Merge "Fix @link tags in keystore doc"
diff --git a/Android.mk b/Android.mk
index b6a4c44..1d236f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -308,6 +308,7 @@
core/java/com/android/internal/app/IEphemeralResolver.aidl \
core/java/com/android/internal/app/ISoundTriggerService.aidl \
core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \
+ core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl \
core/java/com/android/internal/app/IVoiceInteractionSessionShowCallback.aidl \
core/java/com/android/internal/app/IVoiceInteractor.aidl \
core/java/com/android/internal/app/IVoiceInteractorCallback.aidl \
@@ -342,6 +343,7 @@
core/java/com/android/internal/view/IInputMethodManager.aidl \
core/java/com/android/internal/view/IInputMethodSession.aidl \
core/java/com/android/internal/view/IInputSessionCallback.aidl \
+ core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl \
core/java/com/android/internal/widget/ILockSettings.aidl \
core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \
@@ -468,6 +470,9 @@
../../system/update_engine/binder_bindings/android/os/IUpdateEngine.aidl \
../../system/update_engine/binder_bindings/android/os/IUpdateEngineCallback.aidl \
+LOCAL_SRC_FILES += \
+ ../../system/netd/server/binder/android/net/INetd.aidl \
+
LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings
# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
@@ -495,6 +500,10 @@
LOCAL_RMTYPEDEFS := true
+ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
+LOCAL_EMMA_INSTRUMENT := true
+endif
+
include $(BUILD_JAVA_LIBRARY)
framework_module := $(LOCAL_INSTALLED_MODULE)
@@ -891,7 +900,7 @@
framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-hdf sdk.codename N \
- -hdf sdk.preview.version 2 \
+ -hdf sdk.preview.version 5 \
-hdf sdk.version $(framework_docs_SDK_VERSION) \
-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
-hdf sdk.preview 1
@@ -1050,6 +1059,42 @@
-title "Android SDK" \
-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
-sdkvalues $(OUT_DOCS) \
+ -hdf android.whichdoc offline
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+
+include $(BUILD_DROIDDOC)
+
+static_doc_index_redirect := $(out_dir)/index.html
+$(static_doc_index_redirect): \
+ $(LOCAL_PATH)/docs/docs-preview-index.html | $(ACP)
+ $(hide) mkdir -p $(dir $@)
+ $(hide) $(ACP) $< $@
+
+$(full_target): $(static_doc_index_redirect)
+$(full_target): $(framework_built)
+
+
+# ==== static html in the sdk ==================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
+LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
+LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
+LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
+LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
+LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := offline-sdk-referenceonly
+
+LOCAL_DROIDDOC_OPTIONS:=\
+ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+ -offlinemode \
+ -title "Android SDK" \
+ -proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
+ -sdkvalues $(OUT_DOCS) \
-hdf android.whichdoc offline \
-referenceonly
@@ -1089,7 +1134,7 @@
-hdf android.hasSamples true \
-samplesdir $(samples_dir)
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
include $(BUILD_DROIDDOC)
diff --git a/apct-tests/perftests/core/Android.mk b/apct-tests/perftests/core/Android.mk
index e9f18fd..2fd6740 100644
--- a/apct-tests/perftests/core/Android.mk
+++ b/apct-tests/perftests/core/Android.mk
@@ -3,6 +3,7 @@
LOCAL_MODULE_TAGS := tests
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test apct-perftests-utils
diff --git a/apct-tests/perftests/core/res/layout/test_linear_layout.xml b/apct-tests/perftests/core/res/layout/test_linear_layout.xml
new file mode 100644
index 0000000..a863d1b
--- /dev/null
+++ b/apct-tests/perftests/core/res/layout/test_linear_layout.xml
@@ -0,0 +1,87 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/linear_layout_root"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button2"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button5"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/button4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/button2"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button6"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/button4"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button7"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/button"
+ android:layout_toEndOf="@+id/button"
+ android:layout_toRightOf="@+id/button" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apct-tests/perftests/core/res/layout/test_linear_layout_weighted.xml b/apct-tests/perftests/core/res/layout/test_linear_layout_weighted.xml
new file mode 100644
index 0000000..77a982c
--- /dev/null
+++ b/apct-tests/perftests/core/res/layout/test_linear_layout_weighted.xml
@@ -0,0 +1,89 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/linear_layout_weighted_root"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button2"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button5"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_alignParentBottom="true" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/button4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/button2"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button6"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/button4"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button7"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/button"
+ android:layout_toEndOf="@+id/button"
+ android:layout_toRightOf="@+id/button" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apct-tests/perftests/core/res/layout/test_relative_layout.xml b/apct-tests/perftests/core/res/layout/test_relative_layout.xml
new file mode 100644
index 0000000..1daf93a
--- /dev/null
+++ b/apct-tests/perftests/core/res/layout/test_relative_layout.xml
@@ -0,0 +1,87 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/relative_layout_root"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button2"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <ImageButton
+ android:id="@+id/button5"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true" />
+ </RelativeLayout>
+
+ <ImageButton
+ android:id="@+id/button4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/button2"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button6"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/button4"
+ android:layout_centerHorizontal="true" />
+
+ <ImageButton
+ android:id="@+id/button7"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/button"
+ android:layout_toEndOf="@+id/button"
+ android:layout_toRightOf="@+id/button" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/apct-tests/perftests/core/src/android/widget/EditTextBackspacePerfTest.java b/apct-tests/perftests/core/src/android/widget/EditTextBackspacePerfTest.java
new file mode 100644
index 0000000..40b56f4
--- /dev/null
+++ b/apct-tests/perftests/core/src/android/widget/EditTextBackspacePerfTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.perftests.utils.BenchmarkState;
+import android.perftests.utils.PerfStatusReporter;
+import android.perftests.utils.StubActivity;
+import android.text.Selection;
+import android.view.KeyEvent;
+import android.view.View.MeasureSpec;
+import android.view.ViewGroup;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Locale;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized;
+
+@LargeTest
+@RunWith(Parameterized.class)
+public class EditTextBackspacePerfTest {
+
+ private static final String BOY = "\uD83D\uDC66"; // U+1F466
+ private static final String US_FLAG = "\uD83C\uDDFA\uD83C\uDDF8"; // U+1F1FA U+1F1F8
+ private static final String FAMILY =
+ // U+1F469 U+200D U+1F469 U+200D U+1F467 U+200D U+1F467
+ "\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC67";
+ private static final String EMOJI_MODIFIER = "\uD83C\uDFFD"; // U+1F3FD
+ private static final String KEYCAP = "\u20E3";
+ private static final String COLOR_COPYRIGHT = "\u00A9\uFE0F";
+
+ @Parameters(name = "{0}")
+ public static Collection cases() {
+ return Arrays.asList(new Object[][] {
+ { "Latin", "aaa", 1 },
+ { "Flags", US_FLAG + US_FLAG + US_FLAG, 4 },
+ { "EmojiModifier",
+ BOY + EMOJI_MODIFIER + BOY + EMOJI_MODIFIER + BOY + EMOJI_MODIFIER, 4 },
+ { "KeyCap", "1" + KEYCAP + "1" + KEYCAP + "1" + KEYCAP, 2 },
+ { "ZwjSequence", FAMILY + FAMILY + FAMILY, 11 },
+ { "VariationSelector", COLOR_COPYRIGHT + COLOR_COPYRIGHT + COLOR_COPYRIGHT, 2 },
+ });
+ }
+
+ private final String mMetricKey;
+ private final String mText;
+ private final int mCursorPos;
+
+ private static final KeyEvent BACKSPACE_KEY_EVENT =
+ new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
+ private static final KeyEvent RIGHT_ARROW_KEY_EVENT =
+ new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
+
+ public EditTextBackspacePerfTest(String metricKey, String text, int cursorPos) {
+ mMetricKey = metricKey;
+ mText = text;
+ mCursorPos = cursorPos;
+ }
+
+ @Rule
+ public ActivityTestRule<StubActivity> mActivityRule = new ActivityTestRule(StubActivity.class);
+
+ @Rule
+ public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+
+ private void prepareTextForBackspace(EditText editText) {
+ editText.setText(mText, TextView.BufferType.EDITABLE);
+ Selection.setSelection(editText.getText(), 0, 0);
+
+ // Do layout it here since the cursor movement requires layout information but it
+ // happens asynchronously even if the view is attached to an Activity.
+ editText.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+ editText.invalidate();
+ editText.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+ MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+ editText.layout(0, 0, 1024, 768);
+
+ // mText contains three grapheme clusters. Move the cursor to the 2nd grapheme
+ // cluster by forwarding right arrow key event.
+ editText.onKeyDown(RIGHT_ARROW_KEY_EVENT.getKeyCode(), RIGHT_ARROW_KEY_EVENT);
+ Assert.assertEquals(mCursorPos, Selection.getSelectionStart(editText.getText()));
+ }
+
+ @Test
+ public void testBackspace() {
+ InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
+ EditText editText = new EditText(mActivityRule.getActivity());
+
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+ while (state.keepRunning()) {
+ // Prepare the test data for this iteration with pausing timer.
+ state.pauseTiming();
+ prepareTextForBackspace(editText);
+ state.resumeTiming();
+
+ editText.onKeyDown(BACKSPACE_KEY_EVENT.getKeyCode(), BACKSPACE_KEY_EVENT);
+ }
+ });
+ }
+}
diff --git a/apct-tests/perftests/core/src/android/widget/EditTextCursorMovementPerfTest.java b/apct-tests/perftests/core/src/android/widget/EditTextCursorMovementPerfTest.java
new file mode 100644
index 0000000..b100acb
--- /dev/null
+++ b/apct-tests/perftests/core/src/android/widget/EditTextCursorMovementPerfTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.perftests.utils.BenchmarkState;
+import android.perftests.utils.PerfStatusReporter;
+import android.perftests.utils.StubActivity;
+import android.text.Selection;
+import android.view.KeyEvent;
+import android.view.View.MeasureSpec;
+import android.view.ViewGroup;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Locale;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized;
+
+@LargeTest
+@RunWith(Parameterized.class)
+public class EditTextCursorMovementPerfTest {
+
+ private static final String BOY = "\uD83D\uDC66"; // U+1F466
+ private static final String US_FLAG = "\uD83C\uDDFA\uD83C\uDDF8"; // U+1F1FA U+1F1F8
+ private static final String FAMILY =
+ // U+1F469 U+200D U+1F469 U+200D U+1F467 U+200D U+1F467
+ "\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC67";
+
+ @Parameters(name = "{0}")
+ public static Collection cases() {
+ return Arrays.asList(new Object[][] {
+ { "Latin", "aaa", 1 },
+ { "Emoji", BOY + BOY + BOY, 2 },
+ { "Flags", US_FLAG + US_FLAG + US_FLAG, 4 },
+ { "ZwjSequence", FAMILY + FAMILY + FAMILY, 11 },
+ });
+ }
+
+ private final String mMetricKey;
+ private final String mText;
+ private final int mCursorPos;
+
+ private static final KeyEvent LEFT_ARROW_KEY_EVENT =
+ new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT);
+ private static final KeyEvent RIGHT_ARROW_KEY_EVENT =
+ new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
+
+ public EditTextCursorMovementPerfTest(String metricKey, String text, int cursorPos) {
+ mMetricKey = metricKey;
+ mText = text;
+ mCursorPos = cursorPos;
+ }
+
+ @Rule
+ public ActivityTestRule<StubActivity> mActivityRule = new ActivityTestRule(StubActivity.class);
+
+ @Rule
+ public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+
+ @Test
+ public void testCursorMovement() {
+ InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ EditText editText = new EditText(mActivityRule.getActivity());
+
+ editText.setText(mText, TextView.BufferType.EDITABLE);
+ Selection.setSelection(editText.getText(), 0, 0);
+
+ // Layout it here since the cursor movement requires layout information but it
+ // happens asynchronously even if the view is attached to an Activity.
+ editText.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+ editText.invalidate();
+ editText.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+ MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+ editText.layout(0, 0, 1024, 768);
+
+ // mText contains three grapheme clusters. Move the cursor to the 2nd grapheme
+ // cluster by forwarding right arrow key event.
+ editText.onKeyDown(RIGHT_ARROW_KEY_EVENT.getKeyCode(), RIGHT_ARROW_KEY_EVENT);
+ Assert.assertEquals(mCursorPos, Selection.getSelectionStart(editText.getText()));
+
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+ while (state.keepRunning()) {
+ editText.onKeyDown(RIGHT_ARROW_KEY_EVENT.getKeyCode(), RIGHT_ARROW_KEY_EVENT);
+ editText.onKeyDown(LEFT_ARROW_KEY_EVENT.getKeyCode(), LEFT_ARROW_KEY_EVENT);
+ }
+ }
+ });
+ }
+}
diff --git a/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java b/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java
new file mode 100644
index 0000000..d444c92
--- /dev/null
+++ b/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget;
+
+import android.app.Activity;
+import android.os.Looper;
+import android.perftests.utils.BenchmarkState;
+import android.perftests.utils.PerfStatusReporter;
+import android.perftests.utils.StubActivity;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.core.frameworks.perftests.R;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static android.perftests.utils.LayoutUtils.gatherViewTree;
+import static android.perftests.utils.LayoutUtils.requestLayoutForAllNodes;
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.UNSPECIFIED;
+import static org.junit.Assert.assertTrue;
+
+@LargeTest
+@RunWith(Parameterized.class)
+public class LayoutPerfTest {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection measureSpecs() {
+ return Arrays.asList(new Object[][] {
+ { "relative", R.layout.test_relative_layout, R.id.relative_layout_root },
+ { "linear", R.layout.test_linear_layout, R.id.linear_layout_root },
+ { "linear_weighted", R.layout.test_linear_layout_weighted,
+ R.id.linear_layout_weighted_root },
+ });
+ }
+
+ private int[] mMeasureSpecs = {EXACTLY, AT_MOST, UNSPECIFIED};
+
+ private int mLayoutId;
+ private int mViewId;
+
+ public LayoutPerfTest(String key, int layoutId, int viewId) {
+ // key is used in the final report automatically.
+ mLayoutId = layoutId;
+ mViewId = viewId;
+ }
+
+ @Rule
+ public ActivityTestRule<StubActivity> mActivityRule =
+ new ActivityTestRule(StubActivity.class);
+
+ @Rule
+ public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+
+ @Test
+ @UiThreadTest
+ public void testLayoutPerf() {
+ assertTrue("We should be running on the main thread",
+ Looper.getMainLooper().getThread() == Thread.currentThread());
+ assertTrue("We should be running on the main thread",
+ Looper.myLooper() == Looper.getMainLooper());
+
+ Activity activity = mActivityRule.getActivity();
+ activity.setContentView(mLayoutId);
+
+ ViewGroup viewGroup = (ViewGroup) activity.findViewById(mViewId);
+
+ List<View> allNodes = gatherViewTree(viewGroup);
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+
+ int length = mMeasureSpecs.length;
+ while (state.keepRunning()) {
+ for (int i = 0; i < length; i++) {
+ // The overhead of this call is ignorable, like within 1% difference.
+ requestLayoutForAllNodes(allNodes);
+
+ viewGroup.measure(mMeasureSpecs[i % length], mMeasureSpecs[i % length]);
+ viewGroup.layout(0, 0, viewGroup.getMeasuredWidth(), viewGroup.getMeasuredHeight());
+ }
+ }
+ }
+}
diff --git a/apct-tests/perftests/core/src/android/widget/TextViewSetTextLocalePerfTest.java b/apct-tests/perftests/core/src/android/widget/TextViewSetTextLocalePerfTest.java
index 030bd2c..7fc5e4f 100644
--- a/apct-tests/perftests/core/src/android/widget/TextViewSetTextLocalePerfTest.java
+++ b/apct-tests/perftests/core/src/android/widget/TextViewSetTextLocalePerfTest.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
+import android.perftests.utils.PerfStatusReporter;
import android.util.Log;
import android.perftests.utils.BenchmarkState;
@@ -40,12 +41,11 @@
@LargeTest
@RunWith(Parameterized.class)
public class TextViewSetTextLocalePerfTest {
-
- @Parameters
+ @Parameters(name = "{0}")
public static Collection locales() {
return Arrays.asList(new Object[][] {
- { "TextView_setTextLocale_SameLocale", "en-US", "en-US" },
- { "TextView_setTextLocale_DifferentLocale", "en-US", "ja-JP"}
+ { "SameLocale", "en-US", "en-US" },
+ { "DifferentLocale", "en-US", "ja-JP"}
});
}
@@ -63,17 +63,18 @@
@Rule
public ActivityTestRule<StubActivity> mActivityRule = new ActivityTestRule(StubActivity.class);
+ @Rule
+ public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+
@Test
public void testSetTextLocale() {
TextView textView = new TextView(mActivityRule.getActivity());
- BenchmarkState state = new BenchmarkState();
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) {
textView.setTextLocale(mFirstLocale);
textView.setTextLocale(mSecondLocale);
}
-
- state.sendFullStatusReport(InstrumentationRegistry.getInstrumentation(), mMetricKey);
}
}
diff --git a/apct-tests/perftests/graphics/src/android/graphics/perftests/PaintHasGlyphPerfTest.java b/apct-tests/perftests/graphics/src/android/graphics/perftests/PaintHasGlyphPerfTest.java
new file mode 100644
index 0000000..26b8309
--- /dev/null
+++ b/apct-tests/perftests/graphics/src/android/graphics/perftests/PaintHasGlyphPerfTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.graphics.perftests;
+
+import android.graphics.Paint;
+import android.perftests.utils.BenchmarkState;
+import android.perftests.utils.PerfStatusReporter;
+import android.perftests.utils.StubActivity;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized;
+
+@LargeTest
+@RunWith(Parameterized.class)
+public class PaintHasGlyphPerfTest {
+ @Parameters(name = "{0}")
+ public static Collection glyphStrings() {
+ return Arrays.asList(new Object[][] {
+ { "Latin", "A" },
+ { "Ligature", "fi" },
+ { "SurrogatePair", "\uD83D\uDE00" }, // U+1F600
+ { "Flags", "\uD83C\uDDFA\uD83C\uDDF8" }, // US
+ { "Ideograph_VariationSelector", "\u3402\uDB40\uDD00" }, // U+3402 U+E0100
+ { "Emoji_VariationSelector", "\u00A9\uFE0F" },
+ { "EmojiSequence",
+ // U+1F468 U+200D U+2764 U+FE0F U+200D U+1F48B U+200D U+1F468
+ "\uD83D\uDC68\u200D\u2764\uFE0F\u200D\uD83D\uDC8B\u200D\uD83D\uDC68" },
+ });
+ }
+
+ private final String mQuery;
+
+ public PaintHasGlyphPerfTest(String metricKey, String query) {
+ mQuery = query;
+ }
+
+ @Rule
+ public ActivityTestRule<StubActivity> mActivityRule = new ActivityTestRule(StubActivity.class);
+
+ @Rule
+ public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+
+ @Test
+ public void testHasGlyph() {
+ Paint paint = new Paint();
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+
+ while (state.keepRunning()) {
+ paint.hasGlyph(mQuery);
+ }
+ }
+}
diff --git a/apct-tests/perftests/graphics/src/android/graphics/perftests/VectorDrawablePerfTest.java b/apct-tests/perftests/graphics/src/android/graphics/perftests/VectorDrawablePerfTest.java
index fc203ee..2af3b04 100644
--- a/apct-tests/perftests/graphics/src/android/graphics/perftests/VectorDrawablePerfTest.java
+++ b/apct-tests/perftests/graphics/src/android/graphics/perftests/VectorDrawablePerfTest.java
@@ -23,6 +23,7 @@
import android.graphics.drawable.VectorDrawable;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.BitmapUtils;
+import android.perftests.utils.PerfStatusReporter;
import android.perftests.utils.StubActivity;
import android.support.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule;
@@ -48,12 +49,12 @@
private int[] mTestWidths = {1024, 512};
private int[] mTestHeights = {512, 1024};
- private String KEY_VECTORDRAWABLE_DRAW_TIME = "VectorDrawable_Draw_Time_NanoSec";
-
@Rule
public ActivityTestRule<StubActivity> mActivityRule =
new ActivityTestRule(StubActivity.class);
+ @Rule
+ public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@Test
public void testBitmapDrawPerf() {
@@ -66,7 +67,7 @@
Bitmap bmp = Bitmap.createBitmap(w, h, conf);
Canvas canvas = new Canvas(bmp);
- BenchmarkState state = new BenchmarkState();
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
int i = 0;
while (state.keepRunning()) {
// Use different width / height each to force the vectorDrawable abandon the cache.
@@ -86,8 +87,5 @@
if (DUMP_BITMAP) {
BitmapUtils.saveBitmapIntoPNG(activity, bmp, resId);
}
-
- state.sendFullStatusReport(InstrumentationRegistry.getInstrumentation(),
- KEY_VECTORDRAWABLE_DRAW_TIME);
}
}
diff --git a/apct-tests/perftests/utils/Android.mk b/apct-tests/perftests/utils/Android.mk
index 2dc7d4c..55c13b0 100644
--- a/apct-tests/perftests/utils/Android.mk
+++ b/apct-tests/perftests/utils/Android.mk
@@ -1,14 +1,13 @@
- LOCAL_PATH := $(call my-dir)
- include $(CLEAR_VARS)
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
- # Build all java files in the java subdirectory
- LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
- # Any libraries that this library depends on
- LOCAL_JAVA_LIBRARIES := android.test.runner
+# Build all java files in the java subdirectory
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
- # The name of the jar file to create
- LOCAL_MODULE := apct-perftests-utils
+# The name of the jar file to create
+LOCAL_MODULE := apct-perftests-utils
- # Build a static jar file.
- include $(BUILD_STATIC_JAVA_LIBRARY)
\ No newline at end of file
+# Build a static jar file.
+include $(BUILD_STATIC_JAVA_LIBRARY)
\ No newline at end of file
diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java b/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java
index 8e1674a..4213e4a 100644
--- a/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java
+++ b/apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java
@@ -46,13 +46,16 @@
private static final int NOT_STARTED = 1; // The benchmark has not started yet.
private static final int RUNNING = 2; // The benchmark is running.
- private static final int FINISHED = 3; // The benchmark has stopped.
+ private static final int RUNNING_PAUSED = 3; // The benchmark is temporary paused.
+ private static final int FINISHED = 4; // The benchmark has stopped.
private static final int MIN_REPEAT_TIMES = 16;
private int mState = NOT_STARTED; // Current benchmark state.
private long mNanoPreviousTime = 0; // Previously captured System.nanoTime().
private long mNanoFinishTime = 0; // Finish if System.nanoTime() returns after than this value.
+ private long mNanoPausedTime = 0; // The System.nanoTime() when the pauseTiming() is called.
+ private long mNanoPausedDuration = 0; // The duration of paused state in nano sec.
private long mNanoTimeLimit = 1 * 1000 * 1000 * 1000; // 1 sec. Default time limit.
// Statistics. These values will be filled when the benchmark has finished.
@@ -89,6 +92,29 @@
mStandardDeviation = Math.sqrt(mStandardDeviation / (double) (size - 1));
}
+ // Stops the benchmark timer.
+ // This method can be called only when the timer is running.
+ public void pauseTiming() {
+ if (mState == RUNNING_PAUSED) {
+ throw new IllegalStateException(
+ "Unable to pause the benchmark. The benchmark has already paused.");
+ }
+ mNanoPausedTime = System.nanoTime();
+ mState = RUNNING_PAUSED;
+ }
+
+ // Starts the benchmark timer.
+ // This method can be called only when the timer is stopped.
+ public void resumeTiming() {
+ if (mState == RUNNING) {
+ throw new IllegalStateException(
+ "Unable to resume the benchmark. The benchmark is already running.");
+ }
+ mNanoPausedDuration += System.nanoTime() - mNanoPausedTime;
+ mNanoPausedTime = 0;
+ mState = RUNNING;
+ }
+
/**
* Judges whether the benchmark needs more samples.
*
@@ -103,7 +129,8 @@
return true;
case RUNNING:
final long currentTime = System.nanoTime();
- mResults.add(currentTime - mNanoPreviousTime);
+ mResults.add(currentTime - mNanoPreviousTime - mNanoPausedDuration);
+ mNanoPausedDuration = 0;
// To calculate statistics, needs two or more samples.
if (mResults.size() > MIN_REPEAT_TIMES && currentTime > mNanoFinishTime) {
@@ -114,6 +141,10 @@
mNanoPreviousTime = currentTime;
return true;
+ case RUNNING_PAUSED:
+ throw new IllegalStateException(
+ "Benchmark step finished with paused state. " +
+ "Resume the benchmark before finishing each step.");
case FINISHED:
throw new IllegalStateException("The benchmark has finished.");
default:
@@ -145,10 +176,15 @@
private String summaryLine() {
StringBuilder sb = new StringBuilder();
sb.append("Summary: ");
- sb.append("median=" + median() + "ns, ");
- sb.append("mean=" + mean() + "ns, ");
- sb.append("sigma=" + standardDeviation() + ", ");
- sb.append("iteration=" + mResults.size());
+ sb.append("median=").append(median()).append("ns, ");
+ sb.append("mean=").append(mean()).append("ns, ");
+ sb.append("sigma=").append(standardDeviation()).append(", ");
+ sb.append("iteration=").append(mResults.size()).append(", ");
+ // print out the first few iterations' number for double checking.
+ int sampleNumber = Math.min(mResults.size(), MIN_REPEAT_TIMES);
+ for (int i = 0; i < sampleNumber; i++) {
+ sb.append("No ").append(i).append(" result is ").append(mResults.get(i)).append(", ");
+ }
return sb.toString();
}
diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/LayoutUtils.java b/apct-tests/perftests/utils/src/android/perftests/utils/LayoutUtils.java
new file mode 100644
index 0000000..c64af8f
--- /dev/null
+++ b/apct-tests/perftests/utils/src/android/perftests/utils/LayoutUtils.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.perftests.utils;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LayoutUtils {
+
+ private static void recursivelyGather(ViewGroup currentNode, List<View> nodeList) {
+ nodeList.add(currentNode);
+ int count = currentNode.getChildCount();
+ for (int i = 0; i < count; i++) {
+ View view = currentNode.getChildAt(i);
+ if (view instanceof ViewGroup) {
+ recursivelyGather((ViewGroup) view, nodeList);
+ } else {
+ nodeList.add(view);
+ }
+ }
+ }
+
+ /**
+ * Flattern the whole view tree into a list of View.
+ */
+ public static List<View> gatherViewTree(ViewGroup root) {
+ List<View> result = new ArrayList<View>();
+ recursivelyGather(root, result);
+ return result;
+ }
+
+ /**
+ * For every node in the list, call requestLayout.
+ */
+ public static void requestLayoutForAllNodes(List<View> nodeList) {
+ int count = nodeList.size();
+ for (int i = 0; i < count; i++) {
+ nodeList.get(i).requestLayout();
+ }
+ }
+}
diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java b/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java
new file mode 100644
index 0000000..3933b57
--- /dev/null
+++ b/apct-tests/perftests/utils/src/android/perftests/utils/PerfStatusReporter.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.perftests.utils;
+
+import android.support.test.InstrumentationRegistry;
+
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * Use this rule to make sure we report the status after the test success.
+ *
+ * <code>
+ *
+ * @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
+ * @Test public void functionName() {
+ * ...
+ * BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+ * while (state.keepRunning()) {
+ * // DO YOUR TEST HERE!
+ * }
+ * ...
+ * }
+ * </code>
+ *
+ * When test succeeded, the status report will use the key as
+ * "functionName[optional subTestName]_*"
+ *
+ * Notice that optional subTestName can't be just numbers, that means each sub test needs to have a
+ * name when using parameterization.
+ */
+
+public class PerfStatusReporter extends TestWatcher {
+ private final BenchmarkState mState = new BenchmarkState();
+
+ public BenchmarkState getBenchmarkState() {
+ return mState;
+ }
+
+ @Override
+ protected void succeeded(Description description) {
+ String invokeMethodName = description.getMethodName();
+ // validate and simplify the function name.
+ // First, remove the "test" prefix which normally comes from CTS test.
+ // Then make sure the [subTestName] is valid, not just numbers like [0].
+ if (invokeMethodName.startsWith("test")) {
+ assertTrue("The test name " + invokeMethodName + " is too short",
+ invokeMethodName.length() > 5);
+ invokeMethodName = invokeMethodName.substring(4, 5).toLowerCase()
+ + invokeMethodName.substring(5);
+ }
+
+ int index = invokeMethodName.lastIndexOf('[');
+ if (index > 0) {
+ boolean allDigits = true;
+ for (int i = index + 1; i < invokeMethodName.length() - 1; i++) {
+ if (!Character.isDigit(invokeMethodName.charAt(i))) {
+ allDigits = false;
+ break;
+ }
+ }
+ assertFalse("The name in [] can't contain only digits for " + invokeMethodName,
+ allDigits);
+ }
+
+ mState.sendFullStatusReport(InstrumentationRegistry.getInstrumentation(),
+ invokeMethodName);
+ }
+
+}
diff --git a/api/current.txt b/api/current.txt
index 0a701ab..64838a4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2802,12 +2802,16 @@
method public android.os.Bundle addAccountFromCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle confirmCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle editProperties(android.accounts.AccountAuthenticatorResponse, java.lang.String);
+ method public android.os.Bundle finishSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public android.os.Bundle getAccountCredentialsForCloning(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException;
method public android.os.Bundle getAccountRemovalAllowed(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle getAuthToken(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract java.lang.String getAuthTokenLabel(java.lang.String);
method public final android.os.IBinder getIBinder();
method public abstract android.os.Bundle hasFeatures(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String[]) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle isCredentialsUpdateSuggested(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startAddAccountSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startUpdateCredentialsSession(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle updateCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
field public static final java.lang.String KEY_CUSTOM_TOKEN_EXPIRY = "android.accounts.expiry";
}
@@ -2845,6 +2849,7 @@
method public void clearPassword(android.accounts.Account);
method public android.accounts.AccountManagerFuture<android.os.Bundle> confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public static android.accounts.AccountManager get(android.content.Context);
method public android.accounts.Account[] getAccounts();
method public android.accounts.Account[] getAccountsByType(java.lang.String);
@@ -2860,6 +2865,7 @@
method public java.lang.String getUserData(android.accounts.Account, java.lang.String);
method public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
method public void invalidateAuthToken(java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<java.lang.Boolean> isCredentialsUpdateSuggested(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
method public static deprecated android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
method public boolean notifyAccountAuthenticated(android.accounts.Account);
@@ -2872,6 +2878,8 @@
method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);
method public void setPassword(android.accounts.Account, java.lang.String);
method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startAddAccountSession(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startUpdateCredentialsSession(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
field public static final java.lang.String ACTION_AUTHENTICATOR_INTENT = "android.accounts.AccountAuthenticator";
field public static final java.lang.String AUTHENTICATOR_ATTRIBUTES_NAME = "account-authenticator";
@@ -2888,6 +2896,8 @@
field public static final java.lang.String KEY_ACCOUNT_AUTHENTICATOR_RESPONSE = "accountAuthenticatorResponse";
field public static final java.lang.String KEY_ACCOUNT_MANAGER_RESPONSE = "accountManagerResponse";
field public static final java.lang.String KEY_ACCOUNT_NAME = "authAccount";
+ field public static final java.lang.String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
+ field public static final java.lang.String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
field public static final java.lang.String KEY_ACCOUNT_TYPE = "accountType";
field public static final java.lang.String KEY_ANDROID_PACKAGE_NAME = "androidPackageName";
field public static final java.lang.String KEY_AUTHENTICATOR_TYPES = "authenticator_types";
@@ -3707,6 +3717,7 @@
method public void moveTaskToFront(int, int);
method public void moveTaskToFront(int, int, android.os.Bundle);
method public deprecated void restartPackage(java.lang.String);
+ method public static void setVrThread(int);
method public void setWatchHeapLimit(long);
field public static final java.lang.String ACTION_REPORT_HEAP_LIMIT = "android.app.action.REPORT_HEAP_LIMIT";
field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1
@@ -9534,8 +9545,8 @@
method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
- method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
- method public boolean startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
+ method public void startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
+ method public void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}
@@ -10067,17 +10078,15 @@
method public android.content.ComponentName getActivity();
method public java.util.Set<java.lang.String> getCategories();
method public java.lang.CharSequence getDisabledMessage();
- method public int getDisabledMessageResourceId();
method public android.os.PersistableBundle getExtras();
method public java.lang.String getId();
method public android.content.Intent getIntent();
+ method public android.content.Intent[] getIntents();
method public long getLastChangedTimestamp();
method public java.lang.CharSequence getLongLabel();
- method public int getLongLabelResourceId();
method public java.lang.String getPackage();
method public int getRank();
method public java.lang.CharSequence getShortLabel();
- method public int getShortLabelResourceId();
method public android.os.UserHandle getUserHandle();
method public boolean hasKeyFieldsOnly();
method public boolean isDeclaredInManifest();
@@ -10091,7 +10100,6 @@
}
public static class ShortcutInfo.Builder {
- ctor public deprecated ShortcutInfo.Builder(android.content.Context);
ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
method public android.content.pm.ShortcutInfo build();
method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
@@ -10099,8 +10107,8 @@
method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);
method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
- method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);
method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
+ method public android.content.pm.ShortcutInfo.Builder setIntents(android.content.Intent[]);
method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
method public android.content.pm.ShortcutInfo.Builder setRank(int);
method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);
@@ -10109,17 +10117,15 @@
public class ShortcutManager {
method public boolean addDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
method public void disableShortcuts(java.util.List<java.lang.String>);
- method public void disableShortcuts(java.util.List<java.lang.String>, int);
- method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.String);
+ method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.CharSequence);
method public void enableShortcuts(java.util.List<java.lang.String>);
method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
method public int getIconMaxHeight();
method public int getIconMaxWidth();
method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
- method public int getMaxShortcutCountForActivity();
+ method public int getMaxShortcutCountPerActivity();
method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
- method public long getRateLimitResetTime();
- method public int getRemainingCallCount();
+ method public boolean isRateLimitingActive();
method public void removeAllDynamicShortcuts();
method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
method public void reportShortcutUsed(java.lang.String);
@@ -10333,7 +10339,7 @@
}
public class Resources {
- ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
+ ctor public deprecated Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
method public final void finishPreloading();
method public final void flushLayoutCache();
method public android.content.res.XmlResourceParser getAnimation(int) throws android.content.res.Resources.NotFoundException;
@@ -10384,7 +10390,7 @@
method public android.content.res.AssetFileDescriptor openRawResourceFd(int) throws android.content.res.Resources.NotFoundException;
method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;
method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
- method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
+ method public deprecated void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
}
public static class Resources.NotFoundException extends java.lang.RuntimeException {
@@ -12289,6 +12295,7 @@
method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public float[] approximate(float);
method public void arcTo(android.graphics.RectF, float, float, boolean);
method public void arcTo(android.graphics.RectF, float, float);
method public void arcTo(float, float, float, float, float, float, boolean);
@@ -18863,7 +18870,6 @@
public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
ctor public InputMethodService();
method public deprecated boolean enableHardwareAcceleration();
- method public final boolean exposeContent(android.view.inputmethod.InputContentInfo, android.view.inputmethod.EditorInfo);
method public int getBackDisposition();
method public int getCandidatesHiddenVisibility();
method public android.view.inputmethod.InputBinding getCurrentInputBinding();
@@ -19665,6 +19671,7 @@
field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;
field public static final int ENCODING_AC3 = 5; // 0x5
field public static final int ENCODING_DEFAULT = 1; // 0x1
+ field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe
field public static final int ENCODING_DTS = 7; // 0x7
field public static final int ENCODING_DTS_HD = 8; // 0x8
field public static final int ENCODING_E_AC3 = 6; // 0x6
@@ -20148,6 +20155,7 @@
field public static final java.lang.String TAG_DATETIME = "DateTime";
field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
field public static final java.lang.String TAG_DATETIME_ORIGINAL = "DateTimeOriginal";
+ field public static final java.lang.String TAG_DEFAULT_CROP_SIZE = "DefaultCropSize";
field public static final java.lang.String TAG_DEVICE_SETTING_DESCRIPTION = "DeviceSettingDescription";
field public static final java.lang.String TAG_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";
field public static final java.lang.String TAG_EXIF_VERSION = "ExifVersion";
@@ -20213,7 +20221,12 @@
field public static final java.lang.String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";
field public static final java.lang.String TAG_METERING_MODE = "MeteringMode";
field public static final java.lang.String TAG_MODEL = "Model";
+ field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
field public static final java.lang.String TAG_OECF = "OECF";
+ field public static final java.lang.String TAG_ORF_ASPECT_FRAME = "AspectFrame";
+ field public static final java.lang.String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";
+ field public static final java.lang.String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";
+ field public static final java.lang.String TAG_ORF_THUMBNAIL_IMAGE = "ThumbnailImage";
field public static final java.lang.String TAG_ORIENTATION = "Orientation";
field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
field public static final java.lang.String TAG_PIXEL_X_DIMENSION = "PixelXDimension";
@@ -20224,6 +20237,12 @@
field public static final java.lang.String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
field public static final java.lang.String TAG_RESOLUTION_UNIT = "ResolutionUnit";
field public static final java.lang.String TAG_ROWS_PER_STRIP = "RowsPerStrip";
+ field public static final java.lang.String TAG_RW2_ISO = "ISO";
+ field public static final java.lang.String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";
+ field public static final java.lang.String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";
field public static final java.lang.String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";
field public static final java.lang.String TAG_SATURATION = "Saturation";
field public static final java.lang.String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
@@ -20236,6 +20255,7 @@
field public static final java.lang.String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";
field public static final java.lang.String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";
field public static final java.lang.String TAG_STRIP_OFFSETS = "StripOffsets";
+ field public static final java.lang.String TAG_SUBFILE_TYPE = "SubfileType";
field public static final java.lang.String TAG_SUBJECT_AREA = "SubjectArea";
field public static final java.lang.String TAG_SUBJECT_DISTANCE = "SubjectDistance";
field public static final java.lang.String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";
@@ -28388,6 +28408,7 @@
field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
+ field public static final int N_MR1 = 25; // 0x19
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
@@ -29291,6 +29312,7 @@
method public android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites();
method public android.os.StrictMode.ThreadPolicy.Builder detectNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder detectResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectUnbufferedIo();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeath();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();
@@ -29303,6 +29325,7 @@
method public android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites();
method public android.os.StrictMode.ThreadPolicy.Builder permitNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder permitResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitUnbufferedIo();
}
public static final class StrictMode.VmPolicy {
@@ -29381,6 +29404,7 @@
method public android.os.Bundle getUserRestrictions();
method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
method public boolean hasUserRestriction(java.lang.String);
+ method public boolean isDemoUser();
method public boolean isQuietModeEnabled(android.os.UserHandle);
method public boolean isSystemUser();
method public boolean isUserAGoat();
@@ -29620,6 +29644,7 @@
method public boolean isObbMounted(java.lang.String);
method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
+ field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";
}
public final class StorageVolume implements android.os.Parcelable {
@@ -32405,7 +32430,6 @@
field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
- field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";
field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";
@@ -34269,8 +34293,13 @@
method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);
method public static boolean isKeyAlgorithmSupported(java.lang.String);
- field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";
+ field public static final java.lang.String ACTION_KEY_ACCESS_CHANGED = "android.security.action.KEY_ACCESS_CHANGED";
+ field public static final deprecated java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String ACTION_TRUST_STORE_CHANGED = "android.security.action.TRUST_STORE_CHANGED";
field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";
+ field public static final java.lang.String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";
+ field public static final java.lang.String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";
field public static final java.lang.String EXTRA_NAME = "name";
field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";
}
@@ -34689,6 +34718,7 @@
field public static final java.lang.String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE";
field public static final java.lang.String EXTRA_RECENT = "android.service.media.extra.RECENT";
field public static final java.lang.String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED";
+ field public static final java.lang.String EXTRA_SUGGESTION_KEYWORDS = "android.service.media.extra.SUGGESTION_KEYWORDS";
}
public class MediaBrowserService.Result {
@@ -36236,7 +36266,7 @@
method public final void setConnectionTime(long);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
- method public final deprecated void setExtras(android.os.Bundle);
+ method public final void setExtras(android.os.Bundle);
method public final void setOnHold();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
@@ -36301,12 +36331,13 @@
method public final void setConnectionProperties(int);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
- method public final deprecated void setExtras(android.os.Bundle);
+ method public final void setExtras(android.os.Bundle);
method public final void setInitialized();
method public final void setInitializing();
method public final void setNextPostDialChar(char);
method public final void setOnHold();
method public final void setPostDialWait(java.lang.String);
+ method public final void setPulling();
method public final void setRingbackRequested(boolean);
method public final void setRinging();
method public final void setStatusHints(android.telecom.StatusHints);
@@ -36787,9 +36818,11 @@
field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";
+ field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";
field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
+ field public static final java.lang.String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";
field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
@@ -37376,26 +37409,6 @@
method public void onSubscriptionsChanged();
}
- public final class TelephonyHistogram implements android.os.Parcelable {
- ctor public TelephonyHistogram(int, int, int);
- ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);
- ctor public TelephonyHistogram(android.os.Parcel);
- method public void addTimeTaken(int);
- method public int describeContents();
- method public int getAverageTime();
- method public int getBucketCount();
- method public int[] getBucketCounters();
- method public int[] getBucketEndPoints();
- method public int getCategory();
- method public int getId();
- method public int getMaxTime();
- method public int getMinTime();
- method public int getSampleCount();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator<android.telephony.TelephonyHistogram> CREATOR;
- field public static final int TELEPHONY_CATEGORY_RIL = 1; // 0x1
- }
-
public class TelephonyManager {
method public boolean canChangeDtmfToneLength();
method public android.telephony.TelephonyManager createForSubscriptionId(int);
@@ -37426,7 +37439,6 @@
method public java.lang.String getSimSerialNumber();
method public int getSimState();
method public java.lang.String getSubscriberId();
- method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailNumber();
method public int getVoiceNetworkType();
@@ -38773,7 +38785,7 @@
}
public class TextUtils {
- method public static java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
+ method public static deprecated java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
method public static java.lang.CharSequence concat(java.lang.CharSequence...);
method public static void copySpansFrom(android.text.Spanned, int, int, java.lang.Class, android.text.Spannable, int);
method public static void dumpSpans(java.lang.CharSequence, android.util.Printer, java.lang.String);
@@ -38804,6 +38816,7 @@
method public static int lastIndexOf(java.lang.CharSequence, char);
method public static int lastIndexOf(java.lang.CharSequence, char, int);
method public static int lastIndexOf(java.lang.CharSequence, char, int, int);
+ method public static java.lang.CharSequence listEllipsize(android.content.Context, java.util.List<java.lang.CharSequence>, java.lang.String, android.text.TextPaint, float, int);
method public static boolean regionMatches(java.lang.CharSequence, int, java.lang.CharSequence, int, int);
method public static java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[]);
method public static java.lang.String[] split(java.lang.String, java.lang.String);
@@ -40477,6 +40490,7 @@
method public E get(long, E);
method public int indexOfKey(long);
method public int indexOfValue(E);
+ method public int indexOfValueByValue(E);
method public long keyAt(int);
method public void put(long, E);
method public void remove(long);
@@ -40679,6 +40693,7 @@
method public E get(int, E);
method public int indexOfKey(int);
method public int indexOfValue(E);
+ method public int indexOfValueByValue(E);
method public int keyAt(int);
method public void put(int, E);
method public void remove(int);
@@ -42519,6 +42534,7 @@
method public float getPivotY();
method public android.view.PointerIcon getPointerIcon();
method public android.content.res.Resources getResources();
+ method public final boolean getRevealOnFocusHint();
method public final int getRight();
method protected float getRightFadingEdgeStrength();
method protected int getRightPaddingOffset();
@@ -42806,6 +42822,7 @@
method public void setPivotY(float);
method public void setPointerIcon(android.view.PointerIcon);
method public void setPressed(boolean);
+ method public final void setRevealOnFocusHint(boolean);
method public final void setRight(int);
method public void setRotation(float);
method public void setRotationX(float);
@@ -44727,7 +44744,7 @@
method public boolean clearMetaKeyStates(int);
method public void closeConnection();
method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public boolean commitText(java.lang.CharSequence, int);
method public boolean deleteSurroundingText(int, int);
@@ -44897,7 +44914,7 @@
method public abstract boolean clearMetaKeyStates(int);
method public abstract void closeConnection();
method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public abstract boolean commitText(java.lang.CharSequence, int);
method public abstract boolean deleteSurroundingText(int, int);
@@ -44923,6 +44940,7 @@
field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
+ field public static final int INPUT_CONTENT_GRANT_READ_URI_PERMISSION = 1; // 0x1
}
public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
@@ -44931,7 +44949,7 @@
method public boolean clearMetaKeyStates(int);
method public void closeConnection();
method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public boolean commitText(java.lang.CharSequence, int);
method public boolean deleteSurroundingText(int, int);
@@ -45252,7 +45270,7 @@
method public static boolean allowFileSchemeCookies();
method public abstract void flush();
method public abstract java.lang.String getCookie(java.lang.String);
- method public static synchronized android.webkit.CookieManager getInstance();
+ method public static android.webkit.CookieManager getInstance();
method public abstract boolean hasCookies();
method public abstract deprecated void removeAllCookie();
method public abstract void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>);
@@ -45267,8 +45285,8 @@
}
public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
- method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
- method public static synchronized android.webkit.CookieSyncManager getInstance();
+ method public static android.webkit.CookieSyncManager createInstance(android.content.Context);
+ method public static android.webkit.CookieSyncManager getInstance();
method protected deprecated void syncFromRamToFlash();
field protected static final java.lang.String LOGTAG = "websync";
field protected android.webkit.WebViewDatabase mDataBase;
@@ -51292,11 +51310,14 @@
public abstract class Process {
ctor public Process();
method public abstract void destroy();
+ method public java.lang.Process destroyForcibly();
method public abstract int exitValue();
method public abstract java.io.InputStream getErrorStream();
method public abstract java.io.InputStream getInputStream();
method public abstract java.io.OutputStream getOutputStream();
+ method public boolean isAlive();
method public abstract int waitFor() throws java.lang.InterruptedException;
+ method public boolean waitFor(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
}
public final class ProcessBuilder {
@@ -53596,6 +53617,7 @@
method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();
method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;
method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
@@ -53607,6 +53629,7 @@
method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);
method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
@@ -53675,6 +53698,7 @@
method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
@@ -53910,6 +53934,7 @@
method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;
method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.ServerSocket socket();
@@ -53925,6 +53950,7 @@
method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean finishConnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public abstract boolean isConnectionPending();
@@ -55161,9 +55187,7 @@
public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
ctor public KeyStore.PasswordProtection(char[]);
- method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
method public synchronized char[] getPassword();
- method public synchronized boolean isDestroyed();
}
public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -64907,8 +64931,8 @@
}
public abstract interface Destroyable {
- method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
- method public abstract boolean isDestroyed();
+ method public default void destroy() throws javax.security.auth.DestroyFailedException;
+ method public default boolean isDestroyed();
}
public final class PrivateCredentialPermission extends java.security.Permission {
diff --git a/api/removed.txt b/api/removed.txt
index 21b1716..94ba452 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -427,12 +427,3 @@
}
-package com.android.internal {
-
- public static final class R.styleable {
- field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6
- field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5
- }
-
-}
-
diff --git a/api/system-current.txt b/api/system-current.txt
index c72f282..c7a05b2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3843,6 +3843,7 @@
method public void moveTaskToFront(int, int);
method public void moveTaskToFront(int, int, android.os.Bundle);
method public deprecated void restartPackage(java.lang.String);
+ method public static void setVrThread(int);
method public void setWatchHeapLimit(long);
field public static final java.lang.String ACTION_REPORT_HEAP_LIMIT = "android.app.action.REPORT_HEAP_LIMIT";
field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1
@@ -6694,6 +6695,7 @@
method public abstract java.util.List<android.app.job.JobInfo> getAllPendingJobs();
method public abstract android.app.job.JobInfo getPendingJob(int);
method public abstract int schedule(android.app.job.JobInfo);
+ method public abstract int scheduleAsPackage(android.app.job.JobInfo, java.lang.String, int, java.lang.String);
field public static final int RESULT_FAILURE = 0; // 0x0
field public static final int RESULT_SUCCESS = 1; // 0x1
}
@@ -8447,6 +8449,7 @@
method public abstract void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);
method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
+ method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.os.Bundle);
method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String);
method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
@@ -8640,6 +8643,7 @@
method public void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
+ method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, java.lang.String);
method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
@@ -9888,8 +9892,8 @@
method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
- method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
- method public boolean startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
+ method public void startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
+ method public void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}
@@ -10491,17 +10495,15 @@
method public android.content.ComponentName getActivity();
method public java.util.Set<java.lang.String> getCategories();
method public java.lang.CharSequence getDisabledMessage();
- method public int getDisabledMessageResourceId();
method public android.os.PersistableBundle getExtras();
method public java.lang.String getId();
method public android.content.Intent getIntent();
+ method public android.content.Intent[] getIntents();
method public long getLastChangedTimestamp();
method public java.lang.CharSequence getLongLabel();
- method public int getLongLabelResourceId();
method public java.lang.String getPackage();
method public int getRank();
method public java.lang.CharSequence getShortLabel();
- method public int getShortLabelResourceId();
method public android.os.UserHandle getUserHandle();
method public boolean hasKeyFieldsOnly();
method public boolean isDeclaredInManifest();
@@ -10515,7 +10517,6 @@
}
public static class ShortcutInfo.Builder {
- ctor public deprecated ShortcutInfo.Builder(android.content.Context);
ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
method public android.content.pm.ShortcutInfo build();
method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
@@ -10523,8 +10524,8 @@
method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);
method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
- method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);
method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
+ method public android.content.pm.ShortcutInfo.Builder setIntents(android.content.Intent[]);
method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
method public android.content.pm.ShortcutInfo.Builder setRank(int);
method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);
@@ -10533,17 +10534,15 @@
public class ShortcutManager {
method public boolean addDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
method public void disableShortcuts(java.util.List<java.lang.String>);
- method public void disableShortcuts(java.util.List<java.lang.String>, int);
- method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.String);
+ method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.CharSequence);
method public void enableShortcuts(java.util.List<java.lang.String>);
method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
method public int getIconMaxHeight();
method public int getIconMaxWidth();
method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
- method public int getMaxShortcutCountForActivity();
+ method public int getMaxShortcutCountPerActivity();
method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
- method public long getRateLimitResetTime();
- method public int getRemainingCallCount();
+ method public boolean isRateLimitingActive();
method public void removeAllDynamicShortcuts();
method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
method public void reportShortcutUsed(java.lang.String);
@@ -10771,7 +10770,7 @@
}
public class Resources {
- ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
+ ctor public deprecated Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
method public final void finishPreloading();
method public final void flushLayoutCache();
method public android.content.res.XmlResourceParser getAnimation(int) throws android.content.res.Resources.NotFoundException;
@@ -10822,7 +10821,7 @@
method public android.content.res.AssetFileDescriptor openRawResourceFd(int) throws android.content.res.Resources.NotFoundException;
method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;
method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
- method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
+ method public deprecated void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
}
public static class Resources.NotFoundException extends java.lang.RuntimeException {
@@ -12727,6 +12726,7 @@
method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public float[] approximate(float);
method public void arcTo(android.graphics.RectF, float, float, boolean);
method public void arcTo(android.graphics.RectF, float, float);
method public void arcTo(float, float, float, float, float, float, boolean);
@@ -20063,7 +20063,6 @@
public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
ctor public InputMethodService();
method public deprecated boolean enableHardwareAcceleration();
- method public final boolean exposeContent(android.view.inputmethod.InputContentInfo, android.view.inputmethod.EditorInfo);
method public int getBackDisposition();
method public int getCandidatesHiddenVisibility();
method public android.view.inputmethod.InputBinding getCurrentInputBinding();
@@ -21172,6 +21171,7 @@
field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;
field public static final int ENCODING_AC3 = 5; // 0x5
field public static final int ENCODING_DEFAULT = 1; // 0x1
+ field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe
field public static final int ENCODING_DTS = 7; // 0x7
field public static final int ENCODING_DTS_HD = 8; // 0x8
field public static final int ENCODING_E_AC3 = 6; // 0x6
@@ -21667,6 +21667,7 @@
field public static final java.lang.String TAG_DATETIME = "DateTime";
field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
field public static final java.lang.String TAG_DATETIME_ORIGINAL = "DateTimeOriginal";
+ field public static final java.lang.String TAG_DEFAULT_CROP_SIZE = "DefaultCropSize";
field public static final java.lang.String TAG_DEVICE_SETTING_DESCRIPTION = "DeviceSettingDescription";
field public static final java.lang.String TAG_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";
field public static final java.lang.String TAG_EXIF_VERSION = "ExifVersion";
@@ -21732,7 +21733,12 @@
field public static final java.lang.String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";
field public static final java.lang.String TAG_METERING_MODE = "MeteringMode";
field public static final java.lang.String TAG_MODEL = "Model";
+ field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
field public static final java.lang.String TAG_OECF = "OECF";
+ field public static final java.lang.String TAG_ORF_ASPECT_FRAME = "AspectFrame";
+ field public static final java.lang.String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";
+ field public static final java.lang.String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";
+ field public static final java.lang.String TAG_ORF_THUMBNAIL_IMAGE = "ThumbnailImage";
field public static final java.lang.String TAG_ORIENTATION = "Orientation";
field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
field public static final java.lang.String TAG_PIXEL_X_DIMENSION = "PixelXDimension";
@@ -21743,6 +21749,12 @@
field public static final java.lang.String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
field public static final java.lang.String TAG_RESOLUTION_UNIT = "ResolutionUnit";
field public static final java.lang.String TAG_ROWS_PER_STRIP = "RowsPerStrip";
+ field public static final java.lang.String TAG_RW2_ISO = "ISO";
+ field public static final java.lang.String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";
+ field public static final java.lang.String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";
field public static final java.lang.String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";
field public static final java.lang.String TAG_SATURATION = "Saturation";
field public static final java.lang.String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
@@ -21755,6 +21767,7 @@
field public static final java.lang.String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";
field public static final java.lang.String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";
field public static final java.lang.String TAG_STRIP_OFFSETS = "StripOffsets";
+ field public static final java.lang.String TAG_SUBFILE_TYPE = "SubfileType";
field public static final java.lang.String TAG_SUBJECT_AREA = "SubjectArea";
field public static final java.lang.String TAG_SUBJECT_DISTANCE = "SubjectDistance";
field public static final java.lang.String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";
@@ -26035,6 +26048,33 @@
package android.net.metrics {
+ public final class ApfProgramEvent implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.metrics.ApfProgramEvent> CREATOR;
+ field public static final int FLAG_HAS_IPV4_ADDRESS = 1; // 0x1
+ field public static final int FLAG_MULTICAST_FILTER_ON = 0; // 0x0
+ field public final int currentRas;
+ field public final int filteredRas;
+ field public final int flags;
+ field public final long lifetime;
+ field public final int programLength;
+ }
+
+ public final class ApfStats implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.metrics.ApfStats> CREATOR;
+ field public final int droppedRas;
+ field public final long durationMs;
+ field public final int matchingRas;
+ field public final int maxProgramSize;
+ field public final int parseErrors;
+ field public final int programUpdates;
+ field public final int receivedRas;
+ field public final int zeroLifetimeRas;
+ }
+
public final class DefaultNetworkEvent implements android.os.Parcelable {
method public int describeContents();
method public static void logEvent(int, int[], int, boolean, boolean);
@@ -26052,6 +26092,7 @@
method public static void logStateEvent(java.lang.String, java.lang.String);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.metrics.DhcpClientEvent> CREATOR;
+ field public final int durationMs;
field public final java.lang.String ifName;
field public final java.lang.String msg;
}
@@ -26143,6 +26184,18 @@
field public final int netId;
}
+ public final class RaEvent implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.metrics.RaEvent> CREATOR;
+ field public final long dnsslLifetime;
+ field public final long prefixPreferredLifetime;
+ field public final long prefixValidLifetime;
+ field public final long rdnssLifetime;
+ field public final long routeInfoLifetime;
+ field public final long routerLifetime;
+ }
+
public final class ValidationProbeEvent implements android.os.Parcelable {
method public int describeContents();
method public static void logEvent(int, long, int, int);
@@ -30828,6 +30881,7 @@
field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
+ field public static final int N_MR1 = 25; // 0x19
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
@@ -31759,6 +31813,7 @@
method public android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites();
method public android.os.StrictMode.ThreadPolicy.Builder detectNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder detectResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectUnbufferedIo();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeath();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();
@@ -31771,6 +31826,7 @@
method public android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites();
method public android.os.StrictMode.ThreadPolicy.Builder permitNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder permitResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitUnbufferedIo();
}
public static final class StrictMode.VmPolicy {
@@ -31906,6 +31962,7 @@
method public android.os.Bundle getUserRestrictions();
method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
method public boolean hasUserRestriction(java.lang.String);
+ method public boolean isDemoUser();
method public boolean isManagedProfile();
method public boolean isManagedProfile(int);
method public boolean isQuietModeEnabled(android.os.UserHandle);
@@ -32154,6 +32211,7 @@
method public boolean isObbMounted(java.lang.String);
method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
+ field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";
}
public final class StorageVolume implements android.os.Parcelable {
@@ -35110,7 +35168,6 @@
field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
- field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";
field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";
@@ -36977,8 +37034,13 @@
method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);
method public static boolean isKeyAlgorithmSupported(java.lang.String);
- field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";
+ field public static final java.lang.String ACTION_KEY_ACCESS_CHANGED = "android.security.action.KEY_ACCESS_CHANGED";
+ field public static final deprecated java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String ACTION_TRUST_STORE_CHANGED = "android.security.action.TRUST_STORE_CHANGED";
field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";
+ field public static final java.lang.String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";
+ field public static final java.lang.String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";
field public static final java.lang.String EXTRA_NAME = "name";
field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";
}
@@ -37397,6 +37459,7 @@
field public static final java.lang.String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE";
field public static final java.lang.String EXTRA_RECENT = "android.service.media.extra.RECENT";
field public static final java.lang.String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED";
+ field public static final java.lang.String EXTRA_SUGGESTION_KEYWORDS = "android.service.media.extra.SUGGESTION_KEYWORDS";
}
public class MediaBrowserService.Result {
@@ -39083,7 +39146,7 @@
method public final void setConnectionTime(long);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
- method public final deprecated void setExtras(android.os.Bundle);
+ method public final void setExtras(android.os.Bundle);
method public final void setOnHold();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
@@ -39150,12 +39213,13 @@
method public final void setConnectionProperties(int);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
- method public final deprecated void setExtras(android.os.Bundle);
+ method public final void setExtras(android.os.Bundle);
method public final void setInitialized();
method public final void setInitializing();
method public final void setNextPostDialChar(char);
method public final void setOnHold();
method public final void setPostDialWait(java.lang.String);
+ method public final void setPulling();
method public final void setRingbackRequested(boolean);
method public final void setRinging();
method public final void setStatusHints(android.telecom.StatusHints);
@@ -39826,9 +39890,11 @@
field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";
+ field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";
field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
+ field public static final java.lang.String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";
field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
@@ -41126,6 +41192,7 @@
method public void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
+ method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, java.lang.String);
method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
@@ -41877,7 +41944,7 @@
}
public class TextUtils {
- method public static java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
+ method public static deprecated java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
method public static java.lang.CharSequence concat(java.lang.CharSequence...);
method public static void copySpansFrom(android.text.Spanned, int, int, java.lang.Class, android.text.Spannable, int);
method public static void dumpSpans(java.lang.CharSequence, android.util.Printer, java.lang.String);
@@ -41908,6 +41975,7 @@
method public static int lastIndexOf(java.lang.CharSequence, char);
method public static int lastIndexOf(java.lang.CharSequence, char, int);
method public static int lastIndexOf(java.lang.CharSequence, char, int, int);
+ method public static java.lang.CharSequence listEllipsize(android.content.Context, java.util.List<java.lang.CharSequence>, java.lang.String, android.text.TextPaint, float, int);
method public static boolean regionMatches(java.lang.CharSequence, int, java.lang.CharSequence, int, int);
method public static java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[]);
method public static java.lang.String[] split(java.lang.String, java.lang.String);
@@ -43581,6 +43649,7 @@
method public E get(long, E);
method public int indexOfKey(long);
method public int indexOfValue(E);
+ method public int indexOfValueByValue(E);
method public long keyAt(int);
method public void put(long, E);
method public void remove(long);
@@ -43783,6 +43852,7 @@
method public E get(int, E);
method public int indexOfKey(int);
method public int indexOfValue(E);
+ method public int indexOfValueByValue(E);
method public int keyAt(int);
method public void put(int, E);
method public void remove(int);
@@ -45623,6 +45693,7 @@
method public float getPivotY();
method public android.view.PointerIcon getPointerIcon();
method public android.content.res.Resources getResources();
+ method public final boolean getRevealOnFocusHint();
method public final int getRight();
method protected float getRightFadingEdgeStrength();
method protected int getRightPaddingOffset();
@@ -45910,6 +45981,7 @@
method public void setPivotY(float);
method public void setPointerIcon(android.view.PointerIcon);
method public void setPressed(boolean);
+ method public final void setRevealOnFocusHint(boolean);
method public final void setRight(int);
method public void setRotation(float);
method public void setRotationX(float);
@@ -47834,7 +47906,7 @@
method public boolean clearMetaKeyStates(int);
method public void closeConnection();
method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public boolean commitText(java.lang.CharSequence, int);
method public boolean deleteSurroundingText(int, int);
@@ -48004,7 +48076,7 @@
method public abstract boolean clearMetaKeyStates(int);
method public abstract void closeConnection();
method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public abstract boolean commitText(java.lang.CharSequence, int);
method public abstract boolean deleteSurroundingText(int, int);
@@ -48030,6 +48102,7 @@
field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
+ field public static final int INPUT_CONTENT_GRANT_READ_URI_PERMISSION = 1; // 0x1
}
public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
@@ -48038,7 +48111,7 @@
method public boolean clearMetaKeyStates(int);
method public void closeConnection();
method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public boolean commitText(java.lang.CharSequence, int);
method public boolean deleteSurroundingText(int, int);
@@ -48362,7 +48435,7 @@
method public abstract java.lang.String getCookie(java.lang.String);
method public abstract java.lang.String getCookie(java.lang.String, boolean);
method public synchronized java.lang.String getCookie(android.net.WebAddress);
- method public static synchronized android.webkit.CookieManager getInstance();
+ method public static android.webkit.CookieManager getInstance();
method public abstract boolean hasCookies();
method public abstract boolean hasCookies(boolean);
method public abstract deprecated void removeAllCookie();
@@ -48379,8 +48452,8 @@
}
public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
- method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
- method public static synchronized android.webkit.CookieSyncManager getInstance();
+ method public static android.webkit.CookieSyncManager createInstance(android.content.Context);
+ method public static android.webkit.CookieSyncManager getInstance();
method protected deprecated void syncFromRamToFlash();
field protected static final java.lang.String LOGTAG = "websync";
field protected android.webkit.WebViewDatabase mDataBase;
@@ -54753,11 +54826,14 @@
public abstract class Process {
ctor public Process();
method public abstract void destroy();
+ method public java.lang.Process destroyForcibly();
method public abstract int exitValue();
method public abstract java.io.InputStream getErrorStream();
method public abstract java.io.InputStream getInputStream();
method public abstract java.io.OutputStream getOutputStream();
+ method public boolean isAlive();
method public abstract int waitFor() throws java.lang.InterruptedException;
+ method public boolean waitFor(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
}
public final class ProcessBuilder {
@@ -57057,6 +57133,7 @@
method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();
method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;
method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
@@ -57068,6 +57145,7 @@
method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);
method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
@@ -57136,6 +57214,7 @@
method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
@@ -57371,6 +57450,7 @@
method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;
method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.ServerSocket socket();
@@ -57386,6 +57466,7 @@
method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean finishConnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public abstract boolean isConnectionPending();
@@ -58622,9 +58703,7 @@
public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
ctor public KeyStore.PasswordProtection(char[]);
- method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
method public synchronized char[] getPassword();
- method public synchronized boolean isDestroyed();
}
public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -68368,8 +68447,8 @@
}
public abstract interface Destroyable {
- method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
- method public abstract boolean isDestroyed();
+ method public default void destroy() throws javax.security.auth.DestroyFailedException;
+ method public default boolean isDestroyed();
}
public final class PrivateCredentialPermission extends java.security.Permission {
diff --git a/api/system-removed.txt b/api/system-removed.txt
index f972b51..3811e22 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -425,12 +425,3 @@
}
-package com.android.internal {
-
- public static final class R.styleable {
- field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6
- field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5
- }
-
-}
-
diff --git a/api/test-current.txt b/api/test-current.txt
index 1e01020..881d290 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -2802,12 +2802,16 @@
method public android.os.Bundle addAccountFromCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle confirmCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle editProperties(android.accounts.AccountAuthenticatorResponse, java.lang.String);
+ method public android.os.Bundle finishSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public android.os.Bundle getAccountCredentialsForCloning(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException;
method public android.os.Bundle getAccountRemovalAllowed(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle getAuthToken(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract java.lang.String getAuthTokenLabel(java.lang.String);
method public final android.os.IBinder getIBinder();
method public abstract android.os.Bundle hasFeatures(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String[]) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle isCredentialsUpdateSuggested(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startAddAccountSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startUpdateCredentialsSession(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle updateCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
field public static final java.lang.String KEY_CUSTOM_TOKEN_EXPIRY = "android.accounts.expiry";
}
@@ -2845,6 +2849,7 @@
method public void clearPassword(android.accounts.Account);
method public android.accounts.AccountManagerFuture<android.os.Bundle> confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public static android.accounts.AccountManager get(android.content.Context);
method public android.accounts.Account[] getAccounts();
method public android.accounts.Account[] getAccountsByType(java.lang.String);
@@ -2860,6 +2865,7 @@
method public java.lang.String getUserData(android.accounts.Account, java.lang.String);
method public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
method public void invalidateAuthToken(java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<java.lang.Boolean> isCredentialsUpdateSuggested(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
method public static deprecated android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
method public boolean notifyAccountAuthenticated(android.accounts.Account);
@@ -2872,6 +2878,8 @@
method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);
method public void setPassword(android.accounts.Account, java.lang.String);
method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startAddAccountSession(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startUpdateCredentialsSession(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
field public static final java.lang.String ACTION_AUTHENTICATOR_INTENT = "android.accounts.AccountAuthenticator";
field public static final java.lang.String AUTHENTICATOR_ATTRIBUTES_NAME = "account-authenticator";
@@ -2888,6 +2896,8 @@
field public static final java.lang.String KEY_ACCOUNT_AUTHENTICATOR_RESPONSE = "accountAuthenticatorResponse";
field public static final java.lang.String KEY_ACCOUNT_MANAGER_RESPONSE = "accountManagerResponse";
field public static final java.lang.String KEY_ACCOUNT_NAME = "authAccount";
+ field public static final java.lang.String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
+ field public static final java.lang.String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
field public static final java.lang.String KEY_ACCOUNT_TYPE = "accountType";
field public static final java.lang.String KEY_ANDROID_PACKAGE_NAME = "androidPackageName";
field public static final java.lang.String KEY_AUTHENTICATOR_TYPES = "authenticator_types";
@@ -3707,6 +3717,7 @@
method public void moveTaskToFront(int, int);
method public void moveTaskToFront(int, int, android.os.Bundle);
method public deprecated void restartPackage(java.lang.String);
+ method public static void setVrThread(int);
method public void setWatchHeapLimit(long);
field public static final java.lang.String ACTION_REPORT_HEAP_LIMIT = "android.app.action.REPORT_HEAP_LIMIT";
field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1
@@ -9546,8 +9557,8 @@
method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
- method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
- method public boolean startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
+ method public void startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
+ method public void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}
@@ -10080,17 +10091,15 @@
method public android.content.ComponentName getActivity();
method public java.util.Set<java.lang.String> getCategories();
method public java.lang.CharSequence getDisabledMessage();
- method public int getDisabledMessageResourceId();
method public android.os.PersistableBundle getExtras();
method public java.lang.String getId();
method public android.content.Intent getIntent();
+ method public android.content.Intent[] getIntents();
method public long getLastChangedTimestamp();
method public java.lang.CharSequence getLongLabel();
- method public int getLongLabelResourceId();
method public java.lang.String getPackage();
method public int getRank();
method public java.lang.CharSequence getShortLabel();
- method public int getShortLabelResourceId();
method public android.os.UserHandle getUserHandle();
method public boolean hasKeyFieldsOnly();
method public boolean isDeclaredInManifest();
@@ -10104,7 +10113,6 @@
}
public static class ShortcutInfo.Builder {
- ctor public deprecated ShortcutInfo.Builder(android.content.Context);
ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
method public android.content.pm.ShortcutInfo build();
method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
@@ -10112,8 +10120,8 @@
method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);
method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
- method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);
method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
+ method public android.content.pm.ShortcutInfo.Builder setIntents(android.content.Intent[]);
method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
method public android.content.pm.ShortcutInfo.Builder setRank(int);
method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);
@@ -10123,17 +10131,15 @@
ctor public ShortcutManager(android.content.Context);
method public boolean addDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
method public void disableShortcuts(java.util.List<java.lang.String>);
- method public void disableShortcuts(java.util.List<java.lang.String>, int);
- method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.String);
+ method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.CharSequence);
method public void enableShortcuts(java.util.List<java.lang.String>);
method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
method public int getIconMaxHeight();
method public int getIconMaxWidth();
method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
- method public int getMaxShortcutCountForActivity();
+ method public int getMaxShortcutCountPerActivity();
method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
- method public long getRateLimitResetTime();
- method public int getRemainingCallCount();
+ method public boolean isRateLimitingActive();
method public void removeAllDynamicShortcuts();
method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
method public void reportShortcutUsed(java.lang.String);
@@ -10347,7 +10353,7 @@
}
public class Resources {
- ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
+ ctor public deprecated Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
method public final void finishPreloading();
method public final void flushLayoutCache();
method public android.content.res.XmlResourceParser getAnimation(int) throws android.content.res.Resources.NotFoundException;
@@ -10398,7 +10404,7 @@
method public android.content.res.AssetFileDescriptor openRawResourceFd(int) throws android.content.res.Resources.NotFoundException;
method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;
method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
- method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
+ method public deprecated void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
}
public static class Resources.NotFoundException extends java.lang.RuntimeException {
@@ -12303,6 +12309,7 @@
method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public float[] approximate(float);
method public void arcTo(android.graphics.RectF, float, float, boolean);
method public void arcTo(android.graphics.RectF, float, float);
method public void arcTo(float, float, float, float, float, float, boolean);
@@ -18877,7 +18884,6 @@
public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
ctor public InputMethodService();
method public deprecated boolean enableHardwareAcceleration();
- method public final boolean exposeContent(android.view.inputmethod.InputContentInfo, android.view.inputmethod.EditorInfo);
method public int getBackDisposition();
method public int getCandidatesHiddenVisibility();
method public android.view.inputmethod.InputBinding getCurrentInputBinding();
@@ -19735,6 +19741,7 @@
field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;
field public static final int ENCODING_AC3 = 5; // 0x5
field public static final int ENCODING_DEFAULT = 1; // 0x1
+ field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe
field public static final int ENCODING_DTS = 7; // 0x7
field public static final int ENCODING_DTS_HD = 8; // 0x8
field public static final int ENCODING_E_AC3 = 6; // 0x6
@@ -20218,6 +20225,7 @@
field public static final java.lang.String TAG_DATETIME = "DateTime";
field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
field public static final java.lang.String TAG_DATETIME_ORIGINAL = "DateTimeOriginal";
+ field public static final java.lang.String TAG_DEFAULT_CROP_SIZE = "DefaultCropSize";
field public static final java.lang.String TAG_DEVICE_SETTING_DESCRIPTION = "DeviceSettingDescription";
field public static final java.lang.String TAG_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";
field public static final java.lang.String TAG_EXIF_VERSION = "ExifVersion";
@@ -20283,7 +20291,12 @@
field public static final java.lang.String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";
field public static final java.lang.String TAG_METERING_MODE = "MeteringMode";
field public static final java.lang.String TAG_MODEL = "Model";
+ field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
field public static final java.lang.String TAG_OECF = "OECF";
+ field public static final java.lang.String TAG_ORF_ASPECT_FRAME = "AspectFrame";
+ field public static final java.lang.String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";
+ field public static final java.lang.String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";
+ field public static final java.lang.String TAG_ORF_THUMBNAIL_IMAGE = "ThumbnailImage";
field public static final java.lang.String TAG_ORIENTATION = "Orientation";
field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
field public static final java.lang.String TAG_PIXEL_X_DIMENSION = "PixelXDimension";
@@ -20294,6 +20307,12 @@
field public static final java.lang.String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
field public static final java.lang.String TAG_RESOLUTION_UNIT = "ResolutionUnit";
field public static final java.lang.String TAG_ROWS_PER_STRIP = "RowsPerStrip";
+ field public static final java.lang.String TAG_RW2_ISO = "ISO";
+ field public static final java.lang.String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";
+ field public static final java.lang.String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";
+ field public static final java.lang.String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";
field public static final java.lang.String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";
field public static final java.lang.String TAG_SATURATION = "Saturation";
field public static final java.lang.String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
@@ -20306,6 +20325,7 @@
field public static final java.lang.String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";
field public static final java.lang.String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";
field public static final java.lang.String TAG_STRIP_OFFSETS = "StripOffsets";
+ field public static final java.lang.String TAG_SUBFILE_TYPE = "SubfileType";
field public static final java.lang.String TAG_SUBJECT_AREA = "SubjectArea";
field public static final java.lang.String TAG_SUBJECT_DISTANCE = "SubjectDistance";
field public static final java.lang.String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";
@@ -28458,6 +28478,7 @@
field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
+ field public static final int N_MR1 = 25; // 0x19
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
@@ -29361,6 +29382,7 @@
method public android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites();
method public android.os.StrictMode.ThreadPolicy.Builder detectNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder detectResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectUnbufferedIo();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeath();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();
@@ -29373,6 +29395,7 @@
method public android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites();
method public android.os.StrictMode.ThreadPolicy.Builder permitNetwork();
method public android.os.StrictMode.ThreadPolicy.Builder permitResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitUnbufferedIo();
}
public static final class StrictMode.VmPolicy {
@@ -29452,6 +29475,7 @@
method public android.os.Bundle getUserRestrictions();
method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
method public boolean hasUserRestriction(java.lang.String);
+ method public boolean isDemoUser();
method public boolean isQuietModeEnabled(android.os.UserHandle);
method public boolean isSystemUser();
method public boolean isUserAGoat();
@@ -29691,6 +29715,7 @@
method public boolean isObbMounted(java.lang.String);
method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
+ field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";
}
public final class StorageVolume implements android.os.Parcelable {
@@ -32479,7 +32504,6 @@
field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
- field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";
field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";
@@ -34346,8 +34370,13 @@
method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);
method public static boolean isKeyAlgorithmSupported(java.lang.String);
- field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";
+ field public static final java.lang.String ACTION_KEY_ACCESS_CHANGED = "android.security.action.KEY_ACCESS_CHANGED";
+ field public static final deprecated java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String ACTION_TRUST_STORE_CHANGED = "android.security.action.TRUST_STORE_CHANGED";
field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";
+ field public static final java.lang.String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";
+ field public static final java.lang.String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";
field public static final java.lang.String EXTRA_NAME = "name";
field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";
}
@@ -34402,7 +34431,6 @@
public class NetworkSecurityPolicy {
method public static android.security.NetworkSecurityPolicy getInstance();
- method public void handleTrustStorageUpdate();
method public boolean isCleartextTrafficPermitted();
method public boolean isCleartextTrafficPermitted(java.lang.String);
}
@@ -34767,6 +34795,7 @@
field public static final java.lang.String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE";
field public static final java.lang.String EXTRA_RECENT = "android.service.media.extra.RECENT";
field public static final java.lang.String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED";
+ field public static final java.lang.String EXTRA_SUGGESTION_KEYWORDS = "android.service.media.extra.SUGGESTION_KEYWORDS";
}
public class MediaBrowserService.Result {
@@ -36314,7 +36343,7 @@
method public final void setConnectionTime(long);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
- method public final deprecated void setExtras(android.os.Bundle);
+ method public final void setExtras(android.os.Bundle);
method public final void setOnHold();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
@@ -36379,12 +36408,13 @@
method public final void setConnectionProperties(int);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
- method public final deprecated void setExtras(android.os.Bundle);
+ method public final void setExtras(android.os.Bundle);
method public final void setInitialized();
method public final void setInitializing();
method public final void setNextPostDialChar(char);
method public final void setOnHold();
method public final void setPostDialWait(java.lang.String);
+ method public final void setPulling();
method public final void setRingbackRequested(boolean);
method public final void setRinging();
method public final void setStatusHints(android.telecom.StatusHints);
@@ -36865,9 +36895,11 @@
field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";
+ field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";
field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
+ field public static final java.lang.String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";
field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
@@ -37454,26 +37486,6 @@
method public void onSubscriptionsChanged();
}
- public final class TelephonyHistogram implements android.os.Parcelable {
- ctor public TelephonyHistogram(int, int, int);
- ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);
- ctor public TelephonyHistogram(android.os.Parcel);
- method public void addTimeTaken(int);
- method public int describeContents();
- method public int getAverageTime();
- method public int getBucketCount();
- method public int[] getBucketCounters();
- method public int[] getBucketEndPoints();
- method public int getCategory();
- method public int getId();
- method public int getMaxTime();
- method public int getMinTime();
- method public int getSampleCount();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator<android.telephony.TelephonyHistogram> CREATOR;
- field public static final int TELEPHONY_CATEGORY_RIL = 1; // 0x1
- }
-
public class TelephonyManager {
method public boolean canChangeDtmfToneLength();
method public android.telephony.TelephonyManager createForSubscriptionId(int);
@@ -37504,7 +37516,6 @@
method public java.lang.String getSimSerialNumber();
method public int getSimState();
method public java.lang.String getSubscriberId();
- method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailNumber();
method public int getVoiceNetworkType();
@@ -38853,7 +38864,7 @@
}
public class TextUtils {
- method public static java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
+ method public static deprecated java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
method public static java.lang.CharSequence concat(java.lang.CharSequence...);
method public static void copySpansFrom(android.text.Spanned, int, int, java.lang.Class, android.text.Spannable, int);
method public static void dumpSpans(java.lang.CharSequence, android.util.Printer, java.lang.String);
@@ -38884,6 +38895,7 @@
method public static int lastIndexOf(java.lang.CharSequence, char);
method public static int lastIndexOf(java.lang.CharSequence, char, int);
method public static int lastIndexOf(java.lang.CharSequence, char, int, int);
+ method public static java.lang.CharSequence listEllipsize(android.content.Context, java.util.List<java.lang.CharSequence>, java.lang.String, android.text.TextPaint, float, int);
method public static boolean regionMatches(java.lang.CharSequence, int, java.lang.CharSequence, int, int);
method public static java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[]);
method public static java.lang.String[] split(java.lang.String, java.lang.String);
@@ -40558,6 +40570,7 @@
method public E get(long, E);
method public int indexOfKey(long);
method public int indexOfValue(E);
+ method public int indexOfValueByValue(E);
method public long keyAt(int);
method public void put(long, E);
method public void remove(long);
@@ -40760,6 +40773,7 @@
method public E get(int, E);
method public int indexOfKey(int);
method public int indexOfValue(E);
+ method public int indexOfValueByValue(E);
method public int keyAt(int);
method public void put(int, E);
method public void remove(int);
@@ -42600,6 +42614,7 @@
method public float getPivotY();
method public android.view.PointerIcon getPointerIcon();
method public android.content.res.Resources getResources();
+ method public final boolean getRevealOnFocusHint();
method public final int getRight();
method protected float getRightFadingEdgeStrength();
method protected int getRightPaddingOffset();
@@ -42887,6 +42902,7 @@
method public void setPivotY(float);
method public void setPointerIcon(android.view.PointerIcon);
method public void setPressed(boolean);
+ method public final void setRevealOnFocusHint(boolean);
method public final void setRight(int);
method public void setRotation(float);
method public void setRotationX(float);
@@ -44808,7 +44824,7 @@
method public boolean clearMetaKeyStates(int);
method public void closeConnection();
method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public boolean commitText(java.lang.CharSequence, int);
method public boolean deleteSurroundingText(int, int);
@@ -44978,7 +44994,7 @@
method public abstract boolean clearMetaKeyStates(int);
method public abstract void closeConnection();
method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public abstract boolean commitText(java.lang.CharSequence, int);
method public abstract boolean deleteSurroundingText(int, int);
@@ -45004,6 +45020,7 @@
field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
+ field public static final int INPUT_CONTENT_GRANT_READ_URI_PERMISSION = 1; // 0x1
}
public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
@@ -45012,7 +45029,7 @@
method public boolean clearMetaKeyStates(int);
method public void closeConnection();
method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
- method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
+ method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
method public boolean commitText(java.lang.CharSequence, int);
method public boolean deleteSurroundingText(int, int);
@@ -45333,7 +45350,7 @@
method public static boolean allowFileSchemeCookies();
method public abstract void flush();
method public abstract java.lang.String getCookie(java.lang.String);
- method public static synchronized android.webkit.CookieManager getInstance();
+ method public static android.webkit.CookieManager getInstance();
method public abstract boolean hasCookies();
method public abstract deprecated void removeAllCookie();
method public abstract void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>);
@@ -45348,8 +45365,8 @@
}
public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
- method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
- method public static synchronized android.webkit.CookieSyncManager getInstance();
+ method public static android.webkit.CookieSyncManager createInstance(android.content.Context);
+ method public static android.webkit.CookieSyncManager getInstance();
method protected deprecated void syncFromRamToFlash();
field protected static final java.lang.String LOGTAG = "websync";
field protected android.webkit.WebViewDatabase mDataBase;
@@ -48417,10 +48434,14 @@
ctor public TimePicker(android.content.Context, android.util.AttributeSet);
ctor public TimePicker(android.content.Context, android.util.AttributeSet, int);
ctor public TimePicker(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.view.View getAmView();
method public deprecated java.lang.Integer getCurrentHour();
method public deprecated java.lang.Integer getCurrentMinute();
method public int getHour();
+ method public android.view.View getHourView();
method public int getMinute();
+ method public android.view.View getMinuteView();
+ method public android.view.View getPmView();
method public boolean is24HourView();
method public deprecated void setCurrentHour(java.lang.Integer);
method public deprecated void setCurrentMinute(java.lang.Integer);
@@ -51377,11 +51398,14 @@
public abstract class Process {
ctor public Process();
method public abstract void destroy();
+ method public java.lang.Process destroyForcibly();
method public abstract int exitValue();
method public abstract java.io.InputStream getErrorStream();
method public abstract java.io.InputStream getInputStream();
method public abstract java.io.OutputStream getOutputStream();
+ method public boolean isAlive();
method public abstract int waitFor() throws java.lang.InterruptedException;
+ method public boolean waitFor(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
}
public final class ProcessBuilder {
@@ -53681,6 +53705,7 @@
method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();
method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;
method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
@@ -53692,6 +53717,7 @@
method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);
method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
@@ -53760,6 +53786,7 @@
method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
@@ -53995,6 +54022,7 @@
method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;
method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.ServerSocket socket();
@@ -54010,6 +54038,7 @@
method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean finishConnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public abstract boolean isConnectionPending();
@@ -55246,9 +55275,7 @@
public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
ctor public KeyStore.PasswordProtection(char[]);
- method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
method public synchronized char[] getPassword();
- method public synchronized boolean isDestroyed();
}
public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -64992,8 +65019,8 @@
}
public abstract interface Destroyable {
- method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
- method public abstract boolean isDestroyed();
+ method public default void destroy() throws javax.security.auth.DestroyFailedException;
+ method public default boolean isDestroyed();
}
public final class PrivateCredentialPermission extends java.security.Permission {
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 21b1716..94ba452 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -427,12 +427,3 @@
}
-package com.android.internal {
-
- public static final class R.styleable {
- field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6
- field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5
- }
-
-}
-
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index 8ccd5d2e..d6c0058 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -723,10 +723,10 @@
System.out.println("Complete");
}
mRepeat--;
- if (mRepeat > 1) {
+ if (mRepeat > 0) {
mAm.unhandledBack();
}
- } while (mRepeat > 1);
+ } while (mRepeat > 0);
}
private void runForceStop() throws Exception {
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 2e02382..72a21e3 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -299,8 +299,7 @@
}
if (!niceName.isEmpty()) {
- runtime.setArgv0(niceName.string());
- set_process_name(niceName.string());
+ runtime.setArgv0(niceName.string(), true /* setProcName */);
}
if (zygote) {
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index 7c8842c..3a92b9e 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -3,14 +3,16 @@
LOCAL_SRC_FILES:= \
bootanimation_main.cpp \
- AudioPlayer.cpp \
+ audioplay.cpp \
BootAnimation.cpp
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
-LOCAL_C_INCLUDES += external/tinyalsa/include
+LOCAL_C_INCLUDES += \
+ external/tinyalsa/include \
+ frameworks/wilhelm/include
LOCAL_SHARED_LIBRARIES := \
libcutils \
@@ -23,6 +25,7 @@
libEGL \
libGLESv1_CM \
libgui \
+ libOpenSLES \
libtinyalsa
LOCAL_MODULE:= bootanimation
diff --git a/cmds/bootanimation/AudioPlayer.cpp b/cmds/bootanimation/AudioPlayer.cpp
deleted file mode 100644
index 2932130..0000000
--- a/cmds/bootanimation/AudioPlayer.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_NDEBUG 0
-#define LOG_TAG "BootAnim_AudioPlayer"
-
-#include "AudioPlayer.h"
-
-#include <androidfw/ZipFileRO.h>
-#include <tinyalsa/asoundlib.h>
-#include <utils/Log.h>
-#include <utils/String8.h>
-
-#define ID_RIFF 0x46464952
-#define ID_WAVE 0x45564157
-#define ID_FMT 0x20746d66
-#define ID_DATA 0x61746164
-
-// Maximum line length for audio_conf.txt
-// We only accept lines less than this length to avoid overflows using sscanf()
-#define MAX_LINE_LENGTH 1024
-
-struct riff_wave_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t wave_id;
-};
-
-struct chunk_header {
- uint32_t id;
- uint32_t sz;
-};
-
-struct chunk_fmt {
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate;
- uint16_t block_align;
- uint16_t bits_per_sample;
-};
-
-
-namespace android {
-
-AudioPlayer::AudioPlayer()
- : mCard(-1),
- mDevice(-1),
- mPeriodSize(0),
- mPeriodCount(0),
- mCurrentFile(NULL)
-{
-}
-
-AudioPlayer::~AudioPlayer() {
-}
-
-static bool setMixerValue(struct mixer* mixer, const char* name, const char* values)
-{
- if (!mixer) {
- ALOGE("no mixer in setMixerValue");
- return false;
- }
- struct mixer_ctl *ctl = mixer_get_ctl_by_name(mixer, name);
- if (!ctl) {
- ALOGE("mixer_get_ctl_by_name failed for %s", name);
- return false;
- }
-
- enum mixer_ctl_type type = mixer_ctl_get_type(ctl);
- int numValues = mixer_ctl_get_num_values(ctl);
- int intValue;
- char stringValue[MAX_LINE_LENGTH];
-
- for (int i = 0; i < numValues && values; i++) {
- // strip leading space
- while (*values == ' ') values++;
- if (*values == 0) break;
-
- switch (type) {
- case MIXER_CTL_TYPE_BOOL:
- case MIXER_CTL_TYPE_INT:
- if (sscanf(values, "%d", &intValue) == 1) {
- if (mixer_ctl_set_value(ctl, i, intValue) != 0) {
- ALOGE("mixer_ctl_set_value failed for %s %d", name, intValue);
- }
- } else {
- ALOGE("Could not parse %s as int for %s", values, name);
- }
- break;
- case MIXER_CTL_TYPE_ENUM:
- if (sscanf(values, "%s", stringValue) == 1) {
- if (mixer_ctl_set_enum_by_string(ctl, stringValue) != 0) {
- ALOGE("mixer_ctl_set_enum_by_string failed for %s %s", name, stringValue);
- }
- } else {
- ALOGE("Could not parse %s as enum for %s", values, name);
- }
- break;
- default:
- ALOGE("unsupported mixer type %d for %s", type, name);
- break;
- }
-
- values = strchr(values, ' ');
- }
-
- return true;
-}
-
-
-/*
- * Parse the audio configuration file.
- * The file is named audio_conf.txt and must begin with the following header:
- *
- * card=<ALSA card number>
- * device=<ALSA device number>
- * period_size=<period size>
- * period_count=<period count>
- *
- * This header is followed by zero or more mixer settings, each with the format:
- * mixer "<name>" = <value list>
- * Since mixer names can contain spaces, the name must be enclosed in double quotes.
- * The values in the value list can be integers, booleans (represented by 0 or 1)
- * or strings for enum values.
- */
-bool AudioPlayer::init(const char* config)
-{
- int tempInt;
- struct mixer* mixer = NULL;
- char name[MAX_LINE_LENGTH];
-
- for (;;) {
- const char* endl = strstr(config, "\n");
- if (!endl) break;
- String8 line(config, endl - config);
- if (line.length() >= MAX_LINE_LENGTH) {
- ALOGE("Line too long in audio_conf.txt");
- return false;
- }
- const char* l = line.string();
-
- if (sscanf(l, "card=%d", &tempInt) == 1) {
- ALOGD("card=%d", tempInt);
- mCard = tempInt;
-
- mixer = mixer_open(mCard);
- if (!mixer) {
- ALOGE("could not open mixer for card %d", mCard);
- return false;
- }
- } else if (sscanf(l, "device=%d", &tempInt) == 1) {
- ALOGD("device=%d", tempInt);
- mDevice = tempInt;
- } else if (sscanf(l, "period_size=%d", &tempInt) == 1) {
- ALOGD("period_size=%d", tempInt);
- mPeriodSize = tempInt;
- } else if (sscanf(l, "period_count=%d", &tempInt) == 1) {
- ALOGD("period_count=%d", tempInt);
- mPeriodCount = tempInt;
- } else if (sscanf(l, "mixer \"%[0-9a-zA-Z _]s\"", name) == 1) {
- const char* values = strchr(l, '=');
- if (values) {
- values++; // skip '='
- ALOGD("name: \"%s\" = %s", name, values);
- setMixerValue(mixer, name, values);
- } else {
- ALOGE("values missing for name: \"%s\"", name);
- }
- }
- config = ++endl;
- }
-
- mixer_close(mixer);
-
- if (mCard >= 0 && mDevice >= 0) {
- return true;
- }
-
- return false;
-}
-
-void AudioPlayer::playFile(FileMap* fileMap) {
- // stop any currently playing sound
- requestExitAndWait();
-
- mCurrentFile = fileMap;
- run("bootanim audio", PRIORITY_URGENT_AUDIO);
-}
-
-bool AudioPlayer::threadLoop()
-{
- struct pcm_config config;
- struct pcm *pcm = NULL;
- bool moreChunks = true;
- const struct chunk_fmt* chunkFmt = NULL;
- int bufferSize;
- const uint8_t* wavData;
- size_t wavLength;
- const struct riff_wave_header* wavHeader;
-
- if (mCurrentFile == NULL) {
- ALOGE("mCurrentFile is NULL");
- return false;
- }
-
- wavData = (const uint8_t *)mCurrentFile->getDataPtr();
- if (!wavData) {
- ALOGE("Could not access WAV file data");
- goto exit;
- }
- wavLength = mCurrentFile->getDataLength();
-
- wavHeader = (const struct riff_wave_header *)wavData;
- if (wavLength < sizeof(*wavHeader) || (wavHeader->riff_id != ID_RIFF) ||
- (wavHeader->wave_id != ID_WAVE)) {
- ALOGE("Error: audio file is not a riff/wave file\n");
- goto exit;
- }
- wavData += sizeof(*wavHeader);
- wavLength -= sizeof(*wavHeader);
-
- do {
- const struct chunk_header* chunkHeader = (const struct chunk_header*)wavData;
- if (wavLength < sizeof(*chunkHeader)) {
- ALOGE("EOF reading chunk headers");
- goto exit;
- }
-
- wavData += sizeof(*chunkHeader);
- wavLength -= sizeof(*chunkHeader);
-
- switch (chunkHeader->id) {
- case ID_FMT:
- chunkFmt = (const struct chunk_fmt *)wavData;
- wavData += chunkHeader->sz;
- wavLength -= chunkHeader->sz;
- break;
- case ID_DATA:
- /* Stop looking for chunks */
- moreChunks = 0;
- break;
- default:
- /* Unknown chunk, skip bytes */
- wavData += chunkHeader->sz;
- wavLength -= chunkHeader->sz;
- }
- } while (moreChunks);
-
- if (!chunkFmt) {
- ALOGE("format not found in WAV file");
- goto exit;
- }
-
-
- memset(&config, 0, sizeof(config));
- config.channels = chunkFmt->num_channels;
- config.rate = chunkFmt->sample_rate;
- config.period_size = mPeriodSize;
- config.period_count = mPeriodCount;
- config.start_threshold = mPeriodSize / 4;
- config.stop_threshold = INT_MAX;
- config.avail_min = config.start_threshold;
- if (chunkFmt->bits_per_sample != 16) {
- ALOGE("only 16 bit WAV files are supported");
- goto exit;
- }
- config.format = PCM_FORMAT_S16_LE;
-
- pcm = pcm_open(mCard, mDevice, PCM_OUT, &config);
- if (!pcm || !pcm_is_ready(pcm)) {
- ALOGE("Unable to open PCM device (%s)\n", pcm_get_error(pcm));
- goto exit;
- }
-
- bufferSize = pcm_frames_to_bytes(pcm, pcm_get_buffer_size(pcm));
-
- while (wavLength > 0) {
- if (exitPending()) goto exit;
- size_t count = bufferSize;
- if (count > wavLength)
- count = wavLength;
-
- if (pcm_write(pcm, wavData, count)) {
- ALOGE("pcm_write failed (%s)", pcm_get_error(pcm));
- goto exit;
- }
- wavData += count;
- wavLength -= count;
- }
-
-exit:
- if (pcm)
- pcm_close(pcm);
- delete mCurrentFile;
- mCurrentFile = NULL;
- return false;
-}
-
-} // namespace android
diff --git a/cmds/bootanimation/AudioPlayer.h b/cmds/bootanimation/AudioPlayer.h
deleted file mode 100644
index 1def0ae..0000000
--- a/cmds/bootanimation/AudioPlayer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _BOOTANIMATION_AUDIOPLAYER_H
-#define _BOOTANIMATION_AUDIOPLAYER_H
-
-#include <utils/Thread.h>
-#include <utils/FileMap.h>
-
-namespace android {
-
-class AudioPlayer : public Thread
-{
-public:
- AudioPlayer();
- virtual ~AudioPlayer();
- bool init(const char* config);
-
- void playFile(FileMap* fileMap);
-
-private:
- virtual bool threadLoop();
-
-private:
- int mCard; // ALSA card to use
- int mDevice; // ALSA device to use
- int mPeriodSize;
- int mPeriodCount;
-
- FileMap* mCurrentFile;
-};
-
-} // namespace android
-
-#endif // _BOOTANIMATION_AUDIOPLAYER_H
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index e8fcd3b..3087098 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -49,8 +49,8 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <SkBitmap.h>
+#include <SkImage.h>
#include <SkStream.h>
-#include <SkImageDecoder.h>
#pragma GCC diagnostic pop
#include <GLES/gl.h>
@@ -58,7 +58,7 @@
#include <EGL/eglext.h>
#include "BootAnimation.h"
-#include "AudioPlayer.h"
+#include "audioplay.h"
namespace android {
@@ -72,6 +72,8 @@
static const char LAST_TIME_CHANGED_FILE_PATH[] = "/data/system/time/last_time_change";
static const char ACCURATE_TIME_FLAG_FILE_NAME[] = "time_is_accurate";
static const char ACCURATE_TIME_FLAG_FILE_PATH[] = "/data/system/time/time_is_accurate";
+// Java timestamp format. Don't show the clock if the date is before 2000-01-01 00:00:00.
+static const long long ACCURATE_TIME_EPOCH = 946684800000;
static const char EXIT_PROP_NAME[] = "service.bootanim.exit";
static const int ANIM_ENTRY_NAME_MAX = 256;
@@ -106,9 +108,7 @@
// might be blocked on a condition variable that will never be updated.
kill( getpid(), SIGKILL );
requestExit();
- if (mAudioPlayer != NULL) {
- mAudioPlayer->requestExit();
- }
+ audioplay::destroy();
}
status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,
@@ -117,8 +117,10 @@
if (asset == NULL)
return NO_INIT;
SkBitmap bitmap;
- SkImageDecoder::DecodeMemory(asset->getBuffer(false), asset->getLength(),
- &bitmap, kUnknown_SkColorType, SkImageDecoder::kDecodePixels_Mode);
+ sk_sp<SkData> data = SkData::MakeWithoutCopy(asset->getBuffer(false),
+ asset->getLength());
+ sk_sp<SkImage> image = SkImage::MakeFromEncoded(data);
+ image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode);
asset->close();
delete asset;
@@ -171,15 +173,10 @@
//StopWatch watch("blah");
SkBitmap bitmap;
- SkMemoryStream stream(frame.map->getDataPtr(), frame.map->getDataLength());
- SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
- if (codec != NULL) {
- codec->setDitherImage(false);
- codec->decode(&stream, &bitmap,
- kN32_SkColorType,
- SkImageDecoder::kDecodePixels_Mode);
- delete codec;
- }
+ sk_sp<SkData> data = SkData::MakeWithoutCopy(frame.map->getDataPtr(),
+ frame.map->getDataLength());
+ sk_sp<SkImage> image = SkImage::MakeFromEncoded(data);
+ image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode);
// FileMap memory is never released until application exit.
// Release it now as the texture is already loaded and the memory used for
@@ -202,25 +199,25 @@
switch (bitmap.colorType()) {
case kN32_SkColorType:
- if (tw != w || th != h) {
+ if (!mUseNpotTextures && (tw != w || th != h)) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,
GL_UNSIGNED_BYTE, 0);
glTexSubImage2D(GL_TEXTURE_2D, 0,
0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, p);
} else {
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
GL_UNSIGNED_BYTE, p);
}
break;
case kRGB_565_SkColorType:
- if (tw != w || th != h) {
+ if (!mUseNpotTextures && (tw != w || th != h)) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,
GL_UNSIGNED_SHORT_5_6_5, 0);
glTexSubImage2D(GL_TEXTURE_2D, 0,
0, 0, w, h, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, p);
} else {
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB,
GL_UNSIGNED_SHORT_5_6_5, p);
}
break;
@@ -323,6 +320,7 @@
mFlingerSurface.clear();
mFlingerSurfaceControl.clear();
eglTerminate(mDisplay);
+ eglReleaseThread();
IPCThreadState::self()->stopProcess();
return r;
}
@@ -400,9 +398,6 @@
int exitnow = atoi(value);
if (exitnow) {
requestExit();
- if (mAudioPlayer != NULL) {
- mAudioPlayer->requestExit();
- }
}
}
@@ -524,16 +519,6 @@
}
char const* s = desString.string();
- // Create and initialize an AudioPlayer if we have an audio_conf.txt file
- String8 audioConf;
- if (readFile(animation.zip, "audio_conf.txt", audioConf)) {
- mAudioPlayer = new AudioPlayer;
- if (!mAudioPlayer->init(audioConf.string())) {
- ALOGE("mAudioPlayer.init failed");
- mAudioPlayer = NULL;
- }
- }
-
// Parse the description file
for (;;) {
const char* endl = strstr(s, "\n");
@@ -564,7 +549,7 @@
part.pause = pause;
part.path = path;
part.clockPosY = clockPosY;
- part.audioFile = NULL;
+ part.audioData = NULL;
part.animation = NULL;
if (!parseColor(color, part.backgroundColor)) {
ALOGE("> invalid color '#%s'", color);
@@ -580,7 +565,7 @@
part.playUntilComplete = false;
part.count = 1;
part.pause = 0;
- part.audioFile = NULL;
+ part.audioData = NULL;
part.animation = loadAnimation(String8(SYSTEM_BOOTANIMATION_FILE));
if (part.animation != NULL)
animation.parts.add(part);
@@ -596,15 +581,16 @@
// read all the data structures
const size_t pcount = animation.parts.size();
void *cookie = NULL;
- ZipFileRO* mZip = animation.zip;
- if (!mZip->startIteration(&cookie)) {
+ ZipFileRO* zip = animation.zip;
+ if (!zip->startIteration(&cookie)) {
return false;
}
+ Animation::Part* partWithAudio = NULL;
ZipEntryRO entry;
char name[ANIM_ENTRY_NAME_MAX];
- while ((entry = mZip->nextEntry(cookie)) != NULL) {
- const int foundEntryName = mZip->getEntryFileName(entry, name, ANIM_ENTRY_NAME_MAX);
+ while ((entry = zip->nextEntry(cookie)) != NULL) {
+ const int foundEntryName = zip->getEntryFileName(entry, name, ANIM_ENTRY_NAME_MAX);
if (foundEntryName > ANIM_ENTRY_NAME_MAX || foundEntryName == -1) {
ALOGE("Error fetching entry file name");
continue;
@@ -614,25 +600,36 @@
const String8 path(entryName.getPathDir());
const String8 leaf(entryName.getPathLeaf());
if (leaf.size() > 0) {
- for (size_t j=0 ; j<pcount ; j++) {
+ for (size_t j = 0; j < pcount; j++) {
if (path == animation.parts[j].path) {
uint16_t method;
// supports only stored png files
- if (mZip->getEntryInfo(entry, &method, NULL, NULL, NULL, NULL, NULL)) {
+ if (zip->getEntryInfo(entry, &method, NULL, NULL, NULL, NULL, NULL)) {
if (method == ZipFileRO::kCompressStored) {
- FileMap* map = mZip->createEntryFileMap(entry);
+ FileMap* map = zip->createEntryFileMap(entry);
if (map) {
Animation::Part& part(animation.parts.editItemAt(j));
if (leaf == "audio.wav") {
// a part may have at most one audio file
- part.audioFile = map;
+ part.audioData = (uint8_t *)map->getDataPtr();
+ part.audioLength = map->getDataLength();
+ partWithAudio = ∂
+ } else if (leaf == "trim.txt") {
+ part.trimData.setTo((char const*)map->getDataPtr(),
+ map->getDataLength());
} else {
Animation::Frame frame;
frame.name = leaf;
frame.map = map;
+ frame.trimWidth = animation.width;
+ frame.trimHeight = animation.height;
+ frame.trimX = 0;
+ frame.trimY = 0;
part.frames.add(frame);
}
}
+ } else {
+ ALOGE("bootanimation.zip is compressed; must be only stored");
}
}
}
@@ -640,7 +637,41 @@
}
}
- mZip->endIteration(cookie);
+ // If there is trimData present, override the positioning defaults.
+ for (Animation::Part& part : animation.parts) {
+ const char* trimDataStr = part.trimData.string();
+ for (size_t frameIdx = 0; frameIdx < part.frames.size(); frameIdx++) {
+ const char* endl = strstr(trimDataStr, "\n");
+ // No more trimData for this part.
+ if (endl == NULL) {
+ break;
+ }
+ String8 line(trimDataStr, endl - trimDataStr);
+ const char* lineStr = line.string();
+ trimDataStr = ++endl;
+ int width = 0, height = 0, x = 0, y = 0;
+ if (sscanf(lineStr, "%dx%d+%d+%d", &width, &height, &x, &y) == 4) {
+ Animation::Frame& frame(part.frames.editItemAt(frameIdx));
+ frame.trimWidth = width;
+ frame.trimHeight = height;
+ frame.trimX = x;
+ frame.trimY = y;
+ } else {
+ ALOGE("Error parsing trim.txt, line: %s", lineStr);
+ break;
+ }
+ }
+ }
+
+ // Create and initialize audioplay if there is a wav file in any of the animations.
+ if (partWithAudio != NULL) {
+ ALOGD("found audio.wav, creating playback engine");
+ if (!audioplay::create(partWithAudio->audioData, partWithAudio->audioLength)) {
+ return false;
+ }
+ }
+
+ zip->endIteration(cookie);
return true;
}
@@ -662,6 +693,20 @@
mClockEnabled = false;
}
+ // Check if npot textures are supported
+ mUseNpotTextures = false;
+ String8 gl_extensions;
+ const char* exts = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
+ if (!exts) {
+ glGetError();
+ } else {
+ gl_extensions.setTo(exts);
+ if ((gl_extensions.find("GL_ARB_texture_non_power_of_two") != -1) ||
+ (gl_extensions.find("GL_OES_texture_npot") != -1)) {
+ mUseNpotTextures = true;
+ }
+ }
+
// Blend required to draw time on top of animation frames.
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glShadeModel(GL_FLAT);
@@ -707,12 +752,9 @@
bool BootAnimation::playAnimation(const Animation& animation)
{
const size_t pcount = animation.parts.size();
- const int xc = (mWidth - animation.width) / 2;
- const int yc = ((mHeight - animation.height) / 2);
nsecs_t frameDuration = s2ns(1) / animation.fps;
-
- Region clearReg(Rect(mWidth, mHeight));
- clearReg.subtractSelf(Rect(xc, yc, xc+animation.width, yc+animation.height));
+ const int animationX = (mWidth - animation.width) / 2;
+ const int animationY = (mHeight - animation.height) / 2;
for (size_t i=0 ; i<pcount ; i++) {
const Animation::Part& part(animation.parts[i]);
@@ -733,8 +775,9 @@
break;
// only play audio file the first time we animate the part
- if (r == 0 && mAudioPlayer != NULL && part.audioFile) {
- mAudioPlayer->playFile(part.audioFile);
+ if (r == 0 && part.audioData) {
+ ALOGD("playing clip for part%d, size=%d", (int) i, part.audioLength);
+ audioplay::playClip(part.audioData, part.audioLength);
}
glClearColor(
@@ -759,22 +802,25 @@
initTexture(frame);
}
+ const int xc = animationX + frame.trimX;
+ const int yc = animationY + frame.trimY;
+ Region clearReg(Rect(mWidth, mHeight));
+ clearReg.subtractSelf(Rect(xc, yc, xc+frame.trimWidth, yc+frame.trimHeight));
if (!clearReg.isEmpty()) {
Region::const_iterator head(clearReg.begin());
Region::const_iterator tail(clearReg.end());
glEnable(GL_SCISSOR_TEST);
while (head != tail) {
const Rect& r2(*head++);
- glScissor(r2.left, mHeight - r2.bottom,
- r2.width(), r2.height());
+ glScissor(r2.left, mHeight - r2.bottom, r2.width(), r2.height());
glClear(GL_COLOR_BUFFER_BIT);
}
glDisable(GL_SCISSOR_TEST);
}
- // specify the y center as ceiling((mHeight - animation.height) / 2)
- // which is equivalent to mHeight - (yc + animation.height)
- glDrawTexiOES(xc, mHeight - (yc + animation.height),
- 0, animation.width, animation.height);
+ // specify the y center as ceiling((mHeight - frame.trimHeight) / 2)
+ // which is equivalent to mHeight - (yc + frame.trimHeight)
+ glDrawTexiOES(xc, mHeight - (yc + frame.trimHeight),
+ 0, frame.trimWidth, frame.trimHeight);
if (mClockEnabled && mTimeIsAccurate && part.clockPosY >= 0) {
drawTime(mClock, part.clockPosY);
}
@@ -806,14 +852,23 @@
break;
}
- // free the textures for this part
+ }
+
+ // Free textures created for looping parts now that the animation is done.
+ for (const Animation::Part& part : animation.parts) {
if (part.count != 1) {
- for (size_t j=0 ; j<fcount ; j++) {
+ const size_t fcount = part.frames.size();
+ for (size_t j = 0; j < fcount; j++) {
const Animation::Frame& frame(part.frames[j]);
glDeleteTextures(1, &frame.tid);
}
}
}
+
+ // we've finally played everything we're going to play
+ audioplay::setPlaying(false);
+ audioplay::destroy();
+
return true;
}
@@ -849,7 +904,10 @@
mLoadedFiles.add(animation->fileName);
parseAnimationDesc(*animation);
- preloadZip(*animation);
+ if (!preloadZip(*animation)) {
+ return NULL;
+ }
+
mLoadedFiles.remove(fn);
return animation;
@@ -879,8 +937,9 @@
clock_gettime(CLOCK_REALTIME, &now);
// Match the Java timestamp format
long long rtcNow = (now.tv_sec * 1000LL) + (now.tv_nsec / 1000000LL);
- if (lastChangedTime > rtcNow - MAX_TIME_IN_PAST
- && lastChangedTime < rtcNow + MAX_TIME_IN_FUTURE) {
+ if (ACCURATE_TIME_EPOCH < rtcNow
+ && lastChangedTime > (rtcNow - MAX_TIME_IN_PAST)
+ && lastChangedTime < (rtcNow + MAX_TIME_IN_FUTURE)) {
mTimeIsAccurate = true;
}
}
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index 1c3d53a..a53216e 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -30,7 +30,6 @@
namespace android {
-class AudioPlayer;
class Surface;
class SurfaceComposerClient;
class SurfaceControl;
@@ -79,6 +78,10 @@
struct Frame {
String8 name;
FileMap* map;
+ int trimX;
+ int trimY;
+ int trimWidth;
+ int trimHeight;
mutable GLuint tid;
bool operator < (const Frame& rhs) const {
return name < rhs.name;
@@ -90,10 +93,12 @@
int clockPosY; // The y position of the clock, in pixels, from the bottom of the
// display (the clock is centred horizontally). -1 to disable the clock
String8 path;
+ String8 trimData;
SortedVector<Frame> frames;
bool playUntilComplete;
float backgroundColor[3];
- FileMap* audioFile;
+ uint8_t* audioData;
+ int audioLength;
Animation* animation;
};
int fps;
@@ -119,12 +124,12 @@
void checkExit();
sp<SurfaceComposerClient> mSession;
- sp<AudioPlayer> mAudioPlayer;
AssetManager mAssets;
Texture mAndroid[2];
Texture mClock;
int mWidth;
int mHeight;
+ bool mUseNpotTextures = false;
EGLDisplay mDisplay;
EGLDisplay mContext;
EGLDisplay mSurface;
diff --git a/cmds/bootanimation/FORMAT.md b/cmds/bootanimation/FORMAT.md
new file mode 100644
index 0000000..9ea6fea
--- /dev/null
+++ b/cmds/bootanimation/FORMAT.md
@@ -0,0 +1,101 @@
+# bootanimation format
+
+## zipfile paths
+
+The system selects a boot animation zipfile from the following locations, in order:
+
+ /system/media/bootanimation-encrypted.zip (if getprop("vold.decrypt") = '1')
+ /system/media/bootanimation.zip
+ /oem/media/bootanimation.zip
+
+## zipfile layout
+
+The `bootanimation.zip` archive file includes:
+
+ desc.txt - a text file
+ part0 \
+ part1 \ directories full of PNG frames
+ ... /
+ partN /
+
+## desc.txt format
+
+The first line defines the general parameters of the animation:
+
+ WIDTH HEIGHT FPS
+
+ * **WIDTH:** animation width (pixels)
+ * **HEIGHT:** animation height (pixels)
+ * **FPS:** frames per second, e.g. 60
+
+It is followed by a number of rows of the form:
+
+ TYPE COUNT PAUSE PATH [#RGBHEX CLOCK]
+
+ * **TYPE:** a single char indicating what type of animation segment this is:
+ + `p` -- this part will play unless interrupted by the end of the boot
+ + `c` -- this part will play to completion, no matter what
+ * **COUNT:** how many times to play the animation, or 0 to loop forever until boot is complete
+ * **PAUSE:** number of FRAMES to delay after this part ends
+ * **PATH:** directory in which to find the frames for this part (e.g. `part0`)
+ * **RGBHEX:** _(OPTIONAL)_ a background color, specified as `#RRGGBB`
+ * **CLOCK:** _(OPTIONAL)_ the y-coordinate at which to draw the current time (for watches)
+
+There is also a special TYPE, `$SYSTEM`, that loads `/system/media/bootanimation.zip`
+and plays that.
+
+## loading and playing frames
+
+Each part is scanned and loaded directly from the zip archive. Within a part directory, every file
+(except `trim.txt` and `audio.wav`; see next sections) is expected to be a PNG file that represents
+one frame in that part (at the specified resolution). For this reason it is important that frames be
+named sequentially (e.g. `part000.png`, `part001.png`, ...) and added to the zip archive in that
+order.
+
+## trim.txt
+
+To save on memory, textures may be trimmed by their background color. trim.txt sequentially lists
+the trim output for each frame in its directory, so the frames may be properly positioned.
+Output should be of the form: `WxH+X+Y`. Example:
+
+ 713x165+388+914
+ 708x152+388+912
+ 707x139+388+911
+ 649x92+388+910
+
+If the file is not present, each frame is assumed to be the same size as the animation.
+
+## audio.wav
+
+Each part may optionally play a `wav` sample when it starts. To enable this, add a file
+with the name `audio.wav` in the part directory.
+
+## exiting
+
+The system will end the boot animation (first completing any incomplete or even entirely unplayed
+parts that are of type `c`) when the system is finished booting. (This is accomplished by setting
+the system property `service.bootanim.exit` to a nonzero string.)
+
+## protips
+
+### PNG compression
+
+Use `zopflipng` if you have it, otherwise `pngcrush` will do. e.g.:
+
+ for fn in *.png ; do
+ zopflipng -m ${fn}s ${fn}s.new && mv -f ${fn}s.new ${fn}
+ # or: pngcrush -q ....
+ done
+
+Some animations benefit from being reduced to 256 colors:
+
+ pngquant --force --ext .png *.png
+ # alternatively: mogrify -colors 256 anim-tmp/*/*.png
+
+### creating the ZIP archive
+
+ cd <path-to-pieces>
+ zip -0qry -i \*.txt \*.png \*.wav @ ../bootanimation.zip *.txt part*
+
+Note that the ZIP archive is not actually compressed! The PNG files are already as compressed
+as they can reasonably get, and there is unlikely to be any redundancy between files.
diff --git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp
new file mode 100644
index 0000000..4983b9a
--- /dev/null
+++ b/cmds/bootanimation/audioplay.cpp
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// cribbed from samples/native-audio
+
+#include "audioplay.h"
+
+#define CHATTY ALOGD
+#define LOG_TAG "audioplay"
+
+#include <string.h>
+
+#include <utils/Log.h>
+
+// for native audio
+#include <SLES/OpenSLES.h>
+#include <SLES/OpenSLES_Android.h>
+
+namespace audioplay {
+namespace {
+
+// engine interfaces
+static SLObjectItf engineObject = NULL;
+static SLEngineItf engineEngine;
+
+// output mix interfaces
+static SLObjectItf outputMixObject = NULL;
+
+// buffer queue player interfaces
+static SLObjectItf bqPlayerObject = NULL;
+static SLPlayItf bqPlayerPlay;
+static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue;
+static SLMuteSoloItf bqPlayerMuteSolo;
+static SLVolumeItf bqPlayerVolume;
+
+// pointer and size of the next player buffer to enqueue, and number of remaining buffers
+static const uint8_t* nextBuffer;
+static unsigned nextSize;
+
+static const uint32_t ID_RIFF = 0x46464952;
+static const uint32_t ID_WAVE = 0x45564157;
+static const uint32_t ID_FMT = 0x20746d66;
+static const uint32_t ID_DATA = 0x61746164;
+
+struct RiffWaveHeader {
+ uint32_t riff_id;
+ uint32_t riff_sz;
+ uint32_t wave_id;
+};
+
+struct ChunkHeader {
+ uint32_t id;
+ uint32_t sz;
+};
+
+struct ChunkFormat {
+ uint16_t audio_format;
+ uint16_t num_channels;
+ uint32_t sample_rate;
+ uint32_t byte_rate;
+ uint16_t block_align;
+ uint16_t bits_per_sample;
+};
+
+// this callback handler is called every time a buffer finishes playing
+void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
+ (void)bq;
+ (void)context;
+ audioplay::setPlaying(false);
+}
+
+bool hasPlayer() {
+ return (engineObject != NULL && bqPlayerObject != NULL);
+}
+
+// create the engine and output mix objects
+bool createEngine() {
+ SLresult result;
+
+ // create engine
+ result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("slCreateEngine failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // realize the engine
+ result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl engine Realize failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // get the engine interface, which is needed in order to create other objects
+ result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl engine GetInterface failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // create output mix
+ result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, NULL, NULL);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl engine CreateOutputMix failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // realize the output mix
+ result = (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl outputMix Realize failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ return true;
+}
+
+// create buffer queue audio player
+bool createBufferQueueAudioPlayer(const ChunkFormat* chunkFormat) {
+ SLresult result;
+
+ // configure audio source
+ SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
+
+ SLDataFormat_PCM format_pcm = {
+ SL_DATAFORMAT_PCM,
+ chunkFormat->num_channels,
+ chunkFormat->sample_rate * 1000, // convert to milliHz
+ chunkFormat->bits_per_sample,
+ 16,
+ SL_SPEAKER_FRONT_CENTER,
+ SL_BYTEORDER_LITTLEENDIAN
+ };
+ SLDataSource audioSrc = {&loc_bufq, &format_pcm};
+
+ // configure audio sink
+ SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
+ SLDataSink audioSnk = {&loc_outmix, NULL};
+
+ // create audio player
+ const SLInterfaceID ids[3] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME, SL_IID_ANDROIDCONFIGURATION};
+ const SLboolean req[3] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
+ result = (*engineEngine)->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk,
+ 3, ids, req);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl CreateAudioPlayer failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // Use the System stream for boot sound playback.
+ SLAndroidConfigurationItf playerConfig;
+ result = (*bqPlayerObject)->GetInterface(bqPlayerObject,
+ SL_IID_ANDROIDCONFIGURATION, &playerConfig);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("config GetInterface failed with result %d", result);
+ return false;
+ }
+ SLint32 streamType = SL_ANDROID_STREAM_SYSTEM;
+ result = (*playerConfig)->SetConfiguration(playerConfig,
+ SL_ANDROID_KEY_STREAM_TYPE, &streamType, sizeof(SLint32));
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("SetConfiguration failed with result %d", result);
+ return false;
+ }
+ // use normal performance mode as low latency is not needed. This is not mandatory so
+ // do not bail if we fail
+ SLuint32 performanceMode = SL_ANDROID_PERFORMANCE_NONE;
+ result = (*playerConfig)->SetConfiguration(
+ playerConfig, SL_ANDROID_KEY_PERFORMANCE_MODE, &performanceMode, sizeof(SLuint32));
+ ALOGW_IF(result != SL_RESULT_SUCCESS,
+ "could not set performance mode on player, error %d", result);
+ (void)result;
+
+ // realize the player
+ result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl player Realize failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // get the play interface
+ result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_PLAY, &bqPlayerPlay);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl player GetInterface failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // get the buffer queue interface
+ result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE,
+ &bqPlayerBufferQueue);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl playberBufferQueue GetInterface failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // register callback on the buffer queue
+ result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, NULL);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl bqPlayerBufferQueue RegisterCallback failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // get the volume interface
+ result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_VOLUME, &bqPlayerVolume);
+ if (result != SL_RESULT_SUCCESS) {
+ ALOGE("sl volume GetInterface failed with result %d", result);
+ return false;
+ }
+ (void)result;
+
+ // set the player's state to playing
+ audioplay::setPlaying(true);
+ CHATTY("Created buffer queue player: %p", bqPlayerBufferQueue);
+ return true;
+}
+
+bool parseClipBuf(const uint8_t* clipBuf, int clipBufSize, const ChunkFormat** oChunkFormat,
+ const uint8_t** oSoundBuf, unsigned* oSoundBufSize) {
+ *oSoundBuf = clipBuf;
+ *oSoundBufSize = clipBufSize;
+ *oChunkFormat = NULL;
+ const RiffWaveHeader* wavHeader = (const RiffWaveHeader*)*oSoundBuf;
+ if (*oSoundBufSize < sizeof(*wavHeader) || (wavHeader->riff_id != ID_RIFF) ||
+ (wavHeader->wave_id != ID_WAVE)) {
+ ALOGE("Error: audio file is not a riff/wave file\n");
+ return false;
+ }
+ *oSoundBuf += sizeof(*wavHeader);
+ *oSoundBufSize -= sizeof(*wavHeader);
+
+ while (true) {
+ const ChunkHeader* chunkHeader = (const ChunkHeader*)*oSoundBuf;
+ if (*oSoundBufSize < sizeof(*chunkHeader)) {
+ ALOGE("EOF reading chunk headers");
+ return false;
+ }
+
+ *oSoundBuf += sizeof(*chunkHeader);
+ *oSoundBufSize -= sizeof(*chunkHeader);
+
+ bool endLoop = false;
+ switch (chunkHeader->id) {
+ case ID_FMT:
+ *oChunkFormat = (const ChunkFormat*)*oSoundBuf;
+ *oSoundBuf += chunkHeader->sz;
+ *oSoundBufSize -= chunkHeader->sz;
+ break;
+ case ID_DATA:
+ /* Stop looking for chunks */
+ *oSoundBufSize = chunkHeader->sz;
+ endLoop = true;
+ break;
+ default:
+ /* Unknown chunk, skip bytes */
+ *oSoundBuf += chunkHeader->sz;
+ *oSoundBufSize -= chunkHeader->sz;
+ }
+ if (endLoop) {
+ break;
+ }
+ }
+
+ if (*oChunkFormat == NULL) {
+ ALOGE("format not found in WAV file");
+ return false;
+ }
+ return true;
+}
+
+} // namespace
+
+bool create(const uint8_t* exampleClipBuf, int exampleClipBufSize) {
+ if (!createEngine()) {
+ return false;
+ }
+
+ // Parse the example clip.
+ const ChunkFormat* chunkFormat;
+ const uint8_t* soundBuf;
+ unsigned soundBufSize;
+ if (!parseClipBuf(exampleClipBuf, exampleClipBufSize, &chunkFormat, &soundBuf, &soundBufSize)) {
+ return false;
+ }
+
+ // Initialize the BufferQueue based on this clip's format.
+ if (!createBufferQueueAudioPlayer(chunkFormat)) {
+ return false;
+ }
+ return true;
+}
+
+bool playClip(const uint8_t* buf, int size) {
+ // Parse the WAV header
+ const ChunkFormat* chunkFormat;
+ if (!parseClipBuf(buf, size, &chunkFormat, &nextBuffer, &nextSize)) {
+ return false;
+ }
+
+ if (!hasPlayer()) {
+ ALOGD("cannot play clip %p without a player", buf);
+ return false;
+ }
+
+ CHATTY("playClip on player %p: buf=%p size=%d nextSize %d",
+ bqPlayerBufferQueue, buf, size, nextSize);
+
+ if (nextSize > 0) {
+ // here we only enqueue one buffer because it is a long clip,
+ // but for streaming playback we would typically enqueue at least 2 buffers to start
+ SLresult result;
+ result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, nextBuffer, nextSize);
+ if (SL_RESULT_SUCCESS != result) {
+ return false;
+ }
+ audioplay::setPlaying(true);
+ }
+
+ return true;
+}
+
+// set the playing state for the buffer queue audio player
+void setPlaying(bool isPlaying) {
+ if (!hasPlayer()) return;
+
+ SLresult result;
+
+ if (NULL != bqPlayerPlay) {
+ // set the player's state
+ result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay,
+ isPlaying ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_STOPPED);
+ }
+
+}
+
+void destroy() {
+ // destroy buffer queue audio player object, and invalidate all associated interfaces
+ if (bqPlayerObject != NULL) {
+ CHATTY("destroying audio player");
+ (*bqPlayerObject)->Destroy(bqPlayerObject);
+ bqPlayerObject = NULL;
+ bqPlayerPlay = NULL;
+ bqPlayerBufferQueue = NULL;
+ bqPlayerMuteSolo = NULL;
+ bqPlayerVolume = NULL;
+ }
+
+ // destroy output mix object, and invalidate all associated interfaces
+ if (outputMixObject != NULL) {
+ (*outputMixObject)->Destroy(outputMixObject);
+ outputMixObject = NULL;
+ }
+
+ // destroy engine object, and invalidate all associated interfaces
+ if (engineObject != NULL) {
+ CHATTY("destroying audio engine");
+ (*engineObject)->Destroy(engineObject);
+ engineObject = NULL;
+ engineEngine = NULL;
+ }
+}
+
+} // namespace audioplay
diff --git a/cmds/bootanimation/audioplay.h b/cmds/bootanimation/audioplay.h
new file mode 100644
index 0000000..0e5705a
--- /dev/null
+++ b/cmds/bootanimation/audioplay.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef AUDIOPLAY_H_
+#define AUDIOPLAY_H_
+
+#include <string.h>
+
+namespace audioplay {
+
+// Initializes the engine with an example of the type of WAV clip to play.
+// All buffers passed to playClip are assumed to be in the same format.
+bool create(const uint8_t* exampleClipBuf, int exampleClipBufSize);
+
+// Plays a WAV contained in buf.
+// Should not be called while a clip is still playing.
+bool playClip(const uint8_t* buf, int size);
+void setPlaying(bool isPlaying);
+void destroy();
+
+}
+
+#endif // AUDIOPLAY_H_
diff --git a/cmds/bootanimation/bootanim.rc b/cmds/bootanimation/bootanim.rc
index ee0d0b8..7344ba7 100644
--- a/cmds/bootanimation/bootanim.rc
+++ b/cmds/bootanimation/bootanim.rc
@@ -4,3 +4,4 @@
group graphics audio
disabled
oneshot
+ writepid /dev/stune/top-app/tasks
\ No newline at end of file
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index c6834f9..32a8088 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -922,6 +922,8 @@
flags |= UserInfo.FLAG_EPHEMERAL;
} else if ("--guest".equals(opt)) {
flags |= UserInfo.FLAG_GUEST;
+ } else if ("--demo".equals(opt)) {
+ flags |= UserInfo.FLAG_DEMO;
} else {
System.err.println("Error: unknown option " + opt);
return showUsage();
diff --git a/core/java/android/accounts/AbstractAccountAuthenticator.java b/core/java/android/accounts/AbstractAccountAuthenticator.java
index 4dca8e2..c9e09e4 100644
--- a/core/java/android/accounts/AbstractAccountAuthenticator.java
+++ b/core/java/android/accounts/AbstractAccountAuthenticator.java
@@ -782,9 +782,7 @@
* @throws NetworkErrorException if the authenticator could not honor the
* request due to a network error
* @see #finishSession(AccountAuthenticatorResponse, String, Bundle)
- * @hide
*/
- @SystemApi
public Bundle startAddAccountSession(
final AccountAuthenticatorResponse response,
final String accountType,
@@ -840,9 +838,7 @@
* @throws NetworkErrorException if the authenticator could not honor the
* request due to a network error
* @see #finishSession(AccountAuthenticatorResponse, String, Bundle)
- * @hide
*/
- @SystemApi
public Bundle startUpdateCredentialsSession(
final AccountAuthenticatorResponse response,
final Account account,
@@ -888,16 +884,16 @@
* <li>{@link AccountManager#KEY_INTENT}, or
* <li>{@link AccountManager#KEY_ACCOUNT_NAME} and
* {@link AccountManager#KEY_ACCOUNT_TYPE} of the account that was
- * added or local credentials were updated, or
+ * added or local credentials were updated, and optional
+ * {@link AccountManager#KEY_ACCOUNT_STATUS_TOKEN} for checking
+ * the status of the account later, or
* <li>{@link AccountManager#KEY_ERROR_CODE} and
* {@link AccountManager#KEY_ERROR_MESSAGE} to indicate an error
* </ul>
* @throws NetworkErrorException if the authenticator could not honor the request due to a
* network error
* @see #startAddAccountSession and #startUpdateCredentialsSession
- * @hide
*/
- @SystemApi
public Bundle finishSession(
final AccountAuthenticatorResponse response,
final String accountType,
@@ -981,9 +977,7 @@
* </ul>
* @throws NetworkErrorException if the authenticator could not honor the request due to a
* network error
- * @hide
*/
- @SystemApi
public Bundle isCredentialsUpdateSuggested(
final AccountAuthenticatorResponse response,
Account account,
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index 5cf59bc..88b1297 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -245,18 +245,14 @@
* Bundle key used for a {@link Bundle} in result from
* {@link #startAddAccountSession} and friends which returns session data
* for installing an account later.
- * @hide
*/
- @SystemApi
public static final String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
/**
* Bundle key used for the {@link String} account status token in result
* from {@link #startAddAccountSession} and friends which returns
* information about a particular account.
- * @hide
*/
- @SystemApi
public static final String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
public static final String ACTION_AUTHENTICATOR_INTENT =
@@ -2705,9 +2701,7 @@
* trouble
* </ul>
* @see #finishSession
- * @hide
*/
- @SystemApi
public AccountManagerFuture<Bundle> startAddAccountSession(
final String accountType,
final String authTokenType,
@@ -2789,9 +2783,7 @@
* trouble
* </ul>
* @see #finishSession
- * @hide
*/
- @SystemApi
public AccountManagerFuture<Bundle> startUpdateCredentialsSession(
final Account account,
final String authTokenType,
@@ -2850,6 +2842,8 @@
* <ul>
* <li>{@link #KEY_ACCOUNT_NAME} - the name of the account created
* <li>{@link #KEY_ACCOUNT_TYPE} - the type of the account
+ * <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check
+ * status of the account
* </ul>
* If no activity was specified and additional information is needed
* from user, the returned Bundle may contains only
@@ -2869,9 +2863,7 @@
* trouble
* </ul>
* @see #startAddAccountSession and #startUpdateCredentialsSession
- * @hide
*/
- @SystemApi
public AccountManagerFuture<Bundle> finishSession(
final Bundle sessionBundle,
final Activity activity,
@@ -2931,9 +2923,7 @@
* @param handler {@link Handler} identifying the callback thread, null for the main thread
* @return An {@link AccountManagerFuture} which resolves to a Boolean, true if the credentials
* of the account should be updated.
- * @hide
*/
- @SystemApi
public AccountManagerFuture<Boolean> isCredentialsUpdateSuggested(
final Account account,
final String statusToken,
diff --git a/core/java/android/animation/ArgbEvaluator.java b/core/java/android/animation/ArgbEvaluator.java
index 745903a..a96bee6 100644
--- a/core/java/android/animation/ArgbEvaluator.java
+++ b/core/java/android/animation/ArgbEvaluator.java
@@ -85,6 +85,6 @@
g = (float) Math.pow(g, 1.0 / 2.2) * 255.0f;
b = (float) Math.pow(b, 1.0 / 2.2) * 255.0f;
- return ((int) a) << 24 | ((int) r) << 16 | ((int) g) << 8 | (int) b;
+ return Math.round(a) << 24 | Math.round(r) << 16 | Math.round(g) << 8 | Math.round(b);
}
}
\ No newline at end of file
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java
index 5c4b979..9a2aa30 100644
--- a/core/java/android/animation/ObjectAnimator.java
+++ b/core/java/android/animation/ObjectAnimator.java
@@ -977,7 +977,7 @@
@Override
void animateValue(float fraction) {
final Object target = getTarget();
- if (mTarget != null && target == null) {
+ if (target == null) {
// We lost the target reference, cancel and clean up.
cancel();
return;
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java
index 2f2d9d6..f93a1d8 100644
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -982,6 +982,7 @@
mStarted = true;
mPaused = false;
mRunning = false;
+ mAnimationEndRequested = false;
// Resets mLastFrameTime when start() is called, so that if the animation was running,
// calling start() would put the animation in the
// started-but-not-yet-reached-the-first-frame phase.
diff --git a/core/java/android/annotation/AnyThread.java b/core/java/android/annotation/AnyThread.java
new file mode 100644
index 0000000..c101548c
--- /dev/null
+++ b/core/java/android/annotation/AnyThread.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+/**
+ * Denotes that the annotated method can be called from any thread (e.g. it is "thread safe".)
+ * If the annotated element is a class, then all methods in the class can be called
+ * from any thread.
+ * <p>
+ * The main purpose of this method is to indicate that you believe a method can be called
+ * from any thread; static tools can then check that nothing you call from within this method
+ * or class have more strict threading requirements.
+ * <p>
+ * Example:
+ * <pre><code>
+ * @AnyThread
+ * public void deliverResult(D data) { ... }
+ * </code></pre>
+ *
+ * {@hide}
+ */
+@Retention(SOURCE)
+@Target({METHOD,CONSTRUCTOR,TYPE})
+public @interface AnyThread {
+}
diff --git a/core/java/android/annotation/Dimension.java b/core/java/android/annotation/Dimension.java
new file mode 100644
index 0000000..5f705ad5
--- /dev/null
+++ b/core/java/android/annotation/Dimension.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+/**
+ * Denotes that a numeric parameter, field or method return value is expected
+ * to represent a dimension.
+ *
+ * {@hide}
+ */
+@Documented
+@Retention(SOURCE)
+@Target({METHOD,PARAMETER,FIELD,LOCAL_VARIABLE,ANNOTATION_TYPE})
+public @interface Dimension {
+ @Unit
+ int unit() default PX;
+
+ int DP = 0;
+ int PX = 1;
+ int SP = 2;
+
+ @IntDef({PX, DP, SP})
+ @Retention(SOURCE)
+ @interface Unit {}
+}
diff --git a/core/java/android/annotation/Px.java b/core/java/android/annotation/Px.java
new file mode 100644
index 0000000..a0ef224
--- /dev/null
+++ b/core/java/android/annotation/Px.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+/**
+ * Denotes that a numeric parameter, field or method return value is expected
+ * to represent a pixel dimension.
+ *
+ * {@hide}
+ */
+@Documented
+@Retention(SOURCE)
+@Target({METHOD, PARAMETER, FIELD, LOCAL_VARIABLE})
+@Dimension(unit = Dimension.PX)
+public @interface Px {
+}
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 0c0af87..edeb838 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -724,8 +724,6 @@
private static final String REQUEST_PERMISSIONS_WHO_PREFIX = "@android:requestPermissions:";
private static final String KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME = "com.android.systemui";
- private static final String KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME =
- "com.android.systemui.statusbar.KeyboardShortcutsReceiver";
private static class ManagedDialog {
Dialog mDialog;
@@ -1694,9 +1692,8 @@
*/
public final void requestShowKeyboardShortcuts() {
Intent intent = new Intent(Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS);
- intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME,
- KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME));
- sendBroadcast(intent);
+ intent.setPackage(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME);
+ sendBroadcastAsUser(intent, UserHandle.SYSTEM);
}
/**
@@ -1704,9 +1701,8 @@
*/
public final void dismissKeyboardShortcutsHelper() {
Intent intent = new Intent(Intent.ACTION_DISMISS_KEYBOARD_SHORTCUTS);
- intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME,
- KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME));
- sendBroadcast(intent);
+ intent.setPackage(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME);
+ sendBroadcastAsUser(intent, UserHandle.SYSTEM);
}
@Override
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 154e11b..419f723 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -93,7 +93,8 @@
@IntDef({
BUGREPORT_OPTION_FULL,
BUGREPORT_OPTION_INTERACTIVE,
- BUGREPORT_OPTION_REMOTE
+ BUGREPORT_OPTION_REMOTE,
+ BUGREPORT_OPTION_WEAR
})
public @interface BugreportMode {}
/**
@@ -114,6 +115,11 @@
* @hide
*/
public static final int BUGREPORT_OPTION_REMOTE = 2;
+ /**
+ * Takes a bugreport on a wearable device.
+ * @hide
+ */
+ public static final int BUGREPORT_OPTION_WEAR = 3;
/**
* <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code
@@ -1507,7 +1513,7 @@
throws SecurityException {
try {
return ActivityManagerNative.getDefault().getRecentTasks(maxNum,
- flags, UserHandle.myUserId());
+ flags, UserHandle.myUserId()).getList();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1532,7 +1538,7 @@
throws SecurityException {
try {
return ActivityManagerNative.getDefault().getRecentTasks(maxNum,
- flags, userId);
+ flags, userId).getList();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -3626,6 +3632,24 @@
}
/**
+ * Enable more aggressive scheduling for latency-sensitive low-runtime VR threads. Only one
+ * thread can be a VR thread in a process at a time, and that thread may be subject to
+ * restrictions on the amount of time it can run.
+ *
+ * To reset the VR thread for an application, a tid of 0 can be passed.
+ *
+ * @see android.os.Process#myTid()
+ * @param tid tid of the VR thread
+ */
+ public static void setVrThread(int tid) {
+ try {
+ ActivityManagerNative.getDefault().setVrThread(tid);
+ } catch (RemoteException e) {
+ // pass
+ }
+ }
+
+ /**
* The AppTask allows you to manage your own application's tasks.
* See {@link android.app.ActivityManager#getAppTasks()}
*/
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index 33ae553..83e2678 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -19,7 +19,9 @@
import android.annotation.NonNull;
import android.content.ComponentName;
import android.content.IIntentSender;
+import android.content.Intent;
import android.content.res.Configuration;
+import android.os.Bundle;
import android.os.IBinder;
import android.service.voice.IVoiceInteractionSession;
@@ -161,4 +163,12 @@
*/
public abstract void updatePersistentConfigurationForUser(@NonNull Configuration values,
int userId);
+
+ /**
+ * Start activity {@code intents} as if {@code packageName} on user {@code userId} did it.
+ *
+ * @return error codes used by {@link IActivityManager#startActivity} and its siblings.
+ */
+ public abstract int startActivitiesAsPackage(String packageName,
+ int userId, Intent[] intents, Bundle bOptions);
}
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index cee5646..aacd5da 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -683,10 +683,10 @@
int maxNum = data.readInt();
int fl = data.readInt();
int userId = data.readInt();
- List<ActivityManager.RecentTaskInfo> list = getRecentTasks(maxNum,
+ ParceledListSlice<ActivityManager.RecentTaskInfo> list = getRecentTasks(maxNum,
fl, userId);
reply.writeNoException();
- reply.writeTypedList(list);
+ list.writeToParcel(reply, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
return true;
}
@@ -2996,6 +2996,27 @@
reply.writeInt(result);
return true;
}
+ case SET_VR_THREAD_TRANSACTION: {
+ data.enforceInterface(IActivityManager.descriptor);
+ final int tid = data.readInt();
+ setVrThread(tid);
+ reply.writeNoException();
+ return true;
+ }
+ case SET_RENDER_THREAD_TRANSACTION: {
+ data.enforceInterface(IActivityManager.descriptor);
+ final int tid = data.readInt();
+ setRenderThread(tid);
+ reply.writeNoException();
+ return true;
+ }
+ case SET_HAS_TOP_UI: {
+ data.enforceInterface(IActivityManager.descriptor);
+ final boolean hasTopUi = data.readInt() != 0;
+ setHasTopUi(hasTopUi);
+ reply.writeNoException();
+ return true;
+ }
}
return super.onTransact(code, data, reply, flags);
@@ -3741,7 +3762,7 @@
reply.recycle();
return list;
}
- public List<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum,
+ public ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum,
int flags, int userId) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -3751,8 +3772,8 @@
data.writeInt(userId);
mRemote.transact(GET_RECENT_TASKS_TRANSACTION, data, reply, 0);
reply.readException();
- ArrayList<ActivityManager.RecentTaskInfo> list
- = reply.createTypedArrayList(ActivityManager.RecentTaskInfo.CREATOR);
+ final ParceledListSlice<ActivityManager.RecentTaskInfo> list = ParceledListSlice.CREATOR
+ .createFromParcel(reply);
data.recycle();
reply.recycle();
return list;
@@ -7031,5 +7052,45 @@
return res;
}
+ @Override
+ public void setVrThread(int tid)
+ throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeInt(tid);
+ mRemote.transact(SET_VR_THREAD_TRANSACTION, data, reply, 0);
+ reply.readException();
+ data.recycle();
+ reply.recycle();
+ return;
+ }
+
+ public void setRenderThread(int tid)
+ throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeInt(tid);
+ mRemote.transact(SET_RENDER_THREAD_TRANSACTION, data, reply, 0);
+ reply.readException();
+ data.recycle();
+ reply.recycle();
+ return;
+ }
+
+ public void setHasTopUi(boolean hasTopUi)
+ throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeInt(hasTopUi ? 1 : 0);
+ mRemote.transact(SET_HAS_TOP_UI, data, reply, 0);
+ reply.readException();
+ data.recycle();
+ reply.recycle();
+ return;
+ }
+
private IBinder mRemote;
}
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index ccc37d7..d9a4690 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -193,6 +193,7 @@
= "android:activity.exitCoordinatorIndex";
private static final String KEY_USAGE_TIME_REPORT = "android:activity.usageTimeReport";
+ private static final String KEY_ROTATION_ANIMATION_HINT = "android:activity.rotationAnimationHint";
/** @hide */
public static final int ANIM_NONE = 0;
@@ -244,6 +245,7 @@
private int mDockCreateMode = DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
private boolean mTaskOverlay;
private AppTransitionAnimationSpec mAnimSpecs[];
+ private int mRotationAnimationHint = -1;
/**
* Create an ActivityOptions specifying a custom animation to run when
@@ -863,6 +865,7 @@
mAnimationFinishedListener = IRemoteCallback.Stub.asInterface(
opts.getBinder(KEY_ANIMATION_FINISHED_LISTENER));
}
+ mRotationAnimationHint = opts.getInt(KEY_ROTATION_ANIMATION_HINT);
}
/**
@@ -1216,6 +1219,7 @@
if (mAnimationFinishedListener != null) {
b.putBinder(KEY_ANIMATION_FINISHED_LISTENER, mAnimationFinishedListener.asBinder());
}
+ b.putInt(KEY_ROTATION_ANIMATION_HINT, mRotationAnimationHint);
return b;
}
@@ -1262,6 +1266,27 @@
return null;
}
+ /**
+ * Returns the rotation animation set by {@link setRotationAnimationHint} or -1
+ * if unspecified.
+ * @hide
+ */
+ public int getRotationAnimationHint() {
+ return mRotationAnimationHint;
+ }
+
+
+ /**
+ * Set a rotation animation to be used if launching the activity
+ * triggers an orientation change, or -1 to clear. See
+ * {@link android.view.WindowManager.LayoutParams} for rotation
+ * animation values.
+ * @hide
+ */
+ public void setRotationAnimationHint(int hint) {
+ mRotationAnimationHint = hint;
+ }
+
/** @hide */
@Override
public String toString() {
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index cd94740..4ca1af8 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -81,6 +81,7 @@
import android.os.TransactionTooLargeException;
import android.os.UserHandle;
import android.provider.Settings;
+import android.security.NetworkSecurityPolicy;
import android.security.net.config.NetworkSecurityConfigProvider;
import android.util.AndroidRuntimeException;
import android.util.ArrayMap;
@@ -1324,6 +1325,11 @@
args.arg2 = voiceInteractor;
sendMessage(H.LOCAL_VOICE_INTERACTION_STARTED, args);
}
+
+ @Override
+ public void handleTrustStorageUpdate() {
+ NetworkSecurityPolicy.getInstance().handleTrustStorageUpdate();
+ }
}
private int getLifecycleSeq() {
@@ -4626,11 +4632,12 @@
if ((activity == null) || (activity.mCurrentConfig == null)) {
shouldChangeConfig = true;
} else {
- // If the new config is the same as the config this Activity
- // is already running with then don't bother calling
- // onConfigurationChanged
+ // If the new config is the same as the config this Activity is already
+ // running with and the override config also didn't change, then don't
+ // bother calling onConfigurationChanged.
int diff = activity.mCurrentConfig.diff(newConfig);
- if (diff != 0) {
+ if (diff != 0 || !mResourcesManager.isSameResourcesOverrideConfig(activityToken,
+ amOverrideConfig)) {
// Always send the task-level config changes. For system-level configuration, if
// this activity doesn't handle any of the config changes, then don't bother
// calling onConfigurationChanged as we're going to destroy it.
diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java
index 8692336..9fa8a5d 100644
--- a/core/java/android/app/ApplicationErrorReport.java
+++ b/core/java/android/app/ApplicationErrorReport.java
@@ -345,7 +345,7 @@
PrintWriter pw = new FastPrintWriter(sw, false, 256);
tr.printStackTrace(pw);
pw.flush();
- stackTrace = sw.toString();
+ stackTrace = sanitizeString(sw.toString());
exceptionMessage = tr.getMessage();
// Populate fields with the "root cause" exception
@@ -374,6 +374,29 @@
throwMethodName = "unknown";
throwLineNumber = 0;
}
+
+ exceptionMessage = sanitizeString(exceptionMessage);
+ }
+
+ /**
+ * Ensure that the string is of reasonable size, truncating from the middle if needed.
+ */
+ private String sanitizeString(String s) {
+ int prefixLength = 10 * 1024;
+ int suffixLength = 10 * 1024;
+ int acceptableLength = prefixLength + suffixLength;
+
+ if (s != null && s.length() > acceptableLength) {
+ String replacement =
+ "\n[TRUNCATED " + (s.length() - acceptableLength) + " CHARS]\n";
+
+ StringBuilder sb = new StringBuilder(acceptableLength + replacement.length());
+ sb.append(s.substring(0, prefixLength));
+ sb.append(replacement);
+ sb.append(s.substring(s.length() - suffixLength));
+ return sb.toString();
+ }
+ return s;
}
/**
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 8cc1bc4..5d87528 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -2080,8 +2080,14 @@
@Override
public void setComponentEnabledSetting(ComponentName componentName,
int newState, int flags) {
+ setComponentEnabledSettingAsUser(componentName, newState, flags, mContext.getUserId());
+ }
+
+ @Override
+ public void setComponentEnabledSettingAsUser(ComponentName componentName,
+ int newState, int flags, int userId) {
try {
- mPM.setComponentEnabledSetting(componentName, newState, flags, mContext.getUserId());
+ mPM.setComponentEnabledSetting(componentName, newState, flags, userId);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2099,9 +2105,16 @@
@Override
public void setApplicationEnabledSetting(String packageName,
int newState, int flags) {
+ setApplicationEnabledSettingAsUser(packageName, newState, flags,
+ mContext.getUserId());
+ }
+
+ @Override
+ public void setApplicationEnabledSettingAsUser(String packageName,
+ int newState, int flags, int userId) {
try {
mPM.setApplicationEnabledSetting(packageName, newState, flags,
- mContext.getUserId(), mContext.getOpPackageName());
+ userId, mContext.getOpPackageName());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java
index d6da3f4..3063d98 100644
--- a/core/java/android/app/ApplicationThreadNative.java
+++ b/core/java/android/app/ApplicationThreadNative.java
@@ -749,6 +749,12 @@
schedulePictureInPictureModeChanged(b, inPip);
return true;
}
+ case HANDLE_TRUST_STORAGE_UPDATE_TRANSACTION:
+ {
+ data.enforceInterface(IApplicationThread.descriptor);
+ handleTrustStorageUpdate();
+ return true;
+ }
}
@@ -1522,4 +1528,12 @@
IBinder.FLAG_ONEWAY);
data.recycle();
}
+
+ @Override
+ public void handleTrustStorageUpdate() throws RemoteException {
+ Parcel data = Parcel.obtain();
+ data.writeInterfaceToken(IApplicationThread.descriptor);
+ mRemote.transact(HANDLE_TRUST_STORAGE_UPDATE_TRANSACTION, data, null, IBinder.FLAG_ONEWAY);
+ data.recycle();
+ }
}
diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 00ed21f..f4f8d69 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -54,39 +54,22 @@
final ArrayList<String> mSharedElementTargetNames;
public BackStackState(FragmentManagerImpl fm, BackStackRecord bse) {
- int numRemoved = 0;
- BackStackRecord.Op op = bse.mHead;
- while (op != null) {
- if (op.removed != null) {
- numRemoved += op.removed.size();
- }
- op = op.next;
- }
- mOps = new int[bse.mNumOp * 7 + numRemoved];
+ final int numOps = bse.mOps.size();
+ mOps = new int[numOps * 6];
if (!bse.mAddToBackStack) {
throw new IllegalStateException("Not on back stack");
}
- op = bse.mHead;
int pos = 0;
- while (op != null) {
+ for (int opNum = 0; opNum < numOps; opNum++) {
+ final BackStackRecord.Op op = bse.mOps.get(opNum);
mOps[pos++] = op.cmd;
mOps[pos++] = op.fragment != null ? op.fragment.mIndex : -1;
mOps[pos++] = op.enterAnim;
mOps[pos++] = op.exitAnim;
mOps[pos++] = op.popEnterAnim;
mOps[pos++] = op.popExitAnim;
- if (op.removed != null) {
- final int N = op.removed.size();
- mOps[pos++] = N;
- for (int i = 0; i < N; i++) {
- mOps[pos++] = op.removed.get(i).mIndex;
- }
- } else {
- mOps[pos++] = 0;
- }
- op = op.next;
}
mTransition = bse.mTransition;
mTransitionStyle = bse.mTransitionStyle;
@@ -136,18 +119,6 @@
op.exitAnim = mOps[pos++];
op.popEnterAnim = mOps[pos++];
op.popExitAnim = mOps[pos++];
- final int N = mOps[pos++];
- if (N > 0) {
- op.removed = new ArrayList<Fragment>(N);
- for (int i = 0; i < N; i++) {
- if (FragmentManagerImpl.DEBUG) {
- Log.v(FragmentManagerImpl.TAG,
- "Instantiate " + bse + " set remove fragment #" + mOps[pos]);
- }
- Fragment r = fm.mActive.get(mOps[pos++]);
- op.removed.add(r);
- }
- }
bse.mEnterAnim = op.enterAnim;
bse.mExitAnim = op.exitAnim;
bse.mPopEnterAnim = op.popEnterAnim;
@@ -219,20 +190,15 @@
static final int OP_ATTACH = 7;
static final class Op {
- Op next;
- Op prev;
int cmd;
Fragment fragment;
int enterAnim;
int exitAnim;
int popEnterAnim;
int popExitAnim;
- ArrayList<Fragment> removed;
}
- Op mHead;
- Op mTail;
- int mNumOp;
+ ArrayList<Op> mOps = new ArrayList<>();
int mEnterAnim;
int mExitAnim;
int mPopEnterAnim;
@@ -320,13 +286,13 @@
}
}
- if (mHead != null) {
+ if (!mOps.isEmpty()) {
writer.print(prefix);
writer.println("Operations:");
String innerPrefix = prefix + " ";
- Op op = mHead;
- int num = 0;
- while (op != null) {
+ final int numOps = mOps.size();
+ for (int opNum = 0; opNum < numOps; opNum++) {
+ final Op op = mOps.get(opNum);
String cmdStr;
switch (op.cmd) {
case OP_NULL:
@@ -359,7 +325,7 @@
}
writer.print(prefix);
writer.print(" Op #");
- writer.print(num);
+ writer.print(opNum);
writer.print(": ");
writer.print(cmdStr);
writer.print(" ");
@@ -380,25 +346,6 @@
writer.println(Integer.toHexString(op.popExitAnim));
}
}
- if (op.removed != null && op.removed.size() > 0) {
- for (int i = 0; i < op.removed.size(); i++) {
- writer.print(innerPrefix);
- if (op.removed.size() == 1) {
- writer.print("Removed: ");
- } else {
- if (i == 0) {
- writer.println("Removed:");
- }
- writer.print(innerPrefix);
- writer.print(" #");
- writer.print(i);
- writer.print(": ");
- }
- writer.println(op.removed.get(i));
- }
- }
- op = op.next;
- num++;
}
}
}
@@ -434,18 +381,11 @@
}
void addOp(Op op) {
- if (mHead == null) {
- mHead = mTail = op;
- } else {
- op.prev = mTail;
- mTail.next = op;
- mTail = op;
- }
+ mOps.add(op);
op.enterAnim = mEnterAnim;
op.exitAnim = mExitAnim;
op.popEnterAnim = mPopEnterAnim;
op.popExitAnim = mPopExitAnim;
- mNumOp++;
}
public FragmentTransaction add(Fragment fragment, String tag) {
@@ -473,8 +413,9 @@
if (targetSdkVersion > Build.VERSION_CODES.N && (fragmentClass.isAnonymousClass()
|| !Modifier.isPublic(modifiers)
|| (fragmentClass.isMemberClass() && !Modifier.isStatic(modifiers)))) {
- throw new IllegalStateException("Fragment must be a public static class to be "
- + "properly recreated on configuration change.");
+ throw new IllegalStateException("Fragment " + fragmentClass.getCanonicalName()
+ + " must be a public static class to be properly recreated from"
+ + " instance state.");
}
}
fragment.mFragmentManager = mManager;
@@ -659,8 +600,9 @@
Log.v(TAG, "Bump nesting in " + this
+ " by " + amt);
}
- Op op = mHead;
- while (op != null) {
+ final int numOps = mOps.size();
+ for (int opNum = 0; opNum < numOps; opNum++) {
+ final Op op = mOps.get(opNum);
if (op.fragment != null) {
op.fragment.mBackStackNesting += amt;
if (FragmentManagerImpl.DEBUG) {
@@ -668,17 +610,6 @@
+ op.fragment + " to " + op.fragment.mBackStackNesting);
}
}
- if (op.removed != null) {
- for (int i = op.removed.size() - 1; i >= 0; i--) {
- Fragment r = op.removed.get(i);
- r.mBackStackNesting += amt;
- if (FragmentManagerImpl.DEBUG) {
- Log.v(TAG, "Bump nesting of "
- + r + " to " + r.mBackStackNesting);
- }
- }
- }
- op = op.next;
}
}
@@ -734,6 +665,7 @@
}
}
+ expandReplaceOps();
bumpBackStackNesting(1);
if (mManager.mCurState >= Fragment.CREATED) {
@@ -743,88 +675,38 @@
beginTransition(firstOutFragments, lastInFragments, false);
}
- Op op = mHead;
- while (op != null) {
+ final int numOps = mOps.size();
+ for (int opNum = 0; opNum < numOps; opNum++) {
+ final Op op = mOps.get(opNum);
+ Fragment f = op.fragment;
switch (op.cmd) {
- case OP_ADD: {
- Fragment f = op.fragment;
+ case OP_ADD:
f.mNextAnim = op.enterAnim;
mManager.addFragment(f, false);
- }
- break;
- case OP_REPLACE: {
- Fragment f = op.fragment;
- int containerId = f.mContainerId;
- if (mManager.mAdded != null) {
- for (int i = mManager.mAdded.size() - 1; i >= 0; i--) {
- Fragment old = mManager.mAdded.get(i);
- if (FragmentManagerImpl.DEBUG) {
- Log.v(TAG,
- "OP_REPLACE: adding=" + f + " old=" + old);
- }
- if (old.mContainerId == containerId) {
- if (old == f) {
- op.fragment = f = null;
- } else {
- if (op.removed == null) {
- op.removed = new ArrayList<Fragment>();
- }
- op.removed.add(old);
- old.mNextAnim = op.exitAnim;
- if (mAddToBackStack) {
- old.mBackStackNesting += 1;
- if (FragmentManagerImpl.DEBUG) {
- Log.v(TAG, "Bump nesting of "
- + old + " to " + old.mBackStackNesting);
- }
- }
- mManager.removeFragment(old, mTransition, mTransitionStyle);
- }
- }
- }
- }
- if (f != null) {
- f.mNextAnim = op.enterAnim;
- mManager.addFragment(f, false);
- }
- }
- break;
- case OP_REMOVE: {
- Fragment f = op.fragment;
+ break;
+ case OP_REMOVE:
f.mNextAnim = op.exitAnim;
mManager.removeFragment(f, mTransition, mTransitionStyle);
- }
- break;
- case OP_HIDE: {
- Fragment f = op.fragment;
+ break;
+ case OP_HIDE:
f.mNextAnim = op.exitAnim;
mManager.hideFragment(f, mTransition, mTransitionStyle);
- }
- break;
- case OP_SHOW: {
- Fragment f = op.fragment;
+ break;
+ case OP_SHOW:
f.mNextAnim = op.enterAnim;
mManager.showFragment(f, mTransition, mTransitionStyle);
- }
- break;
- case OP_DETACH: {
- Fragment f = op.fragment;
+ break;
+ case OP_DETACH:
f.mNextAnim = op.exitAnim;
mManager.detachFragment(f, mTransition, mTransitionStyle);
- }
- break;
- case OP_ATTACH: {
- Fragment f = op.fragment;
+ break;
+ case OP_ATTACH:
f.mNextAnim = op.enterAnim;
mManager.attachFragment(f, mTransition, mTransitionStyle);
- }
- break;
- default: {
+ break;
+ default:
throw new IllegalArgumentException("Unknown cmd: " + op.cmd);
- }
}
-
- op = op.next;
}
mManager.moveToState(mManager.mCurState, mTransition,
@@ -835,6 +717,72 @@
}
}
+ private void expandReplaceOps() {
+ final int numOps = mOps.size();
+
+ boolean hasReplace = false;
+ // Before we do anything, check to see if any replace operations exist:
+ for (int opNum = 0; opNum < numOps; opNum++) {
+ final Op op = mOps.get(opNum);
+ if (op.cmd == OP_REPLACE) {
+ hasReplace = true;
+ break;
+ }
+ }
+
+ if (!hasReplace) {
+ return; // nothing to expand
+ }
+
+ ArrayList<Fragment> added = (mManager.mAdded == null) ? new ArrayList<Fragment>() :
+ new ArrayList<>(mManager.mAdded);
+ for (int opNum = 0; opNum < mOps.size(); opNum++) {
+ final Op op = mOps.get(opNum);
+ switch (op.cmd) {
+ case OP_ADD:
+ case OP_ATTACH:
+ added.add(op.fragment);
+ break;
+ case OP_REMOVE:
+ case OP_DETACH:
+ added.remove(op.fragment);
+ break;
+ case OP_REPLACE: {
+ Fragment f = op.fragment;
+ int containerId = f.mContainerId;
+ boolean alreadyAdded = false;
+ for (int i = added.size() - 1; i >= 0; i--) {
+ Fragment old = added.get(i);
+ if (old.mContainerId == containerId) {
+ if (old == f) {
+ alreadyAdded = true;
+ } else {
+ Op removeOp = new Op();
+ removeOp.cmd = OP_REMOVE;
+ removeOp.fragment = old;
+ removeOp.enterAnim = op.enterAnim;
+ removeOp.popEnterAnim = op.popEnterAnim;
+ removeOp.exitAnim = op.exitAnim;
+ removeOp.popExitAnim = op.popExitAnim;
+ mOps.add(opNum, removeOp);
+ added.remove(old);
+ opNum++;
+ }
+ }
+ }
+ if (alreadyAdded) {
+ mOps.remove(opNum);
+ opNum--;
+ } else {
+ op.cmd = OP_ADD;
+ added.add(f);
+ }
+ }
+ break;
+ }
+ }
+ }
+
private static void setFirstOut(SparseArray<Fragment> firstOutFragments,
SparseArray<Fragment> lastInFragments, Fragment fragment) {
if (fragment != null) {
@@ -867,7 +815,9 @@
* Ensure that fragments that are entering are at least at the CREATED state
* so that they may load Transitions using TransitionInflater.
*/
- if (fragment.mState < Fragment.CREATED && mManager.mCurState >= Fragment.CREATED) {
+ if (fragment.mState < Fragment.CREATED && mManager.mCurState >= Fragment.CREATED &&
+ mManager.mHost.getContext().getApplicationInfo().targetSdkVersion >=
+ Build.VERSION_CODES.N) {
mManager.makeActive(fragment);
mManager.moveToState(fragment, Fragment.CREATED, 0, 0, false);
}
@@ -888,30 +838,13 @@
if (!mManager.mContainer.onHasView()) {
return; // nothing to see, so no transitions
}
- Op op = mHead;
- while (op != null) {
+ final int numOps = mOps.size();
+ for (int opNum = 0; opNum < numOps; opNum++) {
+ final Op op = mOps.get(opNum);
switch (op.cmd) {
case OP_ADD:
setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
- case OP_REPLACE: {
- Fragment f = op.fragment;
- if (mManager.mAdded != null) {
- for (int i = 0; i < mManager.mAdded.size(); i++) {
- Fragment old = mManager.mAdded.get(i);
- if (f == null || old.mContainerId == f.mContainerId) {
- if (old == f) {
- f = null;
- lastInFragments.remove(old.mContainerId);
- } else {
- setFirstOut(firstOutFragments, lastInFragments, old);
- }
- }
- }
- }
- setLastIn(firstOutFragments, lastInFragments, op.fragment);
- break;
- }
case OP_REMOVE:
setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
@@ -928,8 +861,6 @@
setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
}
-
- op = op.next;
}
}
@@ -947,20 +878,13 @@
if (!mManager.mContainer.onHasView()) {
return; // nothing to see, so no transitions
}
- Op op = mTail;
- while (op != null) {
+ final int numOps = mOps.size();
+ for (int opNum = numOps - 1; opNum >= 0; opNum--) {
+ final Op op = mOps.get(opNum);
switch (op.cmd) {
case OP_ADD:
setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
- case OP_REPLACE:
- if (op.removed != null) {
- for (int i = op.removed.size() - 1; i >= 0; i--) {
- setLastIn(firstOutFragments, lastInFragments, op.removed.get(i));
- }
- }
- setFirstOut(firstOutFragments, lastInFragments, op.fragment);
- break;
case OP_REMOVE:
setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
@@ -977,8 +901,6 @@
setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
}
-
- op = op.prev;
}
}
@@ -1688,74 +1610,44 @@
bumpBackStackNesting(-1);
- Op op = mTail;
- while (op != null) {
+ final int numOps = mOps.size();
+ for (int opNum = numOps - 1; opNum >= 0; opNum--) {
+ final Op op = mOps.get(opNum);
+ Fragment f = op.fragment;
switch (op.cmd) {
- case OP_ADD: {
- Fragment f = op.fragment;
+ case OP_ADD:
f.mNextAnim = op.popExitAnim;
mManager.removeFragment(f,
FragmentManagerImpl.reverseTransit(mTransition),
mTransitionStyle);
- }
- break;
- case OP_REPLACE: {
- Fragment f = op.fragment;
- if (f != null) {
- f.mNextAnim = op.popExitAnim;
- mManager.removeFragment(f,
- FragmentManagerImpl.reverseTransit(mTransition),
- mTransitionStyle);
- }
- if (op.removed != null) {
- for (int i = 0; i < op.removed.size(); i++) {
- Fragment old = op.removed.get(i);
- old.mNextAnim = op.popEnterAnim;
- mManager.addFragment(old, false);
- }
- }
- }
- break;
- case OP_REMOVE: {
- Fragment f = op.fragment;
+ break;
+ case OP_REMOVE:
f.mNextAnim = op.popEnterAnim;
mManager.addFragment(f, false);
- }
- break;
- case OP_HIDE: {
- Fragment f = op.fragment;
+ break;
+ case OP_HIDE:
f.mNextAnim = op.popEnterAnim;
mManager.showFragment(f,
FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);
- }
- break;
- case OP_SHOW: {
- Fragment f = op.fragment;
+ break;
+ case OP_SHOW:
f.mNextAnim = op.popExitAnim;
mManager.hideFragment(f,
FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);
- }
- break;
- case OP_DETACH: {
- Fragment f = op.fragment;
+ break;
+ case OP_DETACH:
f.mNextAnim = op.popEnterAnim;
mManager.attachFragment(f,
FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);
- }
- break;
- case OP_ATTACH: {
- Fragment f = op.fragment;
+ break;
+ case OP_ATTACH:
f.mNextAnim = op.popExitAnim;
mManager.detachFragment(f,
FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);
- }
- break;
- default: {
+ break;
+ default:
throw new IllegalArgumentException("Unknown cmd: " + op.cmd);
- }
}
-
- op = op.prev;
}
if (doStateMove) {
@@ -1842,7 +1734,7 @@
}
public boolean isEmpty() {
- return mNumOp == 0;
+ return mOps.isEmpty();
}
public class TransitionState {
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index e6ca520..f1d0e10 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -185,15 +185,6 @@
@GuardedBy("mSync")
private File mCodeCacheDir;
- @GuardedBy("mSync")
- private File[] mExternalObbDirs;
- @GuardedBy("mSync")
- private File[] mExternalFilesDirs;
- @GuardedBy("mSync")
- private File[] mExternalCacheDirs;
- @GuardedBy("mSync")
- private File[] mExternalMediaDirs;
-
// The system service cache for the system services that are cached per-ContextImpl.
final Object[] mServiceCache = SystemServiceRegistry.createServiceCache();
@@ -562,17 +553,10 @@
@Override
public File[] getExternalFilesDirs(String type) {
synchronized (mSync) {
- if (mExternalFilesDirs == null) {
- mExternalFilesDirs = Environment.buildExternalStorageAppFilesDirs(getPackageName());
- }
-
- // Splice in requested type, if any
- File[] dirs = mExternalFilesDirs;
+ File[] dirs = Environment.buildExternalStorageAppFilesDirs(getPackageName());
if (type != null) {
dirs = Environment.buildPaths(dirs, type);
}
-
- // Create dirs if needed
return ensureExternalDirsExistOrFilter(dirs);
}
}
@@ -586,12 +570,8 @@
@Override
public File[] getObbDirs() {
synchronized (mSync) {
- if (mExternalObbDirs == null) {
- mExternalObbDirs = Environment.buildExternalStorageAppObbDirs(getPackageName());
- }
-
- // Create dirs if needed
- return ensureExternalDirsExistOrFilter(mExternalObbDirs);
+ File[] dirs = Environment.buildExternalStorageAppObbDirs(getPackageName());
+ return ensureExternalDirsExistOrFilter(dirs);
}
}
@@ -624,24 +604,16 @@
@Override
public File[] getExternalCacheDirs() {
synchronized (mSync) {
- if (mExternalCacheDirs == null) {
- mExternalCacheDirs = Environment.buildExternalStorageAppCacheDirs(getPackageName());
- }
-
- // Create dirs if needed
- return ensureExternalDirsExistOrFilter(mExternalCacheDirs);
+ File[] dirs = Environment.buildExternalStorageAppCacheDirs(getPackageName());
+ return ensureExternalDirsExistOrFilter(dirs);
}
}
@Override
public File[] getExternalMediaDirs() {
synchronized (mSync) {
- if (mExternalMediaDirs == null) {
- mExternalMediaDirs = Environment.buildExternalStorageAppMediaDirs(getPackageName());
- }
-
- // Create dirs if needed
- return ensureExternalDirsExistOrFilter(mExternalMediaDirs);
+ File[] dirs = Environment.buildExternalStorageAppMediaDirs(getPackageName());
+ return ensureExternalDirsExistOrFilter(dirs);
}
}
@@ -1081,6 +1053,23 @@
}
@Override
+ public void sendBroadcastAsUser(Intent intent, UserHandle user, String receiverPermission,
+ Bundle options) {
+ String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
+ String[] receiverPermissions = receiverPermission == null ? null
+ : new String[] {receiverPermission};
+ try {
+ intent.prepareToLeaveProcess(this);
+ ActivityManagerNative.getDefault().broadcastIntent(
+ mMainThread.getApplicationThread(), intent, resolvedType, null,
+ Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
+ options, false, false, user.getIdentifier());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ @Override
public void sendBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp) {
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index cd7665c..7394c7f 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1536,8 +1536,11 @@
}
mExecutingActions = true;
- action.run();
- mExecutingActions = false;
+ try {
+ action.run();
+ } finally {
+ mExecutingActions = false;
+ }
doPendingDeferredStart();
}
@@ -1574,11 +1577,14 @@
}
mExecutingActions = true;
- for (int i=0; i<numActions; i++) {
- mTmpActions[i].run();
- mTmpActions[i] = null;
+ try {
+ for (int i = 0; i < numActions; i++) {
+ mTmpActions[i].run();
+ mTmpActions[i] = null;
+ }
+ } finally {
+ mExecutingActions = false;
}
- mExecutingActions = false;
didSomething = true;
}
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 3f7ff0b..e411e03 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -136,7 +136,7 @@
ActivityManager.TaskDescription description, Bitmap thumbnail) throws RemoteException;
public Point getAppTaskThumbnailSize() throws RemoteException;
public List<RunningTaskInfo> getTasks(int maxNum, int flags) throws RemoteException;
- public List<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum,
+ public ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum,
int flags, int userId) throws RemoteException;
public ActivityManager.TaskThumbnail getTaskThumbnail(int taskId) throws RemoteException;
public List<RunningServiceInfo> getServices(int maxNum, int flags) throws RemoteException;
@@ -658,6 +658,19 @@
IIntentReceiver finishedReceiver, String requiredPermission, Bundle options)
throws RemoteException;
+ public void setVrThread(int tid) throws RemoteException;
+ public void setRenderThread(int tid) throws RemoteException;
+
+ /**
+ * Lets activity manager know whether the calling process is currently showing "top-level" UI
+ * that is not an activity, i.e. windows on the screen the user is currently interacting with.
+ *
+ * <p>This flag can only be set for persistent processes.
+ *
+ * @param hasTopUi Whether the calling process has "top-level" UI.
+ */
+ public void setHasTopUi(boolean hasTopUi) throws RemoteException;
+
/*
* Private non-Binder interfaces
*/
@@ -1044,4 +1057,9 @@
int START_CONFIRM_DEVICE_CREDENTIAL_INTENT = IBinder.FIRST_CALL_TRANSACTION + 374;
int SEND_IDLE_JOB_TRIGGER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 375;
int SEND_INTENT_SENDER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 376;
+
+ // Start of N MR1 transactions
+ int SET_VR_THREAD_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 377;
+ int SET_RENDER_THREAD_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 378;
+ int SET_HAS_TOP_UI = IBinder.FIRST_CALL_TRANSACTION + 379;
}
diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java
index 559f69f..7732157 100644
--- a/core/java/android/app/IApplicationThread.java
+++ b/core/java/android/app/IApplicationThread.java
@@ -161,6 +161,7 @@
void scheduleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode) throws RemoteException;
void schedulePictureInPictureModeChanged(IBinder token, boolean isInPictureInPictureMode) throws RemoteException;
void scheduleLocalVoiceInteractionStarted(IBinder token, IVoiceInteractor voiceInteractor) throws RemoteException;
+ void handleTrustStorageUpdate() throws RemoteException;
String descriptor = "android.app.IApplicationThread";
@@ -224,4 +225,5 @@
int SCHEDULE_MULTI_WINDOW_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+58;
int SCHEDULE_PICTURE_IN_PICTURE_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+59;
int SCHEDULE_LOCAL_VOICE_INTERACTION_STARTED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+60;
+ int HANDLE_TRUST_STORAGE_UPDATE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+61;
}
diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl
index a0762b9..db7d54b 100644
--- a/core/java/android/app/IWallpaperManager.aidl
+++ b/core/java/android/app/IWallpaperManager.aidl
@@ -49,7 +49,7 @@
/**
* Set the live wallpaper. This only affects the system wallpaper.
*/
- void setWallpaperComponentChecked(in ComponentName name, in String callingPackage);
+ void setWallpaperComponentChecked(in ComponentName name, in String callingPackage, int userId);
/**
* Set the live wallpaper. This only affects the system wallpaper.
@@ -72,7 +72,7 @@
* information about that wallpaper. Otherwise, if it is a static image,
* simply return null.
*/
- WallpaperInfo getWallpaperInfo();
+ WallpaperInfo getWallpaperInfo(int userId);
/**
* Clear the system wallpaper.
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index 67d762b..f934a9f 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -1151,16 +1151,6 @@
// }
activity.performDestroy();
-
- if (mActivityMonitors != null) {
- synchronized (mSync) {
- final int N = mActivityMonitors.size();
- for (int i=0; i<N; i++) {
- final ActivityMonitor am = mActivityMonitors.get(i);
- am.match(activity, activity, activity.getIntent());
- }
- }
- }
}
/**
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index b889c8f..7754244 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -1396,18 +1396,6 @@
}
public void death(ComponentName name, IBinder service) {
- ServiceDispatcher.ConnectionInfo old;
-
- synchronized (this) {
- old = mActiveConnections.remove(name);
- if (old == null || old.binder != service) {
- // Death for someone different than who we last
- // reported... just ignore it.
- return;
- }
- old.binder.unlinkToDeath(old.deathMonitor, 0);
- }
-
if (mActivityThread != null) {
mActivityThread.post(new RunConnection(name, service, 1));
} else {
@@ -1456,7 +1444,7 @@
}
}
- // If there was an old service, it is not disconnected.
+ // If there was an old service, it is now disconnected.
if (old != null) {
mConnection.onServiceDisconnected(name);
}
@@ -1467,6 +1455,17 @@
}
public void doDeath(ComponentName name, IBinder service) {
+ synchronized (this) {
+ ConnectionInfo old = mActiveConnections.get(name);
+ if (old == null || old.binder != service) {
+ // Death for someone different than who we last
+ // reported... just ignore it.
+ return;
+ }
+ mActiveConnections.remove(name);
+ old.binder.unlinkToDeath(old.deathMonitor, 0);
+ }
+
mConnection.onServiceDisconnected(name);
}
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index d89287d..40b0906 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -50,9 +50,12 @@
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
+import android.text.style.BackgroundColorSpan;
import android.text.style.CharacterStyle;
+import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
import android.text.style.TextAppearanceSpan;
+import android.util.ArraySet;
import android.util.Log;
import android.util.SparseArray;
import android.view.Gravity;
@@ -63,6 +66,7 @@
import android.widget.RemoteViews;
import com.android.internal.R;
+import com.android.internal.util.ArrayUtils;
import com.android.internal.util.NotificationColorUtil;
import java.lang.annotation.Retention;
@@ -760,6 +764,15 @@
public Bundle extras = new Bundle();
/**
+ * All pending intents in the notification as the system needs to be able to access them but
+ * touching the extras bundle in the system process is not safe because the bundle may contain
+ * custom parcelable objects.
+ *
+ * @hide
+ */
+ public ArraySet<PendingIntent> allPendingIntents;
+
+ /**
* {@link #extras} key: this is the title of the notification,
* as supplied to {@link Builder#setContentTitle(CharSequence)}.
*/
@@ -1575,7 +1588,16 @@
/**
* Unflatten the notification from a parcel.
*/
- public Notification(Parcel parcel)
+ @SuppressWarnings("unchecked")
+ public Notification(Parcel parcel) {
+ // IMPORTANT: Add unmarshaling code in readFromParcel as the pending
+ // intents in extras are always written as the last entry.
+ readFromParcelImpl(parcel);
+ // Must be read last!
+ allPendingIntents = (ArraySet<PendingIntent>) parcel.readArraySet(null);
+ }
+
+ private void readFromParcelImpl(Parcel parcel)
{
int version = parcel.readInt();
@@ -1730,6 +1752,10 @@
}
}
+ if (!ArrayUtils.isEmpty(allPendingIntents)) {
+ that.allPendingIntents = new ArraySet<>(allPendingIntents);
+ }
+
if (this.actions != null) {
that.actions = new Action[this.actions.length];
for(int i=0; i<this.actions.length; i++) {
@@ -1845,8 +1871,40 @@
/**
* Flatten this notification into a parcel.
*/
- public void writeToParcel(Parcel parcel, int flags)
- {
+ public void writeToParcel(Parcel parcel, int flags) {
+ // We need to mark all pending intents getting into the notification
+ // system as being put there to later allow the notification ranker
+ // to launch them and by doing so add the app to the battery saver white
+ // list for a short period of time. The problem is that the system
+ // cannot look into the extras as there may be parcelables there that
+ // the platform does not know how to handle. To go around that we have
+ // an explicit list of the pending intents in the extras bundle.
+ final boolean collectPendingIntents = (allPendingIntents == null);
+ if (collectPendingIntents) {
+ PendingIntent.setOnMarshaledListener(
+ (PendingIntent intent, Parcel out, int outFlags) -> {
+ if (parcel == out) {
+ if (allPendingIntents == null) {
+ allPendingIntents = new ArraySet<>();
+ }
+ allPendingIntents.add(intent);
+ }
+ });
+ }
+ try {
+ // IMPORTANT: Add marshaling code in writeToParcelImpl as we
+ // want to intercept all pending events written to the pacel.
+ writeToParcelImpl(parcel, flags);
+ // Must be written last!
+ parcel.writeArraySet(allPendingIntents);
+ } finally {
+ if (collectPendingIntents) {
+ PendingIntent.setOnMarshaledListener(null);
+ }
+ }
+ }
+
+ private void writeToParcelImpl(Parcel parcel, int flags) {
parcel.writeInt(1);
parcel.writeLong(when);
@@ -3207,6 +3265,7 @@
contentView.setTextViewText(R.id.app_name_text, null);
contentView.setViewVisibility(R.id.chronometer, View.GONE);
contentView.setViewVisibility(R.id.header_text, View.GONE);
+ contentView.setTextViewText(R.id.header_text, null);
contentView.setViewVisibility(R.id.header_text_divider, View.GONE);
contentView.setViewVisibility(R.id.time_divider, View.GONE);
contentView.setViewVisibility(R.id.time, View.GONE);
@@ -3419,6 +3478,8 @@
mN.mSmallIcon = Icon.createWithResource(mContext, mN.icon);
}
contentView.setImageViewIcon(R.id.icon, mN.mSmallIcon);
+ contentView.setDrawableParameters(R.id.icon, false /* targetBackground */,
+ -1 /* alpha */, -1 /* colorFilter */, null /* mode */, mN.iconLevel);
processSmallIconColor(mN.mSmallIcon, contentView);
}
@@ -3464,6 +3525,8 @@
boolean validRemoteInput = false;
int N = mActions.size();
+ boolean emphazisedMode = mN.fullScreenIntent != null;
+ big.setBoolean(R.id.actions, "setEmphasizedMode", emphazisedMode);
if (N > 0) {
big.setViewVisibility(R.id.actions_container, View.VISIBLE);
big.setViewVisibility(R.id.actions, View.VISIBLE);
@@ -3474,7 +3537,8 @@
Action action = mActions.get(i);
validRemoteInput |= hasValidRemoteInput(action);
- final RemoteViews button = generateActionButton(action);
+ final RemoteViews button = generateActionButton(action, emphazisedMode,
+ i % 2 != 0);
big.addView(R.id.actions, button);
}
} else {
@@ -3639,13 +3703,13 @@
- private RemoteViews generateActionButton(Action action) {
+ private RemoteViews generateActionButton(Action action, boolean emphazisedMode,
+ boolean oddAction) {
final boolean tombstone = (action.actionIntent == null);
RemoteViews button = new BuilderRemoteViews(mContext.getApplicationInfo(),
- tombstone ? getActionTombstoneLayoutResource()
- : getActionLayoutResource());
- final Icon ai = action.getIcon();
- button.setTextViewText(R.id.action0, processLegacyText(action.title));
+ emphazisedMode ? getEmphasizedActionLayoutResource()
+ : tombstone ? getActionTombstoneLayoutResource()
+ : getActionLayoutResource());
if (!tombstone) {
button.setOnClickPendingIntent(R.id.action0, action.actionIntent);
}
@@ -3653,13 +3717,144 @@
if (action.mRemoteInputs != null) {
button.setRemoteInputs(R.id.action0, action.mRemoteInputs);
}
- if (mN.color != COLOR_DEFAULT) {
- button.setTextColor(R.id.action0, resolveContrastColor());
+ if (emphazisedMode) {
+ // change the background bgColor
+ int bgColor = mContext.getColor(oddAction ? R.color.notification_action_list
+ : R.color.notification_action_list_dark);
+ button.setDrawableParameters(R.id.button_holder, true, -1, bgColor,
+ PorterDuff.Mode.SRC_ATOP, -1);
+ CharSequence title = action.title;
+ ColorStateList[] outResultColor = null;
+ if (isLegacy()) {
+ title = clearColorSpans(title);
+ } else {
+ outResultColor = new ColorStateList[1];
+ title = ensureColorSpanContrast(title, bgColor, outResultColor);
+ }
+ button.setTextViewText(R.id.action0, title);
+ if (outResultColor != null && outResultColor[0] != null) {
+ // We need to set the text color as well since changing a text to uppercase
+ // clears its spans.
+ button.setTextColor(R.id.action0, outResultColor[0]);
+ } else if (mN.color != COLOR_DEFAULT) {
+ button.setTextColor(R.id.action0,resolveContrastColor());
+ }
+ } else {
+ button.setTextViewText(R.id.action0, processLegacyText(action.title));
+ if (mN.color != COLOR_DEFAULT) {
+ button.setTextColor(R.id.action0, resolveContrastColor());
+ }
}
return button;
}
/**
+ * Clears all color spans of a text
+ * @param charSequence the input text
+ * @return the same text but without color spans
+ */
+ private CharSequence clearColorSpans(CharSequence charSequence) {
+ if (charSequence instanceof Spanned) {
+ Spanned ss = (Spanned) charSequence;
+ Object[] spans = ss.getSpans(0, ss.length(), Object.class);
+ SpannableStringBuilder builder = new SpannableStringBuilder(ss.toString());
+ for (Object span : spans) {
+ Object resultSpan = span;
+ if (resultSpan instanceof CharacterStyle) {
+ resultSpan = ((CharacterStyle) span).getUnderlying();
+ }
+ if (resultSpan instanceof TextAppearanceSpan) {
+ TextAppearanceSpan originalSpan = (TextAppearanceSpan) resultSpan;
+ if (originalSpan.getTextColor() != null) {
+ resultSpan = new TextAppearanceSpan(
+ originalSpan.getFamily(),
+ originalSpan.getTextStyle(),
+ originalSpan.getTextSize(),
+ null,
+ originalSpan.getLinkTextColor());
+ }
+ } else if (resultSpan instanceof ForegroundColorSpan
+ || (resultSpan instanceof BackgroundColorSpan)) {
+ continue;
+ } else {
+ resultSpan = span;
+ }
+ builder.setSpan(resultSpan, ss.getSpanStart(span), ss.getSpanEnd(span),
+ ss.getSpanFlags(span));
+ }
+ return builder;
+ }
+ return charSequence;
+ }
+
+ /**
+ * Ensures contrast on color spans against a background color. also returns the color of the
+ * text if a span was found that spans over the whole text.
+ *
+ * @param charSequence the charSequence on which the spans are
+ * @param background the background color to ensure the contrast against
+ * @param outResultColor an array in which a color will be returned as the first element if
+ * there exists a full length color span.
+ * @return the contrasted charSequence
+ */
+ private CharSequence ensureColorSpanContrast(CharSequence charSequence, int background,
+ ColorStateList[] outResultColor) {
+ if (charSequence instanceof Spanned) {
+ Spanned ss = (Spanned) charSequence;
+ Object[] spans = ss.getSpans(0, ss.length(), Object.class);
+ SpannableStringBuilder builder = new SpannableStringBuilder(ss.toString());
+ for (Object span : spans) {
+ Object resultSpan = span;
+ int spanStart = ss.getSpanStart(span);
+ int spanEnd = ss.getSpanEnd(span);
+ boolean fullLength = (spanEnd - spanStart) == charSequence.length();
+ if (resultSpan instanceof CharacterStyle) {
+ resultSpan = ((CharacterStyle) span).getUnderlying();
+ }
+ if (resultSpan instanceof TextAppearanceSpan) {
+ TextAppearanceSpan originalSpan = (TextAppearanceSpan) resultSpan;
+ ColorStateList textColor = originalSpan.getTextColor();
+ if (textColor != null) {
+ int[] colors = textColor.getColors();
+ int[] newColors = new int[colors.length];
+ for (int i = 0; i < newColors.length; i++) {
+ newColors[i] = NotificationColorUtil.ensureLargeTextContrast(
+ colors[i], background);
+ }
+ textColor = new ColorStateList(textColor.getStates().clone(),
+ newColors);
+ resultSpan = new TextAppearanceSpan(
+ originalSpan.getFamily(),
+ originalSpan.getTextStyle(),
+ originalSpan.getTextSize(),
+ textColor,
+ originalSpan.getLinkTextColor());
+ if (fullLength) {
+ outResultColor[0] = new ColorStateList(
+ textColor.getStates().clone(), newColors);
+ }
+ }
+ } else if (resultSpan instanceof ForegroundColorSpan) {
+ ForegroundColorSpan originalSpan = (ForegroundColorSpan) resultSpan;
+ int foregroundColor = originalSpan.getForegroundColor();
+ foregroundColor = NotificationColorUtil.ensureLargeTextContrast(
+ foregroundColor, background);
+ resultSpan = new ForegroundColorSpan(foregroundColor);
+ if (fullLength) {
+ outResultColor[0] = ColorStateList.valueOf(foregroundColor);
+ }
+ } else {
+ resultSpan = span;
+ }
+
+ builder.setSpan(resultSpan, spanStart, spanEnd, ss.getSpanFlags(span));
+ }
+ return builder;
+ }
+ return charSequence;
+ }
+
+ /**
* @return Whether we are currently building a notification from a legacy (an app that
* doesn't create material notifications by itself) app.
*/
@@ -3924,6 +4119,10 @@
return R.layout.notification_material_action;
}
+ private int getEmphasizedActionLayoutResource() {
+ return R.layout.notification_material_action_emphasized;
+ }
+
private int getActionTombstoneLayoutResource() {
return R.layout.notification_material_action_tombstone;
}
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index cb15392..cfa242b 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -242,6 +242,36 @@
}
/**
+ * Listener for observing when pending intents are written to a parcel.
+ *
+ * @hide
+ */
+ public interface OnMarshaledListener {
+ /**
+ * Called when a pending intent is written to a parcel.
+ *
+ * @param intent The pending intent.
+ * @param parcel The parcel to which it was written.
+ * @param flags The parcel flags when it was written.
+ */
+ void onMarshaled(PendingIntent intent, Parcel parcel, int flags);
+ }
+
+ private static final ThreadLocal<OnMarshaledListener> sOnMarshaledListener
+ = new ThreadLocal<>();
+
+ /**
+ * Registers an listener for pending intents being written to a parcel.
+ *
+ * @param listener The listener, null to clear.
+ *
+ * @hide
+ */
+ public static void setOnMarshaledListener(OnMarshaledListener listener) {
+ sOnMarshaledListener.set(listener);
+ }
+
+ /**
* Retrieve a PendingIntent that will start a new activity, like calling
* {@link Context#startActivity(Intent) Context.startActivity(Intent)}.
* Note that the activity will be started outside of the context of an
@@ -1016,6 +1046,11 @@
public void writeToParcel(Parcel out, int flags) {
out.writeStrongBinder(mTarget.asBinder());
+ OnMarshaledListener listener = sOnMarshaledListener.get();
+ if (listener != null) {
+ listener.onMarshaled(this, out, flags);
+ }
+
}
public static final Parcelable.Creator<PendingIntent> CREATOR
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index c4673a3..835ef626 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -364,6 +364,26 @@
return null;
}
+ /**
+ * Check if activity resources have same override config as the provided on.
+ * @param activityToken The Activity that resources should be associated with.
+ * @param overrideConfig The override configuration to be checked for equality with.
+ * @return true if activity resources override config matches the provided one or they are both
+ * null, false otherwise.
+ */
+ boolean isSameResourcesOverrideConfig(@Nullable IBinder activityToken,
+ @Nullable Configuration overrideConfig) {
+ synchronized (this) {
+ final ActivityResources activityResources
+ = activityToken != null ? mActivityResourceReferences.get(activityToken) : null;
+ if (activityResources == null) {
+ return overrideConfig == null;
+ } else {
+ return Objects.equals(activityResources.overrideConfig, overrideConfig);
+ }
+ }
+ }
+
private ActivityResources getOrCreateActivityResourcesStructLocked(
@NonNull IBinder activityToken) {
ActivityResources activityResources = mActivityResourceReferences.get(activityToken);
@@ -679,7 +699,7 @@
if (overrideConfig != null) {
activityResources.overrideConfig.setTo(overrideConfig);
} else {
- activityResources.overrideConfig.setToDefaults();
+ activityResources.overrideConfig.unset();
}
if (DEBUG) {
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index 7f467f0..20cbde1 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -51,6 +51,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
+import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
import android.view.WindowManagerGlobal;
@@ -265,7 +266,7 @@
}
static class Globals extends IWallpaperManagerCallback.Stub {
- private IWallpaperManager mService;
+ private final IWallpaperManager mService;
private Bitmap mCachedWallpaper;
private int mCachedWallpaperUserId;
private Bitmap mDefaultWallpaper;
@@ -292,16 +293,16 @@
public Bitmap peekWallpaperBitmap(Context context, boolean returnDefault,
@SetWallpaperFlags int which, int userId) {
- synchronized (this) {
- if (mService != null) {
- try {
- if (!mService.isWallpaperSupported(context.getOpPackageName())) {
- return null;
- }
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
+ if (mService != null) {
+ try {
+ if (!mService.isWallpaperSupported(context.getOpPackageName())) {
+ return null;
}
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
}
+ }
+ synchronized (this) {
if (mCachedWallpaper != null && mCachedWallpaperUserId == userId) {
return mCachedWallpaper;
}
@@ -316,17 +317,21 @@
if (mCachedWallpaper != null) {
return mCachedWallpaper;
}
- if (returnDefault) {
- if (mDefaultWallpaper == null) {
- mDefaultWallpaper = getDefaultWallpaperLocked(context, which);
- }
- return mDefaultWallpaper;
- }
- return null;
}
+ if (returnDefault) {
+ Bitmap defaultWallpaper = mDefaultWallpaper;
+ if (defaultWallpaper == null) {
+ defaultWallpaper = getDefaultWallpaper(context, which);
+ synchronized (this) {
+ mDefaultWallpaper = defaultWallpaper;
+ }
+ }
+ return defaultWallpaper;
+ }
+ return null;
}
- public void forgetLoadedWallpaper() {
+ void forgetLoadedWallpaper() {
synchronized (this) {
mCachedWallpaper = null;
mCachedWallpaperUserId = 0;
@@ -361,7 +366,7 @@
return null;
}
- private Bitmap getDefaultWallpaperLocked(Context context, @SetWallpaperFlags int which) {
+ private Bitmap getDefaultWallpaper(Context context, @SetWallpaperFlags int which) {
InputStream is = openDefaultWallpaper(context, which);
if (is != null) {
try {
@@ -412,8 +417,14 @@
* This is returned as an
* abstract Drawable that you can install in a View to display whatever
* wallpaper the user has currently set.
+ * <p>
+ * This method can return null if there is no system wallpaper available, if
+ * wallpapers are not supported in the current user, or if the calling app is not
+ * permitted to access the system wallpaper.
*
- * @return Returns a Drawable object that will draw the wallpaper.
+ * @return Returns a Drawable object that will draw the system wallpaper,
+ * or {@code null} if no system wallpaper exists or if the calling application
+ * is not able to access the wallpaper.
*/
public Drawable getDrawable() {
Bitmap bm = sGlobals.peekWallpaperBitmap(mContext, true, FLAG_SYSTEM);
@@ -783,7 +794,7 @@
Log.w(TAG, "WallpaperService not running");
throw new RuntimeException(new DeadSystemException());
} else {
- return sGlobals.mService.getWallpaperInfo();
+ return sGlobals.mService.getWallpaperInfo(UserHandle.myUserId());
}
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -1399,12 +1410,26 @@
*/
@SystemApi
public boolean setWallpaperComponent(ComponentName name) {
+ return setWallpaperComponent(name, UserHandle.myUserId());
+ }
+
+ /**
+ * Set the live wallpaper.
+ *
+ * This can only be called by packages with android.permission.SET_WALLPAPER_COMPONENT
+ * permission. The caller must hold the INTERACT_ACROSS_USERS_FULL permission to change
+ * another user's wallpaper.
+ *
+ * @hide
+ */
+ public boolean setWallpaperComponent(ComponentName name, int userId) {
if (sGlobals.mService == null) {
Log.w(TAG, "WallpaperService not running");
throw new RuntimeException(new DeadSystemException());
}
try {
- sGlobals.mService.setWallpaperComponentChecked(name, mContext.getOpPackageName());
+ sGlobals.mService.setWallpaperComponentChecked(name, mContext.getOpPackageName(),
+ userId);
return true;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 76b002a..6176652 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -24,6 +24,7 @@
import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemApi;
import android.annotation.UserIdInt;
+import android.annotation.WorkerThread;
import android.app.Activity;
import android.app.admin.SecurityLog.SecurityEvent;
import android.content.ComponentName;
@@ -1315,7 +1316,7 @@
/**
* Retrieve the current minimum password quality for a particular admin or all admins that set
- * retrictions on this user and its participating profiles. Restrictions on profiles that have
+ * restrictions on this user and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
*
* <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -1379,7 +1380,7 @@
/**
* Retrieve the current minimum password length for a particular admin or all admins that set
- * retrictions on this user and its participating profiles. Restrictions on profiles that have
+ * restrictions on this user and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
*
* <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -1442,7 +1443,7 @@
/**
* Retrieve the current number of upper case letters required in the password
- * for a particular admin or all admins that set retrictions on this user and
+ * for a particular admin or all admins that set restrictions on this user and
* its participating profiles. Restrictions on profiles that have a separate challenge
* are not taken into account.
* This is the same value as set by
@@ -1511,7 +1512,7 @@
/**
* Retrieve the current number of lower case letters required in the password
- * for a particular admin or all admins that set retrictions on this user
+ * for a particular admin or all admins that set restrictions on this user
* and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
* This is the same value as set by
@@ -1580,7 +1581,7 @@
/**
* Retrieve the current number of letters required in the password
- * for a particular admin or all admins that set retrictions on this user
+ * for a particular admin or all admins that set restrictions on this user
* and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
* This is the same value as set by
@@ -1648,7 +1649,7 @@
/**
* Retrieve the current number of numerical digits required in the password
- * for a particular admin or all admins that set retrictions on this user
+ * for a particular admin or all admins that set restrictions on this user
* and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
* This is the same value as set by
@@ -1716,7 +1717,7 @@
/**
* Retrieve the current number of symbols required in the password
- * for a particular admin or all admins that set retrictions on this user
+ * for a particular admin or all admins that set restrictions on this user
* and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account. This is the same value as
* set by {@link #setPasswordMinimumSymbols(ComponentName, int)}
@@ -1783,7 +1784,7 @@
/**
* Retrieve the current number of non-letter characters required in the password
- * for a particular admin or all admins that set retrictions on this user
+ * for a particular admin or all admins that set restrictions on this user
* and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
* This is the same value as set by
@@ -1915,7 +1916,7 @@
/**
* Get the current password expiration time for a particular admin or all admins that set
- * retrictions on this user and its participating profiles. Restrictions on profiles that have
+ * restrictions on this user and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account. If admin is {@code null}, then a composite
* of all expiration times is returned - which will be the minimum of all of them.
*
@@ -1939,7 +1940,7 @@
/**
* Retrieve the current password history length for a particular admin or all admins that
- * set retrictions on this user and its participating profiles. Restrictions on profiles that
+ * set restrictions on this user and its participating profiles. Restrictions on profiles that
* have a separate challenge are not taken into account.
*
* <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -2121,7 +2122,7 @@
/**
* Retrieve the current maximum number of login attempts that are allowed before the device
- * or profile is wiped, for a particular admin or all admins that set retrictions on this user
+ * or profile is wiped, for a particular admin or all admins that set restrictions on this user
* and its participating profiles. Restrictions on profiles that have a separate challenge are
* not taken into account.
*
@@ -2262,7 +2263,7 @@
/**
* Retrieve the current maximum time to unlock for a particular admin or all admins that set
- * retrictions on this user and its participating profiles. Restrictions on profiles that have
+ * restrictions on this user and its participating profiles. Restrictions on profiles that have
* a separate challenge are not taken into account.
*
* <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -2510,6 +2511,8 @@
/**
* Result code for {@link #setStorageEncryption} and {@link #getStorageEncryptionStatus}:
* indicating that encryption is active.
+ * <p>
+ * Also see {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER}.
*/
public static final int ENCRYPTION_STATUS_ACTIVE = 3;
@@ -2522,7 +2525,11 @@
/**
* Result code for {@link #getStorageEncryptionStatus}:
- * indicating that encryption is active and the encryption key is tied to the user.
+ * indicating that encryption is active and the encryption key is tied to the user or profile.
+ * <p>
+ * This value is only returned to apps targeting API level 24 and above. For apps targeting
+ * earlier API levels, {@link #ENCRYPTION_STATUS_ACTIVE} is returned, even if the
+ * encryption key is specific to the user or profile.
*/
public static final int ENCRYPTION_STATUS_ACTIVE_PER_USER = 5;
@@ -2649,7 +2656,7 @@
/**
* Called by an application that is administering the device to
* determine the current encryption status of the device.
- *
+ * <p>
* Depending on the returned status code, the caller may proceed in different
* ways. If the result is {@link #ENCRYPTION_STATUS_UNSUPPORTED}, the
* storage system does not support encryption. If the
@@ -2657,13 +2664,14 @@
* #ACTION_START_ENCRYPTION} to begin the process of encrypting or decrypting the
* storage. If the result is {@link #ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY}, the
* storage system has enabled encryption but no password is set so further action
- * may be required. If the result is {@link #ENCRYPTION_STATUS_ACTIVATING} or
- * {@link #ENCRYPTION_STATUS_ACTIVE}, no further action is required.
+ * may be required. If the result is {@link #ENCRYPTION_STATUS_ACTIVATING},
+ * {@link #ENCRYPTION_STATUS_ACTIVE} or {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER},
+ * no further action is required.
*
* @return current status of encryption. The value will be one of
* {@link #ENCRYPTION_STATUS_UNSUPPORTED}, {@link #ENCRYPTION_STATUS_INACTIVE},
* {@link #ENCRYPTION_STATUS_ACTIVATING}, {@link #ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY},
- * or {@link #ENCRYPTION_STATUS_ACTIVE}.
+ * {@link #ENCRYPTION_STATUS_ACTIVE}, or {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER}.
*/
public int getStorageEncryptionStatus() {
throwIfParentInstance("getStorageEncryptionStatus");
@@ -3342,7 +3350,7 @@
/**
* Determine whether or not features have been disabled in keyguard either by the calling
- * admin, if specified, or all admins that set retrictions on this user and its participating
+ * admin, if specified, or all admins that set restrictions on this user and its participating
* profiles. Restrictions on profiles that have a separate challenge are not taken into account.
*
* <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -4219,6 +4227,8 @@
* owner, and the application restrictions managing package via
* {@link #getApplicationRestrictions}.
*
+ * <p>NOTE: The method performs disk I/O and shouldn't be called on the main thread
+ *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with, or
* {@code null} if called by the application restrictions managing package.
* @param packageName The name of the package to update restricted settings for.
@@ -4228,6 +4238,7 @@
* @see #setApplicationRestrictionsManagingPackage
* @see UserManager#KEY_RESTRICTIONS_PENDING
*/
+ @WorkerThread
public void setApplicationRestrictions(@Nullable ComponentName admin, String packageName,
Bundle settings) {
throwIfParentInstance("setApplicationRestrictions");
@@ -4974,6 +4985,8 @@
* application restrictions via {@link #setApplicationRestrictionsManagingPackage}; otherwise a
* security exception will be thrown.
*
+ * <p>NOTE: The method performs disk I/O and shouldn't be called on the main thread
+ *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with, or
* {@code null} if called by the application restrictions managing package.
* @param packageName The name of the package to fetch restricted settings of.
@@ -4983,6 +4996,7 @@
* @throws SecurityException if {@code admin} is not a device or profile owner.
* @see {@link #setApplicationRestrictionsManagingPackage}
*/
+ @WorkerThread
public Bundle getApplicationRestrictions(@Nullable ComponentName admin, String packageName) {
throwIfParentInstance("getApplicationRestrictions");
if (mService != null) {
@@ -6418,6 +6432,43 @@
}
}
+ /**
+ * @hide
+ * @return whether {@link android.provider.Settings.Global#DEVICE_PROVISIONED} has ever been set
+ * to 1.
+ */
+ public boolean isDeviceProvisioned() {
+ try {
+ return mService.isDeviceProvisioned();
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * @hide
+ * Writes that the provisioning configuration has been applied.
+ */
+ public void setDeviceProvisioningConfigApplied() {
+ try {
+ mService.setDeviceProvisioningConfigApplied();
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * @hide
+ * @return whether the provisioning configuration has been applied.
+ */
+ public boolean isDeviceProvisioningConfigApplied() {
+ try {
+ return mService.isDeviceProvisioningConfigApplied();
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
private void throwIfParentInstance(String functionName) {
if (mParentInstance) {
throw new SecurityException(functionName + " cannot be called on the parent instance");
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index ddec412..1036f04 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -301,4 +301,8 @@
boolean isUninstallInQueue(String packageName);
void uninstallPackageWithActiveAdmins(String packageName);
+
+ boolean isDeviceProvisioned();
+ boolean isDeviceProvisioningConfigApplied();
+ void setDeviceProvisioningConfigApplied();
}
diff --git a/core/java/android/app/backup/WallpaperBackupHelper.java b/core/java/android/app/backup/WallpaperBackupHelper.java
index f256a95..f987468 100644
--- a/core/java/android/app/backup/WallpaperBackupHelper.java
+++ b/core/java/android/app/backup/WallpaperBackupHelper.java
@@ -42,7 +42,7 @@
// If 'true', then apply an acceptable-size heuristic at restore time, dropping back
// to the factory default wallpaper if the restored one differs "too much" from the
// device's preferred wallpaper image dimensions.
- private static final boolean REJECT_OUTSIZED_RESTORE = true;
+ private static final boolean REJECT_OUTSIZED_RESTORE = false;
// When outsized restore rejection is enabled, this is the maximum ratio between the
// source and target image heights that will be permitted. The ratio is checked both
@@ -60,6 +60,9 @@
public static final String WALLPAPER_IMAGE =
new File(Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM),
"wallpaper").getAbsolutePath();
+ public static final String WALLPAPER_ORIG_IMAGE =
+ new File(Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM),
+ "wallpaper_orig").getAbsolutePath();
public static final String WALLPAPER_INFO =
new File(Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM),
"wallpaper_info.xml").getAbsolutePath();
@@ -199,7 +202,7 @@
// since it does not exist anywhere other than the private wallpaper
// file.
Slog.d(TAG, "Applying restored wallpaper image.");
- f.renameTo(new File(WALLPAPER_IMAGE));
+ f.renameTo(new File(WALLPAPER_ORIG_IMAGE));
}
}
}
diff --git a/core/java/android/app/job/JobInfo.java b/core/java/android/app/job/JobInfo.java
index 49f32ab..2d6b45d 100644
--- a/core/java/android/app/job/JobInfo.java
+++ b/core/java/android/app/job/JobInfo.java
@@ -166,6 +166,9 @@
* network restrictions for the requesting app. Note that this flag alone
* doesn't actually place your {@link JobService} in the foreground; you
* still need to post the notification yourself.
+ * <p>
+ * To use this flag, the caller must hold the
+ * {@link android.Manifest.permission#CONNECTIVITY_INTERNAL} permission.
*
* @hide
*/
diff --git a/core/java/android/app/job/JobScheduler.java b/core/java/android/app/job/JobScheduler.java
index 9618cd10..1b640d0 100644
--- a/core/java/android/app/job/JobScheduler.java
+++ b/core/java/android/app/job/JobScheduler.java
@@ -18,6 +18,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import java.util.List;
@@ -75,6 +76,7 @@
* @return {@link #RESULT_SUCCESS} or {@link #RESULT_FAILURE}
* @hide
*/
+ @SystemApi
public abstract int scheduleAsPackage(JobInfo job, String packageName, int userId, String tag);
/**
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index cd1a3dd..073196c 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -23,6 +23,7 @@
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemApi;
+import android.app.ActivityThread;
import android.bluetooth.le.BluetoothLeAdvertiser;
import android.bluetooth.le.BluetoothLeScanner;
import android.bluetooth.le.ScanCallback;
@@ -252,6 +253,29 @@
"android.bluetooth.adapter.action.REQUEST_ENABLE";
/**
+ * Activity Action: Show a system activity that allows the user to turn off
+ * Bluetooth. This is used only if permission review is enabled which is for
+ * apps targeting API less than 23 require a permission review before any of
+ * the app's components can run.
+ * <p>This system activity will return once Bluetooth has completed turning
+ * off, or the user has decided not to turn Bluetooth off.
+ * <p>Notification of the result of this activity is posted using the
+ * {@link android.app.Activity#onActivityResult} callback. The
+ * <code>resultCode</code>
+ * will be {@link android.app.Activity#RESULT_OK} if Bluetooth has been
+ * turned off or {@link android.app.Activity#RESULT_CANCELED} if the user
+ * has rejected the request or an error has occurred.
+ * <p>Applications can also listen for {@link #ACTION_STATE_CHANGED}
+ * for global notification whenever Bluetooth is turned on or off.
+ * <p>Requires {@link android.Manifest.permission#BLUETOOTH}
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_REQUEST_DISABLE =
+ "android.bluetooth.adapter.action.REQUEST_DISABLE";
+
+ /**
* Activity Action: Show a system activity that allows user to enable BLE scans even when
* Bluetooth is turned off.<p>
*
@@ -775,7 +799,7 @@
try {
if (DBG) Log.d(TAG, "Calling enableBLE");
mManagerService.updateBleAppCount(mToken, true);
- return mManagerService.enable();
+ return mManagerService.enable(ActivityThread.currentPackageName());
} catch (RemoteException e) {
Log.e(TAG, "", e);
}
@@ -902,7 +926,7 @@
return true;
}
try {
- return mManagerService.enable();
+ return mManagerService.enable(ActivityThread.currentPackageName());
} catch (RemoteException e) {Log.e(TAG, "", e);}
return false;
}
@@ -934,7 +958,7 @@
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
public boolean disable() {
try {
- return mManagerService.disable(true);
+ return mManagerService.disable(ActivityThread.currentPackageName(), true);
} catch (RemoteException e) {Log.e(TAG, "", e);}
return false;
}
@@ -952,7 +976,7 @@
public boolean disable(boolean persist) {
try {
- return mManagerService.disable(persist);
+ return mManagerService.disable(ActivityThread.currentPackageName(), persist);
} catch (RemoteException e) {Log.e(TAG, "", e);}
return false;
}
diff --git a/core/java/android/bluetooth/BluetoothHeadsetClient.java b/core/java/android/bluetooth/BluetoothHeadsetClient.java
index 874026f..93790fe 100644
--- a/core/java/android/bluetooth/BluetoothHeadsetClient.java
+++ b/core/java/android/bluetooth/BluetoothHeadsetClient.java
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
/**
* Public API to control Hands Free Profile (HFP role only).
@@ -799,7 +800,9 @@
* Works only when Extended Call Control is supported by Audio Gateway.
*
* @param device remote device
- * @param index index of the call to be terminated
+ * @param call Handle of call obtained in {@link dial()} or obtained via
+ * {@link ACTION_CALL_CHANGED}. {@code call} may be null in which
+ * case we will hangup all active calls.
* @return <code>true</code> if command has been issued successfully;
* <code>false</code> otherwise;
* upon completion HFP sends {@link #ACTION_CALL_CHANGED}
@@ -809,12 +812,12 @@
* {@link #EXTRA_AG_FEATURE_ECC}.
* This method invocation will fail silently when feature is not supported.</p>
*/
- public boolean terminateCall(BluetoothDevice device, int index) {
+ public boolean terminateCall(BluetoothDevice device, BluetoothHeadsetClientCall call) {
if (DBG) log("terminateCall()");
if (mService != null && isEnabled() &&
isValidDevice(device)) {
try {
- return mService.terminateCall(device, index);
+ return mService.terminateCall(device, call);
} catch (RemoteException e) {
Log.e(TAG, Log.getStackTraceString(new Throwable()));
}
@@ -883,41 +886,18 @@
}
/**
- * Redials last number from Audio Gateway.
- *
- * @param device remote device
- * @return <code>true</code> if command has been issued successfully;
- * <code>false</code> otherwise;
- * upon completion HFP sends {@link #ACTION_CALL_CHANGED}
- * intent in case of success; {@link #ACTION_RESULT} is sent
- * otherwise;
- */
- public boolean redial(BluetoothDevice device) {
- if (DBG) log("redial()");
- if (mService != null && isEnabled() &&
- isValidDevice(device)) {
- try {
- return mService.redial(device);
- } catch (RemoteException e) {
- Log.e(TAG, Log.getStackTraceString(new Throwable()));
- }
- }
- if (mService == null) Log.w(TAG, "Proxy not attached to service");
- return false;
- }
-
- /**
* Places a call with specified number.
*
* @param device remote device
* @param number valid phone number
- * @return <code>true</code> if command has been issued successfully;
- * <code>false</code> otherwise;
- * upon completion HFP sends {@link #ACTION_CALL_CHANGED}
- * intent in case of success; {@link #ACTION_RESULT} is sent
- * otherwise;
+ * @return <code>{@link BluetoothHeadsetClientCall} call</code> if command has been
+ * issued successfully;
+ * <code>{@link null}</code> otherwise;
+ * upon completion HFP sends {@link #ACTION_CALL_CHANGED}
+ * intent in case of success; {@link #ACTION_RESULT} is sent
+ * otherwise;
*/
- public boolean dial(BluetoothDevice device, String number) {
+ public BluetoothHeadsetClientCall dial(BluetoothDevice device, String number) {
if (DBG) log("dial()");
if (mService != null && isEnabled() &&
isValidDevice(device)) {
@@ -928,32 +908,7 @@
}
}
if (mService == null) Log.w(TAG, "Proxy not attached to service");
- return false;
- }
-
- /**
- * Places a call to the number under specified memory location.
- *
- * @param device remote device
- * @param location valid memory location
- * @return <code>true</code> if command has been issued successfully;
- * <code>false</code> otherwise;
- * upon completion HFP sends {@link #ACTION_CALL_CHANGED}
- * intent in case of success; {@link #ACTION_RESULT} is sent
- * otherwise;
- */
- public boolean dialMemory(BluetoothDevice device, int location) {
- if (DBG) log("dialMemory()");
- if (mService != null && isEnabled() &&
- isValidDevice(device)) {
- try {
- return mService.dialMemory(device, location);
- } catch (RemoteException e) {
- Log.e(TAG, Log.getStackTraceString(new Throwable()));
- }
- }
- if (mService == null) Log.w(TAG, "Proxy not attached to service");
- return false;
+ return null;
}
/**
diff --git a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java
index c73bc3c..420c079f 100644
--- a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java
+++ b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java
@@ -18,6 +18,7 @@
import android.os.Parcel;
import android.os.Parcelable;
+import android.os.SystemClock;
import java.util.UUID;
@@ -70,6 +71,7 @@
private boolean mMultiParty;
private final boolean mOutgoing;
private final UUID mUUID;
+ private final long mCreationElapsedMilli;
/**
* Creates BluetoothHeadsetClientCall instance.
@@ -88,6 +90,7 @@
mNumber = number != null ? number : "";
mMultiParty = multiParty;
mOutgoing = outgoing;
+ mCreationElapsedMilli = SystemClock.elapsedRealtime();
}
/**
@@ -171,6 +174,15 @@
}
/**
+ * Gets call's creation time in millis since epoch.
+ *
+ * @return long representing the creation time.
+ */
+ public long getCreationElapsedMilli() {
+ return mCreationElapsedMilli;
+ }
+
+ /**
* Checks if call is an active call in a conference mode (aka multi party).
*
* @return <code>true</code> if call is a multi party call,
diff --git a/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl b/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl
index 79ae4e4..a351bd2 100644
--- a/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl
+++ b/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl
@@ -47,14 +47,12 @@
boolean acceptCall(in BluetoothDevice device, int flag);
boolean holdCall(in BluetoothDevice device);
boolean rejectCall(in BluetoothDevice device);
- boolean terminateCall(in BluetoothDevice device, int index);
+ boolean terminateCall(in BluetoothDevice device, in BluetoothHeadsetClientCall call);
boolean enterPrivateMode(in BluetoothDevice device, int index);
boolean explicitCallTransfer(in BluetoothDevice device);
- boolean redial(in BluetoothDevice device);
- boolean dial(in BluetoothDevice device, String number);
- boolean dialMemory(in BluetoothDevice device, int location);
+ BluetoothHeadsetClientCall dial(in BluetoothDevice device, String number);
boolean sendDTMF(in BluetoothDevice device, byte code);
boolean getLastVoiceTagNumber(in BluetoothDevice device);
diff --git a/core/java/android/bluetooth/IBluetoothManager.aidl b/core/java/android/bluetooth/IBluetoothManager.aidl
index 2b853a3..3af4a4d 100644
--- a/core/java/android/bluetooth/IBluetoothManager.aidl
+++ b/core/java/android/bluetooth/IBluetoothManager.aidl
@@ -34,9 +34,9 @@
void registerStateChangeCallback(in IBluetoothStateChangeCallback callback);
void unregisterStateChangeCallback(in IBluetoothStateChangeCallback callback);
boolean isEnabled();
- boolean enable();
+ boolean enable(String packageName);
boolean enableNoAutoConnect();
- boolean disable(boolean persist);
+ boolean disable( String packageName, boolean persist);
int getState();
IBluetoothGatt getBluetoothGatt();
@@ -50,3 +50,4 @@
int updateBleAppCount(IBinder b, boolean enable);
boolean isBleAppPresent();
}
+
diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java
index 90b58aa..5162a73 100644
--- a/core/java/android/content/ClipData.java
+++ b/core/java/android/content/ClipData.java
@@ -191,6 +191,14 @@
final Intent mIntent;
Uri mUri;
+ /** @hide */
+ public Item(Item other) {
+ mText = other.mText;
+ mHtmlText = other.mHtmlText;
+ mIntent = other.mIntent;
+ mUri = other.mUri;
+ }
+
/**
* Create an Item consisting of a single block of (possibly styled) text.
*/
@@ -834,6 +842,11 @@
return mItems.get(index);
}
+ /** @hide */
+ public void setItemAt(int index, Item item) {
+ mItems.set(index, item);
+ }
+
/**
* Prepare this {@link ClipData} to leave an app process.
*
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index c8d8920..b3320d6 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -34,6 +34,7 @@
import android.database.Cursor;
import android.database.IContentObserver;
import android.graphics.Point;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.CancellationSignal;
@@ -51,6 +52,7 @@
import android.util.Log;
import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.MimeIconUtils;
import com.android.internal.util.Preconditions;
import dalvik.system.CloseGuard;
@@ -2693,4 +2695,9 @@
public int resolveUserId(Uri uri) {
return ContentProvider.getUserIdFromUri(uri, mContext.getUserId());
}
+
+ /** @hide */
+ public Drawable getTypeDrawable(String mimeType) {
+ return MimeIconUtils.loadMimeIcon(mContext, mimeType);
+ }
}
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index f51fe58..467eb89 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2028,6 +2028,27 @@
public abstract void sendBroadcastAsUser(@RequiresPermission Intent intent,
UserHandle user, @Nullable String receiverPermission);
+ /**
+ * Version of {@link #sendBroadcast(Intent, String, Bundle)} that allows you to specify the
+ * user the broadcast will be sent to. This is not available to applications
+ * that are not pre-installed on the system image. Using it requires holding
+ * the INTERACT_ACROSS_USERS permission.
+ *
+ * @param intent The Intent to broadcast; all receivers matching this
+ * Intent will receive the broadcast.
+ * @param user UserHandle to send the intent to.
+ * @param receiverPermission (optional) String naming a permission that
+ * a receiver must hold in order to receive your broadcast.
+ * If null, no permission is required.
+ * @param options (optional) Additional sending options, generated from a
+ * {@link android.app.BroadcastOptions}.
+ *
+ * @see #sendBroadcast(Intent, String, Bundle)
+ * @hide
+ */
+ @SystemApi
+ public abstract void sendBroadcastAsUser(@RequiresPermission Intent intent,
+ UserHandle user, @Nullable String receiverPermission, @Nullable Bundle options);
/**
* Version of {@link #sendBroadcast(Intent, String)} that allows you to specify the
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 60da63e..edc8d82 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -498,6 +498,13 @@
/** @hide */
@Override
public void sendBroadcastAsUser(Intent intent, UserHandle user,
+ String receiverPermission, Bundle options) {
+ mBase.sendBroadcastAsUser(intent, user, receiverPermission, options);
+ }
+
+ /** @hide */
+ @Override
+ public void sendBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp) {
mBase.sendBroadcastAsUser(intent, user, receiverPermission, appOp);
}
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 9f5b838..d537739 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2219,6 +2219,22 @@
"android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE";
/**
+ * Broadcast Action: preferred activities have changed *explicitly*.
+ *
+ * <p>Note there are cases where a preferred activity is invalidated *implicitly*, e.g.
+ * when an app is installed or uninstalled, but in such cases this broadcast will *not*
+ * be sent.
+ *
+ * {@link #EXTRA_USER_HANDLE} contains the user ID in question.
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+ public static final String ACTION_PREFERRED_ACTIVITY_CHANGED =
+ "android.intent.action.ACTION_PREFERRED_ACTIVITY_CHANGED";
+
+
+ /**
* Broadcast Action: The current system wallpaper has changed. See
* {@link android.app.WallpaperManager} for retrieving the new wallpaper.
* This should <em>only</em> be used to determine when the wallpaper
@@ -4298,6 +4314,14 @@
public static final int FLAG_DEBUG_TRIAGED_MISSING = 0x00000100;
/**
+ * Internal flag used to indicate ephemeral applications should not be
+ * considered when resolving the intent.
+ *
+ * @hide
+ */
+ public static final int FLAG_IGNORE_EPHEMERAL = 0x00000200;
+
+ /**
* If set, the new activity is not kept in the history stack. As soon as
* the user navigates away from it, the activity is finished. This may also
* be set with the {@link android.R.styleable#AndroidManifestActivity_noHistory
diff --git a/core/java/android/content/UriMatcher.java b/core/java/android/content/UriMatcher.java
index 71a035e..444edd0 100644
--- a/core/java/android/content/UriMatcher.java
+++ b/core/java/android/content/UriMatcher.java
@@ -167,7 +167,7 @@
if (path != null) {
String newPath = path;
// Strip leading slash if present.
- if (path.length() > 0 && path.charAt(0) == '/') {
+ if (path.length() > 1 && path.charAt(0) == '/') {
newPath = path.substring(1);
}
tokens = newPath.split("/");
diff --git a/core/java/android/content/pm/IOtaDexopt.aidl b/core/java/android/content/pm/IOtaDexopt.aidl
index 786a77f..467bd5f 100644
--- a/core/java/android/content/pm/IOtaDexopt.aidl
+++ b/core/java/android/content/pm/IOtaDexopt.aidl
@@ -50,6 +50,13 @@
/**
* Optimize the next package. Note: this command is synchronous, that is, only returns after
* the package has been dexopted (or dexopting failed).
+ *
+ * Note: this will be removed after a transition period. Use nextDexoptCommand instead.
*/
void dexoptNextPackage();
+
+ /**
+ * Get the optimization parameters for the next package.
+ */
+ String nextDexoptCommand();
}
diff --git a/core/java/android/content/pm/IShortcutService.aidl b/core/java/android/content/pm/IShortcutService.aidl
index 7ba1b8b..1bf2ab0 100644
--- a/core/java/android/content/pm/IShortcutService.aidl
+++ b/core/java/android/content/pm/IShortcutService.aidl
@@ -41,12 +41,12 @@
boolean updateShortcuts(String packageName, in ParceledListSlice shortcuts, int userId);
- void disableShortcuts(String packageName, in List shortcutIds, String disabledMessage,
+ void disableShortcuts(String packageName, in List shortcutIds, CharSequence disabledMessage,
int disabledMessageResId, int userId);
void enableShortcuts(String packageName, in List shortcutIds, int userId);
- int getMaxShortcutCountForActivity(String packageName, int userId);
+ int getMaxShortcutCountPerActivity(String packageName, int userId);
int getRemainingCallCount(String packageName, int userId);
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index d57968f..b9b609b 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -20,6 +20,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
+import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -164,17 +165,19 @@
}
/**
- * Indicates that one or more shortcuts (which may be dynamic and/or pinned)
+ * Indicates that one or more shortcuts of any kind (dynamic, pinned, or manifest)
* have been added, updated or removed.
*
* <p>Only the applications that are allowed to access the shortcut information,
* as defined in {@link #hasShortcutHostPermission()}, will receive it.
*
* @param packageName The name of the package that has the shortcuts.
- * @param shortcuts all shortcuts from the package (dynamic, manifest and/or pinned).
+ * @param shortcuts All shortcuts from the package (dynamic, manifest and/or pinned).
* Only "key" information will be provided, as defined in
* {@link ShortcutInfo#hasKeyFieldsOnly()}.
* @param user The UserHandle of the profile that generated the change.
+ *
+ * @see ShortcutManager
*/
public void onShortcutsChanged(@NonNull String packageName,
@NonNull List<ShortcutInfo> shortcuts, @NonNull UserHandle user) {
@@ -221,8 +224,21 @@
public static final int FLAG_GET_ALL_KINDS = FLAG_MATCH_ALL_KINDS;
/**
- * Requests "key" fields only. See {@link ShortcutInfo#hasKeyFieldsOnly()} for which
- * fields are available.
+ * Requests "key" fields only. See {@link ShortcutInfo#hasKeyFieldsOnly()}'s javadoc to
+ * see which fields fields "key".
+ * This allows quicker access to shortcut information in order to
+ * determine whether the caller's in-memory cache needs to be updated.
+ *
+ * <p>Typically, launcher applications cache all or most shortcut information
+ * in memory in order to show shortcuts without a delay.
+ *
+ * When a given launcher application wants to update its cache, such as when its process
+ * restarts, it can fetch shortcut information with this flag.
+ * The application can then check {@link ShortcutInfo#getLastChangedTimestamp()} for each
+ * shortcut, fetching a shortcut's non-key information only if that shortcut has been
+ * updated.
+ *
+ * @see ShortcutManager
*/
public static final int FLAG_GET_KEY_FIELDS_ONLY = 1 << 2;
@@ -255,8 +271,9 @@
}
/**
- * If non-zero, returns only shortcuts that have been added or updated since the timestamp,
- * which is a milliseconds since the Epoch.
+ * If non-zero, returns only shortcuts that have been added or updated
+ * since the given timestamp, expressed in milliseconds since the Epoch—see
+ * {@link System#currentTimeMillis()}.
*/
public ShortcutQuery setChangedSince(long changedSince) {
mChangedSince = changedSince;
@@ -273,7 +290,7 @@
/**
* If non-null, return only the specified shortcuts by ID. When setting this field,
- * a packange name must also be set with {@link #setPackage}.
+ * a package name must also be set with {@link #setPackage}.
*/
public ShortcutQuery setShortcutIds(@Nullable List<String> shortcutIds) {
mShortcutIds = shortcutIds;
@@ -291,7 +308,15 @@
}
/**
- * Set query options.
+ * Set query options. At least one of the {@code MATCH} flags should be set. Otherwise,
+ * no shortcuts will be returned.
+ *
+ * <ul>
+ * <li>{@link #FLAG_MATCH_DYNAMIC}
+ * <li>{@link #FLAG_MATCH_PINNED}
+ * <li>{@link #FLAG_MATCH_MANIFEST}
+ * <li>{@link #FLAG_GET_KEY_FIELDS_ONLY}
+ * </ul>
*/
public ShortcutQuery setQueryFlags(@QueryFlags int queryFlags) {
mQueryFlags = queryFlags;
@@ -460,10 +485,16 @@
*
* <p>Only the default launcher can access the shortcut information.
*
- * <p>Note when this method returns {@code false}, that may be a temporary situation because
+ * <p>Note when this method returns {@code false}, it may be a temporary situation because
* the user is trying a new launcher application. The user may decide to change the default
- * launcher to the calling application again, so even if a launcher application loses
+ * launcher back to the calling application again, so even if a launcher application loses
* this permission, it does <b>not</b> have to purge pinned shortcut information.
+ * If the calling launcher application contains pinned shortcuts, they will still work,
+ * even though the caller no longer has the shortcut host permission.
+ *
+ * <p>Returns {@code false} when the user is locked.
+ *
+ * @see ShortcutManager
*/
public boolean hasShortcutHostPermission() {
try {
@@ -474,15 +505,20 @@
}
/**
- * Returns the IDs of {@link ShortcutInfo}s that match {@code query}.
+ * Returns {@link ShortcutInfo}s that match {@code query}.
*
* <p>Callers must be allowed to access the shortcut information, as defined in {@link
* #hasShortcutHostPermission()}.
*
+ * <p>Returns am empty list when the user is locked, or when the {@code user} user
+ * is locked or not running.
+ *
* @param query result includes shortcuts matching this query.
* @param user The UserHandle of the profile.
*
* @return the IDs of {@link ShortcutInfo}s that match the query.
+ *
+ * @see ShortcutManager
*/
@Nullable
public List<ShortcutInfo> getShortcuts(@NonNull ShortcutQuery query,
@@ -517,12 +553,17 @@
* <p>This API is <b>NOT</b> cumulative; this will replace all pinned shortcuts for the package.
* However, different launchers may have different set of pinned shortcuts.
*
- * <p>Callers must be allowed to access the shortcut information, as defined in {@link
- * #hasShortcutHostPermission()}.
+ * <p>The calling launcher application must be allowed to access the shortcut information,
+ * as defined in {@link #hasShortcutHostPermission()}.
+ *
+ * <p>Call will be ignored when the user is locked, or when the {@code user} user
+ * is locked or not running.
*
* @param packageName The target package name.
* @param shortcutIds The IDs of the shortcut to be pinned.
* @param user The UserHandle of the profile.
+ *
+ * @see ShortcutManager
*/
public void pinShortcuts(@NonNull String packageName, @NonNull List<String> shortcutIds,
@NonNull UserHandle user) {
@@ -586,11 +627,20 @@
/**
* Returns the icon for this shortcut, without any badging for the profile.
*
+ * <p>The calling launcher application must be allowed to access the shortcut information,
+ * as defined in {@link #hasShortcutHostPermission()}.
+ *
+ * <p>Returns {@code null} when the user is locked, or when the user owning the shortcut
+ * is locked or not running.
+ *
* @param density The preferred density of the icon, zero for default density. Use
* density DPI values from {@link DisplayMetrics}.
+ *
+ * @return The drawable associated with the shortcut.
+ *
+ * @see ShortcutManager
* @see #getShortcutBadgedIconDrawable(ShortcutInfo, int)
* @see DisplayMetrics
- * @return The drawable associated with the shortcut.
*/
public Drawable getShortcutIconDrawable(@NonNull ShortcutInfo shortcut, int density) {
if (shortcut.hasIconFile()) {
@@ -628,10 +678,18 @@
/**
* Returns the shortcut icon with badging appropriate for the profile.
*
+ * <p>The calling launcher application must be allowed to access the shortcut information,
+ * as defined in {@link #hasShortcutHostPermission()}.
+ *
+ * <p>Returns {@code 0} when the user is locked, or when the user owning the shortcut
+ * is locked or not running.
+ *
* @param density Optional density for the icon, or 0 to use the default density. Use
- * {@link DisplayMetrics} for DPI values.
- * @see DisplayMetrics
* @return A badged icon for the shortcut.
+ *
+ * @see ShortcutManager
+ * @see #getShortcutIconDrawable(ShortcutInfo, int)
+ * @see DisplayMetrics
*/
public Drawable getShortcutBadgedIconDrawable(ShortcutInfo shortcut, int density) {
final Drawable originalIcon = getShortcutIconDrawable(shortcut, density);
@@ -641,51 +699,65 @@
}
/**
- * Launches a shortcut.
+ * Starts a shortcut.
*
- * <p>Callers must be allowed to access the shortcut information, as defined in {@link
- * #hasShortcutHostPermission()}.
+ * <p>The calling launcher application must be allowed to access the shortcut information,
+ * as defined in {@link #hasShortcutHostPermission()}.
+ *
+ * <p>Throws {@link android.content.ActivityNotFoundException}
+ * when the user is locked, or when the {@code user} user
+ * is locked or not running.
*
* @param packageName The target shortcut package name.
* @param shortcutId The target shortcut ID.
* @param sourceBounds The Rect containing the source bounds of the clicked icon.
* @param startActivityOptions Options to pass to startActivity.
* @param user The UserHandle of the profile.
- * @return {@code false} when the shortcut is no longer valid (e.g. the creator application
- * has been uninstalled). {@code true} when the shortcut is still valid.
+ *
+ * @throws android.content.ActivityNotFoundException failed to start shortcut. (e.g.
+ * the shortcut no longer exists, is disabled, the intent receiver activity doesn't exist, etc)
*/
- public boolean startShortcut(@NonNull String packageName, @NonNull String shortcutId,
+ public void startShortcut(@NonNull String packageName, @NonNull String shortcutId,
@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions,
@NonNull UserHandle user) {
- return startShortcut(packageName, shortcutId, sourceBounds, startActivityOptions,
+ startShortcut(packageName, shortcutId, sourceBounds, startActivityOptions,
user.getIdentifier());
}
/**
* Launches a shortcut.
*
- * <p>Callers must be allowed to access the shortcut information, as defined in {@link
- * #hasShortcutHostPermission()}.
+ * <p>The calling launcher application must be allowed to access the shortcut information,
+ * as defined in {@link #hasShortcutHostPermission()}.
+ *
+ * <p>Throws {@link android.content.ActivityNotFoundException}
+ * when the user is locked, or when the user owning the shortcut
+ * is locked or not running.
*
* @param shortcut The target shortcut.
* @param sourceBounds The Rect containing the source bounds of the clicked icon.
* @param startActivityOptions Options to pass to startActivity.
- * @return {@code false} when the shortcut is no longer valid (e.g. the creator application
- * has been uninstalled). {@code true} when the shortcut is still valid.
+ *
+ * @throws android.content.ActivityNotFoundException failed to start shortcut. (e.g.
+ * the shortcut no longer exists, is disabled, the intent receiver activity doesn't exist, etc)
*/
- public boolean startShortcut(@NonNull ShortcutInfo shortcut,
+ public void startShortcut(@NonNull ShortcutInfo shortcut,
@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions) {
- return startShortcut(shortcut.getPackage(), shortcut.getId(),
+ startShortcut(shortcut.getPackage(), shortcut.getId(),
sourceBounds, startActivityOptions,
shortcut.getUserId());
}
- private boolean startShortcut(@NonNull String packageName, @NonNull String shortcutId,
+ private void startShortcut(@NonNull String packageName, @NonNull String shortcutId,
@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions,
int userId) {
try {
- return mService.startShortcut(mContext.getPackageName(), packageName, shortcutId,
+ final boolean success =
+ mService.startShortcut(mContext.getPackageName(), packageName, shortcutId,
sourceBounds, startActivityOptions, userId);
+ if (!success) {
+ throw new ActivityNotFoundException("Shortcut could not be started");
+ }
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index b06568c..7ba067b 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -132,6 +132,9 @@
MATCH_SYSTEM_ONLY,
MATCH_FACTORY_ONLY,
MATCH_DEBUG_TRIAGED_MISSING,
+ GET_DISABLED_COMPONENTS,
+ GET_DISABLED_UNTIL_USED_COMPONENTS,
+ GET_UNINSTALLED_PACKAGES,
})
@Retention(RetentionPolicy.SOURCE)
public @interface PackageInfoFlags {}
@@ -143,6 +146,9 @@
MATCH_UNINSTALLED_PACKAGES,
MATCH_SYSTEM_ONLY,
MATCH_DEBUG_TRIAGED_MISSING,
+ MATCH_DISABLED_UNTIL_USED_COMPONENTS,
+ GET_DISABLED_UNTIL_USED_COMPONENTS,
+ GET_UNINSTALLED_PACKAGES,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ApplicationInfoFlags {}
@@ -160,6 +166,9 @@
MATCH_DIRECT_BOOT_UNAWARE,
MATCH_SYSTEM_ONLY,
MATCH_UNINSTALLED_PACKAGES,
+ GET_DISABLED_COMPONENTS,
+ GET_DISABLED_UNTIL_USED_COMPONENTS,
+ GET_UNINSTALLED_PACKAGES,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ComponentInfoFlags {}
@@ -178,6 +187,9 @@
MATCH_DIRECT_BOOT_UNAWARE,
MATCH_SYSTEM_ONLY,
MATCH_UNINSTALLED_PACKAGES,
+ GET_DISABLED_COMPONENTS,
+ GET_DISABLED_UNTIL_USED_COMPONENTS,
+ GET_UNINSTALLED_PACKAGES,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ResolveInfoFlags {}
@@ -2869,6 +2881,7 @@
*
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
+ * @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3281,7 +3294,7 @@
* java.lang.SecurityException} is thrown.
* <p>
* <strong>Note: </strong>Using this API requires holding
- * android.permission.GRANT_REVOKE_PERMISSIONS and if the user id is
+ * android.permission.GRANT_RUNTIME_PERMISSIONS and if the user id is
* not the current user android.permission.INTERACT_ACROSS_USERS_FULL.
* </p>
*
@@ -3290,7 +3303,6 @@
* @param user The user for which to grant the permission.
*
* @see #revokeRuntimePermission(String, String, android.os.UserHandle)
- * @see android.content.pm.PackageManager.PermissionFlags
*
* @hide
*/
@@ -3306,7 +3318,7 @@
* java.lang.SecurityException} is thrown.
* <p>
* <strong>Note: </strong>Using this API requires holding
- * android.permission.GRANT_REVOKE_PERMISSIONS and if the user id is
+ * android.permission.REVOKE_RUNTIME_PERMISSIONS and if the user id is
* not the current user android.permission.INTERACT_ACROSS_USERS_FULL.
* </p>
*
@@ -3315,7 +3327,6 @@
* @param user The user for which to revoke the permission.
*
* @see #grantRuntimePermission(String, String, android.os.UserHandle)
- * @see android.content.pm.PackageManager.PermissionFlags
*
* @hide
*/
@@ -3497,6 +3508,7 @@
*
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
+ * @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -5367,6 +5379,14 @@
int newState, int flags);
/**
+ * Per-user version of {@link #setComponentEnabledSetting(ComponentName, int, int)}
+ *
+ * @hide
+ */
+ public abstract void setComponentEnabledSettingAsUser(ComponentName componentName,
+ int newState, int flags, int userId);
+
+ /**
* Return the enabled setting for a package component (activity,
* receiver, service, provider). This returns the last value set by
* {@link #setComponentEnabledSetting(ComponentName, int, int)}; in most
@@ -5405,6 +5425,14 @@
int newState, int flags);
/**
+ * Per-user version of {@link #setApplicationEnabledSetting(String, int, int)}
+ *
+ * @hide
+ */
+ public abstract void setApplicationEnabledSettingAsUser(String packageName,
+ int newState, int flags, int userId);
+
+ /**
* Return the enabled setting for an application. This returns
* the last value set by
* {@link #setApplicationEnabledSetting(String, int, int)}; in most
diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java
index 14f7727..d208fe7 100644
--- a/core/java/android/content/pm/PackageManagerInternal.java
+++ b/core/java/android/content/pm/PackageManagerInternal.java
@@ -157,7 +157,7 @@
int deviceOwnerUserId, String deviceOwner, SparseArray<String> profileOwners);
/**
- * Whether a package's data be cleared.
+ * Returns {@code true} if a given package can't be wiped. Otherwise, returns {@code false}.
*/
- public abstract boolean canPackageBeWiped(int userId, String packageName);
+ public abstract boolean isPackageDataProtected(int userId, String packageName);
}
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index a068095..503ca09 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -702,8 +702,10 @@
private static PackageLite parseMonolithicPackageLite(File packageFile, int flags)
throws PackageParserException {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parseApkLite");
final ApkLite baseApk = parseApkLite(packageFile, flags);
final String packagePath = packageFile.getAbsolutePath();
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
return new PackageLite(packagePath, baseApk, null, null, null);
}
@@ -718,6 +720,7 @@
String packageName = null;
int versionCode = 0;
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parseApkLite");
final ArrayMap<String, ApkLite> apks = new ArrayMap<>();
for (File file : files) {
if (isApkFile(file)) {
@@ -749,6 +752,7 @@
}
}
}
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
final ApkLite baseApk = apks.remove(null);
if (baseApk == null) {
@@ -1877,7 +1881,7 @@
sa = res.obtainAttributes(parser,
com.android.internal.R.styleable.AndroidManifestUsesSdk);
- int minVers = 0;
+ int minVers = 1;
String minCode = null;
int targetVers = 0;
String targetCode = null;
@@ -1904,9 +1908,6 @@
} else {
// If it's not a string, it's an integer.
targetVers = val.data;
- if (minVers == 0) {
- minVers = targetVers;
- }
}
}
diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java
index c9be6ed..b5df4d7 100644
--- a/core/java/android/content/pm/ResolveInfo.java
+++ b/core/java/android/content/pm/ResolveInfo.java
@@ -68,12 +68,6 @@
public EphemeralResolveInfo ephemeralResolveInfo;
/**
- * A ResolveInfo that points at the ephemeral installer.
- * @hide
- */
- public ResolveInfo ephemeralInstaller;
-
- /**
* The IntentFilter that was matched for this ResolveInfo.
*/
public IntentFilter filter;
diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java
index 35370f0..ed0ac53 100644
--- a/core/java/android/content/pm/ShortcutInfo.java
+++ b/core/java/android/content/pm/ShortcutInfo.java
@@ -19,11 +19,14 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
+import android.app.TaskStackBuilder;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.LauncherApps.ShortcutQuery;
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
+import android.graphics.Bitmap;
import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.os.Parcel;
@@ -42,20 +45,10 @@
import java.util.List;
import java.util.Set;
-// TODO Enhance javadoc
/**
+ * Represents a "launcher shortcut" that can be published via {@link ShortcutManager}.
*
- * Represents a shortcut from an application.
- *
- * <p>Notes about icons:
- * <ul>
- * <li>If an {@link Icon} is a resource, the system keeps the package name and the resource ID.
- * Otherwise, the bitmap is fetched when it's registered to ShortcutManager,
- * then shrunk if necessary, and persisted.
- * <li>The system disallows byte[] icons, because they can easily go over the binder size limit.
- * </ul>
- *
- * @see {@link ShortcutManager}.
+ * @see ShortcutManager
*/
public final class ShortcutInfo implements Parcelable {
static final String TAG = "Shortcut";
@@ -149,7 +142,7 @@
public @interface CloneFlags {}
/**
- * Shortcut category for
+ * Shortcut category for messaging related actions, such as chat.
*/
public static final String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";
@@ -189,16 +182,16 @@
private ArraySet<String> mCategories;
/**
- * Intent *with extras removed*.
+ * Intents *with extras removed*.
*/
@Nullable
- private Intent mIntent;
+ private Intent[] mIntents;
/**
- * Extras for the intent.
+ * Extras for the intents.
*/
@Nullable
- private PersistableBundle mIntentPersistableExtras;
+ private PersistableBundle[] mIntentPersistableExtrases;
private int mRank;
@@ -248,20 +241,36 @@
mDisabledMessage = b.mDisabledMessage;
mDisabledMessageResId = b.mDisabledMessageResId;
mCategories = cloneCategories(b.mCategories);
- mIntent = b.mIntent;
- if (mIntent != null) {
- final Bundle intentExtras = mIntent.getExtras();
- if (intentExtras != null) {
- mIntent.replaceExtras((Bundle) null);
- mIntentPersistableExtras = new PersistableBundle(intentExtras);
- }
- }
+ mIntents = cloneIntents(b.mIntents);
+ fixUpIntentExtras();
mRank = b.mRank;
mExtras = b.mExtras;
updateTimestamp();
}
- private ArraySet<String> cloneCategories(Set<String> source) {
+ /**
+ * Extract extras from {@link #mIntents} and set them to {@link #mIntentPersistableExtrases}
+ * as {@link PersistableBundle}, and remove extras from the original intents.
+ */
+ private void fixUpIntentExtras() {
+ if (mIntents == null) {
+ mIntentPersistableExtrases = null;
+ return;
+ }
+ mIntentPersistableExtrases = new PersistableBundle[mIntents.length];
+ for (int i = 0; i < mIntents.length; i++) {
+ final Intent intent = mIntents[i];
+ final Bundle extras = intent.getExtras();
+ if (extras == null) {
+ mIntentPersistableExtrases[i] = null;
+ } else {
+ mIntentPersistableExtrases[i] = new PersistableBundle(extras);
+ intent.replaceExtras((Bundle) null);
+ }
+ }
+ }
+
+ private static ArraySet<String> cloneCategories(Set<String> source) {
if (source == null) {
return null;
}
@@ -274,6 +283,32 @@
return ret;
}
+ private static Intent[] cloneIntents(Intent[] intents) {
+ if (intents == null) {
+ return null;
+ }
+ final Intent[] ret = new Intent[intents.length];
+ for (int i = 0; i < ret.length; i++) {
+ if (intents[i] != null) {
+ ret[i] = new Intent(intents[i]);
+ }
+ }
+ return ret;
+ }
+
+ private static PersistableBundle[] clonePersistableBundle(PersistableBundle[] bundle) {
+ if (bundle == null) {
+ return null;
+ }
+ final PersistableBundle[] ret = new PersistableBundle[bundle.length];
+ for (int i = 0; i < ret.length; i++) {
+ if (bundle[i] != null) {
+ ret[i] = new PersistableBundle(bundle[i]);
+ }
+ }
+ return ret;
+ }
+
/**
* Throws if any of the mandatory fields is not set.
*
@@ -285,7 +320,8 @@
if (mTitle == null && mTitleResId == 0) {
throw new IllegalArgumentException("Short label must be provided");
}
- Preconditions.checkNotNull(mIntent, "Shortcut Intent must be provided");
+ Preconditions.checkNotNull(mIntents, "Shortcut Intent must be provided");
+ Preconditions.checkArgument(mIntents.length > 0, "Shortcut Intent must be provided");
}
/**
@@ -317,8 +353,9 @@
mDisabledMessageResId = source.mDisabledMessageResId;
mCategories = cloneCategories(source.mCategories);
if ((cloneFlags & CLONE_REMOVE_INTENT) == 0) {
- mIntent = source.mIntent;
- mIntentPersistableExtras = source.mIntentPersistableExtras;
+ mIntents = cloneIntents(source.mIntents);
+ mIntentPersistableExtrases =
+ clonePersistableBundle(source.mIntentPersistableExtrases);
}
mRank = source.mRank;
mExtras = source.mExtras;
@@ -627,9 +664,10 @@
if (source.mCategories != null) {
mCategories = cloneCategories(source.mCategories);
}
- if (source.mIntent != null) {
- mIntent = source.mIntent;
- mIntentPersistableExtras = source.mIntentPersistableExtras;
+ if (source.mIntents != null) {
+ mIntents = cloneIntents(source.mIntents);
+ mIntentPersistableExtrases =
+ clonePersistableBundle(source.mIntentPersistableExtrases);
}
if (source.mRank != RANK_NOT_SET) {
mRank = source.mRank;
@@ -660,11 +698,13 @@
/** @hide */
public static IllegalArgumentException getInvalidIconException() {
return new IllegalArgumentException("Unsupported icon type:"
- +" only bitmap, resource and content URI are supported");
+ +" only the bitmap and resource types are supported");
}
/**
* Builder class for {@link ShortcutInfo} objects.
+ *
+ * @see ShortcutManager
*/
public static class Builder {
private final Context mContext;
@@ -689,14 +729,15 @@
private Set<String> mCategories;
- private Intent mIntent;
+ private Intent[] mIntents;
private int mRank = RANK_NOT_SET;
private PersistableBundle mExtras;
/**
- * Old style constructor. STOPSHIP hide it before launch.
+ * Old style constructor.
+ * @hide
*/
@Deprecated
public Builder(Context context) {
@@ -704,7 +745,8 @@
}
/**
- * Used with the old style constructor, kept for unit tests. STOPSHIP hide it before launch.
+ * Used with the old style constructor, kept for unit tests.
+ * @hide
*/
@NonNull
@Deprecated
@@ -725,19 +767,29 @@
}
/**
- * Sets the target activity. A shortcut will be shown with this activity on the launcher.
+ * Sets the target activity. A shortcut will be shown along with this activity's icon
+ * on the launcher.
*
- * <p>Only "main" activities -- i.e. ones with an intent filter for
- * {@link Intent#ACTION_MAIN} and {@link Intent#CATEGORY_LAUNCHER} can be target activities.
+ * When selecting a target activity, keep the following in mind:
+ * <ul>
+ * <li>All dynamic shortcuts must have a target activity. When a shortcut with no target
+ * activity is published using
+ * {@link ShortcutManager#addDynamicShortcuts(List)} or
+ * {@link ShortcutManager#setDynamicShortcuts(List)},
+ * the first main activity defined in the application's <code>AndroidManifest.xml</code>
+ * file is used.
*
- * <p>By default, the first main activity defined in the application manifest will be
- * the target.
+ * <li>Only "main" activities—ones that define the {@link Intent#ACTION_MAIN}
+ * and {@link Intent#CATEGORY_LAUNCHER} intent filters—can be target
+ * activities.
*
- * <p>The package name of the target activity must match the package name of the shortcut
- * publisher.
+ * <li>By default, the first main activity defined in the application manifest is
+ * the target activity.
*
- * <p>This has nothing to do with the activity that this shortcut will launch. This is
- * a hint to the launcher app about which launcher icon to associate this shortcut with.
+ * <li>A target activity must belong to the publisher application.
+ * </ul>
+ *
+ * @see ShortcutInfo#getActivity()
*/
@NonNull
public Builder setActivity(@NonNull ComponentName activity) {
@@ -746,18 +798,23 @@
}
/**
- * Sets an icon.
+ * Sets an icon of a shortcut.
*
- * <ul>
- * <li>Tints set by {@link Icon#setTint} or {@link Icon#setTintList} are not supported.
- * <li>Bitmaps and resources are supported, but "content:" URIs are not supported.
- * </ul>
- *
- * <p>For performance and security reasons, icons will <b>NOT</b> be available on instances
- * returned by {@link ShortcutManager} or {@link LauncherApps}. Default launcher application
- * can use {@link LauncherApps#getShortcutIconDrawable(ShortcutInfo, int)}
+ * <p>Icons are not available on {@link ShortcutInfo} instances
+ * returned by {@link ShortcutManager} or {@link LauncherApps}. The default launcher
+ * application can use {@link LauncherApps#getShortcutIconDrawable(ShortcutInfo, int)}
* or {@link LauncherApps#getShortcutBadgedIconDrawable(ShortcutInfo, int)} to fetch
* shortcut icons.
+ *
+ * <p>Tints set with {@link Icon#setTint} or {@link Icon#setTintList} are not supported
+ * and will be ignored.
+ *
+ * <p>Only icons created with {@link Icon#createWithBitmap(Bitmap)} and
+ * {@link Icon#createWithResource} are supported.
+ * Other types, such as URI-based icons, are not supported.
+ *
+ * @see LauncherApps#getShortcutIconDrawable(ShortcutInfo, int)
+ * @see LauncherApps#getShortcutBadgedIconDrawable(ShortcutInfo, int)
*/
@NonNull
public Builder setIcon(Icon icon) {
@@ -779,11 +836,15 @@
/**
* Sets the short title of a shortcut.
*
- * <p>This is a mandatory field, unless it's passed to
- * {@link ShortcutManager#updateShortcuts(List)}.
+ * <p>This is a mandatory field when publishing a new shortcut with
+ * {@link ShortcutManager#addDynamicShortcuts(List)} or
+ * {@link ShortcutManager#setDynamicShortcuts(List)}.
*
- * <p>This field is intended for a concise description of a shortcut displayed under
- * an icon. The recommend max length is 10 characters.
+ * <p>This field is intended to be a concise description of a shortcut.
+ *
+ * <p>The recommended maximum length is 10 characters.
+ *
+ * @see ShortcutInfo#getShortLabel()
*/
@NonNull
public Builder setShortLabel(@NonNull CharSequence shortLabel) {
@@ -807,8 +868,11 @@
* Sets the text of a shortcut.
*
* <p>This field is intended to be more descriptive than the shortcut title. The launcher
- * shows this instead of the short title, when it has enough space.
- * The recommend max length is 25 characters.
+ * shows this instead of the short title when it has enough space.
+ *
+ * <p>The recommend maximum length is 25 characters.
+ *
+ * @see ShortcutInfo#getLongLabel()
*/
@NonNull
public Builder setLongLabel(@NonNull CharSequence longLabel) {
@@ -852,6 +916,12 @@
return this;
}
+ /**
+ * Sets the message that should be shown when the user attempts to start a shortcut that
+ * is disabled.
+ *
+ * @see ShortcutInfo#getDisabledMessage()
+ */
@NonNull
public Builder setDisabledMessage(@NonNull CharSequence disabledMessage) {
Preconditions.checkState(
@@ -867,6 +937,7 @@
* categorise shortcuts.
*
* @see #SHORTCUT_CATEGORY_CONVERSATION
+ * @see ShortcutInfo#getCategories()
*/
@NonNull
public Builder setCategories(Set<String> categories) {
@@ -875,19 +946,56 @@
}
/**
- * Sets the intent of a shortcut. This is a mandatory field. The extras must only contain
- * persistable information. (See {@link PersistableBundle}).
+ * Sets the intent of a shortcut. Alternatively, {@link #setIntents(Intent[])} can be used
+ * to launch an activity with other activities in the back stack.
+ *
+ * <p>This is a mandatory field when publishing a new shortcut with
+ * {@link ShortcutManager#addDynamicShortcuts(List)} or
+ * {@link ShortcutManager#setDynamicShortcuts(List)}.
+ *
+ * <p>A shortcut can launch any intent that the publisher application has permission to
+ * launch. For example, a shortcut can launch an unexported activity within the publisher
+ * application. A shortcut intent doesn't have to point at the target activity.
+ *
+ * <p>The given {@code intent} can contain extras, but these extras must contain values
+ * of primitive types in order for the system to persist these values.
+ *
+ * @see ShortcutInfo#getIntent()
+ * @see #setIntents(Intent[])
*/
@NonNull
public Builder setIntent(@NonNull Intent intent) {
- mIntent = Preconditions.checkNotNull(intent, "intent cannot be null");
- Preconditions.checkNotNull(mIntent.getAction(), "intent's action must be set");
+ return setIntents(new Intent[]{intent});
+ }
+
+ /**
+ * Sets multiple intents instead of a single intent, in order to launch an activity with
+ * other activities in back stack. Use {@link TaskStackBuilder} to build intents.
+ * See the {@link ShortcutManager} javadoc for details.
+ *
+ * @see Builder#setIntent(Intent)
+ * @see ShortcutInfo#getIntents()
+ * @see Context#startActivities(Intent[])
+ * @see TaskStackBuilder
+ */
+ @NonNull
+ public Builder setIntents(@NonNull Intent[] intents) {
+ Preconditions.checkNotNull(intents, "intents cannot be null");
+ Preconditions.checkNotNull(intents.length, "intents cannot be empty");
+ for (Intent intent : intents) {
+ Preconditions.checkNotNull(intent, "intents cannot contain null");
+ Preconditions.checkNotNull(intent.getAction(), "intent's action must be set");
+ }
+ // Make sure always clone incoming intents.
+ mIntents = cloneIntents(intents);
return this;
}
/**
* "Rank" of a shortcut, which is a non-negative value that's used by the launcher app
* to sort shortcuts.
+ *
+ * See {@link ShortcutInfo#getRank()} for details.
*/
@NonNull
public Builder setRank(int rank) {
@@ -898,10 +1006,10 @@
}
/**
- * Extras that application can set to any purposes.
+ * Extras that application can set for any purpose.
*
- * <p>Applications can store any meta-data of
- * shortcuts in this, and retrieve later from {@link ShortcutInfo#getExtras()}.
+ * <p>Applications can store arbitrary shortcut metadata in extras and retrieve the
+ * metadata later using {@link ShortcutInfo#getExtras()}.
*/
@NonNull
public Builder setExtras(@NonNull PersistableBundle extras) {
@@ -919,7 +1027,11 @@
}
/**
- * Return the ID of the shortcut.
+ * Returns the ID of a shortcut.
+ *
+ * <p>Shortcut IDs are unique within each publisher application and must be stable across
+ * devices so that shortcuts will still be valid when restored on a different device.
+ * See {@link ShortcutManager} for details.
*/
@NonNull
public String getId() {
@@ -927,7 +1039,7 @@
}
/**
- * Return the package name of the creator application.
+ * Return the package name of the publisher application.
*/
@NonNull
public String getPackage() {
@@ -935,11 +1047,11 @@
}
/**
- * Return the target activity, which may be null, in which case the shortcut is not associated
- * with a specific activity.
+ * Return the target activity.
*
- * <p>This has nothing to do with the activity that this shortcut will launch. This is
- * a hint to the launcher app that on which launcher icon this shortcut should be shown.
+ * <p>This has nothing to do with the activity that this shortcut will launch.
+ * Launcher applications should show the launcher icon for the returned activity alongside
+ * this shortcut.
*
* @see Builder#setActivity
*/
@@ -954,11 +1066,7 @@
}
/**
- * Icon.
- *
- * For performance reasons, this will <b>NOT</b> be available when an instance is returned
- * by {@link ShortcutManager} or {@link LauncherApps}. A launcher application needs to use
- * other APIs in LauncherApps to fetch the bitmap.
+ * Returns the shortcut icon.
*
* @hide
*/
@@ -994,49 +1102,55 @@
}
/**
- * Return the shorter version of the shortcut title.
+ * Return the shorter description of a shortcut.
*
- * <p>All shortcuts must have a non-empty title, but this method will return null when
- * {@link #hasKeyFieldsOnly()} is true.
+ * @see Builder#setShortLabel(CharSequence)
*/
@Nullable
public CharSequence getShortLabel() {
return mTitle;
}
- /** TODO Javadoc */
+ /** @hide */
public int getShortLabelResourceId() {
return mTitleResId;
}
/**
- * Return the shortcut text.
+ * Return the longer description of a shortcut.
+ *
+ * @see Builder#setLongLabel(CharSequence)
*/
@Nullable
public CharSequence getLongLabel() {
return mText;
}
- /** TODO Javadoc */
+ /** @hide */
public int getLongLabelResourceId() {
return mTextResId;
}
/**
- * Return the message that should be shown when a shortcut in disabled state is launched.
+ * Return the message that should be shown when the user attempts to start a shortcut
+ * that is disabled.
+ *
+ * @see Builder#setDisabledMessage(CharSequence)
*/
@Nullable
public CharSequence getDisabledMessage() {
return mDisabledMessage;
}
- /** TODO Javadoc */
+ /** @hide */
public int getDisabledMessageResourceId() {
return mDisabledMessageResId;
}
/**
- * Return the categories.
+ * Return the shortcut's categories.
+ *
+ * @see Builder#setCategories(Set)
*/
@Nullable
public Set<String> getCategories() {
@@ -1044,43 +1158,63 @@
}
/**
- * Return the intent.
+ * Returns the intent that is executed when the user selects this shortcut.
+ * If setIntents() was used, then return the last intent in the array.
*
- * <p>All shortcuts must have an intent, but this method will return null when
- * {@link #hasKeyFieldsOnly()} is true.
+ * <p>Launcher applications <b>cannot</b> see the intent. If a {@link ShortcutInfo} is
+ * obtained via {@link LauncherApps}, then this method will always return null.
+ * Launchers can only start a shortcut intent with {@link LauncherApps#startShortcut}.
*
- * <p>Launcher apps <b>cannot</b> see the intent. If a {@link ShortcutInfo} is obtained via
- * {@link LauncherApps}, then this method will always return null. Launcher apps can only
- * start a shortcut intent with {@link LauncherApps#startShortcut}.
+ * @see Builder#setIntent(Intent)
*/
@Nullable
public Intent getIntent() {
- if (mIntent == null) {
+ if (mIntents == null || mIntents.length == 0) {
return null;
}
- final Intent intent = new Intent(mIntent);
- intent.replaceExtras(
- mIntentPersistableExtras != null ? new Bundle(mIntentPersistableExtras) : null);
- return intent;
+ final int last = mIntents.length - 1;
+ final Intent intent = new Intent(mIntents[last]);
+ return setIntentExtras(intent, mIntentPersistableExtrases[last]);
}
/**
- * Return "raw" intent, which is the original intent without the extras.
+ * Return the intent set with {@link Builder#setIntents(Intent[])}.
+ *
+ * <p>Launcher applications <b>cannot</b> see the intents. If a {@link ShortcutInfo} is
+ * obtained via {@link LauncherApps}, then this method will always return null.
+ * Launchers can only start a shortcut intent with {@link LauncherApps#startShortcut}.
+ *
+ * @see Builder#setIntents(Intent[])
+ */
+ @Nullable
+ public Intent[] getIntents() {
+ final Intent[] ret = new Intent[mIntents.length];
+
+ for (int i = 0; i < ret.length; i++) {
+ ret[i] = new Intent(mIntents[i]);
+ setIntentExtras(ret[i], mIntentPersistableExtrases[i]);
+ }
+
+ return ret;
+ }
+
+ /**
+ * Return "raw" intents, which is the original intents without the extras.
* @hide
*/
@Nullable
- public Intent getIntentNoExtras() {
- return mIntent;
+ public Intent[] getIntentsNoExtras() {
+ return mIntents;
}
/**
- * The extras in the intent. We convert extras into {@link PersistableBundle} so we can
+ * The extras in the intents. We convert extras into {@link PersistableBundle} so we can
* persist them.
* @hide
*/
@Nullable
- public PersistableBundle getIntentPersistableExtras() {
- return mIntentPersistableExtras;
+ public PersistableBundle[] getIntentPersistableExtrases() {
+ return mIntentPersistableExtrases;
}
/**
@@ -1094,6 +1228,10 @@
*
* <p>"Floating" shortcuts (i.e. shortcuts that are neither dynamic nor manifest) will all
* have rank 0, because there's no sorting for them.
+ *
+ * See the {@link ShortcutManager}'s class javadoc for details.
+ *
+ * @see Builder#setRank(int)
*/
public int getRank() {
return mRank;
@@ -1137,6 +1275,8 @@
/**
* Extras that application can set to any purposes.
+ *
+ * @see Builder#setExtras(PersistableBundle)
*/
@Nullable
public PersistableBundle getExtras() {
@@ -1149,7 +1289,7 @@
}
/**
- * {@link UserHandle} on which the publisher created shortcuts.
+ * {@link UserHandle} on which the publisher created this shortcut.
*/
public UserHandle getUserHandle() {
return UserHandle.of(mUserId);
@@ -1199,16 +1339,13 @@
}
/**
- * Return whether a shortcut is published via AndroidManifest.xml or not. If {@code true},
+ * Return whether a shortcut is published from AndroidManifest.xml or not. If {@code true},
* it's also {@link #isImmutable()}.
*
* <p>When an app is upgraded and a shortcut is no longer published from AndroidManifest.xml,
* this will be set to {@code false}. If the shortcut is not pinned, then it'll just disappear.
* However, if it's pinned, it will still be alive, and {@link #isEnabled()} will be
* {@code false} and {@link #isImmutable()} will be {@code true}.
- *
- * <p>NOTE this is whether a shortcut is published from the <b>current version's</b>
- * AndroidManifest.xml.
*/
public boolean isDeclaredInManifest() {
return hasFlags(FLAG_MANIFEST);
@@ -1309,6 +1446,12 @@
* <li>{@link #isEnabled()}
* <li>{@link #getUserHandle()}
* </ul>
+ *
+ * <p>For performance reasons, shortcuts passed to
+ * {@link LauncherApps.Callback#onShortcutsChanged(String, List, UserHandle)} as well as those
+ * returned from {@link LauncherApps#getShortcuts(ShortcutQuery, UserHandle)}
+ * while using the {@link ShortcutQuery#FLAG_GET_KEY_FIELDS_ONLY} option contain only key
+ * information.
*/
public boolean hasKeyFieldsOnly() {
return hasFlags(FLAG_KEY_FIELDS_ONLY);
@@ -1424,19 +1567,22 @@
*
* @hide
*/
- public void setIntent(Intent intent) throws IllegalArgumentException {
- Preconditions.checkNotNull(intent);
+ public void setIntents(Intent[] intents) throws IllegalArgumentException {
+ Preconditions.checkNotNull(intents);
+ Preconditions.checkArgument(intents.length > 0);
- final Bundle intentExtras = intent.getExtras();
+ mIntents = cloneIntents(intents);
+ fixUpIntentExtras();
+ }
- mIntent = intent;
-
- if (intentExtras != null) {
+ /** @hide */
+ public static Intent setIntentExtras(Intent intent, PersistableBundle extras) {
+ if (extras == null) {
intent.replaceExtras((Bundle) null);
- mIntentPersistableExtras = new PersistableBundle(intentExtras);
} else {
- mIntentPersistableExtras = null;
+ intent.replaceExtras(new Bundle(extras));
}
+ return intent;
}
/**
@@ -1470,8 +1616,8 @@
mTextResId = source.readInt();
mDisabledMessage = source.readCharSequence();
mDisabledMessageResId = source.readInt();
- mIntent = source.readParcelable(cl);
- mIntentPersistableExtras = source.readParcelable(cl);
+ mIntents = source.readParcelableArray(cl, Intent.class);
+ mIntentPersistableExtrases = source.readParcelableArray(cl, PersistableBundle.class);
mRank = source.readInt();
mExtras = source.readParcelable(cl);
mBitmapPath = source.readString();
@@ -1516,8 +1662,8 @@
dest.writeCharSequence(mDisabledMessage);
dest.writeInt(mDisabledMessageResId);
- dest.writeParcelable(mIntent, flags);
- dest.writeParcelable(mIntentPersistableExtras, flags);
+ dest.writeParcelableArray(mIntents, flags);
+ dest.writeParcelableArray(mIntentPersistableExtrases, flags);
dest.writeInt(mRank);
dest.writeParcelable(mExtras, flags);
dest.writeString(mBitmapPath);
@@ -1647,11 +1793,27 @@
sb.append(", timestamp=");
sb.append(mLastChangedTimestamp);
- sb.append(", intent=");
- sb.append(mIntent);
-
- sb.append(", intentExtras=");
- sb.append(secure ? "***" : mIntentPersistableExtras);
+ sb.append(", intents=");
+ if (mIntents == null) {
+ sb.append("null");
+ } else {
+ if (secure) {
+ sb.append("size:");
+ sb.append(mIntents.length);
+ } else {
+ final int size = mIntents.length;
+ sb.append("[");
+ String sep = "";
+ for (int i = 0; i < size; i++) {
+ sb.append(sep);
+ sep = ", ";
+ sb.append(mIntents[i]);
+ sb.append("/");
+ sb.append(mIntentPersistableExtrases[i]);
+ }
+ sb.append("]");
+ }
+ }
sb.append(", extras=");
sb.append(mExtras);
@@ -1678,9 +1840,8 @@
Icon icon, CharSequence title, int titleResId, String titleResName,
CharSequence text, int textResId, String textResName,
CharSequence disabledMessage, int disabledMessageResId, String disabledMessageResName,
- Set<String> categories,
- Intent intent, PersistableBundle intentPersistableExtras,
- int rank, PersistableBundle extras, long lastChangedTimestamp,
+ Set<String> categories, Intent[] intentsWithExtras, int rank, PersistableBundle extras,
+ long lastChangedTimestamp,
int flags, int iconResId, String iconResName, String bitmapPath) {
mUserId = userId;
mId = id;
@@ -1697,8 +1858,8 @@
mDisabledMessageResId = disabledMessageResId;
mDisabledMessageResName = disabledMessageResName;
mCategories = cloneCategories(categories);
- mIntent = intent;
- mIntentPersistableExtras = intentPersistableExtras;
+ mIntents = cloneIntents(intentsWithExtras);
+ fixUpIntentExtras();
mRank = rank;
mExtras = extras;
mLastChangedTimestamp = lastChangedTimestamp;
diff --git a/core/java/android/content/pm/ShortcutManager.java b/core/java/android/content/pm/ShortcutManager.java
index 3ccdef1..cd248ea 100644
--- a/core/java/android/content/pm/ShortcutManager.java
+++ b/core/java/android/content/pm/ShortcutManager.java
@@ -18,8 +18,10 @@
import android.annotation.NonNull;
import android.annotation.TestApi;
import android.annotation.UserIdInt;
+import android.app.Activity;
import android.app.usage.UsageStatsManager;
import android.content.Context;
+import android.content.Intent;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
@@ -28,80 +30,416 @@
import java.util.List;
-// TODO Enhance javadoc
/**
- * <b>TODO: Update to reflect DR changes, such as manifest shortcuts.</b><br>
+ * The ShortcutManager manages "launcher shortcuts" (or simply "shortcuts"). Shortcuts provide
+ * users
+ * with quick access to activities other than an application's main activity in the currently-active
+ * launcher. For example,
+ * an email application may publish the "compose new email" action, which will directly open the
+ * compose activity. The {@link ShortcutInfo} class contains information about each of the
+ * shortcuts themselves.
*
- * {@link ShortcutManager} manages shortcuts created by applications.
+ * <h3>Dynamic Shortcuts and Manifest Shortcuts</h3>
*
- * <h3>Dynamic shortcuts and pinned shortcuts</h3>
+ * There are two ways to publish shortcuts: manifest shortcuts and dynamic shortcuts.
*
- * An application can publish shortcuts with {@link #setDynamicShortcuts(List)} and
- * {@link #addDynamicShortcuts(List)}. There can be at most
- * {@link #getMaxShortcutCountForActivity()} number of dynamic shortcuts at a time from the
- * same application.
- * A dynamic shortcut can be deleted with {@link #removeDynamicShortcuts(List)}, and apps
- * can also use {@link #removeAllDynamicShortcuts()} to delete all dynamic shortcuts.
+ * <ul>
+ * <li>Manifest shortcuts are declared in a resource
+ * XML, which is referenced in the publisher application's <code>AndroidManifest.xml</code> file.
+ * Manifest shortcuts are published when an application is installed,
+ * and the details of these shortcuts change when an application is upgraded with an updated XML
+ * file.
+ * Manifest shortcuts are immutable, and their
+ * definitions, such as icons and labels, cannot be changed dynamically without upgrading the
+ * publisher application.
*
- * <p>The shortcuts that are currently published by the above APIs are called "dynamic", because
- * they can be removed by the creator application at any time. The user may "pin" dynamic shortcuts
- * on Launcher to make "pinned" shortcuts. Pinned shortcuts <b>cannot</b> be removed by the creator
- * app. An application can obtain all pinned shortcuts from itself with
- * {@link #getPinnedShortcuts()}. Applications should keep the pinned shortcut information
- * up-to-date using {@link #updateShortcuts(List)}.
+ * <li>Dynamic shortcuts are published at runtime using the {@link ShortcutManager} APIs.
+ * Applications can publish, update, and remove dynamic shortcuts at runtime.
+ * </ul>
*
- * <p>The number of pinned shortcuts does not affect the number of dynamic shortcuts that can be
- * published by an application at a time.
- * No matter how many pinned shortcuts that Launcher has for an application, the
- * application can still always publish {@link #getMaxShortcutCountForActivity()} number of
- * dynamic
- * shortcuts.
+ * <p>Only "main" activities—activities that handle the {@code MAIN} action and the
+ * {@code LAUNCHER} category—can have shortcuts.
+ * If an application has multiple main activities, these activities will have different sets
+ * of shortcuts.
*
- * <h3>Shortcut IDs</h3>
+ * <p>Dynamic shortcuts and manifest shortcuts are shown in the currently active launcher when
+ * the user long-presses on an application launcher icon. The actual gesture may be different
+ * depending on the launcher application.
*
- * Each shortcut must have an ID, which must be unique within each application. When a shortcut is
- * published, existing shortcuts with the same ID will be updated. Note this may include a
- * pinned shortcut.
+ * <p>Each launcher icon can have at most {@link #getMaxShortcutCountPerActivity()} number of
+ * dynamic and manifest shortcuts combined.
*
- * <h3>Rate limiting</h3>
*
- * Calls to {@link #setDynamicShortcuts(List)}, {@link #addDynamicShortcuts(List)},
- * and {@link #updateShortcuts(List)} from <b>background applications</b> will be
- * rate-limited. An application can call these methods at most
- * {@link #getRemainingCallCount()} times until the rate-limiting counter is reset,
- * which happens at a certain time every day.
+ * <h3>Pinning Shortcuts</h3>
*
- * <p>An application can use {@link #getRateLimitResetTime()} to get the next reset time.
+ * Launcher applications allow users to "pin" shortcuts so they're easier to access. Both manifest
+ * and dynamic shortcuts can be pinned.
+ * Pinned shortcuts <b>cannot</b> be removed by publisher
+ * applications; they're removed only when the user removes them,
+ * when the publisher application is uninstalled, or when the
+ * user performs the "clear data" action on the publisher application from the device's Settings
+ * application.
*
- * <p>Foreground applications (i.e. ones with a foreground activity or a foreground services)
- * will not be throttled. Also, when an application comes to foreground,
- * {@link #getRemainingCallCount()} will be reset to the initial value.
+ * <p>However, the publisher application can <em>disable</em> pinned shortcuts so they cannot be
+ * started. See the following sections for details.
*
- * <p>For testing purposes, use "Developer Options" (found in the Settings menu) to reset the
- * internal rate-limiting counter. Automated tests can use the following ADB shell command to
- * achieve the same effect:</p>
- * <pre>adb shell cmd shortcut reset-throttling</pre>
+ *
+ * <h3>Updating and Disabling Shortcuts</h3>
+ *
+ * <p>When a dynamic shortcut is pinned, even when the publisher removes it as a dynamic shortcut,
+ * the pinned shortcut will still be visible and launchable. This allows an application to have
+ * more than {@link #getMaxShortcutCountPerActivity()} number of shortcuts.
+ *
+ * <p>For example, suppose {@link #getMaxShortcutCountPerActivity()} is 5:
+ * <ul>
+ * <li>A chat application publishes 5 dynamic shortcuts for the 5 most recent
+ * conversations, "c1" - "c5".
+ *
+ * <li>The user pins all 5 of the shortcuts.
+ *
+ * <li>Later, the user has started 3 additional conversations ("c6", "c7", and "c8"),
+ * so the publisher application
+ * re-publishes its dynamic shortcuts. The new dynamic shortcut list is:
+ * "c4", "c5", "c6", "c7", and "c8".
+ * The publisher application has to remove "c1", "c2", and "c3" because it can't have more than
+ * 5 dynamic shortcuts.
+ *
+ * <li>However, even though "c1", "c2" and "c3" are no longer dynamic shortcuts, the pinned
+ * shortcuts for these conversations are still available and launchable.
+ *
+ * <li>At this point, the user can access a total of 8 shortcuts that link to activities in
+ * the publisher application, including the 3 pinned
+ * shortcuts, even though it's allowed to have at most 5 dynamic shortcuts.
+ *
+ * <li>The application can use {@link #updateShortcuts(List)} to update any of the existing
+ * 8 shortcuts, when, for example, the chat peers' icons have changed.
+ * </ul>
+ * The {@link #addDynamicShortcuts(List)} and {@link #setDynamicShortcuts(List)} methods
+ * can also be used
+ * to update existing shortcuts with the same IDs, but they <b>cannot</b> be used
+ * for updating non-dynamic, pinned shortcuts because these two methods try to convert the given
+ * lists of shortcuts to dynamic shortcuts.
+ *
+ *
+ * <h4>Disabling Manifest Shortcuts</h4>
+ * When an application is upgraded and the new version
+ * no longer uses a manifest shortcut that appeared in the previous version, this deprecated
+ * shortcut will no longer be published as a manifest shortcut.
+ *
+ * <p>If the deprecated shortcut is pinned, then the pinned shortcut will remain on the launcher,
+ * but it will be disabled automatically.
+ * Note that, in this case, the pinned shortcut is no longer a manifest shortcut, but it's
+ * still <b>immutable</b> and cannot be updated using the {@link ShortcutManager} APIs.
+ *
+ *
+ * <h4>Disabling Dynamic Shortcuts</h4>
+ * Sometimes pinned shortcuts become obsolete and may not be usable. For example, a pinned shortcut
+ * to a group chat will be unusable when the associated group chat is deleted. In cases like this,
+ * applications should use {@link #disableShortcuts(List)}, which will remove the specified dynamic
+ * shortcuts and also make any specified pinned shortcuts un-launchable.
+ * The {@link #disableShortcuts(List, CharSequence)} method can also be used to disabled shortcuts
+ * and show users a custom error message when they attempt to launch the disabled shortcuts.
+ *
+ *
+ * <h3>Publishing Manifest Shortcuts</h3>
+ *
+ * In order to add manifest shortcuts to your application, first add
+ * {@code <meta-data android:name="android.app.shortcuts" />} to your main activity in
+ * AndroidManifest.xml:
+ * <pre>
+ * <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ * package="com.example.myapplication">
+ * <application . . .>
+ * <activity android:name="Main">
+ * <intent-filter>
+ * <action android:name="android.intent.action.MAIN" />
+ * <category android:name="android.intent.category.LAUNCHER" />
+ * </intent-filter>
+ * <b><meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/></b>
+ * </activity>
+ * </application>
+ * </manifest>
+ * </pre>
+ *
+ * Then, define your application's manifest shortcuts in the <code>res/xml/shortcuts.xml</code>
+ * file:
+ * <pre>
+ * <shortcuts xmlns:android="http://schemas.android.com/apk/res/android" >
+ * <shortcut
+ * android:shortcutId="compose"
+ * android:enabled="true"
+ * android:icon="@drawable/compose_icon"
+ * android:shortcutShortLabel="@string/compose_shortcut_short_label1"
+ * android:shortcutLongLabel="@string/compose_shortcut_long_label1"
+ * android:shortcutDisabledMessage="@string/compose_disabled_message1"
+ * >
+ * <intent
+ * android:action="android.intent.action.VIEW"
+ * android:targetPackage="com.example.myapplication"
+ * android:targetClass="com.example.myapplication.ComposeActivity" />
+ * <!-- more intents can go here; see below -->
+ * <categories android:name="android.shortcut.conversation" />
+ * </shortcut>
+ * <!-- more shortcuts can go here -->
+ * </shortcuts>
+ * </pre>
+ *
+ * The following list includes descriptions for the different attributes within a manifest shortcut:
+ * <dl>
+ * <dt>android:shortcutId</dt>
+ * <dd>Mandatory shortcut ID</dd>
+ *
+ * <dt>android:enabled</dt>
+ * <dd>Default is {@code true}. Can be set to {@code false} in order
+ * to disable a manifest shortcut that was published in a previous version and and set a custom
+ * disabled message. If a custom disabled message is not needed, then a manifest shortcut can
+ * be simply removed from the XML file rather than keeping it with {@code enabled="false"}.</dd>
+ *
+ * <dt>android:icon</dt>
+ * <dd>Shortcut icon.</dd>
+ *
+ * <dt>android:shortcutShortLabel</dt>
+ * <dd>Mandatory shortcut short label.
+ * See {@link ShortcutInfo.Builder#setShortLabel(CharSequence)}.</dd>
+ *
+ * <dt>android:shortcutLongLabel</dt>
+ * <dd>Shortcut long label.
+ * See {@link ShortcutInfo.Builder#setLongLabel(CharSequence)}.</dd>
+ *
+ * <dt>android:shortcutDisabledMessage</dt>
+ * <dd>When {@code android:enabled} is set to
+ * {@code false}, this attribute is used to display a custom disabled message.</dd>
+ *
+ * <dt>intent</dt>
+ * <dd>Intent to launch when the user selects the shortcut.
+ * {@code android:action} is mandatory.
+ * See <a href="{@docRoot}guide/topics/ui/settings.html#Intents">Using intents</a> for the
+ * other supported tags.
+ * You can provide multiple intents for a single shortcut so that an activity is launched
+ * with other activities in the back stack. See {@link android.app.TaskStackBuilder} for details.
+ * </dd>
+ * <dt>categories</dt>
+ * <dd>Specify shortcut categories. Currently only
+ * {@link ShortcutInfo#SHORTCUT_CATEGORY_CONVERSATION} is defined in the framework.
+ * </dd>
+ * </dl>
+ *
+ * <h3>Publishing Dynamic Shortcuts</h3>
+ *
+ * Applications can publish dynamic shortcuts with {@link #setDynamicShortcuts(List)}
+ * or {@link #addDynamicShortcuts(List)}. The {@link #updateShortcuts(List)} method can also be
+ * used to update existing, mutable shortcuts.
+ * Use {@link #removeDynamicShortcuts(List)} or {@link #removeAllDynamicShortcuts()} to remove
+ * dynamic shortcuts.
+ *
+ * <p>Example:
+ * <pre>
+ * ShortcutManager shortcutManager = getSystemService(ShortcutManager.class);
+ *
+ * ShortcutInfo shortcut = new ShortcutInfo.Builder(this, "id1")
+ * .setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.mysite.com/")))
+ * .setShortLabel("Web site")
+ * .setLongLabel("Open the web site")
+ * .setIcon(Icon.createWithResource(context, R.drawable.icon_website))
+ * .build();
+ *
+ * shortcutManager.setDynamicShortcuts(Arrays.asList(shortcut));
+ * </pre>
+ *
+ *
+ * <h3>Shortcut Intents</h3>
+ * Dynamic shortcuts can be published with any set of {@link Intent#addFlags Intent} flags.
+ * Typically, {@link Intent#FLAG_ACTIVITY_CLEAR_TASK} is specified, possibly along with other
+ * flags; otherwise, if the application is already running, the application is simply brought to
+ * the foreground, and the target activity may not appear.
+ *
+ * <p>The {@link ShortcutInfo.Builder#setIntents(Intent[])} method can be used instead of
+ * {@link ShortcutInfo.Builder#setIntent(Intent)} with {@link android.app.TaskStackBuilder}
+ * in order to launch an activity with other activities in the back stack.
+ * When the user selects a shortcut to load an activity with a back stack,
+ * then presses the back key, a "parent" activity will be shown instead of the user being
+ * navigated back to the launcher.
+ *
+ * <p>Manifest shortcuts can also have multiple intents to achieve the same effect.
+ * In order to associate multiple {@link Intent} objects with a shortcut, simply list multiple
+ * <code><intent></code> elements within a single <code><shortcut></code> element.
+ * The last intent specifies what the user will see when they launch a shortcut.
+ *
+ * <p>Manifest shortcuts <b>cannot</b> have custom intent flags.
+ * The first intent of a manifest shortcut will always have {@link Intent#FLAG_ACTIVITY_NEW_TASK}
+ * and {@link Intent#FLAG_ACTIVITY_CLEAR_TASK} set.
+ * This means, when the application is already running, all the existing activities will be
+ * destroyed when a manifest shortcut is launched.
+ * If this behavior is not desirable, you can use a <em>trampoline activity</em>,
+ * or an invisible activity that starts another activity in {@link Activity#onCreate},
+ * then calls {@link Activity#finish()}.
+ * The first activity should include an attribute setting
+ * of {@code android:taskAffinity=""} in the application's <code>AndroidManifest.xml</code>
+ * file, and the intent within the manifest shortcut should point at this first activity.
+ *
+ *
+ * <h3>Showing New Information in a Shortcut</h3>
+ * In order to avoid confusion, you should not use {@link #updateShortcuts(List)} to update
+ * a shortcut so that it contains conceptually different information.
+ *
+ * <p>For example, a phone application may publish the most frequently called contact as a dynamic
+ * shortcut. Over time, this contact may change; when it does, the application should
+ * represent the changed contact with a new shortcut that contains a different ID, using either
+ * {@link #setDynamicShortcuts(List)} or {@link #addDynamicShortcuts(List)}, rather than updating
+ * the existing shortcut with {@link #updateShortcuts(List)}.
+ * This is because when the shortcut is pinned, changing
+ * it to reference a different contact will likely confuse the user.
+ *
+ * <p>On the other hand, when the
+ * contact's information has changed, such as the name or picture, the application should
+ * use {@link #updateShortcuts(List)} so that the pinned shortcut is updated too.
+ *
+ *
+ * <h3>Shortcut Display Order</h3>
+ * When the launcher displays the shortcuts that are associated with a particular launcher icon,
+ * the shortcuts should appear in the following order:
+ * <ul>
+ * <li>First show manifest shortcuts
+ * (if {@link ShortcutInfo#isDeclaredInManifest()} is {@code true}),
+ * and then show dynamic shortcuts (if {@link ShortcutInfo#isDynamic()} is {@code true}).
+ * <li>Within each category of shortcuts (manifest and dynamic), sort the shortcuts in order
+ * of increasing rank according to {@link ShortcutInfo#getRank()}.
+ * </ul>
+ * <p>Shortcut ranks are non-negative sequential integers
+ * that determine the order in which shortcuts appear, assuming that the shortcuts are all in
+ * the same category.
+ * Ranks of existing shortcuts can be updated with
+ * {@link #updateShortcuts(List)}; you can use {@link #addDynamicShortcuts(List)} and
+ * {@link #setDynamicShortcuts(List)}, too.
+ *
+ * <p>Ranks are auto-adjusted so that they're unique for each target activity in each category
+ * (dynamic or manifest). For example, if there are 3 dynamic shortcuts with ranks 0, 1 and 2,
+ * adding another dynamic shortcut with a rank of 1 represents a request to place this shortcut at
+ * the second position.
+ * In response, the third and fourth shortcuts move closer to the bottom of the shortcut list,
+ * with their ranks changing to 2 and 3, respectively.
+ *
+ * <h3>Rate Limiting</h3>
+ *
+ * Calls to {@link #setDynamicShortcuts(List)}, {@link #addDynamicShortcuts(List)}, and
+ * {@link #updateShortcuts(List)} may be rate-limited when called by background applications, or
+ * applications with no foreground activity or service. When you attempt to call these methods
+ * from a background application after exceeding the rate limit, these APIs return {@code false}.
+ *
+ * <p>Applications with a foreground activity or service are not rate-limited.
+ *
+ * <p>Rate-limiting will be reset upon certain events, so that even background applications
+ * can call these APIs again until they are rate limit is reached again.
+ * These events include the following:
+ * <ul>
+ * <li>When an application comes to the foreground.
+ * <li>When the system locale changes.
+ * <li>When the user performs an "inline reply" action on a notification.
+ * </ul>
+ *
+ * <p>When rate-limiting is active, {@link #isRateLimitingActive()} returns {@code true}.
+ *
+ * <h4>Resetting rate-limiting for testing</h4>
+ *
+ * If your application is rate-limited during development or testing, you can use the
+ * "Reset ShortcutManager rate-limiting" development option or the following adb command to reset
+ * it:
+ * <pre>
+ * adb shell cmd shortcut reset-throttling [ --user USER-ID ]
+ * </pre>
+ *
+ * <h3>Handling System Locale Changes</h3>
+ *
+ * Applications should update dynamic and pinned shortcuts when the system locale changes
+ * using the {@link Intent#ACTION_LOCALE_CHANGED} broadcast.
+ *
+ * <p>When the system locale changes, rate-limiting is reset, so even background applications
+ * can set dynamic shortcuts, add dynamic shortcuts, and update shortcuts until the rate limit
+ * is reached again.
+ *
*
* <h3>Backup and Restore</h3>
*
- * Pinned shortcuts will be backed up and restored across devices. This means all information
- * within shortcuts, including IDs, must be meaningful on different devices.
+ * When an application has the {@code android:allowBackup="true"} attribute assignment included
+ * in its <code>AndroidManifest.xml</code> file, pinned shortcuts are
+ * backed up automatically and are restored when the user sets up a new device.
*
- * <p>Note that:
+ * <h4>Categories of Shortcuts that are Backed Up</h4>
+ *
* <ul>
- * <li>Dynamic shortcuts will not be backed up or restored.
- * <li>Icons of pinned shortcuts will <b>not</b> be backed up for performance reasons, unless
- * they refer to resources. Instead, launcher applications are supposed to back up and restore
- * icons of pinned shortcuts by themselves, and thus from the user's point of view, pinned
- * shortcuts will look to have icons restored.
+ * <li>Pinned shortcuts are backed up. Bitmap icons are not backed up by the system,
+ * but launcher applications should back them up and restore them so that the user still sees icons
+ * for pinned shortcuts on the launcher. Applications can always use
+ * {@link #updateShortcuts(List)} to re-publish icons.
+ *
+ * <li>Manifest shortcuts are not backed up, but when an application is re-installed on a new
+ * device, they are re-published from the <code>AndroidManifest.xml</code> file, anyway.
+ *
+ * <li>Dynamic shortcuts are <b>not</b> backed up.
* </ul>
*
+ * <p>Because dynamic shortcuts are not restored, it is recommended that applications check
+ * currently-published dynamic shortcuts using {@link #getDynamicShortcuts()}
+ * each time they are launched, and they should re-publish
+ * dynamic shortcuts when necessary.
*
- * <h3>APIs for launcher</h3>
+ * <pre>
+ * public class MainActivity extends Activity {
+ * public void onCreate(Bundle savedInstanceState) {
+ * super.onCreate(savedInstanceState);
*
- * Launcher applications should use {@link LauncherApps} to get shortcuts that are published from
- * applications. Launcher applications can also pin shortcuts with
- * {@link LauncherApps#pinShortcuts(String, List, UserHandle)}.
+ * ShortcutManager shortcutManager = getSystemService(ShortcutManager.class);
+ *
+ * if (shortcutManager.getDynamicShortcuts().size() == 0) {
+ * // Application restored; re-publish dynamic shortcuts.
+ *
+ * if (shortcutManager.getPinnedShortcuts().size() > 0) {
+ * // Pinned shortcuts have been restored. Use updateShortcuts() to make sure
+ * // they have up-to-date information.
+ * }
+ * }
+ * }
+ * :
+ *
+ * }
+ * </pre>
+ *
+ *
+ * <h4>Backup/restore and shortcut IDs</h4>
+ *
+ * Because pinned shortcuts are backed up and restored on new devices, shortcut IDs should be
+ * meaningful across devices; that is, IDs should contain either stable, constant strings
+ * or server-side identifiers,
+ * rather than identifiers generated locally that might not make sense on other devices.
+ *
+ *
+ * <h3>Report Shortcut Usage and Prediction</h3>
+ *
+ * Launcher applications may be capable of predicting which shortcuts will most likely be
+ * used at a given time by examining the shortcut usage history data.
+ *
+ * <p>In order to provide launchers with such data, publisher applications should
+ * report the shortcuts that are used with {@link #reportShortcutUsed(String)}
+ * when a shortcut is selected,
+ * <b>or when an action equivalent to a shortcut is taken by the user even if it wasn't started
+ * with the shortcut</b>.
+ *
+ * <p>For example, suppose a GPS navigation application supports "navigate to work" as a shortcut.
+ * It should then report when the user selects this shortcut <b>and</b> when the user chooses
+ * to navigate to work within the application itself.
+ * This helps the launcher application
+ * learn that the user wants to navigate to work at a certain time every
+ * weekday, and it can then show this shortcut in a suggestion list at the right time.
+ *
+ * <h3>Launcher API</h3>
+ *
+ * The {@link LauncherApps} class provides APIs for launcher applications to access shortcuts.
+ *
+ *
+ * <h3>Direct Boot and Shortcuts</h3>
+ *
+ * All shortcut information is stored in credential encrypted storage, so no shortcuts can be
+ * accessed when the user is locked.
*/
public class ShortcutManager {
private static final String TAG = "ShortcutManager";
@@ -127,15 +465,18 @@
}
/**
- * Publish a list of shortcuts. All existing dynamic shortcuts from the caller application
- * will be replaced.
+ * Publish the list of shortcuts. All existing dynamic shortcuts from the caller application
+ * will be replaced. If there are already pinned shortcuts with the same IDs,
+ * the mutable pinned shortcuts are updated.
*
* <p>This API will be rate-limited.
*
* @return {@code true} if the call has succeeded. {@code false} if the call is rate-limited.
*
- * @throws IllegalArgumentException if {@code shortcutInfoList} contains more than
- * {@link #getMaxShortcutCountForActivity()} shortcuts.
+ * @throws IllegalArgumentException if {@link #getMaxShortcutCountPerActivity()} is exceeded,
+ * or when trying to update immutable shortcuts.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public boolean setDynamicShortcuts(@NonNull List<ShortcutInfo> shortcutInfoList) {
try {
@@ -147,8 +488,9 @@
}
/**
- * Return all dynamic shortcuts from the caller application. The number of result items
- * will not exceed the value returned by {@link #getMaxShortcutCountForActivity()}.
+ * Return all dynamic shortcuts from the caller application.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
@NonNull
public List<ShortcutInfo> getDynamicShortcuts() {
@@ -161,7 +503,9 @@
}
/**
- * TODO Javadoc
+ * Return all manifest shortcuts from the caller application.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
@NonNull
public List<ShortcutInfo> getManifestShortcuts() {
@@ -174,15 +518,17 @@
}
/**
- * Publish list of dynamic shortcuts. If there's already dynamic or pinned shortcuts with
- * the same IDs, they will all be updated.
+ * Publish the list of dynamic shortcuts. If there are already dynamic or pinned shortcuts with
+ * the same IDs, each mutable shortcut is updated.
*
* <p>This API will be rate-limited.
*
* @return {@code true} if the call has succeeded. {@code false} if the call is rate-limited.
*
- * @throws IllegalArgumentException if the caller application has already published the
- * max number of dynamic shortcuts.
+ * @throws IllegalArgumentException if {@link #getMaxShortcutCountPerActivity()} is exceeded,
+ * or when trying to update immutable shortcuts.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public boolean addDynamicShortcuts(@NonNull List<ShortcutInfo> shortcutInfoList) {
try {
@@ -195,6 +541,8 @@
/**
* Delete dynamic shortcuts by ID.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public void removeDynamicShortcuts(@NonNull List<String> shortcutIds) {
try {
@@ -207,6 +555,8 @@
/**
* Delete all dynamic shortcuts from the caller application.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public void removeAllDynamicShortcuts() {
try {
@@ -218,6 +568,8 @@
/**
* Return all pinned shortcuts from the caller application.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
@NonNull
public List<ShortcutInfo> getPinnedShortcuts() {
@@ -230,11 +582,16 @@
}
/**
- * Update all existing shortcuts with the same IDs. Shortcuts may be pinned and/or dynamic.
+ * Update all existing shortcuts with the same IDs. Target shortcuts may be pinned and/or
+ * dynamic, but they must not be immutable.
*
* <p>This API will be rate-limited.
*
* @return {@code true} if the call has succeeded. {@code false} if the call is rate-limited.
+ *
+ * @throws IllegalArgumentException If trying to update immutable shortcuts.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public boolean updateShortcuts(List<ShortcutInfo> shortcutInfoList) {
try {
@@ -246,7 +603,12 @@
}
/**
- * TODO Javadoc
+ * Disable pinned shortcuts. For more details, see the Javadoc for the {@link ShortcutManager}
+ * class.
+ *
+ * @throws IllegalArgumentException If trying to disable immutable shortcuts.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public void disableShortcuts(@NonNull List<String> shortcutIds) {
try {
@@ -259,7 +621,7 @@
}
/**
- * TODO Javadoc
+ * @hide old signature, kept for unit testing.
*/
public void disableShortcuts(@NonNull List<String> shortcutIds, int disabledMessageResId) {
try {
@@ -272,9 +634,22 @@
}
/**
- * TODO Javadoc
+ * @hide old signature, kept for unit testing.
*/
public void disableShortcuts(@NonNull List<String> shortcutIds, String disabledMessage) {
+ disableShortcuts(shortcutIds, (CharSequence) disabledMessage);
+ }
+
+ /**
+ * Disable pinned shortcuts, showing the user a custom error message when they try to select
+ * the disabled shortcuts.
+ * For more details, see the Javadoc for the {@link ShortcutManager} class.
+ *
+ * @throws IllegalArgumentException If trying to disable immutable shortcuts.
+ *
+ * @throws IllegalStateException when the user is locked.
+ */
+ public void disableShortcuts(@NonNull List<String> shortcutIds, CharSequence disabledMessage) {
try {
mService.disableShortcuts(mContext.getPackageName(), shortcutIds,
disabledMessage, /* disabledMessageResId =*/ 0,
@@ -285,7 +660,12 @@
}
/**
- * TODO Javadoc
+ * Re-enable pinned shortcuts that were previously disabled. If the target shortcuts
+ * already enabled, this method does nothing.
+ *
+ * @throws IllegalArgumentException If trying to enable immutable shortcuts.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public void enableShortcuts(@NonNull List<String> shortcutIds) {
try {
@@ -295,13 +675,21 @@
}
}
+
/**
- * Return the max number of dynamic shortcuts + manifest shortcuts that each launcher icon
- * can have at a time.
+ * @hide old signature, kept for unit testing.
*/
public int getMaxShortcutCountForActivity() {
+ return getMaxShortcutCountPerActivity();
+ }
+
+ /**
+ * Return the maximum number of dynamic and manifest shortcuts that each launcher icon
+ * can have at a time.
+ */
+ public int getMaxShortcutCountPerActivity() {
try {
- return mService.getMaxShortcutCountForActivity(
+ return mService.getMaxShortcutCountPerActivity(
mContext.getPackageName(), injectMyUserId());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -313,6 +701,8 @@
* before the rate limit counter is reset.
*
* @see #getRateLimitResetTime()
+ *
+ * @hide
*/
public int getRemainingCallCount() {
try {
@@ -327,6 +717,8 @@
*
* @see #getRemainingCallCount()
* @see System#currentTimeMillis()
+ *
+ * @hide
*/
public long getRateLimitResetTime() {
try {
@@ -337,6 +729,22 @@
}
/**
+ * Return {@code true} when rate-limiting is active for the caller application.
+ *
+ * <p>See the class level javadoc for details.
+ *
+ * @throws IllegalStateException when the user is locked.
+ */
+ public boolean isRateLimitingActive() {
+ try {
+ return mService.getRemainingCallCount(mContext.getPackageName(), injectMyUserId())
+ == 0;
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Return the max width for icons, in pixels.
*/
public int getIconMaxWidth() {
@@ -361,16 +769,16 @@
}
/**
- * Applications that publish shortcuts should call this method whenever an action that's
- * equivalent to an existing shortcut has been taken by the user. This includes not only when
- * the user manually taps a shortcut, but when the user takes an equivalent action within the
- * application -- for example, when a music player application has a shortcut to playlist X,
- * then the application should not only report it when the playlist is opened from the
- * shortcut, but also when the user plays the playlist within the application.
+ * Applications that publish shortcuts should call this method
+ * whenever the user selects the shortcut containing the given ID or when the user completes
+ * an action in the application that is equivalent to selecting the shortcut.
+ * For more details, see the Javadoc for the {@link ShortcutManager} class
*
* <p>The information is accessible via {@link UsageStatsManager#queryEvents}
* Typically, launcher applications use this information to build a prediction model
* so that they can promote the shortcuts that are likely to be used at the moment.
+ *
+ * @throws IllegalStateException when the user is locked.
*/
public void reportShortcutUsed(String shortcutId) {
try {
diff --git a/core/java/android/content/pm/ShortcutServiceInternal.java b/core/java/android/content/pm/ShortcutServiceInternal.java
index 3f8bad1..af56105 100644
--- a/core/java/android/content/pm/ShortcutServiceInternal.java
+++ b/core/java/android/content/pm/ShortcutServiceInternal.java
@@ -53,7 +53,8 @@
@NonNull String callingPackage, @NonNull String packageName,
@NonNull List<String> shortcutIds, int userId);
- public abstract Intent createShortcutIntent(int launcherUserId, @NonNull String callingPackage,
+ public abstract Intent[] createShortcutIntents(
+ int launcherUserId, @NonNull String callingPackage,
@NonNull String packageName, @NonNull String shortcutId, int userId);
public abstract void addListener(@NonNull ShortcutChangeListener listener);
@@ -67,10 +68,4 @@
public abstract boolean hasShortcutHostPermission(int launcherUserId,
@NonNull String callingPackage);
-
- /**
- * Called by AM when the system locale changes *within the AM lock*. ABSOLUTELY do not take
- * any locks in this method.
- */
- public abstract void onSystemLocaleChangedNoLock();
}
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index b2d518c..35d3dc3 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -725,11 +725,23 @@
public static final int NATIVE_CONFIG_LAYOUTDIR = 0x4000;
/**
- * Construct an invalid Configuration. You must call {@link #setToDefaults}
- * for this object to be valid. {@more}
+ * <p>Construct an invalid Configuration. This state is only suitable for constructing a
+ * Configuration delta that will be applied to some valid Configuration object. In order to
+ * create a valid standalone Configuration, you must call {@link #setToDefaults}. </p>
+ *
+ * <p>Example:</p>
+ * <pre class="prettyprint">
+ * Configuration validConfig = new Configuration();
+ * validConfig.setToDefaults();
+ *
+ * Configuration deltaOnlyConfig = new Configuration();
+ * deltaOnlyConfig.orientation = Configuration.ORIENTATION_LANDSCAPE;
+ *
+ * validConfig.updateFrom(deltaOnlyConfig);
+ * </pre>
*/
public Configuration() {
- setToDefaults();
+ unset();
}
/**
@@ -939,6 +951,15 @@
seq = 0;
}
+ /**
+ * Set this object to completely undefined.
+ * @hide
+ */
+ public void unset() {
+ setToDefaults();
+ fontScale = 0;
+ }
+
/** {@hide} */
@Deprecated public void makeDefault() {
setToDefaults();
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 8d3940c..ad11307 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -201,12 +201,16 @@
* Create a new Resources object on top of an existing set of assets in an
* AssetManager.
*
+ * @deprecated Resources should not be constructed by apps.
+ * See {@link android.content.Context#createConfigurationContext(Configuration)}.
+ *
* @param assets Previously created AssetManager.
* @param metrics Current display metrics to consider when
* selecting/computing resource values.
* @param config Desired device configuration to consider when
* selecting/computing resource values (optional).
*/
+ @Deprecated
public Resources(AssetManager assets, DisplayMetrics metrics, Configuration config) {
this(null);
mResourcesImpl = new ResourcesImpl(assets, metrics, config, new DisplayAdjustments());
@@ -1762,7 +1766,10 @@
/**
* Store the newly updated configuration.
+ *
+ * @deprecated See {@link android.content.Context#createConfigurationContext(Configuration)}.
*/
+ @Deprecated
public void updateConfiguration(Configuration config, DisplayMetrics metrics) {
updateConfiguration(config, metrics, null);
}
diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index aa80390..8233ad2 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -142,6 +142,7 @@
mAssets = assets;
mMetrics.setToDefaults();
mDisplayAdjustments = displayAdjustments;
+ mConfiguration.setToDefaults();
updateConfiguration(config, metrics, displayAdjustments.getCompatibilityInfo());
mAssets.ensureStringBlocks();
}
@@ -383,7 +384,10 @@
mMetrics.density =
mConfiguration.densityDpi * DisplayMetrics.DENSITY_DEFAULT_SCALE;
}
- mMetrics.scaledDensity = mMetrics.density * mConfiguration.fontScale;
+
+ // Protect against an unset fontScale.
+ mMetrics.scaledDensity = mMetrics.density *
+ (mConfiguration.fontScale != 0 ? mConfiguration.fontScale : 1.0f);
final int width, height;
if (mMetrics.widthPixels >= mMetrics.heightPixels) {
diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java
index 92134ee..1e44a5c 100644
--- a/core/java/android/content/res/TypedArray.java
+++ b/core/java/android/content/res/TypedArray.java
@@ -49,6 +49,10 @@
attrs.mLength = len;
attrs.mRecycled = false;
+ // Reset the assets, which may have changed due to configuration changes
+ // or further resource loading.
+ attrs.mAssets = res.getAssets();
+
final int fullLen = len * AssetManager.STYLE_NUM_ENTRIES;
if (attrs.mData.length >= fullLen) {
return attrs;
@@ -66,7 +70,7 @@
private final Resources mResources;
private final DisplayMetrics mMetrics;
- private final AssetManager mAssets;
+ private AssetManager mAssets;
private boolean mRecycled;
@@ -1086,6 +1090,7 @@
// These may have been set by the client.
mXml = null;
mTheme = null;
+ mAssets = null;
mResources.mTypedArrayPool.release(this);
}
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index a20307a..04ee1e6 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -1356,20 +1356,35 @@
/**
* Computes the device's orientation based on the rotation matrix.
* <p>
- * When it returns, the array values is filled with the result:
+ * When it returns, the array values are as follows:
* <ul>
- * <li>values[0]: <i>azimuth</i>, rotation around the -Z axis,
- * i.e. the opposite direction of Z axis.</li>
- * <li>values[1]: <i>pitch</i>, rotation around the -X axis,
- * i.e the opposite direction of X axis.</li>
- * <li>values[2]: <i>roll</i>, rotation around the Y axis.</li>
+ * <li>values[0]: <i>Azimuth</i>, angle of rotation about the -z axis.
+ * This value represents the angle between the device's y
+ * axis and the magnetic north pole. When facing north, this
+ * angle is 0, when facing south, this angle is π.
+ * Likewise, when facing east, this angle is π/2, and
+ * when facing west, this angle is -π/2. The range of
+ * values is -π to π.</li>
+ * <li>values[1]: <i>Pitch</i>, angle of rotation about the x axis.
+ * This value represents the angle between a plane parallel
+ * to the device's screen and a plane parallel to the ground.
+ * Assuming that the bottom edge of the device faces the
+ * user and that the screen is face-up, tilting the top edge
+ * of the device toward the ground creates a positive pitch
+ * angle. The range of values is -π to π.</li>
+ * <li>values[2]: <i>Roll</i>, angle of rotation about the y axis. This
+ * value represents the angle between a plane perpendicular
+ * to the device's screen and a plane perpendicular to the
+ * ground. Assuming that the bottom edge of the device faces
+ * the user and that the screen is face-up, tilting the left
+ * edge of the device toward the ground creates a positive
+ * roll angle. The range of values is -π/2 to π/2.</li>
* </ul>
* <p>
- * Applying these three intrinsic rotations in azimuth, pitch and roll order transforms
- * identity matrix to the rotation matrix given in input R.
- * All three angles above are in <b>radians</b> and <b>positive</b> in the
- * <b>counter-clockwise</b> direction. Range of output is: azimuth from -π to π,
- * pitch from -π/2 to π/2 and roll from -π to π.
+ * Applying these three rotations in the azimuth, pitch, roll order
+ * transforms an identity matrix to the rotation matrix passed into this
+ * method. Also, note that all three orientation angles are expressed in
+ * <b>radians</b>.
*
* @param R
* rotation matrix see {@link #getRotationMatrix}.
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 3917bfa..145b1d0 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -267,6 +267,10 @@
* @param cameraId The unique identifier of the camera device to open
* @param callback The callback for the camera. Must not be null.
* @param handler The handler to invoke the callback on. Must not be null.
+ * @param uid The UID of the application actually opening the camera.
+ * Must be USE_CALLING_UID unless the caller is a service
+ * that is trusted to open the device on behalf of an
+ * application and to forward the real UID.
*
* @throws CameraAccessException if the camera is disabled by device policy,
* too many camera devices are already open, or the cameraId does not match
@@ -281,7 +285,7 @@
* @see android.app.admin.DevicePolicyManager#setCameraDisabled
*/
private CameraDevice openCameraDeviceUserAsync(String cameraId,
- CameraDevice.StateCallback callback, Handler handler)
+ CameraDevice.StateCallback callback, Handler handler, final int uid)
throws CameraAccessException {
CameraCharacteristics characteristics = getCameraCharacteristics(cameraId);
CameraDevice device = null;
@@ -317,7 +321,7 @@
"Camera service is currently unavailable");
}
cameraUser = cameraService.connectDevice(callbacks, id,
- mContext.getOpPackageName(), USE_CALLING_UID);
+ mContext.getOpPackageName(), uid);
} else {
// Use legacy camera implementation for HAL1 devices
Log.i(TAG, "Using legacy camera HAL.");
@@ -434,6 +438,29 @@
@NonNull final CameraDevice.StateCallback callback, @Nullable Handler handler)
throws CameraAccessException {
+ openCameraForUid(cameraId, callback, handler, USE_CALLING_UID);
+ }
+
+ /**
+ * Open a connection to a camera with the given ID, on behalf of another application
+ * specified by clientUid.
+ *
+ * <p>The behavior of this method matches that of {@link #openCamera}, except that it allows
+ * the caller to specify the UID to use for permission/etc verification. This can only be
+ * done by services trusted by the camera subsystem to act on behalf of applications and
+ * to forward the real UID.</p>
+ *
+ * @param clientUid
+ * The UID of the application on whose behalf the camera is being opened.
+ * Must be USE_CALLING_UID unless the caller is a trusted service.
+ *
+ * @hide
+ */
+ public void openCameraForUid(@NonNull String cameraId,
+ @NonNull final CameraDevice.StateCallback callback, @Nullable Handler handler,
+ int clientUid)
+ throws CameraAccessException {
+
if (cameraId == null) {
throw new IllegalArgumentException("cameraId was null");
} else if (callback == null) {
@@ -447,7 +474,7 @@
}
}
- openCameraDeviceUserAsync(cameraId, callback, handler);
+ openCameraDeviceUserAsync(cameraId, callback, handler, clientUid);
}
/**
diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java
index 93da3e5..826eb74 100644
--- a/core/java/android/hardware/display/DisplayManagerGlobal.java
+++ b/core/java/android/hardware/display/DisplayManagerGlobal.java
@@ -354,9 +354,9 @@
}
}
- public void requestColorTransform(int displayId, int colorTransformId) {
+ public void requestColorMode(int displayId, int colorMode) {
try {
- mDm.requestColorTransform(displayId, colorTransformId);
+ mDm.requestColorMode(displayId, colorMode);
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl
index 8a1abf1..f696c8d 100644
--- a/core/java/android/hardware/display/IDisplayManager.aidl
+++ b/core/java/android/hardware/display/IDisplayManager.aidl
@@ -59,8 +59,8 @@
// No permissions required.
WifiDisplayStatus getWifiDisplayStatus();
- // Requires CONFIGURE_DISPLAY_COLOR_TRANSFORM
- void requestColorTransform(int displayId, int colorTransformId);
+ // Requires CONFIGURE_DISPLAY_COLOR_MODE
+ void requestColorMode(int displayId, int colorMode);
// Requires CAPTURE_VIDEO_OUTPUT, CAPTURE_SECURE_VIDEO_OUTPUT, or an appropriate
// MediaProjection token for certain combinations of flags.
diff --git a/core/java/android/hardware/location/ContextHubService.java b/core/java/android/hardware/location/ContextHubService.java
index 43e596f..062c958 100644
--- a/core/java/android/hardware/location/ContextHubService.java
+++ b/core/java/android/hardware/location/ContextHubService.java
@@ -16,6 +16,11 @@
package android.hardware.location;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+
import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -53,10 +58,14 @@
private static final int PRE_LOADED_APP_MEM_REQ = 0;
private static final int MSG_HEADER_SIZE = 4;
- private static final int MSG_FIELD_TYPE = 0;
- private static final int MSG_FIELD_VERSION = 1;
- private static final int MSG_FIELD_HUB_HANDLE = 2;
- private static final int MSG_FIELD_APP_INSTANCE = 3;
+ private static final int HEADER_FIELD_MSG_TYPE = 0;
+ private static final int HEADER_FIELD_MSG_VERSION = 1;
+ private static final int HEADER_FIELD_HUB_HANDLE = 2;
+ private static final int HEADER_FIELD_APP_INSTANCE = 3;
+
+ private static final int HEADER_FIELD_LOAD_APP_ID_LO = MSG_HEADER_SIZE;
+ private static final int HEADER_FIELD_LOAD_APP_ID_HI = MSG_HEADER_SIZE + 1;
+ private static final int MSG_LOAD_APP_HEADER_SIZE = MSG_HEADER_SIZE + 2;
private static final int OS_APP_INSTANCE = -1;
@@ -146,15 +155,23 @@
return -1;
}
- int[] msgHeader = new int[MSG_HEADER_SIZE];
- msgHeader[MSG_FIELD_HUB_HANDLE] = contextHubHandle;
- msgHeader[MSG_FIELD_APP_INSTANCE] = OS_APP_INSTANCE;
- msgHeader[MSG_FIELD_VERSION] = 0;
- msgHeader[MSG_FIELD_TYPE] = MSG_LOAD_NANO_APP;
+ int[] msgHeader = new int[MSG_LOAD_APP_HEADER_SIZE];
+ msgHeader[HEADER_FIELD_HUB_HANDLE] = contextHubHandle;
+ msgHeader[HEADER_FIELD_APP_INSTANCE] = OS_APP_INSTANCE;
+ msgHeader[HEADER_FIELD_MSG_VERSION] = 0;
+ msgHeader[HEADER_FIELD_MSG_TYPE] = MSG_LOAD_NANO_APP;
- if (nativeSendMessage(msgHeader, app.getAppBinary()) != 0) {
+ long appId = app.getAppId();
+
+ msgHeader[HEADER_FIELD_LOAD_APP_ID_LO] = (int)(appId & 0xFFFFFFFF);
+ msgHeader[HEADER_FIELD_LOAD_APP_ID_HI] = (int)((appId >> 32) & 0xFFFFFFFF);
+
+ int errVal = nativeSendMessage(msgHeader, app.getAppBinary());
+ if (errVal != 0) {
+ Log.e(TAG, "Send Message returns error" + contextHubHandle);
return -1;
}
+
// Do not add an entry to mNanoAppInstance Hash yet. The HAL may reject the app
return 0;
}
@@ -169,12 +186,14 @@
// Call Native interface here
int[] msgHeader = new int[MSG_HEADER_SIZE];
- msgHeader[MSG_FIELD_HUB_HANDLE] = ANY_HUB;
- msgHeader[MSG_FIELD_APP_INSTANCE] = OS_APP_INSTANCE;
- msgHeader[MSG_FIELD_VERSION] = 0;
- msgHeader[MSG_FIELD_TYPE] = MSG_UNLOAD_NANO_APP;
+ msgHeader[HEADER_FIELD_HUB_HANDLE] = ANY_HUB;
+ msgHeader[HEADER_FIELD_APP_INSTANCE] = nanoAppInstanceHandle;
+ msgHeader[HEADER_FIELD_MSG_VERSION] = 0;
+ msgHeader[HEADER_FIELD_MSG_TYPE] = MSG_UNLOAD_NANO_APP;
- if (nativeSendMessage(msgHeader, null) != 0) {
+ byte msg[] = new byte[0];
+
+ if (nativeSendMessage(msgHeader, msg) != 0) {
return -1;
}
@@ -222,10 +241,10 @@
checkPermissions();
int[] msgHeader = new int[MSG_HEADER_SIZE];
- msgHeader[MSG_FIELD_HUB_HANDLE] = hubHandle;
- msgHeader[MSG_FIELD_APP_INSTANCE] = nanoAppHandle;
- msgHeader[MSG_FIELD_VERSION] = msg.getVersion();
- msgHeader[MSG_FIELD_TYPE] = msg.getMsgType();
+ msgHeader[HEADER_FIELD_HUB_HANDLE] = hubHandle;
+ msgHeader[HEADER_FIELD_APP_INSTANCE] = nanoAppHandle;
+ msgHeader[HEADER_FIELD_MSG_VERSION] = msg.getVersion();
+ msgHeader[HEADER_FIELD_MSG_TYPE] = msg.getMsgType();
return nativeSendMessage(msgHeader, msg.getData());
}
@@ -269,15 +288,17 @@
Log.v(TAG, "No message callbacks registered.");
return 0;
}
- ContextHubMessage message =
- new ContextHubMessage(header[MSG_FIELD_TYPE], header[MSG_FIELD_VERSION], data);
+
+ ContextHubMessage msg = new ContextHubMessage(header[HEADER_FIELD_MSG_TYPE],
+ header[HEADER_FIELD_MSG_VERSION],
+ data);
for (int i = 0; i < callbacksCount; ++i) {
IContextHubCallback callback = mCallbacksList.getBroadcastItem(i);
try {
callback.onMessageReceipt(
- header[MSG_FIELD_HUB_HANDLE],
- header[MSG_FIELD_APP_INSTANCE],
- message);
+ header[HEADER_FIELD_HUB_HANDLE],
+ header[HEADER_FIELD_APP_INSTANCE],
+ msg);
} catch (RemoteException e) {
Log.i(TAG, "Exception (" + e + ") calling remote callback (" + callback + ").");
continue;
@@ -308,12 +329,20 @@
return 0;
}
+ private int deleteAppInstance(int appInstanceHandle) {
+ if (mNanoAppHash.remove(appInstanceHandle) == null) {
+ return -1;
+ }
+
+ return 0;
+ }
+
private void sendVrStateChangeMessageToApp(NanoAppInstanceInfo app, boolean vrModeEnabled) {
int[] msgHeader = new int[MSG_HEADER_SIZE];
- msgHeader[MSG_FIELD_TYPE] = 0;
- msgHeader[MSG_FIELD_VERSION] = 0;
- msgHeader[MSG_FIELD_HUB_HANDLE] = ANY_HUB;
- msgHeader[MSG_FIELD_APP_INSTANCE] = app.getHandle();
+ msgHeader[HEADER_FIELD_MSG_TYPE] = 0;
+ msgHeader[HEADER_FIELD_MSG_VERSION] = 0;
+ msgHeader[HEADER_FIELD_HUB_HANDLE] = ANY_HUB;
+ msgHeader[HEADER_FIELD_APP_INSTANCE] = app.getHandle();
byte[] data = new byte[1];
data[0] = (byte) ((vrModeEnabled) ? 1 : 0);
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java
index 8f21b38..629db06 100644
--- a/core/java/android/hardware/usb/UsbManager.java
+++ b/core/java/android/hardware/usb/UsbManager.java
@@ -43,7 +43,7 @@
* <div class="special reference">
* <h3>Developer Guides</h3>
* <p>For more information about communicating with USB hardware, read the
- * <a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p>
+ * <a href="{@docRoot}guide/topics/connectivity/usb/index.html">USB developer guide</a>.</p>
* </div>
*/
public class UsbManager {
diff --git a/core/java/android/inputmethodservice/AbstractInputMethodService.java b/core/java/android/inputmethodservice/AbstractInputMethodService.java
index 3531926..29177b6 100644
--- a/core/java/android/inputmethodservice/AbstractInputMethodService.java
+++ b/core/java/android/inputmethodservice/AbstractInputMethodService.java
@@ -16,11 +16,14 @@
package android.inputmethodservice;
+import android.annotation.NonNull;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import android.view.KeyEvent;
import android.view.MotionEvent;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputContentInfo;
import android.view.inputmethod.InputMethod;
import android.view.inputmethod.InputMethodSession;
@@ -208,7 +211,7 @@
*
* @param event The motion event being received.
* @return True if the event was handled in this function, false otherwise.
- * @see View#onTrackballEvent
+ * @see android.view.View#onTrackballEvent(MotionEvent)
*/
public boolean onTrackballEvent(MotionEvent event) {
return false;
@@ -219,9 +222,30 @@
*
* @param event The motion event being received.
* @return True if the event was handled in this function, false otherwise.
- * @see View#onGenericMotionEvent
+ * @see android.view.View#onGenericMotionEvent(MotionEvent)
*/
public boolean onGenericMotionEvent(MotionEvent event) {
return false;
}
+
+ /**
+ * Allow the receiver of {@link InputContentInfo} to obtain a temporary read-only access
+ * permission to the content.
+ *
+ * <p>Default implementation does nothing.</p>
+ *
+ * @param inputContentInfo Content to be temporarily exposed from the input method to the
+ * application.
+ * This cannot be {@code null}.
+ * @param inputConnection {@link InputConnection} with which
+ * {@link InputConnection#commitContent(InputContentInfo, int, android.os.Bundle)} will be
+ * called.
+ * @return {@code false} if we cannot allow a temporary access permission.
+ * @hide
+ */
+ public void exposeContent(@NonNull InputContentInfo inputContentInfo,
+ @NonNull InputConnection inputConnection) {
+ return;
+ }
+
}
diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java
index cc71a9c..167d5a0 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -168,7 +168,7 @@
int missingMethods = msg.arg1;
IInputContext inputContext = (IInputContext)args.arg1;
InputConnection ic = inputContext != null
- ? new InputConnectionWrapper(inputContext, missingMethods) : null;
+ ? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null;
EditorInfo info = (EditorInfo)args.arg2;
info.makeCompatible(mTargetSdkVersion);
inputMethod.startInput(ic, info);
@@ -180,7 +180,7 @@
int missingMethods = msg.arg1;
IInputContext inputContext = (IInputContext)args.arg1;
InputConnection ic = inputContext != null
- ? new InputConnectionWrapper(inputContext, missingMethods) : null;
+ ? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null;
EditorInfo info = (EditorInfo)args.arg2;
info.makeCompatible(mTargetSdkVersion);
inputMethod.restartInput(ic, info);
@@ -251,7 +251,7 @@
public void bindInput(InputBinding binding) {
// This IInputContext is guaranteed to implement all the methods.
final int missingMethodFlags = 0;
- InputConnection ic = new InputConnectionWrapper(
+ InputConnection ic = new InputConnectionWrapper(mTarget,
IInputContext.Stub.asInterface(binding.getConnectionToken()), missingMethodFlags);
InputBinding nu = new InputBinding(ic, binding);
mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_INPUT_CONTEXT, nu));
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 6594c09..ad3f4d2 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -2604,33 +2604,23 @@
* Allow the receiver of {@link InputContentInfo} to obtain a temporary read-only access
* permission to the content.
*
- * <p>Make sure that the content provider owning the Uri sets the
- * {@link android.R.styleable#AndroidManifestProvider_grantUriPermissions
- * grantUriPermissions} attribute in its manifest or included the
- * {@link android.R.styleable#AndroidManifestGrantUriPermission
- * <grant-uri-permissions>} tag. Otherwise {@link InputContentInfo#requestPermission()}
- * can fail.</p>
- *
- * <p>Although calling this API is allowed only for the IME that is currently selected, the
- * client is able to request a temporary read-only access even after the current IME is switched
- * to any other IME as long as the client keeps {@link InputContentInfo} object.</p>
- *
* @param inputContentInfo Content to be temporarily exposed from the input method to the
* application.
* This cannot be {@code null}.
- * @param editorInfo The editor that receives {@link InputContentInfo}.
- * @return {@code false} if we cannot allow a temporary access permission.
+ * @param inputConnection {@link InputConnection} with which
+ * {@link InputConnection#commitContent(InputContentInfo, Bundle)} will be called.
+ * @hide
*/
- public final boolean exposeContent(@NonNull InputContentInfo inputContentInfo,
- @NonNull EditorInfo editorInfo) {
- if (inputContentInfo == null) {
- throw new NullPointerException("inputContentInfo");
+ @Override
+ public final void exposeContent(@NonNull InputContentInfo inputContentInfo,
+ @NonNull InputConnection inputConnection) {
+ if (inputConnection == null) {
+ return;
}
- if (editorInfo == null) {
- throw new NullPointerException("editorInfo");
+ if (getCurrentInputConnection() != inputConnection) {
+ return;
}
-
- return mImm.exposeContent(mToken, inputContentInfo, editorInfo);
+ mImm.exposeContent(mToken, inputContentInfo, getCurrentInputEditorInfo());
}
/**
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index d1b79e5..8f62d3f 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1045,6 +1045,26 @@
}
/**
+ * Request that this callback be invoked at ConnectivityService's earliest
+ * convenience with the current satisfying network's LinkProperties.
+ * If no such network exists no callback invocation is performed.
+ *
+ * The callback must have been registered with #requestNetwork() or
+ * #registerDefaultNetworkCallback(); callbacks registered with
+ * registerNetworkCallback() are not specific to any particular Network so
+ * do not cause any updates.
+ *
+ * @hide
+ */
+ public void requestLinkProperties(NetworkCallback networkCallback) {
+ try {
+ mService.requestLinkProperties(networkCallback.networkRequest);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Get the {@link android.net.NetworkCapabilities} for the given {@link Network}. This
* will return {@code null} if the network is unknown.
* <p>This method requires the caller to hold the permission
@@ -1062,6 +1082,26 @@
}
/**
+ * Request that this callback be invoked at ConnectivityService's earliest
+ * convenience with the current satisfying network's NetworkCapabilities.
+ * If no such network exists no callback invocation is performed.
+ *
+ * The callback must have been registered with #requestNetwork() or
+ * #registerDefaultNetworkCallback(); callbacks registered with
+ * registerNetworkCallback() are not specific to any particular Network so
+ * do not cause any updates.
+ *
+ * @hide
+ */
+ public void requestNetworkCapabilities(NetworkCallback networkCallback) {
+ try {
+ mService.requestNetworkCapabilities(networkCallback.networkRequest);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Gets the URL that should be used for resolving whether a captive portal is present.
* 1. This URL should respond with a 204 response to a GET request to indicate no captive
* portal is present.
@@ -3125,14 +3165,11 @@
throw new IllegalArgumentException("Invalid NetworkCallback");
}
try {
+ // CallbackHandler will release callback when receiving CALLBACK_RELEASED.
mService.releaseNetworkRequest(networkCallback.networkRequest);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
-
- synchronized (sNetworkCallback) {
- sNetworkCallback.remove(networkCallback.networkRequest);
- }
}
/**
diff --git a/core/java/android/net/ConnectivityMetricsLogger.java b/core/java/android/net/ConnectivityMetricsLogger.java
index 7373495..9a2d4e0 100644
--- a/core/java/android/net/ConnectivityMetricsLogger.java
+++ b/core/java/android/net/ConnectivityMetricsLogger.java
@@ -23,6 +23,8 @@
import android.os.ServiceManager;
import android.util.Log;
+import com.android.internal.annotations.VisibleForTesting;
+
/** {@hide} */
@SystemApi
public class ConnectivityMetricsLogger {
@@ -44,13 +46,32 @@
public static final String DATA_KEY_EVENTS_COUNT = "count";
- /** {@hide} */ protected final IConnectivityMetricsLogger mService;
+ /** {@hide} */ protected IConnectivityMetricsLogger mService;
/** {@hide} */ protected volatile long mServiceUnblockedTimestampMillis;
private int mNumSkippedEvents;
public ConnectivityMetricsLogger() {
- mService = IConnectivityMetricsLogger.Stub.asInterface(ServiceManager.getService(
- CONNECTIVITY_METRICS_LOGGER_SERVICE));
+ // TODO: consider not initializing mService in constructor
+ this(IConnectivityMetricsLogger.Stub.asInterface(
+ ServiceManager.getService(CONNECTIVITY_METRICS_LOGGER_SERVICE)));
+ }
+
+ /** {@hide} */
+ @VisibleForTesting
+ public ConnectivityMetricsLogger(IConnectivityMetricsLogger service) {
+ mService = service;
+ }
+
+ /** {@hide} */
+ protected boolean checkLoggerService() {
+ if (mService != null) {
+ return true;
+ }
+ // Two threads racing here will write the same pointer because getService
+ // is idempotent once MetricsLoggerService is initialized.
+ mService = IConnectivityMetricsLogger.Stub.asInterface(
+ ServiceManager.getService(CONNECTIVITY_METRICS_LOGGER_SERVICE));
+ return mService != null;
}
/**
@@ -88,6 +109,12 @@
// Log number of skipped events
Bundle b = new Bundle();
b.putInt(DATA_KEY_EVENTS_COUNT, mNumSkippedEvents);
+
+ // Log the skipped event.
+ // TODO: Note that some of the clients push all states events into the server,
+ // If we lose some states logged here, we might mess up the statistics happened at the
+ // backend. One of the options is to introduce a non-skippable flag for important events
+ // that are logged.
skippedEventsEvent = new ConnectivityMetricsEvent(mServiceUnblockedTimestampMillis,
componentTag, TAG_SKIPPED_EVENTS, b);
@@ -153,11 +180,10 @@
public boolean unregister(PendingIntent newEventsIntent) {
try {
mService.unregister(newEventsIntent);
+ return true;
} catch (RemoteException e) {
Log.e(TAG, "IConnectivityMetricsLogger.unregister", e);
return false;
}
-
- return true;
}
}
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 0d518cc..d48c155 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -156,6 +156,8 @@
void pendingListenForNetwork(in NetworkCapabilities networkCapabilities,
in PendingIntent operation);
+ void requestLinkProperties(in NetworkRequest networkRequest);
+ void requestNetworkCapabilities(in NetworkRequest networkRequest);
void releaseNetworkRequest(in NetworkRequest networkRequest);
void setAcceptUnvalidated(in Network network, boolean accept, boolean always);
diff --git a/core/java/android/net/LinkAddress.java b/core/java/android/net/LinkAddress.java
index 384ab1c..6e74f14 100644
--- a/core/java/android/net/LinkAddress.java
+++ b/core/java/android/net/LinkAddress.java
@@ -103,7 +103,7 @@
private boolean isIPv6ULA() {
if (address != null && address instanceof Inet6Address) {
byte[] bytes = address.getAddress();
- return ((bytes[0] & (byte)0xfc) == (byte)0xfc);
+ return ((bytes[0] & (byte)0xfe) == (byte)0xfc);
}
return false;
}
diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java
index fe69320..0c0872a 100644
--- a/core/java/android/net/Network.java
+++ b/core/java/android/net/Network.java
@@ -34,9 +34,13 @@
import java.net.UnknownHostException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.net.SocketFactory;
import com.android.okhttp.ConnectionPool;
+import com.android.okhttp.Dns;
import com.android.okhttp.HttpHandler;
import com.android.okhttp.HttpsHandler;
import com.android.okhttp.OkHttpClient;
@@ -62,10 +66,10 @@
// Objects used to perform per-network operations such as getSocketFactory
// and openConnection, and a lock to protect access to them.
private volatile NetworkBoundSocketFactory mNetworkBoundSocketFactory = null;
- // mLock should be used to control write access to mConnectionPool and mNetwork.
+ // mLock should be used to control write access to mConnectionPool and mDns.
// maybeInitHttpClient() must be called prior to reading either variable.
private volatile ConnectionPool mConnectionPool = null;
- private volatile com.android.okhttp.internal.Network mNetwork = null;
+ private volatile Dns mDns = null;
private final Object mLock = new Object();
// Default connection pool values. These are evaluated at startup, just
@@ -219,17 +223,17 @@
// out) ConnectionPools.
private void maybeInitHttpClient() {
synchronized (mLock) {
- if (mNetwork == null) {
- mNetwork = new com.android.okhttp.internal.Network() {
+ if (mDns == null) {
+ mDns = new Dns() {
@Override
- public InetAddress[] resolveInetAddresses(String host) throws UnknownHostException {
- return Network.this.getAllByName(host);
+ public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+ return Arrays.asList(Network.this.getAllByName(hostname));
}
};
}
if (mConnectionPool == null) {
mConnectionPool = new ConnectionPool(httpMaxConnections,
- httpKeepAliveDurationMs);
+ httpKeepAliveDurationMs, TimeUnit.MILLISECONDS);
}
}
}
@@ -288,9 +292,8 @@
}
OkHttpClient client = okUrlFactory.client();
client.setSocketFactory(getSocketFactory()).setConnectionPool(mConnectionPool);
-
- // Use internal APIs to change the Network.
- Internal.instance.setNetwork(client, mNetwork);
+ // Let network traffic go via mDns
+ client.setDns(mDns);
return okUrlFactory.open(url);
}
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 6243f46..ebb9601 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -405,8 +405,15 @@
*/
public static final int TRANSPORT_VPN = 4;
+ /**
+ * Indicates this network uses a Wi-Fi NAN transport.
+ *
+ * @hide PROPOSED_NAN_API
+ */
+ public static final int TRANSPORT_WIFI_NAN = 5;
+
private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
- private static final int MAX_TRANSPORT = TRANSPORT_VPN;
+ private static final int MAX_TRANSPORT = TRANSPORT_WIFI_NAN;
/**
* Adds the given transport type to this {@code NetworkCapability} instance.
@@ -862,6 +869,7 @@
case TRANSPORT_BLUETOOTH: transports += "BLUETOOTH"; break;
case TRANSPORT_ETHERNET: transports += "ETHERNET"; break;
case TRANSPORT_VPN: transports += "VPN"; break;
+ case TRANSPORT_WIFI_NAN: transports += "WIFI_NAN"; break;
}
if (++i < types.length) transports += "|";
}
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index 51c45e0..11b861a 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -18,7 +18,6 @@
import static android.content.pm.PackageManager.GET_SIGNATURES;
import static android.net.NetworkPolicy.CYCLE_NONE;
-import static android.text.format.Time.MONTH_DAY;
import android.content.Context;
import android.content.Intent;
@@ -27,12 +26,13 @@
import android.content.pm.Signature;
import android.os.RemoteException;
import android.os.UserHandle;
-import android.text.format.Time;
import android.util.DebugUtils;
import com.google.android.collect.Sets;
+import java.util.Calendar;
import java.util.HashSet;
+import java.util.TimeZone;
/**
* Manager for creating and modifying network policy rules.
@@ -253,28 +253,18 @@
throw new IllegalArgumentException("Unable to compute boundary without cycleDay");
}
- final Time now = new Time(policy.cycleTimezone);
- now.set(currentTime);
+ final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(policy.cycleTimezone));
+ cal.setTimeInMillis(currentTime);
+ snapToCycleDay(cal, policy.cycleDay);
- // first, find cycle boundary for current month
- final Time cycle = new Time(now);
- cycle.hour = cycle.minute = cycle.second = 0;
- snapToCycleDay(cycle, policy.cycleDay);
-
- if (Time.compare(cycle, now) >= 0) {
- // cycle boundary is beyond now, use last cycle boundary; start by
- // pushing ourselves squarely into last month.
- final Time lastMonth = new Time(now);
- lastMonth.hour = lastMonth.minute = lastMonth.second = 0;
- lastMonth.monthDay = 1;
- lastMonth.month -= 1;
- lastMonth.normalize(true);
-
- cycle.set(lastMonth);
- snapToCycleDay(cycle, policy.cycleDay);
+ if (cal.getTimeInMillis() >= currentTime) {
+ // Cycle boundary is beyond now, use last cycle boundary
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.add(Calendar.MONTH, -1);
+ snapToCycleDay(cal, policy.cycleDay);
}
- return cycle.toMillis(true);
+ return cal.getTimeInMillis();
}
/** {@hide} */
@@ -283,28 +273,18 @@
throw new IllegalArgumentException("Unable to compute boundary without cycleDay");
}
- final Time now = new Time(policy.cycleTimezone);
- now.set(currentTime);
+ final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(policy.cycleTimezone));
+ cal.setTimeInMillis(currentTime);
+ snapToCycleDay(cal, policy.cycleDay);
- // first, find cycle boundary for current month
- final Time cycle = new Time(now);
- cycle.hour = cycle.minute = cycle.second = 0;
- snapToCycleDay(cycle, policy.cycleDay);
-
- if (Time.compare(cycle, now) <= 0) {
- // cycle boundary is before now, use next cycle boundary; start by
- // pushing ourselves squarely into next month.
- final Time nextMonth = new Time(now);
- nextMonth.hour = nextMonth.minute = nextMonth.second = 0;
- nextMonth.monthDay = 1;
- nextMonth.month += 1;
- nextMonth.normalize(true);
-
- cycle.set(nextMonth);
- snapToCycleDay(cycle, policy.cycleDay);
+ if (cal.getTimeInMillis() <= currentTime) {
+ // Cycle boundary is before now, use next cycle boundary
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.add(Calendar.MONTH, 1);
+ snapToCycleDay(cal, policy.cycleDay);
}
- return cycle.toMillis(true);
+ return cal.getTimeInMillis();
}
/**
@@ -313,16 +293,17 @@
*
* @hide
*/
- public static void snapToCycleDay(Time time, int cycleDay) {
- if (cycleDay > time.getActualMaximum(MONTH_DAY)) {
- // cycle day isn't valid this month; snap to last second of month
- time.month += 1;
- time.monthDay = 1;
- time.second = -1;
+ public static void snapToCycleDay(Calendar cal, int cycleDay) {
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ if (cycleDay > cal.getActualMaximum(Calendar.DAY_OF_MONTH)) {
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.add(Calendar.MONTH, 1);
+ cal.add(Calendar.SECOND, -1);
} else {
- time.monthDay = cycleDay;
+ cal.set(Calendar.DAY_OF_MONTH, cycleDay);
}
- time.normalize(true);
}
/**
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index f1edcbe..4501f7b 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -19,6 +19,8 @@
import android.os.Parcel;
import android.os.Parcelable;
+import java.util.Objects;
+
/**
* Defines a request for a network, made through {@link NetworkRequest.Builder} and used
* to request a network via {@link ConnectivityManager#requestNetwork} or listen for changes
@@ -47,15 +49,55 @@
public final int legacyType;
/**
+ * A NetworkRequest as used by the system can be one of three types:
+ *
+ * - LISTEN, for which the framework will issue callbacks about any
+ * and all networks that match the specified NetworkCapabilities,
+ *
+ * - REQUEST, capable of causing a specific network to be created
+ * first (e.g. a telephony DUN request), the framework will issue
+ * callbacks about the single, highest scoring current network
+ * (if any) that matches the specified NetworkCapabilities, or
+ *
+ * - TRACK_DEFAULT, a hybrid of the two designed such that the
+ * framework will issue callbacks for the single, highest scoring
+ * current network (if any) that matches the capabilities of the
+ * default Internet request (mDefaultRequest), but which cannot cause
+ * the framework to either create or retain the existence of any
+ * specific network.
+ *
+ * - The value NONE is used only by applications. When an application
+ * creates a NetworkRequest, it does not have a type; the type is set
+ * by the system depending on the method used to file the request
+ * (requestNetwork, registerNetworkCallback, etc.).
+ *
* @hide
*/
- public NetworkRequest(NetworkCapabilities nc, int legacyType, int rId) {
+ public static enum Type {
+ NONE,
+ LISTEN,
+ TRACK_DEFAULT,
+ REQUEST
+ };
+
+ /**
+ * The type of the request. This is only used by the system and is always NONE elsewhere.
+ *
+ * @hide
+ */
+ public final Type type;
+
+ /**
+ * @hide
+ */
+ public NetworkRequest(NetworkCapabilities nc, int legacyType, int rId, Type type) {
if (nc == null) {
throw new NullPointerException();
}
requestId = rId;
networkCapabilities = nc;
this.legacyType = legacyType;
+ this.type = type;
}
/**
@@ -65,6 +107,7 @@
networkCapabilities = new NetworkCapabilities(that.networkCapabilities);
requestId = that.requestId;
this.legacyType = that.legacyType;
+ this.type = that.type;
}
/**
@@ -90,7 +133,7 @@
final NetworkCapabilities nc = new NetworkCapabilities(mNetworkCapabilities);
nc.maybeMarkCapabilitiesRestricted();
return new NetworkRequest(nc, ConnectivityManager.TYPE_NONE,
- ConnectivityManager.REQUEST_ID_UNSET);
+ ConnectivityManager.REQUEST_ID_UNSET, Type.NONE);
}
/**
@@ -223,6 +266,7 @@
dest.writeParcelable(networkCapabilities, flags);
dest.writeInt(legacyType);
dest.writeInt(requestId);
+ dest.writeString(type.name());
}
public static final Creator<NetworkRequest> CREATOR =
new Creator<NetworkRequest>() {
@@ -230,7 +274,8 @@
NetworkCapabilities nc = (NetworkCapabilities)in.readParcelable(null);
int legacyType = in.readInt();
int requestId = in.readInt();
- NetworkRequest result = new NetworkRequest(nc, legacyType, requestId);
+ Type type = Type.valueOf(in.readString()); // IllegalArgumentException if invalid.
+ NetworkRequest result = new NetworkRequest(nc, legacyType, requestId, type);
return result;
}
public NetworkRequest[] newArray(int size) {
@@ -238,8 +283,36 @@
}
};
+ /**
+ * Returns true iff. the contained NetworkRequest is of type LISTEN.
+ *
+ * @hide
+ */
+ public boolean isListen() {
+ return type == Type.LISTEN;
+ }
+
+ /**
+ * Returns true iff. the contained NetworkRequest is one that:
+ *
+ * - should be associated with at most one satisfying network
+ * at a time;
+ *
+ * - should cause a network to be kept up if it is the best network
+ * which can satisfy the NetworkRequest.
+ *
+ * For full detail of how isRequest() is used for pairing Networks with
+ * NetworkRequests read rematchNetworkAndRequests().
+ *
+ * @hide
+ */
+ public boolean isRequest() {
+ return type == Type.TRACK_DEFAULT || type == Type.REQUEST;
+ }
+
public String toString() {
- return "NetworkRequest [ id=" + requestId + ", legacyType=" + legacyType +
+ return "NetworkRequest [ " + type + " id=" + requestId +
+ (legacyType != ConnectivityManager.TYPE_NONE ? ", legacyType=" + legacyType : "") +
", " + networkCapabilities.toString() + " ]";
}
@@ -248,13 +321,11 @@
NetworkRequest that = (NetworkRequest)obj;
return (that.legacyType == this.legacyType &&
that.requestId == this.requestId &&
- ((that.networkCapabilities == null && this.networkCapabilities == null) ||
- (that.networkCapabilities != null &&
- that.networkCapabilities.equals(this.networkCapabilities))));
+ that.type == this.type &&
+ Objects.equals(that.networkCapabilities, this.networkCapabilities));
}
public int hashCode() {
- return requestId + (legacyType * 1013) +
- (networkCapabilities.hashCode() * 1051);
+ return Objects.hash(requestId, legacyType, networkCapabilities, type);
}
}
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 069d227..f081e93 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -45,13 +45,20 @@
public native static void attachDhcpFilter(FileDescriptor fd) throws SocketException;
/**
- * Attaches a socket filter that accepts ICMP6 router advertisement packets to the given socket.
+ * Attaches a socket filter that accepts ICMPv6 router advertisements to the given socket.
* @param fd the socket's {@link FileDescriptor}.
* @param packetType the hardware address type, one of ARPHRD_*.
*/
public native static void attachRaFilter(FileDescriptor fd, int packetType) throws SocketException;
/**
+ * Configures a socket for receiving ICMPv6 router solicitations and sending advertisements.
+ * @param fd the socket's {@link FileDescriptor}.
+ * @param ifIndex the interface index.
+ */
+ public native static void setupRaSocket(FileDescriptor fd, int ifIndex) throws SocketException;
+
+ /**
* Binds the current process to the network designated by {@code netId}. All sockets created
* in the future (and not explicitly bound via a bound {@link SocketFactory} (see
* {@link Network#getSocketFactory}) will be bound to this network. Note that if this
diff --git a/core/java/android/net/metrics/ApfProgramEvent.java b/core/java/android/net/metrics/ApfProgramEvent.java
new file mode 100644
index 0000000..258d8e1
--- /dev/null
+++ b/core/java/android/net/metrics/ApfProgramEvent.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.metrics;
+
+import android.annotation.IntDef;
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.SparseArray;
+
+import com.android.internal.util.MessageUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
+/**
+ * An event logged when there is a change or event that requires updating the
+ * the APF program in place with a new APF program.
+ * {@hide}
+ */
+@SystemApi
+public final class ApfProgramEvent implements Parcelable {
+
+ // Bitflag constants describing what an Apf program filters.
+ // Bits are indexeds from LSB to MSB, starting at index 0.
+ public static final int FLAG_MULTICAST_FILTER_ON = 0;
+ public static final int FLAG_HAS_IPV4_ADDRESS = 1;
+
+ /** {@hide} */
+ @IntDef(flag = true, value = {FLAG_MULTICAST_FILTER_ON, FLAG_HAS_IPV4_ADDRESS})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Flags {}
+
+ public final long lifetime; // Lifetime of the program in seconds
+ public final int filteredRas; // Number of RAs filtered by the APF program
+ public final int currentRas; // Total number of current RAs at generation time
+ public final int programLength; // Length of the APF program in bytes
+ public final int flags; // Bitfield compound of FLAG_* constants
+
+ /** {@hide} */
+ public ApfProgramEvent(
+ long lifetime, int filteredRas, int currentRas, int programLength, @Flags int flags) {
+ this.lifetime = lifetime;
+ this.filteredRas = filteredRas;
+ this.currentRas = currentRas;
+ this.programLength = programLength;
+ this.flags = flags;
+ }
+
+ private ApfProgramEvent(Parcel in) {
+ this.lifetime = in.readLong();
+ this.filteredRas = in.readInt();
+ this.currentRas = in.readInt();
+ this.programLength = in.readInt();
+ this.flags = in.readInt();
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeLong(lifetime);
+ out.writeInt(filteredRas);
+ out.writeInt(currentRas);
+ out.writeInt(programLength);
+ out.writeInt(flags);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ String lifetimeString = (lifetime < Long.MAX_VALUE) ? lifetime + "s" : "forever";
+ return String.format("ApfProgramEvent(%d/%d RAs %dB %s %s)",
+ filteredRas, currentRas, programLength, lifetimeString, namesOf(flags));
+ }
+
+ public static final Parcelable.Creator<ApfProgramEvent> CREATOR
+ = new Parcelable.Creator<ApfProgramEvent>() {
+ public ApfProgramEvent createFromParcel(Parcel in) {
+ return new ApfProgramEvent(in);
+ }
+
+ public ApfProgramEvent[] newArray(int size) {
+ return new ApfProgramEvent[size];
+ }
+ };
+
+ /** {@hide} */
+ public static @Flags int flagsFor(boolean hasIPv4, boolean multicastFilterOn) {
+ int bitfield = 0;
+ if (hasIPv4) {
+ bitfield |= (1 << FLAG_HAS_IPV4_ADDRESS);
+ }
+ if (multicastFilterOn) {
+ bitfield |= (1 << FLAG_MULTICAST_FILTER_ON);
+ }
+ return bitfield;
+ }
+
+ private static String namesOf(@Flags int bitfield) {
+ List<String> names = new ArrayList<>(Integer.bitCount(bitfield));
+ BitSet set = BitSet.valueOf(new long[]{bitfield & Integer.MAX_VALUE});
+ // Only iterate over flag bits which are set.
+ for (int bit = set.nextSetBit(0); bit >= 0; bit = set.nextSetBit(bit+1)) {
+ names.add(Decoder.constants.get(bit));
+ }
+ return TextUtils.join("|", names);
+ }
+
+ final static class Decoder {
+ static final SparseArray<String> constants =
+ MessageUtils.findMessageNames(
+ new Class[]{ApfProgramEvent.class}, new String[]{"FLAG_"});
+ }
+}
diff --git a/core/java/android/net/metrics/ApfStats.java b/core/java/android/net/metrics/ApfStats.java
new file mode 100644
index 0000000..8451e53
--- /dev/null
+++ b/core/java/android/net/metrics/ApfStats.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.metrics;
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * An event logged for an interface with APF capabilities when its IpManager state machine exits.
+ * {@hide}
+ */
+@SystemApi
+public final class ApfStats implements Parcelable {
+
+ public final long durationMs; // time interval in milliseconds these stastistics covers
+ public final int receivedRas; // number of received RAs
+ public final int matchingRas; // number of received RAs matching a known RA
+ public final int droppedRas; // number of received RAs ignored due to the MAX_RAS limit
+ public final int zeroLifetimeRas; // number of received RAs with a minimum lifetime of 0
+ public final int parseErrors; // number of received RAs that could not be parsed
+ public final int programUpdates; // number of APF program updates
+ public final int maxProgramSize; // maximum APF program size advertised by hardware
+
+ /** {@hide} */
+ public ApfStats(long durationMs, int receivedRas, int matchingRas, int droppedRas,
+ int zeroLifetimeRas, int parseErrors, int programUpdates, int maxProgramSize) {
+ this.durationMs = durationMs;
+ this.receivedRas = receivedRas;
+ this.matchingRas = matchingRas;
+ this.droppedRas = droppedRas;
+ this.zeroLifetimeRas = zeroLifetimeRas;
+ this.parseErrors = parseErrors;
+ this.programUpdates = programUpdates;
+ this.maxProgramSize = maxProgramSize;
+ }
+
+ private ApfStats(Parcel in) {
+ this.durationMs = in.readLong();
+ this.receivedRas = in.readInt();
+ this.matchingRas = in.readInt();
+ this.droppedRas = in.readInt();
+ this.zeroLifetimeRas = in.readInt();
+ this.parseErrors = in.readInt();
+ this.programUpdates = in.readInt();
+ this.maxProgramSize = in.readInt();
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeLong(durationMs);
+ out.writeInt(receivedRas);
+ out.writeInt(matchingRas);
+ out.writeInt(droppedRas);
+ out.writeInt(zeroLifetimeRas);
+ out.writeInt(parseErrors);
+ out.writeInt(programUpdates);
+ out.writeInt(maxProgramSize);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ return new StringBuilder("ApfStats(")
+ .append(String.format("%dms ", durationMs))
+ .append(String.format("%dB RA: {", maxProgramSize))
+ .append(String.format("%d received, ", receivedRas))
+ .append(String.format("%d matching, ", matchingRas))
+ .append(String.format("%d dropped, ", droppedRas))
+ .append(String.format("%d zero lifetime, ", zeroLifetimeRas))
+ .append(String.format("%d parse errors, ", parseErrors))
+ .append(String.format("%d program updates})", programUpdates))
+ .toString();
+ }
+
+ public static final Parcelable.Creator<ApfStats> CREATOR = new Parcelable.Creator<ApfStats>() {
+ public ApfStats createFromParcel(Parcel in) {
+ return new ApfStats(in);
+ }
+
+ public ApfStats[] newArray(int size) {
+ return new ApfStats[size];
+ }
+ };
+}
diff --git a/core/java/android/net/metrics/DefaultNetworkEvent.java b/core/java/android/net/metrics/DefaultNetworkEvent.java
index f8b5992..9f0bad7 100644
--- a/core/java/android/net/metrics/DefaultNetworkEvent.java
+++ b/core/java/android/net/metrics/DefaultNetworkEvent.java
@@ -22,10 +22,11 @@
import android.os.Parcelable;
/**
+ * An event recorded by ConnectivityService when there is a change in the default network.
* {@hide}
*/
@SystemApi
-public final class DefaultNetworkEvent extends IpConnectivityEvent implements Parcelable {
+public final class DefaultNetworkEvent implements Parcelable {
// The ID of the network that has become the new default or NETID_UNSET if none.
public final int netId;
// The list of transport types of the new default network, for example TRANSPORT_WIFI, as
@@ -37,7 +38,8 @@
public final boolean prevIPv4;
public final boolean prevIPv6;
- private DefaultNetworkEvent(int netId, int[] transportTypes,
+ /** {@hide} */
+ public DefaultNetworkEvent(int netId, int[] transportTypes,
int prevNetId, boolean prevIPv4, boolean prevIPv6) {
this.netId = netId;
this.transportTypes = transportTypes;
@@ -54,6 +56,7 @@
this.prevIPv6 = (in.readByte() > 0);
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeInt(netId);
out.writeIntArray(transportTypes);
@@ -62,6 +65,7 @@
out.writeByte(prevIPv6 ? (byte) 1 : (byte) 0);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -105,6 +109,5 @@
public static void logEvent(
int netId, int[] transports, int prevNetId, boolean hadIPv4, boolean hadIPv6) {
- logEvent(new DefaultNetworkEvent(netId, transports, prevNetId, hadIPv4, hadIPv6));
}
-};
+}
diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java
index ec560bf..4a9ff05 100644
--- a/core/java/android/net/metrics/DhcpClientEvent.java
+++ b/core/java/android/net/metrics/DhcpClientEvent.java
@@ -21,35 +21,50 @@
import android.os.Parcelable;
/**
+ * An event recorded when a DhcpClient state machine transitions to a new state.
* {@hide}
*/
@SystemApi
-public final class DhcpClientEvent extends IpConnectivityEvent implements Parcelable {
+public final class DhcpClientEvent implements Parcelable {
+
+ // Names for recording DhcpClient pseudo-state transitions.
+ /** {@hide} Represents transitions from DhcpInitState to DhcpBoundState */
+ public static final String INITIAL_BOUND = "InitialBoundState";
+ /** {@hide} Represents transitions from and to DhcpBoundState via DhcpRenewingState */
+ public static final String RENEWING_BOUND = "RenewingBoundState";
+
public final String ifName;
public final String msg;
+ public final int durationMs;
- private DhcpClientEvent(String ifName, String msg) {
+ /** {@hide} */
+ public DhcpClientEvent(String ifName, String msg, int durationMs) {
this.ifName = ifName;
this.msg = msg;
+ this.durationMs = durationMs;
}
private DhcpClientEvent(Parcel in) {
this.ifName = in.readString();
this.msg = in.readString();
+ this.durationMs = in.readInt();
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeString(ifName);
out.writeString(msg);
+ out.writeInt(durationMs);
}
+ @Override
public int describeContents() {
return 0;
}
@Override
public String toString() {
- return String.format("DhcpClientEvent(%s, %s)", ifName, msg);
+ return String.format("DhcpClientEvent(%s, %s, %dms)", ifName, msg, durationMs);
}
public static final Parcelable.Creator<DhcpClientEvent> CREATOR
@@ -64,6 +79,5 @@
};
public static void logStateEvent(String ifName, String state) {
- logEvent(new DhcpClientEvent(ifName, state));
}
-};
+}
diff --git a/core/java/android/net/metrics/DhcpErrorEvent.java b/core/java/android/net/metrics/DhcpErrorEvent.java
index 84795b8..59c5fb6 100644
--- a/core/java/android/net/metrics/DhcpErrorEvent.java
+++ b/core/java/android/net/metrics/DhcpErrorEvent.java
@@ -24,10 +24,11 @@
import com.android.internal.util.MessageUtils;
/**
- * {@hide} Event class used to record error events when parsing DHCP response packets.
+ * Event class used to record error events when parsing DHCP response packets.
+ * {@hide}
*/
@SystemApi
-public final class DhcpErrorEvent extends IpConnectivityEvent implements Parcelable {
+public final class DhcpErrorEvent implements Parcelable {
public static final int L2_ERROR = 1;
public static final int L3_ERROR = 2;
public static final int L4_ERROR = 3;
@@ -61,7 +62,8 @@
// byte 3: optional code
public final int errorCode;
- private DhcpErrorEvent(String ifName, int errorCode) {
+ /** {@hide} */
+ public DhcpErrorEvent(String ifName, int errorCode) {
this.ifName = ifName;
this.errorCode = errorCode;
}
@@ -71,11 +73,13 @@
this.errorCode = in.readInt();
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeString(ifName);
out.writeInt(errorCode);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -92,11 +96,9 @@
};
public static void logParseError(String ifName, int errorCode) {
- logEvent(new DhcpErrorEvent(ifName, errorCode));
}
public static void logReceiveError(String ifName) {
- logEvent(new DhcpErrorEvent(ifName, RECEIVE_ERROR));
}
public static int errorCodeWithOption(int errorCode, int option) {
diff --git a/core/java/android/net/metrics/DnsEvent.java b/core/java/android/net/metrics/DnsEvent.java
index b94dda0..4fc6b7a 100644
--- a/core/java/android/net/metrics/DnsEvent.java
+++ b/core/java/android/net/metrics/DnsEvent.java
@@ -21,10 +21,11 @@
import android.os.Parcelable;
/**
+ * An event recorded by DnsEventListenerService.
* {@hide}
*/
@SystemApi
-final public class DnsEvent extends IpConnectivityEvent implements Parcelable {
+final public class DnsEvent implements Parcelable {
public final int netId;
// The event type is currently only 1 or 2, so we store it as a byte.
@@ -37,7 +38,8 @@
// queries.
public final int[] latenciesMs;
- private DnsEvent(int netId, byte[] eventTypes, byte[] returnCodes, int[] latenciesMs) {
+ /** {@hide} */
+ public DnsEvent(int netId, byte[] eventTypes, byte[] returnCodes, int[] latenciesMs) {
this.netId = netId;
this.eventTypes = eventTypes;
this.returnCodes = returnCodes;
@@ -59,6 +61,7 @@
out.writeIntArray(latenciesMs);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -82,6 +85,5 @@
public static void logEvent(
int netId, byte[] eventTypes, byte[] returnCodes, int[] latenciesMs) {
- logEvent(new DnsEvent(netId, eventTypes, returnCodes, latenciesMs));
}
}
diff --git a/core/java/android/net/metrics/IpConnectivityEvent.java b/core/java/android/net/metrics/IpConnectivityEvent.java
deleted file mode 100644
index d3771dc..0000000
--- a/core/java/android/net/metrics/IpConnectivityEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.metrics;
-
-import android.os.Parcelable;
-
-/** {@hide} */
-public abstract class IpConnectivityEvent {
- private static final IpConnectivityLog sMetricsLog = new IpConnectivityLog();
-
- static <T extends IpConnectivityEvent & Parcelable> void logEvent(T event) {
- sMetricsLog.log(System.currentTimeMillis(), event);
- }
-}
diff --git a/core/java/android/net/metrics/IpConnectivityLog.java b/core/java/android/net/metrics/IpConnectivityLog.java
index 233ff74..dd7bd1b 100644
--- a/core/java/android/net/metrics/IpConnectivityLog.java
+++ b/core/java/android/net/metrics/IpConnectivityLog.java
@@ -18,31 +18,43 @@
import android.net.ConnectivityMetricsEvent;
import android.net.ConnectivityMetricsLogger;
+import android.net.IConnectivityMetricsLogger;
import android.os.Parcelable;
import android.os.RemoteException;
import android.util.Log;
+import com.android.internal.annotations.VisibleForTesting;
+
/**
* Specialization of the ConnectivityMetricsLogger class for recording IP connectivity events.
* {@hide}
*/
-class IpConnectivityLog extends ConnectivityMetricsLogger {
+public class IpConnectivityLog extends ConnectivityMetricsLogger {
private static String TAG = "IpConnectivityMetricsLogger";
- private static final boolean DBG = false;
+ private static final boolean DBG = true;
+
+ public IpConnectivityLog() {
+ // mService initialized in super constructor.
+ }
+
+ @VisibleForTesting
+ public IpConnectivityLog(IConnectivityMetricsLogger service) {
+ super(service);
+ }
/**
* Log an IpConnectivity event. Contrary to logEvent(), this method does not
* keep track of skipped events and is thread-safe for callers.
*
* @param timestamp is the epoch timestamp of the event in ms.
- * @param data is a Parcelable IpConnectivityEvent instance representing the event.
+ * @param data is a Parcelable instance representing the event.
*
* @return true if the event was successfully logged.
*/
- public <T extends IpConnectivityEvent & Parcelable> boolean log(long timestamp, T data) {
- if (mService == null) {
+ public boolean log(long timestamp, Parcelable data) {
+ if (!checkLoggerService()) {
if (DBG) {
- Log.d(TAG, CONNECTIVITY_METRICS_LOGGER_SERVICE + " service not ready");
+ Log.d(TAG, CONNECTIVITY_METRICS_LOGGER_SERVICE + " service was not ready");
}
return false;
}
@@ -67,4 +79,8 @@
return false;
}
}
+
+ public void log(Parcelable event) {
+ log(System.currentTimeMillis(), event);
+ }
}
diff --git a/core/java/android/net/metrics/IpManagerEvent.java b/core/java/android/net/metrics/IpManagerEvent.java
index 0940bd0..a5b4eb5 100644
--- a/core/java/android/net/metrics/IpManagerEvent.java
+++ b/core/java/android/net/metrics/IpManagerEvent.java
@@ -16,6 +16,7 @@
package android.net.metrics;
+import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -23,21 +24,32 @@
import com.android.internal.util.MessageUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
+ * An event recorded by IpManager when IP provisioning completes for a network or
+ * when a network disconnects.
* {@hide}
*/
@SystemApi
-public final class IpManagerEvent extends IpConnectivityEvent implements Parcelable {
+public final class IpManagerEvent implements Parcelable {
public static final int PROVISIONING_OK = 1;
public static final int PROVISIONING_FAIL = 2;
public static final int COMPLETE_LIFECYCLE = 3;
+ /** {@hide} */
+ @IntDef(value = {PROVISIONING_OK, PROVISIONING_FAIL, COMPLETE_LIFECYCLE})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface EventType {}
+
public final String ifName;
- public final int eventType;
+ public final @EventType int eventType;
public final long durationMs;
- private IpManagerEvent(String ifName, int eventType, long duration) {
+ /** {@hide} */
+ public IpManagerEvent(String ifName, @EventType int eventType, long duration) {
this.ifName = ifName;
this.eventType = eventType;
this.durationMs = duration;
@@ -49,12 +61,14 @@
this.durationMs = in.readLong();
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeString(ifName);
out.writeInt(eventType);
out.writeLong(durationMs);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -71,7 +85,6 @@
};
public static void logEvent(int eventType, String ifName, long durationMs) {
- logEvent(new IpManagerEvent(ifName, eventType, durationMs));
}
@Override
@@ -84,4 +97,4 @@
static final SparseArray<String> constants = MessageUtils.findMessageNames(
new Class[]{IpManagerEvent.class}, new String[]{"PROVISIONING_", "COMPLETE_"});
}
-};
+}
diff --git a/core/java/android/net/metrics/IpReachabilityEvent.java b/core/java/android/net/metrics/IpReachabilityEvent.java
index d40389c..ee09e22 100644
--- a/core/java/android/net/metrics/IpReachabilityEvent.java
+++ b/core/java/android/net/metrics/IpReachabilityEvent.java
@@ -24,24 +24,35 @@
import com.android.internal.util.MessageUtils;
/**
+ * An event recorded when IpReachabilityMonitor sends a neighbor probe or receives
+ * a neighbor probe result.
* {@hide}
*/
@SystemApi
-public final class IpReachabilityEvent extends IpConnectivityEvent implements Parcelable {
+public final class IpReachabilityEvent implements Parcelable {
- public static final int PROBE = 1 << 8;
- public static final int NUD_FAILED = 2 << 8;
- public static final int PROVISIONING_LOST = 3 << 8;
+ // Event types.
+ /** A probe forced by IpReachabilityMonitor. */
+ public static final int PROBE = 1 << 8;
+ /** Neighbor unreachable after a forced probe. */
+ public static final int NUD_FAILED = 2 << 8;
+ /** Neighbor unreachable after a forced probe, IP provisioning is also lost. */
+ public static final int PROVISIONING_LOST = 3 << 8;
+ /** {@hide} Neighbor unreachable notification from kernel. */
+ public static final int NUD_FAILED_ORGANIC = 4 << 8;
+ /** {@hide} Neighbor unreachable notification from kernel, IP provisioning is also lost. */
+ public static final int PROVISIONING_LOST_ORGANIC = 5 << 8;
public final String ifName;
// eventType byte format (MSB to LSB):
// byte 0: unused
// byte 1: unused
// byte 2: type of event: PROBE, NUD_FAILED, PROVISIONING_LOST
- // byte 3: kernel errno from RTNetlink or IpReachabilityMonitor
+ // byte 3: when byte 2 == PROBE, errno code from RTNetlink or IpReachabilityMonitor.
public final int eventType;
- private IpReachabilityEvent(String ifName, int eventType) {
+ /** {@hide} */
+ public IpReachabilityEvent(String ifName, int eventType) {
this.ifName = ifName;
this.eventType = eventType;
}
@@ -51,11 +62,13 @@
this.eventType = in.readInt();
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeString(ifName);
out.writeInt(eventType);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -72,21 +85,32 @@
};
public static void logProbeEvent(String ifName, int nlErrorCode) {
- logEvent(new IpReachabilityEvent(ifName, PROBE | (nlErrorCode & 0xFF)));
}
public static void logNudFailed(String ifName) {
- logEvent(new IpReachabilityEvent(ifName, NUD_FAILED));
}
public static void logProvisioningLost(String ifName) {
- logEvent(new IpReachabilityEvent(ifName, PROVISIONING_LOST));
+ }
+
+ /**
+ * Returns the NUD failure event type code corresponding to the given conditions.
+ * {@hide}
+ */
+ public static int nudFailureEventType(boolean isFromProbe, boolean isProvisioningLost) {
+ if (isFromProbe) {
+ return isProvisioningLost ? PROVISIONING_LOST : NUD_FAILED;
+ } else {
+ return isProvisioningLost ? PROVISIONING_LOST_ORGANIC : NUD_FAILED_ORGANIC;
+ }
}
@Override
public String toString() {
- return String.format("IpReachabilityEvent(%s, %s)", ifName,
- Decoder.constants.get(eventType));
+ int hi = eventType & 0xff00;
+ int lo = eventType & 0x00ff;
+ String eventName = Decoder.constants.get(hi);
+ return String.format("IpReachabilityEvent(%s, %s:%02x)", ifName, eventName, lo);
}
final static class Decoder {
@@ -94,4 +118,4 @@
MessageUtils.findMessageNames(new Class[]{IpReachabilityEvent.class},
new String[]{"PROBE", "PROVISIONING_", "NUD_"});
}
-};
+}
diff --git a/core/java/android/net/metrics/NetworkEvent.java b/core/java/android/net/metrics/NetworkEvent.java
index 08c9c75..3b3fa69 100644
--- a/core/java/android/net/metrics/NetworkEvent.java
+++ b/core/java/android/net/metrics/NetworkEvent.java
@@ -16,6 +16,7 @@
package android.net.metrics;
+import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -23,11 +24,14 @@
import com.android.internal.util.MessageUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* {@hide}
*/
@SystemApi
-public final class NetworkEvent extends IpConnectivityEvent implements Parcelable {
+public final class NetworkEvent implements Parcelable {
public static final int NETWORK_CONNECTED = 1;
public static final int NETWORK_VALIDATED = 2;
@@ -37,28 +41,49 @@
public static final int NETWORK_UNLINGER = 6;
public static final int NETWORK_DISCONNECTED = 7;
+ /** {@hide} */
+ @IntDef(value = {
+ NETWORK_CONNECTED,
+ NETWORK_VALIDATED,
+ NETWORK_VALIDATION_FAILED,
+ NETWORK_CAPTIVE_PORTAL_FOUND,
+ NETWORK_LINGER,
+ NETWORK_UNLINGER,
+ NETWORK_DISCONNECTED,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface EventType {}
+
public final int netId;
- public final int eventType;
+ public final @EventType int eventType;
public final long durationMs;
- private NetworkEvent(int netId, int eventType, long durationMs) {
+ /** {@hide} */
+ public NetworkEvent(int netId, @EventType int eventType, long durationMs) {
this.netId = netId;
this.eventType = eventType;
this.durationMs = durationMs;
}
+ /** {@hide} */
+ public NetworkEvent(int netId, @EventType int eventType) {
+ this(netId, eventType, 0);
+ }
+
private NetworkEvent(Parcel in) {
netId = in.readInt();
eventType = in.readInt();
durationMs = in.readLong();
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeInt(netId);
out.writeInt(eventType);
out.writeLong(durationMs);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -75,15 +100,12 @@
};
public static void logEvent(int netId, int eventType) {
- logEvent(new NetworkEvent(netId, eventType, 0));
}
public static void logValidated(int netId, long durationMs) {
- logEvent(new NetworkEvent(netId, NETWORK_VALIDATED, durationMs));
}
public static void logCaptivePortalFound(int netId, long durationMs) {
- logEvent(new NetworkEvent(netId, NETWORK_CAPTIVE_PORTAL_FOUND, durationMs));
}
@Override
@@ -96,4 +118,4 @@
static final SparseArray<String> constants = MessageUtils.findMessageNames(
new Class[]{NetworkEvent.class}, new String[]{"NETWORK_"});
}
-};
+}
diff --git a/core/java/android/net/metrics/RaEvent.java b/core/java/android/net/metrics/RaEvent.java
new file mode 100644
index 0000000..91bd023
--- /dev/null
+++ b/core/java/android/net/metrics/RaEvent.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.metrics;
+
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * An event logged when the APF packet socket receives an RA packet.
+ * {@hide}
+ */
+@SystemApi
+public final class RaEvent implements Parcelable {
+
+ /** {@hide} */
+ public static final long NO_LIFETIME = -1L;
+
+ // Lifetime in seconds of options found in a single RA packet.
+ // When an option is not set, the value of the associated field is -1;
+ public final long routerLifetime;
+ public final long prefixValidLifetime;
+ public final long prefixPreferredLifetime;
+ public final long routeInfoLifetime;
+ public final long rdnssLifetime;
+ public final long dnsslLifetime;
+
+ /** {@hide} */
+ public RaEvent(long routerLifetime, long prefixValidLifetime, long prefixPreferredLifetime,
+ long routeInfoLifetime, long rdnssLifetime, long dnsslLifetime) {
+ this.routerLifetime = routerLifetime;
+ this.prefixValidLifetime = prefixValidLifetime;
+ this.prefixPreferredLifetime = prefixPreferredLifetime;
+ this.routeInfoLifetime = routeInfoLifetime;
+ this.rdnssLifetime = rdnssLifetime;
+ this.dnsslLifetime = dnsslLifetime;
+ }
+
+ private RaEvent(Parcel in) {
+ routerLifetime = in.readLong();
+ prefixValidLifetime = in.readLong();
+ prefixPreferredLifetime = in.readLong();
+ routeInfoLifetime = in.readLong();
+ rdnssLifetime = in.readLong();
+ dnsslLifetime = in.readLong();
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeLong(routerLifetime);
+ out.writeLong(prefixValidLifetime);
+ out.writeLong(prefixPreferredLifetime);
+ out.writeLong(routeInfoLifetime);
+ out.writeLong(rdnssLifetime);
+ out.writeLong(dnsslLifetime);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ return new StringBuilder("RaEvent(lifetimes: ")
+ .append(String.format("router=%ds, ", routerLifetime))
+ .append(String.format("prefix_valid=%ds, ", prefixValidLifetime))
+ .append(String.format("prefix_preferred=%ds, ", prefixPreferredLifetime))
+ .append(String.format("route_info=%ds, ", routeInfoLifetime))
+ .append(String.format("rdnss=%ds, ", rdnssLifetime))
+ .append(String.format("dnssl=%ds)", dnsslLifetime))
+ .toString();
+ }
+
+ public static final Parcelable.Creator<RaEvent> CREATOR = new Parcelable.Creator<RaEvent>() {
+ public RaEvent createFromParcel(Parcel in) {
+ return new RaEvent(in);
+ }
+
+ public RaEvent[] newArray(int size) {
+ return new RaEvent[size];
+ }
+ };
+
+ /** {@hide} */
+ public static class Builder {
+
+ long routerLifetime = NO_LIFETIME;
+ long prefixValidLifetime = NO_LIFETIME;
+ long prefixPreferredLifetime = NO_LIFETIME;
+ long routeInfoLifetime = NO_LIFETIME;
+ long rdnssLifetime = NO_LIFETIME;
+ long dnsslLifetime = NO_LIFETIME;
+
+ public Builder() {
+ }
+
+ public RaEvent build() {
+ return new RaEvent(routerLifetime, prefixValidLifetime, prefixPreferredLifetime,
+ routeInfoLifetime, rdnssLifetime, dnsslLifetime);
+ }
+
+ public Builder updateRouterLifetime(long lifetime) {
+ routerLifetime = updateLifetime(routerLifetime, lifetime);
+ return this;
+ }
+
+ public Builder updatePrefixValidLifetime(long lifetime) {
+ prefixValidLifetime = updateLifetime(prefixValidLifetime, lifetime);
+ return this;
+ }
+
+ public Builder updatePrefixPreferredLifetime(long lifetime) {
+ prefixPreferredLifetime = updateLifetime(prefixPreferredLifetime, lifetime);
+ return this;
+ }
+
+ public Builder updateRouteInfoLifetime(long lifetime) {
+ routeInfoLifetime = updateLifetime(routeInfoLifetime, lifetime);
+ return this;
+ }
+
+ public Builder updateRdnssLifetime(long lifetime) {
+ rdnssLifetime = updateLifetime(rdnssLifetime, lifetime);
+ return this;
+ }
+
+ public Builder updateDnsslLifetime(long lifetime) {
+ dnsslLifetime = updateLifetime(dnsslLifetime, lifetime);
+ return this;
+ }
+
+ private long updateLifetime(long currentLifetime, long newLifetime) {
+ if (currentLifetime == RaEvent.NO_LIFETIME) {
+ return newLifetime;
+ }
+ return Math.min(currentLifetime, newLifetime);
+ }
+ }
+}
diff --git a/core/java/android/net/metrics/ValidationProbeEvent.java b/core/java/android/net/metrics/ValidationProbeEvent.java
index 751c35f..331cf0c 100644
--- a/core/java/android/net/metrics/ValidationProbeEvent.java
+++ b/core/java/android/net/metrics/ValidationProbeEvent.java
@@ -16,6 +16,7 @@
package android.net.metrics;
+import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -23,11 +24,15 @@
import com.android.internal.util.MessageUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
+ * An event recorded by NetworkMonitor when sending a probe for finding captive portals.
* {@hide}
*/
@SystemApi
-public final class ValidationProbeEvent extends IpConnectivityEvent implements Parcelable {
+public final class ValidationProbeEvent implements Parcelable {
public static final int PROBE_DNS = 0;
public static final int PROBE_HTTP = 1;
@@ -37,12 +42,24 @@
public static final int DNS_FAILURE = 0;
public static final int DNS_SUCCESS = 1;
+ /** {@hide} */
+ @IntDef(value = {PROBE_DNS, PROBE_HTTP, PROBE_HTTPS, PROBE_PAC})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ProbeType {}
+
+ /** {@hide} */
+ @IntDef(value = {DNS_FAILURE, DNS_SUCCESS})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ReturnCode {}
+
public final int netId;
public final long durationMs;
- public final int probeType;
- public final int returnCode;
+ public final @ProbeType int probeType;
+ public final @ReturnCode int returnCode;
- private ValidationProbeEvent(int netId, long durationMs, int probeType, int returnCode) {
+ /** @hide */
+ public ValidationProbeEvent(
+ int netId, long durationMs, @ProbeType int probeType, @ReturnCode int returnCode) {
this.netId = netId;
this.durationMs = durationMs;
this.probeType = probeType;
@@ -56,6 +73,7 @@
returnCode = in.readInt();
}
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeInt(netId);
out.writeLong(durationMs);
@@ -63,6 +81,7 @@
out.writeInt(returnCode);
}
+ @Override
public int describeContents() {
return 0;
}
@@ -84,7 +103,6 @@
}
public static void logEvent(int netId, long durationMs, int probeType, int returnCode) {
- logEvent(new ValidationProbeEvent(netId, durationMs, probeType, returnCode));
}
@Override
@@ -97,4 +115,4 @@
static final SparseArray<String> constants = MessageUtils.findMessageNames(
new Class[]{ValidationProbeEvent.class}, new String[]{"PROBE_"});
}
-};
+}
diff --git a/core/java/android/net/network-policy-restrictions.md b/core/java/android/net/network-policy-restrictions.md
index fe13f7a..63ce1a2 100644
--- a/core/java/android/net/network-policy-restrictions.md
+++ b/core/java/android/net/network-policy-restrictions.md
@@ -29,8 +29,8 @@
| **DS** | *WL* | ok | blk | ok | ok |
| **ON** | *!WL* | blk | blk | blk | blk |
| | *BL* | blk | blk | blk | blk |
-| **DS** | *WL* | blk | ok | ok | ok |
-| **OFF** | *!WL* | blk | ok | ok | ok |
+| **DS** | *WL* | blk | blk | ok | ok |
+| **OFF** | *!WL* | blk | blk | ok | ok |
| | *BL* | blk | blk | blk | blk |
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 4acb729..370f7f9 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -30,6 +30,7 @@
import android.telephony.SignalStrength;
import android.text.format.DateFormat;
import android.util.ArrayMap;
+import android.util.LongSparseArray;
import android.util.MutableBoolean;
import android.util.Pair;
import android.util.Printer;
@@ -546,6 +547,20 @@
*/
public abstract long getTimeAtCpuSpeed(int cluster, int step, int which);
+ /**
+ * Returns the number of times this UID woke up the Application Processor to
+ * process a mobile radio packet.
+ * @param which one of STATS_SINCE_CHARGED, STATS_SINCE_UNPLUGGED, or STATS_CURRENT.
+ */
+ public abstract long getMobileRadioApWakeupCount(int which);
+
+ /**
+ * Returns the number of times this UID woke up the Application Processor to
+ * process a WiFi packet.
+ * @param which one of STATS_SINCE_CHARGED, STATS_SINCE_UNPLUGGED, or STATS_CURRENT.
+ */
+ public abstract long getWifiRadioApWakeupCount(int which);
+
public static abstract class Sensor {
/*
* FIXME: it's not correct to use this magic value because it
@@ -1285,9 +1300,14 @@
public static final int EVENT_TEMP_WHITELIST = 0x0011;
// Event for the screen waking up.
public static final int EVENT_SCREEN_WAKE_UP = 0x0012;
+ // Event for the UID that woke up the application processor.
+ // Used for wakeups coming from WiFi, modem, etc.
+ public static final int EVENT_WAKEUP_AP = 0x0013;
+ // Event for reporting that a specific partial wake lock has been held for a long duration.
+ public static final int EVENT_LONG_WAKE_LOCK = 0x0014;
// Number of event types.
- public static final int EVENT_COUNT = 0x0013;
+ public static final int EVENT_COUNT = 0x0015;
// Mask to extract out only the type part of the event.
public static final int EVENT_TYPE_MASK = ~(EVENT_FLAG_START|EVENT_FLAG_FINISH);
@@ -1315,6 +1335,10 @@
EVENT_TEMP_WHITELIST | EVENT_FLAG_START;
public static final int EVENT_TEMP_WHITELIST_FINISH =
EVENT_TEMP_WHITELIST | EVENT_FLAG_FINISH;
+ public static final int EVENT_LONG_WAKE_LOCK_START =
+ EVENT_LONG_WAKE_LOCK | EVENT_FLAG_START;
+ public static final int EVENT_LONG_WAKE_LOCK_FINISH =
+ EVENT_LONG_WAKE_LOCK | EVENT_FLAG_FINISH;
// For CMD_EVENT.
public int eventCode;
@@ -1979,13 +2003,13 @@
public static final String[] HISTORY_EVENT_NAMES = new String[] {
"null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn",
"active", "pkginst", "pkgunin", "alarm", "stats", "inactive", "active", "tmpwhitelist",
- "screenwake",
+ "screenwake", "wakeupap", "longwake"
};
public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {
"Enl", "Epr", "Efg", "Etp", "Esy", "Ewl", "Ejb", "Eur", "Euf", "Ecn",
"Eac", "Epi", "Epu", "Eal", "Est", "Eai", "Eaa", "Etw",
- "Esw",
+ "Esw", "Ewa", "Elw"
};
/**
@@ -2427,6 +2451,8 @@
public abstract Map<String, ? extends Timer> getKernelWakelockStats();
+ public abstract LongSparseArray<? extends Timer> getKernelMemoryStats();
+
public abstract void writeToParcelWithoutUids(Parcel out, int flags);
private final static void formatTimeRaw(StringBuilder out, long seconds) {
@@ -3105,20 +3131,22 @@
final long mobilePacketsTx = u.getNetworkActivityPackets(NETWORK_MOBILE_TX_DATA, which);
final long mobileActiveTime = u.getMobileRadioActiveTime(which);
final int mobileActiveCount = u.getMobileRadioActiveCount(which);
+ final long mobileWakeup = u.getMobileRadioApWakeupCount(which);
final long wifiPacketsRx = u.getNetworkActivityPackets(NETWORK_WIFI_RX_DATA, which);
final long wifiPacketsTx = u.getNetworkActivityPackets(NETWORK_WIFI_TX_DATA, which);
+ final long wifiWakeup = u.getWifiRadioApWakeupCount(which);
final long btBytesRx = u.getNetworkActivityBytes(NETWORK_BT_RX_DATA, which);
final long btBytesTx = u.getNetworkActivityBytes(NETWORK_BT_TX_DATA, which);
if (mobileBytesRx > 0 || mobileBytesTx > 0 || wifiBytesRx > 0 || wifiBytesTx > 0
|| mobilePacketsRx > 0 || mobilePacketsTx > 0 || wifiPacketsRx > 0
|| wifiPacketsTx > 0 || mobileActiveTime > 0 || mobileActiveCount > 0
- || btBytesRx > 0 || btBytesTx > 0) {
+ || btBytesRx > 0 || btBytesTx > 0 || mobileWakeup > 0 || wifiWakeup > 0) {
dumpLine(pw, uid, category, NETWORK_DATA, mobileBytesRx, mobileBytesTx,
wifiBytesRx, wifiBytesTx,
mobilePacketsRx, mobilePacketsTx,
wifiPacketsRx, wifiPacketsTx,
mobileActiveTime, mobileActiveCount,
- btBytesRx, btBytesTx);
+ btBytesRx, btBytesTx, mobileWakeup, wifiWakeup);
}
// Dump modem controller data, per UID.
@@ -4091,6 +4119,17 @@
}
}
+ final LongSparseArray<? extends Timer> mMemoryStats = getKernelMemoryStats();
+ pw.println("Memory Stats");
+ for (int i = 0; i < mMemoryStats.size(); i++) {
+ sb.setLength(0);
+ sb.append("Bandwidth ");
+ sb.append(mMemoryStats.keyAt(i));
+ sb.append(" Time ");
+ sb.append(mMemoryStats.valueAt(i).getTotalTimeLocked(rawRealtime, which));
+ pw.println(sb.toString());
+ }
+
for (int iu=0; iu<NU; iu++) {
final int uid = uidStats.keyAt(iu);
if (reqUid >= 0 && uid != reqUid && uid != Process.SYSTEM_UID) {
@@ -4125,6 +4164,9 @@
final int wifiScanCount = u.getWifiScanCount(which);
final long uidWifiRunningTime = u.getWifiRunningTime(rawRealtime, which);
+ final long mobileWakeup = u.getMobileRadioApWakeupCount(which);
+ final long wifiWakeup = u.getWifiRadioApWakeupCount(which);
+
if (mobileRxBytes > 0 || mobileTxBytes > 0
|| mobileRxPackets > 0 || mobileTxPackets > 0) {
pw.print(prefix); pw.print(" Mobile network: ");
@@ -4150,6 +4192,14 @@
pw.println(sb.toString());
}
+ if (mobileWakeup > 0) {
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" Mobile radio AP wakeups: ");
+ sb.append(mobileWakeup);
+ pw.println(sb.toString());
+ }
+
printControllerActivityIfInteresting(pw, sb, prefix + " ", "Modem",
u.getModemControllerActivity(), which);
@@ -4181,6 +4231,14 @@
pw.println(sb.toString());
}
+ if (wifiWakeup > 0) {
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" WiFi AP wakeups: ");
+ sb.append(wifiWakeup);
+ pw.println(sb.toString());
+ }
+
printControllerActivityIfInteresting(pw, sb, prefix + " ", "WiFi",
u.getWifiControllerActivity(), which);
@@ -4922,7 +4980,9 @@
pw.print(',');
pw.print(rec.stepDetails.statIdlTime);
pw.print(',');
- pw.print(rec.stepDetails.statPlatformIdleState);
+ if (rec.stepDetails.statPlatformIdleState != null) {
+ pw.print(rec.stepDetails.statPlatformIdleState);
+ }
pw.println();
}
}
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index dc7be6b..c5e09bd 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -672,6 +672,11 @@
* N is for ¯\_(ツ)_/¯.
*/
public static final int N = 24;
+
+ /**
+ * N MR1: Still ¯\_(シ)_/¯.
+ */
+ public static final int N_MR1 = 25;
}
/** The type of build, like "user" or "eng". */
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 80927f3..8d6d9ed 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -286,6 +286,11 @@
}
/** {@hide} */
+ public static File getReferenceProfile(String packageName) {
+ return buildPath(getDataDirectory(), "misc", "profiles", "ref", packageName);
+ }
+
+ /** {@hide} */
public static File getDataProfilesDePackageDirectory(int userId, String packageName) {
return buildPath(getDataProfilesDeDirectory(userId), packageName);
}
diff --git a/core/java/android/os/HandlerThread.java b/core/java/android/os/HandlerThread.java
index 2904105..c432519 100644
--- a/core/java/android/os/HandlerThread.java
+++ b/core/java/android/os/HandlerThread.java
@@ -64,7 +64,7 @@
/**
* This method returns the Looper associated with this thread. If this thread not been started
- * or for any reason is isAlive() returns false, this method will return null. If this thread
+ * or for any reason isAlive() returns false, this method will return null. If this thread
* has been started, this method will block until the looper has been initialized.
* @return The looper.
*/
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl
index 27fb7bd..0c211d6 100644
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -18,6 +18,7 @@
package android.os;
import android.net.InterfaceConfiguration;
+import android.net.INetd;
import android.net.INetworkManagementEventObserver;
import android.net.Network;
import android.net.NetworkStats;
@@ -36,7 +37,7 @@
**/
/**
- * Register an observer to receive events
+ * Register an observer to receive events.
*/
void registerObserver(INetworkManagementEventObserver obs);
@@ -46,6 +47,11 @@
void unregisterObserver(INetworkManagementEventObserver obs);
/**
+ * Retrieve an INetd to talk to netd.
+ */
+ INetd getNetdService();
+
+ /**
* Returns a list of currently known network interfaces
*/
String[] listInterfaces();
@@ -431,6 +437,7 @@
void addInterfaceToLocalNetwork(String iface, in List<RouteInfo> routes);
void removeInterfaceFromLocalNetwork(String iface);
+ int removeRoutesFromLocalNetwork(in List<RouteInfo> routes);
void setAllowOnlyVpnForUids(boolean enable, in UidRange[] uidRanges);
}
diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl
index b27cb32..eeb641d 100644
--- a/core/java/android/os/IUserManager.aidl
+++ b/core/java/android/os/IUserManager.aidl
@@ -81,4 +81,5 @@
void clearSeedAccountData();
boolean someUserHasSeedAccount(in String accountName, in String accountType);
boolean isManagedProfile(int userId);
+ boolean isDemoUser(int userId);
}
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 2631247..f6e6ad6 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -17,8 +17,10 @@
package android.os;
import android.annotation.IntegerRes;
+import android.annotation.Nullable;
import android.text.TextUtils;
import android.util.ArrayMap;
+import android.util.ArraySet;
import android.util.Log;
import android.util.Size;
import android.util.SizeF;
@@ -34,6 +36,7 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.io.Serializable;
+import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -734,6 +737,21 @@
}
/**
+ * Write an array set to the parcel.
+ *
+ * @param val The array set to write.
+ *
+ * @hide
+ */
+ public void writeArraySet(@Nullable ArraySet<? extends Object> val) {
+ final int size = (val != null) ? val.size() : -1;
+ writeInt(size);
+ for (int i = 0; i < size; i++) {
+ writeValue(val.valueAt(i));
+ }
+ }
+
+ /**
* Flatten a Bundle into the parcel at the current dataPosition(),
* growing dataCapacity() if needed.
*/
@@ -2554,6 +2572,20 @@
return p;
}
+ /** @hide */
+ public final <T extends Parcelable> T[] readParcelableArray(ClassLoader loader,
+ Class<T> clazz) {
+ int N = readInt();
+ if (N < 0) {
+ return null;
+ }
+ T[] p = (T[]) Array.newInstance(clazz, N);
+ for (int i = 0; i < N; i++) {
+ p[i] = readParcelable(loader);
+ }
+ return p;
+ }
+
/**
* Read and return a new Serializable object from the parcel.
* @return the Serializable object, or null if the Serializable name
@@ -2735,6 +2767,26 @@
readArrayMapInternal(outVal, N, loader);
}
+ /**
+ * Reads an array set.
+ *
+ * @param loader The class loader to use.
+ *
+ * @hide
+ */
+ public @Nullable ArraySet<? extends Object> readArraySet(ClassLoader loader) {
+ final int size = readInt();
+ if (size < 0) {
+ return null;
+ }
+ ArraySet<Object> result = new ArraySet<>(size);
+ for (int i = 0; i < size; i++) {
+ Object value = readValue(loader);
+ result.append(value);
+ }
+ return result;
+ }
+
private void readListInternal(List outVal, int N,
ClassLoader loader) {
while (N > 0) {
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 6aa9fac..edd8a39 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -17,6 +17,7 @@
package android.os;
import android.system.Os;
+import android.system.OsConstants;
import android.util.Log;
import dalvik.system.VMRuntime;
@@ -297,6 +298,12 @@
*/
public static final int SCHED_IDLE = 5;
+ /**
+ * Reset scheduler choice on fork.
+ * @hide
+ */
+ public static final int SCHED_RESET_ON_FORK = 0x40000000;
+
// Keep in sync with SP_* constants of enum type SchedPolicy
// declared in system/core/include/cutils/sched_policy.h,
// except THREAD_GROUP_DEFAULT does not correspond to any SP_* value.
@@ -613,6 +620,9 @@
* priority.
* If the thread is a thread group leader, that is it's gettid() == getpid(),
* then the other threads in the same thread group are _not_ affected.
+ *
+ * Does not set cpuset for some historical reason, just calls
+ * libcutils::set_sched_policy().
*/
public static final native void setThreadGroup(int tid, int group)
throws IllegalArgumentException, SecurityException;
@@ -634,6 +644,8 @@
* priority threads alone. group == THREAD_GROUP_BG_NONINTERACTIVE moves all
* threads, regardless of priority, to the background scheduling group.
* group == THREAD_GROUP_FOREGROUND is not allowed.
+ *
+ * Always sets cpusets.
*/
public static final native void setProcessGroup(int pid, int group)
throws IllegalArgumentException, SecurityException;
@@ -892,4 +904,26 @@
* @hide
*/
public static final native void removeAllProcessGroups();
+
+ /**
+ * Check to see if a thread belongs to a given process. This may require
+ * more permissions than apps generally have.
+ * @return true if this thread belongs to a process
+ * @hide
+ */
+ public static final boolean isThreadInProcess(int tid, int pid) {
+ StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+ try {
+ if (Os.access("/proc/" + tid + "/task/" + pid, OsConstants.F_OK)) {
+ return true;
+ } else {
+ return false;
+ }
+ } catch (Exception e) {
+ return false;
+ } finally {
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
+
+ }
}
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index c36b488..ff69cf6 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -191,9 +191,14 @@
*/
public static final int DETECT_RESOURCE_MISMATCH = 0x10; // for ThreadPolicy
+ /**
+ * @hide
+ */
+ public static final int DETECT_UNBUFFERED_IO = 0x20; // for ThreadPolicy
+
private static final int ALL_THREAD_DETECT_BITS =
DETECT_DISK_WRITE | DETECT_DISK_READ | DETECT_NETWORK | DETECT_CUSTOM |
- DETECT_RESOURCE_MISMATCH;
+ DETECT_RESOURCE_MISMATCH | DETECT_UNBUFFERED_IO;
// Byte 2: Process-policy
@@ -465,6 +470,20 @@
}
/**
+ * Detect unbuffered input/output operations.
+ */
+ public Builder detectUnbufferedIo() {
+ return enable(DETECT_UNBUFFERED_IO);
+ }
+
+ /**
+ * Detect unbuffered input/output operations.
+ */
+ public Builder permitUnbufferedIo() {
+ return disable(DETECT_UNBUFFERED_IO);
+ }
+
+ /**
* Enables detection of mismatches between defined resource types
* and getter calls.
* <p>
@@ -974,6 +993,15 @@
}
/**
+ * @hide
+ */
+ private static class StrictModeUnbufferedIOViolation extends StrictModeViolation {
+ public StrictModeUnbufferedIOViolation(int policyMask) {
+ super(policyMask, DETECT_UNBUFFERED_IO, null);
+ }
+ }
+
+ /**
* Returns the bitmask of the current thread's policy.
*
* @return the bitmask of all the DETECT_* and PENALTY_* bits currently enabled
@@ -1281,6 +1309,20 @@
startHandlingViolationException(e);
}
+ // Part of BlockGuard.Policy; just part of StrictMode:
+ public void onUnbufferedIO() {
+ if ((mPolicyMask & DETECT_UNBUFFERED_IO) == 0) {
+ return;
+ }
+ if (tooManyViolationsThisLoop()) {
+ return;
+ }
+ BlockGuard.BlockGuardPolicyException e =
+ new StrictModeUnbufferedIOViolation(mPolicyMask);
+ e.fillInStackTrace();
+ startHandlingViolationException(e);
+ }
+
// Part of BlockGuard.Policy interface:
public void onReadFromDisk() {
if ((mPolicyMask & DETECT_DISK_READ) == 0) {
@@ -2208,6 +2250,18 @@
/**
* @hide
*/
+ public static void noteUnbufferedIO() {
+ BlockGuard.Policy policy = BlockGuard.getThreadPolicy();
+ if (!(policy instanceof AndroidBlockGuardPolicy)) {
+ // StrictMode not enabled.
+ return;
+ }
+ ((AndroidBlockGuardPolicy) policy).onUnbufferedIO();
+ }
+
+ /**
+ * @hide
+ */
public static void noteDiskRead() {
BlockGuard.Policy policy = BlockGuard.getThreadPolicy();
if (!(policy instanceof AndroidBlockGuardPolicy)) {
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index e359164..3fcc253 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -23,6 +23,7 @@
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.UserIdInt;
+import android.annotation.WorkerThread;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
@@ -580,6 +581,16 @@
public static final String DISALLOW_CAMERA = "no_camera";
/**
+ * Specifies if a user is not allowed to unmute the device's master volume.
+ *
+ * @see DevicePolicyManager#setMasterVolumeMuted(ComponentName, boolean)
+ * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
+ * @see #getUserRestrictions()
+ * @hide
+ */
+ public static final String DISALLLOW_UNMUTE_DEVICE = "disallow_unmute_device";
+
+ /**
* Specifies if a user is not allowed to use cellular data when roaming. This can only be set by
* device owners. The default value is <code>false</code>.
*
@@ -603,6 +614,17 @@
public static final String DISALLOW_SET_USER_ICON = "no_set_user_icon";
/**
+ * Specifies if a user is not allowed to enable the oem unlock setting. The default value is
+ * <code>false</code>.
+ *
+ * @see DevicePolicyManager#addUserRestriction(ComponentName, String)
+ * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
+ * @see #getUserRestrictions()
+ * @hide
+ */
+ public static final String DISALLOW_OEM_UNLOCK = "no_oem_unlock";
+
+ /**
* Allows apps in the parent profile to handle web links from the managed profile.
*
* This user restriction has an effect only in a managed profile.
@@ -859,15 +881,17 @@
}
/**
- * Checks if the calling app is running in a demo user.
- * <p>
- * Caller must hold the MANAGE_USERS permission.
+ * Checks if the calling app is running in a demo user. When running in a demo user,
+ * apps can be more helpful to the user, or explain their features in more detail.
+ *
* @return whether the caller is a demo user.
- * @hide
*/
public boolean isDemoUser() {
- UserInfo user = getUserInfo(UserHandle.myUserId());
- return user != null && user.isDemo();
+ try {
+ return mService.isDemoUser(UserHandle.myUserId());
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
}
/**
@@ -2059,12 +2083,15 @@
* <li>From {@link android.os.Build.VERSION_CODES#M}, {@code Bundle} or {@code Bundle[]}
* </ul>
*
+ * <p>NOTE: The method performs disk I/O and shouldn't be called on the main thread
+ *
* @param packageName the package name of the calling application
* @return a {@link Bundle} with the restrictions for that package, or an empty {@link Bundle}
* if there are no saved restrictions.
*
* @see #KEY_RESTRICTIONS_PENDING
*/
+ @WorkerThread
public Bundle getApplicationRestrictions(String packageName) {
try {
return mService.getApplicationRestrictions(packageName);
@@ -2076,6 +2103,7 @@
/**
* @hide
*/
+ @WorkerThread
public Bundle getApplicationRestrictions(String packageName, UserHandle user) {
try {
return mService.getApplicationRestrictionsForUser(packageName, user.getIdentifier());
@@ -2087,6 +2115,7 @@
/**
* @hide
*/
+ @WorkerThread
public void setApplicationRestrictions(String packageName, Bundle restrictions,
UserHandle user) {
try {
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 968996f..c5507b9 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -20,6 +20,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SdkConstant;
import android.app.ActivityThread;
import android.content.ContentResolver;
import android.content.Context;
@@ -95,6 +96,19 @@
/** {@hide} */
public static final String UUID_PRIMARY_PHYSICAL = "primary_physical";
+
+ /**
+ * Activity Action: Allows the user to manage their storage. This activity provides the ability
+ * to free up space on the device by deleting data such as apps.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ */
+ @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_MANAGE_STORAGE
+ = "android.os.storage.action.MANAGE_STORAGE";
+
/** {@hide} */
public static final int DEBUG_FORCE_ADOPTABLE = 1 << 0;
/** {@hide} */
@@ -118,10 +132,15 @@
public static final int FLAG_INCLUDE_INVISIBLE = 1 << 10;
private static volatile IMountService sMountService = null;
- private static final String INTERNAL_STORAGE_SIZE_PATH =
- "/sys/block/mmcblk0/size";
- private static final String INTERNAL_STORAGE_SECTOR_SIZE =
- "/sys/block/mmcblk0/queue/hw_sector_size";
+
+ // TODO: the location of the primary storage block varies from device to device, so we need to
+ // try the most likely candidates - a long-term solution would be a device-specific vold
+ // function that returns the calculated size.
+ private static final String[] INTERNAL_STORAGE_SIZE_PATHS = {
+ "/sys/block/mmcblk0/size",
+ "/sys/block/sda/size"
+ };
+ private static final int INTERNAL_STORAGE_SECTOR_SIZE = 512;
private final Context mContext;
private final ContentResolver mResolver;
@@ -912,9 +931,13 @@
/** {@hide} */
public long getPrimaryStorageSize() {
- final long numberBlocks = readLong(INTERNAL_STORAGE_SIZE_PATH);
- final long sectorSize = readLong(INTERNAL_STORAGE_SECTOR_SIZE);
- return numberBlocks * sectorSize;
+ for (String path : INTERNAL_STORAGE_SIZE_PATHS) {
+ final long numberBlocks = readLong(path);
+ if (numberBlocks > 0) {
+ return numberBlocks * INTERNAL_STORAGE_SECTOR_SIZE;
+ }
+ }
+ return 0;
}
private long readLong(String path) {
@@ -922,7 +945,7 @@
final BufferedReader reader = new BufferedReader(new InputStreamReader(fis));) {
return Long.parseLong(reader.readLine());
} catch (Exception e) {
- Slog.w("Could not read " + path, e);
+ Slog.w(TAG, "Could not read " + path, e);
return 0;
}
}
diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java
index 3e496b6..73fa01e 100644
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -27,12 +27,14 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnKeyListener;
import android.view.ViewGroup;
import android.widget.ListView;
+import android.widget.TextView;
/**
* Shows a hierarchy of {@link Preference} objects as
@@ -189,12 +191,10 @@
0);
ListView lv = (ListView) view.findViewById(android.R.id.list);
- if (lv != null) {
- Drawable divider =
- a.getDrawable(com.android.internal.R.styleable.PreferenceFragment_divider);
- if (divider != null) {
- lv.setDivider(divider);
- }
+ if (lv != null
+ && a.hasValueOrEmpty(com.android.internal.R.styleable.PreferenceFragment_divider)) {
+ lv.setDivider(
+ a.getDrawable(com.android.internal.R.styleable.PreferenceFragment_divider));
}
a.recycle();
@@ -368,6 +368,20 @@
private void bindPreferences() {
final PreferenceScreen preferenceScreen = getPreferenceScreen();
if (preferenceScreen != null) {
+ View root = getView();
+ if (root != null) {
+ View titleView = root.findViewById(android.R.id.title);
+ if (titleView instanceof TextView) {
+ CharSequence title = preferenceScreen.getTitle();
+ if (TextUtils.isEmpty(title)) {
+ titleView.setVisibility(View.GONE);
+ } else {
+ ((TextView) titleView).setText(title);
+ titleView.setVisibility(View.VISIBLE);
+ }
+ }
+ }
+
preferenceScreen.bind(getListView());
}
onBindPreferences();
diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java
index b1317e6..2305b05 100644
--- a/core/java/android/preference/PreferenceScreen.java
+++ b/core/java/android/preference/PreferenceScreen.java
@@ -19,6 +19,8 @@
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
@@ -31,6 +33,7 @@
import android.widget.AdapterView;
import android.widget.ListAdapter;
import android.widget.ListView;
+import android.widget.TextView;
/**
* Represents a top-level {@link Preference} that
@@ -91,13 +94,33 @@
private Dialog mDialog;
private ListView mListView;
-
+
+ private int mLayoutResId = com.android.internal.R.layout.preference_list_fragment;
+ private Drawable mDividerDrawable;
+ private boolean mDividerSpecified;
+
/**
* Do NOT use this constructor, use {@link PreferenceManager#createPreferenceScreen(Context)}.
* @hide-
*/
public PreferenceScreen(Context context, AttributeSet attrs) {
super(context, attrs, com.android.internal.R.attr.preferenceScreenStyle);
+
+ TypedArray a = context.obtainStyledAttributes(null,
+ com.android.internal.R.styleable.PreferenceScreen,
+ com.android.internal.R.attr.preferenceScreenStyle,
+ 0);
+
+ mLayoutResId = a.getResourceId(
+ com.android.internal.R.styleable.PreferenceScreen_screenLayout,
+ mLayoutResId);
+ if (a.hasValueOrEmpty(com.android.internal.R.styleable.PreferenceScreen_divider)) {
+ mDividerDrawable =
+ a.getDrawable(com.android.internal.R.styleable.PreferenceScreen_divider);
+ mDividerSpecified = true;
+ }
+
+ a.recycle();
}
/**
@@ -163,18 +186,30 @@
LayoutInflater inflater = (LayoutInflater)
context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- View childPrefScreen = inflater.inflate(
- com.android.internal.R.layout.preference_list_fragment, null);
+ View childPrefScreen = inflater.inflate(mLayoutResId, null);
+ View titleView = childPrefScreen.findViewById(android.R.id.title);
mListView = (ListView) childPrefScreen.findViewById(android.R.id.list);
+ if (mDividerSpecified) {
+ mListView.setDivider(mDividerDrawable);
+ }
+
bind(mListView);
// Set the title bar if title is available, else no title bar
final CharSequence title = getTitle();
Dialog dialog = mDialog = new Dialog(context, context.getThemeResId());
if (TextUtils.isEmpty(title)) {
+ if (titleView != null) {
+ titleView.setVisibility(View.GONE);
+ }
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
} else {
- dialog.setTitle(title);
+ if (titleView instanceof TextView) {
+ ((TextView) titleView).setText(title);
+ titleView.setVisibility(View.VISIBLE);
+ } else {
+ dialog.setTitle(title);
+ }
}
dialog.setContentView(childPrefScreen);
dialog.setOnDismissListener(this);
diff --git a/core/java/android/print/PrintDocumentInfo.java b/core/java/android/print/PrintDocumentInfo.java
index bec6f29..6143404 100644
--- a/core/java/android/print/PrintDocumentInfo.java
+++ b/core/java/android/print/PrintDocumentInfo.java
@@ -334,7 +334,7 @@
/**
* Sets the content type.
* <p>
- * <strong>Default: </strong> {@link #CONTENT_TYPE_UNKNOWN}
+ * <strong>Default: </strong> {@link #CONTENT_TYPE_DOCUMENT}
* </p>
*
* @param type The content type.
diff --git a/core/java/android/print/PrintServiceRecommendationsLoader.java b/core/java/android/print/PrintServiceRecommendationsLoader.java
index bb5d065..c6a4d51 100644
--- a/core/java/android/print/PrintServiceRecommendationsLoader.java
+++ b/core/java/android/print/PrintServiceRecommendationsLoader.java
@@ -36,7 +36,7 @@
private final @NonNull PrintManager mPrintManager;
/** Handler to sequentialize the delivery of the results to the main thread */
- private final Handler mHandler;
+ private final @NonNull Handler mHandler;
/** Listens for updates to the data from the platform */
private PrintManager.PrintServiceRecommendationsChangeListener mListener;
@@ -90,9 +90,7 @@
mListener = null;
}
- if (mHandler != null) {
- mHandler.removeMessages(0);
- }
+ mHandler.removeMessages(0);
}
@Override
diff --git a/core/java/android/print/PrintServicesLoader.java b/core/java/android/print/PrintServicesLoader.java
index 60d7d66..4c9a69a 100644
--- a/core/java/android/print/PrintServicesLoader.java
+++ b/core/java/android/print/PrintServicesLoader.java
@@ -39,7 +39,7 @@
private final @NonNull PrintManager mPrintManager;
/** Handler to sequentialize the delivery of the results to the main thread */
- private Handler mHandler;
+ private final @NonNull Handler mHandler;
/** Listens for updates to the data from the platform */
private PrintManager.PrintServicesChangeListener mListener;
@@ -54,6 +54,7 @@
public PrintServicesLoader(@NonNull PrintManager printManager, @NonNull Context context,
int selectionFlags) {
super(Preconditions.checkNotNull(context));
+ mHandler = new MyHandler();
mPrintManager = Preconditions.checkNotNull(printManager);
mSelectionFlags = Preconditions.checkFlagsArgument(selectionFlags,
PrintManager.ALL_SERVICES);
@@ -75,7 +76,6 @@
@Override
protected void onStartLoading() {
- mHandler = new MyHandler();
mListener = new PrintManager.PrintServicesChangeListener() {
@Override public void onPrintServicesChanged() {
queueNewResult();
@@ -95,10 +95,7 @@
mListener = null;
}
- if (mHandler != null) {
- mHandler.removeMessages(0);
- mHandler = null;
- }
+ mHandler.removeMessages(0);
}
@Override
@@ -119,8 +116,6 @@
@Override
public void handleMessage(Message msg) {
- super.handleMessage(msg);
-
if (isStarted()) {
deliverResult((List<PrintServiceInfo>) msg.obj);
}
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index 1158776..c51a613 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -235,7 +235,6 @@
* @see #FLAG_DIR_PREFERS_GRID
* @see #FLAG_DIR_PREFERS_LAST_MODIFIED
* @see #FLAG_VIRTUAL_DOCUMENT
- * @see #FLAG_ARCHIVE
* @see #FLAG_SUPPORTS_COPY
* @see #FLAG_SUPPORTS_MOVE
* @see #FLAG_SUPPORTS_REMOVE
@@ -326,7 +325,7 @@
* Flag indicating that a document can be renamed.
*
* @see #COLUMN_FLAGS
- * @see DocumentsContract#renameDocument(ContentProviderClient, Uri,
+ * @see DocumentsContract#renameDocument(ContentResolver, Uri,
* String)
* @see DocumentsProvider#renameDocument(String, String)
*/
@@ -337,7 +336,7 @@
* within the same document provider.
*
* @see #COLUMN_FLAGS
- * @see DocumentsContract#copyDocument(ContentProviderClient, Uri, Uri)
+ * @see DocumentsContract#copyDocument(ContentResolver, Uri, Uri)
* @see DocumentsProvider#copyDocument(String, String)
*/
public static final int FLAG_SUPPORTS_COPY = 1 << 7;
@@ -347,7 +346,7 @@
* within the same document provider.
*
* @see #COLUMN_FLAGS
- * @see DocumentsContract#moveDocument(ContentProviderClient, Uri, Uri, Uri)
+ * @see DocumentsContract#moveDocument(ContentResolver, Uri, Uri, Uri)
* @see DocumentsProvider#moveDocument(String, String, String)
*/
public static final int FLAG_SUPPORTS_MOVE = 1 << 8;
@@ -368,7 +367,7 @@
* Flag indicating that a document can be removed from a parent.
*
* @see #COLUMN_FLAGS
- * @see DocumentsContract#removeDocument(ContentProviderClient, Uri, Uri)
+ * @see DocumentsContract#removeDocument(ContentResolver, Uri, Uri)
* @see DocumentsProvider#removeDocument(String, String)
*/
public static final int FLAG_SUPPORTS_REMOVE = 1 << 10;
@@ -593,6 +592,9 @@
* @hide
*/
public static final int FLAG_REMOVABLE_USB = 1 << 20;
+
+ /** {@hide} */
+ public static final int FLAG_SUPPORTS_EJECT = 1 << 21;
}
/**
@@ -643,6 +645,8 @@
public static final String METHOD_IS_CHILD_DOCUMENT = "android:isChildDocument";
/** {@hide} */
public static final String METHOD_REMOVE_DOCUMENT = "android:removeDocument";
+ /** {@hide} */
+ public static final String METHOD_EJECT_ROOT = "android:ejectRoot";
/** {@hide} */
public static final String EXTRA_PARENT_URI = "parentUri";
@@ -870,7 +874,7 @@
* Test if the given URI represents a {@link Document} tree.
*
* @see #buildTreeDocumentUri(String, String)
- * @see #getTreeDocumentId(Uri, String)
+ * @see #getTreeDocumentId(Uri)
*/
public static boolean isTreeUri(Uri uri) {
final List<String> paths = uri.getPathSegments();
@@ -1274,6 +1278,37 @@
client.call(METHOD_REMOVE_DOCUMENT, null, in);
}
+ /** {@hide} */
+ public static boolean ejectRoot(ContentResolver resolver, Uri rootUri) {
+ final ContentProviderClient client = resolver.acquireUnstableContentProviderClient(
+ rootUri.getAuthority());
+ try {
+ return ejectRoot(client, rootUri);
+ } catch (Exception e) {
+ Log.w(TAG, "Failed to eject root", e);
+ return false;
+ } finally {
+ ContentProviderClient.releaseQuietly(client);
+ }
+ }
+
+ /** {@hide} */
+ public static boolean ejectRoot(ContentProviderClient client, Uri rootUri)
+ throws RemoteException {
+ final Bundle in = new Bundle();
+ in.putParcelable(DocumentsContract.EXTRA_URI, rootUri);
+
+ final Bundle out = client.call(METHOD_EJECT_ROOT, null, in);
+
+ if (out == null) {
+ throw new RemoteException("Failed to get a reponse from ejectRoot.");
+ }
+ if (!out.containsKey(DocumentsContract.EXTRA_RESULT)) {
+ throw new RemoteException("Response did not include result field..");
+ }
+ return out.getBoolean(DocumentsContract.EXTRA_RESULT);
+ }
+
/**
* Open the given image for thumbnail purposes, using any embedded EXIF
* thumbnail if available, and providing orientation hints from the parent
diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java
index 515f975..6117ce4 100644
--- a/core/java/android/provider/DocumentsProvider.java
+++ b/core/java/android/provider/DocumentsProvider.java
@@ -19,6 +19,7 @@
import static android.provider.DocumentsContract.METHOD_COPY_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_CREATE_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_DELETE_DOCUMENT;
+import static android.provider.DocumentsContract.METHOD_EJECT_ROOT;
import static android.provider.DocumentsContract.METHOD_IS_CHILD_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_MOVE_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_REMOVE_DOCUMENT;
@@ -458,6 +459,12 @@
throw new UnsupportedOperationException("Search not supported");
}
+ /** {@hide} */
+ @SuppressWarnings("unused")
+ public boolean ejectRoot(String rootId) {
+ throw new UnsupportedOperationException("Eject not supported");
+ }
+
/**
* Return concrete MIME type of the requested document. Must match the value
* of {@link Document#COLUMN_MIME_TYPE} for this document. The default
@@ -723,6 +730,23 @@
throws FileNotFoundException {
final Context context = getContext();
+ final Bundle out = new Bundle();
+
+ if (METHOD_EJECT_ROOT.equals(method)) {
+ // Given that certain system apps can hold MOUNT_UNMOUNT permission, but only apps
+ // signed with platform signature can hold MANAGE_DOCUMENTS, we are going to check for
+ // MANAGE_DOCUMENTS here instead
+ getContext().enforceCallingPermission(
+ android.Manifest.permission.MANAGE_DOCUMENTS, null);
+ final Uri rootUri = extras.getParcelable(DocumentsContract.EXTRA_URI);
+ final String rootId = DocumentsContract.getRootId(rootUri);
+ final boolean ejected = ejectRoot(rootId);
+
+ out.putBoolean(DocumentsContract.EXTRA_RESULT, ejected);
+
+ return out;
+ }
+
final Uri documentUri = extras.getParcelable(DocumentsContract.EXTRA_URI);
final String authority = documentUri.getAuthority();
final String documentId = DocumentsContract.getDocumentId(documentUri);
@@ -732,8 +756,6 @@
"Requested authority " + authority + " doesn't match provider " + mAuthority);
}
- final Bundle out = new Bundle();
-
// If the URI is a tree URI performs some validation.
enforceTree(documentUri);
@@ -851,7 +873,6 @@
// It's responsibility of the provider to revoke any grants, as the document may be
// still attached to another parents.
-
} else {
throw new UnsupportedOperationException("Method not supported " + method);
}
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 23270b0..14be2aa 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -440,6 +440,22 @@
"android.settings.DISPLAY_SETTINGS";
/**
+ * Activity Action: Show settings to allow configuration of Night display.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you
+ * safeguard against this.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_NIGHT_DISPLAY_SETTINGS =
+ "android.settings.NIGHT_DISPLAY_SETTINGS";
+
+ /**
* Activity Action: Show settings to allow configuration of locale.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
@@ -1277,17 +1293,6 @@
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_WEBVIEW_SETTINGS = "android.settings.WEBVIEW_SETTINGS";
- /**
- * Activity Action: Show the Deletion Helper settings.
- * <p>
- * Input: Nothing.
- * <p>
- * Output: Nothing.
- */
- @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
- public static final String ACTION_DELETION_HELPER_SETTINGS
- = "android.settings.DELETION_HELPER_SETTINGS";
-
// End of Intent actions for Settings
/**
@@ -1559,7 +1564,7 @@
private IContentProvider lazyGetProvider(ContentResolver cr) {
IContentProvider cp = null;
- synchronized (this) {
+ synchronized (NameValueCache.this) {
cp = mContentProvider;
if (cp == null) {
cp = mContentProvider = cr.acquireProvider(mUri.getAuthority());
@@ -1586,7 +1591,7 @@
public String getStringForUser(ContentResolver cr, String name, final int userHandle) {
final boolean isSelf = (userHandle == UserHandle.myUserId());
if (isSelf) {
- synchronized (this) {
+ synchronized (NameValueCache.this) {
if (mGenerationTracker != null) {
if (mGenerationTracker.isGenerationChanged()) {
if (DEBUG) {
@@ -1619,7 +1624,7 @@
args.putInt(CALL_METHOD_USER_KEY, userHandle);
}
boolean needsGenerationTracker = false;
- synchronized (this) {
+ synchronized (NameValueCache.this) {
if (isSelf && mGenerationTracker == null) {
needsGenerationTracker = true;
if (args == null) {
@@ -1638,7 +1643,7 @@
String value = b.getString(Settings.NameValueTable.VALUE);
// Don't update our cache for reads of other users' data
if (isSelf) {
- synchronized (this) {
+ synchronized (NameValueCache.this) {
if (needsGenerationTracker) {
MemoryIntArray array = b.getParcelable(
CALL_METHOD_TRACK_GENERATION_KEY);
@@ -1655,7 +1660,7 @@
}
mGenerationTracker = new GenerationTracker(array, index,
generation, () -> {
- synchronized (this) {
+ synchronized (NameValueCache.this) {
Log.e(TAG, "Error accessing generation"
+ " tracker - removing");
if (mGenerationTracker != null) {
@@ -1696,7 +1701,7 @@
}
String value = c.moveToNext() ? c.getString(0) : null;
- synchronized (this) {
+ synchronized (NameValueCache.this) {
mValues.put(name, value);
}
if (LOCAL_LOGV) {
@@ -5309,15 +5314,6 @@
"accessibility_display_daltonizer";
/**
- * Float list that specifies the color matrix to apply to
- * the display. Valid values are defined in AccessibilityManager.
- *
- * @hide
- */
- public static final String ACCESSIBILITY_DISPLAY_COLOR_MATRIX =
- "accessibility_display_color_matrix";
-
- /**
* Setting that specifies whether automatic click when the mouse pointer stops moving is
* enabled.
*
@@ -6161,44 +6157,39 @@
"camera_double_tap_power_gesture_disabled";
/**
-
- /**
- * Behavior of twilight on the device.
- * One of {@link #TWILIGHT_MODE_LOCKED_OFF}, {@link #TWILIGHT_MODE_LOCKED_ON}
- * or {@link #TWILIGHT_MODE_AUTO}.
+ * Whether the camera double twist gesture to flip between front and back mode should be
+ * enabled.
+ *
* @hide
*/
- public static final String TWILIGHT_MODE = "twilight_mode";
+ public static final String CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED =
+ "camera_double_twist_to_flip_enabled";
/**
- * Twilight mode always off.
+ * Control whether Night display is currently activated.
* @hide
*/
- public static final int TWILIGHT_MODE_LOCKED_OFF = 0;
+ public static final String NIGHT_DISPLAY_ACTIVATED = "night_display_activated";
/**
- * Twilight mode always on.
+ * Control whether Night display will automatically activate/deactivate.
* @hide
*/
- public static final int TWILIGHT_MODE_LOCKED_ON = 1;
+ public static final String NIGHT_DISPLAY_AUTO_MODE = "night_display_auto_mode";
/**
- * Twilight mode auto.
+ * Custom time when Night display is scheduled to activate.
+ * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
* @hide
*/
- public static final int TWILIGHT_MODE_AUTO = 2;
+ public static final String NIGHT_DISPLAY_CUSTOM_START_TIME = "night_display_custom_start_time";
/**
- * Twilight mode auto, temporarily overriden to on.
+ * Custom time when Night display is scheduled to deactivate.
+ * Represented as milliseconds from midnight (e.g. 21600000 == 6am).
* @hide
*/
- public static final int TWILIGHT_MODE_AUTO_OVERRIDE_OFF = 3;
-
- /**
- * Twilight mode auto, temporarily overriden to off.
- * @hide
- */
- public static final int TWILIGHT_MODE_AUTO_OVERRIDE_ON = 4;
+ public static final String NIGHT_DISPLAY_CUSTOM_END_TIME = "night_display_custom_end_time";
/**
* Whether brightness should automatically adjust based on twilight state.
@@ -6242,6 +6233,20 @@
public static final int VR_DISPLAY_MODE_OFF = 1;
/**
+ * Whether CarrierAppUtils#disableCarrierAppsUntilPrivileged has been executed at least
+ * once.
+ *
+ * <p>This is used to ensure that we only take one pass which will disable apps that are not
+ * privileged (if any). From then on, we only want to enable apps (when a matching SIM is
+ * inserted), to avoid disabling an app that the user might actively be using.
+ *
+ * <p>Will be set to 1 once executed.
+ *
+ * @hide
+ */
+ public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
+
+ /**
* Whether parent user can access remote contact in managed profile.
*
* @hide
@@ -6273,6 +6278,70 @@
public static final int AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT = 90;
/**
+ * How many bytes the automatic storage manager has cleared out.
+ *
+ * @hide
+ */
+ public static final String AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED =
+ "automatic_storage_manager_bytes_cleared";
+
+
+ /**
+ * Last run time for the automatic storage manager.
+ *
+ * @hide
+ */
+ public static final String AUTOMATIC_STORAGE_MANAGER_LAST_RUN =
+ "automatic_storage_manager_last_run";
+
+ /**
+ * Whether SystemUI navigation keys is enabled.
+ * @hide
+ */
+ public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
+ "system_navigation_keys_enabled";
+
+ /**
+ * Whether Downloads folder backup is enabled and should run on the device.
+ *
+ * @hide
+ */
+ public static final String DOWNLOADS_BACKUP_ENABLED = "downloads_backup_enabled";
+
+ /**
+ * Whether Downloads folder backup should only occur if the device is using a metered
+ * network.
+ *
+ * @hide
+ */
+ public static final String DOWNLOADS_BACKUP_ALLOW_METERED =
+ "downloads_backup_allow_metered";
+
+ /**
+ * Whether Downloads folder backup should only occur if the device is charging.
+ *
+ * @hide
+ */
+ public static final String DOWNLOADS_BACKUP_CHARGING_ONLY =
+ "downloads_backup_charging_only";
+
+ /**
+ * How many days of information for the automatic storage manager to retain on the device
+ * for downloads.
+ *
+ * @hide
+ */
+ public static final String AUTOMATIC_STORAGE_MANAGER_DOWNLOADS_DAYS_TO_RETAIN =
+ "automatic_storage_manager_downloads_days_to_retain";
+
+ /**
+ * Whether preloaded APKs have been installed for the user.
+ * @hide
+ */
+ public static final String DEMO_USER_SETUP_COMPLETE
+ = "demo_user_setup_complete";
+
+ /**
* This are the settings to be backed up.
*
* NOTE: Settings are backed up and restored in the order they appear
@@ -6289,7 +6358,6 @@
USB_MASS_STORAGE_ENABLED, // moved to global
ACCESSIBILITY_DISPLAY_INVERSION_ENABLED,
ACCESSIBILITY_DISPLAY_DALTONIZER,
- ACCESSIBILITY_DISPLAY_COLOR_MATRIX,
ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
@@ -6345,7 +6413,11 @@
PREFERRED_TTY_MODE,
ENHANCED_VOICE_PRIVACY_ENABLED,
TTY_MODE_ENABLED,
- INCALL_POWER_BUTTON_BEHAVIOR
+ INCALL_POWER_BUTTON_BEHAVIOR,
+ NIGHT_DISPLAY_CUSTOM_START_TIME,
+ NIGHT_DISPLAY_CUSTOM_END_TIME,
+ NIGHT_DISPLAY_AUTO_MODE,
+ NIGHT_DISPLAY_ACTIVATED
};
/**
@@ -8655,6 +8727,22 @@
public static final String DEVICE_DEMO_MODE = "device_demo_mode";
/**
+ * Retail mode specific settings. This is encoded as a key=value list, separated by commas.
+ * Ex: "user_inactivity_timeout_ms=30000,warning_dialog_timeout_ms=10000". The following
+ * keys are supported:
+ *
+ * <pre>
+ * user_inactivity_timeout_ms (long)
+ * warning_dialog_timeout_ms (long)
+ * </pre>
+ * <p>
+ * Type: string
+ *
+ * @hide
+ */
+ public static final String RETAIL_DEMO_MODE_CONSTANTS = "retail_demo_mode_constants";
+
+ /**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.
*
@@ -9053,15 +9141,6 @@
public static final String ENABLE_CELLULAR_ON_BOOT = "enable_cellular_on_boot";
/**
- * Whether toggling OEM unlock is disallowed. If disallowed, it is not possible to enable or
- * disable OEM unlock.
- * <p>
- * Type: int (0: allow OEM unlock setting. 1: disallow OEM unlock)
- * @hide
- */
- public static final String OEM_UNLOCK_DISALLOWED = "oem_unlock_disallowed";
-
- /**
* The maximum allowed notification enqueue rate in Hertz.
*
* Should be a float, and includes both posts and updates.
@@ -9070,13 +9149,6 @@
public static final String MAX_NOTIFICATION_ENQUEUE_RATE = "max_notification_enqueue_rate";
/**
- * Whether SystemUI navigation keys is enabled.
- * @hide
- */
- public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
- "system_navigation_keys_enabled";
-
- /**
* Whether cell is enabled/disabled
* @hide
*/
diff --git a/core/java/android/security/NetworkSecurityPolicy.java b/core/java/android/security/NetworkSecurityPolicy.java
index 1b1c300..812c956 100644
--- a/core/java/android/security/NetworkSecurityPolicy.java
+++ b/core/java/android/security/NetworkSecurityPolicy.java
@@ -97,9 +97,11 @@
* Handle an update to the system or user certificate stores.
* @hide
*/
- @TestApi
public void handleTrustStorageUpdate() {
- ApplicationConfig.getDefaultInstance().handleTrustStorageUpdate();
+ ApplicationConfig config = ApplicationConfig.getDefaultInstance();
+ if (config != null) {
+ config.handleTrustStorageUpdate();
+ }
}
/**
diff --git a/core/java/android/security/net/config/ApplicationConfig.java b/core/java/android/security/net/config/ApplicationConfig.java
index fadea56..801eceb 100644
--- a/core/java/android/security/net/config/ApplicationConfig.java
+++ b/core/java/android/security/net/config/ApplicationConfig.java
@@ -148,14 +148,20 @@
}
public void handleTrustStorageUpdate() {
- ensureInitialized();
- mDefaultConfig.handleTrustStorageUpdate();
- if (mConfigs != null) {
- Set<NetworkSecurityConfig> updatedConfigs =
- new HashSet<NetworkSecurityConfig>(mConfigs.size());
- for (Pair<Domain, NetworkSecurityConfig> entry : mConfigs) {
- if (updatedConfigs.add(entry.second)) {
- entry.second.handleTrustStorageUpdate();
+ synchronized(mLock) {
+ // If the config is uninitialized then there is no work to be done to handle an update,
+ // avoid needlessly parsing configs.
+ if (!mInitialized) {
+ return;
+ }
+ mDefaultConfig.handleTrustStorageUpdate();
+ if (mConfigs != null) {
+ Set<NetworkSecurityConfig> updatedConfigs =
+ new HashSet<NetworkSecurityConfig>(mConfigs.size());
+ for (Pair<Domain, NetworkSecurityConfig> entry : mConfigs) {
+ if (updatedConfigs.add(entry.second)) {
+ entry.second.handleTrustStorageUpdate();
+ }
}
}
}
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 1d9784b..474a9b6 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -20,6 +20,8 @@
import android.app.NotificationManager.Policy;
import android.content.ComponentName;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Parcel;
@@ -42,6 +44,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
+import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.Objects;
@@ -118,6 +121,7 @@
private static final String RULE_ATT_ZEN = "zen";
private static final String RULE_ATT_CONDITION_ID = "conditionId";
private static final String RULE_ATT_CREATION_TIME = "creationTime";
+ private static final String RULE_ATT_ENABLER = "enabler";
public boolean allowCalls = DEFAULT_ALLOW_CALLS;
public boolean allowRepeatCallers = DEFAULT_ALLOW_REPEAT_CALLERS;
@@ -502,6 +506,7 @@
rt.conditionId = safeUri(parser, RULE_ATT_CONDITION_ID);
rt.component = safeComponentName(parser, RULE_ATT_COMPONENT);
rt.creationTime = safeLong(parser, RULE_ATT_CREATION_TIME, 0);
+ rt.enabler = parser.getAttributeValue(null, RULE_ATT_ENABLER);
rt.condition = readConditionXml(parser);
return rt;
}
@@ -520,6 +525,9 @@
out.attribute(null, RULE_ATT_CONDITION_ID, rule.conditionId.toString());
}
out.attribute(null, RULE_ATT_CREATION_TIME, Long.toString(rule.creationTime));
+ if (rule.enabler != null) {
+ out.attribute(null, RULE_ATT_ENABLER, rule.enabler);
+ }
if (rule.condition != null) {
writeConditionXml(rule.condition, out);
}
@@ -889,9 +897,13 @@
", endHour=" + endHour +
", endMinute=" + endMinute +
", exitAtAlarm=" + exitAtAlarm +
- ", nextAlarm=" + nextAlarm +
+ ", nextAlarm=" + ts(nextAlarm) +
'}';
}
+
+ protected static String ts(long time) {
+ return new Date(time) + " (" + time + ")";
+ }
}
// ==== Built-in system condition: event ====
@@ -989,6 +1001,25 @@
return UUID.randomUUID().toString().replace("-", "");
}
+ private static String getOwnerCaption(Context context, String owner) {
+ final PackageManager pm = context.getPackageManager();
+ try {
+ final ApplicationInfo info = pm.getApplicationInfo(owner, 0);
+ if (info != null) {
+ final CharSequence seq = info.loadLabel(pm);
+ if (seq != null) {
+ final String str = seq.toString().trim();
+ if (str.length() > 0) {
+ return str;
+ }
+ }
+ }
+ } catch (Throwable e) {
+ Slog.w(TAG, "Error loading owner caption", e);
+ }
+ return "";
+ }
+
public static String getConditionSummary(Context context, ZenModeConfig config,
int userHandle, boolean shortVersion) {
return getConditionLine(context, config, userHandle, false /*useLine1*/, shortVersion);
@@ -997,23 +1028,28 @@
private static String getConditionLine(Context context, ZenModeConfig config,
int userHandle, boolean useLine1, boolean shortVersion) {
if (config == null) return "";
+ String summary = "";
if (config.manualRule != null) {
final Uri id = config.manualRule.conditionId;
- if (id == null) {
- return context.getString(com.android.internal.R.string.zen_mode_forever);
+ if (config.manualRule.enabler != null) {
+ summary = getOwnerCaption(context, config.manualRule.enabler);
+ } else {
+ if (id == null) {
+ summary = context.getString(com.android.internal.R.string.zen_mode_forever);
+ } else {
+ final long time = tryParseCountdownConditionId(id);
+ Condition c = config.manualRule.condition;
+ if (time > 0) {
+ final long now = System.currentTimeMillis();
+ final long span = time - now;
+ c = toTimeCondition(context, time, Math.round(span / (float) MINUTES_MS),
+ userHandle, shortVersion);
+ }
+ final String rt = c == null ? "" : useLine1 ? c.line1 : c.summary;
+ summary = TextUtils.isEmpty(rt) ? "" : rt;
+ }
}
- final long time = tryParseCountdownConditionId(id);
- Condition c = config.manualRule.condition;
- if (time > 0) {
- final long now = System.currentTimeMillis();
- final long span = time - now;
- c = toTimeCondition(context, time, Math.round(span / (float) MINUTES_MS),
- userHandle, shortVersion);
- }
- final String rt = c == null ? "" : useLine1 ? c.line1 : c.summary;
- return TextUtils.isEmpty(rt) ? "" : rt;
}
- String summary = "";
for (ZenRule automaticRule : config.automaticRules.values()) {
if (automaticRule.isAutomaticActive()) {
if (summary.isEmpty()) {
@@ -1023,6 +1059,7 @@
.getString(R.string.zen_mode_rule_name_combination, summary,
automaticRule.name);
}
+
}
}
return summary;
@@ -1038,6 +1075,7 @@
public ComponentName component; // optional
public String id; // required for automatic (unique)
public long creationTime; // required for automatic
+ public String enabler; // package name, only used for manual rules.
public ZenRule() { }
@@ -1055,6 +1093,9 @@
id = source.readString();
}
creationTime = source.readLong();
+ if (source.readInt() == 1) {
+ enabler = source.readString();
+ }
}
@Override
@@ -1083,6 +1124,12 @@
dest.writeInt(0);
}
dest.writeLong(creationTime);
+ if (enabler != null) {
+ dest.writeInt(1);
+ dest.writeString(enabler);
+ } else {
+ dest.writeInt(0);
+ }
}
@Override
@@ -1097,6 +1144,7 @@
.append(",component=").append(component)
.append(",id=").append(id)
.append(",creationTime=").append(creationTime)
+ .append(",enabler=").append(enabler)
.append(']').toString();
}
@@ -1143,6 +1191,9 @@
if (creationTime != to.creationTime) {
d.addLine(item, "creationTime", creationTime, to.creationTime);
}
+ if (enabler != to.enabler) {
+ d.addLine(item, "enabler", enabler, to.enabler);
+ }
}
@Override
@@ -1158,13 +1209,14 @@
&& Objects.equals(other.condition, condition)
&& Objects.equals(other.component, component)
&& Objects.equals(other.id, id)
- && other.creationTime == creationTime;
+ && other.creationTime == creationTime
+ && Objects.equals(other.enabler, enabler);
}
@Override
public int hashCode() {
return Objects.hash(enabled, snoozing, name, zenMode, conditionId, condition,
- component, id, creationTime);
+ component, id, creationTime, enabler);
}
public boolean isAutomaticActive() {
diff --git a/core/java/android/service/quicksettings/IQSService.aidl b/core/java/android/service/quicksettings/IQSService.aidl
index bf96357..d03ff93 100644
--- a/core/java/android/service/quicksettings/IQSService.aidl
+++ b/core/java/android/service/quicksettings/IQSService.aidl
@@ -23,16 +23,16 @@
* @hide
*/
interface IQSService {
- Tile getTile(in ComponentName component);
- void updateQsTile(in Tile tile);
- void updateStatusIcon(in Tile tile, in Icon icon,
+ Tile getTile(in IBinder tile);
+ void updateQsTile(in Tile tile, in IBinder service);
+ void updateStatusIcon(in IBinder tile, in Icon icon,
String contentDescription);
- void onShowDialog(in Tile tile);
- void onStartActivity(in Tile tile);
+ void onShowDialog(in IBinder tile);
+ void onStartActivity(in IBinder tile);
boolean isLocked();
boolean isSecure();
- void startUnlockAndRun(in Tile tile);
+ void startUnlockAndRun(in IBinder tile);
- void onDialogHidden(in Tile tile);
- void onStartSuccessful(in Tile tile);
+ void onDialogHidden(in IBinder tile);
+ void onStartSuccessful(in IBinder tile);
}
diff --git a/core/java/android/service/quicksettings/Tile.java b/core/java/android/service/quicksettings/Tile.java
index 3d7d53e..4b81a72 100644
--- a/core/java/android/service/quicksettings/Tile.java
+++ b/core/java/android/service/quicksettings/Tile.java
@@ -15,8 +15,8 @@
*/
package android.service.quicksettings;
-import android.content.ComponentName;
import android.graphics.drawable.Icon;
+import android.os.IBinder;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
@@ -59,7 +59,7 @@
*/
public static final int STATE_ACTIVE = 2;
- private ComponentName mComponentName;
+ private IBinder mToken;
private Icon mIcon;
private CharSequence mLabel;
private CharSequence mContentDescription;
@@ -78,29 +78,15 @@
/**
* @hide
*/
- public Tile(ComponentName componentName) {
- mComponentName = componentName;
+ public Tile() {
}
/**
* @hide
*/
- public void setService(IQSService service) {
+ public void setService(IQSService service, IBinder stub) {
mService = service;
- }
-
- /**
- * @hide
- */
- public ComponentName getComponentName() {
- return mComponentName;
- }
-
- /**
- * @hide
- */
- public IQSService getQsService() {
- return mService;
+ mToken = stub;
}
/**
@@ -193,7 +179,7 @@
*/
public void updateTile() {
try {
- mService.updateQsTile(this);
+ mService.updateQsTile(this, mToken);
} catch (RemoteException e) {
Log.e(TAG, "Couldn't update tile");
}
@@ -201,12 +187,6 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
- if (mComponentName != null) {
- dest.writeByte((byte) 1);
- mComponentName.writeToParcel(dest, flags);
- } else {
- dest.writeByte((byte) 0);
- }
if (mIcon != null) {
dest.writeByte((byte) 1);
mIcon.writeToParcel(dest, flags);
@@ -220,11 +200,6 @@
private void readFromParcel(Parcel source) {
if (source.readByte() != 0) {
- mComponentName = ComponentName.CREATOR.createFromParcel(source);
- } else {
- mComponentName = null;
- }
- if (source.readByte() != 0) {
mIcon = Icon.CREATOR.createFromParcel(source);
} else {
mIcon = null;
diff --git a/core/java/android/service/quicksettings/TileService.java b/core/java/android/service/quicksettings/TileService.java
index 50411ab..887f4b6 100644
--- a/core/java/android/service/quicksettings/TileService.java
+++ b/core/java/android/service/quicksettings/TileService.java
@@ -123,6 +123,11 @@
/**
* @hide
*/
+ public static final String EXTRA_TOKEN = "token";
+
+ /**
+ * @hide
+ */
public static final String EXTRA_COMPONENT = "android.service.quicksettings.extra.COMPONENT";
private final H mHandler = new H(Looper.getMainLooper());
@@ -132,6 +137,7 @@
private IBinder mToken;
private IQSService mService;
private Runnable mUnlockRunnable;
+ private IBinder mTileToken;
@Override
public void onDestroy() {
@@ -197,7 +203,7 @@
public final void setStatusIcon(Icon icon, String contentDescription) {
if (mService != null) {
try {
- mService.updateStatusIcon(mTile, icon, contentDescription);
+ mService.updateStatusIcon(mTileToken, icon, contentDescription);
} catch (RemoteException e) {
}
}
@@ -224,14 +230,14 @@
@Override
public void onViewDetachedFromWindow(View v) {
try {
- mService.onDialogHidden(getQsTile());
+ mService.onDialogHidden(mTileToken);
} catch (RemoteException e) {
}
}
});
dialog.show();
try {
- mService.onShowDialog(mTile);
+ mService.onShowDialog(mTileToken);
} catch (RemoteException e) {
}
}
@@ -246,7 +252,7 @@
public final void unlockAndRun(Runnable runnable) {
mUnlockRunnable = runnable;
try {
- mService.startUnlockAndRun(mTile);
+ mService.startUnlockAndRun(mTileToken);
} catch (RemoteException e) {
}
}
@@ -292,7 +298,7 @@
public final void startActivityAndCollapse(Intent intent) {
startActivity(intent);
try {
- mService.onStartActivity(mTile);
+ mService.onStartActivity(mTileToken);
} catch (RemoteException e) {
}
}
@@ -311,14 +317,14 @@
@Override
public IBinder onBind(Intent intent) {
mService = IQSService.Stub.asInterface(intent.getIBinderExtra(EXTRA_SERVICE));
+ mTileToken = intent.getIBinderExtra(EXTRA_TOKEN);
try {
- ComponentName component = intent.getParcelableExtra(EXTRA_COMPONENT);
- mTile = mService.getTile(component);
+ mTile = mService.getTile(mTileToken);
} catch (RemoteException e) {
throw new RuntimeException("Unable to reach IQSService", e);
}
if (mTile != null) {
- mTile.setService(mService);
+ mTile.setService(mService, mTileToken);
mHandler.sendEmptyMessage(H.MSG_START_SUCCESS);
}
return new IQSTileService.Stub() {
@@ -403,7 +409,7 @@
break;
case MSG_START_SUCCESS:
try {
- mService.onStartSuccessful(mTile);
+ mService.onStartSuccessful(mTileToken);
} catch (RemoteException e) {
}
break;
diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java
index b1c07f5..bbe1523 100644
--- a/core/java/android/text/AndroidBidi.java
+++ b/core/java/android/text/AndroidBidi.java
@@ -18,11 +18,14 @@
import android.text.Layout.Directions;
+import com.android.internal.annotations.VisibleForTesting;
+
/**
* Access the ICU bidi implementation.
* @hide
*/
-/* package */ class AndroidBidi {
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+public class AndroidBidi {
public static int bidi(int dir, char[] chs, byte[] chInfo, int n, boolean haveInfo) {
if (chs == null || chInfo == null) {
diff --git a/core/java/android/text/CharSequenceCharacterIterator.java b/core/java/android/text/CharSequenceCharacterIterator.java
new file mode 100644
index 0000000..9b07d29
--- /dev/null
+++ b/core/java/android/text/CharSequenceCharacterIterator.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.text;
+
+import android.annotation.NonNull;
+
+import java.text.CharacterIterator;
+
+/**
+ * An implementation of {@link java.text.CharacterIterator} that iterates over a given CharSequence.
+ * {@hide}
+ */
+public class CharSequenceCharacterIterator implements CharacterIterator {
+ private final int mBeginIndex, mEndIndex;
+ private int mIndex;
+ private final CharSequence mCharSeq;
+
+ /**
+ * Constructs the iterator given a CharSequence and a range. The position of the iterator index
+ * is set to the beginning of the range.
+ */
+ public CharSequenceCharacterIterator(@NonNull CharSequence text, int start, int end) {
+ mCharSeq = text;
+ mBeginIndex = mIndex = start;
+ mEndIndex = end;
+ }
+
+ public char first() {
+ mIndex = mBeginIndex;
+ return current();
+ }
+
+ public char last() {
+ if (mBeginIndex == mEndIndex) {
+ mIndex = mEndIndex;
+ return DONE;
+ } else {
+ mIndex = mEndIndex - 1;
+ return mCharSeq.charAt(mIndex);
+ }
+ }
+
+ public char current() {
+ return (mIndex == mEndIndex) ? DONE : mCharSeq.charAt(mIndex);
+ }
+
+ public char next() {
+ mIndex++;
+ if (mIndex >= mEndIndex) {
+ mIndex = mEndIndex;
+ return DONE;
+ } else {
+ return mCharSeq.charAt(mIndex);
+ }
+ }
+
+ public char previous() {
+ if (mIndex <= mBeginIndex) {
+ return DONE;
+ } else {
+ mIndex--;
+ return mCharSeq.charAt(mIndex);
+ }
+ }
+
+ public char setIndex(int position) {
+ if (mBeginIndex <= position && position <= mEndIndex) {
+ mIndex = position;
+ return current();
+ } else {
+ throw new IllegalArgumentException("invalid position");
+ }
+ }
+
+ public int getBeginIndex() {
+ return mBeginIndex;
+ }
+
+ public int getEndIndex() {
+ return mEndIndex;
+ }
+
+ public int getIndex() {
+ return mIndex;
+ }
+
+ public Object clone() {
+ try {
+ return super.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new InternalError();
+ }
+ }
+}
diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java
index 5b5cdd2..3c7741d 100644
--- a/core/java/android/text/DynamicLayout.java
+++ b/core/java/android/text/DynamicLayout.java
@@ -20,6 +20,7 @@
import android.text.style.UpdateLayout;
import android.text.style.WrapTogetherSpan;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
@@ -449,7 +450,8 @@
*
* @hide
*/
- void updateBlocks(int startLine, int endLine, int newLineCount) {
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public void updateBlocks(int startLine, int endLine, int newLineCount) {
if (mBlockEndLines == null) {
createBlocks();
return;
@@ -549,7 +551,8 @@
* This package private method is used for test purposes only
* @hide
*/
- void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) {
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) {
mBlockEndLines = new int[blockEndLines.length];
mBlockIndices = new int[blockIndices.length];
System.arraycopy(blockEndLines, 0, mBlockEndLines, 0, blockEndLines.length);
diff --git a/core/java/android/text/Emoji.java b/core/java/android/text/Emoji.java
index b62cc66..b6d720d 100644
--- a/core/java/android/text/Emoji.java
+++ b/core/java/android/text/Emoji.java
@@ -32,111 +32,112 @@
0x23EC, 0x23ED, 0x23EE, 0x23EF, 0x23F0, 0x23F1, 0x23F2, 0x23F3, 0x23F8, 0x23F9, 0x23FA,
0x24C2, 0x25AA, 0x25AB, 0x25B6, 0x25C0, 0x25FB, 0x25FC, 0x25FD, 0x25FE, 0x2600, 0x2601,
0x2602, 0x2603, 0x2604, 0x260E, 0x2611, 0x2614, 0x2615, 0x2618, 0x261D, 0x2620, 0x2622,
- 0x2623, 0x2626, 0x262A, 0x262E, 0x262F, 0x2638, 0x2639, 0x263A, 0x2648, 0x2649, 0x264A,
- 0x264B, 0x264C, 0x264D, 0x264E, 0x264F, 0x2650, 0x2651, 0x2652, 0x2653, 0x2660, 0x2663,
- 0x2665, 0x2666, 0x2668, 0x267B, 0x267F, 0x2692, 0x2693, 0x2694, 0x2696, 0x2697, 0x2699,
- 0x269B, 0x269C, 0x26A0, 0x26A1, 0x26AA, 0x26AB, 0x26B0, 0x26B1, 0x26BD, 0x26BE, 0x26C4,
- 0x26C5, 0x26C8, 0x26CE, 0x26CF, 0x26D1, 0x26D3, 0x26D4, 0x26E9, 0x26EA, 0x26F0, 0x26F1,
- 0x26F2, 0x26F3, 0x26F4, 0x26F5, 0x26F7, 0x26F8, 0x26F9, 0x26FA, 0x26FD, 0x2702, 0x2705,
- 0x2708, 0x2709, 0x270A, 0x270B, 0x270C, 0x270D, 0x270F, 0x2712, 0x2714, 0x2716, 0x271D,
- 0x2721, 0x2728, 0x2733, 0x2734, 0x2744, 0x2747, 0x274C, 0x274E, 0x2753, 0x2754, 0x2755,
- 0x2757, 0x2763, 0x2764, 0x2795, 0x2796, 0x2797, 0x27A1, 0x27B0, 0x27BF, 0x2934, 0x2935,
- 0x2B05, 0x2B06, 0x2B07, 0x2B1B, 0x2B1C, 0x2B50, 0x2B55, 0x3030, 0x303D, 0x3297, 0x3299,
- 0x1F004, 0x1F0CF, 0x1F170, 0x1F171, 0x1F17E, 0x1F17F, 0x1F18E, 0x1F191, 0x1F192, 0x1F193,
- 0x1F194, 0x1F195, 0x1F196, 0x1F197, 0x1F198, 0x1F199, 0x1F19A, 0x1F1E6, 0x1F1E7, 0x1F1E8,
- 0x1F1E9, 0x1F1EA, 0x1F1EB, 0x1F1EC, 0x1F1ED, 0x1F1EE, 0x1F1EF, 0x1F1F0, 0x1F1F1, 0x1F1F2,
- 0x1F1F3, 0x1F1F4, 0x1F1F5, 0x1F1F6, 0x1F1F7, 0x1F1F8, 0x1F1F9, 0x1F1FA, 0x1F1FB, 0x1F1FC,
- 0x1F1FD, 0x1F1FE, 0x1F1FF, 0x1F201, 0x1F202, 0x1F21A, 0x1F22F, 0x1F232, 0x1F233, 0x1F234,
- 0x1F235, 0x1F236, 0x1F237, 0x1F238, 0x1F239, 0x1F23A, 0x1F250, 0x1F251, 0x1F300, 0x1F301,
- 0x1F302, 0x1F303, 0x1F304, 0x1F305, 0x1F306, 0x1F307, 0x1F308, 0x1F309, 0x1F30A, 0x1F30B,
- 0x1F30C, 0x1F30D, 0x1F30E, 0x1F30F, 0x1F310, 0x1F311, 0x1F312, 0x1F313, 0x1F314, 0x1F315,
- 0x1F316, 0x1F317, 0x1F318, 0x1F319, 0x1F31A, 0x1F31B, 0x1F31C, 0x1F31D, 0x1F31E, 0x1F31F,
- 0x1F320, 0x1F321, 0x1F324, 0x1F325, 0x1F326, 0x1F327, 0x1F328, 0x1F329, 0x1F32A, 0x1F32B,
- 0x1F32C, 0x1F32D, 0x1F32E, 0x1F32F, 0x1F330, 0x1F331, 0x1F332, 0x1F333, 0x1F334, 0x1F335,
- 0x1F336, 0x1F337, 0x1F338, 0x1F339, 0x1F33A, 0x1F33B, 0x1F33C, 0x1F33D, 0x1F33E, 0x1F33F,
- 0x1F340, 0x1F341, 0x1F342, 0x1F343, 0x1F344, 0x1F345, 0x1F346, 0x1F347, 0x1F348, 0x1F349,
- 0x1F34A, 0x1F34B, 0x1F34C, 0x1F34D, 0x1F34E, 0x1F34F, 0x1F350, 0x1F351, 0x1F352, 0x1F353,
- 0x1F354, 0x1F355, 0x1F356, 0x1F357, 0x1F358, 0x1F359, 0x1F35A, 0x1F35B, 0x1F35C, 0x1F35D,
- 0x1F35E, 0x1F35F, 0x1F360, 0x1F361, 0x1F362, 0x1F363, 0x1F364, 0x1F365, 0x1F366, 0x1F367,
- 0x1F368, 0x1F369, 0x1F36A, 0x1F36B, 0x1F36C, 0x1F36D, 0x1F36E, 0x1F36F, 0x1F370, 0x1F371,
- 0x1F372, 0x1F373, 0x1F374, 0x1F375, 0x1F376, 0x1F377, 0x1F378, 0x1F379, 0x1F37A, 0x1F37B,
- 0x1F37C, 0x1F37D, 0x1F37E, 0x1F37F, 0x1F380, 0x1F381, 0x1F382, 0x1F383, 0x1F384, 0x1F385,
- 0x1F386, 0x1F387, 0x1F388, 0x1F389, 0x1F38A, 0x1F38B, 0x1F38C, 0x1F38D, 0x1F38E, 0x1F38F,
- 0x1F390, 0x1F391, 0x1F392, 0x1F393, 0x1F396, 0x1F397, 0x1F399, 0x1F39A, 0x1F39B, 0x1F39E,
- 0x1F39F, 0x1F3A0, 0x1F3A1, 0x1F3A2, 0x1F3A3, 0x1F3A4, 0x1F3A5, 0x1F3A6, 0x1F3A7, 0x1F3A8,
- 0x1F3A9, 0x1F3AA, 0x1F3AB, 0x1F3AC, 0x1F3AD, 0x1F3AE, 0x1F3AF, 0x1F3B0, 0x1F3B1, 0x1F3B2,
- 0x1F3B3, 0x1F3B4, 0x1F3B5, 0x1F3B6, 0x1F3B7, 0x1F3B8, 0x1F3B9, 0x1F3BA, 0x1F3BB, 0x1F3BC,
- 0x1F3BD, 0x1F3BE, 0x1F3BF, 0x1F3C0, 0x1F3C1, 0x1F3C2, 0x1F3C3, 0x1F3C4, 0x1F3C5, 0x1F3C6,
- 0x1F3C7, 0x1F3C8, 0x1F3C9, 0x1F3CA, 0x1F3CB, 0x1F3CC, 0x1F3CD, 0x1F3CE, 0x1F3CF, 0x1F3D0,
- 0x1F3D1, 0x1F3D2, 0x1F3D3, 0x1F3D4, 0x1F3D5, 0x1F3D6, 0x1F3D7, 0x1F3D8, 0x1F3D9, 0x1F3DA,
- 0x1F3DB, 0x1F3DC, 0x1F3DD, 0x1F3DE, 0x1F3DF, 0x1F3E0, 0x1F3E1, 0x1F3E2, 0x1F3E3, 0x1F3E4,
- 0x1F3E5, 0x1F3E6, 0x1F3E7, 0x1F3E8, 0x1F3E9, 0x1F3EA, 0x1F3EB, 0x1F3EC, 0x1F3ED, 0x1F3EE,
- 0x1F3EF, 0x1F3F0, 0x1F3F3, 0x1F3F4, 0x1F3F5, 0x1F3F7, 0x1F3F8, 0x1F3F9, 0x1F3FA, 0x1F3FB,
- 0x1F3FC, 0x1F3FD, 0x1F3FE, 0x1F3FF, 0x1F400, 0x1F401, 0x1F402, 0x1F403, 0x1F404, 0x1F405,
- 0x1F406, 0x1F407, 0x1F408, 0x1F409, 0x1F40A, 0x1F40B, 0x1F40C, 0x1F40D, 0x1F40E, 0x1F40F,
- 0x1F410, 0x1F411, 0x1F412, 0x1F413, 0x1F414, 0x1F415, 0x1F416, 0x1F417, 0x1F418, 0x1F419,
- 0x1F41A, 0x1F41B, 0x1F41C, 0x1F41D, 0x1F41E, 0x1F41F, 0x1F420, 0x1F421, 0x1F422, 0x1F423,
- 0x1F424, 0x1F425, 0x1F426, 0x1F427, 0x1F428, 0x1F429, 0x1F42A, 0x1F42B, 0x1F42C, 0x1F42D,
- 0x1F42E, 0x1F42F, 0x1F430, 0x1F431, 0x1F432, 0x1F433, 0x1F434, 0x1F435, 0x1F436, 0x1F437,
- 0x1F438, 0x1F439, 0x1F43A, 0x1F43B, 0x1F43C, 0x1F43D, 0x1F43E, 0x1F43F, 0x1F440, 0x1F441,
- 0x1F442, 0x1F443, 0x1F444, 0x1F445, 0x1F446, 0x1F447, 0x1F448, 0x1F449, 0x1F44A, 0x1F44B,
- 0x1F44C, 0x1F44D, 0x1F44E, 0x1F44F, 0x1F450, 0x1F451, 0x1F452, 0x1F453, 0x1F454, 0x1F455,
- 0x1F456, 0x1F457, 0x1F458, 0x1F459, 0x1F45A, 0x1F45B, 0x1F45C, 0x1F45D, 0x1F45E, 0x1F45F,
- 0x1F460, 0x1F461, 0x1F462, 0x1F463, 0x1F464, 0x1F465, 0x1F466, 0x1F467, 0x1F468, 0x1F469,
- 0x1F46A, 0x1F46B, 0x1F46C, 0x1F46D, 0x1F46E, 0x1F46F, 0x1F470, 0x1F471, 0x1F472, 0x1F473,
- 0x1F474, 0x1F475, 0x1F476, 0x1F477, 0x1F478, 0x1F479, 0x1F47A, 0x1F47B, 0x1F47C, 0x1F47D,
- 0x1F47E, 0x1F47F, 0x1F480, 0x1F481, 0x1F482, 0x1F483, 0x1F484, 0x1F485, 0x1F486, 0x1F487,
- 0x1F488, 0x1F489, 0x1F48A, 0x1F48B, 0x1F48C, 0x1F48D, 0x1F48E, 0x1F48F, 0x1F490, 0x1F491,
- 0x1F492, 0x1F493, 0x1F494, 0x1F495, 0x1F496, 0x1F497, 0x1F498, 0x1F499, 0x1F49A, 0x1F49B,
- 0x1F49C, 0x1F49D, 0x1F49E, 0x1F49F, 0x1F4A0, 0x1F4A1, 0x1F4A2, 0x1F4A3, 0x1F4A4, 0x1F4A5,
- 0x1F4A6, 0x1F4A7, 0x1F4A8, 0x1F4A9, 0x1F4AA, 0x1F4AB, 0x1F4AC, 0x1F4AD, 0x1F4AE, 0x1F4AF,
- 0x1F4B0, 0x1F4B1, 0x1F4B2, 0x1F4B3, 0x1F4B4, 0x1F4B5, 0x1F4B6, 0x1F4B7, 0x1F4B8, 0x1F4B9,
- 0x1F4BA, 0x1F4BB, 0x1F4BC, 0x1F4BD, 0x1F4BE, 0x1F4BF, 0x1F4C0, 0x1F4C1, 0x1F4C2, 0x1F4C3,
- 0x1F4C4, 0x1F4C5, 0x1F4C6, 0x1F4C7, 0x1F4C8, 0x1F4C9, 0x1F4CA, 0x1F4CB, 0x1F4CC, 0x1F4CD,
- 0x1F4CE, 0x1F4CF, 0x1F4D0, 0x1F4D1, 0x1F4D2, 0x1F4D3, 0x1F4D4, 0x1F4D5, 0x1F4D6, 0x1F4D7,
- 0x1F4D8, 0x1F4D9, 0x1F4DA, 0x1F4DB, 0x1F4DC, 0x1F4DD, 0x1F4DE, 0x1F4DF, 0x1F4E0, 0x1F4E1,
- 0x1F4E2, 0x1F4E3, 0x1F4E4, 0x1F4E5, 0x1F4E6, 0x1F4E7, 0x1F4E8, 0x1F4E9, 0x1F4EA, 0x1F4EB,
- 0x1F4EC, 0x1F4ED, 0x1F4EE, 0x1F4EF, 0x1F4F0, 0x1F4F1, 0x1F4F2, 0x1F4F3, 0x1F4F4, 0x1F4F5,
- 0x1F4F6, 0x1F4F7, 0x1F4F8, 0x1F4F9, 0x1F4FA, 0x1F4FB, 0x1F4FC, 0x1F4FD, 0x1F4FF, 0x1F500,
- 0x1F501, 0x1F502, 0x1F503, 0x1F504, 0x1F505, 0x1F506, 0x1F507, 0x1F508, 0x1F509, 0x1F50A,
- 0x1F50B, 0x1F50C, 0x1F50D, 0x1F50E, 0x1F50F, 0x1F510, 0x1F511, 0x1F512, 0x1F513, 0x1F514,
- 0x1F515, 0x1F516, 0x1F517, 0x1F518, 0x1F519, 0x1F51A, 0x1F51B, 0x1F51C, 0x1F51D, 0x1F51E,
- 0x1F51F, 0x1F520, 0x1F521, 0x1F522, 0x1F523, 0x1F524, 0x1F525, 0x1F526, 0x1F527, 0x1F528,
- 0x1F529, 0x1F52A, 0x1F52B, 0x1F52C, 0x1F52D, 0x1F52E, 0x1F52F, 0x1F530, 0x1F531, 0x1F532,
- 0x1F533, 0x1F534, 0x1F535, 0x1F536, 0x1F537, 0x1F538, 0x1F539, 0x1F53A, 0x1F53B, 0x1F53C,
- 0x1F53D, 0x1F549, 0x1F54A, 0x1F54B, 0x1F54C, 0x1F54D, 0x1F54E, 0x1F550, 0x1F551, 0x1F552,
- 0x1F553, 0x1F554, 0x1F555, 0x1F556, 0x1F557, 0x1F558, 0x1F559, 0x1F55A, 0x1F55B, 0x1F55C,
- 0x1F55D, 0x1F55E, 0x1F55F, 0x1F560, 0x1F561, 0x1F562, 0x1F563, 0x1F564, 0x1F565, 0x1F566,
- 0x1F567, 0x1F56F, 0x1F570, 0x1F573, 0x1F574, 0x1F575, 0x1F576, 0x1F577, 0x1F578, 0x1F579,
- 0x1F57A, 0x1F587, 0x1F58A, 0x1F58B, 0x1F58C, 0x1F58D, 0x1F590, 0x1F595, 0x1F596, 0x1F5A4,
- 0x1F5A5, 0x1F5A8, 0x1F5B1, 0x1F5B2, 0x1F5BC, 0x1F5C2, 0x1F5C3, 0x1F5C4, 0x1F5D1, 0x1F5D2,
- 0x1F5D3, 0x1F5DC, 0x1F5DD, 0x1F5DE, 0x1F5E1, 0x1F5E3, 0x1F5E8, 0x1F5EF, 0x1F5F3, 0x1F5FA,
- 0x1F5FB, 0x1F5FC, 0x1F5FD, 0x1F5FE, 0x1F5FF, 0x1F600, 0x1F601, 0x1F602, 0x1F603, 0x1F604,
- 0x1F605, 0x1F606, 0x1F607, 0x1F608, 0x1F609, 0x1F60A, 0x1F60B, 0x1F60C, 0x1F60D, 0x1F60E,
- 0x1F60F, 0x1F610, 0x1F611, 0x1F612, 0x1F613, 0x1F614, 0x1F615, 0x1F616, 0x1F617, 0x1F618,
- 0x1F619, 0x1F61A, 0x1F61B, 0x1F61C, 0x1F61D, 0x1F61E, 0x1F61F, 0x1F620, 0x1F621, 0x1F622,
- 0x1F623, 0x1F624, 0x1F625, 0x1F626, 0x1F627, 0x1F628, 0x1F629, 0x1F62A, 0x1F62B, 0x1F62C,
- 0x1F62D, 0x1F62E, 0x1F62F, 0x1F630, 0x1F631, 0x1F632, 0x1F633, 0x1F634, 0x1F635, 0x1F636,
- 0x1F637, 0x1F638, 0x1F639, 0x1F63A, 0x1F63B, 0x1F63C, 0x1F63D, 0x1F63E, 0x1F63F, 0x1F640,
- 0x1F641, 0x1F642, 0x1F643, 0x1F644, 0x1F645, 0x1F646, 0x1F647, 0x1F648, 0x1F649, 0x1F64A,
- 0x1F64B, 0x1F64C, 0x1F64D, 0x1F64E, 0x1F64F, 0x1F680, 0x1F681, 0x1F682, 0x1F683, 0x1F684,
- 0x1F685, 0x1F686, 0x1F687, 0x1F688, 0x1F689, 0x1F68A, 0x1F68B, 0x1F68C, 0x1F68D, 0x1F68E,
- 0x1F68F, 0x1F690, 0x1F691, 0x1F692, 0x1F693, 0x1F694, 0x1F695, 0x1F696, 0x1F697, 0x1F698,
- 0x1F699, 0x1F69A, 0x1F69B, 0x1F69C, 0x1F69D, 0x1F69E, 0x1F69F, 0x1F6A0, 0x1F6A1, 0x1F6A2,
- 0x1F6A3, 0x1F6A4, 0x1F6A5, 0x1F6A6, 0x1F6A7, 0x1F6A8, 0x1F6A9, 0x1F6AA, 0x1F6AB, 0x1F6AC,
- 0x1F6AD, 0x1F6AE, 0x1F6AF, 0x1F6B0, 0x1F6B1, 0x1F6B2, 0x1F6B3, 0x1F6B4, 0x1F6B5, 0x1F6B6,
- 0x1F6B7, 0x1F6B8, 0x1F6B9, 0x1F6BA, 0x1F6BB, 0x1F6BC, 0x1F6BD, 0x1F6BE, 0x1F6BF, 0x1F6C0,
- 0x1F6C1, 0x1F6C2, 0x1F6C3, 0x1F6C4, 0x1F6C5, 0x1F6CB, 0x1F6CC, 0x1F6CD, 0x1F6CE, 0x1F6CF,
- 0x1F6D0, 0x1F6D1, 0x1F6D2, 0x1F6E0, 0x1F6E1, 0x1F6E2, 0x1F6E3, 0x1F6E4, 0x1F6E5, 0x1F6E9,
- 0x1F6EB, 0x1F6EC, 0x1F6F0, 0x1F6F3, 0x1F6F4, 0x1F6F5, 0x1F6F6, 0x1F910, 0x1F911, 0x1F912,
- 0x1F913, 0x1F914, 0x1F915, 0x1F916, 0x1F917, 0x1F918, 0x1F919, 0x1F91A, 0x1F91B, 0x1F91C,
- 0x1F91D, 0x1F91E, 0x1F920, 0x1F921, 0x1F922, 0x1F923, 0x1F924, 0x1F925, 0x1F926, 0x1F927,
- 0x1F930, 0x1F933, 0x1F934, 0x1F935, 0x1F936, 0x1F937, 0x1F938, 0x1F939, 0x1F93A, 0x1F93B,
- 0x1F93C, 0x1F93D, 0x1F93E, 0x1F940, 0x1F941, 0x1F942, 0x1F943, 0x1F944, 0x1F945, 0x1F946,
- 0x1F947, 0x1F948, 0x1F949, 0x1F94A, 0x1F94B, 0x1F950, 0x1F951, 0x1F952, 0x1F953, 0x1F954,
- 0x1F955, 0x1F956, 0x1F957, 0x1F958, 0x1F959, 0x1F95A, 0x1F95B, 0x1F95C, 0x1F95D, 0x1F95E,
- 0x1F980, 0x1F981, 0x1F982, 0x1F983, 0x1F984, 0x1F985, 0x1F986, 0x1F987, 0x1F988, 0x1F989,
- 0x1F98A, 0x1F98B, 0x1F98C, 0x1F98D, 0x1F98E, 0x1F98F, 0x1F990, 0x1F991, 0x1F9C0
+ 0x2623, 0x2626, 0x262A, 0x262E, 0x262F, 0x2638, 0x2639, 0x263A, 0x2640, 0x2642, 0x2648,
+ 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F, 0x2650, 0x2651, 0x2652, 0x2653,
+ 0x2660, 0x2663, 0x2665, 0x2666, 0x2668, 0x267B, 0x267F, 0x2692, 0x2693, 0x2694, 0x2695,
+ 0x2696, 0x2697, 0x2699, 0x269B, 0x269C, 0x26A0, 0x26A1, 0x26AA, 0x26AB, 0x26B0, 0x26B1,
+ 0x26BD, 0x26BE, 0x26C4, 0x26C5, 0x26C8, 0x26CE, 0x26CF, 0x26D1, 0x26D3, 0x26D4, 0x26E9,
+ 0x26EA, 0x26F0, 0x26F1, 0x26F2, 0x26F3, 0x26F4, 0x26F5, 0x26F7, 0x26F8, 0x26F9, 0x26FA,
+ 0x26FD, 0x2702, 0x2705, 0x2708, 0x2709, 0x270A, 0x270B, 0x270C, 0x270D, 0x270F, 0x2712,
+ 0x2714, 0x2716, 0x271D, 0x2721, 0x2728, 0x2733, 0x2734, 0x2744, 0x2747, 0x274C, 0x274E,
+ 0x2753, 0x2754, 0x2755, 0x2757, 0x2763, 0x2764, 0x2795, 0x2796, 0x2797, 0x27A1, 0x27B0,
+ 0x27BF, 0x2934, 0x2935, 0x2B05, 0x2B06, 0x2B07, 0x2B1B, 0x2B1C, 0x2B50, 0x2B55, 0x3030,
+ 0x303D, 0x3297, 0x3299, 0x1F004, 0x1F0CF, 0x1F170, 0x1F171, 0x1F17E, 0x1F17F, 0x1F18E,
+ 0x1F191, 0x1F192, 0x1F193, 0x1F194, 0x1F195, 0x1F196, 0x1F197, 0x1F198, 0x1F199, 0x1F19A,
+ 0x1F1E6, 0x1F1E7, 0x1F1E8, 0x1F1E9, 0x1F1EA, 0x1F1EB, 0x1F1EC, 0x1F1ED, 0x1F1EE, 0x1F1EF,
+ 0x1F1F0, 0x1F1F1, 0x1F1F2, 0x1F1F3, 0x1F1F4, 0x1F1F5, 0x1F1F6, 0x1F1F7, 0x1F1F8, 0x1F1F9,
+ 0x1F1FA, 0x1F1FB, 0x1F1FC, 0x1F1FD, 0x1F1FE, 0x1F1FF, 0x1F201, 0x1F202, 0x1F21A, 0x1F22F,
+ 0x1F232, 0x1F233, 0x1F234, 0x1F235, 0x1F236, 0x1F237, 0x1F238, 0x1F239, 0x1F23A, 0x1F250,
+ 0x1F251, 0x1F300, 0x1F301, 0x1F302, 0x1F303, 0x1F304, 0x1F305, 0x1F306, 0x1F307, 0x1F308,
+ 0x1F309, 0x1F30A, 0x1F30B, 0x1F30C, 0x1F30D, 0x1F30E, 0x1F30F, 0x1F310, 0x1F311, 0x1F312,
+ 0x1F313, 0x1F314, 0x1F315, 0x1F316, 0x1F317, 0x1F318, 0x1F319, 0x1F31A, 0x1F31B, 0x1F31C,
+ 0x1F31D, 0x1F31E, 0x1F31F, 0x1F320, 0x1F321, 0x1F324, 0x1F325, 0x1F326, 0x1F327, 0x1F328,
+ 0x1F329, 0x1F32A, 0x1F32B, 0x1F32C, 0x1F32D, 0x1F32E, 0x1F32F, 0x1F330, 0x1F331, 0x1F332,
+ 0x1F333, 0x1F334, 0x1F335, 0x1F336, 0x1F337, 0x1F338, 0x1F339, 0x1F33A, 0x1F33B, 0x1F33C,
+ 0x1F33D, 0x1F33E, 0x1F33F, 0x1F340, 0x1F341, 0x1F342, 0x1F343, 0x1F344, 0x1F345, 0x1F346,
+ 0x1F347, 0x1F348, 0x1F349, 0x1F34A, 0x1F34B, 0x1F34C, 0x1F34D, 0x1F34E, 0x1F34F, 0x1F350,
+ 0x1F351, 0x1F352, 0x1F353, 0x1F354, 0x1F355, 0x1F356, 0x1F357, 0x1F358, 0x1F359, 0x1F35A,
+ 0x1F35B, 0x1F35C, 0x1F35D, 0x1F35E, 0x1F35F, 0x1F360, 0x1F361, 0x1F362, 0x1F363, 0x1F364,
+ 0x1F365, 0x1F366, 0x1F367, 0x1F368, 0x1F369, 0x1F36A, 0x1F36B, 0x1F36C, 0x1F36D, 0x1F36E,
+ 0x1F36F, 0x1F370, 0x1F371, 0x1F372, 0x1F373, 0x1F374, 0x1F375, 0x1F376, 0x1F377, 0x1F378,
+ 0x1F379, 0x1F37A, 0x1F37B, 0x1F37C, 0x1F37D, 0x1F37E, 0x1F37F, 0x1F380, 0x1F381, 0x1F382,
+ 0x1F383, 0x1F384, 0x1F385, 0x1F386, 0x1F387, 0x1F388, 0x1F389, 0x1F38A, 0x1F38B, 0x1F38C,
+ 0x1F38D, 0x1F38E, 0x1F38F, 0x1F390, 0x1F391, 0x1F392, 0x1F393, 0x1F396, 0x1F397, 0x1F399,
+ 0x1F39A, 0x1F39B, 0x1F39E, 0x1F39F, 0x1F3A0, 0x1F3A1, 0x1F3A2, 0x1F3A3, 0x1F3A4, 0x1F3A5,
+ 0x1F3A6, 0x1F3A7, 0x1F3A8, 0x1F3A9, 0x1F3AA, 0x1F3AB, 0x1F3AC, 0x1F3AD, 0x1F3AE, 0x1F3AF,
+ 0x1F3B0, 0x1F3B1, 0x1F3B2, 0x1F3B3, 0x1F3B4, 0x1F3B5, 0x1F3B6, 0x1F3B7, 0x1F3B8, 0x1F3B9,
+ 0x1F3BA, 0x1F3BB, 0x1F3BC, 0x1F3BD, 0x1F3BE, 0x1F3BF, 0x1F3C0, 0x1F3C1, 0x1F3C2, 0x1F3C3,
+ 0x1F3C4, 0x1F3C5, 0x1F3C6, 0x1F3C7, 0x1F3C8, 0x1F3C9, 0x1F3CA, 0x1F3CB, 0x1F3CC, 0x1F3CD,
+ 0x1F3CE, 0x1F3CF, 0x1F3D0, 0x1F3D1, 0x1F3D2, 0x1F3D3, 0x1F3D4, 0x1F3D5, 0x1F3D6, 0x1F3D7,
+ 0x1F3D8, 0x1F3D9, 0x1F3DA, 0x1F3DB, 0x1F3DC, 0x1F3DD, 0x1F3DE, 0x1F3DF, 0x1F3E0, 0x1F3E1,
+ 0x1F3E2, 0x1F3E3, 0x1F3E4, 0x1F3E5, 0x1F3E6, 0x1F3E7, 0x1F3E8, 0x1F3E9, 0x1F3EA, 0x1F3EB,
+ 0x1F3EC, 0x1F3ED, 0x1F3EE, 0x1F3EF, 0x1F3F0, 0x1F3F3, 0x1F3F4, 0x1F3F5, 0x1F3F7, 0x1F3F8,
+ 0x1F3F9, 0x1F3FA, 0x1F3FB, 0x1F3FC, 0x1F3FD, 0x1F3FE, 0x1F3FF, 0x1F400, 0x1F401, 0x1F402,
+ 0x1F403, 0x1F404, 0x1F405, 0x1F406, 0x1F407, 0x1F408, 0x1F409, 0x1F40A, 0x1F40B, 0x1F40C,
+ 0x1F40D, 0x1F40E, 0x1F40F, 0x1F410, 0x1F411, 0x1F412, 0x1F413, 0x1F414, 0x1F415, 0x1F416,
+ 0x1F417, 0x1F418, 0x1F419, 0x1F41A, 0x1F41B, 0x1F41C, 0x1F41D, 0x1F41E, 0x1F41F, 0x1F420,
+ 0x1F421, 0x1F422, 0x1F423, 0x1F424, 0x1F425, 0x1F426, 0x1F427, 0x1F428, 0x1F429, 0x1F42A,
+ 0x1F42B, 0x1F42C, 0x1F42D, 0x1F42E, 0x1F42F, 0x1F430, 0x1F431, 0x1F432, 0x1F433, 0x1F434,
+ 0x1F435, 0x1F436, 0x1F437, 0x1F438, 0x1F439, 0x1F43A, 0x1F43B, 0x1F43C, 0x1F43D, 0x1F43E,
+ 0x1F43F, 0x1F440, 0x1F441, 0x1F442, 0x1F443, 0x1F444, 0x1F445, 0x1F446, 0x1F447, 0x1F448,
+ 0x1F449, 0x1F44A, 0x1F44B, 0x1F44C, 0x1F44D, 0x1F44E, 0x1F44F, 0x1F450, 0x1F451, 0x1F452,
+ 0x1F453, 0x1F454, 0x1F455, 0x1F456, 0x1F457, 0x1F458, 0x1F459, 0x1F45A, 0x1F45B, 0x1F45C,
+ 0x1F45D, 0x1F45E, 0x1F45F, 0x1F460, 0x1F461, 0x1F462, 0x1F463, 0x1F464, 0x1F465, 0x1F466,
+ 0x1F467, 0x1F468, 0x1F469, 0x1F46A, 0x1F46B, 0x1F46C, 0x1F46D, 0x1F46E, 0x1F46F, 0x1F470,
+ 0x1F471, 0x1F472, 0x1F473, 0x1F474, 0x1F475, 0x1F476, 0x1F477, 0x1F478, 0x1F479, 0x1F47A,
+ 0x1F47B, 0x1F47C, 0x1F47D, 0x1F47E, 0x1F47F, 0x1F480, 0x1F481, 0x1F482, 0x1F483, 0x1F484,
+ 0x1F485, 0x1F486, 0x1F487, 0x1F488, 0x1F489, 0x1F48A, 0x1F48B, 0x1F48C, 0x1F48D, 0x1F48E,
+ 0x1F48F, 0x1F490, 0x1F491, 0x1F492, 0x1F493, 0x1F494, 0x1F495, 0x1F496, 0x1F497, 0x1F498,
+ 0x1F499, 0x1F49A, 0x1F49B, 0x1F49C, 0x1F49D, 0x1F49E, 0x1F49F, 0x1F4A0, 0x1F4A1, 0x1F4A2,
+ 0x1F4A3, 0x1F4A4, 0x1F4A5, 0x1F4A6, 0x1F4A7, 0x1F4A8, 0x1F4A9, 0x1F4AA, 0x1F4AB, 0x1F4AC,
+ 0x1F4AD, 0x1F4AE, 0x1F4AF, 0x1F4B0, 0x1F4B1, 0x1F4B2, 0x1F4B3, 0x1F4B4, 0x1F4B5, 0x1F4B6,
+ 0x1F4B7, 0x1F4B8, 0x1F4B9, 0x1F4BA, 0x1F4BB, 0x1F4BC, 0x1F4BD, 0x1F4BE, 0x1F4BF, 0x1F4C0,
+ 0x1F4C1, 0x1F4C2, 0x1F4C3, 0x1F4C4, 0x1F4C5, 0x1F4C6, 0x1F4C7, 0x1F4C8, 0x1F4C9, 0x1F4CA,
+ 0x1F4CB, 0x1F4CC, 0x1F4CD, 0x1F4CE, 0x1F4CF, 0x1F4D0, 0x1F4D1, 0x1F4D2, 0x1F4D3, 0x1F4D4,
+ 0x1F4D5, 0x1F4D6, 0x1F4D7, 0x1F4D8, 0x1F4D9, 0x1F4DA, 0x1F4DB, 0x1F4DC, 0x1F4DD, 0x1F4DE,
+ 0x1F4DF, 0x1F4E0, 0x1F4E1, 0x1F4E2, 0x1F4E3, 0x1F4E4, 0x1F4E5, 0x1F4E6, 0x1F4E7, 0x1F4E8,
+ 0x1F4E9, 0x1F4EA, 0x1F4EB, 0x1F4EC, 0x1F4ED, 0x1F4EE, 0x1F4EF, 0x1F4F0, 0x1F4F1, 0x1F4F2,
+ 0x1F4F3, 0x1F4F4, 0x1F4F5, 0x1F4F6, 0x1F4F7, 0x1F4F8, 0x1F4F9, 0x1F4FA, 0x1F4FB, 0x1F4FC,
+ 0x1F4FD, 0x1F4FF, 0x1F500, 0x1F501, 0x1F502, 0x1F503, 0x1F504, 0x1F505, 0x1F506, 0x1F507,
+ 0x1F508, 0x1F509, 0x1F50A, 0x1F50B, 0x1F50C, 0x1F50D, 0x1F50E, 0x1F50F, 0x1F510, 0x1F511,
+ 0x1F512, 0x1F513, 0x1F514, 0x1F515, 0x1F516, 0x1F517, 0x1F518, 0x1F519, 0x1F51A, 0x1F51B,
+ 0x1F51C, 0x1F51D, 0x1F51E, 0x1F51F, 0x1F520, 0x1F521, 0x1F522, 0x1F523, 0x1F524, 0x1F525,
+ 0x1F526, 0x1F527, 0x1F528, 0x1F529, 0x1F52A, 0x1F52B, 0x1F52C, 0x1F52D, 0x1F52E, 0x1F52F,
+ 0x1F530, 0x1F531, 0x1F532, 0x1F533, 0x1F534, 0x1F535, 0x1F536, 0x1F537, 0x1F538, 0x1F539,
+ 0x1F53A, 0x1F53B, 0x1F53C, 0x1F53D, 0x1F549, 0x1F54A, 0x1F54B, 0x1F54C, 0x1F54D, 0x1F54E,
+ 0x1F550, 0x1F551, 0x1F552, 0x1F553, 0x1F554, 0x1F555, 0x1F556, 0x1F557, 0x1F558, 0x1F559,
+ 0x1F55A, 0x1F55B, 0x1F55C, 0x1F55D, 0x1F55E, 0x1F55F, 0x1F560, 0x1F561, 0x1F562, 0x1F563,
+ 0x1F564, 0x1F565, 0x1F566, 0x1F567, 0x1F56F, 0x1F570, 0x1F573, 0x1F574, 0x1F575, 0x1F576,
+ 0x1F577, 0x1F578, 0x1F579, 0x1F57A, 0x1F587, 0x1F58A, 0x1F58B, 0x1F58C, 0x1F58D, 0x1F590,
+ 0x1F595, 0x1F596, 0x1F5A4, 0x1F5A5, 0x1F5A8, 0x1F5B1, 0x1F5B2, 0x1F5BC, 0x1F5C2, 0x1F5C3,
+ 0x1F5C4, 0x1F5D1, 0x1F5D2, 0x1F5D3, 0x1F5DC, 0x1F5DD, 0x1F5DE, 0x1F5E1, 0x1F5E3, 0x1F5E8,
+ 0x1F5EF, 0x1F5F3, 0x1F5FA, 0x1F5FB, 0x1F5FC, 0x1F5FD, 0x1F5FE, 0x1F5FF, 0x1F600, 0x1F601,
+ 0x1F602, 0x1F603, 0x1F604, 0x1F605, 0x1F606, 0x1F607, 0x1F608, 0x1F609, 0x1F60A, 0x1F60B,
+ 0x1F60C, 0x1F60D, 0x1F60E, 0x1F60F, 0x1F610, 0x1F611, 0x1F612, 0x1F613, 0x1F614, 0x1F615,
+ 0x1F616, 0x1F617, 0x1F618, 0x1F619, 0x1F61A, 0x1F61B, 0x1F61C, 0x1F61D, 0x1F61E, 0x1F61F,
+ 0x1F620, 0x1F621, 0x1F622, 0x1F623, 0x1F624, 0x1F625, 0x1F626, 0x1F627, 0x1F628, 0x1F629,
+ 0x1F62A, 0x1F62B, 0x1F62C, 0x1F62D, 0x1F62E, 0x1F62F, 0x1F630, 0x1F631, 0x1F632, 0x1F633,
+ 0x1F634, 0x1F635, 0x1F636, 0x1F637, 0x1F638, 0x1F639, 0x1F63A, 0x1F63B, 0x1F63C, 0x1F63D,
+ 0x1F63E, 0x1F63F, 0x1F640, 0x1F641, 0x1F642, 0x1F643, 0x1F644, 0x1F645, 0x1F646, 0x1F647,
+ 0x1F648, 0x1F649, 0x1F64A, 0x1F64B, 0x1F64C, 0x1F64D, 0x1F64E, 0x1F64F, 0x1F680, 0x1F681,
+ 0x1F682, 0x1F683, 0x1F684, 0x1F685, 0x1F686, 0x1F687, 0x1F688, 0x1F689, 0x1F68A, 0x1F68B,
+ 0x1F68C, 0x1F68D, 0x1F68E, 0x1F68F, 0x1F690, 0x1F691, 0x1F692, 0x1F693, 0x1F694, 0x1F695,
+ 0x1F696, 0x1F697, 0x1F698, 0x1F699, 0x1F69A, 0x1F69B, 0x1F69C, 0x1F69D, 0x1F69E, 0x1F69F,
+ 0x1F6A0, 0x1F6A1, 0x1F6A2, 0x1F6A3, 0x1F6A4, 0x1F6A5, 0x1F6A6, 0x1F6A7, 0x1F6A8, 0x1F6A9,
+ 0x1F6AA, 0x1F6AB, 0x1F6AC, 0x1F6AD, 0x1F6AE, 0x1F6AF, 0x1F6B0, 0x1F6B1, 0x1F6B2, 0x1F6B3,
+ 0x1F6B4, 0x1F6B5, 0x1F6B6, 0x1F6B7, 0x1F6B8, 0x1F6B9, 0x1F6BA, 0x1F6BB, 0x1F6BC, 0x1F6BD,
+ 0x1F6BE, 0x1F6BF, 0x1F6C0, 0x1F6C1, 0x1F6C2, 0x1F6C3, 0x1F6C4, 0x1F6C5, 0x1F6CB, 0x1F6CC,
+ 0x1F6CD, 0x1F6CE, 0x1F6CF, 0x1F6D0, 0x1F6D1, 0x1F6D2, 0x1F6E0, 0x1F6E1, 0x1F6E2, 0x1F6E3,
+ 0x1F6E4, 0x1F6E5, 0x1F6E9, 0x1F6EB, 0x1F6EC, 0x1F6F0, 0x1F6F3, 0x1F6F4, 0x1F6F5, 0x1F6F6,
+ 0x1F910, 0x1F911, 0x1F912, 0x1F913, 0x1F914, 0x1F915, 0x1F916, 0x1F917, 0x1F918, 0x1F919,
+ 0x1F91A, 0x1F91B, 0x1F91C, 0x1F91D, 0x1F91E, 0x1F920, 0x1F921, 0x1F922, 0x1F923, 0x1F924,
+ 0x1F925, 0x1F926, 0x1F927, 0x1F930, 0x1F933, 0x1F934, 0x1F935, 0x1F936, 0x1F937, 0x1F938,
+ 0x1F939, 0x1F93A, 0x1F93B, 0x1F93C, 0x1F93D, 0x1F93E, 0x1F940, 0x1F941, 0x1F942, 0x1F943,
+ 0x1F944, 0x1F945, 0x1F946, 0x1F947, 0x1F948, 0x1F949, 0x1F94A, 0x1F94B, 0x1F950, 0x1F951,
+ 0x1F952, 0x1F953, 0x1F954, 0x1F955, 0x1F956, 0x1F957, 0x1F958, 0x1F959, 0x1F95A, 0x1F95B,
+ 0x1F95C, 0x1F95D, 0x1F95E, 0x1F980, 0x1F981, 0x1F982, 0x1F983, 0x1F984, 0x1F985, 0x1F986,
+ 0x1F987, 0x1F988, 0x1F989, 0x1F98A, 0x1F98B, 0x1F98C, 0x1F98D, 0x1F98E, 0x1F98F, 0x1F990,
+ 0x1F991, 0x1F9C0
};
// See http://www.unicode.org/Public/emoji/3.0/emoji-data.txt
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 0bd5071..f9afcc7 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -30,6 +30,7 @@
import android.text.style.ReplacementSpan;
import android.text.style.TabStopSpan;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
@@ -103,8 +104,12 @@
ArrayUtils.emptyArray(ParagraphStyle.class);
/**
- * Return how wide a layout must be in order to display the
- * specified text with one line per paragraph.
+ * Return how wide a layout must be in order to display the specified text with one line per
+ * paragraph.
+ *
+ * <p>As of O, Uses
+ * {@link TextDirectionHeuristics#FIRSTSTRONG_LTR} as the default text direction heuristics. In
+ * the earlier versions uses {@link TextDirectionHeuristics#LTR} as the default.</p>
*/
public static float getDesiredWidth(CharSequence source,
TextPaint paint) {
@@ -112,12 +117,25 @@
}
/**
+ * Return how wide a layout must be in order to display the specified text slice with one
+ * line per paragraph.
+ *
+ * <p>As of O, Uses
+ * {@link TextDirectionHeuristics#FIRSTSTRONG_LTR} as the default text direction heuristics. In
+ * the earlier versions uses {@link TextDirectionHeuristics#LTR} as the default.</p>
+ */
+ public static float getDesiredWidth(CharSequence source, int start, int end, TextPaint paint) {
+ return getDesiredWidth(source, start, end, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR);
+ }
+
+ /**
* Return how wide a layout must be in order to display the
* specified text slice with one line per paragraph.
+ *
+ * @hide
*/
- public static float getDesiredWidth(CharSequence source,
- int start, int end,
- TextPaint paint) {
+ public static float getDesiredWidth(CharSequence source, int start, int end, TextPaint paint,
+ TextDirectionHeuristic textDir) {
float need = 0;
int next;
@@ -128,7 +146,7 @@
next = end;
// note, omits trailing paragraph char
- float w = measurePara(paint, source, i, next);
+ float w = measurePara(paint, source, i, next, textDir);
if (w > need)
need = w;
@@ -1679,12 +1697,12 @@
}
/* package */
- static float measurePara(TextPaint paint, CharSequence text, int start, int end) {
-
+ static float measurePara(TextPaint paint, CharSequence text, int start, int end,
+ TextDirectionHeuristic textDir) {
MeasuredText mt = MeasuredText.obtain();
TextLine tl = TextLine.obtain();
try {
- mt.setPara(text, start, end, TextDirectionHeuristics.LTR, null);
+ mt.setPara(text, start, end, textDir, null);
Directions directions;
int dir;
if (mt.mEasy) {
@@ -1726,7 +1744,7 @@
}
}
tl.set(paint, text, start, end, dir, directions, hasTabs, tabStops);
- return margin + tl.metrics(null);
+ return margin + Math.abs(tl.metrics(null));
} finally {
TextLine.recycle(tl);
MeasuredText.recycle(mt);
@@ -1926,8 +1944,17 @@
// To simply test for an RTL direction, test the bit using
// DIR_RTL_FLAG, if set then the direction is rtl.
- /* package */ int[] mDirections;
- /* package */ Directions(int[] dirs) {
+ /**
+ * @hide
+ */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public int[] mDirections;
+
+ /**
+ * @hide
+ */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public Directions(int[] dirs) {
mDirections = dirs;
}
}
@@ -2070,9 +2097,14 @@
private static final int TAB_INCREMENT = 20;
- /* package */ static final Directions DIRS_ALL_LEFT_TO_RIGHT =
+ /** @hide */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public static final Directions DIRS_ALL_LEFT_TO_RIGHT =
new Directions(new int[] { 0, RUN_LENGTH_MASK });
- /* package */ static final Directions DIRS_ALL_RIGHT_TO_LEFT =
+
+ /** @hide */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public static final Directions DIRS_ALL_RIGHT_TO_LEFT =
new Directions(new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG });
}
diff --git a/core/java/android/text/PackedIntVector.java b/core/java/android/text/PackedIntVector.java
index 546ab44..3e5bf56 100644
--- a/core/java/android/text/PackedIntVector.java
+++ b/core/java/android/text/PackedIntVector.java
@@ -16,6 +16,7 @@
package android.text;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
@@ -24,8 +25,11 @@
* PackedIntVector stores a two-dimensional array of integers,
* optimized for inserting and deleting rows and for
* offsetting the values in segments of a given column.
+ *
+ * @hide
*/
-class PackedIntVector {
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+public class PackedIntVector {
private final int mColumns;
private int mRows;
diff --git a/core/java/android/text/SpannableStringInternal.java b/core/java/android/text/SpannableStringInternal.java
index 47e71be..4b02df86 100644
--- a/core/java/android/text/SpannableStringInternal.java
+++ b/core/java/android/text/SpannableStringInternal.java
@@ -33,6 +33,7 @@
mText = source.toString().substring(start, end);
mSpans = EmptyArray.OBJECT;
+ // Invariant: mSpanData.length = mSpans.length * COLUMNS
mSpanData = EmptyArray.INT;
if (source instanceof Spanned) {
@@ -99,7 +100,7 @@
Object[] srcSpans = src.mSpans;
mSpanCount = count;
mSpans = ArrayUtils.newUnpaddedObjectArray(mSpanCount);
- mSpanData = new int[mSpanCount * COLUMNS];
+ mSpanData = new int[mSpans.length * COLUMNS];
for (int i = 0, j = 0; i < limit; i++) {
int spanStart = srcData[i * COLUMNS + START];
int spanEnd = srcData[i * COLUMNS + END];
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index d7e786a..23b22d1 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -16,7 +16,11 @@
package android.text;
+import android.annotation.FloatRange;
+import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.PluralsRes;
+import android.content.Context;
import android.content.res.Resources;
import android.icu.util.ULocale;
import android.os.Parcel;
@@ -60,6 +64,7 @@
import java.lang.reflect.Array;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
@@ -1191,16 +1196,103 @@
}
/**
+ * Formats a list of CharSequences by repeatedly inserting the separator between them,
+ * but stopping when the resulting sequence is too wide for the specified width.
+ *
+ * This method actually tries to fit the maximum number of elements. So if {@code "A, 11 more"
+ * fits}, {@code "A, B, 10 more"} doesn't fit, but {@code "A, B, C, 9 more"} fits again (due to
+ * the glyphs for the digits being very wide, for example), it returns
+ * {@code "A, B, C, 9 more"}. Because of this, this method may be inefficient for very long
+ * lists.
+ *
+ * Note that the elements of the returned value, as well as the string for {@code moreId}, will
+ * be bidi-wrapped using {@link BidiFormatter#unicodeWrap} based on the locale of the input
+ * Context. If the input {@code Context} is null, the default BidiFormatter from
+ * {@link BidiFormatter#getInstance()} will be used.
+ *
+ * @param context the {@code Context} to get the {@code moreId} resource from. If {@code null},
+ * an ellipsis (U+2026) would be used for {@code moreId}.
+ * @param elements the list to format
+ * @param separator a separator, such as {@code ", "}
+ * @param paint the Paint with which to measure the text
+ * @param avail the horizontal width available for the text (in pixels)
+ * @param moreId the resource ID for the pluralized string to insert at the end of sequence when
+ * some of the elements don't fit.
+ *
+ * @return the formatted CharSequence. If even the shortest sequence (e.g. {@code "A, 11 more"})
+ * doesn't fit, it will return an empty string.
+ */
+
+ public static CharSequence listEllipsize(@Nullable Context context,
+ @Nullable List<CharSequence> elements, @NonNull String separator,
+ @NonNull TextPaint paint, @FloatRange(from=0.0,fromInclusive=false) float avail,
+ @PluralsRes int moreId) {
+ if (elements == null) {
+ return "";
+ }
+ final int totalLen = elements.size();
+ if (totalLen == 0) {
+ return "";
+ }
+
+ final Resources res;
+ final BidiFormatter bidiFormatter;
+ if (context == null) {
+ res = null;
+ bidiFormatter = BidiFormatter.getInstance();
+ } else {
+ res = context.getResources();
+ bidiFormatter = BidiFormatter.getInstance(res.getConfiguration().getLocales().get(0));
+ }
+
+ final SpannableStringBuilder output = new SpannableStringBuilder();
+ final int[] endIndexes = new int[totalLen];
+ for (int i = 0; i < totalLen; i++) {
+ output.append(bidiFormatter.unicodeWrap(elements.get(i)));
+ if (i != totalLen - 1) { // Insert a separator, except at the very end.
+ output.append(separator);
+ }
+ endIndexes[i] = output.length();
+ }
+
+ for (int i = totalLen - 1; i >= 0; i--) {
+ // Delete the tail of the string, cutting back to one less element.
+ output.delete(endIndexes[i], output.length());
+
+ final int remainingElements = totalLen - i - 1;
+ if (remainingElements > 0) {
+ CharSequence morePiece = (res == null) ?
+ ELLIPSIS_STRING :
+ res.getQuantityString(moreId, remainingElements, remainingElements);
+ morePiece = bidiFormatter.unicodeWrap(morePiece);
+ output.append(morePiece);
+ }
+
+ final float width = paint.measureText(output, 0, output.length());
+ if (width <= avail) { // The string fits.
+ return output;
+ }
+ }
+ return ""; // Nothing fits.
+ }
+
+ /**
* Converts a CharSequence of the comma-separated form "Andy, Bob,
* Charles, David" that is too wide to fit into the specified width
* into one like "Andy, Bob, 2 more".
*
* @param text the text to truncate
* @param p the Paint with which to measure the text
- * @param avail the horizontal width available for the text
+ * @param avail the horizontal width available for the text (in pixels)
* @param oneMore the string for "1 more" in the current locale
* @param more the string for "%d more" in the current locale
+ *
+ * @deprecated Do not use. This is not internationalized, and has known issues
+ * with right-to-left text, languages that have more than one plural form, languages
+ * that use a different character as a comma-like separator, etc.
+ * Use {@link #listEllipsize} instead.
*/
+ @Deprecated
public static CharSequence commaEllipsize(CharSequence text,
TextPaint p, float avail,
String oneMore,
@@ -1212,6 +1304,7 @@
/**
* @hide
*/
+ @Deprecated
public static CharSequence commaEllipsize(CharSequence text, TextPaint p,
float avail, String oneMore, String more, TextDirectionHeuristic textDir) {
diff --git a/core/java/android/text/method/BaseKeyListener.java b/core/java/android/text/method/BaseKeyListener.java
index b618f4e..14e0b4f 100644
--- a/core/java/android/text/method/BaseKeyListener.java
+++ b/core/java/android/text/method/BaseKeyListener.java
@@ -129,8 +129,8 @@
// The offset is immediately before a variation selector.
final int STATE_BEFORE_VS = 6;
- // The offset is immediately before a ZWJ emoji.
- final int STATE_BEFORE_ZWJ_EMOJI = 7;
+ // The offset is immediately before an emoji.
+ final int STATE_BEFORE_EMOJI = 7;
// The offset is immediately before a ZWJ that were seen before a ZWJ emoji.
final int STATE_BEFORE_ZWJ = 8;
// The offset is immediately before a variation selector and a ZWJ that were seen before a
@@ -169,7 +169,7 @@
} else if (codePoint == Emoji.COMBINING_ENCLOSING_KEYCAP) {
state = STATE_BEFORE_KEYCAP;
} else if (Emoji.isEmoji(codePoint)) {
- state = STATE_BEFORE_ZWJ_EMOJI;
+ state = STATE_BEFORE_EMOJI;
} else {
state = STATE_FINISHED;
}
@@ -233,7 +233,7 @@
case STATE_BEFORE_VS:
if (Emoji.isEmoji(codePoint)) {
deleteCharCount += Character.charCount(codePoint);
- state = STATE_BEFORE_ZWJ_EMOJI;
+ state = STATE_BEFORE_EMOJI;
break;
}
@@ -243,7 +243,7 @@
}
state = STATE_FINISHED;
break;
- case STATE_BEFORE_ZWJ_EMOJI:
+ case STATE_BEFORE_EMOJI:
if (codePoint == Emoji.ZERO_WIDTH_JOINER) {
state = STATE_BEFORE_ZWJ;
} else {
@@ -253,7 +253,8 @@
case STATE_BEFORE_ZWJ:
if (Emoji.isEmoji(codePoint)) {
deleteCharCount += Character.charCount(codePoint) + 1; // +1 for ZWJ.
- state = STATE_BEFORE_ZWJ_EMOJI;
+ state = Emoji.isEmojiModifier(codePoint) ?
+ STATE_BEFORE_EMOJI_MODIFIER : STATE_BEFORE_EMOJI;
} else if (isVariationSelector(codePoint)) {
lastSeenVSCharCount = Character.charCount(codePoint);
state = STATE_BEFORE_VS_AND_ZWJ;
@@ -266,7 +267,7 @@
// +1 for ZWJ.
deleteCharCount += lastSeenVSCharCount + 1 + Character.charCount(codePoint);
lastSeenVSCharCount = 0;
- state = STATE_BEFORE_ZWJ_EMOJI;
+ state = STATE_BEFORE_EMOJI;
} else {
state = STATE_FINISHED;
}
diff --git a/core/java/android/text/method/WordIterator.java b/core/java/android/text/method/WordIterator.java
index 664d1ea..89ed08c 100644
--- a/core/java/android/text/method/WordIterator.java
+++ b/core/java/android/text/method/WordIterator.java
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2011 The Android Open Source Project
*
@@ -17,10 +16,11 @@
package android.text.method;
-import android.text.Selection;
-import android.text.SpannableStringBuilder;
-
+import android.annotation.NonNull;
import android.icu.text.BreakIterator;
+import android.text.Selection;
+import android.text.CharSequenceCharacterIterator;
+
import java.util.Locale;
/**
@@ -35,10 +35,9 @@
// Size of the window for the word iterator, should be greater than the longest word's length
private static final int WINDOW_WIDTH = 50;
- private String mString;
- private int mOffsetShift;
-
- private BreakIterator mIterator;
+ private int mStart, mEnd;
+ private CharSequence mCharSeq;
+ private final BreakIterator mIterator;
/**
* Constructs a WordIterator using the default locale.
@@ -49,57 +48,49 @@
/**
* Constructs a new WordIterator for the specified locale.
- * @param locale The locale to be used when analysing the text.
+ * @param locale The locale to be used for analyzing the text.
*/
public WordIterator(Locale locale) {
mIterator = BreakIterator.getWordInstance(locale);
}
- public void setCharSequence(CharSequence charSequence, int start, int end) {
- mOffsetShift = Math.max(0, start - WINDOW_WIDTH);
- final int windowEnd = Math.min(charSequence.length(), end + WINDOW_WIDTH);
-
- if (charSequence instanceof SpannableStringBuilder) {
- mString = ((SpannableStringBuilder) charSequence).substring(mOffsetShift, windowEnd);
+ public void setCharSequence(@NonNull CharSequence charSequence, int start, int end) {
+ if (0 <= start && end <= charSequence.length()) {
+ mCharSeq = charSequence;
+ mStart = Math.max(0, start - WINDOW_WIDTH);
+ mEnd = Math.min(charSequence.length(), end + WINDOW_WIDTH);
+ mIterator.setText(new CharSequenceCharacterIterator(charSequence, mStart, mEnd));
} else {
- mString = charSequence.subSequence(mOffsetShift, windowEnd).toString();
+ throw new IndexOutOfBoundsException("input indexes are outside the CharSequence");
}
- mIterator.setText(mString);
}
/** {@inheritDoc} */
public int preceding(int offset) {
- int shiftedOffset = offset - mOffsetShift;
- do {
- shiftedOffset = mIterator.preceding(shiftedOffset);
- if (shiftedOffset == BreakIterator.DONE) {
- return BreakIterator.DONE;
+ checkOffsetIsValid(offset);
+ while (true) {
+ offset = mIterator.preceding(offset);
+ if (offset == BreakIterator.DONE || isOnLetterOrDigit(offset)) {
+ return offset;
}
- if (isOnLetterOrDigit(shiftedOffset)) {
- return shiftedOffset + mOffsetShift;
- }
- } while (true);
+ }
}
/** {@inheritDoc} */
public int following(int offset) {
- int shiftedOffset = offset - mOffsetShift;
- do {
- shiftedOffset = mIterator.following(shiftedOffset);
- if (shiftedOffset == BreakIterator.DONE) {
- return BreakIterator.DONE;
+ checkOffsetIsValid(offset);
+ while (true) {
+ offset = mIterator.following(offset);
+ if (offset == BreakIterator.DONE || isAfterLetterOrDigit(offset)) {
+ return offset;
}
- if (isAfterLetterOrDigit(shiftedOffset)) {
- return shiftedOffset + mOffsetShift;
- }
- } while (true);
+ }
}
/** {@inheritDoc} */
public boolean isBoundary(int offset) {
- int shiftedOffset = offset - mOffsetShift;
- checkOffsetIsValid(shiftedOffset);
- return mIterator.isBoundary(shiftedOffset);
+ checkOffsetIsValid(offset);
+ return mIterator.isBoundary(offset);
}
/**
@@ -110,12 +101,8 @@
* @return the position of the last boundary preceding the given offset.
*/
public int nextBoundary(int offset) {
- int shiftedOffset = offset - mOffsetShift;
- shiftedOffset = mIterator.following(shiftedOffset);
- if (shiftedOffset == BreakIterator.DONE) {
- return BreakIterator.DONE;
- }
- return shiftedOffset + mOffsetShift;
+ checkOffsetIsValid(offset);
+ return mIterator.following(offset);
}
/**
@@ -126,12 +113,8 @@
* @return the position of the last boundary preceding the given offset.
*/
public int prevBoundary(int offset) {
- int shiftedOffset = offset - mOffsetShift;
- shiftedOffset = mIterator.preceding(shiftedOffset);
- if (shiftedOffset == BreakIterator.DONE) {
- return BreakIterator.DONE;
- }
- return shiftedOffset + mOffsetShift;
+ checkOffsetIsValid(offset);
+ return mIterator.preceding(offset);
}
/** If <code>offset</code> is within a word, returns the index of the first character of that
@@ -224,20 +207,19 @@
* @throws IllegalArgumentException is offset is not valid.
*/
private int getBeginning(int offset, boolean getPrevWordBeginningOnTwoWordsBoundary) {
- final int shiftedOffset = offset - mOffsetShift;
- checkOffsetIsValid(shiftedOffset);
+ checkOffsetIsValid(offset);
- if (isOnLetterOrDigit(shiftedOffset)) {
- if (mIterator.isBoundary(shiftedOffset)
- && (!isAfterLetterOrDigit(shiftedOffset)
+ if (isOnLetterOrDigit(offset)) {
+ if (mIterator.isBoundary(offset)
+ && (!isAfterLetterOrDigit(offset)
|| !getPrevWordBeginningOnTwoWordsBoundary)) {
- return shiftedOffset + mOffsetShift;
+ return offset;
} else {
- return mIterator.preceding(shiftedOffset) + mOffsetShift;
+ return mIterator.preceding(offset);
}
} else {
- if (isAfterLetterOrDigit(shiftedOffset)) {
- return mIterator.preceding(shiftedOffset) + mOffsetShift;
+ if (isAfterLetterOrDigit(offset)) {
+ return mIterator.preceding(offset);
}
}
return BreakIterator.DONE;
@@ -260,19 +242,18 @@
* @throws IllegalArgumentException is offset is not valid.
*/
private int getEnd(int offset, boolean getNextWordEndOnTwoWordBoundary) {
- final int shiftedOffset = offset - mOffsetShift;
- checkOffsetIsValid(shiftedOffset);
+ checkOffsetIsValid(offset);
- if (isAfterLetterOrDigit(shiftedOffset)) {
- if (mIterator.isBoundary(shiftedOffset)
- && (!isOnLetterOrDigit(shiftedOffset) || !getNextWordEndOnTwoWordBoundary)) {
- return shiftedOffset + mOffsetShift;
+ if (isAfterLetterOrDigit(offset)) {
+ if (mIterator.isBoundary(offset)
+ && (!isOnLetterOrDigit(offset) || !getNextWordEndOnTwoWordBoundary)) {
+ return offset;
} else {
- return mIterator.following(shiftedOffset) + mOffsetShift;
+ return mIterator.following(offset);
}
} else {
- if (isOnLetterOrDigit(shiftedOffset)) {
- return mIterator.following(shiftedOffset) + mOffsetShift;
+ if (isOnLetterOrDigit(offset)) {
+ return mIterator.following(offset);
}
}
return BreakIterator.DONE;
@@ -286,6 +267,7 @@
* @param offset the offset to search from.
*/
public int getPunctuationBeginning(int offset) {
+ checkOffsetIsValid(offset);
while (offset != BreakIterator.DONE && !isPunctuationStartBoundary(offset)) {
offset = prevBoundary(offset);
}
@@ -301,6 +283,7 @@
* @param offset the offset to search from.
*/
public int getPunctuationEnd(int offset) {
+ checkOffsetIsValid(offset);
while (offset != BreakIterator.DONE && !isPunctuationEndBoundary(offset)) {
offset = nextBoundary(offset);
}
@@ -316,9 +299,8 @@
* @return Whether the offset is after a punctuation character.
*/
public boolean isAfterPunctuation(int offset) {
- final int shiftedOffset = offset - mOffsetShift;
- if (shiftedOffset >= 1 && shiftedOffset <= mString.length()) {
- final int codePoint = mString.codePointBefore(shiftedOffset);
+ if (mStart < offset && offset <= mEnd) {
+ final int codePoint = Character.codePointBefore(mCharSeq, offset);
return isPunctuation(codePoint);
}
return false;
@@ -332,9 +314,8 @@
* @return Whether the offset is at a punctuation character.
*/
public boolean isOnPunctuation(int offset) {
- final int shiftedOffset = offset - mOffsetShift;
- if (shiftedOffset >= 0 && shiftedOffset < mString.length()) {
- final int codePoint = mString.codePointAt(shiftedOffset);
+ if (mStart <= offset && offset < mEnd) {
+ final int codePoint = Character.codePointAt(mCharSeq, offset);
return isPunctuation(codePoint);
}
return false;
@@ -348,8 +329,8 @@
return !isOnPunctuation(offset) && isAfterPunctuation(offset);
}
- private boolean isPunctuation(int cp) {
- int type = Character.getType(cp);
+ private static boolean isPunctuation(int cp) {
+ final int type = Character.getType(cp);
return (type == Character.CONNECTOR_PUNCTUATION ||
type == Character.DASH_PUNCTUATION ||
type == Character.END_PUNCTUATION ||
@@ -359,27 +340,26 @@
type == Character.START_PUNCTUATION);
}
- private boolean isAfterLetterOrDigit(int shiftedOffset) {
- if (shiftedOffset >= 1 && shiftedOffset <= mString.length()) {
- final int codePoint = mString.codePointBefore(shiftedOffset);
+ private boolean isAfterLetterOrDigit(int offset) {
+ if (mStart < offset && offset <= mEnd) {
+ final int codePoint = Character.codePointBefore(mCharSeq, offset);
if (Character.isLetterOrDigit(codePoint)) return true;
}
return false;
}
- private boolean isOnLetterOrDigit(int shiftedOffset) {
- if (shiftedOffset >= 0 && shiftedOffset < mString.length()) {
- final int codePoint = mString.codePointAt(shiftedOffset);
+ private boolean isOnLetterOrDigit(int offset) {
+ if (mStart <= offset && offset < mEnd) {
+ final int codePoint = Character.codePointAt(mCharSeq, offset);
if (Character.isLetterOrDigit(codePoint)) return true;
}
return false;
}
- private void checkOffsetIsValid(int shiftedOffset) {
- if (shiftedOffset < 0 || shiftedOffset > mString.length()) {
- throw new IllegalArgumentException("Invalid offset: " + (shiftedOffset + mOffsetShift) +
- ". Valid range is [" + mOffsetShift + ", " + (mString.length() + mOffsetShift) +
- "]");
+ private void checkOffsetIsValid(int offset) {
+ if (!(mStart <= offset && offset <= mEnd)) {
+ throw new IllegalArgumentException("Invalid offset: " + (offset) +
+ ". Valid range is [" + mStart + ", " + mEnd + "]");
}
}
}
diff --git a/core/java/android/transition/ChangeScroll.java b/core/java/android/transition/ChangeScroll.java
index 5a78b94..e092685 100644
--- a/core/java/android/transition/ChangeScroll.java
+++ b/core/java/android/transition/ChangeScroll.java
@@ -34,6 +34,11 @@
private static final String PROPNAME_SCROLL_X = "android:changeScroll:x";
private static final String PROPNAME_SCROLL_Y = "android:changeScroll:y";
+ private static final String[] PROPERTIES = {
+ PROPNAME_SCROLL_X,
+ PROPNAME_SCROLL_Y,
+ };
+
public ChangeScroll() {}
public ChangeScroll(Context context, AttributeSet attrs) {
@@ -50,6 +55,11 @@
captureValues(transitionValues);
}
+ @Override
+ public String[] getTransitionProperties() {
+ return PROPERTIES;
+ }
+
private void captureValues(TransitionValues transitionValues) {
transitionValues.values.put(PROPNAME_SCROLL_X, transitionValues.view.getScrollX());
transitionValues.values.put(PROPNAME_SCROLL_Y, transitionValues.view.getScrollY());
diff --git a/core/java/android/util/ArraySet.java b/core/java/android/util/ArraySet.java
index 9e9314f..1e765b6 100644
--- a/core/java/android/util/ArraySet.java
+++ b/core/java/android/util/ArraySet.java
@@ -390,6 +390,35 @@
}
/**
+ * Special fast path for appending items to the end of the array without validation.
+ * The array must already be large enough to contain the item.
+ * @hide
+ */
+ public void append(E value) {
+ final int index = mSize;
+ final int hash = value == null ? 0
+ : (mIdentityHashCode ? System.identityHashCode(value) : value.hashCode());
+ if (index >= mHashes.length) {
+ throw new IllegalStateException("Array is full");
+ }
+ if (index > 0 && mHashes[index - 1] > hash) {
+ // Cannot optimize since it would break the sorted order - fallback to add()
+ if (DEBUG) {
+ RuntimeException e = new RuntimeException("here");
+ e.fillInStackTrace();
+ Log.w(TAG, "New hash " + hash
+ + " is before end of array hash " + mHashes[index - 1]
+ + " at index " + index, e);
+ }
+ add(value);
+ return;
+ }
+ mSize = index + 1;
+ mHashes[index] = hash;
+ mArray[index] = value;
+ }
+
+ /**
* Perform a {@link #add(Object)} of all values in <var>array</var>
* @param array The array whose contents are to be retrieved.
*/
diff --git a/core/java/android/util/LongSparseArray.java b/core/java/android/util/LongSparseArray.java
index 6b45ff4..58ad2fd 100644
--- a/core/java/android/util/LongSparseArray.java
+++ b/core/java/android/util/LongSparseArray.java
@@ -299,10 +299,39 @@
gc();
}
- for (int i = 0; i < mSize; i++)
- if (mValues[i] == value)
+ for (int i = 0; i < mSize; i++) {
+ if (mValues[i] == value) {
return i;
+ }
+ }
+ return -1;
+ }
+ /**
+ * Returns an index for which {@link #valueAt} would return the
+ * specified key, or a negative number if no keys map to the
+ * specified value.
+ * <p>Beware that this is a linear search, unlike lookups by key,
+ * and that multiple keys can map to the same value and this will
+ * find only one of them.
+ * <p>Note also that this method uses {@code equals} unlike {@code indexOfValue}.
+ */
+ public int indexOfValueByValue(E value) {
+ if (mGarbage) {
+ gc();
+ }
+
+ for (int i = 0; i < mSize; i++) {
+ if (value == null) {
+ if (mValues[i] == null) {
+ return i;
+ }
+ } else {
+ if (value.equals(mValues[i])) {
+ return i;
+ }
+ }
+ }
return -1;
}
diff --git a/core/java/android/util/SparseArray.java b/core/java/android/util/SparseArray.java
index 34e6f04..c766660 100644
--- a/core/java/android/util/SparseArray.java
+++ b/core/java/android/util/SparseArray.java
@@ -346,14 +346,44 @@
gc();
}
- for (int i = 0; i < mSize; i++)
- if (mValues[i] == value)
+ for (int i = 0; i < mSize; i++) {
+ if (mValues[i] == value) {
return i;
+ }
+ }
return -1;
}
/**
+ * Returns an index for which {@link #valueAt} would return the
+ * specified key, or a negative number if no keys map to the
+ * specified value.
+ * <p>Beware that this is a linear search, unlike lookups by key,
+ * and that multiple keys can map to the same value and this will
+ * find only one of them.
+ * <p>Note also that this method uses {@code equals} unlike {@code indexOfValue}.
+ */
+ public int indexOfValueByValue(E value) {
+ if (mGarbage) {
+ gc();
+ }
+
+ for (int i = 0; i < mSize; i++) {
+ if (value == null) {
+ if (mValues[i] == null) {
+ return i;
+ }
+ } else {
+ if (value.equals(mValues[i])) {
+ return i;
+ }
+ }
+ }
+ return -1;
+ }
+
+ /**
* Removes all key-value mappings from this SparseArray.
*/
public void clear() {
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 2f2fe57..85a4bf9 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -36,7 +36,7 @@
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays;
-import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_TRANSFORM;
+import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE;
/**
* Provides information about the size and density of a logical display.
@@ -284,6 +284,27 @@
*/
public static final int STATE_DOZE_SUSPEND = 4;
+ /* The color mode constants defined below must be kept in sync with the ones in
+ * system/graphics.h */
+
+ /**
+ * Display color mode: The current color mode is unknown or invalid.
+ * @hide
+ */
+ public static final int COLOR_MODE_INVALID = -1;
+
+ /**
+ * Display color mode: The default or native gamut of the display.
+ * @hide
+ */
+ public static final int COLOR_MODE_DEFAULT = 0;
+
+ /**
+ * Display color mode: SRGB
+ * @hide
+ */
+ public static final int COLOR_MODE_SRGB = 7;
+
/**
* Internal method to create a display.
* Applications should use {@link android.view.WindowManager#getDefaultDisplay()}
@@ -463,20 +484,29 @@
/**
* Gets the size of the display, in pixels.
+ * Value returned by this method does not necessarily represent the actual raw size
+ * (native resolution) of the display.
* <p>
- * Note that this value should <em>not</em> be used for computing layouts,
- * since a device will typically have screen decoration (such as a status bar)
- * along the edges of the display that reduce the amount of application
- * space available from the size returned here. Layouts should instead use
- * the window size.
+ * 1. The returned size may be adjusted to exclude certain system decor elements
+ * that are always visible.
* </p><p>
- * The size is adjusted based on the current rotation of the display.
- * </p><p>
- * The size returned by this method does not necessarily represent the
- * actual raw size (native resolution) of the display. The returned size may
- * be adjusted to exclude certain system decoration elements that are always visible.
- * It may also be scaled to provide compatibility with older applications that
+ * 2. It may be scaled to provide compatibility with older applications that
* were originally designed for smaller displays.
+ * </p><p>
+ * 3. It can be different depending on the WindowManager to which the display belongs.
+ * </p><p>
+ * - If requested from non-Activity context (e.g. Application context via
+ * {@code (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE)})
+ * it will report the size of the entire display based on current rotation and with subtracted
+ * system decoration areas.
+ * </p><p>
+ * - If requested from activity (either using {@code getWindowManager()} or
+ * {@code (WindowManager) getSystemService(Context.WINDOW_SERVICE)}) resulting size will
+ * correspond to current app window size. In this case it can be smaller than physical size in
+ * multi-window mode.
+ * </p><p>
+ * Typically for the purposes of layout apps should make a request from activity context
+ * to obtain size available for the app content.
* </p>
*
* @param outSize A {@link Point} object to receive the size information.
@@ -687,33 +717,22 @@
}
/**
- * Request the display applies a color transform.
+ * Request the display applies a color mode.
* @hide
*/
- @RequiresPermission(CONFIGURE_DISPLAY_COLOR_TRANSFORM)
- public void requestColorTransform(ColorTransform colorTransform) {
- mGlobal.requestColorTransform(mDisplayId, colorTransform.getId());
+ @RequiresPermission(CONFIGURE_DISPLAY_COLOR_MODE)
+ public void requestColorMode(int colorMode) {
+ mGlobal.requestColorMode(mDisplayId, colorMode);
}
/**
- * Returns the active color transform of this display
+ * Returns the active color mode of this display
* @hide
*/
- public ColorTransform getColorTransform() {
+ public int getColorMode() {
synchronized (this) {
updateDisplayInfoLocked();
- return mDisplayInfo.getColorTransform();
- }
- }
-
- /**
- * Returns the default color transform of this display
- * @hide
- */
- public ColorTransform getDefaultColorTransform() {
- synchronized (this) {
- updateDisplayInfoLocked();
- return mDisplayInfo.getDefaultColorTransform();
+ return mDisplayInfo.colorMode;
}
}
@@ -728,14 +747,14 @@
}
/**
- * Gets the supported color transforms of this device.
+ * Gets the supported color modes of this device.
* @hide
*/
- public ColorTransform[] getSupportedColorTransforms() {
+ public int[] getSupportedColorModes() {
synchronized (this) {
updateDisplayInfoLocked();
- ColorTransform[] transforms = mDisplayInfo.supportedColorTransforms;
- return Arrays.copyOf(transforms, transforms.length);
+ int[] colorModes = mDisplayInfo.supportedColorModes;
+ return Arrays.copyOf(colorModes, colorModes.length);
}
}
@@ -785,13 +804,16 @@
* were originally designed for smaller displays.
* </p><p>
* 3. It can be different depending on the WindowManager to which the display belongs.
- * <pre>
+ * </p><p>
* - If requested from non-Activity context (e.g. Application context via
* {@code (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE)})
- * metrics will report real size of the display based on current rotation.
- * - If requested from activity resulting metrics will correspond to current window metrics.
- * In this case the size can be smaller than physical size in multi-window mode.
- * </pre>
+ * metrics will report the size of the entire display based on current rotation and with
+ * subtracted system decoration areas.
+ * </p><p>
+ * - If requested from activity (either using {@code getWindowManager()} or
+ * {@code (WindowManager) getSystemService(Context.WINDOW_SERVICE)}) resulting metrics will
+ * correspond to current app window metrics. In this case the size can be smaller than physical
+ * size in multi-window mode.
* </p>
*
* @param outMetrics A {@link DisplayMetrics} object to receive the metrics.
@@ -1205,6 +1227,33 @@
return mMinLuminance;
}
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (!(other instanceof HdrCapabilities)) {
+ return false;
+ }
+ HdrCapabilities that = (HdrCapabilities) other;
+
+ return Arrays.equals(mSupportedHdrTypes, that.mSupportedHdrTypes)
+ && mMaxLuminance == that.mMaxLuminance
+ && mMaxAverageLuminance == that.mMaxAverageLuminance
+ && mMinLuminance == that.mMinLuminance;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 23;
+ hash = hash * 17 + Arrays.hashCode(mSupportedHdrTypes);
+ hash = hash * 17 + Float.floatToIntBits(mMaxLuminance);
+ hash = hash * 17 + Float.floatToIntBits(mMaxAverageLuminance);
+ hash = hash * 17 + Float.floatToIntBits(mMinLuminance);
+ return hash;
+ }
+
public static final Creator<HdrCapabilities> CREATOR = new Creator<HdrCapabilities>() {
@Override
public HdrCapabilities createFromParcel(Parcel source) {
@@ -1251,89 +1300,4 @@
return 0;
}
}
-
- /**
- * A color transform supported by a given display.
- *
- * @see Display#getSupportedColorTransforms()
- * @hide
- */
- public static final class ColorTransform implements Parcelable {
- public static final ColorTransform[] EMPTY_ARRAY = new ColorTransform[0];
-
- private final int mId;
- private final int mColorTransform;
-
- public ColorTransform(int id, int colorTransform) {
- mId = id;
- mColorTransform = colorTransform;
- }
-
- public int getId() {
- return mId;
- }
-
- public int getColorTransform() {
- return mColorTransform;
- }
-
- @Override
- public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (!(other instanceof ColorTransform)) {
- return false;
- }
- ColorTransform that = (ColorTransform) other;
- return mId == that.mId
- && mColorTransform == that.mColorTransform;
- }
-
- @Override
- public int hashCode() {
- int hash = 1;
- hash = hash * 17 + mId;
- hash = hash * 17 + mColorTransform;
- return hash;
- }
-
- @Override
- public String toString() {
- return new StringBuilder("{")
- .append("id=").append(mId)
- .append(", colorTransform=").append(mColorTransform)
- .append("}")
- .toString();
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- private ColorTransform(Parcel in) {
- this(in.readInt(), in.readInt());
- }
-
- @Override
- public void writeToParcel(Parcel out, int parcelableFlags) {
- out.writeInt(mId);
- out.writeInt(mColorTransform);
- }
-
- @SuppressWarnings("hiding")
- public static final Parcelable.Creator<ColorTransform> CREATOR
- = new Parcelable.Creator<ColorTransform>() {
- @Override
- public ColorTransform createFromParcel(Parcel in) {
- return new ColorTransform(in);
- }
-
- @Override
- public ColorTransform[] newArray(int size) {
- return new ColorTransform[size];
- }
- };
- }
}
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 8aeeffd..bc40849 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -169,14 +169,11 @@
*/
public Display.Mode[] supportedModes = Display.Mode.EMPTY_ARRAY;
- /** The active color transform. */
- public int colorTransformId;
+ /** The active color mode. */
+ public int colorMode;
- /** The default color transform. */
- public int defaultColorTransformId;
-
- /** The list of supported color transforms */
- public Display.ColorTransform[] supportedColorTransforms = Display.ColorTransform.EMPTY_ARRAY;
+ /** The list of supported color modes */
+ public int[] supportedColorModes = { Display.COLOR_MODE_DEFAULT };
/** The display's HDR capabilities */
public Display.HdrCapabilities hdrCapabilities;
@@ -291,8 +288,8 @@
&& rotation == other.rotation
&& modeId == other.modeId
&& defaultModeId == other.defaultModeId
- && colorTransformId == other.colorTransformId
- && defaultColorTransformId == other.defaultColorTransformId
+ && colorMode == other.colorMode
+ && Arrays.equals(supportedColorModes, other.supportedColorModes)
&& Objects.equal(hdrCapabilities, other.hdrCapabilities)
&& logicalDensityDpi == other.logicalDensityDpi
&& physicalXDpi == other.physicalXDpi
@@ -332,10 +329,9 @@
modeId = other.modeId;
defaultModeId = other.defaultModeId;
supportedModes = Arrays.copyOf(other.supportedModes, other.supportedModes.length);
- colorTransformId = other.colorTransformId;
- defaultColorTransformId = other.defaultColorTransformId;
- supportedColorTransforms = Arrays.copyOf(
- other.supportedColorTransforms, other.supportedColorTransforms.length);
+ colorMode = other.colorMode;
+ supportedColorModes = Arrays.copyOf(
+ other.supportedColorModes, other.supportedColorModes.length);
hdrCapabilities = other.hdrCapabilities;
logicalDensityDpi = other.logicalDensityDpi;
physicalXDpi = other.physicalXDpi;
@@ -373,12 +369,11 @@
for (int i = 0; i < nModes; i++) {
supportedModes[i] = Display.Mode.CREATOR.createFromParcel(source);
}
- colorTransformId = source.readInt();
- defaultColorTransformId = source.readInt();
- int nColorTransforms = source.readInt();
- supportedColorTransforms = new Display.ColorTransform[nColorTransforms];
- for (int i = 0; i < nColorTransforms; i++) {
- supportedColorTransforms[i] = Display.ColorTransform.CREATOR.createFromParcel(source);
+ colorMode = source.readInt();
+ int nColorModes = source.readInt();
+ supportedColorModes = new int[nColorModes];
+ for (int i = 0; i < nColorModes; i++) {
+ supportedColorModes[i] = source.readInt();
}
hdrCapabilities = source.readParcelable(null);
logicalDensityDpi = source.readInt();
@@ -418,11 +413,10 @@
for (int i = 0; i < supportedModes.length; i++) {
supportedModes[i].writeToParcel(dest, flags);
}
- dest.writeInt(colorTransformId);
- dest.writeInt(defaultColorTransformId);
- dest.writeInt(supportedColorTransforms.length);
- for (int i = 0; i < supportedColorTransforms.length; i++) {
- supportedColorTransforms[i].writeToParcel(dest, flags);
+ dest.writeInt(colorMode);
+ dest.writeInt(supportedColorModes.length);
+ for (int i = 0; i < supportedColorModes.length; i++) {
+ dest.writeInt(supportedColorModes[i]);
}
dest.writeParcelable(hdrCapabilities, flags);
dest.writeInt(logicalDensityDpi);
@@ -496,24 +490,6 @@
return result;
}
- public Display.ColorTransform getColorTransform() {
- return findColorTransform(colorTransformId);
- }
-
- public Display.ColorTransform getDefaultColorTransform() {
- return findColorTransform(defaultColorTransformId);
- }
-
- private Display.ColorTransform findColorTransform(int colorTransformId) {
- for (int i = 0; i < supportedColorTransforms.length; i++) {
- Display.ColorTransform colorTransform = supportedColorTransforms[i];
- if (colorTransform.getId() == colorTransformId) {
- return colorTransform;
- }
- }
- throw new IllegalStateException("Unable to locate color transform: " + colorTransformId);
- }
-
public void getAppMetrics(DisplayMetrics outMetrics) {
getAppMetrics(outMetrics, CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);
}
@@ -615,12 +591,10 @@
sb.append(defaultModeId);
sb.append(", modes ");
sb.append(Arrays.toString(supportedModes));
- sb.append(", colorTransformId ");
- sb.append(colorTransformId);
- sb.append(", defaultColorTransformId ");
- sb.append(defaultColorTransformId);
- sb.append(", supportedColorTransforms ");
- sb.append(Arrays.toString(supportedColorTransforms));
+ sb.append(", colorMode ");
+ sb.append(colorMode);
+ sb.append(", supportedColorModes ");
+ sb.append(Arrays.toString(supportedColorModes));
sb.append(", hdrCapabilities ");
sb.append(hdrCapabilities);
sb.append(", rotation ");
diff --git a/core/java/android/view/DisplayListCanvas.java b/core/java/android/view/DisplayListCanvas.java
index cb7c5a2..44d7a86 100644
--- a/core/java/android/view/DisplayListCanvas.java
+++ b/core/java/android/view/DisplayListCanvas.java
@@ -25,7 +25,7 @@
import android.util.Pools.SynchronizedPool;
/**
- * An implementation of a GL canvas that records drawing operations.
+ * A Canvas implementation that records view system drawing operations for deferred rendering.
* This is intended for use with a DisplayList. This class keeps a list of all the Paint and
* Bitmap objects that it draws, preventing the backing memory of Bitmaps from being freed while
* the DisplayList is still holding a native reference to the memory.
@@ -75,17 +75,6 @@
}
///////////////////////////////////////////////////////////////////////////
- // JNI
- ///////////////////////////////////////////////////////////////////////////
-
- private static native boolean nIsAvailable();
- private static boolean sIsAvailable = nIsAvailable();
-
- static boolean isAvailable() {
- return sIsAvailable;
- }
-
- ///////////////////////////////////////////////////////////////////////////
// Constructors
///////////////////////////////////////////////////////////////////////////
diff --git a/core/java/android/view/DragAndDropPermissions.java b/core/java/android/view/DragAndDropPermissions.java
index 71afaaa..c198e1f 100644
--- a/core/java/android/view/DragAndDropPermissions.java
+++ b/core/java/android/view/DragAndDropPermissions.java
@@ -17,7 +17,7 @@
package android.view;
import android.app.Activity;
-import android.app.ActivityManagerNative;
+import android.os.Binder;
import android.os.IBinder;
import android.os.Parcel;
import android.os.Parcelable;
@@ -54,7 +54,7 @@
private final IDragAndDropPermissions mDragAndDropPermissions;
- private IBinder mPermissionOwnerToken;
+ private IBinder mTransientToken;
/**
* Create a new {@link DragAndDropPermissions} object to control the access permissions for
@@ -98,9 +98,8 @@
*/
public boolean takeTransient() {
try {
- mPermissionOwnerToken = ActivityManagerNative.getDefault().
- newUriPermissionOwner("drop");
- mDragAndDropPermissions.takeTransient(mPermissionOwnerToken);
+ mTransientToken = new Binder();
+ mDragAndDropPermissions.takeTransient(mTransientToken);
} catch (RemoteException e) {
return false;
}
@@ -113,7 +112,7 @@
public void release() {
try {
mDragAndDropPermissions.release();
- mPermissionOwnerToken = null;
+ mTransientToken = null;
} catch (RemoteException e) {
}
}
@@ -139,11 +138,11 @@
@Override
public void writeToParcel(Parcel destination, int flags) {
destination.writeStrongInterface(mDragAndDropPermissions);
- destination.writeStrongBinder(mPermissionOwnerToken);
+ destination.writeStrongBinder(mTransientToken);
}
private DragAndDropPermissions(Parcel in) {
mDragAndDropPermissions = IDragAndDropPermissions.Stub.asInterface(in.readStrongBinder());
- mPermissionOwnerToken = in.readStrongBinder();
+ mTransientToken = in.readStrongBinder();
}
}
diff --git a/core/java/android/view/DragEvent.java b/core/java/android/view/DragEvent.java
index fb482b4..b0f15b5 100644
--- a/core/java/android/view/DragEvent.java
+++ b/core/java/android/view/DragEvent.java
@@ -102,8 +102,8 @@
* </tr>
* <tr>
* <td>ACTION_DRAG_ENDED</td>
- * <td style="text-align: center;">X</td>
- * <td style="text-align: center;">X</td>
+ * <td style="text-align: center;"> </td>
+ * <td style="text-align: center;"> </td>
* <td style="text-align: center;"> </td>
* <td style="text-align: center;"> </td>
* <td style="text-align: center;"> </td>
@@ -359,7 +359,7 @@
* The drag handler or listener for a View can use the metadata in this object to decide if the
* View can accept the dragged View object's data.
* <p>
- * This method returns valid data for all event actions.
+ * This method returns valid data for all event actions except for {@link #ACTION_DRAG_ENDED}.
* @return The ClipDescription that was part of the ClipData sent to the system by startDrag().
*/
public ClipDescription getClipDescription() {
@@ -377,7 +377,7 @@
* The object is intended to provide local information about the drag and drop operation. For
* example, it can indicate whether the drag and drop operation is a copy or a move.
* <p>
- * This method returns valid data for all event actions.
+ * This method returns valid data for all event actions except for {@link #ACTION_DRAG_ENDED}.
* </p>
* @return The local state object sent to the system by startDrag().
*/
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 72126d0..3d786f1 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -107,12 +107,14 @@
* they are in.
* @param homeTask True if this is the task.
* @param targetSdkVersion The application's target SDK version
+ * @param isOnTopLauncher True if this task is an on-top launcher.
*/
void addAppToken(int addPos, IApplicationToken token, int taskId, int stackId,
int requestedOrientation, boolean fullscreen, boolean showWhenLocked, int userId,
int configChanges, boolean voiceInteraction, boolean launchTaskBehind,
in Rect taskBounds, in Configuration configuration, int taskResizeMode,
- boolean alwaysFocusable, boolean homeTask, int targetSdkVersion);
+ boolean alwaysFocusable, boolean homeTask, int targetSdkVersion,
+ int rotationAnimationHint, boolean isOnTopLauncher);
/**
*
* @param token The token we are adding to the input task Id.
@@ -124,9 +126,10 @@
* @param config Configuration that is being used with this task.
* @param taskResizeMode The resize mode of the task.
* @param homeTask True if this is the task.
+ * @param isOnTopLauncher True if this task is an on-top launcher.
*/
void setAppTask(IBinder token, int taskId, int stackId, in Rect taskBounds,
- in Configuration config, int taskResizeMode, boolean homeTask);
+ in Configuration config, int taskResizeMode, boolean homeTask, boolean isOnTopLauncher);
void setAppOrientation(IApplicationToken token, int requestedOrientation);
int getAppOrientation(IApplicationToken token);
void setFocusedApp(IBinder token, boolean moveFocusNow);
@@ -173,7 +176,8 @@
in CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,
int icon, int logo, int windowFlags, IBinder transferFrom, boolean createIfNeeded);
void setAppVisibility(IBinder token, boolean visible);
- void notifyAppStopped(IBinder token, boolean stopped);
+ void notifyAppResumed(IBinder token, boolean wasStopped);
+ void notifyAppStopped(IBinder token);
void startAppFreezingScreen(IBinder token, int configChanges);
void stopAppFreezingScreen(IBinder token, boolean force);
void removeAppToken(IBinder token);
@@ -306,6 +310,11 @@
boolean isRotationFrozen();
/**
+ * Screenshot the current wallpaper layer, including the whole screen.
+ */
+ Bitmap screenshotWallpaper();
+
+ /**
* Used only for assist -- request a screenshot of the current application.
*/
boolean requestAssistScreenshot(IAssistScreenshotReceiver receiver);
diff --git a/core/java/android/view/RenderNode.java b/core/java/android/view/RenderNode.java
index 0164fcd..bce5ec1 100644
--- a/core/java/android/view/RenderNode.java
+++ b/core/java/android/view/RenderNode.java
@@ -51,7 +51,7 @@
*
* <h3>Creating a display list</h3>
* <pre class="prettyprint">
- * HardwareRenderer renderer = myView.getHardwareRenderer();
+ * ThreadedRenderer renderer = myView.getThreadedRenderer();
* if (renderer != null) {
* DisplayList displayList = renderer.createDisplayList();
* DisplayListCanvas canvas = displayList.start(width, height);
diff --git a/core/java/android/view/RoundScrollbarRenderer.java b/core/java/android/view/RoundScrollbarRenderer.java
new file mode 100644
index 0000000..b77be8c
--- /dev/null
+++ b/core/java/android/view/RoundScrollbarRenderer.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.view;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Rect;
+
+/**
+ * Helper class for drawing round scroll bars on round Wear devices.
+ */
+class RoundScrollbarRenderer {
+ // The range of the scrollbar position represented as an angle in degrees.
+ private static final int SCROLLBAR_ANGLE_RANGE = 90;
+ private static final int MAX_SCROLLBAR_ANGLE_SWIPE = 16;
+ private static final int MIN_SCROLLBAR_ANGLE_SWIPE = 6;
+ private static final float WIDTH_PERCENTAGE = 0.02f;
+ private static final int DEFAULT_THUMB_COLOR = 0xFF757575;
+ private static final int DEFAULT_TRACK_COLOR = 0x21FFFFFF;
+
+ private final Paint mThumbPaint = new Paint();
+ private final Paint mTrackPaint = new Paint();
+ private final RectF mRect = new RectF();
+ private final View mParent;
+
+ public RoundScrollbarRenderer(View parent) {
+ // Paints for the round scrollbar.
+ // Set up the thumb paint
+ mThumbPaint.setAntiAlias(true);
+ mThumbPaint.setStrokeCap(Paint.Cap.ROUND);
+ mThumbPaint.setStyle(Paint.Style.STROKE);
+
+ // Set up the track paint
+ mTrackPaint.setAntiAlias(true);
+ mTrackPaint.setStrokeCap(Paint.Cap.ROUND);
+ mTrackPaint.setStyle(Paint.Style.STROKE);
+
+ mParent = parent;
+ }
+
+ public void drawRoundScrollbars(Canvas canvas, float alpha, Rect bounds) {
+ if (alpha == 0) {
+ return;
+ }
+ // Get information about the current scroll state of the parent view.
+ float maxScroll = mParent.computeVerticalScrollRange();
+ float scrollExtent = mParent.computeVerticalScrollExtent();
+ if (scrollExtent <= 0 || maxScroll <= scrollExtent) {
+ return;
+ }
+ float currentScroll = Math.max(0, mParent.computeVerticalScrollOffset());
+ float linearThumbLength = mParent.computeVerticalScrollExtent();
+ float thumbWidth = mParent.getWidth() * WIDTH_PERCENTAGE;
+ mThumbPaint.setStrokeWidth(thumbWidth);
+ mTrackPaint.setStrokeWidth(thumbWidth);
+
+ setThumbColor(applyAlpha(DEFAULT_THUMB_COLOR, alpha));
+ setTrackColor(applyAlpha(DEFAULT_TRACK_COLOR, alpha));
+
+ // Normalize the sweep angle for the scroll bar.
+ float sweepAngle = (linearThumbLength / maxScroll) * SCROLLBAR_ANGLE_RANGE;
+ sweepAngle = clamp(sweepAngle, MIN_SCROLLBAR_ANGLE_SWIPE, MAX_SCROLLBAR_ANGLE_SWIPE);
+ // Normalize the start angle so that it falls on the track.
+ float startAngle = (currentScroll * (SCROLLBAR_ANGLE_RANGE - sweepAngle))
+ / (maxScroll - linearThumbLength) - SCROLLBAR_ANGLE_RANGE / 2;
+ startAngle = clamp(startAngle, -SCROLLBAR_ANGLE_RANGE / 2,
+ SCROLLBAR_ANGLE_RANGE / 2 - sweepAngle);
+
+ // Draw the track and the scroll bar.
+ mRect.set(
+ bounds.left - thumbWidth / 2,
+ bounds.top,
+ bounds.right - thumbWidth / 2,
+ bounds.bottom);
+
+ canvas.drawArc(mRect, -SCROLLBAR_ANGLE_RANGE / 2, SCROLLBAR_ANGLE_RANGE, false,
+ mTrackPaint);
+ canvas.drawArc(mRect, startAngle, sweepAngle, false, mThumbPaint);
+ }
+
+ private static float clamp(float val, float min, float max) {
+ if (val < min) {
+ return min;
+ } else if (val > max) {
+ return max;
+ } else {
+ return val;
+ }
+ }
+
+ private static int applyAlpha(int color, float alpha) {
+ int alphaByte = (int) (Color.alpha(color) * alpha);
+ return Color.argb(alphaByte, Color.red(color), Color.green(color), Color.blue(color));
+ }
+
+ private void setThumbColor(int thumbColor) {
+ if (mThumbPaint.getColor() != thumbColor) {
+ mThumbPaint.setColor(thumbColor);
+ }
+ }
+
+ private void setTrackColor(int trackColor) {
+ if (mTrackPaint.getColor() != trackColor) {
+ mTrackPaint.setColor(trackColor);
+ }
+ }
+}
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index f1abca8..e778a7f 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -82,6 +82,10 @@
IBinder displayToken);
private static native int nativeGetActiveConfig(IBinder displayToken);
private static native boolean nativeSetActiveConfig(IBinder displayToken, int id);
+ private static native int[] nativeGetDisplayColorModes(IBinder displayToken);
+ private static native int nativeGetActiveColorMode(IBinder displayToken);
+ private static native boolean nativeSetActiveColorMode(IBinder displayToken,
+ int colorMode);
private static native void nativeSetDisplayPowerMode(
IBinder displayToken, int mode);
private static native void nativeDeferTransactionUntil(long nativeObject,
@@ -547,7 +551,6 @@
public boolean secure;
public long appVsyncOffsetNanos;
public long presentationDeadlineNanos;
- public int colorTransform;
public PhysicalDisplayInfo() {
}
@@ -571,8 +574,7 @@
&& yDpi == other.yDpi
&& secure == other.secure
&& appVsyncOffsetNanos == other.appVsyncOffsetNanos
- && presentationDeadlineNanos == other.presentationDeadlineNanos
- && colorTransform == other.colorTransform;
+ && presentationDeadlineNanos == other.presentationDeadlineNanos;
}
@Override
@@ -590,7 +592,6 @@
secure = other.secure;
appVsyncOffsetNanos = other.appVsyncOffsetNanos;
presentationDeadlineNanos = other.presentationDeadlineNanos;
- colorTransform = other.colorTransform;
}
// For debugging purposes
@@ -599,8 +600,7 @@
return "PhysicalDisplayInfo{" + width + " x " + height + ", " + refreshRate + " fps, "
+ "density " + density + ", " + xDpi + " x " + yDpi + " dpi, secure " + secure
+ ", appVsyncOffset " + appVsyncOffsetNanos
- + ", bufferDeadline " + presentationDeadlineNanos
- + ", colorTransform " + colorTransform + "}";
+ + ", bufferDeadline " + presentationDeadlineNanos + "}";
}
}
@@ -632,6 +632,27 @@
return nativeSetActiveConfig(displayToken, id);
}
+ public static int[] getDisplayColorModes(IBinder displayToken) {
+ if (displayToken == null) {
+ throw new IllegalArgumentException("displayToken must not be null");
+ }
+ return nativeGetDisplayColorModes(displayToken);
+ }
+
+ public static int getActiveColorMode(IBinder displayToken) {
+ if (displayToken == null) {
+ throw new IllegalArgumentException("displayToken must not be null");
+ }
+ return nativeGetActiveColorMode(displayToken);
+ }
+
+ public static boolean setActiveColorMode(IBinder displayToken, int colorMode) {
+ if (displayToken == null) {
+ throw new IllegalArgumentException("displayToken must not be null");
+ }
+ return nativeSetActiveColorMode(displayToken, colorMode);
+ }
+
public static void setDisplayProjection(IBinder displayToken,
int orientation, Rect layerStackRect, Rect displayRect) {
if (displayToken == null) {
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index ac10927..292e3f5 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -137,7 +137,7 @@
handleGetNewSurface();
} break;
case UPDATE_WINDOW_MSG: {
- updateWindow(false, false);
+ updateWindow();
} break;
}
}
@@ -147,7 +147,7 @@
= new ViewTreeObserver.OnScrollChangedListener() {
@Override
public void onScrollChanged() {
- updateWindow(false, false);
+ updateWindow();
}
};
@@ -157,7 +157,7 @@
public boolean onPreDraw() {
// reposition ourselves where the surface is
mHaveFrame = getWidth() > 0 && getHeight() > 0;
- updateWindow(false, false);
+ updateWindow();
return true;
}
};
@@ -248,7 +248,7 @@
super.onWindowVisibilityChanged(visibility);
mWindowVisibility = visibility == VISIBLE;
mRequestedVisible = mWindowVisibility && mViewVisibility;
- updateWindow(false, false);
+ updateWindow();
}
@Override
@@ -266,7 +266,7 @@
requestLayout();
}
mRequestedVisible = newRequestedVisible;
- updateWindow(false, false);
+ updateWindow();
}
@Override
@@ -279,7 +279,7 @@
}
mRequestedVisible = false;
- updateWindow(false, false);
+ updateWindow();
mHaveFrame = false;
if (mWindow != null) {
try {
@@ -310,7 +310,7 @@
@Override
protected boolean setFrame(int left, int top, int right, int bottom) {
boolean result = super.setFrame(left, top, right, bottom);
- updateWindow(false, false);
+ updateWindow();
return result;
}
@@ -436,7 +436,7 @@
}
/** @hide */
- protected void updateWindow(boolean force, boolean redrawNeeded) {
+ protected void updateWindow() {
if (!mHaveFrame) {
return;
}
@@ -461,8 +461,10 @@
final boolean layoutSizeChanged = getWidth() != mLayout.width
|| getHeight() != mLayout.height;
- if (force || creating || formatChanged || sizeChanged || visibleChanged
- || mUpdateWindowNeeded || mReportDrawNeeded || redrawNeeded) {
+ boolean redrawNeeded = false;
+
+ if (creating || formatChanged || sizeChanged || visibleChanged
+ || mUpdateWindowNeeded || mReportDrawNeeded) {
getLocationInWindow(mLocation);
if (DEBUG) Log.i(TAG, System.identityHashCode(this) + " "
@@ -499,7 +501,7 @@
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
;
- if (!creating && !force && !sizeChanged) {
+ if (!creating && !sizeChanged) {
mLayout.privateFlags |=
WindowManager.LayoutParams.PRIVATE_FLAG_PRESERVE_GEOMETRY;
} else {
@@ -745,6 +747,12 @@
Log.d(TAG, String.format("%d windowPositionLostRT RT, frameNr = %d",
System.identityHashCode(this), frameNumber));
}
+ IWindowSession session = mSession;
+ MyWindow window = mWindow;
+ if (session == null || window == null) {
+ // We got detached prior to receiving this, abort
+ return;
+ }
if (mRtHandlingPositionUpdates) {
mRtHandlingPositionUpdates = false;
// This callback will happen while the UI thread is blocked, so we can
@@ -757,7 +765,7 @@
"postion = [%d, %d, %d, %d]", System.identityHashCode(this),
mWinFrame.left, mWinFrame.top,
mWinFrame.right, mWinFrame.bottom));
- mSession.repositionChild(mWindow, mWinFrame.left, mWinFrame.top,
+ session.repositionChild(window, mWinFrame.left, mWinFrame.top,
mWinFrame.right, mWinFrame.bottom, frameNumber, mWinFrame);
} catch (RemoteException ex) {
Log.e(TAG, "Exception from relayout", ex);
@@ -777,7 +785,7 @@
}
void handleGetNewSurface() {
- updateWindow(false, false);
+ updateWindow();
}
/**
@@ -906,7 +914,7 @@
mRequestedFormat = format;
if (mWindow != null) {
- updateWindow(false, false);
+ updateWindow();
}
}
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java
index 1a712c3..b34dfe0 100644
--- a/core/java/android/view/TextureView.java
+++ b/core/java/android/view/TextureView.java
@@ -355,24 +355,13 @@
}
}
- /**
- * @hide
- */
- @Override
- protected void destroyHardwareResources() {
- super.destroyHardwareResources();
- destroySurface();
- invalidateParentCaches();
- invalidate(true);
- }
-
HardwareLayer getHardwareLayer() {
if (mLayer == null) {
- if (mAttachInfo == null || mAttachInfo.mHardwareRenderer == null) {
+ if (mAttachInfo == null || mAttachInfo.mThreadedRenderer == null) {
return null;
}
- mLayer = mAttachInfo.mHardwareRenderer.createTextureLayer();
+ mLayer = mAttachInfo.mThreadedRenderer.createTextureLayer();
if (!mUpdateSurface) {
// Create a new SurfaceTexture for the layer.
mSurface = new SurfaceTexture(false);
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index b00f334..8ce9ddb 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -16,6 +16,7 @@
package android.view;
+import android.app.ActivityManagerNative;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.content.Context;
@@ -25,9 +26,7 @@
import android.graphics.Rect;
import android.graphics.drawable.AnimatedVectorDrawable;
import android.os.Binder;
-import android.os.Handler;
import android.os.IBinder;
-import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -44,10 +43,9 @@
import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.util.HashSet;
/**
- * Hardware renderer that proxies the rendering to a render thread. Most calls
+ * Threaded renderer that proxies the rendering to a render thread. Most calls
* are currently synchronous.
*
* The UI thread can block on the RenderThread, but RenderThread must never
@@ -85,7 +83,7 @@
static final String RENDER_DIRTY_REGIONS_PROPERTY = "debug.hwui.render_dirty_regions";
/**
- * System property used to enable or disable hardware rendering profiling.
+ * System property used to enable or disable threaded rendering profiling.
* The default value of this property is assumed to be false.
*
* When profiling is enabled, the adb shell dumpsys gfxinfo command will
@@ -113,7 +111,7 @@
/**
* System property used to specify the number of frames to be used
- * when doing hardware rendering profiling.
+ * when doing threaded rendering profiling.
* The default value of this property is #PROFILE_MAX_FRAMES.
*
* When profiling is enabled, the adb shell dumpsys gfxinfo command will
@@ -191,7 +189,7 @@
"debug.hwui.show_non_rect_clip";
/**
- * A process can set this flag to false to prevent the use of hardware
+ * A process can set this flag to false to prevent the use of threaded
* rendering.
*
* @hide
@@ -199,14 +197,14 @@
public static boolean sRendererDisabled = false;
/**
- * Further hardware renderer disabling for the system process.
+ * Further threaded renderer disabling for the system process.
*
* @hide
*/
public static boolean sSystemRendererDisabled = false;
/**
- * Invoke this method to disable hardware rendering in the current process.
+ * Invoke this method to disable threaded rendering in the current process.
*
* @hide
*/
@@ -220,28 +218,31 @@
public static boolean sTrimForeground = false;
/**
- * Controls whether or not the hardware renderer should aggressively
- * trim memory. Note that this must not be set for any process that
- * uses WebView! This should be only used by system_process or similar
+ * Controls whether or not the renderer should aggressively trim
+ * memory. Note that this must not be set for any process that uses
+ * WebView! This should be only used by system_process or similar
* that do not go into the background.
*/
public static void enableForegroundTrimming() {
sTrimForeground = true;
}
+ private static native boolean nSupportsOpenGL();
+ private static boolean sSupportsOpenGL = nSupportsOpenGL();
+
/**
- * Indicates whether hardware acceleration is available under any form for
+ * Indicates whether threaded rendering is available under any form for
* the view hierarchy.
*
- * @return True if the view hierarchy can potentially be hardware accelerated,
+ * @return True if the view hierarchy can potentially be defer rendered,
* false otherwise
*/
public static boolean isAvailable() {
- return DisplayListCanvas.isAvailable();
+ return sSupportsOpenGL;
}
/**
- * Sets the directory to use as a persistent storage for hardware rendering
+ * Sets the directory to use as a persistent storage for threaded rendering
* resources.
*
* @param cacheDir A directory the current process can write to
@@ -253,15 +254,15 @@
}
/**
- * Creates a hardware renderer using OpenGL.
+ * Creates a threaded renderer using OpenGL.
*
* @param translucent True if the surface is translucent, false otherwise
*
- * @return A hardware renderer backed by OpenGL.
+ * @return A threaded renderer backed by OpenGL.
*/
public static ThreadedRenderer create(Context context, boolean translucent) {
ThreadedRenderer renderer = null;
- if (DisplayListCanvas.isAvailable()) {
+ if (isAvailable()) {
renderer = new ThreadedRenderer(context, translucent);
}
return renderer;
@@ -366,7 +367,7 @@
}
/**
- * Destroys the hardware rendering context.
+ * Destroys the threaded rendering context.
*/
void destroy() {
mInitialized = false;
@@ -375,25 +376,25 @@
}
/**
- * Indicates whether hardware acceleration is currently enabled.
+ * Indicates whether threaded rendering is currently enabled.
*
- * @return True if hardware acceleration is in use, false otherwise.
+ * @return True if threaded rendering is in use, false otherwise.
*/
boolean isEnabled() {
return mEnabled;
}
/**
- * Indicates whether hardware acceleration is currently enabled.
+ * Indicates whether threaded rendering is currently enabled.
*
- * @param enabled True if the hardware renderer is in use, false otherwise.
+ * @param enabled True if the threaded renderer is in use, false otherwise.
*/
void setEnabled(boolean enabled) {
mEnabled = enabled;
}
/**
- * Indicates whether hardware acceleration is currently request but not
+ * Indicates whether threaded rendering is currently request but not
* necessarily enabled yet.
*
* @return True if requested, false otherwise.
@@ -403,10 +404,10 @@
}
/**
- * Indicates whether hardware acceleration is currently requested but not
+ * Indicates whether threaded rendering is currently requested but not
* necessarily enabled yet.
*
- * @return True to request hardware acceleration, false otherwise.
+ * @return True to request threaded rendering, false otherwise.
*/
void setRequested(boolean requested) {
mRequested = requested;
@@ -421,9 +422,9 @@
}
/**
- * Initializes the hardware renderer for the specified surface.
+ * Initializes the threaded renderer for the specified surface.
*
- * @param surface The surface to hardware accelerate
+ * @param surface The surface to render
*
* @return True if the initialization was successful, false otherwise.
*/
@@ -436,16 +437,16 @@
}
/**
- * Initializes the hardware renderer for the specified surface and setup the
+ * Initializes the threaded renderer for the specified surface and setup the
* renderer for drawing, if needed. This is invoked when the ViewAncestor has
- * potentially lost the hardware renderer. The hardware renderer should be
+ * potentially lost the threaded renderer. The threaded renderer should be
* reinitialized and setup when the render {@link #isRequested()} and
* {@link #isEnabled()}.
*
* @param width The width of the drawing surface.
* @param height The height of the drawing surface.
* @param attachInfo Information about the window.
- * @param surface The surface to hardware accelerate
+ * @param surface The surface to render
* @param surfaceInsets The drawing surface insets to apply
*
* @return true if the surface was initialized, false otherwise. Returning
@@ -466,9 +467,9 @@
}
/**
- * Updates the hardware renderer for the specified surface.
+ * Updates the threaded renderer for the specified surface.
*
- * @param surface The surface to hardware accelerate
+ * @param surface The surface to render
*/
void updateSurface(Surface surface) throws OutOfResourcesException {
updateEnabledState(surface);
@@ -477,7 +478,7 @@
/**
* Halts any current rendering into the surface. Use this if it is unclear whether
- * or not the surface used by the HardwareRenderer will be changing. It
+ * or not the surface used by the ThreadedRenderer will be changing. It
* Suspends any rendering into the surface, but will not do any destruction.
*
* Any subsequent draws will override the pause, resuming normal operation.
@@ -519,10 +520,10 @@
}
/**
- * This method should be invoked whenever the current hardware renderer
+ * This method should be invoked whenever the current threaded renderer
* context should be reset.
*
- * @param surface The surface to hardware accelerate
+ * @param surface The surface to render
*/
void invalidate(Surface surface) {
updateSurface(surface);
@@ -589,7 +590,7 @@
}
/**
- * Change the HardwareRenderer's opacity
+ * Change the ThreadedRenderer's opacity
*/
void setOpaque(boolean opaque) {
nSetOpaque(mNativeProxy, opaque && !mHasInsets);
@@ -658,7 +659,7 @@
view.mRecreateDisplayList = false;
}
- private void updateRootDisplayList(View view, HardwareDrawCallbacks callbacks) {
+ private void updateRootDisplayList(View view, DrawCallbacks callbacks) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW, "Record View#draw()");
updateViewTreeDisplayList(view);
@@ -667,13 +668,13 @@
try {
final int saveCount = canvas.save();
canvas.translate(mInsetLeft, mInsetTop);
- callbacks.onHardwarePreDraw(canvas);
+ callbacks.onPreDraw(canvas);
canvas.insertReorderBarrier();
canvas.drawRenderNode(view.updateDisplayListIfDirty());
canvas.insertInorderBarrier();
- callbacks.onHardwarePostDraw(canvas);
+ callbacks.onPostDraw(canvas);
canvas.restoreToCount(saveCount);
mRootNodeNeedsUpdate = false;
} finally {
@@ -726,29 +727,29 @@
/**
* Interface used to receive callbacks whenever a view is drawn by
- * a hardware renderer instance.
+ * a threaded renderer instance.
*/
- interface HardwareDrawCallbacks {
+ interface DrawCallbacks {
/**
- * Invoked before a view is drawn by a hardware renderer.
+ * Invoked before a view is drawn by a threaded renderer.
* This method can be used to apply transformations to the
* canvas but no drawing command should be issued.
*
* @param canvas The Canvas used to render the view.
*/
- void onHardwarePreDraw(DisplayListCanvas canvas);
+ void onPreDraw(DisplayListCanvas canvas);
/**
- * Invoked after a view is drawn by a hardware renderer.
+ * Invoked after a view is drawn by a threaded renderer.
* It is safe to invoke drawing commands from this method.
*
* @param canvas The Canvas used to render the view.
*/
- void onHardwarePostDraw(DisplayListCanvas canvas);
+ void onPostDraw(DisplayListCanvas canvas);
}
/**
- * Indicates that the content drawn by HardwareDrawCallbacks needs to
+ * Indicates that the content drawn by DrawCallbacks needs to
* be updated, which will be done by the next call to draw()
*/
void invalidateRoot() {
@@ -762,7 +763,7 @@
* @param attachInfo AttachInfo tied to the specified view.
* @param callbacks Callbacks invoked when drawing happens.
*/
- void draw(View view, AttachInfo attachInfo, HardwareDrawCallbacks callbacks) {
+ void draw(View view, AttachInfo attachInfo, DrawCallbacks callbacks) {
attachInfo.mIgnoreDirtyState = true;
final Choreographer choreographer = attachInfo.mViewRootImpl.mChoreographer;
@@ -917,10 +918,20 @@
synchronized void init(Context context, long renderProxy) {
if (mInitialized) return;
mInitialized = true;
+ initSched(context, renderProxy);
initGraphicsStats(context, renderProxy);
initAssetAtlas(context, renderProxy);
}
+ private static void initSched(Context context, long renderProxy) {
+ try {
+ int tid = nGetRenderThreadTid(renderProxy);
+ ActivityManagerNative.getDefault().setRenderThread(tid);
+ } catch (Throwable t) {
+ Log.w(LOG_TAG, "Failed to set scheduler for RenderThread", t);
+ }
+ }
+
private static void initGraphicsStats(Context context, long renderProxy) {
try {
IBinder binder = ServiceManager.getService("graphicsstats");
@@ -979,6 +990,7 @@
private static native void nSetAtlas(long nativeProxy, GraphicBuffer buffer, long[] map);
private static native void nSetProcessStatsBuffer(long nativeProxy, int fd);
+ private static native int nGetRenderThreadTid(long nativeProxy);
private static native long nCreateRootRenderNode();
private static native long nCreateProxy(boolean translucent, long rootRenderNode);
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index cb267bd..3186073 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -40,6 +40,7 @@
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.Insets;
import android.graphics.Interpolator;
import android.graphics.LinearGradient;
@@ -2435,6 +2436,7 @@
* 1 PFLAG3_OVERLAPPING_RENDERING_FORCED_VALUE
* 1 PFLAG3_HAS_OVERLAPPING_RENDERING_FORCED
* 1 PFLAG3_TEMPORARY_DETACH
+ * 1 PFLAG3_NO_REVEAL_ON_FOCUS
* |-------|-------|-------|-------|
*/
@@ -2676,6 +2678,16 @@
*/
static final int PFLAG3_TEMPORARY_DETACH = 0x2000000;
+ /**
+ * Flag indicating that the view does not wish to be revealed within its parent
+ * hierarchy when it gains focus. Expressed in the negative since the historical
+ * default behavior is to reveal on focus; this flag suppresses that behavior.
+ *
+ * @see #setRevealOnFocusHint(boolean)
+ * @see #getRevealOnFocusHint()
+ */
+ private static final int PFLAG3_NO_REVEAL_ON_FOCUS = 0x4000000;
+
/* End of masks for mPrivateFlags3 */
/**
@@ -3746,7 +3758,8 @@
/**
* Flag indicating that a drag can cross window boundaries. When
* {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int)} is called
- * with this flag set, all visible applications will be able to participate
+ * with this flag set, all visible applications with targetSdkVersion >=
+ * {@link android.os.Build.VERSION_CODES#N API 24} will be able to participate
* in the drag operation and receive the dragged content.
*
* If this is the only flag set, then the drag recipient will only have access to text data
@@ -3981,6 +3994,9 @@
*/
String mStartActivityRequestWho;
+ @Nullable
+ private RoundScrollbarRenderer mRoundScrollbarRenderer;
+
/**
* Simple constructor to use when creating a view from code.
*
@@ -4216,25 +4232,25 @@
setAlpha(a.getFloat(attr, 1f));
break;
case com.android.internal.R.styleable.View_transformPivotX:
- setPivotX(a.getDimensionPixelOffset(attr, 0));
+ setPivotX(a.getDimension(attr, 0));
break;
case com.android.internal.R.styleable.View_transformPivotY:
- setPivotY(a.getDimensionPixelOffset(attr, 0));
+ setPivotY(a.getDimension(attr, 0));
break;
case com.android.internal.R.styleable.View_translationX:
- tx = a.getDimensionPixelOffset(attr, 0);
+ tx = a.getDimension(attr, 0);
transformSet = true;
break;
case com.android.internal.R.styleable.View_translationY:
- ty = a.getDimensionPixelOffset(attr, 0);
+ ty = a.getDimension(attr, 0);
transformSet = true;
break;
case com.android.internal.R.styleable.View_translationZ:
- tz = a.getDimensionPixelOffset(attr, 0);
+ tz = a.getDimension(attr, 0);
transformSet = true;
break;
case com.android.internal.R.styleable.View_elevation:
- elevation = a.getDimensionPixelOffset(attr, 0);
+ elevation = a.getDimension(attr, 0);
transformSet = true;
break;
case com.android.internal.R.styleable.View_rotation:
@@ -5525,7 +5541,7 @@
Window.OnFrameMetricsAvailableListener listener,
Handler handler) {
if (mAttachInfo != null) {
- if (mAttachInfo.mHardwareRenderer != null) {
+ if (mAttachInfo.mThreadedRenderer != null) {
if (mFrameMetricsObservers == null) {
mFrameMetricsObservers = new ArrayList<>();
}
@@ -5533,7 +5549,7 @@
FrameMetricsObserver fmo = new FrameMetricsObserver(window,
handler.getLooper(), listener);
mFrameMetricsObservers.add(fmo);
- mAttachInfo.mHardwareRenderer.addFrameMetricsObserver(fmo);
+ mAttachInfo.mThreadedRenderer.addFrameMetricsObserver(fmo);
} else {
Log.w(VIEW_LOG_TAG, "View not hardware-accelerated. Unable to observe frame stats");
}
@@ -5555,7 +5571,7 @@
*/
public void removeFrameMetricsListener(
Window.OnFrameMetricsAvailableListener listener) {
- ThreadedRenderer renderer = getHardwareRenderer();
+ ThreadedRenderer renderer = getThreadedRenderer();
FrameMetricsObserver fmo = findFrameMetricsObserver(listener);
if (fmo == null) {
throw new IllegalArgumentException(
@@ -5572,7 +5588,7 @@
private void registerPendingFrameMetricsObservers() {
if (mFrameMetricsObservers != null) {
- ThreadedRenderer renderer = getHardwareRenderer();
+ ThreadedRenderer renderer = getThreadedRenderer();
if (renderer != null) {
for (FrameMetricsObserver fmo : mFrameMetricsObservers) {
renderer.addFrameMetricsObserver(fmo);
@@ -5942,6 +5958,47 @@
}
/**
+ * Sets this view's preference for reveal behavior when it gains focus.
+ *
+ * <p>When set to true, this is a signal to ancestor views in the hierarchy that
+ * this view would prefer to be brought fully into view when it gains focus.
+ * For example, a text field that a user is meant to type into. Other views such
+ * as scrolling containers may prefer to opt-out of this behavior.</p>
+ *
+ * <p>The default value for views is true, though subclasses may change this
+ * based on their preferred behavior.</p>
+ *
+ * @param revealOnFocus true to request reveal on focus in ancestors, false otherwise
+ *
+ * @see #getRevealOnFocusHint()
+ */
+ public final void setRevealOnFocusHint(boolean revealOnFocus) {
+ if (revealOnFocus) {
+ mPrivateFlags3 &= ~PFLAG3_NO_REVEAL_ON_FOCUS;
+ } else {
+ mPrivateFlags3 |= PFLAG3_NO_REVEAL_ON_FOCUS;
+ }
+ }
+
+ /**
+ * Returns this view's preference for reveal behavior when it gains focus.
+ *
+ * <p>When this method returns true for a child view requesting focus, ancestor
+ * views responding to a focus change in {@link ViewParent#requestChildFocus(View, View)}
+ * should make a best effort to make the newly focused child fully visible to the user.
+ * When it returns false, ancestor views should preferably not disrupt scroll positioning or
+ * other properties affecting visibility to the user as part of the focus change.</p>
+ *
+ * @return true if this view would prefer to become fully visible when it gains focus,
+ * false if it would prefer not to disrupt scroll positioning
+ *
+ * @see #setRevealOnFocusHint(boolean)
+ */
+ public final boolean getRevealOnFocusHint() {
+ return (mPrivateFlags3 & PFLAG3_NO_REVEAL_ON_FOCUS) == 0;
+ }
+
+ /**
* Populates <code>outRect</code> with the hotspot bounds. By default,
* the hotspot bounds are identical to the screen bounds.
*
@@ -13826,8 +13883,8 @@
/**
* @hide
*/
- public ThreadedRenderer getHardwareRenderer() {
- return mAttachInfo != null ? mAttachInfo.mHardwareRenderer : null;
+ public ThreadedRenderer getThreadedRenderer() {
+ return mAttachInfo != null ? mAttachInfo.mThreadedRenderer : null;
}
/**
@@ -14717,6 +14774,25 @@
}
private void getVerticalScrollBarBounds(Rect bounds) {
+ if (mRoundScrollbarRenderer == null) {
+ getStraightVerticalScrollBarBounds(bounds);
+ } else {
+ getRoundVerticalScrollBarBounds(bounds);
+ }
+ }
+
+ private void getRoundVerticalScrollBarBounds(Rect bounds) {
+ final int width = mRight - mLeft;
+ final int height = mBottom - mTop;
+ // Do not take padding into account as we always want the scrollbars
+ // to hug the screen for round wearable devices.
+ bounds.left = mScrollX;
+ bounds.top = mScrollY;
+ bounds.right = bounds.left + width;
+ bounds.bottom = mScrollY + height;
+ }
+
+ private void getStraightVerticalScrollBarBounds(Rect bounds) {
final int inside = (mViewFlags & SCROLLBARS_OUTSIDE_MASK) == 0 ? ~0 : 0;
final int size = getVerticalScrollbarWidth();
int verticalScrollbarPosition = mVerticalScrollbarPosition;
@@ -14751,6 +14827,7 @@
protected final void onDrawScrollBars(Canvas canvas) {
// scrollbars are drawn only when the animation is running
final ScrollabilityCache cache = mScrollCache;
+
if (cache != null) {
int state = cache.state;
@@ -14791,13 +14868,25 @@
final boolean drawVerticalScrollBar = isVerticalScrollBarEnabled()
&& !isVerticalScrollBarHidden();
- if (drawVerticalScrollBar || drawHorizontalScrollBar) {
+ // Fork out the scroll bar drawing for round wearable devices.
+ if (mRoundScrollbarRenderer != null) {
+ if (drawVerticalScrollBar) {
+ final Rect bounds = cache.mScrollBarBounds;
+ getVerticalScrollBarBounds(bounds);
+ mRoundScrollbarRenderer.drawRoundScrollbars(
+ canvas, (float) cache.scrollBar.getAlpha() / 255f, bounds);
+ if (invalidate) {
+ invalidate();
+ }
+ }
+ // Do not draw horizontal scroll bars for round wearable devices.
+ } else if (drawVerticalScrollBar || drawHorizontalScrollBar) {
final ScrollBarDrawable scrollBar = cache.scrollBar;
if (drawHorizontalScrollBar) {
scrollBar.setParameters(computeHorizontalScrollRange(),
- computeHorizontalScrollOffset(),
- computeHorizontalScrollExtent(), false);
+ computeHorizontalScrollOffset(),
+ computeHorizontalScrollExtent(), false);
final Rect bounds = cache.mScrollBarBounds;
getHorizontalScrollBarBounds(bounds);
onDrawHorizontalScrollBar(canvas, scrollBar, bounds.left, bounds.top,
@@ -14809,8 +14898,8 @@
if (drawVerticalScrollBar) {
scrollBar.setParameters(computeVerticalScrollRange(),
- computeVerticalScrollOffset(),
- computeVerticalScrollExtent(), true);
+ computeVerticalScrollOffset(),
+ computeVerticalScrollExtent(), true);
final Rect bounds = cache.mScrollBarBounds;
getVerticalScrollBarBounds(bounds);
onDrawVerticalScrollBar(canvas, scrollBar, bounds.left, bounds.top,
@@ -15870,8 +15959,8 @@
switch (mLayerType) {
case LAYER_TYPE_HARDWARE:
updateDisplayListIfDirty();
- if (attachInfo.mHardwareRenderer != null && mRenderNode.isValid()) {
- attachInfo.mHardwareRenderer.buildLayer(mRenderNode);
+ if (attachInfo.mThreadedRenderer != null && mRenderNode.isValid()) {
+ attachInfo.mThreadedRenderer.buildLayer(mRenderNode);
}
break;
case LAYER_TYPE_SOFTWARE:
@@ -15989,7 +16078,7 @@
* @hide
*/
public boolean canHaveDisplayList() {
- return !(mAttachInfo == null || mAttachInfo.mHardwareRenderer == null);
+ return !(mAttachInfo == null || mAttachInfo.mThreadedRenderer == null);
}
/**
@@ -17246,7 +17335,7 @@
// Attempt to use a display list if requested.
if (canvas.isHardwareAccelerated() && mAttachInfo != null
- && mAttachInfo.mHardwareRenderer != null) {
+ && mAttachInfo.mThreadedRenderer != null) {
mBackgroundRenderNode = getDrawableRenderNode(background, mBackgroundRenderNode);
final RenderNode renderNode = mBackgroundRenderNode;
@@ -17521,6 +17610,15 @@
if (changed || (mPrivateFlags & PFLAG_LAYOUT_REQUIRED) == PFLAG_LAYOUT_REQUIRED) {
onLayout(changed, l, t, r, b);
+
+ if (shouldDrawRoundScrollbar()) {
+ if(mRoundScrollbarRenderer == null) {
+ mRoundScrollbarRenderer = new RoundScrollbarRenderer(this);
+ }
+ } else {
+ mRoundScrollbarRenderer = null;
+ }
+
mPrivateFlags &= ~PFLAG_LAYOUT_REQUIRED;
ListenerInfo li = mListenerInfo;
@@ -22681,7 +22779,7 @@
boolean mHardwareAccelerated;
boolean mHardwareAccelerationRequested;
- ThreadedRenderer mHardwareRenderer;
+ ThreadedRenderer mThreadedRenderer;
List<RenderNode> mPendingAnimatingRenderNodes;
/**
@@ -22855,7 +22953,7 @@
/**
* Last global system UI visibility reported by the window manager.
*/
- int mGlobalSystemUiVisibility;
+ int mGlobalSystemUiVisibility = -1;
/**
* True if a view in this hierarchy has an OnSystemUiVisibilityChangeListener
@@ -22902,7 +23000,7 @@
final int[] mInvalidateChildLocation = new int[2];
/**
- * Global to the view hierarchy used as a temporary for dealng with
+ * Global to the view hierarchy used as a temporary for dealing with
* computing absolute on-screen location.
*/
final int[] mTmpLocation = new int[2];
@@ -23206,7 +23304,7 @@
* </div>
* <p>
* A scenario in which a developer would like to use an accessibility delegate
- * is overriding a method introduced in a later API version then the minimal API
+ * is overriding a method introduced in a later API version than the minimal API
* version supported by the application. For example, the method
* {@link View#onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo)} is not available
* in API version 4 when the accessibility APIs were first introduced. If a
@@ -23215,7 +23313,7 @@
* of this method, instead of overriding the method which would break the application's
* backwards compatibility, he can override the corresponding method in this
* delegate and register the delegate in the target View if the API version of
- * the system is high enough i.e. the API version is same or higher to the API
+ * the system is high enough, i.e. the API version is the same as or higher than the API
* version that introduced
* {@link View#onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo)}.
* </p>
@@ -23740,4 +23838,30 @@
stream.addProperty("accessibility:labelFor", getLabelFor());
stream.addProperty("accessibility:importantForAccessibility", getImportantForAccessibility());
}
+
+ /**
+ * Determine if this view is rendered on a round wearable device and is the main view
+ * on the screen.
+ */
+ private boolean shouldDrawRoundScrollbar() {
+ if (!mResources.getConfiguration().isScreenRound()) {
+ return false;
+ }
+
+ final View rootView = getRootView();
+ final WindowInsets insets = getRootWindowInsets();
+
+ int height = getHeight();
+ int width = getWidth();
+ int displayHeight = rootView.getHeight();
+ int displayWidth = rootView.getWidth();
+
+ if (height != displayHeight || width != displayWidth) {
+ return false;
+ }
+
+ getLocationOnScreen(mAttachInfo.mTmpLocation);
+ return mAttachInfo.mTmpLocation[0] == insets.getStableInsetLeft()
+ && mAttachInfo.mTmpLocation[1] == insets.getStableInsetTop();
+ }
}
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index c427522..2bc1d74 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -112,7 +112,7 @@
*/
@SuppressWarnings({"EmptyCatchBlock", "PointlessBooleanExpression"})
public final class ViewRootImpl implements ViewParent,
- View.AttachInfo.Callbacks, ThreadedRenderer.HardwareDrawCallbacks {
+ View.AttachInfo.Callbacks, ThreadedRenderer.DrawCallbacks {
private static final String TAG = "ViewRootImpl";
private static final boolean DBG = false;
private static final boolean LOCAL_LOGV = false;
@@ -390,7 +390,7 @@
/** Set to true once doDie() has been called. */
private boolean mRemoved;
- private boolean mNeedsHwRendererSetup;
+ private boolean mNeedsRendererSetup;
/**
* Consistency verifier for debugging purposes.
@@ -785,17 +785,17 @@
}
void destroyHardwareResources() {
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.destroyHardwareResources(mView);
- mAttachInfo.mHardwareRenderer.destroy();
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.destroyHardwareResources(mView);
+ mAttachInfo.mThreadedRenderer.destroy();
}
}
public void detachFunctor(long functor) {
- if (mAttachInfo.mHardwareRenderer != null) {
+ if (mAttachInfo.mThreadedRenderer != null) {
// Fence so that any pending invokeFunctor() messages will be processed
// before we return from detachFunctor.
- mAttachInfo.mHardwareRenderer.stopDrawing();
+ mAttachInfo.mThreadedRenderer.stopDrawing();
}
}
@@ -813,8 +813,8 @@
}
public void registerAnimatingRenderNode(RenderNode animator) {
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.registerAnimatingRenderNode(animator);
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.registerAnimatingRenderNode(animator);
} else {
if (mAttachInfo.mPendingAnimatingRenderNodes == null) {
mAttachInfo.mPendingAnimatingRenderNodes = new ArrayList<RenderNode>();
@@ -825,8 +825,8 @@
public void registerVectorDrawableAnimator(
AnimatedVectorDrawable.VectorDrawableAnimatorRT animator) {
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.registerVectorDrawableAnimator(animator);
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.registerVectorDrawableAnimator(animator);
}
}
@@ -867,17 +867,17 @@
mAttachInfo.mHardwareAccelerationRequested = true;
} else if (!ThreadedRenderer.sRendererDisabled
|| (ThreadedRenderer.sSystemRendererDisabled && forceHwAccelerated)) {
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.destroy();
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.destroy();
}
final Rect insets = attrs.surfaceInsets;
final boolean hasSurfaceInsets = insets.left != 0 || insets.right != 0
|| insets.top != 0 || insets.bottom != 0;
final boolean translucent = attrs.format != PixelFormat.OPAQUE || hasSurfaceInsets;
- mAttachInfo.mHardwareRenderer = ThreadedRenderer.create(mContext, translucent);
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.setName(attrs.getTitle().toString());
+ mAttachInfo.mThreadedRenderer = ThreadedRenderer.create(mContext, translucent);
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.setName(attrs.getTitle().toString());
mAttachInfo.mHardwareAccelerated =
mAttachInfo.mHardwareAccelerationRequested = true;
}
@@ -944,7 +944,7 @@
|| mWindowAttributes.surfaceInsets.top != oldInsetTop
|| mWindowAttributes.surfaceInsets.right != oldInsetRight
|| mWindowAttributes.surfaceInsets.bottom != oldInsetBottom) {
- mNeedsHwRendererSetup = true;
+ mNeedsRendererSetup = true;
}
applyKeepScreenOnFlag(mWindowAttributes);
@@ -1138,7 +1138,7 @@
void setWindowStopped(boolean stopped) {
if (mStopped != stopped) {
mStopped = stopped;
- final ThreadedRenderer renderer = mAttachInfo.mHardwareRenderer;
+ final ThreadedRenderer renderer = mAttachInfo.mThreadedRenderer;
if (renderer != null) {
if (DEBUG_DRAW) Log.d(mTag, "WindowStopped on " + getTitle() + " set to " + mStopped);
renderer.setStopped(mStopped);
@@ -1214,8 +1214,8 @@
* this knowledge to adjust the scheduling of off-thread animations
*/
void notifyRendererOfFramePending() {
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.notifyFramePending();
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.notifyFramePending();
}
}
@@ -1731,7 +1731,7 @@
}
boolean hwInitialized = false;
- boolean framesChanged = false;
+ boolean contentInsetsChanged = false;
boolean hadSurface = mSurface.isValid();
try {
@@ -1740,11 +1740,11 @@
host.getMeasuredHeight() + ", params=" + params);
}
- if (mAttachInfo.mHardwareRenderer != null) {
+ if (mAttachInfo.mThreadedRenderer != null) {
// relayoutWindow may decide to destroy mSurface. As that decision
// happens in WindowManager service, we need to be defensive here
// and stop using the surface in case it gets destroyed.
- if (mAttachInfo.mHardwareRenderer.pauseSurface(mSurface)) {
+ if (mAttachInfo.mThreadedRenderer.pauseSurface(mSurface)) {
// Animations were running so we need to push a frame
// to resume them
mDirty.set(0, 0, mWidth, mHeight);
@@ -1771,7 +1771,7 @@
final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals(
mAttachInfo.mOverscanInsets);
- boolean contentInsetsChanged = !mPendingContentInsets.equals(
+ contentInsetsChanged = !mPendingContentInsets.equals(
mAttachInfo.mContentInsets);
final boolean visibleInsetsChanged = !mPendingVisibleInsets.equals(
mAttachInfo.mVisibleInsets);
@@ -1821,19 +1821,6 @@
+ mAttachInfo.mVisibleInsets);
}
- // If any of the insets changed, do a forceLayout on the view so that the
- // measure cache is cleared. We might have a pending MSG_RESIZED_REPORT
- // that is supposed to take care of it, but since pending insets are
- // already modified here, it won't detect the frame change after this.
- framesChanged = overscanInsetsChanged
- || contentInsetsChanged
- || stableInsetsChanged
- || visibleInsetsChanged
- || outsetsChanged;
- if (mAdded && mView != null && framesChanged) {
- forceLayout(mView);
- }
-
if (!hadSurface) {
if (mSurface.isValid()) {
// If we are creating a new surface, then we need to
@@ -1850,9 +1837,9 @@
// Only initialize up-front if transparent regions are not
// requested, otherwise defer to see if the entire window
// will be transparent
- if (mAttachInfo.mHardwareRenderer != null) {
+ if (mAttachInfo.mThreadedRenderer != null) {
try {
- hwInitialized = mAttachInfo.mHardwareRenderer.initialize(
+ hwInitialized = mAttachInfo.mThreadedRenderer.initialize(
mSurface);
if (hwInitialized && (host.mPrivateFlags
& View.PFLAG_REQUEST_TRANSPARENT_REGIONS) == 0) {
@@ -1880,14 +1867,14 @@
mScroller.abortAnimation();
}
// Our surface is gone
- if (mAttachInfo.mHardwareRenderer != null &&
- mAttachInfo.mHardwareRenderer.isEnabled()) {
- mAttachInfo.mHardwareRenderer.destroy();
+ if (mAttachInfo.mThreadedRenderer != null &&
+ mAttachInfo.mThreadedRenderer.isEnabled()) {
+ mAttachInfo.mThreadedRenderer.destroy();
}
} else if ((surfaceGenerationId != mSurface.getGenerationId()
|| surfaceSizeChanged)
&& mSurfaceHolder == null
- && mAttachInfo.mHardwareRenderer != null) {
+ && mAttachInfo.mThreadedRenderer != null) {
mFullRedrawNeeded = true;
try {
// Need to do updateSurface (which leads to CanvasContext::setSurface and
@@ -1898,7 +1885,7 @@
// Note that frame size change doesn't always imply surface size change (eg.
// drag resizing uses fullscreen surface), need to check surfaceSizeChanged
// flag from WindowManager.
- mAttachInfo.mHardwareRenderer.updateSurface(mSurface);
+ mAttachInfo.mThreadedRenderer.updateSurface(mSurface);
} catch (OutOfResourcesException e) {
handleOutOfResourcesException(e);
return;
@@ -2001,15 +1988,15 @@
}
}
- final ThreadedRenderer hardwareRenderer = mAttachInfo.mHardwareRenderer;
- if (hardwareRenderer != null && hardwareRenderer.isEnabled()) {
+ final ThreadedRenderer threadedRenderer = mAttachInfo.mThreadedRenderer;
+ if (threadedRenderer != null && threadedRenderer.isEnabled()) {
if (hwInitialized
- || mWidth != hardwareRenderer.getWidth()
- || mHeight != hardwareRenderer.getHeight()
- || mNeedsHwRendererSetup) {
- hardwareRenderer.setup(mWidth, mHeight, mAttachInfo,
+ || mWidth != threadedRenderer.getWidth()
+ || mHeight != threadedRenderer.getHeight()
+ || mNeedsRendererSetup) {
+ threadedRenderer.setup(mWidth, mHeight, mAttachInfo,
mWindowAttributes.surfaceInsets);
- mNeedsHwRendererSetup = false;
+ mNeedsRendererSetup = false;
}
}
@@ -2017,7 +2004,7 @@
boolean focusChangedDueToTouchMode = ensureTouchModeLocally(
(relayoutResult&WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE) != 0);
if (focusChangedDueToTouchMode || mWidth != host.getMeasuredWidth()
- || mHeight != host.getMeasuredHeight() || framesChanged ||
+ || mHeight != host.getMeasuredHeight() || contentInsetsChanged ||
updatedConfiguration) {
int childWidthMeasureSpec = getRootMeasureSpec(mWidth, lp.width);
int childHeightMeasureSpec = getRootMeasureSpec(mHeight, lp.height);
@@ -2026,7 +2013,7 @@
+ mWidth + " measuredWidth=" + host.getMeasuredWidth()
+ " mHeight=" + mHeight
+ " measuredHeight=" + host.getMeasuredHeight()
- + " framesChanged=" + framesChanged);
+ + " coveredInsetsChanged=" + contentInsetsChanged);
// Ask host how big it wants to be
performMeasure(childWidthMeasureSpec, childHeightMeasureSpec);
@@ -2253,8 +2240,8 @@
}
if (windowMoved || mAttachInfo.mNeedsUpdateLightCenter) {
// Update the light position for the new offsets.
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.setLightCenter(mAttachInfo);
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.setLightCenter(mAttachInfo);
}
mAttachInfo.mNeedsUpdateLightCenter = false;
}
@@ -2520,12 +2507,12 @@
int mHardwareYOffset;
@Override
- public void onHardwarePreDraw(DisplayListCanvas canvas) {
+ public void onPreDraw(DisplayListCanvas canvas) {
canvas.translate(-mHardwareXOffset, -mHardwareYOffset);
}
@Override
- public void onHardwarePostDraw(DisplayListCanvas canvas) {
+ public void onPostDraw(DisplayListCanvas canvas) {
drawAccessibilityFocusedDrawableIfNeeded(canvas);
for (int i = mWindowCallbacks.size() - 1; i >= 0; i--) {
mWindowCallbacks.get(i).onPostDraw(canvas);
@@ -2537,8 +2524,8 @@
*/
void outputDisplayList(View view) {
view.mRenderNode.output();
- if (mAttachInfo.mHardwareRenderer != null) {
- ((ThreadedRenderer)mAttachInfo.mHardwareRenderer).serializeDisplayListTree();
+ if (mAttachInfo.mThreadedRenderer != null) {
+ ((ThreadedRenderer)mAttachInfo.mThreadedRenderer).serializeDisplayListTree();
}
}
@@ -2638,9 +2625,9 @@
mWindowDrawCountDown = null;
}
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.fence();
- mAttachInfo.mHardwareRenderer.setStopped(mStopped);
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.fence();
+ mAttachInfo.mThreadedRenderer.setStopped(mStopped);
}
if (LOCAL_LOGV) {
@@ -2766,7 +2753,7 @@
mChoreographer.getFrameTimeNanos() / TimeUtils.NANOS_PER_MS;
if (!dirty.isEmpty() || mIsAnimating || accessibilityFocusDirty) {
- if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {
+ if (mAttachInfo.mThreadedRenderer != null && mAttachInfo.mThreadedRenderer.isEnabled()) {
// If accessibility focus moved, always invalidate the root.
boolean invalidateRoot = accessibilityFocusDirty || mInvalidateRootRequested;
mInvalidateRootRequested = false;
@@ -2781,7 +2768,7 @@
}
if (invalidateRoot) {
- mAttachInfo.mHardwareRenderer.invalidateRoot();
+ mAttachInfo.mThreadedRenderer.invalidateRoot();
}
dirty.setEmpty();
@@ -2794,14 +2781,14 @@
// report next draw overrides setStopped()
// This value is re-sync'd to the value of mStopped
// in the handling of mReportNextDraw post-draw.
- mAttachInfo.mHardwareRenderer.setStopped(false);
+ mAttachInfo.mThreadedRenderer.setStopped(false);
}
if (updated) {
requestDrawWindow();
}
- mAttachInfo.mHardwareRenderer.draw(mView, mAttachInfo, this);
+ mAttachInfo.mThreadedRenderer.draw(mView, mAttachInfo, this);
} else {
// If we get here with a disabled & requested hardware renderer, something went
// wrong (an invalidate posted right before we destroyed the hardware surface
@@ -2811,12 +2798,12 @@
// Before we request a new frame we must however attempt to reinitiliaze the
// hardware renderer if it's in requested state. This would happen after an
// eglTerminate() for instance.
- if (mAttachInfo.mHardwareRenderer != null &&
- !mAttachInfo.mHardwareRenderer.isEnabled() &&
- mAttachInfo.mHardwareRenderer.isRequested()) {
+ if (mAttachInfo.mThreadedRenderer != null &&
+ !mAttachInfo.mThreadedRenderer.isEnabled() &&
+ mAttachInfo.mThreadedRenderer.isRequested()) {
try {
- mAttachInfo.mHardwareRenderer.initializeIfNeeded(
+ mAttachInfo.mThreadedRenderer.initializeIfNeeded(
mWidth, mHeight, mAttachInfo, mSurface, surfaceInsets);
} catch (OutOfResourcesException e) {
handleOutOfResourcesException(e);
@@ -3186,7 +3173,7 @@
}
focusNode.recycle();
}
- if (mAccessibilityFocusedHost != null) {
+ if ((mAccessibilityFocusedHost != null) && (mAccessibilityFocusedHost != view)) {
// Clear accessibility focus in the view.
mAccessibilityFocusedHost.clearAccessibilityFocusNoCallbacks(
AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
@@ -3196,8 +3183,8 @@
mAccessibilityFocusedHost = view;
mAccessibilityFocusedVirtualView = node;
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.invalidateRoot();
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.invalidateRoot();
}
}
@@ -3571,12 +3558,12 @@
boolean inTouchMode = msg.arg2 != 0;
ensureTouchModeLocally(inTouchMode);
- if (mAttachInfo.mHardwareRenderer != null && mSurface.isValid()){
+ if (mAttachInfo.mThreadedRenderer != null && mSurface.isValid()){
mFullRedrawNeeded = true;
try {
final WindowManager.LayoutParams lp = mWindowAttributes;
final Rect surfaceInsets = lp != null ? lp.surfaceInsets : null;
- mAttachInfo.mHardwareRenderer.initializeIfNeeded(
+ mAttachInfo.mThreadedRenderer.initializeIfNeeded(
mWidth, mHeight, mAttachInfo, mSurface, surfaceInsets);
} catch (OutOfResourcesException e) {
Log.e(mTag, "OutOfResourcesException locking surface", e);
@@ -5515,6 +5502,18 @@
if (mView != null && mAdded) {
final int what = event.mAction;
+ // Cache the drag description when the operation starts, then fill it in
+ // on subsequent calls as a convenience
+ if (what == DragEvent.ACTION_DRAG_STARTED) {
+ mCurrentDragView = null; // Start the current-recipient tracking
+ mDragDescription = event.mClipDescription;
+ } else {
+ if (what == DragEvent.ACTION_DRAG_ENDED) {
+ mDragDescription = null;
+ }
+ event.mClipDescription = mDragDescription;
+ }
+
if (what == DragEvent.ACTION_DRAG_EXITED) {
// A direct EXITED event means that the window manager knows we've just crossed
// a window boundary, so the current drag target within this one must have
@@ -5522,15 +5521,6 @@
// for now.
mView.dispatchDragEvent(event);
} else {
- // Cache the drag description when the operation starts, then fill it in
- // on subsequent calls as a convenience
- if (what == DragEvent.ACTION_DRAG_STARTED) {
- mCurrentDragView = null; // Start the current-recipient tracking
- mDragDescription = event.mClipDescription;
- } else {
- event.mClipDescription = mDragDescription;
- }
-
// For events with a [screen] location, translate into window coordinates
if ((what == DragEvent.ACTION_DRAG_LOCATION) || (what == DragEvent.ACTION_DROP)) {
mDragPoint.set(event.mX, event.mY);
@@ -5568,7 +5558,6 @@
// Report the drop result when we're done
if (what == DragEvent.ACTION_DROP) {
- mDragDescription = null;
try {
Log.i(mTag, "Reporting drop result: " + result);
mWindowSession.reportDropResult(mWindow, result);
@@ -5931,8 +5920,8 @@
profileRendering(mAttachInfo.mHasWindowFocus);
// Hardware rendering
- if (mAttachInfo.mHardwareRenderer != null) {
- if (mAttachInfo.mHardwareRenderer.loadSystemProperties()) {
+ if (mAttachInfo.mThreadedRenderer != null) {
+ if (mAttachInfo.mThreadedRenderer.loadSystemProperties()) {
invalidate();
}
}
@@ -5950,7 +5939,7 @@
}
private void destroyHardwareRenderer() {
- ThreadedRenderer hardwareRenderer = mAttachInfo.mHardwareRenderer;
+ ThreadedRenderer hardwareRenderer = mAttachInfo.mThreadedRenderer;
if (hardwareRenderer != null) {
if (mView != null) {
@@ -5959,7 +5948,7 @@
hardwareRenderer.destroy();
hardwareRenderer.setRequested(false);
- mAttachInfo.mHardwareRenderer = null;
+ mAttachInfo.mThreadedRenderer = null;
mAttachInfo.mHardwareAccelerated = false;
}
}
@@ -6052,7 +6041,8 @@
return true;
}
return mEvent instanceof MotionEvent
- && mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER);
+ && (mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER)
+ || mEvent.isFromSource(InputDevice.SOURCE_ROTARY_ENCODER));
}
public boolean shouldSendToSynthesizer() {
@@ -6946,8 +6936,8 @@
void changeCanvasOpacity(boolean opaque) {
Log.d(mTag, "changeCanvasOpacity: opaque=" + opaque);
- if (mAttachInfo.mHardwareRenderer != null) {
- mAttachInfo.mHardwareRenderer.setOpaque(opaque);
+ if (mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.setOpaque(opaque);
}
}
diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index 11734d3..080bc32 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -523,7 +523,7 @@
for (int i = mRoots.size() - 1; i >= 0; --i) {
final ViewRootImpl root = mRoots.get(i);
if (root.mView != null && root.getHostVisibility() == View.VISIBLE
- && root.mAttachInfo.mHardwareRenderer != null) {
+ && root.mAttachInfo.mThreadedRenderer != null) {
hasVisibleWindows = true;
} else {
root.destroyHardwareResources();
@@ -551,7 +551,7 @@
pw.printf("\n\t%s (visibility=%d)", name, root.getHostVisibility());
ThreadedRenderer renderer =
- root.getView().mAttachInfo.mHardwareRenderer;
+ root.getView().mAttachInfo.mThreadedRenderer;
if (renderer != null) {
renderer.dumpGfxInfo(pw, fd, args);
}
diff --git a/core/java/android/view/WindowManagerInternal.java b/core/java/android/view/WindowManagerInternal.java
index 610dff8..653e583 100644
--- a/core/java/android/view/WindowManagerInternal.java
+++ b/core/java/android/view/WindowManagerInternal.java
@@ -287,4 +287,9 @@
* @return True if and only if the docked divider is currently in resize mode.
*/
public abstract boolean isDockedDividerResizing();
+
+ /**
+ * Requests the window manager to recompute the windows for accessibility.
+ */
+ public abstract void computeWindowsForAccessibility();
}
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index 8984665..b7a8037 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -416,6 +416,8 @@
* screen with other application windows.
*/
public boolean isInMultiWindowMode();
+
+ public int getRotationAnimationHint();
}
/**
diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index 81ec330..2dfa8cd 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -305,7 +305,18 @@
return;
}
if (!mIsEnabled) {
- throw new IllegalStateException("Accessibility off. Did you forget to check that?");
+ Looper myLooper = Looper.myLooper();
+ if (myLooper == Looper.getMainLooper()) {
+ throw new IllegalStateException(
+ "Accessibility off. Did you forget to check that?");
+ } else {
+ // If we're not running on the thread with the main looper, it's possible for
+ // the state of accessibility to change between checking isEnabled and
+ // calling this method. So just log the error rather than throwing the
+ // exception.
+ Log.e(LOG_TAG, "AccessibilityEvent sent with accessibility disabled");
+ return;
+ }
}
userId = mUserId;
}
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index c1076e7..7880b1a 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -3801,7 +3801,8 @@
/**
* Class with information if a node is a range. Use
- * {@link RangeInfo#obtain(int, float, float, float)} to get an instance.
+ * {@link RangeInfo#obtain(int, float, float, float)} to get an instance. Recycling is
+ * handled by the {@link AccessibilityNodeInfo} to which this object is attached.
*/
public static final class RangeInfo {
private static final int MAX_POOL_SIZE = 10;
@@ -3926,7 +3927,8 @@
/**
* Class with information if a node is a collection. Use
- * {@link CollectionInfo#obtain(int, int, boolean)} to get an instance.
+ * {@link CollectionInfo#obtain(int, int, boolean)} to get an instance. Recycling is
+ * handled by the {@link AccessibilityNodeInfo} to which this object is attached.
* <p>
* A collection of items has rows and columns and may be hierarchical.
* For example, a horizontal list is a collection with one column, as
@@ -4082,7 +4084,8 @@
/**
* Class with information if a node is a collection item. Use
* {@link CollectionItemInfo#obtain(int, int, int, int, boolean)}
- * to get an instance.
+ * to get an instance. Recycling is handled by the {@link AccessibilityNodeInfo} to which this
+ * object is attached.
* <p>
* A collection item is contained in a collection, it starts at
* a given row and column in the collection, and spans one or
diff --git a/core/java/android/view/inputmethod/BaseInputConnection.java b/core/java/android/view/inputmethod/BaseInputConnection.java
index 0ebbf7f..38962a3 100644
--- a/core/java/android/view/inputmethod/BaseInputConnection.java
+++ b/core/java/android/view/inputmethod/BaseInputConnection.java
@@ -855,5 +855,7 @@
/**
* The default implementation does nothing.
*/
- public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) { return false; }
+ public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
+ return false;
+ }
}
diff --git a/core/java/android/view/inputmethod/EditorInfo.java b/core/java/android/view/inputmethod/EditorInfo.java
index 2dca892..8038089 100644
--- a/core/java/android/view/inputmethod/EditorInfo.java
+++ b/core/java/android/view/inputmethod/EditorInfo.java
@@ -368,10 +368,10 @@
/**
* List of acceptable MIME types for
- * {@link InputConnection#commitContent(InputContentInfo, Bundle)}.
+ * {@link InputConnection#commitContent(InputContentInfo, int, Bundle)}.
*
* <p>{@code null} or an empty array means that
- * {@link InputConnection#commitContent(InputContentInfo, Bundle)} is not supported in this
+ * {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} is not supported in this
* editor.</p>
*/
@Nullable
diff --git a/core/java/android/view/inputmethod/InputConnection.java b/core/java/android/view/inputmethod/InputConnection.java
index f7f3694..07910b6 100644
--- a/core/java/android/view/inputmethod/InputConnection.java
+++ b/core/java/android/view/inputmethod/InputConnection.java
@@ -840,6 +840,24 @@
public void closeConnection();
/**
+ * When this flag is used, the editor will be able to request read access to the content URI
+ * contained in the {@link InputContentInfo} object.
+ *
+ * <p>Make sure that the content provider owning the Uri sets the
+ * {@link android.R.styleable#AndroidManifestProvider_grantUriPermissions
+ * grantUriPermissions} attribute in its manifest or included the
+ * {@link android.R.styleable#AndroidManifestGrantUriPermission
+ * <grant-uri-permissions>} tag. Otherwise {@link InputContentInfo#requestPermission()}
+ * can fail.</p>
+ *
+ * <p>Although calling this API is allowed only for the IME that is currently selected, the
+ * client is able to request a temporary read-only access even after the current IME is switched
+ * to any other IME as long as the client keeps {@link InputContentInfo} object.</p>
+ **/
+ public static int INPUT_CONTENT_GRANT_READ_URI_PERMISSION =
+ android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION; // 0x00000001
+
+ /**
* Called by the input method to commit a content such as PNG image to the editor.
*
* <p>In order to avoid variety of compatibility issues, this focuses on a simple use case,
@@ -862,9 +880,11 @@
* </ul>
*
* @param inputContentInfo Content to be inserted.
+ * @param flags {@code 0} or {@link #INPUT_CONTENT_GRANT_READ_URI_PERMISSION}.
* @param opts optional bundle data. This can be {@code null}.
* @return {@code true} if this request is accepted by the application, no matter if the request
* is already handled or still being handled in background.
*/
- public boolean commitContent(@NonNull InputContentInfo inputContentInfo, @Nullable Bundle opts);
+ public boolean commitContent(@NonNull InputContentInfo inputContentInfo, int flags,
+ @Nullable Bundle opts);
}
diff --git a/core/java/android/view/inputmethod/InputConnectionInspector.java b/core/java/android/view/inputmethod/InputConnectionInspector.java
index 727e9ca..2b292bb 100644
--- a/core/java/android/view/inputmethod/InputConnectionInspector.java
+++ b/core/java/android/view/inputmethod/InputConnectionInspector.java
@@ -82,7 +82,7 @@
*/
int CLOSE_CONNECTION = 1 << 6;
/**
- * {@link InputConnection#commitContent(InputContentInfo, Bundle)} is available in
+ * {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} is available in
* {@link android.os.Build.VERSION_CODES#N} MR-1 and later.
*/
int COMMIT_CONTENT = 1 << 7;
@@ -209,7 +209,7 @@
private static boolean hasCommitContent(@NonNull final Class clazz) {
try {
final Method method = clazz.getMethod("commitContent", InputContentInfo.class,
- Bundle.class);
+ int.class, Bundle.class);
return !Modifier.isAbstract(method.getModifiers());
} catch (NoSuchMethodException e) {
return false;
diff --git a/core/java/android/view/inputmethod/InputConnectionWrapper.java b/core/java/android/view/inputmethod/InputConnectionWrapper.java
index af9bcae..317730c 100644
--- a/core/java/android/view/inputmethod/InputConnectionWrapper.java
+++ b/core/java/android/view/inputmethod/InputConnectionWrapper.java
@@ -274,7 +274,7 @@
* {@inheritDoc}
* @throws NullPointerException if the target is {@code null}.
*/
- public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) {
- return mTarget.commitContent(inputContentInfo, opts);
+ public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
+ return mTarget.commitContent(inputContentInfo, flags, opts);
}
}
diff --git a/core/java/android/view/inputmethod/InputContentInfo.java b/core/java/android/view/inputmethod/InputContentInfo.java
index 9579bbf..b39705e 100644
--- a/core/java/android/view/inputmethod/InputContentInfo.java
+++ b/core/java/android/view/inputmethod/InputContentInfo.java
@@ -191,8 +191,6 @@
mUriToken.release();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
- } finally {
- mUriToken = null;
}
}
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index b35f5c3..c0c8e64 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -2304,10 +2304,9 @@
* application.
* This cannot be {@code null}.
* @param editorInfo The editor that receives {@link InputContentInfo}.
- * @return {@code false} if we cannot allow a temporary access permission.
* @hide
*/
- public boolean exposeContent(@NonNull IBinder token, @NonNull InputContentInfo inputContentInfo,
+ public void exposeContent(@NonNull IBinder token, @NonNull InputContentInfo inputContentInfo,
@NonNull EditorInfo editorInfo) {
final IInputContentUriToken uriToken;
final Uri contentUri = inputContentInfo.getContentUri();
@@ -2315,15 +2314,15 @@
uriToken = mService.createInputContentUriToken(token, contentUri,
editorInfo.packageName);
if (uriToken == null) {
- return false;
+ return;
}
} catch (RemoteException e) {
Log.e(TAG, "createInputContentAccessToken failed. contentUri=" + contentUri.toString()
+ " packageName=" + editorInfo.packageName, e);
- return false;
+ return;
}
inputContentInfo.setUriToken(uriToken);
- return true;
+ return;
}
void doDump(FileDescriptor fd, PrintWriter fout, String[] args) {
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index 3ec235b..67289c2 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -35,7 +35,7 @@
*
* @return the singleton CookieManager instance
*/
- public static synchronized CookieManager getInstance() {
+ public static CookieManager getInstance() {
return WebViewFactory.getProvider().getCookieManager();
}
diff --git a/core/java/android/webkit/CookieSyncManager.java b/core/java/android/webkit/CookieSyncManager.java
index eda8d36..c974b32 100644
--- a/core/java/android/webkit/CookieSyncManager.java
+++ b/core/java/android/webkit/CookieSyncManager.java
@@ -65,6 +65,7 @@
private static CookieSyncManager sRef;
private static boolean sGetInstanceAllowed = false;
+ private static final Object sLock = new Object();
private CookieSyncManager() {
super(null, null);
@@ -77,12 +78,14 @@
*
* @return CookieSyncManager
*/
- public static synchronized CookieSyncManager getInstance() {
- checkInstanceIsAllowed();
- if (sRef == null) {
- sRef = new CookieSyncManager();
+ public static CookieSyncManager getInstance() {
+ synchronized (sLock) {
+ checkInstanceIsAllowed();
+ if (sRef == null) {
+ sRef = new CookieSyncManager();
+ }
+ return sRef;
}
- return sRef;
}
/**
@@ -90,12 +93,14 @@
* @param context
* @return CookieSyncManager
*/
- public static synchronized CookieSyncManager createInstance(Context context) {
- if (context == null) {
- throw new IllegalArgumentException("Invalid context argument");
+ public static CookieSyncManager createInstance(Context context) {
+ synchronized (sLock) {
+ if (context == null) {
+ throw new IllegalArgumentException("Invalid context argument");
+ }
+ setGetInstanceIsAllowed();
+ return getInstance();
}
- setGetInstanceIsAllowed();
- return getInstance();
}
/**
diff --git a/core/java/android/webkit/WebMessagePort.java b/core/java/android/webkit/WebMessagePort.java
index 5f33c7b..54dd502 100644
--- a/core/java/android/webkit/WebMessagePort.java
+++ b/core/java/android/webkit/WebMessagePort.java
@@ -20,32 +20,32 @@
import android.os.Handler;
/**
- * The Java representation of the
+ * <p>The Java representation of the
* <a href="https://html.spec.whatwg.org/multipage/comms.html#messageport">
- * HTML5 message ports.</a>
+ * HTML5 message ports.</a> </p>
*
- * A Message port represents one endpoint of a Message Channel. In Android
+ * <p>A Message port represents one endpoint of a Message Channel. In Android
* webview, there is no separate Message Channel object. When a message channel
* is created, both ports are tangled to each other and started, and then
* returned in a MessagePort array, see {@link WebView#createWebMessageChannel}
- * for creating a message channel.
+ * for creating a message channel. </p>
*
- * When a message port is first created or received via transfer, it does not
+ * <p>When a message port is first created or received via transfer, it does not
* have a WebMessageCallback to receive web messages. The messages are queued until
- * a WebMessageCallback is set.
+ * a WebMessageCallback is set. </p>
*
- * A message port should be closed when it is not used by the embedder application
+ * <p>A message port should be closed when it is not used by the embedder application
* anymore. A closed port cannot be transferred or cannot be reopened to send
- * messages. Close can be called multiple times.
+ * messages. Close can be called multiple times. </p>
*
- * When a port is transferred to JS, it cannot be used to send or receive messages
+ * <p>When a port is transferred to JS, it cannot be used to send or receive messages
* at the Java side anymore. Different from HTML5 Spec, a port cannot be transferred
* if one of these has ever happened: i. a message callback was set, ii. a message was
* posted on it. A transferred port cannot be closed by the application, since
- * the ownership is also transferred.
+ * the ownership is also transferred. </p>
*
- * It is possible to transfer both ports of a channel to JS, for example for
- * communication between subframes.
+ * <p>It is possible to transfer both ports of a channel to JS, for example for
+ * communication between subframes.</p>
*/
public abstract class WebMessagePort {
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index cbfe43a..6f3fa36 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2322,7 +2322,7 @@
}
}
- private static synchronized WebViewFactoryProvider getFactory() {
+ private static WebViewFactoryProvider getFactory() {
return WebViewFactory.getProvider();
}
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index f296421..66b22ce 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2316,22 +2316,24 @@
}
/**
- * Get a view and have it show the data associated with the specified
- * position. This is called when we have already discovered that the view is
- * not available for reuse in the recycle bin. The only choices left are
+ * Gets a view and have it show the data associated with the specified
+ * position. This is called when we have already discovered that the view
+ * is not available for reuse in the recycle bin. The only choices left are
* converting an old view or making a new one.
*
- * @param position The position to display
- * @param isScrap Array of at least 1 boolean, the first entry will become true if
- * the returned view was taken from the "temporary detached" scrap heap, false if
- * otherwise.
+ * @param position the position to display
+ * @param outMetadata an array of at least 1 boolean where the first entry
+ * will be set {@code true} if the view is currently
+ * attached to the window, {@code false} otherwise (e.g.
+ * newly-inflated or remained scrap for multiple layout
+ * passes)
*
* @return A view displaying the data associated with the specified position
*/
- View obtainView(int position, boolean[] isScrap) {
+ View obtainView(int position, boolean[] outMetadata) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW, "obtainView");
- isScrap[0] = false;
+ outMetadata[0] = false;
// Check whether we have a transient state view. Attempt to re-bind the
// data and discard the view if we fail.
@@ -2350,7 +2352,7 @@
}
}
- isScrap[0] = true;
+ outMetadata[0] = true;
// Finish the temporary detach started in addScrapView().
transientView.dispatchFinishTemporaryDetach();
@@ -2363,19 +2365,11 @@
if (child != scrapView) {
// Failed to re-bind the data, return scrap to the heap.
mRecycler.addScrapView(scrapView, position);
- } else {
- if (child.isTemporarilyDetached()) {
- isScrap[0] = true;
+ } else if (child.isTemporarilyDetached()) {
+ outMetadata[0] = true;
- // Finish the temporary detach started in addScrapView().
- child.dispatchFinishTemporaryDetach();
- } else {
- // we set isScrap to "true" only if the view is temporarily detached.
- // if the view is fully detached, it is as good as a view created by the
- // adapter
- isScrap[0] = false;
- }
-
+ // Finish the temporary detach started in addScrapView().
+ child.dispatchFinishTemporaryDetach();
}
}
@@ -3003,8 +2997,9 @@
setChildrenDrawingCacheEnabled(false);
if (mFlingRunnable != null) {
removeCallbacks(mFlingRunnable);
- // let the fling runnable report it's new state which
+ // let the fling runnable report its new state which
// should be idle
+ mFlingRunnable.mSuppressIdleStateChangeCall = false;
mFlingRunnable.endFling();
if (mPositionScroller != null) {
mPositionScroller.stop();
@@ -4555,6 +4550,12 @@
*/
private int mLastFlingY;
+ /**
+ * If true, {@link #endFling()} will not report scroll state change to
+ * {@link OnScrollListener#SCROLL_STATE_IDLE}.
+ */
+ private boolean mSuppressIdleStateChangeCall;
+
private final Runnable mCheckFlywheel = new Runnable() {
@Override
public void run() {
@@ -4593,6 +4594,7 @@
mScroller.fling(0, initialY, 0, initialVelocity,
0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
mTouchMode = TOUCH_MODE_FLING;
+ mSuppressIdleStateChangeCall = false;
postOnAnimation(this);
if (PROFILE_FLINGING) {
@@ -4608,6 +4610,7 @@
}
void startSpringback() {
+ mSuppressIdleStateChangeCall = false;
if (mScroller.springBack(0, mScrollY, 0, 0, 0, 0)) {
mTouchMode = TOUCH_MODE_OVERFLING;
invalidate();
@@ -4623,6 +4626,7 @@
mScroller.fling(0, mScrollY, 0, initialVelocity, 0, 0,
Integer.MIN_VALUE, Integer.MAX_VALUE, 0, getHeight());
mTouchMode = TOUCH_MODE_OVERFLING;
+ mSuppressIdleStateChangeCall = false;
invalidate();
postOnAnimation(this);
}
@@ -4649,12 +4653,14 @@
postOnAnimation(this);
}
- void startScroll(int distance, int duration, boolean linear) {
+ void startScroll(int distance, int duration, boolean linear,
+ boolean suppressEndFlingStateChangeCall) {
int initialY = distance < 0 ? Integer.MAX_VALUE : 0;
mLastFlingY = initialY;
mScroller.setInterpolator(linear ? sLinearInterpolator : null);
mScroller.startScroll(0, initialY, 0, distance, duration);
mTouchMode = TOUCH_MODE_FLING;
+ mSuppressIdleStateChangeCall = suppressEndFlingStateChangeCall;
postOnAnimation(this);
}
@@ -4664,7 +4670,9 @@
removeCallbacks(this);
removeCallbacks(mCheckFlywheel);
- reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
+ if (!mSuppressIdleStateChangeCall) {
+ reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
+ }
clearScrollingCache();
mScroller.abortAnimation();
@@ -4907,10 +4915,11 @@
* @param duration Duration of the scroll animation in milliseconds.
*/
public void smoothScrollBy(int distance, int duration) {
- smoothScrollBy(distance, duration, false);
+ smoothScrollBy(distance, duration, false, false);
}
- void smoothScrollBy(int distance, int duration, boolean linear) {
+ void smoothScrollBy(int distance, int duration, boolean linear,
+ boolean suppressEndFlingStateChangeCall) {
if (mFlingRunnable == null) {
mFlingRunnable = new FlingRunnable();
}
@@ -4932,7 +4941,7 @@
}
} else {
reportScrollStateChange(OnScrollListener.SCROLL_STATE_FLING);
- mFlingRunnable.startScroll(distance, duration, linear);
+ mFlingRunnable.startScroll(distance, duration, linear, suppressEndFlingStateChangeCall);
}
}
@@ -5006,6 +5015,9 @@
/**
* Scrolls the list items within the view by a specified number of pixels.
*
+ * <p>The actual amount of scroll is capped by the list content viewport height
+ * which is the list height minus top and bottom paddings minus one pixel.</p>
+ *
* @param y the amount of pixels to scroll by vertically
* @see #canScrollList(int)
*/
@@ -5985,8 +5997,8 @@
}
@Override
- public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) {
- return getTarget().commitContent(inputContentInfo, opts);
+ public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
+ return getTarget().commitContent(inputContentInfo, flags, opts);
}
}
@@ -7367,7 +7379,7 @@
} else {
// On-screen, just scroll.
final int targetTop = getChildAt(mTargetPos - firstPos).getTop();
- smoothScrollBy(targetTop - offset, duration, true);
+ smoothScrollBy(targetTop - offset, duration, true, false);
return;
}
@@ -7467,7 +7479,7 @@
Math.max(mListPadding.bottom, mExtraScroll) : mListPadding.bottom;
final int scrollBy = lastViewHeight - lastViewPixelsShowing + extraScroll;
- smoothScrollBy(scrollBy, mScrollDuration, true);
+ smoothScrollBy(scrollBy, mScrollDuration, true, lastPos < mTargetPos);
mLastSeenPos = lastPos;
if (lastPos < mTargetPos) {
@@ -7482,6 +7494,7 @@
if (firstPos == mBoundPos || childCount <= nextViewIndex
|| firstPos + childCount >= mItemCount) {
+ reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
return;
}
final int nextPos = firstPos + nextViewIndex;
@@ -7498,14 +7511,16 @@
final int extraScroll = Math.max(mListPadding.bottom, mExtraScroll);
if (nextPos < mBoundPos) {
smoothScrollBy(Math.max(0, nextViewHeight + nextViewTop - extraScroll),
- mScrollDuration, true);
+ mScrollDuration, true, true);
mLastSeenPos = nextPos;
postOnAnimation(this);
} else {
if (nextViewTop > extraScroll) {
- smoothScrollBy(nextViewTop - extraScroll, mScrollDuration, true);
+ smoothScrollBy(nextViewTop - extraScroll, mScrollDuration, true, false);
+ } else {
+ reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
}
}
break;
@@ -7526,7 +7541,8 @@
final int extraScroll = firstPos > 0 ?
Math.max(mExtraScroll, mListPadding.top) : mListPadding.top;
- smoothScrollBy(firstViewTop - extraScroll, mScrollDuration, true);
+ smoothScrollBy(firstViewTop - extraScroll, mScrollDuration, true,
+ firstPos > mTargetPos);
mLastSeenPos = firstPos;
@@ -7556,13 +7572,16 @@
final int extraScroll = Math.max(mListPadding.top, mExtraScroll);
mLastSeenPos = lastPos;
if (lastPos > mBoundPos) {
- smoothScrollBy(-(lastViewPixelsShowing - extraScroll), mScrollDuration, true);
+ smoothScrollBy(-(lastViewPixelsShowing - extraScroll), mScrollDuration, true,
+ true);
postOnAnimation(this);
} else {
final int bottom = listHeight - extraScroll;
final int lastViewBottom = lastViewTop + lastViewHeight;
if (bottom > lastViewBottom) {
- smoothScrollBy(-(bottom - lastViewBottom), mScrollDuration, true);
+ smoothScrollBy(-(bottom - lastViewBottom), mScrollDuration, true, false);
+ } else {
+ reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
}
}
break;
@@ -7595,12 +7614,12 @@
if (position < firstPos) {
final int distance = (int) (-getHeight() * modifier);
final int duration = (int) (mScrollDuration * modifier);
- smoothScrollBy(distance, duration, true);
+ smoothScrollBy(distance, duration, true, true);
postOnAnimation(this);
} else if (position > lastPos) {
final int distance = (int) (getHeight() * modifier);
final int duration = (int) (mScrollDuration * modifier);
- smoothScrollBy(distance, duration, true);
+ smoothScrollBy(distance, duration, true, true);
postOnAnimation(this);
} else {
// On-screen, just scroll.
@@ -7608,7 +7627,7 @@
final int distance = targetTop - mOffsetFromTop;
final int duration = (int) (mScrollDuration *
((float) Math.abs(distance) / getHeight()));
- smoothScrollBy(distance, duration, true);
+ smoothScrollBy(distance, duration, true, false);
}
break;
}
diff --git a/core/java/android/widget/CalendarViewLegacyDelegate.java b/core/java/android/widget/CalendarViewLegacyDelegate.java
index 91eaab8..bcda83f 100644
--- a/core/java/android/widget/CalendarViewLegacyDelegate.java
+++ b/core/java/android/widget/CalendarViewLegacyDelegate.java
@@ -789,14 +789,14 @@
* @param forceScroll Whether to recenter even if the time is already
* visible.
*
- * @throws IllegalArgumentException of the provided date is before the
- * range start of after the range end.
+ * @throws IllegalArgumentException if the provided date is before the
+ * range start or after the range end.
*/
private void goTo(Calendar date, boolean animate, boolean setSelected,
boolean forceScroll) {
if (date.before(mMinDate) || date.after(mMaxDate)) {
- throw new IllegalArgumentException("Time not between " + mMinDate.getTime()
- + " and " + mMaxDate.getTime());
+ throw new IllegalArgumentException("timeInMillis must be between the values of "
+ + "getMinDate() and getMaxDate()");
}
// Find the first and last entirely visible weeks
int firstFullyVisiblePosition = mListView.getFirstVisiblePosition();
diff --git a/core/java/android/widget/DayPickerView.java b/core/java/android/widget/DayPickerView.java
index 7e950f7..0c02a2b 100644
--- a/core/java/android/widget/DayPickerView.java
+++ b/core/java/android/widget/DayPickerView.java
@@ -16,6 +16,8 @@
package android.widget;
+import static android.os.Build.VERSION_CODES.N_MR1;
+
import android.graphics.Rect;
import com.android.internal.R;
import com.android.internal.widget.ViewPager;
@@ -291,8 +293,21 @@
* @param timeInMillis the target day in milliseconds
* @param animate whether to smooth scroll to the new position
* @param setSelected whether to set the specified day as selected
+ *
+ * @throws IllegalArgumentException as of {@link android.os.Build.VERSION_CODES#N_MR1} if the
+ * provided timeInMillis is before the range start or after the range end.
*/
private void setDate(long timeInMillis, boolean animate, boolean setSelected) {
+ getTempCalendarForTime(timeInMillis);
+
+ final int targetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
+ if (targetSdkVersion >= N_MR1) {
+ if (mTempCalendar.before(mMinDate) || mTempCalendar.after(mMaxDate)) {
+ throw new IllegalArgumentException("timeInMillis must be between the values of "
+ + "getMinDate() and getMaxDate()");
+ }
+ }
+
if (setSelected) {
mSelectedDay.setTimeInMillis(timeInMillis);
}
@@ -302,7 +317,6 @@
mViewPager.setCurrentItem(position, animate);
}
- mTempCalendar.setTimeInMillis(timeInMillis);
mAdapter.setSelectedDay(mTempCalendar);
}
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index c619c6d..a0447a6 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -136,7 +136,7 @@
static final int BLINK = 500;
private static final float[] TEMP_POSITION = new float[2];
- private static int DRAG_SHADOW_MAX_TEXT_LENGTH = 20;
+ private static final int DRAG_SHADOW_MAX_TEXT_LENGTH = 20;
private static final float LINE_SLOP_MULTIPLIER_FOR_HANDLEVIEWS = 0.5f;
private static final int UNSET_X_VALUE = -1;
private static final int UNSET_LINE = -1;
@@ -182,7 +182,9 @@
isDirty = true;
renderNode = RenderNode.create(name, null);
}
- boolean needsRecord() { return isDirty || !renderNode.isValid(); }
+ boolean needsRecord() {
+ return isDirty || !renderNode.isValid();
+ }
}
private TextRenderNode[] mTextRenderNodes;
@@ -278,7 +280,8 @@
final ProcessTextIntentActionsHandler mProcessTextIntentActionsHandler;
- private final CursorAnchorInfoNotifier mCursorAnchorInfoNotifier = new CursorAnchorInfoNotifier();
+ private final CursorAnchorInfoNotifier mCursorAnchorInfoNotifier =
+ new CursorAnchorInfoNotifier();
private final Runnable mShowFloatingToolbar = new Runnable() {
@Override
@@ -454,7 +457,8 @@
com.android.internal.R.layout.textview_hint, null);
final float scale = mTextView.getResources().getDisplayMetrics().density;
- mErrorPopup = new ErrorPopup(err, (int)(200 * scale + 0.5f), (int)(50 * scale + 0.5f));
+ mErrorPopup =
+ new ErrorPopup(err, (int) (200 * scale + 0.5f), (int) (50 * scale + 0.5f));
mErrorPopup.setFocusable(false);
// The user is entering text, so the input method is needed. We
// don't want the popup to be displayed on top of it.
@@ -532,9 +536,9 @@
switch (layoutDirection) {
default:
case View.LAYOUT_DIRECTION_LTR:
- offset = - (dr != null ? dr.mDrawableSizeRight : 0) / 2 + (int) (25 * scale + 0.5f);
- errorX = mTextView.getWidth() - mErrorPopup.getWidth() -
- mTextView.getPaddingRight() + offset;
+ offset = -(dr != null ? dr.mDrawableSizeRight : 0) / 2 + (int) (25 * scale + 0.5f);
+ errorX = mTextView.getWidth() - mErrorPopup.getWidth()
+ - mTextView.getPaddingRight() + offset;
break;
case View.LAYOUT_DIRECTION_RTL:
offset = (dr != null ? dr.mDrawableSizeLeft : 0) / 2 - (int) (25 * scale + 0.5f);
@@ -554,8 +558,8 @@
* if the text height is smaller.
*/
final int compoundPaddingTop = mTextView.getCompoundPaddingTop();
- int vspace = mTextView.getBottom() - mTextView.getTop() -
- mTextView.getCompoundPaddingBottom() - compoundPaddingTop;
+ int vspace = mTextView.getBottom() - mTextView.getTop()
+ - mTextView.getCompoundPaddingBottom() - compoundPaddingTop;
final Drawables dr = mTextView.mDrawables;
@@ -654,8 +658,8 @@
// One is the true focus lost where suggestions pop-up (if any) should be dismissed, and the
// other is an side effect of showing the suggestions pop-up itself. We use isShowingUp()
// to distinguish one from the other.
- if (mSuggestionsPopupWindow != null && ((mTextView.isInExtractedMode()) ||
- !mSuggestionsPopupWindow.isShowingUp())) {
+ if (mSuggestionsPopupWindow != null && ((mTextView.isInExtractedMode())
+ || !mSuggestionsPopupWindow.isShowingUp())) {
// Should be done before hide insertion point controller since it triggers a show of it
mSuggestionsPopupWindow.hide();
}
@@ -670,8 +674,8 @@
mTextView.removeAdjacentSuggestionSpans(start);
mTextView.removeAdjacentSuggestionSpans(end);
- if (mTextView.isTextEditable() && mTextView.isSuggestionsEnabled() &&
- !(mTextView.isInExtractedMode())) {
+ if (mTextView.isTextEditable() && mTextView.isSuggestionsEnabled()
+ && !(mTextView.isInExtractedMode())) {
if (mSpellChecker == null && createSpellChecker) {
mSpellChecker = new SpellChecker(mTextView);
}
@@ -802,13 +806,13 @@
int variation = inputType & InputType.TYPE_MASK_VARIATION;
// Specific text field types: select the entire text for these
- if (klass == InputType.TYPE_CLASS_NUMBER ||
- klass == InputType.TYPE_CLASS_PHONE ||
- klass == InputType.TYPE_CLASS_DATETIME ||
- variation == InputType.TYPE_TEXT_VARIATION_URI ||
- variation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS ||
- variation == InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS ||
- variation == InputType.TYPE_TEXT_VARIATION_FILTER) {
+ if (klass == InputType.TYPE_CLASS_NUMBER
+ || klass == InputType.TYPE_CLASS_PHONE
+ || klass == InputType.TYPE_CLASS_DATETIME
+ || variation == InputType.TYPE_TEXT_VARIATION_URI
+ || variation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+ || variation == InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS
+ || variation == InputType.TYPE_TEXT_VARIATION_FILTER) {
return true;
}
return false;
@@ -838,8 +842,8 @@
int selectionStart, selectionEnd;
// If a URLSpan (web address, email, phone...) is found at that position, select it.
- URLSpan[] urlSpans = ((Spanned) mTextView.getText()).
- getSpans(minOffset, maxOffset, URLSpan.class);
+ URLSpan[] urlSpans =
+ ((Spanned) mTextView.getText()).getSpans(minOffset, maxOffset, URLSpan.class);
if (urlSpans.length >= 1) {
URLSpan urlSpan = urlSpans[0];
selectionStart = ((Spanned) mTextView.getText()).getSpanStart(urlSpan);
@@ -853,8 +857,8 @@
selectionStart = wordIterator.getBeginning(minOffset);
selectionEnd = wordIterator.getEnd(maxOffset);
- if (selectionStart == BreakIterator.DONE || selectionEnd == BreakIterator.DONE ||
- selectionStart == selectionEnd) {
+ if (selectionStart == BreakIterator.DONE || selectionEnd == BreakIterator.DONE
+ || selectionStart == selectionEnd) {
// Possible when the word iterator does not properly handle the text's language
long range = getCharClusterRange(minOffset);
selectionStart = TextUtils.unpackRangeStartFromLong(range);
@@ -957,8 +961,8 @@
private int getNextCursorOffset(int offset, boolean findAfterGivenOffset) {
final Layout layout = mTextView.getLayout();
if (layout == null) return offset;
- return findAfterGivenOffset == layout.isRtlCharAt(offset) ?
- layout.getOffsetToLeftOf(offset) : layout.getOffsetToRightOf(offset);
+ return findAfterGivenOffset == layout.isRtlCharAt(offset)
+ ? layout.getOffsetToLeftOf(offset) : layout.getOffsetToRightOf(offset);
}
private long getCharClusterRange(int offset) {
@@ -1024,8 +1028,8 @@
position[1] -= view.getScrollY();
}
- if (position[0] < 0 || position[1] < 0 ||
- position[0] > view.getWidth() || position[1] > view.getHeight()) {
+ if (position[0] < 0 || position[1] < 0 || position[0] > view.getWidth()
+ || position[1] > view.getHeight()) {
return false;
}
@@ -1096,8 +1100,8 @@
public boolean performLongClick(boolean handled) {
// Long press in empty space moves cursor and starts the insertion action mode.
- if (!handled && !isPositionOnText(mLastDownPositionX, mLastDownPositionY) &&
- mInsertionControllerEnabled) {
+ if (!handled && !isPositionOnText(mLastDownPositionX, mLastDownPositionY)
+ && mInsertionControllerEnabled) {
final int offset = mTextView.getOffsetForPosition(mLastDownPositionX,
mLastDownPositionY);
Selection.setSelection((Spannable) mTextView.getText(), offset);
@@ -1141,11 +1145,11 @@
// SelectAllOnFocus fields are highlighted and not selected. Do not start text selection
// mode for these, unless there was a specific selection already started.
- final boolean isFocusHighlighted = mSelectAllOnFocus && selStart == 0 &&
- selEnd == mTextView.getText().length();
+ final boolean isFocusHighlighted = mSelectAllOnFocus && selStart == 0
+ && selEnd == mTextView.getText().length();
- mCreatedWithASelection = mFrozenWithFocus && mTextView.hasSelection() &&
- !isFocusHighlighted;
+ mCreatedWithASelection = mFrozenWithFocus && mTextView.hasSelection()
+ && !isFocusHighlighted;
if (!mFrozenWithFocus || (selStart < 0 || selEnd < 0)) {
// If a tap was used to give focus to that view, move cursor at tap position.
@@ -1166,8 +1170,8 @@
// ExtractEditText clears focus, which gives focus to the ExtractEditText.
// This special case ensure that we keep current selection in that case.
// It would be better to know why the DecorView does not have focus at that time.
- if (((mTextView.isInExtractedMode()) || mSelectionMoved) &&
- selStart >= 0 && selEnd >= 0) {
+ if (((mTextView.isInExtractedMode()) || mSelectionMoved)
+ && selStart >= 0 && selEnd >= 0) {
/*
* Someone intentionally set the selection, so let them
* do whatever it is that they wanted to do instead of
@@ -1310,8 +1314,8 @@
// Detect double tap and triple click.
if (((mTapState == TAP_STATE_FIRST_TAP)
|| ((mTapState == TAP_STATE_DOUBLE_TAP) && isMouse))
- && (SystemClock.uptimeMillis() - mLastTouchUpTime) <=
- ViewConfiguration.getDoubleTapTimeout()) {
+ && (SystemClock.uptimeMillis() - mLastTouchUpTime)
+ <= ViewConfiguration.getDoubleTapTimeout()) {
if (mTapState == TAP_STATE_FIRST_TAP) {
mTapState = TAP_STATE_DOUBLE_TAP;
} else {
@@ -1465,8 +1469,8 @@
// Show drag handles if they were blocked by batch edit mode.
if (mTextActionMode != null) {
- final CursorController cursorController = mTextView.hasSelection() ?
- getSelectionController() : getInsertionController();
+ final CursorController cursorController = mTextView.hasSelection()
+ ? getSelectionController() : getInsertionController();
if (cursorController != null && !cursorController.isActive()
&& !cursorController.isCursorBeingModified()) {
cursorController.show();
@@ -1506,7 +1510,7 @@
partialEndOffset += delta;
// Adjust offsets to ensure we contain full spans.
if (content instanceof Spanned) {
- Spanned spanned = (Spanned)content;
+ Spanned spanned = (Spanned) content;
Object[] spans = spanned.getSpans(partialStartOffset,
partialEndOffset, ParcelableSpan.class);
int i = spans.length;
@@ -1532,7 +1536,7 @@
partialEndOffset = 0;
}
}
- if ((request.flags&InputConnection.GET_TEXT_WITH_STYLES) != 0) {
+ if ((request.flags & InputConnection.GET_TEXT_WITH_STYLES) != 0) {
outText.text = content.subSequence(partialStartOffset,
partialEndOffset);
} else {
@@ -1568,20 +1572,24 @@
if (req != null) {
InputMethodManager imm = InputMethodManager.peekInstance();
if (imm != null) {
- if (TextView.DEBUG_EXTRACT) Log.v(TextView.LOG_TAG,
- "Retrieving extracted start=" + ims.mChangedStart +
- " end=" + ims.mChangedEnd +
- " delta=" + ims.mChangedDelta);
+ if (TextView.DEBUG_EXTRACT) {
+ Log.v(TextView.LOG_TAG, "Retrieving extracted start="
+ + ims.mChangedStart
+ + " end=" + ims.mChangedEnd
+ + " delta=" + ims.mChangedDelta);
+ }
if (ims.mChangedStart < 0 && !contentChanged) {
ims.mChangedStart = EXTRACT_NOTHING;
}
if (extractTextInternal(req, ims.mChangedStart, ims.mChangedEnd,
ims.mChangedDelta, ims.mExtractedText)) {
- if (TextView.DEBUG_EXTRACT) Log.v(TextView.LOG_TAG,
- "Reporting extracted start=" +
- ims.mExtractedText.partialStartOffset +
- " end=" + ims.mExtractedText.partialEndOffset +
- ": " + ims.mExtractedText.text);
+ if (TextView.DEBUG_EXTRACT) {
+ Log.v(TextView.LOG_TAG,
+ "Reporting extracted start="
+ + ims.mExtractedText.partialStartOffset
+ + " end=" + ims.mExtractedText.partialEndOffset
+ + ": " + ims.mExtractedText.text);
+ }
imm.updateExtractedText(mTextView, req.token, ims.mExtractedText);
ims.mChangedStart = EXTRACT_UNKNOWN;
@@ -1701,7 +1709,8 @@
new TextRenderNode("Text " + blockIndex);
}
- final boolean blockDisplayListIsInvalid = mTextRenderNodes[blockIndex].needsRecord();
+ final boolean blockDisplayListIsInvalid =
+ mTextRenderNodes[blockIndex].needsRecord();
RenderNode blockDisplayList = mTextRenderNodes[blockIndex].renderNode;
if (i >= indexFirstChangedBlock || blockDisplayListIsInvalid) {
final int blockBeginLine = endOfPreviousBlock + 1;
@@ -2201,9 +2210,10 @@
}
private void updateCursorPosition(int cursorIndex, int top, int bottom, float horizontal) {
- if (mCursorDrawable[cursorIndex] == null)
+ if (mCursorDrawable[cursorIndex] == null) {
mCursorDrawable[cursorIndex] = mTextView.getContext().getDrawable(
mTextView.mCursorDrawableRes);
+ }
final Drawable drawable = mCursorDrawable[cursorIndex];
final int left = clampHorizontalPosition(drawable, horizontal);
final int width = drawable.getIntrinsicWidth();
@@ -2243,8 +2253,8 @@
if (horizontalDiff >= (viewClippedWidth - 1f)) {
// at the rightmost position
left = viewClippedWidth + scrollX - (drawableWidth - mTempRect.right);
- } else if (Math.abs(horizontalDiff) <= 1f ||
- (TextUtils.isEmpty(mTextView.getText())
+ } else if (Math.abs(horizontalDiff) <= 1f
+ || (TextUtils.isEmpty(mTextView.getText())
&& (TextView.VERY_WIDE - scrollX) <= (viewClippedWidth + 1f)
&& horizontal <= 1f)) {
// at the leftmost position
@@ -2271,6 +2281,7 @@
}
mCorrectionHighlighter.highlight(info);
+ mUndoInputFilter.onCommitCorrection();
}
void onScrollChanged() {
@@ -2391,53 +2402,51 @@
try {
ClipData clipData = event.getClipData();
final int itemCount = clipData.getItemCount();
- for (int i=0; i < itemCount; i++) {
+ for (int i = 0; i < itemCount; i++) {
Item item = clipData.getItemAt(i);
content.append(item.coerceToStyledText(mTextView.getContext()));
}
- }
- finally {
+ } finally {
if (permissions != null) {
permissions.release();
}
}
- final int offset = mTextView.getOffsetForPosition(event.getX(), event.getY());
-
- Object localState = event.getLocalState();
- DragLocalState dragLocalState = null;
- if (localState instanceof DragLocalState) {
- dragLocalState = (DragLocalState) localState;
- }
- boolean dragDropIntoItself = dragLocalState != null &&
- dragLocalState.sourceTextView == mTextView;
-
- if (dragDropIntoItself) {
- if (offset >= dragLocalState.start && offset < dragLocalState.end) {
- // A drop inside the original selection discards the drop.
- return;
+ mTextView.beginBatchEdit();
+ try {
+ final int offset = mTextView.getOffsetForPosition(event.getX(), event.getY());
+ Object localState = event.getLocalState();
+ DragLocalState dragLocalState = null;
+ if (localState instanceof DragLocalState) {
+ dragLocalState = (DragLocalState) localState;
}
- }
+ boolean dragDropIntoItself = dragLocalState != null
+ && dragLocalState.sourceTextView == mTextView;
- final int originalLength = mTextView.getText().length();
- int min = offset;
- int max = offset;
-
- Selection.setSelection((Spannable) mTextView.getText(), max);
- mTextView.replaceText_internal(min, max, content);
-
- if (dragDropIntoItself) {
- int dragSourceStart = dragLocalState.start;
- int dragSourceEnd = dragLocalState.end;
- if (max <= dragSourceStart) {
- // Inserting text before selection has shifted positions
- final int shift = mTextView.getText().length() - originalLength;
- dragSourceStart += shift;
- dragSourceEnd += shift;
+ if (dragDropIntoItself) {
+ if (offset >= dragLocalState.start && offset < dragLocalState.end) {
+ // A drop inside the original selection discards the drop.
+ return;
+ }
}
- mUndoInputFilter.setForceMerge(true);
- try {
+ final int originalLength = mTextView.getText().length();
+ int min = offset;
+ int max = offset;
+
+ Selection.setSelection((Spannable) mTextView.getText(), max);
+ mTextView.replaceText_internal(min, max, content);
+
+ if (dragDropIntoItself) {
+ int dragSourceStart = dragLocalState.start;
+ int dragSourceEnd = dragLocalState.end;
+ if (max <= dragSourceStart) {
+ // Inserting text before selection has shifted positions
+ final int shift = mTextView.getText().length() - originalLength;
+ dragSourceStart += shift;
+ dragSourceEnd += shift;
+ }
+
// Delete original selection
mTextView.deleteText_internal(dragSourceStart, dragSourceEnd);
@@ -2450,9 +2459,9 @@
mTextView.deleteText_internal(prevCharIdx, prevCharIdx + 1);
}
}
- } finally {
- mUndoInputFilter.setForceMerge(false);
}
+ } finally {
+ mTextView.endBatchEdit();
}
}
@@ -2823,8 +2832,8 @@
mContentView.setBackgroundResource(
com.android.internal.R.drawable.text_edit_side_paste_window);
- LayoutInflater inflater = (LayoutInflater)mTextView.getContext().
- getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ LayoutInflater inflater = (LayoutInflater) mTextView.getContext()
+ .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LayoutParams wrapContent = new LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -2885,10 +2894,10 @@
// 3 handles
// 3 ActionPopup [replace, suggestion, easyedit] (suggestionsPopup first hides the others)
// 1 CursorAnchorInfoNotifier
- private final int MAXIMUM_NUMBER_OF_LISTENERS = 7;
+ private static final int MAXIMUM_NUMBER_OF_LISTENERS = 7;
private TextViewPositionListener[] mPositionListeners =
new TextViewPositionListener[MAXIMUM_NUMBER_OF_LISTENERS];
- private boolean mCanMove[] = new boolean[MAXIMUM_NUMBER_OF_LISTENERS];
+ private boolean[] mCanMove = new boolean[MAXIMUM_NUMBER_OF_LISTENERS];
private boolean mPositionHasChanged = true;
// Absolute position of the TextView with respect to its parent window
private int mPositionX, mPositionY;
@@ -3402,10 +3411,11 @@
if (spanUnionStart >= 0 && spanUnionEnd > spanUnionStart) {
// Do not leave two adjacent spaces after deletion, or one at beginning of
// text
- if (spanUnionEnd < editable.length() &&
- Character.isSpaceChar(editable.charAt(spanUnionEnd)) &&
- (spanUnionStart == 0 ||
- Character.isSpaceChar(editable.charAt(spanUnionStart - 1)))) {
+ if (spanUnionEnd < editable.length()
+ && Character.isSpaceChar(editable.charAt(spanUnionEnd))
+ && (spanUnionStart == 0
+ || Character.isSpaceChar(
+ editable.charAt(spanUnionStart - 1)))) {
spanUnionEnd = spanUnionEnd + 1;
}
mTextView.deleteText_internal(spanUnionStart, spanUnionEnd);
@@ -3709,29 +3719,29 @@
private void populateMenuWithItems(Menu menu) {
if (mTextView.canCut()) {
menu.add(Menu.NONE, TextView.ID_CUT, MENU_ITEM_ORDER_CUT,
- com.android.internal.R.string.cut).
- setAlphabeticShortcut('x').
- setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ com.android.internal.R.string.cut)
+ .setAlphabeticShortcut('x')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
if (mTextView.canCopy()) {
menu.add(Menu.NONE, TextView.ID_COPY, MENU_ITEM_ORDER_COPY,
- com.android.internal.R.string.copy).
- setAlphabeticShortcut('c').
- setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ com.android.internal.R.string.copy)
+ .setAlphabeticShortcut('c')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
if (mTextView.canPaste()) {
menu.add(Menu.NONE, TextView.ID_PASTE, MENU_ITEM_ORDER_PASTE,
- com.android.internal.R.string.paste).
- setAlphabeticShortcut('v').
- setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ com.android.internal.R.string.paste)
+ .setAlphabeticShortcut('v')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
if (mTextView.canShare()) {
menu.add(Menu.NONE, TextView.ID_SHARE, MENU_ITEM_ORDER_SHARE,
- com.android.internal.R.string.share).
- setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ com.android.internal.R.string.share)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
updateSelectAllItem(menu);
@@ -4102,8 +4112,8 @@
mHorizontalGravity = getHorizontalGravity(isRtlCharAtOffset);
if (oldDrawable != mDrawable && isShowing()) {
// Update popup window position.
- mPositionX = getCursorHorizontalPosition(layout, offset) - mHotspotX -
- getHorizontalOffset() + getCursorOffset();
+ mPositionX = getCursorHorizontalPosition(layout, offset) - mHotspotX
+ - getHorizontalOffset() + getCursorOffset();
mPositionX += mTextView.viewportToContentHorizontalOffset();
mPositionHasChanged = true;
updatePosition(mLastParentX, mLastParentY, false, false);
@@ -4145,8 +4155,8 @@
index = (mPreviousOffsetIndex - i + HISTORY_SIZE) % HISTORY_SIZE;
}
- if (i > 0 && i < iMax &&
- (now - mPreviousOffsetsTimes[index]) > TOUCH_UP_FILTER_DELAY_BEFORE) {
+ if (i > 0 && i < iMax
+ && (now - mPreviousOffsetsTimes[index]) > TOUCH_UP_FILTER_DELAY_BEFORE) {
positionAtCursorOffset(mPreviousOffsets[index], false);
}
}
@@ -4258,8 +4268,8 @@
final int line = layout.getLineForOffset(offset);
mPrevLine = line;
- mPositionX = getCursorHorizontalPosition(layout, offset) - mHotspotX -
- getHorizontalOffset() + getCursorOffset();
+ mPositionX = getCursorHorizontalPosition(layout, offset) - mHotspotX
+ - getHorizontalOffset() + getCursorOffset();
mPositionY = layout.getLineBottom(line);
// Take TextView's padding and scroll into account.
@@ -4790,8 +4800,8 @@
// We still snap to the word boundary but we only use the letters on the
// current line to determine if the user is far enough into the word to snap.
if (layout.getLineForOffset(wordBoundary) != currLine) {
- wordBoundary = isStartHandle() ?
- layout.getLineStart(currLine) : layout.getLineEnd(currLine);
+ wordBoundary = isStartHandle()
+ ? layout.getLineStart(currLine) : layout.getLineEnd(currLine);
}
final int offsetThresholdToSnap = isStartHandle()
? wordEnd - ((wordEnd - wordBoundary) / 2)
@@ -4846,8 +4856,8 @@
|| (!isStartHandle() && adjustedOffset > mPreviousOffset)) {
// Handle has jumped to the word boundary, and the user is moving
// their finger towards the handle, the delta should be updated.
- mTouchWordDelta = mTextView.convertToLocalHorizontalCoordinate(x) -
- getHorizontal(layout, mPreviousOffset);
+ mTouchWordDelta = mTextView.convertToLocalHorizontalCoordinate(x)
+ - getHorizontal(layout, mPreviousOffset);
}
}
@@ -4893,8 +4903,8 @@
// This handle passes another one as it crossed a direction boundary.
// Don't minimize the selection, but keep the handle at the run boundary.
final int currentOffset = getCurrentCursorOffset();
- final int offsetToGetRunRange = isStartHandle() ?
- currentOffset : Math.max(currentOffset - 1, 0);
+ final int offsetToGetRunRange = isStartHandle()
+ ? currentOffset : Math.max(currentOffset - 1, 0);
final long range = layout.getRunRange(offsetToGetRunRange);
if (isStartHandle()) {
offset = TextUtils.unpackRangeStartFromLong(range);
@@ -4941,8 +4951,8 @@
final int offsetToCheck = startHandle ? offset : Math.max(offset - 1, 0);
final boolean isRtlChar = layout.isRtlCharAt(offsetToCheck);
final boolean isRtlParagraph = layout.getParagraphDirection(line) == -1;
- return (isRtlChar == isRtlParagraph) ?
- layout.getPrimaryHorizontal(offset) : layout.getSecondaryHorizontal(offset);
+ return (isRtlChar == isRtlParagraph)
+ ? layout.getPrimaryHorizontal(offset) : layout.getSecondaryHorizontal(offset);
}
@Override
@@ -4961,8 +4971,8 @@
} else if (primaryDiff > secondaryDiff) {
return secondaryOffset;
} else {
- final int offsetToCheck = isStartHandle() ?
- currentOffset : Math.max(currentOffset - 1, 0);
+ final int offsetToCheck = isStartHandle()
+ ? currentOffset : Math.max(currentOffset - 1, 0);
final boolean isRtlChar = layout.isRtlCharAt(offsetToCheck);
final boolean isRtlParagraph = layout.getParagraphDirection(line) == -1;
return isRtlChar == isRtlParagraph ? primaryOffset : secondaryOffset;
@@ -5513,11 +5523,11 @@
private int mStart, mEnd;
private long mFadingStartTime;
private RectF mTempRectF;
- private final static int FADE_OUT_DURATION = 400;
+ private static final int FADE_OUT_DURATION = 400;
public CorrectionHighlighter() {
- mPaint.setCompatibilityScaling(mTextView.getResources().getCompatibilityInfo().
- applicationScale);
+ mPaint.setCompatibilityScaling(
+ mTextView.getResources().getCompatibilityInfo().applicationScale);
mPaint.setStyle(Paint.Style.FILL);
}
@@ -5555,8 +5565,8 @@
final float coef = 1.0f - (float) duration / FADE_OUT_DURATION;
final int highlightColorAlpha = Color.alpha(mTextView.mHighlightColor);
- final int color = (mTextView.mHighlightColor & 0x00FFFFFF) +
- ((int) (highlightColorAlpha * coef) << 24);
+ final int color = (mTextView.mHighlightColor & 0x00FFFFFF)
+ + ((int) (highlightColorAlpha * coef) << 24);
mPaint.setColor(color);
return true;
}
@@ -5628,8 +5638,8 @@
com.android.internal.R.styleable.Theme_errorMessageBackground);
}
- mView.setBackgroundResource(above ? mPopupInlineErrorAboveBackgroundId :
- mPopupInlineErrorBackgroundId);
+ mView.setBackgroundResource(
+ above ? mPopupInlineErrorAboveBackgroundId : mPopupInlineErrorBackgroundId);
}
private int getResourceId(int currentId, int index) {
@@ -5689,6 +5699,8 @@
/**
* An InputFilter that monitors text input to maintain undo history. It does not modify the
* text being typed (and hence always returns null from the filter() method).
+ *
+ * TODO: Make this span aware.
*/
public static class UndoInputFilter implements InputFilter {
private final Editor mEditor;
@@ -5700,8 +5712,11 @@
// rotates the screen during composition.
private boolean mHasComposition;
- // Whether to merge events into one operation.
- private boolean mForceMerge;
+ // Whether the user is expanding or shortening the text
+ private boolean mExpanding;
+
+ // Whether the previous edit operation was in the current batch edit.
+ private boolean mPreviousOperationWasInSameBatchEdit;
public UndoInputFilter(Editor editor) {
mEditor = editor;
@@ -5710,15 +5725,15 @@
public void saveInstanceState(Parcel parcel) {
parcel.writeInt(mIsUserEdit ? 1 : 0);
parcel.writeInt(mHasComposition ? 1 : 0);
+ parcel.writeInt(mExpanding ? 1 : 0);
+ parcel.writeInt(mPreviousOperationWasInSameBatchEdit ? 1 : 0);
}
public void restoreInstanceState(Parcel parcel) {
mIsUserEdit = parcel.readInt() != 0;
mHasComposition = parcel.readInt() != 0;
- }
-
- public void setForceMerge(boolean forceMerge) {
- mForceMerge = forceMerge;
+ mExpanding = parcel.readInt() != 0;
+ mPreviousOperationWasInSameBatchEdit = parcel.readInt() != 0;
}
/**
@@ -5732,14 +5747,15 @@
public void endBatchEdit() {
if (DEBUG_UNDO) Log.d(TAG, "endBatchEdit");
mIsUserEdit = false;
+ mPreviousOperationWasInSameBatchEdit = false;
}
@Override
public CharSequence filter(CharSequence source, int start, int end,
Spanned dest, int dstart, int dend) {
if (DEBUG_UNDO) {
- Log.d(TAG, "filter: source=" + source + " (" + start + "-" + end + ") " +
- "dest=" + dest + " (" + dstart + "-" + dend + ")");
+ Log.d(TAG, "filter: source=" + source + " (" + start + "-" + end + ") "
+ + "dest=" + dest + " (" + dstart + "-" + dend + ")");
}
// Check to see if this edit should be tracked for undo.
@@ -5747,77 +5763,85 @@
return null;
}
- // Check for and handle IME composition edits.
- if (handleCompositionEdit(source, start, end, dstart)) {
- return null;
+ final boolean hadComposition = mHasComposition;
+ mHasComposition = isComposition(source);
+ final boolean wasExpanding = mExpanding;
+ boolean shouldCreateSeparateState = false;
+ if ((end - start) != (dend - dstart)) {
+ mExpanding = (end - start) > (dend - dstart);
+ if (hadComposition && mExpanding != wasExpanding) {
+ shouldCreateSeparateState = true;
+ }
}
- // Handle keyboard edits.
- handleKeyboardEdit(source, start, end, dest, dstart, dend);
+ // Handle edit.
+ handleEdit(source, start, end, dest, dstart, dend, shouldCreateSeparateState);
return null;
}
- /**
- * Returns true iff the edit was handled, either because it should be ignored or because
- * this function created an undo operation for it.
- */
- private boolean handleCompositionEdit(CharSequence source, int start, int end, int dstart) {
- // Ignore edits while the user is composing.
- if (isComposition(source)) {
- mHasComposition = true;
- return true;
+ void onCommitCorrection() {
+ mEditor.mUndoManager.beginUpdate("Edit text");
+ EditOperation lastEdit = getLastEdit();
+ if (lastEdit != null) {
+ lastEdit.mFrozen = true;
}
- final boolean hadComposition = mHasComposition;
- mHasComposition = false;
-
- // Check for the transition out of the composing state.
- if (hadComposition) {
- // If there was no text the user canceled composition. Ignore the edit.
- if (start == end) {
- return true;
- }
-
- // Otherwise the user inserted the composition.
- String newText = TextUtils.substring(source, start, end);
- EditOperation edit = new EditOperation(mEditor, "", dstart, newText);
- recordEdit(edit, mForceMerge);
- return true;
- }
-
- // This was neither a composition event nor a transition out of composing.
- return false;
+ mEditor.mUndoManager.endUpdate();
}
- private void handleKeyboardEdit(CharSequence source, int start, int end,
- Spanned dest, int dstart, int dend) {
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({MERGE_EDIT_MODE_FORCE_MERGE, MERGE_EDIT_MODE_NEVER_MERGE, MERGE_EDIT_MODE_NORMAL})
+ private @interface MergeMode {}
+ private static final int MERGE_EDIT_MODE_FORCE_MERGE = 0;
+ private static final int MERGE_EDIT_MODE_NEVER_MERGE = 1;
+ /** Use {@link EditOperation#mergeWith} to merge */
+ private static final int MERGE_EDIT_MODE_NORMAL = 2;
+
+ private void handleEdit(CharSequence source, int start, int end,
+ Spanned dest, int dstart, int dend, boolean shouldCreateSeparateState) {
// An application may install a TextWatcher to provide additional modifications after
// the initial input filters run (e.g. a credit card formatter that adds spaces to a
// string). This results in multiple filter() calls for what the user considers to be
// a single operation. Always undo the whole set of changes in one step.
- final boolean forceMerge = mForceMerge || isInTextWatcher();
-
+ @MergeMode
+ final int mergeMode;
+ if (isInTextWatcher() || mPreviousOperationWasInSameBatchEdit) {
+ mergeMode = MERGE_EDIT_MODE_FORCE_MERGE;
+ } else if (shouldCreateSeparateState) {
+ mergeMode = MERGE_EDIT_MODE_NEVER_MERGE;
+ } else {
+ mergeMode = MERGE_EDIT_MODE_NORMAL;
+ }
// Build a new operation with all the information from this edit.
String newText = TextUtils.substring(source, start, end);
String oldText = TextUtils.substring(dest, dstart, dend);
- EditOperation edit = new EditOperation(mEditor, oldText, dstart, newText);
- recordEdit(edit, forceMerge);
+ EditOperation edit = new EditOperation(mEditor, oldText, dstart, newText,
+ mHasComposition);
+ if (mHasComposition && TextUtils.equals(edit.mNewText, edit.mOldText)) {
+ return;
+ }
+ recordEdit(edit, mergeMode);
}
+ private EditOperation getLastEdit() {
+ final UndoManager um = mEditor.mUndoManager;
+ return um.getLastOperation(
+ EditOperation.class, mEditor.mUndoOwner, UndoManager.MERGE_MODE_UNIQUE);
+ }
/**
* Fetches the last undo operation and checks to see if a new edit should be merged into it.
* If forceMerge is true then the new edit is always merged.
*/
- private void recordEdit(EditOperation edit, boolean forceMerge) {
+ private void recordEdit(EditOperation edit, @MergeMode int mergeMode) {
// Fetch the last edit operation and attempt to merge in the new edit.
final UndoManager um = mEditor.mUndoManager;
um.beginUpdate("Edit text");
- EditOperation lastEdit = um.getLastOperation(
- EditOperation.class, mEditor.mUndoOwner, UndoManager.MERGE_MODE_UNIQUE);
+ EditOperation lastEdit = getLastEdit();
if (lastEdit == null) {
// Add this as the first edit.
if (DEBUG_UNDO) Log.d(TAG, "filter: adding first op " + edit);
um.addOperation(edit, UndoManager.MERGE_MODE_NONE);
- } else if (forceMerge) {
+ mPreviousOperationWasInSameBatchEdit = mIsUserEdit;
+ } else if (mergeMode == MERGE_EDIT_MODE_FORCE_MERGE) {
// Forced merges take priority because they could be the result of a non-user-edit
// change and this case should not create a new undo operation.
if (DEBUG_UNDO) Log.d(TAG, "filter: force merge " + edit);
@@ -5828,7 +5852,8 @@
if (DEBUG_UNDO) Log.d(TAG, "non-user edit, new op " + edit);
um.commitState(mEditor.mUndoOwner);
um.addOperation(edit, UndoManager.MERGE_MODE_NONE);
- } else if (lastEdit.mergeWith(edit)) {
+ mPreviousOperationWasInSameBatchEdit = mIsUserEdit;
+ } else if (mergeMode == MERGE_EDIT_MODE_NORMAL && lastEdit.mergeWith(edit)) {
// Merge succeeded, nothing else to do.
if (DEBUG_UNDO) Log.d(TAG, "filter: merge succeeded, created " + lastEdit);
} else {
@@ -5836,6 +5861,7 @@
if (DEBUG_UNDO) Log.d(TAG, "filter: merge failed, adding " + edit);
um.commitState(mEditor.mUndoOwner);
um.addOperation(edit, UndoManager.MERGE_MODE_NONE);
+ mPreviousOperationWasInSameBatchEdit = mIsUserEdit;
}
um.endUpdate();
}
@@ -5870,7 +5896,7 @@
return true;
}
- private boolean isComposition(CharSequence source) {
+ private static boolean isComposition(CharSequence source) {
if (!(source instanceof Spannable)) {
return false;
}
@@ -5898,70 +5924,70 @@
private int mType;
private String mOldText;
- private int mOldTextStart;
private String mNewText;
- private int mNewTextStart;
+ private int mStart;
private int mOldCursorPos;
private int mNewCursorPos;
+ private boolean mFrozen;
+ private boolean mIsComposition;
/**
* Constructs an edit operation from a text input operation on editor that replaces the
* oldText starting at dstart with newText.
*/
- public EditOperation(Editor editor, String oldText, int dstart, String newText) {
+ public EditOperation(Editor editor, String oldText, int dstart, String newText,
+ boolean isComposition) {
super(editor.mUndoOwner);
mOldText = oldText;
mNewText = newText;
- // Determine the type of the edit and store where it occurred. Avoid storing
- // irrevelant data (e.g. mNewTextStart for a delete) because that makes the
- // merging logic more complex (e.g. merging deletes could lead to mNewTextStart being
- // outside the bounds of the final text).
+ // Determine the type of the edit.
if (mNewText.length() > 0 && mOldText.length() == 0) {
mType = TYPE_INSERT;
- mNewTextStart = dstart;
} else if (mNewText.length() == 0 && mOldText.length() > 0) {
mType = TYPE_DELETE;
- mOldTextStart = dstart;
} else {
mType = TYPE_REPLACE;
- mOldTextStart = mNewTextStart = dstart;
}
+ mStart = dstart;
// Store cursor data.
mOldCursorPos = editor.mTextView.getSelectionStart();
mNewCursorPos = dstart + mNewText.length();
+ mIsComposition = isComposition;
}
public EditOperation(Parcel src, ClassLoader loader) {
super(src, loader);
mType = src.readInt();
mOldText = src.readString();
- mOldTextStart = src.readInt();
mNewText = src.readString();
- mNewTextStart = src.readInt();
+ mStart = src.readInt();
mOldCursorPos = src.readInt();
mNewCursorPos = src.readInt();
+ mFrozen = src.readInt() == 1;
+ mIsComposition = src.readInt() == 1;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mType);
dest.writeString(mOldText);
- dest.writeInt(mOldTextStart);
dest.writeString(mNewText);
- dest.writeInt(mNewTextStart);
+ dest.writeInt(mStart);
dest.writeInt(mOldCursorPos);
dest.writeInt(mNewCursorPos);
+ dest.writeInt(mFrozen ? 1 : 0);
+ dest.writeInt(mIsComposition ? 1 : 0);
}
private int getNewTextEnd() {
- return mNewTextStart + mNewText.length();
+ return mStart + mNewText.length();
}
private int getOldTextEnd() {
- return mOldTextStart + mOldText.length();
+ return mStart + mOldText.length();
}
@Override
@@ -5974,8 +6000,7 @@
// Remove the new text and insert the old.
Editor editor = getOwnerData();
Editable text = (Editable) editor.mTextView.getText();
- modifyText(text, mNewTextStart, getNewTextEnd(), mOldText, mOldTextStart,
- mOldCursorPos);
+ modifyText(text, mStart, getNewTextEnd(), mOldText, mStart, mOldCursorPos);
}
@Override
@@ -5984,8 +6009,7 @@
// Remove the old text and insert the new.
Editor editor = getOwnerData();
Editable text = (Editable) editor.mTextView.getText();
- modifyText(text, mOldTextStart, getOldTextEnd(), mNewText, mNewTextStart,
- mNewCursorPos);
+ modifyText(text, mStart, getOldTextEnd(), mNewText, mStart, mNewCursorPos);
}
/**
@@ -5999,6 +6023,11 @@
Log.d(TAG, "mergeWith old " + this);
Log.d(TAG, "mergeWith new " + edit);
}
+
+ if (mFrozen) {
+ return false;
+ }
+
switch (mType) {
case TYPE_INSERT:
return mergeInsertWith(edit);
@@ -6012,17 +6041,27 @@
}
private boolean mergeInsertWith(EditOperation edit) {
- // Only merge continuous insertions.
- if (edit.mType != TYPE_INSERT) {
- return false;
+ if (edit.mType == TYPE_INSERT) {
+ // Merge insertions that are contiguous even when it's frozen.
+ if (getNewTextEnd() != edit.mStart) {
+ return false;
+ }
+ mNewText += edit.mNewText;
+ mNewCursorPos = edit.mNewCursorPos;
+ mFrozen = edit.mFrozen;
+ mIsComposition = edit.mIsComposition;
+ return true;
}
- // Only merge insertions that are contiguous.
- if (getNewTextEnd() != edit.mNewTextStart) {
- return false;
+ if (mIsComposition && edit.mType == TYPE_REPLACE
+ && mStart <= edit.mStart && getNewTextEnd() >= edit.getOldTextEnd()) {
+ // Merge insertion with replace as they can be single insertion.
+ mNewText = mNewText.substring(0, edit.mStart - mStart) + edit.mNewText
+ + mNewText.substring(edit.getOldTextEnd() - mStart, mNewText.length());
+ mNewCursorPos = edit.mNewCursorPos;
+ mIsComposition = edit.mIsComposition;
+ return true;
}
- mNewText += edit.mNewText;
- mNewCursorPos = edit.mNewCursorPos;
- return true;
+ return false;
}
// TODO: Support forward delete.
@@ -6032,24 +6071,47 @@
return false;
}
// Only merge deletions that are contiguous.
- if (mOldTextStart != edit.getOldTextEnd()) {
+ if (mStart != edit.getOldTextEnd()) {
return false;
}
- mOldTextStart = edit.mOldTextStart;
+ mStart = edit.mStart;
mOldText = edit.mOldText + mOldText;
mNewCursorPos = edit.mNewCursorPos;
+ mIsComposition = edit.mIsComposition;
return true;
}
private boolean mergeReplaceWith(EditOperation edit) {
- // Replacements can merge only with adjacent inserts.
- if (edit.mType != TYPE_INSERT || getNewTextEnd() != edit.mNewTextStart) {
+ if (edit.mType == TYPE_INSERT && getNewTextEnd() == edit.mStart) {
+ // Merge with adjacent insert.
+ mNewText += edit.mNewText;
+ mNewCursorPos = edit.mNewCursorPos;
+ return true;
+ }
+ if (!mIsComposition) {
return false;
}
- mOldText += edit.mOldText;
- mNewText += edit.mNewText;
- mNewCursorPos = edit.mNewCursorPos;
- return true;
+ if (edit.mType == TYPE_DELETE && mStart <= edit.mStart
+ && getNewTextEnd() >= edit.getOldTextEnd()) {
+ // Merge with delete as they can be single operation.
+ mNewText = mNewText.substring(0, edit.mStart - mStart)
+ + mNewText.substring(edit.getOldTextEnd() - mStart, mNewText.length());
+ if (mNewText.isEmpty()) {
+ mType = TYPE_DELETE;
+ }
+ mNewCursorPos = edit.mNewCursorPos;
+ mIsComposition = edit.mIsComposition;
+ return true;
+ }
+ if (edit.mType == TYPE_REPLACE && mStart == edit.mStart
+ && TextUtils.equals(mNewText, edit.mOldText)) {
+ // Merge with the replace that replaces the same region.
+ mNewText = edit.mNewText;
+ mNewCursorPos = edit.mNewCursorPos;
+ mIsComposition = edit.mIsComposition;
+ return true;
+ }
+ return false;
}
/**
@@ -6058,6 +6120,9 @@
*/
public void forceMergeWith(EditOperation edit) {
if (DEBUG_UNDO) Log.d(TAG, "forceMerge");
+ if (mergeWith(edit)) {
+ return;
+ }
Editor editor = getOwnerData();
// Copy the text of the current field.
@@ -6068,29 +6133,28 @@
Editable originalText = new SpannableStringBuilder(editable.toString());
// Roll back the last operation.
- modifyText(originalText, mNewTextStart, getNewTextEnd(), mOldText, mOldTextStart,
- mOldCursorPos);
+ modifyText(originalText, mStart, getNewTextEnd(), mOldText, mStart, mOldCursorPos);
// Clone the text again and apply the new operation.
Editable finalText = new SpannableStringBuilder(editable.toString());
- modifyText(finalText, edit.mOldTextStart, edit.getOldTextEnd(), edit.mNewText,
- edit.mNewTextStart, edit.mNewCursorPos);
+ modifyText(finalText, edit.mStart, edit.getOldTextEnd(),
+ edit.mNewText, edit.mStart, edit.mNewCursorPos);
- // Convert this operation into a non-mergeable replacement of the entire string.
+ // Convert this operation into a replace operation.
mType = TYPE_REPLACE;
mNewText = finalText.toString();
- mNewTextStart = 0;
mOldText = originalText.toString();
- mOldTextStart = 0;
+ mStart = 0;
mNewCursorPos = edit.mNewCursorPos;
+ mIsComposition = edit.mIsComposition;
// mOldCursorPos is unchanged.
}
private static void modifyText(Editable text, int deleteFrom, int deleteTo,
CharSequence newText, int newTextInsertAt, int newCursorPos) {
// Apply the edit if it is still valid.
- if (isValidRange(text, deleteFrom, deleteTo) &&
- newTextInsertAt <= text.length() - (deleteTo - deleteFrom)) {
+ if (isValidRange(text, deleteFrom, deleteTo)
+ && newTextInsertAt <= text.length() - (deleteTo - deleteFrom)) {
if (deleteFrom != deleteTo) {
text.delete(deleteFrom, deleteTo);
}
@@ -6121,17 +6185,18 @@
@Override
public String toString() {
- return "[mType=" + getTypeString() + ", " +
- "mOldText=" + mOldText + ", " +
- "mOldTextStart=" + mOldTextStart + ", " +
- "mNewText=" + mNewText + ", " +
- "mNewTextStart=" + mNewTextStart + ", " +
- "mOldCursorPos=" + mOldCursorPos + ", " +
- "mNewCursorPos=" + mNewCursorPos + "]";
+ return "[mType=" + getTypeString() + ", "
+ + "mOldText=" + mOldText + ", "
+ + "mNewText=" + mNewText + ", "
+ + "mStart=" + mStart + ", "
+ + "mOldCursorPos=" + mOldCursorPos + ", "
+ + "mNewCursorPos=" + mNewCursorPos + ", "
+ + "mFrozen=" + mFrozen + ", "
+ + "mIsComposition=" + mIsComposition + "]";
}
- public static final Parcelable.ClassLoaderCreator<EditOperation> CREATOR
- = new Parcelable.ClassLoaderCreator<EditOperation>() {
+ public static final Parcelable.ClassLoaderCreator<EditOperation> CREATOR =
+ new Parcelable.ClassLoaderCreator<EditOperation>() {
@Override
public EditOperation createFromParcel(Parcel in) {
return new EditOperation(in, null);
@@ -6161,9 +6226,9 @@
private final PackageManager mPackageManager;
private final String mPackageName;
private final SparseArray<Intent> mAccessibilityIntents = new SparseArray<>();
- private final SparseArray<AccessibilityNodeInfo.AccessibilityAction> mAccessibilityActions
- = new SparseArray<>();
- private final List<ResolveInfo> supportedActivities = new ArrayList<>();
+ private final SparseArray<AccessibilityNodeInfo.AccessibilityAction> mAccessibilityActions =
+ new SparseArray<>();
+ private final List<ResolveInfo> mSupportedActivities = new ArrayList<>();
private ProcessTextIntentActionsHandler(Editor editor) {
mEditor = Preconditions.checkNotNull(editor);
@@ -6179,7 +6244,7 @@
public void onInitializeMenu(Menu menu) {
int i = 0;
loadSupportedActivities();
- for (ResolveInfo resolveInfo : supportedActivities) {
+ for (ResolveInfo resolveInfo : mSupportedActivities) {
menu.add(Menu.NONE, Menu.NONE,
Editor.MENU_ITEM_ORDER_PROCESS_TEXT_INTENT_ACTIONS_START + i++,
getLabel(resolveInfo))
@@ -6206,7 +6271,7 @@
mAccessibilityActions.clear();
int i = 0;
loadSupportedActivities();
- for (ResolveInfo resolveInfo : supportedActivities) {
+ for (ResolveInfo resolveInfo : mSupportedActivities) {
int actionId = TextView.ACCESSIBILITY_ACTION_PROCESS_TEXT_START_ID + i++;
mAccessibilityActions.put(
actionId,
@@ -6249,12 +6314,13 @@
}
private void loadSupportedActivities() {
- supportedActivities.clear();
+ mSupportedActivities.clear();
PackageManager packageManager = mTextView.getContext().getPackageManager();
- List<ResolveInfo> unfiltered = packageManager.queryIntentActivities(createProcessTextIntent(), 0);
+ List<ResolveInfo> unfiltered =
+ packageManager.queryIntentActivities(createProcessTextIntent(), 0);
for (ResolveInfo info : unfiltered) {
if (isSupportedActivity(info)) {
- supportedActivities.add(info);
+ mSupportedActivities.add(info);
}
}
}
diff --git a/core/java/android/widget/ForwardingListener.java b/core/java/android/widget/ForwardingListener.java
index b383e1c..a5fcbc7 100644
--- a/core/java/android/widget/ForwardingListener.java
+++ b/core/java/android/widget/ForwardingListener.java
@@ -58,13 +58,14 @@
public ForwardingListener(View src) {
mSrc = src;
+ src.setLongClickable(true);
+ src.addOnAttachStateChangeListener(this);
+
mScaledTouchSlop = ViewConfiguration.get(src.getContext()).getScaledTouchSlop();
mTapTimeout = ViewConfiguration.getTapTimeout();
// Use a medium-press timeout. Halfway between tap and long-press.
mLongPressTimeout = (mTapTimeout + ViewConfiguration.getLongPressTimeout()) / 2;
-
- src.addOnAttachStateChangeListener(this);
}
/**
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 6d7313d..b95aa52 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1407,72 +1407,73 @@
/**
- * Obtain the view and add it to our list of children. The view can be made
- * fresh, converted from an unused view, or used as is if it was in the
- * recycle bin.
+ * Obtains the view and adds it to our list of children. The view can be
+ * made fresh, converted from an unused view, or used as is if it was in
+ * the recycle bin.
*
- * @param position Logical position in the list
- * @param y Top or bottom edge of the view to add
- * @param flow if true, align top edge to y. If false, align bottom edge to
- * y.
- * @param childrenLeft Left edge where children should be positioned
- * @param selected Is this position selected?
- * @param where to add new item in the list
+ * @param position logical position in the list
+ * @param y top or bottom edge of the view to add
+ * @param flow {@code true} to align top edge to y, {@code false} to align
+ * bottom edge to y
+ * @param childrenLeft left edge where children should be positioned
+ * @param selected {@code true} if the position is selected, {@code false}
+ * otherwise
+ * @param where position at which to add new item in the list
* @return View that was added
*/
private View makeAndAddView(int position, int y, boolean flow, int childrenLeft,
boolean selected, int where) {
- View child;
-
if (!mDataChanged) {
// Try to use an existing view for this position
- child = mRecycler.getActiveView(position);
- if (child != null) {
+ final View activeView = mRecycler.getActiveView(position);
+ if (activeView != null) {
// Found it -- we're using an existing child
// This just needs to be positioned
- setupChild(child, position, y, flow, childrenLeft, selected, true, where);
- return child;
+ setupChild(activeView, position, y, flow, childrenLeft, selected, true, where);
+ return activeView;
}
}
// Make a new view for this position, or convert an unused view if
- // possible
- child = obtainView(position, mIsScrap);
+ // possible.
+ final View child = obtainView(position, mIsScrap);
- // This needs to be positioned and measured
+ // This needs to be positioned and measured.
setupChild(child, position, y, flow, childrenLeft, selected, mIsScrap[0], where);
return child;
}
/**
- * Add a view as a child and make sure it is measured (if necessary) and
+ * Adds a view as a child and make sure it is measured (if necessary) and
* positioned properly.
*
- * @param child The view to add
- * @param position The position of the view
- * @param y The y position relative to which this view will be positioned
- * @param flow if true, align top edge to y. If false, align bottom edge
- * to y.
- * @param childrenLeft Left edge where children should be positioned
- * @param selected Is this position selected?
- * @param recycled Has this view been pulled from the recycle bin? If so it
- * does not need to be remeasured.
- * @param where Where to add the item in the list
+ * @param child the view to add
+ * @param position the position of this child
+ * @param y the y position relative to which this view will be positioned
+ * @param flowDown {@code true} to align top edge to y, {@code false} to
+ * align bottom edge to y
+ * @param childrenLeft left edge where children should be positioned
+ * @param selected {@code true} if the position is selected, {@code false}
+ * otherwise
+ * @param isAttachedToWindow {@code true} if the view is already attached
+ * to the window, e.g. whether it was reused, or
+ * {@code false} otherwise
+ * @param where position at which to add new item in the list
*
*/
- private void setupChild(View child, int position, int y, boolean flow, int childrenLeft,
- boolean selected, boolean recycled, int where) {
+ private void setupChild(View child, int position, int y, boolean flowDown, int childrenLeft,
+ boolean selected, boolean isAttachedToWindow, int where) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW, "setupGridItem");
boolean isSelected = selected && shouldShowSelector();
final boolean updateChildSelected = isSelected != child.isSelected();
final int mode = mTouchMode;
- final boolean isPressed = mode > TOUCH_MODE_DOWN && mode < TOUCH_MODE_SCROLL &&
- mMotionPosition == position;
+ final boolean isPressed = mode > TOUCH_MODE_DOWN && mode < TOUCH_MODE_SCROLL
+ && mMotionPosition == position;
final boolean updateChildPressed = isPressed != child.isPressed();
-
- boolean needToMeasure = !recycled || updateChildSelected || child.isLayoutRequested();
+ final boolean needToMeasure = !isAttachedToWindow || updateChildSelected
+ || child.isLayoutRequested();
// Respect layout params that are already in the view. Otherwise make
// some up...
@@ -1483,13 +1484,9 @@
p.viewType = mAdapter.getItemViewType(position);
p.isEnabled = mAdapter.isEnabled(position);
- if (recycled && !p.forceAdd) {
- attachViewToParent(child, where, p);
- } else {
- p.forceAdd = false;
- addViewInLayout(child, where, p, true);
- }
-
+ // Set up view state before attaching the view, since we may need to
+ // rely on the jumpDrawablesToCurrentState() call that occurs as part
+ // of view attachment.
if (updateChildSelected) {
child.setSelected(isSelected);
if (isSelected) {
@@ -1510,6 +1507,21 @@
}
}
+ if (isAttachedToWindow && !p.forceAdd) {
+ attachViewToParent(child, where, p);
+
+ // If the view isn't attached, or if it's attached but for a different
+ // position, then jump the drawables.
+ if (!isAttachedToWindow
+ || (((AbsListView.LayoutParams) child.getLayoutParams()).scrappedFromPosition)
+ != position) {
+ child.jumpDrawablesToCurrentState();
+ }
+ } else {
+ p.forceAdd = false;
+ addViewInLayout(child, where, p, true);
+ }
+
if (needToMeasure) {
int childHeightSpec = ViewGroup.getChildMeasureSpec(
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), 0, p.height);
@@ -1525,7 +1537,7 @@
final int h = child.getMeasuredHeight();
int childLeft;
- final int childTop = flow ? y : y - h;
+ final int childTop = flowDown ? y : y - h;
final int layoutDirection = getLayoutDirection();
final int absoluteGravity = Gravity.getAbsoluteGravity(mGravity, layoutDirection);
@@ -1553,15 +1565,10 @@
child.offsetTopAndBottom(childTop - child.getTop());
}
- if (mCachingStarted) {
+ if (mCachingStarted && !child.isDrawingCacheEnabled()) {
child.setDrawingCacheEnabled(true);
}
- if (recycled && (((AbsListView.LayoutParams)child.getLayoutParams()).scrappedFromPosition)
- != position) {
- child.jumpDrawablesToCurrentState();
- }
-
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 222a040..184544d 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -545,6 +545,13 @@
* Subsequent calls to {@link #setImageDrawable(Drawable)} will automatically
* mutate the drawable and apply the specified tint and tint mode using
* {@link Drawable#setTintList(ColorStateList)}.
+ * <p>
+ * <em>Note:</em> The default tint mode used by this setter is NOT
+ * consistent with the default tint mode used by the
+ * {@link android.R.styleable#ImageView_tint android:tint}
+ * attribute. If the {@code android:tint} attribute is specified, the
+ * default tint mode will be set to {@link PorterDuff.Mode#SRC_ATOP} to
+ * ensure consistency with earlier versions of the platform.
*
* @param tint the tint to apply, may be {@code null} to clear tint
*
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index 3ced253..33d335a 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -914,7 +914,9 @@
remainingWeightSum -= childWeight;
final int childHeight;
- if (lp.height == 0 && (!mAllowInconsistentMeasurement
+ if (mUseLargestChild && heightMode != MeasureSpec.EXACTLY) {
+ childHeight = largestChildHeight;
+ } else if (lp.height == 0 && (!mAllowInconsistentMeasurement
|| heightMode == MeasureSpec.EXACTLY)) {
// This child needs to be laid out from scratch using
// only its share of excess space.
@@ -1299,7 +1301,9 @@
remainingWeightSum -= childWeight;
final int childWidth;
- if (lp.width == 0 && (!mAllowInconsistentMeasurement
+ if (mUseLargestChild && widthMode != MeasureSpec.EXACTLY) {
+ childWidth = largestChildWidth;
+ } else if (lp.width == 0 && (!mAllowInconsistentMeasurement
|| widthMode == MeasureSpec.EXACTLY)) {
// This child needs to be laid out from scratch using
// only its share of excess space.
diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index 0e04e30..b0f19d7 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -112,8 +112,8 @@
public boolean isSelectable;
}
- private ArrayList<FixedViewInfo> mHeaderViewInfos = Lists.newArrayList();
- private ArrayList<FixedViewInfo> mFooterViewInfos = Lists.newArrayList();
+ ArrayList<FixedViewInfo> mHeaderViewInfos = Lists.newArrayList();
+ ArrayList<FixedViewInfo> mFooterViewInfos = Lists.newArrayList();
Drawable mDivider;
int mDividerHeight;
@@ -279,7 +279,7 @@
// Wrap the adapter if it wasn't already wrapped.
if (mAdapter != null) {
if (!(mAdapter instanceof HeaderViewListAdapter)) {
- mAdapter = new HeaderViewListAdapter(mHeaderViewInfos, mFooterViewInfos, mAdapter);
+ wrapHeaderListAdapterInternal();
}
// In the case of re-adding a header view, or adding one later on,
@@ -373,7 +373,7 @@
// Wrap the adapter if it wasn't already wrapped.
if (mAdapter != null) {
if (!(mAdapter instanceof HeaderViewListAdapter)) {
- mAdapter = new HeaderViewListAdapter(mHeaderViewInfos, mFooterViewInfos, mAdapter);
+ wrapHeaderListAdapterInternal();
}
// In the case of re-adding a footer view, or adding one later on,
@@ -476,7 +476,7 @@
mRecycler.clear();
if (mHeaderViewInfos.size() > 0|| mFooterViewInfos.size() > 0) {
- mAdapter = new HeaderViewListAdapter(mHeaderViewInfos, mFooterViewInfos, adapter);
+ mAdapter = wrapHeaderListAdapterInternal(mHeaderViewInfos, mFooterViewInfos, adapter);
} else {
mAdapter = adapter;
}
@@ -1939,72 +1939,73 @@
}
/**
- * Obtain the view and add it to our list of children. The view can be made
- * fresh, converted from an unused view, or used as is if it was in the
- * recycle bin.
+ * Obtains the view and adds it to our list of children. The view can be
+ * made fresh, converted from an unused view, or used as is if it was in
+ * the recycle bin.
*
- * @param position Logical position in the list
- * @param y Top or bottom edge of the view to add
- * @param flow If flow is true, align top edge to y. If false, align bottom
- * edge to y.
- * @param childrenLeft Left edge where children should be positioned
- * @param selected Is this position selected?
- * @return View that was added
+ * @param position logical position in the list
+ * @param y top or bottom edge of the view to add
+ * @param flow {@code true} to align top edge to y, {@code false} to align
+ * bottom edge to y
+ * @param childrenLeft left edge where children should be positioned
+ * @param selected {@code true} if the position is selected, {@code false}
+ * otherwise
+ * @return the view that was added
*/
private View makeAndAddView(int position, int y, boolean flow, int childrenLeft,
boolean selected) {
- View child;
-
-
if (!mDataChanged) {
- // Try to use an existing view for this position
- child = mRecycler.getActiveView(position);
- if (child != null) {
- // Found it -- we're using an existing child
- // This just needs to be positioned
- setupChild(child, position, y, flow, childrenLeft, selected, true);
-
- return child;
+ // Try to use an existing view for this position.
+ final View activeView = mRecycler.getActiveView(position);
+ if (activeView != null) {
+ // Found it. We're reusing an existing child, so it just needs
+ // to be positioned like a scrap view.
+ setupChild(activeView, position, y, flow, childrenLeft, selected, true);
+ return activeView;
}
}
- // Make a new view for this position, or convert an unused view if possible
- child = obtainView(position, mIsScrap);
+ // Make a new view for this position, or convert an unused view if
+ // possible.
+ final View child = obtainView(position, mIsScrap);
- // This needs to be positioned and measured
+ // This needs to be positioned and measured.
setupChild(child, position, y, flow, childrenLeft, selected, mIsScrap[0]);
return child;
}
/**
- * Add a view as a child and make sure it is measured (if necessary) and
+ * Adds a view as a child and make sure it is measured (if necessary) and
* positioned properly.
*
- * @param child The view to add
- * @param position The position of this child
- * @param y The y position relative to which this view will be positioned
- * @param flowDown If true, align top edge to y. If false, align bottom
- * edge to y.
- * @param childrenLeft Left edge where children should be positioned
- * @param selected Is this position selected?
- * @param recycled Has this view been pulled from the recycle bin? If so it
- * does not need to be remeasured.
+ * @param child the view to add
+ * @param position the position of this child
+ * @param y the y position relative to which this view will be positioned
+ * @param flowDown {@code true} to align top edge to y, {@code false} to
+ * align bottom edge to y
+ * @param childrenLeft left edge where children should be positioned
+ * @param selected {@code true} if the position is selected, {@code false}
+ * otherwise
+ * @param isAttachedToWindow {@code true} if the view is already attached
+ * to the window, e.g. whether it was reused, or
+ * {@code false} otherwise
*/
private void setupChild(View child, int position, int y, boolean flowDown, int childrenLeft,
- boolean selected, boolean recycled) {
+ boolean selected, boolean isAttachedToWindow) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW, "setupListItem");
final boolean isSelected = selected && shouldShowSelector();
final boolean updateChildSelected = isSelected != child.isSelected();
final int mode = mTouchMode;
- final boolean isPressed = mode > TOUCH_MODE_DOWN && mode < TOUCH_MODE_SCROLL &&
- mMotionPosition == position;
+ final boolean isPressed = mode > TOUCH_MODE_DOWN && mode < TOUCH_MODE_SCROLL
+ && mMotionPosition == position;
final boolean updateChildPressed = isPressed != child.isPressed();
- final boolean needToMeasure = !recycled || updateChildSelected || child.isLayoutRequested();
+ final boolean needToMeasure = !isAttachedToWindow || updateChildSelected
+ || child.isLayoutRequested();
- // Respect layout params that are already in the view. Otherwise make some up...
- // noinspection unchecked
+ // Respect layout params that are already in the view. Otherwise make
+ // some up...
AbsListView.LayoutParams p = (AbsListView.LayoutParams) child.getLayoutParams();
if (p == null) {
p = (AbsListView.LayoutParams) generateDefaultLayoutParams();
@@ -2012,17 +2013,9 @@
p.viewType = mAdapter.getItemViewType(position);
p.isEnabled = mAdapter.isEnabled(position);
- if ((recycled && !p.forceAdd) || (p.recycledHeaderFooter
- && p.viewType == AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER)) {
- attachViewToParent(child, flowDown ? -1 : 0, p);
- } else {
- p.forceAdd = false;
- if (p.viewType == AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER) {
- p.recycledHeaderFooter = true;
- }
- addViewInLayout(child, flowDown ? -1 : 0, p, true);
- }
-
+ // Set up view state before attaching the view, since we may need to
+ // rely on the jumpDrawablesToCurrentState() call that occurs as part
+ // of view attachment.
if (updateChildSelected) {
child.setSelected(isSelected);
}
@@ -2040,6 +2033,27 @@
}
}
+ if ((isAttachedToWindow && !p.forceAdd) || (p.recycledHeaderFooter
+ && p.viewType == AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER)) {
+ attachViewToParent(child, flowDown ? -1 : 0, p);
+
+ // If the view was previously attached for a different position,
+ // then manually jump the drawables.
+ if (isAttachedToWindow
+ && (((AbsListView.LayoutParams) child.getLayoutParams()).scrappedFromPosition)
+ != position) {
+ child.jumpDrawablesToCurrentState();
+ }
+ } else {
+ p.forceAdd = false;
+ if (p.viewType == AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER) {
+ p.recycledHeaderFooter = true;
+ }
+ addViewInLayout(child, flowDown ? -1 : 0, p, true);
+ // add view in layout will reset the RTL properties. We have to re-resolve them
+ child.resolveRtlPropertiesIfNeeded();
+ }
+
if (needToMeasure) {
final int childWidthSpec = ViewGroup.getChildMeasureSpec(mWidthMeasureSpec,
mListPadding.left + mListPadding.right, p.width);
@@ -2073,11 +2087,6 @@
child.setDrawingCacheEnabled(true);
}
- if (recycled && (((AbsListView.LayoutParams)child.getLayoutParams()).scrappedFromPosition)
- != position) {
- child.jumpDrawablesToCurrentState();
- }
-
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
@@ -2219,7 +2228,7 @@
* after the header views.
*/
public void setSelectionAfterHeaderView() {
- final int count = mHeaderViewInfos.size();
+ final int count = getHeaderViewsCount();
if (count > 0) {
mNextSelectedPosition = 0;
return;
@@ -3347,7 +3356,7 @@
bounds.right = mRight - mLeft - mPaddingRight;
final int count = getChildCount();
- final int headerCount = mHeaderViewInfos.size();
+ final int headerCount = getHeaderViewsCount();
final int itemCount = mItemCount;
final int footerLimit = (itemCount - mFooterViewInfos.size());
final boolean headerDividers = mHeaderDividersEnabled;
@@ -3931,7 +3940,7 @@
if (drawDividers) {
final boolean fillForMissingDividers = isOpaque() && !super.isOpaque();
final int itemCount = mItemCount;
- final int headerCount = mHeaderViewInfos.size();
+ final int headerCount = getHeaderViewsCount();
final int footerLimit = (itemCount - mFooterViewInfos.size());
final boolean isHeader = (itemIndex < headerCount);
final boolean isFooter = (itemIndex >= footerLimit);
@@ -4043,4 +4052,24 @@
encoder.addProperty("recycleOnMeasure", recycleOnMeasure());
}
+
+ /** @hide */
+ protected HeaderViewListAdapter wrapHeaderListAdapterInternal(
+ ArrayList<ListView.FixedViewInfo> headerViewInfos,
+ ArrayList<ListView.FixedViewInfo> footerViewInfos,
+ ListAdapter adapter) {
+ return new HeaderViewListAdapter(headerViewInfos, footerViewInfos, adapter);
+ }
+
+ /** @hide */
+ protected void wrapHeaderListAdapterInternal() {
+ mAdapter = wrapHeaderListAdapterInternal(mHeaderViewInfos, mFooterViewInfos, mAdapter);
+ }
+
+ /** @hide */
+ protected void dispatchDataSetObserverOnChangedInternal() {
+ if (mDataSetObserver != null) {
+ mDataSetObserver.onChanged();
+ }
+ }
}
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index 404c118..167d526 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1396,7 +1396,7 @@
private int computeGravity() {
int gravity = Gravity.START | Gravity.TOP;
if (mClipToScreen || mClippingEnabled) {
- gravity |= Gravity.DISPLAY_CLIP_VERTICAL | Gravity.DISPLAY_CLIP_HORIZONTAL;
+ gravity |= Gravity.DISPLAY_CLIP_VERTICAL;
}
return gravity;
}
@@ -1547,7 +1547,7 @@
}
// Let the window manager know to align the top to y.
- outParams.gravity = Gravity.LEFT | Gravity.TOP;
+ outParams.gravity = computeGravity();
outParams.width = width;
outParams.height = height;
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index c33288b..2a6e01f 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -202,7 +202,7 @@
new MutablePair<String, Class<?>>(null, null);
/**
- * This annotation indicates that a subclass of View is alllowed to be used
+ * This annotation indicates that a subclass of View is allowed to be used
* with the {@link RemoteViews} mechanism.
*/
@Target({ ElementType.TYPE })
@@ -2430,7 +2430,7 @@
}
/**
- * Equivalent to calling View.setVisibility
+ * Equivalent to calling {@link View#setVisibility(int)}
*
* @param viewId The id of the view whose visibility should change
* @param visibility The new visibility for the view
@@ -2440,7 +2440,7 @@
}
/**
- * Equivalent to calling TextView.setText
+ * Equivalent to calling {@link TextView#setText(CharSequence)}
*
* @param viewId The id of the view whose text should change
* @param text The new text for the view
@@ -2547,7 +2547,7 @@
}
/**
- * Equivalent to calling ImageView.setImageResource
+ * Equivalent to calling {@link ImageView#setImageResource(int)}
*
* @param viewId The id of the view whose drawable should change
* @param srcId The new resource id for the drawable
@@ -2557,7 +2557,7 @@
}
/**
- * Equivalent to calling ImageView.setImageURI
+ * Equivalent to calling {@link ImageView#setImageURI(Uri)}
*
* @param viewId The id of the view whose drawable should change
* @param uri The Uri for the image
@@ -2567,7 +2567,7 @@
}
/**
- * Equivalent to calling ImageView.setImageBitmap
+ * Equivalent to calling {@link ImageView#setImageBitmap(Bitmap)}
*
* @param viewId The id of the view whose bitmap should change
* @param bitmap The new Bitmap for the drawable
@@ -2577,7 +2577,7 @@
}
/**
- * Equivalent to calling ImageView.setImageIcon
+ * Equivalent to calling {@link ImageView#setImageIcon(Icon)}
*
* @param viewId The id of the view whose bitmap should change
* @param icon The new Icon for the ImageView
@@ -2587,7 +2587,7 @@
}
/**
- * Equivalent to calling AdapterView.setEmptyView
+ * Equivalent to calling {@link AdapterView#setEmptyView(View)}
*
* @param viewId The id of the view on which to set the empty view
* @param emptyViewId The view id of the empty view
@@ -2659,8 +2659,8 @@
*
* When setting the on-click action of items within collections (eg. {@link ListView},
* {@link StackView} etc.), this method will not work. Instead, use {@link
- * RemoteViews#setPendingIntentTemplate(int, PendingIntent) in conjunction with
- * RemoteViews#setOnClickFillInIntent(int, Intent).
+ * RemoteViews#setPendingIntentTemplate(int, PendingIntent)} in conjunction with
+ * {@link RemoteViews#setOnClickFillInIntent(int, Intent)}.
*
* @param viewId The id of the view that will trigger the {@link PendingIntent} when clicked
* @param pendingIntent The {@link PendingIntent} to send when user clicks
@@ -2694,9 +2694,7 @@
* fillInIntent is then combined with the PendingIntent template in order to determine the final
* intent which will be executed when the item is clicked. This works as follows: any fields
* which are left blank in the PendingIntent template, but are provided by the fillInIntent
- * will be overwritten, and the resulting PendingIntent will be used.
- *
- *
+ * will be overwritten, and the resulting PendingIntent will be used. The rest
* of the PendingIntent template will then be filled in with the associated fields that are
* set in fillInIntent. See {@link Intent#fillIn(Intent, int)} for more details.
*
@@ -2788,6 +2786,18 @@
}
/**
+ * @hide
+ * Equivalent to calling {@link android.widget.TextView#setTextColor(ColorStateList)}.
+ *
+ * @param viewId The id of the view whose text color should change
+ * @param colors the text colors to set
+ */
+ public void setTextColor(int viewId, @ColorInt ColorStateList colors) {
+ addAction(new ReflectionAction(viewId, "setTextColor", ReflectionAction.COLOR_STATE_LIST,
+ colors));
+ }
+
+ /**
* Equivalent to calling {@link android.widget.AbsListView#setRemoteViewsAdapter(Intent)}.
*
* @param appWidgetId The id of the app widget which contains the specified view. (This
@@ -2841,7 +2851,7 @@
}
/**
- * Equivalent to calling {@link android.widget.AbsListView#smoothScrollToPosition(int, int)}.
+ * Equivalent to calling {@link ListView#smoothScrollToPosition(int)}.
*
* @param viewId The id of the view to change
* @param position Scroll to this adapter position
@@ -2851,7 +2861,7 @@
}
/**
- * Equivalent to calling {@link android.widget.AbsListView#smoothScrollToPosition(int, int)}.
+ * Equivalent to calling {@link ListView#smoothScrollByOffset(int)}.
*
* @param viewId The id of the view to change
* @param offset Scroll by this adapter position offset
@@ -3119,7 +3129,7 @@
}
/**
- * Equivalent to calling View.setLabelFor(int).
+ * Equivalent to calling {@link View#setLabelFor(int)}.
*
* @param viewId The id of the view whose property to set.
* @param labeledId The id of a view for which this view serves as a label.
diff --git a/core/java/android/widget/SlidingDrawer.java b/core/java/android/widget/SlidingDrawer.java
index a55e77d..9f48397 100644
--- a/core/java/android/widget/SlidingDrawer.java
+++ b/core/java/android/widget/SlidingDrawer.java
@@ -22,8 +22,6 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Rect;
-import android.os.Handler;
-import android.os.Message;
import android.os.SystemClock;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -475,19 +473,19 @@
playSoundEffect(SoundEffectConstants.CLICK);
if (mExpanded) {
- animateClose(vertical ? top : left);
+ animateClose(vertical ? top : left, true);
} else {
- animateOpen(vertical ? top : left);
+ animateOpen(vertical ? top : left, true);
}
} else {
- performFling(vertical ? top : left, velocity, false);
+ performFling(vertical ? top : left, velocity, false, true);
}
} else {
- performFling(vertical ? top : left, velocity, false);
+ performFling(vertical ? top : left, velocity, false, true);
}
} else {
- performFling(vertical ? top : left, velocity, false);
+ performFling(vertical ? top : left, velocity, false, true);
}
}
break;
@@ -497,17 +495,18 @@
return mTracking || mAnimating || super.onTouchEvent(event);
}
- private void animateClose(int position) {
+ private void animateClose(int position, boolean notifyScrollListener) {
prepareTracking(position);
- performFling(position, mMaximumAcceleration, true);
+ performFling(position, mMaximumAcceleration, true, notifyScrollListener);
}
- private void animateOpen(int position) {
+ private void animateOpen(int position, boolean notifyScrollListener) {
prepareTracking(position);
- performFling(position, -mMaximumAcceleration, true);
+ performFling(position, -mMaximumAcceleration, true, notifyScrollListener);
}
- private void performFling(int position, float velocity, boolean always) {
+ private void performFling(int position, float velocity, boolean always,
+ boolean notifyScrollListener) {
mAnimationPosition = position;
mAnimatedVelocity = velocity;
@@ -553,7 +552,7 @@
mAnimating = true;
removeCallbacks(mSlidingRunnable);
postDelayed(mSlidingRunnable, ANIMATION_FRAME_DURATION);
- stopTracking();
+ stopTracking(notifyScrollListener);
}
private void prepareTracking(int position) {
@@ -681,11 +680,11 @@
content.setVisibility(View.GONE);
}
- private void stopTracking() {
+ private void stopTracking(boolean notifyScrollListener) {
mHandle.setPressed(false);
mTracking = false;
- if (mOnDrawerScrollListener != null) {
+ if (notifyScrollListener && mOnDrawerScrollListener != null) {
mOnDrawerScrollListener.onScrollEnded();
}
@@ -802,7 +801,7 @@
if (scrollListener != null) {
scrollListener.onScrollStarted();
}
- animateClose(mVertical ? mHandle.getTop() : mHandle.getLeft());
+ animateClose(mVertical ? mHandle.getTop() : mHandle.getLeft(), false);
if (scrollListener != null) {
scrollListener.onScrollEnded();
@@ -824,7 +823,7 @@
if (scrollListener != null) {
scrollListener.onScrollStarted();
}
- animateOpen(mVertical ? mHandle.getTop() : mHandle.getLeft());
+ animateOpen(mVertical ? mHandle.getTop() : mHandle.getLeft(), false);
sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index c4a1771..eb81e6f 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -889,8 +889,9 @@
? mSwitchTransformationMethod.getTransformation(text, this)
: text;
- return new StaticLayout(transformed, mTextPaint,
- (int) Math.ceil(Layout.getDesiredWidth(transformed, mTextPaint)),
+ int width = (int) Math.ceil(Layout.getDesiredWidth(transformed, 0,
+ transformed.length(), mTextPaint, getTextDirectionHeuristic()));
+ return new StaticLayout(transformed, mTextPaint, width,
Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
}
diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java
index 27fa3b9..28d187c 100644
--- a/core/java/android/widget/TabHost.java
+++ b/core/java/android/widget/TabHost.java
@@ -18,6 +18,8 @@
import com.android.internal.R;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.LocalActivityManager;
import android.content.Context;
import android.content.Intent;
@@ -108,10 +110,15 @@
}
/**
- * Get a new {@link TabSpec} associated with this tab host.
- * @param tag required tag of tab.
+ * Creates a new {@link TabSpec} associated with this tab host.
+ *
+ * @param tag tag for the tab specification, must be non-null
*/
- public TabSpec newTabSpec(String tag) {
+ @NonNull
+ public TabSpec newTabSpec(@NonNull String tag) {
+ if (tag == null) {
+ throw new IllegalArgumentException("tag must be non-null");
+ }
return new TabSpec(tag);
}
@@ -240,10 +247,23 @@
return mTabWidget;
}
+ /**
+ * Returns the current tab.
+ *
+ * @return the current tab, may be {@code null} if no tab is set as current
+ */
+ @Nullable
public int getCurrentTab() {
return mCurrentTab;
}
+ /**
+ * Returns the tag for the current tab.
+ *
+ * @return the tag for the current tab, may be {@code null} if no tab is
+ * set as current
+ */
+ @Nullable
public String getCurrentTabTag() {
if (mCurrentTab >= 0 && mCurrentTab < mTabSpecs.size()) {
return mTabSpecs.get(mCurrentTab).getTag();
@@ -251,6 +271,13 @@
return null;
}
+ /**
+ * Returns the view for the current tab.
+ *
+ * @return the view for the current tab, may be {@code null} if no tab is
+ * set as current
+ */
+ @Nullable
public View getCurrentTabView() {
if (mCurrentTab >= 0 && mCurrentTab < mTabSpecs.size()) {
return mTabWidget.getChildTabViewAt(mCurrentTab);
@@ -262,9 +289,13 @@
return mCurrentView;
}
+ /**
+ * Sets the current tab based on its tag.
+ *
+ * @param tag the tag for the tab to set as current
+ */
public void setCurrentTabByTag(String tag) {
- int i;
- for (i = 0; i < mTabSpecs.size(); i++) {
+ for (int i = 0, count = mTabSpecs.size(); i < count; i++) {
if (mTabSpecs.get(i).getTag().equals(tag)) {
setCurrentTab(i);
break;
@@ -462,12 +493,17 @@
*/
public class TabSpec {
- private String mTag;
+ private final @NonNull String mTag;
private IndicatorStrategy mIndicatorStrategy;
private ContentStrategy mContentStrategy;
- private TabSpec(String tag) {
+ /**
+ * Constructs a new tab specification with the specified tag.
+ *
+ * @param tag the tag for the tag specification, must be non-null
+ */
+ private TabSpec(@NonNull String tag) {
mTag = tag;
}
@@ -521,7 +557,12 @@
return this;
}
-
+ /**
+ * Returns the tag for this tab specification.
+ *
+ * @return the tag for this tab specification
+ */
+ @NonNull
public String getTag() {
return mTag;
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 72bfc88..b8616cf 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -342,9 +342,10 @@
// A flag to prevent repeated movements from escaping the enclosing text view. The idea here is
// that if a user is holding down a movement key to traverse text, we shouldn't also traverse
- // the view hierarchy. On the other hand, if the user is using the movement key to traverse views
- // (i.e. the first movement was to traverse out of this view, or this view was traversed into by
- // the user holding the movement key down) then we shouldn't prevent the focus from changing.
+ // the view hierarchy. On the other hand, if the user is using the movement key to traverse
+ // views (i.e. the first movement was to traverse out of this view, or this view was traversed
+ // into by the user holding the movement key down) then we shouldn't prevent the focus from
+ // changing.
private boolean mPreventDefaultMovement;
private TextUtils.TruncateAt mEllipsize;
@@ -386,8 +387,8 @@
public Drawables(Context context) {
final int targetSdkVersion = context.getApplicationInfo().targetSdkVersion;
- mIsRtlCompatibilityMode = (targetSdkVersion < JELLY_BEAN_MR1 ||
- !context.getApplicationInfo().hasRtlSupport());
+ mIsRtlCompatibilityMode = targetSdkVersion < JELLY_BEAN_MR1
+ || !context.getApplicationInfo().hasRtlSupport();
mOverride = false;
}
@@ -767,69 +768,69 @@
int attr = appearance.getIndex(i);
switch (attr) {
- case com.android.internal.R.styleable.TextAppearance_textColorHighlight:
- textColorHighlight = appearance.getColor(attr, textColorHighlight);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textColorHighlight:
+ textColorHighlight = appearance.getColor(attr, textColorHighlight);
+ break;
- case com.android.internal.R.styleable.TextAppearance_textColor:
- textColor = appearance.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textColor:
+ textColor = appearance.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextAppearance_textColorHint:
- textColorHint = appearance.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textColorHint:
+ textColorHint = appearance.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextAppearance_textColorLink:
- textColorLink = appearance.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textColorLink:
+ textColorLink = appearance.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextAppearance_textSize:
- textSize = appearance.getDimensionPixelSize(attr, textSize);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textSize:
+ textSize = appearance.getDimensionPixelSize(attr, textSize);
+ break;
- case com.android.internal.R.styleable.TextAppearance_typeface:
- typefaceIndex = appearance.getInt(attr, -1);
- break;
+ case com.android.internal.R.styleable.TextAppearance_typeface:
+ typefaceIndex = appearance.getInt(attr, -1);
+ break;
- case com.android.internal.R.styleable.TextAppearance_fontFamily:
- fontFamily = appearance.getString(attr);
- break;
+ case com.android.internal.R.styleable.TextAppearance_fontFamily:
+ fontFamily = appearance.getString(attr);
+ break;
- case com.android.internal.R.styleable.TextAppearance_textStyle:
- styleIndex = appearance.getInt(attr, -1);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textStyle:
+ styleIndex = appearance.getInt(attr, -1);
+ break;
- case com.android.internal.R.styleable.TextAppearance_textAllCaps:
- allCaps = appearance.getBoolean(attr, false);
- break;
+ case com.android.internal.R.styleable.TextAppearance_textAllCaps:
+ allCaps = appearance.getBoolean(attr, false);
+ break;
- case com.android.internal.R.styleable.TextAppearance_shadowColor:
- shadowcolor = appearance.getInt(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextAppearance_shadowColor:
+ shadowcolor = appearance.getInt(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextAppearance_shadowDx:
- dx = appearance.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextAppearance_shadowDx:
+ dx = appearance.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextAppearance_shadowDy:
- dy = appearance.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextAppearance_shadowDy:
+ dy = appearance.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextAppearance_shadowRadius:
- r = appearance.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextAppearance_shadowRadius:
+ r = appearance.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextAppearance_elegantTextHeight:
- elegant = appearance.getBoolean(attr, false);
- break;
+ case com.android.internal.R.styleable.TextAppearance_elegantTextHeight:
+ elegant = appearance.getBoolean(attr, false);
+ break;
- case com.android.internal.R.styleable.TextAppearance_letterSpacing:
- letterSpacing = appearance.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextAppearance_letterSpacing:
+ letterSpacing = appearance.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextAppearance_fontFeatureSettings:
- fontFeatureSettings = appearance.getString(attr);
- break;
+ case com.android.internal.R.styleable.TextAppearance_fontFeatureSettings:
+ fontFeatureSettings = appearance.getString(attr);
+ break;
}
}
@@ -846,7 +847,7 @@
int buffertype = 0;
boolean selectallonfocus = false;
Drawable drawableLeft = null, drawableTop = null, drawableRight = null,
- drawableBottom = null, drawableStart = null, drawableEnd = null;
+ drawableBottom = null, drawableStart = null, drawableEnd = null;
ColorStateList drawableTint = null;
PorterDuff.Mode drawableTintMode = null;
int drawablePadding = 0;
@@ -866,351 +867,351 @@
int attr = a.getIndex(i);
switch (attr) {
- case com.android.internal.R.styleable.TextView_editable:
- editable = a.getBoolean(attr, editable);
- break;
+ case com.android.internal.R.styleable.TextView_editable:
+ editable = a.getBoolean(attr, editable);
+ break;
- case com.android.internal.R.styleable.TextView_inputMethod:
- inputMethod = a.getText(attr);
- break;
+ case com.android.internal.R.styleable.TextView_inputMethod:
+ inputMethod = a.getText(attr);
+ break;
- case com.android.internal.R.styleable.TextView_numeric:
- numeric = a.getInt(attr, numeric);
- break;
+ case com.android.internal.R.styleable.TextView_numeric:
+ numeric = a.getInt(attr, numeric);
+ break;
- case com.android.internal.R.styleable.TextView_digits:
- digits = a.getText(attr);
- break;
+ case com.android.internal.R.styleable.TextView_digits:
+ digits = a.getText(attr);
+ break;
- case com.android.internal.R.styleable.TextView_phoneNumber:
- phone = a.getBoolean(attr, phone);
- break;
+ case com.android.internal.R.styleable.TextView_phoneNumber:
+ phone = a.getBoolean(attr, phone);
+ break;
- case com.android.internal.R.styleable.TextView_autoText:
- autotext = a.getBoolean(attr, autotext);
- break;
+ case com.android.internal.R.styleable.TextView_autoText:
+ autotext = a.getBoolean(attr, autotext);
+ break;
- case com.android.internal.R.styleable.TextView_capitalize:
- autocap = a.getInt(attr, autocap);
- break;
+ case com.android.internal.R.styleable.TextView_capitalize:
+ autocap = a.getInt(attr, autocap);
+ break;
- case com.android.internal.R.styleable.TextView_bufferType:
- buffertype = a.getInt(attr, buffertype);
- break;
+ case com.android.internal.R.styleable.TextView_bufferType:
+ buffertype = a.getInt(attr, buffertype);
+ break;
- case com.android.internal.R.styleable.TextView_selectAllOnFocus:
- selectallonfocus = a.getBoolean(attr, selectallonfocus);
- break;
+ case com.android.internal.R.styleable.TextView_selectAllOnFocus:
+ selectallonfocus = a.getBoolean(attr, selectallonfocus);
+ break;
- case com.android.internal.R.styleable.TextView_autoLink:
- mAutoLinkMask = a.getInt(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_autoLink:
+ mAutoLinkMask = a.getInt(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_linksClickable:
- mLinksClickable = a.getBoolean(attr, true);
- break;
+ case com.android.internal.R.styleable.TextView_linksClickable:
+ mLinksClickable = a.getBoolean(attr, true);
+ break;
- case com.android.internal.R.styleable.TextView_drawableLeft:
- drawableLeft = a.getDrawable(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableLeft:
+ drawableLeft = a.getDrawable(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableTop:
- drawableTop = a.getDrawable(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableTop:
+ drawableTop = a.getDrawable(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableRight:
- drawableRight = a.getDrawable(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableRight:
+ drawableRight = a.getDrawable(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableBottom:
- drawableBottom = a.getDrawable(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableBottom:
+ drawableBottom = a.getDrawable(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableStart:
- drawableStart = a.getDrawable(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableStart:
+ drawableStart = a.getDrawable(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableEnd:
- drawableEnd = a.getDrawable(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableEnd:
+ drawableEnd = a.getDrawable(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableTint:
- drawableTint = a.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextView_drawableTint:
+ drawableTint = a.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextView_drawableTintMode:
- drawableTintMode = Drawable.parseTintMode(a.getInt(attr, -1), drawableTintMode);
- break;
+ case com.android.internal.R.styleable.TextView_drawableTintMode:
+ drawableTintMode = Drawable.parseTintMode(a.getInt(attr, -1), drawableTintMode);
+ break;
- case com.android.internal.R.styleable.TextView_drawablePadding:
- drawablePadding = a.getDimensionPixelSize(attr, drawablePadding);
- break;
+ case com.android.internal.R.styleable.TextView_drawablePadding:
+ drawablePadding = a.getDimensionPixelSize(attr, drawablePadding);
+ break;
- case com.android.internal.R.styleable.TextView_maxLines:
- setMaxLines(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_maxLines:
+ setMaxLines(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_maxHeight:
- setMaxHeight(a.getDimensionPixelSize(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_maxHeight:
+ setMaxHeight(a.getDimensionPixelSize(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_lines:
- setLines(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_lines:
+ setLines(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_height:
- setHeight(a.getDimensionPixelSize(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_height:
+ setHeight(a.getDimensionPixelSize(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_minLines:
- setMinLines(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_minLines:
+ setMinLines(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_minHeight:
- setMinHeight(a.getDimensionPixelSize(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_minHeight:
+ setMinHeight(a.getDimensionPixelSize(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_maxEms:
- setMaxEms(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_maxEms:
+ setMaxEms(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_maxWidth:
- setMaxWidth(a.getDimensionPixelSize(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_maxWidth:
+ setMaxWidth(a.getDimensionPixelSize(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_ems:
- setEms(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_ems:
+ setEms(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_width:
- setWidth(a.getDimensionPixelSize(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_width:
+ setWidth(a.getDimensionPixelSize(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_minEms:
- setMinEms(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_minEms:
+ setMinEms(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_minWidth:
- setMinWidth(a.getDimensionPixelSize(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_minWidth:
+ setMinWidth(a.getDimensionPixelSize(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_gravity:
- setGravity(a.getInt(attr, -1));
- break;
+ case com.android.internal.R.styleable.TextView_gravity:
+ setGravity(a.getInt(attr, -1));
+ break;
- case com.android.internal.R.styleable.TextView_hint:
- hint = a.getText(attr);
- break;
+ case com.android.internal.R.styleable.TextView_hint:
+ hint = a.getText(attr);
+ break;
- case com.android.internal.R.styleable.TextView_text:
- text = a.getText(attr);
- break;
+ case com.android.internal.R.styleable.TextView_text:
+ text = a.getText(attr);
+ break;
- case com.android.internal.R.styleable.TextView_scrollHorizontally:
- if (a.getBoolean(attr, false)) {
- setHorizontallyScrolling(true);
- }
- break;
+ case com.android.internal.R.styleable.TextView_scrollHorizontally:
+ if (a.getBoolean(attr, false)) {
+ setHorizontallyScrolling(true);
+ }
+ break;
- case com.android.internal.R.styleable.TextView_singleLine:
- singleLine = a.getBoolean(attr, singleLine);
- break;
+ case com.android.internal.R.styleable.TextView_singleLine:
+ singleLine = a.getBoolean(attr, singleLine);
+ break;
- case com.android.internal.R.styleable.TextView_ellipsize:
- ellipsize = a.getInt(attr, ellipsize);
- break;
+ case com.android.internal.R.styleable.TextView_ellipsize:
+ ellipsize = a.getInt(attr, ellipsize);
+ break;
- case com.android.internal.R.styleable.TextView_marqueeRepeatLimit:
- setMarqueeRepeatLimit(a.getInt(attr, mMarqueeRepeatLimit));
- break;
+ case com.android.internal.R.styleable.TextView_marqueeRepeatLimit:
+ setMarqueeRepeatLimit(a.getInt(attr, mMarqueeRepeatLimit));
+ break;
- case com.android.internal.R.styleable.TextView_includeFontPadding:
- if (!a.getBoolean(attr, true)) {
- setIncludeFontPadding(false);
- }
- break;
+ case com.android.internal.R.styleable.TextView_includeFontPadding:
+ if (!a.getBoolean(attr, true)) {
+ setIncludeFontPadding(false);
+ }
+ break;
- case com.android.internal.R.styleable.TextView_cursorVisible:
- if (!a.getBoolean(attr, true)) {
- setCursorVisible(false);
- }
- break;
+ case com.android.internal.R.styleable.TextView_cursorVisible:
+ if (!a.getBoolean(attr, true)) {
+ setCursorVisible(false);
+ }
+ break;
- case com.android.internal.R.styleable.TextView_maxLength:
- maxlength = a.getInt(attr, -1);
- break;
+ case com.android.internal.R.styleable.TextView_maxLength:
+ maxlength = a.getInt(attr, -1);
+ break;
- case com.android.internal.R.styleable.TextView_textScaleX:
- setTextScaleX(a.getFloat(attr, 1.0f));
- break;
+ case com.android.internal.R.styleable.TextView_textScaleX:
+ setTextScaleX(a.getFloat(attr, 1.0f));
+ break;
- case com.android.internal.R.styleable.TextView_freezesText:
- mFreezesText = a.getBoolean(attr, false);
- break;
+ case com.android.internal.R.styleable.TextView_freezesText:
+ mFreezesText = a.getBoolean(attr, false);
+ break;
- case com.android.internal.R.styleable.TextView_shadowColor:
- shadowcolor = a.getInt(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_shadowColor:
+ shadowcolor = a.getInt(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_shadowDx:
- dx = a.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_shadowDx:
+ dx = a.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_shadowDy:
- dy = a.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_shadowDy:
+ dy = a.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_shadowRadius:
- r = a.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_shadowRadius:
+ r = a.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_enabled:
- setEnabled(a.getBoolean(attr, isEnabled()));
- break;
+ case com.android.internal.R.styleable.TextView_enabled:
+ setEnabled(a.getBoolean(attr, isEnabled()));
+ break;
- case com.android.internal.R.styleable.TextView_textColorHighlight:
- textColorHighlight = a.getColor(attr, textColorHighlight);
- break;
+ case com.android.internal.R.styleable.TextView_textColorHighlight:
+ textColorHighlight = a.getColor(attr, textColorHighlight);
+ break;
- case com.android.internal.R.styleable.TextView_textColor:
- textColor = a.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextView_textColor:
+ textColor = a.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextView_textColorHint:
- textColorHint = a.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextView_textColorHint:
+ textColorHint = a.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextView_textColorLink:
- textColorLink = a.getColorStateList(attr);
- break;
+ case com.android.internal.R.styleable.TextView_textColorLink:
+ textColorLink = a.getColorStateList(attr);
+ break;
- case com.android.internal.R.styleable.TextView_textSize:
- textSize = a.getDimensionPixelSize(attr, textSize);
- break;
+ case com.android.internal.R.styleable.TextView_textSize:
+ textSize = a.getDimensionPixelSize(attr, textSize);
+ break;
- case com.android.internal.R.styleable.TextView_typeface:
- typefaceIndex = a.getInt(attr, typefaceIndex);
- break;
+ case com.android.internal.R.styleable.TextView_typeface:
+ typefaceIndex = a.getInt(attr, typefaceIndex);
+ break;
- case com.android.internal.R.styleable.TextView_textStyle:
- styleIndex = a.getInt(attr, styleIndex);
- break;
+ case com.android.internal.R.styleable.TextView_textStyle:
+ styleIndex = a.getInt(attr, styleIndex);
+ break;
- case com.android.internal.R.styleable.TextView_fontFamily:
- fontFamily = a.getString(attr);
- fontFamilyExplicit = true;
- break;
+ case com.android.internal.R.styleable.TextView_fontFamily:
+ fontFamily = a.getString(attr);
+ fontFamilyExplicit = true;
+ break;
- case com.android.internal.R.styleable.TextView_password:
- password = a.getBoolean(attr, password);
- break;
+ case com.android.internal.R.styleable.TextView_password:
+ password = a.getBoolean(attr, password);
+ break;
- case com.android.internal.R.styleable.TextView_lineSpacingExtra:
- mSpacingAdd = a.getDimensionPixelSize(attr, (int) mSpacingAdd);
- break;
+ case com.android.internal.R.styleable.TextView_lineSpacingExtra:
+ mSpacingAdd = a.getDimensionPixelSize(attr, (int) mSpacingAdd);
+ break;
- case com.android.internal.R.styleable.TextView_lineSpacingMultiplier:
- mSpacingMult = a.getFloat(attr, mSpacingMult);
- break;
+ case com.android.internal.R.styleable.TextView_lineSpacingMultiplier:
+ mSpacingMult = a.getFloat(attr, mSpacingMult);
+ break;
- case com.android.internal.R.styleable.TextView_inputType:
- inputType = a.getInt(attr, EditorInfo.TYPE_NULL);
- break;
+ case com.android.internal.R.styleable.TextView_inputType:
+ inputType = a.getInt(attr, EditorInfo.TYPE_NULL);
+ break;
- case com.android.internal.R.styleable.TextView_allowUndo:
- createEditorIfNeeded();
- mEditor.mAllowUndo = a.getBoolean(attr, true);
- break;
+ case com.android.internal.R.styleable.TextView_allowUndo:
+ createEditorIfNeeded();
+ mEditor.mAllowUndo = a.getBoolean(attr, true);
+ break;
- case com.android.internal.R.styleable.TextView_imeOptions:
- createEditorIfNeeded();
- mEditor.createInputContentTypeIfNeeded();
- mEditor.mInputContentType.imeOptions = a.getInt(attr,
- mEditor.mInputContentType.imeOptions);
- break;
+ case com.android.internal.R.styleable.TextView_imeOptions:
+ createEditorIfNeeded();
+ mEditor.createInputContentTypeIfNeeded();
+ mEditor.mInputContentType.imeOptions = a.getInt(attr,
+ mEditor.mInputContentType.imeOptions);
+ break;
- case com.android.internal.R.styleable.TextView_imeActionLabel:
- createEditorIfNeeded();
- mEditor.createInputContentTypeIfNeeded();
- mEditor.mInputContentType.imeActionLabel = a.getText(attr);
- break;
+ case com.android.internal.R.styleable.TextView_imeActionLabel:
+ createEditorIfNeeded();
+ mEditor.createInputContentTypeIfNeeded();
+ mEditor.mInputContentType.imeActionLabel = a.getText(attr);
+ break;
- case com.android.internal.R.styleable.TextView_imeActionId:
- createEditorIfNeeded();
- mEditor.createInputContentTypeIfNeeded();
- mEditor.mInputContentType.imeActionId = a.getInt(attr,
- mEditor.mInputContentType.imeActionId);
- break;
+ case com.android.internal.R.styleable.TextView_imeActionId:
+ createEditorIfNeeded();
+ mEditor.createInputContentTypeIfNeeded();
+ mEditor.mInputContentType.imeActionId = a.getInt(attr,
+ mEditor.mInputContentType.imeActionId);
+ break;
- case com.android.internal.R.styleable.TextView_privateImeOptions:
- setPrivateImeOptions(a.getString(attr));
- break;
+ case com.android.internal.R.styleable.TextView_privateImeOptions:
+ setPrivateImeOptions(a.getString(attr));
+ break;
- case com.android.internal.R.styleable.TextView_editorExtras:
- try {
- setInputExtras(a.getResourceId(attr, 0));
- } catch (XmlPullParserException e) {
- Log.w(LOG_TAG, "Failure reading input extras", e);
- } catch (IOException e) {
- Log.w(LOG_TAG, "Failure reading input extras", e);
- }
- break;
+ case com.android.internal.R.styleable.TextView_editorExtras:
+ try {
+ setInputExtras(a.getResourceId(attr, 0));
+ } catch (XmlPullParserException e) {
+ Log.w(LOG_TAG, "Failure reading input extras", e);
+ } catch (IOException e) {
+ Log.w(LOG_TAG, "Failure reading input extras", e);
+ }
+ break;
- case com.android.internal.R.styleable.TextView_textCursorDrawable:
- mCursorDrawableRes = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textCursorDrawable:
+ mCursorDrawableRes = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textSelectHandleLeft:
- mTextSelectHandleLeftRes = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textSelectHandleLeft:
+ mTextSelectHandleLeftRes = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textSelectHandleRight:
- mTextSelectHandleRightRes = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textSelectHandleRight:
+ mTextSelectHandleRightRes = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textSelectHandle:
- mTextSelectHandleRes = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textSelectHandle:
+ mTextSelectHandleRes = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textEditSuggestionItemLayout:
- mTextEditSuggestionItemLayout = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textEditSuggestionItemLayout:
+ mTextEditSuggestionItemLayout = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textEditSuggestionContainerLayout:
- mTextEditSuggestionContainerLayout = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textEditSuggestionContainerLayout:
+ mTextEditSuggestionContainerLayout = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textEditSuggestionHighlightStyle:
- mTextEditSuggestionHighlightStyle = a.getResourceId(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_textEditSuggestionHighlightStyle:
+ mTextEditSuggestionHighlightStyle = a.getResourceId(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_textIsSelectable:
- setTextIsSelectable(a.getBoolean(attr, false));
- break;
+ case com.android.internal.R.styleable.TextView_textIsSelectable:
+ setTextIsSelectable(a.getBoolean(attr, false));
+ break;
- case com.android.internal.R.styleable.TextView_textAllCaps:
- allCaps = a.getBoolean(attr, false);
- break;
+ case com.android.internal.R.styleable.TextView_textAllCaps:
+ allCaps = a.getBoolean(attr, false);
+ break;
- case com.android.internal.R.styleable.TextView_elegantTextHeight:
- elegant = a.getBoolean(attr, false);
- break;
+ case com.android.internal.R.styleable.TextView_elegantTextHeight:
+ elegant = a.getBoolean(attr, false);
+ break;
- case com.android.internal.R.styleable.TextView_letterSpacing:
- letterSpacing = a.getFloat(attr, 0);
- break;
+ case com.android.internal.R.styleable.TextView_letterSpacing:
+ letterSpacing = a.getFloat(attr, 0);
+ break;
- case com.android.internal.R.styleable.TextView_fontFeatureSettings:
- fontFeatureSettings = a.getString(attr);
- break;
+ case com.android.internal.R.styleable.TextView_fontFeatureSettings:
+ fontFeatureSettings = a.getString(attr);
+ break;
- case com.android.internal.R.styleable.TextView_breakStrategy:
- mBreakStrategy = a.getInt(attr, Layout.BREAK_STRATEGY_SIMPLE);
- break;
+ case com.android.internal.R.styleable.TextView_breakStrategy:
+ mBreakStrategy = a.getInt(attr, Layout.BREAK_STRATEGY_SIMPLE);
+ break;
- case com.android.internal.R.styleable.TextView_hyphenationFrequency:
- mHyphenationFrequency = a.getInt(attr, Layout.HYPHENATION_FREQUENCY_NONE);
- break;
+ case com.android.internal.R.styleable.TextView_hyphenationFrequency:
+ mHyphenationFrequency = a.getInt(attr, Layout.HYPHENATION_FREQUENCY_NONE);
+ break;
}
}
a.recycle();
@@ -1284,24 +1285,24 @@
inputType = EditorInfo.TYPE_CLASS_TEXT;
switch (autocap) {
- case 1:
- cap = TextKeyListener.Capitalize.SENTENCES;
- inputType |= EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
- break;
+ case 1:
+ cap = TextKeyListener.Capitalize.SENTENCES;
+ inputType |= EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
+ break;
- case 2:
- cap = TextKeyListener.Capitalize.WORDS;
- inputType |= EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
- break;
+ case 2:
+ cap = TextKeyListener.Capitalize.WORDS;
+ inputType |= EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
+ break;
- case 3:
- cap = TextKeyListener.Capitalize.CHARACTERS;
- inputType |= EditorInfo.TYPE_TEXT_FLAG_CAP_CHARACTERS;
- break;
+ case 3:
+ cap = TextKeyListener.Capitalize.CHARACTERS;
+ inputType |= EditorInfo.TYPE_TEXT_FLAG_CAP_CHARACTERS;
+ break;
- default:
- cap = TextKeyListener.Capitalize.NONE;
- break;
+ default:
+ cap = TextKeyListener.Capitalize.NONE;
+ break;
}
createEditorIfNeeded();
@@ -1336,15 +1337,18 @@
}
}
- if (mEditor != null) mEditor.adjustInputType(password, passwordInputType,
- webPasswordInputType, numberPasswordInputType);
+ if (mEditor != null) {
+ mEditor.adjustInputType(password, passwordInputType, webPasswordInputType,
+ numberPasswordInputType);
+ }
if (selectallonfocus) {
createEditorIfNeeded();
mEditor.mSelectAllOnFocus = true;
- if (bufferType == BufferType.NORMAL)
+ if (bufferType == BufferType.NORMAL) {
bufferType = BufferType.SPANNABLE;
+ }
}
// Set up the tint (if needed) before setting the drawables so that it
@@ -1365,7 +1369,7 @@
// This call will save the initial left/right drawables
setCompoundDrawablesWithIntrinsicBounds(
- drawableLeft, drawableTop, drawableRight, drawableBottom);
+ drawableLeft, drawableTop, drawableRight, drawableBottom);
setRelativeDrawablesIfNeeded(drawableStart, drawableEnd);
setCompoundDrawablePadding(drawablePadding);
@@ -1375,7 +1379,7 @@
applySingleLine(singleLine, singleLine, singleLine);
if (singleLine && getKeyListener() == null && ellipsize < 0) {
- ellipsize = 3; // END
+ ellipsize = 3; // END
}
switch (ellipsize) {
@@ -1418,8 +1422,9 @@
if (password || passwordInputType || webPasswordInputType || numberPasswordInputType) {
setTransformationMethod(PasswordTransformationMethod.getInstance());
typefaceIndex = MONOSPACE;
- } else if (mEditor != null &&
- (mEditor.mInputType & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_MASK_VARIATION))
+ } else if (mEditor != null
+ && (mEditor.mInputType
+ & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_MASK_VARIATION))
== (EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_PASSWORD)) {
typefaceIndex = MONOSPACE;
}
@@ -1459,17 +1464,17 @@
int attr = a.getIndex(i);
switch (attr) {
- case com.android.internal.R.styleable.View_focusable:
- focusable = a.getBoolean(attr, focusable);
- break;
+ case com.android.internal.R.styleable.View_focusable:
+ focusable = a.getBoolean(attr, focusable);
+ break;
- case com.android.internal.R.styleable.View_clickable:
- clickable = a.getBoolean(attr, clickable);
- break;
+ case com.android.internal.R.styleable.View_clickable:
+ clickable = a.getBoolean(attr, clickable);
+ break;
- case com.android.internal.R.styleable.View_longClickable:
- longClickable = a.getBoolean(attr, longClickable);
- break;
+ case com.android.internal.R.styleable.View_longClickable:
+ longClickable = a.getBoolean(attr, longClickable);
+ break;
}
}
a.recycle();
@@ -1698,7 +1703,7 @@
* @see #getText
*/
public Editable getEditableText() {
- return (mText instanceof Editable) ? (Editable)mText : null;
+ return (mText instanceof Editable) ? (Editable) mText : null;
}
/**
@@ -2738,10 +2743,10 @@
@Override
public void setPadding(int left, int top, int right, int bottom) {
- if (left != mPaddingLeft ||
- right != mPaddingRight ||
- top != mPaddingTop ||
- bottom != mPaddingBottom) {
+ if (left != mPaddingLeft
+ || right != mPaddingRight
+ || top != mPaddingTop
+ || bottom != mPaddingBottom) {
nullLayouts();
}
@@ -2752,10 +2757,10 @@
@Override
public void setPaddingRelative(int start, int top, int end, int bottom) {
- if (start != getPaddingStart() ||
- end != getPaddingEnd() ||
- top != mPaddingTop ||
- bottom != mPaddingBottom) {
+ if (start != getPaddingStart()
+ || end != getPaddingEnd()
+ || top != mPaddingTop
+ || bottom != mPaddingBottom) {
nullLayouts();
}
@@ -2848,17 +2853,17 @@
if (ta.hasValue(R.styleable.TextAppearance_elegantTextHeight)) {
setElegantTextHeight(ta.getBoolean(
- R.styleable.TextAppearance_elegantTextHeight, false));
+ R.styleable.TextAppearance_elegantTextHeight, false));
}
if (ta.hasValue(R.styleable.TextAppearance_letterSpacing)) {
setLetterSpacing(ta.getFloat(
- R.styleable.TextAppearance_letterSpacing, 0));
+ R.styleable.TextAppearance_letterSpacing, 0));
}
if (ta.hasValue(R.styleable.TextAppearance_fontFeatureSettings)) {
setFontFeatureSettings(ta.getString(
- R.styleable.TextAppearance_fontFeatureSettings));
+ R.styleable.TextAppearance_fontFeatureSettings));
}
ta.recycle();
@@ -2878,7 +2883,7 @@
* Get the default {@link LocaleList} of the text in this TextView.
* @return the default {@link LocaleList} of the text in this TextView.
*/
- @NonNull @Size(min=1)
+ @NonNull @Size(min = 1)
public LocaleList getTextLocales() {
return mTextPaint.getTextLocales();
}
@@ -2912,7 +2917,7 @@
*
* @see Paint#setTextLocales
*/
- public void setTextLocales(@NonNull @Size(min=1) LocaleList locales) {
+ public void setTextLocales(@NonNull @Size(min = 1) LocaleList locales) {
mLocalesChanged = true;
mTextPaint.setTextLocales(locales);
if (mLayout != null) {
@@ -2991,10 +2996,11 @@
Context c = getContext();
Resources r;
- if (c == null)
+ if (c == null) {
r = Resources.getSystem();
- else
+ } else {
r = c.getResources();
+ }
setRawTextSize(TypedValue.applyDimension(
unit, size, r.getDisplayMetrics()));
@@ -3134,8 +3140,8 @@
/**
* Returns the font feature settings. The format is the same as the CSS
* font-feature-settings attribute:
- * <a href="http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings">
- * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings</a>
+ * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+ * https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>
*
* @return the currently set font feature settings. Default is null.
*
@@ -3177,8 +3183,8 @@
}
/**
- * Sets the hyphenation frequency. The default value for both TextView and EditText, which is set
- * from the theme, is {@link Layout#HYPHENATION_FREQUENCY_NORMAL}.
+ * Sets the hyphenation frequency. The default value for both TextView and EditText, which is
+ * set from the theme, is {@link Layout#HYPHENATION_FREQUENCY_NORMAL}.
*
* @attr ref android.R.styleable#TextView_hyphenationFrequency
* @see #getHyphenationFrequency()
@@ -3206,8 +3212,8 @@
/**
* Sets font feature settings. The format is the same as the CSS
* font-feature-settings attribute:
- * <a href="http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings">
- * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings</a>
+ * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+ * https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>
*
* @param fontFeatureSettings font feature settings represented as CSS compatible string
*
@@ -3255,6 +3261,7 @@
*
* @attr ref android.R.styleable#TextView_textColor
*/
+ @android.view.RemotableViewMethod
public void setTextColor(ColorStateList colors) {
if (colors == null) {
throw new NullPointerException();
@@ -3584,8 +3591,8 @@
boolean newLayout = false;
- if ((gravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK) !=
- (mGravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK)) {
+ if ((gravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK)
+ != (mGravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK)) {
newLayout = true;
}
@@ -3601,8 +3608,7 @@
int hintWant = mHintLayout == null ? 0 : mHintLayout.getWidth();
makeNewLayout(want, hintWant, UNKNOWN_BORING, UNKNOWN_BORING,
- mRight - mLeft - getCompoundPaddingLeft() -
- getCompoundPaddingRight(), true);
+ mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight(), true);
}
}
@@ -4190,7 +4196,7 @@
return;
}
- SavedState ss = (SavedState)state;
+ SavedState ss = (SavedState) state;
super.onRestoreInstanceState(ss.getSuperState());
// XXX restore buffer type too, as well as lots of other stuff
@@ -4209,9 +4215,8 @@
restored = "(restored) ";
}
- Log.e(LOG_TAG, "Saved cursor position " + ss.selStart +
- "/" + ss.selEnd + " out of range for " + restored +
- "text " + mText);
+ Log.e(LOG_TAG, "Saved cursor position " + ss.selStart + "/" + ss.selEnd
+ + " out of range for " + restored + "text " + mText);
} else {
Selection.setSelection((Spannable) mText, ss.selStart, ss.selEnd);
@@ -4349,8 +4354,8 @@
if (!mUserSetTextScaleX) mTextPaint.setTextScaleX(1.0f);
- if (text instanceof Spanned &&
- ((Spanned) text).getSpanStart(TextUtils.TruncateAt.MARQUEE) >= 0) {
+ if (text instanceof Spanned
+ && ((Spanned) text).getSpanStart(TextUtils.TruncateAt.MARQUEE) >= 0) {
if (ViewConfiguration.get(mContext).isFadingMarqueeEnabled()) {
setHorizontalFadingEdgeEnabled(true);
mMarqueeFadeMode = MARQUEE_FADE_NORMAL;
@@ -4384,8 +4389,8 @@
needEditableForNotification = true;
}
- if (type == BufferType.EDITABLE || getKeyListener() != null ||
- needEditableForNotification) {
+ if (type == BufferType.EDITABLE || getKeyListener() != null
+ || needEditableForNotification) {
createEditorIfNeeded();
mEditor.forgetUndoRedo();
Editable t = mEditableFactory.newEditable(text);
@@ -4450,8 +4455,8 @@
if (mChangeWatcher == null) mChangeWatcher = new ChangeWatcher();
- sp.setSpan(mChangeWatcher, 0, textLength, Spanned.SPAN_INCLUSIVE_INCLUSIVE |
- (CHANGE_WATCHER_PRIORITY << Spanned.SPAN_PRIORITY_SHIFT));
+ sp.setSpan(mChangeWatcher, 0, textLength, Spanned.SPAN_INCLUSIVE_INCLUSIVE
+ | (CHANGE_WATCHER_PRIORITY << Spanned.SPAN_PRIORITY_SHIFT));
if (mEditor != null) mEditor.addSpanWatchers(sp);
@@ -4606,29 +4611,29 @@
}
private static boolean isMultilineInputType(int type) {
- return (type & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE)) ==
- (EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE);
+ return (type & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE))
+ == (EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE);
}
/**
* Removes the suggestion spans.
*/
CharSequence removeSuggestionSpans(CharSequence text) {
- if (text instanceof Spanned) {
- Spannable spannable;
- if (text instanceof Spannable) {
- spannable = (Spannable) text;
- } else {
- spannable = new SpannableString(text);
- text = spannable;
- }
+ if (text instanceof Spanned) {
+ Spannable spannable;
+ if (text instanceof Spannable) {
+ spannable = (Spannable) text;
+ } else {
+ spannable = new SpannableString(text);
+ text = spannable;
+ }
- SuggestionSpan[] spans = spannable.getSpans(0, text.length(), SuggestionSpan.class);
- for (int i = 0; i < spans.length; i++) {
- spannable.removeSpan(spans[i]);
- }
- }
- return text;
+ SuggestionSpan[] spans = spannable.getSpans(0, text.length(), SuggestionSpan.class);
+ for (int i = 0; i < spans.length; i++) {
+ spannable.removeSpan(spans[i]);
+ }
+ }
+ return text;
}
/**
@@ -4910,8 +4915,8 @@
View v = focusSearch(FOCUS_FORWARD);
if (v != null) {
if (!v.requestFocus(FOCUS_FORWARD)) {
- throw new IllegalStateException("focus search returned a view " +
- "that wasn't able to take focus!");
+ throw new IllegalStateException("focus search returned a view "
+ + "that wasn't able to take focus!");
}
}
return;
@@ -4920,8 +4925,8 @@
View v = focusSearch(FOCUS_BACKWARD);
if (v != null) {
if (!v.requestFocus(FOCUS_BACKWARD)) {
- throw new IllegalStateException("focus search returned a view " +
- "that wasn't able to take focus!");
+ throw new IllegalStateException("focus search returned a view "
+ + "that wasn't able to take focus!");
}
}
return;
@@ -5046,8 +5051,12 @@
*/
@Nullable
public LocaleList getImeHintLocales() {
- if (mEditor == null) { return null; }
- if (mEditor.mInputContentType == null) { return null; }
+ if (mEditor == null) {
+ return null;
+ }
+ if (mEditor.mInputContentType == null) {
+ return null;
+ }
return mEditor.mInputContentType.imeHintLocales;
}
@@ -5177,9 +5186,9 @@
private int getBoxHeight(Layout l) {
Insets opticalInsets = isLayoutModeOptical(mParent) ? getOpticalInsets() : Insets.NONE;
- int padding = (l == mHintLayout) ?
- getCompoundPaddingTop() + getCompoundPaddingBottom() :
- getExtendedPaddingTop() + getExtendedPaddingBottom();
+ int padding = (l == mHintLayout)
+ ? getCompoundPaddingTop() + getCompoundPaddingBottom()
+ : getExtendedPaddingTop() + getExtendedPaddingBottom();
return getMeasuredHeight() - padding + opticalInsets.top + opticalInsets.bottom;
}
@@ -5197,10 +5206,11 @@
int textht = l.getHeight();
if (textht < boxht) {
- if (gravity == Gravity.BOTTOM)
+ if (gravity == Gravity.BOTTOM) {
voffset = boxht - textht;
- else // (gravity == Gravity.CENTER_VERTICAL)
+ } else { // (gravity == Gravity.CENTER_VERTICAL)
voffset = (boxht - textht) >> 1;
+ }
}
}
return voffset;
@@ -5220,10 +5230,11 @@
int textht = l.getHeight();
if (textht < boxht) {
- if (gravity == Gravity.TOP)
+ if (gravity == Gravity.TOP) {
voffset = boxht - textht;
- else // (gravity == Gravity.CENTER_VERTICAL)
+ } else { // (gravity == Gravity.CENTER_VERTICAL)
voffset = (boxht - textht) >> 1;
+ }
}
}
return voffset;
@@ -5293,54 +5304,55 @@
if (mLayout == null) {
invalidate();
} else {
- int lineStart = mLayout.getLineForOffset(start);
- int top = mLayout.getLineTop(lineStart);
+ int lineStart = mLayout.getLineForOffset(start);
+ int top = mLayout.getLineTop(lineStart);
- // This is ridiculous, but the descent from the line above
- // can hang down into the line we really want to redraw,
- // so we have to invalidate part of the line above to make
- // sure everything that needs to be redrawn really is.
- // (But not the whole line above, because that would cause
- // the same problem with the descenders on the line above it!)
- if (lineStart > 0) {
- top -= mLayout.getLineDescent(lineStart - 1);
+ // This is ridiculous, but the descent from the line above
+ // can hang down into the line we really want to redraw,
+ // so we have to invalidate part of the line above to make
+ // sure everything that needs to be redrawn really is.
+ // (But not the whole line above, because that would cause
+ // the same problem with the descenders on the line above it!)
+ if (lineStart > 0) {
+ top -= mLayout.getLineDescent(lineStart - 1);
+ }
+
+ int lineEnd;
+
+ if (start == end) {
+ lineEnd = lineStart;
+ } else {
+ lineEnd = mLayout.getLineForOffset(end);
+ }
+
+ int bottom = mLayout.getLineBottom(lineEnd);
+
+ // mEditor can be null in case selection is set programmatically.
+ if (invalidateCursor && mEditor != null) {
+ for (int i = 0; i < mEditor.mCursorCount; i++) {
+ Rect bounds = mEditor.mCursorDrawable[i].getBounds();
+ top = Math.min(top, bounds.top);
+ bottom = Math.max(bottom, bounds.bottom);
}
+ }
- int lineEnd;
+ final int compoundPaddingLeft = getCompoundPaddingLeft();
+ final int verticalPadding = getExtendedPaddingTop() + getVerticalOffset(true);
- if (start == end)
- lineEnd = lineStart;
- else
- lineEnd = mLayout.getLineForOffset(end);
+ int left, right;
+ if (lineStart == lineEnd && !invalidateCursor) {
+ left = (int) mLayout.getPrimaryHorizontal(start);
+ right = (int) (mLayout.getPrimaryHorizontal(end) + 1.0);
+ left += compoundPaddingLeft;
+ right += compoundPaddingLeft;
+ } else {
+ // Rectangle bounding box when the region spans several lines
+ left = compoundPaddingLeft;
+ right = getWidth() - getCompoundPaddingRight();
+ }
- int bottom = mLayout.getLineBottom(lineEnd);
-
- // mEditor can be null in case selection is set programmatically.
- if (invalidateCursor && mEditor != null) {
- for (int i = 0; i < mEditor.mCursorCount; i++) {
- Rect bounds = mEditor.mCursorDrawable[i].getBounds();
- top = Math.min(top, bounds.top);
- bottom = Math.max(bottom, bounds.bottom);
- }
- }
-
- final int compoundPaddingLeft = getCompoundPaddingLeft();
- final int verticalPadding = getExtendedPaddingTop() + getVerticalOffset(true);
-
- int left, right;
- if (lineStart == lineEnd && !invalidateCursor) {
- left = (int) mLayout.getPrimaryHorizontal(start);
- right = (int) (mLayout.getPrimaryHorizontal(end) + 1.0);
- left += compoundPaddingLeft;
- right += compoundPaddingLeft;
- } else {
- // Rectangle bounding box when the region spans several lines
- left = compoundPaddingLeft;
- right = getWidth() - getCompoundPaddingRight();
- }
-
- invalidate(mScrollX + left, verticalPadding + top,
- mScrollX + right, verticalPadding + bottom);
+ invalidate(mScrollX + left, verticalPadding + top,
+ mScrollX + right, verticalPadding + bottom);
}
}
@@ -5360,6 +5372,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean onPreDraw() {
if (mLayout == null) {
assumeLayout();
@@ -5372,8 +5385,8 @@
*/
int curs = getSelectionEnd();
// Do not create the controller if it is not already created.
- if (mEditor != null && mEditor.mSelectionModifierCursorController != null &&
- mEditor.mSelectionModifierCursorController.isSelectionStartDragged()) {
+ if (mEditor != null && mEditor.mSelectionModifierCursorController != null
+ && mEditor.mSelectionModifierCursorController.isSelectionStartDragged()) {
curs = getSelectionStart();
}
@@ -5446,8 +5459,8 @@
@Override
protected int getLeftPaddingOffset() {
- return getCompoundPaddingLeft() - mPaddingLeft +
- (int) Math.min(0, mShadowDx - mShadowRadius);
+ return getCompoundPaddingLeft() - mPaddingLeft
+ + (int) Math.min(0, mShadowDx - mShadowRadius);
}
@Override
@@ -5462,8 +5475,8 @@
@Override
protected int getRightPaddingOffset() {
- return -(getCompoundPaddingRight() - mPaddingRight) +
- (int) Math.max(0, mShadowDx + mShadowRadius);
+ return -(getCompoundPaddingRight() - mPaddingRight)
+ + (int) Math.max(0, mShadowDx + mShadowRadius);
}
@Override
@@ -5658,9 +5671,9 @@
final int selEnd = getSelectionEnd();
if (mMovement != null && (isFocused() || isPressed()) && selStart >= 0) {
if (selStart == selEnd) {
- if (mEditor != null && mEditor.isCursorVisible() &&
- (SystemClock.uptimeMillis() - mEditor.mShowCursor) %
- (2 * Editor.BLINK) < Editor.BLINK) {
+ if (mEditor != null && mEditor.isCursorVisible()
+ && (SystemClock.uptimeMillis() - mEditor.mShowCursor)
+ % (2 * Editor.BLINK) < Editor.BLINK) {
if (mHighlightPathBogus) {
if (mHighlightPath == null) mHighlightPath = new Path();
mHighlightPath.reset();
@@ -5719,7 +5732,7 @@
final boolean isLayoutRtl = isLayoutRtl();
final int offset = getHorizontalOffsetForDrawables();
final int leftOffset = isLayoutRtl ? 0 : offset;
- final int rightOffset = isLayoutRtl ? offset : 0 ;
+ final int rightOffset = isLayoutRtl ? offset : 0;
final Drawables dr = mDrawables;
if (dr != null) {
@@ -5736,8 +5749,7 @@
if (dr.mShowing[Drawables.LEFT] != null) {
canvas.save();
canvas.translate(scrollX + mPaddingLeft + leftOffset,
- scrollY + compoundPaddingTop +
- (vspace - dr.mDrawableHeightLeft) / 2);
+ scrollY + compoundPaddingTop + (vspace - dr.mDrawableHeightLeft) / 2);
dr.mShowing[Drawables.LEFT].draw(canvas);
canvas.restore();
}
@@ -5757,8 +5769,8 @@
// Make sure to update invalidateDrawable() when changing this code.
if (dr.mShowing[Drawables.TOP] != null) {
canvas.save();
- canvas.translate(scrollX + compoundPaddingLeft +
- (hspace - dr.mDrawableWidthTop) / 2, scrollY + mPaddingTop);
+ canvas.translate(scrollX + compoundPaddingLeft
+ + (hspace - dr.mDrawableWidthTop) / 2, scrollY + mPaddingTop);
dr.mShowing[Drawables.TOP].draw(canvas);
canvas.restore();
}
@@ -5767,8 +5779,8 @@
// Make sure to update invalidateDrawable() when changing this code.
if (dr.mShowing[Drawables.BOTTOM] != null) {
canvas.save();
- canvas.translate(scrollX + compoundPaddingLeft +
- (hspace - dr.mDrawableWidthBottom) / 2,
+ canvas.translate(scrollX + compoundPaddingLeft
+ + (hspace - dr.mDrawableWidthBottom) / 2,
scrollY + bottom - top - mPaddingBottom - dr.mDrawableSizeBottom);
dr.mShowing[Drawables.BOTTOM].draw(canvas);
canvas.restore();
@@ -5808,8 +5820,8 @@
float clipLeft = compoundPaddingLeft + scrollX;
float clipTop = (scrollY == 0) ? 0 : extendedPaddingTop + scrollY;
float clipRight = right - left - getCompoundPaddingRight() + scrollX;
- float clipBottom = bottom - top + scrollY -
- ((scrollY == maxScrollY) ? 0 : extendedPaddingBottom);
+ float clipBottom = bottom - top + scrollY
+ - ((scrollY == maxScrollY) ? 0 : extendedPaddingBottom);
if (mShadowRadius != 0) {
clipLeft += Math.min(0, mShadowDx - mShadowRadius);
@@ -5835,8 +5847,8 @@
final int layoutDirection = getLayoutDirection();
final int absoluteGravity = Gravity.getAbsoluteGravity(mGravity, layoutDirection);
if (isMarqueeFadeEnabled()) {
- if (!mSingleLine && getLineCount() == 1 && canMarquee() &&
- (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) != Gravity.LEFT) {
+ if (!mSingleLine && getLineCount() == 1 && canMarquee()
+ && (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) != Gravity.LEFT) {
final int width = mRight - mLeft;
final int padding = getCompoundPaddingLeft() + getCompoundPaddingRight();
final float dx = mLayout.getLineRight(0) - (width - padding);
@@ -5906,8 +5918,8 @@
}
synchronized (TEMP_RECTF) {
mHighlightPath.computeBounds(TEMP_RECTF, true);
- r.left = (int)TEMP_RECTF.left-1;
- r.right = (int)TEMP_RECTF.right+1;
+ r.left = (int) TEMP_RECTF.left - 1;
+ r.right = (int) TEMP_RECTF.right + 1;
}
}
}
@@ -5946,8 +5958,7 @@
bounds.set(0, 0, 0, 0);
}
return 0;
- }
- else {
+ } else {
int baseline = mLayout.getLineBounds(line, bounds);
int voffset = getExtendedPaddingTop();
@@ -6098,19 +6109,19 @@
KeyEvent up = KeyEvent.changeAction(event, KeyEvent.ACTION_UP);
if (which == KEY_DOWN_HANDLED_BY_KEY_LISTENER) {
// mEditor and mEditor.mInput are not null from doKeyDown
- mEditor.mKeyListener.onKeyUp(this, (Editable)mText, keyCode, up);
+ mEditor.mKeyListener.onKeyUp(this, (Editable) mText, keyCode, up);
while (--repeatCount > 0) {
- mEditor.mKeyListener.onKeyDown(this, (Editable)mText, keyCode, down);
- mEditor.mKeyListener.onKeyUp(this, (Editable)mText, keyCode, up);
+ mEditor.mKeyListener.onKeyDown(this, (Editable) mText, keyCode, down);
+ mEditor.mKeyListener.onKeyUp(this, (Editable) mText, keyCode, up);
}
hideErrorIfUnchanged();
} else if (which == KEY_DOWN_HANDLED_BY_MOVEMENT_METHOD) {
// mMovement is not null from doKeyDown
- mMovement.onKeyUp(this, (Spannable)mText, keyCode, up);
+ mMovement.onKeyUp(this, (Spannable) mText, keyCode, up);
while (--repeatCount > 0) {
- mMovement.onKeyDown(this, (Spannable)mText, keyCode, down);
- mMovement.onKeyUp(this, (Spannable)mText, keyCode, up);
+ mMovement.onKeyDown(this, (Spannable) mText, keyCode, down);
+ mMovement.onKeyUp(this, (Spannable) mText, keyCode, up);
}
}
@@ -6132,8 +6143,9 @@
return true;
}
- if (mEditor != null &&
- (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS) == EditorInfo.TYPE_CLASS_TEXT) {
+ if (mEditor != null
+ && (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS)
+ == EditorInfo.TYPE_CLASS_TEXT) {
int variation = mEditor.mInputType & EditorInfo.TYPE_MASK_VARIATION;
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
|| variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_SUBJECT) {
@@ -6149,8 +6161,9 @@
* of inserting the character. Insert tabs only in multi-line editors.
*/
private boolean shouldAdvanceFocusOnTab() {
- if (getKeyListener() != null && !mSingleLine && mEditor != null &&
- (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS) == EditorInfo.TYPE_CLASS_TEXT) {
+ if (getKeyListener() != null && !mSingleLine && mEditor != null
+ && (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS)
+ == EditorInfo.TYPE_CLASS_TEXT) {
int variation = mEditor.mInputType & EditorInfo.TYPE_MASK_VARIATION;
if (variation == EditorInfo.TYPE_TEXT_FLAG_IME_MULTI_LINE
|| variation == EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) {
@@ -6184,9 +6197,9 @@
if (mEditor != null && mEditor.mInputContentType != null) {
// If there is an action listener, given them a
// chance to consume the event.
- if (mEditor.mInputContentType.onEditorActionListener != null &&
- mEditor.mInputContentType.onEditorActionListener.onEditorAction(
- this, EditorInfo.IME_NULL, event)) {
+ if (mEditor.mInputContentType.onEditorActionListener != null
+ && mEditor.mInputContentType.onEditorActionListener.onEditorAction(
+ this, EditorInfo.IME_NULL, event)) {
mEditor.mInputContentType.enterDown = true;
// We are consuming the enter key for them.
return KEY_EVENT_HANDLED;
@@ -6304,7 +6317,7 @@
}
}
if (doDown) {
- if (mMovement.onKeyDown(this, (Spannable)mText, keyCode, event)) {
+ if (mMovement.onKeyDown(this, (Spannable) mText, keyCode, event)) {
if (event.getRepeatCount() == 0 && !KeyEvent.isModifierKey(keyCode)) {
mPreventDefaultMovement = true;
}
@@ -6313,8 +6326,8 @@
}
}
- return mPreventDefaultMovement && !KeyEvent.isModifierKey(keyCode) ?
- KEY_EVENT_HANDLED : KEY_EVENT_NOT_HANDLED;
+ return mPreventDefaultMovement && !KeyEvent.isModifierKey(keyCode)
+ ? KEY_EVENT_HANDLED : KEY_EVENT_NOT_HANDLED;
}
/**
@@ -6405,9 +6418,8 @@
if (v != null) {
if (!v.requestFocus(FOCUS_DOWN)) {
- throw new IllegalStateException(
- "focus search returned a view " +
- "that wasn't able to take focus!");
+ throw new IllegalStateException("focus search returned a view "
+ + "that wasn't able to take focus!");
}
/*
@@ -6433,13 +6445,17 @@
break;
}
- if (mEditor != null && mEditor.mKeyListener != null)
- if (mEditor.mKeyListener.onKeyUp(this, (Editable) mText, keyCode, event))
+ if (mEditor != null && mEditor.mKeyListener != null) {
+ if (mEditor.mKeyListener.onKeyUp(this, (Editable) mText, keyCode, event)) {
return true;
+ }
+ }
- if (mMovement != null && mLayout != null)
- if (mMovement.onKeyUp(this, (Spannable) mText, keyCode, event))
+ if (mMovement != null && mLayout != null) {
+ if (mMovement.onKeyUp(this, (Spannable) mText, keyCode, event)) {
return true;
+ }
+ }
return super.onKeyUp(keyCode, event);
}
@@ -6471,9 +6487,9 @@
if (focusSearch(FOCUS_UP) != null) {
outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS;
}
- if ((outAttrs.imeOptions&EditorInfo.IME_MASK_ACTION)
+ if ((outAttrs.imeOptions & EditorInfo.IME_MASK_ACTION)
== EditorInfo.IME_ACTION_UNSPECIFIED) {
- if ((outAttrs.imeOptions&EditorInfo.IME_FLAG_NAVIGATE_NEXT) != 0) {
+ if ((outAttrs.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_NEXT) != 0) {
// An action has not been set, but the enter key will move to
// the next focus, so set the action to that.
outAttrs.imeOptions |= EditorInfo.IME_ACTION_NEXT;
@@ -6564,18 +6580,24 @@
// avoid crashes. If this is a partial update, it is possible that
// the underlying text may have changed, causing us problems here.
// Also we just don't want to trust clients to do the right thing.
- Spannable sp = (Spannable)getText();
+ Spannable sp = (Spannable) getText();
final int N = sp.length();
int start = text.selectionStart;
- if (start < 0) start = 0;
- else if (start > N) start = N;
+ if (start < 0) {
+ start = 0;
+ } else if (start > N) {
+ start = N;
+ }
int end = text.selectionEnd;
- if (end < 0) end = 0;
- else if (end > N) end = N;
+ if (end < 0) {
+ end = 0;
+ } else if (end > N) {
+ end = N;
+ }
Selection.setSelection(sp, start, end);
// Finally, update the selection mode.
- if ((text.flags&ExtractedText.FLAG_SELECTING) != 0) {
+ if ((text.flags & ExtractedText.FLAG_SELECTING) != 0) {
MetaKeyKeyListener.startSelecting(this, sp);
} else {
MetaKeyKeyListener.stopSelecting(this, sp);
@@ -6615,9 +6637,10 @@
/**
* Called by the framework in response to a text auto-correction (such as fixing a typo using a
- * a dictionnary) from the current input method, provided by it calling
- * {@link InputConnection#commitCorrection} InputConnection.commitCorrection()}. The default
- * implementation flashes the background of the corrected word to provide feedback to the user.
+ * a dictionary) from the current input method, provided by it calling
+ * {@link InputConnection#commitCorrection(CorrectionInfo) InputConnection.commitCorrection()}.
+ * The default implementation flashes the background of the corrected word to provide
+ * feedback to the user.
*
* @param info The auto correct info about the text that was corrected.
*/
@@ -6735,12 +6758,12 @@
alignment = Layout.Alignment.ALIGN_CENTER;
break;
case TEXT_ALIGNMENT_VIEW_START:
- alignment = (getLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
- Layout.Alignment.ALIGN_RIGHT : Layout.Alignment.ALIGN_LEFT;
+ alignment = (getLayoutDirection() == LAYOUT_DIRECTION_RTL)
+ ? Layout.Alignment.ALIGN_RIGHT : Layout.Alignment.ALIGN_LEFT;
break;
case TEXT_ALIGNMENT_VIEW_END:
- alignment = (getLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
- Layout.Alignment.ALIGN_LEFT : Layout.Alignment.ALIGN_RIGHT;
+ alignment = (getLayoutDirection() == LAYOUT_DIRECTION_RTL)
+ ? Layout.Alignment.ALIGN_LEFT : Layout.Alignment.ALIGN_RIGHT;
break;
case TEXT_ALIGNMENT_INHERIT:
// This should never happen as we have already resolved the text alignment
@@ -6777,17 +6800,17 @@
}
Layout.Alignment alignment = getLayoutAlignment();
- final boolean testDirChange = mSingleLine && mLayout != null &&
- (alignment == Layout.Alignment.ALIGN_NORMAL ||
- alignment == Layout.Alignment.ALIGN_OPPOSITE);
+ final boolean testDirChange = mSingleLine && mLayout != null
+ && (alignment == Layout.Alignment.ALIGN_NORMAL
+ || alignment == Layout.Alignment.ALIGN_OPPOSITE);
int oldDir = 0;
if (testDirChange) oldDir = mLayout.getParagraphDirection(0);
boolean shouldEllipsize = mEllipsize != null && getKeyListener() == null;
- final boolean switchEllipsize = mEllipsize == TruncateAt.MARQUEE &&
- mMarqueeFadeMode != MARQUEE_FADE_NORMAL;
+ final boolean switchEllipsize = mEllipsize == TruncateAt.MARQUEE
+ && mMarqueeFadeMode != MARQUEE_FADE_NORMAL;
TruncateAt effectiveEllipsize = mEllipsize;
- if (mEllipsize == TruncateAt.MARQUEE &&
- mMarqueeFadeMode == MARQUEE_FADE_SWITCH_SHOW_ELLIPSIS) {
+ if (mEllipsize == TruncateAt.MARQUEE
+ && mMarqueeFadeMode == MARQUEE_FADE_SWITCH_SHOW_ELLIPSIS) {
effectiveEllipsize = TruncateAt.END_SMALL;
}
@@ -6798,8 +6821,8 @@
mLayout = makeSingleLayout(wantWidth, boring, ellipsisWidth, alignment, shouldEllipsize,
effectiveEllipsize, effectiveEllipsize == mEllipsize);
if (switchEllipsize) {
- TruncateAt oppositeEllipsize = effectiveEllipsize == TruncateAt.MARQUEE ?
- TruncateAt.END : TruncateAt.MARQUEE;
+ TruncateAt oppositeEllipsize = effectiveEllipsize == TruncateAt.MARQUEE
+ ? TruncateAt.END : TruncateAt.MARQUEE;
mSavedMarqueeModeLayout = makeSingleLayout(wantWidth, boring, ellipsisWidth, alignment,
shouldEllipsize, oppositeEllipsize, effectiveEllipsize != mEllipsize);
}
@@ -6819,11 +6842,10 @@
}
if (hintBoring != null) {
- if (hintBoring.width <= hintWidth &&
- (!shouldEllipsize || hintBoring.width <= ellipsisWidth)) {
+ if (hintBoring.width <= hintWidth
+ && (!shouldEllipsize || hintBoring.width <= ellipsisWidth)) {
if (mSavedHintLayout != null) {
- mHintLayout = mSavedHintLayout.
- replaceOrMake(mHint, mTextPaint,
+ mHintLayout = mSavedHintLayout.replaceOrMake(mHint, mTextPaint,
hintWidth, alignment, mSpacingMult, mSpacingAdd,
hintBoring, mIncludePad);
} else {
@@ -6835,8 +6857,7 @@
mSavedHintLayout = (BoringLayout) mHintLayout;
} else if (shouldEllipsize && hintBoring.width <= hintWidth) {
if (mSavedHintLayout != null) {
- mHintLayout = mSavedHintLayout.
- replaceOrMake(mHint, mTextPaint,
+ mHintLayout = mSavedHintLayout.replaceOrMake(mHint, mTextPaint,
hintWidth, alignment, mSpacingMult, mSpacingAdd,
hintBoring, mIncludePad, mEllipsize,
ellipsisWidth);
@@ -6910,8 +6931,8 @@
}
if (boring != null) {
- if (boring.width <= wantWidth &&
- (effectiveEllipsize == null || boring.width <= ellipsisWidth)) {
+ if (boring.width <= wantWidth
+ && (effectiveEllipsize == null || boring.width <= ellipsisWidth)) {
if (useSaved && mSavedLayout != null) {
result = mSavedLayout.replaceOrMake(mTransformed, mTextPaint,
wantWidth, alignment, mSpacingMult, mSpacingAdd,
@@ -6964,8 +6985,8 @@
if (isHardwareAccelerated()) return false;
// Only compress the text if it hasn't been compressed by the previous pass
- if (width > 0.0f && mLayout != null && getLineCount() == 1 && !mUserSetTextScaleX &&
- mTextPaint.getTextScaleX() == 1.0f) {
+ if (width > 0.0f && mLayout != null && getLineCount() == 1 && !mUserSetTextScaleX
+ && mTextPaint.getTextScaleX() == 1.0f) {
final float textWidth = mLayout.getLineWidth(0);
final float overflow = (textWidth + 1.0f - width) / width;
if (overflow > 0.0f && overflow <= Marquee.MARQUEE_DELTA_MAX) {
@@ -6991,8 +7012,9 @@
// but it's ok for the last line not to have a newline
for (int i = 0; i < n - 1; i++) {
- if (text.charAt(layout.getLineEnd(i) - 1) != '\n')
+ if (text.charAt(layout.getLineEnd(i) - 1) != '\n') {
return -1;
+ }
}
for (int i = 0; i < n; i++) {
@@ -7076,7 +7098,8 @@
if (boring == null || boring == UNKNOWN_BORING) {
if (des < 0) {
- des = (int) Math.ceil(Layout.getDesiredWidth(mTransformed, mTextPaint));
+ des = (int) Math.ceil(Layout.getDesiredWidth(mTransformed, 0,
+ mTransformed.length(), mTextPaint, mTextDir));
}
width = des;
} else {
@@ -7106,7 +7129,8 @@
if (hintBoring == null || hintBoring == UNKNOWN_BORING) {
if (hintDes < 0) {
- hintDes = (int) Math.ceil(Layout.getDesiredWidth(mHint, mTextPaint));
+ hintDes = (int) Math.ceil(Layout.getDesiredWidth(mHint, 0, mHint.length(),
+ mTextPaint, mTextDir));
}
hintWidth = hintDes;
} else {
@@ -7152,15 +7176,14 @@
makeNewLayout(want, hintWant, boring, hintBoring,
width - getCompoundPaddingLeft() - getCompoundPaddingRight(), false);
} else {
- final boolean layoutChanged = (mLayout.getWidth() != want) ||
- (hintWidth != hintWant) ||
- (mLayout.getEllipsizedWidth() !=
- width - getCompoundPaddingLeft() - getCompoundPaddingRight());
+ final boolean layoutChanged = (mLayout.getWidth() != want) || (hintWidth != hintWant)
+ || (mLayout.getEllipsizedWidth()
+ != width - getCompoundPaddingLeft() - getCompoundPaddingRight());
- final boolean widthChanged = (mHint == null) &&
- (mEllipsize == null) &&
- (want > mLayout.getWidth()) &&
- (mLayout instanceof BoringLayout || (fromexisting && des >= 0 && des <= want));
+ final boolean widthChanged = (mHint == null) && (mEllipsize == null)
+ && (want > mLayout.getWidth())
+ && (mLayout instanceof BoringLayout
+ || (fromexisting && des >= 0 && des <= want));
final boolean maximumChanged = (mMaxMode != mOldMaxMode) || (mMaximum != mOldMaximum);
@@ -7200,9 +7223,9 @@
* We didn't let makeNewLayout() register to bring the cursor into view,
* so do it here if there is any possibility that it is needed.
*/
- if (mMovement != null ||
- mLayout.getWidth() > unpaddedWidth ||
- mLayout.getHeight() > unpaddedHeight) {
+ if (mMovement != null
+ || mLayout.getWidth() > unpaddedWidth
+ || mLayout.getHeight() > unpaddedHeight) {
registerForPreDraw();
} else {
scrollTo(0, 0);
@@ -7316,10 +7339,10 @@
// If we have a fixed width, we can just swap in a new text layout
// if the text height stays the same or if the view height is fixed.
- if (((mLayoutParams.width != LayoutParams.WRAP_CONTENT && mLayoutParams.width != 0) ||
- (mMaxWidthMode == mMinWidthMode && mMaxWidth == mMinWidth)) &&
- (mHint == null || mHintLayout != null) &&
- (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight() > 0)) {
+ if (((mLayoutParams.width != LayoutParams.WRAP_CONTENT && mLayoutParams.width != 0)
+ || (mMaxWidthMode == mMinWidthMode && mMaxWidth == mMinWidth))
+ && (mHint == null || mHintLayout != null)
+ && (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight() > 0)) {
// Static width, so try making a new text layout.
int oldht = mLayout.getHeight();
@@ -7337,16 +7360,16 @@
if (mEllipsize != TextUtils.TruncateAt.MARQUEE) {
// In a fixed-height view, so use our new text layout.
- if (mLayoutParams.height != LayoutParams.WRAP_CONTENT &&
- mLayoutParams.height != LayoutParams.MATCH_PARENT) {
+ if (mLayoutParams.height != LayoutParams.WRAP_CONTENT
+ && mLayoutParams.height != LayoutParams.MATCH_PARENT) {
invalidate();
return;
}
// Dynamic height, but height has stayed the same,
// so use our new text layout.
- if (mLayout.getHeight() == oldht &&
- (mHintLayout == null || mHintLayout.getHeight() == oldht)) {
+ if (mLayout.getHeight() == oldht
+ && (mHintLayout == null || mHintLayout.getHeight() == oldht)) {
invalidate();
return;
}
@@ -7399,11 +7422,11 @@
// Convert to left, center, or right alignment.
if (a == Layout.Alignment.ALIGN_NORMAL) {
- a = dir == Layout.DIR_LEFT_TO_RIGHT ? Layout.Alignment.ALIGN_LEFT :
- Layout.Alignment.ALIGN_RIGHT;
- } else if (a == Layout.Alignment.ALIGN_OPPOSITE){
- a = dir == Layout.DIR_LEFT_TO_RIGHT ? Layout.Alignment.ALIGN_RIGHT :
- Layout.Alignment.ALIGN_LEFT;
+ a = dir == Layout.DIR_LEFT_TO_RIGHT
+ ? Layout.Alignment.ALIGN_LEFT : Layout.Alignment.ALIGN_RIGHT;
+ } else if (a == Layout.Alignment.ALIGN_OPPOSITE) {
+ a = dir == Layout.DIR_LEFT_TO_RIGHT
+ ? Layout.Alignment.ALIGN_RIGHT : Layout.Alignment.ALIGN_LEFT;
}
if (a == Layout.Alignment.ALIGN_CENTER) {
@@ -7460,7 +7483,7 @@
}
boolean changed = false;
- Layout layout = isShowingHint() ? mHintLayout: mLayout;
+ Layout layout = isShowingHint() ? mHintLayout : mLayout;
if (layout == null) return changed;
@@ -7499,7 +7522,7 @@
// right where it is most likely to be annoying.
final boolean clamped = grav > 0;
// FIXME: Is it okay to truncate this, or should we round?
- final int x = (int)layout.getPrimaryHorizontal(offset, clamped);
+ final int x = (int) layout.getPrimaryHorizontal(offset, clamped);
final int top = layout.getLineTop(line);
final int bottom = layout.getLineTop(line + 1);
@@ -7517,22 +7540,28 @@
int hslack = (bottom - top) / 2;
int vslack = hslack;
- if (vslack > vspace / 4)
+ if (vslack > vspace / 4) {
vslack = vspace / 4;
- if (hslack > hspace / 4)
+ }
+ if (hslack > hspace / 4) {
hslack = hspace / 4;
+ }
int hs = mScrollX;
int vs = mScrollY;
- if (top - vs < vslack)
+ if (top - vs < vslack) {
vs = top - vslack;
- if (bottom - vs > vspace - vslack)
+ }
+ if (bottom - vs > vspace - vslack) {
vs = bottom - (vspace - vslack);
- if (ht - vs < vspace)
+ }
+ if (ht - vs < vspace) {
vs = ht - vspace;
- if (0 - vs > 0)
+ }
+ if (0 - vs > 0) {
vs = 0;
+ }
if (grav != 0) {
if (x - hs < hslack) {
@@ -7544,15 +7573,19 @@
}
if (grav < 0) {
- if (left - hs > 0)
+ if (left - hs > 0) {
hs = left;
- if (right - hs < hspace)
+ }
+ if (right - hs < hspace) {
hs = right - hspace;
+ }
} else if (grav > 0) {
- if (right - hs < hspace)
+ if (right - hs < hspace) {
hs = right - hspace;
- if (left - hs > 0)
+ }
+ if (left - hs > 0) {
hs = left;
+ }
} else /* grav == 0 */ {
if (right - left <= hspace) {
/*
@@ -7667,14 +7700,15 @@
final int bottom = mLayout.getLineTop(line + 1);
final int vspace = mBottom - mTop - getExtendedPaddingTop() - getExtendedPaddingBottom();
int vslack = (bottom - top) / 2;
- if (vslack > vspace / 4)
+ if (vslack > vspace / 4) {
vslack = vspace / 4;
+ }
final int vs = mScrollY;
- if (top < (vs+vslack)) {
- line = mLayout.getLineForVertical(vs+vslack+(bottom-top));
- } else if (bottom > (vspace+vs-vslack)) {
- line = mLayout.getLineForVertical(vspace+vs-vslack-(bottom-top));
+ if (top < (vs + vslack)) {
+ line = mLayout.getLineForVertical(vs + vslack + (bottom - top));
+ } else if (bottom > (vspace + vs - vslack)) {
+ line = mLayout.getLineForVertical(vspace + vs - vslack - (bottom - top));
}
// Next: make sure the character is visible on screen:
@@ -7682,7 +7716,7 @@
final int hspace = mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight();
final int hs = mScrollX;
final int leftChar = mLayout.getOffsetForHorizontal(line, hs);
- final int rightChar = mLayout.getOffsetForHorizontal(line, hspace+hs);
+ final int rightChar = mLayout.getOffsetForHorizontal(line, hspace + hs);
// line might contain bidirectional text
final int lowChar = leftChar < rightChar ? leftChar : rightChar;
@@ -7696,7 +7730,7 @@
}
if (newStart != start) {
- Selection.setSelection((Spannable)mText, newStart);
+ Selection.setSelection((Spannable) mText, newStart);
return true;
}
@@ -7859,8 +7893,9 @@
* @param singleLine
*/
private void setInputTypeSingleLine(boolean singleLine) {
- if (mEditor != null &&
- (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS) == EditorInfo.TYPE_CLASS_TEXT) {
+ if (mEditor != null
+ && (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS)
+ == EditorInfo.TYPE_CLASS_TEXT) {
if (singleLine) {
mEditor.mInputType &= ~EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;
} else {
@@ -8004,10 +8039,10 @@
}
private boolean canMarquee() {
- int width = (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight());
- return width > 0 && (mLayout.getLineWidth(0) > width ||
- (mMarqueeFadeMode != MARQUEE_FADE_NORMAL && mSavedMarqueeModeLayout != null &&
- mSavedMarqueeModeLayout.getLineWidth(0) > width));
+ int width = mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight();
+ return width > 0 && (mLayout.getLineWidth(0) > width
+ || (mMarqueeFadeMode != MARQUEE_FADE_NORMAL && mSavedMarqueeModeLayout != null
+ && mSavedMarqueeModeLayout.getLineWidth(0) > width));
}
private void startMarquee() {
@@ -8018,8 +8053,8 @@
return;
}
- if ((mMarquee == null || mMarquee.isStopped()) && (isFocused() || isSelected()) &&
- getLineCount() == 1 && canMarquee()) {
+ if ((mMarquee == null || mMarquee.isStopped()) && (isFocused() || isSelected())
+ && getLineCount() == 1 && canMarquee()) {
if (mMarqueeFadeMode == MARQUEE_FADE_SWITCH_SHOW_ELLIPSIS) {
mMarqueeFadeMode = MARQUEE_FADE_SWITCH_SHOW_FADE;
@@ -8233,12 +8268,12 @@
ims.mContentChanged = true;
if (ims.mChangedStart < 0) {
ims.mChangedStart = start;
- ims.mChangedEnd = start+before;
+ ims.mChangedEnd = start + before;
} else {
ims.mChangedStart = Math.min(ims.mChangedStart, start);
ims.mChangedEnd = Math.max(ims.mChangedEnd, start + before - ims.mChangedDelta);
}
- ims.mChangedDelta += after-before;
+ ims.mChangedDelta += after - before;
}
resetErrorChangedFlag();
sendOnTextChanged(buffer, start, before, after);
@@ -8254,7 +8289,7 @@
// spending too much time invalidating.
boolean selChanged = false;
- int newSelStart=-1, newSelEnd=-1;
+ int newSelStart = -1, newSelEnd = -1;
final Editor.InputMethodState ims = mEditor == null ? null : mEditor.mInputMethodState;
@@ -8284,7 +8319,7 @@
mHighlightPathBogus = true;
if (mEditor != null && !isFocused()) mEditor.mSelectionMoved = true;
- if ((buf.getSpanFlags(what)&Spanned.SPAN_INTERMEDIATE) == 0) {
+ if ((buf.getSpanFlags(what) & Spanned.SPAN_INTERMEDIATE) == 0) {
if (newSelStart < 0) {
newSelStart = Selection.getSelectionStart(buf);
}
@@ -8303,8 +8338,8 @@
}
}
- if (what instanceof UpdateAppearance || what instanceof ParagraphStyle ||
- what instanceof CharacterStyle) {
+ if (what instanceof UpdateAppearance || what instanceof ParagraphStyle
+ || what instanceof CharacterStyle) {
if (ims == null || ims.mBatchEditNesting == 0) {
invalidate();
mHighlightPathBogus = true;
@@ -8356,16 +8391,18 @@
}
}
} else {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "Span change outside of batch: "
- + oldStart + "-" + oldEnd + ","
- + newStart + "-" + newEnd + " " + what);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "Span change outside of batch: "
+ + oldStart + "-" + oldEnd + ","
+ + newStart + "-" + newEnd + " " + what);
+ }
ims.mContentChanged = true;
}
}
}
- if (mEditor != null && mEditor.mSpellChecker != null && newStart < 0 &&
- what instanceof SpellCheckSpan) {
+ if (mEditor != null && mEditor.mSpellChecker != null && newStart < 0
+ && what instanceof SpellCheckSpan) {
mEditor.mSpellChecker.onSpellCheckSpanRemoved((SpellCheckSpan) what);
}
}
@@ -8421,7 +8458,7 @@
*/
public void clearComposingText() {
if (mText instanceof Spannable) {
- BaseInputConnection.removeComposingSpans((Spannable)mText);
+ BaseInputConnection.removeComposingSpans((Spannable) mText);
}
}
@@ -8446,8 +8483,8 @@
if (mEditor != null) {
mEditor.onTouchEvent(event);
- if (mEditor.mSelectionModifierCursorController != null &&
- mEditor.mSelectionModifierCursorController.isDragAcceleratorActive()) {
+ if (mEditor.mSelectionModifierCursorController != null
+ && mEditor.mSelectionModifierCursorController.isDragAcceleratorActive()) {
return true;
}
}
@@ -8469,10 +8506,10 @@
return superResult;
}
- final boolean touchIsFinished = (action == MotionEvent.ACTION_UP) &&
- (mEditor == null || !mEditor.mIgnoreActionUpEvent) && isFocused();
+ final boolean touchIsFinished = (action == MotionEvent.ACTION_UP)
+ && (mEditor == null || !mEditor.mIgnoreActionUpEvent) && isFocused();
- if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
+ if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
&& mText instanceof Spannable && mLayout != null) {
boolean handled = false;
@@ -8605,7 +8642,7 @@
}
} else if (getLineCount() == 1) {
final float lineLeft = getLayout().getLineLeft(0);
- if(lineLeft > mScrollX) return 0.0f;
+ if (lineLeft > mScrollX) return 0.0f;
return getHorizontalFadingEdgeStrength(mScrollX, lineLeft);
}
return super.getLeftFadingEdgeStrength();
@@ -8617,10 +8654,10 @@
final Marquee marquee = mMarquee;
return getHorizontalFadingEdgeStrength(marquee.getMaxFadeScroll(), marquee.getScroll());
} else if (getLineCount() == 1) {
- final float rightEdge = mScrollX + (getWidth() - getCompoundPaddingLeft() -
- getCompoundPaddingRight());
+ final float rightEdge = mScrollX +
+ (getWidth() - getCompoundPaddingLeft() - getCompoundPaddingRight());
final float lineRight = getLayout().getLineRight(0);
- if(lineRight < rightEdge) return 0.0f;
+ if (lineRight < rightEdge) return 0.0f;
return getHorizontalFadingEdgeStrength(rightEdge, lineRight);
}
return super.getRightFadingEdgeStrength();
@@ -8635,25 +8672,25 @@
* @param position2 A horizontal position.
* @return Fading edge strength between [0.0f, 1.0f].
*/
- @FloatRange(from=0.0, to=1.0)
- private final float getHorizontalFadingEdgeStrength(float position1, float position2) {
+ @FloatRange(from = 0.0, to = 1.0)
+ private float getHorizontalFadingEdgeStrength(float position1, float position2) {
final int horizontalFadingEdgeLength = getHorizontalFadingEdgeLength();
- if(horizontalFadingEdgeLength == 0) return 0.0f;
+ if (horizontalFadingEdgeLength == 0) return 0.0f;
final float diff = Math.abs(position1 - position2);
- if(diff > horizontalFadingEdgeLength) return 1.0f;
+ if (diff > horizontalFadingEdgeLength) return 1.0f;
return diff / horizontalFadingEdgeLength;
}
- private final boolean isMarqueeFadeEnabled() {
- return mEllipsize == TextUtils.TruncateAt.MARQUEE &&
- mMarqueeFadeMode != MARQUEE_FADE_SWITCH_SHOW_ELLIPSIS;
+ private boolean isMarqueeFadeEnabled() {
+ return mEllipsize == TextUtils.TruncateAt.MARQUEE
+ && mMarqueeFadeMode != MARQUEE_FADE_SWITCH_SHOW_ELLIPSIS;
}
@Override
protected int computeHorizontalScrollRange() {
if (mLayout != null) {
- return mSingleLine && (mGravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.LEFT ?
- (int) mLayout.getLineWidth(0) : mLayout.getWidth();
+ return mSingleLine && (mGravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.LEFT
+ ? (int) mLayout.getLineWidth(0) : mLayout.getWidth();
}
return super.computeHorizontalScrollRange();
@@ -8661,9 +8698,9 @@
@Override
protected int computeVerticalScrollRange() {
- if (mLayout != null)
+ if (mLayout != null) {
return mLayout.getHeight();
-
+ }
return super.computeVerticalScrollRange();
}
@@ -8744,31 +8781,31 @@
if (event.hasModifiers(KeyEvent.META_CTRL_ON)) {
// Handle Ctrl-only shortcuts.
switch (keyCode) {
- case KeyEvent.KEYCODE_A:
- if (canSelectText()) {
- return onTextContextMenuItem(ID_SELECT_ALL);
- }
- break;
- case KeyEvent.KEYCODE_Z:
- if (canUndo()) {
- return onTextContextMenuItem(ID_UNDO);
- }
- break;
- case KeyEvent.KEYCODE_X:
- if (canCut()) {
- return onTextContextMenuItem(ID_CUT);
- }
- break;
- case KeyEvent.KEYCODE_C:
- if (canCopy()) {
- return onTextContextMenuItem(ID_COPY);
- }
- break;
- case KeyEvent.KEYCODE_V:
- if (canPaste()) {
- return onTextContextMenuItem(ID_PASTE);
- }
- break;
+ case KeyEvent.KEYCODE_A:
+ if (canSelectText()) {
+ return onTextContextMenuItem(ID_SELECT_ALL);
+ }
+ break;
+ case KeyEvent.KEYCODE_Z:
+ if (canUndo()) {
+ return onTextContextMenuItem(ID_UNDO);
+ }
+ break;
+ case KeyEvent.KEYCODE_X:
+ if (canCut()) {
+ return onTextContextMenuItem(ID_CUT);
+ }
+ break;
+ case KeyEvent.KEYCODE_C:
+ if (canCopy()) {
+ return onTextContextMenuItem(ID_COPY);
+ }
+ break;
+ case KeyEvent.KEYCODE_V:
+ if (canPaste()) {
+ return onTextContextMenuItem(ID_PASTE);
+ }
+ break;
}
} else if (event.hasModifiers(KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)) {
// Handle Ctrl-Shift shortcuts.
@@ -8808,8 +8845,8 @@
// If you change this condition, make sure prepareCursorController is called anywhere
// the value of this condition might be changed.
if (mMovement == null || !mMovement.canSelectArbitrarily()) return false;
- return isTextEditable() ||
- (isTextSelectable() && mText instanceof Spannable && isEnabled());
+ return isTextEditable()
+ || (isTextSelectable() && mText instanceof Spannable && isEnabled());
}
private Locale getTextServicesLocale(boolean allowNullLocale) {
@@ -8963,22 +9000,22 @@
if (topWindowLocation >= 0) {
// The top of the view is fully within its window; start text at line 0.
topLine = getLineAtCoordinateUnclamped(0);
- bottomLine = getLineAtCoordinateUnclamped(windowHeight-1);
+ bottomLine = getLineAtCoordinateUnclamped(windowHeight - 1);
} else {
// The top of hte window has scrolled off the top of the window; figure out
// the starting line for this.
topLine = getLineAtCoordinateUnclamped(-topWindowLocation);
- bottomLine = getLineAtCoordinateUnclamped(windowHeight-1-topWindowLocation);
+ bottomLine = getLineAtCoordinateUnclamped(windowHeight - 1 - topWindowLocation);
}
// We want to return some contextual lines above/below the lines that are
// actually visible.
- int expandedTopLine = topLine - (bottomLine-topLine)/2;
+ int expandedTopLine = topLine - (bottomLine - topLine) / 2;
if (expandedTopLine < 0) {
expandedTopLine = 0;
}
- int expandedBottomLine = bottomLine + (bottomLine-topLine)/2;
+ int expandedBottomLine = bottomLine + (bottomLine - topLine) / 2;
if (expandedBottomLine >= lineCount) {
- expandedBottomLine = lineCount-1;
+ expandedBottomLine = lineCount - 1;
}
// Convert lines into character offsets.
int expandedTopChar = layout.getLineStart(expandedTopLine);
@@ -9000,13 +9037,13 @@
if (expandedTopChar > 0 || expandedBottomChar < text.length()) {
text = text.subSequence(expandedTopChar, expandedBottomChar);
}
- structure.setText(text, selStart-expandedTopChar, selEnd-expandedTopChar);
- final int[] lineOffsets = new int[bottomLine-topLine+1];
- final int[] lineBaselines = new int[bottomLine-topLine+1];
+ structure.setText(text, selStart - expandedTopChar, selEnd - expandedTopChar);
+ final int[] lineOffsets = new int[bottomLine - topLine + 1];
+ final int[] lineBaselines = new int[bottomLine - topLine + 1];
final int baselineOffset = getBaselineOffset();
- for (int i=topLine; i<=bottomLine; i++) {
- lineOffsets[i-topLine] = layout.getLineStart(i);
- lineBaselines[i-topLine] = layout.getLineBaseline(i) + baselineOffset;
+ for (int i = topLine; i <= bottomLine; i++) {
+ lineOffsets[i - topLine] = layout.getLineStart(i);
+ lineBaselines[i - topLine] = layout.getLineBaseline(i) + baselineOffset;
}
structure.setTextLines(lineOffsets, lineBaselines);
}
@@ -9462,11 +9499,11 @@
if ((mEditor.mInputType & InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS) > 0) return false;
final int variation = mEditor.mInputType & EditorInfo.TYPE_MASK_VARIATION;
- return (variation == EditorInfo.TYPE_TEXT_VARIATION_NORMAL ||
- variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_SUBJECT ||
- variation == EditorInfo.TYPE_TEXT_VARIATION_LONG_MESSAGE ||
- variation == EditorInfo.TYPE_TEXT_VARIATION_SHORT_MESSAGE ||
- variation == EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT);
+ return (variation == EditorInfo.TYPE_TEXT_VARIATION_NORMAL
+ || variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_SUBJECT
+ || variation == EditorInfo.TYPE_TEXT_VARIATION_LONG_MESSAGE
+ || variation == EditorInfo.TYPE_TEXT_VARIATION_SHORT_MESSAGE
+ || variation == EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT);
}
/**
@@ -9568,8 +9605,8 @@
return false;
}
- if (mText.length() > 0 && hasSelection() && mText instanceof Editable && mEditor != null &&
- mEditor.mKeyListener != null) {
+ if (mText.length() > 0 && hasSelection() && mText instanceof Editable && mEditor != null
+ && mEditor.mKeyListener != null) {
return true;
}
@@ -9606,12 +9643,12 @@
}
boolean canPaste() {
- return (mText instanceof Editable &&
- mEditor != null && mEditor.mKeyListener != null &&
- getSelectionStart() >= 0 &&
- getSelectionEnd() >= 0 &&
- ((ClipboardManager)getContext().getSystemService(Context.CLIPBOARD_SERVICE)).
- hasPrimaryClip());
+ return (mText instanceof Editable
+ && mEditor != null && mEditor.mKeyListener != null
+ && getSelectionStart() >= 0
+ && getSelectionEnd() >= 0
+ && ((ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE))
+ .hasPrimaryClip());
}
boolean canProcessText() {
@@ -9641,11 +9678,11 @@
*/
private void paste(int min, int max, boolean withFormatting) {
ClipboardManager clipboard =
- (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+ (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = clipboard.getPrimaryClip();
if (clip != null) {
boolean didFirst = false;
- for (int i=0; i<clip.getItemCount(); i++) {
+ for (int i = 0; i < clip.getItemCount(); i++) {
final CharSequence paste;
if (withFormatting) {
paste = clip.getItemAt(i).coerceToStyledText(getContext());
@@ -9682,8 +9719,8 @@
}
private void setPrimaryClip(ClipData clip) {
- ClipboardManager clipboard = (ClipboardManager) getContext().
- getSystemService(Context.CLIPBOARD_SERVICE);
+ ClipboardManager clipboard =
+ (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(clip);
sLastCutCopyOrTextChangedTime = SystemClock.uptimeMillis();
}
@@ -9745,7 +9782,7 @@
case DragEvent.ACTION_DRAG_LOCATION:
final int offset = getOffsetForPosition(event.getX(), event.getY());
- Selection.setSelection((Spannable)mText, offset);
+ Selection.setSelection((Spannable) mText, offset);
return true;
case DragEvent.ACTION_DROP:
@@ -9945,7 +9982,7 @@
Spannable text = (Spannable) getIterableTextForAccessibility();
if (!TextUtils.isEmpty(text) && getLayout() != null) {
AccessibilityIterators.LineTextSegmentIterator iterator =
- AccessibilityIterators.LineTextSegmentIterator.getInstance();
+ AccessibilityIterators.LineTextSegmentIterator.getInstance();
iterator.initialize(text, getLayout());
return iterator;
}
@@ -9954,7 +9991,7 @@
Spannable text = (Spannable) getIterableTextForAccessibility();
if (!TextUtils.isEmpty(text) && getLayout() != null) {
AccessibilityIterators.PageTextSegmentIterator iterator =
- AccessibilityIterators.PageTextSegmentIterator.getInstance();
+ AccessibilityIterators.PageTextSegmentIterator.getInstance();
iterator.initialize(this);
return iterator;
}
@@ -10078,16 +10115,16 @@
}
@SuppressWarnings("hiding")
- public static final Parcelable.Creator<SavedState> CREATOR
- = new Parcelable.Creator<SavedState>() {
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
+ public static final Parcelable.Creator<SavedState> CREATOR =
+ new Parcelable.Creator<SavedState>() {
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
private SavedState(Parcel in) {
super(in);
@@ -10298,8 +10335,8 @@
if (textView != null && textView.mLayout != null) {
mStatus = MARQUEE_STARTING;
mScroll = 0.0f;
- final int textWidth = textView.getWidth() - textView.getCompoundPaddingLeft() -
- textView.getCompoundPaddingRight();
+ final int textWidth = textView.getWidth() - textView.getCompoundPaddingLeft()
+ - textView.getCompoundPaddingRight();
final float lineWidth = textView.mLayout.getLineWidth(0);
final float gap = textWidth / 3.0f;
mGhostStart = lineWidth - textWidth + gap;
@@ -10348,8 +10385,10 @@
public void beforeTextChanged(CharSequence buffer, int start,
int before, int after) {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "beforeTextChanged start=" + start
- + " before=" + before + " after=" + after + ": " + buffer);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "beforeTextChanged start=" + start
+ + " before=" + before + " after=" + after + ": " + buffer);
+ }
if (AccessibilityManager.getInstance(mContext).isEnabled()
&& ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod())
@@ -10361,19 +10400,23 @@
}
public void onTextChanged(CharSequence buffer, int start, int before, int after) {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "onTextChanged start=" + start
- + " before=" + before + " after=" + after + ": " + buffer);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "onTextChanged start=" + start
+ + " before=" + before + " after=" + after + ": " + buffer);
+ }
TextView.this.handleTextChanged(buffer, start, before, after);
- if (AccessibilityManager.getInstance(mContext).isEnabled() &&
- (isFocused() || isSelected() && isShown())) {
+ if (AccessibilityManager.getInstance(mContext).isEnabled()
+ && (isFocused() || isSelected() && isShown())) {
sendAccessibilityEventTypeViewTextChanged(mBeforeText, start, before, after);
mBeforeText = null;
}
}
public void afterTextChanged(Editable buffer) {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "afterTextChanged: " + buffer);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "afterTextChanged: " + buffer);
+ }
TextView.this.sendAfterTextChanged(buffer);
if (MetaKeyKeyListener.getMetaState(buffer, MetaKeyKeyListener.META_SELECTING) != 0) {
@@ -10382,20 +10425,24 @@
}
public void onSpanChanged(Spannable buf, Object what, int s, int e, int st, int en) {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "onSpanChanged s=" + s + " e=" + e
- + " st=" + st + " en=" + en + " what=" + what + ": " + buf);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "onSpanChanged s=" + s + " e=" + e
+ + " st=" + st + " en=" + en + " what=" + what + ": " + buf);
+ }
TextView.this.spanChange(buf, what, s, st, e, en);
}
public void onSpanAdded(Spannable buf, Object what, int s, int e) {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "onSpanAdded s=" + s + " e=" + e
- + " what=" + what + ": " + buf);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "onSpanAdded s=" + s + " e=" + e + " what=" + what + ": " + buf);
+ }
TextView.this.spanChange(buf, what, -1, s, -1, e);
}
public void onSpanRemoved(Spannable buf, Object what, int s, int e) {
- if (DEBUG_EXTRACT) Log.v(LOG_TAG, "onSpanRemoved s=" + s + " e=" + e
- + " what=" + what + ": " + buf);
+ if (DEBUG_EXTRACT) {
+ Log.v(LOG_TAG, "onSpanRemoved s=" + s + " e=" + e + " what=" + what + ": " + buf);
+ }
TextView.this.spanChange(buf, what, s, -1, e, -1);
}
}
diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java
index 84165cb..1bbe041 100644
--- a/core/java/android/widget/TimePicker.java
+++ b/core/java/android/widget/TimePicker.java
@@ -18,6 +18,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.TestApi;
import android.annotation.Widget;
import android.content.Context;
import android.content.res.Configuration;
@@ -250,6 +251,30 @@
return mDelegate.dispatchPopulateAccessibilityEvent(event);
}
+ /** @hide */
+ @TestApi
+ public View getHourView() {
+ return mDelegate.getHourView();
+ }
+
+ /** @hide */
+ @TestApi
+ public View getMinuteView() {
+ return mDelegate.getMinuteView();
+ }
+
+ /** @hide */
+ @TestApi
+ public View getAmView() {
+ return mDelegate.getAmView();
+ }
+
+ /** @hide */
+ @TestApi
+ public View getPmView() {
+ return mDelegate.getPmView();
+ }
+
/**
* A delegate interface that defined the public API of the TimePicker. Allows different
* TimePicker implementations. This would need to be implemented by the TimePicker delegates
@@ -277,6 +302,18 @@
boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event);
void onPopulateAccessibilityEvent(AccessibilityEvent event);
+
+ /** @hide */
+ @TestApi View getHourView();
+
+ /** @hide */
+ @TestApi View getMinuteView();
+
+ /** @hide */
+ @TestApi View getAmView();
+
+ /** @hide */
+ @TestApi View getPmView();
}
static String[] getAmPmStrings(Context context) {
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java
index a70f2c7..59cde5b 100644
--- a/core/java/android/widget/TimePickerClockDelegate.java
+++ b/core/java/android/widget/TimePickerClockDelegate.java
@@ -17,6 +17,7 @@
package android.widget;
import android.annotation.Nullable;
+import android.annotation.TestApi;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -541,6 +542,34 @@
event.getText().add(selectedTime + " " + selectionMode);
}
+ /** @hide */
+ @Override
+ @TestApi
+ public View getHourView() {
+ return mHourView;
+ }
+
+ /** @hide */
+ @Override
+ @TestApi
+ public View getMinuteView() {
+ return mMinuteView;
+ }
+
+ /** @hide */
+ @Override
+ @TestApi
+ public View getAmView() {
+ return mAmLabel;
+ }
+
+ /** @hide */
+ @Override
+ @TestApi
+ public View getPmView() {
+ return mPmLabel;
+ }
+
/**
* @return the index of the current item showing
*/
diff --git a/core/java/android/widget/TimePickerSpinnerDelegate.java b/core/java/android/widget/TimePickerSpinnerDelegate.java
index 513e8c3..26e1564 100644
--- a/core/java/android/widget/TimePickerSpinnerDelegate.java
+++ b/core/java/android/widget/TimePickerSpinnerDelegate.java
@@ -16,6 +16,7 @@
package android.widget;
+import android.annotation.TestApi;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Parcelable;
@@ -413,6 +414,34 @@
event.getText().add(selectedDateUtterance);
}
+ /** @hide */
+ @Override
+ @TestApi
+ public View getHourView() {
+ return mHourSpinnerInput;
+ }
+
+ /** @hide */
+ @Override
+ @TestApi
+ public View getMinuteView() {
+ return mMinuteSpinnerInput;
+ }
+
+ /** @hide */
+ @Override
+ @TestApi
+ public View getAmView() {
+ return mAmPmSpinnerInput;
+ }
+
+ /** @hide */
+ @Override
+ @TestApi
+ public View getPmView() {
+ return mAmPmSpinnerInput;
+ }
+
private void updateInputState() {
// Make sure that if the user changes the value and the IME is active
// for one of the inputs if this widget, the IME is closed. If the user
diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java
index 7762675..e147ed6 100644
--- a/core/java/android/widget/Toast.java
+++ b/core/java/android/widget/Toast.java
@@ -357,8 +357,8 @@
WindowManager mWM;
- static final long SHORT_DURATION_TIMEOUT = 5000;
- static final long LONG_DURATION_TIMEOUT = 1000;
+ static final long SHORT_DURATION_TIMEOUT = 4000;
+ static final long LONG_DURATION_TIMEOUT = 7000;
TN() {
// XXX This should be changed to use a Dialog, with a Theme.Toast
diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java
index 0988c92..44b2b59 100644
--- a/core/java/android/widget/Toolbar.java
+++ b/core/java/android/widget/Toolbar.java
@@ -1689,7 +1689,8 @@
collapsingMargins[0] = collapsingMargins[1] = 0;
// Align views within the minimum toolbar height, if set.
- final int alignmentHeight = getMinimumHeight();
+ final int minHeight = getMinimumHeight();
+ final int alignmentHeight = minHeight >= 0 ? Math.min(minHeight, b - t) : 0;
if (shouldLayout(mNavButtonView)) {
if (isRtl) {
diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java
index 2a40aeb..5aeb7f9 100644
--- a/core/java/com/android/internal/app/AlertController.java
+++ b/core/java/com/android/internal/app/AlertController.java
@@ -178,11 +178,6 @@
return outValue.data != 0;
}
- private static boolean isWatch(Context context) {
- return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_TYPE_WATCH)
- == Configuration.UI_MODE_TYPE_WATCH;
- }
-
public static final AlertController create(Context context, DialogInterface di, Window window) {
final TypedArray a = context.obtainStyledAttributes(
null, R.styleable.AlertDialog, R.attr.alertDialogStyle, 0);
@@ -618,7 +613,7 @@
}
}
- private void setupTitle(ViewGroup topPanel) {
+ protected void setupTitle(ViewGroup topPanel) {
if (mCustomTitleView != null && mShowTitle) {
// Add the custom title view directly to the topPanel layout
final LayoutParams lp = new LayoutParams(
@@ -701,7 +696,7 @@
}
}
- private void setupButtons(ViewGroup buttonPanel) {
+ protected void setupButtons(ViewGroup buttonPanel) {
int BIT_BUTTON_POSITIVE = 1;
int BIT_BUTTON_NEGATIVE = 2;
int BIT_BUTTON_NEUTRAL = 4;
@@ -892,14 +887,8 @@
listView.setAdapter(mAdapter);
final int checkedItem = mCheckedItem;
if (checkedItem > -1) {
- // TODO: Remove temp watch specific code
- if (isWatch(mContext)) {
- listView.setItemChecked(checkedItem + listView.getHeaderViewsCount(), true);
- listView.setSelection(checkedItem + listView.getHeaderViewsCount());
- } else {
- listView.setItemChecked(checkedItem, true);
- listView.setSelection(checkedItem);
- }
+ listView.setItemChecked(checkedItem, true);
+ listView.setSelection(checkedItem);
}
}
}
@@ -1078,13 +1067,7 @@
if (mCheckedItems != null) {
boolean isItemChecked = mCheckedItems[position];
if (isItemChecked) {
- // TODO: Remove temp watch specific code
- if (isWatch(mContext)) {
- listView.setItemChecked(
- position + listView.getHeaderViewsCount(), true);
- } else {
- listView.setItemChecked(position, true);
- }
+ listView.setItemChecked(position, true);
}
}
return view;
@@ -1105,16 +1088,9 @@
public void bindView(View view, Context context, Cursor cursor) {
CheckedTextView text = (CheckedTextView) view.findViewById(R.id.text1);
text.setText(cursor.getString(mLabelIndex));
- // TODO: Remove temp watch specific code
- if (isWatch(mContext)) {
- listView.setItemChecked(
- cursor.getPosition() + listView.getHeaderViewsCount(),
- cursor.getInt(mIsCheckedIndex) == 1);
- } else {
- listView.setItemChecked(
- cursor.getPosition(),
- cursor.getInt(mIsCheckedIndex) == 1);
- }
+ listView.setItemChecked(
+ cursor.getPosition(),
+ cursor.getInt(mIsCheckedIndex) == 1);
}
@Override
@@ -1157,10 +1133,6 @@
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
- // TODO: Remove temp watch specific code
- if (isWatch(mContext)) {
- position -= listView.getHeaderViewsCount();
- }
mOnClickListener.onClick(dialog.mDialogInterface, position);
if (!mIsSingleChoice) {
dialog.mDialogInterface.dismiss();
@@ -1171,10 +1143,6 @@
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
- // TODO: Remove temp watch specific code
- if (isWatch(mContext)) {
- position -= listView.getHeaderViewsCount();
- }
if (mCheckedItems != null) {
mCheckedItems[position] = listView.isItemChecked(position);
}
diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java
index d552e54..56c5cc9 100644
--- a/core/java/com/android/internal/app/AssistUtils.java
+++ b/core/java/com/android/internal/app/AssistUtils.java
@@ -132,6 +132,16 @@
}
}
+ public void registerVoiceInteractionSessionListener(IVoiceInteractionSessionListener listener) {
+ try {
+ if (mVoiceInteractionManagerService != null) {
+ mVoiceInteractionManagerService.registerVoiceInteractionSessionListener(listener);
+ }
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed to register voice interaction listener", e);
+ }
+ }
+
public ComponentName getAssistComponentForUser(int userId) {
final String setting = Settings.Secure.getStringForUser(mContext.getContentResolver(),
Settings.Secure.ASSISTANT, userId);
diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl
index 216a4f1..5623a2c 100644
--- a/core/java/com/android/internal/app/IBatteryStats.aidl
+++ b/core/java/com/android/internal/app/IBatteryStats.aidl
@@ -79,6 +79,8 @@
String newHistoryName, int newType, boolean newUnimportantForLogging);
void noteStopWakelockFromSource(in WorkSource ws, int pid, String name, String historyName,
int type);
+ void noteLongPartialWakelockStart(String name, String historyName, int uid);
+ void noteLongPartialWakelockFinish(String name, String historyName, int uid);
void noteVibratorOn(int uid, long durationMillis);
void noteVibratorOff(int uid);
@@ -118,7 +120,7 @@
void noteWifiBatchedScanStoppedFromSource(in WorkSource ws);
void noteWifiMulticastEnabledFromSource(in WorkSource ws);
void noteWifiMulticastDisabledFromSource(in WorkSource ws);
- void noteWifiRadioPowerState(int powerState, long timestampNs);
+ void noteWifiRadioPowerState(int powerState, long timestampNs, int uid);
void noteNetworkInterfaceType(String iface, int type);
void noteNetworkStatsEnabled();
void noteDeviceIdleMode(int mode, String activeReason, int activeUid);
diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
index 1a963f3..033dd13 100644
--- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
+++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
@@ -22,6 +22,7 @@
import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.internal.app.IVoiceInteractor;
+import com.android.internal.app.IVoiceInteractionSessionListener;
import android.hardware.soundtrigger.IRecognitionStatusCallback;
import android.hardware.soundtrigger.SoundTrigger;
import android.service.voice.IVoiceInteractionService;
@@ -136,4 +137,9 @@
* Called when the lockscreen got shown.
*/
void onLockscreenShown();
+
+ /**
+ * Register a voice interaction listener.
+ */
+ void registerVoiceInteractionSessionListener(IVoiceInteractionSessionListener listener);
}
diff --git a/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl b/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl
new file mode 100644
index 0000000..87749d2
--- /dev/null
+++ b/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package com.android.internal.app;
+
+ oneway interface IVoiceInteractionSessionListener {
+ /**
+ * Called when a voice session is shown.
+ */
+ void onVoiceSessionShown();
+
+ /**
+ * Called when a voice session is hidden.
+ */
+ void onVoiceSessionHidden();
+ }
\ No newline at end of file
diff --git a/core/java/com/android/internal/app/MicroAlertController.java b/core/java/com/android/internal/app/MicroAlertController.java
index 085b226..4431f3c 100644
--- a/core/java/com/android/internal/app/MicroAlertController.java
+++ b/core/java/com/android/internal/app/MicroAlertController.java
@@ -18,12 +18,15 @@
import android.content.Context;
import android.content.DialogInterface;
+import android.text.TextUtils;
+import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
-import android.widget.AbsListView;
import com.android.internal.app.AlertController;
import com.android.internal.R;
@@ -52,34 +55,58 @@
contentPanel.removeView(mMessageView);
if (mListView != null) {
- // has ListView, swap ScrollView with ListView
+ // has ListView, swap scrollView with ListView
- // move topPanel into header of ListView
+ // move topPanel into top of scrollParent
View topPanel = mScrollView.findViewById(R.id.topPanel);
((ViewGroup) topPanel.getParent()).removeView(topPanel);
- topPanel.setLayoutParams(
- new AbsListView.LayoutParams(topPanel.getLayoutParams()));
- mListView.addHeaderView(topPanel, null, false);
+ FrameLayout.LayoutParams topParams =
+ new FrameLayout.LayoutParams(topPanel.getLayoutParams());
+ topParams.gravity = Gravity.TOP;
+ topPanel.setLayoutParams(topParams);
- // move buttonPanel into footer of ListView
+ // move buttonPanel into bottom of scrollParent
View buttonPanel = mScrollView.findViewById(R.id.buttonPanel);
((ViewGroup) buttonPanel.getParent()).removeView(buttonPanel);
- buttonPanel.setLayoutParams(
- new AbsListView.LayoutParams(buttonPanel.getLayoutParams()));
- mListView.addFooterView(buttonPanel, null, false);
+ FrameLayout.LayoutParams buttonParams =
+ new FrameLayout.LayoutParams(buttonPanel.getLayoutParams());
+ buttonParams.gravity = Gravity.BOTTOM;
+ buttonPanel.setLayoutParams(buttonParams);
- // swap ScrollView w/ ListView
+ // remove scrollview
final ViewGroup scrollParent = (ViewGroup) mScrollView.getParent();
final int childIndex = scrollParent.indexOfChild(mScrollView);
scrollParent.removeViewAt(childIndex);
- scrollParent.addView(mListView, childIndex,
+
+ // add list view
+ scrollParent.addView(mListView,
new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT));
+
+ // add top and button panel
+ scrollParent.addView(topPanel);
+ scrollParent.addView(buttonPanel);
} else {
// no content, just hide everything
contentPanel.setVisibility(View.GONE);
}
}
}
+
+ @Override
+ protected void setupTitle(ViewGroup topPanel) {
+ super.setupTitle(topPanel);
+ if (topPanel.getVisibility() == View.GONE) {
+ topPanel.setVisibility(View.INVISIBLE);
+ }
+ }
+
+ @Override
+ protected void setupButtons(ViewGroup buttonPanel) {
+ super.setupButtons(buttonPanel);
+ if (buttonPanel.getVisibility() == View.GONE) {
+ buttonPanel.setVisibility(View.INVISIBLE);
+ }
+ }
}
diff --git a/core/java/com/android/internal/app/NightDisplayController.java b/core/java/com/android/internal/app/NightDisplayController.java
new file mode 100644
index 0000000..03cd729
--- /dev/null
+++ b/core/java/com/android/internal/app/NightDisplayController.java
@@ -0,0 +1,421 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.app;
+
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings.Secure;
+import android.util.Slog;
+
+import com.android.internal.R;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Calendar;
+import java.util.Locale;
+
+/**
+ * Controller for managing Night display settings.
+ * <p/>
+ * Night display tints your screen red at night. This makes it easier to look at your screen in
+ * dim light and may help you fall asleep more easily.
+ */
+public final class NightDisplayController {
+
+ private static final String TAG = "NightDisplayController";
+ private static final boolean DEBUG = false;
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({ AUTO_MODE_DISABLED, AUTO_MODE_CUSTOM, AUTO_MODE_TWILIGHT })
+ public @interface AutoMode {}
+
+ /**
+ * Auto mode value to prevent Night display from being automatically activated. It can still
+ * be activated manually via {@link #setActivated(boolean)}.
+ *
+ * @see #setAutoMode(int)
+ */
+ public static final int AUTO_MODE_DISABLED = 0;
+ /**
+ * Auto mode value to automatically activate Night display at a specific start and end time.
+ *
+ * @see #setAutoMode(int)
+ * @see #setCustomStartTime(LocalTime)
+ * @see #setCustomEndTime(LocalTime)
+ */
+ public static final int AUTO_MODE_CUSTOM = 1;
+ /**
+ * Auto mode value to automatically activate Night display from sunset to sunrise.
+ *
+ * @see #setAutoMode(int)
+ */
+ public static final int AUTO_MODE_TWILIGHT = 2;
+
+ private final Context mContext;
+ private final int mUserId;
+
+ private final ContentObserver mContentObserver;
+
+ private Callback mCallback;
+
+ public NightDisplayController(@NonNull Context context) {
+ this(context, UserHandle.myUserId());
+ }
+
+ public NightDisplayController(@NonNull Context context, int userId) {
+ mContext = context.getApplicationContext();
+ mUserId = userId;
+
+ mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ super.onChange(selfChange, uri);
+
+ final String setting = uri == null ? null : uri.getLastPathSegment();
+ if (setting != null) {
+ onSettingChanged(setting);
+ }
+ }
+ };
+ }
+
+ /**
+ * Returns {@code true} when Night display is activated (the display is tinted red).
+ */
+ public boolean isActivated() {
+ return Secure.getIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_ACTIVATED, 0, mUserId) == 1;
+ }
+
+ /**
+ * Sets whether Night display should be activated.
+ *
+ * @param activated {@code true} if Night display should be activated
+ * @return {@code true} if the activated value was set successfully
+ */
+ public boolean setActivated(boolean activated) {
+ return Secure.putIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_ACTIVATED, activated ? 1 : 0, mUserId);
+ }
+
+ /**
+ * Returns the current auto mode value controlling when Night display will be automatically
+ * activated. One of {@link #AUTO_MODE_DISABLED}, {@link #AUTO_MODE_CUSTOM}, or
+ * {@link #AUTO_MODE_TWILIGHT}.
+ */
+ public @AutoMode int getAutoMode() {
+ int autoMode = Secure.getIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_AUTO_MODE, -1, mUserId);
+ if (autoMode == -1) {
+ if (DEBUG) {
+ Slog.d(TAG, "Using default value for setting: " + Secure.NIGHT_DISPLAY_AUTO_MODE);
+ }
+ autoMode = mContext.getResources().getInteger(
+ R.integer.config_defaultNightDisplayAutoMode);
+ }
+
+ if (autoMode != AUTO_MODE_DISABLED
+ && autoMode != AUTO_MODE_CUSTOM
+ && autoMode != AUTO_MODE_TWILIGHT) {
+ Slog.e(TAG, "Invalid autoMode: " + autoMode);
+ autoMode = AUTO_MODE_DISABLED;
+ }
+
+ return autoMode;
+ }
+
+ /**
+ * Sets the current auto mode value controlling when Night display will be automatically
+ * activated. One of {@link #AUTO_MODE_DISABLED}, {@link #AUTO_MODE_CUSTOM}, or
+ * {@link #AUTO_MODE_TWILIGHT}.
+ *
+ * @param autoMode the new auto mode to use
+ * @return {@code true} if new auto mode was set successfully
+ */
+ public boolean setAutoMode(@AutoMode int autoMode) {
+ if (autoMode != AUTO_MODE_DISABLED
+ && autoMode != AUTO_MODE_CUSTOM
+ && autoMode != AUTO_MODE_TWILIGHT) {
+ throw new IllegalArgumentException("Invalid autoMode: " + autoMode);
+ }
+
+ return Secure.putIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_AUTO_MODE, autoMode, mUserId);
+ }
+
+ /**
+ * Returns the local time when Night display will be automatically activated when using
+ * {@link #AUTO_MODE_CUSTOM}.
+ */
+ public @NonNull LocalTime getCustomStartTime() {
+ int startTimeValue = Secure.getIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_CUSTOM_START_TIME, -1, mUserId);
+ if (startTimeValue == -1) {
+ if (DEBUG) {
+ Slog.d(TAG, "Using default value for setting: "
+ + Secure.NIGHT_DISPLAY_CUSTOM_START_TIME);
+ }
+ startTimeValue = mContext.getResources().getInteger(
+ R.integer.config_defaultNightDisplayCustomStartTime);
+ }
+
+ return LocalTime.valueOf(startTimeValue);
+ }
+
+ /**
+ * Sets the local time when Night display will be automatically activated when using
+ * {@link #AUTO_MODE_CUSTOM}.
+ *
+ * @param startTime the local time to automatically activate Night display
+ * @return {@code true} if the new custom start time was set successfully
+ */
+ public boolean setCustomStartTime(@NonNull LocalTime startTime) {
+ if (startTime == null) {
+ throw new IllegalArgumentException("startTime cannot be null");
+ }
+ return Secure.putIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_CUSTOM_START_TIME, startTime.toMillis(), mUserId);
+ }
+
+ /**
+ * Returns the local time when Night display will be automatically deactivated when using
+ * {@link #AUTO_MODE_CUSTOM}.
+ */
+ public @NonNull LocalTime getCustomEndTime() {
+ int endTimeValue = Secure.getIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_CUSTOM_END_TIME, -1, mUserId);
+ if (endTimeValue == -1) {
+ if (DEBUG) {
+ Slog.d(TAG, "Using default value for setting: "
+ + Secure.NIGHT_DISPLAY_CUSTOM_END_TIME);
+ }
+ endTimeValue = mContext.getResources().getInteger(
+ R.integer.config_defaultNightDisplayCustomEndTime);
+ }
+
+ return LocalTime.valueOf(endTimeValue);
+ }
+
+ /**
+ * Sets the local time when Night display will be automatically deactivated when using
+ * {@link #AUTO_MODE_CUSTOM}.
+ *
+ * @param endTime the local time to automatically deactivate Night display
+ * @return {@code true} if the new custom end time was set successfully
+ */
+ public boolean setCustomEndTime(@NonNull LocalTime endTime) {
+ if (endTime == null) {
+ throw new IllegalArgumentException("endTime cannot be null");
+ }
+ return Secure.putIntForUser(mContext.getContentResolver(),
+ Secure.NIGHT_DISPLAY_CUSTOM_END_TIME, endTime.toMillis(), mUserId);
+ }
+
+ private void onSettingChanged(@NonNull String setting) {
+ if (DEBUG) {
+ Slog.d(TAG, "onSettingChanged: " + setting);
+ }
+
+ if (mCallback != null) {
+ switch (setting) {
+ case Secure.NIGHT_DISPLAY_ACTIVATED:
+ mCallback.onActivated(isActivated());
+ break;
+ case Secure.NIGHT_DISPLAY_AUTO_MODE:
+ mCallback.onAutoModeChanged(getAutoMode());
+ break;
+ case Secure.NIGHT_DISPLAY_CUSTOM_START_TIME:
+ mCallback.onCustomStartTimeChanged(getCustomStartTime());
+ break;
+ case Secure.NIGHT_DISPLAY_CUSTOM_END_TIME:
+ mCallback.onCustomEndTimeChanged(getCustomEndTime());
+ break;
+ }
+ }
+ }
+
+ /**
+ * Register a callback to be invoked whenever the Night display settings are changed.
+ */
+ public void setListener(Callback callback) {
+ final Callback oldCallback = mCallback;
+ if (oldCallback != callback) {
+ mCallback = callback;
+
+ if (callback == null) {
+ // Stop listening for changes now that there IS NOT a listener.
+ mContext.getContentResolver().unregisterContentObserver(mContentObserver);
+ } else if (oldCallback == null) {
+ // Start listening for changes now that there IS a listener.
+ final ContentResolver cr = mContext.getContentResolver();
+ cr.registerContentObserver(Secure.getUriFor(Secure.NIGHT_DISPLAY_ACTIVATED),
+ false /* notifyForDescendants */, mContentObserver, mUserId);
+ cr.registerContentObserver(Secure.getUriFor(Secure.NIGHT_DISPLAY_AUTO_MODE),
+ false /* notifyForDescendants */, mContentObserver, mUserId);
+ cr.registerContentObserver(Secure.getUriFor(Secure.NIGHT_DISPLAY_CUSTOM_START_TIME),
+ false /* notifyForDescendants */, mContentObserver, mUserId);
+ cr.registerContentObserver(Secure.getUriFor(Secure.NIGHT_DISPLAY_CUSTOM_END_TIME),
+ false /* notifyForDescendants */, mContentObserver, mUserId);
+ }
+ }
+ }
+
+ /**
+ * Returns {@code true} if Night display is supported by the device.
+ */
+ public static boolean isAvailable(Context context) {
+ return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable);
+ }
+
+ /**
+ * A time without a time-zone or date.
+ */
+ public static class LocalTime {
+
+ /**
+ * The hour of the day from 0 - 23.
+ */
+ public final int hourOfDay;
+ /**
+ * The minute within the hour from 0 - 59.
+ */
+ public final int minute;
+
+ public LocalTime(int hourOfDay, int minute) {
+ if (hourOfDay < 0 || hourOfDay > 23) {
+ throw new IllegalArgumentException("Invalid hourOfDay: " + hourOfDay);
+ } else if (minute < 0 || minute > 59) {
+ throw new IllegalArgumentException("Invalid minute: " + minute);
+ }
+
+ this.hourOfDay = hourOfDay;
+ this.minute = minute;
+ }
+
+ /**
+ * Returns the first date time corresponding to this local time that occurs before the
+ * provided date time.
+ *
+ * @param time the date time to compare against
+ * @return the prior date time corresponding to this local time
+ */
+ public Calendar getDateTimeBefore(Calendar time) {
+ final Calendar c = Calendar.getInstance();
+ c.set(Calendar.YEAR, time.get(Calendar.YEAR));
+ c.set(Calendar.DAY_OF_YEAR, time.get(Calendar.DAY_OF_YEAR));
+
+ c.set(Calendar.HOUR_OF_DAY, hourOfDay);
+ c.set(Calendar.MINUTE, minute);
+ c.set(Calendar.SECOND, 0);
+ c.set(Calendar.MILLISECOND, 0);
+
+ // Check if the local time has past, if so return the same time tomorrow.
+ if (c.after(time)) {
+ c.add(Calendar.DATE, -1);
+ }
+
+ return c;
+ }
+
+ /**
+ * Returns the first date time corresponding to this local time that occurs after the
+ * provided date time.
+ *
+ * @param time the date time to compare against
+ * @return the next date time corresponding to this local time
+ */
+ public Calendar getDateTimeAfter(Calendar time) {
+ final Calendar c = Calendar.getInstance();
+ c.set(Calendar.YEAR, time.get(Calendar.YEAR));
+ c.set(Calendar.DAY_OF_YEAR, time.get(Calendar.DAY_OF_YEAR));
+
+ c.set(Calendar.HOUR_OF_DAY, hourOfDay);
+ c.set(Calendar.MINUTE, minute);
+ c.set(Calendar.SECOND, 0);
+ c.set(Calendar.MILLISECOND, 0);
+
+ // Check if the local time has past, if so return the same time tomorrow.
+ if (c.before(time)) {
+ c.add(Calendar.DATE, 1);
+ }
+
+ return c;
+ }
+
+ /**
+ * Returns a local time corresponding the given number of milliseconds from midnight.
+ *
+ * @param millis the number of milliseconds from midnight
+ * @return the corresponding local time
+ */
+ private static LocalTime valueOf(int millis) {
+ final int hourOfDay = (millis / 3600000) % 24;
+ final int minutes = (millis / 60000) % 60;
+ return new LocalTime(hourOfDay, minutes);
+ }
+
+ /**
+ * Returns the local time represented as milliseconds from midnight.
+ */
+ private int toMillis() {
+ return hourOfDay * 3600000 + minute * 60000;
+ }
+
+ @Override
+ public String toString() {
+ return String.format(Locale.US, "%02d:%02d", hourOfDay, minute);
+ }
+ }
+
+ /**
+ * Callback invoked whenever the Night display settings are changed.
+ */
+ public interface Callback {
+ /**
+ * Callback invoked when the activated state changes.
+ *
+ * @param activated {@code true} if Night display is activated
+ */
+ default void onActivated(boolean activated) {}
+ /**
+ * Callback invoked when the auto mode changes.
+ *
+ * @param autoMode the auto mode to use
+ */
+ default void onAutoModeChanged(int autoMode) {}
+ /**
+ * Callback invoked when the time to automatically activate Night display changes.
+ *
+ * @param startTime the local time to automatically activate Night display
+ */
+ default void onCustomStartTimeChanged(LocalTime startTime) {}
+ /**
+ * Callback invoked when the time to automatically deactivate Night display changes.
+ *
+ * @param endTime the local time to automatically deactivate Night display
+ */
+ default void onCustomEndTimeChanged(LocalTime endTime) {}
+ }
+}
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java
index bddd826..36ab394 100644
--- a/core/java/com/android/internal/app/PlatLogoActivity.java
+++ b/core/java/com/android/internal/app/PlatLogoActivity.java
@@ -54,6 +54,7 @@
public class PlatLogoActivity extends Activity {
public static final boolean REVEAL_THE_NAME = false;
+ public static final boolean FINISH = false;
FrameLayout mLayout;
int mTapCount;
@@ -138,7 +139,7 @@
} catch (ActivityNotFoundException ex) {
Log.e("PlatLogoActivity", "No more eggs.");
}
- finish();
+ if (FINISH) finish();
}
});
return true;
diff --git a/core/java/com/android/internal/midi/MidiDispatcher.java b/core/java/com/android/internal/midi/MidiDispatcher.java
index 1a3c37c..c16628a 100644
--- a/core/java/com/android/internal/midi/MidiDispatcher.java
+++ b/core/java/com/android/internal/midi/MidiDispatcher.java
@@ -26,11 +26,23 @@
* Utility class for dispatching MIDI data to a list of {@link android.media.midi.MidiReceiver}s.
* This class subclasses {@link android.media.midi.MidiReceiver} and dispatches any data it receives
* to its receiver list. Any receivers that throw an exception upon receiving data will
- * be automatically removed from the receiver list, but no IOException will be returned
- * from the dispatcher's {@link android.media.midi.MidiReceiver#onSend} in that case.
+ * be automatically removed from the receiver list. If a MidiReceiverFailureHandler has been
+ * provided to the MidiDispatcher, it will be notified about the failure, but the exception
+ * itself will be swallowed.
*/
public final class MidiDispatcher extends MidiReceiver {
+ // MidiDispatcher's client and MidiReceiver's owner can be different
+ // classes (e.g. MidiDeviceService is a client, but MidiDeviceServer is
+ // the owner), and errors occuring during sending need to be reported
+ // to the owner rather than to the sender.
+ //
+ // Note that the callbacks will be called on the sender's thread.
+ public interface MidiReceiverFailureHandler {
+ void onReceiverFailure(MidiReceiver receiver, IOException failure);
+ }
+
+ private final MidiReceiverFailureHandler mFailureHandler;
private final CopyOnWriteArrayList<MidiReceiver> mReceivers
= new CopyOnWriteArrayList<MidiReceiver>();
@@ -46,6 +58,14 @@
}
};
+ public MidiDispatcher() {
+ this(null);
+ }
+
+ public MidiDispatcher(MidiReceiverFailureHandler failureHandler) {
+ mFailureHandler = failureHandler;
+ }
+
/**
* Returns the number of {@link android.media.midi.MidiReceiver}s this dispatcher contains.
* @return the number of receivers
@@ -70,8 +90,13 @@
try {
receiver.send(msg, offset, count, timestamp);
} catch (IOException e) {
- // if the receiver fails we remove the receiver but do not propagate the exception
+ // If the receiver fails we remove the receiver but do not propagate the exception.
+ // Note that this may also happen if the client code stalls, and thus underlying
+ // MidiInputPort.onSend has raised IOException for EAGAIN / EWOULDBLOCK error.
mReceivers.remove(receiver);
+ if (mFailureHandler != null) {
+ mFailureHandler.onReceiverFailure(receiver, e);
+ }
}
}
}
@@ -79,7 +104,15 @@
@Override
public void onFlush() throws IOException {
for (MidiReceiver receiver : mReceivers) {
- receiver.flush();
+ try {
+ receiver.flush();
+ } catch (IOException e) {
+ // This is just a special case of 'send' thus handle in the same way.
+ mReceivers.remove(receiver);
+ if (mFailureHandler != null) {
+ mFailureHandler.onReceiverFailure(receiver, e);
+ }
+ }
}
}
}
diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java
index a1f92cd..ab52f2f 100644
--- a/core/java/com/android/internal/net/VpnProfile.java
+++ b/core/java/com/android/internal/net/VpnProfile.java
@@ -176,6 +176,11 @@
* connection.
*/
public boolean isValidLockdownProfile() {
+ // b/7064069: lockdown firewall blocks ports that would be used for PPTP
+ if (type == TYPE_PPTP) {
+ return false;
+ }
+
try {
InetAddress.parseNumericAddress(server);
diff --git a/core/java/com/android/internal/os/BatterySipper.java b/core/java/com/android/internal/os/BatterySipper.java
index d92e596..5ea9475 100644
--- a/core/java/com/android/internal/os/BatterySipper.java
+++ b/core/java/com/android/internal/os/BatterySipper.java
@@ -88,7 +88,8 @@
USER,
UNACCOUNTED,
OVERCOUNTED,
- CAMERA
+ CAMERA,
+ MEMORY
}
public BatterySipper(DrainType drainType, Uid uid, double value) {
diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java
index 27ffb8b..1ae5c66 100644
--- a/core/java/com/android/internal/os/BatteryStatsHelper.java
+++ b/core/java/com/android/internal/os/BatteryStatsHelper.java
@@ -125,6 +125,7 @@
PowerCalculator mSensorPowerCalculator;
PowerCalculator mCameraPowerCalculator;
PowerCalculator mFlashlightPowerCalculator;
+ PowerCalculator mMemoryPowerCalculator;
boolean mHasWifiPowerReporting = false;
boolean mHasBluetoothPowerReporting = false;
@@ -342,6 +343,11 @@
}
mCpuPowerCalculator.reset();
+ if (mMemoryPowerCalculator == null) {
+ mMemoryPowerCalculator = new MemoryPowerCalculator(mPowerProfile);
+ }
+ mMemoryPowerCalculator.reset();
+
if (mWakelockPowerCalculator == null) {
mWakelockPowerCalculator = new WakelockPowerCalculator(mPowerProfile);
}
@@ -672,12 +678,23 @@
}
}
+ private void addMemoryUsage() {
+ BatterySipper memory = new BatterySipper(DrainType.MEMORY, null, 0);
+ mMemoryPowerCalculator.calculateRemaining(memory, mStats, mRawRealtimeUs, mRawUptimeUs,
+ mStatsType);
+ memory.sumPower();
+ if (memory.totalPowerMah > 0) {
+ mUsageList.add(memory);
+ }
+ }
+
private void processMiscUsage() {
addUserUsage();
addPhoneUsage();
addScreenUsage();
addWiFiUsage();
addBluetoothUsage();
+ addMemoryUsage();
addIdleUsage(); // Not including cellular idle power
// Don't compute radio usage if it's a wifi-only device
if (!mWifiOnly) {
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index a1df8c1..91dcc16 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -49,6 +49,8 @@
import android.util.ArrayMap;
import android.util.Log;
import android.util.LogWriter;
+import android.util.LongSparseArray;
+import android.util.LongSparseLongArray;
import android.util.MutableInt;
import android.util.PrintWriterPrinter;
import android.util.Printer;
@@ -99,6 +101,7 @@
private static final boolean DEBUG = false;
public static final boolean DEBUG_ENERGY = false;
private static final boolean DEBUG_ENERGY_CPU = DEBUG_ENERGY;
+ private static final boolean DEBUG_MEMORY = false;
private static final boolean DEBUG_HISTORY = false;
private static final boolean USE_OLD_HISTORY = false; // for debugging.
@@ -108,7 +111,7 @@
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
- private static final int VERSION = 147 + (USE_OLD_HISTORY ? 1000 : 0);
+ private static final int VERSION = 148 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000;
@@ -144,6 +147,13 @@
private final KernelUidCpuTimeReader mKernelUidCpuTimeReader = new KernelUidCpuTimeReader();
private KernelCpuSpeedReader[] mKernelCpuSpeedReaders;
+ private final KernelMemoryBandwidthStats mKernelMemoryBandwidthStats
+ = new KernelMemoryBandwidthStats();
+ private final LongSparseArray<SamplingTimer> mKernelMemoryStats = new LongSparseArray<>();
+ public LongSparseArray<SamplingTimer> getKernelMemoryStats() {
+ return mKernelMemoryStats;
+ }
+
public interface BatteryCallback {
public void batteryNeedsCpuUpdate();
public void batteryPowerChanged(boolean onBattery);
@@ -1791,11 +1801,17 @@
public abstract class OverflowArrayMap<T> {
private static final String OVERFLOW_NAME = "*overflow*";
+ final int mUid;
final ArrayMap<String, T> mMap = new ArrayMap<>();
T mCurOverflow;
ArrayMap<String, MutableInt> mActiveOverflow;
+ long mLastOverflowTime;
+ long mLastOverflowFinishTime;
+ long mLastClearTime;
+ long mLastCleanupTime;
- public OverflowArrayMap() {
+ public OverflowArrayMap(int uid) {
+ mUid = uid;
}
public ArrayMap<String, T> getMap() {
@@ -1803,6 +1819,7 @@
}
public void clear() {
+ mLastClearTime = SystemClock.elapsedRealtime();
mMap.clear();
mCurOverflow = null;
mActiveOverflow = null;
@@ -1819,6 +1836,7 @@
}
public void cleanup() {
+ mLastCleanupTime = SystemClock.elapsedRealtime();
if (mActiveOverflow != null) {
if (mActiveOverflow.size() == 0) {
mActiveOverflow = null;
@@ -1885,6 +1903,7 @@
mActiveOverflow = new ArrayMap<>();
}
mActiveOverflow.put(name, new MutableInt(1));
+ mLastOverflowTime = SystemClock.elapsedRealtime();
return obj;
}
@@ -1914,6 +1933,7 @@
over.value--;
if (over.value <= 0) {
mActiveOverflow.remove(name);
+ mLastOverflowFinishTime = SystemClock.elapsedRealtime();
}
return obj;
}
@@ -1922,9 +1942,35 @@
// Huh, they are stopping an active operation but we can't find one!
// That's not good.
- Slog.wtf(TAG, "Unable to find object for " + name + " mapsize="
- + mMap.size() + " activeoverflow=" + mActiveOverflow
- + " curoverflow=" + mCurOverflow);
+ StringBuilder sb = new StringBuilder();
+ sb.append("Unable to find object for ");
+ sb.append(name);
+ sb.append(" in uid ");
+ sb.append(mUid);
+ sb.append(" mapsize=");
+ sb.append(mMap.size());
+ sb.append(" activeoverflow=");
+ sb.append(mActiveOverflow);
+ sb.append(" curoverflow=");
+ sb.append(mCurOverflow);
+ long now = SystemClock.elapsedRealtime();
+ if (mLastOverflowTime != 0) {
+ sb.append(" lastOverflowTime=");
+ TimeUtils.formatDuration(mLastOverflowTime-now, sb);
+ }
+ if (mLastOverflowFinishTime != 0) {
+ sb.append(" lastOverflowFinishTime=");
+ TimeUtils.formatDuration(mLastOverflowFinishTime-now, sb);
+ }
+ if (mLastClearTime != 0) {
+ sb.append(" lastClearTime=");
+ TimeUtils.formatDuration(mLastClearTime-now, sb);
+ }
+ if (mLastCleanupTime != 0) {
+ sb.append(" lastCleanupTime=");
+ TimeUtils.formatDuration(mLastCleanupTime-now, sb);
+ }
+ Slog.wtf(TAG, sb.toString());
return null;
}
@@ -2082,6 +2128,15 @@
return kwlt;
}
+ public SamplingTimer getKernelMemoryTimerLocked(long bucket) {
+ SamplingTimer kmt = mKernelMemoryStats.get(bucket);
+ if (kmt == null) {
+ kmt = new SamplingTimer(mClocks, mOnBatteryTimeBase);
+ mKernelMemoryStats.put(bucket, kmt);
+ }
+ return kmt;
+ }
+
private int writeHistoryTag(HistoryTag tag) {
Integer idxObj = mHistoryTagPool.get(tag);
int idx;
@@ -3285,6 +3340,36 @@
}
}
+ public void noteLongPartialWakelockStart(String name, String historyName, int uid) {
+ uid = mapUid(uid);
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
+ if (historyName == null) {
+ historyName = name;
+ }
+ if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_START, historyName, uid,
+ 0)) {
+ return;
+ }
+ addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_LONG_WAKE_LOCK_START,
+ historyName, uid);
+ }
+
+ public void noteLongPartialWakelockFinish(String name, String historyName, int uid) {
+ uid = mapUid(uid);
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
+ if (historyName == null) {
+ historyName = name;
+ }
+ if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH, historyName, uid,
+ 0)) {
+ return;
+ }
+ addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH,
+ historyName, uid);
+ }
+
void aggregateLastWakeupUptimeLocked(long uptimeMs) {
if (mLastWakeupReason != null) {
long deltaUptime = uptimeMs - mLastWakeupUptimeMs;
@@ -3554,6 +3639,14 @@
mNumConnectivityChange++;
}
+ private void noteMobileRadioApWakeupLocked(final long elapsedRealtimeMillis,
+ final long uptimeMillis, int uid) {
+ uid = mapUid(uid);
+ addHistoryEventLocked(elapsedRealtimeMillis, uptimeMillis, HistoryItem.EVENT_WAKEUP_AP, "",
+ uid);
+ getUidStatsLocked(uid).noteMobileRadioApWakeupLocked();
+ }
+
public void noteMobileRadioPowerState(int powerState, long timestampNs, int uid) {
final long elapsedRealtime = mClocks.elapsedRealtime();
final long uptime = mClocks.uptimeMillis();
@@ -3563,6 +3656,10 @@
powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM
|| powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH;
if (active) {
+ if (uid > 0) {
+ noteMobileRadioApWakeupLocked(elapsedRealtime, uptime, uid);
+ }
+
mMobileRadioActiveStartTime = realElapsedRealtimeMs = timestampNs / (1000 * 1000);
mHistoryCur.states |= HistoryItem.STATE_MOBILE_RADIO_ACTIVE_FLAG;
} else {
@@ -4239,7 +4336,15 @@
}
}
- public void noteWifiRadioPowerState(int powerState, long timestampNs) {
+ private void noteWifiRadioApWakeupLocked(final long elapsedRealtimeMillis,
+ final long uptimeMillis, int uid) {
+ uid = mapUid(uid);
+ addHistoryEventLocked(elapsedRealtimeMillis, uptimeMillis, HistoryItem.EVENT_WAKEUP_AP, "",
+ uid);
+ getUidStatsLocked(uid).noteWifiRadioApWakeupLocked();
+ }
+
+ public void noteWifiRadioPowerState(int powerState, long timestampNs, int uid) {
final long elapsedRealtime = mClocks.elapsedRealtime();
final long uptime = mClocks.uptimeMillis();
if (mWifiRadioPowerState != powerState) {
@@ -4247,6 +4352,9 @@
powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM
|| powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH;
if (active) {
+ if (uid > 0) {
+ noteWifiRadioApWakeupLocked(elapsedRealtime, uptime, uid);
+ }
mHistoryCur.states |= HistoryItem.STATE_WIFI_RADIO_ACTIVE_FLAG;
} else {
mHistoryCur.states &= ~HistoryItem.STATE_WIFI_RADIO_ACTIVE_FLAG;
@@ -4874,6 +4982,33 @@
return mUidStats;
}
+ private static void detachTimerIfNotNull(BatteryStatsImpl.Timer timer) {
+ if (timer != null) {
+ timer.detach();
+ }
+ }
+
+ private static boolean resetTimerIfNotNull(BatteryStatsImpl.Timer timer,
+ boolean detachIfReset) {
+ if (timer != null) {
+ return timer.reset(detachIfReset);
+ }
+ return true;
+ }
+
+ private static void detachLongCounterIfNotNull(LongSamplingCounter counter) {
+ if (counter != null) {
+ counter.detach();
+ }
+ }
+
+ private static void resetLongCounterIfNotNull(LongSamplingCounter counter,
+ boolean detachIfReset) {
+ if (counter != null) {
+ counter.reset(detachIfReset);
+ }
+ }
+
/**
* The statistics associated with a particular uid.
*/
@@ -4921,6 +5056,16 @@
LongSamplingCounter mMobileRadioActiveCount;
/**
+ * How many times this UID woke up the Application Processor due to a Mobile radio packet.
+ */
+ private LongSamplingCounter mMobileRadioApWakeupCount;
+
+ /**
+ * How many times this UID woke up the Application Processor due to a Wifi packet.
+ */
+ private LongSamplingCounter mWifiRadioApWakeupCount;
+
+ /**
* The amount of time this uid has kept the WiFi controller in idle, tx, and rx mode.
* Can be null if the UID has had no such activity.
*/
@@ -4994,18 +5139,18 @@
mSystemCpuTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
mCpuPower = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
- mWakelockStats = mBsi.new OverflowArrayMap<Wakelock>() {
+ mWakelockStats = mBsi.new OverflowArrayMap<Wakelock>(uid) {
@Override public Wakelock instantiateObject() {
return new Wakelock(mBsi, Uid.this);
}
};
- mSyncStats = mBsi.new OverflowArrayMap<StopwatchTimer>() {
+ mSyncStats = mBsi.new OverflowArrayMap<StopwatchTimer>(uid) {
@Override public StopwatchTimer instantiateObject() {
return new StopwatchTimer(mBsi.mClocks, Uid.this, SYNC, null,
mBsi.mOnBatteryTimeBase);
}
};
- mJobStats = mBsi.new OverflowArrayMap<StopwatchTimer>() {
+ mJobStats = mBsi.new OverflowArrayMap<StopwatchTimer>(uid) {
@Override public StopwatchTimer instantiateObject() {
return new StopwatchTimer(mBsi.mClocks, Uid.this, JOB, null,
mBsi.mOnBatteryTimeBase);
@@ -5629,6 +5774,36 @@
return 0;
}
+ public void noteMobileRadioApWakeupLocked() {
+ if (mMobileRadioApWakeupCount == null) {
+ mMobileRadioApWakeupCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+ }
+ mMobileRadioApWakeupCount.addCountLocked(1);
+ }
+
+ @Override
+ public long getMobileRadioApWakeupCount(int which) {
+ if (mMobileRadioApWakeupCount != null) {
+ return mMobileRadioApWakeupCount.getCountLocked(which);
+ }
+ return 0;
+ }
+
+ public void noteWifiRadioApWakeupLocked() {
+ if (mWifiRadioApWakeupCount == null) {
+ mWifiRadioApWakeupCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+ }
+ mWifiRadioApWakeupCount.addCountLocked(1);
+ }
+
+ @Override
+ public long getWifiRadioApWakeupCount(int which) {
+ if (mWifiRadioApWakeupCount != null) {
+ return mWifiRadioApWakeupCount.getCountLocked(which);
+ }
+ return 0;
+ }
+
void initNetworkActivityLocked() {
mNetworkByteActivityCounters = new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
mNetworkPacketActivityCounters = new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
@@ -5671,24 +5846,14 @@
active |= !mWifiMulticastTimer.reset(false);
active |= mWifiMulticastEnabled;
}
- if (mAudioTurnedOnTimer != null) {
- active |= !mAudioTurnedOnTimer.reset(false);
- }
- if (mVideoTurnedOnTimer != null) {
- active |= !mVideoTurnedOnTimer.reset(false);
- }
- if (mFlashlightTurnedOnTimer != null) {
- active |= !mFlashlightTurnedOnTimer.reset(false);
- }
- if (mCameraTurnedOnTimer != null) {
- active |= !mCameraTurnedOnTimer.reset(false);
- }
- if (mForegroundActivityTimer != null) {
- active |= !mForegroundActivityTimer.reset(false);
- }
- if (mBluetoothScanTimer != null) {
- active |= !mBluetoothScanTimer.reset(false);
- }
+
+ active |= !resetTimerIfNotNull(mAudioTurnedOnTimer, false);
+ active |= !resetTimerIfNotNull(mVideoTurnedOnTimer, false);
+ active |= !resetTimerIfNotNull(mFlashlightTurnedOnTimer, false);
+ active |= !resetTimerIfNotNull(mCameraTurnedOnTimer, false);
+ active |= !resetTimerIfNotNull(mForegroundActivityTimer, false);
+ active |= !resetTimerIfNotNull(mBluetoothScanTimer, false);
+
if (mProcessStateTimer != null) {
for (int i = 0; i < NUM_PROCESS_STATE; i++) {
if (mProcessStateTimer[i] != null) {
@@ -5749,6 +5914,9 @@
}
}
+ resetLongCounterIfNotNull(mMobileRadioApWakeupCount, false);
+ resetLongCounterIfNotNull(mWifiRadioApWakeupCount, false);
+
final ArrayMap<String, Wakelock> wakeStats = mWakelockStats.getMap();
for (int iw=wakeStats.size()-1; iw>=0; iw--) {
Wakelock wl = wakeStats.valueAt(iw);
@@ -5908,6 +6076,9 @@
}
}
}
+
+ detachLongCounterIfNotNull(mMobileRadioApWakeupCount);
+ detachLongCounterIfNotNull(mWifiRadioApWakeupCount);
}
return !active;
@@ -6114,6 +6285,20 @@
} else {
out.writeInt(0);
}
+
+ if (mMobileRadioApWakeupCount != null) {
+ out.writeInt(1);
+ mMobileRadioApWakeupCount.writeToParcel(out);
+ } else {
+ out.writeInt(0);
+ }
+
+ if (mWifiRadioApWakeupCount != null) {
+ out.writeInt(1);
+ mWifiRadioApWakeupCount.writeToParcel(out);
+ } else {
+ out.writeInt(0);
+ }
}
void readFromParcelLocked(TimeBase timeBase, TimeBase screenOffTimeBase, Parcel in) {
@@ -6338,6 +6523,18 @@
} else {
mCpuClusterSpeed = null;
}
+
+ if (in.readInt() != 0) {
+ mMobileRadioApWakeupCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
+ } else {
+ mMobileRadioApWakeupCount = null;
+ }
+
+ if (in.readInt() != 0) {
+ mWifiRadioApWakeupCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
+ } else {
+ mWifiRadioApWakeupCount = null;
+ }
}
/**
@@ -7556,7 +7753,6 @@
NUM_BT_TX_LEVELS);
mModemActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
ModemActivityInfo.TX_POWER_LEVELS);
-
mMobileRadioActiveTimer = new StopwatchTimer(mClocks, null, -400, null, mOnBatteryTimeBase);
mMobileRadioActivePerAppTimer = new StopwatchTimer(mClocks, null, -401, null,
mOnBatteryTimeBase);
@@ -8253,6 +8449,13 @@
mKernelWakelockStats.clear();
}
+ if (mKernelMemoryStats.size() > 0) {
+ for (int i = 0; i < mKernelMemoryStats.size(); i++) {
+ mOnBatteryTimeBase.remove(mKernelMemoryStats.valueAt(i));
+ }
+ mKernelMemoryStats.clear();
+ }
+
if (mWakeupReasonStats.size() > 0) {
for (SamplingTimer timer : mWakeupReasonStats.values()) {
mOnBatteryTimeBase.remove(timer);
@@ -8951,6 +9154,33 @@
long mTempTotalCpuSystemTimeUs;
/**
+ * Reads the newest memory stats from the kernel.
+ */
+ public void updateKernelMemoryBandwidthLocked() {
+ mKernelMemoryBandwidthStats.updateStats();
+ LongSparseLongArray bandwidthEntries = mKernelMemoryBandwidthStats.getBandwidthEntries();
+ final int bandwidthEntryCount = bandwidthEntries.size();
+ int index;
+ for (int i = 0; i < bandwidthEntryCount; i++) {
+ SamplingTimer timer;
+ if ((index = mKernelMemoryStats.indexOfKey(bandwidthEntries.keyAt(i))) >= 0) {
+ timer = mKernelMemoryStats.valueAt(index);
+ } else {
+ timer = new SamplingTimer(mClocks, mOnBatteryTimeBase);
+ mKernelMemoryStats.put(bandwidthEntries.keyAt(i), timer);
+ }
+ timer.update(bandwidthEntries.valueAt(i), 1);
+ if (DEBUG_MEMORY) {
+ Slog.d(TAG, String.format("Added entry %d and updated timer to: "
+ + "mUnpluggedReportedTotalTime %d size %d", bandwidthEntries.keyAt(i),
+ mKernelMemoryStats.get(
+ bandwidthEntries.keyAt(i)).mUnpluggedReportedTotalTime,
+ mKernelMemoryStats.size()));
+ }
+ }
+ }
+
+ /**
* Read and distribute CPU usage across apps. If their are partial wakelocks being held
* and we are on battery with screen off, we give more of the cpu time to those apps holding
* wakelocks. If the screen is on, we just assign the actual cpu time an app used.
@@ -10230,6 +10460,14 @@
}
}
+ int NMS = in.readInt();
+ for (int ims = 0; ims < NMS; ims++) {
+ if (in.readInt() != 0) {
+ long kmstName = in.readLong();
+ getKernelMemoryTimerLocked(kmstName).readSummaryFromParcelLocked(in);
+ }
+ }
+
final int NU = in.readInt();
if (NU > 10000) {
throw new ParcelFormatException("File corrupt: too many uids " + NU);
@@ -10348,6 +10586,20 @@
u.mCpuClusterSpeed = null;
}
+ if (in.readInt() != 0) {
+ u.mMobileRadioApWakeupCount = new LongSamplingCounter(mOnBatteryTimeBase);
+ u.mMobileRadioApWakeupCount.readSummaryFromParcelLocked(in);
+ } else {
+ u.mMobileRadioApWakeupCount = null;
+ }
+
+ if (in.readInt() != 0) {
+ u.mWifiRadioApWakeupCount = new LongSamplingCounter(mOnBatteryTimeBase);
+ u.mWifiRadioApWakeupCount.readSummaryFromParcelLocked(in);
+ } else {
+ u.mWifiRadioApWakeupCount = null;
+ }
+
int NW = in.readInt();
if (NW > 100) {
throw new ParcelFormatException("File corrupt: too many wake locks " + NW);
@@ -10571,6 +10823,18 @@
}
}
+ out.writeInt(mKernelMemoryStats.size());
+ for (int i = 0; i < mKernelMemoryStats.size(); i++) {
+ Timer kmt = mKernelMemoryStats.valueAt(i);
+ if (kmt != null) {
+ out.writeInt(1);
+ out.writeLong(mKernelMemoryStats.keyAt(i));
+ kmt.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
+ } else {
+ out.writeInt(0);
+ }
+ }
+
final int NU = mUidStats.size();
out.writeInt(NU);
for (int iu = 0; iu < NU; iu++) {
@@ -10708,6 +10972,20 @@
out.writeInt(0);
}
+ if (u.mMobileRadioApWakeupCount != null) {
+ out.writeInt(1);
+ u.mMobileRadioApWakeupCount.writeSummaryFromParcelLocked(out);
+ } else {
+ out.writeInt(0);
+ }
+
+ if (u.mWifiRadioApWakeupCount != null) {
+ out.writeInt(1);
+ u.mWifiRadioApWakeupCount.writeSummaryFromParcelLocked(out);
+ } else {
+ out.writeInt(0);
+ }
+
final ArrayMap<String, Uid.Wakelock> wakeStats = u.mWakelockStats.getMap();
int NW = wakeStats.size();
out.writeInt(NW);
@@ -10959,6 +11237,16 @@
}
}
+ mKernelMemoryStats.clear();
+ int nmt = in.readInt();
+ for (int imt = 0; imt < nmt; imt++) {
+ if (in.readInt() != 0) {
+ Long bucket = in.readLong();
+ SamplingTimer kmt = new SamplingTimer(mClocks, mOnBatteryTimeBase, in);
+ mKernelMemoryStats.put(bucket, kmt);
+ }
+ }
+
mPartialTimers.clear();
mFullTimers.clear();
mWindowTimers.clear();
@@ -11117,6 +11405,18 @@
out.writeInt(0);
}
+ out.writeInt(mKernelMemoryStats.size());
+ for (int i = 0; i < mKernelMemoryStats.size(); i++) {
+ SamplingTimer kmt = mKernelMemoryStats.valueAt(i);
+ if (kmt != null) {
+ out.writeInt(1);
+ out.writeLong(mKernelMemoryStats.keyAt(i));
+ kmt.writeToParcel(out, uSecRealtime);
+ } else {
+ out.writeInt(0);
+ }
+ }
+
if (inclUids) {
int size = mUidStats.size();
out.writeInt(size);
diff --git a/core/java/com/android/internal/os/KernelMemoryBandwidthStats.java b/core/java/com/android/internal/os/KernelMemoryBandwidthStats.java
new file mode 100644
index 0000000..b5915aa
--- /dev/null
+++ b/core/java/com/android/internal/os/KernelMemoryBandwidthStats.java
@@ -0,0 +1,72 @@
+package com.android.internal.os;
+
+import android.os.StrictMode;
+import android.text.TextUtils;
+import android.util.LongSparseLongArray;
+import android.util.Slog;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+
+/**
+ * Reads DDR time spent at various frequencies and stores the data. Supports diff comparison with
+ * other KernelMemoryBandwidthStats objects. The sysfs file has the format:
+ *
+ * freq time_in_bucket ... time_in_bucket
+ * ...
+ * freq time_in_bucket ... time_in_bucket
+ *
+ * where time is measured in nanoseconds.
+ */
+public class KernelMemoryBandwidthStats {
+ private static final String TAG = "KernelMemoryBandwidthStats";
+
+ final protected LongSparseLongArray mBandwidthEntries = new LongSparseLongArray();
+ private static final String mSysfsFile = "/sys/kernel/memory_state_time/show_stat";
+ private static final boolean DEBUG = false;
+
+ public void updateStats() {
+ StrictMode.ThreadPolicy policy = StrictMode.allowThreadDiskReads();
+ try (BufferedReader reader = new BufferedReader(new FileReader(mSysfsFile))) {
+ parseStats(reader);
+ } catch (IOException e) {
+ Slog.e(TAG, "Failed to read memory bandwidth: " + e.getMessage());
+ mBandwidthEntries.clear();
+ } finally {
+ StrictMode.setThreadPolicy(policy);
+ }
+ }
+
+ @VisibleForTesting
+ public void parseStats(BufferedReader reader) throws IOException {
+ String line;
+ TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter(' ');
+ mBandwidthEntries.clear();
+ while ((line = reader.readLine()) != null) {
+ splitter.setString(line);
+ splitter.next();
+ int bandwidth = 0;
+ int index;
+ do {
+ if ((index = mBandwidthEntries.indexOfKey(bandwidth)) >= 0) {
+ mBandwidthEntries.put(bandwidth, mBandwidthEntries.valueAt(index)
+ + Long.parseLong(splitter.next()) / 1000000);
+ } else {
+ mBandwidthEntries.put(bandwidth, Long.parseLong(splitter.next()) / 1000000);
+ }
+ if (DEBUG) {
+ Slog.d(TAG, String.format("bandwidth: %s time: %s", bandwidth,
+ mBandwidthEntries.get(bandwidth)));
+ }
+ bandwidth++;
+ } while(splitter.hasNext());
+ }
+ }
+
+ public LongSparseLongArray getBandwidthEntries() {
+ return mBandwidthEntries;
+ }
+}
diff --git a/core/java/com/android/internal/os/MemoryPowerCalculator.java b/core/java/com/android/internal/os/MemoryPowerCalculator.java
new file mode 100644
index 0000000..efd3ab5
--- /dev/null
+++ b/core/java/com/android/internal/os/MemoryPowerCalculator.java
@@ -0,0 +1,54 @@
+package com.android.internal.os;
+
+import android.os.BatteryStats;
+import android.util.Log;
+import android.util.LongSparseArray;
+
+public class MemoryPowerCalculator extends PowerCalculator {
+
+ public static final String TAG = "MemoryPowerCalculator";
+ private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
+ private final double[] powerAverages;
+
+ public MemoryPowerCalculator(PowerProfile profile) {
+ int numBuckets = profile.getNumElements(PowerProfile.POWER_MEMORY);
+ powerAverages = new double[numBuckets];
+ for (int i = 0; i < numBuckets; i++) {
+ powerAverages[i] = profile.getAveragePower(PowerProfile.POWER_MEMORY, i);
+ if (powerAverages[i] == 0 && DEBUG) {
+ Log.d(TAG, "Problem with PowerProfile. Received 0 value in MemoryPowerCalculator");
+ }
+ }
+ }
+
+ @Override
+ public void calculateApp(BatterySipper app, BatteryStats.Uid u, long rawRealtimeUs,
+ long rawUptimeUs, int statsType) {}
+
+ @Override
+ public void calculateRemaining(BatterySipper app, BatteryStats stats, long rawRealtimeUs,
+ long rawUptimeUs, int statsType) {
+ double totalMah = 0;
+ long totalTimeMs = 0;
+ LongSparseArray<? extends BatteryStats.Timer> timers = stats.getKernelMemoryStats();
+ for (int i = 0; i < timers.size() && i < powerAverages.length; i++) {
+ double mAatRail = powerAverages[(int) timers.keyAt(i)];
+ long timeMs = timers.valueAt(i).getTotalTimeLocked(rawRealtimeUs, statsType);
+ double mAm = (mAatRail * timeMs) / (1000*60);
+ if(DEBUG) {
+ Log.d(TAG, "Calculating mAh for bucket " + timers.keyAt(i) + " while unplugged");
+ Log.d(TAG, "Converted power profile number from "
+ + powerAverages[(int) timers.keyAt(i)] + " into " + mAatRail);
+ Log.d(TAG, "Calculated mAm " + mAm);
+ }
+ totalMah += mAm/60;
+ totalTimeMs += timeMs;
+ }
+ app.usagePowerMah = totalMah;
+ app.usageTimeMs = totalTimeMs;
+ if (DEBUG) {
+ Log.d(TAG, String.format("Calculated total mAh for memory %f while unplugged %d ",
+ totalMah, totalTimeMs));
+ }
+ }
+}
diff --git a/core/java/com/android/internal/os/PowerProfile.java b/core/java/com/android/internal/os/PowerProfile.java
index ad14a20..51cf2ea 100644
--- a/core/java/com/android/internal/os/PowerProfile.java
+++ b/core/java/com/android/internal/os/PowerProfile.java
@@ -171,6 +171,11 @@
public static final String POWER_FLASHLIGHT = "camera.flashlight";
/**
+ * Power consumption when DDR is being used.
+ */
+ public static final String POWER_MEMORY = "memory.bandwidths";
+
+ /**
* Average power consumption when the camera is on over all standard use cases.
*
* TODO: Add more fine-grained camera power metrics.
@@ -365,6 +370,24 @@
}
/**
+ * Returns the number of memory bandwidth buckets defined in power_profile.xml, or a
+ * default value if the subsystem has no recorded value.
+ * @return the number of memory bandwidth buckets.
+ */
+ public int getNumElements(String key) {
+ if (sPowerMap.containsKey(key)) {
+ Object data = sPowerMap.get(key);
+ if (data instanceof Double[]) {
+ final Double[] values = (Double[]) data;
+ return values.length;
+ } else {
+ return 1;
+ }
+ }
+ return 0;
+ }
+
+ /**
* Returns the average current in mA consumed by the subsystem, or the given
* default value if the subsystem has no recorded value.
* @param type the subsystem type
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 366fc1a..1308f28 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -2032,7 +2032,7 @@
if (mBackdropFrameRenderer != null) {
return;
}
- final ThreadedRenderer renderer = getHardwareRenderer();
+ final ThreadedRenderer renderer = getThreadedRenderer();
if (renderer != null) {
loadBackgroundDrawablesIfNeeded();
mBackdropFrameRenderer = new BackdropFrameRenderer(this, renderer,
diff --git a/core/java/com/android/internal/util/FastPrintWriter.java b/core/java/com/android/internal/util/FastPrintWriter.java
index dc3832a..cc2c4cf 100644
--- a/core/java/com/android/internal/util/FastPrintWriter.java
+++ b/core/java/com/android/internal/util/FastPrintWriter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.android.internal.util;
import android.util.Log;
diff --git a/core/java/com/android/internal/util/MimeIconUtils.java b/core/java/com/android/internal/util/MimeIconUtils.java
new file mode 100644
index 0000000..841ec7c
--- /dev/null
+++ b/core/java/com/android/internal/util/MimeIconUtils.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.provider.DocumentsContract;
+
+import com.android.internal.R;
+
+import java.util.HashMap;
+
+public class MimeIconUtils {
+
+ private static HashMap<String, Integer> sMimeIcons = new HashMap<>();
+
+ private static void add(String mimeType, int resId) {
+ if (sMimeIcons.put(mimeType, resId) != null) {
+ throw new RuntimeException(mimeType + " already registered!");
+ }
+ }
+
+ static {
+ int icon;
+
+ // Package
+ icon = R.drawable.ic_doc_apk;
+ add("application/vnd.android.package-archive", icon);
+
+ // Audio
+ icon = R.drawable.ic_doc_audio;
+ add("application/ogg", icon);
+ add("application/x-flac", icon);
+
+ // Certificate
+ icon = R.drawable.ic_doc_certificate;
+ add("application/pgp-keys", icon);
+ add("application/pgp-signature", icon);
+ add("application/x-pkcs12", icon);
+ add("application/x-pkcs7-certreqresp", icon);
+ add("application/x-pkcs7-crl", icon);
+ add("application/x-x509-ca-cert", icon);
+ add("application/x-x509-user-cert", icon);
+ add("application/x-pkcs7-certificates", icon);
+ add("application/x-pkcs7-mime", icon);
+ add("application/x-pkcs7-signature", icon);
+
+ // Source code
+ icon = R.drawable.ic_doc_codes;
+ add("application/rdf+xml", icon);
+ add("application/rss+xml", icon);
+ add("application/x-object", icon);
+ add("application/xhtml+xml", icon);
+ add("text/css", icon);
+ add("text/html", icon);
+ add("text/xml", icon);
+ add("text/x-c++hdr", icon);
+ add("text/x-c++src", icon);
+ add("text/x-chdr", icon);
+ add("text/x-csrc", icon);
+ add("text/x-dsrc", icon);
+ add("text/x-csh", icon);
+ add("text/x-haskell", icon);
+ add("text/x-java", icon);
+ add("text/x-literate-haskell", icon);
+ add("text/x-pascal", icon);
+ add("text/x-tcl", icon);
+ add("text/x-tex", icon);
+ add("application/x-latex", icon);
+ add("application/x-texinfo", icon);
+ add("application/atom+xml", icon);
+ add("application/ecmascript", icon);
+ add("application/json", icon);
+ add("application/javascript", icon);
+ add("application/xml", icon);
+ add("text/javascript", icon);
+ add("application/x-javascript", icon);
+
+ // Compressed
+ icon = R.drawable.ic_doc_compressed;
+ add("application/mac-binhex40", icon);
+ add("application/rar", icon);
+ add("application/zip", icon);
+ add("application/x-apple-diskimage", icon);
+ add("application/x-debian-package", icon);
+ add("application/x-gtar", icon);
+ add("application/x-iso9660-image", icon);
+ add("application/x-lha", icon);
+ add("application/x-lzh", icon);
+ add("application/x-lzx", icon);
+ add("application/x-stuffit", icon);
+ add("application/x-tar", icon);
+ add("application/x-webarchive", icon);
+ add("application/x-webarchive-xml", icon);
+ add("application/gzip", icon);
+ add("application/x-7z-compressed", icon);
+ add("application/x-deb", icon);
+ add("application/x-rar-compressed", icon);
+
+ // Contact
+ icon = R.drawable.ic_doc_contact;
+ add("text/x-vcard", icon);
+ add("text/vcard", icon);
+
+ // Event
+ icon = R.drawable.ic_doc_event;
+ add("text/calendar", icon);
+ add("text/x-vcalendar", icon);
+
+ // Font
+ icon = R.drawable.ic_doc_font;
+ add("application/x-font", icon);
+ add("application/font-woff", icon);
+ add("application/x-font-woff", icon);
+ add("application/x-font-ttf", icon);
+
+ // Image
+ icon = R.drawable.ic_doc_image;
+ add("application/vnd.oasis.opendocument.graphics", icon);
+ add("application/vnd.oasis.opendocument.graphics-template", icon);
+ add("application/vnd.oasis.opendocument.image", icon);
+ add("application/vnd.stardivision.draw", icon);
+ add("application/vnd.sun.xml.draw", icon);
+ add("application/vnd.sun.xml.draw.template", icon);
+
+ // PDF
+ icon = R.drawable.ic_doc_pdf;
+ add("application/pdf", icon);
+
+ // Presentation
+ icon = R.drawable.ic_doc_presentation;
+ add("application/vnd.stardivision.impress", icon);
+ add("application/vnd.sun.xml.impress", icon);
+ add("application/vnd.sun.xml.impress.template", icon);
+ add("application/x-kpresenter", icon);
+ add("application/vnd.oasis.opendocument.presentation", icon);
+
+ // Spreadsheet
+ icon = R.drawable.ic_doc_spreadsheet;
+ add("application/vnd.oasis.opendocument.spreadsheet", icon);
+ add("application/vnd.oasis.opendocument.spreadsheet-template", icon);
+ add("application/vnd.stardivision.calc", icon);
+ add("application/vnd.sun.xml.calc", icon);
+ add("application/vnd.sun.xml.calc.template", icon);
+ add("application/x-kspread", icon);
+
+ // Document
+ icon = R.drawable.ic_doc_document;
+ add("application/vnd.oasis.opendocument.text", icon);
+ add("application/vnd.oasis.opendocument.text-master", icon);
+ add("application/vnd.oasis.opendocument.text-template", icon);
+ add("application/vnd.oasis.opendocument.text-web", icon);
+ add("application/vnd.stardivision.writer", icon);
+ add("application/vnd.stardivision.writer-global", icon);
+ add("application/vnd.sun.xml.writer", icon);
+ add("application/vnd.sun.xml.writer.global", icon);
+ add("application/vnd.sun.xml.writer.template", icon);
+ add("application/x-abiword", icon);
+ add("application/x-kword", icon);
+
+ // Video
+ icon = R.drawable.ic_doc_video;
+ add("application/x-quicktimeplayer", icon);
+ add("application/x-shockwave-flash", icon);
+
+ // Word
+ icon = R.drawable.ic_doc_word;
+ add("application/msword", icon);
+ add("application/vnd.openxmlformats-officedocument.wordprocessingml.document", icon);
+ add("application/vnd.openxmlformats-officedocument.wordprocessingml.template", icon);
+
+ // Excel
+ icon = R.drawable.ic_doc_excel;
+ add("application/vnd.ms-excel", icon);
+ add("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", icon);
+ add("application/vnd.openxmlformats-officedocument.spreadsheetml.template", icon);
+
+ // Powerpoint
+ icon = R.drawable.ic_doc_powerpoint;
+ add("application/vnd.ms-powerpoint", icon);
+ add("application/vnd.openxmlformats-officedocument.presentationml.presentation", icon);
+ add("application/vnd.openxmlformats-officedocument.presentationml.template", icon);
+ add("application/vnd.openxmlformats-officedocument.presentationml.slideshow", icon);
+ }
+
+ public static Drawable loadMimeIcon(Context context, String mimeType) {
+ if (DocumentsContract.Document.MIME_TYPE_DIR.equals(mimeType)) {
+ return context.getDrawable(R.drawable.ic_doc_folder);
+ }
+
+ // Look for exact match first
+ Integer resId = sMimeIcons.get(mimeType);
+ if (resId != null) {
+ return context.getDrawable(resId);
+ }
+
+ if (mimeType == null) {
+ // TODO: generic icon?
+ return null;
+ }
+
+ // Otherwise look for partial match
+ final String typeOnly = mimeType.split("/")[0];
+ if ("audio".equals(typeOnly)) {
+ return context.getDrawable(R.drawable.ic_doc_audio);
+ } else if ("image".equals(typeOnly)) {
+ return context.getDrawable(R.drawable.ic_doc_image);
+ } else if ("text".equals(typeOnly)) {
+ return context.getDrawable(R.drawable.ic_doc_text);
+ } else if ("video".equals(typeOnly)) {
+ return context.getDrawable(R.drawable.ic_doc_video);
+ } else {
+ return context.getDrawable(R.drawable.ic_doc_generic);
+ }
+ }
+}
diff --git a/core/java/com/android/internal/util/NotificationColorUtil.java b/core/java/com/android/internal/util/NotificationColorUtil.java
index 48bcc09..4748e6f 100644
--- a/core/java/com/android/internal/util/NotificationColorUtil.java
+++ b/core/java/com/android/internal/util/NotificationColorUtil.java
@@ -271,7 +271,7 @@
* Finds a text color with sufficient contrast over bg that has the same hue as the original
* color, assuming it is for large text.
*/
- private static int ensureLargeTextContrast(int color, int bg) {
+ public static int ensureLargeTextContrast(int color, int bg) {
return findContrastColor(color, bg, true, 3);
}
@@ -341,6 +341,20 @@
}
/**
+ * Lighten a color by a specified value
+ * @param baseColor the base color to lighten
+ * @param amount the amount to lighten the color from 0 to 100. This corresponds to the L
+ * increase in the LAB color space.
+ * @return the lightened color
+ */
+ public static int lightenColor(int baseColor, int amount) {
+ final double[] result = ColorUtilsFromCompat.getTempDouble3Array();
+ ColorUtilsFromCompat.colorToLAB(baseColor, result);
+ result[0] = Math.min(100, result[0] + amount);
+ return ColorUtilsFromCompat.LABToColor(result[0], result[1], result[2]);
+ }
+
+ /**
* Framework copy of functions needed from android.support.v4.graphics.ColorUtils.
*/
private static class ColorUtilsFromCompat {
@@ -434,7 +448,7 @@
* Convert RGB components to its CIE Lab representative components.
*
* <ul>
- * <li>outLab[0] is L [0 ...1)</li>
+ * <li>outLab[0] is L [0 ...100)</li>
* <li>outLab[1] is a [-128...127)</li>
* <li>outLab[2] is b [-128...127)</li>
* </ul>
@@ -516,7 +530,7 @@
* 2° Standard Observer (1931).</p>
*
* <ul>
- * <li>outLab[0] is L [0 ...1)</li>
+ * <li>outLab[0] is L [0 ...100)</li>
* <li>outLab[1] is a [-128...127)</li>
* <li>outLab[2] is b [-128...127)</li>
* </ul>
@@ -634,7 +648,7 @@
: (XYZ_KAPPA * component + 16) / 116;
}
- private static double[] getTempDouble3Array() {
+ public static double[] getTempDouble3Array() {
double[] result = TEMP_ARRAY.get();
if (result == null) {
result = new double[3];
diff --git a/core/java/com/android/internal/view/FloatingActionMode.java b/core/java/com/android/internal/view/FloatingActionMode.java
index 31ab26f..831c646 100644
--- a/core/java/com/android/internal/view/FloatingActionMode.java
+++ b/core/java/com/android/internal/view/FloatingActionMode.java
@@ -26,6 +26,7 @@
import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.ViewParent;
+import android.util.DisplayMetrics;
import com.android.internal.R;
import com.android.internal.util.Preconditions;
@@ -209,11 +210,9 @@
}
private boolean isContentRectWithinBounds() {
- mScreenRect.set(
- 0,
- 0,
- mContext.getResources().getDisplayMetrics().widthPixels,
- mContext.getResources().getDisplayMetrics().heightPixels);
+ DisplayMetrics metrics = mContext.getApplicationContext()
+ .getResources().getDisplayMetrics();
+ mScreenRect.set(0, 0, metrics.widthPixels, metrics.heightPixels);
return intersectsClosed(mContentRectOnScreen, mScreenRect)
&& intersectsClosed(mContentRectOnScreen, mViewRectOnScreen);
diff --git a/core/java/com/android/internal/view/IDragAndDropPermissions.aidl b/core/java/com/android/internal/view/IDragAndDropPermissions.aidl
index 64c2d04..edb759a 100644
--- a/core/java/com/android/internal/view/IDragAndDropPermissions.aidl
+++ b/core/java/com/android/internal/view/IDragAndDropPermissions.aidl
@@ -24,6 +24,6 @@
*/
interface IDragAndDropPermissions {
void take(IBinder activityToken);
- void takeTransient(IBinder permissionOwnerToken);
+ void takeTransient(IBinder transientToken);
void release();
}
diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java
index dce9d2c..644c7e9 100644
--- a/core/java/com/android/internal/view/IInputConnectionWrapper.java
+++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java
@@ -243,9 +243,10 @@
dispatchMessage(obtainMessage(DO_CLOSE_CONNECTION));
}
- public void commitContent(InputContentInfo inputContentInfo, Bundle opts,
+ public void commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts,
int seq, IInputContextCallback callback) {
- dispatchMessage(obtainMessageOOSC(DO_COMMIT_CONTENT, inputContentInfo, opts, seq, callback));
+ dispatchMessage(obtainMessageIOOSC(DO_COMMIT_CONTENT, flags, inputContentInfo, opts, seq,
+ callback));
}
void dispatchMessage(Message msg) {
@@ -560,6 +561,9 @@
return;
}
case DO_COMMIT_CONTENT: {
+ final int flags = msg.arg1;
+ final boolean grantUriPermission =
+ (flags & InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0;
SomeArgs args = (SomeArgs) msg.obj;
try {
InputConnection ic = getInputConnection();
@@ -575,8 +579,17 @@
args.callback.setCommitContentResult(false, args.seq);
return;
}
- args.callback.setCommitContentResult(
- ic.commitContent(inputContentInfo, (Bundle) args.arg2), args.seq);
+ if (grantUriPermission) {
+ inputContentInfo.requestPermission();
+ }
+ final boolean result =
+ ic.commitContent(inputContentInfo, flags, (Bundle) args.arg2);
+ // If this request is not handled, then there is no reason to keep the URI
+ // permission.
+ if (grantUriPermission && !result) {
+ inputContentInfo.releasePermission();
+ }
+ args.callback.setCommitContentResult(result, args.seq);
} catch (RemoteException e) {
Log.w(TAG, "Got RemoteException calling commitContent", e);
}
@@ -612,14 +625,14 @@
return mH.obtainMessage(what, arg1, arg2, args);
}
- Message obtainMessageOOSC(int what, Object arg1, Object arg2, int seq,
+ Message obtainMessageIOOSC(int what, int arg1, Object objArg1, Object objArg2, int seq,
IInputContextCallback callback) {
SomeArgs args = new SomeArgs();
- args.arg1 = arg1;
- args.arg2 = arg2;
+ args.arg1 = objArg1;
+ args.arg2 = objArg2;
args.callback = callback;
args.seq = seq;
- return mH.obtainMessage(what, 0, 0, args);
+ return mH.obtainMessage(what, arg1, 0, args);
}
Message obtainMessageIOSC(int what, int arg1, Object arg2, int seq,
diff --git a/core/java/com/android/internal/view/IInputContext.aidl b/core/java/com/android/internal/view/IInputContext.aidl
index 0d5c8a1..728c557 100644
--- a/core/java/com/android/internal/view/IInputContext.aidl
+++ b/core/java/com/android/internal/view/IInputContext.aidl
@@ -78,6 +78,6 @@
void requestUpdateCursorAnchorInfo(int cursorUpdateMode, int seq,
IInputContextCallback callback);
- void commitContent(in InputContentInfo inputContentInfo, in Bundle opts, int sec,
+ void commitContent(in InputContentInfo inputContentInfo, int flags, in Bundle opts, int sec,
IInputContextCallback callback);
}
diff --git a/core/java/com/android/internal/view/InputConnectionWrapper.java b/core/java/com/android/internal/view/InputConnectionWrapper.java
index 5e78ec5..9a09dcc 100644
--- a/core/java/com/android/internal/view/InputConnectionWrapper.java
+++ b/core/java/com/android/internal/view/InputConnectionWrapper.java
@@ -16,6 +16,8 @@
package com.android.internal.view;
+import android.annotation.NonNull;
+import android.inputmethodservice.AbstractInputMethodService;
import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteException;
@@ -31,9 +33,14 @@
import android.view.inputmethod.InputConnectionInspector.MissingMethodFlags;
import android.view.inputmethod.InputContentInfo;
+import java.lang.ref.WeakReference;
+
public class InputConnectionWrapper implements InputConnection {
private static final int MAX_WAIT_TIME_MILLIS = 2000;
private final IInputContext mIInputContext;
+ @NonNull
+ private final WeakReference<AbstractInputMethodService> mInputMethodService;
+
@MissingMethodFlags
private final int mMissingMethods;
@@ -210,8 +217,10 @@
}
}
- public InputConnectionWrapper(IInputContext inputContext,
- @MissingMethodFlags final int missingMethods) {
+ public InputConnectionWrapper(
+ @NonNull WeakReference<AbstractInputMethodService> inputMethodService,
+ IInputContext inputContext, @MissingMethodFlags final int missingMethods) {
+ mInputMethodService = inputMethodService;
mIInputContext = inputContext;
mMissingMethods = missingMethods;
}
@@ -506,15 +515,24 @@
// Nothing should happen when called from input method.
}
- public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) {
+ public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
boolean result = false;
if (isMethodMissing(MissingMethodFlags.COMMIT_CONTENT)) {
// This method is not implemented.
return false;
}
try {
+ if ((flags & InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
+ final AbstractInputMethodService inputMethodService = mInputMethodService.get();
+ if (inputMethodService == null) {
+ // This basically should not happen, because it's the the caller of this method.
+ return false;
+ }
+ inputMethodService.exposeContent(inputContentInfo, this);
+ }
+
InputContextCallback callback = InputContextCallback.getInstance();
- mIInputContext.commitContent(inputContentInfo, opts, callback.mSeq, callback);
+ mIInputContext.commitContent(inputContentInfo, flags, opts, callback.mSeq, callback);
synchronized (callback) {
callback.waitForResultLocked();
if (callback.mHaveValue) {
diff --git a/core/java/com/android/internal/view/menu/CascadingMenuPopup.java b/core/java/com/android/internal/view/menu/CascadingMenuPopup.java
index ddf3a76..69e974c 100644
--- a/core/java/com/android/internal/view/menu/CascadingMenuPopup.java
+++ b/core/java/com/android/internal/view/menu/CascadingMenuPopup.java
@@ -366,7 +366,7 @@
final int menuWidth = measureIndividualMenuWidth(adapter, null, mContext, mMenuMaxWidth);
final MenuPopupWindow popupWindow = createPopupWindow();
popupWindow.setAdapter(adapter);
- popupWindow.setWidth(menuWidth);
+ popupWindow.setContentWidth(menuWidth);
popupWindow.setDropDownGravity(mDropDownGravity);
final CascadingMenuInfo parentInfo;
diff --git a/core/java/com/android/internal/view/menu/IconMenuItemView.java b/core/java/com/android/internal/view/menu/IconMenuItemView.java
index de5e279..0e0c9b0 100644
--- a/core/java/com/android/internal/view/menu/IconMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/IconMenuItemView.java
@@ -265,7 +265,8 @@
}
// Set the desired width of item
- lp.desiredWidth = (int) Layout.getDesiredWidth(getText(), getPaint());
+ lp.desiredWidth = (int) Layout.getDesiredWidth(getText(), 0, getText().length(),
+ getPaint(), getTextDirectionHeuristic());
return lp;
}
diff --git a/core/java/com/android/internal/widget/DecorCaptionView.java b/core/java/com/android/internal/widget/DecorCaptionView.java
index 8ca0fae..c458ab1 100644
--- a/core/java/com/android/internal/widget/DecorCaptionView.java
+++ b/core/java/com/android/internal/widget/DecorCaptionView.java
@@ -236,6 +236,11 @@
return mTouchDispatchList;
}
+ @Override
+ public boolean shouldDelayChildPressedState() {
+ return false;
+ }
+
private boolean passedSlop(int x, int y) {
return Math.abs(x - mTouchDownX) > mDragSlop || Math.abs(y - mTouchDownY) > mDragSlop;
}
diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java
index 594581a..6604208 100644
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -737,7 +737,7 @@
protected void applyTransformation(float interpolatedTime, Transformation t) {
int deltaWidth = (int) (interpolatedTime * (targetWidth - startWidth));
setWidth(mContentContainer, startWidth + deltaWidth);
- if (isRTL()) {
+ if (isInRTLMode()) {
mContentContainer.setX(left);
// Lock the panels in place.
@@ -766,7 +766,7 @@
}
};
final float overflowButtonStartX = mOverflowButton.getX();
- final float overflowButtonTargetX = isRTL() ?
+ final float overflowButtonTargetX = isInRTLMode() ?
overflowButtonStartX + targetWidth - mOverflowButton.getWidth() :
overflowButtonStartX - targetWidth + mOverflowButton.getWidth();
Animation overflowButtonAnimation = new Animation() {
@@ -774,7 +774,7 @@
protected void applyTransformation(float interpolatedTime, Transformation t) {
float overflowButtonX = overflowButtonStartX
+ interpolatedTime * (overflowButtonTargetX - overflowButtonStartX);
- float deltaContainerWidth = isRTL() ?
+ float deltaContainerWidth = isInRTLMode() ?
0 :
mContentContainer.getWidth() - startWidth;
float actualOverflowButtonX = overflowButtonX + deltaContainerWidth;
@@ -812,7 +812,7 @@
protected void applyTransformation(float interpolatedTime, Transformation t) {
int deltaWidth = (int) (interpolatedTime * (targetWidth - startWidth));
setWidth(mContentContainer, startWidth + deltaWidth);
- if (isRTL()) {
+ if (isInRTLMode()) {
mContentContainer.setX(left);
// Lock the panels in place.
@@ -843,7 +843,7 @@
}
};
final float overflowButtonStartX = mOverflowButton.getX();
- final float overflowButtonTargetX = isRTL() ?
+ final float overflowButtonTargetX = isInRTLMode() ?
overflowButtonStartX - startWidth + mOverflowButton.getWidth() :
overflowButtonStartX + startWidth - mOverflowButton.getWidth();
Animation overflowButtonAnimation = new Animation() {
@@ -851,7 +851,7 @@
protected void applyTransformation(float interpolatedTime, Transformation t) {
float overflowButtonX = overflowButtonStartX
+ interpolatedTime * (overflowButtonTargetX - overflowButtonStartX);
- float deltaContainerWidth = isRTL() ?
+ float deltaContainerWidth = isInRTLMode() ?
0 :
mContentContainer.getWidth() - startWidth;
float actualOverflowButtonX = overflowButtonX + deltaContainerWidth;
@@ -903,7 +903,7 @@
R.string.floating_toolbar_close_overflow_description));
// Update x-coordinates depending on RTL state.
- if (isRTL()) {
+ if (isInRTLMode()) {
mContentContainer.setX(mMarginHorizontal); // align left
mMainPanel.setX(0); // align left
mOverflowButton.setX( // align right
@@ -947,7 +947,7 @@
if (hasOverflow()) {
// Update x-coordinates depending on RTL state.
- if (isRTL()) {
+ if (isInRTLMode()) {
mContentContainer.setX(mMarginHorizontal); // align left
mMainPanel.setX(0); // align left
mOverflowButton.setX(0); // align left
@@ -1087,9 +1087,10 @@
viewTreeObserver.addOnComputeInternalInsetsListener(mInsetsComputer);
}
- private boolean isRTL() {
- return mContext.getResources().getConfiguration().getLayoutDirection()
- == View.LAYOUT_DIRECTION_RTL;
+ private boolean isInRTLMode() {
+ return mContext.getApplicationInfo().hasRtlSupport()
+ && mContext.getResources().getConfiguration().getLayoutDirection()
+ == View.LAYOUT_DIRECTION_RTL;
}
private boolean hasOverflow() {
@@ -1203,7 +1204,7 @@
// The positioning of contents in RTL is wrong when the view is first rendered.
// Hide the view and post a runnable to recalculate positions and render the view.
// TODO: Investigate why this happens and fix.
- if (isRTL()) {
+ if (isInRTLMode()) {
mContentContainer.setAlpha(0);
mContentContainer.post(mPreparePopupContentRTLHelper);
}
diff --git a/core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl b/core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl
new file mode 100644
index 0000000..79717cf
--- /dev/null
+++ b/core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.widget;
+
+/** {@hide} */
+oneway interface ICheckCredentialProgressCallback {
+ void onCredentialVerified();
+}
diff --git a/core/java/com/android/internal/widget/ILockSettings.aidl b/core/java/com/android/internal/widget/ILockSettings.aidl
index 05b839d..9fa558e 100644
--- a/core/java/com/android/internal/widget/ILockSettings.aidl
+++ b/core/java/com/android/internal/widget/ILockSettings.aidl
@@ -17,6 +17,7 @@
package com.android.internal.widget;
import android.app.trust.IStrongAuthTracker;
+import com.android.internal.widget.ICheckCredentialProgressCallback;
import com.android.internal.widget.VerifyCredentialResponse;
/** {@hide} */
@@ -29,10 +30,12 @@
String getString(in String key, in String defaultValue, in int userId);
void setLockPattern(in String pattern, in String savedPattern, int userId);
void resetKeyStore(int userId);
- VerifyCredentialResponse checkPattern(in String pattern, int userId);
+ VerifyCredentialResponse checkPattern(in String pattern, int userId,
+ in ICheckCredentialProgressCallback progressCallback);
VerifyCredentialResponse verifyPattern(in String pattern, long challenge, int userId);
void setLockPassword(in String password, in String savedPassword, int userId);
- VerifyCredentialResponse checkPassword(in String password, int userId);
+ VerifyCredentialResponse checkPassword(in String password, int userId,
+ in ICheckCredentialProgressCallback progressCallback);
VerifyCredentialResponse verifyPassword(in String password, long challenge, int userId);
VerifyCredentialResponse verifyTiedProfileChallenge(String password, boolean isPattern, long challenge, int userId);
boolean checkVoldPassword(int userId);
diff --git a/core/java/com/android/internal/widget/LockPatternChecker.java b/core/java/com/android/internal/widget/LockPatternChecker.java
index 713f56f..df9b0dd 100644
--- a/core/java/com/android/internal/widget/LockPatternChecker.java
+++ b/core/java/com/android/internal/widget/LockPatternChecker.java
@@ -14,6 +14,13 @@
* Interface for a callback to be invoked after security check.
*/
public interface OnCheckCallback {
+
+ /**
+ * Invoked as soon as possible we know that the credentials match. This will be called
+ * earlier than {@link #onChecked} but only if the credentials match.
+ */
+ default void onEarlyMatched() {}
+
/**
* Invoked when a security check is finished.
*
@@ -92,7 +99,7 @@
@Override
protected Boolean doInBackground(Void... args) {
try {
- return utils.checkPattern(pattern, userId);
+ return utils.checkPattern(pattern, userId, callback::onEarlyMatched);
} catch (RequestThrottledException ex) {
mThrottleTimeout = ex.getTimeoutMs();
return false;
@@ -199,7 +206,7 @@
@Override
protected Boolean doInBackground(Void... args) {
try {
- return utils.checkPassword(password, userId);
+ return utils.checkPassword(password, userId, callback::onEarlyMatched);
} catch (RequestThrottledException ex) {
mThrottleTimeout = ex.getTimeoutMs();
return false;
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index b7ce7d7..2a79d28 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -17,6 +17,7 @@
package com.android.internal.widget;
import android.annotation.IntDef;
+import android.annotation.Nullable;
import android.app.admin.DevicePolicyManager;
import android.app.trust.IStrongAuthTracker;
import android.app.trust.TrustManager;
@@ -32,7 +33,6 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.IMountService;
@@ -149,6 +149,7 @@
private DevicePolicyManager mDevicePolicyManager;
private ILockSettings mLockSettingsService;
private UserManager mUserManager;
+ private final Handler mHandler;
/**
* Use {@link TrustManager#isTrustUsuallyManaged(int)}.
@@ -230,6 +231,9 @@
public LockPatternUtils(Context context) {
mContext = context;
mContentResolver = context.getContentResolver();
+
+ Looper looper = Looper.myLooper();
+ mHandler = looper != null ? new Handler(looper) : null;
}
private ILockSettings getLockSettings() {
@@ -341,10 +345,23 @@
*/
public boolean checkPattern(List<LockPatternView.Cell> pattern, int userId)
throws RequestThrottledException {
+ return checkPattern(pattern, userId, null /* progressCallback */);
+ }
+
+ /**
+ * Check to see if a pattern matches the saved pattern. If no pattern exists,
+ * always returns true.
+ * @param pattern The pattern to check.
+ * @return Whether the pattern matches the stored one.
+ */
+ public boolean checkPattern(List<LockPatternView.Cell> pattern, int userId,
+ @Nullable CheckCredentialProgressCallback progressCallback)
+ throws RequestThrottledException {
throwIfCalledOnMainThread();
try {
VerifyCredentialResponse response =
- getLockSettings().checkPattern(patternToString(pattern), userId);
+ getLockSettings().checkPattern(patternToString(pattern), userId,
+ wrapCallback(progressCallback));
if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {
return true;
@@ -354,7 +371,7 @@
return false;
}
} catch (RemoteException re) {
- return true;
+ return false;
}
}
@@ -423,10 +440,22 @@
* @return Whether the password matches the stored one.
*/
public boolean checkPassword(String password, int userId) throws RequestThrottledException {
+ return checkPassword(password, userId, null /* progressCallback */);
+ }
+
+ /**
+ * Check to see if a password matches the saved password. If no password exists,
+ * always returns true.
+ * @param password The password to check.
+ * @return Whether the password matches the stored one.
+ */
+ public boolean checkPassword(String password, int userId,
+ @Nullable CheckCredentialProgressCallback progressCallback)
+ throws RequestThrottledException {
throwIfCalledOnMainThread();
try {
VerifyCredentialResponse response =
- getLockSettings().checkPassword(password, userId);
+ getLockSettings().checkPassword(password, userId, wrapCallback(progressCallback));
if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {
return true;
} else if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_RETRY) {
@@ -435,7 +464,7 @@
return false;
}
} catch (RemoteException re) {
- return true;
+ return false;
}
}
@@ -1481,6 +1510,37 @@
return (getStrongAuthForUser(userId) & ~StrongAuthTracker.ALLOWING_FINGERPRINT) == 0;
}
+ private ICheckCredentialProgressCallback wrapCallback(
+ final CheckCredentialProgressCallback callback) {
+ if (callback == null) {
+ return null;
+ } else {
+ if (mHandler == null) {
+ throw new IllegalStateException("Must construct LockPatternUtils on a looper thread"
+ + " to use progress callbacks.");
+ }
+ return new ICheckCredentialProgressCallback.Stub() {
+
+ @Override
+ public void onCredentialVerified() throws RemoteException {
+ mHandler.post(callback::onEarlyMatched);
+ }
+ };
+ }
+ }
+
+ /**
+ * Callback to be notified about progress when checking credentials.
+ */
+ public interface CheckCredentialProgressCallback {
+
+ /**
+ * Called as soon as possible when we know that the credentials match but the user hasn't
+ * been fully unlocked.
+ */
+ void onEarlyMatched();
+ }
+
/**
* Tracks the global strong authentication state.
*/
diff --git a/core/java/com/android/internal/widget/NotificationActionListLayout.java b/core/java/com/android/internal/widget/NotificationActionListLayout.java
index 9dd118c..073aac5 100644
--- a/core/java/com/android/internal/widget/NotificationActionListLayout.java
+++ b/core/java/com/android/internal/widget/NotificationActionListLayout.java
@@ -17,11 +17,13 @@
package com.android.internal.widget;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.Pair;
import android.view.Gravity;
+import android.view.RemotableViewMethod;
import android.view.View;
-import android.view.ViewGroup;
+import android.widget.LinearLayout;
import android.widget.RemoteViews;
import android.widget.TextView;
@@ -33,11 +35,14 @@
* the remaining available width, and the last action consumes the remaining space.
*/
@RemoteViews.RemoteView
-public class NotificationActionListLayout extends ViewGroup {
+public class NotificationActionListLayout extends LinearLayout {
private int mTotalWidth = 0;
private ArrayList<Pair<Integer, TextView>> mMeasureOrderTextViews = new ArrayList<>();
private ArrayList<View> mMeasureOrderOther = new ArrayList<>();
+ private boolean mMeasureLinearly;
+ private int mDefaultPaddingEnd;
+ private Drawable mDefaultBackground;
public NotificationActionListLayout(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -45,6 +50,10 @@
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ if (mMeasureLinearly) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ return;
+ }
final int N = getChildCount();
int textViews = 0;
int otherViews = 0;
@@ -186,6 +195,10 @@
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ if (mMeasureLinearly) {
+ super.onLayout(changed, left, top, right, bottom);
+ return;
+ }
final boolean isLayoutRtl = isLayoutRtl();
final int paddingTop = mPaddingTop;
@@ -241,26 +254,24 @@
}
@Override
- public LayoutParams generateLayoutParams(AttributeSet attrs) {
- return new MarginLayoutParams(getContext(), attrs);
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ mDefaultPaddingEnd = getPaddingEnd();
+ mDefaultBackground = getBackground();
}
- @Override
- protected LayoutParams generateDefaultLayoutParams() {
- return new MarginLayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
- }
-
- @Override
- protected LayoutParams generateLayoutParams(LayoutParams p) {
- if (p instanceof MarginLayoutParams) {
- return new MarginLayoutParams((MarginLayoutParams)p);
- }
- return new MarginLayoutParams(p);
- }
-
- @Override
- protected boolean checkLayoutParams(LayoutParams p) {
- return p instanceof MarginLayoutParams;
+ /**
+ * Set whether the list is in a mode where some actions are emphasized. This will trigger an
+ * equal measuring where all actions are full height and change a few parameters like
+ * the padding.
+ */
+ @RemotableViewMethod
+ public void setEmphasizedMode(boolean emphasizedMode) {
+ mMeasureLinearly = emphasizedMode;
+ setPaddingRelative(getPaddingStart(), getPaddingTop(),
+ emphasizedMode ? 0 : mDefaultPaddingEnd, getPaddingBottom());
+ setBackground(emphasizedMode ? null : mDefaultBackground);
+ requestLayout();
}
public static final Comparator<Pair<Integer, TextView>> MEASURE_ORDER_COMPARATOR
diff --git a/core/java/com/android/internal/widget/ResolverDrawerLayout.java b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
index 8b9d503..e84cc27 100644
--- a/core/java/com/android/internal/widget/ResolverDrawerLayout.java
+++ b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
@@ -245,7 +245,7 @@
final float y = ev.getY();
mInitialTouchX = x;
mInitialTouchY = mLastTouchY = y;
- mOpenOnClick = isListChildUnderClipped(x, y) && mCollapsibleHeight > 0;
+ mOpenOnClick = isListChildUnderClipped(x, y) && mCollapseOffset > 0;
}
break;
diff --git a/core/java/com/android/internal/widget/WatchHeaderListView.java b/core/java/com/android/internal/widget/WatchHeaderListView.java
new file mode 100644
index 0000000..3d32d86
--- /dev/null
+++ b/core/java/com/android/internal/widget/WatchHeaderListView.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.widget;
+
+import android.annotation.IdRes;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.HeaderViewListAdapter;
+
+import java.util.ArrayList;
+
+import com.android.internal.util.Predicate;
+
+public class WatchHeaderListView extends ListView {
+ private View mTopPanel;
+
+ public WatchHeaderListView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public WatchHeaderListView(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public WatchHeaderListView(
+ Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ protected HeaderViewListAdapter wrapHeaderListAdapterInternal(
+ ArrayList<ListView.FixedViewInfo> headerViewInfos,
+ ArrayList<ListView.FixedViewInfo> footerViewInfos,
+ ListAdapter adapter) {
+ return new WatchHeaderListAdapter(headerViewInfos, footerViewInfos, adapter);
+ }
+
+ @Override
+ public void addView(View child, ViewGroup.LayoutParams params) {
+ if (mTopPanel == null) {
+ setTopPanel(child);
+ } else {
+ throw new IllegalStateException("WatchHeaderListView can host only one header");
+ }
+ }
+
+ public void setTopPanel(View v) {
+ mTopPanel = v;
+ wrapAdapterIfNecessary();
+ }
+
+ @Override
+ public void setAdapter(ListAdapter adapter) {
+ super.setAdapter(adapter);
+ wrapAdapterIfNecessary();
+ }
+
+ @Override
+ protected View findViewTraversal(@IdRes int id) {
+ View v = super.findViewTraversal(id);
+ if (v == null && mTopPanel != null && !mTopPanel.isRootNamespace()) {
+ return mTopPanel.findViewById(id);
+ }
+ return v;
+ }
+
+ @Override
+ protected View findViewWithTagTraversal(Object tag) {
+ View v = super.findViewWithTagTraversal(tag);
+ if (v == null && mTopPanel != null && !mTopPanel.isRootNamespace()) {
+ return mTopPanel.findViewWithTag(tag);
+ }
+ return v;
+ }
+
+ @Override
+ protected View findViewByPredicateTraversal(Predicate<View> predicate, View childToSkip) {
+ View v = super.findViewByPredicateTraversal(predicate, childToSkip);
+ if (v == null && mTopPanel != null && mTopPanel != childToSkip
+ && !mTopPanel.isRootNamespace()) {
+ return mTopPanel.findViewByPredicate(predicate);
+ }
+ return v;
+ }
+
+ @Override
+ public int getHeaderViewsCount() {
+ return mTopPanel == null ? super.getHeaderViewsCount() : super.getHeaderViewsCount() + 1;
+ }
+
+ private void wrapAdapterIfNecessary() {
+ ListAdapter adapter = getAdapter();
+ if (adapter != null && mTopPanel != null) {
+ if (!(adapter instanceof WatchHeaderListAdapter)) {
+ wrapHeaderListAdapterInternal();
+ }
+
+ ((WatchHeaderListAdapter) getAdapter()).setTopPanel(mTopPanel);
+ dispatchDataSetObserverOnChangedInternal();
+ }
+ }
+
+ private static class WatchHeaderListAdapter extends HeaderViewListAdapter {
+ private View mTopPanel;
+
+ public WatchHeaderListAdapter(
+ ArrayList<ListView.FixedViewInfo> headerViewInfos,
+ ArrayList<ListView.FixedViewInfo> footerViewInfos,
+ ListAdapter adapter) {
+ super(headerViewInfos, footerViewInfos, adapter);
+ }
+
+ public void setTopPanel(View v) {
+ mTopPanel = v;
+ }
+
+ private int getTopPanelCount() {
+ return mTopPanel == null ? 0 : 1;
+ }
+
+ @Override
+ public int getCount() {
+ return super.getCount() + getTopPanelCount();
+ }
+
+ @Override
+ public boolean areAllItemsEnabled() {
+ return mTopPanel == null && super.areAllItemsEnabled();
+ }
+
+ @Override
+ public boolean isEnabled(int position) {
+ if (mTopPanel != null) {
+ if (position == 0) {
+ return false;
+ } else {
+ return super.isEnabled(position - 1);
+ }
+ }
+
+ return super.isEnabled(position);
+ }
+
+ @Override
+ public Object getItem(int position) {
+ if (mTopPanel != null) {
+ if (position == 0) {
+ return null;
+ } else {
+ return super.getItem(position - 1);
+ }
+ }
+
+ return super.getItem(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ int numHeaders = getHeadersCount() + getTopPanelCount();
+ if (getWrappedAdapter() != null && position >= numHeaders) {
+ int adjPosition = position - numHeaders;
+ int adapterCount = getWrappedAdapter().getCount();
+ if (adjPosition < adapterCount) {
+ return getWrappedAdapter().getItemId(adjPosition);
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ if (mTopPanel != null) {
+ if (position == 0) {
+ return mTopPanel;
+ } else {
+ return super.getView(position - 1, convertView, parent);
+ }
+ }
+
+ return super.getView(position, convertView, parent);
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ int numHeaders = getHeadersCount() + getTopPanelCount();
+ if (getWrappedAdapter() != null && position >= numHeaders) {
+ int adjPosition = position - numHeaders;
+ int adapterCount = getWrappedAdapter().getCount();
+ if (adjPosition < adapterCount) {
+ return getWrappedAdapter().getItemViewType(adjPosition);
+ }
+ }
+
+ return AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER;
+ }
+ }
+}
diff --git a/core/java/com/android/internal/widget/WatchListDecorLayout.java b/core/java/com/android/internal/widget/WatchListDecorLayout.java
new file mode 100644
index 0000000..538ceca
--- /dev/null
+++ b/core/java/com/android/internal/widget/WatchListDecorLayout.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.widget;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ListView;
+import android.widget.FrameLayout;
+
+import java.util.ArrayList;
+
+
+/**
+ * Layout for the decor for ListViews on watch-type devices with small screens.
+ * <p>
+ * Supports one panel with the gravity set to top, and one panel with gravity set to bottom.
+ * <p>
+ * Use with one ListView child. The top and bottom panels will track the ListView's scrolling.
+ * If there is no ListView child, it will act like a normal FrameLayout.
+ */
+public class WatchListDecorLayout extends FrameLayout
+ implements ViewTreeObserver.OnScrollChangedListener {
+
+ private int mForegroundPaddingLeft = 0;
+ private int mForegroundPaddingTop = 0;
+ private int mForegroundPaddingRight = 0;
+ private int mForegroundPaddingBottom = 0;
+
+ private final ArrayList<View> mMatchParentChildren = new ArrayList<>(1);
+
+ /** Track the amount the ListView has to scroll up to account for padding change difference. */
+ private int mPendingScroll;
+ private View mBottomPanel;
+ private View mTopPanel;
+ private ListView mListView;
+ private ViewTreeObserver mObserver;
+
+
+ public WatchListDecorLayout(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public WatchListDecorLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public WatchListDecorLayout(
+ Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+
+ mPendingScroll = 0;
+
+ for (int i = 0; i < getChildCount(); ++i) {
+ View child = getChildAt(i);
+ if (child instanceof ListView) {
+ if (mListView != null) {
+ throw new IllegalArgumentException("only one ListView child allowed");
+ }
+ mListView = (ListView) child;
+
+ mListView.setNestedScrollingEnabled(true);
+ mObserver = mListView.getViewTreeObserver();
+ mObserver.addOnScrollChangedListener(this);
+ } else {
+ int gravity = (((LayoutParams) child.getLayoutParams()).gravity
+ & Gravity.VERTICAL_GRAVITY_MASK);
+ if (gravity == Gravity.TOP && mTopPanel == null) {
+ mTopPanel = child;
+ } else if (gravity == Gravity.BOTTOM && mBottomPanel == null) {
+ mBottomPanel = child;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ mListView = null;
+ mBottomPanel = null;
+ mTopPanel = null;
+ if (mObserver != null) {
+ if (mObserver.isAlive()) {
+ mObserver.removeOnScrollChangedListener(this);
+ }
+ mObserver = null;
+ }
+ }
+
+ private void applyMeasureToChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
+ final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
+
+ final int childWidthMeasureSpec;
+ if (lp.width == LayoutParams.MATCH_PARENT) {
+ final int width = Math.max(0, getMeasuredWidth()
+ - getPaddingLeftWithForeground() - getPaddingRightWithForeground()
+ - lp.leftMargin - lp.rightMargin);
+ childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(
+ width, MeasureSpec.EXACTLY);
+ } else {
+ childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
+ getPaddingLeftWithForeground() + getPaddingRightWithForeground() +
+ lp.leftMargin + lp.rightMargin,
+ lp.width);
+ }
+
+ final int childHeightMeasureSpec;
+ if (lp.height == LayoutParams.MATCH_PARENT) {
+ final int height = Math.max(0, getMeasuredHeight()
+ - getPaddingTopWithForeground() - getPaddingBottomWithForeground()
+ - lp.topMargin - lp.bottomMargin);
+ childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
+ height, MeasureSpec.EXACTLY);
+ } else {
+ childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
+ getPaddingTopWithForeground() + getPaddingBottomWithForeground() +
+ lp.topMargin + lp.bottomMargin,
+ lp.height);
+ }
+
+ child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+ }
+
+ private int measureAndGetHeight(View child, int widthMeasureSpec, int heightMeasureSpec) {
+ if (child != null) {
+ if (child.getVisibility() != GONE) {
+ applyMeasureToChild(mBottomPanel, widthMeasureSpec, heightMeasureSpec);
+ return child.getMeasuredHeight();
+ } else if (getMeasureAllChildren()) {
+ applyMeasureToChild(mBottomPanel, widthMeasureSpec, heightMeasureSpec);
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int count = getChildCount();
+
+ final boolean measureMatchParentChildren =
+ MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.EXACTLY ||
+ MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY;
+ mMatchParentChildren.clear();
+
+ int maxHeight = 0;
+ int maxWidth = 0;
+ int childState = 0;
+
+ for (int i = 0; i < count; i++) {
+ final View child = getChildAt(i);
+ if (getMeasureAllChildren() || child.getVisibility() != GONE) {
+ measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);
+ final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+ maxWidth = Math.max(maxWidth,
+ child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin);
+ maxHeight = Math.max(maxHeight,
+ child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin);
+ childState = combineMeasuredStates(childState, child.getMeasuredState());
+ if (measureMatchParentChildren) {
+ if (lp.width == LayoutParams.MATCH_PARENT ||
+ lp.height == LayoutParams.MATCH_PARENT) {
+ mMatchParentChildren.add(child);
+ }
+ }
+ }
+ }
+
+ // Account for padding too
+ maxWidth += getPaddingLeftWithForeground() + getPaddingRightWithForeground();
+ maxHeight += getPaddingTopWithForeground() + getPaddingBottomWithForeground();
+
+ // Check against our minimum height and width
+ maxHeight = Math.max(maxHeight, getSuggestedMinimumHeight());
+ maxWidth = Math.max(maxWidth, getSuggestedMinimumWidth());
+
+ // Check against our foreground's minimum height and width
+ final Drawable drawable = getForeground();
+ if (drawable != null) {
+ maxHeight = Math.max(maxHeight, drawable.getMinimumHeight());
+ maxWidth = Math.max(maxWidth, drawable.getMinimumWidth());
+ }
+
+ setMeasuredDimension(resolveSizeAndState(maxWidth, widthMeasureSpec, childState),
+ resolveSizeAndState(maxHeight, heightMeasureSpec,
+ childState << MEASURED_HEIGHT_STATE_SHIFT));
+
+ if (mListView != null) {
+ if (mPendingScroll != 0) {
+ mListView.scrollListBy(mPendingScroll);
+ mPendingScroll = 0;
+ }
+
+ int paddingTop = Math.max(mListView.getPaddingTop(),
+ measureAndGetHeight(mTopPanel, widthMeasureSpec, heightMeasureSpec));
+ int paddingBottom = Math.max(mListView.getPaddingBottom(),
+ measureAndGetHeight(mBottomPanel, widthMeasureSpec, heightMeasureSpec));
+
+ if (paddingTop != mListView.getPaddingTop()
+ || paddingBottom != mListView.getPaddingBottom()) {
+ mPendingScroll += mListView.getPaddingTop() - paddingTop;
+ mListView.setPadding(
+ mListView.getPaddingLeft(), paddingTop,
+ mListView.getPaddingRight(), paddingBottom);
+ }
+ }
+
+ count = mMatchParentChildren.size();
+ if (count > 1) {
+ for (int i = 0; i < count; i++) {
+ final View child = mMatchParentChildren.get(i);
+ if (mListView == null || (child != mTopPanel && child != mBottomPanel)) {
+ applyMeasureToChild(child, widthMeasureSpec, heightMeasureSpec);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void setForegroundGravity(int foregroundGravity) {
+ if (getForegroundGravity() != foregroundGravity) {
+ super.setForegroundGravity(foregroundGravity);
+
+ // calling get* again here because the set above may apply default constraints
+ final Drawable foreground = getForeground();
+ if (getForegroundGravity() == Gravity.FILL && foreground != null) {
+ Rect padding = new Rect();
+ if (foreground.getPadding(padding)) {
+ mForegroundPaddingLeft = padding.left;
+ mForegroundPaddingTop = padding.top;
+ mForegroundPaddingRight = padding.right;
+ mForegroundPaddingBottom = padding.bottom;
+ }
+ } else {
+ mForegroundPaddingLeft = 0;
+ mForegroundPaddingTop = 0;
+ mForegroundPaddingRight = 0;
+ mForegroundPaddingBottom = 0;
+ }
+ }
+ }
+
+ private int getPaddingLeftWithForeground() {
+ return isForegroundInsidePadding() ? Math.max(mPaddingLeft, mForegroundPaddingLeft) :
+ mPaddingLeft + mForegroundPaddingLeft;
+ }
+
+ private int getPaddingRightWithForeground() {
+ return isForegroundInsidePadding() ? Math.max(mPaddingRight, mForegroundPaddingRight) :
+ mPaddingRight + mForegroundPaddingRight;
+ }
+
+ private int getPaddingTopWithForeground() {
+ return isForegroundInsidePadding() ? Math.max(mPaddingTop, mForegroundPaddingTop) :
+ mPaddingTop + mForegroundPaddingTop;
+ }
+
+ private int getPaddingBottomWithForeground() {
+ return isForegroundInsidePadding() ? Math.max(mPaddingBottom, mForegroundPaddingBottom) :
+ mPaddingBottom + mForegroundPaddingBottom;
+ }
+
+ @Override
+ public void onScrollChanged() {
+ if (mListView == null) {
+ return;
+ }
+
+ if (mTopPanel != null) {
+ if (mListView.getChildCount() > 0) {
+ if (mListView.getFirstVisiblePosition() == 0) {
+ View firstChild = mListView.getChildAt(0);
+ setScrolling(mTopPanel,
+ firstChild.getY() - mTopPanel.getHeight() - mTopPanel.getTop());
+ } else {
+ // shift to hide the frame, last child is not the last position
+ setScrolling(mTopPanel, -mTopPanel.getHeight());
+ }
+ } else {
+ setScrolling(mTopPanel, 0); // no visible child, fallback to default behaviour
+ }
+ }
+
+ if (mBottomPanel != null) {
+ if (mListView.getChildCount() > 0) {
+ if (mListView.getLastVisiblePosition() >= mListView.getCount() - 1) {
+ View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
+ setScrolling(mBottomPanel,
+ lastChild.getY() + lastChild.getHeight() - mBottomPanel.getTop());
+ } else {
+ // shift to hide the frame, last child is not the last position
+ setScrolling(mBottomPanel, mBottomPanel.getHeight());
+ }
+ } else {
+ setScrolling(mBottomPanel, 0); // no visible child, fallback to default behaviour
+ }
+ }
+ }
+
+ /** Only set scrolling for the panel if there is a change in its translationY. */
+ private void setScrolling(View panel, float translationY) {
+ if (panel.getTranslationY() != translationY) {
+ panel.setTranslationY(translationY);
+ }
+ }
+}
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index 886265a..429131b 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -42,6 +42,8 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
/**
* Loads global system configuration info.
@@ -122,6 +124,11 @@
// These are the permitted backup transport service components
final ArraySet<ComponentName> mBackupTransportWhitelist = new ArraySet<>();
+ // These are the packages of carrier-associated apps which should be disabled until used until
+ // a SIM is inserted which grants carrier privileges to that carrier app.
+ final ArrayMap<String, List<String>> mDisabledUntilUsedPreinstalledCarrierAssociatedApps =
+ new ArrayMap<>();
+
public static SystemConfig getInstance() {
synchronized (SystemConfig.class) {
if (sInstance == null) {
@@ -183,6 +190,10 @@
return mBackupTransportWhitelist;
}
+ public ArrayMap<String, List<String>> getDisabledUntilUsedPreinstalledCarrierAssociatedApps() {
+ return mDisabledUntilUsedPreinstalledCarrierAssociatedApps;
+ }
+
SystemConfig() {
// Read configuration from system
readPermissions(Environment.buildPath(
@@ -476,6 +487,26 @@
}
}
XmlUtils.skipCurrentTag(parser);
+ } else if ("disabled-until-used-preinstalled-carrier-associated-app".equals(name)
+ && allowAppConfigs) {
+ String pkgname = parser.getAttributeValue(null, "package");
+ String carrierPkgname = parser.getAttributeValue(null, "carrierAppPackage");
+ if (pkgname == null || carrierPkgname == null) {
+ Slog.w(TAG, "<disabled-until-used-preinstalled-carrier-associated-app"
+ + " without package or carrierAppPackage in " + permFile + " at "
+ + parser.getPositionDescription());
+ } else {
+ List<String> associatedPkgs =
+ mDisabledUntilUsedPreinstalledCarrierAssociatedApps.get(
+ carrierPkgname);
+ if (associatedPkgs == null) {
+ associatedPkgs = new ArrayList<>();
+ mDisabledUntilUsedPreinstalledCarrierAssociatedApps.put(
+ carrierPkgname, associatedPkgs);
+ }
+ associatedPkgs.add(pkgname);
+ }
+ XmlUtils.skipCurrentTag(parser);
} else {
XmlUtils.skipCurrentTag(parser);
continue;
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 93ff637..2ea80ff 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -7,7 +7,6 @@
LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-non-virtual-dtor
LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
-LOCAL_CFLAGS += -DHWUI_NEW_OPS
LOCAL_CPPFLAGS += -Wno-conversion-null
ifeq ($(TARGET_ARCH), arm)
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 536c09c..be53cf3 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -276,7 +276,15 @@
return jniRegisterNativeMethods(env, className, gMethods, numMethods);
}
-void AndroidRuntime::setArgv0(const char* argv0) {
+void AndroidRuntime::setArgv0(const char* argv0, bool setProcName) {
+ if (setProcName) {
+ int len = strlen(argv0);
+ if (len < 15) {
+ pthread_setname_np(pthread_self(), argv0);
+ } else {
+ pthread_setname_np(pthread_self(), argv0 + len - 15);
+ }
+ }
memset(mArgBlockStart, 0, mArgBlockLength);
strlcpy(mArgBlockStart, argv0, mArgBlockLength);
}
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 06188d2..695aed5 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -72,7 +72,7 @@
case SkEncodedFormat::kWBMP_SkEncodedFormat:
mimeType = "image/vnd.wap.wbmp";
break;
- case SkEncodedFormat::kRAW_SkEncodedFormat:
+ case SkEncodedFormat::kDNG_SkEncodedFormat:
mimeType = "image/x-adobe-dng";
break;
default:
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h
index 5baa8f8..a5e94a10 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -10,7 +10,6 @@
#include "SkMallocPixelRef.h"
#include "SkPoint.h"
#include "SkRect.h"
-#include "SkImageDecoder.h"
#include <jni.h>
#include <hwui/Canvas.h>
diff --git a/core/jni/android/graphics/NinePatchPeeker.cpp b/core/jni/android/graphics/NinePatchPeeker.cpp
index 8a84a35..1ea5650 100644
--- a/core/jni/android/graphics/NinePatchPeeker.cpp
+++ b/core/jni/android/graphics/NinePatchPeeker.cpp
@@ -17,7 +17,6 @@
#include "NinePatchPeeker.h"
#include "SkBitmap.h"
-#include "SkImageDecoder.h"
using namespace android;
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index b586c43..67c94fb 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -769,6 +769,21 @@
return false;
}
+ // Don't count glyphs that are the recommended "space" glyph and are zero width.
+ // This logic makes assumptions about HarfBuzz layout, but does correctly handle
+ // cases where ligatures form and zero width space glyphs are left in as
+ // placeholders.
+ static size_t countNonSpaceGlyphs(const minikin::Layout& layout) {
+ size_t count = 0;
+ static unsigned int kSpaceGlyphId = 3;
+ for (size_t i = 0; i < layout.nGlyphs(); i++) {
+ if (layout.getGlyphId(i) != kSpaceGlyphId || layout.getCharAdvance(i) != 0.0) {
+ count++;
+ }
+ }
+ return count;
+ }
+
// Returns true if the given string is exact one pair of regional indicators.
static bool isFlag(const jchar* str, size_t length) {
const jchar RI_LEAD_SURROGATE = 0xD83C;
@@ -832,7 +847,7 @@
minikin::Layout layout;
MinikinUtils::doLayout(&layout, paint, bidiFlags, typeface, str.get(), 0, str.size(),
str.size());
- size_t nGlyphs = layout.nGlyphs();
+ size_t nGlyphs = countNonSpaceGlyphs(layout);
if (nGlyphs != 1 && nChars > 1) {
// multiple-character input, and was not a ligature
// TODO: handle ZWJ/ZWNJ characters specially so we can detect certain ligatures
diff --git a/core/jni/android/graphics/YuvToJpegEncoder.cpp b/core/jni/android/graphics/YuvToJpegEncoder.cpp
index 7d0c39c..31567f7 100644
--- a/core/jni/android/graphics/YuvToJpegEncoder.cpp
+++ b/core/jni/android/graphics/YuvToJpegEncoder.cpp
@@ -1,5 +1,5 @@
#include "CreateJavaOutputStreamAdaptor.h"
-#include "SkJpegUtility.h"
+#include "SkJPEGWriteUtility.h"
#include "YuvToJpegEncoder.h"
#include <ui/PixelFormat.h>
#include <hardware/hardware.h>
diff --git a/core/jni/android/graphics/pdf/PdfDocument.cpp b/core/jni/android/graphics/pdf/PdfDocument.cpp
index d535193..acf9996 100644
--- a/core/jni/android/graphics/pdf/PdfDocument.cpp
+++ b/core/jni/android/graphics/pdf/PdfDocument.cpp
@@ -88,7 +88,7 @@
}
void write(SkWStream* stream) {
- SkAutoTUnref<SkDocument> document(SkDocument::CreatePDF(stream));
+ sk_sp<SkDocument> document = SkDocument::MakePDF(stream);
for (unsigned i = 0; i < mPages.size(); i++) {
PageRecord* page = mPages[i];
diff --git a/core/jni/android_app_ApplicationLoaders.cpp b/core/jni/android_app_ApplicationLoaders.cpp
index 24ee959..3e7c039 100644
--- a/core/jni/android_app_ApplicationLoaders.cpp
+++ b/core/jni/android_app_ApplicationLoaders.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "ApplicationLoaders"
+
#include <nativehelper/ScopedUtfChars.h>
#include <nativeloader/native_loader.h>
#include <vulkan/vulkan_loader_data.h>
@@ -22,10 +24,17 @@
static void setupVulkanLayerPath_native(JNIEnv* env, jobject clazz,
jobject classLoader, jstring librarySearchPath) {
+ android_namespace_t* ns = android::FindNamespaceByClassLoader(env, classLoader);
ScopedUtfChars layerPathChars(env, librarySearchPath);
+
vulkan::LoaderData& loader_data = vulkan::LoaderData::GetInstance();
- loader_data.layer_path = layerPathChars.c_str();
- loader_data.app_namespace = android::FindNamespaceByClassLoader(env, classLoader);
+ if (loader_data.layer_path.empty()) {
+ loader_data.layer_path = layerPathChars.c_str();
+ loader_data.app_namespace = ns;
+ } else {
+ ALOGD("ignored Vulkan layer search path %s for namespace %p",
+ layerPathChars.c_str(), ns);
+ }
}
static const JNINativeMethod g_methods[] = {
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index 03a50dd..d5a7a90 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -614,10 +614,10 @@
{"native_drawPath","!(JJJ)V", (void*) CanvasJNI::drawPath},
{"nativeDrawVertices", "!(JII[FI[FI[II[SIIJ)V", (void*)CanvasJNI::drawVertices},
{"native_drawNinePatch", "!(JJJFFFFJII)V", (void*)CanvasJNI::drawNinePatch},
- {"native_drawBitmap","!(JLandroid/graphics/Bitmap;FFJIII)V", (void*) CanvasJNI::drawBitmap},
+ {"native_drawBitmap","(JLandroid/graphics/Bitmap;FFJIII)V", (void*) CanvasJNI::drawBitmap},
{"nativeDrawBitmapMatrix", "!(JLandroid/graphics/Bitmap;JJ)V", (void*)CanvasJNI::drawBitmapMatrix},
- {"native_drawBitmap","!(JLandroid/graphics/Bitmap;FFFFFFFFJII)V", (void*) CanvasJNI::drawBitmapRect},
- {"native_drawBitmap", "!(J[IIIFFIIZJ)V", (void*)CanvasJNI::drawBitmapArray},
+ {"native_drawBitmap","(JLandroid/graphics/Bitmap;FFFFFFFFJII)V", (void*) CanvasJNI::drawBitmapRect},
+ {"native_drawBitmap", "(J[IIIFFIIZJ)V", (void*)CanvasJNI::drawBitmapArray},
{"nativeDrawBitmapMesh", "!(JLandroid/graphics/Bitmap;II[FI[IIJ)V", (void*)CanvasJNI::drawBitmapMesh},
{"native_drawText","!(J[CIIFFIJJ)V", (void*) CanvasJNI::drawTextChars},
{"native_drawText","!(JLjava/lang/String;IIFFIJJ)V", (void*) CanvasJNI::drawTextString},
diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp
index f37fd78..518f99e 100644
--- a/core/jni/android_hardware_camera2_CameraMetadata.cpp
+++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp
@@ -43,8 +43,6 @@
#include <sys/types.h> // for socketpair
#include <sys/socket.h> // for socketpair
-static const bool kIsDebug = false;
-
// fully-qualified class name
#define CAMERA_METADATA_CLASS_NAME "android/hardware/camera2/impl/CameraMetadataNative"
#define CHARACTERISTICS_KEY_CLASS_NAME "android/hardware/camera2/CameraCharacteristics$Key"
@@ -787,109 +785,16 @@
// exception thrown by ScopedUtfChars
return 0;
}
- size_t keyLength = strlen(key);
-
ALOGV("%s (key = '%s')", __FUNCTION__, key);
- sp<VendorTagDescriptor> vTags = VendorTagDescriptor::getGlobalVendorTagDescriptor();
-
- SortedVector<String8> vendorSections;
- size_t vendorSectionCount = 0;
-
- if (vTags != NULL) {
- vendorSections = vTags->getAllSectionNames();
- vendorSectionCount = vendorSections.size();
- }
-
- // First, find the section by the longest string match
- const char *section = NULL;
- size_t sectionIndex = 0;
- size_t sectionLength = 0;
- size_t totalSectionCount = ANDROID_SECTION_COUNT + vendorSectionCount;
- for (size_t i = 0; i < totalSectionCount; ++i) {
-
- const char *str = (i < ANDROID_SECTION_COUNT) ? camera_metadata_section_names[i] :
- vendorSections[i - ANDROID_SECTION_COUNT].string();
- if (kIsDebug) {
- ALOGV("%s: Trying to match against section '%s'", __FUNCTION__, str);
- }
- if (strstr(key, str) == key) { // key begins with the section name
- size_t strLength = strlen(str);
-
- if (kIsDebug) {
- ALOGV("%s: Key begins with section name", __FUNCTION__);
- }
-
- // section name is the longest we've found so far
- if (section == NULL || sectionLength < strLength) {
- section = str;
- sectionIndex = i;
- sectionLength = strLength;
-
- if (kIsDebug) {
- ALOGV("%s: Found new best section (%s)", __FUNCTION__, section);
- }
- }
- }
- }
-
- // TODO: Make above get_camera_metadata_section_from_name ?
-
- if (section == NULL) {
- jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
- "Could not find section name for key '%s')", key);
- return 0;
- } else {
- ALOGV("%s: Found matched section '%s' (%zu)",
- __FUNCTION__, section, sectionIndex);
- }
-
- // Get the tag name component of the key
- const char *keyTagName = key + sectionLength + 1; // x.y.z -> z
- if (sectionLength + 1 >= keyLength) {
- jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
- "Key length too short for key '%s')", key);
- return 0;
- }
-
- // Match rest of name against the tag names in that section only
uint32_t tag = 0;
- if (sectionIndex < ANDROID_SECTION_COUNT) {
- // Match built-in tags (typically android.*)
- uint32_t tagBegin, tagEnd; // [tagBegin, tagEnd)
- tagBegin = camera_metadata_section_bounds[sectionIndex][0];
- tagEnd = camera_metadata_section_bounds[sectionIndex][1];
-
- for (tag = tagBegin; tag < tagEnd; ++tag) {
- const char *tagName = get_camera_metadata_tag_name(tag);
-
- if (strcmp(keyTagName, tagName) == 0) {
- ALOGV("%s: Found matched tag '%s' (%d)",
- __FUNCTION__, tagName, tag);
- break;
- }
- }
-
- if (tag == tagEnd) {
- jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
- "Could not find tag name for key '%s')", key);
- return 0;
- }
- } else if (vTags != NULL) {
- // Match vendor tags (typically com.*)
- const String8 sectionName(section);
- const String8 tagName(keyTagName);
-
- status_t res = OK;
- if ((res = vTags->lookupTag(tagName, sectionName, &tag)) != OK) {
- jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
- "%s: No vendor tag matches key '%s'", __FUNCTION__, key);
- return 0;
- }
+ sp<VendorTagDescriptor> vTags =
+ VendorTagDescriptor::getGlobalVendorTagDescriptor();
+ status_t res = CameraMetadata::getTagFromName(key, vTags.get(), &tag);
+ if (res != OK) {
+ jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
+ "Could not find tag for key '%s')", key);
}
-
- // TODO: Make above get_camera_metadata_tag_from_name ?
-
return tag;
}
diff --git a/core/jni/android_hardware_location_ContextHubService.cpp b/core/jni/android_hardware_location_ContextHubService.cpp
index 3881d6d..9515a0e 100644
--- a/core/jni/android_hardware_location_ContextHubService.cpp
+++ b/core/jni/android_hardware_location_ContextHubService.cpp
@@ -21,28 +21,34 @@
#include <inttypes.h>
#include <jni.h>
-#include <queue>
-#include <unordered_map>
+#include <mutex>
#include <string.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <unordered_map>
+#include <queue>
#include <cutils/log.h>
#include "JNIHelp.h"
#include "core_jni_helpers.h"
-static constexpr int OS_APP_ID=-1;
+static constexpr int OS_APP_ID = -1;
+static constexpr uint64_t ALL_APPS = UINT64_C(0xFFFFFFFFFFFFFFFF);
-static constexpr int MIN_APP_ID=1;
-static constexpr int MAX_APP_ID=128;
+static constexpr int MIN_APP_ID = 1;
+static constexpr int MAX_APP_ID = 128;
-static constexpr size_t MSG_HEADER_SIZE=4;
-static constexpr int HEADER_FIELD_MSG_TYPE=0;
-//static constexpr int HEADER_FIELD_MSG_VERSION=1;
-static constexpr int HEADER_FIELD_HUB_HANDLE=2;
-static constexpr int HEADER_FIELD_APP_INSTANCE=3;
+static constexpr size_t MSG_HEADER_SIZE = 4;
+static constexpr size_t HEADER_FIELD_MSG_TYPE = 0;
+static constexpr size_t HEADER_FIELD_MSG_VERSION = 1;
+static constexpr size_t HEADER_FIELD_HUB_HANDLE = 2;
+static constexpr size_t HEADER_FIELD_APP_INSTANCE = 3;
+
+static constexpr size_t HEADER_FIELD_LOAD_APP_ID_LO = MSG_HEADER_SIZE;
+static constexpr size_t HEADER_FIELD_LOAD_APP_ID_HI = MSG_HEADER_SIZE + 1;
+static constexpr size_t MSG_HEADER_SIZE_LOAD_APP = MSG_HEADER_SIZE + 2;
namespace android {
@@ -83,6 +89,7 @@
jmethodID contextHubServiceMsgReceiptCallback;
jmethodID contextHubServiceAddAppInstance;
+ jmethodID contextHubServiceDeleteAppInstance;
};
struct context_hub_info_s {
@@ -93,10 +100,53 @@
};
struct app_instance_info_s {
- uint32_t hubHandle; // Id of the hub this app is on
- int instanceId; // systemwide unique instance id - assigned
+ uint64_t truncName; // Possibly truncated name for logging
+ uint32_t hubHandle; // Id of the hub this app is on
+ int instanceId; // system wide unique instance id - assigned
struct hub_app_info appInfo; // returned from the HAL
- uint64_t truncName; // Possibly truncated name - logging
+};
+
+/*
+ * TODO(ashutoshj): From original code review:
+ *
+ * So, I feel like we could possible do a better job of organizing this code,
+ * and being more C++-y. Consider something like this:
+ * class TxnManager {
+ * public:
+ * TxnManager();
+ * ~TxnManager();
+ * int add(hub_message_e identifier, void *data);
+ * int close();
+ * bool isPending() const;
+ * int fetchData(hub_message_e *identifier, void **data) const;
+ *
+ * private:
+ * bool mPending;
+ * mutable std::mutex mLock;
+ * hub_message_e mIdentifier;
+ * void *mData;
+ * };
+ *
+ * And then, for example, we'd have things like:
+ * TxnManager::TxnManager() : mPending(false), mLock(), mIdentifier(), mData(nullptr) {}
+ * int TxnManager::add(hub_message_e identifier, void *data) {
+ * std::lock_guard<std::mutex> lock(mLock);
+ * mPending = true;
+ * mData = txnData;
+ * mIdentifier = txnIdentifier;
+ * return 0;
+ * }
+ * And then calling code would look like:
+ * if (!db.txnManager.add(CONTEXT_HUB_LOAD_APP, txnInfo)) {
+ *
+ * This would make it clearer the nothing is manipulating any state within TxnManager
+ * unsafely and outside of these couple of calls.
+ */
+struct txnManager_s {
+ bool txnPending; // Is a transaction pending
+ std::mutex m; // mutex for manager
+ hub_messages_e txnIdentifier; // What are we doing
+ void *txnData; // Details
};
struct contextHubServiceDb_s {
@@ -105,12 +155,69 @@
jniInfo_s jniInfo;
std::queue<int> freeIds;
std::unordered_map<int, app_instance_info_s> appInstances;
+ txnManager_s txnManager;
};
} // unnamed namespace
static contextHubServiceDb_s db;
+static bool initTxnManager() {
+ txnManager_s *mgr = &db.txnManager;
+
+ mgr->txnData = nullptr;
+ mgr->txnPending = false;
+ return true;
+}
+
+static int addTxn(hub_messages_e txnIdentifier, void *txnData) {
+ txnManager_s *mgr = &db.txnManager;
+
+ std::lock_guard<std::mutex>lock(mgr->m);
+
+ mgr->txnPending = true;
+ mgr->txnData = txnData;
+ mgr->txnIdentifier = txnIdentifier;
+
+ return 0;
+}
+
+static int closeTxn() {
+ txnManager_s *mgr = &db.txnManager;
+ std::lock_guard<std::mutex>lock(mgr->m);
+ mgr->txnPending = false;
+ free(mgr->txnData);
+ mgr->txnData = nullptr;
+
+ return 0;
+}
+
+static bool isTxnPending() {
+ txnManager_s *mgr = &db.txnManager;
+ std::lock_guard<std::mutex>lock(mgr->m);
+ return mgr->txnPending;
+}
+
+static int fetchTxnData(hub_messages_e *id, void **data) {
+ txnManager_s *mgr = &db.txnManager;
+
+ if (!id || !data) {
+ ALOGW("Null params id %p, data %p", id, data);
+ return -1;
+ }
+
+ std::lock_guard<std::mutex>lock(mgr->m);
+ if (!mgr->txnPending) {
+ ALOGW("No Transactions pending");
+ return -1;
+ }
+
+ // else
+ *id = mgr->txnIdentifier;
+ *data = mgr->txnData;
+ return 0;
+}
+
int context_hub_callback(uint32_t hubId, const struct hub_message_t *msg,
void *cookie);
@@ -152,13 +259,21 @@
}
}
-static int get_hub_id_for_app_instance(int id) {
+static int get_hub_handle_for_app_instance(int id) {
if (!db.appInstances.count(id)) {
ALOGD("%s: Cannot find app for app instance %d", __FUNCTION__, id);
return -1;
}
- int hubHandle = db.appInstances[id].hubHandle;
+ return db.appInstances[id].hubHandle;
+}
+
+static int get_hub_id_for_app_instance(int id) {
+ int hubHandle = get_hub_handle_for_app_instance(id);
+
+ if (hubHandle < 0) {
+ return -1;
+ }
return db.hubInfo.hubs[hubHandle].hub_id;
}
@@ -184,29 +299,41 @@
return 0;
}
-static void send_query_for_apps() {
+static void query_hub_for_apps(uint64_t appId, uint32_t hubHandle) {
hub_message_t msg;
+ query_apps_request_t queryMsg;
+
+ queryMsg.app_name.id = NANOAPP_VENDOR_ALL_APPS;
msg.message_type = CONTEXT_HUB_QUERY_APPS;
- msg.message_len = 0;
+ msg.message_len = sizeof(queryMsg);
+ msg.message = &queryMsg;
+ ALOGD("Sending query for apps to hub %" PRIu32, hubHandle);
+ set_os_app_as_destination(&msg, hubHandle);
+ if (send_msg_to_hub(&msg, hubHandle) != 0) {
+ ALOGW("Could not query hub %" PRIu32 " for apps", hubHandle);
+ }
+}
+
+static void sendQueryForApps(uint64_t appId) {
for (int i = 0; i < db.hubInfo.numHubs; i++ ) {
- ALOGD("Sending query for apps to hub %d", i);
- set_os_app_as_destination(&msg, i);
- if (send_msg_to_hub(&msg, i) != 0) {
- ALOGW("Could not query hub %i for apps", i);
- }
+ query_hub_for_apps(appId, i);
}
}
static int return_id(int id) {
// Note : This method is not thread safe.
- // id returned is guarenteed to be in use
- db.freeIds.push(id);
- return 0;
+ // id returned is guaranteed to be in use
+ if (id >= 0) {
+ db.freeIds.push(id);
+ return 0;
+ }
+
+ return -1;
}
-static int generate_id(void) {
+static int generate_id() {
// Note : This method is not thread safe.
int retVal = -1;
@@ -218,23 +345,31 @@
return retVal;
}
-int add_app_instance(const hub_app_info *appInfo, uint32_t hubHandle, JNIEnv *env) {
+
+static int add_app_instance(const hub_app_info *appInfo, uint32_t hubHandle,
+ int appInstanceHandle, JNIEnv *env) {
+
+ ALOGI("Loading App");
+
// Not checking if the apps are indeed distinct
app_instance_info_s entry;
- int appInstanceHandle = generate_id();
-
assert(appInfo);
- if (appInstanceHandle < 0) {
- ALOGE("Cannot find resources to add app instance %d",
- appInstanceHandle);
- return -1;
+ if (db.appInstances.count(appInstanceHandle) == 0) {
+ appInstanceHandle = generate_id();
+ if (appInstanceHandle < 0) {
+ ALOGE("Cannot find resources to add app instance %d",
+ appInstanceHandle);
+ return -1;
+ }
}
entry.appInfo = *appInfo;
+
entry.instanceId = appInstanceHandle;
entry.truncName = appInfo->app_name.id;
entry.hubHandle = hubHandle;
+
db.appInstances[appInstanceHandle] = entry;
// Finally - let the service know of this app instance
@@ -250,17 +385,70 @@
return appInstanceHandle;
}
-int delete_app_instance(int id) {
+int delete_app_instance(int id, JNIEnv *env) {
if (!db.appInstances.count(id)) {
+ ALOGW("Cannot find App id : %d", id);
return -1;
}
return_id(id);
db.appInstances.erase(id);
+ if (env->CallIntMethod(db.jniInfo.jContextHubService,
+ db.jniInfo.contextHubServiceDeleteAppInstance,
+ id) != 0) {
+ ALOGW("Could not delete App id : %d", id);
+ return -1;
+ }
+
+ ALOGI("Deleted App id : %d", id);
return 0;
}
+static int startLoadAppTxn(uint64_t appId, int hubHandle) {
+ app_instance_info_s *txnInfo = (app_instance_info_s *)malloc(sizeof(app_instance_info_s));
+ int instanceId = generate_id();
+
+ if (!txnInfo || instanceId < 0) {
+ return_id(instanceId);
+ free(txnInfo);
+ return -1;
+ }
+
+ txnInfo->truncName = appId;
+ txnInfo->hubHandle = hubHandle;
+ txnInfo->instanceId = instanceId;
+
+ txnInfo->appInfo.app_name.id = appId;
+ txnInfo->appInfo.num_mem_ranges = 0;
+ txnInfo->appInfo.version = -1; // Awaited
+
+ if (addTxn(CONTEXT_HUB_LOAD_APP, txnInfo) != 0) {
+ return_id(instanceId);
+ free(txnInfo);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int startUnloadAppTxn(uint32_t appInstanceHandle) {
+ uint32_t *txnData = (uint32_t *) malloc(sizeof(uint32_t));
+ if (!txnData) {
+ ALOGW("Cannot allocate memory to start unload transaction");
+ return -1;
+ }
+
+ *txnData = appInstanceHandle;
+
+ if (addTxn(CONTEXT_HUB_UNLOAD_APP, txnData) != 0) {
+ free(txnData);
+ ALOGW("Cannot start transaction to unload app");
+ return -1;
+ }
+
+ return 0;
+}
static void initContextHubService() {
int err = 0;
@@ -281,6 +469,7 @@
db.freeIds.push(i);
}
+ initTxnManager();
if (db.hubInfo.contextHubModule) {
int retNumHubs = db.hubInfo.contextHubModule->get_hubs(db.hubInfo.contextHubModule,
&db.hubInfo.hubs);
@@ -298,6 +487,7 @@
for (i = 0; i < db.hubInfo.numHubs; i++) {
db.hubInfo.cookies[i] = db.hubInfo.hubs[i].hub_id;
+ ALOGI("Subscribing to hubHandle %d with OS App name %" PRIu64, i, db.hubInfo.hubs[i].os_app_name.id);
if (db.hubInfo.contextHubModule->subscribe_messages(db.hubInfo.hubs[i].hub_id,
context_hub_callback,
&db.hubInfo.cookies[i]) == 0) {
@@ -305,7 +495,7 @@
}
}
- send_query_for_apps();
+ sendQueryForApps(ALL_APPS);
} else {
ALOGW("No Context Hub Module present");
}
@@ -342,7 +532,8 @@
return ret;
}
-int handle_query_apps_response(char *msg, int msgLen, uint32_t hubHandle) {
+int handle_query_apps_response(const uint8_t *msg, int msgLen,
+ uint32_t hubHandle) {
JNIEnv *env;
if ((db.jniInfo.vm)->AttachCurrentThread(&env, nullptr) != JNI_OK) {
return -1;
@@ -350,53 +541,202 @@
int numApps = msgLen/sizeof(hub_app_info);
hub_app_info info;
- hub_app_info *unalignedInfoAddr = (hub_app_info*)msg;
+ const hub_app_info *unalignedInfoAddr = (const hub_app_info*)msg;
for (int i = 0; i < numApps; i++, unalignedInfoAddr++) {
memcpy(&info, unalignedInfoAddr, sizeof(info));
- add_app_instance(&info, hubHandle, env);
+ // We will only have one instance of the app
+ // TODO : Change this logic once we support multiple instances of the same app
+ int appInstance = get_app_instance_for_app_id(info.app_name.id);
+ add_app_instance(&info, hubHandle, appInstance, env);
}
return 0;
}
+static void passOnOsResponse(uint32_t hubHandle, uint32_t msgType,
+ status_response_t *rsp, int8_t *additionalData,
+ size_t additionalDataLen) {
+ JNIEnv *env;
-int handle_os_message(uint32_t msgType, uint32_t hubHandle,
- char *msg, int msgLen) {
- int retVal;
+ if ((db.jniInfo.vm)->AttachCurrentThread(&env, nullptr) != JNI_OK) {
+ ALOGW("Cannot latch to JNI env, dropping OS response %" PRIu32, msgType);
+ return;
+ }
- //ALOGD("Rcd OS message from hubHandle %" PRIu32 " type %" PRIu32 " length %d",
- // hubHandle, msgType, msgLen);
+ uint32_t header[MSG_HEADER_SIZE];
+ memset(header, 0, sizeof(header));
+
+ if (!additionalData) {
+ additionalDataLen = 0; // clamp
+ }
+ int msgLen = 1 + additionalDataLen;
+
+ int8_t *msg = new int8_t[msgLen];
+
+ if (!msg) {
+ ALOGW("Unexpected : Ran out of memory, cannot send response");
+ return;
+ }
+
+ header[HEADER_FIELD_MSG_TYPE] = msgType;
+ header[HEADER_FIELD_MSG_VERSION] = 0;
+ header[HEADER_FIELD_HUB_HANDLE] = hubHandle;
+ header[HEADER_FIELD_APP_INSTANCE] = OS_APP_ID;
+
+ msg[0] = rsp->result;
+
+ if (additionalData) {
+ memcpy(&msg[1], additionalData, additionalDataLen);
+ }
+
+ jbyteArray jmsg = env->NewByteArray(msgLen);
+ jintArray jheader = env->NewIntArray(sizeof(header));
+
+ env->SetByteArrayRegion(jmsg, 0, msgLen, (jbyte *)msg);
+ env->SetIntArrayRegion(jheader, 0, sizeof(header), (jint *)header);
+
+ ALOGI("Passing msg type %" PRIu32 " from app %" PRIu32 " from hub %" PRIu32,
+ header[HEADER_FIELD_MSG_TYPE], header[HEADER_FIELD_APP_INSTANCE],
+ header[HEADER_FIELD_HUB_HANDLE]);
+
+ env->CallIntMethod(db.jniInfo.jContextHubService,
+ db.jniInfo.contextHubServiceMsgReceiptCallback,
+ jheader, jmsg);
+
+ delete[] msg;
+}
+
+void closeUnloadTxn(bool success) {
+ void *txnData = nullptr;
+ hub_messages_e txnId;
+
+ if (success && fetchTxnData(&txnId, &txnData) == 0 &&
+ txnId == CONTEXT_HUB_UNLOAD_APP) {
+ db.appInstances.erase(*(uint32_t *)txnData);
+ } else {
+ ALOGW("Could not unload the app successfully ! success %d, txnData %p", success, txnData);
+ }
+
+ closeTxn();
+}
+
+void closeLoadTxn(bool success, int *appInstanceHandle) {
+ void *txnData;
+ hub_messages_e txnId;
+
+ if (success && fetchTxnData(&txnId, &txnData) == 0 &&
+ txnId == CONTEXT_HUB_LOAD_APP) {
+ app_instance_info_s *info = (app_instance_info_s *)txnData;
+ *appInstanceHandle = info->instanceId;
+
+ JNIEnv *env;
+ if ((db.jniInfo.vm)->AttachCurrentThread(&env, nullptr) == JNI_OK) {
+ add_app_instance(&info->appInfo, info->hubHandle, info->instanceId, env);
+ } else {
+ ALOGW("Could not attach to JVM !");
+ }
+ sendQueryForApps(info->appInfo.app_name.id);
+ } else {
+ ALOGW("Could not load the app successfully ! Unexpected failure");
+ }
+
+ closeTxn();
+}
+
+static bool isValidOsStatus(const uint8_t *msg, size_t msgLen,
+ status_response_t *rsp) {
+ // Workaround a bug in some HALs
+ if (msgLen == 1) {
+ rsp->result = msg[0];
+ return true;
+ }
+
+ if (!msg || msgLen != sizeof(*rsp)) {
+ ALOGW("Received invalid response %p of size %zu", msg, msgLen);
+ return false;
+ }
+
+ memcpy(rsp, msg, sizeof(*rsp));
+
+ // No sanity checks on return values
+ return true;
+}
+
+static void invalidateNanoApps(uint32_t hubHandle) {
+ JNIEnv *env;
+
+ if ((db.jniInfo.vm)->AttachCurrentThread(&env, nullptr) != JNI_OK) {
+ ALOGW("Could not attach to JVM !");
+ }
+
+ auto end = db.appInstances.end();
+ for (auto current = db.appInstances.begin(); current != end; ) {
+ app_instance_info_s info = current->second;
+ current++;
+ if (info.hubHandle == hubHandle) {
+ delete_app_instance(info.instanceId, env);
+ }
+ }
+}
+
+static int handle_os_message(uint32_t msgType, uint32_t hubHandle,
+ const uint8_t *msg, int msgLen) {
+ int retVal = -1;
+
+ ALOGD("Rcd OS message from hubHandle %" PRIu32 " type %" PRIu32 " length %d",
+ hubHandle, msgType, msgLen);
+
+ struct status_response_t rsp;
switch(msgType) {
- case CONTEXT_HUB_APPS_ENABLE:
- retVal = 0;
- break;
- case CONTEXT_HUB_APPS_DISABLE:
- retVal = 0;
- break;
+ case CONTEXT_HUB_APPS_ENABLE:
+ case CONTEXT_HUB_APPS_DISABLE:
+ case CONTEXT_HUB_LOAD_APP:
+ case CONTEXT_HUB_UNLOAD_APP:
+ if (isValidOsStatus(msg, msgLen, &rsp)) {
+ if (msgType == CONTEXT_HUB_LOAD_APP) {
+ int appInstanceHandle;
+ closeLoadTxn(rsp.result == 0, &appInstanceHandle);
+ passOnOsResponse(hubHandle, msgType, &rsp, (int8_t *)(&appInstanceHandle),
+ sizeof(appInstanceHandle));
+ } else if (msgType == CONTEXT_HUB_UNLOAD_APP) {
+ closeUnloadTxn(rsp.result == 0);
+ passOnOsResponse(hubHandle, msgType, &rsp, nullptr, 0);
+ } else {
+ passOnOsResponse(hubHandle, msgType, &rsp, nullptr, 0);
+ }
+ retVal = 0;
+ }
+ break;
- case CONTEXT_HUB_LOAD_APP:
- retVal = 0;
- break;
+ case CONTEXT_HUB_QUERY_APPS:
+ rsp.result = 0;
+ retVal = handle_query_apps_response(msg, msgLen, hubHandle);
+ passOnOsResponse(hubHandle, msgType, &rsp, nullptr, 0);
+ break;
- case CONTEXT_HUB_UNLOAD_APP:
- retVal = 0;
- break;
+ case CONTEXT_HUB_QUERY_MEMORY:
+ // Deferring this use
+ retVal = 0;
+ break;
- case CONTEXT_HUB_QUERY_APPS:
- retVal = handle_query_apps_response(msg, msgLen, hubHandle);
- break;
+ case CONTEXT_HUB_OS_REBOOT:
+ if (isValidOsStatus(msg, msgLen, &rsp)) {
+ rsp.result = 0;
+ ALOGW("Context Hub handle %d restarted", hubHandle);
+ closeTxn();
+ passOnOsResponse(hubHandle, msgType, &rsp, nullptr, 0);
+ invalidateNanoApps(hubHandle);
+ query_hub_for_apps(ALL_APPS, hubHandle);
+ retVal = 0;
+ }
+ break;
- case CONTEXT_HUB_QUERY_MEMORY:
- retVal = 0;
- break;
-
- default:
- retVal = -1;
- break;
-
+ default:
+ retVal = -1;
+ break;
}
return retVal;
@@ -416,10 +756,12 @@
}
}
+
int context_hub_callback(uint32_t hubId,
const struct hub_message_t *msg,
void *cookie) {
if (!msg) {
+ ALOGW("NULL message");
return -1;
}
if (!sanity_check_cookie(cookie, hubId)) {
@@ -429,11 +771,12 @@
return -1;
}
+
uint32_t messageType = msg->message_type;
uint32_t hubHandle = *(uint32_t*) cookie;
if (messageType < CONTEXT_HUB_TYPE_PRIVATE_MSG_BASE) {
- handle_os_message(messageType, hubHandle, (char*) msg->message, msg->message_len);
+ handle_os_message(messageType, hubHandle, (uint8_t*) msg->message, msg->message_len);
} else {
int appHandle = get_app_instance_for_app_id(msg->app_name.id);
if (appHandle < 0) {
@@ -524,7 +867,9 @@
env->GetMethodID(db.jniInfo.contextHubServiceClass,
"addAppInstance", "(IIJI)I");
-
+ db.jniInfo.contextHubServiceDeleteAppInstance =
+ env->GetMethodID(db.jniInfo.contextHubServiceClass,
+ "deleteAppInstance", "(I)I");
return 0;
}
@@ -534,8 +879,6 @@
jintArray jintBuf;
jobjectArray jmemBuf;
- int dummyConnectedSensors[] = {1, 2, 3, 4, 5};
-
jobject jHub = env->NewObject(db.jniInfo.contextHubInfoClass,
db.jniInfo.contextHubInfoCtor);
env->CallVoidMethod(jHub, db.jniInfo.contextHubInfoSetId, hub->hub_id);
@@ -565,11 +908,21 @@
hub->max_supported_msg_len);
- // TODO : jintBuf = env->NewIntArray(hub->num_connected_sensors);
- // TODO : env->SetIntArrayRegion(jintBuf, 0, hub->num_connected_sensors,
- // hub->connected_sensors);
- jintBuf = env->NewIntArray(array_length(dummyConnectedSensors));
- env->SetIntArrayRegion(jintBuf, 0, hub->num_connected_sensors, dummyConnectedSensors);
+ jintBuf = env->NewIntArray(hub->num_connected_sensors);
+ int *connectedSensors = new int[hub->num_connected_sensors];
+
+ if (!connectedSensors) {
+ ALOGW("Cannot allocate memory! Unexpected");
+ assert(false);
+ } else {
+ for (unsigned int i = 0; i < hub->num_connected_sensors; i++) {
+ connectedSensors[i] = hub->connected_sensors[i].sensor_id;
+ }
+ }
+
+ env->SetIntArrayRegion(jintBuf, 0, hub->num_connected_sensors,
+ connectedSensors);
+
env->CallVoidMethod(jHub, db.jniInfo.contextHubInfoSetSupportedSensors, jintBuf);
env->DeleteLocalRef(jintBuf);
@@ -580,6 +933,7 @@
env->DeleteLocalRef(jmemBuf);
+ delete[] connectedSensors;
return jHub;
}
@@ -618,33 +972,98 @@
jbyte *data = env->GetByteArrayElements(data_, 0);
int dataBufferLength = env->GetArrayLength(data_);
+ if (numHeaderElements < MSG_HEADER_SIZE) {
+ ALOGW("Malformed header len");
+ return -1;
+ }
- if (numHeaderElements >= MSG_HEADER_SIZE) {
- bool setAddressSuccess;
- int hubId;
- hub_message_t msg;
+ uint32_t appInstanceHandle = header[HEADER_FIELD_APP_INSTANCE];
+ uint32_t msgType = header[HEADER_FIELD_MSG_TYPE];
+ int hubHandle = -1;
+ int hubId;
+ uint64_t appId;
+
+ if (msgType == CONTEXT_HUB_UNLOAD_APP) {
+ hubHandle = get_hub_handle_for_app_instance(appInstanceHandle);
+ } else if (msgType == CONTEXT_HUB_LOAD_APP) {
+ if (numHeaderElements < MSG_HEADER_SIZE_LOAD_APP) {
+ return -1;
+ }
+ uint64_t appIdLo = header[HEADER_FIELD_LOAD_APP_ID_LO];
+ uint64_t appIdHi = header[HEADER_FIELD_LOAD_APP_ID_HI];
+ appId = appIdHi << 32 | appIdLo;
+
+ hubHandle = header[HEADER_FIELD_HUB_HANDLE];
+ } else {
+ hubHandle = header[HEADER_FIELD_HUB_HANDLE];
+ }
+
+ if (hubHandle < 0) {
+ ALOGD("Invalid hub Handle %d", hubHandle);
+ return -1;
+ }
+
+ if (msgType == CONTEXT_HUB_LOAD_APP ||
+ msgType == CONTEXT_HUB_UNLOAD_APP) {
+
+ if (isTxnPending()) {
+ ALOGW("Cannot load or unload app while a transaction is pending !");
+ return -1;
+ }
+
+ if (msgType == CONTEXT_HUB_LOAD_APP) {
+ if (startLoadAppTxn(appId, hubHandle) != 0) {
+ ALOGW("Cannot Start Load Transaction");
+ return -1;
+ }
+ } else if (msgType == CONTEXT_HUB_UNLOAD_APP) {
+ if (startUnloadAppTxn(appInstanceHandle) != 0) {
+ ALOGW("Cannot Start UnLoad Transaction");
+ return -1;
+ }
+ }
+ }
+
+ bool setAddressSuccess = false;
+ hub_message_t msg;
+
+ msg.message_type = msgType;
+
+ if (msgType == CONTEXT_HUB_UNLOAD_APP) {
+ msg.message_len = sizeof(db.appInstances[appInstanceHandle].appInfo.app_name);
+ msg.message = &db.appInstances[appInstanceHandle].appInfo.app_name;
+ setAddressSuccess = (set_os_app_as_destination(&msg, hubHandle) == 0);
+ hubId = get_hub_id_for_hub_handle(hubHandle);
+ } else {
+ msg.message_len = dataBufferLength;
+ msg.message = data;
if (header[HEADER_FIELD_APP_INSTANCE] == OS_APP_ID) {
- setAddressSuccess = (set_os_app_as_destination(&msg, header[HEADER_FIELD_HUB_HANDLE]) == 0);
- hubId = get_hub_id_for_hub_handle(header[HEADER_FIELD_HUB_HANDLE]);
+ setAddressSuccess = (set_os_app_as_destination(&msg, hubHandle) == 0);
+ hubId = get_hub_id_for_hub_handle(hubHandle);
} else {
setAddressSuccess = (set_dest_app(&msg, header[HEADER_FIELD_APP_INSTANCE]) == 0);
hubId = get_hub_id_for_app_instance(header[HEADER_FIELD_APP_INSTANCE]);
}
+ }
- if (setAddressSuccess && hubId >= 0) {
- msg.message_type = header[HEADER_FIELD_MSG_TYPE];
- msg.message_len = dataBufferLength;
- msg.message = data;
- retVal = db.hubInfo.contextHubModule->send_message(hubId, &msg);
- } else {
- ALOGD("Could not find app instance %d on hubHandle %d, setAddress %d",
- header[HEADER_FIELD_APP_INSTANCE],
- header[HEADER_FIELD_HUB_HANDLE],
- (int)setAddressSuccess);
- }
+ if (setAddressSuccess && hubId >= 0) {
+ ALOGD("Asking HAL to remove app");
+ retVal = db.hubInfo.contextHubModule->send_message(hubId, &msg);
} else {
- ALOGD("Malformed header len");
+ ALOGD("Could not find app instance %d on hubHandle %d, setAddress %d",
+ header[HEADER_FIELD_APP_INSTANCE],
+ header[HEADER_FIELD_HUB_HANDLE],
+ (int)setAddressSuccess);
+ }
+
+ if (retVal != 0) {
+ ALOGD("Send Message failure - %d", retVal);
+ if (msgType == CONTEXT_HUB_LOAD_APP) {
+ closeLoadTxn(false, nullptr);
+ } else if (msgType == CONTEXT_HUB_UNLOAD_APP) {
+ closeUnloadTxn(false);
+ }
}
env->ReleaseIntArrayElements(header_, header, 0);
diff --git a/core/jni/android_media_AudioFormat.h b/core/jni/android_media_AudioFormat.h
index 6513304..092aaf6 100644
--- a/core/jni/android_media_AudioFormat.h
+++ b/core/jni/android_media_AudioFormat.h
@@ -20,18 +20,20 @@
#include <system/audio.h>
// keep these values in sync with AudioFormat.java
-#define ENCODING_PCM_16BIT 2
-#define ENCODING_PCM_8BIT 3
-#define ENCODING_PCM_FLOAT 4
-#define ENCODING_AC3 5
-#define ENCODING_E_AC3 6
-#define ENCODING_DTS 7
-#define ENCODING_DTS_HD 8
-#define ENCODING_MP3 9
-#define ENCODING_AAC_LC 10
-#define ENCODING_AAC_HE_V1 11
-#define ENCODING_AAC_HE_V2 12
-#define ENCODING_IEC61937 13
+#define ENCODING_PCM_16BIT 2
+#define ENCODING_PCM_8BIT 3
+#define ENCODING_PCM_FLOAT 4
+#define ENCODING_AC3 5
+#define ENCODING_E_AC3 6
+#define ENCODING_DTS 7
+#define ENCODING_DTS_HD 8
+#define ENCODING_MP3 9
+#define ENCODING_AAC_LC 10
+#define ENCODING_AAC_HE_V1 11
+#define ENCODING_AAC_HE_V2 12
+#define ENCODING_IEC61937 13
+#define ENCODING_DOLBY_TRUEHD 14
+
#define ENCODING_INVALID 0
#define ENCODING_DEFAULT 1
@@ -65,6 +67,8 @@
return AUDIO_FORMAT_AAC_HE_V1;
case ENCODING_AAC_HE_V2:
return AUDIO_FORMAT_AAC_HE_V2;
+ case ENCODING_DOLBY_TRUEHD:
+ return AUDIO_FORMAT_DOLBY_TRUEHD;
case ENCODING_IEC61937:
return AUDIO_FORMAT_IEC61937;
case ENCODING_DEFAULT:
@@ -108,6 +112,8 @@
return ENCODING_AAC_HE_V2;
case AUDIO_FORMAT_IEC61937:
return ENCODING_IEC61937;
+ case AUDIO_FORMAT_DOLBY_TRUEHD:
+ return ENCODING_DOLBY_TRUEHD;
case AUDIO_FORMAT_DEFAULT:
return ENCODING_DEFAULT;
default:
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index f79254d..26a2cf0 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -122,6 +122,99 @@
}
}
+static void android_net_utils_setupRaSocket(JNIEnv *env, jobject clazz, jobject javaFd,
+ jint ifIndex)
+{
+ static const int kLinkLocalHopLimit = 255;
+
+ int fd = jniGetFDFromFileDescriptor(env, javaFd);
+
+ // Set an ICMPv6 filter that only passes Router Solicitations.
+ struct icmp6_filter rs_only;
+ ICMP6_FILTER_SETBLOCKALL(&rs_only);
+ ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &rs_only);
+ socklen_t len = sizeof(rs_only);
+ if (setsockopt(fd, IPPROTO_ICMPV6, ICMP6_FILTER, &rs_only, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "setsockopt(ICMP6_FILTER): %s", strerror(errno));
+ return;
+ }
+
+ // Most/all of the rest of these options can be set via Java code, but
+ // because we're here on account of setting an icmp6_filter go ahead
+ // and do it all natively for now.
+ //
+ // TODO: Consider moving these out to Java.
+
+ // Set the multicast hoplimit to 255 (link-local only).
+ int hops = kLinkLocalHopLimit;
+ len = sizeof(hops);
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &hops, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "setsockopt(IPV6_MULTICAST_HOPS): %s", strerror(errno));
+ return;
+ }
+
+ // Set the unicast hoplimit to 255 (link-local only).
+ hops = kLinkLocalHopLimit;
+ len = sizeof(hops);
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hops, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "setsockopt(IPV6_UNICAST_HOPS): %s", strerror(errno));
+ return;
+ }
+
+ // Explicitly disable multicast loopback.
+ int off = 0;
+ len = sizeof(off);
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &off, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "setsockopt(IPV6_MULTICAST_LOOP): %s", strerror(errno));
+ return;
+ }
+
+ // Specify the IPv6 interface to use for outbound multicast.
+ len = sizeof(ifIndex);
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifIndex, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "setsockopt(IPV6_MULTICAST_IF): %s", strerror(errno));
+ return;
+ }
+
+ // Additional options to be considered:
+ // - IPV6_TCLASS
+ // - IPV6_RECVPKTINFO
+ // - IPV6_RECVHOPLIMIT
+
+ // Bind to [::].
+ const struct sockaddr_in6 sin6 = {
+ .sin6_family = AF_INET6,
+ .sin6_port = 0,
+ .sin6_flowinfo = 0,
+ .sin6_addr = IN6ADDR_ANY_INIT,
+ .sin6_scope_id = 0,
+ };
+ auto sa = reinterpret_cast<const struct sockaddr *>(&sin6);
+ len = sizeof(sin6);
+ if (bind(fd, sa, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "bind(IN6ADDR_ANY): %s", strerror(errno));
+ return;
+ }
+
+ // Join the all-routers multicast group, ff02::2%index.
+ struct ipv6_mreq all_rtrs = {
+ .ipv6mr_multiaddr = {{{0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2}}},
+ .ipv6mr_interface = ifIndex,
+ };
+ len = sizeof(all_rtrs);
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &all_rtrs, len) != 0) {
+ jniThrowExceptionFmt(env, "java/net/SocketException",
+ "setsockopt(IPV6_JOIN_GROUP): %s", strerror(errno));
+ return;
+ }
+}
+
static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId)
{
return (jboolean) !setNetworkForProcess(netId);
@@ -170,6 +263,7 @@
{ "queryUserAccess", "(II)Z", (void*)android_net_utils_queryUserAccess },
{ "attachDhcpFilter", "(Ljava/io/FileDescriptor;)V", (void*) android_net_utils_attachDhcpFilter },
{ "attachRaFilter", "(Ljava/io/FileDescriptor;I)V", (void*) android_net_utils_attachRaFilter },
+ { "setupRaSocket", "(Ljava/io/FileDescriptor;I)V", (void*) android_net_utils_setupRaSocket },
};
int register_android_net_NetworkUtils(JNIEnv* env)
diff --git a/core/jni/android_os_SystemClock.cpp b/core/jni/android_os_SystemClock.cpp
index d98407d..ccb833a 100644
--- a/core/jni/android_os_SystemClock.cpp
+++ b/core/jni/android_os_SystemClock.cpp
@@ -106,17 +106,17 @@
*/
static const JNINativeMethod gMethods[] = {
/* name, signature, funcPtr */
- { "uptimeMillis", "()J",
+ { "uptimeMillis", "!()J",
(void*) android_os_SystemClock_uptimeMillis },
- { "elapsedRealtime", "()J",
+ { "elapsedRealtime", "!()J",
(void*) android_os_SystemClock_elapsedRealtime },
- { "currentThreadTimeMillis", "()J",
+ { "currentThreadTimeMillis", "!()J",
(void*) android_os_SystemClock_currentThreadTimeMillis },
- { "currentThreadTimeMicro", "()J",
+ { "currentThreadTimeMicro", "!()J",
(void*) android_os_SystemClock_currentThreadTimeMicro },
- { "currentTimeMicro", "()J",
+ { "currentTimeMicro", "!()J",
(void*) android_os_SystemClock_currentTimeMicro },
- { "elapsedRealtimeNanos", "()J",
+ { "elapsedRealtimeNanos", "!()J",
(void*) android_os_SystemClock_elapsedRealtimeNano },
};
int register_android_os_SystemClock(JNIEnv* env)
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 3d952b0..7487619 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -546,10 +546,8 @@
env->ReleaseStringCritical(name, str);
}
- if (name8.size() > 0) {
- const char* procName = name8.string();
- set_process_name(procName);
- AndroidRuntime::getRuntime()->setArgv0(procName);
+ if (!name8.isEmpty()) {
+ AndroidRuntime::getRuntime()->setArgv0(name8.string(), true /* setProcName */);
}
}
diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp
index d6f9db5..edc0da3 100644
--- a/core/jni/android_view_DisplayListCanvas.cpp
+++ b/core/jni/android_view_DisplayListCanvas.cpp
@@ -199,22 +199,6 @@
}
// ----------------------------------------------------------------------------
-// Common
-// ----------------------------------------------------------------------------
-
-static jboolean android_view_DisplayListCanvas_isAvailable(JNIEnv* env, jobject clazz) {
- char prop[PROPERTY_VALUE_MAX];
- if (property_get("ro.kernel.qemu", prop, NULL) == 0) {
- // not in the emulator
- return JNI_TRUE;
- }
- // In the emulator this property will be set > 0 when OpenGL ES 2.0 is
- // enabled, 0 otherwise. On old emulator versions it will be undefined.
- property_get("qemu.gles", prop, "0");
- return atoi(prop) > 0 ? JNI_TRUE : JNI_FALSE;
-}
-
-// ----------------------------------------------------------------------------
// Logging
// ----------------------------------------------------------------------------
@@ -231,7 +215,6 @@
const char* const kClassPathName = "android/view/DisplayListCanvas";
static JNINativeMethod gMethods[] = {
- { "nIsAvailable", "!()Z", (void*) android_view_DisplayListCanvas_isAvailable },
{ "nInsertReorderBarrier","!(JZ)V", (void*) android_view_DisplayListCanvas_insertReorderBarrier },
{ "nCallDrawGLFunction", "!(JJLjava/lang/Runnable;)V",
diff --git a/core/jni/android_view_HardwareLayer.cpp b/core/jni/android_view_HardwareLayer.cpp
index 6b774e8..4e0b924 100644
--- a/core/jni/android_view_HardwareLayer.cpp
+++ b/core/jni/android_view_HardwareLayer.cpp
@@ -32,7 +32,6 @@
#include <SkXfermode.h>
#include <DeferredLayerUpdater.h>
-#include <LayerRenderer.h>
#include <SkiaShader.h>
#include <Rect.h>
#include <RenderNode.h>
diff --git a/core/jni/android_view_RenderNode.cpp b/core/jni/android_view_RenderNode.cpp
index 4fc546c..b0028e1 100644
--- a/core/jni/android_view_RenderNode.cpp
+++ b/core/jni/android_view_RenderNode.cpp
@@ -573,8 +573,9 @@
bounds.roundOut();
}
+ incStrong(0);
auto functor = std::bind(
- std::mem_fn(&SurfaceViewPositionUpdater::doUpdatePosition), this,
+ std::mem_fn(&SurfaceViewPositionUpdater::doUpdatePositionAsync), this,
(jlong) info.canvasContext.getFrameNumber(),
(jint) bounds.left, (jint) bounds.top,
(jint) bounds.right, (jint) bounds.bottom);
@@ -585,15 +586,18 @@
virtual void onPositionLost(RenderNode& node, const TreeInfo* info) override {
if (CC_UNLIKELY(!mWeakRef || (info && !info->updateWindowPositions))) return;
- if (info) {
- auto functor = std::bind(
- std::mem_fn(&SurfaceViewPositionUpdater::doNotifyPositionLost), this,
- (jlong) info->canvasContext.getFrameNumber());
-
- info->canvasContext.enqueueFrameWork(std::move(functor));
- } else {
- doNotifyPositionLost(0);
+ ATRACE_NAME("SurfaceView position lost");
+ JNIEnv* env = jnienv();
+ jobject localref = env->NewLocalRef(mWeakRef);
+ if (CC_UNLIKELY(!localref)) {
+ jnienv()->DeleteWeakGlobalRef(mWeakRef);
+ mWeakRef = nullptr;
+ return;
}
+
+ env->CallVoidMethod(localref, gSurfaceViewPositionLostMethod,
+ info ? info->canvasContext.getFrameNumber() : 0);
+ env->DeleteLocalRef(localref);
}
private:
@@ -605,36 +609,23 @@
return env;
}
- void doUpdatePosition(jlong frameNumber, jint left, jint top,
+ void doUpdatePositionAsync(jlong frameNumber, jint left, jint top,
jint right, jint bottom) {
ATRACE_NAME("Update SurfaceView position");
JNIEnv* env = jnienv();
jobject localref = env->NewLocalRef(mWeakRef);
if (CC_UNLIKELY(!localref)) {
- jnienv()->DeleteWeakGlobalRef(mWeakRef);
+ env->DeleteWeakGlobalRef(mWeakRef);
mWeakRef = nullptr;
- return;
+ } else {
+ env->CallVoidMethod(localref, gSurfaceViewPositionUpdateMethod,
+ frameNumber, left, top, right, bottom);
+ env->DeleteLocalRef(localref);
}
- env->CallVoidMethod(localref, gSurfaceViewPositionUpdateMethod,
- frameNumber, left, top, right, bottom);
- env->DeleteLocalRef(localref);
- }
-
- void doNotifyPositionLost(jlong frameNumber) {
- ATRACE_NAME("SurfaceView position lost");
-
- JNIEnv* env = jnienv();
- jobject localref = env->NewLocalRef(mWeakRef);
- if (CC_UNLIKELY(!localref)) {
- jnienv()->DeleteWeakGlobalRef(mWeakRef);
- mWeakRef = nullptr;
- return;
- }
-
- env->CallVoidMethod(localref, gSurfaceViewPositionLostMethod, frameNumber);
- env->DeleteLocalRef(localref);
+ // We need to release ourselves here
+ decStrong(0);
}
JavaVM* mVm;
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index 50e982f..5637dbc 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -504,7 +504,7 @@
ContextFactory factory;
RenderProxy* proxy = new RenderProxy(false, rootNode, &factory);
proxy->loadSystemProperties();
- proxy->setSwapBehavior(kSwap_discardBuffer);
+ proxy->setSwapBehavior(SwapBehavior::kSwap_discardBuffer);
proxy->initialize(surface);
// Shadows can't be used via this interface, so just set the light source
// to all 0s.
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index fa1313b..0d8a95c 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -32,6 +32,7 @@
#include <jni.h>
#include <memory>
#include <stdio.h>
+#include <system/graphics.h>
#include <ui/DisplayInfo.h>
#include <ui/HdrCapabilities.h>
#include <ui/FrameStats.h>
@@ -58,7 +59,6 @@
jfieldID secure;
jfieldID appVsyncOffsetNanos;
jfieldID presentationDeadlineNanos;
- jfieldID colorTransform;
} gPhysicalDisplayInfoClassInfo;
static struct {
@@ -429,8 +429,6 @@
info.appVsyncOffset);
env->SetLongField(infoObj, gPhysicalDisplayInfoClassInfo.presentationDeadlineNanos,
info.presentationDeadline);
- env->SetIntField(infoObj, gPhysicalDisplayInfoClassInfo.colorTransform,
- info.colorTransform);
env->SetObjectArrayElement(configArray, static_cast<jsize>(c), infoObj);
env->DeleteLocalRef(infoObj);
}
@@ -451,6 +449,43 @@
return err == NO_ERROR ? JNI_TRUE : JNI_FALSE;
}
+static jintArray nativeGetDisplayColorModes(JNIEnv* env, jclass, jobject tokenObj) {
+ sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
+ if (token == NULL) return NULL;
+ Vector<android_color_mode_t> colorModes;
+ if (SurfaceComposerClient::getDisplayColorModes(token, &colorModes) != NO_ERROR ||
+ colorModes.isEmpty()) {
+ return NULL;
+ }
+
+ jintArray colorModesArray = env->NewIntArray(colorModes.size());
+ if (colorModesArray == NULL) {
+ jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
+ return NULL;
+ }
+ jint* colorModesArrayValues = env->GetIntArrayElements(colorModesArray, 0);
+ for (size_t i = 0; i < colorModes.size(); i++) {
+ colorModesArrayValues[i] = static_cast<jint>(colorModes[i]);
+ }
+ env->ReleaseIntArrayElements(colorModesArray, colorModesArrayValues, 0);
+ return colorModesArray;
+}
+
+static jint nativeGetActiveColorMode(JNIEnv* env, jclass, jobject tokenObj) {
+ sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
+ if (token == NULL) return -1;
+ return static_cast<jint>(SurfaceComposerClient::getActiveColorMode(token));
+}
+
+static jboolean nativeSetActiveColorMode(JNIEnv* env, jclass,
+ jobject tokenObj, jint colorMode) {
+ sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
+ if (token == NULL) return JNI_FALSE;
+ status_t err = SurfaceComposerClient::setActiveColorMode(token,
+ static_cast<android_color_mode_t>(colorMode));
+ return err == NO_ERROR ? JNI_TRUE : JNI_FALSE;
+}
+
static void nativeSetDisplayPowerMode(JNIEnv* env, jclass clazz, jobject tokenObj, jint mode) {
sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
if (token == NULL) return;
@@ -715,6 +750,12 @@
(void*)nativeGetActiveConfig },
{"nativeSetActiveConfig", "(Landroid/os/IBinder;I)Z",
(void*)nativeSetActiveConfig },
+ {"nativeGetDisplayColorModes", "(Landroid/os/IBinder;)[I",
+ (void*)nativeGetDisplayColorModes},
+ {"nativeGetActiveColorMode", "(Landroid/os/IBinder;)I",
+ (void*)nativeGetActiveColorMode},
+ {"nativeSetActiveColorMode", "(Landroid/os/IBinder;I)Z",
+ (void*)nativeSetActiveColorMode},
{"nativeGetHdrCapabilities", "(Landroid/os/IBinder;)Landroid/view/Display$HdrCapabilities;",
(void*)nativeGetHdrCapabilities },
{"nativeClearContentFrameStats", "(J)Z",
@@ -757,8 +798,6 @@
clazz, "appVsyncOffsetNanos", "J");
gPhysicalDisplayInfoClassInfo.presentationDeadlineNanos = GetFieldIDOrDie(env,
clazz, "presentationDeadlineNanos", "J");
- gPhysicalDisplayInfoClassInfo.colorTransform = GetFieldIDOrDie(env, clazz,
- "colorTransform", "I");
jclass rectClazz = FindClassOrDie(env, "android/graphics/Rect");
gRectClassInfo.bottom = GetFieldIDOrDie(env, rectClazz, "bottom", "I");
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp
index a747167..a5c9d54 100644
--- a/core/jni/android_view_ThreadedRenderer.cpp
+++ b/core/jni/android_view_ThreadedRenderer.cpp
@@ -188,13 +188,21 @@
virtual void prepareTree(TreeInfo& info) override {
info.errorHandler = this;
- for (auto& anim : mVectorDrawableAnimators) {
+ for (auto& anim : mRunningVDAnimators) {
// Assume that the property change in VD from the animators will not be consumed. Mark
// otherwise if the VDs are found in the display list tree. For VDs that are not in
// the display list tree, we stop providing animation pulses by 1) removing them from
// the animation list, 2) post a delayed message to end them at end time so their
// listeners can receive the corresponding callbacks.
anim->getVectorDrawable()->setPropertyChangeWillBeConsumed(false);
+ // Mark the VD dirty so it will damage itself during prepareTree.
+ anim->getVectorDrawable()->markDirty();
+ }
+ if (info.mode == TreeInfo::MODE_FULL) {
+ for (auto &anim : mPausedVDAnimators) {
+ anim->getVectorDrawable()->setPropertyChangeWillBeConsumed(false);
+ anim->getVectorDrawable()->markDirty();
+ }
}
// TODO: This is hacky
info.windowInsetLeft = -stagingProperties().getLeft();
@@ -205,18 +213,6 @@
info.windowInsetLeft = 0;
info.windowInsetTop = 0;
info.errorHandler = nullptr;
-
- for (auto it = mVectorDrawableAnimators.begin(); it != mVectorDrawableAnimators.end();) {
- if (!(*it)->getVectorDrawable()->getPropertyChangeWillBeConsumed()) {
- // Vector Drawable is not in the display list, we should remove this animator from
- // the list and post a delayed message to end the animator.
- detachVectorDrawableAnimator(it->get());
- it = mVectorDrawableAnimators.erase(it);
- } else {
- ++it;
- }
- }
- info.out.hasAnimations |= !mVectorDrawableAnimators.empty();
}
void sendMessage(const sp<MessageHandler>& handler) {
@@ -232,17 +228,18 @@
}
void attachPendingVectorDrawableAnimators() {
- mVectorDrawableAnimators.insert(mPendingVectorDrawableAnimators.begin(),
+ mRunningVDAnimators.insert(mPendingVectorDrawableAnimators.begin(),
mPendingVectorDrawableAnimators.end());
mPendingVectorDrawableAnimators.clear();
}
void detachAnimators() {
// Remove animators from the list and post a delayed message in future to end the animator
- for (auto& anim : mVectorDrawableAnimators) {
+ for (auto& anim : mRunningVDAnimators) {
detachVectorDrawableAnimator(anim.get());
}
- mVectorDrawableAnimators.clear();
+ mRunningVDAnimators.clear();
+ mPausedVDAnimators.clear();
}
void doAttachAnimatingNodes(AnimationContext* context) {
@@ -253,18 +250,92 @@
mPendingAnimatingRenderNodes.clear();
}
- void runVectorDrawableAnimators(AnimationContext* context) {
- for (auto it = mVectorDrawableAnimators.begin(); it != mVectorDrawableAnimators.end();) {
+ // Run VectorDrawable animators after prepareTree.
+ void runVectorDrawableAnimators(AnimationContext* context, TreeInfo& info) {
+ // Push staging.
+ if (info.mode == TreeInfo::MODE_FULL) {
+ pushStagingVectorDrawableAnimators(context);
+ }
+
+ // Run the animators in the running list.
+ for (auto it = mRunningVDAnimators.begin(); it != mRunningVDAnimators.end();) {
if ((*it)->animate(*context)) {
- it = mVectorDrawableAnimators.erase(it);
+ it = mRunningVDAnimators.erase(it);
} else {
- ++it;
+ it++;
+ }
+ }
+
+ // Run the animators in paused list during full sync.
+ if (info.mode == TreeInfo::MODE_FULL) {
+ // During full sync we also need to pulse paused animators, in case their targets
+ // have been added back to the display list. All the animators that passed the
+ // scheduled finish time will be removed from the paused list.
+ for (auto it = mPausedVDAnimators.begin(); it != mPausedVDAnimators.end();) {
+ if ((*it)->animate(*context)) {
+ // Animator has finished, remove from the list.
+ it = mPausedVDAnimators.erase(it);
+ } else {
+ it++;
+ }
+ }
+ }
+
+ // Move the animators with a target not in DisplayList to paused list.
+ for (auto it = mRunningVDAnimators.begin(); it != mRunningVDAnimators.end();) {
+ if (!(*it)->getVectorDrawable()->getPropertyChangeWillBeConsumed()) {
+ // Vector Drawable is not in the display list, we should remove this animator from
+ // the list, put it in the paused list, and post a delayed message to end the
+ // animator.
+ detachVectorDrawableAnimator(it->get());
+ mPausedVDAnimators.insert(*it);
+ it = mRunningVDAnimators.erase(it);
+ } else {
+ it++;
+ }
+ }
+
+ // Move the animators with a target in DisplayList from paused list to running list, and
+ // trim paused list.
+ if (info.mode == TreeInfo::MODE_FULL) {
+ // Check whether any paused animator's target is back in Display List. If so, put the
+ // animator back in the running list.
+ for (auto it = mPausedVDAnimators.begin(); it != mPausedVDAnimators.end();) {
+ if ((*it)->getVectorDrawable()->getPropertyChangeWillBeConsumed()) {
+ mRunningVDAnimators.insert(*it);
+ it = mPausedVDAnimators.erase(it);
+ } else {
+ it++;
+ }
+ }
+ // Trim paused VD animators at full sync, so that when Java loses reference to an
+ // animator, we know we won't be requested to animate it any more, then we remove such
+ // animators from the paused list so they can be properly freed. We also remove the
+ // animators from paused list when the time elapsed since start has exceeded duration.
+ trimPausedVDAnimators(context);
+ }
+
+ info.out.hasAnimations |= !mRunningVDAnimators.empty();
+ }
+
+ void trimPausedVDAnimators(AnimationContext* context) {
+ // Trim paused vector drawable animator list.
+ for (auto it = mPausedVDAnimators.begin(); it != mPausedVDAnimators.end();) {
+ // Remove paused VD animator if no one else is referencing it. Note that animators that
+ // have passed scheduled finish time are removed from list when they are being pulsed
+ // before prepare tree.
+ // TODO: this is a bit hacky, need to figure out a better way to track when the paused
+ // animators should be freed.
+ if ((*it)->getStrongCount() == 1) {
+ it = mPausedVDAnimators.erase(it);
+ } else {
+ it++;
}
}
}
void pushStagingVectorDrawableAnimators(AnimationContext* context) {
- for (auto& anim : mVectorDrawableAnimators) {
+ for (auto& anim : mRunningVDAnimators) {
anim->pushStaging(*context);
}
}
@@ -286,7 +357,15 @@
JavaVM* mVm;
std::vector< sp<RenderNode> > mPendingAnimatingRenderNodes;
std::set< sp<PropertyValuesAnimatorSet> > mPendingVectorDrawableAnimators;
- std::set< sp<PropertyValuesAnimatorSet> > mVectorDrawableAnimators;
+ std::set< sp<PropertyValuesAnimatorSet> > mRunningVDAnimators;
+ // mPausedVDAnimators stores a list of animators that have not yet passed the finish time, but
+ // their VectorDrawable targets are no longer in the DisplayList. We skip these animators when
+ // render thread runs animators independent of UI thread (i.e. RT_ONLY mode). These animators
+ // need to be re-activated once their VD target is added back into DisplayList. Since that could
+ // only happen when we do a full sync, we need to make sure to pulse these paused animators at
+ // full sync. If any animator's VD target is found in DisplayList during a full sync, we move
+ // the animator back to the running list.
+ std::set< sp<PropertyValuesAnimatorSet> > mPausedVDAnimators;
void detachVectorDrawableAnimator(PropertyValuesAnimatorSet* anim) {
if (anim->isInfinite() || !anim->isRunning()) {
// Do not need to post anything if the animation is infinite (i.e. no meaningful
@@ -327,21 +406,12 @@
mRootNode->attachPendingVectorDrawableAnimators();
}
AnimationContext::startFrame(mode);
- // Run VectorDrawable animators in the beginning of the frame instead of during prepareTree,
- // because one VD can be in multiple render nodes' display list. So it's more simple to
- // run them all at once before prepareTree than running them or checking whether they have
- // already ran in each RenderNode. Note that these animators don't damage the RenderNodes.
- // The damaging is done in prepareTree as needed after checking whether a VD has been
- // modified.
- if (mode == TreeInfo::MODE_FULL) {
- mRootNode->pushStagingVectorDrawableAnimators(this);
- }
- mRootNode->runVectorDrawableAnimators(this);
}
// Runs any animations still left in mCurrentFrameAnimations
virtual void runRemainingAnimations(TreeInfo& info) {
AnimationContext::runRemainingAnimations(info);
+ mRootNode->runVectorDrawableAnimators(this, info);
postOnFinishedEvents();
}
@@ -521,6 +591,18 @@
mObserver->decStrong(nullptr);
}
+static jboolean android_view_ThreadedRenderer_supportsOpenGL(JNIEnv* env, jobject clazz) {
+ char prop[PROPERTY_VALUE_MAX];
+ if (property_get("ro.kernel.qemu", prop, NULL) == 0) {
+ // not in the emulator
+ return JNI_TRUE;
+ }
+ // In the emulator this property will be set > 0 when OpenGL ES 2.0 is
+ // enabled, 0 otherwise. On old emulator versions it will be undefined.
+ property_get("qemu.gles", prop, "0");
+ return atoi(prop) > 0 ? JNI_TRUE : JNI_FALSE;
+}
+
static void android_view_ThreadedRenderer_setAtlas(JNIEnv* env, jobject clazz,
jlong proxyPtr, jobject graphicBuffer, jlongArray atlasMapArray) {
sp<GraphicBuffer> buffer = graphicBufferForJavaObject(env, graphicBuffer);
@@ -542,6 +624,12 @@
proxy->setProcessStatsBuffer(fd);
}
+static jint android_view_ThreadedRenderer_getRenderThreadTid(JNIEnv* env, jobject clazz,
+ jlong proxyPtr) {
+ RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
+ return proxy->getRenderThreadTid();
+}
+
static jlong android_view_ThreadedRenderer_createRootRenderNode(JNIEnv* env, jobject clazz) {
RootRenderNode* node = new RootRenderNode(env);
node->incStrong(0);
@@ -855,8 +943,10 @@
const char* const kClassPathName = "android/view/ThreadedRenderer";
static const JNINativeMethod gMethods[] = {
+ { "nSupportsOpenGL", "!()Z", (void*) android_view_ThreadedRenderer_supportsOpenGL },
{ "nSetAtlas", "(JLandroid/view/GraphicBuffer;[J)V", (void*) android_view_ThreadedRenderer_setAtlas },
{ "nSetProcessStatsBuffer", "(JI)V", (void*) android_view_ThreadedRenderer_setProcessStatsBuffer },
+ { "nGetRenderThreadTid", "(J)I", (void*) android_view_ThreadedRenderer_getRenderThreadTid },
{ "nCreateRootRenderNode", "()J", (void*) android_view_ThreadedRenderer_createRootRenderNode },
{ "nCreateProxy", "(ZJ)J", (void*) android_view_ThreadedRenderer_createProxy },
{ "nDeleteProxy", "(J)V", (void*) android_view_ThreadedRenderer_deleteProxy },
diff --git a/core/res/Android.mk b/core/res/Android.mk
index a1bef83..b066929 100644
--- a/core/res/Android.mk
+++ b/core/res/Android.mk
@@ -16,16 +16,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_PACKAGE_NAME := framework-res
LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
-# Tell aapt to create "extending (non-application)" resource IDs,
-# since these resources will be used by many apps.
-LOCAL_AAPT_FLAGS := -x
+# Generate private symbols into the com.android.internal.R class
+# so they are not accessible to 3rd party apps.
LOCAL_AAPT_FLAGS += --private-symbols com.android.internal
-LOCAL_MODULE_TAGS := optional
+# Framework doesn't need versioning since it IS the platform.
+LOCAL_AAPT_FLAGS += --no-auto-version
# Install this alongside the libraries.
LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)
@@ -34,12 +36,4 @@
# PRODUCT-agnostic resource data like IDs and type definitions.
LOCAL_EXPORT_PACKAGE_RESOURCES := true
-# Include resources generated by system RenderScript files.
-framework_GENERATED_SOURCE_DIR := $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)/src
-framework_RenderScript_STAMP_FILE := $(framework_GENERATED_SOURCE_DIR)/RenderScript.stamp
-#LOCAL_RESOURCE_DIR := $(framework_GENERATED_SOURCE_DIR)/renderscript/res $(LOCAL_PATH)/res
-
include $(BUILD_PACKAGE)
-
-# Make sure the system .rs files get compiled before building the package-export.apk.
-# $(resource_export_package): $(framework_RenderScript_STAMP_FILE)
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8750866..3ceba08 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -49,6 +49,7 @@
<protected-broadcast android:name="android.intent.action.PACKAGE_VERIFIED" />
<protected-broadcast android:name="android.intent.action.PACKAGES_SUSPENDED" />
<protected-broadcast android:name="android.intent.action.PACKAGES_UNSUSPENDED" />
+ <protected-broadcast android:name="android.intent.action.ACTION_PREFERRED_ACTIVITY_CHANGED" />
<protected-broadcast android:name="android.intent.action.UID_REMOVED" />
<protected-broadcast android:name="android.intent.action.QUERY_PACKAGE_RESTART" />
<protected-broadcast android:name="android.intent.action.CONFIGURATION_CHANGED" />
@@ -193,6 +194,7 @@
<protected-broadcast android:name="android.btopp.intent.action.OPEN" />
<protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
<protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
+ <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />
<protected-broadcast android:name="com.android.bluetooth.pbap.authchall" />
<protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />
<protected-broadcast android:name="com.android.bluetooth.pbap.authresponse" />
@@ -404,6 +406,9 @@
<protected-broadcast android:name="android.os.action.DISCHARGING" />
<protected-broadcast android:name="android.search.action.SEARCHABLES_CHANGED" />
<protected-broadcast android:name="android.security.STORAGE_CHANGED" />
+ <protected-broadcast android:name="android.security.action.TRUST_STORE_CHANGED" />
+ <protected-broadcast android:name="android.security.action.KEYCHAIN_CHANGED" />
+ <protected-broadcast android:name="android.security.action.KEY_ACCESS_CHANGED" />
<protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_REGISTERED" />
<protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED" />
<protected-broadcast android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
@@ -478,7 +483,7 @@
<protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
<protected-broadcast android:name="com.android.server.pm.DISABLE_QUIET_MODE_AFTER_UNLOCK" />
- <protected-broadcast android:name="com.android.server.am.ACTION_RESET_DEMO" />
+ <protected-broadcast android:name="com.android.server.retaildemo.ACTION_RESET_DEMO" />
<!-- ====================================================================== -->
<!-- RUNTIME PERMISSIONS -->
@@ -1261,6 +1266,11 @@
<permission android:name="android.permission.CONNECTIVITY_INTERNAL"
android:protectionLevel="signature|privileged" />
+ <!-- Allows an internal user to use restricted Networks.
+ @hide -->
+ <permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"
+ android:protectionLevel="signature|privileged" />
+
<!-- Allows a system application to access hardware packet offload capabilities.
@hide -->
<permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD"
@@ -2507,11 +2517,10 @@
<permission android:name="android.permission.CONTROL_WIFI_DISPLAY"
android:protectionLevel="signature" />
- <!-- Allows an application to control the color transforms applied to
- displays system-wide.
+ <!-- Allows an application to control the color modes set for displays system-wide.
<p>Not for use by third-party applications.</p>
@hide -->
- <permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_TRANSFORM"
+ <permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_MODE"
android:protectionLevel="signature" />
<!-- @SystemApi Allows an application to control VPN.
diff --git a/core/res/res/anim/watch_switch_thumb_to_off_animation.xml b/core/res/res/anim/watch_switch_thumb_to_off_animation.xml
new file mode 100644
index 0000000..c300894
--- /dev/null
+++ b/core/res/res/anim/watch_switch_thumb_to_off_animation.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:ordering="sequentially">
+ <objectAnimator
+ android:duration="33"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="49"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="83"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="50"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="33"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+</set>
diff --git a/core/res/res/anim/watch_switch_thumb_to_on_animation.xml b/core/res/res/anim/watch_switch_thumb_to_on_animation.xml
new file mode 100644
index 0000000..c300894
--- /dev/null
+++ b/core/res/res/anim/watch_switch_thumb_to_on_animation.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:ordering="sequentially">
+ <objectAnimator
+ android:duration="33"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="49"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="83"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="50"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+ <objectAnimator
+ android:duration="33"
+ android:interpolator="@android:interpolator/linear"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z"
+ android:valueType="pathType" />
+</set>
diff --git a/core/res/res/color/watch_switch_thumb_color_material.xml b/core/res/res/color/watch_switch_thumb_color_material.xml
new file mode 100644
index 0000000..a931724
--- /dev/null
+++ b/core/res/res/color/watch_switch_thumb_color_material.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="?android:colorAccent" android:state_checked="true" />
+ <item android:color="?android:colorButtonNormal" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/core/res/res/drawable-nodpi/platlogo.xml b/core/res/res/drawable-nodpi/platlogo.xml
index defa83a..516f252 100644
--- a/core/res/res/drawable-nodpi/platlogo.xml
+++ b/core/res/res/drawable-nodpi/platlogo.xml
@@ -19,10 +19,10 @@
android:viewportWidth="48.0"
android:viewportHeight="48.0">
<path
- android:fillColor="#FF7E5BBF"
+ android:fillColor="#FFc7d4b6"
android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
<path
- android:fillColor="#FF7E5BBF"
+ android:fillColor="#FFfbd3cb"
android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
<path
android:fillColor="#40000000"
@@ -31,7 +31,7 @@
android:fillColor="#40000000"
android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
<path
- android:fillColor="#FF55C4F5"
+ android:fillColor="#FFe0e0d6"
android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>
</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_apk.xml b/core/res/res/drawable/ic_doc_apk.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_apk.xml
rename to core/res/res/drawable/ic_doc_apk.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_audio.xml b/core/res/res/drawable/ic_doc_audio.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_audio.xml
rename to core/res/res/drawable/ic_doc_audio.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml b/core/res/res/drawable/ic_doc_certificate.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_certificate.xml
rename to core/res/res/drawable/ic_doc_certificate.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_codes.xml b/core/res/res/drawable/ic_doc_codes.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_codes.xml
rename to core/res/res/drawable/ic_doc_codes.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml b/core/res/res/drawable/ic_doc_compressed.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_compressed.xml
rename to core/res/res/drawable/ic_doc_compressed.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_contact.xml b/core/res/res/drawable/ic_doc_contact.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_contact.xml
rename to core/res/res/drawable/ic_doc_contact.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_document.xml b/core/res/res/drawable/ic_doc_document.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_document.xml
rename to core/res/res/drawable/ic_doc_document.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_event.xml b/core/res/res/drawable/ic_doc_event.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_event.xml
rename to core/res/res/drawable/ic_doc_event.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_excel.xml b/core/res/res/drawable/ic_doc_excel.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_excel.xml
rename to core/res/res/drawable/ic_doc_excel.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_folder.xml b/core/res/res/drawable/ic_doc_folder.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_folder.xml
rename to core/res/res/drawable/ic_doc_folder.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_font.xml b/core/res/res/drawable/ic_doc_font.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_font.xml
rename to core/res/res/drawable/ic_doc_font.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_generic.xml b/core/res/res/drawable/ic_doc_generic.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_generic.xml
rename to core/res/res/drawable/ic_doc_generic.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_image.xml b/core/res/res/drawable/ic_doc_image.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_image.xml
rename to core/res/res/drawable/ic_doc_image.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml b/core/res/res/drawable/ic_doc_pdf.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_pdf.xml
rename to core/res/res/drawable/ic_doc_pdf.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml b/core/res/res/drawable/ic_doc_powerpoint.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml
rename to core/res/res/drawable/ic_doc_powerpoint.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml b/core/res/res/drawable/ic_doc_presentation.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_presentation.xml
rename to core/res/res/drawable/ic_doc_presentation.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml b/core/res/res/drawable/ic_doc_spreadsheet.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml
rename to core/res/res/drawable/ic_doc_spreadsheet.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_text.xml b/core/res/res/drawable/ic_doc_text.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_text.xml
rename to core/res/res/drawable/ic_doc_text.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_video.xml b/core/res/res/drawable/ic_doc_video.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_video.xml
rename to core/res/res/drawable/ic_doc_video.xml
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_word.xml b/core/res/res/drawable/ic_doc_word.xml
similarity index 100%
rename from packages/DocumentsUI/res/drawable/ic_doc_word.xml
rename to core/res/res/drawable/ic_doc_word.xml
diff --git a/core/res/res/drawable/watch_switch_thumb_material.xml b/core/res/res/drawable/watch_switch_thumb_material.xml
new file mode 100644
index 0000000..3463a4f
--- /dev/null
+++ b/core/res/res/drawable/watch_switch_thumb_material.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="20dp"
+ android:height="40dp"
+ android:viewportHeight="40"
+ android:viewportWidth="20">
+ <group
+ android:translateX="10"
+ android:translateY="20">
+ <path
+ android:name="thumb_path"
+ android:fillColor="@color/white"
+ android:pathData="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" />
+ </group>
+</vector>
diff --git a/core/res/res/drawable/watch_switch_thumb_material_anim.xml b/core/res/res/drawable/watch_switch_thumb_material_anim.xml
new file mode 100644
index 0000000..686fb97
--- /dev/null
+++ b/core/res/res/drawable/watch_switch_thumb_material_anim.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:constantSize="true">
+ <item
+ android:id="@+id/off"
+ android:drawable="@drawable/watch_switch_thumb_material"
+ android:state_enabled="false" />
+ <item
+ android:id="@+id/on"
+ android:drawable="@drawable/watch_switch_thumb_material"
+ android:state_checked="true" />
+ <item
+ android:id="@+id/off"
+ android:drawable="@drawable/watch_switch_thumb_material" />
+ <transition
+ android:drawable="@drawable/watch_switch_thumb_to_on_anim_mtrl"
+ android:fromId="@id/off"
+ android:toId="@id/on" />
+ <transition
+ android:drawable="@drawable/watch_switch_thumb_to_off_anim_mtrl"
+ android:fromId="@id/on"
+ android:toId="@id/off" />
+</animated-selector>
diff --git a/core/res/res/drawable/watch_switch_thumb_to_off_anim_mtrl.xml b/core/res/res/drawable/watch_switch_thumb_to_off_anim_mtrl.xml
new file mode 100644
index 0000000..2c6ba2f
--- /dev/null
+++ b/core/res/res/drawable/watch_switch_thumb_to_off_anim_mtrl.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/watch_switch_thumb_material">
+ <target
+ android:name="thumb_path"
+ android:animation="@anim/watch_switch_thumb_to_off_animation" />
+</animated-vector>
diff --git a/core/res/res/drawable/watch_switch_thumb_to_on_anim_mtrl.xml b/core/res/res/drawable/watch_switch_thumb_to_on_anim_mtrl.xml
new file mode 100644
index 0000000..9f92361
--- /dev/null
+++ b/core/res/res/drawable/watch_switch_thumb_to_on_anim_mtrl.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/watch_switch_thumb_material">
+ <target
+ android:name="thumb_path"
+ android:animation="@anim/watch_switch_thumb_to_on_animation" />
+</animated-vector>
diff --git a/core/res/res/drawable/watch_switch_track_material.xml b/core/res/res/drawable/watch_switch_track_material.xml
new file mode 100644
index 0000000..00cdadb
--- /dev/null
+++ b/core/res/res/drawable/watch_switch_track_material.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:gravity="center_vertical|center_horizontal">
+ <shape android:shape="oval">
+ <solid android:color="@android:color/white" />
+ <size
+ android:width="40dp"
+ android:height="40dp" />
+ </shape>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/core/res/res/layout-notround-watch/alert_dialog_header_micro.xml b/core/res/res/layout-notround-watch/alert_dialog_header_micro.xml
deleted file mode 100644
index fc840d9..0000000
--- a/core/res/res/layout-notround-watch/alert_dialog_header_micro.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="top|center_horizontal"
- android:minHeight="@dimen/alert_dialog_title_height">
- <ImageView android:id="@+id/icon"
- android:maxHeight="24dp"
- android:maxWidth="24dp"
- android:layout_marginTop="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginBottom="8dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@null" />
- <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
- style="?android:attr/windowTitleStyle"
- android:ellipsize="end"
- android:layout_marginStart="8dp"
- android:layout_marginBottom="8dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAlignment="viewStart" />
-</LinearLayout>
diff --git a/core/res/res/layout-notround-watch/alert_dialog_title_material.xml b/core/res/res/layout-notround-watch/alert_dialog_title_material.xml
new file mode 100644
index 0000000..307c6db
--- /dev/null
+++ b/core/res/res/layout-notround-watch/alert_dialog_title_material.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="top|center_horizontal"
+ android:minHeight="@dimen/alert_dialog_title_height">
+ <ImageView android:id="@+id/icon"
+ android:maxHeight="24dp"
+ android:maxWidth="24dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginBottom="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@null" />
+ <TextView android:id="@+id/alertTitle"
+ style="?android:attr/windowTitleStyle"
+ android:layout_marginBottom="8dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/core/res/res/layout-round-watch/alert_dialog_header_micro.xml b/core/res/res/layout-round-watch/alert_dialog_header_micro.xml
deleted file mode 100644
index 6f7ae02..0000000
--- a/core/res/res/layout-round-watch/alert_dialog_header_micro.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="top|center_horizontal"
- android:minHeight="@dimen/alert_dialog_title_height">
- <ImageView android:id="@+id/icon"
- android:maxHeight="24dp"
- android:maxWidth="24dp"
- android:layout_marginTop="12dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@null" />
- <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
- style="?android:attr/windowTitleStyle"
- android:ellipsize="end"
- android:layout_marginTop="36dp"
- android:layout_marginBottom="4dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAlignment="center" />
-</FrameLayout>
diff --git a/core/res/res/layout-round-watch/alert_dialog_title_material.xml b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
new file mode 100644
index 0000000..0279911
--- /dev/null
+++ b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="top|center_horizontal"
+ android:minHeight="@dimen/alert_dialog_title_height">
+ <ImageView android:id="@+id/icon"
+ android:maxHeight="24dp"
+ android:maxWidth="24dp"
+ android:layout_marginTop="12dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@null" />
+ <TextView android:id="@+id/alertTitle"
+ style="?android:attr/windowTitleStyle"
+ android:layout_marginTop="36dp"
+ android:layout_marginBottom="8dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+</FrameLayout>
diff --git a/core/res/res/layout-watch/alert_dialog_material.xml b/core/res/res/layout-watch/alert_dialog_material.xml
index e627d42..002dde8 100644
--- a/core/res/res/layout-watch/alert_dialog_material.xml
+++ b/core/res/res/layout-watch/alert_dialog_material.xml
@@ -14,13 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<FrameLayout
+<com.android.internal.widget.WatchListDecorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parentPanel"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:id="@+id/scrollView"
+ android:fillViewport="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@@ -33,11 +34,12 @@
android:paddingRight="?dialogPreferredPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/topPanel">
+ android:id="@+id/topPanel"
+ android:minHeight="@dimen/dialog_list_padding_top_no_title">
<include android:id="@+id/title_template"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- layout="@layout/alert_dialog_header_micro"/>
+ layout="@layout/alert_dialog_title_material"/>
</FrameLayout>
<!-- Content Panel -->
@@ -48,7 +50,8 @@
<TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Material.Body1"
+ android:gravity="@integer/config_dialogTextGravity"
+ android:textAppearance="@style/TextAppearance.Material.Subhead"
android:paddingStart="?dialogPreferredPadding"
android:paddingEnd="?dialogPreferredPadding"
android:paddingTop="8dip"
@@ -68,41 +71,34 @@
<!-- Button Panel -->
<FrameLayout
android:id="@+id/buttonPanel"
+ android:minHeight="@dimen/dialog_list_padding_bottom_no_buttons"
+ android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning"
- android:dividerPadding="0dip"
+ android:layout_gravity="bottom"
android:orientation="vertical"
android:minHeight="@dimen/alert_dialog_button_bar_height"
android:paddingBottom="?dialogPreferredPadding"
style="?android:attr/buttonBarStyle"
- android:layoutDirection="locale"
android:measureWithLargestChild="true">
<Button android:id="@+id/button1"
android:layout_gravity="start"
android:layout_weight="1"
- android:layout_marginLeft="?dialogPreferredPadding"
- android:layout_marginRight="?dialogPreferredPadding"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button android:id="@+id/button3"
android:layout_gravity="start"
android:layout_weight="1"
- android:layout_marginLeft="?dialogPreferredPadding"
- android:layout_marginRight="?dialogPreferredPadding"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button android:id="@+id/button2"
android:layout_gravity="start"
android:layout_weight="1"
- android:layout_marginLeft="?dialogPreferredPadding"
- android:layout_marginRight="?dialogPreferredPadding"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -110,4 +106,4 @@
</FrameLayout>
</LinearLayout>
</ScrollView>
-</FrameLayout>
+</com.android.internal.widget.WatchListDecorLayout>
diff --git a/core/res/res/layout-watch/preference_list_fragment_material.xml b/core/res/res/layout-watch/preference_list_fragment_material.xml
new file mode 100644
index 0000000..ae8f203
--- /dev/null
+++ b/core/res/res/layout-watch/preference_list_fragment_material.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:background="@android:color/transparent"
+ android:layout_removeBorders="true">
+
+ <FrameLayout
+ android:id="@android:id/list_container"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1">
+ <com.android.internal.widget.WatchHeaderListView
+ android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="?attr/preferenceFragmentListStyle"
+ android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
+ android:clipToPadding="false"
+ android:drawSelectorOnTop="false"
+ android:cacheColorHint="@android:color/transparent"
+ android:scrollbarAlwaysDrawVerticalTrack="true">
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/dialog_padding_material"
+ android:paddingEnd="@dimen/dialog_padding_material"
+ android:paddingBottom="8dp"
+ android:textAppearance="@style/TextAppearance.Material.Title"
+ android:gravity="center" />
+ </com.android.internal.widget.WatchHeaderListView>
+ </FrameLayout>
+
+ <TextView android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/preference_fragment_padding_side"
+ android:gravity="center"
+ android:visibility="gone" />
+
+ <RelativeLayout android:id="@+id/button_bar"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_weight="0"
+ android:visibility="gone">
+
+ <Button android:id="@+id/back_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:layout_alignParentStart="true"
+ android:text="@string/back_button_label"
+ />
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true">
+
+ <Button android:id="@+id/skip_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:text="@string/skip_button_label"
+ android:visibility="gone"
+ />
+
+ <Button android:id="@+id/next_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:text="@string/next_button_label"
+ />
+ </LinearLayout>
+ </RelativeLayout>
+</LinearLayout>
diff --git a/core/res/res/layout-watch/preference_material.xml b/core/res/res/layout-watch/preference_material.xml
index 5da64fc..ad217db 100644
--- a/core/res/res/layout-watch/preference_material.xml
+++ b/core/res/res/layout-watch/preference_material.xml
@@ -29,34 +29,42 @@
<LinearLayout
android:id="@+id/icon_frame"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="-4dp"
- android:minWidth="32dp"
- android:gravity="start|center_vertical"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:gravity="center"
android:orientation="horizontal"
- android:paddingEnd="8dp"
- android:paddingTop="4dp"
- android:paddingBottom="4dp">
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp">
<com.android.internal.widget.PreferenceImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
- android:maxHeight="24dp" />
+ android:maxWidth="40dp"
+ android:maxHeight="40dp" />
</LinearLayout>
+ <!-- Preference should place its actual preference widget here. -->
+ <LinearLayout android:id="@+id/widget_frame"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp" />
+
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingTop="16dp"
- android:paddingBottom="16dp">
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp">
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxLines="2"
+ android:maxLines="3"
android:textAppearance="?attr/textAppearanceListItem"
android:ellipsize="end" />
@@ -70,13 +78,4 @@
android:maxLines="10" />
</RelativeLayout>
-
- <!-- Preference should place its actual preference widget here. -->
- <LinearLayout android:id="@+id/widget_frame"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="end|center_vertical"
- android:paddingStart="4dp"
- android:orientation="vertical" />
-
</LinearLayout>
diff --git a/core/res/res/layout-watch/preference_widget_switch.xml b/core/res/res/layout-watch/preference_widget_switch.xml
new file mode 100644
index 0000000..37d0c6b
--- /dev/null
+++ b/core/res/res/layout-watch/preference_widget_switch.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Layout for a SwitchPreference -->
+<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+android:id/switch_widget"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:switchMinWidth="40dp"
+ android:layout_gravity="center"
+ android:thumb="@drawable/watch_switch_thumb_material_anim"
+ android:thumbTint="@color/watch_switch_thumb_color_material"
+ android:track="@drawable/watch_switch_track_material"
+ android:trackTint="?android:colorPrimary"
+ android:focusable="false"
+ android:clickable="false"
+ android:background="@null" />
diff --git a/core/res/res/layout/alert_dialog_material.xml b/core/res/res/layout/alert_dialog_material.xml
index 6d33de6..178505c 100644
--- a/core/res/res/layout/alert_dialog_material.xml
+++ b/core/res/res/layout/alert_dialog_material.xml
@@ -20,6 +20,7 @@
android:id="@+id/parentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="start|top"
android:orientation="vertical">
<include layout="@layout/alert_dialog_title_material" />
diff --git a/core/res/res/layout/date_picker_header_material.xml b/core/res/res/layout/date_picker_header_material.xml
index a0e2b1d..755317e 100644
--- a/core/res/res/layout/date_picker_header_material.xml
+++ b/core/res/res/layout/date_picker_header_material.xml
@@ -54,7 +54,7 @@
android:textAppearance="@style/TextAppearance.Material.DatePicker.DateLabel"
android:includeFontPadding="false"
android:gravity="start"
- android:maxLines="2"
+ android:maxLines="@integer/date_picker_header_max_lines_material"
android:ellipsize="none" />
</LinearLayout>
</LinearLayout>
diff --git a/core/res/res/layout/notification_material_action_emphasized.xml b/core/res/res/layout/notification_material_action_emphasized.xml
new file mode 100644
index 0000000..1e364cc
--- /dev/null
+++ b/core/res/res/layout/notification_material_action_emphasized.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/button_holder"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="#ff000000">
+ <Button
+ style="@android:style/Widget.Material.Light.Button.Borderless.Small"
+ android:id="@+id/action0"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textColor="@color/notification_default_color"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:background="@drawable/notification_material_action_background"
+ />
+</FrameLayout>
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index 70d8c21..58d59f0 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimeer tans berging."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android gradeer tans op"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Sommige programme sal dalk nie behoorlik werk voordat die opgradering voltooi is nie"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> gradeer tans op …"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimeer program <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Berei tans <xliff:g id="APPNAME">%1$s</xliff:g> voor."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Begin programme."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Ontspeld"</string>
<string name="app_info" msgid="6856026610594615344">"Programinligting"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Herbegin sessie"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tik om \'n nuwe demonstrasiesessie te begin"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Begin tans demonstrasie"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Herbegin tans sessie"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Stel toestel terug?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tik om toestel terug te stel"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Begin tans demonstrasie …"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Stel toestel tans terug …"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Stel toestel terug?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Jy sal enige veranderinge verloor en die demonstrasie sal oor <xliff:g id="TIMEOUT">%1$s</xliff:g> sekondes weer begin …"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Kanselleer"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Stel nou terug"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Doen \'n fabriekterugstelling om hierdie toestel sonder beperkinge te gebruik"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Raak om meer te wete te kom."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Het <xliff:g id="LABEL">%1$s</xliff:g> gedeaktiveer"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferensie-oproep"</string>
</resources>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index ab82b2c..6b3b866 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"ማከማቻን በማመቻቸት ላይ።"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android በማላቅ ላይ ነው"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"አንዳንድ መተግበሪያዎች ማላቁ እስኪጠናቀቅ ድረስ በአግባቡ ላይሰሩ ይችላሉ"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> በማላቅ ላይ…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"መተግበሪያዎች በአግባቡ በመጠቀም ላይ <xliff:g id="NUMBER_0">%1$d</xliff:g> ከ <xliff:g id="NUMBER_1">%2$d</xliff:g> ፡፡"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g>ን ማዘጋጀት።"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"መተግበሪያዎችን በማስጀመር ላይ፡፡"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ንቀል"</string>
<string name="app_info" msgid="6856026610594615344">"የመተግበሪያ መረጃ"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"ክፍለ-ጊዜን ዳግም ያስጀምሩ"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"አዲስ የማሳያ ክፍለ-ጊዜን ለመጀመር መታ ያድርጉ"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ማሳያን ዳግም በማስጀመር ላይ"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"ክፍለ-ጊዜን ዳግም በማስጀመር ላይ"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"መሣሪያ ዳግም ይጀመር?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"መሣሪያን ዳግም ለማስጀመር መታ ያድርጉ"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ማሳያን በማስጀመር ላይ…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"መሣሪያን ዳግም በማስጀመር ላይ…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"መሣሪያ ዳግም ይጀመር?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ማንኛቸውም ለውጦች ይጠፋሉ፣ እና ማሳያው በ<xliff:g id="TIMEOUT">%1$s</xliff:g> ሰከንዶች ውስጥ እንደገና ይጀምራል…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ይቅር"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"አሁን ዳግም አስጀምር"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ይህን መሣሪያ ያለምንም ገደብ ለመጠቀም የፋብሪካ ዳግም ያስጀምሩ"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"የበለጠ ለመረዳት ይንኩ።"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ተሰናክሏል"</string>
+ <string name="conference_call" msgid="3751093130790472426">"የስብሰባ ጥሪ"</string>
</resources>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index c558e29..72ba5ee 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -1116,6 +1116,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"جارٍ تحسين السعة التخزينية."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"جارٍ ترقية Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"قد لا تعمل بعض التطبيقات بشكل مناسب إلا بعد انتهاء الترقية"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"جارٍ ترقية <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"جارٍ تحسين التطبيق <xliff:g id="NUMBER_0">%1$d</xliff:g> من <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"جارٍ تحضير <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"بدء التطبيقات."</string>
@@ -1795,11 +1796,16 @@
<string name="unpin_target" msgid="3556545602439143442">"إزالة تثبيت"</string>
<string name="app_info" msgid="6856026610594615344">"معلومات عن التطبيق"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"إعادة تشغيل الجلسة"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"انقر لبدء جلسة عرض توضيحي جديدة"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"جارٍ بدء العرض التوضيحي"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"جارٍ إعادة تشغيل الجلسة"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"هل تريد إعادة تعيين الجهاز؟"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"انقر لإعادة تعيين الجهاز"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"جارٍ بدء العرض التوضيحي…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"جارٍ إعادة تعيين الجهاز…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"هل تريد إعادة تعيين الجهاز؟"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ستفقد أي تغييرات وسيبدأ العرض التوضيحي مرة أخرى خلال <xliff:g id="TIMEOUT">%1$s</xliff:g> من الثواني…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"إلغاء"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"إعادة التعيين الآن"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"يمكنك إعادة تعيين بيانات المصنع لاستخدام هذا الجهاز بدون قيود"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"المس للتعرف على مزيد من المعلومات."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"تم تعطيل <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"مكالمة جماعية"</string>
</resources>
diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml
index 22a10eb..23aa918 100644
--- a/core/res/res/values-az-rAZ/strings.xml
+++ b/core/res/res/values-az-rAZ/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Yaddaş optimallaşdırılır."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android təkmilləşdirilir"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Güncəllənmə tamamlanana kimi bəzi tətbiqlər düzgün işləməyə bilər"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> təkmilləşdirilir…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> əddədən <xliff:g id="NUMBER_0">%1$d</xliff:g> tətbiq optimallaşır."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> proqramının hazırlanması."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Tətbiqlər başladılır."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Çıxarın"</string>
<string name="app_info" msgid="6856026610594615344">"Tətbiq məlumatı"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Sessiyanı Yenidən Başladın"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Yeni demo sessiyanı başlamaq üçün tıklayın"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demo başlayır"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sessiya yenidən başlayır"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Cihaz sıfırlansın?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Cihazı sıfırlamaq üçün tıklayın"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo başlayır…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Cihaz sıfırlanır…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Cihaz sıfırlansın?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Hər hansı dəyişikliyi itirəcəksiniz və demo <xliff:g id="TIMEOUT">%1$s</xliff:g> saniyəyə yenidən başlayacaq…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Ləğv edin"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"İndi sıfırlayın"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Bu cihazı məhdudiyyətsiz istifadə etmək üçün zavod sıfırlaması edin"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Daha çox məlumat üçün toxunun."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> deaktiv edildi"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konfrans Zəngi"</string>
</resources>
diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml
index 330a3ea..8735a3b 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -1047,6 +1047,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Memorija se optimizuje."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se nadograđuje…"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Neke aplikacije možda neće ispravno funkcionisati dok se nadogradnja ne dovrši"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> se nadograđuje…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizovanje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Priprema se <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Pokretanje aplikacija."</string>
@@ -1687,11 +1688,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Otkači"</string>
<string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Ponovo pokrenite sesiju"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Dodirnite da biste pokrenuli novu sesiju demonstracije"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demonstracija se pokreće"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sesija se ponovo pokreće"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite li da resetujete uređaj?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dodirnite da biste resetovali uređaj"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Pokrećemo demonstraciju..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetujemo uređaj..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite li da resetujete uređaj?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Izgubićete sve promene i demonstracija će ponovo početi za <xliff:g id="TIMEOUT">%1$s</xliff:g> sek…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Otkaži"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetuj"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Resetujte uređaj na fabrička podešavanja da biste ga koristili bez ograničenja"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da biste saznali više."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Vidžet <xliff:g id="LABEL">%1$s</xliff:g> je onemogućen"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferencijski poziv"</string>
</resources>
diff --git a/core/res/res/values-be-rBY/strings.xml b/core/res/res/values-be-rBY/strings.xml
index d7c91df..2737128 100644
--- a/core/res/res/values-be-rBY/strings.xml
+++ b/core/res/res/values-be-rBY/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Аптымізацыя сховішча."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Абнаўленне Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Пэўныя праграмы могуць не працаваць належным чынам, пакуль не скончыцца абнаўленне"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> абнаўляецца…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Аптымізацыя прыкладання <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Падрыхтоўка <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Запуск прыкладанняў."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Адмацаваць"</string>
<string name="app_info" msgid="6856026610594615344">"Інфармацыя пра праграму"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Перазапуск сеанса"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Дакраніцеся, каб пачаць новы дэманстрацыйны сеанс"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Запуск дэманстрацыі"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Перазапуск сеанса"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Скінуць налады прылады?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Дакраніцеся, каб скінуць налады прылады"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Ідзе запуск дэманстрацыі…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Ідзе скід налад прылады…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Скінуць налады прылады?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Усе змены будуць страчаны, і дэманстрацыя пачнецца зноў праз <xliff:g id="TIMEOUT">%1$s</xliff:g> с…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Скасаваць"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Выканаць скід"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Выканайце скід да заводскіх налад, каб выкарыстоўваць гэту прыладу без абмежаванняў"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Краніце, каб даведацца больш."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Адключаны <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Канферэнц-выклік"</string>
</resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 0ea9fea..fb967883 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Хранилището се оптимизира."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android се надстройва"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Някои приложения може да не работят правилно, докато надстройването не завърши"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> се надстройва…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимизира се приложение <xliff:g id="NUMBER_0">%1$d</xliff:g> от <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> се подготвя."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Приложенията се стартират."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Освобождаване"</string>
<string name="app_info" msgid="6856026610594615344">"Информация за приложението"</string>
<string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Рестартиране на сесията"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Докоснете, за да стартирате нова демонстрационна сесия"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Демонстрацията се стартира"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Сесията се рестартира"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Да се нулира ли устройството?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Докоснете, за да нулирате устройството"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Демонстрацията се стартира…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Устройството се нулира…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Да се нулира ли устройството?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ще загубите всички промени и демонстрацията ще започне отново след <xliff:g id="TIMEOUT">%1$s</xliff:g> секунди…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Отказ"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Нулиране сега"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Възстановете фабричните настройки на това устройство, за да го използвате без ограничения"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Докоснете, за да научите повече."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g>: Деактивирано"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конферентно обаждане"</string>
</resources>
diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml
index 0e6a459..bd59603 100644
--- a/core/res/res/values-bn-rBD/strings.xml
+++ b/core/res/res/values-bn-rBD/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"সঞ্চয়স্থান অপ্টিমাইজ করা হচ্ছে৷"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android আপগ্রেড করা হচ্ছে"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"আপগ্রেড সম্পন্ন না হওয়া পর্যন্ত কিছু অ্যাপ্লিকেশান সঠিকভাবে কাজ নাও করতে পারে"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> আপগ্রেড করা হচ্ছে…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="NUMBER_0">%1$d</xliff:g>টি অ্যাপ্লিকেশান অপ্টিমাইজ করা হচ্ছে৷"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> প্রস্তুত করা হচ্ছে৷"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"অ্যাপ্লিকেশানগুলি শুরু করা হচ্ছে৷"</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"কোনো অ্যাপ্লিকেশানকে সেশনগুলি পড়ার অনুমতি দেয়। এটি সক্রিয় প্যাকেজ ইনস্টলেশনের বিশদ বিবরণ দেখতে দেয়।"</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"প্যাকেজগুলি ইনস্টল করার অনুরোধ"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"একটি অ্যাপ্লিকেশানকে প্যাকেজগুলির ইনস্টল করার অনুরোধ জানাতে অনুমতি দেয়৷"</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"জুম নিয়ন্ত্রণের জন্য দুবার আলতো চাপুন"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"উইজেট যোগ করা যায়নি৷"</string>
<string name="ime_action_go" msgid="8320845651737369027">"যান"</string>
<string name="ime_action_search" msgid="658110271822807811">"অনুসন্ধান করুন"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"বিজ্ঞপ্তি র্যাঙ্কার পরিষেবা"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN সক্রিয়"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> এর দ্বারা VPN সক্রিয় করা হয়েছে"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"নেটওয়ার্ক পরিচালনা করতে আলতো চাপুন।"</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> তে সংযুক্ত হয়েছে৷ নেটওয়ার্ক পরিচালনা করতে আলতো চাপুন৷"</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"সর্বদা-চালু VPN সংযুক্ত হচ্ছে..."</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"সর্বদা-চালু VPN সংযুক্ত হয়েছে"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"সর্বদা-চালু VPN ত্রুটি"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"আনপিন করুন"</string>
<string name="app_info" msgid="6856026610594615344">"অ্যাপ্লিকেশানের তথ্য"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"সেশন পুনঃসূচনা করুন"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"একটি নতুন ডেমো সেশন শুরু করতে আলতো চাপ দিন"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ডেমো শুরু করা হচ্ছে"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"সেশন পুনরায় চালু করা হচ্ছে"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ডিভাইস পুনরায় সেট করবেন?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ডিভাইসটিকে পুনরায় সেট করতে আলতো চাপুন"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ডেমো শুরু করা হচ্ছে…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"ডিভাইস পুনরায় সেট করা হচ্ছে…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ডিভাইস পুনরায় সেট করবেন?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"আপনার করা যে কোনো পরিবর্তন মুছে যাবে এবং <xliff:g id="TIMEOUT">%1$s</xliff:g> সেকেন্ডের মধ্যে ডেমো আবার শুরু হবে…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"বাতিল করুন"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"এখনই পুনরায় সেট করুন"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"কোনো বিধিনিষেধ ছাড়াই এই ডিভাইসটিকে ব্যবহার করতে ফ্যাক্টরি রিসেট করুন"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"আরো জানতে স্পর্শ করুন৷"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"অক্ষম করা <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"কনফারেন্স কল"</string>
</resources>
diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml
index 13b2a3d..671bf7e 100644
--- a/core/res/res/values-bs-rBA/strings.xml
+++ b/core/res/res/values-bs-rBA/strings.xml
@@ -390,9 +390,9 @@
<string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"Dozvoljava aplikaciji korištenje infracrvenog predajnika na TV-u."</string>
<string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"Omogućava aplikaciji korištenje infracrvenog odašiljača telefona."</string>
<string name="permlab_setWallpaper" msgid="6627192333373465143">"postavljanje pozadinske slike"</string>
- <string name="permdesc_setWallpaper" msgid="7373447920977624745">"Dozvoljava aplikaciji postavljanje sistemske pozadine ekrana."</string>
- <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"prilagođavanje veličine pozadine"</string>
- <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"Dozvoljava aplikaciji određivanje veličine sistemske pozadine ekrana."</string>
+ <string name="permdesc_setWallpaper" msgid="7373447920977624745">"Dozvoljava aplikaciji postavljanje sistemske pozadinske slike."</string>
+ <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"prilagođavanje veličine pozadinske slike"</string>
+ <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"Dozvoljava aplikaciji određivanje veličine sistemske pozadinske slike."</string>
<string name="permlab_setTimeZone" msgid="2945079801013077340">"postavljanje vremenske zone"</string>
<string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Dozvoljava aplikaciji promjenu vremenske zone tableta."</string>
<string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"Dozvoljava aplikaciji promjenu vremenske zone na TV-u."</string>
@@ -1049,6 +1049,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimiziranje pohrane."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se nadograđuje"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Neke aplikacije možda neće raditi ispravno dok traje nadogradnja"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Aplikacija <xliff:g id="APPLICATION">%1$s</xliff:g> se nadograđuje…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimiziranje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Priprema se <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Pokretanje aplikacija."</string>
@@ -1222,8 +1223,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Dozvoljava aplikaciji da čita sesije instalacija. Ovim se aplikaciji omogućava da vidi detalje o aktivnim instalacijama paketa."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"zahtijevanje paketa za instaliranje"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Omogućava aplikaciji da zahtijeva instalaciju paket ā."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Dodirnite dvaput za kontrolu uvećanja"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Dodavanje vidžeta nije uspjelo."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Počni"</string>
<string name="ime_action_search" msgid="658110271822807811">"Traži"</string>
@@ -1254,10 +1254,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Usluga rangiranja obavještenja"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN aktiviran"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"Aplikacija <xliff:g id="APP">%s</xliff:g> je aktivirala VPN"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Dodirnite da upravljate mrežom."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"Povezano sa sesijom <xliff:g id="SESSION">%s</xliff:g>. Dodirnite da upravljate mrežom."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Povezivanje na uvijek aktivni VPN…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"Povezan na uvijek aktivni VPN"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Greška u povezivanju na uvijek aktivni VPN"</string>
@@ -1692,11 +1690,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Otkači"</string>
<string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Ponovo pokreni sesiju"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Dodirnite za početak nove demo sesije"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Pokretanje pokaznog videozapisa"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Ponovno pokretanje sesije"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite li vratiti na početne postavke?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dodirnite da vratite uređaj na početne postavke"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Pokretanje demonstracije…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Vraćanje uređaja na početne postavke…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite li vratiti na početne postavke?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Nestat će sve izmjene, a demonstracija će početi ponovo za <xliff:g id="TIMEOUT">%1$s</xliff:g> sek…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Otkaži"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Vrati sada na početne postavke"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Vratite uređaj na fabričke postavke kako biste ga koristili bez ograničenja"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da saznate više."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Onemogućen <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferencijski poziv"</string>
</resources>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index 86ca5c2..7e366f5 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -429,7 +429,7 @@
<string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"Permet que l\'aplicació consulti la configuració de Bluetooth del televisor i estableixi i accepti connexions amb dispositius vinculats ."</string>
<string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Permet que una aplicació visualitzi la configuració de Bluetooth del telèfon i que estableixi i accepti connexions amb els dispositius sincronitzats."</string>
<string name="permlab_nfc" msgid="4423351274757876953">"controlar Comunicació de camp proper (NFC)"</string>
- <string name="permdesc_nfc" msgid="7120611819401789907">"Permet que l\'aplicació es comuniqui amb les etiquetes, les targetes i els lectors de Near Field Communication (NFC)."</string>
+ <string name="permdesc_nfc" msgid="7120611819401789907">"Permet que l\'aplicació es comuniqui amb les etiquetes, les targetes i els lectors de Comunicació de camp proper (NFC)."</string>
<string name="permlab_disableKeyguard" msgid="3598496301486439258">"desactivació del bloqueig de pantalla"</string>
<string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Permet que l\'aplicació desactivi el bloqueig del teclat i qualsevol element de seguretat de contrasenyes associat. Per exemple, el telèfon desactiva el bloqueig del teclat en rebre una trucada telefònica entrant i, a continuació, reactiva el bloqueig del teclat quan finalitza la trucada."</string>
<string name="permlab_manageFingerprint" msgid="5640858826254575638">"Gestionar el maquinari d\'empremtes digitals"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"S\'està optimitzant l\'emmagatzematge."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android s\'està actualitzant"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Pot ser que algunes aplicacions no funcionin correctament fins que no es completi l\'actualització"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"S\'està actualitzant <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"S\'està optimitzant l\'aplicació <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"S\'està preparant <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"S\'estan iniciant les aplicacions."</string>
@@ -1316,7 +1317,7 @@
<string name="storage_usb" msgid="3017954059538517278">"Emmagatzematge USB"</string>
<string name="extract_edit_menu_button" msgid="8940478730496610137">"Edita"</string>
<string name="data_usage_warning_title" msgid="1955638862122232342">"Advertiment d\'ús de dades"</string>
- <string name="data_usage_warning_body" msgid="6660692274311972007">"Toca per veure ús i configuració."</string>
+ <string name="data_usage_warning_body" msgid="6660692274311972007">"Toca per veure l\'ús i la configuració."</string>
<string name="data_usage_3g_limit_title" msgid="4361523876818447683">"Límit de dades 2G-3G assolit"</string>
<string name="data_usage_4g_limit_title" msgid="4609566827219442376">"Límit de dades 4G assolit"</string>
<string name="data_usage_mobile_limit_title" msgid="557158376602636112">"Límit de dades mòbils assolit"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"No fixis"</string>
<string name="app_info" msgid="6856026610594615344">"Informació de l\'aplicació"</string>
<string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Torna a iniciar la sessió"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Toca per iniciar una nova sessió de demostració"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"S\'està iniciant la demostració"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"S\'està tornant a iniciar la sessió"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vols restablir el dispositiu?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toca per restablir el dispositiu"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"S\'està iniciant la demostració…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"S\'està restablint el dispositiu…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vols restablir el dispositiu?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perdràs els canvis, i la demostració tornarà a començar d\'aquí a <xliff:g id="TIMEOUT">%1$s</xliff:g> segons…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel·la"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restableix ara"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Restableix les dades de fàbrica del dispositiu per utilitzar-lo sense restriccions"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca per obtenir més informació."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> s\'ha desactivat"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conferència"</string>
</resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index bac3e80..1e1919c 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Probíhá optimalizace úložiště."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se upgraduje"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Před dokončením upgradu nemusí některé aplikace fungovat správně"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Aplikace <xliff:g id="APPLICATION">%1$s</xliff:g> se upgraduje…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimalizování aplikace <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Příprava aplikace <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Spouštění aplikací."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Odepnout"</string>
<string name="app_info" msgid="6856026610594615344">"Informace o aplikaci"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Restartujte relaci"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Klepnutím zahájíte novou demonstrační relaci"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Spouštění ukázky"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Restartování relace"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Resetovat zařízení?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Zařízení resetujete klepnutím"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Spouštění ukázky…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetování zařízení…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Resetovat zařízení?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ztratíte všechny provedené změny a ukázka se za <xliff:g id="TIMEOUT">%1$s</xliff:g> s spustí znovu…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Zrušit"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetovat"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Chcete-li toto zařízení používat bez omezení, obnovte jej do továrního nastavení"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Klepnutím zobrazíte další informace."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – zakázáno"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferenční hovor"</string>
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 5f2c331..ef201c5 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Lageret optimeres."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android opgraderes"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Nogle apps fungerer muligvis ikke korrekt, før opgraderingen er gennemført"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> opgraderer…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimerer app <xliff:g id="NUMBER_0">%1$d</xliff:g> ud af <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Forbereder <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Åbner dine apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Frigør"</string>
<string name="app_info" msgid="6856026610594615344">"Oplysninger om appen"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Genstart sessionen"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tryk for at starte en ny demosession"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Starter demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Genstarter session"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vil du nulstille enheden?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tryk for at nulstille enheden"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Starter demoen…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Nulstiller enheden…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vil du nulstille enheden?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Du mister alle ændringer, og demoen starter igen om <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunder…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuller"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Nulstil nu"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Gendan fabriksdataene på enheden for at bruge den uden begrænsninger"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tryk for at få flere oplysninger."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – deaktiveret"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Telefonmøde"</string>
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 5fa1c01..5096565 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Speicher wird optimiert"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android wird aktualisiert"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Einige Apps funktionieren unter Umständen nicht richtig, bis das Upgrade abgeschlossen ist"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Für <xliff:g id="APPLICATION">%1$s</xliff:g> wird gerade ein Upgrade ausgeführt…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> von <xliff:g id="NUMBER_1">%2$d</xliff:g> wird optimiert..."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> wird vorbereitet"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Apps werden gestartet..."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Markierung entfernen"</string>
<string name="app_info" msgid="6856026610594615344">"App-Informationen"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Sitzung neu starten"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Zum Starten einer neuen Demositzung tippen"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demo wird gestartet"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sitzung wird neu gestartet"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Gerät zurücksetzen?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Zum Zurücksetzen des Geräts tippen"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo wird gestartet…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Gerät wird zurückgesetzt…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Gerät zurücksetzen?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Alle Änderungen gehen verloren und Demo wird in <xliff:g id="TIMEOUT">%1$s</xliff:g> Sekunden neu gestartet…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Abbrechen"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Jetzt zurücksetzen"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Gerät auf Werkseinstellungen zurücksetzen, um es ohne Einschränkungen zu nutzen"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Für weitere Informationen tippen."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> deaktiviert"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Telefonkonferenz"</string>
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index c4d110e..5188f7b 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Βελτιστοποίηση αποθηκευτικού χώρου."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Το Android αναβαθμίζεται"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν σωστά μέχρι την ολοκλήρωση της αναβάθμισης"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Η εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> αναβαθμίζεται…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Βελτιστοποίηση της εφαρμογής <xliff:g id="NUMBER_0">%1$d</xliff:g> από <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Προετοιμασία <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Έναρξη εφαρμογών."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Ξεκαρφίτσωμα"</string>
<string name="app_info" msgid="6856026610594615344">"Πληροφορίες εφαρμογής"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Επανεκκίνηση περιόδου σύνδεσης"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Πατήστε για να ξεκινήσετε μια νέα περίοδο σύνδεσης επίδειξης"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Έναρξη επίδειξης"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Επανεκκίνηση περιόδου σύνδεσης"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Να γίνει επαναφορά της συσκευής;"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Πατήστε για επαναφορά της συσκευής"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Έναρξη επίδειξης…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Επαναφορά συσκευής…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Να γίνει επαναφορά της συσκευής;"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Τυχόν αλλαγές που πραγματοποιήσατε θα χαθούν και η επίδειξη θα ξεκινήσει ξανά σε <xliff:g id="TIMEOUT">%1$s</xliff:g> δευτερόλεπτα…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Ακύρωση"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Επαναφορά τώρα"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Επαναφέρετε τις εργοστασιακές ρυθμίσεις για να χρησιμοποιήσετε αυτήν τη συσκευή χωρίς περιορισμούς"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Αγγίξτε για να μάθετε περισσότερα."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Απενεργοποιημένο <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Κλήση συνδιάσκεψης"</string>
</resources>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 6cec009..43945e5 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -974,7 +974,7 @@
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
<string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
- <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shared"</string>
+ <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
<string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string>
<string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Send"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimising storage."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android is upgrading"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Some apps may not work properly until the upgrade finishes"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparing <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Starting apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Unpin"</string>
<string name="app_info" msgid="6856026610594615344">"App info"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Restart Session"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tap to start a new demo session"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Starting demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Restarting session"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Reset device?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tap to reset device"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Reset device?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"You\'ll lose any changes and the demo will start again in <xliff:g id="TIMEOUT">%1$s</xliff:g> seconds…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reset now"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string>
</resources>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 6cec009..43945e5 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -974,7 +974,7 @@
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
<string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
- <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shared"</string>
+ <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
<string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string>
<string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Send"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimising storage."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android is upgrading"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Some apps may not work properly until the upgrade finishes"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparing <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Starting apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Unpin"</string>
<string name="app_info" msgid="6856026610594615344">"App info"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Restart Session"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tap to start a new demo session"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Starting demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Restarting session"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Reset device?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tap to reset device"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Reset device?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"You\'ll lose any changes and the demo will start again in <xliff:g id="TIMEOUT">%1$s</xliff:g> seconds…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reset now"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string>
</resources>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 6cec009..43945e5 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -974,7 +974,7 @@
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
<string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
- <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shared"</string>
+ <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
<string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string>
<string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Send"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimising storage."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android is upgrading"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Some apps may not work properly until the upgrade finishes"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparing <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Starting apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Unpin"</string>
<string name="app_info" msgid="6856026610594615344">"App info"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Restart Session"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tap to start a new demo session"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Starting demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Restarting session"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Reset device?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tap to reset device"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Reset device?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"You\'ll lose any changes and the demo will start again in <xliff:g id="TIMEOUT">%1$s</xliff:g> seconds…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reset now"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string>
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 9433f46..3f3d328 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizando almacenamiento"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se está actualizando"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Es posible que algunas apps no funcionen correctamente hasta que termine la actualización"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Se está actualizando <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizando la aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparando <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Iniciando aplicaciones"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"No fijar"</string>
<string name="app_info" msgid="6856026610594615344">"Información de la app"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reiniciar sesión"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Presiona para iniciar una nueva sesión de demostración"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Iniciando demostración"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Reiniciando sesión"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"¿Deseas restablecer el dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Presiona para restablecer el dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demostración…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Restableciendo dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"¿Deseas restablecer el dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Se perderán los cambios y la demostración volverá a iniciarse en <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restablecer ahora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Restablece la configuración de fábrica para usar este dispositivo sin restricciones"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para obtener más información."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Se inhabilitó <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conferencia"</string>
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index a701389..7efefe6 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizando almacenamiento."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Actualizando Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Es posible que algunas aplicaciones no funcionen correctamente hasta que finalice la actualización"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> se está actualizando…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizando aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>..."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparando <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Iniciando aplicaciones"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"No fijar"</string>
<string name="app_info" msgid="6856026610594615344">"Información de la aplicación"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reiniciar sesión"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Toca para iniciar una nueva sesión de demostración"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Iniciando demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Reiniciando sesión"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"¿Restablecer el dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toca para restablecer el dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demostración…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Restableciendo dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"¿Restablecer el dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Se perderán todos los cambios y la demostración volverá a empezar en <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restablecer ahora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Restablece los datos de fábrica para usar este dispositivo sin restricciones"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para obtener más información."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> inhabilitado"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conferencia"</string>
</resources>
diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml
index 005289b..9fbbba0 100644
--- a/core/res/res/values-et-rEE/strings.xml
+++ b/core/res/res/values-et-rEE/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Salvestusruumi optimeerimine."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android viiakse üle uuemale versioonile"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Mõned rakendused ei pruugi enne uuemale versioonile ülemineku lõpetamist korralikult töötada"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Rakenduse <xliff:g id="APPLICATION">%1$s</xliff:g> versiooni uuendatakse …"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g>. rakenduse <xliff:g id="NUMBER_1">%2$d</xliff:g>-st optimeerimine."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Rakenduse <xliff:g id="APPNAME">%1$s</xliff:g> ettevalmistamine."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Rakenduste käivitamine."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Vabasta"</string>
<string name="app_info" msgid="6856026610594615344">"Rakenduse teave"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Seansi taaskäivitamine"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Puudutage uue demoseansi alustamiseks"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demo käivitamine"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Seansi taaskäivitamine"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Kas soovite seadme lähtestada?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Puudutage seadme lähtestamiseks"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo käivitamine …"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Seadme lähtestamine …"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Kas soovite seadme lähtestada?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Kõik muudatused lähevad kaotsi ja demo käivitub uuesti <xliff:g id="TIMEOUT">%1$s</xliff:g> sekundi möödudes …"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Tühista"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Lähtesta kohe"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Seadme piiranguteta kasutamiseks lähtestage see tehaseandmetele"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Lisateabe saamiseks puudutage."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Keelatud <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konverentskõne"</string>
</resources>
diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml
index f118506..bde9f49 100644
--- a/core/res/res/values-eu-rES/strings.xml
+++ b/core/res/res/values-eu-rES/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Memoria optimizatzen."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android bertsioa berritzen ari gara"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Aplikazio batzuek agian ez dute behar bezala funtzionatuko bertsioa berritzen amaitu arte"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> bertsio-berritzen ari da…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g> aplikazio optimizatzen."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> prestatzen."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Aplikazioak abiarazten."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Instalazio-saioak irakurtzea baimentzen die aplikazioei. Horrela, pakete-instalazio aktiboei buruzko xehetasunak ikus ditzakete."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"Eskatu instalazio-paketeak"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Paketeak instalatzeko eskatzea baimentzen die aplikazioei."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Sakatu birritan zooma kontrolatzeko"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Ezin izan da widgeta gehitu."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Joan"</string>
<string name="ime_action_search" msgid="658110271822807811">"Bilatu"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Jakinarazpenen sailkapen-zerbitzua"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN eginbidea aktibatuta"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> aplikazioak VPN konexioa aktibatu du"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Sakatu sarea kudeatzeko."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> saiora konektatuta. Sakatu sarea kudeatzeko."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Beti aktibatuta dagoen VPNa konektatzen…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"Beti aktibatuta dagoen VPNa konektatu da"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Beti aktibatuta dagoen VPN errorea"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Kendu aingura"</string>
<string name="app_info" msgid="6856026610594615344">"Aplikazioari buruzko informazioa"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Berrabiarazi saioa"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Demo-saio berria hasteko, sakatu hau"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demoa abiarazten"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Saioa berrabiarazten"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Gailua berrezarri nahi duzu?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Gailua berrezartzeko, sakatu hau"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demoa abiarazten…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Gailua berrezartzen…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Gailua berrezarri nahi duzu?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Aldaketak galduko dituzu eta <xliff:g id="TIMEOUT">%1$s</xliff:g> segundo barru hasiko da berriro demoa…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Utzi"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Berrezarri"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Berrezarri jatorrizko ezarpenak gailua murriztapenik gabe erabili ahal izateko"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Sakatu informazio gehiago lortzeko."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> desgaituta dago"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferentzia-deia"</string>
</resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 6b6ebff..4377690 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -937,7 +937,7 @@
<string name="selectAll" msgid="6876518925844129331">"انتخاب همه"</string>
<string name="cut" msgid="3092569408438626261">"برش"</string>
<string name="copy" msgid="2681946229533511987">"کپی"</string>
- <string name="paste" msgid="5629880836805036433">"جای گذاری"</string>
+ <string name="paste" msgid="5629880836805036433">"جایگذاری"</string>
<string name="paste_as_plain_text" msgid="5427792741908010675">"جایگذاری به عنوان متن ساده"</string>
<string name="replace" msgid="5781686059063148930">"جایگزین شود..."</string>
<string name="delete" msgid="6098684844021697789">"حذف"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"بهینهسازی فضای ذخیرهسازی."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android درحال ارتقا است"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"تا پایان ارتقا، ممکن است برخی از برنامهها بهدرستی کار نکنند."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> درحال ارتقا است...."</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"در حال بهینهسازی برنامهٔ <xliff:g id="NUMBER_0">%1$d</xliff:g> از <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"آمادهسازی <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"در حال آغاز برنامهها."</string>
@@ -1356,7 +1357,7 @@
<string name="default_audio_route_name" product="tv" msgid="9158088547603019321">"تلویزیون"</string>
<string name="default_audio_route_name" product="default" msgid="4239291273420140123">"تلفن"</string>
<string name="default_audio_route_name_headphones" msgid="8119971843803439110">"هدفونها"</string>
- <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"بلندگوهای جایگاه اتصال"</string>
+ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"بلندگوهای جایگاه"</string>
<string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string>
<string name="default_audio_route_category_name" msgid="3722811174003886946">"سیستم"</string>
<string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"بلوتوثهای صوتی"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"برداشتن پین"</string>
<string name="app_info" msgid="6856026610594615344">"اطلاعات برنامه"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"راهاندازی مجدد جلسه"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"برای شروع جلسه آزمایشی جدید ضربه بزنید"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"شروع نسخه نمایشی"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"راهاندازی مجدد جلسه"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"دستگاه بازنشانی شود؟"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"برای بازنشانی دستگاه، ضربه بزنید"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"در حال شروع نسخه نمایشی…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"در حال بازنشانی دستگاه…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"دستگاه بازنشانی شود؟"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"همه تغییرات را از دست خواهید داد و نسخه نمایشی دوباره تا <xliff:g id="TIMEOUT">%1$s</xliff:g> ثانیه دیگر شروع میشود…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"لغو"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"بازنشانی در این لحظه"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"برای استفاده بدون محدودیت از این دستگاه، بازنشانی کارخانهای انجام دهید"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"برای یادگیری بیشتر لمس کنید."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> غیرفعال شد"</string>
+ <string name="conference_call" msgid="3751093130790472426">"تماس کنفرانسی"</string>
</resources>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index e4345b7..b32099d 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimoidaan tallennustilaa."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Androidia päivitetään"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Kaikki sovellukset eivät ehkä toimi oikein, ennen kuin päivitys on valmis."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> päivittyy…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimoidaan sovellusta <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Valmistellaan: <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Käynnistetään sovelluksia."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Irrota"</string>
<string name="app_info" msgid="6856026610594615344">"Sovelluksen tiedot"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Istunnon uudelleenaloitus"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Aloita uusi esittely napauttamalla."</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Aloitetaan esittelyä"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Aloitetaan istuntoa uudelleen"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Palautetaanko laitteen tehdasasetukset?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Palauta laite napauttamalla"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Aloitetaan esittelyä…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Palautetaan asetuksia…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Palautetaanko laitteen tehdasasetukset?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Muutokset poistetaan ja esittely aloitetaan uudelleen <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunnin kuluttua…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Peruuta"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Palauta nyt"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Palauta tehdasasetukset, jotta voit käyttää tätä laitetta rajoituksitta"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Lue lisätietoja koskettamalla."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ei ole käytössä."</string>
+ <string name="conference_call" msgid="3751093130790472426">"Puhelinneuvottelu"</string>
</resources>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index ef92040..a5d990d 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimisation du stockage."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Installation de la m. à niveau d\'Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Il se peut que certaines applications ne fonctionnent pas correctement jusqu\'à ce que la mise à niveau soit terminée"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Mise à niveau de <xliff:g id="APPLICATION">%1$s</xliff:g> en cours…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimisation de l\'application <xliff:g id="NUMBER_0">%1$d</xliff:g> sur <xliff:g id="NUMBER_1">%2$d</xliff:g>…"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Préparation de <xliff:g id="APPNAME">%1$s</xliff:g> en cours…"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Lancement des applications…"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Annuler l\'épinglage"</string>
<string name="app_info" msgid="6856026610594615344">"Détails de l\'application"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Redémarrer la séance"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Touchez ici pour démarrer une nouvelle séance de démonstration"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Démarrage de la démonstration en cours..."</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Redémarrage de la séance en cours..."</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Réinitialiser l\'appareil?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Touchez pour réinitialiser l\'appareil"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Démarrage de la démonstration en cours…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Réinitialisation de l\'appareil en cours…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Réinitialiser l\'appareil?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Vous perdrez vos modifications, et la démo recommencera dans <xliff:g id="TIMEOUT">%1$s</xliff:g> secondes…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuler"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Réinitialiser maintenant"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Rétablissez la configuration d\'usine de cet appareil pour l\'utiliser sans restrictions"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touchez ici pour en savoir plus."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Désactivé : <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conférence téléphonique"</string>
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 646372e..5fcc9a4 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimisation du stockage en cours…"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Mise à jour d\'Android…"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Certaines applications peuvent ne pas fonctionner correctement jusqu\'à ce que la mise à jour soit terminée."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Mise à jour de l\'application <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimisation de l\'application <xliff:g id="NUMBER_0">%1$d</xliff:g> sur <xliff:g id="NUMBER_1">%2$d</xliff:g>…"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Préparation de <xliff:g id="APPNAME">%1$s</xliff:g> en cours…"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Lancement des applications…"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Retirer"</string>
<string name="app_info" msgid="6856026610594615344">"Infos sur l\'appli"</string>
<string name="negative_duration" msgid="5688706061127375131">"− <xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Redémarrer la session"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Appuyer pour lancer une nouvelle session de démonstration"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Lancement de la démo…"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Redémarrage de la session"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Réinitialiser l\'appareil ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Appuyer pour réinitialiser l\'appareil"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Lancement de la démo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Réinitialisation…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Réinitialiser l\'appareil ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Vous perdrez vos modifications, et la démo recommencera dans <xliff:g id="TIMEOUT">%1$s</xliff:g> secondes…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuler"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Réinitialiser maintenant"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Rétablir la configuration d\'usine pour utiliser cet appareil sans restrictions"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Appuyez ici pour en savoir plus."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Élément \"<xliff:g id="LABEL">%1$s</xliff:g>\" désactivé"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conférence téléphonique"</string>
</resources>
diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml
index 01fc311..feb0802 100644
--- a/core/res/res/values-gl-rES/strings.xml
+++ b/core/res/res/values-gl-rES/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizando almacenamento."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Estase actualizando Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"É posible que algunhas aplicacións non funcionen correctamente ata que finalice o proceso de actualización"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Actualizando <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizando aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparando <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Iniciando aplicacións."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Permite que unha aplicación consulte as sesións de instalación. Desta forma, pode ver os detalles acerca das instalacións de paquetes activas."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"solicitar instalación de paquetes"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Permite a unha aplicación solicitar a instalación dos paquetes."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Toca dúas veces para controlar o zoom"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Non se puido engadir o widget."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Ir"</string>
<string name="ime_action_search" msgid="658110271822807811">"Buscar"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Servizo de clasificación de notificacións"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN activada"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> activou a VPN"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Toca aquí para xestionar a rede."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"Conectado a <xliff:g id="SESSION">%s</xliff:g>. Toca aquí para xestionar a rede."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"VPN sempre activada conectándose..."</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"VPN sempre activada conectada"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Erro na VPN sempre activada"</string>
@@ -1539,8 +1537,8 @@
<string name="immersive_cling_description" msgid="3482371193207536040">"Para saír, pasa o dedo cara abaixo desde arriba."</string>
<string name="immersive_cling_positive" msgid="5016839404568297683">"De acordo"</string>
<string name="done_label" msgid="2093726099505892398">"Feito"</string>
- <string name="hour_picker_description" msgid="6698199186859736512">"Control de desprazamento circular das horas"</string>
- <string name="minute_picker_description" msgid="8606010966873791190">"Control de desprazamento circular dos minutos"</string>
+ <string name="hour_picker_description" msgid="6698199186859736512">"Control desprazable circular das horas"</string>
+ <string name="minute_picker_description" msgid="8606010966873791190">"Control desprazable circular dos minutos"</string>
<string name="select_hours" msgid="6043079511766008245">"Seleccionar horas"</string>
<string name="select_minutes" msgid="3974345615920336087">"Seleccionar minutos"</string>
<string name="select_day" msgid="7774759604701773332">"Seleccionar mes e día"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Soltar"</string>
<string name="app_info" msgid="6856026610594615344">"Información da aplicación"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reiniciar sesión"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Toca para iniciar unha nova sesión de demostración"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Iniciando demostración"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Reiniciando sesión"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Queres restablecer o dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toca aquí para restablecer o dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demostración…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Restablecendo dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Queres restablecer o dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perderás os cambios que fixeses e a demostración volverá comezar en <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restablecer agora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Restablecemento dos valores de fábrica para usar este dispositivo sen restricións"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para acceder a máis información"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Desactivouse <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conferencia telefónica"</string>
</resources>
diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml
index f89d709..964b12c 100644
--- a/core/res/res/values-gu-rIN/strings.xml
+++ b/core/res/res/values-gu-rIN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"સંગ્રહ ઓપ્ટિમાઇઝ કરી રહ્યું છે."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android અપગ્રેડ થઈ રહ્યું છે"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"અપગ્રેડ સમાપ્ત ન થાય ત્યાં સુધી કેટલીક ઍપ્લિકેશનો કદાચ યોગ્ય રીતે કામ ન કરે"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> અપગ્રેડ થઈ રહી છે…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> માંથી <xliff:g id="NUMBER_0">%1$d</xliff:g> ઍપ્લિકેશન ઓપ્ટિમાઇઝ કરી રહ્યું છે."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> તૈયાર કરી રહ્યું છે."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ઍપ્લિકેશનો શરૂ કરી રહ્યાં છે."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"એપ્લિકેશનને ઇન્સ્ટોલ સત્રોને વાંચવાની મંજૂરી આપે છે. આ તેને સક્રિય પૅકેજ ઇન્સ્ટોલેશન્સ વિશે વિગતો જોવાની મંજૂરી આપે છે."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"પૅકેજેસ ઇન્સ્ટૉલ કરવાની વિનંતી કરો"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"એપ્લિકેશનને પૅકેજેસના ઇન્સ્ટોલેશનની વિનંતી કરવાની મંજૂરી આપો."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"ઝૂમ નિયંત્રણ માટે બેવાર ટૅપ કરો"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"વિજેટ ઉમેરી શકાયું નથી."</string>
<string name="ime_action_go" msgid="8320845651737369027">"જાઓ"</string>
<string name="ime_action_search" msgid="658110271822807811">"શોધો"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"સૂચના રેંકર સેવા"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN સક્રિય કર્યું"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> દ્વારા VPN સક્રિય થયું"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"નેટવર્કને સંચાલિત કરવા માટે ટૅપ કરો."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> થી કનેક્ટ થયાં. નેટવર્કને સંચાલિત કરવા માટે ટૅપ કરો."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"હંમેશા-ચાલુ VPN કનેક્ટ થઈ રહ્યું છે…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"હંમેશા-ચાલુ VPN કનેક્ટ થયું"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"હંમેશાં ચાલુ VPN ભૂલ"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"અનપિન કરો"</string>
<string name="app_info" msgid="6856026610594615344">"ઍપ્લિકેશન માહિતી"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"સત્ર પુનઃપ્રારંભ કરો"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"નવું ડેમો સત્ર પ્રારંભ કરવા માટે ટૅપ કરો"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ડેમો પુનઃપ્રારંભ કરી રહ્યાં છે"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"સત્ર પુનઃપ્રારંભ કરી રહ્યાં છે"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ઉપકરણ ફરીથી સેટ કરીએ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ઉપકરણને ફરીથી સેટ કરવા માટે ટૅપ કરો"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ડેમો પ્રારંભ કરી રહ્યાં છે…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"ઉપકરણ ફરીથી સેટ કરી રહ્યાં છે…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ઉપકરણ ફરીથી સેટ કરીએ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"તમે કોઈપણ ફેરફારો ગુમાવશો અને ડેમો <xliff:g id="TIMEOUT">%1$s</xliff:g> સેકન્ડમાં ફરી શરૂ થશે…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"રદ કરો"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"હમણાં ફરીથી સેટ કરો"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"આ ઉપકરણનો પ્રતિબંધો વિના ઉપયોગ કરવા માટે ફેક્ટરી રીસેટ કરો"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"વધુ જાણવા માટે ટચ કરો."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> અક્ષમ કર્યું"</string>
+ <string name="conference_call" msgid="3751093130790472426">"કોન્ફરન્સ કૉલ"</string>
</resources>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index c9537df..c646a57 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"मेमोरी ऑप्टिमाइज़ हो रही है."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android अपग्रेड हो रहा है"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"जब तक अपग्रेड पूरा नहीं हो जाता, तब तक संभव है कि कुछ ऐप्लिकेशन ठीक से कार्य ना करें"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> अपग्रेड हो रहा है…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> में से <xliff:g id="NUMBER_0">%1$d</xliff:g> ऐप्स अनुकूलित हो रहा है."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> तैयार हो रहा है."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ऐप्स प्रारंभ होने वाले हैं"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"अनपिन करें"</string>
<string name="app_info" msgid="6856026610594615344">"ऐप की जानकारी"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"सत्र पुन: प्रारंभ करें"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"एक नया डेमो सत्र प्रारंभ करने के लिए टैप करें"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"डेमो प्रारंभ हो रहा है"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"सत्र पुन: प्रारंभ हो रहा है"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"डिवाइस रीसेट करें?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"डिवाइस को रीसेट करने के लिए टैप करें"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"डेमो प्रारंभ हो रहा है…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"डिवाइस पुन: रीसेट कर रहा है…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"डिवाइस रीसेट करें?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"आपके सभी बदलाव खो जाएंगे और डेमो <xliff:g id="TIMEOUT">%1$s</xliff:g> सेकंड में फिर से शुरू हो जाएगा…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"अभी नहीं"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"अभी रीसेट करें"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"इस डिवाइस को प्रतिबंधों के बिना उपयोग करने के लिए फ़ैक्टरी रीसेट करें"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"अधिक जानने के लिए स्पर्श करें."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"अक्षम <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"कॉन्फ़्रेंस कॉल"</string>
</resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 9ebd40a..eaca463 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -1047,6 +1047,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimiziranje pohrane."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se nadograđuje"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Neke aplikacije možda neće funkcionirati pravilno dok nadogradnja ne završi"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Nadogradnja aplikacije <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimiziranje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Pripremanje aplikacije <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Pokretanje aplikacija."</string>
@@ -1687,11 +1688,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Otkvači"</string>
<string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Ponovno pokretanje sesije"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Dodirnite za pokretanje nove demo-sesije"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Pokretanje demonstracije"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Ponovno pokretanje sesije"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite li vratiti uređaj na zadano?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dodirnite za vraćanje uređaja na zadano"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Pokretanje demo-načina..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Vraćanje uređaja na zadano…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite li vratiti uređaj na zadano?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Sve će se promjene izbrisati, a demonstracija će se ponovo pokrenuti za <xliff:g id="TIMEOUT">%1$s</xliff:g> s…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Odustani"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Vrati na zadano sada"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Uređaj je vraćen na tvorničke postavke da biste ga mogli upotrebljavati bez ograničenja"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da biste saznali više."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – onemogućeno"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferencijski poziv"</string>
</resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index f09ee21..7eecfa3 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Tárhely-optimalizálás."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android frissítése folyamatban"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"A frissítés befejezéséig előfordulhat, hogy egyes alkalmazások nem megfelelően működnek."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"A(z) <xliff:g id="APPLICATION">%1$s</xliff:g> frissítése folyamatban van"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Alkalmazás optimalizálása: <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"A(z) <xliff:g id="APPNAME">%1$s</xliff:g> előkészítése."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Kezdő alkalmazások."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Feloldás"</string>
<string name="app_info" msgid="6856026610594615344">"Alkalmazásinformáció"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Munkamenet újraindítása"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Koppintson az új, bemutató munkamenet indításához"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Bemutató indítása"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Munkamenet újraindítása"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Visszaállítja eszközét?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Koppintson az eszköz visszaállítása érdekében"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Bemutató indítása…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Eszköz visszaállítása…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Visszaállítja eszközét?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"A módosítások elvesznek, és a bemutató újra elindul <xliff:g id="TIMEOUT">%1$s</xliff:g> másodperc múlva…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Mégse"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Visszaállítás most"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Állítsa vissza a gyári beállításokat az eszköz korlátozások nélküli használata érdekében"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Érintse meg a további információkért."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"A(z) <xliff:g id="LABEL">%1$s</xliff:g> letiltva"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferenciahívás"</string>
</resources>
diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml
index beeb4c9..85392ff 100644
--- a/core/res/res/values-hy-rAM/strings.xml
+++ b/core/res/res/values-hy-rAM/strings.xml
@@ -670,7 +670,7 @@
<string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Արտակարգ իրավիճակների հեռախոսահամար"</string>
<string name="lockscreen_carrier_default" msgid="6169005837238288522">"Ծառայություն չկա"</string>
<string name="lockscreen_screen_locked" msgid="7288443074806832904">"Էկրանը կողպված է:"</string>
- <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Սեղմեք Ցանկ` ապակողպելու համար, կամ կատարեք արտակարգ իրավիճակների զանգ:"</string>
+ <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Ապակողպելու կամ շտապ կանչ անելու համար սեղմեք «Ընտրացանկ»"</string>
<string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Ապակողպելու համար սեղմեք Ցանկը:"</string>
<string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Հավաքեք սխեման` ապակողպելու համար"</string>
<string name="lockscreen_emergency_call" msgid="5298642613417801888">"Արտակարգ իրավիճակ"</string>
@@ -967,7 +967,7 @@
<string name="whichApplicationNamed" msgid="8260158865936942783">"Եզրափակել գործողությունը՝ օգտագործելով %1$s"</string>
<string name="whichApplicationLabel" msgid="7425855495383818784">"Ավարտել գործողությունը"</string>
<string name="whichViewApplication" msgid="3272778576700572102">"Բացել հետևյալ ծրագրով՝"</string>
- <string name="whichViewApplicationNamed" msgid="2286418824011249620">"Բացել հետևյալով՝ %1$s"</string>
+ <string name="whichViewApplicationNamed" msgid="2286418824011249620">"Բացել ծրագրով՝ %1$s"</string>
<string name="whichViewApplicationLabel" msgid="2666774233008808473">"Բացել"</string>
<string name="whichEditApplication" msgid="144727838241402655">"Խմբագրել հետևյալ ծրագրով՝"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Խմբագրել հետևյալով՝ %1$s"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Պահեստի օպտիմալացում:"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android-ը նորացվում է"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Հնարավոր է՝ որոշ հավելվածներ մինչև նորացման ավարտը ճիշտ չաշխատեն"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածը նորացվում է…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Օպտիմալացվում է հավելված <xliff:g id="NUMBER_0">%1$d</xliff:g>-ը <xliff:g id="NUMBER_1">%2$d</xliff:g>-ից:"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> հավելվածը պատրաստվում է:"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Հավելվածները մեկնարկում են:"</string>
@@ -1636,7 +1637,7 @@
<string name="language_picker_section_all" msgid="3097279199511617537">"Բոլոր լեզուները"</string>
<string name="locale_search_menu" msgid="2560710726687249178">"Որոնում"</string>
<string name="work_mode_off_title" msgid="8954725060677558855">"Աշխատանքային ռեժիմն ԱՆՋԱՏՎԱԾ Է"</string>
- <string name="work_mode_off_message" msgid="3286169091278094476">"Թույլատրել աշխատանքային պրոֆիլի (այդ թվում նաև հավելվածների, ֆոնային համաժամացման և առնչվող գործառական հնարավորությունների) աշխատանքը:"</string>
+ <string name="work_mode_off_message" msgid="3286169091278094476">"Միացնել աշխատանքային պրոֆիլը՝ հավելվածները, ֆոնային համաժամեցումը և առնչվող գործառույթները"</string>
<string name="work_mode_turn_on" msgid="2062544985670564875">"Միացնել"</string>
<string name="new_sms_notification_title" msgid="8442817549127555977">"Դուք ունեք նոր հաղորդագրություններ"</string>
<string name="new_sms_notification_content" msgid="7002938807812083463">"Դիտելու համար բացել SMS հավելվածը"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Ապամրացնել"</string>
<string name="app_info" msgid="6856026610594615344">"Հավելվածի տվյալներ"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Վերագործարկել աշխատաշրջանը"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Հպեք՝ նոր ցուցադրական աշխատաշրջան սկսելու համար"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Ցուցադրական օգտվողի գործարկում"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Աշխատաշրջանի վերագործարկում"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Վերակայե՞լ սարքը:"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Հպեք՝ սարքը վերակայելու համար"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Ցուցադրական օգտվողը գործարկվում է…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Սարաքը վերակայվում է…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Վերակայե՞լ սարքը:"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Կատարված փոփոխությունները չեն պահվի, իսկ ցուցադրական նյութը կրկին կգործարկվի <xliff:g id="TIMEOUT">%1$s</xliff:g> վայրկյանից…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Չեղարկել"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Վերակայել հիմա"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Սարքն առանց սահմանափակումների օգտագործելու համար կատարեք գործարանային վերակայում"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Հպեք՝ ավելին իմանալու համար:"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Անջատած <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Կոնֆերանս զանգ"</string>
</resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 93eb72e..4790524 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Mengoptimalkan penyimpanan."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android sedang meningkatkan versi"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Beberapa aplikasi mungkin tidak berfungsi dengan baik jika peningkatan versi belum selesai"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> sedang ditingkatkan versinya…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Mengoptimalkan aplikasi <xliff:g id="NUMBER_0">%1$d</xliff:g> dari <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Menyiapkan <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Memulai aplikasi."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Lepas pin"</string>
<string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Mulai Ulang Sesi"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Ketuk untuk memulai sesi demo baru"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Memulai demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Memulai ulang sesi"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Setel ulang perangkat?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Ketuk untuk menyetel ulang perangkat"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Memulai demo..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Menyetel ulang perangkat..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Setel ulang perangkat?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perubahan yang dibuat akan hilang dan demo akan dimulai lagi dalam <xliff:g id="TIMEOUT">%1$s</xliff:g> detik…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Batal"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Setel ulang sekarang"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Dikembalikan ke setelan pabrik agar perangkat ini dapat digunakan tanpa batasan"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Sentuh untuk mempelajari lebih lanjut."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> dinonaktifkan"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferensi Telepon"</string>
</resources>
diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml
index 510d447..fb31267 100644
--- a/core/res/res/values-is-rIS/strings.xml
+++ b/core/res/res/values-is-rIS/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Fínstillir geymslu."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android er að uppfæra"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Hugsanlega virka sum forrit ekki fyrr en uppfærslunni lýkur"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> uppfærir…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Fínstillir forrit <xliff:g id="NUMBER_0">%1$d</xliff:g> af <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Undirbýr <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Ræsir forrit."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Leyfir forriti að lesa uppsetningarlotur. Þetta gerir því kleift að sjá upplýsingar um virkar pakkauppsetningar."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"fara fram á uppsetningu pakka"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Leyfir forriti að fara fram á uppsetningu pakka."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Ýttu tvisvar til að opna aðdráttarstýringar"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Ekki tókst að bæta græju við."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Áfram"</string>
<string name="ime_action_search" msgid="658110271822807811">"Leita"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Tilkynningaröðun"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN virkjað"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"VPN er virkjað með <xliff:g id="APP">%s</xliff:g>"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Ýttu til að hafa umsjón með netkerfi"</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"Tengt við <xliff:g id="SESSION">%s</xliff:g>. Ýttu til að hafa umsjón með netinu."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Sívirkt VPN tengist…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"Sívirkt VPN tengt"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Villa í sívirku VPN"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Losa"</string>
<string name="app_info" msgid="6856026610594615344">"Forritsupplýsingar"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Endurræsa lotu"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Ýttu til að hefja nýja tilraunalotu"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Byrjar kynningu"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Endurræsir lotu"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Endurstilla tækið?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Ýttu til að endurstilla tækið"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Byrjar kynningu…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Endurstillir tækið…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Endurstilla tækið?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Þú glatar öllum breytingum og kynningin byrjar aftur eftir <xliff:g id="TIMEOUT">%1$s</xliff:g> sekúndur…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Hætta við"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Endurstilla núna"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Núllstilltu til að nota þetta tæki án takmarkana"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Snertu til að fá frekari upplýsingar."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Slökkt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Símafundur"</string>
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index f39a804..eec694e 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ottimizzazione archiviazione."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Aggiornamento di Android in corso"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Alcune app potrebbero non funzionare correttamente fino al completamento dell\'upgrade"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Upgrade dell\'app <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Ottimizzazione applicazione <xliff:g id="NUMBER_0">%1$d</xliff:g> di <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> in preparazione."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Avvio applicazioni."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Sblocca"</string>
<string name="app_info" msgid="6856026610594615344">"Informazioni app"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Riavvia la sessione"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tocca per iniziare una nuova sessione demo"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Avvio della demo in corso"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Riavvio della sessione in corso"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Ripristinare il dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tocca per ripristinare il dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Avvio della demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Ripristino del dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Ripristinare il dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perderai tutte le modifiche e la demo verrà riavviata tra <xliff:g id="TIMEOUT">%1$s</xliff:g> secondi…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annulla"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ripristina ora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Esegui il ripristino dei dati di fabbrica per utilizzare il dispositivo senza limitazioni"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tocca per ulteriori informazioni."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> disattivato"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Audioconferenza"</string>
</resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index 76a7988..39bb50f 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"מתבצעת אופטימיזציה של האחסון."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android מבצע שדרוג"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"ייתכן שאפליקציות מסוימות לא יפעלו כראוי עד סיום השדרוג"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> מבצעת שדרוג…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"מבצע אופטימיזציה של אפליקציה <xliff:g id="NUMBER_0">%1$d</xliff:g> מתוך <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"מכין את <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"מפעיל אפליקציות."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"בטל הצמדה"</string>
<string name="app_info" msgid="6856026610594615344">"פרטי אפליקציה"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"הפעלה מחדש"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"הקש כדי להפעיל הדגמה חדשה"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"מתחיל בהדגמה"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"מפעיל מחדש"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"האם לאפס את המכשיר?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"הקש כדי לאפס את המכשיר"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"מתחיל בהדגמה…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"מאפס את המכשיר…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"האם לאפס את המכשיר?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"תאבד את כל השינויים וההדגמה תתחיל שוב בעוד <xliff:g id="TIMEOUT">%1$s</xliff:g> שניות…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"בטל"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"אפס עכשיו"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"איפוס להגדרות היצרן כדי לאפשר שימוש במכשיר ללא מגבלות"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"גע לקבלת מידע נוסף."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> הושבת"</string>
+ <string name="conference_call" msgid="3751093130790472426">"שיחת ועידה"</string>
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index cab7f99..da90057 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"ストレージを最適化しています。"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android のアップグレード中"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"アップグレードが完了するまで一部のアプリが正常に動作しない可能性があります"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」をアップグレードしています…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>個中<xliff:g id="NUMBER_0">%1$d</xliff:g>個のアプリを最適化しています。"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g>をペア設定しています。"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"アプリを起動しています。"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"固定を解除"</string>
<string name="app_info" msgid="6856026610594615344">"アプリ情報"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"新しいセッションの開始"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"新しいデモセッションを開始するにはタップ"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"デモを開始しています"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"新しいセッションを開始しています"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"端末をリセットしますか？"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"端末をリセットするにはタップしてください"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"デモを開始しています…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"端末をリセットしています…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"端末をリセットしますか？"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"変更が失われ、<xliff:g id="TIMEOUT">%1$s</xliff:g> 秒後にデモがもう一度開始されます…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"キャンセル"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"今すぐリセット"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"制限なしでこの端末を使用するには初期状態にリセットしてください"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"タップして詳細をご確認ください。"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"停止済みの「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
+ <string name="conference_call" msgid="3751093130790472426">"グループ通話"</string>
</resources>
diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml
index 9c57779..2d3aaa6 100644
--- a/core/res/res/values-ka-rGE/strings.xml
+++ b/core/res/res/values-ka-rGE/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"მეხსიერების ოპტიმიზირება."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ახალ ვერსიაზე გადადის"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"ახალ ვერსიაზე გადასვლის დასრულებამდე, ზოგიერთმა აპმა შეიძლება არასწორად იმუშაოს"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ახალ ვერსიაზე გადადის…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"მიმდინარეობს აპლიკაციების ოპტიმიზაცია. დასრულებულია <xliff:g id="NUMBER_0">%1$d</xliff:g>, სულ <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"ემზადება <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"აპების ჩართვა"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ჩამაგრების მოხსნა"</string>
<string name="app_info" msgid="6856026610594615344">"აპის შესახებ"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"სესიის ხელახლა დაწყება"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"შეეხეთ ახალი სადემონსტრაციო სესიის დასაწყებად"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"მიმდინარეობს დემონსტრაციის დაწყება"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"მიმდინარეობს სესიის ხელახლა დაწყება"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"გსურთ მოწყობილობის გადაყენება?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"შეეხეთ მოწყობილობის გადასაყენებლად"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"მიმდინარეობს დემონსტრაციის დაწყება…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"მიმდინარეობს მოწყობილობის გადაყენება…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"გსურთ მოწყობილობის გადაყენება?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"შეტანილი ცვლილებები დაიკარგება, ხოლო დემონსტრაცია ხელახლა <xliff:g id="TIMEOUT">%1$s</xliff:g> წამში დაიწყება…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"გაუქმება"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ახლავე გადაყენება"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ამ მოწყობილობის შეზღუდვების გარეშე გამოსაყენებლად, დააბრუნეთ ქარხნული პარამეტრები"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"შეეხეთ მეტის გასაგებად."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"გათიშული <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"საკონფერენციო ზარი"</string>
</resources>
diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml
index e7f47f0..7d3eddf 100644
--- a/core/res/res/values-kk-rKZ/strings.xml
+++ b/core/res/res/values-kk-rKZ/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Қойманы оңтайландыру."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android жаңартылуда"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Жаңарту аяқталғанға дейін кейбір қолданбалар дұрыс жұмыс істемеуі мүмкін"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> жаңартылуда…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ішінен <xliff:g id="NUMBER_0">%1$d</xliff:g> қолданба оңтайландырылуда."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> дайындалуда."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Қолданбалар іске қосылуда."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Қолданбаға орнату сеанстарын оқуға рұқсат етеді. Бұл оған белсенді бума орнатулары туралы мәліметтерді көруге рұқсат етеді."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"орнату бумаларын сұрау"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Қолданбаның бумаларды орнатуға рұқсат сұрауына мүмкіндік береді."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Масштабтау параметрін басқару үшін екі рет түртіңіз"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Виджетті қосу."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Өту"</string>
<string name="ime_action_search" msgid="658110271822807811">"Іздеу"</string>
@@ -1218,7 +1218,7 @@
<string name="forward_intent_to_work" msgid="621480743856004612">"Осы қолданбаны жұмыс профиліңізде пайдаланып жатырсыз"</string>
<string name="input_method_binding_label" msgid="1283557179944992649">"Енгізу әдісі"</string>
<string name="sync_binding_label" msgid="3687969138375092423">"Синх"</string>
- <string name="accessibility_binding_label" msgid="4148120742096474641">"Қол жетімділік"</string>
+ <string name="accessibility_binding_label" msgid="4148120742096474641">"Арнайы мүмкіндіктер"</string>
<string name="wallpaper_binding_label" msgid="1240087844304687662">"Артқы фоны"</string>
<string name="chooser_wallpaper" msgid="7873476199295190279">"Артқы фонын өзгерту"</string>
<string name="notification_listener_binding_label" msgid="2014162835481906429">"Хабар бақылағыш"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Хабарландыруларды жіктеу қызметі"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN белсенді"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"ВЖЭ <xliff:g id="APP">%s</xliff:g> арқылы қосылған"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Желіні басқару үшін түртіңіз."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> жүйесіне жалғанған. Желіні басқару үшін түріңіз."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Әрқашан қосылған ВЖЖ жалғануда…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"Әрқашан қосылған ВЖЖ жалғанған"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Әрқашан қосылған ВЖЖ қателігі"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Босату"</string>
<string name="app_info" msgid="6856026610594615344">"Қолданба ақпараты"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Сеансты қайта бастау"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Жаңа демо сеансты бастау үшін түртіңіз"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Демо нұсқасын бастау"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Сеансты қайта бастау"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Құрылғыны бастапқы күйге қайтару керек пе?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Құрылғыны бастапқы күйге келтіру үшін түртіңіз"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Демо нұсқасы іске қосылуда..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Құрылғы бастапқы күйге қайтарылуда..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Құрылғыны басқапқы күйге қайтару керек пе?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Барлық өзгеріс жоғалады және демо нұсқасы <xliff:g id="TIMEOUT">%1$s</xliff:g> секундтан кейін қайта қосылады…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Бас тарту"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Қазір бастапқы күйге қайтару"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Осы құрылғыны шектеусіз пайдалану үшін зауыттық параметрлерді қалпына келтіріңіз"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Қосымша мәліметтер алу үшін түртіңіз."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> өшірулі"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конференциялық қоңырау"</string>
</resources>
diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml
index e7f6cb1..aaf6921 100644
--- a/core/res/res/values-km-rKH/strings.xml
+++ b/core/res/res/values-km-rKH/strings.xml
@@ -975,7 +975,7 @@
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"កែសម្រួលជាមួយ %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"កែសម្រួល"</string>
<string name="whichSendApplication" msgid="6902512414057341668">"ចែករំលែកជាមួយ"</string>
- <string name="whichSendApplicationNamed" msgid="2799370240005424391">"ចែករំលែកជាមួយ"</string>
+ <string name="whichSendApplicationNamed" msgid="2799370240005424391">"ចែករំលែកជាមួយ %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"ចែករំលែក"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ផ្ញើដោយប្រើ"</string>
<string name="whichSendToApplicationNamed" msgid="7768387871529295325">"ផ្ញើដោយប្រើ %1$s"</string>
@@ -1026,6 +1026,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"កំពុងធ្វើឲ្យឧបករណ៍ផ្ទុកមានប្រសិទ្ធភាព។"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android កំពុងអាប់គ្រេត..."</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"កម្មវិធីមួយចំនួនអាចនឹងមិនដំណើរការប្រក្រតីនោះទេ រហូតដល់ការអាប់គ្រេតបញ្ចប់"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> អាប់គ្រេត…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"ធ្វើឲ្យកម្មវិធីប្រសើរឡើង <xliff:g id="NUMBER_0">%1$d</xliff:g> នៃ <xliff:g id="NUMBER_1">%2$d</xliff:g> ។"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"កំពុងរៀបចំ <xliff:g id="APPNAME">%1$s</xliff:g>។"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ចាប់ផ្ដើមកម្មវិធី។"</string>
@@ -1653,11 +1654,16 @@
<string name="unpin_target" msgid="3556545602439143442">"មិនខ្ទាស់"</string>
<string name="app_info" msgid="6856026610594615344">"ព័ត៌មានកម្មវិធី"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"ចាប់ផ្តើមវេនម្តងទៀត"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"ប៉ះដើម្បីចាប់ផ្តើមវេនបង្ហាញសាកល្បងថ្មី"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"កំពុងចាប់ផ្តើមការបង្ហាញសាកល្បង"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"ចាប់ផ្តើមវេនសារជាថ្មី"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"កំណត់ឧបករណ៍ឡើងវិញឬ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ប៉ះដើម្បីកំណត់ឧបករណ៍ឡើងវិញ"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"កំពុងចាប់ផ្តើមការបង្ហាញសាកល្បង…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"កំពុងកំណត់ឧបករណ៍ឡើងវិញ…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"កំណត់ឧបករណ៍ឡើងវិញឬ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"អ្នកនឹងបាត់បង់ការផ្លាស់ប្តូរណាមួយ ហើយការបង្ហាញសាកល្បងនឹងចាប់ផ្តើមម្តងទៀតក្នុងរយៈពេល <xliff:g id="TIMEOUT">%1$s</xliff:g> វិនាទីទៀត…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"បោះបង់"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"កំណត់ឡើងវិញឥឡូវនេះ"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"កំណត់ដូចចេញពីរោងចក្រឡើងវិញដើម្បីប្រើឧបករណ៍នេះដោយគ្មានការរឹតបន្តឹង"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"ប៉ះ ដើម្បីស្វែងយល់បន្ថែម។"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ដែលបានបិទដំណើរការ"</string>
+ <string name="conference_call" msgid="3751093130790472426">"ការហៅជាក្រុម"</string>
</resources>
diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml
index e4c5031..6cdf10c 100644
--- a/core/res/res/values-kn-rIN/strings.xml
+++ b/core/res/res/values-kn-rIN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"ಸಂಗ್ರಹಣೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ಅಪ್ಗ್ರೇಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"ಅಪ್ಗ್ರೇಡ್ ಮುಗಿಯುವ ತನಕ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡದಿರಬಹುದು"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ಅಪ್ಗ್ರೇಡ್ ಆಗುತ್ತಿದೆ..."</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER_0">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> ಸಿದ್ಧಪಡಿಸಲಾಗುತ್ತಿದೆ."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"ಸ್ಥಾಪಿತ ಸೆಷನ್ಗಳನ್ನು ಓದಲು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಅನುಮತಿಸುತ್ತದೆ. ಸಕ್ರಿಯ ಪ್ಯಾಕೇಜ್ ಸ್ಥಾಪನೆಗಳ ಕುರಿತು ವಿವರಣೆಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಇದು ಅನುಮತಿಸುತ್ತದೆ."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"ಸ್ಥಾಪನೆ ಪ್ಯಾಕೇಜ್ಗಳನ್ನು ವಿನಂತಿಸಿ"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"ಪ್ಯಾಕೇಜ್ಗಳ ಸ್ಥಾಪನೆಯನ್ನು ವಿನಂತಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"ಝೂಮ್ ನಿಯಂತ್ರಿಸಲು ಎರಡು ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"ವಿಜೆಟ್ ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."</string>
<string name="ime_action_go" msgid="8320845651737369027">"ಹೋಗು"</string>
<string name="ime_action_search" msgid="658110271822807811">"ಹುಡುಕು"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"ಅಧಿಸೂಚನೆ ಶ್ರೇಣಿಯ ಸೇವೆ"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN ಸಕ್ರಿಯಗೊಂಡಿದೆ"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ಮೂಲಕ VPN ಸಕ್ರಿಯಗೊಂಡಿದೆ"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"ನೆಟ್ವರ್ಕ್ ನಿರ್ವಹಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ. ನೆಟ್ವರ್ಕ್ ನಿರ್ವಹಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"ಯಾವಾಗಲೂ-ಆನ್ VPN ಸಂಪರ್ಕಗೊಳ್ಳುತ್ತಿದೆ…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"ಯಾವಾಗಲೂ-ಆನ್ VPN ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"ಯಾವಾಗಲೂ-ಆನ್ VPN ದೋಷ"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ಅನ್ಪಿನ್"</string>
<string name="app_info" msgid="6856026610594615344">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"ಸೆಶನ್ ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"ಹೊಸ ಡೆಮೊ ಸೆಶನ್ ಪ್ರಾರಂಭಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ಡೆಮೋ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"ಸೆಶನ್ ಮರುಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ಸಾಧನ ಮರುಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ಡೆಮೋ ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"ಸಾಧನ ಮರುಹೊಂದಿಸಲಾಗುತ್ತಿದೆ..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ನೀವು ಯಾವುದೇ ಬದಲಾವಣೆಗಳನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ ಮತ್ತು <xliff:g id="TIMEOUT">%1$s</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಡೆಮೋ ಮತ್ತೆ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ..."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ರದ್ದುಮಾಡು"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ಈಗಲೇ ಮರುಹೊಂದಿಸು"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ನಿರ್ಬಂಧಗಳು ಇಲ್ಲದೆಯೇ ಈ ಸಾಧನವನ್ನು ಬಳಸಲು ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ಸ್ಪರ್ಶಿಸಿ."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="conference_call" msgid="3751093130790472426">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index 590a250..68a3f25 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"저장소 최적화 중"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android 업그레이드 중"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"특정 앱은 업그레이드가 완료될 때까지 제대로 작동하지 않을 수 있습니다."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> 업그레이드 중…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"앱 <xliff:g id="NUMBER_1">%2$d</xliff:g>개 중 <xliff:g id="NUMBER_0">%1$d</xliff:g>개 최적화 중"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> 준비 중..."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"앱을 시작하는 중입니다."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"고정 해제"</string>
<string name="app_info" msgid="6856026610594615344">"앱 정보"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"세션 다시 시작"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"탭하여 새로운 데모 세션 시작"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"데모 시작 중"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"세션 다시 시작 중"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"기기를 초기화하시겠습니까?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"기기를 초기화하려면 탭하세요."</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"데모 시작 중..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"기기 초기화 중..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"기기를 초기화하시겠습니까?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"변경사항이 사라지며 데모가 <xliff:g id="TIMEOUT">%1$s</xliff:g>초 후에 시작됩니다."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"취소"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"지금 초기화"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"제한 없이 기기를 사용하기 위한 초기화"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"자세한 내용을 보려면 터치하세요."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> 사용 중지됨"</string>
+ <string name="conference_call" msgid="3751093130790472426">"다자간 통화"</string>
</resources>
diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml
index f0b22cf..fb5085d 100644
--- a/core/res/res/values-ky-rKG/strings.xml
+++ b/core/res/res/values-ky-rKG/strings.xml
@@ -1015,7 +1015,7 @@
<string name="screen_compat_mode_scale" msgid="3202955667675944499">"Шкала"</string>
<string name="screen_compat_mode_show" msgid="4013878876486655892">"Ар дайым көрсөтүлсүн"</string>
<string name="screen_compat_mode_hint" msgid="1064524084543304459">"Муну тутум жөндөөлөрүнөн кайра иштетүү > Колдонмолор > Жүктөлүп алынган."</string>
- <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу учурдагы дисплей өлчөмүнүн жөндөөлөрүн колдоого албагандыктан, күтүүсүз аракеттерди жасашы мүмкүн."</string>
+ <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу көрүнүштүн тандалган өлчөмүн экранда көрсөтө албайт жана туура эмес иштеши мүмкүн."</string>
<string name="unsupported_display_size_show" msgid="7969129195360353041">"Ар дайым көрсөтүлсүн"</string>
<string name="smv_application" msgid="3307209192155442829">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу (<xliff:g id="PROCESS">%2$s</xliff:g> процесси) өз алдынча иштеткен StrictMode саясатын бузду."</string>
<string name="smv_process" msgid="5120397012047462446">"<xliff:g id="PROCESS">%1$s</xliff:g> процесси өзүнүн мажбурланган StrictMode саясатын бузуп койду."</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Сактагыч ыңгайлаштырылууда."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android жаңыртылууда"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Жаңыртуу аягына чыкмайынча айрым колдонмолор талаптагыдай иштебей калышы мүмкүн"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> жаңыртылууда..."</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ичинен <xliff:g id="NUMBER_0">%1$d</xliff:g> колдонмо ыңгайлаштырылууда."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> даярдалууда."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Колдонмолорду иштетип баштоо"</string>
@@ -1654,11 +1655,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Кадоодон алып коюу"</string>
<string name="app_info" msgid="6856026610594615344">"Колдонмо тууралуу"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Сеансты кайра баштоо"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Жаңы демо сеансын баштоо үчүн таптап коюңуз"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Демо башталууда"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Сеанс кайра башталууда"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Түзмөк баштапкы абалга келтирилсинби?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Түзмөктү баштапкы абалга келтирүү үчүн таптап коюңуз"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Демо режим башталууда…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Түзмөк баштапкы абалга келтирилүүдө…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Түзмөк баштапкы абалга келтирилсинби?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Бардык өзгөртүүлөр жоголуп, демо режим <xliff:g id="TIMEOUT">%1$s</xliff:g> секунддан кийин кайра башталат…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Жокко чыгаруу"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Баштапкы абалга келтирүү"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Бул түзмөктү чектөөсүз колдонуу үчүн аны баштапкы абалга келтириңиз"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Көбүрөөк билүү үчүн тийип коюңуз."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> өчүрүлдү"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конференц чалуу"</string>
</resources>
diff --git a/core/res/res/values-land/integers.xml b/core/res/res/values-land/integers.xml
index 020fd23..a578989 100644
--- a/core/res/res/values-land/integers.xml
+++ b/core/res/res/values-land/integers.xml
@@ -23,4 +23,6 @@
<integer name="kg_widget_region_weight">45</integer>
<integer name="kg_security_flipper_weight">55</integer>
<integer name="kg_glowpad_rotation_offset">-90</integer>
+
+ <integer name="date_picker_header_max_lines_material">4</integer>
</resources>
diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml
index 2c43727..6fcc233 100644
--- a/core/res/res/values-lo-rLA/strings.xml
+++ b/core/res/res/values-lo-rLA/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"ການປັບບ່ອນເກັບຂໍ້ມູນໃຫ້ເໝາະສົມ."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"ກຳລັງອັບເກຣດ Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"ບາງແອັບອາດບໍ່ສາມາດເຮັດວຽກໄດ້ປົກກະຕິຈົນກວ່າຈະອັບເກຣດສຳເລັດ"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"ກຳລັງອັບເກຣດ<xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"ກຳລັງປັບປຸງປະສິດທິພາບແອັບຯທີ <xliff:g id="NUMBER_0">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="NUMBER_1">%2$d</xliff:g> ແອັບຯ."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"ກຳລັງກຽມ <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ກຳລັງເປີດແອັບຯ."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ຖອນປັກໝຸດ"</string>
<string name="app_info" msgid="6856026610594615344">"ຂໍ້ມູນແອັບ"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"ເລີ່ມເຊດຊັນຄືນໃໝ່"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"ແຕະເພື່ອເລີ່ມເຊດຊັນເດໂມໃໝ່"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ກຳລັງເລີ່ມເດໂມ"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"ເລີ່ມເຊດຊັນໃໝ່"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ຣີເຊັດອຸປະກອນບໍ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ແຕະເພື່ອຣີເຊັດອຸປະກອນ"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ກຳລັງເລີ່ມເດໂມ…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"ກຳລັງຣີເຊັດອຸປະກອນ…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ຣີເຊັດອຸປະກອນບໍ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ທ່ານຈະສູນເສຍການປ່ຽນແປງ ແລະ ເດໂມຈະເລີ່ມອີກຄັ້ງໃນອີກ <xliff:g id="TIMEOUT">%1$s</xliff:g> ວິນາທີ…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ຍົກເລີກ"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ຣີເຊັດດຽວນີ້"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ຣີເຊັດໃຫ້ເປັນຄ່າໂຮງງານເພື່ອໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ມີຂໍ້ຈຳກັດ"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"ແຕະເພື່ອສຶກສາເພີ່ມເຕີມ."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"ປິດການນຳໃຊ້ <xliff:g id="LABEL">%1$s</xliff:g> ແລ້ວ"</string>
+ <string name="conference_call" msgid="3751093130790472426">"ການປະຊຸມສາຍ"</string>
</resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 88281d5..8df29db 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizuojama saugykla."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"„Android“ naujovinama"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Kai kurios programos gali tinkamai neveikti, kol naujovinimo procesas nebus baigtas"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"„<xliff:g id="APPLICATION">%1$s</xliff:g>“ naujovinama..."</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizuojama <xliff:g id="NUMBER_0">%1$d</xliff:g> progr. iš <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Ruošiama „<xliff:g id="APPNAME">%1$s</xliff:g>“."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Paleidžiamos programos."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Atsegti"</string>
<string name="app_info" msgid="6856026610594615344">"Programos informacija"</string>
<string name="negative_duration" msgid="5688706061127375131">"–<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Paleisti sesiją iš naujo"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Palieskite, kad pradėtumėte naują demonstracinės versijos sesiją"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Paleidžiama demonstracinė versija"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Seansas paleidžiamas iš naujo"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Iš naujo nustatyti įrenginį?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Palieskite, kad iš naujo nustatytumėte įrenginį"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Paleidžiama demonstracinė versija…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Įrenginys nustatomas iš naujo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Iš naujo nustatyti įrenginį?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Prarasite visus pakeitimus, o demonstracinė versija bus paleista iš naujo po <xliff:g id="TIMEOUT">%1$s</xliff:g> sek…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Atšaukti"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Nustatyti iš naujo dabar"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Atkurkite gamyklinius nustatymus, kad galėtumėte naudoti šį įrenginį be apribojimų"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Palieskite, kad sužinotumėte daugiau."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Išj. valdiklis „<xliff:g id="LABEL">%1$s</xliff:g>“"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferencinis skambutis"</string>
</resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index a2c0917..c5df354 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -1047,6 +1047,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Notiek krātuves optimizēšana."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Notiek Android jaunināšana..."</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Kamēr jaunināšana nebūs pabeigta, dažas lietotnes, iespējams, nedarbosies pareizi."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Notiek lietotnes <xliff:g id="APPLICATION">%1$s</xliff:g> jaunināšana…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Tiek optimizēta <xliff:g id="NUMBER_0">%1$d</xliff:g>. lietotne no <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Notiek lietotnes <xliff:g id="APPNAME">%1$s</xliff:g> sagatavošana."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Notiek lietotņu palaišana."</string>
@@ -1687,11 +1688,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Atspraust"</string>
<string name="app_info" msgid="6856026610594615344">"Lietotnes informācija"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Atkārtoti palaidiet sesiju"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Pieskarieties, lai sāktu jaunu demonstrācijas sesiju."</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demonstrācijas startēšana"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sesijas restartēšana"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vai atiestatīt ierīci?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Pieskarieties, lai atiestatītu ierīci"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Notiek demonstrācijas palaišana..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Notiek ierīces atiestatīšana..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vai atiestatīt ierīci?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Pēc <xliff:g id="TIMEOUT">%1$s</xliff:g> sekundēm zaudēsiet visas izmaiņas un tiks atkārtoti palaista demonstrācija..."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Atcelt"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Atiestatīt tūlīt"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Rūpnīcas datu atiestatīšana ierīces neierobežotai izmantošanai"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Pieskarieties, lai uzzinātu vairāk."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> atspējots"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferences zvans"</string>
</resources>
diff --git a/core/res/res/values-mcc466-mnc01/config.xml b/core/res/res/values-mcc466-mnc01/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc01/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mcc466-mnc02/config.xml b/core/res/res/values-mcc466-mnc02/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc02/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mcc466-mnc03/config.xml b/core/res/res/values-mcc466-mnc03/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc03/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mcc466-mnc06/config.xml b/core/res/res/values-mcc466-mnc06/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc06/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mcc466-mnc07/config.xml b/core/res/res/values-mcc466-mnc07/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc07/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mcc466-mnc11/config.xml b/core/res/res/values-mcc466-mnc11/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc11/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mcc466-mnc92/config.xml b/core/res/res/values-mcc466-mnc92/config.xml
new file mode 100644
index 0000000..3c379d14
--- /dev/null
+++ b/core/res/res/values-mcc466-mnc92/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2016, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml
index 4482328..cd25aa0 100644
--- a/core/res/res/values-mk-rMK/strings.xml
+++ b/core/res/res/values-mk-rMK/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Оптимизирање на складирањето."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android се ажурира"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Некои апликации може да не работат правилно додека не се заврши надградбата"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> се надградува…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Се оптимизира апликација <xliff:g id="NUMBER_0">%1$d</xliff:g> од <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Се подготвува <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Се стартуваат апликациите."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Дозволува апликација да чита сесии на инсталирање. Тоа овозможува апликацијата да гледа детали за активни инсталации на пакет."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"барање пакети за инсталирање"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Дозволува апликацијата да бара инсталација на пакети."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Допрете двапати за контрола на зумот"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Не можеше да се додаде виџет."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Оди"</string>
<string name="ime_action_search" msgid="658110271822807811">"Пребарај"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Услуга за рангирање известувања"</string>
<string name="vpn_title" msgid="19615213552042827">"Активирана VPN"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"VPN е активирана со <xliff:g id="APP">%s</xliff:g>"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Допрете за да управувате со мрежата."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"Поврзани сте на <xliff:g id="SESSION">%s</xliff:g>. Допрете за да управувате со мрежата."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Поврзување со секогаш вклучена VPN..."</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"Поврзани со секогаш вклучена VPN"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Грешка на секогаш вклучена VPN"</string>
@@ -1656,11 +1654,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Откачете"</string>
<string name="app_info" msgid="6856026610594615344">"Информации за апликација"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Започнете сесија одново"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Допрете за да започнете нова демо сесија"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Демото стартува"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Сесијата се рестартира"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Да се ресетира уредот?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Допрете за да го ресетирате уредот"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Се вклучува демонстрацијата…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Се ресетира уредот…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Да се ресетира уредот?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ќе ги изгубите измените и демонстрацијата ќе започне повторно по <xliff:g id="TIMEOUT">%1$s</xliff:g> секунди…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Откажи"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ресетирај сега"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Ресетирајте до фабричките поставки за уредов да го користите без ограничувања"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Допрете за да дознаете повеќе."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Оневозможен <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конференциски повик"</string>
</resources>
diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml
index 6932d16..13e820d 100644
--- a/core/res/res/values-ml-rIN/strings.xml
+++ b/core/res/res/values-ml-rIN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"സ്റ്റോറേജ് ഒപ്റ്റിമൈസ് ചെയ്യുന്നു."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android അപ്ഗ്രേഡുചെയ്യുന്നു"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"അപ്ഗ്രേഡ് പൂർത്തിയാകുന്നത് വരെ ചില ആപ്സ് ശരിയായി പ്രവർത്തിച്ചേക്കില്ല"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> അപ്ഗ്രേഡ് ചെയ്യുന്നു…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g> അപ്ലിക്കേഷൻ ഓപ്റ്റിമൈസ് ചെയ്യുന്നു."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> തയ്യാറാക്കുന്നു."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"അപ്ലിക്കേഷനുകൾ ആരംഭിക്കുന്നു."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"ഇൻസ്റ്റാൾ ചെയ്ത സെഷനുകൾ റീഡുചെയ്യുന്നതിന് ഒരു അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. സജീവ പാക്കേജ് ഇൻസ്റ്റാളേഷനുകളെക്കുറിച്ചുള്ള വിശദാംശങ്ങൾ കാണുന്നതിന് ഇത് അനുവദിക്കുന്നു."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"പാക്കേജുകൾ ഇൻസ്റ്റാൾ ചെയ്യാൻ അഭ്യർത്ഥിക്കുക"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"പാക്കേജുകളുടെ ഇൻസ്റ്റാളേഷൻ അഭ്യർത്ഥിക്കാൻ ഒരു അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"സൂം നിയന്ത്രണം ലഭിക്കാൻ രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"വിജറ്റ് ചേർക്കാനായില്ല."</string>
<string name="ime_action_go" msgid="8320845651737369027">"പോവുക"</string>
<string name="ime_action_search" msgid="658110271822807811">"തിരയൽ"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"അറിയിപ്പ് റാങ്കർ സേവനം"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN സജീവമാക്കി"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ഉപയോഗിച്ച് VPN പ്രവർത്തനക്ഷമമാക്കി"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"നെറ്റ്വർക്ക് മാനേജുചെയ്യാൻ ടാപ്പുചെയ്യുക"</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> എന്ന സെഷനിലേക്ക് കണക്റ്റുചെയ്തു. നെറ്റ്വർക്ക് മാനേജുചെയ്യാൻ ടാപ്പുചെയ്യുക."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"എല്ലായ്പ്പോഴും ഓണായിരിക്കുന്ന VPN കണക്റ്റുചെയ്യുന്നു…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"എല്ലായ്പ്പോഴും ഓണായിരിക്കുന്ന VPN കണക്റ്റുചെയ്തു"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"എല്ലായ്പ്പോഴും ഓണായിരിക്കുന്ന VPN പിശക്"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"അൺപിൻ ചെയ്യുക"</string>
<string name="app_info" msgid="6856026610594615344">"ആപ്പ് വിവരം"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"സെഷൻ പുനരാരംഭിക്കുക"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"പുതിയൊരു ഡെമോ സെഷൻ ആരംഭിക്കാൻ ടാപ്പുചെയ്യുക"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ഡെമോ ആരംഭിക്കുന്നു"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"സെഷൻ പുനരാരംഭിക്കുന്നു"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ഉപകരണം പുനക്രമീകരിക്കണോ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ഉപകരണം പുനക്രമീകരിക്കാൻ ടാപ്പുചെയ്യുക"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ഡെമോ ആരംഭിക്കുന്നു…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"ഉപകരണം പുനക്രമീകരിക്കുന്നു…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ഉപകരണം പുനക്രമീകരിക്കണോ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"മാറ്റങ്ങളെല്ലാം നിങ്ങൾക്ക് നഷ്ടപ്പെടും, <xliff:g id="TIMEOUT">%1$s</xliff:g> സെക്കൻഡിൽ ഡെമോ വീണ്ടും തുടങ്ങും…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"റദ്ദാക്കുക"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ഇപ്പോൾ പുനക്രമീകരിക്കുക"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"നിയന്ത്രണങ്ങൾ ഇല്ലാതെ ഈ ഉപകരണം ഉപയോഗിക്കാൻ ഫാക്ടറി റീസെറ്റ് നടത്തുക"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"കൂടുതലറിയുന്നതിന് സ്പർശിക്കുക."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> പ്രവർത്തനരഹിതമാക്കി"</string>
+ <string name="conference_call" msgid="3751093130790472426">"കോൺഫറൻസ് കോൾ"</string>
</resources>
diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml
index 8b6ab2e..3a1b479 100644
--- a/core/res/res/values-mn-rMN/strings.xml
+++ b/core/res/res/values-mn-rMN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Хадгалалтыг сайжруулж байна."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Андройдыг дэвшүүлж байна"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Шинэчилж дуустал зарим апп хэвийн бус ажиллаж болзошгүй"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g>-г сайжруулж байна…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>-н <xliff:g id="NUMBER_0">%1$d</xliff:g> апп-г тохируулж байна."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Бэлдэж байна <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Апп-г эхлүүлж байна."</string>
@@ -1649,11 +1650,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Unpin"</string>
<string name="app_info" msgid="6856026610594615344">"Апп-н мэдээлэл"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Харилцан үйлдлийг дахин эхлүүлэх"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Демо харилцан үйлдлийг шинээр эхлүүлэхийн тулд товшино уу"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Жишээг эхлүүлж байна"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Харилцан үйлдлийг дахин эхлүүлж байна"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Төхөөрөмжийг шинэчлэх үү?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Төхөөрөмжийг шинэчлэхийн тулд товшино уу"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Жишээг эхлүүлж байна…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Төхөөрөмжийг шинэчилж байна…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Төхөөрөмжийг шинэчлэх үү?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Таны хийсэн өөрчлөлтийг хадгалахгүй бөгөөд жишээ <xliff:g id="TIMEOUT">%1$s</xliff:g> секундын дотор дахин эхлэх болно..."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Цуцлах"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Одоо шинэчлэх"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Энэ төхөөрөмжийг хязгаарлалтгүй ашиглахын тулд үйлдвэрийн тохиргоонд дахин тохируулна уу"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Дэлгэрэнгүй үзэх бол дарна уу."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g>-г цуцалсан"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Хурлын дуудлага"</string>
</resources>
diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml
index cbd62ad..d97be50 100644
--- a/core/res/res/values-mr-rIN/strings.xml
+++ b/core/res/res/values-mr-rIN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"संचयन ऑप्टिमाइझ करत आहे."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android श्रेणीसुधारित होत आहे"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"श्रेणीसुधारणा पूर्ण होईपर्यंत काही अॅप्स योग्यरित्या कार्य करणार नाहीत"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> श्रेणीसुधारित करीत आहे…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> पैकी <xliff:g id="NUMBER_0">%1$d</xliff:g> अॅप ऑप्टिमाइझ करत आहे."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> तयार करीत आहे."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"अॅप्स प्रारंभ करत आहे."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"अनुप्रयोगास स्थापना सत्र वाचण्याची अनुमती देते. हे सक्रिय पॅकेज स्थापनांविषयी तपशील पाहाण्याची यास अनुमती देते."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"पॅकेज स्थापित करण्यासाठी विनंती करा"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"पॅकेजच्या स्थापना करण्यासाठी अनुप्रयोगास अनुमती देते."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"झूम नियंत्रणासाठी दोनदा टॅप करा"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"विजेट जोडू शकलो नाही."</string>
<string name="ime_action_go" msgid="8320845651737369027">"जा"</string>
<string name="ime_action_search" msgid="658110271822807811">"शोधा"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"सूचना रॅंकर सेवा"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN सक्रिय"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> द्वारे VPN सक्रिय केले आहे"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"नेटवर्क व्यवस्थापित करण्यासाठी टॅप करा."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> शी कनेक्ट केले. नेटवर्क व्यवस्थापित करण्यासाठी टॅप करा."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"VPN कनेक्ट करणे नेहमी-चालू…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"VPN कनेक्ट केलेले नेहमी-चालू"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"VPN त्रुटी नेहमी-चालू"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"अनपिन करा"</string>
<string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"सत्र पुन्हा सुरू करा"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"नवीन डेमो सत्र प्रारंभ करण्यासाठी टॅप करा"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"डेमो प्रारंभ करत आहे"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"सत्र पुन्हा सुरू करत आहे"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"डिव्हाइस रीसेट करायचे?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"डिव्हाइस रीसेट करण्यासाठी टॅप करा"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"डेमो प्रारंभ करत आहे..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"डिव्हाइस रीसेट करत आहे..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"डिव्हाइस रीसेट करायचे?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"आपण कोणतेही बदल गमवाल आणि डेमो पुन्हा <xliff:g id="TIMEOUT">%1$s</xliff:g> सेकंदांमध्ये प्रारंभ होईल..."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"रद्द करा"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"आता रीसेट करा"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"हे डिव्हाइस निर्बंधांशिवाय वापरण्यासाठी फॅक्टरी रीसेट करा"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"अधिक जाणून घेण्यासाठी स्पर्श करा."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> अक्षम केले"</string>
+ <string name="conference_call" msgid="3751093130790472426">"परिषद कॉल"</string>
</resources>
diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml
index 6273546..1068c08 100644
--- a/core/res/res/values-ms-rMY/strings.xml
+++ b/core/res/res/values-ms-rMY/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Mengoptimumkan storan."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android sedang ditingkatkan"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Sesetengah apl mungkin tidak berfungsi dengan betul sehingga peningkatan selesai"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> sedang ditingkatkan…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Mengoptimumkan apl <xliff:g id="NUMBER_0">%1$d</xliff:g> daripada <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Menyediakan <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Memulakan apl."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Nyahsemat"</string>
<string name="app_info" msgid="6856026610594615344">"Maklumat apl"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Mulakan Semula Sesi"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Ketik untuk memulakan sesi tunjuk cara baharu"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Memulakan tunjuk cara"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Memulakan semula sesi"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Tetapkan semula peranti?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Ketik untuk menetapkan semula peranti"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Memulakan tunjuk cara…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Menetapkan semula peranti…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Tetapkan semula peranti?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Anda akan kehilangan sebarang perubahan yang dibuat dan tunjuk cara akan dimulakan sekali lagi dalam masa <xliff:g id="TIMEOUT">%1$s</xliff:g> saat…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Batal"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Tetapkan semula sekarang"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Lakukan tetapan semula kilang untuk menggunakan peranti ini tanpa sekatan"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Ketik untuk mengetahui lebih lanjut."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> dilumpuhkan"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Panggilan Sidang"</string>
</resources>
diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml
index 1926015..ea9888c 100644
--- a/core/res/res/values-my-rMM/strings.xml
+++ b/core/res/res/values-my-rMM/strings.xml
@@ -124,7 +124,7 @@
<string name="roamingTextSearching" msgid="8360141885972279963">"ဆားဗစ်အားရှာဖွေနေသည်"</string>
<string name="wfcRegErrorTitle" msgid="2301376280632110664">"Wi-Fi ခေါ်ဆိုမှု"</string>
<string-array name="wfcOperatorErrorAlertMessages">
- <item msgid="2254967670088539682">"Wi-Fi သုံး၍ ဖုန်းခေါ်ဆိုရန်နှင့် မက်စေ့ဂျ်များပို့ရန်၊ ဤဝန်ဆောင်မှုအား စတင်သုံးနိုင်ရန်အတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုအား ဦးစွာမေးမြန်းပါ။ ထို့နောက် ဆက်တင်မှတဆင့် Wi-Fi ခေါ်ဆိုမှုအား ထပ်ဖွင့်ပါ။"</item>
+ <item msgid="2254967670088539682">"Wi-Fi သုံး၍ ဖုန်းခေါ်ဆိုရန်နှင့် မက်ဆေ့ဂျ်များပို့ရန်၊ ဤဝန်ဆောင်မှုအား စတင်သုံးနိုင်ရန်အတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုအား ဦးစွာမေးမြန်းပါ။ ထို့နောက် ဆက်တင်မှတဆင့် Wi-Fi ခေါ်ဆိုမှုအား ထပ်ဖွင့်ပါ။"</item>
</string-array>
<string-array name="wfcOperatorErrorNotificationMessages">
<item msgid="6177300162212449033">"သင့် မိုဘိုင်းဝန်ဆောင်မှုဖြင့် မှတ်ပုံတင်ရန်"</item>
@@ -176,7 +176,7 @@
<string name="ssl_ca_cert_noti_by_administrator" msgid="550758088185764312">"သင့်အလုပ်ပရိုဖိုင် စီမံခန့်ခွဲသူမှ"</string>
<string name="ssl_ca_cert_noti_managed" msgid="4030263497686867141">"<xliff:g id="MANAGING_DOMAIN">%s</xliff:g> ဖြင့်"</string>
<string name="work_profile_deleted" msgid="5005572078641980632">"အလုပ်ပရိုဖိုင် ဖျက်ပြီးဖြစ်၏"</string>
- <string name="work_profile_deleted_description" msgid="6305147513054341102">"အက်ဒမင် အက်ပ် ပျောက်နေသောကြောင့် အလုပ်ပရိုဖိုင် ပျက်သွားသည်။"</string>
+ <string name="work_profile_deleted_description" msgid="6305147513054341102">"အက်ဒမင် အက်ပ်ပျောက်နေသောကြောင့် အလုပ်ပရိုဖိုင် ပျက်သွားသည်။"</string>
<string name="work_profile_deleted_details" msgid="226615743462361248">"အလုပ်ပရိုဖိုင် အက်ဒမင် အပလီကေးရှင်းပျောက်နေသည် သို့မဟုတ် ပျက်စီးနေသည်။ ထို့ကြောင့် သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်နေသော ဒေတာများအား ပယ်ဖျက်ခြင်းခံရမည်။ အကူအညီတောင်းခံရန် သင့်အက်ဒမင်အား ဆက်သွယ်ပါ။"</string>
<string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ဤစက်ကိရိယာတွင် သင့်အလုပ်ပရိုဖိုင် မရှိတော့ပါ။"</string>
<string name="factory_reset_warning" msgid="5423253125642394387">"သင့်ကိရိယာအား ပယ်ဖျက်လိမ့်မည်"</string>
@@ -193,9 +193,9 @@
<string name="silent_mode_silent" msgid="319298163018473078">"ဖုန်းမြည်သံပိတ်ထားသည်"</string>
<string name="silent_mode_vibrate" msgid="7072043388581551395">"တုန်ခါခြင်း ဖုန်းမြည်သံ"</string>
<string name="silent_mode_ring" msgid="8592241816194074353">"ဖုန်းမြည်သံဖွင့်ထားသည်"</string>
- <string name="reboot_to_update_title" msgid="6212636802536823850">"Android စနစ်အဆင့်မြှင့်ခြင်း"</string>
- <string name="reboot_to_update_prepare" msgid="6305853831955310890">"အဆင့်မြှင့်တင်ရန် ပြင်ဆင်နေသည်…"</string>
- <string name="reboot_to_update_package" msgid="3871302324500927291">"ပက်ကေ့ အဆင့်မြှင့်ခြင်း စီမံဆောင်ရွက်နေစဉ်…"</string>
+ <string name="reboot_to_update_title" msgid="6212636802536823850">"Android စနစ်အပ်ဒိတ်လုပ်ခြင်း"</string>
+ <string name="reboot_to_update_prepare" msgid="6305853831955310890">"အပ်ဒိတ်လုပ်ရန် ပြင်ဆင်နေသည်…"</string>
+ <string name="reboot_to_update_package" msgid="3871302324500927291">"အပ်ဒိတ်ပက်ကေ့ဂျ်ကို စီမံဆောင်ရွက်နေဆဲ…"</string>
<string name="reboot_to_update_reboot" msgid="6428441000951565185">"ပြန်လည်စတင်နေ…"</string>
<string name="reboot_to_reset_title" msgid="4142355915340627490">"စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း"</string>
<string name="reboot_to_reset_message" msgid="2432077491101416345">"ပြန်လည်စတင်နေ…"</string>
@@ -264,12 +264,12 @@
<string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"သင် အပြန်အလှန်လုပ်နေသော ဝင်းဒိုးမှာပါရှိသည်များကို သေချာစွာ ကြည့်ရှုစစ်ဆေးပါ"</string>
<string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"ထိတို့ခြင်းဖြင့် ရှာဖွေပေးနိုင်တာကို ဖွင့်လိုက်ပါ"</string>
<string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"တို့လိုက်သည့်အရာများကို အသံထွက်ဖတ်ပေးပါလိမ့်မည်။ လက်ဟန်အမူအရာများကို အသုံးပြု၍ မျက်နှာပြင်ကို လေ့လာနိုင်ပါသည်။"</string>
- <string name="capability_title_canRequestEnhancedWebAccessibility" msgid="1739881766522594073">"ပိုမိုကောင်းမွန်သော ဝက်ဘ်အများသုံးစွဲနိုင်မှုကို ဖွင့်ရန်"</string>
+ <string name="capability_title_canRequestEnhancedWebAccessibility" msgid="1739881766522594073">"ပိုမိုကောင်းမွန်သော ဝဘ်ရယူသုံးစွဲနိုင်မှုကို ဖွင့်ရန်"</string>
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"အပလီကေးရှင်းကို ပိုမိုပြည့်စုံစေရန် စကရစ်များကို သွင်းနိုင်ပါတယ်"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ရိုက်သောစာများကို သေချာစွာ စစ်ဆေးပါ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"အရေးကြီးသော ကိုယ်ရေးအချက်အလက်များဖြစ်တဲ့ ခရက်ဒစ်ကဒ်နံပါတ်များနှင့် စကားဝှက်များ ပါဝင်ပါတယ်."</string>
<string name="capability_title_canControlMagnification" msgid="3593493281059424855">"မျက်နှာပြင် ချဲ့ခြင်းကို ထိန်းချုပ်ပါ"</string>
- <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"မျက်နှာပြင် ချဲ့ခြင်းနှင့် နေရာချထားခြင်းကို ထိန်းချုပ်ပါ"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"မျက်နှာပြင် ဇူးမ်အရွယ်နှင့် နေရာချထားခြင်းကို ထိန်းချုပ်ပါ။"</string>
<string name="capability_title_canPerformGestures" msgid="7418984730362576862">"လက်ဟန်များ အသုံးပြုပါ"</string>
<string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"တို့ခြင်း၊ ပွတ်ဆွဲခြင်း၊ နှင့် အခြား လက်ဟန်များကို အသုံးပြုနိုင်ပါသည်။"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"အခြေအနေပြဘားအား အလုပ်မလုပ်ခိုင်းရန်သို့မဟုတ် မွမ်းမံရန်"</string>
@@ -293,17 +293,17 @@
<string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"အမည်သွင်းထားသောဖိဖ့်များကို ဖတ်ခြင်း"</string>
<string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"အက်ပ်အား လောလောဆယ် စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများ ဆိုင်ရာ အသေးစိတ်များကို ရယူခွင့်ပြုသည်။"</string>
<string name="permlab_sendSms" msgid="7544599214260982981">"SMS စာများကို ပို့ကာ ကြည့်မည်"</string>
- <string name="permdesc_sendSms" msgid="7094729298204937667">"အပလီကေးရှင်းအား စာတိုပို့ခွင့် ပြုပါ။ မမျှော်လင့်သော ကုန်ကျမှု ဖြစ်နိုင်ပါသည်။ အန္တရာယ်ရှိ အပလီကေးရှင်းများမှ သင် မသိပဲ စာပို့ခြင်းများ ပြုလုပ်ခြင်းကြောင့် ပိုက်ဆံ အပို ကုန်စေနိုင်သည်"</string>
+ <string name="permdesc_sendSms" msgid="7094729298204937667">"အက်ပ်အား စာတိုပို့ခွင့် ပြုပါ။ မမျှော်လင့်သော ကုန်ကျမှု ဖြစ်နိုင်ပါသည်။ အန္တရာယ်ရှိ အက်ပ်များမှ သင် မသိပဲ စာပို့ခြင်းများ ပြုလုပ်ခြင်းကြောင့် ပိုက်ဆံ အပို ကုန်စေနိုင်သည်"</string>
<string name="permlab_readSms" msgid="8745086572213270480">"သင့်ရဲ့ စာပေးပို့ခြင်းများ ဖတ်ခြင်း (စာတို နှင့် ရုပ်သံစာ)"</string>
<string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"အပလီကေးရှင်းအား တက်ဘလက် သို့မဟုတ် ဆင်းမ်ကဒ်မှာ သိမ်းဆည်းထားသော စာတိုများ ဖတ်ရှုခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် အကြာင်းအရာ သို့မဟုတ် ယုံကြည်စိတ်ချရမှုကို ဂရုမပြုပဲ စာတိုအားလုံးကို ဖတ်နိုင်ပါလိမ်မည်။"</string>
- <string name="permdesc_readSms" product="tv" msgid="5102425513647038535">"သင့်တီဗွီ သို့မဟုတ် ဆင်းမ်ကဒ်တွင် သိမ်းထားသည့် SMS စာများကို အက်ပ် အား ဖတ်ခွင့်ပြုပါ။ ထိုသို့ခွင့်ပြုခြင်းဖြင့် အက်ပ် သည် အကြောင်းအရာ သို့မဟုတ် ယုံကြည်စိတ်ချရမှု တို့နှင့် မသက်ဆိုင်ဘဲ၊ SMS စာများအားလုံးကို ဖတ်နိုင်မည်ဖြစ်၏။"</string>
+ <string name="permdesc_readSms" product="tv" msgid="5102425513647038535">"သင့်တီဗွီ သို့မဟုတ် ဆင်းမ်ကဒ်တွင် သိမ်းထားသည့် SMS စာများကို အက်ပ်အား ဖတ်ခွင့်ပြုပါ။ ထိုသို့ခွင့်ပြုခြင်းဖြင့် အက်ပ်သည် အကြောင်းအရာ သို့မဟုတ် ယုံကြည်စိတ်ချရမှု တို့နှင့် မသက်ဆိုင်ဘဲ၊ SMS စာများအားလုံးကို ဖတ်နိုင်မည်ဖြစ်၏။"</string>
<string name="permdesc_readSms" product="default" msgid="3695967533457240550">"အပလီကေးရှင်းအား ဖုန်း သို့မဟုတ် ဆင်းမ်ကဒ်မှာ သိမ်းဆည်းထားသော စာတိုများ ဖတ်ရှုခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် အကြာင်းအရာ သို့မဟုတ် ယုံကြည်စိတ်ချရမှုကို ဂရုမပြုပဲ စာတိုအားလုံးကို ဖတ်နိုင်ပါလိမ်မည်။"</string>
<string name="permlab_receiveWapPush" msgid="5991398711936590410">"စာပို့ခြင်းအား လက်ခံရယူခြင်း (WAP)"</string>
<string name="permdesc_receiveWapPush" msgid="748232190220583385">"အပလီကေးရှင်းအား WAP စာများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
<string name="permlab_getTasks" msgid="6466095396623933906">"အလုပ်လုပ်နေကြသည့် အက်ပ်များကို ရယူခြင်း"</string>
<string name="permdesc_getTasks" msgid="7454215995847658102">"အပလီကေးရှင်းအား လက်ရှိနဲ့ လတ်တလော လုပ်ဆောင်ခဲ့သော သတင်းအချက်အလက် အသေးစိတ်အား ထုတ်ယူခွင့်ပြုရန်။ အပလီကေးရှင်းမှ သင် ဘယ် အပလီကေးရှင်းများသုံးရှိကြောင့် တွေ့ရှိနိုင်ပါသည်"</string>
<string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"ကိုယ်ရေးအချက်အလက်နှင့် စက်ပစ္စည်း ပိုင်ရှင်များကို စီမံပါ"</string>
- <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"ကိုယ်ရေးအချက်လက်ပိုင်ရှင်များနှင့်စက်ပစ္စည်းပိုင်ရှင်အား သတ်မှတ်ရန် App အားခွင့်ပြုပါ။"</string>
+ <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"ကိုယ်ရေးအချက်လက်ပိုင်ရှင်များနှင့်စက်ပစ္စည်းပိုင်ရှင်အား သတ်မှတ်ရန် အက်ပ်အားခွင့်ပြုပါ။"</string>
<string name="permlab_reorderTasks" msgid="2018575526934422779">"အလုပ်လုပ်နေကြသည့် အက်ပ်များကို ပြန်လည်စီစဉ်ခြင်း"</string>
<string name="permdesc_reorderTasks" msgid="7734217754877439351">"အပလီကေးရှင်းအား နောက်ကွယ် နှင့် ရှေ့မှောက်တွင် လက်ရှိ လုပ်ဆောင်နေမှုများအား ဖယ်ခွင့် ပြုပါ။ သင့် ခွင့်ပြုချက်မပါပဲ လုပ်ဆောင်နိုင်ပါလိမ့်မည်"</string>
<string name="permlab_enableCarMode" msgid="5684504058192921098">"ကားမောင်းနေစဥ်စနစ်အား ရရှိစေခြင်း"</string>
@@ -314,23 +314,23 @@
<string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"အပလီကေးရှင်းအား အခြားအပလီကေးရှင်းများ သို့ တခြား အသုံးပြုသူ မြင်ရသော နေရာများပေါ်တွင် ထပ်၍ ရေးဆွဲခွင့် ပေးသည်။ ဒီခွင့်ပြုမှုဟာ သင် အပလီကေးရှင်းများနဲ့ အသုံးပြုရန် စီစဉ်ထားမှု သို့ သင် မြင်ရသောမြင်ကွင်းအား ပြောင်းလဲမှု ဖြစ်စေနိုင်သည်"</string>
<string name="permlab_persistentActivity" msgid="8841113627955563938">"အက်ပ်ကို အမြဲတမ်း အလုပ်လုပ်စေခြင်း"</string>
<string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"အပလီကေးရှင်းအား မှတ်ဉာဏ်ထဲတွင် ရေရှည်သိမ်းဆည်ထားရန် ခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် တခြားအပလီကေးရှင်းအများအတွက် မှတ်ဉာဏ်ရရှိမှု နည်းသွားနိုင်ပြီး တက်ဘလက်လည်း နှေးသွားနိုင်ပါသည်။"</string>
- <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"မှတ်ဉာဏ်တွင် ၎င်း၏အစိတ်အပိုင်းများကိုယ်တိုင် တည်မြဲနေစေရန် အက်ပ် အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် တီဗွီကို နှေးစေသော အခြား အက်ပ် များ၏ မှတ်ဉာဏ်ကို ကန့်သတ်ထားနိုင်သည်။"</string>
+ <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"မှတ်ဉာဏ်တွင် ၎င်း၏အစိတ်အပိုင်းများကိုယ်တိုင် တည်မြဲနေစေရန် အက်ပ်အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် တီဗွီကို နှေးစေသော အခြား အက်ပ်များ၏ မှတ်ဉာဏ်ကို ကန့်သတ်ထားနိုင်သည်။"</string>
<string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"အပလီကေးရှင်းအား မှတ်ဉာဏ်ထဲတွင် ရေရှည်သိမ်းဆည်ထားရန် ခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် တခြားအပလီကေးရှင်းအများအတွက် မှတ်ဉာဏ်ရရှိမှု နည်းသွားနိုင်ပြီး ဖုန်းလည်း နှေးသွားနိုင်ပါသည်။"</string>
- <string name="permlab_getPackageSize" msgid="7472921768357981986">"အက်ပ် သိုလှောင်မှု နေရာကို တိုင်းထွာခြင်း"</string>
+ <string name="permlab_getPackageSize" msgid="7472921768357981986">"အက်ပ်သိုလှောင်မှု နေရာကို တိုင်းထွာခြင်း"</string>
<string name="permdesc_getPackageSize" msgid="3921068154420738296">"အက်ပ်အား ၎င်း၏ ကုဒ်၊ ဒေတာ၊ နှင့် ကက်ရှ ဆိုက်များကို ရယူခွင့် ပြုသည်။"</string>
<string name="permlab_writeSettings" msgid="2226195290955224730">"စနစ်အပြင်အဆင်အား မွမ်းမံခြင်း"</string>
<string name="permdesc_writeSettings" msgid="7775723441558907181">"အက်ပ်အား စနစ်၏ ဆက်တင် ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ သာမန် အက်ပ်များက သင့် စနစ်၏ စီစဉ်ဖွဲ့စည်းမှုကို ဖျက်ဆီးပစ်နိုင်သည်။"</string>
<string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"အစတွင် လုပ်ဆောင်ရန်"</string>
<string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"အက်ပ်အား စနစ်၏ စတင်မှု ပြီးဆုံးသည့်နှင့် မိမိကိုမိမိ စတင်ခွင့် ပြုသည်။ သို့ဖြစ်၍ ဖုန်း စတင်မှုမှာ အချိန် ပိုကြာနိုင်ပြီး အက်ပ်က တချိန်လုံး အလုပ်လုပ်နေခြင်းကြောင့် တက်ဘလက်၏ အလုပ် တစ်ခုလုံးကို နှေးကွေးလာစေနိုင်သည်။"</string>
- <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"စနစ် စတင်ပြီးသည်နှင့် တစ်ပြိုင်နက် အလိုလို အစပြုရန် အက်ပ် အားခွင့်ပြုပါ။ ထိုသို့ခွင့်ပြုခြင်းဖြင့် တီဗွီအား စရန် အချိန်ကြာစေပြီး အစဉ်အမြဲဖွင့်ထားခြင်းဖြင့် တက်ဘလက်အား နှေးသွားစေရန် အက်ပ် အား ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"စနစ် စတင်ပြီးသည်နှင့် တစ်ပြိုင်နက် အလိုလို အစပြုရန် အက်ပ်အားခွင့်ပြုပါ။ ထိုသို့ခွင့်ပြုခြင်းဖြင့် တီဗွီအား စရန် အချိန်ကြာစေပြီး အစဉ်အမြဲဖွင့်ထားခြင်းဖြင့် တက်ဘလက်အား နှေးသွားစေရန် အက်ပ်အား ခွင့်ပြုပါ။"</string>
<string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"အက်ပ်အား စနစ်၏ စတင်မှု ပြီးဆုံးသည့်နှင့် မိမိကိုမိမိ စတင်ခွင့် ပြုသည်။ သို့ဖြစ်၍ ဖုန်း စတင်မှုမှာ အချိန် ပိုကြာနိုင်ပြီး အက်ပ်က တချိန်လုံး အလုပ်လုပ်နေခြင်းကြောင့် ဖုန်း၏ အလုပ် တစ်ခုလုံးကို နှေးကွေးလာစေနိုင်သည်။"</string>
<string name="permlab_broadcastSticky" msgid="7919126372606881614">"ကြာရှည်ခံ ထုတ်လွှတ်မှု အားပေးပို့ခြင်း"</string>
- <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"အပလီကေးရှင်းအား ကြာရှည်ခံ ထုတ်လွှင့်မှု ပြုပါ။ ဒီထုတ်လွှင့်မှုများဟာ ထုတ်လွှင့်မှု ပြီးဆုံးပြီးသွားတည့်တိုင် ကျန်နေမည် ဖြစ်ပါသည်။ အလွန်အကျွံသုံးခြင်းကြောင့် မက်မိုရီ အသုံးများပြီး တက်ဘလက်နှေးခြင်း၊ မတည်ငြိမ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
- <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"ထုတ်လွှင့်ခြင်းများ ပြီးဆုံးသည့်နောက် ဆက်လက်ရှိနေသည့်၊ တည်မြဲ ထုတ်လွှင့်မှုများပို့ရန် အက်ပ် အား ခွင့်ပြုပါ။ အလွန်အကျွံ လုပ်ဆောင်ပါက တီဗွီ နှေးသွားခြင်း သို့မဟုတ် မှတ်ဉာဏ်အသုံးများမှုကြောင့် မတည်မငြိမ်ဖြစ်ခြင်းများ ဖြစ်တတ်၏။"</string>
- <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"အပလီကေးရှင်းအား ကြာရှည်ခံ ထုတ်လွှင့်မှု ပြုပါ။ ဒီထုတ်လွှင့်မှုများဟာ ထုတ်လွှင့်မှု ပြီးဆုံးပြီးသွားတည့်တိုင် ကျန်နေမည် ဖြစ်ပါသည်။ အလွန်အကျွံသုံးခြင်းကြောင့် မှတ်ဉာဏ်အသုံးများပြီး ဖုန်းနှေးခြင်း၊ မတည်ငြိမ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
+ <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"အက်ပ်အား ကြာရှည်ခံ ထုတ်လွှင့်မှု ပြုပါ။ ဒီထုတ်လွှင့်မှုများဟာ ထုတ်လွှင့်မှု ပြီးဆုံးပြီးသွားတည့်တိုင် ကျန်နေမည် ဖြစ်ပါသည်။ အလွန်အကျွံသုံးခြင်းကြောင့် မက်မိုရီ အသုံးများပြီး တက်ဘလက်နှေးခြင်း၊ မတည်ငြိမ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
+ <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"ထုတ်လွှင့်ခြင်းများ ပြီးဆုံးသည့်နောက် ဆက်လက်ရှိနေသည့်၊ တည်မြဲ ထုတ်လွှင့်မှုများပို့ရန် အက်ပ်အား ခွင့်ပြုပါ။ အလွန်အကျွံ လုပ်ဆောင်ပါက တီဗွီ နှေးသွားခြင်း သို့မဟုတ် မှတ်ဉာဏ်အသုံးများမှုကြောင့် မတည်မငြိမ်ဖြစ်ခြင်းများ ဖြစ်တတ်၏။"</string>
+ <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"အက်ပ်အား ကြာရှည်ခံ ထုတ်လွှင့်မှု ပြုပါ။ ဤထုတ်လွှင့်မှုများဟာ ထုတ်လွှင့်မှု ပြီးဆုံးပြီးသွားတည့်တိုင် ကျန်နေမည် ဖြစ်ပါသည်။ အလွန်အကျွံသုံးခြင်းကြောင့် မှတ်ဉာဏ်အသုံးများပြီး ဖုန်းနှေးခြင်း၊ မတည်ငြိမ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
<string name="permlab_readContacts" msgid="8348481131899886131">"အဆက်အသွယ်များအား ဖတ်ခြင်း"</string>
<string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"အပလီကေးရှင်းအား ခေါ်ဆိုသော အကြိမ်ရေ၊ အီးမေးလ်အကြိမ်ရေ၊ တခြားဆက်သွယ်မှုများစသည်ကဲ့သို့ သင့်တက်ဘလက်မှာ သိမ်းဆည်းထားသော အဆက်အသွယ်များရဲ့ အချက်အလက်ကို ဖတ်ခွင့်ပြုပါ။ ဤသို့ခွင့်ပြုခြင်းအားဖြင့် အပလီကေးရှင်းများကို သင့် အဆက်အသွယ်၏ အချက်မလက်များကို သိမ်းဆည်းရန် ခွင့်ပြုပြီး အန္တရာယ်ရှိသော အပလီကေးရှင်းများမှ ထိုအချက်အလက်များ ကို သင် မသိစေပဲ ဖြန့်ဝေနိုင််မည် ဖြစ်ပါသည်။"</string>
- <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"တစ်ဦးတစ်ယောက်ထံ သင်ခေါ်ထားသော၊ အီးမေးိပု့ထားသော၊ သို့မဟုတ် တစ်ခြားနည်းဖြင့် အဆက်အသွယ်ပြုထားသော အကြိမ်အရေအတွက် အပါအဝင်၊ သင့်တီဗွီတွင် သိမ်းထားသည့် အဆက်အသွယ်ဆိုင်ရာ အချက်အလက်များ ဖတ်ရန် အက်ပ် အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် သင့် အဆက်အသွယ် အချက်အလက်များအား သိမ်းဆည်းရန် အက်ပ် အား ခွင့်ပြုထားခြင်းဖြစ်ပြီး၊ အဆက်အသွယ် အချက်အလက်များအား အန္တရာယ်ရှိသော အက်ပ် များက သင်မသိဘဲ ဝေမျှနိုင်သည်။"</string>
+ <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"တစ်ဦးတစ်ယောက်ထံ သင်ခေါ်ထားသော၊ အီးမေးိပု့ထားသော၊ သို့မဟုတ် တစ်ခြားနည်းဖြင့် အဆက်အသွယ်ပြုထားသော အကြိမ်အရေအတွက် အပါအဝင်၊ သင့်တီဗွီတွင် သိမ်းထားသည့် အဆက်အသွယ်ဆိုင်ရာ အချက်အလက်များ ဖတ်ရန် အက်ပ်အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် သင့် အဆက်အသွယ် အချက်အလက်များအား သိမ်းဆည်းရန် အက်ပ်အား ခွင့်ပြုထားခြင်းဖြစ်ပြီး၊ အဆက်အသွယ် အချက်အလက်များအား အန္တရာယ်ရှိသော အက်ပ်များက သင်မသိဘဲ ဝေမျှနိုင်သည်။"</string>
<string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"အပလီကေးရှင်းအား ခေါ်ဆိုသော အကြိမ်ရေ၊ အီးမေးလ်အကြိမ်ရေ၊ တခြားဆက်သွယ်မှုများစသည်ကဲ့သို့ သင့်ဖုန်းမှာ သိမ်းဆည်းထားသော အဆက်အသွယ်များရဲ့ အချက်အလက်ကို ဖတ်ခွင့်ပြုပါ။ ဤသို့ခွင့်ပြုခြင်းအားဖြင့် အပလီကေးရှင်းများကို သင့် အဆက်အသွယ်၏ အချက်မလက်များကို သိမ်းဆည်းရန် ခွင့်ပြုပြီး အန္တရာယ်ရှိသော အပလီကေးရှင်းများမှ ထိုအချက်အလက်များ ကို သင် မသိစေပဲ ဖြန့်ဝေနိုင််မည် ဖြစ်ပါသည်။"</string>
<string name="permlab_writeContacts" msgid="5107492086416793544">"အဆက်အသွယ်များအား ပြင်ဆင်ခြင်း"</string>
<string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"အပလီကေးရှင်းအား သင့်တက်ဘလက်မှာ သိမ်းဆည်းထားသော အဆက်အသွယ်များရဲ့ အချက်အလက် (အထူးအဆက်အသွယ်များအား ခေါ်ဆိုသော အကြိမ်ရေ၊ အီးမေးလ်ပို့သောအကြိမ်ရေ သို့ အခြားနည်းလမ်းဖြင့်ဆက်သွယ်မှုများ) ကို ပြင်ဆင်ခွင့်ပြုခြင်း။ ဒီခွင့်ပြုချက်က အပလီကေးရှင်းများအား အဆက်အသွယ် အချက်အလက်များ ဖျက်စီးခြင်း လုပ်ဆောင်စေနိုင်မှာ ဖြစ်ပါသည်။"</string>
@@ -338,7 +338,7 @@
<string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"အပလီကေးရှင်းအား သင့်ဖုန်းမှာ သိမ်းဆည်းထားသော အဆက်အသွယ်များရဲ့ အချက်အလက် (အထူးအဆက်အသွယ်များအား ခေါ်ဆိုသော အကြိမ်ရေ၊ အီးမေးလ်ပို့သောအကြိမ်ရေ သို့ အခြားနည်းလမ်းဖြင့်ဆက်သွယ်မှုများ) ကို ပြင်ဆင်ခွင့်ပြုခြင်း။ ဒီခွင့်ပြုချက်က အပလီကေးရှင်းများအား အဆက်အသွယ် အချက်အလက်များ ဖျက်စီးခြင်း လုပ်ဆောင်စေနိုင်မှာ ဖြစ်ပါသည်။"</string>
<string name="permlab_readCallLog" msgid="3478133184624102739">"ခေါ်ဆိုမှု မှတ်တမ်းအား ဖတ်ခြင်း"</string>
<string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"အပလီကေးရှင်းအား တက်ဘလက်၏ အထွက် အဝင် ခေါ်ဆိုမှုများ အပါအဝင် ခေါ်ဆိုမှု မှတ်တမ်းအား ကြည့်ရှုခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် ခေါ်ဆိုမှု မှတ်တမ်းအား သိုလှောင်ခြင်း၊ မျှဝေခြင်းများကို သင် မသိရှိပဲ ပြုလုပ်နိုင်မှာ ဖြစ်ပါသည်"</string>
- <string name="permdesc_readCallLog" product="tv" msgid="5611770887047387926">"အဝင်အထွက် ခေါ်ဆိုထားသော ဒေတာများ အပါအဝင်၊ သင့် တီဗွီ၏ ခေါ်ဆိုမှု မှတ်တမ်းအား ဖတ်ရန် အက်ပ် အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် သင့် ခေါ်ဆိုမှုမှတ်တမ်းဒေတာကို သိမ်းဆည်းရန် အက်ပ် အား ခွင့်ပြုပြီး၊ အန္တရာယ်ရှိသော အက်ပ် များက သင်အား အသိမပေးဘဲ ခေါ်ဆိုမှုမှတ်တမ်းဒေတာကို ဝေမျှနိုင်သည်။"</string>
+ <string name="permdesc_readCallLog" product="tv" msgid="5611770887047387926">"အဝင်အထွက် ခေါ်ဆိုထားသော ဒေတာများ အပါအဝင်၊ သင့် တီဗွီ၏ ခေါ်ဆိုမှု မှတ်တမ်းအား ဖတ်ရန် အက်ပ်အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် သင့် ခေါ်ဆိုမှုမှတ်တမ်းဒေတာကို သိမ်းဆည်းရန် အက်ပ်အား ခွင့်ပြုပြီး၊ အန္တရာယ်ရှိသော အက်ပ်များက သင်အား အသိမပေးဘဲ ခေါ်ဆိုမှုမှတ်တမ်းဒေတာကို ဝေမျှနိုင်သည်။"</string>
<string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"အပလီကေးရှင်းအား ဖုန်း၏ အဝင်အထွက် ခေါ်ဆိုမှုများ အပါအဝင် ခေါ်ဆိုမှု မှတ်တမ်းအား ကြည့်ရှုခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် ခေါ်ဆိုမှု မှတ်တမ်းအား သိုလှောင်ခြင်း၊ မျှဝေခြင်းများကို သင် မသိရှိပဲ ပြုလုပ်နိုင်မှာ ဖြစ်ပါသည်။"</string>
<string name="permlab_writeCallLog" msgid="8552045664743499354">"ခေါ်ဆိုမှုမှတ်တမ်း ရေးသားခြင်း"</string>
<string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"အပလီကေးရှင်းအား သင့်တက်ဘလက်၏ ဖုန်းခေါ်ဆိုမှု မှတ်တမ်း (အဝင်အထွက်ခေါ်ဆိုမှု အချက်အလက်များ) ကို ပြင်ဆင်ခွင့် ပေးခြင်း။ အန္တရာယ်ရှိ အပလီကေးရှင်းများမှ ဤအချက်ကို အသုံးပြု၍ သင့် ဖုန်းခေါ်ဆိုမှု မှတ်တမ်းကို ဖျက်ပစ်ခြင်း၊ ပြင်ဆင်ခြင်းများ ပြုလုပ်နိုင်ပါသည်"</string>
@@ -348,24 +348,24 @@
<string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"သင်၏ နှလုံးခုန်နှုန်းလို ရုပ်ပိုင်း အခြေအနေကို စောင့်ကြပ်သည့် အာရုံခံစက်များထံမှ ဒေတာများကို အက်ပ်အား ရယူသုံးခွင့် ပြုပါ။"</string>
<string name="permlab_readCalendar" msgid="5972727560257612398">"ပြက္ခဒိန်အဖြစ်အပျက်များနှင့် လှို့ဝှက်အချက်အလက်များအား ဖတ်ခြင်း"</string>
<string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"အပလီကေးရှင်းအား တက်ဘလက်ထဲတွင် သိမ်းထားသော သူငယ်ချင်းနှင့် လုပ်ဖော်ကိုင်ဘက်များ၏ ပြက္ခဒိန် အဖြစ်အပျက်များအပါအဝင် အားလုံးကို ဖတ်ရှုခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် အပလီကေးရှင်းမှ ပြက္ခဒိန် အဖြစ်အပျက်များအား လျှို့ဝှက်မှု သို့ ဂရုပြုမှု ကို ထည့်သွင်းမစဉ်းစားပဲ သိမ်းဆည်းခြင်း၊ မျှဝေခြင်း ပြုလုပ်စေနိုင်ပါသည်"</string>
- <string name="permdesc_readCalendar" product="tv" msgid="3191352452242394196">"သူငယ်ချင်းများ သို့မဟုတ် လုပ်ဖော်ကိုင်ဖက်များ၏ ဖြစ်ရပ်များ အပါအဝင်၊ သင့် တီဗွီတွင် သိမ်းထားသော ပြက္ခဒိန်ရှိ ဖြစ်ရပ်များအား ဖတ်ရန် အက်ပ် အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် ယုံကြည်စိတ်ချရမှု သို့မဟုတ် ထိခိုက်လွယ်မှုတို့နှင့် မသက်ဆိုင်ဘဲ၊ သင့် ပြက္ခဒိန်ရှိ ဒေတာကို ဝေမျှရန် သို့မဟုတ် သိမ်းဆည်းရန် အက်ပ် အား ခွင့်ပြုသည်။"</string>
+ <string name="permdesc_readCalendar" product="tv" msgid="3191352452242394196">"သူငယ်ချင်းများ သို့မဟုတ် လုပ်ဖော်ကိုင်ဖက်များ၏ ဖြစ်ရပ်များ အပါအဝင်၊ သင့် တီဗွီတွင် သိမ်းထားသော ပြက္ခဒိန်ရှိ ဖြစ်ရပ်များအား ဖတ်ရန် အက်ပ်အား ခွင့်ပြုပါ။ ဤနည်းဖြင့် ယုံကြည်စိတ်ချရမှု သို့မဟုတ် ထိခိုက်လွယ်မှုတို့နှင့် မသက်ဆိုင်ဘဲ၊ သင့် ပြက္ခဒိန်ရှိ ဒေတာကို ဝေမျှရန် သို့မဟုတ် သိမ်းဆည်းရန် အက်ပ်အား ခွင့်ပြုသည်။"</string>
<string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"အပလီကေးရှင်းအားဖုန်းထဲတွင် သိမ်းထားသော သူငယ်ချင်းနှင့် လုပ်ဖော်ကိုင်ဘက်များ၏ ပြက္ခဒိန် အဖြစ်အပျက်များအပါအဝင် အားလုံးကို ဖတ်ရှုခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် အပလီကေးရှင်းမှ ပြက္ခဒိန် အဖြစ်အပျက်များအား လျှို့ဝှက်မှု သို့ ဂရုပြုမှု ကို ထည့်သွင်းမစဉ်းစားပဲ သိမ်းဆည်းခြင်း၊ မျှဝေခြင်း ပြုလုပ်စေနိုင်ပါသည်"</string>
<string name="permlab_writeCalendar" msgid="8438874755193825647">"ပြက္ခဒိန်အဖြစ်အပျက်များကို ထပ်ထည့်ရန် သို့မဟုတ် မွမ်းမံရန်နှင့် ပိုင်ရှင်၏အသိမပေးပဲ ဧည့်သည်များထံ အီးမေးလ်ပို့ရန်"</string>
- <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"အပလီကေးရှင်းအား သင်၏ တက်ဘလက်တွင် သူငယ်ချင်း အလုပ်ဖော်များ အပါအဝင် သင်၏ ပြောင်းလဲအဖြစ်အပျက်များအား ထည့်ခြင်း၊ ထုတ်ခြင်းအား ခွင့်ပြုရန်။ ဤခွင့်ပြုချက်သည် အပလီကေးရှင်းအား သတင်းများပို့ခြင်းကို ပြက္ခဒိန်ပိုင်ရှင်ဆီမှ လာသလို အနေဖြင့် ပေးပို့ခြင်း သို့မဟုတ် အဖြစ်အပျက်များကို ပိုင်ရှင်မသိပဲ ပြင်ဆင်နိုင်ပါသည်။"</string>
- <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"သင့် သူငယ်ချင်းများ သို့မဟုတ် လုပ်ဖော်ကိုင်ဖက်များ၏ လှုပ်ရှားမှုများ အပါအဝင်၊ သင့်တီဗွီရှိ လှုပ်ရှားမှုများကို ထပ်ထည့်ရန်၊ ဖယ်ထုတ်ရန်၊ ပြောင်းလဲရန် အက်ပ် အား ခွင့်ပြုပါ။ ဤသို့ပြုပါက ပြက္ခဒိန် ပိုင်ရှင်ဆီမှ စာတိုများ လာသကဲ့သို့ စာများပို့ရန်၊ သို့မဟုတ် ပိုင်ရှင်၏ ခွင့်ပြုချက်မရှိဘဲ လှုပ်ရှားမှုများကို ပြင်ဆင်ရန် အက်ပ် အား ခွင့်ပြုထားခြင်း ဖြစ်၏။"</string>
- <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"အပလီကေးရှင်းအား သင်၏ ဖုန်းတွင် သူငယ်ချင်း အလုပ်ဖော်များ အပါအဝင် သင်၏ ပြောင်းလဲအဖြစ်အပျက်များအား ထည့်ခြင်း၊ ထုတ်ခြင်းအား ခွင့်ပြုရန်။ ဤခွင့်ပြုချက်သည် အပလီကေးရှင်းအား သတင်းများပို့ခြင်းကို ပြက္ခဒိန်ပိုင်ရှင်ဆီမှ လာသလို အနေဖြင့် ပေးပို့ခြင်း သို့မဟုတ် အဖြစ်အပျက်များကို ပိုင်ရှင်မသိပဲ ပြင်ဆင်နိုင်ပါသည်။"</string>
+ <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"အက်ပ်အား သင်၏ တက်ဘလက်တွင် မိတ်ဆွေ အလုပ်ဖော်များ အပါအဝင် သင်၏ ပြောင်းလဲအဖြစ်အပျက်များအား ထည့်ခြင်း၊ ထုတ်ခြင်းအား ခွင့်ပြုရန်။ ဤခွင့်ပြုချက်သည် အက်ပ်အား သတင်းများပို့ခြင်းကို ပြက္ခဒိန်ပိုင်ရှင်ဆီမှ လာသလို အနေဖြင့် ပေးပို့ခြင်း သို့မဟုတ် အဖြစ်အပျက်များကို ပိုင်ရှင်မသိပဲ ပြင်ဆင်နိုင်ပါသည်။"</string>
+ <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"သင့် သူငယ်ချင်းများ သို့မဟုတ် လုပ်ဖော်ကိုင်ဖက်များ၏ လှုပ်ရှားမှုများ အပါအဝင်၊ သင့်တီဗွီရှိ လှုပ်ရှားမှုများကို ထပ်ထည့်ရန်၊ ဖယ်ထုတ်ရန်၊ ပြောင်းလဲရန် အက်ပ်အား ခွင့်ပြုပါ။ ဤသို့ပြုပါက ပြက္ခဒိန် ပိုင်ရှင်ဆီမှ စာတိုများ လာသကဲ့သို့ စာများပို့ရန်၊ သို့မဟုတ် ပိုင်ရှင်၏ ခွင့်ပြုချက်မရှိဘဲ လှုပ်ရှားမှုများကို ပြင်ဆင်ရန် အက်ပ်အား ခွင့်ပြုထားခြင်း ဖြစ်၏။"</string>
+ <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"အက်ပ်အား သင်၏ ဖုန်းတွင် မိတ်ဆွေ အလုပ်ဖော်များ အပါအဝင် သင်၏ ပြောင်းလဲအဖြစ်အပျက်များအား ထည့်ခြင်း၊ ထုတ်ခြင်းအား ခွင့်ပြုရန်။ ဤခွင့်ပြုချက်သည် အက်ပ်အား သတင်းများပို့ခြင်းကို ပြက္ခဒိန်ပိုင်ရှင်ဆီမှ လာသလို အနေဖြင့် ပေးပို့ခြင်း သို့မဟုတ် အဖြစ်အပျက်များကို ပိုင်ရှင်မသိပဲ ပြင်ဆင်နိုင်ပါသည်။"</string>
<string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"တည်နေရာပံ့ပိုးမှုညွှန်ကြားချက်အပိုအား ဝင်ရောက်ကြည့်ခြင်း"</string>
<string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"အက်ပ်အား တည်နေရာ စီမံပေးရေး ညွှန်ကြားချက် အပိုများကို ရယူခွင့်ပြုသည်။ သို့ဖြစ်၍ အက်ပ်သည် GPS သို့မဟုတ် အခြား တည်နေရာ ရင်းမြစ်ကို သုံးကြသူတို့၏ လုပ်ငန်းများကို ဝင်စွက်ခွင့် ပြုနိုင်သည်။"</string>
<string name="permlab_accessFineLocation" msgid="251034415460950944">"တိကျတဲ့ တည်နေရာ (GPS နှင့် ကွန်ရက် အခြေခံ)ကို ရယူသုံးရန်"</string>
<string name="permdesc_accessFineLocation" msgid="5295047563564981250">"အပလီကေးရှင်းမှ သင့်ရဲ့ တိကျသောနေရာကို ဂျီပီအက်စ် သို့ ဆယ်လူလာတာဝါတိုင်၊ Wi-Fi အချက်အလက်များ သုံးပြီး ရှာခြင်း ခွင့်ယူပါ။ နေရာပြ ဆားဗစ်များ စက်ပေါ်မှာ ရှိရမှာ ဖြစ်သလို ဖွင့်ထားရမှာလည်း ဖြစ်ပါသည်။ အပလီကေးရှင်းမှ ဒီဆားဗစ်များကို သုံး၍ ရှာဖွေသောကြောင့် ဘက်ထရီ ပိုကုန်နိုင်ပါသည်။"</string>
<string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"အနီးစပ်ဆုံး တည်နေရာ (ကွန်ရက် အခြေခံ)ကို ရယူသုံးရန်"</string>
- <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"သင့်ရဲ့ ပျမ်းမျတည်နေရာကို အက်ပ် အား သိခွင့် ပြုရန်။ ဒီ တည်နေရာကို တည်နေရာရှာဖွေရေး ဆားဗစ်မှ မိုဘိုင်း တာဝါတိုင်၊ Wi-Fi စသည်တို့မှ တဆင့် ရယူပါသည်။ အက်ပ် အနေဖြင့် ဒီ ဆားဗစ်များ ရှိနေရန် လိုအပ်ပါသည်။ ဒီအရာများကို အသုံးပြု၍ သင့်နေရာကို သိနိုင်ပါသည်။"</string>
+ <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"သင့်ရဲ့ ပျမ်းမျတည်နေရာကို အက်ပ်အား သိခွင့် ပြုရန်။ ဒီ တည်နေရာကို တည်နေရာရှာဖွေရေး ဆားဗစ်မှ မိုဘိုင်း တာဝါတိုင်၊ Wi-Fi စသည်တို့မှ တဆင့် ရယူပါသည်။ အက်ပ်အနေဖြင့် ဒီ ဆားဗစ်များ ရှိနေရန် လိုအပ်ပါသည်။ ဒီအရာများကို အသုံးပြု၍ သင့်နေရာကို သိနိုင်ပါသည်။"</string>
<string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"သင့်အသံအပြင်အဆင်အားပြောင်းခြင်း"</string>
<string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"အပလီကေးရှင်းအား အသံအတိုးအကျယ်နှင့် အထွက်ကို မည်သည့်စပီကာကို သုံးရန်စသည်ဖြင့် စက်တစ်ခုလုံးနှင့်ဆိုင်သော အသံဆိုင်ရာ ဆက်တင်များ ပြင်ဆင်ခွင့် ပြုရန်"</string>
<string name="permlab_recordAudio" msgid="3876049771427466323">"အသံဖမ်းခြင်း"</string>
<string name="permdesc_recordAudio" msgid="4906839301087980680">"အပလီကေးရှင်းအား မိုက်ခရိုဖုန်းဖြင့် အသံသွင်းခွင့် ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် သင့် ခွင့်ပြုချက် မပါပဲ အချိန်မရွေး အသံဖမ်းနိုင်ပါမည်"</string>
<string name="permlab_sim_communication" msgid="2935852302216852065">"SIM ထံသို့ ညွှန်ကြားချက်များကို ပို့ပါ"</string>
- <string name="permdesc_sim_communication" msgid="5725159654279639498">"အပလီကေးရှင်းအား ဆင်းမ်ကဒ်ဆီသို့ အမိန့်များ ပေးပို့ခွင့် ပြုခြင်း။ ဒီ ခွင့်ပြုမှုဟာ အန်တရယ် အလွန် ရှိပါသည်။."</string>
+ <string name="permdesc_sim_communication" msgid="5725159654279639498">"အက်ပ်အား ဆင်းမ်ကဒ်ဆီသို့ အမိန့်များ ပေးပို့ခွင့် ပြုခြင်း။ ဤခွင့်ပြုမှုမှာ အန္တရာယ်အလွန် ရှိပါသည်။"</string>
<string name="permlab_camera" msgid="3616391919559751192">"ဓါတ်ပုံနှင့်ဗွီဒီယိုရိုက်ခြင်း"</string>
<string name="permdesc_camera" msgid="8497216524735535009">"အပလီကေးရှင်းအား အလိုအလျောက် ဓာတ်ပုံရိုက်ခွင့်၊ ဗီဒီယို ရိုက်ကူးခွင့် ပြုပါ။ ဒီခွင့်ပြုချက်က အပလီကေးရှင်းကို အချိန်မရွေး ကင်မရာအား ခွင့်ပြုချက် မလိုအပ်ပဲ သုံးခွင့်ပြုပါသည်။"</string>
<string name="permlab_vibrate" msgid="7696427026057705834">"တုန်ခုန်မှုအား ထိန်းချုပ်ခြင်း"</string>
@@ -380,11 +380,11 @@
<string name="permlab_wakeLock" product="tv" msgid="2601193288949154131">"တီဗွီအား နားနေခြင်းမှ ကာကွယ်ရန်"</string>
<string name="permlab_wakeLock" product="default" msgid="573480187941496130">"ဖုန်းအနားယူခြင်းမပြုလုပ်စေရန်"</string>
<string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"အက်ပ်အား တက်ဘလက်ကို အနားမယူနိုင်အောင် ဟန့်တားခွင့် ပြုသည်။"</string>
- <string name="permdesc_wakeLock" product="tv" msgid="3208534859208996974">"တီဗွီ ရပ်နားသွားခြင်းအား ကာကွယ်ရန် အက်ပ် အား ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_wakeLock" product="tv" msgid="3208534859208996974">"တီဗွီ ရပ်နားသွားခြင်းအား ကာကွယ်ရန် အက်ပ်အား ခွင့်ပြုပါ။"</string>
<string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"အက်ပ်အား ဖုန်းကို အနားမယူနိုင်အောင် ဟန့်တားခွင့် ပြုသည်။"</string>
<string name="permlab_transmitIr" msgid="7545858504238530105">"အနီအောက်ရောင်ခြည် ထုတ်လွှတ်ခြင်း"</string>
<string name="permdesc_transmitIr" product="tablet" msgid="5358308854306529170">"အပလီကေးရှင်းအား တက်ဘလက်ရဲ့ အနီအောက်ရောင်ခြည် ထုတ်လွှတ်ခြင်းအား သုံးခွင့်ပေးခြင်း"</string>
- <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"တီဗွီ၏ အင်ဖရာရက် ထုတ်လွှတ်မှုအား အသုံးပြုရန် အက်ပ် အား ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"တီဗွီ၏ အင်ဖရာရက် ထုတ်လွှတ်မှုအား အသုံးပြုရန် အက်ပ်အား ခွင့်ပြုပါ။"</string>
<string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"အပလီကေးရှင်းအား ဖုန်းရဲ့ အနီအောက်ရောင်ခြည် ထုတ်လွှတ်ခြင်းအား သုံးခွင့်ပေးခြင်း"</string>
<string name="permlab_setWallpaper" msgid="6627192333373465143">"နောက်ခံအား သတ်မှတ်ရန်"</string>
<string name="permdesc_setWallpaper" msgid="7373447920977624745">"အက်ပ်အား စနစ် နောက်ခံပုံကို သတ်မှတ်ခွင့် ပြုသည်။"</string>
@@ -392,16 +392,16 @@
<string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"အက်ပ်အား စနစ် နောက်ခံပုံ ဆိုက်ဆိုင်ရာ ညွှန်းချက်များကို သတ်မှတ်ခွင့် ပြုသည်။"</string>
<string name="permlab_setTimeZone" msgid="2945079801013077340">"အချိန်ဇုန်းအား သတ်မှတ်ခြင်း"</string>
<string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"အက်ပ်အား တက်ဘလက်၏ နာရီ ဇုန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
- <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"တီဗွီ၏ အချိန်အပိုင်းအခြားဇုန်အား ပြင်ဆင်ရန် အက်ပ် အား ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"တီဗွီ၏ အချိန်အပိုင်းအခြားဇုန်အား ပြင်ဆင်ရန် အက်ပ်အား ခွင့်ပြုပါ။"</string>
<string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"အက်ပ်အား ဖုန်း၏ နာရီ ဇုန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
<string name="permlab_getAccounts" msgid="1086795467760122114">"စက်ပေါ်မှာ အကောင့်များ ရှာဖွေခြင်း"</string>
<string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"အပလီကေးရှင်းအား တက်ဘလက်မှ သိရှိထားသော အကောင့်များအား ရယူခွင့်ပေးပါ။ ဒီထဲတွင် သင် ထည့်သွင်းထားသော အပလီကေးရှင်းများမှတဆင့် ပြုလုပ်ထားသော အကောင့်များပါ ပါဝင်နိုင်ပါသည်။"</string>
- <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"တီဗွီ သိသော အကောင့်စာရင်းအား ရယူခွင့်ကို အက်ပ် အား ခွင့်ပြုပါ။ သင်ထည့်သွင်းထားသည့် အပလီကေးရှင်းများမှ ဖန်တီးထားသော မည်သည့်အကောင့်မဆို ပါဝင်မည်။"</string>
+ <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"တီဗွီ သိသော အကောင့်စာရင်းအား ရယူခွင့်ကို အက်ပ်အား ခွင့်ပြုပါ။ သင်ထည့်သွင်းထားသည့် အပလီကေးရှင်းများမှ ဖန်တီးထားသော မည်သည့်အကောင့်မဆို ပါဝင်မည်။"</string>
<string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"အပလီကေးရှင်းအား ဖုန်းမှ သိရှိထားသော အကောင့်စာရင်းများအား ရယူခွင့်ပေးပါ။ ဒီထဲတွင် သင် ထည့်သွင်းထားသော အပလီကေးရှင်းများမှတဆင့် ပြုလုပ်ထားသော အကောင့်များပါ ပါဝင်နိုင်ပါသည်။"</string>
<string name="permlab_accessNetworkState" msgid="4951027964348974773">"ကွန်ရက် ချိတ်ဆက်မှုများအား ကြည့်ရန်"</string>
<string name="permdesc_accessNetworkState" msgid="8318964424675960975">"အပလီကေးရှင်းအား မည်သည့်ကွန်ရက်နက်ဝဘ်ရှိသလဲ၊ မည်သည့်ကွန်ရက်နှင့် ချိတ်ဆက်ထားလဲ စသည်ဖြင့် ကွန်ရက်ချိတ်ဆက်မှုများ၏ သတင်းအချက်အလက်များကို ကြည့်ခွင့်ပေးရန်"</string>
<string name="permlab_createNetworkSockets" msgid="7934516631384168107">"ကွန်ရက်ကို အပြည့်အဝ ရယူသုံးနိုင်"</string>
- <string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"အပလီကေးရှင်းအား ကွန်ရက်ဆော့ကတ်များ တည်ဆောက်ခွင့်၊ တသီးတသန့် ကွန်ရက် ပရိုတိုကောလ်များ သုံးခွင့် ပြုပါ။ အင်တာနက်မှ အချက်အလက်များ ပေးပို့ခြင်းကို ဘရောက်ဇာနှင့် တခြား အပလီကေးရှင်းများက လုပ်ဆောင်ပေးသောကြောင့် ဒီခွင့်ပြုချက်က အင်တာနက်မှ အချက်အလက် ပေးပို့ခြင်း မလိုအပ်ပါ"</string>
+ <string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"အက်ပ်အား ကွန်ရက်ဆော့ကတ်များ တည်ဆောက်ခွင့်၊ တသီးတသန့် ကွန်ရက် ပရိုတိုကောလ်များ သုံးခွင့် ပြုပါ။ အင်တာနက်မှ အချက်အလက်များ ပေးပို့ခြင်းကို ဘရောက်ဇာနှင့် တခြား အက်ပ်များက လုပ်ဆောင်ပေးသောကြောင့် ဒီခွင့်ပြုချက်က အင်တာနက်မှ အချက်အလက် ပေးပို့ခြင်း မလိုအပ်ပါ"</string>
<string name="permlab_changeNetworkState" msgid="958884291454327309">"ကွန်ယက်ဆက်သွယ်မှုအားပြောင်းခြင်း"</string>
<string name="permdesc_changeNetworkState" msgid="6789123912476416214">"အက်ပ်အား ကွန်ရက် ချိတ်ဆက်နိုင်စွမ်း အခြေအနေကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
<string name="permlab_changeTetherState" msgid="5952584964373017960">"တစ်ဆင့်ပွါးဆက်သွယ်မှုအားပြောင်းခြင်း"</string>
@@ -412,21 +412,21 @@
<string name="permdesc_changeWifiState" msgid="7137950297386127533">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်တည်နေရာများအား ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်း၊ ဝိုင်ဖိုင်ကွန်ရက်အတွက် စက်အပြင်အဆင်များ ပြုလုပ်ခြင်း ခွင့်ပြုပါ"</string>
<string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"Wi-Fi Multicastလက်ခံခြင်းကိုခွင့်ပြုရန်"</string>
<string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်ကွန်ရက်ပေါ်တွင် သင့်တက်ဘလက်တစ်ခုထဲအားမဟုတ်ပဲ multicast လိပ်စာအား သုံးပြီး လွှင့်ထုတ်သော အချက်အလက်များ လက်ခံခွင့် ပြုပါ။ ဒီလိုသုံးခြင်းမှာ non-multicast ထက် ဘက်ထရီ ပိုကုန်ပါသည်။"</string>
- <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"သင့် တီဗွီနှင့်သာ မဟုတ်ဘဲ၊ ကွန်ယက်လိပ်စာများစွာ သုံးသော ဝိုင်ဖိုင်ကွန်ယက်ရှိ စက်ကိရိယာအားလုံးသို့ ပို့သော ပက်ကက်များအား လက်ခံရရှိရန် အက်ပ် အားခွင့်ပြုပါ။ ၎င်းသည် ကွန်ယက်လိပ်စာများစွာမသုံးသောမုဒ်ထက် စွမ်းအားပိုသုံး၏။"</string>
+ <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"သင့် တီဗွီနှင့်သာ မဟုတ်ဘဲ၊ ကွန်ယက်လိပ်စာများစွာ သုံးသော ဝိုင်ဖိုင်ကွန်ယက်ရှိ စက်ကိရိယာအားလုံးသို့ ပို့သော ပက်ကက်များအား လက်ခံရရှိရန် အက်ပ်အားခွင့်ပြုပါ။ ၎င်းသည် ကွန်ယက်လိပ်စာများစွာမသုံးသောမုဒ်ထက် စွမ်းအားပိုသုံး၏။"</string>
<string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်နက်ဘ်ပေါ်တွင် သင့်ဖုန်းတစ်ခုထဲအားမဟုတ်ပဲ multicast လိပ်စာအား သုံးပြီး လွှင့်ထုတ်သော အချက်အလက်များ လက်ခံခွင့် ပြုပါ။ ဒီလိုသုံးခြင်းမှာ non-multicast ထက် ဘက်ထရီ ပိုကုန်ပါသည်။"</string>
<string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ဘလူးတုသ် ဆက်တင်များအား သုံးခွင့်ပေးရန်"</string>
<string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"အက်ပ်အား ဒေသန္တရ ဘလူးတုသ် တက်ဘလက်ကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string>
- <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"ကွန်ယက်တွင်းရှိ ဘလူးတုသ် တီဗွီအား ပုံစံပြင်ရန်နှင့်၊ အဝေးရှိ စက်ကိရိယာများအား ရှာဖွေတွဲဖက်ရန် အက်ပ် အား ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"ကွန်ယက်တွင်းရှိ ဘလူးတုသ် တီဗွီအား ပုံစံပြင်ရန်နှင့်၊ အဝေးရှိ စက်ကိရိယာများအား ရှာဖွေတွဲဖက်ရန် အက်ပ်အား ခွင့်ပြုပါ။"</string>
<string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"အက်ပ်အား ဒေသန္တရ ဘလူးတုသ် ဖုန်းကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"ဝိုင်မက်စ် နှင့် ချိတ်ဆက်ရန်နှင့် ဆက်သွယ်မှု ဖြတ်တောက်ရန်"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"အပလီကေးရှင်းအား ဝိုင်မက်စ် အခြေအနေ ကြည့်ခွင့်ပေးရန် ဥပမာ ဝိုင်မက်စ် ဖွင့်ထား မထား၊ ဝိုင်မက်စ် ချိတ်ဆက်ထားသော ကွန်ရက်အခြေအနေ"</string>
<string name="permlab_changeWimaxState" msgid="340465839241528618">"WiMAX အခြေအနေကို ပြောင်းရန် ပြင်ရန်"</string>
<string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"အပလီကေးရှင်းအား တက်ဘလက်ကို ဝိုင်မက်စ် ကွန်ရက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်းများ လုပ်ခွင့်ပြုပါ"</string>
- <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"တီဗွီနှင့် ချိတ်ဆက်ရန် အက်ပ် အား ခွင့်ပြုပြီး တီဗွီနှင့် WiMAX ကွန်ယက်များ ချိတ်ဆက်ထားမှုအား ဖြတ်တောက်ပါ။"</string>
+ <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"တီဗွီနှင့် ချိတ်ဆက်ရန် အက်ပ်အား ခွင့်ပြုပြီး တီဗွီနှင့် WiMAX ကွန်ယက်များ ချိတ်ဆက်ထားမှုအား ဖြတ်တောက်ပါ။"</string>
<string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"အပလီကေးရှင်းအား ဖုန်းကို ဝိုင်မက်စ် ကွန်ရက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်းများ လုပ်ခွင့်ပြုပါ"</string>
<string name="permlab_bluetooth" msgid="6127769336339276828">"ဘလူးတုသ် စက်များနှင့် အတူတွဲချိတ်ရန်"</string>
<string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"အပလီကေးရှင်းအား တက်ဘလက်ပေါ်မှ ဘလူးတုသ် အပြင်အဆင်အား ကြည့်ခွင့်၊ တခြားစက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်ခြင်းကို လက်ခံခွင့်ပြုပါ။"</string>
- <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"တီဗွီတွင် ဘလူးတုသ်အတွက် ပုံစံပြင်ခြင်းများ ဝင်ကြည့်ရန်နှင့်၊ တွဲဖက်ထားသည့် စက်ကိရိယာများအား ချိတ်ဆက်မှုပြုရန်နှင့်လက်ခံရန် အက်ပ် အား ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"တီဗွီတွင် ဘလူးတုသ်အတွက် ပုံစံပြင်ခြင်းများ ဝင်ကြည့်ရန်နှင့်၊ တွဲဖက်ထားသည့် စက်ကိရိယာများအား ချိတ်ဆက်မှုပြုရန်နှင့်လက်ခံရန် အက်ပ်အား ခွင့်ပြုပါ။"</string>
<string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"အပလီကေးရှင်းအား ဖုန်းမှဘလူးတု အပြင်အဆင်အား ကြည့်ခွင့်၊ တခြားစက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်ခြင်းကို လက်ခံခွင့်ပြုပါ။"</string>
<string name="permlab_nfc" msgid="4423351274757876953">"Near Field Communicationအား ထိန်းချုပ်ရန်"</string>
<string name="permdesc_nfc" msgid="7120611819401789907">"အက်ပ်အား တာတို စက်ကွင်း ဆက်သွယ်ရေး (NFC) တဲဂ်များ၊ ကဒ်များ နှင့် ဖတ်ကြသူတို့နှင့် ဆက်သွယ်ပြောဆိုခွင့် ပြုသည်။"</string>
@@ -454,9 +454,9 @@
</string-array>
<string name="fingerprint_icon_content_description" msgid="2340202869968465936">"လက်ဗွေ အိုင်ကွန်"</string>
<string name="permlab_readSyncSettings" msgid="6201810008230503052">"ထပ်တူပြုအဆင်အပြင်အားဖတ်ခြင်း"</string>
- <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"အပလီကေးရှင်းအား အကောင့်တစ်ခုအတွက် ထပ်တူညီအောင် လုပ်ဆောင်မှု ဆက်တင်အား ကြည့်ခွင့် ပြုပါ။ ဥပမာ People အက်ပ် က အကောင့်တစ်ခုနဲ့ ထပ်တူညီအောင် လုပ်ရန် ဆက်သွယ်ထားမှု ရှိမရှိ သိရှိနိုင်ခြင်း"</string>
+ <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"အပလီကေးရှင်းအား အကောင့်တစ်ခုအတွက် ထပ်တူညီအောင် လုပ်ဆောင်မှု ဆက်တင်အား ကြည့်ခွင့် ပြုပါ။ ဥပမာ People အက်ပ်က အကောင့်တစ်ခုနဲ့ ထပ်တူညီအောင် လုပ်ရန် ဆက်သွယ်ထားမှု ရှိမရှိ သိရှိနိုင်ခြင်း"</string>
<string name="permlab_writeSyncSettings" msgid="5408694875793945314">"ထပ်တူညီအောင် လုပ်ခြင်းအား ပြုနိုင်၊ မပြုနိုင် အပြောင်းအလဲလုပ်ခြင်း"</string>
- <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"အကောင့်တစ်ခုအတွက် ထပ်တူညီအောင်လုပ်သော ဆက်တင်များကို ပြင်ရန် အက်ပ်ကို ခွင့်ပြုရန်။ ဥပမာ People အက်ပ် က အကောင့်တစ်ခုနှင့် ထပ်တူညီအောင် လုပ်ဆောင်ခြင်းအား ဖွင့်ရန် သုံးနိုင်သည်။"</string>
+ <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"အကောင့်တစ်ခုအတွက် ထပ်တူညီအောင်လုပ်သော ဆက်တင်များကို ပြင်ရန် အက်ပ်ကို ခွင့်ပြုရန်။ ဥပမာ People အက်ပ်က အကောင့်တစ်ခုနှင့် ထပ်တူညီအောင် လုပ်ဆောင်ခြင်းအား ဖွင့်ရန် သုံးနိုင်သည်။"</string>
<string name="permlab_readSyncStats" msgid="7396577451360202448">"ထပ်တူကူးခြင်း ကိန်းဂဏန်းအချက်အလက်များကို ဖတ်ခြင်း"</string>
<string name="permdesc_readSyncStats" msgid="1510143761757606156">"အပလီကေးရှင်းအား အကောင့်တစ်ခု၏ ထပ်တူညီအောင် လုပ်ဆောင်မှု အခြေအနေ (ပြီးခဲ့သော အဖြစ်အပျက်၊ ဒေတာ ပမာဏ ပါဝင်မှု များအပါအဝင်)ကို ဖတ်ရှုခွင့် ပြုပါ။"</string>
<string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"USB သိုလှောင်မှုမှ အချက်အလက်များအား ဖတ်ခြင်း"</string>
@@ -468,7 +468,7 @@
<string name="permdesc_sdcardWrite" product="nosdcard" msgid="6175406299445710888">"အက်ပ်အား USB သိုလှောင်ခန်းသို့ ရေးခွင့် ပြုသည်။"</string>
<string name="permdesc_sdcardWrite" product="default" msgid="4337417790936632090">"အက်ပ်အား SD ကဒ်သို့ ရေးခွင့် ပြုသည်။"</string>
<string name="permlab_use_sip" msgid="2052499390128979920">"SIP ခေါ်ဆိုမှုများ ခေါ်ရန်/လက်ခံရန်"</string>
- <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP ခေါ်ဆိုမှုများ ခေါ်ရန်နှင့် လက်ခံနိုင်ရန် အက်ပ် ကို ခွင့်ပြုပါ။"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP ခေါ်ဆိုမှုများ ခေါ်ရန်နှင့် လက်ခံနိုင်ရန် အက်ပ်ကို ခွင့်ပြုပါ။"</string>
<string name="permlab_register_sim_subscription" msgid="3166535485877549177">"တယ်လီကွမ် ဆင်းမ် ချိတ်ဆက်မှုများကို မှတ်ပုံတင်ပါ"</string>
<string name="permdesc_register_sim_subscription" msgid="2138909035926222911">"အက်ပ်အား တယ်လီကွမ် ဆင်းမ် ချိတ်ဆက်မှုကို မှတ်ပုံတင်ခွင့် ပြုသည်။"</string>
<string name="permlab_register_call_provider" msgid="108102120289029841">"တယ်လီကွမ် တယ်လီကွမ် ချိတ်ဆက်မှု အသစ်များကို မှတ်ပုံတင်ပါ"</string>
@@ -488,37 +488,37 @@
<string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"ကွန်ယက်အသုံးပြုမှုစာရင်းအား မွမ်းမံခြင်း"</string>
<string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"အပလီကေးရှင်းအား တခြားအပလီကေးရှင်းများမှ ကွန်ရက်အသုံးပြုမှု တွက်ချက်ခြင်းအား ပြင်ဆင်ခွင့် ပြုပါ။ ပုံမှန် အပလီကေးရှင်းများအတွက် မလိုအပ်ပါ။"</string>
<string name="permlab_accessNotifications" msgid="7673416487873432268">"သတိပေးချက်များအား အသုံးပြုခွင့်"</string>
- <string name="permdesc_accessNotifications" msgid="458457742683431387">"အပလီကေးရှင်းကို အကြောင်းကြားချက်များအား ထုတ်လုပ်ရန်၊ လေ့လာရန်၊ ဖျက်ပစ်ရန် ခွင့်ပြုခြင်း။ တခြား အပလီကေးရှင်းများမှ သတိပေးချက်များလည်း ပါဝင်ပါသည်"</string>
+ <string name="permdesc_accessNotifications" msgid="458457742683431387">"အပလီကေးရှင်းကို အကြောင်းကြားချက်များအား ထုတ်လုပ်ရန်၊ လေ့လာရန်၊ ဖျက်ရန် ခွင့်ပြုခြင်း။ တခြား အပလီကေးရှင်းများမှ သတိပေးချက်များလည်း ပါဝင်ပါသည်"</string>
<string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"သတိပေးချက် နားထောင်ခြင်း ဆားဗစ် နှင့် ပူးပေါင်းခြင်း"</string>
- <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"ဖုန်းကိုင်ထားသူနှင့် အကြောင်းကြားချက် နားစွင့်သော ဆားဗစ်မှ ထိပ်ပိုင်းအင်တာဖေ့စ် ကို ပူးပေါင်းခွင့်ပေးခြင်း။ ပုံမှန် အပလီကေးရှင်းများမှာ မလိုအပ်ပါ"</string>
+ <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"ဖုန်းကိုင်ထားသူနှင့် အကြောင်းကြားချက် နားစွင့်သော ဆားဗစ်မှ ထိပ်ပိုင်းအင်တာဖေ့စ် ကို ပူးပေါင်းခွင့်ပေးခြင်း။ ပုံမှန် အက်ပ်များအတွက် ဘယ်တော့မှ မလိုအပ်ပါ"</string>
<string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"အခြေအနေ စီမံပေးရေး ဝန်ဆောင်မှု တစ်ခုဆီသို့ ချိတ်တွဲခြင်း"</string>
<string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"စွဲကိုင်ထားသူအား အခြေအနေကို စီမံပေးသူ၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် အက်ပ်များ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindDreamService" msgid="4153646965978563462">"အိပ်မက် ဝန်ဆောင်မှုသို့ ပေါင်းစည်းမည်"</string>
- <string name="permdesc_bindDreamService" msgid="7325825272223347863">"အိမ်မက်ဝန်ဆောင်မှု၏ ထိပ်တန်းအဆင့် မျက်နှာပြင်အား ကိုင်ဆောင်သူမှ ပေါင်းစည်းရန် ခွင့်ပြုမည်။ သာမန် အပလီကေးရှင်းများတွင် မလိုအပ်ပါ။"</string>
+ <string name="permdesc_bindDreamService" msgid="7325825272223347863">"အိမ်မက်ဝန်ဆောင်မှု၏ ထိပ်တန်းအဆင့် မျက်နှာပြင်အား ကိုင်ဆောင်သူမှ ပေါင်းစည်းရန် ခွင့်ပြုမည်။ သာမန် အက်ပ်များတွင်ဘယ်တော့မှ မလိုအပ်ပါ။"</string>
<string name="permlab_invokeCarrierSetup" msgid="3699600833975117478">"မိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာန မှ ထည့်သွင်းပေးသော အခြေအနေများအား ပယ်ဖျက်ခြင်း"</string>
- <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"ကိုင်ဆောင်သူအားမိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာနမှ ထည့်သွင်းထားတဲ့ အပြင်အဆင်အား ပယ်ဖျက်ခွင့် ပေးခြင်း။ ပုံမှန် အပလီကေးရှင်းများမှာ မလိုပါ"</string>
+ <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"ကိုင်ဆောင်သူအားမိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာနမှ ထည့်သွင်းထားတဲ့ အပြင်အဆင်အား ပယ်ဖျက်ခွင့် ပေးခြင်း။ ပုံမှန် အက်ပ်များအတွက် ဘယ်တော့မှ မလိုအပ်ပါ။"</string>
<string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"ကွန်ယက်အခြေအနေအား လေ့လာနေမှုအား နားထောင်ခွင့်"</string>
- <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"အက်ပ်ကို နက်ဝေါ့ ပေါ်က အခြေအနေကို သတိထားခွင့် ပေးခြင်း၊. ပုံမှန် အက်ပ် များတွင် မလိုအပ်ပါ"</string>
+ <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"အပလီကေးရှင်းကို ကွန်ရက်ပေါ်က အခြေအနေစောင့်ကြည့်ခွင့်ပေးခြင်း၊ ပုံမှန် အက်ပ်များတွင် ဘယ်တော့မှ မလိုအပ်ပါ"</string>
<string name="permlab_setInputCalibration" msgid="4902620118878467615">"change ထည့်သွင်းရေး ကိရိယာ တိုင်းထွာညှိနှိုင်းမှု ပြောင်းလဲခြင်း"</string>
- <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"အက်ပ်အား တို့ထိရေး မျက်နှာပြင် တိုင်းထွာစံညှိမှုကို မွမ်းမံခွင့် ပြုသည်။ သာမန် အက်ပ်များ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"အက်ပ်အား တို့ထိရေး မျက်နှာပြင် တိုင်းထွာစံညှိမှုကို မွမ်းမံခွင့် ပြုသည်။ သာမန် အက်ပ်များအတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"DRM လက်မှတ်များကို ရယူသုံးခြင်း"</string>
- <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"အက်ပ် တစ်ခုအား စီမံလုပ်ကိုင်ခွင့် DRM လက်မှတ်များ သုံးခွင့် ပြုသည်။ သာမန် အက်ပ်များ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"အပလီကေးရှင်းတစ်ခုအား စီမံလုပ်ကိုင်ခွင့် DRM လက်မှတ်များ သုံးခွင့် ပြုသည်။ သာမန် အက်ပ်များ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_handoverStatus" msgid="7820353257219300883">"Android ရဲ့ အလင်းတန်းထိုး လွှဲပြောင်းမှု အခြေအနေကို ရယူရန်"</string>
<string name="permdesc_handoverStatus" msgid="4788144087245714948">"ဒီအပလီကေးရှင်းအား အန်ဒရွိုက်၏ လက်ရှိ အလင်းတန်းထိုး လွှဲပြောင်းမှု အကြောင်း အချက်အလက်ကို ရယူခွင့် ပြုသည်"</string>
<string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM လက်မှတ်များ ဖယ်ရှားရန်"</string>
<string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"အပလီကေးရှင်းအား DRM လက်မှတ်များကို ဖယ်ရှားခွင့် ပြုသည်။ သာမန် အက်ပ်များ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"စာပို့စာယူ ဆက်သွယ်ရေးဝန်ဆောင်မှုတစ်ခုအား ပူးပေါင်းခွင့်ပြုရန်"</string>
- <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"စာပို့စာယူဆက်သွယ်ရေးဝန်ဆောင်မှုတစ်ခု၏ ထိပ်ဆုံးရှိအင်တာဖေ့စ်ဖြင့် ပူးပေါင်းရန် ပိုင်ရှင်အားခွင့်ပြုပါ။ ပုံမှန် အက်ပ် များအတွက် မလိုအပ်ပါ။"</string>
+ <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"စာပို့စာယူဆက်သွယ်ရေးဝန်ဆောင်မှုတစ်ခု၏ ထိပ်ဆုံးရှိအင်တာဖေ့စ်ဖြင့် ပူးပေါင်းရန် ပိုင်ရှင်အားခွင့်ပြုပါ။ ပုံမှန် အက်ပ်များအတွက် ဘယ်တော့မှ မလိုအပ်ပါ။"</string>
<string name="permlab_bindCarrierServices" msgid="3233108656245526783">"မိုဘိုင်းဖုန်းဝန်ဆောင်မှုပေးသူများနှင့် ပူးပေါင်းခွင့်ပြုရန်"</string>
- <string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"မိုဘိုင်းဖုန်းဝန်ဆောင်မှုစနစ်တစ်ခုအား ပူးပေါင်းခွင့်ပြုရန် ကိုင်ဆောင်ထားသူအား ခွင့်ပြုပါ။ သာမန် အက်ပ် များ အတွက် မည်သည့်အခါမျှ မလိုအပ်ပါ။"</string>
+ <string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"မိုဘိုင်းဖုန်းဝန်ဆောင်မှုစနစ်တစ်ခုအား ပူးပေါင်းခွင့်ပြုရန် ကိုင်ဆောင်ထားသူအား ခွင့်ပြုပါ။ သာမန် အက်ပ်များ အတွက် ဘယ်တော့မှ မလိုအပ်ပါ။"</string>
<string name="permlab_access_notification_policy" msgid="4247510821662059671">"မနှောင့်ယှက်ရန်ကို အသုံးပြုမည်"</string>
<string name="permdesc_access_notification_policy" msgid="3296832375218749580">"မနှောင့်ယှက်ရန် ချိန်ညှိမှုကို အပ်ဖ်များ ဖတ်ခြင်း ပြင်ခြင်းပြုလုပ်နိုင်ရန် ခွင့်ပြုမည်။"</string>
<string name="policylab_limitPassword" msgid="4497420728857585791">"စကားဝှက်စည်းမျဥ်းကိုသတ်မှတ်ရန်"</string>
<string name="policydesc_limitPassword" msgid="2502021457917874968">"မျက်နှာပြင်သော့ခတ်သည့် စကားဝှက်များနှင့် PINများရှိ ခွင့်ပြုထားသည့် စာလုံးအရေအတွက်နှင့် အက္ခရာများအား ထိန်းချုပ်ရန်။"</string>
<string name="policylab_watchLogin" msgid="914130646942199503">"မော်နီတာမျက်နှာပြင်ဖွင့်ရန် ကြိုးစားခွင့်များ"</string>
- <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် တက်ဘလက်ကို သော့ခတ်ရန် သို့မဟုတ် တက်ဘလက် ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်။"</string>
+ <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် တက်ဘလက်ကို သော့ခတ်ရန် သို့မဟုတ် တက်ဘလက် ဒေတာ အားလုံးကို ဖျက်ရန်။"</string>
<string name="policydesc_watchLogin" product="TV" msgid="2707817988309890256">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက တီဗွီအား သော့ချခြင်း သို့မဟုတ် တီဗွီ၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုရန်။"</string>
- <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် ဖုန်းကို သော့ခတ်ရန် သို့မဟုတ် ဖုန်း ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်။"</string>
+ <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် ဖုန်းကို သော့ခတ်ရန် သို့မဟုတ် ဖုန်း ဒေတာ အားလုံးကို ဖျက်ရန်။"</string>
<string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက တက်ဘလက်အား သော့ချခြင်း သို့မဟုတ် တက်ဘလက်၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုလုပ်မည်။"</string>
<string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက တီဗွီအား သော့ချခြင်း သို့မဟုတ် တီဗွီ၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုလုပ်မည်။"</string>
<string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက ဖုန်းအား သော့ချခြင်း သို့မဟုတ် ဖုန်း၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုလုပ်မည်။"</string>
@@ -657,7 +657,7 @@
<string name="sipAddressTypeHome" msgid="6093598181069359295">"ပင်မစာမျက်နှာ"</string>
<string name="sipAddressTypeWork" msgid="6920725730797099047">"အလုပ်အကိုင်"</string>
<string name="sipAddressTypeOther" msgid="4408436162950119849">"တခြား"</string>
- <string name="quick_contacts_not_available" msgid="746098007828579688">"ဒီအဆက်အသွယ်အား ကြည့်ရှုရန် အက်ပ် မတွေ့ပါ"</string>
+ <string name="quick_contacts_not_available" msgid="746098007828579688">"ဤအဆက်အသွယ်အား ကြည့်ရှုရန် အပလီကေးရှင်းမတွေ့ပါ"</string>
<string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN ကုဒ် ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"PUK နှင့် PIN ကုဒ် အသစ်ကို ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"PUK နံပါတ်"</string>
@@ -761,7 +761,7 @@
<string name="granularity_label_link" msgid="5815508880782488267">"အခြားစာမျက်နှာသို့ကွင်းဆက်"</string>
<string name="granularity_label_line" msgid="5764267235026120888">"စာကြောင်း"</string>
<string name="factorytest_failed" msgid="5410270329114212041">"စက်ရုံစမ်းသပ်ခြင်းမအောင်မြင်ပါ"</string>
- <string name="factorytest_not_system" msgid="4435201656767276723">"စက်ရုံစမ်းသပ်မှုမှာ စနစ်/အပ်ပလီကေးရှင်း ထည့်သွင်းထားသောpackageများကိုသာ ပံ့ပိုးမှုပေးသည်။."</string>
+ <string name="factorytest_not_system" msgid="4435201656767276723">"စက်ရုံစမ်းသပ်မှုမှာ စနစ်/အက်ပ်ထည့်သွင်းထားသောpackageများကိုသာ ပံ့ပိုးမှုပေးသည်။."</string>
<string name="factorytest_no_action" msgid="872991874799998561">"စက်ရုံစမ်းသပ်မှုအားလုပ်ဆောင်ရန် မည်သည့်packageမှ မတွေ့ပါ။"</string>
<string name="factorytest_reboot" msgid="6320168203050791643">"လုပ်ငန်းစနစ်ထည့်သွင်းပြီး ပြန်လည်စတင်ရန်"</string>
<string name="js_dialog_title" msgid="1987483977834603872">"ဒီ \"<xliff:g id="TITLE">%s</xliff:g>\" က စာမျက်နှာက ပြောဆိုတာက:"</string>
@@ -771,7 +771,7 @@
<string name="js_dialog_before_unload_negative_button" msgid="5614861293026099715">"ဒီစာမျက်နှာပေါ်မှာ ဆက်နေပါ"</string>
<string name="js_dialog_before_unload" msgid="3468816357095378590">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nဒီစာမျက်နှာကနေ သွားဖို့ သေချာပါသလား?"</string>
<string name="save_password_label" msgid="6860261758665825069">"အတည်ပြုသည်"</string>
- <string name="double_tap_toast" msgid="4595046515400268881">"အကြံပေးချက်: အကြီးအသေး ချုံ့၊ချဲ့ ရန် နှစ်ခါ တို့ပါ"</string>
+ <string name="double_tap_toast" msgid="4595046515400268881">"အကြံပေးချက်- ဇူးမ်ဆွဲရန်နှင့် ဖြုတ်ရန် နှစ်ကြိမ်ဆက်တိုက် တို့ပါ"</string>
<string name="autofill_this_form" msgid="4616758841157816676">"အလိုအလျောက်ဖြည့်ပါ"</string>
<string name="setup_autofill" msgid="7103495070180590814">"အလိုအလျောက်ဖြည့်ရန် သတ်မှတ်သည်"</string>
<string name="autofill_address_name_separator" msgid="6350145154779706772">" "</string>
@@ -794,31 +794,31 @@
<string name="permdesc_readHistoryBookmarks" msgid="8462378226600439658">"အပလီကေးရှင်းအား ဘရောင်ဇာမှ ယခင် သွားရောက်ထားသော URLများ၊ နေရာ အမှတ်အသားများအား ကြည့်ရှုခွင့်ပြုပါ။ မှတ်ချက်။ ဒီခွင့်ပြုချက်ကို တတိယပါတီ ဘရောင်ဇာများ နှင့် တခြား အပလီကေးရှင်းများမှ လုပ်ဆောင်မည် မဟုတ်ပါ။"</string>
<string name="permlab_writeHistoryBookmarks" msgid="3714785165273314490">"သင့်ရဲ့ ဝဘ် အမှတ်နေရာများနှင့် သွားလာသော မှတ်တမ်း ရေးခြင်း"</string>
<string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="6825527469145760922">"အပလီကေးရှင်းအား ဘရောင်ဇာမှ မှတ်တမ်း သို့ မှတ်သားမှု အမှတ်များအား ပြင်ဆင်ခွင့် ပေးခြင်း။ အပလီကေးရှင်းမှ ဘရောင်ဇာ မှတ်တမ်းများကို ဖျက်ပစ်ခွင့် သို့ ပြင်ဆင်ခွင့် ရှိပါမည်။ မှတ်ချက်။ ဤခွင့်ပြုချက်ကို တတိယပါတီ ဘရောင်ဇာများ၊ တခြား အပလီကေးရှင်းများမှ သုံးမည် မဟုတ်ပါ။"</string>
- <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="7007393823197766548">"ဘရောင်ဇာ၏မှတ်တမ်း သို့မဟုတ် တီဗွီတွင်သိမ်းထားသည့် မှတ်သားချက်များအား ပြင်ဆင်ရန် အက်ပ် အား ခွင့်ပြုပါ။ ဤသို့ပြုခြင်းသည် ဘရောင်ဇာ၏ အချက်အလက်များအား ဖျက်ပစ်ရန် သို့မဟုတ် ပြင်ဆင်ရန် အက်ပ် အား ခွင့်ပြုထားခြင်းဖြစ်၏။ မှတ်ချက်၊ ဤသို့ခွင့်ပြုခြင်းသည် ပြင်ပဘရောင်ဇာများ သို့မဟုတ် ဝဘ်အား ကြည့်ရှုနိုင်သည့် တစ်ခြားသော အပလီကေးရှင်းများအား သက်ရောက်မှုရှိမည် မဟုတ်ပါ။"</string>
+ <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="7007393823197766548">"ဘရောင်ဇာ၏မှတ်တမ်း သို့မဟုတ် တီဗွီတွင်သိမ်းထားသည့် မှတ်သားချက်များအား ပြင်ဆင်ရန် အက်ပ်အား ခွင့်ပြုပါ။ ဤသို့ပြုခြင်းသည် ဘရောင်ဇာ၏ အချက်အလက်များအား ဖျက်ရန် သို့မဟုတ် ပြင်ဆင်ရန် အက်ပ်အား ခွင့်ပြုထားခြင်းဖြစ်၏။ မှတ်ချက်၊ ဤသို့ခွင့်ပြုခြင်းသည် ပြင်ပဘရောင်ဇာများ သို့မဟုတ် ဝဘ်အား ကြည့်ရှုနိုင်သည့် တစ်ခြားသော အပလီကေးရှင်းများအား သက်ရောက်မှုရှိမည် မဟုတ်ပါ။"</string>
<string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"အပလီကေးရှင်းအား ဘရောင်ဇာမှ မှတ်တမ်း သို့ မှတ်သားမှု အမှတ်များအား ပြင်ဆင်ခွင့် ပေးခြင်း။ အပလီကေးရှင်းမှ ဘရောင်ဇာ မှတ်တမ်းများကို ဖျက်ပစ်ခွင့် သို့ ပြင်ဆင်ခွင့် ရှိပါမည်။ မှတ်ချက်။ ဒီခွင့်ပြုချက်ကို တတိယပါတီ ဘရောင်ဇာများ၊ တခြား အပလီကေးရှင်းများမှ သုံးမည် မဟုတ်ပါ။"</string>
<string name="permlab_setAlarm" msgid="1379294556362091814">"နှိုးစက်သတ်မှတ်ရန်"</string>
- <string name="permdesc_setAlarm" msgid="316392039157473848">"အက်ပ်အား တပ်ဆင်ထားသည့် နှိုးစက်နာရီ အက်ပ် ထဲတွင် နှိုးစက်ကို သတ်မှတ်ခွင့် ပြုသည်။ အချို့ နှိုးစက် အက်ပ်များက ထိုအင်္ဂါရပ်ကို ပြီးမြောက်အောင် မလုပ်နိုင်ကြပါ။"</string>
+ <string name="permdesc_setAlarm" msgid="316392039157473848">"အက်ပ်အား တပ်ဆင်ထားသည့် နှိုးစက်နာရီ အက်ပ်ထဲတွင် နှိုးစက်ကို သတ်မှတ်ခွင့် ပြုသည်။ အချို့ နှိုးစက် အက်ပ်များက ထိုအင်္ဂါရပ်ကို ပြီးမြောက်အောင် မလုပ်နိုင်ကြပါ။"</string>
<string name="permlab_addVoicemail" msgid="5525660026090959044">"အသံစာပို့စနစ်အားထည့်ရန်"</string>
<string name="permdesc_addVoicemail" msgid="6604508651428252437">"အက်ပ်အား သင့် အသံမေးလ် ဝင်စာသို့ စာများကို ထည့်ခွင့် ပြုသည်။"</string>
<string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"ဘရောင်ဇာ ဘူမိဇုန်သတ်မှတ်မှု ခွင့်ပြုချက်များကို မွမ်းမံခြင်း"</string>
- <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"အက်ပ်အား ဘရောင်ဇာ၏ ဘူမိဇုန်သတ်မှတ်ရေး ခွင့်ပြုချက်များကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် အက်ပ်များက ၎င်းကို အသုံးချပြီး လိုရာ ဝက်ဘ်ဆိုက်များသို့ တည်နေရာ အချက်အလက် ပို့မှုကို လုပ်နိုင်သည်။"</string>
+ <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"အက်ပ်အား ဘရောင်ဇာ၏ ဘူမိဇုန်သတ်မှတ်ရေး ခွင့်ပြုချက်များကို မွမ်းမံခွင့်ပြုသည်။ အဖျက်အက်ပ်များက ၎င်းကိုအသုံးချပြီး လိုရာ ဝဘ်ဆိုက်များသို့ တည်နေရာအချက်အလက် ပို့နိုင်သည်။"</string>
<string name="save_password_message" msgid="767344687139195790">"ဤလျှို့ဝှက်စကားဝှက်အား ဘရောင်ဇာကိုမှတ်ခိုင်းမည်လား"</string>
<string name="save_password_notnow" msgid="6389675316706699758">"ယခုမလုပ်ပါ"</string>
<string name="save_password_remember" msgid="6491879678996749466">"မှတ်ထားရန်"</string>
- <string name="save_password_never" msgid="8274330296785855105">"ကန့်သတ်မှုမရှိ"</string>
+ <string name="save_password_never" msgid="8274330296785855105">"ဘယ်တော့မှ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"သင့်ဆီမှာ ဒီစာမျက်နှာကို ဖွင့်ရန် ခွင့်ပြုချက် မရှိပါ။"</string>
<string name="text_copied" msgid="4985729524670131385">"clipboardထံ စာသားအားကူးယူမည်"</string>
<string name="more_item_label" msgid="4650918923083320495">"နောက်ထပ်"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_space_shortcut_label" msgid="2410328639272162537">"space"</string>
<string name="menu_enter_shortcut_label" msgid="2743362785111309668">"enter"</string>
- <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"ဖျက်"</string>
+ <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"ဖျက်ရန်"</string>
<string name="search_go" msgid="8298016669822141719">"ရှာဖွေခြင်း"</string>
<string name="search_hint" msgid="1733947260773056054">"ရှာဖွေပါ..."</string>
<string name="searchview_description_search" msgid="6749826639098512120">"ရှာဖွေခြင်း"</string>
<string name="searchview_description_query" msgid="5911778593125355124">"ရှာစရာ အချက်အလက်နေရာ"</string>
<string name="searchview_description_clear" msgid="1330281990951833033">"ရှာစရာ အချက်အလက်များ ဖယ်ရှားရန်"</string>
- <string name="searchview_description_submit" msgid="2688450133297983542">"ရှာဖွေစရာ အချက်အလက်ကို အတည်ပြုရန်"</string>
+ <string name="searchview_description_submit" msgid="2688450133297983542">"ရှာဖွေစရာ အချက်အလက်ကို ပေးပို့ရန်"</string>
<string name="searchview_description_voice" msgid="2453203695674994440">"အသံဖြင့် ရှာဖွေခြင်း"</string>
<string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"ထိတွေ့ပြီး ရှာဖွေခြင်း ဖွင့်မည်မလား?"</string>
<string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> က ထိတွေ့ပြီး ရှာဖွေခြင်းကို လုပ်ချင်ပါသည်။ ထိတွေ့ရှာဖွေခြင်း ဖွင့်ထားလျှင် သင့်လက်ဖျားအောက်မှ အရာကို ကြားနိုင် သို့ ရှင်းလင်းချက်ကို မြင်နိုင်တဲ့ အပြင် လက် အနေအထားဖြင့် တက်ဘလက်ကို ဆက်သွယ်ပြုလုပ်စေခိုင်းနိုင်ပါသည်"</string>
@@ -940,14 +940,14 @@
<string name="paste" msgid="5629880836805036433">"Paste"</string>
<string name="paste_as_plain_text" msgid="5427792741908010675">"စာသားအတိုင်း ကူးထည့်ပါ"</string>
<string name="replace" msgid="5781686059063148930">"အစားထိုခြင်း"</string>
- <string name="delete" msgid="6098684844021697789">"ဖျက်ပစ်ရန်"</string>
+ <string name="delete" msgid="6098684844021697789">"ဖျက်ရန်"</string>
<string name="copyUrl" msgid="2538211579596067402">"URLအား ကူးခြင်း"</string>
<string name="selectTextMode" msgid="1018691815143165326">"စာသား ရွေးရန်"</string>
<string name="undo" msgid="7905788502491742328">"ပြန်ဖျက်ရန်"</string>
<string name="redo" msgid="7759464876566803888">"ထပ်လုပ်ပါ"</string>
<string name="textSelectionCABTitle" msgid="5236850394370820357">"စာတိုရွေးချယ်မှု"</string>
<string name="addToDictionary" msgid="4352161534510057874">"အဘိဓာန်ထဲ ထည့်ပါ"</string>
- <string name="deleteText" msgid="6979668428458199034">"ဖျက်ပစ်ရန်"</string>
+ <string name="deleteText" msgid="6979668428458199034">"ဖျက်ရန်"</string>
<string name="inputMethod" msgid="1653630062304567879">"ထည့်သွင်းရန်နည်းလမ်း"</string>
<string name="editTextMenuTitle" msgid="4909135564941815494">"စာတို လုပ်ဆောင်ချက်"</string>
<string name="low_internal_storage_view_title" msgid="5576272496365684834">"သိမ်းဆည်သော နေရာ နည်းနေပါသည်"</string>
@@ -956,9 +956,9 @@
<string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> က အလုပ်လုပ်နေသည်။"</string>
<string name="app_running_notification_text" msgid="1197581823314971177">"နောက်ထပ်အချက်အလက်များကို ကြည့်ရန် သို့မဟုတ် အက်ပ်ကိုရပ်တန့်ရန် တို့ပါ။"</string>
<string name="ok" msgid="5970060430562524910">"အိုကေ"</string>
- <string name="cancel" msgid="6442560571259935130">"မလုပ်တော့ပါ"</string>
+ <string name="cancel" msgid="6442560571259935130">"မလုပ်တော့"</string>
<string name="yes" msgid="5362982303337969312">"အိုကေ"</string>
- <string name="no" msgid="5141531044935541497">"မလုပ်တော့ပါ"</string>
+ <string name="no" msgid="5141531044935541497">"မလုပ်တော့"</string>
<string name="dialog_alert_title" msgid="2049658708609043103">"သတိပြုရန်"</string>
<string name="loading" msgid="7933681260296021180">"တင်နေ…"</string>
<string name="capital_on" msgid="1544682755514494298">"ဖွင့်ရန်"</string>
@@ -977,7 +977,7 @@
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"မျှဝေပါ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ကိုအသုံးပြု၍ ပို့ပါ"</string>
<string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s ကိုအသုံးပြု၍ ပို့ပါ"</string>
- <string name="whichSendToApplicationLabel" msgid="8878962419005813500">"ပို့ပါ"</string>
+ <string name="whichSendToApplicationLabel" msgid="8878962419005813500">"ပို့ရန်"</string>
<string name="whichHomeApplication" msgid="4307587691506919691">"ပင်မ အက်ပ်ကို ရွေးပါ"</string>
<string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$sကို ပင်မအဖြစ် သုံးပါ"</string>
<string name="whichHomeApplicationLabel" msgid="809529747002918649">"ဓာတ်ပုံရိုက်ပါ"</string>
@@ -986,9 +986,9 @@
<string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"ဓာတ်ပုံရိုက်ပါ"</string>
<string name="alwaysUse" msgid="4583018368000610438">"ဤလှုပ်ရှားမှုအတွက် မူရင်းအတိုင်း အသုံးပြုပါ။"</string>
<string name="use_a_different_app" msgid="8134926230585710243">"အခြား အက်ပ်ကို သုံးပါ"</string>
- <string name="clearDefaultHintMsg" msgid="3252584689512077257">"စနစ် ဆက်တင် ထဲမှာ ပုံသေကို ရှင်းလိုက်ပါ > Appများ > ဒေါင်းလုဒ် လုပ်ပြီး။"</string>
+ <string name="clearDefaultHintMsg" msgid="3252584689512077257">"စနစ် ဆက်တင် ထဲမှာ ပုံသေကို ရှင်းလိုက်ပါ > အက်ပ်များ > ဒေါင်းလုဒ် လုပ်ပြီး။"</string>
<string name="chooseActivity" msgid="7486876147751803333">"လုပ်စရာ တစ်ခု ရွေးချယ်ပါ"</string>
- <string name="chooseUsbActivity" msgid="6894748416073583509">"USB ကိရိယာ အတွက် အက်ပ် တစ်ခု ရွေးပါ"</string>
+ <string name="chooseUsbActivity" msgid="6894748416073583509">"USB ကိရိယာ အတွက် အက်ပ်တစ်ခု ရွေးပါ"</string>
<string name="noApplications" msgid="2991814273936504689">"ဘယ် အက်ပ်ကမှ ဒီ လုပ်ဆောင်ချက်ကို မလုပ်ကိုင်နိုင်ပါ။"</string>
<string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> ရပ်သွားပါပြီ"</string>
<string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ရပ်တန့်သွားပါပြီ"</string>
@@ -1009,7 +1009,7 @@
<string name="report" msgid="4060218260984795706">"သတင်းပို့ပါ"</string>
<string name="wait" msgid="7147118217226317732">"စောင့်ဆိုင်းရန်"</string>
<string name="webpage_unresponsive" msgid="3272758351138122503">"စာမျက်နှာမှာ ပြန်လည် တုံ့ပြန်မှု မရှိတော့ပါ။\n\nပိတ်လိုက်ချင်ပါသလား?"</string>
- <string name="launch_warning_title" msgid="1547997780506713581">"App ပြန်ညွှန်းခဲ့"</string>
+ <string name="launch_warning_title" msgid="1547997780506713581">"အက်ပ်ပြန်ညွှန်းခဲ့"</string>
<string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> သည် ယခုအလုပ်လုပ်နေသည်"</string>
<string name="launch_warning_original" msgid="188102023021668683">"မူလ <xliff:g id="APP_NAME">%1$s</xliff:g> တွင် ထုတ်လွင့်သည်"</string>
<string name="screen_compat_mode_scale" msgid="3202955667675944499">"စကေး"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"သိုလှောင်မှုအား ပြုပြင်ခြင်း။"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ကိုအဆင့်မြှင့်တင်နေပါသည်"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"အဆင့်မြှင့်တင်ခြင်း မပြီးဆုံးသေးသ၍ အချို့အက်ပ်များကို ကောင်းမွန်စွာအသုံးပြုနိုင်ဦးမည် မဟုတ်ပါ"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ကို အဆင့်မြှင့်တင်နေပါသည်…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> ထဲက အက်ပ်<xliff:g id="NUMBER_1">%2$d</xliff:g>ကို ဆီလျော်အောင် လုပ်နေ"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> အားပြင်ဆင်နေသည်။"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"အက်ပ်များကို စတင်နေ"</string>
@@ -1031,11 +1032,11 @@
<string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> က အလုပ်လုပ်နေသည်"</string>
<string name="heavy_weight_notification_detail" msgid="867643381388543170">"အက်ပ်သို့ပြောင်းရန် တို့ပါ"</string>
<string name="heavy_weight_switcher_title" msgid="7153167085403298169">"အက်ပ်များကို ပြောင်းမလား?"</string>
- <string name="heavy_weight_switcher_text" msgid="7022631924534406403">"အခြား အက်ပ် တစ်ခု အလုပ်လုပ်နေ၍ သင်က အသစ် တစ်ခုကို မစမီ ၎င်းကို ရပ်ပစ်ရမည်။"</string>
+ <string name="heavy_weight_switcher_text" msgid="7022631924534406403">"အခြား အက်ပ်တစ်ခု အလုပ်လုပ်နေ၍ သင်က အသစ် တစ်ခုကို မစမီ ၎င်းကို ရပ်ပစ်ရမည်။"</string>
<string name="old_app_action" msgid="493129172238566282">"<xliff:g id="OLD_APP">%1$s</xliff:g>သို့ပြန်သွားရန်"</string>
<string name="old_app_description" msgid="2082094275580358049">"pp အသစ်ကို မစတင်ပါနှင့်။"</string>
<string name="new_app_action" msgid="5472756926945440706">"<xliff:g id="OLD_APP">%1$s</xliff:g>စတင်ပါ"</string>
- <string name="new_app_description" msgid="1932143598371537340">"အက်ပ် အဟောင်းကို မသိမ်းဆည်းဘဲ ရပ်လိုက်ပါ။"</string>
+ <string name="new_app_description" msgid="1932143598371537340">"အက်ပ်အဟောင်းကို မသိမ်းဆည်းဘဲ ရပ်လိုက်ပါ။"</string>
<string name="dump_heap_notification" msgid="2618183274836056542">"<xliff:g id="PROC">%1$s</xliff:g> သိမ်းထားနိုင်မှု အကန့်အသတ် ကျော်လွန်နေ"</string>
<string name="dump_heap_notification_detail" msgid="6901391084243999274">"သိမ်းဆည်းနိုင်မှု ပမာဏကျော်လွန်သွားပါပြီ။ မျှဝေရန် တို့ပါ"</string>
<string name="dump_heap_title" msgid="5864292264307651673">"အရေးပေါ် သိမ်းထားပေးမှု ကို မျှဝေမလား။"</string>
@@ -1077,8 +1078,8 @@
<string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"ဝိုင်ဖိုင်ကိုချိတ်ဆက်မရပါ"</string>
<string name="wifi_watchdog_network_disabled_detailed" msgid="5548780776418332675">" အင်တာနက် ဆက်သွယ်မှု ကောင်းကောင်းမရှိပါ"</string>
<string name="wifi_connect_alert_title" msgid="8455846016001810172">"ချိတ်ဆက်မှုကို ခွင့်ပြုမလား?"</string>
- <string name="wifi_connect_alert_message" msgid="6451273376815958922">"အပ္ပလီကေးရှင်း %1$s သည် ဝိုင်ဖိုင်ကွန်ရက် %2$s ကိုချိတ်ဆက်လိုသည်"</string>
- <string name="wifi_connect_default_application" msgid="7143109390475484319">"အက်ပ်"</string>
+ <string name="wifi_connect_alert_message" msgid="6451273376815958922">"အပလီကေးရှင်း %1$s သည် ဝိုင်ဖိုင်ကွန်ရက် %2$s ကိုချိတ်ဆက်လိုသည်"</string>
+ <string name="wifi_connect_default_application" msgid="7143109390475484319">"အပလီကေးရှင်း"</string>
<string name="wifi_p2p_dialog_title" msgid="97611782659324517">"တိုက်ရိုက် Wi-Fi"</string>
<string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"တိုက်ရိုက်Wi-Fi ကို စတင်ပါ။ ၎င်းသည် Wi-Fi ဟော့စပေါ့ကို ရပ်ဆိုင်းစေမှာ ဖြစ်ပါသည်။"</string>
<string name="wifi_p2p_failed_message" msgid="3763669677935623084">"တိုက်ရိုက်ဝိုင်ဖိုင်ကို စတင်လို့ မရပါ"</string>
@@ -1104,7 +1105,7 @@
<string name="sms_short_code_details" msgid="5873295990846059400"><b>"ဒါက သင့် မိုဘိုင်း အကောင့် အတွက် "</b>" ကုန်ကျမှု ရှိလာနိုင်သည်။"</string>
<string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"ဒါက သင့် မိုဘိုင်း အကောင့် အတွက် ကုန်ကျမှု ရှိလာနိုင်သည်။"</b></string>
<string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"ပို့ရန်"</string>
- <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"မလုပ်တော့ပါ"</string>
+ <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"မလုပ်တော့"</string>
<string name="sms_short_code_remember_choice" msgid="5289538592272218136">"ကျွန်ပ်၏ရွေးချယ်မှုကို မှတ်ထားရန်"</string>
<string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"နောင်တွင် ဆက်တင် > အပလီကေးရှင်းများ မှပြောင်းနိုင်သည်"</string>
<string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"အမြဲခွင့်ပြုရန်"</string>
@@ -1194,20 +1195,19 @@
<string name="permlab_readInstallSessions" msgid="3713753067455750349">"တပ်ဆင်ရေး လုပ်ကိုင်မှုကို ဖတ်ရန်"</string>
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"အပလီကေးရှင်းအား တပ်ဆင်ရေး ချိတ်ဆက်မှုများကို ဖတ်ခွင့်ပြုသည်။ ၎င်းသည် ဖွင့်သုံးနေသည့် အထုပ်အား တပ်ဆင်မှုဆိုင်ရာ အသေးိစတ်များကို ကြည့်ရှုခွင့် ပြုသည်။"</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"တပ်ဆင်ရေး အထုပ်များကို တောင်းဆိုပါ"</string>
- <string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"ပက်ကေ့များ သွင်းယူခြင်းအတွက် တောင်းဆိုရန် အပ္ပလီကေးရှင်းအား ခွင့်ပြုပါ"</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"ပက်ကေ့များ သွင်းယူခြင်းအတွက် တောင်းဆိုရန် အပလီကေးရှင်းအား ခွင့်ပြုပါ"</string>
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"ဇူးမ်အသုံးပြုရန် နှစ်ချက်တို့ပါ"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"ဝဒ်ဂျက်ထည့်လို့ မရပါ"</string>
<string name="ime_action_go" msgid="8320845651737369027">"သွားပါ"</string>
<string name="ime_action_search" msgid="658110271822807811">"ရှာဖွေခြင်း"</string>
- <string name="ime_action_send" msgid="2316166556349314424">"ပို့ခြင်း"</string>
+ <string name="ime_action_send" msgid="2316166556349314424">"ပို့ရန်"</string>
<string name="ime_action_next" msgid="3138843904009813834">"ရှေ့သို့"</string>
<string name="ime_action_done" msgid="8971516117910934605">"ပြီးပါပြီ"</string>
<string name="ime_action_previous" msgid="1443550039250105948">"အနောက်သို့"</string>
<string name="ime_action_default" msgid="2840921885558045721">"လုပ်ဆောင်ချက်"</string>
<string name="dial_number_using" msgid="5789176425167573586">\n"အား အသုံးပြု၍ <xliff:g id="NUMBER">%s</xliff:g>နံပါတ်ခေါ်ဆိုပါ"</string>
<string name="create_contact_using" msgid="4947405226788104538">\n"အား အသုံးပြု၍<xliff:g id="NUMBER">%s</xliff:g>ဆက်သွယ်မည့်သူများအား ဖန်တီးခြင်း"</string>
- <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"အောက်ပါထဲက အက်ပ် တစ်ခု သို့မဟုတ် ပိုလျက် သင်၏ အကောင့်ကို၊ ယခု နှင့် အနာဂတ်မှာ ရယူအသုံးချရန် ခွင့်ပြုချက်ကို တောင်းထားသည်။"</string>
+ <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"အောက်ပါထဲက အက်ပ်တစ်ခု သို့မဟုတ် ပိုလျက် သင်၏ အကောင့်ကို၊ ယခု နှင့် အနာဂတ်မှာ ရယူအသုံးချရန် ခွင့်ပြုချက်ကို တောင်းထားသည်။"</string>
<string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"ဤတောင်းခံမှုအားခွင့်ပြုမည်လား"</string>
<string name="grant_permissions_header_text" msgid="6874497408201826708">"သုံးစွဲခွင့် တောင်းဆိုရန်"</string>
<string name="allow" msgid="7225948811296386551">"ခွင့်ပြုသည်"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"သတိပေးချက် အဆင့်သတ်မှတ်ခြင်းဝန်ဆောင်မှု"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN ဖွင့်ထားပါသည်"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g>မှVPNအလုပ်လုပ်နေသည်"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"ကွန်ရက်ကို စီမံခန့်ခွဲရန် တို့ပါ။"</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> သို့ ချိတ်ဆက်ထားသည်။ ကွန်ရက်ကို စီမံခန့်ခွဲရန် တို့ပါ။"</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"အမြဲတမ်းဖွင့်ထား VPN ဆက်သွယ်နေစဉ်…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"အမြဲတမ်းဖွင့်ထား VPN ဆက်သွယ်မှုရှိ"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"အမြဲတမ်းဖွင့်ထား VPN အမှား"</string>
@@ -1238,13 +1236,13 @@
<string name="upload_file" msgid="2897957172366730416">"ဖိုင်ရွေးချယ်ရန်"</string>
<string name="no_file_chosen" msgid="6363648562170759465">"မည်သည့်ဖိုင်ကိုမှမရွေးပါ"</string>
<string name="reset" msgid="2448168080964209908">"ပြန်လည်သတ်မှတ်ရန်"</string>
- <string name="submit" msgid="1602335572089911941">"တင်ပြရန်"</string>
+ <string name="submit" msgid="1602335572089911941">"ပေးပို့ရန်"</string>
<string name="car_mode_disable_notification_title" msgid="3164768212003864316">"ကားထဲတွင်အသုံးပြုနိုင်သောစနစ် ရရှိနိုင်သည်"</string>
<string name="car_mode_disable_notification_message" msgid="6301524980144350051">"ကားမောင်းနှင်ခြင်းမုဒ်မှ ထွက်ရန် တို့ပါ။"</string>
<string name="tethered_notification_title" msgid="3146694234398202601">"တဆင့်ပြန်လည်လွှင့်ခြင်း သို့မဟုတ် ဟော့စပေါ့ ဖွင့်ထားသည်"</string>
<string name="tethered_notification_message" msgid="2113628520792055377">"စနစ်ထည့်သွင်းရန် တို့ပါ။"</string>
<string name="back_button_label" msgid="2300470004503343439">"နောက်သို့"</string>
- <string name="next_button_label" msgid="1080555104677992408">"နောက်"</string>
+ <string name="next_button_label" msgid="1080555104677992408">"ရှေ့သို့"</string>
<string name="skip_button_label" msgid="1275362299471631819">"ကျော်"</string>
<string name="no_matches" msgid="8129421908915840737">"ထပ်တူမတွေ့ရှိပါ"</string>
<string name="find_on_page" msgid="1946799233822820384">"စာမျက်နှာတွင်ရှာဖွေရန်"</string>
@@ -1257,13 +1255,13 @@
<string name="progress_erasing" product="default" msgid="6596988875507043042">"SD ကဒ် အား ဖျက်နေစဉ်…"</string>
<string name="share" msgid="1778686618230011964">"မျှဝေခြင်း"</string>
<string name="find" msgid="4808270900322985960">"ရှာဖွေရန်"</string>
- <string name="websearch" msgid="4337157977400211589">"ဝက်ဘ်ပေါ်မှာ ရှာဖွေရန်"</string>
+ <string name="websearch" msgid="4337157977400211589">"ဝဘ်တွင် ရှာရန်"</string>
<string name="find_next" msgid="5742124618942193978">"နောက်တစ်ခု ရှာဖွေရန်"</string>
<string name="find_previous" msgid="2196723669388360506">"အရင်တစ်ခု ရှာဖွေရန်"</string>
<string name="gpsNotifTicker" msgid="5622683912616496172">"<xliff:g id="NAME">%s</xliff:g>မှ တည်နေရာအား တောင်းခံသည်"</string>
<string name="gpsNotifTitle" msgid="5446858717157416839">"တည်နေရာအား တောင်းခံသည်"</string>
<string name="gpsNotifMessage" msgid="1374718023224000702">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)မှတောင်းခံသည်"</string>
- <string name="gpsVerifYes" msgid="2346566072867213563">"ဟုတ်ကဲ့"</string>
+ <string name="gpsVerifYes" msgid="2346566072867213563">"Yes"</string>
<string name="gpsVerifNo" msgid="1146564937346454865">"No"</string>
<string name="sync_too_many_deletes" msgid="5296321850662746890">"ပယ်ဖျက်မည့်ကန့်သတ်နှုန်းကျော်လွန်သည်"</string>
<string name="sync_too_many_deletes_desc" msgid="496551671008694245">"<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>၊ account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> အတွက် စုစုပေါင်း <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> အရာဖျက်ထားပါသည်။ သင်ဘာလုပ်ချင်ပါလဲ?"</string>
@@ -1292,13 +1290,13 @@
<string name="date_picker_prev_month_button" msgid="2858244643992056505">"ပြီးခဲ့သော လ"</string>
<string name="date_picker_next_month_button" msgid="5559507736887605055">"လာမည့် လ"</string>
<string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Altခလုတ်"</string>
- <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"မလုပ်တော့ပါ ခလုတ်"</string>
- <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်ခလုတ်"</string>
+ <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"မလုပ်တော့ ခလုတ်"</string>
+ <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်"</string>
<string name="keyboardview_keycode_done" msgid="1992571118466679775">"ပြီးဆုံးသည့်ခလုတ်"</string>
<string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"စနစ်ပြောင်းခြင်းခလုတ်"</string>
<string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shiftခလုတ်"</string>
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enterခလုတ်"</string>
- <string name="activitychooserview_choose_application" msgid="2125168057199941199">"အက်ပ် တစ်ခုကို ရွေးရန်"</string>
+ <string name="activitychooserview_choose_application" msgid="2125168057199941199">"အက်ပ်တစ်ခုကို ရွေးရန်"</string>
<string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ကို စတင်လို့ မရပါ"</string>
<string name="shareactionprovider_share_with" msgid="806688056141131819">"မျှဝေဖို့ ရွေးပါ"</string>
<string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>နှင့် မျှဝေပါမည်"</string>
@@ -1347,7 +1345,7 @@
<string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 လက်ပွေ"</string>
<string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 လက်ပွေ"</string>
<string name="activity_chooser_view_see_all" msgid="4292569383976636200">"အားလုံးကို ကြည့်ရန်"</string>
- <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"လှုပ်ရှားမှုကို ရွေးရန်"</string>
+ <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"လုပ်ဆောင်ချက်ကို ရွေးရန်"</string>
<string name="share_action_provider_share_with" msgid="5247684435979149216">"...နှင့် မျှဝေရန်"</string>
<string name="sending" msgid="3245653681008218030">"ပေးပို့နေစဉ်…"</string>
<string name="launchBrowserDefault" msgid="2057951947297614725">"ဘရောက်ဇာ ဖွင့်မည်လား။"</string>
@@ -1430,7 +1428,7 @@
<string name="owner_name" msgid="2716755460376028154">"ပိုင်ရှင်"</string>
<string name="error_message_title" msgid="4510373083082500195">"အမှား"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string>
- <string name="app_not_found" msgid="3429141853498927379">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အက်ပ် မရှိပါ။"</string>
+ <string name="app_not_found" msgid="3429141853498927379">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အပလီကေးရှင်းမရှိပါ။"</string>
<string name="revoke" msgid="5404479185228271586">"မလုပ်တော့ပါ"</string>
<string name="mediasize_iso_a0" msgid="1994474252931294172">"အိုက်အက်စ်အို အေ ဝ"</string>
<string name="mediasize_iso_a1" msgid="3333060421529791786">"အိုက်အက်စ်အို အေ၁"</string>
@@ -1548,7 +1546,7 @@
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ကို ဖျက်ပြီးပါပြီ"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"အလုပ် <xliff:g id="LABEL">%1$s</xliff:g>"</string>
<string name="lock_to_app_toast" msgid="1420543809500606964">"ဤမျက်နှာပြင်ကို ပင်ဖြုတ်ရန် \"နောက်သို့\" ကိုထိပြီးဖိထားပါ။"</string>
- <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Appကို ပင်ထိုးထားသည်။ ပင်ဖျက်ခြင်းကို ဒီစက်မှာ မရနိုင်ပါ။"</string>
+ <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"အက်ပ်ကို ပင်ထိုးထားသည်။ ပင်ဖျက်ခြင်းကို ဒီစက်မှာ မရနိုင်ပါ။"</string>
<string name="lock_to_app_start" msgid="6643342070839862795">"မျက်နှာပြင်ကို ပင်ထိုးထား"</string>
<string name="lock_to_app_exit" msgid="8598219838213787430">"မျက်နှာပြင် ပင်ထိုးမှု ဖြတ်လိုက်ပြီ"</string>
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ပင်မဖြုတ်မီမှာ PIN ကို မေးကြည့်ရန်"</string>
@@ -1556,8 +1554,8 @@
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ပင်မဖြုတ်မီမှာ စကားဝှက်ကို မေးကြည့်ရန်"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"သင့် အက်ဒမင်မှ သွင်းယူထား၏"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"သင့်စီမံခန့်ခွဲသူမှ အဆင့်မြှင့်ထားပါသည်။"</string>
- <string name="package_deleted_device_owner" msgid="7650577387493101353">"သင့် အက်ဒမင်အား ဖျက်ပစ်ရန်"</string>
- <string name="battery_saver_description" msgid="1960431123816253034">"ဘက်ထရီသက်တမ်း ကြာရှည်ခံရန်၊ ဘက်ထရီအားထိန်းသည် သင့်ကိရိယာ၏ ဆောင်ရွက်ချက်ကို လျှော့ပေးပြီး တုန်ခါမှု၊ တည်နေရာဝန်ဆောင်မှုများနှင့်၊ နောက်ခံဒေတာအများစုကို ကန့်သတ်ပေး၏။ စင့်လုပ်ပေးရလေ့ရှိသည့် အီးမေးလ်၊ စာပို့ခြင်းနှင့်၊ အခြားအပလီကေးရှင်းများကို ၎င်းတို့အား သင် ဖွင့်မှသာ အဆင့်မြှင့်မွမ်းမံမည်ဖြစ်၏။ \n\n ကိရိယာအား အားသွင်းနေစဉ် ဘက်ထရီအားထိန်းအား အလိုအလျောက် ပိတ်ထားသည်။"</string>
+ <string name="package_deleted_device_owner" msgid="7650577387493101353">"သင့် အက်ဒမင်အား ဖျက်ရန်"</string>
+ <string name="battery_saver_description" msgid="1960431123816253034">"ဘက်ထရီသက်တမ်း ကြာရှည်ခံရန်၊ ဘက်ထရီအားထိန်းသည် သင့်ကိရိယာ၏ ဆောင်ရွက်ချက်ကို လျှော့ပေးပြီး တုန်ခါမှု၊ တည်နေရာဝန်ဆောင်မှုများနှင့်၊ နောက်ခံဒေတာအများစုကို ကန့်သတ်ပေး၏။ စင့်လုပ်ပေးရလေ့ရှိသည့် အီးမေးလ်၊ စာပို့ခြင်းနှင့်၊ အခြားအပလီကေးရှင်းများကို ၎င်းတို့အား သင် ဖွင့်မှသာ အပ်ဒိတ်လုပ်မည်ဖြစ်၏။ \n\n ကိရိယာအား အားသွင်းနေစဉ် ဘက်ထရီအားထိန်းအား အလိုအလျောက် ပိတ်ထားသည်။"</string>
<string name="data_saver_description" msgid="6015391409098303235">"ဒေတာအသုံးလျှော့ချနိုင်ရန် အက်ပ်များကို နောက်ခံတွင် ဒေတာပို့ခြင်းနှင့် လက်ခံခြင်းမရှိစေရန် ဒေတာချွေတာမှုစနစ်က တားဆီးထားပါသည်။ ယခုအက်ပ်ဖြင့် ဒေတာအသုံးပြုနိုင်သော်လည်း အကြိမ်လျှော့၍သုံးရပါမည်။ ဥပမာ၊ သင် မတို့မချင်း ပုံများပေါ်လာမည် မဟုတ်ပါ။"</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"ဒေတာအသုံးပြုမှု ချွေတာမှုစနစ်ကို ဖွင့်မလား။"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"ဖွင့်ပါ"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ဖြုတ်ပါ"</string>
<string name="app_info" msgid="6856026610594615344">"အက်ပ်အချက်အလက်"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"စက်ရှင်ကို ပြန်စပါ"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"သရုပ်ပြစက်ရှင်အသစ်စတင်ရန် တို့ပါ"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"သရုပ်ပြချက်ကို စတင်နေသည်"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"စက်ရှင်ကို ပြန်လည်စတင်နေပါသည်"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်မလား။"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်ရန် တို့ပါ"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"သရုပ်ပြချက်ကို စတင်နေသည်…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်နေသည်…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်မလား။"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ပြောင်းလဲမှုများကို ဆုံးရှုံးသွားမည်ဖြစ်ပြီး သရုပ်ပြချက်သည် <xliff:g id="TIMEOUT">%1$s</xliff:g> စက္ကန့်အတွင်း ပြန်လည်စတင်ပါမည်…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"မလုပ်တော့"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ယခုပြန်လည်သတ်မှတ်ပါ"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ဤစက်ပစ္စည်းကို ကန့်သတ်ချက်များမပါဘဲ အသုံးပြုရန် စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြန်လည်သတ်မှတ်ပါ"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"ပိုမိုလေ့လာရန် တို့ပါ။"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"ပိတ်ထားသည့် <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"လူအမြောက်အမြားတပြိုင်နက် ခေါ်ဆိုမှု"</string>
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 8ddc371..17d470e 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimaliser lagring."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android oppgraderes"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Noen apper fungerer kanskje ikke skikkelig før oppgraderingen er fullført"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> oppgraderes …"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimaliserer app <xliff:g id="NUMBER_0">%1$d</xliff:g> av <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Forbereder <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Starter apper."</string>
@@ -1201,7 +1202,7 @@
<string name="ime_action_search" msgid="658110271822807811">"Søk"</string>
<string name="ime_action_send" msgid="2316166556349314424">"Send"</string>
<string name="ime_action_next" msgid="3138843904009813834">"Neste"</string>
- <string name="ime_action_done" msgid="8971516117910934605">"Utført"</string>
+ <string name="ime_action_done" msgid="8971516117910934605">"Ferdig"</string>
<string name="ime_action_previous" msgid="1443550039250105948">"Forrige"</string>
<string name="ime_action_default" msgid="2840921885558045721">"Utfør"</string>
<string name="dial_number_using" msgid="5789176425167573586">"Ring nummeret\n<xliff:g id="NUMBER">%s</xliff:g>"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Løsne"</string>
<string name="app_info" msgid="6856026610594615344">"Info om appen"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Start økten på nytt"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Trykk for å starte en ny demoøkt"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Starter demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Starte økten på nytt"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Tilbakestille enheten?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Trykk for å tilbakestille enheten"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Starter demo …"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Tilbakestiller enheten …"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Tilbakestille enheten?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Du mister eventuelle endringer, og demoen starter på nytt om <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunder."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Avbryt"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Tilbakestill nå"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Tilbakestill til fabrikkstandard for å bruke denne enheten uten begrensninger"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Trykk for å finne ut mer."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> er slått av"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferansesamtale"</string>
</resources>
diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml
index a8efe9f..5ada486 100644
--- a/core/res/res/values-ne-rNP/strings.xml
+++ b/core/res/res/values-ne-rNP/strings.xml
@@ -1030,6 +1030,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"भण्डारण अनुकूलन गर्दै।"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android को स्तरवृद्धि हुँदैछ"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"स्तरवृद्धि सम्पन्न नभएसम्म केही अनुप्रयोगहरू राम्ररी काम नगर्न सक्छन्"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> को स्तरवृद्धि हुँदैछ…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"अनुप्रयोग अनुकुल हुँदै <xliff:g id="NUMBER_0">%1$d</xliff:g> को <xliff:g id="NUMBER_1">%2$d</xliff:g>।"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> तयारी गर्दै।"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"सुरुवात अनुप्रयोगहरू।"</string>
@@ -1605,7 +1606,7 @@
<string name="zen_mode_feature_name" msgid="5254089399895895004">"अवरोध नपुर्याउँनुहोस्"</string>
<string name="zen_mode_downtime_feature_name" msgid="2626974636779860146">"डाउनटाइम"</string>
<string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"हरेक हप्तादिनको राति"</string>
- <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"शनिवार"</string>
+ <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"शनिबार"</string>
<string name="zen_mode_default_events_name" msgid="8158334939013085363">"घटना"</string>
<string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा मौन गरिएको"</string>
<string name="system_error_wipe_data" msgid="6608165524785354962">"तपाईंको यन्त्रसँग आन्तरिक समस्या छ, र तपाईंले फ्याक्ट्री डाटा रिसेट नगर्दासम्म यो अस्थिर रहन्छ।"</string>
@@ -1657,11 +1658,16 @@
<string name="unpin_target" msgid="3556545602439143442">"अनपिन गर्नुहोस्"</string>
<string name="app_info" msgid="6856026610594615344">"अनुप्रयोगका बारे जानकारी"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"सत्रलाई पुन:सुरु गर्नुहोस्"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"एउटा नयाँ डेमो सम्बन्धी सत्र सुरु गर्न ट्याप गर्नुहोस्"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"डेमो सुरु गर्दै"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"सत्रलाई पुन:सुरु गर्दै"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"यन्त्रलाई रिसेट गर्ने हो?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"यन्त्रलाई रिसेट गर्न ट्याप गर्नुहोस्"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"डेमो सुरु गर्दै…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"यन्त्रलाई रिसेट गर्दै…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"यन्त्रलाई रिसेट गर्ने हो?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"तपाईँ सबै परिवर्तनहरू गुमाउनु हुनेछ र <xliff:g id="TIMEOUT">%1$s</xliff:g> सेकेन्डमा डेमो फेरि सुरु हुनेछ…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"रद्द गर्नुहोस्"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"अहिले रिसेट गर्नुहोस्"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"यस यन्त्रलाई सीमितताहरू बिना प्रयोग गर्नका लागि फ्याक्ट्री रिसेट गर्नुहोस्"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"थप जान्नका लागि छुनुहोस्।"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> लाई असक्षम गरियो"</string>
+ <string name="conference_call" msgid="3751093130790472426">"सम्मेलन कल"</string>
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 6aab8a5..5c55345 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Opslagruimte wordt geoptimaliseerd."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android wordt geüpgraded"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Sommige apps werken mogelijk pas correct nadat de upgrade is voltooid"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> upgraden…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g> optimaliseren."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> voorbereiden."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Apps starten."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Losmaken"</string>
<string name="app_info" msgid="6856026610594615344">"App-info"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Sessie opnieuw starten"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tik om een nieuwe demosessie te starten"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demo starten"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sessie opnieuw starten"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Apparaat resetten?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tik om apparaat te resetten"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo starten…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Apparaat resetten…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Apparaat resetten?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Je wijzigingen gaan verloren. De demo wordt opnieuw gestart over <xliff:g id="TIMEOUT">%1$s</xliff:g> seconden…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuleren"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Nu resetten"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Zet dit apparaat terug op de fabrieksinstellingen om het zonder beperkingen te gebruiken"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tik voor meer informatie."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> uitgeschakeld"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Telefonische vergadering"</string>
</resources>
diff --git a/core/res/res/values-notround-watch/config_material.xml b/core/res/res/values-notround-watch/config_material.xml
new file mode 100644
index 0000000..a99674f
--- /dev/null
+++ b/core/res/res/values-notround-watch/config_material.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds, only for Material theme. Do not translate.
+
+ NOTE: The naming convention is "config_camelCaseValue". -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Gravity that should be used for dialog text styles. Equivalent to: Gravity.START | Gravity.TOP -->
+ <integer name="config_dialogTextGravity">0x00800033</integer>
+</resources>
diff --git a/core/res/res/values-notround-watch/dimens_material.xml b/core/res/res/values-notround-watch/dimens_material.xml
index b02437b..9cacb11 100644
--- a/core/res/res/values-notround-watch/dimens_material.xml
+++ b/core/res/res/values-notround-watch/dimens_material.xml
@@ -20,4 +20,7 @@
<dimen name="list_item_padding_horizontal_material">16dp</dimen>
<dimen name="list_item_padding_start_material">16dp</dimen>
<dimen name="list_item_padding_end_material">16dp</dimen>
+
+ <dimen name="dialog_list_padding_top_no_title">8dp</dimen>
+ <dimen name="dialog_list_padding_bottom_no_buttons">8dp</dimen>
</resources>
diff --git a/core/res/res/values-notround-watch/styles_material.xml b/core/res/res/values-notround-watch/styles_material.xml
deleted file mode 100644
index cd8521f4..0000000
--- a/core/res/res/values-notround-watch/styles_material.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1"/>
-</resources>
diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml
index f506243..c059202 100644
--- a/core/res/res/values-pa-rIN/strings.xml
+++ b/core/res/res/values-pa-rIN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"ਸਟੋਰੇਜ ਅਨੁਕੂਲ ਕਰ ਰਿਹਾ ਹੈ।"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ਅੱਪਗ੍ਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਕੁਝ ਐਪਾਂ ਅੱਪਗ੍ਰੇਡ ਦੇ ਪੂਰੀ ਹੋਣ ਤੱਕ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰਨ"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ਅੱਪਗ੍ਰੇਡ ਹੋ ਰਹੀ ਹੈ…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> <xliff:g id="NUMBER_1">%2$d</xliff:g> ਦਾ ਐਪ ਅਨੁਕੂਲ ਕਰ ਰਿਹਾ ਹੈ।"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ।"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ਐਪਸ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ।"</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟੌਲ ਸੈਸ਼ਨ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ ਇਸਨੂੰ ਸਕਿਰਿਆ ਪੈਕੇਜ ਇੰਸਟੌਲੇਸ਼ਨਾਂ ਬਾਰੇ ਵੇਰਵੇ ਦੇਖਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"ਪੈਕੇਜ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕਰੋ"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"ਪੈਕੇਜ ਦੀ ਸਥਾਪਨਾ ਦੀ ਬੇਨਤੀ ਕਰਨ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਅਨੁਮਤੀ ਦਿੰਦਾ ਹੈ"</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"ਜ਼ੂਮ ਕੰਟਰੋਲ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"ਵਿਜੇਟ ਨਹੀਂ ਜੋੜ ਸਕਿਆ।"</string>
<string name="ime_action_go" msgid="8320845651737369027">"ਜਾਓ"</string>
<string name="ime_action_search" msgid="658110271822807811">"ਖੋਜੋ"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"ਸੂਚਨਾ ਰੈਂਕਰ ਸੇਵਾ"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN ਸਕਿਰਿਆ ਕੀਤਾ"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"VPN <xliff:g id="APP">%s</xliff:g> ਰਾਹੀਂ ਸਕਿਰਿਆ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"ਨੈੱਟਵਰਕ ਦੇ ਪ੍ਰਬੰਧਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ। ਨੈੱਟਵਰਕ ਦੇ ਪ੍ਰਬੰਧਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਕਨੈਕਟ ਕੀਤਾ"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਅਸ਼ੁੱਧੀ"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ਅਨਪਿੰਨ ਕਰੋ"</string>
<string name="app_info" msgid="6856026610594615344">"ਐਪ ਜਾਣਕਾਰੀ"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"ਸੈਸ਼ਨ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰੋ"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"ਇੱਕ ਨਵਾਂ ਡੈਮੋ ਸੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ਡੈਮੋ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"ਸੈਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ਕੀ ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕਰਨੀ ਹੈ?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ਡੈਮੋ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ਕੀ ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕਰਨੀ ਹੈ?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਤਬਦੀਲੀਆਂ ਨੂੰ ਗੁਆ ਬੈਠੋਂਗੇ ਅਤੇ ਡੈਮੋ <xliff:g id="TIMEOUT">%1$s</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਚਾਲੂ ਕੀਤਾ ਜਾਵੇਗਾ…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ਰੱਦ ਕਰੋ"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ਹੁਣੇ ਮੁੜ-ਸੈੱਟ ਕਰੋ"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਬਿਨਾਂ ਪਾਬੰਦੀਆਂ ਦੇ ਵਰਤਣ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"ਹੋਰ ਜਾਣਨ ਲਈ ਸਪਰਸ਼ ਕਰੋ।"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"ਕਾਨਫਰੰਸ ਕਾਲ"</string>
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 7c7758c..527a0c2 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optymalizacja pamięci."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android jest uaktualniany"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Niektóre aplikacje mogą nie działać prawidłowo, dopóki nie zakończy się aktualizacja."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Uaktualniam aplikację <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optymalizowanie aplikacji <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Przygotowuję aplikację <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Uruchamianie aplikacji."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Odepnij"</string>
<string name="app_info" msgid="6856026610594615344">"O aplikacji"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Ponowne rozpoczęcie sesji"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Kliknij, by rozpocząć nową sesję demonstracyjną"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Uruchamiam wersję demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Uruchamiam ponownie sesję"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Zresetować urządzenie?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Kliknij, by zresetować urządzenie"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Uruchamiam tryb demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetuję urządzenie…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Zresetować urządzenie?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Stracisz wszystkie wprowadzone zmiany, a tryb demo uruchomi się ponownie za <xliff:g id="TIMEOUT">%1$s</xliff:g> s…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Anuluj"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetuj teraz"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Aby używać tego urządzenia bez ograniczeń, przywróć ustawienia fabryczne"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Kliknij, by dowiedzieć się więcej."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Wyłączono: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Połączenie konferencyjne"</string>
</resources>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index 7be2c0b..9b683fc 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Otimizando o armazenamento."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"O Android está sendo atualizado"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Alguns apps podem não funcionar corretamente até que a atualização seja concluída"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> está fazendo upgrade…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Otimizando app <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparando <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Iniciando apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string>
<string name="app_info" msgid="6856026610594615344">"Informações do app"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reiniciar sessão"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Toque para iniciar uma nova sessão de demonstração"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Iniciando demonstração"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Reiniciando sessão"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Redefinir dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toque para redefinir o dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demonstração…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Redefinindo dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Redefinir dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Você perderá todas as alterações. A demonstração será iniciada novamente em <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reiniciar agora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Redefinir para a configuração original para usar este dispositivo sem restrições"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> desativado"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Teleconferência"</string>
</resources>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 784d03a..b6be06e 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"A otimizar o armazenamento."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"O Android está a ser atualizado"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Algumas aplicações podem não funcionar corretamente enquanto a atualização não for concluída"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"O <xliff:g id="APPLICATION">%1$s</xliff:g> está a ser atualizado…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"A otimizar a aplicação <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"A preparar o <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"A iniciar aplicações"</string>
@@ -1316,7 +1317,7 @@
<string name="storage_usb" msgid="3017954059538517278">"Armazenamento USB"</string>
<string name="extract_edit_menu_button" msgid="8940478730496610137">"Editar"</string>
<string name="data_usage_warning_title" msgid="1955638862122232342">"Aviso de utilização de dados"</string>
- <string name="data_usage_warning_body" msgid="6660692274311972007">"Toque para ver a utiliz. e def."</string>
+ <string name="data_usage_warning_body" msgid="6660692274311972007">"Toque para ver a utilização e definições"</string>
<string name="data_usage_3g_limit_title" msgid="4361523876818447683">"Limite de dados 2G/3G atingido"</string>
<string name="data_usage_4g_limit_title" msgid="4609566827219442376">"Limite de dados 4G atingido"</string>
<string name="data_usage_mobile_limit_title" msgid="557158376602636112">"Limite de dados móveis atingido"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Soltar"</string>
<string name="app_info" msgid="6856026610594615344">"Informações da aplicação"</string>
<string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reiniciar sessão"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Toque para iniciar uma nova sessão de demonstração"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"A iniciar a demonstração"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"A reiniciar a sessão"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Pretende repor o dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toque para repor o dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"A iniciar a demonstração…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"A repor o dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Pretende repor o dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perderá todas as alterações e a demonstração começará novamente dentro de <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Repor agora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Repor os dados de fábrica para utilizar o dispositivo sem restrições"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> desativado"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conferência"</string>
</resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 7be2c0b..9b683fc 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Otimizando o armazenamento."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"O Android está sendo atualizado"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Alguns apps podem não funcionar corretamente até que a atualização seja concluída"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> está fazendo upgrade…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Otimizando app <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Preparando <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Iniciando apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string>
<string name="app_info" msgid="6856026610594615344">"Informações do app"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reiniciar sessão"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Toque para iniciar uma nova sessão de demonstração"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Iniciando demonstração"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Reiniciando sessão"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Redefinir dispositivo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toque para redefinir o dispositivo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demonstração…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Redefinindo dispositivo…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Redefinir dispositivo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Você perderá todas as alterações. A demonstração será iniciada novamente em <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reiniciar agora"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Redefinir para a configuração original para usar este dispositivo sem restrições"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> desativado"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Teleconferência"</string>
</resources>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 27ac216..a5cae27 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -1047,6 +1047,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Se optimizează stocarea."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android face upgrade"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Este posibil ca unele aplicații să nu funcționeze corespunzător până când nu se finalizează upgrade-ul"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Se face upgrade pentru <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Se optimizează aplicația <xliff:g id="NUMBER_0">%1$d</xliff:g> din <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Se pregătește <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Se pornesc aplicațiile."</string>
@@ -1687,11 +1688,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Anulați fixarea"</string>
<string name="app_info" msgid="6856026610594615344">"Informații despre aplicație"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reporniți sesiunea"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Atingeți pentru a începe o nouă sesiune demonstrativă"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Se pornește demonstrația"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Se repornește sesiunea"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Resetați dispozitivul?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Atingeți pentru a reseta dispozitivul"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Se pornește demonstrația…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Se resetează dispozitivul…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Resetați dispozitivul?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Veți pierde toate modificările, iar demonstrația va începe din nou peste <xliff:g id="TIMEOUT">%1$s</xliff:g> secunde…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Anulați"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetați acum"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Reveniți la setările din fabrică pentru a folosi acest dispozitiv fără restricții"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Atingeți pentru a afla mai multe."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> a fost dezactivat"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conferință telefonică"</string>
</resources>
diff --git a/core/res/res/values-round-watch/config_material.xml b/core/res/res/values-round-watch/config_material.xml
index bf445ef..871e910 100644
--- a/core/res/res/values-round-watch/config_material.xml
+++ b/core/res/res/values-round-watch/config_material.xml
@@ -19,4 +19,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Don't clip on round screens so the list can scroll past the rounded edges. -->
<bool name="config_preferenceFragmentClipToPadding">false</bool>
+
+ <!-- Gravity that should be used for dialog text styles. Equivalent to: Gravity.CENTER_HORIZONTAL | Gravity.TOP -->
+ <integer name="config_dialogTextGravity">0x00000031</integer>
</resources>
diff --git a/core/res/res/values-round-watch/dimens_material.xml b/core/res/res/values-round-watch/dimens_material.xml
index a417d19..f2de4e0 100644
--- a/core/res/res/values-round-watch/dimens_material.xml
+++ b/core/res/res/values-round-watch/dimens_material.xml
@@ -14,10 +14,13 @@
limitations under the License.
-->
<resources>
- <dimen name="dialog_padding_material">32dp</dimen>
- <dimen name="preference_fragment_padding_vertical_material">22dp</dimen>
+ <dimen name="dialog_padding_material">@dimen/screen_percentage_15</dimen>
+ <dimen name="preference_fragment_padding_vertical_material">@dimen/screen_percentage_15</dimen>
- <dimen name="list_item_padding_horizontal_material">32dp</dimen>
- <dimen name="list_item_padding_start_material">40dp</dimen>
- <dimen name="list_item_padding_end_material">24dp</dimen>
+ <dimen name="list_item_padding_horizontal_material">@dimen/screen_percentage_15</dimen>
+ <dimen name="list_item_padding_start_material">@dimen/screen_percentage_15</dimen>
+ <dimen name="list_item_padding_end_material">@dimen/screen_percentage_10</dimen>
+
+ <dimen name="dialog_list_padding_top_no_title">@dimen/screen_percentage_15</dimen>
+ <dimen name="dialog_list_padding_bottom_no_buttons">@dimen/screen_percentage_15</dimen>
</resources>
diff --git a/core/res/res/values-round-watch/styles_material.xml b/core/res/res/values-round-watch/styles_material.xml
deleted file mode 100644
index a2f3c02..0000000
--- a/core/res/res/values-round-watch/styles_material.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1">
- <item name="textAlignment">center</item>
- </style>
-</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index a84c15b..6e95df8 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -1020,7 +1020,7 @@
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Изменить"</string>
<string name="whichSendApplication" msgid="6902512414057341668">"Поделиться с помощью:"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Поделиться через %1$s"</string>
- <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Открыть доступ"</string>
+ <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Поделиться"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Выберите приложение"</string>
<string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Отправка с помощью %1$s"</string>
<string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Отправить"</string>
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Оптимизация хранилища…"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Обновление Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Во время обновления возможны неполадки в работе приложений."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Обновление приложения \"<xliff:g id="APPLICATION">%1$s</xliff:g>\"…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимизация приложения <xliff:g id="NUMBER_0">%1$d</xliff:g> из <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Подготовка приложения \"<xliff:g id="APPNAME">%1$s</xliff:g>\"..."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Запуск приложений."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Открепить"</string>
<string name="app_info" msgid="6856026610594615344">"О приложении"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Начните сеанс заново"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Нажмите, чтобы начать новый демосеанс."</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Запуск деморежима"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Повтор сеанса"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Сбросить настройки устройства?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Нажмите здесь, чтобы сбросить настройки"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Запуск деморежима…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Сброс настроек…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Сбросить настройки устройства?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Все изменения будут утеряны. Деморежим будет перезапущен через <xliff:g id="TIMEOUT">%1$s</xliff:g> сек."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Отмена"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Сбросить"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Сброс до заводских настроек для работы без ограничений"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Нажмите, чтобы узнать больше."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Виджет <xliff:g id="LABEL">%1$s</xliff:g> отключен"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конференц-связь"</string>
</resources>
diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml
index ed30daa..006313a 100644
--- a/core/res/res/values-si-rLK/strings.xml
+++ b/core/res/res/values-si-rLK/strings.xml
@@ -1026,6 +1026,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"ආචයනය ප්රශස්තිකරණය කිරීම."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android උත්ශ්රේණි කරමින්"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"උත්ශ්රේණි කිරීම අවසන් වන තෙක් සමහර යෙදුම් නිසි ලෙස ක්රියා නොකළ හැකිය"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> උත්ශ්රේණි කරමින්…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> කින් <xliff:g id="NUMBER_0">%1$d</xliff:g> වැනි යෙදුම ප්රශස්ත කරමින්."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> සූදානම් කරමින්."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"යෙදුම් ආරම්භ කරමින්."</string>
@@ -1653,11 +1654,16 @@
<string name="unpin_target" msgid="3556545602439143442">"ගලවන්න"</string>
<string name="app_info" msgid="6856026610594615344">"යෙදුම් තොරතුරු"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"සැසිය ආරම්භ කරන්න"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"නව ආදර්ශ සැසියක් ආරම්භ කිරීම තට්ටු කරන්න"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ආදර්ශනය ආරම්භ කරමින්"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"සැසිය නැවත ආරම්භ කරමින්"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"උපාංගය යළි සකසන්නද?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"උපාංගය යළි සැකසීමට තට්ටු කරන්න"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ආදර්ශනය ආරම්භ කරමින්..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"උපාංගය යළි සකසමින්..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"උපාංගය යළි සකසන්නද?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ඔබට යම් වෙනස් කිරීම් අහිමි වනු ඇති අතර ආදර්ශනය තත්පර <xliff:g id="TIMEOUT">%1$s</xliff:g>කින් නැවත ආරම්භ වනු ඇත…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"අවලංගු කරන්න"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"දැන් යළි සකසන්න"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"සීමා කිරීම්වලින් තොරව මෙම උපාංගය භාවිත කිරීමට කර්මාන්ත ශාලා යළි සැකසීම"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"තව දැන ගැනීමට ස්පර්ශ කරන්න."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"අබල කළ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"සම්මන්ත්රණ ඇමතුම"</string>
</resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 768bb6d..6d513d0d7 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimalizuje sa úložisko"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Prebieha inovácia systému Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Niektoré aplikácie môžu správne fungovať až po dokončení inovácie"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Aplikácia <xliff:g id="APPLICATION">%1$s</xliff:g> sa inovuje…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Prebieha optimalizácia aplikácie <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Pripravuje sa aplikácia <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Prebieha spúšťanie aplikácií."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Uvoľniť"</string>
<string name="app_info" msgid="6856026610594615344">"Info o aplikácii"</string>
<string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Reštartujte reláciu"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Klepnutím začnete novú demo reláciu"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Spúšťa sa ukážka"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Reštartuje sa relácia"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Resetovať zariadenie?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Klepnutím resetujete zariadenie"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Spúšťa sa ukážka…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetuje sa zariadenie…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Resetovať zariadenie?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Prídete o všetky zmeny a ukážka sa znova spustí o <xliff:g id="TIMEOUT">%1$s</xliff:g> s…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Zrušiť"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetovať"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Ak chcete toto zariadenie používať bez obmedzení, obnovte na ňom továrenské nastavenia"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Klepnutím získate ďalšie informácie."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Deaktivovaná miniaplikácia <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferenčný hovor"</string>
</resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index c04c30e..0239112 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimiziranje shrambe."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Poteka nadgradnja Androida."</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Nekatere aplikacije morda ne bodo delovale pravilno, dokler ne bo dokončana nadgradnja."</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> se nadgrajuje …"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimiranje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Pripravljanje aplikacije <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Zagon aplikacij."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Odpenjanje"</string>
<string name="app_info" msgid="6856026610594615344">"Podatki o aplikaciji"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Vnovični zagon seje"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Dotaknite se, če želite začeti novo predstavitveno sejo"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Začenjanje predstavitve"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Vnovičen zagon seje"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite ponastaviti napravo?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dotaknite se, če želite ponastaviti napravo"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Začenjanje predstavitve …"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Ponastavljanje naprave …"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite ponastaviti napravo?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Morebitne spremembe bodo izgubljene in predstavitev se bo začela znova čez <xliff:g id="TIMEOUT">%1$s</xliff:g> s …"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Prekliči"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ponastavi"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Ponastavitev naprave na tovarniške nastavitve za uporabo brez omejitev"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dotaknite se, če želite izvedeti več."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – onemogočeno"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferenčni klic"</string>
</resources>
diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml
index 6c58678..6523abd 100644
--- a/core/res/res/values-sq-rAL/strings.xml
+++ b/core/res/res/values-sq-rAL/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Po përshtat ruajtjen."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android po përmirësohet"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Disa aplikacione mund të mos funksionojnë si duhet deri sa të përfundojë përmirësimi"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> po përmirësohet…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Po përshtat aplikacionin <xliff:g id="NUMBER_0">%1$d</xliff:g> nga gjithsej <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Po përgatit <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Aplikacionet e fillimit."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Lejon një aplikacion të lexojë sesionet e instalimit. Kjo e lejon atë të shohë detaje rreth instalimeve të paketave aktive."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"kërko paketat e instalimit"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Lejon që një aplikacion të kërkojë instalimin e paketave."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Trokit dy herë për të kontrolluar zmadhimin"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Nuk mundi të shtonte miniaplikacion."</string>
<string name="ime_action_go" msgid="8320845651737369027">"Shko"</string>
<string name="ime_action_search" msgid="658110271822807811">"Kërko"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Shërbimi i klasifikimit të njoftimeve"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN-ja u aktivizua"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"VPN-ja është aktivizuar nga <xliff:g id="APP">%s</xliff:g>"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Trokit për të menaxhuar rrjetin."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"Lidhur me <xliff:g id="SESSION">%s</xliff:g>. Trokit për të menaxhuar rrjetin."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Po lidh VPN-në për aktivizim të përhershëm…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"VPN e lidhur në mënyrë të përhershme"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Gabimi VPN-je për aktivizimin e përhershëm"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Zhgozhdo"</string>
<string name="app_info" msgid="6856026610594615344">"Informacioni mbi aplikacionin"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Rinis sesionin"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Trokit për të nisur një sesion të ri të demonstrimit"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demonstrimi po niset"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sesioni po riniset"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Do ta rivendosësh pajisjen?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Trokit për ta rivendosur pajisjen"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Po nis demonstrimin..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Po rivendos pajisjen…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Do ta rivendosësh pajisjen?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Do të humbasësh çdo ndryshim dhe demonstrimi do të niset përsëri për <xliff:g id="TIMEOUT">%1$s</xliff:g> sekonda…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Anulo"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Rivendos tani"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Rivendos cilësimet e fabrikës për ta përdorur këtë pajisje pa kufizime"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Prek për të mësuar më shumë."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> u çaktivizua"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Telefonatë konferencë"</string>
</resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 786de9a..26ca7d9 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -1047,6 +1047,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Меморија се оптимизује."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android се надограђује…"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Неке апликације можда неће исправно функционисати док се надоградња не доврши"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> се надограђује…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимизовање апликације <xliff:g id="NUMBER_0">%1$d</xliff:g> од <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Припрема се <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Покретање апликација."</string>
@@ -1687,11 +1688,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Откачи"</string>
<string name="app_info" msgid="6856026610594615344">"Информације о апликацији"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Поново покрените сесију"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Додирните да бисте покренули нову сесију демонстрације"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Демонстрација се покреће"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Сесија се поново покреће"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Желите ли да ресетујете уређај?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Додирните да бисте ресетовали уређај"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Покрећемо демонстрацију..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Ресетујемо уређај..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Желите ли да ресетујете уређај?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Изгубићете све промене и демонстрација ће поново почети за <xliff:g id="TIMEOUT">%1$s</xliff:g> сек…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Откажи"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ресетуј"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Ресетујте уређај на фабричка подешавања да бисте га користили без ограничења"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Додирните да бисте сазнали више."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Виџет <xliff:g id="LABEL">%1$s</xliff:g> је онемогућен"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конференцијски позив"</string>
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 78513cf..9aacefc 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Lagringsutrymmet optimeras."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android uppgraderas"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"En del appar kanske inte fungerar som de ska innan uppgraderingen har slutförts"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> uppgraderas …"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Optimerar app <xliff:g id="NUMBER_0">%1$d</xliff:g> av <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> förbereds."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Appar startas."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Lossa"</string>
<string name="app_info" msgid="6856026610594615344">"Info om appen"</string>
<string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Starta om sessionen"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Tryck om du vill starta en ny demosession"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demo startas"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Sessionen startas om"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vill du återställa enheten?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tryck om du vill återställa enheten"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo startas …"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Enheten återställs …"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vill du återställa enheten?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ändringar som du har gjort sparas inte och demon börjar om om <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunder …"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Avbryt"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Återställ nu"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Återställ enheten till standardinställningarna om du vill använda den utan begränsningar"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tryck här om du vill läsa mer."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> har inaktiverats"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferenssamtal"</string>
</resources>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index fb510a3..42cfb8b 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -1022,6 +1022,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Inaboresha hifadhi."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Tunasasisha Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Huenda baadhi ya programu zisifanye kazi vizuri hadi itakapomaliza kusasisha"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> inapata toleo jipya…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Inaboresha programu <xliff:g id="NUMBER_0">%1$d</xliff:g> kutoka <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Inaandaa <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Programu zinaanza"</string>
@@ -1649,11 +1650,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Bandua"</string>
<string name="app_info" msgid="6856026610594615344">"Maelezo ya programu"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Anzisha Kipindi Upya"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Gonga ili uanzishe kipindi kipya cha onyesho"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Inaanzisha onyesho"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Inaanzisha onyesho upya"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Ungependa kuweka upya mipangilio ya kifaa?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Gonga ili uweke upya kifaa"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Inaanzisha onyesho..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Inaweka upya kifaa..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Ungependa kuweka upya mipangilio ya kifaa?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Mabadiliko yoyote hayatahifadhiwa. Onyesho litaanza tena baada ya sekunde <xliff:g id="TIMEOUT">%1$s</xliff:g>..."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Ghairi"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Weka upya sasa"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Rejesha mipangilio iliyotoka nayo kiwandani ili utumie kifaa hiki bila vikwazo"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Gusa ili kupata maelezo zaidi."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> imezimwa"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Simu ya Kongamano"</string>
</resources>
diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml
index 6720d5b..41e316f 100644
--- a/core/res/res/values-ta-rIN/strings.xml
+++ b/core/res/res/values-ta-rIN/strings.xml
@@ -243,23 +243,23 @@
<string name="user_owner_label" msgid="1119010402169916617">"தனிப்பட்ட சுயவிவரத்திற்கு மாறு"</string>
<string name="managed_profile_label" msgid="5289992269827577857">"பணிச் சுயவிவரத்திற்கு மாறு"</string>
<string name="permgrouplab_contacts" msgid="3657758145679177612">"தொடர்புகள்"</string>
- <string name="permgroupdesc_contacts" msgid="6951499528303668046">"தொடர்புகளை அணுகும்"</string>
+ <string name="permgroupdesc_contacts" msgid="6951499528303668046">"தொடர்புகளை அணுக வேண்டும்"</string>
<string name="permgrouplab_location" msgid="7275582855722310164">"இருப்பிடம்"</string>
- <string name="permgroupdesc_location" msgid="1346617465127855033">"சாதனத்தின் இருப்பிடத்தை அணுகும்"</string>
+ <string name="permgroupdesc_location" msgid="1346617465127855033">"இந்தச் சாதனத்தின் இருப்பிடத்தை அறிந்து கொள்ளலாம்"</string>
<string name="permgrouplab_calendar" msgid="5863508437783683902">"கேலெண்டர்"</string>
- <string name="permgroupdesc_calendar" msgid="3889615280211184106">"கேலெண்டரை அணுகும்"</string>
+ <string name="permgroupdesc_calendar" msgid="3889615280211184106">"கேலெண்டரை அணுகலாம்"</string>
<string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string>
- <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS செய்திகளை அனுப்பும் மற்றும் பார்க்கும்"</string>
+ <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS அனுப்பலாம், வந்த SMSகளைப் பார்க்கலாம்"</string>
<string name="permgrouplab_storage" msgid="1971118770546336966">"சேமிப்பிடம்"</string>
- <string name="permgroupdesc_storage" msgid="637758554581589203">"உங்கள் சாதனத்தில் உள்ள படங்கள், மீடியா மற்றும் கோப்புகளை அணுகும்"</string>
+ <string name="permgroupdesc_storage" msgid="637758554581589203">"உங்கள் சாதனத்தில் உள்ள படங்கள், மீடியா மற்றும் கோப்புகளை அணுக வேண்டும்"</string>
<string name="permgrouplab_microphone" msgid="171539900250043464">"மைக்ரோஃபோன்"</string>
- <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ஆடியோவைப் பதிவுசெய்யும்"</string>
+ <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ஒலிப் பதிவு செய்யலாம்"</string>
<string name="permgrouplab_camera" msgid="4820372495894586615">"கேமரா"</string>
- <string name="permgroupdesc_camera" msgid="3250611594678347720">"படங்களை எடுக்கும், வீடியோவைப் பதிவுசெய்யும்"</string>
+ <string name="permgroupdesc_camera" msgid="3250611594678347720">"படங்கள் மற்றும் வீடியோக்கள் எடுக்கலாம்"</string>
<string name="permgrouplab_phone" msgid="5229115638567440675">"ஃபோன்"</string>
- <string name="permgroupdesc_phone" msgid="6234224354060641055">"மொபைல் அழைப்புகளைச் செய்யும், பெறும்"</string>
+ <string name="permgroupdesc_phone" msgid="6234224354060641055">"யாரையும் தொலைபேசியில் அழைக்கலாம்"</string>
<string name="permgrouplab_sensors" msgid="416037179223226722">"உடல் உணர்விகள்"</string>
- <string name="permgroupdesc_sensors" msgid="7147968539346634043">"உங்கள் உடலியக்கக் குறிகள் பற்றிய உணர்வித் தரவை அணுகும்"</string>
+ <string name="permgroupdesc_sensors" msgid="7147968539346634043">"உங்கள் உடல் இயக்கம் பற்றி உணர்விகள் கூறும் தகவலைப் பார்க்கலாம்"</string>
<string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"சாளர உள்ளடக்கத்தைப் பெறும்"</string>
<string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"நீங்கள் பணியாற்றி கொண்டிருக்கும் சாளரத்தின் உள்ளடக்கத்தைப் பார்க்கலாம்."</string>
<string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"தொடுவதன் மூலம் அறிவதை இயக்கும்"</string>
@@ -858,7 +858,7 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> மணிநேரம்</item>
<item quantity="one">1 மணிநேரம்</item>
</plurals>
- <string name="now_string_shortest" msgid="8912796667087856402">"உடனே"</string>
+ <string name="now_string_shortest" msgid="8912796667087856402">"இப்போது"</string>
<plurals name="duration_minutes_shortest" formatted="false" msgid="3957499975064245495">
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>நி</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>நி</item>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"சேமிப்பகத்தை உகந்ததாக்குகிறது."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android மேம்படுத்தப்படுகிறது"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"மேம்படுத்துவது முடியும் வரை, சில பயன்பாடுகள் சரியாக வேலைசெய்யாமல் போகக்கூடும்"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g>ஐ மேம்படுத்துகிறது…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g> பயன்பாட்டை ஒருங்கிணைக்கிறது."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g>ஐத் தயார்செய்கிறது."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"பயன்பாடுகள் தொடங்கப்படுகின்றன."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"நிறுவல் அமர்வுகளைப் படிக்க, பயன்பாட்டை அனுமதிக்கிறது. இது செயல்படும் தொகுப்பு நிறுவல்களைப் பற்றிய விவரங்களைப் பார்க்க அனுமதிக்கிறது."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"நிறுவல் தொகுப்புகளைக் கோருதல்"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"தொகுப்புகளின் நிறுவலைக் கோர, பயன்பாட்டை அனுமதிக்கும்."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"அளவை மாற்றுவதற்கான கட்டுப்பாட்டிற்கு, இருமுறை தட்டவும்"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"விட்ஜெட்டைச் சேர்க்க முடியவில்லை."</string>
<string name="ime_action_go" msgid="8320845651737369027">"செல்"</string>
<string name="ime_action_search" msgid="658110271822807811">"தேடு"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"அறிவிப்பை மதிப்பீடு செய்யும் சேவை"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN செயல்படுத்தப்பட்டது"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ஆல் VPN செயல்படுத்தப்பட்டது"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"நெட்வொர்க்கை நிர்வகிக்க, தட்டவும்."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> உடன் இணைக்கப்பட்டது. நெட்வொர்க்கை நிர்வகிக்க, தட்டவும்."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"எப்போதும் இயங்கும் VPN உடன் இணைக்கிறது…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"எப்போதும் இயங்கும் VPN இணைக்கப்பட்டது"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"எப்போதும் இயங்கும் VPN பிழை"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"பின்னை அகற்று"</string>
<string name="app_info" msgid="6856026610594615344">"பயன்பாட்டுத் தகவல்"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"அமர்வை மீண்டும் தொடங்கு"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"புதிய டெமோ அமர்வைத் தொடங்க, தட்டவும்"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"டெமோவைத் தொடங்குகிறது"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"அமர்வை மீண்டும் தொடங்குகிறது"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"சாதனத்தை மீட்டமைக்கவா?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"சாதனத்தை மீட்டமைக்க, தட்டவும்"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"டெமோவைத் தொடங்குகிறது…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"சாதனத்தை மீட்டமைக்கிறது…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"சாதனத்தை மீட்டமைக்கவா?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"மாற்றங்கள் சேமிக்கப்படாது, <xliff:g id="TIMEOUT">%1$s</xliff:g> வினாடிகளில் டெமோ மீண்டும் தொடங்கும்…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ரத்துசெய்"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"இப்போதே மீட்டமை"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"இந்தச் சாதனத்தைக் கட்டுப்பாடுகளின்றிப் பயன்படுத்த, ஆரம்ப நிலைக்கு மீட்டமைக்கவும்"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"மேலும் அறிய தொடவும்."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"முடக்கப்பட்டது: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"குழு அழைப்பு"</string>
</resources>
diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml
index 66f0232..514eed4 100644
--- a/core/res/res/values-te-rIN/strings.xml
+++ b/core/res/res/values-te-rIN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"నిల్వను అనుకూలపరుస్తోంది."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android అప్గ్రేడ్ అవుతోంది"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"అప్గ్రేడ్ పూర్తయ్యే వరకు కొన్ని అనువర్తనాలు సరిగ్గా పని చేయకపోవచ్చు"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g>ని అప్గ్రేడ్ చేస్తోంది…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>లో <xliff:g id="NUMBER_0">%1$d</xliff:g> అనువర్తనాన్ని అనుకూలీకరిస్తోంది."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g>ని సిద్ధం చేస్తోంది."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"అనువర్తనాలను ప్రారంభిస్తోంది."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"ఇన్స్టాల్ సెషన్లను చదవడానికి అనువర్తనాన్ని అనుమతిస్తుంది. ఇది సక్రియ ప్యాకేజీ ఇన్స్టాలేషన్ల గురించి వివరాలను చూడటానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"ఇన్స్టాల్ ప్యాకేజీలను అభ్యర్థించడం"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"ప్యాకేజీల ఇన్స్టాలేషన్ అభ్యర్థించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"జూమ్ నియంత్రణ కోసం రెండుసార్లు నొక్కండి"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"విడ్జెట్ను జోడించడం సాధ్యపడలేదు."</string>
<string name="ime_action_go" msgid="8320845651737369027">"వెళ్లు"</string>
<string name="ime_action_search" msgid="658110271822807811">"శోధించు"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"నోటిఫికేషన్ ర్యాంకర్ సేవ"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN సక్రియం చేయబడింది"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ద్వారా VPN సక్రియం చేయబడింది"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"నెట్వర్క్ను నిర్వహించడానికి నొక్కండి."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g>కు కనెక్ట్ చేయబడింది. నెట్వర్క్ను నిర్వహించడానికి నొక్కండి."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"ఎల్లప్పుడూ-ఆన్లో ఉండే VPN కనెక్ట్ చేయబడుతోంది…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"ఎల్లప్పుడూ-ఆన్లో ఉండే VPN కనెక్ట్ చేయబడింది"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"ఎల్లప్పుడూ-ఆన్లో ఉండే VPN లోపం"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"అన్పిన్ చేయి"</string>
<string name="app_info" msgid="6856026610594615344">"అనువర్తన సమాచారం"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"సెషన్ను పునఃప్రారంభించండి"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"కొత్త డెమో సెషన్ను ప్రారంభించడానికి నొక్కండి"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"డెమోను ప్రారంభిస్తోంది"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"సెషన్ను పునఃప్రారంభిస్తోంది"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"పరికరాన్ని రీసెట్ చేయాలా?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"పరికరాన్ని రీసెట్ చేయడానికి నొక్కండి"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"డెమోను ప్రారంభిస్తోంది..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"పరికరాన్ని రీసెట్ చేస్తోంది..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"పరికరాన్ని రీసెట్ చేయాలా?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"మీరు చేసిన ఏవైనా మార్పులను కోల్పోతారు మరియు డెమో <xliff:g id="TIMEOUT">%1$s</xliff:g> సెకన్లలో మళ్లీ ప్రారంభమవుతుంది…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"రద్దు చేయి"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ఇప్పుడే రీసెట్ చేయి"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"ఈ పరికరాన్ని ఎటువంటి పరిమితులు లేకుండా ఉపయోగించడానికి ఫ్యాక్టరీ రీసెట్ చేయండి"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"మరింత తెలుసుకోవడానికి తాకండి."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> నిలిపివేయబడింది"</string>
+ <string name="conference_call" msgid="3751093130790472426">"కాన్ఫరెన్స్ కాల్"</string>
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 7326b7d..26303da 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"กำลังเพิ่มประสิทธิภาพพื้นที่จัดเก็บข้อมูล"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android กำลังอัปเกรด"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"แอปบางแอปอาจทำงานไม่ถูกต้องจนกว่าจะอัปเกรดเสร็จ"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"กำลังอัปเกรด <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"กำลังเพิ่มประสิทธิภาพแอปพลิเคชัน <xliff:g id="NUMBER_0">%1$d</xliff:g> จาก <xliff:g id="NUMBER_1">%2$d</xliff:g> รายการ"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"กำลังเตรียม <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"กำลังเริ่มต้นแอปพลิเคชัน"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"เลิกปักหมุด"</string>
<string name="app_info" msgid="6856026610594615344">"ข้อมูลแอป"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"เริ่มเซสชันอีกครั้ง"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"แตะเพื่อเริ่มเซสชันสาธิตใหม่"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"กำลังเริ่มการสาธิต"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"กำลังเริ่มเซสชันอีกครั้ง"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"รีเซ็ตอุปกรณ์ไหม"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"แตะเพื่อรีเซ็ตอุปกรณ์"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"กำลังเริ่มการสาธิต…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"กำลังรีเซ็ตอุปกรณ์…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"รีเซ็ตอุปกรณ์ไหม"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"การเปลี่ยนแปลงของคุณจะหายไปและการสาธิตจะเริ่มต้นอีกครั้งใน <xliff:g id="TIMEOUT">%1$s</xliff:g> วินาที…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ยกเลิก"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"รีเซ็ตทันที"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"รีเซ็ตเป็นค่าเริ่มต้นเพื่อใช้อุปกรณ์นี้โดยไร้ข้อจำกัด"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"แตะเพื่อเรียนรู้เพิ่มเติม"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"ปิดใช้ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"การประชุมสาย"</string>
</resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index b12d84d..bc0e449 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ino-optimize ang storage."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Nag-a-upgrade ang Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Maaaring hindi gumana nang maayos ang ilang app hangga\'t hindi pa natatapos ang pag-upgrade"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Nag-a-upgrade ang <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Ino-optimize ang app <xliff:g id="NUMBER_0">%1$d</xliff:g> ng <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Ihinahanda ang <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Sinisimulan ang apps."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"I-unpin"</string>
<string name="app_info" msgid="6856026610594615344">"Impormasyon ng app"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"I-restart ang Session"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"I-tap upang magsimula ng bagong session ng demo"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Sinisimulan ang demo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Nire-restart ang session"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Gusto mo bang i-reset ang device?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Mag-tap upang i-reset ang device"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Sinisimulan ang demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Nire-reset ang device…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Gusto mo bang i-reset ang device?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Mawawala mo ang anumang mga pagbabago at magsisimulang muli ang demo pagkalipas ng <xliff:g id="TIMEOUT">%1$s</xliff:g> (na) segundo…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Kanselahin"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"I-reset ngayon"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"I-factory reset upang magamit ang device na ito nang walang mga paghihigpit"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Pindutin upang matuto nang higit pa."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Na-disable ang <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string>
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 61f15ef..b66d0dc 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Depolama optimize ediliyor."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android yeni sürüme geçiriliyor"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Yeni sürüme geçiş işlemi tamamlanana kadar bazı uygulamalar düzgün çalışmayabilir"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> yeni sürüme geçiriliyor…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g> uygulama optimize ediliyor."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> hazırlanıyor."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Uygulamalar başlatılıyor"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Sabitlemeyi kaldır"</string>
<string name="app_info" msgid="6856026610594615344">"Uygulama bilgileri"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Oturumu Yeniden Başlatın"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Yeni bir demo oturumu başlatmak için dokunun"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Tanıtım başlatılıyor"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Oturum yeniden başlatılıyor"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Cihaz sıfırlansın mı?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Cihazı sıfırlamak için dokunun"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo başlatılıyor…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Cihaz sıfırlanıyor…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Cihaz sıfırlansın mı?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Değişiklikleri kaybedeceksiniz ve demo <xliff:g id="TIMEOUT">%1$s</xliff:g> saniye içinde tekrar başlayacak…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"İptal"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Şimdi sıfırla"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Bu cihazı kısıtlama olmadan kullanmak için fabrika ayarlarına sıfırlayın"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Daha fazla bilgi edinmek için dokunun."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> devre dışı"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferans Çağrısı"</string>
</resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index a626df4..3154ef9 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -1070,6 +1070,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Оптимізація пам’яті."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android оновлюється"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Деякі додатки можуть не працювати належним чином, доки не завершиться оновлення"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"Додаток <xliff:g id="APPLICATION">%1$s</xliff:g> оновлюється…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимізація програми <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Підготовка додатка <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Запуск програм."</string>
@@ -1723,11 +1724,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Відкріпити"</string>
<string name="app_info" msgid="6856026610594615344">"Про додаток"</string>
<string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Новий сеанс"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Торкніться, щоб почати новий демо-сеанс"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Запускається демонстрація"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Починається новий сеанс"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Скинути налаштування пристрою?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Торкніться, щоб скинути налаштування пристрою"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Запуск демонстрації…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Скидання налаштувань пристрою…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Скинути налаштування пристрою?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ви втратите всі зміни, а демонстрація знову почнеться через <xliff:g id="TIMEOUT">%1$s</xliff:g> с…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Скасувати"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Скинути"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Відновіть заводські параметри, щоб використовувати пристрій без обмежень"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Торкніться, щоб дізнатися більше."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> вимкнено"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Конференц-виклик"</string>
</resources>
diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml
index 7746c09..5919618 100644
--- a/core/res/res/values-ur-rPK/strings.xml
+++ b/core/res/res/values-ur-rPK/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"اسٹوریج کو بہترین بنایا جا رہا ہے۔"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android اپ گریڈ ہو رہا ہے"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"اپ گریڈ ختم ہونے تک شاید کچھ ایپس ٹھیک طرح سے کام نہ کریں"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> اپ گریڈ ہو رہی ہے…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"ایپ <xliff:g id="NUMBER_0">%1$d</xliff:g> از <xliff:g id="NUMBER_1">%2$d</xliff:g> کو بہتر بنایا جا رہا ہے۔"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> تیار ہو رہی ہے۔"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"ایپس شروع ہو رہی ہیں۔"</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"ایک ایپلیکیشن کو انسٹال سیشنز پڑھنے کی اجازت دیتا ہے۔ یہ اسے فعال پیکیج انسٹالیشنز کے بارے میں تفصیلات دیکھنے کی اجازت دیتا ہے۔"</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"پیکجز انسٹال کرنے کی درخواست کریں"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"ایک ایپلیکیشن کو پیکجز انسٹال کرنے کی اجازت دیتی ہے۔"</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"زوم کنٹرول کیلئے دوبار تھپتھپائیں"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"ویجٹس کو شامل نہیں کرسکا۔"</string>
<string name="ime_action_go" msgid="8320845651737369027">"جائیں"</string>
<string name="ime_action_search" msgid="658110271822807811">"تلاش کریں"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"اطلاع کی درجہ بندی سروس"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN فعال ہوگیا"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> کے ذریعہ VPN فعال ہے"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"نیٹ ورک نظم کرنے کیلئے تھپتھپائیں۔"</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> سے منسلک ہے۔ نیٹ ورک کا نظم کرنے کیلئے تھپتھپائیں۔"</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"ہمیشہ آن VPN مربوط ہو رہا ہے…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"ہمیشہ آن VPN مربوط ہوگیا"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"ہمیشہ آن VPN کی خرابی"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"پن ہٹائیں"</string>
<string name="app_info" msgid="6856026610594615344">"ایپ کی معلومات"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"سیشن دوبارہ شروع کریں"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"نیا ڈیمو سیشن شروع کرنے کیلئے تھپتھپائیں"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"ڈیمو شروع ہو رہا ہے"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"سیشن دوبارہ شروع ہو رہا ہے"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"آلہ ری سیٹ کریں؟"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"آلہ ری سیٹ کرنے کیلئے تھپتھپائیں"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"ڈیمو شروع ہو رہا ہے…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"آلہ ری سیٹ ہو رہا ہے…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"آلہ ری سیٹ کریں؟"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"آپ کی تمام تبدیلیاں ضائع ہو جائیں گی اور ڈیمو <xliff:g id="TIMEOUT">%1$s</xliff:g> سیکنڈز میں دوبارہ شروع ہوگا…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"منسوخ کریں"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ابھی ری سیٹ کریں"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"بغیر کسی حدود کے استعمال کرنے کیلئے اس آلے کو فیکٹری ری سیٹ کریں"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"مزید جاننے کیلئے ٹچ کریں۔"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"غیر فعال کردہ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"کانفرنس کال"</string>
</resources>
diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml
index 8ec4c2c..30e753f 100644
--- a/core/res/res/values-uz-rUZ/strings.xml
+++ b/core/res/res/values-uz-rUZ/strings.xml
@@ -44,7 +44,7 @@
<string name="unknownName" msgid="6867811765370350269">"Noma’lum"</string>
<string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"Ovozli pochta"</string>
<string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>
- <string name="mmiError" msgid="5154499457739052907">"Ulanishda xato yoki noto‘g‘ri MMI kodi."</string>
+ <string name="mmiError" msgid="5154499457739052907">"Tarmoqda xato yoki MMI kod noto‘g‘ri."</string>
<string name="mmiFdnError" msgid="5224398216385316471">"Bu amal faqat ruxsat etilgan raqamlar uchun mavjud."</string>
<string name="serviceEnabled" msgid="8147278346414714315">"Xizmat yoqildi."</string>
<string name="serviceEnabledFor" msgid="6856228140453471041">"Xizmat quyidagi uchun yoqildi:"</string>
@@ -143,7 +143,7 @@
<string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Yo‘naltirilmadi"</string>
<string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: yo‘naltirilmadi"</string>
<string name="fcComplete" msgid="3118848230966886575">"Maxsus kod bajarildi."</string>
- <string name="fcError" msgid="3327560126588500777">"Ulanishda muammo yoki maxsus kod xato."</string>
+ <string name="fcError" msgid="3327560126588500777">"Tarmoqda xato yoki maxsus kod noto‘g‘ri."</string>
<string name="httpErrorOk" msgid="1191919378083472204">"OK"</string>
<string name="httpError" msgid="7956392511146698522">"Tarmoqda xato yuz berdi."</string>
<string name="httpErrorLookup" msgid="4711687456111963163">"URL topilmadi."</string>
@@ -985,7 +985,7 @@
<string name="whichImageCaptureApplicationNamed" msgid="8619384150737825003">"%1$s yordamida suratga oling"</string>
<string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"Suratga olish"</string>
<string name="alwaysUse" msgid="4583018368000610438">"Ushbu amaldan standart sifatida foydalanish"</string>
- <string name="use_a_different_app" msgid="8134926230585710243">"Boshqa ilovadan foydalanish"</string>
+ <string name="use_a_different_app" msgid="8134926230585710243">"Boshqa ilova"</string>
<string name="clearDefaultHintMsg" msgid="3252584689512077257">"Birlamchi sozlamalarni Tizim sozlamalari > Ilovalar > Yuklab olingan menyusidan tozalang."</string>
<string name="chooseActivity" msgid="7486876147751803333">"Amalni tanlash"</string>
<string name="chooseUsbActivity" msgid="6894748416073583509">"USB qurilma uchun ilovani tanlang"</string>
@@ -998,16 +998,16 @@
<string name="aerr_report" msgid="5371800241488400617">"Fikr-mulohaza yuborish"</string>
<string name="aerr_close" msgid="2991640326563991340">"Yopish"</string>
<string name="aerr_mute" msgid="1974781923723235953">"Qurilma o‘chib yonguncha e’tiborsiz qoldirish"</string>
- <string name="aerr_wait" msgid="3199956902437040261">"Kuting"</string>
+ <string name="aerr_wait" msgid="3199956902437040261">"Kutish"</string>
<string name="aerr_close_app" msgid="3269334853724920302">"Ilovani yopish"</string>
<string name="anr_title" msgid="4351948481459135709"></string>
- <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> javob bermayapti"</string>
- <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> javob bermayapti"</string>
- <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> javob bermayapti"</string>
+ <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> ilovasi javob bermayapti"</string>
+ <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> harakati javob bermayapti"</string>
+ <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasi javob bermayapti"</string>
<string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> ilovasi javob bermayapti"</string>
<string name="force_close" msgid="8346072094521265605">"OK"</string>
<string name="report" msgid="4060218260984795706">"Xabar berish"</string>
- <string name="wait" msgid="7147118217226317732">"Kuting"</string>
+ <string name="wait" msgid="7147118217226317732">"Kutish"</string>
<string name="webpage_unresponsive" msgid="3272758351138122503">"Sahifa javob bermayapti.\n\nUni yopishni xohlaysizmi?"</string>
<string name="launch_warning_title" msgid="1547997780506713581">"Ilova qayta yo‘naltirildi"</string>
<string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> hozirda ishlamoqda"</string>
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Xotira optimallashtirilmoqda."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android yangilanmoqda"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Yangilanish vaqtida ba’zi ilovalar to‘g‘ri ishlamasligi mumkin"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasi yangilanmoqda…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Ilovalar optimallashtirilmoqda (<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g>)."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"<xliff:g id="APPNAME">%1$s</xliff:g> tayyorlanmoqda."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Ilovalar ishga tushirilmoqda."</string>
@@ -1132,7 +1133,7 @@
<string name="usb_charging_notification_title" msgid="6895185153353640787">"USB orqali quvvatlash"</string>
<string name="usb_supplying_notification_title" msgid="5310642257296510271">"USB orqali ulangan qurilma quvvatlanmoqda"</string>
<string name="usb_mtp_notification_title" msgid="8396264943589760855">"USB orqali fayl o‘tkazish"</string>
- <string name="usb_ptp_notification_title" msgid="1347328437083192112">"USB orqali rasm o‘tkazish"</string>
+ <string name="usb_ptp_notification_title" msgid="1347328437083192112">"USB orqali surat o‘tkazish"</string>
<string name="usb_midi_notification_title" msgid="4850904915889144654">"USB orqali MIDI"</string>
<string name="usb_accessory_notification_title" msgid="7848236974087653666">"USB jihozga ulangan"</string>
<string name="usb_notification_message" msgid="3370903770828407960">"Boshqa parametrlarini ko‘rish uchun bosing."</string>
@@ -1195,8 +1196,7 @@
<string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Ilovaga o‘rnatilgan seanslarni o‘qish uchun ruxsat beradi. Bu unga faol paket o‘rnatmalari haqidagi ma’lumotlarni ko‘rish imkonini beradi."</string>
<string name="permlab_requestInstallPackages" msgid="5782013576218172577">"paketlarni o‘rnatish so‘rovini yuborish"</string>
<string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Ilovaga paketlarni o‘rnatish so‘rovini yuborish imkonini beradi."</string>
- <!-- no translation found for tutorial_double_tap_to_zoom_message_short (1311810005957319690) -->
- <skip />
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Ko‘lamini o‘zgartirish uchun ikki marta bosing"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"Vidjet qo‘shilmadi."</string>
<string name="ime_action_go" msgid="8320845651737369027">"O‘tish"</string>
<string name="ime_action_search" msgid="658110271822807811">"Qidirish"</string>
@@ -1227,10 +1227,8 @@
<string name="notification_ranker_binding_label" msgid="774540592299064747">"Bildirishnomalarni baholash xizmati"</string>
<string name="vpn_title" msgid="19615213552042827">"VPN faollashtirildi"</string>
<string name="vpn_title_long" msgid="6400714798049252294">"VPN <xliff:g id="APP">%s</xliff:g> tomonidan faollashtirilgan"</string>
- <!-- no translation found for vpn_text (1610714069627824309) -->
- <skip />
- <!-- no translation found for vpn_text_long (4907843483284977618) -->
- <skip />
+ <string name="vpn_text" msgid="1610714069627824309">"Tarmoq sozlamalarini o‘zgartirish uchun bu yerni bosing."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"<xliff:g id="SESSION">%s</xliff:g> ulandi. Tarmoq sozlamalarini o‘zgartirish uchun bu yerni bosing."</string>
<string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Ulanmoqda…"</string>
<string name="vpn_lockdown_connected" msgid="8202679674819213931">"Ulandi"</string>
<string name="vpn_lockdown_error" msgid="6009249814034708175">"Xato"</string>
@@ -1318,7 +1316,7 @@
<string name="storage_usb_drive_label" msgid="4501418548927759953">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB xotira qurilmasi"</string>
<string name="storage_usb" msgid="3017954059538517278">"USB xotira"</string>
<string name="extract_edit_menu_button" msgid="8940478730496610137">"Tahrirlash"</string>
- <string name="data_usage_warning_title" msgid="1955638862122232342">"Ma’lumotlardan foydalanish ogohlantirilishi"</string>
+ <string name="data_usage_warning_title" msgid="1955638862122232342">"Trafik kam qoldi"</string>
<string name="data_usage_warning_body" msgid="6660692274311972007">"Trafik sarfi va sozlamalarni ko‘rish uchun bosing."</string>
<string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-3G trafik chekloviga yetdi"</string>
<string name="data_usage_4g_limit_title" msgid="4609566827219442376">"4G trafik chekloviga yetdi"</string>
@@ -1353,7 +1351,7 @@
<string name="launchBrowserDefault" msgid="2057951947297614725">"Brauzer ishga tushirilsinmi?"</string>
<string name="SetupCallDefault" msgid="5834948469253758575">"Qo‘ng‘iroqni qabul qilasizmi?"</string>
<string name="activity_resolver_use_always" msgid="8017770747801494933">"Har doim"</string>
- <string name="activity_resolver_use_once" msgid="2404644797149173758">"Bir marta"</string>
+ <string name="activity_resolver_use_once" msgid="2404644797149173758">"Faqat hozir"</string>
<string name="activity_resolver_work_profiles_support" msgid="185598180676883455">"“%1$s” ishchi profilni qo‘llab-quvvatlamaydi"</string>
<string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Planshet"</string>
<string name="default_audio_route_name" product="tv" msgid="9158088547603019321">"TV"</string>
@@ -1654,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Olib tashlash"</string>
<string name="app_info" msgid="6856026610594615344">"Ilova haqida"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Yangi seans"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Yangi demo-seans boshlash uchun bosing"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Demo boshlanmoqda"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Seans qayta boshlanmoqda"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Qurilma asl holatga qaytarilsinmi?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Qurilmani asl holatga qaytarish uchun bosing"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Demo boshlanmoqda…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Qurilma asl holatga qaytarilmoqda…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Qurilma asl holatga qaytarilsinmi?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Har qanday o‘zgarishlar o‘chib ketadi va demo <xliff:g id="TIMEOUT">%1$s</xliff:g> soniyadan so‘ng yana qayta ishga tushadi…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Bekor qilish"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Asl holatga qaytarish"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Bu qurilmadan cheklovlarsiz foydalanish uchun zavod sozlamalarini tiklang"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Ko‘proq o‘rganish uchun bosing."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> vidjeti o‘chirilgan"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Konferens-aloqa"</string>
</resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index a4aa101..eb25bf54 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Tối ưu hóa lưu trữ."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android đang nâng cấp"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Một số ứng dụng có thể không hoạt động bình thường cho đến khi nâng cấp xong"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> đang nâng cấp…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Đang tối ưu hóa ứng dụng <xliff:g id="NUMBER_0">%1$d</xliff:g> trong tổng số <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Đang chuẩn bị <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Khởi động ứng dụng."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Bỏ ghim"</string>
<string name="app_info" msgid="6856026610594615344">"Thông tin ứng dụng"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Khởi động lại phiên"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Nhấn để bắt đầu phiên trình diễn mới"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Bắt đầu bản trình diễn"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Bắt đầu lại phiên"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Đặt lại thiết bị?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Nhấn để đặt lại thiết bị"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Đang bắt đầu bản trình diễn..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Đang đặt lại thiết bị..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Đặt lại thiết bị?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Bạn sẽ bị mất mọi thay đổi và bản trình diễn sẽ bắt đầu lại sau <xliff:g id="TIMEOUT">%1$s</xliff:g> giây…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Hủy"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Đặt lại ngay bây giờ"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Khôi phục cài đặt gốc để sử dụng thiết bị này mà không bị hạn chế"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Chạm để tìm hiểu thêm."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"Đã tắt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Cuộc gọi nhiều bên"</string>
</resources>
diff --git a/core/res/res/values-w180dp-notround-watch/dimens_material.xml b/core/res/res/values-w180dp-notround-watch/dimens_material.xml
new file mode 100644
index 0000000..79acf84
--- /dev/null
+++ b/core/res/res/values-w180dp-notround-watch/dimens_material.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="text_size_display_4_material">80sp</dimen>
+ <dimen name="text_size_display_3_material">50sp</dimen>
+ <dimen name="text_size_display_2_material">40sp</dimen>
+ <dimen name="text_size_display_1_material">30sp</dimen>
+ <dimen name="text_size_headline_material">20sp</dimen>
+ <dimen name="text_size_title_material">18sp</dimen>
+ <dimen name="text_size_subhead_material">18sp</dimen>
+ <dimen name="text_size_title_material_toolbar">18dp</dimen>
+ <dimen name="text_size_subtitle_material_toolbar">18dp</dimen>
+ <dimen name="text_size_menu_material">18sp</dimen>
+ <dimen name="text_size_menu_header_material">16sp</dimen>
+ <dimen name="text_size_body_2_material">16sp</dimen>
+ <dimen name="text_size_body_1_material">16sp</dimen>
+ <dimen name="text_size_caption_material">14sp</dimen>
+ <dimen name="text_size_button_material">16sp</dimen>
+
+ <dimen name="text_size_large_material">18sp</dimen>
+ <dimen name="text_size_medium_material">16sp</dimen>
+ <dimen name="text_size_small_material">14sp</dimen>
+</resources>
diff --git a/core/res/res/values-w192dp/dimens_material.xml b/core/res/res/values-w192dp/dimens_material.xml
new file mode 100644
index 0000000..797bf5a
--- /dev/null
+++ b/core/res/res/values-w192dp/dimens_material.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="screen_percentage_05">9.6dp</dimen>
+ <dimen name="screen_percentage_10">19.2dp</dimen>
+ <dimen name="screen_percentage_15">28.8dp</dimen>
+</resources>
diff --git a/core/res/res/values-w205dp/dimens_material.xml b/core/res/res/values-w205dp/dimens_material.xml
new file mode 100644
index 0000000..94907ee
--- /dev/null
+++ b/core/res/res/values-w205dp/dimens_material.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="screen_percentage_05">10.25dp</dimen>
+ <dimen name="screen_percentage_10">20.5dp</dimen>
+ <dimen name="screen_percentage_15">30.75dp</dimen>
+</resources>
diff --git a/core/res/res/values-w210dp-round-watch/dimens_material.xml b/core/res/res/values-w210dp-round-watch/dimens_material.xml
new file mode 100644
index 0000000..79acf84
--- /dev/null
+++ b/core/res/res/values-w210dp-round-watch/dimens_material.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="text_size_display_4_material">80sp</dimen>
+ <dimen name="text_size_display_3_material">50sp</dimen>
+ <dimen name="text_size_display_2_material">40sp</dimen>
+ <dimen name="text_size_display_1_material">30sp</dimen>
+ <dimen name="text_size_headline_material">20sp</dimen>
+ <dimen name="text_size_title_material">18sp</dimen>
+ <dimen name="text_size_subhead_material">18sp</dimen>
+ <dimen name="text_size_title_material_toolbar">18dp</dimen>
+ <dimen name="text_size_subtitle_material_toolbar">18dp</dimen>
+ <dimen name="text_size_menu_material">18sp</dimen>
+ <dimen name="text_size_menu_header_material">16sp</dimen>
+ <dimen name="text_size_body_2_material">16sp</dimen>
+ <dimen name="text_size_body_1_material">16sp</dimen>
+ <dimen name="text_size_caption_material">14sp</dimen>
+ <dimen name="text_size_button_material">16sp</dimen>
+
+ <dimen name="text_size_large_material">18sp</dimen>
+ <dimen name="text_size_medium_material">16sp</dimen>
+ <dimen name="text_size_small_material">14sp</dimen>
+</resources>
diff --git a/core/res/res/values-w213dp/dimens_material.xml b/core/res/res/values-w213dp/dimens_material.xml
new file mode 100644
index 0000000..8a4e3a0
--- /dev/null
+++ b/core/res/res/values-w213dp/dimens_material.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="screen_percentage_05">10.65dp</dimen>
+ <dimen name="screen_percentage_10">21.3dp</dimen>
+ <dimen name="screen_percentage_15">31.95dp</dimen>
+</resources>
diff --git a/core/res/res/values-w228dp/dimens_material.xml b/core/res/res/values-w228dp/dimens_material.xml
new file mode 100644
index 0000000..a200975
--- /dev/null
+++ b/core/res/res/values-w228dp/dimens_material.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="screen_percentage_05">11.4dp</dimen>
+ <dimen name="screen_percentage_10">22.8dp</dimen>
+ <dimen name="screen_percentage_15">34.2dp</dimen>
+</resources>
diff --git a/core/res/res/values-w240dp/dimens_material.xml b/core/res/res/values-w240dp/dimens_material.xml
new file mode 100644
index 0000000..a4b58fa
--- /dev/null
+++ b/core/res/res/values-w240dp/dimens_material.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="screen_percentage_05">12dp</dimen>
+ <dimen name="screen_percentage_10">24dp</dimen>
+ <dimen name="screen_percentage_15">36dp</dimen>
+</resources>
diff --git a/core/res/res/values-watch/colors_material.xml b/core/res/res/values-watch/colors_material.xml
index cbdf879..45eb981 100644
--- a/core/res/res/values-watch/colors_material.xml
+++ b/core/res/res/values-watch/colors_material.xml
@@ -14,35 +14,13 @@
limitations under the License.
-->
<resources>
- <color name="background_material_dark">@color/micro_blue_grey_b15</color>
- <color name="background_floating_material_dark">@color/micro_blue_grey_b30</color>
+ <color name="background_material_dark">#ff232e33</color>
+ <color name="background_floating_material_dark">#ff3e5059</color>
- <color name="primary_material_dark">@color/micro_blue_grey_b65</color>
- <color name="primary_dark_material_dark">@color/micro_blue_grey_b40</color>
+ <color name="accent_material_dark">#ff5e97f6</color>
+ <color name="accent_material_light">#ff4285f4</color>
- <color name="accent_material_dark">@color/micro_blue_grey_b100</color>
- <color name="accent_material_light">@color/micro_blue_grey_500</color>
+ <color name="primary_material_dark">#4D4D4D</color>
- <!-- Primary & accent colors -->
- <eat-comment />
-
- <!-- App color -->
- <color name="micro_blue_grey_500">#ff607d8b</color>
- <!-- Accent -->
- <color name="micro_blue_grey_b100">#ffb0e5ff</color>
- <!-- Lighter UI element -->
- <color name="micro_blue_grey_b65">#ff7295a6</color>
- <!-- UI Element -->
- <color name="micro_blue_grey_b40">#ff465b66</color>
- <!-- Lighter background -->
- <color name="micro_blue_grey_b30">#ff35454d</color>
- <!-- Dark background -->
- <color name="micro_blue_grey_b15">#ff1a2226</color>
-
- <!-- Button colors -->
- <eat-comment />
-
- <color name="micro_confirm_green">#ff4fc0b0</color>
- <color name="micro_button_gray">#ffc2c2c2</color>
- <color name="micro_action_blue">#ff0288d1</color>
+ <color name="button_material_dark">#ff999999</color>
</resources>
diff --git a/core/res/res/values-watch/config_material.xml b/core/res/res/values-watch/config_material.xml
index 81b53e7..104d122 100644
--- a/core/res/res/values-watch/config_material.xml
+++ b/core/res/res/values-watch/config_material.xml
@@ -29,7 +29,4 @@
<!-- Always overscan by default to ensure onApplyWindowInsets will always be called. -->
<bool name="config_windowOverscanByDefault">true</bool>
-
- <!-- Due to the smaller screen size, have dialog titles occupy more than 1 line. -->
- <integer name="config_dialogWindowTitleMaxLines">3</integer>
</resources>
diff --git a/core/res/res/values-watch/dimens_material.xml b/core/res/res/values-watch/dimens_material.xml
index d579434..96e91a5 100644
--- a/core/res/res/values-watch/dimens_material.xml
+++ b/core/res/res/values-watch/dimens_material.xml
@@ -14,5 +14,25 @@
limitations under the License.
-->
<resources>
+ <dimen name="text_size_display_4_material">71sp</dimen>
+ <dimen name="text_size_display_3_material">44sp</dimen>
+ <dimen name="text_size_display_2_material">36sp</dimen>
+ <dimen name="text_size_display_1_material">27sp</dimen>
+ <dimen name="text_size_headline_material">18sp</dimen>
+ <dimen name="text_size_title_material">16sp</dimen>
+ <dimen name="text_size_subhead_material">16sp</dimen>
+ <dimen name="text_size_title_material_toolbar">16dp</dimen>
+ <dimen name="text_size_subtitle_material_toolbar">16dp</dimen>
+ <dimen name="text_size_menu_material">16sp</dimen>
+ <dimen name="text_size_menu_header_material">14sp</dimen>
+ <dimen name="text_size_body_2_material">14sp</dimen>
+ <dimen name="text_size_body_1_material">14sp</dimen>
+ <dimen name="text_size_caption_material">12sp</dimen>
+ <dimen name="text_size_button_material">14sp</dimen>
+
+ <dimen name="text_size_large_material">16sp</dimen>
+ <dimen name="text_size_medium_material">14sp</dimen>
+ <dimen name="text_size_small_material">12sp</dimen>
+
<item name="text_line_spacing_multiplier_material" format="float" type="dimen">1.2</item>
</resources>
diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml
index c19cc72..e8d3d74 100644
--- a/core/res/res/values-watch/styles_material.xml
+++ b/core/res/res/values-watch/styles_material.xml
@@ -53,12 +53,28 @@
<item name="wallpaperIntraCloseExitAnimation">@anim/slide_in_exit_micro</item>
</style>
+ <style name="PreferenceFragment.Material" parent="BasePreferenceFragment">
+ <item name="divider">@empty</item>
+ </style>
+
+ <style name="Preference.Material.PreferenceScreen" parent="Preference.Material.BasePreferenceScreen">
+ <item name="divider">@empty</item>
+ </style>
+
+ <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Body1" />
+ <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Caption" />
+
<style name="Widget.Material.TextView" parent="Widget.TextView">
<item name="breakStrategy">balanced</item>
</style>
+ <style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar" />
+
<!-- Alert dialog button bar button -->
<style name="Widget.Material.Button.ButtonBar.AlertDialog" parent="Widget.Material.Button.Borderless.Small">
+ <item name="paddingStart">@dimen/list_item_padding_start_material</item>
+ <item name="paddingEnd">@dimen/list_item_padding_end_material</item>
+ <item name="drawablePadding">8dp</item>
<item name="gravity">center_vertical|left</item>
<item name="minWidth">64dp</item>
<item name="minHeight">@dimen/alert_dialog_button_bar_height</item>
@@ -76,6 +92,14 @@
<item name="descendantFocusability">blocksDescendants</item>
</style>
+ <style name="DialogWindowTitle.Material">
+ <item name="maxLines">3</item>
+ <item name="scrollHorizontally">false</item>
+ <item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item>
+ <item name="gravity">@integer/config_dialogTextGravity</item>
+ <item name="ellipsize">end</item>
+ </style>
+
<!-- DO NOTE TRANSLATE Spans within this text are applied to style composing regions
within an EditText widget. The text content is ignored and not used.
Note: This is @color/material_deep_teal_200, cannot use @color references here. -->
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index fd25b74..50a5b86 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"正在优化存储空间。"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android 正在升级"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"在升级完成之前，部分应用可能无法正常运行"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"正在升级<xliff:g id="APPLICATION">%1$s</xliff:g>…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"正在优化第<xliff:g id="NUMBER_0">%1$d</xliff:g>个应用（共<xliff:g id="NUMBER_1">%2$d</xliff:g>个）。"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"正在准备升级<xliff:g id="APPNAME">%1$s</xliff:g>。"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"正在启动应用。"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"取消固定"</string>
<string name="app_info" msgid="6856026610594615344">"应用信息"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"重新启动会话"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"点按即可启动新的演示会话"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"正在启动演示模式"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"正在重新启动会话"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"要重置设备吗？"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"点按即可重置设备"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"正在启动演示模式…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"正在重置设备…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"要重置设备吗？"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"您将丢失所有更改，而且演示模式将在 <xliff:g id="TIMEOUT">%1$s</xliff:g> 秒后重新启动…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"取消"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"立即重置"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"恢复出厂设置即可正常使用此设备，不受任何限制"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"触摸即可了解详情。"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"电话会议"</string>
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index 623cca6..380be6b 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"正在優化儲存空間。"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"正在升級 Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"部分應用程式需要完成升級方可正常運作"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」正在升級…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"正在優化第 <xliff:g id="NUMBER_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="NUMBER_1">%2$d</xliff:g> 個)。"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"正在準備 <xliff:g id="APPNAME">%1$s</xliff:g>。"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"正在啟動應用程式。"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"取消固定"</string>
<string name="app_info" msgid="6856026610594615344">"應用程式資料"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"重新開始時段"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"輕按即可開始新示範時段"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"正在開始示範"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"正在重新開始示範時段"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"要重設裝置嗎？"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"輕按即可重設裝置"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"正在開始示範…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"正在重設裝置…"</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"要重設裝置嗎？"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"系統將不會儲存變更，示範將於 <xliff:g id="TIMEOUT">%1$s</xliff:g> 秒後重新開始…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"取消"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"立即重設"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"將此裝置回復至原廠設定後，使用將不受限制"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸以瞭解詳情。"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"「<xliff:g id="LABEL">%1$s</xliff:g>」已停用"</string>
+ <string name="conference_call" msgid="3751093130790472426">"會議通話"</string>
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 039d999..edb6d0b 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"正在對儲存空間進行最佳化處理。"</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"正在升級 Android"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"升級完成前，部分應用程式可能無法正常運作"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"正在升級「<xliff:g id="APPLICATION">%1$s</xliff:g>」…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"正在最佳化第 <xliff:g id="NUMBER_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="NUMBER_1">%2$d</xliff:g> 個)。"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"正在準備升級「<xliff:g id="APPNAME">%1$s</xliff:g>」。"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"正在啟動應用程式。"</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"取消固定"</string>
<string name="app_info" msgid="6856026610594615344">"應用程式資訊"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"重新啟動工作階段"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"輕觸即可啟動新的示範工作階段"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"正在啟動示範模式"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"正在重新啟動工作階段"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"要重設裝置嗎？"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"輕觸即可重設裝置"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"正在啟動示範模式..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"正在重設裝置..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"要重設裝置嗎？"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"系統不會儲存您所做的變更，示範模式將於 <xliff:g id="TIMEOUT">%1$s</xliff:g> 秒後重新開始…"</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"取消"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"立即重設"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"恢復原廠設定即可正常使用這個裝置"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸即可瞭解詳情。"</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"電話會議"</string>
</resources>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index 5f4225f..27ea7ae 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -1024,6 +1024,7 @@
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ikhulisa isitoreji."</string>
<string name="android_upgrading_notification_title" msgid="1619393112444671028">"I-Android iyathuthukiswa"</string>
<string name="android_upgrading_notification_body" msgid="5761201379457064286">"Ezinye izinhlelo zokusebenza kungenzeka zingasebenzi kahle kuze kuqedwe ukuthuthukiswa"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> iyathuthukisa…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Ukubeka ezingeni eliphezulu <xliff:g id="NUMBER_0">%1$d</xliff:g> uhlelo lokusebenza <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
<string name="android_preparing_apk" msgid="8162599310274079154">"Ukulungisela i-<xliff:g id="APPNAME">%1$s</xliff:g>."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"Qalisa izinhlelo zokusebenza."</string>
@@ -1651,11 +1652,16 @@
<string name="unpin_target" msgid="3556545602439143442">"Susa ukuphina"</string>
<string name="app_info" msgid="6856026610594615344">"Ulwazi lohlelo lokusebenza"</string>
<string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="reset_retail_demo_mode_title" msgid="2187220736280147886">"Qalisa kabusha isikhathi"</string>
- <string name="reset_retail_demo_mode_text" msgid="5687062656885515019">"Thepha ukuze uqale isikhathi esisha sedemo"</string>
- <string name="demo_starting_message" msgid="7574017688324606624">"Ukuqalisa idemo"</string>
- <string name="demo_restarting_message" msgid="1363894248779727028">"Ukuqalisa kabusha iseshini"</string>
+ <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Setha kabusha idivayisi?"</string>
+ <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Thepha ukuze usethe kabusha idivayisi"</string>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Iqalisa i-demo..."</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Isetha kabusha idivayisi..."</string>
+ <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Setha kabusha idivayisi?"</string>
+ <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Uzolahlekelwa inoma iluphi ushintsho futhi idemo izoqala futhi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$s</xliff:g>..."</string>
+ <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Khansela"</string>
+ <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Setha kabusha manje"</string>
<string name="audit_safemode_notification" msgid="6416076898350685856">"Setha kabusha ukuze usebenzise idivayisi ngaphandle kwemikhawulo"</string>
<string name="audit_safemode_notification_details" msgid="1860601176690176413">"Thinta ukuze ufunde kabanzi."</string>
<string name="suspended_widget_accessibility" msgid="6712143096475264190">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhutshaziwe"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Ikholi yengqungquthela"</string>
</resources>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index d82158f..9a7fccc 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3792,7 +3792,10 @@
<!-- An optional argument to supply a maximum height for this view.
See {see android.widget.ImageView#setMaxHeight} for details. -->
<attr name="maxHeight" format="dimension" />
- <!-- Set a tinting color for the image. By default, the tint will blend using SRC_ATOP mode. -->
+ <!-- The tinting color for the image. By default, the tint will blend using SRC_ATOP mode.
+ Please note that for compatibility reasons, this is NOT consistent with the default
+ SRC_IN tint mode used by {@link android.widget.ImageView#setImageTintList} and by
+ similar tint attributes on other views. -->
<attr name="tint" format="color" />
<!-- If true, the image view will be baseline aligned with based on its
bottom edge. -->
@@ -7900,6 +7903,13 @@
<attr name="divider" />
</declare-styleable>
+ <!-- Base attributes available to PreferenceScreen. -->
+ <declare-styleable name="PreferenceScreen">
+ <!-- The layout for the PreferenceScreen. This should rarely need to be changed. -->
+ <attr name="screenLayout" format="reference" />
+ <attr name="divider" />
+ </declare-styleable>
+
<!-- Base attributes available to PreferenceActivity. -->
<declare-styleable name="PreferenceActivity">
<!-- The layout for the Preference Activity. This should rarely need to be changed. -->
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index a6a02c5..01cb64d 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -2314,8 +2314,6 @@
then the system will set the same minimal width on all other activities in the task. It
will also ignore any other minimal width attributes of non-root activities. -->
<attr name="minWidth" />
- <!-- @removed -->
- <attr name="minimalWidth" format="dimension" />
<!-- Minimal height of the activity.
<p><strong>NOTE:</strong> A task's root activity value is applied to all additional
@@ -2323,8 +2321,6 @@
then the system will set the same minimal height on all other activities in the task. It
will also ignore any other minimal height attributes of non-root activities. -->
<attr name="minHeight" />
- <!-- @removed -->
- <attr name="minimalHeight" format="dimension" />
</declare-styleable>
<!-- <code>restrict-update</code> tag restricts system apps from being updated unless the
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index bddd225..de86cef 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -74,6 +74,8 @@
<drawable name="input_method_fullscreen_background">#fff9f9f9</drawable>
<color name="input_method_navigation_guard">#ff000000</color>
+ <color name="system_error">#fff4511e</color> <!-- deep orange 600 -->
+
<!-- For date picker widget -->
<drawable name="selected_day_background">#ff0092f4</drawable>
@@ -118,7 +120,7 @@
<!-- LockPatternView -->
<color name="lock_pattern_view_regular_color">#ffffffff</color>
<color name="lock_pattern_view_success_color">#ffffffff</color>
- <color name="lock_pattern_view_error_color">#fff4511e</color>
+ <color name="lock_pattern_view_error_color">@color/system_error</color>
<!-- FaceLock -->
<color name="facelock_spotlight_mask">#CC000000</color>
@@ -138,6 +140,7 @@
<color name="notification_progress_background_color">@color/secondary_text_material_light</color>
<color name="notification_action_list">#ffeeeeee</color>
+ <color name="notification_action_list_dark">#ffe0e0e0</color>
<!-- Keyguard colors -->
<color name="keyguard_avatar_frame_color">#ffffffff</color>
@@ -151,7 +154,7 @@
<color name="battery_saver_mode_color">#fff4511e</color><!-- deep orange 600 -->
<!-- Default user icon colors -->
- <color name="user_icon_1">#ff00bcd4</color><!-- teal 500 -->
+ <color name="user_icon_1">#ff00bcd4</color><!-- cyan 500 -->
<color name="user_icon_2">#ff3f51b5</color><!-- indigo 500 -->
<color name="user_icon_3">#ff4285f4</color><!-- blue 500 -->
<color name="user_icon_4">#ffe91e63</color><!-- pink 500 -->
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index 5518de2..27ee27b 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -26,7 +26,10 @@
<color name="secondary_device_default_settings">@color/secondary_material_settings</color>
<color name="tertiary_device_default_settings">@color/tertiary_material_settings</color>
+ <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color>
+ <color name="accent_device_default_700">@color/material_deep_teal_700</color>
<color name="accent_device_default_light">@color/accent_material_light</color>
<color name="accent_device_default_dark">@color/accent_material_dark</color>
-</resources>
\ No newline at end of file
+ <color name="accent_device_default_50">@color/material_deep_teal_50</color>
+</resources>
diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml
index 2ac4092a5..a864cf3 100644
--- a/core/res/res/values/colors_material.xml
+++ b/core/res/res/values/colors_material.xml
@@ -34,6 +34,7 @@
<color name="secondary_material_settings">@color/material_blue_grey_800</color>
<color name="tertiary_material_settings">@color/material_blue_grey_700</color>
+ <color name="quaternary_material_settings">@color/material_blue_grey_200</color>
<color name="accent_material_light">@color/material_deep_teal_500</color>
<color name="accent_material_dark">@color/material_deep_teal_200</color>
@@ -80,11 +81,14 @@
<color name="material_grey_100">#fff5f5f5</color>
<color name="material_grey_50">#fffafafa</color>
+ <color name="material_deep_teal_50">#ffe0f2f1</color>
<color name="material_deep_teal_100">#ffb2dfdb</color>
<color name="material_deep_teal_200">#ff80cbc4</color>
<color name="material_deep_teal_300">#ff4db6ac</color>
<color name="material_deep_teal_500">#ff009688</color>
+ <color name="material_deep_teal_700">#ff00796b</color>
+ <color name="material_blue_grey_200">#ffb0bec5</color>
<color name="material_blue_grey_700">#ff455a64</color>
<color name="material_blue_grey_800">#ff37474f</color>
<color name="material_blue_grey_900">#ff263238</color>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5a794a2..61b4c8d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -754,6 +754,26 @@
-->
<integer name="config_defaultNightMode">1</integer>
+ <!-- Control whether Night display is available. This should only be enabled on devices
+ with HWC 2.0 or higher. -->
+ <bool name="config_nightDisplayAvailable">false</bool>
+
+ <!-- Default mode to control how Night display is automatically activated.
+ One of the following values (see NightDisplayController.java):
+ 0 - AUTO_MODE_DISABLED
+ 1 - AUTO_MODE_CUSTOM
+ 2 - AUTO_MODE_TWILIGHT
+ -->
+ <integer name="config_defaultNightDisplayAutoMode">0</integer>
+
+ <!-- Default time when Night display is automatically activated.
+ Represented as milliseconds from midnight (e.g. 79200000 == 10pm). -->
+ <integer name="config_defaultNightDisplayCustomStartTime">79200000</integer>
+
+ <!-- Default time when Night display is automatically deactivated.
+ Represented as milliseconds from midnight (e.g. 21600000 == 6am). -->
+ <integer name="config_defaultNightDisplayCustomEndTime">21600000</integer>
+
<!-- Indicate whether to allow the device to suspend when the screen is off
due to the proximity sensor. This resource should only be set to true
if the sensor HAL correctly handles the proximity sensor as a wake-up source.
@@ -1816,28 +1836,6 @@
-->
<bool name="config_enableWifiDisplay">false</bool>
- <!-- The color transform values that correspond to each respective configuration mode for the
- built-in display, or -1 if the mode is unsupported by the device. The possible
- configuration modes are:
- 1. Wide-gamut ("Vibrant")
- 2. Adobe RGB ("Natural")
- 3. sRGB ("Standard")
-
- For example, if a device had Wide-gamut as color transform mode 1, sRGB mode as color
- transform mode 7, and did not support Adobe RGB at all this would look like:
-
- <integer-array name="config_colorTransforms">
- <item>1</item>
- <item>-1</item>
- <item>7</item>
- </integer-array>
- -->
- <integer-array name="config_colorTransforms">
- <item>-1</item>
- <item>-1</item>
- <item>-1</item>
- </integer-array>
-
<!-- When true, local displays that do not contain any of their own content will automatically
mirror the content of the default display. -->
<bool name="config_localDisplaysMirrorContent">true</bool>
@@ -2504,6 +2502,9 @@
<string-array translatable="false" name="config_defaultPinnerServiceFiles">
</string-array>
+ <!-- True if camera app should be pinned via Pinner Service -->
+ <bool name="config_pinnerCameraApp">false</bool>
+
<!-- Component that is the default launcher when demo mode is enabled. -->
<string name="config_demoModeLauncherComponent">com.android.retaildemo/.DemoPlayer</string>
@@ -2513,4 +2514,22 @@
<!-- True if the device supports system navigation keys. -->
<bool name="config_supportSystemNavigationKeys">false</bool>
+ <!-- Package name for the device provisioning package. -->
+ <string name="config_deviceProvisioningPackage"></string>
+
+ <!-- Colon separated list of package names that should be granted DND access -->
+ <string name="config_defaultDndAccessPackages" translatable="false">com.android.camera2</string>
+
+ <!-- User restrictions set when the first user is created.
+ Note: Also update appropriate overlay files. -->
+ <string-array translatable="false" name="config_defaultFirstUserRestrictions">
+ </string-array>
+
+ <!-- Specifies whether the permissions needed by a legacy app should be
+ reviewed before any of its components can run. A legacy app is one
+ with targetSdkVersion < 23, i.e apps using the old permission model.
+ If review is not required, permissions are reviewed before the app
+ is installed. -->
+ <bool name="config_permissionReviewRequired">false</bool>
+
</resources>
diff --git a/core/res/res/values/config_material.xml b/core/res/res/values/config_material.xml
index a37be83..397635f 100644
--- a/core/res/res/values/config_material.xml
+++ b/core/res/res/values/config_material.xml
@@ -32,9 +32,6 @@
<!-- True if windowOverscan should be on by default. -->
<bool name="config_windowOverscanByDefault">false</bool>
- <!-- Max number of lines for the dialog title. -->
- <integer name="config_dialogWindowTitleMaxLines">1</integer>
-
<!-- True if preference fragment should clip to padding. -->
<bool name="config_preferenceFragmentClipToPadding">true</bool>
</resources>
diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml
index 8f8d59e..71ac2f4 100644
--- a/core/res/res/values/integers.xml
+++ b/core/res/res/values/integers.xml
@@ -26,4 +26,5 @@
<integer name="date_picker_mode">1</integer>
<integer name="time_picker_mode">1</integer>
+ <integer name="date_picker_header_max_lines_material">2</integer>
</resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 9ccd39f..a37db7e 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2732,15 +2732,35 @@
Resources added in version N MR1 of the platform
=============================================================== -->
<eat-comment />
- <public type="attr" name="shortcutId" />
- <public type="attr" name="shortcutShortLabel" />
- <public type="attr" name="shortcutLongLabel" />
- <public type="attr" name="shortcutDisabledMessage" />
- <public type="attr" name="roundIcon" />
+ <public type="attr" name="shortcutId" id="0x01010528" />
+ <public type="attr" name="shortcutShortLabel" id="0x01010529" />
+ <public type="attr" name="shortcutLongLabel" id="0x0101052a" />
+ <public type="attr" name="shortcutDisabledMessage" id="0x0101052b" />
+ <public type="attr" name="roundIcon" id="0x0101052c" />
+ <public type="attr" name="contextUri" id="0x0101052d" />
+ <public type="attr" name="contextDescription" id="0x0101052e" />
+ <public type="attr" name="showMetadataInPreview" id="0x0101052f" />
+ <public type="attr" name="colorSecondary" id="0x01010530" />
- <public type="attr" name="contextUri" />
- <public type="attr" name="contextDescription" />
- <public type="attr" name="showMetadataInPreview" />
- <public type="attr" name="colorSecondary" />
+ <!-- ===============================================================
+ Resources added in version O of the platform
+
+ NOTE: add <public> elements within a <public-group> like so:
+
+ <public-group type="attr" first-id="0x01010531">
+ <public name="exampleAttr1" />
+ <public name="exampleAttr2" />
+ </public-group>
+ =============================================================== -->
+ <eat-comment />
+
+ <public-group type="attr" first-id="0x01010531">
+ </public-group>
+
+ <public-group type="style" first-id="0x010302e0">
+ </public-group>
+
+ <public-group type="id" first-id="0x01020041">
+ </public-group>
</resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 54d6f9a..77de0af 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1758,6 +1758,10 @@
<string name="lockscreen_pattern_wrong">Try again</string>
<!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
<string name="lockscreen_password_wrong">Try again</string>
+
+ <!-- On the keyguard screen, this string explains that some features or data may not be available until the device is unlocked. [CHAR LIMIT=48] -->
+ <string name="lockscreen_storage_locked">Unlock for all features and data</string>
+
<!-- Shown when face unlock failed multiple times so we're just using the backup -->
<string name="faceunlock_multiple_failures">Maximum Face Unlock attempts exceeded</string>
@@ -2791,11 +2795,14 @@
<!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
<string name="android_upgrading_fstrim">Optimizing storage.</string>
- <!-- [CHAR LIMIT=40] Title of notification that is shown when performing a system upgrade. -->
- <string name="android_upgrading_notification_title">Android is upgrading</string>
+ <!-- [CHAR LIMIT=40] Title of notification that is shown when finishing a system upgrade. -->
+ <string name="android_upgrading_notification_title">Finishing Android update\u2026</string>
<!-- [CHAR LIMIT=200] Body of notification that is shown when performing a system upgrade. -->
<string name="android_upgrading_notification_body">Some apps may not work properly until the upgrade finishes</string>
+ <!-- [CHAR LIMIT=40] Toast that is shown when an app is still upgrading. -->
+ <string name="app_upgrading_toast"><xliff:g id="application">%1$s</xliff:g> is upgrading\u2026</string>
+
<!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
<string name="android_upgrading_apk">Optimizing app
<xliff:g id="number" example="123">%1$d</xliff:g> of
@@ -4160,7 +4167,7 @@
<!-- [CHAR_LIMIT=NONE] Data saver: Feature description -->
<string name="data_saver_description">To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them.</string>
- <!-- [CHAR_LIMIT=30] Data saver: Title on first-time dialogFeature description -->
+ <!-- [CHAR_LIMIT=35] Data saver: Title on first-time dialog -->
<string name="data_saver_enable_title">Turn on Data Saver?</string>
<!-- [CHAR_LIMIT=16] Data saver: Button to turn it on on first-time dialog -->
<string name="data_saver_enable_button">Turn on</string>
@@ -4384,7 +4391,7 @@
<!-- Title of the dialog shown when user inactivity times out in retail demo mode [CHAR LIMIT=40] -->
<string name="demo_user_inactivity_timeout_title">Reset device?</string>
<!-- Warning message shown when user inactivity times out in retail demo mode [CHAR LIMIT=none] -->
- <string name="demo_user_inactivity_timeout_countdown">You\'ll lose any changes and the demo will start again in <xliff:g id="timeout" example="9">%1$s</xliff:g> seconds\u2026</string>
+ <string name="demo_user_inactivity_timeout_countdown">You\u2019ll lose any changes and the demo will start again in <xliff:g id="timeout" example="9">%1$s</xliff:g> seconds\u2026</string>
<!-- Text of button to allow user to abort countdown and continue current session in retail demo mode [CHAR LIMIT=40] -->
<string name="demo_user_inactivity_timeout_left_button">Cancel</string>
<!-- Text of button to allow user to abort countdown and immediately start another session in retail demo mode [CHAR LIMIT=40] -->
@@ -4398,4 +4405,6 @@
<!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->
<string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>
+ <!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] -->
+ <string name="conference_call">Conference Call</string>
</resources>
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 6e0ad36..c66bc10 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -36,7 +36,7 @@
<item name="layout">@layout/preference_material</item>
</style>
- <style name="PreferenceFragment.Material">
+ <style name="BasePreferenceFragment">
<item name="layout">@layout/preference_list_fragment_material</item>
<item name="paddingStart">@dimen/preference_fragment_padding_side_material</item>
<item name="paddingEnd">@dimen/preference_fragment_padding_side_material</item>
@@ -46,6 +46,8 @@
<item name="clipToPadding">@bool/config_preferenceFragmentClipToPadding</item>
</style>
+ <style name="PreferenceFragment.Material" parent="BasePreferenceFragment"/>
+
<style name="PreferenceActivity.Material">
<item name="layout">@layout/preference_list_content_material</item>
<item name="headerLayout">@layout/preference_header_item_material</item>
@@ -79,7 +81,12 @@
<item name="layout">@layout/preference_widget_seekbar_material</item>
</style>
- <style name="Preference.Material.PreferenceScreen"/>
+ <style name="Preference.Material.BasePreferenceScreen">
+ <item name="screenLayout">@layout/preference_list_fragment_material</item>
+ <item name="divider">?attr/listDivider</item>
+ </style>
+
+ <style name="Preference.Material.PreferenceScreen" parent="Preference.Material.BasePreferenceScreen"/>
<style name="Preference.Material.DialogPreference">
<item name="positiveButtonText">@string/ok</item>
@@ -468,6 +475,9 @@
<item name="textColor">#66000000</item>
</style>
+ <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Subhead" />
+ <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Body1" />
+
<style name="Widget.Material.Notification.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" />
<style name="Widget.Material.Notification.MessagingText" parent="Widget.Material.Light.TextView">
@@ -541,7 +551,11 @@
<item name="textOff">@string/capital_off</item>
</style>
- <style name="Widget.Material.ButtonBar">
+ <style name="Widget.Material.BaseButtonBar">
+ <item name="background">?attr/colorBackgroundFloating</item>
+ </style>
+
+ <style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar">
<item name="background">@null</item>
</style>
@@ -1202,7 +1216,11 @@
<style name="AlertDialog.Material.Light" />
<style name="DatePickerDialog.Material" parent="AlertDialog.Material">
- <item name="showTitle">true</item>
+ <item name="showTitle">false</item>
+ </style>
+
+ <style name="TimePickerDialog.Material" parent="AlertDialog.Material">
+ <item name="showTitle">false</item>
</style>
<!-- Window title -->
@@ -1231,7 +1249,7 @@
<style name="DialogWindowTitleBackground.Material.Light" />
<style name="DialogWindowTitle.Material">
- <item name="maxLines">@integer/config_dialogWindowTitleMaxLines</item>
+ <item name="maxLines">1</item>
<item name="scrollHorizontally">true</item>
<item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item>
</style>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 503fbb1..54cb9ce 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1109,6 +1109,7 @@
<java-symbol type="string" name="config_demoModeLauncherComponent" />
<java-symbol type="string" name="demo_starting_message" />
<java-symbol type="string" name="demo_restarting_message" />
+ <java-symbol type="string" name="conference_call" />
<java-symbol type="plurals" name="bugreport_countdown" />
@@ -1143,7 +1144,6 @@
<java-symbol type="array" name="config_telephonyHardware" />
<java-symbol type="array" name="config_keySystemUuidMapping" />
<java-symbol type="array" name="config_gpsParameters" />
- <java-symbol type="array" name="config_colorTransforms" />
<java-symbol type="drawable" name="default_wallpaper" />
<java-symbol type="drawable" name="default_lock_wallpaper" />
@@ -2560,6 +2560,7 @@
<java-symbol type="color" name="notification_action_list" />
<java-symbol type="color" name="notification_material_background_color" />
+ <java-symbol type="color" name="notification_action_list_dark" />
<!-- Resolver target actions -->
<java-symbol type="array" name="resolver_target_actions_pin" />
@@ -2620,6 +2621,7 @@
<!-- Pinner Service -->
<java-symbol type="array" name="config_defaultPinnerServiceFiles" />
+ <java-symbol type="bool" name="config_pinnerCameraApp" />
<java-symbol type="string" name="config_doubleTouchGestureEnableFile" />
@@ -2628,6 +2630,8 @@
<!-- Used internally for assistant to launch activity transitions -->
<java-symbol type="id" name="cross_task_transition" />
+ <java-symbol type="id" name="button_holder" />
+
<java-symbol type="bool" name="config_useRoundIcon" />
<!-- For System navigation keys -->
@@ -2635,4 +2639,50 @@
<java-symbol type="layout" name="unsupported_display_size_dialog_content" />
<java-symbol type="string" name="unsupported_display_size_message" />
+
+ <java-symbol type="layout" name="notification_material_action_emphasized" />
+
+ <!-- Package name for the device provisioning package -->
+ <java-symbol type="string" name="config_deviceProvisioningPackage" />
+
+ <!-- Colon separated list of package names that should be granted DND access -->
+ <java-symbol type="string" name="config_defaultDndAccessPackages" />
+
+ <java-symbol type="string" name="lockscreen_storage_locked" />
+
+ <!-- Used for MimeIconUtils. -->
+ <java-symbol type="drawable" name="ic_doc_apk" />
+ <java-symbol type="drawable" name="ic_doc_audio" />
+ <java-symbol type="drawable" name="ic_doc_certificate" />
+ <java-symbol type="drawable" name="ic_doc_codes" />
+ <java-symbol type="drawable" name="ic_doc_compressed" />
+ <java-symbol type="drawable" name="ic_doc_contact" />
+ <java-symbol type="drawable" name="ic_doc_event" />
+ <java-symbol type="drawable" name="ic_doc_font" />
+ <java-symbol type="drawable" name="ic_doc_image" />
+ <java-symbol type="drawable" name="ic_doc_pdf" />
+ <java-symbol type="drawable" name="ic_doc_presentation" />
+ <java-symbol type="drawable" name="ic_doc_spreadsheet" />
+ <java-symbol type="drawable" name="ic_doc_document" />
+ <java-symbol type="drawable" name="ic_doc_video" />
+ <java-symbol type="drawable" name="ic_doc_word" />
+ <java-symbol type="drawable" name="ic_doc_excel" />
+ <java-symbol type="drawable" name="ic_doc_powerpoint" />
+ <java-symbol type="drawable" name="ic_doc_folder" />
+ <java-symbol type="drawable" name="ic_doc_audio" />
+ <java-symbol type="drawable" name="ic_doc_image" />
+ <java-symbol type="drawable" name="ic_doc_text" />
+ <java-symbol type="drawable" name="ic_doc_video" />
+ <java-symbol type="drawable" name="ic_doc_generic" />
+
+ <java-symbol type="bool" name="config_nightDisplayAvailable" />
+ <java-symbol type="integer" name="config_defaultNightDisplayAutoMode" />
+ <java-symbol type="integer" name="config_defaultNightDisplayCustomStartTime" />
+ <java-symbol type="integer" name="config_defaultNightDisplayCustomEndTime" />
+
+ <!-- Default first user restrictions -->
+ <java-symbol type="array" name="config_defaultFirstUserRestrictions" />
+
+ <java-symbol type="bool" name="config_permissionReviewRequired" />
+
</resources>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 92f049d..5b2522f 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -318,6 +318,7 @@
<item name="activityChooserViewStyle">@style/Widget.ActivityChooserView</item>
<item name="mediaRouteButtonStyle">@style/Widget.DeviceDefault.MediaRouteButton</item>
<item name="fragmentBreadCrumbsStyle">@style/Widget.FragmentBreadCrumbs</item>
+ <item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>
<!-- Preference styles -->
<item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item>
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index dd0dac6..0e98ade 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -724,6 +724,12 @@
<item name="colorAccent">@color/accent_device_default_light</item>
</style>
+ <style name="Theme.DeviceDefault.Light.Voice" parent="Theme.Material.Light.Voice">
+ <!-- Color palette -->
+ <item name="colorPrimary">@color/primary_device_default_light</item>
+ <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
+ <item name="colorAccent">@color/accent_device_default_light</item>
+ </style>
<!-- DeviceDefault theme for a window that should look like the Settings app. -->
<style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">
@@ -745,6 +751,15 @@
<item name="colorAccent">@color/accent_device_default_dark</item>
</style>
+ <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+ <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="Theme.Material.NoActionBar">
+ <!-- Color palette -->
+ <item name="colorPrimary">@color/primary_device_default_settings</item>
+ <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
+ <item name="colorSecondary">@color/secondary_device_default_settings</item>
+ <item name="colorAccent">@color/accent_device_default_dark</item>
+ </style>
+
<style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.Material.Settings.Dialog">
<!-- Color palette -->
<item name="colorPrimary">@color/primary_device_default_settings</item>
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 35ce9b0..0eb4c8d 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -114,9 +114,9 @@
<item name="listPreferredItemHeightSmall">48dip</item>
<item name="listPreferredItemHeightLarge">80dip</item>
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
- <item name="textAppearanceListItem">@style/TextAppearance.Material.Subhead</item>
- <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.Subhead</item>
- <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item>
+ <item name="textAppearanceListItem">@style/TextAppearance.Material.ListItem</item>
+ <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.ListItem</item>
+ <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.ListItemSecondary</item>
<item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingStart">@dimen/list_item_padding_start_material</item>
@@ -370,7 +370,7 @@
<item name="timePickerStyle">@style/Widget.Material.TimePicker</item>
<!-- TimePicker dialog theme -->
- <item name="timePickerDialogTheme">?attr/dialogTheme</item>
+ <item name="timePickerDialogTheme">@style/ThemeOverlay.Material.Dialog.TimePicker</item>
<!-- DatePicker style -->
<item name="datePickerStyle">@style/Widget.Material.DatePicker</item>
@@ -475,9 +475,9 @@
<item name="listPreferredItemHeightSmall">48dip</item>
<item name="listPreferredItemHeightLarge">80dip</item>
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
- <item name="textAppearanceListItem">@style/TextAppearance.Material.Subhead</item>
- <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.Subhead</item>
- <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item>
+ <item name="textAppearanceListItem">@style/TextAppearance.Material.ListItem</item>
+ <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.ListItem</item>
+ <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.ListItemSecondary</item>
<item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingStart">@dimen/list_item_padding_start_material</item>
@@ -733,7 +733,7 @@
<item name="timePickerStyle">@style/Widget.Material.Light.TimePicker</item>
<!-- TimePicker dialog theme -->
- <item name="timePickerDialogTheme">?attr/dialogTheme</item>
+ <item name="timePickerDialogTheme">@style/ThemeOverlay.Material.Dialog.TimePicker</item>
<!-- DatePicker style -->
<item name="datePickerStyle">@style/Widget.Material.Light.DatePicker</item>
@@ -900,6 +900,11 @@
<item name="colorBackground">?attr/colorBackgroundFloating</item>
</style>
+ <!-- Theme overlay that overrides window properties to display as a time picker dialog. -->
+ <style name="ThemeOverlay.Material.Dialog.TimePicker">
+ <item name="alertDialogStyle">@style/TimePickerDialog.Material</item>
+ </style>
+
<!-- Theme overlay that overrides window properties to display as a date picker dialog. -->
<style name="ThemeOverlay.Material.Dialog.DatePicker">
<item name="alertDialogStyle">@style/DatePickerDialog.Material</item>
diff --git a/core/res/res/xml-watch/default_zen_mode_config.xml b/core/res/res/xml-watch/default_zen_mode_config.xml
index 26af10c..938cc0c 100644
--- a/core/res/res/xml-watch/default_zen_mode_config.xml
+++ b/core/res/res/xml-watch/default_zen_mode_config.xml
@@ -17,8 +17,8 @@
<!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. -->
<zen version="2">
- <!-- Allow starred contacts to go through only. Repeated calls on.
- Calls, messages, reminders, events off.-->
- <allow from="2" repeatCallers="true" calls="false" messages="false" reminders="false"
+ <!-- Allow starred contacts to go through only.
+ Repeated calls, calls, messages, reminders, events off. -->
+ <allow from="2" repeatCallers="false" calls="false" messages="false" reminders="false"
events="false"/>
</zen>
diff --git a/core/res/res/xml/power_profile.xml b/core/res/res/xml/power_profile.xml
index 2e593a3..6e31cd2 100644
--- a/core/res/res/xml/power_profile.xml
+++ b/core/res/res/xml/power_profile.xml
@@ -91,6 +91,12 @@
<!-- Current when CPU is idle -->
<item name="cpu.idle">0.1</item>
+ <!-- Memory bandwidth power values in mA at the rail. There must be one value
+ for each bucket defined in the device tree. -->
+ <array name="memory.bandwidths">
+ <value>22.7</value> <!-- mA for bucket: 100mb/s-1.5 GB/s memory bandwidth -->
+ </array>
+
<!-- This is the battery capacity in mAh (measured at nominal voltage) -->
<item name="battery.capacity">1000</item>
diff --git a/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java b/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java
new file mode 100644
index 0000000..19a390a
--- /dev/null
+++ b/core/tests/coretests/src/android/app/ApplicationErrorReportTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package android.app;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import android.app.ApplicationErrorReport.CrashInfo;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ApplicationErrorReportTest {
+
+ @Test
+ public void testHugeStacktraceLeadsToReasonableReport() {
+ Throwable deepStackTrace = deepStackTrace();
+ CrashInfo crashInfo = new CrashInfo(deepStackTrace);
+
+ assertTrue("stack trace is longer than 50'000 characters",
+ crashInfo.stackTrace.length() < 50000);
+ }
+
+ @Test
+ public void testHugeExceptionMessageLeadsToReasonableReport() {
+ StringBuilder msg = new StringBuilder();
+ for (int i = 0; i < 1000000; i++) {
+ msg.append('x');
+ }
+
+ CrashInfo crashInfo = new CrashInfo(new Throwable(msg.toString()));
+
+ assertTrue("message is longer than 50'000 characters",
+ crashInfo.exceptionMessage.length() < 50000);
+ }
+
+ @Test
+ public void testTruncationKeepsStartAndEndIntact() {
+ StringBuilder msg = new StringBuilder("start");
+ for (int i = 0; i < 1000000; i++) {
+ msg.append('x');
+ }
+ msg.append("end");
+
+ CrashInfo crashInfo = new CrashInfo(new Throwable(msg.toString()));
+
+ String exceptionMessage = crashInfo.exceptionMessage;
+ assertEquals("start", exceptionMessage.substring(0, "start".length()));
+ assertEquals("end", exceptionMessage.substring(exceptionMessage.length() - "end".length()));
+ }
+
+ /**
+ * @return a Throwable with a very long stack trace.
+ */
+ private Throwable deepStackTrace() {
+ return stackTraceGenerator__aaaaaaaaa_aaaaaaaaa_aaaaaaaaa_aaaaaaaaa_aaaaaaaaa(1000);
+ }
+
+ private Throwable stackTraceGenerator__aaaaaaaaa_aaaaaaaaa_aaaaaaaaa_aaaaaaaaa_aaaaaaaaa(
+ int d) {
+ if (d > 0) {
+ return stackTraceGenerator__aaaaaaaaa_aaaaaaaaa_aaaaaaaaa_aaaaaaaaa_aaaaaaaaa(d - 1);
+ } else {
+ return new Throwable("here");
+ }
+ }
+}
diff --git a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java
index f088197..4e70bb1 100644
--- a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java
+++ b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java
@@ -147,6 +147,7 @@
mResourcesManager.applyConfigurationToResourcesLocked(newConfig, null);
final Configuration expectedConfig = new Configuration();
+ expectedConfig.setToDefaults();
expectedConfig.setLocales(LocaleList.getAdjustedDefault());
expectedConfig.densityDpi = mDisplayMetrics.densityDpi;
expectedConfig.orientation = Configuration.ORIENTATION_LANDSCAPE;
@@ -229,6 +230,7 @@
assertNotSame(resources1.getImpl(), resources2.getImpl());
final Configuration expectedConfig1 = new Configuration();
+ expectedConfig1.setToDefaults();
expectedConfig1.setLocales(LocaleList.getAdjustedDefault());
expectedConfig1.densityDpi = 280;
assertEquals(expectedConfig1, resources1.getConfiguration());
@@ -236,6 +238,7 @@
// resources2 should be based on the Activity's override config, so the density should
// be the same as resources1.
final Configuration expectedConfig2 = new Configuration();
+ expectedConfig2.setToDefaults();
expectedConfig2.setLocales(LocaleList.getAdjustedDefault());
expectedConfig2.densityDpi = 280;
expectedConfig2.screenLayout |= Configuration.SCREENLAYOUT_ROUND_YES;
diff --git a/core/tests/coretests/src/android/graphics/TypefaceTest.java b/core/tests/coretests/src/android/graphics/TypefaceTest.java
new file mode 100644
index 0000000..c8ce884
--- /dev/null
+++ b/core/tests/coretests/src/android/graphics/TypefaceTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.graphics;
+
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import junit.framework.TestCase;
+
+
+public class TypefaceTest extends TestCase {
+
+ // create array of all std faces
+ private final Typeface[] mFaces = new Typeface[] {
+ Typeface.create(Typeface.SANS_SERIF, 0),
+ Typeface.create(Typeface.SANS_SERIF, 1),
+ Typeface.create(Typeface.SERIF, 0),
+ Typeface.create(Typeface.SERIF, 1),
+ Typeface.create(Typeface.SERIF, 2),
+ Typeface.create(Typeface.SERIF, 3),
+ Typeface.create(Typeface.MONOSPACE, 0)
+ };
+
+ @SmallTest
+ public void testBasic() throws Exception {
+ assertTrue("basic", Typeface.DEFAULT != null);
+ assertTrue("basic", Typeface.DEFAULT_BOLD != null);
+ assertTrue("basic", Typeface.SANS_SERIF != null);
+ assertTrue("basic", Typeface.SERIF != null);
+ assertTrue("basic", Typeface.MONOSPACE != null);
+ }
+
+ @SmallTest
+ public void testUnique() throws Exception {
+ final int n = mFaces.length;
+ for (int i = 0; i < n; i++) {
+ for (int j = i + 1; j < n; j++) {
+ assertTrue("unique", mFaces[i] != mFaces[j]);
+ }
+ }
+ }
+
+ @SmallTest
+ public void testStyles() throws Exception {
+ assertTrue("style", mFaces[0].getStyle() == Typeface.NORMAL);
+ assertTrue("style", mFaces[1].getStyle() == Typeface.BOLD);
+ assertTrue("style", mFaces[2].getStyle() == Typeface.NORMAL);
+ assertTrue("style", mFaces[3].getStyle() == Typeface.BOLD);
+ assertTrue("style", mFaces[4].getStyle() == Typeface.ITALIC);
+ assertTrue("style", mFaces[5].getStyle() == Typeface.BOLD_ITALIC);
+ assertTrue("style", mFaces[6].getStyle() == Typeface.NORMAL);
+ }
+
+ @MediumTest
+ public void testUniformY() throws Exception {
+ Paint p = new Paint();
+ final int n = mFaces.length;
+ for (int i = 1; i <= 36; i++) {
+ p.setTextSize(i);
+ float ascent = 0;
+ float descent = 0;
+ for (int j = 0; j < n; j++) {
+ p.setTypeface(mFaces[j]);
+ Paint.FontMetrics fm = p.getFontMetrics();
+ if (j == 0) {
+ ascent = fm.ascent;
+ descent = fm.descent;
+ } else {
+ assertTrue("fontMetrics", fm.ascent == ascent);
+ assertTrue("fontMetrics", fm.descent == descent);
+ }
+ }
+ }
+ }
+
+}
diff --git a/core/tests/coretests/src/android/net/UriMatcherTest.java b/core/tests/coretests/src/android/net/UriMatcherTest.java
index a728d4f..dd46fa3 100644
--- a/core/tests/coretests/src/android/net/UriMatcherTest.java
+++ b/core/tests/coretests/src/android/net/UriMatcherTest.java
@@ -82,9 +82,31 @@
checkAll(matcher);
}
+ @SmallTest
+ public void testContentUrisWithLeadingSlashAndOnlySlash() {
+ UriMatcher matcher = new UriMatcher(ROOT);
+ matcher.addURI("people", "/", PEOPLE);
+ matcher.addURI("people", "/#", PEOPLE_ID);
+ matcher.addURI("people", "/#/phones", PEOPLE_PHONES);
+ matcher.addURI("people", "/#/phones/blah", PEOPLE_PHONES_ID);
+ matcher.addURI("people", "/#/phones/#", PEOPLE_PHONES_ID);
+ matcher.addURI("people", "/#/addresses", PEOPLE_ADDRESSES);
+ matcher.addURI("people", "/#/addresses/#", PEOPLE_ADDRESSES_ID);
+ matcher.addURI("people", "/#/contact-methods", PEOPLE_CONTACTMETH);
+ matcher.addURI("people", "/#/contact-methods/#", PEOPLE_CONTACTMETH_ID);
+ matcher.addURI("calls", "/", CALLS);
+ matcher.addURI("calls", "/#", CALLS_ID);
+ matcher.addURI("caller-id", "/", CALLERID);
+ matcher.addURI("caller-id", "/*", CALLERID_TEXT);
+ matcher.addURI("filter-recent", null, FILTERRECENT);
+ matcher.addURI("auth", "/another/path/segment", ANOTHER_PATH_SEGMENT);
+ checkAll(matcher);
+ }
+
private void checkAll(UriMatcher matcher) {
check("content://asdf", UriMatcher.NO_MATCH, matcher);
check("content://people", PEOPLE, matcher);
+ check("content://people/", PEOPLE, matcher);
check("content://people/1", PEOPLE_ID, matcher);
check("content://people/asdf", UriMatcher.NO_MATCH, matcher);
check("content://people/2/phones", PEOPLE_PHONES, matcher);
@@ -97,9 +119,11 @@
check("content://people/2/contact-methods/3", PEOPLE_CONTACTMETH_ID, matcher);
check("content://people/2/contact-methods/asdf", UriMatcher.NO_MATCH, matcher);
check("content://calls", CALLS, matcher);
+ check("content://calls/", CALLS, matcher);
check("content://calls/1", CALLS_ID, matcher);
check("content://calls/asdf", UriMatcher.NO_MATCH, matcher);
check("content://caller-id", CALLERID, matcher);
+ check("content://caller-id/", CALLERID, matcher);
check("content://caller-id/asdf", CALLERID_TEXT, matcher);
check("content://caller-id/1", CALLERID_TEXT, matcher);
check("content://filter-recent", FILTERRECENT, matcher);
diff --git a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java
index 2e42e5a..5ed6ce5 100644
--- a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java
+++ b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java
@@ -16,18 +16,15 @@
package android.text;
-import static android.text.Layout.Alignment.*;
-
-import android.text.DynamicLayout;
-
import junit.framework.TestCase;
+import static android.text.Layout.Alignment.ALIGN_NORMAL;
+
/**
* Tests DynamciLayout updateBlocks method.
*
* Requires disabling access checks in the vm since this calls package-private APIs.
*
- * @Suppress
*/
public class DynamicLayoutBlocksTest extends TestCase {
private DynamicLayout dl = new DynamicLayout("", new TextPaint(), 0, ALIGN_NORMAL, 0, 0, false);
diff --git a/core/tests/coretests/src/android/text/PackedIntVectorTest.java b/core/tests/coretests/src/android/text/PackedIntVectorTest.java
index 1dc683e..1aab8af 100644
--- a/core/tests/coretests/src/android/text/PackedIntVectorTest.java
+++ b/core/tests/coretests/src/android/text/PackedIntVectorTest.java
@@ -16,13 +16,16 @@
package android.text;
+import android.support.test.filters.SmallTest;
+
import junit.framework.TestCase;
/**
* PackedIntVectorTest tests the features of android.util.PackedIntVector.
*/
public class PackedIntVectorTest extends TestCase {
-
+
+ @SmallTest
public void testBasic() throws Exception {
for (int width = 0; width < 10; width++) {
PackedIntVector p = new PackedIntVector(width);
diff --git a/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java b/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
index da920c9..1f1a689 100644
--- a/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
+++ b/core/tests/coretests/src/android/text/SpannableStringBuilderTest.java
@@ -16,9 +16,6 @@
package android.text;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-
public class SpannableStringBuilderTest extends SpannableTest {
protected Spannable newSpannableWithText(String text) {
diff --git a/core/tests/coretests/src/android/text/SpannableStringTest.java b/core/tests/coretests/src/android/text/SpannableStringTest.java
index 8dd1214..3106438 100644
--- a/core/tests/coretests/src/android/text/SpannableStringTest.java
+++ b/core/tests/coretests/src/android/text/SpannableStringTest.java
@@ -16,9 +16,6 @@
package android.text;
-import android.text.Spannable;
-import android.text.SpannableString;
-
public class SpannableStringTest extends SpannableTest {
protected Spannable newSpannableWithText(String text) {
diff --git a/core/tests/coretests/src/android/text/SpannableTest.java b/core/tests/coretests/src/android/text/SpannableTest.java
index 46be99d..d6f0244 100644
--- a/core/tests/coretests/src/android/text/SpannableTest.java
+++ b/core/tests/coretests/src/android/text/SpannableTest.java
@@ -19,7 +19,6 @@
import android.test.InstrumentationTestCase;
import android.test.MoreAsserts;
import android.test.suitebuilder.annotation.MediumTest;
-import android.text.Spannable;
public abstract class SpannableTest extends InstrumentationTestCase {
diff --git a/core/tests/coretests/src/android/text/SpannedTest.java b/core/tests/coretests/src/android/text/SpannedTest.java
index 1c22cf9..911da4b 100644
--- a/core/tests/coretests/src/android/text/SpannedTest.java
+++ b/core/tests/coretests/src/android/text/SpannedTest.java
@@ -18,10 +18,11 @@
import android.graphics.Typeface;
import android.os.Parcel;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.*;
-import android.text.style.*;
-import android.util.Log;
+import android.support.test.filters.SmallTest;
+import android.text.style.CharacterStyle;
+import android.text.style.StyleSpan;
+import android.text.style.TextAppearanceSpan;
+import android.text.style.TypefaceSpan;
import junit.framework.TestCase;
diff --git a/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java b/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java
index fb0f0c1..a9865f8 100644
--- a/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java
+++ b/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java
@@ -16,7 +16,7 @@
package android.text;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
import android.util.Log;
import junit.framework.TestCase;
@@ -25,73 +25,73 @@
* Quick check of native bidi implementation.
*/
public class StaticLayoutBidiTest extends TestCase {
-
+
public static final int REQ_DL = 2; // Layout.DIR_REQUEST_DEFAULT_LTR;
public static final int REQ_DR = -2; // Layout.DIR_REQUEST_DEFAULT_RTL;
public static final int REQ_L = 1; // Layout.DIR_REQUEST_LTR;
public static final int REQ_R = -1; // Layout.DIR_REQUEST_RTL;
public static final int L = Layout.DIR_LEFT_TO_RIGHT;
public static final int R = Layout.DIR_RIGHT_TO_LEFT;
-
+
public static final String SP = " ";
public static final String ALEF = "\u05d0";
public static final String BET = "\u05d1";
public static final String GIMEL = "\u05d2";
public static final String DALET = "\u05d3";
-
- //@SmallTest
+
+ @SmallTest
public void testAllLtr() {
expectNativeBidi(REQ_DL, "a test", "000000", L);
}
-
- //@SmallTest
+
+ @SmallTest
public void testLtrRtl() {
expectNativeBidi(REQ_DL, "abc " + ALEF + BET + GIMEL, "0000111", L);
}
-
- //@SmallTest
+
+ @SmallTest
public void testAllRtl() {
expectNativeBidi(REQ_DL, ALEF + SP + ALEF + BET + GIMEL + DALET, "111111", R);
}
-
- //@SmallTest
+
+ @SmallTest
public void testRtlLtr() {
expectNativeBidi(REQ_DL, ALEF + BET + GIMEL + " abc", "1111222", R);
}
-
- //@SmallTest
+
+ @SmallTest
public void testRAllLtr() {
expectNativeBidi(REQ_R, "a test", "222222", R);
}
-
- //@SmallTest
+
+ @SmallTest
public void testRLtrRtl() {
expectNativeBidi(REQ_R, "abc " + ALEF + BET + GIMEL, "2221111", R);
}
-
- //@SmallTest
+
+ @SmallTest
public void testLAllRtl() {
expectNativeBidi(REQ_L, ALEF + SP + ALEF + BET + GIMEL + DALET, "111111", L);
}
-
- //@SmallTest
+
+ @SmallTest
public void testLRtlLtr() {
expectNativeBidi(REQ_DL, ALEF + BET + GIMEL + " abc", "1111222", R);
}
-
- //@SmallTest
+
+ @SmallTest
public void testNativeBidi() {
expectNativeBidi(REQ_L, ALEF + BET + GIMEL + " abc", "1110000", L);
}
-
- private void expectNativeBidi(int dir, String text,
+
+ private void expectNativeBidi(int dir, String text,
String expectedLevels, int expectedDir) {
char[] chs = text.toCharArray();
int n = chs.length;
byte[] chInfo = new byte[n];
-
+
int resultDir = AndroidBidi.bidi(dir, chs, chInfo, n, false);
-
+
{
StringBuilder sb = new StringBuilder("info:");
for (int i = 0; i < n; ++i) {
@@ -99,7 +99,7 @@
}
Log.i("BIDI", sb.toString());
}
-
+
char[] resultLevelChars = new char[n];
for (int i = 0; i < n; ++i) {
resultLevelChars[i] = (char)('0' + chInfo[i]);
diff --git a/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java b/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java
index 4fde849..2300c63 100644
--- a/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java
+++ b/core/tests/coretests/src/android/text/StaticLayoutDirectionsTest.java
@@ -16,14 +16,15 @@
package android.text;
+import android.support.test.filters.SmallTest;
import android.text.Layout.Directions;
import android.text.StaticLayoutTest.LayoutBuilder;
+import junit.framework.TestCase;
+
import java.util.Arrays;
import java.util.Formatter;
-import junit.framework.TestCase;
-
public class StaticLayoutDirectionsTest extends TestCase {
private static final char ALEF = '\u05d0';
@@ -106,7 +107,7 @@
return new String(chars, 0, chars.length);
}
- // @SmallTest
+ @SmallTest
public void testDirections() {
StringBuilder buf = new StringBuilder("\n");
Formatter f = new Formatter(buf);
@@ -121,7 +122,7 @@
}
}
- // @SmallTest
+ @SmallTest
public void testTrailingWhitespace() {
LayoutBuilder b = StaticLayoutTest.builder();
b.setText(pseudoBidiToReal("Ab c"));
@@ -136,6 +137,7 @@
expectDirections("split line", expected, result);
}
+ @SmallTest
public void testNextToRightOf() {
LayoutBuilder b = StaticLayoutTest.builder();
b.setText(pseudoBidiToReal("aA1B2"));
@@ -159,6 +161,7 @@
}
}
+ @SmallTest
public void testNextToLeftOf() {
LayoutBuilder b = StaticLayoutTest.builder();
b.setText(pseudoBidiToReal("aA1B2"));
diff --git a/core/tests/coretests/src/android/text/StaticLayoutTest.java b/core/tests/coretests/src/android/text/StaticLayoutTest.java
index cbed96c..436840c 100644
--- a/core/tests/coretests/src/android/text/StaticLayoutTest.java
+++ b/core/tests/coretests/src/android/text/StaticLayoutTest.java
@@ -17,34 +17,24 @@
package android.text;
import android.graphics.Paint.FontMetricsInt;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
import android.text.Layout.Alignment;
-import static android.text.Layout.Alignment.*;
-import android.text.TextPaint;
import android.text.method.EditorState;
import android.util.Log;
import junit.framework.TestCase;
+import static android.text.Layout.Alignment.ALIGN_NORMAL;
+
/**
* Tests StaticLayout vertical metrics behavior.
- *
- * Requires disabling access checks in the vm since this calls package-private
- * APIs.
- *
- * @Suppress
*/
public class StaticLayoutTest extends TestCase {
- private static final int DEFAULT_OUTER_WIDTH = 150;
- private static final Alignment DEFAULT_ALIGN = Alignment.ALIGN_CENTER;
- private static final float SPACE_MULTI = 1.0f;
- private static final float SPACE_ADD = 0.0f;
-
/**
* Basic test showing expected behavior and relationship between font
* metrics and line metrics.
*/
- //@SmallTest
+ @SmallTest
public void testGetters1() {
LayoutBuilder b = builder();
FontMetricsInt fmi = b.paint.getFontMetricsInt();
@@ -70,7 +60,7 @@
* Basic test showing effect of includePad = true with 1 line.
* Top and bottom padding are affected, as is the line descent and height.
*/
- //@SmallTest
+ @SmallTest
public void testGetters2() {
LayoutBuilder b = builder()
.setIncludePad(true);
@@ -85,7 +75,7 @@
* Basic test showing effect of includePad = true wrapping to 2 lines.
* Ascent of top line and descent of bottom line are affected.
*/
- //@SmallTest
+ @SmallTest
public void testGetters3() {
LayoutBuilder b = builder()
.setIncludePad(true)
@@ -102,7 +92,7 @@
* Basic test showing effect of includePad = true wrapping to 3 lines.
* First line ascent is top, bottom line descent is bottom.
*/
- //@SmallTest
+ @SmallTest
public void testGetters4() {
LayoutBuilder b = builder()
.setText("This is a longer test")
@@ -122,7 +112,7 @@
* large text. See effect of leading. Currently, we don't expect there to
* even be non-zero leading.
*/
- //@SmallTest
+ @SmallTest
public void testGetters5() {
LayoutBuilder b = builder()
.setText("This is a longer test")
@@ -149,7 +139,7 @@
* Basic test showing effect of includePad = true, spacingAdd = 2, wrapping
* to 3 lines.
*/
- //@SmallTest
+ @SmallTest
public void testGetters6() {
int spacingAdd = 2; // int so expressions return int
LayoutBuilder b = builder()
@@ -163,14 +153,14 @@
assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
fmi.top, fmi.descent + spacingAdd,
fmi.ascent, fmi.descent + spacingAdd,
- fmi.ascent, fmi.bottom + spacingAdd);
+ fmi.ascent, fmi.bottom);
}
/**
* Basic test showing effect of includePad = true, spacingAdd = 2,
* spacingMult = 1.5, wrapping to 3 lines.
*/
- //@SmallTest
+ @SmallTest
public void testGetters7() {
LayoutBuilder b = builder()
.setText("This is a longer test")
@@ -185,14 +175,14 @@
assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
fmi.top, fmi.descent + s.scale(fmi.descent - fmi.top),
fmi.ascent, fmi.descent + s.scale(fmi.descent - fmi.ascent),
- fmi.ascent, fmi.bottom + s.scale(fmi.bottom - fmi.ascent));
+ fmi.ascent, fmi.bottom);
}
/**
* Basic test showing effect of includePad = true, spacingAdd = 0,
* spacingMult = 0.8 when wrapping to 3 lines.
*/
- //@SmallTest
+ @SmallTest
public void testGetters8() {
LayoutBuilder b = builder()
.setText("This is a longer test")
@@ -207,7 +197,7 @@
assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
fmi.top, fmi.descent + s.scale(fmi.descent - fmi.top),
fmi.ascent, fmi.descent + s.scale(fmi.descent - fmi.ascent),
- fmi.ascent, fmi.bottom + s.scale(fmi.bottom - fmi.ascent));
+ fmi.ascent, fmi.bottom);
}
// ----- test utility classes and methods -----
diff --git a/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java b/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java
index 2e0e6dc..7e07acb 100644
--- a/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java
+++ b/core/tests/coretests/src/android/text/StaticLayoutTextMeasuringTest.java
@@ -16,7 +16,9 @@
package android.text;
+import android.support.test.filters.SmallTest;
import android.text.Layout.Alignment;
+
import junit.framework.TestCase;
/**
@@ -38,6 +40,7 @@
}
}
+ @SmallTest
public void testGetPrimaryHorizontal_zwnbsp() {
// a, ZERO WIDTH NO-BREAK SPACE
String testString = "a\uFEFF";
@@ -48,6 +51,7 @@
assertEquals(layout.getPrimaryHorizontal(2), layout.getPrimaryHorizontal(1));
}
+ @SmallTest
public void testGetPrimaryHorizontal_devanagari() {
// DEVANAGARI LETTER KA, DEVANAGARI VOWEL SIGN AA
String testString = "\u0915\u093E";
@@ -58,6 +62,7 @@
assertEquals(layout.getPrimaryHorizontal(2), layout.getPrimaryHorizontal(1));
}
+ @SmallTest
public void testGetPrimaryHorizontal_flagEmoji() {
// REGIONAL INDICATOR SYMBOL LETTER U, REGIONAL INDICATOR SYMBOL LETTER S, REGIONAL
// INDICATOR SYMBOL LETTER Z
diff --git a/core/tests/coretests/src/android/text/TextLayoutTest.java b/core/tests/coretests/src/android/text/TextLayoutTest.java
index 6cf3000..f3a28b4 100644
--- a/core/tests/coretests/src/android/text/TextLayoutTest.java
+++ b/core/tests/coretests/src/android/text/TextLayoutTest.java
@@ -16,11 +16,8 @@
package android.text;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.DynamicLayout;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
+import android.support.test.filters.SmallTest;
+
import junit.framework.TestCase;
diff --git a/core/tests/coretests/src/android/text/TextUtilsTest.java b/core/tests/coretests/src/android/text/TextUtilsTest.java
index 121f02a..26aabdb 100644
--- a/core/tests/coretests/src/android/text/TextUtilsTest.java
+++ b/core/tests/coretests/src/android/text/TextUtilsTest.java
@@ -18,21 +18,21 @@
import com.google.android.collect.Lists;
-import android.test.MoreAsserts;
import android.os.Parcel;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.test.MoreAsserts;
import android.text.style.StyleSpan;
import android.text.util.Rfc822Token;
import android.text.util.Rfc822Tokenizer;
import android.view.View;
+import junit.framework.TestCase;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import junit.framework.TestCase;
-
/**
* TextUtilsTest tests {@link TextUtils}.
*/
diff --git a/core/tests/coretests/src/android/text/format/DateFormatTest.java b/core/tests/coretests/src/android/text/format/DateFormatTest.java
index 5f36cfd..93bc911 100644
--- a/core/tests/coretests/src/android/text/format/DateFormatTest.java
+++ b/core/tests/coretests/src/android/text/format/DateFormatTest.java
@@ -16,11 +16,12 @@
package android.text.format;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
import junit.framework.TestCase;
public class DateFormatTest extends TestCase {
+
@SmallTest
public void testHasDesignator() throws Exception {
assertTrue(DateFormat.hasDesignator("hh:mm:ss", DateFormat.MINUTE));
diff --git a/core/tests/coretests/src/android/text/format/DateUtilsTest.java b/core/tests/coretests/src/android/text/format/DateUtilsTest.java
index c5f6236..909f971 100644
--- a/core/tests/coretests/src/android/text/format/DateUtilsTest.java
+++ b/core/tests/coretests/src/android/text/format/DateUtilsTest.java
@@ -16,12 +16,43 @@
package android.text.format;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.LocaleList;
+import android.support.test.filters.SmallTest;
import junit.framework.TestCase;
+import java.util.Locale;
+
public class DateUtilsTest extends TestCase {
- // This test is not in CTS because formatDuration is @hidden.
+
+ private static final LocaleList LOCALE_LIST_US = new LocaleList(Locale.US);
+ private LocaleList mOriginalLocales;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mOriginalLocales = Resources.getSystem().getConfiguration().getLocales();
+ setLocales(LOCALE_LIST_US);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ setLocales(mOriginalLocales);
+ super.tearDown();
+ }
+
+ private void setLocales(LocaleList locales) {
+ final Resources systemResources = Resources.getSystem();
+ final Configuration config = new Configuration(systemResources.getConfiguration());
+ config.setLocales(locales);
+ // This is not very safe to call, but since DateUtils.formatDuration() is a static method
+ // (it gets its format strings from the system resources), we can't pass a modified Context
+ // to it.
+ systemResources.updateConfiguration(config, null);
+ }
+
@SmallTest
public void test_formatDuration_seconds() throws Exception {
assertEquals("0 seconds", DateUtils.formatDuration(0));
@@ -32,7 +63,6 @@
assertEquals("2 seconds", DateUtils.formatDuration(1500));
}
- // This test is not in CTS because formatDuration is @hidden.
@SmallTest
public void test_formatDuration_Minutes() throws Exception {
assertEquals("59 seconds", DateUtils.formatDuration(59000));
@@ -41,7 +71,6 @@
assertEquals("2 minutes", DateUtils.formatDuration(120000));
}
- // This test is not in CTS because formatDuration is @hidden.
@SmallTest
public void test_formatDuration_Hours() throws Exception {
assertEquals("59 minutes", DateUtils.formatDuration(3540000));
diff --git a/core/tests/coretests/src/android/text/format/FormatterTest.java b/core/tests/coretests/src/android/text/format/FormatterTest.java
index be6e7ea..2293094 100644
--- a/core/tests/coretests/src/android/text/format/FormatterTest.java
+++ b/core/tests/coretests/src/android/text/format/FormatterTest.java
@@ -18,8 +18,8 @@
import android.content.res.Configuration;
import android.content.res.Resources;
+import android.support.test.filters.SmallTest;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
import android.text.format.Formatter.BytesResult;
import java.util.Locale;
@@ -68,23 +68,26 @@
checkFormatBytes(123, true, "123", 123);
checkFormatBytes(123, false, "123", 123);
- checkFormatBytes(812, true, "812", 812);
- checkFormatBytes(812, false, "812", 812);
+ checkFormatBytes(900, true, "900", 900);
+ checkFormatBytes(900, false, "900", 900);
- checkFormatBytes(912, true, "0.89", 911);
- checkFormatBytes(912, false, "0.89", 911);
+ checkFormatBytes(901, true, "0.90", 900);
+ checkFormatBytes(901, false, "0.90", 900);
- checkFormatBytes(9123, true, "8.9", 9113);
- checkFormatBytes(9123, false, "8.91", 9123);
+ checkFormatBytes(912, true, "0.91", 910);
+ checkFormatBytes(912, false, "0.91", 910);
- checkFormatBytes(9123000, true, "8.7", 9122611);
- checkFormatBytes(9123000, false, "8.70", 9122611);
+ checkFormatBytes(9123, true, "9.1", 9100);
+ checkFormatBytes(9123, false, "9.12", 9120);
+
+ checkFormatBytes(9123456, true, "9.1", 9100000);
+ checkFormatBytes(9123456, false, "9.12", 9120000);
checkFormatBytes(-1, true, "-1", -1);
checkFormatBytes(-1, false, "-1", -1);
- checkFormatBytes(-912, true, "-0.89", -911);
- checkFormatBytes(-912, false, "-0.89", -911);
+ checkFormatBytes(-914, true, "-0.91", -910);
+ checkFormatBytes(-914, false, "-0.91", -910);
// Missing FLAG_CALCULATE_ROUNDED case.
BytesResult r = Formatter.formatBytes(getContext().getResources(), 1, 0);
@@ -93,7 +96,7 @@
// Make sure it works on different locales.
setLocale(new Locale("es", "ES"));
- checkFormatBytes(9123000, false, "8,70", 9122611);
+ checkFormatBytes(9123000, false, "9,12", 9120000);
}
private void checkFormatBytes(long bytes, boolean useShort,
diff --git a/core/tests/coretests/src/android/text/format/TimeTest.java b/core/tests/coretests/src/android/text/format/TimeTest.java
index 489f58b..f6dd0d4 100644
--- a/core/tests/coretests/src/android/text/format/TimeTest.java
+++ b/core/tests/coretests/src/android/text/format/TimeTest.java
@@ -16,9 +16,8 @@
package android.text.format;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
-import android.text.format.Time;
+import android.support.test.filters.SmallTest;
+import android.support.test.filters.Suppress;
import android.util.Log;
import android.util.TimeFormatException;
diff --git a/core/tests/coretests/src/android/text/method/BackspaceTest.java b/core/tests/coretests/src/android/text/method/BackspaceTest.java
index ee5ec41..a260e94 100644
--- a/core/tests/coretests/src/android/text/method/BackspaceTest.java
+++ b/core/tests/coretests/src/android/text/method/BackspaceTest.java
@@ -16,18 +16,13 @@
package android.text.method;
-import android.app.Activity;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
+import android.support.test.filters.SmallTest;
import android.text.InputType;
-import android.text.method.BaseKeyListener;
-import android.text.method.KeyListenerTestCase;
import android.view.KeyEvent;
-import android.widget.EditText;
import android.widget.TextView.BufferType;
/**
- * Test backspace key handling of {@link android.text.method.BaseKeyListner}.
+ * Test backspace key handling of {@link android.text.method.BaseKeyListener}.
*
* Only contains edge cases. For normal cases, see {@see android.text.method.cts.BackspaceTest}.
* TODO: introduce test cases for surrogate pairs and replacement span.
@@ -170,10 +165,27 @@
backspace(state, 0);
state.assertEquals("|");
+ state.setByString("U+1F469 U+200D U+1F373 |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
+ state.setByString("U+1F487 U+200D U+2640 |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
+ state.setByString("U+1F487 U+200D U+2640 U+FE0F |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
state.setByString("U+1F468 U+200D U+2764 U+FE0F U+200D U+1F48B U+200D U+1F468 |");
backspace(state, 0);
state.assertEquals("|");
+ // Emoji modifier can be appended to the first emoji.
+ state.setByString("U+1F469 U+1F3FB U+200D U+1F4BC |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
// End with ZERO WIDTH JOINER
state.setByString("U+1F441 U+200D |");
backspace(state, 0);
@@ -445,13 +457,6 @@
backspace(state, 0);
state.assertEquals("|");
- // Emoji modifier + ZERO WIDTH JOINER
- state.setByString("U+1F466 U+1F3FB U+200D U+1F469 |");
- backspace(state, 0);
- state.assertEquals("U+1F466 |");
- backspace(state, 0);
- state.assertEquals("|");
-
// Regional indicator symbol + Emoji modifier
state.setByString("U+1F1FA U+1F3FB |");
backspace(state, 0);
diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
index 0fed77c..1990fd0 100644
--- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
+++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
@@ -16,14 +16,9 @@
package android.text.method;
-import android.app.Activity;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
+import android.support.test.filters.SmallTest;
import android.text.InputType;
-import android.text.method.BaseKeyListener;
-import android.text.method.KeyListenerTestCase;
import android.view.KeyEvent;
-import android.widget.EditText;
import android.widget.TextView.BufferType;
/**
@@ -330,7 +325,7 @@
// ZERO WIDTH JOINER + regional indicator symbol
state.setByString("| U+1F469 U+200D U+1F1FA");
forwardDelete(state, 0);
- state.assertEquals("| U+1F1FA");
+ state.assertEquals("|");
// Regional indicator symbol + end with ZERO WIDTH JOINER
state.setByString("| U+1F1FA U+200D");
@@ -340,8 +335,6 @@
// Regional indicator symbol + ZERO WIDTH JOINER
state.setByString("| U+1F1FA U+200D U+1F469");
forwardDelete(state, 0);
- state.assertEquals("| U+1F469");
- forwardDelete(state, 0);
state.assertEquals("|");
// Start with ZERO WIDTH JOINER + emoji modifier
@@ -352,7 +345,7 @@
// ZERO WIDTH JOINER + emoji modifier
state.setByString("| U+1F469 U+200D U+1F3FB");
forwardDelete(state, 0);
- state.assertEquals("| U+1F3FB");
+ state.assertEquals("|");
// Emoji modifier + end with ZERO WIDTH JOINER
state.setByString("| U+1F466 U+1F3FB U+200D");
@@ -362,8 +355,6 @@
// Emoji modifier + ZERO WIDTH JOINER
state.setByString("| U+1F466 U+1F3FB U+200D U+1F469");
forwardDelete(state, 0);
- state.assertEquals("| U+1F469");
- forwardDelete(state, 0);
state.assertEquals("|");
// Regional indicator symbol + emoji modifier
diff --git a/core/tests/coretests/src/android/text/method/WordIteratorTest.java b/core/tests/coretests/src/android/text/method/WordIteratorTest.java
index 37f887c..28a480d 100644
--- a/core/tests/coretests/src/android/text/method/WordIteratorTest.java
+++ b/core/tests/coretests/src/android/text/method/WordIteratorTest.java
@@ -17,6 +17,7 @@
package android.text.method;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import java.text.BreakIterator;
import java.util.Locale;
@@ -24,6 +25,7 @@
// TODO(Bug: 24062099): Add more tests for non-ascii text.
public class WordIteratorTest extends AndroidTestCase {
+ @SmallTest
public void testSetCharSequence() {
final String text = "text";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -46,6 +48,24 @@
wordIterator.setCharSequence(text, text.length(), text.length());
}
+ @SmallTest
+ public void testWindowWidth() {
+ final String text = "aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn";
+ WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
+
+ // The first 'n' is more than 50 characters into the string.
+ wordIterator.setCharSequence(text, text.indexOf('n'), text.length());
+ final int expectedWindowStart = text.indexOf('n') - 50;
+ assertEquals(expectedWindowStart, wordIterator.preceding(expectedWindowStart + 1));
+ assertEquals(BreakIterator.DONE, wordIterator.preceding(expectedWindowStart));
+
+ wordIterator.setCharSequence(text, 0, 1);
+ final int expectedWindowEnd = 1 + 50;
+ assertEquals(expectedWindowEnd, wordIterator.following(expectedWindowEnd - 1));
+ assertEquals(BreakIterator.DONE, wordIterator.following(expectedWindowEnd));
+ }
+
+ @SmallTest
public void testPreceding() {
final String text = "abc def-ghi. jkl";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -70,8 +90,22 @@
assertEquals(text.indexOf('g'), wordIterator.preceding(text.indexOf('h')));
assertEquals(text.indexOf('g'), wordIterator.preceding(text.indexOf('j')));
assertEquals(text.indexOf('j'), wordIterator.preceding(text.indexOf('l')));
+
+ // The results should be the same even if we set an smaller window, since WordIterator
+ // enlargens the window by 50 code units on each side anyway.
+ wordIterator.setCharSequence(text, text.indexOf('d'), text.indexOf('e'));
+
+ assertEquals(BreakIterator.DONE, wordIterator.preceding(text.indexOf('a')));
+ assertEquals(text.indexOf('a'), wordIterator.preceding(text.indexOf('c')));
+ assertEquals(text.indexOf('a'), wordIterator.preceding(text.indexOf('d')));
+ assertEquals(text.indexOf('d'), wordIterator.preceding(text.indexOf('e')));
+ assertEquals(text.indexOf('d'), wordIterator.preceding(text.indexOf('g')));
+ assertEquals(text.indexOf('g'), wordIterator.preceding(text.indexOf('h')));
+ assertEquals(text.indexOf('g'), wordIterator.preceding(text.indexOf('j')));
+ assertEquals(text.indexOf('j'), wordIterator.preceding(text.indexOf('l')));
}
+ @SmallTest
public void testFollowing() {
final String text = "abc def-ghi. jkl";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -96,8 +130,22 @@
assertEquals(text.indexOf('i') + 1, wordIterator.following(text.indexOf('g')));
assertEquals(text.length(), wordIterator.following(text.indexOf('j')));
assertEquals(BreakIterator.DONE, wordIterator.following(text.length()));
+
+ // The results should be the same even if we set an smaller window, since WordIterator
+ // enlargens the window by 50 code units on each side anyway.
+ wordIterator.setCharSequence(text, text.indexOf('d'), text.indexOf('e'));
+
+ assertEquals(text.indexOf('c') + 1, wordIterator.following(text.indexOf('a')));
+ assertEquals(text.indexOf('c') + 1, wordIterator.following(text.indexOf('c')));
+ assertEquals(text.indexOf('f') + 1, wordIterator.following(text.indexOf('c') + 1));
+ assertEquals(text.indexOf('f') + 1, wordIterator.following(text.indexOf('d')));
+ assertEquals(text.indexOf('i') + 1, wordIterator.following(text.indexOf('-')));
+ assertEquals(text.indexOf('i') + 1, wordIterator.following(text.indexOf('g')));
+ assertEquals(text.length(), wordIterator.following(text.indexOf('j')));
+ assertEquals(BreakIterator.DONE, wordIterator.following(text.length()));
}
+ @SmallTest
public void testIsBoundary() {
final String text = "abc def-ghi. jkl";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -125,6 +173,7 @@
assertTrue(wordIterator.isBoundary(text.length()));
}
+ @SmallTest
public void testNextBoundary() {
final String text = "abc def-ghi. jkl";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -171,6 +220,7 @@
assertEquals(BreakIterator.DONE, currentOffset);
}
+ @SmallTest
public void testPrevBoundary() {
final String text = "abc def-ghi. jkl";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -216,6 +266,7 @@
assertEquals(BreakIterator.DONE, currentOffset);
}
+ @SmallTest
public void testGetBeginning() {
{
final String text = "abc def-ghi. jkl";
@@ -289,6 +340,7 @@
}
}
+ @SmallTest
public void testGetEnd() {
{
final String text = "abc def-ghi. jkl";
@@ -363,14 +415,18 @@
}
}
+ @SmallTest
public void testGetPunctuationBeginning() {
final String text = "abc!? (^^;) def";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
wordIterator.setCharSequence(text, 0, text.length());
- // TODO: Shouldn't this throw an exception?
- assertEquals(BreakIterator.DONE, wordIterator.getPunctuationBeginning(BreakIterator.DONE));
-
+ try {
+ wordIterator.getPunctuationBeginning(BreakIterator.DONE);
+ fail("getPunctuationBeginning with invalid offset should throw "
+ + "IllegalArgumentException.");
+ } catch (IllegalArgumentException e) {
+ }
try {
wordIterator.getPunctuationBeginning(-2);
fail("getPunctuationBeginning with invalid offset should throw "
@@ -394,14 +450,17 @@
assertEquals(text.indexOf(';'), wordIterator.getPunctuationBeginning(text.length()));
}
+ @SmallTest
public void testGetPunctuationEnd() {
final String text = "abc!? (^^;) def";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
wordIterator.setCharSequence(text, 0, text.length());
- // TODO: Shouldn't this throw an exception?
- assertEquals(BreakIterator.DONE, wordIterator.getPunctuationEnd(BreakIterator.DONE));
-
+ try {
+ wordIterator.getPunctuationEnd(BreakIterator.DONE);
+ fail("getPunctuationEnd with invalid offset should throw IllegalArgumentException.");
+ } catch (IllegalArgumentException e) {
+ }
try {
wordIterator.getPunctuationEnd(-2);
fail("getPunctuationEnd with invalid offset should throw IllegalArgumentException.");
@@ -423,6 +482,7 @@
assertEquals(BreakIterator.DONE, wordIterator.getPunctuationEnd(text.length()));
}
+ @SmallTest
public void testIsAfterPunctuation() {
final String text = "abc!? (^^;) def";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
@@ -438,6 +498,7 @@
assertFalse(wordIterator.isAfterPunctuation(text.length() + 1));
}
+ @SmallTest
public void testIsOnPunctuation() {
final String text = "abc!? (^^;) def";
WordIterator wordIterator = new WordIterator(Locale.ENGLISH);
diff --git a/core/tests/coretests/src/android/text/util/LinkifyTest.java b/core/tests/coretests/src/android/text/util/LinkifyTest.java
index 444eb0c..487f4e9 100644
--- a/core/tests/coretests/src/android/text/util/LinkifyTest.java
+++ b/core/tests/coretests/src/android/text/util/LinkifyTest.java
@@ -16,21 +16,48 @@
package android.text.util;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.LocaleList;
+import android.support.test.filters.SmallTest;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
import android.text.method.LinkMovementMethod;
import android.widget.TextView;
+import java.util.Locale;
+
/**
* LinkifyTest tests {@link Linkify}.
*/
public class LinkifyTest extends AndroidTestCase {
+ private static final LocaleList LOCALE_LIST_US = new LocaleList(Locale.US);
+ private LocaleList mOriginalLocales;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mOriginalLocales = LocaleList.getDefault();
+ LocaleList.setDefault(LOCALE_LIST_US);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ LocaleList.setDefault(mOriginalLocales);
+ super.tearDown();
+ }
+
+ private Context createUsEnglishContext() {
+ final Configuration overrideConfig = new Configuration();
+ overrideConfig.setLocales(LOCALE_LIST_US);
+ return getContext().createConfigurationContext(overrideConfig);
+ }
+
@SmallTest
public void testNothing() throws Exception {
TextView tv;
- tv = new TextView(getContext());
+ tv = new TextView(createUsEnglishContext());
tv.setText("Hey, foo@google.com, call 415-555-1212.");
assertFalse(tv.getMovementMethod() instanceof LinkMovementMethod);
@@ -41,7 +68,7 @@
public void testNormal() throws Exception {
TextView tv;
- tv = new TextView(getContext());
+ tv = new TextView(createUsEnglishContext());
tv.setAutoLinkMask(Linkify.ALL);
tv.setText("Hey, foo@google.com, call 415-555-1212.");
@@ -53,7 +80,7 @@
public void testUnclickable() throws Exception {
TextView tv;
- tv = new TextView(getContext());
+ tv = new TextView(createUsEnglishContext());
tv.setAutoLinkMask(Linkify.ALL);
tv.setLinksClickable(false);
tv.setText("Hey, foo@google.com, call 415-555-1212.");
diff --git a/core/tests/coretests/src/android/util/PatternsTest.java b/core/tests/coretests/src/android/util/PatternsTest.java
index 91e950c..360b875 100644
--- a/core/tests/coretests/src/android/util/PatternsTest.java
+++ b/core/tests/coretests/src/android/util/PatternsTest.java
@@ -15,7 +15,7 @@
*/
package android.util;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/core/tests/coretests/src/android/view/RemoteViewsTest.java b/core/tests/coretests/src/android/view/RemoteViewsTest.java
deleted file mode 100644
index 6dfd3bb..0000000
--- a/core/tests/coretests/src/android/view/RemoteViewsTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package android.view;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RemoteViews;
-import android.widget.TextView;
-
-import com.android.frameworks.coretests.R;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-/**
- * Tests for RemoteViews.
- */
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class RemoteViewsTest {
-
- @Rule
- public final ExpectedException exception = ExpectedException.none();
-
- private Context mContext;
- private String mPackage;
- private LinearLayout mContainer;
-
- @Before
- public void setup() {
- mContext = InstrumentationRegistry.getContext();
- mPackage = mContext.getPackageName();
- mContainer = new LinearLayout(mContext);
- }
-
- @Test
- public void clone_doesNotCopyBitmap() {
- RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
- Bitmap bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
-
- original.setImageViewBitmap(R.id.image, bitmap);
- RemoteViews clone = original.clone();
- View inflated = clone.apply(mContext, mContainer);
-
- Drawable drawable = ((ImageView) inflated.findViewById(R.id.image)).getDrawable();
- assertSame(bitmap, ((BitmapDrawable)drawable).getBitmap());
- }
-
- @Test
- public void clone_originalCanStillBeApplied() {
- RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
-
- RemoteViews clone = original.clone();
-
- clone.apply(mContext, mContainer);
- }
-
- @Test
- public void clone_clones() {
- RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
-
- RemoteViews clone = original.clone();
- original.setTextViewText(R.id.text, "test");
- View inflated = clone.apply(mContext, mContainer);
-
- TextView textView = (TextView) inflated.findViewById(R.id.text);
- assertEquals("", textView.getText());
- }
-
- @Test
- public void clone_child_fails() {
- RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
- RemoteViews child = new RemoteViews(mPackage, R.layout.remote_views_test);
-
- original.addView(R.id.layout, child);
-
- exception.expect(IllegalStateException.class);
- RemoteViews clone = child.clone();
- }
-
- @Test
- public void clone_repeatedly() {
- RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
-
- original.clone();
- original.clone();
-
- original.apply(mContext, mContainer);
- }
-
- @Test
- public void clone_chained() {
- RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
-
- RemoteViews clone = original.clone().clone();
-
- clone.apply(mContext, mContainer);
- }
-
-}
diff --git a/core/tests/coretests/src/android/widget/RemoteViewsTest.java b/core/tests/coretests/src/android/widget/RemoteViewsTest.java
new file mode 100644
index 0000000..4e3bf46
--- /dev/null
+++ b/core/tests/coretests/src/android/widget/RemoteViewsTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package android.widget;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+
+import com.android.frameworks.coretests.R;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+/**
+ * Tests for RemoteViews.
+ */
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class RemoteViewsTest {
+
+ @Rule
+ public final ExpectedException exception = ExpectedException.none();
+
+ private Context mContext;
+ private String mPackage;
+ private LinearLayout mContainer;
+
+ @Before
+ public void setup() {
+ mContext = InstrumentationRegistry.getContext();
+ mPackage = mContext.getPackageName();
+ mContainer = new LinearLayout(mContext);
+ }
+
+ @Test
+ public void clone_doesNotCopyBitmap() {
+ RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
+
+ original.setImageViewBitmap(R.id.image, bitmap);
+ RemoteViews clone = original.clone();
+ View inflated = clone.apply(mContext, mContainer);
+
+ Drawable drawable = ((ImageView) inflated.findViewById(R.id.image)).getDrawable();
+ assertSame(bitmap, ((BitmapDrawable)drawable).getBitmap());
+ }
+
+ @Test
+ public void clone_originalCanStillBeApplied() {
+ RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
+
+ RemoteViews clone = original.clone();
+
+ clone.apply(mContext, mContainer);
+ }
+
+ @Test
+ public void clone_clones() {
+ RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
+
+ RemoteViews clone = original.clone();
+ original.setTextViewText(R.id.text, "test");
+ View inflated = clone.apply(mContext, mContainer);
+
+ TextView textView = (TextView) inflated.findViewById(R.id.text);
+ assertEquals("", textView.getText());
+ }
+
+ @Test
+ public void clone_child_fails() {
+ RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
+ RemoteViews child = new RemoteViews(mPackage, R.layout.remote_views_test);
+
+ original.addView(R.id.layout, child);
+
+ exception.expect(IllegalStateException.class);
+ RemoteViews clone = child.clone();
+ }
+
+ @Test
+ public void clone_repeatedly() {
+ RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
+
+ original.clone();
+ original.clone();
+
+ original.apply(mContext, mContainer);
+ }
+
+ @Test
+ public void clone_chained() {
+ RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test);
+
+ RemoteViews clone = original.clone().clone();
+
+ clone.apply(mContext, mContainer);
+ }
+
+}
diff --git a/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java b/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java
index 57881af..472958a 100644
--- a/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java
+++ b/core/tests/coretests/src/com/android/internal/app/WindowDecorActionBarTest.java
@@ -18,6 +18,7 @@
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
+import android.test.suitebuilder.annotation.SmallTest;
import android.view.ActionMode;
import android.view.Menu;
import android.view.MenuItem;
@@ -25,6 +26,7 @@
/**
* Tests for {@link WindowDecorActionBar}.
*/
+@SmallTest
public class WindowDecorActionBarTest
extends ActivityInstrumentationTestCase2<WindowDecorActionBarTestActivity> {
private WindowDecorActionBar mWindowDecorActionBar;
diff --git a/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java b/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java
new file mode 100644
index 0000000..32317ee
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/KernelMemoryBandwidthStatsTest.java
@@ -0,0 +1,80 @@
+package com.android.internal.os;
+
+import android.support.test.filters.SmallTest;
+import android.util.LongSparseLongArray;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+import org.mockito.Mockito;
+
+import java.io.BufferedReader;
+
+/**
+ * Tests for KernelMemoryBandwidthStats parsing and delta calculation, based on memory_state_time.
+ */
+public class KernelMemoryBandwidthStatsTest extends TestCase {
+
+ /**
+ * Standard example of parsing stats.
+ * @throws Exception
+ */
+ @SmallTest
+ public void testParseStandard() throws Exception {
+ KernelMemoryBandwidthStats stats = new KernelMemoryBandwidthStats();
+ BufferedReader mockStandardReader = Mockito.mock(BufferedReader.class);
+ Mockito.when(mockStandardReader.readLine()).thenReturn(
+ "99000000 0 0 0 0 0 0 0 0 0 0 0 0",
+ "149000000 0 0 0 0 0 0 0 0 0 0 0 0",
+ "199884800 7301000000 0 2000000 1000000 0 0 0 0 0 0 0 0",
+ "299892736 674000000 0 21000000 0 0 0 0 0 0 0 0 0",
+ "411959296 1146000000 0 221000000 1000000 0 0 0 0 0 0 0 0",
+ "546963456 744000000 0 420000000 0 0 0 1000000 0 0 0 0 0",
+ "680919040 182000000 0 1839000000 207000000 1000000 1000000 0 0 0 0 0 0",
+ "767950848 0 0 198000000 33000000 4000000 0 1000000 0 0 0 0 0",
+ "1016987648 0 0 339000000 362000000 3000000 0 0 0 0 0 0 16000000",
+ "1295908864 0 0 20000000 870000000 244000000 0 0 0 0 0 0 33000000",
+ "1554907136 0 0 6000000 32000000 631000000 115000000 0 0 0 1000000 0 0",
+ "1803943936 2496000000 0 17000000 2000000 377000000 1505000000 278000000 183000000 141000000 486000000 154000000 113000000", null);
+ stats.parseStats(mockStandardReader);
+ long[] expected = new long[] {12543L, 0L, 3083L, 1508L, 1260L, 1621L, 280L, 183L,
+ 141L, 487L, 154L, 162L};
+ LongSparseLongArray array = stats.getBandwidthEntries();
+ for (int i = 2; i < array.size(); i++) {
+ assertEquals(i, array.keyAt(i));
+ assertEquals(expected[i], array.valueAt(i));
+ }
+ Mockito.verify(mockStandardReader, Mockito.times(13)).readLine();
+ }
+
+ /**
+ * When the stats are populated with zeroes (unsupported device), checks that the stats are
+ * zero.
+ * @throws Exception
+ */
+ @SmallTest
+ public void testParseBackwards() throws Exception {
+ KernelMemoryBandwidthStats zeroStats = new KernelMemoryBandwidthStats();
+ BufferedReader mockZeroReader = Mockito.mock(BufferedReader.class);
+ Mockito.when(mockZeroReader.readLine()).thenReturn(
+ "99000000 0 0 0 0 0 0 0 0 0 0 0 0",
+ "149000000 0 0 0 0 0 0 0 0 0 0 0 0",
+ "199884800 0 0 0 0 0 0 0 0 0 0 0 0",
+ "299892736 0 0 0 0 0 0 0 0 0 0 0 0",
+ "411959296 0 0 0 0 0 0 0 0 0 0 0 0",
+ "546963456 0 0 0 0 0 0 0 0 0 0 0 0",
+ "680919040 0 0 0 0 0 0 0 0 0 0 0 0",
+ "767950848 0 0 0 0 0 0 0 0 0 0 0 0",
+ "1016987648 0 0 0 0 0 0 0 0 0 0 0 0",
+ "1295908864 0 0 0 0 0 0 0 0 0 0 0 0",
+ "1554907136 0 0 0 0 0 0 0 0 0 0 0 0",
+ "1803943936 0 0 0 0 0 0 0 0 0 0 0 0", null);
+ zeroStats.parseStats(mockZeroReader);
+ long[] expected = new long[] {0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L};
+ LongSparseLongArray array = zeroStats.getBandwidthEntries();
+ for (int i = 0; i < array.size(); i++) {
+ assertEquals(expected[i], array.valueAt(i));
+ }
+ Mockito.verify(mockZeroReader, Mockito.times(13)).readLine();
+ }
+}
diff --git a/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java b/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java
index 4a8e18d..1471796 100644
--- a/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java
+++ b/core/tests/coretests/src/com/android/internal/widget/ActionBarContainerTest.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.view.ActionMode;
import android.view.View;
import android.view.ViewGroup;
@@ -25,6 +26,7 @@
/**
* Tests for {@link ActionBarContainer}.
*/
+@SmallTest
public class ActionBarContainerTest extends AndroidTestCase {
private ActionBarContainer mActionBarContainer;
diff --git a/docs/docs-preview-index.html b/docs/docs-preview-index.html
index e26b57c..8d5422b 100644
--- a/docs/docs-preview-index.html
+++ b/docs/docs-preview-index.html
@@ -79,19 +79,16 @@
<h2>Get Started</h2>
<ul>
- <li>View the <a href="reference/packages.html">API Reference</a></li>
+ <li>View the <a href="reference/packages.html">offline API Reference</a></li>
<li>Read Diff Reports:</a>
<ul>
- <li><a href="sdk/api_diff/n-preview-1/changes.html"
- >API 23 --> Preview 1</a></li>
+ <li><a href="https://developer.android.com/sdk/api_diff/24/changes.html"
+ >API 23 --> API 24</a></li>
</ul>
</li>
- <li>Downloads and additional documentation are available at the
+ <li>For more information, visit the
<a href="http://developer.android.com/preview/index.html">
Android N Developer Preview site</a></li>
- <li>For information about Developer Preview 1, visit the
- <a href="http://developer.android.com/preview/support.html">Support</a>
- page.</li>
</ul>
diff --git a/docs/html-intl/intl/es/about/versions/android-5.0.jd b/docs/html-intl/intl/es/about/versions/android-5.0.jd
index c94a140..4d50584 100644
--- a/docs/html-intl/intl/es/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/es/about/versions/android-5.0.jd
@@ -428,7 +428,7 @@
<p>Cuando el sistema detecta una red adecuada, se conecta a la red e invoca la devolución de llamada {@link android.net.ConnectivityManager.NetworkCallback#onAvailable(android.net.Network) onAvailable()}. Puedes usar el objeto {@link android.net.Network} de la devolución de llamada para obtener información adicional acerca de la red o para indicar que el tráfico use la red seleccionada.</p>
<h3 id="BluetoothBroadcasting">Bluetooth de baja energía</h3>
-<p>Android 4.3 introdujo compatibilidad de plataforma para <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">Bluetooth de baja energía</a> (<em>Bluetooth LE</em>) en el rol central. En Android 5.0, un dispositivo Android ahora puede actuar como un <em>dispositivo periférico</em> Bluetooth LE. Las aplicaciones pueden utilizar esta capacidad para que otros dispositivos cercanos detecten su presencia. Por ejemplo, puedes crear aplicaciones que permiten que un dispositivo funcione como un podómetro o un monitor de estado, y comunique sus datos a otro dispositivo Bluetooth LE.</p>
+<p>Android 4.3 introdujo compatibilidad de plataforma para <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">Bluetooth de baja energía</a> (<em>Bluetooth LE</em>) en el rol central. En Android 5.0, un dispositivo Android ahora puede actuar como un <em>dispositivo periférico</em> Bluetooth LE. Las aplicaciones pueden utilizar esta capacidad para que otros dispositivos cercanos detecten su presencia. Por ejemplo, puedes crear aplicaciones que permiten que un dispositivo funcione como un podómetro o un monitor de estado, y comunique sus datos a otro dispositivo Bluetooth LE.</p>
<p>Las nuevas API {@link android.bluetooth.le} permiten a sus aplicaciones transmitir anuncios, buscar respuestas y establecer conexiones con dispositivos Bluetooth LE cercanos. Para utilizar las nuevas funciones de anuncio y búsqueda, agrega el permiso {@link android.Manifest.permission#BLUETOOTH_ADMIN BLUETOOTH_ADMIN} en el manifiesto. Cuando los usuarios actualizan o descargan tu aplicación desde Play Store, se les pide que concedan el siguiente permiso a tu aplicación: "Información de conexión Bluetooth: Permite que la aplicación controle Bluetooth, incluida la transmisión de información a dispositivos Bluetooth cercanos o la obtención de información sobre ellos".</p>
<p>Para comenzar el anuncio de Bluetooth LE a fin de que otros dispositivos puedan detectar tu aplicación, llama a {@link android.bluetooth.le.BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback) startAdvertising()} y envía una implementación de la clase {@link android.bluetooth.le.AdvertiseCallback}. El objeto de devolución de llamada recibe un informe del éxito o fracaso de la operación de anuncio.</p>
diff --git a/docs/html-intl/intl/es/about/versions/marshmallow/android-6.0-testing.jd b/docs/html-intl/intl/es/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..20d2d6e
--- /dev/null
+++ b/docs/html-intl/intl/es/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Guía de prueba
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>En este documento</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Prueba de los permisos</a></li>
+ <li><a href="#doze-standby">Prueba de los modos Descanso y App Standby</a></li>
+ <li><a href="#ids">Copia de seguridad automática e identificadores de dispositivos</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N te brinda la oportunidad de garantizar que tus aplicaciones funcionen con la próxima versión de la plataforma.
+ Esta versión preliminar incluye diversas API y cambios en los comportamientos que pueden
+tener impactos en tu aplicación, como se describe en las secciones <a href="{@docRoot}preview/api-overview.html">Información general de la API</a> y <a href="{@docRoot}preview/behavior-changes.html">Cambios en los comportamientos</a>.
+ Al probar tu aplicación con la versión preliminar, te debes centrar en algunos cambios específicos del sistema para garantizar que los usuarios disfruten de una buena experiencia.
+
+
+</p>
+
+<p>
+ En esta guía, se describen qué y cómo probar las características preliminares con tu aplicación. Debes priorizar la prueba de estas características específicas preliminares, puesto que podrían tener un alto impacto en el comportamiento de tu aplicación:
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Permisos</a>
+ </li>
+ <li><a href="#doze-standby">Modos Descanso y App Standby</a>
+ </li>
+ <li><a href="#ids">Copia de seguridad automática e identificadores de dispositivos</a></li>
+</ul>
+
+<p>
+ Para obtener más información sobre cómo configurar dispositivos o dispositivos virtuales con una imagen
+ del sistema de la versión preliminar para realizar pruebas, consulta la sección <a href="{@docRoot}preview/setup-sdk.html">Configurar el SDK de Android N</a>.
+
+</p>
+
+
+<h2 id="runtime-permissions">Prueba de los permisos</h2>
+
+<p>
+ El nuevo modelo de <a href="{@docRoot}preview/features/runtime-permissions.html">permisos</a> cambia el modo en que el usuario asigna permisos a tu aplicación.
+ En lugar de conceder todos los permisos durante el procedimiento de instalación, tu aplicación debe solicitar al usuario los permisos individuales en el tiempo de ejecución.
+
+ Para los usuarios, este comportamiento ofrece más control granular sobre las actividades de cada aplicación, así como un mejor contexto para comprender por qué la aplicación está solicitando un permiso específico.
+ Los usuarios pueden conceder o revocar los permisos concedidos a una aplicación de forma individual en cualquier momento.
+ Es muy probable que esta característica de la versión preliminar tenga un impacto en el comportamiento de tu aplicación y puede hacer que algunas características de tu aplicación no funcionen o funcionen en un estado degradado.
+
+
+</p>
+
+<p class="caution">
+ Este cambio afecta a todas las aplicaciones que se ejecutan en la nueva plataforma, incluso a aquellas que no tienen como destino la nueva versión de la plataforma.
+ La plataforma ofrece un comportamiento de compatibilidad limitada para las aplicaciones heredadas, pero debes comenzar a planificar ahora la migración de tu aplicación al nuevo modelo de permisos, con el objetivo de publicar una versión actualizada de tu aplicación cuando se lance la plataforma oficial.
+
+
+</p>
+
+
+<h3 id="permission-test-tips">Tips para pruebas</h3>
+
+<p>
+ Usa los siguientes tips para pruebas como ayuda para planificar y ejecutar las pruebas de tu aplicación con el nuevo comportamiento de permisos.
+
+</p>
+
+<ul>
+ <li>Identifica los permisos actuales de tu aplicación y las rutas de códigos relacionadas.</li>
+ <li>Prueba los flujos del usuario en los datos y servicios protegidos por permisos.</li>
+ <li>Realiza pruebas con varias combinaciones de permisos concedidos/revocados.</li>
+ <li>Usa la herramienta {@code adb} para administrar permisos desde la línea de comando:
+ <ul>
+ <li>Enumera los permisos y estados por grupo:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Concede o revoca un permiso o más permisos utilizando la siguiente sintaxis:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analiza tu aplicación para detectar servicios que utilizan permisos.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Estrategia de prueba</h3>
+
+<p>
+ El cambio en los permisos afecta la estructura y el diseño de tu aplicación, además de la experiencia del usuario y los flujos que proporcionas a los usuarios.
+ Debes evaluar el uso de los permisos actuales de tu aplicación y comenzar a planificar los nuevos flujos que deseas ofrecer.
+ La versión oficial de la plataforma proporciona un comportamiento de compatibilidad, pero debes prever la actualización de tu aplicación y no depender de estos comportamientos.
+
+
+</p>
+
+<p>
+ Identifica los permisos que tu aplicación verdaderamente necesita y utiliza, y luego busca las diversas rutas de códigos que utilizan los servicios protegidos por permisos.
+ Puedes realizar esto mediante una combinación de pruebas en la plataforma nueva y análisis de códigos.
+ Al realizar las pruebas, debes centrarte en
+ incluir permisos de tiempo de ejecución cambiando {@code targetSdkVersion} de la aplicación a la versión preliminar. Para
+ obtener más información, consulta la sección <a href="{@docRoot}preview/setup-sdk.html#">Configurar el SDK de Android N</a>.
+
+</p>
+
+<p>
+ Realiza pruebas con diversas combinaciones de permisos revocados y agregados, a fin de destacar los flujos del usuario que dependen de permisos.
+ Cuando una dependencia no sea obvia ni lógica, debes considerar la opción de refactorizar o compartimentar ese flujo para eliminar la dependencia o aclarar por qué se necesita el permiso.
+
+
+</p>
+
+<p>
+ Para obtener más información sobre el comportamiento de los permisos de tiempo de ejecución, las pruebas y las mejores prácticas, consulta la página <a href="{@docRoot}preview/features/runtime-permissions.html">Permisos</a> de la versión preliminar para desarrolladores.
+
+
+</p>
+
+
+<h2 id="doze-standby">Prueba de los modos Descanso y App Standby</h2>
+
+<p>
+ Las características de ahorro de energía de los modos Descanso y App Standby limitan la cantidad de procesamiento en segundo plano que puede realizar tu aplicación cuando un dispositivo se encuentra en estado inactivo o mientras tu aplicación no está en foco.
+ Entre las restricciones que el sistema puede imponer en las aplicaciones se incluyen el acceso limitado a la red o denegación de acceso, suspensión de las tareas en segundo plano, suspensión de notificaciones, y alarmas y solicitudes de reactivación ignoradas.
+
+ Para garantizar que tu aplicación tenga un comportamiento correcto con estas optimizaciones de ahorro de energía, debes probar tu aplicación simulando estos estados de bajo consumo.
+
+
+</p>
+
+<h4 id="doze">Cómo probar la aplicación en modo Descanso</h4>
+
+<p>Para probar el modo Descanso con tu aplicación, realiza lo siguiente:</p>
+
+<ol>
+<li>Configura un dispositivo de hardware o un dispositivo virtual con una imagen del sistema Android N.</li>
+<li>Conecta el dispositivo a tu equipo de desarrollo e instala tu aplicación.</li>
+<li>Ejecuta tu aplicación y déjala activa.</li>
+<li>Simula la activación del modo Descanso en el dispositivo ejecutando los siguientes comandos:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Observa el comportamiento de tu aplicación cuando se reactive el dispositivo. Asegúrate de que se recupere correctamente cuando el dispositivo salga del modo Descanso.
+</li>
+</ol>
+
+
+<h4 id="standby">Cómo probar aplicaciones en modo App Standby</h4>
+
+<p>Para probar el modo App Standby con tu aplicación, realiza lo siguiente:</p>
+
+<ol>
+ <li>Configura un dispositivo de hardware o un dispositivo virtual con una imagen del sistema Android N.</li>
+ <li>Conecta el dispositivo a tu equipo de desarrollo e instala tu aplicación.</li>
+ <li>Ejecuta tu aplicación y déjala activa.</li>
+ <li>Simula la activación del modo App Standby en la aplicación ejecutando los siguientes comandos:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simula la activación de tu aplicación con el siguiente comando:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Observa el comportamiento de tu aplicación al reactivarse. Asegúrate de que se recupere correctamente del modo App Standby.
+ En particular, debes comprobar si los trabajos en segundo plano y las notificaciones de tu aplicación continúan funcionando de la manera esperada.
+</li>
+</ol>
+
+<h2 id="ids">Copia de seguridad automática para aplicaciones e identificadores específicos del dispositivo</h2>
+
+<p>Si tu aplicación continúa teniendo algún identificador específico del dispositivo, como la Id. de registro de Google Cloud Messaging, en el almacenamiento interno, asegúrate de seguir las mejores prácticas para excluir la ubicación de almacenamiento de la copia de seguridad automática, como se describe en la sección <a href="{@docRoot}preview/backup/index.html">Copia de seguridad automática para aplicaciones</a>.
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/es/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/es/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..d4438f2
--- /dev/null
+++ b/docs/html-intl/intl/es/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,610 @@
+page.title=Cambios en los comportamientos
+page.keywords=versión preliminar,sdk,compatibilidad
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>En este documento</h2>
+
+<ol>
+ <li><a href="#perf">Mejoras de rendimiento</a>
+ <ol>
+ <li><a href="#doze">Descanso</a></li>
+ <li><a href="#bg-opt">Optimizaciones en segundo plano</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">Cambios en los permisos</a>
+ </li>
+ <li><a href="#sharing-files">Intercambio de archivos entre aplicaciones</a></li>
+ <li><a href="#accessibility">Mejoras de accesibilidad</a>
+ <ol>
+ <li><a href="#screen-zoom">Zoom de la pantalla</a></li>
+ <li><a href="#vision-settings">Vision Settings en el asistente de configuración</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">Aplicaciones del NDK con vínculos a bibliotecas de plataformas</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">Retención de anotaciones</a></li>
+ <li><a href="#other">Otros aspectos importantes</a></li>
+</ol>
+
+<h2>Consulta también</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">
+ Información general sobre la API de Android N</a></li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Además de nuevas características y capacidades, Android N
+ incluye diversos cambios en el sistema y en los comportamientos de la API. En este documento,
+ se destacan algunos de los cambios principales que debes comprender y justificar
+ en tus aplicaciones.
+</p>
+
+<p>
+ Si publicaste anteriormente una aplicación para Android, ten en cuenta que tu aplicación
+ podría verse afectada por estos cambios en la plataforma.
+</p>
+
+
+<h2 id="perf">Batería y memoria</h2>
+
+<p>
+Android N incluye cambios en los comportamientos del sistema para mejorar la duración de la batería
+de los dispositivos y reducir el uso de la memoria RAM. Estos cambios pueden afectar el acceso de tu aplicación a
+recursos del sistema, además de la manera en que tu aplicación interactúa con otras aplicaciones mediante
+determinadas intents implícitas.
+</p>
+
+<h3 id="doze">Descanso</h3>
+
+<p>
+ Descanso, presentado en Android 6.0 (nivel de API 23), prolonga la duración de la batería
+ aplazando actividades de CPU y red cuando un usuario deja un dispositivo desenchufado,
+ quieto y con la pantalla apagada. En Android N se ofrecen más
+ mejoras para Descanso a través de la aplicación de un subconjunto de restricciones de CPU y red
+ mientras el dispositivo se encuentra desenchufado y con la pantalla apagada, aunque no necesariamente
+ quieto; por ejemplo, al ir dentro del bolsillo de un usuario en movimiento.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>Figura 1:</strong> Ilustración del modo en que Descanso aplica un primer nivel de
+ restricciones de actividad del sistema para prolongar la duración de la batería.
+</p>
+
+<p>
+ Cuando un dispositivo funciona con la batería y la pantalla permanece apagada durante un tiempo
+ determinado, se activa en este el modo Descanso y se aplica el primer subconjunto de restricciones: se
+ desactiva el acceso de las aplicaciones a la red y se aplazan tareas y sincronizaciones. Si el dispositivo
+ permanece quieto durante un tiempo determinado tras activarse el modo Descanso, el sistema aplica el
+ resto de las restricciones del modo a {@link android.os.PowerManager.WakeLock},
+ alarmas de {@link android.app.AlarmManager}, GPS y análisis de Wi-Fi. Independientemente de que
+ se apliquen algunas o todas las restricciones del modo Descanso, el sistema activa el
+ dispositivo durante plazos de mantenimiento breves en los cuales las aplicaciones tienen
+ acceso a la red y pueden ejecutar sincronizaciones o procesos aplazados.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>Figura 2:</strong> Ilustración del modo en que Descanso aplica un segundo nivel de
+ restricciones de actividad del sistema después de que el dispositivo permanece quieto durante un tiempo determinado.
+</p>
+
+<p>
+ Ten en cuenta que, cuando se activa la pantalla o se enchufa el dispositivo, se desactiva el modo Descanso y
+ se retiran estas restricciones de procesamiento. El comportamiento adicional no
+ tiene efecto sobre las recomendaciones ni las prácticas recomendadas para adaptar tu aplicación a la versión
+ anterior de Descanso, presentada en Android 6.0 (nivel de API 23), según lo descrito en
+ <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
+ Optimización para Descanso y App Standby</a>. De todos modos, debes
+ seguir las recomendaciones; por ejemplo, la de usar Google Cloud Messaging (GCM) para
+ enviar y recibir mensajes, y la de planificar actualizaciones para adaptar
+ el comportamiento adicional de Descanso.
+</p>
+
+
+<h3 id="bg-opt">Project Svelte: Optimizaciones en segundo plano</h3>
+
+<p>
+ En Android N, se eliminan tres transmisiones implícitas para ayudar a optimizar el uso de la
+ memoria y el consumo de energía. Este cambio es necesario porque las transmisiones
+ implícitas a menudo inician aplicaciones que se registran para realizar un seguimiento de ellas en
+ segundo plano. La eliminación de estas transmisiones puede mejorar sustancialmente el rendimiento del dispositivo
+ y la experiencia del usuario.
+</p>
+
+<p>
+ Los dispositivos móviles están sujetos a cambios de conectividad frecuentes
+ entre los modos de datos Wi-Fi y móviles. Actualmente, las aplicaciones pueden realizar controles en busca de cambios en la
+ conectividad registrando un receptor para la transmisión implícita {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} en su
+ manifiesto. Debido a que muchas aplicaciones se registran para recibir esta transmisión, un cambio de
+ red puede hacer que todas se activen y procesen la transmisión a la
+ vez.
+</p>
+
+<p>
+ Asimismo, en versiones anteriores de Android, las aplicaciones podían registrarse para recibir las transmisiones implícitas {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} y {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} de otras aplicaciones, como la
+ cámara. Cuando un usuario toma una foto con la aplicación de la cámara, estas aplicaciones se activan
+ para procesar la transmisión.
+</p>
+
+<p>
+ Para corregir estos problemas, en Android N se aplican las siguientes
+ optimizaciones:
+</p>
+
+<ul>
+ <li>Las aplicaciones orientadas a Android N no reciben transmisiones {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION}, aun cuando contengan
+ entradas de manifiesto que les permitan solicitar notificaciones de estos eventos. Las aplicaciones que
+ se ejecutan aún pueden escuchar {@code CONNECTIVITY_CHANGE} en su subproceso principal
+ si solicitan una notificación con un {@link android.content.BroadcastReceiver}.
+ </li>
+
+ <li>Las aplicaciones no pueden enviar ni recibir transmisiones {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} ni {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}. Esta optimización
+ afecta a todas las aplicaciones, no solo a aquellas orientadas a Android N.
+ </li>
+</ul>
+
+<p>Si la aplicación utiliza cualquiera de estas intents, debes quitar las dependencias
+ en ellas lo antes posible a fin de poder orientar los dispositivos con Android N correctamente.
+ El framework de Android ofrece varias soluciones para mitigar la necesidad de
+ estas transmisiones implícitas. Por ejemplo, la API {@link
+ android.app.job.JobScheduler} proporciona un mecanismo sólido para programar
+ operaciones de red cuando se cumplen las condiciones especificadas, como una conexión a una
+ red de uso no medido. Puedes usar {@link
+ android.app.job.JobScheduler} para responder a cambios en proveedores de contenido.
+</p>
+
+<p>
+ Para obtener más información sobre optimizaciones en segundo plano en Android N y la manera de adaptar tu aplicación,
+ consulta <a href="{@docRoot}preview/features/background-optimization.html">Optimizaciones
+ en segundo plano</a>.
+</p>
+
+<h2 id="perm">Cambios en los permisos</h2>
+
+<p>
+ En Android N, se incorporan cambios en permisos que pueden afectar tu aplicación.
+</p>
+
+<h3 id="permfilesys">Cambios en los permisos del sistema de archivos</h3>
+
+<p>
+ Para mejorar la seguridad de los archivos privados, el directorio privado de
+ las aplicaciones orientadas a Android N o versiones posteriores tiene acceso restringido. (<code>0700</code>).
+ Esta configuración evita la fuga de metadatos de archivos privados, como su tamaño
+ o existencia. Este cambio en los permisos tiene varios efectos secundarios:
+</p>
+
+<ul>
+ <li>
+ Los propietarios ya no pueden reducir los permisos de archivo de los archivos privados,
+ y un intento de hacerlo utilizando
+ {@link android.content.Context#MODE_WORLD_READABLE} o
+ {@link android.content.Context#MODE_WORLD_WRITEABLE} activará una
+ {@link java.lang.SecurityException}.
+ <p class="note">
+ <strong>Nota:</strong> Desde ahora, esta restricción no se aplica planamente.
+ Las aplicaciones pueden seguir modificando los permisos para sus directorios privados con
+ las API nativas o la API {@link java.io.File File}. Sin embargo, desaconsejamos
+ reducir los permisos para el directorio privado.
+ </p>
+ </li>
+ <li>
+ Pasar URI <code>file://</code> fuera del dominio del paquete puede dar al
+ receptor una ruta de acceso inaccesible. Por lo tanto, los intentos de pasar un
+ URI <code>file://</code> activan una
+ <code>FileUriExposedException</code>. La manera recomendada para compartir el
+ contenido de un archivo privado consiste en utilizar el {@link
+ android.support.v4.content.FileProvider}.
+ </li>
+ <li>
+ El {@link android.app.DownloadManager} ya no puede compartir archivos
+ almacenados de manera privada por nombre de archivo. Las aplicaciones heredadas pueden terminar con una
+ ruta de acceso inaccesible cuando acceden a {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Las aplicaciones orientadas a
+ Android N o versiones posteriores activan una {@link java.lang.SecurityException} cuando
+ intentan acceder a
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
+ Las aplicaciones heredadas que establecen la ubicación de descarga en una ubicación pública
+ usando
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+ DownloadManager.Request.setDestinationInExternalFilesDir()} o
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+ DownloadManager.Request.setDestinationInExternalPublicDir()}
+ siguen teniendo acceso a la ruta de acceso en
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}; sin embargo, se desaconseja
+ seguir este método. El método preferido para acceder a un archivo
+ expuesto por el{@link android.app.DownloadManager} consiste en utilizar
+ {@link android.content.ContentResolver#openFileDescriptor
+ ContentResolver.openFileDescriptor()}.
+ </li>
+</ul>
+
+<h2 id="sharing-files">Intercambio de archivos entre aplicaciones</h2>
+
+<p>
+En las aplicaciones orientadas a Android N, el framework de Android aplica
+la política de la API {@link android.os.StrictMode} que prohíbe exponer URI {@code file://}
+fuera de la aplicación. Si una intent con un URI de archivo sale de tu aplicación, la aplicación falla
+con una excepción {@code FileUriExposedException}.
+</p>
+
+<p>
+Para compartir archivos entre aplicaciones, debes enviar un URI {@code content://}
+y otorgar un permiso de acceso temporal en el URI. La forma más sencilla de otorgar este permiso es
+utilizando la clase {@link android.support.v4.content.FileProvider}. Para obtener más información
+sobre permisos e intercambio de archivos,
+consulta <a href="{@docRoot}training/secure-file-sharing/index.html">Intercambio de archivos</a>.
+</p>
+
+<h2 id="accessibility">Mejoras de accesibilidad</h2>
+
+<p>
+ En Android N, se incluyen cambios destinados a mejorar la usabilidad de la
+ plataforma para usuarios con defectos o discapacidades visuales. Estos cambios
+ generalmente no deben exigir modificaciones en el código de tu aplicación. Sin embargo, debes revisar
+ estas funciones y probarlas con tu aplicación para avaluar el posible impacto en la experiencia
+ del usuario.
+</p>
+
+
+<h3 id="screen-zoom">Zoom de la pantalla</h3>
+
+<p>
+ Android N permite a los usuarios configurar <strong>Display size</strong>, el ajuste que expande
+ o contrae todos los elementos de la pantalla, lo cual mejora la accesibilidad al dispositivo
+ para usuarios con poca visión. Estos no podrán superar el valor de zoom
+ mínimo de <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
+ sw320dp</a> para el ancho de pantalla, que es el ancho de un Nexus 4, un teléfono común de tamaño intermedio.
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>Figura 3:</strong> En la pantalla de la derecha se muestra el efecto que tiene
+ aumentar Display size para un dispositivo con una imagen de sistema de Android N.
+</p>
+
+
+<p>
+ Al cambiar la densidad del dispositivo, el sistema notifica a las aplicaciones de las
+ siguientes maneras:
+</p>
+
+<ul>
+ <li>Si una aplicación se orienta hacia el nivel de API 23 o uno inferior, el sistema automáticamente finaliza
+ todos los procesos en segundo plano. Esto significa que, si un usuario hace a un lado
+ dicha aplicación para abrir la pantalla <em>Settings</em> y cambiar la configuración de
+ <strong>Display size</strong>, el sistema finalizará la aplicación tal
+ como lo haría en una situación de bajos recursos de memoria. Si en la aplicación hay procesos en
+ primer plano, el sistema notifica a estos procesos el cambio en la configuración como se
+ indica en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Manejo de cambios
+ en tiempo de ejecución</a>, así como lo haría si cambiara la orientación del dispositivo.
+ </li>
+
+ <li>Si una aplicación se orienta hacia Android N, se notifica a todos los procesos
+ (en primer y segundo plano) el cambio en la configuración, como se
+ indica en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Manejo de cambios
+ en tiempo de ejecución</a>.
+ </li>
+</ul>
+
+<p>
+ En la mayoría de las aplicaciones, no se necesitan cambios para admitir esta función, si
+ en ellas se siguen las prácticas recomendadas de Android. Verificaciones específicas que deben realizarse:
+</p>
+
+<ul>
+ <li>Prueba tu aplicación en un dispositivo con ancho de pantalla <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
+ y asegúrate de que funcione bien.
+ </li>
+
+ <li>Cuando se modifique la configuración del dispositivo, actualiza la información almacenada en caché que
+ dependa de la densidad, como los mapas de bits o recursos almacenados en caché que se carguen desde la
+ red. Busca de cambios en la configuración cuando se reanude la actividad de la aplicación, después de la
+ pausa.
+ <p class="note">
+ <strong>Nota:</strong> Si almacenaste en caché datos que dependen de la configuración, te
+ convendrá incluir metadatos relacionados, como el tamaño de pantalla
+ correspondiente o la densidad de píxeles para dichos datos. Guardar estos metadatos te permite
+ decidir si necesitas actualizar los datos almacenados en caché después de un cambio en la
+ configuración.
+ </p>
+ </li>
+
+ <li>Evita especificar dimensiones con unidades px, ya que no responden a la
+ densidad de pantalla. En lugar de ello, recurre a unidades de <a href="{@docRoot}guide/practices/screens_support.html">píxeles
+ (<code>dp</code>) independientes de la densidad</a>.
+ </li>
+</ul>
+
+<h3 id="vision-settings">Vision Settings en el asistente de configuración</h3>
+
+<p>
+ Vision Settings se incluye en la pantalla de Bienvenida de Android N, en la cual los usuarios pueden
+ configurar los siguientes ajustes de accesibilidad para un nuevo dispositivo:
+ <strong>Magnification gesture</strong>, <strong>Font size</strong>,
+ <strong>Display size</strong> y <strong>TalkBack</strong>. Este cambio
+ aumenta la visibilidad de errores relacionados con diferentes ajustes de pantalla. Para
+ evaluar el impacto de esta función, debes probar tus aplicaciones con estos
+ ajustes habilitados. Puedes encontrarlos en <strong>Settings >
+ Accessibility</strong>.
+</p>
+
+<h2 id="ndk">Aplicaciones del NDK con vínculos a bibliotecas de plataformas</h2>
+
+<p>
+ En Android N, se incluyen cambios en el espacio de nombres a fin de evitar la carga de API no públicas.
+ Si usas el NDK, solo debes emplear API públicas de la plataforma de
+ Android. El uso de API no públicas en la próxima versión oficial de Android
+ puede hacer que tu aplicación se bloquee.
+</p>
+
+<p>
+ Con el propósito de alertarte sobre el uso de API no públicas, las aplicaciones que funcionen en un dispositivo con
+ Android N producirán un error de salida de logcat cuando una de ellas llame a una API no pública.
+ Este error también aparecerá en la pantalla del dispositivo como un mensaje para ayudar a
+ generar conciencia respecto de la situación. Debes revisar el código de tu aplicación para
+ quitar el uso de API de plataformas no públicas y probar por completo tus aplicaciones con
+ un dispositivo de prueba o emulador.
+</p>
+
+<p>
+ Si tu aplicación depende de bibliotecas de plataformas, consulta la documentación sobre el NDK a fin de hallar
+ soluciones típicas para el reemplazo de API privadas comunes por API públicas equivalentes.
+ También es posible que establezcas vínculos con bibliotecas de plataformas sin notarlo,
+ en especial si tu aplicación usa una biblioteca que forma parte de la plataforma (como
+ <code>libpng</code>), pero no del NDK. En ese caso, asegúrate de que
+ tu APK contenga todos los archivos .so con los cuales intentaste establecer vínculos.
+</p>
+
+<p class="caution">
+ <strong>Advertencia:</strong> Algunas bibliotecas de terceros pueden establecer vínculos con API
+ no públicas. Si tu aplicación usa estas bibliotecas, es probable que se bloquee al ejecutarse
+ en la próxima versión oficial de Android.
+</p>
+
+<p>
+ Las aplicaciones no deben depender de bibliotecas nativas no incluidas en el NDK
+ ni usarlas, ya que pueden modificarse o eliminarse en la transición de una versión de Android a
+ otra. El cambio de OpenSSL a BoringSSL es un ejemplo de modificaciones como esta.
+ A su vez, los diferentes dispositivos pueden ofrecer distintos niveles de compatibilidad, debido a que
+ no existen requisitos de compatibilidad para bibliotecas de plataformas no incluidas
+ en el NDK. Si debes acceder a bibliotecas no relacionadas con el NDK en dispositivos anteriores, haz que la
+ carga dependa del nivel de la API de Android.
+</p>
+
+<p>
+ Para ayudarte a diagnosticar estos tipos de problemas, a continuación, se ofrecen ejemplos de errores de Java y
+ del NDK que podrías hallar al intentar compilar tu aplicación con Android N:
+</p>
+
+<p>Ejemplo de error de Java:</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>Ejemplo de error de NDK:</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ Aquí se ofrecen soluciones típicas para aplicaciones en las que se produzcan estos tipos de errores:
+</p>
+
+<ul>
+ <li>getJavaVM y getJNIEnv de libandroid_runtime.so pueden reemplazarse
+ por funciones estándares de JNI:
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>El símbolo {@code property_get} de {@code libcutils.so} puede
+ reemplazarse por la API pública {@code alternative __system_property_get}.
+ Para hacerlo, usa {@code __system_property_get} con el siguiente elemento include:
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>El símbolo {@code SSL_ctrl} de {@code libcrypto.so} debe
+ reemplazarse por una versión local de la aplicación. Por ejemplo, debes establecer un vínculo estático de
+ {@code libcyrpto.a} en tu archivo {@code .so} o incluir un vínculo dinámico propio de
+ {@code libcrypto.so} de BoringSSL u OpenSSL en tu aplicación.
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N contiene cambios para aplicaciones orientadas a Android for Work, entre los que se incluyen
+ modificaciones en la instalación de certificados, el restablecimiento de contraseñas, la gestión de usuarios
+ secundarios y el acceso a identificadores de dispositivos. Si creas aplicaciones para entornos de
+ Android for Work, debes estudiar estos cambios y modificar
+ tu aplicación según corresponda.
+</p>
+
+<ul>
+ <li>Debes usar un instalador de certificados delegados para que el controlador de políticas de dispositivos (DPC) pueda
+ configurarlo. Para aplicaciones de propietarios de perfiles y de dispositivos orientadas al SDK de Android N, debes
+ usar el instalador de certificados delegados para que el
+ DPC llame a
+ <code>DevicePolicyManager.setCertInstallerPackage()</code>. Si el instalador
+ no está instalado de antemano, el sistema emite una
+ <code>IllegalArgumentException</code>.
+ </li>
+
+ <li>Las restricciones de restablecimiento de contraseñas para administradores de dispositivos ahora se aplican a los propietarios de
+ perfiles. Los administradores de dispositivos ya no pueden usar
+ {@code DevicePolicyManager.resetPassword()} para borrar contraseñas ni modificar
+ las que ya están establecidas. No obstante, pueden establecer una contraseña, aunque solo
+ cuando el dispositivo no tiene contraseña, PIN ni patrón.
+ </li>
+
+ <li>Los propietarios de dispositivos y perfiles pueden administrar cuentas aun cuando haya
+ restricciones. Tienen la posibilidad de llamar a las API de administración de cuentas
+ incluso al haber restricciones <code>DISALLOW_MODIFY_ACCOUNTS</code> para el usuario.
+ </li>
+
+ <li>Los propietarios de dispositivos pueden administrar usuarios secundarios de manera más sencilla. Cuando un dispositivo
+ funciona en el modo de propietario de dispositivo, automáticamente se establece la restricción <code>DISALLOW_ADD_USER</code>
+. Esto evita que los usuarios creen usuarios secundarios no
+ administrados. A su vez, los métodos <code>CreateUser()</code> y
+ <code>createAndInitializeUser()</code> han sido dados de baja; los reemplaza el nuevo método
+ <code>DevicePolicyManager.createAndManageUser()</code>.
+ </li>
+
+ <li>Los propietarios de dispositivos pueden acceder a identificadores de dispositivos. Tienen la posibilidad de acceder a la
+ dirección MAC de Wi-Fi de un dispositivo a través de
+ <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Si nunca se habilitó la función Wi-Fi
+ en el dispositivo, este método devuelve un valor {@code null}.
+ </li>
+
+ <li>La configuración Work Mode controla el acceso a las aplicaciones de trabajo. Cuando este ajuste está desactivado, el
+ launcher del sistema indica que las aplicaciones de trabajo no están disponibles atenuándolas. Para volver
+ a restaurar el comportamiento normal, habilita el modo de trabajo nuevamente.
+</ul>
+
+<p>
+ Para obtener más información sobre los cambios de Android for Work en Android N, consulta
+ <a href="{@docRoot}preview/features/afw.html">Actualizaciones de Android for Work</a>.
+</p>
+
+<h2 id="annotations">Retención de anotaciones</h2>
+
+<p>
+Android N soluciona un error por el cual la visibilidad de las anotaciones se había ignorado.
+Este problema permitió que el tiempo de ejecución accediera a anotaciones a las que no debía
+tener acceso. Entre estas anotaciones se incluyen las siguientes:
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}: destinada a ser visible solo en el momento de compilación.</li>
+ <li>{@code VISIBILITY_SYSTEM}: destinada a ser visible en el tiempo de ejecución, pero únicamente al
+ sistema subyacente.</li>
+</ul>
+
+<p>
+Si tu aplicación se basa en este comportamiento, agrega una política de retención para las anotaciones que deben
+estar disponibles en el tiempo de ejecución. Para ello, usa {@code @Retention(RetentionPolicy.RUNTIME)}.
+</p>
+
+<h2 id="other">Otros aspectos importantes</h2>
+
+<ul>
+<li>Cuando una aplicación funcione en Android N, pero esté orientada a un nivel de API inferior,
+y el usuario modifique el tamaño de pantalla, el proceso de la aplicación finalizará. La aplicación
+debe tener capacidad para manejar correctamente esta situación. De lo contrario, se bloqueará
+cuando el usuario la restaure desde Recents.
+
+<p>
+Debes probar tu aplicación para controlar que no tenga lugar
+este comportamiento.
+Puedes hacerlo produciendo un error idéntico
+al finalizarla manualmente a través del panel DDMS.
+</p>
+
+<p>
+Las aplicaciones orientadas a Android N y versiones posteriores no finalizarán automáticamente por cambios en la densidad;
+sin embargo, es posible que respondan en forma deficiente a los cambios en la configuración.
+</p>
+</li>
+
+<li>
+En Android N, las aplicaciones deben tener capacidad para manejar correctamente los cambios de configuración
+y no deben bloquearse durante inicios posteriores. Puedes verificar el comportamiento de las aplicaciones
+modificando el tamaño de la fuente (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>) y restaurándolas
+desde Recents.
+</li>
+
+<li>
+Debido a un error en versiones anteriores de Android, el sistema no indicaba la escritura
+a un socket del TCP en el subproceso principal como una violación del modo strict. En Android N, se corrige este error.
+Las aplicaciones que tienen este comportamiento, ahora emiten una {@code android.os.NetworkOnMainThreadException}.
+Generalmente, realizar operaciones de red en el subproceso principal no es una buena idea porque estas operaciones
+suelen tener una latencia alta de cola que genera mensajes que indican que la aplicación no responde y bloqueos.
+</li>
+
+<li>
+De manea predeterminada, la familia de métodos {@code Debug.startMethodTracing()} ahora
+almacena los resultados en el directorio específico del paquete en el almacenamiento compartido,
+en lugar de hacerlo en el nivel superior
+de la tarjeta SD. Esto significa que las aplicaciones ya no tienen que solicitar el permiso {@code WRITE_EXTERNAL_STORAGE} para usar estas API.
+</li>
+
+<li>
+Muchas API de la plataforma han comenzado a controlar en busca del envío de cargas grandes
+a través de transacciones {@link android.os.Binder}. Además, el
+sistema ahora vuelve a emitir {@code TransactionTooLargeExceptions}
+como {@code RuntimeExceptions}, en lugar de registrarlas o suprimirlas silenciosamente. Un
+ejemplo común es almacenar demasiados datos en
+{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
+ lo que hace que {@code ActivityThread.StopInfo} emita una
+{@code RuntimeException} cuando la aplicación se orienta a Android N.
+</li>
+
+<li>
+Si una aplicación publica tareas {@link java.lang.Runnable} en una {@link android.view.View}, y
+la {@link android.view.View}
+no está anexada a una ventana, el sistema
+pone en cola la tarea {@link java.lang.Runnable} con la {@link android.view.View}.
+La tarea {@link java.lang.Runnable} no se ejecuta hasta que la
+{@link android.view.View} esté anexada
+a una ventana. Este comportamiento soluciona los siguientes errores:
+<ul>
+ <li>Si una aplicación publicaba una {@link android.view.View} desde un subproceso que no fuera el subproceso de la IU
+ de la ventana prevista, la tarea {@link java.lang.Runnable} podía ejecutarse en el subproceso incorrecto.
+ </li>
+ <li>Si la tarea {@link java.lang.Runnable} se publicaba desde un subproceso que no fuera
+ un subproceso de looper, la aplicación podía exponer la terea {@link java.lang.Runnable}.</li>
+</ul>
+</li>
+
+<li>
+Si una aplicación en Android N con el permiso
+{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
+intentaba borrar un paquete instalado por otra aplicación,
+el sistema solicitaba la confirmación del usuario. En este escenario, las aplicaciones debían esperar recibir el estado
+{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
+al invocar
+{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
+</li>
+
+</ul>
+
diff --git a/docs/html-intl/intl/es/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/es/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..6461b54
--- /dev/null
+++ b/docs/html-intl/intl/es/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=Ejemplos
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ Los siguientes ejemplos de código se proporcionan para Android N. Para
+ descargarlos en Android Studio, selecciona la opción de menú <b>File > Import
+ Samples</b>.
+</p>
+
+<p class="note">
+ <strong>Nota:</strong> Estos proyectos que se pueden descargar están diseñados
+ para su uso con Gradle y Android Studio.
+</p>
+
+
+<h3 id="mw">“Área de juegos” de ventanas múltiples</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ En este ejemplo se muestra la manera de aprovechar interfaces de usuario
+ de ventanas múltiples con tu aplicación.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+Obtener en GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">Notificaciones activas</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Este es un ejemplo preexistente en el cual se muestra un servicio simple que envía
+ notificaciones con NotificationCompat. Cada conversación no leída
+ se envía como una notificación diferente.
+</p>
+<p>
+ Este ejemplo se actualizó para aprovechar nuevas funciones de notificación
+ disponibles en Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+Obtener en GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">Servicio de mensajería</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ Este es un ejemplo preexistente en el que se demuestra la manera de usar
+ NotificationManager para indicar la cantidad de notificaciones que se aparecen actualmente en una
+ aplicación.
+</p>
+<p>
+ Este ejemplo se actualizó para aprovechar nuevas funciones de notificación
+ disponibles en Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+Obtener en GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">Inicio directo</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ En este ejemplo se demuestra la manera de almacenar datos, y de acceder a ellos, en un medio de almacenamiento encriptado por
+ dispositivo que esté siempre disponible mientras el dispositivo se haya iniciado.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+Obtener en GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">Acceso a directorios determinados</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ En este ejemplo se demuestra la manera de leer y escribir datos de
+ directorios específicos y, al mismo tiempo, evitar más permisos.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+Obtener en GitHub</a>
+</p>
diff --git a/docs/html-intl/intl/es/about/versions/nougat/android-7.0-testing.jd b/docs/html-intl/intl/es/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..20d2d6e
--- /dev/null
+++ b/docs/html-intl/intl/es/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Guía de prueba
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>En este documento</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Prueba de los permisos</a></li>
+ <li><a href="#doze-standby">Prueba de los modos Descanso y App Standby</a></li>
+ <li><a href="#ids">Copia de seguridad automática e identificadores de dispositivos</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N te brinda la oportunidad de garantizar que tus aplicaciones funcionen con la próxima versión de la plataforma.
+ Esta versión preliminar incluye diversas API y cambios en los comportamientos que pueden
+tener impactos en tu aplicación, como se describe en las secciones <a href="{@docRoot}preview/api-overview.html">Información general de la API</a> y <a href="{@docRoot}preview/behavior-changes.html">Cambios en los comportamientos</a>.
+ Al probar tu aplicación con la versión preliminar, te debes centrar en algunos cambios específicos del sistema para garantizar que los usuarios disfruten de una buena experiencia.
+
+
+</p>
+
+<p>
+ En esta guía, se describen qué y cómo probar las características preliminares con tu aplicación. Debes priorizar la prueba de estas características específicas preliminares, puesto que podrían tener un alto impacto en el comportamiento de tu aplicación:
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Permisos</a>
+ </li>
+ <li><a href="#doze-standby">Modos Descanso y App Standby</a>
+ </li>
+ <li><a href="#ids">Copia de seguridad automática e identificadores de dispositivos</a></li>
+</ul>
+
+<p>
+ Para obtener más información sobre cómo configurar dispositivos o dispositivos virtuales con una imagen
+ del sistema de la versión preliminar para realizar pruebas, consulta la sección <a href="{@docRoot}preview/setup-sdk.html">Configurar el SDK de Android N</a>.
+
+</p>
+
+
+<h2 id="runtime-permissions">Prueba de los permisos</h2>
+
+<p>
+ El nuevo modelo de <a href="{@docRoot}preview/features/runtime-permissions.html">permisos</a> cambia el modo en que el usuario asigna permisos a tu aplicación.
+ En lugar de conceder todos los permisos durante el procedimiento de instalación, tu aplicación debe solicitar al usuario los permisos individuales en el tiempo de ejecución.
+
+ Para los usuarios, este comportamiento ofrece más control granular sobre las actividades de cada aplicación, así como un mejor contexto para comprender por qué la aplicación está solicitando un permiso específico.
+ Los usuarios pueden conceder o revocar los permisos concedidos a una aplicación de forma individual en cualquier momento.
+ Es muy probable que esta característica de la versión preliminar tenga un impacto en el comportamiento de tu aplicación y puede hacer que algunas características de tu aplicación no funcionen o funcionen en un estado degradado.
+
+
+</p>
+
+<p class="caution">
+ Este cambio afecta a todas las aplicaciones que se ejecutan en la nueva plataforma, incluso a aquellas que no tienen como destino la nueva versión de la plataforma.
+ La plataforma ofrece un comportamiento de compatibilidad limitada para las aplicaciones heredadas, pero debes comenzar a planificar ahora la migración de tu aplicación al nuevo modelo de permisos, con el objetivo de publicar una versión actualizada de tu aplicación cuando se lance la plataforma oficial.
+
+
+</p>
+
+
+<h3 id="permission-test-tips">Tips para pruebas</h3>
+
+<p>
+ Usa los siguientes tips para pruebas como ayuda para planificar y ejecutar las pruebas de tu aplicación con el nuevo comportamiento de permisos.
+
+</p>
+
+<ul>
+ <li>Identifica los permisos actuales de tu aplicación y las rutas de códigos relacionadas.</li>
+ <li>Prueba los flujos del usuario en los datos y servicios protegidos por permisos.</li>
+ <li>Realiza pruebas con varias combinaciones de permisos concedidos/revocados.</li>
+ <li>Usa la herramienta {@code adb} para administrar permisos desde la línea de comando:
+ <ul>
+ <li>Enumera los permisos y estados por grupo:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Concede o revoca un permiso o más permisos utilizando la siguiente sintaxis:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analiza tu aplicación para detectar servicios que utilizan permisos.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Estrategia de prueba</h3>
+
+<p>
+ El cambio en los permisos afecta la estructura y el diseño de tu aplicación, además de la experiencia del usuario y los flujos que proporcionas a los usuarios.
+ Debes evaluar el uso de los permisos actuales de tu aplicación y comenzar a planificar los nuevos flujos que deseas ofrecer.
+ La versión oficial de la plataforma proporciona un comportamiento de compatibilidad, pero debes prever la actualización de tu aplicación y no depender de estos comportamientos.
+
+
+</p>
+
+<p>
+ Identifica los permisos que tu aplicación verdaderamente necesita y utiliza, y luego busca las diversas rutas de códigos que utilizan los servicios protegidos por permisos.
+ Puedes realizar esto mediante una combinación de pruebas en la plataforma nueva y análisis de códigos.
+ Al realizar las pruebas, debes centrarte en
+ incluir permisos de tiempo de ejecución cambiando {@code targetSdkVersion} de la aplicación a la versión preliminar. Para
+ obtener más información, consulta la sección <a href="{@docRoot}preview/setup-sdk.html#">Configurar el SDK de Android N</a>.
+
+</p>
+
+<p>
+ Realiza pruebas con diversas combinaciones de permisos revocados y agregados, a fin de destacar los flujos del usuario que dependen de permisos.
+ Cuando una dependencia no sea obvia ni lógica, debes considerar la opción de refactorizar o compartimentar ese flujo para eliminar la dependencia o aclarar por qué se necesita el permiso.
+
+
+</p>
+
+<p>
+ Para obtener más información sobre el comportamiento de los permisos de tiempo de ejecución, las pruebas y las mejores prácticas, consulta la página <a href="{@docRoot}preview/features/runtime-permissions.html">Permisos</a> de la versión preliminar para desarrolladores.
+
+
+</p>
+
+
+<h2 id="doze-standby">Prueba de los modos Descanso y App Standby</h2>
+
+<p>
+ Las características de ahorro de energía de los modos Descanso y App Standby limitan la cantidad de procesamiento en segundo plano que puede realizar tu aplicación cuando un dispositivo se encuentra en estado inactivo o mientras tu aplicación no está en foco.
+ Entre las restricciones que el sistema puede imponer en las aplicaciones se incluyen el acceso limitado a la red o denegación de acceso, suspensión de las tareas en segundo plano, suspensión de notificaciones, y alarmas y solicitudes de reactivación ignoradas.
+
+ Para garantizar que tu aplicación tenga un comportamiento correcto con estas optimizaciones de ahorro de energía, debes probar tu aplicación simulando estos estados de bajo consumo.
+
+
+</p>
+
+<h4 id="doze">Cómo probar la aplicación en modo Descanso</h4>
+
+<p>Para probar el modo Descanso con tu aplicación, realiza lo siguiente:</p>
+
+<ol>
+<li>Configura un dispositivo de hardware o un dispositivo virtual con una imagen del sistema Android N.</li>
+<li>Conecta el dispositivo a tu equipo de desarrollo e instala tu aplicación.</li>
+<li>Ejecuta tu aplicación y déjala activa.</li>
+<li>Simula la activación del modo Descanso en el dispositivo ejecutando los siguientes comandos:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Observa el comportamiento de tu aplicación cuando se reactive el dispositivo. Asegúrate de que se recupere correctamente cuando el dispositivo salga del modo Descanso.
+</li>
+</ol>
+
+
+<h4 id="standby">Cómo probar aplicaciones en modo App Standby</h4>
+
+<p>Para probar el modo App Standby con tu aplicación, realiza lo siguiente:</p>
+
+<ol>
+ <li>Configura un dispositivo de hardware o un dispositivo virtual con una imagen del sistema Android N.</li>
+ <li>Conecta el dispositivo a tu equipo de desarrollo e instala tu aplicación.</li>
+ <li>Ejecuta tu aplicación y déjala activa.</li>
+ <li>Simula la activación del modo App Standby en la aplicación ejecutando los siguientes comandos:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simula la activación de tu aplicación con el siguiente comando:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Observa el comportamiento de tu aplicación al reactivarse. Asegúrate de que se recupere correctamente del modo App Standby.
+ En particular, debes comprobar si los trabajos en segundo plano y las notificaciones de tu aplicación continúan funcionando de la manera esperada.
+</li>
+</ol>
+
+<h2 id="ids">Copia de seguridad automática para aplicaciones e identificadores específicos del dispositivo</h2>
+
+<p>Si tu aplicación continúa teniendo algún identificador específico del dispositivo, como la Id. de registro de Google Cloud Messaging, en el almacenamiento interno, asegúrate de seguir las mejores prácticas para excluir la ubicación de almacenamiento de la copia de seguridad automática, como se describe en la sección <a href="{@docRoot}preview/backup/index.html">Copia de seguridad automática para aplicaciones</a>.
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/es/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/es/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..97bf2f1
--- /dev/null
+++ b/docs/html-intl/intl/es/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1039 @@
+page.title=Android N for Developers
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>Funciones claves para desarrolladores</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">Compatibilidad con ventanas múltiples</a></li>
+ <li><a href="#notification_enhancements">Notificaciones</a></li>
+ <li><a href="#jit_aot">Compilación de JIT y AOT</a></li>
+ <li><a href="#quick_path_to_app_install">Acceso rápido a la instalación de aplicaciones</a></li>
+ <li><a href="#doze_on_the_go">Descanso en movimiento</a></li>
+ <li><a href="#background_optimizations">Optimizaciones en segundo plano</a></li>
+ <li><a href="#data_saver">Ahorro de datos</a></li>
+ <li><a href="#vulkan">API Vulkan</a></li>
+ <li><a href="#tile_api">API para mosaicos de Quick Settings</a></li>
+ <li><a href="#number-blocking">Bloqueo de números</a></li>
+ <li><a href="#call_screening">Filtración de llamadas</a></li>
+ <li><a href="#multi-locale_languages">Configuraciones regionales e idiomas</a></li>
+ <li><a href="#emoji">Nuevos emojis</a></li>
+ <li><a href="#icu4">API de ICU4J en Android</a></li>
+ <li><a href="#gles_32">API de OpenGL ES 3.2</a></li>
+ <li><a href="#android_tv_recording">Grabación de Android TV</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">Accesibilidad</a></li>
+ <li><a href="#direct_boot">Inicio directo</a></li>
+ <li><a href="#key_attestation">Atestación de claves</a></li>
+ <li><a href="#network_security_config">Configuración de seguridad de la red</a></li>
+ <li><a href="#default_trusted_ca">CA de confianza predeterminada</a></li>
+ <li><a href="#apk_signature_v2">Esquema de firma de APK v2</a></li>
+ <li><a href="#scoped_directory_access">Acceso a directorios determinados</a></li>
+ <li><a href="#keyboard_shortcuts_helper">Ayuda en los métodos abreviados del teclado</a></li>
+ <li><a href="#sustained_performance_api">API de rendimiento sostenido</a></li>
+ <li><a href="#vr">Soporte de RV</a></li>
+ <li><a href="#print_svc">Mejoras del servicio de impresión</a></li>
+ <li><a href="#virtual_files">Archivos virtuales</a></li>
+ <li><a href="#framemetrics_api">API FrameMetricsListener</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N aún se encuentra en proceso activo de desarrollo, pero puedes probarlo
+ahora como parte de la N Developer Preview. En las secciones siguientes se destacan algunas de
+las nuevas funciones para desarrolladores. </p>
+
+<p>
+ Asegúrate de ver los <a href="{@docRoot}preview/behavior-changes.html">Cambios de comportamiento</a> para obtener información sobre
+ áreas en las cuales los cambios en las plataformas puedan tener efecto en tus aplicaciones, consultar las
+ guías del desarrollador para conocer mejor las funciones claves y descargar la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia de la API</a> para obtener información sobre
+ API nuevas.
+</p>
+
+<h2 id="multi-window_support">Compatibilidad con ventanas múltiples</h2>
+
+
+<p>En Android N, presentamos una nueva y muy solicitada función multitarea
+en la plataforma: la compatibilidad con ventanas múltiples. </p>
+
+ <p>Los usuarios ahora pueden abrir dos aplicaciones al mismo tiempo en la pantalla. </p>
+ <ul>
+ <li>En teléfonos y tabletas
+con Android N, los usuarios pueden ejecutar dos aplicaciones en paralelo
+una encima otra en el modo de pantalla dividida. También tienen la posibilidad de modificar el tamaño de las aplicaciones arrastrando
+la línea divisoria que se encuentra entre ellas. </li>
+
+<li>En los dispositivos con Android TV, las aplicaciones pueden habilitar en forma automática el <a href="{@docRoot}preview/features/picture-in-picture.html">modo
+"picture-in-picture"</a>. Esto les permite continuar mostrando contenido mientras el usuario explora otras
+aplicaciones o interactúa con ellas.</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>Figura 1:</strong> Aplicaciones en ejecución en el modo de pantalla dividida.
+</p>
+
+ </div>
+
+<p>En las tabletas, en particular, y en otros dispositivos de pantallas más grandes, la compatibilidad con ventanas múltiples
+ofrece nuevas maneras de atraer a los usuarios Puedes, habilitar acciones de arrastrar y soltar en
+tu aplicación para que los usuarios arrastren contenido hacia tu aplicación —o desde ella; es una excelente
+manera de mejorar su experiencia. </p>
+
+<p>Es sencillo agregar compatibilidad con ventanas múltiples a tu aplicación y configurar la manera en que
+administra la visualización de estas ventanas. Por ejemplo, puedes especificar las dimensiones mínimas
+permitidas de tu actividad y evitar así que los usuarios den a la actividad un
+tamaño inferior. También puedes inhabilitar la visualización de ventanas múltiples para tu aplicación, lo que
+ garantiza que el sistema solo muestre tu aplicación en modo de pantalla completa.</p>
+
+<p>
+ Para obtener más información, consulta la documentación <a href="{@docRoot}preview/features/multi-window.html">Compatibilidad con ventanas múltiples</a>
+ para desarrolladores.
+</p>
+
+<h2 id="notification_enhancements">Mejoras en las notificaciones</h2>
+
+<p>En Android N, hemos rediseñado las notificaciones para facilitar y agilizar su
+uso. Entre los cambios, se incluyen los siguientes:</p>
+
+<ul>
+ <li>
+ <strong>Actualizaciones de plantillas</strong>: estamos actualizando las plantillas de notificaciones para
+ poner nuevo énfasis en la imagen de héroe y el avatar. Los desarrolladores podrán
+ aprovechar las nuevas plantillas con una cantidad mínima de ajustes en el código.
+ </li>
+
+ <li>
+ <strong>Personalización del estilo de mensaje</strong>: puedes personalizar más etiquetas
+ de la interfaz de usuario asociadas con tus notificaciones utilizando la clase
+ <code>MessageStyle</code>. Puedes configurar el mensaje, el título de
+ la conversación y la vista del contenido.
+ </li>
+
+ <li>
+ <strong>Notificaciones agrupadas</strong>: el sistema puede agrupar mensajes
+ (por ejemplo, por tema) y mostrar el grupo. Un usuario puede
+ aplicar acciones, como Dismiss o Archive, en ellos. Si
+ has implementado notificaciones para Android Wear, ya estarás familiarizado con
+ este modelo.
+ </li>
+
+ <li>
+ <strong>Respuesta directa</strong>: en el caso de las aplicaciones de comunicación en tiempo real, el
+ sistema de Android admite respuestas en línea para que los usuarios puedan responder rápidamente a
+ un mensaje SMS o de texto directamente dentro en la interfaz de notificaciones.
+ </li>
+
+ <li>
+ <strong>Vistas personalizadas</strong>: dos API nuevas te permiten aprovechar las decoraciones
+ del sistema, como los encabezados y las acciones de notificaciones, al usar vistas
+ personalizadas en las notificaciones.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>Figura 2:</strong> Notificaciones agrupadas y respuesta directa.
+</p>
+
+<p>Para obtener información acerca de cómo implementar las nuevas funciones, consulta la guía
+ <a href="{@docRoot}preview/features/notification-updates.html">Notificaciones</a>.
+</p>
+
+
+
+<h2 id="jit_aot">Compilación de JIT y AOT guiada por perfiles</h2>
+
+<p>En Android N, agregamos un compilador Just in Time (JIT) con generación de perfiles de código para
+ART, lo cual te permite mejorar constantemente el rendimiento de las aplicaciones con Android mientras se
+ejecutan. El compilador JIT complementa el compilador Ahead of Time (AOT) actual de ART
+y permite mejorar el rendimiento del tiempo de ejecución, ahorrar espacio de almacenamiento y acelerar las actualizaciones
+de aplicaciones y del sistema.</p>
+
+<p>La compilación guiada por perfiles permite que ART maneje la compilación de AOT y JIT de cada aplicación
+conforme a su uso real, además de las condiciones en el dispositivo. Por
+ejemplo, ART conserva un perfil de los métodos directos de cada aplicación, y puede compilar previamente
+y almacenar en caché dichos métodos para obtener el mejor rendimiento. A su vez, deja otras partes de la aplicación
+sin compilar hasta que se usan realmente.</p>
+
+<p>Además de mejorar el rendimiento de partes claves de la aplicación, la compilación guiada por
+perfiles permite reducir la superficie de memora RAM total de una aplicación, incluidos los archivos binarios
+asociados. Esta función tiene particular importancia en los dispositivos de memoria reducida.</p>
+
+<p>ART administra la compilación guiada por perfiles de una manera que minimiza el impacto en la batería
+del dispositivo. Realiza compilaciones previas únicamente cuando el dispositivo se encuentra inactivo y
+en proceso de carga, lo cual permite ahorrar tiempo y batería haciendo el trabajo de manera anticipada.</p>
+
+<h2 id="quick_path_to_app_install">Acceso rápido a la instalación de aplicaciones</h2>
+
+<p>Uno de los beneficios más palpables del compilador JIT de ART es la velocidad de instalación de las
+aplicaciones y de actualización del sistema. Incluso las aplicaciones de mayor tamaño, en las que se necesitaban varios minutos para la
+optimización y la instalación en Android 6.0, ahora pueden instalarse en cuestión de
+segundos. Las actualizaciones del sistema también son más rápidas, debido a que ya no hay un paso de optimización. </p>
+
+<h2 id="doze_on_the_go">Descanso en movimiento...</h2>
+
+<p>En Android 6.0, se presentó Descanso, un modo de sistema que ahorra batería aplazando
+actividades de CPU y red de las aplicaciones cuando el dispositivo se encuentra inactivo; por ejemplo, al hallarse
+sobre una mesa o en un cajón. </p>
+
+<p>Ahora, en Android N, el modo Descanso ofrece el beneficio adicional de ahorrar batería en movimiento.
+Siempre que la pantalla permanezca apagada durante un tiempo y el dispositivo esté desenchufado,
+Descanso aplicará un subconjunto de las restricciones de CPU y red conocidas a las aplicaciones.
+Esto significa que los usuarios pueden ahorrar batería aun cuando lleven sus dispositivos
+en los bolsillos.</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>Figura 3:</strong> Descanso ahora aplica
+ restricciones para prolongar la duración de la batería aun cuando el dispositivo no está quieto.
+</p>
+
+
+<p>Poco tiempo después de que la pantalla se apaga, cuando el dispositivo no está enchufado, Descanso
+restringe el acceso a la red y aplaza tareas y sincronizaciones. Durante períodos de mantenimiento
+breves, las aplicaciones tienen acceso a la red y se ejecutan todas las
+tareas y sincronizaciones aplazadas. Ten en cuenta que, cuando se activa la pantalla o se enchufa el dispositivo, se
+desactiva el modo Descanso.</p>
+
+<p>Cuando el dispositivo vuelve a estar quieto, desenchufado y con la pantalla apagada durante un
+tiempo, Descanso aplica todas las restricciones de CPU y redes en {@link
+android.os.PowerManager.WakeLock}, alarmas de {@link android.app.AlarmManager} y análisis de
+GPS o Wi-Fi.</p>
+
+<p>Las prácticas recomendadas para adaptar tu aplicación a Descanso no varían si el
+dispositivo estará en movimiento o no. Por lo tanto, si ya actualizaste tu aplicación para que administre
+Descanso correctamente, no tienes nada más que hacer. Si no lo hiciste, comienza a <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">adaptarla
+a Descanso</a> ahora.</p>
+
+<h2 id="background_optimizations">Project Svelte: Optimizaciones en segundo plano</h2>
+
+<p>Project Svelte representa un esfuerzo constante por minimizar el uso de memoria RAM a través del sistema y de las aplicaciones
+en los diferentes dispositivos Android del ecosistema. En Android N, el objetivo principal de Project
+Svelte es optimizar la manera en que las aplicaciones se ejecutan en segundo plano. </p>
+
+<p>El procesamiento en segundo plano es una parte esencial de la mayoría de las aplicaciones. Cuando se maneja en forma adecuada, puede
+hacer que la experiencia de tu usuario sea increíble —(inmediata, rápida y pertinente al contexto).
+Cuando no se maneja de tal manera, el procesamiento en segundo plano puede suponer un consumo innecesario de memoria RAM (y
+batería), y afectar el rendimiento del sistema para otras aplicaciones. </p>
+
+<p>A partir de Android 5.0, {@link android.app.job.JobScheduler} ha sido el
+método preferido para ejecutar tareas en segundo plano con resultados positivos
+para los usuarios. Las aplicaciones pueden programar tareas y, al mismo tiempo, permitir que el sistema se optimice según las condiciones de
+memoria, energía y conectividad. JobScheduler ofrece control y
+simpleza, y nuestro deseo es que todas las aplicaciones lo usen. </p>
+
+<p>
+ Otra buena opción es <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+ <code>GCMNetworkManager</code></a>, que forma parte de Google Play Services y
+ ofrece una capacidad similar de programación de tareas con compatibilidad en versiones heredadas de
+ Android.
+</p>
+
+<p>Continuaremos ampliando <code>JobScheduler</code> y
+<code>GCMNetworkManager</code> para que se apliquen a más
+casos de uso de tus aplicaciones; por ejemplo, en Android N ahora puedes programar procesos
+en segundo plano según los cambios de los proveedores de contenido. Al mismo tiempo, comenzaremos a
+dejar de usar algunos de los patrones anteriores que pueden reducir el rendimiento del sistema,
+en especial, en dispositivos de memoria reducida.</p>
+
+<p>En Android N, eliminaremos tres transmisiones implícitas que se usan normalmente —(
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} y {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}), ya que pueden activar los
+procesos en segundo plano de varias aplicaciones al mismo tiempo, y así exigir la memoria y la batería. Si
+tu aplicación recibe estas transmisiones, aprovecha la N Developer Preview y
+ realiza la migración a <code>JobScheduler</code> y las API relacionadas, como alternativa. </p>
+
+<p>
+ Para obtener información detallada, consulta la documentación <a href="{@docRoot}preview/features/background-optimization.html">Optimizaciones
+ en segundo plano</a>.
+</p>
+
+
+<h2 id="data_saver">Ahorro de datos</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>Figura 4:</strong> Ahorro de datos en la configuración.
+</p>
+ </div>
+
+<p>Durante la vida útil de un dispositivo móvil, el costo de un plan de datos móviles puede
+superar fácilmente el costo del propio dispositivo. Para muchos usuarios, los datos móviles son un
+recurso costoso que desean conservar. </p>
+
+<p>En Android N, se presenta el modo de ahorro de datos, un nuevo servicio del sistema que permite reducir
+el uso de datos móviles de las aplicaciones, ya sea con servicio de itinerancia, cerca del final del ciclo de facturación
+o con un paquete de datos prepagos. El ahorro de datos permite que los usuarios controlen la manera en que las aplicaciones
+usan los datos móviles y que los desarrolladores brinden un servicio más eficaz cuando el ahorro
+de datos se encuentra activo. </p>
+
+<p>Cuando un usuario habilita el ahorro de datos en <strong>Settings</strong> y el dispositivo está
+conectado a una red o, el sistema bloquea el uso de datos en segundo plano y ordena a las aplicaciones
+usar menos datos en primer plano siempre que sea posible (por ejemplo, limitando
+la tasa de bits para la transmisión, reduciendo la calidad de la imagen y aplazando el valor optimista de almacenamiento previo en caché,
+entre otras posibilidades). Los usuarios pueden incluir aplicaciones específicas en la lista blanca para
+permitir el uso de datos medidos en segundo plano, incluso cuando está activado el ahorro de datos.</p>
+
+<p>Android N extiende {@link android.net.ConnectivityManager} para que las aplicaciones
+tengan una manera de <a href="{@docRoot}preview/features/data-saver.html#status">recuperar las
+preferencias de ahorro de datos del usuario</a> y<a href="{@docRoot}preview/features/data-saver.html#monitor-changes"> monitorear
+cambios en estas</a>. Todas las aplicaciones deben verificar si el usuario habilitó el ahorro
+de datos e intentar limitar el uso de datos en primer y segundo plano.</p>
+
+
+<h2 id="vulkan">API Vulkan</h2>
+
+<p>
+ Android N integra <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>, una nueva API de visualización 3D, en la plataforma. Al igual que
+ <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
+ ES</a>, Vulkan es un estándar abierto para gráficos y visualización 3D, cuyo mantenimiento está a cargo de
+ Khronos Group.
+</p>
+
+<p>
+ Vulkan se diseñó desde el principio para minimizar la sobrecarga de CPU en el controlador,
+ y permite que tu aplicación controle el funcionamiento de la unidad de procesamiento de gráficos más directamente. También
+ hace posible contar con un mejor trabajo en paralelo, ya que permite que varios subprocesos diversos realicen
+ trabajos, como la construcción del búfer de comandos, a la vez.
+</p>
+
+<p>
+ Las herramientas y las bibliotecas de desarrollo de Vulkan son parte del NDK de Android. Esto
+incluye lo siguiente:
+</p>
+
+<ul>
+ <li>Encabezados
+ </li>
+
+ <li>Capas de validación (bibliotecas de depuración)
+ </li>
+
+ <li>Compilador SPIR-V
+ </li>
+
+ <li>Biblioteca de compilación de tiempo de ejecución de SPIR-V
+ </li>
+</ul>
+
+<p>
+ Vulkan solo está disponible en las aplicaciones en dispositivos con hardware compatible con Vulkan,
+ como Nexus 5X, Nexus 6P y Nexus Player. Estamos trabajando estrechamente con nuestros
+ socios para que Vulkan se pueda utilizar en más dispositivos lo más pronto posible.
+</p>
+
+<p>
+ Para obtener más información, consulta la <a href="{@docRoot}ndk/guides/graphics/index.html">documentación de la API</a>.
+</p>
+
+<h2 id="tile_api">API para mosaicos de Quick Settings</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>Figura 5:</strong> Mosaicos de Quick Settings del panel de notificaciones.
+</p>
+
+
+ </div><p>Quick Settings es una manera popular y simple de exhibir configuraciones y acciones claves
+directamente desde el panel de notificaciones. En Android N, expandimos el alcance de
+Quick Settings para que sea todavía más útil y práctico. </p>
+
+<p>Agregamos más espacio para mosaicos adicionales de Quick Settings, a los cuales los usuarios pueden
+acceder desde un área de visualización paginada deslizando el dedo hacia la izquierda o la derecha. También permitimos
+que los usuarios determinen los mosaicos de Quick Settings que aparecerán y los puntos en los cuales
+se mostrarán; pueden agregar o mover mosaicos con solo arrastrarlos y soltarlos. </p>
+
+<p>Para los desarrolladores, en Android N también se agrega una nueva API que les permite definir mosaicos de
+ Quick Settings propios para facilitar, dentro de sus aplicaciones, el acceso a controles y acciones claves por parte de los usuarios.</p>
+
+<p>
+ Los mosaicos de Quick Settings se reservan para controles o acciones que se necesiten
+ con urgencia o se usen con frecuencia; no deben emplearse como accesos directos para
+ iniciar una aplicación.
+</p>
+
+<p>
+ Una vez que hayas definido tus mosaicos, puedes dejarlos a disposición de los usuarios, quienes tendrán la posibilidad de agregarlos
+ a Quick Settings con solo arrastrarlos y soltarlos.
+</p>
+
+<p>
+ Para obtener información sobre la creación de un mosaico de aplicación, consulta la documentación de
+ <code>android.service.quicksettings.Tile</code> en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
+</p>
+
+
+
+<h2 id="number-blocking">Bloqueo de números</h2>
+
+<p>Android N ahora admite el bloqueo de números en la plataforma y proporciona una API
+de framework para que los proveedores de servicios dispongan de una lista con números bloqueados. La
+aplicación de SMS predeterminada, la aplicación telefónica predeterminada y las aplicaciones de proveedores tienen capacidad de lectura y
+escritura en la lista de números bloqueados. Otras aplicaciones no pueden acceder a la lista.</p>
+
+<p>Al hacer que el bloqueo de números sea una función estándar de la plataforma, Android permite que las
+aplicaciones admitan de manera uniforme el bloqueo de números en una amplia variedad de
+dispositivos. Entre los demás beneficios que pueden aprovechar las aplicaciones, se encuentran los siguientes:</p>
+
+<ul>
+ <li> Los números bloqueados en las llamadas también se bloquean en los mensajes de texto.
+ <li> Los números bloqueados pueden perdurar tras procesos de restablecimiento y cambios de dispositivos con la función Backup &
+Restore.
+ <li> Varias aplicaciones pueden usar la misma lista de números bloqueados.
+</ul>
+
+<p>De manera adicional, la integración de aplicaciones de proveedores a través de Android permite que estos
+lean la lista de números bloqueados del dispositivo y realicen un bloqueo de servicio
+para el usuario, a fin de evitar que el usuario reciba llamadas o mensajes de texto no deseados
+por cualquier medio, como terminales VOIP o teléfonos con transferencia de llamadas.</p>
+
+<p>
+ Para obtener más información, consulta <code>android.provider.BlockedNumberContract</code>
+ en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API
+ </a>descargable.
+</p>
+
+<h2 id="call_screening">Filtración de llamadas</h2>
+
+<p>
+ Android N permite que la aplicación predeterminada de un teléfono filtre las llamadas entrantes. La aplicación
+ hace esto a través del nuevo <code>CallScreeningService</code>,
+ que le permite realizar varias acciones según la clase
+ {@link android.telecom.Call.Details Call.Details} de la llamada entrante. Algunos ejemplos:
+</p>
+
+<ul>
+ <li> rechazar la llamada entrante;
+ <li> no permitir el ingreso de la llamada en el registro de llamadas;
+ <li> no mostrar al usuario una notificación de la llamada.
+</ul>
+
+<p>
+ Para obtener más información, consulta <code>android.telecom.CallScreeningService</code>
+ en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API
+ </a>descargable.
+</p>
+
+
+<h2 id="multi-locale_languages">Compatibilidad con varias configuraciones regionales y más idiomas</h2>
+
+
+<p>Android N permite a los usuarios seleccionar <strong>varias configuraciones regionales</strong> en Settings,
+para brindar una mejor compatibilidad con casos de uso de dos idiomas. Las aplicaciones pueden usar
+una nueva API para obtener las configuraciones regionales seleccionadas del usuario y luego ofrecer experiencias más sofisticadas
+para usuarios que usen varias configuraciones regionales; por ejemplo, pueden mostrar resultados de búsqueda en
+varios idiomas y no ofrecer traducciones de páginas web con idiomas que el
+usuario conozca.</p>
+
+<p>Además de la compatibilidad con varias configuraciones regionales, en Android N también se amplía la variedad de idiomas
+disponibles para los usuarios. Se ofrecen más de 25 variantes, cada una de ellas para idiomas de uso
+común, como el inglés, el español, el francés y el árabe. También se agrega compatibilidad
+parcial con más de 100 idiomas nuevos.</p>
+
+<p>Las aplicaciones pueden obtener la lista de configuraciones regionales establecida por el usuario llamando a
+<code>LocaleList.GetDefault()</code>. A fin de admitir la cantidad ampliada de configuraciones regionales, en Android N, se
+modificará la forma de resolver recursos. Asegúrate de controlar que tus aplicaciones
+funcionen de la manera esperada con la nueva lógica de resolución de recursos.</p>
+
+<p>Para obtener información sobre el nuevo comportamiento de resolución de recursos y las prácticas recomendadas que
+debes aplicar, consulta <a href="{@docRoot}preview/features/multilingual-support.html">Compatibilidad con varios idiomas</a>.</p>
+
+
+<h2 id="emoji">Nuevos emojis</h2>
+
+<p>
+ Android N presenta más emojis y funciones relacionadas con estos, como
+ emojis con diferentes tonos de piel y compatibilidad con selectores de
+ variación. Si tu aplicación admite emojis,
+ sigue las pautas a continuación para aprovechar estas funciones relacionadas con emojis.
+</p>
+
+<ul>
+ <li>
+ <strong>Comprueba que el dispositivo contenga el emoji antes de insertarlo.</strong>
+ Para corroborar qué emojis tiene la fuente del
+ sistema, usa el método {@link android.graphics.Paint#hasGlyph(String)}.
+ </li>
+ <li>
+ <strong>Comprueba que el emoji admita los selectores de variación.</strong>
+ Los selectores de variación te permiten
+ presentar determinados emojis en color o en blanco y negro.
+ En los dispositivos móviles, las aplicaciones deben representar los emojis en color, en lugar de hacerlo en blanco y negro. Sin embargo,
+ si tu aplicación muestra los emojis alineados con el texto, debe usar la variación de blanco y negro.
+ A fin de determinar si un emoji tiene una variación, usa el selector de variación.
+ Para conocer la lista completa de caracteres con variaciones, consulta la sección de
+ <em>secuencias de variación de emojis</em> de la
+ <a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
+ documentación de Unicode sobre variaciones</a>.
+ </li>
+ <li>
+ <strong>Comprueba que el emoji admita tonos de piel.</strong> Android N permite que los usuarios modifiquen el
+ tono de piel presentado de los emojis según su preferencia. Las aplicaciones de teclado deben brindar indicaciones
+ visuales para los emojis que tienen múltiples tonos de piel y permitir que los usuarios
+ seleccionen el tono que prefieran. Para determinar qué emojis del sistema tienen
+ modificadores del tono de piel, usa el método {@link android.graphics.Paint#hasGlyph(String)}.
+ Puedes determinar qué emojis usan tonos de piel leyendo la
+ <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
+ documentación de Unicode</a>.
+ </li>
+</ul>
+
+
+<h2 id="icu4">API de ICU4J en Android</h2>
+
+<p>
+ Android N ahora ofrece un subconjunto de las API de <a href="http://site.icu-project.org/">ICU4J</a> dentro del framework de Android, en
+ el paquete <code>android.icu</code>. La migración es sencilla y en mayor medida implica
+ simplemente un cambio del espacio de nombres <code>com.java.icu</code> a
+ <code>android.icu</code>. Si ya usas el paquete ICU4J en tus
+ aplicaciones, el cambio a las API <code>android.icu</code> en el framework de Android
+ puede reducir notablemente el tamaño del APK.
+</p>
+
+<p>
+ Para obtener más información sobre las API de ICU4J de Android, consulta <a href="{@docRoot}preview/features/icu4j-framework.html">Compatibilidad con ICU4J</a>.
+</p>
+
+
+
+<h2 id="gles_32">API™ de OpenGL ES 3.2</h2>
+
+<p>En Android N se agregan interfaces de framework y compatibilidad con plataformas para OpenGL ES 3.2, entre las que se incluye lo siguiente:</p>
+
+<ul>
+ <li> todas las extensiones del <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
+paquete de extensiones de Android</a></a> (AEP), a excepción de <code>EXT_texture_sRGB_decode</code>;
+ <li> búferes de fotogramas de punto flotante para HDR y sombreado aplazado;
+ <li> llamadas a draw a través de BaseVertex para mejorar el procesamiento por lotes y la transmisión;
+ <li> sólido control de acceso a búfer para reducir la sobrecarga de WebGL.
+</ul>
+
+<p>En Android N, la API de framework para OpenGL ES 3.2 se proporciona con la clase
+<code>GLES32</code>. Al usar OpenGL ES 3.2, asegúrate de declarar el
+requisito en tu archivo de manifiesto, con la etiqueta <code><uses-feature></code> y el
+atributo <code>android:glEsVersion</code>. </p>
+
+<p>Para obtener información sobre el uso de OpenGL ES, incluida la manera de comprobar la
+versión de OpenGL ES que admite el dispositivo durante el tiempo de ejecución, consulta la<a href="{@docRoot}guide/topics/graphics/opengl.html"> guía de la API OpenGL ES</a>.</p>
+
+
+<h2 id="android_tv_recording">Grabación de Android TV</h2>
+
+<p>En Android N, se agrega la capacidad de grabar y reproducir contenido de servicios
+de entrada de Android TV a través de las nuevas API de grabación. Aprovechando las mejoras existentes de las API time shifting
+, los servicios de entrada de TV pueden controlar los datos de canales que pueden grabarse y la manera
+en que se guardan las sesiones grabadas, y administrar la interacción del usuario con el contenido grabado. </p>
+
+<p>Para obtener más información, consulta <a href="{@docRoot}preview/features/tv-recording-api.html">API de grabación de Android TV</a>.</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work suma muchas funciones y API nuevas para dispositivos con Android N.
+A continuación, se muestran algunos aspectos destacados. Para ver la lista completa de cambios, consulta
+<a href="{@docRoot}preview/features/afw.html">Actualizaciones de Android for Work</a>.</p>
+
+<h3 id="work_profile_security_challenge">Comprobación de seguridad para perfiles de trabajo </h3>
+
+<p>
+ Los propietarios de perfiles orientados al SDK de Android N
+ pueden especificar una comprobación de seguridad independiente para las aplicaciones que se ejecutan en
+ el perfil de trabajo. La comprobación para perfiles de trabajo se muestra cuando un usuario intenta abrir
+ aplicaciones de trabajo. Cuando la comprobación de seguridad es exitosa, se desbloquea el
+ perfil de trabajo y se descifra si es necesario. Para quienes posean perfiles,
+ <code>ACTION_SET_NEW_PASSWORD</code> solicita al usuario establecer una comprobación de
+ trabajo y <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> le solicita
+ establecer un bloqueo de dispositivo.
+</p>
+
+<p>
+ Quienes posean perfiles pueden establecer políticas de contraseñas diferentes para la comprobación de seguridad de trabajo
+ (por ejemplo, la extensión que debe tener el PIN o la posibilidad de usar una huella digital
+ para desbloquear el perfil) usando <code>setPasswordQuality()</code>,
+ <code>setPasswordMinimumLength()</code> y métodos relacionados. También
+ pueden establecer el bloqueo del dispositivo usando la instancia de <code>DevicePolicyManager</code>
+ devuelta por el nuevo método <code>getParentProfileInstance()</code>.
+ Además, tienen la posibilidad de personalizar la pantalla de credenciales de la
+ comprobación de trabajo usando los nuevos métodos <code>setOrganizationColor()</code> y
+ <code>setOrganizationName()</code>.
+</p>
+<h3 id="turn_off_work">Desactivación del modo de trabajo </h3>
+
+<p>En dispositivos con perfil de trabajo, los usuarios pueden alternar el modo de trabajo. Cuando este último está
+inactivo, el usuario administrado queda deshabilitado temporalmente, con lo cual se desactivan las aplicaciones de perfiles
+de trabajo, la sincronización en segundo plano y las notificaciones. Esto incluye la aplicación del propietario del
+perfil. Cuando el modo de trabajo está inactivo, en el sistema se muestra un ícono
+de estado persistente para recordar al usuario que no puede iniciar aplicaciones de trabajo. El launcher
+indica que no es posible acceder a aplicaciones ni widgets de trabajo. </p>
+
+<h3 id="always_on_vpn">Always on VPN </h3>
+
+<p>Los propietarios de dispositivos y perfiles pueden asegurarse de que las aplicaciones de trabajo siempre se conecten
+a través de una VPN especificada. El sistema inicia dicha VPN en forma automática después del
+inicio del dispositivo.</p>
+
+<p>
+ Los nuevos métodos de <code>DevicePolicyManager</code> son
+ <code>setAlwaysOnVpnPackage()</code> y
+ <code>getAlwaysOnVpnPackage()</code>.
+</p>
+
+<p>Debido a que los servicios de VPN pueden enlazarse directamente a través del sistema sin interacción con
+aplicaciones, los clientes de VPN deben administrar nuevos puntos de entrada para Always on VPN. Al igual que
+antes, los servicios se indican al sistema con una
+clase <code>android.net.VpnService</code> de acción de coincidencia de filtro de intents. </p>
+
+<p>
+ Los usuarios también pueden establecer clientes Always on VPN que implementen métodos
+ <code>VPNService</code> en el usuario principal con
+ <strong>Settings > More > Vpn</strong>.
+</p>
+
+<h3 id="custom_provisioning">Aprovisionamiento personalizado</h3>
+
+<p>
+ En una aplicación, se pueden personalizar los flujos de aprovisionamiento
+ del propietario del perfil y del dispositivo con logos y colores corporativos.
+ <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> personaliza el
+ color del flujo. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
+ personaliza el flujo con un logotipo corporativo.
+</p>
+
+<h2 id="accessibility_enhancements">Mejoras de accesibilidad</h2>
+
+<p>Android N ahora ofrece Vision Settings directamente en la pantalla de bienvenida para la configuración de
+dispositivos nuevos. Esto permite a los usuarios descubrir y configurar de manera mucho más sencilla
+funciones de accesibilidad en sus dispositivos, como el gesto de ampliación, el tamaño
+de fuente, el tamaño de pantalla y TalkBack. </p>
+
+<p>Al tener estas funciones de accesibilidad una disposición más prominente, es más probable
+que tus usuarios prueben tu aplicación con ellas habilitadas. Asegúrate de probar tus aplicaciones
+anticipadamente con esta configuración habilitada. Puedes habilitarla en Settings >
+Accessibility.</p>
+
+<p>Además, los servicios de accesibilidad de Android N ahora pueden asistir a los usuarios con discapacidades
+motrices con el uso de la pantalla. La nueva API permite crear servicios con
+funciones como el seguimiento de rostros u ojos y la exploración por puntos, entre otros, para satisfacer
+las necesidades de estos usuarios.</p>
+
+<p>Para obtener más información, consulta <code>android.accessibilityservice.GestureDescription</code>
+ en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.</p>
+
+
+<h2 id="direct_boot">Inicio directo</h2>
+
+<p>El inicio directo optimiza los tiempos de inicio del dispositivo y permite una funcionalidad
+limitada de las aplicaciones aun después de un reinicio inesperado.
+Por ejemplo, si un dispositivo encriptado se reinicia mientras el usuario duerme,
+este último puede continuar recibiendo en forma normal notificaciones de alarmas, llamadas entrantes y mensajes
+registrados. Esto también significa que los servicios de accesibilidad también pueden estar
+ disponibles de inmediato después de un reinicio.</p>
+
+<p>El inicio directo aprovecha la encriptación basada en archivos de Android N,
+a fin de habilitar políticas de encriptación específicas para datos del sistema y de aplicaciones.
+El sistema usa un encriptado por el dispositivo para datos de sistema seleccionados y datos de aplicaciones
+explícitamente registrados. De forma predeterminada, se usa un depósito encriptado con credenciales para los
+ datos de sistema, los datos de usuario, las aplicaciones y los datos de aplicaciones restantes. </p>
+
+<p>Durante el inicio, el sistema se carga en un modo restringido con acceso únicamente
+a datos encriptados por el dispositivo y sin acceso general a aplicaciones o datos.
+Si hay componentes que deseas ejecutar en este modo, puedes registrarlos
+configurando un marcador en el manifiesto. Después del reinicio, el sistema activa
+componentes registrados transmitiendo la intent <code>LOCKED_BOOT_COMPLETED</code>
+. El sistema garantiza que estén disponibles los datos de aplicaciones encriptados por el dispositivo
+antes de la desactivación del bloqueo. No es posible acceder a los demás datos hasta que el usuario confirme sus credenciales de pantalla de
+ bloqueo para descifrarlos. </p>
+
+Para obtener más información, consulta <a href="{@docRoot}preview/features/direct-boot.html">Inicio directo</a>.</p>
+</p>
+
+
+<h2 id="key_attestation">Atestación de claves</h2>
+
+<p>Los depósitos de claves guardados en hardware proporcionan un método mucho más seguro para crear, almacenar
+y usar claves criptográficas en dispositivos Android. Protegen las claves contra funciones del kernel de
+Linux, vulnerabilidades potenciales de Android y extracciones
+de dispositivos con derechos de administrador.</p>
+
+<p>Para hacer más sencillo y seguro el uso de depósitos de claves guardados en hardware,
+en Android N, se presenta la atestación de claves. En las aplicaciones y en los servicios que no dependen de los dispositivos se puede usar la atestación
+de claves para determinar fehacientemente el almacenamiento de un par de claves RSA o EC se
+en hardware, las propiedades de dicho par y las
+ limitaciones aplicadas a su uso y validez. </p>
+
+<p>Los servicios que no dependen de los dispositivos y las aplicaciones pueden solicitar información acerca de un par de claves
+a través de un certificado de atestación X.509 que debe firmarse con una clave de atestación
+válida. La clave de atestación es una clave de firma ECDSA que se
+inyecta en el depósito de claves guardado en hardware en la fábrica.
+Por lo tanto, un certificado de atestación firmado con una clave de atestación
+válida confirma la existencia de un depósito de claves guardado en hardware y de información detallada
+ sobre los pares de claves en dicho depósito de claves.</p>
+
+<p>Para asegurarse de que el dispositivo use una imagen segura y oficial de fábrica de
+Android, la atestación de claves solicita que el <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a>
+del dispositivo proporcione la siguiente información al <a class="external-link" href="https://source.android.com/security/trusty/index.html">entorno de ejecución
+seguro (TEE)</a>:</p>
+
+<ul>
+<li>la versión del SO y el nivel de revisión instalados en el dispositivo;</li>
+<li>la clave pública de <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> y el estado de bloqueo.</li>
+ </ul>
+
+<p>Para obtener más información sobre la función de depósitos de claves guardados en hardware,
+consulta la guía de<a href="https://source.android.com/security/keystore/" class="external-link"> Depósito de clave guardado en hardware</a>.</p>
+
+<p>Además de la atestación de claves, en Android N también se presentan
+ claves enlazadas a huellas digitales no revocadas en la inscripción con estas huellas.</p>
+
+<h2 id="network_security_config">Configuración de seguridad de la red</h2>
+
+<p>En Android N, las aplicaciones pueden personalizar el comportamiento de sus conexiones protegidas (HTTPS y TLS)
+en forma segura, sin modificaciones en el código, a través de la
+<em>Configuración de seguridad de la red</em> en lugar de las API
+convencionales, propensas a generar errores (p. ej., X509TrustManager).</p>
+
+ <p>Funciones admitidas:</p>
+<ul>
+<li><b>Anclajes de confianza personalizados.</b> Permite personalizar qué autoridades de
+certificado (CA) son de confianza para las conexiones de seguridad de una aplicación. Por ejemplo,
+ confiar en certificados autofirmados particulares o un conjunto restringido de CA públicas.
+</li>
+<li><b>Anulaciones de solo depuración.</b> Permite que el desarrollador de una aplicación depure en forma segura
+conexiones protegidas de su aplicación sin riesgos adicionales para la base
+instalada.
+</li>
+<li><b>Desactivación del tráfico de Cleartext.</b> Permite que una aplicación se proteja a sí misma contra
+el uso accidental de tráfico de Cleartext.</li>
+<li><b>Fijación de certificados.</b> Esta es una función avanzada que permite a una aplicación
+ limitar las claves de servidores en las que se pueda confiar para conexiones protegidas.</li>
+</ul>
+
+<p>Para obtener más información, consulta <a href="{@docRoot}preview/features/security-config.html">Configuración de seguridad de
+la red</a>.</p>
+
+<h2 id="default_trusted_ca">Entidad de certificación de confianza predeterminada</h2>
+
+<p>De manera predeterminada, en las aplicaciones orientadas a Android N solo se consideran como confiables los certificados proporcionados por el sistema
+y ya no se da esta misma consideración a las entidades de certificación (CA) agregadas por usuarios. En aquellas aplicaciones orientadas a Android
+N para las cuales se desee considerar tales CA como válidas, se debe usar la
+<a href="{@docRoot}preview/features/security-config.html">Configuración de seguridad de la red</a> a fin de
+especificar los términos de confianza de dichas CA.</p>
+
+<h2 id="apk_signature_v2">Esquema de firma de APK v2</h2>
+
+<p>
+ Android N presenta el esquema de firma de APK v2, un nuevo esquema de firma de aplicaciones que
+ ofrece instalación más rápida de las aplicaciones y mayor protección contra alteraciones
+ no autorizadas de archivos APK. De forma predeterminada, Android Studio 2.2 y el complemento de Android
+ para Gradle 2.2 firman tu aplicación con el esquema de firma de APK v2 y
+ el esquema de firma tradicional, que utiliza la firma JAR.
+</p>
+
+<p>
+ Aunque recomendamos que implementes el esquema de firma de APK v2 en tu aplicación, este esquema
+ nuevo no es obligatorio. Si la aplicación no se compila correctamente con el
+ esquema de firma de APK v2, puedes deshabilitar este esquema nuevo. Si se deshabilita el proceso,
+ Android Studio 2.2 y el complemento de Android para Gradle 2.2 firman tu
+ aplicación con el esquema de firma tradicional solamente. Para firmar solo con el
+ esquema tradicional, abre el archivo <code>build.gradle</code> del nivel del módulo, a continuación,
+ agrega la línea <code>v2SigningEnabled false</code> a la configuración de firma
+ de la versión:
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>Advertencia: </strong> Si firmas la aplicación con el
+ esquema de firma de APK v2 y luego la modificas, se invalida
+ la firma de la aplicación. Por este motivo, usa herramientas como <code>zipalign</code>
+ antes de firmar la aplicación con el esquema de firma de APK v2, y no después.
+</p>
+
+<p>
+ Para obtener más información, lee los documentos de Android Studio que describen cómo
+ <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
+ firmar una aplicación</a> en Android Studio y cómo<a href="{@docRoot}studio/build/build-variants.html#signing"> configurar
+ el archivo de compilación para firmar aplicaciones</a> con el complemento de Android para Gradle.
+</p>
+
+<h2 id="scoped_directory_access">Acceso a directorios determinados</h2>
+
+<p>En Android N, las aplicaciones pueden usar nuevas API para solicitar acceso a directorios de <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">almacenamiento
+externo</a> específicos, incluidos los directorios de medios extraíbles, como las tarjetas
+SD. Las nuevas API simplifican enormemente la manera en que tu aplicación accede a directorios
+de almacenamiento externo estándares, como <code>Pictures</code>. Las aplicaciones
+de fotografía, por ejemplo, pueden usar estas API en lugar de
+<code>READ_EXTERNAL_STORAGE</code>, que otorga acceso a todos los directorios
+de almacenamiento, o del framework de acceso a almacenamiento, con el cual el usuario debe navegar hasta
+el directorio.</p>
+
+<p>A su vez, las nuevas API simplifican los pasos que un usuario debe seguir para otorgar a tu aplicación acceso a almacenamiento
+externo. Cuando se usan las nuevas API, el sistema emplea una IU de
+permisos simple en la que se detallan claramente los directorios a los cuales
+la aplicación solicita acceso.</p>
+
+<p>Para obtener más información, consulta la documentación
+<a href="{@docRoot}preview/features/scoped-folder-access.html">Acceso
+a directorios determinados</a> para desarrolladores.</p>
+
+<h2 id="keyboard_shortcuts_helper">Ayuda en los métodos abreviados del teclado</h2>
+
+<p>
+En Android N, el usuario puede presionar "Alt + /" para activar una pantalla de <em>métodos abreviados del teclado</em>
+que muestra todos los métodos abreviados disponibles, tanto para el
+sistema como la aplicación que esté en primer plano. Estos se recuperan automáticamente del menú de la aplicación si
+están disponibles, pero los desarrolladores pueden proporcionar sus propios métodos abreviados perfeccionados
+para la pantalla. Puedes hacerlo anulando el nuevo método
+<code>Activity.onProvideKeyboardShortcuts()</code>, lo que se describe en la
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
+</p>
+
+<p>
+Para activar la ayuda en los métodos abreviados del teclado desde cualquier ubicación en la aplicación,
+llama a {@code Activity.requestKeyboardShortcutsHelper()} para la actividad relevante.
+</p>
+
+<h2 id="sustained_performance_api">API de rendimiento sostenido</h2>
+
+<p>
+El rendimiento puede fluctuar considerablemente en las aplicaciones de ejecución prolongada porque el
+sistema limita los motores de sistemas en chip cuando los componentes del dispositivo alcanzan los
+límites de temperatura. Esta fluctuación presenta un objetivo móvil para los desarrolladores
+de aplicaciones que crean aplicaciones de alto rendimiento y ejecución prolongada.
+</p>
+
+<p>
+Android N incluye compatibilidad opcional para un
+<em>modo de rendimiento sostenido</em>, que permite que los fabricantes de equipo original (OEM) arrojen datos sobre las capacidades de rendimiento del dispositivo
+para las aplicaciones de ejecución prolongada. Los desarrolladores
+de aplicaciones pueden usar estos datos para perfeccionar sus aplicaciones y alcanzar un nivel
+uniforme y predecible de rendimiento en el dispositivo durante períodos prolongados.
+</p>
+
+<p>
+Los desarrolladores de aplicaciones solo pueden probar esta API nueva en la N Developer Preview instalada solo en dispositivos con
+Nexus 6P. Para usar esta función,
+establece el indicador de rendimiento sostenido de la ventana
+que deseas ejecutar en el modo de rendimiento sostenido. Establece este indicador con el método
+{@code Window.setSustainedPerformanceMode()}. El sistema deshabilita
+automáticamente este modo cuando la ventana deja de estar en primer plano.
+</p>
+
+<h2 id="vr">Soporte de RV</h2>
+
+<p>
+Android N agrega compatibilidad y optimizaciones de plataforma para un modo de RV nuevo, con el objetivo de que los
+ desarrolladores puedan forjar experiencias de RV móviles de alta calidad para los usuarios. Hay varias mejoras en el
+rendimiento, entre las que se incluye el acceso a un núcleo de CPU exclusivo para aplicaciones de RV.
+Dentro de tus aplicaciones, puedes aprovechar el seguimiento de cabeza inteligente
+y las notificaciones en sonido estéreo que funcionan para la RV. Un dato muy importante es que Android N presenta
+muy pocos gráficos de baja latencia. Para obtener información completa sobre el desarrollo de aplicaciones de RV para Android N,
+consulta <a href="https://developers.google.com/vr/android/">Google VR SDK para Android</a>.
+</p>
+
+
+<h2 id="print_svc">Mejoras del servicio de impresión</h2>
+
+<p>
+ En Android N, los desarrolladores de servicios de impresión ahora pueden publicar información adicional
+ sobre impresoras y trabajos de impresión individuales.
+</p>
+
+<p>
+ Al enumerar las impresoras individuales, un servicio de impresión ahora puede establecer íconos
+ por impresora de dos maneras:
+</p>
+
+<ul>
+ <li>Puedes establecer un ícono desde el id. de un recurso llamando a
+ <code>PrinterInfo.Builder.setResourceIconId()</code>.
+ </li>
+
+ <li>Puedes mostrar un ícono de la red llamando a
+ <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code> y configurando un
+ callback para cuando se solicite el ícono con
+ <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>.
+ </li>
+</ul>
+
+<p>
+ Además, puedes proporcionar las actividades por impresora para mostrar información
+ adicional llamando a <code>PrinterInfo.Builder.setInfoIntent()</code>.
+</p>
+
+<p>
+ Puedes indicar el progreso y el estado de los trabajos de impresión en la notificación de
+ trabajo de impresión llamando a
+ <code>android.printservice.PrintJob.setProgress()</code> y
+ <code>android.printservice.PrintJob.setStatus()</code>, respectivamente.
+</p>
+
+<p>
+ Para obtener más información sobre estos métodos, consulta la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
+</p>
+
+<h2 id="framemetrics_api">API FrameMetricsListener</h2>
+
+<p>
+La API FrameMetricsListener permite que una aplicación monitoree el rendimiento de la representación
+de la IU. La API brinda esta capacidad mediante la exposición de una transmisión de API Pub/Sub para transferir información sobre el tiempo
+de los cuadros para la ventana actual de la aplicación. Los datos devueltos son
+equivalentes a lo que muestra <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code>, pero no se limita a los últimos 120 cuadros.
+</p>
+
+<p>
+Puedes usar FrameMetricsListener para medir el rendimiento de
+la IU del nivel de interacción en producción sin contar con una conexión USB. Esta API
+permite recopilar datos con una especificidad mayor que
+{@code adb shell dumpsys gfxinfo}. Esta especificidad mayor es posible porque
+el sistema puede recopilar datos para interacciones determinadas en la aplicación, sin que sea
+necesario que el sistema obtenga un resumen global del
+rendimiento de toda la aplicación o borre un estado global. Puedes usar esta
+capacidad con el objetivo de recopilar datos de rendimiento e identificar regresiones en el rendimiento de la IU
+para casos de uso reales dentro de una aplicación.
+</p>
+
+<p>
+Para monitorear una ventana, implementa el callback <code>FrameMetricsListener.onMetricsAvailable()</code>
+y regístralo en esa ventana. Para obtener más información, consulta
+la documentación de la clase {@code FrameMetricsListener}
+en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
+</p>
+
+<p>
+La API proporciona un objeto {@code FrameMetrics}, que contiene datos de intervalos que
+el subsistema de representación informa sobre varios hitos en el ciclo de vida de un marco.
+Las métricas compatibles son {@code UNKNOWN_DELAY_DURATION},
+{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
+{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
+{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
+{@code TOTAL_DURATION} y {@code FIRST_DRAW_FRAME}.
+</p>
+
+
+<h2 id="virtual_files">Archivos virtuales</h2>
+
+<p>
+ En versiones anteriores de Android, tu aplicación podía usar el framework
+ de acceso al almacenamiento para permitir a los usuarios seleccionar archivos de cuentas de almacenamiento en la nube,
+ como Google Drive. Sin embargo, no se podían representar los archivos que no
+ tenían una representación directa en código de bits; cada archivo debía brindar
+ un flujo de entrada.
+</p>
+
+<p>
+ Android N incorpora el concepto de <em>archivos virtuales</em> al framework
+ de acceso al almacenamiento. La función de archivos virtuales permite que tu
+ {@link android.provider.DocumentsProvider} devuelva URI de documentos que se pueden
+ usar en una intent {@link android.content.Intent#ACTION_VIEW} incluso si
+ no tienen una representación directa en código de bits. Android N también te permite
+ ofrecer formatos alternativos para archivos del usuario, virtuales u otros.
+</p>
+
+<p>
+ Para obtener un URI para un documento virtual en tu aplicación, primero crea una
+ {@link android.content.Intent} a fin de abrir la IU del selector de archivos. Como una aplicación
+ no puede abrir directamente un archivo virtual con el método
+ {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()},
+ la aplicación no recibe ningún archivo virtual si incluyes la categoría
+ {@link android.content.Intent#CATEGORY_OPENABLE}.
+</p>
+
+<p>
+ Cuando el usuario realiza una selección, el sistema llama al método
+ {@link android.app.Activity#onActivityResult onActivityResult()}.
+ La aplicación puede recuperar el URI del archivo virtual y obtener un flujo de entrada, como
+ se demuestra en el fragmento de código a continuación.
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ Para obtener más información sobre el acceso a archivos del usuario, consulta la
+ <a href="{@docRoot}guide/topics/providers/document-provider.html">guía
+ Frameworks de acceso a almacenamiento</a>.
+</p>
diff --git a/docs/html-intl/intl/es/preview/index.jd b/docs/html-intl/intl/es/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/es/preview/index.jd
rename to docs/html-intl/intl/es/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/es/design/patterns/navigation.jd b/docs/html-intl/intl/es/design/patterns/navigation.jd
index e7d73fd..4b05239 100644
--- a/docs/html-intl/intl/es/design/patterns/navigation.jd
+++ b/docs/html-intl/intl/es/design/patterns/navigation.jd
@@ -137,7 +137,7 @@
<h4>Notificaciones emergentes</h4>
-<p><em>Las notificaciones emergentes</em> omiten el panel lateral de notificaciones y aparecen directamente
+<p><em>Las notificaciones emergentes</em> omiten el panel lateral de notificaciones y aparecen directamente
frente al usuario. Estas casi nunca se utilizan, y se <strong>deben reservar para ocasiones en las que es necesario proporcionar una
respuesta oportuna y es necesario realizar una interrupción en el contexto del usuario</strong>. Por ejemplo,
en Talk se utiliza este estilo para alertar al usuario sobre una invitación de un amigo para participar en una videocharla, ya que esta
diff --git a/docs/html-intl/intl/es/design/patterns/notifications.jd b/docs/html-intl/intl/es/design/patterns/notifications.jd
deleted file mode 100644
index bdbc77b..0000000
--- a/docs/html-intl/intl/es/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=Notificaciones
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>Documentos para desarrolladores</h3>
- <p>Cómo notificar al usuario</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Notificaciones en Android 4.4 y versiones anteriores</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>Video</h3>
- <p>DevBytes: Notificaciones en la vista previa para desarrolladores de Android L</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>El sistema de notificaciones les permite a los usuarios mantenerse informados sobre eventos relevantes y
-oportunos
-de su aplicación, como nuevos mensajes de chat de un amigo o un evento del calendario.
-Piense en las notificaciones como un canal de noticias que alerta a los usuarios sobre eventos
-importantes
-a medida que se producen o como un registro en el que se relatan los eventos mientras el usuario no está prestando
-atención y que se sincroniza de forma correspondiente en todos los dispositivos de Android.</p>
-
-<h4 id="New"><strong>Novedades de Android 5.0</strong></h4>
-
-<p>En Android 5.0, las notificaciones reciben actualizaciones importantes a nivel estructural,
-visual y funcional.</p>
-
-<ul>
- <li>En las notificaciones, se han realizado cambios visuales de forma coherente con el nuevo
-tema Material Design.</li>
- <li> Las notificaciones ahora están disponibles en la pantalla de bloqueo del dispositivo y
-el contenido confidencial se puede seguir
- ocultando detrás de dicha pantalla.</li>
- <li>En las notificaciones de alta prioridad que se reciben cuando el dispositivo está en uso, ahora se utiliza un nuevo formato llamado
- notificaciones emergentes.</li>
- <li>Notificaciones sincronizadas en la nube: Si se omite una notificación en un dispositivo
-Android, esta se omitirá
- también en los demás dispositivos.</li>
-</ul>
-
-<p class="note"><strong>Nota:</strong> El diseño de las notificaciones de esta versión de
-Android se diferencia
-de manera significativa del diseño de las versiones anteriores. Para obtener información sobre el diseño de las notificaciones en versiones
-anteriores, consulte <a href="./notifications_k.html">Notificaciones en Android 4.4 y versiones anteriores</a>.</p>
-
-<h2 id="Anatomy">Anatomía de una notificación</h2>
-
-<p>En esta sección, se repasan las partes básicas de una notificación y cómo se pueden mostrar en
-diferentes tipos de dispositivos.</p>
-
-<h3 id="BaseLayout">Diseño básico</h3>
-
-<p>Como mínimo, todas las notificaciones poseen un diseño básico que incluye lo siguiente:</p>
-
-<ul>
- <li> El <strong>icono</strong> de la notificación. El icono simboliza la
-aplicación que lo origina. También puede
- indicar el tipo de notificación si la aplicación genera más de un
-tipo.</li>
- <li> <strong>Título</strong> de la notificación y
-<strong>texto</strong> adicional.</li>
- <li> Una <strong>marca de tiempo</strong>.</li>
-</ul>
-
-<p>Las notificaciones creadas con {@link android.app.Notification.Builder Notification.Builder}
-para versiones anteriores de la plataforma lucen y funcionan igual en Android
-5.0; solo presentan algunos cambios de estilo que el sistema realiza
-por usted. Para obtener más información sobre las notificaciones en versiones anteriores de
-Android, consulte
-<a href="./notifications_k.html">Notificaciones en Android 4.4 y versiones anteriores</a>.</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- Diseño básico de una notificación para dispositivos portátiles (izquierda) y la misma notificación en Wear (derecha),
- con una fotografía del usuario y un icono de la notificación
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">Diseños expandidos</h3>
-
-
-<p>Usted puede decidir cuántos detalles mostrarán las notificaciones
-de su aplicación. Las notificaciones pueden mostrar las primeras
-líneas de un mensaje o la vista previa de una imagen más grande. A través de la
-información adicional, se proporciona más
-contexto al usuario y, en algunos casos, se puede permitir que el usuario lea todo el
-mensaje. El usuario
-puede acercar o alejar la imagen, o deslizar la imagen con un solo dedo para alternar entre los diseños compacto
-y expandido.
- En el caso de las notificaciones de un solo evento, Android proporciona tres plantillas de
-diseños expandidos (texto, bandeja de entrada e
- imagen) para que usted utilice en su aplicación. En las siguientes imágenes, se muestra cómo
-se ven las notificaciones de un solo evento en los
- dispositivos portátiles (izquierda) y los dispositivos con Wear (derecha).</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">Acciones</h3>
-
-<p>Android es compatible con acciones opcionales que se muestran en la parte inferior
-de la notificación.
-A través de las acciones, los usuarios pueden administrar las tareas más comunes para una determinada
-notificación desde el interior del panel de notificaciones, sin tener que abrir la
-aplicación que la originó.
-Esto acelera la interacción y, junto con la función deslizar para descartar, ayuda a los usuarios a enfocarse en las
-notificaciones que les parecen importantes.</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">Sea moderado con la cantidad de acciones que incluye en una
-notificación. Mientras más
-acciones incluya, mayor complejidad cognitiva generará. Limítese a
-la menor cantidad posible
-de acciones al incluir solo las acciones más importantes
-y significativas.</p>
-
-<p>Las acciones recomendadas para las notificaciones son aquellas que:</p>
-
-<ul>
- <li> Son fundamentales, frecuentes y típicas para el tipo de contenido que está
-mostrando.
- <li> Les permiten a los usuarios realizar las tareas rápidamente.
-</ul>
-
-<p>Evite acciones que sean:</p>
-
-<ul>
- <li> ambiguas;
- <li> iguales que la acción predeterminada de la notificación (tales como "Leer" o
-"Abrir").
-</ul>
-
-
-
-<p>Puede especificar un máximo de tres acciones, cada una de ellas formada por un icono
-de la acción y un nombre.
- Al agregarle acciones a un diseño básico simple, la notificación será expandible,
-incluso si no
- cuenta con un diseño expandido. Como las acciones solo se muestran en las notificaciones
-expandidas
- y, de lo contrario, se ocultan, asegúrese de que cualquier acción que el
-usuario invoque desde
- una notificación esté disponible también desde la aplicación
-asociada.</p>
-
-<h2 style="clear:left">Notificación emergente</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- Ejemplo de una notificación emergente (llamada telefónica entrante, alta prioridad)
-que aparece en la parte superior de una
- aplicación inmersiva
- </p>
-</div>
-
-<p>Cuando llega una notificación de alta prioridad (ver a la derecha), esta se presenta
-a los usuarios
-durante un período breve, con un diseño expandido que expone las posibles acciones.</p>
-<p> Luego de este período, la notificación se retira hacia el
-panel de notificaciones. Si la <a href="#correctly_set_and_manage_notification_priority">prioridad</a> de una notificación
-se marca como Alta, Máxima o Pantalla completa, se obtiene una notificación emergente.</p>
-
-<p><b>Buenos ejemplos de notificaciones emergentes</b></p>
-
-<ul>
- <li> Llamada telefónica entrante cuando se utiliza un dispositivo</li>
- <li> Alarma cuando se utiliza un dispositivo</li>
- <li> Nuevo mensaje SMS</li>
- <li> Batería baja</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">Pautas</h2>
-
-
-<h3 id="MakeItPersonal">Personalización</h3>
-
-<p>En el caso de las notificaciones de los elementos que envía otra persona (como un mensaje o una
-actualización de estado), utilice
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()} para incluir la imagen de esa persona. Además, adjunte información sobre
-la persona en los metadatos de la notificación (consulte {@link android.app.Notification#EXTRA_PEOPLE}).</p>
-
-<p>El icono principal de su notificación seguirá estando visible, de modo que el usuario pueda asociarlo
-con el icono
-que se muestra en la barra de estado.</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- Notificación en la que se muestra la persona que la generó y el contenido que envió.
-</p>
-
-
-<h3 id="navigate_to_the_right_place">Navegación hacia el lugar correcto</h3>
-
-<p>Cuando el usuario toca el cuerpo de una notificación (fuera de los botones de acción
-), esta se abre
-en el lugar en el que el usuario puede visualizarla y utilizar los datos que se mencionan en la
-notificación. En la mayoría de los casos, se tratará de la vista detallada de un solo elemento de datos como un mensaje,
-pero también se podría tratar de una
-vista resumida si la notificación está apilada. Si la aplicación dirige al
-usuario a cualquier sitio que se encuentre debajo del nivel superior, incorpore la navegación en la pila de retroceso de la aplicación para que el
-usuario pueda presionar el botón Back del sistema y regresar al nivel superior. Para obtener más información, consulte
-<em>Navegación dentro de la aplicación a través de los widgets y las notificaciones de la pantalla de Inicio</em> en el patrón de
-diseño <a href="{@docRoot}design/patterns/navigation.html#into-your-app">Navegación</a>.</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">Configuración y administración
-correctas de la prioridad
-de las notificaciones</h3>
-
-<p>Android admite el uso de una marca de prioridad en las notificaciones. Esta marca
-le permite influir en el lugar donde aparecerá la notificación, en relación con otras notificaciones, y
-lo ayuda a asegurarse de
-que los usuarios vean siempre primero las notificaciones más importantes. Cuando publica una notificación, puede elegir
-entre los
-siguientes niveles de prioridad:</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>Prioridad</strong></p>
-</td>
- <td class="tab0">
-<p><strong>Uso</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>Utilícelo para las notificaciones críticas y urgentes en las que se le informa al usuario sobre una condición
-que es
-crítica en el tiempo o que se debe resolver antes de que el usuario continúe con una
-tarea específica.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>Utilícelo, principalmente, para comunicaciones importantes, como eventos de mensajes o
-chats con contenido que sea particularmente interesante para el usuario.
-Las notificaciones de alta prioridad activan la pantalla de notificaciones emergentes.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>Utilícelo para todas las notificaciones que no pertenecen a ninguno de los otros tipos de prioridades que se describen aquí.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>Utilícelo para las notificaciones que desea que el usuario reciba, pero
-que son menos urgentes. Las notificaciones de baja prioridad tienden a aparecer en la parte inferior de la lista,
-por lo que son ideales para
-eventos como actualizaciones sociales públicas o indirectas: El usuario solicitó que se le notifiquen
-estas
-actualizaciones, pero estas notificaciones nunca tendrán prioridad sobre las comunicaciones
-urgentes o directas.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>Utilícelo para la información contextual o de segundo plano, como información sobre el clima o la
-ubicación contextual.
-Las notificaciones cuya prioridad es mínima no aparecen en la barra de estado. El usuario
-las descubre al expandir el panel de notificaciones.</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>Cómo elegir la
-prioridad
-adecuada</strong></h4>
-
-<p><code>DEFAULT</code>, <code>HIGH</code> y <code>MAX</code> son niveles de prioridad interruptiva, y se corre el riesgo de
-interrumpir al usuario
-en el medio de su actividad. Para evitar incomodar a los usuarios de su aplicación, reserve los niveles de prioridad interruptiva para
-las notificaciones:</p>
-
-<ul>
- <li> en las que participe otra persona;</li>
- <li> en las que el tiempo sea importante;</li>
- <li> que puedan modificar inmediatamente el comportamiento del usuario en el mundo real.</li>
-</ul>
-
-<p>Las notificaciones que se configuran en <code>LOW</code> y <code>MIN</code> pueden seguir siendo
-valiosas para el usuario: muchas, tal vez la mayoría, de las notificaciones simplemente no le piden al usuario que actúe de inmediato
-ni llaman su atención mediante una vibración, pero poseen información que será valiosa para el
-usuario
-cuando este decida ver las notificaciones. Entre los criterios de las notificaciones con prioridad <code>LOW</code> y <code>MIN</code>,
-se incluyen los siguientes:</p>
-
-<ul>
- <li> No participan otras personas.</li>
- <li> El tiempo no es importante.</li>
- <li> Incluyen contenido que podría interesarle al usuario, pero que tal vez desee
-buscarlo cuando lo necesite.</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">Configuración de una
-categoría de notificaciones</h3>
-
-<p>Si su notificación se puede clasificar dentro de alguna de las categorías predefinidas (consulte
-a continuación), asígnela
-según corresponda. Esta información se puede utilizar en determinados aspectos de la IU del sistema, como el panel de notificaciones (o cualquier
-otro
-agente de escucha de la notificación), para realizar una clasificación y filtrar las decisiones.</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>Llamada entrante (voz o video) o una solicitud de comunicación
-sincrónica similar</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>Mensaje entrante directo (SMS, mensaje instantáneo, etc.)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>Mensaje en bloque asíncrono (correo electrónico)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>Evento del calendario</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>Promoción o anuncio</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>Alarma o temporizador</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>Progreso de una operación en segundo plano de larga ejecución</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>Actualización de red social o uso compartido de datos</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>Error en una operación en segundo plano o un estado de autenticación</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>Control de transporte de medios para la reproducción</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>Actualización del estado del dispositivo o el sistema. Reservado para ser utilizado por el sistema</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>Indicación de ejecución de servicio en segundo plano</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>Una recomendación específica y oportuna para un solo evento. Por ejemplo, en una
-aplicación de noticias tal vez se desee
-recomendar una historia que se considere que el usuario deseará leer luego</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>Información constante sobre el estado contextual o del dispositivo</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">Resumen de las notificaciones</h3>
-
-<p>Si una notificación de un determinado tipo ya está pendiente cuando su aplicación intenta enviar una nueva
-notificación del mismo tipo, combínelas en una misma notificación resumida para la aplicación. No
-cree un objeto nuevo.</p>
-
-<p>Las notificaciones resumidas incluirán una descripción resumida y le permitirán al usuario
-conocer cuántas
-notificaciones de un determinado tipo están pendientes.</p>
-
-<div class="col-6">
-
-<p><strong>Lo que no debe hacer</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>Lo que debe hacer</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">Puede proporcionar
-información más detallada sobre cada una de las notificaciones que conforman un
- resumen al utilizar el diseño resumido expandido. Este enfoque les permite a los usuarios tener
-una idea más clara de las
- notificaciones pendientes y determinar si están lo suficientemente interesados como para leer
-los detalles en la
- aplicación asociada.</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- Notificación contraída y expandida que es un resumen (mediante el uso de <code>InboxStyle</code>)
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">Uso de notificaciones
-opcionales</h3>
-
-<p>Los usuarios deben tener siempre el control sobre las notificaciones. Permítale al usuario
-deshabilitar las notificaciones
-de su aplicación o cambiar las propiedades de las alertas, como el sonido de una alerta y si desea
-utilizar la vibración,
-mediante la incorporación de un elemento de configuración de notificaciones en las configuraciones de la aplicación.</p>
-
-<h3 id="use_distinct_icons">Uso de iconos diferentes</h3>
-<p>Al mirar el área de notificaciones, el usuario debe poder diferenciar
-los tipos de
-notificaciones que están pendientes actualmente.</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>Lo que debe hacer</strong></p>
- <p>Mirar los iconos de notificaciones que ya se proporcionan en las aplicaciones de Android y crear
-iconos de notificaciones para
- su aplicación que tengan una apariencia bastante diferente.</p>
-
- <p><strong>Lo que debe hacer</strong></p>
- <p>Utilizar el <a href="/design/style/iconography.html#notification">estilo de icono de notificación</a>
- adecuado para los iconos pequeños y el
-<a href="/design/style/iconography.html#action-bar">estilo
-de icono de barra de acción</a> del diseño Material Light para los iconos
- de acciones.</p>
-<p ><strong>Lo que debe hacer</strong></p>
-<p >Hacer que los iconos sean simples y evitar incluir una cantidad excesiva de detalles difíciles de
-distinguir.</p>
-
- <div><p><strong>Lo que no debe hacer</strong></p>
- <p>Colocar valores alfa adicionales (que se oscurezcan o aclaren) en los
-iconos pequeños y los
- iconos de acciones. Estos pueden tener bordes alisados, pero como en Android estos iconos se utilizan
-como máscaras (es decir, solo se
- utiliza el canal alfa), por lo general, la imagen se debe dibujar con
-opacidad completa.</p>
-
-</div>
-<p style="clear:both"><strong>Lo que no debe hacer</strong></p>
-
-<p>Utilizar colores para diferenciar su aplicación de las demás. Los iconos de las notificaciones simplemente
-deben ser una imagen sobre un fondo blanco o transparente.</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">Pulsación adecuada del
-LED de notificaciones</h3>
-
-<p>Muchos dispositivos con Android incluyen un LED de notificaciones, que se utiliza para mantener al
-usuario informado sobre los
-eventos cuando la pantalla está apagada. Las notificaciones con un nivel de prioridad <code>MAX</code>,
-<code>HIGH</code> o <code>DEFAULT</code> deben
-hacer que se encienda el LED, mientras que las de menor prioridad (<code>LOW</code> y
-<code>MIN</code>) no deben activar esta función.</p>
-
-<p>El control del usuario sobre las notificaciones debe extenderse al LED. Cuando se utilice
-DEFAULT_LIGHTS, el
-LED se iluminará en color blanco. Sus notificaciones no deberían utilizar un color
-diferente, a menos que el
-usuario lo haya personalizado explícitamente.</p>
-
-<h2 id="building_notifications_that_users_care_about">Creación de notificaciones
-importantes para los usuarios</h2>
-
-<p>Para crear una aplicación que les guste a los usuarios, es importante diseñar las notificaciones
-cuidadosamente.
-Las notificaciones son la voz de su aplicación y ayudan a definir su
-personalidad. Las notificaciones no deseadas
-o que no son importantes pueden hacer que el usuario se moleste o no se sienta cómodo con la cantidad de
-atención que le demanda la
-aplicación, por eso debe utilizarlas de forma moderada.</p>
-
-<h3 id="when_to_display_a_notification">Cuándo se deben mostrar las notificaciones</h3>
-
-<p>Para crear una aplicación que los usuarios disfruten, es importante
-reconocer que la atención
-y el enfoque del usuario son recursos que se deben proteger. Aunque el sistema de notificaciones de Android
-se diseñó
-para minimizar el impacto de las notificaciones en la atención del usuario,
-es
-importante tener en cuenta que las notificaciones interrumpen el
-flujo de tareas del usuario.
-Cuando planifique sus notificaciones, pregúntese si son lo suficiente importantes como para
-realizar una interrupción. Si no está seguro, permítale al usuario que elija las
-notificaciones mediante la configuración de notificaciones de su aplicación o que ajuste
-la marca de prioridad de las notificaciones en <code>LOW</code> o <code>MIN</code> para
-evitar distraer al usuario cuando realiza
-alguna otra tarea.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- Ejemplos de notificaciones sujetas a limitación temporal
- </p>
-
-<p>Aunque las aplicaciones más eficientes para el usuario solo proporcionan una respuesta cuando se la solicita, en algunos casos,
-vale la pena que una aplicación interrumpa al usuario con una notificación no solicitada.</p>
-
-<p>Utilice las notificaciones principalmente para <strong>eventos sujetos a limitaciones temporales</strong>, en especial
- si estos eventos sincrónicos <strong>involucran a otras personas</strong>. Por
-ejemplo, un chat entrante
- es una forma de comunicación sincrónica y en tiempo real: otro usuario
-está esperando de forma activa su respuesta. Los eventos del calendario son otros buenos ejemplos de cuándo se debe utilizar una
-notificación y llamar la atención del usuario,
- ya que los eventos son inminentes y, generalmente,
-involucran a otras personas.</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">Cuándo no se debe
-mostrar una notificación</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>En muchos otros casos, no es apropiado enviar notificaciones:</p>
-
-<ul>
- <li> Evite notificarle al usuario acerca de información que no le enviaron
-específicamente a él o
-información que no está verdaderamente sujeta a una limitación temporal. Por ejemplo, las actualizaciones asíncronas
-e indirectas
- que circulan por las redes sociales generalmente no justifican una interrupción en
-tiempo real. En el caso de los usuarios
- interesados en dichas notificaciones, permítales elegir.</li>
- <li> No cree una notificación si la información nueva y relevante se muestra actualmente
-en la pantalla. En su lugar,
- utilice la IU de la aplicación para notificarle al usuario sobre la nueva información
-directamente en contexto.
- Por ejemplo, una aplicación de chat no debe crear notificaciones del sistema mientras
-el usuario está chateando de forma activa con otro usuario.</li>
- <li> No interrumpa al usuario para que ejecute operaciones técnicas de bajo nivel, como guardar
-o sincronizar información, o actualizar una aplicación si dicha aplicación o el sistema pueden resolver el problema
-sin la participación del usuario.</li>
- <li> No interrumpa al usuario para informarle sobre un error si la
-aplicación puede solucionar el error por sus propios medios, sin que el usuario
-realice ninguna acción.</li>
- <li> No cree notificaciones que no incluyan contenidos reales de notificación y que
-simplemente promocionen
- su aplicación. Una notificación debe proporcionar información nueva, útil y oportuna, y
-no debe utilizarse
- solo para lanzar una aplicación.</li>
- <li> No cree notificaciones superfluas solo para mostrar su marca
-a los usuarios.
- Dichas notificaciones frustran y aíslan a su público. La
-mejor forma de proporcionar
- pequeñas cantidades de información actualizada y de mantener a los usuarios interesados
-en su
- aplicación es desarrollar un widget que puedan colocar en la
-pantalla de inicio, si así lo desean.</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">Interacción con
-las notificaciones</h2>
-
-<p>Las notificaciones se indican mediante iconos en la barra de estado, y se puede acceder a ellas
-al abrir el
-panel lateral de notificaciones.</p>
-
-<p>Al tocar una notificación, se abre la aplicación asociada con el contenido detallado
-que coincide con el de la notificación.
-Si dicha notificación se desplaza hacia la izquierda o la derecha, esta se eliminará del panel lateral.</p>
-
-<h3 id="ongoing_notifications">Notificaciones constantes</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- Notificaciones constantes relacionadas con la reproducción de música
- </p>
-</div>
-<p>Mediante las notificaciones constantes, se mantiene a los usuarios informados sobre un proceso en curso en
-segundo plano.
-Por ejemplo, los reproductores de música anuncian la pista que se está reproduciendo actualmente en el
-sistema de notificaciones y
-siguen haciéndolo hasta que el usuario detiene la reproducción. Mediante las notificaciones constantes también se le pueden
-mostrar al usuario
-comentarios sobre tareas más extensas, como descargar un archivo o codificar un video. Los usuarios no podrán
-eliminar las notificaciones constantes del panel lateral de notificaciones.</p>
-
-<h3 id="ongoing_notifications">Reproducción de medios</h3>
-<p>En Android 5.0, la pantalla de bloqueo no muestra los controles de transporte para la clase
-{@link android.media.RemoteControlClient} obsoleta. Sin embargo, <em>sí</em> muestra las notificaciones, de modo que las notificaciones de reproducción de cada
-aplicación ahora son la forma principal
-en la que los usuarios controlan la reproducción desde el estado bloqueado. A través de este comportamiento, se le otorga más control
-a la aplicación sobre los
-botones que se deben mostrar, y la forma en que debe mostrarlos, al mismo tiempo que se proporciona
-al usuario una experiencia coherente, independientemente de si la pantalla está bloqueada o no.</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">Diálogos
-y avisos</h3>
-
-<p>Su aplicación no debe crear un diálogo o un aviso si actualmente no se muestra en la
-pantalla. Los diálogos o los avisos se deben
- mostrar únicamente como una respuesta inmediata a una acción que realiza el usuario
-dentro de su aplicación.
-Para obtener más información sobre cómo utilizar los diálogos y los avisos, consulte
-<a href="/design/patterns/confirming-acknowledging.html">Confirmación y reconocimiento</a>.</p>
-
-<h3>Orden y clasificación</h3>
-
-<p>Las notificaciones son noticias que, como tales, se muestran, básicamente, en
-orden cronológico inverso, prestando
-especial atención a la
-<a href="#correctly_set_and_manage_notification_priority">prioridad</a> de la notificación especificada en la aplicación.</p>
-
-<p>Las notificaciones son una parte clave de la pantalla de bloqueo y se muestran de forma prominente
-cada vez
-que se enciende la pantalla del dispositivo. El espacio en la pantalla de bloqueo es reducido, por lo que
-es sumamente importante
-que se identifiquen las notificaciones más urgentes o relevantes. Por este
-motivo, Android cuenta
-con un algoritmo de clasificación más sofisticado para las notificaciones, que tiene en cuenta lo siguiente:</p>
-
-<ul>
- <li> La marca de tiempo y la prioridad especificada en la aplicación.</li>
- <li> Si la notificación interrumpió al usuario recientemente con un sonido o una
-vibración. (Es decir,
- si el teléfono emitió un sonido y el usuario desea saber "¿Qué
-pasó?", en la pantalla de bloqueo se debe
- proporcionar una respuesta a simple vista).</li>
- <li> Todas aquellas personas involucradas en la notificación mediante{@link android.app.Notification#EXTRA_PEOPLE}
- y, especialmente, si son contactos preferidos.</li>
-</ul>
-
-<p>Para aprovechar aún más esta función de clasificación, enfóquese en la
-experiencia del usuario que desea
-crear, en lugar de centrarse en algún punto importante de la lista.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Las notificaciones de Gmail
-poseen una prioridad predeterminada, por lo que
- normalmente clasifican los mensajes de una aplicación de mensajería instantánea como Hangouts, pero
-realizan
- un cambio de prioridad temporal cuando ingresan nuevos mensajes.
- </p>
-
-
-<h3>En la pantalla de bloqueo</h3>
-
-<p>Como las notificaciones son visibles en la pantalla de bloqueo, la privacidad del usuario es un aspecto
-especialmente
-importante. Por lo general, las notificaciones contienen información confidencial y
-no necesariamente deben ser visibles
-para cualquier persona que agarre el dispositivo y encienda la pantalla.</p>
-
-<ul>
- <li> En el caso de los dispositivos que posean una pantalla de bloqueo segura (PIN, patrón o contraseña), la interface está formada por
- partes públicas y privadas. La interfaz pública se puede mostrar en una pantalla de bloqueo segura y,
- por ende, cualquier persona puede verla. La interfaz privada es el mundo detrás de esa pantalla de bloqueo y
- solo se revela cuando el usuario se registra en el dispositivo.</li>
-</ul>
-
-<h3>Control del usuario sobre la información que se muestra en la pantalla de bloqueo segura</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- Notificaciones en la pantalla de bloqueo, en la que el contenido se revela luego de que el usuario desbloquea el dispositivo
- </p>
-</div>
-
-<p>Cuando se configura una pantalla de bloqueo segura, el usuario puede decidir ocultar los
-detalles confidenciales de dicha pantalla. En este caso, la IU del sistema
-analiza el <em>nivel de visibilidad</em> de la notificación para decidir
-qué información se puede mostrar de forma segura.</p>
-<p> Para controlar el nivel de visibilidad, realice una llamada a
-<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>
- y especifique uno de los siguientes valores:</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>.
-Se muestra todo el contenido de la notificación.
- Esta es la opción predeterminada del sistema si no se especificó el grado de visibilidad.</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>.
-En la pantalla de bloqueo se muestra la información básica sobre la existencia de esta notificación, incluido
-el icono y el nombre de la aplicación a través de la cual se publicó. No se muestra el resto de los detalles de la notificación.
-A continuación, especificamos algunos puntos que se deben tener en cuenta:
- <ul>
- <li> Si desea proporcionar una versión pública diferente de su notificación
-para que el sistema la muestre en una pantalla de bloqueo segura, suministre un
-objeto de notificación de reemplazo en el campo <code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code>
-.
- <li> Mediante esta configuración, su aplicación puede crear una versión resumida del
-contenido que sigue siendo útil, pero que no revela información personal. Considere el ejemplo de una
-aplicación de SMS cuyas notificaciones incluyen el texto del SMS, el nombre del remitente y el icono del contacto.
-Esta notificación debe ser <code>VISIBILITY_PRIVATE</code>, pero <code>publicVersion</code> podría
-seguir conteniendo información útil como "3 mensajes nuevos", sin que se muestren otros detalles
-de identificación.
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>. Se muestra solo la menor cantidad de información posible; se excluye incluso
-el icono de la notificación.</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Notificaciones en
-Android Wear</h2>
-
-<p>Las notificaciones y sus <em>acciones</em> se conectan de forma predeterminada con los dispositivos con Wear.
-Los desarrolladores pueden controlar qué notificaciones se conectan desde el
-teléfono hacia el reloj
-y viceversa. Los desarrolladores también pueden controlar qué acciones se conectan. Si
-en su aplicación se incluyen
-acciones que no se pueden realizar con una sola pulsación, oculte dichas acciones
-en su notificación para Wear
-o considere anclarlas a una aplicación de Wear. De este modo, el usuario podrá
-finalizar con la acción desde el
-reloj.</p>
-
-<h4>Conexión entre notificaciones y acciones</h4>
-
-<p>Mediante un dispositivo conectado, como un teléfono, es posible conectar las notificaciones con un dispositivo con Wear, para que las
-notificaciones se muestren allí. De modo similar, también es posible conectar acciones para que el usuario pueda ejecutarlas
-directamente desde las notificaciones en los dispositivos con Wear.</p>
-
-<p><strong>Conexión</strong></p>
-
-<ul>
- <li> Nuevos mensajes instantáneos</li>
- <li> Acciones de una sola pulsación como Hacer +1, Me gusta o Favorito</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>Sin conexión</strong></p>
-
-<ul>
- <li> Notificaciones de podcasts que llegaron recientemente</li>
- <li> Acciones que se asignan a funciones que no se pueden ejecutar desde el reloj</li>
-</ul>
-
-
-
-<p><h4>Acciones únicas diseñadas para Wear</h4></p>
-
-<p>Existen algunas acciones que solo puede realizar en Wear. Entre estas, se incluyen las siguientes:</p>
-
-<ul>
- <li> listas rápidas de respuestas predeterminadas como "Vuelvo enseguida";</li>
- <li> acciones que se abren desde el teléfono;</li>
- <li> un "Comentario" o una acción de "Respuesta" que activa la pantalla de entrada de voz;</li>
- <li> acciones que lanzan aplicaciones específicas de Wear.</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/es/distribute/googleplay/about.jd b/docs/html-intl/intl/es/distribute/googleplay/about.jd
index 96faf49..987b43b 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/about.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/about.jd
@@ -6,7 +6,7 @@
@jd:body
- <div id="qv-wrapper">
+ <div id="qv-wrapper">
<div id="qv">
<h2>Acerca de Google Play</h2>
<ol style="list-style-type:none;">
diff --git a/docs/html-intl/intl/es/distribute/googleplay/auto.jd b/docs/html-intl/intl/es/distribute/googleplay/auto.jd
index a2a2943..d9928b5a 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/auto.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/auto.jd
@@ -158,7 +158,7 @@
</p>
<p>
- Ten en cuenta que la revisión afecta la disponibilidad de tu aplicación para otros dispositivos en la
+ Ten en cuenta que la revisión afecta la disponibilidad de tu aplicación para otros dispositivos en la
Play Store de Google; por ejemplo, para teléfonos y tablets.
Si tienes una aplicación actual que incluya actualizaciones para el componente de teléfono/tablet,
el componente de Android Auto debe pasar la revisión antes de que la aplicación actualizada
diff --git a/docs/html-intl/intl/es/distribute/googleplay/developer-console.jd b/docs/html-intl/intl/es/distribute/googleplay/developer-console.jd
index fcf5e44d..73cd63e 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/developer-console.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/developer-console.jd
@@ -4,8 +4,8 @@
Xnonavpage=true
@jd:body
-
- <div id="qv-wrapper">
+
+ <div id="qv-wrapper">
<div id="qv">
<h2>Características de la publicación</h2>
<ol>
@@ -303,7 +303,7 @@
<p>
En la mayoría de los casos, todo lo que necesitas es un solo paquete de aplicaciones (APK), y generalmente es la manera
más sencilla de administrar y mantener la aplicación. Sin embargo, si necesitas
- proporcionar un APK distinto para diferentes dispositivos, Google Play te
+ proporcionar un APK distinto para diferentes dispositivos, Google Play te
permite hacerlo.
</p>
diff --git a/docs/html-intl/intl/es/distribute/googleplay/families/faq.jd b/docs/html-intl/intl/es/distribute/googleplay/families/faq.jd
index ecad47c..44da225 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/families/faq.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>En este documento:</h2>
@@ -141,7 +141,7 @@
confirmar que es apta para familias. Suponiendo que tu aplicación cumple con todos los requisitos
del programa, prevemos que el tiempo de publicación no debería prolongarse
más allá de lo habitual; no obstante, puede haber una demora en la publicación de la aplicación si se
- rechaza durante la revisión para la inclusión en Diseñado para familias.
+ rechaza durante la revisión para la inclusión en Diseñado para familias.
</dd>
<dt>
diff --git a/docs/html-intl/intl/es/distribute/googleplay/families/start.jd b/docs/html-intl/intl/es/distribute/googleplay/families/start.jd
index 3ed1eb3..d6d6126 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/families/start.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/families/start.jd
@@ -78,7 +78,7 @@
<p class="note">
<strong>Nota</strong>: Las aplicaciones publicadas en el programa Diseñado para familias
- también están disponibles para todos los usuarios en Google Play.
+ también están disponibles para todos los usuarios en Google Play.
</p>
<p>
diff --git a/docs/html-intl/intl/es/distribute/googleplay/quality/auto.jd b/docs/html-intl/intl/es/distribute/googleplay/quality/auto.jd
index c7cb65d..2b1f403 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/quality/auto.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/quality/auto.jd
@@ -477,7 +477,7 @@
No. Cuando Google inicie el proceso de aprobación, tu aplicación para Auto se someterá a una revisión de
seguridad del conductor y no estará
disponible para distribución hasta que se apruebe. Dado que es el mismo APK que el
- que utilizas para teléfonos y tablets, tus actualizaciones en la Play Store para esos dispositivos no estará disponible hasta que
+ que utilizas para teléfonos y tablets, tus actualizaciones en la Play Store para esos dispositivos no estará disponible hasta que
finalice el proceso de aprobación para Auto.
</p>
diff --git a/docs/html-intl/intl/es/distribute/googleplay/quality/core.jd b/docs/html-intl/intl/es/distribute/googleplay/quality/core.jd
index 8588c6b..b972949 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/quality/core.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/quality/core.jd
@@ -12,7 +12,7 @@
<li><a href="#listing">Google Play</a></li>
</ol>
-
+
<h2>Prueba</h2>
<ol>
<li><a href="#test-environment">Configuración de un entorno de prueba</a></li>
@@ -24,7 +24,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">Calidad de las aplicaciones para tablets</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">Optimiza tu aplicación</a></li>
</ol>
-
+
</div>
</div>
@@ -84,7 +84,7 @@
<th style="width:54px;">
ID
</th>
-
+
<th>
Descripción
diff --git a/docs/html-intl/intl/es/distribute/googleplay/quality/tablets.jd b/docs/html-intl/intl/es/distribute/googleplay/quality/tablets.jd
index 62c6f87..e004923 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/quality/tablets.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/quality/tablets.jd
@@ -56,7 +56,7 @@
<p>El primer paso en la provisión de una excelente experiencia con la aplicación en tablets es asegurarte
de que la aplicación cumpla con los <em>criterios de calidad de la aplicación principal</em> en todos los dispositivos
- y formatos a los que apunte. Para obtener información completa, consulta las <a href="{@docRoot}distribute/essentials/quality/core.html">Pautas de calidad de la aplicación principal</a>.
+ y formatos a los que apunte. Para obtener información completa, consulta las <a href="{@docRoot}distribute/essentials/quality/core.html">Pautas de calidad de la aplicación principal</a>.
</p>
<p>
@@ -119,7 +119,7 @@
<li>Proporciona diseños personalizados, según sea necesario, para las pantallas <code>large</code> y
<code>xlarge</code>. También puedes proporcionar diseños que se cargarán
en función de la <a href="{@docRoot}guide/practices/screens_support.html#NewQualifiers">dimensión
- más corta</a> de la pantalla o la <a href="{@docRoot}guide/practices/screens_support.html#NewQualifiers">altura y el ancho
+ más corta</a> de la pantalla o la <a href="{@docRoot}guide/practices/screens_support.html#NewQualifiers">altura y el ancho
mínimos disponibles</a>.
</li>
@@ -208,7 +208,7 @@
maximizar la reutilización de códigos entre diferentes factores y pantallas que
compartan contenido.</li>
<li>Decide en qué tamaños de pantalla usarás una IU multipanel y luego proporciona los
- diferentes diseños en los depósitos para el tamaño de pantalla correspondiente (como
+ diferentes diseños en los depósitos para el tamaño de pantalla correspondiente (como
<code>large</code>/<code>xlarge</code>) o anchos mínimos de pantalla (como
<code>sw600dp</code>/<code>sw720</code>).</li>
</ul>
@@ -492,7 +492,7 @@
<pre><uses-feature android:name="android.hardware.telephony" android:required="false" /></pre></li>
-<li>En forma similar, revisa el manifiesto para detectar elementos <a href="{@docRoot}guide/topics/manifest/permission-element.html"><code><permission></code></a> que
+<li>En forma similar, revisa el manifiesto para detectar elementos <a href="{@docRoot}guide/topics/manifest/permission-element.html"><code><permission></code></a> que
<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#permissions">impliquen requisitos
de características de hardware</a> que no sean adecuadas para tablets. Si encuentras esos
permisos, asegúrate de declarar explícitamente un elemento
@@ -735,7 +735,7 @@
distribución. </p>
<p>Si la página de Sugerencias para la optimización indica problemas "Pendientes" que crees que no
- corresponden a tu aplicación o afectan la calidad de la aplicación en las tablets,
+ corresponden a tu aplicación o afectan la calidad de la aplicación en las tablets,
usa el <a href="https://support.google.com/googleplay/android-developer/contact/tabletq" target="_googleplay" style="white-space:nowrap">Formulario de contacto de Diseñado para tablets»</a> para comunicárnoslo. Revisaremos
tu aplicación y actualizaremos tu página de Sugerencias para la optimización
según corresponda.</p>
diff --git a/docs/html-intl/intl/es/distribute/googleplay/tv.jd b/docs/html-intl/intl/es/distribute/googleplay/tv.jd
index e3a95bc..e9deacb 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/tv.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/tv.jd
@@ -132,7 +132,7 @@
<ul>
<li>Cumple las pautas de Calidad de la aplicación principal
<ul>
- <li>Sigue las <a href="{@docRoot}design/index.html">pautas de
+ <li>Sigue las <a href="{@docRoot}design/index.html">pautas de
Diseño Android</a>. Presta especial atención al uso de <a href="http://www.google.com/design/spec/material-design/introduction.html">Material
Design</a> en tu aplicación.
</li>
@@ -261,7 +261,7 @@
los criterios, recibirás una <strong>notificación por correo electrónico enviada a tu cuenta
de desarrollador</strong> con un resumen de las áreas que debes abordar. Una vez que realices
los ajustes necesarios, puedes cargar una nueva versión de tu aplicación a la Consola para
- desarrolladores.
+ desarrolladores.
</p>
<p>
@@ -282,7 +282,7 @@
<li>
<em>Aprobada</em>: se revisó tu aplicación y se aprobó. La aplicación
- estará disponible de forma directa para los usuarios de Android TV.
+ estará disponible de forma directa para los usuarios de Android TV.
</li>
<li>
diff --git a/docs/html-intl/intl/es/distribute/googleplay/wear.jd b/docs/html-intl/intl/es/distribute/googleplay/wear.jd
index f23315d..2c8a804 100644
--- a/docs/html-intl/intl/es/distribute/googleplay/wear.jd
+++ b/docs/html-intl/intl/es/distribute/googleplay/wear.jd
@@ -127,7 +127,7 @@
<ul>
<li>Cumple las pautas de Calidad de la aplicación principal.
<ul>
- <li>Sigue las <a href="{@docRoot}design/index.html">pautas de
+ <li>Sigue las <a href="{@docRoot}design/index.html">pautas de
Diseño Android</a>. Presta especial atención al uso de <a href="http://www.google.com/design/spec/material-design/introduction.html">Material
Design</a> en tu aplicación.
</li>
@@ -152,7 +152,7 @@
<p>
Una vez que hayas creado tu APK listo para el lanzamiento y lo hayas probado para asegurarte de que cumple todos los criterios de <a href="{@docRoot}distribute/essentials/quality/wear.html">Calidad de las aplicaciones para Wear</a>, cárgalo
a la Consola para desarrolladores. Actualiza el directorio de tu tienda con capturas de pantalla de tu aplicación para Wear y configura opciones
- de distribución, según sea necesario. Si no sabes cómo prepararte para el lanzamiento en Google Play, consulta la
+ de distribución, según sea necesario. Si no sabes cómo prepararte para el lanzamiento en Google Play, consulta la
<a href="{@docRoot}distribute/googleplay/publish/preparing.html">Lista de comprobación para el lanzamiento.</a>
</p>
diff --git a/docs/html-intl/intl/es/distribute/tools/launch-checklist.jd b/docs/html-intl/intl/es/distribute/tools/launch-checklist.jd
index ad42663..be23c86 100644
--- a/docs/html-intl/intl/es/distribute/tools/launch-checklist.jd
+++ b/docs/html-intl/intl/es/distribute/tools/launch-checklist.jd
@@ -870,7 +870,7 @@
<li>
<p>
"Dispositivos compatibles" indica que tus aplicaciones están llegando a los dispositivos
- a los que pretendías llegar. De lo contrario, deberás verificar con tu equipo de desarrollo
+ a los que pretendías llegar. De lo contrario, deberás verificar con tu equipo de desarrollo
los requisitos y las reglas de filtrado de las aplicaciones.
</p>
</li>
diff --git a/docs/html-intl/intl/es/distribute/tools/localization-checklist.jd b/docs/html-intl/intl/es/distribute/tools/localization-checklist.jd
index 7cb3ccb..c068490 100644
--- a/docs/html-intl/intl/es/distribute/tools/localization-checklist.jd
+++ b/docs/html-intl/intl/es/distribute/tools/localization-checklist.jd
@@ -903,7 +903,7 @@
Responde las reseñas, si fuera posible. Te recomendamos que interactúes
con los usuarios internacionales en sus idiomas o en un idioma común, si fuera posible.
Si no lo es, puedes intentar utilizar herramientas de traducción, aunque es posible que no puedas
- prever los resultados. Si tu aplicación se vuelve muy popular en un idioma, considera
+ prever los resultados. Si tu aplicación se vuelve muy popular en un idioma, considera
la posibilidad de obtener ayuda por parte de hablantes nativos para brindar soporte.
</p>
</li>
diff --git a/docs/html-intl/intl/es/google/play/filters.jd b/docs/html-intl/intl/es/google/play/filters.jd
index 03565b9..07238ee 100644
--- a/docs/html-intl/intl/es/google/play/filters.jd
+++ b/docs/html-intl/intl/es/google/play/filters.jd
@@ -81,7 +81,7 @@
solicite específicamente la aplicación al hacer clic en un vínculo profundo que apunte directamente a la
ID de la aplicación en Google Play.</p>
-<p>Puedes usar cualquier combinación de los filtros disponibles para tu aplicación. Por ejemplo, puedes establecer un requisito
+<p>Puedes usar cualquier combinación de los filtros disponibles para tu aplicación. Por ejemplo, puedes establecer un requisito
<code>minSdkVersion</code> de <code>"4"</code> y configurar <code>smallScreens="false"</code>
en la aplicación; luego, al cargar la aplicación a Google Play, podrías apuntar a países (operadores) europeos
únicamente. De este modo, los filtros de Google Play evitarán que la aplicación esté disponible en un dispositivo
@@ -102,7 +102,7 @@
<h2 id="manifest-filters">Filtrado en función del manifiesto de la aplicación</h2>
-<p>La mayoría de los filtros son activados por elementos del archivo de manifiesto de una
+<p>La mayoría de los filtros son activados por elementos del archivo de manifiesto de una
aplicación, <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</a>
(aunque no todo lo que se encuentra en el archivo de manifiesto puede desencadenar el filtrado).
La tabla 1 contiene los elementos del manifiesto que debes usar para desencadenar el
diff --git a/docs/html-intl/intl/es/preview/j8-jack.jd b/docs/html-intl/intl/es/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/es/preview/j8-jack.jd
rename to docs/html-intl/intl/es/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/es/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/es/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..0a9cbe2
--- /dev/null
+++ b/docs/html-intl/intl/es/guide/topics/ui/multi-window.jd
@@ -0,0 +1,589 @@
+page.title=Compatibilidad con ventanas múltiples
+page.metaDescription=Nueva compatibilidad en Android N para mostrar más de una aplicación a la vez.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>En este documento</h2>
+ <ol>
+ <li><a href="#overview">Información general</a></li>
+ <li><a href="#lifecycle">Ciclo de vida en modo de ventanas múltiples</a></li>
+ <li><a href="#configuring">Configuración de tu aplicación para el modo de
+ ventanas múltiples</a></li>
+ <li><a href="#running">Ejecución de tu aplicación en modo de ventanas múltiples</a></li>
+ <li><a href="#testing">Prueba de la compatibilidad de tu aplicación con el uso de ventanas múltiples</a></li>
+ </ol>
+ <h2>Consulta también</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Aplicación de ejemplo para la
+ prueba de ventanas múltiples</a></li>
+ <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Cinco tips para prepararse para ventanas múltiples en Android N</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N agrega compatibilidad con la visualización de más de una aplicación
+ a la vez. En dispositivos portátiles, se pueden ejecutar dos aplicaciones una al lado de la otra o
+ una por encima de la otra en modo de <em>pantalla dividida</em>. En dispositivos de TV, las aplicaciones pueden
+ usar el modo <em>picture-in-picture</em> para continuar la reproducción de video mientras los usuarios
+ interactúan con otra aplicación.
+</p>
+
+<p>
+ Si compilas tu aplicación con el N Preview SDK, puedes configurar la manera en que tu aplicación
+ administra la visualización de ventanas múltiples. Por ejemplo, puedes especificar las dimensiones
+ mínimas permitidas de tu actividad. También puedes inhabilitar la visualización de ventanas múltiples para
+ tu aplicación asegurándote de que el sistema solo muestre tu aplicación en modo de
+ pantalla completa.
+</p>
+
+<h2 id="overview">Información general</h2>
+
+<p>
+ Android N permite que varias aplicaciones compartan la pantalla al mismo tiempo. Por
+ ejemplo, un usuario podría dividir la pantalla y ver una página web a la izquierda
+ mientras escribe un correo electrónico a la derecha. La experiencia de usuario depende
+ del dispositivo:
+</p>
+
+<ul>
+ <li>Los dispositivos portátiles con Android N ofrecen modo de
+ pantalla dividida. En este modo, el sistema ocupa la pantalla con dos aplicaciones y las muestra
+ una al lado de la otra o una encima de la otra. El usuario puede arrastrar la línea que divide
+ las dos aplicaciones para visualizar una más grande que la otra.
+ </li>
+
+ <li>En dispositivos Nexus Player con Android N, las aplicaciones pueden ubicarse automáticamente
+ en <a href="picture-in-picture.html">modo Picture-in-picture</a>, lo que les permite
+ continuar mostrando contenido mientras el usuario explora o interactúa con
+ otras aplicaciones.
+ </li>
+
+ <li>Los fabricantes de dispositivos más grandes pueden optar por habilitar el modo
+ de forma libre, en el que el usuario puede modificar libremente el tamaño de cada actividad. Si el
+ fabricante habilita está función, el dispositivo ofrecerá modo de forma libre además
+ del modo de pantalla dividida.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>Figura 1:</strong> Dos aplicaciones ejecutándose una al lado de la otra en modo de pantalla dividida.
+</p>
+
+<p>
+ El usuario puede cambiar a modo de ventanas múltiples de la siguiente manera:
+</p>
+
+<ul>
+ <li>Si el usuario abre la <a href="{@docRoot}guide/components/recents.html">pantalla
+ Overview</a> y presiona durante un momento el
+ título de una actividad, puede arrastrar esa actividad a una parte resaltada de la
+ pantalla para llevarla a modo de ventanas múltiples.
+ </li>
+
+ <li>Si el usuario presiona durante un momento el botón Overview, el dispositivo coloca
+ la actividad actual en modo de ventanas múltiples y abre la pantalla Overview para
+ permitirle al usuario seleccionar otra actividad para compartir la pantalla.
+ </li>
+</ul>
+
+<p>
+ Los usuarios pueden <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastrar y
+ soltar</a> datos de una actividad a otra mientras las actividades comparten
+ la pantalla. (Antes, los usuarios solo podían arrastrar y soltar datos dentro de una sola
+ actividad).
+</p>
+
+<h2 id="lifecycle">Ciclo de vida en modo de ventanas múltiples</h2>
+
+<p>
+ El modo de ventanas múltiples no cambia el <a href="{@docRoot}training/basics/activity-lifecycle/index.html">ciclo de vida
+ de la actividad</a>.
+</p>
+
+<p>
+ En modo de ventanas múltiples, solo la actividad con la que el usuario interactuó más recientemente
+ está activa en un momento determinado. Esa actividad se considera la <em>principal</em>.
+ Todas las demás actividades están pausadas, aunque estén visibles.
+ No obstante, el sistema les da a esas actividades pausadas pero visibles una prioridad más alta
+ que las actividades que no están visibles. Si el usuario interactúa con una de las
+ actividades pausadas, se reanuda esa actividad y se pausa la actividad que antes
+ era la principal.
+</p>
+
+<p class="note">
+ <strong>Nota:</strong> En modo de ventanas múltiples, una aplicación puede estar pausada
+ y aún visible para el usuario. Es posible que una aplicación necesite continuar sus
+ actividades mientras está pausada. Por ejemplo, una aplicación de reproducción de video que está
+ pausada pero visible debería continuar mostrando el video. Por ese
+ motivo, recomendamos que las actividades que reproducen video <em>no</em> pausen el
+ video en sus controladores{@link android.app.Activity#onPause onPause()}.
+ En su lugar, deben pausar el video en {@link android.app.Activity#onStop
+ onStop()} y reanudar la reproducción en {@link android.app.Activity#onStart
+ onStart()}.
+</p>
+
+<p>
+ Cuando el usuario coloca una aplicación en modo de ventanas múltiples, el sistema le notifica a la
+ actividad de un cambio de configuración, tal como se especifica en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Control de cambios en
+ tiempo de ejecución</a>. Esto también sucede cuando el usuario modifica el tamaño de la aplicación o coloca la aplicación
+ nuevamente en el modo de pantalla completa.
+ Básicamente, este cambio tiene las mismas consecuencias en el ciclo de vida
+ de la actividad que cuando el sistema notifica a la aplicación que el dispositivo cambió de
+ modo vertical a modo de paisaje, excepto porque se modifican las dimensiones del dispositivo
+ en lugar de intercambiarse solamente. Como se aborda en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Control de cambios en
+ tiempo de ejecución</a>, tu actividad puede administrar el cambio de configuración por sí misma, o
+ puede permitir que el sistema destruya la actividad y la vuelva a crear con las nuevas
+ dimensiones.
+</p>
+
+<p>
+ Si el usuario cambia el tamaño de una ventana y la agranda en cualquier dirección, el
+ sistema modifica el tamaño de la actividad para que coincida con la acción del usuario y emite <a href="{@docRoot}guide/topics/resources/runtime-changes.html">cambios en tiempo de ejecución</a>
+ según sean necesarios. Si la aplicación se retrasa en el trazado de áreas recientemente expuestas, el
+ sistema rellena esas áreas con el color especificado por el atributo {@link
+ android.R.attr#windowBackground windowBackground} o por el atributo de estilo predeterminado
+ <code>windowBackgroundFallback</code>.
+</p>
+
+<h2 id="configuring">Configuración de tu aplicación para el modo de ventanas múltiples</h2>
+
+<p>
+ Si tu aplicación está orientada a Android N, puedes configurar cómo y
+ si quieres que las actividades de tu aplicación admitan la visualización de ventanas múltiples. Puedes establecer
+ atributos en tu manifiesto para controlar el tamaño y el diseño.
+ La configuración de atributos de una actividad raíz se aplica a todas las actividades
+ de su pila de tareas. Por ejemplo, si
+ <code>android:resizeableActivity</code> está configurado en true para la actividad raíz, se puede modificar el tamaño de todas las actividades
+ de la pila de tareas.
+</p>
+
+<p class="note">
+ <strong>Nota:</strong> Si compilas una aplicación con múltiples orientaciones con una versión del
+ SDK anterior a Android N, y el usuario usa la aplicación en
+ modo de ventanas múltiples, el sistema cambia el tamaño de la aplicación de forma forzada. El sistema presenta un
+ cuadro de diálogo en el que se advierte al usuario que la aplicación puede comportarse de forma inesperada. El sistema
+ <em>no</em> modifica el tamaño de aplicaciones con orientación fija; si
+ el usuario intenta abrir una aplicación con orientación fija en modo de ventanas múltiples,
+ la aplicación ocupará toda la pantalla.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ Establece este atributo en el nodo <code><activity></code> o
+ <code><application></code> de tu manifiesto para habilitar o inhabilitar la visualización
+ en modo de ventanas múltiples:
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ Si este atributo se establece en true, la actividad puede iniciarse en
+ los modos de pantalla dividida y forma libre. Si el atributo se establece en false, la
+ actividad no admite el modo de ventanas múltiples. Si el valor es false, y el
+ usuario intenta iniciar la actividad en modo de ventanas múltiples, la actividad ocupará
+ toda la pantalla.
+</p>
+
+<p>
+ Si tu aplicación está orientada a Android N, pero no especificas un valor
+ para este atributo, el valor predeterminado del atributo será true.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ Establece este atributo en el nodo <code><activity></code> de tu manifiesto
+ para indicar si la actividad admite la visualización de Picture-in-picture. Este
+ atributo se ignora si <code>android:resizeableActivity</code> es false.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">Atributos de diseño</h3>
+
+<p>
+ Con Android N, el elemento de manifiesto <code><layout></code>
+ admite varios atributos que afectan cómo se comporta una actividad en
+ modo de ventanas múltiples:
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ Ancho predeterminado de la actividad cuando se inicia en modo de forma libre.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ Altura predeterminada de la actividad cuando se inicia en modo de forma libre.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ Ubicación inicial de la actividad cuando se inicia en modo de forma libre. Consulta la referencia
+ {@link android.view.Gravity} para obtener valores adecuados.
+ </dd>
+
+ <dt>
+ <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
+ </dt>
+
+ <dd>
+ Altura y ancho mínimos para la actividad tanto en el modo de pantalla dividida como en el
+ modo de forma libre. Si el usuario mueve la línea divisoria en el modo de pantalla dividida
+ para reducir el tamaño respecto del tamaño mínimo especificado, el sistema recorta
+ la actividad para ajustarla a los requisitos del usuario.
+ </dd>
+</dl>
+
+<p>
+ Por ejemplo, el siguiente código muestra cómo especificar el tamaño
+ y la ubicación predeterminados de una actividad, y su tamaño mínimo, cuando la actividad se visualiza en
+ modo de forma libre:
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalHeight="450dp"
+ android:minimalWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">Ejecución de tu aplicación en modo de ventanas múltiples</h2>
+
+<p>
+ Android N ofrece nuevas funcionalidades para admitir aplicaciones que puedan ejecutarse
+ en modo de ventanas múltiples.
+</p>
+
+<h3 id="disabled-features">Funciones deshabilitadas en modo de ventanas múltiples</h3>
+
+<p>
+ Ciertas funciones están deshabilitadas o se ignoran cuando un dispositivo se encuentra en modo de
+ ventanas múltiples, ya que no resultan útiles para una actividad que podría estar compartiendo la
+ pantalla del dispositivo con otras actividades o aplicaciones. Esas funciones incluyen las siguientes:
+
+<ul>
+ <li>Algunas opciones de personalización de la <a href="{@docRoot}training/system-ui/index.html">IU del sistema</a>
+ están deshabilitadas; por ejemplo, las aplicaciones no pueden ocultar la barra de
+ estado si no se están ejecutando en modo de pantalla completa.
+ </li>
+
+ <li>El sistema ignora los cambios en el atributo <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code>.
+ </li>
+</ul>
+
+<h3 id="change-notification">Notificación y consulta de cambios en modo de ventanas múltiples</h3>
+
+<p>
+ Se agregaron los siguientes métodos nuevos a la clase {@link android.app.Activity}
+ para admitir la visualización de ventanas múltiples. Para obtener información detallada sobre cada método, consulta la
+ <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia sobre N Preview SDK
+</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.isInMultiWindowMode()</code>
+ </dt>
+
+ <dd>
+ Realiza una llamada para averiguar si la actividad está en modo de ventanas múltiples.
+ </dd>
+
+ <dt>
+ <code>Activity.isInPictureInPictureMode()</code>
+ </dt>
+
+ <dd>
+ Realiza una llamada para averiguar si la actividad está en modo Picture-in-picture.
+
+ <p class="note">
+ <strong>Nota:</strong> El modo Picture-in-picture es un caso especial del
+ modo de ventanas múltiples. Si <code>myActivity.isInPictureInPictureMode()</code>
+ devuelve un valor true, <code>myActivity.isInMultiWindowMode()</code> también
+ devuelve un valor true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowModeChanged()</code>
+ </dt>
+
+ <dd>
+ El sistema llama a este método siempre que la actividad entra en modo de ventanas
+ múltiples o sale de él. El sistema le pasa al método un valor de true si la
+ actividad entra en modo de ventanas múltiples y false si la actividad
+ sale del modo de ventanas múltiples.
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureModeChanged()</code>
+ </dt>
+
+ <dd>
+ El sistema llama a este método siempre que la actividad entra en modo Picture-in-picture
+ o sale de él. El sistema le pasa al método un valor de true si
+ la actividad entra en modo Picture-in-picture y false si la actividad
+ sale de dicho modo.
+ </dd>
+</dl>
+
+<p>
+ También hay versiones {@link android.app.Fragment} de cada uno de esos
+ métodos; por ejemplo, <code>Fragment.isInMultiWindowMode()</code>.
+</p>
+
+<h3 id="entering-pip">Cómo entrar en modo Picture-in-picture</h3>
+
+<p>
+ Para que una actividad entre en modo de Picture-in-picture, debes llamar al nuevo método
+ <code>Activity.enterPictureInPictureMode()</code>. Este método no tiene efecto si
+ el dispositivo no admite el modo de imagen en imagen. Para obtener más información,
+ consulta la documentación de <a href="picture-in-picture.html">Picture-in-Picture</a>.
+</p>
+
+<h3 id="launch">Inicia nuevas actividades en modo de ventanas múltiples</h3>
+
+<p>
+ Cuando inicias una nueva actividad, puedes indicarle al sistema que la nueva
+ actividad se debe mostrar adyacente a la actual, si fuera posible. Para hacer
+ esto, usa el marcador
+ <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Pasar
+ este marcador requiere el siguiente comportamiento:
+</p>
+
+<ul>
+ <li>Si el dispositivo está en modo de pantalla dividida, el sistema intenta crear la
+ nueva actividad junto a la actividad que lo inició, de modo que las dos actividades
+ compartan la pantalla. No se garantiza que el sistema pueda hacerlo, pero
+ ubicará las actividades de forma adyacente si fuera posible.
+ </li>
+
+ <li>Si el dispositivo no está en modo de pantalla dividida, este marcador no tendrá efecto.
+ </li>
+</ul>
+
+<p>
+ Si un dispositivo está en modo de forma libre e inicias una nueva actividad, puedes
+ especificar las dimensiones y la ubicación de la pantalla de la nueva actividad al llamar a
+ <code>ActivityOptions.setLaunchBounds()</code>. Este método no tiene efecto si
+ el dispositivo no está en modo de ventanas múltiples.
+</p>
+
+<p class="note">
+ <strong>Nota:</strong> Si inicias una actividad en una pila de tareas, esa
+ actividad reemplaza la actividad en pantalla y hereda todas sus
+ propiedades de ventanas múltiples. Si quieres iniciar la nueva actividad en una ventana
+ independiente en modo de ventanas múltiples, debes iniciarla en una nueva pila de tareas.
+</p>
+
+<h3 id="dnd">Admisión de la funcionalidad de arrastrar y soltar</h3>
+
+<p>
+ Los usuarios pueden <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastrar y
+ soltar</a> datos de una actividad a otra mientras las dos actividades
+ comparten la pantalla. (Antes, los usuarios solo podían arrastrar y soltar datos dentro de una
+ sola actividad). Por este motivo, te recomendamos que agregues la funcionalidad de arrastrar y
+ soltar a tu aplicación si es que aún no la admite.
+</p>
+
+<p>
+ El N Preview SDK amplía el paquete <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+ para admitir la funcionalidad de arrastrar y soltar entre aplicaciones diferentes. Para obtener información detallada sobre las siguientes
+ clase y métodos, consulta la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia
+ del N Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ Objeto token responsable de especificar los permisos otorgados a la aplicación
+ que recibe datos mediante la funcionalidad de arrastrar y soltar.
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Nuevo alias para {@link android.view.View#startDrag View.startDrag()}. Para
+ habilitar la funcionalidad arrastrar y soltar entre diferentes actividades, pasa el nuevo marcador
+ <code>View.DRAG_FLAG_GLOBAL</code>. Si necesitas otorgar permisos de URI a
+ la actividad receptora, pasa los nuevos marcadores
+ <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> o
+ <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, según corresponda.
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Cancela una operación de arrastrar actualmente en curso. Solo puede ser llamado por la
+ aplicación que originó la operación de arrastrar.
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ Reemplaza la sombra del arrastre por una operación de arrastrar actualmente en curso. Solo
+ puede ser llamado por la aplicación que originó la operación de arrastrar.
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ Solicita los permisos para los URI de contenido que se pasan con el {@link
+ android.content.ClipData} incluido en un {@link android.view.DragEvent}.
+ </dd>
+</dl>
+
+<h2 id="testing">Prueba de la compatibilidad de tu aplicación con el uso de ventanas múltiples</h2>
+
+<p>
+ Ya sea que actualices o no tu aplicación para Android N, debes
+ verificar la forma en que se comporta en modo de ventanas múltiples en caso de que un usuario intente iniciarla
+ en modo de ventanas múltiples en un dispositivo con Android N.
+</p>
+
+<h3 id="configuring">Configuración de un dispositivo de prueba</h3>
+
+<p>
+ Si instalas Android N en un dispositivo, se admite automáticamente el modo
+ de pantalla dividida.
+</p>
+
+<h3 id="test-non-n">Si tu aplicación no se compiló con el N Preview SDK</h3>
+
+<p>
+ Si no creaste tu aplicación con el N Preview SDK y el usuario intenta usar
+ la aplicación en modo de ventanas múltiples, el sistema cambia el tamaño de la aplicación de forma forzada, a menos que la aplicación
+ declare una orientación fija.
+</p>
+
+<p>
+ Si tu aplicación no declara una orientación fija, debes iniciar tu aplicación
+ en un dispositivo con Android N e intentar colocar la aplicación en
+ modo de pantalla dividida. Cuando se modifique el tamaño de la aplicación de forma forzada,
+ verifica que la experiencia de usuario sea aceptable.
+</p>
+
+<p>
+ Si la aplicación declara una orientación fija, debes intentar colocar la aplicación en
+ modo de ventanas múltiples. Cuando lo hagas, verifica que la aplicación
+ continúe en modo de pantalla completa.
+</p>
+
+<h3 id="test-mw">Si admites el modo de ventanas múltiples</h3>
+
+<p>
+ Si compilaste tu aplicación con el N Preview SDK y no deshabilitaste
+ la compatibilidad con ventanas múltiples, verifica el siguiente comportamiento tanto en modo de pantalla dividida
+ como en modo de forma libre.
+</p>
+
+<ul>
+ <li>Inicia la aplicación en modo de pantalla completa y luego cambia al modo de ventanas múltiples al presionar
+ durante un momento el botón Overview. Verifica que la aplicación pase de un modo a otro correctamente.
+ </li>
+
+ <li>Inicia la aplicación directamente en modo de ventanas múltiples y verifica que se
+ inicie correctamente. Puedes iniciar una aplicación en modo de ventanas múltiples al presionar el
+ botón Overview, luego presionar durante un momento la barra de título de la aplicación y arrastrarla
+ a una de las áreas resaltadas de la pantalla.
+ </li>
+
+ <li>Cambia el tamaño de tu aplicación en modo de pantalla dividida al arrastrar la línea divisoria.
+ Verifica que la aplicación cambie de tamaño sin fallar y que estén visibles los elementos
+ necesarios de la IU.
+ </li>
+
+ <li>Si especificaste dimensiones mínimas para tu aplicación, intenta cambiar el tamaño
+ de la aplicación a dimensiones más bajas que las especificadas. Verifica que no puedas modificar el tamaño de la aplicación
+ para que sea más pequeña que la dimensión mínima especificada.
+ </li>
+
+ <li>En todas las pruebas, verifica que el rendimiento de la aplicación sea aceptable. Por
+ ejemplo, verifica que la actualización de la IU después de cambiar el tamaño de la aplicación
+ no demore mucho.
+ </li>
+</ul>
+
+<h4 id="test-checklist">Lista de comprobación de pruebas</h4>
+
+<p>
+ Para verificar el rendimiento de tu aplicación en modo de ventanas múltiples, intenta las siguientes
+ operaciones. Debes probar estas operaciones tanto en modo de pantalla dividida como en
+ modo de ventanas múltiples, excepto cuando se indique algo diferente.
+</p>
+
+<ul>
+ <li>Ingresa en modo de ventanas múltiples y luego sal.
+ </li>
+
+ <li>Pasa de tu aplicación a otra y verifica que la aplicación se comporte
+ correctamente mientras esté visible pero no activa. Por ejemplo, si tu aplicación está
+ reproduciendo video, comprueba que el video se siga reproduciendo mientras el usuario interactúe
+ con otra aplicación.
+ </li>
+
+ <li>En modo de pantalla dividida, prueba mover la barra divisora para agrandar y
+ achicar la aplicación. Realiza estas operaciones en las configuraciones una al lado de la otra y
+ una encima de la otra. Verifica que la aplicación no falle,
+ que las funcionalidades necesarias estén visibles y que la operación de cambio de tamaño no demore
+ mucho.
+ </li>
+
+ <li>Realiza varias operaciones de cambio de tamaño en una sucesión rápida. Verifica que tu
+ aplicación no falle ni pierda memoria. Para obtener información acerca de cómo comprobar el uso de memoria
+ de tu aplicación, consulta <a href="{@docRoot}tools/debugging/debugging-memory.html">
+ Averiguación del uso de RAM</a>.
+ </li>
+
+ <li>Usa tu aplicación normalmente en diferentes configuraciones de ventanas y
+ verifica que la aplicación se comporte correctamente. Verifica que el texto sea legible y que
+ los elementos de la IU sean lo suficientemente grandes para interactuar con ellos.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">Si deshabilitaste la compatibilidad con el modo de ventanas múltiples</h3>
+
+<p>
+ Si deshabilitaste la compatibilidad con el modo de ventanas múltiples al configurar
+ <code>android:resizableActivity="false"</code>, debes iniciar tu aplicación en
+ un dispositivo con Android N e intentar colocar la aplicación en los
+ modos de forma libre y pantalla dividida. Cuando lo hagas, verifica que la aplicación
+ continúe en modo de pantalla completa.
+</p>
diff --git a/docs/html-intl/intl/es/preview/_book.yaml b/docs/html-intl/intl/es/preview/_book.yaml
deleted file mode 100644
index 815f0f6..0000000
--- a/docs/html-intl/intl/es/preview/_book.yaml
+++ /dev/null
@@ -1,342 +0,0 @@
-toc:
-- title: Información general del programa
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ikhtisar Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: Compatibilidad y notas de la versión
- path: /preview/support.html
-
-- title: Configuración de Preview
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Preview
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: Probar en un dispositivo
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Probar en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: Cambios en los comportamientos
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: Background Optimizations
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: Idioma y configuración regional
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 總覽
- section:
- - title: Compatibilidad con ventanas múltiples
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: Notificaciones
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: Ahorro de datos
- path: /preview/features/data-saver.html
- - title: Grabación de TV
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: Configuración de seguridad de la red
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: Compatibilidad con ICU4J
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: API de ICU4J del framework de Android
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android 框架 API
- - name: zh-tw-lang
- value: ICU4J Android 架構 API
- - title: Funciones del lenguaje Java 8
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 语言功能
- - name: zh-tw-lang
- value: Java 8 語言功能
- - title: Actualizaciones para Android for Work
- path: /preview/features/afw.html
- - title: Acceso a directorios determinados
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: Ejemplos
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: Contrato de licencia
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html-intl/intl/es/preview/api-overview.jd b/docs/html-intl/intl/es/preview/api-overview.jd
deleted file mode 100644
index f84bede..0000000
--- a/docs/html-intl/intl/es/preview/api-overview.jd
+++ /dev/null
@@ -1,1039 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Funciones claves para desarrolladores</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">Compatibilidad con ventanas múltiples</a></li>
- <li><a href="#notification_enhancements">Notificaciones</a></li>
- <li><a href="#jit_aot">Compilación de JIT y AOT</a></li>
- <li><a href="#quick_path_to_app_install">Acceso rápido a la instalación de aplicaciones</a></li>
- <li><a href="#doze_on_the_go">Descanso en movimiento</a></li>
- <li><a href="#background_optimizations">Optimizaciones en segundo plano</a></li>
- <li><a href="#data_saver">Ahorro de datos</a></li>
- <li><a href="#vulkan">API Vulkan</a></li>
- <li><a href="#tile_api">API para mosaicos de Quick Settings</a></li>
- <li><a href="#number-blocking">Bloqueo de números</a></li>
- <li><a href="#call_screening">Filtración de llamadas</a></li>
- <li><a href="#multi-locale_languages">Configuraciones regionales e idiomas</a></li>
- <li><a href="#emoji">Nuevos emojis</a></li>
- <li><a href="#icu4">API de ICU4J en Android</a></li>
- <li><a href="#gles_32">API de OpenGL ES 3.2</a></li>
- <li><a href="#android_tv_recording">Grabación de Android TV</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">Accesibilidad</a></li>
- <li><a href="#direct_boot">Inicio directo</a></li>
- <li><a href="#key_attestation">Atestación de claves</a></li>
- <li><a href="#network_security_config">Configuración de seguridad de la red</a></li>
- <li><a href="#default_trusted_ca">CA de confianza predeterminada</a></li>
- <li><a href="#apk_signature_v2">Esquema de firma de APK v2</a></li>
- <li><a href="#scoped_directory_access">Acceso a directorios determinados</a></li>
- <li><a href="#keyboard_shortcuts_helper">Ayuda en los métodos abreviados del teclado</a></li>
- <li><a href="#sustained_performance_api">API de rendimiento sostenido</a></li>
- <li><a href="#vr">Soporte de RV</a></li>
- <li><a href="#print_svc">Mejoras del servicio de impresión</a></li>
- <li><a href="#virtual_files">Archivos virtuales</a></li>
- <li><a href="#framemetrics_api">API FrameMetricsListener</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N aún se encuentra en proceso activo de desarrollo, pero puedes probarlo
-ahora como parte de la N Developer Preview. En las secciones siguientes se destacan algunas de
-las nuevas funciones para desarrolladores. </p>
-
-<p>
- Asegúrate de ver los <a href="{@docRoot}preview/behavior-changes.html">Cambios de comportamiento</a> para obtener información sobre
- áreas en las cuales los cambios en las plataformas puedan tener efecto en tus aplicaciones, consultar las
- guías del desarrollador para conocer mejor las funciones claves y descargar la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia de la API</a> para obtener información sobre
- API nuevas.
-</p>
-
-<h2 id="multi-window_support">Compatibilidad con ventanas múltiples</h2>
-
-
-<p>En Android N, presentamos una nueva y muy solicitada función multitarea
-en la plataforma: la compatibilidad con ventanas múltiples. </p>
-
- <p>Los usuarios ahora pueden abrir dos aplicaciones al mismo tiempo en la pantalla. </p>
- <ul>
- <li>En teléfonos y tabletas
-con Android N, los usuarios pueden ejecutar dos aplicaciones en paralelo
-una encima otra en el modo de pantalla dividida. También tienen la posibilidad de modificar el tamaño de las aplicaciones arrastrando
-la línea divisoria que se encuentra entre ellas. </li>
-
-<li>En los dispositivos con Android TV, las aplicaciones pueden habilitar en forma automática el <a href="{@docRoot}preview/features/picture-in-picture.html">modo
-"picture-in-picture"</a>. Esto les permite continuar mostrando contenido mientras el usuario explora otras
-aplicaciones o interactúa con ellas.</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>Figura 1:</strong> Aplicaciones en ejecución en el modo de pantalla dividida.
-</p>
-
- </div>
-
-<p>En las tabletas, en particular, y en otros dispositivos de pantallas más grandes, la compatibilidad con ventanas múltiples
-ofrece nuevas maneras de atraer a los usuarios Puedes, habilitar acciones de arrastrar y soltar en
-tu aplicación para que los usuarios arrastren contenido hacia tu aplicación —o desde ella; es una excelente
-manera de mejorar su experiencia. </p>
-
-<p>Es sencillo agregar compatibilidad con ventanas múltiples a tu aplicación y configurar la manera en que
-administra la visualización de estas ventanas. Por ejemplo, puedes especificar las dimensiones mínimas
-permitidas de tu actividad y evitar así que los usuarios den a la actividad un
-tamaño inferior. También puedes inhabilitar la visualización de ventanas múltiples para tu aplicación, lo que
- garantiza que el sistema solo muestre tu aplicación en modo de pantalla completa.</p>
-
-<p>
- Para obtener más información, consulta la documentación <a href="{@docRoot}preview/features/multi-window.html">Compatibilidad con ventanas múltiples</a>
- para desarrolladores.
-</p>
-
-<h2 id="notification_enhancements">Mejoras en las notificaciones</h2>
-
-<p>En Android N, hemos rediseñado las notificaciones para facilitar y agilizar su
-uso. Entre los cambios, se incluyen los siguientes:</p>
-
-<ul>
- <li>
- <strong>Actualizaciones de plantillas</strong>: estamos actualizando las plantillas de notificaciones para
- poner nuevo énfasis en la imagen de héroe y el avatar. Los desarrolladores podrán
- aprovechar las nuevas plantillas con una cantidad mínima de ajustes en el código.
- </li>
-
- <li>
- <strong>Personalización del estilo de mensaje</strong>: puedes personalizar más etiquetas
- de la interfaz de usuario asociadas con tus notificaciones utilizando la clase
- <code>MessageStyle</code>. Puedes configurar el mensaje, el título de
- la conversación y la vista del contenido.
- </li>
-
- <li>
- <strong>Notificaciones agrupadas</strong>: el sistema puede agrupar mensajes
- (por ejemplo, por tema) y mostrar el grupo. Un usuario puede
- aplicar acciones, como Dismiss o Archive, en ellos. Si
- has implementado notificaciones para Android Wear, ya estarás familiarizado con
- este modelo.
- </li>
-
- <li>
- <strong>Respuesta directa</strong>: en el caso de las aplicaciones de comunicación en tiempo real, el
- sistema de Android admite respuestas en línea para que los usuarios puedan responder rápidamente a
- un mensaje SMS o de texto directamente dentro en la interfaz de notificaciones.
- </li>
-
- <li>
- <strong>Vistas personalizadas</strong>: dos API nuevas te permiten aprovechar las decoraciones
- del sistema, como los encabezados y las acciones de notificaciones, al usar vistas
- personalizadas en las notificaciones.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>Figura 2:</strong> Notificaciones agrupadas y respuesta directa.
-</p>
-
-<p>Para obtener información acerca de cómo implementar las nuevas funciones, consulta la guía
- <a href="{@docRoot}preview/features/notification-updates.html">Notificaciones</a>.
-</p>
-
-
-
-<h2 id="jit_aot">Compilación de JIT y AOT guiada por perfiles</h2>
-
-<p>En Android N, agregamos un compilador Just in Time (JIT) con generación de perfiles de código para
-ART, lo cual te permite mejorar constantemente el rendimiento de las aplicaciones con Android mientras se
-ejecutan. El compilador JIT complementa el compilador Ahead of Time (AOT) actual de ART
-y permite mejorar el rendimiento del tiempo de ejecución, ahorrar espacio de almacenamiento y acelerar las actualizaciones
-de aplicaciones y del sistema.</p>
-
-<p>La compilación guiada por perfiles permite que ART maneje la compilación de AOT y JIT de cada aplicación
-conforme a su uso real, además de las condiciones en el dispositivo. Por
-ejemplo, ART conserva un perfil de los métodos directos de cada aplicación, y puede compilar previamente
-y almacenar en caché dichos métodos para obtener el mejor rendimiento. A su vez, deja otras partes de la aplicación
-sin compilar hasta que se usan realmente.</p>
-
-<p>Además de mejorar el rendimiento de partes claves de la aplicación, la compilación guiada por
-perfiles permite reducir la superficie de memora RAM total de una aplicación, incluidos los archivos binarios
-asociados. Esta función tiene particular importancia en los dispositivos de memoria reducida.</p>
-
-<p>ART administra la compilación guiada por perfiles de una manera que minimiza el impacto en la batería
-del dispositivo. Realiza compilaciones previas únicamente cuando el dispositivo se encuentra inactivo y
-en proceso de carga, lo cual permite ahorrar tiempo y batería haciendo el trabajo de manera anticipada.</p>
-
-<h2 id="quick_path_to_app_install">Acceso rápido a la instalación de aplicaciones</h2>
-
-<p>Uno de los beneficios más palpables del compilador JIT de ART es la velocidad de instalación de las
-aplicaciones y de actualización del sistema. Incluso las aplicaciones de mayor tamaño, en las que se necesitaban varios minutos para la
-optimización y la instalación en Android 6.0, ahora pueden instalarse en cuestión de
-segundos. Las actualizaciones del sistema también son más rápidas, debido a que ya no hay un paso de optimización. </p>
-
-<h2 id="doze_on_the_go">Descanso en movimiento...</h2>
-
-<p>En Android 6.0, se presentó Descanso, un modo de sistema que ahorra batería aplazando
-actividades de CPU y red de las aplicaciones cuando el dispositivo se encuentra inactivo; por ejemplo, al hallarse
-sobre una mesa o en un cajón. </p>
-
-<p>Ahora, en Android N, el modo Descanso ofrece el beneficio adicional de ahorrar batería en movimiento.
-Siempre que la pantalla permanezca apagada durante un tiempo y el dispositivo esté desenchufado,
-Descanso aplicará un subconjunto de las restricciones de CPU y red conocidas a las aplicaciones.
-Esto significa que los usuarios pueden ahorrar batería aun cuando lleven sus dispositivos
-en los bolsillos.</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>Figura 3:</strong> Descanso ahora aplica
- restricciones para prolongar la duración de la batería aun cuando el dispositivo no está quieto.
-</p>
-
-
-<p>Poco tiempo después de que la pantalla se apaga, cuando el dispositivo no está enchufado, Descanso
-restringe el acceso a la red y aplaza tareas y sincronizaciones. Durante períodos de mantenimiento
-breves, las aplicaciones tienen acceso a la red y se ejecutan todas las
-tareas y sincronizaciones aplazadas. Ten en cuenta que, cuando se activa la pantalla o se enchufa el dispositivo, se
-desactiva el modo Descanso.</p>
-
-<p>Cuando el dispositivo vuelve a estar quieto, desenchufado y con la pantalla apagada durante un
-tiempo, Descanso aplica todas las restricciones de CPU y redes en {@link
-android.os.PowerManager.WakeLock}, alarmas de {@link android.app.AlarmManager} y análisis de
-GPS o Wi-Fi.</p>
-
-<p>Las prácticas recomendadas para adaptar tu aplicación a Descanso no varían si el
-dispositivo estará en movimiento o no. Por lo tanto, si ya actualizaste tu aplicación para que administre
-Descanso correctamente, no tienes nada más que hacer. Si no lo hiciste, comienza a <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">adaptarla
-a Descanso</a> ahora.</p>
-
-<h2 id="background_optimizations">Project Svelte: Optimizaciones en segundo plano</h2>
-
-<p>Project Svelte representa un esfuerzo constante por minimizar el uso de memoria RAM a través del sistema y de las aplicaciones
-en los diferentes dispositivos Android del ecosistema. En Android N, el objetivo principal de Project
-Svelte es optimizar la manera en que las aplicaciones se ejecutan en segundo plano. </p>
-
-<p>El procesamiento en segundo plano es una parte esencial de la mayoría de las aplicaciones. Cuando se maneja en forma adecuada, puede
-hacer que la experiencia de tu usuario sea increíble —(inmediata, rápida y pertinente al contexto).
-Cuando no se maneja de tal manera, el procesamiento en segundo plano puede suponer un consumo innecesario de memoria RAM (y
-batería), y afectar el rendimiento del sistema para otras aplicaciones. </p>
-
-<p>A partir de Android 5.0, {@link android.app.job.JobScheduler} ha sido el
-método preferido para ejecutar tareas en segundo plano con resultados positivos
-para los usuarios. Las aplicaciones pueden programar tareas y, al mismo tiempo, permitir que el sistema se optimice según las condiciones de
-memoria, energía y conectividad. JobScheduler ofrece control y
-simpleza, y nuestro deseo es que todas las aplicaciones lo usen. </p>
-
-<p>
- Otra buena opción es <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GCMNetworkManager</code></a>, que forma parte de Google Play Services y
- ofrece una capacidad similar de programación de tareas con compatibilidad en versiones heredadas de
- Android.
-</p>
-
-<p>Continuaremos ampliando <code>JobScheduler</code> y
-<code>GCMNetworkManager</code> para que se apliquen a más
-casos de uso de tus aplicaciones; por ejemplo, en Android N ahora puedes programar procesos
-en segundo plano según los cambios de los proveedores de contenido. Al mismo tiempo, comenzaremos a
-dejar de usar algunos de los patrones anteriores que pueden reducir el rendimiento del sistema,
-en especial, en dispositivos de memoria reducida.</p>
-
-<p>En Android N, eliminaremos tres transmisiones implícitas que se usan normalmente —(
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} y {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}), ya que pueden activar los
-procesos en segundo plano de varias aplicaciones al mismo tiempo, y así exigir la memoria y la batería. Si
-tu aplicación recibe estas transmisiones, aprovecha la N Developer Preview y
- realiza la migración a <code>JobScheduler</code> y las API relacionadas, como alternativa. </p>
-
-<p>
- Para obtener información detallada, consulta la documentación <a href="{@docRoot}preview/features/background-optimization.html">Optimizaciones
- en segundo plano</a>.
-</p>
-
-
-<h2 id="data_saver">Ahorro de datos</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>Figura 4:</strong> Ahorro de datos en la configuración.
-</p>
- </div>
-
-<p>Durante la vida útil de un dispositivo móvil, el costo de un plan de datos móviles puede
-superar fácilmente el costo del propio dispositivo. Para muchos usuarios, los datos móviles son un
-recurso costoso que desean conservar. </p>
-
-<p>En Android N, se presenta el modo de ahorro de datos, un nuevo servicio del sistema que permite reducir
-el uso de datos móviles de las aplicaciones, ya sea con servicio de itinerancia, cerca del final del ciclo de facturación
-o con un paquete de datos prepagos. El ahorro de datos permite que los usuarios controlen la manera en que las aplicaciones
-usan los datos móviles y que los desarrolladores brinden un servicio más eficaz cuando el ahorro
-de datos se encuentra activo. </p>
-
-<p>Cuando un usuario habilita el ahorro de datos en <strong>Settings</strong> y el dispositivo está
-conectado a una red o, el sistema bloquea el uso de datos en segundo plano y ordena a las aplicaciones
-usar menos datos en primer plano siempre que sea posible (por ejemplo, limitando
-la tasa de bits para la transmisión, reduciendo la calidad de la imagen y aplazando el valor optimista de almacenamiento previo en caché,
-entre otras posibilidades). Los usuarios pueden incluir aplicaciones específicas en la lista blanca para
-permitir el uso de datos medidos en segundo plano, incluso cuando está activado el ahorro de datos.</p>
-
-<p>Android N extiende {@link android.net.ConnectivityManager} para que las aplicaciones
-tengan una manera de <a href="{@docRoot}preview/features/data-saver.html#status">recuperar las
-preferencias de ahorro de datos del usuario</a> y<a href="{@docRoot}preview/features/data-saver.html#monitor-changes"> monitorear
-cambios en estas</a>. Todas las aplicaciones deben verificar si el usuario habilitó el ahorro
-de datos e intentar limitar el uso de datos en primer y segundo plano.</p>
-
-
-<h2 id="vulkan">API Vulkan</h2>
-
-<p>
- Android N integra <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>, una nueva API de visualización 3D, en la plataforma. Al igual que
- <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
- ES</a>, Vulkan es un estándar abierto para gráficos y visualización 3D, cuyo mantenimiento está a cargo de
- Khronos Group.
-</p>
-
-<p>
- Vulkan se diseñó desde el principio para minimizar la sobrecarga de CPU en el controlador,
- y permite que tu aplicación controle el funcionamiento de la unidad de procesamiento de gráficos más directamente. También
- hace posible contar con un mejor trabajo en paralelo, ya que permite que varios subprocesos diversos realicen
- trabajos, como la construcción del búfer de comandos, a la vez.
-</p>
-
-<p>
- Las herramientas y las bibliotecas de desarrollo de Vulkan son parte del NDK de Android. Esto
-incluye lo siguiente:
-</p>
-
-<ul>
- <li>Encabezados
- </li>
-
- <li>Capas de validación (bibliotecas de depuración)
- </li>
-
- <li>Compilador SPIR-V
- </li>
-
- <li>Biblioteca de compilación de tiempo de ejecución de SPIR-V
- </li>
-</ul>
-
-<p>
- Vulkan solo está disponible en las aplicaciones en dispositivos con hardware compatible con Vulkan,
- como Nexus 5X, Nexus 6P y Nexus Player. Estamos trabajando estrechamente con nuestros
- socios para que Vulkan se pueda utilizar en más dispositivos lo más pronto posible.
-</p>
-
-<p>
- Para obtener más información, consulta la <a href="{@docRoot}ndk/guides/graphics/index.html">documentación de la API</a>.
-</p>
-
-<h2 id="tile_api">API para mosaicos de Quick Settings</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>Figura 5:</strong> Mosaicos de Quick Settings del panel de notificaciones.
-</p>
-
-
- </div><p>Quick Settings es una manera popular y simple de exhibir configuraciones y acciones claves
-directamente desde el panel de notificaciones. En Android N, expandimos el alcance de
-Quick Settings para que sea todavía más útil y práctico. </p>
-
-<p>Agregamos más espacio para mosaicos adicionales de Quick Settings, a los cuales los usuarios pueden
-acceder desde un área de visualización paginada deslizando el dedo hacia la izquierda o la derecha. También permitimos
-que los usuarios determinen los mosaicos de Quick Settings que aparecerán y los puntos en los cuales
-se mostrarán; pueden agregar o mover mosaicos con solo arrastrarlos y soltarlos. </p>
-
-<p>Para los desarrolladores, en Android N también se agrega una nueva API que les permite definir mosaicos de
- Quick Settings propios para facilitar, dentro de sus aplicaciones, el acceso a controles y acciones claves por parte de los usuarios.</p>
-
-<p>
- Los mosaicos de Quick Settings se reservan para controles o acciones que se necesiten
- con urgencia o se usen con frecuencia; no deben emplearse como accesos directos para
- iniciar una aplicación.
-</p>
-
-<p>
- Una vez que hayas definido tus mosaicos, puedes dejarlos a disposición de los usuarios, quienes tendrán la posibilidad de agregarlos
- a Quick Settings con solo arrastrarlos y soltarlos.
-</p>
-
-<p>
- Para obtener información sobre la creación de un mosaico de aplicación, consulta la documentación de
- <code>android.service.quicksettings.Tile</code> en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
-</p>
-
-
-
-<h2 id="number-blocking">Bloqueo de números</h2>
-
-<p>Android N ahora admite el bloqueo de números en la plataforma y proporciona una API
-de framework para que los proveedores de servicios dispongan de una lista con números bloqueados. La
-aplicación de SMS predeterminada, la aplicación telefónica predeterminada y las aplicaciones de proveedores tienen capacidad de lectura y
-escritura en la lista de números bloqueados. Otras aplicaciones no pueden acceder a la lista.</p>
-
-<p>Al hacer que el bloqueo de números sea una función estándar de la plataforma, Android permite que las
-aplicaciones admitan de manera uniforme el bloqueo de números en una amplia variedad de
-dispositivos. Entre los demás beneficios que pueden aprovechar las aplicaciones, se encuentran los siguientes:</p>
-
-<ul>
- <li> Los números bloqueados en las llamadas también se bloquean en los mensajes de texto.
- <li> Los números bloqueados pueden perdurar tras procesos de restablecimiento y cambios de dispositivos con la función Backup &
-Restore.
- <li> Varias aplicaciones pueden usar la misma lista de números bloqueados.
-</ul>
-
-<p>De manera adicional, la integración de aplicaciones de proveedores a través de Android permite que estos
-lean la lista de números bloqueados del dispositivo y realicen un bloqueo de servicio
-para el usuario, a fin de evitar que el usuario reciba llamadas o mensajes de texto no deseados
-por cualquier medio, como terminales VOIP o teléfonos con transferencia de llamadas.</p>
-
-<p>
- Para obtener más información, consulta <code>android.provider.BlockedNumberContract</code>
- en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API
- </a>descargable.
-</p>
-
-<h2 id="call_screening">Filtración de llamadas</h2>
-
-<p>
- Android N permite que la aplicación predeterminada de un teléfono filtre las llamadas entrantes. La aplicación
- hace esto a través del nuevo <code>CallScreeningService</code>,
- que le permite realizar varias acciones según la clase
- {@link android.telecom.Call.Details Call.Details} de la llamada entrante. Algunos ejemplos:
-</p>
-
-<ul>
- <li> rechazar la llamada entrante;
- <li> no permitir el ingreso de la llamada en el registro de llamadas;
- <li> no mostrar al usuario una notificación de la llamada.
-</ul>
-
-<p>
- Para obtener más información, consulta <code>android.telecom.CallScreeningService</code>
- en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API
- </a>descargable.
-</p>
-
-
-<h2 id="multi-locale_languages">Compatibilidad con varias configuraciones regionales y más idiomas</h2>
-
-
-<p>Android N permite a los usuarios seleccionar <strong>varias configuraciones regionales</strong> en Settings,
-para brindar una mejor compatibilidad con casos de uso de dos idiomas. Las aplicaciones pueden usar
-una nueva API para obtener las configuraciones regionales seleccionadas del usuario y luego ofrecer experiencias más sofisticadas
-para usuarios que usen varias configuraciones regionales; por ejemplo, pueden mostrar resultados de búsqueda en
-varios idiomas y no ofrecer traducciones de páginas web con idiomas que el
-usuario conozca.</p>
-
-<p>Además de la compatibilidad con varias configuraciones regionales, en Android N también se amplía la variedad de idiomas
-disponibles para los usuarios. Se ofrecen más de 25 variantes, cada una de ellas para idiomas de uso
-común, como el inglés, el español, el francés y el árabe. También se agrega compatibilidad
-parcial con más de 100 idiomas nuevos.</p>
-
-<p>Las aplicaciones pueden obtener la lista de configuraciones regionales establecida por el usuario llamando a
-<code>LocaleList.GetDefault()</code>. A fin de admitir la cantidad ampliada de configuraciones regionales, en Android N, se
-modificará la forma de resolver recursos. Asegúrate de controlar que tus aplicaciones
-funcionen de la manera esperada con la nueva lógica de resolución de recursos.</p>
-
-<p>Para obtener información sobre el nuevo comportamiento de resolución de recursos y las prácticas recomendadas que
-debes aplicar, consulta <a href="{@docRoot}preview/features/multilingual-support.html">Compatibilidad con varios idiomas</a>.</p>
-
-
-<h2 id="emoji">Nuevos emojis</h2>
-
-<p>
- Android N presenta más emojis y funciones relacionadas con estos, como
- emojis con diferentes tonos de piel y compatibilidad con selectores de
- variación. Si tu aplicación admite emojis,
- sigue las pautas a continuación para aprovechar estas funciones relacionadas con emojis.
-</p>
-
-<ul>
- <li>
- <strong>Comprueba que el dispositivo contenga el emoji antes de insertarlo.</strong>
- Para corroborar qué emojis tiene la fuente del
- sistema, usa el método {@link android.graphics.Paint#hasGlyph(String)}.
- </li>
- <li>
- <strong>Comprueba que el emoji admita los selectores de variación.</strong>
- Los selectores de variación te permiten
- presentar determinados emojis en color o en blanco y negro.
- En los dispositivos móviles, las aplicaciones deben representar los emojis en color, en lugar de hacerlo en blanco y negro. Sin embargo,
- si tu aplicación muestra los emojis alineados con el texto, debe usar la variación de blanco y negro.
- A fin de determinar si un emoji tiene una variación, usa el selector de variación.
- Para conocer la lista completa de caracteres con variaciones, consulta la sección de
- <em>secuencias de variación de emojis</em> de la
- <a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
- documentación de Unicode sobre variaciones</a>.
- </li>
- <li>
- <strong>Comprueba que el emoji admita tonos de piel.</strong> Android N permite que los usuarios modifiquen el
- tono de piel presentado de los emojis según su preferencia. Las aplicaciones de teclado deben brindar indicaciones
- visuales para los emojis que tienen múltiples tonos de piel y permitir que los usuarios
- seleccionen el tono que prefieran. Para determinar qué emojis del sistema tienen
- modificadores del tono de piel, usa el método {@link android.graphics.Paint#hasGlyph(String)}.
- Puedes determinar qué emojis usan tonos de piel leyendo la
- <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
- documentación de Unicode</a>.
- </li>
-</ul>
-
-
-<h2 id="icu4">API de ICU4J en Android</h2>
-
-<p>
- Android N ahora ofrece un subconjunto de las API de <a href="http://site.icu-project.org/">ICU4J</a> dentro del framework de Android, en
- el paquete <code>android.icu</code>. La migración es sencilla y en mayor medida implica
- simplemente un cambio del espacio de nombres <code>com.java.icu</code> a
- <code>android.icu</code>. Si ya usas el paquete ICU4J en tus
- aplicaciones, el cambio a las API <code>android.icu</code> en el framework de Android
- puede reducir notablemente el tamaño del APK.
-</p>
-
-<p>
- Para obtener más información sobre las API de ICU4J de Android, consulta <a href="{@docRoot}preview/features/icu4j-framework.html">Compatibilidad con ICU4J</a>.
-</p>
-
-
-
-<h2 id="gles_32">API™ de OpenGL ES 3.2</h2>
-
-<p>En Android N se agregan interfaces de framework y compatibilidad con plataformas para OpenGL ES 3.2, entre las que se incluye lo siguiente:</p>
-
-<ul>
- <li> todas las extensiones del <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
-paquete de extensiones de Android</a></a> (AEP), a excepción de <code>EXT_texture_sRGB_decode</code>;
- <li> búferes de fotogramas de punto flotante para HDR y sombreado aplazado;
- <li> llamadas a draw a través de BaseVertex para mejorar el procesamiento por lotes y la transmisión;
- <li> sólido control de acceso a búfer para reducir la sobrecarga de WebGL.
-</ul>
-
-<p>En Android N, la API de framework para OpenGL ES 3.2 se proporciona con la clase
-<code>GLES32</code>. Al usar OpenGL ES 3.2, asegúrate de declarar el
-requisito en tu archivo de manifiesto, con la etiqueta <code><uses-feature></code> y el
-atributo <code>android:glEsVersion</code>. </p>
-
-<p>Para obtener información sobre el uso de OpenGL ES, incluida la manera de comprobar la
-versión de OpenGL ES que admite el dispositivo durante el tiempo de ejecución, consulta la<a href="{@docRoot}guide/topics/graphics/opengl.html"> guía de la API OpenGL ES</a>.</p>
-
-
-<h2 id="android_tv_recording">Grabación de Android TV</h2>
-
-<p>En Android N, se agrega la capacidad de grabar y reproducir contenido de servicios
-de entrada de Android TV a través de las nuevas API de grabación. Aprovechando las mejoras existentes de las API time shifting
-, los servicios de entrada de TV pueden controlar los datos de canales que pueden grabarse y la manera
-en que se guardan las sesiones grabadas, y administrar la interacción del usuario con el contenido grabado. </p>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}preview/features/tv-recording-api.html">API de grabación de Android TV</a>.</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work suma muchas funciones y API nuevas para dispositivos con Android N.
-A continuación, se muestran algunos aspectos destacados. Para ver la lista completa de cambios, consulta
-<a href="{@docRoot}preview/features/afw.html">Actualizaciones de Android for Work</a>.</p>
-
-<h3 id="work_profile_security_challenge">Comprobación de seguridad para perfiles de trabajo </h3>
-
-<p>
- Los propietarios de perfiles orientados al SDK de Android N
- pueden especificar una comprobación de seguridad independiente para las aplicaciones que se ejecutan en
- el perfil de trabajo. La comprobación para perfiles de trabajo se muestra cuando un usuario intenta abrir
- aplicaciones de trabajo. Cuando la comprobación de seguridad es exitosa, se desbloquea el
- perfil de trabajo y se descifra si es necesario. Para quienes posean perfiles,
- <code>ACTION_SET_NEW_PASSWORD</code> solicita al usuario establecer una comprobación de
- trabajo y <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> le solicita
- establecer un bloqueo de dispositivo.
-</p>
-
-<p>
- Quienes posean perfiles pueden establecer políticas de contraseñas diferentes para la comprobación de seguridad de trabajo
- (por ejemplo, la extensión que debe tener el PIN o la posibilidad de usar una huella digital
- para desbloquear el perfil) usando <code>setPasswordQuality()</code>,
- <code>setPasswordMinimumLength()</code> y métodos relacionados. También
- pueden establecer el bloqueo del dispositivo usando la instancia de <code>DevicePolicyManager</code>
- devuelta por el nuevo método <code>getParentProfileInstance()</code>.
- Además, tienen la posibilidad de personalizar la pantalla de credenciales de la
- comprobación de trabajo usando los nuevos métodos <code>setOrganizationColor()</code> y
- <code>setOrganizationName()</code>.
-</p>
-<h3 id="turn_off_work">Desactivación del modo de trabajo </h3>
-
-<p>En dispositivos con perfil de trabajo, los usuarios pueden alternar el modo de trabajo. Cuando este último está
-inactivo, el usuario administrado queda deshabilitado temporalmente, con lo cual se desactivan las aplicaciones de perfiles
-de trabajo, la sincronización en segundo plano y las notificaciones. Esto incluye la aplicación del propietario del
-perfil. Cuando el modo de trabajo está inactivo, en el sistema se muestra un ícono
-de estado persistente para recordar al usuario que no puede iniciar aplicaciones de trabajo. El launcher
-indica que no es posible acceder a aplicaciones ni widgets de trabajo. </p>
-
-<h3 id="always_on_vpn">Always on VPN </h3>
-
-<p>Los propietarios de dispositivos y perfiles pueden asegurarse de que las aplicaciones de trabajo siempre se conecten
-a través de una VPN especificada. El sistema inicia dicha VPN en forma automática después del
-inicio del dispositivo.</p>
-
-<p>
- Los nuevos métodos de <code>DevicePolicyManager</code> son
- <code>setAlwaysOnVpnPackage()</code> y
- <code>getAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>Debido a que los servicios de VPN pueden enlazarse directamente a través del sistema sin interacción con
-aplicaciones, los clientes de VPN deben administrar nuevos puntos de entrada para Always on VPN. Al igual que
-antes, los servicios se indican al sistema con una
-clase <code>android.net.VpnService</code> de acción de coincidencia de filtro de intents. </p>
-
-<p>
- Los usuarios también pueden establecer clientes Always on VPN que implementen métodos
- <code>VPNService</code> en el usuario principal con
- <strong>Settings > More > Vpn</strong>.
-</p>
-
-<h3 id="custom_provisioning">Aprovisionamiento personalizado</h3>
-
-<p>
- En una aplicación, se pueden personalizar los flujos de aprovisionamiento
- del propietario del perfil y del dispositivo con logos y colores corporativos.
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> personaliza el
- color del flujo. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- personaliza el flujo con un logotipo corporativo.
-</p>
-
-<h2 id="accessibility_enhancements">Mejoras de accesibilidad</h2>
-
-<p>Android N ahora ofrece Vision Settings directamente en la pantalla de bienvenida para la configuración de
-dispositivos nuevos. Esto permite a los usuarios descubrir y configurar de manera mucho más sencilla
-funciones de accesibilidad en sus dispositivos, como el gesto de ampliación, el tamaño
-de fuente, el tamaño de pantalla y TalkBack. </p>
-
-<p>Al tener estas funciones de accesibilidad una disposición más prominente, es más probable
-que tus usuarios prueben tu aplicación con ellas habilitadas. Asegúrate de probar tus aplicaciones
-anticipadamente con esta configuración habilitada. Puedes habilitarla en Settings >
-Accessibility.</p>
-
-<p>Además, los servicios de accesibilidad de Android N ahora pueden asistir a los usuarios con discapacidades
-motrices con el uso de la pantalla. La nueva API permite crear servicios con
-funciones como el seguimiento de rostros u ojos y la exploración por puntos, entre otros, para satisfacer
-las necesidades de estos usuarios.</p>
-
-<p>Para obtener más información, consulta <code>android.accessibilityservice.GestureDescription</code>
- en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.</p>
-
-
-<h2 id="direct_boot">Inicio directo</h2>
-
-<p>El inicio directo optimiza los tiempos de inicio del dispositivo y permite una funcionalidad
-limitada de las aplicaciones aun después de un reinicio inesperado.
-Por ejemplo, si un dispositivo encriptado se reinicia mientras el usuario duerme,
-este último puede continuar recibiendo en forma normal notificaciones de alarmas, llamadas entrantes y mensajes
-registrados. Esto también significa que los servicios de accesibilidad también pueden estar
- disponibles de inmediato después de un reinicio.</p>
-
-<p>El inicio directo aprovecha la encriptación basada en archivos de Android N,
-a fin de habilitar políticas de encriptación específicas para datos del sistema y de aplicaciones.
-El sistema usa un encriptado por el dispositivo para datos de sistema seleccionados y datos de aplicaciones
-explícitamente registrados. De forma predeterminada, se usa un depósito encriptado con credenciales para los
- datos de sistema, los datos de usuario, las aplicaciones y los datos de aplicaciones restantes. </p>
-
-<p>Durante el inicio, el sistema se carga en un modo restringido con acceso únicamente
-a datos encriptados por el dispositivo y sin acceso general a aplicaciones o datos.
-Si hay componentes que deseas ejecutar en este modo, puedes registrarlos
-configurando un marcador en el manifiesto. Después del reinicio, el sistema activa
-componentes registrados transmitiendo la intent <code>LOCKED_BOOT_COMPLETED</code>
-. El sistema garantiza que estén disponibles los datos de aplicaciones encriptados por el dispositivo
-antes de la desactivación del bloqueo. No es posible acceder a los demás datos hasta que el usuario confirme sus credenciales de pantalla de
- bloqueo para descifrarlos. </p>
-
-Para obtener más información, consulta <a href="{@docRoot}preview/features/direct-boot.html">Inicio directo</a>.</p>
-</p>
-
-
-<h2 id="key_attestation">Atestación de claves</h2>
-
-<p>Los depósitos de claves guardados en hardware proporcionan un método mucho más seguro para crear, almacenar
-y usar claves criptográficas en dispositivos Android. Protegen las claves contra funciones del kernel de
-Linux, vulnerabilidades potenciales de Android y extracciones
-de dispositivos con derechos de administrador.</p>
-
-<p>Para hacer más sencillo y seguro el uso de depósitos de claves guardados en hardware,
-en Android N, se presenta la atestación de claves. En las aplicaciones y en los servicios que no dependen de los dispositivos se puede usar la atestación
-de claves para determinar fehacientemente el almacenamiento de un par de claves RSA o EC se
-en hardware, las propiedades de dicho par y las
- limitaciones aplicadas a su uso y validez. </p>
-
-<p>Los servicios que no dependen de los dispositivos y las aplicaciones pueden solicitar información acerca de un par de claves
-a través de un certificado de atestación X.509 que debe firmarse con una clave de atestación
-válida. La clave de atestación es una clave de firma ECDSA que se
-inyecta en el depósito de claves guardado en hardware en la fábrica.
-Por lo tanto, un certificado de atestación firmado con una clave de atestación
-válida confirma la existencia de un depósito de claves guardado en hardware y de información detallada
- sobre los pares de claves en dicho depósito de claves.</p>
-
-<p>Para asegurarse de que el dispositivo use una imagen segura y oficial de fábrica de
-Android, la atestación de claves solicita que el <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a>
-del dispositivo proporcione la siguiente información al <a class="external-link" href="https://source.android.com/security/trusty/index.html">entorno de ejecución
-seguro (TEE)</a>:</p>
-
-<ul>
-<li>la versión del SO y el nivel de revisión instalados en el dispositivo;</li>
-<li>la clave pública de <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> y el estado de bloqueo.</li>
- </ul>
-
-<p>Para obtener más información sobre la función de depósitos de claves guardados en hardware,
-consulta la guía de<a href="https://source.android.com/security/keystore/" class="external-link"> Depósito de clave guardado en hardware</a>.</p>
-
-<p>Además de la atestación de claves, en Android N también se presentan
- claves enlazadas a huellas digitales no revocadas en la inscripción con estas huellas.</p>
-
-<h2 id="network_security_config">Configuración de seguridad de la red</h2>
-
-<p>En Android N, las aplicaciones pueden personalizar el comportamiento de sus conexiones protegidas (HTTPS y TLS)
-en forma segura, sin modificaciones en el código, a través de la
-<em>Configuración de seguridad de la red</em> en lugar de las API
-convencionales, propensas a generar errores (p. ej., X509TrustManager).</p>
-
- <p>Funciones admitidas:</p>
-<ul>
-<li><b>Anclajes de confianza personalizados.</b> Permite personalizar qué autoridades de
-certificado (CA) son de confianza para las conexiones de seguridad de una aplicación. Por ejemplo,
- confiar en certificados autofirmados particulares o un conjunto restringido de CA públicas.
-</li>
-<li><b>Anulaciones de solo depuración.</b> Permite que el desarrollador de una aplicación depure en forma segura
-conexiones protegidas de su aplicación sin riesgos adicionales para la base
-instalada.
-</li>
-<li><b>Desactivación del tráfico de Cleartext.</b> Permite que una aplicación se proteja a sí misma contra
-el uso accidental de tráfico de Cleartext.</li>
-<li><b>Fijación de certificados.</b> Esta es una función avanzada que permite a una aplicación
- limitar las claves de servidores en las que se pueda confiar para conexiones protegidas.</li>
-</ul>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}preview/features/security-config.html">Configuración de seguridad de
-la red</a>.</p>
-
-<h2 id="default_trusted_ca">Entidad de certificación de confianza predeterminada</h2>
-
-<p>De manera predeterminada, en las aplicaciones orientadas a Android N solo se consideran como confiables los certificados proporcionados por el sistema
-y ya no se da esta misma consideración a las entidades de certificación (CA) agregadas por usuarios. En aquellas aplicaciones orientadas a Android
-N para las cuales se desee considerar tales CA como válidas, se debe usar la
-<a href="{@docRoot}preview/features/security-config.html">Configuración de seguridad de la red</a> a fin de
-especificar los términos de confianza de dichas CA.</p>
-
-<h2 id="apk_signature_v2">Esquema de firma de APK v2</h2>
-
-<p>
- Android N presenta el esquema de firma de APK v2, un nuevo esquema de firma de aplicaciones que
- ofrece instalación más rápida de las aplicaciones y mayor protección contra alteraciones
- no autorizadas de archivos APK. De forma predeterminada, Android Studio 2.2 y el complemento de Android
- para Gradle 2.2 firman tu aplicación con el esquema de firma de APK v2 y
- el esquema de firma tradicional, que utiliza la firma JAR.
-</p>
-
-<p>
- Aunque recomendamos que implementes el esquema de firma de APK v2 en tu aplicación, este esquema
- nuevo no es obligatorio. Si la aplicación no se compila correctamente con el
- esquema de firma de APK v2, puedes deshabilitar este esquema nuevo. Si se deshabilita el proceso,
- Android Studio 2.2 y el complemento de Android para Gradle 2.2 firman tu
- aplicación con el esquema de firma tradicional solamente. Para firmar solo con el
- esquema tradicional, abre el archivo <code>build.gradle</code> del nivel del módulo, a continuación,
- agrega la línea <code>v2SigningEnabled false</code> a la configuración de firma
- de la versión:
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>Advertencia: </strong> Si firmas la aplicación con el
- esquema de firma de APK v2 y luego la modificas, se invalida
- la firma de la aplicación. Por este motivo, usa herramientas como <code>zipalign</code>
- antes de firmar la aplicación con el esquema de firma de APK v2, y no después.
-</p>
-
-<p>
- Para obtener más información, lee los documentos de Android Studio que describen cómo
- <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
- firmar una aplicación</a> en Android Studio y cómo<a href="{@docRoot}studio/build/build-variants.html#signing"> configurar
- el archivo de compilación para firmar aplicaciones</a> con el complemento de Android para Gradle.
-</p>
-
-<h2 id="scoped_directory_access">Acceso a directorios determinados</h2>
-
-<p>En Android N, las aplicaciones pueden usar nuevas API para solicitar acceso a directorios de <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">almacenamiento
-externo</a> específicos, incluidos los directorios de medios extraíbles, como las tarjetas
-SD. Las nuevas API simplifican enormemente la manera en que tu aplicación accede a directorios
-de almacenamiento externo estándares, como <code>Pictures</code>. Las aplicaciones
-de fotografía, por ejemplo, pueden usar estas API en lugar de
-<code>READ_EXTERNAL_STORAGE</code>, que otorga acceso a todos los directorios
-de almacenamiento, o del framework de acceso a almacenamiento, con el cual el usuario debe navegar hasta
-el directorio.</p>
-
-<p>A su vez, las nuevas API simplifican los pasos que un usuario debe seguir para otorgar a tu aplicación acceso a almacenamiento
-externo. Cuando se usan las nuevas API, el sistema emplea una IU de
-permisos simple en la que se detallan claramente los directorios a los cuales
-la aplicación solicita acceso.</p>
-
-<p>Para obtener más información, consulta la documentación
-<a href="{@docRoot}preview/features/scoped-folder-access.html">Acceso
-a directorios determinados</a> para desarrolladores.</p>
-
-<h2 id="keyboard_shortcuts_helper">Ayuda en los métodos abreviados del teclado</h2>
-
-<p>
-En Android N, el usuario puede presionar "Alt + /" para activar una pantalla de <em>métodos abreviados del teclado</em>
-que muestra todos los métodos abreviados disponibles, tanto para el
-sistema como la aplicación que esté en primer plano. Estos se recuperan automáticamente del menú de la aplicación si
-están disponibles, pero los desarrolladores pueden proporcionar sus propios métodos abreviados perfeccionados
-para la pantalla. Puedes hacerlo anulando el nuevo método
-<code>Activity.onProvideKeyboardShortcuts()</code>, lo que se describe en la
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
-</p>
-
-<p>
-Para activar la ayuda en los métodos abreviados del teclado desde cualquier ubicación en la aplicación,
-llama a {@code Activity.requestKeyboardShortcutsHelper()} para la actividad relevante.
-</p>
-
-<h2 id="sustained_performance_api">API de rendimiento sostenido</h2>
-
-<p>
-El rendimiento puede fluctuar considerablemente en las aplicaciones de ejecución prolongada porque el
-sistema limita los motores de sistemas en chip cuando los componentes del dispositivo alcanzan los
-límites de temperatura. Esta fluctuación presenta un objetivo móvil para los desarrolladores
-de aplicaciones que crean aplicaciones de alto rendimiento y ejecución prolongada.
-</p>
-
-<p>
-Android N incluye compatibilidad opcional para un
-<em>modo de rendimiento sostenido</em>, que permite que los fabricantes de equipo original (OEM) arrojen datos sobre las capacidades de rendimiento del dispositivo
-para las aplicaciones de ejecución prolongada. Los desarrolladores
-de aplicaciones pueden usar estos datos para perfeccionar sus aplicaciones y alcanzar un nivel
-uniforme y predecible de rendimiento en el dispositivo durante períodos prolongados.
-</p>
-
-<p>
-Los desarrolladores de aplicaciones solo pueden probar esta API nueva en la N Developer Preview instalada solo en dispositivos con
-Nexus 6P. Para usar esta función,
-establece el indicador de rendimiento sostenido de la ventana
-que deseas ejecutar en el modo de rendimiento sostenido. Establece este indicador con el método
-{@code Window.setSustainedPerformanceMode()}. El sistema deshabilita
-automáticamente este modo cuando la ventana deja de estar en primer plano.
-</p>
-
-<h2 id="vr">Soporte de RV</h2>
-
-<p>
-Android N agrega compatibilidad y optimizaciones de plataforma para un modo de RV nuevo, con el objetivo de que los
- desarrolladores puedan forjar experiencias de RV móviles de alta calidad para los usuarios. Hay varias mejoras en el
-rendimiento, entre las que se incluye el acceso a un núcleo de CPU exclusivo para aplicaciones de RV.
-Dentro de tus aplicaciones, puedes aprovechar el seguimiento de cabeza inteligente
-y las notificaciones en sonido estéreo que funcionan para la RV. Un dato muy importante es que Android N presenta
-muy pocos gráficos de baja latencia. Para obtener información completa sobre el desarrollo de aplicaciones de RV para Android N,
-consulta <a href="https://developers.google.com/vr/android/">Google VR SDK para Android</a>.
-</p>
-
-
-<h2 id="print_svc">Mejoras del servicio de impresión</h2>
-
-<p>
- En Android N, los desarrolladores de servicios de impresión ahora pueden publicar información adicional
- sobre impresoras y trabajos de impresión individuales.
-</p>
-
-<p>
- Al enumerar las impresoras individuales, un servicio de impresión ahora puede establecer íconos
- por impresora de dos maneras:
-</p>
-
-<ul>
- <li>Puedes establecer un ícono desde el id. de un recurso llamando a
- <code>PrinterInfo.Builder.setResourceIconId()</code>.
- </li>
-
- <li>Puedes mostrar un ícono de la red llamando a
- <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code> y configurando un
- callback para cuando se solicite el ícono con
- <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>.
- </li>
-</ul>
-
-<p>
- Además, puedes proporcionar las actividades por impresora para mostrar información
- adicional llamando a <code>PrinterInfo.Builder.setInfoIntent()</code>.
-</p>
-
-<p>
- Puedes indicar el progreso y el estado de los trabajos de impresión en la notificación de
- trabajo de impresión llamando a
- <code>android.printservice.PrintJob.setProgress()</code> y
- <code>android.printservice.PrintJob.setStatus()</code>, respectivamente.
-</p>
-
-<p>
- Para obtener más información sobre estos métodos, consulta la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
-</p>
-
-<h2 id="framemetrics_api">API FrameMetricsListener</h2>
-
-<p>
-La API FrameMetricsListener permite que una aplicación monitoree el rendimiento de la representación
-de la IU. La API brinda esta capacidad mediante la exposición de una transmisión de API Pub/Sub para transferir información sobre el tiempo
-de los cuadros para la ventana actual de la aplicación. Los datos devueltos son
-equivalentes a lo que muestra <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code>, pero no se limita a los últimos 120 cuadros.
-</p>
-
-<p>
-Puedes usar FrameMetricsListener para medir el rendimiento de
-la IU del nivel de interacción en producción sin contar con una conexión USB. Esta API
-permite recopilar datos con una especificidad mayor que
-{@code adb shell dumpsys gfxinfo}. Esta especificidad mayor es posible porque
-el sistema puede recopilar datos para interacciones determinadas en la aplicación, sin que sea
-necesario que el sistema obtenga un resumen global del
-rendimiento de toda la aplicación o borre un estado global. Puedes usar esta
-capacidad con el objetivo de recopilar datos de rendimiento e identificar regresiones en el rendimiento de la IU
-para casos de uso reales dentro de una aplicación.
-</p>
-
-<p>
-Para monitorear una ventana, implementa el callback <code>FrameMetricsListener.onMetricsAvailable()</code>
-y regístralo en esa ventana. Para obtener más información, consulta
-la documentación de la clase {@code FrameMetricsListener}
-en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referencia de la API</a> descargable.
-</p>
-
-<p>
-La API proporciona un objeto {@code FrameMetrics}, que contiene datos de intervalos que
-el subsistema de representación informa sobre varios hitos en el ciclo de vida de un marco.
-Las métricas compatibles son {@code UNKNOWN_DELAY_DURATION},
-{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
-{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
-{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
-{@code TOTAL_DURATION} y {@code FIRST_DRAW_FRAME}.
-</p>
-
-
-<h2 id="virtual_files">Archivos virtuales</h2>
-
-<p>
- En versiones anteriores de Android, tu aplicación podía usar el framework
- de acceso al almacenamiento para permitir a los usuarios seleccionar archivos de cuentas de almacenamiento en la nube,
- como Google Drive. Sin embargo, no se podían representar los archivos que no
- tenían una representación directa en código de bits; cada archivo debía brindar
- un flujo de entrada.
-</p>
-
-<p>
- Android N incorpora el concepto de <em>archivos virtuales</em> al framework
- de acceso al almacenamiento. La función de archivos virtuales permite que tu
- {@link android.provider.DocumentsProvider} devuelva URI de documentos que se pueden
- usar en una intent {@link android.content.Intent#ACTION_VIEW} incluso si
- no tienen una representación directa en código de bits. Android N también te permite
- ofrecer formatos alternativos para archivos del usuario, virtuales u otros.
-</p>
-
-<p>
- Para obtener un URI para un documento virtual en tu aplicación, primero crea una
- {@link android.content.Intent} a fin de abrir la IU del selector de archivos. Como una aplicación
- no puede abrir directamente un archivo virtual con el método
- {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()},
- la aplicación no recibe ningún archivo virtual si incluyes la categoría
- {@link android.content.Intent#CATEGORY_OPENABLE}.
-</p>
-
-<p>
- Cuando el usuario realiza una selección, el sistema llama al método
- {@link android.app.Activity#onActivityResult onActivityResult()}.
- La aplicación puede recuperar el URI del archivo virtual y obtener un flujo de entrada, como
- se demuestra en el fragmento de código a continuación.
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- Para obtener más información sobre el acceso a archivos del usuario, consulta la
- <a href="{@docRoot}guide/topics/providers/document-provider.html">guía
- Frameworks de acceso a almacenamiento</a>.
-</p>
diff --git a/docs/html-intl/intl/es/preview/behavior-changes.jd b/docs/html-intl/intl/es/preview/behavior-changes.jd
deleted file mode 100644
index 5eb4966..0000000
--- a/docs/html-intl/intl/es/preview/behavior-changes.jd
+++ /dev/null
@@ -1,610 +0,0 @@
-page.title=Cambios en los comportamientos
-page.keywords=versión preliminar,sdk,compatibilidad
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>En este documento</h2>
-
-<ol>
- <li><a href="#perf">Mejoras de rendimiento</a>
- <ol>
- <li><a href="#doze">Descanso</a></li>
- <li><a href="#bg-opt">Optimizaciones en segundo plano</a></li>
- </ol>
- </li>
- <li><a href="#perm">Cambios en los permisos</a>
- </li>
- <li><a href="#sharing-files">Intercambio de archivos entre aplicaciones</a></li>
- <li><a href="#accessibility">Mejoras de accesibilidad</a>
- <ol>
- <li><a href="#screen-zoom">Zoom de la pantalla</a></li>
- <li><a href="#vision-settings">Vision Settings en el asistente de configuración</a></li>
- </ol>
- </li>
- <li><a href="#ndk">Aplicaciones del NDK con vínculos a bibliotecas de plataformas</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">Retención de anotaciones</a></li>
- <li><a href="#other">Otros aspectos importantes</a></li>
-</ol>
-
-<h2>Consulta también</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">
- Información general sobre la API de Android N</a></li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Además de nuevas características y capacidades, Android N
- incluye diversos cambios en el sistema y en los comportamientos de la API. En este documento,
- se destacan algunos de los cambios principales que debes comprender y justificar
- en tus aplicaciones.
-</p>
-
-<p>
- Si publicaste anteriormente una aplicación para Android, ten en cuenta que tu aplicación
- podría verse afectada por estos cambios en la plataforma.
-</p>
-
-
-<h2 id="perf">Batería y memoria</h2>
-
-<p>
-Android N incluye cambios en los comportamientos del sistema para mejorar la duración de la batería
-de los dispositivos y reducir el uso de la memoria RAM. Estos cambios pueden afectar el acceso de tu aplicación a
-recursos del sistema, además de la manera en que tu aplicación interactúa con otras aplicaciones mediante
-determinadas intents implícitas.
-</p>
-
-<h3 id="doze">Descanso</h3>
-
-<p>
- Descanso, presentado en Android 6.0 (nivel de API 23), prolonga la duración de la batería
- aplazando actividades de CPU y red cuando un usuario deja un dispositivo desenchufado,
- quieto y con la pantalla apagada. En Android N se ofrecen más
- mejoras para Descanso a través de la aplicación de un subconjunto de restricciones de CPU y red
- mientras el dispositivo se encuentra desenchufado y con la pantalla apagada, aunque no necesariamente
- quieto; por ejemplo, al ir dentro del bolsillo de un usuario en movimiento.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>Figura 1:</strong> Ilustración del modo en que Descanso aplica un primer nivel de
- restricciones de actividad del sistema para prolongar la duración de la batería.
-</p>
-
-<p>
- Cuando un dispositivo funciona con la batería y la pantalla permanece apagada durante un tiempo
- determinado, se activa en este el modo Descanso y se aplica el primer subconjunto de restricciones: se
- desactiva el acceso de las aplicaciones a la red y se aplazan tareas y sincronizaciones. Si el dispositivo
- permanece quieto durante un tiempo determinado tras activarse el modo Descanso, el sistema aplica el
- resto de las restricciones del modo a {@link android.os.PowerManager.WakeLock},
- alarmas de {@link android.app.AlarmManager}, GPS y análisis de Wi-Fi. Independientemente de que
- se apliquen algunas o todas las restricciones del modo Descanso, el sistema activa el
- dispositivo durante plazos de mantenimiento breves en los cuales las aplicaciones tienen
- acceso a la red y pueden ejecutar sincronizaciones o procesos aplazados.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>Figura 2:</strong> Ilustración del modo en que Descanso aplica un segundo nivel de
- restricciones de actividad del sistema después de que el dispositivo permanece quieto durante un tiempo determinado.
-</p>
-
-<p>
- Ten en cuenta que, cuando se activa la pantalla o se enchufa el dispositivo, se desactiva el modo Descanso y
- se retiran estas restricciones de procesamiento. El comportamiento adicional no
- tiene efecto sobre las recomendaciones ni las prácticas recomendadas para adaptar tu aplicación a la versión
- anterior de Descanso, presentada en Android 6.0 (nivel de API 23), según lo descrito en
- <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
- Optimización para Descanso y App Standby</a>. De todos modos, debes
- seguir las recomendaciones; por ejemplo, la de usar Google Cloud Messaging (GCM) para
- enviar y recibir mensajes, y la de planificar actualizaciones para adaptar
- el comportamiento adicional de Descanso.
-</p>
-
-
-<h3 id="bg-opt">Project Svelte: Optimizaciones en segundo plano</h3>
-
-<p>
- En Android N, se eliminan tres transmisiones implícitas para ayudar a optimizar el uso de la
- memoria y el consumo de energía. Este cambio es necesario porque las transmisiones
- implícitas a menudo inician aplicaciones que se registran para realizar un seguimiento de ellas en
- segundo plano. La eliminación de estas transmisiones puede mejorar sustancialmente el rendimiento del dispositivo
- y la experiencia del usuario.
-</p>
-
-<p>
- Los dispositivos móviles están sujetos a cambios de conectividad frecuentes
- entre los modos de datos Wi-Fi y móviles. Actualmente, las aplicaciones pueden realizar controles en busca de cambios en la
- conectividad registrando un receptor para la transmisión implícita {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} en su
- manifiesto. Debido a que muchas aplicaciones se registran para recibir esta transmisión, un cambio de
- red puede hacer que todas se activen y procesen la transmisión a la
- vez.
-</p>
-
-<p>
- Asimismo, en versiones anteriores de Android, las aplicaciones podían registrarse para recibir las transmisiones implícitas {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} y {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} de otras aplicaciones, como la
- cámara. Cuando un usuario toma una foto con la aplicación de la cámara, estas aplicaciones se activan
- para procesar la transmisión.
-</p>
-
-<p>
- Para corregir estos problemas, en Android N se aplican las siguientes
- optimizaciones:
-</p>
-
-<ul>
- <li>Las aplicaciones orientadas a Android N no reciben transmisiones {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION}, aun cuando contengan
- entradas de manifiesto que les permitan solicitar notificaciones de estos eventos. Las aplicaciones que
- se ejecutan aún pueden escuchar {@code CONNECTIVITY_CHANGE} en su subproceso principal
- si solicitan una notificación con un {@link android.content.BroadcastReceiver}.
- </li>
-
- <li>Las aplicaciones no pueden enviar ni recibir transmisiones {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} ni {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}. Esta optimización
- afecta a todas las aplicaciones, no solo a aquellas orientadas a Android N.
- </li>
-</ul>
-
-<p>Si la aplicación utiliza cualquiera de estas intents, debes quitar las dependencias
- en ellas lo antes posible a fin de poder orientar los dispositivos con Android N correctamente.
- El framework de Android ofrece varias soluciones para mitigar la necesidad de
- estas transmisiones implícitas. Por ejemplo, la API {@link
- android.app.job.JobScheduler} proporciona un mecanismo sólido para programar
- operaciones de red cuando se cumplen las condiciones especificadas, como una conexión a una
- red de uso no medido. Puedes usar {@link
- android.app.job.JobScheduler} para responder a cambios en proveedores de contenido.
-</p>
-
-<p>
- Para obtener más información sobre optimizaciones en segundo plano en Android N y la manera de adaptar tu aplicación,
- consulta <a href="{@docRoot}preview/features/background-optimization.html">Optimizaciones
- en segundo plano</a>.
-</p>
-
-<h2 id="perm">Cambios en los permisos</h2>
-
-<p>
- En Android N, se incorporan cambios en permisos que pueden afectar tu aplicación.
-</p>
-
-<h3 id="permfilesys">Cambios en los permisos del sistema de archivos</h3>
-
-<p>
- Para mejorar la seguridad de los archivos privados, el directorio privado de
- las aplicaciones orientadas a Android N o versiones posteriores tiene acceso restringido. (<code>0700</code>).
- Esta configuración evita la fuga de metadatos de archivos privados, como su tamaño
- o existencia. Este cambio en los permisos tiene varios efectos secundarios:
-</p>
-
-<ul>
- <li>
- Los propietarios ya no pueden reducir los permisos de archivo de los archivos privados,
- y un intento de hacerlo utilizando
- {@link android.content.Context#MODE_WORLD_READABLE} o
- {@link android.content.Context#MODE_WORLD_WRITEABLE} activará una
- {@link java.lang.SecurityException}.
- <p class="note">
- <strong>Nota:</strong> Desde ahora, esta restricción no se aplica planamente.
- Las aplicaciones pueden seguir modificando los permisos para sus directorios privados con
- las API nativas o la API {@link java.io.File File}. Sin embargo, desaconsejamos
- reducir los permisos para el directorio privado.
- </p>
- </li>
- <li>
- Pasar URI <code>file://</code> fuera del dominio del paquete puede dar al
- receptor una ruta de acceso inaccesible. Por lo tanto, los intentos de pasar un
- URI <code>file://</code> activan una
- <code>FileUriExposedException</code>. La manera recomendada para compartir el
- contenido de un archivo privado consiste en utilizar el {@link
- android.support.v4.content.FileProvider}.
- </li>
- <li>
- El {@link android.app.DownloadManager} ya no puede compartir archivos
- almacenados de manera privada por nombre de archivo. Las aplicaciones heredadas pueden terminar con una
- ruta de acceso inaccesible cuando acceden a {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Las aplicaciones orientadas a
- Android N o versiones posteriores activan una {@link java.lang.SecurityException} cuando
- intentan acceder a
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
- Las aplicaciones heredadas que establecen la ubicación de descarga en una ubicación pública
- usando
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalFilesDir
- DownloadManager.Request.setDestinationInExternalFilesDir()} o
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalPublicDir
- DownloadManager.Request.setDestinationInExternalPublicDir()}
- siguen teniendo acceso a la ruta de acceso en
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}; sin embargo, se desaconseja
- seguir este método. El método preferido para acceder a un archivo
- expuesto por el{@link android.app.DownloadManager} consiste en utilizar
- {@link android.content.ContentResolver#openFileDescriptor
- ContentResolver.openFileDescriptor()}.
- </li>
-</ul>
-
-<h2 id="sharing-files">Intercambio de archivos entre aplicaciones</h2>
-
-<p>
-En las aplicaciones orientadas a Android N, el framework de Android aplica
-la política de la API {@link android.os.StrictMode} que prohíbe exponer URI {@code file://}
-fuera de la aplicación. Si una intent con un URI de archivo sale de tu aplicación, la aplicación falla
-con una excepción {@code FileUriExposedException}.
-</p>
-
-<p>
-Para compartir archivos entre aplicaciones, debes enviar un URI {@code content://}
-y otorgar un permiso de acceso temporal en el URI. La forma más sencilla de otorgar este permiso es
-utilizando la clase {@link android.support.v4.content.FileProvider}. Para obtener más información
-sobre permisos e intercambio de archivos,
-consulta <a href="{@docRoot}training/secure-file-sharing/index.html">Intercambio de archivos</a>.
-</p>
-
-<h2 id="accessibility">Mejoras de accesibilidad</h2>
-
-<p>
- En Android N, se incluyen cambios destinados a mejorar la usabilidad de la
- plataforma para usuarios con defectos o discapacidades visuales. Estos cambios
- generalmente no deben exigir modificaciones en el código de tu aplicación. Sin embargo, debes revisar
- estas funciones y probarlas con tu aplicación para avaluar el posible impacto en la experiencia
- del usuario.
-</p>
-
-
-<h3 id="screen-zoom">Zoom de la pantalla</h3>
-
-<p>
- Android N permite a los usuarios configurar <strong>Display size</strong>, el ajuste que expande
- o contrae todos los elementos de la pantalla, lo cual mejora la accesibilidad al dispositivo
- para usuarios con poca visión. Estos no podrán superar el valor de zoom
- mínimo de <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
- sw320dp</a> para el ancho de pantalla, que es el ancho de un Nexus 4, un teléfono común de tamaño intermedio.
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>Figura 3:</strong> En la pantalla de la derecha se muestra el efecto que tiene
- aumentar Display size para un dispositivo con una imagen de sistema de Android N.
-</p>
-
-
-<p>
- Al cambiar la densidad del dispositivo, el sistema notifica a las aplicaciones de las
- siguientes maneras:
-</p>
-
-<ul>
- <li>Si una aplicación se orienta hacia el nivel de API 23 o uno inferior, el sistema automáticamente finaliza
- todos los procesos en segundo plano. Esto significa que, si un usuario hace a un lado
- dicha aplicación para abrir la pantalla <em>Settings</em> y cambiar la configuración de
- <strong>Display size</strong>, el sistema finalizará la aplicación tal
- como lo haría en una situación de bajos recursos de memoria. Si en la aplicación hay procesos en
- primer plano, el sistema notifica a estos procesos el cambio en la configuración como se
- indica en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Manejo de cambios
- en tiempo de ejecución</a>, así como lo haría si cambiara la orientación del dispositivo.
- </li>
-
- <li>Si una aplicación se orienta hacia Android N, se notifica a todos los procesos
- (en primer y segundo plano) el cambio en la configuración, como se
- indica en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Manejo de cambios
- en tiempo de ejecución</a>.
- </li>
-</ul>
-
-<p>
- En la mayoría de las aplicaciones, no se necesitan cambios para admitir esta función, si
- en ellas se siguen las prácticas recomendadas de Android. Verificaciones específicas que deben realizarse:
-</p>
-
-<ul>
- <li>Prueba tu aplicación en un dispositivo con ancho de pantalla <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
- y asegúrate de que funcione bien.
- </li>
-
- <li>Cuando se modifique la configuración del dispositivo, actualiza la información almacenada en caché que
- dependa de la densidad, como los mapas de bits o recursos almacenados en caché que se carguen desde la
- red. Busca de cambios en la configuración cuando se reanude la actividad de la aplicación, después de la
- pausa.
- <p class="note">
- <strong>Nota:</strong> Si almacenaste en caché datos que dependen de la configuración, te
- convendrá incluir metadatos relacionados, como el tamaño de pantalla
- correspondiente o la densidad de píxeles para dichos datos. Guardar estos metadatos te permite
- decidir si necesitas actualizar los datos almacenados en caché después de un cambio en la
- configuración.
- </p>
- </li>
-
- <li>Evita especificar dimensiones con unidades px, ya que no responden a la
- densidad de pantalla. En lugar de ello, recurre a unidades de <a href="{@docRoot}guide/practices/screens_support.html">píxeles
- (<code>dp</code>) independientes de la densidad</a>.
- </li>
-</ul>
-
-<h3 id="vision-settings">Vision Settings en el asistente de configuración</h3>
-
-<p>
- Vision Settings se incluye en la pantalla de Bienvenida de Android N, en la cual los usuarios pueden
- configurar los siguientes ajustes de accesibilidad para un nuevo dispositivo:
- <strong>Magnification gesture</strong>, <strong>Font size</strong>,
- <strong>Display size</strong> y <strong>TalkBack</strong>. Este cambio
- aumenta la visibilidad de errores relacionados con diferentes ajustes de pantalla. Para
- evaluar el impacto de esta función, debes probar tus aplicaciones con estos
- ajustes habilitados. Puedes encontrarlos en <strong>Settings >
- Accessibility</strong>.
-</p>
-
-<h2 id="ndk">Aplicaciones del NDK con vínculos a bibliotecas de plataformas</h2>
-
-<p>
- En Android N, se incluyen cambios en el espacio de nombres a fin de evitar la carga de API no públicas.
- Si usas el NDK, solo debes emplear API públicas de la plataforma de
- Android. El uso de API no públicas en la próxima versión oficial de Android
- puede hacer que tu aplicación se bloquee.
-</p>
-
-<p>
- Con el propósito de alertarte sobre el uso de API no públicas, las aplicaciones que funcionen en un dispositivo con
- Android N producirán un error de salida de logcat cuando una de ellas llame a una API no pública.
- Este error también aparecerá en la pantalla del dispositivo como un mensaje para ayudar a
- generar conciencia respecto de la situación. Debes revisar el código de tu aplicación para
- quitar el uso de API de plataformas no públicas y probar por completo tus aplicaciones con
- un dispositivo de prueba o emulador.
-</p>
-
-<p>
- Si tu aplicación depende de bibliotecas de plataformas, consulta la documentación sobre el NDK a fin de hallar
- soluciones típicas para el reemplazo de API privadas comunes por API públicas equivalentes.
- También es posible que establezcas vínculos con bibliotecas de plataformas sin notarlo,
- en especial si tu aplicación usa una biblioteca que forma parte de la plataforma (como
- <code>libpng</code>), pero no del NDK. En ese caso, asegúrate de que
- tu APK contenga todos los archivos .so con los cuales intentaste establecer vínculos.
-</p>
-
-<p class="caution">
- <strong>Advertencia:</strong> Algunas bibliotecas de terceros pueden establecer vínculos con API
- no públicas. Si tu aplicación usa estas bibliotecas, es probable que se bloquee al ejecutarse
- en la próxima versión oficial de Android.
-</p>
-
-<p>
- Las aplicaciones no deben depender de bibliotecas nativas no incluidas en el NDK
- ni usarlas, ya que pueden modificarse o eliminarse en la transición de una versión de Android a
- otra. El cambio de OpenSSL a BoringSSL es un ejemplo de modificaciones como esta.
- A su vez, los diferentes dispositivos pueden ofrecer distintos niveles de compatibilidad, debido a que
- no existen requisitos de compatibilidad para bibliotecas de plataformas no incluidas
- en el NDK. Si debes acceder a bibliotecas no relacionadas con el NDK en dispositivos anteriores, haz que la
- carga dependa del nivel de la API de Android.
-</p>
-
-<p>
- Para ayudarte a diagnosticar estos tipos de problemas, a continuación, se ofrecen ejemplos de errores de Java y
- del NDK que podrías hallar al intentar compilar tu aplicación con Android N:
-</p>
-
-<p>Ejemplo de error de Java:</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>Ejemplo de error de NDK:</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- Aquí se ofrecen soluciones típicas para aplicaciones en las que se produzcan estos tipos de errores:
-</p>
-
-<ul>
- <li>getJavaVM y getJNIEnv de libandroid_runtime.so pueden reemplazarse
- por funciones estándares de JNI:
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>El símbolo {@code property_get} de {@code libcutils.so} puede
- reemplazarse por la API pública {@code alternative __system_property_get}.
- Para hacerlo, usa {@code __system_property_get} con el siguiente elemento include:
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>El símbolo {@code SSL_ctrl} de {@code libcrypto.so} debe
- reemplazarse por una versión local de la aplicación. Por ejemplo, debes establecer un vínculo estático de
- {@code libcyrpto.a} en tu archivo {@code .so} o incluir un vínculo dinámico propio de
- {@code libcrypto.so} de BoringSSL u OpenSSL en tu aplicación.
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N contiene cambios para aplicaciones orientadas a Android for Work, entre los que se incluyen
- modificaciones en la instalación de certificados, el restablecimiento de contraseñas, la gestión de usuarios
- secundarios y el acceso a identificadores de dispositivos. Si creas aplicaciones para entornos de
- Android for Work, debes estudiar estos cambios y modificar
- tu aplicación según corresponda.
-</p>
-
-<ul>
- <li>Debes usar un instalador de certificados delegados para que el controlador de políticas de dispositivos (DPC) pueda
- configurarlo. Para aplicaciones de propietarios de perfiles y de dispositivos orientadas al SDK de Android N, debes
- usar el instalador de certificados delegados para que el
- DPC llame a
- <code>DevicePolicyManager.setCertInstallerPackage()</code>. Si el instalador
- no está instalado de antemano, el sistema emite una
- <code>IllegalArgumentException</code>.
- </li>
-
- <li>Las restricciones de restablecimiento de contraseñas para administradores de dispositivos ahora se aplican a los propietarios de
- perfiles. Los administradores de dispositivos ya no pueden usar
- {@code DevicePolicyManager.resetPassword()} para borrar contraseñas ni modificar
- las que ya están establecidas. No obstante, pueden establecer una contraseña, aunque solo
- cuando el dispositivo no tiene contraseña, PIN ni patrón.
- </li>
-
- <li>Los propietarios de dispositivos y perfiles pueden administrar cuentas aun cuando haya
- restricciones. Tienen la posibilidad de llamar a las API de administración de cuentas
- incluso al haber restricciones <code>DISALLOW_MODIFY_ACCOUNTS</code> para el usuario.
- </li>
-
- <li>Los propietarios de dispositivos pueden administrar usuarios secundarios de manera más sencilla. Cuando un dispositivo
- funciona en el modo de propietario de dispositivo, automáticamente se establece la restricción <code>DISALLOW_ADD_USER</code>
-. Esto evita que los usuarios creen usuarios secundarios no
- administrados. A su vez, los métodos <code>CreateUser()</code> y
- <code>createAndInitializeUser()</code> han sido dados de baja; los reemplaza el nuevo método
- <code>DevicePolicyManager.createAndManageUser()</code>.
- </li>
-
- <li>Los propietarios de dispositivos pueden acceder a identificadores de dispositivos. Tienen la posibilidad de acceder a la
- dirección MAC de Wi-Fi de un dispositivo a través de
- <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Si nunca se habilitó la función Wi-Fi
- en el dispositivo, este método devuelve un valor {@code null}.
- </li>
-
- <li>La configuración Work Mode controla el acceso a las aplicaciones de trabajo. Cuando este ajuste está desactivado, el
- launcher del sistema indica que las aplicaciones de trabajo no están disponibles atenuándolas. Para volver
- a restaurar el comportamiento normal, habilita el modo de trabajo nuevamente.
-</ul>
-
-<p>
- Para obtener más información sobre los cambios de Android for Work en Android N, consulta
- <a href="{@docRoot}preview/features/afw.html">Actualizaciones de Android for Work</a>.
-</p>
-
-<h2 id="annotations">Retención de anotaciones</h2>
-
-<p>
-Android N soluciona un error por el cual la visibilidad de las anotaciones se había ignorado.
-Este problema permitió que el tiempo de ejecución accediera a anotaciones a las que no debía
-tener acceso. Entre estas anotaciones se incluyen las siguientes:
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}: destinada a ser visible solo en el momento de compilación.</li>
- <li>{@code VISIBILITY_SYSTEM}: destinada a ser visible en el tiempo de ejecución, pero únicamente al
- sistema subyacente.</li>
-</ul>
-
-<p>
-Si tu aplicación se basa en este comportamiento, agrega una política de retención para las anotaciones que deben
-estar disponibles en el tiempo de ejecución. Para ello, usa {@code @Retention(RetentionPolicy.RUNTIME)}.
-</p>
-
-<h2 id="other">Otros aspectos importantes</h2>
-
-<ul>
-<li>Cuando una aplicación funcione en Android N, pero esté orientada a un nivel de API inferior,
-y el usuario modifique el tamaño de pantalla, el proceso de la aplicación finalizará. La aplicación
-debe tener capacidad para manejar correctamente esta situación. De lo contrario, se bloqueará
-cuando el usuario la restaure desde Recents.
-
-<p>
-Debes probar tu aplicación para controlar que no tenga lugar
-este comportamiento.
-Puedes hacerlo produciendo un error idéntico
-al finalizarla manualmente a través del panel DDMS.
-</p>
-
-<p>
-Las aplicaciones orientadas a Android N y versiones posteriores no finalizarán automáticamente por cambios en la densidad;
-sin embargo, es posible que respondan en forma deficiente a los cambios en la configuración.
-</p>
-</li>
-
-<li>
-En Android N, las aplicaciones deben tener capacidad para manejar correctamente los cambios de configuración
-y no deben bloquearse durante inicios posteriores. Puedes verificar el comportamiento de las aplicaciones
-modificando el tamaño de la fuente (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>) y restaurándolas
-desde Recents.
-</li>
-
-<li>
-Debido a un error en versiones anteriores de Android, el sistema no indicaba la escritura
-a un socket del TCP en el subproceso principal como una violación del modo strict. En Android N, se corrige este error.
-Las aplicaciones que tienen este comportamiento, ahora emiten una {@code android.os.NetworkOnMainThreadException}.
-Generalmente, realizar operaciones de red en el subproceso principal no es una buena idea porque estas operaciones
-suelen tener una latencia alta de cola que genera mensajes que indican que la aplicación no responde y bloqueos.
-</li>
-
-<li>
-De manea predeterminada, la familia de métodos {@code Debug.startMethodTracing()} ahora
-almacena los resultados en el directorio específico del paquete en el almacenamiento compartido,
-en lugar de hacerlo en el nivel superior
-de la tarjeta SD. Esto significa que las aplicaciones ya no tienen que solicitar el permiso {@code WRITE_EXTERNAL_STORAGE} para usar estas API.
-</li>
-
-<li>
-Muchas API de la plataforma han comenzado a controlar en busca del envío de cargas grandes
-a través de transacciones {@link android.os.Binder}. Además, el
-sistema ahora vuelve a emitir {@code TransactionTooLargeExceptions}
-como {@code RuntimeExceptions}, en lugar de registrarlas o suprimirlas silenciosamente. Un
-ejemplo común es almacenar demasiados datos en
-{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
- lo que hace que {@code ActivityThread.StopInfo} emita una
-{@code RuntimeException} cuando la aplicación se orienta a Android N.
-</li>
-
-<li>
-Si una aplicación publica tareas {@link java.lang.Runnable} en una {@link android.view.View}, y
-la {@link android.view.View}
-no está anexada a una ventana, el sistema
-pone en cola la tarea {@link java.lang.Runnable} con la {@link android.view.View}.
-La tarea {@link java.lang.Runnable} no se ejecuta hasta que la
-{@link android.view.View} esté anexada
-a una ventana. Este comportamiento soluciona los siguientes errores:
-<ul>
- <li>Si una aplicación publicaba una {@link android.view.View} desde un subproceso que no fuera el subproceso de la IU
- de la ventana prevista, la tarea {@link java.lang.Runnable} podía ejecutarse en el subproceso incorrecto.
- </li>
- <li>Si la tarea {@link java.lang.Runnable} se publicaba desde un subproceso que no fuera
- un subproceso de looper, la aplicación podía exponer la terea {@link java.lang.Runnable}.</li>
-</ul>
-</li>
-
-<li>
-Si una aplicación en Android N con el permiso
-{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
-intentaba borrar un paquete instalado por otra aplicación,
-el sistema solicitaba la confirmación del usuario. En este escenario, las aplicaciones debían esperar recibir el estado
-{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
-al invocar
-{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
-</li>
-
-</ul>
-
diff --git a/docs/html-intl/intl/es/preview/download-ota.jd b/docs/html-intl/intl/es/preview/download-ota.jd
deleted file mode 100644
index d3e8be9..0000000
--- a/docs/html-intl/intl/es/preview/download-ota.jd
+++ /dev/null
@@ -1,324 +0,0 @@
-page.title=Aplicación de imágenes inalámbricas de dispositivo
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Antes de descargar e instalar los componentes del
- Android Preview SDK, debe aceptar los términos y las
- condiciones que se describen a continuación.</p>
-
- <h2 class="norule">Términos y condiciones</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Este es el Contrato de licencia de la versión Android SDK Preview (el “Contrato de licencia”).
-
-1. Introducción
-
-1.1 Se le otorga la licencia de la versión Android SDK Preview (denominada “Preview” en el Contrato de licencia y que incluye específicamente los archivos de sistema de Android, las API agrupadas y los archivos de biblioteca de la Preview, si se encuentran disponibles), sujeto a los términos del Contrato de licencia. El Contrato de licencia establece una relación legal vinculante entre usted y Google en relación con el uso que realice de la Preview.
-
-1.2 “Android” hace referencia al conjunto de soluciones Android para dispositivos, según se encuentre disponible en el Proyecto de código abierto de Android (Android Open Source Project), que se encuentra en la siguiente URL: http://source.android.com/, y según se actualiza periódicamente.
-
-.1.3 “Compatible con Android” se refiere a cualquier implementación de Android que (i) cumpla con el documento Definición de compatibilidad de Android, disponible en el sitio web de compatibilidad de Android (http://source.android.com/compatibility) y que puede actualizarse esporádicamente; y (ii) apruebe satisfactoriamente la prueba de Compatibilidad con Android, "CTS” (en inglés, Android Compatibility Test Suite).
-
-1.4 “Google” hace referencia a Google Inc., una corporación de Delaware, con sede principal en 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
-
-2. Aceptación del Contrato de licencia
-
-2.1 Para poder utilizar la Preview, primero debe aceptar el Contrato de licencia. Si no acepta el Contrato de licencia, no podrá utilizar la Preview.
-
-2.2 Al hacer clic para aceptar o utilizar la Preview, por medio del presente, usted acepta los términos del Contrato de licencia.
-
-2.3 No puede utilizar la Preview ni aceptar el Contrato de licencia si tiene prohibido recibir la Preview en virtud de las leyes de los Estados Unidos o de otros países, lo que incluye el país donde es residente o desde el que utilizará la Preview.
-
-2.4 Si utilizará la Preview de forma interna, dentro de su empresa u organización, usted acepta quedar sujeto al Contrato de licencia en representación de su empleador u otra entidad, y expresa y garantiza que tiene plena autoridad legal para vincular a su empleador o a dicha entidad al Contrato de licencia. Si usted no posee la autoridad requerida, no podrá aceptar el Contrato de licencia ni utilizar la Preview en representación de su empleador u otra entidad.
-
-3. Licencia de la Preview de Google
-
-3.1 Conforme a los términos de este contrato de licencia, Google le otorga una licencia limitada, con validez mundial, libre de regalías, no asignable, no exclusiva y sin la posibilidad de otorgar una sublicencia, para utilizar la Preview con el único propósito de desarrollar aplicaciones para ejecutar en implementaciones compatibles de Android.
-
-3.2 No puede utilizar esta Preview para desarrollar aplicaciones para otras plataformas (entre las que se incluyen implementaciones incompatibles de Android) o para desarrollar otro SDK. Desde luego, usted tiene la libertad para desarrollar aplicaciones para otras plataformas, entre las que se incluyen implementaciones incompatibles de Android, siempre y cuando esta Preview no se utilice con ese propósito.
-
-3.3 Usted acepta que Google o terceros poseen todos los derechos legales, títulos e intereses en relación con la Preview, incluidos derechos de propiedad intelectual que existan en esta. "Derechos de propiedad intelectual" hace referencia a todos los derechos de la ley de patentes, la ley de derechos de autor, la ley de secreto comercial, la ley de marca comercial y cualquier otro derecho de propiedad. Google se reserva todos los derechos que no se le otorguen expresamente.
-
-3.4 Usted no podrá utilizar la Preview para ningún otro propósito que no esté expresamente permitido en el Contrato de licencia. Excepto en la medida que lo exijan las licencias correspondientes de terceros, no podrá: (a) copiar (excepto con fines de copia de seguridad), modificar, adaptar, redistribuir, descompilar, utilizar técnicas de ingeniería inversa, desarmar ni crear trabajos derivados de la Preview ni de ninguna de sus partes; ni (b) cargar ninguna parte de la Preview en un teléfono móvil ni en ningún otro dispositivo de hardware (a excepción de una computadora personal), ni podrá combinar ninguna parte de la Preview con otro software, ni distribuir algún software o dispositivo que incorpore alguna parte de la Preview.
-
-3.5 El uso, la reproducción y la distribución de los componentes de la Preview con licencia de software de código abierto están regidos exclusivamente por los términos de la licencia de ese software de código abierto y no de este Contrato de licencia. Usted acepta mantener la licencia en regla con respecto a dichas licencias de software de código abierto en virtud de todos los derechos otorgados y acepta abstenerte de realizar acción alguna que pudiera poner fin, suspender o violar dichos derechos.
-
-3.6 Acepta que la forma y la naturaleza de la Preview que proporciona Google pueden cambiar sin tener que brindarle aviso previo, y que las versiones futuras de la Preview pueden ser incompatibles con las aplicaciones desarrolladas en versiones anteriores de la Preview. Usted acepta que Google, generalmente a su entera discreción, puede dejar de proporcionarle a usted o a los demás usuarios (de forma permanente o temporal) la Preview (o cualquiera de sus funciones) sin previo aviso.
-
-3.7 Ninguna declaración de este Contrato de licencia le otorga el derecho de utilizar alguno de los nombres comerciales, las marcas comerciales, las marcas de servicio, los logotipos, los nombres de dominio ni otras características distintivas de marca de Google.
-
-3.8 Usted acepta que no quitará, ocultará o alterará ninguna de las notificaciones de derechos de autor (entre las que se incluyen las notificaciones de copyright y marcas comercias) que pudieran estar anexadas o implícitas en la Preview.
-
-4. Uso que usted realiza de la Preview
-
-4.1 Google acepta que ninguna declaración del Contrato de licencia le concede a Google derecho, título o interés alguno de su parte (o de parte de sus licenciantes), en virtud del Contrato de licencia, con respecto a las aplicaciones de software que usted desarrolle mediante el uso de la Preview, lo que incluye los derechos de propiedad intelectual que conlleven esas aplicaciones.
-
-4.2 Usted acepta utilizar la Preview y escribir aplicaciones únicamente conforme a lo que permite (a) este Contrato de licencia y (b) las leyes, regulaciones, o prácticas y pautas generalmente aceptadas y pertinentes en las jurisdicciones relevantes (entre las que se incluyen las leyes sobre la exportación de datos o software hacia los Estados Unidos u otros países relevantes y desde ellos).
-
-4.3 Usted acepta que si utiliza la Preview para desarrollar aplicaciones, protegerá la privacidad y los derechos legales de los usuarios. Si los usuarios le proporcionan sus nombres de usuario, contraseñas u otra información de inicio de sesión o información personal, debe comunicarles que la información se encontrará disponible para su aplicación, y debe proporcionarles a dichos usuarios un aviso de privacidad con protección y validez legal. Si su aplicación almacena información personal o confidencial proporcionada por los usuarios, lo debe hacer de forma segura. Si los usuarios le proporcionan información sobre la cuenta de Google, su aplicación solo puede usar esa información para acceder a la cuenta de Google del usuario siempre que este le haya otorgado permiso para hacerlo y con los fines para los que se lo haya otorgado.
-
-4.4 Usted acepta que no participará en ninguna actividad con la Versión preliminar (lo que incluye el desarrollo o la distribución de una aplicación) que interfiera, interrumpa, dañe o acceda sin autorización a servidores, redes u otras propiedades o servicios de Google o de algún tercero.
-
-4.5 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de los datos, el contenido o los recursos que usted cree, transmita o muestre a través de Android o las aplicaciones para Android, y de las consecuencias de sus acciones (lo que incluye la pérdida o el daño que Google pudiera sufrir) al hacerlo.
-
-4.6 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de cualquier incumplimiento de sus obligaciones en virtud de este Contrato de licencia, los contratos aplicables de terceros o los términos del servicio, o cualquier ley o regulación pertinentes, y de las consecuencias (lo que incluye las pérdidas o los daños que pudieran sufrir Google o algún tercero) de dichos incumplimientos.
-
-4.7 La Versión preliminar se encuentra en desarrollo, y sus pruebas y comentarios son una parte importante del proceso de desarrollo. Al utilizar la Preview, usted reconoce que la implementación de algunas características aún se encuentra en desarrollo y que no debe confiar en que la Preview contará con todas las funcionalidades de una versión estable. Usted acepta no distribuir públicamente ni enviar ninguna aplicación que utilice esta Preview, dado que esta Preview ya no se admitirá tras el lanzamiento del Android SDK oficial.
-
-5. Sus credenciales de desarrollador
-
-5.1 Usted acepta que es responsable de mantener la confidencialidad de toda credencial de desarrollador que Google pudiera otorgarle o que pudiera escoger usted mismo, y que será el único responsable de todas las aplicaciones que se desarrollen con sus credenciales de desarrollador.
-
-6. Privacidad e información
-
-6.1 Con el objetivo de poder innovar y mejorar de forma continua la Preview, Google podría recopilar ciertas estadísticas de uso del software, entre las que se incluyen, de forma enunciativa, un identificador único, la dirección IP asociada, el número de versión del software e información sobre las herramientas o los servicios de la Preview que se estén utilizando y la manera en que se estén utilizando. Antes de que se recopile esta información, la Preview se lo notificará y le solicitará su permiso. Si no otorga su permiso, no se recopilará la información.
-
-6.2 Los datos recopilados se analizan en el agregado para mejorar la Preview y se conservan de acuerdo con la política de privacidad de Google, que se encuentra en el sitio http://www.google.com/policies/privacy/.
-
-7. Aplicaciones de terceros
-
-7.1 Si utiliza la Preview para ejecutar aplicaciones desarrolladas por un tercero o que accedan a datos, contenido o recursos proporcionados por un tercero, usted acepta que Google no es responsable de esas aplicaciones, datos, contenido ni recursos. Usted comprende que todos los datos, contenidos o recursos a los que podría acceder a través de esas aplicaciones de terceros son exclusiva responsabilidad de la persona que los origina y que Google no es responsable de las pérdidas ni los daños que usted pudiera experimentar como consecuencia del uso o acceso de cualquiera de esas aplicaciones, datos, contenido o recursos de terceros.
-
-7.2 Usted debe saber que los datos, el contenido y los recursos que se le presentan a través de esa aplicación de un tercero pueden estar protegidos por derechos de propiedad intelectual que les pertenecen a sus proveedores (o a otras personas o compañías en representación de estos). No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas basadas en esos datos, contenidos o recursos (en su totalidad o en parte), a menos que los propietarios pertinentes le hayan otorgado el permiso específico para hacerlo.
-
-7.3 Usted acepta que el uso que haga de las aplicaciones, los datos, el contenido o los recursos de ese tercero puede estar sujeto a términos independientes entre usted y el tercero correspondiente.
-
-Uso de las API de Google
-
-8.1 API de Google
-
-8.1.1 Si utiliza alguna API para recuperar datos de Google, usted acepta que los datos pueden estar protegidos por derechos de propiedad intelectual que le pertenecen a Google o a las partes que proporcionan esos datos (o a otras personas o empresas en representación de estos). El uso que realice de cualquiera de esas API puede estar sujeto a términos de servicio adicionales. No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas con base en esos datos (en su totalidad o en parte), a menos que los términos de servicio correspondientes lo permitan.
-
-8.1.2 Si utiliza cualquier API para recuperar datos de un usuario de Google, usted acepta y acuerda que solo podrá recuperar datos con el consentimiento explícito del usuario y solo cuando, y para los fines limitados para los que, el usuario le haya otorgado permiso para hacerlo.
-
-9. Finalización del Contrato de licencia
-
-9.1 Este Contrato de licencia tendrá vigencia hasta que lo revoquen usted o Google, como se indica a continuación.
-
-9.2 Si desea rescindir el Contrato de licencia, puede hacerlo al interrumpir el uso que realiza de la Preview y de las credenciales de desarrollador pertinentes.
-
-9.3 Google puede, en cualquier momento, rescindir el Contrato de licencia, con causa o sin ella, luego de notificárselo.
-
-9.4 El Contrato de licencia finalizará automáticamente, sin previo aviso ni acción alguna, tras la primera de las siguientes situaciones:
-(A) cuando Google deje de proporcionar la Preview o ciertas partes de esta a los usuarios en el país donde usted reside o desde el que utiliza el servicio; y
-(B) cuando Google emita una versión final del Android SDK.
-
-9.5 Si el Contrato de licencia se rescinde, se revocará la licencia que usted recibió en virtud de dicho contrato; usted deberá suspender inmediatamente todo uso de la Preview, y las disposiciones de los párrafos 10, 11, 12 y 14 seguirán vigentes indefinidamente.
-
-10. EXENCIONES DE RESPONSABILIDAD
-
-10.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE EL USO QUE REALICE DE LA PREVIEW ES BAJO SU PROPIO RIESGO Y QUE LA PREVIEW SE PROPORCIONA “EN LAS CONDICIONES EN LAS QUE SE ENCUENTRA” Y “SUJETA A DISPONIBILIDAD” SIN GARANTÍAS DE NINGÚN TIPO POR PARTE DE GOOGLE.
-
-10.2 EL USO QUE USTED REALICE DE LA PREVIEW Y DE TODO MATERIAL DESCARGADO U OBTENIDO DE ALGUNA OTRA MANERA MEDIANTE EL USO DE LA PREVIEW ES A SU ENTERO RIESGO Y DISCRECIÓN, Y USTED ES EL ÚNICO RESPONSABLE DE CUALQUIER DAÑO QUE PUDIERA SUFRIR SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO, O DE LA PÉRDIDA DE DATOS COMO CONSECUENCIA DE DICHO USO. SIN PERJUICIO DE LO MENCIONADO ANTERIORMENTE, USTED COMPRENDE QUE LA VERSIÓN PRELIMINAR NO ES UNA VERSIÓN ESTABLE, Y PUEDE CONTENER ERRORES, DEFECTOS Y VULNERABILIDADES DE SEGURIDAD QUE PUEDEN PROVOCAR DAÑOS SIGNIFICATIVOS, LO QUE INCLUYE LA PÉRDIDA COMPLETA E IRRECUPERABLE DEL USO DE SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO.
-
-10.3 GOOGLE TAMBIÉN RECHAZA TODAS LAS GARANTÍAS Y CONDICIONES DE CUALQUIER TIPO, EXPRESAS O IMPLÍCITAS, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS Y CONDICIONES DE COMERCIABILIDAD, IDONEIDAD PARA UN FIN DETERMINADO Y NO VIOLACIÓN.
-
-11. LIMITACIÓN DE RESPONSABILIDADES
-
-11.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE GOOGLE, SUS SUBSIDIARIAS Y FILIALES, Y SUS LICENCIANTES NO SERÁN RESPONSABLES ANTE USTED, EN VIRTUD DE NINGUNA TEORÍA DE RESPONSABILIDAD, POR NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL, ESPECIAL, RESULTANTE NI PUNITIVO EN EL QUE PODRÍA HABER INCURRIDO, LO QUE INCLUYE LA PÉRDIDA DE DATOS, YA SEA QUE SE LE HAYA NOTIFICADO O NO A GOOGLE O A SUS REPRESENTANTES, O SOBRE CUYA POSIBILIDAD ESTOS DEBERÍAN HABER SABIDO.
-
-12. Indemnización
-
-12.1 Hasta el grado máximo que permita la ley, usted acepta defender, indemnizar y eximir de responsabilidades a Google, sus filiales y sus respectivos directores, funcionarios, empleados y agentes, de todo tipo de reclamo, acción legal y proceso judicial, así como de las pérdidas, responsabilidades, daños, costos y gastos (incluidos los honorarios razonables de abogados) que surjan o se acumulen (a) del uso que usted realiza de la Versión preliminar, (b) de cualquier aplicación que desarrolle en la Versión preliminar que infrinja algún derecho de propiedad intelectual de cualquier persona, o que difame a cualquier persona o viole sus derechos de publicidad o privacidad, y (c) del incumplimiento por su parte del Contrato de licencia.
-
-13. Cambios en el Contrato de licencia
-
-13.1 Google puede realizar cambios en el Contrato de licencia a medida que distribuye nuevas versiones de la Versión preliminar. Cuando se realicen esos cambios, Google emitirá una nueva versión del Contrato de licencia, que estará disponible en el sitio web donde se ponga a la venta la Versión preliminar.
-
-14. Términos legales generales
-
-14.1 El Contrato de licencia constituye el contrato legal integral entre usted y Google, y rige el uso que usted realice de la Versión preliminar (a excepción de los servicios que Google pueda proporcionarle en virtud de un contrato por escrito independiente), y reemplaza totalmente cualquier contrato anterior entre usted y Google en relación con la Versión preliminar.
-
-14.2 Usted acepta que, si Google no ejerce ni impone un derecho o recurso legal especificados en el Contrato de licencia (o sobre el que Google tenga beneficios conforme a cualquier ley aplicable), esto no se considerará una renuncia formal a los derechos por parte de Google y Google aún seguirá recibiendo los beneficios de esos derechos o recursos legales.
-
-14.3 Si algún tribunal judicial con jurisdicción para decidir sobre este asunto determina que alguna de las disposiciones de este Contrato de licencia no es válida, se eliminará esa disposición del Contrato de licencia sin que eso afecte la validez del resto del contrato. Las disposiciones restantes del Contrato de licencia continuarán siendo válidas y aplicables.
-
-14.4 Usted reconoce y acepta que cada miembro del grupo de compañías de las que Google es la compañía central serán terceros beneficiarios del Contrato de licencia, y que esas otras empresas tendrán el derecho de imponer directamente cualquier disposición y ampararse en las disposiciones de este Contrato de licencia que les confieran un beneficio (o que confieran derechos a su favor). Además de esto, ninguna otra persona o compañía serán terceros beneficiarios del Contrato de licencia.
-
-14.5 RESTRICCIONES DE EXPORTACIÓN. LA VERSIÓN PRELIMINAR ESTÁ SUJETA A LAS LEYES Y REGULACIONES DE EXPORTACIÓN DE LOS ESTADOS UNIDOS. DEBE CUMPLIR CON TODAS LAS LEYES Y REGULACIONES DE EXPORTACIÓN NACIONALES E INTERNACIONALES QUE SE APLIQUEN A LA VERSIÓN PRELIMINAR. ESTAS LEYES INCLUYEN RESTRICCIONES EN RELACIÓN CON LOS DESTINOS, USUARIOS FINALES Y USO FINAL.
-
-14.6 Usted no puede asignar ni transferir el Contrato de licencia sin la aprobación previa por escrito de Google y todo intento de asignación sin dicha aprobación no tendrá validez. No podrá delegar sus responsabilidades u obligaciones otorgadas en virtud del Contrato de licencia sin la aprobación previa por escrito de Google.
-
-14.7 El Contrato de licencia y su relación con Google conforme al Contrato de licencia se regirán por las leyes del estado de California, independientemente de los principios de conflictos entre leyes. Usted y Google aceptan presentarse ante la jurisdicción exclusiva de los tribunales del condado de Santa Clara, California, para resolver cualquier asunto legal que pudiera surgir del Contrato de licencia. Sin perjuicio de esto, usted acepta que Google aún podrá aplicar reparaciones conforme a mandato judicial (o a un tipo equivalente de desagravio legal) en cualquier jurisdicción.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">He leído y acepto los términos y las condiciones anteriores.</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- Esta página cuenta con enlaces a imágenes de dispositivos inalámbricos y describe
- cómo aplicar una actualización inalámbrica a un dispositivo de forma manual. Este procedimiento puede ser útil
- para recuperar dispositivos que hayan recibido actualizaciones inalámbricas por medio del Programa
- Android Beta y no enciendan luego de instalada la aplicación.
-</p>
-
-<h2 id="install-ota">Instalar imágenes inalámbricas</h2>
-
-<p></p>
-
-<p>Para instalar un paquete inalámbrico en un dispositivo sigue estos pasos:</p>
-
-<ol>
- <li>Descargar una imagen de dispositivo inalámbrico de la tabla que verás a continuación.</li>
- <li>Reinicia el dispositivo en modo Recuperación. Para leer más información sobre cómo
- aplicar este modo en dispositivos Nexus, visita la sección
-<a href="https://support.google.com/nexus/answer/4596836">Reset your Nexus
- device to factory settings</a>.
- </li>
- <li>En el dispositivo, selecciona <strong>ADB sideload</strong>.</li>
- <li>Conecta el dispositivo a una computadora con el entorno de desarrollo Android
- cargado y la herramienta Android Debug Bridge (ADB) instalada.</li>
- <li>Ejecuta el comando siguiente:
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">Imágenes inalámbricas de dispositivo</h2>
-
-<table>
- <tr>
- <th scope="col">Dispositivo</th>
- <th scope="col">Descarga/sumas de comprobación</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-ota-npd35k-b8cfbd80.zip</a><br>
- MD5: 15fe2eba9b01737374196bdf0a792fe9<br>
- SHA-1: 5014b2bba77f9e1a680ac3f90729621c85a14283
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-ota-npd35k-078e6fa5.zip</a><br>
- MD5: e8b12f7721c53af9a450f7058928a5fc<br>
- SHA-1: b7a9b756f84a1d2e482ff9c16749d65f6e51425a
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-ota-npd35k-88457699.zip</a><br>
- MD5: 3fac09fef759dde26e57cb80b20b6477<br>
- SHA-1: 27d6caa786577d8a38b2da5bf94b33b4524a1a1c
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-ota-npd35k-51dbae76.zip</a><br>
- MD5: 58312c4a5971818ef5c77a3f446003da<br>
- SHA-1: aad9005be33d3e2bab480509a6ab74c3c3b9d921
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-ota-npd35k-834f047f.zip</a><br>
- MD5: 92b7d1fa252f7394e70f957c72d4aac8<br>
- SHA-1: b6c057c84d90893630e303cbb60530e20ddb8361
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-ota-npd35k-6ac91298.zip</a><br>
- MD5: 1461622ad53ea842b2722fa7b49b8172<br>
- SHA-1: 409c061668ab270774877d7f3eae44fa48d2b931
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-ota-npd35k-a0b2347f.zip</a><br>
- MD5: c60117f3640cc6db12386fd632289c7d<br>
- SHA-1: 87349c767c69efb4172c90ce1d88cf578c3d28b3
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-ota-npd35k-09897a1d.zip</a><br>
- MD5: a55cf94f7cce0393ec6c0b35041766b7<br>
- SHA-1: 6f33742290eb46f2561891f38ca2e754b4e50c6a
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/es/preview/download.jd b/docs/html-intl/intl/es/preview/download.jd
deleted file mode 100644
index d489074..0000000
--- a/docs/html-intl/intl/es/preview/download.jd
+++ /dev/null
@@ -1,543 +0,0 @@
-page.title=Prueba en un dispositivo
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Antes de descargar e instalar los componentes del
- Android Preview SDK, debe aceptar los términos y las
- condiciones que se describen a continuación.</p>
-
- <h2 class="norule">Términos y condiciones</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Este es el Contrato de licencia de la versión Android SDK Preview (el “Contrato de licencia”).
-
-1. Introducción
-
-1.1 Se le otorga la licencia de la versión Android SDK Preview (denominada “Preview” en el Contrato de licencia y que incluye específicamente los archivos de sistema de Android, las API agrupadas y los archivos de biblioteca de la Preview, si se encuentran disponibles), sujeto a los términos del Contrato de licencia. El Contrato de licencia establece una relación legal vinculante entre usted y Google en relación con el uso que realice de la Preview.
-
-1.2 “Android” hace referencia al conjunto de soluciones Android para dispositivos, según se encuentre disponible en el Proyecto de código abierto de Android (Android Open Source Project), que se encuentra en la siguiente URL: http://source.android.com/, y según se actualiza periódicamente.
-
-.1.3 “Compatible con Android” se refiere a cualquier implementación de Android que (i) cumpla con el documento Definición de compatibilidad de Android, disponible en el sitio web de compatibilidad de Android (http://source.android.com/compatibility) y que puede actualizarse esporádicamente; y (ii) apruebe satisfactoriamente la prueba de Compatibilidad con Android, "CTS” (en inglés, Android Compatibility Test Suite).
-
-1.4 “Google” hace referencia a Google Inc., una corporación de Delaware, con sede principal en 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
-
-2. Aceptación del Contrato de licencia
-
-2.1 Para poder utilizar la Preview, primero debe aceptar el Contrato de licencia. Si no acepta el Contrato de licencia, no podrá utilizar la Preview.
-
-2.2 Al hacer clic para aceptar o utilizar la Preview, por medio del presente, usted acepta los términos del Contrato de licencia.
-
-2.3 No puede utilizar la Preview ni aceptar el Contrato de licencia si tiene prohibido recibir la Preview en virtud de las leyes de los Estados Unidos o de otros países, lo que incluye el país donde es residente o desde el que utilizará la Preview.
-
-2.4 Si utilizará la Preview de forma interna, dentro de su empresa u organización, usted acepta quedar sujeto al Contrato de licencia en representación de su empleador u otra entidad, y expresa y garantiza que tiene plena autoridad legal para vincular a su empleador o a dicha entidad al Contrato de licencia. Si usted no posee la autoridad requerida, no podrá aceptar el Contrato de licencia ni utilizar la Preview en representación de su empleador u otra entidad.
-
-3. Licencia de la Preview de Google
-
-3.1 Conforme a los términos de este contrato de licencia, Google le otorga una licencia limitada, con validez mundial, libre de regalías, no asignable, no exclusiva y sin la posibilidad de otorgar una sublicencia, para utilizar la Preview con el único propósito de desarrollar aplicaciones para ejecutar en implementaciones compatibles de Android.
-
-3.2 No puede utilizar esta Preview para desarrollar aplicaciones para otras plataformas (entre las que se incluyen implementaciones incompatibles de Android) o para desarrollar otro SDK. Desde luego, usted tiene la libertad para desarrollar aplicaciones para otras plataformas, entre las que se incluyen implementaciones incompatibles de Android, siempre y cuando esta Preview no se utilice con ese propósito.
-
-3.3 Usted acepta que Google o terceros poseen todos los derechos legales, títulos e intereses en relación con la Preview, incluidos derechos de propiedad intelectual que existan en esta. "Derechos de propiedad intelectual" hace referencia a todos los derechos de la ley de patentes, la ley de derechos de autor, la ley de secreto comercial, la ley de marca comercial y cualquier otro derecho de propiedad. Google se reserva todos los derechos que no se le otorguen expresamente.
-
-3.4 Usted no podrá utilizar la Preview para ningún otro propósito que no esté expresamente permitido en el Contrato de licencia. Excepto en la medida que lo exijan las licencias correspondientes de terceros, no podrá: (a) copiar (excepto con fines de copia de seguridad), modificar, adaptar, redistribuir, descompilar, utilizar técnicas de ingeniería inversa, desarmar ni crear trabajos derivados de la Preview ni de ninguna de sus partes; ni (b) cargar ninguna parte de la Preview en un teléfono móvil ni en ningún otro dispositivo de hardware (a excepción de una computadora personal), ni podrá combinar ninguna parte de la Preview con otro software, ni distribuir algún software o dispositivo que incorpore alguna parte de la Preview.
-
-3.5 El uso, la reproducción y la distribución de los componentes de la Preview con licencia de software de código abierto están regidos exclusivamente por los términos de la licencia de ese software de código abierto y no de este Contrato de licencia. Usted acepta mantener la licencia en regla con respecto a dichas licencias de software de código abierto en virtud de todos los derechos otorgados y acepta abstenerte de realizar acción alguna que pudiera poner fin, suspender o violar dichos derechos.
-
-3.6 Acepta que la forma y la naturaleza de la Preview que proporciona Google pueden cambiar sin tener que brindarle aviso previo, y que las versiones futuras de la Preview pueden ser incompatibles con las aplicaciones desarrolladas en versiones anteriores de la Preview. Usted acepta que Google, generalmente a su entera discreción, puede dejar de proporcionarle a usted o a los demás usuarios (de forma permanente o temporal) la Preview (o cualquiera de sus funciones) sin previo aviso.
-
-3.7 Ninguna declaración de este Contrato de licencia le otorga el derecho de utilizar alguno de los nombres comerciales, las marcas comerciales, las marcas de servicio, los logotipos, los nombres de dominio ni otras características distintivas de marca de Google.
-
-3.8 Usted acepta que no quitará, ocultará o alterará ninguna de las notificaciones de derechos de autor (entre las que se incluyen las notificaciones de copyright y marcas comercias) que pudieran estar anexadas o implícitas en la Preview.
-
-4. Uso que usted realiza de la Preview
-
-4.1 Google acepta que ninguna declaración del Contrato de licencia le concede a Google derecho, título o interés alguno de su parte (o de parte de sus licenciantes), en virtud del Contrato de licencia, con respecto a las aplicaciones de software que usted desarrolle mediante el uso de la Preview, lo que incluye los derechos de propiedad intelectual que conlleven esas aplicaciones.
-
-4.2 Usted acepta utilizar la Preview y escribir aplicaciones únicamente conforme a lo que permite (a) este Contrato de licencia y (b) las leyes, regulaciones, o prácticas y pautas generalmente aceptadas y pertinentes en las jurisdicciones relevantes (entre las que se incluyen las leyes sobre la exportación de datos o software hacia los Estados Unidos u otros países relevantes y desde ellos).
-
-4.3 Usted acepta que si utiliza la Preview para desarrollar aplicaciones, protegerá la privacidad y los derechos legales de los usuarios. Si los usuarios le proporcionan sus nombres de usuario, contraseñas u otra información de inicio de sesión o información personal, debe comunicarles que la información se encontrará disponible para su aplicación, y debe proporcionarles a dichos usuarios un aviso de privacidad con protección y validez legal. Si su aplicación almacena información personal o confidencial proporcionada por los usuarios, lo debe hacer de forma segura. Si los usuarios le proporcionan información sobre la cuenta de Google, su aplicación solo puede usar esa información para acceder a la cuenta de Google del usuario siempre que este le haya otorgado permiso para hacerlo y con los fines para los que se lo haya otorgado.
-
-4.4 Usted acepta que no participará en ninguna actividad con la Versión preliminar (lo que incluye el desarrollo o la distribución de una aplicación) que interfiera, interrumpa, dañe o acceda sin autorización a servidores, redes u otras propiedades o servicios de Google o de algún tercero.
-
-4.5 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de los datos, el contenido o los recursos que usted cree, transmita o muestre a través de Android o las aplicaciones para Android, y de las consecuencias de sus acciones (lo que incluye la pérdida o el daño que Google pudiera sufrir) al hacerlo.
-
-4.6 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de cualquier incumplimiento de sus obligaciones en virtud de este Contrato de licencia, los contratos aplicables de terceros o los términos del servicio, o cualquier ley o regulación pertinentes, y de las consecuencias (lo que incluye las pérdidas o los daños que pudieran sufrir Google o algún tercero) de dichos incumplimientos.
-
-4.7 La Versión preliminar se encuentra en desarrollo, y sus pruebas y comentarios son una parte importante del proceso de desarrollo. Al utilizar la Preview, usted reconoce que la implementación de algunas características aún se encuentra en desarrollo y que no debe confiar en que la Preview contará con todas las funcionalidades de una versión estable. Usted acepta no distribuir públicamente ni enviar ninguna aplicación que utilice esta Preview, dado que esta Preview ya no se admitirá tras el lanzamiento del Android SDK oficial.
-
-5. Sus credenciales de desarrollador
-
-5.1 Usted acepta que es responsable de mantener la confidencialidad de toda credencial de desarrollador que Google pudiera otorgarle o que pudiera escoger usted mismo, y que será el único responsable de todas las aplicaciones que se desarrollen con sus credenciales de desarrollador.
-
-6. Privacidad e información
-
-6.1 Con el objetivo de poder innovar y mejorar de forma continua la Preview, Google podría recopilar ciertas estadísticas de uso del software, entre las que se incluyen, de forma enunciativa, un identificador único, la dirección IP asociada, el número de versión del software e información sobre las herramientas o los servicios de la Preview que se estén utilizando y la manera en que se estén utilizando. Antes de que se recopile esta información, la Preview se lo notificará y le solicitará su permiso. Si no otorga su permiso, no se recopilará la información.
-
-6.2 Los datos recopilados se analizan en el agregado para mejorar la Preview y se conservan de acuerdo con la política de privacidad de Google, que se encuentra en el sitio http://www.google.com/policies/privacy/.
-
-7. Aplicaciones de terceros
-
-7.1 Si utiliza la Preview para ejecutar aplicaciones desarrolladas por un tercero o que accedan a datos, contenido o recursos proporcionados por un tercero, usted acepta que Google no es responsable de esas aplicaciones, datos, contenido ni recursos. Usted comprende que todos los datos, contenidos o recursos a los que podría acceder a través de esas aplicaciones de terceros son exclusiva responsabilidad de la persona que los origina y que Google no es responsable de las pérdidas ni los daños que usted pudiera experimentar como consecuencia del uso o acceso de cualquiera de esas aplicaciones, datos, contenido o recursos de terceros.
-
-7.2 Usted debe saber que los datos, el contenido y los recursos que se le presentan a través de esa aplicación de un tercero pueden estar protegidos por derechos de propiedad intelectual que les pertenecen a sus proveedores (o a otras personas o compañías en representación de estos). No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas basadas en esos datos, contenidos o recursos (en su totalidad o en parte), a menos que los propietarios pertinentes le hayan otorgado el permiso específico para hacerlo.
-
-7.3 Usted acepta que el uso que haga de las aplicaciones, los datos, el contenido o los recursos de ese tercero puede estar sujeto a términos independientes entre usted y el tercero correspondiente.
-
-Uso de las API de Google
-
-8.1 API de Google
-
-8.1.1 Si utiliza alguna API para recuperar datos de Google, usted acepta que los datos pueden estar protegidos por derechos de propiedad intelectual que le pertenecen a Google o a las partes que proporcionan esos datos (o a otras personas o empresas en representación de estos). El uso que realice de cualquiera de esas API puede estar sujeto a términos de servicio adicionales. No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas con base en esos datos (en su totalidad o en parte), a menos que los términos de servicio correspondientes lo permitan.
-
-8.1.2 Si utiliza cualquier API para recuperar datos de un usuario de Google, usted acepta y acuerda que solo podrá recuperar datos con el consentimiento explícito del usuario y solo cuando, y para los fines limitados para los que, el usuario le haya otorgado permiso para hacerlo.
-
-9. Finalización del Contrato de licencia
-
-9.1 Este Contrato de licencia tendrá vigencia hasta que lo revoquen usted o Google, como se indica a continuación.
-
-9.2 Si desea rescindir el Contrato de licencia, puede hacerlo al interrumpir el uso que realiza de la Preview y de las credenciales de desarrollador pertinentes.
-
-9.3 Google puede, en cualquier momento, rescindir el Contrato de licencia, con causa o sin ella, luego de notificárselo.
-
-9.4 El Contrato de licencia finalizará automáticamente, sin previo aviso ni acción alguna, tras la primera de las siguientes situaciones:
-(A) cuando Google deje de proporcionar la Preview o ciertas partes de esta a los usuarios en el país donde usted reside o desde el que utiliza el servicio; y
-(B) cuando Google emita una versión final del Android SDK.
-
-9.5 Si el Contrato de licencia se rescinde, se revocará la licencia que usted recibió en virtud de dicho contrato; usted deberá suspender inmediatamente todo uso de la Preview, y las disposiciones de los párrafos 10, 11, 12 y 14 seguirán vigentes indefinidamente.
-
-10. EXENCIONES DE RESPONSABILIDAD
-
-10.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE EL USO QUE REALICE DE LA PREVIEW ES BAJO SU PROPIO RIESGO Y QUE LA PREVIEW SE PROPORCIONA “EN LAS CONDICIONES EN LAS QUE SE ENCUENTRA” Y “SUJETA A DISPONIBILIDAD” SIN GARANTÍAS DE NINGÚN TIPO POR PARTE DE GOOGLE.
-
-10.2 EL USO QUE USTED REALICE DE LA PREVIEW Y DE TODO MATERIAL DESCARGADO U OBTENIDO DE ALGUNA OTRA MANERA MEDIANTE EL USO DE LA PREVIEW ES A SU ENTERO RIESGO Y DISCRECIÓN, Y USTED ES EL ÚNICO RESPONSABLE DE CUALQUIER DAÑO QUE PUDIERA SUFRIR SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO, O DE LA PÉRDIDA DE DATOS COMO CONSECUENCIA DE DICHO USO. SIN PERJUICIO DE LO MENCIONADO ANTERIORMENTE, USTED COMPRENDE QUE LA VERSIÓN PRELIMINAR NO ES UNA VERSIÓN ESTABLE, Y PUEDE CONTENER ERRORES, DEFECTOS Y VULNERABILIDADES DE SEGURIDAD QUE PUEDEN PROVOCAR DAÑOS SIGNIFICATIVOS, LO QUE INCLUYE LA PÉRDIDA COMPLETA E IRRECUPERABLE DEL USO DE SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO.
-
-10.3 GOOGLE TAMBIÉN RECHAZA TODAS LAS GARANTÍAS Y CONDICIONES DE CUALQUIER TIPO, EXPRESAS O IMPLÍCITAS, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS Y CONDICIONES DE COMERCIABILIDAD, IDONEIDAD PARA UN FIN DETERMINADO Y NO VIOLACIÓN.
-
-11. LIMITACIÓN DE RESPONSABILIDADES
-
-11.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE GOOGLE, SUS SUBSIDIARIAS Y FILIALES, Y SUS LICENCIANTES NO SERÁN RESPONSABLES ANTE USTED, EN VIRTUD DE NINGUNA TEORÍA DE RESPONSABILIDAD, POR NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL, ESPECIAL, RESULTANTE NI PUNITIVO EN EL QUE PODRÍA HABER INCURRIDO, LO QUE INCLUYE LA PÉRDIDA DE DATOS, YA SEA QUE SE LE HAYA NOTIFICADO O NO A GOOGLE O A SUS REPRESENTANTES, O SOBRE CUYA POSIBILIDAD ESTOS DEBERÍAN HABER SABIDO.
-
-12. Indemnización
-
-12.1 Hasta el grado máximo que permita la ley, usted acepta defender, indemnizar y eximir de responsabilidades a Google, sus filiales y sus respectivos directores, funcionarios, empleados y agentes, de todo tipo de reclamo, acción legal y proceso judicial, así como de las pérdidas, responsabilidades, daños, costos y gastos (incluidos los honorarios razonables de abogados) que surjan o se acumulen (a) del uso que usted realiza de la Versión preliminar, (b) de cualquier aplicación que desarrolle en la Versión preliminar que infrinja algún derecho de propiedad intelectual de cualquier persona, o que difame a cualquier persona o viole sus derechos de publicidad o privacidad, y (c) del incumplimiento por su parte del Contrato de licencia.
-
-13. Cambios en el Contrato de licencia
-
-13.1 Google puede realizar cambios en el Contrato de licencia a medida que distribuye nuevas versiones de la Versión preliminar. Cuando se realicen esos cambios, Google emitirá una nueva versión del Contrato de licencia, que estará disponible en el sitio web donde se ponga a la venta la Versión preliminar.
-
-14. Términos legales generales
-
-14.1 El Contrato de licencia constituye el contrato legal integral entre usted y Google, y rige el uso que usted realice de la Versión preliminar (a excepción de los servicios que Google pueda proporcionarle en virtud de un contrato por escrito independiente), y reemplaza totalmente cualquier contrato anterior entre usted y Google en relación con la Versión preliminar.
-
-14.2 Usted acepta que, si Google no ejerce ni impone un derecho o recurso legal especificados en el Contrato de licencia (o sobre el que Google tenga beneficios conforme a cualquier ley aplicable), esto no se considerará una renuncia formal a los derechos por parte de Google y Google aún seguirá recibiendo los beneficios de esos derechos o recursos legales.
-
-14.3 Si algún tribunal judicial con jurisdicción para decidir sobre este asunto determina que alguna de las disposiciones de este Contrato de licencia no es válida, se eliminará esa disposición del Contrato de licencia sin que eso afecte la validez del resto del contrato. Las disposiciones restantes del Contrato de licencia continuarán siendo válidas y aplicables.
-
-14.4 Usted reconoce y acepta que cada miembro del grupo de compañías de las que Google es la compañía central serán terceros beneficiarios del Contrato de licencia, y que esas otras empresas tendrán el derecho de imponer directamente cualquier disposición y ampararse en las disposiciones de este Contrato de licencia que les confieran un beneficio (o que confieran derechos a su favor). Además de esto, ninguna otra persona o compañía serán terceros beneficiarios del Contrato de licencia.
-
-14.5 RESTRICCIONES DE EXPORTACIÓN. LA VERSIÓN PRELIMINAR ESTÁ SUJETA A LAS LEYES Y REGULACIONES DE EXPORTACIÓN DE LOS ESTADOS UNIDOS. DEBE CUMPLIR CON TODAS LAS LEYES Y REGULACIONES DE EXPORTACIÓN NACIONALES E INTERNACIONALES QUE SE APLIQUEN A LA VERSIÓN PRELIMINAR. ESTAS LEYES INCLUYEN RESTRICCIONES EN RELACIÓN CON LOS DESTINOS, USUARIOS FINALES Y USO FINAL.
-
-14.6 Usted no puede asignar ni transferir el Contrato de licencia sin la aprobación previa por escrito de Google y todo intento de asignación sin dicha aprobación no tendrá validez. No podrá delegar sus responsabilidades u obligaciones otorgadas en virtud del Contrato de licencia sin la aprobación previa por escrito de Google.
-
-14.7 El Contrato de licencia y su relación con Google conforme al Contrato de licencia se regirán por las leyes del estado de California, independientemente de los principios de conflictos entre leyes. Usted y Google aceptan presentarse ante la jurisdicción exclusiva de los tribunales del condado de Santa Clara, California, para resolver cualquier asunto legal que pudiera surgir del Contrato de licencia. Sin perjuicio de esto, usted acepta que Google aún podrá aplicar reparaciones conforme a mandato judicial (o a un tipo equivalente de desagravio legal) en cualquier jurisdicción.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">He leído y acepto los términos y las condiciones anteriores.</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#device-preview">Configurar un dispositivo de hardware</a>
- <ol>
- <li><a href="#ota">Obtener actualizaciones inalámbricas</a></li>
- <li><a href="#flash">Actualizar manualmente un dispositivo</a></li>
- <li><a href="#revertDevice">Desinstalar</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">Configurar un emulador</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Para ejecutar y probar tu aplicación en la plataforma nueva necesitas configurar el entorno de ejecución
- de Android N. Puedes llevar a cabo la configuración de las siguientes maneras:
-</p>
-
-<ul>
- <li>Instalar Android N en un dispositivo de hardware compatible o</li>
- <li>Configurar un emulador de Android a través de la ejecución de Android N</li>
-</ul>
-
-<p>
- Si deseas un entorno para realizarle pruebas básicas de compatibilidad a tu aplicación en la
- plataforma nueva, todo lo que necesitas es tu APK actual y un dispositivo de hardware o
- emulador. No necesitas actualizar todo tu entorno de desarrollo
- para realizar pruebas básicas.
-</p>
-
-<p>
- Si deseas modificar tu aplicación para seleccionar como destino Android N o usar las API nuevas de Android N,
- debes configurar un entorno de desarrollo actualizado y que seas compatible con
- Android N. En <a href="{@docRoot}preview/setup-sdk.html">Configuración para el desarrollo de
- Android N</a> se ofrece información detallada.
-</p>
-
-
-<h2 id="device-preview">Configurar un dispositivo de hardware</h2>
-
-<p>
- En N Developer Preview se ofrecen actualizaciones del sistema para una variedad de dispositivos de hardware
-que puedes usar para realizarle pruebas a tu aplicación, desde teléfonos hasta tablets y TV.
-</p>
-
-<p>
- Si tienes acceso a un dispositivo compatible, puedes actualizarlo a una compilación "milestone" de la Developer
- Preview de las siguientes maneras:
-</p>
-
-<ul>
- <li><strong>Registrar el dispositivo en actualizaciones automáticas inalámbricas</strong> a través del
- <a href="https://g.co/androidbeta">Programa Android Beta</a>. Una vez registrado, tu dispositivo recibirá actualizaciones inalámbricas periódicas
- de todas las compilaciones "milestone" en la N Developer Preview. Se recomienda este
- enfoque porque te permite realizar una transición sin inconvenientes desde tu entorno
- actual a través de varios lanzamientos de la N Developer Preview.</li>
- <li><strong>Descargar una imagen de sistema de la Developer Preview y actualizar el dispositivo de manera manual</strong>.
- Las actualizaciones inalámbricas no se proporcionan de manera automática para los dispositivos que actualizas de manera manual, pero
- puedes registrar esos dispositivos en el Programa de Android Beta para obtener actualizaciones inalámbricas. </li>
-</ul>
-
-<h3 id="ota">Registrar el dispositivo en actualizaciones automáticas inalámbricas</h3>
-
-<p>
- Si tienes acceso a un dispositivo compatible (consulta la lista en la tabla de
- descargas), puedes recibir actualizaciones inalámbricas para versiones de la Android Preview
- registrando el dispositivo en el <a href="https://g.co/androidbeta">Programa de Android Beta</a>. Estas actualizaciones
- se descargan de manera automática y actualizarán tu dispositivo como otras actualizaciones
- oficiales del sistema.
-</p>
-
-<p>
- Puedes dar de baja el dispositivo en cualquier momento. El dispositivo recibirá una actualización inalámbrica
- para la versión de producción más reciente de Android que se encuentre disponible para ese dispositivo
- (por ejemplo, Android 6.0 Marshmallow). La actualización requiere un restablecimiento
- completo del dispositivo, por lo que se eliminarán los datos del usuario del dispositivo. No te olvides de crear una <strong>copia
- de seguridad de los datos importantes</strong> antes de dar de baja un dispositivo.
-</p>
-
-<p>
- Para obtener más información y para registrar tu dispositivo, consulta
- el sitio web del <a href="https://g.co/androidbeta">Programa de Android Beta</a> .
-</p>
-
-<p class="note"><strong>Nota:</strong>
- Dar de baja el registro requiere un restablecimiento completo del dispositivo. Crea una copia de seguridad
- de los datos importantes.
-</p>
-
-<h3 id="flash">Actualizar un dispositivo de forma manual</h3>
-
-<p>
- En cualquier momento, puedes descargar la última imagen de sistema de la Developer Preview y
- actualizarla de forma manual en tu dispositivo. Consulta la tabla siguiente para descargar la imagen
- de sistema para tu dispositivo de prueba. La actualización manual de un dispositivo es útil si necesitas
- un control preciso del entorno de prueba o necesitas reinstalar con frecuencia,
- como en pruebas automatizadas.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- El proceso de instalación de una imagen de sistema en un dispositivo <strong>elimina todos los datos del
- dispositivo</strong>, por lo tanto, es recomendable crear una copia de seguridad de los datos.
-</p>
-
-<p>
- Después de que crees una copia de seguridad y descargues la siguiente imagen de sistema que
- se adecua a tu dispositivo, sigue las instrucciones que se describen en <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
- para actualizar la imagen en tu dispositivo de manera manual.
-</p>
-
-<p>
- Las imágenes de sistema actualizadas de manera manual <strong>no
- reciben actualizaciones inalámbricas de forma automática</strong> para posteriores compilaciones "milestone"
- de la Developer Preview. No te olvides de mantener tu entorno actualizado y actualiza una
- imagen de sistema nueva en cada versión "milestone" de la Developer Preview.
-</p>
-
-<p>
- Si decides que quieres obtener actualizaciones inalámbricas después de actualizar un dispositivo de manera manual,
- lo único que debes hacer es registrar el dispositivo en el <a href="https://g.co/androidbeta">Programa
- de Android Beta</a>. Puedes registrar el dispositivo en cualquier momento para recibir la siguiente actualización
- de la Preview de manera inalámbrica.
-</p>
-
-<table>
- <tr>
- <th scope="col">Dispositivo</th>
- <th scope="col">Descarga/sumas de comprobación</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npd35k-factory-5ba40535.tgz</a><br>
- MD5: b6c5d79a21815ee21db41822dcf61e9f<br>
- SHA-1: 5ba4053577007d15c96472206e3a79bc80ab194c
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npd35k-factory-a33bf20c.tgz</a><br>
- MD5: e1cf9c57cfb11bebe7f1f5bfbf05d7ab<br>
- SHA-1: a33bf20c719206bcf08d1edd8da6c0ff9d50f69c
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npd35k-factory-81c341d5.tgz</a><br>
- MD5: e93de7949433339856124c3729c15ebb<br>
- SHA-1: 81c341d57ef2cd139569b055d5d59e9e592a7abd
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npd35k-factory-2b50e19d.tgz</a><br>
- MD5: 565be87ebb2d5937e2abe1a42645864b<br>
- SHA-1: 2b50e19dae2667b27f911e3c61ed64860caf43e1
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npd35k-factory-2e89ebe6.tgz</a><br>
- MD5: a8464e15c6683fe2afa378a63e205fda<br>
- SHA-1: 2e89ebe67a46b2f3beb050746c13341cd11fa678
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npd35k-factory-1de74874.tgz</a><br>
- MD5: c0dbb7db671f61b2785da5001cedefcb<br>
- SHA-1: 1de74874f8d83e14d642f13b5a2130fc2aa55873
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npd35k-factory-b4eed85d.tgz</a><br>
- MD5: bdcb6f770e753668b5fadff2a6678e0d<br>
- SHA-1: b4eed85de0d42c200348a8629084f78e24f72ac2
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npd35k-factory-5ab1212b.tgz</a><br>
- MD5: 7d34a9774fdd6e025d485ce6cfc23c4c<br>
- SHA-1: 5ab1212bc9417269d391aacf1e672fff24b4ecc5
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> (D6603 and D6653)</td>
- <td>Descarga: <a class="external-link" href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- Para más información, visita la sección <a class="external-link" href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">Prueba la Android N Developer Preview en Xperia Z3</a>.
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">Desinstalar la Preview de un dispositivo</h3>
-
-<p>
- Si quieres desinstalar la muestra desde un dispositivo, puedes hacerlo de las
- siguientes maneras: </p>
- <ul>
- <li><strong>Obtener una imagen de sistema con las especificaciones de fábrica</strong> y luego actualízala de manera manual
- para el dispositivo.
- <ul>
- <li>Para <strong>los dispositivos Nexus y Pixel C</strong>, consulta
- la página <a href="http://developers.google.com/android/nexus/images">Imágenes de fábrica
- para dispositivos Nexus </a>para descargas. </li>
- <li>Para <strong>otros dispositivos</strong>, comunícate directamente con el fabricante del dispositivo
-. Como alternativa, si el dispositivo es compatible con
- el Programa de Android Beta, puedes registrar el dispositivo en el
- programa y luego darlo de baja (consulta a continuación).</li>
- </ul>
- </li>
- <li><strong>Dar de baja el dispositivo del Programa Android Beta</strong>. Si el
- dispositivo se registra en el <a href="https://g.co/androidbeta">Programa de Android
- Beta</a>, sin importar el dispositivo, puedes darlo de baja desde el programa fácilmente.
- <p>
- El dispositivo recibirá una actualización inalámbricas para la versión de producción más reciente de
- Android que se encuentre disponible para ese dispositivo (por ejemplo, Android 6.0 Marshmallow).
- La actualización requiere un restablecimiento completo del dispositivo, por lo que se eliminarán los datos del usuario del
- dispositivo. No te olvides de crear una <strong>copia de seguridad de los datos importantes</strong> antes
- de dar de baja un dispositivo.
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>Nota:</strong>
- Desinstalar una imagen de sistema de la Developer Preview antes
- del final del programa requiere un restablecimiento completo del dispositivo y elimina todos los datos del usuario
- que se encuentren en él.
-</p>
-
-
-<h2 id="setupAVD">Configurar un emulador</h2>
-
-<p>Para usar el emulador de Android para la ejecución de la Android N Preview, necesitas
-descargar el Android N Preview SDK y crear un dispositivo virtual para el
-emulador.</p>
-
-<p>Primero, descarga el Android N Preview SDK de la siguiente manera (si
-ya la obtuviste durante <a href="{@docRoot}preview/setup-sdk.html">la configuración
-para desarrollar Android N</a>, puedes omitir esta parte):
-
-<ol>
- <li>En Android Studio, abre el cuadro de diálogo de configuración
- (<strong>File > Settings</strong> en Windows y Linux, o
- <strong>Android Studio > Preferences</strong> en Mac). En el panel
- izquierdo, selecciona <strong>Appearance & Behavior >
- System Settings > Android SDK</strong>.
-
- <li>Haz clic en la pestaña <strong>SDK platforms</strong> y luego selecciona la casilla de verificación
- <strong>Android N Preview</strong>.</li>
-
- <li>Haz clic en la pestaña <strong>SDK Tools</strong> y luego selecciona las casillas de verificación
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong> y
- <strong>Android SDK Tools</strong>.
- </li>
-
- <li>Haz clic en <strong>OK</strong> y acepta los contratos
- de licencia para instalar cualquier paquete.
- </li>
-</ol>
-
-<p>Ahora debes tener <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-<strong>Platform-Tools 24.0.0 rc1</strong>, y <strong>SDK Tools
-25.0.9</strong>. Si no actualizas las SDK Tools a 25.0.9, luego no podrás
-ejecutar las imágenes de sistema x86_64 para Android N.</p>
-
-
-<p>Ahora crea un dispositivo virtual con la imagen de sistema de Android N:</p>
-
-<ol>
- <li>Abre el Administrador de AVD seleccionando <strong>Tools > Android >
- AVD Manager</strong>.</li>
- <li>Haz clic en <strong>Create Virtual Device</strong>.</li>
- <li>Selecciona un dispositivo como Nexus 5X, Nexus 6P, Nexus 9, o Android TV,
- luego haz clic en <strong>Next</strong>.</li>
- <li>Selecciona la imagen de sistema <strong>N</strong> (con la ABI
- <strong>x86</strong>), luego haz clic en <strong>Next</strong>.
- (De momento, solo las imágenes de sistema x86 son compatibles con el emulador de Android
-para la Android N Preview).
- <li>Completa el resto de la configuración AVD y haz clic en
- <strong>Finish</strong>.</li>
-</ol>
-
-<p>Ahora puedes ejecutar el emulador de Android con el AVD de la Android N Preview.</p>
-
-<p>
-A fin de garantizar la mejor experiencia en el emulador de Android, verifica que estás utilizando
-Android Studio 2.1 o una versión superior, compatible con el <a href="http://tools.android.com/tech-docs/emulator">emulador de Android 2.0</a>,
-cuyo rendimiento es mayor si se lo compara con el emulador utilizado en
-Android Studio 1.5.</p>
-
-<p>Para obtener más información sobre la creación de dispositivos virtuales, consulta <a href="{@docRoot}tools/devices/index.html">Administración de dispositivos virtuales</a>.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/es/preview/features/afw.jd b/docs/html-intl/intl/es/preview/features/afw.jd
deleted file mode 100644
index 32e57c8..0000000
--- a/docs/html-intl/intl/es/preview/features/afw.jd
+++ /dev/null
@@ -1,552 +0,0 @@
-page.title=Actualizaciones de Android for Work
-page.metaDescription=Nuevas API y funciones de Android for Work en Android N.
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#qr">Provisión de código QR
- </a></li>
-
- <li><a href="#sec-challenge">Comprobación de seguridad para perfiles de trabajo
- </a></li>
-
- <li><a href="#suspend">Inhabilitar acceso a aplicaciones
- </a></li>
-
- <li><a href="#toggle-work">Activar o desactivar el modo de trabajo
- </a></li>
-
- <li><a href="#always-on-vpn">VPN siempre visibles
- </a></li>
-
- <li><a href="#contacts">Integración de contactos con el perfil de trabajo
- </a></li>
-
- <li><a href="#remote-reboot">Reinicio remoto
- </a></li>
-
- <li><a href="#disable-roaming">Inhabilitar roaming de datos
- </a></li>
-
- <li><a href="#process-logging">Registros de procesos empresariales
- </a></li>
-
- <li><a href="#bug-reports">Informes de errores remotos
- </a></li>
-
- <li><a href="#remove-cert">Quitar un certificado de cliente
- </a></li>
-
- <li><a href="#grant-cert-on-install">Otorgar acceso a certificado de cliente
- en la instalación</a></li>
-
- <li><a href="#ui-policy">Transparencia de la política de IU del sistema
- </a></li>
-
- <li><a href="#restrictions-mgmt">Mejoras en la administración de restricciones de aplicaciones
- </a></li>
-
- <li><a href="#location-off">Interruptor de desactivación de los servicios de ubicación
- </a></li>
-
- <li><a href="#custom-provisioning">Provisión personalizada
- </a></li>
-
- <li><a href="#multi-wifi-ca">Múltiples certificados de CA de Wi-Fi
- </a></li>
-
- <li><a href="#custom-lock">Mensaje personalizado en la pantalla bloqueada
- </a></li>
-
- <li><a href="#work-connectionservice">ConnectionService del perfil de trabajo
- </a></li>
-
- <li><a href="#lock-wp">Bloquear fondo de pantalla
- </a></li>
-
- <li><a href="#lock-user-icon">Bloquear ícono de usuario
- </a></li>
-
- <li><a href="#health-monitoring">Control del estado del dispositivo
- </a></li>
-
- </ol>
-
- <h2>Consulta también</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia sobre N Preview SDK
- </a></li>
- </ul>
- </div>
-</div>
-
-<p>En este documento, se describen las nuevas funciones de Android for Work que se proporcionan en
-Android N.</p>
-
-<h2 id="qr">Provisión de código QR</h2>
-
-<p>
- Android for Work ahora es compatible con la utilización de códigos QR para aprovisionar dispositivos
- de responsabilidad corporativa. Gracias al asistente de configuración, ahora puedes escanear un código QR para aprovisionar
- el dispositivo.
-</p>
-
-<h2 id="sec-challenge">Comprobación de seguridad para perfiles de trabajo</h2>
-
-<p>
- Los propietarios de perfiles pueden solicitar que los usuarios especifiquen una comprobación de seguridad para las aplicaciones
- que se ejecutan en el perfil de trabajo. Dicha comprobación se muestra en el sistema cuando el
- usuario intenta abrir cualquier aplicación de trabajo. Si el usuario completa con éxito la
- comprobación de seguridad, el sistema desbloquea el perfil de trabajo y lo descifra
- si es necesario.
-</p>
-
-<p>
- Si el propietario de un perfil envía una intent {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD}, el
- sistema le pide al usuario que configure una comprobación de seguridad. El propietario del perfil también puede
- enviar una intent <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code>
- para que el usuario establezca un bloqueo de dispositivo.
-</p>
-
-<p>
- Los propietarios de perfiles pueden elegir establecer las políticas de contraseña para la comprobación del perfil de trabajo de modo que sean
- diferentes de aquellas para las contraseñas de otros dispositivos. Por ejemplo, la
- longitud mínima para la respuesta de comprobación del dispositivo puede ser diferente de la
- longitud necesaria para otras contraseñas. Los propietarios de perfiles establecen las políticas de
- comprobación mediante los métodos {@link android.app.admin.DevicePolicyManager}
- comunes, como por ejemplo, {@link
- android.app.admin.DevicePolicyManager#setPasswordQuality
- setPasswordQuality()} y {@link
- android.app.admin.DevicePolicyManager#setPasswordMinimumLength
- setPasswordMinimumLength()}. El propietario del perfil también puede establecer el bloqueo del dispositivo mediante
- la utilización de la instancia de{@link android.app.admin.DevicePolicyManager} devuelta
- por el nuevo método <code>DevicePolicyManager.getParentProfileInstance()</code>
-. Además, los propietarios de perfiles pueden personalizar la pantalla de credenciales para
- la comprobación de trabajo mediante la utilización de los nuevos métodos de la clase{@link android.app.admin.DevicePolicyManager}
- <code>setOrganizationColor()</code> y
- <code>setOrganizationName()</code>.
-</p>
-
-<p>
- Para obtener detalles sobre los nuevos métodos y constantes, consulta la página de referencia de
- <code>DevicePolicyManager</code> en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia sobre N Preview SDK</a>.
-</p>
-
-<h2 id="suspend">Inhabilitar acceso a aplicaciones</h2>
-
-<p>
- Los propietarios de perfiles y dispositivos pueden suspender temporariamente el acceso a los paquetes
- mediante una llamada al nuevo método <code>DevicePolicyManager.setPackagesSuspended()</code>
-. Los propietarios pueden utilizar el mismo método para volver a habilitar esos paquetes.
-</p>
-
-<p>
- Mientras un paquete está suspendido, este no puede comenzar actividades, se suprimen las notificaciones al
- paquete y se oculta la entrada de la aplicación en la <a href="{@docRoot}guide/components/recents.html">pantalla de información general</a>.
- Los paquetes suspendidos no aparecen en la <a href="{@docRoot}guide/components/recents.html">pantalla de información general</a> y
- no pueden mostrar diálogos (incluidos avisos y snackbars). Además, no pueden reproducir
- audio ni hacer vibrar el dispositivo.
-</p>
-
-<p>
- Los lanzadores deben aplicar una IU distintiva para las aplicaciones suspendidas a fin de mostrar que las
- aplicaciones no están actualmente disponibles; por ejemplo, el ícono de la aplicación puede aparecer en color
- gris. Los lanzadores pueden averiguar si una aplicación está suspendida llamando al nuevo método
- <code>DevicePolicyManager.getPackageSuspended()</code>.
-</p>
-
-<h2 id="toggle-work">Activar o desactivar el modo de trabajo</h2>
-
-<p>
- En dispositivos de perfil doble, los usuarios pueden activar o desactivar el modo de trabajo. Mientras este último está
- desactivado, el perfil administrado se encuentra inactivo temporariamente. Se inhabilitan
- todas las aplicaciones del perfil de trabajo, la sincronización en segundo plano y las notificaciones, incluida
- la aplicación del propietario del perfil. Mientras el perfil de trabajo está deshabilitado, en el sistema
- se muestra un ícono de estado persistente para recordarles a los usuarios que no pueden iniciar aplicaciones
- de trabajo. El launcher del sistema indica que no se puede acceder a aplicaciones ni widgets
- de trabajo.
-</p>
-
-<h2 id="always-on-vpn">VPN siempre visibles</h2>
-
-<p>
- Los propietarios de dispositivos y perfiles pueden solicitar que las aplicaciones de trabajo siempre se conecten a la red
- a través de una VPN especificada. Si los propietarios establecen este requisito, el
- dispositivo inicia automáticamente esa VPN en el inicio.
-</p>
-
-<p>
- Los propietarios pueden requerir el uso de una VPN llamando al nuevo método
- <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code>. Para averiguar
- si el propietario ha establecido un requisito de VPN, llama al nuevo método
- <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>
- Debido a que los servicios de VPN pueden enlazarse directamente a través del sistema sin interacción con aplicaciones,
- los clientes de VPN deben administrar nuevos puntos de entrada para VPN siempre visibles. Como antes, puedes
- encontrar servicios activos mediante la utilización de un filtro de intent que coincida con la acción
- {@link android.net.VpnService android.net.VpnService}.
-</p>
-
-<p>
- Para configurar manualmente un cliente de VPN que esté siempre visible y que implemente {@link
- android.net.VpnService}, los usuarios deben ir a <strong>Settings > More >
- pantalla VPN</strong>.
-</p>
-
-<h2 id="contacts">Integración de contactos con el perfil de trabajo</h2>
-
-<p>
- Los propietarios de perfiles pueden permitir la búsqueda local y la búsqueda en directorio de los contactos de trabajo
- a partir del usuario principal. Por ejemplo, un usuario puede acceder a contactos personales y laborales del directorio
- desde el teléfono personal o la aplicación de contactos (si
- así lo permite el administrador del perfil).
-</p>
-
-<p>
- Los desarrolladores que aprovechan el proveedor de contactos pueden utilizar la API de contactos empresariales
- para acceder a las entradas del directorio del perfil de trabajo desde el usuario principal si así lo permiten
- las siguientes políticas:
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- Los propietarios de perfiles pueden controlar la visibilidad de los contactos laborales en el usuario
- principal por medio de los nuevos métodos a continuación:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">Reinicio remoto</h2>
-
-<p>
- Los propietarios pueden reiniciar sus dispositivos de forma remota. En algunos casos, no se puede acceder al botón de encendido de los dispositivos implementados en
- lugares públicos dentro de recintos. Si se debe
- reiniciar un dispositivo, los administradores pueden hacerlo utilizando el nuevo método
- <code>DevicePolicyManager.reboot()</code>.
-</p>
-
-<h2 id="disable-roaming">Inhabilitar roaming de datos</h2>
-
-<p>
- Los propietarios de dispositivos pueden inhabilitar el roaming de datos mediante la nueva restricción de usuario de {@link
- android.os.UserManager} denominada <code>DISALLOW_DATA_ROAMING</code>.
-</p>
-
-<h2 id="process-logging">Registros de procesos empresariales</h2>
-
-<p>
- Los propietarios de dispositivos pueden identificar actividades sospechosas mediante un rastreo remoto de la actividad del
- dispositivo, incluidos inicios de aplicaciones, actividad adb y desbloqueos de pantalla. Los registros de
- procesos no requieren del consentimiento del usuario. Para recuperar registros, los propietarios de dispositivos habilitan
- los registros de dispositivos mediante <code>DevicePolicyManager.setSecurityLoggingEnabled()</code>.
-</p>
-
-<p>
- Entre los cambios en la API, se incluyen los siguientes:
-</p>
-
-<ul>
-
- <li>
- La nueva clase <code>android.app.admin.SecurityLog</code> y sus
- métodos
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">Informes de errores remotos</h2>
-
-<p>
- Los propietarios de dispositivos pueden activar y recuperar de forma remota un informe de errores que contenga un
- archivo de descarga sobre el estado del dispositivo, lo que permite llevar a cabo una investigación forense de un
- incidente conocido o un dispositivo afectado. Debido a la naturaleza detallada del informe de errores,
- se requiere el consentimiento del usuario.
-</p>
-
-<p>
- Android N incluye los siguientes agregados de API para ofrecer compatibilidad con esta función. Para obtener
- detalles, consulte la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia sobre N Preview SDK
-</a>.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">Quitar un certificado de cliente</h2>
-
-<p>
- Los propietarios de perfiles y dispositivos ahora pueden quitar certificados de cliente que se
- instalaron a través de {@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()} llamando al nuevo método
- <code>DevicePolicyManager.removeKeyPair()</code>.
-</p>
-
-<h2 id="grant-cert-on-install">Otorgar acceso a certificado de cliente
- en la instalación</h2>
-
-<p>
- Si un propietario de perfil o dispositivo otorga a una aplicación de terceros la capacidad de
- administrar certificados, dicha aplicación puede acceder por sí sola a los certificados que
- instala sin intervención alguna por parte del propietario.
-</p>
-
-<p>
- La API existente para administrar certificados se extiende para incluir lo siguiente:
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">Transparencia de la política de IU del sistema</h2>
-
-<p>
- Las políticas que afectan la experiencia del usuario o restringen las configuraciones del usuario se divulgan
- en su totalidad al usuario, y los propietarios de perfiles y dispositivos pueden atribuir la
- política al departamento de TI de la empresa. Además de un mensaje “Action
- not allowed” consistente en Settings, los administradores de TI pueden configurar un
- mensaje de soporte específico para la organización en la configuración del dispositivo con los nuevos
- métodos{@link android.app.admin.DevicePolicyManager} a continuación:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="restrictions-mgmt">Mejoras en la administración de las restricciones de aplicaciones</h2>
-
-<p>
- El propietario del dispositivo o perfil puede habilitar otra aplicación para que administre las restricciones de
- aplicaciones mediante el nuevo método
- <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code>
-. La aplicación nominada puede controlar si se otorgó este permiso
- llamando a
- <code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code>.
-</p>
-
-<p>
- Una aplicación nominada para administrar restricciones de aplicaciones puede llamar a {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
- setApplicationRestrictions()} y {@link
- android.app.admin.DevicePolicyManager#getApplicationRestrictions
- getApplicationRestrictions()} para cualquier paquete dentro de ese usuario o perfil.
-</p>
-
-<h2 id="location-off">Interruptor de desactivación de los servicios de ubicación</h2>
-
-<p>
- Los usuarios pueden inhabilitar los permisos de ubicación para las aplicaciones de trabajo mientras continúan
- accediendo a información sobre ubicación en sus aplicaciones personales. Mediante un interruptor independiente de acceso
- a información de ubicación en Location Settings, los usuarios pueden denegar las actualizaciones de ubicación o
- las consultas de última ubicación para las aplicaciones que se ejecutan en el perfil de trabajo.
-</p>
-
-<p>
- Gracias al interruptor de desactivación de servicios de ubicación de nivel superior, se inhabilita el acceso a este tipo de información para
- el perfil principal y el perfil administrado.
-</p>
-
-<h2 id="custom-provisioning">Aprovisionamiento personalizado</h2>
-
-<p>
- En una aplicación se pueden personalizar los flujos de provisión
- del propietario del perfil y del propietario del dispositivo con logos y colores corporativos.
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- Permite personalizar el color del flujo.
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- Permite personalizar el flujo con un logo corporativo.
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">Múltiples certificados de CA de Wi-Fi</h2>
-
-<p>
- Los propietarios de perfiles y dispositivos pueden configurar múltiples certificados de CA para una configuración
- de Wi-Fi determinada. Cuando las redes de Wi-Fi corporativas tienen CA independientes para
- diferentes puntos de acceso con el mismo SSID, los administradores de TI pueden incluir todas las
- CA relevantes en la configuración Wi-Fi utilizando el nuevo método
- <code>setCaCertificates()</code>.
-</p>
-
-<p>
- Las API que se agregaron son las siguientes:
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">Mensaje personalizado en la pantalla bloqueada</h2>
-
-<p>
- Los propietarios de dispositivos pueden proporcionar información de propietario para que aparezca en la pantalla bloqueada.
- Esta información prevalece sobre el mensaje de la pantalla bloqueada del usuario (si se configuró
- uno). Los nuevos métodos {@link android.app.admin.DevicePolicyManager} son los siguientes:
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">ConnectionService del perfil de trabajo</h2>
-
-<p>
- Los propietarios de perfiles pueden especificar una aplicación de teléfono de trabajo que utilice un
- {@link android.telecom.ConnectionService} específico del trabajo para el backend
- de llamadas (cuentas de llamadas). El teléfono de trabajo lleva únicamente un registro de llamadas de trabajo
- y depende solo de contactos laborales. Los usuarios tienen una experiencia de IU
- de llamada entrante consistente independientemente de la aplicación de marcación. Las llamadas laborales que ingresan en las
- cuentas de llamadas de trabajo se distinguen de las llamadas personales que ingresan en
- las cuentas de llamadas personales.
-</p>
-
-<p>
- El teléfono debe controlar el nuevo marcador
- <code>android.telecom.Call.PROPERTY_WORK_CALL</code> para determinar si una llamada es
- de tipo laboral. Si se trata de una llamada laboral, el teléfono debe indicarlo
-, por ejemplo, mediante el agregado de una insignia de trabajo.
-</p>
-
-<h2 id="lock-wp">Bloquear fondo de pantalla</h2>
-
-<p>
- Mediante una nueva restricción de usuario (<code>DISALLOW_SET_WALLPAPER</code>), se evita que el
- usuario modifique el fondo de pantalla. Los propietarios de dispositivos o perfiles aún pueden
- modificar el fondo de pantalla. Sin embargo, solo pueden hacerlo para el
- usuario o perfil que controlan. Por ejemplo, el propietario de un perfil no puede modificar el
- fondo de pantalla del usuario primario,
- pero sí pueden hacerlo el propietario de un dispositivo o el propietario de un perfil en el perfil principal. El propietario de un dispositivo o perfil que desea modificar el
- fondo de pantalla debe controlar si el usuario o perfil que administra posee un
- fondo de pantalla ({@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}) y si puede modificarlo (con el
- nuevo método <code>WallpaperManager.isWallpaperSettingAllowed()</code>).
-</p>
-
-<h2 id="lock-user-icon">Bloquear ícono de usuario</h2>
-
-<p>
- Mediante una nueva restricción de usuario (<code>DISALLOW_SET_USER_ICON</code>), se evita que el
- usuario modifique el ícono de usuario. El propietario del dispositivo o del perfil del usuario
- aún puede modificar el ícono. Sin embargo, un propietario de perfil solo puede modificar el ícono
- de usuario del perfil que controla.
-</p>
-
-<h2 id="health-monitoring">Control del estado del dispositivo</h2>
-
-<p>
- El propietario de un perfil o dispositivo puede usar la nueva interfaz
- <code>HardwarePropertiesManager</code> para recuperar información
- sobre el estado del dispositivo, como por ejemplo, las temperaturas de CPU o GPU y el uso de la CPU. La nueva interfaz
- de control es especialmente útil para controlar dispositivos sin supervisión
- que se ejecutan en una ubicación remota.
-</p>
diff --git a/docs/html-intl/intl/es/preview/features/background-optimization.jd b/docs/html-intl/intl/es/preview/features/background-optimization.jd
index fbae9b5..c061a09 100644
--- a/docs/html-intl/intl/es/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/es/preview/features/background-optimization.jd
@@ -274,7 +274,7 @@
</pre>
<p>
Cuando el sistema informa un cambio en el(los) URI de contenido especificado(s), tu aplicación
- recibe un callback y se pasa un objeto {@link android.app.job.JobParameters}
+ recibe un callback y se pasa un objeto {@link android.app.job.JobParameters}
al método {@link android.app.job.JobService#onStartJob onStartJob()}
en {@code MediaContentJob.class}.
</p>
diff --git a/docs/html-intl/intl/es/preview/features/data-saver.jd b/docs/html-intl/intl/es/preview/features/data-saver.jd
deleted file mode 100644
index 458e662..0000000
--- a/docs/html-intl/intl/es/preview/features/data-saver.jd
+++ /dev/null
@@ -1,234 +0,0 @@
-page.title=Ahorro de datos
-metaDescription=User-enabled data usage optimization.
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- En este documento
- </h2>
-
- <ol>
- <li>
- <a href="#status">Verificación de las preferencias de ahorro de datos</a>
- <ol>
- <li>
- <a href="#request-whitelist">Solicitud de permisos de lista blanca</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">Control de cambios en las preferencias
- de ahorro de datos</a>
- </li>
-
- <li>
- <a href="#testing">Pruebas con comandos de Android Debug Bridge</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- Durante la vida útil de un smartphone, el costo de un plan de datos móviles puede
- superar fácilmente el costo del propio dispositivo. En la versión N Developer Preview, los usuarios pueden
- habilitar el ahorro de datos en todo el dispositivo a fin de reducir el uso de datos, ya sea con
- servicio de itinerancia, cerca del final del ciclo de facturación o con un pequeño paquete de datos prepago.
-</p>
-
-<p>
- Cuando un usuario habilita el ahorro de datos en <strong>Settings</strong> y el dispositivo está conectado
- a una red de uso medido, el sistema bloquea el uso de datos en segundo plano y envía señales
- a las aplicaciones para que utilicen menos datos en primer plano siempre que sea posible. Los usuarios pueden
- incluir aplicaciones específicas en la lista blanca para permitir el uso de datos medidos en segundo plano, incluso cuando está activado el ahorro
- de datos.
-</p>
-
-<p>
- La N Developer Preview extiende la API {@link android.net.ConnectivityManager}
- para que las aplicaciones puedan <a href="#status">recuperar las preferencias de
- ahorro de datos del usuario</a> y <a href="#monitor-changes">controlar
- los cambios en las preferencias</a>. Se considera una buena práctica que las aplicaciones verifiquen si el
- usuario habilitó el ahorro de datos y se esfuercen por reducir el uso de datos en primer
- y segundo plano.
-</p>
-
-<h2 id="status">
- Verificación de las preferencias de ahorro de datos
-</h2>
-
-<p>
- En la N Developer Preview, las aplicaciones pueden utilizar la API {@link
- android.net.ConnectivityManager} para determinar qué restricciones
- de uso de datos se aplican. Mediante el método {@code getRestrictBackgroundStatus()}
-, se devuelve uno de los siguientes valores:
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- El ahorro de datos está inhabilitado.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- El usuario habilitó el ahorro de datos para esta aplicación. Las aplicaciones deben esforzarse por reducir
- el uso de datos en primer plano y manejar correctamente las restricciones para
- el uso de datos en segundo plano.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- El usuario habilitó el ahorro de datos, pero la aplicación se encuentra en la lista blanca. Las aplicaciones aún deben
- esforzarse por reducir el uso de datos en primer y segundo plano.
- </dd>
-</dl>
-
-<p>
- Se considera una buena práctica limitar el uso de datos siempre que el dispositivo esté
- conectado a una red de uso medido, incluso si el ahorro de datos está deshabilitado o la aplicación
- se encuentra en la lista blanca. El siguiente código de muestra utiliza {@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} y {@code
- ConnectivityManager.getRestrictBackgroundStatus()} para determinar la cantidad de datos
- que la aplicación debe utilizar:
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- Solicitud de permisos de lista blanca
-</h3>
-
-<p>
- Si la aplicación necesita utilizar datos en segundo plano, esta puede solicitar permisos de
- lista blanca mediante el envío de una intent
- <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
- que contenga un URI del nombre de paquete de la aplicación, como por ejemplo,
- <code>package:MY_APP_ID</code>.
-</p>
-
-<p>
- Mediante el envío de la intent y el URI, se inicia la aplicación <strong>Settings</strong> y
- se muestra la configuración de uso de datos para la aplicación. El usuario luego puede decidir si
- habilita los datos en segundo plano para la aplicación. Antes de enviar esta intent, resulta
- buena práctica consultarle primero al usuario acerca de si desea iniciar la aplicación
- <strong>Settings</strong> con el objetivo de habilitar el uso de datos
- en segundo plano.
-</p>
-
-<h2 id="monitor-changes">
- Control de cambios en las preferencias de ahorro de datos
-</h2>
-
-<p>
- Las aplicaciones pueden controlar los cambios en las preferencias de ahorro de datos mediante la creación de un {@link
- android.content.BroadcastReceiver} para escuchar {@code
- ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} y mediante un registro
- dinámico del receptor con {@link android.content.Context#registerReceiver
- Context.registerReceiver()}. Cuando una aplicación recibe esta transmisión, debe
- <a href="#status">verificar si las nuevas preferencias de ahorro de datos afectan los
- permisos; para ello,</a> la aplicación debe llamar a {@code
- ConnectivityManager.getRestrictBackgroundStatus()}.
-</p>
-
-<p class="note">
- <strong>Nota:</strong> El sistema únicamente envía esta transmisión a las aplicaciones que
- se registran dinámicamente para recibirla con {@link
- android.content.Context#registerReceiver Context.registerReceiver()}. Las aplicaciones
- que en su manifiesto registran que la reciben no la
- recibirán.
-</p>
-
-<h2 id="testing">
- Pruebas con comandos de Android Debug Bridge
-</h2>
-
-<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
-ofrece algunos comandos que puedes utilizar para verificar y configurar los permisos
-de red:
-
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- Se genera un informe en el que se incluyen la configuración global actual de restricciones de red
- en segundo plano, los UID de paquetes que se encuentran actualmente en una lista blanca y los permisos
- de red de otros paquetes conocidos.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- Se muestra una lista completa de los comandos del administrador de políticas de red (políticas de red).
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- Se habilita o deshabilita el modo de ahorro de datos cuando se asignan los valores <code>true</code> o
- <code>false</code>, respectivamente.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Se agrega el UID del paquete específico a la lista blanca para permitir el uso de datos
- medidos en segundo plano.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Se quita el UID del paquete específico de la lista blanca para bloquear el uso de datos
- medidos en segundo plano mientras el ahorro de datos está habilitado.
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/preview/features/direct-boot.jd b/docs/html-intl/intl/es/preview/features/direct-boot.jd
deleted file mode 100644
index a9cfcf0..0000000
--- a/docs/html-intl/intl/es/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=Inicio directo
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#run">Solicitar acceso para ejecutar durante el inicio directo</a></li>
- <li><a href="#access">Acceder al almacenamiento encriptado por dispositivo</a></li>
- <li><a href="#notification">Recibir notificaciones sobre el desbloqueo del usuario</a></li>
- <li><a href="#migrating">Migrar datos existentes</a></li>
- <li><a href="#testing">Probar la aplicación con reconocimiento de encriptación</a></li>
- </ol>
-</div>
-</div>
-
-<p>Android N se ejecuta en un modo <i>de inicio directo</i> seguro
-cuando el dispositivo se enciende pero el usuario no lo ha
-desbloqueado. Para permitir esto, el sistema brinda dos ubicaciones de almacenamiento para los datos:</p>
-
-<ul>
-<li><i>Almacenamiento encriptado por credencial: </i>es la ubicación de almacenamiento predeterminada
-y solo está disponible después de que el usuario desbloquea el dispositivo.</li>
-<li><i>Almacenamiento encriptado por dispositivo: </i>es una ubicación de almacenamiento que está disponible tanto
-durante el modo de inicio directo como después de que el usuario desbloquea el dispositivo.</li>
-</ul>
-
-<p>De forma predeterminada, las aplicaciones no se ejecutan durante el modo de inicio directo.
-Si necesitas que tu aplicación se ejecute durante el modo de inicio directo, puedes registrar
-los componentes de la aplicación que deberían ejecutarse durante este modo. Algunos casos comunes de
-aplicaciones que necesitan ejecutarse durante el modo de inicio directo incluyen los siguientes:</p>
-
-<ul>
-<li>aplicaciones que tienen notificaciones programadas, como aplicaciones
-de alarma;</li>
-<li>aplicaciones que generan notificaciones de usuario importantes, como aplicaciones de mensajes SMS;</li>
-<li>aplicaciones que brindan servicios de accesibilidad, como Talkback.</li>
-</ul>
-
-<p>Si necesitas que tu aplicación acceda a datos mientras se ejecuta el modo de inicio directo, usa
-el almacenamiento encriptado por dispositivo. Este tipo de almacenamiento contiene datos
-encriptados con una clave que solo está disponible luego de que el dispositivo haya realizado un inicio
-verificado correctamente.</p>
-
-<p>Para los datos que se deben cifrar con una clave asociada con credenciales del
-usuario, como un PIN o una contraseña, usa el almacenamiento encriptado por credencial.
-Este tipo de almacenamiento solo está disponible luego de que el usuario haya desbloqueado
-correctamente el dispositivo y hasta que el usuario reinicie nuevamente el dispositivo. Si el
-usuario habilita el bloqueo de pantalla luego de desbloquear el dispositivo, esto no bloquea
-el almacenamiento encriptado por credencial.</p>
-
-<h2 id="run">Solicitar acceso para ejecutar durante el inicio directo</h2>
-
-<p>Debes registrar los componentes de las aplicaciones con el sistema antes de que estas puedan
-ejecutarse durante el modo de inicio directo o acceder al almacenamiento encriptado por
-dispositivo. Para registrar una aplicación en el sistema, debes marcar los componentes como
-<i>"con reconocimiento de encriptación"</i>. Para marcar tu dispositivo como "con reconocimiento de encriptación", configura el atributo
-<code>android:directBootAware</code> como verdadero en el manifiesto.<p>
-
-<p>Los componentes con reconocimiento de encriptación pueden registrarse para recibir un mensaje de transmisión
-<code>LOCKED_BOOT_COMPLETED</code> del
- sistema cuando el dispositivo se haya reiniciado. En este momento, el almacenamiento
-encriptado por dispositivo está disponible, y el componente puede ejecutar tareas que se deben
-ejecutar durante el modo de inicio directo, como disparar una alarma programada.</p>
-
-<p>El siguiente fragmento de código es un ejemplo de cómo registrar un
-{@link android.content.BroadcastReceiver} como reconocimiento de encriptación y de cómo agregar un
-filtro de intents para <code>LOCKED_BOOT_COMPLETED</code> en el manifiesto de la aplicación:</p>
-
-<pre>
-<receiver
- android:directBootAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Una vez que el usuario haya desbloqueado el dispositivo, todos los componentes podrán acceder tanto al
-almacenamiento encriptado por dispositivo como al almacenamiento cifrado por credencial.</p>
-
-<h2 id="access">Acceder al almacenamiento encriptado por dispositivo</h2>
-
-<p>Para acceder al almacenamiento encriptado por dispositivo, crea una segunda
-instancia de {@link android.content.Context} llamando a
-<code>Context.createDeviceProtectedStorageContext()</code>. Todas las llamadas
-de API de almacenamiento que se hacen usando este contexto acceden al almacenamiento encriptado por dispositivo. El siguiente
-ejemplo accede al almacenamiento encriptado por dispositivo y abre un archivo de datos de la aplicación
-existente:</p>
-
-<pre>
-Context directBootContext = appContext.createDeviceProtectedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>Solo debes usar el almacenamiento encriptado por dispositivo para
-información que debe ser accesible durante el modo de inicio directo.
-No uses este tipo de almacenamiento como un almacenamiento encriptado de propósito general.
-Para información privada del usuario o datos encriptados que no son necesarios durante
-el modo de inicio directo, usa el almacenamiento encriptado por credencial.</p>
-
-<h2 id="notification">Recibir notificaciones sobre el desbloqueo del usuario</h2>
-
-<p>Una vez que el usuario desbloquea el dispositivo después de reiniciarlo, la aplicación puede cambiar y acceder
-al almacenamiento encriptado por credencial y usar servicios del sistema comunes que
-dependen de credenciales de usuario.</p>
-
-<p>Para recibir una notificación cuando el usuario desbloquea el dispositivo luego de reiniciarlo,
-registra un {@link android.content.BroadcastReceiver} de un componente en ejecución
-para que escuche el mensaje <code>ACTION_USER_UNLOCKED</code>. O puedes
-recibir el mensaje existente {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED}, que ahora indica que el dispositivo se ha iniciado y
-que el usuario ha desbloqueado el dispositivo.</p>
-
-<p>Puedes consultar directamente si el usuario ha desbloqueado el dispositivo llamando a
-<code>UserManager.isUserUnlocked()</code>.</p>
-
-<h2 id="migrating">Migrar datos existentes</h2>
-
-<p>Si un usuario actualiza el dispositivo para usar el modo de inicio directo, es posible que haya
-datos existentes que se deban migrar al almacenamiento encriptado por dispositivo. Usa
-<code>Context.moveSharedPreferencesFrom()</code> y
-<code>Context.moveDatabaseFrom()</code> para migrar los datos de preferencia y de base de datos
-del almacenamiento encriptado por credencial al almacenamiento encriptado por dispositivo.</p>
-
-<p>Debes tener cuidado cuando decidas qué datos migrar entre
-estos dos tipos de almacenamiento. No deberías migrar
-información de usuario privada, como contraseñas o tokens de autorización, al
- almacenamiento encriptado por dispositivo. En algunos casos, es posible que debas gestionar
-conjuntos separados de datos en ambos tipos de almacenamiento encriptado.</p>
-
-<h2 id="testing">Probar la aplicación con reconocimiento de encriptación</h2>
-
-<p>Prueba la aplicación con reconocimiento de encriptación usando el nuevo modo de inicio directo. Hay dos
-maneras de habilitar el inicio directo.</p>
-
-<p class="caution"><strong>Advertencia:</strong> Habilitar el inicio directo
-borrará todos los datos de usuario del dispositivo.</p>
-
-<p>Para los dispositivos compatibles que tienen Android N instalado, habilita
-el inicio directo mediante una de las siguientes opciones:</p>
-
-<ul>
-<li>En el dispositivo, habilita las <b>Developer options</b> si no lo haz hecho aún
-yendo a <b>Settings > About phone</b> y presionando <b>Build number</b>
-siete veces. Una vez que aparezca la pantalla Developer options, dirígete a
-<b>Settings > Developer options</b> y selecciona
-<b>Convert to file encryption</b>.</li>
-<li>Usa los siguientes comandos shell ADB para habilitar el modo de inicio directo:
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>También está disponible un modo de inicio directo emulado en caso de que debas cambiar
-de modo en los dispositivos de prueba. El modo emulado solo debería usarse durante
-el desarrollo, y puede provocar la pérdida de datos. Para habilitar el modo de inicio directo emulado,
-debes establecer un patrón de bloqueo en el dispositivo, elegir "No thanks" si te pregunta si deseas un
-inicio seguro cuando estás estableciendo el patrón de bloqueo y, luego, usar el
-siguiente comando shell ADB:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>Para deshabilitar el modo de inicio directo emulado, usa el siguiente comando:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>Usar estos comandos provoca el reinicio del dispositivo.</p>
diff --git a/docs/html-intl/intl/es/preview/features/multi-window.jd b/docs/html-intl/intl/es/preview/features/multi-window.jd
deleted file mode 100644
index 89bc319..0000000
--- a/docs/html-intl/intl/es/preview/features/multi-window.jd
+++ /dev/null
@@ -1,589 +0,0 @@
-page.title=Compatibilidad con ventanas múltiples
-page.metaDescription=Nueva compatibilidad en Android N para mostrar más de una aplicación a la vez.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#overview">Información general</a></li>
- <li><a href="#lifecycle">Ciclo de vida en modo de ventanas múltiples</a></li>
- <li><a href="#configuring">Configuración de tu aplicación para el modo de
- ventanas múltiples</a></li>
- <li><a href="#running">Ejecución de tu aplicación en modo de ventanas múltiples</a></li>
- <li><a href="#testing">Prueba de la compatibilidad de tu aplicación con el uso de ventanas múltiples</a></li>
- </ol>
- <h2>Consulta también</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Aplicación de ejemplo para la
- prueba de ventanas múltiples</a></li>
- <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Cinco tips para prepararse para ventanas múltiples en Android N</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N agrega compatibilidad con la visualización de más de una aplicación
- a la vez. En dispositivos portátiles, se pueden ejecutar dos aplicaciones una al lado de la otra o
- una por encima de la otra en modo de <em>pantalla dividida</em>. En dispositivos de TV, las aplicaciones pueden
- usar el modo <em>picture-in-picture</em> para continuar la reproducción de video mientras los usuarios
- interactúan con otra aplicación.
-</p>
-
-<p>
- Si compilas tu aplicación con el N Preview SDK, puedes configurar la manera en que tu aplicación
- administra la visualización de ventanas múltiples. Por ejemplo, puedes especificar las dimensiones
- mínimas permitidas de tu actividad. También puedes inhabilitar la visualización de ventanas múltiples para
- tu aplicación asegurándote de que el sistema solo muestre tu aplicación en modo de
- pantalla completa.
-</p>
-
-<h2 id="overview">Información general</h2>
-
-<p>
- Android N permite que varias aplicaciones compartan la pantalla al mismo tiempo. Por
- ejemplo, un usuario podría dividir la pantalla y ver una página web a la izquierda
- mientras escribe un correo electrónico a la derecha. La experiencia de usuario depende
- del dispositivo:
-</p>
-
-<ul>
- <li>Los dispositivos portátiles con Android N ofrecen modo de
- pantalla dividida. En este modo, el sistema ocupa la pantalla con dos aplicaciones y las muestra
- una al lado de la otra o una encima de la otra. El usuario puede arrastrar la línea que divide
- las dos aplicaciones para visualizar una más grande que la otra.
- </li>
-
- <li>En dispositivos Nexus Player con Android N, las aplicaciones pueden ubicarse automáticamente
- en <a href="picture-in-picture.html">modo Picture-in-picture</a>, lo que les permite
- continuar mostrando contenido mientras el usuario explora o interactúa con
- otras aplicaciones.
- </li>
-
- <li>Los fabricantes de dispositivos más grandes pueden optar por habilitar el modo
- de forma libre, en el que el usuario puede modificar libremente el tamaño de cada actividad. Si el
- fabricante habilita está función, el dispositivo ofrecerá modo de forma libre además
- del modo de pantalla dividida.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>Figura 1:</strong> Dos aplicaciones ejecutándose una al lado de la otra en modo de pantalla dividida.
-</p>
-
-<p>
- El usuario puede cambiar a modo de ventanas múltiples de la siguiente manera:
-</p>
-
-<ul>
- <li>Si el usuario abre la <a href="{@docRoot}guide/components/recents.html">pantalla
- Overview</a> y presiona durante un momento el
- título de una actividad, puede arrastrar esa actividad a una parte resaltada de la
- pantalla para llevarla a modo de ventanas múltiples.
- </li>
-
- <li>Si el usuario presiona durante un momento el botón Overview, el dispositivo coloca
- la actividad actual en modo de ventanas múltiples y abre la pantalla Overview para
- permitirle al usuario seleccionar otra actividad para compartir la pantalla.
- </li>
-</ul>
-
-<p>
- Los usuarios pueden <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastrar y
- soltar</a> datos de una actividad a otra mientras las actividades comparten
- la pantalla. (Antes, los usuarios solo podían arrastrar y soltar datos dentro de una sola
- actividad).
-</p>
-
-<h2 id="lifecycle">Ciclo de vida en modo de ventanas múltiples</h2>
-
-<p>
- El modo de ventanas múltiples no cambia el <a href="{@docRoot}training/basics/activity-lifecycle/index.html">ciclo de vida
- de la actividad</a>.
-</p>
-
-<p>
- En modo de ventanas múltiples, solo la actividad con la que el usuario interactuó más recientemente
- está activa en un momento determinado. Esa actividad se considera la <em>principal</em>.
- Todas las demás actividades están pausadas, aunque estén visibles.
- No obstante, el sistema les da a esas actividades pausadas pero visibles una prioridad más alta
- que las actividades que no están visibles. Si el usuario interactúa con una de las
- actividades pausadas, se reanuda esa actividad y se pausa la actividad que antes
- era la principal.
-</p>
-
-<p class="note">
- <strong>Nota:</strong> En modo de ventanas múltiples, una aplicación puede estar pausada
- y aún visible para el usuario. Es posible que una aplicación necesite continuar sus
- actividades mientras está pausada. Por ejemplo, una aplicación de reproducción de video que está
- pausada pero visible debería continuar mostrando el video. Por ese
- motivo, recomendamos que las actividades que reproducen video <em>no</em> pausen el
- video en sus controladores{@link android.app.Activity#onPause onPause()}.
- En su lugar, deben pausar el video en {@link android.app.Activity#onStop
- onStop()} y reanudar la reproducción en {@link android.app.Activity#onStart
- onStart()}.
-</p>
-
-<p>
- Cuando el usuario coloca una aplicación en modo de ventanas múltiples, el sistema le notifica a la
- actividad de un cambio de configuración, tal como se especifica en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Control de cambios en
- tiempo de ejecución</a>. Esto también sucede cuando el usuario modifica el tamaño de la aplicación o coloca la aplicación
- nuevamente en el modo de pantalla completa.
- Básicamente, este cambio tiene las mismas consecuencias en el ciclo de vida
- de la actividad que cuando el sistema notifica a la aplicación que el dispositivo cambió de
- modo vertical a modo de paisaje, excepto porque se modifican las dimensiones del dispositivo
- en lugar de intercambiarse solamente. Como se aborda en <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Control de cambios en
- tiempo de ejecución</a>, tu actividad puede administrar el cambio de configuración por sí misma, o
- puede permitir que el sistema destruya la actividad y la vuelva a crear con las nuevas
- dimensiones.
-</p>
-
-<p>
- Si el usuario cambia el tamaño de una ventana y la agranda en cualquier dirección, el
- sistema modifica el tamaño de la actividad para que coincida con la acción del usuario y emite <a href="{@docRoot}guide/topics/resources/runtime-changes.html">cambios en tiempo de ejecución</a>
- según sean necesarios. Si la aplicación se retrasa en el trazado de áreas recientemente expuestas, el
- sistema rellena esas áreas con el color especificado por el atributo {@link
- android.R.attr#windowBackground windowBackground} o por el atributo de estilo predeterminado
- <code>windowBackgroundFallback</code>.
-</p>
-
-<h2 id="configuring">Configuración de tu aplicación para el modo de ventanas múltiples</h2>
-
-<p>
- Si tu aplicación está orientada a Android N, puedes configurar cómo y
- si quieres que las actividades de tu aplicación admitan la visualización de ventanas múltiples. Puedes establecer
- atributos en tu manifiesto para controlar el tamaño y el diseño.
- La configuración de atributos de una actividad raíz se aplica a todas las actividades
- de su pila de tareas. Por ejemplo, si
- <code>android:resizeableActivity</code> está configurado en true para la actividad raíz, se puede modificar el tamaño de todas las actividades
- de la pila de tareas.
-</p>
-
-<p class="note">
- <strong>Nota:</strong> Si compilas una aplicación con múltiples orientaciones con una versión del
- SDK anterior a Android N, y el usuario usa la aplicación en
- modo de ventanas múltiples, el sistema cambia el tamaño de la aplicación de forma forzada. El sistema presenta un
- cuadro de diálogo en el que se advierte al usuario que la aplicación puede comportarse de forma inesperada. El sistema
- <em>no</em> modifica el tamaño de aplicaciones con orientación fija; si
- el usuario intenta abrir una aplicación con orientación fija en modo de ventanas múltiples,
- la aplicación ocupará toda la pantalla.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- Establece este atributo en el nodo <code><activity></code> o
- <code><application></code> de tu manifiesto para habilitar o inhabilitar la visualización
- en modo de ventanas múltiples:
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- Si este atributo se establece en true, la actividad puede iniciarse en
- los modos de pantalla dividida y forma libre. Si el atributo se establece en false, la
- actividad no admite el modo de ventanas múltiples. Si el valor es false, y el
- usuario intenta iniciar la actividad en modo de ventanas múltiples, la actividad ocupará
- toda la pantalla.
-</p>
-
-<p>
- Si tu aplicación está orientada a Android N, pero no especificas un valor
- para este atributo, el valor predeterminado del atributo será true.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- Establece este atributo en el nodo <code><activity></code> de tu manifiesto
- para indicar si la actividad admite la visualización de Picture-in-picture. Este
- atributo se ignora si <code>android:resizeableActivity</code> es false.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">Atributos de diseño</h3>
-
-<p>
- Con Android N, el elemento de manifiesto <code><layout></code>
- admite varios atributos que afectan cómo se comporta una actividad en
- modo de ventanas múltiples:
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- Ancho predeterminado de la actividad cuando se inicia en modo de forma libre.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- Altura predeterminada de la actividad cuando se inicia en modo de forma libre.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- Ubicación inicial de la actividad cuando se inicia en modo de forma libre. Consulta la referencia
- {@link android.view.Gravity} para obtener valores adecuados.
- </dd>
-
- <dt>
- <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
- </dt>
-
- <dd>
- Altura y ancho mínimos para la actividad tanto en el modo de pantalla dividida como en el
- modo de forma libre. Si el usuario mueve la línea divisoria en el modo de pantalla dividida
- para reducir el tamaño respecto del tamaño mínimo especificado, el sistema recorta
- la actividad para ajustarla a los requisitos del usuario.
- </dd>
-</dl>
-
-<p>
- Por ejemplo, el siguiente código muestra cómo especificar el tamaño
- y la ubicación predeterminados de una actividad, y su tamaño mínimo, cuando la actividad se visualiza en
- modo de forma libre:
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalHeight="450dp"
- android:minimalWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">Ejecución de tu aplicación en modo de ventanas múltiples</h2>
-
-<p>
- Android N ofrece nuevas funcionalidades para admitir aplicaciones que puedan ejecutarse
- en modo de ventanas múltiples.
-</p>
-
-<h3 id="disabled-features">Funciones deshabilitadas en modo de ventanas múltiples</h3>
-
-<p>
- Ciertas funciones están deshabilitadas o se ignoran cuando un dispositivo se encuentra en modo de
- ventanas múltiples, ya que no resultan útiles para una actividad que podría estar compartiendo la
- pantalla del dispositivo con otras actividades o aplicaciones. Esas funciones incluyen las siguientes:
-
-<ul>
- <li>Algunas opciones de personalización de la <a href="{@docRoot}training/system-ui/index.html">IU del sistema</a>
- están deshabilitadas; por ejemplo, las aplicaciones no pueden ocultar la barra de
- estado si no se están ejecutando en modo de pantalla completa.
- </li>
-
- <li>El sistema ignora los cambios en el atributo <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code>.
- </li>
-</ul>
-
-<h3 id="change-notification">Notificación y consulta de cambios en modo de ventanas múltiples</h3>
-
-<p>
- Se agregaron los siguientes métodos nuevos a la clase {@link android.app.Activity}
- para admitir la visualización de ventanas múltiples. Para obtener información detallada sobre cada método, consulta la
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia sobre N Preview SDK
-</a>.
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- Realiza una llamada para averiguar si la actividad está en modo de ventanas múltiples.
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- Realiza una llamada para averiguar si la actividad está en modo Picture-in-picture.
-
- <p class="note">
- <strong>Nota:</strong> El modo Picture-in-picture es un caso especial del
- modo de ventanas múltiples. Si <code>myActivity.isInPictureInPictureMode()</code>
- devuelve un valor true, <code>myActivity.isInMultiWindowMode()</code> también
- devuelve un valor true.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- El sistema llama a este método siempre que la actividad entra en modo de ventanas
- múltiples o sale de él. El sistema le pasa al método un valor de true si la
- actividad entra en modo de ventanas múltiples y false si la actividad
- sale del modo de ventanas múltiples.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- El sistema llama a este método siempre que la actividad entra en modo Picture-in-picture
- o sale de él. El sistema le pasa al método un valor de true si
- la actividad entra en modo Picture-in-picture y false si la actividad
- sale de dicho modo.
- </dd>
-</dl>
-
-<p>
- También hay versiones {@link android.app.Fragment} de cada uno de esos
- métodos; por ejemplo, <code>Fragment.isInMultiWindowMode()</code>.
-</p>
-
-<h3 id="entering-pip">Cómo entrar en modo Picture-in-picture</h3>
-
-<p>
- Para que una actividad entre en modo de Picture-in-picture, debes llamar al nuevo método
- <code>Activity.enterPictureInPictureMode()</code>. Este método no tiene efecto si
- el dispositivo no admite el modo de imagen en imagen. Para obtener más información,
- consulta la documentación de <a href="picture-in-picture.html">Picture-in-Picture</a>.
-</p>
-
-<h3 id="launch">Inicia nuevas actividades en modo de ventanas múltiples</h3>
-
-<p>
- Cuando inicias una nueva actividad, puedes indicarle al sistema que la nueva
- actividad se debe mostrar adyacente a la actual, si fuera posible. Para hacer
- esto, usa el marcador
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Pasar
- este marcador requiere el siguiente comportamiento:
-</p>
-
-<ul>
- <li>Si el dispositivo está en modo de pantalla dividida, el sistema intenta crear la
- nueva actividad junto a la actividad que lo inició, de modo que las dos actividades
- compartan la pantalla. No se garantiza que el sistema pueda hacerlo, pero
- ubicará las actividades de forma adyacente si fuera posible.
- </li>
-
- <li>Si el dispositivo no está en modo de pantalla dividida, este marcador no tendrá efecto.
- </li>
-</ul>
-
-<p>
- Si un dispositivo está en modo de forma libre e inicias una nueva actividad, puedes
- especificar las dimensiones y la ubicación de la pantalla de la nueva actividad al llamar a
- <code>ActivityOptions.setLaunchBounds()</code>. Este método no tiene efecto si
- el dispositivo no está en modo de ventanas múltiples.
-</p>
-
-<p class="note">
- <strong>Nota:</strong> Si inicias una actividad en una pila de tareas, esa
- actividad reemplaza la actividad en pantalla y hereda todas sus
- propiedades de ventanas múltiples. Si quieres iniciar la nueva actividad en una ventana
- independiente en modo de ventanas múltiples, debes iniciarla en una nueva pila de tareas.
-</p>
-
-<h3 id="dnd">Admisión de la funcionalidad de arrastrar y soltar</h3>
-
-<p>
- Los usuarios pueden <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastrar y
- soltar</a> datos de una actividad a otra mientras las dos actividades
- comparten la pantalla. (Antes, los usuarios solo podían arrastrar y soltar datos dentro de una
- sola actividad). Por este motivo, te recomendamos que agregues la funcionalidad de arrastrar y
- soltar a tu aplicación si es que aún no la admite.
-</p>
-
-<p>
- El N Preview SDK amplía el paquete <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- para admitir la funcionalidad de arrastrar y soltar entre aplicaciones diferentes. Para obtener información detallada sobre las siguientes
- clase y métodos, consulta la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia
- del N Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- Objeto token responsable de especificar los permisos otorgados a la aplicación
- que recibe datos mediante la funcionalidad de arrastrar y soltar.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- Nuevo alias para {@link android.view.View#startDrag View.startDrag()}. Para
- habilitar la funcionalidad arrastrar y soltar entre diferentes actividades, pasa el nuevo marcador
- <code>View.DRAG_FLAG_GLOBAL</code>. Si necesitas otorgar permisos de URI a
- la actividad receptora, pasa los nuevos marcadores
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> o
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, según corresponda.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- Cancela una operación de arrastrar actualmente en curso. Solo puede ser llamado por la
- aplicación que originó la operación de arrastrar.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- Reemplaza la sombra del arrastre por una operación de arrastrar actualmente en curso. Solo
- puede ser llamado por la aplicación que originó la operación de arrastrar.
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- Solicita los permisos para los URI de contenido que se pasan con el {@link
- android.content.ClipData} incluido en un {@link android.view.DragEvent}.
- </dd>
-</dl>
-
-<h2 id="testing">Prueba de la compatibilidad de tu aplicación con el uso de ventanas múltiples</h2>
-
-<p>
- Ya sea que actualices o no tu aplicación para Android N, debes
- verificar la forma en que se comporta en modo de ventanas múltiples en caso de que un usuario intente iniciarla
- en modo de ventanas múltiples en un dispositivo con Android N.
-</p>
-
-<h3 id="configuring">Configuración de un dispositivo de prueba</h3>
-
-<p>
- Si instalas Android N en un dispositivo, se admite automáticamente el modo
- de pantalla dividida.
-</p>
-
-<h3 id="test-non-n">Si tu aplicación no se compiló con el N Preview SDK</h3>
-
-<p>
- Si no creaste tu aplicación con el N Preview SDK y el usuario intenta usar
- la aplicación en modo de ventanas múltiples, el sistema cambia el tamaño de la aplicación de forma forzada, a menos que la aplicación
- declare una orientación fija.
-</p>
-
-<p>
- Si tu aplicación no declara una orientación fija, debes iniciar tu aplicación
- en un dispositivo con Android N e intentar colocar la aplicación en
- modo de pantalla dividida. Cuando se modifique el tamaño de la aplicación de forma forzada,
- verifica que la experiencia de usuario sea aceptable.
-</p>
-
-<p>
- Si la aplicación declara una orientación fija, debes intentar colocar la aplicación en
- modo de ventanas múltiples. Cuando lo hagas, verifica que la aplicación
- continúe en modo de pantalla completa.
-</p>
-
-<h3 id="test-mw">Si admites el modo de ventanas múltiples</h3>
-
-<p>
- Si compilaste tu aplicación con el N Preview SDK y no deshabilitaste
- la compatibilidad con ventanas múltiples, verifica el siguiente comportamiento tanto en modo de pantalla dividida
- como en modo de forma libre.
-</p>
-
-<ul>
- <li>Inicia la aplicación en modo de pantalla completa y luego cambia al modo de ventanas múltiples al presionar
- durante un momento el botón Overview. Verifica que la aplicación pase de un modo a otro correctamente.
- </li>
-
- <li>Inicia la aplicación directamente en modo de ventanas múltiples y verifica que se
- inicie correctamente. Puedes iniciar una aplicación en modo de ventanas múltiples al presionar el
- botón Overview, luego presionar durante un momento la barra de título de la aplicación y arrastrarla
- a una de las áreas resaltadas de la pantalla.
- </li>
-
- <li>Cambia el tamaño de tu aplicación en modo de pantalla dividida al arrastrar la línea divisoria.
- Verifica que la aplicación cambie de tamaño sin fallar y que estén visibles los elementos
- necesarios de la IU.
- </li>
-
- <li>Si especificaste dimensiones mínimas para tu aplicación, intenta cambiar el tamaño
- de la aplicación a dimensiones más bajas que las especificadas. Verifica que no puedas modificar el tamaño de la aplicación
- para que sea más pequeña que la dimensión mínima especificada.
- </li>
-
- <li>En todas las pruebas, verifica que el rendimiento de la aplicación sea aceptable. Por
- ejemplo, verifica que la actualización de la IU después de cambiar el tamaño de la aplicación
- no demore mucho.
- </li>
-</ul>
-
-<h4 id="test-checklist">Lista de comprobación de pruebas</h4>
-
-<p>
- Para verificar el rendimiento de tu aplicación en modo de ventanas múltiples, intenta las siguientes
- operaciones. Debes probar estas operaciones tanto en modo de pantalla dividida como en
- modo de ventanas múltiples, excepto cuando se indique algo diferente.
-</p>
-
-<ul>
- <li>Ingresa en modo de ventanas múltiples y luego sal.
- </li>
-
- <li>Pasa de tu aplicación a otra y verifica que la aplicación se comporte
- correctamente mientras esté visible pero no activa. Por ejemplo, si tu aplicación está
- reproduciendo video, comprueba que el video se siga reproduciendo mientras el usuario interactúe
- con otra aplicación.
- </li>
-
- <li>En modo de pantalla dividida, prueba mover la barra divisora para agrandar y
- achicar la aplicación. Realiza estas operaciones en las configuraciones una al lado de la otra y
- una encima de la otra. Verifica que la aplicación no falle,
- que las funcionalidades necesarias estén visibles y que la operación de cambio de tamaño no demore
- mucho.
- </li>
-
- <li>Realiza varias operaciones de cambio de tamaño en una sucesión rápida. Verifica que tu
- aplicación no falle ni pierda memoria. Para obtener información acerca de cómo comprobar el uso de memoria
- de tu aplicación, consulta <a href="{@docRoot}tools/debugging/debugging-memory.html">
- Averiguación del uso de RAM</a>.
- </li>
-
- <li>Usa tu aplicación normalmente en diferentes configuraciones de ventanas y
- verifica que la aplicación se comporte correctamente. Verifica que el texto sea legible y que
- los elementos de la IU sean lo suficientemente grandes para interactuar con ellos.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">Si deshabilitaste la compatibilidad con el modo de ventanas múltiples</h3>
-
-<p>
- Si deshabilitaste la compatibilidad con el modo de ventanas múltiples al configurar
- <code>android:resizableActivity="false"</code>, debes iniciar tu aplicación en
- un dispositivo con Android N e intentar colocar la aplicación en los
- modos de forma libre y pantalla dividida. Cuando lo hagas, verifica que la aplicación
- continúe en modo de pantalla completa.
-</p>
diff --git a/docs/html-intl/intl/es/preview/features/notification-updates.jd b/docs/html-intl/intl/es/preview/features/notification-updates.jd
index 380efce..ff0635e 100644
--- a/docs/html-intl/intl/es/preview/features/notification-updates.jd
+++ b/docs/html-intl/intl/es/preview/features/notification-updates.jd
@@ -194,7 +194,7 @@
</ol>
<p>
- En el caso de las aplicaciones interactivas, como los chats, podría ser útil incluir
+ En el caso de las aplicaciones interactivas, como los chats, podría ser útil incluir
contexto adicional cuando se administra texto recuperado. Por ejemplo, en estas aplicaciones, se podrían mostrar
múltiples líneas de historial de chat. Cuando el usuario responde a través de {@link
android.support.v4.app.RemoteInput}, puedes actualizar el historial de respuestas
diff --git a/docs/html-intl/intl/es/preview/features/picture-in-picture.jd b/docs/html-intl/intl/es/preview/features/picture-in-picture.jd
deleted file mode 100644
index 0d9313a..0000000
--- a/docs/html-intl/intl/es/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,213 +0,0 @@
-page.title=Modo Picture-in-picture
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>En este documento</h2>
-<ol>
- <li><a href="#declaring">Declarar que la actividad permite
-el modo Picture-in-Picture</a></li>
- <li><a href="#pip_button">Cambiar la actividad al modo Picture-in-picture</a>
-</li>
- <li><a href="#handling_ui">Gestionar las IU durante el modo Picture-in-picture</a>
-</li>
- <li><a href="#continuing_playback">Continuar la reproducción de video durante
-el modo Picture-in-picture</a></li>
- <li><a href="#single_playback">Usar una única actividad de reproducción para
-el modo Picture-in-picture</a></li>
- <li><a href="#best">Prácticas recomendadas</a></li>
-</ol>
-
-<h2>Consulta también</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">Compatibilidad con
-ventanas múltiples</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>Con Android N, los usuarios de Android TV ahora pueden ver un video
-en una ventana fija que se ubica en una esquina de la pantalla mientras navegan dentro de
-aplicaciones. El modo picture-in-picture (PIP) permite que las aplicaciones reproduzcan un video
-en una ventana fija mientras se lleva a cabo otra actividad
-en el fondo. La ventana de PIP les permite a los usuarios realizar múltiples tareas mientras usan tu aplicación, lo cual les permite
-ser más productivos.</p>
-
-<p>Tu aplicación puede decidir cuándo activar el modo PIP. Aquí te mostramos algunos ejemplos de
-situaciones en las que se podría usar el modo PIP:</p>
-
-<ul>
-<li>Tu aplicación puede pasar un video al modo PIP cuando el usuario retrocede
-en la navegación desde el video para explorar otro contenido.</li>
-<li>También puede hacerlo mientras el usuario está viendo el final
-de un episodio de contenido. La pantalla principal muestra información promocional
-o de resumen sobre el próximo capítulo de la serie.</li>
-<li>Tu aplicación puede brindarles a los usuarios una forma de poner en cola otro contenido mientras
-miran un video. El video continúa reproduciéndose en modo PIP mientras la pantalla
-principal muestra una actividad de selección de contenido.</li>
-</ul>
-
-<p>La ventana de PIP es de 240x135 dp y se muestra en la capa delantera en una de las
-cuatro esquinas de la pantalla que el sistema elige. El usuario puede acceder a un menú de
-PIP que le permite activar o desactivar la ventana de PIP a pantalla completa o cerrarla
-presionando el botón <b>Home</b> en el control remoto. Si se comienza a reproducir
-otro video en la pantalla principal, la ventana de PIP se cierra
-automáticamente. Los usuarios también pueden cerrar la ventana de PIP desde Recents.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>Imagen 1.</strong> Un video picture-in-picture
-visible en una esquina de la pantalla mientras el usuario explora contenido
-en la pantalla principal.</p>
-
-<p>El modo PIP aprovecha las API de ventanas múltiples disponibles en Android N para
-brindar la ventana superpuesta fija de video. Para agregarle el modo PIP a tu aplicación, debes
-registrar las actividades que permitan este modo, cambiar la actividad al modo PIP según
-sea necesario y asegurarte de que los elementos de IU se oculten y que la reproducción de video continúe mientras
-la actividad se encuentra en modo PIP.</p>
-
-<h2 id="declaring">Declarar que la actividad permite el modo picture-in-picture</h2>
-
-<p>De forma predeterminada, el sistema no permite el modo PIP para aplicaciones automáticamente.
-Si deseas permitir este modo en tu aplicaciones, registra la actividad
-de video en tu manifiesto configurando
-<code>android:supportsPictureInPicture</code> y
-<code>android:resizeableActivity</code> en <code>true</code>. Además, debes especificar
-que tu actividad gestiona los cambios de configuración de la presentación para que la actividad
-no se reinicie cuando ocurran cambios de presentación durante las transiciones en el modo PIP.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>Cuando registres la actividad, ten en cuenta que, en el modo PIP, la
-actividad se muestra en una ventana superpuesta pequeña en una pantalla de TV. Las actividades de reproducción
-de videos con IU mínimas brindan la mejor experiencia de usuario. Las actividades que
-incluyen elementos de IU pequeños podrían no brindar una buena experiencia de usuario
-cuando se cambian al modo PIP, porque los usuarios no podrán ver los detalles de los elementos de IU
-en la ventana PIP.</p>
-
-<h2 id="pip_button">Cambiar la actividad al modo Picture-in-picture</h2>
-
-Cuando necesites cambiar la actividad al modo PIP, llama a
-<code>Activity.enterPictureInPictureMode()</code>. En el siguiente ejemplo, se
-cambia al modo PIP cuando el usuario selecciona un botón PIP especial en una barra
-de control de medios:</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>Agregar un botón PIP a la barra de control de medios le permite al usuario cambiar
-fácilmente al modo PIP y seguir controlando la reproducción de video.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>Imagen 1.</strong> Un botón
-PIP en una barra de control de medios.</p>
-
-<p>Android N incluye una nueva clase
-<code>PlaybackControlsRow.PictureInPictureAction</code> que define
-las acciones de PIP de la barra de control y usa el ícono PIP.</p>
-
-<h2 id="handling_ui">Gestionar las IU durante el modo picture-in-picture</h2>
-
-<p>Cuando la actividad ingresa al modo PIP, esta solo debería mostrar la reproducción
-de video. Debes quitar los elementos de IU antes de que la actividad ingrese al modo PIP
-y volver a mostrarlos cuando la actividad vuelva al modo de pantalla completa.
-Anula <code>Activity.onPictureInPictureModeChanged()</code> o
-<code>Fragment.onPictureInPictureModeChanged()</code> y habilita
-o inhabilita los elementos de IU según sea necesario, por ejemplo:</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">Continuar la reproducción de video durante
-el modo Picture-in-picture</h2>
-
-<p>Cuando la actividad cambia al modo PIP, el sistema considera que se encuentra en
-pausa y llama al método <code>onPause()</code> de la actividad. La reproducción
-de video no debería pausarse y debería continuar si la actividad se
-pausa debido al modo PIP. Busca el modo PIP en el método
-<code>onPause()</code> de la actividad y controla la reproducción según corresponda, por
-ejemplo:</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>Cuando la actividad sale del modo PIP y vuelve al modo de pantalla completa, el
-sistema reinicia la actividad y llama al método <code>onResume()</code>.</p>
-
-<h2 id="single_playback">Usar una única actividad de reproducción para
-el modo Picture-in-picture</h2>
-
-<p>En tu aplicación, un usuario puede seleccionar un nuevo video cuando busca contenido en la
-pantalla principal, mientras una actividad de reproducción de video está en modo PIP. Reproduce el nuevo
-video en la actividad de reproducción actual en modo de pantalla completa, en lugar de
-iniciar una nueva actividad que podría confundir al usuario.</p>
-
-<p>A fin de garantizar que se utilice una única actividad para las solicitudes de reproducción de video y que esta
- ingrese en el modo PIP o salga de este cuando sea necesario, configura el
-<code>android:launchMode</code> de la actividad en <code>singleTask</code>, en el manifiesto:
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>En tu actividad, anula {@link android.app.Activity#onNewIntent
-Activity.onNewIntent()} y administra el nuevo video, deteniendo cualquier reproducción
-de video actual si es necesario.</p>
-
-<h2 id="best">Prácticas recomendadas</h2>
-
-<p>El modo PIP está diseñado para actividades que reproducen un video en pantalla completa. Cuando cambies la
-actividad al modo PIP, evita que se muestre cualquier elemento que no sea el contenido del video.
-Rastrea el cambio a modo PIP de la actividad y oculta los elementos de IU, como se explica
-en la sección <a href="#handling_ui">Gestionar las IU durante el modo picture-in-picture</a>.</p>
-
-<p>Debido a que la ventana de PIP se muestra como una ventana flotante en una
-esquina de la pantalla, debes evitar mostrar información importante en la pantalla principal
-en cualquier área que pueda quedar oculta detrás de la ventana de PIP.</p>
-
-<p>Cuando una actividad se encuentra en modo PIP, de forma predeterminada, no tiene focalización en las entradas. Para
-recibir eventos de entradas durante este modo, usa
-<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/es/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/es/preview/features/scoped-folder-access.jd
deleted file mode 100644
index e83ca53..0000000
--- a/docs/html-intl/intl/es/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,148 +0,0 @@
-page.title=Acceso a directorios determinados
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#accessing">Acceder a un directorio de almacenamiento externo</a></li>
- <li><a href="#removable">Acceder a un directorio de un medio extraíble</a></li>
- <li><a href="#best">Prácticas recomendadas</a></li>
- </ol>
-</div>
-</div>
-
-<p>Las aplicaciones como las aplicaciones de fotografía generalmente solo necesitan acceso a directorios de
-almacenamiento externo, como el directorio <code>Pictures</code>. Los métodos
-existentes para acceder a almacenamiento externo no están diseñados para brindar un
-acceso fácil a determinados directorios para estos tipos de aplicaciones. Por ejemplo:</p>
-
-<ul>
-<li>Solicitar {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-o {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} en tu manifiesto
-permite el acceso a todos los directorios públicos de un almacenamiento externo, lo cual podría ser
-un acceso mayor que el que necesita tu aplicación.</li>
-<li>Usar el
-<a href="{@docRoot}guide/topics/providers/document-provider.html">framework
-de acceso al almacenamiento</a> generalmente implica que el usuario seleccione directorios
-mediante un sistema de IU, lo cual no es necesario si tu aplicación siempre accede al mismo
-directorio externo.</li>
-</ul>
-
-<p>Android N brinda una API nueva y simplificada para acceder a
- directorios de almacenamiento externo comunes. </p>
-
-<h2 id="accessing">Acceder a un directorio de almacenamiento externo</h2>
-
-<p>Usa la clase <code>StorageManager</code> para obtener la instancia de
-<code>StorageVolume</code> correcta. Luego, crea una intent llamando al
- método <code>StorageVolume.createAccessIntent()</code> de esa instancia.
-Usa esta intención para acceder a directorios de almacenamiento externo. Para obtener una lista de
-todos los volúmenes disponibles, incluidos los volúmenes de medios extraíbles, usa
-<code>StorageManager.getVolumesList()</code>.</p>
-
-<p>Si tienes información sobre un archivo específico, usa
-<code>StorageManager.getStorageVolume(File)</code> para obtener el
-<code>StorageVolume</code> que contiene el archivo. Llama a
-<code>createAccessIntent()</code> en este <code>StorageVolume</code> para acceder al
-directorio de almacenamiento externo del archivo.</p>
-
-<p>
-En el caso de los volúmenes secundarios, como las tarjetas SD externas, pasa un valor nulo cuando llames a
-<code>StorageVolume.createAccessIntent()</code> para solicitar acceso al volumen
- completo, en lugar de un directorio específico.
-<code>StorageVolume.createAccessIntent()</code> regresa un valor nulo si pasas un
- valor nulo para el volumen principal o si pasas un nombre de directorio no válido.
-</p>
-
-<p>El siguiente fragmento de código es un ejemplo de cómo abrir el
-directorio <code>Pictures</code> en el almacenamiento compartido principal:</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>El sistema intenta otorgar acceso al directorio externo y, si
-es necesario, confirma el acceso con el usuario usando una IU simplificada:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>Imagen 1.</strong> Una aplicación solicitando
-acceso al directorio Pictures.</p>
-
-<p>Si el usuario otorga el acceso, el sistema llama a tu
- anulación de <code>onActivityResult()</code> con un código resultante de
-<code>Activity.RESULT_OK</code> y datos de intents que contienen el URI. Usa
-el URI brindado para acceder a la información del directorio. Es similar a usar URI
-generados por el
-<a href="{@docRoot}guide/topics/providers/document-provider.html">framework
-de acceso al almacenamiento</a>.</p>
-
-<p>Si el usuario no otorga el acceso, el sistema llama a tu
-anulación de <code>onActivityResult()</code> con un código resultante de
-<code>Activity.RESULT_CANCELED</code> y datos de intents nulos.</p>
-
-<p class="note"><b>Nota</b>: Obtener acceso a un directorio externo específico
-también otorga el acceso a los subdirectorios de ese directorio.</p>
-
-<h2 id="removable">Acceder a un directorio de un medio extraíble</h2>
-
-<p>Para usar el acceso a directorios determinados para acceder a directorios de medios extraíbles,
-primero debes agregar un {@link android.content.BroadcastReceiver} que escuche la
-notificación{@link android.os.Environment#MEDIA_MOUNTED}, por ejemplo:</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Cuando el usuario conecta un medio extraíble, como una tarjeta SD, el sistema envía una
-notificación{@link android.os.Environment#MEDIA_MOUNTED}. Esta notificación
-brinda un objeto <code>StorageVolume</code> en los datos de intents que puedes
-usar para acceder a directorios del medio extraíble. El siguiente ejemplo
-accede al directorio <code>Pictures</code> de medios extraíbles:</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">Prácticas recomendadas</h2>
-
-<p>Cuando sea posible, sigue usando el URI de acceso a directorios externos de modo que no tengas
-que solicitarle acceso al usuario continuamente. Una vez que el usuario haya otorgado el acceso, llama a
-<code>getContentResolver().takePersistableUriPermssion()</code> con el
-URI de acceso a directorios. El sistema continuará el URI, y las siguientes solicitudes
-de acceso generarán <code>RESULT_OK</code> y no le mostrarán una IU de confirmación al
-usuario.</p>
-
-<p>Si el usuario deniega el acceso a un directorio externo, no vuelvas a solicitar el
-acceso inmediatamente. Hacer esto provocaría una mala experiencia
-de usuario. Si el usuario deniega una solicitud y la aplicación solicita acceso
- nuevamente, aparece la casilla de verificación <b>Don't ask again</b> en la IU:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>Figura 1.</strong> Una aplicación que presenta una
-segunda solicitud para obtener acceso a medios extraíbles.</p>
-
-<p>Si el usuario selecciona <b>Don't ask again</b> y deniega la solicitud, todas las
-solicitudes futuras que presente la aplicación para el directorio determinado se denegarán
- automáticamente, y el usuario no recibirá ninguna IU de solicitud.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/preview/features/security-config.jd b/docs/html-intl/intl/es/preview/features/security-config.jd
deleted file mode 100644
index 39d95c8..0000000
--- a/docs/html-intl/intl/es/preview/features/security-config.jd
+++ /dev/null
@@ -1,747 +0,0 @@
-page.title=Configuración de seguridad de la red
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>En este documento</h2>
-<ol>
- <li><a href="#manifest">Agregar un archivo de configuración de seguridad</a></li>
- <li><a href="#CustomTrust">Personalizar las CA de confianza</a>
- <ol>
- <li><a href="#ConfigCustom">Configurar una CA de confianza personalizada</a></li>
- <li><a href="#LimitingCas">Limitar el conjunto de CA de confianza</a></li>
- <li><a href="#TrustingAdditionalCas">Otorgar confianza a CA adicionales</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">CA de solo depuración</a></li>
- <li><a href="#UsesCleartextTraffic">Desactivar el tráfico de Cleartext</a></li>
- <li><a href="#CertificatePinning">Fijar certificados</a></li>
- <li><a href="#ConfigInheritance">Comportamiento de herencia de configuración</a></li>
- <li><a href="#FileFormat">Formato del archivo de configuración</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N incluye una función de configuración de seguridad de la red
- que les permite a las aplicaciones personalizar los ajustes de seguridad de la red mediante un archivo
- de configuración declarativo seguro sin que haya que modificar el código de la aplicación. Estos ajustes se pueden
- configurar para dominios específicos y para una aplicación específica. Las capacidades
- clave de esta función son las siguientes:
-</p>
-
-<ul>
- <li>
- <b>Anclajes de confianza personalizados:</b> personalizar qué autoridades de certificado (CA)
- son de confianza para las conexiones de seguridad de una aplicación. Por ejemplo,
- confiar en certificados autofirmados particulares
- o restringir el conjunto de CA públicas en las que confía la aplicación.
- </li>
-
- <li>
- <b>Anulaciones de solo depuración:</b> depurar de forma segura conexiones
- de una aplicación sin riesgos adicionales para la base instalada.
- </li>
-
- <li>
- <b>Desactivación del tráfico de Cleartext:</b> proteger a las aplicaciones del
- uso accidental de tráfico de Cleartext.
- </li>
-
- <li>
- <b>Fijación de certificados:</b> restringir la conexión segura de una aplicación
- a certificados en particular.
- </li>
-</ul>
-
-
-<h2 id="manifest">Agregar un archivo de configuración de seguridad</h2>
-
-<p>
- La función de configuración de seguridad de la red usa un archivo XML donde
- se especifican los ajustes para la aplicación. Debes incluir una entrada en el manifiesto de tu
- aplicación que apunte a este archivo. El siguiente fragmento de código de un manifiesto
- demuestra cómo crear esta entrada:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application ... >
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">Personalizar las CA de confianza</h2>
-
-<p>
- Una aplicación podría querer otorgar confianza a un conjunto personalizado de CA en lugar de hacerlo según los ajustes
- predeterminados de la plataforma. Las razones más comunes son las siguientes:
-</p>
-
-<ul>
- <li>Conectarse a un host con una autoridad de certificado personalizada (autofirmado,
- emitido por una CA corporativa interna, etc.).
- </li>
-
- <li>Limitar el conjunto de CA a CA de confianza establecidas por el usuario y no a cada
- CA preinstalada.
- </li>
-
- <li>Otorgar confianza a CA adicionales que no están incluidas en el sistema
- </li>
-</ul>
-
-<p>
- De forma predeterminada, las conexiones seguras (p. ej.: TLS, HTTP) de todas las aplicaciones dependen de
- las CA preinstaladas del sistema; las aplicaciones que tienen como objetivo a la API nivel 23
- (Android M) e inferiores también dependen de la tienda de CA agregada por el usuario de forma predeterminada. Una
- aplicación puede personalizar sus propias conexiones usando {@code base-config} (para
- la personalización de toda la aplicación) o {@code domain-config} (para la personalización
- por dominio).
-</p>
-
-
-<h3 id="ConfigCustom">Configurar una CA de confianza personalizada</h3>
-
-<p>
- Supongamos que deseas conectarte a tu host, el cual usa un certificado SSL
- autofirmado, o a un host cuyo certificado SSL está emitido por una CA no pública
- en la cual confías, como la CA interna de tu empresa.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Agrega el certificado de CA autofirmado o no público, en formato PEM o DER, a
- {@code res/raw/my_ca}.
-</p>
-
-
-<h3 id="LimitingCas">Limitar el conjunto de CA de confianza</h3>
-
-<p>
- Una aplicación que no desee confiar en todas las CA en que confía el sistema puede,
- en su lugar, especificar su propio conjunto reducido de CA en las que confía. Esto protege a la aplicación
- de certificados fraudulentos emitidos por cualquiera de las demás CA.
-</p>
-
-<p>
- La configuración para limitar el conjunto de CA de confianza es similar a <a href="#TrustingACustomCa">confiar en una CA personalizada</a> para un dominio específico, con la diferencia
- de que se brindan múltiples CA en el recurso.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Agrega las CA de confianza, en formato PEM o DER, a {@code res/raw/trusted_roots}.
- Ten en cuenta que, si usas el formato PEM, el archivo debe incluir <em>solo</em> datos PEM
- y ningún texto adicional. También puedes brindar elementos
-<a href="#certificates"><code><certificates></code></a>
- múltiples en lugar de solo uno.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- Otorgar confianza a CA adicionales
-</h3>
-
-<p>
- Una aplicación podría querer otorgar confianza a CA adicionales en las cuales el sistema no confía,
- ya sea porque el sistema aún no incluye la CA o porque la CA no
- cumple con los requisitos de inclusión del sistema Android. La
- aplicación puede hacerlo especificando múltiples fuentes de certificado para una
- configuración.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">Configurar las CA para depuración</h2>
-
-<p>
- Cuando depuras una aplicación que se conecta mediante HTTPS, podrías querer
- conectarte a un servidor de desarrollo local que no tiene el certificado
- SSL de tu servidor de producción. Para poder hacerlo sin
- tener que modificar el código de tu aplicación, puedes especificar CA de solo depuración que
- solo <i>son</i> de confianza cuando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- es {@code true} usando {@code debug-overrides}. Generalmente, las herramientas de IDE
- y de compilación configuran esta marca automáticamente para las compilaciones que no son de lanzamiento.
-</p>
-
-<p>
- Esto es más seguro que el código condicional habitual ya que, como precaución
- de seguridad, las tiendas de aplicaciones no aceptan aplicaciones que están marcadas
- como depurables.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">Desactivar el tráfico de Cleartext</h2>
-
-<p>
- Las aplicaciones que deseen conectarse a destinos usando solo conexiones
- seguras pueden desactivar Cleartext (usando el protocolo
- HTTP no encriptado en lugar del protocolo HTTPS) para esos destinos. Esta opción ayuda a prevenir
- las regresiones accidentales en aplicaciones debido a cambios en direcciones URL generados por fuentes
- externas como servidores backend.
- Consulta {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()} para obtener más información.
-</p>
-
-<p>
- Por ejemplo, una aplicación puede querer garantizar que todas las conexiones a {@code
-secure.example.com} se hagan siempre mediante HTTPS para proteger el tráfico sensible
- de redes hostiles.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">Fijar certificados</h2>
-
-<p>
- Generalmente, una aplicación otorga confianza a todas las CA preinstaladas. Si alguna de estas CA emitiera
- un certificado fraudulento, la aplicación estaría en riesgo de sufrir un ataque
- MiTM. Algunas aplicaciones eligen limitar el conjunto de certificados que aceptan
- ya sea limitando el conjunto de CA al que otorgan confianza o fijando certificados.
-</p>
-
-<p>
- La fijación de certificados se hace brindando un conjunto de certificados por hash de la
- clave pública (SubjectPublicKeyInfo del certificado X.509). De este modo,
- una cadena de certificados solo es válida si contiene al menos una de
- las claves públicas fijadas.
-</p>
-
-<p>
- Ten en cuenta que, cuando uses la fijación de certificados, siempre debes incluir una clave
- de respaldo para que, si te ves obligado a cambiar a claves nuevas o a cambiar de CA (cuando
- fijas un certificado de CA o un intermediario de esa CA), la conectividad
- de la aplicación no se vea afectada. Si no, deberás actualizar
- la aplicación para recuperar la conectividad.
-</p>
-
-<p>
- Además, se puede configurar un tiempo de expiración para las fijaciones,
- luego del cual las fijaciones dejan de realizarse. Esto ayuda a evitar los problemas de conectividad
- en aplicaciones que no se han actualizado. Sin embargo, configurar un tiempo de expiración
- para las fijaciones puede habilitar la omisión de fijaciones.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">Comportamiento de herencia de configuración</h2>
-
-<p>
- Los valores que no se establecen en una configuración específica se heredan. Este comportamiento permite configuraciones
- más complejas y un archivo de configuración de fácil lectura.
-</p>
-
-<p>
- Si no se establece un valor en una entrada específica, se usa el valor de
- la siguiente entrada más general. Los valores no establecidos en una {@code domain-config} se
- toman de la {@code domain-config} primaria, si están anidados, o de la {@code
-base-config}, si no están anidados. Los valores no establecidos en la {@code base-config} usan
- los valores predeterminados de la plataforma.
-</p>
-
-<p>
- Por ejemplo, cuando todas las conexiones a subdominios de {@code
-example.com} deben usar un conjunto personalizado de CA. Además, el tráfico de Cleartext a
- estos dominios se permite <em>excepto</em> con las conexiones a {@code
- secure.example.com}. Anidando la configuración para {@code
-secure.example.com} dentro de la configuración para {@code example.com},
- {@code trust-anchors} no necesita duplicación.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">Formato del archivo de configuración</h2>
-
-<p>
- La función de configuración de seguridad de la red usa un formato de archivo XML.
- La estructura general del archivo se muestra en el siguiente ejemplo de código:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- Las siguientes secciones describen la sintaxis y otros detalles del formato
- de archivo.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- PUEDE CONTENER:
- </dt>
-
- <dd>
- 0 o 1 de <code><a href="#base-config"><base-config></a></code><br>
- Cualquier cantidad de <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 o 1 de <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- SINTAXIS:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- PUEDE CONTENER:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- DESCRIPCIÓN:
- </dt>
-
- <dd>
- La configuración predeterminada usada por todas las conexiones cuyo destino no
- está cubierto por una <a href="#domain-config"><code>domain-config</code></a>.
-
-<p>
- Los valores que no están configurados usan los valores predeterminados de la plataforma. La configuración predeterminada
- para aplicaciones con API nivel 24 o superior es:
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-La configuración predeterminada para aplicaciones con API nivel 23 o inferior es:
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>SINTAXIS:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>PUEDE CONTENER:</dt>
-
-<dd>
-1 o más <code><a href="#domain"><domain></a></code>
-<br/>0 o 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 o 1 <code><a href="#pin-set"><pin-set></code></a>
-<br/>Cualquier cantidad de <code><domain-config></code> anidadas</dd>
-
-<dt>DESCRIPCIÓN</dt>
-<dd>Configuración usada para conexiones con destinos específicos, como los definidos por elementos de {@code domain}.
-
-<p>Ten en cuenta que, si múltiples elementos de {@code domain-config} cubren un destino, la configuración con la regla de coincidencia de dominio más específica (más larga)
- es la que se usa.</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- SINTAXIS:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- ATRIBUTOS:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- Si es {@code "true"}, esta regla de dominio coincide con el dominio
- y con todos los subdominios, incluidos los subdominios de subdominios. Si no, la regla
- solo se aplica a coincidencias exactas.
- </dd>
- </dl>
- </dd>
-
- <dt>
- DESCRIPCIÓN:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- sintaxis:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- PUEDE CONTENER:
- </dt>
-
- <dd>
- 0 o 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- DESCRIPCIÓN:
- </dt>
-
- <dd>
- Sobrescrituras que se deben aplicar cuando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- es {@code "true"}, que es, generalmente, el caso de las compilaciones que no sean de lanzamiento
- generadas por herramientas de IDE y de compilación. Los anclajes de confianza especificados en {@code
- debug-overrides} se agregan a todas las demás configuraciones, y la fijación
- de certificados no se lleva a cabo cuando la cadena de certificados del servidor usa uno de estos
- anclajes de confianza de solo depuración. Si <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- es {@code "false"}, entonces, esta sección se omite por completo.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- SINTAXIS:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- PUEDE CONTENER:
- </dt>
-
- <dd>
- Cualquier cantidad de <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- DESCRIPCIÓN:
- </dt>
-
- <dd>
- Conjunto de anclajes de confianza para conexiones seguras.
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>SINTAXIS:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>DESCRIPCIÓN:</dt>
-<dd>Conjunto de certificados X.509 para elementos de {@code trust-anchors}.</dd>
-
-<dt>ATRIBUTOS:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-La fuente de los certificados de CA puede ser una de las siguientes opciones:
-<ul>
- <li>Una ID de recurso sin procesar que apunta a un archivo que contiene certificados X.509.
- Los certificados deben estar codificados en formato DER o PEM. En el caso de los certificados
- PEM, el archivo <em>no debe</em> contener datos adicionales que no sean de PEM, como
- comentarios.
- </li>
-
- <li>{@code "system"} para los certificados de CA preinstalados del sistema.
- </li>
-
- <li>{@code "user"} para los certificados de CA agregados por el usuario.
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- Especifica si las CA de esta fuente omiten la fijación de certificados. Si es {@code
-"true"}, las cadenas de certificados se encadenan mediante una de estas CA
- desde esta fuente, y la fijación no se lleva a cabo. Esto puede ser útil para CA de depuración
- o para poder permitirle al usuario hacer un ataque MiTM al tráfico seguro de la aplicación.
- </p>
-
- <p>
- Es {@code "false"} de forma predeterminada, a menos que se especifique en un elemento de {@code debug-overrides}
-, en cuyo caso, es {@code "true"} de forma predeterminada.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- SINTAXIS:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- PUEDE CONTENER:
- </dt>
-
- <dd>
- Cualquier cantidad de <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- DESCRIPCIÓN:
- </dt>
-
- <dd>
- Un conjunto de fijaciones de claves públicas. Para que una conexión segura sea de confianza, una de las
- claves públicas de la cadena de confianza debe estar en el conjunto de fijaciones. Consulta
- <code><a href="#pin"><pin></a></code> para el formato de las fijaciones.
- </dd>
-
- <dt>
- ATRIBUTOS:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- La fecha, en formato {@code yyyy-MM-dd}, a partir de la cual
- expiran las fijaciones, lo cual deshabilita la fijación. Si el atributo no está establecido, las fijaciones
- no expiran.
- <p>
- La expiración ayuda a evitar problemas de conectividad en aplicaciones que no
- reciben actualizaciones para el conjunto de fijaciones, por ejemplo, porque el usuario
- deshabilitó las actualizaciones de la aplicación.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- sintaxis:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- ATRIBUTOS:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- Resumen del algoritmo usado para generar la fijación. Actualmente, solo se admite
- {@code "SHA-256"}.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/es/preview/features/tv-recording-api.jd b/docs/html-intl/intl/es/preview/features/tv-recording-api.jd
deleted file mode 100644
index 5837975..0000000
--- a/docs/html-intl/intl/es/preview/features/tv-recording-api.jd
+++ /dev/null
@@ -1,142 +0,0 @@
-page.title=Grabación de TV
-page.keywords=preview,sdk,tv,recording
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#supporting">Indicar la compatibilidad para la grabación</a></li>
- <li><a href="#recording">Grabar una sesión</a></li>
- <li><a href="#errors">Gestionar los errores de grabación</a></li>
- <li><a href="#sessions">Gestionar las sesiones grabadas</a></li>
- <li><a href="#best">Prácticas recomendadas</a></li>
- </ol>
-</div>
-</div>
-
-<p>Los servicios de entrada de TV le permiten al usuario pausar y reanudar la reproducción de canales
-mediante API de time-shifting. Android N expande la función de time-shifting
- permitiéndoles a los usuarios guardar múltiples sesiones grabadas.</p>
-
-<p>Los usuarios pueden programar las grabaciones por adelantado o comenzar a grabar a la vez
-que miran un programa. Una vez que el sistema haya guardado una grabación, el usuario puede explorar, gestionar
-y reproducir las grabaciones usando la aplicación del sistema de TV.</p>
-
-<p>Si deseas brindar funcionalidades de grabación a tu servicio de entrada de TV,
-debes indicarle al sistema que tu aplicación permite la grabación, implementar
-la habilidad para grabar programas, gestionar y comunicar los errores que ocurren
-durante la grabación y gestionar las sesiones grabadas.</p>
-
-<p class="note"><strong>Nota:</strong> La aplicación Live Channels todavía no
- permite que los usuarios creen grabaciones ni accedan a estas. Hasta que se realicen
- cambios en la aplicación Live Channels, es posible que sea difícil probar completamente la
-experiencia de grabación para tu servicio de entrada de TV.</p>
-
-<h2 id="supporting">Indicar la compatibilidad para la grabación</h2>
-
-<p>Para comunicarle al sistema que tu servicio de entrada de TV permite la grabación, configura el
-atributo <code>android:canRecord</code> de tu archivo XML de metadatos de servicio
-en <code>true</code>:
-</p>
-
-<pre>
-<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
- <b>android:canRecord="true"</b>
- android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
-</pre>
-
-<p>Para obtener más información sobre el archivo de metadatos de servicio, consulta
-<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">Declarar el servicio de entrada
- de TV en el manifiesto</a>.
-</p>
-
-<p>De forma alternativa, puedes indicar la compatibilidad para la grabación en tu código; para ello, sigue
- estos pasos:</p>
-
-<ol>
-<li>En el método <code>TvInputService.onCreate()</code>, crea un nuevo
-objeto <code>TvInputInfo</code> usando la clase <code>TvInputInfo.Builder</code>.
-</li>
-<li>Cuando crees el nuevo objeto <code>TvInputInfo</code>, llama a
-<code>setCanRecord(true)</code> antes de llamar a <code>build()</code> para
-indicar que tu servicio permite la grabación.</li>
-<li>Registra tu objeto <code>TvInputInfo</code> con el sistema llamando a
-<code>TvInputManager.updateTvInputInfo()</code>.</li>
-</ol>
-
-<h2 id="recording">Grabar una sesión</h2>
-
-<p>Luego de que el servicio de entrada de TV registra la compatibilidad
-con la funcionalidad de grabación, el sistema llama a tu
-<code>TvInputService.onCreateRecordingSession()</code> cuando necesita acceder
-a la implementación de grabación de tu aplicación. Implementa tu propia subclase
-<code>TvInputService.RecordingSession</code> y devuélvela
-cuando el callback de <code>onCreateRecordingSession()</code>
-se dispare. Esta subclase es responsable de cambiar a los datos del canal correcto,
-de grabar los datos solicitados y de comunicar el estado y los errores de grabación al
-sistema.</p>
-
-<p>Cuando el sistema llama a <code>RecordingSession.onTune()</code>, pasando en un
-URI de canal, sintoniza el canal que el URI especifica. Notifícale al sistema que tu
-aplicación se ha sintonizado al canal deseado llamando a <code>notifyTuned()</code>
-o, si tu aplicación no pudo sintonizarse al canal correcto, llama a
-<code>notifyError()</code>.</p>
-
-<p>El sistema invoca, a continuación, el callback <code>RecordingSession.onStartRecording()</code>.
- Tu aplicación debe comenzar a grabar inmediatamente. Cuando el sistema invoca
-este callback, puede brindar un URI que contiene información sobre el programa
-que se está por grabar. Cuando finaliza la grabación, debes copiar estos
-datos a la tabla de datos <code>RecordedPrograms</code>.</p>
-
-<p>Finalmente, el sistema llama a <code>RecordingSession.onStopRecording()</code>.
-En este momento, tu aplicación debe dejar de grabar inmediatamente. También debes crear
-una entrada en la tabla <code>RecordedPrograms</code>. Esta entrada debe
-incluir el URI de datos de la sesión grabada en la columna
-<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> y cualquier información
-del programa que el sistema haya brindado en la llamada inicial a
-<code>onStartRecording()</code>.</p>
-
-<p>Para obtener más información sobre cómo acceder a la tabla <code>RecordedPrograms</code>
-, consulta <a href="#sessions">Gestionar las sesiones grabadas</a>.</p>
-
-<h2 id="errors">Gestionar los errores de grabación</h2>
-
-<p>Si ocurre un error durante la grabación que hace que los datos grabados no se puedan usar,
-notifica al sistema llamando a<code>RecordingSession.notifyError()</code>.
-De forma similar, puedes llamar a <code>notifyError()</code> después de que se cree una sesión de grabación
-para que el sistema sepa que la aplicación ya no puede grabar sesiones.</p>
-
-<p>Si ocurre un error durante la grabación, pero deseas brindarle al usuario una grabación
-parcial usable para su reproducción, llama a
-<code>RecordingSession.notifyRecordingStopped()</code> para permitir que el sistema
-use la sesión parcial.</p>
-
-<h2 id="sessions">Gestionar las sesiones grabadas</h2>
-
-<p>El sistema mantiene información de todas las sesiones grabadas de todas
-las aplicaciones de canal con funcionalidad de grabación en la tabla de proveedor de contenido <code>TvContract.RecordedPrograms</code>
-. Esta información se accede mediante el URI de contenido
-<code>RecordedPrograms.Uri</code>. Usa API de proveedor de contenido para
-leer, agregar y borrar entradas de esta tabla.</p>
-
-<p>Para obtener más información sobre cómo trabajar con datos del proveedor de contenido, consulta
-<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
-Conceptos básicos sobre el proveedor de contenido</a>.</p>
-
-<h2 id="best">Prácticas recomendadas</h2>
-
-<p>Los dispositivos de TV tienen un almacenamiento limitado, de modo que debes ser cuidadoso a la hora
-de asignar el almacenamiento para guardar las sesiones grabadas. Usa
-<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code> cuando
-no haya espacio suficiente para guardar una sesión grabada.</p>
-
-<p>Cuando el usuario inicie la grabación, el registro de datos debe comenzar
-lo antes posible. Para facilitar este proceso, completa cualquier tarea anterior demandante,
-como acceder al espacio de almacenamiento y asignarlo, cuando el sistema invoque el
-callback <code>onCreateRecordingSession()</code>. Hacerlo te permite comenzar
-a grabar inmediatamente cuando el callback <code>onStartRecording()</code>
-se dispare.</p>
diff --git a/docs/html-intl/intl/es/preview/guide.jd b/docs/html-intl/intl/es/preview/guide.jd
deleted file mode 100644
index 9fe555c..0000000
--- a/docs/html-intl/intl/es/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=Guía de prueba
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>En este documento</h2>
- <ol>
- <li><a href="#runtime-permissions">Prueba de los permisos</a></li>
- <li><a href="#doze-standby">Prueba de los modos Descanso y App Standby</a></li>
- <li><a href="#ids">Copia de seguridad automática e identificadores de dispositivos</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N te brinda la oportunidad de garantizar que tus aplicaciones funcionen con la próxima versión de la plataforma.
- Esta versión preliminar incluye diversas API y cambios en los comportamientos que pueden
-tener impactos en tu aplicación, como se describe en las secciones <a href="{@docRoot}preview/api-overview.html">Información general de la API</a> y <a href="{@docRoot}preview/behavior-changes.html">Cambios en los comportamientos</a>.
- Al probar tu aplicación con la versión preliminar, te debes centrar en algunos cambios específicos del sistema para garantizar que los usuarios disfruten de una buena experiencia.
-
-
-</p>
-
-<p>
- En esta guía, se describen qué y cómo probar las características preliminares con tu aplicación. Debes priorizar la prueba de estas características específicas preliminares, puesto que podrían tener un alto impacto en el comportamiento de tu aplicación:
-
-
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">Permisos</a>
- </li>
- <li><a href="#doze-standby">Modos Descanso y App Standby</a>
- </li>
- <li><a href="#ids">Copia de seguridad automática e identificadores de dispositivos</a></li>
-</ul>
-
-<p>
- Para obtener más información sobre cómo configurar dispositivos o dispositivos virtuales con una imagen
- del sistema de la versión preliminar para realizar pruebas, consulta la sección <a href="{@docRoot}preview/setup-sdk.html">Configurar el SDK de Android N</a>.
-
-</p>
-
-
-<h2 id="runtime-permissions">Prueba de los permisos</h2>
-
-<p>
- El nuevo modelo de <a href="{@docRoot}preview/features/runtime-permissions.html">permisos</a> cambia el modo en que el usuario asigna permisos a tu aplicación.
- En lugar de conceder todos los permisos durante el procedimiento de instalación, tu aplicación debe solicitar al usuario los permisos individuales en el tiempo de ejecución.
-
- Para los usuarios, este comportamiento ofrece más control granular sobre las actividades de cada aplicación, así como un mejor contexto para comprender por qué la aplicación está solicitando un permiso específico.
- Los usuarios pueden conceder o revocar los permisos concedidos a una aplicación de forma individual en cualquier momento.
- Es muy probable que esta característica de la versión preliminar tenga un impacto en el comportamiento de tu aplicación y puede hacer que algunas características de tu aplicación no funcionen o funcionen en un estado degradado.
-
-
-</p>
-
-<p class="caution">
- Este cambio afecta a todas las aplicaciones que se ejecutan en la nueva plataforma, incluso a aquellas que no tienen como destino la nueva versión de la plataforma.
- La plataforma ofrece un comportamiento de compatibilidad limitada para las aplicaciones heredadas, pero debes comenzar a planificar ahora la migración de tu aplicación al nuevo modelo de permisos, con el objetivo de publicar una versión actualizada de tu aplicación cuando se lance la plataforma oficial.
-
-
-</p>
-
-
-<h3 id="permission-test-tips">Tips para pruebas</h3>
-
-<p>
- Usa los siguientes tips para pruebas como ayuda para planificar y ejecutar las pruebas de tu aplicación con el nuevo comportamiento de permisos.
-
-</p>
-
-<ul>
- <li>Identifica los permisos actuales de tu aplicación y las rutas de códigos relacionadas.</li>
- <li>Prueba los flujos del usuario en los datos y servicios protegidos por permisos.</li>
- <li>Realiza pruebas con varias combinaciones de permisos concedidos/revocados.</li>
- <li>Usa la herramienta {@code adb} para administrar permisos desde la línea de comando:
- <ul>
- <li>Enumera los permisos y estados por grupo:
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>Concede o revoca un permiso o más permisos utilizando la siguiente sintaxis:<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>Analiza tu aplicación para detectar servicios que utilizan permisos.</li>
-</ul>
-
-<h3 id="permission-test-strategy">Estrategia de prueba</h3>
-
-<p>
- El cambio en los permisos afecta la estructura y el diseño de tu aplicación, además de la experiencia del usuario y los flujos que proporcionas a los usuarios.
- Debes evaluar el uso de los permisos actuales de tu aplicación y comenzar a planificar los nuevos flujos que deseas ofrecer.
- La versión oficial de la plataforma proporciona un comportamiento de compatibilidad, pero debes prever la actualización de tu aplicación y no depender de estos comportamientos.
-
-
-</p>
-
-<p>
- Identifica los permisos que tu aplicación verdaderamente necesita y utiliza, y luego busca las diversas rutas de códigos que utilizan los servicios protegidos por permisos.
- Puedes realizar esto mediante una combinación de pruebas en la plataforma nueva y análisis de códigos.
- Al realizar las pruebas, debes centrarte en
- incluir permisos de tiempo de ejecución cambiando {@code targetSdkVersion} de la aplicación a la versión preliminar. Para
- obtener más información, consulta la sección <a href="{@docRoot}preview/setup-sdk.html#">Configurar el SDK de Android N</a>.
-
-</p>
-
-<p>
- Realiza pruebas con diversas combinaciones de permisos revocados y agregados, a fin de destacar los flujos del usuario que dependen de permisos.
- Cuando una dependencia no sea obvia ni lógica, debes considerar la opción de refactorizar o compartimentar ese flujo para eliminar la dependencia o aclarar por qué se necesita el permiso.
-
-
-</p>
-
-<p>
- Para obtener más información sobre el comportamiento de los permisos de tiempo de ejecución, las pruebas y las mejores prácticas, consulta la página <a href="{@docRoot}preview/features/runtime-permissions.html">Permisos</a> de la versión preliminar para desarrolladores.
-
-
-</p>
-
-
-<h2 id="doze-standby">Prueba de los modos Descanso y App Standby</h2>
-
-<p>
- Las características de ahorro de energía de los modos Descanso y App Standby limitan la cantidad de procesamiento en segundo plano que puede realizar tu aplicación cuando un dispositivo se encuentra en estado inactivo o mientras tu aplicación no está en foco.
- Entre las restricciones que el sistema puede imponer en las aplicaciones se incluyen el acceso limitado a la red o denegación de acceso, suspensión de las tareas en segundo plano, suspensión de notificaciones, y alarmas y solicitudes de reactivación ignoradas.
-
- Para garantizar que tu aplicación tenga un comportamiento correcto con estas optimizaciones de ahorro de energía, debes probar tu aplicación simulando estos estados de bajo consumo.
-
-
-</p>
-
-<h4 id="doze">Cómo probar la aplicación en modo Descanso</h4>
-
-<p>Para probar el modo Descanso con tu aplicación, realiza lo siguiente:</p>
-
-<ol>
-<li>Configura un dispositivo de hardware o un dispositivo virtual con una imagen del sistema Android N.</li>
-<li>Conecta el dispositivo a tu equipo de desarrollo e instala tu aplicación.</li>
-<li>Ejecuta tu aplicación y déjala activa.</li>
-<li>Simula la activación del modo Descanso en el dispositivo ejecutando los siguientes comandos:
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>Observa el comportamiento de tu aplicación cuando se reactive el dispositivo. Asegúrate de que se recupere correctamente cuando el dispositivo salga del modo Descanso.
-</li>
-</ol>
-
-
-<h4 id="standby">Cómo probar aplicaciones en modo App Standby</h4>
-
-<p>Para probar el modo App Standby con tu aplicación, realiza lo siguiente:</p>
-
-<ol>
- <li>Configura un dispositivo de hardware o un dispositivo virtual con una imagen del sistema Android N.</li>
- <li>Conecta el dispositivo a tu equipo de desarrollo e instala tu aplicación.</li>
- <li>Ejecuta tu aplicación y déjala activa.</li>
- <li>Simula la activación del modo App Standby en la aplicación ejecutando los siguientes comandos:
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>Simula la activación de tu aplicación con el siguiente comando:
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>Observa el comportamiento de tu aplicación al reactivarse. Asegúrate de que se recupere correctamente del modo App Standby.
- En particular, debes comprobar si los trabajos en segundo plano y las notificaciones de tu aplicación continúan funcionando de la manera esperada.
-</li>
-</ol>
-
-<h2 id="ids">Copia de seguridad automática para aplicaciones e identificadores específicos del dispositivo</h2>
-
-<p>Si tu aplicación continúa teniendo algún identificador específico del dispositivo, como la Id. de registro de Google Cloud Messaging, en el almacenamiento interno, asegúrate de seguir las mejores prácticas para excluir la ubicación de almacenamiento de la copia de seguridad automática, como se describe en la sección <a href="{@docRoot}preview/backup/index.html">Copia de seguridad automática para aplicaciones</a>.
-
-
-
- </p>
diff --git a/docs/html-intl/intl/es/preview/license.jd b/docs/html-intl/intl/es/preview/license.jd
deleted file mode 100644
index 52643bc..0000000
--- a/docs/html-intl/intl/es/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=Contrato de licencia
-
-@jd:body
-
-<p>
-Para comenzar a usar la Android SDK Preview, debe aceptar los términos y las condiciones que se describen a continuación.
-Como se describe a continuación, tenga en cuenta que esta es una versión preliminar del Android SDK, que está sujeta a cambios y que usted utiliza bajo su cuenta y riesgo. La Android SDK Preview no es una versión estable y puede contener errores y defectos que pueden provocar daños graves a sus sistemas informáticos, dispositivos y datos.
-</p>
-
-<p>
-Este es el Contrato de licencia de la versión Android SDK Preview (el “Contrato de licencia”).
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. Introducción
-
-1.1 Se le otorga la licencia de la versión Android SDK Preview (denominada “Preview” en el Contrato de licencia y que incluye específicamente los archivos de sistema de Android, las API agrupadas y los archivos de biblioteca de la Preview, si se encuentran disponibles), sujeto a los términos del Contrato de licencia. El Contrato de licencia establece una relación legal vinculante entre usted y Google en relación con el uso que realice de la Preview.
-
-1.2 “Android” hace referencia al conjunto de soluciones Android para dispositivos, según se encuentre disponible en el Proyecto de código abierto de Android (Android Open Source Project), que se encuentra en la siguiente URL: http://source.android.com/, y según se actualiza periódicamente.
-
-.1.3 “Compatible con Android” se refiere a cualquier implementación de Android que (i) cumpla con el documento Definición de compatibilidad de Android, disponible en el sitio web de compatibilidad de Android (http://source.android.com/compatibility) y que puede actualizarse esporádicamente; y (ii) apruebe satisfactoriamente la prueba de Compatibilidad con Android, "CTS” (en inglés, Android Compatibility Test Suite).
-
-1.4 “Google” hace referencia a Google Inc., una corporación de Delaware, con sede principal en 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
-
-2. Aceptación del Contrato de licencia
-
-2.1 Para poder utilizar la Preview, primero debe aceptar el Contrato de licencia. Si no acepta el Contrato de licencia, no podrá utilizar la Preview.
-
-2.2 Al hacer clic para aceptar o utilizar la Preview, por medio del presente, usted acepta los términos del Contrato de licencia.
-
-2.3 No puede utilizar la Preview ni aceptar el Contrato de licencia si tiene prohibido recibir la Preview en virtud de las leyes de los Estados Unidos o de otros países, lo que incluye el país donde es residente o desde el que utilizará la Preview.
-
-2.4 Si utilizará la Preview de forma interna, dentro de su empresa u organización, usted acepta quedar sujeto al Contrato de licencia en representación de su empleador u otra entidad, y expresa y garantiza que tiene plena autoridad legal para vincular a su empleador o a dicha entidad al Contrato de licencia. Si usted no posee la autoridad requerida, no podrá aceptar el Contrato de licencia ni utilizar la Preview en representación de su empleador u otra entidad.
-
-3. Licencia de la Preview de Google
-
-3.1 Conforme a los términos de este contrato de licencia, Google le otorga una licencia limitada, con validez mundial, libre de regalías, no asignable, no exclusiva y sin la posibilidad de otorgar una sublicencia, para utilizar la Preview con el único propósito de desarrollar aplicaciones para ejecutar en implementaciones compatibles de Android.
-
-3.2 No puede utilizar esta Preview para desarrollar aplicaciones para otras plataformas (entre las que se incluyen implementaciones incompatibles de Android) o para desarrollar otro SDK. Desde luego, usted tiene la libertad para desarrollar aplicaciones para otras plataformas, entre las que se incluyen implementaciones incompatibles de Android, siempre y cuando esta Preview no se utilice con ese propósito.
-
-3.3 Usted acepta que Google o terceros poseen todos los derechos legales, títulos e intereses en relación con la Preview, incluidos derechos de propiedad intelectual que existan en esta. "Derechos de propiedad intelectual" hace referencia a todos los derechos de la ley de patentes, la ley de derechos de autor, la ley de secreto comercial, la ley de marca comercial y cualquier otro derecho de propiedad. Google se reserva todos los derechos que no se le otorguen expresamente.
-
-3.4 Usted no podrá utilizar la Preview para ningún otro propósito que no esté expresamente permitido en el Contrato de licencia. Excepto en la medida que lo exijan las licencias correspondientes de terceros, no podrá: (a) copiar (excepto con fines de copia de seguridad), modificar, adaptar, redistribuir, descompilar, utilizar técnicas de ingeniería inversa, desarmar ni crear trabajos derivados de la Preview ni de ninguna de sus partes; ni (b) cargar ninguna parte de la Preview en un teléfono móvil ni en ningún otro dispositivo de hardware (a excepción de una computadora personal), ni podrá combinar ninguna parte de la Preview con otro software, ni distribuir algún software o dispositivo que incorpore alguna parte de la Preview.
-
-3.5 El uso, la reproducción y la distribución de los componentes de la Preview con licencia de software de código abierto están regidos exclusivamente por los términos de la licencia de ese software de código abierto y no de este Contrato de licencia. Usted acepta mantener la licencia en regla con respecto a dichas licencias de software de código abierto en virtud de todos los derechos otorgados y acepta abstenerte de realizar acción alguna que pudiera poner fin, suspender o violar dichos derechos.
-
-3.6 Acepta que la forma y la naturaleza de la Preview que proporciona Google pueden cambiar sin tener que brindarle aviso previo, y que las versiones futuras de la Preview pueden ser incompatibles con las aplicaciones desarrolladas en versiones anteriores de la Preview. Usted acepta que Google, generalmente a su entera discreción, puede dejar de proporcionarle a usted o a los demás usuarios (de forma permanente o temporal) la Preview (o cualquiera de sus funciones) sin previo aviso.
-
-3.7 Ninguna declaración de este Contrato de licencia le otorga el derecho de utilizar alguno de los nombres comerciales, las marcas comerciales, las marcas de servicio, los logotipos, los nombres de dominio ni otras características distintivas de marca de Google.
-
-3.8 Usted acepta que no quitará, ocultará o alterará ninguna de las notificaciones de derechos de autor (entre las que se incluyen las notificaciones de copyright y marcas comercias) que pudieran estar anexadas o implícitas en la Preview.
-
-4. Uso que usted realiza de la Preview
-
-4.1 Google acepta que ninguna declaración del Contrato de licencia le concede a Google derecho, título o interés alguno de su parte (o de parte de sus licenciantes), en virtud del Contrato de licencia, con respecto a las aplicaciones de software que usted desarrolle mediante el uso de la Preview, lo que incluye los derechos de propiedad intelectual que conlleven esas aplicaciones.
-
-4.2 Usted acepta utilizar la Preview y escribir aplicaciones únicamente conforme a lo que permite (a) este Contrato de licencia y (b) las leyes, regulaciones, o prácticas y pautas generalmente aceptadas y pertinentes en las jurisdicciones relevantes (entre las que se incluyen las leyes sobre la exportación de datos o software hacia los Estados Unidos u otros países relevantes y desde ellos).
-
-4.3 Usted acepta que si utiliza la Preview para desarrollar aplicaciones, protegerá la privacidad y los derechos legales de los usuarios. Si los usuarios le proporcionan sus nombres de usuario, contraseñas u otra información de inicio de sesión o información personal, debe comunicarles que la información se encontrará disponible para su aplicación, y debe proporcionarles a dichos usuarios un aviso de privacidad con protección y validez legal. Si su aplicación almacena información personal o confidencial proporcionada por los usuarios, lo debe hacer de forma segura. Si los usuarios le proporcionan información sobre la cuenta de Google, su aplicación solo puede usar esa información para acceder a la cuenta de Google del usuario siempre que este le haya otorgado permiso para hacerlo y con los fines para los que se lo haya otorgado.
-
-4.4 Usted acepta que no participará en ninguna actividad con la Versión preliminar (lo que incluye el desarrollo o la distribución de una aplicación) que interfiera, interrumpa, dañe o acceda sin autorización a servidores, redes u otras propiedades o servicios de Google o de algún tercero.
-
-4.5 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de los datos, el contenido o los recursos que usted cree, transmita o muestre a través de Android o las aplicaciones para Android, y de las consecuencias de sus acciones (lo que incluye la pérdida o el daño que Google pudiera sufrir) al hacerlo.
-
-4.6 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de cualquier incumplimiento de sus obligaciones en virtud de este Contrato de licencia, los contratos aplicables de terceros o los términos del servicio, o cualquier ley o regulación pertinentes, y de las consecuencias (lo que incluye las pérdidas o los daños que pudieran sufrir Google o algún tercero) de dichos incumplimientos.
-
-4.7 La Versión preliminar se encuentra en desarrollo, y sus pruebas y comentarios son una parte importante del proceso de desarrollo. Al utilizar la Preview, usted reconoce que la implementación de algunas características aún se encuentra en desarrollo y que no debe confiar en que la Preview contará con todas las funcionalidades de una versión estable. Usted acepta no distribuir públicamente ni enviar ninguna aplicación que utilice esta Preview, dado que esta Preview ya no se admitirá tras el lanzamiento del Android SDK oficial.
-
-5. Sus credenciales de desarrollador
-
-5.1 Usted acepta que es responsable de mantener la confidencialidad de toda credencial de desarrollador que Google pudiera otorgarle o que pudiera escoger usted mismo, y que será el único responsable de todas las aplicaciones que se desarrollen con sus credenciales de desarrollador.
-
-6. Privacidad e información
-
-6.1 Con el objetivo de poder innovar y mejorar de forma continua la Preview, Google podría recopilar ciertas estadísticas de uso del software, entre las que se incluyen, de forma enunciativa, un identificador único, la dirección IP asociada, el número de versión del software e información sobre las herramientas o los servicios de la Preview que se estén utilizando y la manera en que se estén utilizando. Antes de que se recopile esta información, la Preview se lo notificará y le solicitará su permiso. Si no otorga su permiso, no se recopilará la información.
-
-6.2 Los datos recopilados se analizan en el agregado para mejorar la Preview y se conservan de acuerdo con la política de privacidad de Google, que se encuentra en el sitio http://www.google.com/policies/privacy/.
-
-7. Aplicaciones de terceros
-
-7.1 Si utiliza la Preview para ejecutar aplicaciones desarrolladas por un tercero o que accedan a datos, contenido o recursos proporcionados por un tercero, usted acepta que Google no es responsable de esas aplicaciones, datos, contenido ni recursos. Usted comprende que todos los datos, contenidos o recursos a los que podría acceder a través de esas aplicaciones de terceros son exclusiva responsabilidad de la persona que los origina y que Google no es responsable de las pérdidas ni los daños que usted pudiera experimentar como consecuencia del uso o acceso de cualquiera de esas aplicaciones, datos, contenido o recursos de terceros.
-
-7.2 Usted debe saber que los datos, el contenido y los recursos que se le presentan a través de esa aplicación de un tercero pueden estar protegidos por derechos de propiedad intelectual que les pertenecen a sus proveedores (o a otras personas o compañías en representación de estos). No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas basadas en esos datos, contenidos o recursos (en su totalidad o en parte), a menos que los propietarios pertinentes le hayan otorgado el permiso específico para hacerlo.
-
-7.3 Usted acepta que el uso que haga de las aplicaciones, los datos, el contenido o los recursos de ese tercero puede estar sujeto a términos independientes entre usted y el tercero correspondiente.
-
-8. Uso de las API de Google
-
-8.1 API de Google
-
-8.1.1 Si utiliza alguna API para recuperar datos de Google, usted acepta que los datos pueden estar protegidos por derechos de propiedad intelectual que le pertenecen a Google o a las partes que proporcionan esos datos (o a otras personas o empresas en representación de estos). El uso que realice de cualquiera de esas API puede estar sujeto a términos de servicio adicionales. No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas con base en esos datos (en su totalidad o en parte), a menos que los términos de servicio correspondientes lo permitan.
-
-8.1.2 Si utiliza cualquier API para recuperar datos de un usuario de Google, usted acepta y acuerda que solo podrá recuperar datos con el consentimiento explícito del usuario y solo cuando, y para los fines limitados para los que, el usuario le haya otorgado permiso para hacerlo.
-
-9. Finalización del Contrato de licencia
-
-9.1 Este Contrato de licencia tendrá vigencia hasta que lo revoquen usted o Google, como se indica a continuación.
-
-9.2 Si desea rescindir el Contrato de licencia, puede hacerlo al interrumpir el uso que realiza de la Preview y de las credenciales de desarrollador pertinentes.
-
-9.3 Google puede, en cualquier momento, rescindir el Contrato de licencia, con causa o sin ella, luego de notificárselo.
-
-9.4 El Contrato de licencia finalizará automáticamente, sin previo aviso ni acción alguna, tras la primera de las siguientes situaciones:
-(A) cuando Google deje de proporcionar la Preview o ciertas partes de esta a los usuarios en el país donde usted reside o desde el que utiliza el servicio; y
-(B) cuando Google emita una versión final del Android SDK.
-
-9.5 Si el Contrato de licencia se rescinde, se revocará la licencia que usted recibió en virtud de dicho contrato; usted deberá suspender inmediatamente todo uso de la Preview, y las disposiciones de los párrafos 10, 11, 12 y 14 seguirán vigentes indefinidamente.
-
-10. EXENCIONES DE RESPONSABILIDAD
-
-10.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE EL USO QUE REALICE DE LA PREVIEW ES BAJO SU PROPIO RIESGO Y QUE LA PREVIEW SE PROPORCIONA “EN LAS CONDICIONES EN LAS QUE SE ENCUENTRA” Y “SUJETA A DISPONIBILIDAD” SIN GARANTÍAS DE NINGÚN TIPO POR PARTE DE GOOGLE.
-
-10.2 EL USO QUE USTED REALICE DE LA PREVIEW Y DE TODO MATERIAL DESCARGADO U OBTENIDO DE ALGUNA OTRA MANERA MEDIANTE EL USO DE LA PREVIEW ES A SU ENTERO RIESGO Y DISCRECIÓN, Y USTED ES EL ÚNICO RESPONSABLE DE CUALQUIER DAÑO QUE PUDIERA SUFRIR SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO, O DE LA PÉRDIDA DE DATOS COMO CONSECUENCIA DE DICHO USO. SIN PERJUICIO DE LO MENCIONADO ANTERIORMENTE, USTED COMPRENDE QUE LA VERSIÓN PRELIMINAR NO ES UNA VERSIÓN ESTABLE, Y PUEDE CONTENER ERRORES, DEFECTOS Y VULNERABILIDADES DE SEGURIDAD QUE PUEDEN PROVOCAR DAÑOS SIGNIFICATIVOS, LO QUE INCLUYE LA PÉRDIDA COMPLETA E IRRECUPERABLE DEL USO DE SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO.
-
-10.3 GOOGLE TAMBIÉN RECHAZA TODAS LAS GARANTÍAS Y CONDICIONES DE CUALQUIER TIPO, EXPRESAS O IMPLÍCITAS, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS Y CONDICIONES DE COMERCIABILIDAD, IDONEIDAD PARA UN FIN DETERMINADO Y NO VIOLACIÓN.
-
-11. LIMITACIÓN DE RESPONSABILIDADES
-
-11.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE GOOGLE, SUS SUBSIDIARIAS Y FILIALES, Y SUS LICENCIANTES NO SERÁN RESPONSABLES ANTE USTED, EN VIRTUD DE NINGUNA TEORÍA DE RESPONSABILIDAD, POR NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL, ESPECIAL, RESULTANTE NI PUNITIVO EN EL QUE PODRÍA HABER INCURRIDO, LO QUE INCLUYE LA PÉRDIDA DE DATOS, YA SEA QUE SE LE HAYA NOTIFICADO O NO A GOOGLE O A SUS REPRESENTANTES, O SOBRE CUYA POSIBILIDAD ESTOS DEBERÍAN HABER SABIDO.
-
-12. Indemnización
-
-12.1 Hasta el grado máximo que permita la ley, usted acepta defender, indemnizar y eximir de responsabilidades a Google, sus filiales y sus respectivos directores, funcionarios, empleados y agentes, de todo tipo de reclamo, acción legal y proceso judicial, así como de las pérdidas, responsabilidades, daños, costos y gastos (incluidos los honorarios razonables de abogados) que surjan o se acumulen (a) del uso que usted realiza de la Versión preliminar, (b) de cualquier aplicación que desarrolle en la Versión preliminar que infrinja algún derecho de propiedad intelectual de cualquier persona, o que difame a cualquier persona o viole sus derechos de publicidad o privacidad, y (c) del incumplimiento por su parte del Contrato de licencia.
-
-13. Cambios en el Contrato de licencia
-
-13.1 Google puede realizar cambios en el Contrato de licencia a medida que distribuye nuevas versiones de la Versión preliminar. Cuando se realicen esos cambios, Google emitirá una nueva versión del Contrato de licencia, que estará disponible en el sitio web donde se ponga a la venta la Versión preliminar.
-
-14. Términos legales generales
-
-14.1 El Contrato de licencia constituye el contrato legal integral entre usted y Google, y rige el uso que usted realice de la Versión preliminar (a excepción de los servicios que Google pueda proporcionarle en virtud de un contrato por escrito independiente), y reemplaza totalmente cualquier contrato anterior entre usted y Google en relación con la Versión preliminar.
-
-14.2 Usted acepta que, si Google no ejerce ni impone un derecho o recurso legal especificados en el Contrato de licencia (o sobre el que Google tenga beneficios conforme a cualquier ley aplicable), esto no se considerará una renuncia formal a los derechos por parte de Google y Google aún seguirá recibiendo los beneficios de esos derechos o recursos legales.
-
-14.3 Si algún tribunal judicial con jurisdicción para decidir sobre este asunto determina que alguna de las disposiciones de este Contrato de licencia no es válida, se eliminará esa disposición del Contrato de licencia sin que eso afecte la validez del resto del contrato. Las disposiciones restantes del Contrato de licencia continuarán siendo válidas y aplicables.
-
-14.4 Usted reconoce y acepta que cada miembro del grupo de compañías de las que Google es la compañía central serán terceros beneficiarios del Contrato de licencia, y que esas otras empresas tendrán el derecho de imponer directamente cualquier disposición y ampararse en las disposiciones de este Contrato de licencia que les confieran un beneficio (o que confieran derechos a su favor). Además de esto, ninguna otra persona o compañía serán terceros beneficiarios del Contrato de licencia.
-
-14.5 RESTRICCIONES DE EXPORTACIÓN. LA VERSIÓN PRELIMINAR ESTÁ SUJETA A LAS LEYES Y REGULACIONES DE EXPORTACIÓN DE LOS ESTADOS UNIDOS. DEBE CUMPLIR CON TODAS LAS LEYES Y REGULACIONES DE EXPORTACIÓN NACIONALES E INTERNACIONALES QUE SE APLIQUEN A LA VERSIÓN PRELIMINAR. ESTAS LEYES INCLUYEN RESTRICCIONES EN RELACIÓN CON LOS DESTINOS, USUARIOS FINALES Y USO FINAL.
-
-14.6 Usted no puede asignar ni transferir el Contrato de licencia sin la aprobación previa por escrito de Google y todo intento de asignación sin dicha aprobación no tendrá validez. No podrá delegar sus responsabilidades u obligaciones otorgadas en virtud del Contrato de licencia sin la aprobación previa por escrito de Google.
-
-14.7 El Contrato de licencia y su relación con Google conforme al Contrato de licencia se regirán por las leyes del estado de California, independientemente de los principios de conflictos entre leyes. Usted y Google aceptan presentarse ante la jurisdicción exclusiva de los tribunales del condado de Santa Clara, California, para resolver cualquier asunto legal que pudiera surgir del Contrato de licencia. Sin perjuicio de esto, usted acepta que Google aún podrá aplicar reparaciones conforme a mandato judicial (o a un tipo equivalente de desagravio legal) en cualquier jurisdicción.
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/preview/overview.jd b/docs/html-intl/intl/es/preview/overview.jd
deleted file mode 100644
index 279a536..0000000
--- a/docs/html-intl/intl/es/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=Información general del programa
-page.metaDescription=Prepara tus aplicaciones para la próxima versión de Android.
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- Bienvenido a <strong>Android N Developer Preview</strong>, un programa en el que
- se ofrece todo lo que necesitas a fin de probar y optimizar tus aplicaciones para la próxima
- versión de Android. Es gratis, y puedes comenzar
- descargando las herramientas de la N Developer Preview.
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- Imágenes de hardware y emuladores
- </h5>
-
- <p>
- Ejecuta y prueba tus aplicaciones en varios dispositivos o en un emulador.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- El código de plataforma más reciente
- </h5>
-
- <p>
- Durante el programa de muestra, ofreceremos varias actualizaciones mensuales. De esta manera, realizarás la prueba con los últimos cambios de la plataforma.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Prioridad para problemas de desarrolladores
- </h5>
-
- <p>
- Durante las primeras semanas, daremos prioridad a los problemas informados por los desarrolladores;
- por lo tanto, debes realizar las pruebas y enviar tus comentarios lo antes posible.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- Capacidades y comportamientos nuevos
- </h5>
-
- <p>
- Comienza a trabajar temprano para admitir los comportamientos de la nueva plataforma y realizar desarrollos con nuevas funciones.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Actualizaciones inalámbricas
- </h5>
-
- <p>
- Actualizaciones inalámbricas sin inconvenientes para dispositivos admitidos a través
- del Programa de Android Beta. No se requieren actualizaciones.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Comentarios y soporte
- </h5>
-
- <p>
- Infórmanos los problemas y envíanos comentarios a través de nuestro
- <a href="{@docRoot}preview/bug">seguimiento de problemas</a>. Conéctate con otros
- desarrolladores en la
- <a href="{@docRoot}preview/dev-community">comunidad de desarrolladores de Android N</a>.
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">Escala de tiempo y actualizaciones</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- La N Developer Preview rige desde el 9 de marzo de 2016 hasta el lanzamiento público
- de Android N para AOSP y OEM, previsto para el tercer trimestre de 2016.
-</p>
-
-<p>
- En las versiones "milestone" del desarrollo, lanzaremos actualizaciones para tu entorno de pruebas y desarrollo.
- En general, podrás contar con una actualización por mes (intervalo de 4 a 6
- semanas). A continuación, se muestran las versiones "milestone":
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (versión inicial, alpha);</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (actualización gradual, alpha);</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong> (actualización gradual, beta);</li>
- <li><strong>Preview 4</strong> (API finales y SDK oficial, publicación en Google Play);</li>
- <li><strong>Preview 5</strong> (imágenes de sistema casi definitivas para pruebas finales);</li>
- <li><strong>Lanzamiento de la versión final</strong> para AOSP y el ecosistema.</li>
-</ul>
-
-<p>
- En cada actualización se incluyen herramientas de SDK, imágenes de sistema de Preview, emuladores, documentación de referencia y diferencias de API.
-
-</p>
-
-<p>
- En las primeras <strong>tres versiones "milestone" de Preview</strong>, se proporciona un <strong>entorno
- de prueba y desarrollo tempranos</strong> que te permitirá identificar
- problemas de compatibilidad en tus aplicaciones actuales y planificar tareas relacionadas con la migración o las funciones que se necesitan
- para orientar la nueva plataforma. Este será el período de prioridad
- en el cual nos enviarás tus comentarios sobre funciones y problemas de compatibilidad de API y archivos;
- para hacerlo, usa el <a href="{@docRoot}preview/bug">sistema se seguimiento
- de problemas.</a> Podrás contar con cambios en las API en estas actualizaciones.
-</p>
-
-<p>
- En <strong>Preview 4 y 5</strong>, tendrás acceso a las <strong>API y al SDK finales
- de Android N</strong> para tareas de desarrollo, y también a imágenes de sistema casi definitivas
- para poner a prueba comportamientos y funciones del sistema. Durante este período, Android N ofrecerá un nivel
- de API estándar. Puedes iniciar la prueba de compatibilidad de tus aplicaciones
- heredadas y optimizar el código nuevo en el que se usen las API o funciones de Android N.
-</p>
-
-<p>
- A su vez, a partir de Preview 4, podrás <strong>publicar aplicaciones en
- dispositivos</strong> con Android N cuyo nivel de API sea el oficial (por ejemplo, dispositivos de
- consumidores inscritos en el Programa de Android Beta). Puedes
- realizar primero publicaciones en los canales alpha y beta de Google Play, para probar
- tus aplicaciones con consumidores de Android Beta antes de proceder con la distribución a gran escala en la
- tienda.
-</p>
-
-<p>
- A medida que pruebas y desarrollas en Android N, te recomendamos que <strong>mantengas
- tu entorno de desarrollo actualizado</strong> conforme se lanzan
- las actualizaciones de Preview. Para facilitar el proceso, puedes registrar tus dispositivos de prueba en el
- Programa de Android Beta y obtener <strong>actualizaciones inalámbricas</strong> en cada
- versión "milestone". Como alternativa, habrá imágenes de Preview actualizadas disponibles que puedes
- descargar y actualizar de manera manual.
-</p>
-
-<p>
- Cuando haya actualizaciones de Preview disponibles, te informaremos a través del <a href="http://android-developers.blogspot.com/">blog para desarrolladores de Android</a>, de este sitio y
- de la <a href="{@docRoot}preview/dev-community">Comunidad de desarrolladores de
- Android N</a>.
-</p>
-
-
-<h2 id="preview_tools">¿Qué es la N Developer Preview?</h2>
-
-<p>
- En la N Developer Preview se incluye todo lo que necesitas para probar tus aplicaciones
- existentes con diferentes tamaños de pantalla, tecnologías de red, chipsets de CPU y GPU,
- y arquitecturas de hardware.
-</p>
-
-<h3 id="sdk_tools">Herramientas del SDK</h3>
-
-<p>Puedes descargar todos estos componentes a través de SDK Manager en <a href="{@docRoot}studio/intro/update.html">Android Studio</a>:</p>
-
-<ul>
- <li> <strong>SDK y herramientas</strong> de la N Developer Preview;
- <li> <strong>imagen del sistema para el emulador</strong>de la N Developer Preview (32 y 64 bits);
- <li> <strong>imagen del sistema para el emulador para Android TV</strong> (32 bits) de la N Developer Preview;
- <li> bibliotecas de compatibilidad de la N Developer Preview (para nuevas plantillas de aplicaciones).
-</ul>
-
-<p>
- Ofreceremos actualizaciones para estas herramientas de desarrollo en cada momento clave (versión "milestone") según sea necesario.
-</p>
-
-<h3 id="hardware_system_images">Imágenes de sistema de hardware</h3>
-
-<p>
- En la N Developer Preview se incluyen, entre otras, imágenes de sistema del hardware de Nexus que puedes usar al
- realizar pruebas y desarrollos en dispositivos físicos. Consulta la sección de <a href="{@docRoot}preview/download.html">imágenes de sistema</a> para encontrar la lista
- completa de imágenes de hardware.
-</p>
-
-<p>
- Ofreceremos imágenes de sistema actualizadas para estos dispositivos en cada versión "milestone". Puedes
- descargar y actualizar manualmente las imágenes de sistema renovadas en tus dispositivos
- de prueba con la frecuencia que desees. Esto resulta particularmente útil para entornos de prueba
- automatizados en los cuales probablemente debas volver a actualizar tu dispositivo varias
- veces.
-</p>
-
-<p class="note"><strong>Nota</strong>:
- <strong>Los dispositivos actualizados de manera manual no recibirán actualizaciones inalámbricas</strong>, como en
- la Preview del año pasado. Este año, podrás recibir actualizaciones inalámbricas registrando dispositivos en el
- Programa de Android Beta. Consulta la sección siguiente para obtener información detallada.
-</p>
-
-<h3 id="android_beta">Actualizaciones inalámbricas a través del Programa de Android Beta</h3>
-
-<p>
- Como novedad en Android N, se ofrece un programa de actualización inalámbrica que
- proporciona las últimas actualizaciones de Android N directamente para dispositivos registrados
- en él. Es gratuito y está pensado para quienes tengan
- dispositivos compatibles registrados en sus cuentas de Google.
-</p>
-
-<p>
- Para el registro, visita el sitio del <a href="https://g.co/androidbeta">Programa de Android
- Beta</a>. En él,
- verás todos los dispositivos registrados en tu cuenta que cumplen con los requisitos para registrarse
- en el programa.
-</p>
-
-<ol>
- <li> Selecciona los dispositivos para los que deseas recibir actualizaciones de Android N
- <li> Haz clic en Registrar, lee y acepta las condiciones de servicio y luego haz clic en Aceptar
-</ol>
-
-<p>
- Una vez que realices el registro, tu dispositivo recibirá pronto una actualización. En la mayoría de los casos,
- no necesitarás restablecer por completo tus datos para la migración a Android N, pero
- te recomendamos crear una copia de seguridad de los datos que no desees perder antes de
- registrar el dispositivo.
-</p>
-
-<p>
- A medida que tu dispositivo reciba actualizaciones, te recomendamos descargarlas e
- instalarlas lo más pronto posible. Te convendrá mantenerte actualizado respecto de las
- últimas modificaciones en la IU, el comportamiento, las API y las funciones del sistema.
-</p>
-
-<p>
- Al finalizar la Developer Preview, tus dispositivos registrados
- recibirán una actualización a la versión oficial de Android N.
-</p>
-
-<p>
- Puedes dar de baja tus dispositivos del Programa de Android Beta en cualquier momento desde
- el sitio de Android Beta. Antes de hacerlo, no te olvides de realizar una copia de respaldo de los datos
- de tu dispositivo.
-</p>
-
- <p class="note"><strong>Nota</strong>:
- Cuando des de baja tu dispositivo, <strong>
- se someterá a un restablecimiento de fábrica</strong> a través del que se cargará la última versión de
- Android 6.0 Marshmallow (no necesariamente la versión
- instalada antes del registro). Para garantizar que la instalación sea nueva, se borrarán
- tus datos del dispositivo; entre otros, los contactos,
- los mensajes y las fotos.
-</p>
-
-<h3 id="documentation_and_sample_code">Documentación y ejemplo de código</h3>
-
-<p>
- Los siguientes recursos de documentación se encuentran disponibles en el sitio de Developer Preview y con ellos
- podrás obtener información sobre Android N:
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Preparación para el desarrollo con
- Android N</a>: contiene
- instrucciones paso a paso para comenzar.</li>
- <li> En <a href="{@docRoot}preview/behavior-changes.html">Cambios en los
- comportamientos</a> se indican áreas clave que debes probar.</li>
- <li> Documentación de nuevas API, entre la que se incluye <a href="{@docRoot}preview/api-overview.html">Información general de API</a>, una <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia
- de API</a> descargable
- y guías exhaustivas para desarrolladores que muestran, por ejemplo, soporte
- de múltiples ventanas, notificaciones integradas, soporte de múltiples configuraciones regionales y mucho más.
- <li> <a href="{@docRoot}preview/samples.html">Ejemplo de código</a>, en el que se
- demuestra la manera de admitir permisos y otras funciones nuevas.
- <li> <a href="{@docRoot}preview/support.html#release-notes">Notas de la versión</a>
- sobre la versión actual de la N Developer Preview. Se incluyen notas sobre los cambios e informes
- de diferencias.
-</ul>
-
-<h4 id="reference">Referencia de la API descargable</h4>
-
-<p>
- Durante las actualizaciones de Preview, puedes descargar la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia de la API más reciente
- para la plataforma de Android N</a> en forma de
- archivo .zip independiente. En esta descarga
- también se incluye un informe de diferencias que te permite identificar cambios en la API en comparación con la
- API 23 y la actualización anterior.
-</p>
-
-<p>
- Cuando las API de Android N sean definitivas y se asigne el nivel de API oficial,
- te proporcionaremos la referencia de la API en línea en <a href="https://developer.android.com">https://developer.android.com</a>.
-</p>
-
-<h3 id="support_resources">
- Recursos de soporte
-</h3>
-
-<p>
- A medida que realices pruebas y desarrollos con la N Developer Preview, recurre a los siguientes canales
- para informar problemas y enviar comentarios.
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">El sistema de seguimiento de problemas
- de la N Developer Preview</a> es el canal <strong>principal para comentarios.</strong> A través de él, puedes informar errores y
- problemas de rendimiento, y enviar comentarios generales. También puedes buscar
-<a href="{@docRoot}preview/bugs">problemas conocidos</a> y
- encontrar pasos para solucionarlos. Te mantendremos informado sobre tu problema durante el proceso de evaluación y
- derivación al equipo de ingeniería de Android para su resolución. </li>
- <li> La <a href="{@docRoot}preview/dev-community">comunidad de desarrolladores de Android N</a> es
- una comunidad de Google+ en la que puedes <strong>conectarte con otros desarrolladores</strong> que trabajen con
- Android N. Puedes compartir observaciones o ideas, o encontrar respuestas a
- preguntas acerca de Android N. Moderaremos la comunidad y proporcionaremos respuestas y
- orientación según sea necesario.</li>
-</ul>
-
-<h3 id="targeting">Orientación, API de la Preview y publicación</h3>
-
-<p>
- En la N Developer Preview se proporciona un sistema exclusivo para desarrollo y una
- biblioteca de Android <strong>cuyo nivel de API no es estándar</strong>. Si deseas
- no incluir comportamientos de compatibilidad para probar tu aplicación (un proceso muy
- recomendado), puedes orientar la versión Android N Preview fijando el valor
- de <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code> de tu aplicación
- en <code>“N”</code>.
-</p>
-
-<p>
- Android N Developer Preview ofrece las <strong>API de Preview</strong>
- , que no serán oficiales hasta el lanzamiento de la versión definitiva de SDK,
- actualmente previsto para el tercer trimestre de 2016. Esto significa que podrás
- <strong>contar con cambios menores en las API</strong> conforme pase el tiempo, en especial durante
- las primeras semanas del programa. Te proporcionaremos un resumen de cambios con
- cada actualización de Android N Developer Preview.
-</p>
-
-<p class="note">
- <strong>Nota</strong>: Aunque las API de Preview pueden modificarse, los comportamientos del sistema
- subyacente permanecen estables y disponibles para cualquier prueba
- inmediata.
-</p>
-
-<p>
- Google Play <strong>evita la publicación de aplicaciones orientadas a la N Developer
- Preview</strong>. Cuando esté disponible el SDK definitivo de Android N, podrás
- apuntar hacia el nivel de API oficial de Android N y publicar tu aplicación en Google
- Play a través de los canales para versiones alpha y beta. Mientras tanto, si deseas
- distribuir una aplicación orientada a Android N para testers, puedes hacerlo por correo electrónico o
- mediante descarga directa desde tu sitio.
-</p>
-
-<p>
- Cuando se lance la versión completa de Android N para AOSP y OEM, evento previsto para el tercer trimestre de 2016,
- podrás publicar tus aplicaciones orientadas a Android N en el canal de lanzamientos
- públicos de Google Play.
-</p>
-
-
-<h2 id="how_to_get_started">Comenzar</h2>
-
-<p>
- Para comenzar a probar tu aplicación con Android N:
-</p>
-
-<ol>
- <li> Revisa las secciones <a href="{@docRoot}preview/api-overview.html">Información general de la API</a>
- y <a href="{@docRoot}preview/behavior-changes.html">Cambios en los comportamientos</a> para
- conocer las novedades y el efecto que tienen en tus aplicaciones. En particular,
- procura obtener información sobre las nuevas funciones de <a href="{@docRoot}preview/features/notification-updates.html">notificaciones</a> y
- la <a href="{@docRoot}preview/features/multi-window.html">compatibilidad con ventanas múltiples</a>.</li>
- <li> Configura tu entorno siguiendo las instrucciones para <a href="{@docRoot}preview/setup-sdk.html">configurar el SDK Preview</a>
- y los dispositivos de prueba.</li>
- <li> Sigue las <a href="https://developers.google.com/android/nexus/images">instrucciones de
- actualización</a> a fin de usar la última imagen de sistema de Android N para tu dispositivo. </li>
- <li> Revisa la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia de la API</a>
- y los <a href="{@docRoot}preview/samples.html">Ejemplos de Android N</a> para obtener más
- información sobre las nuevas funciones de la API y la manera de usarlas en tu aplicación.
- <li> Únete a la <a href="{@docRoot}preview/dev-community">comunidad de
- desarrolladores de Android N</a> para recibir las últimas noticias y para contactarte con otros
- desarrolladores que estén trabajando con la nueva plataforma.</li>
-</ol>
-
-<p>
- ¡Te agradecemos por participar de la Android N Developer Preview!
-</p>
diff --git a/docs/html-intl/intl/es/preview/preview_toc.cs b/docs/html-intl/intl/es/preview/preview_toc.cs
deleted file mode 100644
index 6c98c2f..0000000
--- a/docs/html-intl/intl/es/preview/preview_toc.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html" es-lang="Información general del programa" in-lang="Ikhtisar Program" ja-lang="プログラム概要" ko-lang="프로그램 개요" pt-br-lang="Visão geral do programa" ru-lang="Обзор программы" vi-lang="Tổng quan về Chương trình" zh-cn-lang="计划概览" zh-tw-lang="程式總覽">Información general del programa</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">Compatibilidad y notas de la versión</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html" es-lang="Configurar el SDK de la versión preliminar" in-lang="Menyiapkan Preview" ja-lang="Preview SDK のセットアップ" ko-lang="미리 보기 SDK 설정하기" pt-br-lang="Configuração do Preview SDK" ru-lang="Настройка пакета SDK Preview" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="设置预览版 SDK" zh-tw-lang="設定預覽版 SDK">Configuración de Preview</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html" es-lang="Pruebe en un dispositivo" in-lang="Menguji pada Perangkat" ja-lang="デバイス上でテストする" ko-lang="기기에서 테스트" pt-br-lang="Testar em um dispositivo" ru-lang="Тестирование на устройстве" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="在设备上测试" zh-tw-lang="在裝置上測試">Prueba en un dispositivo</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html" es-lang="Cambios en los comportamientos" in-lang="Perubahan Perilaku" ja-lang="動作の変更点" ko-lang="동작 변경" pt-br-lang="Mudanças de comportamento" ru-lang="Изменения в работе" vi-lang="Các thay đổi Hành vi" zh-cn-lang="行为变更" zh-tw-lang="行為變更">Cambios en los comportamientos</a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html" es-lang="Optimizaciones en segundo plano" in-lang="Optimisasi Latar Belakang" ja-lang="バックグラウンド処理の最適化" ko-lang="백그라운드 최적화" pt-br-lang="Otimizações em segundo plano" ru-lang="Оптимизация фоновых процессов" vi-lang="Tối ưu hóa Chạy ngầm" zh-cn-lang="后台优化" zh-tw-lang="背景最佳化">Optimizaciones en segundo plano</a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html" es-lang="Idioma y configuración regional" in-lang="Bahasa dan Lokal" ja-lang="言語とロケール" ko-lang="언어 및 로케일" pt-br-lang="Idioma e localidade" ru-lang="Язык и языковой стандарт" vi-lang="Ngôn ngữ và Bản địa" zh-cn-lang="语言和区域设置" zh-tw-lang="語言和地區設定">Idioma y configuración regional</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html" es-lang="Información general de la API" in-lang="Android N untuk Pengembang" ja-lang="API の概要" ko-lang="API 개요" pt-br-lang="Visão geral da API" ru-lang="Обзор API-интерфейсов" vi-lang="Android N cho Nhà phát triển" zh-cn-lang="API 概览" zh-tw-lang="API 總覽">Android N for Developers </a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html" es-lang="Compatibilidad con ventanas múltiples" in-lang="Dukungan Multi-Jendela" ja-lang="マルチ ウィンドウのサポート" ko-lang="다중 창 지원" pt-br-lang="Suporte a várias janelas" ru-lang="Поддержка многооконного режима" vi-lang="Hỗ trợ đa cửa sổ" zh-cn-lang="多窗口支持" zh-tw-lang="多視窗支援">Compatibilidad con ventanas múltiples</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html" es-lang="Notificaciones" in-lang="Pemberitahuan" ja-lang="通知" ko-lang="알림" pt-br-lang="Notificações" ru-lang="Уведомления" vi-lang="Thông báo" zh-cn-lang="通知" zh-tw-lang="通知">Notificaciones</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html">Ahorro de datos</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html" es-lang="Grabación de TV" in-lang="Perekaman TV" ja-lang="TV の録画" ko-lang="TV 녹화" pt-br-lang="Gravação para TV" ru-lang="Запись ТВ" vi-lang="Ghi lại TV" zh-cn-lang="TV 录制" zh-tw-lang="電視錄製">Grabación de TV</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html" es-lang="Configuración de seguridad de la red" in-lang="Network Security Configuration" ja-lang="ネットワーク セキュリティ構成" ko-lang="네트워크 보안 구성" pt-br-lang="Configurações de segurança de rede" ru-lang="Конфигурация сетевой безопасности" vi-lang="Cấu hình Bảo mật mạng" zh-cn-lang="网络安全配置" zh-tw-lang="網路安全性設定">Configuración de seguridad de la red</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html" es-lang="API de ICU4J del framework de Android" in-lang="ICU4J Android Framework API" ja-lang="ICU4J Android フレームワーク API" ko-lang="ICU4J Android 프레임워크 API" pt-br-lang="APIs de estrutura do Android para ICU4J" ru-lang="API-интерфейсы ICU4J в платформе Android" vi-lang="API Khuôn khổ Android ICU4J" zh-cn-lang="ICU4J Android 框架 API" zh-tw-lang="ICU4J Android 架構 API">Compatibilidad con ICU4J</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html" es-lang="Funciones del lenguaje Java 8" in-lang="Fitur Bahasa Java 8" ja-lang="Java 8 の機能" ko-lang="Java 8 언어 기능" pt-br-lang="Recursos de linguagem do Java 8" ru-lang="Возможности языка Java 8" vi-lang="Tính năng của Ngôn ngữ Java 8" zh-cn-lang="Java 8 语言功能" zh-tw-lang="Java 8 語言功能">Funciones del lenguaje Java 8</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html">Actualizaciones para Android for Work</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html" es-lang="Acceso a directorios determinados" in-lang="Scoped Directory Access" ja-lang="特定のディレクトリへのアクセス" ko-lang="범위가 지정된 디렉터리 액세스" pt-br-lang="Acesso a diretórios com escopo" ru-lang="Доступ к выделенным каталогам" vi-lang="Truy cập Thư mục theo Phạm vi" zh-cn-lang="作用域目录访问" zh-tw-lang="限定範圍目錄存取">Acceso a directorios determinados</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html" es-lang="Ejemplos" in-lang="Contoh" ja-lang="サンプル" ko-lang="샘플" pt-br-lang="Exemplos" ru-lang="Примеры" zh-cn-lang="示例" zh-tw-lang="範例">Ejemplos</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html" es-lang="Contrato de licencia" ja-lang="使用許諾契約" ko-lang="라이선스 계약" pt-br-lang="Contrato de licença" ru-lang="Лицензионное соглашение" zh-cn-lang="许可协议" zh-tw-lang="授權協議">Contrato de licencia</a></div>
- </li>
-
-</ul>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/preview/samples.jd b/docs/html-intl/intl/es/preview/samples.jd
deleted file mode 100644
index 204d11a..0000000
--- a/docs/html-intl/intl/es/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=Ejemplos
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- Los siguientes ejemplos de código se proporcionan para Android N. Para
- descargarlos en Android Studio, selecciona la opción de menú <b>File > Import
- Samples</b>.
-</p>
-
-<p class="note">
- <strong>Nota:</strong> Estos proyectos que se pueden descargar están diseñados
- para su uso con Gradle y Android Studio.
-</p>
-
-
-<h3 id="mw">“Área de juegos” de ventanas múltiples</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- En este ejemplo se muestra la manera de aprovechar interfaces de usuario
- de ventanas múltiples con tu aplicación.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
-Obtener en GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">Notificaciones activas</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Este es un ejemplo preexistente en el cual se muestra un servicio simple que envía
- notificaciones con NotificationCompat. Cada conversación no leída
- se envía como una notificación diferente.
-</p>
-<p>
- Este ejemplo se actualizó para aprovechar nuevas funciones de notificación
- disponibles en Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
-Obtener en GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">Servicio de mensajería</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- Este es un ejemplo preexistente en el que se demuestra la manera de usar
- NotificationManager para indicar la cantidad de notificaciones que se aparecen actualmente en una
- aplicación.
-</p>
-<p>
- Este ejemplo se actualizó para aprovechar nuevas funciones de notificación
- disponibles en Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
-Obtener en GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">Inicio directo</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- En este ejemplo se demuestra la manera de almacenar datos, y de acceder a ellos, en un medio de almacenamiento encriptado por
- dispositivo que esté siempre disponible mientras el dispositivo se haya iniciado.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
-Obtener en GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">Acceso a directorios determinados</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- En este ejemplo se demuestra la manera de leer y escribir datos de
- directorios específicos y, al mismo tiempo, evitar más permisos.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
-Obtener en GitHub</a>
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/preview/setup-sdk.jd b/docs/html-intl/intl/es/preview/setup-sdk.jd
deleted file mode 100644
index 2f8c4fa..0000000
--- a/docs/html-intl/intl/es/preview/setup-sdk.jd
+++ /dev/null
@@ -1,187 +0,0 @@
-page.title=Configuración de Preview
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Obtener Android Studio 2.1</a></li>
- <li><a href="#get-sdk">Obtener el SDK de Android N</a>
- <ol>
- <li><a href="#docs-dl">Documentación de referencia</a>
- </ol>
- </li>
- <li><a href="#java8">Obtener el JDK de Java 8</a></li>
- <li><a href="#create-update">Actualizar o crear un proyecto</a></li>
- <li><a href="#next">Próximos pasos</a></li>
-</ol>
- </div>
-</div>
-
-<p>A fin de desarrollar aplicaciones para la Android N Preview, debes aplicar algunas actualizaciones
-a tu entorno de desarrollo, como se describe en esta página.</p>
-
-<p>Para solo probar la compatibilidad de tu aplicación en la
-imagen de sistema de Android N, sigue la guía de <a href="{@docRoot}preview/download.html">Prueba en un dispositivo Android N</a>.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Obtener Android Studio 2.1</h2>
-
-<p>La plataforma de Android N agrega compatibilidad para <a href="{@docRoot}preview/j8-jack.html">funciones de lenguaje de Java 8</a>,
- que requieren un nuevo compilador llamado Jack. La última versión de Jack
-actualmente solo es compatible con Android Studio 2.1. Por lo tanto, si deseas
-usar funciones de lenguaje de Java 8, debes usar Android Studio 2.1 para
-crear tu aplicación. De lo contrario, no necesitarás el compilador Jack, pero
-deberás aplicar una actualización a JDK 8 para compilar tu proyecto en función a la plataforma de Android N,
-según lo descrito a continuación.</p>
-
-<p>Si ya cuentas con Android Studio, cerciórate de que tienes Android
-Studio 2.1 o una versión anterior haciendo clic en <strong>Help > Check for Update</strong>
-(en Mac, <strong>Android Studio > Check for Updates</strong>).</p>
-
-<p>Si no cuentas con él, <a href="{@docRoot}studio/">descarga Android Studio
-2.1 aquí</a>.</p>
-
-
-<h2 id="get-sdk">Obtener el N Preview SDK</h2>
-
-<p>Para comenzar a desarrollar proyectos con las API de Android N, debes instalar el
-Android N Preview SDK en Android Studio de la siguiente manera:</p>
-
-<ol>
- <li>Abre el Administrador de SDK haciendo clic en <strong>Tools > Android >
- SDK Manager</strong>.</li>
-
- <li>En la pestaña <strong>SDK Platforms</strong>, selecciona la
- casilla de verificación <strong>Android N Preview</strong>.</li>
-
- <li>Haz clic en la pestaña <strong>SDK Tools</strong> y luego selecciona las casillas de verificación
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong> y
- <strong>Android SDK Tools</strong>.
- </li>
-
- <li>Haz clic en <strong>OK</strong> y acepta los acuerdos
- de licencia para instalar cualquier paquete que se necesite.
- </li>
-</ol>
-
-<h3 id="docs-dl">Obtener documentación de referencia de la Android N Preview</h3>
-
-<p>
- En la documentación de referencia de la N Preview, se encuentra disponible información
- detallada acerca de las API de Android N. Puedes descargar la documentación de la tabla siguiente.
- Este paquete contiene una versión abreviada y de uso sin conexión del sitio web para desarrolladores
- de Android, y en ella se incluyen una referencia de API actualizada para las API de Android N y un
- informe de diferencia de API.
-</p>
-
-<table>
- <tr>
- <th scope="col">Documentación</th>
- <th scope="col">Sumas de comprobación</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip">n-preview-3-docs.zip</a></td>
- <td width="100%">
- MD5: 19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
- SHA-1: 9224bd4445cd7f653c4c294d362ccb195a2101e7
- </td>
- </tr>
-<table>
-
-
-
-<h2 id="java8">Obtener el JDK de Java 8</h2>
-
-<p>Para compilar tu aplicación en función de la plataforma de Android N y para usar algunas herramientas con
-Android Studio 2.1 el Java 8 Developer Kit (JDK 8). Por lo tanto, si
-aún no tienes la última versión, descarga el JDK 8 ahora.</p>
-
-<p>Luego configura la versión de JDK en Android Studio de la siguiente manera:</p>
-
-<ol>
- <li>Abre un proyecto de Android en Android Studio y luego el
- cuadro de diálogo de estructura del proyecto seleccionando <strong>File >
- Project Structure</strong>. (Como alternativa, puedes fijar el valor predeterminado
- para todos los proyectos seleccionando<strong> File > Other Settings >
- Default Project Structure</strong>).
- </li>
- <li>En el panel izquierdo del cuadro de diálogo, haz clic en <strong>SDK Location</strong>.
- </li>
- <li>En el campo <strong>JDK Location</strong>, escribe la ubicación del
- JDK de Java 8 (haz clic en el botón de la derecha
- para explorar tus archivos) y luego haz clic en <strong>OK</strong>.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">Actualizar o crear un proyecto</h2>
-
-<p>
- Para usar las API de Android N, debes configurar tu proyecto en forma correspondiente.
-</p>
-
-<p>Si planeas usar funciones del lenguaje Java 8, también debes leer
-<a href="{@docRoot}preview/j8-jack.html">Funciones del lenguaje Java 8</a>
-para obtener información sobre las funciones de Java 8 admitidas y
-la manera de configurar tu proyecto con el compilador Jack.</p>
-
-
-<h3 id="update">Actualizar un proyecto existente</h3>
-
-<p>Abre el archivo
- <code>build.gradle</code> de tu módulo y actualiza los valores de la siguiente
- manera:
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc3'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">Crear un proyecto nuevo</h3>
-
-
-<p>Si deseas crear un proyecto nuevo para realizar desarrollos con el Android N Preview SDK:</p>
-
-<ol>
- <li>Haz clic en <strong>File > New Project</strong> y sigue los pasos correspondientes hasta
- llegar a la página Target Android Devices.
- </li>
- <li>En la página, selecciona la opción <strong>Phone and Tablet</strong>.</li>
- <li>En la opción <strong>Phone and Tablet</strong>, dentro de la lista de opciones <strong>Minimum
- SDK</strong>, selecciona
- <strong>N: Android API 23, N Preview (Preview).</strong></li>
-</ol>
-
-
-<h2 id="next">Próximos pasos</h2>
-
-<ul>
- <li>Sigue la guía de <a href="{@docRoot}preview/download.html">Prueba en un dispositivo Android N</a>.</li>
- <li>Para obtener más información sobre la plataforma de Android N, visita las secciones
-<a href="{@docRoot}preview/behavior-changes.html">Cambios en los comportamientos</a>
-y <a href="{@docRoot}preview/api-overview.html">API y funciones de Android N
-</a>.</li>
-</ul>
-
diff --git a/docs/html-intl/intl/es/preview/support.jd b/docs/html-intl/intl/es/preview/support.jd
deleted file mode 100644
index f74bae9..0000000
--- a/docs/html-intl/intl/es/preview/support.jd
+++ /dev/null
@@ -1,1188 +0,0 @@
-page.title=Soporte y notas de la versión
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>En este documento</h2>
-
-<ul>
- <li><a href="#dp3">Developer Preview 3</a>
- <ul>
- <li><a href="#general">Recomendaciones generales</a></li>
- <li><a href="#new">Novedades en DP3</a></li>
- <li><a href="#ki">Problemas conocidos</a></li>
- </ul>
- </li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- Durante el desarrollo y las pruebas que lleves a cabo con
- la Android N Developer Preview tendrás dos canales de soporte principales: Para informar los errores específicos de
- dispositivos, de sistema o de Google Apps, visita <a href="https://developer.android.com/preview/bug">https://developer.android.com/preview/bug</a>. Para informar sobre problemas en otras aplicaciones,
- ponte en contacto directamente con el desarrollador.
-</p>
-
-<p>Para debatir sobre problemas o ideas con otros desarrolladores que estén trabajando en Android N, únete a la comunidad
-<a href="{@docRoot}preview/dev-community">M Developer Preview en Google+</a>.</p>
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Fecha: Mayo de 2016<br>
- Versión: NPD35K<br>
- Compatibilidad con emulador: x86 y ARM (32/64-bit)<br>
- Servicios de Google Play: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">Recomendaciones generales</h3>
-
-<p>
- Esta versión de Developer Preview está pensada para <strong>desarrolladores de aplicaciones y usuarios
- pioneros</strong> y está disponible para uso diario, desarrollo o
- pruebas de compatibilidad. Ten en cuenta estas notas generales sobre la
- versión:
-</p>
-
-<ul>
- <li>Esta versión puede tener varios <strong>problemas de estabilidad</strong> en
- dispositivos compatibles. Los usuarios se pueden topar con un sistema inestable, con errores
- internos del núcleo y fallas.
- </li>
-
- <li>Algunas aplicaciones <strong>quizá no funcionen como se espera</strong> en la versión de la plataforma
- nueva. Entre ellas se incluyen tanto aplicaciones de Google como de otros desarrolladores.
- </li>
-
- <li>Developer Preview 3 para desarrolladores ha superado el <strong>conjunto de pruebas de compatibilidad (CTS)
- </strong> en estos dispositivos: Nexus 5X, Nexus 6, Nexus 6P y Pixel
- C. Las aplicaciones que dependen de compilaciones que hayan aprobado el CTS deberían
- funcionar con normalidad en estos dispositivos (por ejemplo, Android Pay).
- </li>
-
- <li>Developer Preview 3 está <strong>disponible en todos los dispositivos
- compatibles:</strong> Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player, Pixel
- C, General Mobile 4G (Android One) y Sony Xperia Z3 (modelos D6603 y
- D6653).
-
- </li>
-</ul>
-
-
-<h3 id="new">Novedades en DP3</h3>
-
-<h4 id="">Modo RV para Android</h4>
-
-<p>
- Android N agrega compatibilidad y optimizaciones de plataforma para un Modo RV nuevo, con el objetivo de que los
- desarrolladores puedan forjar experiencias RV móviles de alta calidad para los usuarios. Hay varias
- mejoras en el rendimiento, entre las que se incluye el acceso a un núcleo de CPU exclusivo
- para aplicaciones de RV. Dentro de tus aplicaciones, puedes aprovechar el seguimiento de cabeza
- inteligente y las notificaciones en sonido estéreo que funcionan para el modo RV. Un dato muy importante es que
- Android N presenta muy pocos gráficos de baja latencia.
-</p>
-
-<p>
- Para obtener más información, consulta <a href="https://developers.google.com/vr/android/">Google VR SDK para Android</a>.
-</p>
-
-<h4 id="">Modo de rendimiento sostenido</h4>
-
-<p>
- Android N incluye compatibilidad opcional para un <a href="{@docRoot}preview/api-overview.html#sustained_performance_api">modo de rendimiento
- sostenido</a>, que permite que los OEM arrojen datos sobre las capacidades de rendimiento del dispositivo
- para las aplicaciones que llevan tiempo ejecutándose. Los desarrolladores de aplicaciones pueden usar estos
- datos para pulir sus aplicaciones y alcanzar un nivel consistente y predecible de rendimiento durante períodos prolongados
- en el dispositivo. Los desarrolladores de aplicaciones solo pueden probar este API nuevo
- en la Preview instalada en Nexus 6P.
-</p>
-
-<h4>Multiprocess WebView</h4>
-
-<p>
- Desde la versión 51 de Android N, WebView ejecutará contenido web en
- procesos individuales de espacio aislado cuando se haya habilitado
- la opción "Multiprocess WebView". El equipo de WebView espera recibir comentarios sobre compatibilidad y
- rendimiento de tiempo de ejecución en N antes de habilitar Multiprocess WebView en
- versiones futuras de Android. En esta versión, pueden darse regresiones en el tiempo de inicio, uso total
- de la memoria y problemas de rendimiento en la representación de software.
-</p>
-
-<p>
- Si te topas con problemas inesperados en el modo de multiprocesos, nos gustaría que compartas la información
- con nosotros. Ponte en contacto con el equipo de WebView <a href="https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">
- informándolos sobre un error</a>.
-</p>
-
-<h4 id="">Ayuda en los métodos abreviados del teclado</h4>
-
-<p>
- Android N permite que los usuarios pulsen <code>Meta+/</code> para activar una pantalla de <strong>Keyboard
- Shortcuts</strong> que muestra todos los métodos abreviados disponibles tanto para el
- sistema como para la aplicación que esté en primer plano. Los desarrolladores pueden agregar sus propios métodos abreviados o
- activar la pantalla de métodos abreviados desde sus aplicaciones. Consulta <a href="{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">Ayuda en los métodos
- abreviados del teclado</a> para ver más detalles.
-</p>
-
-<h4 id="">API FrameMetrics</h4>
-
-<p>
- DP3 presenta una <a href="{@docRoot}preview/api-overview.html#framemetrics_api">API FrameMetrics</a>nueva
- que permite que una aplicación monitoree su rendimiento de representación de IU mediante la exposición de una
- transmisión de API Pub/Sub para transferir información sobre el intervalo de los fotogramas para la ventana actual
- de la aplicación. Puedes usar <code>FrameMetricsListener</code> para medir
- el rendimiento de la IU del nivel de interacción en producción con una granularidad mayor y
- sin la necesidad de contar con conexión USB.
-</p>
-
-<h4 id="api-changes">Característica y cambios en la API</h4>
-
-<dl>
- <dt>
- Accesos directos al launcher y sus API
- </dt>
-
- <dd>
- Hemos decidido postergar esta característica hasta una versión futura de Android. El plan
- es eliminar las API de accesos directos al launcher (ShortcutManager y otras) de la
- API pública de Android N a partir de la siguiente Preview.
- </dd>
-
- <dt>
- Ejecución de WebView Javascript antes de la carga de página
- </dt>
-
- <dd>
- Comenzando por las aplicaciones que hagan objetivo a Android N, el contexto de JavaScript se restablece
- cuando se carga una página nueva. De momento, el contexto de la
- primera página cargada se mantiene en una instancia {@link android.webkit.WebView} nueva.
- Los desarrolladores que quieran introducir JavaScript en {@link
- android.webkit.WebView} deberían ejecutar la secuencia de comandos luego de que la página haya
- comenzado a cargar.
- </dd>
-
- <dt>
- Ubicación geográfica de WebView en orígenes inseguros
- </dt>
-
- <dd>
- Comenzando por las aplicaciones que hagan objetivo a Android N, solo se permitirá
- el uso de la API de ubicación geográfica en orígenes seguros (en HTTPS). Esta política se ha diseñado para proteger
- la información privada del usuario cuando use una conexión insegura.
- </dd>
-
- <dt>
- Ahorro de datos
- </dt>
-
- <dd>
- A partir de Developer Preview 3 para desarrolladores, las aplicaciones pueden usar una intent para mostrar un
- recuadro de diálogo de sistema que permite que el usuario agregue la aplicación directamente a la lista blanca de excepciones
- de ahorro de datos. Consulta la <a href="{@docRoot}preview/api-overview.html#data_saver">documentación
- sobre ahorro de datos</a> para ver más detalles.
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#number-blocking">Bloqueo de números</a>
- </dt>
-
- <dd>
- Ahora, si un usuario sin autorización intenta bloquear o desbloquear un número, la
- operación fallará y arrojará el mensaje {@link java.lang.SecurityException}. (Antes,
- la operación arrojaba el mensaje {@link java.lang.UnsupportedOperationException}).
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">API para mosaico
- de configuración rápida</a>
- </dt>
-
- <dd>
- Ahora, el sistema utiliza metadatos de la actividad para definir el modo de mosaico.
- (Antes, el valor de devolución de
- <code>TileService.onTileAdded()</code> determinaba el modo de mosaico). Para obtener más información, consulta
- <code>TileService.META_DATA_ACTIVE_TILE</code> en la <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referencia de la API</a> descargable.
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">Soluciones para los errores que informaron los desarrolladores</h4>
-
-<p>
- Se han solucionado varios errores que los desarrolladores habían informado, entre los que se incluyen:
-</p>
-
-<ul>
- <li>Interrupción de la reproducción de audio por Bluetooth luego de una canción (error <a href="https://code.google.com/p/android/issues/detail?id=206889">206889</a>)
- </li>
-
- <li>Fallas continuas en Pixel C (error <a href="https://code.google.com/p/android/issues/detail?id=206962">206962</a>)
- </li>
-
- <li>Problemas de notificaciones en Clock and Toast (error <a href="https://code.google.com/p/android/issues/detail?id=203094">203094</a>)
- </li>
-
- <li>Reinicio de Pixel C cuando se lo conecta a una MacBook Pro mediante un cable USB C (error
- <a href="https://code.google.com/p/android/issues/detail?id=205432">205432</a>)
- </li>
-
- <li>Diferencia de un día en el calendario (error <a href="https://code.google.com/p/android/issues/detail?id=203002">203002</a>)
- </li>
-
- <li>Devolución de datos no válidos de parte de TelephonyManager.getAllCellInfo (error <a href="https://code.google.com/p/android/issues/detail?id=203022">203022</a>)
- </li>
-
- <li>Nexus 6P - Desconexión continua de Bluetooth (error <a href="https://code.google.com/p/android/issues/detail?id=208062">208062</a>)
- </li>
-</ul>
-
-<p>Para conocer la lista completa de errores solucionados, consulta <a href="https://goo.gl/6uCKtf">el
-seguimiento de problemas</a>.</p>
-
-<h3 id="ki">Problemas conocidos</h3>
-
-<h4>Accesibilidad</h4>
-
-<ul>
- <li>Imposibilidad de escuchar el formato de salida TTS cuando la inclinación está cerca del nivel máximo.
- </li>
-
- <li>Las funciones y la configuración de accesibilidad pueden verse interrumpidas cuando el usuario agrega un
- perfil de trabajo, como el gesto y la configuración de ampliación. El estado
- de la accesibilidad se restablece cuando el usuario cambia la configuración asociada.
- </li>
-</ul>
-
-<h4>Cámara</h4>
-
-<ul>
- <li>La aplicación Cámara ha mostrado inestabilidad; puede presentar fallos en varias
- circunstancias, como cuando se la ejecuta en el modo de ventanas múltiples.
- </li>
-
- <li>Si se presiona el obturador repetidas veces en el modo panorámico, la aplicación Cámara
- puede fallar.
- </li>
-</ul>
-
-<h4>Audio</h4>
-<ul>
- <li>Un error en el reproductor de audio de plataforma impide que algunas aplicaciones
- funcionen con normalidad. Este error afecta, por ejemplo, a aplicaciones como Skype y otras.
- </li>
-</ul>
-
-<h4>Conectividad</h4>
-
-
-<ul>
- <li>Cuando un dispositivo de rol periférico Bluetooth Low Energy (BLE) indica un
- servicio y se conecta un dispositivo de rol central BLE, el dispositivo de rol periférico
- se desconecta rápidamente.
- </li>
-
- <li>La conexión Wi-Fi puede perderse cuando la pantalla está apagada.
- </li>
-
- <li>Las conexiones RFCOMM son inestables y pueden provocar daños en los datos y
- conexiones con poca estabilidad.
- </li>
-
- <li>El estado de red activo ({@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} y {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}) pueden devolver valores incorrectos durante algunos
- escenarios de fondos restringidos.
- </li>
-</ul>
-
-
-<h4>
- Launcher
-</h4>
-
-<ul>
- <li>La bandeja All Apps predeterminada del lanzador puede dejar de responder luego de que
- la pantalla se apague y se encienda. El problema se puede resolver volviendo a la pantalla de inicio y ejecutando otra vez
- la bandeja All Apps.
- </li>
-</ul>
-
-<h4>
- Teclado
-</h4>
-
-<ul>
- <li>Cuando se actualiza un dispositivo que utiliza Android 6.0 o una versión anterior a la N Developer
- Preview, el teclado de Google no conserva los datos de preferencias como los emoji recientes
- y la configuración de sonido.
- </li>
-
- <li>Google Indic Managed Keyboard puede comportarse de manera inestable.
- </li>
-
- <li>Cuando se ingresa texto en un campo de contraseña, el usuario puede seleccionar ruso como
- el idioma de escritura, pero el teclado permanece en inglés. Esto impide que los
- usuarios puedan ingresar contraseñas en ruso.
- </li>
-</ul>
-
-<h4>
- Configuración regional e idiomas
-</h4>
-
-<ul>
- <li>Cuando se usa una configuración regional de derecha a izquierda (RTL), el sistema puede cambiar, de manera inesperada,
- a una presentación de izquierda a derecha (LTR) luego de reiniciar el dispositivo.
- </li>
-</ul>
-
-<h4>Medios</h4>
-
-<ul>
- <li>En Nexus 9 y Nexus Player, la reproducción de medios puede no ser la correcta y presentar, entre otros,
- errores al reproducir HD.
- </li>
-</ul>
-
-<h4>
- Modo de ventanas múltiples
-</h4>
-
-<ul>
- <li>El dispositivo se puede congelar cuando se cambia la orientación en el modo de ventanas múltiples.
- </li>
-
- <li>De momento, varias aplicaciones tienen problemas con el modo de ventanas múltiples:
- <ul>
- <li>La IU del sistema puede fallar cuando se cambia Settings > Display >
- Screen brightness al modo de ventanas múltiples.
- </li>
-
- <li>La aplicación Cámara puede fallar cuando se la ejecuta en el modo de ventanas múltiples.
- </li>
-
- <li>YouTube puede fallar cuando se lo ejecuta en el modo de ventanas múltiples. Para solucionar el
- problema, puedes borrar los datos de la aplicación YouTube en Storage > Apps >
- YouTube.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Servicios de Google Play
-</h4>
-
-<ul>
- <li>Las aplicaciones que usen Google Cast por medio de los servicios de Google Play pueden presentar problemas cuando
- el usuario elige una configuración regional del sistema que usa letras y números que estén fuera del
- rango ASCII.
- </li>
-</ul>
-
-<h4>
- Android for Work y Google Apps Device Policy
-</h4>
-
-<ul>
- <li>La aplicación Device Policy puede fallar cuando el usuario desbloquea el dispositivo con la pantalla
- "device policy status" anclada.
- </li>
-
- <li>Después de configurar un perfil de trabajo con la encriptación a base de archivos habilitada y
- luego desactivar Work, los usuarios deberán desactivar el bloqueo de pantalla del perfil principal para volver
- a acceder a las aplicaciones de Work.
- </li>
-
- <li>El dispositivo se reinicia cuando se quita el patrón de seguridad y se abre una
- aplicación personal o de trabajo en el modo de ventanas múltiples.
- </li>
-
- <li>Configurar DISALLOW_VPN_CONFIG provoca que el diálogo de consentimiento aparezca en
- always-on-vpn, configurado por Device Policy Client.
- </li>
-
- <li>El tráfico no se bloquea hasta que la VPN esté conectada en el modo always-on-vpn.
- </li>
-</ul>
-
-<h4>
- Almacenamiento externo
-</h4>
-
-<ul>
- <li>Las aplicaciones pueden comenzar a funcionar mal cuando el usuario las mueve desde el almacenamiento interno a un dispositivo de
- almacenamiento externo (entre los que se incluyen las tarjetas SD o los dispositivos conectados por
- medio de USB).
- </li>
-</ul>
-
-<h4>
- Zoom de la pantalla y APK múltiples en Google Play
-</h4>
-
-<ul>
- <li>En dispositivos que usen Android N, los servicios de Google Play 9.0.83 informan erróneamente
- la densidad de la pantalla actual en vez de la densidad de la pantalla estable. Cuando se habilita el zoom
- de la pantalla en estos dispositivos, esto puede provocar que Google Play seleccione una
- versión de una aplicación con APK múltiples diseñada para pantallas más pequeñas. Este error se
- soluciona en la siguiente versión de los servicios de Google Play, y se incluirá en un
- lanzamiento futuro de la Developer Preview.
- </li>
-
- <li>De momento, en dispositivos que usen Android N, los servicios de Google Play 9.0.83 informan la compatibilidad con
- Vulkan, pero no con qué versión. Esto puede provocar que Google Play seleccione una
- versión de una aplicación con APK múltiples diseñada con compatibilidad inferior con Vulkan en
- dispositivos que son compatibles con versiones más nuevas. De momento, la tienda Google Play no
- acepta actualizaciones de aplicaciones que utilicen selección de versión de Vulkan. Esta compatibilidad
- se agregará a la tienda Google Play en el futuro, y se solucionará en la siguiente
- versión de los servicios Google Play (que se incluirá en una Developer Preview
- nueva). Cualquier dispositivo N que use una versión de servicios Google Play 9.0.83 seguirá
- recibiendo versiones de aplicaciones que tengan compatibilidad básica con Vulkan.
- </li>
-</ul>
-
-<h4 id="">Notificaciones</h4>
-
-<ul>
- <li>MessagingStyle no muestra notificaciones con emisor "null" (propio).
- </li>
-</ul>
-
-<h4 id="">Herramientas de desarrollador</h4>
-
-<ul>
- <li>
- <code>adb</code> se puede desconectar mientras se usa la depuración JDWP.
- </li>
-</ul>
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-
-
-
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Fecha: Abril de 2016<br>
- Compilaciones: NPC91K, NPC91O<br>
- Compatibilidad con emulador: x86 y ARM (32/64-bit)<br>
- Servicios de Google Play: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">Novedades en DP2</h3>
-
-<ul>
- <li>Compatibilidad con plataformas para Vulkan, una nueva API de visualización 3D que permite
- controlar explícitamente y con baja sobrecarga la GPU (unidad de procesamiento de gráficos) y ofrece
- un rendimiento mejorado para aplicaciones sujetas a un nivel elevado de llamadas a draw. Para ver más detalles, consulta la
- <a href="{@docRoot}ndk/guides/graphics/index.html">documentación</a>.
- </li>
-
- <li>Emoji de gente nuevos con compatibilidad para tonos de piel, y glifos Unicode 9.
- El tono de piel y los emoji nuevos no se mostrarán hasta que la versión de los teclados sea compatible con
- ellos en la paleta. Las aplicaciones no deberían tomar ninguna acción para sacar
- ventaja de estos emoji nuevos, a menos que la aplicación utilice una fuente que no sea del sistema. Los desarrolladores de IME
- tienen que incorporar compatibilidad con los emoji nuevos.
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">API de accesos directos
- al launcher</a>: Las aplicaciones pueden usar <code>ShortcutManager</code> para enviar al launcher
- accesos directos a puntos de control dentro de sí mismos.
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">Ventanas múltiples</a>:
- Ahora puedes especificar un alto mínimo y un ancho mínimo individual para una
- actividad. Además, se han modificado los nombres de varias API.
- </li>
-</ul>
-
-<h4 id="dp2-fixes">Soluciones para los errores que informaron los desarrolladores</h4>
-
-<p>
- Se han solucionado varios errores que los desarrolladores habían informado, entre los que se incluyen:
-</p>
-
-<ul>
- <li>No se puede establecer la conexión a SSID o Wi-Fi ocultos. (error <a href="https://code.google.com/p/android/issues/detail?id=203116">203116</a>)
- </li>
-
- <li>El modo silenciado del micrófono persiste en distintas actividades. (error <a href="https://code.google.com/p/android/issues/detail?id=205922">205922</a>)
- </li>
-
- <li>Al cambiar el foco de ventanas múltiples, YouTube se pausa. (error <a href="https://code.google.com/p/android/issues/detail?id=203424">203424</a>)
- </li>
-
- <li>Respuesta directa puede cerrar la actividad abierta. (error <a href="https://code.google.com/p/android/issues/detail?id=204411">204411</a>)
- </li>
-
- <li>Varias soluciones de estabilidad.
- </li>
-</ul>
-
-<h3 id="dp2-general">Recomendaciones generales</h3>
-
-<p>
- Esta versión de la Developer Preview solo se recomienda a los <strong>desarrolladores de aplicaciones</strong>
-, y está diseñada para usarla en pruebas de compatibilidad y durante etapas tempranas del desarrollo.
- Ten en cuenta estas notas generales sobre la versión:
-</p>
-
-<ul>
-
- <li>Para el lanzamiento de la DP2,
- se han actualizado los componentes de herramienta de desarrollo y las bibliotecas de compatibilidad. No te olvides de actualizar tu entorno de desarrollo de Preview
- antes de desarrollar para DP2. Para ver instrucciones sobre cómo configurar tu entorno
- de desarrollo, consulta
- <a href="{@docRoot}preview/setup-sdk.html">Configuración de Preview</a>.
- </li>
-
- <li>Esta versión presenta varios problemas de estabilidad y rendimiento en todos los dispositivos
- que la convierten en una versión <strong>no recomendable para el uso diario en tablets o teléfonos</strong>,
- especialmente para quienes no sean desarrolladores.
- </li>
-
- <li>En esta
- versión, aún no se ha optimizado el rendimiento y la vida de la batería:
-
- <ul>
- <li>Se sabe que el <strong>rendimiento de las aplicaciones y el sistema es lento o
- problemático</strong>, y existe la posibilidad de que, periódicamente, los dispositivos dejen de funcionar. Estos
- problemas se pueden agravar con el uso prolongado.
- </li>
-
- <li>En esta versión, la vida de la batería se puede ver afectada cuando la pantalla
- se apaga y se enciende.
- </li>
- </ul>
- </li>
-
- <li>Algunas <strong>aplicaciones quizá no funcionen con normalidad</strong> en la Developer Preview
- 2. Entre ellas se incluyen tanto aplicaciones de Google como de otros desarrolladores.
- </li>
-
- <li>Esta versión temprana no ha superado <strong>el conjunto de pruebas de compatibilidad (CTS)
- </strong>. Las aplicaciones que dependen de compilaciones que hayan aprobado el CTS no funcionarán
- (Android Pay, por ejemplo).
- </li>
-
- <li>Esta versión de Preview es compatible con los siguientes dispositivos: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, Pixel C y General Mobile 4G
- (Android One). Próximamente también será compatible con Nexus Player.
- </li>
-
-
- <li><a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> se ha
- actualizado para manejar cambios de API entre DP1 y DP2.
- </li>
-</ul>
-
-<h3 id="dp2-ki">Problemas conocidos</h3>
-
-<h4>Rendimiento y batería</h4>
-
-<ul>
- <li>Se sabe que el rendimiento de las aplicaciones y el sistema es <strong>lento o
- problemático</strong>, y existe la posibilidad de que, periódicamente, los dispositivos dejen de funcionar. Estos
- problemas se pueden agravar con el uso prolongado.
- </li>
-</ul>
-
-<h4>Cuentas de Google</h4>
-
-<ul>
- <li>En ciertas circunstancias, pueden ocurrir problemas con
- <code>AccountManagerService</code>, que impide iniciar sesión en cuentas de Google.
- </li>
-</ul>
-
-<h4>Actualización del sistema</h4>
-
-<ul>
- <li>El dispositivo se puede reiniciar al momento de actualizar a DP2.
- </li>
-</ul>
-
-<h4>Accesibilidad</h4>
-
-<ul>
- <li>Problemas al escuchar formato de salida de texto a voz (TTS) cuando la inclinación está
- cerca del nivel máximo.
- </li>
-</ul>
-
-<h4>Bluetooth</h4>
-
-<ul>
- <li>Las características GATT del Bluetooth de bajo consumo (LE) utilizan el tipo
- de escritura equivocado, y no se enviarán a un dispositivo remoto. Por esa razón, algunos dispositivos útiles
- para la realización de ejercicios no funcionarán.
- </li>
-</ul>
-
-<h4>Asistente de configuración</h4>
-
-<ul>
- <li>La opción para recuperar datos en un dispositivo nuevo (o en un dispositivo que se ha restablecido hace poco tiempo) de
- "Your Google Account" no se puede utilizar en el asistente de configuración. Debes restablecer
- los datos de un dispositivo existente eligiendo "another Android device" en el
- asistente de configuración o configurarlo como un dispositivo nuevo.
- </li>
-</ul>
-
-<h4>OEM unlock</h4>
-
-<ul>
- <li>En algunos dispositivos, <strong>Enable OEM unlock</strong> aparecerá inhabilitado en
- "Developer Options" al ejecutar DP2.<br>
- <strong>Método alternativo:</strong> Apúntate para
- el Programa Android Beta (si aún no lo has hecho) en
- <a href="https://www.google.com/android/beta" class="external-link">www.google.com/android/beta</a>. Luego, date de baja y acepta el
- paso a una versión anterior (OTA). Darse de baja hará que el dispositivo pase a la versión Android 6.0. Ahora deberías
- poder elegir la opción <strong>Enable OEM unlock</strong> en
- "Developer Options". Cuando
- el dispositivo se desactualiza, todos los datos personales se pierden; sin embargo, si se hubiera desbloqueado el bootloader, también se habrían eliminado esos datos.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Comprobación de seguridad de trabajo
- <ul>
- <li>Luego de migrar a N, o después de que el usuario cree perfiles de trabajo, los perfiles
- de trabajo no pueden crear claves en el depósito de claves hasta que el usuario cambie su
- patrón, PIN o contraseña o configure una comprobación de trabajo.
- </li>
-
- <li>En modo de inicio directo, aplicar restricciones de contraseña al dispositivo
- hará que el perfil de trabajo se desbloquee, incluso si el dispositivo está bloqueado.
- Esto permite acceder al perfil de trabajo aunque debería estar protegido
- por la pantalla de bloqueo del dispositivo.
- </li>
- </ul>
- </li>
-
- <li>Always On VPN
- <ul>
- <li>Si el modo Always On VPN está activado, pero la VPN no está disponible, las aplicaciones
- se conectarán a la red normal. Las aplicaciones deberían quedar sin conexión si no hay
- una conexión de VPN disponible.
- </li>
-
- <li>Cuando el modo Always On VPN está activado, las conexiones VPN no se establecen después
- del reinicio de un dispositivo a modo de inicio directo, incluso luego de que el usuario desbloquee la
- pantalla de bloqueo.
- </li>
- </ul>
- </li>
-
- <li>Paquetes suspendidos
- <ul>
- <li>Los administradores de dispositivos pueden suspender paquetes de sistema críticos, lo que puede provocar
- un comportamiento inesperado, como la realización de llamadas a pesar de que se muestre el recuadro de diálogo "Telephone
- disabled".
- </li>
- </ul>
- </li>
-
- <li>Otros
- <ul>
- <li>Cuando se inicia, la aplicación Configuración falla si {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} está configurado como verdadero cuando el usuario
- conecta un medio físico como una tarjeta SD.
- </li>
-
- <li>El primer registro en un perfil de trabajo tarda varios minutos en
- completarse.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>Los espacios entre números vinculantes y números distintos a cero
- como primer número vinculante hacen que {@code vkCreateGraphicsPipeline()} falle.</li>
- <li>Vulkan exhibe un comportamiento de muestras incorrecto en coordinadas de textura proyectada.</li>
- <li>En la muestra multithreadCmdBuffer, {@code vkCmdClearColorImage()} falla cuando
- se ejecuta con el controlador N-DP2.</li>
- <li>Los valores de devolución de {@code vkGetPhysicalDeviceFormatProperties()} no configuran un valor
- para {@code VkFormatProperties::linearTilingFeatures} que, como resultado,
- toma el valor de 0.</li>
- <li>Los anexos del búfer de fotogramas de punto flotante de Vulkan no se manejan de forma correcta.</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>Los sombreadores SPIR-V no disparan activos del controlador.</li>
- <li>Algunas configuraciones del proceso pueden hacer que {@code vkCreateGraphicsPipeline()}
- falle.</li>
- </ul>
-</ul>
-
-<h4>Problemas específicos de dispositivo</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- La conexión de datos falla cuando un dispositivo se cambia de la ranura SIM 1 a la 2.
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- No se puede activar o desactivar la opción "Always On" de búsqueda por voz.
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- Las fotografías de la cámara en orientación vertical están dañadas, a excepción de las fotos
- HDR+.
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- En Nexus Player, la reproducción de contenido Netflix HD puede fallar.
- </dd>
-
- <dd>
- En Nexus Player, cualquier aplicación que dependa de cambios de resolución de video dinámico
- puede fallar.
- </dd>
-
- <dd>
- En Nexus Player, cualquier aplicación que use el códec de video VP9 puede fallar.
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Fecha: Marzo de 2016<br>
- Compilaciones: NPC56P, NPC56R, actualizado: NPC56W, NPC56X<br>
- Compatibilidad con emulador: x86 y ARM (32/64-bit)<br>
- Servicios de Google Play: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">Recomendaciones generales</h3>
-
-<p>
- Esta versión de la Developer Preview solo se recomienda a los desarrolladores de aplicaciones, y está diseñada para
- usarla en pruebas de compatibilidad y durante etapas tempranas del desarrollo. Ten en cuenta
- estas notas generales sobre la versión:
-</p>
-<ul>
- <li>Esta versión presenta varios problemas de estabilidad y rendimiento en todos los dispositivos
- que la convierten en una versión <em>no recomendable para el uso diario en tablets o teléfonos</em>,
- especialmente para quienes no sean desarrolladores.
- </li>
-
- <li>Se sabe que el rendimiento de las aplicaciones y el sistema es <strong>lento o
- problemático</strong>, y existe la posibilidad de que, periódicamente, los dispositivos dejen de funcionar. Estos
- problemas se pueden agravar con el uso prolongado.
- </li>
-
- <li>En esta versión, la vida de la batería se puede ver afectada cuando la pantalla se apaga y
- se enciende.
- </li>
-
- <li>Algunas aplicaciones quizá no funcionen con normalidad en la Developer Preview 1. Entre estas se incluyen
- tanto aplicaciones de Google como de otros desarrolladores.
- </li>
-
- <li>Esta versión temprana no ha superado el conjunto de pruebas de compatibilidad(CTS). Las aplicaciones
- que dependen de compilaciones que hayan aprobado el CTS no funcionarán (por ejemplo, Android Pay).
- </li>
-
- <li>Esta versión de Preview es compatible con los siguientes dispositivos: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, Nexus Player, Pixel C y General Mobile 4G
- (Android One).
- </li>
-</ul>
-
-<h3 id="dp1-platform">Problemas de plataforma</h3>
-
-<h4>Rendimiento y batería</h4>
-
-<ul>
- <li>Se sabe que el rendimiento de las aplicaciones y el sistema es <strong>lento o
- problemático</strong>, y existe la posibilidad de que, periódicamente, los dispositivos dejen de funcionar. Estos
- problemas se pueden agravar con el uso prolongado.
- </li>
-
- <li>En esta versión, la vida de la batería se puede ver afectada cuando la pantalla se apaga y
- se enciende.
- </li>
-</ul>
-<h4 id="dialer">Teléfono</h4>
-
-<ul>
- <li>La aplicación Teléfono no es compatible con el inicio directo. Este tema se abordará más adelante en
- N Developer Preview.
- </li>
-
- <li>La reproducción del buzón de voz no funciona.
- </li>
-</ul>
-
-<h4>Micrófono</h4>
-
-<ul>
- <li>El estado silencioso del micrófono en el sistema puede persistir de manera incorrecta entre aplicaciones y luego de haberlo reiniciado. Si silencias el micrófono en una aplicación y el estado persiste, abre cualquiera aplicación que tenga controles de silencio para el micrófono y reactiva el micrófono.</li>
-</ul>
-
-<h4 id="ui">IU del sistema</h4>
-
-<ul>
- <li>Algunas cadenas nuevas o modificadas de la IU del sistema no están traducidas a todos
- los idiomas.
- </li>
-
- <li>La IU de información general aún está en desarrollo y sujeta a modificaciones. Por ejemplo,
- tenemos pensado quitar el temporizado que aparece cuando el usuario alterna entre
- aplicaciones.
- </li>
-
- <li>Los controles y los cambios de configuración pueden ser lentos o no funcionar correctamente.
- </li>
-
- <li>El diseño visual de las notificaciones está sujeto a cambios.
- </li>
-
- <li>En la aplicación Gmail, el archivo directo de correos electrónicos incluidos en un
- paquete de notificación no funciona correctamente.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Comprobación de seguridad de trabajo
- <ul>
- <li>Luego de migrar a N, o después de que el usuario cree perfiles de trabajo, los perfiles
- de trabajo no pueden crear claves en el depósito de claves hasta que el usuario cambie su
- patrón, PIN o contraseña o configure una comprobación de trabajo.
- </li>
-
- <li>En modo de inicio directo, aplicar restricciones de contraseña al dispositivo
- hará que el perfil de trabajo se desbloquee, incluso si el dispositivo está bloqueado.
- Esto permite acceder al perfil de trabajo aunque debería estar protegido
- por la pantalla de bloqueo del dispositivo.
- </li>
-
- <li>Cuando el usuario ingresa una contraseña o un PIN incorrecto, el sistema no
- muestra ningún mensaje informativo; en vez de eso, solo borra el campo
- de entrada. Este problema no afecta al ingreso de huellas digitales o patrones.
- </li>
-
- <li>En una tablet, el fondo que se muestra durante la comprobación de trabajo es
- desproporcionalmente pequeño.
- </li>
-
- <li>La versión de <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">
- Google Apps Device Policy</a> que está integrada en la N Developer Preview
- aún no es compatible con la función comprobación de seguridad para perfiles de trabajo.
- Los desarrolladores debería usar <a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a>
- para probar esta función.
- </li>
- </ul>
- </li>
-
- <li>Always On VPN
- <ul>
- <li>Si el modo Always On VPN está activado, pero la VPN no está disponible, las aplicaciones
- no especificadas como excepción en la política "Always On" se conectarán
- a la red normal. A menos que se especifiquen como excepciones en la política Always On VPN,
- las aplicaciones deberían quedar sin conexión si no hay una conexión de VPN disponible.
- <ul>
- <li>Cuando el modo Always On VPN está activado, las conexiones VPN no se establecen
- después del reinicio de un dispositivo a modo de inicio directo, incluso luego de que el usuario
- desbloquee la pantalla de bloqueo.
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>Contactos mejorados
- <ul>
- <li>Los dispositivos Bluetooth PBAP/MAP no muestran el identificador de llamada para los contactos
- de trabajo. La versión siguiente de Preview resuelve este problema.
- </li>
- </ul>
- </li>
-
- <li>Modo de trabajo
- <ul>
- <li>El Google Now Launcher no muestra si el modo de trabajo está activado o
- desactivado. El launcher tampoco muestra el estado de suspensión de las aplicaciones.
- </li>
-
- <li>Después de que los usuarios activan o desactivan el modo de trabajo, el sistema ya no muestra
- los widgets de aplicación del perfil de trabajo como el Calendario.
- </li>
- </ul>
- </li>
-
- <li>Paquetes suspendidos
- </li>
-
- <li>Los administradores de dispositivos pueden suspender paquetes de sistema críticos, lo que puede provocar
- un comportamiento inesperado, como la realización de llamadas a pesar de que se muestre el recuadro de diálogo
- "Telephone disabled".
- </li>
-
- <li>Otros
- <ul>
- <li>Cuando se inicia, la aplicación Configuración falla si {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} está configurado como verdadero cuando el usuario
- conecta un medio físico como una tarjeta SD.
- </li>
-
- <li>El estado {@code DPM.setPackagesSuspended} no persiste cuando el
- usuario desinstala y luego reinstala la aplicación. La aplicación debería permanecer
- suspendida luego de desinstalarla/reinstalarla, o las aplicaciones suspendidas no deberían poder
- desinstalarse.
- </li>
-
- <li>El primer registro en un perfil de trabajo tarda varios minutos en
- completarse. Esto puede hacer que el dispositivo tarde más de lo normal en volverse
- visible en la API Play EMM.
- </li>
-
- <li>Las notificaciones de las aplicaciones de perfiles de trabajo no son visibles para los oyentes de las notificaciones
- instalados en el perfil personal. Como resultado, el sistema no
- muestra las notificaciones como se esperaría.
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >Teclado</h4>
-
-<ul>
- <li>La sincronización por Bluetooth entre teclados y dispositivos Android puede comportarse de manera inestable.
- </li>
-</ul>
-
-<h4 >Video</h4>
-
-<ul>
-<li>La reproducción de video puede interrumpirse y demorarse.</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>La conexión Wi-Fi ha sufrido algunos cambios, que podrían modificar el comportamiento
- del caso límite de la API. Específicamente, se deberían volver a probar las aplicaciones que intentan conectarse a redes
- específicas o intentan reconectarse a redes.
- </li>
-
- <li>El cliente DHCP heredado se ha quitado de la plataforma. El único cliente DHCP
- que es compatible con la plataforma es el cliente DHCP presentado en M.
- </li>
-</ul>
-
-<h4>Inicio directo</h4>
-
-<ul>
- <li>NFC no funciona hasta el primer desbloqueo.
- <ul>
- <li>Cuando se reinicia un teléfono con Bluetooth habilitado, el Bluetooth no
- se activa de forma automática. Tendrás que rehabilitar el Bluetooth de forma manual.
- </li>
-
- <li>En ciertas circunstancias, el tono predeterminado no se oye cuando
- se reciben llamadas o mensajes. Este comportamiento está corregido en la próxima versión de la N Preview
- , con una excepción (y solución alternativa):
- </li>
-
- <li>En un dispositivo cuyos datos no se hayan eliminado hace poco uno que se haya iniciado
- al menos una vez desde la activación del modo inicio directo, el tono de
- notificación predeterminado no se oye. El usuario puede solucionar este problema eligiendo de forma manual
- un tono del menú Configuración.
- </li>
-
- <li>El inicio directo no está habilitado de forma predeterminada en dispositivos que usen la versión N
- Developer Preview. Para habilitar el inicio directo para pruebas y
- desarrollo, ve a Developer Options y toca Convert to File Encryption.
- En esta Developer Preview, esta opción requiere de un restablecimiento de la configuración predeterminada de fábrica para reparticionar y
- reformatear tu dispositivo para encriptación a base de archivos.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>Picture-in-picture para Android TV</h4>
-
-<ul>
- <li>La integración PIP en la IU de Recientes no está finalizada y está sujeta a
- cambios.
- <ul>
- <li>La animación de la ventana de PIP no está terminada. Este aspecto se mejorará en las
- versiones futuras de la Preview.
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">El diseño visual y la alineación del diseño de PIP se mejorarán
- en las versiones futuras de la Preview.
- </li>
-</ul>
-
-<h4>Informes de errores</h4>
-
-<ul>
- <li>Los informes de errores no siempre se completan con éxito (como solución alternativa,
- a menudo se puede acceder a ellos a través del documento de informe de error provisto
- en el almacenamiento interno).
- </li>
-</ul>
-
-<h4>Ventanas múltiples con pantalla dividida</h4>
-
-<ul>
- <li>Las aplicaciones pueden fallar, o el comportamiento de su IU puede no ser el adecuado, cuando se utiliza el modo de
- pantalla dividida. Estos son problemas de la aplicación que el desarrollador
- de la aplicación debe solucionar.
- </li>
-
- <li>Cuando una aplicación hace objetivo a una versión de la plataforma Android anterior a N, la
- aplicación quizá no funcione, y las alertas de pantalla dividida pueden aparecer en múltiples oportunidades.
- </li>
-
- <li>Presionar durante bastante tiempo el botón Recientes cuando se usa una aplicación con orientación fija
- puede hacer que la aplicación se comporte de manera inesperada.
- </li>
-
- <li>Las aplicaciones pueden parpadear cuando se les cambia el tamaño.
- </li>
-
- <li>Las animaciones no están terminadas.
- </li>
-</ul>
-
-<h4>Método de entrada.</h4>
-
-<ul>
- <li>El teclado de Google vuelve a su versión genérica de manera inesperada
- cuando se habilita<b> Use system language</b>, pero no es compatible con ninguno de los
- idiomas seleccionados en las preferencias del idioma del sistema. Debería volver
- al idioma inglés estadounidense.
- <p>
- Puedes sortear este problema agregado, al menos, un idioma que sea compatible con el
- teclado de Google.
- </p>
- </li>
-</ul>
-
-<h4>Accesibilidad</h4>
-
-<ul>
- <li>TalkBack tiene problemas con características como Notificaciones, mosaicos de Quick
- Settings e imágenes en modo ventanas múltiples que pueden hacer que el sistema falle o
- que haya pocos comentarios por voz de parte de TalkBack. Estos problemas se abordarán en las
- versiones futuras de la Preview.
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">Problemas y notas específicas del dispositivo</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>En esta versión de la Preview, está previsto que ocurran errores de estabilidad y compatibilidad con aplicaciones y de reproducción de video en
- Nexus Player.
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>El cambio de tamaño en el modo de ventanas múltiples puede provocar fallos.</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Los dispositivos Nexus 9 pueden no iniciar luego de recibir una actualización inalámbrica
- mediante el Programa Android Beta. Para solventar este problema, puedes intentar
- instalar la imagen inalámbrica de forma manual. Para obtener más información, consulta
- <a href="{@docRoot}preview/download-ota.html">Aplicación de imágenes inalámbricas de dispositivo</a>.
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/es/training/articles/direct-boot.jd b/docs/html-intl/intl/es/training/articles/direct-boot.jd
new file mode 100644
index 0000000..e1d99e9
--- /dev/null
+++ b/docs/html-intl/intl/es/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=Inicio directo
+page.keywords=preview,sdk,direct boot
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>En este documento</h2>
+ <ol>
+ <li><a href="#run">Solicitar acceso para ejecutar durante el inicio directo</a></li>
+ <li><a href="#access">Acceder al almacenamiento encriptado por dispositivo</a></li>
+ <li><a href="#notification">Recibir notificaciones sobre el desbloqueo del usuario</a></li>
+ <li><a href="#migrating">Migrar datos existentes</a></li>
+ <li><a href="#testing">Probar la aplicación con reconocimiento de encriptación</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Android N se ejecuta en un modo <i>de inicio directo</i> seguro
+cuando el dispositivo se enciende pero el usuario no lo ha
+desbloqueado. Para permitir esto, el sistema brinda dos ubicaciones de almacenamiento para los datos:</p>
+
+<ul>
+<li><i>Almacenamiento encriptado por credencial: </i>es la ubicación de almacenamiento predeterminada
+y solo está disponible después de que el usuario desbloquea el dispositivo.</li>
+<li><i>Almacenamiento encriptado por dispositivo: </i>es una ubicación de almacenamiento que está disponible tanto
+durante el modo de inicio directo como después de que el usuario desbloquea el dispositivo.</li>
+</ul>
+
+<p>De forma predeterminada, las aplicaciones no se ejecutan durante el modo de inicio directo.
+Si necesitas que tu aplicación se ejecute durante el modo de inicio directo, puedes registrar
+los componentes de la aplicación que deberían ejecutarse durante este modo. Algunos casos comunes de
+aplicaciones que necesitan ejecutarse durante el modo de inicio directo incluyen los siguientes:</p>
+
+<ul>
+<li>aplicaciones que tienen notificaciones programadas, como aplicaciones
+de alarma;</li>
+<li>aplicaciones que generan notificaciones de usuario importantes, como aplicaciones de mensajes SMS;</li>
+<li>aplicaciones que brindan servicios de accesibilidad, como Talkback.</li>
+</ul>
+
+<p>Si necesitas que tu aplicación acceda a datos mientras se ejecuta el modo de inicio directo, usa
+el almacenamiento encriptado por dispositivo. Este tipo de almacenamiento contiene datos
+encriptados con una clave que solo está disponible luego de que el dispositivo haya realizado un inicio
+verificado correctamente.</p>
+
+<p>Para los datos que se deben cifrar con una clave asociada con credenciales del
+usuario, como un PIN o una contraseña, usa el almacenamiento encriptado por credencial.
+Este tipo de almacenamiento solo está disponible luego de que el usuario haya desbloqueado
+correctamente el dispositivo y hasta que el usuario reinicie nuevamente el dispositivo. Si el
+usuario habilita el bloqueo de pantalla luego de desbloquear el dispositivo, esto no bloquea
+el almacenamiento encriptado por credencial.</p>
+
+<h2 id="run">Solicitar acceso para ejecutar durante el inicio directo</h2>
+
+<p>Debes registrar los componentes de las aplicaciones con el sistema antes de que estas puedan
+ejecutarse durante el modo de inicio directo o acceder al almacenamiento encriptado por
+dispositivo. Para registrar una aplicación en el sistema, debes marcar los componentes como
+<i>"con reconocimiento de encriptación"</i>. Para marcar tu dispositivo como "con reconocimiento de encriptación", configura el atributo
+<code>android:directBootAware</code> como verdadero en el manifiesto.<p>
+
+<p>Los componentes con reconocimiento de encriptación pueden registrarse para recibir un mensaje de transmisión
+<code>LOCKED_BOOT_COMPLETED</code> del
+ sistema cuando el dispositivo se haya reiniciado. En este momento, el almacenamiento
+encriptado por dispositivo está disponible, y el componente puede ejecutar tareas que se deben
+ejecutar durante el modo de inicio directo, como disparar una alarma programada.</p>
+
+<p>El siguiente fragmento de código es un ejemplo de cómo registrar un
+{@link android.content.BroadcastReceiver} como reconocimiento de encriptación y de cómo agregar un
+filtro de intents para <code>LOCKED_BOOT_COMPLETED</code> en el manifiesto de la aplicación:</p>
+
+<pre>
+<receiver
+ android:directBootAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Una vez que el usuario haya desbloqueado el dispositivo, todos los componentes podrán acceder tanto al
+almacenamiento encriptado por dispositivo como al almacenamiento cifrado por credencial.</p>
+
+<h2 id="access">Acceder al almacenamiento encriptado por dispositivo</h2>
+
+<p>Para acceder al almacenamiento encriptado por dispositivo, crea una segunda
+instancia de {@link android.content.Context} llamando a
+<code>Context.createDeviceProtectedStorageContext()</code>. Todas las llamadas
+de API de almacenamiento que se hacen usando este contexto acceden al almacenamiento encriptado por dispositivo. El siguiente
+ejemplo accede al almacenamiento encriptado por dispositivo y abre un archivo de datos de la aplicación
+existente:</p>
+
+<pre>
+Context directBootContext = appContext.createDeviceProtectedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>Solo debes usar el almacenamiento encriptado por dispositivo para
+información que debe ser accesible durante el modo de inicio directo.
+No uses este tipo de almacenamiento como un almacenamiento encriptado de propósito general.
+Para información privada del usuario o datos encriptados que no son necesarios durante
+el modo de inicio directo, usa el almacenamiento encriptado por credencial.</p>
+
+<h2 id="notification">Recibir notificaciones sobre el desbloqueo del usuario</h2>
+
+<p>Una vez que el usuario desbloquea el dispositivo después de reiniciarlo, la aplicación puede cambiar y acceder
+al almacenamiento encriptado por credencial y usar servicios del sistema comunes que
+dependen de credenciales de usuario.</p>
+
+<p>Para recibir una notificación cuando el usuario desbloquea el dispositivo luego de reiniciarlo,
+registra un {@link android.content.BroadcastReceiver} de un componente en ejecución
+para que escuche el mensaje <code>ACTION_USER_UNLOCKED</code>. O puedes
+recibir el mensaje existente {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED}, que ahora indica que el dispositivo se ha iniciado y
+que el usuario ha desbloqueado el dispositivo.</p>
+
+<p>Puedes consultar directamente si el usuario ha desbloqueado el dispositivo llamando a
+<code>UserManager.isUserUnlocked()</code>.</p>
+
+<h2 id="migrating">Migrar datos existentes</h2>
+
+<p>Si un usuario actualiza el dispositivo para usar el modo de inicio directo, es posible que haya
+datos existentes que se deban migrar al almacenamiento encriptado por dispositivo. Usa
+<code>Context.moveSharedPreferencesFrom()</code> y
+<code>Context.moveDatabaseFrom()</code> para migrar los datos de preferencia y de base de datos
+del almacenamiento encriptado por credencial al almacenamiento encriptado por dispositivo.</p>
+
+<p>Debes tener cuidado cuando decidas qué datos migrar entre
+estos dos tipos de almacenamiento. No deberías migrar
+información de usuario privada, como contraseñas o tokens de autorización, al
+ almacenamiento encriptado por dispositivo. En algunos casos, es posible que debas gestionar
+conjuntos separados de datos en ambos tipos de almacenamiento encriptado.</p>
+
+<h2 id="testing">Probar la aplicación con reconocimiento de encriptación</h2>
+
+<p>Prueba la aplicación con reconocimiento de encriptación usando el nuevo modo de inicio directo. Hay dos
+maneras de habilitar el inicio directo.</p>
+
+<p class="caution"><strong>Advertencia:</strong> Habilitar el inicio directo
+borrará todos los datos de usuario del dispositivo.</p>
+
+<p>Para los dispositivos compatibles que tienen Android N instalado, habilita
+el inicio directo mediante una de las siguientes opciones:</p>
+
+<ul>
+<li>En el dispositivo, habilita las <b>Developer options</b> si no lo haz hecho aún
+yendo a <b>Settings > About phone</b> y presionando <b>Build number</b>
+siete veces. Una vez que aparezca la pantalla Developer options, dirígete a
+<b>Settings > Developer options</b> y selecciona
+<b>Convert to file encryption</b>.</li>
+<li>Usa los siguientes comandos shell ADB para habilitar el modo de inicio directo:
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>También está disponible un modo de inicio directo emulado en caso de que debas cambiar
+de modo en los dispositivos de prueba. El modo emulado solo debería usarse durante
+el desarrollo, y puede provocar la pérdida de datos. Para habilitar el modo de inicio directo emulado,
+debes establecer un patrón de bloqueo en el dispositivo, elegir "No thanks" si te pregunta si deseas un
+inicio seguro cuando estás estableciendo el patrón de bloqueo y, luego, usar el
+siguiente comando shell ADB:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>Para deshabilitar el modo de inicio directo emulado, usa el siguiente comando:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>Usar estos comandos provoca el reinicio del dispositivo.</p>
diff --git a/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..67f9ad6
--- /dev/null
+++ b/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd
@@ -0,0 +1,148 @@
+page.title=Acceso a directorios determinados
+page.keywords=preview,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>En este documento</h2>
+ <ol>
+ <li><a href="#accessing">Acceder a un directorio de almacenamiento externo</a></li>
+ <li><a href="#removable">Acceder a un directorio de un medio extraíble</a></li>
+ <li><a href="#best">Prácticas recomendadas</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Las aplicaciones como las aplicaciones de fotografía generalmente solo necesitan acceso a directorios de
+almacenamiento externo, como el directorio <code>Pictures</code>. Los métodos
+existentes para acceder a almacenamiento externo no están diseñados para brindar un
+acceso fácil a determinados directorios para estos tipos de aplicaciones. Por ejemplo:</p>
+
+<ul>
+<li>Solicitar {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+o {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} en tu manifiesto
+permite el acceso a todos los directorios públicos de un almacenamiento externo, lo cual podría ser
+un acceso mayor que el que necesita tu aplicación.</li>
+<li>Usar el
+<a href="{@docRoot}guide/topics/providers/document-provider.html">framework
+de acceso al almacenamiento</a> generalmente implica que el usuario seleccione directorios
+mediante un sistema de IU, lo cual no es necesario si tu aplicación siempre accede al mismo
+directorio externo.</li>
+</ul>
+
+<p>Android N brinda una API nueva y simplificada para acceder a
+ directorios de almacenamiento externo comunes. </p>
+
+<h2 id="accessing">Acceder a un directorio de almacenamiento externo</h2>
+
+<p>Usa la clase <code>StorageManager</code> para obtener la instancia de
+<code>StorageVolume</code> correcta. Luego, crea una intent llamando al
+ método <code>StorageVolume.createAccessIntent()</code> de esa instancia.
+Usa esta intención para acceder a directorios de almacenamiento externo. Para obtener una lista de
+todos los volúmenes disponibles, incluidos los volúmenes de medios extraíbles, usa
+<code>StorageManager.getVolumesList()</code>.</p>
+
+<p>Si tienes información sobre un archivo específico, usa
+<code>StorageManager.getStorageVolume(File)</code> para obtener el
+<code>StorageVolume</code> que contiene el archivo. Llama a
+<code>createAccessIntent()</code> en este <code>StorageVolume</code> para acceder al
+directorio de almacenamiento externo del archivo.</p>
+
+<p>
+En el caso de los volúmenes secundarios, como las tarjetas SD externas, pasa un valor nulo cuando llames a
+<code>StorageVolume.createAccessIntent()</code> para solicitar acceso al volumen
+ completo, en lugar de un directorio específico.
+<code>StorageVolume.createAccessIntent()</code> regresa un valor nulo si pasas un
+ valor nulo para el volumen principal o si pasas un nombre de directorio no válido.
+</p>
+
+<p>El siguiente fragmento de código es un ejemplo de cómo abrir el
+directorio <code>Pictures</code> en el almacenamiento compartido principal:</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>El sistema intenta otorgar acceso al directorio externo y, si
+es necesario, confirma el acceso con el usuario usando una IU simplificada:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>Imagen 1.</strong> Una aplicación solicitando
+acceso al directorio Pictures.</p>
+
+<p>Si el usuario otorga el acceso, el sistema llama a tu
+ anulación de <code>onActivityResult()</code> con un código resultante de
+<code>Activity.RESULT_OK</code> y datos de intents que contienen el URI. Usa
+el URI brindado para acceder a la información del directorio. Es similar a usar URI
+generados por el
+<a href="{@docRoot}guide/topics/providers/document-provider.html">framework
+de acceso al almacenamiento</a>.</p>
+
+<p>Si el usuario no otorga el acceso, el sistema llama a tu
+anulación de <code>onActivityResult()</code> con un código resultante de
+<code>Activity.RESULT_CANCELED</code> y datos de intents nulos.</p>
+
+<p class="note"><b>Nota</b>: Obtener acceso a un directorio externo específico
+también otorga el acceso a los subdirectorios de ese directorio.</p>
+
+<h2 id="removable">Acceder a un directorio de un medio extraíble</h2>
+
+<p>Para usar el acceso a directorios determinados para acceder a directorios de medios extraíbles,
+primero debes agregar un {@link android.content.BroadcastReceiver} que escuche la
+notificación{@link android.os.Environment#MEDIA_MOUNTED}, por ejemplo:</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Cuando el usuario conecta un medio extraíble, como una tarjeta SD, el sistema envía una
+notificación{@link android.os.Environment#MEDIA_MOUNTED}. Esta notificación
+brinda un objeto <code>StorageVolume</code> en los datos de intents que puedes
+usar para acceder a directorios del medio extraíble. El siguiente ejemplo
+accede al directorio <code>Pictures</code> de medios extraíbles:</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">Prácticas recomendadas</h2>
+
+<p>Cuando sea posible, sigue usando el URI de acceso a directorios externos de modo que no tengas
+que solicitarle acceso al usuario continuamente. Una vez que el usuario haya otorgado el acceso, llama a
+<code>getContentResolver().takePersistableUriPermssion()</code> con el
+URI de acceso a directorios. El sistema continuará el URI, y las siguientes solicitudes
+de acceso generarán <code>RESULT_OK</code> y no le mostrarán una IU de confirmación al
+usuario.</p>
+
+<p>Si el usuario deniega el acceso a un directorio externo, no vuelvas a solicitar el
+acceso inmediatamente. Hacer esto provocaría una mala experiencia
+de usuario. Si el usuario deniega una solicitud y la aplicación solicita acceso
+ nuevamente, aparece la casilla de verificación <b>Don't ask again</b> en la IU:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>Figura 1.</strong> Una aplicación que presenta una
+segunda solicitud para obtener acceso a medios extraíbles.</p>
+
+<p>Si el usuario selecciona <b>Don't ask again</b> y deniega la solicitud, todas las
+solicitudes futuras que presente la aplicación para el directorio determinado se denegarán
+ automáticamente, y el usuario no recibirá ninguna IU de solicitud.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/training/articles/security-config.jd b/docs/html-intl/intl/es/training/articles/security-config.jd
new file mode 100644
index 0000000..7deadbe
--- /dev/null
+++ b/docs/html-intl/intl/es/training/articles/security-config.jd
@@ -0,0 +1,747 @@
+page.title=Configuración de seguridad de la red
+page.keywords=androidn,security,network
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>En este documento</h2>
+<ol>
+ <li><a href="#manifest">Agregar un archivo de configuración de seguridad</a></li>
+ <li><a href="#CustomTrust">Personalizar las CA de confianza</a>
+ <ol>
+ <li><a href="#ConfigCustom">Configurar una CA de confianza personalizada</a></li>
+ <li><a href="#LimitingCas">Limitar el conjunto de CA de confianza</a></li>
+ <li><a href="#TrustingAdditionalCas">Otorgar confianza a CA adicionales</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">CA de solo depuración</a></li>
+ <li><a href="#UsesCleartextTraffic">Desactivar el tráfico de Cleartext</a></li>
+ <li><a href="#CertificatePinning">Fijar certificados</a></li>
+ <li><a href="#ConfigInheritance">Comportamiento de herencia de configuración</a></li>
+ <li><a href="#FileFormat">Formato del archivo de configuración</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N incluye una función de configuración de seguridad de la red
+ que les permite a las aplicaciones personalizar los ajustes de seguridad de la red mediante un archivo
+ de configuración declarativo seguro sin que haya que modificar el código de la aplicación. Estos ajustes se pueden
+ configurar para dominios específicos y para una aplicación específica. Las capacidades
+ clave de esta función son las siguientes:
+</p>
+
+<ul>
+ <li>
+ <b>Anclajes de confianza personalizados:</b> personalizar qué autoridades de certificado (CA)
+ son de confianza para las conexiones de seguridad de una aplicación. Por ejemplo,
+ confiar en certificados autofirmados particulares
+ o restringir el conjunto de CA públicas en las que confía la aplicación.
+ </li>
+
+ <li>
+ <b>Anulaciones de solo depuración:</b> depurar de forma segura conexiones
+ de una aplicación sin riesgos adicionales para la base instalada.
+ </li>
+
+ <li>
+ <b>Desactivación del tráfico de Cleartext:</b> proteger a las aplicaciones del
+ uso accidental de tráfico de Cleartext.
+ </li>
+
+ <li>
+ <b>Fijación de certificados:</b> restringir la conexión segura de una aplicación
+ a certificados en particular.
+ </li>
+</ul>
+
+
+<h2 id="manifest">Agregar un archivo de configuración de seguridad</h2>
+
+<p>
+ La función de configuración de seguridad de la red usa un archivo XML donde
+ se especifican los ajustes para la aplicación. Debes incluir una entrada en el manifiesto de tu
+ aplicación que apunte a este archivo. El siguiente fragmento de código de un manifiesto
+ demuestra cómo crear esta entrada:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application ... >
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">Personalizar las CA de confianza</h2>
+
+<p>
+ Una aplicación podría querer otorgar confianza a un conjunto personalizado de CA en lugar de hacerlo según los ajustes
+ predeterminados de la plataforma. Las razones más comunes son las siguientes:
+</p>
+
+<ul>
+ <li>Conectarse a un host con una autoridad de certificado personalizada (autofirmado,
+ emitido por una CA corporativa interna, etc.).
+ </li>
+
+ <li>Limitar el conjunto de CA a CA de confianza establecidas por el usuario y no a cada
+ CA preinstalada.
+ </li>
+
+ <li>Otorgar confianza a CA adicionales que no están incluidas en el sistema
+ </li>
+</ul>
+
+<p>
+ De forma predeterminada, las conexiones seguras (p. ej.: TLS, HTTP) de todas las aplicaciones dependen de
+ las CA preinstaladas del sistema; las aplicaciones que tienen como objetivo a la API nivel 23
+ (Android M) e inferiores también dependen de la tienda de CA agregada por el usuario de forma predeterminada. Una
+ aplicación puede personalizar sus propias conexiones usando {@code base-config} (para
+ la personalización de toda la aplicación) o {@code domain-config} (para la personalización
+ por dominio).
+</p>
+
+
+<h3 id="ConfigCustom">Configurar una CA de confianza personalizada</h3>
+
+<p>
+ Supongamos que deseas conectarte a tu host, el cual usa un certificado SSL
+ autofirmado, o a un host cuyo certificado SSL está emitido por una CA no pública
+ en la cual confías, como la CA interna de tu empresa.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Agrega el certificado de CA autofirmado o no público, en formato PEM o DER, a
+ {@code res/raw/my_ca}.
+</p>
+
+
+<h3 id="LimitingCas">Limitar el conjunto de CA de confianza</h3>
+
+<p>
+ Una aplicación que no desee confiar en todas las CA en que confía el sistema puede,
+ en su lugar, especificar su propio conjunto reducido de CA en las que confía. Esto protege a la aplicación
+ de certificados fraudulentos emitidos por cualquiera de las demás CA.
+</p>
+
+<p>
+ La configuración para limitar el conjunto de CA de confianza es similar a <a href="#TrustingACustomCa">confiar en una CA personalizada</a> para un dominio específico, con la diferencia
+ de que se brindan múltiples CA en el recurso.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Agrega las CA de confianza, en formato PEM o DER, a {@code res/raw/trusted_roots}.
+ Ten en cuenta que, si usas el formato PEM, el archivo debe incluir <em>solo</em> datos PEM
+ y ningún texto adicional. También puedes brindar elementos
+<a href="#certificates"><code><certificates></code></a>
+ múltiples en lugar de solo uno.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ Otorgar confianza a CA adicionales
+</h3>
+
+<p>
+ Una aplicación podría querer otorgar confianza a CA adicionales en las cuales el sistema no confía,
+ ya sea porque el sistema aún no incluye la CA o porque la CA no
+ cumple con los requisitos de inclusión del sistema Android. La
+ aplicación puede hacerlo especificando múltiples fuentes de certificado para una
+ configuración.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">Configurar las CA para depuración</h2>
+
+<p>
+ Cuando depuras una aplicación que se conecta mediante HTTPS, podrías querer
+ conectarte a un servidor de desarrollo local que no tiene el certificado
+ SSL de tu servidor de producción. Para poder hacerlo sin
+ tener que modificar el código de tu aplicación, puedes especificar CA de solo depuración que
+ solo <i>son</i> de confianza cuando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ es {@code true} usando {@code debug-overrides}. Generalmente, las herramientas de IDE
+ y de compilación configuran esta marca automáticamente para las compilaciones que no son de lanzamiento.
+</p>
+
+<p>
+ Esto es más seguro que el código condicional habitual ya que, como precaución
+ de seguridad, las tiendas de aplicaciones no aceptan aplicaciones que están marcadas
+ como depurables.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">Desactivar el tráfico de Cleartext</h2>
+
+<p>
+ Las aplicaciones que deseen conectarse a destinos usando solo conexiones
+ seguras pueden desactivar Cleartext (usando el protocolo
+ HTTP no encriptado en lugar del protocolo HTTPS) para esos destinos. Esta opción ayuda a prevenir
+ las regresiones accidentales en aplicaciones debido a cambios en direcciones URL generados por fuentes
+ externas como servidores backend.
+ Consulta {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()} para obtener más información.
+</p>
+
+<p>
+ Por ejemplo, una aplicación puede querer garantizar que todas las conexiones a {@code
+secure.example.com} se hagan siempre mediante HTTPS para proteger el tráfico sensible
+ de redes hostiles.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">Fijar certificados</h2>
+
+<p>
+ Generalmente, una aplicación otorga confianza a todas las CA preinstaladas. Si alguna de estas CA emitiera
+ un certificado fraudulento, la aplicación estaría en riesgo de sufrir un ataque
+ MiTM. Algunas aplicaciones eligen limitar el conjunto de certificados que aceptan
+ ya sea limitando el conjunto de CA al que otorgan confianza o fijando certificados.
+</p>
+
+<p>
+ La fijación de certificados se hace brindando un conjunto de certificados por hash de la
+ clave pública (SubjectPublicKeyInfo del certificado X.509). De este modo,
+ una cadena de certificados solo es válida si contiene al menos una de
+ las claves públicas fijadas.
+</p>
+
+<p>
+ Ten en cuenta que, cuando uses la fijación de certificados, siempre debes incluir una clave
+ de respaldo para que, si te ves obligado a cambiar a claves nuevas o a cambiar de CA (cuando
+ fijas un certificado de CA o un intermediario de esa CA), la conectividad
+ de la aplicación no se vea afectada. Si no, deberás actualizar
+ la aplicación para recuperar la conectividad.
+</p>
+
+<p>
+ Además, se puede configurar un tiempo de expiración para las fijaciones,
+ luego del cual las fijaciones dejan de realizarse. Esto ayuda a evitar los problemas de conectividad
+ en aplicaciones que no se han actualizado. Sin embargo, configurar un tiempo de expiración
+ para las fijaciones puede habilitar la omisión de fijaciones.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">Comportamiento de herencia de configuración</h2>
+
+<p>
+ Los valores que no se establecen en una configuración específica se heredan. Este comportamiento permite configuraciones
+ más complejas y un archivo de configuración de fácil lectura.
+</p>
+
+<p>
+ Si no se establece un valor en una entrada específica, se usa el valor de
+ la siguiente entrada más general. Los valores no establecidos en una {@code domain-config} se
+ toman de la {@code domain-config} primaria, si están anidados, o de la {@code
+base-config}, si no están anidados. Los valores no establecidos en la {@code base-config} usan
+ los valores predeterminados de la plataforma.
+</p>
+
+<p>
+ Por ejemplo, cuando todas las conexiones a subdominios de {@code
+example.com} deben usar un conjunto personalizado de CA. Además, el tráfico de Cleartext a
+ estos dominios se permite <em>excepto</em> con las conexiones a {@code
+ secure.example.com}. Anidando la configuración para {@code
+secure.example.com} dentro de la configuración para {@code example.com},
+ {@code trust-anchors} no necesita duplicación.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">Formato del archivo de configuración</h2>
+
+<p>
+ La función de configuración de seguridad de la red usa un formato de archivo XML.
+ La estructura general del archivo se muestra en el siguiente ejemplo de código:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ Las siguientes secciones describen la sintaxis y otros detalles del formato
+ de archivo.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ PUEDE CONTENER:
+ </dt>
+
+ <dd>
+ 0 o 1 de <code><a href="#base-config"><base-config></a></code><br>
+ Cualquier cantidad de <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 o 1 de <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ SINTAXIS:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ PUEDE CONTENER:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ DESCRIPCIÓN:
+ </dt>
+
+ <dd>
+ La configuración predeterminada usada por todas las conexiones cuyo destino no
+ está cubierto por una <a href="#domain-config"><code>domain-config</code></a>.
+
+<p>
+ Los valores que no están configurados usan los valores predeterminados de la plataforma. La configuración predeterminada
+ para aplicaciones con API nivel 24 o superior es:
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+La configuración predeterminada para aplicaciones con API nivel 23 o inferior es:
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>SINTAXIS:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>PUEDE CONTENER:</dt>
+
+<dd>
+1 o más <code><a href="#domain"><domain></a></code>
+<br/>0 o 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 o 1 <code><a href="#pin-set"><pin-set></code></a>
+<br/>Cualquier cantidad de <code><domain-config></code> anidadas</dd>
+
+<dt>DESCRIPCIÓN</dt>
+<dd>Configuración usada para conexiones con destinos específicos, como los definidos por elementos de {@code domain}.
+
+<p>Ten en cuenta que, si múltiples elementos de {@code domain-config} cubren un destino, la configuración con la regla de coincidencia de dominio más específica (más larga)
+ es la que se usa.</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ SINTAXIS:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ ATRIBUTOS:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ Si es {@code "true"}, esta regla de dominio coincide con el dominio
+ y con todos los subdominios, incluidos los subdominios de subdominios. Si no, la regla
+ solo se aplica a coincidencias exactas.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ DESCRIPCIÓN:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ sintaxis:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ PUEDE CONTENER:
+ </dt>
+
+ <dd>
+ 0 o 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ DESCRIPCIÓN:
+ </dt>
+
+ <dd>
+ Sobrescrituras que se deben aplicar cuando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ es {@code "true"}, que es, generalmente, el caso de las compilaciones que no sean de lanzamiento
+ generadas por herramientas de IDE y de compilación. Los anclajes de confianza especificados en {@code
+ debug-overrides} se agregan a todas las demás configuraciones, y la fijación
+ de certificados no se lleva a cabo cuando la cadena de certificados del servidor usa uno de estos
+ anclajes de confianza de solo depuración. Si <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ es {@code "false"}, entonces, esta sección se omite por completo.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ SINTAXIS:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ PUEDE CONTENER:
+ </dt>
+
+ <dd>
+ Cualquier cantidad de <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ DESCRIPCIÓN:
+ </dt>
+
+ <dd>
+ Conjunto de anclajes de confianza para conexiones seguras.
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>SINTAXIS:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>DESCRIPCIÓN:</dt>
+<dd>Conjunto de certificados X.509 para elementos de {@code trust-anchors}.</dd>
+
+<dt>ATRIBUTOS:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+La fuente de los certificados de CA puede ser una de las siguientes opciones:
+<ul>
+ <li>Una ID de recurso sin procesar que apunta a un archivo que contiene certificados X.509.
+ Los certificados deben estar codificados en formato DER o PEM. En el caso de los certificados
+ PEM, el archivo <em>no debe</em> contener datos adicionales que no sean de PEM, como
+ comentarios.
+ </li>
+
+ <li>{@code "system"} para los certificados de CA preinstalados del sistema.
+ </li>
+
+ <li>{@code "user"} para los certificados de CA agregados por el usuario.
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ Especifica si las CA de esta fuente omiten la fijación de certificados. Si es {@code
+"true"}, las cadenas de certificados se encadenan mediante una de estas CA
+ desde esta fuente, y la fijación no se lleva a cabo. Esto puede ser útil para CA de depuración
+ o para poder permitirle al usuario hacer un ataque MiTM al tráfico seguro de la aplicación.
+ </p>
+
+ <p>
+ Es {@code "false"} de forma predeterminada, a menos que se especifique en un elemento de {@code debug-overrides}
+, en cuyo caso, es {@code "true"} de forma predeterminada.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ SINTAXIS:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ PUEDE CONTENER:
+ </dt>
+
+ <dd>
+ Cualquier cantidad de <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ DESCRIPCIÓN:
+ </dt>
+
+ <dd>
+ Un conjunto de fijaciones de claves públicas. Para que una conexión segura sea de confianza, una de las
+ claves públicas de la cadena de confianza debe estar en el conjunto de fijaciones. Consulta
+ <code><a href="#pin"><pin></a></code> para el formato de las fijaciones.
+ </dd>
+
+ <dt>
+ ATRIBUTOS:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ La fecha, en formato {@code yyyy-MM-dd}, a partir de la cual
+ expiran las fijaciones, lo cual deshabilita la fijación. Si el atributo no está establecido, las fijaciones
+ no expiran.
+ <p>
+ La expiración ayuda a evitar problemas de conectividad en aplicaciones que no
+ reciben actualizaciones para el conjunto de fijaciones, por ejemplo, porque el usuario
+ deshabilitó las actualizaciones de la aplicación.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ sintaxis:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ ATRIBUTOS:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ Resumen del algoritmo usado para generar la fijación. Actualmente, solo se admite
+ {@code "SHA-256"}.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/es/training/basics/network-ops/data-saver.jd b/docs/html-intl/intl/es/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..d1d6c34
--- /dev/null
+++ b/docs/html-intl/intl/es/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,234 @@
+page.title=Ahorro de datos
+metaDescription=User-enabled data usage optimization.
+page.keywords="android N", "data usage", "metered network"
+page.image=images/cards/card-nyc_2x.jpg
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ En este documento
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#status">Verificación de las preferencias de ahorro de datos</a>
+ <ol>
+ <li>
+ <a href="#request-whitelist">Solicitud de permisos de lista blanca</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#monitor-changes">Control de cambios en las preferencias
+ de ahorro de datos</a>
+ </li>
+
+ <li>
+ <a href="#testing">Pruebas con comandos de Android Debug Bridge</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Durante la vida útil de un smartphone, el costo de un plan de datos móviles puede
+ superar fácilmente el costo del propio dispositivo. En la versión N Developer Preview, los usuarios pueden
+ habilitar el ahorro de datos en todo el dispositivo a fin de reducir el uso de datos, ya sea con
+ servicio de itinerancia, cerca del final del ciclo de facturación o con un pequeño paquete de datos prepago.
+</p>
+
+<p>
+ Cuando un usuario habilita el ahorro de datos en <strong>Settings</strong> y el dispositivo está conectado
+ a una red de uso medido, el sistema bloquea el uso de datos en segundo plano y envía señales
+ a las aplicaciones para que utilicen menos datos en primer plano siempre que sea posible. Los usuarios pueden
+ incluir aplicaciones específicas en la lista blanca para permitir el uso de datos medidos en segundo plano, incluso cuando está activado el ahorro
+ de datos.
+</p>
+
+<p>
+ La N Developer Preview extiende la API {@link android.net.ConnectivityManager}
+ para que las aplicaciones puedan <a href="#status">recuperar las preferencias de
+ ahorro de datos del usuario</a> y <a href="#monitor-changes">controlar
+ los cambios en las preferencias</a>. Se considera una buena práctica que las aplicaciones verifiquen si el
+ usuario habilitó el ahorro de datos y se esfuercen por reducir el uso de datos en primer
+ y segundo plano.
+</p>
+
+<h2 id="status">
+ Verificación de las preferencias de ahorro de datos
+</h2>
+
+<p>
+ En la N Developer Preview, las aplicaciones pueden utilizar la API {@link
+ android.net.ConnectivityManager} para determinar qué restricciones
+ de uso de datos se aplican. Mediante el método {@code getRestrictBackgroundStatus()}
+, se devuelve uno de los siguientes valores:
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ El ahorro de datos está inhabilitado.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ El usuario habilitó el ahorro de datos para esta aplicación. Las aplicaciones deben esforzarse por reducir
+ el uso de datos en primer plano y manejar correctamente las restricciones para
+ el uso de datos en segundo plano.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ El usuario habilitó el ahorro de datos, pero la aplicación se encuentra en la lista blanca. Las aplicaciones aún deben
+ esforzarse por reducir el uso de datos en primer y segundo plano.
+ </dd>
+</dl>
+
+<p>
+ Se considera una buena práctica limitar el uso de datos siempre que el dispositivo esté
+ conectado a una red de uso medido, incluso si el ahorro de datos está deshabilitado o la aplicación
+ se encuentra en la lista blanca. El siguiente código de muestra utiliza {@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} y {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} para determinar la cantidad de datos
+ que la aplicación debe utilizar:
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ Solicitud de permisos de lista blanca
+</h3>
+
+<p>
+ Si la aplicación necesita utilizar datos en segundo plano, esta puede solicitar permisos de
+ lista blanca mediante el envío de una intent
+ <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
+ que contenga un URI del nombre de paquete de la aplicación, como por ejemplo,
+ <code>package:MY_APP_ID</code>.
+</p>
+
+<p>
+ Mediante el envío de la intent y el URI, se inicia la aplicación <strong>Settings</strong> y
+ se muestra la configuración de uso de datos para la aplicación. El usuario luego puede decidir si
+ habilita los datos en segundo plano para la aplicación. Antes de enviar esta intent, resulta
+ buena práctica consultarle primero al usuario acerca de si desea iniciar la aplicación
+ <strong>Settings</strong> con el objetivo de habilitar el uso de datos
+ en segundo plano.
+</p>
+
+<h2 id="monitor-changes">
+ Control de cambios en las preferencias de ahorro de datos
+</h2>
+
+<p>
+ Las aplicaciones pueden controlar los cambios en las preferencias de ahorro de datos mediante la creación de un {@link
+ android.content.BroadcastReceiver} para escuchar {@code
+ ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} y mediante un registro
+ dinámico del receptor con {@link android.content.Context#registerReceiver
+ Context.registerReceiver()}. Cuando una aplicación recibe esta transmisión, debe
+ <a href="#status">verificar si las nuevas preferencias de ahorro de datos afectan los
+ permisos; para ello,</a> la aplicación debe llamar a {@code
+ ConnectivityManager.getRestrictBackgroundStatus()}.
+</p>
+
+<p class="note">
+ <strong>Nota:</strong> El sistema únicamente envía esta transmisión a las aplicaciones que
+ se registran dinámicamente para recibirla con {@link
+ android.content.Context#registerReceiver Context.registerReceiver()}. Las aplicaciones
+ que en su manifiesto registran que la reciben no la
+ recibirán.
+</p>
+
+<h2 id="testing">
+ Pruebas con comandos de Android Debug Bridge
+</h2>
+
+<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
+ofrece algunos comandos que puedes utilizar para verificar y configurar los permisos
+de red:
+
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ Se genera un informe en el que se incluyen la configuración global actual de restricciones de red
+ en segundo plano, los UID de paquetes que se encuentran actualmente en una lista blanca y los permisos
+ de red de otros paquetes conocidos.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ Se muestra una lista completa de los comandos del administrador de políticas de red (políticas de red).
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ Se habilita o deshabilita el modo de ahorro de datos cuando se asignan los valores <code>true</code> o
+ <code>false</code>, respectivamente.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Se agrega el UID del paquete específico a la lista blanca para permitir el uso de datos
+ medidos en segundo plano.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Se quita el UID del paquete específico de la lista blanca para bloquear el uso de datos
+ medidos en segundo plano mientras el ahorro de datos está habilitado.
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/es/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/es/training/monitoring-device-state/battery-monitoring.jd
index 08a42dd..cfccdab0 100644
--- a/docs/html-intl/intl/es/training/monitoring-device-state/battery-monitoring.jd
+++ b/docs/html-intl/intl/es/training/monitoring-device-state/battery-monitoring.jd
@@ -7,8 +7,8 @@
next.link=docking-monitoring.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>En esta sección puedes aprender:</h2>
@@ -24,9 +24,9 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Intentos y filtros de intentos</a>
</ul>
-</div>
</div>
-
+</div>
+
<p>Al modificar la frecuencia de las actualizaciones en segundo plano para reducir el efecto de las mismas en la duración de la batería, te recomendamos que comiences por comprobar el estado de carga y el nivel actual de la batería.</p>
<p>El impacto derivado de actualizar aplicaciones en la duración de la batería varía en función del nivel de batería y del estado de carga del dispositivo, mientras que es insignificante cuando este está conectado a la corriente. Por ello, en la mayoría de los casos, puedes maximizar la frecuencia de actualización cuando el dispositivo esté conectado a un cargador. Por el contrario, si el dispositivo está en proceso de descarga, disminuir la frecuencia de actualización te permitirá aumentar la duración de la batería.</p>
@@ -34,8 +34,8 @@
<p>Del mismo modo, puedes comprobar el nivel de carga de la batería y reducir la frecuencia de las actualizaciones o incluso detenerlas cuando la batería esté a punto de agotarse.</p>
-<h2 id="DetermineChargeState">Cómo determinar el estado de carga actual</h2>
-
+<h2 id="DetermineChargeState">Cómo determinar el estado de carga actual</h2>
+
<p>En primer lugar, te recomendamos que determines el estado de carga actual. {@link android.os.BatteryManager} envía los detalles de carga y de la batería en un {@link android.content.Intent} persistente que incluye el estado de carga.</p>
<p>Se trata de un intento persistente, por lo que no es necesario registrar un {@link android.content.BroadcastReceiver}. Para ello, solo tienes que ejecutar {@code registerReceiver} transmitiendo {@code null} como el receptor (como se muestra en el siguiente fragmento). A continuación, se devuelve el intento de estado actual de la batería. Puedes transmitir un objeto {@link android.content.BroadcastReceiver} real, pero hablaremos sobre las actualizaciones en otra sección, por lo que no es necesario ahora.</p>
@@ -58,7 +58,7 @@
<p>Normalmente, debes maximizar la frecuencia de las actualizaciones en segundo plano si el dispositivo está conectado a un cargador de corriente alterna, disminuir esa frecuencia si se utiliza un cargador USB y reducirla aún más si la batería se está descargando.</p>
-<h2 id="MonitorChargeState">Cómo supervisar los cambios en el estado de carga</h2>
+<h2 id="MonitorChargeState">Cómo supervisar los cambios en el estado de carga</h2>
<p>Modificar el estado de carga es tan fácil como conectar el dispositivo a un enchufe o USB. Por ello, es importante que supervises el estado de carga por si se producen cambios y modifiques la frecuencia de actualización según corresponda.</p>
@@ -75,11 +75,11 @@
<pre>public class PowerConnectionReceiver extends BroadcastReceiver {
@Override
- public void onReceive(Context context, Intent intent) {
+ public void onReceive(Context context, Intent intent) {
int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
status == BatteryManager.BATTERY_STATUS_FULL;
-
+
int chargePlug = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
boolean usbCharge = chargePlug == BATTERY_PLUGGED_USB;
boolean acCharge = chargePlug == BATTERY_PLUGGED_AC;
@@ -87,7 +87,7 @@
}</pre>
-<h2 id="CurrentLevel">Cómo determinar el nivel de batería actual</h2>
+<h2 id="CurrentLevel">Cómo determinar el nivel de batería actual</h2>
<p>En algunos casos, también es útil determinar el nivel de batería actual. Puedes disminuir la frecuencia de las actualizaciones en segundo plano si el nivel de carga de la batería es inferior a un valor determinado.</p>
@@ -99,7 +99,7 @@
float batteryPct = level / (float)scale;</pre>
-<h2 id="MonitorLevel">Cómo supervisar cambios importantes en el nivel de batería</h2>
+<h2 id="MonitorLevel">Cómo supervisar cambios importantes en el nivel de batería</h2>
<p>No puedes controlar el estado de la batería de forma continua fácilmente, pero tampoco es necesario.</p>
diff --git a/docs/html-intl/intl/es/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/es/training/monitoring-device-state/connectivity-monitoring.jd
index 2a5ff12..b76b812 100644
--- a/docs/html-intl/intl/es/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html-intl/intl/es/training/monitoring-device-state/connectivity-monitoring.jd
@@ -11,7 +11,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>En esta sección puedes aprender:</h2>
@@ -27,7 +27,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Intentos y filtros de intentos</a>
</ul>
-</div>
+</div>
</div>
<p>Algunos de los usos más comunes para las alarmas con repetición y los servicios en segundo plano es programar actualizaciones regulares de los datos de aplicaciones a partir de recursos de Internet, almacenar datos en la memoria caché o ejecutar descargas a largo plazo. Sin embargo, si no estás conectado a Internet o la conexión es demasiado débil para completar la descarga, ¿para qué activar el dispositivo y programar la actualización?</p>
@@ -35,18 +35,18 @@
<p>Puedes utilizar {@link android.net.ConnectivityManager} para comprobar si estás conectado a Internet y, en ese caso, el tipo de conexión que estás utilizando.</p>
-<h2 id="DetermineConnection">Cómo determinar si tienes conexión a Internet</h2>
-
+<h2 id="DetermineConnection">Cómo determinar si tienes conexión a Internet</h2>
+
<p>No es necesario programar una actualización basada en un recurso de Internet si no estás conectado. En el fragmento que aparece a continuación, se muestra cómo utilizar {@link android.net.ConnectivityManager} para consultar la red activa y determinar si hay conexión a Internet.</p>
<pre>ConnectivityManager cm =
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
-<h2 id="DetermineType">Cómo determinar el tipo de conexión a Internet</h2>
+<h2 id="DetermineType">Cómo determinar el tipo de conexión a Internet</h2>
<p>También puedes determinar el tipo de conexión a Internet que hay disponible.</p>
@@ -59,7 +59,7 @@
<p>Cuando hayas inhabilitado las actualizaciones, es importante que detectes si se hay cambios en la conectividad para poder reanudarlas cuando se haya establecido una conexión a Internet.</p>
-<h2 id="MonitorChanges">Cómo supervisar los cambios en la conectividad</h2>
+<h2 id="MonitorChanges">Cómo supervisar los cambios en la conectividad</h2>
<p>{@link android.net.ConnectivityManager} emite la acción {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION} ({@code "android.net.conn.CONNECTIVITY_CHANGE"}) cuando se han modificado los detalles de la conectividad. Puedes registrar un receptor de emisión en el archivo de manifiesto para detectar estos cambios y reanudar (o cancelar) las actualizaciones en segundo plano según corresponda.</p>
diff --git a/docs/html-intl/intl/es/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/es/training/monitoring-device-state/docking-monitoring.jd
index d612281..bede4e2 100644
--- a/docs/html-intl/intl/es/training/monitoring-device-state/docking-monitoring.jd
+++ b/docs/html-intl/intl/es/training/monitoring-device-state/docking-monitoring.jd
@@ -10,7 +10,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>En esta sección puedes aprender:</h2>
@@ -26,7 +26,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Intentos y filtros de intentos</a>
</ul>
-</div>
+</div>
</div>
<p>Los dispositivos Android se pueden conectar a distintos tipos de conectores. Por ejemplo, se puede utilizar conectores para coche o domésticos y tanto digitales como analógicos. Normalmente, el estado del conector está vinculado al estado de carga, ya que muchos conectores cargan el dispositivo mientras está conectado.</p>
@@ -36,8 +36,8 @@
<p>El estado del conector se emite también como un {@link android.content.Intent} persistente, lo que te permite consultar si el dispositivo está conectado o no y, si lo está, determinar el tipo de conector.</p>
-<h2 id="CurrentDockState">Cómo determinar el estado de conexión actual</h2>
-
+<h2 id="CurrentDockState">Cómo determinar el estado de conexión actual</h2>
+
<p>La información sobre el estado del conector se incluye como información adicional en una emisión persistente de la acción {@link android.content.Intent#ACTION_DOCK_EVENT}. Por ello, no es necesario registrar un {@link android.content.BroadcastReceiver}. Solo tienes que ejecutar {@link android.content.Context#registerReceiver registerReceiver()} transmitiendo {@code null} como el receptor de emisión, como se muestra en el fragmento de código que aparece a continuación.</p>
<pre>IntentFilter ifilter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
@@ -49,9 +49,9 @@
boolean isDocked = dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED;</pre>
-<h2 id="DockType">Cómo determinar el tipo de conector actual</h2>
+<h2 id="DockType">Cómo determinar el tipo de conector actual</h2>
-<p>Si un dispositivo está insertado en un conector, se puede conectar a cualquiera de estos cuatro tipos de conectores:
+<p>Si un dispositivo está insertado en un conector, se puede conectar a cualquiera de estos cuatro tipos de conectores:
<ul><li>coche,</li>
<li>escritorio,</li>
<li>escritorio de gama baja (analógico),</li>
@@ -60,12 +60,12 @@
<p>Ten en cuenta que las últimas dos opciones se introdujeron en Android únicamente en el nivel 11 del API. Por ello, te recomendamos que compruebes las tres opciones solo cuando te interese más el tipo de conector que si se trata de un conector digital o analógico:</p>
<pre>boolean isCar = dockState == EXTRA_DOCK_STATE_CAR;
-boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
+boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
dockState == EXTRA_DOCK_STATE_LE_DESK ||
dockState == EXTRA_DOCK_STATE_HE_DESK;</pre>
-<h2 id="MonitorDockState">Cómo supervisar los cambios en el tipo de conector o en el estado del mismo</h2>
+<h2 id="MonitorDockState">Cómo supervisar los cambios en el tipo de conector o en el estado del mismo</h2>
<p>Cuando el dispositivo está conectado a un conector o desconectado del mismo, se emite la acción {@link android.content.Intent#ACTION_DOCK_EVENT}. Para controlar los cambios que se produzcan en el estado del conector del dispositivo, solo tienes que registrar un receptor de emisión en el archivo de manifiesto de la aplicación, como se muestra en el fragmento que aparece a continuación:</p>
diff --git a/docs/html-intl/intl/es/training/monitoring-device-state/index.jd b/docs/html-intl/intl/es/training/monitoring-device-state/index.jd
index bf6b1c1..12fcae7 100644
--- a/docs/html-intl/intl/es/training/monitoring-device-state/index.jd
+++ b/docs/html-intl/intl/es/training/monitoring-device-state/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
-<h2>Dependencias y requisitos previos</h2>
+<h2>Dependencias y requisitos previos</h2>
<ul>
<li>Android 2.0 (nivel 5 del API) o superior</li>
<li>Experiencia con <a href="{@docRoot}guide/components/intents-filters.html">Intentos y filtros de intentos</a></li>
@@ -21,19 +21,19 @@
<li><a href="{@docRoot}guide/components/services.html">Servicios</a>
</ul>
-</div>
+</div>
</div>
<p>Uno de los objetivos de tu aplicación debe ser limitar su impacto en la duración de la batería del dispositivo en el que esté instalada. Después de leer estas secciones, podrás desarrollar aplicaciones que optimizarán el uso de la batería en función del estado del dispositivo en el que estén instaladas.</p>
<p>Al tomar medidas como inhabilitar las actualizaciones de servicios en segundo plano o disminuir la frecuencia de dichas actualizaciones cuando el nivel de batería sea bajo, puedes garantizar que se minimice el impacto de tu aplicación en la duración de la batería sin afectar a la experiencia del usuario.</p>
-<h2>Secciones</h2>
-
+<h2>Secciones</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
+will want to jump to a lesson or not.-->
+
<dl>
<dt><b><a href="battery-monitoring.html">Cómo controlar el nivel de batería y el estado de carga</a></b></dt>
<dd>Obtén más información sobre cómo determinar y controlar el nivel de batería actual y los cambios en el estado de carga para modificar la frecuencia de actualizaciones en segundo plano de tu aplicación.</dd>
@@ -46,4 +46,4 @@
<dt><b><a href="manifest-receivers.html">Cómo manipular los receptores de emisión bajo demanda</a></b></dt>
<dd>Los receptores de emisión que declaras en el archivo de manifiesto se pueden alternar durante la ejecución para inhabilitar los que no son necesarios debido al estado actual del dispositivo. Obtén más información sobre cómo alternar y superponer receptores de cambio de estado para mejorar el rendimiento y cómo posponer acciones hasta que el dispositivo se encuentre en un estado concreto.</dd>
-</dl>
\ No newline at end of file
+</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/es/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/es/training/monitoring-device-state/manifest-receivers.jd
index a90468e..0be198c 100644
--- a/docs/html-intl/intl/es/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html-intl/intl/es/training/monitoring-device-state/manifest-receivers.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>En esta sección puedes aprender:</h2>
@@ -23,7 +23,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Intentos y filtros de intentos</a>
</ul>
-</div>
+</div>
</div>
<p>La forma más sencilla de controlar los cambios en el estado del dispositivo es crear un {@link android.content.BroadcastReceiver} para cada estado que vayas a controlar y registrar cada uno de ellos en el archivo de manifiesto de tu aplicación. A continuación, en cada uno de esos receptores solo tienes que volver a programar las alarmas recurrentes en función del estado actual del dispositivo.</p>
@@ -31,10 +31,10 @@
<p>Un efecto secundario de este método es que tu aplicación activará el dispositivo siempre que uno de los receptores se active (probablemente, con más frecuencia de la necesaria).</p>
<p>Te recomendamos que inhabilites o habilites los receptores de emisión en el momento de la ejecución. De este modo, puedes utilizar los receptores que hayas declarado en el archivo de manifiesto como alarmas pasivas que se activan mediante los eventos del sistema solo cuando es necesario.</p>
-
-<h2 id="ToggleReceivers">Cómo alternar y superponer receptores de cambio de estado para mejorar el rendimiento </h2>
-
+
+<h2 id="ToggleReceivers">Cómo alternar y superponer receptores de cambio de estado para mejorar el rendimiento </h2>
+
<p>Se puede utilizar el {@link android.content.pm.PackageManager} para alternar el estado habilitado en cualquier componente definido en el archivo de manifiesto, incluidos los receptores de emisión que quieras habilitar o inhabilitar, como se muestra en el fragmento que aparece a continuación:</p>
<pre>ComponentName receiver = new ComponentName(context, myReceiver.class);
diff --git a/docs/html-intl/intl/es/training/multiscreen/adaptui.jd b/docs/html-intl/intl/es/training/multiscreen/adaptui.jd
index 61f0735..7982ce1 100644
--- a/docs/html-intl/intl/es/training/multiscreen/adaptui.jd
+++ b/docs/html-intl/intl/es/training/multiscreen/adaptui.jd
@@ -10,9 +10,9 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
-
+<div id="tb-wrapper">
+<div id="tb">
+
<h2>En esta sección puedes aprender:</h2>
<ol>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Cómo admitir tablets y dispositivos móviles</a></li>
</ul>
-
+
<h2>¡Pruébalo!</h2>
-
+
<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Descargar la aplicación de ejemplo</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>En función del diseño actual de tu aplicación, la interfaz puede variar. Por ejemplo, si tu aplicación está en modo de panel dual, haz clic en un elemento del panel izquierdo para que aparezca en el panel de la derecha. Asimismo, si está en modo de panel único, el contenido debería aparecer por sí mismo (en otra actividad).</p>
@@ -56,7 +56,7 @@
setContentView(R.layout.main_layout);
View articleView = findViewById(R.id.article);
- mIsDualPane = articleView != null &&
+ mIsDualPane = articleView != null &&
articleView.getVisibility() == View.VISIBLE;
}
}
@@ -116,7 +116,7 @@
else {
/* use list navigation (spinner) */
actionBar.setNavigationMode(android.app.ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter adap = new ArrayAdapter<String>(this,
+ SpinnerAdapter adap = new ArrayAdapter<String>(this,
R.layout.headline_item, CATEGORIES);
actionBar.setListNavigationCallbacks(adap, handler);
}
@@ -168,7 +168,7 @@
public class HeadlinesFragment extends ListFragment {
...
@Override
- public void onItemClick(AdapterView<?> parent,
+ public void onItemClick(AdapterView<?> parent,
View view, int position, long id) {
if (null != mHeadlineSelectedListener) {
mHeadlineSelectedListener.onHeadlineSelected(position);
diff --git a/docs/html-intl/intl/es/training/multiscreen/index.jd b/docs/html-intl/intl/es/training/multiscreen/index.jd
index d836f96..b9b5916 100644
--- a/docs/html-intl/intl/es/training/multiscreen/index.jd
+++ b/docs/html-intl/intl/es/training/multiscreen/index.jd
@@ -6,10 +6,10 @@
@jd:body
-<div id="tb-wrapper">
-<div id="tb">
-
-<h2>Dependencias y requisitos previos</h2>
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Dependencias y requisitos previos</h2>
<ul>
<li>Android 1.6 o superior (Android 2.1 o superior para la aplicación de ejemplo)</li>
@@ -26,17 +26,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/screens_support.html">Cómo admitir varias pantallas</a></li>
</ul>
-
-<h2>¡Pruébalo!</h2>
-
-<div class="download-box">
+
+<h2>¡Pruébalo!</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Descargar la aplicación de ejemplo</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
-
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
+
<p>Android se utiliza en cientos de dispositivos con diferentes tamaños de pantalla, desde pequeños teléfonos hasta enormes televisores. Por ello, es importante que diseñes tu aplicación para que sea compatible con todos los tamaños de pantalla y esté disponible para el mayor número de usuarios posible.</p>
<p>Sin embargo, no es suficiente con que tu aplicación sea compatible con diferentes dispositivos. Cada tamaño de pantalla ofrece diferentes posibilidades y retos para la interacción del usuario. Por ello, para satisfacer completamente a tus usuarios e impresionarlos, tu aplicación debe ir más allá de simplemente <em>admitir</em> varias pantallas: debe <em>optimizar</em> la experiencia de usuario para cada configuración de pantalla.</p>
@@ -47,17 +47,17 @@
<p class="note"><strong>Nota:</strong> en esta sección y en el ejemplo correspondiente, se utiliza la <a
href="{@docRoot}tools/support-library/index.html">biblioteca de compatibilidad</a> para poder usar las API de <PH>{@link android.app.Fragment}</PH> en versiones anteriores a Android 3.0. Debes descargar y la biblioteca y añadirla a tu aplicación para poder utilizar todas las API que se indican en esta sección.</p>
-
-<h2>Secciones</h2>
-
-<dl>
- <dt><b><a href="screensizes.html">Cómo admitir varios tamaños de pantalla</a></b></dt>
- <dd>En esta sección se explica cómo crear diseños que se adapten a diferentes tamaños de pantalla (mediante dimensiones flexibles para vistas, <PH>{@link android.widget.RelativeLayout}</PH>, calificadores de orientación y tamaño de pantalla, filtros de alias y mapas de bits de la clase NinePatch).</dd>
-
- <dt><b><a href="screendensities.html">Cómo admitir varias densidades de pantalla</a></b></dt>
- <dd>En esta sección se explica cómo admitir pantallas con diferentes densidades de píxeles (mediante píxeles independientes de la densidad y mapas de bits adecuados a cada densidad).</dd>
-
- <dt><b><a href="adaptui.html">Cómo implementar interfaces de usuario adaptables</a></b></dt>
- <dd>En esta sección se explica cómo implementar tu interfaz de usuario para que se adapte a varias combinaciones de densidad o de tamaño de pantalla (detección de tiempo de ejecución del diseño activo, cómo reaccionar en función del diseño actual y cómo administrar los cambios en la configuración de la pantalla).</dd>
-</dl>
+
+<h2>Secciones</h2>
+
+<dl>
+ <dt><b><a href="screensizes.html">Cómo admitir varios tamaños de pantalla</a></b></dt>
+ <dd>En esta sección se explica cómo crear diseños que se adapten a diferentes tamaños de pantalla (mediante dimensiones flexibles para vistas, <PH>{@link android.widget.RelativeLayout}</PH>, calificadores de orientación y tamaño de pantalla, filtros de alias y mapas de bits de la clase NinePatch).</dd>
+
+ <dt><b><a href="screendensities.html">Cómo admitir varias densidades de pantalla</a></b></dt>
+ <dd>En esta sección se explica cómo admitir pantallas con diferentes densidades de píxeles (mediante píxeles independientes de la densidad y mapas de bits adecuados a cada densidad).</dd>
+
+ <dt><b><a href="adaptui.html">Cómo implementar interfaces de usuario adaptables</a></b></dt>
+ <dd>En esta sección se explica cómo implementar tu interfaz de usuario para que se adapte a varias combinaciones de densidad o de tamaño de pantalla (detección de tiempo de ejecución del diseño activo, cómo reaccionar en función del diseño actual y cómo administrar los cambios en la configuración de la pantalla).</dd>
+</dl>
diff --git a/docs/html-intl/intl/es/training/multiscreen/screendensities.jd b/docs/html-intl/intl/es/training/multiscreen/screendensities.jd
index 0edb89f..a91f5a0 100644
--- a/docs/html-intl/intl/es/training/multiscreen/screendensities.jd
+++ b/docs/html-intl/intl/es/training/multiscreen/screendensities.jd
@@ -12,8 +12,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>En esta sección puedes aprender:</h2>
<ol>
@@ -29,15 +29,15 @@
</ul>
<h2>¡Pruébalo!</h2>
-
-<div class="download-box">
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Descargar la aplicación de ejemplo</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>En esta sección se explica cómo proporcionar diferentes recursos y utilizar unidades de medida de resolución independiente para admitir diferentes densidades de pantalla.</p>
@@ -48,8 +48,8 @@
<p>Por ejemplo, al especificar un espacio entre dos vistas, debes utilizar <code>dp</code> en lugar de <code>px</code>:</p>
<pre>
-<Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+<Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/clickme"
android:layout_marginTop="20dp" />
</pre>
@@ -57,8 +57,8 @@
<p>Al especificar el tamaño de letra, debes usar siempre <code>sp</code>:</p>
<pre>
-<TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
+<TextView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:textSize="20sp" />
</pre>
diff --git a/docs/html-intl/intl/es/training/multiscreen/screensizes.jd b/docs/html-intl/intl/es/training/multiscreen/screensizes.jd
index 9a971d1..9af109c 100644
--- a/docs/html-intl/intl/es/training/multiscreen/screensizes.jd
+++ b/docs/html-intl/intl/es/training/multiscreen/screensizes.jd
@@ -10,8 +10,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>En esta sección puedes aprender:</h2>
<ol>
@@ -30,26 +30,26 @@
<li><a href="{@docRoot}guide/practices/screens_support.html">Cómo admitir varias pantallas</a></li>
</ul>
-<h2>¡Pruébalo!</h2>
-
-<div class="download-box">
+<h2>¡Pruébalo!</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Descargar la aplicación de ejemplo</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
<p>En esta sección se explica cómo admitir varios tamaños de pantalla. Para ello, sigue estos pasos:</p>
-<ul>
- <li>Asegúrate de que el diseño se haya ajustado correctamente al tamaño de la pantalla.</li>
- <li>Configura la pantalla con el diseño de interfaz adecuado.</li>
+<ul>
+ <li>Asegúrate de que el diseño se haya ajustado correctamente al tamaño de la pantalla.</li>
+ <li>Configura la pantalla con el diseño de interfaz adecuado.</li>
<li>Asegúrate de aplicar el diseño adecuado a la pantalla correspondiente.</li>
- <li>Utiliza el mapa de bits con la escala adecuada.</li>
-</ul>
+ <li>Utiliza el mapa de bits con la escala adecuada.</li>
+</ul>
-<h2 id="TaskUseWrapMatchPar">Cómo utilizar los valores "wrap_content" y "match_parent"</h2>
+<h2 id="TaskUseWrapMatchPar">Cómo utilizar los valores "wrap_content" y "match_parent"</h2>
<p>Para garantizar que el diseño es flexible y que se adapta a varios tamaños de pantalla, debes utilizar los valores <code>"wrap_content"</code> y <code>"match_parent"</code> para la altura y el ancho de algunos componentes de la vista. Si utilizas <code>"wrap_content"</code>, el ancho o la altura de la vista se establece en el tamaño mínimo necesario para adaptar el contenido a esta vista, mientras que <code>"match_parent"</code> (también conocido como <code>"fill_parent"</code> antes del nivel 8 del API) provoca que el componente se amplíe hasta coincidir con el tamaño de la vista principal.</p>
@@ -65,7 +65,7 @@
<p class="img-caption"><strong>Figura 1.</strong> La aplicación de ejemplo News Reader en modo vertical (izquierda) y horizontal (derecha)</p>
-<h2 id="TaskUseRelativeLayout">Cómo utilizar RelativeLayout</h2>
+<h2 id="TaskUseRelativeLayout">Cómo utilizar RelativeLayout</h2>
<p>Puedes crear diseños de un cierto nivel de complejidad con instancias anidadas de <PH>{@link android.widget.LinearLayout}</PH> y combinaciones de los valores de tamaño <code>"wrap_content"</code> y <code>"match_parent"</code>. Sin embargo, <PH>{@link android.widget.LinearLayout}</PH> no te permite controlar con precisión las relaciones espaciales de las vistas secundarias; las vistas de <PH>{@link android.widget.LinearLayout}</PH> simplemente se alinean en paralelo. Si quieres orientar las vistas secundarias de una forma que no sea una línea recta, a menudo la mejor solución es utilizar <PH>{@link android.widget.RelativeLayout}</PH>que te permite especificar el diseño según las relaciones espaciales entre los componentes. Por ejemplo, puedes alinear una vista secundaria en el lateral izquierdo y otra vista en el lateral derecho de la pantalla.</p>
@@ -115,8 +115,8 @@
<p>Ten en cuenta que aunque el tamaño de los componentes es diferente, las relaciones espaciales se mantienen según se ha especificado con <PH>{@link android.widget.RelativeLayout.LayoutParams}</PH>.</p>
-
-<h2 id="TaskUseSizeQuali">Cómo utilizar calificadores de tamaño</h2>
+
+<h2 id="TaskUseSizeQuali">Cómo utilizar calificadores de tamaño</h2>
<p>Hay mucha diferencia entre un diseño flexible y un diseño relativo como el que se ha utilizado en las secciones anteriores. Aunque ambos diseños se adaptan a diferentes pantalla estirando el espacio dentro de los componentes y alrededor de los mismos, puede que no ofrezcan la mejor experiencia de usuario para cada tamaño de pantalla. Por tanto, tu aplicación no solo debe implementar los diseños flexibles, sino que también debe ofrecer varios diseños alternativos para diferentes configuraciones de pantalla. Para ello, se utilizan <a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">calificadores de configuración</a>, que permiten que el tiempo de ejecución seleccione el recurso adecuado en función de la configuración actual del dispositivo (por ejemplo, un diseño diferente para diferentes tamaños de pantalla).</p>
@@ -158,7 +158,7 @@
<p>No obstante, esto no funcionará en los dispositivos anteriores a Android 3.2 porque no reconocen <code>sw600dp</code> como calificador de tamaño, por lo que también tendrás que seguir utilizando el calificador <code>large</code>. Por tanto, debes tener un archivo con el nombre <code>res/layout-large/main.xml</code> idéntico a <code>res/layout-sw600dp/main.xml</code>. En la siguiente sección, obtendrás información sobre una técnica que te permite evitar que se dupliquen los archivos de diseños.</p>
-<h2 id="TaskUseAliasFilters">Cómo utilizar alias de diseño</h2>
+<h2 id="TaskUseAliasFilters">Cómo utilizar alias de diseño</h2>
<p>El calificador de ancho mínimo solo está disponible en Android 3.2 o superior. Por tanto, tendrás que seguir utilizando los contenedores de tamaño abstractos (pequeño, normal, grande y extragrande) para que sean compatibles con versiones anteriores. Por ejemplo, si quieres que tu interfaz de usuario sea de panel único en teléfonos pero multipanel en tablets de 7", televisiones y otros dispositivos grandes, tendrás que utilizar los siguientes archivos:</p>
@@ -202,7 +202,7 @@
<PH>{@code large}</PH>y las televisiones y los tablets posteriores a la versión 3.2 utilizarán <code>sw600dp</code>).</p>
-<h2 id="TaskUseOriQuali">Cómo utilizar calificadores de orientación</h2>
+<h2 id="TaskUseOriQuali">Cómo utilizar calificadores de orientación</h2>
<p>Aunque algunos diseños se pueden utilizar tanto en modo horizontal como vertical, la mayoría de ellos pueden beneficiarse de los ajustes. A continuación, se indica cómo se comporta el diseño según cada tamaño y orientación de la pantalla en la aplicación de ejemplo News Reader:</p>
diff --git a/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..0aa46dc
--- /dev/null
+++ b/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,213 @@
+page.title=Modo Picture-in-picture
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>En este documento</h2>
+<ol>
+ <li><a href="#declaring">Declarar que la actividad permite
+el modo Picture-in-Picture</a></li>
+ <li><a href="#pip_button">Cambiar la actividad al modo Picture-in-picture</a>
+</li>
+ <li><a href="#handling_ui">Gestionar las IU durante el modo Picture-in-picture</a>
+</li>
+ <li><a href="#continuing_playback">Continuar la reproducción de video durante
+el modo Picture-in-picture</a></li>
+ <li><a href="#single_playback">Usar una única actividad de reproducción para
+el modo Picture-in-picture</a></li>
+ <li><a href="#best">Prácticas recomendadas</a></li>
+</ol>
+
+<h2>Consulta también</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">Compatibilidad con
+ventanas múltiples</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>Con Android N, los usuarios de Android TV ahora pueden ver un video
+en una ventana fija que se ubica en una esquina de la pantalla mientras navegan dentro de
+aplicaciones. El modo picture-in-picture (PIP) permite que las aplicaciones reproduzcan un video
+en una ventana fija mientras se lleva a cabo otra actividad
+en el fondo. La ventana de PIP les permite a los usuarios realizar múltiples tareas mientras usan tu aplicación, lo cual les permite
+ser más productivos.</p>
+
+<p>Tu aplicación puede decidir cuándo activar el modo PIP. Aquí te mostramos algunos ejemplos de
+situaciones en las que se podría usar el modo PIP:</p>
+
+<ul>
+<li>Tu aplicación puede pasar un video al modo PIP cuando el usuario retrocede
+en la navegación desde el video para explorar otro contenido.</li>
+<li>También puede hacerlo mientras el usuario está viendo el final
+de un episodio de contenido. La pantalla principal muestra información promocional
+o de resumen sobre el próximo capítulo de la serie.</li>
+<li>Tu aplicación puede brindarles a los usuarios una forma de poner en cola otro contenido mientras
+miran un video. El video continúa reproduciéndose en modo PIP mientras la pantalla
+principal muestra una actividad de selección de contenido.</li>
+</ul>
+
+<p>La ventana de PIP es de 240x135 dp y se muestra en la capa delantera en una de las
+cuatro esquinas de la pantalla que el sistema elige. El usuario puede acceder a un menú de
+PIP que le permite activar o desactivar la ventana de PIP a pantalla completa o cerrarla
+presionando el botón <b>Home</b> en el control remoto. Si se comienza a reproducir
+otro video en la pantalla principal, la ventana de PIP se cierra
+automáticamente. Los usuarios también pueden cerrar la ventana de PIP desde Recents.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>Imagen 1.</strong> Un video picture-in-picture
+visible en una esquina de la pantalla mientras el usuario explora contenido
+en la pantalla principal.</p>
+
+<p>El modo PIP aprovecha las API de ventanas múltiples disponibles en Android N para
+brindar la ventana superpuesta fija de video. Para agregarle el modo PIP a tu aplicación, debes
+registrar las actividades que permitan este modo, cambiar la actividad al modo PIP según
+sea necesario y asegurarte de que los elementos de IU se oculten y que la reproducción de video continúe mientras
+la actividad se encuentra en modo PIP.</p>
+
+<h2 id="declaring">Declarar que la actividad permite el modo picture-in-picture</h2>
+
+<p>De forma predeterminada, el sistema no permite el modo PIP para aplicaciones automáticamente.
+Si deseas permitir este modo en tu aplicaciones, registra la actividad
+de video en tu manifiesto configurando
+<code>android:supportsPictureInPicture</code> y
+<code>android:resizeableActivity</code> en <code>true</code>. Además, debes especificar
+que tu actividad gestiona los cambios de configuración de la presentación para que la actividad
+no se reinicie cuando ocurran cambios de presentación durante las transiciones en el modo PIP.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>Cuando registres la actividad, ten en cuenta que, en el modo PIP, la
+actividad se muestra en una ventana superpuesta pequeña en una pantalla de TV. Las actividades de reproducción
+de videos con IU mínimas brindan la mejor experiencia de usuario. Las actividades que
+incluyen elementos de IU pequeños podrían no brindar una buena experiencia de usuario
+cuando se cambian al modo PIP, porque los usuarios no podrán ver los detalles de los elementos de IU
+en la ventana PIP.</p>
+
+<h2 id="pip_button">Cambiar la actividad al modo Picture-in-picture</h2>
+
+Cuando necesites cambiar la actividad al modo PIP, llama a
+<code>Activity.enterPictureInPictureMode()</code>. En el siguiente ejemplo, se
+cambia al modo PIP cuando el usuario selecciona un botón PIP especial en una barra
+de control de medios:</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>Agregar un botón PIP a la barra de control de medios le permite al usuario cambiar
+fácilmente al modo PIP y seguir controlando la reproducción de video.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>Imagen 1.</strong> Un botón
+PIP en una barra de control de medios.</p>
+
+<p>Android N incluye una nueva clase
+<code>PlaybackControlsRow.PictureInPictureAction</code> que define
+las acciones de PIP de la barra de control y usa el ícono PIP.</p>
+
+<h2 id="handling_ui">Gestionar las IU durante el modo picture-in-picture</h2>
+
+<p>Cuando la actividad ingresa al modo PIP, esta solo debería mostrar la reproducción
+de video. Debes quitar los elementos de IU antes de que la actividad ingrese al modo PIP
+y volver a mostrarlos cuando la actividad vuelva al modo de pantalla completa.
+Anula <code>Activity.onPictureInPictureModeChanged()</code> o
+<code>Fragment.onPictureInPictureModeChanged()</code> y habilita
+o inhabilita los elementos de IU según sea necesario, por ejemplo:</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">Continuar la reproducción de video durante
+el modo Picture-in-picture</h2>
+
+<p>Cuando la actividad cambia al modo PIP, el sistema considera que se encuentra en
+pausa y llama al método <code>onPause()</code> de la actividad. La reproducción
+de video no debería pausarse y debería continuar si la actividad se
+pausa debido al modo PIP. Busca el modo PIP en el método
+<code>onPause()</code> de la actividad y controla la reproducción según corresponda, por
+ejemplo:</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>Cuando la actividad sale del modo PIP y vuelve al modo de pantalla completa, el
+sistema reinicia la actividad y llama al método <code>onResume()</code>.</p>
+
+<h2 id="single_playback">Usar una única actividad de reproducción para
+el modo Picture-in-picture</h2>
+
+<p>En tu aplicación, un usuario puede seleccionar un nuevo video cuando busca contenido en la
+pantalla principal, mientras una actividad de reproducción de video está en modo PIP. Reproduce el nuevo
+video en la actividad de reproducción actual en modo de pantalla completa, en lugar de
+iniciar una nueva actividad que podría confundir al usuario.</p>
+
+<p>A fin de garantizar que se utilice una única actividad para las solicitudes de reproducción de video y que esta
+ ingrese en el modo PIP o salga de este cuando sea necesario, configura el
+<code>android:launchMode</code> de la actividad en <code>singleTask</code>, en el manifiesto:
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>En tu actividad, anula {@link android.app.Activity#onNewIntent
+Activity.onNewIntent()} y administra el nuevo video, deteniendo cualquier reproducción
+de video actual si es necesario.</p>
+
+<h2 id="best">Prácticas recomendadas</h2>
+
+<p>El modo PIP está diseñado para actividades que reproducen un video en pantalla completa. Cuando cambies la
+actividad al modo PIP, evita que se muestre cualquier elemento que no sea el contenido del video.
+Rastrea el cambio a modo PIP de la actividad y oculta los elementos de IU, como se explica
+en la sección <a href="#handling_ui">Gestionar las IU durante el modo picture-in-picture</a>.</p>
+
+<p>Debido a que la ventana de PIP se muestra como una ventana flotante en una
+esquina de la pantalla, debes evitar mostrar información importante en la pantalla principal
+en cualquier área que pueda quedar oculta detrás de la ventana de PIP.</p>
+
+<p>Cuando una actividad se encuentra en modo PIP, de forma predeterminada, no tiene focalización en las entradas. Para
+recibir eventos de entradas durante este modo, usa
+<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/es/training/tv/tif/content-recording.jd b/docs/html-intl/intl/es/training/tv/tif/content-recording.jd
new file mode 100644
index 0000000..855db8d
--- /dev/null
+++ b/docs/html-intl/intl/es/training/tv/tif/content-recording.jd
@@ -0,0 +1,142 @@
+page.title=Grabación de TV
+page.keywords=preview,sdk,tv,recording
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>En este documento</h2>
+ <ol>
+ <li><a href="#supporting">Indicar la compatibilidad para la grabación</a></li>
+ <li><a href="#recording">Grabar una sesión</a></li>
+ <li><a href="#errors">Gestionar los errores de grabación</a></li>
+ <li><a href="#sessions">Gestionar las sesiones grabadas</a></li>
+ <li><a href="#best">Prácticas recomendadas</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Los servicios de entrada de TV le permiten al usuario pausar y reanudar la reproducción de canales
+mediante API de time-shifting. Android N expande la función de time-shifting
+ permitiéndoles a los usuarios guardar múltiples sesiones grabadas.</p>
+
+<p>Los usuarios pueden programar las grabaciones por adelantado o comenzar a grabar a la vez
+que miran un programa. Una vez que el sistema haya guardado una grabación, el usuario puede explorar, gestionar
+y reproducir las grabaciones usando la aplicación del sistema de TV.</p>
+
+<p>Si deseas brindar funcionalidades de grabación a tu servicio de entrada de TV,
+debes indicarle al sistema que tu aplicación permite la grabación, implementar
+la habilidad para grabar programas, gestionar y comunicar los errores que ocurren
+durante la grabación y gestionar las sesiones grabadas.</p>
+
+<p class="note"><strong>Nota:</strong> La aplicación Live Channels todavía no
+ permite que los usuarios creen grabaciones ni accedan a estas. Hasta que se realicen
+ cambios en la aplicación Live Channels, es posible que sea difícil probar completamente la
+experiencia de grabación para tu servicio de entrada de TV.</p>
+
+<h2 id="supporting">Indicar la compatibilidad para la grabación</h2>
+
+<p>Para comunicarle al sistema que tu servicio de entrada de TV permite la grabación, configura el
+atributo <code>android:canRecord</code> de tu archivo XML de metadatos de servicio
+en <code>true</code>:
+</p>
+
+<pre>
+<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
+ <b>android:canRecord="true"</b>
+ android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
+</pre>
+
+<p>Para obtener más información sobre el archivo de metadatos de servicio, consulta
+<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">Declarar el servicio de entrada
+ de TV en el manifiesto</a>.
+</p>
+
+<p>De forma alternativa, puedes indicar la compatibilidad para la grabación en tu código; para ello, sigue
+ estos pasos:</p>
+
+<ol>
+<li>En el método <code>TvInputService.onCreate()</code>, crea un nuevo
+objeto <code>TvInputInfo</code> usando la clase <code>TvInputInfo.Builder</code>.
+</li>
+<li>Cuando crees el nuevo objeto <code>TvInputInfo</code>, llama a
+<code>setCanRecord(true)</code> antes de llamar a <code>build()</code> para
+indicar que tu servicio permite la grabación.</li>
+<li>Registra tu objeto <code>TvInputInfo</code> con el sistema llamando a
+<code>TvInputManager.updateTvInputInfo()</code>.</li>
+</ol>
+
+<h2 id="recording">Grabar una sesión</h2>
+
+<p>Luego de que el servicio de entrada de TV registra la compatibilidad
+con la funcionalidad de grabación, el sistema llama a tu
+<code>TvInputService.onCreateRecordingSession()</code> cuando necesita acceder
+a la implementación de grabación de tu aplicación. Implementa tu propia subclase
+<code>TvInputService.RecordingSession</code> y devuélvela
+cuando el callback de <code>onCreateRecordingSession()</code>
+se dispare. Esta subclase es responsable de cambiar a los datos del canal correcto,
+de grabar los datos solicitados y de comunicar el estado y los errores de grabación al
+sistema.</p>
+
+<p>Cuando el sistema llama a <code>RecordingSession.onTune()</code>, pasando en un
+URI de canal, sintoniza el canal que el URI especifica. Notifícale al sistema que tu
+aplicación se ha sintonizado al canal deseado llamando a <code>notifyTuned()</code>
+o, si tu aplicación no pudo sintonizarse al canal correcto, llama a
+<code>notifyError()</code>.</p>
+
+<p>El sistema invoca, a continuación, el callback <code>RecordingSession.onStartRecording()</code>.
+ Tu aplicación debe comenzar a grabar inmediatamente. Cuando el sistema invoca
+este callback, puede brindar un URI que contiene información sobre el programa
+que se está por grabar. Cuando finaliza la grabación, debes copiar estos
+datos a la tabla de datos <code>RecordedPrograms</code>.</p>
+
+<p>Finalmente, el sistema llama a <code>RecordingSession.onStopRecording()</code>.
+En este momento, tu aplicación debe dejar de grabar inmediatamente. También debes crear
+una entrada en la tabla <code>RecordedPrograms</code>. Esta entrada debe
+incluir el URI de datos de la sesión grabada en la columna
+<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> y cualquier información
+del programa que el sistema haya brindado en la llamada inicial a
+<code>onStartRecording()</code>.</p>
+
+<p>Para obtener más información sobre cómo acceder a la tabla <code>RecordedPrograms</code>
+, consulta <a href="#sessions">Gestionar las sesiones grabadas</a>.</p>
+
+<h2 id="errors">Gestionar los errores de grabación</h2>
+
+<p>Si ocurre un error durante la grabación que hace que los datos grabados no se puedan usar,
+notifica al sistema llamando a<code>RecordingSession.notifyError()</code>.
+De forma similar, puedes llamar a <code>notifyError()</code> después de que se cree una sesión de grabación
+para que el sistema sepa que la aplicación ya no puede grabar sesiones.</p>
+
+<p>Si ocurre un error durante la grabación, pero deseas brindarle al usuario una grabación
+parcial usable para su reproducción, llama a
+<code>RecordingSession.notifyRecordingStopped()</code> para permitir que el sistema
+use la sesión parcial.</p>
+
+<h2 id="sessions">Gestionar las sesiones grabadas</h2>
+
+<p>El sistema mantiene información de todas las sesiones grabadas de todas
+las aplicaciones de canal con funcionalidad de grabación en la tabla de proveedor de contenido <code>TvContract.RecordedPrograms</code>
+. Esta información se accede mediante el URI de contenido
+<code>RecordedPrograms.Uri</code>. Usa API de proveedor de contenido para
+leer, agregar y borrar entradas de esta tabla.</p>
+
+<p>Para obtener más información sobre cómo trabajar con datos del proveedor de contenido, consulta
+<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
+Conceptos básicos sobre el proveedor de contenido</a>.</p>
+
+<h2 id="best">Prácticas recomendadas</h2>
+
+<p>Los dispositivos de TV tienen un almacenamiento limitado, de modo que debes ser cuidadoso a la hora
+de asignar el almacenamiento para guardar las sesiones grabadas. Usa
+<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code> cuando
+no haya espacio suficiente para guardar una sesión grabada.</p>
+
+<p>Cuando el usuario inicie la grabación, el registro de datos debe comenzar
+lo antes posible. Para facilitar este proceso, completa cualquier tarea anterior demandante,
+como acceder al espacio de almacenamiento y asignarlo, cuando el sistema invoque el
+callback <code>onCreateRecordingSession()</code>. Hacerlo te permite comenzar
+a grabar inmediatamente cuando el callback <code>onStartRecording()</code>
+se dispare.</p>
diff --git a/docs/html-intl/intl/in/about/versions/marshmallow/android-6.0-testing.jd b/docs/html-intl/intl/in/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..94bc74c
--- /dev/null
+++ b/docs/html-intl/intl/in/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Panduan Pengujian
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Dalam dokumen ini</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Izin Pengujian</a></li>
+ <li><a href="#doze-standby">Menguji Istirahatkan dan Aplikasi Siaga</a></li>
+ <li><a href="#ids">Pencadangan Otomatis dan Identifier Perangkat</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N memberi Anda kesempatan untuk memastikan aplikasi bekerja pada
+ platform versi berikutnya. Pratinjau ini berisi beberapa API dan perubahan perilaku yang bisa
+ memengaruhi aplikasi Anda, sebagaimana dijelaskan dalam <a href="{@docRoot}preview/api-overview.html">Ringkasan
+ API</a> dan <a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a>. Dalam menguji
+ aplikasi dengan pratinjau, ada beberapa perubahan sistem spesifik yang harus Anda fokuskan untuk
+ memastikan pengguna mendapatkan pengalaman yang bagus.
+</p>
+
+<p>
+ Panduan ini menjelaskan apa dan bagaimana menguji fitur pratinjau dengan aplikasi Anda. Anda harus
+ mengutamakan pengujian fitur pratinjau spesifik ini, dikarenakan pengaruhnya yang besar pada
+ perilaku aplikasi Anda:
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Izin</a>
+ </li>
+ <li><a href="#doze-standby">Istirahatkan dan Aplikasi Siaga</a>
+ </li>
+ <li><a href="#ids">Pencadangan Otomatis dan Identifier Perangkat</a></li>
+</ul>
+
+<p>
+ Untuk informasi selengkapnya tentang cara menyiapkan perangkat atau perangkat maya dengan citra sistem pratinjau
+ untuk pengujian, lihat <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan
+Android N SDK</a>.
+</p>
+
+
+<h2 id="runtime-permissions">Izin Pengujian</h2>
+
+<p>
+ Model <a href="{@docRoot}preview/features/runtime-permissions.html">Izin</a> yang baru
+ mengubah cara alokasi izin untuk aplikasi Anda oleh pengguna. Sebagai ganti memberi semua
+ izin selama prosedur pemasangan, aplikasi Anda harus meminta izin kepada pengguna secara individual
+ pada waktu proses. Bagi pengguna, perilaku ini memberi kontrol yang lebih detail atas setiap aktivitas aplikasi, dan
+ juga konteks yang lebih untuk memahami sebab aplikasi meminta izin tertentu. Pengguna
+ bisa memberi atau mencabut izin yang diberikan pada suatu aplikasi secara individual kapan saja. Fitur
+ pratinjau ini kemungkinan besar memengaruhi perilaku aplikasi Anda dan mungkin menghambat fungsi beberapa
+ fitur aplikasi Anda, atau mengurangi kualitas kerjanya.
+</p>
+
+<p class="caution">
+ Perubahan ini memengaruhi semua aplikasi yang berjalan di platform baru, bahkan aplikasi yang tidak menargetkan versi
+ platform baru. Platform ini memberikan perilaku kompatibilitas terbatas untuk aplikasi lawas, namun Anda
+ harus mulai merencanakan migrasi aplikasi ke model izin baru sekarang juga, dengan tujuan
+ mempublikasikan versi terbaru aplikasi Anda saat peluncuran platform secara resmi.
+</p>
+
+
+<h3 id="permission-test-tips">Tip pengujian</h3>
+
+<p>
+ Gunakan tip berikut untuk membantu Anda merencanakan dan menjalankan pengujian aplikasi dengan
+ perilaku izin yang baru.
+</p>
+
+<ul>
+ <li>Identifikasi izin aplikasi Anda saat ini dan jalur kode terkait.</li>
+ <li>Uji alur pengguna pada semua layanan dan data yang dilindungi izin.</li>
+ <li>Uji dengan berbagai kombinasi izin yang diberikan/dicabut.</li>
+ <li>Gunakan alat bantu {@code adb} untuk mengelola izin dari baris perintah:
+ <ul>
+ <li>Cantumkan daftar izin dan status berdasarkan kelompok:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Beri atau cabut satu atau beberapa izin menggunakan sintaks berikut:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analisis aplikasi Anda untuk layanan yang menggunakan izin.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Strategi pengujian</h3>
+
+<p>
+ Perubahan izin memengaruhi struktur dan desain aplikasi Anda, begitu juga
+ pengalaman pengguna dan alur yang Anda sediakan untuk pengguna. Anda harus menilai penggunaan izin
+ aplikasi saat ini dan mulai merencanakan alur baru yang ingin ditawarkan. Rilis platform
+ resmi menyediakan perilaku kompatibilitas, namun Anda harus merencanakan pembaruan aplikasi dan tidak
+ bergantung pada perilaku ini.
+</p>
+
+<p>
+ Identifikasi izin yang sebenarnya diperlukan dan digunakan aplikasi Anda, kemudian temukan berbagai
+ jalur kode yang menggunakan layanan yang dilindungi izin. Anda bisa melakukan ini melalui kombinasi
+ pengujian pada platform baru dan analisis kode. Dalam pengujian, Anda harus fokus pada pemilihan
+ izin waktu proses dengan mengubah {@code targetSdkVersion} aplikasi ke versi pratinjau. Untuk
+ informasi selengkapnya, lihat <a href="{@docRoot}preview/setup-sdk.html#">Menyiapkan
+Android N SDK</a>.
+</p>
+
+<p>
+ Uji dengan berbagai kombinasi izin yang dicabut dan ditambahkan, untuk menyoroti alur pengguna yang
+ bergantung pada izin. Jika dependensi tidak jelas atau logis, Anda harus mempertimbangkan
+optimalisasi atau kompartementalisasi alur tersebut untuk mengeliminasi dependensi atau menjelaskan alasan
+ diperlukannya izin.
+</p>
+
+<p>
+ Untuk informasi selengkapnya tentang perilaku izin waktu proses, pengujian, dan praktik terbaik, lihat
+ halaman pratinjau <a href="{@docRoot}preview/features/runtime-permissions.html">Izin</a>
+ pengembang.
+</p>
+
+
+<h2 id="doze-standby">Menguji Istirahatkan dan Aplikasi Siaga</h2>
+
+<p>
+ Fitur penghematan daya Istirahatkan dan Aplikasi Siaga membatasi jumlah pemrosesan latar belakang yang
+ bisa dikerjakan aplikasi Anda saat perangkat dalam keadaan diam atau saat aplikasi Anda sedang tidak fokus. Pembatasan
+ yang dapat diberlakukan oleh sistem pada aplikasi termasuk akses jaringan terbatas atau tidak ada,
+ tugas latar belakang yang ditangguhkan, Pemberitahuan yang ditangguhkan, permintaan membangunkan yang diabaikan, serta alarm. Untuk memastikan
+ aplikasi Anda berperilaku dengan benar pada optimalisasi penghematan daya ini, Anda harus menguji aplikasi dengan
+ menyimulasikan keadaan baterai yang sedang tinggal sedikit ini.
+</p>
+
+<h4 id="doze">Menguji aplikasi Anda dengan Istirahatkan</h4>
+
+<p>Untuk menguji Istirahatkan dengan aplikasi Anda:</p>
+
+<ol>
+<li>Konfigurasikan perangkat keras atau perangkat maya dengan citra sistem Android N.</li>
+<li>Hubungkan perangkat dengan mesin pengembangan dan pasang aplikasi Anda.</li>
+<li>Jalankan aplikasi Anda dan biarkan aktif.</li>
+<li>Simulasikan perangkat yang sedang masuk ke dalam mode Istirahatkan dengan menjalankan perintah berikut:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Amati perilaku aplikasi Anda saat perangkat diaktifkan kembali. Pastikan aplikasi
+ pulih dengan baik saat perangkat keluar dari Istirahatkan.</li>
+</ol>
+
+
+<h4 id="standby">Menguji aplikasi dengan Aplikasi Siaga</h4>
+
+<p>Untuk menguji mode Aplikasi Siaga dengan aplikasi Anda:</p>
+
+<ol>
+ <li>Konfigurasikan perangkat keras atau perangkat maya dengan citra sistem Android N.</li>
+ <li>Hubungkan perangkat dengan mesin pengembangan dan pasang aplikasi Anda.</li>
+ <li>Jalankan aplikasi Anda dan biarkan aktif.</li>
+ <li>Simulasikan aplikasi yang sedang masuk ke dalam mode siaga dengan menjalankan perintah berikut:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simulasikan membangunkan aplikasi Anda menggunakan perintah berikut:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Amati perilaku aplikasi Anda saat dibangunkan. Pastikan aplikasi pulih dengan baik
+ dari mode siaga. Secara khusus, Anda harus memeriksa apakah Pemberitahuan aplikasi dan pekerjaan latar belakang
+ tetap berjalan sebagaimana yang diharapkan.</li>
+</ol>
+
+<h2 id="ids">Auto Backup for Apps dan Identifier Perangkat Spesifik</h2>
+
+<p>Jika aplikasi Anda mempertahankan identifier perangkat spesifik, seperti ID pendaftaran Google
+Cloud Messaging, dalam penyimpanan internal,
+pastikan Anda mengikuti praktik terbaik untuk mengecualikan lokasi
+penyimpanan dari pencadangan otomatis, seperti dijelaskan dalam <a href="{@docRoot}preview/backup/index.html">Auto
+Backup for Apps</a>. </p>
diff --git a/docs/html-intl/intl/in/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/in/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..af01cd2
--- /dev/null
+++ b/docs/html-intl/intl/in/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,610 @@
+page.title=Perubahan Perilaku
+page.keywords=pratinjau,sdk,kompatibilitas
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Dalam dokumen ini</h2>
+
+<ol>
+ <li><a href="#perf">Peningkatan Kinerja</a>
+ <ol>
+ <li><a href="#doze">Istirahatkan</a></li>
+ <li><a href="#bg-opt">Optimalisasi Latar Belakang</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">Perubahan Izin</a>
+ </li>
+ <li><a href="#sharing-files">Berbagi File Antar Aplikasi</a></li>
+ <li><a href="#accessibility">Peningkatan Aksesibilitas</a>
+ <ol>
+ <li><a href="#screen-zoom">Perbesaran Layar</a></li>
+ <li><a href="#vision-settings">Vision Settings di Setup Wizard</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">Penautan Aplikasi NDK ke Pustaka Platform</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">Retensi Anotasi</a></li>
+ <li><a href="#other">Poin Penting Lainnya</a></li>
+</ol>
+
+<h2>Lihat Juga</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">
+ Ringkasan Android N API</a></li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Bersama fitur dan kemampuan baru, Android N
+ menyertakan berbagai macam perubahan sistem dan perubahan perilaku API. Dokumen ini
+ menyoroti beberapa perubahan utama yang harus dipahami dan diperhitungkan
+ dalam aplikasi Anda.
+</p>
+
+<p>
+ Jika Anda sebelumnya telah mempublikasikan aplikasi untuk Android, ketahuilah bahwa aplikasi Anda
+ mungkin dipengaruhi oleh perubahan dalam platform.
+</p>
+
+
+<h2 id="perf">Baterai dan Memori</h2>
+
+<p>
+Android N menyertakan perubahan perilaku sistem yang bertujuan untuk meningkatkan daya tahan baterai
+perangkat dan mengurangi penggunaan RAM. Perubahan ini bisa memengaruhi akses aplikasi Anda ke
+sumber daya sistem, termasuk cara aplikasi Anda berinteraksi dengan aplikasi lain melalui
+intent implisit tertentu.
+</p>
+
+<h3 id="doze">Istirahatkan</h3>
+
+<p>
+ Diperkenalkan dalam Android 6.0 (API level 23), Istirahatkan meningkatkan daya tahan baterai dengan
+ menangguhkan aktivitas CPU dan jaringan bila pengguna tidak mencabut perangkat,
+ tidak bergerak, dan layar dinonaktifkan. Android N lebih
+ menyempurnakan Istirahatkan dengan menerapkan subset CPU dan pembatasan jaringan
+ bila perangkat dicabut dan layar dinonaktifkan, namun tidak harus
+ diam, misalnya, bila handset dibawa bepergian di saku pengguna.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>Gambar 1.</strong> Ilustrasi tentang cara Istirahatkan menerapkan pembatasan
+ aktivitas sistem level pertama untuk meningkatkan daya tahan baterai.
+</p>
+
+<p>
+ Bila perangkat sedang menggunakan daya baterai, dan layar telah nonaktif selama jangka waktu
+ tertentu, perangkat akan memasuki Istirahatkan dan menerapkan subset pembatasan pertama: Perangkat
+ akan menutup akses jaringan aplikasi, serta menangguhkan pekerjaan dan sinkronisasi. Jika perangkat sedang
+ diam selama jangka waktu tertentu setelah memasuki Istirahatkan, sistem akan menerapkan
+ pembatasan Istirahatkan selebihnya terhadap alarm {@link android.os.PowerManager.WakeLock},
+ {@link android.app.AlarmManager}, GPS, dan pemindaian Wi-Fi. Tidak peduli
+ apakah sebagian atau semua pembatasan Istirahatkan diterapkan, sistem akan membangunkan
+ perangkat selama jeda pemeliharaan singkat, dan selama itu aplikasi diizinkan
+ mengakses jaringan dan bisa mengeksekusi semua pekerjaan/sinkronisasi yang telah ditangguhkan.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>Gambar 2.</strong> Ilustrasi tentang cara Istirahatkan menerapkan pembatasan
+ aktivitas sistem level kedua setelah perangkat diam selama jangka waktu tertentu.
+</p>
+
+<p>
+ Perhatikan, mengaktifkan layar atau mencolokkan steker perangkat akan mengeluarkan dari Istirahatkan
+ dan membuang pembatasan pemrosesan ini. Perilaku tambahan ini tidak
+ memengaruhi rekomendasi dan praktik terbaik dalam menyesuaikan aplikasi Anda dengan versi
+ Istirahatkan sebelumnya yang diperkenalkan dalam Android 6.0 (API level 23), seperti yang dibahas di
+ <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
+ Mengoptimalkan untuk Istirahatkan dan Aplikasi Siaga</a>. Anda tetap harus
+ mengikuti rekomendasi itu, seperti menggunakan Google Cloud Messaging (GCM) untuk
+ mengirim dan menerima pesan, serta mulai merencanakan pembaruan
+ untuk mengakomodasi perilaku Istirahatkan tambahan.
+</p>
+
+
+<h3 id="bg-opt">Project Svelte: Optimalisasi Latar Belakang</h3>
+
+<p>
+ Android N membuang tiga siaran implisit untuk membantu mengoptimalkan
+ penggunaan memori dan konsumsi daya. Perubahan ini penting karena siaran
+ implisit sering memulai aplikasi yang telah didaftarkan untuk mendengarkannya di
+ latar belakang. Membuang siaran ini bisa sangat menguntungkan
+ kinerja perangkat dan pengalaman pengguna.
+</p>
+
+<p>
+ Perangkat seluler seringkali mengalami perubahan konektivitas, seperti saat berpindah
+ antara Wi-Fi dan data seluler. Saat ini, aplikasi bisa memantau perubahan dalam
+ konektivitas dengan mendaftarkan suatu penerima untuk siaran implisit {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} dalam manifes
+ mereka. Karena banyak aplikasi yang didaftarkan untuk menerima siaran ini, switch jaringan tunggal
+ bisa menyebabkan semuanya aktif dan memproses siaran tersebut
+ secara bersamaan.
+</p>
+
+<p>
+ Demikian pula, dalam Android versi sebelumnya, aplikasi bisa mendaftar untuk menerima siaran implisit {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} dan {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} dari aplikasi lain, seperti
+ Kamera. Bila pengguna mengambil gambar dengan aplikasi Kamera, semua aplikasi ini akan aktif
+ untuk memproses siaran.
+</p>
+
+<p>
+ Untuk meminimalkan masalah ini, Android N menerapkan optimalisasi
+ berikut:
+</p>
+
+<ul>
+ <li>Aplikasi yang menargetkan Android N tidak menerima siaran {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION}, sekalipun
+ memiliki entri manifes untuk meminta pemberitahuan mengenai kejadian ini. Aplikasi
+ yang berjalan tetap bisa mendengarkan {@code CONNECTIVITY_CHANGE} pada thread utama
+ jika mereka meminta pemberitahuan dengan {@link android.content.BroadcastReceiver}.
+ </li>
+
+ <li>Aplikasi tidak bisa mengirim atau menerima siaran {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} atau {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}. Optimalisasi ini
+ memengaruhi semua aplikasi, bukan hanya aplikasi yang menargetkan Android N.
+ </li>
+</ul>
+
+<p>Jika aplikasi Anda menggunakan intent ini, Anda harus membuang dependensi padanya
+ secepat mungkin agar Anda bisa menargetkan perangkat Android N dengan benar.
+ Kerangka kerja Android menyediakan beberapa solusi untuk mengurangi kebutuhan akan
+ siaran implisit ini. Misalnya, {@link
+ android.app.job.JobScheduler} API menyediakan mekanisme yang tangguh untuk menjadwalkan
+ operasi jaringan bila kondisi yang ditetapkan, seperti koneksi ke jaringan
+ berbiaya tetap, terpenuhi. Anda juga dapat menggunakan {@link
+ android.app.job.JobScheduler} untuk bereaksi terhadap perubahan pada penyedia materi.
+</p>
+
+<p>
+ Untuk informasi selengkapnya tentang optimalisasi latar belakang di N dan cara menyesuaikan aplikasi Anda,
+ lihat <a href="{@docRoot}preview/features/background-optimization.html">Optimalisasi
+ Latar Belakang</a>.
+</p>
+
+<h2 id="perm">Perubahan Izin</h2>
+
+<p>
+ Android N menyertakan perubahan pada izin yang bisa memengaruhi aplikasi Anda.
+</p>
+
+<h3 id="permfilesys">Perubahan izin sistem file</h3>
+
+<p>
+ Guna meningkatkan keamanan file privat, direktori privat
+ aplikasi yang menargetkan Android N atau yang lebih tinggi memiliki akses terbatas (<code>0700</code>).
+ Pengaturan ini mencegah kebocoran metadata dari file privat, seperti ukuran
+ atau eksistensi. Perubahan izin ini memiliki beberapa efek samping:
+</p>
+
+<ul>
+ <li>
+ Izin file privat tidak boleh dianggap remeh oleh pemilik,
+ dan usaha untuk melakukannya menggunakan
+ {@link android.content.Context#MODE_WORLD_READABLE} dan/atau
+ {@link android.content.Context#MODE_WORLD_WRITEABLE}, akan memicu sebuah
+ {@link java.lang.SecurityException}.
+ <p class="note">
+ <strong>Catatan:</strong> Seperti sebelumnya, pembatasan ini tidak sepenuhnya diterapkan.
+ Aplikasi mungkin masih memodifikasi izin ke direktori privat mereka menggunakan
+ API asal atau {@link java.io.File File} API. Akan tetapi, kami sangat
+ tidak menyarankan Anda meremehkan izin direktori privat.
+ </p>
+ </li>
+ <li>
+ Meneruskan URI <code>file://</code> di luar domain paket dapat meninggalkan
+ penerima dengan jalur yang tidak bisa di akses. Karena itu, upaya untuk meneruskan URI
+ <code>file://</code> akan memicu
+ <code>FileUriExposedException</code>. Cara yang disarankan adalah
+ materi file privat menggunakan {@link
+ android.support.v4.content.FileProvider}.
+ </li>
+ <li>
+ {@link android.app.DownloadManager} tidak bisa lagi berbagi
+ file yang tersimpan secara privat berdasarkan nama file. Aplikasi lawas dapat mengakibatkan
+ jalur yang tidak dapat diakses saat mengakses {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Aplikasi yang menargetkan
+ Android N atau yang lebih tinggi akan memicu {@link java.lang.SecurityException} saat
+ berupaya mengakses
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
+ Aplikasi lawas yang menyetel lokasi unduhan ke lokasi publik dengan
+ menggunakan
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+ DownloadManager.Request.setDestinationInExternalFilesDir()} atau
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+ DownloadManager.Request.setDestinationInExternalPublicDir()}
+ tetap bisa mengakses jalur tersebut di
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}, akan tetapi,
+ metode ini sangat tidak disarankan. Cara yang disarankan untuk mengakses file
+ yang diekspos oleh {@link android.app.DownloadManager} adalah menggunakan
+ {@link android.content.ContentResolver#openFileDescriptor
+ ContentResolver.openFileDescriptor()}.
+ </li>
+</ul>
+
+<h2 id="sharing-files">Berbagi File Antar Aplikasi</h2>
+
+<p>
+Untuk aplikasi yang menargetkan Android N, kerangka kerja Android menerapkan
+kebijakan {@link android.os.StrictMode} API yang melarang mengekspos URI {@code file://}
+di luar aplikasi Anda. Jika sebuah intent berisi URI file meninggalkan aplikasi Anda, aplikasi tersebut akan gagal
+dengan pengecualian {@code FileUriExposedException}.
+</p>
+
+<p>
+Untuk berbagi file antar aplikasi, Anda harus mengirim URI {@code content://}
+dan memberikan izin akses sementara pada URI. Cara termudah untuk memberikan izin ini adalah dengan
+menggunakan kelas {@link android.support.v4.content.FileProvider}. Untuk informasi selengkapnya
+mengenai izin dan berbagi file,
+lihat <a href="{@docRoot}training/secure-file-sharing/index.html">Berbagi File</a>.
+</p>
+
+<h2 id="accessibility">Peningkatan Aksesibilitas</h2>
+
+<p>
+ Android N menyertakan perubahan yang bertujuan meningkatkan kegunaan
+ platform untuk pengguna dengan penglihatan yang rendah atau lemah. Perubahan ini umumnya tidak
+ memerlukan perubahan kode dalam aplikasi Anda, akan tetapi Anda harus memeriksa
+ fitur ini dan mengujinya dengan aplikasi untuk menilai kemungkinan dampaknya terhadap pengalaman
+ pengguna.
+</p>
+
+
+<h3 id="screen-zoom">Perbesaran Layar</h3>
+
+<p>
+ Android N memungkinkan pengguna menyetel <strong>Display size</strong> yang akan memperbesar
+ atau memperkecil semua elemen pada layar, sehingga meningkatkan aksesibilitas perangkat
+ bagi pengguna yang kurang melihat. Pengguna tidak bisa memperbesar layar melewati lebar layar
+ minimum <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
+ sw320dp</a>, yang merupakan lebar Nexus 4, yakni ponsel ukuran sedang pada umumnya.
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>Gambar 3.</strong> Layar di sebelah kanan menampilkan efek
+ penambahan Display size perangkat yang menjalankan citra sistem Android N.
+</p>
+
+
+<p>
+ Bila kepadatan perangkat berubah, sistem akan memberi tahu aplikasi yang sedang berjalan dengan
+ cara berikut:
+</p>
+
+<ul>
+ <li>Jika aplikasi menargetkan API level 23 atau yang lebih rendah, sistem secara otomatis akan mematikan
+ semua proses latar belakang. Artinya, jika pengguna beralih dari
+ aplikasi tersebut untuk membuka layar <em>Settings</em> dan mengubah
+ setelan <strong>Display size</strong>, maka sistem akan mematikan aplikasi tersebut dengan cara yang
+ sama dengan saat memori tinggal sedikit. Jika aplikasi memiliki beberapa proses
+ latar depan, sistem akan memberi tahu proses tersebut mengenai perubahan konfigurasi seperti
+ dijelaskan dalam <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
+ Waktu Proses</a>, seolah-olah orientasi perangkat telah berubah.
+ </li>
+
+ <li>Jika sebuah aplikasi menargetkan Android N, semua prosesnya
+ (latar depan dan latar belakang) akan diberi tahu mengenai perubahan konfigurasi seperti
+ dijelaskan dalam <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
+ Waktu Proses</a>.
+ </li>
+</ul>
+
+<p>
+ Sebagian besar aplikasi tidak perlu melakukan perubahan untuk mendukung fitur ini, asalkan
+ aplikasi tersebut mengikuti praktik terbaik Android. Hal-hal tertentu yang harus diperiksa:
+</p>
+
+<ul>
+ <li>Uji aplikasi Anda pada perangkat dengan lebar layar <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
+ dan pastikan aplikasi berjalan dengan semestinya.
+ </li>
+
+ <li>Bila konfigurasi perangkat berubah, perbarui informasi cache
+ yang bergantung pada kepadatan, seperti bitmap di cache atau sumber daya yang dimuat dari
+ jaringan. Periksa perubahan konfigurasi bila aplikasi melanjutkan dari status dihentikan
+ sementara.
+ <p class="note">
+ <strong>Catatan:</strong> Catatan: Jika Anda meng-cache data yang bergantung pada konfigurasi, ada
+ baiknya untuk menyertakan metadata yang relevan seperti ukuran layar
+ atau kepadatan piksel yang sesuai untuk data tersebut. Menyimpan metadata ini memungkinkan Anda untuk
+ memutuskan apakah Anda perlu segarkan data cache setelah perubahan
+ konfigurasi.
+ </p>
+ </li>
+
+ <li>Hindari menetapkan dimensi dengan satuan px, karena satuan ini tidak diskalakan dengan
+ kepadatan layar. Sebagai gantinya, tetapkan dimensi dengan satuan <a href="{@docRoot}guide/practices/screens_support.html">piksel yang tidak bergantung kepadatan
+ </a> (<code>dp</code>).
+ </li>
+</ul>
+
+<h3 id="vision-settings">Vision Settings di Setup Wizard</h3>
+
+<p>
+ Android N menyertakan Vision Settings di layar Sambutan, di mana pengguna bisa
+ menyiapkan setelan aksesibilitas berikut pada perangkat baru:
+ <strong>Magnification gesture</strong>, <strong>Font size</strong>,
+ <strong>Display size</strong> dan <strong>TalkBack</strong>. Perubahan ini
+ meningkatkan visibilitas bug terkait dengan setelan layar yang berbeda. Untuk
+ mengurangi dampak fitur ini, Anda harus menguji aplikasi dengan setelan ini
+ diaktifkan. Anda bisa menemukannya pada <strong>Settings >
+ Accessibility</strong>.
+</p>
+
+<h2 id="ndk">Penautan Aplikasi NDK ke Pustaka Platform</h2>
+
+<p>
+ Android N menyertakan perubahan ruang nama untuk mencegah pemuatan API non-publik.
+ Jika menggunakan NDK, Anda hanya boleh menggunakan API publik dari platform
+ Android. Menggunakan API non-publik dalam rilis Android resmi berikutnya
+ bisa menyebabkan aplikasi mogok.
+</p>
+
+<p>
+ Untuk memberi tahu Anda agar menggunakan API non-publik, aplikasi yang berjalan pada perangkat
+ Android N akan menghasilkan kesalahan dalam keluaran logcat bila aplikasi memanggil API non-publik.
+ Kesalahan ini juga ditampilkan di layar perangkat berupa pesan untuk membantu
+ meningkatkan kepedulian terhadap situasi ini. Anda harus memeriksa kode aplikasi untuk
+ membuang penggunaan API platform non-publik dan secara saksama menguji aplikasi Anda menggunakan
+ perangkat pratinjau atau emulator.
+</p>
+
+<p>
+ Jika aplikasi Anda bergantung pada pustaka platform, lihat dokumentasi NDK untuk
+ perbaikan tipikal guna menggantikan API privat umum dengan padanan API publik.
+ Anda mungkin juga menautkan ke pustaka platform tanpa menyadarinya,
+ terutama jika aplikasi Anda menggunakan pustaka yang merupakan bagian dari platform ini (seperti
+ <code>libpng</code>), namun bukan bagian dari NDK. Dalam hal itu, pastikan
+ APK Anda berisi semua file .so yang ingin ditautkan.
+</p>
+
+<p class="caution">
+ <strong>Perhatian:</strong> Beberapa pustaka pihak ketiga mungkin menautkan ke API
+ non-publik. Jika menggunakan pustaka ini, aplikasi Anda bisa mogok saat dijalankan
+ pada rilis resmi Android berikutnya.
+</p>
+
+<p>
+ Aplikasi tidak boleh bergantung pada atau menggunakan pustaka bawaan yang tidak disertakan dalam
+ NDK, karena bisa mengalami perubahan, atau dipindahkan dari satu rilis Android ke
+ rilis lainnya. Peralihan dari OpenSSL ke BoringSSL merupakan satu contoh dari perubahan semacam ini.
+ Selain itu, perangkat yang berbeda bisa menawarkan tingkat kompatibilitas yang berbeda, karena
+ tidak ada persyaratan kompatibilitas untuk pustaka platform yang tidak disertakan
+ dalam NDK. Jika Anda harus mengakses pustaka non-NDK pada perangkat yang lebih lama, jadikan
+ pemuatan bergantung pada level Android API.
+</p>
+
+<p>
+ Untuk membantu Anda mendiagnosis tipe masalah ini ada beberapa contoh kesalahan Java dan NDK
+ yang mungkin Anda temui saat berusaha membangun aplikasi dengan Android N:
+</p>
+
+<p>Contoh kesalahan Java:</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>Contoh kesalahan NDK:</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ Inilah beberapa perbaikan tipikal untuk aplikasi yang mengalami tipe kesalahan ini:
+</p>
+
+<ul>
+ <li>Penggunaan getJavaVM dan getJNIEnv dari libandroid_runtime.so bisa diganti
+ dengan fungsi JNI standar:
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>Penggunaan simbol {@code property_get} dari {@code libcutils.so} bisa
+ diganti dengan {@code alternative __system_property_get} publik.
+ Caranya, gunakan {@code __system_property_get} dengan menyertakan yang berikut:
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>Penggunaan simbol {@code SSL_ctrl} dari {@code libcrypto.so} harus
+ diganti dengan aplikasi versi lokal. Misalnya, Anda harus menautkan
+ {@code libcyrpto.a} secara statis dalam file {@code .so} atau menyertakan
+ {@code libcrypto.so} Anda sendiri secara dinamis dari BoringSSL atau OpenSSL dalam aplikasi Anda.
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N berisi perubahan untuk aplikasi yang menargetkan Android for Work, termasuk
+ perubahan pada pemasangan sertifikat, penyetelan ulang sandi, manajemen pengguna
+ tambahan, dan akses ke identifier perangkat. Jika Anda membangun aplikasi untuk
+ lingkungan Android for Work, Anda harus meninjau perubahan ini dan memodifikasi
+ aplikasi sebagaimana mestinya.
+</p>
+
+<ul>
+ <li>Anda harus pasang pemasang sertifikat yang didelegasikan sebelum DPC bisa
+ menyetelnya. Untuk aplikasi profil dan aplikasi pemilik perangkat yang menargetkan N SDK, Anda harus
+ pasang pemasang sertifikat yang didelegasikan sebelum pengontrol kebijakan
+ perangkat (DPC) memanggil
+ <code>DevicePolicyManager.setCertInstallerPackage()</code>. Jika pemasang
+ belum dipasang, sistem akan melontarkan
+ <code>IllegalArgumentException</code>.
+ </li>
+
+ <li>Pembatasan sandi penyetelan ulang untuk admin perangkat sekarang diterapkan ke pemilik
+ profil. Admin perangkat tidak bisa lagi menggunakan
+ {@code DevicePolicyManager.resetPassword()} untuk menghapus sandi atau mengubah
+ sandi yang sudah disetel. Admin perangkat tetap bisa menyetel sandi, namun hanya
+ bila perangkat belum memiliki sandi, PIN, atau pola.
+ </li>
+
+ <li>Pemilik perangkat dan profil bisa mengelola akun meskipun pembatasan
+ telah disetel. Pemilik perangkat dan pemilik profil bisa memanggil Account Management API
+ sekalipun pembatasan pengguna <code>DISALLOW_MODIFY_ACCOUNTS</code> diberlakukan.
+ </li>
+
+ <li>Pemilik perangkat bisa mengelola pengguna tambahan lebih mudah. Bila perangkat
+ berjalan dalam mode pemilik perangkat, maka pembatasan <code>DISALLOW_ADD_USER</code>
+ secara otomatis akan ditetapkan. Ini mencegah pengguna membuat pengguna tambahan yang
+ tidak terkelola. Selain itu, <code>CreateUser()</code> dan
+ <code>createAndInitializeUser()</code> metode tidak digunakan lagi; metode
+ <code>DevicePolicyManager.createAndManageUser()</code> telah menggantikannya.
+ </li>
+
+ <li>Pemilik perangkat bisa mengakses identifier perangkat. Pemilik perangkat bisa mengakses
+ alamat MAC Wi-Fi dari perangkat, menggunakan
+ <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Jika Wi-Fi belum pernah
+ diaktifkan pada perangkat tersebut, metode ini akan mengembalikan nilai {@code null}.
+ </li>
+
+ <li>Setelan Mode Kerja mengontrol akses ke aplikasi kerja. Bila mode kerja tidak aktif, peluncur sistem
+ akan menunjukkan aplikasi kerja tidak tersedia dengan membuat warnanya jadi abu-abu. Mengaktifkan kembali
+ mode kerja akan memulihkan perilaku normal.
+</ul>
+
+<p>
+ Untuk informasi selengkapnya tentang perubahan Android for Work di Android N, lihat
+ <a href="{@docRoot}preview/features/afw.html">Pembaruan Android for Work</a>.
+</p>
+
+<h2 id="annotations">Retensi Anotasi</h2>
+
+<p>
+Android N memperbaiki bug dengan visibilitas anotasi diabaikan.
+Masalah ini mengaktifkan waktu proses untuk mengakses anotasi yang seharusnya tidak bisa
+dilakukan. Anotasi ini termasuk:
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}: Dimaksudkan agar hanya bisa terlihat pada waktu pembuatan.</li>
+ <li>{@code VISIBILITY_SYSTEM}: Dimaksud agar bisa terlihat pada waktu proses, namun hanya pada
+ sistem yang mendasarinya.</li>
+</ul>
+
+<p>
+Jika aplikasi Anda mengandalkan perilaku ini, tambahkan kebijakan retensi untuk anotasi yang harus
+tersedia di waktu proses. Caranya dengan menggunakan {@code @Retention(RetentionPolicy.RUNTIME)}.
+</p>
+
+<h2 id="other">Poin Penting Lainnya</h2>
+
+<ul>
+<li>Bila aplikasi berjalan pada Android N, namun menargetkan level API yang lebih rendah,
+dan pengguna mengubah ukuran tampilan, proses aplikasi akan dimatikan. Aplikasi
+harus dapat menangani skenario ini dengan lancar. Jika tidak, maka akan mogok
+bila pengguna memulihkannya dari Recents.
+
+<p>
+Anda harus menguji aplikasi untuk memastikan
+perilaku ini tidak terjadi.
+Anda bisa melakukannya dengan menyebabkan suatu mogok yang identik
+saat mematikan aplikasi secara manual melalui DDMS.
+</p>
+
+<p>
+Aplikasi yang menargetkan N dan yang di atasnya tidak secara otomatis dimatikan saat perubahan kepadatan;
+akan tetapi, aplikasi tersebut mungkin tetap merespons perubahan konfigurasi dengan buruk.
+</p>
+</li>
+
+<li>
+Aplikasi pada Android N harus mampu menangani perubahan konfigurasi dengan lancar,
+dan tidak boleh mengalami mogok pada start selanjutnya. Anda bisa memverifikasi perilaku aplikasi
+dengan mengubah ukuran font (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>), kemudian memulihkan
+aplikasi dari Recents.
+</li>
+
+<li>
+Dikarenakan adanya bug di versi Android sebelumnya, sistem tidak menandai penulisan
+ ke soket TCP di thread utama sebagai pelanggaran mode-ketat. Android N memperbaiki bug ini.
+Aplikasi yang menunjukkan perilaku ini kini melontarkan sebuah {@code android.os.NetworkOnMainThreadException}.
+Secara umum, melakukan operasi jaringan di thread utama tidak baik karena operasi ini
+biasanya memiliki latensi tinggi yang menyebabkan ANR dan jank.
+</li>
+
+<li>
+Kelompok metode {@code Debug.startMethodTracing()} kini default ke
+keluaran penyimpanan di direktori paket tertentu di penyimpanan bersama,
+sebagai ganti di level teratas
+kartu SD. Berarti aplikasi tidak perlu lagi meminta izin {@code WRITE_EXTERNAL_STORAGE} untuk menggunakan API ini.
+</li>
+
+<li>
+Banyak platform API yang kini mulai memeriksa beban besar yang dikirim
+ke seluruh transaksi {@link android.os.Binder}, dan sistem
+kini melontarkan kembali {@code TransactionTooLargeExceptions}
+sebagai {@code RuntimeExceptions}, sebagai ganti logging secara diam-diam atau menyembunyikannya. Satu contoh
+umum adalah menyimpan terlalu banyak data di
+{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
+yang menyebabkan {@code ActivityThread.StopInfo} melontarkan
+{@code RuntimeException} bila aplikasi Anda menargetkan Android N.
+</li>
+
+<li>
+Jika sebuah aplikasi mengeposkan tugas {@link java.lang.Runnable} ke{@link android.view.View}, dan
+{@link android.view.View}
+tidak terpasang ke jendela, sistem
+akan mengantrekan tugas {@link java.lang.Runnable} dengan {@link android.view.View};
+tugas {@link java.lang.Runnable} tidak akan dieksekusi hingga
+{@link android.view.View} terpasang
+ke jendela. Perilaku ini mengatasi bug berikut:
+<ul>
+ <li>Jika sebuah aplikasi mengeposkan ke {@link android.view.View} dari thread selain thread UI jendela yang dimaksud,
+ maka {@link java.lang.Runnable} mungkin akan menjalankan thread yang salah.
+ </li>
+ <li>Jika tugas {@link java.lang.Runnable} diposkan dari thread selain
+ looper-thread, aplikasi bisa mengekspos tugas {@link java.lang.Runnable}.</li>
+</ul>
+</li>
+
+<li>
+Jika sebuah aplikasi di Android N dengan
+izin{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
+mencoba menghapus sebuah paket, namun sebuah aplikasi berbeda telah memasang paket itu,
+sistem akan memerlukan konfirmasi pengguna. Dalam skenario ini, aplikasi harus mengharapkan
+{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
+sebagai status kembalian bila memanggil
+{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
+</li>
+
+</ul>
+
diff --git a/docs/html-intl/intl/in/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/in/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..d31c0c0
--- /dev/null
+++ b/docs/html-intl/intl/in/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=Contoh
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ Contoh kode berikut disediakan untuk Android N. Untuk
+ mengunduh contoh di Android Studio, pilih opsi menu <b>File > Import
+ Samples</b>.
+</p>
+
+<p class="note">
+ <strong>Catatan:</strong> Proyek yang bisa diunduh ini didesain
+ untuk digunakan bersama Gradle dan Android Studio.
+</p>
+
+
+<h3 id="mw">Playground Multi-Jendela</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ Contoh ini memperagakan cara memanfaatkan antarmuka pengguna
+ multi-jendela bersama aplikasi Anda.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+ Dapatkan di GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">Pemberitahuan Aktif</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Ini adalah contoh yang sudah ada sebelumnya, menampilkan layanan sederhana yang mengirimkan
+ pemberitahuan menggunakan NotificationCompat. Setiap percakapan yang belum dibaca dari pengguna
+ dikirimkan sebagai pemberitahuan berbeda.
+</p>
+<p>
+ Contoh ini telah diperbarui untuk memanfaatkan fitur pemberitahuan baru
+ yang tersedia di Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+ Dapatkan di GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">Layanan Perpesanan</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ Ini adalah contoh yang telah ada sebelumnya yang memperagakan cara menggunakan
+ NotificationManager untuk memberi tahu jumlah pemberitahuan yang saat ini ditampilkan
+ oleh aplikasi.
+</p>
+<p>
+ Contoh ini telah diperbarui untuk memanfaatkan fitur pemberitahuan baru
+ yang tersedia di Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+ Dapatkan di GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">Direct Boot</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Contoh ini memperagakan cara menyimpan dan mengakses data dalam penyimpanan yang dienkripsi
+ dengan perangkat yang selalu tersedia saat perangkat booting.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+ Dapatkan di GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">Scoped Directory Access</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Contoh ini memperagakan cara membaca dan menulis data dari direktori
+ spesifik, sekaligus meminta izin lebih sedikit.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+ Dapatkan di GitHub</a>
+</p>
diff --git a/docs/html-intl/intl/in/about/versions/nougat/android-7.0-testing.jd b/docs/html-intl/intl/in/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..94bc74c
--- /dev/null
+++ b/docs/html-intl/intl/in/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Panduan Pengujian
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Dalam dokumen ini</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Izin Pengujian</a></li>
+ <li><a href="#doze-standby">Menguji Istirahatkan dan Aplikasi Siaga</a></li>
+ <li><a href="#ids">Pencadangan Otomatis dan Identifier Perangkat</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N memberi Anda kesempatan untuk memastikan aplikasi bekerja pada
+ platform versi berikutnya. Pratinjau ini berisi beberapa API dan perubahan perilaku yang bisa
+ memengaruhi aplikasi Anda, sebagaimana dijelaskan dalam <a href="{@docRoot}preview/api-overview.html">Ringkasan
+ API</a> dan <a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a>. Dalam menguji
+ aplikasi dengan pratinjau, ada beberapa perubahan sistem spesifik yang harus Anda fokuskan untuk
+ memastikan pengguna mendapatkan pengalaman yang bagus.
+</p>
+
+<p>
+ Panduan ini menjelaskan apa dan bagaimana menguji fitur pratinjau dengan aplikasi Anda. Anda harus
+ mengutamakan pengujian fitur pratinjau spesifik ini, dikarenakan pengaruhnya yang besar pada
+ perilaku aplikasi Anda:
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Izin</a>
+ </li>
+ <li><a href="#doze-standby">Istirahatkan dan Aplikasi Siaga</a>
+ </li>
+ <li><a href="#ids">Pencadangan Otomatis dan Identifier Perangkat</a></li>
+</ul>
+
+<p>
+ Untuk informasi selengkapnya tentang cara menyiapkan perangkat atau perangkat maya dengan citra sistem pratinjau
+ untuk pengujian, lihat <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan
+Android N SDK</a>.
+</p>
+
+
+<h2 id="runtime-permissions">Izin Pengujian</h2>
+
+<p>
+ Model <a href="{@docRoot}preview/features/runtime-permissions.html">Izin</a> yang baru
+ mengubah cara alokasi izin untuk aplikasi Anda oleh pengguna. Sebagai ganti memberi semua
+ izin selama prosedur pemasangan, aplikasi Anda harus meminta izin kepada pengguna secara individual
+ pada waktu proses. Bagi pengguna, perilaku ini memberi kontrol yang lebih detail atas setiap aktivitas aplikasi, dan
+ juga konteks yang lebih untuk memahami sebab aplikasi meminta izin tertentu. Pengguna
+ bisa memberi atau mencabut izin yang diberikan pada suatu aplikasi secara individual kapan saja. Fitur
+ pratinjau ini kemungkinan besar memengaruhi perilaku aplikasi Anda dan mungkin menghambat fungsi beberapa
+ fitur aplikasi Anda, atau mengurangi kualitas kerjanya.
+</p>
+
+<p class="caution">
+ Perubahan ini memengaruhi semua aplikasi yang berjalan di platform baru, bahkan aplikasi yang tidak menargetkan versi
+ platform baru. Platform ini memberikan perilaku kompatibilitas terbatas untuk aplikasi lawas, namun Anda
+ harus mulai merencanakan migrasi aplikasi ke model izin baru sekarang juga, dengan tujuan
+ mempublikasikan versi terbaru aplikasi Anda saat peluncuran platform secara resmi.
+</p>
+
+
+<h3 id="permission-test-tips">Tip pengujian</h3>
+
+<p>
+ Gunakan tip berikut untuk membantu Anda merencanakan dan menjalankan pengujian aplikasi dengan
+ perilaku izin yang baru.
+</p>
+
+<ul>
+ <li>Identifikasi izin aplikasi Anda saat ini dan jalur kode terkait.</li>
+ <li>Uji alur pengguna pada semua layanan dan data yang dilindungi izin.</li>
+ <li>Uji dengan berbagai kombinasi izin yang diberikan/dicabut.</li>
+ <li>Gunakan alat bantu {@code adb} untuk mengelola izin dari baris perintah:
+ <ul>
+ <li>Cantumkan daftar izin dan status berdasarkan kelompok:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Beri atau cabut satu atau beberapa izin menggunakan sintaks berikut:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analisis aplikasi Anda untuk layanan yang menggunakan izin.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Strategi pengujian</h3>
+
+<p>
+ Perubahan izin memengaruhi struktur dan desain aplikasi Anda, begitu juga
+ pengalaman pengguna dan alur yang Anda sediakan untuk pengguna. Anda harus menilai penggunaan izin
+ aplikasi saat ini dan mulai merencanakan alur baru yang ingin ditawarkan. Rilis platform
+ resmi menyediakan perilaku kompatibilitas, namun Anda harus merencanakan pembaruan aplikasi dan tidak
+ bergantung pada perilaku ini.
+</p>
+
+<p>
+ Identifikasi izin yang sebenarnya diperlukan dan digunakan aplikasi Anda, kemudian temukan berbagai
+ jalur kode yang menggunakan layanan yang dilindungi izin. Anda bisa melakukan ini melalui kombinasi
+ pengujian pada platform baru dan analisis kode. Dalam pengujian, Anda harus fokus pada pemilihan
+ izin waktu proses dengan mengubah {@code targetSdkVersion} aplikasi ke versi pratinjau. Untuk
+ informasi selengkapnya, lihat <a href="{@docRoot}preview/setup-sdk.html#">Menyiapkan
+Android N SDK</a>.
+</p>
+
+<p>
+ Uji dengan berbagai kombinasi izin yang dicabut dan ditambahkan, untuk menyoroti alur pengguna yang
+ bergantung pada izin. Jika dependensi tidak jelas atau logis, Anda harus mempertimbangkan
+optimalisasi atau kompartementalisasi alur tersebut untuk mengeliminasi dependensi atau menjelaskan alasan
+ diperlukannya izin.
+</p>
+
+<p>
+ Untuk informasi selengkapnya tentang perilaku izin waktu proses, pengujian, dan praktik terbaik, lihat
+ halaman pratinjau <a href="{@docRoot}preview/features/runtime-permissions.html">Izin</a>
+ pengembang.
+</p>
+
+
+<h2 id="doze-standby">Menguji Istirahatkan dan Aplikasi Siaga</h2>
+
+<p>
+ Fitur penghematan daya Istirahatkan dan Aplikasi Siaga membatasi jumlah pemrosesan latar belakang yang
+ bisa dikerjakan aplikasi Anda saat perangkat dalam keadaan diam atau saat aplikasi Anda sedang tidak fokus. Pembatasan
+ yang dapat diberlakukan oleh sistem pada aplikasi termasuk akses jaringan terbatas atau tidak ada,
+ tugas latar belakang yang ditangguhkan, Pemberitahuan yang ditangguhkan, permintaan membangunkan yang diabaikan, serta alarm. Untuk memastikan
+ aplikasi Anda berperilaku dengan benar pada optimalisasi penghematan daya ini, Anda harus menguji aplikasi dengan
+ menyimulasikan keadaan baterai yang sedang tinggal sedikit ini.
+</p>
+
+<h4 id="doze">Menguji aplikasi Anda dengan Istirahatkan</h4>
+
+<p>Untuk menguji Istirahatkan dengan aplikasi Anda:</p>
+
+<ol>
+<li>Konfigurasikan perangkat keras atau perangkat maya dengan citra sistem Android N.</li>
+<li>Hubungkan perangkat dengan mesin pengembangan dan pasang aplikasi Anda.</li>
+<li>Jalankan aplikasi Anda dan biarkan aktif.</li>
+<li>Simulasikan perangkat yang sedang masuk ke dalam mode Istirahatkan dengan menjalankan perintah berikut:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Amati perilaku aplikasi Anda saat perangkat diaktifkan kembali. Pastikan aplikasi
+ pulih dengan baik saat perangkat keluar dari Istirahatkan.</li>
+</ol>
+
+
+<h4 id="standby">Menguji aplikasi dengan Aplikasi Siaga</h4>
+
+<p>Untuk menguji mode Aplikasi Siaga dengan aplikasi Anda:</p>
+
+<ol>
+ <li>Konfigurasikan perangkat keras atau perangkat maya dengan citra sistem Android N.</li>
+ <li>Hubungkan perangkat dengan mesin pengembangan dan pasang aplikasi Anda.</li>
+ <li>Jalankan aplikasi Anda dan biarkan aktif.</li>
+ <li>Simulasikan aplikasi yang sedang masuk ke dalam mode siaga dengan menjalankan perintah berikut:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simulasikan membangunkan aplikasi Anda menggunakan perintah berikut:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Amati perilaku aplikasi Anda saat dibangunkan. Pastikan aplikasi pulih dengan baik
+ dari mode siaga. Secara khusus, Anda harus memeriksa apakah Pemberitahuan aplikasi dan pekerjaan latar belakang
+ tetap berjalan sebagaimana yang diharapkan.</li>
+</ol>
+
+<h2 id="ids">Auto Backup for Apps dan Identifier Perangkat Spesifik</h2>
+
+<p>Jika aplikasi Anda mempertahankan identifier perangkat spesifik, seperti ID pendaftaran Google
+Cloud Messaging, dalam penyimpanan internal,
+pastikan Anda mengikuti praktik terbaik untuk mengecualikan lokasi
+penyimpanan dari pencadangan otomatis, seperti dijelaskan dalam <a href="{@docRoot}preview/backup/index.html">Auto
+Backup for Apps</a>. </p>
diff --git a/docs/html-intl/intl/in/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/in/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..ff8af12
--- /dev/null
+++ b/docs/html-intl/intl/in/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1039 @@
+page.title=Android N for Developers
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>Fitur-fitur Utama bagi Pengembang</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">Dukungan Multi-Jendela</a></li>
+ <li><a href="#notification_enhancements">Pemberitahuan</a></li>
+ <li><a href="#jit_aot">Kompilasi JIT/AOT</a></li>
+ <li><a href="#quick_path_to_app_install">Jalur Cepat untuk Pasang Aplikasi</a></li>
+ <li><a href="#doze_on_the_go">Istirahatkan Kapan Saja</a></li>
+ <li><a href="#background_optimizations">Optimalisasi Latar Belakang</a></li>
+ <li><a href="#data_saver">Data Saver</a></li>
+ <li><a href="#vulkan">Vulkan API</a></li>
+ <li><a href="#tile_api">Quick Settings Tile API</a></li>
+ <li><a href="#number-blocking">Pemblokiran Nomor</a></li>
+ <li><a href="#call_screening">Penyaringan Panggilan</a></li>
+ <li><a href="#multi-locale_languages">Lokal dan Bahasa</a></li>
+ <li><a href="#emoji">Emoji Baru</a></li>
+ <li><a href="#icu4">ICU4J API di Android</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Perekaman Android TV</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">Aksesibilitas</a></li>
+ <li><a href="#direct_boot">Direct Boot</a></li>
+ <li><a href="#key_attestation">Key Attestation</a></li>
+ <li><a href="#network_security_config">Network Security Config</a></li>
+ <li><a href="#default_trusted_ca">CA Tepercaya Default</a></li>
+ <li><a href="#apk_signature_v2">APK Signature Scheme V2</a></li>
+ <li><a href="#scoped_directory_access">Scoped Directory Access</a></li>
+ <li><a href="#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a></li>
+ <li><a href="#sustained_performance_api">Sustained Performance API</a></li>
+ <li><a href="#vr">Dukungan VR</a></li>
+ <li><a href="#print_svc">Penyempurnaan Layanan Cetak</a></li>
+ <li><a href="#virtual_files">File Maya</a></li>
+ <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N masih dalam pengembangan aktif, namun Anda bisa mencobanya
+sekarang sebagai bagian dari N Developer Preview. Bagian-bagian di bawah ini akan menyoroti sebagian dari
+fitur baru untuk pengembang. </p>
+
+<p>
+ Pastikan memeriksa <a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a> untuk mengetahui selengkapnya tentang
+ bagian-bagian perubahan platform yang bisa memengaruhi aplikasi Anda, lihatlah
+ panduan pengembang untuk mengetahui selengkapnya tentang fitur-fitur utama, dan unduh <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> untuk mengetahui detail tentang
+ API baru.
+</p>
+
+<h2 id="multi-window_support">Dukungan Multi-Jendela</h2>
+
+
+<p>Di Android N, kami memperkenalkan fitur multitasking baru dan yang banyak diminta
+ke dalam platform — dukungan multi-jendela. </p>
+
+ <p>Pengguna sekarang bisa membuka dua aplikasi sekaligus di layar. </p>
+ <ul>
+ <li>Pada ponsel dan tablet
+yang menjalankan Android N, pengguna bisa menjalankan dua aplikasi secara berdampingan atau
+satu aplikasi di atas yang lain dalam mode layar terbagi. Pengguna bisa mengubah ukuran aplikasi dengan menyeret
+pembagi di antara keduanya. </li>
+
+<li>Pada perangkat Android TV, aplikasi bisa menempatkan dirinya sendiri dalam <a href="{@docRoot}preview/features/picture-in-picture.html">mode
+gambar-dalam-gambar</a>, sehingga aplikasi bisa terus menampilkan materi sementara pengguna menjelajahi atau
+berinteraksi dengan aplikasi lain.</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>Gambar 1.</strong> Aplikasi yang berjalan dalam mode layar terbagi.
+</p>
+
+ </div>
+
+<p>Khususnya pada tablet dan perangkat yang berlayar lebih besar lainnya, dukungan multi-jendela
+memberi Anda cara baru untuk memikat pengguna. Anda bahkan bisa mengaktifkan fitur seret-dan-lepas di
+aplikasi untuk memudahkan pengguna menyeret materi ke dan dari aplikasi — cara bagus
+untuk menyempurnakan pengalaman pengguna Anda. </p>
+
+<p>Tidak sulit menambahkan dukungan multi-jendela ke aplikasi Anda dan mengonfigurasi cara
+menangani tampilan multi-jendela. Misalnya, Anda bisa menetapkan dimensi
+minimum yang diizinkan aktivitas, sehingga mencegah pengguna mengubah ukuran aktivitas di bawah
+ukuran itu. Anda juga bisa menonaktifkan tampilan multi-jendela untuk aplikasi Anda, yang
+ akan memastikan sistem hanya menampilkan aplikasi dalam mode layar penuh.</p>
+
+<p>
+ Untuk informasi selengkapnya, lihat dokumentasi pengembang <a href="{@docRoot}preview/features/multi-window.html">Dukungan Multi-Jendela</a>.
+
+</p>
+
+<h2 id="notification_enhancements">Penyempurnaan Pemberitahuan</h2>
+
+<p>Di Android N kami telah mengubah desain pemberitahuan agar lebih mudah dan lebih cepat
+digunakan. Beberapa perubahan tersebut antara lain:</p>
+
+<ul>
+ <li>
+ <strong>Pembaruan template</strong>: Kami telah memperbarui template pemberitahuan untuk
+ lebih menekankan citra pahlawan dan avatar. Pengembang akan dapat
+ memanfaatkan template baru dengan penyesuaian kode yang minimal.
+ </li>
+
+ <li>
+ <strong>Penyesuaian gaya pesan</strong>: Anda bisa menyesuaikan lebih banyak
+ label antarmuka pengguna yang berkaitan dengan pemberitahuan Anda menggunakan kelas
+ <code>MessageStyle</code>. Anda bisa mengonfigurasi pesan, judul percakapan,
+ dan tampilan materi.
+ </li>
+
+ <li>
+ <strong>Bundel pemberitahuan</strong>: Sistem bisa mengelompokkan pesan,
+ misalnya menurut topik pesan, dan menampilkan kelompok pesan tersebut. Seorang pengguna bisa
+ bertindak, misalnya Tutup atau Arsipkan, atas pesan yang ditampilkan. Jika Anda sudah
+ mengimplementasikan pemberitahuan untuk Android Wear, Anda akan terbiasa dengan
+ model ini.
+ </li>
+
+ <li>
+ <strong>Balasan Langsung</strong>: Untuk aplikasi komunikasi real-time, sistem
+ Android mendukung balasan inline sehingga pengguna bisa dengan cepat membalas
+ SMS atau pesan teks secara langsung dari dalam antarmuka pemberitahuan.
+ </li>
+
+ <li>
+ <strong>Tampilan khusus</strong>: Dua API baru memungkinkan Anda memanfaatkan dekorasi sistem,
+ misalnya header pemberitahuan dan tindakan, saat menggunakan tampilan
+ khusus dalam pemberitahuan.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>Gambar 2.</strong> Bundel pemberitahuan dan balasan langsung.
+</p>
+
+<p>Untuk mengetahui cara mengimplementasikan fitur-fitur
+ baru ini, lihat panduan <a href="{@docRoot}preview/features/notification-updates.html">Pemberitahuan</a>.
+</p>
+
+
+
+<h2 id="jit_aot">Kompilasi JIT/AOT yang dipandu profil</h2>
+
+<p>Di Android N, kami telah menambahkan compiler Just in Time (JIT) dengan pembuatan profil kode ke
+ART, yang memungkinkannya terus meningkatkan kinerja aplikasi Android saat
+dijalankan. Compiler JIT melengkapi compiler Ahead of Time (AOT) pada ART
+dan membantu memperbaiki kinerja waktu proses, menghemat ruang penyimpanan, dan mempercepat
+pembaruan aplikasi serta pembaruan sistem.</p>
+
+<p>Kompilasi yang dipandu profil memungkinkan ART mengelola kompilasi AOT/JIT untuk setiap aplikasi
+sesuai dengan penggunaan sebenarnya, serta kondisi pada perangkat. Misalnya
+,ART menyimpan profil setiap metode terbaik aplikasi dan bisa melakukan kompilasi lebih awal
+serta menyimpan sementara metode-metode tersebut di cache untuk mendapatkan kinerja terbaik. Hal ini membuat bagian lain dari aplikasi
+dibiarkan tidak dikompilasi hingga benar-benar digunakan.</p>
+
+<p>Di samping meningkatkan kinerja bagian-bagian penting aplikasi, kompilasi yang dipandu profil
+membantu mengurangi footprint RAM keseluruhan aplikasi, termasuk biner
+terkait. Fitur ini terutama penting pada perangkat dengan memori minim.</p>
+
+<p>ART mengelola kompilasi yang dipandu profil dengan cara yang meminimalkan dampak terhadap
+baterai perangkat. ART melakukan prakompilasi hanya bila perangkat sedang diam dan
+mengisi daya, sehingga menghemat waktu dan baterai dengan melakukan pekerjaan tersebut di awal.</p>
+
+<h2 id="quick_path_to_app_install">Jalur Cepat untuk Pasang Aplikasi</h2>
+
+<p>Salah satu manfaat paling nyata dari compiler JIT pada ART adalah kecepatan
+pemasnagan aplikasi dan pembaruan sistem. Bahkan aplikasi besar yang membutuhkan beberapa menit untuk
+dioptimalkan dan dipasang di Android 6.0 sekarang bisa dipasang hanya dalam hitungan
+detik. Pembaruan sistem juga lebih cepat, karena tidak ada lagi langkah optimalisasi. </p>
+
+<h2 id="doze_on_the_go">Istirahatkan Kapan Saja...</h2>
+
+<p>Android 6.0 memperkenalkan Istirahatkan, yaitu mode sistem yang menghemat baterai dengan menangguhkan
+aktivitas CPU dan jaringan di aplikasi bila perangkat sedang diam, misalnya saat
+diletakkan di atas meja atau dalam laci. </p>
+
+<p>Sekarang di Android N, Istirahatkan selangkah lebih maju dalam menghemat baterai kapan saja.
+Setiap kali layar mati dalam jangka waktu tertentu dan perangkat tidak terhubung ke sumber daya,
+Istirahatkan akan menerapkan subset pembatasan umum CPU dan jaringan pada aplikasi.
+Artinya pengguna bisa menghemat daya baterai meskipun perangkat dibawa di dalam
+tasnya.</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>Gambar 3.</strong> Istirahatkan sekarang menerapkan
+ pembatasan untuk meningkatkan daya tahan baterai bahkan saat perangkat sedang tidak diam.
+</p>
+
+
+<p>Tidak lama setelah layar dimatikan saat perangkat menggunakan daya baterai, Istirahatkan
+akan membatasi akses jaringan serta menangguhkan pekerjaan dan sinkronisasi. Selama jeda
+pemeliharaan, aplikasi diizinkan mengakses jaringan dan menjalankan semua
+pekerjaan/sinkronisasi yang ditangguhkan. Menyalakan layar atau mencolokkan perangkat akan mengeluarkan
+perangkat dari Istirahatkan.</p>
+
+<p>Bila perangkat dalam kondisi diam lagi, dengan layar mati dan menggunakan daya baterai selama
+jangka waktu tertentu, Istirahatkan akan menerapkan pembatasan CPU dan jaringan pada {@link
+android.os.PowerManager.WakeLock}, alarm {@link android.app.AlarmManager}, dan
+pemindaian GPS/Wi-Fi.</p>
+
+<p>Praktik terbaik untuk menyesuaikan aplikasi Anda dengan Istirahatkan adalah sama, baik
+perangkat sedang bergerak maupun diam, jadi jika Anda sudah memperbarui aplikasi untuk
+menjalankan Istirahatkan dengan lancar, berarti Anda sudah siap. Jika belum, mulailah <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">menyesuaikan
+aplikasi Anda dengan Istirahatkan</a> sekarang juga.</p>
+
+<h2 id="background_optimizations">Project Svelte: Optimalisasi Latar Belakang</h2>
+
+<p>Project Svelte merupakan upaya berkelanjutan untuk meminimalkan penggunaan RAM oleh sistem dan aplikasi
+di semua jenis perangkat Android dalam ekosistem. Di Android N, Project
+Svelte berfokus pada optimalisasi cara aplikasi berjalan di latar belakang. </p>
+
+<p>Proses latar belakang merupakan bagian terpenting dari sebagian besar aplikasi. Bila ditangani dengan benar, proses
+ini bisa memberikan pengalaman pengguna yang mengagumkan — segera, cepat, dan sesuai konteks.
+Bila tidak ditangani dengan benar, proses latar belakang bisa menguras RAM (dan
+baterai) yang sebenarnya tidak perlu serta memengaruhi kinerja sistem untuk aplikasi lain. </p>
+
+<p>Sejak Android 5.0, {@link android.app.job.JobScheduler} telah menjadi
+cara yang disukai untuk melakukan pekerjaan latar belakang dengan cara yang baik
+bagi pengguna. Aplikasi bisa menjadwalkan pekerjaan sekaligus memungkinkan sistem mengoptimalkan berdasarkan
+kondisi memori, daya, dan konektivitas. JobScheduler menawarkan kontrol serta
+kemudahan, dan kami ingin semua aplikasi menggunakannya. </p>
+
+<p>
+ Opsi baik lainnya adalah <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+ <code>GCMNetworkManager</code></a>, bagian dari Google Play Services, yang
+ menawarkan penjadwalan pekerjaan serupa dengan kompatibilitas pada semua versi lawas
+ Android.
+</p>
+
+<p>Kami terus memperluas <code>JobScheduler</code> dan
+<code>GCMNetworkManager</code> untuk memenuhi lebih banyak
+kasus penggunaan Anda — misalnya, di Android N Anda sekarang bisa menjadwalkan pekerjaan
+latar belakang berdasarkan perubahan di Content Providers. Pada saat yang sama kami mulai
+menghilangkan beberapa pola lama yang bisa mengurangi kinerja sistem,
+terutama pada perangkat yang minim memori.</p>
+
+<p>Di Android N kami membuang tiga siaran implisit yang umum digunakan —
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE}, dan {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} — karena ketiganya bisa mengaktifkan
+proses latar belakang pada beberapa aplikasi sekaligus serta menguras memori dan baterai. Jika
+aplikasi Anda menerimanya, manfaatkan N Developer Preview untuk
+ beralih ke <code>JobScheduler</code> dan API terkait sebagai gantinya. </p>
+
+<p>
+ Lihat dokumentasi <a href="{@docRoot}preview/features/background-optimization.html">Optimalisasi
+ Latar Belakang</a> untuk mengetahui detailnya.
+</p>
+
+
+<h2 id="data_saver">Data Saver</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>Gambar 4.</strong> Data Saver di Settings.
+</p>
+ </div>
+
+<p>Selama penggunaan perangkat seluler, biaya paket data seluler biasanya
+ melebihi harga perangkat itu sendiri. Bagi banyak pengguna, data seluler adalah sumber daya
+mahal yang ingin mereka hemat. </p>
+
+<p>Android N memperkenalkan mode Data Saver, layanan sistem baru yang mengurangi
+penggunaan data seluler oleh aplikasi, baik saat roaming, mendekati akhir siklus tagihan,
+atau saat menggunakan paket data prabayar yang kecil. Data Saver memberi pengguna kemampuan mengontrol cara aplikasi
+menggunakan data seluler dan memungkinkan pengembang memberikan layanan yang lebih efisien bila Data
+Saver aktif. </p>
+
+<p>Bila pengguna mengaktifkan Data Saver di <strong>Settings</strong> dan perangkat
+dalam jaringan berkuota, sistem akan memblokir penggunaan data latar belakang dan memberi tahu aplikasi
+untuk menghemat penggunaan data latar depan — misalnya dengan membatasi
+kecepatan bit untuk streaming, mengurangi kualitas gambar, menangguhkan precaching optimistik,
+dan seterusnya. Pengguna bisa memasukkan aplikasi tertentu ke daftar putih untuk memungkinkan penggunaan data berkuota
+bila Data Saver diaktifkan.</p>
+
+<p>Android N memperluas {@link android.net.ConnectivityManager} untuk menyediakan cara pada aplikasi
+untuk <a href="{@docRoot}preview/features/data-saver.html#status">mengambil
+preferensi Data Saver pengguna</a> dan <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">memantau
+perubahan preferensi</a>. Semua aplikasi harus memeriksa apakah pengguna telah mengaktifkan Data
+Saver dan berusaha membatasi penggunaan data latar belakang dan latar depan.</p>
+
+
+<h2 id="vulkan">Vulkan API</h2>
+
+<p>
+ Android N mengintegrasikan <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>, sebuah API rendering 3D baru, ke dalam platform. Seperti
+ <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
+ ES</a>, Vulkan merupakan standar terbuka untuk grafik 3D dan rendering yang dikelola
+ oleh Khronos Group.
+</p>
+
+<p>
+ Vulkan didesain dari nol untuk meminimalkan overhead CPU dalam driver,
+ dan memungkinkan aplikasi Anda mengontrol operasi GPU lebih langsung. Vulkan
+ juga memungkinkan paralelisasi yang lebih baik dengan mengizinkan beberapa thread menjalankan
+ pekerjaan seperti pembuatan buffer perintah sekaligus.
+</p>
+
+<p>
+ Pustaka dan alat pengembangan Vulkan telah dimasukkan ke dalam Android NDK. Ini
+ berisi:
+</p>
+
+<ul>
+ <li>Header
+ </li>
+
+ <li>Layer validasi (pustaka debug)
+ </li>
+
+ <li>SPIR-V shader compiler
+ </li>
+
+ <li>Pustaka kompilasi shader waktu proses SPIR-V
+ </li>
+</ul>
+
+<p>
+ Vulkan hanya tersedia untuk aplikasi pada perangkat dengan perangkat keras yang mendukung Vulkan,
+ seperti Nexus 5X, Nexus 6P, dan Nexus Player. Kami bekerja sama erat dengan mitra
+ agar secepatnya makin banyak perangkat yang dilengkapi Vulkan.
+</p>
+
+<p>
+ Untuk informasi selengkapnya, lihat <a href="{@docRoot}ndk/guides/graphics/index.html">dokumentasi API</a>.
+</p>
+
+<h2 id="tile_api">Quick Settings Tile API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>Gambar 5.</strong> Quick Settings Tile dalam bayangan pemberitahuan.
+</p>
+
+
+ </div><p>Quick Settings adalah cara populer dan mudah untuk mengekspos setelan dan tindakan utama,
+langsung dari bayangan pemberitahuan. Di Android N, kami telah memperluas lingkup
+Quick Settings untuk membuatnya lebih berguna dan praktis lagi. </p>
+
+<p>Kami telah menambahkan ruang lebih banyak untuk petak Quick Settings tambahan, yang bisa
+diakses pengguna di semua bagian area tampilan halaman bernomor dengan mengusap ke kiri atau kanan. Kami juga memberi pengguna
+kontrol untuk mengatur letak dan petak Quick Settings apa yang akan
+ditampilkan — pengguna bisa menambahkan atau memindahkan petak dengan menyeret dan melepasnya. </p>
+
+<p>Bagi pengembang, Android N juga menambahkan API baru yang memungkinkan Anda mendefinisikan
+ petak Quick Settings untuk memberi akses mudah kepada pengguna ke berbagai kontrol dan tindakan utama dalam aplikasi Anda.</p>
+
+<p>
+ Petak Quick Settings dicadangkan untuk kontrol atau tindakan yang
+ mendesak atau sering digunakan, dan tidak boleh digunakan sebagai pintasan untuk
+ membuka aplikasi.
+</p>
+
+<p>
+ Setelah mendefinisikan petak, Anda bisa menyediakannya kepada pengguna, yang bisa mereka tambahkan
+ ke Quick Settings cukup dengan seret dan lepas.
+</p>
+
+<p>
+ Untuk informasi tentang pembuatan petak aplikasi, lihat dokumentasi untuk
+ <code>android.service.quicksettings.Tile</code> dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
+</p>
+
+
+
+<h2 id="number-blocking">Pemblokiran Nomor</h2>
+
+<p>Android N sekarang mendukung pemblokiran nomor di platform dan menyediakan
+API kerangka kerja agar penyedia layanan bisa mengelola daftar nomor blokir. Aplikasi SMS
+default, aplikasi telepon default, dan aplikasi operator bisa membaca dari dan
+menulis ke daftar nomor blokir. Daftar ini tidak dapat diakses oleh aplikasi lain.</p>
+
+<p>Dengan membuat pemblokiran nomor sebagai fitur standar pada platformnya, Android menyediakan
+cara konsisten bagi aplikasi untuk mendukung pemblokiran nomor di berbagai
+perangkat. Manfaat lain yang bisa diperoleh aplikasi antara lain:</p>
+
+<ul>
+ <li> Nomor yang diblokir untuk panggilan juga akan diblokir untuk SMS
+ <li> Nomor yang diblokir tetap disimpan saat pengaturan ulang dan pada berbagai perangkat melalui fitur Backup &
+Restore.
+ <li> Beberapa aplikasi sekaligus bisa menggunakan daftar nomor blokir yang sama.
+</ul>
+
+<p>Selain itu, dengan integrasi aplikasi operator melalui Android berarti operator bisa
+membaca daftar nomor blokir pada perangkat dan melakukan pemblokiran di sisi layanan
+bagi pengguna tersebut untuk menghentikan panggilan dan SMS yang tidak diinginkan
+agar tidak sampai ke pengguna lewat media apa pun, misalnya VOIP-endpoint atau meneruskan panggilan telepon.</p>
+
+<p>
+ Untuk informasi selengkapnya, lihat <code>android.provider.BlockedNumberContract</code>
+ dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
+ API</a> yang bisa diunduh.
+</p>
+
+<h2 id="call_screening">Penyaringan Panggilan</h2>
+
+<p>
+ Android N memungkinkan aplikasi telepon default untuk menyaring panggilan masuk. Aplikasi
+ telepon melakukannya dengan mengimplementasikan <code>CallScreeningService</code> baru,
+ yang memungkinkan aplikasi telepon untuk melakukan sejumlah tindakan berdasarkan
+ {@link android.telecom.Call.Details Call.Details} panggilan masuk, misalnya:
+</p>
+
+<ul>
+ <li> Menolak panggilan masuk
+ <li> Tidak mengizinkan panggilan tersebut disimpan ke log panggilan
+ <li> Tidak menampilkan pemberitahuan untuk panggilan tersebut kepada pengguna
+</ul>
+
+<p>
+ Untuk informasi selengkapnya, lihat <code>android.telecom.CallScreeningService</code>
+ dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
+ API</a> yang bisa diunduh.
+</p>
+
+
+<h2 id="multi-locale_languages">Dukungan Multilokal, Lebih Banyak Bahasa yang Didukung</h2>
+
+
+<p>Android N kini memungkinkan pengguna memilih <strong>banyak lokal</strong> di Settings,
+untuk mendukung kasus penggunaan dwibahasa dengan lebih baik. Aplikasi bisa menggunakan
+API baru untuk mendapatkan lokal pilihan pengguna kemudian menawarkan pengalaman pengguna
+yang lebih canggih untuk pengguna multilokal — seperti menampilkan hasil telusur dalam
+banyak bahasa dan tidak menawarkan untuk menerjemahkan halaman web dalam bahasa
+yang sudah diketahui pengguna.</p>
+
+<p>Bersama dukungan multilokal, Android N juga memperluas ragam bahasa
+yang tersedia untuk pengguna. Masing-masing ditawarkan lebih dari 25 varian untuk bahasa yang umum
+digunakan seperti Inggris, Spanyol, Prancis, dan Arab. Juga ditambahkan dukungan
+parsial untuk lebih dari 100 bahasa baru.</p>
+
+<p>Aplikasi bisa mendapatkan daftar lokal yang disetel oleh pengguna dengan memanggil
+<code>LocaleList.GetDefault()</code>. Untuk mendukung jumlah lokal yang diperluas, Android N sedang
+ mengubah cara mengatasi masalah sumber daya. Pastikan Anda menguji dan memverifikasi bahwa aplikasi Anda
+berfungsi seperti yang diharapkan dengan logika resolusi sumber daya baru.</p>
+
+<p>Untuk mengetahui tentang perilaku resolusi sumber daya baru dan praktik terbaik yang
+harus Anda ikuti, lihat <a href="{@docRoot}preview/features/multilingual-support.html">Dukungan Multibahasa</a>.</p>
+
+
+<h2 id="emoji">Emoji Baru</h2>
+
+<p>
+ Android N memperkenalkan emoji tambahan dan fitur terkait emoji termasuk
+ emoji warna kulit dan dukungan untuk pemilih
+ variasi. Jika aplikasi Anda mendukung emoji,
+ ikuti panduan berikut untuk memanfaatkan fitur terkait emoji ini.
+</p>
+
+<ul>
+ <li>
+ <strong>Periksa apakah perangkat berisi emoji sebelum memasukannya.</strong>
+ Untuk memeriksa emoji mana yang terdapat di
+ font sistem, gunakan metode {@link android.graphics.Paint#hasGlyph(String)}.
+ </li>
+ <li>
+ <strong>Periksa apakah emoji mendukung pemilih variasi.</strong>
+ Pemilih variasi memungkinkan Anda
+ menampilkan emoji tertentu berwarna atau hitam-putih.
+ Pada perangkat seluler, aplikasi akan menghadirkan emoji berwarna daripada hitam-putih. Akan tetapi,
+ jika aplikasi Anda menampilkan emoji sebaris dengan teks, maka harus menggunakan variasi hitam-putih.
+ Untuk menentukan apakah sebuah emoji memiliki variasi, gunakan pemilih variasi.
+ Untuk daftar lengkap dari karakter dengan variasinya, tinjaulah bagian
+ <em>rangkaian variasi emoji</em> pada
+ <a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
+ dokumentasi Unicode mengenai variasi</a>.
+ </li>
+ <li>
+ <strong>Periksa apakah emoji mendukung warna kulit.</strong> Android N memungkinkan pengguna memodifikasi
+ warna kulit emoji yang dirender sesuai dengan preferensi mereka. Aplikasi keyboard harus menyediakan indikasi
+ visual untuk emoji yang memiliki beberapa warna kulit dan harus memungkinkan pengguna
+ memilih warna kulit yang mereka sukai. Untuk menentukan apakah emoji sistem memiliki
+ modifier warna kulit, gunakan metode {@link android.graphics.Paint#hasGlyph(String)}.
+ Anda bisa menentukan emoji mana yang menggunakan warna kulit dengan membaca
+ <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
+ dokumentasi Unicode</a>.
+ </li>
+</ul>
+
+
+<h2 id="icu4">ICU4J API di Android</h2>
+
+<p>
+ Android N kini menawarkan subset <a href="http://site.icu-project.org/">ICU4J</a> API dalam kerangka kerja Android pada paket
+ <code>android.icu</code>. Migrasi mudah, dan biasanya hanya perlu
+ mengubah dari ruang nama <code>com.java.icu</code> ke
+ <code>android.icu</code>. Jika Anda sudah menggunakan bundel ICU4J dalam aplikasi,
+ maka beralih ke <code>android.icu</code> API yang disediakan dalam kerangka kerja
+ Android bisa menghasilkan penghematan besar dalam ukuran APK.
+</p>
+
+<p>
+ Untuk mengetahui selengkapnya tentang Android ICU4J API, lihat <a href="{@docRoot}preview/features/icu4j-framework.html">Dukungan ICU4J</a>.
+</p>
+
+
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>Android N menambahkan antarmuka kerangka kerja dan dukungan platform untuk OpenGL ES 3.2, termasuk:</p>
+
+<ul>
+ <li> Semua ekstensi dari <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
+Android Extension Pack</a></a> (AEP) kecuali untuk <code>EXT_texture_sRGB_decode</code>.
+ <li> Floating-point framebuffer untuk HDR dan shading yang ditangguhkan.
+ <li> Panggilan draw BaseVertex agar batching dan streaming jadi lebih baik.
+ <li> Kontrol akses buffer yang tangguh untuk mengurangi overhead WebGL.
+</ul>
+
+<p>API kerangka kerja untuk OpenGL ES 3.2 di Android N dilengkapi dengan kelas
+ <code>GLES32</code>. Saat menggunakan OpenGL ES 3.2, pastikan
+mendeklarasikan persyaratan dalam file manifes Anda, dengan tag <code><uses-feature></code> dan
+atribut <code>android:glEsVersion</code>. </p>
+
+<p>Untuk informasi tentang menggunakan OpenGL ES, termasuk cara memeriksa versi
+OpenGL ES yang didukung perangkat saat waktu proses, lihat <a href="{@docRoot}guide/topics/graphics/opengl.html">Panduan OpenGL ES API</a>.</p>
+
+
+<h2 id="android_tv_recording">Perekaman Android TV</h2>
+
+<p>Android N menambahkan kemampuan untuk merekam dan memutar kembali materi dari layanan masukan
+Android TV melalui API perekaman baru. Karena dibangun dengan API perekaman yang sudah
+ada, layanan masukan TV bisa mengontrol data saluran apa yang bisa direkam, cara menyimpan
+sesi rekaman, dan mengelola interaksi pengguna dengan materi rekaman. </p>
+
+<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}preview/features/tv-recording-api.html">API Perekaman Android TV</a>.</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work menambahkan berbagai fitur dan API baru untuk perangkat yang menjalankan Android N.
+Beberapa fitur unggulannya ada di bawah ini — untuk mengetahui daftar lengkap perubahannya, lihat
+<a href="{@docRoot}preview/features/afw.html">Pembaruan Android for Work</a>.</p>
+
+<h3 id="work_profile_security_challenge">Pertanyaan Keamanan Profil Kerja </h3>
+
+<p>
+ Pemilik profil yang menargetkan N SDK
+ bisa menetapkan pertanyaan keamanan terpisah untuk aplikasi yang berjalan di
+ profil kerja. Pertanyaan kerja ditampilkan bila pengguna mencoba membuka
+ aplikasi kerja apa pun. Jawaban pertanyaan keamanan yang benar akan membuka
+ profil kerja dan mendekripsinya jika diperlukan. Untuk pemilik profil,
+ <code>ACTION_SET_NEW_PASSWORD</code> akan meminta pengguna untuk menetapkan pertanyaan
+ kerja, dan <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> meminta
+ pengguna menyetel kunci perangkat.
+</p>
+
+<p>
+ Pemilik profil bisa menyetel kebijakan kode sandi untuk pertanyaan kerja
+ (seperti berapa lama seharusnya PIN, atau apakah sidik jari bisa digunakan
+ untuk membuka kunci profil) menggunakan <code>setPasswordQuality()</code>,
+ <code>setPasswordMinimumLength()</code> dan metode terkait. Pemilik profil
+ juga bisa menyetel kunci perangkat, menggunakan instance <code>DevicePolicyManager</code>
+ yang dikembalikan oleh metode <code>getParentProfileInstance()</code> baru.
+ Selain itu, pemilik profil bisa menyesuaikan layar kredensial untuk
+ pertanyaan kerja menggunakan metode baru <code>setOrganizationColor()</code> dan
+ <code>setOrganizationName()</code>.
+</p>
+<h3 id="turn_off_work">Menonaktifkan pekerjaan </h3>
+
+<p>Pada perangkat dengan profil kerja, pengguna bisa beralih mode kerja. Bila mode
+kerja dinonaktifkan, profil yang dikelola akan dinonaktifkan untuk sementara, yang akan menonaktifkan aplikasi
+profil kerja, sinkronisasi latar belakang, dan pemberitahuan. Termasuk aplikasi pemilik
+profil. Bila profil kerja dinonaktifkan, sistem akan menampilkan ikon status
+tetap untuk mengingatkan pengguna bahwa mereka tidak bisa meluncurkan aplikasi kerja. Peluncur
+menunjukkan bahwa aplikasi kerja dan widget tidak bisa diakses. </p>
+
+<h3 id="always_on_vpn">Always-On VPN </h3>
+
+<p>Pemilik perangkat dan pemilik profil bisa memastikan bahwa aplikasi kerja selalu menghubungkan
+melalui VPN yang ditetapkan. Sistem secara otomatis akan memulai VPN itu setelah booting
+perangkat.</p>
+
+<p>
+ Metode <code>DevicePolicyManager</code> baru adalah
+ <code>setAlwaysOnVpnPackage()</code> dan
+ <code>getAlwaysOnVpnPackage()</code>.
+</p>
+
+<p>Karena layanan VPN bisa diikat langsung oleh sistem tanpa interaksi
+aplikasi, klien VPN perlu menangani titik masuk baru untuk Always-On VPN. Seperti
+sebelumnya, layanan ditunjukkan ke sistem melalui
+tindakan pencocokan filter intent <code>android.net.VpnService</code>. </p>
+
+<p>
+ Pengguna bisa secara manual menyetel klien Always-On VPN yang mengimplementasikan
+ metode <code>VPNService</code> dalam pengguna utama dengan menggunakan
+ <strong>Settings>More>Vpn</strong>.
+</p>
+
+<h3 id="custom_provisioning">Penyediaan yang disesuaikan</h3>
+
+<p>
+ Aplikasi bisa menyesuaikan alur penyediaan pemilik profil dan pemilik perangkat
+ dengan warna dan logo perusahaan.
+ <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> menyesuaikan
+ warna alur. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
+ menyesuaikan alur dengan logo perusahaan.
+</p>
+
+<h2 id="accessibility_enhancements">Penyempurnaan Aksesibilitas</h2>
+
+<p>Android N saat ini menawarkan Vision Settings langsung di layar Sambutan untuk
+persiapan perangkat baru. Ini sangat memudahkan pengguna untuk menemukan dan mengonfigurasi
+fitur aksesibilitas pada perangkat mereka, termasuk isyarat perbesaran, ukuran
+font, ukuran layar, dan TalkBack. </p>
+
+<p>Dengan fitur aksesibilitas yang penempatannya semakin jelas, pengguna Anda
+kemungkinan besar akan mencoba aplikasi dengan fitur-fitur yang diaktifkan itu. Pastikan Anda menguji aplikasi
+lebih dini dengan mengaktifkan dahulu setelan ini. Anda bisa mengaktifkannya dari Settings >
+Accessibility.</p>
+
+<p>Di Android N, layanan aksesibilitas sekarang bisa membantu pengguna yang mengalami gangguan
+motorik untuk menyentuh layar. API baru memungkinkan membangun layanan dengan
+fitur-fitur seperti pelacakan wajah, pelacakan mata, pemindaian titik, dan seterusnya, untuk
+memenuhi kebutuhan para pengguna tersebut.</p>
+
+<p>Untuk informasi selengkapnya, lihat <code>android.accessibilityservice.GestureDescription</code>
+ dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.</p>
+
+
+<h2 id="direct_boot">Direct Boot</h2>
+
+<p>Direct Boot memperbaiki waktu startup perangkat dan memungkinkan aplikasi
+yang telah didaftarkan memiliki fungsionalitas terbatas bahkan setelah boot ulang tak terduga.
+Misalnya, jika perangkat yang dienkripsi melakukan boot ulang selagi pengguna tidur,
+alarm terdaftar, pesan dan panggilan masuk sekarang bisa terus memberi tahu
+pengguna seperti biasa. Ini juga berarti layanan aksesibilitas bisa
+ segera tersedia setelah restart.</p>
+
+<p>Direct Boot memanfaatkan enkripsi berbasis file di Android N
+untuk mengaktifkan kebijakan enkripsi yang telah disesuaikan bagi sistem dan data aplikasi.
+Sistem akan menggunakan penyimpanan yang dienkripsi dengan perangkat untuk data sistem terpilih dan data
+aplikasi yang terdaftar secara eksplisit. Secara default, penyimpanan yang dienkripsi dengan kredensial digunakan untuk semua
+ data sistem lainnya, data pengguna, aplikasi, dan data aplikasi. </p>
+
+<p>Saat booting, sistem dimulai dalam mode terbatas dengan akses
+ke data yang dienkripsi dengan perangkat saja, dan tanpa akses umum ke aplikasi atau data.
+Jika Anda memiliki komponen yang ingin Anda jalankan dalam mode ini, Anda bisa mendaftarkannya
+dengan menyetel flag dalam manifes. Setelah restart, sistem akan mengaktifkan
+komponen terdaftar dengan menyiarkan intent <code>LOCKED_BOOT_COMPLETED</code>.
+ Sistem akan memastikan data aplikasi yang dienkripsi dengan perangkat tersedia
+sebelum membuka kunci. Semua data lainnya tidak tersedia sebelum Pengguna mengonfirmasi
+ kredensial layar kunci mereka untuk mendekripsinya. </p>
+
+Untuk informasi selengkapnya, lihat <a href="{@docRoot}preview/features/direct-boot.html">Direct Boot</a>.</p>
+</p>
+
+
+<h2 id="key_attestation">Key Attestation</h2>
+
+<p>Keystore yang didukung perangkat keras menyediakan metode yang jauh lebih aman untuk membuat, menyimpan,
+dan menggunakan kunci kriptografi pada perangkat Android. Keystore itu melindungi kunci dari
+kernel Linux, potensi kerentanan Android, dan ekstraksi
+dari perangkat yang di-root.</p>
+
+<p>Agar lebih mudah dan lebih aman dalam menggunakan keystore yang didukung perangkat keras,
+Android N memperkenalkan Key Attestation. Aplikasi dan perangkat-nonaktif bisa menggunakan Key
+Attestation untuk menentukan apakah penyandingan kunci RSA atau EC
+didukung perangkat keras, apa properti dari penyandingan kunci, dan batasan
+ apa yang diterapkan terhadap penggunaan dan validitasnya. </p>
+
+<p>Aplikasi dan layanan perangkat-nonaktif bisa meminta informasi tentang penyandingan kunci
+melalui sertifikat pengesahan X.509 yang harus ditandatangani dengan kunci
+pengesahan yang valid. Kunci pengesahan adalah kunci penandatanganan ECDSA yang
+telah diinjeksikan ke dalam keystore yang didukung perangkat keras pada perangkat saat di pabriknya.
+Karena itu, sertifikat pengesahan yang ditandatangani oleh kunci pengesahan yang
+valid akan mengonfirmasi keberadaan keystore yang didukung perangkat keras, bersama
+ detail pasangan kunci dalam keystore itu.</p>
+
+<p>Untuk memastikan perangkat ini menggunakan citra Android resmi yang
+aman dari pabrik, Key Attestation mengharuskan <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a> perangkat
+menyediakan informasi berikut pada <a class="external-link" href="https://source.android.com/security/trusty/index.html">Trusted
+Execution Environment (TEE)</a>:</p>
+
+<ul>
+<li>Versi OS dan level patch yang dipasang pada perangkat</li>
+<li>Kunci publik <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> dan status kunci</li>
+ </ul>
+
+<p>Untuk informasi selengkapnya tentang fitur keystore yang didukung perangkat keras,
+lihat panduan untuk <a href="https://source.android.com/security/keystore/" class="external-link">Keystore yang Didukung Perangkat Keras</a>.</p>
+
+<p>Selain Key Attestation, Android N juga memperkenalkan
+ kunci yang terikat sidik jari yang tidak dipanggil saat pendaftaran sidik jari.</p>
+
+<h2 id="network_security_config">Network Security Config</h2>
+
+<p>Di Android N, aplikasi bisa menyesuaikan perilaku koneksi aman mereka
+(HTTPS, TLS) secara aman, tanpa modifikasi kode, dengan menggunakan
+<em>Network Security Config</em> deklaratif sebagai ganti menggunakan API programatik
+konvensional yang rawan kesalahan (mis. X509TrustManager).</p>
+
+ <p>Fitur yang didukung:</p>
+<ul>
+<li><b>Trust-anchor khusus.</b> Memungkinkan aplikasi menyesuaikan
+Certificate Authorities (CA) mana yang dipercaya untuk koneksi amannya. Misalnya,
+mempercayai sertifikat tertentu yang ditandatangani sendiri atau set CA publik yang dibatasi.
+</li>
+<li><b>Penggantian hanya-debug.</b> Memungkinkan pengembang aplikasi dengan aman men-debug
+koneksi aman aplikasi mereka tanpa menambah risiko pada basis yang sudah
+dipasang.
+</li>
+<li><b>Berhenti dari lalu lintas cleartext.</b> Memungkinkan aplikasi melindungi dirinya sendiri dari
+penggunaan lalu lintas cleartext yang tidak disengaja.</li>
+<li><b>Penyematan sertifikat.</b> Sebuah fitur canggih yang memungkinkan aplikasi
+ membatasi kunci server mana yang dipercaya untuk koneksi aman.</li>
+</ul>
+
+<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}preview/features/security-config.html">Network Security
+Config</a>.</p>
+
+<h2 id="default_trusted_ca">Certificate Authority Tepercaya Default</h2>
+
+<p>Secara default, aplikasi yang menargetkan Android N hanya mempercayai sertifikat yang disediakan sistem
+dan tidak lagi mempercayai Certificate Authorities (CA) yang ditambahkan pengguna. Aplikasi yang menargetkan Android
+N dan ingin mempercayai CA yang ditambahkan pengguna harus menggunakan
+<a href="{@docRoot}preview/features/security-config.html">Network Security Config</a> untuk
+menetapkan cara mempercayai CA pengguna.</p>
+
+<h2 id="apk_signature_v2">APK Signature Scheme v2</h2>
+
+<p>
+ Android N memperkenalkan APK Signature Scheme v2, sebuah skema penandatanganan aplikasi baru yang
+ menawarkan waktu pasang aplikasi lebih cepat dan lebih banyak perlindungan terhadap perubahan
+ tidak sah pada file APK. Secara default, Android Studio 2.2 dan Android
+ Plugin untuk Gradle 2.2 menandatangani aplikasi Anda menggunakan APK Signature Scheme v2 dan
+ skema penandatanganan tradisional, yang menggunakan penandatanganan JAR.
+</p>
+
+<p>
+ Meskipun kami menyarankan untuk menerapkan APK Signature Scheme v2 pada aplikasi Anda, skema
+ baru ini tidak wajib. Jika aplikasi Anda tidak dibangun dengan benar saat menggunakan APK
+ Signature Scheme v2, Anda bisa menonaktifkan skema baru ini. Proses penonaktifan
+ menyebabkan Android Studio 2.2 dan Android Plugin untuk Gradle 2.2 menandatangani aplikasi Anda
+ menggunakan skema penandatanganan tradisional saja. Untuk menandatangani dengan
+ skema tradisional saja, buka file <code>build.gradle</code> level-modul, kemudian
+ tambahkan baris <code>v2SigningEnabled false</code> ke konfigurasi
+ penandatanganan rilis Anda:
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>Perhatian: </strong> Jika Anda menandatangani aplikasi menggunakan APK
+ Signature Scheme v2 dan membuat perubahan lebih jauh pada aplikasi, tanda tangan aplikasi
+ menjadi tidak valid. Untuk alasan ini, gunakan alat seperti <code>zipalign</code>
+ sebelum menandatangani aplikasi Anda menggunakan APK Signature Scheme v2, bukan setelahnya.
+</p>
+
+<p>
+ Untuk informasi selengkapnya, baca dokumen Android Studio yang menjelaskan cara
+ <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
+ menandatangani aplikasi</a> di Android Studio dan cara<a href="{@docRoot}studio/build/build-variants.html#signing"> mengonfigurasi
+ file build untuk menandatangani aplikasi</a> menggunakan Android Plugin untuk Gradle.
+</p>
+
+<h2 id="scoped_directory_access">Scoped Directory Access</h2>
+
+<p>Di Android N, aplikasi bisa menggunakan API baru untuk meminta akses ke direktori <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">penyimpanan
+eksternal</a> tertentu, termasuk direktori di media lepas-pasang seperti kartu
+SD. API baru ini sangat menyederhanakan cara aplikasi Anda mengakses direktori
+penyimpanan eksternal standar, seperti direktori <code>Pictures</code>. Aplikasi
+seperti aplikasi foto bisa menggunakan API ini sebagai ganti menggunakan
+<code>READ_EXTERNAL_STORAGE</code>, yang memberikan akses ke semua direktori
+penyimpanan, atau Storage Access Framework, yang membuat pengguna mengarah ke
+direktori tersebut.</p>
+
+<p>Selain itu, API baru ini menyederhanakan langkah-langkah yang diambil pengguna untuk memberikan akses
+penyimpanan eksternal ke aplikasi Anda. Bila Anda menggunakan API baru, sistem akan menggunakan UI izin
+sederhana yang memperinci dengan jelas direktori apa yang aksesnya diminta
+oleh aplikasi.</p>
+
+<p>Untuk informasi selengkapnya, lihat dokumentasi pengembang
+<a href="{@docRoot}preview/features/scoped-folder-access.html">Scoped
+Directory Access</a>.</p>
+
+<h2 id="keyboard_shortcuts_helper">Keyboard Shortcuts Helper</h2>
+
+<p>
+Di Android N, pengguna bisa menekan "Alt + /" untuk memunculkan layar <em>Keyboard Shortcuts</em>
+yang menampilkan semua pintasan yang tersedia baik dari sistem maupun dari
+aplikasi yang sedang mendapatkan fokus. Ini diambil secara otomatis dari menu aplikasi
+jika tersedia, namun pengembang bisa menyediakan daftar pintasan yang telah disesuaikan
+untuk layar. Anda bisa melakukannya dengan mengganti metode
+<code>Activity.onProvideKeyboardShortcuts()</code> baru, yang dijelaskan dalam
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
+</p>
+
+<p>
+Untuk memunculkan Keyboard Shortcuts Helper dari mana saja di aplikasi Anda,
+panggil {@code Activity.requestKeyboardShortcutsHelper()} untuk aktivitas terkait.
+</p>
+
+<h2 id="sustained_performance_api">Sustained Performance API</h2>
+
+<p>
+Kinerja bisa berfluktuasi secara dramatis untuk aplikasi yang berjalan lama, karena
+sistem melakukan throttle pada mesin sistem-di-chip saat komponen perangkat mencapai
+batas suhunya. Fluktuasi ini memberikan target bergerak bagi pengembang
+aplikasi yang sedang membuat aplikasi berkinerja tinggi dan berjalan lama.
+</p>
+
+<p>
+Untuk menangani batasan ini, Android N menyertakan dukungan untuk
+<em>mode kinerja kontinu</em>, yang memungkinkan OEM memberikan petunjuk mengenai kemampuan kinerja
+perangkat untuk aplikasi yang berjalan lama. Pengembang aplikasi
+bisa menggunakan petunjuk ini untuk menyesuaikan aplikasi agar kinerja perangkat bisa diprediksi
+dan pada level yang konsisten dalam jangka waktu lama.
+</p>
+
+<p>
+Pengembang aplikasi bisa mencoba API baru ini dalam N Developer Preview pada
+perangkat Nexus 6P saja. Untuk menggunakan fitur ini,
+setel flag jendela kinerja kontinu
+yang ingin Anda jalankan dalam mode kinerja kontinu. Setel flag ini menggunakan metode
+{@code Window.setSustainedPerformanceMode()}. Sistem secara otomatis
+akan menonaktifkan mode ini bila jendela tidak lagi mendapatkan fokus.
+</p>
+
+<h2 id="vr">Dukungan VR</h2>
+
+<p>
+Android N menambahkan dukungan platform dan optimalisasi untuk VR Mode baru yang memungkinkan
+pengembang membuat pengalaman VR berkualitas tinggi di seluler bagi para pengguna. Ada banyak perbaikan
+kinerja, termasuk akses ke inti CPU yang eksklusif untuk aplikasi VR.
+Di dalam aplikasi, Anda bisa memanfaatkan pelacakan kepala yang cerdas,
+dan pemberitahuan stereo yang bekerja untuk VR. Hal terpenting adalah Android N menyediakan
+grafis dengan latensi sangat rendah. Untuk informasi selengkapnya tentang membangun aplikasi VR untuk Android N,
+lihat <a href="https://developers.google.com/vr/android/">Google VR SDK untuk Android</a>.
+</p>
+
+
+<h2 id="print_svc">Penyempurnaan Layanan Cetak</h2>
+
+<p>
+ Di Android N, pengembang layanan cetak kini bisa menampilkan informasi tambahan
+ tentang masing-masing printer dan pekerjaan cetak.
+</p>
+
+<p>
+ Saat mendaftarkan masing-masing printer, layanan cetak kini bisa menyetel
+ ikon per printer dalam dua cara:
+</p>
+
+<ul>
+ <li>Anda bisa menyetel ikon dari ID sumber daya dengan memanggil
+ <code>PrinterInfo.Builder.setResourceIconId()</code>
+ </li>
+
+ <li>Anda bisa menampilkan ikon dari jaringan dengan memanggil
+ <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>, dan menyetel sebuah
+ callback bila ikon diminta menggunakan
+ <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>
+ </li>
+</ul>
+
+<p>
+ Selain itu, Anda bisa menyediakan aktivitas per printer untuk menampilkan informasi
+ tambahan dengan memanggil <code>PrinterInfo.Builder.setInfoIntent()</code>.
+</p>
+
+<p>
+ Anda bisa menunjukkan kemajuan dan status pekerjaan cetak di
+ pemberitahuan pekerjaan cetak dengan memanggil masing-masing
+ <code>android.printservice.PrintJob.setProgress()</code> dan
+ <code>android.printservice.PrintJob.setStatus()</code>.
+</p>
+
+<p>
+ Untuk informasi selengkapnya tentang metode ini,lihat dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
+</p>
+
+<h2 id="framemetrics_api">FrameMetricsListener API</h2>
+
+<p>
+FrameMetricsListener API memungkinkan aplikasi untuk memantau
+kinerja rendering UI. API tersebut menyediakan kemampuan ini dengan mengekspos Pub/Sub API streaming
+untuk mentransfer info frame-timing untuk jendela aplikasi saat ini. Data yang dikembalikan
+setara dengan yang ditampilkan <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code>, namun tidak dibatasi pada 120 bingkai.
+</p>
+
+<p>
+Anda bisa menggunakan FrameMetricsListener untuk mengukur kinerja UI
+level interaksi di produksi, tanpa koneksi USB. API
+ini memungkinkan pengumpulan data dengan granularitas lebih tinggi daripada
+{@code adb shell dumpsys gfxinfo}. Granularitas lebih tinggi ini dimungkinkan karena
+sistem bisa mengumpulkan data untuk interaksi tertentu di aplikasi; sistem
+tidak perlu merekam ringkasan global untuk keseluruhan kinerja
+aplikasi, atau mengosongkan status global yang ada. Anda bisa menggunakan kemampuan ini
+untuk mengumpulkan data kinerja dan menangkap regresi di kinerja UI
+untuk kasus penggunaan sungguhan di dalam aplikasi.
+</p>
+
+<p>
+Untuk memantau sebuah jendela, implementasikan metode callback <code>FrameMetricsListener.onMetricsAvailable()</code>
+dan daftarkan di jendela itu. Untuk informasi selengkapnya, lihat
+dokumentasi kelas {@code FrameMetricsListener} di
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
+</p>
+
+<p>
+API menyediakan objek {@code FrameMetrics}, yang berisi data timing yang
+dilaporkan subsistem rendering untuk berbagai tahap pencapaian dalam daur hidup bingkai.
+Metrik yang didukung adalah: {@code UNKNOWN_DELAY_DURATION},
+{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
+{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
+{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
+{@code TOTAL_DURATION}, dan {@code FIRST_DRAW_FRAME}.
+</p>
+
+
+<h2 id="virtual_files">File Maya</h2>
+
+<p>
+ Di versi Android sebelumnya, aplikasi Anda bisa menggunakan Storage Access
+ Framework untuk memungkinkan pengguna memilih file dari akun penyimpanan awan mereka,
+ seperti Google Drive. Akan tetapi, tidak ada cara untuk merepresentasikan file yang
+ tidak memiliki representasi bytecode langsung; setiap file diharuskan menyediakan
+ aliran masukan.
+</p>
+
+<p>
+ Android N menambahkan konsep <em>file maya</em> pada Storage Access
+ Framework. Fitur file maya memungkinkan
+ {@link android.provider.DocumentsProvider} Anda mengembalikan URI dokumen yang bisa
+ digunakan bersama intent {@link android.content.Intent#ACTION_VIEW} sekalipun
+ tidak memiliki representasi bytecode langsung. Android N juga memungkinkan Anda untuk
+ menyediakan format alternatif untuk file pengguna, maya atau dengan cara lain.
+</p>
+
+<p>
+ Untuk mendapatkan URI sebuah dokumen maya di aplikasi Anda, terlebih dahulu Anda membuat
+ {@link android.content.Intent} untuk membuka UI pemilih file. Karena aplikasi
+ tidak bisa membuka file maya secara langsung dengan menggunakan metode
+ {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()},
+ aplikasi Anda tidak akan menerima file maya jika Anda memasukkan kategori
+ {@link android.content.Intent#CATEGORY_OPENABLE}.
+</p>
+
+<p>
+ Setelah pengguna menentukan pilihan, sistem akan memanggil metode
+ {@link android.app.Activity#onActivityResult onActivityResult()}.
+ Aplikasi Anda bisa mengambil URI file maya dan mendapatkan aliran masukan, seperti yang
+ diperagakan dalam cuplikan kode di bawah.
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ Untuk informasi selengkapnya tentang mengakses file pengguna, lihat
+ <a href="{@docRoot}guide/topics/providers/document-provider.html">Panduan Storage
+ Access Frameworks</a>.
+</p>
diff --git a/docs/html-intl/intl/in/preview/index.jd b/docs/html-intl/intl/in/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/in/preview/index.jd
rename to docs/html-intl/intl/in/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/in/design/get-started/principles.jd b/docs/html-intl/intl/in/design/get-started/principles.jd
index 9aed08e..2a1d194 100644
--- a/docs/html-intl/intl/in/design/get-started/principles.jd
+++ b/docs/html-intl/intl/in/design/get-started/principles.jd
@@ -277,7 +277,7 @@
<div class="col-7">
<h4 id="do-heavy-lifting-for-me">Lakukan pekerjaan yang sulit untuk saya</h4>
-<p>Buatlah pemula merasa seperti ahli dengan memungkinkan mereka untuk melakukan hal-hal yang mereka pikir tidak akan bisa.
+<p>Buatlah pemula merasa seperti ahli dengan memungkinkan mereka untuk melakukan hal-hal yang mereka pikir tidak akan bisa.
Misalnya, pintasan yang menggabungkan beberapa efek foto dapat membuat foto amatir terlihat mengagumkan hanya
dalam beberapa langkah.</p>
diff --git a/docs/html-intl/intl/in/design/patterns/navigation.jd b/docs/html-intl/intl/in/design/patterns/navigation.jd
index a8afaaa..4915700 100644
--- a/docs/html-intl/intl/in/design/patterns/navigation.jd
+++ b/docs/html-intl/intl/in/design/patterns/navigation.jd
@@ -121,7 +121,7 @@
kejadian tersebut, dan menyediakan path bagi pengguna untuk menjelajah ke dalam aplikasi. Pemberitahuan dengan gaya seperti ini
disebut <em>pemberitahuan tidak langsung</em>.</p>
-<p>Berbeda dengan pemberitahuan standar (langsung), menekan tombol Back dari
+<p>Berbeda dengan pemberitahuan standar (langsung), menekan tombol Back dari
layar antara pada pemberitahuan tidak langsung akan mengembalikan pengguna ke titik pemicu pemberitahuan tersebut—tidak ada
layar tambahan yang disisipkan ke dalam back-stack. Setelah pengguna melanjutkan ke dalam aplikasi dari
layar antara, tombol Up dan Back akan berperilaku seperti pada pemberitahuan standar, sebagaimana dijelaskan di atas:
@@ -168,7 +168,7 @@
informasi dan semua tindakan terkait yang dapat dilakukan pengguna. Aplikasi Anda adalah kumpulan
aktivitas, yang terdiri dari aktivitas yang Anda buat dan aktivitas yang Anda gunakan ulang dari aplikasi lain.</p>
-<p><strong>Tugas</strong> adalah urutan aktivitas yang diikuti pengguna untuk mencapai tujuan.
+<p><strong>Tugas</strong> adalah urutan aktivitas yang diikuti pengguna untuk mencapai tujuan.
Tugas tunggal dapat memanfaatkan aktivitas dari satu aplikasi saja, atau dapat memanfaatkan aktivitas dari sejumlah
aplikasi berbeda.</p>
diff --git a/docs/html-intl/intl/in/guide/components/activities.jd b/docs/html-intl/intl/in/guide/components/activities.jd
index 6cac696..bbc061c 100644
--- a/docs/html-intl/intl/in/guide/components/activities.jd
+++ b/docs/html-intl/intl/in/guide/components/activities.jd
@@ -53,7 +53,7 @@
<p> Sebuah aplikasi biasanya terdiri atas beberapa aktivitas yang terikat secara longgar
satu sama lain. Biasanya, satu aktivitas dalam aplikasi ditetapkan sebagai aktivitas "utama", yang
ditampilkan kepada pengguna saat membuka aplikasi untuk pertama kali. Tiap
-aktivitas kemudian bisa memulai aktivitas lain untuk melakukan berbagai tindakan. Tiap kali
+aktivitas kemudian bisa memulai aktivitas lain untuk melakukan berbagai tindakan. Tiap kali
aktivitas baru dimulai, aktivitas sebelumnya akan dihentikan, namun sistem mempertahankan aktivitas
dalam sebuah tumpukan ("back-stack"). Bila sebuah aktivitas baru dimulai, aktivitas itu akan didorong ke atas back-stack dan
mengambil fokus pengguna. Back-stack mematuhi mekanisme dasar tumpukan "masuk terakhir, keluar pertama",
@@ -67,7 +67,7 @@
Ada beberapa metode callback yang mungkin diterima aktivitas, karena sebuah perubahan dalam
statusnya—apakah sistem sedang membuatnya, menghentikannya, melanjutkannya, atau menghapuskannya—dan
masing-masing callback memberi Anda kesempatan melakukan pekerjaan tertentu yang
-sesuai untuk perubahan status itu. Misalnya, bila dihentikan, aktivitas Anda harus melepas
+sesuai untuk perubahan status itu. Misalnya, bila dihentikan, aktivitas Anda harus melepas
objek besar, seperti koneksi jaringan atau database. Bila aktivitas dilanjutkan, Anda bisa
memperoleh kembali sumber daya yang diperlukan dan melanjutkan tindakan yang terputus. Transisi status ini
semuanya bagian dari daur hidup aktivitas.</p>
@@ -89,7 +89,7 @@
<dl>
<dt>{@link android.app.Activity#onCreate onCreate()}</dt>
<dd>Anda harus mengimplementasikan metode ini. Sistem memanggilnya saat membuat
- aktivitas Anda. Dalam implementasi, Anda harus menginisialisasi komponen-komponen esensial
+ aktivitas Anda. Dalam implementasi, Anda harus menginisialisasi komponen-komponen esensial
aktivitas.
Yang terpenting, inilah tempat Anda harus memanggil {@link android.app.Activity#setContentView
setContentView()} untuk mendefinisikan layout untuk antarmuka pengguna aktivitas.</dd>
@@ -115,7 +115,7 @@
tombol yang mengawali suatu tindakan bila pengguna menyentuhnya.</p>
<p>Android menyediakan sejumlah tampilan siap-dibuat yang bisa Anda gunakan untuk mendesain dan mengatur
-layout. "Widget" adalah tampilan yang menyediakan elemen-elemen visual (dan interaktif) untuk layar,
+layout. "Widget" adalah tampilan yang menyediakan elemen-elemen visual (dan interaktif) untuk layar,
misalnya tombol, bidang teks, kotak cek, atau sekadar sebuah gambar. "Layout" adalah tampilan yang diturunkan dari {@link
android.view.ViewGroup} yang memberikan sebuah model layout unik untuk tampilan anaknya, misalnya
layout linier, layout grid, atau layout relatif. Anda juga bisa mensubkelaskan kelas-kelas {@link android.view.View} dan
@@ -124,7 +124,7 @@
<p>Cara paling umum untuk mendefinisikan layout dengan menggunakan tampilan adalah dengan file layout XML yang disimpan dalam
sumber daya aplikasi Anda. Dengan cara ini, Anda bisa memelihara desain antarmuka pengguna Anda secara terpisah dari
-kode yang mendefinisikan perilaku aktivitas. Anda bisa mengatur layout sebagai UI
+kode yang mendefinisikan perilaku aktivitas. Anda bisa mengatur layout sebagai UI
aktivitas Anda dengan {@link android.app.Activity#setContentView(int) setContentView()}, dengan meneruskan
ID sumber daya untuk layout itu. Akan tetapi, Anda juga bisa membuat {@link android.view.View} baru dalam
kode aktivitas dan membuat hierarki tampilan dengan menyisipkan {@link
@@ -169,7 +169,7 @@
<p>Elemen <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code
<activity>}</a> juga bisa menetapkan berbagai filter intent—dengan menggunakan elemen <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
-<intent-filter>}</a> —untuk mendeklarasikan cara komponen aplikasi lain
+<intent-filter>}</a> —untuk mendeklarasikan cara komponen aplikasi lain
mengaktifkannya.</p>
<p>Bila Anda membuat aplikasi baru dengan Android SDK Tools, aktivitas stub
@@ -251,7 +251,7 @@
<p>Ekstra {@link android.content.Intent#EXTRA_EMAIL} yang ditambahkan ke intent adalah sebuah larik string
alamat email yang menjadi tujuan pengiriman email. Bila aplikasi email merespons intent ini,
- aplikasi itu akan membaca larik string yang disediakan dalam ekstra dan meletakkannya dalam bidang "to"
+ aplikasi itu akan membaca larik string yang disediakan dalam ekstra dan meletakkannya dalam bidang "to"
pada formulir penulisan email. Dalam situasi ini, aktivitas aplikasi email dimulai dan bila
pengguna selesai, aktivitas Anda akan dilanjutkan.</p>
@@ -297,7 +297,7 @@
</pre>
<p>Contoh ini menunjukkan logika dasar yang harus Anda gunakan dalam metode {@link
-android.app.Activity#onActivityResult onActivityResult()} Anda untuk menangani
+android.app.Activity#onActivityResult onActivityResult()} Anda untuk menangani
hasil aktivitas. Syarat pertama memeriksa apakah permintaan berhasil—jika ya, maka
{@code resultCode} akan berupa {@link android.app.Activity#RESULT_OK}—dan apakah permintaan
yang direspons hasil ini dikenal—dalam hal ini, {@code requestCode} cocok dengan
@@ -602,19 +602,19 @@
menyusuri kembali ke aktivitas tersebut. Namun, pengguna tidak menyadari
bahwa sistem memusnahkan aktivitas dan membuatnya kembali dan, karena itu, mungkin
mengharapkan aktivitas untuk sama persis dengan sebelumnya. Dalam situasi ini, Anda bisa memastikan bahwa
-informasi penting tentang status aktivitas tetap terjaga dengan mengimplementasikan
+informasi penting tentang status aktivitas tetap terjaga dengan mengimplementasikan
metode callback tambahan yang memungkinkan Anda menyimpan informasi tentang status aktivitas: {@link
android.app.Activity#onSaveInstanceState onSaveInstanceState()}.</p>
<p>Sistem memanggil {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}
sebelum membuat aktivitas rawan terhadap pemusnahan. Sistem meneruskan ke metode ini
-sebuah {@link android.os.Bundle} tempat Anda bisa menyimpan
+sebuah {@link android.os.Bundle} tempat Anda bisa menyimpan
informasi status tentang aktivitas sebagai pasangan nama-nilai, dengan menggunakan metode-metode misalnya {@link
android.os.Bundle#putString putString()} dan {@link
android.os.Bundle#putInt putInt()}. Kemudian, jika sistem mematikan proses aplikasi Anda
dan pengguna menyusuri kembali ke aktivitas tersebut, sistem akan membuat kembali aktivitas dan meneruskan
{@link android.os.Bundle} ke {@link android.app.Activity#onCreate onCreate()} maupun {@link
-android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}. Dengan menggunakan salah satu
+android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}. Dengan menggunakan salah satu
metode ini, Anda bisa mengekstrak status tersimpan dari {@link android.os.Bundle} dan memulihkan
status aktivitas. Jika tidak ada informasi status untuk dipulihkan, maka {@link
android.os.Bundle} yang diteruskan kepada adalah Anda null (yang akan terjadi bila aktivitas dibuat untuk
@@ -639,7 +639,7 @@
<p>Akan tetapi, sekalipun Anda tidak melakukan apa-apa dan tidak mengimplementasikan {@link
android.app.Activity#onSaveInstanceState onSaveInstanceState()}, beberapa status aktivitas
akan dipulihkan oleh implementasi default {@link
-android.app.Activity#onSaveInstanceState onSaveInstanceState()} dalam kelas {@link android.app.Activity}. Khususnya,
+android.app.Activity#onSaveInstanceState onSaveInstanceState()} dalam kelas {@link android.app.Activity}. Khususnya,
implementasi default akan memanggil metode {@link
android.view.View#onSaveInstanceState onSaveInstanceState()} yang sesuai untuk setiap {@link
android.view.View} dalam layout, yang memungkinkan setiap tampilan untuk memberi informasi tentang dirinya
@@ -696,7 +696,7 @@
, dan bahasa). Bila terjadi perubahan demikian, Android akan membuat kembali aktivitas yang berjalan
(sistem akan memanggil {@link android.app.Activity#onDestroy}, kemudian segera memanggil {@link
android.app.Activity#onCreate onCreate()}). Perilaku ini
-didesain untuk membantu aplikasi Anda menyesuaikan diri dengan konfigurasi baru dengan cara memuat ulang
+didesain untuk membantu aplikasi Anda menyesuaikan diri dengan konfigurasi baru dengan cara memuat ulang
aplikasi Anda secara otomatis dengan sumber daya alternatif yang telah Anda sediakan (misalnya layout yang berbeda untuk
layar orientasi dan ukuran yang berbeda).</p>
@@ -722,7 +722,7 @@
akan berhenti sementara dan berhenti sama sekali (walau tidak akan berhenti jika masih terlihat di latar belakang), saat
aktivitas lain dibuat. Jika aktivitas-aktivitas ini berbagi data yang disimpan ke disk atau di tempat lain, Anda perlu
memahami bahwa aktivitas pertama tidak dihentikan sepenuhnya sebelum aktivitas kedua dibuat.
-Sebagai gantinya, proses akan memulai aktivitas kedua secara tumpang tindih dengan proses penghentian
+Sebagai gantinya, proses akan memulai aktivitas kedua secara tumpang tindih dengan proses penghentian
aktivitas pertama.</p>
<p>Urutan callback daur hidup didefinisikan dengan baik, khususnya bila kedua aktivitas berada dalam
diff --git a/docs/html-intl/intl/in/guide/components/bound-services.jd b/docs/html-intl/intl/in/guide/components/bound-services.jd
index 5d1f65e..6e5e65a 100644
--- a/docs/html-intl/intl/in/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/in/guide/components/bound-services.jd
@@ -137,7 +137,7 @@
android.os.Message}. {@link android.os.Handler}
ini adalah dasar bagi {@link android.os.Messenger} yang nanti bisa berbagi {@link android.os.IBinder}
dengan klien, sehingga memungkinkan klien mengirim perintah ke layanan dengan menggunakan objek {@link
-android.os.Message}. Selain itu, klien bisa mendefinisikan sendiri {@link android.os.Messenger}
+android.os.Message}. Selain itu, klien bisa mendefinisikan sendiri {@link android.os.Messenger}
sehingga layanan bisa mengirim balik pesan.
<p>Inilah cara termudah melakukan komunikasi antarproses (IPC), karena {@link
android.os.Messenger} akan mengantre semua permintaan ke dalam satu thread sehingga Anda tidak perlu mendesain
@@ -539,7 +539,7 @@
</ol>
<p>Misalnya, cuplikan berikut menghubungkan klien ke layanan yang dibuat di atas dengan
-<a href="#Binder">memperluas kelas Binder</a>, sehingga tinggal mengkonversi
+<a href="#Binder">memperluas kelas Binder</a>, sehingga tinggal mengkonversi
{@link android.os.IBinder} yang dihasilkan ke kelas {@code LocalService} dan meminta instance {@code
LocalService}:</p>
@@ -573,7 +573,7 @@
</pre>
<ul>
- <li>Parameter pertama {@link android.content.Context#bindService bindService()} adalah sebuah
+ <li>Parameter pertama {@link android.content.Context#bindService bindService()} adalah sebuah
{@link android.content.Intent} yang secara eksplisit menyebutkan layanan yang akan diikat (walaupun intent
boleh implisit).</li>
<li>Parameter kedua adalah objek {@link android.content.ServiceConnection}.</li>
diff --git a/docs/html-intl/intl/in/guide/components/fragments.jd b/docs/html-intl/intl/in/guide/components/fragments.jd
index 14d4ef3..9f7199c 100644
--- a/docs/html-intl/intl/in/guide/components/fragments.jd
+++ b/docs/html-intl/intl/in/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>Lihat juga</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Membangun UI Dinamis dengan Fragmen</a></li>
@@ -47,32 +47,32 @@
</div>
<p>{@link android.app.Fragment} mewakili perilaku atau bagian dari antarmuka pengguna dalam
-{@link android.app.Activity}. Anda bisa mengombinasikan beberapa fragmen dalam satu aktivitas untuk membangun UI
-multipanel dan menggunakan kembali sebuah fragmen dalam beberapa aktivitas. Anda bisa menganggap fragmen sebagai bagian
-modular dari aktivitas, yang memiliki daur hidup sendiri, menerima kejadian input sendiri, dan
-yang bisa Anda tambahkan atau hapus saat aktivitas berjalan (semacam "sub aktivitas" yang
+{@link android.app.Activity}. Anda bisa mengombinasikan beberapa fragmen dalam satu aktivitas untuk membangun UI
+multipanel dan menggunakan kembali sebuah fragmen dalam beberapa aktivitas. Anda bisa menganggap fragmen sebagai bagian
+modular dari aktivitas, yang memiliki daur hidup sendiri, menerima kejadian input sendiri, dan
+yang bisa Anda tambahkan atau hapus saat aktivitas berjalan (semacam "sub aktivitas" yang
bisa digunakan kembali dalam aktivitas berbeda).</p>
-<p>Fragmen harus selalu tertanam dalam aktivitas dan daur hidup fragmen secara langsung
+<p>Fragmen harus selalu tertanam dalam aktivitas dan daur hidup fragmen secara langsung
dipengaruhi oleh daur hidup aktivitas host-nya. Misalnya, saat aktivitas dihentikan sementara,
semua fragmen di dalamnya juga dihentikan sementara, dan bila aktivitas dimusnahkan, semua fragmen juga demikian. Akan tetapi, saat
-aktivitas berjalan (dalam <a href="{@docRoot}guide/components/activities.html#Lifecycle">status daur hidup</a> <em>dilanjutkan</em>, Anda bisa
-memanipulasi setiap fragmen secara terpisah, seperti menambah atau menghapusnya. Saat melakukan transaksi
+aktivitas berjalan (dalam <a href="{@docRoot}guide/components/activities.html#Lifecycle">status daur hidup</a> <em>dilanjutkan</em>, Anda bisa
+memanipulasi setiap fragmen secara terpisah, seperti menambah atau menghapusnya. Saat melakukan transaksi
fragmen, Anda juga bisa menambahkannya ke back-stack yang dikelola oleh aktivitas
-—setiap entri back-stack merupakan record transaksi fragmen yang
+—setiap entri back-stack merupakan record transaksi fragmen yang
terjadi. Dengan back-stack pengguna dapat membalikkan transaksi fragmen (mengarah mundur),
dengan menekan tombol <em>Back</em>.</p>
<p>Bila Anda menambahkan fragmen sebagai bagian dari layout aktivitas, fragmen itu berada dalam {@link
-android.view.ViewGroup} di hierarki tampilan aktivitas tersebut dan fragmen mendefinisikan
+android.view.ViewGroup} di hierarki tampilan aktivitas tersebut dan fragmen mendefinisikan
layout
tampilannya sendiri. Anda bisa menyisipkan fragmen ke dalam layout aktivitas dengan mendeklarasikan fragmen dalam file layout aktivitas
, sebagai elemen {@code <fragment>}, atau dari kode aplikasi dengan menambahkannya ke
- {@link android.view.ViewGroup} yang ada. Akan tetapi, fragmen tidak harus menjadi bagian dari
-layout aktivitas; Anda juga bisa menggunakan fragmen tanpa UI-nya sendiri sebagai pekerja tak terlihat untuk
+ {@link android.view.ViewGroup} yang ada. Akan tetapi, fragmen tidak harus menjadi bagian dari
+layout aktivitas; Anda juga bisa menggunakan fragmen tanpa UI-nya sendiri sebagai pekerja tak terlihat untuk
aktivitas tersebut.</p>
-<p>Dokumen ini menjelaskan cara membangun aplikasi menggunakan fragmen, termasuk
+<p>Dokumen ini menjelaskan cara membangun aplikasi menggunakan fragmen, termasuk
cara fragmen mempertahankan statusnya bila ditambahkan ke back-stack aktivitas, berbagi
kejadian dengan aktivitas, dan fragmen lain dalam aktivitas, berkontribusi pada action-bar
aktivitas, dan lainnya.</p>
@@ -80,45 +80,45 @@
<h2 id="Design">Filosofi Desain</h2>
-<p>Android memperkenalkan fragmen di Android 3.0 (API level 11), terutama untuk mendukung desain UI yang lebih
-dinamis dan fleksibel pada layar besar, seperti tablet. Karena
-layar tablet jauh lebih besar daripada layar handset, maka lebih banyak ruang untuk mengombinasikan dan
-bertukar komponen UI. Fragmen memungkinkan desain seperti itu tanpa perlu mengelola perubahan
-kompleks pada hierarki tampilan. Dengan membagi layout aktivitas menjadi beberapa fragmen, Anda bisa
-mengubah penampilan aktivitas saat runtime dan mempertahankan perubahan itu di back-stack
+<p>Android memperkenalkan fragmen di Android 3.0 (API level 11), terutama untuk mendukung desain UI yang lebih
+dinamis dan fleksibel pada layar besar, seperti tablet. Karena
+layar tablet jauh lebih besar daripada layar handset, maka lebih banyak ruang untuk mengombinasikan dan
+bertukar komponen UI. Fragmen memungkinkan desain seperti itu tanpa perlu mengelola perubahan
+kompleks pada hierarki tampilan. Dengan membagi layout aktivitas menjadi beberapa fragmen, Anda bisa
+mengubah penampilan aktivitas saat runtime dan mempertahankan perubahan itu di back-stack
yang dikelola oleh aktivitas.</p>
-<p>Misalnya, aplikasi berita bisa menggunakan satu fragmen untuk menampilkan daftar artikel di
-sebelah kiri dan fragmen lainnya untuk menampilkan artikel di sebelah kanan—kedua fragmen ini muncul di satu
-aktivitas, berdampingan, dan masing-masing fragmen memiliki serangkaian metode callback daur hidup dan menangani kejadian input
+<p>Misalnya, aplikasi berita bisa menggunakan satu fragmen untuk menampilkan daftar artikel di
+sebelah kiri dan fragmen lainnya untuk menampilkan artikel di sebelah kanan—kedua fragmen ini muncul di satu
+aktivitas, berdampingan, dan masing-masing fragmen memiliki serangkaian metode callback daur hidup dan menangani kejadian input
penggunanya sendiri. Sehingga, sebagai ganti menggunakan satu aktivitas untuk memilih
-artikel dan aktivitas lainnya untuk membaca artikel, pengguna bisa memilih artikel dan membaca semuanya dalam
+artikel dan aktivitas lainnya untuk membaca artikel, pengguna bisa memilih artikel dan membaca semuanya dalam
aktivitas yang sama, sebagaimana diilustrasikan dalam layout tablet pada gambar 1.</p>
-<p>Anda harus mendesain masing-masing fragmen sebagai komponen aktivitas modular dan bisa digunakan kembali. Yakni, karena
-setiap fragmen mendefinisikan layoutnya dan perilakunya dengan callback daur hidupnya sendiri, Anda bisa memasukkan
+<p>Anda harus mendesain masing-masing fragmen sebagai komponen aktivitas modular dan bisa digunakan kembali. Yakni, karena
+setiap fragmen mendefinisikan layoutnya dan perilakunya dengan callback daur hidupnya sendiri, Anda bisa memasukkan
satu fragmen dalam banyak aktivitas, sehingga Anda harus mendesainnya untuk digunakan kembali dan mencegah
-memanipulasi satu fragmen dari fragmen lain secara langsung. Ini terutama penting karena dengan
-fragmen modular Anda bisa mengubah kombinasi fragmen untuk ukuran layar berbeda. Saat mendesain aplikasi
-untuk mendukung tablet maupun handset, Anda bisa menggunakan kembali fragmen dalam
+memanipulasi satu fragmen dari fragmen lain secara langsung. Ini terutama penting karena dengan
+fragmen modular Anda bisa mengubah kombinasi fragmen untuk ukuran layar berbeda. Saat mendesain aplikasi
+untuk mendukung tablet maupun handset, Anda bisa menggunakan kembali fragmen dalam
konfigurasi layout berbeda untuk mengoptimalkan pengalaman pengguna berdasarkan ruang layar yang tersedia. Misalnya
-, pada handset, fragmen mungkin perlu dipisahkan untuk menyediakan UI panel tunggal
+, pada handset, fragmen mungkin perlu dipisahkan untuk menyediakan UI panel tunggal
bila lebih dari satu yang tidak cocok dalam aktivitas yang sama.</p>
<img src="{@docRoot}images/fundamentals/fragments.png" alt="" />
<p class="img-caption"><strong>Gambar 1.</strong> Contoh cara dua modul UI yang didefinisikan oleh
- fragmen bisa digabungkan ke dalam satu aktivitas untuk desain tablet, namun dipisahkan untuk
+ fragmen bisa digabungkan ke dalam satu aktivitas untuk desain tablet, namun dipisahkan untuk
desain handset.</p>
<p>Misalnya—untuk melanjutkan contoh aplikasi berita— aplikasi bisa menanamkan
dua fragmen dalam <em>Aktivitas A</em>, saat berjalan pada perangkat berukuran tablet. Akan tetapi, pada
-layar berukuran handset, ruang untuk kedua fragmen tidak cukup, sehingga <em>Aktivitas A</em> hanya
-menyertakan fragmen untuk daftar artikel, dan saat pengguna memilih artikel,
-<em>Aktivitas B</em> akan dimulai, termasuk fragmen kedua untuk membaca artikel. Sehingga, aplikasi mendukung
+layar berukuran handset, ruang untuk kedua fragmen tidak cukup, sehingga <em>Aktivitas A</em> hanya
+menyertakan fragmen untuk daftar artikel, dan saat pengguna memilih artikel,
+<em>Aktivitas B</em> akan dimulai, termasuk fragmen kedua untuk membaca artikel. Sehingga, aplikasi mendukung
tablet dan handset dengan menggunakan kembali fragmen dalam kombinasi berbeda, seperti diilustrasikan dalam
gambar 1.</p>
-<p>Untuk informasi selengkapnya tentang mendesain aplikasi menggunakan kombinasi fragmen berbeda
+<p>Untuk informasi selengkapnya tentang mendesain aplikasi menggunakan kombinasi fragmen berbeda
untuk konfigurasi layar berbeda, lihat panduan untuk <a href="{@docRoot}guide/practices/tablets-and-handsets.html">Mendukung Tablet dan Handset</a>.</p>
@@ -131,26 +131,26 @@
aktivitasnya berjalan).</p>
</div>
-<p>Untuk membuat fragmen, Anda harus membuat subkelas {@link android.app.Fragment} (atau
-subkelasnya yang ada). Kelas {@link android.app.Fragment} memiliki kode yang mirip seperti
+<p>Untuk membuat fragmen, Anda harus membuat subkelas {@link android.app.Fragment} (atau
+subkelasnya yang ada). Kelas {@link android.app.Fragment} memiliki kode yang mirip seperti
{@link android.app.Activity}. Kelas ini memiliki metode callback yang serupa dengan aktivitas, seperti
{@link android.app.Fragment#onCreate onCreate()}, {@link android.app.Fragment#onStart onStart()},
{@link android.app.Fragment#onPause onPause()}, dan {@link android.app.Fragment#onStop onStop()}. Sebenarnya
, jika Anda mengkonversi aplikasi Android saat ini untuk menggunakan fragmen, Anda mungkin cukup memindahkan
-kode dari metode callback aktivitas ke masing-masing metode callback
+kode dari metode callback aktivitas ke masing-masing metode callback
fragmen.</p>
<p>Biasanya, Anda harus mengimplementasikan setidaknya metode daur hidup berikut ini:</p>
<dl>
<dt>{@link android.app.Fragment#onCreate onCreate()}</dt>
- <dd>Sistem akan memanggilnya saat membuat fragmen. Dalam implementasi, Anda harus
-menginisialisasi komponen penting dari fragmen yang ingin dipertahankan saat fragmen
+ <dd>Sistem akan memanggilnya saat membuat fragmen. Dalam implementasi, Anda harus
+menginisialisasi komponen penting dari fragmen yang ingin dipertahankan saat fragmen
dihentikan sementara atau dihentikan, kemudian dilanjutkan.</dd>
<dt>{@link android.app.Fragment#onCreateView onCreateView()}</dt>
- <dd>Sistem akan memanggilnya saat fragmen menggambar antarmuka penggunanya
-untuk yang pertama kali. Untuk menggambar UI fragmen, Anda harus mengembalikan {@link android.view.View} dari metode
-ini yang menjadi akar layout fragmen. Hasil yang dikembalikan bisa berupa null jika
+ <dd>Sistem akan memanggilnya saat fragmen menggambar antarmuka penggunanya
+untuk yang pertama kali. Untuk menggambar UI fragmen, Anda harus mengembalikan {@link android.view.View} dari metode
+ini yang menjadi akar layout fragmen. Hasil yang dikembalikan bisa berupa null jika
fragmen tidak menyediakan UI.</dd>
<dt>{@link android.app.Activity#onPause onPause()}</dt>
<dd>Sistem akan memanggil metode ini sebagai indikasi pertama bahwa pengguna sedang meninggalkan
@@ -161,7 +161,7 @@
<p>Kebanyakan aplikasi harus mengimplementasikan setidaknya tiga metode ini untuk setiap fragmen, namun ada
beberapa metode callback lain yang juga harus Anda gunakan untuk menangani berbagai tahap
-daur hidup fragmen. Semua metode callback daur hidup akan dibahas secara lebih detail, di bagian
+daur hidup fragmen. Semua metode callback daur hidup akan dibahas secara lebih detail, di bagian
tentang <a href="#Lifecycle">Menangani Daur Hidup Fragmen</a>.</p>
@@ -171,15 +171,15 @@
<dl>
<dt>{@link android.app.DialogFragment}</dt>
<dd>Menampilkan dialog mengambang. Penggunaan kelas ini untuk membuat dialog merupakan alternatif yang baik dari
-penggunaan metode helper dialog di kelas {@link android.app.Activity}, karena Anda bisa
-menyatukan dialog fragmen ke dalam back-stack fragmen yang dikelola oleh aktivitas,
+penggunaan metode helper dialog di kelas {@link android.app.Activity}, karena Anda bisa
+menyatukan dialog fragmen ke dalam back-stack fragmen yang dikelola oleh aktivitas,
sehingga pengguna bisa kembali ke fragmen yang ditinggalkan.</dd>
<dt>{@link android.app.ListFragment}</dt>
<dd>Menampilkan daftar item yang dikelola oleh adaptor (seperti {@link
android.widget.SimpleCursorAdapter}), serupa dengan {@link android.app.ListActivity}. Menampilkan
beberapa metode pengelolaan daftar tampilan seperti callback {@link
-android.app.ListFragment#onListItemClick(ListView,View,int,long) onListItemClick()} untuk
+android.app.ListFragment#onListItemClick(ListView,View,int,long) onListItemClick()} untuk
menangani kejadian klik.</dd>
<dt>{@link android.preference.PreferenceFragment}</dt>
@@ -196,7 +196,7 @@
<p>Untuk menyediakan layout fragmen, Anda harus mengimplementasikan metode callback {@link
android.app.Fragment#onCreateView onCreateView()}, yang dipanggil sistem Android
-bila tiba saatnya fragmen menggambar layoutnya. Implementasi Anda atas metode ini harus mengembalikan
+bila tiba saatnya fragmen menggambar layoutnya. Implementasi Anda atas metode ini harus mengembalikan
{@link android.view.View} yang menjadi akar layout fragmen.</p>
<p class="note"><strong>Catatan:</strong> Jika fragmen adalah subkelas {@link
@@ -205,7 +205,7 @@
<p>Untuk mengembalikan layout dari {@link
android.app.Fragment#onCreateView onCreateView()}, Anda bisa memekarkannya dari <a href="{@docRoot}guide/topics/resources/layout-resource.html">sumber daya layout</a> yang didefinisikan di XML. Untuk
-membantu melakukannya, {@link android.app.Fragment#onCreateView onCreateView()} menyediakan objek
+membantu melakukannya, {@link android.app.Fragment#onCreateView onCreateView()} menyediakan objek
{@link android.view.LayoutInflater}.</p>
<p>Misalnya, ini adalah subkelas {@link android.app.Fragment} yang memuat layout dari file
@@ -227,7 +227,7 @@
<h3>Membuat layout</h3>
<p>Dalam contoh di atas, {@code R.layout.example_fragment} merupakan acuan ke sumber daya layout
bernama {@code example_fragment.xml} yang tersimpan dalam sumber daya aplikasi. Untuk informasi tentang cara
-membuat layout di XML, lihat dokumentasi
+membuat layout di XML, lihat dokumentasi
<a href="{@docRoot}guide/topics/ui/index.html">Antarmuka Pengguna</a>.</p>
</div>
</div>
@@ -235,12 +235,12 @@
<p>Parameter {@code container} yang diteruskan ke {@link android.app.Fragment#onCreateView
onCreateView()} adalah induk {@link android.view.ViewGroup} (dari layout aktivitas) tempat
layout fragmen
-akan disisipkan. Parameter {@code savedInstanceState} adalah {@link android.os.Bundle} yang
+akan disisipkan. Parameter {@code savedInstanceState} adalah {@link android.os.Bundle} yang
menyediakan data tentang instance fragmen sebelumnya, jika fragmen dilanjutkan
(status pemulihan dibahas selengkapnya di bagian tentang <a href="#Lifecycle">Menangani
Daur Hidup Fragmen</a>).</p>
-<p>Metode {@link android.view.LayoutInflater#inflate(int,ViewGroup,boolean) inflate()} membutuhkan
+<p>Metode {@link android.view.LayoutInflater#inflate(int,ViewGroup,boolean) inflate()} membutuhkan
tiga argumen:</p>
<ul>
<li>ID sumber daya layout yang ingin dimekarkan.</li>
@@ -260,7 +260,7 @@
<h3 id="Adding">Menambahkan fragmen ke aktivitas</h3>
-<p>Biasanya, fragmen berkontribusi pada sebagian UI ke aktivitas host, yang ditanamkan sebagai
+<p>Biasanya, fragmen berkontribusi pada sebagian UI ke aktivitas host, yang ditanamkan sebagai
bagian dari hierarki tampilan keseluruhan aktivitas. Ada dua cara untuk menambahkan fragmen ke layout
aktivitas:</p>
@@ -297,13 +297,13 @@
<div class="note">
<p><strong>Catatan:</strong> Setiap fragmen memerlukan identifier
-unik yang bisa digunakan sistem untuk memulihkan fragmen jika aktivitas dimulai kembali (dan identifier yang bisa digunakan menangkap
+unik yang bisa digunakan sistem untuk memulihkan fragmen jika aktivitas dimulai kembali (dan identifier yang bisa digunakan menangkap
fragmen untuk melakukan transaksi, seperti menghapusnya). Ada tiga cara untuk memberikan
ID bagi fragmen:</p>
<ul>
<li>Memberikan atribut {@code android:id} bersama ID unik.</li>
<li>Memberikan atribut {@code android:tag} bersama string unik.</li>
- <li>Jika Anda tidak memberikan dua hal tersebut, sistem akan menggunakan ID
+ <li>Jika Anda tidak memberikan dua hal tersebut, sistem akan menggunakan ID
tampilan kontainer.</li>
</ul>
</div>
@@ -354,15 +354,15 @@
dalam layout aktivitas, ini tidak akan menerima panggilan ke {@link
android.app.Fragment#onCreateView onCreateView()}. Jadi Anda tidak perlu mengimplementasikan metode itu.</p>
-<p>Menyediakan tag string untuk fragmen tidak hanya untuk fragmen non-UI—Anda juga bisa
+<p>Menyediakan tag string untuk fragmen tidak hanya untuk fragmen non-UI—Anda juga bisa
menyediakan tag string untuk fragmen yang memiliki UI—namun jika fragmen tidak memiliki UI
-, maka tag string adalah satu-satunya cara untuk mengidentifikasinya. Jika Anda ingin mendapatkan fragmen dari
+, maka tag string adalah satu-satunya cara untuk mengidentifikasinya. Jika Anda ingin mendapatkan fragmen dari
aktivitas nantinya, Anda perlu menggunakan {@link android.app.FragmentManager#findFragmentByTag
findFragmentByTag()}.</p>
<p>Untuk contoh aktivitas yang menggunakan fragmen sebagai pekerja latar belakang, tanpa UI, lihat sampel {@code
-FragmentRetainInstance.java}, yang disertakan dalam sampel SDK (tersedia melalui
-Android SDK Manager) dan terletak di sistem Anda sebagai
+FragmentRetainInstance.java}, yang disertakan dalam sampel SDK (tersedia melalui
+Android SDK Manager) dan terletak di sistem Anda sebagai
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code>.</p>
@@ -378,7 +378,7 @@
<li>Dapatkan fragmen yang ada di aktivitas dengan {@link
android.app.FragmentManager#findFragmentById findFragmentById()} (untuk fragmen yang menyediakan UI dalam
layout aktivitas) atau {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()} (untuk fragmen yang menyediakan atau tidak menyediakan UI).</li>
+findFragmentByTag()} (untuk fragmen yang menyediakan atau tidak menyediakan UI).</li>
<li>Tarik fragmen dari back-stack, dengan {@link
android.app.FragmentManager#popBackStack()} (mensimulasikan perintah <em>Back</em> oleh pengguna).</li>
<li>Daftarkan listener untuk perubahan pada back-stack, dengan {@link
@@ -395,7 +395,7 @@
<h2 id="Transactions">Melakukan Transaksi Fragmen</h2>
-<p>Fitur menarik terkait penggunaan fragmen di aktivitas adalah kemampuan menambah, menghapus, mengganti,
+<p>Fitur menarik terkait penggunaan fragmen di aktivitas adalah kemampuan menambah, menghapus, mengganti,
dan melakukan tindakan lain dengannya, sebagai respons atas interaksi pengguna. Setiap set perubahan
yang Anda lakukan untuk aktivitas disebut transaksi dan Anda bisa melakukan transaksi menggunakan API di {@link
android.app.FragmentTransaction}. Anda juga bisa menyimpan setiap transaksi ke back-stack yang dikelola
@@ -423,7 +423,7 @@
ke back-stack dari transaksi fragmen. Back-stack ini dikelola oleh aktivitas dan memungkinkan
pengguna kembali ke status fragmen sebelumnya, dengan menekan tombol <em>Back</em>.</p>
-<p>Misalnya, berikut ini cara mengganti satu fragmen dengan yang fragmen yang lain, dan mempertahankan
+<p>Misalnya, berikut ini cara mengganti satu fragmen dengan yang fragmen yang lain, dan mempertahankan
status sebelumnya di back-stack:</p>
<pre>
@@ -442,18 +442,18 @@
<p>Dalam contoh ini, {@code newFragment} menggantikan fragmen apa saja (jika ada) yang saat ini berada dalam
kontainer layout yang diidentifikasi oleh ID {@code R.id.fragment_container}. Dengan memanggil @link
-android.app.FragmentTransaction#addToBackStack addToBackStack()}, transaksi yang diganti
-disimpan ke back-stack sehingga pengguna bisa membalikkan transaksi dan mengembalikan fragmen
+android.app.FragmentTransaction#addToBackStack addToBackStack()}, transaksi yang diganti
+disimpan ke back-stack sehingga pengguna bisa membalikkan transaksi dan mengembalikan fragmen
sebelumnya dengan menekan tombol <em>Back</em>.</p>
<p>Jika Anda menambahkan beberapa perubahan pada transaksi (seperti {@link
android.app.FragmentTransaction#add add()} atau {@link android.app.FragmentTransaction#remove
remove()}) dan panggil {@link
-android.app.FragmentTransaction#addToBackStack addToBackStack()}, maka semua perubahan akan diterapkan
-sebelum Anda memanggil {@link android.app.FragmentTransaction#commit commit()} akan ditambahkan ke
+android.app.FragmentTransaction#addToBackStack addToBackStack()}, maka semua perubahan akan diterapkan
+sebelum Anda memanggil {@link android.app.FragmentTransaction#commit commit()} akan ditambahkan ke
back-stack sebagai satu transaksi dan tombol <em>Back</em> akan membalikannya semua.</p>
-<p>Urutan menambahkan perubahan pada {@link android.app.FragmentTransaction} tidak berpengaruh,
+<p>Urutan menambahkan perubahan pada {@link android.app.FragmentTransaction} tidak berpengaruh,
kecuali:</p>
<ul>
<li>Anda harus memanggil {@link android.app.FragmentTransaction#commit()} paling akhir</li>
@@ -462,9 +462,9 @@
</ul>
<p>Jika Anda tidak memanggil {@link android.app.FragmentTransaction#addToBackStack(String)
-addToBackStack()} saat melakukan transaksi yang menghapus fragmen, maka fragmen itu
+addToBackStack()} saat melakukan transaksi yang menghapus fragmen, maka fragmen itu
akan dimusnahkan bila transaksi diikat dan pengguna tidak bisa mengarah kembali ke sana. Sedangkan, jika
-Anda memanggil {@link android.app.FragmentTransaction#addToBackStack(String) addToBackStack()} saat
+Anda memanggil {@link android.app.FragmentTransaction#addToBackStack(String) addToBackStack()} saat
menghapus fragmen, maka fragmen itu akan <em>dihentikan</em> dan akan dilanjutkan jika pengguna mengarah
kembali.</p>
@@ -473,9 +473,9 @@
mengikatnya.</p>
<p>Memanggil {@link android.app.FragmentTransaction#commit()} tidak akan langsung menjalankan
-transaksi. Namun sebuah jadwal akan dibuat untuk dijalankan pada thread UI aktivitas (thread "utama")
+transaksi. Namun sebuah jadwal akan dibuat untuk dijalankan pada thread UI aktivitas (thread "utama")
begitu thread bisa melakukannya. Akan tetapi, jika perlu Anda bisa memanggil {@link
-android.app.FragmentManager#executePendingTransactions()} dari thread UI untuk segera
+android.app.FragmentManager#executePendingTransactions()} dari thread UI untuk segera
mengeksekusi transaksi yang diserahkan oleh {@link android.app.FragmentTransaction#commit()}. Hal itu
biasanya tidak perlu kecuali jika transaksi merupakan dependensi bagi pekerjaan dalam thread lain.</p>
@@ -503,7 +503,7 @@
View listView = {@link android.app.Fragment#getActivity()}.{@link android.app.Activity#findViewById findViewById}(R.id.list);
</pre>
-<p>Demikian pula, aktivitas Anda bisa memanggil metode di fragmen dengan meminta acuan ke
+<p>Demikian pula, aktivitas Anda bisa memanggil metode di fragmen dengan meminta acuan ke
{@link android.app.Fragment} dari {@link android.app.FragmentManager}, menggunakan {@link
android.app.FragmentManager#findFragmentById findFragmentById()} atau {@link
android.app.FragmentManager#findFragmentByTag findFragmentByTag()}. Misalnya:</p>
@@ -537,7 +537,7 @@
</pre>
<p>Selanjutnya aktivitas yang menjadi host fragmen akan mengimplementasikan antarmuka {@code OnArticleSelectedListener}
- dan
+ dan
mengesampingkan {@code onArticleSelected()} untuk memberi tahu fragmen B mengenai kejadian dari fragmen A. Untuk memastikan
bahwa aktivitas host mengimplementasikan antarmuka ini, metode callback fragmen A {@link
android.app.Fragment#onAttach onAttach()} (yang dipanggil sistem saat menambahkan
@@ -564,7 +564,7 @@
<p>Jika aktivitas belum mengimplementasikan antarmuka, maka fragmen akan melontarkan
{@link java.lang.ClassCastException}.
-Jika berhasil, anggota {@code mListener} yang menyimpan acuan ke implementasi aktivitas
+Jika berhasil, anggota {@code mListener} yang menyimpan acuan ke implementasi aktivitas
{@code OnArticleSelectedListener}, sehingga fragmen A bisa berbagi kejadian dengan aktivitas, dengan memanggil metode
yang didefinisikan oleh antarmuka {@code OnArticleSelectedListener}. Misalnya, jika fragmen A adalah
ekstensi dari {@link android.app.ListFragment}, maka setiap kali
@@ -654,7 +654,7 @@
<dt><i>Dihentikan</i></dt>
<dd>Fragmen tidak terlihat. Aktivitas host telah dihentikan atau
fragmen telah dihapus dari aktivitas namun ditambahkan ke back-stack. Fragmen yang dihentikan
-masih hidup (semua status dan informasi anggota masih disimpan oleh sistem). Akan tetapi, fragmen
+masih hidup (semua status dan informasi anggota masih disimpan oleh sistem). Akan tetapi, fragmen
tidak terlihat lagi oleh pengguna dan akan dimatikan jika aktivitas dimatikan.</dd>
</dl>
@@ -668,10 +668,10 @@
status, lihat dokumen <a href="{@docRoot}guide/components/activities.html#SavingActivityState">Aktivitas</a>
.</p>
-<p>Perbedaan paling signifikan dalam daur hidup antara aktivitas dan fragmen ada
+<p>Perbedaan paling signifikan dalam daur hidup antara aktivitas dan fragmen ada
pada cara penyimpanannya dalam back-stack masing-masing. Aktivitas ditempatkan ke back-stack aktivitas
yang dikelola oleh sistem saat dihentikan, secara default (sehingga pengguna bisa mengarah kembali
-ke aktivitas dengan tombol <em>Back</em>, seperti yang dibahas dalam <a href="{@docRoot}guide/components/tasks-and-back-stack.html">Tugas dan Back-Stack</a>).
+ke aktivitas dengan tombol <em>Back</em>, seperti yang dibahas dalam <a href="{@docRoot}guide/components/tasks-and-back-stack.html">Tugas dan Back-Stack</a>).
Akan tetapi, fragmen yang ditempatkan ke back-stack dikelola oleh aktivitas host hanya saat
Anda secara eksplisit meminta agar instance disimpan dengan memanggil {@link
android.app.FragmentTransaction#addToBackStack(String) addToBackStack()} selama transaksi yang
@@ -736,7 +736,7 @@
<p>Untuk merangkum semua yang telah dibahas dalam dokumen ini, berikut ini contoh aktivitas
yang menggunakan dua fragmen untuk membuat layout dua panel. Aktivitas di bawah ini menyertakan satu fragmen untuk
menampilkan daftar putar Shakespeare dan fragmen lainnya menampilkan rangkuman pemutaran bila dipilih dari
-daftar. Aktivitas ini juga menunjukkan cara menyediakan konfigurasi fragmen berbeda,
+daftar. Aktivitas ini juga menunjukkan cara menyediakan konfigurasi fragmen berbeda,
berdasarkan konfigurasi layar.</p>
<p class="note"><strong>Catatan:</strong> Kode sumber lengkap untuk aktivitas ini tersedia di
@@ -752,7 +752,7 @@
{@sample development/samples/ApiDemos/res/layout-land/fragment_layout.xml layout}
-<p>Dengan layout ini, sistem akan membuat instance {@code TitlesFragment} (yang mencantumkan
+<p>Dengan layout ini, sistem akan membuat instance {@code TitlesFragment} (yang mencantumkan
judul) segera setelah aktivitas memuat layout, sementara {@link android.widget.FrameLayout}
(lokasi penempatan fragmen untuk menampilkan rangkuman pemutaran) menempati ruang di sisi kanan
layar, namun pada awalnya masih kosong. Seperti yang akan Anda lihat di bawah ini, sampai pengguna memilih item
@@ -769,14 +769,14 @@
<p>Layout ini hanya menyertakan {@code TitlesFragment}. Ini artinya saat perangkat berada dalam
orientasi tegak, hanya judul daftar putar yang terlihat. Jadi, saat pengguna mengklik item
-daftar dalam konfigurasi ini, aplikasi akan memulai aktivitas baru untuk menampilkan rangkuman,
+daftar dalam konfigurasi ini, aplikasi akan memulai aktivitas baru untuk menampilkan rangkuman,
sebagai ganti pemuatan fragmen kedua.</p>
<p>Berikutnya, Anda bisa melihat bagaimana hal ini dilakukan dalam kelas fragmen. Pertama adalah {@code
TitlesFragment}, yang menampilkan judul daftar putar Shakespeare. Fragmen ini membuat ekstensi {@link
android.app.ListFragment} dan mengandalkannya itu untuk menangani sebagian besar pekerjaan tampilan daftar.</p>
-<p>Saat Anda memeriksa kode ini, perhatikan bahwa ada dua kemungkinan perilaku saat pengguna mengklik
+<p>Saat Anda memeriksa kode ini, perhatikan bahwa ada dua kemungkinan perilaku saat pengguna mengklik
item daftar: bergantung pada layout mana yang aktif, bisa membuat dan menampilkan fragmen
baru untuk menampilkan detail dalam aktivitas yang sama (menambahkan fragmen ke {@link
android.widget.FrameLayout}), atau memulai aktivitas baru (tempat fragmen ditampilkan).</p>
@@ -785,11 +785,11 @@
<p>Fragmen kedua, {@code DetailsFragment} menampilkan rangkuman pemutaran untuk item yang dipilih dari
daftar dari {@code TitlesFragment}:</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>Ingatlah dari kelas {@code TitlesFragment}, bahwa, jika pengguna mengklik item daftar dan
-layout saat ini <em>tidak</em> menyertakan tampilan {@code R.id.details} (yaitu tempat
+layout saat ini <em>tidak</em> menyertakan tampilan {@code R.id.details} (yaitu tempat
{@code DetailsFragment} berada), maka aplikasi memulai aktivitas {@code DetailsActivity}
untuk menampilkan konten item.</p>
@@ -798,14 +798,14 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>Perhatikan bahwa aktivitas ini selesai sendiri jika konfigurasi mendatar, sehingga aktivitas utama
bisa mengambil alih dan menampilkan {@code DetailsFragment} bersama {@code TitlesFragment}.
Ini bisa terjadi jika pengguna memulai {@code DetailsActivity} saat dalam orientasi tegak, namun kemudian
memutarnya menjadi mendatar (yang akan memulai lagi aktivitas saat ini).</p>
-<p>Untuk contoh lainnya mengenai penggunaan fragmen (dan file sumber lengkap untuk contoh ini),
+<p>Untuk contoh lainnya mengenai penggunaan fragmen (dan file sumber lengkap untuk contoh ini),
lihat aplikasi contoh Demo API yang tersedia di <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/index.html#Fragment">
ApiDemos</a> (bisa diunduh dari <a href="{@docRoot}resources/samples/get.html">Komponen contoh SDK</a>).</p>
diff --git a/docs/html-intl/intl/in/guide/components/fundamentals.jd b/docs/html-intl/intl/in/guide/components/fundamentals.jd
index bd9a500..2c925e9 100644
--- a/docs/html-intl/intl/in/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/in/guide/components/fundamentals.jd
@@ -22,44 +22,44 @@
</div>
</div>
-<p>Aplikasi Android ditulis dalam bahasa pemrograman Java. Android SDK Tools mengkompilasi
+<p>Aplikasi Android ditulis dalam bahasa pemrograman Java. Android SDK Tools mengkompilasi
kode Anda—bersama data dan file sumber daya —ke dalam APK: <i>Paket Android</i>,
-yaitu file arsip berekstensi {@code .apk}. Satu file APK berisi semua konten
+yaitu file arsip berekstensi {@code .apk}. Satu file APK berisi semua konten
aplikasi Android dan merupakan file yang digunakan perangkat berbasis Android untuk menginstal aplikasi.</p>
<p>Setelah diinstal di perangkat, setiap aplikasi Android tinggal di sandbox keamanannya sendiri: </p>
<ul>
- <li>Sistem operasi Android merupakan sistem Linux multi-pengguna yang di dalamnya setiap
+ <li>Sistem operasi Android merupakan sistem Linux multi-pengguna yang di dalamnya setiap
aplikasi adalah pengguna berbeda.</li>
<li>Secara default, sistem menetapkan ID pengguna Linux unik kepada setiap aplikasi (ID ini hanya
digunakan oleh sistem dan tidak diketahui aplikasi). Sistem menetapkan izin
bagi semua file dalam aplikasi sehingga hanya ID pengguna yang diizinkan yang bisa mengaksesnya. </li>
-<li>Setiap proses memiliki mesin virtual (VM) sendiri, sehingga kode aplikasi yang berjalan secara terisolasi dari
+<li>Setiap proses memiliki mesin virtual (VM) sendiri, sehingga kode aplikasi yang berjalan secara terisolasi dari
aplikasi lainnya.</li>
-<li>Secara default, setiap aplikasi berjalan dalam proses Linux-nya sendiri. Android memulai proses
+<li>Secara default, setiap aplikasi berjalan dalam proses Linux-nya sendiri. Android memulai proses
bila ada komponen aplikasi yang perlu dijalankan, kemudian mematikan proses bila tidak lagi diperlukan
atau bila sistem harus memulihkan memori untuk digunakan aplikasi lain.</li>
</ul>
-<p>Dengan cara ini, sistem Android mengimplementasikan <em>prinsip privilese minim</em>. Ini berarti,
+<p>Dengan cara ini, sistem Android mengimplementasikan <em>prinsip privilese minim</em>. Ini berarti,
secara default aplikasi hanya memiliki akses ke komponen yang diperlukannya untuk melakukan pekerjaannya dan
-tidak lebih dari itu. Hal ini menghasilkan lingkungan yang sangat aman sehingga aplikasi tidak bisa mengakses bagian
+tidak lebih dari itu. Hal ini menghasilkan lingkungan yang sangat aman sehingga aplikasi tidak bisa mengakses bagian
sistem bila tidak diberi izin.</p>
<p>Akan tetapi, ada beberapa cara bagi aplikasi untuk berbagi data dengan aplikasi lain dan bagi aplikasi
untuk mengakses layanan sistem:</p>
<ul>
- <li>Dua aplikasi bisa diatur untuk menggunakan ID pengguna Linux yang sama,
+ <li>Dua aplikasi bisa diatur untuk menggunakan ID pengguna Linux yang sama,
dalam hal ini keduanya bisa saling mengakses file masing-masing. Untuk menghemat sumber daya sistem, aplikasi dengan ID
pengguna yang sama juga bisa diatur agar berjalan dalam proses Linux yang sama dan menggunakan VM yang sama (
aplikasi juga harus ditandatangani dengan sertifikat yang sama).</li>
- <li>Aplikasi bisa meminta izin akses ke data perangkat seperti kontak
-pengguna, pesan SMS, penyimpanan lepas-pasang (kartu SD), kamera, Bluetooth, dan lainnya. Semua
+ <li>Aplikasi bisa meminta izin akses ke data perangkat seperti kontak
+pengguna, pesan SMS, penyimpanan lepas-pasang (kartu SD), kamera, Bluetooth, dan lainnya. Semua
izin aplikasi harus diberikan oleh pengguna saat menginstal.</li>
</ul>
@@ -69,7 +69,7 @@
<li>Komponen kerangka kerja inti yang mendefinisikan aplikasi.</li>
<li>File manifes tempat Anda mendeklarasikan komponen dan fitur yang diperlukan perangkat
untuk aplikasi.</li>
- <li>Sumber daya yang terpisah dari kode aplikasi dan memungkinkan
+ <li>Sumber daya yang terpisah dari kode aplikasi dan memungkinkan
aplikasi mengoptimalkan perilakunya untuk beragam konfigurasi perangkat.</li>
</ul>
@@ -78,8 +78,8 @@
<h2 id="Components">Komponen Aplikasi</h2>
<p>Komponen aplikasi adalah blok pembangun penting dari aplikasi Android.
-Setiap komponen merupakan titik berbeda yang digunakan sistem untuk memasuki aplikasi. Tidak semua komponen
-merupakan titik masuk sebenarnya bagi pengguna dan sebagian saling bergantung, namun masing-masing komponen tersedia
+Setiap komponen merupakan titik berbeda yang digunakan sistem untuk memasuki aplikasi. Tidak semua komponen
+merupakan titik masuk sebenarnya bagi pengguna dan sebagian saling bergantung, namun masing-masing komponen tersedia
sebagai kesatuan sendiri dan memainkan peran tertentu—masing-masing merupakan
blok pembangun unik yang mendefinisikan perilaku aplikasi secara keseluruhan.</p>
@@ -93,7 +93,7 @@
<dt><b>Aktivitas</b></dt>
<dd>Sebuah <i>aktivitas</i> mewakili satu layar dengan antarmuka pengguna. Misalnya,
-aplikasi email mungkin memiliki satu aktivitas yang menampilkan daftar email
+aplikasi email mungkin memiliki satu aktivitas yang menampilkan daftar email
baru, aktivitas lain untuk menulis email, dan aktivitas satunya lagi untuk membaca email. Walaupun
semua aktivitas bekerja sama untuk membentuk pengalaman pengguna yang kohesif dalam aplikasi email,
masing-masing tidak saling bergantung. Karenanya, aplikasi berbeda bisa memulai
@@ -110,7 +110,7 @@
<dd>Sebuah <i>layanan</i> adalah komponen yang berjalan di latar belakang untuk melakukan
operasi yang berjalan lama atau untuk melakukan pekerjaan bagi proses jarak jauh. Layanan
-tidak menyediakan antarmuka pengguna. Misalnya, sebuah layanan bisa memutar musik di latar belakang sementara
+tidak menyediakan antarmuka pengguna. Misalnya, sebuah layanan bisa memutar musik di latar belakang sementara
pengguna berada dalam aplikasi lain, atau layanan bisa menarik data lewat jaringan tanpa
memblokir interaksi pengguna dengan aktivitas. Komponen lain, seperti aktivitas, bisa memulai
layanan dan membiarkannya berjalan atau mengikat layanan untuk berinteraksi dengannya.
@@ -125,7 +125,7 @@
<dd>Sebuah <i>penyedia konten</i> mengelola seperangkat data-bersama aplikasi. Anda bisa menyimpan data
dalam sistem file, database SQLite, di web, atau lokasi penyimpanan permanen lainnya
-yang bisa diakses aplikasi. Melalui penyedia konten, aplikasi lain bisa melakukan query atau bahkan
+yang bisa diakses aplikasi. Melalui penyedia konten, aplikasi lain bisa melakukan query atau bahkan
memodifikasi data (jika penyedia konten mengizinkannya). Misalnya, sistem Android menyediakan penyedia
konten yang mengelola informasi kontak pengguna. Karenanya, setiap aplikasi
dengan izin yang sesuai bisa melakukan query mengenai bagian dari penyedia konten (seperti {@link
@@ -137,7 +137,7 @@
<p>Penyedia konten diimplementasikan sebagai subkelas {@link android.content.ContentProvider}
dan harus mengimplementasikan seperangkat standar API yang memungkinkan aplikasi
-lain melakukan transaksi. Untuk informasi selengkapnya, lihat panduan pengembang
+lain melakukan transaksi. Untuk informasi selengkapnya, lihat panduan pengembang
<a href="{@docRoot}guide/topics/providers/content-providers.html">Penyedia Konten</a>.</p>
</dd>
@@ -163,7 +163,7 @@
-<p>Aspek unik dari desain sistem Android adalah aplikasi mana pun bisa memulai
+<p>Aspek unik dari desain sistem Android adalah aplikasi mana pun bisa memulai
komponen aplikasi lain. Misalnya, jika Anda menginginkan pengguna mengambil
foto dengan kamera perangkat, bisa saja aplikasi lain yang melakukannya dan aplikasi
Anda bisa menggunakannya, sebagai ganti mengembangkan aktivitas sendiri untuk mengambil foto. Anda tidak
@@ -175,7 +175,7 @@
<p>Saat sistem memulai komponen, sistem akan memulai proses untuk aplikasi itu (jika
belum berjalan) dan membuat instance kelas yang diperlukan untuk komponen. Misalnya, jika aplikasi Anda
memulai aktivitas dalam aplikasi kamera yang mengambil foto, aktivitas itu akan
-berjalan dalam proses yang dimiliki oleh aplikasi kamera, bukan dalam proses aplikasi Anda.
+berjalan dalam proses yang dimiliki oleh aplikasi kamera, bukan dalam proses aplikasi Anda.
Karenanya, tidak seperti aplikasi di sebagian besar sistem lain, aplikasi Android tidak memiliki titik
masuk tunggal (misalnya tidak ada fungsi {@code main()}).</p>
@@ -198,13 +198,13 @@
mengaktifkan komponen tertentu atau komponen <em>tipe</em> komponen tertentu—masing-masing intent
bisa eksplisit atau implisit.</p>
-<p>Untuk aktivitas dan layanan, intent mendefinisikan tindakan yang akan dilakukan (misalnya, untuk "melihat" atau
-"mengirim" sesuatu) dan mungkin menetapkan URI data untuk ditindaklanjuti (salah satu hal yang mungkin perlu diketahui
-oleh komponen yang akan dimulai). Misalnya, intent mungkin menyampaikan permintaan suatu
+<p>Untuk aktivitas dan layanan, intent mendefinisikan tindakan yang akan dilakukan (misalnya, untuk "melihat" atau
+"mengirim" sesuatu) dan mungkin menetapkan URI data untuk ditindaklanjuti (salah satu hal yang mungkin perlu diketahui
+oleh komponen yang akan dimulai). Misalnya, intent mungkin menyampaikan permintaan suatu
aktivitas untuk menampilkan gambar atau membuka halaman web. Dalam beberapa kasus, Anda bisa memulai
-aktivitas untuk menerima hasil, dalam hal ini, aktivitas juga akan mengembalikan hasil
+aktivitas untuk menerima hasil, dalam hal ini, aktivitas juga akan mengembalikan hasil
dalam {@link android.content.Intent} (misalnya Anda bisa mengeluarkan intent agar
-pengguna bisa memilih kontak pribadi dan memintanya dikembalikan kepada Anda—intent yang dikembalikan menyertakan URI yang
+pengguna bisa memilih kontak pribadi dan memintanya dikembalikan kepada Anda—intent yang dikembalikan menyertakan URI yang
menunjuk ke kontak yang dipilih).</p>
<p>Untuk penerima siaran, intent hanya mendefinisikan
@@ -213,18 +213,18 @@
<p>Tipe komponen lainnya dan penyedia konten, tidak diaktifkan oleh intent. Melainkan
diaktifkan saat ditargetkan oleh permintaan dari {@link android.content.ContentResolver}. Resolver
-konten menangani semua transaksi langsung dengan penyedia konten sehingga komponen yang melakukan
+konten menangani semua transaksi langsung dengan penyedia konten sehingga komponen yang melakukan
transaksi dengan penyedia tidak perlu dan sebagai gantinya memanggil metode pada objek {@link
android.content.ContentResolver}. Ini membuat lapisan abstraksi antara penyedia
konten dan komponen yang meminta informasi (demi keamanan).</p>
<p>Ada beberapa metode terpisah untuk mengaktifkan masing-masing tipe komponen:</p>
<ul>
- <li>Anda bisa memulai aktivitas (atau memberinya pekerjaan baru) dengan
+ <li>Anda bisa memulai aktivitas (atau memberinya pekerjaan baru) dengan
meneruskan {@link android.content.Intent} ke {@link android.content.Context#startActivity
startActivity()} atau {@link android.app.Activity#startActivityForResult startActivityForResult()}
(bila Anda ingin aktivitas mengembalikan hasil).</li>
- <li>Anda bisa memulai layanan (atau memberikan instruksi baru ke layanan yang sedang berlangsung) dengan
+ <li>Anda bisa memulai layanan (atau memberikan instruksi baru ke layanan yang sedang berlangsung) dengan
meneruskan {@link android.content.Intent} ke {@link android.content.Context#startService
startService()}. Atau Anda bisa mengikat ke layanan dengan meneruskan {@link android.content.Intent} ke
{@link android.content.Context#bindService bindService()}.</li>
@@ -237,7 +237,7 @@
</ul>
<p>Untuk informasi selengkapnya tentang menggunakan intent, lihat dokumen <a href="{@docRoot}guide/components/intents-filters.html">Intent dan Filter
- Intent</a>. Informasi selengkapnya tentang mengaktifkan komponen
+ Intent</a>. Informasi selengkapnya tentang mengaktifkan komponen
tertentu juga tersedia dalam dokumen berikut: <a href="{@docRoot}guide/components/activities.html">Aktivitas</a>, <a href="{@docRoot}guide/components/services.html">Layanan</a>, {@link
android.content.BroadcastReceiver} dan <a href="{@docRoot}guide/topics/providers/content-providers.html">Penyedia Konten</a>.</p>
@@ -245,7 +245,7 @@
<h2 id="Manifest">File Manifes</h2>
<p>Sebelum sistem Android bisa memulai komponen aplikasi, sistem harus mengetahui
-keberadaan komponen dengan membaca file {@code AndroidManifest.xml} aplikasi (file
+keberadaan komponen dengan membaca file {@code AndroidManifest.xml} aplikasi (file
"manifes"). Aplikasi Anda harus mendeklarasikan semua komponennya dalam file ini, yang harus menjadi akar
dari direktori proyek aplikasi.</p>
@@ -258,8 +258,8 @@
minimum yang diperlukan aplikasi, berdasarkan API yang digunakan aplikasi.</li>
<li>Mendeklarasikan fitur perangkat keras dan perangkat lunak yang diperlukan aplikasi, seperti kamera,
layanan Bluetooth, atau layar multisentuh.</li>
- <li>Pustaka API aplikasi perlu ditautkan (selain
-API kerangka kerja Android), seperti pustaka
+ <li>Pustaka API aplikasi perlu ditautkan (selain
+API kerangka kerja Android), seperti pustaka
<a href="http://code.google.com/android/add-ons/google-apis/maps-overview.html">Google Maps.</a></li>
<li>Dan lainnya</li>
</ul>
@@ -287,7 +287,7 @@
aplikasi.</p>
<p>Dalam elemen <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
atribut {@code android:name} menetapkan nama kelas yang sepenuhnya memenuhi syarat subkelas {@link
android.app.Activity} dan atribut {@code android:label} menetapkan string yang akan
digunakan sebagai label yang terlihat oleh pengguna untuk aktivitas tersebut.</p>
@@ -310,12 +310,12 @@
<p>Aktivitas, layanan, dan penyedia konten yang Anda sertakan dalam kode sumber, namun tidak
dideklarasikan dalam manifes, tidak akan terlihat pada sistem dan, akibatnya, tidak pernah bisa berjalan. Akan tetapi,
-penerima siaran
-bisa dideklarasikan dalam manifes atau dibuat secara dinamis dalam kode (sebagai objek
+penerima siaran
+bisa dideklarasikan dalam manifes atau dibuat secara dinamis dalam kode (sebagai objek
{@link android.content.BroadcastReceiver}) dan didaftarkan pada sistem dengan memanggil
{@link android.content.Context#registerReceiver registerReceiver()}.</p>
-<p>Untuk informasi selengkapnya tentang cara menstrukturkan file manifes untuk aplikasi Anda,
+<p>Untuk informasi selengkapnya tentang cara menstrukturkan file manifes untuk aplikasi Anda,
lihat dokumentasi <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">File AndroidManifest.xml</a>. </p>
@@ -379,7 +379,7 @@
penyaringan bagi pengguna saat mereka mencari aplikasi dari perangkat.</p>
<p>Misalnya, jika aplikasi memerlukan kamera dan menggunakan API yang disediakan dalam Android 2.1 (<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Level</a> 7)
-, Anda harus mendeklarasikannya sebagai kebutuhan dalam file manifes seperti ini:</p>
+, Anda harus mendeklarasikannya sebagai kebutuhan dalam file manifes seperti ini:</p>
<pre>
<manifest ... >
@@ -390,10 +390,10 @@
</manifest>
</pre>
-<p>Sekarang, perangkat yang <em>tidak</em> memiliki kamera dan menggunakan
+<p>Sekarang, perangkat yang <em>tidak</em> memiliki kamera dan menggunakan
Android versi <em>lebih rendah</em> dari 2.1 tidak bisa menginstal aplikasi Anda dari Google Play.</p>
-<p>Akan tetapi, bisa juga mendeklarasikan bahwa aplikasi Anda menggunakan kamera, namun tidak
+<p>Akan tetapi, bisa juga mendeklarasikan bahwa aplikasi Anda menggunakan kamera, namun tidak
<em>mengharuskannya</em>. Dalam hal itu, aplikasi Anda harus mengatur atribut <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#required">{@code required}</a>
ke {@code "false"} dan memeriksa saat runtime apakah
perangkat memiliki kamera dan menonaktifkan setiap fitur kamera yang sesuai.</p>
@@ -455,11 +455,11 @@
mengaktifkan komponen aplikasi, seperti aktivitas dan layanan, dan cara menyediakan komponen aplikasi
untuk digunakan oleh aplikasi lain.</dd>
<dt><a href="{@docRoot}guide/components/activities.html">Aktivitas</a></dt>
- <dd>Informasi tentang cara membuat instance kelas {@link android.app.Activity},
+ <dd>Informasi tentang cara membuat instance kelas {@link android.app.Activity},
yang menyediakan layar tersendiri dalam aplikasi bersama antarmuka pengguna.</dd>
<dt><a href="{@docRoot}guide/topics/resources/providing-resources.html">Menyediakan Sumber Daya</a></dt>
<dd>Informasi tentang cara aplikasi Android disusun untuk memisahkan sumber daya aplikasi dari
-kode aplikasi, termasuk cara Anda bisa menyediakan sumber daya alternatif untuk
+kode aplikasi, termasuk cara Anda bisa menyediakan sumber daya alternatif untuk
konfigurasi perangkat tertentu.
</dd>
</dl>
@@ -468,11 +468,11 @@
<h2 class="norule">Anda juga mungkin tertarik dengan:</h2>
<dl>
<dt><a href="{@docRoot}guide/practices/compatibility.html">Kompatibilitas Perangkat</a></dt>
- <dd>Informasi tentang cara kerja Android pada berbagai tipe perangkat dan
+ <dd>Informasi tentang cara kerja Android pada berbagai tipe perangkat dan
pengenalan mengenai cara mengoptimalkan aplikasi untuk setiap perangkat atau membatasi ketersediaan aplikasi Anda untuk
perangkat berbeda.</dd>
<dt><a href="{@docRoot}guide/topics/security/permissions.html">Izin Sistem</a></dt>
- <dd>Informasi tentang cara Android membatasi akses aplikasi pada API tertentu dengan sistem izin
+ <dd>Informasi tentang cara Android membatasi akses aplikasi pada API tertentu dengan sistem izin
yang mengharuskan persetujuan pengguna agar aplikasi dapat menggunakan API tersebut.</dd>
</dl>
</div>
diff --git a/docs/html-intl/intl/in/guide/components/index.jd b/docs/html-intl/intl/in/guide/components/index.jd
index a8dd5f8..de40b22 100644
--- a/docs/html-intl/intl/in/guide/components/index.jd
+++ b/docs/html-intl/intl/in/guide/components/index.jd
@@ -1,7 +1,7 @@
page.title=Komponen Aplikasi
page.landing=true
-page.landing.intro=Kerangka kerja aplikasi Android memungkinkan Anda membuat aplikasi yang kaya dan inovatif menggunakan seperangkat komponen yang dapat digunakan kembali. Bagian ini menjelaskan cara membangun komponen yang mendefinisikan blok pembangun aplikasi Anda dan cara menghubungkannya bersama menggunakan intent.
-page.metaDescription=Kerangka kerja aplikasi Android memungkinkan Anda membuat aplikasi yang kaya dan inovatif menggunakan seperangkat komponen yang dapat digunakan kembali. Bagian ini menjelaskan cara membangun komponen yang mendefinisikan blok pembangun aplikasi Anda dan cara menghubungkannya bersama menggunakan intent.
+page.landing.intro=Kerangka kerja aplikasi Android memungkinkan Anda membuat aplikasi yang kaya dan inovatif menggunakan seperangkat komponen yang dapat digunakan kembali. Bagian ini menjelaskan cara membangun komponen yang mendefinisikan blok pembangun aplikasi Anda dan cara menghubungkannya bersama menggunakan intent.
+page.metaDescription=Kerangka kerja aplikasi Android memungkinkan Anda membuat aplikasi yang kaya dan inovatif menggunakan seperangkat komponen yang dapat digunakan kembali. Bagian ini menjelaskan cara membangun komponen yang mendefinisikan blok pembangun aplikasi Anda dan cara menghubungkannya bersama menggunakan intent.
page.landing.image=images/develop/app_components.png
page.image=images/develop/app_components.png
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>Artikel Blog</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>Menggunakan DialogFragments</h4>
<p>Dalam posting ini, saya akan menunjukkan cara menggunakan DialogFragments dengan pustaka dukungan v4 (untuk kompatibilitas mundur pada perangkat sebelum Honeycomb) untuk menunjukkan dialog edit sederhana dan mengembalikan hasil ke Aktivitas pemanggil menggunakan antarmuka.</p>
@@ -21,7 +21,7 @@
<h4>Fragmen Untuk Semua</h4>
<p>Hari ini kami telah merilis pustaka statis yang memperlihatkan API Fragment yang sama (serta LoaderManager baru dan beberapa kelas lain) agar aplikasi yang kompatibel dengan Android 1.6 atau yang lebih baru bisa menggunakan fragmen untuk membuat antarmuka pengguna yang kompatibel dengan tablet. </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>Multithreading untuk Kinerja</h4>
<p>Praktik yang baik dalam membuat aplikasi yang responsif adalah memastikan thread UI utama Anda
@@ -32,7 +32,7 @@
<div class="col-6">
<h3>Pelatihan</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>Mengelola Daur Hidup Aktivitas</h4>
<p>Bagian ini menjelaskan pentingnya metode callback daur hidup yang diterima setiap instance Aktivitas
diff --git a/docs/html-intl/intl/in/guide/components/loaders.jd b/docs/html-intl/intl/in/guide/components/loaders.jd
index cd0379b..88093cc 100644
--- a/docs/html-intl/intl/in/guide/components/loaders.jd
+++ b/docs/html-intl/intl/in/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>Kelas-kelas utama</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>Contoh-contoh terkait</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -51,7 +51,7 @@
dibuat kembali setelah perubahan konfigurasi. Karena itu, loader tidak perlu melakukan query ulang
datanya.</li>
</ul>
-
+
<h2 id="summary">Rangkuman Loader API</h2>
<p>Ada beberapa kelas dan antarmuka yang mungkin dilibatkan dalam menggunakan
@@ -64,11 +64,11 @@
</tr>
<tr>
<td>{@link android.app.LoaderManager}</td>
- <td>Kelas abstrak yang dikaitkan dengan {@link android.app.Activity} atau
+ <td>Kelas abstrak yang dikaitkan dengan {@link android.app.Activity} atau
{@link android.app.Fragment} untuk mengelola satu atau beberapa instance {@link
android.content.Loader}. Ini membantu aplikasi mengelola
operasi berjalan lebih lama bersamaan dengan daur hidup {@link android.app.Activity}
-atau {@link android.app.Fragment}; penggunaan paling umumnya adalah dengan
+atau {@link android.app.Fragment}; penggunaan paling umumnya adalah dengan
{@link android.content.CursorLoader}, akan tetapi aplikasi bebas menulis loader-nya
sendiri untuk memuat tipe data lainnya.
<br />
@@ -97,7 +97,7 @@
</tr>
<tr>
<td>{@link android.content.CursorLoader}</td>
- <td>Subkelas {@link android.content.AsyncTaskLoader} yang meng-query
+ <td>Subkelas {@link android.content.AsyncTaskLoader} yang meng-query
{@link android.content.ContentResolver} dan mengembalikan {@link
android.database.Cursor}. Kelas ini mengimplementasikan protokol {@link
android.content.Loader} dengan cara standar untuk query kursor,
@@ -124,15 +124,15 @@
<li>{@link android.app.Activity} atau {@link android.app.Fragment}.</li>
<li>Instance {@link android.app.LoaderManager}.</li>
<li>{@link android.content.CursorLoader} akan memuat data yang didukung oleh {@link
-android.content.ContentProvider}. Atau, Anda dapat mengimplementasikan subkelas sendiri
+android.content.ContentProvider}. Atau, Anda dapat mengimplementasikan subkelas sendiri
dari {@link android.content.Loader} atau {@link android.content.AsyncTaskLoader} untuk
memuat data dari beberapa sumber lain.</li>
<li>Implementasi untuk {@link android.app.LoaderManager.LoaderCallbacks}.
Di sinilah Anda membuat loader baru dan mengelola acuan bagi loader
-yang ada.</li>
+yang ada.</li>
<li>Cara menampilkan data loader, seperti {@link
android.widget.SimpleCursorAdapter}.</li>
- <li>Sumber data, seperti {@link android.content.ContentProvider}, saat menggunakan
+ <li>Sumber data, seperti {@link android.content.ContentProvider}, saat menggunakan
{@link android.content.CursorLoader}.</li>
</ul>
<h3 id="starting">Memulai Loader</h3>
@@ -140,11 +140,11 @@
<p>{@link android.app.LoaderManager} mengelola satu atau beberapa instance {@link
android.content.Loader} dalam {@link android.app.Activity} atau
{@link android.app.Fragment}. Hanya ada satu {@link
-android.app.LoaderManager} per aktivitas atau fragmen.</p>
+android.app.LoaderManager} per aktivitas atau fragmen.</p>
<p>Anda biasanya
memulai {@link android.content.Loader} dalam metode {@link
-android.app.Activity#onCreate onCreate()} aktivitas, atau dalam metode
+android.app.Activity#onCreate onCreate()} aktivitas, atau dalam metode
{@link android.app.Fragment#onActivityCreated onActivityCreated()} fragmen. Anda
melakukannya dengan cara berikut ini:</p>
@@ -157,13 +157,13 @@
<ul>
<li>ID unik yang mengidentifikasi loader. Dalam contoh ini, ID-nya adalah 0.</li>
<li>Argumen opsional untuk dipasok ke loader
-pada saat pembuatan (dalam contoh ini <code>null</code>).</li>
+pada saat pembuatan (dalam contoh ini <code>null</code>).</li>
<li>Implementasi {@link android.app.LoaderManager.LoaderCallbacks}, yang
akan dipanggil {@link android.app.LoaderManager} untuk melaporkan kejadian loader. Dalam contoh
ini, kelas lokal mengimplementasikan antarmuka {@link
android.app.LoaderManager.LoaderCallbacks}, sehingga meneruskan acuan
-ke dirinya sendiri, {@code this}.</li>
+ke dirinya sendiri, {@code this}.</li>
</ul>
<p>Panggilan {@link android.app.LoaderManager#initLoader initLoader()} memastikan bahwa loader
telah dimulai dan aktif. Ia memiliki dua kemungkinan hasil:</p>
@@ -193,7 +193,7 @@
memulai dan menghentikan pemuatan jika perlu, dan menjaga status loader
dan konten terkaitnya. Seperti yang tersirat di sini, Anda akan jarang berinteraksi dengan loader
secara langsung (meskipun misalnya menggunakan metode loader untuk menyempurnakan perilaku
-loader, lihat contoh <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
+loader, lihat contoh <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
Anda paling sering akan menggunakan metode {@link
android.app.LoaderManager.LoaderCallbacks} untuk mengintervensi proses
pemuatan saat terjadi kejadian tertentu. Untuk diskusi selengkapnya mengenai topik ini, lihat <a href="#callback">Menggunakan Callback LoaderManager</a>.</p>
@@ -245,7 +245,7 @@
— Dipanggil bila loader yang dibuat sebelumnya selesai dimuat.
</li></ul>
<ul>
- <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
+ <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
— Dipanggil bila loader yang dibuat sebelumnya sedang di-reset, sehingga datanya
tidak tersedia.
</li>
@@ -322,7 +322,7 @@
<p>Loader akan melepas data setelah mengetahui bahwa aplikasi tidak
lagi menggunakannya. Misalnya, jika data adalah kursor dari {@link
android.content.CursorLoader}, Anda tidak boleh memanggil {@link
-android.database.Cursor#close close()} sendiri. Jika kursor ditempatkan
+android.database.Cursor#close close()} sendiri. Jika kursor ditempatkan
dalam {@link android.widget.CursorAdapter}, Anda harus menggunakan metode {@link
android.widget.SimpleCursorAdapter#swapCursor swapCursor()} agar
{@link android.database.Cursor} lama tidak ditutup. Misalnya:</p>
@@ -343,7 +343,7 @@
<p>Metode ini dipanggil bila loader yang dibuat sebelumnya sedang di-reset, sehingga datanya
tidak tersedia. Callback ini memungkinkan Anda mengetahui
kapan data akan dilepas sehingga dapat menghapus acuannya ke callback. </p>
-<p>Implementasi ini memanggil
+<p>Implementasi ini memanggil
{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
dengan nilai <code>null</code>:</p>
@@ -366,7 +366,7 @@
android.app.Fragment} yang menampilkan {@link android.widget.ListView} berisi
hasil query terhadap penyedia konten kontak. Ia menggunakan {@link
android.content.CursorLoader} untuk mengelola query pada penyedia.</p>
-
+
<p>Agar aplikasi dapat mengakses kontak pengguna, seperti yang ditampilkan dalam contoh ini,
manifesnya harus menyertakan izin
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS}.</p>
diff --git a/docs/html-intl/intl/in/guide/components/processes-and-threads.jd b/docs/html-intl/intl/in/guide/components/processes-and-threads.jd
index 44051bf..cdab715 100644
--- a/docs/html-intl/intl/in/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/in/guide/components/processes-and-threads.jd
@@ -25,13 +25,13 @@
</div>
</div>
-<p>Bila komponen aplikasi dimulai dan tidak ada komponen aplikasi lain yang
-berjalan, sistem Android akan memulai proses Linux baru untuk aplikasi dengan satu thread
-eksekusi. Secara default, semua komponen aplikasi yang sama berjalan dalam proses dan
-thread yang sama (disebut thread "utama"). Jika komponen aplikasi dimulai dan sudah ada
-proses untuk aplikasi itu (karena komponen lain dari aplikasi itu sudah ada), maka komponen
-akan dimulai dalam proses itu dan menggunakan thread eksekusi yang sama. Akan tetapi, Anda bisa
-mengatur komponen berbeda di aplikasi agar berjalan di proses terpisah, dan Anda bisa membuat thread tambahan untuk
+<p>Bila komponen aplikasi dimulai dan tidak ada komponen aplikasi lain yang
+berjalan, sistem Android akan memulai proses Linux baru untuk aplikasi dengan satu thread
+eksekusi. Secara default, semua komponen aplikasi yang sama berjalan dalam proses dan
+thread yang sama (disebut thread "utama"). Jika komponen aplikasi dimulai dan sudah ada
+proses untuk aplikasi itu (karena komponen lain dari aplikasi itu sudah ada), maka komponen
+akan dimulai dalam proses itu dan menggunakan thread eksekusi yang sama. Akan tetapi, Anda bisa
+mengatur komponen berbeda di aplikasi agar berjalan di proses terpisah, dan Anda bisa membuat thread tambahan untuk
setiap proses.</p>
<p>Dokumen ini membahas cara kerja proses dan thread di aplikasi Android.</p>
@@ -39,7 +39,7 @@
<h2 id="Processes">Proses</h2>
-<p>Secara default, semua komponen aplikasi yang sama berjalan dalam proses yang sama dan kebanyakan
+<p>Secara default, semua komponen aplikasi yang sama berjalan dalam proses yang sama dan kebanyakan
aplikasi tidak boleh mengubah ini. Akan tetapi, jika Anda merasa perlu mengontrol proses milik
komponen tertentu, Anda dapat melakukannya dalam file manifes.</p>
@@ -47,54 +47,54 @@
<activity>}</a>, <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code
<service>}</a>, <a href="{@docRoot}guide/topics/manifest/receiver-element.html">{@code
<receiver>}</a>, dan <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code
-<provider>}</a>—mendukung atribut {@code android:process} yang bisa menetapkan
-dalam proses mana komponen harus dijalankan. Anda bisa mengatur atribut ini agar setiap komponen
+<provider>}</a>—mendukung atribut {@code android:process} yang bisa menetapkan
+dalam proses mana komponen harus dijalankan. Anda bisa mengatur atribut ini agar setiap komponen
berjalan dalam prosesnya sendiri atau agar beberapa komponen menggunakan proses yang sama sementara yang lainnya tidak. Anda juga bisa mengatur
{@code android:process} agar komponen aplikasi yang berbeda berjalan dalam proses yang sama
-—sepanjang aplikasi menggunakan ID Linux yang sama dan ditandatangani
+—sepanjang aplikasi menggunakan ID Linux yang sama dan ditandatangani
dengan sertifikat yang sama.</p>
<p>Elemen <a href="{@docRoot}guide/topics/manifest/application-element.html">{@code
-<application>}</a> juga mendukung atribut {@code android:process}, untuk mengatur
+<application>}</a> juga mendukung atribut {@code android:process}, untuk mengatur
nilai default yang berlaku bagi semua komponen.</p>
-<p>Android bisa memutuskan untuk mematikan proses pada waktu tertentu, bila memori tinggal sedikit dan diperlukan oleh
+<p>Android bisa memutuskan untuk mematikan proses pada waktu tertentu, bila memori tinggal sedikit dan diperlukan oleh
proses lain yang lebih mendesak untuk melayani pengguna. Komponen
-aplikasi yang berjalan dalam proses yang dimatikan maka sebagai konsekuensinya juga akan dimusnahkan. Proses dimulai
+aplikasi yang berjalan dalam proses yang dimatikan maka sebagai konsekuensinya juga akan dimusnahkan. Proses dimulai
kembali untuk komponen itu bila ada lagi pekerjaan untuk mereka lakukan.</p>
<p>Saat memutuskan proses yang akan dimatikan, sistem Android akan mempertimbangkan kepentingan relatifnya bagi
pengguna. Misalnya, sistem lebih mudah menghentikan proses yang menjadi host aktivitas yang tidak
- lagi terlihat di layar, dibandingkan dengan proses yang menjadi host aktivitas yang terlihat. Karena itu, keputusan
+ lagi terlihat di layar, dibandingkan dengan proses yang menjadi host aktivitas yang terlihat. Karena itu, keputusan
untuk menghentikan proses bergantung pada keadaan komponen yang berjalan dalam proses tersebut. Aturan
yang digunakan untuk menentukan proses yang akan dihentikan dibahas di bawah ini. </p>
<h3 id="Lifecycle">Daur hidup proses</h3>
-<p>Sistem Android mencoba mempertahankan proses aplikasi selama mungkin, namun
+<p>Sistem Android mencoba mempertahankan proses aplikasi selama mungkin, namun
pada akhirnya perlu menghapus proses lama untuk mengambil kembali memori bagi proses baru atau yang lebih penting. Untuk
menentukan proses yang akan
-dipertahankan dan yang harus dimatikan, sistem menempatkan setiap proses ke dalam "hierarki prioritas" berdasarkan
-komponen yang berjalan dalam proses dan status komponen tersebut. Proses yang memiliki
+dipertahankan dan yang harus dimatikan, sistem menempatkan setiap proses ke dalam "hierarki prioritas" berdasarkan
+komponen yang berjalan dalam proses dan status komponen tersebut. Proses yang memiliki
prioritas terendah akan dimatikan terlebih dahulu, kemudian yang terendah berikutnya, dan seterusnya, jika perlu
untuk memulihkan sumber daya sistem.</p>
-<p>Ada lima tingkatan dalam hierarki prioritas. Daftar berikut berisi beberapa
-tipe proses berdasarkan urutan prioritas (proses pertama adalah yang <em>terpenting</em> dan
+<p>Ada lima tingkatan dalam hierarki prioritas. Daftar berikut berisi beberapa
+tipe proses berdasarkan urutan prioritas (proses pertama adalah yang <em>terpenting</em> dan
<em>dimatikan terakhir</em>):</p>
<ol>
<li><b>Proses latar depan</b>
- <p>Proses yang diperlukan untuk aktivitas yang sedang dilakukan pengguna. Proses
+ <p>Proses yang diperlukan untuk aktivitas yang sedang dilakukan pengguna. Proses
dianggap berada di latar depan jika salah satu kondisi berikut terpenuhi:</p>
<ul>
<li>Proses menjadi host {@link android.app.Activity} yang berinteraksi dengan pengguna dengan metode ({@link
-android.app.Activity}{@link android.app.Activity#onResume onResume()} telah
+android.app.Activity}{@link android.app.Activity#onResume onResume()} telah
dipanggil).</li>
- <li>Proses menjadi host {@link android.app.Service} yang terikat dengan aktivitas yang sedang berinteraksi dengan
+ <li>Proses menjadi host {@link android.app.Service} yang terikat dengan aktivitas yang sedang berinteraksi dengan
pengguna.</li>
<li>Proses menjadi host {@link android.app.Service} yang berjalan "di latar depan"—
@@ -108,23 +108,23 @@
android.content.BroadcastReceiver#onReceive onReceive()}-nya.</li>
</ul>
- <p>Secara umum, hanya ada beberapa proses latar depan pada waktu yang diberikan. Proses dimatikan hanya sebagai
-upaya terakhir— jika memori hampir habis sehingga semuanya tidak bisa terus berjalan. Pada umumnya, pada
-titik itu, perangkat dalam keadaan memory paging, sehingga menghentikan beberapa proses latar depan
+ <p>Secara umum, hanya ada beberapa proses latar depan pada waktu yang diberikan. Proses dimatikan hanya sebagai
+upaya terakhir— jika memori hampir habis sehingga semuanya tidak bisa terus berjalan. Pada umumnya, pada
+titik itu, perangkat dalam keadaan memory paging, sehingga menghentikan beberapa proses latar depan
diperlukan agar antarmuka pengguna tetap responsif.</p></li>
<li><b>Proses yang terlihat</b>
- <p>Proses yang tidak memiliki komponen latar depan, namun masih bisa
-memengaruhi apa yang dilihat pengguna di layar. Proses dianggap terlihat jika salah satu kondisi
+ <p>Proses yang tidak memiliki komponen latar depan, namun masih bisa
+memengaruhi apa yang dilihat pengguna di layar. Proses dianggap terlihat jika salah satu kondisi
berikut terpenuhi:</p>
<ul>
<li>Proses ini menjadi host {@link android.app.Activity} yang tidak berada di latar depan, namun masih
-terlihat oleh penggunanya (metode {@link android.app.Activity#onPause onPause()} telah dipanggil).
-Ini bisa terjadi, misalnya, jika aktivitas latar depan memulai dialog, sehingga
+terlihat oleh penggunanya (metode {@link android.app.Activity#onPause onPause()} telah dipanggil).
+Ini bisa terjadi, misalnya, jika aktivitas latar depan memulai dialog, sehingga
aktivitas sebelumnya terlihat berada di belakangnya.</li>
- <li>Proses menjadi host {@link android.app.Service} yang terikat dengan aktivitas yang terlihat (atau latar
+ <li>Proses menjadi host {@link android.app.Service} yang terikat dengan aktivitas yang terlihat (atau latar
depan)</li>
</ul>
@@ -134,53 +134,53 @@
<li><b>Proses layanan</b>
<p>Proses yang menjalankan layanan yang telah dimulai dengan metode {@link
-android.content.Context#startService startService()} dan tidak termasuk dalam salah satu dari dua kategori
-yang lebih tinggi. Walaupun proses pelayanan tidak langsung terkait dengan semua yang dilihat oleh pengguna, proses ini
-umumnya melakukan hal-hal yang dipedulikan pengguna (seperti memutar musik di latar belakang
-atau mengunduh data di jaringan), jadi sistem membuat proses tetap berjalan kecuali memori tidak cukup untuk
+android.content.Context#startService startService()} dan tidak termasuk dalam salah satu dari dua kategori
+yang lebih tinggi. Walaupun proses pelayanan tidak langsung terkait dengan semua yang dilihat oleh pengguna, proses ini
+umumnya melakukan hal-hal yang dipedulikan pengguna (seperti memutar musik di latar belakang
+atau mengunduh data di jaringan), jadi sistem membuat proses tetap berjalan kecuali memori tidak cukup untuk
mempertahankannya bersama semua proses latar depan dan proses yang terlihat. </p>
</li>
<li><b>Proses latar belakang</b>
- <p>Proses yang menampung aktivitas yang saat ini tidak terlihat oleh pengguna (metode
-{@link android.app.Activity#onStop onStop()} aktivitas telah dipanggil). Proses ini tidak memiliki dampak
-langsung pada pengalaman pengguna, dan sistem bisa menghentikannya kapan saja untuk memperoleh kembali memori bagi
-proses latar depan, proses yang terlihat,
-atau proses layanan. Biasanya ada banyak proses latar belakang yang berjalan, sehingga disimpan
-dalam daftar LRU (least recently used atau paling sedikit digunakan) untuk memastikan bahwa proses dengan aktivitas yang paling baru
+ <p>Proses yang menampung aktivitas yang saat ini tidak terlihat oleh pengguna (metode
+{@link android.app.Activity#onStop onStop()} aktivitas telah dipanggil). Proses ini tidak memiliki dampak
+langsung pada pengalaman pengguna, dan sistem bisa menghentikannya kapan saja untuk memperoleh kembali memori bagi
+proses latar depan, proses yang terlihat,
+atau proses layanan. Biasanya ada banyak proses latar belakang yang berjalan, sehingga disimpan
+dalam daftar LRU (least recently used atau paling sedikit digunakan) untuk memastikan bahwa proses dengan aktivitas yang paling baru
terlihat oleh pengguna sebagai yang terakhir untuk dimatikan. Jika aktivitas mengimplementasikan metode
- daur hidupnya dengan benar, dan menyimpan statusnya saat ini, menghentikan prosesnya tidak akan memiliki efek
-yang terlihat pada pengalaman pengguna, karena ketika pengguna kembali ke aktivitas, aktivitas itu memulihkan
+ daur hidupnya dengan benar, dan menyimpan statusnya saat ini, menghentikan prosesnya tidak akan memiliki efek
+yang terlihat pada pengalaman pengguna, karena ketika pengguna kembali ke aktivitas, aktivitas itu memulihkan
semua statusnya yang terlihat. Lihat dokumen <a href="{@docRoot}guide/components/activities.html#SavingActivityState">Aktivitas</a>
untuk mendapatkan informasi tentang menyimpan dan memulihkan status.</p>
</li>
<li><b>Proses kosong</b>
- <p>Sebuah proses yang tidak berisi komponen aplikasi aktif apa pun. Alasan satu-satunya mempertahankan proses
+ <p>Sebuah proses yang tidak berisi komponen aplikasi aktif apa pun. Alasan satu-satunya mempertahankan proses
seperti ini tetap hidup adalah untuk keperluan caching, meningkatkan waktu mulai (startup) bila
-nanti komponen perlu dijalankan di dalamnya. Sistem sering menghentikan proses ini untuk menyeimbangkan sumber
+nanti komponen perlu dijalankan di dalamnya. Sistem sering menghentikan proses ini untuk menyeimbangkan sumber
daya sistem secara keseluruhan antara proses cache dan cache kernel yang mendasarinya.</p>
</li>
</ol>
<p>Android sebisa mungkin memeringkat proses setinggi
-mungkin, berdasarkan prioritas komponen yang sedang aktif dalam proses. Misalnya, jika suatu proses menjadi host sebuah layanan dan
+mungkin, berdasarkan prioritas komponen yang sedang aktif dalam proses. Misalnya, jika suatu proses menjadi host sebuah layanan dan
aktivitas yang terlihat, proses akan diperingkat sebagai proses yang terlihat, bukan sebagai proses layanan.</p>
<p>Selain itu, peringkat proses dapat meningkat karena adanya proses lain yang bergantung padanya
-—proses yang melayani proses lain tidak bisa diperingkat lebih rendah daripada proses yang
-sedang dilayaninya. Misalnya, jika penyedia konten dalam proses A melayani klien dalam proses B, atau
-jika layanan dalam proses A terikat dengan komponen dalam proses B, proses A selalu dipertimbangkan sebagai paling rendah
+—proses yang melayani proses lain tidak bisa diperingkat lebih rendah daripada proses yang
+sedang dilayaninya. Misalnya, jika penyedia konten dalam proses A melayani klien dalam proses B, atau
+jika layanan dalam proses A terikat dengan komponen dalam proses B, proses A selalu dipertimbangkan sebagai paling rendah
prioritasnya dibandingkan dengan proses B.</p>
- <p>Karena proses yang menjalankan layanan diperingkat lebih tinggi daripada aktivitas latar belakang,
-aktivitas yang memulai operasi yang berjalan lama mungkin lebih baik memulai <a href="{@docRoot}guide/components/services.html">layanan</a> untuk operasi itu, daripada hanya
+ <p>Karena proses yang menjalankan layanan diperingkat lebih tinggi daripada aktivitas latar belakang,
+aktivitas yang memulai operasi yang berjalan lama mungkin lebih baik memulai <a href="{@docRoot}guide/components/services.html">layanan</a> untuk operasi itu, daripada hanya
membuat thread pekerja—khususnya jika operasi mungkin akan berlangsung lebih lama daripada aktivitas.
- Misalnya, aktivitas yang mengunggah gambar ke situs web harus memulai layanan
+ Misalnya, aktivitas yang mengunggah gambar ke situs web harus memulai layanan
untuk mengunggah sehingga unggahan bisa terus berjalan di latar belakang meskipun pengguna meninggalkan aktivitas tersebut.
-Menggunakan layanan akan memastikan operasi paling tidak memiliki prioritas "proses layanan",
-apa pun yang terjadi pada aktivitas. Ini menjadi alasan yang sama yang membuat penerima siaran harus
+Menggunakan layanan akan memastikan operasi paling tidak memiliki prioritas "proses layanan",
+apa pun yang terjadi pada aktivitas. Ini menjadi alasan yang sama yang membuat penerima siaran harus
menjalankan layanan daripada hanya menempatkan operasi yang menghabiskan waktu di thread.</p>
@@ -188,35 +188,35 @@
<h2 id="Threads">Thread</h2>
-<p>Bila aplikasi diluncurkan, sistem akan membuat thread eksekusi untuk aplikasi tersebut, yang diberi nama,
+<p>Bila aplikasi diluncurkan, sistem akan membuat thread eksekusi untuk aplikasi tersebut, yang diberi nama,
"main". Thread ini sangat penting karena bertugas mengirim kejadian ke widget
antarmuka pengguna yang sesuai, termasuk kejadian menggambar. Ini juga merupakan thread yang
membuat aplikasi berinteraksi dengan komponen dari Android UI toolkit (komponen dari paket {@link
-android.widget} dan {@link android.view}). Karena itu, thread 'main' juga terkadang
+android.widget} dan {@link android.view}). Karena itu, thread 'main' juga terkadang
disebut thread UI.</p>
-<p>Sistem ini <em>tidak</em> membuat thread terpisah untuk setiap instance komponen. Semua
-komponen yang berjalan di proses yang sama akan dibuat instance-nya dalam thread UI, dan sistem akan memanggil
+<p>Sistem ini <em>tidak</em> membuat thread terpisah untuk setiap instance komponen. Semua
+komponen yang berjalan di proses yang sama akan dibuat instance-nya dalam thread UI, dan sistem akan memanggil
setiap komponen yang dikirim dari thread itu. Akibatnya, metode yang merespons callback sistem
(seperti {@link android.view.View#onKeyDown onKeyDown()} untuk melaporkan tindakan pengguna atau metode callback daur hidup)
selalu berjalan di thread UI proses.</p>
-<p>Misalnya saat pengguna menyentuh tombol pada layar, thread UI aplikasi akan mengirim kejadian
-sentuh ke widget, yang selanjutnya menetapkan status ditekan dan mengirim permintaan yang tidak divalidasi ke
+<p>Misalnya saat pengguna menyentuh tombol pada layar, thread UI aplikasi akan mengirim kejadian
+sentuh ke widget, yang selanjutnya menetapkan status ditekan dan mengirim permintaan yang tidak divalidasi ke
antrean kejadian. Thread UI akan menghapus antrean permintaan dan memberi tahu widget bahwa widget harus menggambar
dirinya sendiri.</p>
-<p>Saat aplikasi melakukan pekerjaan intensif sebagai respons terhadap interaksi pengguna, model
+<p>Saat aplikasi melakukan pekerjaan intensif sebagai respons terhadap interaksi pengguna, model
thread tunggal ini bisa menghasilkan kinerja yang buruk kecuali jika Anda mengimplementasikan aplikasi dengan benar. Khususnya jika
semua terjadi di thread UI, melakukan operasi yang panjang seperti akses ke jaringan atau query
database akan memblokir seluruh UI. Bila thread diblokir, tidak ada kejadian yang bisa dikirim,
-termasuk kejadian menggambar. Dari sudut pandang pengguna, aplikasi
+termasuk kejadian menggambar. Dari sudut pandang pengguna, aplikasi
tampak mogok (hang). Lebih buruk lagi, jika thread UI diblokir selama lebih dari beberapa detik
(saat ini sekitar 5 detik) pengguna akan ditampilkan dialog "<a href="http://developer.android.com/guide/practices/responsiveness.html">aplikasi tidak
-merespons</a>" (ANR) yang populer karena reputasi buruknya. Pengguna nanti bisa memutuskan untuk keluar dari aplikasi dan menghapus aplikasi
+merespons</a>" (ANR) yang populer karena reputasi buruknya. Pengguna nanti bisa memutuskan untuk keluar dari aplikasi dan menghapus aplikasi
jika mereka tidak suka.</p>
-<p>Selain itu, toolkit Android UI <em>bukan</em> thread-safe. Jadi, Anda tidak harus memanipulasi
+<p>Selain itu, toolkit Android UI <em>bukan</em> thread-safe. Jadi, Anda tidak harus memanipulasi
UI dari thread pekerja—Anda harus melakukan semua manipulasi pada antarmuka pengguna dari thread
UI. Sehingga hanya ada dua aturan untuk model thread tunggal Android:</p>
@@ -227,12 +227,12 @@
<h3 id="WorkerThreads">Thread pekerja</h3>
-<p>Karena model thread tunggal yang dijelaskan di atas, Anda dilarang memblokir thread
+<p>Karena model thread tunggal yang dijelaskan di atas, Anda dilarang memblokir thread
UI demi daya respons UI aplikasi. Jika memiliki operasi untuk dijalankan
yang tidak seketika, Anda harus memastikan untuk melakukannya di thread terpisah (thread "latar belakang" atau
thread "pekerja").</p>
-<p>Misalnya, berikut ini beberapa kode untuk listener klik yang mengunduh gambar dari
+<p>Misalnya, berikut ini beberapa kode untuk listener klik yang mengunduh gambar dari
thread terpisah dan menampilkannya dalam {@link android.widget.ImageView}:</p>
<pre>
@@ -246,13 +246,13 @@
}
</pre>
-<p>Awalnya hal ini tampak bekerja dengan baik, karena menciptakan thread baru untuk menangani
+<p>Awalnya hal ini tampak bekerja dengan baik, karena menciptakan thread baru untuk menangani
operasi jaringan. Akan tetapi, hal tersebut melanggar aturan kedua model thread tunggal: <em>jangan mengakses
toolkit Android UI dari luar thread UI</em>—sampel ini memodifikasi {@link
android.widget.ImageView} dari thread pekerja sebagai ganti thread UI. Ini bisa
mengakibatkan perilaku yang tidak terdefinisi dan tidak diharapkan, yang bisa menyulitkan dan menghabiskan waktu untuk melacaknya.</p>
-<p>Untuk memperbaiki masalah ini, Android menawarkan beberapa cara untuk mengakses thread UI dari
+<p>Untuk memperbaiki masalah ini, Android menawarkan beberapa cara untuk mengakses thread UI dari
thread lainnya. Berikut ini daftar metode yang bisa membantu:</p>
<ul>
@@ -284,10 +284,10 @@
<p>Kini implementasi ini thread-safe: operasi jaringan dilakukan terpisah dari thread
sementara {@link android.widget.ImageView} dimanipulasi dari thread UI.</p>
-<p>Akan tetapi, karena operasi semakin kompleks, jenis kode seperti ini bisa semakin rumit
-dan sulit dipertahankan. Untuk menangani interaksi yang lebih kompleks dengan thread pekerja, Anda bisa mempertimbangkan
+<p>Akan tetapi, karena operasi semakin kompleks, jenis kode seperti ini bisa semakin rumit
+dan sulit dipertahankan. Untuk menangani interaksi yang lebih kompleks dengan thread pekerja, Anda bisa mempertimbangkan
penggunaan {@link android.os.Handler}di thread pekerja, untuk memproses pesan yang dikirim dari
- thread UI. Mungkin solusi terbaiknya adalah memperpanjang kelas {@link android.os.AsyncTask},
+ thread UI. Mungkin solusi terbaiknya adalah memperpanjang kelas {@link android.os.AsyncTask},
yang akan menyederhanakan eksekusi tugas-tugas thread pekerja yang perlu berinteraksi dengan UI.</p>
@@ -298,10 +298,10 @@
di thread UI, tanpa mengharuskan Anda untuk menangani sendiri thread dan/atau handler sendiri.</p>
<p>Untuk menggunakannya, Anda harus menempatkan {@link android.os.AsyncTask} sebagai subkelas dan mengimplementasikan metode callback {@link
-android.os.AsyncTask#doInBackground doInBackground()} yang berjalan di kumpulan
+android.os.AsyncTask#doInBackground doInBackground()} yang berjalan di kumpulan
thread latar belakang. Untuk memperbarui UI, Anda harus mengimplementasikan {@link
android.os.AsyncTask#onPostExecute onPostExecute()}, yang memberikan hasil dari {@link
-android.os.AsyncTask#doInBackground doInBackground()} dan berjalan di thread UI, jadi Anda bisa
+android.os.AsyncTask#doInBackground doInBackground()} dan berjalan di thread UI, jadi Anda bisa
memperbarui UI dengan aman. Selanjutnya Anda bisa menjalankan tugas dengan memanggil {@link android.os.AsyncTask#execute execute()}
dari thread UI.</p>
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
@@ -328,16 +328,16 @@
}
</pre>
-<p>Kini UI aman dan kode jadi lebih sederhana, karena memisahkan pekerjaan ke
+<p>Kini UI aman dan kode jadi lebih sederhana, karena memisahkan pekerjaan ke
dalam bagian-bagian yang harus dilakukan pada thread pekerja dan thread UI.</p>
-<p>Anda harus membaca acuan {@link android.os.AsyncTask} untuk memahami sepenuhnya
+<p>Anda harus membaca acuan {@link android.os.AsyncTask} untuk memahami sepenuhnya
cara menggunakan kelas ini, namun berikut ini ikhtisar singkat cara kerjanya:</p>
<ul>
<li>Anda bisa menetapkan tipe parameter, nilai kemajuan, dan nilai
akhir tugas, dengan menggunakan generik</li>
-<li>Metode {@link android.os.AsyncTask#doInBackground doInBackground()} berjalan secara otomatis pada
+<li>Metode {@link android.os.AsyncTask#doInBackground doInBackground()} berjalan secara otomatis pada
thread pekerja</li>
<li>{@link android.os.AsyncTask#onPreExecute onPreExecute()}, {@link
android.os.AsyncTask#onPostExecute onPostExecute()}, dan {@link
@@ -352,23 +352,23 @@
<p class="caution"><strong>Perhatian:</strong> Masalah lain yang mungkin Anda temui saat menggunakan
thread pekerja adalah restart tak terduga dalam aktivitas karena <a href="{@docRoot}guide/topics/resources/runtime-changes.html">perubahan konfigurasi runtime</a>
- (seperti saat pengguna mengubah orientasi layar), yang bisa memusnahkan thread pekerja. Untuk
-melihat cara mempertahankan tugas selama restart ini dan cara membatalkan
+ (seperti saat pengguna mengubah orientasi layar), yang bisa memusnahkan thread pekerja. Untuk
+melihat cara mempertahankan tugas selama restart ini dan cara membatalkan
tugas dengan benar saat aktivitas dimusnahkan, lihat kode sumber untuk aplikasi sampel <a href="http://code.google.com/p/shelves/">Shelves</a>.</p>
<h3 id="ThreadSafe">Metode thread-safe</h3>
-<p> Dalam beberapa situasi, metode yang Anda implementasikan bisa dipanggil dari lebih dari satu thread,
+<p> Dalam beberapa situasi, metode yang Anda implementasikan bisa dipanggil dari lebih dari satu thread,
dan karena itu harus ditulis agar menjadi thread-safe. </p>
-<p>Ini terutama terjadi untuk metode yang bisa dipanggil dari jauh —seperti metode dalam <a href="{@docRoot}guide/components/bound-services.html">layanan terikat</a>. Bila sebuah panggilan pada
-metode yang dijalankan dalam {@link android.os.IBinder} berasal dari proses yang sama di mana
+<p>Ini terutama terjadi untuk metode yang bisa dipanggil dari jauh —seperti metode dalam <a href="{@docRoot}guide/components/bound-services.html">layanan terikat</a>. Bila sebuah panggilan pada
+metode yang dijalankan dalam {@link android.os.IBinder} berasal dari proses yang sama di mana
{@link android.os.IBinder IBinder} berjalan, metode ini akan dieksekusi di thread pemanggil.
Akan tetapi, bila panggilan berasal proses lain, metode akan dieksekusi dalam thread yang dipilih dari
kumpulan (pool) thread yang dipertahankan sistem dalam proses yang sama seperti{@link android.os.IBinder
-IBinder} (tidak dieksekusi dalam thread UI proses). Misalnya, karena metode
-{@link android.app.Service#onBind onBind()} layanan akan dipanggil dari thread UI
+IBinder} (tidak dieksekusi dalam thread UI proses). Misalnya, karena metode
+{@link android.app.Service#onBind onBind()} layanan akan dipanggil dari thread UI
proses layanan, metode yang diimplementasikan dalam objek yang dikembalikan {@link android.app.Service#onBind
onBind()} (misalnya, subkelas yang mengimplementasikan metode RPC) akan dipanggil dari thread
di pool. Karena layanan bisa memiliki lebih dari satu klien, maka lebih dari satu pool thread bisa melibatkan
@@ -382,19 +382,19 @@
android.content.ContentProvider#query query()}, {@link android.content.ContentProvider#insert
insert()}, {@link android.content.ContentProvider#delete delete()}, {@link
android.content.ContentProvider#update update()}, dan {@link android.content.ContentProvider#getType
-getType()}— dipanggil dari pool thread pada proses penyedia konten, bukan thread UI
-untuk proses tersebut. Mengingat metode ini bisa dipanggil dari thread mana pun
+getType()}— dipanggil dari pool thread pada proses penyedia konten, bukan thread UI
+untuk proses tersebut. Mengingat metode ini bisa dipanggil dari thread mana pun
sekaligus, metode-metode ini juga harus diimplementasikan sebagai thread-safe. </p>
<h2 id="IPC">Komunikasi Antarproses</h2>
<p>Android menawarkan mekanisme komunikasi antarproses (IPC) menggunakan panggilan prosedur jauh
- (RPC), yang mana metode ini dipanggil oleh aktivitas atau komponen aplikasi lain, namun dieksekusi dari
+ (RPC), yang mana metode ini dipanggil oleh aktivitas atau komponen aplikasi lain, namun dieksekusi dari
jauh (di proses lain), bersama hasil yang dikembalikan ke
-pemanggil. Ini mengharuskan penguraian panggilan metode dan datanya ke tingkat yang bisa
-dipahami sistem operasi, mentransmisikannya dari proses lokal dan ruang alamat untuk proses jauh
-dan ruang proses, kemudian merakit kembali dan menetapkannya kembali di sana. Nilai-nilai yang dikembalikan
+pemanggil. Ini mengharuskan penguraian panggilan metode dan datanya ke tingkat yang bisa
+dipahami sistem operasi, mentransmisikannya dari proses lokal dan ruang alamat untuk proses jauh
+dan ruang proses, kemudian merakit kembali dan menetapkannya kembali di sana. Nilai-nilai yang dikembalikan
akan ditransmisikan dalam arah berlawanan. Android menyediakan semua kode untuk melakukan transaksi IPC
ini, sehingga Anda bisa fokus pada pendefinisian dan implementasi antarmuka pemrograman RPC. </p>
diff --git a/docs/html-intl/intl/in/guide/components/recents.jd b/docs/html-intl/intl/in/guide/components/recents.jd
index dcfcda7..286fdc1 100644
--- a/docs/html-intl/intl/in/guide/components/recents.jd
+++ b/docs/html-intl/intl/in/guide/components/recents.jd
@@ -60,23 +60,23 @@
<h2 id="adding">Menambahkan Tugas ke Layar Ikhtisar</h2>
<p>Penggunaan flag kelas {@link android.content.Intent} untuk menambahkan tugas memberi kontrol lebih besar
-atas waktu dan cara dokumen dibuka atau dibuka kembali di layar ikhtisar. Bila menggunakan atribut
+atas waktu dan cara dokumen dibuka atau dibuka kembali di layar ikhtisar. Bila menggunakan atribut
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-, Anda dapat memilih antara selalu membuka dokumen dalam tugas baru atau menggunakan kembali tugas
+, Anda dapat memilih antara selalu membuka dokumen dalam tugas baru atau menggunakan kembali tugas
yang ada untuk dokumen tersebut.</p>
<h3 id="flag-new-doc">Menggunakan flag Intent untuk menambahkan tugas</h3>
-<p>Bila membuat dokumen baru untuk aktivitas, Anda memanggil metode
+<p>Bila membuat dokumen baru untuk aktivitas, Anda memanggil metode
{@link android.app.ActivityManager.AppTask#startActivity(android.content.Context, android.content.Intent, android.os.Bundle) startActivity()}
- dari kelas {@link android.app.ActivityManager.AppTask}, dengan meneruskannya ke intent yang
+ dari kelas {@link android.app.ActivityManager.AppTask}, dengan meneruskannya ke intent yang
menjalankan aktivitas tersebut. Untuk menyisipkan jeda logis agar sistem memperlakukan aktivitas Anda sebagai tugas
-baru di layar ikhtisar, teruskan flag {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
+baru di layar ikhtisar, teruskan flag {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
dalam metode {@link android.content.Intent#addFlags(int) addFlags()} dari {@link android.content.Intent}
yang memulai aktivitas itu.</p>
<p class="note"><strong>Catatan:</strong> Flag {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
-menggantikan flag {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET},
+menggantikan flag {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET},
yang tidak digunakan lagi pada Android 5.0 (API level 21).</p>
<p>Jika Anda menetapkan flag {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} saat membuat
@@ -169,18 +169,18 @@
<dt>"{@code none”}"</dt>
<dd>Aktivitas ini tidak membuat tugas baru untuk dokumen. Layar ikhtisar memperlakukan
- aktivitas seperti itu secara default: satu tugas ditampilkan untuk aplikasi, yang
+ aktivitas seperti itu secara default: satu tugas ditampilkan untuk aplikasi, yang
dilanjutkan dari aktivitas apa pun yang terakhir dipanggil pengguna.</dd>
<dt>"{@code never}"</dt>
<dd>Aktivitas ini tidak membuat tugas baru untuk dokumen. Mengatur nilai ini akan mengesampingkan
perilaku flag {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
- dan {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK}, jika salah satunya ditetapkan di
+ dan {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK}, jika salah satunya ditetapkan di
intent, dan layar ikhtisar menampilkan satu tugas untuk aplikasi, yang dilanjutkan dari
aktivitas apa pun yang terakhir dipanggil pengguna.</dd>
</dl>
-<p class="note"><strong>Catatan:</strong> Untuk nilai selain {@code none} dan {@code never},
+<p class="note"><strong>Catatan:</strong> Untuk nilai selain {@code none} dan {@code never},
aktivitas harus didefinisikan dengan {@code launchMode="standard"}. Jika atribut ini tidak ditetapkan, maka
{@code documentLaunchMode="none"} akan digunakan.</p>
@@ -219,8 +219,8 @@
</pre>
<p class="note"><strong>Catatan:</strong> Penggunaan metode
-{@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()}
-akan mengesampingkan penggunaan tag {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS}, seperti
+{@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()}
+akan mengesampingkan penggunaan tag {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS}, seperti
dibahas di bawah ini.</p>
<h3 id="#retain-finished">Mempertahankan tugas yang telah selesai</h3>
diff --git a/docs/html-intl/intl/in/guide/components/services.jd b/docs/html-intl/intl/in/guide/components/services.jd
index 7ecd8cd..b36e565 100644
--- a/docs/html-intl/intl/in/guide/components/services.jd
+++ b/docs/html-intl/intl/in/guide/components/services.jd
@@ -186,7 +186,7 @@
aplikasi Anda.</p>
<p>Untuk mendeklarasikan layanan Anda, tambahkan sebuah elemen <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
-sebagai anak
+sebagai anak
elemen <a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a>. Misalnya:</p>
<pre>
@@ -539,7 +539,7 @@
komponen lain bisa menghentikannya dengan memanggil {@link android.content.Context#stopService stopService()}.</p>
<p>Setelah diminta untuk berhenti dengan {@link android.app.Service#stopSelf stopSelf()} atau {@link
-android.content.Context#stopService stopService()}, sistem akan menghapus layanan
+android.content.Context#stopService stopService()}, sistem akan menghapus layanan
secepatnya.</p>
<p>Akan tetapi, bila layanan Anda menangani beberapa permintaan ke {@link
diff --git a/docs/html-intl/intl/in/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/in/guide/components/tasks-and-back-stack.jd
index 279442f..4c344ae 100644
--- a/docs/html-intl/intl/in/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/in/guide/components/tasks-and-back-stack.jd
@@ -29,7 +29,7 @@
<ol>
<li><a href="{@docRoot}design/patterns/navigation.html">Desain Android:
Navigasi</a></li>
- <li><a href="{@docRoot}guide/topics/manifest/activity-element.html">Elemen manifes
+ <li><a href="{@docRoot}guide/topics/manifest/activity-element.html">Elemen manifes
{@code <activity>}</a></li>
<li><a href="{@docRoot}guide/components/recents.html">Layar Ikhtisar</a></li>
</ol>
@@ -52,7 +52,7 @@
aktivitas mungkin dari aplikasi yang berbeda, Android akan tetap mempertahankan pengalaman pengguna yang mulus
dengan menjalankan kedua aktivitas dalam <em>tugas</em> yang sama.</p>
-<p>Tugas adalah kumpulan aktivitas yang berinteraksi dengan pengguna
+<p>Tugas adalah kumpulan aktivitas yang berinteraksi dengan pengguna
saat melakukan pekerjaan tertentu. Aktivitas tersebut diatur dalam tumpukan (<em>back-stack</em>), dalam
urutan membuka setiap aktivitas.</p>
@@ -93,7 +93,7 @@
aktivitas saat ini dan dikeluarkan bila pengguna meninggalkannya menggunakan tombol <em>Back</em>. Dengan demikian,
back-stack
beroperasi sebagai struktur objek "masuk terakhir, keluar pertama". Gambar 1 melukiskan perilaku
-ini dengan jangka waktu yang menunjukkan kemajuan antar aktivitas beserta
+ini dengan jangka waktu yang menunjukkan kemajuan antar aktivitas beserta
back-stack pada setiap waktu.</p>
<img src="{@docRoot}images/fundamentals/diagram_backstack.png" alt="" />
@@ -148,7 +148,7 @@
aktivitas tersebut akan dibuat dan didorong ke back-stack (bukannya memunculkan instance sebelumnya dari
aktivitas ke atas). Dengan demikian, satu aktivitas pada aplikasi Anda mungkin dibuat beberapa
kali (bahkan dari beberapa tugas), seperti yang ditampilkan dalam gambar 3. Dengan demikian, jika pengguna mengarahkan mundur
-menggunakan tombol <em>Back</em>, setiap instance aktivitas ini akan ditampilkan dalam urutan saat
+menggunakan tombol <em>Back</em>, setiap instance aktivitas ini akan ditampilkan dalam urutan saat
dibuka (masing-masing
dengan status UI sendiri). Akan tetapi, Anda bisa memodifikasi perilaku ini jika tidak ingin aktivitas
dibuat instance-nya lebih dari sekali. Caranya dibahas di bagian selanjutnya tentang <a href="#ManagingTasks">Mengelola Tugas</a>.</p>
@@ -347,7 +347,7 @@
selalu dibuka dalam tugasnya sendiri—dengan menetapkan mode pembuka {@code singleTask} dalam elemen<a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>.
Ini berarti bahwa jika aplikasi Anda mengeluarkan
intent untuk membuka Browser Android, aktivitasnya <em>tidak</em> akan ditempatkan dalam tugas
-yang sama seperti aplikasi Anda. Sebagai gantinya, tugas baru akan dimulai untuk Browser atau, jika Browser
+yang sama seperti aplikasi Anda. Sebagai gantinya, tugas baru akan dimulai untuk Browser atau, jika Browser
sudah memiliki tugas yang berjalan di latar belakang, tugas tersebut akan dimajukan untuk menangani intent
baru.</p>
@@ -387,13 +387,13 @@
<dd>Memulai aktivitas dalam tugas baru. Jika tugas sudah dijalankan untuk aktivitas yang sekarang
Anda mulai, tugas tersebut akan dibawa ke latar depan dengan status terakhir yang dipulihkan dan aktivitas
akan menerima intent baru dalam {@link android.app.Activity#onNewIntent onNewIntent()}.
- <p>Ini menghasilkan perilaku yang sama dengan nilai {@code "singleTask"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a>
+ <p>Ini menghasilkan perilaku yang sama dengan nilai {@code "singleTask"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a>
yang dibahas di bagian sebelumnya.</p></dd>
<dt>{@link android.content.Intent#FLAG_ACTIVITY_SINGLE_TOP}</dt>
<dd>Jika aktivitas yang dimulai adalah aktivitas saat ini (di bagian teratas back-stack), maka
instance yang ada akan menerima panggilan ke {@link android.app.Activity#onNewIntent onNewIntent()}
sebagai ganti membuat instance baru aktivitas.
- <p>Ini menghasilkan perilaku yang sama dengan nilai {@code "singleTop"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a>
+ <p>Ini menghasilkan perilaku yang sama dengan nilai {@code "singleTop"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a>
yang dibahas di bagian sebelumnya.</p></dd>
<dt>{@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP}</dt>
<dd>Jika aktivitas yang dimulai sudah berjalan dalam tugas saat ini, maka sebagai
@@ -427,8 +427,8 @@
aplikasi yang berbeda bisa berbagi afinitas, atau aktivitas yang didefinisikan dalam aplikasi yang sama bisa
diberi afinitas tugas yang berbeda.</p>
-<p>Anda bisa memodifikasi afinitas untuk setiap yang diberikan
-dengan atribut <a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a>
+<p>Anda bisa memodifikasi afinitas untuk setiap yang diberikan
+dengan atribut <a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a>
elemen <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>.</p>
<p>Atribut <a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a>
@@ -444,7 +444,7 @@
{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}
.
-<p>Aktivitas baru, secara default, diluncurkan ke dalam tugas aktivitas
+<p>Aktivitas baru, secara default, diluncurkan ke dalam tugas aktivitas
yang disebut {@link android.app.Activity#startActivity startActivity()}. Ini didorong ke back-stack
yang sama seperti caller. Akan tetapi, jika intent yang diteruskan ke
{@link android.app.Activity#startActivity startActivity()}
@@ -473,7 +473,7 @@
yang didefinisikan sebagai bagian dari aplikasi perjalanan. Aktivitas memiliki afinitas yang sama dengan aktivitas lain dalam aplikasi
yang sama (afinitas aplikasi default) dan aktivitas ini memungkinkan re-parenting dengan atribut ini.
Bila salah satu aktivitas Anda memulai aktivitas laporan cuaca, awalnya aktivitas ini dimiliki oleh tugas
-yang sama dengan aktivitas Anda. Akan tetapi, bila tugas aplikasi perjalanan di bawa ke latar depan,
+yang sama dengan aktivitas Anda. Akan tetapi, bila tugas aplikasi perjalanan di bawa ke latar depan,
aktivitas laporan cuaca akan ditetapkan kembali ke tugas itu dan ditampilkan di dalamnya.</p>
</li>
</ul>
@@ -497,7 +497,7 @@
<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#always">alwaysRetainTaskState</a></code>
</dt>
-<dd>Jika atribut ini ditetapkan ke {@code "true"} dalam aktivitas akar tugas,
+<dd>Jika atribut ini ditetapkan ke {@code "true"} dalam aktivitas akar tugas,
perilaku default yang baru dijelaskan tidak akan terjadi.
Tugas akan mempertahankan semua aktivitas dalam back-stack bahkan setelah sekian lama.</dd>
@@ -516,7 +516,7 @@
<dd>Atribut ini seperti <a href="{@docRoot}guide/topics/manifest/activity-element.html#clear">{@code clearTaskOnLaunch}</a>,
namun beroperasi pada
satu aktivitas, bukan pada seluruh tugas. Hal ini juga bisa menyebabkan aktivitas
-hilang, termasuk aktivitas akar. Bila ini diatur ke {@code "true"},
+hilang, termasuk aktivitas akar. Bila ini diatur ke {@code "true"},
aktivitas akan tetap menjadi bagian dari tugas hanya untuk sesi saat ini. Jika pengguna
keluar dan kemudian kembali ke tugas tersebut, tugas tidak akan ada lagi.</dd>
</dl>
@@ -552,14 +552,14 @@
{@code "singleInstance"}, hanya boleh digunakan bila aktivitas memiliki filter
{@link android.content.Intent#ACTION_MAIN}
dan {@link android.content.Intent#CATEGORY_LAUNCHER}. Bayangkan, misalnya, apa yang akan
-terjadi jika filter tidak ada: Intent meluncurkan aktivitas{@code "singleTask"}, memulai
-tugas yang baru, dan pengguna menghabiskan lebih banyak waktu mengerjakan tugas tersebut. Pengguna kemudian menekan tombol
+terjadi jika filter tidak ada: Intent meluncurkan aktivitas{@code "singleTask"}, memulai
+tugas yang baru, dan pengguna menghabiskan lebih banyak waktu mengerjakan tugas tersebut. Pengguna kemudian menekan tombol
<em>Home</em>. Tugas kini dikirim ke latar belakang dan tidak terlihat. Sekarang pengguna tidak memiliki cara untuk kembali
ke tugas tersebut, karena tidak dinyatakan dalam launcher aplikasi.</p>
-<p>Untuk kasus-kasus di mana Anda tidak ingin pengguna bisa kembali ke aktivitas, atur dalam
+<p>Untuk kasus-kasus di mana Anda tidak ingin pengguna bisa kembali ke aktivitas, atur dalam
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
- pada
+ pada
<a href="{@docRoot}guide/topics/manifest/activity-element.html#finish">{@code finishOnTaskLaunch}</a>
elemen ke {@code "true"} (lihat <a href="#Clearing">Menghapus back-stack</a>).</p>
diff --git a/docs/html-intl/intl/in/guide/platform/j8-jack.jd b/docs/html-intl/intl/in/guide/platform/j8-jack.jd
new file mode 100644
index 0000000..4389184
--- /dev/null
+++ b/docs/html-intl/intl/in/guide/platform/j8-jack.jd
@@ -0,0 +1,197 @@
+page.title=Fitur Bahasa Java 8
+page.keywords="android N", "Java 8", "Jack"
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <ol>
+ <li>
+ <a href="#supported-features">API dan Fitur Bahasa Java 8 yang didukung</a>
+ </li>
+ <li>
+ <a href="#configuration">Mengaktifkan Fitur Java 8 dan Jack Toolchain</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>Android N memperkenalkan dukungan untuk fitur bahasa Java 8
+ yang bisa Anda gunakan saat mengembangkan aplikasi yang menargetkan Android N.
+ Halaman ini menjelaskan fitur bahasa baru yang didukung dalam Android N
+ Preview, cara menyiapkan proyek Anda dengan benar untuk menggunakannya, dan setiap masalah
+ yang diketahui yang mungkin Anda temui.
+</p>
+
+<p>Untuk mulai menggunakan fitur-fitur ini, Anda perlu mengunduh dan menyiapkan Android
+Studio 2.1 dan Android N Preview SDK, yang menyertakan
+Jack toolchain yang diperlukan dan Plugin Android untuk Gradle yang telah diperbarui. Jika Anda belum
+memasang Android N Preview SDK, lihat <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan Pengembangan untuk Android N</a>.</p>
+
+
+
+<p class="note">
+ <strong>Catatan:</strong> Menggunakan fitur bahasa Java 8 yang baru bukanlah
+ persyaratan untuk mengembangkan aplikasi yang menargetkan platform Android N. Jika Anda
+ tidak ingin menulis kode dengan fitur bahasa Java 8, Anda bisa membiarkan nilai kompatibilitas
+ sumber dan target proyek disetel ke Java 7, namun Anda tetap harus
+ mengompilasi dengan JDK 8 untuk membangun pada platform Android N.
+</p>
+
+<h2 id="supported-features">
+ API dan Fitur Bahasa Java 8 yang Didukung
+</h2>
+
+<p>
+ Saat ini tidak semua fitur bahasa Java 8 didukung Android. Akan tetapi,
+ fitur berikut sekarang tersedia saat mengembangkan aplikasi yang menargetkan
+ Android N Preview:
+</p>
+
+<ul>
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">Metode
+ antarmuka default dan statis</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html">
+ Ekspresi Lambda</a> (juga tersedia pada API level 23 dan yang lebih rendah)
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/annotations/repeating.html">Anotasi
+ yang bisa diulang</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/methodreferences.html">
+ Referensi Metode</a> (juga tersedia pada API level 23 dan yang lebih rendah)
+ </li>
+</ul>
+
+<p class="note">
+ <strong>Catatan:</strong> Untuk menguji ekspresi lambda dan referensi metode pada
+ Android versi sebelumnya, bukalah file {@code build.gradle}
+ Anda, serta setel {@code compileSdkVersion} dan {@code targetSdkVersion} ke 23 atau
+ yang lebih rendah. Anda tetap perlu <a href="#configuration">mengaktifkan Jack
+ toolchain</a> untuk menggunakan fitur Java 8 ini.
+</p>
+
+<p>
+ Selain itu, API fitur bahasa Java 8 berikut ini sekarang tersedia:
+</p>
+
+<ul>
+ <li>Reflection API dan API terkait bahasa:
+ <ul>
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/FunctionalInterface.html">
+ {@code java.lang.FunctionalInterface}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Repeatable.html">
+ {@code java.lang.annotation.Repeatable}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#isDefault--">
+ {@code java.lang.reflect.Method.isDefault()}</a>
+ </li>
+
+ <li>dan Reflection API yang terkait dengan anotasi yang bisa diulang, seperti
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType-java.lang.Class-">
+{@code AnnotatedElement.getAnnotationsByType(Class)}</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>Utility API:
+ <ul>
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">
+ {@code java.util.function}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html">
+ {@code java.util.stream}</a>
+ </li>
+ </ul>
+ </li>
+</ul>
+
+<h2 id="configuration">
+ Mengaktifkan Fitur Java 8 dan Jack Toolchain
+</h2>
+
+<p>
+ Agar dapat menggunakan fitur bahasa Java 8 yang baru, Anda juga perlu menggunakan
+ <a class="external-link" href="https://source.android.com/source/jack.html">Jack toolchain</a> yang baru. Toolchain Android
+ yang baru ini mengompilasi sumber bahasa Java menjadi dex
+ bytecode yang bisa dibaca Android, memiliki format pustaka {@code .jack} sendiri, dan menyediakan sebagian besar fitur toolchain
+ sebagai bagian dari alat bantu tunggal: pengemasan ulang, penciutan, pengaburan, dan
+ multidex.
+</p>
+
+<p>Inilah perbandingan dua toolchain yang digunakan untuk membangun file Android DEX:</p>
+<ul>
+ <li>Toolchain javac lawas:<br>
+ <b>javac</b> ({@code .java} --> {@code .class}) --> <b>dx</b> ({@code
+ .class} --> {@code .dex})
+ </li>
+
+ <li>Jack Toolchain baru:<br>
+ <b>Jack</b> ({@code .java} --> {@code .jack} --> {@code .dex})
+ </li>
+</ul>
+
+<h3>
+ Mengonfigurasi Gradle
+</h3>
+
+<p>
+ Untuk mengaktifkan fitur bahasa Java 8 dan Jack bagi proyek Anda, masukkan
+ yang berikut dalam file {@code build.gradle} level modul Anda:
+</p>
+
+<pre>
+android {
+ ...
+ defaultConfig {
+ ...
+ jackOptions {
+ enabled true
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+</pre>
+
+<h3 id="known-issues">
+ Masalah yang Diketahui
+</h3>
+
+<p>
+ <a href="{@docRoot}tools/building/building-studio.html#instant-run">Instant
+ Run</a> saat ini tidak berfungsi pada Jack dan akan dinonaktifkan saat menggunakan
+ toolchain baru.
+</p>
+
+<p>Karena Jack tidak menghasilkan file kelas antara saat mengompilasi sebuah
+aplikasi, alat yang bergantung pada file-file ini sekarang tidak berfungsi pada Jack. Beberapa
+contoh alat ini adalah:</p>
+
+<ul>
+ <li>Pendeteksi lint yang beroperasi pada file kelas
+ </li>
+
+ <li>Alat dan pustaka yang mewajibkan file kelas aplikasi (misalnya
+pengujian instrumentasi dengan JaCoCo)
+ </li>
+</ul>
+
+<p>Jika Anda menemukan masalah lain saat menggunakan Jack, <a href="http://tools.android.com/filing-bugs">laporkan bug</a>.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/in/guide/topics/manifest/manifest-intro.jd
index 6d6a3ad..050abf4 100644
--- a/docs/html-intl/intl/in/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/in/guide/topics/manifest/manifest-intro.jd
@@ -23,7 +23,7 @@
Setiap aplikasi harus memiliki file AndroidManifest.xml (bernama persis seperti ini) di direktori akar.
<span itemprop="description">File manifes
menyediakan informasi penting tentang aplikasi ke sistem Android,
- informasi yang harus dimiliki sistem agar bisa menjalankan setiap kode
+ informasi yang harus dimiliki sistem agar bisa menjalankan setiap kode
aplikasi.</span> Di antaranya, manifes melakukan hal berikut ini:
</p>
@@ -32,26 +32,26 @@
Nama paket berfungsi sebagai identifier unik untuk aplikasi.</li>
<li>Menjelaskan berbagai komponen aplikasi—aktivitas,
- layanan, penerima siaran, dan penyedia konten
-yang membentuk aplikasi. Menamai kelas yang mengimplementasikan setiap komponen dan
-mempublikasikan kemampuannya (misalnya, pesan {@link android.content.Intent
-Intent} mana yang bisa ditanganinya). Deklarasi ini memberi tahu sistem Android mengenai
+ layanan, penerima siaran, dan penyedia konten
+yang membentuk aplikasi. Menamai kelas yang mengimplementasikan setiap komponen dan
+mempublikasikan kemampuannya (misalnya, pesan {@link android.content.Intent
+Intent} mana yang bisa ditanganinya). Deklarasi ini memberi tahu sistem Android mengenai
komponennya dan dalam kondisi apa bisa diluncurkan.</li>
-<li>Menentukan proses yang akan menjadi host komponen aplikasi.</li>
+<li>Menentukan proses yang akan menjadi host komponen aplikasi.</li>
-<li>Mendeklarasikan izin aplikasi mana yang harus dimiliki untuk
-mengakses bagian yang dilindungi pada API dan berinteraksi dengan aplikasi lain.</li>
+<li>Mendeklarasikan izin aplikasi mana yang harus dimiliki untuk
+mengakses bagian yang dilindungi pada API dan berinteraksi dengan aplikasi lain.</li>
-<li>Juga mendeklarasikan izin lain yang harus dimiliki untuk
+<li>Juga mendeklarasikan izin lain yang harus dimiliki untuk
untuk berinteraksi dengan komponen aplikasi.</li>
-<li>Mencantumkan daftar kelas {@link android.app.Instrumentation} yang memberikan
-profil dan informasi lain saat aplikasi berjalan. Deklarasi ini
+<li>Mencantumkan daftar kelas {@link android.app.Instrumentation} yang memberikan
+profil dan informasi lain saat aplikasi berjalan. Deklarasi ini
hanya ada di manifes saat aplikasi dibuat dan diuji;
deklarasi dihapus sebelum aplikasi dipublikasikan.</li>
-<li>Mendeklarasikan tingkat minimum API Android yang diperlukan
+<li>Mendeklarasikan tingkat minimum API Android yang diperlukan
aplikasi.</li>
<li>Mencantumkan daftar pustaka yang harus ditautkan aplikasi.</li>
@@ -61,12 +61,12 @@
<h2 id="filestruct">Struktur File Manifes</h2>
<p>
-Diagram di bawah ini menampilkan struktur umum file manifes dan setiap
-elemen yang bisa ditampungnya. Setiap elemen, bersama
-atributnya, didokumentasikan secara lengkap dalam file terpisah. Untuk melihat
-informasi terperinci tentang setiap elemen, klik nama elemen dalam diagram,
-dalam daftar abjad elemen yang mengikuti diagram, atau penyebutan nama
-elemen lainnya.
+Diagram di bawah ini menampilkan struktur umum file manifes dan setiap
+elemen yang bisa ditampungnya. Setiap elemen, bersama
+atributnya, didokumentasikan secara lengkap dalam file terpisah. Untuk melihat
+informasi terperinci tentang setiap elemen, klik nama elemen dalam diagram,
+dalam daftar abjad elemen yang mengikuti diagram, atau penyebutan nama
+elemen lainnya.
</p>
<pre>
@@ -126,9 +126,9 @@
</pre>
<p>
-Semua elemen yang bisa muncul dalam file manifes tercantum di bawah ini
-dalam urutan abjad. Ini adalah satu-satunya elemen legal; Anda tidak bisa
-menambahkan elemen atau atribut sendiri.
+Semua elemen yang bisa muncul dalam file manifes tercantum di bawah ini
+dalam urutan abjad. Ini adalah satu-satunya elemen legal; Anda tidak bisa
+menambahkan elemen atau atribut sendiri.
</p>
<p style="margin-left: 2em">
@@ -158,74 +158,74 @@
</p>
-
+
<h2 id="filec">Konvensi File</h2>
<p>
-Sebagian konvensi dan aturan berlaku secara umum untuk semua elemen
+Sebagian konvensi dan aturan berlaku secara umum untuk semua elemen
dan atribut di manifes:
</p>
<dl>
<dt><b>Elemen</b></dt>
-<dd>Hanya elemen
+<dd>Hanya elemen
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> dan
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-yang diwajibkan, masing-masing harus ada dan hanya boleh terjadi sekali.
-Umumnya elemen lain bisa terjadi berkali-kali atau sama sekali tidak terjadi — meskipun
-setidaknya sebagian dari elemen itu harus ada untuk agar manifes mencapai sesuatu yang
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+yang diwajibkan, masing-masing harus ada dan hanya boleh terjadi sekali.
+Umumnya elemen lain bisa terjadi berkali-kali atau sama sekali tidak terjadi — meskipun
+setidaknya sebagian dari elemen itu harus ada untuk agar manifes mencapai sesuatu yang
berarti.
<p>
-Jika elemen tidak berisi apa pun, berarti elemen itu berisi elemen lain.
+Jika elemen tidak berisi apa pun, berarti elemen itu berisi elemen lain.
Semua nilai diatur melalui atribut, bukan sebagai data karakter dalam elemen.
</p>
<p>
-Elemen yang sama tingkatan umumnya tidak diurutkan. Misalnya, elemen
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, dan
-<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-bisa dicampur dalam urutan apa pun. (Elemen
+Elemen yang sama tingkatan umumnya tidak diurutkan. Misalnya, elemen
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, dan
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
+bisa dicampur dalam urutan apa pun. (Elemen
<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
- merupakan eksepsi untuk aturan ini: Elemen ini harus mengikuti
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+ merupakan eksepsi untuk aturan ini: Elemen ini harus mengikuti
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
ini aliasnya.)
</p></dd>
<dt><b>Atribut</b></dt>
-<dd>Secara formal, semua atribut opsional. Akan tetapi, ada sebagian
-yang harus ditetapkan agar elemen bisa mencapai tujuannya. Gunakan
-dokumentasi sebagai panduan. Bagi atribut yang benar-benar opsional, ini menyebutkan
+<dd>Secara formal, semua atribut opsional. Akan tetapi, ada sebagian
+yang harus ditetapkan agar elemen bisa mencapai tujuannya. Gunakan
+dokumentasi sebagai panduan. Bagi atribut yang benar-benar opsional, ini menyebutkan
nilai default atau menyatakan apa yang terjadi jika tidak ada spesifikasi.
-<p>Selain untuk beberapa atribut elemen akar
+<p>Selain untuk beberapa atribut elemen akar
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>,
- semua nama atribut dimulai dengan awalan {@code android:} —
-misalnya, {@code android:alwaysRetainTaskState}. Karena awalan ini universal, dokumentasi umumnya meniadakannya saat mengacu atribut
+ semua nama atribut dimulai dengan awalan {@code android:} —
+misalnya, {@code android:alwaysRetainTaskState}. Karena awalan ini universal, dokumentasi umumnya meniadakannya saat mengacu atribut
dengan nama.
</p></dd>
<dt><b>Mendeklarasikan nama kelas</b></dt>
-<dd>Banyak elemen berhubungan dengan objek Java, termasuk elemen
-aplikasi itu sendiri (elemen
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-) dan aktivitas komponen — utamanya
-(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
-layanan
-(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
-penerima siaran
-(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>),
-dan penyedia konten
-(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
+<dd>Banyak elemen berhubungan dengan objek Java, termasuk elemen
+aplikasi itu sendiri (elemen
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+) dan aktivitas komponen — utamanya
+(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
+layanan
+(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
+penerima siaran
+(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>),
+dan penyedia konten
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
<p>
-Jika mendefinisikan subkelas, seperti yang selalu Anda definisikan untuk kelas komponen
-({@link android.app.Activity}, {@link android.app.Service},
-{@link android.content.BroadcastReceiver}, dan {@link android.content.ContentProvider}),
-subkelas dideklarasikan melalui atribut {@code name}. Nama harus menyertakan tujuan
-paket lengkap.
+Jika mendefinisikan subkelas, seperti yang selalu Anda definisikan untuk kelas komponen
+({@link android.app.Activity}, {@link android.app.Service},
+{@link android.content.BroadcastReceiver}, dan {@link android.content.ContentProvider}),
+subkelas dideklarasikan melalui atribut {@code name}. Nama harus menyertakan tujuan
+paket lengkap.
Misalnya, subkelas {@link android.app.Service} mungkin dideklarasikan sebagai berikut:
</p>
@@ -239,12 +239,12 @@
</manifest></pre>
<p>
-Akan tetapi, sebagai shorthand, jika karakter pertama string adalah titik,
-string akan ditambahkan ke nama paket aplikasi (seperti yang ditetapkan dalam elemen
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
- melalui atribut
+Akan tetapi, sebagai shorthand, jika karakter pertama string adalah titik,
+string akan ditambahkan ke nama paket aplikasi (seperti yang ditetapkan dalam elemen
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+ melalui atribut
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
-). Penetapan berikut sama dengan di atas:
+). Penetapan berikut sama dengan di atas:
</p>
<pre><manifest package="com.example.project" . . . >
@@ -257,13 +257,13 @@
</manifest></pre>
<p>
-Saat memulai komponen, Android akan membuat instance subkelas yang diberi nama.
+Saat memulai komponen, Android akan membuat instance subkelas yang diberi nama.
Jika subkelas tidak ditetapkan, maka akak dibuat instance kelas dasar.
</p></dd>
<dt><b>Banyak nilai</b></dt>
-<dd>Jika lebih dari satu nilai yang dapat ditetapkan, elemen ini hampir selalu
-diulangi, bukan menampilkan daftar banyak nilai dalam satu elemen.
+<dd>Jika lebih dari satu nilai yang dapat ditetapkan, elemen ini hampir selalu
+diulangi, bukan menampilkan daftar banyak nilai dalam satu elemen.
Misalnya, filter intent dapat mencantumkan beberapa tindakan:
<pre><intent-filter . . . >
@@ -275,23 +275,23 @@
<dt><b>Nilai sumber daya</b></dt>
<dd>Beberapa atribut memiliki nilai yang bisa ditampilkan kepada pengguna — misalnya
-, label dan ikon aktivitas. Nilai atribut ini
-harus dilokalkan dan karenanya ditetapkan dari sumber daya atau tema. Nilai sumber
+, label dan ikon aktivitas. Nilai atribut ini
+harus dilokalkan dan karenanya ditetapkan dari sumber daya atau tema. Nilai sumber
daya dinyatakan dalam format berikut,</p>
<p style="margin-left: 2em">{@code @[<i>package</i>:]<i>type</i>:<i>name</i>}</p>
<p>
-dalam hal ini nama <i>package</i> boleh dihilangkan jika sumber daya ada dalam paket yang sama dengan
-dengan aplikasi, <i>type</i> adalah tipe sumber daya — seperti "string" atau
-"drawable" — dan <i>name</i> adalah nama yang mengidentifikasi sumber daya tertentu.
+dalam hal ini nama <i>package</i> boleh dihilangkan jika sumber daya ada dalam paket yang sama dengan
+dengan aplikasi, <i>type</i> adalah tipe sumber daya — seperti "string" atau
+"drawable" — dan <i>name</i> adalah nama yang mengidentifikasi sumber daya tertentu.
Misalnya:
</p>
<pre><activity android:icon="@drawable/smallPic" . . . ></pre>
<p>
-Nilai tema diekspresikan dengan cara yang sama, namun dengan awal '{@code ?}'
+Nilai tema diekspresikan dengan cara yang sama, namun dengan awal '{@code ?}'
dan bukan '{@code @}':
</p>
@@ -299,8 +299,8 @@
</p></dd>
<dt><b>Nilai-nilai string</b></dt>
-<dd>Bila nilai atribut adalah string, dua garis miring kiri ('{@code \\}')
-harus digunakan untuk meninggalkan karakter — misalnya, '{@code \\n}' untuk
+<dd>Bila nilai atribut adalah string, dua garis miring kiri ('{@code \\}')
+harus digunakan untuk meninggalkan karakter — misalnya, '{@code \\n}' untuk
baris baru atau '{@code \\uxxxx}' untuk karakter Unicode.</dd>
</dl>
@@ -308,7 +308,7 @@
<h2 id="filef">Fitur File</h2>
<p>
-Bagian berikut menjelaskan cara menerapkan sebagian fitur Android
+Bagian berikut menjelaskan cara menerapkan sebagian fitur Android
dalam file manifest.
</p>
@@ -316,37 +316,37 @@
<h3 id="ifs">Filter Intent</h3>
<p>
-Komponen inti dari aplikasi (aktivitasnya, layanannya, dan penerima
-siaran) diaktifkan oleh <i>intent</i>. Intent adalah
-sekumpulan informasi (objek {@link android.content.Intent}) yang menjelaskan
-tindakan yang diinginkan — termasuk data yang akan ditindaklanjuti, kategori
-komponen yang harus melakukan tindakan, dan petunjuk terkait lainnya.
-Android mencari komponen yang sesuai untuk merespons intent, meluncurkan
-instance komponen baru jika diperlukan, dan meneruskannya ke
+Komponen inti dari aplikasi (aktivitasnya, layanannya, dan penerima
+siaran) diaktifkan oleh <i>intent</i>. Intent adalah
+sekumpulan informasi (objek {@link android.content.Intent}) yang menjelaskan
+tindakan yang diinginkan — termasuk data yang akan ditindaklanjuti, kategori
+komponen yang harus melakukan tindakan, dan petunjuk terkait lainnya.
+Android mencari komponen yang sesuai untuk merespons intent, meluncurkan
+instance komponen baru jika diperlukan, dan meneruskannya ke
objek Intent.
</p>
<p>
-Komponen mengiklankan kemampuannya — jenis intent yang bisa diresponsnya
- — melalui <i>filter intent</i>. Karena sistem Android
-harus mempelajari intent yang dapat ditangani komponen sebelum meluncurkan komponen,
-filter intent ditetapkan dalam manifes sebagai elemen
+Komponen mengiklankan kemampuannya — jenis intent yang bisa diresponsnya
+ — melalui <i>filter intent</i>. Karena sistem Android
+harus mempelajari intent yang dapat ditangani komponen sebelum meluncurkan komponen,
+filter intent ditetapkan dalam manifes sebagai elemen
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-. Sebuah komponen dapat memiliki filter dalam jumlah berapa saja, masing-masing menjelaskan
+. Sebuah komponen dapat memiliki filter dalam jumlah berapa saja, masing-masing menjelaskan
kemampuan yang berbeda.
</p>
<p>
Intent yang secara eksplisit menamai komponen target akan mengaktifkan komponen itu;
-filter tidak berperan. Namun intent yang tidak menetapkan target
-dengan nama dapat mengaktifkan komponen hanya jika dapat melewati salah satu filter
+filter tidak berperan. Namun intent yang tidak menetapkan target
+dengan nama dapat mengaktifkan komponen hanya jika dapat melewati salah satu filter
komponen.
</p>
<p>
-Untuk informasi tentang cara objek Intent diuji terhadap filter intent,
-lihat dokumen terpisah,
-<a href="{@docRoot}guide/components/intents-filters.html">Intent
+Untuk informasi tentang cara objek Intent diuji terhadap filter intent,
+lihat dokumen terpisah,
+<a href="{@docRoot}guide/components/intents-filters.html">Intent
dan Filter Intent</a>.
</p>
@@ -354,42 +354,42 @@
<h3 id="iconlabel">Ikon dan Label</h3>
<p>
-Sejumlah elemen memiliki atribut {@code icon} dan {@code label} untuk
-ikon kecil dan label teks yang bisa ditampilkan kepada pengguna. Sebagian ada juga yang memiliki atribut
-{@code description}untuk teks penjelasan yang lebih panjang yang juga bisa
-ditampilkan pada layar. Misalnya, elemen
+Sejumlah elemen memiliki atribut {@code icon} dan {@code label} untuk
+ikon kecil dan label teks yang bisa ditampilkan kepada pengguna. Sebagian ada juga yang memiliki atribut
+{@code description}untuk teks penjelasan yang lebih panjang yang juga bisa
+ditampilkan pada layar. Misalnya, elemen
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
- memiliki ketiga atribut ini, jadi saat pengguna ditanya apakah akan
-memberi izin bagi aplikasi yang memintanya, ikon yang mewakili
-izin, nama izin, dan keterangan yang
+ memiliki ketiga atribut ini, jadi saat pengguna ditanya apakah akan
+memberi izin bagi aplikasi yang memintanya, ikon yang mewakili
+izin, nama izin, dan keterangan yang
mengikutinya bisa ditampilkan kepada pengguna.
</p>
<p>
-Dalam setiap kasus, ikon dan label yang ditetapkan dalam elemen yang memuatnya menjadi
-{@code icon} default dan pengaturan {@code label} untuk semua subelemen kontainer ini.
-Karena itu, ikon dan label yang ditetapkan dalam elemen
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-adalah ikon dan label default untuk setiap komponen aplikasi.
-Demikian pula, ikon dan label yang ditetapkan untuk komponen — misalnya, elemen
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-— adalah pengaturan default untuk setiap elemen komponen
+Dalam setiap kasus, ikon dan label yang ditetapkan dalam elemen yang memuatnya menjadi
+{@code icon} default dan pengaturan {@code label} untuk semua subelemen kontainer ini.
+Karena itu, ikon dan label yang ditetapkan dalam elemen
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+adalah ikon dan label default untuk setiap komponen aplikasi.
+Demikian pula, ikon dan label yang ditetapkan untuk komponen — misalnya, elemen
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+— adalah pengaturan default untuk setiap elemen komponen
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-. Jika elemen
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-menetapkan label, namun suatu aktivitas dan filter intent-nya tidak menetapkan label,
-maka label aplikasi akan dianggap sama-sama sebagai label aktvitas dan
+. Jika elemen
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+menetapkan label, namun suatu aktivitas dan filter intent-nya tidak menetapkan label,
+maka label aplikasi akan dianggap sama-sama sebagai label aktvitas dan
filter intent.
</p>
<p>
-Ikon dan label yang ditetapkan untuk filter intent digunakan untuk mewakili komponen
-kapan saja komponen ditampilkan kepada pengguna saat memenuhi fungsi yang
-diiklankan oleh filter. Misalnya, filter dengan pengaturan
-"{@code android.intent.action.MAIN}" dan
-"{@code android.intent.category.LAUNCHER}" mengiklankan aktivitas
-sebagai aktivitas yang memulai aplikasi—, yaitu
-sebagai salah satu aktivitas yang harus ditampilkan dalam launcher aplikasi. Ikon dan label yang
+Ikon dan label yang ditetapkan untuk filter intent digunakan untuk mewakili komponen
+kapan saja komponen ditampilkan kepada pengguna saat memenuhi fungsi yang
+diiklankan oleh filter. Misalnya, filter dengan pengaturan
+"{@code android.intent.action.MAIN}" dan
+"{@code android.intent.category.LAUNCHER}" mengiklankan aktivitas
+sebagai aktivitas yang memulai aplikasi—, yaitu
+sebagai salah satu aktivitas yang harus ditampilkan dalam launcher aplikasi. Ikon dan label yang
diatur dalam filter karenanya adalah ikon dan label yang ditampilkan dalam launcher.
</p>
@@ -397,14 +397,14 @@
<h3 id="perms">Izin</h3>
<p>
-Sebuah <i>izin</i> adalah pembatasan yang membatasi akses ke bagian
-kode atau ke data pada perangkat. Pembatasan diberlakukan untuk melindungi data dan kode
-penting yang bisa disalahgunakan untuk mengganggu atau merusak pengalaman pengguna.
+Sebuah <i>izin</i> adalah pembatasan yang membatasi akses ke bagian
+kode atau ke data pada perangkat. Pembatasan diberlakukan untuk melindungi data dan kode
+penting yang bisa disalahgunakan untuk mengganggu atau merusak pengalaman pengguna.
</p>
<p>
-Setiap izin diidentifikasi melalui label yang unik. Sering kali, label menunjukkan
-tindakan yang dibatasi. Misalnya, berikut ini adalah beberapa izin yang didefinisikan
+Setiap izin diidentifikasi melalui label yang unik. Sering kali, label menunjukkan
+tindakan yang dibatasi. Misalnya, berikut ini adalah beberapa izin yang didefinisikan
oleh Android:
</p>
@@ -418,25 +418,25 @@
</p>
<p>
-Jika aplikasi memerlukan akses ke fitur yang dilindungi oleh izin,
-aplikasi harus mendeklarasikan bahwa aplikasi memerlukan izin itu dengan elemen
+Jika aplikasi memerlukan akses ke fitur yang dilindungi oleh izin,
+aplikasi harus mendeklarasikan bahwa aplikasi memerlukan izin itu dengan elemen
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
- dalam manifes. Kemudian, bila aplikasi telah diinstal pada
-perangkat, installer akan menentukan apakah izin yang diminta akan diberikan atau tidak
-dengan memeriksa otoritas yang menandatangani
-sertifikat aplikasi dan, dalam beberapa kasus, bertanya pada pengguna.
-Jika izin diberikan, aplikasi tersebut bisa menggunakan
-fitur yang dilindungi. Jika tidak, upaya aplikasi untuk mengakses fitur tersebut akan gagal
-tanpa ada pemberitahuan apa pun kepada pengguna.
+ dalam manifes. Kemudian, bila aplikasi telah diinstal pada
+perangkat, installer akan menentukan apakah izin yang diminta akan diberikan atau tidak
+dengan memeriksa otoritas yang menandatangani
+sertifikat aplikasi dan, dalam beberapa kasus, bertanya pada pengguna.
+Jika izin diberikan, aplikasi tersebut bisa menggunakan
+fitur yang dilindungi. Jika tidak, upaya aplikasi untuk mengakses fitur tersebut akan gagal
+tanpa ada pemberitahuan apa pun kepada pengguna.
</p>
<p>
-Aplikasi juga bisa melindungi komponennya sendiri (aktivitas, layanan,
-penerima siaran, dan penyedia konten) dengan izin. Aplikasi bisa menerapkan
-izin mana pun yang didefinisikan oleh Android (tercantum dalam
-{@link android.Manifest.permission android.Manifest.permission}) atau dideklarasikan
-oleh aplikasi lain. Atau aplikasi bisa mendefinisikannya sendiri. Izin baru dideklarasikan
-dengan elemen
+Aplikasi juga bisa melindungi komponennya sendiri (aktivitas, layanan,
+penerima siaran, dan penyedia konten) dengan izin. Aplikasi bisa menerapkan
+izin mana pun yang didefinisikan oleh Android (tercantum dalam
+{@link android.Manifest.permission android.Manifest.permission}) atau dideklarasikan
+oleh aplikasi lain. Atau aplikasi bisa mendefinisikannya sendiri. Izin baru dideklarasikan
+dengan elemen
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
. Misalnya, aktivitas dapat dilindungi sebagai berikut:
</p>
@@ -457,43 +457,43 @@
</pre>
<p>
-Perhatikan, dalam contoh ini izin {@code DEBIT_ACCT} tidak hanya
-dideklarasikan dengan elemen
+Perhatikan, dalam contoh ini izin {@code DEBIT_ACCT} tidak hanya
+dideklarasikan dengan elemen
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-, penggunaannya juga diminta dengan elemen
+, penggunaannya juga diminta dengan elemen
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-. Penggunaannya harus diminta agar komponen
-aplikasi lainnya bisa menjalankan aktivitas yang dilindungi, meskipun perlindungan itu
-diberlakukan oleh aplikasi itu sendiri.
+. Penggunaannya harus diminta agar komponen
+aplikasi lainnya bisa menjalankan aktivitas yang dilindungi, meskipun perlindungan itu
+diberlakukan oleh aplikasi itu sendiri.
</p>
<p>
-Dalam contoh yang sama, jika atribut {@code permission} ditetapkan
-untuk izin yang dideklarasikan di tempat lain
-lain (seperti {@code android.permission.CALL_EMERGENCY_NUMBERS}, maka atribut
-tidak perlu mendeklarasikannya lagi dengan elemen
+Dalam contoh yang sama, jika atribut {@code permission} ditetapkan
+untuk izin yang dideklarasikan di tempat lain
+lain (seperti {@code android.permission.CALL_EMERGENCY_NUMBERS}, maka atribut
+tidak perlu mendeklarasikannya lagi dengan elemen
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-. Akan tetapi, penggunaannya masih perlu dengan
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
+. Akan tetapi, penggunaannya masih perlu dengan
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
</p>
<p>
-Elemen
-<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-mendeklarasikan namespace untuk grup izin yang akan didefinisikan dalam
-kode. Dan
+Elemen
+<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
+mendeklarasikan namespace untuk grup izin yang akan didefinisikan dalam
+kode. Dan
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-mendefinisikan label untuk seperangkat izin (yang sama-sama dideklarasikan dalam manifes dengan elemen
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-dan yang dideklarasikan di tempat lain). Ini hanya memengaruhi cara izin
-dikelompokkan saat ditampilkan kepada pengguna. Elemen
+mendefinisikan label untuk seperangkat izin (yang sama-sama dideklarasikan dalam manifes dengan elemen
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+dan yang dideklarasikan di tempat lain). Ini hanya memengaruhi cara izin
+dikelompokkan saat ditampilkan kepada pengguna. Elemen
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
- tidak menetapkan izin mana dimiliki grup;
+ tidak menetapkan izin mana dimiliki grup;
elemen hanya memberi nama grup. Izin ditempatkan dalam grup
-dengan memberikan nama grup ke elemen
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
- melalui atribut
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
+dengan memberikan nama grup ke elemen
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+ melalui atribut
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
.
</p>
@@ -501,17 +501,17 @@
<h3 id="libs">Pustaka</h3>
<p>
-Setiap aplikasi ditautkan dengan pustaka default Android, yang
-menyertakan paket dasar untuk membangun aplikasi (dengan kelas umum
-seperti Activity, Service, Intent, View, Button, Application, ContentProvider,
+Setiap aplikasi ditautkan dengan pustaka default Android, yang
+menyertakan paket dasar untuk membangun aplikasi (dengan kelas umum
+seperti Activity, Service, Intent, View, Button, Application, ContentProvider,
dan sebagainya).
</p>
<p>
-Akan tetapi, sebagian paket berada dalam pustakanya sendiri. Jika aplikasi Anda
-menggunakan kode salah satu paket ini, aplikasi secara eksplisit meminta untuk ditautkan dengan
-paket tersebut. Manifes harus berisi elemen
-<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code> yang
-terpisah untuk menamai setiap pustaka. (Nama pustaka bisa ditemukan
+Akan tetapi, sebagian paket berada dalam pustakanya sendiri. Jika aplikasi Anda
+menggunakan kode salah satu paket ini, aplikasi secara eksplisit meminta untuk ditautkan dengan
+paket tersebut. Manifes harus berisi elemen
+<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code> yang
+terpisah untuk menamai setiap pustaka. (Nama pustaka bisa ditemukan
dalam dokumentasi paket.)
</p>
diff --git a/docs/html-intl/intl/in/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/in/guide/topics/providers/calendar-provider.jd
index 76bc991..3058815 100644
--- a/docs/html-intl/intl/in/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/in/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">Menggunakan intent untuk menampilkan data kalender</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">Adaptor Sinkronisasi</a></li>
</ol>
@@ -63,8 +63,8 @@
<p>API Penyedia Kalender bisa digunakan oleh aplikasi dan adaptor sinkronisasi. Aturannya
bervariasi menurut tipe program yang membuat panggilan. Dokumen ini
-terutama berfokus pada penggunaan API Penyedia Kalender sebagai sebuah aplikasi. Untuk
-pembahasan ragam adaptor sinkronisasi, lihat
+terutama berfokus pada penggunaan API Penyedia Kalender sebagai sebuah aplikasi. Untuk
+pembahasan ragam adaptor sinkronisasi, lihat
<a href="#sync-adapter">Adaptor Sinkronisasi</a>.</p>
@@ -89,7 +89,7 @@
<p>Setiap penyedia konten membuka sebuah URI publik (yang dibungkus sebagai objek
{@link android.net.Uri}
) yang mengidentifikasikan set datanya secara unik. Penyedia konten yang mengontrol
- beberapa set data (beberapa tabel) mengekspos URI terpisah untuk tiap set. Semua
+ beberapa set data (beberapa tabel) mengekspos URI terpisah untuk tiap set. Semua
URI untuk penyedia diawali dengan string "content://". String ini
mengidentifikasi data sebagai dikontrol oleh penyedia konten. Penyedia Kalender
mendefinisikan konstanta untuk URI masing-masing kelas (tabel). URI ini
@@ -113,26 +113,26 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
- <td>Tabel ini menyimpan
+
+ <td>Tabel ini menyimpan
informasi khusus kalender. Tiap baris dalam tabel ini berisi data untuk
satu kalender, seperti nama, warna, informasi sinkronisasi, dan seterusnya.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>Tabel ini menyimpan
informasi khusus kejadian. Tiap baris dalam tabel ini berisi informasi untuk satu
kejadian—misalnya, judul kejadian, lokasi, waktu mulai, waktu
selesai, dan seterusnya. Kejadian bisa terjadi satu kali atau bisa berulang beberapa kali. Peserta,
-pengingat, dan properti perluasan disimpan dalam tabel terpisah.
-Masing-masing memiliki sebuah {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+pengingat, dan properti perluasan disimpan dalam tabel terpisah.
+Masing-masing memiliki sebuah {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
yang mengacu {@link android.provider.BaseColumns#_ID} dalam tabel Events.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>Tabel ini menyimpan
waktu mulai dan waktu selesai setiap bentuk kejadian. Tiap baris dalam tabel ini
mewakili satu bentuk kejadian. Untuk kejadian satu kali ada pemetaan 1:1
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>Tabel ini menyimpan
informasi peserta (tamu) kejadian. Tiap baris mewakili satu tamu
kejadian. Ini menetapkan tipe tamu dan respons kehadiran tamu
@@ -149,17 +149,17 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>Tabel ini menyimpan
data peringatan/pemberitahuan. Tiap baris mewakili satu peringatan untuk sebuah kejadian. Sebuah
kejadian bisa memiliki beberapa pengingat. Jumlah maksimum pengingat per kejadian
-ditetapkan dalam
-{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS},
+ditetapkan dalam
+{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS},
yang diatur oleh adaptor sinkronisasi yang
memiliki kalender yang diberikan. Pengingat ditetapkan dalam menit sebelum kejadian
dan memiliki metode yang menentukan cara pengguna akan diperingatkan.</td>
</tr>
-
+
</table>
<p>API Penyedia Kalender didesain agar luwes dan tangguh. Sementara itu
@@ -178,9 +178,9 @@
<li><strong>Adaptor sinkronisasi.</strong> Adaptor sinkronisasi menyinkronkan data kalender
-pada perangkat pengguna dengan server atau sumber data lain. Dalam tabel
+pada perangkat pengguna dengan server atau sumber data lain. Dalam tabel
{@link android.provider.CalendarContract.Calendars} dan
-{@link android.provider.CalendarContract.Events},
+{@link android.provider.CalendarContract.Events},
ada kolom yang dicadangkan untuk digunakan adaptor sinkronisasi.
Penyedia dan aplikasi tidak boleh memodifikasinya. Sebenarnya, tabel-tabel itu tidak
terlihat kecuali jika diakses sebagai adaptor sinkronisasi. Untuk informasi selengkapnya tentang
@@ -211,7 +211,7 @@
<p>Tabel {@link android.provider.CalendarContract.Calendars} berisi data
untuk tiap kalender. Kolom-kolom
-berikut ini bisa ditulisi oleh aplikasi maupun <a href="#sync-adapter">adaptor sinkronisasi</a>.
+berikut ini bisa ditulisi oleh aplikasi maupun <a href="#sync-adapter">adaptor sinkronisasi</a>.
Untuk mengetahui daftar lengkap bidang-bidang yang didukung, lihat
acuan {@link android.provider.CalendarContract.Calendars}.</p>
<table>
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>Sebuah boolean yang menunjukkan apakah kalender dipilih untuk ditampilkan. Nilai
0 menunjukkan bahwa kejadian yang terkait dengan kalender ini tidak boleh
ditampilkan. Nilai 1 menunjukkan bahwa kejadian yang terkait dengan kalender ini harus
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>Sebuah boolean yang menunjukkan apakah kalender harus disinkronkan dan apakah
kejadiannya harus disimpan pada perangkat. Nilai 0 berarti jangan menyinkronkan kalender ini atau
simpan kejadiannya pada perangkat. Nilai 1 berarti menyinkronkan kejadian untuk kalender ini
@@ -253,8 +253,8 @@
<p>Berikut ini adalah contoh yang menampilkan cara mendapatkan kalender yang dimiliki oleh
pengguna tertentu. Untuk memudahkan, dalam contoh ini, operasi query ditampilkan dalam
thread antarmuka pengguna ("thread utama"). Dalam praktiknya, hal ini harus dilakukan dalam
-thread asinkron, sebagai ganti pada thread utama. Untuk diskusi selengkapnya, lihat
-<a href="{@docRoot}guide/components/loaders.html">Loader</a>. Jika Anda tidak sekadar
+thread asinkron, sebagai ganti pada thread utama. Untuk diskusi selengkapnya, lihat
+<a href="{@docRoot}guide/components/loaders.html">Loader</a>. Jika Anda tidak sekadar
membaca data melainkan memodifikasinya, lihat {@link android.content.AsyncQueryHandler}.
</p>
@@ -268,18 +268,18 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>Mengapa Anda harus menyertakan
ACCOUNT_TYPE?</h3> <p>Jika Anda membuat query pada {@link
android.provider.CalendarContract.Calendars#ACCOUNT_NAME
-Calendars.ACCOUNT_NAME}, Anda juga harus menyertakan
+Calendars.ACCOUNT_NAME}, Anda juga harus menyertakan
{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
dalam pemilihan. Itu karena akun yang bersangkutan
hanya dianggap unik mengingat <code>ACCOUNT_NAME</code> dan
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} untuk kalender
yang tidak terkait dengan akun perangkat. Akun {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} tidak
-disinkronkan.</p> </div> </div>
+disinkronkan.</p> </div> </div>
<p> Di bagian berikutnya pada contoh ini, Anda akan membuat query. Pemilihan
@@ -301,59 +301,59 @@
telah ditampilkan pengguna, bukan hanya kalender yang dimiliki pengguna, hilangkan <code>OWNER_ACCOUNT</code>.
Query tersebut akan menghasilkan objek {@link android.database.Cursor}
yang bisa Anda gunakan untuk menyusuri set hasil yang dikembalikan oleh
-query database. Untuk diskusi selengkapnya tentang penggunaan query dalam penyedia konten,
+query database. Untuk diskusi selengkapnya tentang penggunaan query dalam penyedia konten,
lihat <a href="{@docRoot}guide/topics/providers/content-providers.html">Penyedia Kalender</a>.</p>
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>Bagian berikutnya ini menggunakan kursor untuk merunut set hasil. Bagian ini menggunakan
konstanta yang disiapkan pada awal contoh ini untuk menghasilkan nilai-nilai
bagi tiap bidang.</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">Memodifikasi kalender</h3>
<p>Untuk melakukan pembaruan kalender, Anda bisa menyediakan {@link
android.provider.BaseColumns#_ID} kalender itu baik sebagai ID yang ditambahkan ke
-URI
+URI
-({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
atau sebagai item pemilihan pertama. Pemilihan
harus diawali dengan <code>"_id=?"</code>, dan
<code>selectionArg</code> pertama harus berupa {@link
-android.provider.BaseColumns#_ID} kalender.
+android.provider.BaseColumns#_ID} kalender.
Anda juga bisa melakukan pembaruan dengan menuliskan kode ID dalam URI. Contoh ini mengubah
-nama tampilan kalender dengan pendekatan
-({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+nama tampilan kalender dengan pendekatan
+({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
:</p>
<pre>private static final String DEBUG_TAG = "MyActivity";
@@ -375,7 +375,7 @@
penyisipan kalender sebagai adaptor sinkronisasi, menggunakan {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} dari {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}.
-{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
+{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
adalah sebuah tipe akun khusus untuk kalender yang tidak
terkait dengan akun perangkat. Kalender tipe ini tidak disinkronkan dengan server. Untuk
diskusi tentang adaptor sinkronisasi, lihat <a href="#sync-adapter">Adaptor Sinkronisasi</a>.</p>
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>Durasi kejadian dalam format <a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a>.
Misalnya, nilai <code>"PT1H"</code> menyatakan bahwa kejadian
akan berlangsung satu jam, dan nilai <code>"P2W"</code> menunjukkan
@@ -444,39 +444,39 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>Nilai 1 menunjukkan kejadian ini memakan waktu sehari penuh, seperti yang didefinisikan oleh
zona waktu lokal. Nilai 0 menunjukkan kejadian adalah kejadian biasa yang mungkin dimulai
dan selesai pada sembarang waktu selama suatu hari.</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>Aturan perulangan untuk format kejadian. Misalnya,
<code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>. Anda bisa menemukan
contoh selengkapnya <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">di sini</a>.</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
- <td>Tanggal perulangan kejadian.
- Anda biasanya menggunakan {@link android.provider.CalendarContract.EventsColumns#RDATE}
- bersama dengan {@link android.provider.CalendarContract.EventsColumns#RRULE}
+ <td>Tanggal perulangan kejadian.
+ Anda biasanya menggunakan {@link android.provider.CalendarContract.EventsColumns#RDATE}
+ bersama dengan {@link android.provider.CalendarContract.EventsColumns#RRULE}
untuk mendefinisikan satu set agregat
kejadian berulang. Untuk diskusi selengkapnya, lihat <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">Spesifikasi RFC5545</a>.</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
- <td>Jika kejadian ini dihitung sebagai waktu sibuk atau waktu bebas yang bisa
+
+ <td>Jika kejadian ini dihitung sebagai waktu sibuk atau waktu bebas yang bisa
dijadwalkan. </td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -514,11 +514,11 @@
Anda menyisipkan kejadian melalui Intent {@link
android.content.Intent#ACTION_INSERT INSERT}, yang dijelaskan dalam <a href="#intent-insert">Menggunakan intent untuk menyisipkan kejadian</a>—dalam
skenario itu, sebuah zona waktu default akan diberikan.</li>
-
+
<li>Untuk kejadian tidak-berulang, Anda harus menyertakan {@link
android.provider.CalendarContract.EventsColumns#DTEND}. </li>
-
-
+
+
<li>Untuk kejadian berulang, Anda harus menyertakan sebuah {@link
android.provider.CalendarContract.EventsColumns#DURATION} selain {@link
android.provider.CalendarContract.EventsColumns#RRULE} atau {@link
@@ -526,9 +526,9 @@
Anda menyisipkan kejadian melalui Intent {@link
android.content.Intent#ACTION_INSERT INSERT}, yang dijelaskan dalam <a href="#intent-insert">Menggunakan intent untuk menyisipkan kejadian</a>—dalam
skenario itu, Anda bisa menggunakan {@link
-android.provider.CalendarContract.EventsColumns#RRULE} bersama {@link android.provider.CalendarContract.EventsColumns#DTSTART} dan {@link android.provider.CalendarContract.EventsColumns#DTEND}, dan aplikasi Calendar
+android.provider.CalendarContract.EventsColumns#RRULE} bersama {@link android.provider.CalendarContract.EventsColumns#DTSTART} dan {@link android.provider.CalendarContract.EventsColumns#DTEND}, dan aplikasi Calendar
akan mengubahnya menjadi durasi secara otomatis.</li>
-
+
</ul>
<p>Berikut ini adalah contoh penyisipan kejadian. Penyisipan ini dilakukan dalam thread UI
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -578,14 +578,14 @@
gunakan Intent {@link android.content.Intent#ACTION_EDIT EDIT}, seperti
dijelaskan dalam <a href="#intent-edit">Menggunakan intent untuk mengedit kejadian</a>.
Akan tetapi, jika perlu, Anda bisa mengedit kejadian secara langsung. Untuk melakukan pembaruan
-suatu kejadian, Anda bisa memberikan <code>_ID</code>
+suatu kejadian, Anda bisa memberikan <code>_ID</code>
kejadian itu sebagai ID yang ditambahkan ke URI ({@link
-android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
-atau sebagai item pemilihan pertama.
+android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+atau sebagai item pemilihan pertama.
Pemilihan harus dimulai dengan <code>"_id=?"</code>, dan
<code>selectionArg</code> yang pertama harus berupa <code>_ID</code> kejadian. Anda juga bisa
melakukan pembaruan dengan menggunakan pemilihan tanpa ID. Berikut ini adalah contoh pembaruan
-kejadian. Contoh ini mengubah judul kejadian dengan pendekatan
+kejadian. Contoh ini mengubah judul kejadian dengan pendekatan
{@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}
:</p>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -625,22 +625,22 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">Tabel Peserta</h2>
<p>Tiap baris tabel {@link android.provider.CalendarContract.Attendees}
-mewakili satu peserta atau tamu dari sebuah kejadian. Memanggil
-{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
+mewakili satu peserta atau tamu dari sebuah kejadian. Memanggil
+{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
akan menghasilkan daftar peserta untuk
-kejadian dengan {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} yang diberikan.
-{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} ini
+kejadian dengan {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} yang diberikan.
+{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} ini
harus cocok dengan {@link
-android.provider.BaseColumns#_ID} kejadian tertentu.</p>
+android.provider.BaseColumns#_ID} kejadian tertentu.</p>
<p>Tabel berikut mencantumkan
-bidang-bidang yang bisa ditulis. Saat menyisipkan peserta baru, Anda harus menyertakan semuanya
+bidang-bidang yang bisa ditulis. Saat menyisipkan peserta baru, Anda harus menyertakan semuanya
kecuali <code>ATTENDEE_NAME</code>.
</p>
@@ -698,7 +698,7 @@
<h3 id="add-attendees">Menambahkan Peserta</h3>
<p>Berikut ini adalah contoh yang menambahkan satu peserta ke kejadian. Perhatikan bahwa
-{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
diperlukan:</p>
<pre>
@@ -718,17 +718,17 @@
<h2 id="reminders">Tabel Pengingat</h2>
<p>Tiap baris tabel {@link android.provider.CalendarContract.Reminders}
-mewakili satu pengingat untuk sebuah kejadian. Memanggil
+mewakili satu pengingat untuk sebuah kejadian. Memanggil
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} akan menghasilkan daftar pengingat untuk
-kejadian dengan
+kejadian dengan
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} yang diberikan.</p>
<p>Tabel berikut mencantumkan bidang-bidang yang bisa ditulis untuk pengingat. Semua bidang harus
disertakan saat menyisipkan pengingat baru. Perhatikan bahwa adaptor sinkronisasi menetapkan
tipe pengingat yang didukungnya dalam tabel {@link
-android.provider.CalendarContract.Calendars}. Lihat
-{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
+android.provider.CalendarContract.Calendars}. Lihat
+{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
untuk detailnya.</p>
@@ -773,16 +773,16 @@
<h2 id="instances">Tabel Instances</h2>
-<p>Tabel
+<p>Tabel
{@link android.provider.CalendarContract.Instances} menyimpan
waktu mulai dan waktu selesai kejadian. Tiap baris dalam tabel ini
mewakili satu bentuk kejadian. Tabel instance tidak bisa ditulis dan hanya
menyediakan sebuah cara untuk membuat query kejadian. </p>
-<p>Tabel berikut mencantumkan beberapa bidang yang bisa Anda query untuk suatu instance. Perhatikan
-bahwa zona waktu didefinisikan oleh
-{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
-dan
+<p>Tabel berikut mencantumkan beberapa bidang yang bisa Anda query untuk suatu instance. Perhatikan
+bahwa zona waktu didefinisikan oleh
+{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
+dan
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES}.</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>Hari selesai Julian dari instance, relatif terhadap
-zona waktu Kalender.
-
+zona waktu Kalender.
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>Menit selesai dari instance yang diukur dari tengah malam di zona waktu
Kalender.</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>Hari mulai Julian dari instance, relatif terhadap zona waktu Kalender.
+ <td>Hari mulai Julian dari instance, relatif terhadap zona waktu Kalender.
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>Menit mulai dari instance yang diukur dari tengah malam, relatif terhadap
-zona waktu Kalender.
+zona waktu Kalender.
</td>
-
+
</tr>
</table>
@@ -840,7 +840,7 @@
dalam URI. Dalam contoh ini, {@link android.provider.CalendarContract.Instances}
mendapatkan akses ke bidang {@link
android.provider.CalendarContract.EventsColumns#TITLE} melalui
-implementasi antarmuka {@link android.provider.CalendarContract.EventsColumns}-nya.
+implementasi antarmuka {@link android.provider.CalendarContract.EventsColumns}-nya.
Dengan kata lain, {@link
android.provider.CalendarContract.EventsColumns#TITLE} dihasilkan melalui
tampilan database, bukan melalui query terhadap tabel {@link
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -922,9 +922,9 @@
<td><br>
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
- Anda juga bisa mengacu ke URI dengan
-{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
-Untuk contoh yang menggunakan intent ini, lihat <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Menggunakan intent untuk menampilkan data kalender</a>.
+ Anda juga bisa mengacu ke URI dengan
+{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
+Untuk contoh yang menggunakan intent ini, lihat <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Menggunakan intent untuk menampilkan data kalender</a>.
</td>
<td>Membuka kalender pada waktu yang ditetapkan oleh <code><ms_since_epoch></code>.</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- Anda juga bisa mengacu ke URI dengan
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ Anda juga bisa mengacu ke URI dengan
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Untuk contoh yang menggunakan intent ini, lihat <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Menggunakan intent untuk menampilkan data kalender</a>.
-
+
</td>
<td>Menampilkan kejadian yang ditetapkan oleh <code><event_id></code>.</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- Anda juga bisa mengacu ke URI dengan
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ Anda juga bisa mengacu ke URI dengan
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Untuk contoh penggunaan intent ini, lihat <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">Menggunakan intent untuk mengedit kejadian</a>.
-
-
+
+
</td>
<td>Mengedit kejadian yang ditetapkan oleh <code><event_id></code>.</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
- Anda juga bisa mengacu ke URI dengan
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ Anda juga bisa mengacu ke URI dengan
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Untuk contoh penggunaan intent ini, lihat <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">Menggunakan intent untuk menyisipkan kejadian</a>.
-
+
</td>
<td>Membuat sebuah kejadian.</td>
@@ -996,7 +996,7 @@
<td>Nama kejadian.</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>Waktu mulai kejadian dalam milidetik sejak waktu patokan.</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>Waktu selesai kejadian dalam milidetik sejak waktu patokan.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
+
<td>Sebuah boolean yang menunjukkan bahwa kejadian sehari penuh. Nilai bisa
<code>true</code> atau <code>false</code>.</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>Lokasi kejadian.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>Keterangan kejadian.</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>Apakah kejadian bersifat privat atau publik.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>Jika kejadian ini dihitung sebagai waktu sibuk atau waktu bebas yang bisa dijadwalkan.</td>
-
-</table>
+
+</table>
<p>Bagian berikut menjelaskan cara menggunakan semua intent ini.</p>
@@ -1059,23 +1059,23 @@
Dengan pendekatan ini, aplikasi Anda bahkan tidak perlu menyertakan izin {@link
android.Manifest.permission#WRITE_CALENDAR} dalam <a href="#manifest">file manifesnya</a>.</p>
-
+
<p>Bila pengguna menjalankan aplikasi yang menggunakan pendekatan ini, aplikasi akan mengirim
izin ke Kalender untuk menyelesaikan penambahan kejadian. Intent {@link
android.content.Intent#ACTION_INSERT INSERT} menggunakan bidang-bidang ekstra
untuk mengisi formulir lebih dahulu dengan detail kejadian dalam Kalender. Pengguna nanti bisa
membatalkan kejadian, mengedit formulir sebagaimana diperlukan, atau menyimpan kejadian ke
kalender mereka.</p>
-
+
<p>Berikut ini adalah cuplikan kode yang menjadwalkan kejadian pada tanggal 19 Januari 2012, yang berjalan
dari 7:30 pagi hingga 8:30 pagi Perhatikan hal-hal berikut tentang cuplikan kode ini:</p>
<ul>
- <li>Cuplikan kode ini menetapkan {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
+ <li>Cuplikan kode ini menetapkan {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
sebagai URI-nya.</li>
-
+
<li>Cuplikan kode ini menggunakan bidang-bidang ekstra {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} dan {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} untuk mengisi dahulu formulir
dengan waktu kejadian. Nilai-nilai untuk waktu ini harus dalam milidetik UTC
sejak waktu patokan.</li>
-
+
<li>Cuplikan kode ini menggunakan bidang ekstra {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
untuk memberikan daftar undangan yang dipisah koma, yang ditetapkan melalui alamat email.</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,18 +1158,18 @@
<ul>
<li>Adaptor sinkronisasi perlu menetapkan bahwa dirinya sebuah adaptor sinkronisasi dengan mengatur {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} ke <code>true</code>.</li>
-
-
+
+
<li>Adaptor sinkronisasi perlu memberikan {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} dan {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} sebagai parameter query dalam URI. </li>
-
+
<li>Adaptor sinkronisasi memiliki akses tulis ke lebih banyak kolom daripada aplikasi atau widget.
- Misalnya, aplikasi hanya bisa mengubah sedikit karakteristik kalender,
+ Misalnya, aplikasi hanya bisa mengubah sedikit karakteristik kalender,
misalnya nama, nama tampilan, pengaturan visibilitas, dan apakah kalender
disinkronkan atau tidak. Sebagai perbandingan, adaptor sinkronisasi bisa mengakses bukan hanya kolom-kolom itu, namun banyak kolom lainnya,
misalnya warna kalender, zona waktu, tingkat akses, lokasi, dan seterusnya.
-Akan tetapi, adaptor sinkronisasi dibatasi pada <code>ACCOUNT_NAME</code> dan
+Akan tetapi, adaptor sinkronisasi dibatasi pada <code>ACCOUNT_NAME</code> dan
<code>ACCOUNT_TYPE</code> yang ditetapkannya.</li> </ul>
<p>Berikut ini adalah metode pembantu yang bisa Anda gunakan untuk menghasilkan URI bagi penggunaan dengan adaptor sinkronisasi:</p>
@@ -1180,5 +1180,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>Untuk contoh implementasi adaptor sinkronisasi (yang tidak terkait secara khusus dengan Kalender), lihat
+<p>Untuk contoh implementasi adaptor sinkronisasi (yang tidak terkait secara khusus dengan Kalender), lihat
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>.
diff --git a/docs/html-intl/intl/in/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/in/guide/topics/providers/content-provider-basics.jd
index c4003ca..4af9277 100644
--- a/docs/html-intl/intl/in/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/in/guide/topics/providers/content-provider-basics.jd
@@ -236,7 +236,7 @@
Misalnya, untuk mendapatkan daftar kata dan lokalnya dari Penyedia Kamus Pengguna,
Anda memanggil {@link android.content.ContentResolver#query ContentResolver.query()}.
Metode {@link android.content.ContentResolver#query query()} memanggil
- metode {@link android.content.ContentProvider#query ContentProvider.query()} yang didefinisikan oleh
+ metode {@link android.content.ContentProvider#query ContentProvider.query()} yang didefinisikan oleh
Penyedia Kamus Pengguna. Baris-baris kode berikut menunjukkan sebuah
panggilan {@link android.content.ContentResolver#query ContentResolver.query()}:
<p>
@@ -251,7 +251,7 @@
</pre>
<p>
Tabel 2 menampilkan cara argumen untuk
- {@link android.content.ContentResolver#query
+ {@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} cocok dengan sebuah pernyataan SELECT di SQL:
</p>
<p class="table-caption">
@@ -310,7 +310,7 @@
{@link android.provider.UserDictionary.Words#CONTENT_URI} mengandung URI konten dari
tabel "words" kamus pengguna. Objek {@link android.content.ContentResolver}
akan mengurai otoritas URI, dan menggunakannya untuk "mengetahui" penyedia dengan
- membandingkan otoritas tersebut dengan sebuah tabel sistem berisi penyedia yang dikenal.
+ membandingkan otoritas tersebut dengan sebuah tabel sistem berisi penyedia yang dikenal.
{@link android.content.ContentResolver} kemudian bisa mengirim argumen query ke penyedia
yang benar.
</p>
@@ -343,8 +343,8 @@
salah satunya.
</p>
<p class="note">
- <strong>Catatan:</strong> Kelas-kelas {@link android.net.Uri} dan {@link android.net.Uri.Builder}
- berisi metode praktis untuk membangun objek dari string URI yang tersusun dengan baik.
+ <strong>Catatan:</strong> Kelas-kelas {@link android.net.Uri} dan {@link android.net.Uri.Builder}
+ berisi metode praktis untuk membangun objek dari string URI yang tersusun dengan baik.
{@link android.content.ContentUris} berisi metode praktis untuk menambahkan nilai ID ke
URI. Cuplikan kode sebelumnya menggunakan {@link android.content.ContentUris#withAppendedId
withAppendedId()} untuk menambahkan id ke URI konten User Dictionary.
@@ -359,8 +359,8 @@
</p>
<p class="note">
Demi kejelasan, cuplikan kode di bagian ini memanggil
- {@link android.content.ContentResolver#query ContentResolver.query()} pada "UI thread"". Akan tetapi, dalam
- kode sesungguhnya, Anda harus melakukan query secara asinkron pada sebuah thread terpisah. Satu cara melakukannya
+ {@link android.content.ContentResolver#query ContentResolver.query()} pada "UI thread"". Akan tetapi, dalam
+ kode sesungguhnya, Anda harus melakukan query secara asinkron pada sebuah thread terpisah. Satu cara melakukannya
adalah menggunakan kelas {@link android.content.CursorLoader}, yang dijelaskan
lebih detail dalam panduan <a href="{@docRoot}guide/components/loaders.html">
Loader</a>. Juga, baris-baris kode tersebut hanyalah cuplikan; tidak menunjukkan sebuah aplikasi
@@ -428,7 +428,7 @@
<p>
Cuplikan berikutnya menampilkan cara menggunakan
{@link android.content.ContentResolver#query ContentResolver.query()}, dengan menggunakan Penyedia Kamus Pengguna
- sebagai contoh. Query klien penyedia serupa dengan query SQL, dan berisi satu
+ sebagai contoh. Query klien penyedia serupa dengan query SQL, dan berisi satu
set kolom yang akan dihasilkan, satu set kriteria pemilihan, dan urutan sortir.
</p>
<p>
@@ -438,8 +438,8 @@
<p>
Ekspresi yang menetapkan baris yang harus diambil dipecah menjadi klausa pemilihan dan
argumen pemilihan. Klausa pemilihan adalah kombinasi ekspresi logis dan boolean,
- nama kolom, dan nilai (variabel <code>mSelectionClause</code>). Jika Anda menetapkan
- parameter <code>?</code> yang bisa diganti, sebagai ganti nilai, metode query akan mengambil nilai
+ nama kolom, dan nilai (variabel <code>mSelectionClause</code>). Jika Anda menetapkan
+ parameter <code>?</code> yang bisa diganti, sebagai ganti nilai, metode query akan mengambil nilai
dari larik argumen pemilihan (variabel <code>mSelectionArgs</code>).
</p>
<p>
@@ -558,21 +558,21 @@
selectionArgs[0] = mUserInput;
</pre>
<p>
- Sebuah klausa pemilihan yang menggunakan <code>?</code> sebagai parameter yang bisa diganti dan sebuah larik
+ Sebuah klausa pemilihan yang menggunakan <code>?</code> sebagai parameter yang bisa diganti dan sebuah larik
argumen pemilihan adalah cara yang lebih disukai untuk menyebutkan pemilihan, sekalipun penyedia tidak
dibuat berdasarkan database SQL.
</p>
<!-- Displaying the results -->
<h3 id="DisplayResults">Menampilkan hasil query</h3>
<p>
- Metode klien {@link android.content.ContentResolver#query ContentResolver.query()} selalu
- menghasilkan {@link android.database.Cursor} berisi kolom-kolom yang ditetapkan oleh
+ Metode klien {@link android.content.ContentResolver#query ContentResolver.query()} selalu
+ menghasilkan {@link android.database.Cursor} berisi kolom-kolom yang ditetapkan oleh
proyeksi query untuk baris yang cocok dengan kriteria pemilihan query. Objek
- {@link android.database.Cursor} menyediakan akses baca acak ke baris dan kolom yang
- dimuatnya. Dengan metode {@link android.database.Cursor}, Anda bisa mengulang baris-baris dalam
+ {@link android.database.Cursor} menyediakan akses baca acak ke baris dan kolom yang
+ dimuatnya. Dengan metode {@link android.database.Cursor}, Anda bisa mengulang baris-baris dalam
hasil, menentukan tipe data tiap kolom, mengambil data dari kolom, dan memeriksa
- properti lain dari hasil. Beberapa implementasi {@link android.database.Cursor}
- akan memperbarui objek secara otomatis bila data penyedia berubah, atau memicu metode dalam objek pengamat
+ properti lain dari hasil. Beberapa implementasi {@link android.database.Cursor}
+ akan memperbarui objek secara otomatis bila data penyedia berubah, atau memicu metode dalam objek pengamat
bila {@link android.database.Cursor} berubah, atau keduanya.
</p>
<p class="note">
@@ -703,14 +703,14 @@
<p>
Untuk mendapatkan izin yang diperlukan untuk mengakses penyedia, aplikasi memintanya dengan elemen
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
- dalam file manifesnya. Bila Android Package Manager memasang aplikasi, pengguna
- harus menyetujui semua izin yang diminta aplikasi. Jika pengguna menyetujui semuanya,
+ dalam file manifesnya. Bila Android Package Manager memasang aplikasi, pengguna
+ harus menyetujui semua izin yang diminta aplikasi. Jika pengguna menyetujui semuanya,
Package Manager akan melanjutkan instalasi; jika pengguna tidak menyetujui, Package Manager
akan membatalkan instalasi.
</p>
<p>
Elemen
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
berikut meminta akses baca ke Penyedia Kamus Pengguna:
</p>
<pre>
@@ -793,8 +793,8 @@
Untuk memperbarui sebuah baris, gunakan objek {@link android.content.ContentValues} dengan
nilai-nilai yang diperbarui, persis seperti yang Anda lakukan pada penyisipan, dan kriteria pemilihan persis seperti yang Anda lakukan pada query.
Metode klien yang Anda gunakan adalah
- {@link android.content.ContentResolver#update ContentResolver.update()}. Anda hanya perlu menambahkan
- nilai-nilai ke objek {@link android.content.ContentValues} untuk kolom yang sedang Anda perbarui. Jika Anda
+ {@link android.content.ContentResolver#update ContentResolver.update()}. Anda hanya perlu menambahkan
+ nilai-nilai ke objek {@link android.content.ContentValues} untuk kolom yang sedang Anda perbarui. Jika Anda
ingin membersihkan konten kolom, aturlah nilai ke <code>null</code>.
</p>
<p>
@@ -828,7 +828,7 @@
</pre>
<p>
Anda juga harus membersihkan input pengguna bila memanggil
- {@link android.content.ContentResolver#update ContentResolver.update()}. Untuk mengetahui selengkapnya tentang
+ {@link android.content.ContentResolver#update ContentResolver.update()}. Untuk mengetahui selengkapnya tentang
hal ini, bacalah bagian <a href="#Injection">Melindungi dari input merusak</a>.
</p>
<h3 id="Deleting">Menghapus data</h3>
@@ -858,7 +858,7 @@
</pre>
<p>
Anda juga harus membersihkan input pengguna bila memanggil
- {@link android.content.ContentResolver#delete ContentResolver.delete()}. Untuk mengetahui selengkapnya tentang
+ {@link android.content.ContentResolver#delete ContentResolver.delete()}. Untuk mengetahui selengkapnya tentang
hal ini, bacalah bagian <a href="#Injection">Melindungi dari input merusak</a>.
</p>
<!-- Provider Data Types -->
@@ -883,7 +883,7 @@
</ul>
<p>
Tipe data lain yang sering digunakan penyedia adalah Binary Large OBject (BLOB) yang diimplementasikan sebagai
- larik byte 64 KB. Anda bisa melihat tipe data yang tersedia dengan memperhatikan metode "get"
+ larik byte 64 KB. Anda bisa melihat tipe data yang tersedia dengan memperhatikan metode "get"
kelas {@link android.database.Cursor}.
</p>
<p>
@@ -905,7 +905,7 @@
{@link android.content.ContentResolver#getType ContentResolver.getType()}.
</p>
<p>
- Bagian <a href="#MIMETypeReference">Acuan Tipe MIME</a> menerangkan
+ Bagian <a href="#MIMETypeReference">Acuan Tipe MIME</a> menerangkan
sintaks tipe MIME baik yang standar maupun custom.
</p>
@@ -946,9 +946,9 @@
Untuk mengakses penyedia dalam "mode batch",
buat satu larik objek {@link android.content.ContentProviderOperation}, kemudian
kirim larik itu ke penyedia konten dengan
- {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. Anda meneruskan
- <em>otoritas</em> penyedia konten ke metode ini, daripada URI konten tertentu.
- Ini memungkinkan tiap objek {@link android.content.ContentProviderOperation} dalam larik untuk bekerja
+ {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. Anda meneruskan
+ <em>otoritas</em> penyedia konten ke metode ini, daripada URI konten tertentu.
+ Ini memungkinkan tiap objek {@link android.content.ContentProviderOperation} dalam larik untuk bekerja
terhadap tabel yang berbeda. Panggilan ke {@link android.content.ContentResolver#applyBatch
ContentResolver.applyBatch()} menghasilkan satu larik hasil.
</p>
@@ -1011,7 +1011,7 @@
<p>
Penyedia mendefinisikan izin URI untuk URI konten dalam manifesnya, dengan menggunakan atribut
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">android:grantUriPermission</a></code>
- dari elemen
+ dari elemen
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
, serta elemen anak
<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
@@ -1184,7 +1184,7 @@
vnd.android.cursor.<strong>item</strong>/vnd.example.line2
</pre>
<p>
- Kebanyakan penyedia konten mendefinisikan konstanta kelas kontrak untuk tipe MIME yang digunakannya. Kelas kontrak
+ Kebanyakan penyedia konten mendefinisikan konstanta kelas kontrak untuk tipe MIME yang digunakannya. Kelas kontrak
{@link android.provider.ContactsContract.RawContacts} pada Penyedia Kontak
misalnya, mendefinisikan konstanta
{@link android.provider.ContactsContract.RawContacts#CONTENT_ITEM_TYPE} untuk tipe MIME
diff --git a/docs/html-intl/intl/in/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/in/guide/topics/providers/content-provider-creating.jd
index fefce70..7fbc613 100644
--- a/docs/html-intl/intl/in/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/in/guide/topics/providers/content-provider-creating.jd
@@ -1171,7 +1171,7 @@
<li>
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#label">
android:label</a></code>: Label informatif yang menjelaskan penyedia atau
- datanya, atau keduanya. Label ini muncul dalam daftar aplikasi di
+ datanya, atau keduanya. Label ini muncul dalam daftar aplikasi di
<em>Settings</em> > <em>Apps</em> > <em>All</em>.
</li>
</ul>
@@ -1189,7 +1189,7 @@
Aplikasi bisa mengakses penyedia konten secara tidak langsung dengan sebuah {@link android.content.Intent}.
Aplikasi tidak memanggil satu pun dari metode-metode {@link android.content.ContentResolver} atau
{@link android.content.ContentProvider}. Sebagai gantinya, aplikasi mengirim intent yang memulai aktivitas,
- yang sering kali merupakan bagian dari aplikasi penyedia sendiri. Aktivitas tujuan bertugas
+ yang sering kali merupakan bagian dari aplikasi penyedia sendiri. Aktivitas tujuan bertugas
mengambil dan menampilkan data dalam UI-nya. Bergantung pada tindakan dalam intent,
aktivitas tujuan juga bisa meminta pengguna untuk membuat modifikasi pada data penyedia.
Intent juga bisa berisi data "ekstra" yang menampilkan aktivitas tujuan
diff --git a/docs/html-intl/intl/in/guide/topics/providers/content-providers.jd b/docs/html-intl/intl/in/guide/topics/providers/content-providers.jd
index fc6f12b..2dcd55e 100644
--- a/docs/html-intl/intl/in/guide/topics/providers/content-providers.jd
+++ b/docs/html-intl/intl/in/guide/topics/providers/content-providers.jd
@@ -69,7 +69,7 @@
<p>
Android sendiri berisi penyedia konten yang mengelola data seperti informasi audio, video, gambar, dan
kontak pribadi. Anda bisa melihat sebagian informasi ini tercantum dalam dokumentasi
- acuan untuk paket
+ acuan untuk paket
<code><a href="{@docRoot}reference/android/provider/package-summary.html">android.provider</a>
</code>. Dengan beberapa batasan, semua penyedia ini bisa diakses oleh aplikasi Android
apa saja.
diff --git a/docs/html-intl/intl/in/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/in/guide/topics/providers/document-provider.jd
index c066e85..f857467 100644
--- a/docs/html-intl/intl/in/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/in/guide/topics/providers/document-provider.jd
@@ -96,7 +96,7 @@
Platform Android terdiri dari beberapa penyedia dokumen bawaan, seperti
Downloads, Images, dan Videos.</li>
-<li><strong>Aplikasi klien</strong>—Aplikasi custom yang memanggil intent
+<li><strong>Aplikasi klien</strong>—Aplikasi custom yang memanggil intent
{@link android.content.Intent#ACTION_OPEN_DOCUMENT} dan/atau
{@link android.content.Intent#ACTION_CREATE_DOCUMENT} dan menerima
file yang dihasilkan penyedia dokumen.</li>
@@ -446,7 +446,7 @@
<h3 id="delete">Menghapus dokumen</h3>
-<p>Jika Anda memiliki URI dokumen dan
+<p>Jika Anda memiliki URI dokumen dan
{@link android.provider.DocumentsContract.Document#COLUMN_FLAGS Document.COLUMN_FLAGS}
dokumen berisi
{@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_DELETE SUPPORTS_DELETE},
diff --git a/docs/html-intl/intl/in/guide/topics/resources/accessing-resources.jd b/docs/html-intl/intl/in/guide/topics/resources/accessing-resources.jd
index e4a0bea..6774557 100644
--- a/docs/html-intl/intl/in/guide/topics/resources/accessing-resources.jd
+++ b/docs/html-intl/intl/in/guide/topics/resources/accessing-resources.jd
@@ -60,7 +60,7 @@
string}, {@code drawable}, dan {@code layout}. Untuk mengetahui selengkapnya tentang berbagai tipe, lihat <a href="available-resources.html">Tipe Sumber Daya</a>.
</li>
<li><em>Nama sumber daya</em>, bisa berupa: nama file,
-tidak termasuk ekstensi; atau nilai dalam atribut {@code android:name} XML, jika
+tidak termasuk ekstensi; atau nilai dalam atribut {@code android:name} XML, jika
sumber daya itu sebuah nilai sederhana (misalnya sebuah string).</li>
</ul>
@@ -259,8 +259,8 @@
android:text="@string/hello" />
</pre>
-<p class="note"><strong>Catatan:</strong> Anda harus menggunakan sumber daya string sepanjang
-waktu, sehingga aplikasi Anda bisa dilokalkan untuk bahasa lain.
+<p class="note"><strong>Catatan:</strong> Anda harus menggunakan sumber daya string sepanjang
+waktu, sehingga aplikasi Anda bisa dilokalkan untuk bahasa lain.
Untuk informasi tentang cara menciptakan
sumber daya alternatif (seperti string lokal), lihat <a href="providing-resources.html#AlternativeResources">Menyediakan Sumber Daya Alternatif
</a>. Untuk panduan lengkap melokalkan aplikasi Anda ke bahasa lain,
@@ -332,6 +332,6 @@
<p>Dalam contoh ini, {@link android.R.layout#simple_list_item_1} adalah sumber daya layout yang didefinisikan oleh
platform untuk item di {@link android.widget.ListView}. Anda bisa menggunakannya sebagai ganti menciptakan
-layout sendiri untuk item daftar. Untuk informasi selengkapnya, lihat panduan pengembang
+layout sendiri untuk item daftar. Untuk informasi selengkapnya, lihat panduan pengembang
<a href="{@docRoot}guide/topics/ui/layout/listview.html">List View</a>.</p>
diff --git a/docs/html-intl/intl/in/guide/topics/resources/overview.jd b/docs/html-intl/intl/in/guide/topics/resources/overview.jd
index 966800c..def4932 100644
--- a/docs/html-intl/intl/in/guide/topics/resources/overview.jd
+++ b/docs/html-intl/intl/in/guide/topics/resources/overview.jd
@@ -24,7 +24,7 @@
sumber daya juga membuat Anda dapat menyediakan sumber daya alternatif yang mendukung konfigurasi
perangkat tertentu seperti bahasa atau ukuran layar yang berbeda, yang semakin penting
seiring semakin banyak tersedianya perangkat berbasis Android dengan konfigurasi berbeda. Untuk
-memberikan kompatibilitas dengan konfigurasi berbeda, Anda harus menata sumber daya dalam
+memberikan kompatibilitas dengan konfigurasi berbeda, Anda harus menata sumber daya dalam
direktori {@code res/} proyek Anda, menggunakan berbagai subdirektori yang mengelompokkan sumber daya menurut tipe
dan konfigurasinya.</p>
@@ -46,7 +46,7 @@
<em>alternatif</em> untuk aplikasi Anda:</p>
<ul>
<li>Sumber daya default adalah sumber daya yang harus digunakan apa pun
-konfigurasi perangkatnya atau jika tidak ada sumber daya alternatif yang sesuai
+konfigurasi perangkatnya atau jika tidak ada sumber daya alternatif yang sesuai
dengan konfigurasi saat ini.</li>
<li>Sumber daya alternatif adalah sumber daya yang Anda desain untuk digunakan dengan
konfigurasi tertentu. Untuk menetapkan bahwa satu kelompok sumber daya ditujukan bagi konfigurasi tertentu,
diff --git a/docs/html-intl/intl/in/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/in/guide/topics/resources/providing-resources.jd
index d6bbfc5..9bccd24 100644
--- a/docs/html-intl/intl/in/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/in/guide/topics/resources/providing-resources.jd
@@ -176,7 +176,7 @@
<li>styles.xml untuk <a href="style-resource.html">gaya</a>.</li>
</ul>
<p>Lihat <a href="string-resource.html">Sumber Daya String</a>,
- <a href="style-resource.html">Sumber Daya Gaya</a>, dan
+ <a href="style-resource.html">Sumber Daya Gaya</a>, dan
<a href="more-resources.html">Tipe Sumber Daya Lainnya</a>.</p>
</td>
</tr>
@@ -289,7 +289,7 @@
dari kartu SIM dalam perangkat. Misalnya, <code>mcc310</code> adalah AS untuk operator mana saja,
<code>mcc310-mnc004</code> adalah AS untuk Verizon, dan <code>mcc208-mnc00</code> Prancis untuk
Orange.</p>
- <p>Jika perangkat menggunakan koneksi radio (ponsel GSM), nilai-nilai MCC dan MNC berasal
+ <p>Jika perangkat menggunakan koneksi radio (ponsel GSM), nilai-nilai MCC dan MNC berasal
dari kartu SIM.</p>
<p>Anda juga dapat menggunakan MNC saja (misalnya, untuk menyertakan sumber daya legal
spesifik untuk negara itu di aplikasi Anda). Jika Anda perlu menetapkan hanya berdasarkan bahasa, maka gunakan qualifier
@@ -312,7 +312,7 @@
dll.
</td>
<td><p>Bahasa didefinisikan oleh kode bahasa dua huruf <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">ISO
-639-1</a>, bisa juga diikuti dengan kode wilayah
+639-1</a>, bisa juga diikuti dengan kode wilayah
dua huruf <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO
3166-1-alpha-2</a> (diawali dengan huruf kecil "{@code r}").
</p><p>
@@ -428,8 +428,8 @@
<p>Bila aplikasi Anda menyediakan beberapa direktori sumber daya dengan nilai yang berbeda
untuk konfigurasi ini, sistem akan menggunakan nilai terdekat dengan (tanpa melebihi)
lebar layar perangkat saat ini. Nilai
-di sini memperhitungkan dekorasi layar akun, jadi jika perangkat memiliki beberapa
-elemen UI persisten di tepi kiri atau kanan, layar
+di sini memperhitungkan dekorasi layar akun, jadi jika perangkat memiliki beberapa
+elemen UI persisten di tepi kiri atau kanan, layar
menggunakan nilai lebar yang lebih kecil daripada ukuran layar sebenarnya, yang memperhitungkan
elemen UI ini dan mengurangi ruang aplikasi yang tersedia.</p>
<p><em>Ditambahkan dalam API level 13.</em></p>
@@ -455,14 +455,14 @@
berubah antara lanskap dan potret agar cocok dengan tinggi sebenarnya saat ini.</p>
<p>Bila aplikasi menyediakan beberapa direktori sumber daya dengan nilai yang berbeda
untuk konfigurasi ini, sistem akan menggunakan nilai yang terdekat dengan (tanpa melebihi)
- tinggi layar perangkat saat ini. Nilai
+ tinggi layar perangkat saat ini. Nilai
di sini memperhitungkan dekorasi layar akun, jadi jika perangkat memiliki beberapa
elemen UI persisten di tepi atas atau bawah, layar akan
menggunakan nilai tinggi yang lebih kecil daripada ukuran layar sebenarnya, memperhitungkan
-elemen UI ini dan mengurangi ruang aplikasi yang tersedia. Dekorasi
-layar yang tidak tetap (misalnya baris status (status-bar) telepon yang bisa
-disembunyikan saat layar penuh) di sini <em>tidak</em> diperhitungkan, demikian pula
-dekorasi jendela seperti baris judul (title-bar)atau baris tindakan (action-bar), jadi aplikasi harus disiapkan
+elemen UI ini dan mengurangi ruang aplikasi yang tersedia. Dekorasi
+layar yang tidak tetap (misalnya baris status (status-bar) telepon yang bisa
+disembunyikan saat layar penuh) di sini <em>tidak</em> diperhitungkan, demikian pula
+dekorasi jendela seperti baris judul (title-bar)atau baris tindakan (action-bar), jadi aplikasi harus disiapkan
untuk menangani ruang yang agak lebih kecil daripada yang ditetapkan.
<p><em>Ditambahkan dalam API level 13.</em></p>
<p>Lihat juga bidang konfigurasi {@link android.content.res.Configuration#screenHeightDp}
@@ -482,35 +482,35 @@
</td>
<td>
<ul class="nolist">
- <li>{@code small}: Layar yang berukuran serupa dengan
-layar QVGA densitas rendah. Ukuran layout minimum untuk layar kecil
-adalah sekitar 320x426 satuan dp. Misalnya QVGA densitas rendah
+ <li>{@code small}: Layar yang berukuran serupa dengan
+layar QVGA densitas rendah. Ukuran layout minimum untuk layar kecil
+adalah sekitar 320x426 satuan dp. Misalnya QVGA densitas rendah
dan VGA densitas tinggi.</li>
- <li>{@code normal}: Layar yang berukuran serupa dengan
+ <li>{@code normal}: Layar yang berukuran serupa dengan
layar HVGA densitas sedang. Ukuran layout minimum untuk
-layar normal adalah sekitar 320x470 satuan dp. Contoh layar seperti itu adalah
+layar normal adalah sekitar 320x470 satuan dp. Contoh layar seperti itu adalah
WQVGA densitas rendah, HVGA densitas sedang, WVGA
densitas tinggi.</li>
- <li>{@code large}: Layar yang berukuran serupa dengan
+ <li>{@code large}: Layar yang berukuran serupa dengan
layar VGA densitas sedang.
Ukuran layout minimum untuk layar besar adalah sekitar 480x640 satuan dp.
Misalnya layar VGA dan WVGA densitas sedang.</li>
- <li>{@code xlarge}: Layar yang jauh lebih besar dari layar HVGA
-densitas sedang tradisional. Ukuran layout minimum untuk
-layar ekstra besar adalah sekitar 720x960 satuan dp. Perangkat dengan layar ekstra besar
+ <li>{@code xlarge}: Layar yang jauh lebih besar dari layar HVGA
+densitas sedang tradisional. Ukuran layout minimum untuk
+layar ekstra besar adalah sekitar 720x960 satuan dp. Perangkat dengan layar ekstra besar
seringkali terlalu besar untuk dibawa dalam saku dan kemungkinan besar
berupa perangkat bergaya tablet. <em>Ditambahkan dalam API level 9.</em></li>
</ul>
- <p class="note"><strong>Catatan:</strong> Menggunakan qualifier ukuran tidak berarti bahwa
+ <p class="note"><strong>Catatan:</strong> Menggunakan qualifier ukuran tidak berarti bahwa
sumber daya <em>hanya</em> untuk layar ukuran itu saja. Jika Anda tidak menyediakan sumber
daya alternatif dengan qualifier yang lebih cocok dengan konfigurasi perangkat saat ini, sistem dapat menggunakan sumber daya
mana saja yang <a href="#BestMatch">paling cocok</a>.</p>
- <p class="caution"><strong>Perhatian:</strong> Jika semua sumber daya Anda menggunakan
-qualifier yang berukuran <em>lebih besar</em> daripada layar saat ini, sistem <strong>tidak</strong> akan menggunakannya dan aplikasi
+ <p class="caution"><strong>Perhatian:</strong> Jika semua sumber daya Anda menggunakan
+qualifier yang berukuran <em>lebih besar</em> daripada layar saat ini, sistem <strong>tidak</strong> akan menggunakannya dan aplikasi
Anda akan crash saat runtime (misalnya, jika semua sumber daya layout ditandai dengan qualifier {@code
xlarge}, namun perangkat memiliki ukuran layar normal).</p>
<p><em>Ditambahkan dalam API level 4.</em></p>
-
+
<p>Lihat <a href="{@docRoot}guide/practices/screens_support.html">Mendukung Beberapa
Layar</a> untuk informasi selengkapnya.</p>
<p>Lihat juga bidang konfigurasi {@link android.content.res.Configuration#screenLayout},
@@ -552,7 +552,7 @@
<p>Ini bisa berubah selama masa pakai aplikasi Anda jika pengguna memutar
layar. Lihat <a href="runtime-changes.html">Menangani Perubahan Runtime</a> untuk
informasi tentang bagaimana hal ini memengaruhi aplikasi Anda selama runtime.</p>
- <p>Lihat juga bidang konfigurasi {@link android.content.res.Configuration#orientation},
+ <p>Lihat juga bidang konfigurasi {@link android.content.res.Configuration#orientation},
yang menunjukkan orientasi perangkat saat ini.</p>
</td>
</tr>
@@ -569,19 +569,19 @@
<ul class="nolist">
<li>{@code car}: Perangkat sedang menampilkan di dudukan perangkat di mobil</li>
<li>{@code desk}: Perangkat sedang menampilkan di dudukan perangkat di meja</li>
- <li>{@code television}: Perangkat sedang menampilkan di televisi, yang menyediakan
+ <li>{@code television}: Perangkat sedang menampilkan di televisi, yang menyediakan
pengalaman "sepuluh kaki" dengan UI-nya pada layar besar yang berada jauh dari pengguna,
-terutama diorientasikan seputar DPAD atau
+terutama diorientasikan seputar DPAD atau
interaksi non-pointer lainnya</li>
- <li>{@code appliance}: Perangkat berlaku sebagai
+ <li>{@code appliance}: Perangkat berlaku sebagai
alat, tanpa tampilan</li>
<li>{@code watch}: Perangkat memiliki tampilan dan dikenakan di pergelangan tangan</li>
</ul>
<p><em>Ditambahkan dalam API level 8, televisi ditambahkan dalam API 13, jam ditambahkan dalam API 20.</em></p>
- <p>Untuk informasi tentang cara aplikasi merespons saat perangkat dimasukkan
+ <p>Untuk informasi tentang cara aplikasi merespons saat perangkat dimasukkan
ke dalam atau dilepaskan dari dudukannya, bacalah <a href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">Menentukan
dan Memantau Kondisi dan Tipe Dudukan</a>.</p>
- <p>Ini bisa berubah selama masa pakai aplikasi jika pengguna menempatkan perangkat di
+ <p>Ini bisa berubah selama masa pakai aplikasi jika pengguna menempatkan perangkat di
dudukannya. Anda dapat mengaktifkan atau menonaktifkan sebagian mode ini menggunakan {@link
android.app.UiModeManager}. Lihat <a href="runtime-changes.html">Menangani Perubahan Runtime</a> untuk
informasi tentang bagaimana hal ini memengaruhi aplikasi Anda selama runtime.</p>
@@ -601,7 +601,7 @@
<p><em>Ditambahkan dalam API level 8.</em></p>
<p>Ini bisa berubah selama masa pakai aplikasi jika mode malam dibiarkan dalam
mode otomatis (default), dalam hal ini perubahan mode berdasarkan pada waktu hari. Anda dapat mengaktifkan
-atau menonaktifkan mode ini menggunakan {@link android.app.UiModeManager}. Lihat <a href="runtime-changes.html">Menangani Perubahan Runtime</a> untuk informasi tentang bagaimana hal ini memengaruhi
+atau menonaktifkan mode ini menggunakan {@link android.app.UiModeManager}. Lihat <a href="runtime-changes.html">Menangani Perubahan Runtime</a> untuk informasi tentang bagaimana hal ini memengaruhi
aplikasi Anda selama runtime.</p>
</td>
</tr>
@@ -627,8 +627,8 @@
Level 8.</em></li>
<li>{@code xxhdpi}: Layar densitas ekstra-ekstra-tinggi; sekitar 480 dpi. <em>Ditambahkan dalam API
Level 16.</em></li>
- <li>{@code xxxhdpi}: Densitas ekstra-ekstra-ekstra-tinggi (hanya ikon launcher,
-lihat <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">catatan</a>
+ <li>{@code xxxhdpi}: Densitas ekstra-ekstra-ekstra-tinggi (hanya ikon launcher,
+lihat <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">catatan</a>
dalam <em>Mendukung Beberapa Layar</em>); sekitar 640 dpi. <em>Ditambahkan dalam API
Level 18.</em></li>
<li>{@code nodpi}: Ini bisa digunakan untuk sumber daya bitmap yang tidak ingin Anda
@@ -696,7 +696,7 @@
hal ini memengaruhi aplikasi Anda selama runtime.</p>
<p>Lihat juga bidang konfigurasi {@link
android.content.res.Configuration#hardKeyboardHidden} dan {@link
-android.content.res.Configuration#keyboardHidden}, yang menunjukkan visibilitas
+android.content.res.Configuration#keyboardHidden}, yang menunjukkan visibilitas
keyboard fisik dan visibilitas segala jenis keyboard (termasuk keyboard perangkat lunak), masing-masing.</p>
</td>
</tr>
@@ -716,7 +716,7 @@
<li>{@code 12key}: Perangkat memiliki keyboard fisik 12 tombol, baik terlihat maupun tidak
pada pengguna.</li>
</ul>
- <p>Lihat juga bidang konfigurasi {@link android.content.res.Configuration#keyboard},
+ <p>Lihat juga bidang konfigurasi {@link android.content.res.Configuration#keyboard},
yang menunjukkan metode utama input teks yang tersedia.</p>
</td>
</tr>
@@ -810,7 +810,7 @@
<li>Anda bisa menetapkan beberapa qualifier untuk satu set sumber daya, yang dipisahkan dengan tanda hubung. Misalnya,
<code>drawable-en-rUS-land</code> berlaku untuk perangkat bahasa Inggris-AS dalam orientasi
lanskap.</li>
- <li>Qualifier harus dalam urutan seperti yang tercantum dalam <a href="#table2">tabel 2</a>.
+ <li>Qualifier harus dalam urutan seperti yang tercantum dalam <a href="#table2">tabel 2</a>.
Misalnya:
<ul>
<li>Salah: <code>drawable-hdpi-port/</code></li>
@@ -947,7 +947,7 @@
{@code layout/} untuk lanskap dan {@code layout-port/} untuk potret.</p>
<p>Sumber daya default perlu disediakan bukan hanya karena aplikasi mungkin berjalan pada
-konfigurasi yang belum Anda antisipasi, namun juga karena versi baru Android terkadang menambahkan
+konfigurasi yang belum Anda antisipasi, namun juga karena versi baru Android terkadang menambahkan
qualifier konfigurasi yang tidak didukung oleh versi lama. Jika Anda menggunakan qualifier sumber daya baru,
namun mempertahankan kompatibilitas kode dengan versi Android yang lebih lama, maka saat versi lama
Android menjalankan aplikasi, aplikasi itu akan crash jika Anda tidak menyediakan sumber daya default, aplikasi
@@ -1058,7 +1058,7 @@
</li>
<li>Kembali dan ulangi langkah 2, 3, dan 4 hingga tersisa satu direktori. Dalam contoh ini, orientasi
-layar adalah qualifier berikutnya yang memiliki kecocokan.
+layar adalah qualifier berikutnya yang memiliki kecocokan.
Jadi, sumber daya yang tidak menetapkan orientasi layar akan dihapus:
<pre class="classic no-pretty-print">
<strike>drawable-en/</strike>
diff --git a/docs/html-intl/intl/in/guide/topics/resources/runtime-changes.jd b/docs/html-intl/intl/in/guide/topics/resources/runtime-changes.jd
index c9a5ead..09ad60c 100644
--- a/docs/html-intl/intl/in/guide/topics/resources/runtime-changes.jd
+++ b/docs/html-intl/intl/in/guide/topics/resources/runtime-changes.jd
@@ -82,12 +82,12 @@
<p>Untuk mempertahankan objek stateful dalam fragmen selama perubahan konfigurasi runtime:</p>
<ol>
- <li>Perluas kelas {@link android.app.Fragment} dan deklarasikan referensi ke objek stateful
+ <li>Perluas kelas {@link android.app.Fragment} dan deklarasikan referensi ke objek stateful
Anda.</li>
<li>Panggil {@link android.app.Fragment#setRetainInstance(boolean)} saat fragmen dibuat.
</li>
<li>Tambahkan fragmen ke aktivitas.</li>
- <li>Gunakan {@link android.app.FragmentManager} untuk mengambil fragmen saat aktivitas
+ <li>Gunakan {@link android.app.FragmentManager} untuk mengambil fragmen saat aktivitas
di-restart.</li>
</ol>
@@ -125,8 +125,8 @@
berarti bahwa aplikasi Anda tetap menyimpannya dan tidak bisa dijadikan kumpulan sampah, sehingga bisa banyak
memori yang hilang.)</p>
-<p>Selanjutnya gunakan {@link android.app.FragmentManager} untuk menambahkan fragmen ke aktivitas.
-Anda bisa memperoleh objek data dari fragmen saat aktivitas memulai kembali selama perubahan
+<p>Selanjutnya gunakan {@link android.app.FragmentManager} untuk menambahkan fragmen ke aktivitas.
+Anda bisa memperoleh objek data dari fragmen saat aktivitas memulai kembali selama perubahan
konfigurasi runtime. Misalnya, definisikan aktivitas Anda sebagai berikut:</p>
<pre>
diff --git a/docs/html-intl/intl/in/guide/topics/ui/controls.jd b/docs/html-intl/intl/in/guide/topics/ui/controls.jd
index 7ee2957..3ebf48b 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">Tombol radio</a></td>
<td>Mirip dengan kotak cek, hanya saja cuma satu opsi yang bisa dipilih dalam kumpulan tersebut.</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/in/guide/topics/ui/declaring-layout.jd b/docs/html-intl/intl/in/guide/topics/ui/declaring-layout.jd
index 83ff746..1c8a0d6 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/declaring-layout.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/declaring-layout.jd
@@ -74,7 +74,7 @@
<code>EditText.setText()</code>. </p>
<p class="note"><strong>Tip:</strong> Ketahui selengkapnya berbagai tipe layout dalam <a href="{@docRoot}guide/topics/ui/layout-objects.html">Objek
-Layout Umum</a>. Ada juga sekumpulan tutorial tentang cara membangun berbagai layout dalam panduan tutorial
+Layout Umum</a>. Ada juga sekumpulan tutorial tentang cara membangun berbagai layout dalam panduan tutorial
<a href="{@docRoot}resources/tutorials/views/index.html">Hello Views</a>.</p>
<h2 id="write">Tulis XML</h2>
@@ -107,7 +107,7 @@
<h2 id="load">Muat Sumber Daya XML</h2>
-<p>Saat mengompilasi aplikasi, masing-masing file layout XML akan dikompilasi dalam sebuah sumber daya
+<p>Saat mengompilasi aplikasi, masing-masing file layout XML akan dikompilasi dalam sebuah sumber daya
{@link android.view.View}. Anda harus memuat sumber daya layout dari kode aplikasi, dalam implementasi
callback {@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()}.
Lakukan dengan memanggil <code>{@link android.app.Activity#setContentView(int) setContentView()}</code>,
@@ -367,8 +367,8 @@
<h2 id="AdapterViews" style="clear:left">Membangun Layout dengan Adaptor</h2>
-<p>Bila isi layout bersifat dinamis atau tidak dipastikan sebelumnya, Anda bisa menggunakan layout yang menjadi
-subkelas {@link android.widget.AdapterView} untuk mengisi layout dengan tampilan saat runtime.
+<p>Bila isi layout bersifat dinamis atau tidak dipastikan sebelumnya, Anda bisa menggunakan layout yang menjadi
+subkelas {@link android.widget.AdapterView} untuk mengisi layout dengan tampilan saat runtime.
Subkelas dari kelas {@link android.widget.AdapterView} menggunakan {@link android.widget.Adapter} untuk
mengikat data ke layoutnya. {@link android.widget.Adapter} berfungsi sebagai penghubung antara sumber data
dan layout{@link android.widget.AdapterView}—{@link android.widget.Adapter}
@@ -445,7 +445,7 @@
nama orang dan nomor telepon, Anda bisa melakukan query yang menghasilkan {@link
android.database.Cursor} yang berisi satu baris untuk tiap orang dan kolom-kolom untuk nama dan
nomor. Selanjutnya Anda membuat larik string yang menentukan kolom dari {@link
-android.database.Cursor} yang Anda inginkan dalam layout untuk setiap hasil dan larik integer yang menentukan
+android.database.Cursor} yang Anda inginkan dalam layout untuk setiap hasil dan larik integer yang menentukan
tampilan yang sesuai untuk menempatkan masing-masing kolom:</p>
<pre>
String[] fromColumns = {ContactsContract.Data.DISPLAY_NAME,
diff --git a/docs/html-intl/intl/in/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/in/guide/topics/ui/dialogs.jd
index 65714a9..06a25ac 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>Lihat juga</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">Panduan desain dialog</a></li>
@@ -89,7 +89,7 @@
<p>Bagian-bagian berikutnya dalam panduan ini akan menjelaskan cara menggunakan {@link
android.support.v4.app.DialogFragment} yang dikombinasikan dengan objek {@link android.app.AlertDialog}
-. Jika Anda ingin membuat picker tanggal atau waktu, Anda harus membaca panduan
+. Jika Anda ingin membuat picker tanggal atau waktu, Anda harus membaca panduan
<a href="{@docRoot}guide/topics/ui/controls/pickers.html">Picker</a>.</p>
<p class="note"><strong>Catatan:</strong>
@@ -235,8 +235,8 @@
</pre>
<p>Metode <code>set...Button()</code> mengharuskan adanya judul bagi tombol (disediakan
-oleh suatu <a href="{@docRoot}guide/topics/resources/string-resource.html">sumber daya string</a>) dan
-{@link android.content.DialogInterface.OnClickListener} yang mendefinisikan tindakan yang diambil
+oleh suatu <a href="{@docRoot}guide/topics/resources/string-resource.html">sumber daya string</a>) dan
+{@link android.content.DialogInterface.OnClickListener} yang mendefinisikan tindakan yang diambil
bila pengguna menekan tombol.</p>
<p>Ada tiga macam tombol tindakan yang Anda bisa tambahkan:</p>
@@ -247,8 +247,8 @@
<dd>Anda harus menggunakan tipe ini untuk membatalkan tindakan.</dd>
<dt>Netral</dt>
<dd>Anda harus menggunakan tipe ini bila pengguna mungkin tidak ingin melanjutkan tindakan,
- namun tidak ingin membatalkan. Tipe ini muncul antara tombol positif dan
-tombol negatif. Misalnya, tindakan bisa berupa "Ingatkan saya nanti".</dd>
+ namun tidak ingin membatalkan. Tipe ini muncul antara tombol positif dan
+tombol negatif. Misalnya, tindakan bisa berupa "Ingatkan saya nanti".</dd>
</dl>
<p>Anda hanya bisa menambahkan salah satu tipe tombol ke {@link
@@ -271,7 +271,7 @@
<li>Daftar pilihan ganda persisten (kotak cek)</li>
</ul>
-<p>Untuk membuat daftar pilihan tunggal seperti dalam gambar 3,
+<p>Untuk membuat daftar pilihan tunggal seperti dalam gambar 3,
gunakan metode {@link android.app.AlertDialog.Builder#setItems setItems()}:</p>
<pre style="clear:right">
@@ -291,7 +291,7 @@
<p>Karena daftar muncul dalam area konten dialog,
dialog tidak bisa menampilkan pesan dan daftar sekaligus dan Anda harus menetapkan judul untuk
-dialog dengan {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
+dialog dengan {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
Untuk menentukan item daftar, panggil {@link
android.app.AlertDialog.Builder#setItems setItems()}, dengan meneruskan larik.
Atau, Anda bisa menetapkan daftar menggunakan {@link
@@ -300,7 +300,7 @@
<p>Jika Anda memilih untuk mendukung daftar dengan {@link android.widget.ListAdapter},
selalu gunakan sebuah {@link android.support.v4.content.Loader} agar konten dimuat
-secara asinkron. Hal ini dijelaskan lebih jauh dalam panduan
+secara asinkron. Hal ini dijelaskan lebih jauh dalam panduan
<a href="{@docRoot}guide/topics/ui/declaring-layout.html#AdapterViews">Membuat Layout
dengan Adaptor</a> dan <a href="{@docRoot}guide/components/loaders.html">Loader</a>
.</p>
@@ -317,11 +317,11 @@
<h4 id="Checkboxes">Menambahkan daftar pilihan ganda atau pilihan tunggal persisten</h4>
-<p>Untuk menambahkan daftar item pilihan ganda (kotak cek) atau
-item pilihan tunggal (tombol radio), gunakan masing-masing metode
+<p>Untuk menambahkan daftar item pilihan ganda (kotak cek) atau
+item pilihan tunggal (tombol radio), gunakan masing-masing metode
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()}, atau
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()}, atau
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()}.</p>
<p>Misalnya, berikut ini cara membuat daftar pilihan ganda seperti
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -373,7 +373,7 @@
<p>Walaupun daftar tradisional maupun daftar dengan tombol radio
menyediakan tindakan "pilihan tunggal", Anda harus menggunakan {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} jika ingin mempertahankan pilihan pengguna.
Yakni, jika nanti membuka dialog lagi untuk menunjukkan pilihan pengguna,
maka Anda perlu membuat daftar dengan tombol radio.</p>
@@ -442,7 +442,7 @@
gaya font yang cocok.</p>
<p>Untuk memekarkan layout dalam {@link android.support.v4.app.DialogFragment} Anda,
-ambillah {@link android.view.LayoutInflater} dengan
+ambillah {@link android.view.LayoutInflater} dengan
{@link android.app.Activity#getLayoutInflater()} dan panggil
{@link android.view.LayoutInflater#inflate inflate()}, dengan parameter pertama
adalah ID sumber daya layout dan parameter kedua adalah tampilan induk untuk layout.
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -638,12 +638,12 @@
<p>Akan tetapi, dalam hal ini Anda tidak bisa menggunakan {@link android.app.AlertDialog.Builder AlertDialog.Builder}
atau objek {@link android.app.Dialog} lain untuk membangun dialog. Jika
-Anda ingin {@link android.support.v4.app.DialogFragment}
+Anda ingin {@link android.support.v4.app.DialogFragment}
bisa ditanamkan, Anda harus mendefinisikan dialog UI dalam layout, lalu memuat layout itu dalam metode callback
{@link android.support.v4.app.DialogFragment#onCreateView
onCreateView()}.</p>
-<p>Berikut ini adalah contoh {@link android.support.v4.app.DialogFragment} yang bisa muncul sebagai
+<p>Berikut ini adalah contoh {@link android.support.v4.app.DialogFragment} yang bisa muncul sebagai
dialog maupun fragmen yang bisa ditanamkan (menggunakan layout bernama <code>purchase_items.xml</code>):</p>
<pre>
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
@@ -776,7 +776,7 @@
android.support.v4.app.DialogFragment} Anda.</p>
<p>Anda juga bisa <em>membatalkan</em> dialog. Ini merupakan kejadian khusus yang menunjukkan bahwa pengguna
-secara eksplisit meninggalkan dialog tanpa menyelesaikan tugas. Hal ini terjadi jika pengguna menekan tombol
+secara eksplisit meninggalkan dialog tanpa menyelesaikan tugas. Hal ini terjadi jika pengguna menekan tombol
<em>Back</em>, menyentuh layar di luar area dialog,
atau jika Anda secara eksplisit memanggil {@link android.app.Dialog#cancel()} pada {@link
android.app.Dialog} (seperti saat merespons tombol "Cancel" dalam dialog).</p>
diff --git a/docs/html-intl/intl/in/guide/topics/ui/menus.jd b/docs/html-intl/intl/in/guide/topics/ui/menus.jd
index 2cd3e6a..1ee0244 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/menus.jd
@@ -60,7 +60,7 @@
tindakan dan opsi lain dalam aktivitas kepada pengguna.</p>
<p>Mulai dengan Android 3.0 (API level 11), perangkat berbasis Android tidak perlu lagi
-menyediakan tombol <em>Menu</em> tersendiri. Dengan perubahan ini, aplikasi Android harus bermigrasi dari
+menyediakan tombol <em>Menu</em> tersendiri. Dengan perubahan ini, aplikasi Android harus bermigrasi dari
dependensi pada panel menu 6 item biasa, dan sebagai ganti menyediakan action-bar untuk menyajikan
berbagai tindakan pengguna yang lazim.</p>
@@ -83,9 +83,9 @@
opsi lainnya.</p>
<p>Lihat bagian tentang <a href="#options-menu">Membuat Menu Opsi</a>.</p>
</dd>
-
+
<dt><strong>Menu konteks dan mode tindakan kontekstual</strong></dt>
-
+
<dd>Menu konteks adalah <a href="#FloatingContextMenu">menu mengambang</a> yang muncul saat
pengguna mengklik lama pada suatu elemen. Menu ini menyediakan tindakan yang memengaruhi konten atau
bingkai konteks yang dipilih.
@@ -94,7 +94,7 @@
memilih beberapa item sekaligus.</p>
<p>Lihat bagian tentang <a href="#context-menu">Membuat Menu Kontekstual</a>.</p>
</dd>
-
+
<dt><strong>Menu popup</strong></dt>
<dd>Menu popup menampilkan daftar item secara vertikal yang dipasang pada tampilan yang
memanggil menu. Ini cocok untuk menyediakan kelebihan tindakan yang terkait dengan konten tertentu atau
@@ -128,14 +128,14 @@
proyek dan buat menu dengan elemen-elemen berikut:</p>
<dl>
<dt><code><menu></code></dt>
- <dd>Mendefinisikan {@link android.view.Menu}, yang merupakan sebuah kontainer untuk item menu. Elemen
+ <dd>Mendefinisikan {@link android.view.Menu}, yang merupakan sebuah kontainer untuk item menu. Elemen
<code><menu></code> harus menjadi simpul akar untuk file dan bisa menampung salah satu atau beberapa dari elemen
<code><item></code> dan <code><group></code>.</dd>
<dt><code><item></code></dt>
<dd>Membuat {@link android.view.MenuItem}, yang mewakili satu item menu. Elemen ini
bisa berisi elemen <code><menu></code> tersarang guna untuk membuat submenu.</dd>
-
+
<dt><code><group></code></dt>
<dd>Kontainer opsional tak terlihat untuk elemen-elemen {@code <item>}. Kontainer ini memungkinkan Anda
mengelompokkan item menu untuk berbagi properti seperti status aktif dan visibilitas. Untuk informasi
@@ -253,7 +253,7 @@
dalam setiap {@code <item>} yang perlu Anda pindahkan.</p>
<p>Untuk menetapkan menu opsi suatu aktivitas, kesampingkan {@link
-android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} (fragmen-fragmen menyediakan
+android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} (fragmen-fragmen menyediakan
callback {@link android.app.Fragment#onCreateOptionsMenu onCreateOptionsMenu()} sendiri). Dalam metode ini
, Anda bisa memekarkan sumber daya menu (<a href="#xml">yang didefinisikan dalam XML</a>) menjadi {@link
android.view.Menu} yang disediakan dalam callback. Misalnya:</p>
@@ -273,7 +273,7 @@
<p>Jika Anda mengembangkan aplikasi untuk Android 2.3.x dan yang lebih rendah, sistem akan memanggil {@link
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} untuk membuat menu opsi
-bila pengguna membuka menu untuk pertama kali. Jika Anda mengembangkan aplikasi untuk Android 3.0 dan yang lebih tinggi,
+bila pengguna membuka menu untuk pertama kali. Jika Anda mengembangkan aplikasi untuk Android 3.0 dan yang lebih tinggi,
sistem akan memanggil {@link android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} saat
memulai aktivitas, untuk menampilkan item menu pada action-bar.</p>
@@ -285,7 +285,7 @@
sistem akan memanggil metode {@link android.app.Activity#onOptionsItemSelected(MenuItem)
onOptionsItemSelected()} aktivitas Anda. Metode ini meneruskan {@link android.view.MenuItem} yang dipilih. Anda
bisa mengidentifikasi item dengan memanggil {@link android.view.MenuItem#getItemId()}, yang menghasilkan
-ID unik untuk item menu itu (yang didefinisikan oleh atribut {@code android:id} dalam sumber daya menu atau dengan
+ID unik untuk item menu itu (yang didefinisikan oleh atribut {@code android:id} dalam sumber daya menu atau dengan
integer yang diberikan ke metode {@link android.view.Menu#add(int,int,int,int) add()}). Anda bisa mencocokkan
ID ini dengan item menu yang diketahui untuk melakukan tindakan yang sesuai. Misalnya:</p>
@@ -317,7 +317,7 @@
{@code true} atau semua fragmen telah dipanggil.</p>
<p class="note"><strong>Tip:</strong> Android 3.0 menambahkan kemampuan mendefinisikan perilaku on-click
-untuk item menu dalam XML, dengan menggunakan atribut {@code android:onClick}. Nilai atribut
+untuk item menu dalam XML, dengan menggunakan atribut {@code android:onClick}. Nilai atribut
harus berupa nama metode yang didefinisikan aktivitas dengan menggunakan menu. Metode
harus bersifat publik dan menerima satu parameter {@link android.view.MenuItem}—bila sistem
memanggilnya, metode ini akan meneruskan item menu yang dipilih. Untuk informasi selengkapnya dan contoh, lihat dokumen <a href="{@docRoot}guide/topics/resources/menu-resource.html">Sumber Daya Menu</a>.</p>
@@ -346,7 +346,7 @@
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} hanya untuk membuat
status menu awal dan tidak untuk membuat perubahan selama daur hidup aktivitas.</p>
-<p>Jika Anda ingin mengubah menu opsi berdasarkan
+<p>Jika Anda ingin mengubah menu opsi berdasarkan
kejadian yang terjadi selama daur hidup aktivitas, Anda bisa melakukannya dalam metode
{@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}. Metode ini
meneruskan objek {@link android.view.Menu} sebagaimana adanya saat ini sehingga Anda bisa mengubahnya,
@@ -363,7 +363,7 @@
memanggil {@link android.app.Activity#invalidateOptionsMenu invalidateOptionsMenu()} untuk meminta
sistem memanggil {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}.</p>
-<p class="note"><strong>Catatan:</strong>
+<p class="note"><strong>Catatan:</strong>
Anda tidak boleh mengubah item dalam menu opsi berdasarkan {@link android.view.View} yang saat ini
difokus. Saat dalam mode sentuh (bila pengguna tidak sedang menggunakan trackball atau d-pad), tampilan
tidak bisa mengambil fokus, sehingga Anda tidak boleh menggunakan fokus sebagai dasar untuk mengubah
@@ -419,7 +419,7 @@
</li>
<li>Implementasikan metode {@link
-android.view.View.OnCreateContextMenuListener#onCreateContextMenu onCreateContextMenu()}
+android.view.View.OnCreateContextMenuListener#onCreateContextMenu onCreateContextMenu()}
dalam {@link android.app.Activity} atau {@link android.app.Fragment} Anda.
<p>Bila tampilan yang terdaftar menerima kejadian klik-lama, sistem akan memanggil metode {@link
android.view.View.OnCreateContextMenuListener#onCreateContextMenu onCreateContextMenu()}
@@ -445,7 +445,7 @@
<li>Implementasikan {@link android.app.Activity#onContextItemSelected(MenuItem)
onContextItemSelected()}.
- <p>Bila pengguna memilih item menu, sistem akan memanggil metode ini sehingga Anda bisa melakukan
+ <p>Bila pengguna memilih item menu, sistem akan memanggil metode ini sehingga Anda bisa melakukan
tindakan yang sesuai. Misalnya:</p>
<pre>
@@ -609,7 +609,7 @@
<p>Bila Anda memanggil {@link android.app.Activity#startActionMode startActionMode()}, sistem akan mengembalikan
{@link android.view.ActionMode} yang dibuat. Dengan menyimpannya dalam variabel anggota, Anda bisa
-membuat perubahan ke action-bar kontekstual sebagai respons terhadap kejadian lainnya. Dalam contoh di atas,
+membuat perubahan ke action-bar kontekstual sebagai respons terhadap kejadian lainnya. Dalam contoh di atas,
{@link android.view.ActionMode} digunakan untuk memastikan bahwa instance {@link android.view.ActionMode}
tidak dibuat kembali jika sudah aktif, dengan memeriksa apakah anggota bernilai nol sebelum memulai
mode tindakan.</p>
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -1010,7 +1010,7 @@
<p>Anda juga bisa menawarkan layanan aktivitas Anda pada aplikasi lainnya, sehingga
aplikasi Anda bisa disertakan dalam menu aplikasi lain (membalik peran yang dijelaskan di atas).</p>
-<p>Agar bisa dimasukkan dalam menu aplikasi lain, Anda perlu mendefinisikan
+<p>Agar bisa dimasukkan dalam menu aplikasi lain, Anda perlu mendefinisikan
filter intent seperti biasa, tetapi pastikan menyertakan nilai-nilai {@link android.content.Intent#CATEGORY_ALTERNATIVE}
dan/atau {@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE} untuk
kategori filter intent. Misalnya:</p>
@@ -1026,6 +1026,6 @@
<p>Baca selengkapnya tentang penulisan filter intent dalam dokumen
<a href="/guide/components/intents-filters.html">Intent dan Filter Intent</a>.</p>
-<p>Untuk contoh aplikasi yang menggunakan teknik ini, lihat contoh kode
+<p>Untuk contoh aplikasi yang menggunakan teknik ini, lihat contoh kode
<a href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">Note
Pad</a>.</p>
diff --git a/docs/html-intl/intl/in/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/in/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..5e7b3d9
--- /dev/null
+++ b/docs/html-intl/intl/in/guide/topics/ui/multi-window.jd
@@ -0,0 +1,589 @@
+page.title=Dukungan Multi-Jendela
+page.metaDescription=Dukungan baru di Android N untuk menampilkan lebih dari satu aplikasi sekaligus.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Dalam dokumen ini</h2>
+ <ol>
+ <li><a href="#overview">Ringkasan</a></li>
+ <li><a href="#lifecycle">Daur Hidup Multi-Jendela</a></li>
+ <li><a href="#configuring">Mengonfigurasi Aplikasi Anda untuk Mode
+ Multi-Jendela</a></li>
+ <li><a href="#running">Menjalankan Aplikasi Anda dalam Mode Multi-Jendela</a></li>
+ <li><a href="#testing">Menguji Dukungan Multi-Jendela Aplikasi Anda</a></li>
+ </ol>
+ <h2>Lihat Juga</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Aplikasi contoh Playground
+ Multi-Jendela</a></li>
+ <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Lima Tip untuk Mempersiapkan Multi-Jendela di Android N</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N menambahkan dukungan untuk menampilkan lebih dari satu aplikasi
+ sekaligus. Pada perangkat genggam, dua aplikasi bisa berjalan berdampingan atau
+ atas-bawah dalam mode <em>layar terbagi</em>. Pada perangkat TV, aplikasi bisa
+ menggunakan mode <em>gambar-dalam-gambar</em> untuk melanjutkan pemutaran video selagi pengguna
+ berinteraksi dengan aplikasi lain.
+</p>
+
+<p>
+ Jika Anda membangun aplikasi Anda dengan N Preview SDK, Anda bisa mengonfigurasi cara aplikasi
+ menangani tampilan multi-jendela. Misalnya, Anda bisa menetapkan dimensi
+ minimum yang diizinkan aktivitas Anda. Anda juga bisa menonaktifkan tampilan multi-jendela untuk
+ aplikasi, sehingga memastikan sistem hanya menampilkan aplikasi Anda dalam mode
+ layar penuh.
+</p>
+
+<h2 id="overview">Ringkasan</h2>
+
+<p>
+ Android N memungkinkan beberapa aplikasi berbagi layar sekaligus. Misalnya,
+ pengguna bisa membagi layar, melihat halaman web di sisi kiri
+ sambil menulis email di sisi kanan. Pengalaman pengguna bergantung pada
+ perangkat:
+</p>
+
+<ul>
+ <li>Perangkat genggam yang menjalankan Android N menawarkan mode
+ layar terbagi. Di mode ini, sistem mengisi layar dengan dua aplikasi, menampilkannya secara
+ berdampingan atau atas-bawah. Pengguna bisa menyeret garis pembagi
+ yang memisahkan keduanya untuk membuat satu aplikasi lebih besar dan yang lainnya lebih kecil.
+ </li>
+
+ <li>Pada Nexus Player yang menjalankan Android N, aplikasi bisa menempatkan diri
+ dalam <a href="picture-in-picture.html">mode gambar-dalam-gambar</a>, yang memungkinkannya
+ untuk terus menampilkan materi selagi pengguna menjelajahi atau berinteraksi dengan
+ aplikasi lain.
+ </li>
+
+ <li>Produsen perangkat berukuran lebih besar bisa memilih untuk mengaktifkan mode
+ bentuk bebas, di mana pengguna bisa bebas mengubah ukuran setiap aktivitas. Jika
+ produsen mengaktifkan fitur ini, perangkat akan menawarkan mode bentuk bebas sebagai tambahan
+ untuk mode layar terbagi.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>Gambar 1.</strong> Dua aplikasi berjalan berdampingan dalam mode layar terbagi.
+</p>
+
+<p>
+ Pengguna bisa beralih ke mode multi-jendela dengan cara berikut:
+</p>
+
+<ul>
+ <li>Jika pengguna membuka <a href="{@docRoot}guide/components/recents.html">layar
+ Ringkasan</a> dan menekan lama pada
+ judul aktivitas, mereka bisa menyeret aktivitas itu ke bagian yang disorot pada layar
+ untuk menempatkan aktivitas dalam mode multi-jendela.
+ </li>
+
+ <li>Jika pengguna menekan lama pada tombol Ringkasan, perangkat akan menempatkan
+ aktivitas saat ini dalam mode multi-jendela, dan membuka layar Ringkasan guna
+ memungkinkan pengguna memilih aktivitas lain untuk berbagi layar.
+ </li>
+</ul>
+
+<p>
+ Pengguna bisa <a href="{@docRoot}guide/topics/ui/drag-drop.html">seret dan
+ lepas</a> data dari aktivitas satu ke aktivitas lain sewaktu aktivitas berbagi
+ layar. (Sebelumnya, pengguna hanya bisa menyeret dan melepas data dalam aktivitas
+ tunggal.)
+</p>
+
+<h2 id="lifecycle">Daur Hidup Multi-Jendela</h2>
+
+<p>
+ Mode multi-jendela tidak mengubah <a href="{@docRoot}training/basics/activity-lifecycle/index.html">daur hidup
+ aktivitas</a>.
+</p>
+
+<p>
+ Dalam mode multi-jendela, hanya aktivitas yang paling sering digunakan pengguna
+ yang akan aktif pada waktu tertentu. Aktivitas ini dianggap <em>teratas</em>.
+ Semua aktivitas lainnya dalam keadaan berhenti sementara, sekalipun terlihat.
+ Akan tetapi, sistem memberikan aktivitas, yang berhenti-sementara-namun-terlihat ini, prioritas lebih tinggi
+ daripada aktivitas yang tidak terlihat. Jika pengguna berinteraksi dengan salah satu
+ aktivitas yang berhenti sementara, aktivitas tersebut akan dilanjutkan kembali, dan aktivitas
+ teratas sebelumnya akan dihentikan sementara.
+</p>
+
+<p class="note">
+ <strong>Catatan:</strong> Dalam mode multi-jendela, aplikasi bisa berada dalam keadaan berhenti sementara
+ dan masih terlihat oleh pengguna. Sebuah aplikasi mungkin perlu melanjutkan aktivitasnya
+ bahkan saat berhenti sementara. Misalnya, aplikasi pemutar video yang ada dalam
+ mode berhenti sementara namun terlihat harus tetap menampilkan videonya. Karena alasan
+ ini, kami menyarankan aktivitas yang memutar video <em>tidak</em> menghentikan sementara video
+ dalam handler {@link android.app.Activity#onPause onPause()} mereka.
+ Sebagai gantinya, aktivitas itu harus menghentikan sementara video di {@link android.app.Activity#onStop
+ onStop()}, dan melanjutkan pemutaran di {@link android.app.Activity#onStart
+ onStart()}.
+</p>
+
+<p>
+ Bila pengguna menempatkan aplikasi dalam mode multi-jendela, sistem akan memberi tahu
+ aktivitas tersebut mengenai perubahan konfigurasi, sebagaimana ditetapkan dalam <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
+ Waktu Proses</a>. Hal ini juga terjadi ketika pengguna mengubah skala aplikasi, atau menempatkan kembali aplikasi
+ ke mode layar penuh.
+ Pada dasarnya, perubahan ini memiliki implikasi daur hidup aktivitas yang sama
+ seperti saat sistem memberi tahu aplikasi bahwa perangkat telah beralih
+ dari mode potret ke mode lanskap, kecuali dimensi perangkat
+ telah berubah sebagai ganti bertukar posisi. Seperti yang dibahas di <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
+ Waktu Proses</a>, aktivitas Anda bisa menangani perubahan konfigurasi itu sendiri, atau
+ mengizinkan sistem memusnahkan aktivitas dan membuatnya kembali dengan dimensi
+ baru.
+</p>
+
+<p>
+ Jika pengguna mengubah ukuran jendela dan membuat dimensinya lebih besar, sistem
+ akan mengubah ukuran aktivitas untuk menyesuaikan dengan tindakan pengguna dan mengeluarkan <a href="{@docRoot}guide/topics/resources/runtime-changes.html">perubahan waktu proses</a>
+ bila diperlukan. Jika aplikasi tertinggal dibandingkan gambar di area yang baru diekspos,
+ sistem untuk sementara mengisi area tersebut dengan warna yang ditetapkan oleh atribut {@link
+ android.R.attr#windowBackground windowBackground} atau dengan atribut gaya
+ <code>windowBackgroundFallback</code> secara default.
+</p>
+
+<h2 id="configuring">Mengonfigurasi Aplikasi Anda untuk Mode Multi-Jendela</h2>
+
+<p>
+ Jika aplikasi Anda menargetkan Android N, Anda bisa mengonfigurasi bagaimana dan
+ apakah aktivitas aplikasi Anda mendukung tampilan multi-jendela. Anda bisa menyetel
+ atribut dalam manifes untuk mengontrol ukuran dan layoutnya.
+ Setelan atribut aktivitas root berlaku pada semua aktivitas
+ dalam tumpukan tugasnya. Misalnya, jika aktivitas root memiliki
+ <code>android:resizeableActivity</code> yang disetel ke true, maka semua aktivitas
+ dalam tumpukan tugas bisa diubah ukurannya.
+</p>
+
+<p class="note">
+ <strong>Catatan:</strong> Jika Anda membangun aplikasi multi-orientasi dengan versi
+ SDK lebih rendah dari Android N, dan pengguna menggunakan aplikasi
+ dalam mode multi-jendela, sistem akan mengubah ukuran aplikasi secara paksa. Sistem akan menampilkan kotak
+ dialog yang memperingatkan pengguna bahwa aplikasi mungkin berperilaku tidak terduga. Sistem
+ <em>tidak</em> mengubah ukuran aplikasi yang berorientasi tetap; jika
+ pengguna berusaha membuka aplikasi berorientasi tetap saat mode multi-jendela,
+ aplikasi akan menggunakan seluruh layar.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ Setel atribut ini dalam manifes <code><activity></code> Anda atau simpul
+ <code><application></code> untuk mengaktifkan atau menonaktifkan tampilan
+ multi-jendela:
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ Jika atribut ini disetel ke true, aktivitas bisa dijalankan di
+ mode layar terbagi dan mode bentuk bebas. Jika atribut ini disetel ke false, aktivitas
+ tidak akan mendukung mode multi-jendela. Jika nilai ini false, dan pengguna
+ berusaha memulai aktivitas dalam mode multi-jendela, aktivitas akan menggunakan
+ layar penuh.
+</p>
+
+<p>
+ Jika aplikasi Anda menargetkan Android N, namun Anda tidak menetapkan nilai
+ untuk atribut ini, nilai atribut default adalah true.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ Setel atribut ini dalam simpul <code><activity></code> manifes Anda untuk
+ menunjukkan apakah aktivitas mendukung tampilan gambar-dalam-gambar. Atribut ini
+ diabaikan jika <code>android:resizeableActivity</code> bernilai false.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">Atribut layout</h3>
+
+<p>
+ Dengan Android N, elemen manifes <code><layout></code>
+ mendukung beberapa atribut yang memengaruhi cara aktivitas berperilaku dalam
+ mode multi-jendela:
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ Lebar default aktivitas saat dijalankan dalam mode bentuk bebas.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ Tinggi default aktivitas saat dijalankan dalam mode bentuk bebas.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ Penempatan awal dari aktivitas saat dibuka dalam mode bentuk bebas. Lihat referensi
+ {@link android.view.Gravity} untuk mengetahui nilai yang cocok.
+ </dd>
+
+ <dt>
+ <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
+ </dt>
+
+ <dd>
+ Tinggi dan lebar minimum untuk aktivitas dalam mode layar terbagi
+ dan mode bentuk bebas. Jika pengguna memindahkan pembagi dalam mode layar terbagi
+ untuk membuat aktivitas lebih kecil dari minimum yang ditetapkan, sistem akan memangkas
+ aktivitas sesuai dengan ukuran yang diminta pengguna.
+ </dd>
+</dl>
+
+<p>
+ Misalnya, kode berikut menampilkan cara menetapkan ukuran dan lokasi default
+ aktivitas, dan ukuran minimumnya, bila aktivitas ditampilkan dalam
+ mode bentuk bebas:
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalHeight="450dp"
+ android:minimalWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">Menjalankan Aplikasi Anda dalam Mode Multi-Jendela</h2>
+
+<p>
+ Android N menawarkan fungsionalitas baru untuk mendukung aplikasi yang bisa berjalan
+ dalam mode multi-jendela.
+</p>
+
+<h3 id="disabled-features">Fitur yang dinonaktifkan dalam mode multi-jendela</h3>
+
+<p>
+ Fitur tertentu akan dinonaktifkan atau diabaikan bila perangkat berada dalam mode
+ multi-jendela, karena dianggap tidak logis bagi suatu aktivitas yang mungkin berbagi
+ layar perangkat dengan aktivitas atau aplikasi lainnya. Fitur tersebut meliputi:
+
+<ul>
+ <li>Beberapa opsi penyesuaian di <a href="{@docRoot}training/system-ui/index.html">System UI</a>
+ dinonaktifkan; misalnya, aplikasi tidak bisa menyembunyikan bilah status
+ jika tidak berjalan dalam mode layar penuh.
+ </li>
+
+ <li>Sistem akan mengabaikan perubahan pada atribut <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code>.
+ </li>
+</ul>
+
+<h3 id="change-notification">Pemberitahuan perubahan multi-jendela dan melakukan kueri</h3>
+
+<p>
+ Metode baru berikut telah ditambahkan ke kelas {@link android.app.Activity}
+ untuk mendukung tampilan multi-jendela. Untuk mengetahui detail tentang setiap
+ metode, lihat <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi N
+ Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.isInMultiWindowMode()</code>
+ </dt>
+
+ <dd>
+ Panggil untuk mengetahui apakah aktivitas berada dalam mode multi-jendela.
+ </dd>
+
+ <dt>
+ <code>Activity.isInPictureInPictureMode()</code>
+ </dt>
+
+ <dd>
+ Panggil untuk mengetahui apakah aktivitas berada dalam mode gambar-dalam-gambar.
+
+ <p class="note">
+ <strong>Catatan:</strong> Mode gambar-dalam-gambar adalah kasus khusus pada
+ mode multi-jendela. Jika <code>myActivity.isInPictureInPictureMode()</code>
+ mengembalikan nilai true, maka <code>myActivity.isInMultiWindowMode()</code> juga
+ mengembalikan nilai true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowModeChanged()</code>
+ </dt>
+
+ <dd>
+ Sistem akan memanggil metode ini bila aktivitas masuk atau keluar dari
+ mode multi-jendela. Sistem akan meneruskan ke metode sebuah nilai true jika
+ aktivitas tersebut memasuki mode multi-jendela, dan nilai false jika aktivitas
+ tersebut meninggalkan mode multi-jendela.
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureModeChanged()</code>
+ </dt>
+
+ <dd>
+ Sistem akan memanggil metode ini bila aktivitas masuk atau keluar dari
+ mode gambar-dalam-gambar. Sistem akan meneruskan ke metode sebuah nilai true jika
+ aktivitas tersebut memasuki mode gambar-dalam-gambar, dan nilai false jika aktivitas
+ tersebut meninggalkan mode gambar-dalam-gambar.
+ </dd>
+</dl>
+
+<p>
+ Ada juga versi {@link android.app.Fragment} untuk setiap
+ metode ini, misalnya <code>Fragment.isInMultiWindowMode()</code>.
+</p>
+
+<h3 id="entering-pip">Memasuki mode gambar-dalam-gambar</h3>
+
+<p>
+ Untuk menempatkan aktivitas dalam mode gambar-dalam-gambar, panggil metode baru
+ <code>Activity.enterPictureInPictureMode()</code>. Metode ini tidak berpengaruh jika
+ perangkat tidak mendukung mode gambar-dalam-gambar. Untuk informasi selengkapnya,
+ lihat dokumentasi <a href="picture-in-picture.html">Gambar-dalam-Gambar</a>.
+</p>
+
+<h3 id="launch">Meluncurkan Aktivitas Baru dalam Mode Multi-Jendela</h3>
+
+<p>
+ Bila meluncurkan aktivitas baru, Anda bisa memberi petunjuk pada sistem bahwa aktivitas
+ baru harus ditampilkan bersebelahan dengan aktivitas yang sedang aktif, jika memungkinkan. Caranya,
+ gunakan flag
+ <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Meneruskan
+ flag ini akan meminta perilaku berikut:
+</p>
+
+<ul>
+ <li>Jika perangkat berada dalam mode layar terbagi, sistem akan berupaya membuat
+ aktivitas baru di sebelah aktivitas yang meluncurkannya, sehingga kedua aktivitas tersebut
+ berbagi layar. Tidak ada jaminan sistem mampu melakukannya, namun sistem akan
+ membuat aktivitas bersebelahan jika memungkinkan.
+ </li>
+
+ <li>Jika perangkat tidak berada dalam mode layar terbagi, flag ini tidak akan berpengaruh.
+ </li>
+</ul>
+
+<p>
+ Jika perangkat dalam mode bentuk bebas dan Anda menjalankan aktivitas baru, Anda bisa
+ menetapkan dimensi aktivitas baru dan lokasi layar dengan memanggil
+ <code>ActivityOptions.setLaunchBounds()</code>. Metode ini tidak berpengaruh jika
+ perangkat tidak berada dalam mode multi-jendela.
+</p>
+
+<p class="note">
+ <strong>Catatan:</strong> Jika Anda meluncurkan aktivitas dalam tumpukan tugas, aktivitas
+ tersebut akan menggantikan aktivitas pada layar, dengan mewarisi semua
+ properti multi-jendelanya. Jika Anda ingin meluncurkan aktivitas baru sebagai jendela
+ terpisah dalam mode multi-jendela, Anda harus meluncurkannya dalam tumpukan tugas baru.
+</p>
+
+<h3 id="dnd">Mendukung seret dan lepas</h3>
+
+<p>
+ Pengguna bisa <a href="{@docRoot}guide/topics/ui/drag-drop.html">menyeret dan
+ melepas</a> data dari satu aktivitas ke aktivitas yang lain selagi kedua aktivitas
+ berbagi layar. (Sebelumnya, pengguna hanya bisa menyeret dan melepas data dalam
+ aktivitas tunggal.) Karena alasan ini, Anda mungkin perlu menambahkan fungsionalitas
+ seret dan lepas ke aplikasi jika aplikasi saat ini belum mendukungnya.
+</p>
+
+<p>
+ N Preview SDK menambahkan paket <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+ untuk mendukung seret dan lepas lintas-aplikasi. Untuk mengetahui detail tentang kelas dan metode
+ berikut, lihat <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi N
+ Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ Objek token bertanggung jawab menetapkan izin yang diberikan kepada aplikasi
+ yang menerima pelepasan tersebut.
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Alias baru untuk {@link android.view.View#startDrag View.startDrag()}. Untuk
+ mengaktifkan seret dan lepas lintas-aktivitas, teruskan flag baru
+ <code>View.DRAG_FLAG_GLOBAL</code>. Jika Anda perlu memberikan izin URI ke
+ aktivitas penerima, teruskan flag baru,
+ <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> atau
+ <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, sebagaimana mestinya.
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Membatalkan operasi seret yang sedang berlangsung. Hanya bisa dipanggil oleh
+ aplikasi yang menghasilkan operasi seret.
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ Menggantikan bayangan penyeretan untuk operasi seret yang sedang berlangsung. Hanya
+ bisa dipanggil oleh aplikasi yang menghasilkan operasi seret.
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ Meminta izin untuk URI materi yang diteruskan dengan {@link
+ android.content.ClipData} yang terdapat dalam {@link android.view.DragEvent}.
+ </dd>
+</dl>
+
+<h2 id="testing">Menguji Dukungan Multi-Jendela Aplikasi Anda</h2>
+
+<p>
+ Apakah Anda memperbarui aplikasi untuk Android N atau tidak, Anda harus
+ verifikasi bagaimana perilakunya di mode multi-jendela saat pengguna mencoba untuk menjalankannya
+ dalam mode multi-jendela pada perangkat yang menjalankan Android N.
+</p>
+
+<h3 id="configuring">Mengonfigurasi Perangkat Pengujian</h3>
+
+<p>
+ Jika Anda pasang Android N pada perangkat, mode
+ layar terbagi secara otomatis didukung.
+</p>
+
+<h3 id="test-non-n">Jika aplikasi Anda tidak dibangun dengan N Preview SDK</h3>
+
+<p>
+ Jika Anda tidak membangun aplikasi dengan N Preview SDK dan pengguna berupaya menggunakan
+ aplikasi dalam mode multi-jendela, sistem secara paksa akan mengubah ukuran aplikasi kecuali jika aplikasi
+ mendeklarasikan orientasi tetap.
+</p>
+
+<p>
+ Jika aplikasi Anda tidak mendeklarasikan orientasi tetap, Anda harus meluncurkan aplikasi
+ pada perangkat yang menjalankan Android N dan berupaya menempatkan aplikasi tersebut dalam
+ mode layar terbagi. Verifikasi pengalaman pengguna
+ bisa diterima bila aplikasi secara paksa diubah ukurannya.
+</p>
+
+<p>
+ Jika aplikasi mendeklarasikan orientasi tetap, Anda harus berupaya menempatkan aplikasi dalam
+ mode multi-jendela. Verifikasi apakah saat Anda melakukannya, aplikasi tetap berada dalam
+ mode layar penuh.
+</p>
+
+<h3 id="test-mw">Jika Anda mendukung mode multi-jendela</h3>
+
+<p>
+ Jika Anda membuat aplikasi Anda dengan N Preview SDK dan belum menonaktifkan
+ dukungan multi-jendela, verifikasi perilaku berikut dalam mode layar terbagi
+ dan mode bentuk bebas.
+</p>
+
+<ul>
+ <li>Luncurkan aplikasi dalam mode layar penuh, kemudian beralih ke mode multi-jendela dengan
+ menekan lama pada tombol Ringkasan. Verifikasi apakah aplikasi beralih dengan benar.
+ </li>
+
+ <li>Jalankan aplikasi secara langsung dalam mode multi-jendela, dan verifikasi aplikasi
+ diluncurkan dengan benar. Anda bisa meluncurkan aplikasi dalam mode multi-jendela dengan menekan
+ tombol Ringkasan, kemudian menekan lama baris judul pada aplikasi Anda dan menyeretnya
+ ke salah satu area yang disorot di layar.
+ </li>
+
+ <li>Ubah ukuran aplikasi Anda dalam mode layar terbagi dengan menyeret garis pembagi.
+ Verifikasi apakah aplikasi mengubah ukuran tanpa mogok, dan apakah elemen UI yang diperlukan
+ terlihat.
+ </li>
+
+ <li>Jika Anda telah menetapkan dimensi minimum aplikasi, cobalah untuk mengubah ukuran
+ aplikasi di bawah dimensi tersebut. Verifikasi apakah Anda tidak bisa mengubah ukuran aplikasi menjadi
+ lebih kecil dari minimum yang ditetapkan.
+ </li>
+
+ <li>Melalui semua pengujian, verifikasi apakah kinerja aplikasi Anda bisa diterima. Misalnya,
+ verifikasi apakah tidak ada jeda yang terlalu lama untuk memperbarui UI setelah
+ aplikasi diubah ukurannya.
+ </li>
+</ul>
+
+<h4 id="test-checklist">Daftar periksa pengujian</h4>
+
+<p>
+ Untuk verifikasi kinerja aplikasi Anda dalam mode multi-jendela, cobalah operasi
+ berikut. Anda harus mencoba semua operasi ini dalam mode layar terbagi dan
+ dan mode multi-jendela, kecuali jika dinyatakan berbeda.
+</p>
+
+<ul>
+ <li>Masuki dan tinggalkan mode multi-jendela.
+ </li>
+
+ <li>Beralih dari aplikasi Anda ke aplikasi lain, dan verifikasi apakah aplikasi berperilaku
+ sebagaimana mestinya saat terlihat namun tidak aktif. Misalnya, jika aplikasi Anda
+ sedang memutar video, verifikasi apakah video terus diputar selagi pengguna
+ berinteraksi dengan aplikasi lain.
+ </li>
+
+ <li>Dalam mode layar terbagi, cobalah menggeser garis pembagi untuk membuat aplikasi
+ Anda menjadi lebih besar dan lebih kecil. Coba operasi ini dalam konfigurasi berdampingan dan
+ atas-bawah. Verifikasi apakah aplikasi tidak mogok,
+ fungsionalitas penting bisa terlihat, dan operasi mengubah ukuran tidak memakan waktu terlalu
+ lama.
+ </li>
+
+ <li>Lakukan beberapa operasi ubah ukuran berturut-turut dalam waktu cepat. Verifikasi apakah
+ aplikasi Anda tidak mogok atau mengalami kebocoran memori. Untuk informasi tentang memeriksa penggunaan memori
+ aplikasi Anda, lihat <a href="{@docRoot}tools/debugging/debugging-memory.html">
+ Menyelidiki Penggunaan RAM Anda</a>.
+ </li>
+
+ <li>Gunakan aplikasi secara normal di sejumlah konfigurasi jendela yang berbeda, dan
+ verifikasi apakah aplikasi berperilaku sebagaimana mestinya. Verifikasi apakah teks terbaca, dan apakah
+ elemen UI tidak terlalu kecil untuk interaksi.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">Jika Anda telah menonaktifkan dukungan multi-jendela</h3>
+
+<p>
+ Jika Anda menonaktifkan dukungan multi-jendela dengan menyetel
+ <code>android:resizableActivity="false"</code>, Anda harus menjalankan aplikasi pada
+ perangkat yang menjalankan Android N dan berusaha menempatkan aplikasi dalam
+ mode bentuk bebas dan mode layar terbagi. Verifikasi apakah saat Anda melakukannya, aplikasi tetap berada dalam
+ mode layar penuh.
+</p>
diff --git a/docs/html-intl/intl/in/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/in/guide/topics/ui/notifiers/notifications.jd
index 9033b9f..bb48b80 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/notifiers/notifications.jd
@@ -147,7 +147,7 @@
</p>
<p>
Dalam {@link android.app.Notification}, tindakan itu sendiri didefinisikan oleh
- {@link android.app.PendingIntent} berisi
+ {@link android.app.PendingIntent} berisi
{@link android.content.Intent} yang memulai
{@link android.app.Activity} dalam aplikasi Anda. Untuk mengaitkan
{@link android.app.PendingIntent} dengan gestur, panggil metode
@@ -174,12 +174,12 @@
android.support.v4.app.NotificationCompat}. Ada
lima level prioritas, mulai dari {@link
android.support.v4.app.NotificationCompat#PRIORITY_MIN} (-2) hingga {@link
- android.support.v4.app.NotificationCompat#PRIORITY_MAX} (2); jika tidak diatur,
+ android.support.v4.app.NotificationCompat#PRIORITY_MAX} (2); jika tidak diatur,
prioritas default akan ditetapkan {@link
android.support.v4.app.NotificationCompat#PRIORITY_DEFAULT} (0).
</p>
<p> Untuk informasi tentang mengatur level prioritas, lihat "Mengatur
- dan mengelola prioritas pemberitahuan dengan benar" dalam panduan
+ dan mengelola prioritas pemberitahuan dengan benar" dalam panduan
Desain <a href="{@docRoot}design/patterns/notifications.html">Pemberitahuan</a>.
</p>
<!-- ------------------------------------------------------------------------------------------ -->
@@ -310,7 +310,7 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h2 id="Managing">Mengelola Pemberitahuan</h2>
<p>
- Bila perlu mengeluarkan pemberitahuan beberapa kali untuk tipe kejadian yang sama,
+ Bila perlu mengeluarkan pemberitahuan beberapa kali untuk tipe kejadian yang sama,
hindari membuat pemberitahuan yang sama sekali baru. Sebagai gantinya, Anda harus mempertimbangkan untuk memperbarui
pemberitahuan sebelumnya, baik dengan mengubah sebagian nilainya atau dengan menambahkan nilai, atau keduanya.
</p>
@@ -506,7 +506,7 @@
TaskStackBuilder.create()}.
</li>
<li>
- Tambahkan back-stack ke stack-builder dengan memanggil
+ Tambahkan back-stack ke stack-builder dengan memanggil
{@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()}.
Untuk setiap {@link android.app.Activity} dalam hierarki yang telah Anda definisikan dalam
manifes, back-stack berisi objek {@link android.content.Intent} yang
@@ -933,7 +933,7 @@
tampilan normal dibatasi hingga 64 dp, dan layout tampilan yang diperluas dibatasi hingga 256 dp.
</p>
<p>
- Untuk mendefinisikan layout pemberitahuan custom, mulailah dengan membuat instance
+ Untuk mendefinisikan layout pemberitahuan custom, mulailah dengan membuat instance
objek {@link android.widget.RemoteViews} yang memekarkan file layout XML. Kemudian,
sebagai ganti memanggil metode seperti
{@link android.support.v4.app.NotificationCompat.Builder#setContentTitle setContentTitle()},
diff --git a/docs/html-intl/intl/in/guide/topics/ui/overview.jd b/docs/html-intl/intl/in/guide/topics/ui/overview.jd
index a0b2b06..ca8b420 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>Untuk mendapatkan panduan lengkap mengenai pembuatan layout UI, lihat <a href="declaring-layout.html">Layout
XML</a>.
-
+
<h2 id="UIComponents">Komponen Antarmuka Pengguna</h2>
<p>Anda tidak harus membuat semua UI menggunakan objek {@link android.view.View} dan {link
diff --git a/docs/html-intl/intl/in/guide/topics/ui/settings.jd b/docs/html-intl/intl/in/guide/topics/ui/settings.jd
index 5ac61f9..89be52f 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/settings.jd
@@ -82,7 +82,7 @@
<img src="{@docRoot}images/ui/settings/settings.png" alt="" width="435" />
<p class="img-caption"><strong>Gambar 1.</strong> Cuplikan layar dari pengaturan
-aplikasi Messaging Android. Memilih item yang didefinisikan oleh {@link android.preference.Preference}
+aplikasi Messaging Android. Memilih item yang didefinisikan oleh {@link android.preference.Preference}
akan membuka antarmuka untuk mengubah pengaturan.</p>
@@ -163,7 +163,7 @@
java.lang.String}.</dd>
</dl>
-<p>Lihat kelas {@link android.preference.Preference} untuk mengetahui daftar subkelas lain dan
+<p>Lihat kelas {@link android.preference.Preference} untuk mengetahui daftar subkelas lain dan
propertinya.</p>
<p>Tentu saja, kelas bawaan tidak mengakomodasi setiap kebutuhan dan aplikasi Anda mungkin memerlukan
@@ -226,7 +226,7 @@
<dt>{@code android:key}</dt>
<dd>Atribut ini diperlukan untuk preferensi yang mempertahankan nilai data. Ini menetapkan kunci
unik (string) yang digunakan sistem saat menyimpan nilai pengaturan ini dalam {@link
-android.content.SharedPreferences}.
+android.content.SharedPreferences}.
<p>Instance satu-satunya di mana atribut ini <em>tidak diperlukan</em> adalah bila preferensi berupa
{@link android.preference.PreferenceCategory} atau {@link android.preference.PreferenceScreen}, atau
preferensi menetapkan {@link android.content.Intent} untuk dipanggil (dengan elemen <a href="#Intents">{@code <intent>}</a>) atau {@link android.app.Fragment} untuk ditampilkan (dengan atribut <a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -370,12 +370,12 @@
<dl>
<dt>{@code android:action}</dt>
- <dd>Tindakan yang akan ditetapkan, sesuai metode
+ <dd>Tindakan yang akan ditetapkan, sesuai metode
{@link android.content.Intent#setAction setAction()}.</dd>
<dt>{@code android:data}</dt>
<dd>Data yang akan ditetapkan, sesuai metode {@link android.content.Intent#setData setData()}.</dd>
<dt>{@code android:mimeType}</dt>
- <dd>Tipe MIME yang akan ditetapkan, sesuai metode
+ <dd>Tipe MIME yang akan ditetapkan, sesuai metode
{@link android.content.Intent#setType setType()}.</dd>
<dt>{@code android:targetClass}</dt>
<dd>Bagian kelas dari nama komponen, sesuai metode {@link android.content.Intent#setComponent
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -672,15 +672,15 @@
akan dimuat.</p>
<p>Misalnya, ini adalah file XML untuk header preferensi yang menggunakan Android 3.0
-dan yang lebih tinggi ({@code res/xml/preference_headers.xml}):</p>
+dan yang lebih tinggi ({@code res/xml/preference_headers.xml}):</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -692,18 +692,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -879,7 +879,7 @@
});
</pre>
-<p>Sebagai gantinya, simpan referensi ke listener dalam bidang data instance
+<p>Sebagai gantinya, simpan referensi ke listener dalam bidang data instance
objek yang akan ada selama listener dibutuhkan:</p>
<pre>
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/in/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/in/guide/topics/ui/ui-events.jd
index 5068176..0307b34 100644
--- a/docs/html-intl/intl/in/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/ui-events.jd
@@ -26,11 +26,11 @@
metode <code>onTouchEvent()</code> akan dipanggil pada objek itu. Akan tetapi, untuk mencegatnya, Anda harus memperluas
kelas dan mengesampingkan metode itu. Akan tetapi, memperluas setiap objek View
untuk menangani kejadian seperti itu tidaklah praktis. Karena itulah kelas View juga berisi
-sekumpulan antarmuka tersarang dengan callback yang jauh lebih mudah didefinisikan. Antarmuka ini,
+sekumpulan antarmuka tersarang dengan callback yang jauh lebih mudah didefinisikan. Antarmuka ini,
yang disebut <a href="#EventListeners">event listener</a>, merupakan tiket Anda untuk menangkap interaksi pengguna dengan UI.</p>
<p>Walaupun Anda akan lebih sering menggunakan event listener ini untuk interaksi pengguna,
-mungkin ada saatnya Anda ingin memperluas kelas View, untuk membuat komponen custom.
+mungkin ada saatnya Anda ingin memperluas kelas View, untuk membuat komponen custom.
Mungkin Anda ingin memperluas kelas {@link android.widget.Button}
untuk membuat sesuatu yang lebih menarik. Dalam hal ini, Anda akan dapat mendefinisikan perilaku kejadian default untuk kelas Anda dengan menggunakan
kelas <a href="#EventHandlers">event handler</a>.</p>
@@ -46,28 +46,28 @@
<dl>
<dt><code>onClick()</code></dt>
- <dd>Dari {@link android.view.View.OnClickListener}.
+ <dd>Dari {@link android.view.View.OnClickListener}.
Ini dipanggil baik saat pengguna menyentuh item
(bila dalam mode sentuh), maupun memfokuskan pada item dengan tombol navigasi atau trackball dan
menekan tombol "enter" yang sesuai atau menekan trackball.</dd>
<dt><code>onLongClick()</code></dt>
- <dd>Dari {@link android.view.View.OnLongClickListener}.
- Ini dipanggil baik saat pengguna menyentuh dan menahan item (bila dalam mode sentuh),
+ <dd>Dari {@link android.view.View.OnLongClickListener}.
+ Ini dipanggil baik saat pengguna menyentuh dan menahan item (bila dalam mode sentuh),
maupun memfokuskan pada item dengan tombol navigasi atau trackball dan
menekan serta menahan tombol "enter" yang sesuai atau menekan dan menahan trackball (selama satu detik).</dd>
<dt><code>onFocusChange()</code></dt>
- <dd>Dari {@link android.view.View.OnFocusChangeListener}.
+ <dd>Dari {@link android.view.View.OnFocusChangeListener}.
Ini dipanggil saat pengguna menyusuri ke atau dari item, dengan menggunakan tombol navigasi atau trackball.</dd>
<dt><code>onKey()</code></dt>
- <dd>Dari {@link android.view.View.OnKeyListener}.
+ <dd>Dari {@link android.view.View.OnKeyListener}.
Ini dipanggil saat pengguna memfokuskan pada item dan menekan atau melepas tombol fisik pada perangkat.</dd>
<dt><code>onTouch()</code></dt>
- <dd>Dari {@link android.view.View.OnTouchListener}.
+ <dd>Dari {@link android.view.View.OnTouchListener}.
Ini dipanggil saat pengguna melakukan tindakan yang digolongkan sebagai kejadian sentuh, termasuk penekanan, pelepasan,
atau gerak perpindahan pada layar (dalam batasan item itu).</dd>
<dt><code>onCreateContextMenu()</code></dt>
- <dd>Dari {@link android.view.View.OnCreateContextMenuListener}.
- Ini dipanggil saat Menu Konteks sedang dibuat (akibat "klik lama" terus-menerus). Lihat diskusi
+ <dd>Dari {@link android.view.View.OnCreateContextMenuListener}.
+ Ini dipanggil saat Menu Konteks sedang dibuat (akibat "klik lama" terus-menerus). Lihat diskusi
tentang menu konteks di panduan pengembang <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Menu</a>.
</dd>
</dl>
@@ -75,8 +75,8 @@
<p>Metode ini satu-satunya yang menempati antarmukanya masing-masing. Untuk mendefinisikan salah satu metode ini
dan menangani kejadian Anda, implementasikan antarmuka tersarang dalam Aktivitas Anda atau definisikan sebagai kelas anonim.
Kemudian, teruskan satu
-instance implementasi Anda pada masing-masing metode <code>View.set...Listener()</code>. (Misalnya, panggil
-<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
+instance implementasi Anda pada masing-masing metode <code>View.set...Listener()</code>. (Misalnya, panggil
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
dan teruskan implementasi {@link android.view.View.OnClickListener OnClickListener} Anda.)</p>
<p>Contoh di bawah menunjukkan cara mendaftarkan on-click listener untuk Button. </p>
@@ -121,20 +121,20 @@
nilai hasil, namun beberapa metode event listener lainnya harus mengembalikan boolean. Sebabnya
bergantung pada kejadian. Untuk sebagian yang mengembalikan boolean, ini sebabnya:</p>
<ul>
- <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
- Ini mengembalikan boolean untuk menunjukkan apakah Anda telah menggunakan kejadian dan tidak boleh dibawa lebih jauh.
- Yaitu, mengembalikan <em>benar</em> untuk menunjukkan apakah Anda telah menangani kejadian dan semestinya berhenti di sini;
+ <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
+ Ini mengembalikan boolean untuk menunjukkan apakah Anda telah menggunakan kejadian dan tidak boleh dibawa lebih jauh.
+ Yaitu, mengembalikan <em>benar</em> untuk menunjukkan apakah Anda telah menangani kejadian dan semestinya berhenti di sini;
mengembalikan <em>salah</em> jika Anda tidak menanganinya dan/atau kejadian semestinya berlanjut ke
on-click listener lainnya.</li>
- <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
+ <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
Ini mengembalikan boolean untuk menunjukkan apakah Anda telah menggunakan kejadian dan tidak boleh dibawa lebih jauh.
- Yaitu, mengembalikan <em>benar</em> untuk menunjukkan apakah Anda telah menangani kejadian dan semestinya berhenti di sini;
+ Yaitu, mengembalikan <em>benar</em> untuk menunjukkan apakah Anda telah menangani kejadian dan semestinya berhenti di sini;
mengembalikan <em>salah</em> jika Anda tidak menanganinya dan/atau kejadian semestinya berlanjut ke
on-key listener lainnya.</li>
- <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
- Ini mengembalikan boolean untuk menunjukkan apakah listener Anda telah menggunakan kejadian ini. Yang penting adalah
-kejadian ini bisa memiliki beberapa tindakan yang saling mengikuti. Jadi, jika Anda mengembalikan <em>salah</em>saat
-kejadian tindakan turun diterima, itu menunjukkan bahwa Anda belum menggunakan kejadian itu dan juga
+ <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
+ Ini mengembalikan boolean untuk menunjukkan apakah listener Anda telah menggunakan kejadian ini. Yang penting adalah
+kejadian ini bisa memiliki beberapa tindakan yang saling mengikuti. Jadi, jika Anda mengembalikan <em>salah</em>saat
+kejadian tindakan turun diterima, itu menunjukkan bahwa Anda belum menggunakan kejadian itu dan juga
tidak tertarik dengan tindakan berikutnya dari kejadian ini. Karena itu, Anda tidak akan diminta untuk melakukan tindakan
lainnya dalam kejadian, seperti gerakan jari, atau kejadian tindakan naik yang akan terjadi.</li>
</ul>
@@ -142,12 +142,12 @@
<p>Ingatlah bahwa kejadian tombol fisik selalu disampaikan ke View yang sedang difokus. Kejadian ini dikirim mulai dari atas
hierarki View, kemudian turun hingga tujuan yang sesuai. Jika View Anda (atau anak View Anda)
saat ini sedang fokus, maka Anda dapat melihat kejadian berpindah melalui metode.<code>{@link android.view.View#dispatchKeyEvent(KeyEvent)
-dispatchKeyEvent()}</code> Sebagai pengganti untuk menangkap kejadian penting melalui View, Anda juga dapat menerima
+dispatchKeyEvent()}</code> Sebagai pengganti untuk menangkap kejadian penting melalui View, Anda juga dapat menerima
semua kejadian dalam Aktivitas Anda dengan <code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code>
dan <code>{@link android.app.Activity#onKeyUp(int,KeyEvent) onKeyUp()}</code>.</p>
<p>Selain itu, saat memikirkan tentang input teks aplikasi Anda, ingatlah bahwa banyak perangkat yang hanya memiliki
-metode input perangkat lunak. Metode seperti itu tidak harus berbasis tombol; sebagian mungkin menggunakan input suara, tulisan tangan, dan seterusnya. Meskipun
+metode input perangkat lunak. Metode seperti itu tidak harus berbasis tombol; sebagian mungkin menggunakan input suara, tulisan tangan, dan seterusnya. Meskipun
metode input menyajikan antarmuka seperti keyboard, itu umumnya <strong>tidak</strong> memicu keluarga kejadian
<code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code>. Anda sama sekali tidak boleh
membangun UI yang mengharuskan penekanan tombol tertentu dikontrol kecuali jika Anda ingin membatasi aplikasi Anda pada perangkat yang memiliki
@@ -157,14 +157,14 @@
tentang bagaimana metode input perangkat lunak seharusnya bekerja dan percayalah bahwa metode akan menyediakan teks yang sudah diformat bagi aplikasi Anda.</p>
<p class="note"><strong>Catatan:</strong> Android akan memanggil event handler terlebih dahulu kemudian handler
-default yang sesuai dari definisi kelas. Karena itu, mengembalikan <em>benar</em> dari event listener ini akan menghentikan
-penyebaran kejadian ke event listener lain dan juga akan memblokir callback ke
+default yang sesuai dari definisi kelas. Karena itu, mengembalikan <em>benar</em> dari event listener ini akan menghentikan
+penyebaran kejadian ke event listener lain dan juga akan memblokir callback ke
event handler default di View. Pastikan bahwa Anda ingin mengakhiri kejadian saat mengembalikan <em>true</em>.</p>
<h2 id="EventHandlers">Event Handler</h2>
-<p>Jika Anda membuat komponen custom dari View, maka Anda dapat mendefinisikan penggunaan beberapa
+<p>Jika Anda membuat komponen custom dari View, maka Anda dapat mendefinisikan penggunaan beberapa
metode callback sebagai event handler default.
Dalam dokumen tentang <a href="{@docRoot}guide/topics/ui/custom-components.html">Komponen
Custom</a>, Anda akan melihat penggunaan beberapa callback umum untuk penanganan kejadian,
@@ -176,19 +176,19 @@
<li><code>{@link android.view.View#onTouchEvent}</code> - Dipanggil bila terjadi kejadian gerakan layar sentuh.</li>
<li><code>{@link android.view.View#onFocusChanged}</code> - Dipanggil bila View memperoleh atau kehilangan fokus.</li>
</ul>
-<p>Ada beberapa metode lain yang harus Anda ketahui, yang bukan bagian dari kelas View,
+<p>Ada beberapa metode lain yang harus Anda ketahui, yang bukan bagian dari kelas View,
namun bisa berdampak langsung pada kemampuan Anda menangani kejadian. Jadi, saat mengelola kejadian yang lebih kompleks dalam
layout, pertimbangkanlah metode-metode lain ini:</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code> - Ini memungkinkan {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code> - Ini memungkinkan {@link
android.app.Activity} Anda mencegat semua kejadian sentuh sebelum dikirim ke jendela.</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - Ini memungkinkan {@link
android.view.ViewGroup} memantau kejadian saat dikirim ke View anak.</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - Panggil ini
- pada View induk untuk menunjukan larangan mencegat kejadian sentuh dengan <code>{@link
+ pada View induk untuk menunjukan larangan mencegat kejadian sentuh dengan <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>.</li>
</ul>
@@ -199,11 +199,11 @@
yang akan menerima input. Akan tetapi jika perangkat memiliki kemampuan sentuh, dan pengguna
mulai berinteraksi dengan antarmuka dengan menyentuhnya, maka Anda tidak perlu lagi
menyorot item, atau memfokuskan pada View tertentu. Karena itu, ada mode
-untuk interaksi yang bernama "mode sentuh".
+untuk interaksi yang bernama "mode sentuh".
</p>
<p>
Untuk perangkat berkemampuan sentuh, setelah pengguna menyentuh layar, perangkat
-akan masuk ke mode sentuh. Dari sini dan selanjutnya, hanya View dengan
+akan masuk ke mode sentuh. Dari sini dan selanjutnya, hanya View dengan
{@link android.view.View#isFocusableInTouchMode} benar yang akan dapat difokus, seperti widget pengedit teks.
View lain yang dapat disentuh, seperti tombol, tidak akan difokus bila disentuh; View ini akan
langsung memicu on-click listener bila ditekan.
@@ -214,7 +214,7 @@
dengan antarmuka pengguna tanpa menyentuh layar.
</p>
<p>
-Status mode sentuh dipertahankan di seluruh sistem (semua jendela dan aktivitas).
+Status mode sentuh dipertahankan di seluruh sistem (semua jendela dan aktivitas).
Untuk query status saat ini, Anda bisa memanggil
{@link android.view.View#isInTouchMode} untuk mengetahui apakah perangkat saat ini sedang dalam mode sentuh.
</p>
@@ -257,7 +257,7 @@
mendefinisikan Button bawah sebagai <var>nextFocusUp</var> (dan sebaliknya), fokus navigasi akan
silih berganti dari atas ke bawah dan bawah ke atas.</p>
-<p>Jika Anda ingin mendeklarasikan View sebagai dapat difokus dalam UI (bila biasanya tidak dapat difokus),
+<p>Jika Anda ingin mendeklarasikan View sebagai dapat difokus dalam UI (bila biasanya tidak dapat difokus),
tambahkan atribut XML <code>android:focusable</code> ke View, dalam deklarasi layout Anda.
Atur nilai <var>true</var>. Anda juga bisa mendeklarasikan View
sebagai dapat difokus saat dalam Mode Sentuh dengan <code>android:focusableInTouchMode</code>.</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/in/preview/_book.yaml b/docs/html-intl/intl/in/preview/_book.yaml
deleted file mode 100644
index 88d6c71..0000000
--- a/docs/html-intl/intl/in/preview/_book.yaml
+++ /dev/null
@@ -1,342 +0,0 @@
-toc:
-- title: Ringkasan Program
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ringkasan Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: Dukungan dan Catatan Rilis
- path: /preview/support.html
-
-- title: Menyiapkan Pratinjau
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Pratinjau
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: Menguji pada Perangkat
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Pruebe en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: Perubahan Perilaku
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: Optimalisasi Latar Belakang
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: Bahasa dan Lokal
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 總覽
- section:
- - title: Dukungan Multi-Jendela
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: Pemberitahuan
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: Data Saver
- path: /preview/features/data-saver.html
- - title: Perekaman TV
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: Konfigurasi Keamanan Jaringan
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: Dukungan ICU4J
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: API de ICU4J del framework de Android
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android 框架 API
- - name: zh-tw-lang
- value: ICU4J Android 架構 API
- - title: Fitur Bahasa Java 8
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 语言功能
- - name: zh-tw-lang
- value: Java 8 語言功能
- - title: Pembaruan Android for Work
- path: /preview/features/afw.html
- - title: Scoped Directory Access
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: Contoh
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: Perjanjian Lisensi
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html-intl/intl/in/preview/api-overview.jd b/docs/html-intl/intl/in/preview/api-overview.jd
deleted file mode 100644
index b0a0317..0000000
--- a/docs/html-intl/intl/in/preview/api-overview.jd
+++ /dev/null
@@ -1,1039 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Fitur-fitur Utama bagi Pengembang</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">Dukungan Multi-Jendela</a></li>
- <li><a href="#notification_enhancements">Pemberitahuan</a></li>
- <li><a href="#jit_aot">Kompilasi JIT/AOT</a></li>
- <li><a href="#quick_path_to_app_install">Jalur Cepat untuk Pasang Aplikasi</a></li>
- <li><a href="#doze_on_the_go">Istirahatkan Kapan Saja</a></li>
- <li><a href="#background_optimizations">Optimalisasi Latar Belakang</a></li>
- <li><a href="#data_saver">Data Saver</a></li>
- <li><a href="#vulkan">Vulkan API</a></li>
- <li><a href="#tile_api">Quick Settings Tile API</a></li>
- <li><a href="#number-blocking">Pemblokiran Nomor</a></li>
- <li><a href="#call_screening">Penyaringan Panggilan</a></li>
- <li><a href="#multi-locale_languages">Lokal dan Bahasa</a></li>
- <li><a href="#emoji">Emoji Baru</a></li>
- <li><a href="#icu4">ICU4J API di Android</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Perekaman Android TV</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">Aksesibilitas</a></li>
- <li><a href="#direct_boot">Direct Boot</a></li>
- <li><a href="#key_attestation">Key Attestation</a></li>
- <li><a href="#network_security_config">Network Security Config</a></li>
- <li><a href="#default_trusted_ca">CA Tepercaya Default</a></li>
- <li><a href="#apk_signature_v2">APK Signature Scheme V2</a></li>
- <li><a href="#scoped_directory_access">Scoped Directory Access</a></li>
- <li><a href="#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a></li>
- <li><a href="#sustained_performance_api">Sustained Performance API</a></li>
- <li><a href="#vr">Dukungan VR</a></li>
- <li><a href="#print_svc">Penyempurnaan Layanan Cetak</a></li>
- <li><a href="#virtual_files">File Maya</a></li>
- <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N masih dalam pengembangan aktif, namun Anda bisa mencobanya
-sekarang sebagai bagian dari N Developer Preview. Bagian-bagian di bawah ini akan menyoroti sebagian dari
-fitur baru untuk pengembang. </p>
-
-<p>
- Pastikan memeriksa <a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a> untuk mengetahui selengkapnya tentang
- bagian-bagian perubahan platform yang bisa memengaruhi aplikasi Anda, lihatlah
- panduan pengembang untuk mengetahui selengkapnya tentang fitur-fitur utama, dan unduh <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> untuk mengetahui detail tentang
- API baru.
-</p>
-
-<h2 id="multi-window_support">Dukungan Multi-Jendela</h2>
-
-
-<p>Di Android N, kami memperkenalkan fitur multitasking baru dan yang banyak diminta
-ke dalam platform — dukungan multi-jendela. </p>
-
- <p>Pengguna sekarang bisa membuka dua aplikasi sekaligus di layar. </p>
- <ul>
- <li>Pada ponsel dan tablet
-yang menjalankan Android N, pengguna bisa menjalankan dua aplikasi secara berdampingan atau
-satu aplikasi di atas yang lain dalam mode layar terbagi. Pengguna bisa mengubah ukuran aplikasi dengan menyeret
-pembagi di antara keduanya. </li>
-
-<li>Pada perangkat Android TV, aplikasi bisa menempatkan dirinya sendiri dalam <a href="{@docRoot}preview/features/picture-in-picture.html">mode
-gambar-dalam-gambar</a>, sehingga aplikasi bisa terus menampilkan materi sementara pengguna menjelajahi atau
-berinteraksi dengan aplikasi lain.</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>Gambar 1.</strong> Aplikasi yang berjalan dalam mode layar terbagi.
-</p>
-
- </div>
-
-<p>Khususnya pada tablet dan perangkat yang berlayar lebih besar lainnya, dukungan multi-jendela
-memberi Anda cara baru untuk memikat pengguna. Anda bahkan bisa mengaktifkan fitur seret-dan-lepas di
-aplikasi untuk memudahkan pengguna menyeret materi ke dan dari aplikasi — cara bagus
-untuk menyempurnakan pengalaman pengguna Anda. </p>
-
-<p>Tidak sulit menambahkan dukungan multi-jendela ke aplikasi Anda dan mengonfigurasi cara
-menangani tampilan multi-jendela. Misalnya, Anda bisa menetapkan dimensi
-minimum yang diizinkan aktivitas, sehingga mencegah pengguna mengubah ukuran aktivitas di bawah
-ukuran itu. Anda juga bisa menonaktifkan tampilan multi-jendela untuk aplikasi Anda, yang
- akan memastikan sistem hanya menampilkan aplikasi dalam mode layar penuh.</p>
-
-<p>
- Untuk informasi selengkapnya, lihat dokumentasi pengembang <a href="{@docRoot}preview/features/multi-window.html">Dukungan Multi-Jendela</a>.
-
-</p>
-
-<h2 id="notification_enhancements">Penyempurnaan Pemberitahuan</h2>
-
-<p>Di Android N kami telah mengubah desain pemberitahuan agar lebih mudah dan lebih cepat
-digunakan. Beberapa perubahan tersebut antara lain:</p>
-
-<ul>
- <li>
- <strong>Pembaruan template</strong>: Kami telah memperbarui template pemberitahuan untuk
- lebih menekankan citra pahlawan dan avatar. Pengembang akan dapat
- memanfaatkan template baru dengan penyesuaian kode yang minimal.
- </li>
-
- <li>
- <strong>Penyesuaian gaya pesan</strong>: Anda bisa menyesuaikan lebih banyak
- label antarmuka pengguna yang berkaitan dengan pemberitahuan Anda menggunakan kelas
- <code>MessageStyle</code>. Anda bisa mengonfigurasi pesan, judul percakapan,
- dan tampilan materi.
- </li>
-
- <li>
- <strong>Bundel pemberitahuan</strong>: Sistem bisa mengelompokkan pesan,
- misalnya menurut topik pesan, dan menampilkan kelompok pesan tersebut. Seorang pengguna bisa
- bertindak, misalnya Tutup atau Arsipkan, atas pesan yang ditampilkan. Jika Anda sudah
- mengimplementasikan pemberitahuan untuk Android Wear, Anda akan terbiasa dengan
- model ini.
- </li>
-
- <li>
- <strong>Balasan Langsung</strong>: Untuk aplikasi komunikasi real-time, sistem
- Android mendukung balasan inline sehingga pengguna bisa dengan cepat membalas
- SMS atau pesan teks secara langsung dari dalam antarmuka pemberitahuan.
- </li>
-
- <li>
- <strong>Tampilan khusus</strong>: Dua API baru memungkinkan Anda memanfaatkan dekorasi sistem,
- misalnya header pemberitahuan dan tindakan, saat menggunakan tampilan
- khusus dalam pemberitahuan.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>Gambar 2.</strong> Bundel pemberitahuan dan balasan langsung.
-</p>
-
-<p>Untuk mengetahui cara mengimplementasikan fitur-fitur
- baru ini, lihat panduan <a href="{@docRoot}preview/features/notification-updates.html">Pemberitahuan</a>.
-</p>
-
-
-
-<h2 id="jit_aot">Kompilasi JIT/AOT yang dipandu profil</h2>
-
-<p>Di Android N, kami telah menambahkan compiler Just in Time (JIT) dengan pembuatan profil kode ke
-ART, yang memungkinkannya terus meningkatkan kinerja aplikasi Android saat
-dijalankan. Compiler JIT melengkapi compiler Ahead of Time (AOT) pada ART
-dan membantu memperbaiki kinerja waktu proses, menghemat ruang penyimpanan, dan mempercepat
-pembaruan aplikasi serta pembaruan sistem.</p>
-
-<p>Kompilasi yang dipandu profil memungkinkan ART mengelola kompilasi AOT/JIT untuk setiap aplikasi
-sesuai dengan penggunaan sebenarnya, serta kondisi pada perangkat. Misalnya
-,ART menyimpan profil setiap metode terbaik aplikasi dan bisa melakukan kompilasi lebih awal
-serta menyimpan sementara metode-metode tersebut di cache untuk mendapatkan kinerja terbaik. Hal ini membuat bagian lain dari aplikasi
-dibiarkan tidak dikompilasi hingga benar-benar digunakan.</p>
-
-<p>Di samping meningkatkan kinerja bagian-bagian penting aplikasi, kompilasi yang dipandu profil
-membantu mengurangi footprint RAM keseluruhan aplikasi, termasuk biner
-terkait. Fitur ini terutama penting pada perangkat dengan memori minim.</p>
-
-<p>ART mengelola kompilasi yang dipandu profil dengan cara yang meminimalkan dampak terhadap
-baterai perangkat. ART melakukan prakompilasi hanya bila perangkat sedang diam dan
-mengisi daya, sehingga menghemat waktu dan baterai dengan melakukan pekerjaan tersebut di awal.</p>
-
-<h2 id="quick_path_to_app_install">Jalur Cepat untuk Pasang Aplikasi</h2>
-
-<p>Salah satu manfaat paling nyata dari compiler JIT pada ART adalah kecepatan
-pemasnagan aplikasi dan pembaruan sistem. Bahkan aplikasi besar yang membutuhkan beberapa menit untuk
-dioptimalkan dan dipasang di Android 6.0 sekarang bisa dipasang hanya dalam hitungan
-detik. Pembaruan sistem juga lebih cepat, karena tidak ada lagi langkah optimalisasi. </p>
-
-<h2 id="doze_on_the_go">Istirahatkan Kapan Saja...</h2>
-
-<p>Android 6.0 memperkenalkan Istirahatkan, yaitu mode sistem yang menghemat baterai dengan menangguhkan
-aktivitas CPU dan jaringan di aplikasi bila perangkat sedang diam, misalnya saat
-diletakkan di atas meja atau dalam laci. </p>
-
-<p>Sekarang di Android N, Istirahatkan selangkah lebih maju dalam menghemat baterai kapan saja.
-Setiap kali layar mati dalam jangka waktu tertentu dan perangkat tidak terhubung ke sumber daya,
-Istirahatkan akan menerapkan subset pembatasan umum CPU dan jaringan pada aplikasi.
-Artinya pengguna bisa menghemat daya baterai meskipun perangkat dibawa di dalam
-tasnya.</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>Gambar 3.</strong> Istirahatkan sekarang menerapkan
- pembatasan untuk meningkatkan daya tahan baterai bahkan saat perangkat sedang tidak diam.
-</p>
-
-
-<p>Tidak lama setelah layar dimatikan saat perangkat menggunakan daya baterai, Istirahatkan
-akan membatasi akses jaringan serta menangguhkan pekerjaan dan sinkronisasi. Selama jeda
-pemeliharaan, aplikasi diizinkan mengakses jaringan dan menjalankan semua
-pekerjaan/sinkronisasi yang ditangguhkan. Menyalakan layar atau mencolokkan perangkat akan mengeluarkan
-perangkat dari Istirahatkan.</p>
-
-<p>Bila perangkat dalam kondisi diam lagi, dengan layar mati dan menggunakan daya baterai selama
-jangka waktu tertentu, Istirahatkan akan menerapkan pembatasan CPU dan jaringan pada {@link
-android.os.PowerManager.WakeLock}, alarm {@link android.app.AlarmManager}, dan
-pemindaian GPS/Wi-Fi.</p>
-
-<p>Praktik terbaik untuk menyesuaikan aplikasi Anda dengan Istirahatkan adalah sama, baik
-perangkat sedang bergerak maupun diam, jadi jika Anda sudah memperbarui aplikasi untuk
-menjalankan Istirahatkan dengan lancar, berarti Anda sudah siap. Jika belum, mulailah <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">menyesuaikan
-aplikasi Anda dengan Istirahatkan</a> sekarang juga.</p>
-
-<h2 id="background_optimizations">Project Svelte: Optimalisasi Latar Belakang</h2>
-
-<p>Project Svelte merupakan upaya berkelanjutan untuk meminimalkan penggunaan RAM oleh sistem dan aplikasi
-di semua jenis perangkat Android dalam ekosistem. Di Android N, Project
-Svelte berfokus pada optimalisasi cara aplikasi berjalan di latar belakang. </p>
-
-<p>Proses latar belakang merupakan bagian terpenting dari sebagian besar aplikasi. Bila ditangani dengan benar, proses
-ini bisa memberikan pengalaman pengguna yang mengagumkan — segera, cepat, dan sesuai konteks.
-Bila tidak ditangani dengan benar, proses latar belakang bisa menguras RAM (dan
-baterai) yang sebenarnya tidak perlu serta memengaruhi kinerja sistem untuk aplikasi lain. </p>
-
-<p>Sejak Android 5.0, {@link android.app.job.JobScheduler} telah menjadi
-cara yang disukai untuk melakukan pekerjaan latar belakang dengan cara yang baik
-bagi pengguna. Aplikasi bisa menjadwalkan pekerjaan sekaligus memungkinkan sistem mengoptimalkan berdasarkan
-kondisi memori, daya, dan konektivitas. JobScheduler menawarkan kontrol serta
-kemudahan, dan kami ingin semua aplikasi menggunakannya. </p>
-
-<p>
- Opsi baik lainnya adalah <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GCMNetworkManager</code></a>, bagian dari Google Play Services, yang
- menawarkan penjadwalan pekerjaan serupa dengan kompatibilitas pada semua versi lawas
- Android.
-</p>
-
-<p>Kami terus memperluas <code>JobScheduler</code> dan
-<code>GCMNetworkManager</code> untuk memenuhi lebih banyak
-kasus penggunaan Anda — misalnya, di Android N Anda sekarang bisa menjadwalkan pekerjaan
-latar belakang berdasarkan perubahan di Content Providers. Pada saat yang sama kami mulai
-menghilangkan beberapa pola lama yang bisa mengurangi kinerja sistem,
-terutama pada perangkat yang minim memori.</p>
-
-<p>Di Android N kami membuang tiga siaran implisit yang umum digunakan —
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
- android.hardware.Camera#ACTION_NEW_PICTURE}, dan {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} — karena ketiganya bisa mengaktifkan
-proses latar belakang pada beberapa aplikasi sekaligus serta menguras memori dan baterai. Jika
-aplikasi Anda menerimanya, manfaatkan N Developer Preview untuk
- beralih ke <code>JobScheduler</code> dan API terkait sebagai gantinya. </p>
-
-<p>
- Lihat dokumentasi <a href="{@docRoot}preview/features/background-optimization.html">Optimalisasi
- Latar Belakang</a> untuk mengetahui detailnya.
-</p>
-
-
-<h2 id="data_saver">Data Saver</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>Gambar 4.</strong> Data Saver di Settings.
-</p>
- </div>
-
-<p>Selama penggunaan perangkat seluler, biaya paket data seluler biasanya
- melebihi harga perangkat itu sendiri. Bagi banyak pengguna, data seluler adalah sumber daya
-mahal yang ingin mereka hemat. </p>
-
-<p>Android N memperkenalkan mode Data Saver, layanan sistem baru yang mengurangi
-penggunaan data seluler oleh aplikasi, baik saat roaming, mendekati akhir siklus tagihan,
-atau saat menggunakan paket data prabayar yang kecil. Data Saver memberi pengguna kemampuan mengontrol cara aplikasi
-menggunakan data seluler dan memungkinkan pengembang memberikan layanan yang lebih efisien bila Data
-Saver aktif. </p>
-
-<p>Bila pengguna mengaktifkan Data Saver di <strong>Settings</strong> dan perangkat
-dalam jaringan berkuota, sistem akan memblokir penggunaan data latar belakang dan memberi tahu aplikasi
-untuk menghemat penggunaan data latar depan — misalnya dengan membatasi
-kecepatan bit untuk streaming, mengurangi kualitas gambar, menangguhkan precaching optimistik,
-dan seterusnya. Pengguna bisa memasukkan aplikasi tertentu ke daftar putih untuk memungkinkan penggunaan data berkuota
-bila Data Saver diaktifkan.</p>
-
-<p>Android N memperluas {@link android.net.ConnectivityManager} untuk menyediakan cara pada aplikasi
-untuk <a href="{@docRoot}preview/features/data-saver.html#status">mengambil
-preferensi Data Saver pengguna</a> dan <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">memantau
-perubahan preferensi</a>. Semua aplikasi harus memeriksa apakah pengguna telah mengaktifkan Data
-Saver dan berusaha membatasi penggunaan data latar belakang dan latar depan.</p>
-
-
-<h2 id="vulkan">Vulkan API</h2>
-
-<p>
- Android N mengintegrasikan <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>, sebuah API rendering 3D baru, ke dalam platform. Seperti
- <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
- ES</a>, Vulkan merupakan standar terbuka untuk grafik 3D dan rendering yang dikelola
- oleh Khronos Group.
-</p>
-
-<p>
- Vulkan didesain dari nol untuk meminimalkan overhead CPU dalam driver,
- dan memungkinkan aplikasi Anda mengontrol operasi GPU lebih langsung. Vulkan
- juga memungkinkan paralelisasi yang lebih baik dengan mengizinkan beberapa thread menjalankan
- pekerjaan seperti pembuatan buffer perintah sekaligus.
-</p>
-
-<p>
- Pustaka dan alat pengembangan Vulkan telah dimasukkan ke dalam Android NDK. Ini
- berisi:
-</p>
-
-<ul>
- <li>Header
- </li>
-
- <li>Layer validasi (pustaka debug)
- </li>
-
- <li>SPIR-V shader compiler
- </li>
-
- <li>Pustaka kompilasi shader waktu proses SPIR-V
- </li>
-</ul>
-
-<p>
- Vulkan hanya tersedia untuk aplikasi pada perangkat dengan perangkat keras yang mendukung Vulkan,
- seperti Nexus 5X, Nexus 6P, dan Nexus Player. Kami bekerja sama erat dengan mitra
- agar secepatnya makin banyak perangkat yang dilengkapi Vulkan.
-</p>
-
-<p>
- Untuk informasi selengkapnya, lihat <a href="{@docRoot}ndk/guides/graphics/index.html">dokumentasi API</a>.
-</p>
-
-<h2 id="tile_api">Quick Settings Tile API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>Gambar 5.</strong> Quick Settings Tile dalam bayangan pemberitahuan.
-</p>
-
-
- </div><p>Quick Settings adalah cara populer dan mudah untuk mengekspos setelan dan tindakan utama,
-langsung dari bayangan pemberitahuan. Di Android N, kami telah memperluas lingkup
-Quick Settings untuk membuatnya lebih berguna dan praktis lagi. </p>
-
-<p>Kami telah menambahkan ruang lebih banyak untuk petak Quick Settings tambahan, yang bisa
-diakses pengguna di semua bagian area tampilan halaman bernomor dengan mengusap ke kiri atau kanan. Kami juga memberi pengguna
-kontrol untuk mengatur letak dan petak Quick Settings apa yang akan
-ditampilkan — pengguna bisa menambahkan atau memindahkan petak dengan menyeret dan melepasnya. </p>
-
-<p>Bagi pengembang, Android N juga menambahkan API baru yang memungkinkan Anda mendefinisikan
- petak Quick Settings untuk memberi akses mudah kepada pengguna ke berbagai kontrol dan tindakan utama dalam aplikasi Anda.</p>
-
-<p>
- Petak Quick Settings dicadangkan untuk kontrol atau tindakan yang
- mendesak atau sering digunakan, dan tidak boleh digunakan sebagai pintasan untuk
- membuka aplikasi.
-</p>
-
-<p>
- Setelah mendefinisikan petak, Anda bisa menyediakannya kepada pengguna, yang bisa mereka tambahkan
- ke Quick Settings cukup dengan seret dan lepas.
-</p>
-
-<p>
- Untuk informasi tentang pembuatan petak aplikasi, lihat dokumentasi untuk
- <code>android.service.quicksettings.Tile</code> dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
-</p>
-
-
-
-<h2 id="number-blocking">Pemblokiran Nomor</h2>
-
-<p>Android N sekarang mendukung pemblokiran nomor di platform dan menyediakan
-API kerangka kerja agar penyedia layanan bisa mengelola daftar nomor blokir. Aplikasi SMS
-default, aplikasi telepon default, dan aplikasi operator bisa membaca dari dan
-menulis ke daftar nomor blokir. Daftar ini tidak dapat diakses oleh aplikasi lain.</p>
-
-<p>Dengan membuat pemblokiran nomor sebagai fitur standar pada platformnya, Android menyediakan
-cara konsisten bagi aplikasi untuk mendukung pemblokiran nomor di berbagai
-perangkat. Manfaat lain yang bisa diperoleh aplikasi antara lain:</p>
-
-<ul>
- <li> Nomor yang diblokir untuk panggilan juga akan diblokir untuk SMS
- <li> Nomor yang diblokir tetap disimpan saat pengaturan ulang dan pada berbagai perangkat melalui fitur Backup &
-Restore.
- <li> Beberapa aplikasi sekaligus bisa menggunakan daftar nomor blokir yang sama.
-</ul>
-
-<p>Selain itu, dengan integrasi aplikasi operator melalui Android berarti operator bisa
-membaca daftar nomor blokir pada perangkat dan melakukan pemblokiran di sisi layanan
-bagi pengguna tersebut untuk menghentikan panggilan dan SMS yang tidak diinginkan
-agar tidak sampai ke pengguna lewat media apa pun, misalnya VOIP-endpoint atau meneruskan panggilan telepon.</p>
-
-<p>
- Untuk informasi selengkapnya, lihat <code>android.provider.BlockedNumberContract</code>
- dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
- API</a> yang bisa diunduh.
-</p>
-
-<h2 id="call_screening">Penyaringan Panggilan</h2>
-
-<p>
- Android N memungkinkan aplikasi telepon default untuk menyaring panggilan masuk. Aplikasi
- telepon melakukannya dengan mengimplementasikan <code>CallScreeningService</code> baru,
- yang memungkinkan aplikasi telepon untuk melakukan sejumlah tindakan berdasarkan
- {@link android.telecom.Call.Details Call.Details} panggilan masuk, misalnya:
-</p>
-
-<ul>
- <li> Menolak panggilan masuk
- <li> Tidak mengizinkan panggilan tersebut disimpan ke log panggilan
- <li> Tidak menampilkan pemberitahuan untuk panggilan tersebut kepada pengguna
-</ul>
-
-<p>
- Untuk informasi selengkapnya, lihat <code>android.telecom.CallScreeningService</code>
- dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
- API</a> yang bisa diunduh.
-</p>
-
-
-<h2 id="multi-locale_languages">Dukungan Multilokal, Lebih Banyak Bahasa yang Didukung</h2>
-
-
-<p>Android N kini memungkinkan pengguna memilih <strong>banyak lokal</strong> di Settings,
-untuk mendukung kasus penggunaan dwibahasa dengan lebih baik. Aplikasi bisa menggunakan
-API baru untuk mendapatkan lokal pilihan pengguna kemudian menawarkan pengalaman pengguna
-yang lebih canggih untuk pengguna multilokal — seperti menampilkan hasil telusur dalam
-banyak bahasa dan tidak menawarkan untuk menerjemahkan halaman web dalam bahasa
-yang sudah diketahui pengguna.</p>
-
-<p>Bersama dukungan multilokal, Android N juga memperluas ragam bahasa
-yang tersedia untuk pengguna. Masing-masing ditawarkan lebih dari 25 varian untuk bahasa yang umum
-digunakan seperti Inggris, Spanyol, Prancis, dan Arab. Juga ditambahkan dukungan
-parsial untuk lebih dari 100 bahasa baru.</p>
-
-<p>Aplikasi bisa mendapatkan daftar lokal yang disetel oleh pengguna dengan memanggil
-<code>LocaleList.GetDefault()</code>. Untuk mendukung jumlah lokal yang diperluas, Android N sedang
- mengubah cara mengatasi masalah sumber daya. Pastikan Anda menguji dan memverifikasi bahwa aplikasi Anda
-berfungsi seperti yang diharapkan dengan logika resolusi sumber daya baru.</p>
-
-<p>Untuk mengetahui tentang perilaku resolusi sumber daya baru dan praktik terbaik yang
-harus Anda ikuti, lihat <a href="{@docRoot}preview/features/multilingual-support.html">Dukungan Multibahasa</a>.</p>
-
-
-<h2 id="emoji">Emoji Baru</h2>
-
-<p>
- Android N memperkenalkan emoji tambahan dan fitur terkait emoji termasuk
- emoji warna kulit dan dukungan untuk pemilih
- variasi. Jika aplikasi Anda mendukung emoji,
- ikuti panduan berikut untuk memanfaatkan fitur terkait emoji ini.
-</p>
-
-<ul>
- <li>
- <strong>Periksa apakah perangkat berisi emoji sebelum memasukannya.</strong>
- Untuk memeriksa emoji mana yang terdapat di
- font sistem, gunakan metode {@link android.graphics.Paint#hasGlyph(String)}.
- </li>
- <li>
- <strong>Periksa apakah emoji mendukung pemilih variasi.</strong>
- Pemilih variasi memungkinkan Anda
- menampilkan emoji tertentu berwarna atau hitam-putih.
- Pada perangkat seluler, aplikasi akan menghadirkan emoji berwarna daripada hitam-putih. Akan tetapi,
- jika aplikasi Anda menampilkan emoji sebaris dengan teks, maka harus menggunakan variasi hitam-putih.
- Untuk menentukan apakah sebuah emoji memiliki variasi, gunakan pemilih variasi.
- Untuk daftar lengkap dari karakter dengan variasinya, tinjaulah bagian
- <em>rangkaian variasi emoji</em> pada
- <a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
- dokumentasi Unicode mengenai variasi</a>.
- </li>
- <li>
- <strong>Periksa apakah emoji mendukung warna kulit.</strong> Android N memungkinkan pengguna memodifikasi
- warna kulit emoji yang dirender sesuai dengan preferensi mereka. Aplikasi keyboard harus menyediakan indikasi
- visual untuk emoji yang memiliki beberapa warna kulit dan harus memungkinkan pengguna
- memilih warna kulit yang mereka sukai. Untuk menentukan apakah emoji sistem memiliki
- modifier warna kulit, gunakan metode {@link android.graphics.Paint#hasGlyph(String)}.
- Anda bisa menentukan emoji mana yang menggunakan warna kulit dengan membaca
- <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
- dokumentasi Unicode</a>.
- </li>
-</ul>
-
-
-<h2 id="icu4">ICU4J API di Android</h2>
-
-<p>
- Android N kini menawarkan subset <a href="http://site.icu-project.org/">ICU4J</a> API dalam kerangka kerja Android pada paket
- <code>android.icu</code>. Migrasi mudah, dan biasanya hanya perlu
- mengubah dari ruang nama <code>com.java.icu</code> ke
- <code>android.icu</code>. Jika Anda sudah menggunakan bundel ICU4J dalam aplikasi,
- maka beralih ke <code>android.icu</code> API yang disediakan dalam kerangka kerja
- Android bisa menghasilkan penghematan besar dalam ukuran APK.
-</p>
-
-<p>
- Untuk mengetahui selengkapnya tentang Android ICU4J API, lihat <a href="{@docRoot}preview/features/icu4j-framework.html">Dukungan ICU4J</a>.
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>Android N menambahkan antarmuka kerangka kerja dan dukungan platform untuk OpenGL ES 3.2, termasuk:</p>
-
-<ul>
- <li> Semua ekstensi dari <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
-Android Extension Pack</a></a> (AEP) kecuali untuk <code>EXT_texture_sRGB_decode</code>.
- <li> Floating-point framebuffer untuk HDR dan shading yang ditangguhkan.
- <li> Panggilan draw BaseVertex agar batching dan streaming jadi lebih baik.
- <li> Kontrol akses buffer yang tangguh untuk mengurangi overhead WebGL.
-</ul>
-
-<p>API kerangka kerja untuk OpenGL ES 3.2 di Android N dilengkapi dengan kelas
- <code>GLES32</code>. Saat menggunakan OpenGL ES 3.2, pastikan
-mendeklarasikan persyaratan dalam file manifes Anda, dengan tag <code><uses-feature></code> dan
-atribut <code>android:glEsVersion</code>. </p>
-
-<p>Untuk informasi tentang menggunakan OpenGL ES, termasuk cara memeriksa versi
-OpenGL ES yang didukung perangkat saat waktu proses, lihat <a href="{@docRoot}guide/topics/graphics/opengl.html">Panduan OpenGL ES API</a>.</p>
-
-
-<h2 id="android_tv_recording">Perekaman Android TV</h2>
-
-<p>Android N menambahkan kemampuan untuk merekam dan memutar kembali materi dari layanan masukan
-Android TV melalui API perekaman baru. Karena dibangun dengan API perekaman yang sudah
-ada, layanan masukan TV bisa mengontrol data saluran apa yang bisa direkam, cara menyimpan
-sesi rekaman, dan mengelola interaksi pengguna dengan materi rekaman. </p>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}preview/features/tv-recording-api.html">API Perekaman Android TV</a>.</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work menambahkan berbagai fitur dan API baru untuk perangkat yang menjalankan Android N.
-Beberapa fitur unggulannya ada di bawah ini — untuk mengetahui daftar lengkap perubahannya, lihat
-<a href="{@docRoot}preview/features/afw.html">Pembaruan Android for Work</a>.</p>
-
-<h3 id="work_profile_security_challenge">Pertanyaan Keamanan Profil Kerja </h3>
-
-<p>
- Pemilik profil yang menargetkan N SDK
- bisa menetapkan pertanyaan keamanan terpisah untuk aplikasi yang berjalan di
- profil kerja. Pertanyaan kerja ditampilkan bila pengguna mencoba membuka
- aplikasi kerja apa pun. Jawaban pertanyaan keamanan yang benar akan membuka
- profil kerja dan mendekripsinya jika diperlukan. Untuk pemilik profil,
- <code>ACTION_SET_NEW_PASSWORD</code> akan meminta pengguna untuk menetapkan pertanyaan
- kerja, dan <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> meminta
- pengguna menyetel kunci perangkat.
-</p>
-
-<p>
- Pemilik profil bisa menyetel kebijakan kode sandi untuk pertanyaan kerja
- (seperti berapa lama seharusnya PIN, atau apakah sidik jari bisa digunakan
- untuk membuka kunci profil) menggunakan <code>setPasswordQuality()</code>,
- <code>setPasswordMinimumLength()</code> dan metode terkait. Pemilik profil
- juga bisa menyetel kunci perangkat, menggunakan instance <code>DevicePolicyManager</code>
- yang dikembalikan oleh metode <code>getParentProfileInstance()</code> baru.
- Selain itu, pemilik profil bisa menyesuaikan layar kredensial untuk
- pertanyaan kerja menggunakan metode baru <code>setOrganizationColor()</code> dan
- <code>setOrganizationName()</code>.
-</p>
-<h3 id="turn_off_work">Menonaktifkan pekerjaan </h3>
-
-<p>Pada perangkat dengan profil kerja, pengguna bisa beralih mode kerja. Bila mode
-kerja dinonaktifkan, profil yang dikelola akan dinonaktifkan untuk sementara, yang akan menonaktifkan aplikasi
-profil kerja, sinkronisasi latar belakang, dan pemberitahuan. Termasuk aplikasi pemilik
-profil. Bila profil kerja dinonaktifkan, sistem akan menampilkan ikon status
-tetap untuk mengingatkan pengguna bahwa mereka tidak bisa meluncurkan aplikasi kerja. Peluncur
-menunjukkan bahwa aplikasi kerja dan widget tidak bisa diakses. </p>
-
-<h3 id="always_on_vpn">Always-On VPN </h3>
-
-<p>Pemilik perangkat dan pemilik profil bisa memastikan bahwa aplikasi kerja selalu menghubungkan
-melalui VPN yang ditetapkan. Sistem secara otomatis akan memulai VPN itu setelah booting
-perangkat.</p>
-
-<p>
- Metode <code>DevicePolicyManager</code> baru adalah
- <code>setAlwaysOnVpnPackage()</code> dan
- <code>getAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>Karena layanan VPN bisa diikat langsung oleh sistem tanpa interaksi
-aplikasi, klien VPN perlu menangani titik masuk baru untuk Always-On VPN. Seperti
-sebelumnya, layanan ditunjukkan ke sistem melalui
-tindakan pencocokan filter intent <code>android.net.VpnService</code>. </p>
-
-<p>
- Pengguna bisa secara manual menyetel klien Always-On VPN yang mengimplementasikan
- metode <code>VPNService</code> dalam pengguna utama dengan menggunakan
- <strong>Settings>More>Vpn</strong>.
-</p>
-
-<h3 id="custom_provisioning">Penyediaan yang disesuaikan</h3>
-
-<p>
- Aplikasi bisa menyesuaikan alur penyediaan pemilik profil dan pemilik perangkat
- dengan warna dan logo perusahaan.
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> menyesuaikan
- warna alur. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- menyesuaikan alur dengan logo perusahaan.
-</p>
-
-<h2 id="accessibility_enhancements">Penyempurnaan Aksesibilitas</h2>
-
-<p>Android N saat ini menawarkan Vision Settings langsung di layar Sambutan untuk
-persiapan perangkat baru. Ini sangat memudahkan pengguna untuk menemukan dan mengonfigurasi
-fitur aksesibilitas pada perangkat mereka, termasuk isyarat perbesaran, ukuran
-font, ukuran layar, dan TalkBack. </p>
-
-<p>Dengan fitur aksesibilitas yang penempatannya semakin jelas, pengguna Anda
-kemungkinan besar akan mencoba aplikasi dengan fitur-fitur yang diaktifkan itu. Pastikan Anda menguji aplikasi
-lebih dini dengan mengaktifkan dahulu setelan ini. Anda bisa mengaktifkannya dari Settings >
-Accessibility.</p>
-
-<p>Di Android N, layanan aksesibilitas sekarang bisa membantu pengguna yang mengalami gangguan
-motorik untuk menyentuh layar. API baru memungkinkan membangun layanan dengan
-fitur-fitur seperti pelacakan wajah, pelacakan mata, pemindaian titik, dan seterusnya, untuk
-memenuhi kebutuhan para pengguna tersebut.</p>
-
-<p>Untuk informasi selengkapnya, lihat <code>android.accessibilityservice.GestureDescription</code>
- dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.</p>
-
-
-<h2 id="direct_boot">Direct Boot</h2>
-
-<p>Direct Boot memperbaiki waktu startup perangkat dan memungkinkan aplikasi
-yang telah didaftarkan memiliki fungsionalitas terbatas bahkan setelah boot ulang tak terduga.
-Misalnya, jika perangkat yang dienkripsi melakukan boot ulang selagi pengguna tidur,
-alarm terdaftar, pesan dan panggilan masuk sekarang bisa terus memberi tahu
-pengguna seperti biasa. Ini juga berarti layanan aksesibilitas bisa
- segera tersedia setelah restart.</p>
-
-<p>Direct Boot memanfaatkan enkripsi berbasis file di Android N
-untuk mengaktifkan kebijakan enkripsi yang telah disesuaikan bagi sistem dan data aplikasi.
-Sistem akan menggunakan penyimpanan yang dienkripsi dengan perangkat untuk data sistem terpilih dan data
-aplikasi yang terdaftar secara eksplisit. Secara default, penyimpanan yang dienkripsi dengan kredensial digunakan untuk semua
- data sistem lainnya, data pengguna, aplikasi, dan data aplikasi. </p>
-
-<p>Saat booting, sistem dimulai dalam mode terbatas dengan akses
-ke data yang dienkripsi dengan perangkat saja, dan tanpa akses umum ke aplikasi atau data.
-Jika Anda memiliki komponen yang ingin Anda jalankan dalam mode ini, Anda bisa mendaftarkannya
-dengan menyetel flag dalam manifes. Setelah restart, sistem akan mengaktifkan
-komponen terdaftar dengan menyiarkan intent <code>LOCKED_BOOT_COMPLETED</code>.
- Sistem akan memastikan data aplikasi yang dienkripsi dengan perangkat tersedia
-sebelum membuka kunci. Semua data lainnya tidak tersedia sebelum Pengguna mengonfirmasi
- kredensial layar kunci mereka untuk mendekripsinya. </p>
-
-Untuk informasi selengkapnya, lihat <a href="{@docRoot}preview/features/direct-boot.html">Direct Boot</a>.</p>
-</p>
-
-
-<h2 id="key_attestation">Key Attestation</h2>
-
-<p>Keystore yang didukung perangkat keras menyediakan metode yang jauh lebih aman untuk membuat, menyimpan,
-dan menggunakan kunci kriptografi pada perangkat Android. Keystore itu melindungi kunci dari
-kernel Linux, potensi kerentanan Android, dan ekstraksi
-dari perangkat yang di-root.</p>
-
-<p>Agar lebih mudah dan lebih aman dalam menggunakan keystore yang didukung perangkat keras,
-Android N memperkenalkan Key Attestation. Aplikasi dan perangkat-nonaktif bisa menggunakan Key
-Attestation untuk menentukan apakah penyandingan kunci RSA atau EC
-didukung perangkat keras, apa properti dari penyandingan kunci, dan batasan
- apa yang diterapkan terhadap penggunaan dan validitasnya. </p>
-
-<p>Aplikasi dan layanan perangkat-nonaktif bisa meminta informasi tentang penyandingan kunci
-melalui sertifikat pengesahan X.509 yang harus ditandatangani dengan kunci
-pengesahan yang valid. Kunci pengesahan adalah kunci penandatanganan ECDSA yang
-telah diinjeksikan ke dalam keystore yang didukung perangkat keras pada perangkat saat di pabriknya.
-Karena itu, sertifikat pengesahan yang ditandatangani oleh kunci pengesahan yang
-valid akan mengonfirmasi keberadaan keystore yang didukung perangkat keras, bersama
- detail pasangan kunci dalam keystore itu.</p>
-
-<p>Untuk memastikan perangkat ini menggunakan citra Android resmi yang
-aman dari pabrik, Key Attestation mengharuskan <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a> perangkat
-menyediakan informasi berikut pada <a class="external-link" href="https://source.android.com/security/trusty/index.html">Trusted
-Execution Environment (TEE)</a>:</p>
-
-<ul>
-<li>Versi OS dan level patch yang dipasang pada perangkat</li>
-<li>Kunci publik <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> dan status kunci</li>
- </ul>
-
-<p>Untuk informasi selengkapnya tentang fitur keystore yang didukung perangkat keras,
-lihat panduan untuk <a href="https://source.android.com/security/keystore/" class="external-link">Keystore yang Didukung Perangkat Keras</a>.</p>
-
-<p>Selain Key Attestation, Android N juga memperkenalkan
- kunci yang terikat sidik jari yang tidak dipanggil saat pendaftaran sidik jari.</p>
-
-<h2 id="network_security_config">Network Security Config</h2>
-
-<p>Di Android N, aplikasi bisa menyesuaikan perilaku koneksi aman mereka
-(HTTPS, TLS) secara aman, tanpa modifikasi kode, dengan menggunakan
-<em>Network Security Config</em> deklaratif sebagai ganti menggunakan API programatik
-konvensional yang rawan kesalahan (mis. X509TrustManager).</p>
-
- <p>Fitur yang didukung:</p>
-<ul>
-<li><b>Trust-anchor khusus.</b> Memungkinkan aplikasi menyesuaikan
-Certificate Authorities (CA) mana yang dipercaya untuk koneksi amannya. Misalnya,
-mempercayai sertifikat tertentu yang ditandatangani sendiri atau set CA publik yang dibatasi.
-</li>
-<li><b>Penggantian hanya-debug.</b> Memungkinkan pengembang aplikasi dengan aman men-debug
-koneksi aman aplikasi mereka tanpa menambah risiko pada basis yang sudah
-dipasang.
-</li>
-<li><b>Berhenti dari lalu lintas cleartext.</b> Memungkinkan aplikasi melindungi dirinya sendiri dari
-penggunaan lalu lintas cleartext yang tidak disengaja.</li>
-<li><b>Penyematan sertifikat.</b> Sebuah fitur canggih yang memungkinkan aplikasi
- membatasi kunci server mana yang dipercaya untuk koneksi aman.</li>
-</ul>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}preview/features/security-config.html">Network Security
-Config</a>.</p>
-
-<h2 id="default_trusted_ca">Certificate Authority Tepercaya Default</h2>
-
-<p>Secara default, aplikasi yang menargetkan Android N hanya mempercayai sertifikat yang disediakan sistem
-dan tidak lagi mempercayai Certificate Authorities (CA) yang ditambahkan pengguna. Aplikasi yang menargetkan Android
-N dan ingin mempercayai CA yang ditambahkan pengguna harus menggunakan
-<a href="{@docRoot}preview/features/security-config.html">Network Security Config</a> untuk
-menetapkan cara mempercayai CA pengguna.</p>
-
-<h2 id="apk_signature_v2">APK Signature Scheme v2</h2>
-
-<p>
- Android N memperkenalkan APK Signature Scheme v2, sebuah skema penandatanganan aplikasi baru yang
- menawarkan waktu pasang aplikasi lebih cepat dan lebih banyak perlindungan terhadap perubahan
- tidak sah pada file APK. Secara default, Android Studio 2.2 dan Android
- Plugin untuk Gradle 2.2 menandatangani aplikasi Anda menggunakan APK Signature Scheme v2 dan
- skema penandatanganan tradisional, yang menggunakan penandatanganan JAR.
-</p>
-
-<p>
- Meskipun kami menyarankan untuk menerapkan APK Signature Scheme v2 pada aplikasi Anda, skema
- baru ini tidak wajib. Jika aplikasi Anda tidak dibangun dengan benar saat menggunakan APK
- Signature Scheme v2, Anda bisa menonaktifkan skema baru ini. Proses penonaktifan
- menyebabkan Android Studio 2.2 dan Android Plugin untuk Gradle 2.2 menandatangani aplikasi Anda
- menggunakan skema penandatanganan tradisional saja. Untuk menandatangani dengan
- skema tradisional saja, buka file <code>build.gradle</code> level-modul, kemudian
- tambahkan baris <code>v2SigningEnabled false</code> ke konfigurasi
- penandatanganan rilis Anda:
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>Perhatian: </strong> Jika Anda menandatangani aplikasi menggunakan APK
- Signature Scheme v2 dan membuat perubahan lebih jauh pada aplikasi, tanda tangan aplikasi
- menjadi tidak valid. Untuk alasan ini, gunakan alat seperti <code>zipalign</code>
- sebelum menandatangani aplikasi Anda menggunakan APK Signature Scheme v2, bukan setelahnya.
-</p>
-
-<p>
- Untuk informasi selengkapnya, baca dokumen Android Studio yang menjelaskan cara
- <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
- menandatangani aplikasi</a> di Android Studio dan cara<a href="{@docRoot}studio/build/build-variants.html#signing"> mengonfigurasi
- file build untuk menandatangani aplikasi</a> menggunakan Android Plugin untuk Gradle.
-</p>
-
-<h2 id="scoped_directory_access">Scoped Directory Access</h2>
-
-<p>Di Android N, aplikasi bisa menggunakan API baru untuk meminta akses ke direktori <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">penyimpanan
-eksternal</a> tertentu, termasuk direktori di media lepas-pasang seperti kartu
-SD. API baru ini sangat menyederhanakan cara aplikasi Anda mengakses direktori
-penyimpanan eksternal standar, seperti direktori <code>Pictures</code>. Aplikasi
-seperti aplikasi foto bisa menggunakan API ini sebagai ganti menggunakan
-<code>READ_EXTERNAL_STORAGE</code>, yang memberikan akses ke semua direktori
-penyimpanan, atau Storage Access Framework, yang membuat pengguna mengarah ke
-direktori tersebut.</p>
-
-<p>Selain itu, API baru ini menyederhanakan langkah-langkah yang diambil pengguna untuk memberikan akses
-penyimpanan eksternal ke aplikasi Anda. Bila Anda menggunakan API baru, sistem akan menggunakan UI izin
-sederhana yang memperinci dengan jelas direktori apa yang aksesnya diminta
-oleh aplikasi.</p>
-
-<p>Untuk informasi selengkapnya, lihat dokumentasi pengembang
-<a href="{@docRoot}preview/features/scoped-folder-access.html">Scoped
-Directory Access</a>.</p>
-
-<h2 id="keyboard_shortcuts_helper">Keyboard Shortcuts Helper</h2>
-
-<p>
-Di Android N, pengguna bisa menekan "Alt + /" untuk memunculkan layar <em>Keyboard Shortcuts</em>
-yang menampilkan semua pintasan yang tersedia baik dari sistem maupun dari
-aplikasi yang sedang mendapatkan fokus. Ini diambil secara otomatis dari menu aplikasi
-jika tersedia, namun pengembang bisa menyediakan daftar pintasan yang telah disesuaikan
-untuk layar. Anda bisa melakukannya dengan mengganti metode
-<code>Activity.onProvideKeyboardShortcuts()</code> baru, yang dijelaskan dalam
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
-</p>
-
-<p>
-Untuk memunculkan Keyboard Shortcuts Helper dari mana saja di aplikasi Anda,
-panggil {@code Activity.requestKeyboardShortcutsHelper()} untuk aktivitas terkait.
-</p>
-
-<h2 id="sustained_performance_api">Sustained Performance API</h2>
-
-<p>
-Kinerja bisa berfluktuasi secara dramatis untuk aplikasi yang berjalan lama, karena
-sistem melakukan throttle pada mesin sistem-di-chip saat komponen perangkat mencapai
-batas suhunya. Fluktuasi ini memberikan target bergerak bagi pengembang
-aplikasi yang sedang membuat aplikasi berkinerja tinggi dan berjalan lama.
-</p>
-
-<p>
-Untuk menangani batasan ini, Android N menyertakan dukungan untuk
-<em>mode kinerja kontinu</em>, yang memungkinkan OEM memberikan petunjuk mengenai kemampuan kinerja
-perangkat untuk aplikasi yang berjalan lama. Pengembang aplikasi
-bisa menggunakan petunjuk ini untuk menyesuaikan aplikasi agar kinerja perangkat bisa diprediksi
-dan pada level yang konsisten dalam jangka waktu lama.
-</p>
-
-<p>
-Pengembang aplikasi bisa mencoba API baru ini dalam N Developer Preview pada
-perangkat Nexus 6P saja. Untuk menggunakan fitur ini,
-setel flag jendela kinerja kontinu
-yang ingin Anda jalankan dalam mode kinerja kontinu. Setel flag ini menggunakan metode
-{@code Window.setSustainedPerformanceMode()}. Sistem secara otomatis
-akan menonaktifkan mode ini bila jendela tidak lagi mendapatkan fokus.
-</p>
-
-<h2 id="vr">Dukungan VR</h2>
-
-<p>
-Android N menambahkan dukungan platform dan optimalisasi untuk VR Mode baru yang memungkinkan
-pengembang membuat pengalaman VR berkualitas tinggi di seluler bagi para pengguna. Ada banyak perbaikan
-kinerja, termasuk akses ke inti CPU yang eksklusif untuk aplikasi VR.
-Di dalam aplikasi, Anda bisa memanfaatkan pelacakan kepala yang cerdas,
-dan pemberitahuan stereo yang bekerja untuk VR. Hal terpenting adalah Android N menyediakan
-grafis dengan latensi sangat rendah. Untuk informasi selengkapnya tentang membangun aplikasi VR untuk Android N,
-lihat <a href="https://developers.google.com/vr/android/">Google VR SDK untuk Android</a>.
-</p>
-
-
-<h2 id="print_svc">Penyempurnaan Layanan Cetak</h2>
-
-<p>
- Di Android N, pengembang layanan cetak kini bisa menampilkan informasi tambahan
- tentang masing-masing printer dan pekerjaan cetak.
-</p>
-
-<p>
- Saat mendaftarkan masing-masing printer, layanan cetak kini bisa menyetel
- ikon per printer dalam dua cara:
-</p>
-
-<ul>
- <li>Anda bisa menyetel ikon dari ID sumber daya dengan memanggil
- <code>PrinterInfo.Builder.setResourceIconId()</code>
- </li>
-
- <li>Anda bisa menampilkan ikon dari jaringan dengan memanggil
- <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>, dan menyetel sebuah
- callback bila ikon diminta menggunakan
- <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>
- </li>
-</ul>
-
-<p>
- Selain itu, Anda bisa menyediakan aktivitas per printer untuk menampilkan informasi
- tambahan dengan memanggil <code>PrinterInfo.Builder.setInfoIntent()</code>.
-</p>
-
-<p>
- Anda bisa menunjukkan kemajuan dan status pekerjaan cetak di
- pemberitahuan pekerjaan cetak dengan memanggil masing-masing
- <code>android.printservice.PrintJob.setProgress()</code> dan
- <code>android.printservice.PrintJob.setStatus()</code>.
-</p>
-
-<p>
- Untuk informasi selengkapnya tentang metode ini,lihat dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
-</p>
-
-<h2 id="framemetrics_api">FrameMetricsListener API</h2>
-
-<p>
-FrameMetricsListener API memungkinkan aplikasi untuk memantau
-kinerja rendering UI. API tersebut menyediakan kemampuan ini dengan mengekspos Pub/Sub API streaming
-untuk mentransfer info frame-timing untuk jendela aplikasi saat ini. Data yang dikembalikan
-setara dengan yang ditampilkan <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code>, namun tidak dibatasi pada 120 bingkai.
-</p>
-
-<p>
-Anda bisa menggunakan FrameMetricsListener untuk mengukur kinerja UI
-level interaksi di produksi, tanpa koneksi USB. API
-ini memungkinkan pengumpulan data dengan granularitas lebih tinggi daripada
-{@code adb shell dumpsys gfxinfo}. Granularitas lebih tinggi ini dimungkinkan karena
-sistem bisa mengumpulkan data untuk interaksi tertentu di aplikasi; sistem
-tidak perlu merekam ringkasan global untuk keseluruhan kinerja
-aplikasi, atau mengosongkan status global yang ada. Anda bisa menggunakan kemampuan ini
-untuk mengumpulkan data kinerja dan menangkap regresi di kinerja UI
-untuk kasus penggunaan sungguhan di dalam aplikasi.
-</p>
-
-<p>
-Untuk memantau sebuah jendela, implementasikan metode callback <code>FrameMetricsListener.onMetricsAvailable()</code>
-dan daftarkan di jendela itu. Untuk informasi selengkapnya, lihat
-dokumentasi kelas {@code FrameMetricsListener} di
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
-</p>
-
-<p>
-API menyediakan objek {@code FrameMetrics}, yang berisi data timing yang
-dilaporkan subsistem rendering untuk berbagai tahap pencapaian dalam daur hidup bingkai.
-Metrik yang didukung adalah: {@code UNKNOWN_DELAY_DURATION},
-{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
-{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
-{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
-{@code TOTAL_DURATION}, dan {@code FIRST_DRAW_FRAME}.
-</p>
-
-
-<h2 id="virtual_files">File Maya</h2>
-
-<p>
- Di versi Android sebelumnya, aplikasi Anda bisa menggunakan Storage Access
- Framework untuk memungkinkan pengguna memilih file dari akun penyimpanan awan mereka,
- seperti Google Drive. Akan tetapi, tidak ada cara untuk merepresentasikan file yang
- tidak memiliki representasi bytecode langsung; setiap file diharuskan menyediakan
- aliran masukan.
-</p>
-
-<p>
- Android N menambahkan konsep <em>file maya</em> pada Storage Access
- Framework. Fitur file maya memungkinkan
- {@link android.provider.DocumentsProvider} Anda mengembalikan URI dokumen yang bisa
- digunakan bersama intent {@link android.content.Intent#ACTION_VIEW} sekalipun
- tidak memiliki representasi bytecode langsung. Android N juga memungkinkan Anda untuk
- menyediakan format alternatif untuk file pengguna, maya atau dengan cara lain.
-</p>
-
-<p>
- Untuk mendapatkan URI sebuah dokumen maya di aplikasi Anda, terlebih dahulu Anda membuat
- {@link android.content.Intent} untuk membuka UI pemilih file. Karena aplikasi
- tidak bisa membuka file maya secara langsung dengan menggunakan metode
- {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()},
- aplikasi Anda tidak akan menerima file maya jika Anda memasukkan kategori
- {@link android.content.Intent#CATEGORY_OPENABLE}.
-</p>
-
-<p>
- Setelah pengguna menentukan pilihan, sistem akan memanggil metode
- {@link android.app.Activity#onActivityResult onActivityResult()}.
- Aplikasi Anda bisa mengambil URI file maya dan mendapatkan aliran masukan, seperti yang
- diperagakan dalam cuplikan kode di bawah.
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- Untuk informasi selengkapnya tentang mengakses file pengguna, lihat
- <a href="{@docRoot}guide/topics/providers/document-provider.html">Panduan Storage
- Access Frameworks</a>.
-</p>
diff --git a/docs/html-intl/intl/in/preview/behavior-changes.jd b/docs/html-intl/intl/in/preview/behavior-changes.jd
deleted file mode 100644
index 6e6ebae9..0000000
--- a/docs/html-intl/intl/in/preview/behavior-changes.jd
+++ /dev/null
@@ -1,610 +0,0 @@
-page.title=Perubahan Perilaku
-page.keywords=pratinjau,sdk,kompatibilitas
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Dalam dokumen ini</h2>
-
-<ol>
- <li><a href="#perf">Peningkatan Kinerja</a>
- <ol>
- <li><a href="#doze">Istirahatkan</a></li>
- <li><a href="#bg-opt">Optimalisasi Latar Belakang</a></li>
- </ol>
- </li>
- <li><a href="#perm">Perubahan Izin</a>
- </li>
- <li><a href="#sharing-files">Berbagi File Antar Aplikasi</a></li>
- <li><a href="#accessibility">Peningkatan Aksesibilitas</a>
- <ol>
- <li><a href="#screen-zoom">Perbesaran Layar</a></li>
- <li><a href="#vision-settings">Vision Settings di Setup Wizard</a></li>
- </ol>
- </li>
- <li><a href="#ndk">Penautan Aplikasi NDK ke Pustaka Platform</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">Retensi Anotasi</a></li>
- <li><a href="#other">Poin Penting Lainnya</a></li>
-</ol>
-
-<h2>Lihat Juga</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">
- Ringkasan Android N API</a></li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Bersama fitur dan kemampuan baru, Android N
- menyertakan berbagai macam perubahan sistem dan perubahan perilaku API. Dokumen ini
- menyoroti beberapa perubahan utama yang harus dipahami dan diperhitungkan
- dalam aplikasi Anda.
-</p>
-
-<p>
- Jika Anda sebelumnya telah mempublikasikan aplikasi untuk Android, ketahuilah bahwa aplikasi Anda
- mungkin dipengaruhi oleh perubahan dalam platform.
-</p>
-
-
-<h2 id="perf">Baterai dan Memori</h2>
-
-<p>
-Android N menyertakan perubahan perilaku sistem yang bertujuan untuk meningkatkan daya tahan baterai
-perangkat dan mengurangi penggunaan RAM. Perubahan ini bisa memengaruhi akses aplikasi Anda ke
-sumber daya sistem, termasuk cara aplikasi Anda berinteraksi dengan aplikasi lain melalui
-intent implisit tertentu.
-</p>
-
-<h3 id="doze">Istirahatkan</h3>
-
-<p>
- Diperkenalkan dalam Android 6.0 (API level 23), Istirahatkan meningkatkan daya tahan baterai dengan
- menangguhkan aktivitas CPU dan jaringan bila pengguna tidak mencabut perangkat,
- tidak bergerak, dan layar dinonaktifkan. Android N lebih
- menyempurnakan Istirahatkan dengan menerapkan subset CPU dan pembatasan jaringan
- bila perangkat dicabut dan layar dinonaktifkan, namun tidak harus
- diam, misalnya, bila handset dibawa bepergian di saku pengguna.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>Gambar 1.</strong> Ilustrasi tentang cara Istirahatkan menerapkan pembatasan
- aktivitas sistem level pertama untuk meningkatkan daya tahan baterai.
-</p>
-
-<p>
- Bila perangkat sedang menggunakan daya baterai, dan layar telah nonaktif selama jangka waktu
- tertentu, perangkat akan memasuki Istirahatkan dan menerapkan subset pembatasan pertama: Perangkat
- akan menutup akses jaringan aplikasi, serta menangguhkan pekerjaan dan sinkronisasi. Jika perangkat sedang
- diam selama jangka waktu tertentu setelah memasuki Istirahatkan, sistem akan menerapkan
- pembatasan Istirahatkan selebihnya terhadap alarm {@link android.os.PowerManager.WakeLock},
- {@link android.app.AlarmManager}, GPS, dan pemindaian Wi-Fi. Tidak peduli
- apakah sebagian atau semua pembatasan Istirahatkan diterapkan, sistem akan membangunkan
- perangkat selama jeda pemeliharaan singkat, dan selama itu aplikasi diizinkan
- mengakses jaringan dan bisa mengeksekusi semua pekerjaan/sinkronisasi yang telah ditangguhkan.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>Gambar 2.</strong> Ilustrasi tentang cara Istirahatkan menerapkan pembatasan
- aktivitas sistem level kedua setelah perangkat diam selama jangka waktu tertentu.
-</p>
-
-<p>
- Perhatikan, mengaktifkan layar atau mencolokkan steker perangkat akan mengeluarkan dari Istirahatkan
- dan membuang pembatasan pemrosesan ini. Perilaku tambahan ini tidak
- memengaruhi rekomendasi dan praktik terbaik dalam menyesuaikan aplikasi Anda dengan versi
- Istirahatkan sebelumnya yang diperkenalkan dalam Android 6.0 (API level 23), seperti yang dibahas di
- <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
- Mengoptimalkan untuk Istirahatkan dan Aplikasi Siaga</a>. Anda tetap harus
- mengikuti rekomendasi itu, seperti menggunakan Google Cloud Messaging (GCM) untuk
- mengirim dan menerima pesan, serta mulai merencanakan pembaruan
- untuk mengakomodasi perilaku Istirahatkan tambahan.
-</p>
-
-
-<h3 id="bg-opt">Project Svelte: Optimalisasi Latar Belakang</h3>
-
-<p>
- Android N membuang tiga siaran implisit untuk membantu mengoptimalkan
- penggunaan memori dan konsumsi daya. Perubahan ini penting karena siaran
- implisit sering memulai aplikasi yang telah didaftarkan untuk mendengarkannya di
- latar belakang. Membuang siaran ini bisa sangat menguntungkan
- kinerja perangkat dan pengalaman pengguna.
-</p>
-
-<p>
- Perangkat seluler seringkali mengalami perubahan konektivitas, seperti saat berpindah
- antara Wi-Fi dan data seluler. Saat ini, aplikasi bisa memantau perubahan dalam
- konektivitas dengan mendaftarkan suatu penerima untuk siaran implisit {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} dalam manifes
- mereka. Karena banyak aplikasi yang didaftarkan untuk menerima siaran ini, switch jaringan tunggal
- bisa menyebabkan semuanya aktif dan memproses siaran tersebut
- secara bersamaan.
-</p>
-
-<p>
- Demikian pula, dalam Android versi sebelumnya, aplikasi bisa mendaftar untuk menerima siaran implisit {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} dan {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} dari aplikasi lain, seperti
- Kamera. Bila pengguna mengambil gambar dengan aplikasi Kamera, semua aplikasi ini akan aktif
- untuk memproses siaran.
-</p>
-
-<p>
- Untuk meminimalkan masalah ini, Android N menerapkan optimalisasi
- berikut:
-</p>
-
-<ul>
- <li>Aplikasi yang menargetkan Android N tidak menerima siaran {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION}, sekalipun
- memiliki entri manifes untuk meminta pemberitahuan mengenai kejadian ini. Aplikasi
- yang berjalan tetap bisa mendengarkan {@code CONNECTIVITY_CHANGE} pada thread utama
- jika mereka meminta pemberitahuan dengan {@link android.content.BroadcastReceiver}.
- </li>
-
- <li>Aplikasi tidak bisa mengirim atau menerima siaran {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} atau {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}. Optimalisasi ini
- memengaruhi semua aplikasi, bukan hanya aplikasi yang menargetkan Android N.
- </li>
-</ul>
-
-<p>Jika aplikasi Anda menggunakan intent ini, Anda harus membuang dependensi padanya
- secepat mungkin agar Anda bisa menargetkan perangkat Android N dengan benar.
- Kerangka kerja Android menyediakan beberapa solusi untuk mengurangi kebutuhan akan
- siaran implisit ini. Misalnya, {@link
- android.app.job.JobScheduler} API menyediakan mekanisme yang tangguh untuk menjadwalkan
- operasi jaringan bila kondisi yang ditetapkan, seperti koneksi ke jaringan
- berbiaya tetap, terpenuhi. Anda juga dapat menggunakan {@link
- android.app.job.JobScheduler} untuk bereaksi terhadap perubahan pada penyedia materi.
-</p>
-
-<p>
- Untuk informasi selengkapnya tentang optimalisasi latar belakang di N dan cara menyesuaikan aplikasi Anda,
- lihat <a href="{@docRoot}preview/features/background-optimization.html">Optimalisasi
- Latar Belakang</a>.
-</p>
-
-<h2 id="perm">Perubahan Izin</h2>
-
-<p>
- Android N menyertakan perubahan pada izin yang bisa memengaruhi aplikasi Anda.
-</p>
-
-<h3 id="permfilesys">Perubahan izin sistem file</h3>
-
-<p>
- Guna meningkatkan keamanan file privat, direktori privat
- aplikasi yang menargetkan Android N atau yang lebih tinggi memiliki akses terbatas (<code>0700</code>).
- Pengaturan ini mencegah kebocoran metadata dari file privat, seperti ukuran
- atau eksistensi. Perubahan izin ini memiliki beberapa efek samping:
-</p>
-
-<ul>
- <li>
- Izin file privat tidak boleh dianggap remeh oleh pemilik,
- dan usaha untuk melakukannya menggunakan
- {@link android.content.Context#MODE_WORLD_READABLE} dan/atau
- {@link android.content.Context#MODE_WORLD_WRITEABLE}, akan memicu sebuah
- {@link java.lang.SecurityException}.
- <p class="note">
- <strong>Catatan:</strong> Seperti sebelumnya, pembatasan ini tidak sepenuhnya diterapkan.
- Aplikasi mungkin masih memodifikasi izin ke direktori privat mereka menggunakan
- API asal atau {@link java.io.File File} API. Akan tetapi, kami sangat
- tidak menyarankan Anda meremehkan izin direktori privat.
- </p>
- </li>
- <li>
- Meneruskan URI <code>file://</code> di luar domain paket dapat meninggalkan
- penerima dengan jalur yang tidak bisa di akses. Karena itu, upaya untuk meneruskan URI
- <code>file://</code> akan memicu
- <code>FileUriExposedException</code>. Cara yang disarankan adalah
- materi file privat menggunakan {@link
- android.support.v4.content.FileProvider}.
- </li>
- <li>
- {@link android.app.DownloadManager} tidak bisa lagi berbagi
- file yang tersimpan secara privat berdasarkan nama file. Aplikasi lawas dapat mengakibatkan
- jalur yang tidak dapat diakses saat mengakses {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Aplikasi yang menargetkan
- Android N atau yang lebih tinggi akan memicu {@link java.lang.SecurityException} saat
- berupaya mengakses
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
- Aplikasi lawas yang menyetel lokasi unduhan ke lokasi publik dengan
- menggunakan
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalFilesDir
- DownloadManager.Request.setDestinationInExternalFilesDir()} atau
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalPublicDir
- DownloadManager.Request.setDestinationInExternalPublicDir()}
- tetap bisa mengakses jalur tersebut di
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}, akan tetapi,
- metode ini sangat tidak disarankan. Cara yang disarankan untuk mengakses file
- yang diekspos oleh {@link android.app.DownloadManager} adalah menggunakan
- {@link android.content.ContentResolver#openFileDescriptor
- ContentResolver.openFileDescriptor()}.
- </li>
-</ul>
-
-<h2 id="sharing-files">Berbagi File Antar Aplikasi</h2>
-
-<p>
-Untuk aplikasi yang menargetkan Android N, kerangka kerja Android menerapkan
-kebijakan {@link android.os.StrictMode} API yang melarang mengekspos URI {@code file://}
-di luar aplikasi Anda. Jika sebuah intent berisi URI file meninggalkan aplikasi Anda, aplikasi tersebut akan gagal
-dengan pengecualian {@code FileUriExposedException}.
-</p>
-
-<p>
-Untuk berbagi file antar aplikasi, Anda harus mengirim URI {@code content://}
-dan memberikan izin akses sementara pada URI. Cara termudah untuk memberikan izin ini adalah dengan
-menggunakan kelas {@link android.support.v4.content.FileProvider}. Untuk informasi selengkapnya
-mengenai izin dan berbagi file,
-lihat <a href="{@docRoot}training/secure-file-sharing/index.html">Berbagi File</a>.
-</p>
-
-<h2 id="accessibility">Peningkatan Aksesibilitas</h2>
-
-<p>
- Android N menyertakan perubahan yang bertujuan meningkatkan kegunaan
- platform untuk pengguna dengan penglihatan yang rendah atau lemah. Perubahan ini umumnya tidak
- memerlukan perubahan kode dalam aplikasi Anda, akan tetapi Anda harus memeriksa
- fitur ini dan mengujinya dengan aplikasi untuk menilai kemungkinan dampaknya terhadap pengalaman
- pengguna.
-</p>
-
-
-<h3 id="screen-zoom">Perbesaran Layar</h3>
-
-<p>
- Android N memungkinkan pengguna menyetel <strong>Display size</strong> yang akan memperbesar
- atau memperkecil semua elemen pada layar, sehingga meningkatkan aksesibilitas perangkat
- bagi pengguna yang kurang melihat. Pengguna tidak bisa memperbesar layar melewati lebar layar
- minimum <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
- sw320dp</a>, yang merupakan lebar Nexus 4, yakni ponsel ukuran sedang pada umumnya.
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>Gambar 3.</strong> Layar di sebelah kanan menampilkan efek
- penambahan Display size perangkat yang menjalankan citra sistem Android N.
-</p>
-
-
-<p>
- Bila kepadatan perangkat berubah, sistem akan memberi tahu aplikasi yang sedang berjalan dengan
- cara berikut:
-</p>
-
-<ul>
- <li>Jika aplikasi menargetkan API level 23 atau yang lebih rendah, sistem secara otomatis akan mematikan
- semua proses latar belakang. Artinya, jika pengguna beralih dari
- aplikasi tersebut untuk membuka layar <em>Settings</em> dan mengubah
- setelan <strong>Display size</strong>, maka sistem akan mematikan aplikasi tersebut dengan cara yang
- sama dengan saat memori tinggal sedikit. Jika aplikasi memiliki beberapa proses
- latar depan, sistem akan memberi tahu proses tersebut mengenai perubahan konfigurasi seperti
- dijelaskan dalam <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
- Waktu Proses</a>, seolah-olah orientasi perangkat telah berubah.
- </li>
-
- <li>Jika sebuah aplikasi menargetkan Android N, semua prosesnya
- (latar depan dan latar belakang) akan diberi tahu mengenai perubahan konfigurasi seperti
- dijelaskan dalam <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
- Waktu Proses</a>.
- </li>
-</ul>
-
-<p>
- Sebagian besar aplikasi tidak perlu melakukan perubahan untuk mendukung fitur ini, asalkan
- aplikasi tersebut mengikuti praktik terbaik Android. Hal-hal tertentu yang harus diperiksa:
-</p>
-
-<ul>
- <li>Uji aplikasi Anda pada perangkat dengan lebar layar <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
- dan pastikan aplikasi berjalan dengan semestinya.
- </li>
-
- <li>Bila konfigurasi perangkat berubah, perbarui informasi cache
- yang bergantung pada kepadatan, seperti bitmap di cache atau sumber daya yang dimuat dari
- jaringan. Periksa perubahan konfigurasi bila aplikasi melanjutkan dari status dihentikan
- sementara.
- <p class="note">
- <strong>Catatan:</strong> Catatan: Jika Anda meng-cache data yang bergantung pada konfigurasi, ada
- baiknya untuk menyertakan metadata yang relevan seperti ukuran layar
- atau kepadatan piksel yang sesuai untuk data tersebut. Menyimpan metadata ini memungkinkan Anda untuk
- memutuskan apakah Anda perlu segarkan data cache setelah perubahan
- konfigurasi.
- </p>
- </li>
-
- <li>Hindari menetapkan dimensi dengan satuan px, karena satuan ini tidak diskalakan dengan
- kepadatan layar. Sebagai gantinya, tetapkan dimensi dengan satuan <a href="{@docRoot}guide/practices/screens_support.html">piksel yang tidak bergantung kepadatan
- </a> (<code>dp</code>).
- </li>
-</ul>
-
-<h3 id="vision-settings">Vision Settings di Setup Wizard</h3>
-
-<p>
- Android N menyertakan Vision Settings di layar Sambutan, di mana pengguna bisa
- menyiapkan setelan aksesibilitas berikut pada perangkat baru:
- <strong>Magnification gesture</strong>, <strong>Font size</strong>,
- <strong>Display size</strong> dan <strong>TalkBack</strong>. Perubahan ini
- meningkatkan visibilitas bug terkait dengan setelan layar yang berbeda. Untuk
- mengurangi dampak fitur ini, Anda harus menguji aplikasi dengan setelan ini
- diaktifkan. Anda bisa menemukannya pada <strong>Settings >
- Accessibility</strong>.
-</p>
-
-<h2 id="ndk">Penautan Aplikasi NDK ke Pustaka Platform</h2>
-
-<p>
- Android N menyertakan perubahan ruang nama untuk mencegah pemuatan API non-publik.
- Jika menggunakan NDK, Anda hanya boleh menggunakan API publik dari platform
- Android. Menggunakan API non-publik dalam rilis Android resmi berikutnya
- bisa menyebabkan aplikasi mogok.
-</p>
-
-<p>
- Untuk memberi tahu Anda agar menggunakan API non-publik, aplikasi yang berjalan pada perangkat
- Android N akan menghasilkan kesalahan dalam keluaran logcat bila aplikasi memanggil API non-publik.
- Kesalahan ini juga ditampilkan di layar perangkat berupa pesan untuk membantu
- meningkatkan kepedulian terhadap situasi ini. Anda harus memeriksa kode aplikasi untuk
- membuang penggunaan API platform non-publik dan secara saksama menguji aplikasi Anda menggunakan
- perangkat pratinjau atau emulator.
-</p>
-
-<p>
- Jika aplikasi Anda bergantung pada pustaka platform, lihat dokumentasi NDK untuk
- perbaikan tipikal guna menggantikan API privat umum dengan padanan API publik.
- Anda mungkin juga menautkan ke pustaka platform tanpa menyadarinya,
- terutama jika aplikasi Anda menggunakan pustaka yang merupakan bagian dari platform ini (seperti
- <code>libpng</code>), namun bukan bagian dari NDK. Dalam hal itu, pastikan
- APK Anda berisi semua file .so yang ingin ditautkan.
-</p>
-
-<p class="caution">
- <strong>Perhatian:</strong> Beberapa pustaka pihak ketiga mungkin menautkan ke API
- non-publik. Jika menggunakan pustaka ini, aplikasi Anda bisa mogok saat dijalankan
- pada rilis resmi Android berikutnya.
-</p>
-
-<p>
- Aplikasi tidak boleh bergantung pada atau menggunakan pustaka bawaan yang tidak disertakan dalam
- NDK, karena bisa mengalami perubahan, atau dipindahkan dari satu rilis Android ke
- rilis lainnya. Peralihan dari OpenSSL ke BoringSSL merupakan satu contoh dari perubahan semacam ini.
- Selain itu, perangkat yang berbeda bisa menawarkan tingkat kompatibilitas yang berbeda, karena
- tidak ada persyaratan kompatibilitas untuk pustaka platform yang tidak disertakan
- dalam NDK. Jika Anda harus mengakses pustaka non-NDK pada perangkat yang lebih lama, jadikan
- pemuatan bergantung pada level Android API.
-</p>
-
-<p>
- Untuk membantu Anda mendiagnosis tipe masalah ini ada beberapa contoh kesalahan Java dan NDK
- yang mungkin Anda temui saat berusaha membangun aplikasi dengan Android N:
-</p>
-
-<p>Contoh kesalahan Java:</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>Contoh kesalahan NDK:</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- Inilah beberapa perbaikan tipikal untuk aplikasi yang mengalami tipe kesalahan ini:
-</p>
-
-<ul>
- <li>Penggunaan getJavaVM dan getJNIEnv dari libandroid_runtime.so bisa diganti
- dengan fungsi JNI standar:
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>Penggunaan simbol {@code property_get} dari {@code libcutils.so} bisa
- diganti dengan {@code alternative __system_property_get} publik.
- Caranya, gunakan {@code __system_property_get} dengan menyertakan yang berikut:
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>Penggunaan simbol {@code SSL_ctrl} dari {@code libcrypto.so} harus
- diganti dengan aplikasi versi lokal. Misalnya, Anda harus menautkan
- {@code libcyrpto.a} secara statis dalam file {@code .so} atau menyertakan
- {@code libcrypto.so} Anda sendiri secara dinamis dari BoringSSL atau OpenSSL dalam aplikasi Anda.
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N berisi perubahan untuk aplikasi yang menargetkan Android for Work, termasuk
- perubahan pada pemasangan sertifikat, penyetelan ulang sandi, manajemen pengguna
- tambahan, dan akses ke identifier perangkat. Jika Anda membangun aplikasi untuk
- lingkungan Android for Work, Anda harus meninjau perubahan ini dan memodifikasi
- aplikasi sebagaimana mestinya.
-</p>
-
-<ul>
- <li>Anda harus pasang pemasang sertifikat yang didelegasikan sebelum DPC bisa
- menyetelnya. Untuk aplikasi profil dan aplikasi pemilik perangkat yang menargetkan N SDK, Anda harus
- pasang pemasang sertifikat yang didelegasikan sebelum pengontrol kebijakan
- perangkat (DPC) memanggil
- <code>DevicePolicyManager.setCertInstallerPackage()</code>. Jika pemasang
- belum dipasang, sistem akan melontarkan
- <code>IllegalArgumentException</code>.
- </li>
-
- <li>Pembatasan sandi penyetelan ulang untuk admin perangkat sekarang diterapkan ke pemilik
- profil. Admin perangkat tidak bisa lagi menggunakan
- {@code DevicePolicyManager.resetPassword()} untuk menghapus sandi atau mengubah
- sandi yang sudah disetel. Admin perangkat tetap bisa menyetel sandi, namun hanya
- bila perangkat belum memiliki sandi, PIN, atau pola.
- </li>
-
- <li>Pemilik perangkat dan profil bisa mengelola akun meskipun pembatasan
- telah disetel. Pemilik perangkat dan pemilik profil bisa memanggil Account Management API
- sekalipun pembatasan pengguna <code>DISALLOW_MODIFY_ACCOUNTS</code> diberlakukan.
- </li>
-
- <li>Pemilik perangkat bisa mengelola pengguna tambahan lebih mudah. Bila perangkat
- berjalan dalam mode pemilik perangkat, maka pembatasan <code>DISALLOW_ADD_USER</code>
- secara otomatis akan ditetapkan. Ini mencegah pengguna membuat pengguna tambahan yang
- tidak terkelola. Selain itu, <code>CreateUser()</code> dan
- <code>createAndInitializeUser()</code> metode tidak digunakan lagi; metode
- <code>DevicePolicyManager.createAndManageUser()</code> telah menggantikannya.
- </li>
-
- <li>Pemilik perangkat bisa mengakses identifier perangkat. Pemilik perangkat bisa mengakses
- alamat MAC Wi-Fi dari perangkat, menggunakan
- <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Jika Wi-Fi belum pernah
- diaktifkan pada perangkat tersebut, metode ini akan mengembalikan nilai {@code null}.
- </li>
-
- <li>Setelan Mode Kerja mengontrol akses ke aplikasi kerja. Bila mode kerja tidak aktif, peluncur sistem
- akan menunjukkan aplikasi kerja tidak tersedia dengan membuat warnanya jadi abu-abu. Mengaktifkan kembali
- mode kerja akan memulihkan perilaku normal.
-</ul>
-
-<p>
- Untuk informasi selengkapnya tentang perubahan Android for Work di Android N, lihat
- <a href="{@docRoot}preview/features/afw.html">Pembaruan Android for Work</a>.
-</p>
-
-<h2 id="annotations">Retensi Anotasi</h2>
-
-<p>
-Android N memperbaiki bug dengan visibilitas anotasi diabaikan.
-Masalah ini mengaktifkan waktu proses untuk mengakses anotasi yang seharusnya tidak bisa
-dilakukan. Anotasi ini termasuk:
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}: Dimaksudkan agar hanya bisa terlihat pada waktu pembuatan.</li>
- <li>{@code VISIBILITY_SYSTEM}: Dimaksud agar bisa terlihat pada waktu proses, namun hanya pada
- sistem yang mendasarinya.</li>
-</ul>
-
-<p>
-Jika aplikasi Anda mengandalkan perilaku ini, tambahkan kebijakan retensi untuk anotasi yang harus
-tersedia di waktu proses. Caranya dengan menggunakan {@code @Retention(RetentionPolicy.RUNTIME)}.
-</p>
-
-<h2 id="other">Poin Penting Lainnya</h2>
-
-<ul>
-<li>Bila aplikasi berjalan pada Android N, namun menargetkan level API yang lebih rendah,
-dan pengguna mengubah ukuran tampilan, proses aplikasi akan dimatikan. Aplikasi
-harus dapat menangani skenario ini dengan lancar. Jika tidak, maka akan mogok
-bila pengguna memulihkannya dari Recents.
-
-<p>
-Anda harus menguji aplikasi untuk memastikan
-perilaku ini tidak terjadi.
-Anda bisa melakukannya dengan menyebabkan suatu mogok yang identik
-saat mematikan aplikasi secara manual melalui DDMS.
-</p>
-
-<p>
-Aplikasi yang menargetkan N dan yang di atasnya tidak secara otomatis dimatikan saat perubahan kepadatan;
-akan tetapi, aplikasi tersebut mungkin tetap merespons perubahan konfigurasi dengan buruk.
-</p>
-</li>
-
-<li>
-Aplikasi pada Android N harus mampu menangani perubahan konfigurasi dengan lancar,
-dan tidak boleh mengalami mogok pada start selanjutnya. Anda bisa memverifikasi perilaku aplikasi
-dengan mengubah ukuran font (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>), kemudian memulihkan
-aplikasi dari Recents.
-</li>
-
-<li>
-Dikarenakan adanya bug di versi Android sebelumnya, sistem tidak menandai penulisan
- ke soket TCP di thread utama sebagai pelanggaran mode-ketat. Android N memperbaiki bug ini.
-Aplikasi yang menunjukkan perilaku ini kini melontarkan sebuah {@code android.os.NetworkOnMainThreadException}.
-Secara umum, melakukan operasi jaringan di thread utama tidak baik karena operasi ini
-biasanya memiliki latensi tinggi yang menyebabkan ANR dan jank.
-</li>
-
-<li>
-Kelompok metode {@code Debug.startMethodTracing()} kini default ke
-keluaran penyimpanan di direktori paket tertentu di penyimpanan bersama,
-sebagai ganti di level teratas
-kartu SD. Berarti aplikasi tidak perlu lagi meminta izin {@code WRITE_EXTERNAL_STORAGE} untuk menggunakan API ini.
-</li>
-
-<li>
-Banyak platform API yang kini mulai memeriksa beban besar yang dikirim
-ke seluruh transaksi {@link android.os.Binder}, dan sistem
-kini melontarkan kembali {@code TransactionTooLargeExceptions}
-sebagai {@code RuntimeExceptions}, sebagai ganti logging secara diam-diam atau menyembunyikannya. Satu contoh
-umum adalah menyimpan terlalu banyak data di
-{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
-yang menyebabkan {@code ActivityThread.StopInfo} melontarkan
-{@code RuntimeException} bila aplikasi Anda menargetkan Android N.
-</li>
-
-<li>
-Jika sebuah aplikasi mengeposkan tugas {@link java.lang.Runnable} ke{@link android.view.View}, dan
-{@link android.view.View}
-tidak terpasang ke jendela, sistem
-akan mengantrekan tugas {@link java.lang.Runnable} dengan {@link android.view.View};
-tugas {@link java.lang.Runnable} tidak akan dieksekusi hingga
-{@link android.view.View} terpasang
-ke jendela. Perilaku ini mengatasi bug berikut:
-<ul>
- <li>Jika sebuah aplikasi mengeposkan ke {@link android.view.View} dari thread selain thread UI jendela yang dimaksud,
- maka {@link java.lang.Runnable} mungkin akan menjalankan thread yang salah.
- </li>
- <li>Jika tugas {@link java.lang.Runnable} diposkan dari thread selain
- looper-thread, aplikasi bisa mengekspos tugas {@link java.lang.Runnable}.</li>
-</ul>
-</li>
-
-<li>
-Jika sebuah aplikasi di Android N dengan
-izin{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
-mencoba menghapus sebuah paket, namun sebuah aplikasi berbeda telah memasang paket itu,
-sistem akan memerlukan konfirmasi pengguna. Dalam skenario ini, aplikasi harus mengharapkan
-{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
-sebagai status kembalian bila memanggil
-{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
-</li>
-
-</ul>
-
diff --git a/docs/html-intl/intl/in/preview/download-ota.jd b/docs/html-intl/intl/in/preview/download-ota.jd
deleted file mode 100644
index 1efe9b7..0000000
--- a/docs/html-intl/intl/in/preview/download-ota.jd
+++ /dev/null
@@ -1,324 +0,0 @@
-page.title=Menerapkan Citra OTA Perangkat
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Sebelum mengunduh dan memasang
- komponen Android Preview SDK, Anda harus menyetujui ketentuan dan persyaratan
- berikut.</p>
-
- <h2 class="norule">Ketentuan dan Persyaratan</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Ini adalah Perjanjian Lisensi Android SDK Preview ("Perjanjian Lisensi").
-
-1. Pengantar
-
-1.1 Android SDK Preview (dalam Perjanjian Lisensi ini disebut "Pratinjau" dan secara spesifik termasuk file sistem Android, paket API, dan file pustaka Pratinjau, jika disediakan) diberikan lisensinya kepada Anda sesuai dengan ketentuan Perjanjian Lisensi. Perjanjian Lisensi ini merupakan kontrak yang mengikat secara hukum antara Anda dan Google dalam kaitannya dengan penggunaan Pratinjau oleh Anda.
-
-1.2 "Android" berarti tumpukan perangkat lunak Android untuk perangkat, seperti yang tersedia di Android Open Source Project, yang ada di URL berikut: http://source.android.com/, yang selalu diperbarui.
-
-1.3 “Kompatibel dengan Android” berarti segala implementasi Android yang (i) sesuai dengan Android Compatibility Definition Document, yang bisa ditemukan di situs web kompatibilitas Android (http://source.android.com/compatibility) dan yang selalu diperbarui; serta (ii) berhasil lulus Android Compatibility Test Suite (CTS).
-
-1.4 "Google" berarti Google Inc., perusahaan asal Delaware dengan kantor bisnis utama di 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Menerima Perjanjian Lisensi
-
-2.1 Agar bisa menggunakan Pratinjau, Anda terlebih dahulu harus menyetujui Perjanjian Lisensi ini. Anda tidak boleh menggunakan Pratinjau jika tidak menerima Perjanjian Lisensi.
-
-2.2 Dengan mengklik untuk menerima dan/atau menggunakan Pratinjau, berarti Anda menyetujui ketentuan Perjanjian Lisensi.
-
-2.3 Anda tidak boleh menggunakan Pratinjau dan tidak boleh menerima Perjanjian Lisensi jika Anda adalah orang yang dilarang menerima Pratinjau berdasarkan hukum Amerika Serikat atau negara lainnya termasuk negara di mana Anda tinggal atau dari mana Anda menggunakan Pratinjau.
-
-2.4 Jika Anda akan menggunakan Pratinjau di lingkungan perusahaan atau organisasi Anda, berarti Anda setuju untuk terikat oleh Perjanjian Lisensi atas nama perusahaan Anda atau entitas lainnya, serta Anda mewakili dan menjamin bahwa Anda memiliki kewenangan hukum penuh untuk mengikat perusahaan Anda atau entitas tersebut pada Perjanjian Lisensi ini. Jika Anda tidak memiliki kewenangan yang disyaratkan, Anda tidak boleh menerima Perjanjian Lisensi atau menggunakan Pratinjau atas nama perusahaan Anda atau entitas lainnya.
-
-3. Lisensi Pratinjau dari Google
-
-3.1 Sesuai dengan ketentuan Perjanjian Lisensi ini, Google memberi Anda lisensi yang tidak bisa disublisensikan, non-eksklusif, tidak bisa dialihkan, bebas royalti, bersifat global dan terbatas dalam menggunakan Pratinjau hanya untuk keperluan pengembangan aplikasi yang kompatibel untuk diimplementasikan pada Android.
-
-3.2 Anda tidak boleh menggunakan Pratinjau ini untuk mengembangkan aplikasi platform lain (termasuk implementasi yang tidak kompatibel pada Android) atau untuk mengembangkan SDK lain. Anda tentu saja bebas mengembangkan aplikasi untuk platform lain, termasuk implementasi yang tidak kompatibel pada Android, karena Pratinjau ini tidak digunakan untuk tujuan tersebut.
-
-3.3 Anda setuju bahwa Google atau pihak ketiga memiliki semua hak, kuasa dan kepentingan hukum dalam dan pada Pratinjau, termasuk Hak Kekayaan Intelektual yang terdapat dalam Pratinjau. "Hak Kekayaan Intelektual" berarti setiap dan semua hak yang berdasarkan pada hukum paten, hukum hak cipta, hukum rahasia dagang, hukum merek dagang, dan setiap dan semua hak kepemilikan lainnya. Google memiliki semua hak yang tidak secara tersurat diberikan kepada Anda.
-
-3.4 Anda tidak boleh menggunakan Pratinjau untuk tujuan apa pun yang tidak secara tersurat diizinkan dalam Perjanjian Lisensi ini. Kecuali sejauh yang diperlukan oleh lisensi pihak ketiga yang berlaku, Anda tidak boleh: (a) menyalin (kecuali untuk keperluan pencadangan), memodifikasi, mengadaptasi, mendistribusikan kembali, mendekompilasi, merekayasa balik, membongkar atau membuat karya turunan dari Pratinjau atau bagian apa pun dari Pratinjau; atau (b) memuat bagian apa pun dari Pratinjau ke sebuah handset ponsel atau perangkat keras selain komputer pribadi, menggabungkan suatu bagian dari Pratinjau dengan perangkat lunak lain, atau mendistribusikan perangkat lunak atau perangkat yang menggabungkan suatu bagian dari Pratinjau.
-
-3.5 Penggunaan, reproduksi dan distribusi komponen Pratinjau yang berlisensi perangkat lunak sumber terbuka diatur semata-mata oleh ketentuan lisensi perangkat lunak sumber terbuka tersebut dan bukan oleh Perjanjian Lisensi ini. Anda menyetujui bagian selebihnya dari lisensi dengan maksud baik sehubungan dengan lisensi perangkat lunak sumber terbuka tersebut sesuai dengan semua hak yang diberikan dan untuk menahan diri dari segala tindakan yang mungkin akan mengakhiri, menangguhkan, atau melanggar hak tersebut.
-
-3.6 Anda setuju bahwa bentuk dan sifat Pratinjau yang disediakan oleh Google dapat berubah tanpa pemberitahuan sebelumnya kepada Anda dan bahwa versi Pratinjau mendatang mungkin tidak kompatibel dengan aplikasi yang dikembangkan di versi Pratinjau sebelumnya. Anda setuju bahwa Google boleh menghentikan (secara permanen atau sementara) penyediaan Pratinjau (atau fitur apa pun dalam Pratinjau) kepada Anda atau pengguna pada umumnya atas kebijakan Google semata, tanpa pemberitahuan sebelumnya kepada Anda.
-
-3.7 Perjanjian Lisensi ini tidak memberi Anda hak untuk menggunakan nama dagang, merek dagang, merek layanan, logo, nama domain, atau fitur merek khas Google lainnya.
-
-3.8 Anda setuju bahwa Anda tidak akan membuang, mengaburkan, atau mengubah pernyataan hak kepemilikan apa pun (termasuk pemberitahuan hak cipta dan merek dagang) yang terlampir atau termuat dalam Pratinjau.
-
-4. Penggunaan Pratinjau oleh Anda
-
-4.1 Google setuju bahwa Perjanjian Lisensi ini tidak memberi Google hak, kuasa, dan kepentingan hukum dari Anda (atau pemberi lisensi Anda) dalam atau pada aplikasi perangkat lunak apa pun yang Anda kembangkan menggunakan Pratinjau ini, termasuk kekayaan intelektual yang ada dalam aplikasi tersebut.
-
-4.2 Anda setuju untuk menggunakan Pratinjau dan menulis aplikasi hanya untuk tujuan yang diizinkan oleh (a) Perjanjian Lisensi, dan (b) hukum yang berlaku, peraturan atau praktik yang diterima secara umum atau panduan dalam yurisdiksi terkait (termasuk hukum mengenai ekspor data atau perangkat lunak ke dan dari Amerika Serikat atau negara lain yang terkait).
-
-4.3 Anda setuju jika Anda menggunakan Pratinjau untuk mengembangkan aplikasi, Anda akan melindungi hak privasi dan hak hukum pengguna. Jika pengguna memberikan nama pengguna, sandi, atau informasi login atau informasi pribadinya, Anda harus membuat pengguna tersebut menyadari bahwa informasi yang diberikannya akan bisa digunakan oleh aplikasi Anda, dan Anda harus memberikan perlindungan dan pemberitahuan privasi yang memadai secara hukum bagi pengguna tersebut. Jika aplikasi Anda menyimpan informasi pribadi atau sensitif yang diberikan oleh pengguna, aplikasi Anda harus melakukannya dengan aman. Jika pengguna memberikan informasi Akun Google, aplikasi Anda hanya boleh menggunakan informasi tersebut untuk mengakses Akun Google pengguna saat, dan untuk tujuan terbatas di mana, pengguna tersebut telah memberikan izin kepada Anda untuk melakukannya.
-
-4.4 Anda setuju bahwa Anda tidak akan terlibat dalam aktivitas apa pun dengan Pratinjau, termasuk pengembangan atau distribusi aplikasi yang mengganggu, mengacaukan, merusak, atau mengakses secara tidak sah server, jaringan atau properti layanan Google atau pihak ketiga lainnya.
-
-4.5 Anda setuju bertanggung jawab penuh untuk (dan bahwa Google tidak bertanggung jawab terhadap Anda atau pihak ketiga lainnya untuk) data, materi, atau sumber daya apa pun yang Anda buat, kirimkan atau tampilkan melalui Android dan/atau aplikasi untuk Android, dan terhadap konsekuensi tindakan Anda (termasuk kerugian atau kerusakan apa pun yang mungkin dialami Google).
-
-4.6 Anda setuju bertanggung jawab penuh terhadap (dan bahwa Google tidak bertanggung jawab terhadap Anda atau pihak ketiga lainnya untuk) pelanggaran kewajiban Anda berdasarkan Perjanjian Lisensi ini, kontrak pihak ketiga yang berlaku atau Ketentuan Layanan, atau hukum atau peraturan yang berlaku, dan terhadap konsekuensi (termasuk kerugian atau kerusakan yang mungkin dialami Google atau pihak ketiga lainnya) akibat pelanggaran tersebut.
-
-4.7 Pratinjau ini dalam tahap pengembangan, dan pengujian serta masukan Anda merupakan bagian penting dalam proses pengembangan. Dengan menggunakan Pratinjau, Anda mengakui bahwa implementasi beberapa fitur masih dalam tahap pengembangan dan bahwa Anda tidak seharusnya mengandalkan Pratinjau berfungsi sepenuhnya sebagaimana pada rilis stabil. Anda setuju untuk tidak mendistribusikan atau mengirimkan untuk umum penggunaan aplikasi menggunakan Pratinjau karena Pratinjau ini tidak akan lagi didukung setelah Android SDK dirilis secara resmi.
-
-5. Kredensial Pengembang Anda
-
-5.1 Anda setuju bertanggung jawab untuk menjaga kerahasiaan semua kredensial pengembang yang mungkin diberikan Google kepada Anda atau yang mungkin Anda pilih sendiri dan bahwa Anda akan bertanggung jawab penuh terhadap semua aplikasi yang dikembangkan dengan kredensial pengembang Anda.
-
-6. Privasi dan Informasi
-
-6.1 Untuk terus berinovasi dan meningkatkan Pratinjau, Google boleh mengumpulkan statistik penggunaan tertentu dari perangkat lunak termasuk namun tidak terbatas pada identifier unik, alamat IP terkait, nomor versi perangkat lunak, dan informasi yang menjadi tempat penggunaan alat dan/atau layanan dalam Pratinjau dan cara penggunaannya. Sebelum informasi ini dikumpulkan, Pratinjau akan memberi tahu dan meminta persetujuan Anda. Jika Anda tidak memberikan persetujuan, informasi tersebut tidak akan dikumpulkan.
-
-6.2 Data yang dikumpulkan akan diperiksa secara agregat untuk meningkatkan Pratinjau dan dikelola sesuai dengan Kebijakan Privasi Google yang terdapat di http://www.google.com/policies/privacy.
-
-7. Aplikasi Pihak Ketiga
-
-7.1 Jika Anda menggunakan Pratinjau untuk menjalankan aplikasi yang dikembangkan oleh pihak ketiga atau yang mengakses data, materi atau sumber daya yang disediakan oleh pihak ketiga, Anda setuju bahwa Google tidak bertanggung jawab terhadap aplikasi, data, materi atau sumber daya tersebut. Anda memahami bahwa semua data, materi atau sumber daya yang mungkin Anda akses melalui aplikasi pihak ketiga merupakan tanggung jawab penuh dari pihak yang menjadi asal data tersebut dan Google tidak bertanggung jawab terhadap kerugian atau kerusakan apa pun yang mungkin Anda alami sebagai akibat menggunakan atau mengakses aplikasi, data, materi, atau sumber daya pihak ketiga tersebut.
-
-7.2 Anda harus menyadari bahwa data, materi dan sumber daya yang diberikan kepada Anda melalui aplikasi pihak ketiga mungkin dilindungi oleh hak kekayaan intelektual yang dimiliki oleh penyedia (atau oleh orang lain atau perusahaan atas nama mereka). Anda tidak boleh memodifikasi, menyewakan, menyewabelikan, meminjamkan, menjual, mendistribusikan atau membuat karya turunan berdasarkan data, materi, atau sumber daya ini (baik secara keseluruhan atau sebagian) kecuali Anda secara khusus diberikan izin untuk melakukannya oleh pemilik yang bersangkutan.
-
-7.3 Anda mengakui bahwa penggunaan Anda atas aplikasi, data, materi, atau sumber daya pihak ketiga semacam itu tunduk pada ketentuan terpisah antara Anda dan pihak ketiga yang bersangkutan.
-
-8. Menggunakan Google API
-
-8.1 Google API
-
-8.1.1 Jika Anda menggunakan API (Antarmuka Pemrograman Aplikasi) untuk mengambil data dari Google, Anda mengakui bahwa data tersebut dilindungi hak kekayaan intelektual yang dimiliki Google atau pihak-pihak yang menyediakan data (atau oleh orang lain atau perusahaan atas nama mereka). Penggunaan API oleh Anda tunduk pada Ketentuan Layanan tambahan. Anda tidak boleh memodifikasi, menyewakan, menyewabelikan, meminjamkan, menjual, mendistribusikan atau membuat karya turunan berdasarkan data ini (baik secara keseluruhan atau sebagian) kecuali diizinkan oleh Ketentuan Layanan yang bersangkutan.
-
-8.1.2 Jika Anda menggunakan API dalam bentuk apa pun untuk mengambil data pengguna dari Google, Anda mengakui dan menyetujui bahwa Anda akan mengambil data hanya dengan persetujuan yang jelas dari pengguna dan hanya bila, dan sebatas keperluan yang diizinkan oleh pengguna tersebut untuk Anda lakukan.
-
-9. Mengakhiri Perjanjian Lisensi
-
-9.1 Perjanjian Lisensi ini akan terus berlaku hingga diakhiri oleh Anda atau Google sebagaimana diatur di bawah ini.
-
-9.2 Jika Anda ingin mengakhiri Perjanjian Lisensi ini, Anda boleh melakukannya dengan menghentikan penggunaan Pratinjau dan kredensial pengembang yang relevan.
-
-9.3 Google boleh mengakhiri Perjanjian Lisensi ini dengan Anda kapan saja, dengan atau tanpa sebab, setelah memberi tahu Anda.
-
-9.4 Perjanjian Lisensi akan berakhir secara otomatis tanpa pemberitahuan atau tindakan lainnya bila, mana saja yang lebih dahulu:
-(A) Google berhenti menyediakan Pratinjau atau bagian Pratinjau tertentu kepada pengguna di negara tempat Anda tinggal atau negara tempat asal Anda menggunakan layanan; dan
-(B) Google mengeluarkan versi rilis final dari Android SDK.
-
-9.5 Bila Perjanjian Lisensi berakhir, lisensi yang telah diberikan kepada Anda dalam Perjanjian Lisensi akan berakhir pula, Anda akan segera menghentikan semua penggunaan Pratinjau, dan ketetapan paragraf 10, 11, 12, dan 14 akan terus berlaku secara tak terbatas.
-
-10. SANGGAHAN
-
-10.1 ANDA SEPENUHNYA MEMAHAMI DAN MENYETUJUI BAHWA PENGGUNAAN PRATINJAU OLEH ANDA MERUPAKAN RISIKO ANDA SENDIRI DAN BAHWA PRATINJAU INI DISEDIAKAN "APA ADANYA" DAN "SEBAGAIMANA TERSEDIA" TANPA JAMINAN DALAM BENTUK APA PUN DARI GOOGLE.
-
-10.2 PENGGUNAAN PRATINJAU DAN MATERI APA PUN YANG DIUNDUH ATAU DIPEROLEH MELALUI PENGGUNAAN PRATINJAU OLEH ANDA ADALAH ATAS KEHENDAK DAN RISIKO ANDA SENDIRI DAN ANDA BERTANGGUNG JAWAB PENUH TERHADAP KERUSAKAN PADA SISTEM KOMPUTER ATAU PERANGKAT LAIN ATAU HILANGNYA DATA AKIBAT PENGGUNAAN TERSEBUT. TANPA MEMBATASI HAL TERSEBUT, ANDA MEMAHAMI BAHWA PRATINJAU BUKANLAH RILIS STABIL DAN MUNGKIN BERISI KESALAHAN, CACAT, DAN RISIKO KEAMANAN YANG BISA MENGAKIBATKAN KERUSAKAN SIGNIFIKAN, TERMASUK KEHILANGAN PENGGUNAAN ATAS SISTEM KOMPUTER ANDA ATAU PERANGKAT LAIN DENGAN SEPENUHNYA DAN TIDAK BISA DIPULIHKAN LAGI.
-
-10.3 GOOGLE LEBIH LANJUT MENYANGGAH SEMUA JAMINAN DAN PERSYARATAN APA PUN, BAIK TERSURAT MAUPUN TERSIRAT, TERMASUK NAMUN TIDAK TERBATAS PADA JAMINAN TERSIRAT DAN PERSYARATAN MENGENAI DAYA JUAL, KESESUAIAN DENGAN TUJUAN TERTENTU, DAN NON-PELANGGARAN.
-
-11. PEMBATASAN KEWAJIBAN
-
-11.1 ANDA SEPENUHNYA MEMAHAMI DAN MENYETUJUI BAHWA GOOGLE, ANAK PERUSAHAAN DAN AFILIASINYA, DAN PEMBERI LISENSINYA TIDAK AKAN BERTANGGUNG JAWAB KEPADA ANDA BERDASARKAN TEORI KEWAJIBAN TERHADAP SEGALA KERUGIAN LANGSUNG, TIDAK LANGSUNG, INSIDENTAL, KHUSUS, JANGKA PANJANG ATAU GANTI RUGI YANG DIAKIBATKAN OLEH ANDA, TERMASUK HILANGNYA DATA, WALAUPUN GOOGLE ATAU PERWAKILANNYA TELAH DIBERI TAHU ATAU SEHARUSNYA MENGETAHUI KEMUNGKINAN TIMBULNYA KEHILANGAN TERSEBUT.
-
-12. Penggantian Kerugian
-
-12.1 Sejauh maksimum yang diizinkan oleh hukum, Anda setuju untuk membela, mengganti kerugian dan melepaskan tanggung jawab Google, afiliasinya beserta direksi, petugas, karyawan dan agennya dari dan terhadap setiap dan semua klaim, tindakan, gugatan, proses hukum, serta setiap dan semua kehilangan, kewajiban, kerusakan, biaya dan pengeluaran (termasuk biaya pengacara yang sewajarnya) yang timbul atau diakibatkan dari (a) penggunaan Pratinjau oleh Anda, (b) aplikasi apa pun yang Anda kembangkan dari Pratinjau yang melanggar Hak Kekayaan Intelektual seseorang atau mencemarkan nama baik seseorang atau melanggar hak mereka berkaitan dengan publisitas atau privasi, dan (c) ketidakpatuhan Anda terhadap Perjanjian Lisensi ini.
-
-13. Perubahan pada Perjanjian Lisensi
-
-13.1 Google boleh membuat perubahan pada Perjanjian Lisensi saat mendistribusikan versi baru Pratinjau. Saat perubahan tersebut dibuat, Google akan menyediakan versi baru Perjanjian Lisensi di situs web penyediaan Pratinjau.
-
-14. Ketentuan Hukum Umum
-
-14.1 Perjanjian Lisensi ini merupakan perjanjian hukum antara Anda dan Google dan mengatur penggunaan Pratinjau oleh Anda (tidak termasuk layanan apa pun yang mungkin disediakan Google untuk Anda dalam perjanjian tertulis terpisah), dan sepenuhnya menggantikan perjanjian sebelumnya antara Anda dan Google dalam kaitannya dengan Pratinjau.
-
-14.2 Anda setuju bahwa jika Google tidak menjalankan atau menerapkan hak atau upaya hukum yang terkandung dalam Perjanjian Lisensi ini (atau bila Google memiliki kewenangan berdasarkan hukum yang berlaku), tindakan ini tidak akan dianggap sebagai pelepasan hak secara resmi oleh Google dan bahwa hak atau upaya hukum tersebut akan tetap bisa digunakan oleh Google.
-
-14.3 Jika persidangan hukum yang berwenang untuk memutuskan perkara ini menetapkan bahwa ada ketetapan Perjanjian Lisensi ini yang tidak valid, maka ketetapan tersebut akan dihapus dari Perjanjian Lisensi tanpa memengaruhi bagian selebihnya dari Perjanjian Lisensi ini. Ketetapan selebihnya dari Perjanjian Lisensi ini akan tetap sah dan berlaku.
-
-14.4 Anda mengakui dan menyetujui bahwa setiap anggota dari kelompok perusahaan yang diinduki oleh Google akan menjadi pihak ketiga penerima manfaat dari Perjanjian Lisensi ini dan bahwa perusahaan tersebut berhak untuk secara langsung memberlakukan, dan bergantung pada, ketetapan yang dimuat dalam Perjanjian Lisensi ini yang memberikan manfaat (atau hak yang mendukung) kepada mereka. Selain yang telah disebutkan di atas, tidak ada orang atau perusahaan lain yang akan menjadi pihak ketiga penerima manfaat dari Perjanjian Lisensi ini
-
-14.5 PEMBATASAN EKSPOR. PRATINJAU TUNDUK PADA HUKUM DAN PERATURAN EKSPOR AMERIKA SERIKAT. ANDA HARUS MEMATUHI SEMUA HUKUM DAN PERATURAN NASIONAL DAN INTERNASIONAL YANG BERLAKU PADA PRATINJAU. HUKUM INI MENYERTAKAN PEMBATASAN ATAS TUJUAN, PENGGUNA AKHIR DAN PENGGUNAAN AKHIR
-
-14.6 Perjanjian Lisensi ini tidak boleh diberikan atau dialihkan baik oleh Anda tanpa persetujuan tertulis sebelumnya dari Google, dan upaya apa pun untuk mengalihkannya tanpa persetujuan akan menjadi tidak sah. Anda tidak boleh mendelegasikan tanggung jawab atau kewajiban berdasarkan Perjanjian Lisensi ini tanpa persetujuan tertulis sebelumnya dari pihak lain.
-
-14.7 Perjanjian Lisensi ini, dan hubungan Anda dengan Google berdasarkan Perjanjian Lisensi ini, akan diatur oleh hukum Negara Bagian California tanpa mengindahkan pertentangan ketetapan hukumnya. Anda dan Google setuju untuk tunduk pada yurisdiksi eksklusif pengadilan yang berlokasi di county Santa Clara, California untuk menyelesaikan segala masalah hukum yang timbul dari Perjanjian Lisensi ini. Meski demikian, Anda setuju bahwa Google akan tetap diizinkan untuk mengajukan upaya hukum (atau tipe keringanan hukum setara yang mendesak) dalam yurisdiksi apa pun.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">Saya telah membaca dan menyetujui ketentuan dan persyaratan di atas</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- Halaman ini menyediakan tautan ke citra perangkat lewat jaringan seluler (OTA) dan menjelaskan
- cara menerapkan pembaruan OTA secara manual ke suatu perangkat. Prosedur ini berguna
- untuk memulihkan perangkat yang menerima pembaruan OTA melalui Android Beta
- Program dan tidak jalan setelah pembaruan dipasang.
-</p>
-
-<h2 id="install-ota">Memasang Citra OTA</h2>
-
-<p></p>
-
-<p>Untuk pasang OTA pada perangkat:</p>
-
-<ol>
- <li>Unduh citra perangkat OTA dari tabel di bawah.</li>
- <li>Boot ulang perangkat ke dalam mode Recovery. Untuk informasi selengkapnya mengenai cara masuk ke mode ini
- di perangkat Nexus, lihat
- <a href="https://support.google.com/nexus/answer/4596836">Setel ulang perangkat Nexus
- Anda ke setelan pabrik</a>.
- </li>
- <li>Pada perangkat, pilih <strong>ADB sideload</strong>.</li>
- <li>Hubungkan perangkat ke komputer dengan lingkungan pengembangan Android
- yang telah dimuat dan alat Android Debug Bridge (adb) yang telah dipasang.</li>
- <li>Jalankan perintah berikut:
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">Citra OTA Perangkat</h2>
-
-<table>
- <tr>
- <th scope="col">Perangkat</th>
- <th scope="col">Unduhan / Checksum</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-ota-npd35k-b8cfbd80.zip</a><br>
- MD5: 15fe2eba9b01737374196bdf0a792fe9<br>
- SHA-1: 5014b2bba77f9e1a680ac3f90729621c85a14283
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-ota-npd35k-078e6fa5.zip</a><br>
- MD5: e8b12f7721c53af9a450f7058928a5fc<br>
- SHA-1: b7a9b756f84a1d2e482ff9c16749d65f6e51425a
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-ota-npd35k-88457699.zip</a><br>
- MD5: 3fac09fef759dde26e57cb80b20b6477<br>
- SHA-1: 27d6caa786577d8a38b2da5bf94b33b4524a1a1c
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-ota-npd35k-51dbae76.zip</a><br>
- MD5: 58312c4a5971818ef5c77a3f446003da<br>
- SHA-1: aad9005be33d3e2bab480509a6ab74c3c3b9d921
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-ota-npd35k-834f047f.zip</a><br>
- MD5: 92b7d1fa252f7394e70f957c72d4aac8<br>
- SHA-1: b6c057c84d90893630e303cbb60530e20ddb8361
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-ota-npd35k-6ac91298.zip</a><br>
- MD5: 1461622ad53ea842b2722fa7b49b8172<br>
- SHA-1: 409c061668ab270774877d7f3eae44fa48d2b931
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-ota-npd35k-a0b2347f.zip</a><br>
- MD5: c60117f3640cc6db12386fd632289c7d<br>
- SHA-1: 87349c767c69efb4172c90ce1d88cf578c3d28b3
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-ota-npd35k-09897a1d.zip</a><br>
- MD5: a55cf94f7cce0393ec6c0b35041766b7<br>
- SHA-1: 6f33742290eb46f2561891f38ca2e754b4e50c6a
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verifikasi apakah TOS disetujui */
- if ($("input#agree").is(":checked")) {
- /* tampilkan tombol unduh */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/in/preview/download.jd b/docs/html-intl/intl/in/preview/download.jd
deleted file mode 100644
index a759a11..0000000
--- a/docs/html-intl/intl/in/preview/download.jd
+++ /dev/null
@@ -1,543 +0,0 @@
-page.title=Menguji pada Perangkat
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Sebelum mengunduh dan memasang
- komponen Android Preview SDK, Anda harus menyetujui ketentuan dan persyaratan
- berikut.</p>
-
- <h2 class="norule">Ketentuan dan Persyaratan</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Ini adalah Perjanjian Lisensi Android SDK Preview ("Perjanjian Lisensi").
-
-1. Pengantar
-
-1.1 Android SDK Preview (dalam Perjanjian Lisensi ini disebut "Pratinjau" dan secara spesifik termasuk file sistem Android, paket API, dan file pustaka Pratinjau, jika disediakan) diberikan lisensinya kepada Anda sesuai dengan ketentuan Perjanjian Lisensi. Perjanjian Lisensi ini merupakan kontrak yang mengikat secara hukum antara Anda dan Google dalam kaitannya dengan penggunaan Pratinjau oleh Anda.
-
-1.2 "Android" berarti tumpukan perangkat lunak Android untuk perangkat, seperti yang tersedia di Android Open Source Project, yang ada di URL berikut: http://source.android.com/, yang selalu diperbarui.
-
-1.3 “Kompatibel dengan Android” berarti segala implementasi Android yang (i) sesuai dengan Android Compatibility Definition Document, yang bisa ditemukan di situs web kompatibilitas Android (http://source.android.com/compatibility) dan yang selalu diperbarui; serta (ii) berhasil lulus Android Compatibility Test Suite (CTS).
-
-1.4 "Google" berarti Google Inc., perusahaan asal Delaware dengan kantor bisnis utama di 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Menerima Perjanjian Lisensi
-
-2.1 Agar bisa menggunakan Pratinjau, Anda terlebih dahulu harus menyetujui Perjanjian Lisensi ini. Anda tidak boleh menggunakan Pratinjau jika tidak menerima Perjanjian Lisensi.
-
-2.2 Dengan mengklik untuk menerima dan/atau menggunakan Pratinjau, berarti Anda menyetujui ketentuan Perjanjian Lisensi.
-
-2.3 Anda tidak boleh menggunakan Pratinjau dan tidak boleh menerima Perjanjian Lisensi jika Anda adalah orang yang dilarang menerima Pratinjau berdasarkan hukum Amerika Serikat atau negara lainnya termasuk negara di mana Anda tinggal atau dari mana Anda menggunakan Pratinjau.
-
-2.4 Jika Anda akan menggunakan Pratinjau di lingkungan perusahaan atau organisasi Anda, berarti Anda setuju untuk terikat oleh Perjanjian Lisensi atas nama perusahaan Anda atau entitas lainnya, serta Anda mewakili dan menjamin bahwa Anda memiliki kewenangan hukum penuh untuk mengikat perusahaan Anda atau entitas tersebut pada Perjanjian Lisensi ini. Jika Anda tidak memiliki kewenangan yang disyaratkan, Anda tidak boleh menerima Perjanjian Lisensi atau menggunakan Pratinjau atas nama perusahaan Anda atau entitas lainnya.
-
-3. Lisensi Pratinjau dari Google
-
-3.1 Sesuai dengan ketentuan Perjanjian Lisensi ini, Google memberi Anda lisensi yang tidak bisa disublisensikan, non-eksklusif, tidak bisa dialihkan, bebas royalti, bersifat global dan terbatas dalam menggunakan Pratinjau hanya untuk keperluan pengembangan aplikasi yang kompatibel untuk diimplementasikan pada Android.
-
-3.2 Anda tidak boleh menggunakan Pratinjau ini untuk mengembangkan aplikasi platform lain (termasuk implementasi yang tidak kompatibel pada Android) atau untuk mengembangkan SDK lain. Anda tentu saja bebas mengembangkan aplikasi untuk platform lain, termasuk implementasi yang tidak kompatibel pada Android, karena Pratinjau ini tidak digunakan untuk tujuan tersebut.
-
-3.3 Anda setuju bahwa Google atau pihak ketiga memiliki semua hak, kuasa dan kepentingan hukum dalam dan pada Pratinjau, termasuk Hak Kekayaan Intelektual yang terdapat dalam Pratinjau. "Hak Kekayaan Intelektual" berarti setiap dan semua hak yang berdasarkan pada hukum paten, hukum hak cipta, hukum rahasia dagang, hukum merek dagang, dan setiap dan semua hak kepemilikan lainnya. Google memiliki semua hak yang tidak secara tersurat diberikan kepada Anda.
-
-3.4 Anda tidak boleh menggunakan Pratinjau untuk tujuan apa pun yang tidak secara tersurat diizinkan dalam Perjanjian Lisensi ini. Kecuali sejauh yang diperlukan oleh lisensi pihak ketiga yang berlaku, Anda tidak boleh: (a) menyalin (kecuali untuk keperluan pencadangan), memodifikasi, mengadaptasi, mendistribusikan kembali, mendekompilasi, merekayasa balik, membongkar atau membuat karya turunan dari Pratinjau atau bagian apa pun dari Pratinjau; atau (b) memuat bagian apa pun dari Pratinjau ke sebuah handset ponsel atau perangkat keras selain komputer pribadi, menggabungkan suatu bagian dari Pratinjau dengan perangkat lunak lain, atau mendistribusikan perangkat lunak atau perangkat yang menggabungkan suatu bagian dari Pratinjau.
-
-3.5 Penggunaan, reproduksi dan distribusi komponen Pratinjau yang berlisensi perangkat lunak sumber terbuka diatur semata-mata oleh ketentuan lisensi perangkat lunak sumber terbuka tersebut dan bukan oleh Perjanjian Lisensi ini. Anda menyetujui bagian selebihnya dari lisensi dengan maksud baik sehubungan dengan lisensi perangkat lunak sumber terbuka tersebut sesuai dengan semua hak yang diberikan dan untuk menahan diri dari segala tindakan yang mungkin akan mengakhiri, menangguhkan, atau melanggar hak tersebut.
-
-3.6 Anda setuju bahwa bentuk dan sifat Pratinjau yang disediakan oleh Google dapat berubah tanpa pemberitahuan sebelumnya kepada Anda dan bahwa versi Pratinjau mendatang mungkin tidak kompatibel dengan aplikasi yang dikembangkan di versi Pratinjau sebelumnya. Anda setuju bahwa Google boleh menghentikan (secara permanen atau sementara) penyediaan Pratinjau (atau fitur apa pun dalam Pratinjau) kepada Anda atau pengguna pada umumnya atas kebijakan Google semata, tanpa pemberitahuan sebelumnya kepada Anda.
-
-3.7 Perjanjian Lisensi ini tidak memberi Anda hak untuk menggunakan nama dagang, merek dagang, merek layanan, logo, nama domain, atau fitur merek khas Google lainnya.
-
-3.8 Anda setuju bahwa Anda tidak akan membuang, mengaburkan, atau mengubah pernyataan hak kepemilikan apa pun (termasuk pemberitahuan hak cipta dan merek dagang) yang terlampir atau termuat dalam Pratinjau.
-
-4. Penggunaan Pratinjau oleh Anda
-
-4.1 Google setuju bahwa Perjanjian Lisensi ini tidak memberi Google hak, kuasa, dan kepentingan hukum dari Anda (atau pemberi lisensi Anda) dalam atau pada aplikasi perangkat lunak apa pun yang Anda kembangkan menggunakan Pratinjau ini, termasuk kekayaan intelektual yang ada dalam aplikasi tersebut.
-
-4.2 Anda setuju untuk menggunakan Pratinjau dan menulis aplikasi hanya untuk tujuan yang diizinkan oleh (a) Perjanjian Lisensi, dan (b) hukum yang berlaku, peraturan atau praktik yang diterima secara umum atau panduan dalam yurisdiksi terkait (termasuk hukum mengenai ekspor data atau perangkat lunak ke dan dari Amerika Serikat atau negara lain yang terkait).
-
-4.3 Anda setuju jika Anda menggunakan Pratinjau untuk mengembangkan aplikasi, Anda akan melindungi hak privasi dan hak hukum pengguna. Jika pengguna memberikan nama pengguna, sandi, atau informasi login atau informasi pribadinya, Anda harus membuat pengguna tersebut menyadari bahwa informasi yang diberikannya akan bisa digunakan oleh aplikasi Anda, dan Anda harus memberikan perlindungan dan pemberitahuan privasi yang memadai secara hukum bagi pengguna tersebut. Jika aplikasi Anda menyimpan informasi pribadi atau sensitif yang diberikan oleh pengguna, aplikasi Anda harus melakukannya dengan aman. Jika pengguna memberikan informasi Akun Google, aplikasi Anda hanya boleh menggunakan informasi tersebut untuk mengakses Akun Google pengguna saat, dan untuk tujuan terbatas di mana, pengguna tersebut telah memberikan izin kepada Anda untuk melakukannya.
-
-4.4 Anda setuju bahwa Anda tidak akan terlibat dalam aktivitas apa pun dengan Pratinjau, termasuk pengembangan atau distribusi aplikasi yang mengganggu, mengacaukan, merusak, atau mengakses secara tidak sah server, jaringan atau properti layanan Google atau pihak ketiga lainnya.
-
-4.5 Anda setuju bertanggung jawab penuh untuk (dan bahwa Google tidak bertanggung jawab terhadap Anda atau pihak ketiga lainnya untuk) data, materi, atau sumber daya apa pun yang Anda buat, kirimkan atau tampilkan melalui Android dan/atau aplikasi untuk Android, dan terhadap konsekuensi tindakan Anda (termasuk kerugian atau kerusakan apa pun yang mungkin dialami Google).
-
-4.6 Anda setuju bertanggung jawab penuh terhadap (dan bahwa Google tidak bertanggung jawab terhadap Anda atau pihak ketiga lainnya untuk) pelanggaran kewajiban Anda berdasarkan Perjanjian Lisensi ini, kontrak pihak ketiga yang berlaku atau Ketentuan Layanan, atau hukum atau peraturan yang berlaku, dan terhadap konsekuensi (termasuk kerugian atau kerusakan yang mungkin dialami Google atau pihak ketiga lainnya) akibat pelanggaran tersebut.
-
-4.7 Pratinjau ini dalam tahap pengembangan, dan pengujian serta masukan Anda merupakan bagian penting dalam proses pengembangan. Dengan menggunakan Pratinjau, Anda mengakui bahwa implementasi beberapa fitur masih dalam tahap pengembangan dan bahwa Anda tidak seharusnya mengandalkan Pratinjau berfungsi sepenuhnya sebagaimana pada rilis stabil. Anda setuju untuk tidak mendistribusikan atau mengirimkan untuk umum penggunaan aplikasi menggunakan Pratinjau karena Pratinjau ini tidak akan lagi didukung setelah Android SDK dirilis secara resmi.
-
-5. Kredensial Pengembang Anda
-
-5.1 Anda setuju bertanggung jawab untuk menjaga kerahasiaan semua kredensial pengembang yang mungkin diberikan Google kepada Anda atau yang mungkin Anda pilih sendiri dan bahwa Anda akan bertanggung jawab penuh terhadap semua aplikasi yang dikembangkan dengan kredensial pengembang Anda.
-
-6. Privasi dan Informasi
-
-6.1 Untuk terus berinovasi dan meningkatkan Pratinjau, Google boleh mengumpulkan statistik penggunaan tertentu dari perangkat lunak termasuk namun tidak terbatas pada identifier unik, alamat IP terkait, nomor versi perangkat lunak, dan informasi yang menjadi tempat penggunaan alat dan/atau layanan dalam Pratinjau dan cara penggunaannya. Sebelum informasi ini dikumpulkan, Pratinjau akan memberi tahu dan meminta persetujuan Anda. Jika Anda tidak memberikan persetujuan, informasi tersebut tidak akan dikumpulkan.
-
-6.2 Data yang dikumpulkan akan diperiksa secara agregat untuk meningkatkan Pratinjau dan dikelola sesuai dengan Kebijakan Privasi Google yang terdapat di http://www.google.com/policies/privacy.
-
-7. Aplikasi Pihak Ketiga
-
-7.1 Jika Anda menggunakan Pratinjau untuk menjalankan aplikasi yang dikembangkan oleh pihak ketiga atau yang mengakses data, materi atau sumber daya yang disediakan oleh pihak ketiga, Anda setuju bahwa Google tidak bertanggung jawab terhadap aplikasi, data, materi atau sumber daya tersebut. Anda memahami bahwa semua data, materi atau sumber daya yang mungkin Anda akses melalui aplikasi pihak ketiga merupakan tanggung jawab penuh dari pihak yang menjadi asal data tersebut dan Google tidak bertanggung jawab terhadap kerugian atau kerusakan apa pun yang mungkin Anda alami sebagai akibat menggunakan atau mengakses aplikasi, data, materi, atau sumber daya pihak ketiga tersebut.
-
-7.2 Anda harus menyadari bahwa data, materi dan sumber daya yang diberikan kepada Anda melalui aplikasi pihak ketiga mungkin dilindungi oleh hak kekayaan intelektual yang dimiliki oleh penyedia (atau oleh orang lain atau perusahaan atas nama mereka). Anda tidak boleh memodifikasi, menyewakan, menyewabelikan, meminjamkan, menjual, mendistribusikan atau membuat karya turunan berdasarkan data, materi, atau sumber daya ini (baik secara keseluruhan atau sebagian) kecuali Anda secara khusus diberikan izin untuk melakukannya oleh pemilik yang bersangkutan.
-
-7.3 Anda mengakui bahwa penggunaan Anda atas aplikasi, data, materi, atau sumber daya pihak ketiga semacam itu tunduk pada ketentuan terpisah antara Anda dan pihak ketiga yang bersangkutan.
-
-8. Menggunakan Google API
-
-8.1 Google API
-
-8.1.1 Jika Anda menggunakan API (Antarmuka Pemrograman Aplikasi) untuk mengambil data dari Google, Anda mengakui bahwa data tersebut dilindungi hak kekayaan intelektual yang dimiliki Google atau pihak-pihak yang menyediakan data (atau oleh orang lain atau perusahaan atas nama mereka). Penggunaan API oleh Anda tunduk pada Ketentuan Layanan tambahan. Anda tidak boleh memodifikasi, menyewakan, menyewabelikan, meminjamkan, menjual, mendistribusikan atau membuat karya turunan berdasarkan data ini (baik secara keseluruhan atau sebagian) kecuali diizinkan oleh Ketentuan Layanan yang bersangkutan.
-
-8.1.2 Jika Anda menggunakan API dalam bentuk apa pun untuk mengambil data pengguna dari Google, Anda mengakui dan menyetujui bahwa Anda akan mengambil data hanya dengan persetujuan yang jelas dari pengguna dan hanya bila, dan sebatas keperluan yang diizinkan oleh pengguna tersebut untuk Anda lakukan.
-
-9. Mengakhiri Perjanjian Lisensi
-
-9.1 Perjanjian Lisensi ini akan terus berlaku hingga diakhiri oleh Anda atau Google sebagaimana diatur di bawah ini.
-
-9.2 Jika Anda ingin mengakhiri Perjanjian Lisensi ini, Anda boleh melakukannya dengan menghentikan penggunaan Pratinjau dan kredensial pengembang yang relevan.
-
-9.3 Google boleh mengakhiri Perjanjian Lisensi ini dengan Anda kapan saja, dengan atau tanpa sebab, setelah memberi tahu Anda.
-
-9.4 Perjanjian Lisensi akan berakhir secara otomatis tanpa pemberitahuan atau tindakan lainnya bila, mana saja yang lebih dahulu:
-(A) Google berhenti menyediakan Pratinjau atau bagian Pratinjau tertentu kepada pengguna di negara tempat Anda tinggal atau negara tempat asal Anda menggunakan layanan; dan
-(B) Google mengeluarkan versi rilis final dari Android SDK.
-
-9.5 Bila Perjanjian Lisensi berakhir, lisensi yang telah diberikan kepada Anda dalam Perjanjian Lisensi akan berakhir pula, Anda akan segera menghentikan semua penggunaan Pratinjau, dan ketetapan paragraf 10, 11, 12, dan 14 akan terus berlaku secara tak terbatas.
-
-10. SANGGAHAN
-
-10.1 ANDA SEPENUHNYA MEMAHAMI DAN MENYETUJUI BAHWA PENGGUNAAN PRATINJAU OLEH ANDA MERUPAKAN RISIKO ANDA SENDIRI DAN BAHWA PRATINJAU INI DISEDIAKAN "APA ADANYA" DAN "SEBAGAIMANA TERSEDIA" TANPA JAMINAN DALAM BENTUK APA PUN DARI GOOGLE.
-
-10.2 PENGGUNAAN PRATINJAU DAN MATERI APA PUN YANG DIUNDUH ATAU DIPEROLEH MELALUI PENGGUNAAN PRATINJAU OLEH ANDA ADALAH ATAS KEHENDAK DAN RISIKO ANDA SENDIRI DAN ANDA BERTANGGUNG JAWAB PENUH TERHADAP KERUSAKAN PADA SISTEM KOMPUTER ATAU PERANGKAT LAIN ATAU HILANGNYA DATA AKIBAT PENGGUNAAN TERSEBUT. TANPA MEMBATASI HAL TERSEBUT, ANDA MEMAHAMI BAHWA PRATINJAU BUKANLAH RILIS STABIL DAN MUNGKIN BERISI KESALAHAN, CACAT, DAN RISIKO KEAMANAN YANG BISA MENGAKIBATKAN KERUSAKAN SIGNIFIKAN, TERMASUK KEHILANGAN PENGGUNAAN ATAS SISTEM KOMPUTER ANDA ATAU PERANGKAT LAIN DENGAN SEPENUHNYA DAN TIDAK BISA DIPULIHKAN LAGI.
-
-10.3 GOOGLE LEBIH LANJUT MENYANGGAH SEMUA JAMINAN DAN PERSYARATAN APA PUN, BAIK TERSURAT MAUPUN TERSIRAT, TERMASUK NAMUN TIDAK TERBATAS PADA JAMINAN TERSIRAT DAN PERSYARATAN MENGENAI DAYA JUAL, KESESUAIAN DENGAN TUJUAN TERTENTU, DAN NON-PELANGGARAN.
-
-11. PEMBATASAN KEWAJIBAN
-
-11.1 ANDA SEPENUHNYA MEMAHAMI DAN MENYETUJUI BAHWA GOOGLE, ANAK PERUSAHAAN DAN AFILIASINYA, DAN PEMBERI LISENSINYA TIDAK AKAN BERTANGGUNG JAWAB KEPADA ANDA BERDASARKAN TEORI KEWAJIBAN TERHADAP SEGALA KERUGIAN LANGSUNG, TIDAK LANGSUNG, INSIDENTAL, KHUSUS, JANGKA PANJANG ATAU GANTI RUGI YANG DIAKIBATKAN OLEH ANDA, TERMASUK HILANGNYA DATA, WALAUPUN GOOGLE ATAU PERWAKILANNYA TELAH DIBERI TAHU ATAU SEHARUSNYA MENGETAHUI KEMUNGKINAN TIMBULNYA KEHILANGAN TERSEBUT.
-
-12. Penggantian Kerugian
-
-12.1 Sejauh maksimum yang diizinkan oleh hukum, Anda setuju untuk membela, mengganti kerugian dan melepaskan tanggung jawab Google, afiliasinya beserta direksi, petugas, karyawan dan agennya dari dan terhadap setiap dan semua klaim, tindakan, gugatan, proses hukum, serta setiap dan semua kehilangan, kewajiban, kerusakan, biaya dan pengeluaran (termasuk biaya pengacara yang sewajarnya) yang timbul atau diakibatkan dari (a) penggunaan Pratinjau oleh Anda, (b) aplikasi apa pun yang Anda kembangkan dari Pratinjau yang melanggar Hak Kekayaan Intelektual seseorang atau mencemarkan nama baik seseorang atau melanggar hak mereka berkaitan dengan publisitas atau privasi, dan (c) ketidakpatuhan Anda terhadap Perjanjian Lisensi ini.
-
-13. Perubahan pada Perjanjian Lisensi
-
-13.1 Google boleh membuat perubahan pada Perjanjian Lisensi saat mendistribusikan versi baru Pratinjau. Saat perubahan tersebut dibuat, Google akan menyediakan versi baru Perjanjian Lisensi di situs web penyediaan Pratinjau.
-
-14. Ketentuan Hukum Umum
-
-14.1 Perjanjian Lisensi ini merupakan perjanjian hukum antara Anda dan Google dan mengatur penggunaan Pratinjau oleh Anda (tidak termasuk layanan apa pun yang mungkin disediakan Google untuk Anda dalam perjanjian tertulis terpisah), dan sepenuhnya menggantikan perjanjian sebelumnya antara Anda dan Google dalam kaitannya dengan Pratinjau.
-
-14.2 Anda setuju bahwa jika Google tidak menjalankan atau menerapkan hak atau upaya hukum yang terkandung dalam Perjanjian Lisensi ini (atau bila Google memiliki kewenangan berdasarkan hukum yang berlaku), tindakan ini tidak akan dianggap sebagai pelepasan hak secara resmi oleh Google dan bahwa hak atau upaya hukum tersebut akan tetap bisa digunakan oleh Google.
-
-14.3 Jika persidangan hukum yang berwenang untuk memutuskan perkara ini menetapkan bahwa ada ketetapan Perjanjian Lisensi ini yang tidak valid, maka ketetapan tersebut akan dihapus dari Perjanjian Lisensi tanpa memengaruhi bagian selebihnya dari Perjanjian Lisensi ini. Ketetapan selebihnya dari Perjanjian Lisensi ini akan tetap sah dan berlaku.
-
-14.4 Anda mengakui dan menyetujui bahwa setiap anggota dari kelompok perusahaan yang diinduki oleh Google akan menjadi pihak ketiga penerima manfaat dari Perjanjian Lisensi ini dan bahwa perusahaan tersebut berhak untuk secara langsung memberlakukan, dan bergantung pada, ketetapan yang dimuat dalam Perjanjian Lisensi ini yang memberikan manfaat (atau hak yang mendukung) kepada mereka. Selain yang telah disebutkan di atas, tidak ada orang atau perusahaan lain yang akan menjadi pihak ketiga penerima manfaat dari Perjanjian Lisensi ini
-
-14.5 PEMBATASAN EKSPOR. PRATINJAU TUNDUK PADA HUKUM DAN PERATURAN EKSPOR AMERIKA SERIKAT. ANDA HARUS MEMATUHI SEMUA HUKUM DAN PERATURAN NASIONAL DAN INTERNASIONAL YANG BERLAKU PADA PRATINJAU. HUKUM INI MENYERTAKAN PEMBATASAN ATAS TUJUAN, PENGGUNA AKHIR DAN PENGGUNAAN AKHIR
-
-14.6 Perjanjian Lisensi ini tidak boleh diberikan atau dialihkan baik oleh Anda tanpa persetujuan tertulis sebelumnya dari Google, dan upaya apa pun untuk mengalihkannya tanpa persetujuan akan menjadi tidak sah. Anda tidak boleh mendelegasikan tanggung jawab atau kewajiban berdasarkan Perjanjian Lisensi ini tanpa persetujuan tertulis sebelumnya dari pihak lain.
-
-14.7 Perjanjian Lisensi ini, dan hubungan Anda dengan Google berdasarkan Perjanjian Lisensi ini, akan diatur oleh hukum Negara Bagian California tanpa mengindahkan pertentangan ketetapan hukumnya. Anda dan Google setuju untuk tunduk pada yurisdiksi eksklusif pengadilan yang berlokasi di county Santa Clara, California untuk menyelesaikan segala masalah hukum yang timbul dari Perjanjian Lisensi ini. Meski demikian, Anda setuju bahwa Google akan tetap diizinkan untuk mengajukan upaya hukum (atau tipe keringanan hukum setara yang mendesak) dalam yurisdiksi apa pun.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">Saya telah membaca dan menyetujui ketentuan dan persyaratan di atas</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Dalam dokumen ini</h2>
- <ol>
- <li><a href="#device-preview">Menyiapkan perangkat keras</a>
- <ol>
- <li><a href="#ota">Mendapatkan pembaruan lewat jaringan seluler</a></li>
- <li><a href="#flash">Mem-flash perangkat secara manual</a></li>
- <li><a href="#revertDevice">Mencopot pemasangan</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">Menyiapkan emulator</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Untuk menjalankan dan menguji aplikasi Anda pada platform baru, Anda perlu menyiapkan lingkungan waktu proses
- Android N. Anda bisa melakukannya dengan salah satu cara ini:
-</p>
-
-<ul>
- <li>Pasang Android N pada perangkat keras yang didukung, atau</li>
- <li>Siapkan emulator Android yang menjalankan Android N</li>
-</ul>
-
-<p>
- Jika Anda ingin lingkungan untuk pengujian kompatibilitas dasar aplikasi Anda pada
- platform baru, maka Anda hanya perlu APK saat ini dan perangkat keras atau
- emulator. Anda tidak perlu memperbarui lingkungan
- pengembangan penuh untuk melakukan pengujian dasar.
-</p>
-
-<p>
- Jika Anda ingin memodifikasi aplikasi untuk menargetkan Android N atau menggunakan Android N API baru,
- Anda perlu menyiapkan lingkungan pengembangan yang telah diperbarui untuk mendukung
- Android N. <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan Pengembangan
- Android N</a> berisi detail mengenai hal ini.
-</p>
-
-
-<h2 id="device-preview">Menyiapkan perangkat keras</h2>
-
-<p>
- N Developer Preview menawarkan pembaruan sistem untuk berbagai jenis perangkat keras
- yang bisa Anda gunakan untuk menguji aplikasi Anda, dari ponsel hingga tablet dan TV.
-</p>
-
-<p>
- Jika Anda memiliki akses ke perangkat yang didukung, Anda bisa memperbaruinya ke build tahapan pencapaian Developer
- Preview dengan salah satu cara berikut:
-</p>
-
-<ul>
- <li><strong>Daftarkan perangkat dalam pembaruan sistem OTA otomatis</strong> melalui
- <a href="https://g.co/androidbeta">Android Beta Program</a>. Setelah didaftarkan, perangkat Anda akan secara teratur menerima
- pembaruan lewat jaringan seluler (OTA) untuk semua build tahapan pencapaian dalam N Developer Preview. Pendekatan
- ini disarankan karena akan membantu Anda melakukan transisi secara mulus dari lingkungan saat ini
- ke berbagai rilis N Developer Preview.</li>
- <li><strong>Unduh citra sistem Developer Preview dan flash perangkat</strong>.
- Pembaruan OTA tidak disediakan secara otomatis untuk perangkat yang Anda flash secara manual, namun
- Anda bisa mendaftarkan perangkat tersebut dalam Android Beta Program untuk memperoleh pembaruan OTA. </li>
-</ul>
-
-<h3 id="ota">Daftarkan perangkat dalam pembaruan OTA otomatis</h3>
-
-<p>
- Jika Anda memiliki akses ke perangkat yang didukung (lihat daftar dalam tabel
- Unduhan), Anda bisa menerima pembaruan lewat jaringan seluler ke versi pratinjau Android
- dengan mendaftarkan perangkat itu ke <a href="https://g.co/androidbeta">Android Beta Program</a>. Pembaruan ini
- secara otomatis akan diunduh dan memperbarui perangkat Anda seperti
- pembaruan sistem resmi.
-</p>
-
-<p>
- Anda bisa membatalkan pendaftaran perangkat kapan saja. Perangkat akan menerima pembaruan OTA
- ke versi produksi terbaru Android yang tersedia untuk perangkat itu
- (misalnya, Android 6.0 Marshmallow). Pembaruan mengharuskan penyetelan ulang
- perangkat secara penuh, jadi data pengguna pada perangkat itu akan dibuang. Pastikan <strong>mencadangkan
- data penting</strong> sebelum membatalkan pendaftaran perangkat.
-</p>
-
-<p>
- Untuk informasi selengkapnya dan untuk mendaftarkan perangkat Anda, lihat
- situs web <a href="https://g.co/androidbeta">Android Beta Program</a>.
-</p>
-
-<p class="note"><strong>Catatan:</strong>
- Membatalkan pendaftaran mengharuskan penyetelan ulang perangkat secara penuh. Cadangkan
- data penting terlebih dahulu.
-</p>
-
-<h3 id="flash">Mem-flash perangkat secara manual</h3>
-
-<p>
- Anda bisa mengunduh citra sistem Developer Preview terbaru dan
- mem-flash-nya secara manual ke perangkat Anda kapan saja. Lihat tabel di bawah untuk mengunduh citra
- sistem perangkat pengujian Anda. Mem-flash perangkat secara manual berguna jika Anda harus
- mengontrol secara persis lingkungan pengujian tersebut atau harus memasang ulang secara rutin,
- misalnya untuk pengujian otomatis.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- Memasang citra sistem pada perangkat <strong>akan membuang semua data dari
- perangkat</strong>, karena itu Anda harus mencadangkan data terlebih dahulu.
-</p>
-
-<p>
- Setelah Anda mencadangkan data perangkat dan mengunduh citra sistem di bawah ini yang
- sesuai dengan perangkat Anda, ikuti petunjuk di <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
- untuk mem-flash citra ini ke perangkat Anda.
-</p>
-
-<p>
- Citra sistem yang di-flash secara manual <strong>tidak secara otomatis akan
- menerima pembaruan OTA</strong> ke build tahapan pencapaian Developer Preview
- terbaru. Pastikan lingkungan Anda selalu diperbarui dan lakukan flash
- citra sistem yang baru di setiap tahapan pencapaian Developer Preview.
-</p>
-
-<p>
- Jika Anda memutuskan ingin mendapatkan pembaruan OTA setelah mem-flash perangkat secara manual,
- Anda tinggal mendaftarkan perangkat dalam <a href="https://g.co/androidbeta">
- Android Beta Program</a>. Anda bisa mendaftarkan perangkat kapan saja untuk menerima pembaruan Pratinjau
- berikutnya lewat jaringan seluler.
-</p>
-
-<table>
- <tr>
- <th scope="col">Perangkat</th>
- <th scope="col">Unduhan / Checksum</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npd35k-factory-5ba40535.tgz</a><br>
- MD5: b6c5d79a21815ee21db41822dcf61e9f<br>
- SHA-1: 5ba4053577007d15c96472206e3a79bc80ab194c
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npd35k-factory-a33bf20c.tgz</a><br>
- MD5: e1cf9c57cfb11bebe7f1f5bfbf05d7ab<br>
- SHA-1: a33bf20c719206bcf08d1edd8da6c0ff9d50f69c
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npd35k-factory-81c341d5.tgz</a><br>
- MD5: e93de7949433339856124c3729c15ebb<br>
- SHA-1: 81c341d57ef2cd139569b055d5d59e9e592a7abd
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npd35k-factory-2b50e19d.tgz</a><br>
- MD5: 565be87ebb2d5937e2abe1a42645864b<br>
- SHA-1: 2b50e19dae2667b27f911e3c61ed64860caf43e1
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npd35k-factory-2e89ebe6.tgz</a><br>
- MD5: a8464e15c6683fe2afa378a63e205fda<br>
- SHA-1: 2e89ebe67a46b2f3beb050746c13341cd11fa678
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npd35k-factory-1de74874.tgz</a><br>
- MD5: c0dbb7db671f61b2785da5001cedefcb<br>
- SHA-1: 1de74874f8d83e14d642f13b5a2130fc2aa55873
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npd35k-factory-b4eed85d.tgz</a><br>
- MD5: bdcb6f770e753668b5fadff2a6678e0d<br>
- SHA-1: b4eed85de0d42c200348a8629084f78e24f72ac2
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npd35k-factory-5ab1212b.tgz</a><br>
- MD5: 7d34a9774fdd6e025d485ce6cfc23c4c<br>
- SHA-1: 5ab1212bc9417269d391aacf1e672fff24b4ecc5
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> (D6603 dan D6653)</td>
- <td>Unduh: <a class="external-link" href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- Untuk informasi selengkapnya, lihat<a class="external-link" href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">Coba Android N Developer Preview untuk Xperia Z3</a>.
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">Mencopot pemasangan Pratinjau dari perangkat</h3>
-
-<p>
- Jika Anda ingin mencopot pemasangan Pratinjau dari perangkat, Anda bisa melakukannya dengan salah satu cara
- ini: </p>
- <ul>
- <li><strong>Dapatkan citra sistem sesuai spesifikasi pabrik</strong> kemudian flash
- secara manual ke perangkat.
- <ul>
- <li>Untuk <strong>perangkat Nexus dan Pixel C</strong>, lihat halaman
- <a href="http://developers.google.com/android/nexus/images">Citra Pabrik
- untuk Perangkat Nexus</a> untuk mengunduhnya. </li>
- <li>Untuk <strong>perangkat lainnya</strong>, hubungi produsen perangkat
- secara langsung. Atau, jika perangkat didukung
- dalam Android Beta Program, Anda bisa mendaftarkan perangkat dalam
- program kemudian membatalkan pendaftarannya (lihat di bawah).</li>
- </ul>
- </li>
- <li><strong>Batalkan pendaftaran perangkat dari Android Beta Program</strong>. Jika
- perangkat telah terdaftar dalam <a href="https://g.co/androidbeta">Android Beta
- Program</a>, apa pun perangkatnya, Anda cukup membatalkan pendaftarannya dari program tersebut.
- <p>
- Perangkat akan menerima pembaruan OTA ke versi produksi terbaru
- Android yang tersedia untuk perangkat itu (misalnya, Android 6.0 Marshmallow).
- Pembaruan mengharuskan penyetelan ulang perangkat secara penuh, jadi data pengguna pada perangkat itu akan
- dibuang. Pastikan Anda <strong>mencadangkan data penting</strong> sebelum
- membatalkan pendaftaran perangkat.
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>Catatan:</strong>
- Mencopot pemasangan citra sistem Developer Preview sebelum
- program berakhir mengharuskan penyetelan ulang perangkat secara penuh dan membuang semua data pengguna
- pada perangkat.
-</p>
-
-
-<h2 id="setupAVD">Menyiapkan emulator</h2>
-
-<p>Untuk menggunakan Android Emulator guna menjalankan Android N Preview, Anda perlu
-mengunduh Android N Preview SDK dan membuat perangkat maya untuk
-emulator.</p>
-
-<p>Pertama, unduh Android N Preview SDK sebagai berikut (jika Anda
-sudah memperolehnya saat <a href="{@docRoot}preview/setup-sdk.html">menyiapkan
-pengembangan Android N</a>, Anda bisa lewati bagian ini):
-
-<ol>
- <li>Di Android Studio, buka dialog Settings
- (<strong>File > Settings</strong> pada Windows/Linux, atau
- <strong>Android Studio > Preferences</strong> pada Mac). Di panel
- kiri, pilih <strong>Appearance & Behavior >
- System Settings > Android SDK</strong>.
-
- <li>Klik tab <strong>SDK Platforms</strong>, kemudian pilih kotak centang
- <strong>Android N Preview</strong>.</li>
-
- <li>Klik tab <strong>SDK Tools</strong>, kemudian pilih
- kotak centang <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong>, dan <strong>Android SDK Tools</strong>.
-
- </li>
-
- <li>Klik <strong>OK</strong>, dan terima
- perjanjian lisensi untuk setiap paket yang akan dipasang.
- </li>
-</ol>
-
-<p>Sekarang Anda seharusnya telah memiliki <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-<strong>Platform-Tools 24.0.0 rc1</strong>, dan <strong>SDK Tools
-25.0.9</strong>. Jika Anda tidak memperbarui SDK Tools ke 25.0.9, maka Anda tidak akan
-dapat menjalankan citra sistem x86_64 untuk Android N.</p>
-
-
-<p>Sekarang buatlah perangkat maya dengan citra sistem Android N:</p>
-
-<ol>
- <li>Buka AVD Manager dengan memilih <strong>Tools > Android >
- AVD Manager</strong>.</li>
- <li>Klik <strong>Create Virtual Device</strong>.</li>
- <li>Pilih perangkat misalnya Nexus 5X, Nexus 6P, Nexus 9, atau Android TV,
- kemudian klik <strong>Next</strong>.</li>
- <li>Pilih citra sistem <strong>N</strong> (dengan
- <strong>x86</strong> ABI), kemudian klik <strong>Next</strong>.
- (Hanya citra sistem x86 yang saat ini didukung dengan Android Emulator
-untuk Android N Preview.)
- <li>Selesaikan konfigurasi AVD selanjutnya dan klik
- <strong>Finish</strong>.</li>
-</ol>
-
-<p>Anda sekarang bisa meluncurkan Android Emulator dengan Android N Preview AVD.</p>
-
-<p>
-Untuk mendapatkan pengalaman terbaik di Android Emulator, pastikan Anda menggunakan
-Android Studio 2.1 atau yang lebih tinggi, yang mendukung <a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0</a>
-dengan kinerja jauh lebih cepat dibandingkan Emulator di
-Android Studio 1.5.</p>
-
-<p>Untuk informasi selengkapnya tentang membuat perangkat maya, lihat <a href="{@docRoot}tools/devices/index.html">Mengelola Perangkat Maya</a>.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verifikasi apakah TOS disetujui */
- if ($("input#agree").is(":checked")) {
- /* tampilkan tombol unduh */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/in/preview/features/afw.jd b/docs/html-intl/intl/in/preview/features/afw.jd
deleted file mode 100644
index 643fab2..0000000
--- a/docs/html-intl/intl/in/preview/features/afw.jd
+++ /dev/null
@@ -1,552 +0,0 @@
-page.title=Pembaruan Android for Work
-page.metaDescription=API dan fitur baru Android for Work di Android N.
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Dalam dokumen ini</h2>
- <ol>
- <li><a href="#qr">Penyediaan Kode QR
- </a></li>
-
- <li><a href="#sec-challenge">Pertanyaan Keamanan Profil Kerja
- </a></li>
-
- <li><a href="#suspend">Menonaktifkan Akses ke Aplikasi
- </a></li>
-
- <li><a href="#toggle-work">Beralih Mode Kerja
- </a></li>
-
- <li><a href="#always-on-vpn">Always-On VPN
- </a></li>
-
- <li><a href="#contacts">Integrasi Kontak dengan Profil Kerja
- </a></li>
-
- <li><a href="#remote-reboot">Boot Ulang Jarak Jauh
- </a></li>
-
- <li><a href="#disable-roaming">Menonaktifkan Roaming Data
- </a></li>
-
- <li><a href="#process-logging">Pencatatan Proses Enterprise
- </a></li>
-
- <li><a href="#bug-reports">Laporan Bug Jarak Jauh
- </a></li>
-
- <li><a href="#remove-cert">Membuang Sertifikat Klien
- </a></li>
-
- <li><a href="#grant-cert-on-install">Memberi Akses ke Sertifikat Klien
- saat Pemasangan</a></li>
-
- <li><a href="#ui-policy">Transparansi Kebijakan UI Sistem
- </a></li>
-
- <li><a href="#restrictions-mgmt">Penyempurnaan Manajemen Pembatasan Aplikasi
- </a></li>
-
- <li><a href="#location-off">Tombol Lokasi Nonaktif
- </a></li>
-
- <li><a href="#custom-provisioning">Penyediaan yang Disesuaikan
- </a></li>
-
- <li><a href="#multi-wifi-ca">Multi-Sertifikat CA Wi-Fi
- </a></li>
-
- <li><a href="#custom-lock">Pesan Layar Kunci yang Disesuaikan
- </a></li>
-
- <li><a href="#work-connectionservice">ConnectionService Profil Kerja
- </a></li>
-
- <li><a href="#lock-wp">Mengunci Wallpaper
- </a></li>
-
- <li><a href="#lock-user-icon">Mengunci Ikon Pengguna
- </a></li>
-
- <li><a href="#health-monitoring">Pemantauan Kesehatan Perangkat
- </a></li>
-
- </ol>
-
- <h2>Lihat Juga</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
- N Preview SDK</a></li>
- </ul>
- </div>
-</div>
-
-<p>Dokumen ini menjelaskan fitur baru Android for Work yang disediakan di
-Android N.</p>
-
-<h2 id="qr">Penyediaan Kode QR</h2>
-
-<p>
- Android for Work kini mendukung penggunaan kode QR untuk penyediaan perangkat
- milik perusahaan. Wizard persiapan kini memungkinkan Anda memindai kode QR untuk penyediaan
- perangkat.
-</p>
-
-<h2 id="sec-challenge">Pertanyaan Keamanan Profil Kerja</h2>
-
-<p>
- Pemilik profil bisa mengharuskan pengguna menetapkan pertanyaan keamanan untuk aplikasi
- yang berjalan dalam profil kerja. Sistem akan menampilkan pertanyaan keamanan bila
- pengguna mencoba membuka aplikasi kerja apa pun. Jika pengguna berhasil menyelesaikan
- pertanyaan keamanan, sistem akan membuat profil kerja dan mendekripsinya
- jika diperlukan.
-</p>
-
-<p>
- Jika pemilik profil mengirim intent {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD} , sistem
- akan menampilkan pertanyaan keamanan kepada pengguna. Pemilik profil juga dapat
- mengirim intent <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> untuk
- meminta pengguna menyetel kunci perangkat.
-</p>
-
-<p>
- Pemilik profil dapat memilih untuk menyetel kebijakan sandi untuk pertanyaan pekerjaan
- yang berbeda dari kebijakan sandi perangkat lainnya. Misalnya, panjang minimum
- jawaban pertanyaan perangkat bisa berbeda dari panjang
- yang diperlukan untuk sandi lainnya. Pemilik profil menyetel kebijakan pertanyaan
- menggunakan metode{@link android.app.admin.DevicePolicyManager}
- biasa, seperti {@link
- android.app.admin.DevicePolicyManager#setPasswordQuality
- setPasswordQuality()} dan {@link
- android.app.admin.DevicePolicyManager#setPasswordMinimumLength
- setPasswordMinimumLength()}. Pemilik profil juga bisa menyetel penguncian perangkat,
- dengan menggunakan instance {@link android.app.admin.DevicePolicyManager} yang dikembalikan secara langsung
- oleh metode <code>DevicePolicyManager.getParentProfileInstance()</code>
- baru. Selain itu, pemilik profil dapat menyesuaikan layar kredensial untuk
- pertanyaan kerja menggunakan kelas {@link android.app.admin.DevicePolicyManager}
- dengan metode <code>setOrganizationColor()</code> dan
- <code>setOrganizationName()</code> baru.
-</p>
-
-<p>
- Untuk mengetahui detail tentang kelas dan metode berikut, lihat halaman referensi
- <code>DevicePolicyManager</code> di <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi N Preview SDK</a>.
-</p>
-
-<h2 id="suspend">Menonaktifkan Akses ke Aplikasi</h2>
-
-<p>
- Pemilik perangkat dan pemilik profil bisa menangguhkan akses untuk sementara ke paket
- dengan memanggil metode <code>DevicePolicyManager.setPackagesSuspended()</code>
- baru. Pemilik bisa menggunakan metode yang sama untuk mengaktifkan kembali paket tersebut.
-</p>
-
-<p>
- Selagi paket ditangguhkan, maka tidak bisa memulai aktivitas, pemberitahuan ke
- paket akan disembunyikan, dan entri aplikasi dalam <a href="{@docRoot}guide/components/recents.html">layar ringkasan</a> akan disembunyikan.
- Paket yang ditangguhkan tidak muncul di <a href="{@docRoot}guide/components/recents.html">layar ringkasan</a>, dan
- tidak bisa menampilkan dialog (termasuk toast dan snackbar). Juga tidak bisa memutar
- audio atau menggetarkan perangkat.
-</p>
-
-<p>
- Launcher harus menerapkan UI berbeda pada aplikasi yang ditangguhkan untuk menunjukkan
- aplikasi saat ini tidak tersedia; misalnya, bisa merender ikon aplikasi
- dalam warna abu-abu. Launcher bisa mengetahui apakah aplikasi ditangguhkan dengan memanggil metode
- <code>DevicePolicyManager.getPackageSuspended()</code> baru.
-</p>
-
-<h2 id="toggle-work">Beralih Mode Kerja</h2>
-
-<p>
- Pada perangkat dua-profil, pengguna bisa mengaktifkan dan menonaktifkan mode kerja. Selagi mode
- kerja dinonaktifkan, profil yang dikelola akan dinonaktifkan untuk sementara. Aplikasi Profil Kerja,
- sinkronisasi latar belakang, dan pemberitahuan semuanya dinonaktifkan, termasuk
- aplikasi pemilik profil. Selagi profil kerja dinonaktifkan, sistem
- akan menampilkan ikon status tetap untuk mengingatkan pengguna bahwa mereka tidak bisa meluncurkan aplikasi
- kerja. Peluncur sistem menunjukkan bahwa aplikasi kerja dan widget tidak bisa
- diakses.
-</p>
-
-<h2 id="always-on-vpn">Always-On VPN</h2>
-
-<p>
- Pemilik perangkat dan pemilik profil bisa mengharuskan aplikasi kerja selalu terhubung
- ke jaringan melalui VPN yang ditetapkan. Jika pemilik menyetel persyaratan ini,
- perangkat secara otomatis akan memulai VPN itu saat booting.
-</p>
-
-<p>
- Pemilik bisa menggunakan VPN dengan memanggil metode
- <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code> baru. Untuk mengetahui
- apakah pemilik telah menyetel persyaratan VPN, panggil metode
- <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code> baru.
-</p>
-
-<p>
- Karena sistem bisa secara langsung mengikat layanan VPN tanpa interaksi aplikasi,
- klien VPN perlu menangani titik masuk baru untuk Always-On VPN. Seperti sebelumnya,
- Anda bisa menemukan layanan aktif dengan menggunakan filter intent yang cocok dengan tindakan
- {@link android.net.VpnService android.net.VpnService}.
-</p>
-
-<p>
- Pengguna bisa secara manual menyetel klien Always-On VPN yang mengimplementasikan {@link
- android.net.VpnService} dengan menggunakan layar <strong>Settings > More >
- VPN</strong>.
-</p>
-
-<h2 id="contacts">Integrasi Kontak dengan Profil Kerja</h2>
-
-<p>
- Pemilik profil bisa mengizinkan penelusuran lokal dan pencarian direktori kontak kerja
- dari pengguna utama. Misalnya, seorang pengguna bisa mengakses kontak direktori pribadi dan pekerjaan
- dari telepon pribadi atau aplikasi kontak mereka (jika
- diizinkan oleh administrator profil mereka).
-</p>
-
-<p>
- Pengembang yang memanfaatkan Contact Provider bisa menggunakan Enterprise Contacts
- API untuk mengakses entri direktori profil kerja dari pengguna utama jika diizinkan
- oleh kebijakan:
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- Pemilik profil bisa mengendalikan visibilitas kontak kerja di
- pengguna utama menggunakan metode baru berikut:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">Boot Ulang Jarak Jauh</h2>
-
-<p>
- Pemilik perangkat bisa mem-boot ulang perangkat dari jarak jauh. Di beberapa kasus, perangkat yang diluncurkan di
- tempat umum dalam pembatas bisa mencegah akses ke tombol daya. Jika
- perangkat perlu di-boot ulang, administrator bisa melakukannya dengan metode
- <code>DevicePolicyManager.reboot()</code> baru.
-</p>
-
-<h2 id="disable-roaming">Menonaktifkan Roaming Data</h2>
-
-<p>
- Pemilik perangkat bisa menonaktifkan roaming data menggunakan pembatasan pengguna {@link
- android.os.UserManager} <code>DISALLOW_DATA_ROAMING</code> baru.
-</p>
-
-<h2 id="process-logging">Pencatatan Proses Enterprise</h2>
-
-<p>
- Pemilik perangkat bisa mengenali aktivitas mencurigakan dengan melacak perangkat dari jarak jauh,
- termasuk peluncuran aplikasi, aktivitas adb, dan pembukaan kunci layar. Log proses
- tidak memerlukan persetujuan pengguna. Untuk mengambil log, pemilik perangkat mengaktifkan
- pencatatan perangkat menggunakan <code>DevicePolicyManager.setSecurityLoggingEnabled()</code>.
-</p>
-
-<p>
- Perubahan API meliputi:
-</p>
-
-<ul>
-
- <li>
- Kelas <code>android.app.admin.SecurityLog</code> baru dan
- metodenya
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">Laporan Bug Jarak Jauh</h2>
-
-<p>
- Pemilik perangkat bisa memicu dari jarak jauh dan mengambil laporan bug yang berisi
- file dump status perangkat, yang memungkinkan penyelidikan forensik atas
- kesalahan yang diketahui atau perangkat yang telah diutak-atik. Dikarenakan sifat detail laporan bug,
- maka diperlukan persetujuan pengguna.
-</p>
-
-<p>
- Android N menyertakan tambahan API berikut untuk mendukung fitur ini. Untuk detailnya, lihat
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
- N Preview SDK</a>.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">Membuang Sertifikat Klien</h2>
-
-<p>
- Pemilik profil dan pemilik perangkat kini bisa membuang sertifikat klien yang telah dipasang melalui
- {@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()} dengan memanggil metode baru
- <code>DevicePolicyManager.removeKeyPair()</code>.
-</p>
-
-<h2 id="grant-cert-on-install">Memberi Akses ke Sertifikat Klien
- saat Pemasangan</h2>
-
-<p>
- Jika pemilik profil dan pemilik perangkat memberikan kemampuan kepada aplikasi pihak ketiga untuk
- mengelola sertifikat, aplikasi bisa memberikan akses pada dirinya sendiri ke sertifikat
- yang dipasangnya tanpa intervensi dari pemilik.
-</p>
-
-<p>
- API yang sudah ada untuk mengelola sertifikat diperluas untuk mencakup:
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">Transparansi Kebijakan UI Sistem</h2>
-
-<p>
- Kebijakan yang memengaruhi pengalaman pengguna atau membatasi Settings pengguna sepenuhnya
- diungkapkan kepada pengguna, serta pemilik profil dan pemilik perangkat bisa memberlakukan
- kebijakannya kepada departemen TI perusahaan mereka. Selain pesan “Action
- not allowed” yang konsisten di Settings, administrator TI bisa menyetel
- pesan dukungan khusus-organisasi di setelan perangkat dengan metode
- {@link android.app.admin.DevicePolicyManager} baru berikut:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="restrictions-mgmt">Penyempurnaan Manajemen Pembatasan Aplikasi</h2>
-
-<p>
- Pemilik perangkat atau profil bisa mengaktifkan aplikasi lain untuk mengelola
- pembatasan aplikasi melalui metode
- <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code>
- baru. Aplikasi yang dipilih bisa memeriksa apakah izin ini telah
- diberikan dengan memanggil
- <code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code>.
-</p>
-
-<p>
- Aplikasi yang dipilih untuk mengelola pembatasan aplikasi bisa memanggil {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
- setApplicationRestrictions()} dan {@link
- android.app.admin.DevicePolicyManager#getApplicationRestrictions
- getApplicationRestrictions()} untuk paket apa pun di pengguna atau profil itu.
-</p>
-
-<h2 id="location-off">Tombol Lokasi Nonaktif</h2>
-
-<p>
- Pengguna bisa menonaktifkan izin lokasi untuk aplikasi kerja sambil melanjutkan
- akses informasi lokasi di aplikasi pribadi mereka. Tombol akses
- lokasi yang terpisah di Location Settings memungkinkan pengguna untuk menolak pembaruan lokasi atau
- kueri lokasi terakhir untuk aplikasi yang berjalan di profil kerja.
-</p>
-
-<p>
- Tombol lokasi nonaktif level teratas menonaktifkan akses lokasi untuk
- profil utama dan profil yang dikelola.
-</p>
-
-<h2 id="custom-provisioning">Penyediaan yang Disesuaikan</h2>
-
-<p>
- Aplikasi bisa menyesuaikan alur penyediaan pemilik profil dan pemilik perangkat
- dengan warna dan logo perusahaan.
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- Menyesuaikan warna alur.
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- Menyesuaikan alur dengan logo perusahaan.
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">Multi-Sertifikat CA Wi-Fi</h2>
-
-<p>
- Pemilik profil dan pemilik perangkat bisa menyetel beberapa sertifikat CA sekaligus untuk
- konfigurasi Wi-Fi yang diberikan. Bila jaringan Wi-Fi perusahaan memiliki CA terpisah untuk
- titik akses yang terpisah dengan SSID yang sama, administrator TI bisa menyertakan semua
- CA yang relevan dalam konfigurasi Wi-Fi menggunakan metode
- <code>setCaCertificates()</code> baru.
-</p>
-
-<p>
- API yang ditambah adalah:
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">Pesan Layar Terkunci yang Disesuaikan</h2>
-
-<p>
- Pemilik perangkat bisa menyediakan informasi pemilik agar ditampilkan di layar kunci.
- Informasi ini lebih diprioritaskan dari pesan layar kunci pengguna (jika sudah ada
- yang disetel). Metode {@link android.app.admin.DevicePolicyManager} baru adalah:
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">ConnectionService Profil Kerja</h2>
-
-<p>
- Pemilik profil bisa menetapkan aplikasi telepon kerja yang menggunakan
- {@link android.telecom.ConnectionService} khusus-kerja untuk
- backend panggilan (akun panggilan). Telepon kerja hanya menyimpan log panggilan kerja
- dan hanya mengandalkan kontak kerja. Pengguna memiliki pengalaman UI
- saat-panggilan yang konsisten, apa pun aplikasi panggilannya. Panggilan telepon kerja yang masuk ke akun panggilan kerja
- dibedakan dari telepon pribadi yang masuk
- ke akun panggilan pribadi.
-</p>
-
-<p>
- Penelepon harus memeriksa tanda baru
- <code>android.telecom.Call.PROPERTY_WORK_CALL</code> untuk menentukan apakah telepon tersebut merupakan
- telepon kerja. Jika merupakan telepon kerja, penelepon harus menunjukkannya,
- misalnya dengan menambahkan lencana kerja.
-</p>
-
-<h2 id="lock-wp">Mengunci Wallpaper</h2>
-
-<p>
- Pembatasan pengguna baru (<code>DISALLOW_SET_WALLPAPER</code>) mencegah
- pengguna mengubah wallpaper mereka. Pemilik perangkat atau pemilik profil tetap bisa
- mengubah wallpaper, namun mereka hanya bisa mengubah wallpaper
- untuk pengguna atau profil yang mereka kontrol. Misalnya, pemilik profil tidak bisa mengubah
- wallpaper pengguna induk, namun pemilik profil utama di profil utama atau
- pemilik perangkat bisa melakukannya. Pemilik profil atau pemilik perangkat yang ingin mengubah
- wallpapernya harus memeriksa apakah pengguna atau profil
- yang mereka kelola memiliki wallpaper ({@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}) dan apakah mereka diperbolehkan untuk mengubahnya (dengan metode
- baru<code>WallpaperManager.isWallpaperSettingAllowed()</code>)
-</p>
-
-<h2 id="lock-user-icon">Mengunci Ikon Pengguna</h2>
-
-<p>
- Pembatasan pengguna baru (<code>DISALLOW_SET_USER_ICON</code>) mencegah
- pengguna mengubah ikon pengguna mereka. Pemilik perangkat atau pemilik profil pengguna
- tetap bisa mengubah ikon. Akan tetapi, pemilik profil hanya bisa mengubah ikon
- pengguna untuk profil yang dikontrolnya.
-</p>
-
-<h2 id="health-monitoring">Pemantauan Kesehatan Perangkat</h2>
-
-<p>
- Pemilik perangkat atau pemilik profil bisa menggunakan antarmuka
- <code>HardwarePropertiesManager</code> baru untuk mengambil informasi
- tentang kesehatan perangkat, seperti suhu CPU atau GPU dan penggunaan CPU. Antarmuka pemantauan
- baru ini khususnya berguna untuk memantau berjalannya perangkat yang tidak diawasi
- di lokasi yang jauh.
-</p>
diff --git a/docs/html-intl/intl/in/preview/features/background-optimization.jd b/docs/html-intl/intl/in/preview/features/background-optimization.jd
index 5712ab6..c6bf175 100644
--- a/docs/html-intl/intl/in/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/in/preview/features/background-optimization.jd
@@ -297,7 +297,7 @@
<dd>
Mengembalikan larik URL yang telah memicu pekerjaan. Ini akan berupa {@code
null} jika tidak ada URI yang memicu pekerjaan (misalnya, pekerjaan
- dipicu karena batas waktu atau alasan lainnya), atau jumlah
+ dipicu karena batas waktu atau alasan lainnya), atau jumlah
URI yang berubah lebih dari 50.
</dd>
diff --git a/docs/html-intl/intl/in/preview/features/data-saver.jd b/docs/html-intl/intl/in/preview/features/data-saver.jd
deleted file mode 100644
index f64609b..0000000
--- a/docs/html-intl/intl/in/preview/features/data-saver.jd
+++ /dev/null
@@ -1,234 +0,0 @@
-page.title=Data Saver
-metaDescription=Optimalisasi penggunaan data yang diaktifkan pengguna.
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- Dalam dokumen ini
- </h2>
-
- <ol>
- <li>
- <a href="#status">Memeriksa Preferensi Data Saver</a>
- <ol>
- <li>
- <a href="#request-whitelist">Meminta izin daftar putih</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">Memantau Perubahan pada Preferensi
- Data Saver</a>
- </li>
-
- <li>
- <a href="#testing">Menguji dengan Perintah Android Debug Bridge</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- Selama penggunaan ponsel cerdas, biaya paket data seluler bisa saja
- melebihi harga perangkat itu sendiri. Di N Developer Preview, pengguna bisa
- mengaktifkan Data Saver berdasarkan lingkup perangkat untuk menghemat data, baik saat
- roaming, mendekati akhir siklus penagihan, atau pada paket data prabayar kecil.
-</p>
-
-<p>
- Bila pengguna mengaktifkan Data Saver di <strong>Settings</strong> dan perangkat
- berada dalam jaringan berkuota, sistem akan memblokir penggunaan data latar belakang dan memberi tahu
- aplikasi untuk menghemat penggunaan data latar depan bila memungkinkan. Pengguna bisa
- memasukkan aplikasi tertentu ke daftar putih untuk memungkinkan penggunaan data berkuota bila Data
- Saver diaktifkan.
-</p>
-
-<p>
- N Developer Preview memperluas {@link android.net.ConnectivityManager}
- API untuk menyediakan cara pada aplikasi untuk <a href="#status">menerima preferensi Data Saver
- pengguna</a> dan <a href="#monitor-changes">memantau perubahan
- preferensi</a>. Hal ini dianggap praktik terbaik bagi aplikasi untuk memeriksa apakah
- pengguna telah mengaktifkan DataSaver dan berusaha membatasi penggunaan data latar depan dan
- data latar belakang.
-</p>
-
-<h2 id="status">
- Memeriksa Preferensi Data Saver
-</h2>
-
-<p>
- Di N Developer Preview, aplikasi bisa menggunakan {@link
- android.net.ConnectivityManager} API untuk menentukan pembatasan penggunaan data
- apa yang sedang diterapkan. Metode {@code getRestrictBackgroundStatus()}
- akan mengembalikan salah satu dari nilai berikut:
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- Data Saver dinonaktifkan.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- Pengguna telah mengaktifkan Data Saver untuk aplikasi ini. Aplikasi harus berusaha membatasi
- penggunaan data di latar depan dan dengan halus menangani pembatasan penggunaan
- data latar belakang.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- Pengguna telah mengaktifkan Data Saver namun aplikasi telah dimasukkan dalam daftar putih. Aplikasi harus
- tetap berusaha membatasi penggunaan data latar belakang dan latar depan.
- </dd>
-</dl>
-
-<p>
- Hal ini dianggap praktik terbaik untuk membatasi penggunaan data bila perangkat
- terhubung ke jaringan berkuota, meskipun Data Saver telah dinonaktifkan atau aplikasi
- telah dimasukkan dalam daftar putih. Kode contoh berikut menggunakan {@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} dan {@code
- ConnectivityManager.getRestrictBackgroundStatus()} untuk menentukan berapa banyak data
- yang harus digunakan aplikasi:
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- Meminta izin daftar putih
-</h3>
-
-<p>
- Jika aplikasi Anda perlu menggunakan data di latar belakang, aplikasi bisa meminta izin
- daftar putih dengan mengirim
- <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
- yang mengandung URI dari nama paket aplikasi Anda: misalnya,
- <code>package:MY_APP_ID</code>.
-</p>
-
-<p>
- Mengirim intent dan URI akan membuka aplikasi <strong>Settings</strong> dan
- menampilkan setelan penggunaan data untuk aplikasi Anda. Pengguna nanti bisa memutuskan apakah akan
- mengaktifkan data latar belakang untuk aplikasi Anda. Sebelum Anda mengirim intent ini, sebaiknya
- tanyakan kepada pengguna terlebih dahulu apakah mereka ingin membuka aplikasi
- <strong>Settings</strong> untuk keperluan mengaktifkan penggunaan
- data latar belakang.
-</p>
-
-<h2 id="monitor-changes">
- Memantau Perubahan pada Preferensi Data Saver
-</h2>
-
-<p>
- Aplikasi bisa memantau perubahan pada preferensi Data Saver dengan membuat {@link
- android.content.BroadcastReceiver} untuk memantau {@code
- ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} dan secara dinamis
- mendaftarkan penerima pada {@link android.content.Context#registerReceiver
- Context.registerReceiver()}. Bila menerima siaran ini, aplikasi harus
- <a href="#status">memeriksa apakah preferensi Data Saver baru memengaruhi
- izinnya</a> dengan memanggil {@code
- ConnectivityManager.getRestrictBackgroundStatus()}.
-</p>
-
-<p class="note">
- <strong>Catatan:</strong> Sistem hanya mengirim siaran ini ke aplikasi yang
- secara dinamis mendaftar padanya dengan {@link
- android.content.Context#registerReceiver Context.registerReceiver()}. Aplikasi
- yang mendaftar untuk menerima siaran ini dalam manifes mereka
- tidak akan menerimanya.
-</p>
-
-<h2 id="testing">
- Menguji dengan Perintah Android Debug Bridge
-</h2>
-
-<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
-menyediakan beberapa perintah yang bisa Anda gunakan untuk memeriksa dan
-mengonfigurasi izin jaringan:
-
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- Menghasilkan laporan berisi setelan pembatasan jaringan latar belakang
- global saat ini, UID paket saat ini di daftar putih, dan izin jaringan
- untuk paket yang diketahui lainnya.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- Menampilkan daftar lengkap dari perintah Network Policy Manager (netpolicy).
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- Mengaktifkan atau menonaktifkan mode Data Saver saat meneruskan <code>true</code> atau
- <code>false</code>, masing-masing.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Menambahkan UID paket tertentu ke daftar putih untuk mengizinkan penggunaan data berkuota
- di latar belakang.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Membuang UID paket tertentu dari daftar putih untuk memblokir
- penggunaan data berkuota di latar belakang saat Data Saver diaktifkan.
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/preview/features/multi-window.jd b/docs/html-intl/intl/in/preview/features/multi-window.jd
deleted file mode 100644
index 33399e9..0000000
--- a/docs/html-intl/intl/in/preview/features/multi-window.jd
+++ /dev/null
@@ -1,589 +0,0 @@
-page.title=Dukungan Multi-Jendela
-page.metaDescription=Dukungan baru di Android N untuk menampilkan lebih dari satu aplikasi sekaligus.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Dalam dokumen ini</h2>
- <ol>
- <li><a href="#overview">Ringkasan</a></li>
- <li><a href="#lifecycle">Daur Hidup Multi-Jendela</a></li>
- <li><a href="#configuring">Mengonfigurasi Aplikasi Anda untuk Mode
- Multi-Jendela</a></li>
- <li><a href="#running">Menjalankan Aplikasi Anda dalam Mode Multi-Jendela</a></li>
- <li><a href="#testing">Menguji Dukungan Multi-Jendela Aplikasi Anda</a></li>
- </ol>
- <h2>Lihat Juga</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Aplikasi contoh Playground
- Multi-Jendela</a></li>
- <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Lima Tip untuk Mempersiapkan Multi-Jendela di Android N</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N menambahkan dukungan untuk menampilkan lebih dari satu aplikasi
- sekaligus. Pada perangkat genggam, dua aplikasi bisa berjalan berdampingan atau
- atas-bawah dalam mode <em>layar terbagi</em>. Pada perangkat TV, aplikasi bisa
- menggunakan mode <em>gambar-dalam-gambar</em> untuk melanjutkan pemutaran video selagi pengguna
- berinteraksi dengan aplikasi lain.
-</p>
-
-<p>
- Jika Anda membangun aplikasi Anda dengan N Preview SDK, Anda bisa mengonfigurasi cara aplikasi
- menangani tampilan multi-jendela. Misalnya, Anda bisa menetapkan dimensi
- minimum yang diizinkan aktivitas Anda. Anda juga bisa menonaktifkan tampilan multi-jendela untuk
- aplikasi, sehingga memastikan sistem hanya menampilkan aplikasi Anda dalam mode
- layar penuh.
-</p>
-
-<h2 id="overview">Ringkasan</h2>
-
-<p>
- Android N memungkinkan beberapa aplikasi berbagi layar sekaligus. Misalnya,
- pengguna bisa membagi layar, melihat halaman web di sisi kiri
- sambil menulis email di sisi kanan. Pengalaman pengguna bergantung pada
- perangkat:
-</p>
-
-<ul>
- <li>Perangkat genggam yang menjalankan Android N menawarkan mode
- layar terbagi. Di mode ini, sistem mengisi layar dengan dua aplikasi, menampilkannya secara
- berdampingan atau atas-bawah. Pengguna bisa menyeret garis pembagi
- yang memisahkan keduanya untuk membuat satu aplikasi lebih besar dan yang lainnya lebih kecil.
- </li>
-
- <li>Pada Nexus Player yang menjalankan Android N, aplikasi bisa menempatkan diri
- dalam <a href="picture-in-picture.html">mode gambar-dalam-gambar</a>, yang memungkinkannya
- untuk terus menampilkan materi selagi pengguna menjelajahi atau berinteraksi dengan
- aplikasi lain.
- </li>
-
- <li>Produsen perangkat berukuran lebih besar bisa memilih untuk mengaktifkan mode
- bentuk bebas, di mana pengguna bisa bebas mengubah ukuran setiap aktivitas. Jika
- produsen mengaktifkan fitur ini, perangkat akan menawarkan mode bentuk bebas sebagai tambahan
- untuk mode layar terbagi.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>Gambar 1.</strong> Dua aplikasi berjalan berdampingan dalam mode layar terbagi.
-</p>
-
-<p>
- Pengguna bisa beralih ke mode multi-jendela dengan cara berikut:
-</p>
-
-<ul>
- <li>Jika pengguna membuka <a href="{@docRoot}guide/components/recents.html">layar
- Ringkasan</a> dan menekan lama pada
- judul aktivitas, mereka bisa menyeret aktivitas itu ke bagian yang disorot pada layar
- untuk menempatkan aktivitas dalam mode multi-jendela.
- </li>
-
- <li>Jika pengguna menekan lama pada tombol Ringkasan, perangkat akan menempatkan
- aktivitas saat ini dalam mode multi-jendela, dan membuka layar Ringkasan guna
- memungkinkan pengguna memilih aktivitas lain untuk berbagi layar.
- </li>
-</ul>
-
-<p>
- Pengguna bisa <a href="{@docRoot}guide/topics/ui/drag-drop.html">seret dan
- lepas</a> data dari aktivitas satu ke aktivitas lain sewaktu aktivitas berbagi
- layar. (Sebelumnya, pengguna hanya bisa menyeret dan melepas data dalam aktivitas
- tunggal.)
-</p>
-
-<h2 id="lifecycle">Daur Hidup Multi-Jendela</h2>
-
-<p>
- Mode multi-jendela tidak mengubah <a href="{@docRoot}training/basics/activity-lifecycle/index.html">daur hidup
- aktivitas</a>.
-</p>
-
-<p>
- Dalam mode multi-jendela, hanya aktivitas yang paling sering digunakan pengguna
- yang akan aktif pada waktu tertentu. Aktivitas ini dianggap <em>teratas</em>.
- Semua aktivitas lainnya dalam keadaan berhenti sementara, sekalipun terlihat.
- Akan tetapi, sistem memberikan aktivitas, yang berhenti-sementara-namun-terlihat ini, prioritas lebih tinggi
- daripada aktivitas yang tidak terlihat. Jika pengguna berinteraksi dengan salah satu
- aktivitas yang berhenti sementara, aktivitas tersebut akan dilanjutkan kembali, dan aktivitas
- teratas sebelumnya akan dihentikan sementara.
-</p>
-
-<p class="note">
- <strong>Catatan:</strong> Dalam mode multi-jendela, aplikasi bisa berada dalam keadaan berhenti sementara
- dan masih terlihat oleh pengguna. Sebuah aplikasi mungkin perlu melanjutkan aktivitasnya
- bahkan saat berhenti sementara. Misalnya, aplikasi pemutar video yang ada dalam
- mode berhenti sementara namun terlihat harus tetap menampilkan videonya. Karena alasan
- ini, kami menyarankan aktivitas yang memutar video <em>tidak</em> menghentikan sementara video
- dalam handler {@link android.app.Activity#onPause onPause()} mereka.
- Sebagai gantinya, aktivitas itu harus menghentikan sementara video di {@link android.app.Activity#onStop
- onStop()}, dan melanjutkan pemutaran di {@link android.app.Activity#onStart
- onStart()}.
-</p>
-
-<p>
- Bila pengguna menempatkan aplikasi dalam mode multi-jendela, sistem akan memberi tahu
- aktivitas tersebut mengenai perubahan konfigurasi, sebagaimana ditetapkan dalam <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
- Waktu Proses</a>. Hal ini juga terjadi ketika pengguna mengubah skala aplikasi, atau menempatkan kembali aplikasi
- ke mode layar penuh.
- Pada dasarnya, perubahan ini memiliki implikasi daur hidup aktivitas yang sama
- seperti saat sistem memberi tahu aplikasi bahwa perangkat telah beralih
- dari mode potret ke mode lanskap, kecuali dimensi perangkat
- telah berubah sebagai ganti bertukar posisi. Seperti yang dibahas di <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Menangani Perubahan
- Waktu Proses</a>, aktivitas Anda bisa menangani perubahan konfigurasi itu sendiri, atau
- mengizinkan sistem memusnahkan aktivitas dan membuatnya kembali dengan dimensi
- baru.
-</p>
-
-<p>
- Jika pengguna mengubah ukuran jendela dan membuat dimensinya lebih besar, sistem
- akan mengubah ukuran aktivitas untuk menyesuaikan dengan tindakan pengguna dan mengeluarkan <a href="{@docRoot}guide/topics/resources/runtime-changes.html">perubahan waktu proses</a>
- bila diperlukan. Jika aplikasi tertinggal dibandingkan gambar di area yang baru diekspos,
- sistem untuk sementara mengisi area tersebut dengan warna yang ditetapkan oleh atribut {@link
- android.R.attr#windowBackground windowBackground} atau dengan atribut gaya
- <code>windowBackgroundFallback</code> secara default.
-</p>
-
-<h2 id="configuring">Mengonfigurasi Aplikasi Anda untuk Mode Multi-Jendela</h2>
-
-<p>
- Jika aplikasi Anda menargetkan Android N, Anda bisa mengonfigurasi bagaimana dan
- apakah aktivitas aplikasi Anda mendukung tampilan multi-jendela. Anda bisa menyetel
- atribut dalam manifes untuk mengontrol ukuran dan layoutnya.
- Setelan atribut aktivitas root berlaku pada semua aktivitas
- dalam tumpukan tugasnya. Misalnya, jika aktivitas root memiliki
- <code>android:resizeableActivity</code> yang disetel ke true, maka semua aktivitas
- dalam tumpukan tugas bisa diubah ukurannya.
-</p>
-
-<p class="note">
- <strong>Catatan:</strong> Jika Anda membangun aplikasi multi-orientasi dengan versi
- SDK lebih rendah dari Android N, dan pengguna menggunakan aplikasi
- dalam mode multi-jendela, sistem akan mengubah ukuran aplikasi secara paksa. Sistem akan menampilkan kotak
- dialog yang memperingatkan pengguna bahwa aplikasi mungkin berperilaku tidak terduga. Sistem
- <em>tidak</em> mengubah ukuran aplikasi yang berorientasi tetap; jika
- pengguna berusaha membuka aplikasi berorientasi tetap saat mode multi-jendela,
- aplikasi akan menggunakan seluruh layar.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- Setel atribut ini dalam manifes <code><activity></code> Anda atau simpul
- <code><application></code> untuk mengaktifkan atau menonaktifkan tampilan
- multi-jendela:
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- Jika atribut ini disetel ke true, aktivitas bisa dijalankan di
- mode layar terbagi dan mode bentuk bebas. Jika atribut ini disetel ke false, aktivitas
- tidak akan mendukung mode multi-jendela. Jika nilai ini false, dan pengguna
- berusaha memulai aktivitas dalam mode multi-jendela, aktivitas akan menggunakan
- layar penuh.
-</p>
-
-<p>
- Jika aplikasi Anda menargetkan Android N, namun Anda tidak menetapkan nilai
- untuk atribut ini, nilai atribut default adalah true.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- Setel atribut ini dalam simpul <code><activity></code> manifes Anda untuk
- menunjukkan apakah aktivitas mendukung tampilan gambar-dalam-gambar. Atribut ini
- diabaikan jika <code>android:resizeableActivity</code> bernilai false.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">Atribut layout</h3>
-
-<p>
- Dengan Android N, elemen manifes <code><layout></code>
- mendukung beberapa atribut yang memengaruhi cara aktivitas berperilaku dalam
- mode multi-jendela:
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- Lebar default aktivitas saat dijalankan dalam mode bentuk bebas.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- Tinggi default aktivitas saat dijalankan dalam mode bentuk bebas.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- Penempatan awal dari aktivitas saat dibuka dalam mode bentuk bebas. Lihat referensi
- {@link android.view.Gravity} untuk mengetahui nilai yang cocok.
- </dd>
-
- <dt>
- <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
- </dt>
-
- <dd>
- Tinggi dan lebar minimum untuk aktivitas dalam mode layar terbagi
- dan mode bentuk bebas. Jika pengguna memindahkan pembagi dalam mode layar terbagi
- untuk membuat aktivitas lebih kecil dari minimum yang ditetapkan, sistem akan memangkas
- aktivitas sesuai dengan ukuran yang diminta pengguna.
- </dd>
-</dl>
-
-<p>
- Misalnya, kode berikut menampilkan cara menetapkan ukuran dan lokasi default
- aktivitas, dan ukuran minimumnya, bila aktivitas ditampilkan dalam
- mode bentuk bebas:
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalHeight="450dp"
- android:minimalWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">Menjalankan Aplikasi Anda dalam Mode Multi-Jendela</h2>
-
-<p>
- Android N menawarkan fungsionalitas baru untuk mendukung aplikasi yang bisa berjalan
- dalam mode multi-jendela.
-</p>
-
-<h3 id="disabled-features">Fitur yang dinonaktifkan dalam mode multi-jendela</h3>
-
-<p>
- Fitur tertentu akan dinonaktifkan atau diabaikan bila perangkat berada dalam mode
- multi-jendela, karena dianggap tidak logis bagi suatu aktivitas yang mungkin berbagi
- layar perangkat dengan aktivitas atau aplikasi lainnya. Fitur tersebut meliputi:
-
-<ul>
- <li>Beberapa opsi penyesuaian di <a href="{@docRoot}training/system-ui/index.html">System UI</a>
- dinonaktifkan; misalnya, aplikasi tidak bisa menyembunyikan bilah status
- jika tidak berjalan dalam mode layar penuh.
- </li>
-
- <li>Sistem akan mengabaikan perubahan pada atribut <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code>.
- </li>
-</ul>
-
-<h3 id="change-notification">Pemberitahuan perubahan multi-jendela dan melakukan kueri</h3>
-
-<p>
- Metode baru berikut telah ditambahkan ke kelas {@link android.app.Activity}
- untuk mendukung tampilan multi-jendela. Untuk mengetahui detail tentang setiap
- metode, lihat <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi N
- Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- Panggil untuk mengetahui apakah aktivitas berada dalam mode multi-jendela.
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- Panggil untuk mengetahui apakah aktivitas berada dalam mode gambar-dalam-gambar.
-
- <p class="note">
- <strong>Catatan:</strong> Mode gambar-dalam-gambar adalah kasus khusus pada
- mode multi-jendela. Jika <code>myActivity.isInPictureInPictureMode()</code>
- mengembalikan nilai true, maka <code>myActivity.isInMultiWindowMode()</code> juga
- mengembalikan nilai true.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- Sistem akan memanggil metode ini bila aktivitas masuk atau keluar dari
- mode multi-jendela. Sistem akan meneruskan ke metode sebuah nilai true jika
- aktivitas tersebut memasuki mode multi-jendela, dan nilai false jika aktivitas
- tersebut meninggalkan mode multi-jendela.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- Sistem akan memanggil metode ini bila aktivitas masuk atau keluar dari
- mode gambar-dalam-gambar. Sistem akan meneruskan ke metode sebuah nilai true jika
- aktivitas tersebut memasuki mode gambar-dalam-gambar, dan nilai false jika aktivitas
- tersebut meninggalkan mode gambar-dalam-gambar.
- </dd>
-</dl>
-
-<p>
- Ada juga versi {@link android.app.Fragment} untuk setiap
- metode ini, misalnya <code>Fragment.isInMultiWindowMode()</code>.
-</p>
-
-<h3 id="entering-pip">Memasuki mode gambar-dalam-gambar</h3>
-
-<p>
- Untuk menempatkan aktivitas dalam mode gambar-dalam-gambar, panggil metode baru
- <code>Activity.enterPictureInPictureMode()</code>. Metode ini tidak berpengaruh jika
- perangkat tidak mendukung mode gambar-dalam-gambar. Untuk informasi selengkapnya,
- lihat dokumentasi <a href="picture-in-picture.html">Gambar-dalam-Gambar</a>.
-</p>
-
-<h3 id="launch">Meluncurkan Aktivitas Baru dalam Mode Multi-Jendela</h3>
-
-<p>
- Bila meluncurkan aktivitas baru, Anda bisa memberi petunjuk pada sistem bahwa aktivitas
- baru harus ditampilkan bersebelahan dengan aktivitas yang sedang aktif, jika memungkinkan. Caranya,
- gunakan flag
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Meneruskan
- flag ini akan meminta perilaku berikut:
-</p>
-
-<ul>
- <li>Jika perangkat berada dalam mode layar terbagi, sistem akan berupaya membuat
- aktivitas baru di sebelah aktivitas yang meluncurkannya, sehingga kedua aktivitas tersebut
- berbagi layar. Tidak ada jaminan sistem mampu melakukannya, namun sistem akan
- membuat aktivitas bersebelahan jika memungkinkan.
- </li>
-
- <li>Jika perangkat tidak berada dalam mode layar terbagi, flag ini tidak akan berpengaruh.
- </li>
-</ul>
-
-<p>
- Jika perangkat dalam mode bentuk bebas dan Anda menjalankan aktivitas baru, Anda bisa
- menetapkan dimensi aktivitas baru dan lokasi layar dengan memanggil
- <code>ActivityOptions.setLaunchBounds()</code>. Metode ini tidak berpengaruh jika
- perangkat tidak berada dalam mode multi-jendela.
-</p>
-
-<p class="note">
- <strong>Catatan:</strong> Jika Anda meluncurkan aktivitas dalam tumpukan tugas, aktivitas
- tersebut akan menggantikan aktivitas pada layar, dengan mewarisi semua
- properti multi-jendelanya. Jika Anda ingin meluncurkan aktivitas baru sebagai jendela
- terpisah dalam mode multi-jendela, Anda harus meluncurkannya dalam tumpukan tugas baru.
-</p>
-
-<h3 id="dnd">Mendukung seret dan lepas</h3>
-
-<p>
- Pengguna bisa <a href="{@docRoot}guide/topics/ui/drag-drop.html">menyeret dan
- melepas</a> data dari satu aktivitas ke aktivitas yang lain selagi kedua aktivitas
- berbagi layar. (Sebelumnya, pengguna hanya bisa menyeret dan melepas data dalam
- aktivitas tunggal.) Karena alasan ini, Anda mungkin perlu menambahkan fungsionalitas
- seret dan lepas ke aplikasi jika aplikasi saat ini belum mendukungnya.
-</p>
-
-<p>
- N Preview SDK menambahkan paket <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- untuk mendukung seret dan lepas lintas-aplikasi. Untuk mengetahui detail tentang kelas dan metode
- berikut, lihat <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi N
- Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- Objek token bertanggung jawab menetapkan izin yang diberikan kepada aplikasi
- yang menerima pelepasan tersebut.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- Alias baru untuk {@link android.view.View#startDrag View.startDrag()}. Untuk
- mengaktifkan seret dan lepas lintas-aktivitas, teruskan flag baru
- <code>View.DRAG_FLAG_GLOBAL</code>. Jika Anda perlu memberikan izin URI ke
- aktivitas penerima, teruskan flag baru,
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> atau
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, sebagaimana mestinya.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- Membatalkan operasi seret yang sedang berlangsung. Hanya bisa dipanggil oleh
- aplikasi yang menghasilkan operasi seret.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- Menggantikan bayangan penyeretan untuk operasi seret yang sedang berlangsung. Hanya
- bisa dipanggil oleh aplikasi yang menghasilkan operasi seret.
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- Meminta izin untuk URI materi yang diteruskan dengan {@link
- android.content.ClipData} yang terdapat dalam {@link android.view.DragEvent}.
- </dd>
-</dl>
-
-<h2 id="testing">Menguji Dukungan Multi-Jendela Aplikasi Anda</h2>
-
-<p>
- Apakah Anda memperbarui aplikasi untuk Android N atau tidak, Anda harus
- verifikasi bagaimana perilakunya di mode multi-jendela saat pengguna mencoba untuk menjalankannya
- dalam mode multi-jendela pada perangkat yang menjalankan Android N.
-</p>
-
-<h3 id="configuring">Mengonfigurasi Perangkat Pengujian</h3>
-
-<p>
- Jika Anda pasang Android N pada perangkat, mode
- layar terbagi secara otomatis didukung.
-</p>
-
-<h3 id="test-non-n">Jika aplikasi Anda tidak dibangun dengan N Preview SDK</h3>
-
-<p>
- Jika Anda tidak membangun aplikasi dengan N Preview SDK dan pengguna berupaya menggunakan
- aplikasi dalam mode multi-jendela, sistem secara paksa akan mengubah ukuran aplikasi kecuali jika aplikasi
- mendeklarasikan orientasi tetap.
-</p>
-
-<p>
- Jika aplikasi Anda tidak mendeklarasikan orientasi tetap, Anda harus meluncurkan aplikasi
- pada perangkat yang menjalankan Android N dan berupaya menempatkan aplikasi tersebut dalam
- mode layar terbagi. Verifikasi pengalaman pengguna
- bisa diterima bila aplikasi secara paksa diubah ukurannya.
-</p>
-
-<p>
- Jika aplikasi mendeklarasikan orientasi tetap, Anda harus berupaya menempatkan aplikasi dalam
- mode multi-jendela. Verifikasi apakah saat Anda melakukannya, aplikasi tetap berada dalam
- mode layar penuh.
-</p>
-
-<h3 id="test-mw">Jika Anda mendukung mode multi-jendela</h3>
-
-<p>
- Jika Anda membuat aplikasi Anda dengan N Preview SDK dan belum menonaktifkan
- dukungan multi-jendela, verifikasi perilaku berikut dalam mode layar terbagi
- dan mode bentuk bebas.
-</p>
-
-<ul>
- <li>Luncurkan aplikasi dalam mode layar penuh, kemudian beralih ke mode multi-jendela dengan
- menekan lama pada tombol Ringkasan. Verifikasi apakah aplikasi beralih dengan benar.
- </li>
-
- <li>Jalankan aplikasi secara langsung dalam mode multi-jendela, dan verifikasi aplikasi
- diluncurkan dengan benar. Anda bisa meluncurkan aplikasi dalam mode multi-jendela dengan menekan
- tombol Ringkasan, kemudian menekan lama baris judul pada aplikasi Anda dan menyeretnya
- ke salah satu area yang disorot di layar.
- </li>
-
- <li>Ubah ukuran aplikasi Anda dalam mode layar terbagi dengan menyeret garis pembagi.
- Verifikasi apakah aplikasi mengubah ukuran tanpa mogok, dan apakah elemen UI yang diperlukan
- terlihat.
- </li>
-
- <li>Jika Anda telah menetapkan dimensi minimum aplikasi, cobalah untuk mengubah ukuran
- aplikasi di bawah dimensi tersebut. Verifikasi apakah Anda tidak bisa mengubah ukuran aplikasi menjadi
- lebih kecil dari minimum yang ditetapkan.
- </li>
-
- <li>Melalui semua pengujian, verifikasi apakah kinerja aplikasi Anda bisa diterima. Misalnya,
- verifikasi apakah tidak ada jeda yang terlalu lama untuk memperbarui UI setelah
- aplikasi diubah ukurannya.
- </li>
-</ul>
-
-<h4 id="test-checklist">Daftar periksa pengujian</h4>
-
-<p>
- Untuk verifikasi kinerja aplikasi Anda dalam mode multi-jendela, cobalah operasi
- berikut. Anda harus mencoba semua operasi ini dalam mode layar terbagi dan
- dan mode multi-jendela, kecuali jika dinyatakan berbeda.
-</p>
-
-<ul>
- <li>Masuki dan tinggalkan mode multi-jendela.
- </li>
-
- <li>Beralih dari aplikasi Anda ke aplikasi lain, dan verifikasi apakah aplikasi berperilaku
- sebagaimana mestinya saat terlihat namun tidak aktif. Misalnya, jika aplikasi Anda
- sedang memutar video, verifikasi apakah video terus diputar selagi pengguna
- berinteraksi dengan aplikasi lain.
- </li>
-
- <li>Dalam mode layar terbagi, cobalah menggeser garis pembagi untuk membuat aplikasi
- Anda menjadi lebih besar dan lebih kecil. Coba operasi ini dalam konfigurasi berdampingan dan
- atas-bawah. Verifikasi apakah aplikasi tidak mogok,
- fungsionalitas penting bisa terlihat, dan operasi mengubah ukuran tidak memakan waktu terlalu
- lama.
- </li>
-
- <li>Lakukan beberapa operasi ubah ukuran berturut-turut dalam waktu cepat. Verifikasi apakah
- aplikasi Anda tidak mogok atau mengalami kebocoran memori. Untuk informasi tentang memeriksa penggunaan memori
- aplikasi Anda, lihat <a href="{@docRoot}tools/debugging/debugging-memory.html">
- Menyelidiki Penggunaan RAM Anda</a>.
- </li>
-
- <li>Gunakan aplikasi secara normal di sejumlah konfigurasi jendela yang berbeda, dan
- verifikasi apakah aplikasi berperilaku sebagaimana mestinya. Verifikasi apakah teks terbaca, dan apakah
- elemen UI tidak terlalu kecil untuk interaksi.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">Jika Anda telah menonaktifkan dukungan multi-jendela</h3>
-
-<p>
- Jika Anda menonaktifkan dukungan multi-jendela dengan menyetel
- <code>android:resizableActivity="false"</code>, Anda harus menjalankan aplikasi pada
- perangkat yang menjalankan Android N dan berusaha menempatkan aplikasi dalam
- mode bentuk bebas dan mode layar terbagi. Verifikasi apakah saat Anda melakukannya, aplikasi tetap berada dalam
- mode layar penuh.
-</p>
diff --git a/docs/html-intl/intl/in/preview/features/picture-in-picture.jd b/docs/html-intl/intl/in/preview/features/picture-in-picture.jd
deleted file mode 100644
index 5df3e5d..0000000
--- a/docs/html-intl/intl/in/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,213 +0,0 @@
-page.title=Gambar-dalam-gambar
-page.keywords=pratinjau,sdk,PIP,Gambar-dalam-gambar
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Dalam dokumen ini</h2>
-<ol>
- <li><a href="#declaring">Mendeklarasikan Bahwa Aktivitas Anda Mendukung
-Gambar-dalam-gambar</a></li>
- <li><a href="#pip_button">Mengalihkan Aktivitas Anda ke Gambar-dalam-gambar</a>
-</li>
- <li><a href="#handling_ui">Menangani UI Selama Gambar-dalam-gambar</a>
-</li>
- <li><a href="#continuing_playback">Melanjutkan Pemutaran Video Saat dalam
-Gambar-dalam-gambar</a></li>
- <li><a href="#single_playback">Menggunakan Aktivitas Pemutaran Tunggal untuk
- Gambar-dalam-gambar</a></li>
- <li><a href="#best">Praktik Terbaik</a></li>
-</ol>
-
-<h2>Lihat Juga</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">Dukungan
-Multi-Jendela</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>Di Android N, pengguna Android TV sekarang bisa menonton video
-dalam jendela yang disematkan di sudut layar saat menyusuri
-aplikasi. Mode gambar-dalam-gambar (PIP) memungkinkan aplikasi menjalankan aktivitas
-video dalam jendela yang disematkan selagi aktivitas lain tetap berjalan di
-latar belakang. Jendela PIP memungkinkan pengguna melakukan multitasking saat menggunakan aplikasi Anda, yang
-membantu pengguna menjadi lebih produktif.</p>
-
-<p>Aplikasi Anda bisa memutuskan kapan memicu mode PIP. Inilah beberapa contoh
-kapan memasuki mode PIP:</p>
-
-<ul>
-<li>Aplikasi Anda bisa memindahkan video ke dalam mode PIP bila pengguna mengarah
-mundur dari video untuk menjelajah materi lainnya.</li>
-<li>Aplikasi Anda bisa mengalihkan video ke dalam mode PIP selagi pengguna menonton akhir episode
-dari materi. Layar utama menampilkan informasi
-promosi atau rangkuman tentang episode berikutnya dalam seri tersebut.</li>
-<li>Aplikasi Anda bisa menyediakan suatu cara bagi pengguna untuk mengantre materi tambahan selagi
-mereka menonton video. Video terus dimainkan dalam mode PIP selagi layar
-utama menampilkan aktivitas pemilihan materi.</li>
-</ul>
-
-<p>Jendela PIP memiliki luas 240x135 dp dan ditampilkan di layer paling atas pada salah satu
-dari empat sudut layar, yang dipilih oleh sistem. Pengguna bisa memunculkan
-menu PIP yang memungkinkan mereka untuk beralih mode dari jendela PIP ke layar penuh, atau menutup jendela
-PIP, dengan menekan dan menahan tombol <b>Beranda</b> pada remote. Jika video
-lain mulai diputar pada layar utama, jendela PIP secara otomatis
-ditutup. Pengguna juga bisa menutup jendela PIP melalui Recents.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>Gambar 1.</strong> Video
-Gambar-dalam-gambar terlihat di sudut layar selagi pengguna menjelajahi materi pada layar
-utama.</p>
-
-<p>PIP memanfaatkan API multi-jendela yang tersedia di Android N untuk
-menyediakan jendela hamparan video yang disematkan. Untuk menambahkan PIP ke aplikasi, Anda harus
-mendaftarkan aktivitas yang mendukung PIP, mengalihkan aktivitas Anda ke mode PIP bila
-diperlukan, serta memastikan elemen UI disembunyikan dan pemutaran video berlanjut bila
-aktivitas dalam mode PIP.</p>
-
-<h2 id="declaring">Mendeklarasikan Bahwa Aktivitas Anda Mendukung Gambar-dalam-gambar</h2>
-
-<p>Secara default, sistem tidak secara otomatis mendukung PIP untuk aplikasi.
-Jika Anda ingin mendukung PIP dalam aplikasi, daftarkan aktivitas
-video Anda dalam manifes dengan menyetel
-<code>android:supportsPictureInPicture</code> dan
-<code>android:resizeableActivity</code> ke <code>true</code>. Juga, tetapkan
-bahwa aktivitas Anda menangani perubahan konfigurasi layout sehingga aktivitas
-Anda tidak diluncurkan ulang saat terjadi perubahan layout selama transisi mode PIP.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>Saat mendaftarkan aktivitas Anda, ingatlah bahwa dalam mode PIP aktivitas
-Anda akan ditampilkan pada jendela hamparan kecil pada layar TV. Aktivitas
-pemutaran video dengan UI minimal akan memberikan pengalaman pengguna terbaik. Aktivitas yang
-mengandung elemen UI kecil mungkin tidak memberikan pengalaman pengguna yang baik
-ketika beralih ke mode PIP, karena pengguna tidak dapat melihat elemen UI secara jelas
-di jendela PIP.</p>
-
-<h2 id="pip_button">Mengalihkan Aktivitas Anda ke Gambar-dalam-gambar</h2>
-
-Bila Anda perlu untuk mengalihkan aktivitas ke mode PIP, panggil
-<code>Activity.enterPictureInPictureMode()</code>. Contoh berikut mengalihkan
-ke mode PIP bila pengguna memilih tombol PIP khusus pada baris
-kontrol media:</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>Menambahkan tombol PIP ke baris kontrol media Anda akan memungkinkan pengguna dengan mudah beralih
-ke mode PIP selagi mengontrol pemutaran video.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>Gambar 1.</strong> Tombol
-gambar-dalam-gambar pada baris kontrol media.</p>
-
-<p>Android N menyertakan kelas
-<code>PlaybackControlsRow.PictureInPictureAction</code> baru yang mendefinisikan
-tindakan PIP baris kontrol dan menggunakan ikon PIP.</p>
-
-<h2 id="handling_ui">Menangani UI Selama Gambar-dalam-gambar</h2>
-
-<p>Bila aktivitas memasuki mode PIP, aktivitas Anda seharusnya hanya menampilkan pemutaran
-video. Buang elemen UI sebelum aktivitas Anda memasuki PIP,
-dan pulihkan elemen ini bila aktivitas Anda beralih ke layar penuh lagi.
-Ganti <code>Activity.onPictureInPictureModeChanged()</code> atau
-<code>Fragment.onPictureInPictureModeChanged()</code> dan aktifkan atau
-nonaktifkan elemen UI saat diperlukan, misalnya:</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">Melanjutkan Pemutaran Video Saat dalam
-Gambar-dalam-gambar</h2>
-
-<p>Bila aktivitas Anda beralih ke PIP, sistem akan menganggap aktivitas tersebut berada dalam
-keadaan berhenti sementara, dan akan memanggil metode <code>onPause()</code> aktivitas Anda. Pemutaran
-video tidak boleh berhenti sementara dan harus terus diputar jika aktivitas tersebut
-berhenti sementara karena mode PIP. Periksa PIP dalam metode
-<code>onPause()</code> aktivitas Anda dan tangani pemutaran dengan tepat,
-misalnya:</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>Bila aktivitas meninggalkan mode PIP dan kembali ke mode layar penuh, sistem
-akan melanjutkan aktivitas Anda dan memanggil metode <code>onResume()</code>.</p>
-
-<h2 id="single_playback">Menggunakan Aktivitas Pemutaran Tunggal untuk
- Gambar-dalam-gambar</h2>
-
-<p>Di aplikasi Anda, seorang pengguna bisa memilih video baru saat menyusuri materi di
-layar utama, selagi aktivitas pemutaran video dalam mode PIP. Putar
-video baru di aktivitas pemutaran yang ada dalam mode layar penuh, sebagai ganti
-meluncurkan aktivitas baru yang dapat membingungkan pengguna.</p>
-
-<p>Guna memastikan aktivitas tunggal digunakan untuk permintaan pemutaran video dan
-beralih ke atau dari mode PIP bila dibutuhkan, setel
-<code>android:launchMode</code> aktivitas ke <code>singleTask</code> dalam manifes Anda:
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>Di aktivitas Anda, ganti {@link android.app.Activity#onNewIntent
-Activity.onNewIntent()} dan tangani video baru, yang akan menghentikan pemutaran video
-jika diperlukan.</p>
-
-<h2 id="best">Praktik Terbaik</h2>
-
-<p>PIP ditujukan untuk aktivitas yang memutar video layar penuh. Saat mengalihkan
-aktivitas Anda ke mode PIP, hindari menampilkan apa pun selain materi video.
-Pantau saat aktivitas Anda memasuki mode PIP dan sembunyikan elemen UI, seperti dijelaskan
-dalam <a href="#handling_ui">Menangani UI Selama Gambar-dalam-gambar</a>.</p>
-
-<p>Karena jendela PIP ditampilkan sebagai jendela mengambang di sudut
-layar, Anda harus menghindari menampilkan informasi penting di layar utama
-di area mana saja yang bisa terhalang oleh jendela PIP.</p>
-
-<p>Bila aktivitas ada berada dalam mode PIP, secara default aktivitas itu tidak mendapatkan fokus masukan. Untuk
-menerima kejadian masukan saat dalam mode PIP, gunakan
-<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/in/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/in/preview/features/scoped-folder-access.jd
deleted file mode 100644
index d557e96..0000000
--- a/docs/html-intl/intl/in/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,148 +0,0 @@
-page.title=Scoped Directory Access
-page.keywords=pratinjau,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Dalam dokumen ini</h2>
- <ol>
- <li><a href="#accessing">Mengakses Direktori Penyimpanan Eksternal</a></li>
- <li><a href="#removable">Mengakses Direktori pada Media Lepas-Pasang</a></li>
- <li><a href="#best">Praktik Terbaik</a></li>
- </ol>
-</div>
-</div>
-
-<p>Aplikasi seperti aplikasi foto biasanya hanya memerlukan akses ke direktori tertentu dalam
-penyimpanan eksternal, seperti direktori <code>Pictures</code>. Pendekatan
-yang ada dalam mengakses penyimpanan eksternal tidak didesain untuk memberi kemudahan
-akses direktori tertarget untuk tipe aplikasi ini. Misalnya:</p>
-
-<ul>
-<li>Meminta {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-atau {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} dalam manifes Anda
-akan memungkinkan akses ke semua direktori publik pada penyimpanan eksternal, yang mungkin
-lebih banyak akses dari yang dibutuhkan aplikasi Anda.</li>
-<li>Menggunakan
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
-Access Framework</a> biasanya membuat pengguna Anda memilih direktori
-melalui UI sistem, yang tidak diperlukan jika aplikasi Anda selalu mengakses
-direktori eksternal yang sama.</li>
-</ul>
-
-<p>Android N menyediakan API baru yang disederhanakan untuk mengakses
-direktori penyimpanan eksternal umum. </p>
-
-<h2 id="accessing">Mengakses Direktori Penyimpanan Eksternal</h2>
-
-<p>Gunakan kelas <code>StorageManager</code> untuk mendapatkan instance
-<code>StorageVolume</code> yang tepat. Kemudian, buat intent dengan memanggil metode
-<code>StorageVolume.createAccessIntent()</code> dari instance itu.
-Gunakan intent ini untuk mengakses direktori penyimpanan eksternal. Untuk mendapatkan daftar
-semua volume yang tersedia, termasuk volume media lepas-pasang, gunakan
-<code>StorageManager.getVolumesList()</code>.</p>
-
-<p>Jika Anda memiliki informasi tentang file spesifik, gunakan
-<code>StorageManager.getStorageVolume(File)</code> untuk mendapatkan
-<code>StorageVolume</code> yang berisi file tersebut. Panggil
-<code>createAccessIntent()</code> pada <code>StorageVolume</code> ini untuk mengakses
-direktori penyimpanan eksternal untuk file tersebut.</p>
-
-<p>
-Di volume kedua, seperti kartu SD eksternal, teruskan null saat memanggil
-<code>StorageVolume.createAccessIntent()</code> untuk meminta akses ke seluruh
-volume, sebagai ganti direktori spesifik.
-<code>StorageVolume.createAccessIntent()</code> akan mengembalikan null jika Anda meneruskan
-null ke volume utama, atau jika Anda meneruskan nama direktori yang tidak valid.
-</p>
-
-<p>Cuplikan kode berikut adalah contoh cara membuka direktori
-<code>Pictures</code> dalam penyimpanan bersama utama:</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>Sistem ini mencoba untuk memberikan akses ke direktori eksternal, dan jika
-diperlukan mengonfirmasi akses dengan pengguna menggunakan UI yang disederhanakan:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>Gambar 1.</strong> Sebuah aplikasi yang meminta
-akses ke direktori Pictures.</p>
-
-<p>Jika pengguna memberi akses, sistem akan memanggil penggantian
-<code>onActivityResult()</code> Anda dengan kode hasil
-<code>Activity.RESULT_OK</code>, dan data intent yang berisi URI. Gunakan
-URI yang disediakan untuk mengakses informasi direktori, serupa dengan menggunakan URI
-yang dikembalikan oleh
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
-Access Framework</a>.</p>
-
-<p>Jika pengguna tidak memberi akses, sistem akan memanggil penggantian
-<code>onActivityResult()</code> Anda dengan kode hasil
-<code>Activity.RESULT_CANCELED</code>, dan data intent nol.</p>
-
-<p class="note"><b>Catatan</b>: Mendapatkan akses ke direktori eksternal tertentu
-juga akan memperoleh akses ke subdirektori dalam direktori tersebut.</p>
-
-<h2 id="removable">Mengakses Direktori pada Media Lepas-Pasang</h2>
-
-<p>Untuk menggunakan Scoped Directory Access guna mengakses direktori pada media lepas-pasang,
-pertama tambahkan {@link android.content.BroadcastReceiver} yang akan mendengarkan pemberitahuan
-{@link android.os.Environment#MEDIA_MOUNTED}, misalnya:</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Bila pengguna memasang media lepas-pasang, seperti kartu SD, sistem akan mengirimkan pemberitahuan
-{@link android.os.Environment#MEDIA_MOUNTED}. Pemberitahuan ini
-memberikan sebuah objek <code>StorageVolume</code> dalam data intent yang bisa
-Anda gunakan untuk mengakses direktori pada media lepas-pasang. Contoh berikut
-mengakses direktori <code>Pictures</code> pada media lepas-pasang:</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">Praktik Terbaik</h2>
-
-<p>Bila memungkinkan, pertahankan URI akses direktori eksternal sehingga Anda tidak perlu
-berulang kali meminta akses ke pengguna. Setelah pengguna memberikan akses, panggil
-<code>getContentResolver().takePersistableUriPermssion()</code> bersama
-URI akses direktori. Sistem akan mempertahankan URI dan permintaan
-akses berikutnya akan mengembalikan <code>RESULT_OK</code> dan tidak menampilkan UI konfirmasi kepada
-pengguna.</p>
-
-<p>Jika pengguna menolak akses ke direktori eksternal, jangan langsung
-meminta akses lagi. Berulang kali meminta akses akan menghasilkan pengalaman
-pengguna yang buruk. Jika permintaan ditolak oleh pengguna, dan aplikasi meminta akses
-lagi, UI akan menampilkan kotak centang <b>Don't ask again</b>:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>Gambar 1.</strong> Sebuah aplikasi membuat
-permintaan kedua untuk mengakses media lepas-pasang.</p>
-
-<p>Jika pengguna memilih <b>Don't ask again</b> dan menolak permintaan,
-semua permintaan berikutnya untuk direktori yang diberikan dari aplikasi
-Anda secara otomatis akan ditolak, dan tidak ada UI permintaan yang akan ditampilkan ke pengguna.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/preview/features/security-config.jd b/docs/html-intl/intl/in/preview/features/security-config.jd
deleted file mode 100644
index 53f5576..0000000
--- a/docs/html-intl/intl/in/preview/features/security-config.jd
+++ /dev/null
@@ -1,747 +0,0 @@
-page.title=Konfigurasi Keamanan Jaringan
-page.keywords=androidn,keamanan,jaringan
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Dalam dokumen ini</h2>
-<ol>
- <li><a href="#manifest">Menambahkan File Konfigurasi Keamanan</a></li>
- <li><a href="#CustomTrust">Menyesuaikan CA Tepercaya</a>
- <ol>
- <li><a href="#ConfigCustom">Mengonfigurasi CA Tepercaya Khusus</a></li>
- <li><a href="#LimitingCas">Membatasi Set CA Tepercaya</a></li>
- <li><a href="#TrustingAdditionalCas">Mempercayai CA Tambahan</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">CA Debug Saja</a></li>
- <li><a href="#UsesCleartextTraffic">Berhenti dari Lalu Lintas Cleartext</a></li>
- <li><a href="#CertificatePinning">Menyematkan Sertifikat</a></li>
- <li><a href="#ConfigInheritance">Perilaku Pewarisan Konfigurasi</a></li>
- <li><a href="#FileFormat">Format File Konfigurasi</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N menyertakan fitur
- Network Security Configuration yang memungkinkan aplikasi menyesuaikan setelan keamanan jaringan mereka dalam
- file konfigurasi deklaratif yang aman tanpa memodifikasi kode aplikasi. Setelan ini bisa
- dikonfigurasi untuk domain dan aplikasi tertentu. Kemampuan
- utama fitur ini adalah sebagai berikut:
-</p>
-
-<ul>
- <li>
- <b>Trust-anchor khusus:</b> Menyesuaikan Certificate Authorities (CA) mana
- yang dipercaya untuk koneksi aman aplikasi. Misalnya,
- mempercayai sertifikat tertentu yang ditandatangani sendiri atau membatasi
- set CA umum yang dipercaya aplikasi.
- </li>
-
- <li>
- <b>Penggantian hanya-debug:</b> Men-debug secara aman koneksi aman dalam aplikasi
- tanpa menambahkan risiko pada basis yang telah dipasang.
- </li>
-
- <li>
- <b>Berhenti dari lalu lintas cleartext:</b> Melindungi aplikasi dari
- penggunaan lalu lintas cleartext secara tidak sengaja.
- </li>
-
- <li>
- <b>Penyematan sertifikat:</b> Membatasi koneksi aman aplikasi ke
- sertifikat tertentu.
- </li>
-</ul>
-
-
-<h2 id="manifest">Menambahkan File Konfigurasi Keamanan</h2>
-
-<p>
- Fitur Network Security Configuration menggunakan file XML tempat Anda menetapkan
- setelan untuk aplikasi. Anda harus menyertakan sebuah entri dalam manifes aplikasi
- untuk menunjuk ke file ini. Kutipan kode berikut dari sebuah manifes
- yang memperagakan cara membuat entri ini:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application ... >
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">Menyesuaikan CA Tepercaya</h2>
-
-<p>
- Aplikasi mungkin perlu mempercayai set CA khusus sebagai ganti default
- platform. Alasannya yang paling umum adalah:
-</p>
-
-<ul>
- <li>Menghubungkan ke host dengan otoritas sertifikat khusus (ditandatangani sendiri,
- dikeluarkan oleh CA internal, dll).
- </li>
-
- <li>Membatasi set CA hanya untuk CA yang Anda percaya sebagai ganti setiap CA
- yang sudah terpasang.
- </li>
-
- <li>Mempercayai CA tambahan yang tidak disertakan dalam sistem.
- </li>
-</ul>
-
-<p>
- Secara default koneksi (mis. TLS, HTTPS) aman dari semua aplikasi mempercayai
- CA yang telah dipasang oleh sistem, dan aplikasi yang menargetkan API level 23
- (Android M) ke bawah, juga mempercayai penyimpanan CA yang ditambahkan pengguna secara default. Aplikasi
- bisa menyesuaikan koneksinya menggunakan {@code base-config} (untuk
- penyesuaian lebar-aplikasi) atau {@code domain-config} (untuk penyesuaian
- per-domain).
-</p>
-
-
-<h3 id="ConfigCustom">Mengonfigurasi CA Khusus</h3>
-
-<p>
- Anggaplah Anda ingin menghubungkan ke host Anda yang menggunakan sertifikat
- SSL yang ditandatangani sendiri atau ke host yang sertifikat SSL-nya dikeluarkan oleh CA non-publik
- yang Anda percaya, seperti CA internal perusahaan Anda.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Menambahkan sertifikat CA yang ditandatangani sendiri atau sertifikat CA non-publik, dalam format PEM atau DER, ke
- {@code res/raw/my_ca}.
-</p>
-
-
-<h3 id="LimitingCas">Membatasi Set CA Tepercaya</h3>
-
-<p>
- Aplikasi yang tidak ingin mempercayai semua CA yang dipercaya oleh sistem
- sebagai gantinya bisa menetapkan set CA sendiri yang telah dikurangi untuk dipercaya. Ini akan melindungi
- aplikasi dari sertifikat palsu yang dikeluarkan oleh selain CA.
-</p>
-
-<p>
- Konfigurasi untuk membatasi set CA tepercaya mirip dengan <a href="#TrustingACustomCa">mempercayai CA khusus</a> untuk domain tertentu selain
- beberapa CA disediakan dalam sumber daya.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Menambahkan CA tepercaya, dalam format PEM atau DER, ke {@code res/raw/trusted_roots}.
- Perhatikan, jika menggunakan format PEM, file <em>hanya</em> boleh berisi data PEM
- dan tidak ada teks tambahan. Anda juga bisa menyediakan beberapa elemen
- <a href="#certificates"><code><certificates></code></a>
-sebagai ganti satu elemen.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- Mempercayai CA Tambahan
-</h3>
-
-<p>
- Sebuah aplikasi mungkin perlu mempercayai CA tambahan yang tidak dipercaya oleh sistem,
- hal ini bisa disebabkan karena sistem belum menyertakan CA atau CA tidak
- memenuhi persyaratan untuk memasukkan ke dalam sistem Android. Aplikasi
- bisa melakukannya dengan menetapkan beberapa sumber sertifikat untuk
- konfigurasi.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">Mengonfigurasi CA untuk Debug</h2>
-
-<p>
- Saat men-debug aplikasi yang terhubung melalui HTTPS, Anda mungkin perlu
- menghubungkan ke server pengembangan lokal, yang tidak memiliki sertifikat
- SSL untuk server produksi Anda. Untuk mendukungnya tanpa
- memodifikasi kode aplikasi, Anda bisa menetapkan CA hanya-debug
- yang <i>hanya</i> dipercaya bila <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- adalah {@code true} dengan menggunakan {@code debug-overrides}. Biasanya IDE dan alat
- build menyetel flag ini secara otomatis untuk build non-rilis.
-</p>
-
-<p>
- Ini lebih aman daripada kode kondisional biasa karena, sebagai tindakan
- pencegahan keamanan, toko aplikasi tidak menerima aplikasi yang ditandai
- bisa-di-debug.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">Berhenti dari Lalu Lintas Cleartext</h2>
-
-<p>
- Aplikasi bermaksud menyambung ke tujuan hanya menggunakan koneksi
- aman dapat memilih keluar dari dukungan cleartext (menggunakan protokol
- HTTP yang tidak terenkripsi sebagai ganti HTTPS) ke tujuan tersebut. Opsi ini akan membantu mencegah
- regresi tidak disengaja dalam aplikasi karena perubahan dalam URL yang disediakan oleh sumber-sumber
- eksternal seperti server backend.
- Lihat {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()} untuk detail selengkapnya.
-</p>
-
-<p>
- Misalnya, aplikasi mungkin ingin memastikan semua koneksi ke {@code
- secure.example.com} selalu dilakukan melalui HTTPS untuk melindungi lalu lintas sensitif
- dari jaringan yang berbahaya.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">Menyematkan Sertifikat</h2>
-
-<p>
- Biasanya aplikasi mempercayai semua CA yang telah terpasang. Jika salah satu dari CA ini
- mengeluarkan sertifikat palsu, aplikasi akan berisiko terkena serangan
- MiTM. Beberapa aplikasi memilih untuk membatasi set sertifikat yang mereka terima
- baik dengan membatasi set CA yang mereka percaya atau dengan menyematkan sertifikat.
-</p>
-
-<p>
- Penyematan sertifikat dilakukan dengan memberikan seperangkat sertifikat dengan hash
- kunci publik (SubjectPublicKeyInfo pada sertifikat X.509). Rantai
- sertifikat nanti hanya berlaku jika rantai sertifikat berisi setidaknya salah satu
- dari kunci publik yang disematkan.
-</p>
-
-<p>
- Perhatikan, saat menggunakan penyematan sertifikat, Anda harus selalu menyertakan kunci
- cadangan sehingga jika Anda terpaksa beralih ke kunci baru, atau mengubah CA (saat
- menyematkan ke sertifikat CA atau perantara CA tersebut), konektivitas
- aplikasi Anda tidak terpengaruh. Jika tidak, Anda harus mendorong
- pembaruan ke aplikasi tersebut untuk memulihkan konektivitas.
-</p>
-
-<p>
- Selain itu dimungkinkan juga menyetel waktu habis masa berlaku untuk pin setelah
- penyematan tidak dilakukan. Hal ini membantu mencegah masalah konektivitas dalam
- aplikasi yang belum diperbarui. Akan tetapi, menyetel waktu kedaluwarsa
- pada pin mungkin akan membuat penyematan bisa diabaikan.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">Perilaku Pewarisan Konfigurasi</h2>
-
-<p>
- Nilai yang tidak disetel dalam konfigurasi tertentu akan diwariskan. Perilaku ini memungkinkan konfigurasi
- yang lebih kompleks sambil menjaga file konfigurasi tetap terbaca.
-</p>
-
-<p>
- Jika nilai tidak disetel dalam entri tertentu maka nilai dari entri berikutnya yang lebih
- umum akan digunakan. Nilai yang tidak disetel dalam {@code domain-config} akan
- diambil dari {@code domain-config} induk, jika tersarang, atau dari {@code
- base-config} jika tidak. Nilai yang tidak disetel dalam {@code base-config} akan menggunakan
- nilai default platform.
-</p>
-
-<p>
- Misalnya pertimbangkan, bila semua koneksi ke subdomain {@code
- example.com} harus menggunakan set CA khusus. Selain itu, lalu lintas cleartext ke
- domain ini diizinkan <em>kecuali</em> saat menghubungkan ke {@code
- secure.example.com}. Dengan menyarangkan konfigurasi untuk {@code
- secure.example.com} dalam konfigurasi untuk {@code example.com},
- {@code trust-anchors} tidak perlu digandakan.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">Format File Konfigurasi</h2>
-
-<p>
- Fitur Network Security Configuration menggunakan format file XML.
- Struktur keseluruhan file ditampilkan dalam contoh kode berikut:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- Bagian berikut menjelaskan sintaks dan detail lainnya dari format
- file.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- bisa berisi:
- </dt>
-
- <dd>
- 0 atau 1 <code><a href="#base-config"><base-config></a></code><br>
- Sejumlah <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 atau 1 <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- sintaks:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- bisa berisi:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- keterangan:
- </dt>
-
- <dd>
- Konfigurasi default yang digunakan oleh semua koneksi yang tujuannya tidak
- tercakup oleh <a href="#domain-config"><code>domain-config</code></a>.
-
-<p>
- Nilai yang tidak disetel akan menggunakan nilai default platform. Konfigurasi
- default untuk aplikasi yang menargetkan API level 24 ke atas:
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-Konfigurasi default untuk aplikasi yang menargetkan API level 23 ke bawah:
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>sintaks:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>Bisa Berisi:</dt>
-
-<dd>
-1 atau beberapa <code><a href="#domain"><domain></a></code>
-<br/>0 atau 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 atau 1 <code><a href="#pin-set"><pin-set></code></a>
-<br/>Sejumlah <code><domain-config></code> tersarang</dd>
-
-<dt>Keterangan</dt>
-<dd>Konfigurasi yang digunakan untuk koneksi ke tujuan tertentu seperti didefinisikan oleh elemen {@code domain}.
-
-<p>Perhatikan, jika beberapa elemen {@code domain-config} mencakup suatu tujuan, konfigurasi dengan aturan domain paling spesifik (terpanjang) yang cocok
-akan digunakan.</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- sintaks:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- Atribut:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- Jika {@code "true"} maka aturan domain ini akan dicocokkan dengan domain dan semua
- subdomain, termasuk subdomain dari subdomain, jika tidak peraturan hanya
- diterapkan pada kecocokan yang persis tepat.
- </dd>
- </dl>
- </dd>
-
- <dt>
- Keterangan:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- sintaks:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- Bisa Berisi:
- </dt>
-
- <dd>
- 0 atau 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- Keterangan:
- </dt>
-
- <dd>
- Pengesampingan yang akan diterapkan bila <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- adalah {@code "true"} yang biasanya terjadi untuk build non-rilis
- yang dihasilkan oleh alat IDE dan build. Trust-anchor yang ditetapkan dalam {@code
- debug-overrides} akan ditambahkan ke semua konfigurasi lainnya dan penyematan
- sertifikat tidak dilakukan bila rantai sertifikat server menggunakan satu dari
- trust-anchor hanya-debug ini. Jika <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- adalah {@code "false"} maka bagian ini akan diabaikan sepenuhnya.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- sintaks:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- Bisa Berisi:
- </dt>
-
- <dd>
- Sejumlah <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- Keterangan:
- </dt>
-
- <dd>
- Set trust-anchor untuk koneksi aman.
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>sintaks:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>keterangan:</dt>
-<dd>Set sertifikat X.509 untuk elemen {@code trust-anchors}.</dd>
-
-<dt>atribut:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-Sumber sertifikat CA, bisa salah satu dari
-<ul>
- <li>ID sumber daya mentah yang menunjuk ke file berisi sertifikat X.509.
- Sertifikat harus dikodekan dalam format DER atau PEM. Dalam hal sertifikat
- PEM, file <em>tidak boleh</em> berisi data tambahan non-PEM seperti
- komentar.
- </li>
-
- <li>{@code "system"} untuk sertifikat CA sistem yang telah terpasang.
- </li>
-
- <li>{@code "user"} untuk sertifikat CA yang ditambahkan pengguna.
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- Menetapkan apakah CA dari sumber akan mengabaikan penyematan sertifikat. Jika {@code
- "true"} kemudian rangkaian sertifikat melalui salah satu CA dari
- sumber ini maka tidak dilakukan penyematan. Hal ini bisa berguna untuk debug CA
- atau untuk mendukung dengan memungkinkan pengguna melakukan MiTM atas lalu lintas aman aplikasi Anda.
- </p>
-
- <p>
- Default-nya adalah {@code "false"} kecuali jika ditetapkan dalam elemen {@code debug-overrides},
- dalam hal demikian default-nya adalah {@code "true"}.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- sintaks:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- Bisa Berisi:
- </dt>
-
- <dd>
- Sejumlah <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- Keterangan:
- </dt>
-
- <dd>
- Satu set pin kunci publik. Agar koneksi aman bisa dipercaya, salah satu
- kunci publik dalam rantai kepercayaan harus berada dalam set pin. Lihat
- <code><a href="#pin"><pin></a></code> untuk mengetahui format pin.
- </dd>
-
- <dt>
- Atribut:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- Tanggal, dalam format {@code yyyy-MM-dd}, pada saat dan setelah pin
- kedaluwarsa, sehingga menonaktifkan penyematan. Jika atribut tidak disetel maka
- pin tidak kedaluwarsa.
- <p>
- Tanggal kedaluwarsa membantu mencegah masalah konektivitas di aplikasi yang
- tidak mengambil pembaruan untuk set pin mereka, misalnya karena pengguna
- menonaktifkan pembaruan aplikasi.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- sintaks:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- Atribut:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- Algoritme intisari yang digunakan untuk menghasilkan pin. Saat ini, hanya
- {@code "SHA-256"} yang didukung.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/in/preview/guide.jd b/docs/html-intl/intl/in/preview/guide.jd
deleted file mode 100644
index a229beb..0000000
--- a/docs/html-intl/intl/in/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=Panduan Pengujian
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Dalam dokumen ini</h2>
- <ol>
- <li><a href="#runtime-permissions">Izin Pengujian</a></li>
- <li><a href="#doze-standby">Menguji Istirahatkan dan Aplikasi Siaga</a></li>
- <li><a href="#ids">Pencadangan Otomatis dan Identifier Perangkat</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N memberi Anda kesempatan untuk memastikan aplikasi bekerja pada
- platform versi berikutnya. Pratinjau ini berisi beberapa API dan perubahan perilaku yang bisa
- memengaruhi aplikasi Anda, sebagaimana dijelaskan dalam <a href="{@docRoot}preview/api-overview.html">Ringkasan
- API</a> dan <a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a>. Dalam menguji
- aplikasi dengan pratinjau, ada beberapa perubahan sistem spesifik yang harus Anda fokuskan untuk
- memastikan pengguna mendapatkan pengalaman yang bagus.
-</p>
-
-<p>
- Panduan ini menjelaskan apa dan bagaimana menguji fitur pratinjau dengan aplikasi Anda. Anda harus
- mengutamakan pengujian fitur pratinjau spesifik ini, dikarenakan pengaruhnya yang besar pada
- perilaku aplikasi Anda:
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">Izin</a>
- </li>
- <li><a href="#doze-standby">Istirahatkan dan Aplikasi Siaga</a>
- </li>
- <li><a href="#ids">Pencadangan Otomatis dan Identifier Perangkat</a></li>
-</ul>
-
-<p>
- Untuk informasi selengkapnya tentang cara menyiapkan perangkat atau perangkat maya dengan citra sistem pratinjau
- untuk pengujian, lihat <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan
-Android N SDK</a>.
-</p>
-
-
-<h2 id="runtime-permissions">Izin Pengujian</h2>
-
-<p>
- Model <a href="{@docRoot}preview/features/runtime-permissions.html">Izin</a> yang baru
- mengubah cara alokasi izin untuk aplikasi Anda oleh pengguna. Sebagai ganti memberi semua
- izin selama prosedur pemasangan, aplikasi Anda harus meminta izin kepada pengguna secara individual
- pada waktu proses. Bagi pengguna, perilaku ini memberi kontrol yang lebih detail atas setiap aktivitas aplikasi, dan
- juga konteks yang lebih untuk memahami sebab aplikasi meminta izin tertentu. Pengguna
- bisa memberi atau mencabut izin yang diberikan pada suatu aplikasi secara individual kapan saja. Fitur
- pratinjau ini kemungkinan besar memengaruhi perilaku aplikasi Anda dan mungkin menghambat fungsi beberapa
- fitur aplikasi Anda, atau mengurangi kualitas kerjanya.
-</p>
-
-<p class="caution">
- Perubahan ini memengaruhi semua aplikasi yang berjalan di platform baru, bahkan aplikasi yang tidak menargetkan versi
- platform baru. Platform ini memberikan perilaku kompatibilitas terbatas untuk aplikasi lawas, namun Anda
- harus mulai merencanakan migrasi aplikasi ke model izin baru sekarang juga, dengan tujuan
- mempublikasikan versi terbaru aplikasi Anda saat peluncuran platform secara resmi.
-</p>
-
-
-<h3 id="permission-test-tips">Tip pengujian</h3>
-
-<p>
- Gunakan tip berikut untuk membantu Anda merencanakan dan menjalankan pengujian aplikasi dengan
- perilaku izin yang baru.
-</p>
-
-<ul>
- <li>Identifikasi izin aplikasi Anda saat ini dan jalur kode terkait.</li>
- <li>Uji alur pengguna pada semua layanan dan data yang dilindungi izin.</li>
- <li>Uji dengan berbagai kombinasi izin yang diberikan/dicabut.</li>
- <li>Gunakan alat bantu {@code adb} untuk mengelola izin dari baris perintah:
- <ul>
- <li>Cantumkan daftar izin dan status berdasarkan kelompok:
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>Beri atau cabut satu atau beberapa izin menggunakan sintaks berikut:<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>Analisis aplikasi Anda untuk layanan yang menggunakan izin.</li>
-</ul>
-
-<h3 id="permission-test-strategy">Strategi pengujian</h3>
-
-<p>
- Perubahan izin memengaruhi struktur dan desain aplikasi Anda, begitu juga
- pengalaman pengguna dan alur yang Anda sediakan untuk pengguna. Anda harus menilai penggunaan izin
- aplikasi saat ini dan mulai merencanakan alur baru yang ingin ditawarkan. Rilis platform
- resmi menyediakan perilaku kompatibilitas, namun Anda harus merencanakan pembaruan aplikasi dan tidak
- bergantung pada perilaku ini.
-</p>
-
-<p>
- Identifikasi izin yang sebenarnya diperlukan dan digunakan aplikasi Anda, kemudian temukan berbagai
- jalur kode yang menggunakan layanan yang dilindungi izin. Anda bisa melakukan ini melalui kombinasi
- pengujian pada platform baru dan analisis kode. Dalam pengujian, Anda harus fokus pada pemilihan
- izin waktu proses dengan mengubah {@code targetSdkVersion} aplikasi ke versi pratinjau. Untuk
- informasi selengkapnya, lihat <a href="{@docRoot}preview/setup-sdk.html#">Menyiapkan
-Android N SDK</a>.
-</p>
-
-<p>
- Uji dengan berbagai kombinasi izin yang dicabut dan ditambahkan, untuk menyoroti alur pengguna yang
- bergantung pada izin. Jika dependensi tidak jelas atau logis, Anda harus mempertimbangkan
-optimalisasi atau kompartementalisasi alur tersebut untuk mengeliminasi dependensi atau menjelaskan alasan
- diperlukannya izin.
-</p>
-
-<p>
- Untuk informasi selengkapnya tentang perilaku izin waktu proses, pengujian, dan praktik terbaik, lihat
- halaman pratinjau <a href="{@docRoot}preview/features/runtime-permissions.html">Izin</a>
- pengembang.
-</p>
-
-
-<h2 id="doze-standby">Menguji Istirahatkan dan Aplikasi Siaga</h2>
-
-<p>
- Fitur penghematan daya Istirahatkan dan Aplikasi Siaga membatasi jumlah pemrosesan latar belakang yang
- bisa dikerjakan aplikasi Anda saat perangkat dalam keadaan diam atau saat aplikasi Anda sedang tidak fokus. Pembatasan
- yang dapat diberlakukan oleh sistem pada aplikasi termasuk akses jaringan terbatas atau tidak ada,
- tugas latar belakang yang ditangguhkan, Pemberitahuan yang ditangguhkan, permintaan membangunkan yang diabaikan, serta alarm. Untuk memastikan
- aplikasi Anda berperilaku dengan benar pada optimalisasi penghematan daya ini, Anda harus menguji aplikasi dengan
- menyimulasikan keadaan baterai yang sedang tinggal sedikit ini.
-</p>
-
-<h4 id="doze">Menguji aplikasi Anda dengan Istirahatkan</h4>
-
-<p>Untuk menguji Istirahatkan dengan aplikasi Anda:</p>
-
-<ol>
-<li>Konfigurasikan perangkat keras atau perangkat maya dengan citra sistem Android N.</li>
-<li>Hubungkan perangkat dengan mesin pengembangan dan pasang aplikasi Anda.</li>
-<li>Jalankan aplikasi Anda dan biarkan aktif.</li>
-<li>Simulasikan perangkat yang sedang masuk ke dalam mode Istirahatkan dengan menjalankan perintah berikut:
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>Amati perilaku aplikasi Anda saat perangkat diaktifkan kembali. Pastikan aplikasi
- pulih dengan baik saat perangkat keluar dari Istirahatkan.</li>
-</ol>
-
-
-<h4 id="standby">Menguji aplikasi dengan Aplikasi Siaga</h4>
-
-<p>Untuk menguji mode Aplikasi Siaga dengan aplikasi Anda:</p>
-
-<ol>
- <li>Konfigurasikan perangkat keras atau perangkat maya dengan citra sistem Android N.</li>
- <li>Hubungkan perangkat dengan mesin pengembangan dan pasang aplikasi Anda.</li>
- <li>Jalankan aplikasi Anda dan biarkan aktif.</li>
- <li>Simulasikan aplikasi yang sedang masuk ke dalam mode siaga dengan menjalankan perintah berikut:
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>Simulasikan membangunkan aplikasi Anda menggunakan perintah berikut:
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>Amati perilaku aplikasi Anda saat dibangunkan. Pastikan aplikasi pulih dengan baik
- dari mode siaga. Secara khusus, Anda harus memeriksa apakah Pemberitahuan aplikasi dan pekerjaan latar belakang
- tetap berjalan sebagaimana yang diharapkan.</li>
-</ol>
-
-<h2 id="ids">Auto Backup for Apps dan Identifier Perangkat Spesifik</h2>
-
-<p>Jika aplikasi Anda mempertahankan identifier perangkat spesifik, seperti ID pendaftaran Google
-Cloud Messaging, dalam penyimpanan internal,
-pastikan Anda mengikuti praktik terbaik untuk mengecualikan lokasi
-penyimpanan dari pencadangan otomatis, seperti dijelaskan dalam <a href="{@docRoot}preview/backup/index.html">Auto
-Backup for Apps</a>. </p>
diff --git a/docs/html-intl/intl/in/preview/j8-jack.jd b/docs/html-intl/intl/in/preview/j8-jack.jd
deleted file mode 100644
index bbb1670..0000000
--- a/docs/html-intl/intl/in/preview/j8-jack.jd
+++ /dev/null
@@ -1,197 +0,0 @@
-page.title=Fitur Bahasa Java 8
-page.keywords="android N", "Java 8", "Jack"
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <ol>
- <li>
- <a href="#supported-features">API dan Fitur Bahasa Java 8 yang didukung</a>
- </li>
- <li>
- <a href="#configuration">Mengaktifkan Fitur Java 8 dan Jack Toolchain</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>Android N memperkenalkan dukungan untuk fitur bahasa Java 8
- yang bisa Anda gunakan saat mengembangkan aplikasi yang menargetkan Android N.
- Halaman ini menjelaskan fitur bahasa baru yang didukung dalam Android N
- Preview, cara menyiapkan proyek Anda dengan benar untuk menggunakannya, dan setiap masalah
- yang diketahui yang mungkin Anda temui.
-</p>
-
-<p>Untuk mulai menggunakan fitur-fitur ini, Anda perlu mengunduh dan menyiapkan Android
-Studio 2.1 dan Android N Preview SDK, yang menyertakan
-Jack toolchain yang diperlukan dan Plugin Android untuk Gradle yang telah diperbarui. Jika Anda belum
-memasang Android N Preview SDK, lihat <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan Pengembangan untuk Android N</a>.</p>
-
-
-
-<p class="note">
- <strong>Catatan:</strong> Menggunakan fitur bahasa Java 8 yang baru bukanlah
- persyaratan untuk mengembangkan aplikasi yang menargetkan platform Android N. Jika Anda
- tidak ingin menulis kode dengan fitur bahasa Java 8, Anda bisa membiarkan nilai kompatibilitas
- sumber dan target proyek disetel ke Java 7, namun Anda tetap harus
- mengompilasi dengan JDK 8 untuk membangun pada platform Android N.
-</p>
-
-<h2 id="supported-features">
- API dan Fitur Bahasa Java 8 yang Didukung
-</h2>
-
-<p>
- Saat ini tidak semua fitur bahasa Java 8 didukung Android. Akan tetapi,
- fitur berikut sekarang tersedia saat mengembangkan aplikasi yang menargetkan
- Android N Preview:
-</p>
-
-<ul>
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">Metode
- antarmuka default dan statis</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html">
- Ekspresi Lambda</a> (juga tersedia pada API level 23 dan yang lebih rendah)
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/annotations/repeating.html">Anotasi
- yang bisa diulang</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/methodreferences.html">
- Referensi Metode</a> (juga tersedia pada API level 23 dan yang lebih rendah)
- </li>
-</ul>
-
-<p class="note">
- <strong>Catatan:</strong> Untuk menguji ekspresi lambda dan referensi metode pada
- Android versi sebelumnya, bukalah file {@code build.gradle}
- Anda, serta setel {@code compileSdkVersion} dan {@code targetSdkVersion} ke 23 atau
- yang lebih rendah. Anda tetap perlu <a href="#configuration">mengaktifkan Jack
- toolchain</a> untuk menggunakan fitur Java 8 ini.
-</p>
-
-<p>
- Selain itu, API fitur bahasa Java 8 berikut ini sekarang tersedia:
-</p>
-
-<ul>
- <li>Reflection API dan API terkait bahasa:
- <ul>
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/FunctionalInterface.html">
- {@code java.lang.FunctionalInterface}</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Repeatable.html">
- {@code java.lang.annotation.Repeatable}</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#isDefault--">
- {@code java.lang.reflect.Method.isDefault()}</a>
- </li>
-
- <li>dan Reflection API yang terkait dengan anotasi yang bisa diulang, seperti
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType-java.lang.Class-">
-{@code AnnotatedElement.getAnnotationsByType(Class)}</a>
- </li>
- </ul>
- </li>
-
- <li>Utility API:
- <ul>
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">
- {@code java.util.function}</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html">
- {@code java.util.stream}</a>
- </li>
- </ul>
- </li>
-</ul>
-
-<h2 id="configuration">
- Mengaktifkan Fitur Java 8 dan Jack Toolchain
-</h2>
-
-<p>
- Agar dapat menggunakan fitur bahasa Java 8 yang baru, Anda juga perlu menggunakan
- <a class="external-link" href="https://source.android.com/source/jack.html">Jack toolchain</a> yang baru. Toolchain Android
- yang baru ini mengompilasi sumber bahasa Java menjadi dex
- bytecode yang bisa dibaca Android, memiliki format pustaka {@code .jack} sendiri, dan menyediakan sebagian besar fitur toolchain
- sebagai bagian dari alat bantu tunggal: pengemasan ulang, penciutan, pengaburan, dan
- multidex.
-</p>
-
-<p>Inilah perbandingan dua toolchain yang digunakan untuk membangun file Android DEX:</p>
-<ul>
- <li>Toolchain javac lawas:<br>
- <b>javac</b> ({@code .java} --> {@code .class}) --> <b>dx</b> ({@code
- .class} --> {@code .dex})
- </li>
-
- <li>Jack Toolchain baru:<br>
- <b>Jack</b> ({@code .java} --> {@code .jack} --> {@code .dex})
- </li>
-</ul>
-
-<h3>
- Mengonfigurasi Gradle
-</h3>
-
-<p>
- Untuk mengaktifkan fitur bahasa Java 8 dan Jack bagi proyek Anda, masukkan
- yang berikut dalam file {@code build.gradle} level modul Anda:
-</p>
-
-<pre>
-android {
- ...
- defaultConfig {
- ...
- jackOptions {
- enabled true
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
-</pre>
-
-<h3 id="known-issues">
- Masalah yang Diketahui
-</h3>
-
-<p>
- <a href="{@docRoot}tools/building/building-studio.html#instant-run">Instant
- Run</a> saat ini tidak berfungsi pada Jack dan akan dinonaktifkan saat menggunakan
- toolchain baru.
-</p>
-
-<p>Karena Jack tidak menghasilkan file kelas antara saat mengompilasi sebuah
-aplikasi, alat yang bergantung pada file-file ini sekarang tidak berfungsi pada Jack. Beberapa
-contoh alat ini adalah:</p>
-
-<ul>
- <li>Pendeteksi lint yang beroperasi pada file kelas
- </li>
-
- <li>Alat dan pustaka yang mewajibkan file kelas aplikasi (misalnya
-pengujian instrumentasi dengan JaCoCo)
- </li>
-</ul>
-
-<p>Jika Anda menemukan masalah lain saat menggunakan Jack, <a href="http://tools.android.com/filing-bugs">laporkan bug</a>.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/preview/license.jd b/docs/html-intl/intl/in/preview/license.jd
deleted file mode 100644
index 56ae58a..0000000
--- a/docs/html-intl/intl/in/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=Perjanjian Lisensi
-
-@jd:body
-
-<p>
-Untuk mulai Android SDK Preview, Anda harus menyetujui ketentuan dan persyaratan berikut.
-Seperti dijelaskan di bawah ini, perhatikan bahwa ini adalah versi pratinjau Android SDK, bisa saja berubah, yang Anda gunakan dengan risiko sendiri. Android SDK Preview bukan rilis stabil, dan mungkin berisi kesalahan serta cacat yang bisa mengakibatkan kerusakan serius pada sistem komputer, perangkat dan data Anda.
-</p>
-
-<p>
-Ini adalah Perjanjian Lisensi Android SDK Preview ("Perjanjian Lisensi").
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. Pengantar
-
-1.1 Android SDK Preview (dalam Perjanjian Lisensi ini disebut "Pratinjau" dan secara spesifik termasuk file sistem Android, paket API, dan file pustaka Pratinjau, jika disediakan) diberikan lisensinya kepada Anda sesuai dengan ketentuan Perjanjian Lisensi. Perjanjian Lisensi ini merupakan kontrak yang mengikat secara hukum antara Anda dan Google dalam kaitannya dengan penggunaan Pratinjau oleh Anda.
-
-1.2 "Android" berarti tumpukan perangkat lunak Android untuk perangkat, seperti yang tersedia di Android Open Source Project, yang ada di URL berikut: http://source.android.com/, yang selalu diperbarui.
-
-1.3 “Kompatibel dengan Android” berarti segala implementasi Android yang (i) sesuai dengan Android Compatibility Definition Document, yang bisa ditemukan di situs web kompatibilitas Android (http://source.android.com/compatibility) dan yang selalu diperbarui; serta (ii) berhasil lulus Android Compatibility Test Suite (CTS).
-
-1.4 "Google" berarti Google Inc., perusahaan asal Delaware dengan kantor bisnis utama di 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Menerima Perjanjian Lisensi
-
-2.1 Agar bisa menggunakan Pratinjau, Anda terlebih dahulu harus menyetujui Perjanjian Lisensi ini. Anda tidak boleh menggunakan Pratinjau jika tidak menerima Perjanjian Lisensi.
-
-2.2 Dengan mengklik untuk menerima dan/atau menggunakan Pratinjau, berarti Anda menyetujui ketentuan Perjanjian Lisensi.
-
-2.3 Anda tidak boleh menggunakan Pratinjau dan tidak boleh menerima Perjanjian Lisensi jika Anda adalah orang yang dilarang menerima Pratinjau berdasarkan hukum Amerika Serikat atau negara lainnya termasuk negara di mana Anda tinggal atau dari mana Anda menggunakan Pratinjau.
-
-2.4 Jika Anda akan menggunakan Pratinjau di lingkungan perusahaan atau organisasi Anda, berarti Anda setuju untuk terikat oleh Perjanjian Lisensi atas nama perusahaan Anda atau entitas lainnya, serta Anda mewakili dan menjamin bahwa Anda memiliki kewenangan hukum penuh untuk mengikat perusahaan Anda atau entitas tersebut pada Perjanjian Lisensi ini. Jika Anda tidak memiliki kewenangan yang disyaratkan, Anda tidak boleh menerima Perjanjian Lisensi atau menggunakan Pratinjau atas nama perusahaan Anda atau entitas lainnya.
-
-3. Lisensi Pratinjau dari Google
-
-3.1 Sesuai dengan ketentuan Perjanjian Lisensi ini, Google memberi Anda lisensi yang tidak bisa disublisensikan, non-eksklusif, tidak bisa dialihkan, bebas royalti, bersifat global dan terbatas dalam menggunakan Pratinjau hanya untuk keperluan pengembangan aplikasi yang kompatibel untuk diimplementasikan pada Android.
-
-3.2 Anda tidak boleh menggunakan Pratinjau ini untuk mengembangkan aplikasi platform lain (termasuk implementasi yang tidak kompatibel pada Android) atau untuk mengembangkan SDK lain. Anda tentu saja bebas mengembangkan aplikasi untuk platform lain, termasuk implementasi yang tidak kompatibel pada Android, karena Pratinjau ini tidak digunakan untuk tujuan tersebut.
-
-3.3 Anda setuju bahwa Google atau pihak ketiga memiliki semua hak, kuasa dan kepentingan hukum dalam dan pada Pratinjau, termasuk Hak Kekayaan Intelektual yang terdapat dalam Pratinjau. "Hak Kekayaan Intelektual" berarti setiap dan semua hak yang berdasarkan pada hukum paten, hukum hak cipta, hukum rahasia dagang, hukum merek dagang, dan setiap dan semua hak kepemilikan lainnya. Google memiliki semua hak yang tidak secara tersurat diberikan kepada Anda.
-
-3.4 Anda tidak boleh menggunakan Pratinjau untuk tujuan apa pun yang tidak secara tersurat diizinkan dalam Perjanjian Lisensi ini. Kecuali sejauh yang diperlukan oleh lisensi pihak ketiga yang berlaku, Anda tidak boleh: (a) menyalin (kecuali untuk keperluan pencadangan), memodifikasi, mengadaptasi, mendistribusikan kembali, mendekompilasi, merekayasa balik, membongkar atau membuat karya turunan dari Pratinjau atau bagian apa pun dari Pratinjau; atau (b) memuat bagian apa pun dari Pratinjau ke sebuah handset ponsel atau perangkat keras selain komputer pribadi, menggabungkan suatu bagian dari Pratinjau dengan perangkat lunak lain, atau mendistribusikan perangkat lunak atau perangkat yang menggabungkan suatu bagian dari Pratinjau.
-
-3.5 Penggunaan, reproduksi dan distribusi komponen Pratinjau yang berlisensi perangkat lunak sumber terbuka diatur semata-mata oleh ketentuan lisensi perangkat lunak sumber terbuka tersebut dan bukan oleh Perjanjian Lisensi ini. Anda menyetujui bagian selebihnya dari lisensi dengan maksud baik sehubungan dengan lisensi perangkat lunak sumber terbuka tersebut sesuai dengan semua hak yang diberikan dan untuk menahan diri dari segala tindakan yang mungkin akan mengakhiri, menangguhkan, atau melanggar hak tersebut.
-
-3.6 Anda setuju bahwa bentuk dan sifat Pratinjau yang disediakan oleh Google dapat berubah tanpa pemberitahuan sebelumnya kepada Anda dan bahwa versi Pratinjau mendatang mungkin tidak kompatibel dengan aplikasi yang dikembangkan di versi Pratinjau sebelumnya. Anda setuju bahwa Google boleh menghentikan (secara permanen atau sementara) penyediaan Pratinjau (atau fitur apa pun dalam Pratinjau) kepada Anda atau pengguna pada umumnya atas kebijakan Google semata, tanpa pemberitahuan sebelumnya kepada Anda.
-
-3.7 Perjanjian Lisensi ini tidak memberi Anda hak untuk menggunakan nama dagang, merek dagang, merek layanan, logo, nama domain, atau fitur merek khas Google lainnya.
-
-3.8 Anda setuju bahwa Anda tidak akan membuang, mengaburkan, atau mengubah pernyataan hak kepemilikan apa pun (termasuk pemberitahuan hak cipta dan merek dagang) yang terlampir atau termuat dalam Pratinjau.
-
-4. Penggunaan Pratinjau oleh Anda
-
-4.1 Google setuju bahwa Perjanjian Lisensi ini tidak memberi Google hak, kuasa, dan kepentingan hukum dari Anda (atau pemberi lisensi Anda) dalam atau pada aplikasi perangkat lunak apa pun yang Anda kembangkan menggunakan Pratinjau ini, termasuk kekayaan intelektual yang ada dalam aplikasi tersebut.
-
-4.2 Anda setuju untuk menggunakan Pratinjau dan menulis aplikasi hanya untuk tujuan yang diizinkan oleh (a) Perjanjian Lisensi, dan (b) hukum yang berlaku, peraturan atau praktik yang diterima secara umum atau panduan dalam yurisdiksi terkait (termasuk hukum mengenai ekspor data atau perangkat lunak ke dan dari Amerika Serikat atau negara lain yang terkait).
-
-4.3 Anda setuju jika Anda menggunakan Pratinjau untuk mengembangkan aplikasi, Anda akan melindungi hak privasi dan hak hukum pengguna. Jika pengguna memberikan nama pengguna, sandi, atau informasi login atau informasi pribadinya, Anda harus membuat pengguna tersebut menyadari bahwa informasi yang diberikannya akan bisa digunakan oleh aplikasi Anda, dan Anda harus memberikan perlindungan dan pemberitahuan privasi yang memadai secara hukum bagi pengguna tersebut. Jika aplikasi Anda menyimpan informasi pribadi atau sensitif yang diberikan oleh pengguna, aplikasi Anda harus melakukannya dengan aman. Jika pengguna memberikan informasi Akun Google, aplikasi Anda hanya boleh menggunakan informasi tersebut untuk mengakses Akun Google pengguna saat, dan untuk tujuan terbatas di mana, pengguna tersebut telah memberikan izin kepada Anda untuk melakukannya.
-
-4.4 Anda setuju bahwa Anda tidak akan terlibat dalam aktivitas apa pun dengan Pratinjau, termasuk pengembangan atau distribusi aplikasi yang mengganggu, mengacaukan, merusak, atau mengakses secara tidak sah server, jaringan atau properti layanan Google atau pihak ketiga lainnya.
-
-4.5 Anda setuju bertanggung jawab penuh untuk (dan bahwa Google tidak bertanggung jawab terhadap Anda atau pihak ketiga lainnya untuk) data, materi, atau sumber daya apa pun yang Anda buat, kirimkan atau tampilkan melalui Android dan/atau aplikasi untuk Android, dan terhadap konsekuensi tindakan Anda (termasuk kerugian atau kerusakan apa pun yang mungkin dialami Google).
-
-4.6 Anda setuju bertanggung jawab penuh terhadap (dan bahwa Google tidak bertanggung jawab terhadap Anda atau pihak ketiga lainnya untuk) pelanggaran kewajiban Anda berdasarkan Perjanjian Lisensi ini, kontrak pihak ketiga yang berlaku atau Ketentuan Layanan, atau hukum atau peraturan yang berlaku, dan terhadap konsekuensi (termasuk kerugian atau kerusakan yang mungkin dialami Google atau pihak ketiga lainnya) akibat pelanggaran tersebut.
-
-4.7 Pratinjau ini dalam tahap pengembangan, dan pengujian serta masukan Anda merupakan bagian penting dalam proses pengembangan. Dengan menggunakan Pratinjau, Anda mengakui bahwa implementasi beberapa fitur masih dalam tahap pengembangan dan bahwa Anda tidak seharusnya mengandalkan Pratinjau berfungsi sepenuhnya sebagaimana pada rilis stabil. Anda setuju untuk tidak mendistribusikan atau mengirimkan untuk umum penggunaan aplikasi menggunakan Pratinjau karena Pratinjau ini tidak akan lagi didukung setelah Android SDK dirilis secara resmi.
-
-5. Kredensial Pengembang Anda
-
-5.1 Anda setuju bertanggung jawab untuk menjaga kerahasiaan semua kredensial pengembang yang mungkin diberikan Google kepada Anda atau yang mungkin Anda pilih sendiri dan bahwa Anda akan bertanggung jawab penuh terhadap semua aplikasi yang dikembangkan dengan kredensial pengembang Anda.
-
-6. Privasi dan Informasi
-
-6.1 Untuk terus berinovasi dan meningkatkan Pratinjau, Google boleh mengumpulkan statistik penggunaan tertentu dari perangkat lunak termasuk namun tidak terbatas pada identifier unik, alamat IP terkait, nomor versi perangkat lunak, dan informasi yang menjadi tempat penggunaan alat dan/atau layanan dalam Pratinjau dan cara penggunaannya. Sebelum informasi ini dikumpulkan, Pratinjau akan memberi tahu dan meminta persetujuan Anda. Jika Anda tidak memberikan persetujuan, informasi tersebut tidak akan dikumpulkan.
-
-6.2 Data yang dikumpulkan akan diperiksa secara agregat untuk meningkatkan Pratinjau dan dikelola sesuai dengan Kebijakan Privasi Google yang terdapat di http://www.google.com/policies/privacy.
-
-7. Aplikasi Pihak Ketiga
-
-7.1 Jika Anda menggunakan Pratinjau untuk menjalankan aplikasi yang dikembangkan oleh pihak ketiga atau yang mengakses data, materi atau sumber daya yang disediakan oleh pihak ketiga, Anda setuju bahwa Google tidak bertanggung jawab terhadap aplikasi, data, materi atau sumber daya tersebut. Anda memahami bahwa semua data, materi atau sumber daya yang mungkin Anda akses melalui aplikasi pihak ketiga merupakan tanggung jawab penuh dari pihak yang menjadi asal data tersebut dan Google tidak bertanggung jawab terhadap kerugian atau kerusakan apa pun yang mungkin Anda alami sebagai akibat menggunakan atau mengakses aplikasi, data, materi, atau sumber daya pihak ketiga tersebut.
-
-7.2 Anda harus menyadari bahwa data, materi dan sumber daya yang diberikan kepada Anda melalui aplikasi pihak ketiga mungkin dilindungi oleh hak kekayaan intelektual yang dimiliki oleh penyedia (atau oleh orang lain atau perusahaan atas nama mereka). Anda tidak boleh memodifikasi, menyewakan, menyewabelikan, meminjamkan, menjual, mendistribusikan atau membuat karya turunan berdasarkan data, materi, atau sumber daya ini (baik secara keseluruhan atau sebagian) kecuali Anda secara khusus diberikan izin untuk melakukannya oleh pemilik yang bersangkutan.
-
-7.3 Anda mengakui bahwa penggunaan Anda atas aplikasi, data, materi, atau sumber daya pihak ketiga semacam itu tunduk pada ketentuan terpisah antara Anda dan pihak ketiga yang bersangkutan.
-
-8. Menggunakan Google API
-
-8.1 Google API
-
-8.1.1 Jika Anda menggunakan API (Antarmuka Pemrograman Aplikasi) untuk mengambil data dari Google, Anda mengakui bahwa data tersebut dilindungi hak kekayaan intelektual yang dimiliki Google atau pihak-pihak yang menyediakan data (atau oleh orang lain atau perusahaan atas nama mereka). Penggunaan API oleh Anda tunduk pada Ketentuan Layanan tambahan. Anda tidak boleh memodifikasi, menyewakan, menyewabelikan, meminjamkan, menjual, mendistribusikan atau membuat karya turunan berdasarkan data ini (baik secara keseluruhan atau sebagian) kecuali diizinkan oleh Ketentuan Layanan yang bersangkutan.
-
-8.1.2 Jika Anda menggunakan API dalam bentuk apa pun untuk mengambil data pengguna dari Google, Anda mengakui dan menyetujui bahwa Anda akan mengambil data hanya dengan persetujuan yang jelas dari pengguna dan hanya bila, dan sebatas keperluan yang diizinkan oleh pengguna tersebut untuk Anda lakukan.
-
-9. Mengakhiri Perjanjian Lisensi
-
-9.1 Perjanjian Lisensi ini akan terus berlaku hingga diakhiri oleh Anda atau Google sebagaimana diatur di bawah ini.
-
-9.2 Jika Anda ingin mengakhiri Perjanjian Lisensi ini, Anda boleh melakukannya dengan menghentikan penggunaan Pratinjau dan kredensial pengembang yang relevan.
-
-9.3 Google boleh mengakhiri Perjanjian Lisensi ini dengan Anda kapan saja, dengan atau tanpa sebab, setelah memberi tahu Anda.
-
-9.4 Perjanjian Lisensi akan berakhir secara otomatis tanpa pemberitahuan atau tindakan lainnya bila, mana saja yang lebih dahulu:
-(A) Google berhenti menyediakan Pratinjau atau bagian Pratinjau tertentu kepada pengguna di negara tempat Anda tinggal atau negara tempat asal Anda menggunakan layanan; dan
-(B) Google mengeluarkan versi rilis final dari Android SDK.
-
-9.5 Bila Perjanjian Lisensi berakhir, lisensi yang telah diberikan kepada Anda dalam Perjanjian Lisensi akan berakhir pula, Anda akan segera menghentikan semua penggunaan Pratinjau, dan ketetapan paragraf 10, 11, 12, dan 14 akan terus berlaku secara tak terbatas.
-
-10. SANGGAHAN
-
-10.1 ANDA SEPENUHNYA MEMAHAMI DAN MENYETUJUI BAHWA PENGGUNAAN PRATINJAU OLEH ANDA MERUPAKAN RISIKO ANDA SENDIRI DAN BAHWA PRATINJAU INI DISEDIAKAN "APA ADANYA" DAN "SEBAGAIMANA TERSEDIA" TANPA JAMINAN DALAM BENTUK APA PUN DARI GOOGLE.
-
-10.2 PENGGUNAAN PRATINJAU DAN MATERI APA PUN YANG DIUNDUH ATAU DIPEROLEH MELALUI PENGGUNAAN PRATINJAU OLEH ANDA ADALAH ATAS KEHENDAK DAN RISIKO ANDA SENDIRI DAN ANDA BERTANGGUNG JAWAB PENUH TERHADAP KERUSAKAN PADA SISTEM KOMPUTER ATAU PERANGKAT LAIN ATAU HILANGNYA DATA AKIBAT PENGGUNAAN TERSEBUT. TANPA MEMBATASI HAL TERSEBUT, ANDA MEMAHAMI BAHWA PRATINJAU BUKANLAH RILIS STABIL DAN MUNGKIN BERISI KESALAHAN, CACAT, DAN RISIKO KEAMANAN YANG BISA MENGAKIBATKAN KERUSAKAN SIGNIFIKAN, TERMASUK KEHILANGAN PENGGUNAAN ATAS SISTEM KOMPUTER ANDA ATAU PERANGKAT LAIN DENGAN SEPENUHNYA DAN TIDAK BISA DIPULIHKAN LAGI.
-
-10.3 GOOGLE LEBIH LANJUT MENYANGGAH SEMUA JAMINAN DAN PERSYARATAN APA PUN, BAIK TERSURAT MAUPUN TERSIRAT, TERMASUK NAMUN TIDAK TERBATAS PADA JAMINAN TERSIRAT DAN PERSYARATAN MENGENAI DAYA JUAL, KESESUAIAN DENGAN TUJUAN TERTENTU, DAN NON-PELANGGARAN.
-
-11. PEMBATASAN KEWAJIBAN
-
-11.1 ANDA SEPENUHNYA MEMAHAMI DAN MENYETUJUI BAHWA GOOGLE, ANAK PERUSAHAAN DAN AFILIASINYA, DAN PEMBERI LISENSINYA TIDAK AKAN BERTANGGUNG JAWAB KEPADA ANDA BERDASARKAN TEORI KEWAJIBAN TERHADAP SEGALA KERUGIAN LANGSUNG, TIDAK LANGSUNG, INSIDENTAL, KHUSUS, JANGKA PANJANG ATAU GANTI RUGI YANG DIAKIBATKAN OLEH ANDA, TERMASUK HILANGNYA DATA, WALAUPUN GOOGLE ATAU PERWAKILANNYA TELAH DIBERI TAHU ATAU SEHARUSNYA MENGETAHUI KEMUNGKINAN TIMBULNYA KEHILANGAN TERSEBUT.
-
-12. Penggantian Kerugian
-
-12.1 Sejauh maksimum yang diizinkan oleh hukum, Anda setuju untuk membela, mengganti kerugian dan melepaskan tanggung jawab Google, afiliasinya beserta direksi, petugas, karyawan dan agennya dari dan terhadap setiap dan semua klaim, tindakan, gugatan, proses hukum, serta setiap dan semua kehilangan, kewajiban, kerusakan, biaya dan pengeluaran (termasuk biaya pengacara yang sewajarnya) yang timbul atau diakibatkan dari (a) penggunaan Pratinjau oleh Anda, (b) aplikasi apa pun yang Anda kembangkan dari Pratinjau yang melanggar Hak Kekayaan Intelektual seseorang atau mencemarkan nama baik seseorang atau melanggar hak mereka berkaitan dengan publisitas atau privasi, dan (c) ketidakpatuhan Anda terhadap Perjanjian Lisensi ini.
-
-13. Perubahan pada Perjanjian Lisensi
-
-13.1 Google boleh membuat perubahan pada Perjanjian Lisensi saat mendistribusikan versi baru Pratinjau. Saat perubahan tersebut dibuat, Google akan menyediakan versi baru Perjanjian Lisensi di situs web penyediaan Pratinjau.
-
-14. Ketentuan Hukum Umum
-
-14.1 Perjanjian Lisensi ini merupakan perjanjian hukum antara Anda dan Google dan mengatur penggunaan Pratinjau oleh Anda (tidak termasuk layanan apa pun yang mungkin disediakan Google untuk Anda dalam perjanjian tertulis terpisah), dan sepenuhnya menggantikan perjanjian sebelumnya antara Anda dan Google dalam kaitannya dengan Pratinjau.
-
-14.2 Anda setuju bahwa jika Google tidak menjalankan atau menerapkan hak atau upaya hukum yang terkandung dalam Perjanjian Lisensi ini (atau bila Google memiliki kewenangan berdasarkan hukum yang berlaku), tindakan ini tidak akan dianggap sebagai pelepasan hak secara resmi oleh Google dan bahwa hak atau upaya hukum tersebut akan tetap bisa digunakan oleh Google.
-
-14.3 Jika persidangan hukum yang berwenang untuk memutuskan perkara ini menetapkan bahwa ada ketetapan Perjanjian Lisensi ini yang tidak valid, maka ketetapan tersebut akan dihapus dari Perjanjian Lisensi tanpa memengaruhi bagian selebihnya dari Perjanjian Lisensi ini. Ketetapan selebihnya dari Perjanjian Lisensi ini akan tetap sah dan berlaku.
-
-14.4 Anda mengakui dan menyetujui bahwa setiap anggota dari kelompok perusahaan yang diinduki oleh Google akan menjadi pihak ketiga penerima manfaat dari Perjanjian Lisensi ini dan bahwa perusahaan tersebut berhak untuk secara langsung memberlakukan, dan bergantung pada, ketetapan yang dimuat dalam Perjanjian Lisensi ini yang memberikan manfaat (atau hak yang mendukung) kepada mereka. Selain yang telah disebutkan di atas, tidak ada orang atau perusahaan lain yang akan menjadi pihak ketiga penerima manfaat dari Perjanjian Lisensi ini
-
-14.5 PEMBATASAN EKSPOR. PRATINJAU TUNDUK PADA HUKUM DAN PERATURAN EKSPOR AMERIKA SERIKAT. ANDA HARUS MEMATUHI SEMUA HUKUM DAN PERATURAN NASIONAL DAN INTERNASIONAL YANG BERLAKU PADA PRATINJAU. HUKUM INI MENYERTAKAN PEMBATASAN ATAS TUJUAN, PENGGUNA AKHIR DAN PENGGUNAAN AKHIR
-
-14.6 Perjanjian Lisensi ini tidak boleh diberikan atau dialihkan baik oleh Anda tanpa persetujuan tertulis sebelumnya dari Google, dan upaya apa pun untuk mengalihkannya tanpa persetujuan akan menjadi tidak sah. Anda tidak boleh mendelegasikan tanggung jawab atau kewajiban berdasarkan Perjanjian Lisensi ini tanpa persetujuan tertulis sebelumnya dari pihak lain.
-
-14.7 Perjanjian Lisensi ini, dan hubungan Anda dengan Google berdasarkan Perjanjian Lisensi ini, akan diatur oleh hukum Negara Bagian California tanpa mengindahkan pertentangan ketetapan hukumnya. Anda dan Google setuju untuk tunduk pada yurisdiksi eksklusif pengadilan yang berlokasi di county Santa Clara, California untuk menyelesaikan segala masalah hukum yang timbul dari Perjanjian Lisensi ini. Meski demikian, Anda setuju bahwa Google akan tetap diizinkan untuk mengajukan upaya hukum (atau tipe keringanan hukum setara yang mendesak) dalam yurisdiksi apa pun.
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/preview/overview.jd b/docs/html-intl/intl/in/preview/overview.jd
deleted file mode 100644
index c1fc0b5..0000000
--- a/docs/html-intl/intl/in/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=Ringkasan Program
-page.metaDescription=Persiapkan aplikasi Anda untuk versi Android berikutnya
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- Selamat datang di <strong>Android N Developer Preview</strong>, program yang
- akan memberi apa saja yang Anda butuhkan untuk menguji dan mengoptimalkan aplikasi untuk versi
- Android berikutnya. Program ini tersedia gratis, dan Anda bisa langsung mulai hanya dengan
- mengunduh alat bantu N Developer Preview.
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- Gambar perangkat keras dan emulator
- </h5>
-
- <p>
- Jalankan dan uji aplikasi Anda pada berbagai perangkat atau pada emulator.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Kode platform terbaru
- </h5>
-
- <p>
- Kami akan menyediakan pembaruan setiap bulan selama Pratinjau, agar Anda bisa menguji perubahan platform terbaru.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Prioritas untuk masalah pengembang
- </h5>
-
- <p>
- Selama beberapa minggu pertama, kami akan memberikan prioritas pada masalah-masalah
- yang dilaporkan pengembang, jadi ujilah dan berikan masukan sesegera mungkin.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- Kemampuan dan perilaku baru
- </h5>
-
- <p>
- Mulailah pekerjaan lebih awal untuk mendukung perilaku platform baru dan kembangkan dengan fitur-fitur baru.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Pembaruan dikirim melalui OTA
- </h5>
-
- <p>
- Pembaruan lewat jaringan seluler tanpa kendala untuk setiap perangkat yang didukung melalui
- Android Beta Program. Flashing tidak diperlukan.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Masukan dan dukungan
- </h5>
-
- <p>
- Laporkan masalah dan berikan masukan kepada kami dengan menggunakan
- <a href="{@docRoot}preview/bug">Issue Tracker</a> kami. Hubungkan dengan
- pengembang lain di
- <a href="{@docRoot}preview/dev-community">N Developer Community</a>.
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">Kronologi dan pembaruan</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- N Developer Preview berjalan dari 9 Maret 2016 hingga rilis resmi Android N
- final ke AOSP dan OEM, yang direncanakan selama Kuartal 3 2016.
-</p>
-
-<p>
- Pada tahapan pencapaian pengembangan yang penting kami akan mengirimkan pembaruan untuk lingkungan pengujian dan
- pengembangan Anda. Pada umumnya Anda diharapkan sudah memperoleh pembaruan setiap bulan (dengan interval 4 sampai 6
- minggu). Tahapan pencapaian tersebut tercantum di bawah ini.
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Pratinjau 1</a></strong> (rilis pertama, alfa)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Pratinjau 2</a></strong> (pembaruan bertahap, alfa)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Pratinjau 3</a></strong> (pembaruan bertahap, beta)</li>
- <li><strong>Pratinjau 4</strong> (API final dan SDK resmi, publikasi di Play)</li>
- <li><strong>Pratinjau 5</strong> (citra sistem hampir final untuk pengujian akhir)</li>
- <li><strong>Rilis Final</strong> ke AOSP dan ekosistem</li>
-</ul>
-
-<p>
- Setiap pembaruan menyertakan SDK Tools, citra sistem pratinjau, emulator, dokumentasi
- referensi, dan diff API.
-</p>
-
-<p>
- <strong>Tiga tahapan pencapaian pratinjau pertama</strong> memberikan <strong>ujian
- pertama dan lingkungan pengembangan</strong> yang membantu Anda mengidentifikasi
- masalah kompatibilitas dalam aplikasi Anda saat ini dan merencanakan migrasi atau menampilkan pekerjaan
- yang diperlukan untuk menargetkan platform baru. Ini adalah periode prioritas yang akan
- memberi kami masukan dari Anda tentang fitur dan API serta masalah kompatibilitas file
- — untuk semua ini, gunakan <a href="{@docRoot}preview/bug">Issue
- Tracker</a>. Anda bisa mengharapkan beberapa perubahan API dalam pembaruan ini.
-</p>
-
-<p>
- Pada <strong>pratinjau 4 dan 5</strong> Anda akan memiliki akses ke <strong>
- API dan SDK N final</strong> untuk digunakan dalam pengembangan, serta citra sistem hampir-final
- untuk menguji perilaku dan fitur sistem. Android N akan memberikan level API
- standar pada saat ini. Anda bisa memulai pengujian kompatibilitas final dari aplikasi
- lawas dan menyaring setiap kode baru yang menggunakan API atau fitur N.
-</p>
-
-<p>
- Juga, mulai pratinjau 4, Anda akan bisa <strong>mempublikasikan aplikasi ke
- perangkat</strong> yang menjalankan Android N pada level API resmi, seperti
- perangkat konsumen yang telah mengikuti program Android Beta. Anda bisa
- mempublikasikan ke saluran alfa dan beta Google Play terlebih dahulu, agar Anda bisa menguji
- aplikasi pada konsumen Android Beta sebelum mendistribusikan secara luas di
- toko.
-</p>
-
-<p>
- Saat Anda menguji dan mengembangkan di Android N, kami sangat menyarankan<strong>terus memperbarui
- lingkungan pengembangan</strong> saat pembaruan pratinjau
- dirilis. Untuk mempermudah prosesnya, Anda bisa mendaftarkan perangkat pengujian di
- program Android Beta dan mendapatkan <strong>pembaruan lewat jaringan seluler (OTA)</strong>
- pada setiap tahapan pencapaian. Sebagai alternatif, citra pratinjau terbaru telah tersedia agar Anda
- bisa mengunduh dan mem-flash secara manual.
-</p>
-
-<p>
- Kami akan memberi tahu Anda bila pembaruan pratinjau telah tersedia lewat <a href="http://android-developers.blogspot.com/">Android Developers Blog</a> serta
- situs ini dan <a href="{@docRoot}preview/dev-community">Android
- N Developer Community</a>.
-</p>
-
-
-<h2 id="preview_tools">Apa yang ada di N Developer Preview?</h2>
-
-<p>
- N Developer Preview menyertakan apa saja yang Anda perlukan untuk menguji aplikasi
- yang ada pada berbagai ukuran layar, teknologi jaringan, chipset CPU/GPU,
- dan arsitektur perangkat keras.
-</p>
-
-<h3 id="sdk_tools">SDK Tools</h3>
-
-<p>Anda bisa mengunduh komponen-komponen ini melalui SDK Manager di <a href="{@docRoot}studio/intro/update.html">Android Studio</a>:</p>
-
-<ul>
- <li> SDK dan alat <strong>N Developer Preview</strong>
- <li> <strong>Citra sistem emulator</strong> N Developer Preview (32-bit & 64-bit)
- <li> <strong>Citra sistem emulator</strong> N Developer Preview untuk Android TV (32-bit)
- <li> N Developer Preview mendukung pustaka (untuk template aplikasi baru)
-</ul>
-
-<p>
- Kami akan menyediakan pembaruan untuk alat pengembangan ini di setiap tahapan pencapaian jika diperlukan.
-</p>
-
-<h3 id="hardware_system_images">Citra sistem perangkat keras</h3>
-
-<p>
- N Developer Preview menyertakan citra sistem Nexus dan perangkat keras lainnya yang bisa Anda gunakan saat
- menguji dan mengembangkan pada perangkat fisik. Lihat halaman <a href="{@docRoot}preview/download.html">Citra Perangkat</a> untuk melihat daftar lengkap
- citra perangkat keras.
-</p>
-
-<p>
- Kami akan mengirimkan citra sistem terbaru untuk perangkat ini pada setiap tahapan pencapaian. Anda
- bisa mengunduh dan mem-flash citra sistem yang diperbarui untuk perangkat pengujian
- secara manual, sesering yang Anda perlukan. Ini terutama berguna untuk lingkungan pengujian
- otomatis bila Anda mungkin perlu mem-flash ulang perangkat beberapa
- kali.
-</p>
-
-<p class="note"><strong>Catatan</strong>:
- <strong>Perangkat yang di-flash secara manual tidak akan mendapatkan pembaruan OTA</strong> seperti di
- pratinjau tahun lalu. Tahun ini, Anda bisa memperoleh OTA dengan mendaftarkan perangkat dalam
- Android Beta Program — lihat detailnya di bagian berikutnya.
-</p>
-
-<h3 id="android_beta">Pembaruan OTA melalui Android Beta Program</h3>
-
-<p>
- Yang baru untuk Android N adalah program pembaruan lewat jaringan seluler (OTA) yang secara otomatis
- mengirim pembaruan pratinjau terbaru Android N secara langsung ke perangkat yang telah mendaftar
- di program ini. Program ini gratis dan terbuka bagi siapa saja yang memiliki
- perangkat yang didukung dan telah didaftarkan ke akun Google mereka.
-</p>
-
-<p>
- Untuk mendaftar dalam program ini, kunjungi situs <a href="https://g.co/androidbeta">Android
- Beta Program</a>. Anda akan
- melihat semua perangkat yang telah didaftarkan ke akun Anda yang memenuhi syarat untuk mendaftar
- dalam Android Beta.
-</p>
-
-<ol>
- <li> Pilih perangkat yang Anda inginkan untuk menerima pembaruan Android N
- <li> Klik Enroll, baca dan setujui ketentuan layanan, kemudian klik OK
-</ol>
-
-<p>
- Setelah terdaftar, perangkat Anda akan segera menerima pembaruan. Umumnya
- Anda tidak perlu penyetelan ulang penuh atas data untuk beralih ke Android N, namun
- Anda disarankan mencadangkan setiap data yang tidak ingin hilang sebelum
- mendaftarkan perangkat.
-</p>
-
-<p>
- Saat pembaruan dikirim ke perangkat Anda, kami menyarankan Anda untuk segera mengunduh dan
- memasangnya. Anda perlu terus mengikuti perubahan terbaru
- dalam UI sistem, perilaku, API, dan fitur.
-</p>
-
-<p>
- Di akhir periode Developer Preview, perangkat Anda yang telah didaftarkan akan
- menerima pembaruan ke rilis resmi Android N.
-</p>
-
-<p>
- Anda bisa membatalkan pendaftaran perangkat dari program Android Beta kapan saja dari
- situs Android Beta. Sebelum membatalkan pendaftaran, pastikan Anda telah mencadangkan data pada
- perangkat.
-</p>
-
- <p class="note"><strong>Catatan</strong>:
- Bila membatalkan pendaftaran, <strong>perangkat Anda akan dikembalikan ke setelan pabrik</strong>
- ke versi terbaru
- Android 6.0 Marshmallow (tidak harus ke versi yang telah Anda
- pasang sebelum mendaftarkan perangkat). Untuk memastikan pemasangan yang bersih,
- data Anda akan dihapus dari perangkat, termasuk kontak, pesan,
- foto, dan seterusnya.
-</p>
-
-<h3 id="documentation_and_sample_code">Dokumentasi dan kode contoh</h3>
-
-<p>
- Sumber daya dokumentasi ini tersedia pada situs Developer Preview untuk
- membantu Anda mempelajari tentang Android N:
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan Pengembangan untuk
-Android N</a> memiliki
- petunjuk langkah demi langkah untuk memulai.</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">Perubahan
- Perilaku</a> akan menunjukkan kepada Anda bidang-bidang utama untuk diuji.</li>
- <li> Dokumentasi API baru, termasuk <a href="{@docRoot}preview/api-overview.html">Ringkasan API</a>,
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi
- API</a> yang bisa diunduh, dan panduan pengembang detail mengenai fitur-fitur utama seperti
- dukungan multi-jendela, bundel pemberitahuan, dukungan multilokal, dan lainnya.
- <li> <a href="{@docRoot}preview/samples.html">Kode contoh</a> yang
- memperagakan cara mendukung izin dan fitur baru lainnya.
- <li> <a href="{@docRoot}preview/support.html#release-notes">Catatan rilis</a>
- untuk versi N Developer Preview saat ini, termasuk catatan perubahan dan
- laporan diff.
-</ul>
-
-<h4 id="reference">Referensi API yang Bisa Diunduh</h4>
-
-<p>
- Selama pembaruan pratinjau awal, Anda bisa mengunduh
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API
- untuk platform Android N</a> sebagai arsip zip terpisah. Unduhan
- referensi juga menyertakan laporan diff yang akan membantu Anda mengenali perubahan API dari
- API 23 dan pembaruan sebelumnya.
-</p>
-
-<p>
- Bila API Android N sudah final dan API level resmi telah ditetapkan,
- kami akan menyediakan referensi API kepada Anda secara online di <a href="https://developer.android.com">https://developer.android.com</a>.
-</p>
-
-<h3 id="support_resources">
- Sumber daya dukungan
-</h3>
-
-<p>
- Saat Anda menguji dan mengembangkan N Developer Preview, gunakan saluran
- ini untuk melaporkan masalah dan memberikan masukan.
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue
- Tracker</a> adalah <strong>saluran masukan Anda.</strong> Anda bisa melaporkan bug, masalah
- kinerja, dan masukan umum melalui Issue Tracker. Anda juga bisa memeriksa
-<a href="{@docRoot}preview/bugs">masalah yang diketahui</a> dan
- mencari langkah-langkah solusinya. Kami akan terus mengabari Anda mengenai masalah tersebut bila telah disortir dan dikirimkan ke
- tim teknis Android untuk ditinjau. </li>
- <li> <a href="{@docRoot}preview/dev-community">Android N Developer Community</a> adalah
- sebuah komunitas Google+ tempat Anda bisa <strong>terhubung dengan pengembang lain</strong> yang menggunakan
- Android N. Anda bisa menyampaikan pengamatan atau ide atau menemukan jawaban atas
- pertanyaan-pertanyaan mengenai Android N. Kami akan memoderasi komunitas ini dan memberikan jawaban serta
- panduan jika diperlukan.</li>
-</ul>
-
-<h3 id="targeting">Menargetkan, API pratinjau, dan mempublikasikan</h3>
-
-<p>
- N Developer Preview menyediakan sistem pengembangan saja dan pustaka
- Android yang <strong>tidak memiliki API level standar</strong>. Jika Anda tidak ingin
- mengikuti perilaku kompatibilitas untuk menguji aplikasi (yang sangat
- disarankan), Anda bisa menargetkan versi pratinjau Android N dengan menyetel
- <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code>
- aplikasi Anda ke <code>“N”</code>.
-</p>
-
-<p>
- Android N Developer Preview menghasilkan <strong>API pratinjau</strong>
- — API ini tidak akan resmi hingga SDK final dirilis,
- yang saat ini direncanakan untuk kuartal ketiga 2016. Berarti Anda bisa
- <strong>mengharapkan ada banyak perubahan kecil pada API</strong> selama waktu ini, terutama selama
- minggu-minggu awal program. Kami akan menyediakan rangkuman perubahan kepada Anda bersama
- setiap pembaruan Android N Developer Preview.
-</p>
-
-<p class="note">
- <strong>Catatan</strong>: Meskipun API pratinjau mungkin berubah, perilaku dasar
- sistem sudah stabil dan siap diuji.
-
-</p>
-
-<p>
- Google Play <strong>mencegah publikasi aplikasi yang menargetkan N Developer
- Preview</strong>. Bila Android N final SDK tersedia, Anda akan bisa
- menargetkan level API Android N resmi dan mempublikasikan aplikasi ke Google
- Play lewat saluran rilis alfa dan beta. Sementara itu, jika Anda ingin
- mendistribusikan aplikasi yang menargetkan Android N kepada penguji, Anda bisa melakukannya lewat email atau
- dengan mengunduh langsung dari situs Anda.
-</p>
-
-<p>
- Saat rilis penuh Android N ke AOSP dan OEM, yang direncanakan pada Kuartal 3 2016,
- Anda akan bisa mempublikasikan aplikasi yang menargetkan Android N ke saluran
- rilis resmi di Google Play.
-</p>
-
-
-<h2 id="how_to_get_started">Cara mulai</h2>
-
-<p>
- Untuk mulai menguji aplikasi Anda dengan Android N:
-</p>
-
-<ol>
- <li> Tinjau <a href="{@docRoot}preview/api-overview.html">Ringkasan API</a>
- dan <a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a> untuk
- mendapatkan gambaran mengenai apa saja yang baru dan bagaimana pengaruhnya pada aplikasi Anda. Khususnya,
- pelajari tentang fitur baru <a href="{@docRoot}preview/features/notification-updates.html">pemberitahuan</a> dan
- <a href="{@docRoot}preview/features/multi-window.html">dukungan multi-jendela</a>.</li>
- <li> Siapkan lingkungan Anda dengan mengikuti petunjuk berikut untuk <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan SDK Pratinjau</a>
- dan mengonfigurasi perangkat pengujian.</li>
- <li> Ikuti <a href="https://developers.google.com/android/nexus/images">petunjuk
- flashing</a> untuk mem-flash citra sistem Android N terbaru ke perangkat Anda. </li>
- <li> Tinjau <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a>
- dan <a href="{@docRoot}preview/samples.html">contoh Android N</a> untuk mendapatkan wawasan
- lebih luas mengenai fitur-futur API yang baru dan cara menggunakannya dalam aplikasi Anda.
- <li> Bergabunglah dengan <a href="{@docRoot}preview/dev-community">Android N
- Developer Community</a> untuk mendapatkan berita terbaru dan terhubung dengan pengembang
- lainnya yang menggunakan platform baru ini.</li>
-</ol>
-
-<p>
- Terima kasih atas partisipasi Anda dalam program Android N Developer Preview!
-</p>
diff --git a/docs/html-intl/intl/in/preview/preview_toc.cs b/docs/html-intl/intl/in/preview/preview_toc.cs
deleted file mode 100644
index 5868e4d..0000000
--- a/docs/html-intl/intl/in/preview/preview_toc.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html" es-lang="Información general del programa" in-lang="Ikhtisar Program" ja-lang="プログラム概要" ko-lang="프로그램 개요" pt-br-lang="Visão geral do programa" ru-lang="Обзор программы" vi-lang="Tổng quan về Chương trình" zh-cn-lang="计划概览" zh-tw-lang="程式總覽"> Ringkasan Program</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html"> Dukungan dan Catatan Rilis</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html" es-lang="Configurar el SDK de la versión preliminar" in-lang="Menyiapkan Preview" ja-lang="Preview SDK のセットアップ" ko-lang="미리 보기 SDK 설정하기" pt-br-lang="Configuração do Preview SDK" ru-lang="Настройка пакета SDK Preview" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="设置预览版 SDK" zh-tw-lang="設定預覽版 SDK">Menyiapkan Pratinjau</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html" es-lang="Pruebe en un dispositivo" in-lang="Menguji pada Perangkat" ja-lang="デバイス上でテストする" ko-lang="기기에서 테스트" pt-br-lang="Testar em um dispositivo" ru-lang="Тестирование на устройстве" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="在设备上测试" zh-tw-lang="在裝置上測試">Menguji pada Perangkat</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html" es-lang="Cambios en los comportamientos" in-lang="Perubahan Perilaku" ja-lang="動作の変更点" ko-lang="동작 변경" pt-br-lang="Mudanças de comportamento" ru-lang="Изменения в работе" vi-lang="Các thay đổi Hành vi" zh-cn-lang="行为变更" zh-tw-lang="行為變更">Perubahan Perilaku </a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html" es-lang="Optimizaciones en segundo plano" in-lang="Optimisasi Latar Belakang" ja-lang="バックグラウンド処理の最適化" ko-lang="백그라운드 최적화" pt-br-lang="Otimizações em segundo plano" ru-lang="Оптимизация фоновых процессов" vi-lang="Tối ưu hóa Chạy ngầm" zh-cn-lang="后台优化" zh-tw-lang="背景最佳化">Optimalisasi Latar Belakang</a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html" es-lang="Idioma y configuración regional" in-lang="Bahasa dan Lokal" ja-lang="言語とロケール" ko-lang="언어 및 로케일" pt-br-lang="Idioma e localidade" ru-lang="Язык и языковой стандарт" vi-lang="Ngôn ngữ và Bản địa" zh-cn-lang="语言和区域设置" zh-tw-lang="語言和地區設定">Bahasa dan Lokal</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html" es-lang="Información general de la API" in-lang="Android N untuk Pengembang" ja-lang="API の概要" ko-lang="API 개요" pt-br-lang="Visão geral da API" ru-lang="Обзор API-интерфейсов" vi-lang="Android N cho Nhà phát triển" zh-cn-lang="API 概览" zh-tw-lang="API 總覽">Android N for Developers</a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html" es-lang="Compatibilidad con ventanas múltiples" in-lang="Dukungan Multi-Jendela" ja-lang="マルチ ウィンドウのサポート" ko-lang="다중 창 지원" pt-br-lang="Suporte a várias janelas" ru-lang="Поддержка многооконного режима" vi-lang="Hỗ trợ đa cửa sổ" zh-cn-lang="多窗口支持" zh-tw-lang="多視窗支援">Dukungan Multi-Jendela</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html" es-lang="Notificaciones" in-lang="Pemberitahuan" ja-lang="通知" ko-lang="알림" pt-br-lang="Notificações" ru-lang="Уведомления" vi-lang="Thông báo" zh-cn-lang="通知" zh-tw-lang="通知">Pemberitahuan</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html"> Data Saver</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html" es-lang="Grabación de TV" in-lang="Perekaman TV" ja-lang="TV の録画" ko-lang="TV 녹화" pt-br-lang="Gravação para TV" ru-lang="Запись ТВ" vi-lang="Ghi lại TV" zh-cn-lang="TV 录制" zh-tw-lang="電視錄製">Perekaman TV</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html" es-lang="Configuración de seguridad de la red" in-lang="Network Security Configuration" ja-lang="ネットワーク セキュリティ構成" ko-lang="네트워크 보안 구성" pt-br-lang="Configurações de segurança de rede" ru-lang="Конфигурация сетевой безопасности" vi-lang="Cấu hình Bảo mật mạng" zh-cn-lang="网络安全配置" zh-tw-lang="網路安全性設定">Konfigurasi Keamanan Jaringan</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html" es-lang="API de ICU4J del framework de Android" in-lang="ICU4J Android Framework API" ja-lang="ICU4J Android フレームワーク API" ko-lang="ICU4J Android 프레임워크 API" pt-br-lang="APIs de estrutura do Android para ICU4J" ru-lang="API-интерфейсы ICU4J в платформе Android" vi-lang="API Khuôn khổ Android ICU4J" zh-cn-lang="ICU4J Android 框架 API" zh-tw-lang="ICU4J Android 架構 API"> Dukungan ICU4J</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html" es-lang="Funciones del lenguaje Java 8" in-lang="Fitur Bahasa Java 8" ja-lang="Java 8 の機能" ko-lang="Java 8 언어 기능" pt-br-lang="Recursos de linguagem do Java 8" ru-lang="Возможности языка Java 8" vi-lang="Tính năng của Ngôn ngữ Java 8" zh-cn-lang="Java 8 语言功能" zh-tw-lang="Java 8 語言功能">Fitur Bahasa Java 8</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html"> Pembaruan Android for Work</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html" es-lang="Acceso a directorios determinados" in-lang="Scoped Directory Access" ja-lang="特定のディレクトリへのアクセス" ko-lang="범위가 지정된 디렉터리 액세스" pt-br-lang="Acesso a diretórios com escopo" ru-lang="Доступ к выделенным каталогам" vi-lang="Truy cập Thư mục theo Phạm vi" zh-cn-lang="作用域目录访问" zh-tw-lang="限定範圍目錄存取">Scoped Directory Access</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html" es-lang="Ejemplos" in-lang="Contoh" ja-lang="サンプル" ko-lang="샘플" pt-br-lang="Exemplos" ru-lang="Примеры" zh-cn-lang="示例" zh-tw-lang="範例"> Contoh</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html" es-lang="Contrato de licencia" ja-lang="使用許諾契約" ko-lang="라이선스 계약" pt-br-lang="Contrato de licença" ru-lang="Лицензионное соглашение" zh-cn-lang="许可协议" zh-tw-lang="授權協議"> Perjanjian Lisensi</a></div>
- </li>
-
-</ul>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/preview/samples.jd b/docs/html-intl/intl/in/preview/samples.jd
deleted file mode 100644
index 481260c..0000000
--- a/docs/html-intl/intl/in/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=Contoh
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- Contoh kode berikut disediakan untuk Android N. Untuk
- mengunduh contoh di Android Studio, pilih opsi menu <b>File > Import
- Samples</b>.
-</p>
-
-<p class="note">
- <strong>Catatan:</strong> Proyek yang bisa diunduh ini didesain
- untuk digunakan bersama Gradle dan Android Studio.
-</p>
-
-
-<h3 id="mw">Playground Multi-Jendela</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- Contoh ini memperagakan cara memanfaatkan antarmuka pengguna
- multi-jendela bersama aplikasi Anda.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
- Dapatkan di GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">Pemberitahuan Aktif</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Ini adalah contoh yang sudah ada sebelumnya, menampilkan layanan sederhana yang mengirimkan
- pemberitahuan menggunakan NotificationCompat. Setiap percakapan yang belum dibaca dari pengguna
- dikirimkan sebagai pemberitahuan berbeda.
-</p>
-<p>
- Contoh ini telah diperbarui untuk memanfaatkan fitur pemberitahuan baru
- yang tersedia di Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
- Dapatkan di GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">Layanan Perpesanan</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- Ini adalah contoh yang telah ada sebelumnya yang memperagakan cara menggunakan
- NotificationManager untuk memberi tahu jumlah pemberitahuan yang saat ini ditampilkan
- oleh aplikasi.
-</p>
-<p>
- Contoh ini telah diperbarui untuk memanfaatkan fitur pemberitahuan baru
- yang tersedia di Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
- Dapatkan di GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">Direct Boot</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Contoh ini memperagakan cara menyimpan dan mengakses data dalam penyimpanan yang dienkripsi
- dengan perangkat yang selalu tersedia saat perangkat booting.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
- Dapatkan di GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">Scoped Directory Access</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Contoh ini memperagakan cara membaca dan menulis data dari direktori
- spesifik, sekaligus meminta izin lebih sedikit.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
- Dapatkan di GitHub</a>
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/preview/setup-sdk.jd b/docs/html-intl/intl/in/preview/setup-sdk.jd
deleted file mode 100644
index 9999705..0000000
--- a/docs/html-intl/intl/in/preview/setup-sdk.jd
+++ /dev/null
@@ -1,187 +0,0 @@
-page.title=Menyiapkan Pratinjau
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Dapatkan Android Studio 2.1</a></li>
- <li><a href="#get-sdk">Dapatkan Android N SDK</a>
- <ol>
- <li><a href="#docs-dl">Dokumentasi referensi</a>
- </ol>
- </li>
- <li><a href="#java8">Dapatkan Java 8 JDK</a></li>
- <li><a href="#create-update">Perbarui atau Buat sebuah Proyek</a></li>
- <li><a href="#next">Langkah Berikutnya</a></li>
-</ol>
- </div>
-</div>
-
-<p>Untuk mengembangkan aplikasi bagi Android N Preview, Anda perlu membuat beberapa pembaruan
-pada lingkungan pengembang, seperti dijelaskan pada halaman ini.</p>
-
-<p>Untuk sekedar menguji kompatibilitas aplikasi Anda pada
-citra sistem Android N, ikuti panduan untuk <a href="{@docRoot}preview/download.html">Menguji pada Perangkat Android N</a>.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Dapatkan Android Studio 2.1</h2>
-
-<p>Platform Android N menambahkan dukungan untuk <a href="{@docRoot}preview/j8-jack.html">fitur bahasa Java 8</a>,
-yang memerlukan compiler baru bernama Jack. Jack versi terbaru
-saat ini hanya didukung di Android Studio 2.1. Jadi, jika Anda ingin
-menggunakan fitur bahasa Java 8, Anda harus menggunakan Android Studio 2.1 untuk
-membangun aplikasi. Jika tidak, Anda tidak perlu menggunakan compiler Jack, namun Anda
-tetap harus memperbarui JDK 8 untuk mengompilasi pada platform Android N,
-seperti dijelaskan di bawah ini.</p>
-
-<p>Jika sudah memasang Android Studio, pastikan Anda memiliki Android
-Studio 2.1 atau yang lebih tinggi dengan mengklik <strong>Help > Check for Update</strong>
-(pada Mac, <strong>Android Studio > Check for Updates</strong>).</p>
-
-<p>Jika Anda tidak memilikinya, <a href="{@docRoot}studio/">unduh Android Studio
-2.1 di sini</a>.</p>
-
-
-<h2 id="get-sdk">Dapatkan N Preview SDK</h2>
-
-<p>Untuk mulai mengembangkan dengan Android N API, Anda perlu pasang
-Android N Preview SDK di Android Studio sebagai berikut:</p>
-
-<ol>
- <li>Buka SDK Manager dengan mengklik <strong>Tools > Android >
- SDK Manager</strong>.</li>
-
- <li>Di tab <strong>SDK Platforms</strong> pilih
-kotak centang <strong>Android N Preview</strong>.</li>
-
- <li>Klik tab <strong>SDK Tools</strong>, kemudian pilih
- kotak centang <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong>, dan <strong>Android SDK Tools</strong>.
-
- </li>
-
- <li>Klik <strong>OK</strong>, kemudian terima
- perjanjian lisensi untuk setiap paket yang perlu dipasang.
- </li>
-</ol>
-
-<h3 id="docs-dl">Dapatkan dokumentasi referensi N Preview</h3>
-
-<p>
- Informasi detail tentang Android N API tersedia dalam dokumentasi referensi N Preview,
- yang bisa Anda unduh dari tabel berikut.
- Paket ini berisi versi offline situs web pengembang Android yang disederhanakan,
- dan termasuk referensi API yang diperbarui untuk Android N API serta
- laporan perbedaan API.
-</p>
-
-<table>
- <tr>
- <th scope="col">Dokumentasi</th>
- <th scope="col">Checksum</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip">n-preview-3-docs.zip</a></td>
- <td width="100%">
- MD5: 19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
- SHA-1: 9224bd4445cd7f653c4c294d362ccb195a2101e7
- </td>
- </tr>
-<table>
-
-
-
-<h2 id="java8">Dapatkan Java 8 JDK</h2>
-
-<p>Untuk mengompilasi aplikasi Anda pada platform Android N dan menggunakan beberapa alat bersama
-Android Studio 2.1, Anda perlu pasang Java 8 Developer Kit (JDK 8). Jadi, jika
-Anda belum mempunyai versi terbaru, unduh JDK 8 sekarang.</p>
-
-<p>Kemudian, setel versi JDK di Android Studio sebagai berikut:</p>
-
-<ol>
- <li>Buka proyek Android di Android Studio, kemudian buka
- dialog Project Structure dengan memilih <strong>File >
- Project Structure</strong>. (Atau, Anda bisa menyetel default
- untuk semua proyek dengan memilih <strong>File > Other Settings >
- Default Project Structure</strong>.)
- </li>
- <li>Di panel kiri dialog, klik <strong>SDK Location</strong>.
- </li>
- <li>Dalam bidang <strong>JDK Location</strong>, masukkan lokasi
- Java 8 JDK (klik tombol di sebelah kanan
- untuk menjelajah file Anda), kemudian klik <strong>OK</strong>.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">Perbarui atau Buat sebuah Proyek</h2>
-
-<p>
- Untuk menggunakan Android N API, proyek Anda harus dikonfigurasi dengan benar.
-</p>
-
-<p>Jika Anda berencana menggunakan fitur bahasa Java 8, Anda juga harus membaca
-<a href="{@docRoot}preview/j8-jack.html">Fitur Bahasa Java 8</a>
-untuk informasi tentang fitur Java 8 yang didukung dan
-cara mengonfigurasi proyek Anda dengan Jack compiler.</p>
-
-
-<h3 id="update">Perbarui proyek yang ada</h3>
-
-<p>Buka file
- <code>build.gradle</code> untuk modul Anda dan perbarui nilainya sebagai
- berikut:
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc3'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">Buat proyek baru</h3>
-
-
-<p>Untuk membuat proyek baru bagi pengembangan dengan Android N Preview SDK:</p>
-
-<ol>
- <li>Klik <strong>File > New Project</strong>, dan ikuti langkah-langkahnya hingga
- Anda tiba di halaman Target Android Devices.
- </li>
- <li>Pada halaman ini, pilih opsi <strong>Phone and Tablet</strong>.</li>
- <li>Pada opsi <strong>Phone and Tablet</strong>, dalam daftar opsi <strong>Minimum
- SDK</strong>, pilih
- <strong>N: Android API 23, N Preview (Pratinjau)</strong>.</li>
-</ol>
-
-
-<h2 id="next">Langkah Berikutnya</h2>
-
-<ul>
- <li>Ikuti panduan untuk <a href="{@docRoot}preview/download.html">Menguji pada Perangkat Android N</a>.</li>
- <li>Ketahui selengkapnya tentang platform Android N dengan
-<a href="{@docRoot}preview/behavior-changes.html">Perubahan Perilaku</a>
-dan <a href="{@docRoot}preview/api-overview.html">Android N API
-dan Fiturnya</a>.</li>
-</ul>
-
diff --git a/docs/html-intl/intl/in/preview/support.jd b/docs/html-intl/intl/in/preview/support.jd
deleted file mode 100644
index 5571b11..0000000
--- a/docs/html-intl/intl/in/preview/support.jd
+++ /dev/null
@@ -1,1188 +0,0 @@
-page.title=Dukungan dan Catatan Rilis
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Dalam dokumen ini</h2>
-
-<ul>
- <li><a href="#dp3">Developer Preview 3</a>
- <ul>
- <li><a href="#general">Saran umum</a></li>
- <li><a href="#new">Yang baru di DP3</a></li>
- <li><a href="#ki">Masalah yang diketahui</a></li>
- </ul>
- </li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- Dua saluran dukungan utama tersedia untuk Anda saat mengembangkan dan menguji
- dengan Android N Developer Preview: Laporkan bug di <a href="https://developer.android.com/preview/bug">https://developer.android.com/preview/bug</a> untuk
- bug perangkat tertentu, sistem, dan Google App. Untuk masalah di aplikasi lain,
- hubungi pengembang secara langsung.
-</p>
-
-<p>Untuk mendiskusikan masalah atau gagasan dengan pengembang lain yang menangani Android N, bergabunglah dengan
-<a href="{@docRoot}preview/dev-community">komunitas Google+ untuk Developer Preview</a>.</p>
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Tanggal: Mei 2016<br>
- Build: NPD35K<br>
- Dukungan emulator: x86 & ARM (32/64-bit)<br>
- Google Play Services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">Saran umum</h3>
-
-<p>
- Rilis Developer Preview ini adalah untuk <strong>pengembang aplikasi dan pengguna
- awal lainnya</strong> serta tersedia untuk penggunaan sehari-hari, pengembangan, atau
- pengujian kompatibilitas. Harap perhatikan catatan umum tentang
- rilis ini:
-</p>
-
-<ul>
- <li>Rilis ini mungkin memiliki berbagai <strong>masalah stabilitas</strong> pada
- perangkat yang didukung. Pengguna mungkin mengalami ketidakstabilan sistem, seperti kernel
- yang panik dan mogok.
- </li>
-
- <li>Beberapa aplikasi <strong>mungkin tidak berfungsi seperti yang diharapkan</strong> pada versi
- platform baru. Hal ini termasuk aplikasi Google serta aplikasi lainnya.
- </li>
-
- <li>Developer Preview 3 adalah <strong>Compatibility Test Suite (CTS)
- yang disetujui</strong> pada perangkat ini: Nexus 5X, Nexus 6, Nexus 6P, dan Pixel
- C. Aplikasi yang bergantung pada build yang disetujui CTS seharusnya
- berfungsi secara normal pada perangkat ini (Android Pay misalnya).
- </li>
-
- <li>Developer Preview 3 <strong>tersedia pada semua perangkat
- yang didukung:</strong> Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player, Pixel
- C, General Mobile 4G (Android One), serta Sony Xperia Z3 (model D6603 dan
- D6653).
-
- </li>
-</ul>
-
-
-<h3 id="new">Yang baru di DP3</h3>
-
-<h4 id="">VR Mode untuk Android</h4>
-
-<p>
- Android N menambahkan dukungan platform dan optimalisasi untuk VR Mode baru yang memungkinkan
- pengembang membuat pengalaman VR berkualitas tinggi di seluler bagi para pengguna. Ada
- banyak penyempurnaan kinerja, termasuk akses ke inti CPU yang eksklusif
- untuk aplikasi VR. Dalam aplikasi, Anda bisa memanfaatkan pemantauan kepala
- yang cerdas, dan pemberitahuan stereo yang bekerja untuk VR. Yang terpenting,
- Android N memberikan grafis latensi sangat rendah.
-</p>
-
-<p>
- Untuk informasi selengkapnya, lihat <a href="https://developers.google.com/vr/android/">Google VR SDK untuk Android</a>.
-</p>
-
-<h4 id="">Mode kinerja kontinu</h4>
-
-<p>
- Android N menyertakan dukungan opsional untuk <a href="{@docRoot}preview/api-overview.html#sustained_performance_api">mode
- kinerja kontinu</a>, yang memungkinkan OEM memberikan petunjuk mengenai kapabilitas kinerja
- perangkat untuk aplikasi yang berjalan dalam waktu lama. Pengembang aplikasi nanti bisa menggunakan
- petunjuk ini untuk menyesuaikan aplikasi agar kinerja
- perangkat bisa diprediksi pada level yang konsisten dalam jangka waktu lama. Pengembang aplikasi bisa mencoba API
- baru ini dalam Developer Preview pada perangkat Nexus 6P saja.
-</p>
-
-<h4>Multiprocess WebView</h4>
-
-<p>
- Mulai versi 51 di Android N, WebView akan menjalankan materi web dalam
- proses sandbox terpisah bila opsi pengembang "Multiprocess Webview"
- diaktifkan. Tim WebView menunggu masukan mengenai kompatibilitas dan
- kinerja waktu proses di N sebelum mengaktifkan Multiprocess WebView di versi Android
- yang akan datang. Dalam versi ini, diharapkan adanya regresi waktu startup, penggunaan
- memori total dan kinerja render perangkat lunak.
-</p>
-
-<p>
- Jika Anda menemukan masalah yang tidak diharapkan dalam mode multiproses, kami ingin
- mengetahuinya. Hubungi tim WebView dengan <a href="https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">
- melaporkan bug</a>.
-</p>
-
-<h4 id="">Keyboard Shortcuts Helper</h4>
-
-<p>
- Android N memungkinkan pengguna menekan <code>Meta+/</code> untuk memunculkan layar <strong>Keyboard
- Shortcuts</strong> yang menampilkan semua pintasan yang tersedia baik dari
- sistem maupun dari aplikasi yang sedang mendapatkan fokus. Pengembang bisa menambahkan pintasan sendiri atau
- memunculkan layar Shortcuts dari aplikasi mereka. Lihat <a href="{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">Keyboard
- Shortcuts Helper</a> untuk detailnya.
-</p>
-
-<h4 id="">FrameMetrics API</h4>
-
-<p>
- DP3 memperkenalkan <a href="{@docRoot}preview/api-overview.html#framemetrics_api">FrameMetrics API</a>
- baru yang memungkinkan aplikasi memantau kinerja render UI dengan mengekspos
- streaming pubsub API untuk mentransfer informasi frame-timing jendela aplikasi
- saat ini. <code>FrameMetricsListener</code> bisa digunakan untuk mengukur
- kinerja UI level interaksi di produksi dengan tingkat kejelasan yang lebih tinggi dan
- tidak memerlukan koneksi USB.
-</p>
-
-<h4 id="api-changes">Fitur dan perubahan API</h4>
-
-<dl>
- <dt>
- Pintasan Peluncur dan Launcher Shortcuts API
- </dt>
-
- <dd>
- Kami memutuskan untuk menunda fitur ini pada rilis Android yang akan datang. Kami berencana
- membuang Launcher Shortcuts API (ShortcutManager dan lainnya) dari
- Android N API publik mulai dalam Developer Preview berikutnya.
- </dd>
-
- <dt>
- WebView Javascript berjalan sebelum halaman dimuat
- </dt>
-
- <dd>
- Mulai dengan aplikasi yang menargetkan Android N, konteks Javascript disetel ulang
- saat halaman baru telah dimuat. Saat ini, konteks tersebut dibawa untuk
- halaman pertama yang dimuat di instance {@link android.webkit.WebView} yang baru.
- Pengembang yang ingin menginjeksikan Javascript ke dalam {@link
-android.webkit.WebView} harus mengeksekusi skrip setelah halaman
- mulai dimuat.
- </dd>
-
- <dt>
- WebView Geolocation pada sumber yang tidak aman
- </dt>
-
- <dd>
- Mulai dengan aplikasi yang menargetkan Android N, API geolokasi hanya akan
- diizinkan pada sumber yang aman (melalui HTTPS). Kebijakan ini didesain untuk melindungi
- informasi privat pengguna saat mereka menggunakan koneksi yang tidak aman.
- </dd>
-
- <dt>
- Data Saver
- </dt>
-
- <dd>
- Mulai di Developer Preview 3, aplikasi bisa menggunakan intent untuk menampilkan
- dialog sistem yang memungkinkan pengguna menambahkan aplikasi secara langsung ke daftar putih pengecualian
- Data Saver. Lihat <a href="{@docRoot}preview/api-overview.html#data_saver">dokumentasi
- Data Saver</a> untuk detailnya.
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#number-blocking">Pemblokiran nomor</a>
- </dt>
-
- <dd>
- Jika pengguna yang tidak diizinkan berusaha memblokir atau membuka blokir suatu nomor, operasi
- tersebut kini akan gagal dengan {@link java.lang.SecurityException}. (Sebelumnya,
- operasi tersebut akan melontarkan {@link java.lang.UnsupportedOperationException}.)
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">Quick Settings Tile
- API</a>
- </dt>
-
- <dd>
- Sistem kini menggunakan metadata aktivitas untuk memutuskan mode petak.
- (Sebelumnya, mode petak ditentukan oleh nilai hasil
- <code>TileService.onTileAdded()</code>.) Untuk informasi selengkapnya, lihat
- <code>TileService.META_DATA_ACTIVE_TILE</code> dalam <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referensi API</a> yang bisa diunduh.
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">Perbaikan untuk masalah yang dilaporkan oleh pengembang</h4>
-
-<p>
- Banyak masalah yang dilaporkan oleh pengembang telah diperbaiki, termasuk:
-</p>
-
-<ul>
- <li>Pemutaran Bluetooth Audio yang terputus setelah 1 lagu (bug <a href="https://code.google.com/p/android/issues/detail?id=206889">206889</a>)
- </li>
-
- <li>Pixel C Terus Mengalami Mogok (bug <a href="https://code.google.com/p/android/issues/detail?id=206962">206962</a>)
- </li>
-
- <li>Masalah pemberitahuan Jam dan Toast (bug <a href="https://code.google.com/p/android/issues/detail?id=203094">203094</a>)
- </li>
-
- <li>Pixel C melakukan boot ulang saat dihubungkan ke MacBook Pro lewat Kabel USB C (bug
- <a href="https://code.google.com/p/android/issues/detail?id=205432">205432</a>)
- </li>
-
- <li>Kalender selisih satu hari (bug <a href="https://code.google.com/p/android/issues/detail?id=203002">203002</a>)
- </li>
-
- <li>TelephonyManager.getAllCellInfo menghasilkan data tidak valid (bug <a href="https://code.google.com/p/android/issues/detail?id=203022">203022</a>)
- </li>
-
- <li>Nexus 6p, Bluetooth terputus terus-menerus (bug <a href="https://code.google.com/p/android/issues/detail?id=208062">208062</a>)
- </li>
-</ul>
-
-<p>Untuk daftar lengkap masalah yang telah diperbaiki, lihat <a href="https://goo.gl/6uCKtf">Issue
-Tracker</a>.</p>
-
-<h3 id="ki">Masalah yang Diketahui</h3>
-
-<h4>Aksesibilitas</h4>
-
-<ul>
- <li>Tidak bisa memantau output TTS saat pitch disetel mendekati level maksimum.
- </li>
-
- <li>Fitur dan setelan aksesibilitas bisa terganggu bila pengguna menambahkan
- sebuah profil kerja, termasuk isyarat perbesaran dan setelan. Kondisi
- aksesibilitas dipulihkan bila pengguna menyentuh setelan terkait.
- </li>
-</ul>
-
-<h4>Kamera</h4>
-
-<ul>
- <li>Aplikasi Kamera telah menunjukkan ketidakstabilan; aplikasi ini bisa mogok dalam berbagai
- keadaan, seperti saat diluncurkan dalam mode multi-jendela.
- </li>
-
- <li>Menekan rana terus-menerus dalam mode panorama dapat menyebabkan aplikasi
- Kamera mogok.
- </li>
-</ul>
-
-<h4>Audio</h4>
-<ul>
- <li>Masalah pemutar audio platform mencegah beberapa aplikasi berfungsi
- secara normal. Misalnya, Skype dan aplikasi lain terpengaruh oleh masalah ini.
- </li>
-</ul>
-
-<h4>Konektivitas</h4>
-
-
-<ul>
- <li>Bila perangkat peran periferal Bluetooth Low Energy (BLE) mengiklankan suatu
- layanan dan perangkat peran sentral BLE menghubungkan, perangkat peran periferal
- akan terputus dengan sangat cepat.
- </li>
-
- <li>Koneksi Wi-Fi dapat melemah bila layar mati.
- </li>
-
- <li>Koneksi RFCOMM tidak stabil serta dapat mengakibatkan kerusakan data dan
- koneksi yang menggantung.
- </li>
-
- <li>Kondisi jaringan aktif ({@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} dan {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}) mungkin mengembalikan nilai yang tidak benar selama beberapa
- skenario latar belakang terbatas.
- </li>
-</ul>
-
-
-<h4>
- Peluncur
-</h4>
-
-<ul>
- <li>Baki All Apps peluncur default mungkin menjadi tidak responsif setelah
- layar dimatikan/dihidupkan berulang-ulang. Kembali ke layar beranda dan meluncurkan kembali
- baki All Apps mungkin akan mengatasi masalah ini.
- </li>
-</ul>
-
-<h4>
- Keyboard
-</h4>
-
-<ul>
- <li>Saat memperbarui perangkat yang menjalankan Android 6.0 atau yang sebelum versi N Developer
- Preview, Keyboard Google tidak menyimpan data preferensi seperti emoji
- terbaru dan setelan suara.
- </li>
-
- <li>Google Indic Managed Keyboard mungkin menjadi tidak stabil.
- </li>
-
- <li>Saat memasukkan teks dalam bidang sandi, pengguna bisa memilih bahasa Rusia sebagai
- bahasa masukan, namun keyboard tetap dalam bahasa Inggris. Hal ini mencegah
- pengguna memasukkan sandi berbahasa Rusia.
- </li>
-</ul>
-
-<h4>
- Lokal dan bahasa
-</h4>
-
-<ul>
- <li>Saat menggunakan lokal kanan-ke-kiri (RTL), sistem mungkin secara tidak diharapkan
- beralih ke presentasi kiri-ke-kanan (LTR) setelah menghidupkan ulang perangkat.
- </li>
-</ul>
-
-<h4>Media</h4>
-
-<ul>
- <li>Pemutaran media mungkin tidak bisa diandalkan pada Nexus 9 dan Nexus Player, termasuk
- masalah pemutaran video HD.
- </li>
-</ul>
-
-<h4>
- Mode multi-jendela
-</h4>
-
-<ul>
- <li>Perangkat mungkin macet saat mengubah orientasi dalam mode multi-jendela.
- </li>
-
- <li>Beberapa aplikasi saat ini memiliki masalah dengan mode multi-jendela:
- <ul>
- <li>UI sistem bisa mogok saat mengubah Settings > Display >
- Screen brightness ke multi-jendela.
- </li>
-
- <li>Aplikasi Kamera mungkin mogok bila diluncurkan dalam mode multi-jendela.
- </li>
-
- <li>YouTube mungkin mogok bila diluncurkan dalam mode multi-jendela. Untuk memperbaiki
- masalah ini, Anda bisa mengosongkan data aplikasi YouTube di Storage > Apps >
- YouTube.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Google Play Services
-</h4>
-
-<ul>
- <li>Aplikasi yang menggunakan Google Cast melalui Google Play Services mungkin menjadi tidak stabil bila
- pengguna memilih lokal sistem yang menggunakan huruf serta angka di luar
- rentang ASCII.
- </li>
-</ul>
-
-<h4>
- Kebijakan Perangkat Android for Work dan Google Apps
-</h4>
-
-<ul>
- <li>Aplikasi Device Policy mungkin mogok bila pengguna membuka kunci perangkat dengan
- layar "status kebijakan perangkat" disematkan.
- </li>
-
- <li>Setelah menyiapkan profil kerja dengan enkripsi berbasis file diaktifkan
- kemudian menonaktifkan Work, pengguna harus membuka kunci layar profil utama untuk sekali
- lagi mengakses aplikasi Work.
- </li>
-
- <li>Perangkat dihidupkan ulang saat membuang kunci pola keamanan dan membuka aplikasi
- kerja/aplikasi pribadi di multi-jendela.
- </li>
-
- <li>Menyetel DISALLOW_VPN_CONFIG menyebabkan dialog persetujuan muncul di
- always-on-vpn yang disetel oleh Device Policy Client.
- </li>
-
- <li>Lalu lintas tidak dikunci hingga VPN terhubung dalam mode always-on-vpn.
- </li>
-</ul>
-
-<h4>
- Penyimpanan eksternal
-</h4>
-
-<ul>
- <li>Aplikasi mungkin menjadi tidak stabil bila pengguna memindahkannya dari penyimpanan internal
- ke penyimpanan eksternal lepas-pasang (ini termasuk kartu SD atau perangkat yang dihubungkan
- melalui USB).
- </li>
-</ul>
-
-<h4>
- Perbesaran layar dan multi-APK dalam Google Play
-</h4>
-
-<ul>
- <li>Pada perangkat yang menjalankan Android N, Google Play Services 9.0.83 salah melaporkan
- kepadatan layar saat ini dibandingkan dengan kepadatan layar stabil. Saat perbesaran
- layar diaktifkan pada perangkat, hal ini bisa menyebabkan Google Play memilih
- versi aplikasi multi-APK yang didesain untuk layar yang lebih kecil. Masalah ini
- telah diperbaiki dalam Google Play Services versi berikutnya dan akan disertakan dalam
- rilis Developer Preview mendatang.
- </li>
-
- <li>Pada perangkat yang menjalankan Android N, Google Play Services 9.0.83 saat ini melaporkan
- dukungan Vulkan, namun bukan versi Vulkan. Hal ini bisa mengakibatkan Google Play memilih
- versi aplikasi multi-APK yang didesain untuk mendukung Vulkan yang lebih rendah pada
- perangkat dengan dukungan versi yang lebih tinggi. Saat ini, Google Play Store tidak
- menerima unggahan aplikasi yang menggunakan penargetan versi Vulkan. Dukungan ini
- akan ditambahkan pada Google Play Store di masa mendatang dan diperbaiki dalam
- Google Play Services versi berikutnya (akan disertakan dalam rilis Developer Preview
- mendatang). Perangkat N yang menggunakan Google Play Services 9.0.83 akan
- tetap menerima versi Aplikasi yang menargetkan dukungan Vulkan dasar.
- </li>
-</ul>
-
-<h4 id="">Pemberitahuan</h4>
-
-<ul>
- <li>MessagingStyle tidak menampilkan pemberitahuan dengan pengirim "null" (sendiri).
- </li>
-</ul>
-
-<h4 id="">Alat Pengembang</h4>
-
-<ul>
- <li>
- <code>adb</code> mungkin kadang-kadang terputus saat menggunakan debug JDWP.
- </li>
-</ul>
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-
-
-
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Tanggal: April 2016<br>
- Build: NPC91K, NPC91O<br>
- Dukungan emulator: x86 & ARM (32/64-bit)<br>
- Google Play Services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">Yang baru di DP2</h3>
-
-<ul>
- <li>Dukungan platform untuk Vulkan, API rendering 3D baru yang menyediakan
- kontrol GPU (Graphics Processor Unit) eksplisit dan overhead yang rendah serta menawarkan
- peningkatan kinerja untuk aplikasi draw-call yang berat. Untuk detailnya, lihat
- <a href="{@docRoot}ndk/guides/graphics/index.html">dokumentasi</a>.
- </li>
-
- <li>Emoji orang yang baru dengan dukungan untuk warna kulit, dan glyph Unicode 9 baru.
- Warna kulit dan emoji baru tidak akan muncul hingga keyboard membangun dukungan untuknya
- di palet. Aplikasi tidak perlu melakukan tindakan apa pun untuk memanfaatkan
- emoji baru ini, kecuali jika aplikasi menggunakan font nonsistem. Pengembang
- IME perlu menyertakan dukungan untuk emoji baru.
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">Launcher
- Shortcuts API</a>: Aplikasi bisa menggunakan <code>ShortcutManager</code> untuk mengirim
- pintasan ke titik awal dalam aplikasi itu sendiri ke peluncur.
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">Multi-Jendela</a>:
- Anda kini bisa menetapkan tinggi minimum dan lebar minimum secara terpisah untuk suatu
- aktivitas. Selain itu, beberapa nama API sedikit berubah.
- </li>
-</ul>
-
-<h4 id="dp2-fixes">Perbaikan untuk masalah yang dilaporkan oleh pengembang</h4>
-
-<p>
- Banyak masalah yang dilaporkan oleh pengembang telah diperbaiki, termasuk:
-</p>
-
-<ul>
- <li>Tidak bisa menghubungkan ke SSID tersembunyi atau Wi-Fi yang tidak disiarkan. (bug <a href="https://code.google.com/p/android/issues/detail?id=203116">203116</a>)
- </li>
-
- <li>Keadaan mikrofon nonaktif terjadi selama aktivitas. (bug <a href="https://code.google.com/p/android/issues/detail?id=205922">205922</a>)
- </li>
-
- <li>Mengubah fokus multi-jendela akan menghentikan YouTube untuk sementara. (bug <a href="https://code.google.com/p/android/issues/detail?id=203424">203424</a>)
- </li>
-
- <li>Balasan Langsung mungkin menutup aktivitas yang telah dibuka. (bug <a href="https://code.google.com/p/android/issues/detail?id=204411">204411</a>)
- </li>
-
- <li>Berbagai perbaikan stabilitas.
- </li>
-</ul>
-
-<h3 id="dp2-general">Saran umum</h3>
-
-<p>
- Rilis Developer Preview ini adalah untuk <strong>pengembang aplikasi saja</strong>
- dan didesain untuk digunakan dalam pengujian kompatibilitas serta pengembangan awal saja.
- Harap perhatikan catatan umum tentang rilis ini:
-</p>
-
-<ul>
-
- <li>Komponen alat pengembangan dan pustaka dukungan telah diperbarui
- untuk rilis DP2. Pastikan memperbarui lingkungan pengembangan pratinjau Anda
- sebelum mengembangkan untuk DP2. Untuk petunjuk mengenai persiapan lingkungan
- pengembangan Anda, lihat
- <a href="{@docRoot}preview/setup-sdk.html">Menyiapkan Pratinjau</a>.
- </li>
-
- <li>Rilis ini memiliki berbagai masalah stabilitas dan kinerja pada semua perangkat
- yang membuatnya <strong>tidak cocok untuk penggunaan sehari-hari pada ponsel atau tablet</strong>,
- terutama untuk selain pengembang.
- </li>
-
- <li>Daya tahan dan kinerja baterai belum dioptimalkan pada rilis
- ini:
-
- <ul>
- <li>Kinerja <strong>sistem dan aplikasi diketahui lambat/
- melempem pada waktu-waktu tertentu</strong>, dan perangkat kadang-kadang tidak responsif. Masalah-masalah
- ini bisa menjadi lebih akut pada penggunaan yang lama.
- </li>
-
- <li>Daya tahan baterai mungkin melemah dalam rilis ini untuk kasus penggunaan layar hidup dan
- layar mati.
- </li>
- </ul>
- </li>
-
- <li>Beberapa <strong>aplikasi mungkin tidak berfungsi dengan normal</strong> pada Developer Preview
- 2. Termasuk aplikasi Google serta aplikasi lainnya.
- </li>
-
- <li>Build awal ini bukan <strong>Compatibility Test Suite (CTS)
- yang disetujui</strong>. Aplikasi yang bergantung pada build yang disetujui CTS tidak akan berfungsi
- (Android Pay misalnya).
- </li>
-
- <li>Rilis pratinjau ini mendukung perangkat berikut: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, dan Pixel C, serta General Mobile 4G
- (Android One). Dukungan untuk Nexus Player segera hadir.
- </li>
-
-
- <li><a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> telah
- diperbarui untuk menangani perubahan API antara DP1 dan DP2.
- </li>
-</ul>
-
-<h3 id="dp2-ki">Masalah yang Diketahui</h3>
-
-<h4>Kinerja dan baterai</h4>
-
-<ul>
- <li>Kinerja sistem dan aplikasi diketahui <strong>lambat/
- melempem pada waktu-waktu tertentu</strong>, dan perangkat kadang-kadang tidak responsif. Masalah-masalah
- ini bisa menjadi lebih akut pada penggunaan yang lama.
- </li>
-</ul>
-
-<h4>Akun Google</h4>
-
-<ul>
- <li>Dalam beberapa situasi, bisa jadi ada masalah dengan
- <code>AccountManagerService</code> yang mencegah masuk ke akun Google
- </li>
-</ul>
-
-<h4>Pemutakhiran sistem</h4>
-
-<ul>
- <li>Perangkat mungkin langsung dihidupkan ulang setelah memperbarui ke DP2.
- </li>
-</ul>
-
-<h4>Aksesibilitas</h4>
-
-<ul>
- <li>Ada masalah dalam mendengarkan keluaran teks-ke-suara (TTS) bila pitch disetel
- mendekati level maksimum.
- </li>
-</ul>
-
-<h4>Bluetooth</h4>
-
-<ul>
- <li>Karakteristik Bluetooth Low Energy (LE) GATT menggunakan tipe tulisan
- yang salah dan tidak akan dikirim ke perangkat jauh. Karena itu, misalnya, beberapa perangkat
- kebugaran tidak akan berfungsi.
- </li>
-</ul>
-
-<h4>Wizard persiapan</h4>
-
-<ul>
- <li>Opsi untuk memulihkan data pada perangkat baru (atau perangkat yang baru disetel ulang) dari
- "Your Google Account" tidak dapat digunakan dari wizard persiapan. Anda harus memulihkan
- data dari perangkat yang ada dengan memilih "another Android device" dalam
- wizard persiapan, atau siapkan sebagai perangkat baru.
- </li>
-</ul>
-
-<h4>Buka kunci OEM</h4>
-
-<ul>
- <li>Pada beberapa perangkat, <strong>Enable OEM unlock</strong> dalam "Developer Options", berwarna abu-abu
- saat menjalankan DP2.<br>
- <strong>Solusi:</strong> Ikuti
- Android Beta Program (jika Anda belum mengikuti) dengan mengunjungi
- <a href="https://www.google.com/android/beta" class="external-link">www.google.com/android/beta</a>. Kemudian, keluar dan terima
- OTA turunkan versi. Keluar dari program akan menyebabkan perangkat turun versi ke Android 6.0. Anda
- seharusnya sekarang bisa memilih <strong>Enable OEM unlock</strong> dalam
- "Developer Options". Data pribadi akan dihapus bila Anda turunkan versi
- perangkat; akan tetapi, membuka kunci bootloader akan menghapus data ini.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Work Security Challenge
- <ul>
- <li>Setelah migrasi ke N, atau setelah pengguna membuat profil kerja, profil
- kerja tidak bisa membuat kunci-kunci dalam keystore hingga pengguna mengubah pola,
- PIN, atau sandi mereka, atau menyiapkan Work Challenge.
- </li>
-
- <li>Dalam mode Direct Boot, menerapkan batasan kode sandi pada perangkat
- menyebabkan profil kerja tidak terkunci, meskipun perangkat terkunci.
- Hal ini membuat profil kerja bisa diakses meskipun seharusnya dilindungi
- oleh layar kunci perangkat.
- </li>
- </ul>
- </li>
-
- <li>Always-On VPN
- <ul>
- <li>Jika mode Always-On VPN diaktifkan, namun VPN tidak tersedia, aplikasi
- akan menghubungkan melalui jaringan biasa. Aplikasi seharusnya offline jika tidak
- tersedia koneksi VPN.
- </li>
-
- <li>Bila mode Always-On aktif, koneksi VPN tidak akan dibuat setelah
- perangkat dihidupkan ulang ke dalam mode Direct Boot, bahkan setelah pengguna membuka kunci
- layar kunci aman.
- </li>
- </ul>
- </li>
-
- <li>Paket Ditangguhkan
- <ul>
- <li>Admin perangkat bisa menangguhkan paket sistem penting, yang dapat menyebabkan
- perilaku yang tidak diharapkan, seperti melakukan panggilan meskipun dialog "Telephone
- disabled" sedang ditampilkan.
- </li>
- </ul>
- </li>
-
- <li>Lainnya
- <ul>
- <li>Aplikasi Settings akan mogok saat dibuka jika {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} disetel ke true bila
- pengguna memasukkan media fisik seperti kartu SD.
- </li>
-
- <li>Proses masuk pertama ke Profil Kerja membutuhkan waktu
- beberapa menit.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>Selisih antara angka-angka yang mengikat dan selain nol
- sebagai angka pengikat pertama menyebabkan {@code vkCreateGraphicsPipeline()} gagal.</li>
- <li>Vulkan menunjukkan perilaku sampling yang salah pada koordinat tekstur yang diproyeksikan.</li>
- <li>dalam contoh multithreadCmdBuffer, {@code vkCmdClearColorImage()} mengalami mogok bila
- dijalankan dengan driver N-DP2.</li>
- <li>Nilai kembalian dari {@code vkGetPhysicalDeviceFormatProperties()} tidak menyetel nilai
- untuk {@code VkFormatProperties::linearTilingFeatures}, yang mengambil nilai 0 sebagai
- hasil.</li>
- <li>Lampiran buffer bingkai titik ambang Vulkan tidak ditangani dengan benar.</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>SPIR-V shader mungkin memicu pernyataan driver.</li>
- <li>Beberapa konfigurasi pipeline mungkin menyebabkan {@code vkCreateGraphicsPipeline()}
- mogok.</li>
- </ul>
-</ul>
-
-<h4>Masalah perangkat tertentu</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- Koneksi data gagal bila perangkat dipindah dari slot 1 SIM ke slot 2 SIM.
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- Tidak bisa mengubah opsi "Always On" untuk Voice Search.
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- Gambar kamera dalam orientasi potret rusak, kecuali untuk foto
- HDR+.
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- Pemutaran materi HD Netflix mungkin gagal pada Nexus Player.
- </dd>
-
- <dd>
- Aplikasi yang bergantung pada perubahan resolusi video dinamis mungkin gagal pada
- Nexus Player.
- </dd>
-
- <dd>
- Aplikasi yang menggunakan codec video VP9 mungkin gagal pada Nexus Player.
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Tanggal: Maret 2016<br>
- Build: NPC56P, NPC56R, diperbarui: NPC56W, NPC56X<br>
- Dukungan emulator: x86 & ARM (32/64-bit)<br>
- Google Play Services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">Saran umum</h3>
-
-<p>
- Rilis Developer Preview ini adalah untuk pengembang aplikasi saja dan didesain untuk
- digunakan dalam pengujian kompatibilitas serta pengembangan awal saja. Harap perhatikan
- catatan umum tentang rilis ini:
-</p>
-<ul>
- <li>Rilis ini memiliki berbagai masalah stabilitas dan kinerja pada semua perangkat
- yang membuatnya <em>tidak cocok untuk penggunaan sehari-hari pada ponsel atau tablet</em>,
- terutama untuk selain pengembang.
- </li>
-
- <li>Kinerja sistem dan aplikasi diketahui <strong>lambat/
- melempem pada waktu-waktu tertentu</strong>, dan perangkat kadang-kadang tidak responsif. Masalah-masalah
- ini bisa menjadi lebih akut pada penggunaan yang lama.
- </li>
-
- <li>Daya tahan baterai mungkin melemah dalam rilis ini untuk kasus penggunaan layar hidup dan
- layar mati.
- </li>
-
- <li>Beberapa aplikasi mungkin tidak berfungsi dengan normal pada Developer Preview 1.
- Termasuk aplikasi Google serta aplikasi lainnya.
- </li>
-
- <li>Build awal ini bukan Compatibility Test Suite (CTS) yang disetujui. Aplikasi
- yang bergantung pada build yang disetujui CTS tidak akan berfungsi (Android Pay misalnya).
- </li>
-
- <li>Rilis pratinjau ini mendukung perangkat berikut: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, Nexus Player, dan Pixel C, serta General Mobile 4G
- (Android One).
- </li>
-</ul>
-
-<h3 id="dp1-platform">Masalah Platform</h3>
-
-<h4>Kinerja dan baterai</h4>
-
-<ul>
- <li>Kinerja sistem dan aplikasi diketahui <strong>lambat/
- melempem pada waktu-waktu tertentu</strong>, dan perangkat kadang-kadang tidak responsif. Masalah-masalah
- ini bisa menjadi lebih akut pada penggunaan yang lama.
- </li>
-
- <li>Daya tahan baterai mungkin melemah dalam rilis ini untuk kasus penggunaan layar hidup dan
- layar mati.
- </li>
-</ul>
-<h4 id="dialer">Telepon</h4>
-
-<ul>
- <li>Aplikasi telepon tidak mendukung Direct Boot. Hal ini nanti akan ditangani dalam
- N Developer Preview.
- </li>
-
- <li>Pemutaran pesan suara tidak berfungsi.
- </li>
-</ul>
-
-<h4>Mikrofon</h4>
-
-<ul>
- <li>Sistem mungkin keliru mempertahankan mikrofon dalam keadaan nonaktif di semua aplikasi dan saat menghidupkan ulang. Jika Anda menonaktifkan mikrofon di aplikasi dan kondisi ini terus bertahan, buka aplikasi apa saja yang memiliki kontrol untuk menonaktifkan mikrofon dan aktifkan mikrofon.</li>
-</ul>
-
-<h4 id="ui">UI sistem</h4>
-
-<ul>
- <li>Beberapa string baru atau yang dimodifikasi dalam UI sistem tidak diterjemahkan ke semua
- bahasa.
- </li>
-
- <li>UI ringkasan masih dalam pengembangan, dan masih mungkin berubah. Misalnya,
- kami bermaksud membuang timer yang muncul bila pengguna beralih
- aplikasi.
- </li>
-
- <li>Kontrol setelan dan peralihannya mungkin menjadi lambat atau tampak tidak responsif.
- </li>
-
- <li>Desain visual pemberitahuan masih bisa berubah.
- </li>
-
- <li>Dalam aplikasi Gmail, pengarsipan email secara langsung yang disertakan dalam bundel
- pemberitahuan tidak berfungsi dengan benar.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Work Security Challenge
- <ul>
- <li>Setelah migrasi ke N, atau setelah pengguna membuat profil kerja, profil
- kerja tidak bisa membuat kunci-kunci dalam keystore hingga pengguna mengubah pola,
- PIN, atau sandi mereka, atau menyiapkan Work Challenge.
- </li>
-
- <li>Dalam mode Direct Boot, menerapkan batasan kode sandi pada perangkat
- menyebabkan profil kerja tidak terkunci, meskipun perangkat terkunci.
- Hal ini membuat profil kerja bisa diakses meskipun seharusnya dilindungi
- oleh layar kunci perangkat.
- </li>
-
- <li>Bila pengguna memasukkan sandi dan pin yang salah, sistem tidak akan
- menampilkan pesan informasi; sistem hanya mengosongkan bidang
- masukan. Masalah ini tidak memengaruhi masukan pola atau sidik jari.
- </li>
-
- <li>Pada tablet, latar belakang yang ditampilkan bersama pertanyaan kerja
- berukuran kecil dan tidak proporsional.
- </li>
-
- <li>Versi <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">
- Google Apps Device Policy</a> yang dibundel bersama N Developer Preview
- belum mendukung fitur Pertanyaan Keamanan Profil Kerja.
- Pengembang seharusnya menggunakan <a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a>
- untuk menguji fitur ini.
- </li>
- </ul>
- </li>
-
- <li>Always-On VPN
- <ul>
- <li>Jika mode Always-On VPN diaktifkan, namun VPN tidak tersedia, aplikasi
- yang tidak dinyatakan sebagai pengecualian pada kebijakan Always On akan menghubungkan melalui
- jaringan biasa. Kecuali jika ditetapkan sebagai pengecualian pada kebijakan Always-On VPN,
- aplikasi seharusnya offline jika tidak tersedia koneksi VPN.
- <ul>
- <li>Bila mode Always On aktif, koneksi VPN tidak akan dibuat
- setelah perangkat dihidupkan ulang ke dalam mode Direct Boot, bahkan
- setelah pengguna membuka kunci layar kunci aman.
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>Kontak yang Ditingkatkan
- <ul>
- <li>Perangkat Bluetooth PBAP/MAP tidak menampilkan nomor penelepon untuk kontak
- kerja. Rilis Pratinjau berikutnya akan mengatasi masalah ini.
- </li>
- </ul>
- </li>
-
- <li>Mode Kerja
- <ul>
- <li>Peluncur Google Now tidak menampilkan apakah Mode Kerja aktif atau
- nonaktif. Peluncur juga tidak menunjukkan kondisi penangguhan aplikasi.
- </li>
-
- <li>Setelah pengguna menonaktifkan lalu mengaktifkan Mode Kerja, sistem tidak lagi menampilkan
- widget aplikasi Profil Kerja, seperti Kalender.
- </li>
- </ul>
- </li>
-
- <li>Paket Ditangguhkan
- </li>
-
- <li>Admin perangkat bisa menangguhkan paket sistem penting, yang dapat menyebabkan
- perilaku yang tidak diharapkan, seperti melakukan panggilan meskipun dialog Telephone
- disabled sedang ditampilkan.
- </li>
-
- <li>Lainnya
- <ul>
- <li>Aplikasi Settings akan mogok saat dibuka jika {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} disetel ke true bila
- pengguna memasukkan media fisik seperti kartu SD.
- </li>
-
- <li>Keadaan {@code DPM.setPackagesSuspended} tidak akan bertahan bila
- pengguna mencopot pemasangan kemudian memasang kembali aplikasi tersebut. Aplikasi harus tetap
- ditangguhkan setelah mencopot pemasangan/pemasangan ulang, atau aplikasi tidak boleh
- dicopot pemasangannya
- </li>
-
- <li>Proses masuk pertama ke Profil Kerja membutuhkan waktu
- beberapa menit. Hal ini dapat menyebabkan perangkat membutuhkan waktu lebih lama dari biasanya untuk
- terlihat di Play EMM API.
- </li>
-
- <li>Pemberitahuan dari aplikasi Profil Kerja tidak tampak bagi listener
- pemberitahuan yang terpasang di profil pribadi. Akibatnya, sistem tidak
- menampilkan Pemberitahuan seperti yang diharapkan.
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >Keyboard</h4>
-
-<ul>
- <li>Penyandingan Bluetooth antara keyboard dan perangkat Android mungkin menjadi tidak stabil.
- </li>
-</ul>
-
-<h4 >Video</h4>
-
-<ul>
-<li>Pemutaran video mungkin mengalami selisih waktu dan menunjukkan interupsi.</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>Wi-Fi telah menjalani beberapa optimalisasi yang mungkin mengubah perilaku kasus patologis
- API. Khususnya, aplikasi yang berusaha menghubungkan ke jaringan
- tertentu, atau berusaha menghubungkan kembali ke jaringan harus mengulang pengujian.
- </li>
-
- <li>Klien DHCP lawas telah dibuang dari platform. Satu-satunya klien DHCP
- yang didukung platform adalah klien DHCP yang diperkenalkan di M.
- </li>
-</ul>
-
-<h4>Direct Boot</h4>
-
-<ul>
- <li>NFC tidak berfungsi hingga pembukaan kunci pertama.
- <ul>
- <li>Bila telepon berkemampuan Bluetooth dihidupkan ulang, Bluetooth tidak akan
- aktif secara otomatis. Anda harus mengaktifkan kembali Bluetooth secara manual.
- </li>
-
- <li>Dalam beberapa situasi, nada dering default mungkin tidak terdengar untuk
- panggilan telepon dan pesan. Perilaku ini telah diperbaiki dalam rilis N Preview berikutnya,
- dengan satu pengecualian (dan solusi):
- </li>
-
- <li>Pada perangkat yang bukan baru dikosongkan--perangkat yang telah booting setidaknya
- sekali sejak disetel ke mode Direct Boot--nada dering pemberitahuan
- default tidak berbunyi. Pengguna bisa mengatasi masalah ini dengan
- memilih nada dering dari Settings secara manual.
- </li>
-
- <li>Direct Boot tidak diaktifkan secara default pada perangkat yang menjalankan build N
- Developer Preview. Untuk mengaktifkan Direct Boot untuk pengujian dan
- pengembangan, masuklah ke Developer Option dan ketuk Convert to File Encryption.
- Dalam Developer Preview ini perlu penyetelan ulang pabrik untuk membagi ulang dan
- memformat ulang perangkat Anda bagi File-based Encryption.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>Gambar-dalam-gambar untuk Android TV</h4>
-
-<ul>
- <li>Integrasi PIP dalam Recents UI belum final, dan masih bisa
- berubah.
- <ul>
- <li>Animasi jendela PIP belum halus. Rilis Pratinjau
- mendatang akan memperbaiki hal ini.
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">Rilis Pratinjau mendatang akan memperbaiki
- desain visual dan perapian layout PIP.
- </li>
-</ul>
-
-<h4>Laporan bug</h4>
-
-<ul>
- <li>Laporan bug tidak selalu berhasil diselesaikan (seperti solusi,
- kadang-kadang masih bisa diakses melalui penyedia dokumen laporan bug
- di penyimpanan internal).
- </li>
-</ul>
-
-<h4>Layar terbagi Multi-jendela</h4>
-
-<ul>
- <li>Aplikasi bisa mengalami mogok dan perilaku UI yang tidak diharapkan bila ditempatkan dalam
- mode layar terbagi. Ini adalah masalah aplikasi yang harus diperbaiki oleh pengembang
- aplikasi.
- </li>
-
- <li>Bila aplikasi menargetkan versi platform Android sebelum N, maka
- aplikasi mungkin tidak berfungsi pada layar terbagi dan toast mungkin muncul berkali-kali.
- </li>
-
- <li>Menekan lama tombol Ringkasan saat menggunakan aplikasi dengan orientasi
- tetap mungkin menghasilkan perilaku aplikasi yang tidak diharapkan.
- </li>
-
- <li>Aplikasi mungkin berkedip saat mengubah ukurannya.
- </li>
-
- <li>Animasi belum final.
- </li>
-</ul>
-
-<h4>Metode masukan</h4>
-
-<ul>
- <li>Google Keyboard secara tidak diharapkan kembali ke keyboard Google generik
- bila <b>menggunakan bahasa sistem</b>, namun Google Keyboard tidak mendukung
- bahasa yang dipilih dalam preferensi bahasa sistem. Ia akan kembali
- ke American English.
- <p>
- Anda bisa mengatasi masalah ini dengan menambahkan setidaknya satu bahasa yang didukung
- Keyboard Google.
- </p>
- </li>
-</ul>
-
-<h4>Aksesibilitas</h4>
-
-<ul>
- <li>TalkBack menunjukkan masalah pada beberapa fitur termasuk Pemberitahuan, petak
- Quick Settings dan tampilan Multi-jendela yang mungkin menyebabkan sistem mogok atau
- tidak ada masukan lisan dari TalkBack. Rilis pratinjau mendatang akan
- menangani masalah ini.
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">Masalah dan Catatan untuk Perangkat Tertentu</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>Pemutaran video, kompatibilitas aplikasi, dan masalah stabilitas telah antisipasi pada
- Nexus Player dalam rilis Pratinjau ini.
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>Mengubah ukuran multi-jendela bisa menyebabkan mogok.</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Perangkat Nexus 9 mungkin tidak jalan setelah menerima pembaruan lewat jaringan seluler (OTA)
- via Android Beta Program. Untuk memulihkan dari masalah ini, Anda bisa mencoba
- pasang citra OTA secara manual. Untuk informasi selengkapnya, lihat
- <a href="{@docRoot}preview/download-ota.html">Menerapkan Citra OTA Perangkat</a>.
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/in/preview/features/direct-boot.jd b/docs/html-intl/intl/in/training/articles/direct-boot.jd
similarity index 100%
rename from docs/html-intl/intl/in/preview/features/direct-boot.jd
rename to docs/html-intl/intl/in/training/articles/direct-boot.jd
diff --git a/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..855993f
--- /dev/null
+++ b/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd
@@ -0,0 +1,148 @@
+page.title=Scoped Directory Access
+page.keywords=pratinjau,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Dalam dokumen ini</h2>
+ <ol>
+ <li><a href="#accessing">Mengakses Direktori Penyimpanan Eksternal</a></li>
+ <li><a href="#removable">Mengakses Direktori pada Media Lepas-Pasang</a></li>
+ <li><a href="#best">Praktik Terbaik</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Aplikasi seperti aplikasi foto biasanya hanya memerlukan akses ke direktori tertentu dalam
+penyimpanan eksternal, seperti direktori <code>Pictures</code>. Pendekatan
+yang ada dalam mengakses penyimpanan eksternal tidak didesain untuk memberi kemudahan
+akses direktori tertarget untuk tipe aplikasi ini. Misalnya:</p>
+
+<ul>
+<li>Meminta {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+atau {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} dalam manifes Anda
+akan memungkinkan akses ke semua direktori publik pada penyimpanan eksternal, yang mungkin
+lebih banyak akses dari yang dibutuhkan aplikasi Anda.</li>
+<li>Menggunakan
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+Access Framework</a> biasanya membuat pengguna Anda memilih direktori
+melalui UI sistem, yang tidak diperlukan jika aplikasi Anda selalu mengakses
+direktori eksternal yang sama.</li>
+</ul>
+
+<p>Android N menyediakan API baru yang disederhanakan untuk mengakses
+direktori penyimpanan eksternal umum. </p>
+
+<h2 id="accessing">Mengakses Direktori Penyimpanan Eksternal</h2>
+
+<p>Gunakan kelas <code>StorageManager</code> untuk mendapatkan instance
+<code>StorageVolume</code> yang tepat. Kemudian, buat intent dengan memanggil metode
+<code>StorageVolume.createAccessIntent()</code> dari instance itu.
+Gunakan intent ini untuk mengakses direktori penyimpanan eksternal. Untuk mendapatkan daftar
+semua volume yang tersedia, termasuk volume media lepas-pasang, gunakan
+<code>StorageManager.getVolumesList()</code>.</p>
+
+<p>Jika Anda memiliki informasi tentang file spesifik, gunakan
+<code>StorageManager.getStorageVolume(File)</code> untuk mendapatkan
+<code>StorageVolume</code> yang berisi file tersebut. Panggil
+<code>createAccessIntent()</code> pada <code>StorageVolume</code> ini untuk mengakses
+direktori penyimpanan eksternal untuk file tersebut.</p>
+
+<p>
+Di volume kedua, seperti kartu SD eksternal, teruskan null saat memanggil
+<code>StorageVolume.createAccessIntent()</code> untuk meminta akses ke seluruh
+volume, sebagai ganti direktori spesifik.
+<code>StorageVolume.createAccessIntent()</code> akan mengembalikan null jika Anda meneruskan
+null ke volume utama, atau jika Anda meneruskan nama direktori yang tidak valid.
+</p>
+
+<p>Cuplikan kode berikut adalah contoh cara membuka direktori
+<code>Pictures</code> dalam penyimpanan bersama utama:</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>Sistem ini mencoba untuk memberikan akses ke direktori eksternal, dan jika
+diperlukan mengonfirmasi akses dengan pengguna menggunakan UI yang disederhanakan:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>Gambar 1.</strong> Sebuah aplikasi yang meminta
+akses ke direktori Pictures.</p>
+
+<p>Jika pengguna memberi akses, sistem akan memanggil penggantian
+<code>onActivityResult()</code> Anda dengan kode hasil
+<code>Activity.RESULT_OK</code>, dan data intent yang berisi URI. Gunakan
+URI yang disediakan untuk mengakses informasi direktori, serupa dengan menggunakan URI
+yang dikembalikan oleh
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+Access Framework</a>.</p>
+
+<p>Jika pengguna tidak memberi akses, sistem akan memanggil penggantian
+<code>onActivityResult()</code> Anda dengan kode hasil
+<code>Activity.RESULT_CANCELED</code>, dan data intent nol.</p>
+
+<p class="note"><b>Catatan</b>: Mendapatkan akses ke direktori eksternal tertentu
+juga akan memperoleh akses ke subdirektori dalam direktori tersebut.</p>
+
+<h2 id="removable">Mengakses Direktori pada Media Lepas-Pasang</h2>
+
+<p>Untuk menggunakan Scoped Directory Access guna mengakses direktori pada media lepas-pasang,
+pertama tambahkan {@link android.content.BroadcastReceiver} yang akan mendengarkan pemberitahuan
+{@link android.os.Environment#MEDIA_MOUNTED}, misalnya:</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Bila pengguna memasang media lepas-pasang, seperti kartu SD, sistem akan mengirimkan pemberitahuan
+{@link android.os.Environment#MEDIA_MOUNTED}. Pemberitahuan ini
+memberikan sebuah objek <code>StorageVolume</code> dalam data intent yang bisa
+Anda gunakan untuk mengakses direktori pada media lepas-pasang. Contoh berikut
+mengakses direktori <code>Pictures</code> pada media lepas-pasang:</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">Praktik Terbaik</h2>
+
+<p>Bila memungkinkan, pertahankan URI akses direktori eksternal sehingga Anda tidak perlu
+berulang kali meminta akses ke pengguna. Setelah pengguna memberikan akses, panggil
+<code>getContentResolver().takePersistableUriPermssion()</code> bersama
+URI akses direktori. Sistem akan mempertahankan URI dan permintaan
+akses berikutnya akan mengembalikan <code>RESULT_OK</code> dan tidak menampilkan UI konfirmasi kepada
+pengguna.</p>
+
+<p>Jika pengguna menolak akses ke direktori eksternal, jangan langsung
+meminta akses lagi. Berulang kali meminta akses akan menghasilkan pengalaman
+pengguna yang buruk. Jika permintaan ditolak oleh pengguna, dan aplikasi meminta akses
+lagi, UI akan menampilkan kotak centang <b>Don't ask again</b>:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>Gambar 1.</strong> Sebuah aplikasi membuat
+permintaan kedua untuk mengakses media lepas-pasang.</p>
+
+<p>Jika pengguna memilih <b>Don't ask again</b> dan menolak permintaan,
+semua permintaan berikutnya untuk direktori yang diberikan dari aplikasi
+Anda secara otomatis akan ditolak, dan tidak ada UI permintaan yang akan ditampilkan ke pengguna.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/in/training/articles/security-config.jd b/docs/html-intl/intl/in/training/articles/security-config.jd
new file mode 100644
index 0000000..e13429d
--- /dev/null
+++ b/docs/html-intl/intl/in/training/articles/security-config.jd
@@ -0,0 +1,747 @@
+page.title=Konfigurasi Keamanan Jaringan
+page.keywords=androidn,keamanan,jaringan
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Dalam dokumen ini</h2>
+<ol>
+ <li><a href="#manifest">Menambahkan File Konfigurasi Keamanan</a></li>
+ <li><a href="#CustomTrust">Menyesuaikan CA Tepercaya</a>
+ <ol>
+ <li><a href="#ConfigCustom">Mengonfigurasi CA Tepercaya Khusus</a></li>
+ <li><a href="#LimitingCas">Membatasi Set CA Tepercaya</a></li>
+ <li><a href="#TrustingAdditionalCas">Mempercayai CA Tambahan</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">CA Debug Saja</a></li>
+ <li><a href="#UsesCleartextTraffic">Berhenti dari Lalu Lintas Cleartext</a></li>
+ <li><a href="#CertificatePinning">Menyematkan Sertifikat</a></li>
+ <li><a href="#ConfigInheritance">Perilaku Pewarisan Konfigurasi</a></li>
+ <li><a href="#FileFormat">Format File Konfigurasi</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N menyertakan fitur
+ Network Security Configuration yang memungkinkan aplikasi menyesuaikan setelan keamanan jaringan mereka dalam
+ file konfigurasi deklaratif yang aman tanpa memodifikasi kode aplikasi. Setelan ini bisa
+ dikonfigurasi untuk domain dan aplikasi tertentu. Kemampuan
+ utama fitur ini adalah sebagai berikut:
+</p>
+
+<ul>
+ <li>
+ <b>Trust-anchor khusus:</b> Menyesuaikan Certificate Authorities (CA) mana
+ yang dipercaya untuk koneksi aman aplikasi. Misalnya,
+ mempercayai sertifikat tertentu yang ditandatangani sendiri atau membatasi
+ set CA umum yang dipercaya aplikasi.
+ </li>
+
+ <li>
+ <b>Penggantian hanya-debug:</b> Men-debug secara aman koneksi aman dalam aplikasi
+ tanpa menambahkan risiko pada basis yang telah dipasang.
+ </li>
+
+ <li>
+ <b>Berhenti dari lalu lintas cleartext:</b> Melindungi aplikasi dari
+ penggunaan lalu lintas cleartext secara tidak sengaja.
+ </li>
+
+ <li>
+ <b>Penyematan sertifikat:</b> Membatasi koneksi aman aplikasi ke
+ sertifikat tertentu.
+ </li>
+</ul>
+
+
+<h2 id="manifest">Menambahkan File Konfigurasi Keamanan</h2>
+
+<p>
+ Fitur Network Security Configuration menggunakan file XML tempat Anda menetapkan
+ setelan untuk aplikasi. Anda harus menyertakan sebuah entri dalam manifes aplikasi
+ untuk menunjuk ke file ini. Kutipan kode berikut dari sebuah manifes
+ yang memperagakan cara membuat entri ini:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application ... >
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">Menyesuaikan CA Tepercaya</h2>
+
+<p>
+ Aplikasi mungkin perlu mempercayai set CA khusus sebagai ganti default
+ platform. Alasannya yang paling umum adalah:
+</p>
+
+<ul>
+ <li>Menghubungkan ke host dengan otoritas sertifikat khusus (ditandatangani sendiri,
+ dikeluarkan oleh CA internal, dll).
+ </li>
+
+ <li>Membatasi set CA hanya untuk CA yang Anda percaya sebagai ganti setiap CA
+ yang sudah terpasang.
+ </li>
+
+ <li>Mempercayai CA tambahan yang tidak disertakan dalam sistem.
+ </li>
+</ul>
+
+<p>
+ Secara default koneksi (mis. TLS, HTTPS) aman dari semua aplikasi mempercayai
+ CA yang telah dipasang oleh sistem, dan aplikasi yang menargetkan API level 23
+ (Android M) ke bawah, juga mempercayai penyimpanan CA yang ditambahkan pengguna secara default. Aplikasi
+ bisa menyesuaikan koneksinya menggunakan {@code base-config} (untuk
+ penyesuaian lebar-aplikasi) atau {@code domain-config} (untuk penyesuaian
+ per-domain).
+</p>
+
+
+<h3 id="ConfigCustom">Mengonfigurasi CA Khusus</h3>
+
+<p>
+ Anggaplah Anda ingin menghubungkan ke host Anda yang menggunakan sertifikat
+ SSL yang ditandatangani sendiri atau ke host yang sertifikat SSL-nya dikeluarkan oleh CA non-publik
+ yang Anda percaya, seperti CA internal perusahaan Anda.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Menambahkan sertifikat CA yang ditandatangani sendiri atau sertifikat CA non-publik, dalam format PEM atau DER, ke
+ {@code res/raw/my_ca}.
+</p>
+
+
+<h3 id="LimitingCas">Membatasi Set CA Tepercaya</h3>
+
+<p>
+ Aplikasi yang tidak ingin mempercayai semua CA yang dipercaya oleh sistem
+ sebagai gantinya bisa menetapkan set CA sendiri yang telah dikurangi untuk dipercaya. Ini akan melindungi
+ aplikasi dari sertifikat palsu yang dikeluarkan oleh selain CA.
+</p>
+
+<p>
+ Konfigurasi untuk membatasi set CA tepercaya mirip dengan <a href="#TrustingACustomCa">mempercayai CA khusus</a> untuk domain tertentu selain
+ beberapa CA disediakan dalam sumber daya.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Menambahkan CA tepercaya, dalam format PEM atau DER, ke {@code res/raw/trusted_roots}.
+ Perhatikan, jika menggunakan format PEM, file <em>hanya</em> boleh berisi data PEM
+ dan tidak ada teks tambahan. Anda juga bisa menyediakan beberapa elemen
+ <a href="#certificates"><code><certificates></code></a>
+sebagai ganti satu elemen.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ Mempercayai CA Tambahan
+</h3>
+
+<p>
+ Sebuah aplikasi mungkin perlu mempercayai CA tambahan yang tidak dipercaya oleh sistem,
+ hal ini bisa disebabkan karena sistem belum menyertakan CA atau CA tidak
+ memenuhi persyaratan untuk memasukkan ke dalam sistem Android. Aplikasi
+ bisa melakukannya dengan menetapkan beberapa sumber sertifikat untuk
+ konfigurasi.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">Mengonfigurasi CA untuk Debug</h2>
+
+<p>
+ Saat men-debug aplikasi yang terhubung melalui HTTPS, Anda mungkin perlu
+ menghubungkan ke server pengembangan lokal, yang tidak memiliki sertifikat
+ SSL untuk server produksi Anda. Untuk mendukungnya tanpa
+ memodifikasi kode aplikasi, Anda bisa menetapkan CA hanya-debug
+ yang <i>hanya</i> dipercaya bila <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ adalah {@code true} dengan menggunakan {@code debug-overrides}. Biasanya IDE dan alat
+ build menyetel flag ini secara otomatis untuk build non-rilis.
+</p>
+
+<p>
+ Ini lebih aman daripada kode kondisional biasa karena, sebagai tindakan
+ pencegahan keamanan, toko aplikasi tidak menerima aplikasi yang ditandai
+ bisa-di-debug.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">Berhenti dari Lalu Lintas Cleartext</h2>
+
+<p>
+ Aplikasi bermaksud menyambung ke tujuan hanya menggunakan koneksi
+ aman dapat memilih keluar dari dukungan cleartext (menggunakan protokol
+ HTTP yang tidak terenkripsi sebagai ganti HTTPS) ke tujuan tersebut. Opsi ini akan membantu mencegah
+ regresi tidak disengaja dalam aplikasi karena perubahan dalam URL yang disediakan oleh sumber-sumber
+ eksternal seperti server backend.
+ Lihat {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()} untuk detail selengkapnya.
+</p>
+
+<p>
+ Misalnya, aplikasi mungkin ingin memastikan semua koneksi ke {@code
+ secure.example.com} selalu dilakukan melalui HTTPS untuk melindungi lalu lintas sensitif
+ dari jaringan yang berbahaya.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">Menyematkan Sertifikat</h2>
+
+<p>
+ Biasanya aplikasi mempercayai semua CA yang telah terpasang. Jika salah satu dari CA ini
+ mengeluarkan sertifikat palsu, aplikasi akan berisiko terkena serangan
+ MiTM. Beberapa aplikasi memilih untuk membatasi set sertifikat yang mereka terima
+ baik dengan membatasi set CA yang mereka percaya atau dengan menyematkan sertifikat.
+</p>
+
+<p>
+ Penyematan sertifikat dilakukan dengan memberikan seperangkat sertifikat dengan hash
+ kunci publik (SubjectPublicKeyInfo pada sertifikat X.509). Rantai
+ sertifikat nanti hanya berlaku jika rantai sertifikat berisi setidaknya salah satu
+ dari kunci publik yang disematkan.
+</p>
+
+<p>
+ Perhatikan, saat menggunakan penyematan sertifikat, Anda harus selalu menyertakan kunci
+ cadangan sehingga jika Anda terpaksa beralih ke kunci baru, atau mengubah CA (saat
+ menyematkan ke sertifikat CA atau perantara CA tersebut), konektivitas
+ aplikasi Anda tidak terpengaruh. Jika tidak, Anda harus mendorong
+ pembaruan ke aplikasi tersebut untuk memulihkan konektivitas.
+</p>
+
+<p>
+ Selain itu dimungkinkan juga menyetel waktu habis masa berlaku untuk pin setelah
+ penyematan tidak dilakukan. Hal ini membantu mencegah masalah konektivitas dalam
+ aplikasi yang belum diperbarui. Akan tetapi, menyetel waktu kedaluwarsa
+ pada pin mungkin akan membuat penyematan bisa diabaikan.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">Perilaku Pewarisan Konfigurasi</h2>
+
+<p>
+ Nilai yang tidak disetel dalam konfigurasi tertentu akan diwariskan. Perilaku ini memungkinkan konfigurasi
+ yang lebih kompleks sambil menjaga file konfigurasi tetap terbaca.
+</p>
+
+<p>
+ Jika nilai tidak disetel dalam entri tertentu maka nilai dari entri berikutnya yang lebih
+ umum akan digunakan. Nilai yang tidak disetel dalam {@code domain-config} akan
+ diambil dari {@code domain-config} induk, jika tersarang, atau dari {@code
+ base-config} jika tidak. Nilai yang tidak disetel dalam {@code base-config} akan menggunakan
+ nilai default platform.
+</p>
+
+<p>
+ Misalnya pertimbangkan, bila semua koneksi ke subdomain {@code
+ example.com} harus menggunakan set CA khusus. Selain itu, lalu lintas cleartext ke
+ domain ini diizinkan <em>kecuali</em> saat menghubungkan ke {@code
+ secure.example.com}. Dengan menyarangkan konfigurasi untuk {@code
+ secure.example.com} dalam konfigurasi untuk {@code example.com},
+ {@code trust-anchors} tidak perlu digandakan.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">Format File Konfigurasi</h2>
+
+<p>
+ Fitur Network Security Configuration menggunakan format file XML.
+ Struktur keseluruhan file ditampilkan dalam contoh kode berikut:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ Bagian berikut menjelaskan sintaks dan detail lainnya dari format
+ file.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ bisa berisi:
+ </dt>
+
+ <dd>
+ 0 atau 1 <code><a href="#base-config"><base-config></a></code><br>
+ Sejumlah <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 atau 1 <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ sintaks:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ bisa berisi:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ keterangan:
+ </dt>
+
+ <dd>
+ Konfigurasi default yang digunakan oleh semua koneksi yang tujuannya tidak
+ tercakup oleh <a href="#domain-config"><code>domain-config</code></a>.
+
+<p>
+ Nilai yang tidak disetel akan menggunakan nilai default platform. Konfigurasi
+ default untuk aplikasi yang menargetkan API level 24 ke atas:
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+Konfigurasi default untuk aplikasi yang menargetkan API level 23 ke bawah:
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>sintaks:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>Bisa Berisi:</dt>
+
+<dd>
+1 atau beberapa <code><a href="#domain"><domain></a></code>
+<br/>0 atau 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 atau 1 <code><a href="#pin-set"><pin-set></code></a>
+<br/>Sejumlah <code><domain-config></code> tersarang</dd>
+
+<dt>Keterangan</dt>
+<dd>Konfigurasi yang digunakan untuk koneksi ke tujuan tertentu seperti didefinisikan oleh elemen {@code domain}.
+
+<p>Perhatikan, jika beberapa elemen {@code domain-config} mencakup suatu tujuan, konfigurasi dengan aturan domain paling spesifik (terpanjang) yang cocok
+akan digunakan.</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ sintaks:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ Atribut:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ Jika {@code "true"} maka aturan domain ini akan dicocokkan dengan domain dan semua
+ subdomain, termasuk subdomain dari subdomain, jika tidak peraturan hanya
+ diterapkan pada kecocokan yang persis tepat.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ Keterangan:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ sintaks:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ Bisa Berisi:
+ </dt>
+
+ <dd>
+ 0 atau 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ Keterangan:
+ </dt>
+
+ <dd>
+ Pengesampingan yang akan diterapkan bila <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ adalah {@code "true"} yang biasanya terjadi untuk build non-rilis
+ yang dihasilkan oleh alat IDE dan build. Trust-anchor yang ditetapkan dalam {@code
+ debug-overrides} akan ditambahkan ke semua konfigurasi lainnya dan penyematan
+ sertifikat tidak dilakukan bila rantai sertifikat server menggunakan satu dari
+ trust-anchor hanya-debug ini. Jika <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ adalah {@code "false"} maka bagian ini akan diabaikan sepenuhnya.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ sintaks:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ Bisa Berisi:
+ </dt>
+
+ <dd>
+ Sejumlah <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ Keterangan:
+ </dt>
+
+ <dd>
+ Set trust-anchor untuk koneksi aman.
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>sintaks:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>keterangan:</dt>
+<dd>Set sertifikat X.509 untuk elemen {@code trust-anchors}.</dd>
+
+<dt>atribut:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+Sumber sertifikat CA, bisa salah satu dari
+<ul>
+ <li>ID sumber daya mentah yang menunjuk ke file berisi sertifikat X.509.
+ Sertifikat harus dikodekan dalam format DER atau PEM. Dalam hal sertifikat
+ PEM, file <em>tidak boleh</em> berisi data tambahan non-PEM seperti
+ komentar.
+ </li>
+
+ <li>{@code "system"} untuk sertifikat CA sistem yang telah terpasang.
+ </li>
+
+ <li>{@code "user"} untuk sertifikat CA yang ditambahkan pengguna.
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ Menetapkan apakah CA dari sumber akan mengabaikan penyematan sertifikat. Jika {@code
+ "true"} kemudian rangkaian sertifikat melalui salah satu CA dari
+ sumber ini maka tidak dilakukan penyematan. Hal ini bisa berguna untuk debug CA
+ atau untuk mendukung dengan memungkinkan pengguna melakukan MiTM atas lalu lintas aman aplikasi Anda.
+ </p>
+
+ <p>
+ Default-nya adalah {@code "false"} kecuali jika ditetapkan dalam elemen {@code debug-overrides},
+ dalam hal demikian default-nya adalah {@code "true"}.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ sintaks:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ Bisa Berisi:
+ </dt>
+
+ <dd>
+ Sejumlah <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ Keterangan:
+ </dt>
+
+ <dd>
+ Satu set pin kunci publik. Agar koneksi aman bisa dipercaya, salah satu
+ kunci publik dalam rantai kepercayaan harus berada dalam set pin. Lihat
+ <code><a href="#pin"><pin></a></code> untuk mengetahui format pin.
+ </dd>
+
+ <dt>
+ Atribut:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ Tanggal, dalam format {@code yyyy-MM-dd}, pada saat dan setelah pin
+ kedaluwarsa, sehingga menonaktifkan penyematan. Jika atribut tidak disetel maka
+ pin tidak kedaluwarsa.
+ <p>
+ Tanggal kedaluwarsa membantu mencegah masalah konektivitas di aplikasi yang
+ tidak mengambil pembaruan untuk set pin mereka, misalnya karena pengguna
+ menonaktifkan pembaruan aplikasi.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ sintaks:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ Atribut:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ Algoritme intisari yang digunakan untuk menghasilkan pin. Saat ini, hanya
+ {@code "SHA-256"} yang didukung.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/in/training/basics/network-ops/data-saver.jd b/docs/html-intl/intl/in/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..abd4e43
--- /dev/null
+++ b/docs/html-intl/intl/in/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,234 @@
+page.title=Data Saver
+metaDescription=Optimalisasi penggunaan data yang diaktifkan pengguna.
+page.keywords="android N", "data usage", "metered network"
+page.image=images/cards/card-nyc_2x.jpg
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ Dalam dokumen ini
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#status">Memeriksa Preferensi Data Saver</a>
+ <ol>
+ <li>
+ <a href="#request-whitelist">Meminta izin daftar putih</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#monitor-changes">Memantau Perubahan pada Preferensi
+ Data Saver</a>
+ </li>
+
+ <li>
+ <a href="#testing">Menguji dengan Perintah Android Debug Bridge</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Selama penggunaan ponsel cerdas, biaya paket data seluler bisa saja
+ melebihi harga perangkat itu sendiri. Di N Developer Preview, pengguna bisa
+ mengaktifkan Data Saver berdasarkan lingkup perangkat untuk menghemat data, baik saat
+ roaming, mendekati akhir siklus penagihan, atau pada paket data prabayar kecil.
+</p>
+
+<p>
+ Bila pengguna mengaktifkan Data Saver di <strong>Settings</strong> dan perangkat
+ berada dalam jaringan berkuota, sistem akan memblokir penggunaan data latar belakang dan memberi tahu
+ aplikasi untuk menghemat penggunaan data latar depan bila memungkinkan. Pengguna bisa
+ memasukkan aplikasi tertentu ke daftar putih untuk memungkinkan penggunaan data berkuota bila Data
+ Saver diaktifkan.
+</p>
+
+<p>
+ N Developer Preview memperluas {@link android.net.ConnectivityManager}
+ API untuk menyediakan cara pada aplikasi untuk <a href="#status">menerima preferensi Data Saver
+ pengguna</a> dan <a href="#monitor-changes">memantau perubahan
+ preferensi</a>. Hal ini dianggap praktik terbaik bagi aplikasi untuk memeriksa apakah
+ pengguna telah mengaktifkan DataSaver dan berusaha membatasi penggunaan data latar depan dan
+ data latar belakang.
+</p>
+
+<h2 id="status">
+ Memeriksa Preferensi Data Saver
+</h2>
+
+<p>
+ Di N Developer Preview, aplikasi bisa menggunakan {@link
+ android.net.ConnectivityManager} API untuk menentukan pembatasan penggunaan data
+ apa yang sedang diterapkan. Metode {@code getRestrictBackgroundStatus()}
+ akan mengembalikan salah satu dari nilai berikut:
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ Data Saver dinonaktifkan.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ Pengguna telah mengaktifkan Data Saver untuk aplikasi ini. Aplikasi harus berusaha membatasi
+ penggunaan data di latar depan dan dengan halus menangani pembatasan penggunaan
+ data latar belakang.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ Pengguna telah mengaktifkan Data Saver namun aplikasi telah dimasukkan dalam daftar putih. Aplikasi harus
+ tetap berusaha membatasi penggunaan data latar belakang dan latar depan.
+ </dd>
+</dl>
+
+<p>
+ Hal ini dianggap praktik terbaik untuk membatasi penggunaan data bila perangkat
+ terhubung ke jaringan berkuota, meskipun Data Saver telah dinonaktifkan atau aplikasi
+ telah dimasukkan dalam daftar putih. Kode contoh berikut menggunakan {@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} dan {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} untuk menentukan berapa banyak data
+ yang harus digunakan aplikasi:
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ Meminta izin daftar putih
+</h3>
+
+<p>
+ Jika aplikasi Anda perlu menggunakan data di latar belakang, aplikasi bisa meminta izin
+ daftar putih dengan mengirim
+ <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
+ yang mengandung URI dari nama paket aplikasi Anda: misalnya,
+ <code>package:MY_APP_ID</code>.
+</p>
+
+<p>
+ Mengirim intent dan URI akan membuka aplikasi <strong>Settings</strong> dan
+ menampilkan setelan penggunaan data untuk aplikasi Anda. Pengguna nanti bisa memutuskan apakah akan
+ mengaktifkan data latar belakang untuk aplikasi Anda. Sebelum Anda mengirim intent ini, sebaiknya
+ tanyakan kepada pengguna terlebih dahulu apakah mereka ingin membuka aplikasi
+ <strong>Settings</strong> untuk keperluan mengaktifkan penggunaan
+ data latar belakang.
+</p>
+
+<h2 id="monitor-changes">
+ Memantau Perubahan pada Preferensi Data Saver
+</h2>
+
+<p>
+ Aplikasi bisa memantau perubahan pada preferensi Data Saver dengan membuat {@link
+ android.content.BroadcastReceiver} untuk memantau {@code
+ ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} dan secara dinamis
+ mendaftarkan penerima pada {@link android.content.Context#registerReceiver
+ Context.registerReceiver()}. Bila menerima siaran ini, aplikasi harus
+ <a href="#status">memeriksa apakah preferensi Data Saver baru memengaruhi
+ izinnya</a> dengan memanggil {@code
+ ConnectivityManager.getRestrictBackgroundStatus()}.
+</p>
+
+<p class="note">
+ <strong>Catatan:</strong> Sistem hanya mengirim siaran ini ke aplikasi yang
+ secara dinamis mendaftar padanya dengan {@link
+ android.content.Context#registerReceiver Context.registerReceiver()}. Aplikasi
+ yang mendaftar untuk menerima siaran ini dalam manifes mereka
+ tidak akan menerimanya.
+</p>
+
+<h2 id="testing">
+ Menguji dengan Perintah Android Debug Bridge
+</h2>
+
+<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
+menyediakan beberapa perintah yang bisa Anda gunakan untuk memeriksa dan
+mengonfigurasi izin jaringan:
+
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ Menghasilkan laporan berisi setelan pembatasan jaringan latar belakang
+ global saat ini, UID paket saat ini di daftar putih, dan izin jaringan
+ untuk paket yang diketahui lainnya.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ Menampilkan daftar lengkap dari perintah Network Policy Manager (netpolicy).
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ Mengaktifkan atau menonaktifkan mode Data Saver saat meneruskan <code>true</code> atau
+ <code>false</code>, masing-masing.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Menambahkan UID paket tertentu ke daftar putih untuk mengizinkan penggunaan data berkuota
+ di latar belakang.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Membuang UID paket tertentu dari daftar putih untuk memblokir
+ penggunaan data berkuota di latar belakang saat Data Saver diaktifkan.
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/in/training/material/drawables.jd b/docs/html-intl/intl/in/training/material/drawables.jd
index 56fd17f..493abd4 100644
--- a/docs/html-intl/intl/in/training/material/drawables.jd
+++ b/docs/html-intl/intl/in/training/material/drawables.jd
@@ -66,7 +66,7 @@
<p>Anda bisa mengambil warna mencolok dari gambar dengan metode getter di kelas
<code>Palette</code>, misalnya <code>Palette.getVibrantColor</code>.</p>
-<p>Untuk menggunakan kelas {@link android.support.v7.graphics.Palette} dalam proyek Anda, tambahkan
+<p>Untuk menggunakan kelas {@link android.support.v7.graphics.Palette} dalam proyek Anda, tambahkan
<a href="{@docRoot}sdk/installing/studio-build.html#dependencies">dependensi Gradle</a> berikut ke
modul aplikasi Anda:</p>
diff --git a/docs/html-intl/intl/in/training/material/lists-cards.jd b/docs/html-intl/intl/in/training/material/lists-cards.jd
index 358f1d1..46dd19af 100644
--- a/docs/html-intl/intl/in/training/material/lists-cards.jd
+++ b/docs/html-intl/intl/in/training/material/lists-cards.jd
@@ -83,7 +83,7 @@
<h3>Animasi</h3>
<p>Animasi untuk menambahkan dan menghapus item diaktifkan secara default di {@link
-android.support.v7.widget.RecyclerView}. Untuk menyesuaikan animasi ini, perluas kelas
+android.support.v7.widget.RecyclerView}. Untuk menyesuaikan animasi ini, perluas kelas
{@link android.support.v7.widget.RecyclerView.ItemAnimator RecyclerView.ItemAnimator}dan gunakan
metode {@link android.support.v7.widget.RecyclerView#setItemAnimator RecyclerView.setItemAnimator()}.
</p>
@@ -253,7 +253,7 @@
<p>Widget {@link android.support.v7.widget.RecyclerView} dan {@link android.support.v7.widget.CardView}
adalah bagian dari <a href="{@docRoot}tools/support-library/features.html#v7">v7 Support
-Library</a>. Untuk menggunakan widget dalam proyek Anda, tambahkan
+Library</a>. Untuk menggunakan widget dalam proyek Anda, tambahkan
<a href="{@docRoot}sdk/installing/studio-build.html#dependencies">dependensi Gradle</a> ini ke
modul aplikasi Anda:</p>
diff --git a/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..1cad955
--- /dev/null
+++ b/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,213 @@
+page.title=Gambar-dalam-gambar
+page.keywords=pratinjau,sdk,PIP,Gambar-dalam-gambar
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Dalam dokumen ini</h2>
+<ol>
+ <li><a href="#declaring">Mendeklarasikan Bahwa Aktivitas Anda Mendukung
+Gambar-dalam-gambar</a></li>
+ <li><a href="#pip_button">Mengalihkan Aktivitas Anda ke Gambar-dalam-gambar</a>
+</li>
+ <li><a href="#handling_ui">Menangani UI Selama Gambar-dalam-gambar</a>
+</li>
+ <li><a href="#continuing_playback">Melanjutkan Pemutaran Video Saat dalam
+Gambar-dalam-gambar</a></li>
+ <li><a href="#single_playback">Menggunakan Aktivitas Pemutaran Tunggal untuk
+ Gambar-dalam-gambar</a></li>
+ <li><a href="#best">Praktik Terbaik</a></li>
+</ol>
+
+<h2>Lihat Juga</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">Dukungan
+Multi-Jendela</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>Di Android N, pengguna Android TV sekarang bisa menonton video
+dalam jendela yang disematkan di sudut layar saat menyusuri
+aplikasi. Mode gambar-dalam-gambar (PIP) memungkinkan aplikasi menjalankan aktivitas
+video dalam jendela yang disematkan selagi aktivitas lain tetap berjalan di
+latar belakang. Jendela PIP memungkinkan pengguna melakukan multitasking saat menggunakan aplikasi Anda, yang
+membantu pengguna menjadi lebih produktif.</p>
+
+<p>Aplikasi Anda bisa memutuskan kapan memicu mode PIP. Inilah beberapa contoh
+kapan memasuki mode PIP:</p>
+
+<ul>
+<li>Aplikasi Anda bisa memindahkan video ke dalam mode PIP bila pengguna mengarah
+mundur dari video untuk menjelajah materi lainnya.</li>
+<li>Aplikasi Anda bisa mengalihkan video ke dalam mode PIP selagi pengguna menonton akhir episode
+dari materi. Layar utama menampilkan informasi
+promosi atau rangkuman tentang episode berikutnya dalam seri tersebut.</li>
+<li>Aplikasi Anda bisa menyediakan suatu cara bagi pengguna untuk mengantre materi tambahan selagi
+mereka menonton video. Video terus dimainkan dalam mode PIP selagi layar
+utama menampilkan aktivitas pemilihan materi.</li>
+</ul>
+
+<p>Jendela PIP memiliki luas 240x135 dp dan ditampilkan di layer paling atas pada salah satu
+dari empat sudut layar, yang dipilih oleh sistem. Pengguna bisa memunculkan
+menu PIP yang memungkinkan mereka untuk beralih mode dari jendela PIP ke layar penuh, atau menutup jendela
+PIP, dengan menekan dan menahan tombol <b>Beranda</b> pada remote. Jika video
+lain mulai diputar pada layar utama, jendela PIP secara otomatis
+ditutup. Pengguna juga bisa menutup jendela PIP melalui Recents.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>Gambar 1.</strong> Video
+Gambar-dalam-gambar terlihat di sudut layar selagi pengguna menjelajahi materi pada layar
+utama.</p>
+
+<p>PIP memanfaatkan API multi-jendela yang tersedia di Android N untuk
+menyediakan jendela hamparan video yang disematkan. Untuk menambahkan PIP ke aplikasi, Anda harus
+mendaftarkan aktivitas yang mendukung PIP, mengalihkan aktivitas Anda ke mode PIP bila
+diperlukan, serta memastikan elemen UI disembunyikan dan pemutaran video berlanjut bila
+aktivitas dalam mode PIP.</p>
+
+<h2 id="declaring">Mendeklarasikan Bahwa Aktivitas Anda Mendukung Gambar-dalam-gambar</h2>
+
+<p>Secara default, sistem tidak secara otomatis mendukung PIP untuk aplikasi.
+Jika Anda ingin mendukung PIP dalam aplikasi, daftarkan aktivitas
+video Anda dalam manifes dengan menyetel
+<code>android:supportsPictureInPicture</code> dan
+<code>android:resizeableActivity</code> ke <code>true</code>. Juga, tetapkan
+bahwa aktivitas Anda menangani perubahan konfigurasi layout sehingga aktivitas
+Anda tidak diluncurkan ulang saat terjadi perubahan layout selama transisi mode PIP.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>Saat mendaftarkan aktivitas Anda, ingatlah bahwa dalam mode PIP aktivitas
+Anda akan ditampilkan pada jendela hamparan kecil pada layar TV. Aktivitas
+pemutaran video dengan UI minimal akan memberikan pengalaman pengguna terbaik. Aktivitas yang
+mengandung elemen UI kecil mungkin tidak memberikan pengalaman pengguna yang baik
+ketika beralih ke mode PIP, karena pengguna tidak dapat melihat elemen UI secara jelas
+di jendela PIP.</p>
+
+<h2 id="pip_button">Mengalihkan Aktivitas Anda ke Gambar-dalam-gambar</h2>
+
+Bila Anda perlu untuk mengalihkan aktivitas ke mode PIP, panggil
+<code>Activity.enterPictureInPictureMode()</code>. Contoh berikut mengalihkan
+ke mode PIP bila pengguna memilih tombol PIP khusus pada baris
+kontrol media:</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>Menambahkan tombol PIP ke baris kontrol media Anda akan memungkinkan pengguna dengan mudah beralih
+ke mode PIP selagi mengontrol pemutaran video.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>Gambar 1.</strong> Tombol
+gambar-dalam-gambar pada baris kontrol media.</p>
+
+<p>Android N menyertakan kelas
+<code>PlaybackControlsRow.PictureInPictureAction</code> baru yang mendefinisikan
+tindakan PIP baris kontrol dan menggunakan ikon PIP.</p>
+
+<h2 id="handling_ui">Menangani UI Selama Gambar-dalam-gambar</h2>
+
+<p>Bila aktivitas memasuki mode PIP, aktivitas Anda seharusnya hanya menampilkan pemutaran
+video. Buang elemen UI sebelum aktivitas Anda memasuki PIP,
+dan pulihkan elemen ini bila aktivitas Anda beralih ke layar penuh lagi.
+Ganti <code>Activity.onPictureInPictureModeChanged()</code> atau
+<code>Fragment.onPictureInPictureModeChanged()</code> dan aktifkan atau
+nonaktifkan elemen UI saat diperlukan, misalnya:</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">Melanjutkan Pemutaran Video Saat dalam
+Gambar-dalam-gambar</h2>
+
+<p>Bila aktivitas Anda beralih ke PIP, sistem akan menganggap aktivitas tersebut berada dalam
+keadaan berhenti sementara, dan akan memanggil metode <code>onPause()</code> aktivitas Anda. Pemutaran
+video tidak boleh berhenti sementara dan harus terus diputar jika aktivitas tersebut
+berhenti sementara karena mode PIP. Periksa PIP dalam metode
+<code>onPause()</code> aktivitas Anda dan tangani pemutaran dengan tepat,
+misalnya:</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>Bila aktivitas meninggalkan mode PIP dan kembali ke mode layar penuh, sistem
+akan melanjutkan aktivitas Anda dan memanggil metode <code>onResume()</code>.</p>
+
+<h2 id="single_playback">Menggunakan Aktivitas Pemutaran Tunggal untuk
+ Gambar-dalam-gambar</h2>
+
+<p>Di aplikasi Anda, seorang pengguna bisa memilih video baru saat menyusuri materi di
+layar utama, selagi aktivitas pemutaran video dalam mode PIP. Putar
+video baru di aktivitas pemutaran yang ada dalam mode layar penuh, sebagai ganti
+meluncurkan aktivitas baru yang dapat membingungkan pengguna.</p>
+
+<p>Guna memastikan aktivitas tunggal digunakan untuk permintaan pemutaran video dan
+beralih ke atau dari mode PIP bila dibutuhkan, setel
+<code>android:launchMode</code> aktivitas ke <code>singleTask</code> dalam manifes Anda:
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>Di aktivitas Anda, ganti {@link android.app.Activity#onNewIntent
+Activity.onNewIntent()} dan tangani video baru, yang akan menghentikan pemutaran video
+jika diperlukan.</p>
+
+<h2 id="best">Praktik Terbaik</h2>
+
+<p>PIP ditujukan untuk aktivitas yang memutar video layar penuh. Saat mengalihkan
+aktivitas Anda ke mode PIP, hindari menampilkan apa pun selain materi video.
+Pantau saat aktivitas Anda memasuki mode PIP dan sembunyikan elemen UI, seperti dijelaskan
+dalam <a href="#handling_ui">Menangani UI Selama Gambar-dalam-gambar</a>.</p>
+
+<p>Karena jendela PIP ditampilkan sebagai jendela mengambang di sudut
+layar, Anda harus menghindari menampilkan informasi penting di layar utama
+di area mana saja yang bisa terhalang oleh jendela PIP.</p>
+
+<p>Bila aktivitas ada berada dalam mode PIP, secara default aktivitas itu tidak mendapatkan fokus masukan. Untuk
+menerima kejadian masukan saat dalam mode PIP, gunakan
+<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/in/preview/features/tv-recording-api.jd b/docs/html-intl/intl/in/training/tv/tif/content-recording.jd
similarity index 100%
rename from docs/html-intl/intl/in/preview/features/tv-recording-api.jd
rename to docs/html-intl/intl/in/training/tv/tif/content-recording.jd
diff --git a/docs/html-intl/intl/ja/about/versions/marshmallow/android-6.0-testing.jd b/docs/html-intl/intl/ja/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..9f03412
--- /dev/null
+++ b/docs/html-intl/intl/ja/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=テストガイド
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>このドキュメントの内容</h2>
+ <ol>
+ <li><a href="#runtime-permissions">パーミッションをテストする</a></li>
+ <li><a href="#doze-standby">Doze とアプリ スタンバイをテストする</a></li>
+ <li><a href="#ids">自動バックアップと端末識別子</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N を利用すると、次期バージョンのプラットフォームでアプリが動作するか確認できます。
+このプレビューには、<a href="{@docRoot}preview/api-overview.html">API の概要</a>と<a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>に記載されているように、アプリに影響を与える可能性のある多くの API と動作の変更が含まれています。
+
+このプレビューでアプリをテストするときには、アプリの良好な使用感を確保するために、システムのいくつかの変更点に特に注意する必要があります。
+
+
+</p>
+
+<p>
+ このガイドでは、アプリでプレビューの機能の何をどのようにテストすればよいか説明します。以下のプレビュー機能は、アプリの動作に大きな影響を与える可能性があるので、優先してテストする必要があります。
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">パーミッション</a>
+ </li>
+ <li><a href="#doze-standby">Doze とアプリ スタンバイ</a>
+ </li>
+ <li><a href="#ids">自動バックアップと端末識別子</a></li>
+</ul>
+
+<p>
+ テスト用のプレビュー システム イメージを使用した端末または仮想端末のセットアップ方法の詳細については、<a href="{@docRoot}preview/setup-sdk.html">Android N SDK のセットアップ</a>をご覧ください。
+
+
+</p>
+
+
+<h2 id="runtime-permissions">パーミッションをテストする</h2>
+
+<p>
+ <a href="{@docRoot}preview/features/runtime-permissions.html">パーミッション</a> モデルの変更により、ユーザーがアプリにパーミッションを付与する方法が変わりました。
+アプリでは、インストール時にすべてのパーミッションを要求するのではなく、実行時に個々のパーミッションをユーザーに要求する必要があります。
+
+これにより、ユーザーは、各アプリのアクティビティをより細かくコントロールできるようになるだけではなく、アプリが各パーミッションを要求する理由をこれまでよりもよく理解できるようになります。
+ユーザーは、いつでもアプリに個別にパーミッションを付与したり、付与したパーミッションを個別に取り消したりできます。
+プレビューのこの機能は、アプリの動作に大きな影響を与える可能性があり、アプリの一部の機能が動作しなくなったり、限定された機能しか使えなくなったりする可能性もあります。
+
+
+</p>
+
+<p class="caution">
+ この変更は、アプリがこの新しいバージョンを対象にしているかどうかにかかわらず、この新しいプラットフォーム上で実行されるすべてのアプリに影響します。
+このプラットフォームは以前のアプリに限定的な互換動作を提供しますが、公式版のプラットフォームのリリースに合わせてアップデート版のアプリを公開できるように、新しいパーミッション モデルに対応させるためのアプリの移行を今から計画することを強くお勧めします。
+
+
+</p>
+
+
+<h3 id="permission-test-tips">テストのヒント</h3>
+
+<p>
+ 以下のテストのヒントを活用して、アプリでの新しいパーミッション動作のテストを計画し、実行してください。
+
+</p>
+
+<ul>
+ <li>アプリの現在のパーミッションと関連するコードパスを確認します。</li>
+ <li>パーミッションで保護されているサービスとデータ間のユーザーフローをテストします。</li>
+ <li>付与されたパーミッションと取り消されたパーミッションのさまざまな組み合わせをテストします。</li>
+ <li>{@code adb} ツールを使用して、コマンドラインからパーミッションを管理します。
+ <ul>
+ <li>パーミッションとステータスをグループ化して表示します。
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>以下の構文を使用して 1 つまたは複数のパーミッションを付与または取り消します。<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>アプリでパーミッションを使用しているサービスを分析します。</li>
+</ul>
+
+<h3 id="permission-test-strategy">テスト方針</h3>
+
+<p>
+ このパーミッションの変化は、アプリの構造と設計、ユーザー エクスペリエンスとフローに影響を与えます。
+アプリの現在のパーミッション利用の状況を調査し、新しいフローの検討を開始する必要があります。
+このプラットフォームの公式リリースは互換動作を提供しますが、互換動作に頼ることなくアプリのアップデートを計画することを強くお勧めします。
+
+
+</p>
+
+<p>
+ まずアプリが実際に必要とし使用しているパーミッションを特定してから、パーミッションで保護されたサービスを使用している各コードパスを探してください。
+これには、新しいプラットフォーム上でのテストと、コードの解析が必要です。
+テストでは、アプリの {@code targetSdkVersion} をこのプレビュー版に変えて、ランタイム パーミッションのオプトインに重点的にテストする必要があります。
+詳細については、<a href="{@docRoot}preview/setup-sdk.html#">Android N SDK のセットアップ</a>をご覧ください。
+
+
+</p>
+
+<p>
+ パーミッションの取り消しと追加のさまざまな組み合わせをテストし、パーミッションに依存するユーザーフローを確認します。
+パーミッションへの依存性が明白または論理的ではない箇所では、依存性を取り除くため、またはパーミッションが必要な理由を明白にするために、フローのリファクタリングまたはコンパートメント化を検討する必要があります。
+
+
+</p>
+
+<p>
+ ランタイム パーミッションの動作、テスト、ベスト プラクティスについては、Developer Preview ページの<a href="{@docRoot}preview/features/runtime-permissions.html">パーミッション</a>をご覧ください。
+
+
+</p>
+
+
+<h2 id="doze-standby">Doze とアプリ スタンバイをテストする</h2>
+
+<p>
+ 省電力機能である Doze とアプリ スタンバイにより、端末がアイドル状態のときやそのアプリにフォーカスがないときに、アプリが実行できるバックグラウンド処理の量が制限されます。
+システムによってアプリに加えられる可能性のある制限には、ネットワーク アクセスの制限や停止、バックグラウンド タスクの停止、通知の停止、ウェイク リクエストの無視、アラームなどがあります。
+
+これらの省電力のための最適化が行われた状態で確実にアプリが適切に動作するように、これらの省電力状態をシミュレートしてアプリをテストする必要があります。
+
+
+</p>
+
+<h4 id="doze">アプリで Doze をテストする</h4>
+
+<p>アプリで Doze をテストするには: </p>
+
+<ol>
+<li>Android N のシステム イメージを使用して、ハードウェア端末または仮想端末を設定します。</li>
+<li>端末を開発マシンに接続し、アプリをインストールします。</li>
+<li>アプリを実行し、アクティブ状態のままにします。</li>
+<li>以下のコマンドを実行して、端末の Doze モードへの移行をシミュレートします。
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>端末がアクティブ状態に戻ったときのアプリの動作を観察します。端末が Doze モードから抜けるときに、アプリがスムーズに復帰することを確認します。
+</li>
+</ol>
+
+
+<h4 id="standby">アプリでアプリ スタンバイをテストする</h4>
+
+<p>アプリでアプリ スタンバイ モードをテストするには: </p>
+
+<ol>
+ <li>Android N のシステム イメージを使用して、ハードウェア端末または仮想端末を設定します。</li>
+ <li>端末を開発マシンに接続し、アプリをインストールします。</li>
+ <li>アプリを実行し、アクティブ状態のままにします。</li>
+ <li>以下のコマンドを実行して、アプリのスタンバイ モードへの移行をシミュレートします。
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>以下のコマンドを使用して、アプリのウェイクをシミュレートします。
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>アプリがウェイク状態に戻ったときのアプリの動作を観察します。アプリがスタンバイ モードからスムーズに復帰することを確認します。
+特に、アプリの通知とバックグラウンド ジョブが想定通りの動作を続けているかを確認する必要があります。
+</li>
+</ol>
+
+<h2 id="ids">アプリの自動バックアップと端末固有識別子</h2>
+
+<p>アプリが、Google Cloud Messaging の登録 ID などのなんらかの端末固有の識別子を内部ストレージに保持している場合、<a href="{@docRoot}preview/backup/index.html">アプリの自動バックアップ</a>の説明に従って、そのストレージのロケーションを自動バックアップの対象から除外してください。
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..0fd9412
--- /dev/null
+++ b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,610 @@
+page.title=動作の変更点
+page.keywords=preview,sdk,compatibility
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>このドキュメントの内容</h2>
+
+<ol>
+ <li><a href="#perf">パフォーマンスの向上</a>
+ <ol>
+ <li><a href="#doze">Doze</a></li>
+ <li><a href="#bg-opt">バックグラウンド処理の最適化</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">パーミッションの変更</a>
+ </li>
+ <li><a href="#sharing-files">アプリ間のファイルの共有</a></li>
+ <li><a href="#accessibility">ユーザー補助機能の改善</a>
+ <ol>
+ <li><a href="#screen-zoom">画面のズーム</a></li>
+ <li><a href="#vision-settings">セットアップ ウィザードの [Vision Settings]</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">プラットフォーム ライブラリにリンクした NDK アプリ</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">アノテーションの保持</a></li>
+ <li><a href="#other">その他の重要事項</a></li>
+</ol>
+
+<h2>関連ドキュメント</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">Android N API の概要</a>
+</li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ 新しい機能に加えて、Android N では、さまざまなシステムおよび API の動作が変更されています。
+このドキュメントでは、アプリ開発において把握しておくべき主な変更点について説明します。
+
+
+</p>
+
+<p>
+ 過去に Android 向けのアプリを公開したことがある場合は、そのアプリが今回のプラットフォームの変更による影響を受ける可能性があることに注意してください。
+
+</p>
+
+
+<h2 id="perf">電池とメモリ</h2>
+
+<p>
+Android N では、端末の電池寿命を改善したり、RAM の使用量を削減したりするために、システムの動作がいくつか変更されています。
+これらの変更は、システム リソースへのアプリのアクセスに加え、特定の暗黙的インテントを介して他のアプリとやり取りする方法に影響を及ぼす可能性があります。
+
+
+</p>
+
+<h3 id="doze">Doze</h3>
+
+<p>
+ Android 6.0（API レベル 23）で Doze が導入されました。これは、ユーザーが端末を電源と接続せずに静止状態にし、画面をオフにすると、CPU とネットワークのアクティビティを保留して電池寿命を改善するものです。
+
+Android N では、Doze が改良されています。端末を電源と接続せずに画面をオフにすると、端末が静止していなくても（たとえば、ユーザーが携帯端末をポケットに入れて持ち歩いている場合）、CPU およびネットワーク制限のサブセットがアプリに適用されます。
+
+
+
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>図 1.</strong> Doze が第 1 レベルのシステム アクティビティ制限を適用して、電池寿命を改善
+
+</p>
+
+<p>
+ 端末が電池電源で動作しているときに画面をしばらくオフにすると、端末は Doze モードになり、制限の最初のサブセットが適用されます。
+これにより、アプリのネットワーク アクセスが切断されてジョブと同期が保留されます。
+端末が Doze モードに入った後、しばらくの間静止状態になると、残りの Doze 制限が {@link android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} アラーム、GPS、Wi-Fi スキャンに適用されます。
+
+
+適用される Doze 制限が一部であるか完全なものであるかには関係なく、端末は Doze モードから短時間抜け出し、メンテナンス ウィンドウと呼ばれる状態になります。このとき、アプリはネットワーク アクセスを許可され、保留されたジョブや同期を実行することができます。
+
+
+
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>図 2.</strong> 端末がしばらくの間静止状態になると、Doze が第 2 レベルのシステム アクティビティ制限を適用する
+
+</p>
+
+<p>
+ 画面をオンにするか、端末を電源に接続すると、Doze モードは解除され、これらの処理の制限は適用されなくなります。
+<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">Doze とアプリ スタンバイ用に最適化する</a>で説明したように、今回追加された動作は、Android 6.0（API レベル 23）で導入された以前のバージョンの Doze にアプリを対応させるための推奨事項とベスト プラクティスには影響を及ぼしません。
+
+
+
+メッセージの送受信に Google Cloud Messaging（GCM）を使用するなどの推奨事項を引き続き順守して、追加の Doze 動作に対応するためにアップデートを計画する必要があります。
+
+
+
+</p>
+
+
+<h3 id="bg-opt">Project Svelte:バックグラウンド処理の最適化</h3>
+
+<p>
+ Android N では、メモリ使用量と消費電力を最適化するために、3 つの暗黙的なブロードキャストが削除されています。
+この変更が必要になるのは、暗黙的なブロードキャストが行われると、バックグラウンドでブロードキャストをリッスンするように登録されているアプリが頻繁に起動されるためです。
+
+これらのブロードキャストを削除すると端末のパフォーマンスとユーザー エクスペリエンスが大幅に向上します。
+
+</p>
+
+<p>
+ モバイル端末では、Wi-Fi とモバイルデータ間を移動するときなど、接続が頻繁に変化します。
+現在のアプリでは、暗黙的な {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} ブロードキャストのレシーバーをマニフェストに登録することにより、接続の変化を監視できるようになっています。
+
+多くのアプリがこのブロードキャストを受信する登録を行っているので、一度ネットワークの切り替えが起こるだけですべてのアプリがアクティブになり、ブロードキャストが同時に処理されます。
+
+
+</p>
+
+<p>
+ 同様に、旧バージョンの Android では、暗黙的な {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} ブロードキャストと {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} ブロードキャストをカメラなどの他のアプリから受信するよう登録できました。
+ユーザーがカメラアプリで写真を撮ると、これらのアプリがアクティブになり、ブロードキャストが処理されます。
+
+</p>
+
+<p>
+ Android N では、こういった問題を緩和するために、以下の最適化手法が適用されます。
+
+</p>
+
+<ul>
+ <li>Android N 向けのアプリは、{@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} ブロードキャストを受信しません。これは、アプリにこれらのイベントの通知をリクエストするマニフェスト エントリがある場合も同様です。
+実行されているアプリが {@link android.content.BroadcastReceiver} で通知をリクエストした場合は、メインスレッドで {@code CONNECTIVITY_CHANGE} を引き続きリッスンできます。
+
+
+ </li>
+
+ <li>アプリは、{@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} ブロードキャストまたは {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} ブロードキャストを送受信できません。この最適化は、Android N 向けのアプリだけでなく、すべてのアプリに影響を及ぼします。
+
+ </li>
+</ul>
+
+<p>アプリでこれらのインテントのいずれかを使用する場合は、Android N 端末を適切にターゲットにできるよう可能な限りインテントとの依存性を削除する必要があります。
+
+ Android フレームワークは、これらの暗黙的なブロードキャストの必要性を軽減するいくつかのソリューションを提供します。
+たとえば、{@link
+ android.app.job.JobScheduler} API は、従量制ではないネットワークへの接続など、指定された条件のときに、ネットワーク操作をスケジュールするための堅牢なメカニズムを提供します。
+
+また、{@link
+ android.app.job.JobScheduler} を使用して、コンテンツ プロバイダの変更に対応することもできます。
+</p>
+
+<p>
+ N でのバックグラウンド処理の最適化や、アプリで必要となる対応の詳細については、<a href="{@docRoot}preview/features/background-optimization.html">バックグラウンド処理の最適化</a>をご覧ください。
+
+
+</p>
+
+<h2 id="perm">パーミッションの変更</h2>
+
+<p>
+ Android N では、アプリに影響を及ぼす可能性のあるパーミッションが変更されています。
+</p>
+
+<h3 id="permfilesys">ファイル システムのパーミッションの変更</h3>
+
+<p>
+ プライベート ファイルのセキュリティを強化するために、Android N 以降向けのアプリのプライベート ディレクトリにはアクセス制限があります（<code>0700</code>）。
+
+ この設定により、サイズや存在など、プライベート ファイルのメタデータの漏洩を防ぐことができます。
+このパーミッションの変更には、以下のような複数の副作用があります。
+</p>
+
+<ul>
+ <li>
+ プライベート ファイルの所有者はこのファイル パーミッションを緩和することができず、{@link android.content.Context#MODE_WORLD_READABLE} や {@link android.content.Context#MODE_WORLD_WRITEABLE} を使用してこれを実行しようとすると、{@link java.lang.SecurityException} がトリガーされます。
+
+
+
+
+ <p class="note">
+ <strong>注:</strong>現在のところ、この制限は完全には適用されていません。
+ アプリはネイティブ API や {@link java.io.File File} API を使用して、プライベート ディレクトリのパーミッションを変更できる場合があります。
+ただし、プライベート ディレクトリのパーミッションを緩和できないようにすることをお勧めします。
+
+ </p>
+ </li>
+ <li>
+ パッケージ ドメイン以外の <code>file://</code> URI を渡すと、レシーバーがアクセスできないパスになる可能性があります。
+そのため、<code>file://</code> URI を渡そうとすると、<code>FileUriExposedException</code> がトリガーされます。
+
+プライベート ファイルのコンテンツの共有には、{@link
+ android.support.v4.content.FileProvider} を使用することをお勧めします。
+
+ </li>
+ <li>
+ {@link android.app.DownloadManager} では、ファイル名でプライベートに保存されたファイルを共有することはできなくなりました。
+以前のアプリで {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME} にアクセスした場合、このパスにアクセスできないことがあります。
+Android N 以降向けのアプリが、{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} にアクセスしようとすると、{@link java.lang.SecurityException} がトリガーされます。
+
+
+
+ ダウンロードの場所を {@link
+ android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+ DownloadManager.Request.setDestinationInExternalFilesDir()} や {@link
+ android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+ DownloadManager.Request.setDestinationInExternalPublicDir()} を使用してパブリックな場所に設定する以前のアプリは、{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} でこのパスにアクセスできますが、このメソッドは使用しないことをお勧めします。
+
+
+
+
+
+{@link android.app.DownloadManager} で公開されているファイルへのアクセスには、{@link android.content.ContentResolver#openFileDescriptor
+ ContentResolver.openFileDescriptor()} を使用することをお勧めします。
+
+
+ </li>
+</ul>
+
+<h2 id="sharing-files">アプリ間のファイルの共有</h2>
+
+<p>
+Android N 向けのアプリでは、Android フレームワークにより、アプリ以外の {@code file://} URI の公開を禁止する {@link android.os.StrictMode} API ポリシーが適用されます。
+
+ファイル URI を含むインテントがアプリからなくなると、{@code FileUriExposedException} 例外によりアプリはエラーになります。
+
+</p>
+
+<p>
+アプリ間でファイルを共有するには、{@code content://} URI を送信して、この URI に一時的なアクセス パーミッションを付与する必要があります。
+このパーミッションを付与する最も簡単な方法は、{@link android.support.v4.content.FileProvider} クラスを使用することです。
+パーミッションとファイルの共有の詳細については、<a href="{@docRoot}training/secure-file-sharing/index.html">ファイルの共有</a>をご覧ください。
+
+
+</p>
+
+<h2 id="accessibility">ユーザー補助機能の改善</h2>
+
+<p>
+ Android N には、低視力のユーザーまたは視覚障害のあるユーザー向けのプラットフォームのユーザビリティを改善するための変更がいくつか追加されています。
+通常は、これらの変更によってアプリのコードを変更する必要はありませんが、この機能について理解し、アプリでテストして、ユーザー エクスペリエンスに与える潜在的な影響を評価する必要があります。
+
+
+
+</p>
+
+
+<h3 id="screen-zoom">画面のズーム</h3>
+
+<p>
+ Android N では、<strong>ディスプレイ サイズ</strong>を設定して、画面上のすべての要素を拡大または縮小することができるので、視覚障害のあるユーザーに対する端末のユーザー補助機能が向上しています。
+
+ユーザーは、一般的な中くらいのサイズの携帯端末 Nexus 4 の幅である <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">sw320dp</a> の画面最小幅を超えて画面をズームできません。
+
+
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>図 3.</strong> 右側の画面では、Android N システム イメージを実行している端末のディスプレイ サイズを拡大している
+
+</p>
+
+
+<p>
+ 端末の画面密度が変更されると、以下の方法で実行中のアプリに通知されます。
+
+</p>
+
+<ul>
+ <li>アプリが API レベル 23 以前をターゲットにしている場合は、すべてのバックグラウンド処理が自動的に強制終了します。
+つまり、ユーザーがそのようなアプリから移動して [<em>Settings</em>] 画面を開き、<strong>ディスプレイ サイズ</strong>の設定を変更すると、メモリ不足の場合と同じように、アプリが強制終了します。
+
+
+アプリになんらかのフォアグラウンド処理がある場合は、<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>に記載されている設定変更の処理が通知されます。これは、端末の画面の向きが変わったときの処理と同様です。
+
+
+
+ </li>
+
+ <li>アプリが Android N をターゲットにしている場合、<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>に記載されているように、すべての処理（フォアグラウンド処理およびバックグラウンド処理）に対して設定変更が通知されます。
+
+
+
+ </li>
+</ul>
+
+<p>
+ Android のベスト プラクティスに従っているほとんどのアプリでは、この機能をサポートするための変更を加える必要はありません。
+以下の点は確認する必要があります。
+</p>
+
+<ul>
+ <li>画面幅 <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code> の端末でアプリをテストして、適切に機能することを確認します。
+
+ </li>
+
+ <li>端末設定が変更された場合、キャッシュ済みのビットマップやネットワークからロードされるリソースなど、画面密度に依存するキャッシュ情報を更新してください。
+
+また、アプリが一時停止状態から再開された場合は、設定変更をチェックしてください。
+
+ <p class="note">
+ <strong>注:</strong>設定に依存したデータをキャッシュに保存する場合は、そのデータ用の適切な画面サイズやピクセル密度など、関連するメタデータを含めることをお勧めします。
+
+このメタデータを保存しておくと、設定を変更した後、キャッシュ データを更新する必要があるかどうかを決定できます。
+
+
+ </p>
+ </li>
+
+ <li>ピクセル単位は画面密度に対応しないため、ピクセル単位で寸法を指定することは避けてください。
+その代わり、<a href="{@docRoot}guide/practices/screens_support.html">密度非依存ピクセル</a>（<code>dp</code>）単位で寸法を指定します。
+
+ </li>
+</ul>
+
+<h3 id="vision-settings">セットアップ ウィザードの [Vision Settings]</h3>
+
+<p>
+ Android N には、オープニング画面に [Vision Settings] が追加されています。ユーザーはこれを使用して、新しい端末で以下のユーザー補助機能設定を設定できます。
+
+ <strong>ズーム操作</strong>、<strong>フォントサイズ</strong>、<strong>ディスプレイ サイズ</strong>、<strong>TalkBack</strong>。
+この変更により、さまざまな画面設定に関連するバグが顕在化する可能性があります。
+この機能が及ぼす影響を評価するには、これらの設定を有効にしてアプリをテストする必要があります。
+
+設定は、<strong>[Settings] > [Accessibility]</strong> にあります。
+
+</p>
+
+<h2 id="ndk">プラットフォーム ライブラリにリンクした NDK アプリ</h2>
+
+<p>
+ Android N では、非パブリック API のロードを防止するために、名前空間が変更されています。
+ NDK を使用する場合、Android プラットフォームのパブリック API のみを使用する必要があります。
+Android の次の公式リリースで非パブリック API を使用すると、アプリがクラッシュする可能性があります。
+
+</p>
+
+<p>
+ 非パブリック API を使用していることを警告するために、アプリが非パブリック API を呼び出すと、Android N 端末で実行されているアプリは logcat 出力でエラーを生成します。
+
+ この状態を認識してもらえるよう、このエラーはメッセージとして端末の画面にも表示されます。
+アプリのコードを確認して、非パブリック プラットフォーム API を削除し、プレビュー端末またはエミュレータを使用して、アプリを十分にテストしてください。
+
+
+</p>
+
+<p>
+ アプリがプラットフォーム ライブラリに依存している場合は、NDK ドキュメントにある一般的な修正例を参照して、共通のプライベート API をそれと同等の機能を持つパブリック API に置き換えます。
+
+ 特に、<code>libpng</code> など、プラットフォームに含まれていて NDK には含まれていないライブラリをアプリで使用している場合、気付かないうちにプラットフォーム ライブラリにリンクしていることがあります。
+
+この場合、APK にリンク対象のすべての .so ファイルが含まれていることを確認します。
+
+</p>
+
+<p class="caution">
+ <strong>警告:</strong>サードパーティのライブラリの中には非パブリック API にリンクしているものもあります。
+アプリがこれらのライブラリを使用している場合、Android の次の公式リリースでアプリを実行すると、アプリがクラッシュする可能性があります。
+
+</p>
+
+<p>
+ NDK に含まれていないネイティブ ライブラリは Android のリリース版が変わると変更または削除される場合があるため、アプリでは、こういったライブラリへの依存やその使用を避けてください。
+
+OpenSSL から BoringSSL への移行は、そのような変更の一例です。
+ また、NDK に含まれていないプラットフォーム ライブラリには互換性要件がないため、端末によって互換性レベルが異なる場合があります。
+
+古い端末で非 NDK ライブラリにアクセスする必要がある場合は、Android API レベルに応じてロードしてください。
+
+</p>
+
+<p>
+ こうしたタイプの問題の診断を支援するために、Android N でアプリをビルドするときに発生する可能性のある Java および NDK のエラーの例を以下に示します。
+
+</p>
+
+<p>Java のエラー例</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>NDK のエラー例</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ こうしたタイプのエラーが発生しているアプリの典型的な修正例を以下に示します。
+</p>
+
+<ul>
+ <li>libandroid_runtime.so の getJavaVM と getJNIEnv を使用している場合は、標準の JNI 関数に置き換えることができます。
+
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>{@code libcutils.so} の {@code property_get} シンボルを使用している場合は、public {@code alternative __system_property_get} に置き換えることができます。
+
+ これを行うには、次の include 文とともに {@code __system_property_get} を使用します。
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>{@code libcrypto.so} の {@code SSL_ctrl} シンボルを使用している場合は、ローカル版のアプリに置き換える必要があります。
+たとえば、{@code .so} ファイルに {@code libcyrpto.a} を静的にリンクするか、BoringSSL や OpenSSL の {@code libcrypto.so} をアプリに動的に含める必要があります。
+
+
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N には、証明書のインストール、パスワードの再設定、セカンダリ ユーザーの管理、端末識別子へのアクセスなど、Android for Work をターゲットにしているアプリに対する変更が含まれています。
+
+Android for Work 環境向けのアプリをビルドしている場合、これらの変更点を確認し、変更に応じてアプリを修正する必要があります。
+
+
+</p>
+
+<ul>
+ <li>DPC が代理証明書を設定する前に、代理証明書インストーラをインストールする必要があります。
+また、プロファイルと N SDK をターゲットにしているデバイス オーナー アプリに対して、デバイス ポリシー コントローラ（DPC）が <code>DevicePolicyManager.setCertInstallerPackage()</code> を呼び出す前に代理証明書インストーラをインストールする必要があります。
+
+
+このインストーラがインストールされていない場合、<code>IllegalArgumentException</code> がスローされます。
+
+
+ </li>
+
+ <li>端末管理者向けのパスワードの再設定制限がプロファイル オーナーに適用されます。
+端末管理者は、{@code DevicePolicyManager.resetPassword()} を使用して、既に設定されているパスワードを削除または変更できなくなりました。
+
+端末管理者は、端末にパスワード、PIN、またはパターンが設定されていない場合のみ、パスワードを設定できます。
+
+ </li>
+
+ <li>デバイス オーナーとプロファイル オーナーは、制限が設定されている場合でもアカウントを管理することができます。
+デバイス オーナーとプロファイル オーナーは、<code>DISALLOW_MODIFY_ACCOUNTS</code> ユーザー制限が適用されている場合でもアカウント管理 API を呼び出すことができます。
+
+ </li>
+
+ <li>デバイス オーナーによるセカンダリ ユーザーの管理がさらに簡単になりました。端末がデバイス オーナー モードで実行されている場合は、<code>DISALLOW_ADD_USER</code> 制限が自動的に設定されます。
+
+これにより、管理されていないセカンダリ ユーザーが作成されることを防ぐことができます。
+また、<code>CreateUser()</code> メソッドと <code>createAndInitializeUser()</code> メソッドは廃止され、新しい <code>DevicePolicyManager.createAndManageUser()</code> メソッドに置き換えられました。
+
+
+ </li>
+
+ <li>デバイス オーナーは、端末識別子にアクセスできます。また、デバイス オーナーは <code>DevicePolicyManagewr.getWifiMacAddress()</code> を使用して、端末の Wi-Fi MAC アドレスにもアクセスできます。
+
+端末で Wi-Fi が有効にされたことがない場合、このメソッドは {@code null} 値を返します。
+
+ </li>
+
+ <li>ワークモード設定により、仕事用アプリへのアクセスが制御されます。ワークモードがオフになると、システム ランチャーは仕事用アプリをグレーアウトしてこれらが利用できないことを示します。
+ワークモードが再度有効になると、通常の動作が復元されます。
+
+</ul>
+
+<p>
+ Android N での Android for Work の変更の詳細については、<a href="{@docRoot}preview/features/afw.html">Android for Work のアップデート</a>をご覧ください。
+
+</p>
+
+<h2 id="annotations">アノテーションの保持</h2>
+
+<p>
+Android N では、アノテーションの表示が無視されていたバグを修正しています。この問題は、ランタイムがこれまでできなかったアノテーションへのアクセスを可能にしました。
+
+これらのアノテーションは以下のとおりです。
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}:ビルド時にのみ表示されます。</li>
+ <li>{@code VISIBILITY_SYSTEM}:実行時に表示されますが、基幹システムにのみ表示されます。
+</li>
+</ul>
+
+<p>
+アプリでこの動作を利用している場合は、実行時に表示されるアノテーションに保持ポリシーを追加してください。
+これは {@code @Retention(RetentionPolicy.RUNTIME)} を使用して実行できます。
+</p>
+
+<h2 id="other">その他の重要事項</h2>
+
+<ul>
+<li>Android N 上で低い API レベルをターゲットにしたアプリが実行されている場合、ユーザーがディスプレイ サイズを変更すると、アプリのプロセスは強制終了されます。
+アプリは、このシナリオを適切に処理する必要があります。
+適切に処理しないと、ユーザーが [Recents] からアプリを復元したときに、アプリがクラッシュします。
+
+
+<p>
+アプリをテストして、この動作が発生しないようにしてください。DDMS でアプリを手動で強制終了させて同様のクラッシュを発生させることにより、アプリのテストを行うことができます。
+
+
+
+</p>
+
+<p>
+N 以上をターゲットにしたアプリは、画面密度の変更時に自動的に強制終了しませんが、設定変更への対応が不十分なままである可能性があります。
+
+</p>
+</li>
+
+<li>
+Android N 上のアプリは設定変更を適切に処理し、次回の起動時にクラッシュしないようにする必要があります。
+フォントのサイズを変更（[<strong>Setting</strong>] > [<strong>Display</strong>] > [<strong>Font size</strong>]）した後に [Recents] からアプリを復元すると、アプリの動作を確認できます。
+
+
+
+</li>
+
+<li>
+旧バージョンの Android では、バグにより、メインスレッドの TCP ソケットへの書き込みを厳格モード違反として報告していませんでした。
+Android N ではこのバグが修正されています。この動作を表示するアプリから {@code android.os.NetworkOnMainThreadException} がスローされるようになりました。通常、メインスレッドでネットワーク操作を実行することはお勧めできません。それは、これらの操作は一般的に ANR やジャンクを引き起こす大幅なテイル レイテンシが発生するためです。
+
+
+
+</li>
+
+<li>
+メソッドの {@code Debug.startMethodTracing()} ファミリーが、SD カードのトップレベルではなく、共有ストレージ上のパッケージ固有のディレクトリの storing output にデフォルト設定されました。
+
+
+つまり、これらの API を使用するためにアプリで {@code WRITE_EXTERNAL_STORAGE} パーミッションをリクエストする必要はありません。
+</li>
+
+<li>
+多くのプラットフォーム API は、{@link android.os.Binder} トランザクションで送信される大きなペイロードをチェックし、暗黙的にログ記録したり、削除したりするのではなく {@code TransactionTooLargeExceptions} を {@code RuntimeExceptions} として再度スローするようになりました。
+
+
+一般的な例としては、{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()} で大量のデータを格納することです。これにより、アプリが Android N をターゲットにしている場合は、{@code ActivityThread.StopInfo} で {@code RuntimeException} がスローされます。
+
+
+
+
+</li>
+
+<li>
+アプリが {@link java.lang.Runnable} タスクを {@link android.view.View} に渡し、{@link android.view.View} がウィンドウにアタッチされない場合は、{@link java.lang.Runnable} タスクと {@link android.view.View} がキューに入れられます。{@link java.lang.Runnable} タスクは {@link android.view.View} がウィンドウにアタッチされるまで実行されません。
+
+
+
+
+
+この動作は以下のバグを修正します。
+<ul>
+ <li>対象ウィンドウの UI スレッド以外のスレッドからアプリが {@link android.view.View} に渡すと、結果として不適切なスレッドで {@link java.lang.Runnable} が実行される可能性があります。
+
+ </li>
+ <li>{@link java.lang.Runnable} タスクがルーパー スレッド以外のスレッドから渡されると、アプリは {@link java.lang.Runnable} タスクを公開できました。
+</li>
+</ul>
+</li>
+
+<li>
+{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES} パーミッションを持つ Android N 上のアプリが、別のアプリがインストールしたパッケージを削除しようとすると、ユーザー確認が要求されます。
+
+
+このシナリオでは、アプリが {@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()} を呼び出した場合は、{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION} をリターン ステータスとしてみなす必要があります。
+
+
+
+</li>
+
+</ul>
+
diff --git a/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..9a50ff7
--- /dev/null
+++ b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=サンプル
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ 以下は Android N のサンプルコードです。サンプルを Android Studio でダウンロードするには、<b>[File] > [Import Samples]</b> メニュー オプションを選択します。
+
+
+</p>
+
+<p class="note">
+ <strong>注:</strong>以下のダウンロード可能なプロジェクトは、Gradle と Android Studio でご利用いただくために提供しています。
+
+</p>
+
+
+<h3 id="mw">マルチ ウィンドウ Playground</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ このサンプルでは、自身のアプリでマルチ ウィンドウのユーザー インターフェースを使用する方法をご確認いただけます。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">GitHub でサンプルを入手</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">アクティブ通知</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ NotificationCompat を使用して通知を送信するシンプルなサービスをご確認いただける既存のサンプルです。
+ユーザーからの未読メッセージは、それぞれ別の通知として送信されます。
+
+</p>
+<p>
+ このサンプルは、Android N 向けの新たな通知機能を利用できるようにアップデートされています。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">GitHub でサンプルを入手</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">メッセージ サービス</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ 1 つのアプリで表示している通知の件数を NotificationManager で取得する方法をご確認いただける既存のサンプルです。
+
+
+</p>
+<p>
+ このサンプルは、Android N 向けの新たな通知機能を利用できるようにアップデートされています。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">GitHub でサンプルを入手</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">ダイレクト ブート</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ このサンプルでは、端末の暗号化ストレージ内のデータにアクセスしたり、データを保存したりする方法をご確認いただけます。この機能は端末が起動している間は常に有効です。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">GitHub でサンプルを入手</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">特定のディレクトリへのアクセス</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ このサンプルでは、より少ないパーミッションで、特定のディレクトリに対するデータの読み出しや書き込みを行う方法をご確認いただけます。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">GitHub でサンプルを入手</a>
+
+</p>
diff --git a/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-testing.jd b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..9f03412
--- /dev/null
+++ b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=テストガイド
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>このドキュメントの内容</h2>
+ <ol>
+ <li><a href="#runtime-permissions">パーミッションをテストする</a></li>
+ <li><a href="#doze-standby">Doze とアプリ スタンバイをテストする</a></li>
+ <li><a href="#ids">自動バックアップと端末識別子</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N を利用すると、次期バージョンのプラットフォームでアプリが動作するか確認できます。
+このプレビューには、<a href="{@docRoot}preview/api-overview.html">API の概要</a>と<a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>に記載されているように、アプリに影響を与える可能性のある多くの API と動作の変更が含まれています。
+
+このプレビューでアプリをテストするときには、アプリの良好な使用感を確保するために、システムのいくつかの変更点に特に注意する必要があります。
+
+
+</p>
+
+<p>
+ このガイドでは、アプリでプレビューの機能の何をどのようにテストすればよいか説明します。以下のプレビュー機能は、アプリの動作に大きな影響を与える可能性があるので、優先してテストする必要があります。
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">パーミッション</a>
+ </li>
+ <li><a href="#doze-standby">Doze とアプリ スタンバイ</a>
+ </li>
+ <li><a href="#ids">自動バックアップと端末識別子</a></li>
+</ul>
+
+<p>
+ テスト用のプレビュー システム イメージを使用した端末または仮想端末のセットアップ方法の詳細については、<a href="{@docRoot}preview/setup-sdk.html">Android N SDK のセットアップ</a>をご覧ください。
+
+
+</p>
+
+
+<h2 id="runtime-permissions">パーミッションをテストする</h2>
+
+<p>
+ <a href="{@docRoot}preview/features/runtime-permissions.html">パーミッション</a> モデルの変更により、ユーザーがアプリにパーミッションを付与する方法が変わりました。
+アプリでは、インストール時にすべてのパーミッションを要求するのではなく、実行時に個々のパーミッションをユーザーに要求する必要があります。
+
+これにより、ユーザーは、各アプリのアクティビティをより細かくコントロールできるようになるだけではなく、アプリが各パーミッションを要求する理由をこれまでよりもよく理解できるようになります。
+ユーザーは、いつでもアプリに個別にパーミッションを付与したり、付与したパーミッションを個別に取り消したりできます。
+プレビューのこの機能は、アプリの動作に大きな影響を与える可能性があり、アプリの一部の機能が動作しなくなったり、限定された機能しか使えなくなったりする可能性もあります。
+
+
+</p>
+
+<p class="caution">
+ この変更は、アプリがこの新しいバージョンを対象にしているかどうかにかかわらず、この新しいプラットフォーム上で実行されるすべてのアプリに影響します。
+このプラットフォームは以前のアプリに限定的な互換動作を提供しますが、公式版のプラットフォームのリリースに合わせてアップデート版のアプリを公開できるように、新しいパーミッション モデルに対応させるためのアプリの移行を今から計画することを強くお勧めします。
+
+
+</p>
+
+
+<h3 id="permission-test-tips">テストのヒント</h3>
+
+<p>
+ 以下のテストのヒントを活用して、アプリでの新しいパーミッション動作のテストを計画し、実行してください。
+
+</p>
+
+<ul>
+ <li>アプリの現在のパーミッションと関連するコードパスを確認します。</li>
+ <li>パーミッションで保護されているサービスとデータ間のユーザーフローをテストします。</li>
+ <li>付与されたパーミッションと取り消されたパーミッションのさまざまな組み合わせをテストします。</li>
+ <li>{@code adb} ツールを使用して、コマンドラインからパーミッションを管理します。
+ <ul>
+ <li>パーミッションとステータスをグループ化して表示します。
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>以下の構文を使用して 1 つまたは複数のパーミッションを付与または取り消します。<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>アプリでパーミッションを使用しているサービスを分析します。</li>
+</ul>
+
+<h3 id="permission-test-strategy">テスト方針</h3>
+
+<p>
+ このパーミッションの変化は、アプリの構造と設計、ユーザー エクスペリエンスとフローに影響を与えます。
+アプリの現在のパーミッション利用の状況を調査し、新しいフローの検討を開始する必要があります。
+このプラットフォームの公式リリースは互換動作を提供しますが、互換動作に頼ることなくアプリのアップデートを計画することを強くお勧めします。
+
+
+</p>
+
+<p>
+ まずアプリが実際に必要とし使用しているパーミッションを特定してから、パーミッションで保護されたサービスを使用している各コードパスを探してください。
+これには、新しいプラットフォーム上でのテストと、コードの解析が必要です。
+テストでは、アプリの {@code targetSdkVersion} をこのプレビュー版に変えて、ランタイム パーミッションのオプトインに重点的にテストする必要があります。
+詳細については、<a href="{@docRoot}preview/setup-sdk.html#">Android N SDK のセットアップ</a>をご覧ください。
+
+
+</p>
+
+<p>
+ パーミッションの取り消しと追加のさまざまな組み合わせをテストし、パーミッションに依存するユーザーフローを確認します。
+パーミッションへの依存性が明白または論理的ではない箇所では、依存性を取り除くため、またはパーミッションが必要な理由を明白にするために、フローのリファクタリングまたはコンパートメント化を検討する必要があります。
+
+
+</p>
+
+<p>
+ ランタイム パーミッションの動作、テスト、ベスト プラクティスについては、Developer Preview ページの<a href="{@docRoot}preview/features/runtime-permissions.html">パーミッション</a>をご覧ください。
+
+
+</p>
+
+
+<h2 id="doze-standby">Doze とアプリ スタンバイをテストする</h2>
+
+<p>
+ 省電力機能である Doze とアプリ スタンバイにより、端末がアイドル状態のときやそのアプリにフォーカスがないときに、アプリが実行できるバックグラウンド処理の量が制限されます。
+システムによってアプリに加えられる可能性のある制限には、ネットワーク アクセスの制限や停止、バックグラウンド タスクの停止、通知の停止、ウェイク リクエストの無視、アラームなどがあります。
+
+これらの省電力のための最適化が行われた状態で確実にアプリが適切に動作するように、これらの省電力状態をシミュレートしてアプリをテストする必要があります。
+
+
+</p>
+
+<h4 id="doze">アプリで Doze をテストする</h4>
+
+<p>アプリで Doze をテストするには: </p>
+
+<ol>
+<li>Android N のシステム イメージを使用して、ハードウェア端末または仮想端末を設定します。</li>
+<li>端末を開発マシンに接続し、アプリをインストールします。</li>
+<li>アプリを実行し、アクティブ状態のままにします。</li>
+<li>以下のコマンドを実行して、端末の Doze モードへの移行をシミュレートします。
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>端末がアクティブ状態に戻ったときのアプリの動作を観察します。端末が Doze モードから抜けるときに、アプリがスムーズに復帰することを確認します。
+</li>
+</ol>
+
+
+<h4 id="standby">アプリでアプリ スタンバイをテストする</h4>
+
+<p>アプリでアプリ スタンバイ モードをテストするには: </p>
+
+<ol>
+ <li>Android N のシステム イメージを使用して、ハードウェア端末または仮想端末を設定します。</li>
+ <li>端末を開発マシンに接続し、アプリをインストールします。</li>
+ <li>アプリを実行し、アクティブ状態のままにします。</li>
+ <li>以下のコマンドを実行して、アプリのスタンバイ モードへの移行をシミュレートします。
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>以下のコマンドを使用して、アプリのウェイクをシミュレートします。
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>アプリがウェイク状態に戻ったときのアプリの動作を観察します。アプリがスタンバイ モードからスムーズに復帰することを確認します。
+特に、アプリの通知とバックグラウンド ジョブが想定通りの動作を続けているかを確認する必要があります。
+</li>
+</ol>
+
+<h2 id="ids">アプリの自動バックアップと端末固有識別子</h2>
+
+<p>アプリが、Google Cloud Messaging の登録 ID などのなんらかの端末固有の識別子を内部ストレージに保持している場合、<a href="{@docRoot}preview/backup/index.html">アプリの自動バックアップ</a>の説明に従って、そのストレージのロケーションを自動バックアップの対象から除外してください。
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/ja/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..732b014
--- /dev/null
+++ b/docs/html-intl/intl/ja/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1039 @@
+page.title=Android N for Developers
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>主なデベロッパー機能</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">マルチ ウィンドウのサポート</a></li>
+ <li><a href="#notification_enhancements">通知</a></li>
+ <li><a href="#jit_aot">JIT / AOT コンパイル</a></li>
+ <li><a href="#quick_path_to_app_install">アプリの高速インストール</a></li>
+ <li><a href="#doze_on_the_go">どこでも機能する Doze</a></li>
+ <li><a href="#background_optimizations">バックグラウンド処理の最適化</a></li>
+ <li><a href="#data_saver">データセーバー</a></li>
+ <li><a href="#vulkan">Vulkan API</a></li>
+ <li><a href="#tile_api">クイック設定タイル API</a></li>
+ <li><a href="#number-blocking">電話番号のブロック</a></li>
+ <li><a href="#call_screening">通話スクリーニング</a></li>
+ <li><a href="#multi-locale_languages">ロケールと言語</a></li>
+ <li><a href="#emoji">新しい絵文字</a></li>
+ <li><a href="#icu4">Android の ICU4J API</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Android TV の録画機能</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">ユーザー補助機能</a></li>
+ <li><a href="#direct_boot">ダイレクト ブート</a></li>
+ <li><a href="#key_attestation">キーの構成証明</a></li>
+ <li><a href="#network_security_config">ネットワーク セキュリティ構成</a></li>
+ <li><a href="#default_trusted_ca">既定の信頼される証明機関</a></li>
+ <li><a href="#apk_signature_v2">APK 署名スキーム v2</a></li>
+ <li><a href="#scoped_directory_access">特定のディレクトリへのアクセス</a></li>
+ <li><a href="#keyboard_shortcuts_helper">キーボード ショートカット ヘルパー</a></li>
+ <li><a href="#sustained_performance_api">パフォーマンス維持 API</a></li>
+ <li><a href="#vr">VR サポート</a></li>
+ <li><a href="#print_svc">印刷サービス機能の強化</a></li>
+ <li><a href="#virtual_files">仮想ファイル</a></li>
+ <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N は現在も開発中ですが、N Developer Preview の一部として Android N を試用できます。
+以下のセクションでは、デベロッパー向けの新しい機能の一部を紹介しています。
+ </p>
+
+<p>
+ <a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>を確認して、プラットフォームの変更がアプリに影響を及ぼす可能性のある領域について把握してください。また、デベロッパー ガイドを参照して主な機能について詳しく学習し、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>をダウンロードして、新しい API の詳細を理解してください。
+
+
+
+</p>
+
+<h2 id="multi-window_support">マルチ ウィンドウのサポート</h2>
+
+
+<p>Android N では、多くのユーザーから求められていたマルチタスク機能がプラットフォームに新しく導入されました。つまり、マルチ ウィンドウがサポートされるようになりました。
+ </p>
+
+ <p>ユーザーは同時に 2 つのアプリを画面に開くことができます。 </p>
+ <ul>
+ <li>Android N が動作している携帯端末やタブレットでは、分割画面モードで 2 つのアプリを左右や上下に並べて実行できます。
+
+また、2 つのアプリの間にある分割線をドラッグしてアプリのサイズを変更することもできます。
+ </li>
+
+<li>Android TV 端末では、アプリを<a href="{@docRoot}preview/features/picture-in-picture.html">ピクチャ イン ピクチャ モード</a>にすると、アプリにコンテンツを表示したまま、他のアプリをブラウジングまたは操作することができます。
+
+</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>図 1.</strong> 分割画面モードで実行されているアプリ
+</p>
+
+ </div>
+
+<p>特にタブレットや大画面の端末では、マルチ ウィンドウのサポートにより、ユーザーを引き付ける新しい方法が提供されます。
+アプリでドラッグ アンド ドロップを有効にすると、ユーザーはアプリとの間でコンテンツを簡単にドラッグすることができるので、快適な使い心地を実現することができます。
+
+ </p>
+
+<p>マルチ ウィンドウのサポートをアプリに追加して、マルチ ウィンドウ ディスプレイを処理する方法を設定するのは簡単です。
+たとえば、アクティビティの最小許容ディメンションを指定すると、ユーザーはアクティビティをそのサイズより小さく変更できなくなります。
+
+また、アプリに対してマルチ ウィンドウ ディスプレイを無効にし、アプリを全画面モードのみで表示することもできます。
+</p>
+
+<p>
+ 詳細については、<a href="{@docRoot}preview/features/multi-window.html">マルチ ウィンドウのサポート</a>に関するデベロッパー向けドキュメントをご覧ください。
+
+</p>
+
+<h2 id="notification_enhancements">通知の機能強化</h2>
+
+<p>Android N では、通知が再設計されており、さらに使いやすくなっています。
+次のような点が変更されました。</p>
+
+<ul>
+ <li>
+ <strong>テンプレートのアップデート</strong>:通知テンプレートは、ヒーロー イメージやアバターを中心としたデザインにアップデートされています。
+デベロッパーは、コードに最小限の変更を加えるだけで、この新しいテンプレートを活用できます。
+
+ </li>
+
+ <li>
+ <strong>メッセージ スタイルのカスタマイズ</strong>:<code>MessageStyle</code> クラスを使用して、通知に関連付けられているさらに多くのユーザー インターフェース ラベルをカスタマイズできます。
+
+メッセージ、会話、タイトル、コンテンツ ビューを設定できます。
+
+ </li>
+
+ <li>
+ <strong>バンドル通知</strong>:メッセージをグループ化できます。たとえば、メッセージをトピックごとにグループ化して、各グループを表示できます。
+ユーザーは、各グループに対して、消去やアーカイブといったアクションを実行できます。
+Android Wear 向けの通知を実装したことがある場合は、このモデルはおなじみでしょう。
+
+
+ </li>
+
+ <li>
+ <strong>ダイレクト リプライ</strong>:Android システムでは、インライン リプライがサポートされています。リアルタイム通信アプリを使用しているユーザーは、通知インターフェース内で直接 SMS やテキスト メッセージにすばやく応答できます。
+
+
+ </li>
+
+ <li>
+ <strong>カスタムビュー</strong>:2 つの新しい API を使用すると、通知でカスタムビューを使用するときに、通知ヘッダーやアクションなどのシステム デコレーションを活用できます。
+
+
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>図 2.</strong> バンドル通知とダイレクト リプライ
+</p>
+
+<p>以上の新しい機能を実装する方法の詳細については、<a href="{@docRoot}preview/features/notification-updates.html">通知</a>に関するガイドをご覧ください。
+
+</p>
+
+
+
+<h2 id="jit_aot">プロファイルに基づいた JIT / AOT コンパイル</h2>
+
+<p>Android N では、コード プロファイリングにも対応した Just in Time（JIT）コンパイラーが ART に追加されており、Android アプリを実行するときのパフォーマンスが向上しています。
+
+JIT コンパイラーは、ART で現在使用されている Ahead of Time（AOT）コンパイラーを補完するものであり、ランタイム パフォーマンスの向上、ストレージ スペースの削減、アプリとシステムのアップデートの高速化に貢献します。
+
+</p>
+
+<p>プロファイルに基づいたコンパイルを使用すると、アプリの実際の使用方法や端末上での状態に応じて、ART が各アプリの AOT / JIT コンパイルを管理します。
+たとえば、ART は各アプリのホット メソッドのプロファイルを維持し、これらのメソッドをプリコンパイルしてキャッシュに保存することにより、パフォーマンスを最適化します。
+
+また、アプリの他の部分は、実際に使用されるときまでコンパイルされません。
+</p>
+
+<p>プロファイルに基づいたコンパイルは、アプリの主要部分のパフォーマンスを向上させ、関連するバイナリなど、アプリの全体的な RAM 使用量を削減します。
+
+この機能は、メモリが少ない端末で特に重要です。</p>
+
+<p>ART は、端末の電池への影響が最小限になるようにプロファイルに基づいたコンパイルを管理します。
+端末がアイドル状態および充電中のときにのみ、プリコンパイルが事前に実行されるため、時間と電池が節約できます。
+</p>
+
+<h2 id="quick_path_to_app_install">アプリの高速インストール</h2>
+
+<p>ART の JIT コンパイラーの最も明確な利点の 1 つは、アプリのインストールとシステム アップデートの速度です。
+Android 6.0 では最適化とインストールの実行に数分かかっていたサイズの大きいアプリでも、数秒でインストールできるようになりました。
+
+最適化のステップが不要になったため、システム アップデートも高速化されています。 </p>
+
+<h2 id="doze_on_the_go">どこでも機能する Doze</h2>
+
+<p>Android 6.0 では Doze システムモードが導入されています。これにより、端末が机に置かれているときや引き出しに収められているときなどのアイドル時にアプリの CPU とネットワーク通信の実行を保留し、電池を節約します。
+
+ </p>
+
+<p>Android N では Doze が改良され、外出中でも電池を節約できるようになっています。画面をしばらくオフにしたり端末を電源から抜いたりすると、Doze により、通常の CPU およびネットワーク制限の一部がアプリに適用されます。つまり、端末をポケットに入れて持ち歩いているときでも電池を節約できます。
+
+
+
+</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>図 3.</strong> Doze により、端末が静止していないときでも制限が適用され、電池の寿命が延長される
+
+</p>
+
+
+<p>端末が電池で動作しているときに画面をしばらくオフにすると、Doze はネットワーク アクセスを制限し、ジョブと同期を保留します。
+アプリはメンテナンス ウィンドウと呼ばれる短い時間にネットワークにアクセスしたり、保留中のジョブや同期を実行したりします。
+
+画面をオンにするか、端末を電源に接続すると、端末の Doze モードは解除されます。
+</p>
+
+<p>電池で動作している端末が再び静止状態になり、画面がしばらくオフになると、Doze は完全な CPU およびネットワーク制限を {@link
+android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} アラーム、GPS / Wi-Fi スキャンに適用します。
+
+</p>
+
+<p>アプリを Doze に対応させるためのベスト プラクティスは端末を持ち歩いているかどうかには関係ありません。そのため、Doze が適切に処理されるようにアプリを既にアップデートしている場合は、追加の対応は必要ありません。
+
+そうでない場合は、<a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">アプリの Doze 対応</a>を行ってください。
+</p>
+
+<h2 id="background_optimizations">Project Svelte:バックグラウンド処理の最適化</h2>
+
+<p>Project Svelte は、Android エコシステムのさまざまな端末でシステムやアプリによる RAM の使用を最小限にする取り組みです。
+Android N での Project Svelte は、アプリをバックグラウンドで実行する方法を最適化することに重点を置いています。
+ </p>
+
+<p>ほとんどのアプリでは、バックグラウンド処理が非常に重要になります。バックグラウンド処理を適切に実行すると、状況に応じて高速に実行できるなどユーザー エクスペリエンスが大幅に向上します。バックグラウンド処理が不適切な場合は、RAM（と電池）が必要以上に消費され、他のアプリのシステム パフォーマンスに影響を及ぼす可能性があります。
+
+
+ </p>
+
+<p>Android 5.0 以降では、ユーザーに適した方法でバックグラウンド処理を実行する {@link android.app.job.JobScheduler} が推奨されています。
+
+これによって、メモリ、電源、接続の状態に基づいてシステムを最適化しながら、アプリでジョブをスケジュールできます。
+JobScheduler はシンプルな制御を提供するため、すべてのアプリで JobScheduler を使用することが効果的です。
+ </p>
+
+<p>
+ もう 1 つの適切な選択肢は、Google Play サービスの一部である <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager"><code>GCMNetworkManager</code></a> です。この機能も同様のジョブ スケジュール機能を提供しますが、こちらは以前のバージョンの Android とも互換性があります。
+
+
+
+</p>
+
+<p>さらに多くのユースケースに対応するために、<code>JobScheduler</code> と <code>GCMNetworkManager</code> の拡張は継続されています。たとえば、Android N では、コンテンツ プロバイダの変更に基づいてバックグラウンド処理をスケジュールできるようになりました。
+
+
+また、特にメモリの少ない端末でシステム パフォーマンスを低下させる可能性のある一部の古いパターンの廃止も開始されています。
+
+</p>
+
+<p>一般的に使用される暗黙的なブロードキャストである
+{@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}、{@link
+ android.hardware.Camera#ACTION_NEW_PICTURE}、{@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} は複数のアプリのバックグラウンド処理を同時に起動するので、メモリと電池に負荷をかける可能性があります。そのため、Android N では、この 3 つのブロードキャストが削除されています。
+アプリがこれらのブロードキャストを受信する場合は、N Developer Preview を使用して、<code>JobScheduler</code> とそれに関連する API に移行してください。
+
+ </p>
+
+<p>
+ 詳細については、<a href="{@docRoot}preview/features/background-optimization.html">バックグラウンド処理の最適化</a>に関するドキュメントをご覧ください。
+
+</p>
+
+
+<h2 id="data_saver">データセーバー</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>図 4.</strong> [Settings] でのデータセーバー
+</p>
+ </div>
+
+<p>一般的に、モバイル端末のライフサイクル全体では、モバイルデータ通信プランのコストが端末自体のコストを上回ります。
+多くのユーザーにとって、モバイルデータ通信は、節約する必要のある高価なリソースです。
+ </p>
+
+<p>Android N では、ローミング、課金サイクルの終了近く、または短期間のデータパックであるかどうかに関係なく、アプリによるモバイルデータ通信の使用を削減する新しいシステム サービスであるデータセーバー モードが導入されています。
+
+データセーバーを使用すると、アプリによるモバイルデータ通信の使用方法をユーザーが制御できます。また、デベロッパーは、データセーバーがオンのときに、より効率よく通信するサービスを提供できるようになります。
+
+ </p>
+
+<p>ユーザーが [<strong>Settings</strong>] でデータセーバーを有効にし、端末が従量制課金ネットワークに接続されている場合、システムは、ストリーミングのビットレートを制限したり、画質を低下させたり、オプティミスティックなプレキャッシングを保留したりすることにより、バックグラウンドでのデータ使用をブロックし、フォアグラウンドでのデータ使用をなるべく抑えるようにアプリに指示します。
+
+
+
+ユーザーは特定のアプリをホワイトリストに登録することにより、データセーバーがオンになっているときでも、バックグラウンドで従量制データ通信を使用できます。
+</p>
+
+<p>Android N は {@link android.net.ConnectivityManager} を拡張することで、<a href="{@docRoot}preview/features/data-saver.html#status">ユーザーのデータセーバー設定を取得</a>する方法と、<a href="{@docRoot}preview/features/data-saver.html#monitor-changes">設定の変更を監視</a>する方法を提供しています。
+
+
+すべてのアプリは、ユーザーがデータセーバーを有効にしているかどうかを確認し、フォアグラウンドおよびバックグラウンドでのデータ使用を制限する必要があります。
+</p>
+
+
+<h2 id="vulkan">Vulkan API</h2>
+
+<p>
+ Android N では、新しい 3D レンダリング API である <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a> がプラットフォームに統合されています。<a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™ ES</a> と同様に、Vulkan は Khronos グループによって管理されている 3D グラフィックおよびレンダリングのオープン スタンダードです。
+
+
+
+</p>
+
+<p>
+ Vulkan は、ドライバの CPU オーバーヘッドを最小化するため、およびアプリケーションが GPU の動作をより直接的に制御できるように設計されています。
+また、Vulkan は、複数のスレッドが作業を実行できるようにする（コマンド バッファの作成を同時に行うなど）ことによって、より優れた並列処理が可能です。
+
+
+</p>
+
+<p>
+ Vulkan 開発ツールおよびライブラリは、Android NDK に含まれています。次のようなものが含まれます。
+
+</p>
+
+<ul>
+ <li>ヘッダー
+ </li>
+
+ <li>検証レイヤ（デバッグ ライブラリ）
+ </li>
+
+ <li>SPIR-V シェーダー コンパイラー
+ </li>
+
+ <li>SPIR-V シェーダーのランタイム コンパイル ライブラリ
+ </li>
+</ul>
+
+<p>
+ Vulkan は、Nexus 5X、Nexus 6P、Nexus Player などの Vulkan 対応ハードウェアを備えた端末上のアプリでのみ利用できます。
+Vulkan を可能な限りより多くの端末に導入するためにパートナーと緊密に協力し合っています。
+
+</p>
+
+<p>
+ 詳細については、<a href="{@docRoot}ndk/guides/graphics/index.html">API ドキュメント</a>をご覧ください。
+</p>
+
+<h2 id="tile_api">クイック設定タイル API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>図 5.</strong> 通知シェードにあるクイック設定タイル
+</p>
+
+
+ </div><p>クイック設定は、通知シェードから主要な設定とアクションを直接公開するための一般的で簡単な方法です。
+Android N では、クイック設定の範囲が拡大され、さらに使いやすく便利な機能になっています。
+ </p>
+
+<p>クイック設定タイル用のスペースが広くなったので、ユーザーは、左または右にスワイプして、ページ分割された表示領域でこれらのタイルにアクセスできます。
+また、ユーザーは、表示するクイック設定タイルとその表示場所を制御できるようになっています。ユーザーはタイルをドラッグ アンド ドロップして、追加または移動できます。
+
+ </p>
+
+<p>Android N では、デベロッパーが独自のクイック設定タイルを定義できる新しい API が追加されており、ユーザーはこの API を通じて、アプリの主なコントロールとアクションに簡単にアクセスできます。
+</p>
+
+<p>
+ クイック設定タイルは、緊急に必要な、または頻繁に使用されるコントロールやアクション用に用意されたものであり、アプリを起動するためのショートカットとして使用するべきではありません。
+
+
+</p>
+
+<p>
+ タイルの定義が完了すると、ユーザーにタイルを公開できるようになります。ユーザーはタイルをドラッグ アンド ドロップするだけで、クイック設定にタイルを追加できます。
+
+</p>
+
+<p>
+ アプリタイルを作成する方法については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>に掲載されている <code>android.service.quicksettings.Tile</code> のドキュメントをご覧ください。
+
+</p>
+
+
+
+<h2 id="number-blocking">電話番号のブロック</h2>
+
+<p>Android N では、プラットフォームで電話番号のブロックがサポートされており、サービス プロバイダがブロックされた電話番号のリストを保持するためのフレームワーク API が提供されています。
+デフォルトの SMS アプリ、デフォルトの電話アプリ、携帯通信会社アプリは、ブロックされた電話番号のリストを読み込んだり、このリストに書き込んだりできます。
+
+その他のアプリはこのリストにアクセスできません。</p>
+
+<p>Android では、電話番号のブロックをプラットフォームの標準の機能にすることにより、幅広い端末で電話番号をブロックできるようにする一貫した方法がアプリに提供されています。
+
+その他にアプリは次のような機能も利用できます。</p>
+
+<ul>
+ <li> ブロックされた電話番号は、テキスト メッセージでもブロックされる
+ <li> ブロックされた電話番号は、リセットした端末や、バックアップおよびリストア機能で移行したデバイスでも保持される
+
+ <li> 複数のアプリが同じブロックリストを使用できる
+</ul>
+
+<p>また、Android に携帯通信会社のアプリが組み込まれていると、携帯通信会社は端末上のブロックリストを読み込んで迷惑な電話やテキスト メッセージをサービス側でブロックできます。これによって、VOIP エンドポイントや転送電話などいかなる媒体を介しても、ブロックされた番号はユーザーに到達できなくなります。
+
+
+</p>
+
+<p>
+ 詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>android.provider.BlockedNumberContract</code> をご覧ください。
+
+
+</p>
+
+<h2 id="call_screening">通話スクリーニング</h2>
+
+<p>
+ Android N では、デフォルトの電話アプリで着信をスクリーニングできます。新しい <code>CallScreeningService</code> を実装することによって、電話アプリは着信をスクリーニングします。これにより、電話アプリは着信する電話の {@link android.telecom.Call.Details Call.Details} に基づいて次のようなアクションを実行できます。
+
+
+
+</p>
+
+<ul>
+ <li> 着信を拒否する
+ <li> 着信を通話履歴に含めない
+ <li> 着信通知をユーザーに表示しない
+</ul>
+
+<p>
+ 詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>android.telecom.CallScreeningService</code> をご覧ください。
+
+
+</p>
+
+
+<h2 id="multi-locale_languages">マルチロケールのサポートと言語の追加</h2>
+
+
+<p>Android N では、[Settings] で<strong>マルチロケール</strong>を選択できるようになり、複数言語を使用するユーザーへのサポートが強化されました。
+アプリで新しい API を使用して、ユーザーが選択したロケールを取得すると、複数のロケールを設定しているユーザーに対してより洗練されたユーザー エクスペリエンスを提供できます。たとえば、検索結果を複数の言語で表示したり、ユーザーが理解している言語のウェブページでは翻訳の提案を行わないようにしたりすることが可能になります。
+
+
+
+</p>
+
+<p>また、Android N では、マルチロケールのサポートに加えて、ユーザーが利用できる言語が追加されています。
+英語、スペイン語、フランス語、アラビア語などの一般的な言語に対して、それぞれ 25 以上のバリエーションが提供されます。
+100 以上の新しい言語も部分的にサポートされています。
+</p>
+
+<p>アプリは、<code>LocaleList.GetDefault()</code> を呼び出すことにより、ユーザーが設定したロケールのリストを取得できます。
+Android N では、ロケール数の増加に対応するために、リソースを解決する方法が変更されています。
+この新しいリソース解決ロジックでアプリが想定どおりに動作することをテストおよび確認してください。
+</p>
+
+<p>新しいリソース解決動作と順守する必要のあるベスト プラクティスの詳細については、<a href="{@docRoot}preview/features/multilingual-support.html">複数言語のサポート</a>をご覧ください。
+</p>
+
+
+<h2 id="emoji">新しい絵文字</h2>
+
+<p>
+ Android N では、肌色の異なる絵文字や異体字セレクターのサポートなど、絵文字の追加と絵文字関連機能が導入されています。
+
+アプリで絵文字をサポートする場合は、以下のガイドラインに従い、これらの絵文字関連機能を利用します。
+
+</p>
+
+<ul>
+ <li>
+ <strong>絵文字を挿入する前に端末に絵文字が含まれていることを確認する。</strong>
+ システム フォントで表示される絵文字を確認するには、{@link android.graphics.Paint#hasGlyph(String)} メソッドを使用します。
+
+ </li>
+ <li>
+ <strong>絵文字が異体字セレクターをサポートしていることを確認する。</strong>
+ 異体字セレクターを使用すると、特定の絵文字をカラーまたは白黒で表示できます。
+
+ アプリは、モバイル端末では白黒よりもカラーで絵文字を表示する必要があります。ただし、アプリでテキスト メッセージを使用して絵文字を表示する場合は、白黒バージョンを使用する必要があります。
+
+ 絵文字に異体字があるかどうかを確認するには、異体字セレクターを使用します。
+ 異体字のある文字の完全なリストについては、<a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">異体字に関する Unicode ドキュメント</a>の<em>絵文字異体字シーケンス</em> セクションを確認してください。
+
+
+
+ </li>
+ <li>
+ <strong>絵文字が肌色をサポートしていることを確認する。</strong>Android N では、レンダリングされる絵文字の肌色を好みの色に変更できます。
+キーボード アプリでは、肌色が複数ある絵文字をわかりやすく表示して、ユーザーが好みの肌色を選択できるようにする必要があります。
+
+肌色修飾子を持つシステムの絵文字を確認するには、{@link android.graphics.Paint#hasGlyph(String)} メソッドを使用します。
+
+肌色を使用する絵文字を確認するには、<a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">Unicode ドキュメント</a>をご覧ください。
+
+
+ </li>
+</ul>
+
+
+<h2 id="icu4">Android の ICU4J API</h2>
+
+<p>
+ Android N では、Android フレームワーク内で <a href="http://site.icu-project.org/">ICU4J</a> API のサブセットが提供されており、<code>android.icu</code> パッケージにあります。
+移行は簡単で、ほとんどの場合、名前空間を <code>com.java.icu</code> から <code>android.icu</code> に変更するだけです。
+
+アプリで ICU4J バンドルを既に使用している場合は、Android フレームワークで提供されている <code>android.icu</code> API に移行すると、APK サイズを大幅に削減できます。
+
+
+</p>
+
+<p>
+ Android ICU4J API の詳細については、<a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J のサポート</a>をご覧ください。
+</p>
+
+
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>Android N では、OpenGL ES 3.2 用の以下のようなフレームワーク インターフェースとプラットフォーム サポートが追加されています。</p>
+
+<ul>
+ <li> <code>EXT_texture_sRGB_decode</code> を除く <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Android エクステンション パック</a></a>（AEP）のすべての拡張機能
+
+ <li> HDR および遅延シェーディング用の浮動小数点フレームバッファ
+ <li> 一括処理とストリーミングを向上させるための BaseVertex 描画呼び出し
+ <li> WebGL のオーバーヘッドを低減するための堅牢なバッファ アクセス コントロール
+</ul>
+
+<p>Android N の OpenGL ES 3.2 用のフレームワーク API は、<code>GLES32</code> クラスで提供されます。
+OpenGL ES 3.2 を使用する場合、<code><uses-feature></code> タグと <code>android:glEsVersion</code> 属性を使用してマニフェスト ファイルで要件を宣言する必要があります。
+
+ </p>
+
+<p>端末でサポートされる OpenGL ES のバージョンを実行時に確認する方法など、OpenGL ES の使用方法については、<a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API ガイド</a>をご覧ください。
+</p>
+
+
+<h2 id="android_tv_recording">Android TV の録画機能</h2>
+
+<p>Android N では、新しい recording API を介して Android TV 入力サービスからコンテンツを録画して再生する機能が追加されています。
+TV 入力サービスでは、録画できるチャンネル データや録画したセッションを保存する方法の制御、ユーザーによる録画されたコンテンツの操作の管理を行うことができます。このサービスは、既存の time-shifting API を使用して構築されています。
+
+ </p>
+
+<p>詳細については、<a href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording API</a> をご覧ください。</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work は、Android N を実行している端末に多くの新しい機能と API を追加するものです。主要な機能の一部を以下に紹介します。変更点の完全なリストについては、<a href="{@docRoot}preview/features/afw.html">Android for Work のアップデート</a>をご覧ください。
+
+</p>
+
+<h3 id="work_profile_security_challenge">仕事用プロファイルによるセキュリティ確認 </h3>
+
+<p>
+ N SDK を対象としているプロファイル オーナーは、仕事用プロファイルで実行しているアプリで個別にセキュリティ確認を行うよう指定することができます。
+
+ユーザーが仕事用アプリを開こうとすると、仕事用プロファイル用のセキュリティ確認画面が表示されます。
+セキュリティの確認に成功すると、仕事用プロファイルのロックが解除され、必要に応じて暗号化も解除されます。
+プロファイル オーナーは、<code>ACTION_SET_NEW_PASSWORD</code> でユーザーに仕事用プロファイル用のセキュリティ確認を設定するように求めたり、<code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> でユーザーに端末のロックを設定するように求めたりします。
+
+
+
+</p>
+
+<p>
+ プロファイル オーナーは、<code>setPasswordQuality()</code>、<code>setPasswordMinimumLength()</code>、および関連するメソッドを使用して、仕事用プロファイル用のセキュリティ確認に個別のパスコード ポリシー（PIN に必要な長さや、指紋によるプロファイルのロック解除が可能かどうかなど）を設定できます。
+
+
+また、新しい <code>getParentProfileInstance()</code> メソッドが返す <code>DevicePolicyManager</code> インスタンスを使用して端末のロックを設定できます。
+
+
+ さらに、新しい <code>setOrganizationColor()</code> メソッドおよび <code>setOrganizationName()</code> メソッドを使用して仕事用プロファイル用のセキュリティ確認画面をカスタマイズすることができます。
+
+
+</p>
+<h3 id="turn_off_work">ワークモードのオフ </h3>
+
+<p>ユーザーは、仕事用プロファイルがある端末でワークモードを切り替えることができます。ワークモードがオフになると、管理されているユーザーが一時的にシャットダウンされ、仕事用プロファイルのアプリ、バックグラウンドでの同期、通知が無効になります。
+
+これには、プロファイル オーナーのアプリが含まれます。
+また、ワークモードがオフになると、仕事用アプリを起動できないことをユーザーに示すステータス アイコンが表示されたままになります。
+ランチャーは、仕事用アプリとウィジェットにアクセスできないことを示します。
+ </p>
+
+<h3 id="always_on_vpn">Always on VPN </h3>
+
+<p>デバイス オーナーとプロファイル オーナーは、指定した VPN を介して仕事用アプリが常時接続するように設定できます。
+端末が起動すると、システムは VPN を自動的に開始します。
+</p>
+
+<p>
+ <code>setAlwaysOnVpnPackage()</code> と <code>getAlwaysOnVpnPackage()</code> は新しい <code>DevicePolicyManager</code> のメソッドです。
+
+
+</p>
+
+<p>システムがアプリの介入なしに VPN サービスを直接バインドするため、Always on VPN の新しいエンドポイントは VPN クライアント側で処理する必要があります。
+以前と同じように、システムへのサービスの通知はインテント フィルタのマッチング アクション <code>android.net.VpnService</code> で行います。
+
+ </p>
+
+<p>
+ プライマリ ユーザーは、<strong>[Settings] > [More] > [Vpn]</strong> から、<code>VPNService</code> のメソッドを実装した Always on VPN クライアントを手動で設定することもできます。
+
+
+</p>
+
+<h3 id="custom_provisioning">カスタマイズされたプロビジョニング</h3>
+
+<p>
+ アプリでは、コーポレート・カラーやロゴを含むプロファイル オーナーとデバイス オーナーのプロビジョニング フローをカスタマイズできます。<code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> はフローカラーをカスタマイズします。<code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code> は、コーポレート ロゴを含むフローをカスタマイズします。
+
+
+
+
+</p>
+
+<h2 id="accessibility_enhancements">ユーザー補助機能の強化</h2>
+
+<p>Android N では、新しい端末のセットアップのオープニング画面に [Vision Settings] が直接表示されます。
+これにより、ユーザーは、ズーム操作、フォントサイズ、ディスプレイ サイズ、TalkBack など、端末のユーザー補助機能を簡単に見つけて設定できるようになっています。
+
+ </p>
+
+<p>このようなユーザー補助機能が目立つ場所に配置されたため、ユーザーがこれらの機能を有効にしてアプリを試用する可能性が高まりました。
+これらの設定を有効にして、アプリを事前にテストするようにしてください。
+これらの設定は、[Settings] > [Accessibility] で有効にできます。
+</p>
+
+<p>Android N では、ユーザー補助機能サービスにより、運動障害のあるユーザーが画面をタップすることを支援できます。
+この新しい API を使用すると、顔追跡、視線追跡、ポイント スキャンなどの機能を備えたサービスを構築して、これらのユーザーのニーズに対応することができます。
+
+</p>
+
+<p>詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>android.accessibilityservice.GestureDescription</code> をご覧ください。
+</p>
+
+
+<h2 id="direct_boot">ダイレクト ブート</h2>
+
+<p>ダイレクト ブートは端末のスタートアップ時間を短縮し、予期しない再起動後でも、登録されたアプリの一部の機能が使用できるようにします。たとえば、ユーザーの就寝中に暗号化された端末が再起動した場合でも、登録したアラーム、メッセージ、電話の着信をユーザーに通常どおり通知することができます。
+
+
+
+また、再起動後にユーザー補助機能サービスをすぐに使用することもできます。
+</p>
+
+<p>ダイレクト ブートでは、Android N のファイルベースの暗号化を活用して、システムとアプリのデータに対してきめ細かい暗号化ポリシーを有効にします。システムは、一部のシステムデータと明示的に登録されたアプリデータに端末暗号化ストアを使用します。
+
+
+デフォルトでは、他のすべてのシステムデータ、ユーザーデータ、アプリ、アプリデータには、認証情報暗号化ストアが使用されます。
+ </p>
+
+<p>システムは起動時に端末暗号化データのみにアクセスできる制限モードになります。この状態では、アプリやデータへの一般的なアクセスは許可されません。このモードで実行する必要のあるコンポーネントがある場合、マニフェストにフラグを設定することでコンポーネントを登録できます。
+
+
+再起動後、システムは、<code>LOCKED_BOOT_COMPLETED</code> インテントをブロードキャストすることにより、登録済みのコンポーネントをアクティベートします。
+
+システムは、ロック解除する前に、登録済みの端末暗号化アプリデータを利用できるようにします。
+他のすべてのデータは、ユーザーがロック画面の認証情報を確認して暗号化を解除するまで利用できません。
+ </p>
+
+詳細については、<a href="{@docRoot}preview/features/direct-boot.html">ダイレクト ブート</a>をご覧ください。</p>
+</p>
+
+
+<h2 id="key_attestation">キーの構成証明</h2>
+
+<p>ハードウェアがサポートするキーストアは、Android 端末で暗号化キーを作成、格納、使用するためのより安全な方法を提供します。
+このキーストアは、Linux カーネル、Android の潜在的な脆弱性、ルート権限を取得された端末からの抽出からキーを保護します。
+
+</p>
+
+<p>ハードウェアがサポートするキーストアの使用をさらに簡単かつ安全にするために、Android N では、キーの構成証明が導入されています。
+アプリや別の端末は、キーの構成証明を使用して RSA または EC キーペアがハードウェアでサポートされているかどうか、キーペアのプロパティはどのようなものか、使用方法や有効性にどのような制限が適用されるかを積極的に確認することができます。
+
+
+ </p>
+
+<p>アプリや別の端末のサービスは、有効な構成証明キーによって署名された X.509 構成証明書を通じて、キーペアについての情報をリクエストできます。
+
+この構成証明キーは、出荷前に端末のハードウェアがサポートするキーストアに挿入される ECDSA 署名キーです。したがって、有効な構成証明キーによって署名される構成証明書により、ハードウェアがサポートするキーストアの存在に加えて、そのキーストアのキーペアの詳細が確認されます。
+
+
+
+</p>
+
+<p>端末が Android の安全な公式ファクトリー イメージを使用していることを確認するために、キーの構成証明では、端末の<a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">ブートローダー</a>が以下の情報を <a class="external-link" href="https://source.android.com/security/trusty/index.html">Trusted Execution Environment（TEE）</a>に提供することが要求されます。
+
+
+</p>
+
+<ul>
+<li>端末にインストールされる OS のバージョンとパッチレベル</li>
+<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">セキュアブート</a>の公開キーとロック ステータス</li>
+ </ul>
+
+<p>ハードウェアがサポートするキーストアの機能の詳細については、<a href="https://source.android.com/security/keystore/" class="external-link">ハードウェアがサポートするキーストア</a>に関するガイドをご覧ください。
+</p>
+
+<p>Android N では、キーの構成証明に加えて、指紋にバインドされたキーが導入されています。このキーは、指紋を登録しても無効になることはありません。
+</p>
+
+<h2 id="network_security_config">ネットワーク セキュリティ構成</h2>
+
+<p>Android N では、エラーが発生しやすいプログラムによる従来の API（X509TrustManager など）ではなく、宣言型のネットワーク セキュリティ構成を使用することにより、コードを変更することなく、セキュアな（HTTPS、TLS）接続の動作をアプリで安全にカスタマイズできます。<em></em>
+
+
+</p>
+
+ <p>以下の機能がサポートされます。</p>
+<ul>
+<li><b>カスタム トラスト アンカー。</b>アプリのセキュアな接続にどの証明機関（CA）を信頼するかをカスタマイズできます。
+たとえば、特定の自己署名証明書や制限された一連の公的 CA を信頼できます。
+
+</li>
+<li><b>デバッグ限定のオーバーライド。</b>アプリのデベロッパーは、インストール ベースに対する追加リスクなしに、アプリのセキュアな接続を安全にデバッグできます。
+
+
+</li>
+<li><b>クリアテキスト トラフィックのオプトアウト。</b>クリアテキスト トラフィックの意図しない使用からアプリを保護できます。
+</li>
+<li><b>証明書のピン留め。</b>アプリのセキュアな接続で信頼するサーバーキーを制限できる高度な機能です。
+</li>
+</ul>
+
+<p>詳細については、<a href="{@docRoot}preview/features/security-config.html">ネットワーク セキュリティ構成</a>をご覧ください。
+</p>
+
+<h2 id="default_trusted_ca">既定の信頼される証明機関</h2>
+
+<p>既定では、Android N 用アプリは、システムが提供する証明書のみを信頼し、ユーザーが追加した証明機関（CA）を信頼しません。
+ユーザーが追加した CA を信頼する必要がある Android N 向けのアプリは、<a href="{@docRoot}preview/features/security-config.html">ネットワーク セキュリティ構成</a>を使用して、ユーザー CA を信頼する方法を指定する必要があります。
+
+
+</p>
+
+<h2 id="apk_signature_v2">APK 署名スキーム v2</h2>
+
+<p>
+ Android N では、APK 署名スキーム v2 というアプリのインストール時間を高速化したり、APK ファイルに無許可の変更が行われないようにしたりする新しいアプリ署名スキームが導入されています。
+
+既定では、Android Studio 2.2 と Gradle 2.2 用の Android プラグインで APK 署名スキーム v2 と従来の署名スキーム（JAR 署名を使用する）の両方を使用してアプリに署名します。
+
+
+</p>
+
+<p>
+ APK 署名スキーム v2 をアプリに適用することをお勧めしますが、この新しいスキームは必須ではありません。
+APK 署名スキーム v2 を使用するときにアプリが正しくビルドされていない場合は、この新しいスキームを無効にできます。
+無効化プロセスにより、Android Studio 2.2 と Gradle 2.2 用の Android プラグインでアプリへの署名に従来の署名スキームのみが使用されるようになります。
+
+従来のスキームのみを使用して署名するには、モジュール レベルの <code>build.gradle</code> ファイルを開き、<code>v2SigningEnabled false</code> という行をリリース用署名構成に追加します。
+
+
+
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>警告:</strong> APK 署名スキーム v2 を使用してアプリに署名し、さらにアプリに変更を加える場合、アプリの署名は無効になります。
+
+そのため、APK 署名スキーム v2 を使用してアプリに署名する場合は、署名後ではなく署名前に <code>zipalign</code> などのツールを使用します。
+
+</p>
+
+<p>
+ 詳細については、Android Studio で<a href="{@docRoot}studio/publish/app-signing.html#release-mode">アプリに署名する</a>方法や、Gradle 用の Android プラグインを使用して<a href="{@docRoot}studio/build/build-variants.html#signing">アプリへの署名用ビルドファイルを構成する</a>方法を説明する Android Studio ドキュメントをご覧ください。
+
+
+
+</p>
+
+<h2 id="scoped_directory_access">特定のディレクトリへのアクセス</h2>
+
+<p>Android N では、アプリで新しい API を使用して、SD カードなどのリムーバブル メディア上のディレクトリといった特定の<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">外部ストレージ</a> ディレクトリへのアクセスをリクエストできるようになりました。
+
+この新しい API は、アプリが <code>Pictures</code> ディレクトリなどの標準の外部ストレージ ディレクトリにアクセスする方法を大幅に簡略化します。
+写真アプリなどのアプリでは、<code>READ_EXTERNAL_STORAGE</code> の代わりに、この API ですべてのストレージ ディレクトリやストレージ アクセス フレームワークにアクセスできるため、ユーザーはそのディレクトリに移動できます。
+
+
+
+</p>
+
+<p>また、この新しい API は、ユーザーがアプリに外部ストレージへのアクセスを付与するステップを簡素化します。
+この新しい API を使用する場合、アプリがどのディレクトリへのアクセス許可を求めているかをわかりやすく説明するシンプルな UI が使用されます。
+
+</p>
+
+<p>詳細については、<a href="{@docRoot}preview/features/scoped-folder-access.html">特定のディレクトリへのアクセス</a>に関するデベロッパー向けドキュメントをご覧ください。
+
+</p>
+
+<h2 id="keyboard_shortcuts_helper">キーボード ショートカット ヘルパー</h2>
+
+<p>
+Android N では、ユーザーは Alt キー + / キーを同時に押して<em>キーボード ショートカット</em>画面をトリガーできます。この画面には、システムとアプリから使用できるすべてのショートカットが表示されます。
+
+これらは使用可能な場合はアプリのメニューから自動的に取得されますが、デベロッパーは独自に微調整したショートカットのリストを画面に表示することもできます。
+
+ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>で説明するように、新しい <code>Activity.onProvideKeyboardShortcuts()</code> メソッドをオーバーライドしてこれを実行することができます。
+
+
+</p>
+
+<p>
+アプリ内のどこででもキーボード ショートカット ヘルパーをトリガーするには、関連アクティビティの {@code Activity.requestKeyboardShortcutsHelper()} を呼び出します。
+
+</p>
+
+<h2 id="sustained_performance_api">パフォーマンス維持 API</h2>
+
+<p>
+長時間実行するアプリではパフォーマンスが大幅に変動する可能性があります。これは、端末のコンポーネントがその温度制限に達するとシステムによりシステムオンチップ エンジンが抑制されるためです。
+
+この変動は、高性能で長時間実行するアプリを作成するアプリのデベロッパーの移動目標となります。
+
+</p>
+
+<p>
+これらの制限に対処するために、Android N には、<em>パフォーマンス維持モード</em>のサポートが含まれており、OEM は長時間実行するアプリに端末のパフォーマンスに関するヒントを提供することができます。
+
+アプリのデベロッパーはこれらのヒントを使用して、長時間にわたる予測可能な一定レベルの端末のパフォーマンスに合わせてアプリを調整できます。
+
+
+</p>
+
+<p>
+アプリのデベロッパーが N Developer Preview でこの新しい API を試すことができるのは、Nexus 6P 端末上でのみです。
+この機能を使用するには、パフォーマンス維持モードで実行するウィンドウにパフォーマンス維持ウィンドウ フラグを設定します。
+
+このフラグは {@code Window.setSustainedPerformanceMode()} メソッドを使用して設定します。
+このウィンドウがフォーカスされていない場合、このモードは自動的に無効になります。
+
+</p>
+
+<h2 id="vr">VR サポート</h2>
+
+<p>
+Android N には、新しい VR モードのためのプラットフォーム サポートと最適化が追加され、デベロッパーは高品質モバイル端末 VR 体験をユーザーのために生み出すことができます。
+多数のパフォーマンス強化があり、VR アプリ用の CPU コアへの排他アクセスが含まれます。アプリでは、VR 用に動作するインテリジェントなヘッド トラッキングやステレオ方式の通知を利用できます。
+
+
+最も重要な点は、Android N によって大幅に遅延の少ないグラフィックが実現される点です。
+Android N 向け VR アプリのビルドの詳細については、<a href="https://developers.google.com/vr/android/">Google VR SDK for Android</a> を参照してください。
+
+</p>
+
+
+<h2 id="print_svc">印刷サービス機能の強化</h2>
+
+<p>
+ Android N では、印刷サービスのデベロッパーが、各プリンターや印刷ジョブに関する追加情報を公開できるようになりました。
+
+</p>
+
+<p>
+ 各プリンターを一覧表示する場合、印刷サービスでは以下の 2 つの方法で各プリンターのアイコンを設定できます。
+
+</p>
+
+<ul>
+ <li><code>PrinterInfo.Builder.setResourceIconId()</code> を呼び出すことにより、リソース ID からアイコンを設定できます
+
+ </li>
+
+ <li><code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code> を呼び出して、<code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code> を使用してアイコンがリクエストされた場合のコールバックを設定することにより、ネットワークからアイコンを表示できます
+
+
+
+ </li>
+</ul>
+
+<p>
+ また、追加情報を表示する各プリンターのアクティビティを提供する場合は、<code>PrinterInfo.Builder.setInfoIntent()</code> を呼び出します。
+
+</p>
+
+<p>
+ 印刷ジョブ通知に印刷ジョブの進捗状況やステータスを表示する場合は、<code>android.printservice.PrintJob.setProgress()</code> と <code>android.printservice.PrintJob.setStatus()</code> をそれぞれ呼び出します。
+
+
+
+</p>
+
+<p>
+ これらのメソッドの詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>をご覧ください。
+</p>
+
+<h2 id="framemetrics_api">FrameMetricsListener API</h2>
+
+<p>
+FrameMetricsListener API を使用すると、アプリでその UI レンダリング パフォーマンスを監視できます。
+この API は、アプリの現在のウィンドウのフレーム タイミング情報を転送するストリーミング Pub / Sub API を公開することにより、この機能を提供します。
+返されるデータは、<code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code> によって表示される内容と同じですが、過去の 120 フレームに制限されません。
+
+</p>
+
+<p>
+FrameMetricsListener を使用すると、USB 接続を使用せずに、本番環境のインタラクション レベルの UI パフォーマンスを計測できます。
+この API により、{@code adb shell dumpsys gfxinfo} を実行するより粒度の高いデータの収集が可能になります。
+
+アプリの特定のインタラクション データを収集できるため、この粒度の高さが可能となります。アプリのパフォーマンス全体の包括的な概要を取得したり、包括的な状態を明確にしたりする必要はありません。
+
+
+この機能を使用して、パフォーマンス データを収集したり、アプリでの実際のユースケースにおける UI パフォーマンスの低下を検出したりすることができます。
+
+
+</p>
+
+<p>
+ウィンドウを監視するには、<code>FrameMetricsListener.onMetricsAvailable()</code> コールバック メソッドを実装して、これを対象のウィンドウに登録します。
+詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の {@code FrameMetricsListener} クラスのドキュメントをご覧ください。
+
+
+</p>
+
+<p>
+この API は {@code FrameMetrics} オブジェクトを提供します。これには、レンダリング サブシステムがフレーム ライフサイクル内のさまざまなマイルストーンで報告するタイミング データが含まれます。サポートされているメトリックは、{@code UNKNOWN_DELAY_DURATION}、{@code INPUT_HANDLING_DURATION}、{@code ANIMATION_DURATION}、{@code LAYOUT_MEASURE_DURATION}、{@code DRAW_DURATION}、{@code SYNC_DURATION}、{@code COMMAND_ISSUE_DURATION}、{@code SWAP_BUFFERS_DURATION}、{@code TOTAL_DURATION}、{@code FIRST_DRAW_FRAME} です。
+
+
+
+
+
+
+</p>
+
+
+<h2 id="virtual_files">仮想ファイル</h2>
+
+<p>
+ 旧バージョンの Android では、アプリはストレージ アクセス フレームワークを使用して、ユーザーが Google ドライブなどのクラウド ストレージ アカウントからファイルを選択できるようにしていました。
+
+ただし、バイトコードの直接表現がなかったファイルを表示する方法はありませんでした。すべてのファイルは入力ストリームの提供が必要でした。
+
+
+</p>
+
+<p>
+ Android N では、ストレージ アクセス フレームワークに<em>仮想ファイル</em>の概念が追加されています。
+仮想ファイル機能を使用すると、バイトコードの直接表現がなくても、{@link android.content.Intent#ACTION_VIEW} インテントで使用できるドキュメント URI を {@link android.provider.DocumentsProvider} で返すことができます。
+
+
+また、Android N では、ユーザー ファイル（仮想またはそれ以外）に別の形式を提供できます。
+
+</p>
+
+<p>
+ アプリで仮想ドキュメントの URI を取得するには、{@link android.content.Intent} を作成してからファイル ピッカーの UI を開きます。
+アプリでは {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()} メソッドを使用して仮想ファイルを直接開くことができないため、{@link android.content.Intent#CATEGORY_OPENABLE} カテゴリが含まれている場合はどの仮想ファイルも受信されません。
+
+
+
+
+</p>
+
+<p>
+ ユーザーが選択した後で、{@link android.app.Activity#onActivityResult onActivityResult()} メソッドが呼び出されます。
+
+ 以下のコード スニペットに示すように、アプリは仮想ファイルの URI と入力ストリームを取得できます。
+
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ ユーザー ファイルへのアクセスの詳細については、<a href="{@docRoot}guide/topics/providers/document-provider.html">ストレージ アクセス フレームワークのガイド</a>をご覧ください。
+
+
+</p>
diff --git a/docs/html-intl/intl/ja/preview/index.jd b/docs/html-intl/intl/ja/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/ja/preview/index.jd
rename to docs/html-intl/intl/ja/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/ja/design/patterns/notifications.jd b/docs/html-intl/intl/ja/design/patterns/notifications.jd
deleted file mode 100644
index 8c5b6ba..0000000
--- a/docs/html-intl/intl/ja/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=通知
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>デベロッパー文書</h3>
- <p>ユーザーに通知する</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Android 4.4 以前での通知</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>ビデオ</h3>
- <p>DevBytes:Notifications in the Android L Developer Preview</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>通知システムを使用すると、ユーザーは友人からの新しいチャット メッセージやカレンダー イベントなど、自分に関係のあるタイムリーなイベントについてアプリで常に通知を受けることができます。通知は、重要な出来事が起こるとすぐに知らせてくれるニュース チャンネルであり、ユーザーが意識していない間に出来事を時系列的に記録するログであると捉えることができます — さらに、すべての Android 端末で適宜同期されます。
-
-
-
-
-
-</p>
-
-<h4 id="New"><strong>Android 5.0 での新機能</strong></h4>
-
-<p>Android 5.0 において、通知は構造的に、視覚的に、機能的に重要なアップデートを受信します。
-</p>
-
-<ul>
- <li>通知は、新しいマテリアル デザインのテーマにあわせて外観が変更されているところす。
-</li>
- <li> 端末のロック画面で通知を利用できるようになりましたが、機密性の高いコンテンツはこれからも非表示にできます。
-
-</li>
- <li>端末の使用中に受信した高優先度の通知において、ヘッドアップ通知と呼ばれる新しい形式が使用されるようになりました。
-</li>
- <li>クラウド同期通知: 所有する Android 端末のどれかで通知を却下すると、他でも却下されます。
-
-</li>
-</ul>
-
-<p class="note"><strong>注</strong>: このバージョンの Android での通知設計は、従来のバージョンから大きく変わっています。
-
-これまでのバージョンの通知設計について詳しくは、<a href="./notifications_k.html">Android 4.4 以前での通知</a>をご覧ください。
-</p>
-
-<h2 id="Anatomy">通知の仕組み</h2>
-
-<p>このセクションでは、通知の基本パーツと各種端末における通知の表示について詳しく説明します。
-</p>
-
-<h3 id="BaseLayout">基本レイアウト</h3>
-
-<p>あらゆる通知の最低限の基本レイアウトは次のようになっています。</p>
-
-<ul>
- <li> 通知の<strong>アイコン</strong>。このアイコンは通知元のアプリを示します。複数タイプの通知を生成するアプリでは、通知のタイプを示すことがあります。
-
-
-</li>
- <li> 通知の<strong>タイトル</strong>と追加<strong>テキストメッセージ</strong>。
-</li>
- <li> <strong>タイムスタンプ</strong>。</li>
-</ul>
-
-<p>従来のプラットフォーム バージョンの {@link android.app.Notification.Builder Notification.Builder} で作成された通知は、Android 5.0 でも同じように表示され、機能します。スタイルにいくらかの違いがありますが、システムが対処します。
-
-
-従来のバージョンの Android での通知について詳しくは、<a href="./notifications_k.html">Android 4.4 以前での通知</a>をご覧ください。
-
-</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- ユーザー フォトと通知アイコンを使用した、携帯端末での通知（左）と Wear での同じ通知（右）
-
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">展開レイアウト</h3>
-
-
-<p>通知にどこまでの詳細を表示するかを選択できます。
-メッセージの最初の数行を表示したり、大きな画像プレビューを表示したりできます。
-追加情報はユーザーにより多くのコンテキストを提供し、—場合によっては—メッセージ全体が表示されることもあります。
-
-
-ユーザーは、ピンチ ズームまたは 1 本指のスワイプで、コンパクトなレイアウトと展開されたレイアウトを切り替えることができます。
-
-
- 1 つのイベントに関する通知に対し、Android では 3 種類の展開レイアウト（テキスト、受信トレイ、画像）をアプリケーションで使用できるようにしています。
-
-次の図に、1 つのイベントに関する通知が携帯端末（左）とウェアラブル（右）でどのように見えるかを示します。
-
-</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">アクション</h3>
-
-<p>Android では、通知の最下部に表示されるオプションのアクションをサポートしています。ここに示されるアクションを使用することで、ユーザーは特定の通知に対するほとんどの一般的なタスクを通知シェードで処理でき、通知元のアプリケーションを開く必要はありません。これによりやり取りがスピードアップし、スワイプで却下もできることから、ユーザーは自分に関係のある通知に集中しやすくなります。
-
-
-
-
-
-</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">通知に含めるアクションの数はほどほどに抑えることをお勧めします。
-含めるアクションを増やすほど、わかりにくくなるからです。
-もっとも差し迫った意味のある重要なアクションだけにして、アクションの数を最小限に抑えてください。
-
-
-</p>
-
-<p>通知に対するアクションとして好ましい候補は次のとおりです。</p>
-
-<ul>
- <li> 表示するコンテンツ タイプに欠かせず、よく使われ、典型的である
-
- <li> ユーザーがタスクを手早く完了できる
-</ul>
-
-<p>次のようなアクションは避けてください。</p>
-
-<ul>
- <li> あいまいである
- <li> 通知のデフォルト アクションと同じである（「読む」や「開く」など）
-
-</ul>
-
-
-
-<p>アクションは 3 つまで指定でき、それぞれにアクションのアイコンと名前が付きます。
-
- シンプルな基本レイアウトにアクションを追加すると、展開レイアウトがない場合でも、通知は展開可能になります。
-
-アクションは展開可能な通知にのみ表示され、それ以外では非表示になることから、ユーザーが通知から起動できるどのアクションについても、関連アプリケーションからも利用できるようにしてください。
-
-
-
-
-</p>
-
-<h2 style="clear:left">ヘッドアップ通知</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- イマーシブ アプリの最上部に表示されたヘッドアップ通知の例（電話の着信、高優先度）
-
-
- </p>
-</div>
-
-<p>優先度の高い通知が作成されると（右図）、その展開レイアウトが可能なアクションとともに短時間表示されます。
-
-</p>
-<p> この時間が過ぎると、通知は通知シェードに戻ります。
-通知の<a href="#correctly_set_and_manage_notification_priority">優先度</a>を示すフラグが高、最大、全画面の場合は、ヘッドアップ通知になります。
-</p>
-
-<p><b>ヘッドアップ通知にふさわしい例</b></p>
-
-<ul>
- <li> 端末使用中の電話の着信</li>
- <li> 端末使用中のアラーム</li>
- <li> 新しい SMS メッセージ</li>
- <li> 低バッテリ残量</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">ガイドライン</h2>
-
-
-<h3 id="MakeItPersonal">パーソナルにする</h3>
-
-<p>他人から送信されたアイテム（メッセージ、ステータス アップデートなど）の通知には、{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()} を使用して相手の画像を含めます。
-
-また、通知のメタデータに相手に関する情報を添付します（{@link android.app.Notification#EXTRA_PEOPLE} を参照）。
-</p>
-
-<p>通知のメインアイコンは表示され続けるため、ユーザーはそれをステータスバーに表示されるアイコンと関連付けることができます。
-
-</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- 通知をトリガーした人と送信内容が表示された通知。
-</p>
-
-
-<h3 id="navigate_to_the_right_place">適切な画面へのナビゲーション</h3>
-
-<p>ユーザーが通知の本体（アクション ボタン以外）をタップしたら、アプリが開き、通知に表示されているデータの表示や操作ができる画面へ移動するようにします。
-
-
-ほとんどの場合、移動先はメッセージのような 1 つのデータアイテムの詳細表示になりますが、通知がスタックされている場合は概要ビューにすることも考えられます。
-
-アプリがユーザーをアプリの最上位レベルより下のどこかに移動する場合は、アプリのバックスタックにナビゲーションを挿入して、ユーザーがシステムの Back ボタンを押すと最上位レベルに戻れるようにします。
-
-詳しくは、<a href="{@docRoot}design/patterns/navigation.html#into-your-app">ナビゲーション</a>デザイン パターンの<em>ホーム画面ウィジェットと通知を経由するアプリへのナビゲーション</em>をご覧ください。
-
-</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">通知優先度の適切な設定と管理
-
-</h3>
-
-<p>Android では、通知用の優先度フラグをサポートしています。このフラグを使用すると、通知の表示位置に他の通知との相対関係として影響を及ぼして、ユーザーが常に最重要の通知を真っ先に目にするようにできます。
-
-
-通知を投稿する際には、優先度を次の中から選べます。
-
-</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>優先度</strong></p>
-</td>
- <td class="tab0">
-<p><strong>用途</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>重大で切迫した通知に対して使用します。緊急を要する状況、または特定のタスクを続ける前に解決する必要がある状況であることをユーザーに通告します。
-
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>主に重要な情報に対して使用します。ユーザーが特に関心を持ちそうなメッセージ イベントやチャット イベントなどが該当します。通知の優先度を高く設定すると、ヘッドアップ通知を表示できます。
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>ここで説明している他の優先度のどれにも該当しないすべての通知に対して使用します。</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>ユーザーに知らせたいがそれほど緊急ではない通知に対して使用します。
-低優先度の通知は一般にリストの末尾に表示され、公の、または間接的なソーシャル アップデートなどに適しています。
-
-ユーザーがこうした通知の設定をしていても、急を要するコミュニケーションや直接的なコミュニケーションより優先されないようにする必要があります。
-
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>天気予報や周辺位置情報のようなコンテキスト的またはバックグラウンド的な情報に対して使用します。最小優先度の通知はステータスバーに表示されません。
-
-ユーザーは通知シェードを展開したときにその存在に気づきます。
-</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>適切な優先度の選び方</strong>
-
-</h4>
-
-<p><code>DEFAULT</code>、<code>HIGH</code>、<code>MAX</code> は中断を伴う優先度レベルで、ユーザーによるアクティビティに割り込むリスクがあります。
-
-アプリのユーザーに不快に思われないようにするため、割り込みを伴う優先度レベルの通知は次のような場合に限定してください。
-</p>
-
-<ul>
- <li> 他人が絡む</li>
- <li> 急を要する</li>
- <li> 実世界におけるユーザーの行動が直ちに変わりうる</li>
-</ul>
-
-<p><code>LOW</code> や <code>MIN</code> に設定されている通知も、ユーザーにとって価値がある可能性はあります。
-ほとんどとは言わないまでも、多くの通知は、ユーザーの注意を直ちに引く、またはユーザーの手首に振動を与える必要はありませんが、ユーザーがその通知を見ることにしたときに価値があると気づくような情報が含まれている必要があります。
-
-
-優先度が <code>LOW</code> や <code>MIN</code> の通知の条件は以下のとおりです。
-</p>
-
-<ul>
- <li> 他人が絡まない</li>
- <li> 急を要さない</li>
- <li> ユーザーが興味を持ちうる内容が含まれているが、手が空いたときに参照することにして問題ない
-</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">通知カテゴリの設定
-</h3>
-
-<p>通知が、あらかじめ定義されているカテゴリ（下を参照）のどれかに該当する場合は、それに沿って割り当てます。
-
-通知シェード（やその他の通知リスナー）などの各種システム UI は、評価やフィルタリングの判断にこの情報を使用することがあります。
-
-</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>電話（ビデオまたは音声）の着信またはそれに類する同期通信の要求
-</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>直接メッセージ（SMS、インスタントメッセージなど）の受信</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>非同期バルク メッセージ（メール）</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>カレンダー イベント</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>販促または広告</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>アラームまたはタイマー</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>長時間実行のバックグラウンド処理の進捗</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>ソーシャル ネットワークまたは共有アップデート</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>バックグラウンド処理または認証ステータスにおけるエラー</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>再生のためのメディア転送コントロール</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>システムまたは端末のステータス アップデート。システム用に予約済み。</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>バックグラウンド サービス実行中の表示。</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>1 つの事項に対する具体的でタイムリーな推奨。たとえば、ニュースアプリがユーザーが次に読みたいのではないかと予想した記事を推奨するなど。
-
-</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>端末やコンテキスト ステータスに関する進行中情報。</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">通知の概要</h3>
-
-<p>アプリで特定の新しい通知を送信しようとしたときに同じタイプの通知が既に保留されていた場合は、それらを統合してそのアプリに対する 1 つの概要通知にします。新しいオブジェクトは作成しないでください。
-
-</p>
-
-<p>概要通知は概要説明を作成し、特定タイプの通知がいくつ保留になっているのかがユーザーにわかるようにします。
-
-</p>
-
-<div class="col-6">
-
-<p><strong>非推奨</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>推奨</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">概要を構成している個々の通知に関する詳細は、展開ダイジェスト レイアウトを使用して提示できます。
-
-このアプローチにより、ユーザーはどの通知が保留中か、そして関連アプリで詳しく読もうと思うほどそれらに興味があるかを把握しやすくなります。
-
-
-
-</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- 通知の展開された概要と折りたたまれた概要（<code>InboxStyle</code> を使用）
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">通知をオプションにする
-</h3>
-
-<p>ユーザーは常に通知を制御できる必要があります。アプリケーションの設定に通知設定アイテムを追加して、ユーザーがアプリの通知を無効にしたり、警告音や振動を使用するかどうかなどのアラート設定を変更したりできるようにしてください。
-
-
-
-</p>
-
-<h3 id="use_distinct_icons">見分けやすいアイコンにする</h3>
-<p>現在保留になっているのがどのタイプの通知なのか、ユーザーが通知エリアを一目で見分けられることが必要です。
-
-</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>推奨</strong></p>
- <p>Android アプリが既に提供している通知アイコンを見ながら、独自アプリ用に見かけの十分異なるアイコンを作成する。
-
-</p>
-
- <p><strong>推奨</strong></p>
- <p>小さなアイコン用の適切な<a href="/design/style/iconography.html#notification">通知アイコン スタイル</a>と、アクション アイコン用の Material Light <a href="/design/style/iconography.html#action-bar">アクションバー アイコンスタイル</a>を使う。
-
-
-
-</p>
-<p ><strong>推奨</strong></p>
-<p >アイコンの見た目はシンプルに保ち、細かくしすぎて見にくくならないようにする。
-</p>
-
- <div><p><strong>非推奨</strong></p>
- <p>なんらかの追加アルファ（暗転やフェード）を小さなアイコンやアクション アイコンに配置する。エッジはアンチ エイリアス処理できますが、Android ではこれらのアイコンをマークとして使用するため（つまり、アルファ チャンネルのみ使用）、画像は概して完全不透明で描画されます。
-
-
-
-
-</p>
-
-</div>
-<p style="clear:both"><strong>非推奨</strong></p>
-
-<p>アプリを他と色で区別する。通知アイコンは、背景が透明な白に限定してください。
-</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">通知 LED を適切に点灯させる
-</h3>
-
-<p>多くの Android 端末には通知 LED が用意されており、スクリーンがオフのときでもユーザーに引き続きイベントを通知するために使用されます。
-
-優先度が <code>MAX</code>、<code>HIGH</code>、<code>DEFAULT</code> の通知を LED 点灯するようにし、優先度の低い通知（<code>LOW</code> と <code>MIN</code>）は点灯しないようにしてください。
-
-
-</p>
-
-<p>ユーザーによる通知の制御が LED にも及ぶようにしてください。DEFAULT_LIGHTS を使用すると、LED が白く点灯します。
-
-ユーザーが明示的にカスタマイズしない限り、通知では別の色を使用しないでください。
-
-</p>
-
-<h2 id="building_notifications_that_users_care_about">ユーザーが気にする通知の作成
-</h2>
-
-<p>ユーザーに愛されるアプリを開発するためには、通知を入念にデザインすることが重要です。通知はアプリの声を体現するものであり、アプリの個性の一部です。
-
-
-望まれない通知や重要ではない通知がユーザーの邪魔になったり、アプリへの注目を集める意図が逆にユーザーに不快に思われたりしかねませんので、通知は適切に使用してください。
-
-
-</p>
-
-<h3 id="when_to_display_a_notification">通知を表示すべきケース</h3>
-
-<p>ユーザーが楽しんで使えるアプリケーションを開発するには、ユーザーの注目や関心は保護すべきリソースであるという認識が重要です。
-
-Android の通知システムは、ユーザーの注意に対する通知のインパクトを最小限に抑える設計になっていますが、通知がユーザーのタスクフローに割り込むという事実を意識することがやはり重要です。通知を盛り込む予定の場合は、それが割り込みに値するほど重要かどうかを自問してください。
-
-
-
-
-
-
-確信が持てない場合は、ユーザーがアプリの通知設定を使用して通知をコントロールできるようにするか、通知のフラグを <code>LOW</code> か <code>MIN</code> に設定してユーザーがしている別のことを邪魔しないようにします。
-
-
-
-</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- 急を要する通知の例
- </p>
-
-<p>概して、適切に振る舞うアプリは話しかけられたときだけ口を開きますが、求められていない通知でユーザーの作業に割り込むことにメリットがあるケースもいくつか存在します。
-</p>
-
-<p>通知は主に<strong>急を要するイベント</strong>で、特に<strong>他人が絡む</strong>同期イベントで使用します。
-たとえば、受信チャットはリアルタイムの同期コミュニケーションです。
-
-他人が応答を能動的に待っています。
-カレンダー イベントも、通知でユーザーの注目を引くタイミングに関する好例です。なぜなら、そうしたイベントは差し迫っており、往々にして他人が絡みます。
-
-
-</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">通知を表示すべきでないケース
-</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>以上を除く多くの場合、通知の使用は適切ではありません。</p>
-
-<ul>
- <li> 明示的にユーザー宛てではない情報や、それほど急を要さない情報は、ユーザーへの通知を避けます。
-
-たとえば、ソーシャル ネットワーク経由で流れてくる非同期の間接的なアップデートは、概してリアルタイムの割り込みにふさわしくありません。
-
-
-それらに本当に関心のあるユーザーが選択できるようにします。
-</li>
- <li> 関連する新しい情報が現在画面に表示されている場合は、通知を作成しないようにします。
-その代わり、アプリケーションそのものの UI を使用して、ユーザーに情報をコンテキスト内で直接通知します。
-
-
- たとえば、チャット アプリケーションは、ユーザーが他のユーザーとチャットしている最中にシステム通知を作成しないようにします。
-</li>
- <li> 情報の保存や同期、アプリケーションのアップデートなど、低レベルの技術的な通知については、アプリやシステムがユーザーの介入なしに問題を解決できる場合は割り込まないようにします。
-
-</li>
- <li> アプリケーションがユーザーの介入なしにエラーから復旧できる場合は、そのようなエラーの通知で割り込まないでください。
-
-</li>
- <li> 通知にふさわしい内容がなく、アプリを宣伝するだけの通知は、作成しないようにします。通知は、有益でタイムリーな新しい情報を提供するものであり、アプリを起動するためだけには使用しないでください。
-
-
-
-</li>
- <li> ブランドをユーザーの目の前に提示するだけの表面的な通知を作成しないようにします。
-
- そうした通知はユーザーにフラストレーションを与え、アプリが使われなくなります。アップデートされた情報を少しだけ提供し、ユーザーをアプリにつなぎ止める最適な方法は、ホームスクリーンに配置できるウィジェットを開発することです。
-
-
-
-
-</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">通知の操作
-</h2>
-
-<p>通知はステータスバーにアイコンとして示され、通知ドロワーを開いてアクセスできます。
-
-</p>
-
-<p>通知をタップすると関連アプリが開き、その通知に対応する詳細なコンテンツに移動します。通知上で左か右にスワイプされた通知は、ドロワーから削除されます。
-
-</p>
-
-<h3 id="ongoing_notifications">進行中通知</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- 音楽再生の進行中通知
- </p>
-</div>
-<p>進行中通知は、バックグラウンドで進行中の処理に関する情報をユーザーに伝えます。たとえば、音楽プレイヤーは通知システムで現在再生中のトラックを示し、ユーザーが再生を停止するまで通知を継続します。
-
-
-
-進行中通知には、ファイルのダウンロードやビデオのエンコードなど、時間のかかるタスクに対するフィードバックをユーザーに示すこともできます。
-
-ユーザーは、進行中通知を通知ドロワーから手動では削除できません。
-</p>
-
-<h3 id="ongoing_notifications">メディア再生</h3>
-<p>Android 5.0 では、廃止された {@link android.media.RemoteControlClient} クラスの転送コントロールがロック画面に表示されません。
-ただし、通知が表示されるため、<em></em>ユーザーがロック状態から再生をコントロールするための主な手段は、現状では各アプリの再生通知です。
-
-この動作により、アプリは表示するボタンとその表示形態についてより多くをコントロールでき、画面がロックされているかどうかによらない一貫した操作感をユーザーに提供できます。
-
-
-</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">ダイアログとトースト
-</h3>
-
-<p>アプリが画面上に表示されていないときにダイアログやトーストを作成しないようにしてください。
-ダイアログやトーストの表示は、アプリでのアクションに対するユーザーへの即座の応答のみにします。ダイアログやトーストの使用の目安については、<a href="/design/patterns/confirming-acknowledging.html">確認と通知</a>をご覧ください。
-
-
-
-</p>
-
-<h3>評価と並べ替え</h3>
-
-<p>通知はニュースであるため、基本的には新しい順に表示され、アプリが通知に指定した<a href="#correctly_set_and_manage_notification_priority">優先度</a>に基づき特別な配慮がなされます。
-
-
-</p>
-
-<p>通知はロック画面の重要な一部であり、端末のディスプレイがオンになるたび前面に出ます。
-
-ロック画面のスペースは限られているため、もっとも緊急か重要な通知を識別することが何より重要になります。
-
-この理由から、Android では洗練された通知並べ替えアルゴリズムを採用しており、その中で以下を考慮しています。
-
-</p>
-
-<ul>
- <li> タイムスタンプと、アプリが指定した優先度。</li>
- <li> その通知が最近ユーザーに音または振動で配信されたかどうか。
-（つまり、電話が音を立てるだけの場合、ユーザーが「何が起こったのか」を知りたくなったら、ロック画面はそれに一目でわかる答えを示すべきです）。
-
-
-</li>
- <li> {@link android.app.Notification#EXTRA_PEOPLE} を使用して通知に添付された人、特にその人が「お気に入り」の連絡先かどうか。
-</li>
-</ul>
-
-<p>この並べ替え機能を最大限に生かすには、リストにおける特定の位置付けを狙うのではなく、ユーザーの操作感に注目します。
-
-</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Gmail 通知の優先度はデフォルトであり、そのため Hangouts などのインスタントメッセージ アプリからのメッセージの下に並びますが、新しいメッセージが来たときは一時的にそれより先に表示されます。
-
-
-
-
- </p>
-
-
-<h3>ロック画面上</h3>
-
-<p>通知はロック画面に表示されるため、ユーザーのプライバシーはとりわけ重要な考慮対象です。
-
-通知には機密性の高い情報が含まれることが多く、端末を手に取ってディスプレイをオンにした誰にでも見られるようにすべきではありません。
-
-</p>
-
-<ul>
- <li> セキュリティ保護されたロック画面（PIN、パターン、パスワードなど）を持つ端末の場合、インターフェースには公開部分と秘密部分があります。
-公開インターフェースはセキュリティ保護されたロック画面に表示でき、誰でも見られます。
-秘密インターフェースはロック画面の背後にある世界で、ユーザーが端末にサインインして初めて表示されます。
-</li>
-</ul>
-
-<h3>セキュリティ保護されたロック画面に表示される情報のユーザー コントロール</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- ロック画面上の通知。コンテンツはユーザーが端末をロック解除した後に表示されます。
- </p>
-</div>
-
-<p>セキュリティ保護されたロック画面をセットアップする際、ユーザーはセキュリティ保護されたロック画面には表示しない機密性の高い情報を選ぶことができます。
-その場合、システム UI は通知の<em>可視性レベル</em>を考慮して、表示しても問題ない情報を識別します。
-
-</p>
-<p> 可視性レベルをコントロールするには、<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code> を呼び出し、次の値のどれかを指定します。
-
-</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>。通知の内容がすべて表示されます。
-
- 可視性レベルが指定されていない場合は、これがシステム デフォルトです。</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>。ロック画面に、その通知の存在に関する基本情報、たとえば通知のアイコンやそれを提示したアプリ名などを表示します。
-
-通知のその他の詳細は表示されません。いくつか留意すべき点があります。
-
- <ul>
- <li> システムがセキュリティ保護されたロック画面に表示するためとして公開バージョンの通知を別に提供する場合は、<code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code> フィールドに代替 Notification オブジェクトを用意します。
-
-
-
- <li> この設定により、アプリは利便性はあるが個人情報は明かさない編集されたバージョンのコンテンツを作成できるようになります。
-SMS アプリを例に考えて見ましょう。通知には SMS のテキストメッセージ、送信者の名前、連絡先アイコンが含まれています。この通知は <code>VISIBILITY_PRIVATE</code> であるべきですが、<code>publicVersion</code> にも "3 件の新しいメッセージ" のような個人を特定する詳細なしでも利便性のある情報を盛り込めます。
-
-
-
-
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>。必要最小限の情報のみ表示し、通知のアイコンさえありません。
-</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Android Wear での通知
-</h2>
-
-<p>通知とそのアクション<em></em>は、デフォルトで Wear 端末にブリッジされます。デベロッパーは、どの通知が電話から腕時計へ、またはその逆へブリッジするかを制御できます。
-
-
-また、どのアクションがブリッジするかも制御できます。タップ 1 回では完了しないアクションがアプリに含まれている場合は、そうしたアクションを Wear 通知では隠すか Wear アプリに接続することを検討してください。いずれにしても、ユーザーがアクションを腕時計で完了できるようにします。
-
-
-
-
-
-</p>
-
-<h4>通知とアクションのブリッジ</h4>
-
-<p>電話のような接続状態の端末は、通知を Wear 端末にブリッジして、通知が腕時計に表示されるようにできます。
-同様に、アクションもブリッジして、ユーザーが通知に Wear 端末で直接対処できるようにできます。
-</p>
-
-<p><strong>ブリッジする</strong></p>
-
-<ul>
- <li> 新しいインスタントメッセージ</li>
- <li> +1、いいね、心拍数のようなタップ 1 回のアクション</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>ブリッジしない</strong></p>
-
-<ul>
- <li> 新着ポッドキャストの通知</li>
- <li> 腕時計ではできない機能にマップされたアクション</li>
-</ul>
-
-
-
-<p><h4>Wear 専用に定義されたアクション</h4></p>
-
-<p>Wear でのみできるアクションがいくつかあります。次に例を挙げます。</p>
-
-<ul>
- <li> 「Be right back」 のような定形応答のクイックリスト</li>
- <li> 携帯電話で開く</li>
- <li> 音声入力画面を起動する 「Comment」 アクションや 「Reply」 アクション</li>
- <li> Wear 専用アプリを起動するアクション</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/about.jd b/docs/html-intl/intl/ja/distribute/googleplay/about.jd
index 56eaf2c..6a58cf6 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/about.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/about.jd
@@ -6,7 +6,7 @@
@jd:body
-<div id="qv-wrapper">
+<div id="qv-wrapper">
<div id="qv">
<h2>Google Play について</h2>
<ol style="list-style-type:none;">
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/auto.jd b/docs/html-intl/intl/ja/distribute/googleplay/auto.jd
index 0cbf8b1..bc5a01f 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/auto.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/auto.jd
@@ -160,4 +160,4 @@
data-query="collection:autolanding"
data-cardSizes="9x6, 6x3x2"
data-maxResults="6">
- </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/developer-console.jd b/docs/html-intl/intl/ja/distribute/googleplay/developer-console.jd
index 8dd562d..29e4145 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/developer-console.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/developer-console.jd
@@ -5,7 +5,7 @@
@jd:body
-<div id="qv-wrapper">
+<div id="qv-wrapper">
<div id="qv">
<h2>公開機能</h2>
<ol>
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/families/about.jd b/docs/html-intl/intl/ja/distribute/googleplay/families/about.jd
index 53258de..54c4f34 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/families/about.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/families/about.jd
@@ -36,4 +36,4 @@
<div class="paging-links" style="padding-top:.75em;">
<a href="{@docRoot}distribute/googleplay/families/start.html" class="next-class-link">次のトピック:オプトイン</a>
-</div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/families/faq.jd b/docs/html-intl/intl/ja/distribute/googleplay/families/faq.jd
index 206429c..da877f9 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/families/faq.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>本書の内容</h2>
@@ -106,7 +106,7 @@
</dt>
<dd>
- Designed for Families プログラムにオプトインすると、Google Play はアプリを審査し、ファミリー層に適切かどうか確認します。アプリがすべてのプログラム要件に準拠している場合、公開までの時間は通常よりも長くかかることはないはずです。ただし、Designed for Families 審査で却下された場合、アプリの公開が遅れる可能性があります。
+ Designed for Families プログラムにオプトインすると、Google Play はアプリを審査し、ファミリー層に適切かどうか確認します。アプリがすべてのプログラム要件に準拠している場合、公開までの時間は通常よりも長くかかることはないはずです。ただし、Designed for Families 審査で却下された場合、アプリの公開が遅れる可能性があります。
</dd>
<dt>
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/families/start.jd b/docs/html-intl/intl/ja/distribute/googleplay/families/start.jd
index e8e9ee5..023e2c1 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/families/start.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/families/start.jd
@@ -51,7 +51,7 @@
</p>
<p class="note">
- <strong>注:</strong> Designed for Families プログラムで公開されたアプリは Google Play ですべてのユーザーも利用できます。
+ <strong>注:</strong> Designed for Families プログラムで公開されたアプリは Google Play ですべてのユーザーも利用できます。
</p>
<p>
@@ -67,4 +67,4 @@
<div class="paging-links" style="padding-top:.75em;">
<a href="{@docRoot}distribute/googleplay/families/faq.html" class="next-class-link">次のトピック:よくある質問</a>
-</div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/guide.jd b/docs/html-intl/intl/ja/distribute/googleplay/guide.jd
index 137c63f..1655017 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/guide.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/guide.jd
@@ -54,4 +54,4 @@
data-query="collection:play_dev_guide"
data-cardSizes="9x6"
data-maxResults="1">
- </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/quality/auto.jd b/docs/html-intl/intl/ja/distribute/googleplay/quality/auto.jd
index eda7297..2870153 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/quality/auto.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/quality/auto.jd
@@ -431,4 +431,4 @@
<p class="caution">
<strong>重要: </strong>この制限のため、Auto サポートのプロトタイプの作成に、実働 APK を使用してはなりません。
-</p>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/quality/core.jd b/docs/html-intl/intl/ja/distribute/googleplay/quality/core.jd
index 5229aa7..ddf4115 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/quality/core.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/quality/core.jd
@@ -13,7 +13,7 @@
<li><a href="#listing">Google Play</a></li>
</ol>
-
+
<h2>テスト</h2>
<ol>
<li><a href="#test-environment">テスト環境の設定</a></li>
@@ -25,7 +25,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">タブレットのアプリ品質</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">アプリを最適化する</a></li>
</ol>
-
+
</div>
</div>
@@ -70,7 +70,7 @@
<th style="width:54px;">
ID
</th>
-
+
<th>
説明
@@ -1011,4 +1011,4 @@
<p>
{@link android.os.StrictMode.ThreadPolicy.Builder#penaltyFlashScreen() penaltyFlashScreen()} を使用して<code>ThreadPolicy</code> に対するポリシー違反の<strong>視覚通知</strong>を有効にします。
-</p>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/quality/tablets.jd b/docs/html-intl/intl/ja/distribute/googleplay/quality/tablets.jd
index f0cc133..dbdabc2 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/quality/tablets.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/quality/tablets.jd
@@ -46,7 +46,7 @@
<div class="headerLine"><h2 id="core-app-quality">1.タブレット アプリの基本的な品質テスト</h2></div>
-<p>タブレット アプリの優れたエクスペリエンスを提供する最初のステップは、アプリがターゲットとしているすべてのデバイスとフォーム ファクタに対して、<em>アプリの中核品質基準</em>に適合していることを確認することです。詳細については、<a href="{@docRoot}distribute/essentials/quality/core.html">アプリの中核品質に関するガイドライン</a>を参照してください。
+<p>タブレット アプリの優れたエクスペリエンスを提供する最初のステップは、アプリがターゲットとしているすべてのデバイスとフォーム ファクタに対して、<em>アプリの中核品質基準</em>に適合していることを確認することです。詳細については、<a href="{@docRoot}distribute/essentials/quality/core.html">アプリの中核品質に関するガイドライン</a>を参照してください。
</p>
<p>
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/quality/wear.jd b/docs/html-intl/intl/ja/distribute/googleplay/quality/wear.jd
index 9fa4439..1d92d8c 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/quality/wear.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/quality/wear.jd
@@ -395,4 +395,4 @@
</p>
<p>
はい。上記の要件は、アプリが Google Play で Android Wear アプリとして識別され、Android Wear ユーザーが発見しやすくなるかどうかのみを判断するものです。アプリが Wear アプリとして承認されなくても、電話やタブレットなどの他のデバイス タイプで利用可能です。ウェアラブル端末へのインストールも可能です。
-</p>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/start.jd b/docs/html-intl/intl/ja/distribute/googleplay/start.jd
index 3c5e548..93aee13 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/start.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/start.jd
@@ -134,4 +134,4 @@
data-query="collection:distribute/googleplay/gettingstarted"
data-sortOrder="-timestamp"
data-cardSizes="9x3"
- data-maxResults="6"></div>
\ No newline at end of file
+ data-maxResults="6"></div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/tv.jd b/docs/html-intl/intl/ja/distribute/googleplay/tv.jd
index 1a7558d..9532bf4 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/tv.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/tv.jd
@@ -173,7 +173,7 @@
<h3 id="track_review">5.審査と承認をトラッキングする</h3>
<p>
- アプリが上述の Android TV 向けの技術上の基準と品質基準に適合すると、ユーザーはそのアプリを Android TV で活用できるようになります。アプリが基準を満たしていない場合、<strong>デベロッパー アカウント アドレスに送られた通知メール</strong>を受け取ります。このメールには対処が必要な領域の要約が記載されています。必要な調整を行ったら、デベロッパー コンソールにアプリの新規バージョンをアップロードできます。
+ アプリが上述の Android TV 向けの技術上の基準と品質基準に適合すると、ユーザーはそのアプリを Android TV で活用できるようになります。アプリが基準を満たしていない場合、<strong>デベロッパー アカウント アドレスに送られた通知メール</strong>を受け取ります。このメールには対処が必要な領域の要約が記載されています。必要な調整を行ったら、デベロッパー コンソールにアプリの新規バージョンをアップロードできます。
</p>
<p>
@@ -190,7 +190,7 @@
</li>
<li>
- <em>承認</em> — アプリが審査され、承認されました。アプリは Android TV ユーザーが直接利用できるようになります。
+ <em>承認</em> — アプリが審査され、承認されました。アプリは Android TV ユーザーが直接利用できるようになります。
</li>
<li>
@@ -207,4 +207,4 @@
data-query="collection:tvlanding"
data-cardSizes="9x6, 6x3x2"
data-maxResults="6">
- </div>
+ </div>
diff --git a/docs/html-intl/intl/ja/distribute/googleplay/wear.jd b/docs/html-intl/intl/ja/distribute/googleplay/wear.jd
index 4e0196e..85cffca 100644
--- a/docs/html-intl/intl/ja/distribute/googleplay/wear.jd
+++ b/docs/html-intl/intl/ja/distribute/googleplay/wear.jd
@@ -196,4 +196,4 @@
data-query="collection:wearlanding"
data-cardSizes="6x2"
data-maxResults="3">
- </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/tools/launch-checklist.jd b/docs/html-intl/intl/ja/distribute/tools/launch-checklist.jd
index b1394f8..a6f1a7f 100644
--- a/docs/html-intl/intl/ja/distribute/tools/launch-checklist.jd
+++ b/docs/html-intl/intl/ja/distribute/tools/launch-checklist.jd
@@ -789,4 +789,4 @@
data-query="collection:distribute/toolsreference/launchchecklist/afterlaunch"
data-sortOrder="-timestamp"
data-cardSizes="9x3,9x3,9x3,9x3,9x3,9x3"
- data-maxResults="6"></div>
\ No newline at end of file
+ data-maxResults="6"></div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/distribute/tools/localization-checklist.jd b/docs/html-intl/intl/ja/distribute/tools/localization-checklist.jd
index b2c797b..5bb9fe0 100644
--- a/docs/html-intl/intl/ja/distribute/tools/localization-checklist.jd
+++ b/docs/html-intl/intl/ja/distribute/tools/localization-checklist.jd
@@ -2,7 +2,7 @@
page.metaDescription=Android と Google Play から提供される世界中のユーザーを活用します。このチェックリストを読んで、お客様の製品を世界中のマーケットに提供する方法の概要を把握してください。
meta.tags="localizing, publishing, disttools"
page.tags="local, l10n, translation, language"
-page.image=/distribute/images/localization-checklist.jpg
+page.image=/distribute/images/localization-checklist.jpg
@jd:body
@@ -713,4 +713,4 @@
data-query="collection:distribute/toolsreference/localizationchecklist/supportlaunch"
data-sortOrder="-timestamp"
data-cardSizes="9x3,9x3,6x3,9x3,9x3,9x3"
- data-maxResults="6"></div>
\ No newline at end of file
+ data-maxResults="6"></div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/google/play/filters.jd b/docs/html-intl/intl/ja/google/play/filters.jd
index 5ab6336..eed069f 100644
--- a/docs/html-intl/intl/ja/google/play/filters.jd
+++ b/docs/html-intl/intl/ja/google/play/filters.jd
@@ -263,4 +263,4 @@
<p class="caution"><strong>警告:</strong> 同じアプリに複数の APK を公開することは拡張機能とみなされます。<strong>大部分のアプリは、広範囲のデバイス設定をサポートする APK を 1 つだけ公開すべきです</strong>。複数の APK を公開する場合、フィルタ固有のルールに従う必要があります。また、設定ごとに適切なアップデート パスを確保するため、各 APK のバージョン コードに特別な注意を払う必要があります。</p>
-<p>Google Play で複数の APK を公開する方法について詳しくは、<a href="{@docRoot}google/play/publishing/multiple-apks.html">複数の APK サポート（Multiple APK Support）</a>をご覧ください。</p>
\ No newline at end of file
+<p>Google Play で複数の APK を公開する方法について詳しくは、<a href="{@docRoot}google/play/publishing/multiple-apks.html">複数の APK サポート（Multiple APK Support）</a>をご覧ください。</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/guide/components/activities.jd b/docs/html-intl/intl/ja/guide/components/activities.jd
index 9b06d2c..227f7f4 100644
--- a/docs/html-intl/intl/ja/guide/components/activities.jd
+++ b/docs/html-intl/intl/ja/guide/components/activities.jd
@@ -53,7 +53,7 @@
<p> 通常、アプリケーションは複数のアクティビティで構成されており、各アプリケーションはそれぞれ緩やかにつながっています。
一般的には、アプリケーションの 1 つのアクティビティが「メイン」アクティビティとして指定され、ユーザーが初めてアプリケーションを起動したときに表示されるのがこのアクティビティになります。
その後、各アクティビティで別のアクティビティを開始して別の操作を実行できます。
-新しいアクティビティの開始時には、前のアクティビティは停止しますが、そのアクティビティはシステムによってスタック（「バックスタック」）に維持されます
+新しいアクティビティの開始時には、前のアクティビティは停止しますが、そのアクティビティはシステムによってスタック（「バックスタック」）に維持されます
新しいアクティビティが開始すると、それがバックスタックに入ってユーザーに表示されます。
バックスタックは「後入れ先出し」の基本的なスタック メカニズムを順守するため、ユーザーが現在のアクティビティを完了して [<em>戻る</em>] ボタンを押すと、そのアクティビティはスタックから消え（破棄され）、前のアクティビティが再開します。
diff --git a/docs/html-intl/intl/ja/guide/components/fragments.jd b/docs/html-intl/intl/ja/guide/components/fragments.jd
index 31fb7f5..7f90963 100644
--- a/docs/html-intl/intl/ja/guide/components/fragments.jd
+++ b/docs/html-intl/intl/ja/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>関連ドキュメント</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Building a Dynamic UI with Fragments</a></li>
@@ -332,7 +332,7 @@
fragmentTransaction.commit();
</pre>
- <p>{@link android.app.FragmentTransaction#add(int,Fragment) add()} に渡される最初の引数はフラグメントを配置する {@link android.view.ViewGroup} でリソース ID で指定されており、2 つ目のパラメータは追加するフラグメントです。
+ <p>{@link android.app.FragmentTransaction#add(int,Fragment) add()} に渡される最初の引数はフラグメントを配置する {@link android.view.ViewGroup} でリソース ID で指定されており、2 つ目のパラメータは追加するフラグメントです。
</p>
<p>{@link android.app.FragmentTransaction} で変更を加えたら、{@link android.app.FragmentTransaction#commit} を呼び出して変更を適用する必要があります。
@@ -378,7 +378,7 @@
<li>{@link
android.app.FragmentManager#findFragmentById findFragmentById()}（アクティビティ レイアウトで UI を提供するフラグメントの場合）や {@link android.app.FragmentManager#findFragmentByTag
findFragmentByTag()}（UI を提供しないフラグメントの場合）を使用して、アクティビティにあるフラグメントを取得する。
-</li>
+</li>
<li>{@link
android.app.FragmentManager#popBackStack()} を使用してフラグメントをバックスタックから取り出す（ユーザーによる [<em>戻る</em>] コマンドをシミュレートする）。</li>
<li>{@link
@@ -785,7 +785,7 @@
<p>2 つ目のフラグメントである {@code DetailsFragment} は、{@code TitlesFragment} のリストで選択された劇のあらすじを表示します。
</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>{@code TitlesFragment} クラスで説明したように、ユーザーがリストアイテムをクリックしたときに、現在のレイアウトに{@code R.id.details} ビュー（{@code DetailsFragment} が属する場所）が<em>含まれていない</em>場合、アプリケーションは {@code DetailsActivity} のアクティビティを開始してアイテムのコンテンツを表示します。
@@ -798,7 +798,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>構成が横方向の場合はアクティビティは自ら終了するため、メイン アクティビティが引き継いで {@code DetailsFragment} を {@code TitlesFragment} の横に表示できます。これは、ユーザーが縦方向のときに {@code DetailsActivity} を開始し、その後横方向に回転した（ここで現在のアクティビティが再開される）ときに起こることがあります。
diff --git a/docs/html-intl/intl/ja/guide/components/fundamentals.jd b/docs/html-intl/intl/ja/guide/components/fundamentals.jd
index 46e9868..e1a26cd 100644
--- a/docs/html-intl/intl/ja/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/ja/guide/components/fundamentals.jd
@@ -379,7 +379,7 @@
</p>
<p>たとえば、アプリでカメラを使用する必要があり、Android 2.1 で採用された API（<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API レベル</a> 7）を使用する場合、次のようにマニフェスト ファイルでそれを要件として宣言する必要があります。
-</p>
+</p>
<pre>
<manifest ... >
diff --git a/docs/html-intl/intl/ja/guide/components/index.jd b/docs/html-intl/intl/ja/guide/components/index.jd
index 803f99b..f4801c9 100644
--- a/docs/html-intl/intl/ja/guide/components/index.jd
+++ b/docs/html-intl/intl/ja/guide/components/index.jd
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>ブログの記事</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>DialogFragments の使用</h4>
<p>この投稿では、DialogFragments を v4 サポート ライブラリで使用して（Honeycomb 以前の端末での下方互換性のため）ダイアログを編集したり、インターフェースを使用して呼び出し元の Activity に結果を返したりする方法について説明します。</p>
@@ -21,7 +21,7 @@
<h4>すべてに Fragments を</h4>
<p>本日、同じ Fragments API を利用できる静的なライブラリが公開され、Android 1.6 以降でもフラグメントを使用してタブレット対応のユーザー インターフェースを作成できるようになりました。 </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>マルチスレッドでパフォーマンス向上</h4>
<p>応答の速いアプリケーションを作成する上で重要なのは、メイン UI スレッドが最小限の作業を行うようにすることです。
@@ -32,7 +32,7 @@
<div class="col-6">
<h3>トレーニング</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>アクティビティのライフサイクルの管理</h4>
<p>このレッスンでは、各 Activity インスタンスが受け取る重要なライフサイクル コールバック メソッドについて、それらを使用してユーザーの予期する内容でアクティビティを動作させる方法と、アクティビティがそれらを必要としないときに、システムのリソースを消費しないようにする方法について学習します。
diff --git a/docs/html-intl/intl/ja/guide/components/loaders.jd b/docs/html-intl/intl/ja/guide/components/loaders.jd
index bc93677..6034717 100644
--- a/docs/html-intl/intl/ja/guide/components/loaders.jd
+++ b/docs/html-intl/intl/ja/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>キークラス</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>関連サンプル</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -51,7 +51,7 @@
再度データを問い合わせる必要がない。
</li>
</ul>
-
+
<h2 id="summary">Loader API の概要</h2>
<p>アプリケーションでローダを使用するのに必要になりそうなクラスやインターフェースは複数あります。
@@ -129,7 +129,7 @@
</li>
<li>{@link android.app.LoaderManager.LoaderCallbacks} の実装。ここで、新しいローダを作成して既存のローダへの参照を管理します。
-</li>
+</li>
<li>{@link
android.widget.SimpleCursorAdapter} などのローダのデータを表示する方法。</li>
<li>{@link android.content.CursorLoader} を使用するときの、{@link android.content.ContentProvider} などのデータ ソース。
@@ -140,7 +140,7 @@
<p>{@link android.app.LoaderManager} は 1 つ以上の {@link
android.content.Loader} インスタンスを {@link android.app.Activity} や {@link android.app.Fragment} 内で管理します。
1 つのアクティビティやフラグメントごとに、{@link
-android.app.LoaderManager} は 1 つだけ存在します。</p>
+android.app.LoaderManager} は 1 つだけ存在します。</p>
<p>通常は、アクティビティの {@link
android.app.Activity#onCreate onCreate()} メソッドか、フラグメントの {@link android.app.Fragment#onActivityCreated onActivityCreated()} メソッド内で {@link android.content.Loader} を初期化します。
@@ -157,13 +157,13 @@
<ul>
<li>ローダを識別する一意の ID。この例では、ID は 0 です。</li>
<li>ローダの構築時に提供する任意の引数（この例では <code>null</code>）。
-</li>
+</li>
<li>{@link android.app.LoaderManager} がローダのイベントを報告する際に呼び出す {@link android.app.LoaderManager.LoaderCallbacks} の実装。
この例では、ローカルクラスが {@link
android.app.LoaderManager.LoaderCallbacks} インターフェースを実装するため、自身の {@code this} に参照を渡します。
-</li>
+</li>
</ul>
<p>{@link android.app.LoaderManager#initLoader initLoader()} の呼び出しによって、ローダが初期化され、アクティブになります。
結果には次の 2 つの可能性があります。</p>
@@ -366,7 +366,7 @@
android.app.Fragment} の完全な実装の例です。
{@link
android.content.CursorLoader} を使用してプロバイダへのクエリを管理しています。</p>
-
+
<p>この例にあるように、アプリケーションがユーザーの連絡先にアクセスするには、マニフェストに {@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS} の許可を含める必要があります。
</p>
diff --git a/docs/html-intl/intl/ja/guide/components/processes-and-threads.jd b/docs/html-intl/intl/ja/guide/components/processes-and-threads.jd
index 691a5f4..ae36411 100644
--- a/docs/html-intl/intl/ja/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/ja/guide/components/processes-and-threads.jd
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
diff --git a/docs/html-intl/intl/ja/preview/j8-jack.jd b/docs/html-intl/intl/ja/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/ja/preview/j8-jack.jd
rename to docs/html-intl/intl/ja/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/ja/guide/publishing/app-signing.jd b/docs/html-intl/intl/ja/guide/publishing/app-signing.jd
index 2d2acfa..efe66f4 100644
--- a/docs/html-intl/intl/ja/guide/publishing/app-signing.jd
+++ b/docs/html-intl/intl/ja/guide/publishing/app-signing.jd
@@ -53,7 +53,7 @@
<ul>
<li>すべてのアプリケーションは<em>署名される必要があります</em>。署名されていないアプリケーションはシステムにインストールされません。</li>
<li>アプリケーションの署名に、自己署名証明書を使用できます。認証機関は不要です。</li>
- <li>アプリケーションをエンド ユーザーにリリースする準備ができたら、適切な秘密鍵を使用してアプリケーションに署名する必要があります。SDK ツールで生成されたデバッグ キーで署名されたアプリケーションは、公開できません。
+ <li>アプリケーションをエンド ユーザーにリリースする準備ができたら、適切な秘密鍵を使用してアプリケーションに署名する必要があります。SDK ツールで生成されたデバッグ キーで署名されたアプリケーションは、公開できません。
</li>
<li>システムが署名証明書の有効期限を確認するのは、インストール時のみです。アプリケーションのインストール後に署名者証明書が期限切れになった場合、アプリケーションは正常な動作を継続します。</li>
<li>標準ツールである Keytool と Jarsigner を使用してキーを生成し、アプリケーションの .apk ファイルに署名できます。</li>
@@ -61,7 +61,7 @@
<p>Android システムは、適切に署名されていないアプリケーションをインストールせず、実行もしません。この規則は、実際のデバイスでもエミュレータでも、Android システムが実行されるすべての状況で適用されます。このため、エミュレータまたはデバイス上で実行またはデバッグする前に、アプリケーションの署名を設定する必要があります。</p>
-<p>Android SDK ツールは、デバッグ時のアプリケーション署名を支援します。「ADT Plugin for Eclipse」と「Ant ビルド ツール」では両方とも、<em>デバッグ モード</em>と<em>リリース モード</em>の 2 種類の署名モードを利用できます。
+<p>Android SDK ツールは、デバッグ時のアプリケーション署名を支援します。「ADT Plugin for Eclipse」と「Ant ビルド ツール」では両方とも、<em>デバッグ モード</em>と<em>リリース モード</em>の 2 種類の署名モードを利用できます。
<ul>
<li>開発およびテスト中は、デバッグ モードでコンパイルできます。デバッグ モードでは、ビルド ツールは JDK に付属の Keytool ユーティリティを使用して、キーストアとキーを既知のエイリアスとパスワードで作成します。コンパイルのたびに、ツールはデバッグ キーを使用してアプリケーションの .apk ファイルに署名します。パスワードは既知のものなので、コンパイルのたびにツールにキーストア/キー パスワードを入力する必要はありません。</li>
@@ -198,8 +198,8 @@
<ul>
<li>自分が所有している。</li>
<li>アプリケーションで識別される、個人、法人、または組織の実体を表す。</li>
-<li>アプリケーションまたはアプリケーション スイートの予期される使用期間を超える有効期間を持っている。有効期間として、25 年以上を推奨します。
-<p>アプリケーションを Android マーケットに公開する予定の場合、2033 年 10 月 22 日までの有効期間が必要です。有効期間がこの日付以前に期限切れになるキーで署名されたアプリケーションは、アップロードできません。
+<li>アプリケーションまたはアプリケーション スイートの予期される使用期間を超える有効期間を持っている。有効期間として、25 年以上を推奨します。
+<p>アプリケーションを Android マーケットに公開する予定の場合、2033 年 10 月 22 日までの有効期間が必要です。有効期間がこの日付以前に期限切れになるキーで署名されたアプリケーションは、アップロードできません。
</p></li>
<li>Android SDK ツールで生成されたデバッグ キーではない。 </li>
</ul>
@@ -248,7 +248,7 @@
<p>秘密鍵を生成する Keytool コマンドの例を示します。</p>
-<pre>$ keytool -genkey -v -keystore my-release-key.keystore
+<pre>$ keytool -genkey -v -keystore my-release-key.keystore
-alias alias_name -keyalg RSA -validity 10000</pre>
<p>上記のコマンド例を実行すると、Keytool からキーストアとキーのパスワードと、キーの識別名フィールドの指定が求められます。キーストアが <code>my-release-key.keystore</code> というファイルとして生成されます。キーストアとキーは、入力したパスワードで保護されます。キーストアには 1 つのキーが含まれ、10000 日間有効です。エイリアスは、後で使用する名前で、アプリケーションに署名するときにこのキーストアを参照する名前です。 </p>
@@ -282,10 +282,10 @@
</tr>
</table>
-<p>Jarsigner を使用して <code>my_application.apk</code> というアプリケーション パッケージに署名する例を、上記で作成したキーストアを使用して示します。
+<p>Jarsigner を使用して <code>my_application.apk</code> というアプリケーション パッケージに署名する例を、上記で作成したキーストアを使用して示します。
</p>
-<pre>$ jarsigner -verbose -keystore my-release-key.keystore
+<pre>$ jarsigner -verbose -keystore my-release-key.keystore
my_application.apk alias_name</pre>
<p>上記のコマンドを実行すると、Jarsigner からキーストアとキーのパスワードの入力が求められます。.apk がその場で変更され、.apk は署名されます。.apk に別のキーで複数回署名できます。</p>
diff --git a/docs/html-intl/intl/ja/guide/publishing/preparing.jd b/docs/html-intl/intl/ja/guide/publishing/preparing.jd
index c7a2950..a86f70c 100644
--- a/docs/html-intl/intl/ja/guide/publishing/preparing.jd
+++ b/docs/html-intl/intl/ja/guide/publishing/preparing.jd
@@ -68,7 +68,7 @@
<h3 id="eula">2. アプリケーションへのエンドユーザー ライセンス契約の追加を検討する</h3>
-<p>個人、組織、知的財産を保護するため、アプリケーションのエンドユーザー ライセンス契約（EULA）を付加することを推奨します。
+<p>個人、組織、知的財産を保護するため、アプリケーションのエンドユーザー ライセンス契約（EULA）を付加することを推奨します。
<h3 id="iconlabel">3. アプリケーションのマニフェストにアイコンとラベルを指定する</h3>
diff --git a/docs/html-intl/intl/ja/guide/publishing/versioning.jd b/docs/html-intl/intl/ja/guide/publishing/versioning.jd
index 1928610..4da05bf 100644
--- a/docs/html-intl/intl/ja/guide/publishing/versioning.jd
+++ b/docs/html-intl/intl/ja/guide/publishing/versioning.jd
@@ -48,13 +48,13 @@
<p>アプリケーションのバージョン情報を定義するには、アプリケーションのマニフェスト ファイルで属性を設定します。2 つの属性を使用でき、常にこの両方に値を定義することが推奨されています: </p>
<ul>
-<li><code>android:versionCode</code> - アプリケーション コードのバージョンを他のバージョンと相対的に示す整数値。
+<li><code>android:versionCode</code> - アプリケーション コードのバージョンを他のバージョンと相対的に示す整数値。
<p>この値は整数なので、その他のアプリケーションはプログラムでバージョンの値を評価して関係を確認できます（たとえば、このバージョンがアップグレードかダウングレードなのか、など）。任意の整数値を設定できますが、アプリケーションの後続のリリースでは、現在より大きな値を使用するようにしてください。システムではこのバージョン管理の基準を強制しませんが、後継リリースの値を増加させることは標準的です。 </p>
<p>通常、アプリケーションの最初のバージョンの versionCode を 1 に設定してリリースし、その後は各リリースについて、リリースがメジャー リリースであってもマイナー リリースであっても、値を単調増加させます。これは、<code>android:versionCode</code> の値は、ユーザーに表示されるアプリケーション リリース バージョンと類似している必要性はないことを意味します。以下の <code>android:versionName</code> をご覧ください。アプリケーションと公開サービスでは、このバージョンの値はユーザーには表示されません。</p>
</li>
-<li><code>android:versionName</code> - アプリケーション コードのリリース バージョンを表す文字列値で、ユーザーに表示される値です。
+<li><code>android:versionName</code> - アプリケーション コードのリリース バージョンを表す文字列値で、ユーザーに表示される値です。
<p>値は文字列なので、アプリケーション バージョンを「<major>.<minor>.<point>」といった文字列や、その他のタイプの絶対的または相対的バージョン ID として記述できます。 </p>
<p><code>android:versionCode</code> の場合と同様に、システムではこの値をアプリケーションでユーザーに表示する以外の目的で内部的に利用することはありません。公開サービスでは、ユーザーに表示するために <code>android:versionName</code> 値を取り出す可能性もあります。</p>
@@ -79,7 +79,7 @@
<p>この例では、<code>android:versionCode</code> 値は現在の .apk がこのアプリケーション コードの 2 番目のリリースを含んでいることを表し、これは <code>android:codeName</code> 文字列が示すようにマイナー後継リリースであることを示します。 </p>
-<p>Android フレームワークには、アプリケーションがシステムに別のアプリケーションのバージョン情報を問い合わせる API が用意されています。バージョン情報を取得するため、アプリケーションは {@link android.content.pm.PackageManager#getPackageInfo(java.lang.String, int)}
+<p>Android フレームワークには、アプリケーションがシステムに別のアプリケーションのバージョン情報を問い合わせる API が用意されています。バージョン情報を取得するため、アプリケーションは {@link android.content.pm.PackageManager#getPackageInfo(java.lang.String, int)}
method of {@link android.content.pm.PackageManager PackageManager}. </p> を使用します。
<h2 id="minsdkversion">最小システム API バージョンの指定</h2>
@@ -89,7 +89,7 @@
<p>最小システム バージョンをマニフェストに指定するには、次の属性を使用します: </p>
<ul>
-<li><code>android:minSdkVersion</code> - Android プラットフォームのコード バージョンに対応する整数値。
+<li><code>android:minSdkVersion</code> - Android プラットフォームのコード バージョンに対応する整数値。
<p>アプリケーションのインストールを準備する際に、システムはこの属性の値を確認して、システム バージョンと比較します。<code>android:minSdkVersion</code> 値がシステム バージョンよりも大きい場合、システムはアプリケーションのインストールを中止します。 </p>
<p>この属性をマニフェストに指定しない場合、システムではアプリケーションがすべてのプラットフォーム バージョンと互換性があると仮定します。</p></li>
diff --git a/docs/html-intl/intl/ja/guide/topics/fundamentals.jd b/docs/html-intl/intl/ja/guide/topics/fundamentals.jd
index d76c92e..2517073 100644
--- a/docs/html-intl/intl/ja/guide/topics/fundamentals.jd
+++ b/docs/html-intl/intl/ja/guide/topics/fundamentals.jd
@@ -80,10 +80,10 @@
<dl>
<dt><b>アクティビティ</b></dt>
-<dd>アクティビティは、ユーザーが 1 つの操作を集中的に行うための視覚的なユーザー インターフェースを表します。<i></i>たとえば、ユーザーが選択できるメニュー アイテムの一覧を表示するアクティビティや、写真をキャプション付きで表示するアクティビティなどが考えられます。SMS アプリケーションなら、あるアクティビティでメッセージを送信する連絡先の一覧を表示し、別のアクティビティで選択した連絡先へのメッセージを入力し、その他のアクティビティで古いメッセージを参照したり設定を変更したりできます。これらのアクティビティを組み合わせて全体としてのユーザー インターフェースを形成しますが、それぞれのアクティビティは相互に独立しています。各アクティビティは、{@link android.app.Activity} 基本クラスのサブクラスとして実装されます。
+<dd>アクティビティは、ユーザーが 1 つの操作を集中的に行うための視覚的なユーザー インターフェースを表します。<i></i>たとえば、ユーザーが選択できるメニュー アイテムの一覧を表示するアクティビティや、写真をキャプション付きで表示するアクティビティなどが考えられます。SMS アプリケーションなら、あるアクティビティでメッセージを送信する連絡先の一覧を表示し、別のアクティビティで選択した連絡先へのメッセージを入力し、その他のアクティビティで古いメッセージを参照したり設定を変更したりできます。これらのアクティビティを組み合わせて全体としてのユーザー インターフェースを形成しますが、それぞれのアクティビティは相互に独立しています。各アクティビティは、{@link android.app.Activity} 基本クラスのサブクラスとして実装されます。
<p>
-アプリケーションは、1 つのアクティビティで構成することも、上記のSMS アプリケーションのように複数のアクティビティで構成することもできます。どのようなアクティビティがいくつ必要になるかは、アプリケーションやその設計に応じて異なります。通常は、アクティビティのうちのいずれかを最初のアクティビティとして指定し、ユーザーがアプリケーションを起動したときに表示します。あるアクティビティから別のアクティビティに移動するには、現在のアクティビティから次のアクティビティを開始します。
+アプリケーションは、1 つのアクティビティで構成することも、上記のSMS アプリケーションのように複数のアクティビティで構成することもできます。どのようなアクティビティがいくつ必要になるかは、アプリケーションやその設計に応じて異なります。通常は、アクティビティのうちのいずれかを最初のアクティビティとして指定し、ユーザーがアプリケーションを起動したときに表示します。あるアクティビティから別のアクティビティに移動するには、現在のアクティビティから次のアクティビティを開始します。
</p>
<p>
@@ -105,7 +105,7 @@
典型的な例としては、プレイリストの曲を再生するメディア プレーヤーが挙げられます。プレーヤー アプリケーションは、ユーザーが曲を選んで再生するための 1 つ以上のアクティビティで構成することが予想されますが、ユーザーはプレーヤーを離れて別の操作に移った後も曲を聞いていたいと考えられることから、曲の再生自体をアクティビティで処理するわけにはいきません。音楽の再生を続けるには、メディア プレーヤー アクティビティから、バックグラウンドで実行するサービスを開始します。音楽再生サービスは、それを開始したアクティビティが画面上に見えなくなった後もそのまま実行されます。
</p>
-<p>
+<p>
また、実行中のサービスに接続（バインド）することもできます（実行されていない場合はそのサービスを開始することも可能です）。接続中は、サービスが公開しているインターフェースを使ってサービスと対話できます。音楽再生サービスであれは、このインターフェースを使って一時停止、巻き戻し、停止、再生の再開などの操作を実行できるようにします。
</p>
@@ -121,11 +121,11 @@
</p>
<p>
-ブロードキャスト レシーバがユーザー インターフェースを表示することはありません。ただし、受信した情報への応答としてアクティビティを開始したり、{@link android.app.NotificationManager} を使用してユーザーにアラートを送信したりすることはあります。通知の際には、バックライトを点滅させる、バイブレーションを起動する、音を鳴らすなど、さまざまな方法でユーザーの注意を喚起できます。通常は、ステータス バーに永続アイコンを表示し、ユーザーがこれを開いてメッセージを取得できるようにします。
+ブロードキャスト レシーバがユーザー インターフェースを表示することはありません。ただし、受信した情報への応答としてアクティビティを開始したり、{@link android.app.NotificationManager} を使用してユーザーにアラートを送信したりすることはあります。通知の際には、バックライトを点滅させる、バイブレーションを起動する、音を鳴らすなど、さまざまな方法でユーザーの注意を喚起できます。通常は、ステータス バーに永続アイコンを表示し、ユーザーがこれを開いてメッセージを取得できるようにします。
</p></dd>
<dt><b>コンテンツ プロバイダ</b></dt>
-<dd>コンテンツ プロバイダは、アプリケーションのデータを他のアプリケーションでも利用できるようにします。<i></i>データは、ファイル システムや SQLite データベースなど、一般に利用できる方法で格納されていれば使用できます。コンテンツ プロバイダは、{@link android.content.ContentProvider} 基本クラスの拡張です。プロバイダが制御する型のデータを、他のアプリケーションから取得および格納するための標準メソッド セットを実装しています。ただし、これらのメソッドをアプリケーションから直接呼び出すことはできません。代わりに、{@link android.content.ContentResolver} オブジェクトのメソッドを呼び出します。ContentResolver は、すべてのプロバイダと通信でき、プロバイダと連携して関係のあるすべてのプロセス間通信を管理します。
+<dd>コンテンツ プロバイダは、アプリケーションのデータを他のアプリケーションでも利用できるようにします。<i></i>データは、ファイル システムや SQLite データベースなど、一般に利用できる方法で格納されていれば使用できます。コンテンツ プロバイダは、{@link android.content.ContentProvider} 基本クラスの拡張です。プロバイダが制御する型のデータを、他のアプリケーションから取得および格納するための標準メソッド セットを実装しています。ただし、これらのメソッドをアプリケーションから直接呼び出すことはできません。代わりに、{@link android.content.ContentResolver} オブジェクトのメソッドを呼び出します。ContentResolver は、すべてのプロバイダと通信でき、プロバイダと連携して関係のあるすべてのプロセス間通信を管理します。
<p>
コンテンツ プロバイダの使用方法について詳しくは、<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>のドキュメントをご覧ください。
@@ -134,40 +134,40 @@
</dl>
<p>
-Android では、特定のコンポーネントで処理すべきリクエストがあると、そのコンポーネントのアプリケーション プロセスが実行中かどうかを確認（必要に応じてプロセスを開始）し、そのコンポーネントの適切なインスタンスが利用可能かどうかを確認（必要に応じてインスタンスを作成）します。
+Android では、特定のコンポーネントで処理すべきリクエストがあると、そのコンポーネントのアプリケーション プロセスが実行中かどうかを確認（必要に応じてプロセスを開始）し、そのコンポーネントの適切なインスタンスが利用可能かどうかを確認（必要に応じてインスタンスを作成）します。
</p>
-<h3 id="actcomp">コンポーネントのアクティブ化: インテント</h3>
+<h3 id="actcomp">コンポーネントのアクティブ化: インテント</h3>
<p>
コンテンツ プロバイダは、ContentResolver からのリクエストの対象になるとアクティブ化されます。それ以外の 3 つのコンポーネント（アクティビティ、サービス、ブロードキャスト レシーバ）は、インテントと呼ばれる非同期メッセージによってアクティブ化されます。<i></i>インテントは、メッセージのコンテンツを保持する {@link android.content.Intent} オブジェクトです。アクティビティやサービスの場合の Intent オブジェクトの主な役割は、リクエストされているアクションを指名し、その対象となるデータの URI を指定することです。たとえば、ユーザーに画像を表示するためのリクエストや、ユーザーにテキストを編集させるリクエストをアクティビティに伝達できます。ブロードキャスト レシーバの場合は、Intent オブジェクトがこれから通知を行うアクションを指名します。たとえば、カメラのボタンが押されたことを、関係のあるブロードキャスト レシーバに通知できます。
</p>
<p>
-以下に示すように、コンポーネントのタイプごとに別々のアクティブ化メソッドが用意されています:
+以下に示すように、コンポーネントのタイプごとに別々のアクティブ化メソッドが用意されています:
</p>
<ul>
-<li>アクティビティを起動する（または何か新しい処理を実行させる）には、Intent オブジェクトを <code>{@link android.content.Context#startActivity
-Context.startActivity()}</code> または <code>{@link
-android.app.Activity#startActivityForResult
-Activity.startActivityForResult()}</code> に渡します。応答アクティビティで <code>{@link android.app.Activity#getIntent getIntent()}</code> メソッドを呼び出すと、最初にそのアクティビティが起動されたときのインテントの内容を確認できます。Android によってアクティビティの <code>{@link
+<li>アクティビティを起動する（または何か新しい処理を実行させる）には、Intent オブジェクトを <code>{@link android.content.Context#startActivity
+Context.startActivity()}</code> または <code>{@link
+android.app.Activity#startActivityForResult
+Activity.startActivityForResult()}</code> に渡します。応答アクティビティで <code>{@link android.app.Activity#getIntent getIntent()}</code> メソッドを呼び出すと、最初にそのアクティビティが起動されたときのインテントの内容を確認できます。Android によってアクティビティの <code>{@link
android.app.Activity#onNewIntent onNewIntent()}</code> メソッドが呼び出され、アクティビティが後続のインテントに渡されます。
<p>
-多くの場合、アクティビティから次のアクティビティを開始します。開始するアクティビティから結果が返される場合は、{@code startActivity()} ではなく {@code startActivityForResult()} を呼び出します。たとえば、ユーザーに写真を選択させるアクティビティを開始する場合は、ユーザーによって選択された写真が返されるかもしれません。結果は、呼び出し側のアクティビティの <code>{@link android.app.Activity#onActivityResult
+多くの場合、アクティビティから次のアクティビティを開始します。開始するアクティビティから結果が返される場合は、{@code startActivity()} ではなく {@code startActivityForResult()} を呼び出します。たとえば、ユーザーに写真を選択させるアクティビティを開始する場合は、ユーザーによって選択された写真が返されるかもしれません。結果は、呼び出し側のアクティビティの <code>{@link android.app.Activity#onActivityResult
onActivityResult()}</code> メソッドに渡した Intent オブジェクトで返されます。
</p>
</li>
-<li><p>サービスを開始する（または実行中のサービスに新しい指示を与える）には、<code>{@link
-android.content.Context#startService Context.startService()}</code> に Intent オブジェクトを渡します。Android により、サービスの <code>{@link android.app.Service#onStart
+<li><p>サービスを開始する（または実行中のサービスに新しい指示を与える）には、<code>{@link
+android.content.Context#startService Context.startService()}</code> に Intent オブジェクトを渡します。Android により、サービスの <code>{@link android.app.Service#onStart
onStart()}</code> メソッドが呼び出されて Intent オブジェクトが渡されます。</p>
<p>
-同様に、インテントを <code>{@link
+同様に、インテントを <code>{@link
android.content.Context#bindService Context.bindService()}</code> に渡すと、呼び出し側のコンポーネントと対象となるサービスの間の継続中の接続を確立できます。サービスは、<code>{@link android.app.Service#onBind onBind()}</code> 呼び出しで Intent オブジェクトを受け取ります（サービスがまだ開始されていない場合は、必要に応じて {@code bindService()} で開始できます）。たとえば、上で例に挙げた音楽再生サービスとの接続を確立するアクティビティを使用して、ユーザーが再生を操作するための手段（ユーザー インターフェース）を提供できます。アクティビティで {@code bindService()} を呼び出して接続を確立してから、サービスに定義されているメソッドを呼び出して再生を操作します。
</p>
@@ -176,10 +176,10 @@
</p>
</li>
-<li><p>アプリケーションでブロードキャストを開始するには、<code>{@link
-android.content.Context#sendBroadcast(Intent) Context.sendBroadcast()}</code>、<code>{@link android.content.Context#sendOrderedBroadcast(Intent, String)
-Context.sendOrderedBroadcast()}</code>、<code>{@link
-android.content.Context#sendStickyBroadcast Context.sendStickyBroadcast()}</code> などのメソッドのいずれかのバリエーションに Intent オブジェクトを渡します。Android によって <code>{@link
+<li><p>アプリケーションでブロードキャストを開始するには、<code>{@link
+android.content.Context#sendBroadcast(Intent) Context.sendBroadcast()}</code>、<code>{@link android.content.Context#sendOrderedBroadcast(Intent, String)
+Context.sendOrderedBroadcast()}</code>、<code>{@link
+android.content.Context#sendStickyBroadcast Context.sendStickyBroadcast()}</code> などのメソッドのいずれかのバリエーションに Intent オブジェクトを渡します。Android によって <code>{@link
android.content.BroadcastReceiver#onReceive onReceive()}</code> メソッドが呼び出され、関係のあるすべてのブロードキャスト レシーバにインテントが配信されます。</p></li>
</ul>
@@ -213,7 +213,7 @@
<h3 id="manfile">マニフェスト ファイル</h3>
<p>
-アプリケーション コンポーネントを開始するには、Android がそのコンポーネントの存在を認識している必要があります。アプリケーションのコンポーネントは、マニフェスト ファイルで宣言します。このファイルは、アプリケーションのコード、ファイル、リソースなどとともに Android パッケージ（{@code .apk} ファイル）にバンドルされます。
+アプリケーション コンポーネントを開始するには、Android がそのコンポーネントの存在を認識している必要があります。アプリケーションのコンポーネントは、マニフェスト ファイルで宣言します。このファイルは、アプリケーションのコード、ファイル、リソースなどとともに Android パッケージ（{@code .apk} ファイル）にバンドルされます。
</p>
<p>
@@ -229,7 +229,7 @@
<application . . . >
<activity android:name="com.example.project.FreneticActivity"
android:icon="@drawable/small_pic.png"
- android:label="@string/freneticLabel"
+ android:label="@string/freneticLabel"
. . . >
</activity>
. . .
@@ -260,7 +260,7 @@
<application . . . >
<activity android:name="com.example.project.FreneticActivity"
android:icon="@drawable/small_pic.png"
- android:label="@string/freneticLabel"
+ android:label="@string/freneticLabel"
. . . >
<intent-filter . . . >
<action android:name="android.intent.action.MAIN" />
@@ -304,7 +304,7 @@
</p>
<p>
-この場合、マップ ビューアは別のアプリケーションで定義されており、そのアプリケーションのプロセスで実行されていますが、ユーザーにとってはマップ ビューアが元のアプリケーションの一部であるかのように感じられます。Android では、両方のアクティビティを同じタスクに組み込むことで、このようなユーザー エクスペリエンスを実現できます。<i></i>簡単に言えば、ユーザーが 1 つの「アプリケーション」と感じるものがタスクです。関連するアクティビティをスタックにまとめたものがタスクです。スタック内のルート アクティビティは、タスクを開始するアクティビティです。通常であれば、ユーザーがアプリケーション ランチャで選択するアクティビティがこれに相当します。スタックの最上位にあるアクティビティは、ユーザーのアクションの焦点となっている実行中のアクティビティです。あるアクティビティから別のアクティビティを開始すると、そのアクティビティが新たにスタックにプッシュされて実行中のアクティビティになります。1 つ前のアクティビティはスタック内に残されています。ユーザーが [[]戻る] キーを押すと、現在のアクティビティがスタックからポップされ、1 つ前のアクティビティが実行中のアクティビティとして再開されます。
+この場合、マップ ビューアは別のアプリケーションで定義されており、そのアプリケーションのプロセスで実行されていますが、ユーザーにとってはマップ ビューアが元のアプリケーションの一部であるかのように感じられます。Android では、両方のアクティビティを同じタスクに組み込むことで、このようなユーザー エクスペリエンスを実現できます。<i></i>簡単に言えば、ユーザーが 1 つの「アプリケーション」と感じるものがタスクです。関連するアクティビティをスタックにまとめたものがタスクです。スタック内のルート アクティビティは、タスクを開始するアクティビティです。通常であれば、ユーザーがアプリケーション ランチャで選択するアクティビティがこれに相当します。スタックの最上位にあるアクティビティは、ユーザーのアクションの焦点となっている実行中のアクティビティです。あるアクティビティから別のアクティビティを開始すると、そのアクティビティが新たにスタックにプッシュされて実行中のアクティビティになります。1 つ前のアクティビティはスタック内に残されています。ユーザーが [[]戻る] キーを押すと、現在のアクティビティがスタックからポップされ、1 つ前のアクティビティが実行中のアクティビティとして再開されます。
</p>
<p>
@@ -316,7 +316,7 @@
</p>
<p>
-タスク内のアクティビティは、1 つのユニットとして一緒に移動します。タスク全体（アクティビティ スタック全体）をフォアグラウンドに移動したり、バックグラウンドに移動したりできます。たとえば、現在のタスクは 4 つのアクティビティからなるスタックで、現在のアクティビティの下にアクティビティが 3 つあるとします。ここで、ユーザーが [ホーム] キーを押してアプリケーション ランチャに移動し、新しいアプリケーション（実際には新しいタスク）を選択したとします。<i></i>すると、現在のタスクはバックグラウンドに移動し、新しいタスクのルート アクティビティが表示されます。しばらくして、ユーザーがホーム画面に戻り 1 つ前のアプリケーション（タスク）を選択すると、そのタスクがスタック内の 4 つのアクティビティとともにフォアグラウンドに移動します。ここでユーザーが [戻る] キーを押しても、中断したばかりのアプリケーション（1 つ前のタスクのルート アクティビティ）は表示されません。代わりに、スタックの最上位のアクティビティがポップされ、同じタスクの 1 つ前のアクティビティが表示されます。
+タスク内のアクティビティは、1 つのユニットとして一緒に移動します。タスク全体（アクティビティ スタック全体）をフォアグラウンドに移動したり、バックグラウンドに移動したりできます。たとえば、現在のタスクは 4 つのアクティビティからなるスタックで、現在のアクティビティの下にアクティビティが 3 つあるとします。ここで、ユーザーが [ホーム] キーを押してアプリケーション ランチャに移動し、新しいアプリケーション（実際には新しいタスク）を選択したとします。<i></i>すると、現在のタスクはバックグラウンドに移動し、新しいタスクのルート アクティビティが表示されます。しばらくして、ユーザーがホーム画面に戻り 1 つ前のアプリケーション（タスク）を選択すると、そのタスクがスタック内の 4 つのアクティビティとともにフォアグラウンドに移動します。ここでユーザーが [戻る] キーを押しても、中断したばかりのアプリケーション（1 つ前のタスクのルート アクティビティ）は表示されません。代わりに、スタックの最上位のアクティビティがポップされ、同じタスクの 1 つ前のアクティビティが表示されます。
</p>
<p>
@@ -330,7 +330,7 @@
<p>
また、主に使用する {@code <activity>} 属性は以下のとおりです:
-
+
<p style="margin-left: 2em">{@code taskAffinity} <br/>{@code launchMode} <br/>{@code allowTaskReparenting} <br/>{@code clearTaskOnLaunch} <br/>{@code alwaysRetainTaskState} <br/>{@code finishOnTaskLaunch}</p>
<p>
@@ -348,7 +348,7 @@
<dt><code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> フラグ</dt>
<dd>既に説明したとおり、新しいアクティビティは、デフォルトでは {@code startActivity()} を呼び出したアクティビティのタスクの一部として起動します。つまり、呼び出し側のアクティビティと同じスタックにプッシュされるということです。しかし、{@code startActivity()} に渡された Intent オブジェクトに {@code FLAG_ACTIVITY_NEW_TASK} フラグが含まれている場合、システムはその新しいアクティビティを別のタスクに収容しようとします。フラグの名前からも判断できますが、ほとんどの場合は新しいタスクが開始されます。ただし常にそうなるとは限りません。既存のタスクに新しいアクティビティと同じ親和性が割り当てられている場合、そのアクティビティはそのタスクの一部として起動します。そうでない場合には、新しいタスクが開始されます。</dd>
-<dt><code><a
+<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code> 属性</dt>
<dd>{@code allowTaskReparenting} 属性が "{@code true}" に設定されているアクティビティは、そのアクティビティと親和性のあるタスクがフォアグラウンドに移ったときに、アクティビティを開始したタスクから親和性のあるタスクに移動できます。たとえば、旅行アプリケーションの一部として、選択された都市の天気予報を表示するアクティビティが定義されているとします。このアクティビティには、同じアプリケーション内の他のアクティビティと同じ親和性（デフォルトの親和性）が割り当てられていますが、その親の割り当てを変更することも可能です。あるアクティビティが天気予報アクティビティを開始すると、その時点では開始側のアクティビティと同じタスクに属した状態になります。しかし、次に旅行アプリケーションがフォアグラウンドに移ると、天気予報アクティビティの割り当てが変更され、旅行アプリケーションのタスクの一部として表示されます。</dd>
</dl>
@@ -372,29 +372,29 @@
<ul>
-<li><b>インテントに応答するアクティビティをどのタスクに保持するか</b>。"{@code standard}" および "{@code singleTop}" モードの場合は、そのインテントを開始した（つまり <code>{@link android.content.Context#startActivity startActivity()}</code> を呼び出した）タスクに保持されます。ただし、Intent オブジェクトに <code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> フラグが含まれている場合は、前のセクション<a href="#afftask">親和性と新しいタスク</a>で説明したとおり、別のタスクが選択されます。
+<li><b>インテントに応答するアクティビティをどのタスクに保持するか</b>。"{@code standard}" および "{@code singleTop}" モードの場合は、そのインテントを開始した（つまり <code>{@link android.content.Context#startActivity startActivity()}</code> を呼び出した）タスクに保持されます。ただし、Intent オブジェクトに <code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> フラグが含まれている場合は、前のセクション<a href="#afftask">親和性と新しいタスク</a>で説明したとおり、別のタスクが選択されます。
<p>
一方、"{@code singleTask}" および "{@code singleInstance}" モードの場合は、アクティビティが常にタスクのルート アクティビティになります。タスクは定義されており、他のタスクの一部として起動されることはありません。
-</p>
+</p>
<li><p><b>アクティビティのインスタンスを複数生成できるか</b>。"{@code standard}" または "{@code singleTop}" アクティビティは複数回インスタンス化できます。それらのインスタンスを複数のタスクに割り当てることも、特定のタスクに同じアクティビティの複数のインスタンスを割り当てることも可能です。
-</p>
+</p>
<p>
一方、"{@code singleTask}" および "{@code singleInstance}" アクティビティのインスタンスは 1 つに制限されます。これらのアクティビティはタスクのルートに当たります。したがって、これらのタスクの複数のインスタンスがデバイス上に同時に存在することはないということになります。
-</p>
+</p>
<li><p><b>インスタンスのタスクに他のアクティビティを含めることができるか</b>。"{@code singleInstance}" アクティビティは、そのタスク内の唯一のアクティビティとして単独で動作します。ここから別のアクティビティを開始した場合、そのアクティビティは起動モードに関係なく、あたかもインテントに {@code FLAG_ACTIVITY_NEW_TASK} フラグが含まれているかのように別のタスクで起動します。"{@code singleInstance}" モードと "{@code singleTask}" モードは、これ以外の点ではまったく同じです。</p>
<p>
-他の 3 つのモードでは、タスクに複数のアクティビティを割り当てることができます。"{@code singleTask}" アクティビティは、常にタスクのルート アクティビティになりますが、同じタスクに割り当てることになる別のアクティビティを開始することができます。"{@code standard}" および "{@code singleTop}" アクティビティのインスタンスは、スタック内のどの位置にでも配置できます。
+他の 3 つのモードでは、タスクに複数のアクティビティを割り当てることができます。"{@code singleTask}" アクティビティは、常にタスクのルート アクティビティになりますが、同じタスクに割り当てることになる別のアクティビティを開始することができます。"{@code standard}" および "{@code singleTop}" アクティビティのインスタンスは、スタック内のどの位置にでも配置できます。
</p></li>
<li><b>クラスの新しいインスタンスを起動して新しいインテントを処理するかどうか</b>。デフォルトの "{@code standard}" モードの場合は、新しいインテントに応答するときには必ず新しいインスタンスが作成されます。それぞれのインスタンスで処理するインテントは 1 つのみです。"{@code singleTop}" モードの場合は、クラスの既存のインスタンスが対象タスクのアクティビティ スタックの最上位にあれば、それを再利用して新しいインテントを処理します。スタックの最上位にない場合は再利用されません。代わりに、新しいインスタンスが作成されてスタックにプッシュされ、新しいインテントの処理に使用されます。
<p>
-たとえば、タスクのアクティビティ スタックに、ルート アクティビティ A とアクティビティ B、C、D が含まれているとします。スタック内のアクティビティの順序は A-B-C-D で D が最上位です。ここに、アクティビティのタイプが D のインテントが届きます。D の起動モードがデフォルトの "{@code standard}" である場合は、そのクラスの新しいインスタンスが起動し、スタックは A-B-C-D-D となります。しかし、D の起動モードが "{@code singleTop}" であれば、スタックの最上位は D なので、新しいインテントは既存のインスタンスによって処理されるはずです。したがって、スタックは A-B-C-D のままとなります。
+たとえば、タスクのアクティビティ スタックに、ルート アクティビティ A とアクティビティ B、C、D が含まれているとします。スタック内のアクティビティの順序は A-B-C-D で D が最上位です。ここに、アクティビティのタイプが D のインテントが届きます。D の起動モードがデフォルトの "{@code standard}" である場合は、そのクラスの新しいインスタンスが起動し、スタックは A-B-C-D-D となります。しかし、D の起動モードが "{@code singleTop}" であれば、スタックの最上位は D なので、新しいインテントは既存のインスタンスによって処理されるはずです。したがって、スタックは A-B-C-D のままとなります。
</p>
<p>
@@ -417,7 +417,7 @@
</p>
<p>
-起動モードについて詳しくは、<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> 要素の説明をご覧ください。
+起動モードについて詳しくは、<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> 要素の説明をご覧ください。
</p>
@@ -432,26 +432,26 @@
</p>
<dl>
-<dt><code><a
+<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#always">alwaysRetainTaskState</a></code> 属性</dt>
<dd>タスクのルート アクティビティでこの属性を "{@code true}" に設定すると、上で説明したデフォルトの動作は発生しません。長時間経過しても、タスク内のすべてのアクティビティはそのまま残されます。</dd>
-<dt><code><a
+<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code> 属性</dt>
<dd>タスクのルート アクティビティでこの属性を "{@code true}" に設定した場合、ユーザーがいったんタスクを離れると、戻ったときにはルートを含むすべてのアクティビティがクリアされています。つまり、{@code alwaysRetainTaskState} の正反対の動作になります。ユーザーが一瞬でもタスクを離れると、最初の状態からやり直すことになります。</dd>
-<dt><code><a
+<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#finish">finishOnTaskLaunch</a></code> 属性</dt>
<dd>この属性は {@code clearTaskOnLaunch} に似ていますが、タスク全体ではなく単一のアクティビティに作用します。また、ルート アクティビティを含むどのアクティビティもクリアの対象となりえます。この属性が "{@code true}" に設定されたアクティビティは、現在のセッションの間のみタスクの一部を形成します。ユーザーがいったんそのタスクから離れてから、再度タスクに戻ると、このアクティビティはクリアされています</dd>
</dl>
<p>
-アクティビティをスタックから削除する方法は他にもあります。Intent オブジェクトに <code>{@link
+アクティビティをスタックから削除する方法は他にもあります。Intent オブジェクトに <code>{@link
android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP FLAG_ACTIVITY_CLEAR_TOP}</code> フラグが含まれており、そのインテントを処理すべきタイプのアクティビティのインスタンスが対象タスクのスタック内に存在する場合は、そのインスタンスがスタックの最上位になってインテントに応答できるよう、それより上位のアクティビティはすべてクリアされます。指定されたアクティビティの起動モードが "{@code standard}" である場合は、そのアクティビティもスタックから削除され、新しいインスタンスが起動してインテントを処理します。起動モード "{@code standard}" では、新しいインテントを処理する際、常に新しいインスタンスが作成されるためです。
</p>
<p>
-{@code FLAG_ACTIVITY_CLEAR_TOP} は、ほとんどの場合 {@code FLAG_ACTIVITY_NEW_TASK} と組み合わせて使用します。これらのフラグを組み合わせると、別のタスクに既に存在しているアクティビティを探し、それをインテントに応答できる位置に配置できます。
+{@code FLAG_ACTIVITY_CLEAR_TOP} は、ほとんどの場合 {@code FLAG_ACTIVITY_NEW_TASK} と組み合わせて使用します。これらのフラグを組み合わせると、別のタスクに既に存在しているアクティビティを探し、それをインテントに応答できる位置に配置できます。
</p>
@@ -467,7 +467,7 @@
<p>
{@code FLAG_ACTIVITY_NEW_TASK} フラグにも、これと同じような難しさがあります。このフラグを指定したアクティビティでは、新しいタスクを開始した後にユーザーが [ホーム] キーを押してそのタスクを離れた場合に備え、タスクに戻るための手段を用意しておく必要があります。一部のエンティティ（たとえば通知マネージャ）は、アクティビティを常に外部タスクとして開始します。エンティティの一部として開始することはないため、{@code startActivity()} に渡すインテントには必ず {@code FLAG_ACTIVITY_NEW_TASK} を指定します。外部エンティティから呼び出すことのできるアクティビティでこのフラグが使用されている可能性がある場合は、開始されたタスクにユーザーが戻るための手段を別途提供するようにしてください。
-</p>
+</p>
<p>
ユーザーがアクティビティに戻ることができるようにしない場合は、{@code <activity>} 要素の {@code finishOnTaskLaunch} を "{@code true}" に設定します。詳しくは、<a href="#clearstack">スタックのクリア</a>をご覧ください。
@@ -497,7 +497,7 @@
<p>
状況によっては、Android がプロセスを終了させるべきと判断する場合があります。たとえば、メモリが不足してきた場合や、他のプロセスでユーザーにすばやく応答する必要がある場合です。プロセスが終了すると、そのプロセス内で実行されているアプリケーション コンポーネントは破棄されます。それらのコンポーネントで処理する作業がもう一度発生すると、そのためのプロセスが再び開始されます。
-</p>
+</p>
<p>
Android では、どのプロセスを終了させるかを判断するため、ユーザーにとっての相対的な重要度を重み付けして管理します。たとえば、アクティビティがまだ画面に表示されているプロセスを終了させるよりも、アクティビティが画面に表示されていないプロセスを終了させる方が合理的です。したがって、プロセスを終了させるかどうかは、そのプロセスで実行されているコンポーネントの状態に応じて判断されるということです。コンポーネントの状態については、後ほど<a href="#lcycles">コンポーネントのライフサイクル</a>で詳しく説明します。
@@ -507,7 +507,7 @@
<h3 id="threads">スレッド</h3>
<p>
-アプリケーションを単一のプロセスに限定したとしても、バックグラウンドでの処理にスレッドが必要になることはよくあります。ユーザー インターフェースはユーザーのアクションに対して常にすばやく応答できなければならないため、アクティビティをホストするスレッドで、ネットワーク ダウンロードのような時間のかかる処理を一緒にホストしないようにする必要があります。すぐに完了しない可能性のあるすべての処理は、別のスレッドに割り当てるようにしてください。
+アプリケーションを単一のプロセスに限定したとしても、バックグラウンドでの処理にスレッドが必要になることはよくあります。ユーザー インターフェースはユーザーのアクションに対して常にすばやく応答できなければならないため、アクティビティをホストするスレッドで、ネットワーク ダウンロードのような時間のかかる処理を一緒にホストしないようにする必要があります。すぐに完了しない可能性のあるすべての処理は、別のスレッドに割り当てるようにしてください。
</p>
<p>
@@ -549,19 +549,19 @@
<li>サービスのクライアント（ローカル側）には <code>{@link android.content.ServiceConnection#onServiceConnected
onServiceConnected()}</code> および<code>{@link android.content.ServiceConnection#onServiceDisconnected
onServiceDisconnected()}</code> メソッドが実装されているため、リモート サービスとの接続が確立されたときや切断されたときには通知を受けることができます。通知があり次第、<code>{@link android.content.Context#bindService bindService()}</code> を呼び出して接続を設定します。
-</li>
+</li>
-<li>
+<li>
サービスの <code>{@link android.app.Service#onBind onBind()}</code> メソッドは、受け取ったインテント（{@code bindService()} に渡されたインテント）に応じて、接続を承認または拒否するために実装します。接続が承認されると、接続を承認するのであれば、スタブ サブクラスのインスタンスを返します。
</li>
-<li>サービスが接続を承認すると、Android がクライアントの {@code onServiceConnected()} メソッドを呼び出し、IBinder オブジェクト（サービスが管理するスタブ サブクラスのプロキシ）を渡します。クライアントは、このプロキシを介してリモートサービスを呼び出すことができます。
+<li>サービスが接続を承認すると、Android がクライアントの {@code onServiceConnected()} メソッドを呼び出し、IBinder オブジェクト（サービスが管理するスタブ サブクラスのプロキシ）を渡します。クライアントは、このプロキシを介してリモートサービスを呼び出すことができます。
</li>
</ul>
<p>
ここでは、説明を簡単にするため、RPC メカニズムの細かい点は省略しています。詳しくは、<a href="{@docRoot}guide/components/aidl.html">Designing a Remote Interface Using AIDL</a>、および {@link android.os.IBinder IBinder} クラスの説明をご覧ください。
-</p>
+</p>
<h3 id="tsafe">スレッドセーフなメソッド</h3>
@@ -572,18 +572,18 @@
<p>
前のセクションで説明した RPC のようにメソッドをリモートで呼び出すことができる場合は、このような状況が特に発生しやすくなります。IBinder オブジェクトに実装されているメソッドを IBinder と同じプロセスから呼び出すと、そのメソッドは呼び出し側のスレッドで実行されます。一方、別のプロセスからメソッドを呼び出した場合は、プロセスのメイン スレッドではなく、IBinder と同じプロセス内に保持されているスレッドのプールから選択されたスレッドで実行されます。たとえば、サービスの {@code onBind()} メソッドはそのサービスのプロセスのメイン スレッドから呼び出されるのに対し、{@code onBind()} から返されたオブジェクトに実装されているメソッド（たとえば RPC メソッドを実装するスタブ サブクラス）はプール内のスレッドから呼び出されます。サービスには複数のクライアントを割り当てることができるため、複数のプール スレッドを同じ IBinder に同時に割り当てることも可能です。したがって、IBinder メソッドはスレッドセーフになるように実装する必要があります。
-</p>
+</p>
<p>
同様に、コンテンツ プロバイダも別のプロセスからのデータ リクエストを受け取ることができます。ContentResolver および ContentProvider クラスはプロセス間通信の管理の詳細を隠蔽しますが、それらのリクエストに応答する ContentProvider メソッド（<code>{@link android.content.ContentProvider#query query()}</code>、<code>{@link android.content.ContentProvider#insert insert()}</code>、<code>{@link android.content.ContentProvider#delete delete()}</code>、<code>{@link android.content.ContentProvider#update update()}</code>、および <code>{@link android.content.ContentProvider#getType getType()}</code> メソッド）は、プロセスのメイン スレッドではなく、コンテンツ プロバイダのプロセス内のスレッドのプールから呼び出されます。これらのメソッドを同時に呼び出すことのできるメソッドの数に制限はありません。したがって、これらのメソッドもスレッドセーフになるように実装する必要があります。
-</p>
+</p>
<h2 id="lcycles">コンポーネントのライフサイクル</h2>
<p>
アプリケーション コンポーネントにはライフサイクルがあります。ライフサイクルは、インテントへ応答することでのインスタンス化で始まり、そのインスタンスの破棄で終わります。この間、コンポーネントがアクティブなときとアクティブでないときがあり、アクティビティであればユーザーから見えるときと見えないときがあります。このセクションでは、アクティビティ、サービス、およびブロードキャスト レシーバのライフサイクルについて説明します。具体的には、それぞれがライフタイムの間に取ることのできる状態、状態の遷移を通知する方法、およびそれらの状態が、コンポーネントを実行しているプロセスが終了させられたり、インスタンスが破棄されたりする可能性への影響などについて説明します。
-</p>
+</p>
<h3 id="actlife">アクティビティのライフサイクル</h3>
@@ -624,12 +624,12 @@
. . .
}</pre>
</div>
-</div>
+</div>
<p>
-これら 7 つのメソッドを使用すると、アクティビティのライフサイクル全体を定義できます。これらを実装することで、ネストされた 3 つのループからなるアクティビティのライフサイクルを監視できます:
-</p>
+これら 7 つのメソッドを使用すると、アクティビティのライフサイクル全体を定義できます。これらを実装することで、ネストされた 3 つのループからなるアクティビティのライフサイクルを監視できます:
+</p>
<ul>
<li>アクティビティの<b>ライフタイム全体</b>は、<code>{@link android.app.Activity#onCreate onCreate()}</code> が初めて呼び出されたときに始まり、最後に <code>{@link android.app.Activity#onDestroy}</code> が呼び出されたときに終了します。アクティビティは、{@code onCreate()} で「全体的」な状態のすべての初期設定を行い、{@code onDestroy()} 残っていたリソースをすべて解放します。たとえば、ネットワークからのデータのダウンロードをバックグラウンドで実行するスレッドは、{@code onCreate()} で作成され、{@code onDestroy()} で停止します。</li>
@@ -644,8 +644,8 @@
<p>
<p style="margin-left: 2em"><img src="{@docRoot}images/activity_lifecycle.png"
-alt="Android のアクティビティ ライフサイクルの状態遷移図" /></p>
-
+alt="Android のアクティビティ ライフサイクルの状態遷移図" /></p>
+
<p>
次の表では、各メソッドについて詳しく説明し、ライフサイクル全体における位置付けを示します:
</p>
@@ -671,7 +671,7 @@
<tr>
<td rowspan="5" style="border-left: none; border-right: none;"> </td>
- <td colspan="2" align="left"><code>{@link android.app.Activity#onRestart
+ <td colspan="2" align="left"><code>{@link android.app.Activity#onRestart
onRestart()}</code></td>
<td>アクティビティが停止した後、それをもう一度開始する直前に呼び出されます。
<p>この後には、必ず {@code onStart()} が呼び出されます。</p></td>
@@ -706,16 +706,16 @@
<tr>
<td colspan="2" align="left"><code>{@link android.app.Activity#onStop onStop()}</code></td>
- <td>アクティビティがユーザーから見えなくなったときに呼び出されます。見えなくなる状況としては、アクティビティが破棄された場合や、再開された別のアクティビティ（既存か新規かを問わず）によって隠された場合が考えられます。
+ <td>アクティビティがユーザーから見えなくなったときに呼び出されます。見えなくなる状況としては、アクティビティが破棄された場合や、再開された別のアクティビティ（既存か新規かを問わず）によって隠された場合が考えられます。
<p>その後、アクティビティがユーザーとの対話に戻った場合は {@code onRestart()} が、アクティビティが完全に終了する場合は {@code onDestroy()} が呼び出されます。</p></td>
<td align="center"><strong style="color:#800000">可能</strong></td>
<td align="center">{@code onRestart()} <br/>または<br/>{@code onDestroy()}</td>
</tr>
<tr>
- <td colspan="3" align="left"><code>{@link android.app.Activity#onDestroy
+ <td colspan="3" align="left"><code>{@link android.app.Activity#onDestroy
onDestroy()}</code></td>
- <td>アクティビティが破棄される前に呼び出されます。これが、アクティビティが受け取る最後の呼び出しとなります。このメソッドが呼び出される状況としては、アクティビティが完了する場合（<code>{@link android.app.Activity#finish
+ <td>アクティビティが破棄される前に呼び出されます。これが、アクティビティが受け取る最後の呼び出しとなります。このメソッドが呼び出される状況としては、アクティビティが完了する場合（<code>{@link android.app.Activity#finish
finish()}</code> が呼び出されたとき）や、システムが領域を確保するために一時的にそのアクティビティのインスタンスを破棄する場合が考えられます。これらの 2 つの状況は、<code>{@link
android.app.Activity#isFinishing isFinishing()}</code> メソッドを使用して識別できます。</td>
<td align="center"><strong style="color:#800000">可能</strong></td>
@@ -744,8 +744,8 @@
</p>
<p>
-アクティビティが強制終了させられる前の状態を保存しておきたい場合は、アクティビティに <code>{@link android.app.Activity#onSaveInstanceState
-onSaveInstanceState()}</code> メソッドを実装します。このメソッドは、アクティビティが破棄されやすい状態になる前（つまり {@code onPause()} が呼び出される前）に呼び出されます。その際、アクティビティの動的な状態を名前/値ペアとして記録できる {@link android.os.Bundle} オブジェクトが渡されます。アクティビティがもう一度開始されると、Bundle は {@code onCreate()} だけでなく、{@code onStart()} の後に呼び出される <code>{@link
+アクティビティが強制終了させられる前の状態を保存しておきたい場合は、アクティビティに <code>{@link android.app.Activity#onSaveInstanceState
+onSaveInstanceState()}</code> メソッドを実装します。このメソッドは、アクティビティが破棄されやすい状態になる前（つまり {@code onPause()} が呼び出される前）に呼び出されます。その際、アクティビティの動的な状態を名前/値ペアとして記録できる {@link android.os.Bundle} オブジェクトが渡されます。アクティビティがもう一度開始されると、Bundle は {@code onCreate()} だけでなく、{@code onStart()} の後に呼び出される <code>{@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}</code> メソッドにも渡され、保存されている状態をそのどちらかまたは両方で復元できます。
</p>
@@ -871,15 +871,15 @@
<li><b>フォアグラウンド プロセス</b>は、ユーザーがその時点で行っている作業に必要なプロセスです。以下のいずれかの条件を満たしているプロセスは、フォアグラウンド プロセスと見なされます:
<ul>
-<li>ユーザーと対話中のアクティビティを実行している（Activity オブジェクトの <code>{@link android.app.Activity#onResume
+<li>ユーザーと対話中のアクティビティを実行している（Activity オブジェクトの <code>{@link android.app.Activity#onResume
onResume()}</code> メソッドが呼び出されている）。</li>
<li><p>ユーザーと対話中のアクティビティにバインドされているサービスを実行している。</p></li>
-<li><p>いずれかのライフサイクル コールバック（<code>{@link android.app.Service#onCreate
+<li><p>いずれかのライフサイクル コールバック（<code>{@link android.app.Service#onCreate
onCreate()}</code>、<code>{@link android.app.Service#onStart onStart()}</code>、または <code>{@link android.app.Service#onDestroy onDestroy()}</code>）を実行している {@link android.app.Service} オブジェクトを保持している。</p></li>
-<li><p><code>{@link android.content.BroadcastReceiver#onReceive
+<li><p><code>{@link android.content.BroadcastReceiver#onReceive
onReceive()}</code> メソッドを実行している {@link android.content.BroadcastReceiver} オブジェクトを保持している。</p></li>
</ul>
@@ -899,10 +899,10 @@
可視プロセスは、非常に重要なプロセスと見なされ、すべてのフォアグラウンド プロセスの実行を維持するために必要でない限り、強制終了させられることはありません。
</p></li>
-<li><p><b>サービス プロセス</b>は、<code>{@link android.content.Context#startService startService()}</code> メソッドで開始されたサービスを実行しているプロセスのうち、より重要度の高い 2 つのレベルのどちらにも該当しないプロセスです。サービス プロセスは、ユーザーに見えるものとの直接的な関係はありませんが、たとえばバックグラウンドでの MP3 の再生、ネットワークからのデータのダウンロードなど、ユーザーが気にかけている処理であることが一般的です。したがって、すべてのフォアグラウンド プロセスと可視プロセスに加え、これらのサービス プロセスの実行を維持するだけのメモリが確保できる限り、強制終了させられることはありません。
+<li><p><b>サービス プロセス</b>は、<code>{@link android.content.Context#startService startService()}</code> メソッドで開始されたサービスを実行しているプロセスのうち、より重要度の高い 2 つのレベルのどちらにも該当しないプロセスです。サービス プロセスは、ユーザーに見えるものとの直接的な関係はありませんが、たとえばバックグラウンドでの MP3 の再生、ネットワークからのデータのダウンロードなど、ユーザーが気にかけている処理であることが一般的です。したがって、すべてのフォアグラウンド プロセスと可視プロセスに加え、これらのサービス プロセスの実行を維持するだけのメモリが確保できる限り、強制終了させられることはありません。
</p></li>
-<li><p><b>バックグラウンド プロセス</b>は、その時点でユーザーから見えないアクティビティを保持している（Activity オブジェクトの <code>{@link android.app.Activity#onStop onStop()}</code> メソッドが呼び出されている）プロセスです。これらのプロセスは、ユーザー エクスペリエンスに直接的には影響しておらず、フォアグラウンド、可視、サービス プロセスからメモリが要求された場合はいつでも強制終了する可能性があります。通常は数多くのバックグラウンド プロセスが実行されているため、それらを LRU（least recently used）リストに登録し、ユーザーが一番最近見たアクティビティのプロセスが最後に強制終了するような仕組みになっています。アクティビティにライフサイクル メソッドが正しく実装されており、現在の状態が正しく保存されていれば、プロセスを強制終了してもユーザー エクスペリエンスに悪影響が及ぶことはありません。
+<li><p><b>バックグラウンド プロセス</b>は、その時点でユーザーから見えないアクティビティを保持している（Activity オブジェクトの <code>{@link android.app.Activity#onStop onStop()}</code> メソッドが呼び出されている）プロセスです。これらのプロセスは、ユーザー エクスペリエンスに直接的には影響しておらず、フォアグラウンド、可視、サービス プロセスからメモリが要求された場合はいつでも強制終了する可能性があります。通常は数多くのバックグラウンド プロセスが実行されているため、それらを LRU（least recently used）リストに登録し、ユーザーが一番最近見たアクティビティのプロセスが最後に強制終了するような仕組みになっています。アクティビティにライフサイクル メソッドが正しく実装されており、現在の状態が正しく保存されていれば、プロセスを強制終了してもユーザー エクスペリエンスに悪影響が及ぶことはありません。
</p></li>
<li><p><b>空のプロセス</b>は、アクティブなアプリケーション コンポーネントを保持していないプロセスです。このようなプロセスを維持しておく唯一の理由は、これをキャッシュとして使用し、次回コンポーネントを実行するときの起動時間を短くするためです。多くの場合、システムはこれらのプロセスを強制終了させて、プロセス キャッシュとその基礎となるカーネル キャッシュの間でシステム リソース全体のバランスを取ります。</p></li>
@@ -915,7 +915,7 @@
<p>
また、あるプロセスに他のプロセスが依存しているために、そのプロセスのランクが引き上げられる可能性もあります。他のプロセスから依存されているプロセスが、依存しているプロセスよりも低いレベルにランク付けされることはありません。たとえば、プロセス A 内のコンテンツ プロバイダにプロセス B 内のクライアントが依存している場合や、プロセス A 内のサービスがプロセス B 内のコンポーネントにバインドされている場合、プロセス A は常にプロセス B よりは重要度が高いと見なされます。
-</p>
+</p>
<p>
サービスを実行しているプロセスは、バックグラウンド アクティビティを実行しているプロセスよりも高くランク付けされます。したがって、時間のかかる処理を実行する場合、特にその処理がアクティビティよりも長く続くような場合は、単にスレッドを生成するのではなく、その処理用のサービスを開始することをおすすめします。たとえば、バックグラウンドで音楽を再生する場合や、カメラで撮影した写真を Web サイトにアップロードする場合などはこれに当たります。サービスを使用することで、アクティビティがどのような状況にあっても、処理の重要度として「サービス プロセス」レベル以上を維持できます。<a href="#broadlife">ブロードキャスト レシーバのライフサイクル</a>のセクションでも説明しましたが、ブロードキャスト レシーバにおいてもこれと同じ理由で、処理に時間がかかる場合はスレッドではなくサービスを使用することをおすすめします。
diff --git a/docs/html-intl/intl/ja/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/ja/guide/topics/manifest/manifest-intro.jd
index 7d9e8ac..a0041de 100644
--- a/docs/html-intl/intl/ja/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/ja/guide/topics/manifest/manifest-intro.jd
@@ -38,10 +38,10 @@
これらの宣言によって、Android システムは、どんなコンポーネントがあり、それらのコンポーネントがどのような条件で起動されるのかを把握できます。
</li>
-<li>アプリケーション コンポーネントをホストするプロセスを決定します。</li>
+<li>アプリケーション コンポーネントをホストするプロセスを決定します。</li>
<li>アプリケーションが API の保護された部分にアクセスしたり他のアプリケーションとやり取りしたりする際に必要となるパーミッションを宣言します。
-</li>
+</li>
<li>他のアプリケーションがアプリケーションのコンポーネントとやり取りするために必要なパーミッションを宣言します。
</li>
@@ -66,7 +66,7 @@
エレメントの詳細を見るには、図中、図の下にあるアルファベット順のエレメント一覧、またはその他の説明文に表示されているエレメント名をクリックしてください。
-
+
</p>
<pre>
@@ -128,7 +128,7 @@
<p>
以下は、マニフェスト ファイルに含むことができるすべてのエレメントをアルファベット順に並べたものです。
使用が許可されているのはこれらのエレメントのみです。独自のエレメントや属性は追加できません。
-
+
</p>
<p style="margin-left: 2em">
@@ -158,7 +158,7 @@
</p>
-
+
<h2 id="filec">ファイルの規則</h2>
@@ -218,7 +218,7 @@
-
+
<p>
サブクラスを定義する場合は、コンポーネント クラス（{@link android.app.Activity}、{@link android.app.Service}、{@link android.content.BroadcastReceiver}、{@link android.content.ContentProvider}）でいつも行うように、サブクラスは {@code name} 属性で宣言されます。
@@ -244,7 +244,7 @@
-以下は、上記のものと同じ内容です。
+以下は、上記のものと同じ内容です。
</p>
<pre><manifest package="com.example.project" . . . >
@@ -399,7 +399,7 @@
<p>
パーミッションは、コードの一部や端末上のデータへのアクセスを制限する機能を提供します。<i></i>
誤用や悪用によってユーザーの利用を妨げたり有害な作用をもたらす恐れのある重要なデータやコードを保護したりするための制限を設定します。
-
+
</p>
<p>
@@ -421,13 +421,13 @@
アプリケーションがパーミッションにより保護されている機能へのアクセスを必要としている場合は、<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> エレメントをマニフェスト ファイルに記述し、そのパーミッションが必要であることを宣言する必要があります。
-これによって、アプリケーションが端末にインストールされた際に、インストーラーは、アプリケーションの証明書に署名した関係機関を確認し、場合によってはユーザーに尋ねることで、要求されたパーミッションを付与するかどうかを決定します。
-
-
+これによって、アプリケーションが端末にインストールされた際に、インストーラーは、アプリケーションの証明書に署名した関係機関を確認し、場合によってはユーザーに尋ねることで、要求されたパーミッションを付与するかどうかを決定します。
+
+
パーミッションが付与されると、アプリケーションは保護された機能を使用できるようになります。
パーミッションが付与されなかった場合は、アプリケーションは機能にアクセスできず、ユーザーに通知が表示されることもありません。
-
+
</p>
<p>
@@ -464,7 +464,7 @@
アプリケーション自身によって保護が設定されている場合でも、アプリケーションの他のコンポーネントが保護されたアクティビティを起動するために、その使用を要求する必要があります。
-
+
</p>
<p>
@@ -474,7 +474,7 @@
その場合も <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> でその使用を要求する必要があります。
-
+
</p>
<p>
diff --git a/docs/html-intl/intl/ja/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/ja/guide/topics/providers/calendar-provider.jd
index 7b97c30..46409f9 100644
--- a/docs/html-intl/intl/ja/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/ja/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">インテントを使用したカレンダー データの参照</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">同期アダプタ</a></li>
</ol>
@@ -113,14 +113,14 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
+
<td>このテーブルは、該当するカレンダー固有の情報を保持します。
各行には、名前、色、同期情報など、1 つのカレンダーに関する詳細が格納されます。
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>このテーブルは、該当するイベント固有の情報を保持します。
各行には、1 つのイベントに関する情報が格納されます—イベントのタイトル、場所、開始時刻、終了時刻などが該当します。
@@ -132,7 +132,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>このテーブルは、あるイベントの発生ごとの開始時刻と終了時刻を保持します。
各行は、イベントの発生 1 回を表します。
単発イベントには、イベントのインスタンスが 1 対 1 で対応します。
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>このテーブルは、イベントの参加者（ゲスト）の情報を保持します。
各行は、1 回のイベントの 1 人のゲストを表します。
ゲストのタイプと、ゲストのイベントへの出欠の回答を指定します。
@@ -149,7 +149,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>このテーブルは、アラートや通知のデータを保持します。
各行は、1 回のイベントの 1 つのアラートを表します。1 つのイベントが複数のリマインダーを持つことができます。
1 イベントあたりの最大リマインダー数は {@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS} で指定され、指定されたカレンダーを所有する同期アダプタによって設定されます。
@@ -159,7 +159,7 @@
リマインダーは、イベント開始前の分単位で指定され、ユーザーに注意喚起する手段を示す情報を保持します。
</td>
</tr>
-
+
</table>
<p>カレンダー プロバイダ API は、柔軟で効果的な設計になっています。ですが同時に、エンドユーザーにとって使いやすくすることや、カレンダーとそのデータの整合性を保護することが重要です。
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>カレンダーが表示対象として選択されているかどうかを示すブール値。値 0 は、このカレンダーに関連付けられているイベントを表示しないことを示します。
値 1 は、このカレンダーに関連付けられているイベントを表示することを示します。
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>カレンダーを同期してそのイベントを端末に格納するかどうかを示すブール値。
値 0 は、このカレンダーを同期せず、イベントを端末に格納しないことを指定します。
値 1 は、このカレンダーのイベントを同期し、イベントを端末に格納することを指定します。
@@ -268,13 +268,13 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>ACCOUNT_TYPE を含める必要がある理由
</h3> <p>{@link android.provider.CalendarContract.Calendars#ACCOUNT_NAME Calendars.ACCOUNT_NAME} にクエリする場合は、このセクションに {@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE} も含める必要があります。
@@ -289,7 +289,7 @@
-</p> </div> </div>
+</p> </div> </div>
<p> この例の次の部分では、クエリを作成します。クエリの条件は selection に指定しています。
@@ -308,38 +308,38 @@
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>次のセクションでは、カーソルを使用して結果セットをステップ単位で移動します。例の冒頭で設定した定数を使用して各フィールドの値を返します。
</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">カレンダーの変更</h3>
<p>カレンダーのアップデートを実行する場合、カレンダーの {@link android.provider.BaseColumns#_ID} を、URI（{@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}）の末尾に追加された ID として、または最初の selection 項目として指定できます。
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td><a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a> 形式でのイベントの期間。たとえば、<code>"PT1H"</code> という値はイベントが 1 時間であること、<code>"P2W"</code> という値は期間が 2 週間であることを示します。
@@ -444,24 +444,24 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>値 1 は、そのイベントがローカルのタイムゾーンで定義された終日を占めることを示します。
値 0 は、1 日のどこかで始まって終わる定例のイベントであることを示します。
</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>イベント形式の繰り返し発生ルール。たとえば、<code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code> のようになります。
その他の例については、<a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">こちら</a>をご覧ください。
</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
<td>イベントの繰り返し発生日。通常、{@link android.provider.CalendarContract.EventsColumns#RDATE} は {@link android.provider.CalendarContract.EventsColumns#RRULE} と組み合わせて、繰り返し発生全体を定義するのに使用します。
@@ -470,13 +470,13 @@
詳細については、<a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">RFC5545 の仕様</a>をご覧ください。</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
+
<td>このイベントを埋まっている時間に数えるか、それともスケジュールのやり直しが利く空き時間とみなすか。
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -514,11 +514,11 @@
</li>
-
+
<li>繰り返されないイベントには、{@link android.provider.CalendarContract.EventsColumns#DTEND} を含める必要があります。
</li>
-
-
+
+
<li>繰り返されるイベントには、{@link android.provider.CalendarContract.EventsColumns#RRULE} と {@link android.provider.CalendarContract.EventsColumns#RDATE} に加えて {@link android.provider.CalendarContract.EventsColumns#DURATION} を含める必要があります。
@@ -528,7 +528,7 @@
</li>
-
+
</ul>
<p>イベントの挿入の例を次に示します。簡潔にするため、この例は UI スレッドで実行されています。
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -625,7 +625,7 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">Attendees テーブル</h2>
@@ -637,7 +637,7 @@
この {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} は特定のイベントの {@link android.provider.BaseColumns#_ID} と一致している必要があります。
-</p>
+</p>
<p>次の表に、書き込み可能なフィールドを示します。
新しい参加者を挿入する際には、<code>ATTENDEE_NAME</code> を除くすべてを含める必要があります。
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>インスタンスの、カレンダーのタイムゾーンにおけるユリウス暦での終了日。
-
-
+
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>カレンダーのタイムゾーンにおける午前零時を基準にしたインスタンスの終了分。
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>インスタンスの、カレンダーのタイムゾーンにおけるユリウス暦での開始日。
+ <td>インスタンスの、カレンダーのタイムゾーンにおけるユリウス暦での開始日。
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>カレンダーのタイムゾーンにおける午前零時を基準にしたインスタンスの開始分。
-
+
</td>
-
+
</tr>
</table>
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -924,7 +924,7 @@
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
URI は、{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI} を使用しても参照できます。
このインテントの使用例については、<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">インテントを使用したカレンダー データの参照</a>をご覧ください。
-
+
</td>
<td><code><ms_since_epoch></code> に指定された時刻でカレンダーを開きます。</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
+
URI は、{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} を使用しても参照できます。
このインテントの使用例については、<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">インテントを使用したカレンダー データの参照</a>をご覧ください。
-
+
</td>
<td><code><event_id></code> で指定されたイベントを参照します。</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
+
URI は、{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} を使用しても参照できます。
このインテントの使用例については、<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">インテントを使用したカレンダー データの編集</a>をご覧ください。
-
-
+
+
</td>
<td><code><event_id></code> で指定されたイベントを編集します。</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
+
URI は、{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} を使用しても参照できます。
このインテントの使用例については、<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">インテントを使用したカレンダー データの挿入</a>をご覧ください。
-
+
</td>
<td>イベントを作成します。</td>
@@ -996,7 +996,7 @@
<td>イベントの名前。</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME CalendarContract.EXTRA_EVENT_BEGIN_TIME}
</td>
<td>イベントの開始時刻（エポックからのミリ秒単位）。</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME CalendarContract.EXTRA_EVENT_END_TIME}
</td>
-
+
<td>イベントの終了時刻（エポックからのミリ秒単位）。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY CalendarContract.EXTRA_EVENT_ALL_DAY}
</td>
-
+
<td>イベントが終日かどうかを示すブール値。使用できる値は <code>true</code> または <code>false</code> です。
</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION Events.EVENT_LOCATION}
</td>
-
+
<td>イベントの場所。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION Events.DESCRIPTION}
</td>
-
+
<td>イベントの説明。</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL Events.ACCESS_LEVEL}
</td>
-
+
<td>イベントが公開か非公開か。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY Events.AVAILABILITY}
</td>
-
+
<td>このイベントを埋まっている時間に数えるか、それともスケジュールのやり直しが利く空き時間とみなすか。</td>
-
-</table>
+
+</table>
<p>次のセクションでは、これらのインテント使用方法を説明します。</p>
@@ -1059,14 +1059,14 @@
</p>
-
+
<p>このアプローチのアプリケーションをユーザーが実行すると、アプリケーションによってユーザーがカレンダーに誘導されイベントを追加できるようになります。
{@link android.content.Intent#ACTION_INSERT INSERT} インテントは、追加フィールドを使用して、カレンダーに格納されている詳細情報をフォームに自動入力します。
それに対して、ユーザーはイベントのキャンセル、必要に応じたイベントの編集、イベントのカレンダーへの保存ができます。
</p>
-
+
<p>次に示すのは、2012 年 1 月 19 日の午前 7:30 から 午前 8:30 までのイベントをスケジュールするコード スニペットです。
@@ -1075,7 +1075,7 @@
<ul>
<li>URI として {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} を指定しています。
</li>
-
+
<li>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME CalendarContract.EXTRA_EVENT_BEGIN_TIME} と {@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME CalendarContract.EXTRA_EVENT_END_TIME} の各エクストラ フィールドを使用して、イベントの時間をフォームに自動入力しています。
@@ -1083,10 +1083,10 @@
これらの値は、エポックからの UTC ミリ秒単位であることが必要です。
</li>
-
+
<li>{@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL} エクストラ フィールドを使用して、参加者をメールアドレスで示したコンマ区切りリストを指定しています。
</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,12 +1158,12 @@
<ul>
<li>同期アダプタは、{@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} を <code>true</code> に設定して、それが同期アダプタであることを示す必要があります。</li>
-
-
+
+
<li>同期アダプタは、{@link android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} と {@link android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} をクエリ パラメータとして URI に指定する必要があります。
</li>
-
+
<li>同期アダプタは、アプリケーションやウィジェットより多くの列に書き込みアクセスできます。
たとえば、アプリケーションで変更できるのは、名前、表示名、可視性の設定、カレンダーが同期対象かどうかなど、カレンダーの特性の一部のみです。
diff --git a/docs/html-intl/intl/ja/guide/topics/providers/contacts-provider.jd b/docs/html-intl/intl/ja/guide/topics/providers/contacts-provider.jd
index e12b62f..09bc249 100644
--- a/docs/html-intl/intl/ja/guide/topics/providers/contacts-provider.jd
+++ b/docs/html-intl/intl/ja/guide/topics/providers/contacts-provider.jd
@@ -2146,19 +2146,19 @@
viewStreamItemPhotoActivity="<em>viewphotostream_activity_name</em>">
</pre>
<p>
- <strong>含まれているファイル:</strong>
+ <strong>含まれているファイル:</strong>
</p>
<p>
<code>res/xml/contacts.xml</code>
</p>
<p>
- <strong>含めることのできる要素:</strong>
+ <strong>含めることのできる要素:</strong>
</p>
<p>
<strong><code><ContactsDataKind></code></strong>
</p>
<p>
- <strong>説明:</strong>
+ <strong>説明:</strong>
</p>
<p>
ユーザーが連絡先の 1 人をソーシャル ネットワーキングに招待できるようにしたり、ソーシャル ネットワーキング ストリームのどれかがアップデートされたらユーザーに通知したりするための、Android コンポーネントや UI ラベルを宣言します。
@@ -2170,7 +2170,7 @@
</p>
<p>
- <strong>属性:</strong>
+ <strong>属性:</strong>
</p>
<dl>
<dt>{@code inviteContactActivity}</dt>
@@ -2248,11 +2248,11 @@
android:detailColumn="<em>column_name</em>">
</pre>
<p>
- <strong>含まれているファイル:</strong>
+ <strong>含まれているファイル:</strong>
</p>
<code><ContactsAccountType></code>
<p>
- <strong>説明:</strong>
+ <strong>説明:</strong>
</p>
<p>
この要素は、カスタムデータ行のコンテンツを未加工連絡先の詳細の一部として連絡先アプリケーションに表示させるために使用します。
@@ -2263,7 +2263,7 @@
</p>
<p>
- <strong>属性:</strong>
+ <strong>属性:</strong>
</p>
<dl>
<dt>{@code android:mimeType}</dt>
diff --git a/docs/html-intl/intl/ja/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/ja/guide/topics/providers/content-provider-creating.jd
index af21814..b14174f 100644
--- a/docs/html-intl/intl/ja/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/ja/guide/topics/providers/content-provider-creating.jd
@@ -377,7 +377,7 @@
プロバイダの任意のコンテンツ URI に一致します。
</dd>
<dt>
- <code>content://com.example.app.provider/table2/*</code>:
+ <code>content://com.example.app.provider/table2/*</code>:
</dt>
<dd>
テーブル <code>dataset1</code> と <code>dataset2</code> のコンテンツ URI に一致しますが、<code>table1</code> や <code>table3</code> のコンテンツ URI には一致しません。
@@ -791,7 +791,7 @@
タイプ部分: <code>vnd</code>
</li>
<li>
- サブタイプ部分:
+ サブタイプ部分:
<ul>
<li>
URI パターンが 1 つの行の場合: <code>android.cursor.<strong>item</strong>/</code>
diff --git a/docs/html-intl/intl/ja/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/ja/guide/topics/resources/providing-resources.jd
index 6729e8b6..2024d5d 100644
--- a/docs/html-intl/intl/ja/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/ja/guide/topics/resources/providing-resources.jd
@@ -110,7 +110,7 @@
<tr>
<td><code>drawable/</code></td>
- <td><p>ビットマップ ファイル（{@code .png}、{@code .9.png}、{@code .jpg}、{@code .gif}）または次のドローアブル リソース サブタイプにコンパイルされる XML ファイル:
+ <td><p>ビットマップ ファイル（{@code .png}、{@code .9.png}、{@code .jpg}、{@code .gif}）または次のドローアブル リソース サブタイプにコンパイルされる XML ファイル:
</p>
<ul>
<li>ビットマップ ファイル</li>
@@ -510,7 +510,7 @@
</p>
<p>API レベル 4 で追加。<em></em></p>
-
+
<p>詳細については、「<a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>」をご覧ください。
</p>
<p>さらに、{@link android.content.res.Configuration#screenLayout} 設定フィールドもご覧ください。これは、画面のサイズが小、中、大のいずれかであるかを表します。
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/controls.jd b/docs/html-intl/intl/ja/guide/topics/ui/controls.jd
index 0bc2063..c76771f 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">ラジオボタン</a></td>
<td>グループで選択できるオプションは 1 つのみであることを除き、チェックボックスと同様です。</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/ja/guide/topics/ui/dialogs.jd
index 358fc30..006dc99 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>関連ドキュメント</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">ダイアログ デザインのガイド</a></li>
@@ -142,7 +142,7 @@
<div class="figure" style="width:290px;margin:0 0 0 20px">
<img src="{@docRoot}images/ui/dialog_buttons.png" alt="" />
-<p class="img-caption"><strong>図 1</strong>
+<p class="img-caption"><strong>図 1</strong>
メッセージと 2 つのアクション ボタンを含むダイアログ</p>
</div>
@@ -248,7 +248,7 @@
<dt>Neutral</dt>
<dd>ユーザーがアクションを続けたくない可能性があり、キャンセルしたいとは限らない場合に使います。
ポジティブ ボタンとネガティブ ボタンの間に表示されます。
-たとえば、「後で通知する」のようなアクションの場合です。</dd>
+たとえば、「後で通知する」のようなアクションの場合です。</dd>
</dl>
<p>各ボタンタイプのいずれか 1 つのみを {@link
@@ -258,7 +258,7 @@
<div class="figure" style="width:290px;margin:0 0 0 40px">
<img src="{@docRoot}images/ui/dialog_list.png" alt="" />
-<p class="img-caption"><strong>図 3</strong>
+<p class="img-caption"><strong>図 3</strong>
タイトルとリストを含むダイアログ</p>
</div>
@@ -318,7 +318,7 @@
<h4 id="Checkboxes">固定の複数選択または排他的選択リストを追加する</h4>
<p>複数選択アイテム（チェックボックス）または排他的選択アイテム（ラジオボタン）のリストを追加するには、{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} または {@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} または {@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} メソッドをそれぞれ使用します。
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -372,7 +372,7 @@
</pre>
<p>従来のリストとラジオボタンを含むリストでは、「排他的選択」アクションが提供されますが、ユーザーの選択を固定させたい場合は、{@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} を使用してください。つまり、ダイアログを後でもう一度開く場合は、ユーザーの現在の選択を表示し、ラジオボタンを含むリストを作成します。
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/menus.jd b/docs/html-intl/intl/ja/guide/topics/ui/menus.jd
index 7d8090e..53142a1b 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/menus.jd
@@ -83,9 +83,9 @@
</p>
<p><a href="#options-menu">オプション メニューの作成</a>のセクションをご覧ください。</p>
</dd>
-
+
<dt><strong>コンテキスト メニューとコンテキスト アクション モード</strong></dt>
-
+
<dd>コンテキスト メニューは、ユーザーが要素を長押しクリックするときに表示される<a href="#FloatingContextMenu">フローティング メニュー</a>です。
ここでは、選択したコンテンツやコンテキスト フレームに影響するアクションが提供されます。
@@ -94,7 +94,7 @@
</p>
<p><a href="#context-menu">コンテキスト メニューの作成</a>のセクションをご覧ください。</p>
</dd>
-
+
<dt><strong>ポップアップ メニュー</strong></dt>
<dd>ポップアップ メニューでは、メニューを呼び出すビューに固定された縦方向のリストでアイテムが表示されます。
特定のコンテンツに関連するアクションの概要を表示したり、コマンドの 2 番目の部分のオプションを表示したりする場合に適しています。
@@ -135,7 +135,7 @@
<dt><code><item></code></dt>
<dd>メニューで 1 つのアイテムを表示する {@link android.view.MenuItem} を作成します。この要素には、サブメニューを作成するために、ネストされた <code><menu></code> 要素を含めることができます。
</dd>
-
+
<dt><code><group></code></dt>
<dd>省略可能な {@code <item>} 要素の非表示コンテナ。メニュー アイテムでアクティブ状態や可視性のようなプロパティを共有できるよう、メニュー アイテムを分類できます。
詳細については、<a href="#groups">メニュー グループの作成</a>のセクションをご覧ください。
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..a8df89d
--- /dev/null
+++ b/docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd
@@ -0,0 +1,589 @@
+page.title=マルチ ウィンドウのサポート
+page.metaDescription=複数のアプリを同時に表示するための Android N の新しいサポート。
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>このドキュメントの内容</h2>
+ <ol>
+ <li><a href="#overview">概要</a></li>
+ <li><a href="#lifecycle">マルチ ウィンドウ ライフサイクル</a></li>
+ <li><a href="#configuring">マルチ ウィンドウ モード向けアプリを構成する</a>
+</li>
+ <li><a href="#running">マルチ ウィンドウ モードでアプリを実行する</a></li>
+ <li><a href="#testing">アプリのマルチ ウィンドウ サポートをテストする</a></li>
+ </ol>
+ <h2>関連ドキュメント</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">マルチ ウィンドウ Playground のサンプルアプリ</a>
+</li>
+ <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Android N でマルチ ウィンドウを準備するための 5 つのヒント</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N には、複数のアプリを同時に表示するためのサポートが追加されています。
+ハンドヘルド端末で、分割画面モードにして、2 つのアプリを並べて実行したり、重ねて表示したりできます。<em></em>
+TV 端末で、アプリがピクチャ イン ピクチャ モードで動画を再生しているときに、ユーザーは別のアプリを操作できます。<em></em>
+
+
+</p>
+
+<p>
+ N Preview SDK でアプリをビルドする場合、アプリがマルチ ウィンドウ ディスプレイを処理をする方法を設定できます。
+たとえば、アクティビティの最小許容ディメンションを指定できます。
+また、アプリに対してマルチ ウィンドウ ディスプレイを無効にし、アプリを全画面モードのみで表示することもできます。
+
+
+</p>
+
+<h2 id="overview">概要</h2>
+
+<p>
+ Android N では、複数のアプリが画面を同時に共有できます。たとえば、ユーザーは画面を分割し、ウェブページを左側の画面に表示しながら、右側の画面でメールを作成することができます。
+
+ユーザー エクスペリエンスは端末によって異なります。
+
+</p>
+
+<ul>
+ <li>Android N を実行しているハンドヘルド端末は、分割画面モードに対応しています。
+このモードでは、画面で 2 つのアプリが実行され、これらのアプリを並べて、または重ねて表示できます。
+ユーザーは、2 つのアプリを分離している分割線をドラッグして、1 つのアプリを拡大し、もう 1 つのアプリを縮小することができます。
+
+ </li>
+
+ <li>Android N を実行している Nexus Player で、アプリを<a href="picture-in-picture.html">ピクチャ イン ピクチャ モード</a>にすると、アプリにコンテンツを表示したまま、ユーザーは他のアプリをブラウジングまたは操作することができます。
+
+
+
+ </li>
+
+ <li>より大きい画面の端末のメーカーは、ユーザーが各アクティビティのサイズを自由に変更できるフリーフォーム モードを有効にすることもできます。
+メーカーがこの機能を有効にした場合、端末では、分割画面モードに加えて、フリーフォーム モードが利用できます。
+
+
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>図 1.</strong> 分割画面モードで並べて実行されている 2 つのアプリ。
+</p>
+
+<p>
+ ユーザーは、次の方法でマルチ ウィンドウ モードに切り替えることができます。
+</p>
+
+<ul>
+ <li>ユーザーは <a href="{@docRoot}guide/components/recents.html">[Overview] 画面</a>を開いているときに、アクティビティのタイトルを長押ししてから、そのアクティビティを画面の強調表示された部分にドラッグすることにより、アクティビティをマルチ ウィンドウ モードにすることができます。
+
+
+
+ </li>
+
+ <li>ユーザーが [Overview] ボタンを長押しすると、現在のアクティビティがマルチ ウィンドウ モードになり、[Overview] 画面が開くので、ユーザーは、画面で共有する別のアクティビティを選択できるようになります。
+
+
+ </li>
+</ul>
+
+<p>
+ ユーザーは、複数のアクティビティが画面を共有しているときに、データを 1 つのアクティビティから別のアクティビティに<a href="{@docRoot}guide/topics/ui/drag-drop.html">ドラッグ＆ドロップ</a>できます
+
+（以前は、単一のアクティビティ内でのみデータをドラッグ＆ドロップできました）。
+
+</p>
+
+<h2 id="lifecycle">マルチ ウィンドウ ライフサイクル</h2>
+
+<p>
+ マルチ ウィンドウ モードは、<a href="{@docRoot}training/basics/activity-lifecycle/index.html">アクティビティのライフサイクル</a>を変更しません。
+
+</p>
+
+<p>
+ マルチ ウィンドウ モードでは、ユーザーが直前に操作したアクティビティのみが任意の時点でアクティブになります。
+このアクティビティは、トップ レベルにあると見なされます。<em></em>
+ 他のすべてのアクティビティは、表示されていても一時停止状態になっています。
+ ただし、一時停止状態ではあるが、表示されているこれらのアクティビティには、表示されていないアクティビティよりも高い優先度が付与されます。
+ユーザーが一時停止状態のアクティビティのいずれかを操作した場合、そのアクティビティが再開され、前のトップ レベルのアクティビティが一時停止します。
+
+
+</p>
+
+<p class="note">
+ <strong>注:</strong>マルチ ウィンドウ モードでは、アプリが一時停止状態になっても、そのアプリを表示したままにすることができます。
+アプリは、一時停止していても、アクティビティを続行する必用がある場合があります。
+たとえば、一時停止モードになっているが、表示されている動画再生アプリは、動画の表示を継続する必要があります。
+そのため、動画を再生するアクティビティが {@link android.app.Activity#onPause onPause()} ハンドラで動画を一時停止しないようにすることをお勧めします。
+
+<em></em>
+ その代わり、これらのアクティビティは {@link android.app.Activity#onStop
+ onStop()} で動画を一時停止し、{@link android.app.Activity#onStart
+ onStart()} で動画の再生を再開する必要があります。
+</p>
+
+<p>
+ <a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>で指定したように、ユーザーがアプリをマルチ ウィンドウ モードにすると、アクティビティに構成の変更が通知されます。
+
+これは、ユーザーがアプリのサイズを変更するか、アプリを全画面モードに戻した場合にも行われます。
+
+ 基本的に、この構成の変更は、端末が縦表示から横表示に切り替えられたことをアプリに通知する場合と同じ影響（端末のディメンションが変更された場合を除いて）をアクティビティのライフサイクルに及ぼします。
+
+
+<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>で説明したように、アクティビティは構成の変更を処理することができます。または、システムによってアクティビティを破棄し、新しいディメンションでアクティビティを再作成することもできます。
+
+
+
+</p>
+
+<p>
+ ユーザーがウィンドウのサイズを変更して、高さや幅を拡大した場合、ユーザー操作に一致するようにアクティビティのサイズが変更され、必要に応じて、<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更</a>が発行されます。
+
+アプリで新しく表示された領域を描画するまでに時間がかかる場合、{@link
+ android.R.attr#windowBackground windowBackground} 属性またはデフォルトの
+<code>windowBackgroundFallback</code> システム属性によって指定された色でこれらの領域が一時的に塗りつぶされます。
+
+</p>
+
+<h2 id="configuring">マルチ ウィンドウ モード向けアプリを構成する</h2>
+
+<p>
+ アプリが Android N をターゲットにしている場合は、アプリのアクティビティがマルチ ウィンドウ ディスプレイをサポートする方法や、このサポートを行うかどうかを決めることができます。
+サイズとレイアウトを制御するための属性をマニフェストに設定できます。
+
+ ルート アクティビティ属性の設定は、タスクスタック内のすべてのアクティビティに適用されます。
+たとえば、ルート アクティビティにより
+<code>android:resizeableActivity</code> が true に設定されると、タスク スタック内のすべてのアクティビティのサイズを変更できるようになります。
+
+</p>
+
+<p class="note">
+ <strong>注:</strong>Android N より前の SDK バージョンでマルチ オリエンテーション アプリをビルドして、そのアプリをマルチ ウィンドウ モードで使用する場合は、アプリのサイズが強制的に変更されます。
+
+アプリに予想外の動作が発生する場合があることをユーザーに警告するダイアログ ボックスが表示されます。
+システムは、画面の向きが固定されたアプリのサイズを変更しません。ユーザーがマルチ ウィンドウ モードで画面の向きが固定されたアプリを開こうとすると、そのアプリが全画面で表示されます。<em></em>
+
+
+
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ マルチ ウィンドウ ディスプレイを有効または無効にするには、この属性をマニフェストの <code><activity></code> ノードまたは
+<code><application></code> ノードに設定します。
+
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ この属性が true に設定されている場合、アクティビティを分割画面モードまたはフリーフォーム モードで起動できます。
+この属性が false に設定されている場合、アクティビティはマルチ ウィンドウ モードをサポートしません。
+この値が false のとき、ユーザーがアクティビティをマルチ ウィンドウ モードで起動しようとすると、アクティビティが全画面で表示されます。
+
+
+</p>
+
+<p>
+ アプリが Android N をターゲットにしているが、この属性の値が指定されていない場合、属性の値がデフォルトの true になります。
+
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ この属性をマニフェストの <code><activity></code> ノードに設定すると、アクティビティがピクチャ イン ピクチャ ディスプレイをサポートするかどうかを示すことができます。
+<code>android:resizeableActivity</code> が false の場合、この属性は無視されます。
+
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">レイアウト属性</h3>
+
+<p>
+ Android N では、<code><layout></code> マニフェスト要素により、マルチ ウィンドウ モードでのアクティビティの動作に影響を及ぼすいくつかの属性がサポートされています。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ フリーフォーム モードで起動されたときのアクティビティのデフォルトの幅です。
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ フリーフォーム モードで起動されたときのアクティビティのデフォルトの高さです。
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ フリーフォーム モードで起動されたときのアクティビティの初期配置です。適切な値については、
+{@link android.view.Gravity} のリファレンスをご覧ください。
+ </dd>
+
+ <dt>
+ <code>android:minimalHeight</code>、<code>android:minimalWidth</code>
+ </dt>
+
+ <dd>
+ 分割画面モードおよびフリーフォーム モードでのアクティビティの最小の高さと幅です。
+ユーザーが分割画面モードの分割線を移動して、アクティビティを指定された最小ディメンションよりも小さくすると、アクティビティはユーザーがリクエストしたサイズにトリミングされます。
+
+
+ </dd>
+</dl>
+
+<p>
+ たとえば、次のコードは、アクティビティがフリーフォーム モードで表示されているときに、アクティビティのデフォルトのサイズと位置、およびその最小サイズを指定する方法を示しています。
+
+
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalHeight="450dp"
+ android:minimalWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">マルチ ウィンドウ モードでアプリを実行する</h2>
+
+<p>
+ Android N では、マルチ ウィンドウ モードで実行できるアプリをサポートするための新しい機能が導入されています。
+
+</p>
+
+<h3 id="disabled-features">マルチ ウィンドウ モードで無効になる機能</h3>
+
+<p>
+ 端末がマルチ ウィンドウ モードになっている場合、特定の機能は、端末の画面を他のアクティビティやアプリと共有する場合があるアクティビティに対して機能しないため、これらの機能は無効なるか、無視されます。
+
+これらの機能には、次のものが含まれます。
+
+<ul>
+ <li><a href="{@docRoot}training/system-ui/index.html">システム UI</a> の一部のカスタマイズ オプションは無効になります。たとえば、アプリが全画面モードで実行されていない場合、アプリのステータスバーを非表示にできません。
+
+
+ </li>
+
+ <li>システムは、<code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code> 属性に加えられた変更を無視します。
+ </li>
+</ul>
+
+<h3 id="change-notification">マルチ ウィンドウの変更通知とクエリ</h3>
+
+<p>
+ マルチ ウィンドウ ディスプレイをサポートするために、次の新しいメソッドが {@link android.app.Activity} クラスに追加されています。
+各メソッドの詳細については、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>をご覧ください。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.isInMultiWindowMode()</code>
+ </dt>
+
+ <dd>
+ アクティビティがマルチ ウィンドウ モードで実行されているかどうかを判別するために呼び出します。
+ </dd>
+
+ <dt>
+ <code>Activity.isInPictureInPictureMode()</code>
+ </dt>
+
+ <dd>
+ アクティビティがピクチャ イン ピクチャ モードで実行されているかどうかを判別するために呼び出します。
+
+ <p class="note">
+ <strong>注:</strong>ピクチャ イン ピクチャ モードは、マルチ ウィンドウ モードの特別な形態です。
+<code>myActivity.isInPictureInPictureMode()</code> が true を返す場合は、<code>myActivity.isInMultiWindowMode()</code> も true を返します。
+
+
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowModeChanged()</code>
+ </dt>
+
+ <dd>
+ アクティビティがマルチ ウィンドウ モードになるか、マルチ ウィンドウ モードではなくなると、常にこのメソッドが呼び出されます。
+アクティビティがマルチ ウィンドウ モードになると、このメソッドに true 値が渡され、アクティビティがマルチ ウィンドウ モードではなくなると、このメソッドに false 値が渡されます。
+
+
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureModeChanged()</code>
+ </dt>
+
+ <dd>
+ アクティビティがピクチャ イン ピクチャ モードになるか、ピクチャ イン ピクチャ モードではなくなると、常にこのメソッドが呼び出されます。
+アクティビティがピクチャ イン ピクチャ モードになると、このメソッドに true 値が渡され、アクティビティがピクチャ イン ピクチャ モードではなくなると、このメソッドに false 値が渡されます。
+
+
+ </dd>
+</dl>
+
+<p>
+ また、これらの各メソッドの {@link android.app.Fragment} バージョンがあります。たとえば、<code>Fragment.isInMultiWindowMode()</code> です。
+
+</p>
+
+<h3 id="entering-pip">ピクチャ イン ピクチャ モードにする</h3>
+
+<p>
+ アクティビティをピクチャ イン ピクチャ モードにするには、新しいメソッド
+<code>Activity.enterPictureInPictureMode()</code> を呼び出します。端末がピクチャ イン ピクチャ モードをサポートしない場合、このメソッドの効果はありません。
+詳細については、<a href="picture-in-picture.html">ピクチャ イン ピクチャ</a>に関するドキュメントをご覧ください。
+
+</p>
+
+<h3 id="launch">マルチ ウィンドウ モードで新しいアクティビティを起動する</h3>
+
+<p>
+ 新しいアクティビティを起動するときに、可能であれば、新しいアクティビティを現在のアクティビティの隣に表示する必用があるかどうかをシステムに示すことができます。
+そうするには、フラグ
+<code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code> を使用します。
+このフラグを渡すと、次の動作がリクエストされます。
+
+</p>
+
+<ul>
+ <li>端末が分割画面モードになっている場合、システムは、起動しているアクティビティの隣に新しいアクティビティを作成しようとするので、これらの 2 つのアクティビティが画面を共有します。
+
+システムでは、この操作の実行が保証されるわけではありませんが、可能であれば、アクティビティが並べて表示されます。
+
+ </li>
+
+ <li>端末が分割画面モードではない場合、このフラグの効果はありません。
+ </li>
+</ul>
+
+<p>
+ 端末がフリーフォーム モードになっている場合、新しいアクティビティを起動するときに、
+<code>ActivityOptions.setLaunchBounds()</code> を呼び出すことにより、新しいアクティビティのディメンションと画面上での位置を指定することができます。
+端末がマルチ ウィンドウ モードではない場合、このメソッドの効果はありません。
+
+</p>
+
+<p class="note">
+ <strong>注:</strong>タスクスタック内でアクティビティを起動すると、画面上のアクティビティが起動したアクティビティに置き換えられ、すべてのマルチ ウィンドウ プロパティが継承されます。
+
+マルチ ウィンドウ モードで新しいアクティビティを別個の画面として起動する場合は、新しいアクティビティを新しいタスクスタックで起動する必要があります。
+
+</p>
+
+<h3 id="dnd">ドラッグ＆ドロップのサポート</h3>
+
+<p>
+ ユーザーは、2 つのアクティビティが画面を共有しているときに、データを 1 つのアクティビティから別のアクティビティに<a href="{@docRoot}guide/topics/ui/drag-drop.html">ドラッグ＆ドロップ</a>できます
+
+（以前は、単一のアクティビティ内でのみデータをドラッグ＆ドロップできました）。
+そのため、アプリがドラッグ＆ドロップをサポートしていない場合は、ドラッグ＆ドロップ機能をアプリに追加する必要があります。
+
+</p>
+
+<p>
+ N Preview SDK では、異なるアプリ間のドラッグ＆ドロップをサポートするために、<a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a> パッケージが拡張されています。
+次のクラスとメソッドの詳細については、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>をご覧ください。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ ドロップを受け取るアプリに付与されるパーミッションの指定を処理するトークン オブジェクトです。
+
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ {@link android.view.View#startDrag View.startDrag()} の新しいエイリアスです。異なるアクティビティ間のドラッグ＆ドロップを有効にするには、新しいフラグ
+<code>View.DRAG_FLAG_GLOBAL</code> を渡します。
+URI パーミッションを受け取る側のアクティビティに付与する必要がある場合、必要に応じて、新しいフラグ
+<code>View.DRAG_FLAG_GLOBAL_URI_READ</code> または
+<code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code> を渡します。
+
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ 実行中のドラッグ操作をキャンセルします。ドラッグ操作を開始したアプリだけが呼び出せます。
+
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ 実行中のドラッグ操作のドラッグ シャドウを置き換えます。ドラッグ操作を開始したアプリだけが呼び出せます。
+
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ {@link android.view.DragEvent} に含まれる {@link
+ android.content.ClipData} で渡されるコンテンツ URI のパーミッションをリクエストします。
+ </dd>
+</dl>
+
+<h2 id="testing">アプリのマルチ ウィンドウ サポートをテストする</h2>
+
+<p>
+ ユーザーが Android N を実行している端末をマルチ ウィンドウ モードにしてアプリの起動を試みる場合に備えて、Android N 向けにアプリをアップデートするかどうかに関係なく、アプリがマルチ ウィンドウ モードでどのように動作するかを確認する必要があります。
+
+
+</p>
+
+<h3 id="configuring">テスト端末の構成</h3>
+
+<p>
+ Android N を端末にインストールすると、分割画面モードが自動的にサポートされます。
+
+</p>
+
+<h3 id="test-non-n">アプリが N Preview SDK でビルドされていない場合</h3>
+
+<p>
+ アプリが N Preview SDK でビルドされていないときに、ユーザーがマルチ ウィンドウ モードでそのアプリを使用しようとすると、アプリが画面の向きの固定を宣言しない限り、アプリのサイズが強制的に変更されます。
+
+
+</p>
+
+<p>
+ アプリが画面の向きの固定を宣言しない場合、Android N を実行している端末でアプリを起動し、アプリを分割画面モードにすることを試みる必要があります。
+
+アプリのサイズが強制的に変更されたときに、ユーザー エクスペリエンスが許容範囲内にあることを確認してください。
+
+</p>
+
+<p>
+ アプリが画面の向きの固定を宣言する場合、アプリをマルチ ウィンドウ モードにすることを試みる必要があります。
+アプリをマルチ ウィンドウ モードにすることを試みたとき、アプリが全画面モードのままであることを確認してください。
+
+</p>
+
+<h3 id="test-mw">マルチ ウィンドウ モードをサポートする場合</h3>
+
+<p>
+ アプリが N Preview SDK でビルドされていて、マルチ ウィンドウ モードが無効になっていない場合、分割画面モードとフリーフォーム モードの両方で次の動作を確認してください。
+
+
+</p>
+
+<ul>
+ <li>アプリを全画面モードで起動してから、[Overview] ボタンを長押しして、マルチ ウィンドウ モードに切り替えます。
+モードが適切に切り替わることを確認します。
+ </li>
+
+ <li>アプリをマルチ ウィンドウ モードで直接起動し、アプリが適切に起動することを確認します。
+[Overview] ボタンを押すと、アプリをマルチ ウィンドウ モードで起動できます。次に、アプリのタイトルバーを長押しし、アプリを画面上の強調表示された領域のいずれかにドラッグします。
+
+
+ </li>
+
+ <li>分割画面モードで分割線をドラッグして、アプリのサイズを変更します。
+ アプリがクラッシュせずに、アプリのサイズが変更され、必要な UI 要素が表示されることを確認します。
+
+ </li>
+
+ <li>アプリの最小ディメンションを指定している場合、アプリのサイズをそれらのディメンション以下にすることを試みてください。
+アプリのサイズを指定最小ディメンションよりも小さくできないことを確認してください。
+
+ </li>
+
+ <li>すべてのテストを通じて、アプリのパフォーマンスが許容範囲内にあることを確認してください。たとえば、アプリのサイズを変更した後、UI の更新に大きな遅延がないことを確認してください。
+
+
+ </li>
+</ul>
+
+<h4 id="test-checklist">チェックリストのテスト</h4>
+
+<p>
+ アプリのパフォーマンスをマルチ ウィンドウ モードで確認するには、以下の操作を試みてください。
+特に記載のない限り、分割画面モードとマルチ ウィンドウ モードの両方でこれらの操作を試みる必要があります。
+
+</p>
+
+<ul>
+ <li>マルチ ウィンドウ モードを有効にしてから無効にします。
+ </li>
+
+ <li>1 つのアプリから別のアプリに切り替えたとき、最初のアプリの動作が適切であり、表示されているが、アクティブになっていないことを確認します。
+たとえば、アプリが動画を再生している場合、ユーザーが別のアプリを操作しているときに、アプリで動画の再生が継続していることを確認します。
+
+
+ </li>
+
+ <li>分割画面モードで分割線を移動して、アプリの拡大および縮小を試みてください。
+アプリを並べて表示しているときと重ねて表示しているときの両方でこれらの操作を試みてください。
+アプリがクラッシュせず、基本的な機能が表示され、サイズ変更の操作に時間がかかり過ぎないことを確認します。
+
+
+ </li>
+
+ <li>続けざまにサイズ変更の操作を行います。アプリがクラッシュしたり、メモリリークが発生したりしないことを確認します。
+アプリのメモリリークをチェックする方法の詳細については、<a href="{@docRoot}tools/debugging/debugging-memory.html">RAM の使用状況を調査する</a>をご覧ください。
+
+
+ </li>
+
+ <li>さまざまなウィンドウ構成でアプリを通常の方法で使用し、アプリが適切に動作することを確認します。
+テキストが読み取り可能であり、UI 要素が操作に支障をきたすほど小さくないことを確認します。
+
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">マルチ ウィンドウのサポートを無効にしている場合</h3>
+
+<p>
+
+<code>android:resizableActivity="false"</code> を設定して、マルチ ウィンドウのサポートを無効にした場合は、Android N を実行している端末でアプリを起動し、アプリをフリーフォーム モードおよび分割画面モードにすることを試みる必要があります。
+
+アプリをマルチ ウィンドウ モードにすることを試みたとき、アプリが全画面モードのままであることを確認してください。
+
+</p>
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/ja/guide/topics/ui/notifiers/notifications.jd
index f341256..d0f1f72 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/notifiers/notifications.jd
@@ -531,7 +531,7 @@
<li>
必要に応じて、{@link android.support.v4.app.TaskStackBuilder#editIntentAt TaskStackBuilder.editIntentAt()} を呼び出し、スタック上の {@link android.content.Intent} オブジェクトに引数を追加します。
-これは、場合によっては、ターゲット {@link android.app.Activity} に、ユーザーが
+これは、場合によっては、ターゲット {@link android.app.Activity} に、ユーザーが
<i>[戻る]</i> を使って移動したときに、適切なデータが表示されるようにするために必要です。
</li>
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/overview.jd b/docs/html-intl/intl/ja/guide/topics/ui/overview.jd
index 08d9356..7bc49f4 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>UI レイアウト作成のガイドについては、<a href="declaring-layout.html">XML レイアウト</a>をご覧ください。
-
+
<h2 id="UIComponents">ユーザー インターフェース コンポーネント</h2>
<p>{@link android.view.View} と {@link android.view.ViewGroup} オブジェクトを使用してすべての UI をビルドする必要はありません。
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/settings.jd b/docs/html-intl/intl/ja/guide/topics/ui/settings.jd
index 9e6bb9d..c36a01c 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/settings.jd
@@ -226,7 +226,7 @@
<dt>{@code android:key}</dt>
<dd>この属性は、データ値を保持するプリファレンスで必要です。設定の値を {@link android.content.SharedPreferences} に保存するときにシステムが使用する一意のキー（文字列）を指定します。
-
+
<p>プリファレンスが {@link android.preference.PreferenceCategory} または{@link android.preference.PreferenceScreen} の場合、またはプリファレンスが {@link android.content.Intent} の呼び出しを指定している場合（<a href="#Intents">{@code <intent>}</a> 要素を使用）、または {@link android.app.Fragment} の表示を指定している場合（<a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code android:fragment}</a> 属性を使用）のみ、インスタンスでこの属性は<em>必要ありません</em>。
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -672,15 +672,15 @@
</p>
<p>たとえば、以下は Android 3.0 以降で使用されるプリファレンス ヘッダーの XML ファイル（{@code res/xml/preference_headers.xml}）です。
-</p>
+</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -692,18 +692,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/ja/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/ja/guide/topics/ui/ui-events.jd
index 1cff3f6..b4b3766 100644
--- a/docs/html-intl/intl/ja/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/ui-events.jd
@@ -187,7 +187,7 @@
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - {@link android.view.ViewGroup} が、イベントが子ビューにディスパッチされたときにイベントを監視できるようにします。
</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
- ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - このメソッドを親ビュー上で呼び出すことで、<code>{@link
+ ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - このメソッドを親ビュー上で呼び出すことで、<code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code> による親ビューのタップイベントのインターセプトを許可しないことを示すことができます。
</li>
</ul>
@@ -199,7 +199,7 @@
ただし、端末にタッチ機能がある場合は、ユーザーはタップでインターフェースの操作を開始するため、アイテムをハイライトすることや、特定のビューにフォーカスを与えることは必要ではなくなりました。
そのため、「タッチモード」と名付けられた操作モードが存在します。
-
+
</p>
<p>
タッチ可能な端末では、ユーザーが画面をタップすると、端末がタッチモードになります。
@@ -233,7 +233,7 @@
<p>フォーカスの移動は、所定の方向で最も近くにあるアイテムを見つけるアルゴリズムに基づきますが、
まれに、デフォルトのアルゴリズムが開発者の意図する動作と一致しない場合もあります。
-この場合、レイアウト ファイルの
+この場合、レイアウト ファイルの
<var>nextFocusDown</var>、 <var>nextFocusLeft</var>、 <var>nextFocusRight</var>、
<var>nextFocusUp</var> の各 XML 属性を明示的にオーバーライドできます。これらの属性のいずれかを、フォーカスの移動<em>元</em>のビューに追加します。
@@ -253,11 +253,11 @@
</pre>
<p>本来、上記の縦方向のレイアウトでは、1 番上のボタンから上に移動しようとしても、2 番目のボタンから下に移動しようしても、どこにもフォーカスが移動しないはずでしたが、上記の処理により、
-1 番上のボタンによって 1 番下のボタンが
+1 番上のボタンによって 1 番下のボタンが
<var>nextFocusUp</var> として定義され（逆の場合も同様）、フォーカスが、上から下と下から上に順番に移動するようになります。
</p>
-<p>UI でビューをフォーカス可能にする場合は（従来は、ビューはフォーカス可能ではありません）、レイアウトの宣言で <code>android:focusable</code> XML 属性をビューに追加し、値を
+<p>UI でビューをフォーカス可能にする場合は（従来は、ビューはフォーカス可能ではありません）、レイアウトの宣言で <code>android:focusable</code> XML 属性をビューに追加し、値を
<var>true</var> に設定します。また、<code>android:focusableInTouchMode</code> を使用して、タッチモードのときにビューをフォーカス可能にすることもできます。
</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/ja/preview/_book.yaml b/docs/html-intl/intl/ja/preview/_book.yaml
deleted file mode 100644
index 5f1e18f..0000000
--- a/docs/html-intl/intl/ja/preview/_book.yaml
+++ /dev/null
@@ -1,342 +0,0 @@
-toc:
-- title: プログラム概要
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ikhtisar Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: サポートとリリースノート
- path: /preview/support.html
-
-- title: Preview のセットアップ
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Preview
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: 端末上でのテスト
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Pruebe en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: 動作の変更点
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: バックグラウンド処理の最適化
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: 言語とロケール
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 總覽
- section:
- - title: マルチ ウィンドウのサポート
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: 通知
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: データセーバー
- path: /preview/features/data-saver.html
- - title: TV の録画機能
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: ネットワーク セキュリティ構成
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: ICU4J のサポート
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: API de ICU4J del framework de Android
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android 框架 API
- - name: zh-tw-lang
- value: ICU4J Android 架構 API
- - title: Java 8 の言語機能
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 语言功能
- - name: zh-tw-lang
- value: Java 8 語言功能
- - title: Android for Work のアップデート
- path: /preview/features/afw.html
- - title: 特定のディレクトリへのアクセス
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: サンプル
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: 使用許諾契約
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html-intl/intl/ja/preview/api-overview.jd b/docs/html-intl/intl/ja/preview/api-overview.jd
deleted file mode 100644
index d967a67..0000000
--- a/docs/html-intl/intl/ja/preview/api-overview.jd
+++ /dev/null
@@ -1,1039 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>主なデベロッパー機能</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">マルチ ウィンドウのサポート</a></li>
- <li><a href="#notification_enhancements">通知</a></li>
- <li><a href="#jit_aot">JIT / AOT コンパイル</a></li>
- <li><a href="#quick_path_to_app_install">アプリの高速インストール</a></li>
- <li><a href="#doze_on_the_go">どこでも機能する Doze</a></li>
- <li><a href="#background_optimizations">バックグラウンド処理の最適化</a></li>
- <li><a href="#data_saver">データセーバー</a></li>
- <li><a href="#vulkan">Vulkan API</a></li>
- <li><a href="#tile_api">クイック設定タイル API</a></li>
- <li><a href="#number-blocking">電話番号のブロック</a></li>
- <li><a href="#call_screening">通話スクリーニング</a></li>
- <li><a href="#multi-locale_languages">ロケールと言語</a></li>
- <li><a href="#emoji">新しい絵文字</a></li>
- <li><a href="#icu4">Android の ICU4J API</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Android TV の録画機能</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">ユーザー補助機能</a></li>
- <li><a href="#direct_boot">ダイレクト ブート</a></li>
- <li><a href="#key_attestation">キーの構成証明</a></li>
- <li><a href="#network_security_config">ネットワーク セキュリティ構成</a></li>
- <li><a href="#default_trusted_ca">既定の信頼される証明機関</a></li>
- <li><a href="#apk_signature_v2">APK 署名スキーム v2</a></li>
- <li><a href="#scoped_directory_access">特定のディレクトリへのアクセス</a></li>
- <li><a href="#keyboard_shortcuts_helper">キーボード ショートカット ヘルパー</a></li>
- <li><a href="#sustained_performance_api">パフォーマンス維持 API</a></li>
- <li><a href="#vr">VR サポート</a></li>
- <li><a href="#print_svc">印刷サービス機能の強化</a></li>
- <li><a href="#virtual_files">仮想ファイル</a></li>
- <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N は現在も開発中ですが、N Developer Preview の一部として Android N を試用できます。
-以下のセクションでは、デベロッパー向けの新しい機能の一部を紹介しています。
- </p>
-
-<p>
- <a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>を確認して、プラットフォームの変更がアプリに影響を及ぼす可能性のある領域について把握してください。また、デベロッパー ガイドを参照して主な機能について詳しく学習し、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>をダウンロードして、新しい API の詳細を理解してください。
-
-
-
-</p>
-
-<h2 id="multi-window_support">マルチ ウィンドウのサポート</h2>
-
-
-<p>Android N では、多くのユーザーから求められていたマルチタスク機能がプラットフォームに新しく導入されました。つまり、マルチ ウィンドウがサポートされるようになりました。
- </p>
-
- <p>ユーザーは同時に 2 つのアプリを画面に開くことができます。 </p>
- <ul>
- <li>Android N が動作している携帯端末やタブレットでは、分割画面モードで 2 つのアプリを左右や上下に並べて実行できます。
-
-また、2 つのアプリの間にある分割線をドラッグしてアプリのサイズを変更することもできます。
- </li>
-
-<li>Android TV 端末では、アプリを<a href="{@docRoot}preview/features/picture-in-picture.html">ピクチャ イン ピクチャ モード</a>にすると、アプリにコンテンツを表示したまま、他のアプリをブラウジングまたは操作することができます。
-
-</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>図 1.</strong> 分割画面モードで実行されているアプリ
-</p>
-
- </div>
-
-<p>特にタブレットや大画面の端末では、マルチ ウィンドウのサポートにより、ユーザーを引き付ける新しい方法が提供されます。
-アプリでドラッグ アンド ドロップを有効にすると、ユーザーはアプリとの間でコンテンツを簡単にドラッグすることができるので、快適な使い心地を実現することができます。
-
- </p>
-
-<p>マルチ ウィンドウのサポートをアプリに追加して、マルチ ウィンドウ ディスプレイを処理する方法を設定するのは簡単です。
-たとえば、アクティビティの最小許容ディメンションを指定すると、ユーザーはアクティビティをそのサイズより小さく変更できなくなります。
-
-また、アプリに対してマルチ ウィンドウ ディスプレイを無効にし、アプリを全画面モードのみで表示することもできます。
-</p>
-
-<p>
- 詳細については、<a href="{@docRoot}preview/features/multi-window.html">マルチ ウィンドウのサポート</a>に関するデベロッパー向けドキュメントをご覧ください。
-
-</p>
-
-<h2 id="notification_enhancements">通知の機能強化</h2>
-
-<p>Android N では、通知が再設計されており、さらに使いやすくなっています。
-次のような点が変更されました。</p>
-
-<ul>
- <li>
- <strong>テンプレートのアップデート</strong>:通知テンプレートは、ヒーロー イメージやアバターを中心としたデザインにアップデートされています。
-デベロッパーは、コードに最小限の変更を加えるだけで、この新しいテンプレートを活用できます。
-
- </li>
-
- <li>
- <strong>メッセージ スタイルのカスタマイズ</strong>:<code>MessageStyle</code> クラスを使用して、通知に関連付けられているさらに多くのユーザー インターフェース ラベルをカスタマイズできます。
-
-メッセージ、会話、タイトル、コンテンツ ビューを設定できます。
-
- </li>
-
- <li>
- <strong>バンドル通知</strong>:メッセージをグループ化できます。たとえば、メッセージをトピックごとにグループ化して、各グループを表示できます。
-ユーザーは、各グループに対して、消去やアーカイブといったアクションを実行できます。
-Android Wear 向けの通知を実装したことがある場合は、このモデルはおなじみでしょう。
-
-
- </li>
-
- <li>
- <strong>ダイレクト リプライ</strong>:Android システムでは、インライン リプライがサポートされています。リアルタイム通信アプリを使用しているユーザーは、通知インターフェース内で直接 SMS やテキスト メッセージにすばやく応答できます。
-
-
- </li>
-
- <li>
- <strong>カスタムビュー</strong>:2 つの新しい API を使用すると、通知でカスタムビューを使用するときに、通知ヘッダーやアクションなどのシステム デコレーションを活用できます。
-
-
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>図 2.</strong> バンドル通知とダイレクト リプライ
-</p>
-
-<p>以上の新しい機能を実装する方法の詳細については、<a href="{@docRoot}preview/features/notification-updates.html">通知</a>に関するガイドをご覧ください。
-
-</p>
-
-
-
-<h2 id="jit_aot">プロファイルに基づいた JIT / AOT コンパイル</h2>
-
-<p>Android N では、コード プロファイリングにも対応した Just in Time（JIT）コンパイラーが ART に追加されており、Android アプリを実行するときのパフォーマンスが向上しています。
-
-JIT コンパイラーは、ART で現在使用されている Ahead of Time（AOT）コンパイラーを補完するものであり、ランタイム パフォーマンスの向上、ストレージ スペースの削減、アプリとシステムのアップデートの高速化に貢献します。
-
-</p>
-
-<p>プロファイルに基づいたコンパイルを使用すると、アプリの実際の使用方法や端末上での状態に応じて、ART が各アプリの AOT / JIT コンパイルを管理します。
-たとえば、ART は各アプリのホット メソッドのプロファイルを維持し、これらのメソッドをプリコンパイルしてキャッシュに保存することにより、パフォーマンスを最適化します。
-
-また、アプリの他の部分は、実際に使用されるときまでコンパイルされません。
-</p>
-
-<p>プロファイルに基づいたコンパイルは、アプリの主要部分のパフォーマンスを向上させ、関連するバイナリなど、アプリの全体的な RAM 使用量を削減します。
-
-この機能は、メモリが少ない端末で特に重要です。</p>
-
-<p>ART は、端末の電池への影響が最小限になるようにプロファイルに基づいたコンパイルを管理します。
-端末がアイドル状態および充電中のときにのみ、プリコンパイルが事前に実行されるため、時間と電池が節約できます。
-</p>
-
-<h2 id="quick_path_to_app_install">アプリの高速インストール</h2>
-
-<p>ART の JIT コンパイラーの最も明確な利点の 1 つは、アプリのインストールとシステム アップデートの速度です。
-Android 6.0 では最適化とインストールの実行に数分かかっていたサイズの大きいアプリでも、数秒でインストールできるようになりました。
-
-最適化のステップが不要になったため、システム アップデートも高速化されています。 </p>
-
-<h2 id="doze_on_the_go">どこでも機能する Doze</h2>
-
-<p>Android 6.0 では Doze システムモードが導入されています。これにより、端末が机に置かれているときや引き出しに収められているときなどのアイドル時にアプリの CPU とネットワーク通信の実行を保留し、電池を節約します。
-
- </p>
-
-<p>Android N では Doze が改良され、外出中でも電池を節約できるようになっています。画面をしばらくオフにしたり端末を電源から抜いたりすると、Doze により、通常の CPU およびネットワーク制限の一部がアプリに適用されます。つまり、端末をポケットに入れて持ち歩いているときでも電池を節約できます。
-
-
-
-</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>図 3.</strong> Doze により、端末が静止していないときでも制限が適用され、電池の寿命が延長される
-
-</p>
-
-
-<p>端末が電池で動作しているときに画面をしばらくオフにすると、Doze はネットワーク アクセスを制限し、ジョブと同期を保留します。
-アプリはメンテナンス ウィンドウと呼ばれる短い時間にネットワークにアクセスしたり、保留中のジョブや同期を実行したりします。
-
-画面をオンにするか、端末を電源に接続すると、端末の Doze モードは解除されます。
-</p>
-
-<p>電池で動作している端末が再び静止状態になり、画面がしばらくオフになると、Doze は完全な CPU およびネットワーク制限を {@link
-android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} アラーム、GPS / Wi-Fi スキャンに適用します。
-
-</p>
-
-<p>アプリを Doze に対応させるためのベスト プラクティスは端末を持ち歩いているかどうかには関係ありません。そのため、Doze が適切に処理されるようにアプリを既にアップデートしている場合は、追加の対応は必要ありません。
-
-そうでない場合は、<a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">アプリの Doze 対応</a>を行ってください。
-</p>
-
-<h2 id="background_optimizations">Project Svelte:バックグラウンド処理の最適化</h2>
-
-<p>Project Svelte は、Android エコシステムのさまざまな端末でシステムやアプリによる RAM の使用を最小限にする取り組みです。
-Android N での Project Svelte は、アプリをバックグラウンドで実行する方法を最適化することに重点を置いています。
- </p>
-
-<p>ほとんどのアプリでは、バックグラウンド処理が非常に重要になります。バックグラウンド処理を適切に実行すると、状況に応じて高速に実行できるなどユーザー エクスペリエンスが大幅に向上します。バックグラウンド処理が不適切な場合は、RAM（と電池）が必要以上に消費され、他のアプリのシステム パフォーマンスに影響を及ぼす可能性があります。
-
-
- </p>
-
-<p>Android 5.0 以降では、ユーザーに適した方法でバックグラウンド処理を実行する {@link android.app.job.JobScheduler} が推奨されています。
-
-これによって、メモリ、電源、接続の状態に基づいてシステムを最適化しながら、アプリでジョブをスケジュールできます。
-JobScheduler はシンプルな制御を提供するため、すべてのアプリで JobScheduler を使用することが効果的です。
- </p>
-
-<p>
- もう 1 つの適切な選択肢は、Google Play サービスの一部である <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager"><code>GCMNetworkManager</code></a> です。この機能も同様のジョブ スケジュール機能を提供しますが、こちらは以前のバージョンの Android とも互換性があります。
-
-
-
-</p>
-
-<p>さらに多くのユースケースに対応するために、<code>JobScheduler</code> と <code>GCMNetworkManager</code> の拡張は継続されています。たとえば、Android N では、コンテンツ プロバイダの変更に基づいてバックグラウンド処理をスケジュールできるようになりました。
-
-
-また、特にメモリの少ない端末でシステム パフォーマンスを低下させる可能性のある一部の古いパターンの廃止も開始されています。
-
-</p>
-
-<p>一般的に使用される暗黙的なブロードキャストである
-{@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}、{@link
- android.hardware.Camera#ACTION_NEW_PICTURE}、{@link
- android.hardware.Camera#ACTION_NEW_VIDEO} は複数のアプリのバックグラウンド処理を同時に起動するので、メモリと電池に負荷をかける可能性があります。そのため、Android N では、この 3 つのブロードキャストが削除されています。
-アプリがこれらのブロードキャストを受信する場合は、N Developer Preview を使用して、<code>JobScheduler</code> とそれに関連する API に移行してください。
-
- </p>
-
-<p>
- 詳細については、<a href="{@docRoot}preview/features/background-optimization.html">バックグラウンド処理の最適化</a>に関するドキュメントをご覧ください。
-
-</p>
-
-
-<h2 id="data_saver">データセーバー</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>図 4.</strong> [Settings] でのデータセーバー
-</p>
- </div>
-
-<p>一般的に、モバイル端末のライフサイクル全体では、モバイルデータ通信プランのコストが端末自体のコストを上回ります。
-多くのユーザーにとって、モバイルデータ通信は、節約する必要のある高価なリソースです。
- </p>
-
-<p>Android N では、ローミング、課金サイクルの終了近く、または短期間のデータパックであるかどうかに関係なく、アプリによるモバイルデータ通信の使用を削減する新しいシステム サービスであるデータセーバー モードが導入されています。
-
-データセーバーを使用すると、アプリによるモバイルデータ通信の使用方法をユーザーが制御できます。また、デベロッパーは、データセーバーがオンのときに、より効率よく通信するサービスを提供できるようになります。
-
- </p>
-
-<p>ユーザーが [<strong>Settings</strong>] でデータセーバーを有効にし、端末が従量制課金ネットワークに接続されている場合、システムは、ストリーミングのビットレートを制限したり、画質を低下させたり、オプティミスティックなプレキャッシングを保留したりすることにより、バックグラウンドでのデータ使用をブロックし、フォアグラウンドでのデータ使用をなるべく抑えるようにアプリに指示します。
-
-
-
-ユーザーは特定のアプリをホワイトリストに登録することにより、データセーバーがオンになっているときでも、バックグラウンドで従量制データ通信を使用できます。
-</p>
-
-<p>Android N は {@link android.net.ConnectivityManager} を拡張することで、<a href="{@docRoot}preview/features/data-saver.html#status">ユーザーのデータセーバー設定を取得</a>する方法と、<a href="{@docRoot}preview/features/data-saver.html#monitor-changes">設定の変更を監視</a>する方法を提供しています。
-
-
-すべてのアプリは、ユーザーがデータセーバーを有効にしているかどうかを確認し、フォアグラウンドおよびバックグラウンドでのデータ使用を制限する必要があります。
-</p>
-
-
-<h2 id="vulkan">Vulkan API</h2>
-
-<p>
- Android N では、新しい 3D レンダリング API である <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a> がプラットフォームに統合されています。<a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™ ES</a> と同様に、Vulkan は Khronos グループによって管理されている 3D グラフィックおよびレンダリングのオープン スタンダードです。
-
-
-
-</p>
-
-<p>
- Vulkan は、ドライバの CPU オーバーヘッドを最小化するため、およびアプリケーションが GPU の動作をより直接的に制御できるように設計されています。
-また、Vulkan は、複数のスレッドが作業を実行できるようにする（コマンド バッファの作成を同時に行うなど）ことによって、より優れた並列処理が可能です。
-
-
-</p>
-
-<p>
- Vulkan 開発ツールおよびライブラリは、Android NDK に含まれています。次のようなものが含まれます。
-
-</p>
-
-<ul>
- <li>ヘッダー
- </li>
-
- <li>検証レイヤ（デバッグ ライブラリ）
- </li>
-
- <li>SPIR-V シェーダー コンパイラー
- </li>
-
- <li>SPIR-V シェーダーのランタイム コンパイル ライブラリ
- </li>
-</ul>
-
-<p>
- Vulkan は、Nexus 5X、Nexus 6P、Nexus Player などの Vulkan 対応ハードウェアを備えた端末上のアプリでのみ利用できます。
-Vulkan を可能な限りより多くの端末に導入するためにパートナーと緊密に協力し合っています。
-
-</p>
-
-<p>
- 詳細については、<a href="{@docRoot}ndk/guides/graphics/index.html">API ドキュメント</a>をご覧ください。
-</p>
-
-<h2 id="tile_api">クイック設定タイル API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>図 5.</strong> 通知シェードにあるクイック設定タイル
-</p>
-
-
- </div><p>クイック設定は、通知シェードから主要な設定とアクションを直接公開するための一般的で簡単な方法です。
-Android N では、クイック設定の範囲が拡大され、さらに使いやすく便利な機能になっています。
- </p>
-
-<p>クイック設定タイル用のスペースが広くなったので、ユーザーは、左または右にスワイプして、ページ分割された表示領域でこれらのタイルにアクセスできます。
-また、ユーザーは、表示するクイック設定タイルとその表示場所を制御できるようになっています。ユーザーはタイルをドラッグ アンド ドロップして、追加または移動できます。
-
- </p>
-
-<p>Android N では、デベロッパーが独自のクイック設定タイルを定義できる新しい API が追加されており、ユーザーはこの API を通じて、アプリの主なコントロールとアクションに簡単にアクセスできます。
-</p>
-
-<p>
- クイック設定タイルは、緊急に必要な、または頻繁に使用されるコントロールやアクション用に用意されたものであり、アプリを起動するためのショートカットとして使用するべきではありません。
-
-
-</p>
-
-<p>
- タイルの定義が完了すると、ユーザーにタイルを公開できるようになります。ユーザーはタイルをドラッグ アンド ドロップするだけで、クイック設定にタイルを追加できます。
-
-</p>
-
-<p>
- アプリタイルを作成する方法については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>に掲載されている <code>android.service.quicksettings.Tile</code> のドキュメントをご覧ください。
-
-</p>
-
-
-
-<h2 id="number-blocking">電話番号のブロック</h2>
-
-<p>Android N では、プラットフォームで電話番号のブロックがサポートされており、サービス プロバイダがブロックされた電話番号のリストを保持するためのフレームワーク API が提供されています。
-デフォルトの SMS アプリ、デフォルトの電話アプリ、携帯通信会社アプリは、ブロックされた電話番号のリストを読み込んだり、このリストに書き込んだりできます。
-
-その他のアプリはこのリストにアクセスできません。</p>
-
-<p>Android では、電話番号のブロックをプラットフォームの標準の機能にすることにより、幅広い端末で電話番号をブロックできるようにする一貫した方法がアプリに提供されています。
-
-その他にアプリは次のような機能も利用できます。</p>
-
-<ul>
- <li> ブロックされた電話番号は、テキスト メッセージでもブロックされる
- <li> ブロックされた電話番号は、リセットした端末や、バックアップおよびリストア機能で移行したデバイスでも保持される
-
- <li> 複数のアプリが同じブロックリストを使用できる
-</ul>
-
-<p>また、Android に携帯通信会社のアプリが組み込まれていると、携帯通信会社は端末上のブロックリストを読み込んで迷惑な電話やテキスト メッセージをサービス側でブロックできます。これによって、VOIP エンドポイントや転送電話などいかなる媒体を介しても、ブロックされた番号はユーザーに到達できなくなります。
-
-
-</p>
-
-<p>
- 詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>android.provider.BlockedNumberContract</code> をご覧ください。
-
-
-</p>
-
-<h2 id="call_screening">通話スクリーニング</h2>
-
-<p>
- Android N では、デフォルトの電話アプリで着信をスクリーニングできます。新しい <code>CallScreeningService</code> を実装することによって、電話アプリは着信をスクリーニングします。これにより、電話アプリは着信する電話の {@link android.telecom.Call.Details Call.Details} に基づいて次のようなアクションを実行できます。
-
-
-
-</p>
-
-<ul>
- <li> 着信を拒否する
- <li> 着信を通話履歴に含めない
- <li> 着信通知をユーザーに表示しない
-</ul>
-
-<p>
- 詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>android.telecom.CallScreeningService</code> をご覧ください。
-
-
-</p>
-
-
-<h2 id="multi-locale_languages">マルチロケールのサポートと言語の追加</h2>
-
-
-<p>Android N では、[Settings] で<strong>マルチロケール</strong>を選択できるようになり、複数言語を使用するユーザーへのサポートが強化されました。
-アプリで新しい API を使用して、ユーザーが選択したロケールを取得すると、複数のロケールを設定しているユーザーに対してより洗練されたユーザー エクスペリエンスを提供できます。たとえば、検索結果を複数の言語で表示したり、ユーザーが理解している言語のウェブページでは翻訳の提案を行わないようにしたりすることが可能になります。
-
-
-
-</p>
-
-<p>また、Android N では、マルチロケールのサポートに加えて、ユーザーが利用できる言語が追加されています。
-英語、スペイン語、フランス語、アラビア語などの一般的な言語に対して、それぞれ 25 以上のバリエーションが提供されます。
-100 以上の新しい言語も部分的にサポートされています。
-</p>
-
-<p>アプリは、<code>LocaleList.GetDefault()</code> を呼び出すことにより、ユーザーが設定したロケールのリストを取得できます。
-Android N では、ロケール数の増加に対応するために、リソースを解決する方法が変更されています。
-この新しいリソース解決ロジックでアプリが想定どおりに動作することをテストおよび確認してください。
-</p>
-
-<p>新しいリソース解決動作と順守する必要のあるベスト プラクティスの詳細については、<a href="{@docRoot}preview/features/multilingual-support.html">複数言語のサポート</a>をご覧ください。
-</p>
-
-
-<h2 id="emoji">新しい絵文字</h2>
-
-<p>
- Android N では、肌色の異なる絵文字や異体字セレクターのサポートなど、絵文字の追加と絵文字関連機能が導入されています。
-
-アプリで絵文字をサポートする場合は、以下のガイドラインに従い、これらの絵文字関連機能を利用します。
-
-</p>
-
-<ul>
- <li>
- <strong>絵文字を挿入する前に端末に絵文字が含まれていることを確認する。</strong>
- システム フォントで表示される絵文字を確認するには、{@link android.graphics.Paint#hasGlyph(String)} メソッドを使用します。
-
- </li>
- <li>
- <strong>絵文字が異体字セレクターをサポートしていることを確認する。</strong>
- 異体字セレクターを使用すると、特定の絵文字をカラーまたは白黒で表示できます。
-
- アプリは、モバイル端末では白黒よりもカラーで絵文字を表示する必要があります。ただし、アプリでテキスト メッセージを使用して絵文字を表示する場合は、白黒バージョンを使用する必要があります。
-
- 絵文字に異体字があるかどうかを確認するには、異体字セレクターを使用します。
- 異体字のある文字の完全なリストについては、<a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">異体字に関する Unicode ドキュメント</a>の<em>絵文字異体字シーケンス</em> セクションを確認してください。
-
-
-
- </li>
- <li>
- <strong>絵文字が肌色をサポートしていることを確認する。</strong>Android N では、レンダリングされる絵文字の肌色を好みの色に変更できます。
-キーボード アプリでは、肌色が複数ある絵文字をわかりやすく表示して、ユーザーが好みの肌色を選択できるようにする必要があります。
-
-肌色修飾子を持つシステムの絵文字を確認するには、{@link android.graphics.Paint#hasGlyph(String)} メソッドを使用します。
-
-肌色を使用する絵文字を確認するには、<a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">Unicode ドキュメント</a>をご覧ください。
-
-
- </li>
-</ul>
-
-
-<h2 id="icu4">Android の ICU4J API</h2>
-
-<p>
- Android N では、Android フレームワーク内で <a href="http://site.icu-project.org/">ICU4J</a> API のサブセットが提供されており、<code>android.icu</code> パッケージにあります。
-移行は簡単で、ほとんどの場合、名前空間を <code>com.java.icu</code> から <code>android.icu</code> に変更するだけです。
-
-アプリで ICU4J バンドルを既に使用している場合は、Android フレームワークで提供されている <code>android.icu</code> API に移行すると、APK サイズを大幅に削減できます。
-
-
-</p>
-
-<p>
- Android ICU4J API の詳細については、<a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J のサポート</a>をご覧ください。
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>Android N では、OpenGL ES 3.2 用の以下のようなフレームワーク インターフェースとプラットフォーム サポートが追加されています。</p>
-
-<ul>
- <li> <code>EXT_texture_sRGB_decode</code> を除く <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Android エクステンション パック</a></a>（AEP）のすべての拡張機能
-
- <li> HDR および遅延シェーディング用の浮動小数点フレームバッファ
- <li> 一括処理とストリーミングを向上させるための BaseVertex 描画呼び出し
- <li> WebGL のオーバーヘッドを低減するための堅牢なバッファ アクセス コントロール
-</ul>
-
-<p>Android N の OpenGL ES 3.2 用のフレームワーク API は、<code>GLES32</code> クラスで提供されます。
-OpenGL ES 3.2 を使用する場合、<code><uses-feature></code> タグと <code>android:glEsVersion</code> 属性を使用してマニフェスト ファイルで要件を宣言する必要があります。
-
- </p>
-
-<p>端末でサポートされる OpenGL ES のバージョンを実行時に確認する方法など、OpenGL ES の使用方法については、<a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API ガイド</a>をご覧ください。
-</p>
-
-
-<h2 id="android_tv_recording">Android TV の録画機能</h2>
-
-<p>Android N では、新しい recording API を介して Android TV 入力サービスからコンテンツを録画して再生する機能が追加されています。
-TV 入力サービスでは、録画できるチャンネル データや録画したセッションを保存する方法の制御、ユーザーによる録画されたコンテンツの操作の管理を行うことができます。このサービスは、既存の time-shifting API を使用して構築されています。
-
- </p>
-
-<p>詳細については、<a href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording API</a> をご覧ください。</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work は、Android N を実行している端末に多くの新しい機能と API を追加するものです。主要な機能の一部を以下に紹介します。変更点の完全なリストについては、<a href="{@docRoot}preview/features/afw.html">Android for Work のアップデート</a>をご覧ください。
-
-</p>
-
-<h3 id="work_profile_security_challenge">仕事用プロファイルによるセキュリティ確認 </h3>
-
-<p>
- N SDK を対象としているプロファイル オーナーは、仕事用プロファイルで実行しているアプリで個別にセキュリティ確認を行うよう指定することができます。
-
-ユーザーが仕事用アプリを開こうとすると、仕事用プロファイル用のセキュリティ確認画面が表示されます。
-セキュリティの確認に成功すると、仕事用プロファイルのロックが解除され、必要に応じて暗号化も解除されます。
-プロファイル オーナーは、<code>ACTION_SET_NEW_PASSWORD</code> でユーザーに仕事用プロファイル用のセキュリティ確認を設定するように求めたり、<code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> でユーザーに端末のロックを設定するように求めたりします。
-
-
-
-</p>
-
-<p>
- プロファイル オーナーは、<code>setPasswordQuality()</code>、<code>setPasswordMinimumLength()</code>、および関連するメソッドを使用して、仕事用プロファイル用のセキュリティ確認に個別のパスコード ポリシー（PIN に必要な長さや、指紋によるプロファイルのロック解除が可能かどうかなど）を設定できます。
-
-
-また、新しい <code>getParentProfileInstance()</code> メソッドが返す <code>DevicePolicyManager</code> インスタンスを使用して端末のロックを設定できます。
-
-
- さらに、新しい <code>setOrganizationColor()</code> メソッドおよび <code>setOrganizationName()</code> メソッドを使用して仕事用プロファイル用のセキュリティ確認画面をカスタマイズすることができます。
-
-
-</p>
-<h3 id="turn_off_work">ワークモードのオフ </h3>
-
-<p>ユーザーは、仕事用プロファイルがある端末でワークモードを切り替えることができます。ワークモードがオフになると、管理されているユーザーが一時的にシャットダウンされ、仕事用プロファイルのアプリ、バックグラウンドでの同期、通知が無効になります。
-
-これには、プロファイル オーナーのアプリが含まれます。
-また、ワークモードがオフになると、仕事用アプリを起動できないことをユーザーに示すステータス アイコンが表示されたままになります。
-ランチャーは、仕事用アプリとウィジェットにアクセスできないことを示します。
- </p>
-
-<h3 id="always_on_vpn">Always on VPN </h3>
-
-<p>デバイス オーナーとプロファイル オーナーは、指定した VPN を介して仕事用アプリが常時接続するように設定できます。
-端末が起動すると、システムは VPN を自動的に開始します。
-</p>
-
-<p>
- <code>setAlwaysOnVpnPackage()</code> と <code>getAlwaysOnVpnPackage()</code> は新しい <code>DevicePolicyManager</code> のメソッドです。
-
-
-</p>
-
-<p>システムがアプリの介入なしに VPN サービスを直接バインドするため、Always on VPN の新しいエンドポイントは VPN クライアント側で処理する必要があります。
-以前と同じように、システムへのサービスの通知はインテント フィルタのマッチング アクション <code>android.net.VpnService</code> で行います。
-
- </p>
-
-<p>
- プライマリ ユーザーは、<strong>[Settings] > [More] > [Vpn]</strong> から、<code>VPNService</code> のメソッドを実装した Always on VPN クライアントを手動で設定することもできます。
-
-
-</p>
-
-<h3 id="custom_provisioning">カスタマイズされたプロビジョニング</h3>
-
-<p>
- アプリでは、コーポレート・カラーやロゴを含むプロファイル オーナーとデバイス オーナーのプロビジョニング フローをカスタマイズできます。<code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> はフローカラーをカスタマイズします。<code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code> は、コーポレート ロゴを含むフローをカスタマイズします。
-
-
-
-
-</p>
-
-<h2 id="accessibility_enhancements">ユーザー補助機能の強化</h2>
-
-<p>Android N では、新しい端末のセットアップのオープニング画面に [Vision Settings] が直接表示されます。
-これにより、ユーザーは、ズーム操作、フォントサイズ、ディスプレイ サイズ、TalkBack など、端末のユーザー補助機能を簡単に見つけて設定できるようになっています。
-
- </p>
-
-<p>このようなユーザー補助機能が目立つ場所に配置されたため、ユーザーがこれらの機能を有効にしてアプリを試用する可能性が高まりました。
-これらの設定を有効にして、アプリを事前にテストするようにしてください。
-これらの設定は、[Settings] > [Accessibility] で有効にできます。
-</p>
-
-<p>Android N では、ユーザー補助機能サービスにより、運動障害のあるユーザーが画面をタップすることを支援できます。
-この新しい API を使用すると、顔追跡、視線追跡、ポイント スキャンなどの機能を備えたサービスを構築して、これらのユーザーのニーズに対応することができます。
-
-</p>
-
-<p>詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>android.accessibilityservice.GestureDescription</code> をご覧ください。
-</p>
-
-
-<h2 id="direct_boot">ダイレクト ブート</h2>
-
-<p>ダイレクト ブートは端末のスタートアップ時間を短縮し、予期しない再起動後でも、登録されたアプリの一部の機能が使用できるようにします。たとえば、ユーザーの就寝中に暗号化された端末が再起動した場合でも、登録したアラーム、メッセージ、電話の着信をユーザーに通常どおり通知することができます。
-
-
-
-また、再起動後にユーザー補助機能サービスをすぐに使用することもできます。
-</p>
-
-<p>ダイレクト ブートでは、Android N のファイルベースの暗号化を活用して、システムとアプリのデータに対してきめ細かい暗号化ポリシーを有効にします。システムは、一部のシステムデータと明示的に登録されたアプリデータに端末暗号化ストアを使用します。
-
-
-デフォルトでは、他のすべてのシステムデータ、ユーザーデータ、アプリ、アプリデータには、認証情報暗号化ストアが使用されます。
- </p>
-
-<p>システムは起動時に端末暗号化データのみにアクセスできる制限モードになります。この状態では、アプリやデータへの一般的なアクセスは許可されません。このモードで実行する必要のあるコンポーネントがある場合、マニフェストにフラグを設定することでコンポーネントを登録できます。
-
-
-再起動後、システムは、<code>LOCKED_BOOT_COMPLETED</code> インテントをブロードキャストすることにより、登録済みのコンポーネントをアクティベートします。
-
-システムは、ロック解除する前に、登録済みの端末暗号化アプリデータを利用できるようにします。
-他のすべてのデータは、ユーザーがロック画面の認証情報を確認して暗号化を解除するまで利用できません。
- </p>
-
-詳細については、<a href="{@docRoot}preview/features/direct-boot.html">ダイレクト ブート</a>をご覧ください。</p>
-</p>
-
-
-<h2 id="key_attestation">キーの構成証明</h2>
-
-<p>ハードウェアがサポートするキーストアは、Android 端末で暗号化キーを作成、格納、使用するためのより安全な方法を提供します。
-このキーストアは、Linux カーネル、Android の潜在的な脆弱性、ルート権限を取得された端末からの抽出からキーを保護します。
-
-</p>
-
-<p>ハードウェアがサポートするキーストアの使用をさらに簡単かつ安全にするために、Android N では、キーの構成証明が導入されています。
-アプリや別の端末は、キーの構成証明を使用して RSA または EC キーペアがハードウェアでサポートされているかどうか、キーペアのプロパティはどのようなものか、使用方法や有効性にどのような制限が適用されるかを積極的に確認することができます。
-
-
- </p>
-
-<p>アプリや別の端末のサービスは、有効な構成証明キーによって署名された X.509 構成証明書を通じて、キーペアについての情報をリクエストできます。
-
-この構成証明キーは、出荷前に端末のハードウェアがサポートするキーストアに挿入される ECDSA 署名キーです。したがって、有効な構成証明キーによって署名される構成証明書により、ハードウェアがサポートするキーストアの存在に加えて、そのキーストアのキーペアの詳細が確認されます。
-
-
-
-</p>
-
-<p>端末が Android の安全な公式ファクトリー イメージを使用していることを確認するために、キーの構成証明では、端末の<a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">ブートローダー</a>が以下の情報を <a class="external-link" href="https://source.android.com/security/trusty/index.html">Trusted Execution Environment（TEE）</a>に提供することが要求されます。
-
-
-</p>
-
-<ul>
-<li>端末にインストールされる OS のバージョンとパッチレベル</li>
-<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">セキュアブート</a>の公開キーとロック ステータス</li>
- </ul>
-
-<p>ハードウェアがサポートするキーストアの機能の詳細については、<a href="https://source.android.com/security/keystore/" class="external-link">ハードウェアがサポートするキーストア</a>に関するガイドをご覧ください。
-</p>
-
-<p>Android N では、キーの構成証明に加えて、指紋にバインドされたキーが導入されています。このキーは、指紋を登録しても無効になることはありません。
-</p>
-
-<h2 id="network_security_config">ネットワーク セキュリティ構成</h2>
-
-<p>Android N では、エラーが発生しやすいプログラムによる従来の API（X509TrustManager など）ではなく、宣言型のネットワーク セキュリティ構成を使用することにより、コードを変更することなく、セキュアな（HTTPS、TLS）接続の動作をアプリで安全にカスタマイズできます。<em></em>
-
-
-</p>
-
- <p>以下の機能がサポートされます。</p>
-<ul>
-<li><b>カスタム トラスト アンカー。</b>アプリのセキュアな接続にどの証明機関（CA）を信頼するかをカスタマイズできます。
-たとえば、特定の自己署名証明書や制限された一連の公的 CA を信頼できます。
-
-</li>
-<li><b>デバッグ限定のオーバーライド。</b>アプリのデベロッパーは、インストール ベースに対する追加リスクなしに、アプリのセキュアな接続を安全にデバッグできます。
-
-
-</li>
-<li><b>クリアテキスト トラフィックのオプトアウト。</b>クリアテキスト トラフィックの意図しない使用からアプリを保護できます。
-</li>
-<li><b>証明書のピン留め。</b>アプリのセキュアな接続で信頼するサーバーキーを制限できる高度な機能です。
-</li>
-</ul>
-
-<p>詳細については、<a href="{@docRoot}preview/features/security-config.html">ネットワーク セキュリティ構成</a>をご覧ください。
-</p>
-
-<h2 id="default_trusted_ca">既定の信頼される証明機関</h2>
-
-<p>既定では、Android N 用アプリは、システムが提供する証明書のみを信頼し、ユーザーが追加した証明機関（CA）を信頼しません。
-ユーザーが追加した CA を信頼する必要がある Android N 向けのアプリは、<a href="{@docRoot}preview/features/security-config.html">ネットワーク セキュリティ構成</a>を使用して、ユーザー CA を信頼する方法を指定する必要があります。
-
-
-</p>
-
-<h2 id="apk_signature_v2">APK 署名スキーム v2</h2>
-
-<p>
- Android N では、APK 署名スキーム v2 というアプリのインストール時間を高速化したり、APK ファイルに無許可の変更が行われないようにしたりする新しいアプリ署名スキームが導入されています。
-
-既定では、Android Studio 2.2 と Gradle 2.2 用の Android プラグインで APK 署名スキーム v2 と従来の署名スキーム（JAR 署名を使用する）の両方を使用してアプリに署名します。
-
-
-</p>
-
-<p>
- APK 署名スキーム v2 をアプリに適用することをお勧めしますが、この新しいスキームは必須ではありません。
-APK 署名スキーム v2 を使用するときにアプリが正しくビルドされていない場合は、この新しいスキームを無効にできます。
-無効化プロセスにより、Android Studio 2.2 と Gradle 2.2 用の Android プラグインでアプリへの署名に従来の署名スキームのみが使用されるようになります。
-
-従来のスキームのみを使用して署名するには、モジュール レベルの <code>build.gradle</code> ファイルを開き、<code>v2SigningEnabled false</code> という行をリリース用署名構成に追加します。
-
-
-
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>警告:</strong> APK 署名スキーム v2 を使用してアプリに署名し、さらにアプリに変更を加える場合、アプリの署名は無効になります。
-
-そのため、APK 署名スキーム v2 を使用してアプリに署名する場合は、署名後ではなく署名前に <code>zipalign</code> などのツールを使用します。
-
-</p>
-
-<p>
- 詳細については、Android Studio で<a href="{@docRoot}studio/publish/app-signing.html#release-mode">アプリに署名する</a>方法や、Gradle 用の Android プラグインを使用して<a href="{@docRoot}studio/build/build-variants.html#signing">アプリへの署名用ビルドファイルを構成する</a>方法を説明する Android Studio ドキュメントをご覧ください。
-
-
-
-</p>
-
-<h2 id="scoped_directory_access">特定のディレクトリへのアクセス</h2>
-
-<p>Android N では、アプリで新しい API を使用して、SD カードなどのリムーバブル メディア上のディレクトリといった特定の<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">外部ストレージ</a> ディレクトリへのアクセスをリクエストできるようになりました。
-
-この新しい API は、アプリが <code>Pictures</code> ディレクトリなどの標準の外部ストレージ ディレクトリにアクセスする方法を大幅に簡略化します。
-写真アプリなどのアプリでは、<code>READ_EXTERNAL_STORAGE</code> の代わりに、この API ですべてのストレージ ディレクトリやストレージ アクセス フレームワークにアクセスできるため、ユーザーはそのディレクトリに移動できます。
-
-
-
-</p>
-
-<p>また、この新しい API は、ユーザーがアプリに外部ストレージへのアクセスを付与するステップを簡素化します。
-この新しい API を使用する場合、アプリがどのディレクトリへのアクセス許可を求めているかをわかりやすく説明するシンプルな UI が使用されます。
-
-</p>
-
-<p>詳細については、<a href="{@docRoot}preview/features/scoped-folder-access.html">特定のディレクトリへのアクセス</a>に関するデベロッパー向けドキュメントをご覧ください。
-
-</p>
-
-<h2 id="keyboard_shortcuts_helper">キーボード ショートカット ヘルパー</h2>
-
-<p>
-Android N では、ユーザーは Alt キー + / キーを同時に押して<em>キーボード ショートカット</em>画面をトリガーできます。この画面には、システムとアプリから使用できるすべてのショートカットが表示されます。
-
-これらは使用可能な場合はアプリのメニューから自動的に取得されますが、デベロッパーは独自に微調整したショートカットのリストを画面に表示することもできます。
-
-ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>で説明するように、新しい <code>Activity.onProvideKeyboardShortcuts()</code> メソッドをオーバーライドしてこれを実行することができます。
-
-
-</p>
-
-<p>
-アプリ内のどこででもキーボード ショートカット ヘルパーをトリガーするには、関連アクティビティの {@code Activity.requestKeyboardShortcutsHelper()} を呼び出します。
-
-</p>
-
-<h2 id="sustained_performance_api">パフォーマンス維持 API</h2>
-
-<p>
-長時間実行するアプリではパフォーマンスが大幅に変動する可能性があります。これは、端末のコンポーネントがその温度制限に達するとシステムによりシステムオンチップ エンジンが抑制されるためです。
-
-この変動は、高性能で長時間実行するアプリを作成するアプリのデベロッパーの移動目標となります。
-
-</p>
-
-<p>
-これらの制限に対処するために、Android N には、<em>パフォーマンス維持モード</em>のサポートが含まれており、OEM は長時間実行するアプリに端末のパフォーマンスに関するヒントを提供することができます。
-
-アプリのデベロッパーはこれらのヒントを使用して、長時間にわたる予測可能な一定レベルの端末のパフォーマンスに合わせてアプリを調整できます。
-
-
-</p>
-
-<p>
-アプリのデベロッパーが N Developer Preview でこの新しい API を試すことができるのは、Nexus 6P 端末上でのみです。
-この機能を使用するには、パフォーマンス維持モードで実行するウィンドウにパフォーマンス維持ウィンドウ フラグを設定します。
-
-このフラグは {@code Window.setSustainedPerformanceMode()} メソッドを使用して設定します。
-このウィンドウがフォーカスされていない場合、このモードは自動的に無効になります。
-
-</p>
-
-<h2 id="vr">VR サポート</h2>
-
-<p>
-Android N には、新しい VR モードのためのプラットフォーム サポートと最適化が追加され、デベロッパーは高品質モバイル端末 VR 体験をユーザーのために生み出すことができます。
-多数のパフォーマンス強化があり、VR アプリ用の CPU コアへの排他アクセスが含まれます。アプリでは、VR 用に動作するインテリジェントなヘッド トラッキングやステレオ方式の通知を利用できます。
-
-
-最も重要な点は、Android N によって大幅に遅延の少ないグラフィックが実現される点です。
-Android N 向け VR アプリのビルドの詳細については、<a href="https://developers.google.com/vr/android/">Google VR SDK for Android</a> を参照してください。
-
-</p>
-
-
-<h2 id="print_svc">印刷サービス機能の強化</h2>
-
-<p>
- Android N では、印刷サービスのデベロッパーが、各プリンターや印刷ジョブに関する追加情報を公開できるようになりました。
-
-</p>
-
-<p>
- 各プリンターを一覧表示する場合、印刷サービスでは以下の 2 つの方法で各プリンターのアイコンを設定できます。
-
-</p>
-
-<ul>
- <li><code>PrinterInfo.Builder.setResourceIconId()</code> を呼び出すことにより、リソース ID からアイコンを設定できます
-
- </li>
-
- <li><code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code> を呼び出して、<code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code> を使用してアイコンがリクエストされた場合のコールバックを設定することにより、ネットワークからアイコンを表示できます
-
-
-
- </li>
-</ul>
-
-<p>
- また、追加情報を表示する各プリンターのアクティビティを提供する場合は、<code>PrinterInfo.Builder.setInfoIntent()</code> を呼び出します。
-
-</p>
-
-<p>
- 印刷ジョブ通知に印刷ジョブの進捗状況やステータスを表示する場合は、<code>android.printservice.PrintJob.setProgress()</code> と <code>android.printservice.PrintJob.setStatus()</code> をそれぞれ呼び出します。
-
-
-
-</p>
-
-<p>
- これらのメソッドの詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>をご覧ください。
-</p>
-
-<h2 id="framemetrics_api">FrameMetricsListener API</h2>
-
-<p>
-FrameMetricsListener API を使用すると、アプリでその UI レンダリング パフォーマンスを監視できます。
-この API は、アプリの現在のウィンドウのフレーム タイミング情報を転送するストリーミング Pub / Sub API を公開することにより、この機能を提供します。
-返されるデータは、<code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code> によって表示される内容と同じですが、過去の 120 フレームに制限されません。
-
-</p>
-
-<p>
-FrameMetricsListener を使用すると、USB 接続を使用せずに、本番環境のインタラクション レベルの UI パフォーマンスを計測できます。
-この API により、{@code adb shell dumpsys gfxinfo} を実行するより粒度の高いデータの収集が可能になります。
-
-アプリの特定のインタラクション データを収集できるため、この粒度の高さが可能となります。アプリのパフォーマンス全体の包括的な概要を取得したり、包括的な状態を明確にしたりする必要はありません。
-
-
-この機能を使用して、パフォーマンス データを収集したり、アプリでの実際のユースケースにおける UI パフォーマンスの低下を検出したりすることができます。
-
-
-</p>
-
-<p>
-ウィンドウを監視するには、<code>FrameMetricsListener.onMetricsAvailable()</code> コールバック メソッドを実装して、これを対象のウィンドウに登録します。
-詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の {@code FrameMetricsListener} クラスのドキュメントをご覧ください。
-
-
-</p>
-
-<p>
-この API は {@code FrameMetrics} オブジェクトを提供します。これには、レンダリング サブシステムがフレーム ライフサイクル内のさまざまなマイルストーンで報告するタイミング データが含まれます。サポートされているメトリックは、{@code UNKNOWN_DELAY_DURATION}、{@code INPUT_HANDLING_DURATION}、{@code ANIMATION_DURATION}、{@code LAYOUT_MEASURE_DURATION}、{@code DRAW_DURATION}、{@code SYNC_DURATION}、{@code COMMAND_ISSUE_DURATION}、{@code SWAP_BUFFERS_DURATION}、{@code TOTAL_DURATION}、{@code FIRST_DRAW_FRAME} です。
-
-
-
-
-
-
-</p>
-
-
-<h2 id="virtual_files">仮想ファイル</h2>
-
-<p>
- 旧バージョンの Android では、アプリはストレージ アクセス フレームワークを使用して、ユーザーが Google ドライブなどのクラウド ストレージ アカウントからファイルを選択できるようにしていました。
-
-ただし、バイトコードの直接表現がなかったファイルを表示する方法はありませんでした。すべてのファイルは入力ストリームの提供が必要でした。
-
-
-</p>
-
-<p>
- Android N では、ストレージ アクセス フレームワークに<em>仮想ファイル</em>の概念が追加されています。
-仮想ファイル機能を使用すると、バイトコードの直接表現がなくても、{@link android.content.Intent#ACTION_VIEW} インテントで使用できるドキュメント URI を {@link android.provider.DocumentsProvider} で返すことができます。
-
-
-また、Android N では、ユーザー ファイル（仮想またはそれ以外）に別の形式を提供できます。
-
-</p>
-
-<p>
- アプリで仮想ドキュメントの URI を取得するには、{@link android.content.Intent} を作成してからファイル ピッカーの UI を開きます。
-アプリでは {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()} メソッドを使用して仮想ファイルを直接開くことができないため、{@link android.content.Intent#CATEGORY_OPENABLE} カテゴリが含まれている場合はどの仮想ファイルも受信されません。
-
-
-
-
-</p>
-
-<p>
- ユーザーが選択した後で、{@link android.app.Activity#onActivityResult onActivityResult()} メソッドが呼び出されます。
-
- 以下のコード スニペットに示すように、アプリは仮想ファイルの URI と入力ストリームを取得できます。
-
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- ユーザー ファイルへのアクセスの詳細については、<a href="{@docRoot}guide/topics/providers/document-provider.html">ストレージ アクセス フレームワークのガイド</a>をご覧ください。
-
-
-</p>
diff --git a/docs/html-intl/intl/ja/preview/behavior-changes.jd b/docs/html-intl/intl/ja/preview/behavior-changes.jd
deleted file mode 100644
index c112504c..0000000
--- a/docs/html-intl/intl/ja/preview/behavior-changes.jd
+++ /dev/null
@@ -1,610 +0,0 @@
-page.title=動作の変更点
-page.keywords=preview,sdk,compatibility
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>このドキュメントの内容</h2>
-
-<ol>
- <li><a href="#perf">パフォーマンスの向上</a>
- <ol>
- <li><a href="#doze">Doze</a></li>
- <li><a href="#bg-opt">バックグラウンド処理の最適化</a></li>
- </ol>
- </li>
- <li><a href="#perm">パーミッションの変更</a>
- </li>
- <li><a href="#sharing-files">アプリ間のファイルの共有</a></li>
- <li><a href="#accessibility">ユーザー補助機能の改善</a>
- <ol>
- <li><a href="#screen-zoom">画面のズーム</a></li>
- <li><a href="#vision-settings">セットアップ ウィザードの [Vision Settings]</a></li>
- </ol>
- </li>
- <li><a href="#ndk">プラットフォーム ライブラリにリンクした NDK アプリ</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">アノテーションの保持</a></li>
- <li><a href="#other">その他の重要事項</a></li>
-</ol>
-
-<h2>関連ドキュメント</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">Android N API の概要</a>
-</li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- 新しい機能に加えて、Android N では、さまざまなシステムおよび API の動作が変更されています。
-このドキュメントでは、アプリ開発において把握しておくべき主な変更点について説明します。
-
-
-</p>
-
-<p>
- 過去に Android 向けのアプリを公開したことがある場合は、そのアプリが今回のプラットフォームの変更による影響を受ける可能性があることに注意してください。
-
-</p>
-
-
-<h2 id="perf">電池とメモリ</h2>
-
-<p>
-Android N では、端末の電池寿命を改善したり、RAM の使用量を削減したりするために、システムの動作がいくつか変更されています。
-これらの変更は、システム リソースへのアプリのアクセスに加え、特定の暗黙的インテントを介して他のアプリとやり取りする方法に影響を及ぼす可能性があります。
-
-
-</p>
-
-<h3 id="doze">Doze</h3>
-
-<p>
- Android 6.0（API レベル 23）で Doze が導入されました。これは、ユーザーが端末を電源と接続せずに静止状態にし、画面をオフにすると、CPU とネットワークのアクティビティを保留して電池寿命を改善するものです。
-
-Android N では、Doze が改良されています。端末を電源と接続せずに画面をオフにすると、端末が静止していなくても（たとえば、ユーザーが携帯端末をポケットに入れて持ち歩いている場合）、CPU およびネットワーク制限のサブセットがアプリに適用されます。
-
-
-
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>図 1.</strong> Doze が第 1 レベルのシステム アクティビティ制限を適用して、電池寿命を改善
-
-</p>
-
-<p>
- 端末が電池電源で動作しているときに画面をしばらくオフにすると、端末は Doze モードになり、制限の最初のサブセットが適用されます。
-これにより、アプリのネットワーク アクセスが切断されてジョブと同期が保留されます。
-端末が Doze モードに入った後、しばらくの間静止状態になると、残りの Doze 制限が {@link android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} アラーム、GPS、Wi-Fi スキャンに適用されます。
-
-
-適用される Doze 制限が一部であるか完全なものであるかには関係なく、端末は Doze モードから短時間抜け出し、メンテナンス ウィンドウと呼ばれる状態になります。このとき、アプリはネットワーク アクセスを許可され、保留されたジョブや同期を実行することができます。
-
-
-
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>図 2.</strong> 端末がしばらくの間静止状態になると、Doze が第 2 レベルのシステム アクティビティ制限を適用する
-
-</p>
-
-<p>
- 画面をオンにするか、端末を電源に接続すると、Doze モードは解除され、これらの処理の制限は適用されなくなります。
-<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">Doze とアプリ スタンバイ用に最適化する</a>で説明したように、今回追加された動作は、Android 6.0（API レベル 23）で導入された以前のバージョンの Doze にアプリを対応させるための推奨事項とベスト プラクティスには影響を及ぼしません。
-
-
-
-メッセージの送受信に Google Cloud Messaging（GCM）を使用するなどの推奨事項を引き続き順守して、追加の Doze 動作に対応するためにアップデートを計画する必要があります。
-
-
-
-</p>
-
-
-<h3 id="bg-opt">Project Svelte:バックグラウンド処理の最適化</h3>
-
-<p>
- Android N では、メモリ使用量と消費電力を最適化するために、3 つの暗黙的なブロードキャストが削除されています。
-この変更が必要になるのは、暗黙的なブロードキャストが行われると、バックグラウンドでブロードキャストをリッスンするように登録されているアプリが頻繁に起動されるためです。
-
-これらのブロードキャストを削除すると端末のパフォーマンスとユーザー エクスペリエンスが大幅に向上します。
-
-</p>
-
-<p>
- モバイル端末では、Wi-Fi とモバイルデータ間を移動するときなど、接続が頻繁に変化します。
-現在のアプリでは、暗黙的な {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} ブロードキャストのレシーバーをマニフェストに登録することにより、接続の変化を監視できるようになっています。
-
-多くのアプリがこのブロードキャストを受信する登録を行っているので、一度ネットワークの切り替えが起こるだけですべてのアプリがアクティブになり、ブロードキャストが同時に処理されます。
-
-
-</p>
-
-<p>
- 同様に、旧バージョンの Android では、暗黙的な {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} ブロードキャストと {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} ブロードキャストをカメラなどの他のアプリから受信するよう登録できました。
-ユーザーがカメラアプリで写真を撮ると、これらのアプリがアクティブになり、ブロードキャストが処理されます。
-
-</p>
-
-<p>
- Android N では、こういった問題を緩和するために、以下の最適化手法が適用されます。
-
-</p>
-
-<ul>
- <li>Android N 向けのアプリは、{@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} ブロードキャストを受信しません。これは、アプリにこれらのイベントの通知をリクエストするマニフェスト エントリがある場合も同様です。
-実行されているアプリが {@link android.content.BroadcastReceiver} で通知をリクエストした場合は、メインスレッドで {@code CONNECTIVITY_CHANGE} を引き続きリッスンできます。
-
-
- </li>
-
- <li>アプリは、{@link
- android.hardware.Camera#ACTION_NEW_PICTURE} ブロードキャストまたは {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} ブロードキャストを送受信できません。この最適化は、Android N 向けのアプリだけでなく、すべてのアプリに影響を及ぼします。
-
- </li>
-</ul>
-
-<p>アプリでこれらのインテントのいずれかを使用する場合は、Android N 端末を適切にターゲットにできるよう可能な限りインテントとの依存性を削除する必要があります。
-
- Android フレームワークは、これらの暗黙的なブロードキャストの必要性を軽減するいくつかのソリューションを提供します。
-たとえば、{@link
- android.app.job.JobScheduler} API は、従量制ではないネットワークへの接続など、指定された条件のときに、ネットワーク操作をスケジュールするための堅牢なメカニズムを提供します。
-
-また、{@link
- android.app.job.JobScheduler} を使用して、コンテンツ プロバイダの変更に対応することもできます。
-</p>
-
-<p>
- N でのバックグラウンド処理の最適化や、アプリで必要となる対応の詳細については、<a href="{@docRoot}preview/features/background-optimization.html">バックグラウンド処理の最適化</a>をご覧ください。
-
-
-</p>
-
-<h2 id="perm">パーミッションの変更</h2>
-
-<p>
- Android N では、アプリに影響を及ぼす可能性のあるパーミッションが変更されています。
-</p>
-
-<h3 id="permfilesys">ファイル システムのパーミッションの変更</h3>
-
-<p>
- プライベート ファイルのセキュリティを強化するために、Android N 以降向けのアプリのプライベート ディレクトリにはアクセス制限があります（<code>0700</code>）。
-
- この設定により、サイズや存在など、プライベート ファイルのメタデータの漏洩を防ぐことができます。
-このパーミッションの変更には、以下のような複数の副作用があります。
-</p>
-
-<ul>
- <li>
- プライベート ファイルの所有者はこのファイル パーミッションを緩和することができず、{@link android.content.Context#MODE_WORLD_READABLE} や {@link android.content.Context#MODE_WORLD_WRITEABLE} を使用してこれを実行しようとすると、{@link java.lang.SecurityException} がトリガーされます。
-
-
-
-
- <p class="note">
- <strong>注:</strong>現在のところ、この制限は完全には適用されていません。
- アプリはネイティブ API や {@link java.io.File File} API を使用して、プライベート ディレクトリのパーミッションを変更できる場合があります。
-ただし、プライベート ディレクトリのパーミッションを緩和できないようにすることをお勧めします。
-
- </p>
- </li>
- <li>
- パッケージ ドメイン以外の <code>file://</code> URI を渡すと、レシーバーがアクセスできないパスになる可能性があります。
-そのため、<code>file://</code> URI を渡そうとすると、<code>FileUriExposedException</code> がトリガーされます。
-
-プライベート ファイルのコンテンツの共有には、{@link
- android.support.v4.content.FileProvider} を使用することをお勧めします。
-
- </li>
- <li>
- {@link android.app.DownloadManager} では、ファイル名でプライベートに保存されたファイルを共有することはできなくなりました。
-以前のアプリで {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME} にアクセスした場合、このパスにアクセスできないことがあります。
-Android N 以降向けのアプリが、{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} にアクセスしようとすると、{@link java.lang.SecurityException} がトリガーされます。
-
-
-
- ダウンロードの場所を {@link
- android.app.DownloadManager.Request#setDestinationInExternalFilesDir
- DownloadManager.Request.setDestinationInExternalFilesDir()} や {@link
- android.app.DownloadManager.Request#setDestinationInExternalPublicDir
- DownloadManager.Request.setDestinationInExternalPublicDir()} を使用してパブリックな場所に設定する以前のアプリは、{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} でこのパスにアクセスできますが、このメソッドは使用しないことをお勧めします。
-
-
-
-
-
-{@link android.app.DownloadManager} で公開されているファイルへのアクセスには、{@link android.content.ContentResolver#openFileDescriptor
- ContentResolver.openFileDescriptor()} を使用することをお勧めします。
-
-
- </li>
-</ul>
-
-<h2 id="sharing-files">アプリ間のファイルの共有</h2>
-
-<p>
-Android N 向けのアプリでは、Android フレームワークにより、アプリ以外の {@code file://} URI の公開を禁止する {@link android.os.StrictMode} API ポリシーが適用されます。
-
-ファイル URI を含むインテントがアプリからなくなると、{@code FileUriExposedException} 例外によりアプリはエラーになります。
-
-</p>
-
-<p>
-アプリ間でファイルを共有するには、{@code content://} URI を送信して、この URI に一時的なアクセス パーミッションを付与する必要があります。
-このパーミッションを付与する最も簡単な方法は、{@link android.support.v4.content.FileProvider} クラスを使用することです。
-パーミッションとファイルの共有の詳細については、<a href="{@docRoot}training/secure-file-sharing/index.html">ファイルの共有</a>をご覧ください。
-
-
-</p>
-
-<h2 id="accessibility">ユーザー補助機能の改善</h2>
-
-<p>
- Android N には、低視力のユーザーまたは視覚障害のあるユーザー向けのプラットフォームのユーザビリティを改善するための変更がいくつか追加されています。
-通常は、これらの変更によってアプリのコードを変更する必要はありませんが、この機能について理解し、アプリでテストして、ユーザー エクスペリエンスに与える潜在的な影響を評価する必要があります。
-
-
-
-</p>
-
-
-<h3 id="screen-zoom">画面のズーム</h3>
-
-<p>
- Android N では、<strong>ディスプレイ サイズ</strong>を設定して、画面上のすべての要素を拡大または縮小することができるので、視覚障害のあるユーザーに対する端末のユーザー補助機能が向上しています。
-
-ユーザーは、一般的な中くらいのサイズの携帯端末 Nexus 4 の幅である <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">sw320dp</a> の画面最小幅を超えて画面をズームできません。
-
-
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>図 3.</strong> 右側の画面では、Android N システム イメージを実行している端末のディスプレイ サイズを拡大している
-
-</p>
-
-
-<p>
- 端末の画面密度が変更されると、以下の方法で実行中のアプリに通知されます。
-
-</p>
-
-<ul>
- <li>アプリが API レベル 23 以前をターゲットにしている場合は、すべてのバックグラウンド処理が自動的に強制終了します。
-つまり、ユーザーがそのようなアプリから移動して [<em>Settings</em>] 画面を開き、<strong>ディスプレイ サイズ</strong>の設定を変更すると、メモリ不足の場合と同じように、アプリが強制終了します。
-
-
-アプリになんらかのフォアグラウンド処理がある場合は、<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>に記載されている設定変更の処理が通知されます。これは、端末の画面の向きが変わったときの処理と同様です。
-
-
-
- </li>
-
- <li>アプリが Android N をターゲットにしている場合、<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>に記載されているように、すべての処理（フォアグラウンド処理およびバックグラウンド処理）に対して設定変更が通知されます。
-
-
-
- </li>
-</ul>
-
-<p>
- Android のベスト プラクティスに従っているほとんどのアプリでは、この機能をサポートするための変更を加える必要はありません。
-以下の点は確認する必要があります。
-</p>
-
-<ul>
- <li>画面幅 <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code> の端末でアプリをテストして、適切に機能することを確認します。
-
- </li>
-
- <li>端末設定が変更された場合、キャッシュ済みのビットマップやネットワークからロードされるリソースなど、画面密度に依存するキャッシュ情報を更新してください。
-
-また、アプリが一時停止状態から再開された場合は、設定変更をチェックしてください。
-
- <p class="note">
- <strong>注:</strong>設定に依存したデータをキャッシュに保存する場合は、そのデータ用の適切な画面サイズやピクセル密度など、関連するメタデータを含めることをお勧めします。
-
-このメタデータを保存しておくと、設定を変更した後、キャッシュ データを更新する必要があるかどうかを決定できます。
-
-
- </p>
- </li>
-
- <li>ピクセル単位は画面密度に対応しないため、ピクセル単位で寸法を指定することは避けてください。
-その代わり、<a href="{@docRoot}guide/practices/screens_support.html">密度非依存ピクセル</a>（<code>dp</code>）単位で寸法を指定します。
-
- </li>
-</ul>
-
-<h3 id="vision-settings">セットアップ ウィザードの [Vision Settings]</h3>
-
-<p>
- Android N には、オープニング画面に [Vision Settings] が追加されています。ユーザーはこれを使用して、新しい端末で以下のユーザー補助機能設定を設定できます。
-
- <strong>ズーム操作</strong>、<strong>フォントサイズ</strong>、<strong>ディスプレイ サイズ</strong>、<strong>TalkBack</strong>。
-この変更により、さまざまな画面設定に関連するバグが顕在化する可能性があります。
-この機能が及ぼす影響を評価するには、これらの設定を有効にしてアプリをテストする必要があります。
-
-設定は、<strong>[Settings] > [Accessibility]</strong> にあります。
-
-</p>
-
-<h2 id="ndk">プラットフォーム ライブラリにリンクした NDK アプリ</h2>
-
-<p>
- Android N では、非パブリック API のロードを防止するために、名前空間が変更されています。
- NDK を使用する場合、Android プラットフォームのパブリック API のみを使用する必要があります。
-Android の次の公式リリースで非パブリック API を使用すると、アプリがクラッシュする可能性があります。
-
-</p>
-
-<p>
- 非パブリック API を使用していることを警告するために、アプリが非パブリック API を呼び出すと、Android N 端末で実行されているアプリは logcat 出力でエラーを生成します。
-
- この状態を認識してもらえるよう、このエラーはメッセージとして端末の画面にも表示されます。
-アプリのコードを確認して、非パブリック プラットフォーム API を削除し、プレビュー端末またはエミュレータを使用して、アプリを十分にテストしてください。
-
-
-</p>
-
-<p>
- アプリがプラットフォーム ライブラリに依存している場合は、NDK ドキュメントにある一般的な修正例を参照して、共通のプライベート API をそれと同等の機能を持つパブリック API に置き換えます。
-
- 特に、<code>libpng</code> など、プラットフォームに含まれていて NDK には含まれていないライブラリをアプリで使用している場合、気付かないうちにプラットフォーム ライブラリにリンクしていることがあります。
-
-この場合、APK にリンク対象のすべての .so ファイルが含まれていることを確認します。
-
-</p>
-
-<p class="caution">
- <strong>警告:</strong>サードパーティのライブラリの中には非パブリック API にリンクしているものもあります。
-アプリがこれらのライブラリを使用している場合、Android の次の公式リリースでアプリを実行すると、アプリがクラッシュする可能性があります。
-
-</p>
-
-<p>
- NDK に含まれていないネイティブ ライブラリは Android のリリース版が変わると変更または削除される場合があるため、アプリでは、こういったライブラリへの依存やその使用を避けてください。
-
-OpenSSL から BoringSSL への移行は、そのような変更の一例です。
- また、NDK に含まれていないプラットフォーム ライブラリには互換性要件がないため、端末によって互換性レベルが異なる場合があります。
-
-古い端末で非 NDK ライブラリにアクセスする必要がある場合は、Android API レベルに応じてロードしてください。
-
-</p>
-
-<p>
- こうしたタイプの問題の診断を支援するために、Android N でアプリをビルドするときに発生する可能性のある Java および NDK のエラーの例を以下に示します。
-
-</p>
-
-<p>Java のエラー例</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>NDK のエラー例</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- こうしたタイプのエラーが発生しているアプリの典型的な修正例を以下に示します。
-</p>
-
-<ul>
- <li>libandroid_runtime.so の getJavaVM と getJNIEnv を使用している場合は、標準の JNI 関数に置き換えることができます。
-
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>{@code libcutils.so} の {@code property_get} シンボルを使用している場合は、public {@code alternative __system_property_get} に置き換えることができます。
-
- これを行うには、次の include 文とともに {@code __system_property_get} を使用します。
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>{@code libcrypto.so} の {@code SSL_ctrl} シンボルを使用している場合は、ローカル版のアプリに置き換える必要があります。
-たとえば、{@code .so} ファイルに {@code libcyrpto.a} を静的にリンクするか、BoringSSL や OpenSSL の {@code libcrypto.so} をアプリに動的に含める必要があります。
-
-
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N には、証明書のインストール、パスワードの再設定、セカンダリ ユーザーの管理、端末識別子へのアクセスなど、Android for Work をターゲットにしているアプリに対する変更が含まれています。
-
-Android for Work 環境向けのアプリをビルドしている場合、これらの変更点を確認し、変更に応じてアプリを修正する必要があります。
-
-
-</p>
-
-<ul>
- <li>DPC が代理証明書を設定する前に、代理証明書インストーラをインストールする必要があります。
-また、プロファイルと N SDK をターゲットにしているデバイス オーナー アプリに対して、デバイス ポリシー コントローラ（DPC）が <code>DevicePolicyManager.setCertInstallerPackage()</code> を呼び出す前に代理証明書インストーラをインストールする必要があります。
-
-
-このインストーラがインストールされていない場合、<code>IllegalArgumentException</code> がスローされます。
-
-
- </li>
-
- <li>端末管理者向けのパスワードの再設定制限がプロファイル オーナーに適用されます。
-端末管理者は、{@code DevicePolicyManager.resetPassword()} を使用して、既に設定されているパスワードを削除または変更できなくなりました。
-
-端末管理者は、端末にパスワード、PIN、またはパターンが設定されていない場合のみ、パスワードを設定できます。
-
- </li>
-
- <li>デバイス オーナーとプロファイル オーナーは、制限が設定されている場合でもアカウントを管理することができます。
-デバイス オーナーとプロファイル オーナーは、<code>DISALLOW_MODIFY_ACCOUNTS</code> ユーザー制限が適用されている場合でもアカウント管理 API を呼び出すことができます。
-
- </li>
-
- <li>デバイス オーナーによるセカンダリ ユーザーの管理がさらに簡単になりました。端末がデバイス オーナー モードで実行されている場合は、<code>DISALLOW_ADD_USER</code> 制限が自動的に設定されます。
-
-これにより、管理されていないセカンダリ ユーザーが作成されることを防ぐことができます。
-また、<code>CreateUser()</code> メソッドと <code>createAndInitializeUser()</code> メソッドは廃止され、新しい <code>DevicePolicyManager.createAndManageUser()</code> メソッドに置き換えられました。
-
-
- </li>
-
- <li>デバイス オーナーは、端末識別子にアクセスできます。また、デバイス オーナーは <code>DevicePolicyManagewr.getWifiMacAddress()</code> を使用して、端末の Wi-Fi MAC アドレスにもアクセスできます。
-
-端末で Wi-Fi が有効にされたことがない場合、このメソッドは {@code null} 値を返します。
-
- </li>
-
- <li>ワークモード設定により、仕事用アプリへのアクセスが制御されます。ワークモードがオフになると、システム ランチャーは仕事用アプリをグレーアウトしてこれらが利用できないことを示します。
-ワークモードが再度有効になると、通常の動作が復元されます。
-
-</ul>
-
-<p>
- Android N での Android for Work の変更の詳細については、<a href="{@docRoot}preview/features/afw.html">Android for Work のアップデート</a>をご覧ください。
-
-</p>
-
-<h2 id="annotations">アノテーションの保持</h2>
-
-<p>
-Android N では、アノテーションの表示が無視されていたバグを修正しています。この問題は、ランタイムがこれまでできなかったアノテーションへのアクセスを可能にしました。
-
-これらのアノテーションは以下のとおりです。
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}:ビルド時にのみ表示されます。</li>
- <li>{@code VISIBILITY_SYSTEM}:実行時に表示されますが、基幹システムにのみ表示されます。
-</li>
-</ul>
-
-<p>
-アプリでこの動作を利用している場合は、実行時に表示されるアノテーションに保持ポリシーを追加してください。
-これは {@code @Retention(RetentionPolicy.RUNTIME)} を使用して実行できます。
-</p>
-
-<h2 id="other">その他の重要事項</h2>
-
-<ul>
-<li>Android N 上で低い API レベルをターゲットにしたアプリが実行されている場合、ユーザーがディスプレイ サイズを変更すると、アプリのプロセスは強制終了されます。
-アプリは、このシナリオを適切に処理する必要があります。
-適切に処理しないと、ユーザーが [Recents] からアプリを復元したときに、アプリがクラッシュします。
-
-
-<p>
-アプリをテストして、この動作が発生しないようにしてください。DDMS でアプリを手動で強制終了させて同様のクラッシュを発生させることにより、アプリのテストを行うことができます。
-
-
-
-</p>
-
-<p>
-N 以上をターゲットにしたアプリは、画面密度の変更時に自動的に強制終了しませんが、設定変更への対応が不十分なままである可能性があります。
-
-</p>
-</li>
-
-<li>
-Android N 上のアプリは設定変更を適切に処理し、次回の起動時にクラッシュしないようにする必要があります。
-フォントのサイズを変更（[<strong>Setting</strong>] > [<strong>Display</strong>] > [<strong>Font size</strong>]）した後に [Recents] からアプリを復元すると、アプリの動作を確認できます。
-
-
-
-</li>
-
-<li>
-旧バージョンの Android では、バグにより、メインスレッドの TCP ソケットへの書き込みを厳格モード違反として報告していませんでした。
-Android N ではこのバグが修正されています。この動作を表示するアプリから {@code android.os.NetworkOnMainThreadException} がスローされるようになりました。通常、メインスレッドでネットワーク操作を実行することはお勧めできません。それは、これらの操作は一般的に ANR やジャンクを引き起こす大幅なテイル レイテンシが発生するためです。
-
-
-
-</li>
-
-<li>
-メソッドの {@code Debug.startMethodTracing()} ファミリーが、SD カードのトップレベルではなく、共有ストレージ上のパッケージ固有のディレクトリの storing output にデフォルト設定されました。
-
-
-つまり、これらの API を使用するためにアプリで {@code WRITE_EXTERNAL_STORAGE} パーミッションをリクエストする必要はありません。
-</li>
-
-<li>
-多くのプラットフォーム API は、{@link android.os.Binder} トランザクションで送信される大きなペイロードをチェックし、暗黙的にログ記録したり、削除したりするのではなく {@code TransactionTooLargeExceptions} を {@code RuntimeExceptions} として再度スローするようになりました。
-
-
-一般的な例としては、{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()} で大量のデータを格納することです。これにより、アプリが Android N をターゲットにしている場合は、{@code ActivityThread.StopInfo} で {@code RuntimeException} がスローされます。
-
-
-
-
-</li>
-
-<li>
-アプリが {@link java.lang.Runnable} タスクを {@link android.view.View} に渡し、{@link android.view.View} がウィンドウにアタッチされない場合は、{@link java.lang.Runnable} タスクと {@link android.view.View} がキューに入れられます。{@link java.lang.Runnable} タスクは {@link android.view.View} がウィンドウにアタッチされるまで実行されません。
-
-
-
-
-
-この動作は以下のバグを修正します。
-<ul>
- <li>対象ウィンドウの UI スレッド以外のスレッドからアプリが {@link android.view.View} に渡すと、結果として不適切なスレッドで {@link java.lang.Runnable} が実行される可能性があります。
-
- </li>
- <li>{@link java.lang.Runnable} タスクがルーパー スレッド以外のスレッドから渡されると、アプリは {@link java.lang.Runnable} タスクを公開できました。
-</li>
-</ul>
-</li>
-
-<li>
-{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES} パーミッションを持つ Android N 上のアプリが、別のアプリがインストールしたパッケージを削除しようとすると、ユーザー確認が要求されます。
-
-
-このシナリオでは、アプリが {@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()} を呼び出した場合は、{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION} をリターン ステータスとしてみなす必要があります。
-
-
-
-</li>
-
-</ul>
-
diff --git a/docs/html-intl/intl/ja/preview/download-ota.jd b/docs/html-intl/intl/ja/preview/download-ota.jd
deleted file mode 100644
index 1107baf..0000000
--- a/docs/html-intl/intl/ja/preview/download-ota.jd
+++ /dev/null
@@ -1,324 +0,0 @@
-page.title=端末の OTA イメージの適用
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Android Preview SDK のコンポーネントをダウンロード、インストールする前に、次の利用規約に同意する必要があります。
-
-</p>
-
- <h2 class="norule">利用規約</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-以下は、Android SDK Preview の使用許諾契約です（以下「本契約」）。
-
-1. はじめに
-
-1.1 Android SDK Preview（以下、本契約で「Preview」という。具体的には利用可能な場合には Android システム ファイル、パッケージ型 API、Preview ライブラリ ファイルを含む）は、本契約の規定に従ってライセンス許可されます。本契約では、デベロッパーの Preview の使用に関して、デベロッパーと Google の間で法的拘束力のある契約を結びます。
-
-1.2 「Android」とは、Android オープンソース プロジェクト（http://source.android.com/ にて随時更新）にて利用可能な、端末向けの Android ソフトウェア スタックを意味します。
-
-1.3 「Android 互換」とは、（i）Android 互換ウェブサイト（http://source.android.com/compatibility）に掲載されており、随時アップデートされる可能性がある Android Compatibility Definition ドキュメントに準拠し、かつ（ii）Android Compatibility Test Suite（CTS）に合格した任意の Android 実装を指します。
-
-1.4 「Google」とは、1600 Amphitheatre Parkway, Mountain View, CA 94043, United States に主たる事業所を有するデラウェア州法人である Google Inc. を意味します。
-
-2. 本契約への同意
-
-2.1 Peview を使用するためには、本契約に同意する必要があります。本契約に同意しない場合は Preview を使用できません。
-
-2.2 同意するかまたは Preview を使用するためにクリックすると、本契約に同意したことになります。
-
-2.3 米国またはその他の国（デベロッパーが居住している国かまたはデベロッパーが Preview を使用する国を含む）の法律により Preview の使用を禁止されている人である場合、Preview を使用することも、使用許諾契約に同意することもできません。
-
-2.4 雇用主またはその他の事業体を代表または代理して本契約に拘束されることに同意し Preview を企業または組織の内部で使用する場合、担当者の雇用主またはその他の事業体を本契約に法的に拘束する完全な法的権限を有していることを表明および保証するものとします。担当者が必要な権限を有していない場合は、担当者の雇用主またはその他の事業体を代表または代理して、本契約に同意することも、Preview を使用することもできません。
-
-3. Google からの Preview ライセンス
-
-3.1 本契約の規定に従い、Google は Android 実装と互換性のあるアプリの開発に Preview を使用するための、限定的で、世界規模の、ロイヤリティ フリーな、譲渡不可、非排他的、サブライセンス不可なライセンスを付与するものとします。
-
-3.2 本 Preview は、別のプラットフォーム（Android 実装と互換性のないものも含む）のアプリの開発や別の SDK の開発には使用できません。本 Preview をその目的で使用しない場合は、Android 実装と互換性のないものを含め、自由に別のプラットフォームのアプリの開発を行うことができます。
-
-3.3 Preview に関するすべての法的権利、所有権、利益（Preview に含まれる知的財産権を含む）は Google またはサードパーティが所有するものとします。「知的財産権」とは、特許法、著作権法、営業秘密法、商標法、不当競争防止法に基づいて発生するすべての権利、およびその他のすべての所有権を意味します。デベロッパーに明示的に付与されていない権利は、すべて Google が所有します。
-
-3.4 本契約で明示的に許可されている目的以外においては、Preview を使用できません。当該のサードパーティのライセンスで必要とされる場合を除き、デベロッパーは、（a）Preview または Preview の一部をコピー（バックアップ目的を除く）、修正、改造、再配布、逆コンパイル、リバース エンジニアリング、逆アセンブルまたは派生物の作成、または（b）モバイル ハンドセットまたは個人用コンピュータ以外のハードウェア端末への Preview の読み込み、Preview と他のソフトウェアとの結合、または Preview の一部を組み込んだソフトウェアや端末の配布はできません。
-
-3.5 オープンソース ソフトウェア ライセンス下でライセンス付与された Preview のコンポーネントの使用、複製、配布は、本契約ではなく、そのオープンソース ソフトウェアのライセンスに準拠するものとします。デベロッパーは、許諾されるすべての権利下で、そのようなオープンソース ソフトウェア ライセンスに対して、良好な状態のライセンシーのままでいることに同意し、そのような権利を終了、停止、または違反する可能性のあるいかなる行為も差し控えることに同意するものとします。
-
-3.6 デベロッパーは、Google が提供する Preview の形式および性質は事前の通知なしに変更される場合があり、今後リリースされる Preview のバージョンでは、以前のバージョンの Preview で開発されたアプリとの互換性がない可能性があることに同意します。デベロッパーは、Google が事前の通知なく、Google の単独の裁量でデベロッパーまたはユーザーへの Preview（または Preview 内の一部の機能）の提供を（恒久的または一時的に）停止する場合があることに同意します。
-
-3.7 本契約のいかなる部分も、Google のいかなる商標名、商標、サービスマーク、ロゴ、ドメイン名、またはその他のブランド識別表示を使用する権利もデベロッパーに付与するものではありません。
-
-3.8 デベロッパーは、Preview に添付または収録されているすべての知的財産権に関する通知（著作権および商標の通知を含む）の削除、隠ぺい、改ざんを行わないことに同意します。
-
-4. デベロッパーによる Preview の使用
-
-4.1 Google は、本契約に基づき Preview を使用してデベロッパーが開発したソフトウェア アプリに関して、デベロッパー（またはデベロッパーのライセンサー）からいかなる権利、所有権、または利益（当該アプリに含まれる知的財産権を含む）も取得するものではないことに同意します。
-
-4.2 デベロッパーは、Preview を（a）本契約、および（b）該当する司法管轄区における適用される法律、規則、または一般に認められた慣行またはガイドライン（米国またはその他の該当国におけるデータまたはソフトウェアの輸出入に関する法律を含む）で認められている目的にのみ使用することに同意します。
-
-4.3 Preview を使用してアプリを開発する場合、デベロッパーはユーザーのプライバシーおよび法的権利を保護することに同意します。ユーザーからデベロッパーにユーザー名、パスワード、またはその他のログイン情報または個人情報が提供される場合、デベロッパーは、情報がデベロッパーのアプリに提供されることをユーザーに認識させ、当該ユーザーについてプライバシーに関する法的に十分な通知および保護を行わなければなりません。デベロッパーのアプリに個人情報または秘密情報が保存される場合、この保存は保護された方法で行われなければなりません。ユーザーからデベロッパーのアプリに Google アカウントの情報が提供された場合、デベロッパーのアプリでは、ユーザーが許可したタイミングで、かつユーザーが許可した限定された目的にのみ、当該情報を使用してユーザーの Google アカウントにアクセスすることが認められるものとします。
-
-4.4 デベロッパーは、Preview に関して、第三者（Google、およびあらゆる携帯電話会社を含むが、これらに限定されない）のサーバー、ネットワーク、またはその他の財産またはサービスへの妨害、中断、損害、または許可されていない態様でのアクセスとなる行為（そのような行為に該当する対象製品の開発または販売 / 配布を含む）に関与しないことに同意します。
-
-4.5 デベロッパーは、デベロッパーが Android および Android のアプリを介して作成、送信、表示するデータ、コンテンツ、リソース、および自身の行為の結果（Google に発生する可能性のあるあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
-
-4.6 デベロッパーは、本契約、適用される第三者の契約もしくは利用規約、または適用される法律もしくは規則に基づく自身の義務に違反したこと、および当該違反の結果（Google または第三者に発生したあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
-
-4.7 Preview は開発中であり、デベロッパーによるテスティングやフィードバックは開発プロセスの重要な一部となります。デベロッパーは、Preview の使用により、一部の機能の実装が開発中であると認識し、Preview が安定したリリースの完全な機能性を持つことに依存すべきでないことを認識するものとします。本 Preview は、公式の Android SDK のリリース後はサポート対象でなくなるため、デベロッパーは、Preview を使用するいかなるアプリも公然と配布または引き渡さないことに同意するものとします。
-
-5. デベロッパーの認証情報
-
-5.1 デベロッパーは、Google が発行した、またはデベロッパー自身で選択した、自身のデベロッパー用認証情報の秘密を保持する責任を負うこと、および自身のデベロッパー用認証情報のもとで開発されたすべてのアプリについて単独で責任を負うことに同意します。
-
-6. プライバシーおよび情報
-
-6.1 Google は、Preview の継続的な技術革新と改良のために、ソフトウェアから特定の使用統計情報（一意識別子、関連する IP アドレス、ソフトウェアのバージョン番号、Preview のどのツール/サービスがどのように使用されているかに関する情報を含むが、これらに限定されない）を収集できます。この情報が収集される前に、Preview に通知が表示され、デベロッパーの同意が求められます。デベロッパーが同意しない場合は、情報は収集されません。
-
-6.2 収集されるデータは、Preview の改良のために集約された形で精査され、Google のプライバシー ポリシー（http://www.google.com/policies/privacy/）に従って管理されます。
-
-7. 第三者のアプリ
-
-7.1 デベロッパーが、Preview を使用して第三者が開発したアプリを実行する、あるいは第三者から提供されたデータ、コンテンツ、リソースにアクセスする場合、デベロッパーは、Google がそれらのアプリ、データ、コンテンツ、リソースについて責任を負わないことに同意します。デベロッパーは、そのような第三者のアプリを介してアクセスするすべてのデータ、コンテンツ、リソースについては、それらを生成した者が単独で責任を負うものであり、Google はそれらの第三者のアプリ、データ、コンテンツ、またはリソースの使用もしくはアクセスによって生じたあらゆる損失および損害について一切責任を負わないことを理解します。
-
-7.2 デベロッパーは、そのような第三者のアプリを介して表示されるデータ、コンテンツ、リソースは、提供者（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。デベロッパーは、当該所有者からの明確な許可がない限り、それらのデータ、コンテンツ、リソース（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
-
-7.3 デベロッパーは、そのような第三者のアプリ、データ、コンテンツまたはリソースの使用が、デベロッパーと当該第三者間の別の規約に従うものであることを認識するものとします。
-
-8. Google API の使用
-
-8.1 Google API
-
-8.1.1 API を使用して Google からデータを取得する場合、デベロッパーは、そのデータは、Google またはデータを提供する事業体（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。そのような API の使用は追加の利用規約に従うものとします。デベロッパーは、当該の利用規約による許可がない限り、そのデータ（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
-
-8.1.2 デベロッパーは、API を使用して Google からユーザーのデータを取得する場合、ユーザーが明示的に同意した場合のみ、およびユーザーが許可したタイミングとその目的にのみ、データを取得できることを理解し、同意します。
-
-9. 本契約の終了
-
-9.1 本契約は、下記の規定に従ってデベロッパーまたは Google のいずれかによって解約されるまで、継続して適用されるものとします。
-
-9.2 デベロッパーが本契約の解約を希望する場合は、Preview および関連するデベロッパー認証情報の使用を停止することで、契約を終了するものとします。
-
-9.3 Google は、理由の有無にかかわらず、書面で通知することでいつでもデベロッパーとの本契約を解約することができます。
-
-9.4 本契約は事前の通知またはその他の措置なく、次のうち早い方に自動的に終了します。
-（A）Google が、デベロッパーが居住している国またはデベロッパーがサービスを使用する国での Preview または Preview の一部の配布を停止したとき。
-（B）Google が Android SDK の最終バージョンをリリースしたとき。
-
-9.5 本契約が終了すると、本契約で付与されていたライセンスは終了し、デベロッパーは速やかに Preview のすべての使用を停止するものとし、第 10 条、第 11 条、第 12 条、第 14 条の規定は無期限に効力を有するものとします。
-
-10.免責事項
-
-10.1 デベロッパーは、デベロッパーによる Preview の使用はデベロッパー自身の責任において行うものであること、および Preview は「現状有姿」かつ「提供可能な限りにおいて」、Google からのいかなる種類の保証もなく提供されるものであることを明示的に理解し、これに同意します。
-
-10.2 デベロッパーによる Preview および Preview の使用を通じてダウンロードまたはその他の方法で取得されたマテリアルの使用は、デベロッパー自身の裁量および責任において行うものであり、当該使用の結果として生じるデベロッパーのコンピュータ システムもしくはその他の端末への損害またはデータの喪失についての責任はデベロッパーが単独で負います。前述を制限することなく、Preview は安定したリリースではなく、コンピュータやその他の端末の利用の完全な回復不可能な損失を含む、重大な損害を引き起こす可能性のあるエラー、欠陥、およびセキュリティ上の脆弱性が含まれている可能性があることを理解します。
-
-10.3 Google はまた、商品性、特定目的への適合性、および権利侵害がないことの黙示的な保証および条件を含む（ただしこれらに限定されない）、明示的か黙示的かを問わずあらゆる種類のすべての保証および条件を明示的に否定します。
-
-11.責任の制限
-
-11.1 デベロッパーは、Google、その子会社および関連会社、ならびにそのライセンサーが、デベロッパーに発生した直接損害、間接損害、偶発的損害、特別損害、結果的損害、または懲罰的損害（データの喪失を含む）について、Google またはその代表者が当該損失が発生する可能性について告知されていたかどうか、または知っていたはずであるかどうかにかかわらず、いかなる責任法理のもとでもデベロッパーに対して責任を負わないことを明示的に理解し、これに同意します。
-
-12.補償
-
-12.1 法律で認められる最大限の範囲内において、デベロッパーは、（a）デベロッパーが Preview を使用したこと、および（b）デベロッパーが Preview で開発したアプリが他者のいかなる知的財産権を侵害していること、または他者の名誉を毀損している、もしくは他者のパブリシティ権もしくはプライバシー権を侵害していること、および（c）デベロッパーが本契約に違反したことから発生したあらゆる申し立て、普通法上の訴訟、衡平法上の訴訟、または法的手続き、ならびにあらゆる損失、責任、損害、費用、および経費（合理的な弁護士報酬を含む）について、Google、その関連会社、ならびに当該各社の取締役、役員、従業員、代理人を防御し、補償し、免責することに同意します。
-
-13.契約の変更
-
-13.1 Google は、Preview の新しいバージョンを配布することにより、いつでも本契約を変更することができます。変更が生じた場合、Google は、Preview の提供ウェブサイト上に使用許諾契約の改訂版を公開します。
-
-14.法的一般条項
-
-14.1 本契約は、デベロッパーと Google の間の法的な合意のすべてを表し、デベロッパーによる Preview の使用（別の契約下で Google が提供するサービスを除く）に適用され、Preview に関するデベロッパーと Google の間のあらゆる事前の合意に完全に取って代わるものです。
-
-14.2 デベロッパーは、Google が本契約に定める（または適用される法律のもとで Google が享受できる）法的な権利または救済措置を行使または執行しなかった場合でも、Google の権利が正式に放棄されたとはみなされないこと、および Google が以後も引き続き当該権利および救済措置を行使または執行できることに同意します。
-
-14.3 本件について判断を下す管轄権を有する司法裁判所によって、本契約のいずれかの条項が無効と判断された場合、当該条項は、本契約の残りの部分に影響を与えることなく本契約から削除されるものとします。本契約の残りの条項は、以後も引き続き有効かつ執行可能であるものとします。
-
-14.4 デベロッパーは、Google が親会社となっている各グループ企業が、本契約の第三受益者となること、および当該企業が、当該企業に利益（または受益権）を付与する本契約の条項を直接執行する、また当該条項に依拠する権利を有することを了承し、これに同意します。上記以外のいかなる人または法人も、本契約の第三受益者とはならないものとします。
-
-14.5 輸出規制。Preview は、米国輸出管理法令の対象です。デベロッパーは、Preview に適用されるすべての国内および国際の輸出管理法令に従わなければなりません。これらの法律には、仕向け地、ユーザー、および最終用途に関する制限が含まれます。
-
-14.6 デベロッパーは、Google から事前に書面で承認を得ずに、本契約を譲渡または移転することはできません。また、そのような承認を得ずに計画された譲渡はすべて無効になります。デベロッパーは、Google から事前に書面で承認を得ずに、本契約に基づく自身の責任または義務を他者に委任してはなりません。
-
-14.7 本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連するすべての申し立ては、米国カリフォルニア州の抵触法を除いて、カリフォルニア州法に準拠するものとします。デベロッパーおよび Google は、本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連する法的事項の解決について、米国カリフォルニア州サンタクララ郡に所在の連邦裁判所または州立裁判所が専属管轄権を有することに合意します。上記にかかわらず、デベロッパーは、Google が任意の司法管轄区において差し止め命令による救済（または同等の緊急法的救済）を求める申し立てを行うことが認められることに同意します。
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">上記の利用規約を読み、同意します。</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- このページでは、無線（OTA）端末イメージへのリンクを提供し、OTA アップデートを端末に手動で適用する方法を説明しています。
-この手順は、Android ベータ版プログラムにより OTA アップデートが配信されたが、アップデートをインストールした後に起動しない端末を復元する際に役立ちます。
-
-
-</p>
-
-<h2 id="install-ota">OTA イメージのインストール</h2>
-
-<p></p>
-
-<p>端末に OTA パッケージをインストールするには：</p>
-
-<ol>
- <li>以下の表の OTA 端末イメージをダウンロードします。</li>
- <li>復旧モードで端末を再起動します。Nexus 端末をこのモードにする方法については、<a href="https://support.google.com/nexus/answer/4596836">Nexus を工場出荷時設定にリセットする</a>を参照してください。
-
-
-
- </li>
- <li>端末で [<strong>ADB sideload</strong>] を選択します。</li>
- <li>Android 開発環境がロードされ、Android Debug Bridge（adb）ツールがインストールされたコンピュータに端末を接続します。
-</li>
- <li>以下のコマンドを実行します。
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">端末の OTA イメージ</h2>
-
-<table>
- <tr>
- <th scope="col">端末</th>
- <th scope="col">ダウンロード / チェックサム</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-ota-npd35k-b8cfbd80.zip</a><br>
- MD5:15fe2eba9b01737374196bdf0a792fe9<br>
- SHA-1:5014b2bba77f9e1a680ac3f90729621c85a14283
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-ota-npd35k-078e6fa5.zip</a><br>
- MD5: e8b12f7721c53af9a450f7058928a5fc<br>
- SHA-1: b7a9b756f84a1d2e482ff9c16749d65f6e51425a
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-ota-npd35k-88457699.zip</a><br>
- MD5:3fac09fef759dde26e57cb80b20b6477<br>
- SHA-1:27d6caa786577d8a38b2da5bf94b33b4524a1a1c
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-ota-npd35k-51dbae76.zip</a><br>
- MD5:58312c4a5971818ef5c77a3f446003da<br>
- SHA-1: aad9005be33d3e2bab480509a6ab74c3c3b9d921
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-ota-npd35k-834f047f.zip</a><br>
- MD5:92b7d1fa252f7394e70f957c72d4aac8<br>
- SHA-1: b6c057c84d90893630e303cbb60530e20ddb8361
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-ota-npd35k-6ac91298.zip</a><br>
- MD5:1461622ad53ea842b2722fa7b49b8172<br>
- SHA-1:409c061668ab270774877d7f3eae44fa48d2b931
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-ota-npd35k-a0b2347f.zip</a><br>
- MD5: c60117f3640cc6db12386fd632289c7d<br>
- SHA-1:87349c767c69efb4172c90ce1d88cf578c3d28b3
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G（Android One） <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-ota-npd35k-09897a1d.zip</a><br>
- MD5: a55cf94f7cce0393ec6c0b35041766b7<br>
- SHA-1:6f33742290eb46f2561891f38ca2e754b4e50c6a
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/ja/preview/download.jd b/docs/html-intl/intl/ja/preview/download.jd
deleted file mode 100644
index 52c3c6c..0000000
--- a/docs/html-intl/intl/ja/preview/download.jd
+++ /dev/null
@@ -1,543 +0,0 @@
-page.title=端末上でのテスト
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Android Preview SDK のコンポーネントをダウンロード、インストールする前に、次の利用規約に同意する必要があります。
-
-</p>
-
- <h2 class="norule">利用規約</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-以下は、Android SDK Preview の使用許諾契約です（以下「本契約」）。
-
-1. はじめに
-
-1.1 Android SDK Preview（以下、本契約で「Preview」という。具体的には利用可能な場合には Android システム ファイル、パッケージ型 API、Preview ライブラリ ファイルを含む）は、本契約の規定に従ってライセンス許可されます。本契約では、デベロッパーの Preview の使用に関して、デベロッパーと Google の間で法的拘束力のある契約を結びます。
-
-1.2 「Android」とは、Android オープンソース プロジェクト（http://source.android.com/ にて随時更新）にて利用可能な、端末向けの Android ソフトウェア スタックを意味します。
-
-1.3 「Android 互換」とは、（i）Android 互換ウェブサイト（http://source.android.com/compatibility）に掲載されており、随時アップデートされる可能性がある Android Compatibility Definition ドキュメントに準拠し、かつ（ii）Android Compatibility Test Suite（CTS）に合格した任意の Android 実装を指します。
-
-1.4 「Google」とは、1600 Amphitheatre Parkway, Mountain View, CA 94043, United States に主たる事業所を有するデラウェア州法人である Google Inc. を意味します。
-
-2. 本契約への同意
-
-2.1 Peview を使用するためには、本契約に同意する必要があります。本契約に同意しない場合は Preview を使用できません。
-
-2.2 同意するかまたは Preview を使用するためにクリックすると、本契約に同意したことになります。
-
-2.3 米国またはその他の国（デベロッパーが居住している国かまたはデベロッパーが Preview を使用する国を含む）の法律により Preview の使用を禁止されている人である場合、Preview を使用することも、使用許諾契約に同意することもできません。
-
-2.4 雇用主またはその他の事業体を代表または代理して本契約に拘束されることに同意し Preview を企業または組織の内部で使用する場合、担当者の雇用主またはその他の事業体を本契約に法的に拘束する完全な法的権限を有していることを表明および保証するものとします。担当者が必要な権限を有していない場合は、担当者の雇用主またはその他の事業体を代表または代理して、本契約に同意することも、Preview を使用することもできません。
-
-3. Google からの Preview ライセンス
-
-3.1 本契約の規定に従い、Google は Android 実装と互換性のあるアプリの開発に Preview を使用するための、限定的で、世界規模の、ロイヤリティ フリーな、譲渡不可、非排他的、サブライセンス不可なライセンスを付与するものとします。
-
-3.2 本 Preview は、別のプラットフォーム（Android 実装と互換性のないものも含む）のアプリの開発や別の SDK の開発には使用できません。本 Preview をその目的で使用しない場合は、Android 実装と互換性のないものを含め、自由に別のプラットフォームのアプリの開発を行うことができます。
-
-3.3 Preview に関するすべての法的権利、所有権、利益（Preview に含まれる知的財産権を含む）は Google またはサードパーティが所有するものとします。「知的財産権」とは、特許法、著作権法、営業秘密法、商標法、不当競争防止法に基づいて発生するすべての権利、およびその他のすべての所有権を意味します。デベロッパーに明示的に付与されていない権利は、すべて Google が所有します。
-
-3.4 本契約で明示的に許可されている目的以外においては、Preview を使用できません。当該のサードパーティのライセンスで必要とされる場合を除き、デベロッパーは、（a）Preview または Preview の一部をコピー（バックアップ目的を除く）、修正、改造、再配布、逆コンパイル、リバース エンジニアリング、逆アセンブルまたは派生物の作成、または（b）モバイル ハンドセットまたは個人用コンピュータ以外のハードウェア端末への Preview の読み込み、Preview と他のソフトウェアとの結合、または Preview の一部を組み込んだソフトウェアや端末の配布はできません。
-
-3.5 オープンソース ソフトウェア ライセンス下でライセンス付与された Preview のコンポーネントの使用、複製、配布は、本契約ではなく、そのオープンソース ソフトウェアのライセンスに準拠するものとします。デベロッパーは、許諾されるすべての権利下で、そのようなオープンソース ソフトウェア ライセンスに対して、良好な状態のライセンシーのままでいることに同意し、そのような権利を終了、停止、または違反する可能性のあるいかなる行為も差し控えることに同意するものとします。
-
-3.6 デベロッパーは、Google が提供する Preview の形式および性質は事前の通知なしに変更される場合があり、今後リリースされる Preview のバージョンでは、以前のバージョンの Preview で開発されたアプリとの互換性がない可能性があることに同意します。デベロッパーは、Google が事前の通知なく、Google の単独の裁量でデベロッパーまたはユーザーへの Preview（または Preview 内の一部の機能）の提供を（恒久的または一時的に）停止する場合があることに同意します。
-
-3.7 本契約のいかなる部分も、Google のいかなる商標名、商標、サービスマーク、ロゴ、ドメイン名、またはその他のブランド識別表示を使用する権利もデベロッパーに付与するものではありません。
-
-3.8 デベロッパーは、Preview に添付または収録されているすべての知的財産権に関する通知（著作権および商標の通知を含む）の削除、隠ぺい、改ざんを行わないことに同意します。
-
-4. デベロッパーによる Preview の使用
-
-4.1 Google は、本契約に基づき Preview を使用してデベロッパーが開発したソフトウェア アプリに関して、デベロッパー（またはデベロッパーのライセンサー）からいかなる権利、所有権、または利益（当該アプリに含まれる知的財産権を含む）も取得するものではないことに同意します。
-
-4.2 デベロッパーは、Preview を（a）本契約、および（b）該当する司法管轄区における適用される法律、規則、または一般に認められた慣行またはガイドライン（米国またはその他の該当国におけるデータまたはソフトウェアの輸出入に関する法律を含む）で認められている目的にのみ使用することに同意します。
-
-4.3 Preview を使用してアプリを開発する場合、デベロッパーはユーザーのプライバシーおよび法的権利を保護することに同意します。ユーザーからデベロッパーにユーザー名、パスワード、またはその他のログイン情報または個人情報が提供される場合、デベロッパーは、情報がデベロッパーのアプリに提供されることをユーザーに認識させ、当該ユーザーについてプライバシーに関する法的に十分な通知および保護を行わなければなりません。デベロッパーのアプリに個人情報または秘密情報が保存される場合、この保存は保護された方法で行われなければなりません。ユーザーからデベロッパーのアプリに Google アカウントの情報が提供された場合、デベロッパーのアプリでは、ユーザーが許可したタイミングで、かつユーザーが許可した限定された目的にのみ、当該情報を使用してユーザーの Google アカウントにアクセスすることが認められるものとします。
-
-4.4 デベロッパーは、Preview に関して、第三者（Google、およびあらゆる携帯電話会社を含むが、これらに限定されない）のサーバー、ネットワーク、またはその他の財産またはサービスへの妨害、中断、損害、または許可されていない態様でのアクセスとなる行為（そのような行為に該当する対象製品の開発または販売 / 配布を含む）に関与しないことに同意します。
-
-4.5 デベロッパーは、デベロッパーが Android および Android のアプリを介して作成、送信、表示するデータ、コンテンツ、リソース、および自身の行為の結果（Google に発生する可能性のあるあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
-
-4.6 デベロッパーは、本契約、適用される第三者の契約もしくは利用規約、または適用される法律もしくは規則に基づく自身の義務に違反したこと、および当該違反の結果（Google または第三者に発生したあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
-
-4.7 Preview は開発中であり、デベロッパーによるテスティングやフィードバックは開発プロセスの重要な一部となります。デベロッパーは、Preview の使用により、一部の機能の実装が開発中であると認識し、Preview が安定したリリースの完全な機能性を持つことに依存すべきでないことを認識するものとします。本 Preview は、公式の Android SDK のリリース後はサポート対象でなくなるため、デベロッパーは、Preview を使用するいかなるアプリも公然と配布または引き渡さないことに同意するものとします。
-
-5. デベロッパーの認証情報
-
-5.1 デベロッパーは、Google が発行した、またはデベロッパー自身で選択した、自身のデベロッパー用認証情報の秘密を保持する責任を負うこと、および自身のデベロッパー用認証情報のもとで開発されたすべてのアプリについて単独で責任を負うことに同意します。
-
-6. プライバシーおよび情報
-
-6.1 Google は、Preview の継続的な技術革新と改良のために、ソフトウェアから特定の使用統計情報（一意識別子、関連する IP アドレス、ソフトウェアのバージョン番号、Preview のどのツール/サービスがどのように使用されているかに関する情報を含むが、これらに限定されない）を収集できます。この情報が収集される前に、Preview に通知が表示され、デベロッパーの同意が求められます。デベロッパーが同意しない場合は、情報は収集されません。
-
-6.2 収集されるデータは、Preview の改良のために集約された形で精査され、Google のプライバシー ポリシー（http://www.google.com/policies/privacy/）に従って管理されます。
-
-7. 第三者のアプリ
-
-7.1 デベロッパーが、Preview を使用して第三者が開発したアプリを実行する、あるいは第三者から提供されたデータ、コンテンツ、リソースにアクセスする場合、デベロッパーは、Google がそれらのアプリ、データ、コンテンツ、リソースについて責任を負わないことに同意します。デベロッパーは、そのような第三者のアプリを介してアクセスするすべてのデータ、コンテンツ、リソースについては、それらを生成した者が単独で責任を負うものであり、Google はそれらの第三者のアプリ、データ、コンテンツ、またはリソースの使用もしくはアクセスによって生じたあらゆる損失および損害について一切責任を負わないことを理解します。
-
-7.2 デベロッパーは、そのような第三者のアプリを介して表示されるデータ、コンテンツ、リソースは、提供者（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。デベロッパーは、当該所有者からの明確な許可がない限り、それらのデータ、コンテンツ、リソース（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
-
-7.3 デベロッパーは、そのような第三者のアプリ、データ、コンテンツまたはリソースの使用が、デベロッパーと当該第三者間の別の規約に従うものであることを認識するものとします。
-
-8. Google API の使用
-
-8.1 Google API
-
-8.1.1 API を使用して Google からデータを取得する場合、デベロッパーは、そのデータは、Google またはデータを提供する事業体（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。そのような API の使用は追加の利用規約に従うものとします。デベロッパーは、当該の利用規約による許可がない限り、そのデータ（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
-
-8.1.2 デベロッパーは、API を使用して Google からユーザーのデータを取得する場合、ユーザーが明示的に同意した場合のみ、およびユーザーが許可したタイミングとその目的にのみ、データを取得できることを理解し、同意します。
-
-9. 本契約の終了
-
-9.1 本契約は、下記の規定に従ってデベロッパーまたは Google のいずれかによって解約されるまで、継続して適用されるものとします。
-
-9.2 デベロッパーが本契約の解約を希望する場合は、Preview および関連するデベロッパー認証情報の使用を停止することで、契約を終了するものとします。
-
-9.3 Google は、理由の有無にかかわらず、書面で通知することでいつでもデベロッパーとの本契約を解約することができます。
-
-9.4 本契約は事前の通知またはその他の措置なく、次のうち早い方に自動的に終了します。
-（A）Google が、デベロッパーが居住している国またはデベロッパーがサービスを使用する国での Preview または Preview の一部の配布を停止したとき。
-（B）Google が Android SDK の最終バージョンをリリースしたとき。
-
-9.5 本契約が終了すると、本契約で付与されていたライセンスは終了し、デベロッパーは速やかに Preview のすべての使用を停止するものとし、第 10 条、第 11 条、第 12 条、第 14 条の規定は無期限に効力を有するものとします。
-
-10.免責事項
-
-10.1 デベロッパーは、デベロッパーによる Preview の使用はデベロッパー自身の責任において行うものであること、および Preview は「現状有姿」かつ「提供可能な限りにおいて」、Google からのいかなる種類の保証もなく提供されるものであることを明示的に理解し、これに同意します。
-
-10.2 デベロッパーによる Preview および Preview の使用を通じてダウンロードまたはその他の方法で取得されたマテリアルの使用は、デベロッパー自身の裁量および責任において行うものであり、当該使用の結果として生じるデベロッパーのコンピュータ システムもしくはその他の端末への損害またはデータの喪失についての責任はデベロッパーが単独で負います。前述を制限することなく、Preview は安定したリリースではなく、コンピュータやその他の端末の利用の完全な回復不可能な損失を含む、重大な損害を引き起こす可能性のあるエラー、欠陥、およびセキュリティ上の脆弱性が含まれている可能性があることを理解します。
-
-10.3 Google はまた、商品性、特定目的への適合性、および権利侵害がないことの黙示的な保証および条件を含む（ただしこれらに限定されない）、明示的か黙示的かを問わずあらゆる種類のすべての保証および条件を明示的に否定します。
-
-11.責任の制限
-
-11.1 デベロッパーは、Google、その子会社および関連会社、ならびにそのライセンサーが、デベロッパーに発生した直接損害、間接損害、偶発的損害、特別損害、結果的損害、または懲罰的損害（データの喪失を含む）について、Google またはその代表者が当該損失が発生する可能性について告知されていたかどうか、または知っていたはずであるかどうかにかかわらず、いかなる責任法理のもとでもデベロッパーに対して責任を負わないことを明示的に理解し、これに同意します。
-
-12.補償
-
-12.1 法律で認められる最大限の範囲内において、デベロッパーは、（a）デベロッパーが Preview を使用したこと、および（b）デベロッパーが Preview で開発したアプリが他者のいかなる知的財産権を侵害していること、または他者の名誉を毀損している、もしくは他者のパブリシティ権もしくはプライバシー権を侵害していること、および（c）デベロッパーが本契約に違反したことから発生したあらゆる申し立て、普通法上の訴訟、衡平法上の訴訟、または法的手続き、ならびにあらゆる損失、責任、損害、費用、および経費（合理的な弁護士報酬を含む）について、Google、その関連会社、ならびに当該各社の取締役、役員、従業員、代理人を防御し、補償し、免責することに同意します。
-
-13.契約の変更
-
-13.1 Google は、Preview の新しいバージョンを配布することにより、いつでも本契約を変更することができます。変更が生じた場合、Google は、Preview の提供ウェブサイト上に使用許諾契約の改訂版を公開します。
-
-14.法的一般条項
-
-14.1 本契約は、デベロッパーと Google の間の法的な合意のすべてを表し、デベロッパーによる Preview の使用（別の契約下で Google が提供するサービスを除く）に適用され、Preview に関するデベロッパーと Google の間のあらゆる事前の合意に完全に取って代わるものです。
-
-14.2 デベロッパーは、Google が本契約に定める（または適用される法律のもとで Google が享受できる）法的な権利または救済措置を行使または執行しなかった場合でも、Google の権利が正式に放棄されたとはみなされないこと、および Google が以後も引き続き当該権利および救済措置を行使または執行できることに同意します。
-
-14.3 本件について判断を下す管轄権を有する司法裁判所によって、本契約のいずれかの条項が無効と判断された場合、当該条項は、本契約の残りの部分に影響を与えることなく本契約から削除されるものとします。本契約の残りの条項は、以後も引き続き有効かつ執行可能であるものとします。
-
-14.4 デベロッパーは、Google が親会社となっている各グループ企業が、本契約の第三受益者となること、および当該企業が、当該企業に利益（または受益権）を付与する本契約の条項を直接執行する、また当該条項に依拠する権利を有することを了承し、これに同意します。上記以外のいかなる人または法人も、本契約の第三受益者とはならないものとします。
-
-14.5 輸出規制。Preview は、米国輸出管理法令の対象です。デベロッパーは、Preview に適用されるすべての国内および国際の輸出管理法令に従わなければなりません。これらの法律には、仕向け地、ユーザー、および最終用途に関する制限が含まれます。
-
-14.6 デベロッパーは、Google から事前に書面で承認を得ずに、本契約を譲渡または移転することはできません。また、そのような承認を得ずに計画された譲渡はすべて無効になります。デベロッパーは、Google から事前に書面で承認を得ずに、本契約に基づく自身の責任または義務を他者に委任してはなりません。
-
-14.7 本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連するすべての申し立ては、米国カリフォルニア州の抵触法を除いて、カリフォルニア州法に準拠するものとします。デベロッパーおよび Google は、本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連する法的事項の解決について、米国カリフォルニア州サンタクララ郡に所在の連邦裁判所または州立裁判所が専属管轄権を有することに合意します。上記にかかわらず、デベロッパーは、Google が任意の司法管轄区において差し止め命令による救済（または同等の緊急法的救済）を求める申し立てを行うことが認められることに同意します。
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">上記の利用規約を読み、同意します。</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>このドキュメントの内容</h2>
- <ol>
- <li><a href="#device-preview">ハードウェア端末をセットアップする</a>
- <ol>
- <li><a href="#ota">OTA アップデートを取得する</a></li>
- <li><a href="#flash">手動で端末への書き込みを行う</a></li>
- <li><a href="#revertDevice">アンインストールする</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">エミュレータをセットアップする</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- 新しいプラットフォーム上でアプリを実行してテストするには、Android N のランタイム環境をセットアップする必要があります。
-これを行うには、以下のいずれかの方法を使用します。
-</p>
-
-<ul>
- <li>Android N をサポート対象のハードウェア端末にインストールする。</li>
- <li>Android N が動作する Android エミュレータをセットアップする。</li>
-</ul>
-
-<p>
- 既存の APK とハードウェア端末またはエミュレータがあれば、新しいプラットフォーム上でアプリの基本的な互換性テストを実施できます。
-
-基本的なテストのために開発環境全体をアップデートする必要はありません。
-
-</p>
-
-<p>
- アプリを Android N 向けに修正したり、Android N の API を使用したりする場合は、Android N 用にアップデートされた開発環境をセットアップする必要があります。詳細は <a href="{@docRoot}preview/setup-sdk.html">Android N 向けの開発準備</a>の説明をご覧ください。
-
-
-
-</p>
-
-
-<h2 id="device-preview">ハードウェア端末をセットアップする</h2>
-
-<p>
- N Developer Preview は、携帯端末やタブレット、テレビなど、アプリのテストに使用するさまざまなハードウェア端末のシステム アップデートに対応しています。
-
-</p>
-
-<p>
- 対象機種をお持ちの場合は、以下のいずれかの方法で Developer Preview マイルストーン ビルドにアップデートできます。
-
-</p>
-
-<ul>
- <li><a href="https://g.co/androidbeta">Android ベータ版プログラム</a>により<strong>自動 OTA アップデートを受信するために端末を登録する</strong>
-登録した端末は、N Developer Preview のマイルストーン ビルドごとに、定期的に無線（OTA）アップデートを受信できます。
-既存の環境から N Developer Preview のさまざまなリリースへシームレスに移行できるため、このベータ版プログラムに登録することをお勧めします。
-
-</li>
- <li><strong>Developer Preview のシステム イメージをダウンロードして、端末に書き込む</strong>
- 手動で書き込みをした端末には、OTA アップデートが自動で配信されません。ただし、端末を Android ベータ版プログラムに登録すれば、OTA アップデートを取得できるようになります。
- </li>
-</ul>
-
-<h3 id="ota">自動 OTA アップデートを受信するために端末を登録する</h3>
-
-<p>
- 対象機種（以下のダウンロードの表をご覧ください）をお持ちの場合は、<a href="https://g.co/androidbeta">Android ベータ版プログラム</a>に端末を登録すると、Android のプレビュー版への OTA アップデートを受信できます。
-
-正式なシステム アップデートと同様に、OTA アップデートのダウンロードや端末の更新は自動で行われます。
-
-
-</p>
-
-<p>
- 端末はいつでも登録解除できます。その端末で利用可能な Android の最新の実稼働向けバージョン（Android 6.0 Marshmallow など）への OTA アップデートが端末に配信されます。
-
-アップデート時はオールリセットされ、端末上のユーザーデータは削除されます。
-端末の登録解除前には、<strong>重要なデータをバックアップ</strong>しておいてください。
-
-</p>
-
-<p>
- 詳細情報や端末の登録方法については、<a href="https://g.co/androidbeta">Android ベータ版プログラム</a>のウェブサイトをご覧ください。
-
-</p>
-
-<p class="note"><strong>注:</strong>
- 登録を解除すると端末はオールリセットされるので、重要なデータはあらかじめバックアップしておいてください。
-
-</p>
-
-<h3 id="flash">手動で端末への書き込みを行う</h3>
-
-<p>
- 最新の Developer Preview のシステム イメージはいつでもダウンロードして、手動で端末に書き込むことができます。
-テスト端末用のシステム イメージは、以下の表からダウンロード可能です。
-テスト環境を詳細に管理したり、自動テストなどで頻繁に再インストールが必要な場合は、このように手動で端末に書き込みをする方法が便利です。
-
-
-</p>
-
-<!-- You can flash by ota or system image --><p>
- 端末にシステム イメージをインストールすると、<strong>端末からすべてのデータが削除</strong>されるため、あらかじめデータをバックアップしておいてください。
-
-</p>
-
-<p>
- 端末上のデータをバックアップして、ご自身の端末用のシステム イメージを以下からダウンロードした後、<a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a> の手順に従って端末にイメージを書き込みます。
-
-
-</p>
-
-<p>
- 手動でシステム イメージを書き込んだ端末には、以降の Developer Preview マイルストーン ビルドへの <strong>OTA アップデートが自動配信されません</strong>。
-
-そのため Developer Preview マイルストーンごとに環境を最新にして、新しいシステム イメージを書き込む必要があります。
-
-</p>
-
-<p>
- 手動で端末に書き込みを行った後でも、<a href="https://g.co/androidbeta">Android ベータ版プログラム</a>に端末を登録すれば OTA アップデートを受信できるようになります。
-
-次のプレビュー版への OTA アップデートを受信したい方は、いつでも端末登録が可能です。
-
-</p>
-
-<table>
- <tr>
- <th scope="col">端末</th>
- <th scope="col">ダウンロード / チェックサム</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npd35k-factory-5ba40535.tgz</a><br>
- MD5: b6c5d79a21815ee21db41822dcf61e9f<br>
- SHA-1:5ba4053577007d15c96472206e3a79bc80ab194c
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npd35k-factory-a33bf20c.tgz</a><br>
- MD5: e1cf9c57cfb11bebe7f1f5bfbf05d7ab<br>
- SHA-1: a33bf20c719206bcf08d1edd8da6c0ff9d50f69c
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npd35k-factory-81c341d5.tgz</a><br>
- MD5: e93de7949433339856124c3729c15ebb<br>
- SHA-1:81c341d57ef2cd139569b055d5d59e9e592a7abd
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npd35k-factory-2b50e19d.tgz</a><br>
- MD5:565be87ebb2d5937e2abe1a42645864b<br>
- SHA-1:2b50e19dae2667b27f911e3c61ed64860caf43e1
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npd35k-factory-2e89ebe6.tgz</a><br>
- MD5: a8464e15c6683fe2afa378a63e205fda<br>
- SHA-1:2e89ebe67a46b2f3beb050746c13341cd11fa678
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npd35k-factory-1de74874.tgz</a><br>
- MD5: c0dbb7db671f61b2785da5001cedefcb<br>
- SHA-1:1de74874f8d83e14d642f13b5a2130fc2aa55873
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npd35k-factory-b4eed85d.tgz</a><br>
- MD5: bdcb6f770e753668b5fadff2a6678e0d<br>
- SHA-1: b4eed85de0d42c200348a8629084f78e24f72ac2
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G（Android One） <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npd35k-factory-5ab1212b.tgz</a><br>
- MD5:7d34a9774fdd6e025d485ce6cfc23c4c<br>
- SHA-1:5ab1212bc9417269d391aacf1e672fff24b4ecc5
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> （D6603 および D6653）</td>
- <td>ダウンロード:<a class="external-link" href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- 詳細については、<a class="external-link" href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">Xperia Z3 に Android N Developer Preview を試す</a>を参照してください。
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">プレビュー版を端末からアンインストールする</h3>
-
-<p>
- 以下のいずれかの方法で、プレビュー版を端末からアンインストールできます。
- </p>
- <ul>
- <li><strong>工場出荷時仕様のシステム イメージを取得</strong>して、手動で端末に書き込みます。
-
- <ul>
- <li><strong>Nexus 端末と Pixel C 端末</strong>については、Nexus 端末の<a href="http://developers.google.com/android/nexus/images">ファクトリー イメージ</a>のページを参照してダウンロードしてください。
-
- </li>
- <li><strong>他の端末</strong>については、端末メーカーに直接お問い合わせください。
-その他の端末については、直接端末メーカーにお問い合わせください。Android ベータ版プログラムの対象機種については、端末をプログラムに登録した後、登録を解除することができます（詳細は以下をご覧ください）。
-
-</li>
- </ul>
- </li>
- <li><strong>Android ベータ版プログラムから端末を登録解除します。</strong>Android ベータ版プログラムへの端末の登録を解除します。<a href="https://g.co/androidbeta">Android ベータ版プログラム</a>に登録中の端末は、その種類のよらず、簡単に登録を解除することができます。
-
-
- <p>
- その端末で利用可能な Android の最新の実稼働向けバージョン（Android 6.0 Marshmallow など）への OTA アップデートが端末に配信されます。
-
- アップデート時はオールリセットされ、端末上のユーザーデータは削除されます。
-端末の登録解除前には、<strong>重要なデータをバックアップ</strong>しておいてください。
-
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>注:</strong>
- プログラムの終了前に Developer Preview のシステム イメージをアンインストールすると、端末はオールリセットされ、すべてのユーザーデータが削除されます。
-
-
-</p>
-
-
-<h2 id="setupAVD">エミュレータをセットアップする</h2>
-
-<p>Android エミュレータで Android N Preview を実行するには、Android N Preview SDK をダウンロードして、エミュレータ用の仮想端末を準備する必要があります。
-
-</p>
-
-<p>まずは以下の手順で Android N Preview SDK をダウンロードします（既に <a href="{@docRoot}preview/setup-sdk.html">Android N 向けの開発準備</a>でダウンロード済みの場合は、この手順は飛ばしてください）。
-
-
-
-<ol>
- <li>Android Studio で設定ダイアログを開きます（Windows、Linux では <strong>[File] > [Settings]</strong>、Mac では <strong>[Android Studio] > [Preferences]</strong>）。
-
-左側のパネルで、<strong>[Appearance & Behavior] > [System Settings] > [Android SDK]</strong> を選択します。
-
-
-
- <li>[<strong>SDK Platforms</strong>] タブをクリックして、[<strong>Android N Preview</strong>] チェック ボックスを選択します。
-</li>
-
- <li>[<strong>SDK Tools</strong>] タブをクリックして、[<strong>Android SDK Build Tools</strong>]、[<strong>Android SDK Platform-Tools</strong>]、[<strong>Android SDK Tools</strong>] のチェック ボックスをオンにします。
-
-
-
- </li>
-
- <li>[<strong>OK</strong>] をクリックして、インストールするパッケージの使用許諾に同意します。
-
- </li>
-</ol>
-
-<p>これで <strong>Android SDK Built-Tools 24.0 0 rc1</strong>、<strong>Platform-Tools 24.0.0 rc1</strong>、<strong>SDK Tools 25.0.9</strong> がインストールされます。SDK Tools を 25.0.9 にアップデートしないと、Android N の x86_64 システム イメージは動作しません。
-
-
-</p>
-
-
-<p>次に Android N のシステム イメージを使用して仮想端末を作成します。</p>
-
-<ol>
- <li><strong>[Tools] > [Android] > [AVD Manager]</strong> を選択して、AVD Manager を起動します。
-</li>
- <li>[<strong>Create Virtual Device</strong>] をクリックします。</li>
- <li>Nexus 5X、Nexus 6P、Nexus 9、Android TV などの端末を選択して、[<strong>Next</strong>] をクリックします。
-</li>
- <li><strong>N</strong> システム イメージ（<strong>x86</strong> ABI）を選択して [<strong>Next</strong>] をクリックします
-
- （現時点で Android N Preview の Android エミュレータに対応しているのは x86 システム イメージだけです）。
-
- <li>残りの AVD 設定を終えたら [<strong>Finish</strong>] をクリックします。
-</li>
-</ol>
-
-<p>これで Android N Preview AVD で Android エミュレータを起動できます。</p>
-
-<p>
-<a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0 Beta</a> に対応した Android Studio 2.1 のプレビュー版をインストールすると、Android Studio 1.5 よりもパフォーマンスが格段に向上し、Android エミュレータをより快適にお使いいただけます。
-
-
-</p>
-
-<p>仮想端末の作成については、<a href="{@docRoot}tools/devices/index.html">仮想端末を管理する</a>で詳細をご覧ください。
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/ja/preview/features/afw.jd b/docs/html-intl/intl/ja/preview/features/afw.jd
deleted file mode 100644
index 8e73298..0000000
--- a/docs/html-intl/intl/ja/preview/features/afw.jd
+++ /dev/null
@@ -1,552 +0,0 @@
-page.title=Android for Work のアップデート
-page.metaDescription=Android N の新しい Android for Work の API と機能。
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>このドキュメントの内容</h2>
- <ol>
- <li><a href="#qr">QR コードのプロビジョニング</a>
-</li>
-
- <li><a href="#sec-challenge">仕事用プロファイルによるセキュリティ確認</a>
-</li>
-
- <li><a href="#suspend">アプリへのアクセスを無効にする</a>
-</li>
-
- <li><a href="#toggle-work">ワークモードの切り替え</a>
-</li>
-
- <li><a href="#always-on-vpn">Always On VPN</a>
-</li>
-
- <li><a href="#contacts">仕事用プロファイルと連絡先の統合</a>
-</li>
-
- <li><a href="#remote-reboot">リモートでの再起動</a>
-</li>
-
- <li><a href="#disable-roaming">データローミングを無効にする</a>
-</li>
-
- <li><a href="#process-logging">企業によるプロセスのログ記録</a>
-</li>
-
- <li><a href="#bug-reports">リモートでのバグレポート</a>
-</li>
-
- <li><a href="#remove-cert">クライアント証明書を削除する</a>
-</li>
-
- <li><a href="#grant-cert-on-install">インストール時にクライアント証明書へのアクセス権を付与する</a>
-</li>
-
- <li><a href="#ui-policy">システムの UI ポリシーの透明性</a>
-</li>
-
- <li><a href="#restrictions-mgmt">アプリ制限の管理の強化</a>
-</li>
-
- <li><a href="#location-off">位置情報のオフへの切り替え</a>
-</li>
-
- <li><a href="#custom-provisioning">カスタマイズされたプロビジョニング</a>
-</li>
-
- <li><a href="#multi-wifi-ca">複数の Wi-Fi 用の CA 証明書
-</a></li>
-
- <li><a href="#custom-lock">カスタマイズされたロック画面のメッセージ</a>
-</li>
-
- <li><a href="#work-connectionservice">仕事用プロファイルの ConnectionService</a>
-</li>
-
- <li><a href="#lock-wp">壁紙をロックダウンする</a>
-</li>
-
- <li><a href="#lock-user-icon">ユーザー アイコンをロックダウンする</a>
-</li>
-
- <li><a href="#health-monitoring">端末の状態の監視</a>
-</li>
-
- </ol>
-
- <h2>関連ドキュメント</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>
-</li>
- </ul>
- </div>
-</div>
-
-<p>このドキュメントでは、Android N で提供されている新しい Android for Work の機能について説明します。
-</p>
-
-<h2 id="qr">QR コードのプロビジョニング</h2>
-
-<p>
- Android for Work では、企業が責任を負う端末のプロビジョニングに QR コードを使用できるようになりました。
-セットアップ ウィザードを使用すると、QR コードをスキャンして端末をプロビジョニングできます。
-
-</p>
-
-<h2 id="sec-challenge">仕事用プロファイルによるセキュリティ確認</h2>
-
-<p>
- プロファイル オーナーは、仕事用プロファイルで実行しているアプリに対してセキュリティ確認を指定するようユーザーに要求できます。
-ユーザーが仕事用アプリを開こうとすると、セキュリティ確認画面が表示されます。
-ユーザーがセキュリティの確認に成功すると、仕事用プロファイルのロックが解除され、必要に応じて暗号化も解除されます。
-
-
-</p>
-
-<p>
- プロファイル オーナーが {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD} インテントを送信すると、ユーザーはセキュリティ確認をセットアップするよう求められます。
-また、プロファイル オーナーは、<code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> インテントを送信して、ユーザーに端末のロックを設定するよう求めることもできます。
-
-
-</p>
-
-<p>
- プロファイル オーナーは仕事用プロファイル用のセキュリティ確認に、他の端末のパスワード ポリシーとは異なるパスワード ポリシーを設定できます。
-たとえば、端末の確認応答の最小長は、他のパスワードに必要な長さと異なっていてもかまいません。
-
-プロファイル オーナーがこの確認のポリシーを設定する場合は、通常 {@link
- android.app.admin.DevicePolicyManager#setPasswordQuality
- setPasswordQuality()} や {@link
- android.app.admin.DevicePolicyManager#setPasswordMinimumLength
- setPasswordMinimumLength()} など、{@link android.app.admin.DevicePolicyManager} メソッドを使用して設定します。
-
-また、新しい <code>DevicePolicyManager.getParentProfileInstance()</code> メソッドが返す {@link android.app.admin.DevicePolicyManager} インスタンスを使用して端末のロックを設定することもできます。
-
-
-さらに、{@link android.app.admin.DevicePolicyManager} クラスの新しい <code>setOrganizationColor()</code> メソッドおよび <code>setOrganizationName()</code> メソッドを使用して仕事用プロファイル用のセキュリティ確認画面をカスタマイズすることができます。
-
-
-
-</p>
-
-<p>
- 新しいメソッドと定数の詳細については、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>の<code>DevicePolicyManager</code> リファレンス ページをご覧ください。
-
-</p>
-
-<h2 id="suspend">アプリへのアクセスを無効にする</h2>
-
-<p>
- デバイス オーナーとプロファイル オーナーは、新しい <code>DevicePolicyManager.setPackagesSuspended()</code> メソッドを呼び出して、パッケージへのアクセスを一時的に停止することができます。
-
-オーナーがパッケージを再度有効にする場合は、同じメソッドを使用できます。
-</p>
-
-<p>
- パッケージが停止されている場合は、アクティビティを開始できないため、パッケージへの通知は行われず、<a href="{@docRoot}guide/components/recents.html">オーバービュー画面</a>のアプリのエントリは非表示になります。
-
- 停止されているパッケージは<a href="{@docRoot}guide/components/recents.html">オーバービュー画面</a>に表示されず、ダイアログ（トーストや Snackbar を含む）を表示することはできません。
-また、音声を再生したり、端末を振動させたりすることもできません。
-
-</p>
-
-<p>
- ランチャーは、アプリが現在利用できないことを示すために、アプリのアイコンをグレーでレンダリングするなど、停止されているアプリにひと目でわかる UI を適用する必要があります。
-
-ランチャーは、新しい <code>DevicePolicyManager.getPackageSuspended()</code> メソッドを呼び出してアプリが停止されているかどうかを確認できます。
-
-</p>
-
-<h2 id="toggle-work">ワークモードの切り替え</h2>
-
-<p>
- デュアル プロファイル端末では、ユーザーはワークモードのオンとオフを切り替えることができます。ワークモードがオフの場合は、管理されているプロファイルが一時的にシャットダウンされます。
-仕事用プロファイルのアプリ、バックグラウンドでの同期、通知がすべて無効になります。これにはプロファイル オーナーのアプリも含まれます。
-
-また、仕事用プロファイルが無効にされている場合は、仕事用アプリを起動できないことをユーザーに示すステータス アイコンが表示されたままになります。
-
-システム ランチャーは、仕事用アプリとウィジェットにアクセスできないことを示します。
-
-</p>
-
-<h2 id="always-on-vpn">Always On VPN</h2>
-
-<p>
- デバイス オーナーとプロファイル オーナーは、指定した VPN を介して仕事用アプリが常時ネットワークに接続することを要求できます。
-オーナーがこの要件を設定すると、端末は起動時に対象の VPN を自動的に開始します。
-
-</p>
-
-<p>
- オーナーは、新しい <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code> メソッドを呼び出して VPN を使用することを要求できます。
-オーナーが VPN 要件を設定しているかどうかを確認するには、新しい <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code> メソッドを呼び出します。
-
-
-</p>
-
-<p>
- システムがアプリの介入なしに VPN サービスを直接バインドできるため、常時接続 VPN の新しいエントリ ポイントは VPN クライアント側で処理する必要があります。
-以前と同様に、アクティブなサービスを見つけるには、アクション {@link android.net.VpnService android.net.VpnService} に一致するインテント フィルタを使用します。
-
-
-</p>
-
-<p>
- ユーザーは {@link
- android.net.VpnService} を実装する常時接続 VPN クライアントを、<strong>[Settings] > [More] > [VPN]</strong> 画面を使用して手動で設定できます。
-
-</p>
-
-<h2 id="contacts">仕事用プロファイルと連絡先の統合</h2>
-
-<p>
- プロファイル オーナーは、プライマリ ユーザーの仕事用連絡先のローカル検索やディレクトリ検索を許可することができます。
-たとえば、ユーザーは個人用電話アプリや連絡先アプリから個人用と仕事用の両方のディレクトリの連絡先にアクセスできます（プロファイル管理者によって許可されている場合）。
-
-
-</p>
-
-<p>
- 連絡先プロバイダを活用するデベロッパーは、ポリシーで許可されている場合、Enterprise Contacts API を使用してプライマリ ユーザーの仕事用プロファイルのディレクトリのエントリにアクセスできます。
-
-
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- プロファイル オーナーは、以下の新しいメソッドを使用して、プライマリ ユーザーの仕事用連絡先の表示を制御できます。
-
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">リモートでの再起動</h2>
-
-<p>
- デバイス オーナーは、端末をリモートで再起動できます。エンクロージャ内のパブリックな場所にデプロイされている端末は、電源ボタンにアクセスできないようにすることができる場合があります。
-端末を再起動する必要がある場合、管理者は新しい <code>DevicePolicyManager.reboot()</code> メソッドを使用して実行することができます。
-
-
-</p>
-
-<h2 id="disable-roaming">データローミングを無効にする</h2>
-
-<p>
- デバイス オーナーがデータローミングを無効にするには、新しい {@link
- android.os.UserManager} のユーザー制限 <code>DISALLOW_DATA_ROAMING</code> を使用します。
-</p>
-
-<h2 id="process-logging">企業によるプロセスのログ記録</h2>
-
-<p>
- デバイス オーナーは、リモートで端末のアクティビティ（アプリの起動、adb アクティビティ、画面のロック解除など）を追跡することにより、疑わしいアクティビティを特定できます。
-プロセス ログはユーザーの同意は必要ありません。
-ログを取得するには、デバイス オーナーは <code>DevicePolicyManager.setSecurityLoggingEnabled()</code> を使用して端末のログ記録を有効にします。
-
-</p>
-
-<p>
- API の変更点は以下のとおりです。
-</p>
-
-<ul>
-
- <li>
- 新しいクラス <code>android.app.admin.SecurityLog</code> とそのメソッド
-
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">リモートでのバグレポート</h2>
-
-<p>
- デバイス オーナーは、端末の状態のダンプファイルを含むバグレポートをリモートでトリガーして取得できます。これにより、既知のインシデントや障害が発生した端末の徹底的な調査が可能になります。
-
-バグレポートの内容は詳細にわたるため、ユーザーの同意が必要になります。
-
-</p>
-
-<p>
- Android N では、この機能をサポートするために以下の API が追加されています。詳細については、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>をご覧ください。
-
-
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">クライアント証明書を削除する</h2>
-
-<p>
- プロファイル オーナーとデバイス オーナーは、{@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()} によってインストールされたクライアント証明書を、新しい <code>DevicePolicyManager.removeKeyPair()</code> メソッドを呼び出して削除できるようになりました。
-
-
-</p>
-
-<h2 id="grant-cert-on-install">インストール時にクライアント証明書へのアクセス権を付与する
-</h2>
-
-<p>
- プロファイル オーナーやデバイス オーナーが、サードパーティ アプリに証明書を管理する権限を付与する場合、アプリはオーナーの介入なしに、インストールされる証明書へのアクセス権をアプリ自体に付与できます。
-
-
-</p>
-
-<p>
- 証明書を管理するための既存の API は、以下を含むように拡張されています。
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">システムの UI ポリシーの透明性</h2>
-
-<p>
- ユーザー エクスペリエンスに影響を及ぼしたり、ユーザー設定を制限したりするポリシーはユーザーに完全に公表されます。プロファイル オーナーとデバイス オーナーは、このポリシーと会社の IT 部門を関連付けることができます。
-
-IT 管理者は [Settings] の「Action not allowed」という通常のメッセージに加え、端末設定に組織固有のサポート メッセージを設定できます。これには以下の新しい {@link android.app.admin.DevicePolicyManager} メソッドを使用します。
-
-
-
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="restrictions-mgmt">アプリ制限の管理の強化</h2>
-
-<p>
- デバイス オーナーやプロファイル オーナーは、別のアプリケーションでアプリ制限を管理できるようにすることができます。これには新しい <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code> メソッドを使用します。
-
-
-指定されたアプリケーションは、このパーミッションが付与されているかどうかを、<code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code> を呼び出して確認できます。
-
-
-</p>
-
-<p>
- アプリ制限を管理するように指定されたアプリケーションは、対象となるユーザーやプロファイル内のパッケージに対して {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
- setApplicationRestrictions()} と {@link
- android.app.admin.DevicePolicyManager#getApplicationRestrictions
- getApplicationRestrictions()} を呼び出すことができます。
-</p>
-
-<h2 id="location-off">位置情報のオフへの切り替え</h2>
-
-<p>
- 個人用アプリの位置情報に継続的にアクセスしている場合、ユーザーは仕事用アプリの位置パーミッションを無効にできます。
-[Location Settings] で別の位置情報へのアクセスに切り替えると、ユーザーは位置情報の更新や、仕事用プロファイルで実行されているアプリの最新位置情報の問い合わせを拒否できます。
-
-
-</p>
-
-<p>
- トップレベルの位置情報をオフに切り替えると、プライマリ プロファイルと管理されているプロファイルの両方の位置情報へのアクセスが無効になります。
-
-</p>
-
-<h2 id="custom-provisioning">カスタマイズされたプロビジョニング</h2>
-
-<p>
- アプリでは、コーポレート・カラーやロゴを含むプロファイル オーナーとデバイス オーナーのプロビジョニング フローをカスタマイズできます。
-
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- フローカラーをカスタマイズします。
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- コーポレート ロゴを含むフローをカスタマイズします。
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">複数の Wi-Fi 用の CA 証明書</h2>
-
-<p>
- プロファイル オーナーとデバイス オーナーは、特定の Wi-Fi 設定に複数の CA 証明書を設定できます。
-企業の Wi-Fi ネットワークで、同じ SSID を持つ別のアクセス ポイントに別の CA を使用する場合、IT 管理者は新しい <code>setCaCertificates()</code> メソッドを使用して、関連するすべての CA を Wi-Fi 設定に含めることができます。
-
-
-
-</p>
-
-<p>
- 以下の API が追加されました。
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">カスタマイズされたロック画面のメッセージ</h2>
-
-<p>
- デバイス オーナーは、ロック画面に表示されるオーナー情報を提供できます。
- この情報は、ユーザーのロック画面のメッセージよりも優先されます（設定されている場合）。
-新しい {@link android.app.admin.DevicePolicyManager} メソッドは以下のとおりです。
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">仕事用プロファイルの ConnectionService</h2>
-
-<p>
- プロファイル オーナーは、バックエンドの呼び出し（アカウントの呼び出し）に仕事固有の {@link android.telecom.ConnectionService} を使用する仕事用電話アプリを指定できます。
-
-仕事用電話は、仕事のみの通話履歴を保持し、仕事用連絡先のみを利用します。
-電話アプリに関係なく、ユーザーには統一された着信 UI が表示されます。
-仕事用通話アカウントへの仕事用の着信は、個人用通話アカウントへの個人用の着信とは区別されます。
-
-
-</p>
-
-<p>
- 通話が仕事用の通話かどうかを確認するには、電話は新しいフラグ <code>android.telecom.Call.PROPERTY_WORK_CALL</code> を確認する必要があります。
-
-通話が仕事用の通話の場合、電話はワーク バッジを追加するなどして、これを示す必要があります。
-
-</p>
-
-<h2 id="lock-wp">壁紙をロックダウンする</h2>
-
-<p>
- 新しいユーザー制限（<code>DISALLOW_SET_WALLPAPER</code>）により、ユーザーは壁紙を変更することができません。
-デバイス オーナーやプロファイル オーナーは壁紙を変更できますが、制御するユーザーやプロファイルの壁紙のみ変更できます。
-
-たとえば、プロファイル オーナーは、親ユーザーの壁紙は変更できませんが、プライマリ プロファイルのプロファイル オーナーやデバイス オーナーは変更できます。
-
-壁紙を変更する必要があるプロファイル オーナーやデバイス オーナーは、管理するユーザーやプロファイルに壁紙があるかどうか（{@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}）、壁紙の変更が許可されているかどうかを（新しい <code>WallpaperManager.isWallpaperSettingAllowed()</code> メソッドを使用して）確認する必要があります。
-
-
-
-</p>
-
-<h2 id="lock-user-icon">ユーザー アイコンをロックダウンする</h2>
-
-<p>
- 新しいユーザー制限（<code>DISALLOW_SET_USER_ICON</code>）により、ユーザーはユーザー アイコンを変更することができません。
-ユーザーのデバイス オーナーやプロファイル オーナーは、このアイコンを変更できます。
-ただし、プロファイル オーナーが変更できるのは、制御するプロファイルのユーザー アイコンのみです。
-
-</p>
-
-<h2 id="health-monitoring">端末の状態の監視</h2>
-
-<p>
- デバイス オーナーやプロファイル オーナーは、新しい <code>HardwarePropertiesManager</code> インターフェースを使用して、CPU や GPU の温度、CPU 使用率などの端末の状態に関する情報を取得できます。
-
-新しい監視インターフェースは、遠隔地で実行されている使用されていない端末の監視に特に役立ちます。
-
-
-</p>
diff --git a/docs/html-intl/intl/ja/preview/features/background-optimization.jd b/docs/html-intl/intl/ja/preview/features/background-optimization.jd
index 1ea9f2e..04921c7 100644
--- a/docs/html-intl/intl/ja/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/ja/preview/features/background-optimization.jd
@@ -248,7 +248,7 @@
setPeriodic()} または {@link android.app.job.JobInfo.Builder#setPersisted
setPersisted()} と組み合わせて使うことはできません。
コンテンツの変更を継続的に監視するには、アプリの {@link
- android.app.job.JobService} が最新のコールバックの処理を完了する前に、新しい
+ android.app.job.JobService} が最新のコールバックの処理を完了する前に、新しい
{@link android.app.job.JobInfo} をスケジュールします。
</p>
diff --git a/docs/html-intl/intl/ja/preview/features/data-saver.jd b/docs/html-intl/intl/ja/preview/features/data-saver.jd
deleted file mode 100644
index 6336151..0000000
--- a/docs/html-intl/intl/ja/preview/features/data-saver.jd
+++ /dev/null
@@ -1,234 +0,0 @@
-page.title=データセーバー
-metaDescription= ユーザーが有効にしたデータ使用量の最適化。
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- このドキュメントの内容
- </h2>
-
- <ol>
- <li>
- <a href="#status">データセーバー設定の確認</a>
- <ol>
- <li>
- <a href="#request-whitelist">ホワイトリスト パーミッションの要求</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">データセーバー設定の変更の監視</a>
-
- </li>
-
- <li>
- <a href="#testing">Android Debug Bridge コマンドを使用したテスト</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- スマートフォンのライフサイクル全体では、モバイルデータ通信プランのコストが端末自体のコストを簡単に上回ります。
-N Developer Preview では、ローミング、課金サイクルの終了近く、または短期間のデータパックであるかどうかに関係なく、データの使用を抑えるために端末全体でデータセーバーを有効にできます。
-
-
-</p>
-
-<p>
- ユーザーが [<strong>Settings</strong>] でデータセーバーを有効にし、端末が従量制課金ネットワークに接続されている場合、システムはバックグラウンドでのデータ使用をブロックし、フォアグラウンドでのデータ使用をなるべく抑えるようにアプリに指示します。
-
-ユーザーは特定のアプリをホワイトリストに登録することにより、データセーバーがオンになっているときでも、バックグラウンドで従量制課金接続を使用できます。
-
-
-</p>
-
-<p>
- N Developer Preview は {@link android.net.ConnectivityManager} API を拡張することで、<a href="#status">ユーザーのデータセーバー設定を取得</a>する方法と、<a href="#monitor-changes">設定の変更を監視</a>する方法を提供しています。
-
-
-アプリでユーザーがデータセーバーを有効にしているかどうかを確認し、フォアグラウンドおよびバックグラウンドでのデータ使用を抑えるようにすることをお勧めします。
-
-
-</p>
-
-<h2 id="status">
- データセーバー設定の確認
-</h2>
-
-<p>
- N Developer Preview では、アプリは {@link
- android.net.ConnectivityManager} API を使用して、どのようなデータ使用量の制限が適用されているかを確認できます。
-{@code getRestrictBackgroundStatus()} メソッドは以下のいずれかの値を返します。
-
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- データセーバーは無効になっています。
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- ユーザーはこのアプリのデータセーバーを有効にしています。アプリはフォアグラウンドでのデータ使用を抑えるようにし、バックグラウンドでのデータ使用に対する制限を適切に処理する必要があります。
-
-
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- ユーザーはデータセーバーを有効にしていますが、アプリがホワイトリストに登録されています。アプリは、フォアグラウンドおよびバックグラウンドでのデータ使用を引き続き抑えるようにする必要があります。
-
- </dd>
-</dl>
-
-<p>
- データセーバーが無効になっている場合や、アプリがホワイトリストに登録されている場合でも、端末が従量制課金ネットワークに接続されている場合は、データ使用量を抑えることをお勧めします。
-
-以下のサンプルコードでは、アプリで使用する必要があるデータ量を確認するために、{@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} と {@code
- ConnectivityManager.getRestrictBackgroundStatus()} を使用しています。
-
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- ホワイトリスト パーミッションの要求
-</h3>
-
-<p>
- アプリがバックグラウンドでデータを使用する必要がある場合は、アプリのパッケージ名（例: <code>package:MY_APP_ID</code>）の URI を含む <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code> インテントを送信することでホワイトリスト パーミッションをリクエストできます。
-
-
-
-
-</p>
-
-<p>
- インテントと URI を送信すると、[<strong>Settings</strong>] アプリが起動し、アプリのデータ使用量の設定が表示されます。
-ユーザーはアプリのバックグラウンドデータを有効にするかどうかを決めることができます。
-このインテントを送信する前に、バックグラウンドでのデータ使用を有効にするために [<strong>Settings</strong>] アプリを起動するかどうかを最初にユーザーに尋ねることをお勧めします。
-
-
-
-</p>
-
-<h2 id="monitor-changes">
- データセーバー設定の変更の監視
-</h2>
-
-<p>
- アプリでデータセーバー設定の変更を監視するには、{@link
- android.content.BroadcastReceiver} を作成して {@code
- ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} をリッスンし、レシーバーを動的に {@link android.content.Context#registerReceiver
- Context.registerReceiver()} に登録します。
-このブロードキャストを受信したアプリは、{@code
- ConnectivityManager.getRestrictBackgroundStatus()} を呼び出して、<a href="#status">新しいデータセーバー設定がそのパーミッションに影響を及ぼすかどうか</a>を確認する必要があります。
-
-
-</p>
-
-<p class="note">
- <strong>注:</strong>このブロードキャストは、{@link
- android.content.Context#registerReceiver Context.registerReceiver()} を使用してブロードキャストに動的に登録するアプリにのみ送信されます。
-マニフェストにこのブロードキャストを受信するために登録するアプリはこれらを受信しません。
-
-
-</p>
-
-<h2 id="testing">
- Android Debug Bridge コマンドを使用したテスト
-</h2>
-
-<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge（ADB）</a>には、ネットワーク パーミッションの確認と設定に使用できるコマンドがいくつか用意されています。
-
-
-
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- 現在のバックグラウンド ネットワーク全体の制限設定、ホワイトリスト内の現在のパッケージ UID、その他の既知のパッケージのネットワーク パーミッションを含むレポートが生成されます。
-
-
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- ネットワーク ポリシー マネージャ（netpolicy）のコマンドの一覧が表示されます。
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- <code>true</code> または <code>false</code> をそれぞれ渡したときに、データセーバー モードを有効または無効にします。
-
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- 指定されたパッケージ UID をホワイトリストに追加し、バックグラウンドで従量制課金接続を使用できるようにします。
-
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- 指定されたパッケージ UID をホワイトリストから削除し、データセーバーが有効な場合でもバックグラウンドで従量制課金接続を使用できないようにします。
-
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/preview/features/direct-boot.jd b/docs/html-intl/intl/ja/preview/features/direct-boot.jd
deleted file mode 100644
index 6ba1852..0000000
--- a/docs/html-intl/intl/ja/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=ダイレクト ブート
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>このドキュメントの内容</h2>
- <ol>
- <li><a href="#run">ダイレクト ブート中に実行するためのアクセスを要求する</a></li>
- <li><a href="#access">端末暗号化ストレージにアクセスする</a></li>
- <li><a href="#notification">ユーザーによる端末のロック解除の通知を受信する</a></li>
- <li><a href="#migrating">既存のデータを移行する</a></li>
- <li><a href="#testing">暗号化対応アプリをテストする</a></li>
- </ol>
-</div>
-</div>
-
-<p>Android N は、電源を入れたときにユーザーが端末のロックを解除していない場合、セキュリティで保護された <i>ダイレクト ブート</i> モードで実行します。
-
-この機能をサポートするため、システムで次の 2 つの保存先を使用できるようになります。</p>
-
-<ul>
-<li><i>認証情報暗号化ストレージ。</i>これはデフォルトの保存先で、ユーザーが端末のロックを解除した後にだけ使用できます。
-</li>
-<li><i>端末暗号化ストレージ。</i>この保存先は、ダイレクト ブート モード中とユーザーが端末のロックを解除した後の両方で使用できます。
-</li>
-</ul>
-
-<p>デフォルトで、ダイレクト ブート モード中はアプリは実行されません。ダイレクト ブート モード中にアプリで操作を実行する必要がある場合、このモードで実行するアプリ コンポーネントを登録できます。
-
-ダイレクト ブート モードでアプリの実行が必要になる一般的な使用例は次のとおりです。
-</p>
-
-<ul>
-<li>アラーム クロック アプリなど、通知がスケジュールされているアプリ。
-</li>
-<li>SMS アプリなど、重要なユーザー通知を表示するアプリ。</li>
-<li>Talkback など、ユーザー補助機能サービスを提供するアプリ。</li>
-</ul>
-
-<p>ダイレクト ブート モードで実行中にアプリがデータにアクセスする必要がある場合は、端末暗号化ストレージを使用します。
-端末暗号化ストレージにはキーで暗号化されたデータが保存され、端末がセキュアブートに成功した場合にのみこのデータを使用できます。
-
-</p>
-
-<p>ユーザーの認証情報に関連付けたキーで暗号化しなければならない PIN やパスワードなどのデータには、認証情報暗号化ストレージを使用します。認証情報暗号化ストレージは、ユーザーが端末のロック解除に成功した後に使用可能になり、ユーザーが端末を再起動するまでアクセスできます。
-
-
-ユーザーが端末をロック解除した後にロック画面を有効にしても、認証情報暗号化ストレージはロックされません。
-
-</p>
-
-<h2 id="run">ダイレクト ブート中に実行するためのアクセスを要求する</h2>
-
-<p>ダイレクト ブート モード中にアプリを実行したり、端末暗号化ストレージにアクセスしたりするには、アプリ コンポーネントの登録が必要です。
-
-アプリをシステムに登録するには、コンポーネントが
-<i>暗号化対応するように指定します。</i>コンポーネントが暗号化対応するよう指定するには、マニフェスト内で
-<code>android:directBootAware</code> 属性を true に設定します。<p>
-
-<p>暗号化対応コンポーネントを登録しておくと、端末を再起動したときにシステムから
-<code>LOCKED_BOOT_COMPLETED</code> ブロードキャスト メッセージを受信できます。
-この時点で端末暗号化ストレージが使用できるようになり、ダイレクト ブート モード中にコンポーネントが実行しなければならないタスクを実行できます。たとえば、スケジュールしたアラームのトリガーなどが該当します。
-
-</p>
-
-<p>次のコード スニペットは、アプリのマニフェスト内で
-{@link android.content.BroadcastReceiver} を暗号化対応として登録し、<code>LOCKED_BOOT_COMPLETED</code> のインテント フィルタを追加する方法の例を示しています。
-</p>
-
-<pre>
-<receiver
- android:directBootAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>ユーザーが端末のロックを解除すると、すべてのコンポーネントは端末暗号化ストレージと認証情報暗号化ストレージの両方にアクセスできます。
-</p>
-
-<h2 id="access">端末暗号化ストレージにアクセスする</h2>
-
-<p>端末暗号化ストレージにアクセスするには、
-<code>Context.createDeviceProtectedStorageContext()</code> を呼び出して追加の
-{@link android.content.Context} インスタンスを作成します。このコンテキストで実行されたストレージ API 呼び出しはすべて、端末暗号化ストレージにアクセスします。
-次の例では、端末暗号化ストレージにアクセスして既存のアプリのデータ ファイルを開きます。
-
-</p>
-
-<pre>
-Context directBootContext = appContext.createDeviceProtectedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>端末暗号化ストレージは、ダイレクト ブート モード中にアクセスが必要な情報のみに使用してください。汎用的な暗号化された保存先として、端末暗号化ストレージを使用することはできません。ユーザーの個人情報や、ダイレクト ブート モード中に特に必要ではない暗号化されたデータには、認証情報暗号化ストレージを使用してください。
-
-
-
-</p>
-
-<h2 id="notification">ユーザーによる端末のロック解除の通知を受信する</h2>
-
-<p>再起動後にユーザーが端末のロックを解除すると、アプリは認証情報暗号化ストレージへのアクセスに切り替えて、ユーザーの認証情報に応じて通常のシステム サービスを使用します。
-
-</p>
-
-<p>再起動後、ユーザーが端末のロックを解除したときに通知を受信するには、実行中のコンポーネントから {@link android.content.BroadcastReceiver} を登録して、<code>ACTION_USER_UNLOCKED</code> メッセージをリッスンするようにします。
-
-または、既存の {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED} メッセージを受信することもできます。このメッセージは、端末が起動してユーザーが端末のロックを解除したことを示すようになりました。
-
-</p>
-
-<p>
-<code>UserManager.isUserUnlocked()</code> を呼び出して、ユーザーが端末のロックを解除したかを直接問い合わせることもできます。</p>
-
-<h2 id="migrating">既存のデータを移行する</h2>
-
-<p>ユーザーが端末をアップデートしてダイレクト ブート モードを使用できるようになると、既存のデータを端末暗号化ストレージに移行しなければならない場合があります。
-
-<code>Context.moveSharedPreferencesFrom()</code> および
-<code>Context.moveDatabaseFrom()</code> を使用すると、設定およびデータベースのデータを認証情報暗号化ストレージと端末暗号化ストレージ間で移行できます。
-</p>
-
-<p>どのデータを認証情報暗号化ストレージから端末暗号化ストレージに移行するかは、慎重に判断してください。
-パスワードや承認トークンなどのユーザーの個人情報は、端末暗号化ストレージに移行しないでください。
-
-場合によっては、この 2 つの暗号化された保存先に、データセットを振り分けて管理する必要があります。
-</p>
-
-<h2 id="testing">暗号化対応アプリをテストする</h2>
-
-<p>新しいダイレクト ブート モードを使用して、暗号化対応アプリをテストしてみましょう。ダイレクト ブートを有効にする方法は 2 つあります。
-</p>
-
-<p class="caution"><strong>警告:</strong>ダイレクト ブートを有効にすると、端末上のすべてのユーザーデータが消去されます。
-</p>
-
-<p>Android N がインストールされたサポート対象端末では、次のいずれかの方法を使用してダイレクト ブートを有効にします。
-</p>
-
-<ul>
-<li>端末で、<b>[Developer options]</b> がまだ有効になっていない場合は、次の手順で有効にします。<b>[Settings] > [About phone]</b> で <b>[Build number]</b> を 7 回タップします。
-
-[Developer options] 画面が表示されたら、<b>[Settings] > [Developer options]</b> で <b>[Convert to file encryption]</b> を選択します。
-
-</li>
-<li>次の adb shell コマンドを使用して、ダイレクト ブート モードを有効にします。
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>テスト端末でモードの切り替えが必要な場合、エミュレーションされたダイレクト ブート モードも使用できます。
-データが失われるおそれがありますので、EMULATED モードは開発中にのみ使用してください。
-エミュレーションされたダイレクト ブート モードを有効にするには、端末でロック パターンを設定します。ロック パターンの設定時にセキュリティで保護されたスタートアップ画面について確認メッセージが表示された場合は、[No thanks] を選択します。次に、次の adb shell コマンドを使用します。
-
-
-</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>エミュレーションされたダイレクト ブート モードを無効にするには、次のコマンドを使用します。</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>これらのコマンドを使用すると、端末が再起動されます。</p>
diff --git a/docs/html-intl/intl/ja/preview/features/icu4j-framework.jd b/docs/html-intl/intl/ja/preview/features/icu4j-framework.jd
index cf2063f..6a25cec 100644
--- a/docs/html-intl/intl/ja/preview/features/icu4j-framework.jd
+++ b/docs/html-intl/intl/ja/preview/features/icu4j-framework.jd
@@ -49,7 +49,7 @@
<h2 id="relation">ICU4J との関係</h2>
<p>
- Android N では、<code>com.ibm.icu</code> ではなく
+ Android N では、<code>com.ibm.icu</code> ではなく
<code>android.icu</code> パッケージを介して ICU4J API のサブセットを公開しています。Android フレームワークでは、さまざまな理由により ICU4J API を公開しないという選択も考えられます。たとえば、Android N で廃止された API を公開しないため、または ICU チームからまだ安定版の発表がないため、などの理由があります。
diff --git a/docs/html-intl/intl/ja/preview/features/multi-window.jd b/docs/html-intl/intl/ja/preview/features/multi-window.jd
deleted file mode 100644
index 4ad3d94..0000000
--- a/docs/html-intl/intl/ja/preview/features/multi-window.jd
+++ /dev/null
@@ -1,589 +0,0 @@
-page.title=マルチ ウィンドウのサポート
-page.metaDescription=複数のアプリを同時に表示するための Android N の新しいサポート。
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>このドキュメントの内容</h2>
- <ol>
- <li><a href="#overview">概要</a></li>
- <li><a href="#lifecycle">マルチ ウィンドウ ライフサイクル</a></li>
- <li><a href="#configuring">マルチ ウィンドウ モード向けアプリを構成する</a>
-</li>
- <li><a href="#running">マルチ ウィンドウ モードでアプリを実行する</a></li>
- <li><a href="#testing">アプリのマルチ ウィンドウ サポートをテストする</a></li>
- </ol>
- <h2>関連ドキュメント</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">マルチ ウィンドウ Playground のサンプルアプリ</a>
-</li>
- <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Android N でマルチ ウィンドウを準備するための 5 つのヒント</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N には、複数のアプリを同時に表示するためのサポートが追加されています。
-ハンドヘルド端末で、分割画面モードにして、2 つのアプリを並べて実行したり、重ねて表示したりできます。<em></em>
-TV 端末で、アプリがピクチャ イン ピクチャ モードで動画を再生しているときに、ユーザーは別のアプリを操作できます。<em></em>
-
-
-</p>
-
-<p>
- N Preview SDK でアプリをビルドする場合、アプリがマルチ ウィンドウ ディスプレイを処理をする方法を設定できます。
-たとえば、アクティビティの最小許容ディメンションを指定できます。
-また、アプリに対してマルチ ウィンドウ ディスプレイを無効にし、アプリを全画面モードのみで表示することもできます。
-
-
-</p>
-
-<h2 id="overview">概要</h2>
-
-<p>
- Android N では、複数のアプリが画面を同時に共有できます。たとえば、ユーザーは画面を分割し、ウェブページを左側の画面に表示しながら、右側の画面でメールを作成することができます。
-
-ユーザー エクスペリエンスは端末によって異なります。
-
-</p>
-
-<ul>
- <li>Android N を実行しているハンドヘルド端末は、分割画面モードに対応しています。
-このモードでは、画面で 2 つのアプリが実行され、これらのアプリを並べて、または重ねて表示できます。
-ユーザーは、2 つのアプリを分離している分割線をドラッグして、1 つのアプリを拡大し、もう 1 つのアプリを縮小することができます。
-
- </li>
-
- <li>Android N を実行している Nexus Player で、アプリを<a href="picture-in-picture.html">ピクチャ イン ピクチャ モード</a>にすると、アプリにコンテンツを表示したまま、ユーザーは他のアプリをブラウジングまたは操作することができます。
-
-
-
- </li>
-
- <li>より大きい画面の端末のメーカーは、ユーザーが各アクティビティのサイズを自由に変更できるフリーフォーム モードを有効にすることもできます。
-メーカーがこの機能を有効にした場合、端末では、分割画面モードに加えて、フリーフォーム モードが利用できます。
-
-
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>図 1.</strong> 分割画面モードで並べて実行されている 2 つのアプリ。
-</p>
-
-<p>
- ユーザーは、次の方法でマルチ ウィンドウ モードに切り替えることができます。
-</p>
-
-<ul>
- <li>ユーザーは <a href="{@docRoot}guide/components/recents.html">[Overview] 画面</a>を開いているときに、アクティビティのタイトルを長押ししてから、そのアクティビティを画面の強調表示された部分にドラッグすることにより、アクティビティをマルチ ウィンドウ モードにすることができます。
-
-
-
- </li>
-
- <li>ユーザーが [Overview] ボタンを長押しすると、現在のアクティビティがマルチ ウィンドウ モードになり、[Overview] 画面が開くので、ユーザーは、画面で共有する別のアクティビティを選択できるようになります。
-
-
- </li>
-</ul>
-
-<p>
- ユーザーは、複数のアクティビティが画面を共有しているときに、データを 1 つのアクティビティから別のアクティビティに<a href="{@docRoot}guide/topics/ui/drag-drop.html">ドラッグ＆ドロップ</a>できます
-
-（以前は、単一のアクティビティ内でのみデータをドラッグ＆ドロップできました）。
-
-</p>
-
-<h2 id="lifecycle">マルチ ウィンドウ ライフサイクル</h2>
-
-<p>
- マルチ ウィンドウ モードは、<a href="{@docRoot}training/basics/activity-lifecycle/index.html">アクティビティのライフサイクル</a>を変更しません。
-
-</p>
-
-<p>
- マルチ ウィンドウ モードでは、ユーザーが直前に操作したアクティビティのみが任意の時点でアクティブになります。
-このアクティビティは、トップ レベルにあると見なされます。<em></em>
- 他のすべてのアクティビティは、表示されていても一時停止状態になっています。
- ただし、一時停止状態ではあるが、表示されているこれらのアクティビティには、表示されていないアクティビティよりも高い優先度が付与されます。
-ユーザーが一時停止状態のアクティビティのいずれかを操作した場合、そのアクティビティが再開され、前のトップ レベルのアクティビティが一時停止します。
-
-
-</p>
-
-<p class="note">
- <strong>注:</strong>マルチ ウィンドウ モードでは、アプリが一時停止状態になっても、そのアプリを表示したままにすることができます。
-アプリは、一時停止していても、アクティビティを続行する必用がある場合があります。
-たとえば、一時停止モードになっているが、表示されている動画再生アプリは、動画の表示を継続する必要があります。
-そのため、動画を再生するアクティビティが {@link android.app.Activity#onPause onPause()} ハンドラで動画を一時停止しないようにすることをお勧めします。
-
-<em></em>
- その代わり、これらのアクティビティは {@link android.app.Activity#onStop
- onStop()} で動画を一時停止し、{@link android.app.Activity#onStart
- onStart()} で動画の再生を再開する必要があります。
-</p>
-
-<p>
- <a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>で指定したように、ユーザーがアプリをマルチ ウィンドウ モードにすると、アクティビティに構成の変更が通知されます。
-
-これは、ユーザーがアプリのサイズを変更するか、アプリを全画面モードに戻した場合にも行われます。
-
- 基本的に、この構成の変更は、端末が縦表示から横表示に切り替えられたことをアプリに通知する場合と同じ影響（端末のディメンションが変更された場合を除いて）をアクティビティのライフサイクルに及ぼします。
-
-
-<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更の処理</a>で説明したように、アクティビティは構成の変更を処理することができます。または、システムによってアクティビティを破棄し、新しいディメンションでアクティビティを再作成することもできます。
-
-
-
-</p>
-
-<p>
- ユーザーがウィンドウのサイズを変更して、高さや幅を拡大した場合、ユーザー操作に一致するようにアクティビティのサイズが変更され、必要に応じて、<a href="{@docRoot}guide/topics/resources/runtime-changes.html">実行時の変更</a>が発行されます。
-
-アプリで新しく表示された領域を描画するまでに時間がかかる場合、{@link
- android.R.attr#windowBackground windowBackground} 属性またはデフォルトの
-<code>windowBackgroundFallback</code> システム属性によって指定された色でこれらの領域が一時的に塗りつぶされます。
-
-</p>
-
-<h2 id="configuring">マルチ ウィンドウ モード向けアプリを構成する</h2>
-
-<p>
- アプリが Android N をターゲットにしている場合は、アプリのアクティビティがマルチ ウィンドウ ディスプレイをサポートする方法や、このサポートを行うかどうかを決めることができます。
-サイズとレイアウトを制御するための属性をマニフェストに設定できます。
-
- ルート アクティビティ属性の設定は、タスクスタック内のすべてのアクティビティに適用されます。
-たとえば、ルート アクティビティにより
-<code>android:resizeableActivity</code> が true に設定されると、タスク スタック内のすべてのアクティビティのサイズを変更できるようになります。
-
-</p>
-
-<p class="note">
- <strong>注:</strong>Android N より前の SDK バージョンでマルチ オリエンテーション アプリをビルドして、そのアプリをマルチ ウィンドウ モードで使用する場合は、アプリのサイズが強制的に変更されます。
-
-アプリに予想外の動作が発生する場合があることをユーザーに警告するダイアログ ボックスが表示されます。
-システムは、画面の向きが固定されたアプリのサイズを変更しません。ユーザーがマルチ ウィンドウ モードで画面の向きが固定されたアプリを開こうとすると、そのアプリが全画面で表示されます。<em></em>
-
-
-
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- マルチ ウィンドウ ディスプレイを有効または無効にするには、この属性をマニフェストの <code><activity></code> ノードまたは
-<code><application></code> ノードに設定します。
-
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- この属性が true に設定されている場合、アクティビティを分割画面モードまたはフリーフォーム モードで起動できます。
-この属性が false に設定されている場合、アクティビティはマルチ ウィンドウ モードをサポートしません。
-この値が false のとき、ユーザーがアクティビティをマルチ ウィンドウ モードで起動しようとすると、アクティビティが全画面で表示されます。
-
-
-</p>
-
-<p>
- アプリが Android N をターゲットにしているが、この属性の値が指定されていない場合、属性の値がデフォルトの true になります。
-
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- この属性をマニフェストの <code><activity></code> ノードに設定すると、アクティビティがピクチャ イン ピクチャ ディスプレイをサポートするかどうかを示すことができます。
-<code>android:resizeableActivity</code> が false の場合、この属性は無視されます。
-
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">レイアウト属性</h3>
-
-<p>
- Android N では、<code><layout></code> マニフェスト要素により、マルチ ウィンドウ モードでのアクティビティの動作に影響を及ぼすいくつかの属性がサポートされています。
-
-
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- フリーフォーム モードで起動されたときのアクティビティのデフォルトの幅です。
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- フリーフォーム モードで起動されたときのアクティビティのデフォルトの高さです。
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- フリーフォーム モードで起動されたときのアクティビティの初期配置です。適切な値については、
-{@link android.view.Gravity} のリファレンスをご覧ください。
- </dd>
-
- <dt>
- <code>android:minimalHeight</code>、<code>android:minimalWidth</code>
- </dt>
-
- <dd>
- 分割画面モードおよびフリーフォーム モードでのアクティビティの最小の高さと幅です。
-ユーザーが分割画面モードの分割線を移動して、アクティビティを指定された最小ディメンションよりも小さくすると、アクティビティはユーザーがリクエストしたサイズにトリミングされます。
-
-
- </dd>
-</dl>
-
-<p>
- たとえば、次のコードは、アクティビティがフリーフォーム モードで表示されているときに、アクティビティのデフォルトのサイズと位置、およびその最小サイズを指定する方法を示しています。
-
-
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalHeight="450dp"
- android:minimalWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">マルチ ウィンドウ モードでアプリを実行する</h2>
-
-<p>
- Android N では、マルチ ウィンドウ モードで実行できるアプリをサポートするための新しい機能が導入されています。
-
-</p>
-
-<h3 id="disabled-features">マルチ ウィンドウ モードで無効になる機能</h3>
-
-<p>
- 端末がマルチ ウィンドウ モードになっている場合、特定の機能は、端末の画面を他のアクティビティやアプリと共有する場合があるアクティビティに対して機能しないため、これらの機能は無効なるか、無視されます。
-
-これらの機能には、次のものが含まれます。
-
-<ul>
- <li><a href="{@docRoot}training/system-ui/index.html">システム UI</a> の一部のカスタマイズ オプションは無効になります。たとえば、アプリが全画面モードで実行されていない場合、アプリのステータスバーを非表示にできません。
-
-
- </li>
-
- <li>システムは、<code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code> 属性に加えられた変更を無視します。
- </li>
-</ul>
-
-<h3 id="change-notification">マルチ ウィンドウの変更通知とクエリ</h3>
-
-<p>
- マルチ ウィンドウ ディスプレイをサポートするために、次の新しいメソッドが {@link android.app.Activity} クラスに追加されています。
-各メソッドの詳細については、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>をご覧ください。
-
-
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- アクティビティがマルチ ウィンドウ モードで実行されているかどうかを判別するために呼び出します。
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- アクティビティがピクチャ イン ピクチャ モードで実行されているかどうかを判別するために呼び出します。
-
- <p class="note">
- <strong>注:</strong>ピクチャ イン ピクチャ モードは、マルチ ウィンドウ モードの特別な形態です。
-<code>myActivity.isInPictureInPictureMode()</code> が true を返す場合は、<code>myActivity.isInMultiWindowMode()</code> も true を返します。
-
-
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- アクティビティがマルチ ウィンドウ モードになるか、マルチ ウィンドウ モードではなくなると、常にこのメソッドが呼び出されます。
-アクティビティがマルチ ウィンドウ モードになると、このメソッドに true 値が渡され、アクティビティがマルチ ウィンドウ モードではなくなると、このメソッドに false 値が渡されます。
-
-
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- アクティビティがピクチャ イン ピクチャ モードになるか、ピクチャ イン ピクチャ モードではなくなると、常にこのメソッドが呼び出されます。
-アクティビティがピクチャ イン ピクチャ モードになると、このメソッドに true 値が渡され、アクティビティがピクチャ イン ピクチャ モードではなくなると、このメソッドに false 値が渡されます。
-
-
- </dd>
-</dl>
-
-<p>
- また、これらの各メソッドの {@link android.app.Fragment} バージョンがあります。たとえば、<code>Fragment.isInMultiWindowMode()</code> です。
-
-</p>
-
-<h3 id="entering-pip">ピクチャ イン ピクチャ モードにする</h3>
-
-<p>
- アクティビティをピクチャ イン ピクチャ モードにするには、新しいメソッド
-<code>Activity.enterPictureInPictureMode()</code> を呼び出します。端末がピクチャ イン ピクチャ モードをサポートしない場合、このメソッドの効果はありません。
-詳細については、<a href="picture-in-picture.html">ピクチャ イン ピクチャ</a>に関するドキュメントをご覧ください。
-
-</p>
-
-<h3 id="launch">マルチ ウィンドウ モードで新しいアクティビティを起動する</h3>
-
-<p>
- 新しいアクティビティを起動するときに、可能であれば、新しいアクティビティを現在のアクティビティの隣に表示する必用があるかどうかをシステムに示すことができます。
-そうするには、フラグ
-<code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code> を使用します。
-このフラグを渡すと、次の動作がリクエストされます。
-
-</p>
-
-<ul>
- <li>端末が分割画面モードになっている場合、システムは、起動しているアクティビティの隣に新しいアクティビティを作成しようとするので、これらの 2 つのアクティビティが画面を共有します。
-
-システムでは、この操作の実行が保証されるわけではありませんが、可能であれば、アクティビティが並べて表示されます。
-
- </li>
-
- <li>端末が分割画面モードではない場合、このフラグの効果はありません。
- </li>
-</ul>
-
-<p>
- 端末がフリーフォーム モードになっている場合、新しいアクティビティを起動するときに、
-<code>ActivityOptions.setLaunchBounds()</code> を呼び出すことにより、新しいアクティビティのディメンションと画面上での位置を指定することができます。
-端末がマルチ ウィンドウ モードではない場合、このメソッドの効果はありません。
-
-</p>
-
-<p class="note">
- <strong>注:</strong>タスクスタック内でアクティビティを起動すると、画面上のアクティビティが起動したアクティビティに置き換えられ、すべてのマルチ ウィンドウ プロパティが継承されます。
-
-マルチ ウィンドウ モードで新しいアクティビティを別個の画面として起動する場合は、新しいアクティビティを新しいタスクスタックで起動する必要があります。
-
-</p>
-
-<h3 id="dnd">ドラッグ＆ドロップのサポート</h3>
-
-<p>
- ユーザーは、2 つのアクティビティが画面を共有しているときに、データを 1 つのアクティビティから別のアクティビティに<a href="{@docRoot}guide/topics/ui/drag-drop.html">ドラッグ＆ドロップ</a>できます
-
-（以前は、単一のアクティビティ内でのみデータをドラッグ＆ドロップできました）。
-そのため、アプリがドラッグ＆ドロップをサポートしていない場合は、ドラッグ＆ドロップ機能をアプリに追加する必要があります。
-
-</p>
-
-<p>
- N Preview SDK では、異なるアプリ間のドラッグ＆ドロップをサポートするために、<a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a> パッケージが拡張されています。
-次のクラスとメソッドの詳細については、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK リファレンス</a>をご覧ください。
-
-
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- ドロップを受け取るアプリに付与されるパーミッションの指定を処理するトークン オブジェクトです。
-
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- {@link android.view.View#startDrag View.startDrag()} の新しいエイリアスです。異なるアクティビティ間のドラッグ＆ドロップを有効にするには、新しいフラグ
-<code>View.DRAG_FLAG_GLOBAL</code> を渡します。
-URI パーミッションを受け取る側のアクティビティに付与する必要がある場合、必要に応じて、新しいフラグ
-<code>View.DRAG_FLAG_GLOBAL_URI_READ</code> または
-<code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code> を渡します。
-
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- 実行中のドラッグ操作をキャンセルします。ドラッグ操作を開始したアプリだけが呼び出せます。
-
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- 実行中のドラッグ操作のドラッグ シャドウを置き換えます。ドラッグ操作を開始したアプリだけが呼び出せます。
-
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- {@link android.view.DragEvent} に含まれる {@link
- android.content.ClipData} で渡されるコンテンツ URI のパーミッションをリクエストします。
- </dd>
-</dl>
-
-<h2 id="testing">アプリのマルチ ウィンドウ サポートをテストする</h2>
-
-<p>
- ユーザーが Android N を実行している端末をマルチ ウィンドウ モードにしてアプリの起動を試みる場合に備えて、Android N 向けにアプリをアップデートするかどうかに関係なく、アプリがマルチ ウィンドウ モードでどのように動作するかを確認する必要があります。
-
-
-</p>
-
-<h3 id="configuring">テスト端末の構成</h3>
-
-<p>
- Android N を端末にインストールすると、分割画面モードが自動的にサポートされます。
-
-</p>
-
-<h3 id="test-non-n">アプリが N Preview SDK でビルドされていない場合</h3>
-
-<p>
- アプリが N Preview SDK でビルドされていないときに、ユーザーがマルチ ウィンドウ モードでそのアプリを使用しようとすると、アプリが画面の向きの固定を宣言しない限り、アプリのサイズが強制的に変更されます。
-
-
-</p>
-
-<p>
- アプリが画面の向きの固定を宣言しない場合、Android N を実行している端末でアプリを起動し、アプリを分割画面モードにすることを試みる必要があります。
-
-アプリのサイズが強制的に変更されたときに、ユーザー エクスペリエンスが許容範囲内にあることを確認してください。
-
-</p>
-
-<p>
- アプリが画面の向きの固定を宣言する場合、アプリをマルチ ウィンドウ モードにすることを試みる必要があります。
-アプリをマルチ ウィンドウ モードにすることを試みたとき、アプリが全画面モードのままであることを確認してください。
-
-</p>
-
-<h3 id="test-mw">マルチ ウィンドウ モードをサポートする場合</h3>
-
-<p>
- アプリが N Preview SDK でビルドされていて、マルチ ウィンドウ モードが無効になっていない場合、分割画面モードとフリーフォーム モードの両方で次の動作を確認してください。
-
-
-</p>
-
-<ul>
- <li>アプリを全画面モードで起動してから、[Overview] ボタンを長押しして、マルチ ウィンドウ モードに切り替えます。
-モードが適切に切り替わることを確認します。
- </li>
-
- <li>アプリをマルチ ウィンドウ モードで直接起動し、アプリが適切に起動することを確認します。
-[Overview] ボタンを押すと、アプリをマルチ ウィンドウ モードで起動できます。次に、アプリのタイトルバーを長押しし、アプリを画面上の強調表示された領域のいずれかにドラッグします。
-
-
- </li>
-
- <li>分割画面モードで分割線をドラッグして、アプリのサイズを変更します。
- アプリがクラッシュせずに、アプリのサイズが変更され、必要な UI 要素が表示されることを確認します。
-
- </li>
-
- <li>アプリの最小ディメンションを指定している場合、アプリのサイズをそれらのディメンション以下にすることを試みてください。
-アプリのサイズを指定最小ディメンションよりも小さくできないことを確認してください。
-
- </li>
-
- <li>すべてのテストを通じて、アプリのパフォーマンスが許容範囲内にあることを確認してください。たとえば、アプリのサイズを変更した後、UI の更新に大きな遅延がないことを確認してください。
-
-
- </li>
-</ul>
-
-<h4 id="test-checklist">チェックリストのテスト</h4>
-
-<p>
- アプリのパフォーマンスをマルチ ウィンドウ モードで確認するには、以下の操作を試みてください。
-特に記載のない限り、分割画面モードとマルチ ウィンドウ モードの両方でこれらの操作を試みる必要があります。
-
-</p>
-
-<ul>
- <li>マルチ ウィンドウ モードを有効にしてから無効にします。
- </li>
-
- <li>1 つのアプリから別のアプリに切り替えたとき、最初のアプリの動作が適切であり、表示されているが、アクティブになっていないことを確認します。
-たとえば、アプリが動画を再生している場合、ユーザーが別のアプリを操作しているときに、アプリで動画の再生が継続していることを確認します。
-
-
- </li>
-
- <li>分割画面モードで分割線を移動して、アプリの拡大および縮小を試みてください。
-アプリを並べて表示しているときと重ねて表示しているときの両方でこれらの操作を試みてください。
-アプリがクラッシュせず、基本的な機能が表示され、サイズ変更の操作に時間がかかり過ぎないことを確認します。
-
-
- </li>
-
- <li>続けざまにサイズ変更の操作を行います。アプリがクラッシュしたり、メモリリークが発生したりしないことを確認します。
-アプリのメモリリークをチェックする方法の詳細については、<a href="{@docRoot}tools/debugging/debugging-memory.html">RAM の使用状況を調査する</a>をご覧ください。
-
-
- </li>
-
- <li>さまざまなウィンドウ構成でアプリを通常の方法で使用し、アプリが適切に動作することを確認します。
-テキストが読み取り可能であり、UI 要素が操作に支障をきたすほど小さくないことを確認します。
-
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">マルチ ウィンドウのサポートを無効にしている場合</h3>
-
-<p>
-
-<code>android:resizableActivity="false"</code> を設定して、マルチ ウィンドウのサポートを無効にした場合は、Android N を実行している端末でアプリを起動し、アプリをフリーフォーム モードおよび分割画面モードにすることを試みる必要があります。
-
-アプリをマルチ ウィンドウ モードにすることを試みたとき、アプリが全画面モードのままであることを確認してください。
-
-</p>
diff --git a/docs/html-intl/intl/ja/preview/features/picture-in-picture.jd b/docs/html-intl/intl/ja/preview/features/picture-in-picture.jd
deleted file mode 100644
index faf63ea..0000000
--- a/docs/html-intl/intl/ja/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,213 +0,0 @@
-page.title=ピクチャ イン ピクチャ
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>このドキュメントの内容</h2>
-<ol>
- <li><a href="#declaring">アクティビティがピクチャ イン ピクチャをサポートしていることを宣言する
-</a></li>
- <li><a href="#pip_button">アクティビティをピクチャ イン ピクチャに切り替える</a>
-</li>
- <li><a href="#handling_ui">ピクチャ イン ピクチャの実行中に UI を処理する</a>
-</li>
- <li><a href="#continuing_playback">ピクチャ イン ピクチャの実行中に動画の再生を続行する
-</a></li>
- <li><a href="#single_playback">ピクチャ イン ピクチャで単一の再生アクティビティを使用する
-</a></li>
- <li><a href="#best">ベスト プラクティス</a></li>
-</ol>
-
-<h2>関連ドキュメント</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">マルチ ウィンドウのサポート
-</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>Android N では、Android TV ユーザーは、アプリを操作するときに画面の隅に固定されたウィンドウで動画を視聴できるようになりました。
-
-ピクチャ イン ピクチャ（PIP）モードを使用すると、アプリはバックグランドで別のアクティビティを続けながら、固定されたウィンドウで動画アクティビティを実行できるようになります。
-
-PIP ウィンドウでは、アプリの使用中にマルチタスクを実行できます。これにより、ユーザーの作業効率が向上します。
-</p>
-
-<p>アプリで、PIP モードをトリガーするタイミングを決めることができます。次に、PIP モードの開始時点の例を示します。
-</p>
-
-<ul>
-<li>ユーザーが別のコンテンツをブラウジングするために動画から別のコンテンツに切り替えると、アプリは動画を PIP モードに切り替えることができます。
-</li>
-<li>コンテンツのエピソード終了の画面が表示されている間、アプリは動画を PIP モードに切り替えることができます。
-メイン画面には、シリーズの次のエピソードに関するプロモーションや概要の情報が表示されます。
-</li>
-<li>アプリで、ユーザーが動画を視聴している間に、追加のコンテンツのキューを作成する方法を提供できます。
-メイン画面でコンテンツの選択アクティビティを表示している間に、動画は PIP モードで再生を続行できます。
-</li>
-</ul>
-
-<p>PIP ウィンドウは 240 x 135 dp で、画面の 4 つのコーナーのうちいずれかの一番上のレイヤに表示されます。表示する場所はシステムによって選択されます。
-ユーザーは PIP メニューを表示して、PIP ウィンドウを全画面表示に切り替えたり、リモコンの [<b>Home</b>] ボタンを押して PIP ウィンドウを閉じたりすることができます。
-
-別の動画がメイン画面で再生を開始すると、PIP ウィンドウは自動的に閉じます。
-
-最近使ったアプリから PIP ウィンドウを閉じることもできます。</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>図 1.</strong> ユーザーがメイン画面でコンテンツを閲覧中に画面の隅に表示されるピクチャ イン ピクチャの動画
-
-</p>
-
-<p>PIP では、Android N で使用可能なマルチウィンドウ API を活用し、固定された動画オーバーレイ ウィンドウを表示します。
-PIP をアプリに追加するには、PIP をサポートするアクティビティを登録し、必要に応じてアクティビティを PIP モードに切り替えて、UI 要素を非表示にして、アクティビティが PIP モードを開始しても動画の再生が続行されるようにします。
-
-
-</p>
-
-<h2 id="declaring">アクティビティがピクチャ イン ピクチャをサポートしていることを宣言する</h2>
-
-<p>デフォルトでは、システムはアプリの PIP を自動的にサポートしません。アプリで PIP をサポートする場合、マニフェストで
-<code>android:supportsPictureInPicture</code> および
-<code>android:resizeableActivity</code> を <code>true</code> に設定して、動画アクティビティを登録します。
-
-また、アクティビティがレイアウトの設定変更を処理するように指定して、PIP モードの遷移中にレイアウト変更が発生しても、アクティビティが再開しないようにします。
-
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>アクティビティを登録する際は、PIP モードでは、アクティビティが TV 画面の小さなオーバーレイ ウィンドウに表示される点に注意してください。
-動画の再生アクティビティは、最小限の UI にすることで最高のユーザー エクスペリエンスを提供できます。
-小さな UI 要素を含むアクティビティでは、PIP モードに切り替えたときに優れたユーザー エクスペリエンスを提供できない可能性があります。PIP ウィンドウでは、その UI 要素の詳細が見えづらくなるためです。
-
-
-</p>
-
-<h2 id="pip_button">アクティビティをピクチャ イン ピクチャに切り替える</h2>
-
-アクティビティを PIP モードに切り替える必要があるときは、
-<code>Activity.enterPictureInPictureMode()</code> を呼び出します。次の例では、ユーザーがメディア コントロール バーにある専用の PIP ボタンを選択したときに、PIP モードに切り替わります。
-
-</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>メディア コントロール バーに PIP ボタンを追加すると、ユーザーが動画の再生を操作中に、簡単に PIP モードに切り替えることができます。
-</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>図 1.</strong> メディア コントロール バー上の [Picture-in-picture] ボタン
-</p>
-
-<p>Android N には、新しい
-<code>PlaybackControlsRow.PictureInPictureAction</code> クラスが含まれています。このクラスは、コントロール バーの PIP アクションと PIP アイコンの使用方法を定義します。
-</p>
-
-<h2 id="handling_ui">ピクチャ イン ピクチャの実行中に UI を処理する</h2>
-
-<p>アクティビティが PIP モードを開始したら、動画の再生のみを表示する必要があります。
-アクティビティが PIP を開始する前に UI 要素を削除して、再び全画面表示に戻ったら、削除した要素を復元します。<code>Activity.onPictureInPictureModeChanged()</code> または
-<code>Fragment.onPictureInPictureModeChanged()</code> をオーバーライドして、必要に応じて UI 要素を有効または無効にします。次に例を示します。
-
-
-</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">ピクチャ イン ピクチャの実行中に動画の再生を続行する
-</h2>
-
-<p>アクティビティを PIP に切り替えると、システムはそのアクティビティを一時停止状態と見なして、アクティビティの <code>onPause()</code> メソッドを呼び出します。
-PIP モードによってアクティビティが一時停止になっても、動画の再生は一時停止せず、再生を続ける必要があります。
-
-アクティビティの
-<code>onPause()</code> メソッドで PIP を確認し、適切に再生を処理してください。次に例を示します。
-</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>アクティビティが PIP モードを終了して全画面モードに戻ると、システムはアクティビティを再開して <code>onResume()</code> メソッドを呼び出します。
-</p>
-
-<h2 id="single_playback">ピクチャ イン ピクチャで単一の再生アクティビティを使用する
-</h2>
-
-<p>動画再生アクティビティが PIP モードのときに、ユーザーがアプリのメイン画面でコンテンツをブラウズ中に新しい動画を選択することがあります。
-全画面モードの既存の再生アクティビティで新しい動画を再生します。新しいアクティビティを起動するとユーザーが混乱する可能性があります。
-
-</p>
-
-<p>動画再生リクエストに対して単一のアクティビティが使用されるようにし、必要に応じて PIP モードの切り替えが行われるようにするには、マニフェストでアクティビティの
-<code>android:launchMode</code> を <code>singleTask</code> に設定します。
-
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>アクティビティで、{@link android.app.Activity#onNewIntent
-Activity.onNewIntent()} をオーバーライドして新しい動画を処理し、既存の動画再生を必要に応じて停止します。
-</p>
-
-<h2 id="best">ベスト プラクティス</h2>
-
-<p>PIP は、動画を全画面表示で再生するアクティビティに使用します。アクティビティを PIP モードに切り替えるときは、動画コンテンツ以外は何も表示しないでください。アクティビティが PIP モードを開始したタイミングを検出し、<a href="#handling_ui">ピクチャ イン ピクチャの実行中に UI を処理する</a>で説明したように、UI 要素を非表示にします。
-
-
-</p>
-
-<p>PIP ウィンドウは画面の隅にフローティング ウィンドウとして表示されるため、メイン画面のどの場所にも重要な情報を表示しないでください。PIP ウィンドウによって隠れる可能性があります。
-
-</p>
-
-<p>アクティビティが PIP モードになると、デフォルトで、入力フォーカスは失われます。PIP モードで動作中に入力イベントを受け付けるには、
-<code>MediaSession.setMediaButtonReceiver()</code> を使用します。
-</p>
diff --git a/docs/html-intl/intl/ja/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/ja/preview/features/scoped-folder-access.jd
deleted file mode 100644
index e77e481..0000000
--- a/docs/html-intl/intl/ja/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,148 +0,0 @@
-page.title=特定のディレクトリへのアクセス
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>このドキュメントの内容</h2>
- <ol>
- <li><a href="#accessing">外部ストレージのディレクトリへのアクセス</a></li>
- <li><a href="#removable">リムーバブル メディアのディレクトリへのアクセス</a></li>
- <li><a href="#best">ベスト プラクティス</a></li>
- </ol>
-</div>
-</div>
-
-<p>写真アプリなどは通常、外部ストレージの特定のディレクトリ（<code>Pictures</code> ディレクトリなど）のみにアクセスする必要があります。
-外部ストレージへのアクセスに関する従来のアプローチでは、このようなアプリに目的のディレクトリへのアクセスを容易に提供できる設計にはなっていませんでした。
-
-次に例を示します。</p>
-
-<ul>
-<li>マニフェストで {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} または {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} を要求すると、外部ストレージ上のすべての公開ディレクトリにアクセスできますが、この場合、アプリが必要な場所以外にもアクセスできることになります。
-
-
-</li>
-<li><a href="{@docRoot}guide/topics/providers/document-provider.html">ストレージ アクセス フレームワーク</a>を使用すると、通常、ユーザーはシステム UI を使用してディレクトリを選択できますが、アプリが常に同じ外部ディレクトリにアクセスする場合、この選択は不要です。
-
-
-
-</li>
-</ul>
-
-<p>Android N では、一般的な外部ストレージ ディレクトリにアクセスできる、新しいシンプルな API を提供します。
- </p>
-
-<h2 id="accessing">外部ストレージのディレクトリへのアクセス</h2>
-
-<p><code>StorageManager</code> クラスを使用して、適切な
-<code>StorageVolume</code> インスタンスを取得します。次に、そのインスタンスの
-<code>StorageVolume.createAccessIntent()</code> メソッドを呼び出して、インテントを作成します。このインテントを使用して、外部ストレージのディレクトリにアクセスします。
-リムーバブル メディア ボリュームなど、使用できるすべてのボリュームのリストを取得するには、<code>StorageManager.getVolumesList()</code> を使用します。
-
-</p>
-
-<p>特定のファイルに関する情報がある場合は、
-<code>StorageManager.getStorageVolume(File)</code> を使用して、そのファイルを含む
-<code>StorageVolume</code> を取得します。この <code>StorageVolume</code> で
-<code>createAccessIntent()</code> を呼び出し、このファイルの外部ストレージ ディレクトリにアクセスします。
-</p>
-
-<p>
-外部 SD カードなどのセカンダリ ボリュームで、
-<code>StorageVolume.createAccessIntent()</code> を呼び出すときに null を渡し、特定のディレクトリではなくボリューム全体へのアクセスをリクエストします。プライマリ ボリュームに null を渡すか、無効なディレクトリ名を渡すと、
-<code>StorageVolume.createAccessIntent()</code> は null を返します。
-
-
-</p>
-
-<p>次のコード スニペットは、プライマリ共有ストレージの
-<code>Pictures</code> ディレクトリを開く方法の例を示しています。</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>システムは外部ディレクトリへのアクセスの付与を試行し、必要に応じてシンプルな UI で、ユーザーにアクセスを確認します。
-</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>図 1.</strong> Pictures ディレクトリへのアクセスを要求するアプリ
-</p>
-
-<p>ユーザーがアクセスを付与すると、
-<code>Activity.RESULT_OK</code> の結果コードと、URI を含むインテント データを指定して、
-<code>onActivityResult()</code> のオーバーライドを呼び出します。提供された URI を使用して、ディレクトリの情報にアクセスします。これは、<a href="{@docRoot}guide/topics/providers/document-provider.html">ストレージ アクセス フレームワーク</a>で返された URI を使用する場合と同様です。
-
-
-
-</p>
-
-<p>ユーザーがアクセスを付与しなかった場合は、
-<code>Activity.RESULT_CANCELED</code> の結果コードと、null のインテント データを指定して、
-<code>onActivityResult()</code> のオーバーライドを呼び出します。</p>
-
-<p class="note"><b>注</b>:特定の外部ディレクトリへのアクセスを取得すると、そのディレクトリ内のサブディレクトリへのアクセスも取得します。
-</p>
-
-<h2 id="removable">リムーバブル メディアのディレクトリへのアクセス</h2>
-
-<p>特定のディレクトリへのアクセスを使用してリムーバブル メディア上のディレクトリにアクセスするには、まず {@link android.os.Environment#MEDIA_MOUNTED} 通知をリッスンする {@link android.content.BroadcastReceiver} を追加します。次に例を示します。
-
-</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>ユーザーが SD カードなどのリムーバブル メディアをマウントすると、システムは
-{@link android.os.Environment#MEDIA_MOUNTED} 通知を送信します。この通知は、インテント データ内の <code>StorageVolume</code> オブジェクトを提供します。このオブジェクトを使用して、リムーバブル メディア上のディレクトリにアクセスできます。
-
-次の例では、リムーバブル メディア上の <code>Pictures</code> ディレクトリにアクセスします。
-</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">ベスト プラクティス</h2>
-
-<p>外部ディレクトリのアクセス URI はできる限り保持してください。そうすれば、ユーザーに何度もアクセス要求をする必要がなくなります。
-ユーザーがアクセスを付与したら、ディレクトリのアクセス URI を指定して
-<code>getContentResolver().takePersistableUriPermssion()</code> を呼び出します。
-システムが URI を保持し、以降のアクセス要求では <code>RESULT_OK</code> を返して、ユーザーに確認の UI を表示しません。
-
-</p>
-
-<p>ユーザーが外部ディレクトリへのアクセスを拒否した直後に、またアクセスをリクエストしないようにしてください。
-何度もアクセスを要求すると、ユーザー エクスペリエンスが低下します。
-リクエストがユーザーにより拒否され、アプリが再度アクセスをリクエストすると、UI に [<b>Don't ask again</b>] チェックボックスが表示されます。
-</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>図 1.</strong> リムーバブル メディアへのアクセスに対して 2 回目のリクエストを行うアプリ。
-</p>
-
-<p>ユーザーが [<b>Don't ask again</b>] を選択してリクエストを拒否すると、特定のディレクトリに対するアプリからの今後のすべてのリクエストは自動的に拒否され、リクエストに関する UI は表示されなくなります。
-
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/preview/features/security-config.jd b/docs/html-intl/intl/ja/preview/features/security-config.jd
deleted file mode 100644
index 1fbfe72..0000000
--- a/docs/html-intl/intl/ja/preview/features/security-config.jd
+++ /dev/null
@@ -1,747 +0,0 @@
-page.title=ネットワーク セキュリティ構成
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>このドキュメントの内容</h2>
-<ol>
- <li><a href="#manifest">セキュリティ構成ファイルの追加</a></li>
- <li><a href="#CustomTrust">信頼できる CA のカスタマイズ</a>
- <ol>
- <li><a href="#ConfigCustom">カスタムの CA の設定</a></li>
- <li><a href="#LimitingCas">信頼できる CA の制限</a></li>
- <li><a href="#TrustingAdditionalCas">信頼できる CA の追加</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">デバッグ限定の CA</a></li>
- <li><a href="#UsesCleartextTraffic">クリアテキスト トラフィックのオプトアウト</a></li>
- <li><a href="#CertificatePinning">証明書のピン留め</a></li>
- <li><a href="#ConfigInheritance">構成の継承の動作</a></li>
- <li><a href="#FileFormat">構成ファイルの形式</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N には、ネットワーク セキュリティ構成機能が含まれています。これにより、アプリのコードを修正しなくても、安全な宣言型構成ファイルで、アプリのネットワーク セキュリティの設定をカスタマイズできます。
-
-これらの設定は、特定のドメインおよび特定のアプリに対して構成できます。
-主な機能は次のとおりです。
-
-</p>
-
-<ul>
- <li>
- <b>カスタム トラスト アンカー:</b>アプリのセキュアな接続にどの証明機関（CA）を信頼するかをカスタマイズできます。
-たとえば、特定の自己署名証明書や制限された一連の公的 CA を信頼できます。
-
-
- </li>
-
- <li>
- <b>デバッグのみのオーバーライド:</b>インストール ベースに対する追加リスクなしに、アプリのセキュアな接続を安全にデバッグできます。
-
- </li>
-
- <li>
- <b>クリアテキスト トラフィックのオプトアウト:</b>クリアテキスト トラフィックの意図しない使用からアプリを保護できます。
-
- </li>
-
- <li>
- <b>証明書のピン留め:</b>アプリのセキュアな接続を特定の証明書に制限します。
-
- </li>
-</ul>
-
-
-<h2 id="manifest">セキュリティ構成ファイルの追加</h2>
-
-<p>
- ネットワーク セキュリティ構成機能は、XML ファイルを使用します。このファイルで、アプリの設定を指定できます。
-アプリのマニフェストに、このファイルを指すエントリを含める必要があります。
-次のコードはマニフェストからの抜粋で、このエントリの作成方法を示しています。
-
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application ... >
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">信頼できる CA のカスタマイズ</h2>
-
-<p>
- アプリで、プラットフォームのデフォルトの設定ではなく、カスタマイズした一連の CA を信頼することが必要な場合があります。
-主な理由は次のとおりです。
-</p>
-
-<ul>
- <li>カスタムの証明機関（自己署名、社内の CA で発行など）を使用してホストに接続する。
-
- </li>
-
- <li>プレインストールされたすべての CA ではなく、信頼する一部の CA のみに制限する。
-
- </li>
-
- <li>システムに含まれていない追加の CA を信頼する。
- </li>
-</ul>
-
-<p>
- デフォルトで、すべてのアプリのセキュアな接続（TLS、HTTPS など）は、システムにプレインストールされた CA を信頼し、API レベル 23（Android M）以下をターゲットにしたアプリは、ユーザーが追加した CA も信頼します。
-
-アプリは {@code base-config}（アプリ全体のカスタマイズ）または {@code domain-config} （ドメイン単位のカスタマイズ）を使用して、独自の接続をカスタマイズすることもできます。
-
-
-
-</p>
-
-
-<h3 id="ConfigCustom">カスタムの CA の設定</h3>
-
-<p>
- 自己署名 SSL 証明書を使用するホストか、または信頼できる非パブリック CA（社内の CA など）によって SSL 証明書が発行されているホストに接続するケースで説明します。
-
-
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- PEM または DER 形式で、自己署名または非パブリック CA 証明書を
-{@code res/raw/my_ca} に追加します。
-</p>
-
-
-<h3 id="LimitingCas">信頼できる CA の制限</h3>
-
-<p>
- システムによって信頼されているすべての CA をアプリで信頼したくない場合は、信頼する CA を制限できます。
-これにより、他の CA が発行した偽造証明書からアプリを保護できます。
-
-</p>
-
-<p>
- 信頼できる CA を制限するための設定は、特定のドメインで<a href="#TrustingACustomCa">カスタムの CA を信頼する</a>設定と似ています。ただし、リソースで複数の CA を指定できる点が異なります。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- PEM または DER 形式で、信頼できる CA を {@code res/raw/trusted_roots} に追加します。
- PEM 形式を使用する場合、そのファイルには PEM データのみを含めるようにして、余分なテキストを含めないでください。<em></em>
-1 つだけでなく複数の
-<a href="#certificates"><code><certificates></code></a> 要素を指定できます。
-
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- 信頼できる CA の追加
-</h3>
-
-<p>
- システムで信頼されていない CA を、アプリが追加で信頼しなければならない場合があります。これは、システムに CA がまだ組み込まれていなかったり、CA が Android システムに組み込まれるための要件を満たしていないことが原因です。
-
-CA を追加するには、アプリの構成で複数の証明書ソースを指定します。
-
-
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">デバッグ用の CA の構成</h2>
-
-<p>
- HTTPS で接続するアプリをデバッグするときは、運用サーバーの SSL 証明書がインストールされていないローカルの開発サーバーへの接続が必要になります。
-
-アプリのコードを変更せずにこの接続をサポートするには
-
- <i>、</i> {@code debug-overrides} を使用して、<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a> が {@code true} の場合にのみ信頼されるデバッグ限定の CA を指定できます。
-
-通常、IDE およびビルド ツールによって、非リリース ビルドには自動的にこのフラグが設定されます。
-
-</p>
-
-<p>
- この方法は、通常の条件付きコードよりも安全です。セキュリティ対策として、アプリ ストアでは debuggable とマークされたアプリは拒否されるからです。
-
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">クリアテキスト トラフィックのオプトアウト</h2>
-
-<p>
- アプリケーションで、セキュアな接続のみを使用して接続する場合、それらの接続先に対して（HTTPS ではなく暗号化されていない HTTP プロトコルを使用する）クリアテキストのサポートを除外できます。
-
-このオプションにより、バックエンド サーバーなど外部ソースが提供する URL の変更によって、アプリで思わぬパフォーマンスの低下が発生するのを防ぐことができます。
-
-
- 詳細については、{@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()} をご覧ください。
-</p>
-
-<p>
- たとえば、アプリで {@code
- secure.example.com} へのすべての接続には常に HTTPS を使用して、機密性の高いトラフィックを有害なネットワークから保護することが必要な場合があります。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">証明書のピン留め</h2>
-
-<p>
- 通常、アプリはプレインストールされたすべての CA を信頼します。これらの CA が偽造証明書を発行すると、アプリは MiTM 攻撃のリスクにさらされます。
-
-アプリによっては、信頼する CA を制限するか証明書をピン留めすることで、受け入れる証明書を制限できます。
-
-</p>
-
-<p>
- 証明書をピン留めするには、公開鍵のハッシュによって証明書のセットを指定します（X.509 証明書の SubjectPublicKeyInfo）。
-証明書チェーンが有効になるのは、証明書チェーンに 1 つ以上のピン留めされた公開鍵が含まれている場合のみです。
-
-
-</p>
-
-<p>
- 証明書のピン留めを使用するときは、必ずバックアップの鍵を含めてください。そうすれば、新しい鍵に切り替えたり、CA を変更したりする必要が生じた場合に（CA 証明書またはその CA の中間証明書にピン留めしていても）、アプリの接続が影響を受けることはありません。
-
-
-そうしないと、接続を復元するためにアプリにアップデートをプッシュしなければならなくなります。
-
-</p>
-
-<p>
- また、ピン留めの有効期限を設定することもできます。その有効期限を過ぎると、ピン留めが無効になります。
-これにより、アップデートされていないアプリの接続の問題を防ぐことができます。
-ただし、ピン留めに有効期限を設定すると、ピン留めを回避できるようになります。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">構成の継承の動作</h2>
-
-<p>
- 固有の構成で設定されていない値は、継承されます。この動作により、より複雑な構成が可能になるうえ、構成ファイルの読みやすさを維持できます。
-
-</p>
-
-<p>
- 固有のエントリに値が設定されていない場合、その次に汎用的なエントリの値が使用されます。
-{@code domain-config} で設定されていない値は、ネストされている場合は親の {@code domain-config} から、ネストされていない場合は {@code
- base-config} から取得されます。
-{@code base-config} で設定されていない値には、プラットフォームの既定値を使用します。
-
-</p>
-
-<p>
- たとえば、{@code
- example.com} のサブドメインに対するすべての接続で、CA のカスタム セットを使用する必要があるケースを考えてみましょう。また、これらのドメインに対するクリアテキストのトラフィックは、{@code
- secure.example.com} に接続する場合を除いて許可します。<em></em>
-{@code example.com} の構成で {@code
- secure.example.com} の構成をネストすることで、
-{@code trust-anchors} の重複を回避できます。
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">構成ファイルの形式</h2>
-
-<p>
- ネットワーク セキュリティ構成機能では、XML ファイル形式を使用します。
- ファイルの全体的な構造については、次のコード サンプルをご覧ください。
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- 次のセクションでは、このファイル形式の構文とその他の詳細について説明します。
-
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 含めることのできる要素:
- </dt>
-
- <dd>
- 0 または 1 つの <code><a href="#base-config"><base-config></a></code><br>
- 任意の数の <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 または 1 つの <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 構文:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- 含めることのできる要素:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 説明:
- </dt>
-
- <dd>
- <a href="#domain-config"><code>domain-config</code></a> に含まれていない接続先に対するすべての接続に使用される、デフォルトの構成。
-
-
-<p>
- 設定されていない値はすべて、プラットフォームの既定値を使用します。API レベル 24 以上をターゲットにしたアプリのデフォルトの構成は次のとおりです。
-
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-API レベル 23 以下をターゲットにしたアプリのデフォルトの構成は次のとおりです。
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>構文:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>含めることのできる要素:</dt>
-
-<dd>
-1 つ以上の <code><a href="#domain"><domain></a></code>
-<br/>0 または 1 つの <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 または 1 つの <code><a href="#pin-set"><pin-set></code></a>
-<br/>任意の数のネストされた <code><domain-config></code></dd>
-
-<dt>説明</dt>
-<dd>固有の接続先への接続に使用される構成です。{@code domain} 要素の定義に従います。
-
-<p>複数の {@code domain-config} 要素で接続先を指定している場合は、最も具体的な（長い）マッチング ドメイン ルールを持つ構成が採用されます。
-</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- 構文:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- 属性:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- {@code "true"} の場合、このドメイン ルールはドメインおよびすべてのサブドメイン（サブドメインのサブドメインも含む）に一致します。そうでない場合、このルールは完全一致のみに適用されます。
-
-
- </dd>
- </dl>
- </dd>
-
- <dt>
- 説明:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- 構文:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- 含めることのできる要素:
- </dt>
-
- <dd>
- 0 または 1 つの <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 説明:
- </dt>
-
- <dd>
- オーバーライドは、<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a> が {@code "true"} の場合に適用されます。これは通常、IDE およびビルド ツールで生成された非リリース ビルドに使用します。
-
-{@code
- debug-overrides} で指定されたトラスト アンカーは、その他すべての構成に追加されます。サーバーの証明書チェーンでデバッグ限定のトラスト アンカーのいずれかを使用するときは、証明書のピン留めは実行されません。
-
-<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a> が {@code "false"} の場合、このセクションは完全に無視されます。
-
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- 構文:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- 含めることのできる要素:
- </dt>
-
- <dd>
- 任意の数の <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- 説明:
- </dt>
-
- <dd>
- セキュアな接続に使用するトラスト アンカーのセット。
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>構文:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>説明:</dt>
-<dd>{@code trust-anchors} 要素の X.509 証明書のセットです。</dd>
-
-<dt>属性:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-CA 証明書のソースには、次のいずれかを指定します。
-<ul>
- <li>X.509 証明書を含むファイルを指す未加工のリソース ID。
- 証明書は、DER または PEM 形式でエンコードする必要があります。PEM 証明書の場合、ファイルには PEM 以外の余分なデータ（コメントなど）を含めないでください。
-<em></em>
-
- </li>
-
- <li>{@code "system"}: プレインストールされたシステムの CA 証明書
- </li>
-
- <li>{@code "user"}: ユーザーが追加した CA 証明書
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- ソースから取得した CA が証明書のピン留めを回避するかどうかを指定します。{@code
- "true"} の場合、証明書チェーンはこのソースから取得したいずれかの CA を使用して作成され、ピン留めは実行されません。
-この設定は、CA をデバッグしたり、アプリのセキュアなトラフィックでユーザーの MiTM の許可をサポートするために役立ちます。
-
- </p>
-
- <p>
- デフォルトは {@code "false"} です。ただし、{@code debug-overrides} 要素で指定された場合の既定値は {@code "true"} です。
-
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- 構文:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- 含めることのできる要素:
- </dt>
-
- <dd>
- 任意の数の <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- 説明:
- </dt>
-
- <dd>
- 公開鍵のピンのセットです。セキュアな接続を信頼するには、信頼チェーン内の公開鍵一式のうちどれかが、ピンのセットに含まれている必要があります。
-ピンの形式については、
-<code><a href="#pin"><pin></a></code> をご覧ください。
- </dd>
-
- <dt>
- 属性:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- {@code yyyy-MM-dd} 形式のピン留めの有効期限、つまりピン留めを無効にする日付です。
-この属性が設定されていない場合、ピン留めの有効期限はありません。
-
- <p>
- 有効期限を設定しておくと、ユーザーがアプリのアップデートを無効にしているなどの原因で、ピンのセットのアップデートを取得していないアプリで、アプリの接続上の問題を回避できます。
-
-
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- 構文:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- 属性:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- PIN の生成にはダイジェスト アルゴリズムが使用されます。現在サポートされているのは
-{@code "SHA-256"} のみです。
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/ja/preview/guide.jd b/docs/html-intl/intl/ja/preview/guide.jd
deleted file mode 100644
index f56fc66..0000000
--- a/docs/html-intl/intl/ja/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=テストガイド
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>このドキュメントの内容</h2>
- <ol>
- <li><a href="#runtime-permissions">パーミッションをテストする</a></li>
- <li><a href="#doze-standby">Doze とアプリ スタンバイをテストする</a></li>
- <li><a href="#ids">自動バックアップと端末識別子</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N を利用すると、次期バージョンのプラットフォームでアプリが動作するか確認できます。
-このプレビューには、<a href="{@docRoot}preview/api-overview.html">API の概要</a>と<a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>に記載されているように、アプリに影響を与える可能性のある多くの API と動作の変更が含まれています。
-
-このプレビューでアプリをテストするときには、アプリの良好な使用感を確保するために、システムのいくつかの変更点に特に注意する必要があります。
-
-
-</p>
-
-<p>
- このガイドでは、アプリでプレビューの機能の何をどのようにテストすればよいか説明します。以下のプレビュー機能は、アプリの動作に大きな影響を与える可能性があるので、優先してテストする必要があります。
-
-
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">パーミッション</a>
- </li>
- <li><a href="#doze-standby">Doze とアプリ スタンバイ</a>
- </li>
- <li><a href="#ids">自動バックアップと端末識別子</a></li>
-</ul>
-
-<p>
- テスト用のプレビュー システム イメージを使用した端末または仮想端末のセットアップ方法の詳細については、<a href="{@docRoot}preview/setup-sdk.html">Android N SDK のセットアップ</a>をご覧ください。
-
-
-</p>
-
-
-<h2 id="runtime-permissions">パーミッションをテストする</h2>
-
-<p>
- <a href="{@docRoot}preview/features/runtime-permissions.html">パーミッション</a> モデルの変更により、ユーザーがアプリにパーミッションを付与する方法が変わりました。
-アプリでは、インストール時にすべてのパーミッションを要求するのではなく、実行時に個々のパーミッションをユーザーに要求する必要があります。
-
-これにより、ユーザーは、各アプリのアクティビティをより細かくコントロールできるようになるだけではなく、アプリが各パーミッションを要求する理由をこれまでよりもよく理解できるようになります。
-ユーザーは、いつでもアプリに個別にパーミッションを付与したり、付与したパーミッションを個別に取り消したりできます。
-プレビューのこの機能は、アプリの動作に大きな影響を与える可能性があり、アプリの一部の機能が動作しなくなったり、限定された機能しか使えなくなったりする可能性もあります。
-
-
-</p>
-
-<p class="caution">
- この変更は、アプリがこの新しいバージョンを対象にしているかどうかにかかわらず、この新しいプラットフォーム上で実行されるすべてのアプリに影響します。
-このプラットフォームは以前のアプリに限定的な互換動作を提供しますが、公式版のプラットフォームのリリースに合わせてアップデート版のアプリを公開できるように、新しいパーミッション モデルに対応させるためのアプリの移行を今から計画することを強くお勧めします。
-
-
-</p>
-
-
-<h3 id="permission-test-tips">テストのヒント</h3>
-
-<p>
- 以下のテストのヒントを活用して、アプリでの新しいパーミッション動作のテストを計画し、実行してください。
-
-</p>
-
-<ul>
- <li>アプリの現在のパーミッションと関連するコードパスを確認します。</li>
- <li>パーミッションで保護されているサービスとデータ間のユーザーフローをテストします。</li>
- <li>付与されたパーミッションと取り消されたパーミッションのさまざまな組み合わせをテストします。</li>
- <li>{@code adb} ツールを使用して、コマンドラインからパーミッションを管理します。
- <ul>
- <li>パーミッションとステータスをグループ化して表示します。
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>以下の構文を使用して 1 つまたは複数のパーミッションを付与または取り消します。<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>アプリでパーミッションを使用しているサービスを分析します。</li>
-</ul>
-
-<h3 id="permission-test-strategy">テスト方針</h3>
-
-<p>
- このパーミッションの変化は、アプリの構造と設計、ユーザー エクスペリエンスとフローに影響を与えます。
-アプリの現在のパーミッション利用の状況を調査し、新しいフローの検討を開始する必要があります。
-このプラットフォームの公式リリースは互換動作を提供しますが、互換動作に頼ることなくアプリのアップデートを計画することを強くお勧めします。
-
-
-</p>
-
-<p>
- まずアプリが実際に必要とし使用しているパーミッションを特定してから、パーミッションで保護されたサービスを使用している各コードパスを探してください。
-これには、新しいプラットフォーム上でのテストと、コードの解析が必要です。
-テストでは、アプリの {@code targetSdkVersion} をこのプレビュー版に変えて、ランタイム パーミッションのオプトインに重点的にテストする必要があります。
-詳細については、<a href="{@docRoot}preview/setup-sdk.html#">Android N SDK のセットアップ</a>をご覧ください。
-
-
-</p>
-
-<p>
- パーミッションの取り消しと追加のさまざまな組み合わせをテストし、パーミッションに依存するユーザーフローを確認します。
-パーミッションへの依存性が明白または論理的ではない箇所では、依存性を取り除くため、またはパーミッションが必要な理由を明白にするために、フローのリファクタリングまたはコンパートメント化を検討する必要があります。
-
-
-</p>
-
-<p>
- ランタイム パーミッションの動作、テスト、ベスト プラクティスについては、Developer Preview ページの<a href="{@docRoot}preview/features/runtime-permissions.html">パーミッション</a>をご覧ください。
-
-
-</p>
-
-
-<h2 id="doze-standby">Doze とアプリ スタンバイをテストする</h2>
-
-<p>
- 省電力機能である Doze とアプリ スタンバイにより、端末がアイドル状態のときやそのアプリにフォーカスがないときに、アプリが実行できるバックグラウンド処理の量が制限されます。
-システムによってアプリに加えられる可能性のある制限には、ネットワーク アクセスの制限や停止、バックグラウンド タスクの停止、通知の停止、ウェイク リクエストの無視、アラームなどがあります。
-
-これらの省電力のための最適化が行われた状態で確実にアプリが適切に動作するように、これらの省電力状態をシミュレートしてアプリをテストする必要があります。
-
-
-</p>
-
-<h4 id="doze">アプリで Doze をテストする</h4>
-
-<p>アプリで Doze をテストするには: </p>
-
-<ol>
-<li>Android N のシステム イメージを使用して、ハードウェア端末または仮想端末を設定します。</li>
-<li>端末を開発マシンに接続し、アプリをインストールします。</li>
-<li>アプリを実行し、アクティブ状態のままにします。</li>
-<li>以下のコマンドを実行して、端末の Doze モードへの移行をシミュレートします。
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>端末がアクティブ状態に戻ったときのアプリの動作を観察します。端末が Doze モードから抜けるときに、アプリがスムーズに復帰することを確認します。
-</li>
-</ol>
-
-
-<h4 id="standby">アプリでアプリ スタンバイをテストする</h4>
-
-<p>アプリでアプリ スタンバイ モードをテストするには: </p>
-
-<ol>
- <li>Android N のシステム イメージを使用して、ハードウェア端末または仮想端末を設定します。</li>
- <li>端末を開発マシンに接続し、アプリをインストールします。</li>
- <li>アプリを実行し、アクティブ状態のままにします。</li>
- <li>以下のコマンドを実行して、アプリのスタンバイ モードへの移行をシミュレートします。
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>以下のコマンドを使用して、アプリのウェイクをシミュレートします。
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>アプリがウェイク状態に戻ったときのアプリの動作を観察します。アプリがスタンバイ モードからスムーズに復帰することを確認します。
-特に、アプリの通知とバックグラウンド ジョブが想定通りの動作を続けているかを確認する必要があります。
-</li>
-</ol>
-
-<h2 id="ids">アプリの自動バックアップと端末固有識別子</h2>
-
-<p>アプリが、Google Cloud Messaging の登録 ID などのなんらかの端末固有の識別子を内部ストレージに保持している場合、<a href="{@docRoot}preview/backup/index.html">アプリの自動バックアップ</a>の説明に従って、そのストレージのロケーションを自動バックアップの対象から除外してください。
-
-
-
- </p>
diff --git a/docs/html-intl/intl/ja/preview/license.jd b/docs/html-intl/intl/ja/preview/license.jd
deleted file mode 100644
index 64275cd..0000000
--- a/docs/html-intl/intl/ja/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=使用許諾契約
-
-@jd:body
-
-<p>
-Android SDK Preview をインストールする前に、次の利用規約に同意する必要があります。
-以下に記載するとおり、これは、Android SDK のプレビュー バージョンであり、変更される可能性があります。デベロッパーご自身の責任においてご使用ください。Android SDK Preview は安定したリリースではなく、お使いのコンピュータ システム、端末、データに深刻な影響を与える可能性のあるエラーまたは欠陥が含まれている場合があります。
-</p>
-
-<p>
-以下は、Android SDK Preview の使用許諾契約です（以下「本契約」）。
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. はじめに
-
-1.1 Android SDK Preview（以下、本契約で「Preview」という。具体的には利用可能な場合には Android システム ファイル、パッケージ型 API、Preview ライブラリ ファイルを含む）は、本契約の規定に従ってライセンス許可されます。本契約では、デベロッパーの Preview の使用に関して、デベロッパーと Google の間で法的拘束力のある契約を結びます。
-
-1.2 「Android」とは、Android オープンソース プロジェクト（http://source.android.com/ にて随時更新）にて利用可能な、端末向けの Android ソフトウェア スタックを意味します。
-
-1.3 「Android 互換」とは、（i）Android 互換ウェブサイト（http://source.android.com/compatibility）に掲載されており、随時アップデートされる可能性がある Android Compatibility Definition ドキュメントに準拠し、かつ（ii）Android Compatibility Test Suite（CTS）に合格した任意の Android 実装を指します。
-
-1.4 「Google」とは、1600 Amphitheatre Parkway, Mountain View, CA 94043, United States に主たる事業所を有するデラウェア州法人である Google Inc. を意味します。
-
-2. 本契約への同意
-
-2.1 Peview を使用するためには、本契約に同意する必要があります。本契約に同意しない場合は Preview を使用できません。
-
-2.2 同意するかまたは Preview を使用するためにクリックすると、本契約に同意したことになります。
-
-2.3 米国またはその他の国（デベロッパーが居住している国かまたはデベロッパーが Preview を使用する国を含む）の法律により Preview の使用を禁止されている人である場合、Preview を使用することも、使用許諾契約に同意することもできません。
-
-2.4 雇用主またはその他の事業体を代表または代理して本契約に拘束されることに同意し Preview を企業または組織の内部で使用する場合、担当者の雇用主またはその他の事業体を本契約に法的に拘束する完全な法的権限を有していることを表明および保証するものとします。担当者が必要な権限を有していない場合は、担当者の雇用主またはその他の事業体を代表または代理して、本契約に同意することも、Preview を使用することもできません。
-
-3. Google からの Preview ライセンス
-
-3.1 本契約の規定に従い、Google は Android 実装と互換性のあるアプリの開発に Preview を使用するための、限定的で、世界規模の、ロイヤリティ フリーな、譲渡不可、非排他的、サブライセンス不可なライセンスを付与するものとします。
-
-3.2 本 Preview は、別のプラットフォーム（Android 実装と互換性のないものも含む）のアプリの開発や別の SDK の開発には使用できません。本 Preview をその目的で使用しない場合は、Android 実装と互換性のないものを含め、自由に別のプラットフォームのアプリの開発を行うことができます。
-
-3.3 Preview に関するすべての法的権利、所有権、利益（Preview に含まれる知的財産権を含む）は Google またはサードパーティが所有するものとします。「知的財産権」とは、特許法、著作権法、営業秘密法、商標法、不当競争防止法に基づいて発生するすべての権利、およびその他のすべての所有権を意味します。デベロッパーに明示的に付与されていない権利は、すべて Google が所有します。
-
-3.4 本契約で明示的に許可されている目的以外においては、Preview を使用できません。当該のサードパーティのライセンスで必要とされる場合を除き、デベロッパーは、（a）Preview または Preview の一部をコピー（バックアップ目的を除く）、修正、改造、再配布、逆コンパイル、リバース エンジニアリング、逆アセンブルまたは派生物の作成、または（b）モバイル ハンドセットまたは個人用コンピュータ以外のハードウェア端末への Preview の読み込み、Preview と他のソフトウェアとの結合、または Preview の一部を組み込んだソフトウェアや端末の配布はできません。
-
-3.5 オープンソース ソフトウェア ライセンス下でライセンス付与された Preview のコンポーネントの使用、複製、配布は、本契約ではなく、そのオープンソース ソフトウェアのライセンスに準拠するものとします。デベロッパーは、許諾されるすべての権利下で、そのようなオープンソース ソフトウェア ライセンスに対して、良好な状態のライセンシーのままでいることに同意し、そのような権利を終了、停止、または違反する可能性のあるいかなる行為も差し控えることに同意するものとします。
-
-3.6 デベロッパーは、Google が提供する Preview の形式および性質は事前の通知なしに変更される場合があり、今後リリースされる Preview のバージョンでは、以前のバージョンの Preview で開発されたアプリとの互換性がない可能性があることに同意します。デベロッパーは、Google が事前の通知なく、Google の単独の裁量でデベロッパーまたはユーザーへの Preview（または Preview 内の一部の機能）の提供を（恒久的または一時的に）停止する場合があることに同意します。
-
-3.7 本契約のいかなる部分も、Google のいかなる商標名、商標、サービスマーク、ロゴ、ドメイン名、またはその他のブランド識別表示を使用する権利もデベロッパーに付与するものではありません。
-
-3.8 デベロッパーは、Preview に添付または収録されているすべての知的財産権に関する通知（著作権および商標の通知を含む）の削除、隠ぺい、改ざんを行わないことに同意します。
-
-4. デベロッパーによる Preview の使用
-
-4.1 Google は、本契約に基づき Preview を使用してデベロッパーが開発したソフトウェア アプリに関して、デベロッパー（またはデベロッパーのライセンサー）からいかなる権利、所有権、または利益（当該アプリに含まれる知的財産権を含む）も取得するものではないことに同意します。
-
-4.2 デベロッパーは、Preview を（a）本契約、および（b）該当する司法管轄区における適用される法律、規則、または一般に認められた慣行またはガイドライン（米国またはその他の該当国におけるデータまたはソフトウェアの輸出入に関する法律を含む）で認められている目的にのみ使用することに同意します。
-
-4.3 Preview を使用してアプリを開発する場合、デベロッパーはユーザーのプライバシーおよび法的権利を保護することに同意します。ユーザーからデベロッパーにユーザー名、パスワード、またはその他のログイン情報または個人情報が提供される場合、デベロッパーは、情報がデベロッパーのアプリに提供されることをユーザーに認識させ、当該ユーザーについてプライバシーに関する法的に十分な通知および保護を行わなければなりません。デベロッパーのアプリに個人情報または秘密情報が保存される場合、この保存は保護された方法で行われなければなりません。ユーザーからデベロッパーのアプリに Google アカウントの情報が提供された場合、デベロッパーのアプリでは、ユーザーが許可したタイミングで、かつユーザーが許可した限定された目的にのみ、当該情報を使用してユーザーの Google アカウントにアクセスすることが認められるものとします。
-
-4.4 デベロッパーは、Preview に関して、第三者（Google、およびあらゆる携帯電話会社を含むが、これらに限定されない）のサーバー、ネットワーク、またはその他の財産またはサービスへの妨害、中断、損害、または許可されていない態様でのアクセスとなる行為（そのような行為に該当する対象製品の開発または販売 / 配布を含む）に関与しないことに同意します。
-
-4.5 デベロッパーは、デベロッパーが Android および Android のアプリを介して作成、送信、表示するデータ、コンテンツ、リソース、および自身の行為の結果（Google に発生する可能性のあるあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
-
-4.6 デベロッパーは、本契約、適用される第三者の契約もしくは利用規約、または適用される法律もしくは規則に基づく自身の義務に違反したこと、および当該違反の結果（Google または第三者に発生したあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
-
-4.7 Preview は開発中であり、デベロッパーによるテスティングやフィードバックは開発プロセスの重要な一部となります。デベロッパーは、Preview の使用により、一部の機能の実装が開発中であると認識し、Preview が安定したリリースの完全な機能性を持つことに依存すべきでないことを認識するものとします。本 Preview は、公式の Android SDK のリリース後はサポート対象でなくなるため、デベロッパーは、Preview を使用するいかなるアプリも公然と配布または引き渡さないことに同意するものとします。
-
-5. デベロッパーの認証情報
-
-5.1 デベロッパーは、Google が発行した、またはデベロッパー自身で選択した、自身のデベロッパー用認証情報の秘密を保持する責任を負うこと、および自身のデベロッパー用認証情報のもとで開発されたすべてのアプリについて単独で責任を負うことに同意します。
-
-6. プライバシーおよび情報
-
-6.1 Google は、Preview の継続的な技術革新と改良のために、ソフトウェアから特定の使用統計情報（一意識別子、関連する IP アドレス、ソフトウェアのバージョン番号、Preview のどのツール/サービスがどのように使用されているかに関する情報を含むが、これらに限定されない）を収集できます。この情報が収集される前に、Preview に通知が表示され、デベロッパーの同意が求められます。デベロッパーが同意しない場合は、情報は収集されません。
-
-6.2 収集されるデータは、Preview の改良のために集約された形で精査され、Google のプライバシー ポリシー（http://www.google.com/policies/privacy/）に従って管理されます。
-
-7. 第三者のアプリ
-
-7.1 デベロッパーが、Preview を使用して第三者が開発したアプリを実行する、あるいは第三者から提供されたデータ、コンテンツ、リソースにアクセスする場合、デベロッパーは、Google がそれらのアプリ、データ、コンテンツ、リソースについて責任を負わないことに同意します。デベロッパーは、そのような第三者のアプリを介してアクセスするすべてのデータ、コンテンツ、リソースについては、それらを生成した者が単独で責任を負うものであり、Google はそれらの第三者のアプリ、データ、コンテンツ、またはリソースの使用もしくはアクセスによって生じたあらゆる損失および損害について一切責任を負わないことを理解します。
-
-7.2 デベロッパーは、そのような第三者のアプリを介して表示されるデータ、コンテンツ、リソースは、提供者（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。デベロッパーは、当該所有者からの明確な許可がない限り、それらのデータ、コンテンツ、リソース（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
-
-7.3 デベロッパーは、そのような第三者のアプリ、データ、コンテンツまたはリソースの使用が、デベロッパーと当該第三者間の別の規約に従うものであることを認識するものとします。
-
-8. Google API の使用
-
-8.1 Google API
-
-8.1.1 API を使用して Google からデータを取得する場合、デベロッパーは、そのデータは、Google またはデータを提供する事業体（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。そのような API の使用は追加の利用規約に従うものとします。デベロッパーは、当該の利用規約による許可がない限り、そのデータ（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
-
-8.1.2 デベロッパーは、API を使用して Google からユーザーのデータを取得する場合、ユーザーが明示的に同意した場合のみ、およびユーザーが許可したタイミングとその目的にのみ、データを取得できることを理解し、同意します。
-
-9. 本契約の終了
-
-9.1 本契約は、下記の規定に従ってデベロッパーまたは Google のいずれかによって解約されるまで、継続して適用されるものとします。
-
-9.2 デベロッパーが本契約の解約を希望する場合は、Preview および関連するデベロッパー認証情報の使用を停止することで、契約を終了するものとします。
-
-9.3 Google は、理由の有無にかかわらず、書面で通知することでいつでもデベロッパーとの本契約を解約することができます。
-
-9.4 本契約は事前の通知またはその他の措置なく、次のうち早い方に自動的に終了します。
-（A）Google が、デベロッパーが居住している国またはデベロッパーがサービスを使用する国での Preview または Preview の一部の配布を停止したとき。
-（B）Google が Android SDK の最終バージョンをリリースしたとき。
-
-9.5 本契約が終了すると、本契約で付与されていたライセンスは終了し、デベロッパーは速やかに Preview のすべての使用を停止するものとし、第 10 条、第 11 条、第 12 条、第 14 条の規定は無期限に効力を有するものとします。
-
-10.免責事項
-
-10.1 デベロッパーは、デベロッパーによる Preview の使用はデベロッパー自身の責任において行うものであること、および Preview は「現状有姿」かつ「提供可能な限りにおいて」、Google からのいかなる種類の保証もなく提供されるものであることを明示的に理解し、これに同意します。
-
-10.2 デベロッパーによる Preview および Preview の使用を通じてダウンロードまたはその他の方法で取得されたマテリアルの使用は、デベロッパー自身の裁量および責任において行うものであり、当該使用の結果として生じるデベロッパーのコンピュータ システムもしくはその他の端末への損害またはデータの喪失についての責任はデベロッパーが単独で負います。前述を制限することなく、Preview は安定したリリースではなく、コンピュータやその他の端末の利用の完全な回復不可能な損失を含む、重大な損害を引き起こす可能性のあるエラー、欠陥、およびセキュリティ上の脆弱性が含まれている可能性があることを理解します。
-
-10.3 Google はまた、商品性、特定目的への適合性、および権利侵害がないことの黙示的な保証および条件を含む（ただしこれらに限定されない）、明示的か黙示的かを問わずあらゆる種類のすべての保証および条件を明示的に否定します。
-
-11.責任の制限
-
-11.1 デベロッパーは、Google、その子会社および関連会社、ならびにそのライセンサーが、デベロッパーに発生した直接損害、間接損害、偶発的損害、特別損害、結果的損害、または懲罰的損害（データの喪失を含む）について、Google またはその代表者が当該損失が発生する可能性について告知されていたかどうか、または知っていたはずであるかどうかにかかわらず、いかなる責任法理のもとでもデベロッパーに対して責任を負わないことを明示的に理解し、これに同意します。
-
-12.補償
-
-12.1 法律で認められる最大限の範囲内において、デベロッパーは、（a）デベロッパーが Preview を使用したこと、および（b）デベロッパーが Preview で開発したアプリが他者のいかなる知的財産権を侵害していること、または他者の名誉を毀損している、もしくは他者のパブリシティ権もしくはプライバシー権を侵害していること、および（c）デベロッパーが本契約に違反したことから発生したあらゆる申し立て、普通法上の訴訟、衡平法上の訴訟、または法的手続き、ならびにあらゆる損失、責任、損害、費用、および経費（合理的な弁護士報酬を含む）について、Google、その関連会社、ならびに当該各社の取締役、役員、従業員、代理人を防御し、補償し、免責することに同意します。
-
-13.契約の変更
-
-13.1 Google は、Preview の新しいバージョンを配布することにより、いつでも本契約を変更することができます。変更が生じた場合、Google は、Preview の提供ウェブサイト上に使用許諾契約の改訂版を公開します。
-
-14.法的一般条項
-
-14.1 本契約は、デベロッパーと Google の間の法的な合意のすべてを表し、デベロッパーによる Preview の使用（別の契約下で Google が提供するサービスを除く）に適用され、Preview に関するデベロッパーと Google の間のあらゆる事前の合意に完全に取って代わるものです。
-
-14.2 デベロッパーは、Google が本契約に定める（または適用される法律のもとで Google が享受できる）法的な権利または救済措置を行使または執行しなかった場合でも、Google の権利が正式に放棄されたとはみなされないこと、および Google が以後も引き続き当該権利および救済措置を行使または執行できることに同意します。
-
-14.3 本件について判断を下す管轄権を有する司法裁判所によって、本契約のいずれかの条項が無効と判断された場合、当該条項は、本契約の残りの部分に影響を与えることなく本契約から削除されるものとします。本契約の残りの条項は、以後も引き続き有効かつ執行可能であるものとします。
-
-14.4 デベロッパーは、Google が親会社となっている各グループ企業が、本契約の第三受益者となること、および当該企業が、当該企業に利益（または受益権）を付与する本契約の条項を直接執行する、また当該条項に依拠する権利を有することを了承し、これに同意します。上記以外のいかなる人または法人も、本契約の第三受益者とはならないものとします。
-
-14.5 輸出規制。Preview は、米国輸出管理法令の対象です。デベロッパーは、Preview に適用されるすべての国内および国際の輸出管理法令に従わなければなりません。これらの法律には、仕向け地、ユーザー、および最終用途に関する制限が含まれます。
-
-14.6 デベロッパーは、Google から事前に書面で承認を得ずに、本契約を譲渡または移転することはできません。また、そのような承認を得ずに計画された譲渡はすべて無効になります。デベロッパーは、Google から事前に書面で承認を得ずに、本契約に基づく自身の責任または義務を他者に委任してはなりません。
-
-14.7 本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連するすべての申し立ては、米国カリフォルニア州の抵触法を除いて、カリフォルニア州法に準拠するものとします。デベロッパーおよび Google は、本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連する法的事項の解決について、米国カリフォルニア州サンタクララ郡に所在の連邦裁判所または州立裁判所が専属管轄権を有することに合意します。上記にかかわらず、デベロッパーは、Google が任意の司法管轄区において差し止め命令による救済（または同等の緊急法的救済）を求める申し立てを行うことが認められることに同意します。
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/preview/overview.jd b/docs/html-intl/intl/ja/preview/overview.jd
deleted file mode 100644
index e14b5fb..0000000
--- a/docs/html-intl/intl/ja/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=プログラム概要
-page.metaDescription= 次期 Android バージョン用のアプリを準備しましょう。
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- <strong>Android N Developer Preview</strong> では、Android の次のバージョンでアプリをテストして最適化するためのすべてを備えています。
-
-N Developer Preview ツールをダウンロードするだけで、無料ですぐにご利用いただけます。
-
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- ハードウェアとエミュレータのイメージ
- </h5>
-
- <p>
- さまざまな端末やエミュレータでアプリを実行してテストできます。
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 最新のプラットフォームのコード
- </h5>
-
- <p>
- プレビュー期間は毎月アップデートされるので、最新のプラットフォームで変更された箇所のテストを実施できます。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- デベロッパー不具合の優先
- </h5>
-
- <p>
- 最初の数週間でデベロッパーから報告された問題に優先的に対応するので、テストの実施とフィードバックはお早めにお願いします。
-
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- 新しい動作や機能
- </h5>
-
- <p>
- 新しいプラットフォーム動作への対応や、新機能を利用した開発を早い段階で開始できます。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- OTA 配信によるアップデート
- </h5>
-
- <p>
- Android ベータ版プログラムによるサポート対象端末の無線でのシームレスなアップデートに対応しています。
-そのため、イメージを書き込む必要がありません。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- フィードバックとサポート
- </h5>
-
- <p>
- <a href="{@docRoot}preview/bug">Issue Tracker</a> で問題を報告し、フィードバックをお送りください。
-<a href="{@docRoot}preview/dev-community">N デベロッパー コミュニティ</a>では、他のデベロッパーと情報交換をすることができます。
-
-
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">スケジュールとアップデート</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- N Developer Preview の対象期間は、2016 年 3 月 9 日から AOSP と OEM 向けの Android N の正式リリース（2016 年の第 3 四半期を予定）までの間です。
-
-</p>
-
-<p>
- 主要な開発マイルストーンでアップデートをリリースしますので、開発やテスト用の環境としてご利用ください。
-アップデートの間隔は基本的には各月（4 週から 6 週に 1 回）の予定です。
-マイルストーンについては、以下をご覧ください。
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong>（初回リリース、アルファ版）</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong>（追加アップデート、アルファ版）</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong>（追加アップデート、ベータ版）</li>
- <li><strong>Preview 4</strong>（最終版の API と正式な SDK、Google Play への公開）</li>
- <li><strong>Preview 5</strong>（最終テスト用の最終版とほぼ同じシステム イメージ）</li>
- <li>AOSP とエコシステムへの<strong>最終リリース</strong></li>
-</ul>
-
-<p>
- 各アップデートには、SDK ツールとプレビュー版のシステム イメージ、エミュレータ、参考資料、API の差分情報が含まれます。
-
-</p>
-
-<p>
- <strong>最初の 3 つのプレビュー マイルストーン</strong>では、<strong>初期段階のテストや開発用の環境</strong>を提供します。それを利用して既存のアプリにおける互換性の問題を特定し、新規プラットフォームへの移行や主な作業計画を立ててください。
-
-
-この期間は各種機能や API、ファイル互換性の問題など、あらゆるフィードバックを受け付けている貴重な期間です。ぜひ <a href="{@docRoot}preview/bug">Issue Tracker</a> を使用して、皆様のご意見をお聞かせください。
-
-
-いただいたフィードバックをもとに、一部の API を改善してアップデートで提供する予定です。
-</p>
-
-<p>
- <strong>Preview 4 と 5</strong> には、開発に使用する <strong>Android N の最終版の API と SDK</strong>、システム動作や機能のテストに使用する最終版とほぼ同じシステム イメージが含まれます。
-
-この時点で Android N の標準 API レベルが確定します。
-以後は既存アプリの最終的な互換性テストを開始し、Android N の API や機能を使った新しいコードを改善できるようになります。
-
-</p>
-
-<p>
- さらに Preview 4 以降では、正式な API レベルの Android N を搭載している<strong>端末にアプリを公開</strong>できるようになります（Android ベータ版プログラムにオプトインしたユーザーの端末などが対象）。
-
-なお、アプリは Google Play のアルファ版やベータ版のチャネルで先に配信できるので、ストア全体に公開する前に、Android ベータ版のユーザーに事前にアプリをテストしてもらうことが可能です。
-
-
-
-</p>
-
-<p>
- Android N でテストや開発を行う場合、プレビューのアップデートがリリースされるたびに<strong>開発環境を最新の状態に更新する</strong>ことを強くお勧めします。
-
-その際はテスト用の端末を Android ベータ版プログラムに登録して、マイルストーンごとに<strong>無線（OTA）でアップデート</strong>を取得するようにしておくと便利です。
-
-もしくはプレビュー イメージを手動でダウンロードして書き込むこともできます。
-
-</p>
-
-<p>
- プレビュー アップデートをご利用いただけるようになった際は <a href="http://android-developers.blogspot.com/">Android デベロッパー ブログ</a>、本サイト、<a href="{@docRoot}preview/dev-community">Android N デベロッパー コミュニティ</a>でお知らせします。
-
-
-</p>
-
-
-<h2 id="preview_tools">N Developer Preview の概要</h2>
-
-<p>
- N Developer Preview は、既存のアプリをさまざまな画面サイズ、ネットワーク テクノロジー、CPU や GPU チップセット、ハードウェア アーキテクチャでテストするために必要なものをすべて備えています。
-
-
-</p>
-
-<h3 id="sdk_tools">SDK ツール</h3>
-
-<p>各コンポーネントは <a href="{@docRoot}studio/intro/update.html">Android Studio</a> の SDK Manager を使ってダウンロードできます。</p>
-
-<ul>
- <li> N Developer Preview の <strong>SDK とツール</strong>
- <li> N Developer Preview の<strong>エミュレータ システム イメージ</strong>（32 ビット版と 64 ビット版）
- <li> N Developer Preview の <strong>Android TV 版エミュレータ システム イメージ</strong>（32 ビット版）
- <li> N Developer Preview サポート ライブラリ（新規アプリのテンプレート用）
-</ul>
-
-<p>
- 上記のツールは、必要に応じて各マイルストーンでアップデートします。
-</p>
-
-<h3 id="hardware_system_images">ハードウェアのシステム イメージ</h3>
-
-<p>
- N Developer Preview に含まれる Nexus などのハードウェアのシステム イメージを使用すると、実機でテストや開発ができます。
-ハードウェア イメージの一覧は、<a href="{@docRoot}preview/download.html">端末イメージ</a>のページでご確認ください。
-
-</p>
-
-<p>
- これらの端末用のシステム イメージは、各マイルストーンでアップデートします。アップデートされたシステム イメージは、何度でもダウンロードしてテスト用の端末に手動で書き込むことができます。
-
-自動化されたテスト環境では、繰り返し端末に再書き込みをする必要があるので、この方法は特に便利です。
-
-
-</p>
-
-<p class="note"><strong>注</strong>:
- 昨年のプレビュー版と同様に、<strong>手動で書き込みをした端末は OTA アップデートを取得できなくなります</strong>。
-そのため、今年は端末を Android ベータ版プログラムに登録して、OTA を取得するようにしてください。詳細は次のセクションに記載しています。
-
-</p>
-
-<h3 id="android_beta">Android ベータ版プログラムによる OTA アップデート</h3>
-
-<p>
- Android N は、新たに無線（OTA）アップデート プログラムに対応しています。このプログラムに登録している端末には、Android N の最新プレビュー版へのアップデートが直接自動配信されます。
-
-登録は無料で、Google アカウントに登録済みの対象端末を所有していれば誰でもご利用いただけます。
-
-</p>
-
-<p>
- このプログラムに登録するには、まず <a href="https://g.co/androidbeta">Android ベータ版プログラム</a>のサイトにアクセスします。
-このサイトには、Android ベータ版プログラムに登録可能なアカウントに登録済みの端末がすべて表示されます。
-
-
-</p>
-
-<ol>
- <li> Android N のアップデートを取得する端末を選択します。
- <li> [Enroll] をクリックして利用規約を読み、合意したら [OK] をクリックします。
-</ol>
-
-<p>
- 登録が完了すると、すぐに端末にアップデートが配信されます。ほとんどの場合、Android N に移行する際にデータのオールリセットは不要ですが、端末の登録前には大事なデータをバックアップしておくことをお勧めします。
-
-
-
-</p>
-
-<p>
- 端末にアップデートが配信されたら、できるだけ早めにダウンロードしてインストールするようにしてください。
-そうすることで常に最新のシステム UI や動作、API、さまざまな機能の変更点を把握できます。
-
-</p>
-
-<p>
- Developer Preview の終了時には、登録端末に Android N の正式リリース版へのアップデートが配信されます。
-
-</p>
-
-<p>
- 端末はいつでも Android ベータ版プログラムのサイトから Android ベータ版プログラムへの登録を解除できます。
-登録を解除する前には、端末のデータを必ずバックアップしておいてください。
-
-</p>
-
- <p class="note"><strong>注</strong>:
- 登録を解除すると、<strong>端末はファクトリー リセットされ</strong>、Android 6.0 Marshmallow の最新バージョンになります（端末を登録する前のバージョンに戻るとは限りません）。
-
-
-確実にクリーン インストールを行うため、連絡先やメッセージ、写真などの端末上のデータは削除されます。
-
-
-</p>
-
-<h3 id="documentation_and_sample_code">ドキュメントとサンプルコード</h3>
-
-<p>
- Developer Preview サイトにあるドキュメントで、Android N の詳細をご確認いただけます。
-
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Android N 向けの開発準備</a>では、はじめの手順をステップごとに説明しています。
-
-</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>には、集中的にテストを実施すべき箇所が記載されています。
-</li>
- <li> 新規 API に関するドキュメントには、<a href="{@docRoot}preview/api-overview.html">API 概要</a>、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>などが含まれています。また、マルチ ウィンドウのサポート、バンドル通知、マルチロケールのサポートなどの主要機能についての詳細なデベロッパー ガイドも含まれています。
-
-
-
- <li> <a href="{@docRoot}preview/samples.html">サンプルコード</a>では、パーミッションや他の新機能の使用方法を確認できます。
-
- <li> 現行バージョンの N Developer Preview の<a href="{@docRoot}preview/support.html#release-notes">リリースノート</a>では、変更履歴や差分レポートなどを確認できます。
-
-
-</ul>
-
-<h4 id="reference">ダウンロード可能な API リファレンス</h4>
-
-<p>
- 初期のプレビュー アップデートでは、<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Android N プラットフォーム用の API リファレンス</a>の最新版を個別の zip アーカイブとしてダウンロードできます。
-
-このリファレンスには差分レポートも含まれているので、API 23 や以前のアップデートからの API の変更点をご確認いただけます。
-
-
-</p>
-
-<p>
- Android N の API が最終決定して正式な API レベルが割り当てられた時点で、API リファレンスを <a href="https://developer.android.com">https://developer.android.com</a> で公開します。
-
-</p>
-
-<h3 id="support_resources">
- サポート リソース
-</h3>
-
-<p>
- N Developer Preview のテスト中や開発中は、以下の方法で不具合の報告やフィードバックの送信を行ってください。
-
-</p>
-
-<ul>
- <li> <strong>主なフィードバック手段</strong>は、<a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue Tracker</a> です。
-Issue Tracker を使うと、バグやパフォーマンスの問題、一般的なフィードバックを報告できます。
-さらに、<a href="{@docRoot}preview/bugs">既知の問題</a>や、その回避方法もご確認いただけます。
-
-報告いただいた問題は常に最新の情報に更新されるので、重要度が判定されたり、問題が Android エンジニア チームに引き継がれたことを確認できます。
- </li>
- <li> <a href="{@docRoot}preview/dev-community">Android N デベロッパー コミュニティ</a>は、Android N に携わっている<strong>デベロッパー同士がつながる</strong> Google+ のコミュニティです。Android N について意見交換をしたり、疑問点を解消したりする場としてご活用ください。Google はこのコミュニティを管理し、必要に応じて回答やアドバイスをします。
-
-
-
-</li>
-</ul>
-
-<h3 id="targeting">ターゲット、プレビュー API、公開</h3>
-
-<p>
- N Developer Preview では開発専用のシステムと、<strong>標準 API レベルを持たない</strong> Android ライブラリを提供します。
-アプリのテストで互換動作を除外する場合（強く推奨します）、アプリの <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code> を <code>“N”</code> に設定することで Android N の プレビュー版を対象にすることができます。
-
-
-
-
-</p>
-
-<p>
- Android N Developer Preview では、<strong>プレビュー API</strong> を提供しています。この API は、2016 年の第 3 四半期に予定している最終版 SDK のリリースまで正式版ではありません。
-
-そのため、プログラム開始後の数週間は特に、<strong>軽微な API 変更が発生することが予想されます</strong>。
-
-変更点の概要については、Android N Developer Preview がアップデートされるたびにお知らせします。
-
-</p>
-
-<p class="note">
- <strong>注</strong>:プレビュー API は変更される可能性がありますが、システムの基幹にかかわる機能には変更はありませんので、すぐにテストしていただけます。
-
-
-</p>
-
-<p>
- Google Play では <strong>N Developer Preview を対象としたアプリの公開を禁止しています</strong>。
-Android N の最終版 SDK がリリースされてからは、正式な Android N の API レベルを対象にして、アルファ版またはベータ版のリリース チャンネルでアプリを Google Play に公開できます。
-
-それまでは、Android N 向けのアプリをテスターに配信する場合は、電子メールで送付するか、自身のサイトから直接ダウンロードしてもらうようにしてください。
-
-
-</p>
-
-<p>
- AOSP と OEM 向けの Android N のフルリリースは 2016 年度の第 3 四半期を予定しています。その後は、Android N 向けのアプリを Google Play の公式リリース チャンネルで公開いただけます。
-
-
-</p>
-
-
-<h2 id="how_to_get_started">開始するには</h2>
-
-<p>
- 以下の手順で Android N を使用したアプリのテストを開始できます。
-</p>
-
-<ol>
- <li> <a href="{@docRoot}preview/api-overview.html">API 概要</a>や<a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>を参照して、新機能や自身のアプリへの影響をご確認ください。
-
-特に新しい<a href="{@docRoot}preview/features/notification-updates.html">通知</a>機能と<a href="{@docRoot}preview/features/multi-window.html">マルチ ウィンドウ</a>機能について把握しておくことをお勧めします。
-
-</li>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Preview SDK のセットアップ</a>手順に従い、ご利用の環境をセットアップしてテスト用端末の設定をします。
-</li>
- <li> <a href="https://developers.google.com/android/nexus/images">書き込み手順</a>に従い、最新の Android N のシステム イメージを自身の端末に書き込みます。
- </li>
- <li> <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>や <a href="{@docRoot}preview/samples.html">Android N のサンプル</a>を参考に API の新機能についてのインサイトを得て、それらを自身のアプリに利用する方法をご検討ください。
-
-
- <li> <a href="{@docRoot}preview/dev-community">Android N デベロッパー コミュニティ</a>に参加すると、最新のニュースを入手でき、新しいプラットフォームを利用している開発者同士で交流ができます。
-
-</li>
-</ol>
-
-<p>
- Android N Developer Preview プログラムへの参加をお待ちしています。
-</p>
diff --git a/docs/html-intl/intl/ja/preview/preview_toc.cs b/docs/html-intl/intl/ja/preview/preview_toc.cs
deleted file mode 100644
index 4b22608..0000000
--- a/docs/html-intl/intl/ja/preview/preview_toc.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html" es-lang="Información general del programa" in-lang="Ikhtisar Program" ja-lang="プログラム概要" ko-lang="프로그램 개요" pt-br-lang="Visão geral do programa" ru-lang="Обзор программы" vi-lang="Tổng quan về Chương trình" zh-cn-lang="计划概览" zh-tw-lang="程式總覽">プログラム概要</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">サポートとリリースノート</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html" es-lang="Configurar el SDK de la versión preliminar" in-lang="Menyiapkan Preview" ja-lang="Preview SDK のセットアップ" ko-lang="미리 보기 SDK 설정하기" pt-br-lang="Configuração do Preview SDK" ru-lang="Настройка пакета SDK Preview" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="设置预览版 SDK" zh-tw-lang="設定預覽版 SDK">Preview のセットアップ</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html" es-lang="Pruebe en un dispositivo" in-lang="Menguji pada Perangkat" ja-lang="デバイス上でテストする" ko-lang="기기에서 테스트" pt-br-lang="Testar em um dispositivo" ru-lang="Тестирование на устройстве" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="在设备上测试" zh-tw-lang="在裝置上測試">端末上でのテスト</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html" es-lang="Cambios en los comportamientos" in-lang="Perubahan Perilaku" ja-lang="動作の変更点" ko-lang="동작 변경" pt-br-lang="Mudanças de comportamento" ru-lang="Изменения в работе" vi-lang="Các thay đổi Hành vi" zh-cn-lang="行为变更" zh-tw-lang="行為變更">動作の変更点</a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html" es-lang="Optimizaciones en segundo plano" in-lang="Optimisasi Latar Belakang" ja-lang="バックグラウンド処理の最適化" ko-lang="백그라운드 최적화" pt-br-lang="Otimizações em segundo plano" ru-lang="Оптимизация фоновых процессов" vi-lang="Tối ưu hóa Chạy ngầm" zh-cn-lang="后台优化" zh-tw-lang="背景最佳化">バックグラウンド処理の最適化</a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html" es-lang="Idioma y configuración regional" in-lang="Bahasa dan Lokal" ja-lang="言語とロケール" ko-lang="언어 및 로케일" pt-br-lang="Idioma e localidade" ru-lang="Язык и языковой стандарт" vi-lang="Ngôn ngữ và Bản địa" zh-cn-lang="语言和区域设置" zh-tw-lang="語言和地區設定">言語とロケール</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html" es-lang="Información general de la API" in-lang="Android N untuk Pengembang" ja-lang="API の概要" ko-lang="API 개요" pt-br-lang="Visão geral da API" ru-lang="Обзор API-интерфейсов" vi-lang="Android N cho Nhà phát triển" zh-cn-lang="API 概览" zh-tw-lang="API 總覽">Android N for Developers</a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html" es-lang="Compatibilidad con ventanas múltiples" in-lang="Dukungan Multi-Jendela" ja-lang="マルチ ウィンドウのサポート" ko-lang="다중 창 지원" pt-br-lang="Suporte a várias janelas" ru-lang="Поддержка многооконного режима" vi-lang="Hỗ trợ đa cửa sổ" zh-cn-lang="多窗口支持" zh-tw-lang="多視窗支援">マルチ ウィンドウのサポート</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html" es-lang="Notificaciones" in-lang="Pemberitahuan" ja-lang="通知" ko-lang="알림" pt-br-lang="Notificações" ru-lang="Уведомления" vi-lang="Thông báo" zh-cn-lang="通知" zh-tw-lang="通知">通知</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html">データセーバー</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html" es-lang="Grabación de TV" in-lang="Perekaman TV" ja-lang="TV の録画" ko-lang="TV 녹화" pt-br-lang="Gravação para TV" ru-lang="Запись ТВ" vi-lang="Ghi lại TV" zh-cn-lang="TV 录制" zh-tw-lang="電視錄製">TV の録画機能</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html" es-lang="Configuración de seguridad de la red" in-lang="Network Security Configuration" ja-lang="ネットワーク セキュリティ構成" ko-lang="네트워크 보안 구성" pt-br-lang="Configurações de segurança de rede" ru-lang="Конфигурация сетевой безопасности" vi-lang="Cấu hình Bảo mật mạng" zh-cn-lang="网络安全配置" zh-tw-lang="網路安全性設定">ネットワーク セキュリティ構成</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html" es-lang="API de ICU4J del framework de Android" in-lang="ICU4J Android Framework API" ja-lang="ICU4J Android フレームワーク API" ko-lang="ICU4J Android 프레임워크 API" pt-br-lang="APIs de estrutura do Android para ICU4J" ru-lang="API-интерфейсы ICU4J в платформе Android" vi-lang="API Khuôn khổ Android ICU4J" zh-cn-lang="ICU4J Android 框架 API" zh-tw-lang="ICU4J Android 架構 API">ICU4J のサポート</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html" es-lang="Funciones del lenguaje Java 8" in-lang="Fitur Bahasa Java 8" ja-lang="Java 8 の機能" ko-lang="Java 8 언어 기능" pt-br-lang="Recursos de linguagem do Java 8" ru-lang="Возможности языка Java 8" vi-lang="Tính năng của Ngôn ngữ Java 8" zh-cn-lang="Java 8 语言功能" zh-tw-lang="Java 8 語言功能">Java 8 の言語機能</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html">Android for Work のアップデート</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html" es-lang="Acceso a directorios determinados" in-lang="Scoped Directory Access" ja-lang="特定のディレクトリへのアクセス" ko-lang="범위가 지정된 디렉터리 액세스" pt-br-lang="Acesso a diretórios com escopo" ru-lang="Доступ к выделенным каталогам" vi-lang="Truy cập Thư mục theo Phạm vi" zh-cn-lang="作用域目录访问" zh-tw-lang="限定範圍目錄存取">特定のディレクトリへのアクセス</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html" es-lang="Ejemplos" in-lang="Contoh" ja-lang="サンプル" ko-lang="샘플" pt-br-lang="Exemplos" ru-lang="Примеры" zh-cn-lang="示例" zh-tw-lang="範例">サンプル</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html" es-lang="Contrato de licencia" ja-lang="使用許諾契約" ko-lang="라이선스 계약" pt-br-lang="Contrato de licença" ru-lang="Лицензионное соглашение" zh-cn-lang="许可协议" zh-tw-lang="授權協議">使用許諾契約</a></div>
- </li>
-
-</ul>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/preview/samples.jd b/docs/html-intl/intl/ja/preview/samples.jd
deleted file mode 100644
index ec3f9f7d..0000000
--- a/docs/html-intl/intl/ja/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=サンプル
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- 以下は Android N のサンプルコードです。サンプルを Android Studio でダウンロードするには、<b>[File] > [Import Samples]</b> メニュー オプションを選択します。
-
-
-</p>
-
-<p class="note">
- <strong>注:</strong>以下のダウンロード可能なプロジェクトは、Gradle と Android Studio でご利用いただくために提供しています。
-
-</p>
-
-
-<h3 id="mw">マルチ ウィンドウ Playground</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- このサンプルでは、自身のアプリでマルチ ウィンドウのユーザー インターフェースを使用する方法をご確認いただけます。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">GitHub でサンプルを入手</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">アクティブ通知</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- NotificationCompat を使用して通知を送信するシンプルなサービスをご確認いただける既存のサンプルです。
-ユーザーからの未読メッセージは、それぞれ別の通知として送信されます。
-
-</p>
-<p>
- このサンプルは、Android N 向けの新たな通知機能を利用できるようにアップデートされています。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">GitHub でサンプルを入手</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">メッセージ サービス</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- 1 つのアプリで表示している通知の件数を NotificationManager で取得する方法をご確認いただける既存のサンプルです。
-
-
-</p>
-<p>
- このサンプルは、Android N 向けの新たな通知機能を利用できるようにアップデートされています。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">GitHub でサンプルを入手</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">ダイレクト ブート</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- このサンプルでは、端末の暗号化ストレージ内のデータにアクセスしたり、データを保存したりする方法をご確認いただけます。この機能は端末が起動している間は常に有効です。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">GitHub でサンプルを入手</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">特定のディレクトリへのアクセス</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- このサンプルでは、より少ないパーミッションで、特定のディレクトリに対するデータの読み出しや書き込みを行う方法をご確認いただけます。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">GitHub でサンプルを入手</a>
-
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/preview/setup-sdk.jd b/docs/html-intl/intl/ja/preview/setup-sdk.jd
deleted file mode 100644
index 37fa086..0000000
--- a/docs/html-intl/intl/ja/preview/setup-sdk.jd
+++ /dev/null
@@ -1,187 +0,0 @@
-page.title=Preview のセットアップ
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Android Studio 2.1 を入手する</a></li>
- <li><a href="#get-sdk">Android N SDK を入手する</a>
- <ol>
- <li><a href="#docs-dl">リファレンス ドキュメント</a>
- </ol>
- </li>
- <li><a href="#java8">Java 8 JDK を入手する</a></li>
- <li><a href="#create-update">プロジェクトをアップデートまたは作成する</a></li>
- <li><a href="#next">次のステップ</a></li>
-</ol>
- </div>
-</div>
-
-<p>このページで説明しているように、Android N Preview 向けのアプリを開発するには、デベロッパー環境をアップデートする必要があります。
-</p>
-
-<p>Android N システム イメージでアプリの互換性を簡単にテストするには、<a href="{@docRoot}preview/download.html">Android N 端末でのテスト</a>に関するガイドに従ってください。
-</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Android Studio 2.1 を入手する</h2>
-
-<p>Android N プラットフォームには、Jack と呼ばれる新しいコンパイラーが必要な <a href="{@docRoot}preview/j8-jack.html">Java 8 の言語機能</a>のサポートが追加されています。
-現在、最新バージョンの Jack は、Android Studio 2.1 のみでサポートされています。したがって、Java 8 の言語機能を使用する場合は、Android Studio 2.1 を使用してアプリをビルドする必要があります。
-
-
-それ以外の合は、Jack コンパイラーを使用する必要はありません。ただし、以下に説明するように、Android N プラットフォームに対応する設定でコンパイルを行うには、JDK 8 にアップデートする必要があります。
-
-</p>
-
-<p>既に Android Studio がインストールされている場合は、<strong>[Help] > [Check for Update]</strong>（Mac では、<strong>[Android Studio] > [Check for Updates]</strong>）をクリックして、Android Studio 2.1 以上であることを確認してください。
-
-</p>
-
-<p>Android Studio 2.1 以上がない場合は、<a href="{@docRoot}studio/">こちらから Android Studio 2.1 をダウンロード</a>してください。
-</p>
-
-
-<h2 id="get-sdk">N Preview SDK を入手する</h2>
-
-<p>Android N API を使用して開発を開始するには、次のステップに従って、Android Studio に Android N Preview SDK をインストールする必要があります。
-</p>
-
-<ol>
- <li><strong>[Tools] > [Android] > [SDK Manager]</strong> をクリックして、SDK Manager を開きます。
-</li>
-
- <li>[<strong>SDK Platforms</strong>] タブで、[<strong>Android N Preview</strong>] チェックボックスをオンにします。
-</li>
-
- <li>[<strong>SDK Tools</strong>] タブをクリックして、[<strong>Android SDK Build Tools</strong>]、[<strong>Android SDK Platform-Tools</strong>]、[<strong>Android SDK Tools</strong>] のチェック ボックスをオンにします。
-
-
-
- </li>
-
- <li>[<strong>OK</strong>] をクリックして、インストールするパッケージの使用許諾に同意します。
-
- </li>
-</ol>
-
-<h3 id="docs-dl">N Preview のリファレンス ドキュメントを入手する</h3>
-
-<p>
- Android N API に関する詳細は、N Preview のリファレンス ドキュメントに記載されています。このドキュメントは、次の表からダウンロードできます。
-
- このパッケージには、簡略化されたオフライン バージョンの Android デベロッパー ウェブサイト、Android N API のアップデートされた API リファレンス、API の比較レポートが含まれています。
-
-
-</p>
-
-<table>
- <tr>
- <th scope="col">ドキュメント</th>
- <th scope="col">チェックサム</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip">n-preview-3-docs.zip</a></td>
- <td width="100%">
- MD5:19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
- SHA-1:9224bd4445cd7f653c4c294d362ccb195a2101e7
- </td>
- </tr>
-<table>
-
-
-
-<h2 id="java8">Java 8 JDK を入手する</h2>
-
-<p>Android N プラットフォームに対応する設定でアプリをコンパイルしたり、Android Studio 2.1 でいくつかのツールを使用したりするには、Java 8 Developer Kit（JDK 8）をインストールする必要があります。
-したがって、最新バージョンを持っていない場合は、すぐに JDK 8 をダウンロードしてください。
-</p>
-
-<p>その後、次のステップに従って Android Studio で JDK のバージョンを設定します。</p>
-
-<ol>
- <li>Android Studio で Android プロジェクトを開いてから、<strong>[File] > [Project Structure]</strong> を選択して、[Project Structure] ダイアログを開きます
-
-（または、<strong>[File] > [Other Settings] > [Default Project Structure]</strong> を選択すると、すべてのプロジェクトの既定値を設定できます）。
-
-
- </li>
- <li>ダイアログの左側のパネルで、[<strong>SDK Location</strong>] をクリックします。
- </li>
- <li>[<strong>JDK Location</strong>] 項目に Java 8 JDK の場所を入力し（ファイルをブラウジングするには、右側のボタンをクリックします）、[<strong>OK</strong>] をクリックします。
-
-
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">プロジェクトをアップデートまたは作成する</h2>
-
-<p>
- Android N API を使用するには、プロジェクトが適切に構成されている必要があります。
-</p>
-
-<p>Java 8 機能の使用を計画している場合は、<a href="{@docRoot}preview/j8-jack.html">Java 8 機能</a>を読んで、サポートされる Java 8 機能に関する情報と、プロジェクトで Jack コンパイラーを設定する方法を確認してください。
-
-
-</p>
-
-
-<h3 id="update">既存のプロジェクトをアップデートする</h3>
-
-<p>モジュールの <code>build.gradle</code> ファイルを開き、次のように値をアップデートします。
-
-
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc3'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">新しいプロジェクトを作成する</h3>
-
-
-<p>Android N Preview SDK を使って、開発のために新しいプロジェクトを作成するには、次のステップを実行します。</p>
-
-<ol>
- <li><strong>[File] > [New Project]</strong> をクリックし、対象とする Android 端末のページに到達するまでのステップを実行します。
-
- </li>
- <li>このページで、[<strong>Phone and Tablet</strong>] オプションを選択します。</li>
- <li>[<strong>Phone and Tablet</strong>] オプションの下にある [<strong>Minimum SDK</strong>] オプション リストで、[<strong>N:
-
-Android API 23, N Preview (Preview)</strong>] を選択します。</li>
-</ol>
-
-
-<h2 id="next">次のステップ</h2>
-
-<ul>
- <li><a href="{@docRoot}preview/download.html">Android N 端末でのテスト</a>に関するガイドに従ってください。</li>
- <li>Android N プラットフォームの詳細については、<a href="{@docRoot}preview/behavior-changes.html">動作の変更点</a>と <a href="{@docRoot}preview/api-overview.html">Android N API とその機能</a>をご覧ください。
-
-
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/ja/preview/support.jd b/docs/html-intl/intl/ja/preview/support.jd
deleted file mode 100644
index bda763d..0000000
--- a/docs/html-intl/intl/ja/preview/support.jd
+++ /dev/null
@@ -1,1188 +0,0 @@
-page.title=サポートとリリースノート
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>このドキュメントの内容</h2>
-
-<ul>
- <li><a href="#dp3">Developer Preview 3</a>
- <ul>
- <li><a href="#general">一般的な注意事項</a></li>
- <li><a href="#new">DP3 の新機能</a></li>
- <li><a href="#ki">既知の問題</a></li>
- </ul>
- </li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- Android N Developer Preview で開発およびテストするときは、2 つの主なサポート チャンネルを使用できます。
-端末固有、システム、Google アプリのバグについては、<a href="https://developer.android.com/preview/bug">https://developer.android.com/preview/bug</a> で報告してください。
-他のアプリの問題については、デベロッパーに直接お問い合わせください。
-
-</p>
-
-<p>Android N に携わっている他のデベロッパーと問題やアイデアについて議論するには、<a href="{@docRoot}preview/dev-community">Developer Preview Google+ コミュニティ</a>にご参加ください。
-</p>
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>日付:2016 年 5 月<br>
- ビルド:NPD35K<br>
- エミュレータ サポート: x86 と ARM（32 / 64 ビット）<br>
- Google Play services:8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">一般的な注意事項</h3>
-
-<p>
- この Developer Preview リリースは、<strong>アプリのデベロッパーやその他の初期導入者</strong>を対象とし、日常的な使用、開発、互換性テストに使用できます。
-
-このリリースに関する次の一般的な事項に注意してください。
-
-</p>
-
-<ul>
- <li>このリリースでは、サポート対象端末でさまざまな<strong>安定性に関する問題</strong>が発生する可能性があります。
-カーネルパニックやクラッシュなど、システムが不安定になる可能性があります。
-
- </li>
-
- <li>一部のアプリは、新しいプラットフォーム バージョンで<strong>期待どおりに動作しない可能性があります</strong>。
-これには、Google のアプリやその他のアプリが含まれます。
- </li>
-
- <li>Developer Preview 3 は、次の端末で <strong>互換性テストスイート（CTS）の承認</strong>を得ています。
-Nexus 5X、Nexus 6、Nexus 6P、Pixel C。CTS 承認済みビルドに依存するアプリは、これらの端末で正常に動作します（Android Pay など）。
-
-
- </li>
-
- <li>Developer Preview 3 は、<strong>次のすべてのサポート対象端末で利用できます</strong>。
-Nexus 5X、Nexus 6、Nexus 6P、Nexus 9、Nexus Player、Pixel C、General Mobile 4G（Android One）、Sony Xperia Z3（D6603 と D6653 モデル）。
-
-
-
- </li>
-</ul>
-
-
-<h3 id="new">DP3 の新機能</h3>
-
-<h4 id="">Android 用 VR モード</h4>
-
-<p>
- Android N には、新しい VR モードのためのプラットフォーム サポートと最適化が追加され、デベロッパーは高品質のモバイル端末 VR エクスペリエンスをユーザーのために生み出すことができます。
-多数のパフォーマンス強化があり、VR アプリ用の CPU コアへの排他アクセスが含まれます。
-
-アプリでは、VR 用に動作するインテリジェントなヘッド トラッキングやステレオ方式の通知を利用できます。
-最も重要な点は、Android N によって大幅に遅延の少ないグラフィックが実現されることです。
-
-</p>
-
-<p>
- 詳細については、<a href="https://developers.google.com/vr/android/">Google VR SDK for Android</a> をご覧ください。
-</p>
-
-<h4 id="">パフォーマンス維持モード</h4>
-
-<p>
- Android N には、<a href="{@docRoot}preview/api-overview.html#sustained_performance_api">パフォーマンス維持モード</a>のオプション サポートが含まれており、OEM は長時間実行されているアプリの端末パフォーマンス機能に関するヒントを示すことができます。
-
-アプリのデベロッパーは、これらのヒントを使用して、長時間にわたって予測可能で一貫性のあるレベルの端末のパフォーマンスを維持できるようにアプリを調整できます。
-
-アプリのデベロッパーが Developer Preview でこの新しい API を試すことができるのは、Nexus 6P 端末上でのみです。
-
-</p>
-
-<h4>Multiprocess WebView</h4>
-
-<p>
- Android N のバージョン 51 以降は、デベロッパー オプションの [Multiprocess WebView] が有効になっている場合、WebView は別のサンドボックス プロセスでウェブ コンテンツを実行します。
-
-WebView チームは、将来のバージョンの Android で Multiprocess WebView を有効にする前に、N での互換性やランタイム パフォーマンスに関するフィードバックを求めています。
-
-このバージョンでは、スタートアップ時間、メモリ使用量の合計、ソフトウェア レンダリング パフォーマンスの低下が予想されます。
-
-</p>
-
-<p>
- マルチプロセス モードで予想外の問題が見つかった場合は、ご報告ください。
-<a href="https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">バグを報告</a>して WebView チームにご連絡ください。
-
-</p>
-
-<h4 id="">キーボード ショートカット ヘルパー</h4>
-
-<p>
- Android N では、ユーザーは <code>Meta+/</code> キーを押して<strong>キーボード ショートカット</strong>画面をトリガーできます。この画面には、システムとアプリから使用できるすべてのショートカットが表示されます。
-
-デベロッパーは、独自のショートカットを追加したり、アプリからショートカット画面をトリガーしたりできます。
-詳細については、<a href="{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">キーボード ショートカット ヘルパー</a>をご覧ください。
-
-</p>
-
-<h4 id="">FrameMetrics API</h4>
-
-<p>
- DP3 で導入された新しい <a href="{@docRoot}preview/api-overview.html#framemetrics_api">FrameMetrics API</a> により、アプリでその UI レンダリング パフォーマンスを監視できます。この機能は、アプリの現在のウィンドウのフレーム タイミング情報を転送するストリーミング pubsub API を公開することによって実現されます。<code>FrameMetricsListener</code> を使用して、より高い粒度で、USB 接続の必要なく、本番環境のインタラクション レベルの UI パフォーマンスを計測できます。
-
-
-
-
-
-</p>
-
-<h4 id="api-changes">機能と API の変更</h4>
-
-<dl>
- <dt>
- ランチャー ショートカットとランチャー ショートカットの API
- </dt>
-
- <dd>
- この機能は、Android の将来のリリースまで延期することを決定しました。次の Developer Preview 以降、公開 Android N API から、ランチャー ショートカットの API（ShortcutManager など）を削除することを計画しています。
-
-
- </dd>
-
- <dt>
- ページを読み込む前に WebView Javascript が実行される
- </dt>
-
- <dd>
- Android N 向けのアプリ以降、新しいページが読み込まれるときに、Javascript コンテキストがリセットされます。
-現在、コンテキストは、新しい {@link android.webkit.WebView} インスタンスで、最初に読み込まれるページに持ち越されます。
-
- Javascript を {@link
- android.webkit.WebView} に注入する予定のデベロッパーの方は、ページの読み込みが開始した後にスクリプトが実行されるようにしてください。
-
- </dd>
-
- <dt>
- 安全でないオリジンでの WebView の位置情報
- </dt>
-
- <dd>
- Android N 向けのアプリ以降、位置情報 API は安全なオリジン（HTTPS 経由）でのみ許可されます。
-このポリシーは、ユーザーが安全でない接続を使用しているときにユーザーの個人情報を保護するために設計されています。
-
- </dd>
-
- <dt>
- データセーバー
- </dt>
-
- <dd>
- Developer Preview 3 以降、アプリで、システム ダイアログを表示するためのインテントを使用できます。これにより、ユーザーはデータセーバーの免除ホワイトリストに直接アプリを追加できます。
-
-詳細については、<a href="{@docRoot}preview/api-overview.html#data_saver">データセーバーのドキュメント</a>をご覧ください。
-
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#number-blocking">迷惑電話のブロック</a>
- </dt>
-
- <dd>
- 許可されていないユーザーが番号をブロックまたはブロック解除しようとした場合、現在は {@link java.lang.SecurityException} が発生してエラーになります。
-以前は、{@link java.lang.UnsupportedOperationException} がスローされていました。
-
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">クイック設定タイル API</a>
-
- </dt>
-
- <dd>
- 現在は、タイルモードの決定に、アクティビティのメタデータが使用されます。
- 以前は、タイルモードは <code>TileService.onTileAdded()</code> の戻り値によって決定されていました。
-詳細については、ダウンロード可能な <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API リファレンス</a>の <code>TileService.META_DATA_ACTIVE_TILE</code> をご覧ください。
-
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">デベロッパーから報告された問題の修正</h4>
-
-<p>
- 次のものを含めて、デベロッパーから報告された問題が修正されました。
-</p>
-
-<ul>
- <li>Bluetooth 音声の再生が、1 曲の後で中断される（バグ <a href="https://code.google.com/p/android/issues/detail?id=206889">206889</a>）
- </li>
-
- <li>Pixel C が一貫してクラッシュする（バグ <a href="https://code.google.com/p/android/issues/detail?id=206962">206962</a>）
- </li>
-
- <li>時計とトーストの通知の問題（バグ <a href="https://code.google.com/p/android/issues/detail?id=203094">203094</a>）
- </li>
-
- <li>Pixel C を USB C ケーブル経由で MacBook Pro に接続すると、再起動します。（バグ <a href="https://code.google.com/p/android/issues/detail?id=205432">205432</a>）
-
- </li>
-
- <li>カレンダーの設定が 1 日オフセットされる（バグ <a href="https://code.google.com/p/android/issues/detail?id=203002">203002</a>）
- </li>
-
- <li>TelephonyManager.getAllCellInfo から無効なデータが戻される（バグ <a href="https://code.google.com/p/android/issues/detail?id=203022">203022</a>）
- </li>
-
- <li>Nexus 6p、Bluetooth が頻繁に接続しなくなる（バグ <a href="https://code.google.com/p/android/issues/detail?id=208062">208062</a>）
- </li>
-</ul>
-
-<p>修正された問題の一覧は、<a href="https://goo.gl/6uCKtf">Issue Tracker</a> をご覧ください。
-</p>
-
-<h3 id="ki">既知の問題</h3>
-
-<h4>ユーザー補助機能</h4>
-
-<ul>
- <li>ピッチを最大レベルに近く設定すると、TTS 出力が聞こえません。
- </li>
-
- <li>ユーザーがズーム操作や設定などの仕事用プロファイルを追加すると、ユーザー補助機能と設定が妨げられます。
-ユーザー補助機能に関連する設定を、ユーザーが後で操作すると、ユーザー補助機能の状態が復元されます。
-
- </li>
-</ul>
-
-<h4>カメラ</h4>
-
-<ul>
- <li>カメラアプリの動作が不安定で、マルチ ウィンドウ モードで起動したときなど、さまざまな状況でクラッシュします。
-
- </li>
-
- <li>パノラマモードでシャッターを続けて押すと、カメラアプリがクラッシュすることがあります。
-
- </li>
-</ul>
-
-<h4>音声</h4>
-<ul>
- <li>プラットフォームの音楽プレーヤーの問題により、一部のアプリが正常に動作しません。
-たとえば、Skype その他のアプリがこの問題の影響を受けます。
- </li>
-</ul>
-
-<h4>接続</h4>
-
-
-<ul>
- <li>Bluetooth Low Energy（BLE）周辺ロール端末がサービスをアドバタイズし、BLE セントラル ロール端末が接続すると、周辺ロール端末の接続が即座に切断されます。
-
-
- </li>
-
- <li>画面がオフになっているときに、Wi-Fi 接続が切れることがあります。
- </li>
-
- <li>RFCOMM 接続が不安定で、データが破損したり、接続が混乱することがあります。
-
- </li>
-
- <li>一部の制限された背景シナリオにおいて、アクティブ ネットワーク状態（{@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} と {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}）によって、誤った値が戻されることがあります。
-
- </li>
-</ul>
-
-
-<h4>
- ランチャー
-</h4>
-
-<ul>
- <li>画面のオンとオフを切り替えた後、既定のランチャーの [All Apps] トレイが応答しなくなることがあります。
-この問題は、ホーム画面に戻り、[All Apps] トレイを再起動することで解決する場合があります。
-
- </li>
-</ul>
-
-<h4>
- キーボード
-</h4>
-
-<ul>
- <li>Android 6.0 以前を実行する端末を N Developer Preview にアップデートすると、Google キーボードで、絵文字やサウンド設定などの設定が保持されません。
-
-
- </li>
-
- <li>Google Indic Managed キーボードが不安定になることがあります。
- </li>
-
- <li>パスワード項目にテキストを入力するとき、ユーザーは入力言語としてロシア語を選択できるにもかかわらず、キーボードは英語のままになります。
-このため、ユーザーはロシア語のパスワードを入力できません。
-
- </li>
-</ul>
-
-<h4>
- ロケールと言語
-</h4>
-
-<ul>
- <li>右から左（RTL）のロケールを使用しているとき、端末を再起動した後に、システムが予期せず左から右（LTR）の表示に切り替わることがあります。
-
- </li>
-</ul>
-
-<h4>メディア</h4>
-
-<ul>
- <li>Nexus 9 と Nexus Player のメディア再生の信頼性が低くなり、HD 動画の再生の問題も発生します。
-
- </li>
-</ul>
-
-<h4>
- マルチ ウィンドウ モード
-</h4>
-
-<ul>
- <li>マルチ ウィンドウ モードで画面の向きを変えているときに端末がフリーズすることがあります。
- </li>
-
- <li>現在、複数のアプリにマルチ ウィンドウ モードの問題があります。
- <ul>
- <li>マルチ ウィンドウで [Settings] > [Display] > [Screen brightness] をドッキングしているときに、システム UI がクラッシュすることがあります。
-
- </li>
-
- <li>カメラアプリをマルチ ウィンドウ モードで起動すると、クラッシュすることがあります。
- </li>
-
- <li>YouTube をマルチ ウィンドウ モードで起動すると、クラッシュすることがあります。[Storage] > [Apps] > [YouTube] で YouTube アプリのデータをクリアすると、この問題を修正できることがあります。
-
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Google Play services
-</h4>
-
-<ul>
- <li>ユーザーが ASCII 範囲外の文字や数字を使用するシステム ロケールを選択した場合に、Google Play services 経由で Google Cast を使用するアプリが不安定になることがあります。
-
-
- </li>
-</ul>
-
-<h4>
- Android for Work と Google Apps のデバイス ポリシー
-</h4>
-
-<ul>
- <li>[device policy status] 画面を固定した状態で、ユーザーが端末のロックを解除すると、デバイス ポリシー アプリがクラッシュすることがあります。
-
- </li>
-
- <li>ファイルベースの暗号化を有効にして仕事用プロファイルをセットアップした後で Work をオフにした場合、再度 Work アプリにアクセスするには、ユーザーはプライマリ プロファイル画面ロックを解除する必要があります。
-
-
- </li>
-
- <li>セキュリティ パターン ロックを削除し、仕事用または個人用のアプリをマルチ ウィンドウで開くと、端末が再起動します。
-
- </li>
-
- <li>DISALLOW_VPN_CONFIG を設定すると、デバイス ポリシー クライアントによって always-on-vpn に設定され、同意を求めるダイアログが表示されます。
-
- </li>
-
- <li>VPN が always-on-vpn モードで接続されるまで、トラフィックがロックダウンされません。
- </li>
-</ul>
-
-<h4>
- 外部ストレージ
-</h4>
-
-<ul>
- <li>ユーザーがアプリを内部ストレージから適用可能な外部ストレージ（SD カードや USB 接続された端末など）に移動した場合に、そのアプリが不安定になることがあります。
-
-
- </li>
-</ul>
-
-<h4>
- Google Play での画面ズームと複数の APK
-</h4>
-
-<ul>
- <li>Android N を実行する端末で、Google Play services 9.0.83 によって、安定した画面密度ではなく、現在の画面密度が誤って報告されます。
-これらの端末で画面ズームが有効になっていると、このことによって、より小さい画面向けに設計されたマルチ APK アプリのバージョンが Google Play によって選択されることがあります。
-
-この問題は、Google Play services の次のバージョンで修正され、その後の Developer Preview リリースに含められます。
-
-
- </li>
-
- <li>Android N を実行する端末で、現在、Google Play services 9.0.83 によって、Vulkan バージョンではなく、Vulkan サポートが報告されます。
-このことによって、より高いバージョンがサポートされた端末で、より低いバージョンの Vulkan サポート向けに設計されたマルチ APK アプリのバージョンが Google Play によって選択されることがあります。
-
-現在、Google Play ストアでは、Vulkan バージョンのターゲットを使用するアプリのアップロードは受け入れていません。
-このサポートは将来 Google Play Store に追加され、次のバージョンの Google Play services で修正されます（その後の Developer Preview リリースに含められます）。Google Play services 9.0.83 のバージョンを使用するすべての N 端末は、基本的な Vulkan サポートをターゲットとするアプリのバージョンを引き続き受信します。
-
-
-
-
- </li>
-</ul>
-
-<h4 id="">通知</h4>
-
-<ul>
- <li>MessagingStyle に、送信者が null（自分）の通知が表示されません。
- </li>
-</ul>
-
-<h4 id="">デベロッパー ツール</h4>
-
-<ul>
- <li>
- JDWP デバッグを使用している間に、<code>adb</code> の接続が切断されることがあります。
- </li>
-</ul>
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-
-
-
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>日付:2016 年 4 月<br>
- ビルド:NPC91K、NPC91O<br>
- エミュレータ サポート: x86 と ARM（32 / 64 ビット）<br>
- Google Play services:8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">DP2 の新機能</h3>
-
-<ul>
- <li>Vulkan のプラットフォーム サポートである、新しい 3D レンダリング API により、GPU（Graphics Processor Unit）を明示的に、かつ少ないオーバーヘッドで制御でき、ドローコールの多いアプリのパフォーマンスが向上しています。
-
-詳細については、<a href="{@docRoot}ndk/guides/graphics/index.html">ドキュメント</a>をご覧ください。
-
- </li>
-
- <li>新しい連絡帳アプリの絵文字では、肌色と、新しい Unicode 9 のグリフがサポートされます。
- 肌色と新しい絵文字は、キーボードのビルドにパレット内でのこれらに対するサポートが備えられるまで、表示されません。
-非システム フォントを使用するアプリを除き、アプリでこれらの新しい絵文字を利用するための操作は必要ありません。
-IME のデベロッパーは新しい絵文字のサポートを組み込む必要があります。
-
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">ランチャー ショートカットの API</a>:
-アプリでは <code>ShortcutManager</code> を使用して、それ自体の中の開始点へのショートカットを、ランチャーに送信できます。
-
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">マルチ ウィンドウ</a>:
- アクティビティに対して個別に最小の高さと幅を指定できるようになりました。
-さらに、複数の API の名前が少し変更されました。
- </li>
-</ul>
-
-<h4 id="dp2-fixes">デベロッパーから報告された問題の修正</h4>
-
-<p>
- 次のものを含めて、デベロッパーから報告された問題が修正されました。
-</p>
-
-<ul>
- <li>隠された SSID や、非ブロードキャスト Wi-Fi に接続できません。（バグ <a href="https://code.google.com/p/android/issues/detail?id=203116">203116</a>）
- </li>
-
- <li>マイクのミュート状態がアクティビティをまたいで保持されます。（バグ <a href="https://code.google.com/p/android/issues/detail?id=205922">205922</a>）
- </li>
-
- <li>マルチ ウィンドウのフォーカスを変更すると、YouTube が停止します。（バグ <a href="https://code.google.com/p/android/issues/detail?id=203424">203424</a>）
- </li>
-
- <li>ダイレクト リプライによって、開かれているアクティビティが閉じられることがあります。（バグ <a href="https://code.google.com/p/android/issues/detail?id=204411">204411</a>）
- </li>
-
- <li>安定性に関するさまざまな修正。
- </li>
-</ul>
-
-<h3 id="dp2-general">一般的な注意事項</h3>
-
-<p>
- この Developer Preview リリースは、<strong>アプリのデベロッパーのみ</strong>を対象とし、互換性テストと初期の開発のみで使用するために開発されています。
-
- このリリースに関する次の一般的な事項に注意してください。
-</p>
-
-<ul>
-
- <li>DP2 リリースで、開発ツールのコンポーネントとサポート ライブラリがアップデートされました。
-DP2 のための開発を行う前に、Preview 開発環境をアップデートしてください。
-開発環境のセットアップの手順については、<a href="{@docRoot}preview/setup-sdk.html">Preview のセットアップ</a>をご覧ください。
-
-
- </li>
-
- <li>このリリースには、すべての端末における安定性とパフォーマンスに関するさまざまな問題があるため、特に、デベロッパー以外の方が、<strong>スマートフォンやタブレットで日常的に使用することには適していません。</strong>
-
-
- </li>
-
- <li>このリリースでは、電池寿命とパフォーマンスがまだ最適化されていません。
-
-
- <ul>
- <li>システムとアプリの<strong>パフォーマンスが、定期的に遅くなるか、不自然になることがわかっており</strong>、端末が応答しなくなることがあります。
-これらの問題は、使用時間が長くなると、より深刻化します。
-
- </li>
-
- <li>このリリースでは、画面のオンとオフのユースケースで電池寿命が短くなることがあります。
-
- </li>
- </ul>
- </li>
-
- <li>Developer Preview 2 で、一部の<strong>アプリが正常に機能しないことがあります</strong>。これには Google のアプリと、その他のアプリが含まれます。
-
- </li>
-
- <li>この早期のビルドは、<strong>互換性テストスイート（CTS）で承認されていません</strong>。
-CTS 承認済みビルドに依存するアプリは動作しません（Android Pay など）。
-
- </li>
-
- <li>このプレビュー リリースでは、次の端末をサポートしています。Nexus 5X、Nexus 6、Nexus 6P、Nexus 9、Pixel C、および General Mobile 4G（Android One）
-
-Nexus Player は近い将来サポートされます。
- </li>
-
-
- <li>DP1 と DP2 の間の API の変更に対処するために、<a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> がアップデートされました。
-
- </li>
-</ul>
-
-<h3 id="dp2-ki">既知の問題</h3>
-
-<h4>パフォーマンスと電池</h4>
-
-<ul>
- <li>システムとアプリのパフォーマンスが、<strong>定期的に遅くなるか、不自然になる</strong>ことがわかっており、端末が応答しなくなることがあります。
-これらの問題は、使用時間が長くなると、より深刻化します。
-
- </li>
-</ul>
-
-<h4>Google アカウント</h4>
-
-<ul>
- <li>一部の状況において、<code>AccountManagerService</code> によって Google アカウントにログインできなくなる問題が発生することがあります。
-
- </li>
-</ul>
-
-<h4>システムアップデート</h4>
-
-<ul>
- <li>DP2 にアップデートすると、即座に端末が再起動します。
- </li>
-</ul>
-
-<h4>ユーザー補助機能</h4>
-
-<ul>
- <li>ピッチを最大レベルに近く設定したときの、テキスト読み上げ（TTS）出力が聞こえない問題。
-
- </li>
-</ul>
-
-<h4>Bluetooth</h4>
-
-<ul>
- <li>Bluetooth Low Energy（LE）GATT 特性によって、誤った書き込みタイプが使用され、リモート端末に送信されません。
-これにより、一部のフィットネス端末が機能しません。
-
- </li>
-</ul>
-
-<h4>セットアップ ウィザード</h4>
-
-<ul>
- <li>セットアップ ウィザードで、[Your Google Account] から、新しい端末（または新しくリセットされた端末）にデータを復元するオプションが動作しません。
-セットアップ ウィザードで [another Android device] を選択して既存の端末からデータを復元するか、新しい端末としてセットアップする必要があります。
-
-
- </li>
-</ul>
-
-<h4>OEM ロック解除</h4>
-
-<ul>
- <li>一部の端末では、DP2 の実行中、[Developer Options] の [<strong>Enable OEM unlock</strong>] がグレー表示されます。
-<br>
- <strong>回避策:</strong><a href="https://www.google.com/android/beta" class="external-link">www.google.com/android/beta</a> にアクセスし、Android ベータ版プログラムを導入します（まだ導入していない場合）。
-
-その後削除して、ダウングレード OTA を受け入れます。
-削除の結果、端末は Android 6.0 にダウングレードされます。これで、[Developer Options] の [<strong>Enable OEM unlock</strong>] を選択できるようになります。
-
-端末をダウングレードすると、個人データは消去されます。ただし、ブートローダーをロック解除したとしても、やはりこのデータは消去されます。
-
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>仕事用のセキュリティ確認
- <ul>
- <li>N に移行した後、またはユーザーが仕事用プロファイルを作成した後、ユーザーが自分のパターン、PIN またはパスワードを変更するか、仕事用のセキュリティ確認をセットアップするまで、プロファイルでキーストアにキーを作成できません。
-
-
- </li>
-
- <li>ダイレクト ブート モードで、端末にパスコード制限を適用すると、端末がロックされている場合でも、仕事用プロファイルがロック解除されます。
-
- これにより、端末ロック画面によって保護される必要がある場合にも、仕事用プロファイルにアクセスできるようになります。
-
- </li>
- </ul>
- </li>
-
- <li>Always On VPN
- <ul>
- <li>Always On VPN モードがオンで、VPN が使用できない場合、アプリが通常のネットワークで接続します。
-VPN 接続を使用できない場合、アプリはオフラインである必要があります。
-
- </li>
-
- <li>Always On モードがオンになっているとき、端末が再起動してダイレクト ブート モードになった後は、ユーザーがセキュリティ保護されたロック画面をロック解除した後でも、VPN 接続が確立されません。
-
-
- </li>
- </ul>
- </li>
-
- <li>パッケージの停止
- <ul>
- <li>[Telephone disabled] ダイアログが表示されているにもかかわらず電話をかけるなど、予期しない動作が発生する可能性がある場合、端末管理者は、重要なシステム パッケージを停止できます。
-
-
- </li>
- </ul>
- </li>
-
- <li>その他
- <ul>
- <li>{@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} が true に設定されていると、ユーザーが SD カードなどの物理メディアを挿入したときに、Settings アプリが起動時にクラッシュします。
-
- </li>
-
- <li>仕事用プロファイルでの最初のチェックが完了するまで数分かかります。
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>バインド番号と、ゼロでない最初のバインド番号のギャップにより、{@code vkCreateGraphicsPipeline()} が失敗します。
-</li>
- <li>Vulkan によって、投影されたテクスチャ座標に関する誤ったサンプリング動作が示されます。</li>
- <li>multithreadCmdBuffer サンプルで、N-DP2 ドライバを使用して {@code vkCmdClearColorImage()} を実行すると、クラッシュします。
-</li>
- <li>{@code vkGetPhysicalDeviceFormatProperties()} からの戻り値で、{@code VkFormatProperties::linearTilingFeatures} の値が設定されず、結果として 0 の値が取得されます。
-
-</li>
- <li>Vulkan 浮動小数点フレーム バッファの添付ファイルが正しく処理されません。</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>SPIR-V シェーダーによって、ドライバ アサートがトリガーされることがあります。</li>
- <li>一部のパイプライン構成によって {@code vkCreateGraphicsPipeline()} がクラッシュすることがあります。
-</li>
- </ul>
-</ul>
-
-<h4>端末固有の問題</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- 端末がスロット 1 からスロット 2 SIM に切り替わったときに、データ接続が失敗します。
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- 音声検索の [Always On] オプションを切り替えることができません。
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- HDR+ フォトを除き、カメラの縦向きの写真が破損します。
-
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- Nexus Player で、Netflix HD コンテンツの再生が失敗することがあります。
- </dd>
-
- <dd>
- 動的な動画の解像度変更に依存するすべてのアプリが、Nexus Player で失敗することがあります。
-
- </dd>
-
- <dd>
- VP9 動画コーデックを使用するすべてのアプリが、Nexus Player で失敗することがあります。
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>日付:2016 年 3 月<br>
- ビルド:NPC56P、NPC56R、アップデート:NPC56W、NPC56X<br>
- エミュレータ サポート: x86 と ARM（32 / 64 ビット）<br>
- Google Play services:8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">一般的な注意事項</h3>
-
-<p>
- この Developer Preview リリースは、アプリのデベロッパーのみを対象とし、互換性テストと初期の開発のみで使用するために開発されています。
-このリリースに関する次の一般的な事項に注意してください。
-
-</p>
-<ul>
- <li>このリリースには、すべての端末における安定性とパフォーマンスに関するさまざまな問題があるため、特に、デベロッパー以外の方が、<em>スマートフォンやタブレットで日常的に使用することには適していません。</em>
-
-
- </li>
-
- <li>システムとアプリのパフォーマンスが、<strong>定期的に遅くなるか、不自然になる</strong>ことがわかっており、端末が応答しなくなることがあります。
-これらの問題は、使用時間が長くなると、より深刻化します。
-
- </li>
-
- <li>このリリースでは、画面のオンとオフのユースケースで電池寿命が短くなることがあります。
-
- </li>
-
- <li>Developer Preview 1 で、一部のアプリが正常に機能しないことがあります。これには Google のアプリと、その他のアプリが含まれます。
-
- </li>
-
- <li>この早期のビルドは、互換性テストスイート（CTS）で承認されていません。CTS 承認済みビルドに依存するアプリは動作しません（Android Pay など）。
-
- </li>
-
- <li>このプレビュー リリースでは、次の端末をサポートしています。Nexus 5X、Nexus 6、Nexus 6P、Nexus 9、Nexus Player、Pixel C、および General Mobile 4G（Android One）
-
-
- </li>
-</ul>
-
-<h3 id="dp1-platform">プラットフォームの問題</h3>
-
-<h4>パフォーマンスと電池</h4>
-
-<ul>
- <li>システムとアプリのパフォーマンスが、<strong>定期的に遅くなるか、不自然になる</strong>ことがわかっており、端末が応答しなくなることがあります。
-これらの問題は、使用時間が長くなると、より深刻化します。
-
- </li>
-
- <li>このリリースでは、画面のオンとオフのユースケースで電池寿命が短くなることがあります。
-
- </li>
-</ul>
-<h4 id="dialer">電話</h4>
-
-<ul>
- <li>電話アプリではダイレクト ブートがサポートされていません。このことは、将来、N Developer Preview で対応されます。
-
- </li>
-
- <li>ボイスメールの再生が動作しません。
- </li>
-</ul>
-
-<h4>マイク</h4>
-
-<ul>
- <li>アプリの再起動をまたいで、マイクのミュート状態が誤って保持されることがあります。あるアプリでマイクをミュートし、その状態が保持されている場合は、マイクのミュート制御機能のある任意のアプリを開き、マイクのミュートを解除してください。</li>
-</ul>
-
-<h4 id="ui">システム UI</h4>
-
-<ul>
- <li>システム UI の、一部の新しいまたは変更された文字列の中に、すべての言語には翻訳されていないものがあります。
-
- </li>
-
- <li>[Overview] の UI は現在開発中であり、変更されることがあります。たとえば、ユーザーがアプリを切り替えたときに表示されるタイマーを削除する予定です。
-
-
- </li>
-
- <li>設定のコントロールとトグルが遅いか、応答しないように見えます。
- </li>
-
- <li>通知の視覚的デザインは変更されることがあります。
- </li>
-
- <li>Gmail アプリで、通知バンドルに含まれるメールの直接アーカイブが正常に動作しません。
-
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>仕事用のセキュリティ確認
- <ul>
- <li>N に移行した後、またはユーザーが仕事用プロファイルを作成した後、ユーザーが自分のパターン、PIN またはパスワードを変更するか、仕事用のセキュリティ確認をセットアップするまで、プロファイルでキーストアにキーを作成できません。
-
-
- </li>
-
- <li>ダイレクト ブート モードで、端末にパスコード制限を適用すると、端末がロックされている場合でも、仕事用プロファイルがロック解除されます。
-
- これにより、端末ロック画面によって保護される必要がある場合にも、仕事用プロファイルにアクセスできるようになります。
-
- </li>
-
- <li>ユーザーが誤ったパスワードと PIN を入力したときに、情報メッセージが表示されず、入力項目が消去されるのみです。
-
-この問題は指紋入力のパターンには影響しません。
- </li>
-
- <li>タブレットで、仕事用のセキュリティ確認で表示される背景が不相応に小さくなります。
-
- </li>
-
- <li>N Developer Preview にバンドルされている <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">Google Apps のデバイス ポリシー</a>のバージョン では、仕事用プロファイルのセキュリティ確認機能がまだサポートされていません。
-
-
- デベロッパーは、この機能をテストする場合は、代わりに <a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> を使用する必要があります。
-
- </li>
- </ul>
- </li>
-
- <li>Always On VPN
- <ul>
- <li>Always On VPN モードがオンで、VPN が使用できない場合、Always On ポリシーの例外として指定されていないアプリが通常のネットワークで接続します。
-
-Always On VPN ポリシーの例外として指定されていない限り、VPN 接続を使用できない場合、アプリはオフラインである必要があります。
-
- <ul>
- <li>Always On モードがオンになっているとき、端末が再起動してダイレクト ブート モードになった後は、ユーザーがセキュリティ保護されたロック画面をロック解除した後でも、VPN 接続が確立されません。
-
-
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>連絡先の改善
- <ul>
- <li>Bluetooth PBAP / MAP 端末で、仕事用連絡先の発信者番号が表示されません。
-この問題は Preview の次のリリースで解決されます。
- </li>
- </ul>
- </li>
-
- <li>ワークモード
- <ul>
- <li>Google Now ランチャーで、ワークモードがオンかオフかが表示されません。
-また、ランチャーにはアプリの保留状態も表示されません。
- </li>
-
- <li>ユーザーがワークモードのオンとオフを切り替えた後、カレンダーなどの仕事用プロファイルのアプリ ウィジェットが表示されなくなります。
-
- </li>
- </ul>
- </li>
-
- <li>パッケージの停止
- </li>
-
- <li>[Telephone disabled] ダイアログが表示されているにもかかわらず電話をかけるなど、予期しない動作が発生する可能性がある場合、端末管理者は、重要なシステム パッケージを停止できます。
-
-
- </li>
-
- <li>その他
- <ul>
- <li>{@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} が true に設定されていると、ユーザーが SD カードなどの物理メディアを挿入したときに、Settings アプリが起動時にクラッシュします。
-
- </li>
-
- <li>ユーザーがアプリをアンインストールした後で再インストールしたときに、{@code DPM.setPackagesSuspended} 状態が保持されません。
-アンインストールと再インストールの後、アプリが停止されたままになるか、停止されたアプリはアンインストール可能にならないかのいずれかである必要があります。
-
-
- </li>
-
- <li>仕事用プロファイルでの最初のチェックが完了するまで数分かかります。
-これにより、端末が Play EMM API によって認識されるまでに、通常よりも長い時間がかかる場合があります。
-
- </li>
-
- <li>仕事用プロファイル アプリからの通知が、個人プロファイルにインストールされた通知リスナによって認識されません。
-その結果、通知が期待どおりに表示されません。
-
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >キーボード</h4>
-
-<ul>
- <li>キーボードと Android 端末の間の Bluetooth ペア設定が不安定になることがあります。
- </li>
-</ul>
-
-<h4 >動画</h4>
-
-<ul>
-<li>動画の再生が遅延したり中断されたりします。</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>Wi-Fi に対して行われたリファクタリングにより、API のコーナーケースの動作が変化する場合があります。
-特に、特定のネットワークへの接続や、ネットワークへの再接続を試みるアプリについては、再テストの必要があります。
-
- </li>
-
- <li>以前の DHCP クライアントがプラットフォームから削除されました。プラットフォームでサポートされる DHCP は、M で導入された DHCP クライアントのみとなります。
-
- </li>
-</ul>
-
-<h4>ダイレクト ブート</h4>
-
-<ul>
- <li>NFC は最初にロック解除するまで機能しません。
- <ul>
- <li>Bluetooth が有効なスマートフォンを再起動したときに、Bluetooth が自動的にオンになりません。
-手動で Bluetooth を再度有効にする必要があります。
- </li>
-
- <li>一部の状況において、電話やメッセージに対して既定の着信音が鳴りません。
-この動作は、1 つの例外（と回避策）を除き、次の N Preview リリースで修正されます。
-
- </li>
-
- <li>ワイプされた直後でない端末、つまり、ダイレクト ブート モードに設定された後で少なくとも 1 回起動された端末では、既定の通知着信音が鳴りません。
-
-ユーザーは、[Settings] から手動で着信音を選択することで、この問題を回避できます。
-
- </li>
-
- <li>ダイレクト ブートは、N Developer Preview ビルドが実行される端末では、既定で有効になっていません。
-テストや開発のためにダイレクト ブートを有効にするには、[Developer Options] に移動して [Convert to File Encryption] をタップします。
-
- この Developer Preview では、このことを行うには、ファクトリ リセットによって再パーティション化し、端末をファイルベースの暗号化向けにリフォーマットする必要があります。
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>Android TV のピクチャ イン ピクチャ</h4>
-
-<ul>
- <li>[Recents] の UI における PIP 統合は最終版ではなく、変更されることがあります。
-
- <ul>
- <li>PIP ウィンドウのアニメーションが滑らかではありません。Preview の将来のリリースで、このことが改善されます。
-
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">Preview の将来のリリースで、PIP の視覚的デザインとレイアウトの整列が改善されます。
-
- </li>
-</ul>
-
-<h4>バグ報告</h4>
-
-<ul>
- <li>バグ報告は必ずしも正常に完了しません（回避策として、内部ストレージのバグ報告ドキュメント プロバイダからアクセスできるようになっている場合があります）。
-
-
- </li>
-</ul>
-
-<h4>マルチ ウィンドウでの分割画面</h4>
-
-<ul>
- <li>分割画面モードにすると、アプリがクラッシュし、予期しない UI 動作が発生することがあります。
-これらはアプリの問題であり、アプリのデベロッパーが修正する必要があります。
-
- </li>
-
- <li>Android プラットフォームの N より前のバージョンをターゲットとするアプリは、複数回表示される分割画面トーストが動作しません。
-
- </li>
-
- <li>画面の向きが固定されたアプリを使用しているときに [Overview] ボタンを長押しすると、アプリに予期しない動作が発生します。
-
- </li>
-
- <li>サイズ変更中にアプリの表示がちらつくことがあります。
- </li>
-
- <li>アニメーションはまだ完成していません。
- </li>
-</ul>
-
-<h4>入力方法</h4>
-
-<ul>
- <li><b>システム言語を使用している</b>ときに、Google キーボードが予期せず汎用的な Google キーボードにフォールバックしますが、Google キーボードではシステム言語設定で選択されている言語がいずれもサポートされていません。
-
-米国英語にフォールバックする必要があります。
-
- <p>
- Google キーボードでサポートされる、少なくとも 1 つの言語を追加することで、この問題を回避できます。
-
- </p>
- </li>
-</ul>
-
-<h4>ユーザー補助機能</h4>
-
-<ul>
- <li>TalkBack で通知、クイック設定タイル、マルチ ウィンドウ表示などの機能に問題が発生し、システムがクラッシュするか、TalkBack からの音声フィードバックがなくなります。
-
-Preview の将来のリリースで、この問題に対処します。
-
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">端末固有のノートと問題</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>このリリースの Preview の Nexus Player では、動画再生、アプリの互換性と安定性の問題が発生することがあります。
-
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>マルチ ウィンドウのサイズ変更によってクラッシュが発生することがあります。</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Nexus 9 の端末が、Android ベータ版プログラムを経由して over-the-air（OTA）アップデートを受信した後、起動しません。
-OTA イメージを手動でインストールすると、この問題が解決することがあります。
-詳細については、<a href="{@docRoot}preview/download-ota.html">端末の OTA イメージの適用</a> をご覧ください。
-
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/ja/training/articles/direct-boot.jd b/docs/html-intl/intl/ja/training/articles/direct-boot.jd
new file mode 100644
index 0000000..933e682
--- /dev/null
+++ b/docs/html-intl/intl/ja/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=ダイレクト ブート
+page.keywords=preview,sdk,direct boot
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>このドキュメントの内容</h2>
+ <ol>
+ <li><a href="#run">ダイレクト ブート中に実行するためのアクセスを要求する</a></li>
+ <li><a href="#access">端末暗号化ストレージにアクセスする</a></li>
+ <li><a href="#notification">ユーザーによる端末のロック解除の通知を受信する</a></li>
+ <li><a href="#migrating">既存のデータを移行する</a></li>
+ <li><a href="#testing">暗号化対応アプリをテストする</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Android N は、電源を入れたときにユーザーが端末のロックを解除していない場合、セキュリティで保護された <i>ダイレクト ブート</i> モードで実行します。
+
+この機能をサポートするため、システムで次の 2 つの保存先を使用できるようになります。</p>
+
+<ul>
+<li><i>認証情報暗号化ストレージ。</i>これはデフォルトの保存先で、ユーザーが端末のロックを解除した後にだけ使用できます。
+</li>
+<li><i>端末暗号化ストレージ。</i>この保存先は、ダイレクト ブート モード中とユーザーが端末のロックを解除した後の両方で使用できます。
+</li>
+</ul>
+
+<p>デフォルトで、ダイレクト ブート モード中はアプリは実行されません。ダイレクト ブート モード中にアプリで操作を実行する必要がある場合、このモードで実行するアプリ コンポーネントを登録できます。
+
+ダイレクト ブート モードでアプリの実行が必要になる一般的な使用例は次のとおりです。
+</p>
+
+<ul>
+<li>アラーム クロック アプリなど、通知がスケジュールされているアプリ。
+</li>
+<li>SMS アプリなど、重要なユーザー通知を表示するアプリ。</li>
+<li>Talkback など、ユーザー補助機能サービスを提供するアプリ。</li>
+</ul>
+
+<p>ダイレクト ブート モードで実行中にアプリがデータにアクセスする必要がある場合は、端末暗号化ストレージを使用します。
+端末暗号化ストレージにはキーで暗号化されたデータが保存され、端末がセキュアブートに成功した場合にのみこのデータを使用できます。
+
+</p>
+
+<p>ユーザーの認証情報に関連付けたキーで暗号化しなければならない PIN やパスワードなどのデータには、認証情報暗号化ストレージを使用します。認証情報暗号化ストレージは、ユーザーが端末のロック解除に成功した後に使用可能になり、ユーザーが端末を再起動するまでアクセスできます。
+
+
+ユーザーが端末をロック解除した後にロック画面を有効にしても、認証情報暗号化ストレージはロックされません。
+
+</p>
+
+<h2 id="run">ダイレクト ブート中に実行するためのアクセスを要求する</h2>
+
+<p>ダイレクト ブート モード中にアプリを実行したり、端末暗号化ストレージにアクセスしたりするには、アプリ コンポーネントの登録が必要です。
+
+アプリをシステムに登録するには、コンポーネントが
+<i>暗号化対応するように指定します。</i>コンポーネントが暗号化対応するよう指定するには、マニフェスト内で
+<code>android:directBootAware</code> 属性を true に設定します。<p>
+
+<p>暗号化対応コンポーネントを登録しておくと、端末を再起動したときにシステムから
+<code>LOCKED_BOOT_COMPLETED</code> ブロードキャスト メッセージを受信できます。
+この時点で端末暗号化ストレージが使用できるようになり、ダイレクト ブート モード中にコンポーネントが実行しなければならないタスクを実行できます。たとえば、スケジュールしたアラームのトリガーなどが該当します。
+
+</p>
+
+<p>次のコード スニペットは、アプリのマニフェスト内で
+{@link android.content.BroadcastReceiver} を暗号化対応として登録し、<code>LOCKED_BOOT_COMPLETED</code> のインテント フィルタを追加する方法の例を示しています。
+</p>
+
+<pre>
+<receiver
+ android:directBootAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>ユーザーが端末のロックを解除すると、すべてのコンポーネントは端末暗号化ストレージと認証情報暗号化ストレージの両方にアクセスできます。
+</p>
+
+<h2 id="access">端末暗号化ストレージにアクセスする</h2>
+
+<p>端末暗号化ストレージにアクセスするには、
+<code>Context.createDeviceProtectedStorageContext()</code> を呼び出して追加の
+{@link android.content.Context} インスタンスを作成します。このコンテキストで実行されたストレージ API 呼び出しはすべて、端末暗号化ストレージにアクセスします。
+次の例では、端末暗号化ストレージにアクセスして既存のアプリのデータ ファイルを開きます。
+
+</p>
+
+<pre>
+Context directBootContext = appContext.createDeviceProtectedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>端末暗号化ストレージは、ダイレクト ブート モード中にアクセスが必要な情報のみに使用してください。汎用的な暗号化された保存先として、端末暗号化ストレージを使用することはできません。ユーザーの個人情報や、ダイレクト ブート モード中に特に必要ではない暗号化されたデータには、認証情報暗号化ストレージを使用してください。
+
+
+
+</p>
+
+<h2 id="notification">ユーザーによる端末のロック解除の通知を受信する</h2>
+
+<p>再起動後にユーザーが端末のロックを解除すると、アプリは認証情報暗号化ストレージへのアクセスに切り替えて、ユーザーの認証情報に応じて通常のシステム サービスを使用します。
+
+</p>
+
+<p>再起動後、ユーザーが端末のロックを解除したときに通知を受信するには、実行中のコンポーネントから {@link android.content.BroadcastReceiver} を登録して、<code>ACTION_USER_UNLOCKED</code> メッセージをリッスンするようにします。
+
+または、既存の {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED} メッセージを受信することもできます。このメッセージは、端末が起動してユーザーが端末のロックを解除したことを示すようになりました。
+
+</p>
+
+<p>
+<code>UserManager.isUserUnlocked()</code> を呼び出して、ユーザーが端末のロックを解除したかを直接問い合わせることもできます。</p>
+
+<h2 id="migrating">既存のデータを移行する</h2>
+
+<p>ユーザーが端末をアップデートしてダイレクト ブート モードを使用できるようになると、既存のデータを端末暗号化ストレージに移行しなければならない場合があります。
+
+<code>Context.moveSharedPreferencesFrom()</code> および
+<code>Context.moveDatabaseFrom()</code> を使用すると、設定およびデータベースのデータを認証情報暗号化ストレージと端末暗号化ストレージ間で移行できます。
+</p>
+
+<p>どのデータを認証情報暗号化ストレージから端末暗号化ストレージに移行するかは、慎重に判断してください。
+パスワードや承認トークンなどのユーザーの個人情報は、端末暗号化ストレージに移行しないでください。
+
+場合によっては、この 2 つの暗号化された保存先に、データセットを振り分けて管理する必要があります。
+</p>
+
+<h2 id="testing">暗号化対応アプリをテストする</h2>
+
+<p>新しいダイレクト ブート モードを使用して、暗号化対応アプリをテストしてみましょう。ダイレクト ブートを有効にする方法は 2 つあります。
+</p>
+
+<p class="caution"><strong>警告:</strong>ダイレクト ブートを有効にすると、端末上のすべてのユーザーデータが消去されます。
+</p>
+
+<p>Android N がインストールされたサポート対象端末では、次のいずれかの方法を使用してダイレクト ブートを有効にします。
+</p>
+
+<ul>
+<li>端末で、<b>[Developer options]</b> がまだ有効になっていない場合は、次の手順で有効にします。<b>[Settings] > [About phone]</b> で <b>[Build number]</b> を 7 回タップします。
+
+[Developer options] 画面が表示されたら、<b>[Settings] > [Developer options]</b> で <b>[Convert to file encryption]</b> を選択します。
+
+</li>
+<li>次の adb shell コマンドを使用して、ダイレクト ブート モードを有効にします。
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>テスト端末でモードの切り替えが必要な場合、エミュレーションされたダイレクト ブート モードも使用できます。
+データが失われるおそれがありますので、EMULATED モードは開発中にのみ使用してください。
+エミュレーションされたダイレクト ブート モードを有効にするには、端末でロック パターンを設定します。ロック パターンの設定時にセキュリティで保護されたスタートアップ画面について確認メッセージが表示された場合は、[No thanks] を選択します。次に、次の adb shell コマンドを使用します。
+
+
+</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>エミュレーションされたダイレクト ブート モードを無効にするには、次のコマンドを使用します。</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>これらのコマンドを使用すると、端末が再起動されます。</p>
diff --git a/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..32681a0
--- /dev/null
+++ b/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd
@@ -0,0 +1,148 @@
+page.title=特定のディレクトリへのアクセス
+page.keywords=preview,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>このドキュメントの内容</h2>
+ <ol>
+ <li><a href="#accessing">外部ストレージのディレクトリへのアクセス</a></li>
+ <li><a href="#removable">リムーバブル メディアのディレクトリへのアクセス</a></li>
+ <li><a href="#best">ベスト プラクティス</a></li>
+ </ol>
+</div>
+</div>
+
+<p>写真アプリなどは通常、外部ストレージの特定のディレクトリ（<code>Pictures</code> ディレクトリなど）のみにアクセスする必要があります。
+外部ストレージへのアクセスに関する従来のアプローチでは、このようなアプリに目的のディレクトリへのアクセスを容易に提供できる設計にはなっていませんでした。
+
+次に例を示します。</p>
+
+<ul>
+<li>マニフェストで {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} または {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} を要求すると、外部ストレージ上のすべての公開ディレクトリにアクセスできますが、この場合、アプリが必要な場所以外にもアクセスできることになります。
+
+
+</li>
+<li><a href="{@docRoot}guide/topics/providers/document-provider.html">ストレージ アクセス フレームワーク</a>を使用すると、通常、ユーザーはシステム UI を使用してディレクトリを選択できますが、アプリが常に同じ外部ディレクトリにアクセスする場合、この選択は不要です。
+
+
+
+</li>
+</ul>
+
+<p>Android N では、一般的な外部ストレージ ディレクトリにアクセスできる、新しいシンプルな API を提供します。
+ </p>
+
+<h2 id="accessing">外部ストレージのディレクトリへのアクセス</h2>
+
+<p><code>StorageManager</code> クラスを使用して、適切な
+<code>StorageVolume</code> インスタンスを取得します。次に、そのインスタンスの
+<code>StorageVolume.createAccessIntent()</code> メソッドを呼び出して、インテントを作成します。このインテントを使用して、外部ストレージのディレクトリにアクセスします。
+リムーバブル メディア ボリュームなど、使用できるすべてのボリュームのリストを取得するには、<code>StorageManager.getVolumesList()</code> を使用します。
+
+</p>
+
+<p>特定のファイルに関する情報がある場合は、
+<code>StorageManager.getStorageVolume(File)</code> を使用して、そのファイルを含む
+<code>StorageVolume</code> を取得します。この <code>StorageVolume</code> で
+<code>createAccessIntent()</code> を呼び出し、このファイルの外部ストレージ ディレクトリにアクセスします。
+</p>
+
+<p>
+外部 SD カードなどのセカンダリ ボリュームで、
+<code>StorageVolume.createAccessIntent()</code> を呼び出すときに null を渡し、特定のディレクトリではなくボリューム全体へのアクセスをリクエストします。プライマリ ボリュームに null を渡すか、無効なディレクトリ名を渡すと、
+<code>StorageVolume.createAccessIntent()</code> は null を返します。
+
+
+</p>
+
+<p>次のコード スニペットは、プライマリ共有ストレージの
+<code>Pictures</code> ディレクトリを開く方法の例を示しています。</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>システムは外部ディレクトリへのアクセスの付与を試行し、必要に応じてシンプルな UI で、ユーザーにアクセスを確認します。
+</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>図 1.</strong> Pictures ディレクトリへのアクセスを要求するアプリ
+</p>
+
+<p>ユーザーがアクセスを付与すると、
+<code>Activity.RESULT_OK</code> の結果コードと、URI を含むインテント データを指定して、
+<code>onActivityResult()</code> のオーバーライドを呼び出します。提供された URI を使用して、ディレクトリの情報にアクセスします。これは、<a href="{@docRoot}guide/topics/providers/document-provider.html">ストレージ アクセス フレームワーク</a>で返された URI を使用する場合と同様です。
+
+
+
+</p>
+
+<p>ユーザーがアクセスを付与しなかった場合は、
+<code>Activity.RESULT_CANCELED</code> の結果コードと、null のインテント データを指定して、
+<code>onActivityResult()</code> のオーバーライドを呼び出します。</p>
+
+<p class="note"><b>注</b>:特定の外部ディレクトリへのアクセスを取得すると、そのディレクトリ内のサブディレクトリへのアクセスも取得します。
+</p>
+
+<h2 id="removable">リムーバブル メディアのディレクトリへのアクセス</h2>
+
+<p>特定のディレクトリへのアクセスを使用してリムーバブル メディア上のディレクトリにアクセスするには、まず {@link android.os.Environment#MEDIA_MOUNTED} 通知をリッスンする {@link android.content.BroadcastReceiver} を追加します。次に例を示します。
+
+</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>ユーザーが SD カードなどのリムーバブル メディアをマウントすると、システムは
+{@link android.os.Environment#MEDIA_MOUNTED} 通知を送信します。この通知は、インテント データ内の <code>StorageVolume</code> オブジェクトを提供します。このオブジェクトを使用して、リムーバブル メディア上のディレクトリにアクセスできます。
+
+次の例では、リムーバブル メディア上の <code>Pictures</code> ディレクトリにアクセスします。
+</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">ベスト プラクティス</h2>
+
+<p>外部ディレクトリのアクセス URI はできる限り保持してください。そうすれば、ユーザーに何度もアクセス要求をする必要がなくなります。
+ユーザーがアクセスを付与したら、ディレクトリのアクセス URI を指定して
+<code>getContentResolver().takePersistableUriPermssion()</code> を呼び出します。
+システムが URI を保持し、以降のアクセス要求では <code>RESULT_OK</code> を返して、ユーザーに確認の UI を表示しません。
+
+</p>
+
+<p>ユーザーが外部ディレクトリへのアクセスを拒否した直後に、またアクセスをリクエストしないようにしてください。
+何度もアクセスを要求すると、ユーザー エクスペリエンスが低下します。
+リクエストがユーザーにより拒否され、アプリが再度アクセスをリクエストすると、UI に [<b>Don't ask again</b>] チェックボックスが表示されます。
+</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>図 1.</strong> リムーバブル メディアへのアクセスに対して 2 回目のリクエストを行うアプリ。
+</p>
+
+<p>ユーザーが [<b>Don't ask again</b>] を選択してリクエストを拒否すると、特定のディレクトリに対するアプリからの今後のすべてのリクエストは自動的に拒否され、リクエストに関する UI は表示されなくなります。
+
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/training/articles/security-config.jd b/docs/html-intl/intl/ja/training/articles/security-config.jd
new file mode 100644
index 0000000..d86c547
--- /dev/null
+++ b/docs/html-intl/intl/ja/training/articles/security-config.jd
@@ -0,0 +1,747 @@
+page.title=ネットワーク セキュリティ構成
+page.keywords=androidn,security,network
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>このドキュメントの内容</h2>
+<ol>
+ <li><a href="#manifest">セキュリティ構成ファイルの追加</a></li>
+ <li><a href="#CustomTrust">信頼できる CA のカスタマイズ</a>
+ <ol>
+ <li><a href="#ConfigCustom">カスタムの CA の設定</a></li>
+ <li><a href="#LimitingCas">信頼できる CA の制限</a></li>
+ <li><a href="#TrustingAdditionalCas">信頼できる CA の追加</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">デバッグ限定の CA</a></li>
+ <li><a href="#UsesCleartextTraffic">クリアテキスト トラフィックのオプトアウト</a></li>
+ <li><a href="#CertificatePinning">証明書のピン留め</a></li>
+ <li><a href="#ConfigInheritance">構成の継承の動作</a></li>
+ <li><a href="#FileFormat">構成ファイルの形式</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N には、ネットワーク セキュリティ構成機能が含まれています。これにより、アプリのコードを修正しなくても、安全な宣言型構成ファイルで、アプリのネットワーク セキュリティの設定をカスタマイズできます。
+
+これらの設定は、特定のドメインおよび特定のアプリに対して構成できます。
+主な機能は次のとおりです。
+
+</p>
+
+<ul>
+ <li>
+ <b>カスタム トラスト アンカー:</b>アプリのセキュアな接続にどの証明機関（CA）を信頼するかをカスタマイズできます。
+たとえば、特定の自己署名証明書や制限された一連の公的 CA を信頼できます。
+
+
+ </li>
+
+ <li>
+ <b>デバッグのみのオーバーライド:</b>インストール ベースに対する追加リスクなしに、アプリのセキュアな接続を安全にデバッグできます。
+
+ </li>
+
+ <li>
+ <b>クリアテキスト トラフィックのオプトアウト:</b>クリアテキスト トラフィックの意図しない使用からアプリを保護できます。
+
+ </li>
+
+ <li>
+ <b>証明書のピン留め:</b>アプリのセキュアな接続を特定の証明書に制限します。
+
+ </li>
+</ul>
+
+
+<h2 id="manifest">セキュリティ構成ファイルの追加</h2>
+
+<p>
+ ネットワーク セキュリティ構成機能は、XML ファイルを使用します。このファイルで、アプリの設定を指定できます。
+アプリのマニフェストに、このファイルを指すエントリを含める必要があります。
+次のコードはマニフェストからの抜粋で、このエントリの作成方法を示しています。
+
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application ... >
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">信頼できる CA のカスタマイズ</h2>
+
+<p>
+ アプリで、プラットフォームのデフォルトの設定ではなく、カスタマイズした一連の CA を信頼することが必要な場合があります。
+主な理由は次のとおりです。
+</p>
+
+<ul>
+ <li>カスタムの証明機関（自己署名、社内の CA で発行など）を使用してホストに接続する。
+
+ </li>
+
+ <li>プレインストールされたすべての CA ではなく、信頼する一部の CA のみに制限する。
+
+ </li>
+
+ <li>システムに含まれていない追加の CA を信頼する。
+ </li>
+</ul>
+
+<p>
+ デフォルトで、すべてのアプリのセキュアな接続（TLS、HTTPS など）は、システムにプレインストールされた CA を信頼し、API レベル 23（Android M）以下をターゲットにしたアプリは、ユーザーが追加した CA も信頼します。
+
+アプリは {@code base-config}（アプリ全体のカスタマイズ）または {@code domain-config} （ドメイン単位のカスタマイズ）を使用して、独自の接続をカスタマイズすることもできます。
+
+
+
+</p>
+
+
+<h3 id="ConfigCustom">カスタムの CA の設定</h3>
+
+<p>
+ 自己署名 SSL 証明書を使用するホストか、または信頼できる非パブリック CA（社内の CA など）によって SSL 証明書が発行されているホストに接続するケースで説明します。
+
+
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ PEM または DER 形式で、自己署名または非パブリック CA 証明書を
+{@code res/raw/my_ca} に追加します。
+</p>
+
+
+<h3 id="LimitingCas">信頼できる CA の制限</h3>
+
+<p>
+ システムによって信頼されているすべての CA をアプリで信頼したくない場合は、信頼する CA を制限できます。
+これにより、他の CA が発行した偽造証明書からアプリを保護できます。
+
+</p>
+
+<p>
+ 信頼できる CA を制限するための設定は、特定のドメインで<a href="#TrustingACustomCa">カスタムの CA を信頼する</a>設定と似ています。ただし、リソースで複数の CA を指定できる点が異なります。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ PEM または DER 形式で、信頼できる CA を {@code res/raw/trusted_roots} に追加します。
+ PEM 形式を使用する場合、そのファイルには PEM データのみを含めるようにして、余分なテキストを含めないでください。<em></em>
+1 つだけでなく複数の
+<a href="#certificates"><code><certificates></code></a> 要素を指定できます。
+
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ 信頼できる CA の追加
+</h3>
+
+<p>
+ システムで信頼されていない CA を、アプリが追加で信頼しなければならない場合があります。これは、システムに CA がまだ組み込まれていなかったり、CA が Android システムに組み込まれるための要件を満たしていないことが原因です。
+
+CA を追加するには、アプリの構成で複数の証明書ソースを指定します。
+
+
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">デバッグ用の CA の構成</h2>
+
+<p>
+ HTTPS で接続するアプリをデバッグするときは、運用サーバーの SSL 証明書がインストールされていないローカルの開発サーバーへの接続が必要になります。
+
+アプリのコードを変更せずにこの接続をサポートするには
+
+ <i>、</i> {@code debug-overrides} を使用して、<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a> が {@code true} の場合にのみ信頼されるデバッグ限定の CA を指定できます。
+
+通常、IDE およびビルド ツールによって、非リリース ビルドには自動的にこのフラグが設定されます。
+
+</p>
+
+<p>
+ この方法は、通常の条件付きコードよりも安全です。セキュリティ対策として、アプリ ストアでは debuggable とマークされたアプリは拒否されるからです。
+
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">クリアテキスト トラフィックのオプトアウト</h2>
+
+<p>
+ アプリケーションで、セキュアな接続のみを使用して接続する場合、それらの接続先に対して（HTTPS ではなく暗号化されていない HTTP プロトコルを使用する）クリアテキストのサポートを除外できます。
+
+このオプションにより、バックエンド サーバーなど外部ソースが提供する URL の変更によって、アプリで思わぬパフォーマンスの低下が発生するのを防ぐことができます。
+
+
+ 詳細については、{@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()} をご覧ください。
+</p>
+
+<p>
+ たとえば、アプリで {@code
+ secure.example.com} へのすべての接続には常に HTTPS を使用して、機密性の高いトラフィックを有害なネットワークから保護することが必要な場合があります。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">証明書のピン留め</h2>
+
+<p>
+ 通常、アプリはプレインストールされたすべての CA を信頼します。これらの CA が偽造証明書を発行すると、アプリは MiTM 攻撃のリスクにさらされます。
+
+アプリによっては、信頼する CA を制限するか証明書をピン留めすることで、受け入れる証明書を制限できます。
+
+</p>
+
+<p>
+ 証明書をピン留めするには、公開鍵のハッシュによって証明書のセットを指定します（X.509 証明書の SubjectPublicKeyInfo）。
+証明書チェーンが有効になるのは、証明書チェーンに 1 つ以上のピン留めされた公開鍵が含まれている場合のみです。
+
+
+</p>
+
+<p>
+ 証明書のピン留めを使用するときは、必ずバックアップの鍵を含めてください。そうすれば、新しい鍵に切り替えたり、CA を変更したりする必要が生じた場合に（CA 証明書またはその CA の中間証明書にピン留めしていても）、アプリの接続が影響を受けることはありません。
+
+
+そうしないと、接続を復元するためにアプリにアップデートをプッシュしなければならなくなります。
+
+</p>
+
+<p>
+ また、ピン留めの有効期限を設定することもできます。その有効期限を過ぎると、ピン留めが無効になります。
+これにより、アップデートされていないアプリの接続の問題を防ぐことができます。
+ただし、ピン留めに有効期限を設定すると、ピン留めを回避できるようになります。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">構成の継承の動作</h2>
+
+<p>
+ 固有の構成で設定されていない値は、継承されます。この動作により、より複雑な構成が可能になるうえ、構成ファイルの読みやすさを維持できます。
+
+</p>
+
+<p>
+ 固有のエントリに値が設定されていない場合、その次に汎用的なエントリの値が使用されます。
+{@code domain-config} で設定されていない値は、ネストされている場合は親の {@code domain-config} から、ネストされていない場合は {@code
+ base-config} から取得されます。
+{@code base-config} で設定されていない値には、プラットフォームの既定値を使用します。
+
+</p>
+
+<p>
+ たとえば、{@code
+ example.com} のサブドメインに対するすべての接続で、CA のカスタム セットを使用する必要があるケースを考えてみましょう。また、これらのドメインに対するクリアテキストのトラフィックは、{@code
+ secure.example.com} に接続する場合を除いて許可します。<em></em>
+{@code example.com} の構成で {@code
+ secure.example.com} の構成をネストすることで、
+{@code trust-anchors} の重複を回避できます。
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">構成ファイルの形式</h2>
+
+<p>
+ ネットワーク セキュリティ構成機能では、XML ファイル形式を使用します。
+ ファイルの全体的な構造については、次のコード サンプルをご覧ください。
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ 次のセクションでは、このファイル形式の構文とその他の詳細について説明します。
+
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 含めることのできる要素:
+ </dt>
+
+ <dd>
+ 0 または 1 つの <code><a href="#base-config"><base-config></a></code><br>
+ 任意の数の <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 または 1 つの <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 構文:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ 含めることのできる要素:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 説明:
+ </dt>
+
+ <dd>
+ <a href="#domain-config"><code>domain-config</code></a> に含まれていない接続先に対するすべての接続に使用される、デフォルトの構成。
+
+
+<p>
+ 設定されていない値はすべて、プラットフォームの既定値を使用します。API レベル 24 以上をターゲットにしたアプリのデフォルトの構成は次のとおりです。
+
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+API レベル 23 以下をターゲットにしたアプリのデフォルトの構成は次のとおりです。
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>構文:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>含めることのできる要素:</dt>
+
+<dd>
+1 つ以上の <code><a href="#domain"><domain></a></code>
+<br/>0 または 1 つの <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 または 1 つの <code><a href="#pin-set"><pin-set></code></a>
+<br/>任意の数のネストされた <code><domain-config></code></dd>
+
+<dt>説明</dt>
+<dd>固有の接続先への接続に使用される構成です。{@code domain} 要素の定義に従います。
+
+<p>複数の {@code domain-config} 要素で接続先を指定している場合は、最も具体的な（長い）マッチング ドメイン ルールを持つ構成が採用されます。
+</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ 構文:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ 属性:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ {@code "true"} の場合、このドメイン ルールはドメインおよびすべてのサブドメイン（サブドメインのサブドメインも含む）に一致します。そうでない場合、このルールは完全一致のみに適用されます。
+
+
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ 説明:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ 構文:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ 含めることのできる要素:
+ </dt>
+
+ <dd>
+ 0 または 1 つの <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 説明:
+ </dt>
+
+ <dd>
+ オーバーライドは、<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a> が {@code "true"} の場合に適用されます。これは通常、IDE およびビルド ツールで生成された非リリース ビルドに使用します。
+
+{@code
+ debug-overrides} で指定されたトラスト アンカーは、その他すべての構成に追加されます。サーバーの証明書チェーンでデバッグ限定のトラスト アンカーのいずれかを使用するときは、証明書のピン留めは実行されません。
+
+<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a> が {@code "false"} の場合、このセクションは完全に無視されます。
+
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ 構文:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ 含めることのできる要素:
+ </dt>
+
+ <dd>
+ 任意の数の <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ 説明:
+ </dt>
+
+ <dd>
+ セキュアな接続に使用するトラスト アンカーのセット。
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>構文:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>説明:</dt>
+<dd>{@code trust-anchors} 要素の X.509 証明書のセットです。</dd>
+
+<dt>属性:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+CA 証明書のソースには、次のいずれかを指定します。
+<ul>
+ <li>X.509 証明書を含むファイルを指す未加工のリソース ID。
+ 証明書は、DER または PEM 形式でエンコードする必要があります。PEM 証明書の場合、ファイルには PEM 以外の余分なデータ（コメントなど）を含めないでください。
+<em></em>
+
+ </li>
+
+ <li>{@code "system"}: プレインストールされたシステムの CA 証明書
+ </li>
+
+ <li>{@code "user"}: ユーザーが追加した CA 証明書
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ ソースから取得した CA が証明書のピン留めを回避するかどうかを指定します。{@code
+ "true"} の場合、証明書チェーンはこのソースから取得したいずれかの CA を使用して作成され、ピン留めは実行されません。
+この設定は、CA をデバッグしたり、アプリのセキュアなトラフィックでユーザーの MiTM の許可をサポートするために役立ちます。
+
+ </p>
+
+ <p>
+ デフォルトは {@code "false"} です。ただし、{@code debug-overrides} 要素で指定された場合の既定値は {@code "true"} です。
+
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ 構文:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ 含めることのできる要素:
+ </dt>
+
+ <dd>
+ 任意の数の <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ 説明:
+ </dt>
+
+ <dd>
+ 公開鍵のピンのセットです。セキュアな接続を信頼するには、信頼チェーン内の公開鍵一式のうちどれかが、ピンのセットに含まれている必要があります。
+ピンの形式については、
+<code><a href="#pin"><pin></a></code> をご覧ください。
+ </dd>
+
+ <dt>
+ 属性:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ {@code yyyy-MM-dd} 形式のピン留めの有効期限、つまりピン留めを無効にする日付です。
+この属性が設定されていない場合、ピン留めの有効期限はありません。
+
+ <p>
+ 有効期限を設定しておくと、ユーザーがアプリのアップデートを無効にしているなどの原因で、ピンのセットのアップデートを取得していないアプリで、アプリの接続上の問題を回避できます。
+
+
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ 構文:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ 属性:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ PIN の生成にはダイジェスト アルゴリズムが使用されます。現在サポートされているのは
+{@code "SHA-256"} のみです。
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/index.jd b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/index.jd
index 837fc2b..3fd3f47 100644
--- a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/index.jd
+++ b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/index.jd
@@ -55,7 +55,7 @@
</p>
<h2>レッスン</h2>
-
+
<dl>
<dt><b><a href="starting.html">アクティビティを開始する</a></b></dt>
<dd>アクティビティのライフサイクルに関する基本、ユーザーがアプリを起動する方法、基本的なアクティビティ作成の方法について学習します。
@@ -68,5 +68,5 @@
<dt><b><a href="recreating.html">アクティビティを再作成する</a></b></dt>
<dd>アクティビティが破棄されるときの動作と、必要に応じてアクティビティの状態を再構築する方法について学習します。
</dd>
-</dl>
+</dl>
diff --git a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/pausing.jd b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/pausing.jd
index b837a00..fd21ef0 100644
--- a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>このレッスンでの学習内容</h2>
<ol>
<li><a href="#Pause">アクティビティを一時停止する</a></li>
<li><a href="#Resume">アクティビティを再開する</a></li>
</ol>
-
+
<h2>関連ドキュメント</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">アクティビティ</a>
@@ -59,7 +59,7 @@
<h2 id="Pause">アクティビティを一時停止する</h2>
-
+
<p>システムがアクティビティに対して {@link android.app.Activity#onPause()} を呼び出した場合、技術的にはアクティビティはまだ部分的に表示されていることを意味しますが、ほとんどの場合は、ユーザーがアクティビティを離れていて、ほどなく停止状態になる徴候を示しています。
通常、以下を行う場合には、{@link android.app.Activity#onPause()} コールバックを使用する必要があります。
diff --git a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/recreating.jd b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/recreating.jd
index 8647375..5753f13 100644
--- a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>このレッスンでの学習内容</h2>
<ol>
<li><a href="#SaveState">自分のアクティビティ状態を保存する</a></li>
<li><a href="#RestoreState">自分のアクティビティ状態をリストアする</a></li>
</ol>
-
+
<h2>関連ドキュメント</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">異なる画面のサポート
@@ -73,7 +73,7 @@
<img src="{@docRoot}images/training/basics/basic-lifecycle-savestate.png" />
<p class="img-caption"><strong>図 2.</strong> システムがアクティビティを停止し始めると、
-{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}（1）が呼び出されるため、{@link android.app.Activity} インスタンスの再作成の必要がある場合に備えて、保存する追加の状態データを指定できます。アクティビティが破棄され、同じインスタンスを再作成する必要がある場合、システムは（1）で定義された状態データを {@link android.app.Activity#onCreate onCreate()} メソッド（2）と
+{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}（1）が呼び出されるため、{@link android.app.Activity} インスタンスの再作成の必要がある場合に備えて、保存する追加の状態データを指定できます。アクティビティが破棄され、同じインスタンスを再作成する必要がある場合、システムは（1）で定義された状態データを {@link android.app.Activity#onCreate onCreate()} メソッド（2）と
{@link android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} メソッド（3）の両方に渡します。
@@ -105,7 +105,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -138,7 +138,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -157,12 +157,12 @@
復元対象の保存済みの状態がある場合のみ {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} が呼び出されるため、
{@link android.os.Bundle} が null であるかどうかをチェックする必要はありません。</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/starting.jd b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/starting.jd
index 124c323..06fcf80 100644
--- a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>このレッスンでの学習内容</h2>
<ol>
<li><a href="#lifecycle-states">ライフサイクル コールバックを理解する</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">新しいインスタンスを作成する</a></li>
<li><a href="#Destroy">アクティビティを破棄する</a></li>
</ol>
-
+
<h2>関連ドキュメント</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">アクティビティ</a></li>
@@ -83,7 +83,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -138,7 +138,7 @@
-<h2 id="launching-activity">アプリのランチャー アクティビティを指定する</h2>
+<h2 id="launching-activity">アプリのランチャー アクティビティを指定する</h2>
<p>ユーザーがホーム画面からアプリのアイコンを選択すると、システムはアプリ内で「ランチャー」（または「メイン」）のアクティビティであると宣言された {@link android.app.Activity} に対して {@link
android.app.Activity#onCreate onCreate()} メソッドを呼び出します。
@@ -151,7 +151,7 @@
<p>アプリのメインのアクティビティは、{@link
android.content.Intent#ACTION_MAIN MAIN} アクションと {@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} カテゴリを含む <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a> を使用してマニフェストで宣言する必要があります。
-次に例を示します。</p>
+次に例を示します。</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -180,7 +180,7 @@
</p>
-<p>アクティビティの存続期間すべてにわたり、一度のみ発生すべき基本的なアプリの起動ロジックを実行するための
+<p>アクティビティの存続期間すべてにわたり、一度のみ発生すべき基本的なアプリの起動ロジックを実行するための
{@link android.app.Activity#onCreate onCreate()} メソッドを実装する必要があります。たとえば、
{@link android.app.Activity#onCreate onCreate()} の実装では、ユーザー インターフェースを定義し、場合によってはいくつかのクラススコープの変数をインスタンス化する必要があります。
</p>
@@ -200,10 +200,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -268,7 +268,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/stopping.jd b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/stopping.jd
index 0007fe6..b267cc8 100644
--- a/docs/html-intl/intl/ja/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html-intl/intl/ja/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>このレッスンでの学習内容</h2>
<ol>
<li><a href="#Stop">アクティビティを停止する</a></li>
<li><a href="#Start">アクティビティを開始/再起動する</a></li>
</ol>
-
+
<h2>関連ドキュメント</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">アクティビティ</a>
@@ -78,7 +78,7 @@
{@link android.app.Activity#onStop()} を使用してメモリのリークを引き起こす可能性があるリソースを解放することが重要です。
</p>
-<p>{@link android.app.Activity#onPause onPause()} メソッドが
+<p>{@link android.app.Activity#onPause onPause()} メソッドが
{@link android.app.Activity#onStop()} の前に呼び出されますが、データベースに情報を書き込むような、規模が大きく CPU に負荷がかかるシャットダウン操作を実行するためには {@link android.app.Activity#onStop onStop()}を使用する必要があります。
</p>
@@ -152,13 +152,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -169,8 +169,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html-intl/intl/ja/training/basics/data-storage/files.jd b/docs/html-intl/intl/ja/training/basics/data-storage/files.jd
index dddfe37..b920c1a 100644
--- a/docs/html-intl/intl/ja/training/basics/data-storage/files.jd
+++ b/docs/html-intl/intl/ja/training/basics/data-storage/files.jd
@@ -183,7 +183,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -250,7 +250,7 @@
-
+
<p>たとえば、自分のアプリでダウンロードした追加のリソースや一時的なメディア ファイルです。</p>
</dd>
</dl>
@@ -265,7 +265,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -287,7 +287,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -366,7 +366,7 @@
<div class="note">
<p><strong>注:</strong> ユーザーがアプリをアンインストールすると、Android システムは次を削除します。
-</p>
+</p>
<ul>
<li>内部ストレージに保存したすべてのファイル</li>
<li>{@link
diff --git a/docs/html-intl/intl/ja/training/basics/intents/filters.jd b/docs/html-intl/intl/ja/training/basics/intents/filters.jd
index 1bcb266..3cf614d 100644
--- a/docs/html-intl/intl/ja/training/basics/intents/filters.jd
+++ b/docs/html-intl/intl/ja/training/basics/intents/filters.jd
@@ -152,7 +152,7 @@
<p>アクティビティで実行するアクションを決定するために、起動時に使用された {@link
android.content.Intent} を読み取ることができます。</p>
-<p>アクティビティが開始されたら、{@link android.app.Activity#getIntent()} を呼び出して、アクティビティを開始した
+<p>アクティビティが開始されたら、{@link android.app.Activity#getIntent()} を呼び出して、アクティビティを開始した
{@link android.content.Intent} を取得します。アクティビティのライフサイクル中はいつでもこれを行うことができますが、通常は、
{@link android.app.Activity#onCreate onCreate()} や {@link android.app.Activity#onStart()} などの早い段階のコールバックの間に行う必要があります。
</p>
diff --git a/docs/html-intl/intl/ja/training/basics/intents/sending.jd b/docs/html-intl/intl/ja/training/basics/intents/sending.jd
index 586bc15..d2a24f8 100644
--- a/docs/html-intl/intl/ja/training/basics/intents/sending.jd
+++ b/docs/html-intl/intl/ja/training/basics/intents/sending.jd
@@ -93,7 +93,7 @@
さまざまな {@link
android.content.Intent#putExtra(String,String) putExtra()} メソッドを使用して、特別データを 1 つ以上追加することができます。</p>
-<p>デフォルトでは、インテントに含まれる
+<p>デフォルトでは、インテントに含まれる
{@link android.net.Uri} データに基づいて、インテントに必要な適切な MIME タイプをシステムが決定します。インテントに {@link android.net.Uri} が含まれていない場合は、通常は {@link android.content.Intent#setType setType()} を使用して、インテントに関連するデータのタイプを指定する必要があります。
MIME タイプの詳細な指定により、どの種類のアクティビティがインテントを受け取るかが指定されます。
diff --git a/docs/html-intl/intl/ja/training/basics/network-ops/data-saver.jd b/docs/html-intl/intl/ja/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..c661b65
--- /dev/null
+++ b/docs/html-intl/intl/ja/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,234 @@
+page.title=データセーバー
+metaDescription= ユーザーが有効にしたデータ使用量の最適化。
+page.keywords="android N", "data usage", "metered network"
+page.image=images/cards/card-nyc_2x.jpg
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ このドキュメントの内容
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#status">データセーバー設定の確認</a>
+ <ol>
+ <li>
+ <a href="#request-whitelist">ホワイトリスト パーミッションの要求</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#monitor-changes">データセーバー設定の変更の監視</a>
+
+ </li>
+
+ <li>
+ <a href="#testing">Android Debug Bridge コマンドを使用したテスト</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ スマートフォンのライフサイクル全体では、モバイルデータ通信プランのコストが端末自体のコストを簡単に上回ります。
+N Developer Preview では、ローミング、課金サイクルの終了近く、または短期間のデータパックであるかどうかに関係なく、データの使用を抑えるために端末全体でデータセーバーを有効にできます。
+
+
+</p>
+
+<p>
+ ユーザーが [<strong>Settings</strong>] でデータセーバーを有効にし、端末が従量制課金ネットワークに接続されている場合、システムはバックグラウンドでのデータ使用をブロックし、フォアグラウンドでのデータ使用をなるべく抑えるようにアプリに指示します。
+
+ユーザーは特定のアプリをホワイトリストに登録することにより、データセーバーがオンになっているときでも、バックグラウンドで従量制課金接続を使用できます。
+
+
+</p>
+
+<p>
+ N Developer Preview は {@link android.net.ConnectivityManager} API を拡張することで、<a href="#status">ユーザーのデータセーバー設定を取得</a>する方法と、<a href="#monitor-changes">設定の変更を監視</a>する方法を提供しています。
+
+
+アプリでユーザーがデータセーバーを有効にしているかどうかを確認し、フォアグラウンドおよびバックグラウンドでのデータ使用を抑えるようにすることをお勧めします。
+
+
+</p>
+
+<h2 id="status">
+ データセーバー設定の確認
+</h2>
+
+<p>
+ N Developer Preview では、アプリは {@link
+ android.net.ConnectivityManager} API を使用して、どのようなデータ使用量の制限が適用されているかを確認できます。
+{@code getRestrictBackgroundStatus()} メソッドは以下のいずれかの値を返します。
+
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ データセーバーは無効になっています。
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ ユーザーはこのアプリのデータセーバーを有効にしています。アプリはフォアグラウンドでのデータ使用を抑えるようにし、バックグラウンドでのデータ使用に対する制限を適切に処理する必要があります。
+
+
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ ユーザーはデータセーバーを有効にしていますが、アプリがホワイトリストに登録されています。アプリは、フォアグラウンドおよびバックグラウンドでのデータ使用を引き続き抑えるようにする必要があります。
+
+ </dd>
+</dl>
+
+<p>
+ データセーバーが無効になっている場合や、アプリがホワイトリストに登録されている場合でも、端末が従量制課金ネットワークに接続されている場合は、データ使用量を抑えることをお勧めします。
+
+以下のサンプルコードでは、アプリで使用する必要があるデータ量を確認するために、{@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} と {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} を使用しています。
+
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ ホワイトリスト パーミッションの要求
+</h3>
+
+<p>
+ アプリがバックグラウンドでデータを使用する必要がある場合は、アプリのパッケージ名（例: <code>package:MY_APP_ID</code>）の URI を含む <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code> インテントを送信することでホワイトリスト パーミッションをリクエストできます。
+
+
+
+
+</p>
+
+<p>
+ インテントと URI を送信すると、[<strong>Settings</strong>] アプリが起動し、アプリのデータ使用量の設定が表示されます。
+ユーザーはアプリのバックグラウンドデータを有効にするかどうかを決めることができます。
+このインテントを送信する前に、バックグラウンドでのデータ使用を有効にするために [<strong>Settings</strong>] アプリを起動するかどうかを最初にユーザーに尋ねることをお勧めします。
+
+
+
+</p>
+
+<h2 id="monitor-changes">
+ データセーバー設定の変更の監視
+</h2>
+
+<p>
+ アプリでデータセーバー設定の変更を監視するには、{@link
+ android.content.BroadcastReceiver} を作成して {@code
+ ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} をリッスンし、レシーバーを動的に {@link android.content.Context#registerReceiver
+ Context.registerReceiver()} に登録します。
+このブロードキャストを受信したアプリは、{@code
+ ConnectivityManager.getRestrictBackgroundStatus()} を呼び出して、<a href="#status">新しいデータセーバー設定がそのパーミッションに影響を及ぼすかどうか</a>を確認する必要があります。
+
+
+</p>
+
+<p class="note">
+ <strong>注:</strong>このブロードキャストは、{@link
+ android.content.Context#registerReceiver Context.registerReceiver()} を使用してブロードキャストに動的に登録するアプリにのみ送信されます。
+マニフェストにこのブロードキャストを受信するために登録するアプリはこれらを受信しません。
+
+
+</p>
+
+<h2 id="testing">
+ Android Debug Bridge コマンドを使用したテスト
+</h2>
+
+<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge（ADB）</a>には、ネットワーク パーミッションの確認と設定に使用できるコマンドがいくつか用意されています。
+
+
+
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ 現在のバックグラウンド ネットワーク全体の制限設定、ホワイトリスト内の現在のパッケージ UID、その他の既知のパッケージのネットワーク パーミッションを含むレポートが生成されます。
+
+
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ ネットワーク ポリシー マネージャ（netpolicy）のコマンドの一覧が表示されます。
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ <code>true</code> または <code>false</code> をそれぞれ渡したときに、データセーバー モードを有効または無効にします。
+
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ 指定されたパッケージ UID をホワイトリストに追加し、バックグラウンドで従量制課金接続を使用できるようにします。
+
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ 指定されたパッケージ UID をホワイトリストから削除し、データセーバーが有効な場合でもバックグラウンドで従量制課金接続を使用できないようにします。
+
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/ja/training/material/animations.jd b/docs/html-intl/intl/ja/training/material/animations.jd
index 460147c..06a3a56 100644
--- a/docs/html-intl/intl/ja/training/material/animations.jd
+++ b/docs/html-intl/intl/ja/training/material/animations.jd
@@ -173,7 +173,7 @@
</ul>
<p>{@link android.transition.Visibility} クラスを拡張する Transition はすべて、EnterTransition または ExitTransition としてサポートされます。
-詳細については、API リファレンスの
+詳細については、API リファレンスの
{@link android.transition.Transition} クラスをご覧ください。</p>
<p>Android 5.0（API レベル 21）では、次の共有要素遷移もサポートしています。</p>
@@ -226,7 +226,7 @@
</transitionSet>
</pre>
-<p><code>changeImageTransform</code> 要素は
+<p><code>changeImageTransform</code> 要素は
{@link android.transition.ChangeImageTransform} クラスに対応します。詳細については、API リファレンスの {@link android.transition.Transition} をご覧ください。
</p>
@@ -263,7 +263,7 @@
有効にしていないと、呼び出し元のアクティビティが Exit 遷移を開始したあと、window 遷移（スケールやフェードなど）が起きます。
</p>
-<p>Enter 遷移をできるだけ早く開始するには、呼び出し先のアクティビティで
+<p>Enter 遷移をできるだけ早く開始するには、呼び出し先のアクティビティで
{@link android.view.Window#setAllowEnterTransitionOverlap Window.setAllowEnterTransitionOverlap()}
メソッドを使用します。これにより、さらに印象的な Enter 遷移になります。</p>
@@ -321,7 +321,7 @@
{@link android.view.View#setTransitionName View.setTransitionName()} メソッドを使用して両方のアクティビティに共通の要素名を指定します。
</p>
-<p>2 つ目のアクティビティが終了したときにシーンの切り替えアニメーションを逆回転させるには、{@link android.app.Activity#finish Activity.finish()} の代わりに
+<p>2 つ目のアクティビティが終了したときにシーンの切り替えアニメーションを逆回転させるには、{@link android.app.Activity#finish Activity.finish()} の代わりに
{@link android.app.Activity#finishAfterTransition Activity.finishAfterTransition()}
メソッドを呼び出します。</p>
diff --git a/docs/html-intl/intl/ja/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/battery-monitoring.jd
index c4aafe4..0b7d602 100644
--- a/docs/html-intl/intl/ja/training/monitoring-device-state/battery-monitoring.jd
+++ b/docs/html-intl/intl/ja/training/monitoring-device-state/battery-monitoring.jd
@@ -7,8 +7,8 @@
next.link=docking-monitoring.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>このレッスンの内容</h2>
@@ -24,9 +24,9 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">インテントとインテント フィルタ</a>
</ul>
-</div>
</div>
-
+</div>
+
<p>バックグラウンド更新が電池消費量に及ぼす影響を抑えるために更新の頻度を変更するには、初めに現在の電池残量と充電状態を調べることをおすすめします。</p>
<p>アプリの更新が電池消費量に及ぼす影響の度合いは、端末の電池残量と充電状態によって異なります。AC 電源から端末を充電しているときは、更新の実行による影響はごくわずかなので、ほとんどの場合は、端末が AC 電源に接続されている限り、更新頻度を最大にして差し支えありません。逆に、端末が電池で駆動しているときは、更新頻度を下げると電池消費量を抑えることができます。</p>
@@ -34,8 +34,8 @@
<p>同様に、電池残量を調べると、残量がごくわずかであるときに更新頻度を下げたり、場合によっては停止させたりすることができます。</p>
-<h2 id="DetermineChargeState">現在の充電状態を特定する</h2>
-
+<h2 id="DetermineChargeState">現在の充電状態を特定する</h2>
+
<p>初めに、現在の充電状態を特定します。{@link android.os.BatteryManager} によって電池と充電状態に関するすべての詳細情報が sticky {@link android.content.Intent} としてブロードキャストされますが、この中に充電状態が格納されています。</p>
<p>これは sticky インテントであるため、{@link android.content.BroadcastReceiver} を登録する必要はありません。{@code registerReceiver} を呼び出し、{@code null} をレシーバとして渡すだけで（次のコード例を参照）、現在の電池状態のインテントが返されます。ここで実際の {@link android.content.BroadcastReceiver} オブジェクトを渡すこともできますが、このレッスンでは後で更新についての処理を行うので、これは必要ありません。</p>
@@ -58,7 +58,7 @@
<p>一般的には、端末が AC 充電器に接続されているときはバックグラウンド更新の頻度を最大にし、USB 経由で充電中のときは頻度を下げ、電池で駆動中のときはさらに頻度を下げます。</p>
-<h2 id="MonitorChargeState">充電状態の変化を監視する</h2>
+<h2 id="MonitorChargeState">充電状態の変化を監視する</h2>
<p>充電状態は、端末が充電器に接続されたときにすぐに変化するので、充電状態の変化を監視し、その変化に応じて更新の頻度を変更することが重要です。</p>
@@ -75,11 +75,11 @@
<pre>public class PowerConnectionReceiver extends BroadcastReceiver {
@Override
- public void onReceive(Context context, Intent intent) {
+ public void onReceive(Context context, Intent intent) {
int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
status == BatteryManager.BATTERY_STATUS_FULL;
-
+
int chargePlug = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
boolean usbCharge = chargePlug == BATTERY_PLUGGED_USB;
boolean acCharge = chargePlug == BATTERY_PLUGGED_AC;
@@ -87,7 +87,7 @@
}</pre>
-<h2 id="CurrentLevel">現在の電池残量を特定する</h2>
+<h2 id="CurrentLevel">現在の電池残量を特定する</h2>
<p>状況によっては、現在の電池残量がわかると便利なことがあります。たとえば、電池残量が所定のレベルを下回った場合にアプリのバックグラウンド更新の頻度を下げることができます。</p>
@@ -99,7 +99,7 @@
float batteryPct = level / (float)scale;</pre>
-<h2 id="MonitorLevel">電池残量の大きな変化を監視する</h2>
+<h2 id="MonitorLevel">電池残量の大きな変化を監視する</h2>
<p>電池状態を継続的に監視することは簡単ではありませんが、その必要もありません。</p>
diff --git a/docs/html-intl/intl/ja/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/connectivity-monitoring.jd
index 82b0c6b..6cead05 100644
--- a/docs/html-intl/intl/ja/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html-intl/intl/ja/training/monitoring-device-state/connectivity-monitoring.jd
@@ -11,7 +11,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>このレッスンの内容</h2>
@@ -27,7 +27,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">インテントとインテント フィルタ</a>
</ul>
-</div>
+</div>
</div>
<p>反復アラームとバックグラウンド サービスの用途のうち代表的なものとしては、インターネット リソースからアプリのデータを定期的に更新するためのスケジュール設定や、データのキャッシュへの格納、長時間に及ぶダウンロードの実行などがあります。しかし、インターネットに接続されていないときや、速度が低すぎるためにダウンロードを完了できない場合にまで、更新をスケジューリングするために端末をスリープ状態から復帰させる必要があるでしょうか。</p>
@@ -35,18 +35,18 @@
<p>{@link android.net.ConnectivityManager} を使用すると、端末が実際にインターネットに接続されているかどうかと、接続されている場合の接続タイプを調べることができます。</p>
-<h2 id="DetermineConnection">インターネット接続の有無を特定する</h2>
-
+<h2 id="DetermineConnection">インターネット接続の有無を特定する</h2>
+
<p>端末がインターネットに接続されていない場合は、インターネット リソースに基づく更新をスケジューリングする必要性はありません。次のスニペットは、{@link android.net.ConnectivityManager} を使用してアクティブなネットワークを問い合わせて、インターネットに接続しているかどうかを特定する方法を示すものです。</p>
<pre>ConnectivityManager cm =
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
-<h2 id="DetermineType">インターネット接続のタイプを特定する</h2>
+<h2 id="DetermineType">インターネット接続のタイプを特定する</h2>
<p>現在使用可能なインターネット接続のタイプも調べることができます。</p>
@@ -59,7 +59,7 @@
<p>更新を停止した場合は、接続状態の変化を受信することが重要です。インターネット接続が確立されたら更新を再開できるようにするためです。</p>
-<h2 id="MonitorChanges">接続状態の変化を監視する</h2>
+<h2 id="MonitorChanges">接続状態の変化を監視する</h2>
<p>接続状態の詳細が変化すると、{@link android.net.ConnectivityManager} によって {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}（{@code "android.net.conn.CONNECTIVITY_CHANGE"}）アクションがブロードキャストされます。アプリのマニフェスト内でブロードキャスト レシーバを登録し、このような変化を検出することで、それに応じてアプリのバックグラウンド更新を再開（または停止）することができます。</p>
diff --git a/docs/html-intl/intl/ja/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/docking-monitoring.jd
index 9c0e054..7d227df 100644
--- a/docs/html-intl/intl/ja/training/monitoring-device-state/docking-monitoring.jd
+++ b/docs/html-intl/intl/ja/training/monitoring-device-state/docking-monitoring.jd
@@ -10,7 +10,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>このレッスンの内容</h2>
@@ -26,7 +26,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">インテントとインテント フィルタ</a>
</ul>
-</div>
+</div>
</div>
<p>Android 搭載端末を装着できるホルダーの種類には、さまざまなものがあります。たとえば、車載用や家庭用のホルダーがあり、デジタルかアナログかという区別もあります。ホルダー装着状態は一般的に、充電状態と密接にリンクしています。多くのホルダーは、装着されている端末に電力を供給しているからです。</p>
@@ -36,8 +36,8 @@
<p>ホルダー装着状態も sticky {@link android.content.Intent} としてブロードキャストされるので、端末がホルダーに装着されているかどうかと、装着されている場合のホルダーのタイプを問い合わせることができます。</p>
-<h2 id="CurrentDockState">現在のホルダー装着状態を特定する</h2>
-
+<h2 id="CurrentDockState">現在のホルダー装着状態を特定する</h2>
+
<p>ホルダー装着状態の詳細は、{@link android.content.Intent#ACTION_DOCK_EVENT} アクションの sticky ブロードキャストにエクストラとして含まれています。これは sticky であるため、{@link android.content.BroadcastReceiver} を登録する必要はありません。次のコード例に示すように、{@link android.content.Context#registerReceiver registerReceiver()} を呼び出し、{@code null} をブロードキャスト レシーバとして渡します。</p>
<pre>IntentFilter ifilter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
@@ -49,9 +49,9 @@
boolean isDocked = dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED;</pre>
-<h2 id="DockType">現在のホルダーのタイプを特定する</h2>
+<h2 id="DockType">現在のホルダーのタイプを特定する</h2>
-<p>端末がホルダーに装着されている場合のホルダーのタイプは、次の 4 つのいずれかです。
+<p>端末がホルダーに装着されている場合のホルダーのタイプは、次の 4 つのいずれかです。
<ul><li>カー</li>
<li>卓上</li>
<li>ローエンド（アナログ）卓上</li>
@@ -60,12 +60,12 @@
<p>最後の 2 つは、Android API レベル 11 で追加されたものです。したがって、ホルダーのタイプだけがわかればよく、デジタルとアナログの区別は問わないという場合は、次のように 3 つすべてについて調べるとよいでしょう。</p>
<pre>boolean isCar = dockState == EXTRA_DOCK_STATE_CAR;
-boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
+boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
dockState == EXTRA_DOCK_STATE_LE_DESK ||
dockState == EXTRA_DOCK_STATE_HE_DESK;</pre>
-<h2 id="MonitorDockState">ホルダーの装着状態またはタイプの変化を監視する</h2>
+<h2 id="MonitorDockState">ホルダーの装着状態またはタイプの変化を監視する</h2>
<p>端末がホルダーに装着されたり、装着が解除されたりするたびに、{@link android.content.Intent#ACTION_DOCK_EVENT} アクションがブロードキャストされます。端末のホルダー装着状態の変化を監視するには、次のコード例に示すように、アプリのマニフェスト内でブロードキャスト レシーバを登録します。</p>
diff --git a/docs/html-intl/intl/ja/training/monitoring-device-state/index.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/index.jd
index 07897b1..9a983e9 100644
--- a/docs/html-intl/intl/ja/training/monitoring-device-state/index.jd
+++ b/docs/html-intl/intl/ja/training/monitoring-device-state/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
-<h2>依存関係と前提条件</h2>
+<h2>依存関係と前提条件</h2>
<ul>
<li>Android 2.0（API レベル 5）以上</li>
<li>「<a href="{@docRoot}guide/components/intents-filters.html">インテントとインテント フィルタ</a>」を読み終えていること</li>
@@ -21,19 +21,19 @@
<li><a href="{@docRoot}guide/components/services.html">サービス</a>
</ul>
-</div>
+</div>
</div>
<p>アプリを開発するときは、ホスト端末の電池消費量への影響を抑えるよう心がける必要があります。このクラスを修了すると、開発するアプリの中でホスト端末の状態を監視し、それに基づいて機能や動作を変更することができるようになります。</p>
<p>接続が失われたときはバックグラウンド サービスの更新を停止する、電池残量が低下したときは更新の頻度を下げるといった対策を講じることにより、ユーザー エクスペリエンスを損なうことなく、アプリが電池消費量に及ぼす影響を最小限に抑えることができます。</p>
-<h2>レッスン</h2>
-
+<h2>レッスン</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
+will want to jump to a lesson or not.-->
+
<dl>
<dt><b><a href="battery-monitoring.html">電池残量と充電状態の監視</a></b></dt>
<dd>アプリの更新頻度を変更するために現在の電池残量や充電状態の変化を特定および監視する方法を学習します。</dd>
@@ -46,4 +46,4 @@
<dt><b><a href="manifest-receivers.html">オンデマンドでのブロードキャスト レシーバ操作</a></b></dt>
<dd>マニフェスト内で宣言したブロードキャスト レシーバのオンとオフを実行時に切り替えます。端末の状態に応じて、不要なレシーバを無効にすることができます。効率を上げるために、状態変化レシーバのオンとオフを切り替える方法や、端末が特定の状態になるまでアクションを延期する方法を学習します。</dd>
-</dl>
\ No newline at end of file
+</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ja/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/ja/training/monitoring-device-state/manifest-receivers.jd
index 7635d9f..eff1221 100644
--- a/docs/html-intl/intl/ja/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html-intl/intl/ja/training/monitoring-device-state/manifest-receivers.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>このレッスンの内容</h2>
@@ -23,7 +23,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">インテントとインテント フィルタ</a>
</ul>
-</div>
+</div>
</div>
<p>端末の状態変化を監視する最も単純な方法は、監視対象とする状態ごとに {@link android.content.BroadcastReceiver} を作成し、それぞれをアプリのマニフェスト内で登録するというものです。これらの各レシーバ内で、端末の現在の状態に基づいて反復アラームのスケジュールを再設定します。</p>
@@ -31,10 +31,10 @@
<p>この方法のデメリットは、これらのレシーバのいずれかがトリガされるたびに端末がスリープから復帰することですが、このことは必要以上に頻繁に発生する可能性があります。</p>
<p>これよりも良い方法は、実行時にブロードキャスト レシーバをオンまたはオフにするというものです。このようにすれば、マニフェスト内で宣言したレシーバを受動的アラームとして使用できます。つまり、このアラームは、必要なときにだけシステム イベントによって呼び出されます。</p>
-
-<h2 id="ToggleReceivers">効率を上げるために状態変化レシーバのオンとオフを切り替える </h2>
-
+
+<h2 id="ToggleReceivers">効率を上げるために状態変化レシーバのオンとオフを切り替える </h2>
+
<p>{@link android.content.pm.PackageManager} を使用すると、マニフェスト内で定義されているコンポーネントの有効化状態を切り替えることができます。このコンポーネントにはブロードキャスト レシーバも該当するので、次に示すようにオンとオフを切り替えることができます。</p>
<pre>ComponentName receiver = new ComponentName(context, myReceiver.class);
diff --git a/docs/html-intl/intl/ja/training/multiscreen/adaptui.jd b/docs/html-intl/intl/ja/training/multiscreen/adaptui.jd
index 8b1e6ac..c738d39 100644
--- a/docs/html-intl/intl/ja/training/multiscreen/adaptui.jd
+++ b/docs/html-intl/intl/ja/training/multiscreen/adaptui.jd
@@ -10,9 +10,9 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
-
+<div id="tb-wrapper">
+<div id="tb">
+
<h2>このレッスンでの学習内容</h2>
<ol>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">タブレットと携帯端末のサポート</a></li>
</ul>
-
+
<h2>試してみる</h2>
-
+
<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">サンプル アプリのダウンロード</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>アプリが現在表示しているレイアウトによって、UI フローが異なる可能性があります。たとえば、アプリがデュアルペイン モードであれば、左ペインのアイテムをクリックすると、単に右ペインにコンテンツが表示されるだけですが、シングルペイン モードであれば、コンテンツは（別のアクティビティ内の）コンテンツ専用のペインに表示される必要があります。</p>
@@ -56,7 +56,7 @@
setContentView(R.layout.main_layout);
View articleView = findViewById(R.id.article);
- mIsDualPane = articleView != null &&
+ mIsDualPane = articleView != null &&
articleView.getVisibility() == View.VISIBLE;
}
}
@@ -116,7 +116,7 @@
else {
/* use list navigation (spinner) */
actionBar.setNavigationMode(android.app.ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter adap = new ArrayAdapter<String>(this,
+ SpinnerAdapter adap = new ArrayAdapter<String>(this,
R.layout.headline_item, CATEGORIES);
actionBar.setListNavigationCallbacks(adap, handler);
}
@@ -168,7 +168,7 @@
public class HeadlinesFragment extends ListFragment {
...
@Override
- public void onItemClick(AdapterView<?> parent,
+ public void onItemClick(AdapterView<?> parent,
View view, int position, long id) {
if (null != mHeadlineSelectedListener) {
mHeadlineSelectedListener.onHeadlineSelected(position);
diff --git a/docs/html-intl/intl/ja/training/multiscreen/index.jd b/docs/html-intl/intl/ja/training/multiscreen/index.jd
index 9e01584..f1ee24a 100644
--- a/docs/html-intl/intl/ja/training/multiscreen/index.jd
+++ b/docs/html-intl/intl/ja/training/multiscreen/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
-<div id="tb">
-
-<h2>必要な知識と前提条件</h2>
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>必要な知識と前提条件</h2>
<ul>
<li>Android 1.6 以上（サンプル アプリを使用するには 2.1 以上）</li>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/screens_support.html">複数画面のサポート</a></li>
</ul>
-
-<h2>試してみる</h2>
-
-<div class="download-box">
+
+<h2>試してみる</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">サンプル アプリのダウンロード</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
-
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
+
<p>Android は、小さな携帯電話から大きなテレビまで、画面サイズも種類もさまざまなデバイスに搭載できます。そのため、できる限り多くのユーザーが使用できるように、すべての画面サイズに対応できるようアプリを設計することが重要になります。</p>
<p>しかし、さまざまな種類のデバイスに対応できるだけでは十分ではありません。画面サイズによって、ユーザーが操作できることが決まってくるため、本当にユーザーを満足させてよい印象を持ってもらうためには、アプリが単に複数の画面をサポートするだけでは不十分です: 画面設定ごとにユーザー エクスペリエンスを最適化する必要があります。<em></em><em></em></p>
@@ -48,17 +48,17 @@
<p class="note"><strong>注:</strong> このクラスと関連サンプルでは、<a
href="{@docRoot}tools/support-library/index.html">サポート ライブラリ</a>を使用します。理由は、Android 3.0 未満のバージョンで <PH>{@link android.app.Fragment}</PH> API を使用するためです。このクラスのすべての API を使用するには、ライブラリをダウンロードして、アプリに追加する必要があります。</p>
-
-<h2>レッスン</h2>
-
-<dl>
- <dt><b><a href="screensizes.html">さまざまな画面サイズのサポート</a></b></dt>
- <dd>このレッスンでは、さまざまな画面サイズに適したレイアウトを（柔軟なビュー サイズ、 <PH>{@link android.widget.RelativeLayout}</PH>、画面サイズと画面の向きの修飾子、エイリアス フィルタ、ナインパッチ ビットマップを使用して）設計する方法について学習します。</dd>
-
- <dt><b><a href="screendensities.html">さまざまな画面密度のサポート</a></b></dt>
- <dd>このレッスンでは、（密度非依存ピクセルを使用し、各密度に適したビットマップを提供して）ピクセル密度が異なる画面をサポートする方法について学習します。</dd>
-
- <dt><b><a href="adaptui.html">順応性のある UI フローの実装</a></b></dt>
- <dd>このレッスンでは、いくつかの画面サイズ/密度の組み合わせに適した方法（実行時にアクティブなレイアウトを検出する方法、現在のレイアウトに合わせて応答する方法、画面設定の変更を処理する方法）で UI を実装する方法について学習します。</dd>
-</dl>
+
+<h2>レッスン</h2>
+
+<dl>
+ <dt><b><a href="screensizes.html">さまざまな画面サイズのサポート</a></b></dt>
+ <dd>このレッスンでは、さまざまな画面サイズに適したレイアウトを（柔軟なビュー サイズ、 <PH>{@link android.widget.RelativeLayout}</PH>、画面サイズと画面の向きの修飾子、エイリアス フィルタ、ナインパッチ ビットマップを使用して）設計する方法について学習します。</dd>
+
+ <dt><b><a href="screendensities.html">さまざまな画面密度のサポート</a></b></dt>
+ <dd>このレッスンでは、（密度非依存ピクセルを使用し、各密度に適したビットマップを提供して）ピクセル密度が異なる画面をサポートする方法について学習します。</dd>
+
+ <dt><b><a href="adaptui.html">順応性のある UI フローの実装</a></b></dt>
+ <dd>このレッスンでは、いくつかの画面サイズ/密度の組み合わせに適した方法（実行時にアクティブなレイアウトを検出する方法、現在のレイアウトに合わせて応答する方法、画面設定の変更を処理する方法）で UI を実装する方法について学習します。</dd>
+</dl>
diff --git a/docs/html-intl/intl/ja/training/multiscreen/screendensities.jd b/docs/html-intl/intl/ja/training/multiscreen/screendensities.jd
index 3482d5c..6f9136c 100644
--- a/docs/html-intl/intl/ja/training/multiscreen/screendensities.jd
+++ b/docs/html-intl/intl/ja/training/multiscreen/screendensities.jd
@@ -12,8 +12,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>このレッスンでの学習内容</h2>
<ol>
@@ -29,15 +29,15 @@
</ul>
<h2>試してみる</h2>
-
-<div class="download-box">
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">サンプル アプリのダウンロード</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>このレッスンでは、異なるリソースを生成し、かつ解像度非依存単位を使用して、異なる画面密度をサポートする方法について学習します。</p>
@@ -48,8 +48,8 @@
<p>たとえば、2 つのビューの間にスペースを挿入する場合は、<code>px</code> ではなくて <code>dp</code> を使用します:</p>
<pre>
-<Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+<Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/clickme"
android:layout_marginTop="20dp" />
</pre>
@@ -57,8 +57,8 @@
<p>テキスト サイズを指定する場合は、常に <code>sp</code> を使用します:</p>
<pre>
-<TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
+<TextView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:textSize="20sp" />
</pre>
diff --git a/docs/html-intl/intl/ja/training/multiscreen/screensizes.jd b/docs/html-intl/intl/ja/training/multiscreen/screensizes.jd
index 3655a33..49c1793 100644
--- a/docs/html-intl/intl/ja/training/multiscreen/screensizes.jd
+++ b/docs/html-intl/intl/ja/training/multiscreen/screensizes.jd
@@ -10,8 +10,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>このレッスンでの学習内容</h2>
<ol>
@@ -30,26 +30,26 @@
<li><a href="{@docRoot}guide/practices/screens_support.html">複数画面のサポート</a></li>
</ul>
-<h2>試してみる</h2>
-
-<div class="download-box">
+<h2>試してみる</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">サンプル アプリのダウンロード</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
<p>このレッスンでは、異なる画面サイズを以下のような方法でサポートする方法について学習します:</p>
-<ul>
- <li>画面に収まるようにレイアウト サイズを適切に変更する</li>
- <li>画面設定に基づいて適切な UI レイアウトを表示する</li>
+<ul>
+ <li>画面に収まるようにレイアウト サイズを適切に変更する</li>
+ <li>画面設定に基づいて適切な UI レイアウトを表示する</li>
<li>適切な画面に適切なレイアウトを適用する</li>
- <li>適切にサイズ調整したビットマップを表示する</li>
-</ul>
+ <li>適切にサイズ調整したビットマップを表示する</li>
+</ul>
-<h2 id="TaskUseWrapMatchPar">「wrap_content」と「match_parent」を使用する</h2>
+<h2 id="TaskUseWrapMatchPar">「wrap_content」と「match_parent」を使用する</h2>
<p>レイアウトをさまざまな画面サイズに柔軟に対応させるには、一部のビュー コンポーネントの幅と高さに <code>"wrap_content"</code> と <code>"match_parent"</code> を使用する必要があります。<code>"wrap_content"</code> を使用すると、ビューの幅や高さがそのビュー内にコンテンツが収まるのに必要な最小サイズに設定されます。一方、<code>"match_parent"</code>（API レベル 8 より前の名称は <code>"fill_parent"</code>）を使用すると、コンポーネントがその親ビューのサイズに一致するまで拡大されます。</p>
@@ -65,7 +65,7 @@
<p class="img-caption"><strong>図 1.</strong> News Reader サンプル アプリの縦表示（左）と横表示（右）</p>
-<h2 id="TaskUseRelativeLayout">RelativeLayout を使用する</h2>
+<h2 id="TaskUseRelativeLayout">RelativeLayout を使用する</h2>
<p>ネストされた <PH>{@link android.widget.LinearLayout} インスタンスや、</PH> <code>"wrap_content"</code> と <code>"match_parent"</code> のサイズの組み合わせを使用すると、かなり複雑なレイアウトを作成できます。しかし、 <PH>{@link android.widget.LinearLayout}</PH> では、子ビューの空間的な位置関係を正確に制御することはできません。 <PH>{@link android.widget.LinearLayout} のビューは、</PH> 単に一列に並ぶだけです。子ビューに対して直線以外のさまざまな配置を実現する必要がある場合は、 <PH>{@link android.widget.RelativeLayout}</PH>を使用することでうまくいくことがよくあります。たとえば、1 つの子ビューを画面の左側に配置し、もう 1 つの子ビューを右側に配置できます。</p>
@@ -115,8 +115,8 @@
<p>コンポーネントのサイズが変更されても、 <PH>{@link android.widget.RelativeLayout.LayoutParams}</PH>で指定されたとおりに空間的な位置関係が維持されていることがわかります。</p>
-
-<h2 id="TaskUseSizeQuali">サイズ修飾子を使用する</h2>
+
+<h2 id="TaskUseSizeQuali">サイズ修飾子を使用する</h2>
<p>柔軟なレイアウトや相対的なレイアウトから得られる恩恵は、前のセクションで説明したことくらいです。これらのレイアウトはコンポーネントの内部や周囲のスペースを引き延ばすことでさまざまな画面に対応しますが、それぞれの画面サイズに合った最高のユーザー エクスペリエンスを実現していない可能性があります。したがって、アプリでは、柔軟なレイアウトの実装だけではなく、さまざまな画面設定に合わせた複数の代替レイアウトも必要になります。これは、<a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">設定修飾子</a>を使用することで実現可能です。設定修飾子により、ランタイムが現在のデバイスの設定に基づいて適切なリソース（画面サイズ別のレイアウト デザインなど）を自動的に選択できます。</p>
@@ -158,7 +158,7 @@
<p>ただし、Android 3.2 未満のデバイスではこの修飾子は機能しません。これは <code>sw600dp</code> をサイズ修飾子として認識できないためです。したがって、引き続き <code>large</code> 修飾子も使用する必要があります。そこで、<code>res/layout-sw600dp/main.xml</code> と同じ内容の <code>res/layout-large/main.xml</code> という名前のファイルも必要になります。次のセクションでは、このようにレイアウト ファイルの重複を避けるためのテクニックについて学習します。</p>
-<h2 id="TaskUseAliasFilters">レイアウト エイリアスを使用する</h2>
+<h2 id="TaskUseAliasFilters">レイアウト エイリアスを使用する</h2>
<p>最小幅修飾子は、Android 3.2 以上でしか利用できません。したがって、旧バージョンとの互換性を維持するために、あいまいなサイズ分類（small、normal、large、xlarge）も併用することが必要です。たとえば、携帯端末ではシングルペイン UI、7 インチ タブレットやテレビなどの大きなデバイスではマルチペイン UI を表示するよう UI を設計する場合、以下のようなファイルが必要になります:</p>
@@ -202,7 +202,7 @@
<PH>Android 3.2 未満のタブレット/テレビは {@code large} に一致し、</PH>Android 3.2 以上のタブレット/テレビは <code>sw600dp</code> に一致します）タブレット/テレビに適用されます。</p>
-<h2 id="TaskUseOriQuali">画面の向きの修飾子を使用する</h2>
+<h2 id="TaskUseOriQuali">画面の向きの修飾子を使用する</h2>
<p>横表示と縦表示が両方とも正しく表示されるレイアウトもありますが、ほとんどのレイアウトは調整が必要になります。以下に、News Reader サンプル アプリの各画面のサイズと向きでレイアウトがどのように表示されるかを示します:</p>
diff --git a/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..7593670
--- /dev/null
+++ b/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,213 @@
+page.title=ピクチャ イン ピクチャ
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>このドキュメントの内容</h2>
+<ol>
+ <li><a href="#declaring">アクティビティがピクチャ イン ピクチャをサポートしていることを宣言する
+</a></li>
+ <li><a href="#pip_button">アクティビティをピクチャ イン ピクチャに切り替える</a>
+</li>
+ <li><a href="#handling_ui">ピクチャ イン ピクチャの実行中に UI を処理する</a>
+</li>
+ <li><a href="#continuing_playback">ピクチャ イン ピクチャの実行中に動画の再生を続行する
+</a></li>
+ <li><a href="#single_playback">ピクチャ イン ピクチャで単一の再生アクティビティを使用する
+</a></li>
+ <li><a href="#best">ベスト プラクティス</a></li>
+</ol>
+
+<h2>関連ドキュメント</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">マルチ ウィンドウのサポート
+</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>Android N では、Android TV ユーザーは、アプリを操作するときに画面の隅に固定されたウィンドウで動画を視聴できるようになりました。
+
+ピクチャ イン ピクチャ（PIP）モードを使用すると、アプリはバックグランドで別のアクティビティを続けながら、固定されたウィンドウで動画アクティビティを実行できるようになります。
+
+PIP ウィンドウでは、アプリの使用中にマルチタスクを実行できます。これにより、ユーザーの作業効率が向上します。
+</p>
+
+<p>アプリで、PIP モードをトリガーするタイミングを決めることができます。次に、PIP モードの開始時点の例を示します。
+</p>
+
+<ul>
+<li>ユーザーが別のコンテンツをブラウジングするために動画から別のコンテンツに切り替えると、アプリは動画を PIP モードに切り替えることができます。
+</li>
+<li>コンテンツのエピソード終了の画面が表示されている間、アプリは動画を PIP モードに切り替えることができます。
+メイン画面には、シリーズの次のエピソードに関するプロモーションや概要の情報が表示されます。
+</li>
+<li>アプリで、ユーザーが動画を視聴している間に、追加のコンテンツのキューを作成する方法を提供できます。
+メイン画面でコンテンツの選択アクティビティを表示している間に、動画は PIP モードで再生を続行できます。
+</li>
+</ul>
+
+<p>PIP ウィンドウは 240 x 135 dp で、画面の 4 つのコーナーのうちいずれかの一番上のレイヤに表示されます。表示する場所はシステムによって選択されます。
+ユーザーは PIP メニューを表示して、PIP ウィンドウを全画面表示に切り替えたり、リモコンの [<b>Home</b>] ボタンを押して PIP ウィンドウを閉じたりすることができます。
+
+別の動画がメイン画面で再生を開始すると、PIP ウィンドウは自動的に閉じます。
+
+最近使ったアプリから PIP ウィンドウを閉じることもできます。</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>図 1.</strong> ユーザーがメイン画面でコンテンツを閲覧中に画面の隅に表示されるピクチャ イン ピクチャの動画
+
+</p>
+
+<p>PIP では、Android N で使用可能なマルチウィンドウ API を活用し、固定された動画オーバーレイ ウィンドウを表示します。
+PIP をアプリに追加するには、PIP をサポートするアクティビティを登録し、必要に応じてアクティビティを PIP モードに切り替えて、UI 要素を非表示にして、アクティビティが PIP モードを開始しても動画の再生が続行されるようにします。
+
+
+</p>
+
+<h2 id="declaring">アクティビティがピクチャ イン ピクチャをサポートしていることを宣言する</h2>
+
+<p>デフォルトでは、システムはアプリの PIP を自動的にサポートしません。アプリで PIP をサポートする場合、マニフェストで
+<code>android:supportsPictureInPicture</code> および
+<code>android:resizeableActivity</code> を <code>true</code> に設定して、動画アクティビティを登録します。
+
+また、アクティビティがレイアウトの設定変更を処理するように指定して、PIP モードの遷移中にレイアウト変更が発生しても、アクティビティが再開しないようにします。
+
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>アクティビティを登録する際は、PIP モードでは、アクティビティが TV 画面の小さなオーバーレイ ウィンドウに表示される点に注意してください。
+動画の再生アクティビティは、最小限の UI にすることで最高のユーザー エクスペリエンスを提供できます。
+小さな UI 要素を含むアクティビティでは、PIP モードに切り替えたときに優れたユーザー エクスペリエンスを提供できない可能性があります。PIP ウィンドウでは、その UI 要素の詳細が見えづらくなるためです。
+
+
+</p>
+
+<h2 id="pip_button">アクティビティをピクチャ イン ピクチャに切り替える</h2>
+
+アクティビティを PIP モードに切り替える必要があるときは、
+<code>Activity.enterPictureInPictureMode()</code> を呼び出します。次の例では、ユーザーがメディア コントロール バーにある専用の PIP ボタンを選択したときに、PIP モードに切り替わります。
+
+</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>メディア コントロール バーに PIP ボタンを追加すると、ユーザーが動画の再生を操作中に、簡単に PIP モードに切り替えることができます。
+</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>図 1.</strong> メディア コントロール バー上の [Picture-in-picture] ボタン
+</p>
+
+<p>Android N には、新しい
+<code>PlaybackControlsRow.PictureInPictureAction</code> クラスが含まれています。このクラスは、コントロール バーの PIP アクションと PIP アイコンの使用方法を定義します。
+</p>
+
+<h2 id="handling_ui">ピクチャ イン ピクチャの実行中に UI を処理する</h2>
+
+<p>アクティビティが PIP モードを開始したら、動画の再生のみを表示する必要があります。
+アクティビティが PIP を開始する前に UI 要素を削除して、再び全画面表示に戻ったら、削除した要素を復元します。<code>Activity.onPictureInPictureModeChanged()</code> または
+<code>Fragment.onPictureInPictureModeChanged()</code> をオーバーライドして、必要に応じて UI 要素を有効または無効にします。次に例を示します。
+
+
+</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">ピクチャ イン ピクチャの実行中に動画の再生を続行する
+</h2>
+
+<p>アクティビティを PIP に切り替えると、システムはそのアクティビティを一時停止状態と見なして、アクティビティの <code>onPause()</code> メソッドを呼び出します。
+PIP モードによってアクティビティが一時停止になっても、動画の再生は一時停止せず、再生を続ける必要があります。
+
+アクティビティの
+<code>onPause()</code> メソッドで PIP を確認し、適切に再生を処理してください。次に例を示します。
+</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>アクティビティが PIP モードを終了して全画面モードに戻ると、システムはアクティビティを再開して <code>onResume()</code> メソッドを呼び出します。
+</p>
+
+<h2 id="single_playback">ピクチャ イン ピクチャで単一の再生アクティビティを使用する
+</h2>
+
+<p>動画再生アクティビティが PIP モードのときに、ユーザーがアプリのメイン画面でコンテンツをブラウズ中に新しい動画を選択することがあります。
+全画面モードの既存の再生アクティビティで新しい動画を再生します。新しいアクティビティを起動するとユーザーが混乱する可能性があります。
+
+</p>
+
+<p>動画再生リクエストに対して単一のアクティビティが使用されるようにし、必要に応じて PIP モードの切り替えが行われるようにするには、マニフェストでアクティビティの
+<code>android:launchMode</code> を <code>singleTask</code> に設定します。
+
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>アクティビティで、{@link android.app.Activity#onNewIntent
+Activity.onNewIntent()} をオーバーライドして新しい動画を処理し、既存の動画再生を必要に応じて停止します。
+</p>
+
+<h2 id="best">ベスト プラクティス</h2>
+
+<p>PIP は、動画を全画面表示で再生するアクティビティに使用します。アクティビティを PIP モードに切り替えるときは、動画コンテンツ以外は何も表示しないでください。アクティビティが PIP モードを開始したタイミングを検出し、<a href="#handling_ui">ピクチャ イン ピクチャの実行中に UI を処理する</a>で説明したように、UI 要素を非表示にします。
+
+
+</p>
+
+<p>PIP ウィンドウは画面の隅にフローティング ウィンドウとして表示されるため、メイン画面のどの場所にも重要な情報を表示しないでください。PIP ウィンドウによって隠れる可能性があります。
+
+</p>
+
+<p>アクティビティが PIP モードになると、デフォルトで、入力フォーカスは失われます。PIP モードで動作中に入力イベントを受け付けるには、
+<code>MediaSession.setMediaButtonReceiver()</code> を使用します。
+</p>
diff --git a/docs/html-intl/intl/ja/preview/features/tv-recording-api.jd b/docs/html-intl/intl/ja/training/tv/tif/content-recording.jd
similarity index 100%
rename from docs/html-intl/intl/ja/preview/features/tv-recording-api.jd
rename to docs/html-intl/intl/ja/training/tv/tif/content-recording.jd
diff --git a/docs/html-intl/intl/ko/about/versions/android-5.0.jd b/docs/html-intl/intl/ko/about/versions/android-5.0.jd
index 48d542e..b4217c6 100644
--- a/docs/html-intl/intl/ko/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/ko/about/versions/android-5.0.jd
@@ -381,7 +381,7 @@
<h3 id="AudioPlayback">오디오 재생</h3>
<p>이 출시 버전에는 다음과 같은 {@link android.media.AudioTrack}에 대한 변경사항이 포함되어 있습니다.</p>
<ul>
- <li>이제 앱에서 부동 소수점 형식({@link android.media.AudioFormat#ENCODING_PCM_FLOAT ENCODING_PCM_FLOAT})으로 오디오 데이터를 제공할 수 있습니다. 이를 통해 더 큰 음량비, 더 일관된 정밀도 및 더 큰 헤드룸이 가능해졌습니다. 부동 소수점 연산은 중간 과정 계산에 특히 유용합니다. 재생 엔드포인트는 오디오 데이터에 낮은 비트 심도로 정수 형식을 사용합니다 (Android 5.0에서 일부 내부 파이프라인은 아직 부동 소수점이 아님).
+ <li>이제 앱에서 부동 소수점 형식({@link android.media.AudioFormat#ENCODING_PCM_FLOAT ENCODING_PCM_FLOAT})으로 오디오 데이터를 제공할 수 있습니다. 이를 통해 더 큰 음량비, 더 일관된 정밀도 및 더 큰 헤드룸이 가능해졌습니다. 부동 소수점 연산은 중간 과정 계산에 특히 유용합니다. 재생 엔드포인트는 오디오 데이터에 낮은 비트 심도로 정수 형식을 사용합니다 (Android 5.0에서 일부 내부 파이프라인은 아직 부동 소수점이 아님).
<li>이제 앱에서 오디오 데이터를 {@link android.media.MediaCodec}에서 제공하는 것과 같은 형식인 {@link java.nio.ByteBuffer}로 제공할 수 있습니다.
<li>{@link android.media.AudioTrack#WRITE_NON_BLOCKING WRITE_NON_BLOCKING} 옵션은 일부 앱에서 버퍼링 및 멀티스레딩을 단순화할 수 있습니다.
</ul>
@@ -429,7 +429,7 @@
<p>시스템에서 적절한 네트워크를 감지하면 감지한 네트워크에 연결하고 {@link android.net.ConnectivityManager.NetworkCallback#onAvailable(android.net.Network) onAvailable()} 콜백을 호출합니다. 콜백의 {@link android.net.Network} 개체를 사용하여 네트워크에 대한 추가 정보를 가져오거나, 트래픽이 선택한 네트워크를 사용하도록 유도합니다.</p>
<h3 id="BluetoothBroadcasting">저전력 블루투스</h3>
-<p>Android 4.3에서는 <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">저전력 블루투스</a>(<em>블루투스 LE</em>)에 대한 플랫폼 지원이 도입되었습니다. Android 5.0에서는 Android 기기가 블루투스 LE <em>주변기기</em>로 작동할 수 있습니다. 앱에서 이 기능을 사용하여 주변 기기에 블루투스로 연결할 수 있음을 알릴 수 있습니다. 예를 들어 기기가 만보계나 건강 모니터링 기기로 작동하면서 다른 블루투스 LE 기기와 데이터를 통신할 수 있도록 하는 앱을 제작할 수 있습니다.</p>
+<p>Android 4.3에서는 <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">저전력 블루투스</a>(<em>블루투스 LE</em>)에 대한 플랫폼 지원이 도입되었습니다. Android 5.0에서는 Android 기기가 블루투스 LE <em>주변기기</em>로 작동할 수 있습니다. 앱에서 이 기능을 사용하여 주변 기기에 블루투스로 연결할 수 있음을 알릴 수 있습니다. 예를 들어 기기가 만보계나 건강 모니터링 기기로 작동하면서 다른 블루투스 LE 기기와 데이터를 통신할 수 있도록 하는 앱을 제작할 수 있습니다.</p>
<p>새 {@link android.bluetooth.le} API를 사용하면 앱에서 광고를 브로드캐스팅하고, 응답을 스캔하며, 주변의 블루투스 LE 기기와 연결을 설정하도록 할 수 있습니다. 새 광고 및 스캔 기능을 사용하려면 매니페스트에 {@link android.Manifest.permission#BLUETOOTH_ADMIN BLUETOOTH_ADMIN} 권한을 추가합니다. 사용자가 Play 스토어에서 앱을 업데이트하거나 다운로드할 때 사용자에게 앱에 권한을 부여할 것인지 묻는 메시지('블루투스 연결 정보: 주변의 블루투스 기기에 브로드캐스팅하거나 이러한 기기에 대한 정보 수집하는 등 앱에서 블루투스를 제어하도록 허용합니다.')가 표시됩니다.</p>
<p>다른 앱에서 내 앱을 찾을 수 있도록 블루투스 LE 광고를 시작하려면 {@link android.bluetooth.le.BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback) startAdvertising()}을 호출하고 이를 {@link android.bluetooth.le.AdvertiseCallback} 클래스 구현에 전달합니다. 콜백 개체는 광고 작업의 성공 또는 실패에 대한 보고서를 수신합니다.</p>
diff --git a/docs/html-intl/intl/ko/about/versions/marshmallow/android-6.0-testing.jd b/docs/html-intl/intl/ko/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..1222227
--- /dev/null
+++ b/docs/html-intl/intl/ko/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=테스트 가이드
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#runtime-permissions">권한 테스트</a></li>
+ <li><a href="#doze-standby">잠자기 및 앱 대기 모드 테스트</a></li>
+ <li><a href="#ids">자동 백업 및 기기 식별자</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N에서는 앱이 차기 버전의 플랫폼에서 제대로 작동하는지 확인해볼 수 있습니다.
+ 이 프리뷰에는 앱에 영향을 미칠 수 있는 수많은 API와 동작 변경 사항이 포함되어 있습니다. 이에 대해서는 <a href="{@docRoot}preview/api-overview.html">API 개요</a>와 <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>에 설명되어 있습니다.
+
+ 프리뷰로 앱을 테스트할 때에는 사용자에게 좋은 환경을 제공하기 위해 개발자 여러분이 꼭 초점을 맞춰야 하는 몇 가지 특정한 시스템 변경사항이 있습니다.
+
+
+</p>
+
+<p>
+ 이 가이드에서는 앱에서 테스트할 프리뷰 기능은 어떤 것이고, 테스트 방법은 어떤지에 대해 설명합니다. 이와 같은 특정 프리뷰 기능을 먼저 테스트하는 것이 좋습니다. 왜냐하면 이들 기능은 앱의 동작에 큰 영향을 미칠 가능성이 높기 때문입니다.
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">권한</a>
+ </li>
+ <li><a href="#doze-standby">잠자기 및 앱 대기 모드</a>
+ </li>
+ <li><a href="#ids">자동 백업 및 기기 식별자</a></li>
+</ul>
+
+<p>
+ 테스트용 프리뷰 시스템 이미지로 기기 또는 가상 기기를 설정하는 방법에 대한 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html">Android N SDK 설정</a>을 참조하세요.
+
+
+</p>
+
+
+<h2 id="runtime-permissions">권한 테스트</h2>
+
+<p>
+ 새로운 <a href="{@docRoot}preview/features/runtime-permissions.html">권한</a> 모델은 사용자가 여러분의 앱에 권한을 할당하는 방법을 바꿔 놓습니다.
+ 설치 절차 중에 모든 권한을 허용하는 것이 아니라, 앱이 런타임에 사용자에게 각각의 권한을 요청해야 합니다.
+
+ 사용자 입장에서는 이러한 동작으로 각 앱의 액티비티에 대해 더 세분화된 제어권을 행사할 수 있을 뿐만 아니라 이 앱이 어째서 특정한 권한을 요청하고 있는 것인지 맥락을 더 잘 이해할 수 있게 되기도 합니다.
+ 사용자는 언제든 앱에 개별적으로 권한을 허용할 수 있고, 이를 취소할 수도 있습니다.
+ 미리 보기의 이러한 기능은 앱의 동작에 영향을 미칠 가능성이 가장 높고, 앱의 몇 가지 기능이 작동하지 않도록 막거나 저하된 상태로 작동하게 할 수도 있습니다.
+
+
+</p>
+
+<p class="caution">
+ 이 변경 내용은 새 플랫폼에서 실행되는 모든 앱에 영향을 비치며, 새 플랫폼 버전을 대상으로 하지 않는 앱도 예외가 아닙니다.
+ 레거시 앱에 대해 플랫폼이 제한된 호환성 동작을 제공하기는 하지만, 지금 바로 새 권한 모델로 앱의 마이그레이션 계획을 시작하는 편이 좋습니다. 플랫폼이 공식적으로 출시될 때에 맞춰 앱의 업데이트된 버전을 게시하는 것을 목표로 하십시오.
+
+
+</p>
+
+
+<h3 id="permission-test-tips">테스트 팁</h3>
+
+<p>
+ 다음은 새 권한 동작에 대해 앱 테스트를 계획하고 실행하는 데 유용한 몇 가지 테스트 팁입니다.
+
+</p>
+
+<ul>
+ <li>앱의 현재 권한과 관련된 코드 경로를 확인합니다.</li>
+ <li>권한 보호된 서비스 및 데이터 전반에 걸친 사용자 흐름을 테스트합니다.</li>
+ <li>허용된/취소된 권한을 여러 가지로 조합하여 테스트합니다.</li>
+ <li>명령줄에서 권한을 관리할 때 {@code adb} 도구를 사용합니다.
+ <ul>
+ <li>권한과 상태를 그룹별로 목록으로 나열합니다.
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>하나 이상의 권한을 다음과 같은 구문을 사용하여 허용하거나 취소합니다.<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>권한을 사용하는 서비스에 대해 앱을 분석해봅니다.</li>
+</ul>
+
+<h3 id="permission-test-strategy">테스트 전략</h3>
+
+<p>
+ 권한을 변경하면 앱의 구조와 디자인은 물론 사용자 환경과, 개발자가 사용자에게 제공하는 흐름에도 영향을 미칩니다.
+ 앱의 현재 권한 사용 내용을 평가한 다음 제공하고자 하는 새로운 흐름을 계획하기 시작해야 합니다.
+ 플랫폼의 공식 릴리스에서 호환성 동작을 제공할 예정이지만, 이와 같은 동작에만 의존하지 말고 앱 업데이트를 계획하는 것이 좋습니다.
+
+
+</p>
+
+<p>
+ 앱이 실제로 필요로 하고 사용하는 권한을 확인한 다음, 권한 보호된 서비스를 사용하는 여러 가지 코드 경로를 찾습니다.
+ 이렇게 하려면 새 플랫폼에서 여러 가지로 조합한 테스트를 거치고 코드 분석을 통해야 합니다.
+ 테스트에서는 런타임 권한에 옵트인하는 것에 초점을 맞춰야 합니다. 이를 위해 앱의 {@code targetSdkVersion}을 프리뷰 버전으로 변경하세요.
+ 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html#">Android N SDK 설정</a>을 참조하세요.
+
+
+</p>
+
+<p>
+ 다양한 조합의 권한을 해지하고 추가하는 방식으로 테스트를 수행하여 권한에 종속되는 사용자 흐름을 파악합니다.
+ 종속성이 분명하지 않거나 논리적인 경우, 리팩터링을 고려해 보거나 해당 흐름을 구분하여 종속성을 제거, 또는 해당 권한이 왜 필요한지 분명히 하는 방안을 고려해야 합니다.
+
+
+</p>
+
+<p>
+ 런타임 권한의 동작, 테스트 및 모범 사례에 대한 자세한 정보는 <a href="{@docRoot}preview/features/runtime-permissions.html">권한</a> 개발자 미리 보기 페이지를 참조하십시오.
+
+
+</p>
+
+
+<h2 id="doze-standby">잠자기 및 앱 대기 모드 테스트</h2>
+
+<p>
+ 잠자기 및 앱 대기 모드의 절전 기능은 기기가 유휴 상태에 있을 때 또는 사용자가 앱에 초점을 맞추고 있지 않을 때 앱이 수행할 수 있는 배경 처리의 양을 제한합니다.
+ 시스템이 앱에 부과할 수 있는 제한 사항에는 네트워크 액세스를 제한하거나 없애기, 배경 작업을 일시 중지시키기, 알림 일시 중지, 절전 모드 해제 및 알람 요청 무시 등이 포함됩니다.
+
+ 이러한 절전 기능에 앱이 적절히 동작하도록 확실히 해 두려면 이와 같은 저전력 상태를 시뮬레이트하여 앱을 테스트해보아야 합니다.
+
+
+</p>
+
+<h4 id="doze">앱에서 잠자기 모드 테스트하기</h4>
+
+<p>앱에서 잠자기 모드를 테스트하려면:</p>
+
+<ol>
+<li>Android N 시스템 이미지로 하드웨어 기기 또는 가상 기기를 구성합니다.</li>
+<li>기기를 개발 머신에 연결하고 앱을 설치합니다.</li>
+<li>앱을 실행시킨 다음 활성 상태로 그냥 둡니다.</li>
+<li>다음 명령을 실행하여 기기가 잠자기 모드에 들어가는 것을 시뮬레이션합니다.
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>기기가 다시 활성화되면 앱이 어떻게 동작하는지 살펴봅니다. 기기가 잠자기 모드를 종료할 때 정상적으로 복구되는지 확인해야 합니다.
+</li>
+</ol>
+
+
+<h4 id="standby">앱에서 앱 대기 모드 테스트하기</h4>
+
+<p>앱에서 앱 대기 모드를 테스트하려면:</p>
+
+<ol>
+ <li>Android N 시스템 이미지로 하드웨어 기기 또는 가상 기기를 구성합니다.</li>
+ <li>기기를 개발 머신에 연결하고 앱을 설치합니다.</li>
+ <li>앱을 실행시킨 다음 활성 상태로 그냥 둡니다.</li>
+ <li>다음 명령을 실행하여 앱이 대기 모드에 들어가는 것을 시뮬레이션합니다.
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>다음 명령을 사용하여 앱이 대기 모드에서 해제되는 것을 시뮬레이션합니다.
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>앱이 대기 모드에서 해제된 상태에서 어떻게 동작하는지 살펴봅니다. 대기 모드에서 정상적으로 복구되는지 확인해야 합니다.
+ 특히, 앱의 알림과 배경 작업이 계속 예상했던 대로 기능하는지 확인해야 합니다.
+</li>
+</ol>
+
+<h2 id="ids">앱용 자동 백업 및 기기별 식별자</h2>
+
+<p>앱이 내부 저장소에서 각 기기에 따라 다른 식별자(예: Google Cloud Messaging 등록 ID)를 유지하는 경우, 모범 사례를 따라 저장소 위치를 자동 백업에서 배제해야 합니다. 이 내용은 <a href="{@docRoot}preview/backup/index.html">앱용 자동 백업</a>에 설명되어 있습니다.
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..d30048f
--- /dev/null
+++ b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,610 @@
+page.title=동작 변경 사항
+page.keywords=preview, sdk, 호환성
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>이 문서의 내용</h2>
+
+<ol>
+ <li><a href="#perf">성능 향상</a>
+ <ol>
+ <li><a href="#doze">잠자기 모드</a></li>
+ <li><a href="#bg-opt">백그라운드 최적화</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">권한 변경</a>
+ </li>
+ <li><a href="#sharing-files">앱 사이의 파일 공유</a></li>
+ <li><a href="#accessibility">접근성 향상</a>
+ <ol>
+ <li><a href="#screen-zoom">화면 확대/축소</a></li>
+ <li><a href="#vision-settings">설정 마법사의 Vision Settings</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">플랫폼 라이브러리에 연결되는 NDK 앱</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">주석 보존</a></li>
+ <li><a href="#other">기타 중요한 사항</a></li>
+</ol>
+
+<h2>참고 항목</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">
+ Android N API 개요</a></li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Android N에는 새로운 기능 및 특징과 더불어
+다양한 시스템 변경 사항 및 API 동작 변경 사항이 포함되어 있습니다. 이 문서에서는
+여러분이 앱에서 숙지하고 고려해야 하는 몇 가지
+주요 변경 사항을 소개하겠습니다.
+</p>
+
+<p>
+ 이전에 Android용 앱을 게시한 적이 있으신 경우, 이와 같은
+ 플랫폼 변경으로 인해 앱이 영향을 받을 수 있다는 점을 유의하세요.
+</p>
+
+
+<h2 id="perf">배터리와 메모리</h2>
+
+<p>
+Android N에는 기기의 배터리 수명을 연장하고 RAM 사용량을 감소시키기 위한
+시스템 동작 변경 사항이 포함됩니다. 이러한 변경 사항은, 앱이 특정한 암시적 인텐트를 통해
+다른 앱과 상호 작용하는 방식과 함께, 시스템 리소스에 대한
+앱의 액세스에 영향을 미칠 수 있습니다.
+</p>
+
+<h3 id="doze">잠자기 모드</h3>
+
+<p>
+ Android 6.0(API 레벨 23)에 도입된 잠자기 모드는 사용자가 기기의
+플러그를 뽑고 정지 상태에서 화면이 꺼져 있을 때 CPU 및
+네트워크 액티비티를 지연시켜서 배터리 수명을 개선해 줍니다. Android N에서는
+기기의 플러그를 뽑고 화면이 꺼져 있는 동안
+CPU 및 네트워크 제한의 하위 세트를 적용하여 잠자기 모드를 더욱
+향상시켜 주지만, 반드시 정지 상태일 필요는 없습니다(예: 핸드셋을 사용자의 주머니에 넣고 다니는 경우).
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>그림 1.</strong> 잠자기 모드에서 배터리 수명을 개선하기 위해 첫 번째 레벨의 시스템 액티비티 제한을
+적용하는 방법에 대한 그림.
+</p>
+
+<p>
+ 기기가 배터리 전원에 연결되고 일정 시간 동안 화면이 꺼져 있는 경우
+기기가 잠자기 모드로 전환되고 첫 번째 하위 세트의 제한을 적용합니다. 기기는 앱
+네트워크 액세스를 차단하고, 작업과 동기화를 지연시킵니다. 기기가 잠자기 모드로
+전환된 후 일정 시간 동안 정지 상태에 있으면, 시스템은 잠자기 모드의 나머지 제한 사항을 {@link android.os.PowerManager.WakeLock},
+{@link android.app.AlarmManager} 알람, GPS 및 Wi-Fi 스캔에
+적용합니다. 일부 잠자기 모드 제한이
+적용되든 모든 잠자기 모드 제한이 적용되든 상관없이,
+시스템은 잠시 동안의 유지 관리 기간 중에 기기를 깨우며, 이 기간 중에는
+애플리케이션의 네트워크 액세스가 허용되고 지연된 작업/동기화가 실행됩니다.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>그림 2.</strong> 기기가 일정 시간 동안 정지 상태에 있은 후에
+잠자기 모드에서 두 번째 레벨의 시스템 액티비티 제한을 적용하는 방법에 대한 그림.
+</p>
+
+<p>
+ 화면을 활성화하거나 기기의 플러그를 꽂으면 잠자기 모드가
+종료되고 이러한 처리 제한이 제거됩니다. <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">잠자기 및 앱 대기
+모드 최적화</a>에서 설명한 대로, Android 6.0(API 레벨 23)에 도입된
+이전 버전의 잠자기 모드에 맞춰 앱을 조정할 경우에는 이러한 추가적인 동작이
+권장 사항 및 모범
+사례에 영향을 미치지 않습니다. 하지만
+여전히 해당 권장 사항을 따라야 합니다. 예를 들어, GCM(Google Cloud Messaging)을 사용하여 메시지를
+송수신하고 추가적인 잠자기 모드 동작을 수용하기 위한 업데이트 계획을
+시작해야 합니다.
+</p>
+
+
+<h3 id="bg-opt">Project Svelte: 백그라운드 최적화</h3>
+
+<p>
+ Android N에서는 메모리 사용량 및 전원 소비량을 최적화하기 위해
+ 세 가지 암시적 브로드캐스트를 제거합니다. 이렇게 변경해야 하는
+이유는, 암시적 브로드캐스트는 백그라운드에서 브로드캐스트를
+수신하도록 등록된 앱을 자주 시작하기 때문입니다. 이들 브로드캐스트를 제거하면 기기 성능과 사용자 환경이
+상당히 향상될 수 있습니다.
+</p>
+
+<p>
+ 모바일 기기의 경우 연결 변경이 자주 나타납니다(예: Wi-Fi와
+ 모바일 데이터 간의 이동 시). 현재는
+암시적 {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} 브로드캐스트의 수신기를
+매니페스트에 등록하여 앱이 이러한 연결 변경을 모니터링할 수 있습니다. 많은 앱들이 이 브로드캐스트를 수신하도록
+ 등록하기 때문에, 단일 네트워크 스위치가 모든 앱을 깨우고 이들 앱이 해당 브로드캐스트를
+ 동시에 처리하도록 할 수 있습니다.
+</p>
+
+<p>
+ 마찬가지로, 이전 버전의 Android에서는 앱이 다른 앱(예: 카메라)에서 암시적 {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 및 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} 브로드캐스트를
+수신하도록 등록할 수 있었습니다. 사용자가 카메라 앱으로 사진을 찍으면, 이들 앱이 깨어나서 해당 브로드캐스트를
+ 처리합니다.
+</p>
+
+<p>
+ 이런 문제를 완화하기 위해, Android N은 다음과 같은 최적화를
+ 적용합니다.
+</p>
+
+<ul>
+ <li>Android N을 대상으로 하는 앱은 해당 이벤트의 알림을 요청하는 매니페스트 항목이 있더라도 {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} 브로드캐스트를
+수신하지 않습니다. 실행 중인
+앱은 {@link android.content.BroadcastReceiver}로 알림을 요청하면
+여전히 기본 스레드에서 {@code CONNECTIVITY_CHANGE}를 수신할 수 있습니다.
+ </li>
+
+ <li>앱은 {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 또는 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} 브로드캐스트를 송수신할 수 없습니다. 이 최적화는 Android N을 대상으로
+ 하는 앱뿐 아니라 모든 앱에 영향을 미칩니다.
+ </li>
+</ul>
+
+<p>앱이 이들 인텐트 중 하나라도 사용하는 경우에는,
+ Android N 기기를 올바로 대상으로 삼을 수 있도록 이들 인텐트에 대한 종속성을 최대한 빨리 제거해야 합니다.
+ Android 프레임워크는 이러한 암시적 브로드캐스트의
+ 필요성을 줄이기 위한 여러 가지 해결책을 제공합니다. 예를 들어, {@link
+ android.app.job.JobScheduler} API는 지정된 조건(예:
+고정 요금제 네트워크에 연결)이 충족될 경우 네트워크 운영을 예약할 수 있는
+강력한 메커니즘을 제공합니다. 심지어 {@link
+ android.app.job.JobScheduler}를 사용하여 콘텐츠 공급자의 변경 사항에 대응할 수도 있습니다.
+</p>
+
+<p>
+ N에서 백그라운드 최적화와 앱을 조정하는 방법에 대한 자세한 내용은
+ <a href="{@docRoot}preview/features/background-optimization.html">백그라운드 최적화</a>를
+ 참조하세요.
+</p>
+
+<h2 id="perm">권한 변경</h2>
+
+<p>
+ Android N에는 앱에 영향을 미칠 수도 있는 권한 변경이 포함되어 있습니다.
+</p>
+
+<h3 id="permfilesys">파일 시스템 권한 변경</h3>
+
+<p>
+ 개인 파일의 보안을 강화하기 위해, Android N 이상을 대상으로 하는 앱의 개인
+ 디렉터리는 액세스가 제한됩니다(<code>0700</code>).
+ 이 설정은 크기 또는
+존재 여부와 같은 개인 파일의 메타데이터 유출을 막아줍니다. 이러한 권한 변경은 여러 가지 부작용이 있습니다.
+</p>
+
+<ul>
+ <li>
+ 소유자가 개인 파일의 파일 권한을
+더 이상 완화해서는 안 되며,
+{@link android.content.Context#MODE_WORLD_READABLE} 및/또는
+{@link android.content.Context#MODE_WORLD_WRITEABLE}을 사용하여 권한을 완화하려고 시도하면
+{@link java.lang.SecurityException}이 트리거됩니다.
+ <p class="note">
+ <strong>참고:</strong> 아직까지는 이 제한이 완전히 적용되지 않습니다.
+ 앱이 여전히 기본
+API 또는 {@link java.io.File File} API를 사용하여 개인 디렉터리에 대한 권한을 수정할 수도 있습니다. 하지만
+개인 디렉터리에 대한 권한은 부득이한 경우가 아니라면 완화하지 않는 것이 좋습니다.
+ </p>
+ </li>
+ <li>
+ 패키지 도메인 외부에서 <code>file://</code> URI를 전달하면 수신기가 액세스 불가능한 경로로
+ 남아 있을 수 있습니다. 따라서
+<code>file://</code> URI를 전달하려고 시도하면
+<code>FileUriExposedException</code>이 트리거됩니다. 개인 파일의 내용을 공유하기 위해
+권장되는 방법은 {@link
+ android.support.v4.content.FileProvider}를 사용하는 것입니다.
+ </li>
+ <li>
+ {@link android.app.DownloadManager}는 비공개로
+저장된 파일을 더 이상 파일 이름별로 공유할 수 없습니다. 레거시 애플리케이션은 {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME}에 액세스할 때
+액세스가 불가능한 경로가 될 수 있습니다. Android N 이상을
+대상으로 하는 앱은 {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}에 액세스할 때 {@link java.lang.SecurityException}을
+트리거합니다.
+
+
+{@link
+ android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+ DownloadManager.Request.setDestinationInExternalFilesDir()} 또는
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+ DownloadManager.Request.setDestinationInExternalPublicDir()}
+을 사용하여 다운로드
+위치를 공용 위치로 설정하는 레거시 애플리케이션은
+{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}에 있는 경로에 여전히 액세스할 수 있지만, 이
+ 메서드는 부득이한 경우가 아니라면 사용하지 않는 것이 좋습니다. {@link android.app.DownloadManager}에 의해 노출되는 파일에
+액세스하는 좋은 방법은
+{@link android.content.ContentResolver#openFileDescriptor
+ ContentResolver.openFileDescriptor()}를 사용하는 것입니다.
+ </li>
+</ul>
+
+<h2 id="sharing-files">앱 사이의 파일 공유</h2>
+
+<p>
+Android N을 대상으로 하는 앱의 경우, Android 프레임워크는 앱 외부에서 {@code file://} URI의 노출을
+금지하는 {@link android.os.StrictMode} API 정책을
+적용합니다. 파일 URI를 포함하는 인텐트가 앱을 떠나면
+{@code FileUriExposedException} 예외가 생기면서 앱에 오류가 발생합니다.
+</p>
+
+<p>
+애플리케이션 간에 파일을 공유하려면 {@code content://} URI를
+보내고 이 URI에 대해 임시 액세스 권한을 부여해야 합니다. 이 권한을 가장 쉽게 부여하는 방법은
+{@link android.support.v4.content.FileProvider} 클래스를 사용하는 방법입니다. 권한과 파일 공유에
+대한 자세한
+내용은 <a href="{@docRoot}training/secure-file-sharing/index.html">파일 공유</a>를 참조하세요.
+</p>
+
+<h2 id="accessibility">접근성 향상</h2>
+
+<p>
+ Android N에는 시력이 나쁘거나 손상된 사용자를 위해 플랫폼의
+ 사용성을 개선하기 위한 변경 사항이 포함되어 있습니다. 이러한 변경 사항에서는 일반적으로
+ 앱의 코드를 변경할 필요가 없지만, 사용자 환경에
+ 미치는 잠재적인 영향을 평가하기 위해 이들 기능을 검토하고
+ 앱으로 테스트해야 합니다.
+</p>
+
+
+<h3 id="screen-zoom">화면 확대/축소</h3>
+
+<p>
+ Android N에서는 사용자가 <strong>Display size</strong>를 설정할 수
+있으며, 이 설정에서 화면의 모든 요소를 확대하거나 축소할 수 있으므로, 시력이
+나쁜 사용자의 기기 접근성이 향상됩니다. 최소 화면 너비인 <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">sw320dp</a>를 초과하는 화면은 사용자가 확대/축소할
+ 수 없으며, 이 너비는 일반적인 중간 크기 전화기인 Nexus 4의
+ 너비입니다.
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>그림 3.</strong> 오른쪽 화면은 Android N 시스템 이미지가
+실행 중인 기기의 Display size를 늘릴 때의 효과를 보여줍니다.
+</p>
+
+
+<p>
+ 기기 밀도가 변경되면 시스템은 다음과 같은 방식으로 실행 중인
+ 앱에게 알립니다.
+</p>
+
+<ul>
+ <li>앱이 API 레벨 23 이하를 대상으로 하는 경우 시스템에서는
+모든 백그라운드 프로세스를 자동으로 종료합니다. 즉, 사용자가 이들
+ 앱으로부터 전환하여 <em>Settings</em> 화면을
+ 열고 <strong>Display size</strong> 설정을 변경하면, 시스템은 저용량 메모리
+ 상황에서와 동일한 방식으로 앱을 종료합니다. 앱에 포그라운드 프로세스가
+ 있는 경우, <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에 설명된 대로, 시스템은
+ 마치 기기의 방향이 변경된
+ 것처럼 구성 변경을 해당 프로세스에 알립니다.
+ </li>
+
+ <li>앱이 Android N을 대상으로 하는 경우,
+<a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에 설명된
+대로, 구성 변경을 모든 프로세스(포그라운드 및 백그라운드)에
+알립니다.
+ </li>
+</ul>
+
+<p>
+ 앱이 Android 모범 사례를 따르기만 한다면, 대부분의 앱은 이 기능을
+ 지원하기 위해 어떠한 변경도 수행할 필요가 없습니다. 확인할 사항은 구체적으로 다음과 같습니다.
+</p>
+
+<ul>
+ <li>화면 너비가 <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>인 기기에서 앱을 테스트하고 적절하게 작동하는지
+ 확인하세요.
+ </li>
+
+ <li>기기 구성이 변경되는 경우, 밀도에 종속된 모든 캐시된
+정보(예: 캐시된 비트맵 또는 네트워크에서 로드된 리소스)를
+업데이트하세요. 앱이 일시 정지 상태에서 다시 시작하는 경우 구성
+ 변경을 확인하세요.
+ <p class="note">
+ <strong>참고:</strong> 구성에 종속된 데이터를 캐시하는 경우,
+ 해당 데이터에 적절한 화면 크기 또는 픽셀 밀도와 같은 관련 메타데이터를
+ 포함시키는 것이 좋습니다. 이 메타데이터를 저장해 놓으면,
+ 구성이 변경된 후에 캐시된 데이터를 새로 고칠지 여부를
+ 결정할 수 있습니다.
+ </p>
+ </li>
+
+ <li>픽셀 단위는 화면 밀도에 따라
+ 변하지 않으므로, 이 단위로 치수를 지정하지 마세요. 그 대신, <a href="{@docRoot}guide/practices/screens_support.html">밀도에 독립적인 픽셀</a>(<code>dp</code>) 단위로
+ 치수를 지정하세요.
+ </li>
+</ul>
+
+<h3 id="vision-settings">설정 마법사의 Vision Settings</h3>
+
+<p>
+ Android N에는 Welcome 화면에 Vision Settings가 포함되어
+있으며, 여기서 사용자는
+ <strong>Magnification gesture</strong>, <strong>Font size</strong>,
+<strong>Display size</strong> 및 <strong>TalkBack</strong>의 접근성 설정을 새 기기에 구성할 수 있습니다. 이러한
+변경은 다른 화면 설정에 관련된 버그의 가시성을 증대시킵니다. 이 기능의 영향을 평가하려면,
+ 이들 설정을 활성화하여 앱을
+ 테스트해야 합니다. 이 설정은 <strong>Settings >
+ Accessibility</strong> 아래에 있습니다.
+</p>
+
+<h2 id="ndk">플랫폼 라이브러리에 연결되는 NDK 앱</h2>
+
+<p>
+ 비공개 API가 로드되는 것을 막기 위해 Android N에는 네임스페이스 변경이 포함되어 있습니다.
+ NDK를 사용하는 경우에는 Android 플랫폼에서
+ 공개 API를 사용해야만 합니다. Android의 다음 번 공식 릴리스에서 비공개 API를 사용하면 앱 작동이 중단될 수
+ 있습니다.
+</p>
+
+<p>
+ 비공개 API의 사용을 여러분에게 경고하기 위해, Android N 기기에서 실행
+ 중인 앱은 어떤 앱이 비공개 API를 호출할 때 logcat 출력에 오류를 생성합니다.
+ 또한, 이런 상황이 잘 인식될 수 있도록
+ 이 오류가 기기 화면에도 메시지로 표시됩니다. 여러분이 앱 코드를 검토하여
+ 비공개 플랫폼 API의 사용을 제거해야 하며, 프리뷰 기기 또는
+ 에뮬레이터를 사용하여 앱을 철저히 테스트해야 합니다.
+</p>
+
+<p>
+ 앱이 플랫폼 라이브러리에 종속된 경우, 개인 API를 이와 동등한
+ 공개 API로 바꾸기 위한 일반적인 수정 사항을 NDK 문서에서 참조하세요.
+ 또한, 자신도 모르는 사이에 플랫폼 라이브러리에
+ 연결되어 있을 수가 있으며, 특히 여러분의 앱이 사용하는 라이브러리가 플랫폼의
+ 일부(예: <code>libpng</code>)이지만 NDK의 일부가 아닌 경우에는 더 그렇습니다. 이 경우에는 연결에
+필요한 모든 .so 파일이 APK에 포함되어 있는지 확인하세요.
+</p>
+
+<p class="caution">
+ <strong>주의:</strong> 일부 타사 라이브러리가 비공개 API에
+ 연결될 수도 있습니다. 앱이 이들 라이브러리를 사용하는 경우, Android의
+ 다음 번 공식 릴리스에서 실행할 때 앱 작동이 중단될 수 있습니다.
+</p>
+
+<p>
+ 앱은 NDK에 포함되지 않은 고유 라이브러리를 사용하거나
+ 이에 종속되어서는 안 됩니다. 왜냐하면 이 라이브러리는 특정
+ Android 릴리스에서 다른 릴리스로 변경되거나 제거될 수 있기 때문입니다. OpenSSL에서 BoringSSL로의 전환은 이러한 변경의 한 예입니다.
+ 또한, NDK에 포함되지 않은
+플랫폼 라이브러리에는 호환성 요구 사항이 없기 때문에, 다른 장치에서는
+호환성 레벨이 다를 수도 있습니다. 구형 기기에 있는 비 NDK 라이브러리에 액세스해야 하는 경우
+Android API 레벨에 따라 로드를 수행하세요.
+</p>
+
+<p>
+ 이러한 유형의 문제를 진단하는 데 도움을 주기 위해, 여기서는
+ Android N으로 앱을 빌드할 때 발생할 수 있는 Java 및 NDK 오류의 몇 가지 예를 보여줍니다.
+</p>
+
+<p>Java 오류의 예:</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>NDK 오류의 예:</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ 다음은 이러한 유형의 오류가 발생한 앱의 몇 가지 일반적인 수정사항입니다.
+</p>
+
+<ul>
+ <li>libandroid_runtime.so에서 getJavaVM 및 getJNIEnv 사용은 표준
+ JNI 함수로 교체될 수 있습니다.
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>{@code libcutils.so}에서 {@code property_get} 기호 사용은 공개
+ {@code alternative __system_property_get}으로 교체될 수 있습니다.
+ 이렇게 하려면, 다음의 include와 함께 {@code __system_property_get}을 사용하세요.
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>{@code libcrypto.so}에서 {@code SSL_ctrl} 기호 사용은 앱
+로컬 버전으로 교체되어야 합니다. 예를 들어, {@code .so} 파일에서
+ {@code libcyrpto.a}를 정적으로 링크하거나 BoringSSL 또는 OpenSSL에서
+ {@code libcrypto.so}를 동적으로 앱에 포함시켜야 합니다.
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N에는 Android for Work를 대상으로 하는 앱에 대한 변경 사항이
+포함되어 있습니다. 인증서 설치, 비밀번호 재설정,
+보조 사용자 관리 및 기기 식별자 액세스에 대한 변경 사항이 이에 포함됩니다. Android for Work 환경용 앱을 빌드하는 경우에는 이러한
+ 변경 사항을 검토하고 그에 따라
+앱을 수정해야 합니다.
+</p>
+
+<ul>
+ <li>DPC가 인증서를 설정할 수 있으려면, 위임된 인증서 설치 관리자를 여러분이 먼저
+ 설치해야 합니다. N SDK를 대상으로 하는 프로필 소유자
+ 앱 및 기기 소유자 앱의 경우, 기기 정책 컨트롤러(DPC)가 <code>DevicePolicyManager.setCertInstallerPackage()</code>를 호출하기
+ 전에, 위임된 인증서 설치 관리자를 여러분이 먼저
+설치해야 합니다. 아직 설치 관리자가
+설치되지 않은 경우 시스템에서 <code>IllegalArgumentException</code>이
+발생합니다.
+ </li>
+
+ <li>이제 기기 관리자의 비밀번호 재설정 제한이 프로필 소유자에게도
+ 적용됩니다. 기기 관리자는 이미 설정된 암호를 변경하거나
+ 지우기 위해 {@code DevicePolicyManager.resetPassword()}를 더 이상 사용할
+ 수 없습니다. 기기 관리자는
+ 기기에 비밀번호, PIN 또는 패턴이 없는 경우에만 비밀번호를 설정할 수 있습니다.
+ </li>
+
+ <li>제한이 설정되어 있더라도 기기 소유자 및 프로필 소유자는
+ 계정을 관리할 수 있습니다. <code>DISALLOW_MODIFY_ACCOUNTS</code> 사용자
+ 제한이 있더라도 기기 소유자 및 프로필 소유자는 계정 관리 API를 호출할 수 있습니다.
+ </li>
+
+ <li>기기 소유자는 보조 사용자를 보다 쉽게 관리할 수 있습니다. 기기가
+기기 소유자 모드에서 실행 중인 경우 <code>DISALLOW_ADD_USER</code> 제한이
+자동으로 설정됩니다. 이렇게 하면 사용자는 관리되지 않는 보조 사용자를 생성할 수
+없습니다. 또한, <code>CreateUser()</code> 및
+ <code>createAndInitializeUser()</code> 메서드가 사용 중단되었으며, 새로운
+<code>DevicePolicyManager.createAndManageUser()</code> 메서드로 대체되었습니다.
+ </li>
+
+ <li>기기 소유자는 기기 식별자에 액세스할 수 있습니다. 기기
+소유자는 <code>DevicePolicyManagewr.getWifiMacAddress()</code>를 사용하여 기기의
+ Wi-Fi MAC 주소에 액세스할 수 있습니다. 기기에서
+Wi-Fi가 활성화된 적이 없는 경우 이 메서드는 {@code null} 값을 반환합니다.
+ </li>
+
+ <li>Work Mode 설정은 업무용 앱에 대한 액세스를 제어합니다. 작업 모드가 해제되면
+시스템 런처에서는 업무용 앱을 회색으로 표시하여 해당 앱이 사용될 수 없음을 나타냅니다. 작업 모드를
+ 다시 활성화하면 정상적인 동작이 복원됩니다.
+</ul>
+
+<p>
+ Android N에서 Android for Work의 변경 사항에 대한 자세한 내용은
+<a href="{@docRoot}preview/features/afw.html">Android for Work 업데이트</a>를 참조하세요.
+</p>
+
+<h2 id="annotations">주석 보존</h2>
+
+<p>
+Android N에서는 주석의 표시 여부가 무시되던 버그가 수정되었습니다. 이 문제로 인해 런타임이 액세스할 수 없어야 하는 주석에 액세스할 수 있었습니다.
+
+ 이러한 주석으로는 다음이 포함됩니다.
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}: 빌드 시에만 표시되어야 합니다.</li>
+ <li>{@code VISIBILITY_SYSTEM}: 런타임에
+기본 시스템에만 표시되어야 합니다.</li>
+</ul>
+
+<p>
+앱이 이 동작에 의존했다면, 런타임에 사용할 수 있어야 하는
+주석에 보존 정책을 추가하세요. {@code @Retention(RetentionPolicy.RUNTIME)}을 사용하여 추가하면 됩니다.
+</p>
+
+<h2 id="other">기타 중요한 사항</h2>
+
+<ul>
+<li>앱이 Android N에서 실행 중일 때 API 레벨이 낮고 사용자가 표시
+크기를 변경하는 경우, 해당 앱 프로세스가 종료됩니다. 앱은 이
+시나리오를 매끄럽게 처리할 수 있어야 합니다. 그렇지 않으면 사용자가 Recents에서
+앱을 복원할 때 앱 작동이 중단됩니다.
+
+<p>
+이러한 동작이 발생하지 않도록 앱을 테스트해야 합니다.
+DDMS를 통해 수동으로 앱을 종료할 때
+동일한 작동 중단을 유발시킴으로써 테스트를 수행할
+수 있습니다.
+</p>
+
+<p>
+N 이상을 대상으로 하는 앱은 밀도 변경 시에 자동으로 종료되지 않지만,
+구성 변경에는 제대로 응답하지 못할 수도 있습니다.
+</p>
+</li>
+
+<li>
+Android N에서 앱은 구성 변경을 매끄럽게 처리할 수 있어야 하며,
+이후에 시작할 때도 작동이 중단되어서는 안 됩니다. 글꼴
+크기(<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>)를 변경하여 앱 동작을 검사한 다음, Recents에서
+앱을 복원할 수 있습니다.
+</li>
+
+<li>
+이전 버전의 Android에서는 버그 때문에, 시스템이 주 스레드에서
+TCP 소켓에 대한 쓰기를 엄격 모드 위반으로서 플래그하지 못했습니다. Android N에서는 이 버그가 수정되었습니다.
+이 동작을 보이는 앱에서는 이제 {@code android.os.NetworkOnMainThreadException}이 발생합니다.
+일반적으로, 주 스레드에서 네트워크 작업을 수행하면 일반적으로
+테일 지연 시간이 길어져 ANR 및 쟁크(jank)를 유발하므로, 이런 작업은 수행하지 않는 것이 좋습니다.
+</li>
+
+<li>
+{@code Debug.startMethodTracing()} 계열에 속하는 메서드는,
+SD 카드의 최상위 레벨에 저장하는 것이 아니라, 이제 공유 저장소의
+패키지별 디렉터리에 출력을 기본적으로
+저장합니다. 즉, 앱은 이들 API를 사용하기 위해 {@code WRITE_EXTERNAL_STORAGE} 권한을 요청할 필요가 더 이상 없습니다.
+</li>
+
+<li>
+상당수 플랫폼 API는 이제 대용량
+페이로드가 {@link android.os.Binder} 트랜잭션을 통해 전송되는 것을 확인하기 시작했으며, 시스템에서는
+이제 {@code TransactionTooLargeExceptions}를
+자동으로 로깅하거나 억제하는 대신 {@code RuntimeExceptions}로 다시 발생시킵니다. 한 가지
+공통적인 예는
+{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()}에
+너무 많은 데이터를 저장하는 바람에, 앱이 Android N을 대상으로 할 때 {@code ActivityThread.StopInfo}가
+{@code RuntimeException}을 발생시키는 경우입니다.
+</li>
+
+<li>
+앱이 {@link java.lang.Runnable} 작업을 {@link android.view.View}에 게시하고
+{@link android.view.View}가
+창에 연결되지 않은 경우, 시스템에서는
+{@link android.view.View}가 있는 {@link java.lang.Runnable} 작업을 큐에 넣으며,
+{@link java.lang.Runnable} 작업은
+{@link android.view.View}가 창에 연결될 때까지
+실행되지 않습니다. 이 동작은 다음과 같은 버그를 수정합니다.
+<ul>
+ <li>의도한 창의 UI 스레드가 아닌 다른 스레드에서 {@link android.view.View}에 앱이 게시된 경우,
+결과적으로 {@link java.lang.Runnable}이 잘못된 스레드에서 실행될 수 있습니다.
+ </li>
+ <li>{@link java.lang.Runnable} 작업이 루퍼 스레드가 아닌 다른 스레드에서
+게시되었다면 해당 앱이 {@link java.lang.Runnable} 작업을 노출시킬 수도 있습니다.</li>
+</ul>
+</li>
+
+<li>
+{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
+권한이
+있는 Android N 상의 앱이 패키지를 삭제하려고 하지만, 해당 패키지를 다른 앱이 설치한 경우에는
+사용자의 확인이 필요합니다. 이 시나리오에서는 앱이
+{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}을 호출할 때
+{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}을
+반환 상태로 예상해야 합니다.
+</li>
+
+</ul>
+
diff --git a/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..1310ae7
--- /dev/null
+++ b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=샘플
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ Android N용으로 다음과 같은 코드 샘플이 제공됩니다. Android Studio에서 샘플을 다운로드하려면 <b>File > Import Samples</b> 메뉴 옵션을 선택합니다.
+
+
+</p>
+
+<p class="note">
+ <strong>참고:</strong> 이러한 다운로드 가능 프로젝트는 Gradle 및 Android Studio와 함께 사용하도록 고안되었습니다.
+
+</p>
+
+
+<h3 id="mw">다중 창 플레이그라운드</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ 이 샘플은 앱으로 다중 창 사용자 인터페이스를 활용하는
+방법을 보여줍니다.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+GitHub에서 가져오기</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">활성 알림</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 이것은 NotificationCompat를 사용하여 알림을 발송하는 간단한 서비스를 보여주는 기존 샘플입니다.
+ 각각의 읽지 않은 사용자 대화는 고유한 알림으로 발송됩니다.
+
+</p>
+<p>
+ 이 샘플은 Android N에서 사용할 수 있는 새로운 알림 기능을
+활용하도록 업데이트되었습니다.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+GitHub에서 가져오기</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">메시징 서비스</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ NotificationManager를
+사용하여 현재 애플리케이션이 표시할 알림 개수를 지시하는
+방법을 보여주는 기존 샘플입니다.
+</p>
+<p>
+ 이 샘플은 Android N에서 사용할 수 있는 새로운 알림 기능을
+활용하도록 업데이트되었습니다.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+GitHub에서 가져오기</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">직접 부팅</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 이 샘플은 기기 암호화된 저장소에 데이터를 저장하고 액세스하는 방법을 보여줍니다.
+이 저장소는 기기가 부팅된 동안 항상 사용할 수 있습니다.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+GitHub에서 가져오기</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">범위가 지정된 디렉터리 액세스</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 이 샘플은 적은 권한을 요구하면서도
+특정 디렉터리에서 데이터를 읽고 쓰는 방법을 보여줍니다.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+GitHub에서 가져오기</a>
+</p>
diff --git a/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-testing.jd b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..1222227
--- /dev/null
+++ b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=테스트 가이드
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#runtime-permissions">권한 테스트</a></li>
+ <li><a href="#doze-standby">잠자기 및 앱 대기 모드 테스트</a></li>
+ <li><a href="#ids">자동 백업 및 기기 식별자</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N에서는 앱이 차기 버전의 플랫폼에서 제대로 작동하는지 확인해볼 수 있습니다.
+ 이 프리뷰에는 앱에 영향을 미칠 수 있는 수많은 API와 동작 변경 사항이 포함되어 있습니다. 이에 대해서는 <a href="{@docRoot}preview/api-overview.html">API 개요</a>와 <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>에 설명되어 있습니다.
+
+ 프리뷰로 앱을 테스트할 때에는 사용자에게 좋은 환경을 제공하기 위해 개발자 여러분이 꼭 초점을 맞춰야 하는 몇 가지 특정한 시스템 변경사항이 있습니다.
+
+
+</p>
+
+<p>
+ 이 가이드에서는 앱에서 테스트할 프리뷰 기능은 어떤 것이고, 테스트 방법은 어떤지에 대해 설명합니다. 이와 같은 특정 프리뷰 기능을 먼저 테스트하는 것이 좋습니다. 왜냐하면 이들 기능은 앱의 동작에 큰 영향을 미칠 가능성이 높기 때문입니다.
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">권한</a>
+ </li>
+ <li><a href="#doze-standby">잠자기 및 앱 대기 모드</a>
+ </li>
+ <li><a href="#ids">자동 백업 및 기기 식별자</a></li>
+</ul>
+
+<p>
+ 테스트용 프리뷰 시스템 이미지로 기기 또는 가상 기기를 설정하는 방법에 대한 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html">Android N SDK 설정</a>을 참조하세요.
+
+
+</p>
+
+
+<h2 id="runtime-permissions">권한 테스트</h2>
+
+<p>
+ 새로운 <a href="{@docRoot}preview/features/runtime-permissions.html">권한</a> 모델은 사용자가 여러분의 앱에 권한을 할당하는 방법을 바꿔 놓습니다.
+ 설치 절차 중에 모든 권한을 허용하는 것이 아니라, 앱이 런타임에 사용자에게 각각의 권한을 요청해야 합니다.
+
+ 사용자 입장에서는 이러한 동작으로 각 앱의 액티비티에 대해 더 세분화된 제어권을 행사할 수 있을 뿐만 아니라 이 앱이 어째서 특정한 권한을 요청하고 있는 것인지 맥락을 더 잘 이해할 수 있게 되기도 합니다.
+ 사용자는 언제든 앱에 개별적으로 권한을 허용할 수 있고, 이를 취소할 수도 있습니다.
+ 미리 보기의 이러한 기능은 앱의 동작에 영향을 미칠 가능성이 가장 높고, 앱의 몇 가지 기능이 작동하지 않도록 막거나 저하된 상태로 작동하게 할 수도 있습니다.
+
+
+</p>
+
+<p class="caution">
+ 이 변경 내용은 새 플랫폼에서 실행되는 모든 앱에 영향을 비치며, 새 플랫폼 버전을 대상으로 하지 않는 앱도 예외가 아닙니다.
+ 레거시 앱에 대해 플랫폼이 제한된 호환성 동작을 제공하기는 하지만, 지금 바로 새 권한 모델로 앱의 마이그레이션 계획을 시작하는 편이 좋습니다. 플랫폼이 공식적으로 출시될 때에 맞춰 앱의 업데이트된 버전을 게시하는 것을 목표로 하십시오.
+
+
+</p>
+
+
+<h3 id="permission-test-tips">테스트 팁</h3>
+
+<p>
+ 다음은 새 권한 동작에 대해 앱 테스트를 계획하고 실행하는 데 유용한 몇 가지 테스트 팁입니다.
+
+</p>
+
+<ul>
+ <li>앱의 현재 권한과 관련된 코드 경로를 확인합니다.</li>
+ <li>권한 보호된 서비스 및 데이터 전반에 걸친 사용자 흐름을 테스트합니다.</li>
+ <li>허용된/취소된 권한을 여러 가지로 조합하여 테스트합니다.</li>
+ <li>명령줄에서 권한을 관리할 때 {@code adb} 도구를 사용합니다.
+ <ul>
+ <li>권한과 상태를 그룹별로 목록으로 나열합니다.
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>하나 이상의 권한을 다음과 같은 구문을 사용하여 허용하거나 취소합니다.<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>권한을 사용하는 서비스에 대해 앱을 분석해봅니다.</li>
+</ul>
+
+<h3 id="permission-test-strategy">테스트 전략</h3>
+
+<p>
+ 권한을 변경하면 앱의 구조와 디자인은 물론 사용자 환경과, 개발자가 사용자에게 제공하는 흐름에도 영향을 미칩니다.
+ 앱의 현재 권한 사용 내용을 평가한 다음 제공하고자 하는 새로운 흐름을 계획하기 시작해야 합니다.
+ 플랫폼의 공식 릴리스에서 호환성 동작을 제공할 예정이지만, 이와 같은 동작에만 의존하지 말고 앱 업데이트를 계획하는 것이 좋습니다.
+
+
+</p>
+
+<p>
+ 앱이 실제로 필요로 하고 사용하는 권한을 확인한 다음, 권한 보호된 서비스를 사용하는 여러 가지 코드 경로를 찾습니다.
+ 이렇게 하려면 새 플랫폼에서 여러 가지로 조합한 테스트를 거치고 코드 분석을 통해야 합니다.
+ 테스트에서는 런타임 권한에 옵트인하는 것에 초점을 맞춰야 합니다. 이를 위해 앱의 {@code targetSdkVersion}을 프리뷰 버전으로 변경하세요.
+ 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html#">Android N SDK 설정</a>을 참조하세요.
+
+
+</p>
+
+<p>
+ 다양한 조합의 권한을 해지하고 추가하는 방식으로 테스트를 수행하여 권한에 종속되는 사용자 흐름을 파악합니다.
+ 종속성이 분명하지 않거나 논리적인 경우, 리팩터링을 고려해 보거나 해당 흐름을 구분하여 종속성을 제거, 또는 해당 권한이 왜 필요한지 분명히 하는 방안을 고려해야 합니다.
+
+
+</p>
+
+<p>
+ 런타임 권한의 동작, 테스트 및 모범 사례에 대한 자세한 정보는 <a href="{@docRoot}preview/features/runtime-permissions.html">권한</a> 개발자 미리 보기 페이지를 참조하십시오.
+
+
+</p>
+
+
+<h2 id="doze-standby">잠자기 및 앱 대기 모드 테스트</h2>
+
+<p>
+ 잠자기 및 앱 대기 모드의 절전 기능은 기기가 유휴 상태에 있을 때 또는 사용자가 앱에 초점을 맞추고 있지 않을 때 앱이 수행할 수 있는 배경 처리의 양을 제한합니다.
+ 시스템이 앱에 부과할 수 있는 제한 사항에는 네트워크 액세스를 제한하거나 없애기, 배경 작업을 일시 중지시키기, 알림 일시 중지, 절전 모드 해제 및 알람 요청 무시 등이 포함됩니다.
+
+ 이러한 절전 기능에 앱이 적절히 동작하도록 확실히 해 두려면 이와 같은 저전력 상태를 시뮬레이트하여 앱을 테스트해보아야 합니다.
+
+
+</p>
+
+<h4 id="doze">앱에서 잠자기 모드 테스트하기</h4>
+
+<p>앱에서 잠자기 모드를 테스트하려면:</p>
+
+<ol>
+<li>Android N 시스템 이미지로 하드웨어 기기 또는 가상 기기를 구성합니다.</li>
+<li>기기를 개발 머신에 연결하고 앱을 설치합니다.</li>
+<li>앱을 실행시킨 다음 활성 상태로 그냥 둡니다.</li>
+<li>다음 명령을 실행하여 기기가 잠자기 모드에 들어가는 것을 시뮬레이션합니다.
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>기기가 다시 활성화되면 앱이 어떻게 동작하는지 살펴봅니다. 기기가 잠자기 모드를 종료할 때 정상적으로 복구되는지 확인해야 합니다.
+</li>
+</ol>
+
+
+<h4 id="standby">앱에서 앱 대기 모드 테스트하기</h4>
+
+<p>앱에서 앱 대기 모드를 테스트하려면:</p>
+
+<ol>
+ <li>Android N 시스템 이미지로 하드웨어 기기 또는 가상 기기를 구성합니다.</li>
+ <li>기기를 개발 머신에 연결하고 앱을 설치합니다.</li>
+ <li>앱을 실행시킨 다음 활성 상태로 그냥 둡니다.</li>
+ <li>다음 명령을 실행하여 앱이 대기 모드에 들어가는 것을 시뮬레이션합니다.
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>다음 명령을 사용하여 앱이 대기 모드에서 해제되는 것을 시뮬레이션합니다.
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>앱이 대기 모드에서 해제된 상태에서 어떻게 동작하는지 살펴봅니다. 대기 모드에서 정상적으로 복구되는지 확인해야 합니다.
+ 특히, 앱의 알림과 배경 작업이 계속 예상했던 대로 기능하는지 확인해야 합니다.
+</li>
+</ol>
+
+<h2 id="ids">앱용 자동 백업 및 기기별 식별자</h2>
+
+<p>앱이 내부 저장소에서 각 기기에 따라 다른 식별자(예: Google Cloud Messaging 등록 ID)를 유지하는 경우, 모범 사례를 따라 저장소 위치를 자동 백업에서 배제해야 합니다. 이 내용은 <a href="{@docRoot}preview/backup/index.html">앱용 자동 백업</a>에 설명되어 있습니다.
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/ko/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..11cd2b9
--- /dev/null
+++ b/docs/html-intl/intl/ko/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1039 @@
+page.title=Android N for Developers
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>주요 개발자 기능</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">다중 창 지원</a></li>
+ <li><a href="#notification_enhancements">알림</a></li>
+ <li><a href="#jit_aot">JIT/AOT 컴파일</a></li>
+ <li><a href="#quick_path_to_app_install">앱 설치를 위한 빠른 경로</a></li>
+ <li><a href="#doze_on_the_go">이동 중 잠자기 모드</a></li>
+ <li><a href="#background_optimizations">백그라운드 최적화</a></li>
+ <li><a href="#data_saver">Data Saver</a></li>
+ <li><a href="#vulkan">Vulkan API</a></li>
+ <li><a href="#tile_api">Quick Settings 타일 API</a></li>
+ <li><a href="#number-blocking">번호 차단</a></li>
+ <li><a href="#call_screening">통화 스크리닝</a></li>
+ <li><a href="#multi-locale_languages">로케일 및 언어</a></li>
+ <li><a href="#emoji">새 이모티콘</a></li>
+ <li><a href="#icu4">Android의 ICU4J API</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Android TV 녹화</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">접근성</a></li>
+ <li><a href="#direct_boot">직접 부팅</a></li>
+ <li><a href="#key_attestation">Key Attestation</a></li>
+ <li><a href="#network_security_config">네트워크 보안 구성</a></li>
+ <li><a href="#default_trusted_ca">신뢰할 수 있는 기본 CA</a></li>
+ <li><a href="#apk_signature_v2">APK Signature Scheme v2</a></li>
+ <li><a href="#scoped_directory_access">범위가 지정된 디렉터리 액세스</a></li>
+ <li><a href="#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a></li>
+ <li><a href="#sustained_performance_api">지속적인 성능 API</a></li>
+ <li><a href="#vr">VR 지원</a></li>
+ <li><a href="#print_svc">인쇄 서비스 개선 사항</a></li>
+ <li><a href="#virtual_files">가상 파일</a></li>
+ <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N은 아직 한창 개발 중이지만, N Developer Preview를
+통해 지금 Android N을 일부 체험해 볼 수 있습니다. 아래 섹션에서는
+개발자를 위한 몇 가지 새로운 기능을 중점적으로 다룹니다. </p>
+
+<p>
+ 플랫폼 변경 사항이 앱에 영향을 미칠 수도 있는 부분에
+대해 알아보려면 <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>을 살펴보고,
+ 주요 기능에 대해 자세히 알아보려면 개발자 가이드를 참조하고, 새로운 API에 대한 자세한
+내용을 보려면 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>를 다운로드하세요.
+</p>
+
+<h2 id="multi-window_support">다중 창 지원</h2>
+
+
+<p>Android N에서 저희는 요청이 많은 새로운 멀티태스킹
+기능인 다중 창 지원을 플랫폼에 도입하고 있습니다. </p>
+
+ <p>이제 사용자가 화면에서 두 개의 앱을 동시에 열 수 있습니다. </p>
+ <ul>
+ <li>Android N이 실행되는
+전화와 태블릿에서 사용자가 화면 분할 모드에서 두 개의 앱을
+나란히 또는 상하로 실행할 수 있습니다. 또한 앱 사이에 있는 분할선을 끌어서 앱의 크기를
+조정할 수 있습니다. </li>
+
+<li>Android TV 기기에서, 앱이 <a href="{@docRoot}preview/features/picture-in-picture.html">PIP(Picture-In-Picture)
+모드</a>로 배치될 수 있으므로, 사용자가 검색을 수행하거나 다른
+앱과 상호 작용하는 중에도 앱이 계속해서 콘텐츠를 표시할 수 있습니다.</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>그림 1.</strong> 화면 분할 모드에서 실행되는 앱.
+</p>
+
+ </div>
+
+<p>특히 태블릿이나 다른 대형 화면 기기에서 다중 창
+지원을 통해 새로운 방식으로 사용자를 참여시킬 수 있습니다. 또한, 앱에서 드래그 앤 드롭 기능을 활성화하여
+사용자가 편리하게 앱에서나 앱으로 콘텐츠를 드래그할
+수 있으므로, 사용자 환경이 크게 개선됩니다. </p>
+
+<p>다중 창 지원을 앱에 추가하고 다중 창이 표시되는 방식을
+구성하는 것은 매우 간단합니다. 예를 들어, 액티비티의
+최소 허용 크기를 지정하면 사용자가 액티비티의 크기를 지정된 크기보다
+작게 조정하지 못합니다. 또한, 앱에 대해 다중 창 표시를 비활성화할 수도 있으며
+ 이 경우 시스템은 전체 화면 모드에서만 앱을 표시합니다.</p>
+
+<p>
+ 자세한 내용은 <a href="{@docRoot}preview/features/multi-window.html">다중 창 지원</a>
+ 개발자 문서를 참조하세요.
+</p>
+
+<h2 id="notification_enhancements">알림 향상</h2>
+
+<p>Android N에서 저희는 알림을 더 쉽고 빠르게 사용할 수
+있도록 재설계했습니다. 몇 가지 변경 사항은 다음과 같습니다.</p>
+
+<ul>
+ <li>
+ <strong>템플릿 업데이트</strong>: 히어로 이미지와 아바타를 새롭게
+ 강조하기 위해 알림 템플릿을 업데이트하는 중입니다. 개발자는 최소한의
+ 코드 조정만으로 새로운 템플릿을 활용할 수 있습니다.
+ </li>
+
+ <li>
+ <strong>메시지 스타일 사용자 지정</strong>: <code>MessageStyle</code> 클래스를 사용하여
+ 알림과 관련된 사용자 인터페이스 레이블을 더 많이
+사용자 지정할 수 있습니다. 메시지, 대화 제목, 콘텐츠 뷰를
+ 구성할 수 있습니다.
+ </li>
+
+ <li>
+ <strong>묶음 알림</strong>: 시스템에서 메시지를 함께
+ 그룹화하고(예: 메시지 주제별로 그룹화) 해당 그룹을 표시할 수 있습니다. 사용자는
+ 이 그룹에 대해 해제 또는 보관과 같은 동작을 적절히 수행할 수 있습니다. Android
+ Wear용 알림을 구현한 적이 있으시다면 이미 이 모델도 친숙하게 느껴질
+ 것입니다.
+ </li>
+
+ <li>
+ <strong>직접 회신</strong>: 실시간 통신 앱의 경우 Android 시스템은
+ 인라인 회신을 지원하므로, 사용자가 알림 인터페이스
+ 내에서 신속하게 SMS 또는 텍스트 메시지에 직접 응답할 수 있습니다.
+ </li>
+
+ <li>
+ <strong>사용자 지정 뷰</strong>: 두 개의 새로운 API를 사용하면 알림에 사용자
+ 지정 뷰를 사용할 때 시스템 장식(예: 알림 헤더 및 액션)을
+ 활용할 수 있습니다.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>그림 2.</strong> 묶음 알림 및 직접 회신.
+</p>
+
+<p>새로운 기능을 구현하는 방법에 대해 알아보려면
+ <a href="{@docRoot}preview/features/notification-updates.html">알림</a>
+가이드를 참조하세요.</p>
+
+
+
+<h2 id="jit_aot">프로필 가이드 방식의 JIT/AOT 컴파일</h2>
+
+<p>Android N에서 저희는 코드 프로파일링이 있는
+JIT(Just in Time) 컴파일러를 ART에 추가했습니다. 이를 통해 ART에서 Android 앱이 실행되는 동안
+그 성능을 계속 향상시킬 수 있습니다. JIT 컴파일러는 ART의 현재 AOT(Ahead of Time) 컴파일러를 보완하고
+런타임 성능을 개선하고, 저장 공간을 절약하고, 앱 업데이트와
+시스템 업데이트의 시간 단축을 도와줍니다.</p>
+
+<p>프로필 가이드 방식의 컴파일을 통해 ART는 실제 사용량과 기기의
+조건에 따라 각 앱의 AOT/JIT 컴파일을 관리할 수 있습니다. 예를 들어, ART는 최상의 성능을 위해 각 앱의 핫 메서드에 대한 프로필을
+유지 관리하고 이들 메서드를 미리 컴파일하고
+캐시할 수 있습니다. 이 경우 앱의 다른 부분들은
+실제로 사용될 때까지 컴파일되지 않고 유지됩니다.</p>
+
+<p>프로필 가이드 방식의
+컴파일은 앱의 주요 부분들의 성능을 높여줄 뿐만 아니라,
+관련 바이너리를 비롯한 앱의 전체 RAM 공간을 줄이는 데 도움이 됩니다. 이 기능은 저용량 메모리 기기에 특히 중요합니다.</p>
+
+<p>ART는 기기 배터리에 미치는 영향이 최소화되는 방식으로
+프로필 가이드 방식의 컴파일을 관리합니다. ART는 기기가 유휴 상태이고 충전 중일 때만 사전 컴파일을 수행하며,
+해당 작업을 미리 수행함으로써 시간과 배터리를 절약합니다.</p>
+
+<h2 id="quick_path_to_app_install">앱 설치를 위한 빠른 경로</h2>
+
+<p>ART의 JIT 컴파일러가 가진 가장 눈에 띄는 이점 중 하나는
+앱 설치 및 시스템 업데이트 속도가 빠르다는 것입니다. Android 6.0에서 최적화하고 설치하는 데
+몇 분이 걸리는 대용량 앱조차도 이제는 단 몇 초 만에 설치할 수
+있습니다. 또한, 더 이상 최적화 단계가 없으므로 시스템 업데이트도 더 빠르게 이루어집니다. </p>
+
+<h2 id="doze_on_the_go">이동 중 잠자기 모드...</h2>
+
+<p>Android 6.0에서는 기기가 테이블 위에 올려져 있거나 서랍 안에
+들어 있는 등의 유휴 상태일 때 앱이 CPU와 네트워크를 사용하는 작업을 지연시킴으로써 배터리를
+절약하는 시스템 모드인 잠자기 모드를 도입했습니다. </p>
+
+<p>이제 Android N에서 잠자기 모드는 한걸음 더 나아가서 이동 중에도
+배터리를 절약합니다. 화면이 일정 시간 동안 꺼져 있고 기기의 플러그가
+뽑혀 있으면 잠자기 모드는 친숙한 일부 CPU 및 네트워크 제한을 앱에 적용합니다.
+즉, 사용자가 기기를 주머니에 휴대하고 다닐 때도 배터리를
+절약할 수 있습니다.</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>그림 3.</strong> 이제 잠자기 모드는 기기가 정지 상태가 아니더라도
+배터리 수명을 개선할 수 있도록 제한을 적용합니다.
+</p>
+
+
+<p>기기의 배터리가 켜져 있는 동안 화면이 꺼지면 잠시 후에
+잠자기 모드는 네트워크 액세스를 제한하고 작업과 동기화를 지연시킵니다. 잠시 동안의 유지 관리 기간 중에
+애플리케이션의 네트워크 액세스가 허용되고
+지연된 작업/동기화가 실행됩니다. 화면을 켜거나 기기의 플러그를 꽂으면 기기가 잠자기 모드 상태에서
+벗어납니다.</p>
+
+<p>기기가 다시 일정 시간 동안 배터리로 켜져 있고 화면이 꺼진
+정지 상태가 되면, 잠자기 모드는 {@link
+android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} 알람 및
+GPS/Wi-Fi 스캔에 대해 전체 CPU 및 네트워크 제한을 적용합니다.</p>
+
+<p>앱을 잠자기 모드에 맞게 적용하는 최선의 방법은 기기가 움직이든
+움직이지 않든 동일합니다. 따라서 잠자기 모드를 효율적으로 처리하도록
+앱을 이미 업데이트했다면 모든 준비가 완료된 것입니다. 아직 업데이트하지 않았다면 지금 <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">앱을 잠자기 모드에 맞춰
+조정</a>해 보세요.</p>
+
+<h2 id="background_optimizations">Project Svelte: 백그라운드 최적화</h2>
+
+<p>Project Svelte는 에코시스템에 속한 전체 Android 기기에서 시스템 및 앱에
+의해 사용되는 RAM 크기를 최소화하기 위한 지속적인 노력입니다. Android N에서 Project
+Svelte는 앱이 백그라운드에서 실행되는 방식을 최적화하는 데 초점을 맞추고 있습니다. </p>
+
+<p>백그라운드 처리는 대부분의 앱에서 필수적인 부분입니다. 백그라운드 처리가 올바로
+수행된다면 즉각적이고 빠르고 상황에 맞는 멋진 사용자 환경을 만들 수 있지만, 백그라운드
+처리가 올바로 수행되지 않는다면 RAM과 배터리를 불필요하게 소모하고
+다른 앱의 시스템 성능에 영향을 미칠 것입니다. </p>
+
+<p>Android 5.0 이후로,
+사용자가 선호하는 백그라운드 작업
+수행 방식은 {@link android.app.job.JobScheduler}였습니다. 앱은 메모리, 전원 및 연결 상태에 따라 시스템을 최적화하면서도
+작업을 예약할 수 있습니다. JobScheduler는 제어 기능과 간편성을 함께
+제공하므로, 저희는 모든 앱에서 이것을 사용하기 원합니다. </p>
+
+<p>
+ 또 한 가지 좋은 옵션은 <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+<code>GCMNetworkManager</code></a>입니다. 이는 Google Play
+ 서비스의 일부분으로, 레거시 Android 버전에서 호환성이
+ 있는 유사한 작업 예약을 제공합니다.
+</p>
+
+<p>Google에서는 더 많은 사용 사례를 충족시키기 위해 <code>JobScheduler</code> 및
+<code>GCMNetworkManager</code>를 계속
+확장하고 있습니다. 예를 들어, 이제 Android N에서는 콘텐츠 공급자의 변화에 따라
+ 백그라운드 작업을 예약할 수 있습니다. 이와 동시에, Google에서는 특히
+저용량 메모리 기기에서 시스템 성능을 저하시킬 수
+있는 일부 오래된 패턴들을 없애기 시작했습니다.</p>
+
+<p>Android N에서 저희는 자주 사용되는 세 가지 암시적 브로드캐스트인
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 및 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}를
+제거하는 중입니다. 왜냐하면 이것들은 여러 앱의 백그라운드 프로세스를 동시에 깨워서 메모리와 배터리를 과도하게 소모시킬 수 있기 때문입니다. 앱이
+이러한 브로드캐스트를 수신한다면, N Developer Preview를
+ 활용하여 <code>JobScheduler</code> 및 관련 API로 마이그레이션하세요. </p>
+
+<p>
+ 자세한 내용은 <a href="{@docRoot}preview/features/background-optimization.html">백그라운드
+ 최적화</a> 문서를 참조하세요.
+</p>
+
+
+<h2 id="data_saver">Data Saver</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>그림 4.</strong> Settings의 Data Saver.
+</p>
+ </div>
+
+<p>모바일 기기의 수명 전체에 걸쳐, 모바일 데이터 요금제에 따른 비용이
+기기 자체의 가격보다 일반적으로 많이 듭니다. 많은 사용자들에게 모바일 데이터는
+아껴 써야 하는 값비싼 자원입니다. </p>
+
+<p>Android N에서는 새로운 시스템 서비스인 Data Saver
+모드를 도입하며, Data Saver는 로밍 시나 결제 주기가 끝날 무렵
+또는 소액 선불 데이터 팩 사용 시에 앱에 의해 사용되는 모바일 데이터 사용량을 줄여줍니다. Data Saver를 통해 사용자는 앱이
+모바일 데이터를 사용하는 방식을 제어할 수 있으며, Data Saver가 켜져 있을 때 개발자가 더 효율적인 서비스를
+제공할 수 있습니다. </p>
+
+<p>사용자가 <strong>Settings</strong>에서 Data Saver를 활성화하고
+해당 기기가 데이터 통신 네트워크에 있는 경우, 시스템은 백그라운드
+데이터 사용을 차단하고, 가능하면 스트리밍의
+비트 전송률을 제한하거나 화질을 줄이거나 낙관적 사전 캐싱을
+지연시키는 등의 방식으로 포그라운드에서 데이터를 더 적게 사용하도록 앱에게 신호를 보냅니다. 사용자는 Data Saver가 켜진 경우에도 백그라운드 데이터 통신 연결을 허용하기 위해
+특정 앱을 허용 목록에 추가할 수 있습니다.</p>
+
+<p>Android N은 {@link android.net.ConnectivityManager}를 확장하여 <a href="{@docRoot}preview/features/data-saver.html#status">사용자의
+Data Saver 기본 설정을 검색</a>하고 <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">기본
+설정 변경을 모니터링</a>하는 방법을
+앱에 제공합니다. 모든 앱은 사용자가 Data Saver를 활성화했는지 여부를 확인해야 하며
+포그라운드 및 백그라운드 데이터 사용을 제한하도록 노력해야 합니다.</p>
+
+
+<h2 id="vulkan">Vulkan API</h2>
+
+<p>
+ Android N은 새로운 3D 렌더링 API인 <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>을 플랫폼에 통합합니다.
+<a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
+ ES</a>와 마찬가지로, Vulkan은 Khronos Group에 의해 관리되는 3D 그래픽 및 렌더링을 위한
+ 공개 표준입니다.
+</p>
+
+<p>
+ Vulkan은 처음부터 드라이버에서 CPU 오버헤드를 최소화하도록 설계되었고,
+ 애플리케이션이 GPU 작업을 더욱 직접적으로 제어할 수 있게 해줍니다. 또한, Vulkan은
+ 멀티스레드가 명령 버퍼 생성과 같은 작업을
+한 번에 수행하도록 허용하여 병렬 처리 성능을 높입니다.
+</p>
+
+<p>
+ Vulkan 개발 도구와 라이브러리가 Android NDK에 배포되며, 그 포함 내역은
+ 다음과 같습니다.
+</p>
+
+<ul>
+ <li>헤더
+ </li>
+
+ <li>유효성 검사 계층(디버그 라이브러리)
+ </li>
+
+ <li>SPIR-V 셰이더 컴파일러
+ </li>
+
+ <li>SPIR-V 런타임 셰이더 컴파일 라이브러리
+ </li>
+</ul>
+
+<p>
+ Vulkan은 Nexus 5X, Nexus 6P 및 Nexus Player와 같은 Vulkan 지원 하드웨어가 있는 기기의
+ 앱에만 사용될 수 있습니다. Google은
+ 최대한 조속히 Vulkan을 더 많은 기기에 도입하기 위해 파트너들과 긴밀히 협력하고 있습니다.
+</p>
+
+<p>
+ 자세한 내용은 <a href="{@docRoot}ndk/guides/graphics/index.html">API 문서</a>를 참조하세요.
+</p>
+
+<h2 id="tile_api">Quick Settings 타일 API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>그림 5.</strong> 알림 창의 Quick Settings 타일.
+</p>
+
+
+ </div><p>Quick Settings는 키 설정 및 작업을 알림 창에서 직접 노출시키기
+위해 널리 사용되는 간단한 방법입니다. 더욱 유용하고 편리한 설정을
+위해 저희가 Android N에서 Quick Settings의 범위를 더욱 확장했습니다. </p>
+
+<p>Google에서는 Quick Settings 타일에 필요한 공간을 더 추가했으며,
+사용자는 페이지가 지정된 디스플레이 영역에서 왼쪽이나 오른쪽으로 스와이프하여 이들 타일에 액세스할 수 있습니다. 또한, 사용자가 Quick Settings 타일의
+모습과 표시 위치를 제어할 수 있도록 했습니다. 따라서 사용자는 끌어서 놓는 간단한 방법으로
+타일을 추가하거나 이동시킬 수 있습니다. </p>
+
+<p>또한, Android N은 개발자를 위해 새로운 API도 추가했으며
+ 이를 통해 자신만의 Quick Settings 타일을 정의할 수 있으며, 사용자가 앱에서 키 컨트롤 및 작업에 쉽게 액세스할 수 있습니다.</p>
+
+<p>
+ 빠른 설정 타일은 긴급하게 필요하거나 자주 사용되는 컨트롤 또는
+작업을 위해 예약되어 있으며, 앱을 시작하기 위한 바로가기로
+사용되어서는 안 됩니다.
+</p>
+
+<p>
+ 타일을 정의한 후에는 이 타일을 사용자에게 표시할 수 있으며, 사용자가
+ 드래그 앤 드롭하는 것만으로 이 타일을 Quick Settings에 추가할 수 있습니다.
+</p>
+
+<p>
+ 앱 타일 만들기에 대한 자세한 내용은
+다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 <code>android.service.quicksettings.Tile</code>에 대한 문서를 참조하세요.
+</p>
+
+
+
+<h2 id="number-blocking">번호 차단</h2>
+
+<p>이제 Android N에서는 플랫폼에서 번호 차단을 지원하며,
+서비스 공급자가 차단된 번호 목록을 유지 관리할 수 있도록 프레임워크 API를 제공합니다. 기본
+SMS 앱, 기본 전화 앱 및 이동통신사 앱은
+차단된 번호 목록에서 읽기와 쓰기가 가능합니다. 다른 앱은 이 목록에 액세스할 수 없습니다.</p>
+
+<p>Android에서는 번호 차단을 플랫폼의 표준 기능으로 만들어,
+광범위한 기기에서 번호를 차단하기 위한 일관된 방식을 앱에
+제공합니다. 앱에서 활용할 수 있는 기타 이점은 다음과 같습니다.</p>
+
+<ul>
+ <li> 통화에서 차단된 번호가 텍스트에서도 차단됩니다.
+ <li> 차단된 번호는 재설정 시에도 백업 및 복원 기능을 통해
+기기에서 유지될 수 있습니다.
+ <li> 여러 앱이 동일한 차단된 번호 목록을 사용할 수 있습니다.
+</ul>
+
+<p>또한 Android를 통한 이동통신사 앱 통합은 이동통신사들이 기기의
+차단된 번호 목록을 읽고 서비스측 차단을 수행할 수 있음을 의미하며,
+이를 통해 사용자들은 원치 않는 통화와 문자가
+특정 매체(예: VOIP 엔드포인트 또는 착신 전화)를 통해 자신들에게 도달하는 것을 차단할 수 있습니다.</p>
+
+<p>
+ 자세한 내용은
+ 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
+ 참조</a>에서 <code>android.provider.BlockedNumberContract</code>를 참조하세요.
+</p>
+
+<h2 id="call_screening">통화 스크리닝</h2>
+
+<p>
+ Android N에서는 기본 전화 앱이 수신 통화를 스크리닝하도록 허용합니다. 이를 위해
+전화 앱에는 새로운 <code>CallScreeningService</code>가 구현되며, 이를 통해 전화 앱은
+수신 통화의 {@link android.telecom.Call.Details Call.Details}에 따라
+다음과 같은 다양한 작업을 수행할 수 있습니다.
+</p>
+
+<ul>
+ <li> 수신 통화 거절
+ <li> 통화를 통화 기록에 허용하지 않음
+ <li> 통화 알림을 사용자에게 표시하지 않음
+</ul>
+
+<p>
+ 자세한 내용은
+ 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
+ 참조</a>에서 <code>android.telecom.CallScreeningService</code>를 참조하세요.
+</p>
+
+
+<h2 id="multi-locale_languages">다중 로케일 지원, 더 많은 언어 지원 추가</h2>
+
+
+<p>두 가지 언어로 된 사용 사례를 지원하기 위해 이제
+Android N에서는 사용자가 Settings에서 <strong>다중 로케일</strong>을 선택할 수 있습니다. 앱은 새로운
+API를 사용하여 사용자의 로케일을 가져온
+다음, 검색 결과를 여러 언어로 표시하거나 사용자가 이미 알고 있는
+언어로는 웹 페이지를 번역하지 않는 등의 더욱 정교한 사용자 환경을
+다중 로케일 사용자들에게 제공합니다.</p>
+
+<p>다중 로케일 지원과 함께 Android N에서는 또한 사용자가
+사용할 수 있는 언어의 범위도 더욱 넓혔습니다. 영어, 스페인어, 프랑스어,
+아랍어 등의 자주 사용되는 언어에 대해 각각 25가지 이상의 변형을 제공하며, 100가지 이상의 새로운 언어에 대한 부분적인
+지원도 추가합니다.</p>
+
+<p>앱은
+<code>LocaleList.GetDefault()</code>를 호출하여 사용자가 설정한 로케일 목록을 가져올 수 있습니다. 더 많은 수의 로케일을 지원하기 위해 Android N에서는 리소스 확인 방식을
+바꾸는 중에 있습니다. 새로운 리소스 확인 논리에서
+앱이 예상대로 작동하는지 테스트하고 확인해야 합니다.</p>
+
+<p>새로운 리소스 확인 동작과 따라야 하는 모범 사례에 대해
+알아보려면, <a href="{@docRoot}preview/features/multilingual-support.html">다국어 지원</a>을 참조하세요.</p>
+
+
+<h2 id="emoji">새 이모티콘</h2>
+
+<p>
+ Android N에서는 피부 색조 그림 이모티콘과 변형 선택기 지원을
+ 비롯한 추가적인 그림 이모티콘과 그림 이모티콘 관련
+ 기능을 도입했습니다. 앱에서 그림 이모티콘을 지원하는 경우
+ 아래 지침에 따라 이러한 그림 이모티콘에 관련된 기능을 잘 활용해 보세요.
+</p>
+
+<ul>
+ <li>
+ <strong>그림 이모티콘을 삽입하기 전에 기기에 해당 그림 이모티콘이 들어 있는지 확인하세요.</strong>
+ 시스템 글꼴에 어떤 이모티콘이 있는지
+ 확인하려면 {@link android.graphics.Paint#hasGlyph(String)} 메서드를 사용하세요.
+ </li>
+ <li>
+ <strong>그림 이모티콘이 변형 선택기를 지원하는지 확인하세요.</strong>
+ 변형 선택기를 사용하면 특정 이모티콘을 컬러나
+ 흑백으로 표현할 수 있습니다.
+ 모바일 기기에서는 앱이 흑백보다는 컬러로 이모티콘을 표시해야 합니다. 하지만
+ 앱이 텍스트와 함께 이모티콘을 표시하는 경우에는 흑백 변형을 사용해야 합니다.
+ 그림 이모티콘에 변형 이모티콘이 있는지 확인하려면 변형 선택기를 사용하세요.
+ 변형이 있는 캐릭터의 전체 목록은
+<a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">변형에
+대한 유니코드 설명서</a>의 <em>그림 이모티콘 변형 시퀀스</em> 섹션을
+검토하세요.
+ </li>
+ <li>
+ <strong>그림 이모티콘이 피부 색조를 지원하는지 확인하세요.</strong> Android N 사용자는 이모티콘의 렌더링된 피부 색조를
+ 자신의 기본 설정에 맞게 수정할 수 있습니다. 키보드 앱은 여러 가지 피부 색조가 있는
+이모티콘에 대한 시각적 표시를 제공해야 하며, 사용자가 선호하는 피부 색조를 선택하도록
+허용해야 합니다. 어떤 시스템 이모티콘에 피부 색조
+한정자가 있는지 확인하려면 {@link android.graphics.Paint#hasGlyph(String)}
+메서드를 사용하세요.
+<a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
+유니코드 설명서</a>를 읽어보면 어떤 이모티콘에서 피부 색조가 사용되는지 확인할 수 있습니다.
+ </li>
+</ul>
+
+
+<h2 id="icu4">Android의 ICU4J API</h2>
+
+<p>
+ 이제 Android N에서는 <code>android.icu</code> 패키지 아래의 Android 프레임워크에 있는 <a href="http://site.icu-project.org/">ICU4J</a> API의 하위 세트를
+ 제공합니다. 마이그레이션이
+ 용이하며, 대개는 <code>com.java.icu</code> 네임스페이스를
+ <code>android.icu</code>로 변경하는 것이 간단합니다. 앱에서 ICU4J 번들을
+ 이미 사용 중이신 경우, Android 프레임워크에서 제공되는 <code>android.icu</code>
+ API로 전환하면 APK 크기를 상당히 줄일 수 있습니다.
+</p>
+
+<p>
+ Android ICU4J API에 대해 자세히 알아보려면 <a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J 지원</a>을 참조하세요.
+</p>
+
+
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>Android N에서는 다음을 비롯하여 OpenGL ES 3.2용 프레임워크 인터페이스와 플랫폼 지원을 추가합니다.</p>
+
+<ul>
+ <li> <code>EXT_texture_sRGB_decode</code>를 제외한 <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
+Android 확장 프로그램 팩</a></a>(AEP)의 모든 확장 프로그램.
+ <li> HDR 및 지연 셰이딩을 위한 부동 소수점 프레임 버퍼.
+ <li> 일괄처리 및 스트리밍 성능을 향상시키는 BaseVertex 그리기 호출.
+ <li> WebGL 오버헤드를 줄여주는 강력한 버퍼 액세스 제어.
+</ul>
+
+<p>Android N에 있는 OpenGL ES 3.2용 프레임워크 API에는
+<code>GLES32</code> 클래스가 제공됩니다. OpenGL ES 3.2를 사용 중인
+경우 반드시 <code><uses-feature></code> 태그와 <code>android:glEsVersion</code>
+속성을 사용하여 매니페스트 파일에서 요구 사항을 선언하세요. </p>
+
+<p>기기의 지원되는 OpenGL ES 버전을 런타임에 확인하는
+방법을 비롯하여, OpenGL ES 사용에 대한 자세한 내용은 <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API 가이드</a>를 참조하세요.</p>
+
+
+<h2 id="android_tv_recording">Android TV 녹화</h2>
+
+<p>Android N에서는 새로운 녹화 API를 통해 Android TV 입력
+서비스로부터 콘텐츠를 녹화하고 재생하는 기능을 추가합니다. 기존의 타임 시프트 API를 기반으로 구축된 TV 입력
+서비스는 녹화 가능한 채널 데이터와 녹화된 세션의 저장 방식을 제어할 수 있으며,
+녹화된 콘텐츠와의 사용자 상호 작용을 관리할 수 있습니다. </p>
+
+<p>자세한 내용은 <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording API</a>를 참조하세요.</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work에서는 Android N이 실행되는 기기를
+위해 여러 가지 새로운 기능과 API를 추가합니다. 몇 가지 특징이 아래에 나와 있으며, 변경 사항의 전체 목록은
+<a href="{@docRoot}preview/features/afw.html">Android for Work 업데이트</a>를 참조하세요.</p>
+
+<h3 id="work_profile_security_challenge">작업 프로필 보안 인증 질문 </h3>
+
+<p>
+ N SDK를
+대상으로 하는 프로필 소유자는 작업 프로필에서 작동하는 앱에 대해
+별개의 보안 인증 질문을 지정할 수 있습니다. 사용자가 업무용 앱을 열려고 시도할 때 작업 프로필 보안 인증 질문이
+표시됩니다. 보안 인증 질문에 올바로 답하면 작업 프로필의 잠금이 해제되고 필요하다면
+작업 프로필의 암호가 해독됩니다. 프로필 소유자의 경우,
+<code>ACTION_SET_NEW_PASSWORD</code>는
+작업 프로필 보안 인증 질문을 설정하라는 메시지를 사용자에게 표시하고, <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code>는 기기
+잠금을 설정하라는 메시지를 사용자에게 표시합니다.
+</p>
+
+<p>
+ 프로필 소유자는 <code>setPasswordQuality()</code>, <code>setPasswordMinimumLength()</code> 및 관련 메서드를 사용하여
+작업 프로필 보안 인증 질문에 대해
+별개의 비밀번호 정책을 설정할 수
+있습니다(예: PIN의 길이는 얼마로 해야 할지 또는 프로필을 잠금 해제하기 위해 지문을 사용할 수 있는지 여부). 프로필 소유자는
+새 <code>getParentProfileInstance()</code> 메서드에 의해 반환되는 <code>DevicePolicyManager</code>
+인스턴스를 사용하여 기기 잠금을 설정할 수도 있습니다.
+ 그 밖에도, 프로필 소유자는
+새 <code>setOrganizationColor()</code> 및 <code>setOrganizationName()</code> 메서드를 사용하여 작업 프로필 보안 인증 질문에 대한 자격 증명 화면을
+사용자 지정할 수 있습니다.
+</p>
+<h3 id="turn_off_work">작업 해제 </h3>
+
+<p>작업 프로필이 있는 기기에서는 사용자가 작업 모드를 설정하거나 해제할 수 있습니다. 작업 모드가
+해제되면 관리된 사용자가 일시적으로 종료되며, 이 경우 작업 프로필
+앱, 백그라운드 동기화 및 알림이 비활성화됩니다. 여기에는 프로필 소유자 애플리케이션이
+포함됩니다. 작업 모드가 해제되면 사용자가 업무용 앱을 실행할 수 없음을
+미리 알려주기 위한 영구적인 상태 아이콘이 표시됩니다. 런처는
+업무용 앱과 위젯에 액세스할 수 없음을 나타냅니다. </p>
+
+<h3 id="always_on_vpn">상시 접속 VPN </h3>
+
+<p>기기 소유자 및 프로필 소유자는 항상 지정된 VPN을 통해 업무용 앱을
+연결하도록 보장할 수 있습니다. 시스템은 기기가 부팅된
+후에 해당 VPN을 자동으로 시작합니다.</p>
+
+<p>
+ 새로운 <code>DevicePolicyManager</code> 메서드는
+ <code>setAlwaysOnVpnPackage()</code> 및
+ <code>getAlwaysOnVpnPackage()</code>입니다.
+</p>
+
+<p>앱 상호 작용 없이 시스템에 의해
+VPN 서비스가 직접 바인딩될 수 있으므로, VPN 클라이언트는 상시 접속 VPN에 대해 새로운 진입점을 처리해야 합니다. 이전과
+마찬가지로, 서비스는 <code>android.net.VpnService</code> 액션과 일치하는 인텐트 필터에
+의해 시스템에 표시됩니다. </p>
+
+<p>
+ 또한, <strong>Settings>More>Vpn</strong>을 사용하여 사용자는 기본 사용자에서
+ <code>VPNService</code> 메서드를
+ 구현하는 상시 접속 VPN 클라이언트를 수동으로 설정할 수도 있습니다.
+</p>
+
+<h3 id="custom_provisioning">사용자 지정 프로비저닝</h3>
+
+<p>
+ 애플리케이션은 기업 색상과 로고로 프로필 소유자 및 기기 소유자 프로비저닝
+ 흐름을 사용자 지정할 수 있습니다.
+<code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>가 흐름 색상을
+사용자 지정하고, <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>가
+기업 로고로 흐름을 사용자 지정합니다.
+</p>
+
+<h2 id="accessibility_enhancements">접근성 향상</h2>
+
+<p>이제 Android N에서는 새로운 기기 설치 시 Welcome 화면에서
+Vision Settings를 바로 제공합니다. 이렇게 하면 사용자가 자신의
+기기에서 확대 제스처, 글꼴 크기,
+디스플레이 크기 및 TalkBack 등과 같은 접근성 기능을 휠씬 더 쉽게 검색하고 구성할 수 있습니다. </p>
+
+<p>이렇게 눈에 띄는 위치에 접근성 기능을 배치하면, 사용자가 이
+기능을 활성화하여 앱을 사용할 가능성이 더욱 커집니다. 이들 설정을 활성화하여 조기에 앱을
+테스트해야 합니다. Settings >
+Accessibility에서 설정을 활성화할 수 있습니다.</p>
+
+<p>Android N에서도 마찬가지로, 운동 장애가 있는 사용자가
+이제 접근성 서비스를 통해 화면을 터치할 수 있습니다. 이 새로운 API를 사용하면 얼굴 추적, 시각 추적,
+지점 스캐닝 등의 기능으로 서비스를 구축하여 해당 사용자의
+요구를 충족시킬 수 있습니다.</p>
+
+<p>자세한 내용은
+ 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 <code>android.accessibilityservice.GestureDescription</code>을 참조하세요.</p>
+
+
+<h2 id="direct_boot">직접 부팅</h2>
+
+<p>직접 부팅은 기기 시동 시간을 개선해주며, 예상치 못한 재부팅
+후에도 등록된 앱이 제한된 기능을 유지하도록 해줍니다. 예를 들어,
+사용자가 취침하는 중에 암호화된 기기가 재부팅되는 경우,
+이제는 등록되어 있는 알람, 메시지 및 수신 통화로 사용자에게 알려줄
+수 있습니다. 즉, 재시작 직후에도 접근성 서비스를
+ 바로 사용할 수 있습니다.</p>
+
+<p>직접 부팅은 Android N의 파일 기반 암호화를 활용하여 시스템
+및 앱 데이터에 대해 정밀한 암호화 정책을 활성화합니다. 이 시스템은
+선택된 시스템 데이터와 명시적으로 등록된 앱
+데이터에 대해 기기 암호화 저장소를 사용합니다. 기본적으로, 다른 모든
+ 시스템 데이터, 사용자 데이터, 앱 및 앱 데이터에 대해 자격 증명 암호화 저장소가 사용됩니다. </p>
+
+<p>부팅 시에 시스템은 제한된 모드에서 시작되며, 기기 암호화
+데이터에만 액세스할 수 있고 앱 또는 데이터에는 액세스하지
+못합니다. 이 모드에서 구성 요소를 실행하려는 경우,
+매니페스트에 플래그를 설정하여 구성 요소를 등록할 수 있습니다. 재시작 후에 시스템은 <code>LOCKED_BOOT_COMPLETED</code>
+인텐트를 브로드캐스트하여
+등록된 구성 요소를 활성화합니다. 잠금을 해제하기 전에, 시스템은 등록된 기기
+암호화 앱 데이터를 사용할 수 있는지 확인합니다. 사용자가 잠금 화면 자격 증명을 확인하여
+ 암호를 풀기 전까지는 다른 모든 데이터를 사용할 수 없습니다. </p>
+
+자세한 내용은 <a href="{@docRoot}preview/features/direct-boot.html">직접 부팅</a>을 참조하세요.</p>
+</p>
+
+
+<h2 id="key_attestation">Key Attestation</h2>
+
+<p>하드웨어 기반 키 저장소는 Android 기기에서 암호화 키를
+만들고 저장하고 사용하기 위한 훨씬 더 안전한 방법입니다. 이
+키 저장소는 Linux 커널, 잠재적 Android 취약점, 루팅된 기기의
+공격으로부터 키를 보호해 줍니다.</p>
+
+<p>하드웨어 기반 키 저장소를 더욱 쉽고 안전하게 사용하도록
+Android N에서는 Key Attestation을 도입했습니다. Key Attestation을 사용하여 앱
+및 오프-기기는 RSA 또는 EC 키 쌍이 하드웨어 기반인지 여부를 결정할 수
+있으며, 키 쌍의 속성에는 어떤 것이 있고 어떠한 제약 조건이 사용성
+및 유효성에 적용되는지 여부를 결정할 수 있습니다. </p>
+
+<p>앱 및 오프-기기 서비스는 X.509 증명 인증서를 통해 키 쌍에 대한
+정보를 요청할 수 있으며 이 인증서는 유효한 증명 키로 서명되어야
+합니다. 증명 키는 공장에서 기기의 하드웨어 기반
+키 저장소에 주입되는 ECDSA 서명 키입니다. 따라서 유효한 증명 키에 의해
+서명된 증명 인증서는 하드웨어 기반 키 저장소에 있는 키 쌍의
+세부 정보와 함께 이 키 저장소의 존재 여부를
+확인합니다.</p>
+
+<p>안전한 공식 Android 공장 이미지가 기기에 사용 중인지
+확인하기 위해, Key Attestation은
+기기 <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">부트로더</a>가 다음의 정보를 <a class="external-link" href="https://source.android.com/security/trusty/index.html">TEE(Trusted Execution Environment)</a>에
+제공하도록 요구합니다.</p>
+
+<ul>
+<li>기기에 설치된 OS 버전 및 패치 수준</li>
+<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">확인된 부팅</a> 공개 키 및 잠금 상태</li>
+ </ul>
+
+<p>하드웨어 기반 키 저장소 기능에 대한 자세한
+내용은 <a href="https://source.android.com/security/keystore/" class="external-link">하드웨어 기반 키 저장소</a> 가이드를 참조하세요.</p>
+
+<p>Key Attestation 이외에도 Android N에서는 지문 등록
+시 취소되지 않는 지문 바인드 키도 도입했습니다.</p>
+
+<h2 id="network_security_config">네트워크 보안 구성</h2>
+
+<p>Android N에서 앱은 오류가 발생하기 쉬운 기존의 프로그래밍 방식
+API(예: X509TrustManager)를 사용하는 대신 선언적
+<em>네트워크 보안 구성</em>을 사용하여 보안(HTTPS, TLS) 연결의 동작을 코드
+수정 없이 안전하게 사용자 지정할 수 있습니다.</p>
+
+ <p>지원되는 기능:</p>
+<ul>
+<li><b>사용자 지정 신뢰 앵커.</b> 애플리케이션이 보안 연결을 위해
+어떤 인증 기관(CA)을 신뢰할 수 있는지 사용자 지정할 수 있게 해줍니다. 예를 들어,
+특정한 자체 서명 인증서를 신뢰하거나 제한적인 공용 CA 세트를 신뢰하도록 사용자 지정할 수 있습니다.
+</li>
+<li><b>디버그 전용 재정의.</b> 애플리케이션 개발자가 설치 기반에 위험을 더하지
+않고 애플리케이션의 보안 연결을 안전하게
+디버그할 수 있게 해줍니다.
+</li>
+<li><b>일반 텍스트 트래픽 옵트아웃.</b> 애플리케이션이 일반 텍스트 트래픽을 실수로 사용하지
+않도록 스스로를 보호할 수 있게 해줍니다.</li>
+<li><b>인증서 고정.</b> 애플리케이션이 보안 연결을 위해 어떤 서버 키를
+ 신뢰할지 제한하도록 해주는 고급 기능입니다.</li>
+</ul>
+
+<p>자세한 내용은 <a href="{@docRoot}preview/features/security-config.html">네트워크 보안 구성</a>을
+참조하세요.</p>
+
+<h2 id="default_trusted_ca">신뢰할 수 있는 기본 인증 기관</h2>
+
+<p>기본적으로, Android N을 대상으로 하는 앱은 시스템에서
+제공되는 인증서만을 신뢰하며 사용자가 추가한 인증 기관(CA)은 더 이상 신뢰하지 않습니다. Android N을 대상으로 하는 앱이 사용자가
+추가한 CA를 신뢰하려는 경우에는
+<a href="{@docRoot}preview/features/security-config.html">네트워크 보안 구성</a>을 사용하여
+사용자 CA를 신뢰해야 하는 방법을 지정해야 합니다.</p>
+
+<h2 id="apk_signature_v2">APK Signature Scheme v2</h2>
+
+<p>
+ Android N에서는 앱 설치 시간을 더욱 단축시켜 주고
+APK 파일을 무단으로 변경하지 못하도록 더욱 강력하게
+보호해주는 새로운 앱 서명 구성표인 APK Signature Scheme v2를 도입했습니다. 기본적으로, Android Studio 2.2 및 Android
+ Plugin for Gradle 2.2는 APK Signature Scheme v2 뿐만 아니라 JAR 서명을 사용하는 기존의 서명 구성표를 둘다
+ 사용하여 앱에 서명합니다.
+</p>
+
+<p>
+ 앱에 APK Signature Scheme v2를 적용하는 것이 좋지만, 이 새로운
+ 구성표를 반드시 적용해야 하는 것은 아닙니다. APK
+ Signature Scheme v2를 사용할 때 앱이 올바로 빌드되지 않을 경우 이 새 구성표를 비활성화할 수 있습니다. 비활성화 프로세스가
+실행되면 Android Studio 2.2 및 Android Plugin for Gradle 2.2는 기존의 서명 구성표만 사용하여
+앱에 서명합니다. 기존 구성표만으로
+서명하려면 모듈 수준의 <code>build.gradle</code> 파일을 연 다음, 릴리스 서명
+구성에 <code>v2SigningEnabled false</code> 줄을
+추가하세요.
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>주의: </strong> APK
+ Signature Scheme v2를 사용하여 앱에 서명하고 앱을 추가로 변경하는 경우 앱의 서명이
+ 무효화됩니다. 따라서 <code>zipalign</code>과
+ 같은 도구는 APK Signature Scheme v2를 사용하여 앱에 서명한 후가 아니라 서명하기 전에 사용되어야 합니다.
+</p>
+
+<p>
+ 자세한 내용은 Android Studio에서
+<a href="{@docRoot}studio/publish/app-signing.html#release-mode">앱에
+서명</a>하는 방법을 설명하고 Android Plugin for Gradle을 사용하여 <a href="{@docRoot}studio/build/build-variants.html#signing">앱
+ 서명을 위한 빌드 파일을 구성</a>하는 방법에 대해 설명하는 Android Studio 문서를 읽어보세요.
+</p>
+
+<h2 id="scoped_directory_access">범위가 지정된 디렉터리 액세스</h2>
+
+<p>Android N에서 앱은 새로운 API를 사용하여 특정
+<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">외부 저장소</a> 디렉터리(SD 카드와 같은 이동식 미디어의 디렉터리 포함)에
+대한 액세스를 요청할 수 있습니다. 새로운 API는 애플리케이션이
+표준 외부 저장소 디렉터리(예: <code>Pictures</code> 디렉터리)에 액세스하는 방식을 훨씬 단순화합니다. 사진
+앱과 같은 앱은 모든 저장소 디렉터리에 대해 액세스 권한을 부여하는
+<code>READ_EXTERNAL_STORAGE</code>를 사용하는 대신 또는 사용자가 디렉터리를 탐색하도록 하는 저장소 액세스 프레임워크(SAF)를
+사용하는 대신 이들 API를
+사용할 수 있습니다.</p>
+
+<p>또한, 새로운 API는 사용자가 외부 저장소 액세스 권한을
+앱에 부여하는 단계를 단순화합니다. 새로운 API를 사용하는 경우 시스템은
+애플리케이션이 어떤 디렉터리에 대한 액세스 권한을
+요청하는지를 명확하게 설명해주는 단순한 권한 UI를 사용합니다.</p>
+
+<p>자세한 내용은
+<a href="{@docRoot}preview/features/scoped-folder-access.html">범위가 지정된
+디렉터리 액세스</a> 개발자 문서를 참조하세요.</p>
+
+<h2 id="keyboard_shortcuts_helper">Keyboard Shortcuts Helper</h2>
+
+<p>
+Android N에서는 사용자가 "Alt + /" 키를 눌러 <em>Keyboard Shortcuts</em>
+화면을 트리거할 수 있는데, 이 화면에는 시스템과 해당 앱에서 둘다 사용할 수 있는 모든
+바로 가기가 표시됩니다. 이들 바로 가기는 앱의 메뉴에서 자동으로 검색되지만(사용 가능한 경우),
+개발자가 화면에 맞춰 스스로 미세 조정한 바로 가기 목록을
+제공할 수 있습니다. 이를 위해서는 다운로드 가능한
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에 설명되어 있는 새
+<code>Activity.onProvideKeyboardShortcuts()</code> 메서드를 재정의할 수 있습니다.
+</p>
+
+<p>
+앱의 어느 곳에서든 Keyboard Shortcuts Helper를 트리거하려면 관련 액티비티에 대해
+{@code Activity.requestKeyboardShortcutsHelper()}를 호출하세요.
+</p>
+
+<h2 id="sustained_performance_api">지속적인 성능 API</h2>
+
+<p>
+기기 구성 요소가 온도 제한에 도달할 때
+시스템에서는 시스템온칩(system-on-chip) 엔진을 조절하므로, 장시간 실행되는 앱의 성능이 크게 변동될
+수 있습니다. 이러한 변동은 장시간 실행되는 고성능 앱을 만들려는 앱 개발자
+입장에서는 일종의 움직이는 과녁과도 같은 것입니다.
+</p>
+
+<p>
+이러한 제한을 해결하기 위해, Android N에서는
+<em>지속적인 성능 모드</em>를 지원하며, 이 모드를 통해 OEM들은 장시간 실행되는 앱의
+기기 성능에 대한 힌트를 제공할 수 있습니다. 앱 개발자는
+이들 힌트를 사용하여 장기간에 걸쳐
+기기 성능을 예측 가능하고 이 성능을 일관된 수준으로 유지하기 위해 앱을 적절히 조정할 수 있습니다.
+</p>
+
+<p>
+앱 개발자는 N Developer Preview에 있는 이
+새 API를 Nexus 6P 기기에서만 시험해 볼 수 있습니다. 이 기능을 사용하려면
+지속적인 성능 모드에서 실행하려는 기간에 대해
+지속적인 성능 기간 플래그를 설정하세요.
+{@code Window.setSustainedPerformanceMode()} 메서드를 사용하여 이 플래그를 설정하세요. 해당 기간이 포커스 안에 없을 때는
+이 모드가 자동으로 비활성화됩니다.
+</p>
+
+<h2 id="vr">VR 지원</h2>
+
+<p>
+개발자가 사용자를 위한 고품질 모바일 VR 환경을 만들 수 있도록, Android N에서는
+새로운 VR 모드에 대한 플랫폼 지원과 최적화를 추가합니다. VR 앱 전용 CPU 코어에 대한 액세스를 비롯하여
+다수의 성능 개선 사항이 있습니다.
+지능적 머리 추적과
+VR용으로 작동하는 스테레오 알림 기능을 앱 내에서 이용할 수 있습니다. 가장 중요한 점은, 지연 시간이 매우 짧은
+그래픽을 Android N이 제공한다는 사실입니다. Android N용 VR 앱 만들기에 대한 자세한 정보는
+<a href="https://developers.google.com/vr/android/">Android용 Google VR SDK</a>를 참조하세요.
+</p>
+
+
+<h2 id="print_svc">인쇄 서비스 개선 사항</h2>
+
+<p>
+ 이제 Android N에서는 인쇄 서비스 개발자가 개별 프린터와 인쇄 작업에
+대한 추가적인 정보를 노출시킬 수 있습니다.
+</p>
+
+<p>
+ 개별 프린터를 나열할 때, 이제 인쇄 서비스가 다음 두 가지 방식으로 프린터마다
+아이콘을 설정할 수 있습니다.
+</p>
+
+<ul>
+ <li><code>PrinterInfo.Builder.setResourceIconId()</code>를 호출하여 리소스 ID로부터
+아이콘을 설정할 수 있습니다.
+ </li>
+
+ <li><code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>을 호출하고,
+<code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>을 사용하여 아이콘이 요청될 때 콜백을 설정하여
+네트워크에서 아이콘을 표시할
+ 수 있습니다.
+ </li>
+</ul>
+
+<p>
+ 또한, <code>PrinterInfo.Builder.setInfoIntent()</code>를 호출하여 추가적인 정보를 표시하도록
+프린터당 액티비티를 제공할 수 있습니다.
+</p>
+
+<p>
+ <code>android.printservice.PrintJob.setProgress()</code> 및
+<code>android.printservice.PrintJob.setStatus()</code>를 각각 호출하여
+인쇄 작업 알림에서 인쇄 작업의
+진행률과 상태를 나타낼 수 있습니다.
+</p>
+
+<p>
+ 이들 메서드에 대한 자세한 내용은 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>를 확인하세요.
+</p>
+
+<h2 id="framemetrics_api">FrameMetricsListener API</h2>
+
+<p>
+앱은 FrameMetricsListener API를 통해 UI 렌더링
+성능을 모니터링할 수 있습니다. 이 기능을 제공하기 위해 이 API는 앱의 현재 창에 대한 프레임 타이밍
+정보를 전송하는 스트리밍 Pub/Sub API를 노출시킵니다. 반환되는 데이터는
+<code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code>가 표시하는 데이터와 동일하지만, 지난 120개 프레임으로 제한되지 않습니다.
+</p>
+
+<p>
+FrameMetricsListener를 사용하면 USB 연결 없이 프로덕션 환경에서
+상호 작용 수준의 UI 성능을 측정할 수 있습니다. 이 API를
+사용하면
+{@code adb shell dumpsys gfxinfo}보다 훨씬 세분화된 수준에서 데이터를 수집할 수 있습니다. 시스템은 앱에서 발생하는 특정한 상호 작용에
+대한 데이터를 수집할 수 있기 때문에, 이처럼 높은 수준의 세분화가 가능합니다. 시스템은
+전체 앱의 성능에 대한 전체 요약을 캡처하거나
+전체 상태를 지울 필요가 없습니다. 이 기능을 사용하면
+앱 내에서의 실제 사용 사례에 대한 UI 성능에서
+성능 데이터를 수집하고 성능 저하를 찾아낼 수 있습니다.
+</p>
+
+<p>
+창을 모니터링하려면 <code>FrameMetricsListener.onMetricsAvailable()</code>
+콜백 메서드를 구현하고 해당 창에 등록하세요. 자세한 내용은 다운로드 가능한
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 {@code FrameMetricsListener} 클래스 문서를
+참조하세요.
+</p>
+
+<p>
+이 API는 {@code FrameMetrics} 객체를 제공하며 여기에는 렌더링 하위 시스템이 프레임 수명 주기의 다양한 이정표에 대해 보고하는
+타이밍 데이터가 포함됩니다.
+지원되는 지표는 {@code UNKNOWN_DELAY_DURATION},
+{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
+{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
+{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
+{@code TOTAL_DURATION}, {@code FIRST_DRAW_FRAME}입니다.
+</p>
+
+
+<h2 id="virtual_files">가상 파일</h2>
+
+<p>
+ 이전 버전의 Android에서는 사용자가
+Google 드라이브와 같은 자신의 클라우드 저장소 계정에서 파일을 선택할 수 있도록, 앱이 저장소 액세스 프레임워크를
+사용할 수 있었습니다. 하지만 직접적인 바이트코드 표시가 없는
+파일을 표시하기 위한 방법이 없었으며, 모든 파일이 입력 스트림을
+제공해야 했습니다.
+</p>
+
+<p>
+ Android N에서는 <em>가상 파일</em>이라는 개념을 저장소 액세스
+ 프레임워크에 추가합니다. 가상 파일 기능을 사용하면,
+{@link android.content.Intent#ACTION_VIEW} 인텐트와 함께 사용될 수 있는
+문서 URI에 직접적인 바이트코드 표시가 없더라도 이 문서 URI를 {@link android.provider.DocumentsProvider}가 반환할 수
+있습니다. 또한 Android N에서는 가상 파일이든 아니든 간에, 사용자 파일에 대한
+대체 형식을 제공할 수 있습니다.
+</p>
+
+<p>
+ 앱에서 가상 문서의 URI를 가져오려면 먼저
+{@link android.content.Intent}를 만들어 파일 선택기 UI를 여세요. 앱은 {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()}
+ 메서드를 사용하여
+ 가상 파일을
+직접 열 수 없으므로,
+{@link android.content.Intent#CATEGORY_OPENABLE} 카테고리를 포함하는 경우에는 앱이 어떤 가상 파일도 수신하지 못합니다.
+</p>
+
+<p>
+ 사용자가 선택한 후에는, 시스템이
+{@link android.app.Activity#onActivityResult onActivityResult()} 메서드를 호출합니다.
+ 아래의 코드 조각에서 볼 수 있듯이, 앱이 가상 파일의 URI를 검색하고
+입력 스트림을 가져올 수 있습니다.
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ 사용자 파일 액세스에 대한 자세한 내용은
+<a href="{@docRoot}guide/topics/providers/document-provider.html">저장소
+액세스 프레임워크 가이드</a>를 참조하세요.
+</p>
diff --git a/docs/html-intl/intl/ko/preview/index.jd b/docs/html-intl/intl/ko/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/ko/preview/index.jd
rename to docs/html-intl/intl/ko/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/ko/design/patterns/navigation.jd b/docs/html-intl/intl/ko/design/patterns/navigation.jd
index 5f335d5..91d1dcc 100644
--- a/docs/html-intl/intl/ko/design/patterns/navigation.jd
+++ b/docs/html-intl/intl/ko/design/patterns/navigation.jd
@@ -152,7 +152,7 @@
<h2 id="between-apps">앱 간 탐색</h2>
-<p>Android 시스템의 본질적인 강점 중 하나는 앱이
+<p>Android 시스템의 본질적인 강점 중 하나는 앱이
다른 앱을 실행할 수 있다는 점이며, 이로 인해 사용자는 한 앱에서 다른 앱으로 직접 이동할 수 있습니다. 예를 들어,
사진을 캡처해야 하는 앱은 카메라 앱을 작동시킬 수 있으며, 카메라 앱은 사진을
해당 앱으로 돌려줍니다. 이러한 기능은 개발자와 사용자 모두에게 매우 유용합니다.
diff --git a/docs/html-intl/intl/ko/design/patterns/notifications.jd b/docs/html-intl/intl/ko/design/patterns/notifications.jd
deleted file mode 100644
index aab5eac..0000000
--- a/docs/html-intl/intl/ko/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=알림
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>개발자 문서</h3>
- <p>사용자에게 알리기</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Android 4.4 이하 버전의 알림</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>비디오</h3>
- <p>DevBytes: Android L Developer Preview의 알림</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>알림 시스템을 사용하면 친구로부터 받은 새 채팅 메시지나 캘린더 이벤트와 같이 앱에서 관련된
-시기 적절한
-이벤트에 대한 알림을 사용자에게 표시할 수 있습니다.
-알림을 중요한
-이벤트가
-발생한 경우 사용자에게 이에 대해 알리는 뉴스 채널이나 사용자가 앱에 집중하고
-있지 않은 동안에 이벤트를 시간순으로 기록하는 로그라고 생각하세요. 또한, 적절한 경우 모든 Android 기기에 걸쳐 동기화될 수도 있습니다.</p>
-
-<h4 id="New"><strong>Android 5.0의 새로운 기능</strong></h4>
-
-<p>Android 5.0에서는 구조적,
-시각적, 그리고 기능적으로 중요한 업데이트를 알림을 통해 받을 수 있습니다.</p>
-
-<ul>
- <li>새로운
-머티어리얼 디자인 테마와 일치하도록 알림이 시각적으로 바뀌었습니다.</li>
- <li> 알림이 이제 기기 잠금 화면에 표시되나,
-민감한 콘텐츠는 여전히
-숨길 수 있습니다.</li>
- <li>기기가 사용 중일 때 수신되는 최우선 순위의 알림은 이제
-헤드업 알림이라는 새로운 형식을 사용합니다.</li>
- <li>클라우드와 동기화되는 알림: Android
-기기 중 하나에서 알림을 해지하면
-다른 기기에서도 해지됩니다.</li>
-</ul>
-
-<p class="note"><strong>참고:</strong> 이
-Android 버전의 알림 디자인은 이전 버전과 많이
-다릅니다. 이전
-버전의 알림 디자인에 대한 자세한 내용은 <a href="./notifications_k.html">Android 4.4 이하 버전의 알림</a>을 참조하세요.</p>
-
-<h2 id="Anatomy">알림의 해부학적 구조</h2>
-
-<p>이 섹션에서는 알림의 기본적인 부분과 다양한 유형의 기기에서 알림이 어떻게
-표시될 수 있는지에 대해 살펴봅니다.</p>
-
-<h3 id="BaseLayout">기본 레이아웃</h3>
-
-<p>모든 알림은 기본적으로 다음을 포함하는 기본 레이아웃으로 구성됩니다.</p>
-
-<ul>
- <li> 알림 <strong>아이콘</strong>. 알림 아이콘은
-알림을 발생시킨 앱을 나타냅니다. 또한,
-앱이 두 가지 이상의
-유형을 생성하는 경우 알림 유형을 나타낼 수도 있습니다.</li>
- <li> 알림 <strong>제목</strong> 및 추가
-<strong>텍스트</strong>.</li>
- <li> <strong>타임스탬프</strong>.</li>
-</ul>
-
-<p>이전 플랫폼 버전의
-{@link android.app.Notification.Builder Notification.Builder}로 생성된 알림은 시스템이 대신
-처리하는 사소한 스타일 변화를 제외하면 Android
-5.0에서 똑같이 표시되고 동작합니다. 이전
-Android 버전의 알림에 대한 자세한 내용은
-<a href="./notifications_k.html">Android 4.4 이하 버전의 알림</a>을 참조하세요.</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- 핸드헬드 알림(왼쪽) 및 Wear에서 표시되는 동일한 알림(오른쪽)의 기본 레이아웃
-- 사용자 사진 및 알림 아이콘 포함
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">확장 레이아웃</h3>
-
-
-<p>앱 알림이 얼마나 자세한 정보를
-제공하도록 할지는 직접 선택할 수 있습니다. 메시지의 처음
-몇 줄을 보여주거나 더 큰 이미지 미리보기를 보여줄 수 있습니다. 이러한 추가
-정보는 사용자에게 더 많은
-컨텍스트를 제공하며, 경우에 따라 이를 통해 사용자는 메시지
-전체를 읽을 수도 있습니다. 사용자는
-핀치-줌(pinch-zoom) 또는 한 손가락으로 밀기를 이용하여 축소 레이아웃과
-확장 레이아웃 간을 전환할 수 있습니다.
- Android는 단일 이벤트 알림에 대해 세 개의 확장 레이아웃
-템플릿(텍스트, 받은 편지함,
-이미지)을 애플리케이션에 사용할 수 있도록 제공합니다. 다음 이미지는
-단일 이벤트 알림이
-핸드헬드(왼쪽) 및 웨어러블(오른쪽)에서 어떻게 표시되는지 보여줍니다.</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">작업</h3>
-
-<p>Android는 알림의
-맨 아래 부분에 표시되는 선택적인 작업을 지원합니다.
-이러한 작업을 통해 사용자는 알림을 발생시킨
-애플리케이션을 열 필요 없이 알림 창에서 특정
-알림에 대한 가장 일반적인 태스크를 처리할 수 있습니다.
-이 기능은 밀어서 해제하기와 함께 작용하여 상호 작용의 속도를 향상시키며, 사용자가 자신에게 중요한 알림에
-집중하는 데 도움이 됩니다.</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">알림에
-포함할 작업의 수는 신중하게 결정해야 합니다. 더 많은
-작업을 포함할수록 인지적 복합성이 가중됩니다. 당장에 중요하며 의미
-있는 작업만 포함하여 작업
-수를 최소한으로
-제한해야 합니다.</p>
-
-<p>알림에 포함하기에 적합한 작업은 다음과 같습니다.</p>
-
-<ul>
- <li> 표시하려는
-콘텐츠 유형과 관련하여 필수적이고, 자주 사용되며 전형적인 작업
- <li> 사용자가 신속하게 태스크를 완료할 수 있게 하는 작업
-</ul>
-
-<p>다음과 같은 작업은 피합니다.</p>
-
-<ul>
- <li> 애매모호한 작업
- <li> "읽기" 또는
-"열기"와 같이 알림의 기본 작업과 동일한 작업
-</ul>
-
-
-
-<p>작업
-아이콘 및 이름으로 각각 구성된, 최대 세 개의 작업을 지정할 수 있습니다.
- 단순한 기본 레이아웃에 작업을 추가하면 알림이 확장 가능하게 되며,
-알림에
-확장 레이아웃이 없는 경우에도 이러한 사항이 적용됩니다. 작업은
-확장된
-알림에서만 표시되고 그 외에는 숨겨져 있으므로
-사용자가 알림에서
-호출할 수 있는 모든 작업을 관련 애플리케이션 내에서도
-사용할 수 있는지 확인해야 합니다.</p>
-
-<h2 style="clear:left">헤드업 알림</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- 몰입형 앱의
-최상위에
-표시되는 헤드업 알림의 예(걸려오는 전화, 최우선 순위)
- </p>
-</div>
-
-<p>최우선 순위의 알림을 수신하면(오른쪽), 가능한 작업을 보여주는 확장된 레이아웃 형태로
-잠시 동안 사용자에게
-표시됩니다.</p>
-<p> 그런 다음, 알림이 알림
-창으로 돌아갑니다. 알림에 대한 <a href="#correctly_set_and_manage_notification_priority">우선 순위</a> 플래그가 HIGH, MAX 또는 전체 화면으로
-지정된 경우 헤드업 알림이 표시됩니다.</p>
-
-<p><b>헤드업 알림의 좋은 예</b></p>
-
-<ul>
- <li> 기기 사용 시 걸려오는 전화</li>
- <li> 기기 사용 시 알람</li>
- <li> 새 SMS 메시지</li>
- <li> 배터리 부족</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">가이드라인</h2>
-
-
-<h3 id="MakeItPersonal">개인에 맞게 만들기</h3>
-
-<p>다른 사람이 보낸 항목(메시지 또는
-상태 업데이트)에 대한 알림의 경우
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()}을 사용하여 그 사람의 이미지를 포함합니다. 또한
-그 사람에 대한 정보를 알림의 메타데이터에 추가합니다({@link android.app.Notification#EXTRA_PEOPLE} 참조).</p>
-
-<p>알림의 기본 아이콘이 여전히 표시됩니다. 따라서 사용자는
-해당 아이콘을 상태 표시줄에
-보이는 아이콘과 관련시킬 수 있습니다.</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- 누가 트리거했는지와 보낸 내용을 보여주는 알림입니다.
-</p>
-
-
-<h3 id="navigate_to_the_right_place">적합한 곳으로 이동하기</h3>
-
-<p>사용자가 작업
-버튼 외부에서 알림을 터치하면, 사용자가 알림에서
-참조되는 데이터를 확인하고 처리할 수 있는 곳에서
-앱이 열리도록 합니다. 대부분의 경우, 메시지와 같은 단일 데이터 항목을 표시하는 상세 뷰가 이에 해당합니다.
-하지만 알림이 중첩되어 있을 경우에는
-요약 뷰일 수도 있습니다. 앱이
-최상위 레벨 아래의 위치에서 열린 경우
-사용자가 시스템의 뒤로 버튼을 눌러 최상위 레벨로 돌아갈 수 있도록 앱의 백 스택에 탐색 경로를 삽입합니다. 자세한 내용은
-<a href="{@docRoot}design/patterns/navigation.html#into-your-app">탐색</a>
-디자인 패턴의 <em>홈 화면 위젯 및 알림을 통한 앱 탐색</em>을 참조하세요.</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">알림의
-우선 순위를 정확하게 설정하고
-관리하기</h3>
-
-<p>Android는 알림 우선 순위 플래그를 지원합니다. 이 플래그를 통해 다른 알림에 상대적으로 알림이 표시되는 위치가
-결정되도록 할 수 있습니다. 또한
-사용자가 가장 중요한 알림을 항상 가장 먼저 볼 수 있게
-할 수 있습니다. 알림을 게시할 때
-다음 우선 순위 중에서
-선택할 수 있습니다.</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>우선 순위</strong></p>
-</td>
- <td class="tab0">
-<p><strong>용도</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>시간에 민감한
-또는
-특정 태스크를 계속 진행하기 전에 처리해야 할
-상황을 사용자에게 알리는 중요하고 긴급한 알림에 사용합니다.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>중요한 대화에 주로 사용합니다. 일례로 사용자에게 특별히 흥미로운 내용이 포함된 메시지 또는 채팅
-이벤트가 이에 해당합니다.
-최우선 순위의 알림은 헤드업 알림이 표시되도록 합니다.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>여기서 설명하지 않은 기타 모든 우선 순위의 알림에 사용합니다.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>사용자에게 알려야 하지만 긴급하지 않은
-알림에 사용합니다. 우선 순위가 낮은 알림은 보통 목록의 맨 아래에 표시되며,
-공개 또는 대상이 불특정한 소셜 업데이트에 사용하기
-좋습니다. 사용자가
-요구한
-알림이지만, 이러한 알림은 긴급하거나 직접적인
-대화를 우선할 수 없습니다.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>날씨 정보 또는 상황에 맞는
-위치 정보와 같은 상황별 또는 배경 정보에 사용합니다.
-최소 우선 순위 알림은 상태 표시줄에 표시되지 않습니다. 이러한 알림은 사용자가 알림 창을 확대하면
-볼 수 있습니다.</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>
-적절한
-우선 순위를 선택하는 방법</strong></h4>
-
-<p><code>DEFAULT</code>, <code>HIGH</code> 및 <code>MAX</code>는 작업을 중단시키는 우선 순위이며, 사용자의 액티비티를
-중단시키는
-위험 요소입니다. 앱 사용자를 성가시게 하지 않으려면 다음과 같은
-알림에만 작업을 중단시키는 우선 순위를 지정해야 합니다.</p>
-
-<ul>
- <li> 다른 사람이 관련된 알림</li>
- <li> 시간에 민감한 알림</li>
- <li> 실제 환경에서의 사용자 행동을 즉시 바꿀 수 있는 알림</li>
-</ul>
-
-<p><code>LOW</code> 및 <code>MIN</code>으로 설정된 알림도 사용자에게
-중요할 수 있습니다. 대부분은 아니지만 많은 알림이 사용자의
-즉각적인 주의를 필요로 하지 않거나 사용자의 손목에 진동을 줄 필요가 없지만, 사용자가 알림을 확인하고자
-했을 때 유용하다고
-여길 정보를 포함합니다. <code>LOW</code> 및 <code>MIN</code>
-우선 순위 알림에 대한 조건은 다음과 같습니다.</p>
-
-<ul>
- <li> 다른 사람이 관련되지 않음</li>
- <li> 시간에 민감하지 않음</li>
- <li> 사용자가 흥미를 가질 만하지만 시간이 있을 때
-보기를 원할 수 있는 내용을 포함함</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">알림
-범주 설정하기</h3>
-
-<p>알림이 미리 정의된 범주에 포함될 경우(아래
-참조),
-그에 따라 할당합니다. 알림 창(또는
-다른 알림
-수신자)과 같은 시스템 UI의 기능은 순위 및 필터링 결정을 내리는 데 이 정보를 활용할 수 있습니다.</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>수신 전화(음성 또는 화상) 또는 이와 유사한 동기적 대화
-요청</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>수신되는 직접 메시지(SMS, 인스턴트 메시지 등)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>비동기적 대량 메시지(이메일)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>캘린더 이벤트</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>홍보 또는 광고</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>알람 또는 타이머</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>장기간 실행 중인 백그라운드 작업의 진행 상황</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>소셜 네트워크 또는 공유 업데이트</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>백그라운드 작업 또는 인증 상태 오류</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>재생에 대한 미디어 전송 제어</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>시스템 또는 기기 상태 업데이트. 시스템용으로 예약됨</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>실행 중인 백그라운드 서비스에 대한 표시</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>한 가지 특정 항목에 대한 구체적이고 시기적절한 권장 사항. 예를 들어, 뉴스
-앱이 사용자가 다음으로 읽기 원할 것이라고 생각하는 뉴스를
-권하고자 하는 경우</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>기기 또는 상황별 상태에 대한 지속적인 정보</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">알림 요약하기</h3>
-
-<p>특정 유형의 알림이 이미 보류 중일 때 앱에서 같은 유형의 새
-알림을 보내려고 하는 경우, 이 앱에 대해 두 알림을 하나의 요약 알림으로 결합합니다. 새로운 개체는
-생성하지 않아야 합니다.</p>
-
-<p>요약 알림은 사용자가 특정 종류의 알림이
-몇 개나 보류 중인지
-파악할 수 있도록 간단한 개요를 표시합니다.</p>
-
-<div class="col-6">
-
-<p><strong>잘못된 사용</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>올바른 사용</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">확장된 다이제스트 레이아웃을 사용하여
-요약에 포함된 각각의 알림에 대한
-더 자세한 정보를 제공할 수 있습니다. 이 방식을 통해 사용자는
-어떠한 알림이 보류 중이고,
-관련된 앱에서
-상세 정보를 읽고 싶을 정도로 알림이 흥미로운지를
-판단할 수 있습니다.</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- 확장된 알림 및 축소된 요약 알림(<code>InboxStyle</code> 사용)
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">알림을
-선택 항목으로 만들기</h3>
-
-<p>사용자는 항상 알림을 통제할 수 있어야 합니다. 애플리케이션 설정에 알림 설정 항목을 추가하여
-사용자가 앱의
-알림을
-해제하거나 경고 속성(예: 경고음 및 진동 사용
-여부)을 변경할 수 있도록 허용합니다.</p>
-
-<h3 id="use_distinct_icons">뚜렷한 아이콘 사용</h3>
-<p>알림 영역을 봄으로써 사용자는 현재
-어떠한 종류의
-알림이 보류 중인지 파악할 수 있어야 합니다.</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>올바른 사용</strong></p>
- <p>Android 앱이 이미 제공하는 알림 아이콘을 살펴본 후 본인의 앱에서
-뚜렷히 나타날 수 있는
-알림 아이콘을 만듭니다.</p>
-
- <p><strong>올바른 사용</strong></p>
- <p>작은 아이콘에
-적절한 <a href="/design/style/iconography.html#notification">알림 아이콘 스타일</a>을 사용하며, 작업
-아이콘에는 머티어리얼 라이트
-<a href="/design/style/iconography.html#action-bar">작업 모음 아이콘
-스타일</a>을 사용합니다.</p>
-<p ><strong>올바른 사용</strong></p>
-<p >아이콘은 시각적으로 단순하게 유지하고,
-알아차리기 힘들 정도로 과도하게 세부적인 디자인은 피합니다.</p>
-
- <div><p><strong>잘못된 사용</strong></p>
- <p>작은
-아이콘 및 작업
-아이콘에 알파(어둡게 설정 또는 페이드 효과)를 추가합니다. 아이콘의 가장자리를 안티-앨리어싱할 수는 있지만, Android가 이러한
-아이콘을 마스크(즉,
-알파 채널만 사용됨)로 사용하기 때문에 일반적으로 이미지는 최대 수준의
-불투명도로 그려집니다.</p>
-
-</div>
-<p style="clear:both"><strong>잘못된 사용</strong></p>
-
-<p>다른 앱과의 차별화를 위해 색상을 사용합니다. 알림 아이콘은 투명한 배경 이미지에 흰색 아이콘이어야만
-합니다.</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">알림 LED를
-적절하게 사용하기</h3>
-
-<p>많은 Android 기기에는 알림 LED가 내장되어 있으며, 이러한 알림 LED는 화면이 꺼져 있을 때
-사용자에게
-이벤트에 대해 알리기 위해 사용됩니다. 우선 순위가 <code>MAX</code>,
-<code>HIGH</code> 또는 <code>DEFAULT</code>인 알림의 경우
-LED가 켜지며, 낮은 우선 순위(<code>LOW</code> 및
-<code>MIN</code>)의 알림의 경우 LED가 켜지지 않습니다.</p>
-
-<p>알림과 관련하여 사용자는 LED도 제어할 수 있어야 합니다.
-DEFAULT_LIGHTS를 사용하는 경우
-LED는 흰색으로 켜집니다. 사용자가
-명시적으로 지정한 경우 외에는 다른 알림
-색상을 사용할 수 없습니다.</p>
-
-<h2 id="building_notifications_that_users_care_about">사용자가 관심을 가질 만한
-알림 만들기</h2>
-
-<p>사용자의 사랑을 받는 앱을 만들기 위해서는
-알림을 신중하게 디자인해야 합니다.
-알림은 앱의 목소리를 대변하며, 앱의
-개성에 큰 영향을 미칩니다. 원하지 않거나
-중요하지 않은 알림은 사용자를 성가시게 하거나 앱에서
-많은 신경을
-쓰게 하는 것에 대해 짜증이 나게 합니다. 따라서 알림을 사용할 때는 현명하게 판단해야 합니다.</p>
-
-<h3 id="when_to_display_a_notification">알림을 표시해야 하는 경우</h3>
-
-<p>사람들이 즐겨 사용하는 애플리케이션을 만들려면 사용자의
-주의와 집중을 흐트러뜨리지 않고 보호해야 하는 리소스임을
-인지하는 것이 중요합니다. Android의
-알림 시스템은 알림이 사용자의 주의를 최대한 방해하지 않도록
-디자인되었습니다.
-하지만
-알림이
-사용자의 태스크 흐름을 방해한다는 사실을 계속해서 인지해야 합니다.
-알림을 계획할 때 알림이 사용자의 작업을 중단할 만큼
-중요한지 곰곰히 생각해 보시기 바랍니다. 잘 모르겠는 경우, 사용자가 앱의 알림 설정을 사용하여 알림에 대한 수신 동의를
-선택할 수 있도록 허용하거나 알림 우선 순위 플래그를 <code>LOW</code> 또는 <code>MIN</code>으로
-조정하여 사용자 작업을
-방해하지
-않도록 합니다.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- 시간에 민감한 알림의 예
- </p>
-
-<p>일반적으로 잘 만들어진 앱은 사용자의 요청이 있을 때에만 정보를 알리고
-요청하지 않은 알림은 꼭 필요한 경우에만 표시하도록 합니다.</p>
-
-<p>알림은 <strong>시간에 민감한 이벤트</strong>에 주로 사용하며, 특히
-이러한 동기적 이벤트에 <strong>다른 사람이 관련된 경우</strong>에 사용합니다. 예를
-들어 수신되는 채팅 메시지는
-실시간으로 진행되는 동기적 대화 형식이며, 이때 다른 사람은
-적극적으로 응답을 기다립니다. 캘린더 이벤트는 언제
-알림을 사용하고
-사용자의 주의를 끌어야 하는지에 대해 알 수 있는 또 다른 좋은 예입니다. 왜냐하면 이는 임박한 이벤트이며, 캘린더 이벤트에는 종종 다른 사람이
-관련되기 때문입니다.</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">알림을
-표시하지 않아야 하는 경우</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>다른 대부분의 경우 알림은 적합하지 않습니다.</p>
-
-<ul>
- <li> 사용자와
-직접 관련이 없는 정보나 시간에 민감하지 않은
-정보는 알리지 않도록 합니다. 예를 들어 소셜 네트워크를 통한 비동기적이며
-대상이 불특정한 업데이트는
-일반적으로 실시간으로
-사용자를 방해할 수 없습니다. 그러한 업데이트를 원하는 사용자의
-경우에는 사전에 수신 동의를 설정할 수 있게 하면 됩니다.</li>
- <li> 관련된 새 정보가 현재
-화면에 표시된 경우에는 알림을 생성하지 않아야 합니다. 대신 애플리케이션 UI를
-사용하여 컨텍스트 내에 새로운 정보가 있음을 사용자에게
-직접 알립니다.
- 예를 들어 채팅 애플리케이션은
-사용자가 다른 사용자와 대화 중일 때는 시스템 알림을 생성하지 않아야 합니다.</li>
- <li> 정보 저장
-또는 동기화, 애플리케이션 업데이트와 같은 낮은 수준의 기술 정보의 경우 사용자가 개입하지
-않아도 앱이나 시스템에서 스스로 알아서 처리할 수 있다면 사용자를 방해하지 않도록 합니다.</li>
- <li> 사용자가 아무런 조치를
-취하지 않아도 애플리케이션 스스로 오류를 복구할
-수 있는 경우, 이러한 오류에 대해 사용자에게 알리지 않도록 합니다.</li>
- <li> 알리는 내용은 없고
-단순히 앱을
-홍보하는 알림은 만들지 않습니다. 알림은 유용하고, 시기적절하며 새로운 정보를 제공해야 하며, 단지 앱 출시를 위한 용도로는
-사용하지
-않습니다.</li>
- <li> 단지
-사용자에게 브랜드를 알리기 위한 불필요한 알림은 만들지 않도록 합니다.
- 그러한 알림은 사용자를 짜증 나게 만들어 앱에 대한 관심을 멀어지게 합니다. 소량의
-업데이트된 정보를 제공하면서 사용자가 지속적으로
-앱에 관심을
-갖게 만드는 최고의
-방법은
-홈 화면에 추가할 수 있는 위젯을 개발하는 것입니다.</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">알림과
-상호 작용하기</h2>
-
-<p>알림은 상태 표시줄에 아이콘으로 표시되며,
-알림 창을 열어서
-확인할 수 있습니다.</p>
-
-<p>알림을 터치하면 관련 앱이 열리고 알림에
-해당되는 세부 내용이 표시됩니다. 알림을 왼쪽이나 오른쪽으로
-스와이프하면 알림 창에서 제거됩니다.</p>
-
-<h3 id="ongoing_notifications">지속적인 알림</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- 음악 재생으로 인한 지속적인 알림
- </p>
-</div>
-<p>지속적인 알림은
-백그라운드에서 진행 중인 프로세스에 대해 사용자에게 알립니다.
-예를 들어 음악 플레이어는 사용자가 재생을 멈출 때까지
-알림 시스템 내에 현재 재생 중인 트랙을
-계속 표시합니다. 또한 지속적인 알림은 파일을 다운로드하거나 비디오를 인코딩하는 등의 장기 태스크에 대한
-피드백을 사용자에게
-표시할 수도 있습니다. 지속적인 알림은 사용자가 알림 창에서 직접
-제거할 수 없습니다.</p>
-
-<h3 id="ongoing_notifications">미디어 재생</h3>
-<p>Android 5.0에서는 잠금 화면에 사용이 중단된
-{@link android.media.RemoteControlClient} 클래스에 대한 전송 제어가 표시되지 않습니다. 하지만 알림은 <em>표시되며</em>, 각
-앱의 재생 알림이 현재 사용자가 잠금 상태에서 재생을 제어하는 기본
-방법입니다. 이 동작은 화면의 잠금 여부와 상관없이 사용자에게
-일관된 환경을 제공하면서, 어떠한 버튼을
-어떻게 표시할지에 대해 앱이 더 세부적으로 제어할 수 있도록
-지원합니다.</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">대화 상자
-및 알림 메시지</h3>
-
-<p>현재
-화면에 표시되어 있는 경우가 아니라면 앱은 대화 상자나 알림 메시지를 생성해서는 안 됩니다. 대화 상자나 알림 메시지는
-앱 내에서
-사용자가 어떠한 행동을 취했을 때 이에 대한 즉각적인 응답으로만 표시되어야 합니다.
-대화 상자 및 알림 메시지 사용에 대한 자세한 지침은
-<a href="/design/patterns/confirming-acknowledging.html">확인 및 승인하기</a>를 참조하세요.</p>
-
-<h3>순위 및 순서</h3>
-
-<p>알림은 뉴스이므로, 기본적으로 발생한 순서의 역순으로
-표시되며, 특히
-앱에서 명시된 알림
-<a href="#correctly_set_and_manage_notification_priority">우선 순위</a>에 따라 순서가 결정됩니다.</p>
-
-<p>알림은 잠금 화면에서 중요한 부분이며, 기기의 화면이 켜질
-때마다
-표시됩니다. 잠금 화면의 공간은 협소하기 때문에 가장 긴급하고 관련 있는 알림을 식별하는 것이
-가장
-중요합니다. 이러한
-이유 때문에 Android에는 다음을 고려한
-더욱 정교한 정렬 알고리즘이 있습니다.</p>
-
-<ul>
- <li> 타임스탬프 및 애플리케이션에 명시된 우선 순위.</li>
- <li> 알림이 최근에 소리 또는
-진동으로 사용자를 방해했는지에 대한 여부. (즉,
-휴대폰에서 방금 소리가 났을 때 사용자가 "방금 무슨
-일이 있었지?"에 대해 알고 싶어하는 경우 잠금 화면을
-보면 한 눈에 알 수 있어야 합니다.)</li>
- <li> {@link android.app.Notification#EXTRA_PEOPLE}을 사용하여 알림에 첨부된 사람,
-그리고 특히 즐겨찾기에 추가된 연락처인지에 대한 여부.</li>
-</ul>
-
-<p>이러한 정렬 알고리즘을 잘 이용하기 위해서는 목록의 특정 부분에 초점을 두기 보다는 생성하고자
-하는 사용자
-환경에 초점을 둡니다.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Gmail 알림은
-기본 우선 순위이기 때문에
-보통은 행아웃과 같은 인스턴트 메시징 앱에서 온 메시지보다 하위에 정렬됩니다. 하지만
-새 메시지가 들어오면
-일시적으로 순위가 올라갑니다.
- </p>
-
-
-<h3>잠금 화면</h3>
-
-<p>알림은 잠금 화면에 표시되기 때문에 사용자의 개인 정보 보호가
-특히
-중요하게 고려해야 할 사항입니다. 알림은 종종 민감한 정보를 포함하기 때문에, 아무나
-기기의 화면을 켰을 때 볼 수 있게 할 필요는
-없습니다.</p>
-
-<ul>
- <li> 보안 잠금 화면(PIN, 패턴 또는 암호)이 있는 기기의 인터페이스에는
-공개 및 비공개 부분이 있습니다. 공개 인터페이스는 보안 잠금 화면에 표시될 수 있기 때문에
-누구나 볼 수 있습니다. 비공개 인터페이스는 잠금 화면 뒤에 있기 때문에
-기기의 잠금 화면을 푼 사람만 볼 수 있습니다.</li>
-</ul>
-
-<h3>보안 잠금 화면에 표시된 정보에 대한 사용자 제어</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- 사용자가 기기의 잠금을 푼 후 보이는 콘텐츠와 함께 잠금 화면에 표시된 알림
- </p>
-</div>
-
-<p>보안 잠금 화면을 설정할 때 사용자는
-민감한 세부 정보를 보안 잠금 화면에서 숨기도록 선택할 수 있습니다. 이러한 경우 시스템 UI는 알림의 <em>정보 공개 수준</em>을
-고려하여
-안전하게 표시할 수 있는 정보를 파악합니다.</p>
-<p> 정보 공개 수준을 제어하려면
-<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>를 호출한 후
-다음 값 중 하나를 지정합니다.</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>. 알림의 전체 내용을
-표시합니다.
- 정보 공개 수준을 지정하지 않을 경우 시스템 기본값입니다.</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>.
-잠금 화면에 알림의
-아이콘과 알림을 게시한 앱의 이름을 포함하여 해당 알림의 존재에 대한 기본 정보를 표시합니다. 알림의 나머지 세부 사항은 표시되지 않습니다.
-다음과 같은 몇 가지 유용한 사항을 염두해야 합니다.
- <ul>
- <li> 시스템이 보안 잠금 화면에 다른 공개 버전의 알림을
-표시하도록 제공하려는 경우, <code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code>
-필드에 대체
-알림 개체를 제공해야 합니다.
- <li> 이렇게 설정하면 앱에서 여전히 유용하지만 개인 정보를 노출하지 않는 편집된 버전의
-내용을 생성할 수 있습니다. 예를 들어, 알림에 SMS 텍스트, 발신자 이름 및 연락처 아이콘을 포함하는
-SMS 앱이 있다고 가정합니다.
-이 알림은 <code>VISIBILITY_PRIVATE</code>여야 하지만, <code>publicVersion</code>은 다른 식별
-정보 없이 "3개의 새 메시지"와 같이 여전히 유용한 정보를
-포함할 수 있습니다.
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>. 최소한의 정보만 표시하며, 알림의 아이콘마저
-표시하지 않습니다.</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Android Wear에
-표시되는 알림</h2>
-
-<p>Android Wear에 표시되는 알림과 해당 <em>작업</em>은 기본적으로 Wear 기기에 연결되어 있습니다.
-개발자는 어떠한 알림을
-휴대폰에서 워치로,
-그리고 그 반대로 연결할지 제어할 수 있습니다. 또한 개발자는 어떠한 작업을 연결할지도 제어할 수 있습니다. 앱이
-단일 탭으로 실행할 수 없는
-작업을 포함하는 경우, 이러한 작업을
-Wear
-알림에 표시되지 않도록 숨기거나 Wear 앱에 연결하여 사용자가
-워치에서 작업을
-끝낼 수 있도록 합니다.</p>
-
-<h4>알림과 작업 연결하기</h4>
-
-<p>휴대폰과 같이 연결된 기기는 알림을 Wear 기기에 연결하여 해당 기기에서
-알림이 표시될 수 있게 합니다. 마찬가지로 작업도 연결할 수 있기 때문에 사용자는 Wear 기기에서
-알림을 바로 처리할 수 있습니다.</p>
-
-<p><strong>연결해야 할 사항</strong></p>
-
-<ul>
- <li> 새 인스턴트 메시지</li>
- <li> +1, Like, Heart와 같은 단일 탭 작업</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>연결하지 않아야 할 사항</strong></p>
-
-<ul>
- <li> 새로 도착한 팟캐스트의 알림</li>
- <li> 워치에서 수행할 수 없는 기능에 매핑되는 작업</li>
-</ul>
-
-
-
-<p><h4>Wear에 대해서만 정의할 수 있는 고유한 작업</h4></p>
-
-<p>Wear에서만 수행할 수 있는 작업이 몇 가지 있으며, 이러한 작업은 다음과 같습니다.</p>
-
-<ul>
- <li> "금방 올게"와 같은 미리 준비된 대답으로 구성된 빠른 목록</li>
- <li> 휴대폰에서 열기</li>
- <li> 음성 입력 화면을 불러오는 "댓글 달기" 또는 "응답" 작업</li>
- <li> Wear에 특화된 앱을 실행하는 작업</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/about.jd b/docs/html-intl/intl/ko/distribute/googleplay/about.jd
index 57b5226..2968ed4 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/about.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/about.jd
@@ -6,7 +6,7 @@
@jd:body
- <div id="qv-wrapper">
+ <div id="qv-wrapper">
<div id="qv">
<h2>Google Play 정보</h2>
<ol style="list-style-type:none;">
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/auto.jd b/docs/html-intl/intl/ko/distribute/googleplay/auto.jd
index 6536f1a..5b93b6b 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/auto.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/auto.jd
@@ -32,7 +32,7 @@
<p>
시작하려면 이 문서를 참조하여 Google Play를 통해 사용자에게 Auto 앱을 배포하는 방법을 배우십시오.
- 앱이 충족해야 하는 유용성, 품질 및 안전 관련 가이드라인에 대한 내용은
+ 앱이 충족해야 하는 유용성, 품질 및 안전 관련 가이드라인에 대한 내용은
<a href="{@docRoot}distribute/essentials/quality/auto.html">Auto 앱 품질</a>
을 참조하십시오.
앱이 준비되면 개발자 콘솔의 약관에 동의하고 검토용 APK를 업로드할 수 있습니다.
@@ -98,7 +98,7 @@
Auto 앱은 잘 작동하고 차 안에서 멋있게 보이고 최고의 사용자 경험을 제공하도록 디자인해야 합니다.
Google Play는 사용자가 Google Play에서 쉽게 검색할 수 있도록 선정된 고품질 Auto 앱을 소개합니다.
다음과 같은 방법으로 참여하여 사용자에게 멋진 Android Auto 앱을 제공할 수 있습니다.
-
+
</p>
<ul>
@@ -127,7 +127,7 @@
<p>
약관에 동의한 후에만 Auto 앱을 업로드할 수 있습니다. 다음은 Auto 앱을 지정하는 기준에 대한 설명입니다.
-
+
</p>
<ul>
@@ -159,10 +159,10 @@
<p>
검토는 휴대폰이나 태블릿 등 Google Play 스토어의 다른 장치에서 앱의 사용 가능성을 결정합니다.
-
+
휴대폰/태블릿 구성요소 업데이트를 포함한 기존 앱이 있는 경우, Android Auto 구성요소가 검토를 통과해야 Google Play 스토어에서 업데이트된 앱을 사용할 수 있습니다.
-
+
</p>
<p>
@@ -209,7 +209,7 @@
<p>앱이 승인되지 않으면 개발자는 해결해야 할 문제에 대한 요약이 포함된 <strong>알림 이메일을 개발자 계정 주소</strong>로 받게 됩니다.
필요한 조정을 거친 후에 새로운 앱 버전을 개발자 콘솔에 업로드할 수 있습니다.
-
+
</p>
<p>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/developer-console.jd b/docs/html-intl/intl/ko/distribute/googleplay/developer-console.jd
index b2dc6d5..fca59e8 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/developer-console.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/developer-console.jd
@@ -4,8 +4,8 @@
Xnonavpage=true
@jd:body
-
- <div id="qv-wrapper">
+
+ <div id="qv-wrapper">
<div id="qv">
<h2>게시 기능</h2>
<ol>
@@ -420,7 +420,7 @@
<li>가격을 책정합니다.
</li>
- <li>앱을 포함한 제품을 게시하거나, 사용하지 않는 제품을 회수합니다.
+ <li>앱을 포함한 제품을 게시하거나, 사용하지 않는 제품을 회수합니다.
</li>
</ul>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/families/faq.jd b/docs/html-intl/intl/ko/distribute/googleplay/families/faq.jd
index 92dbcf0..8bf330d 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/families/faq.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>이 문서의 내용</h2>
@@ -141,7 +141,7 @@
앱이 모든 프로그램 요구사항을 준수할 경우 게시 시간이 평소보다 오래 걸리지 않습니다. 하지만 Designed for Families 검토 중에 앱이 거부되면 게시가 지연될 수 있습니다.
-
+
</dd>
<dt>
@@ -163,7 +163,7 @@
<dt>
앱을 게시한 후에 Designed for Families 프로그램 요구사항을 준수하지 않는 것으로 확인되면 어떻게 됩니까?
-
+
</dt>
<dd>
@@ -185,7 +185,7 @@
<dt>
Designed for Families 프로그램에서 승인된 앱을 업데이트하면 어떻게 됩니까?
-
+
</dt>
<dd>
@@ -265,7 +265,7 @@
인앱 광고를 포함한 전반적인 사용자 경험이 <a href="https://support.google.com/googleplay/android-developer/answer/6184502">Designed for Families 프로그램 요구사항</a>을 충족하도록 보장하는 것은 개발자의 책임입니다.
-
+
</dd>
<dt>
@@ -297,7 +297,7 @@
</dt>
<dd>
- 당사는 부모와 보호자가 Google Play 스토어에서 신뢰할 수 있는 브랜드와 개발자가 제작한 우수한 아동 및 가족용 앱을 찾을 수 있도록 하는 것을 목표로 합니다.
+ 당사는 부모와 보호자가 Google Play 스토어에서 신뢰할 수 있는 브랜드와 개발자가 제작한 우수한 아동 및 가족용 앱을 찾을 수 있도록 하는 것을 목표로 합니다.
</dd>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/families/start.jd b/docs/html-intl/intl/ko/distribute/googleplay/families/start.jd
index 06f76b5..4a93b564 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/families/start.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/families/start.jd
@@ -78,7 +78,7 @@
<p class="note">
<strong>참고:</strong> Designed for Families 프로그램에 게시된 앱은 Google Play의 모든 사용자도 사용할 수 있습니다.
-
+
</p>
<p>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/guide.jd b/docs/html-intl/intl/ko/distribute/googleplay/guide.jd
index e8d25ff..2a622b7 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/guide.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/guide.jd
@@ -34,7 +34,7 @@
<li>
<strong>사용자 확보 및 유지</strong> — 앱을 설치한 사람을 실제 사용자로 확보하고 해당 사용자를 효율적으로 유지하는 방법을 안내합니다.
-
+
</li>
<li>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/quality/core.jd b/docs/html-intl/intl/ko/distribute/googleplay/quality/core.jd
index c914aab..cec3dc6 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/quality/core.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/quality/core.jd
@@ -12,7 +12,7 @@
<li><a href="#listing">Google Play</a></li>
</ol>
-
+
<h2>테스트</h2>
<ol>
<li><a href="#test-environment">테스트 환경 설정</a></li>
@@ -24,7 +24,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">태블릿 앱 품질</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">앱 최적화</a></li>
</ol>
-
+
</div>
</div>
@@ -59,7 +59,7 @@
-
+
</p>
<div class="headerLine">
@@ -84,7 +84,7 @@
<th style="width:54px;">
ID
</th>
-
+
<th>
설명
@@ -166,7 +166,7 @@
</td>
<td>
어디서든지 홈 버튼을 누르면 장치의 홈 화면으로 이동합니다.
-
+
</td>
<td>
<a href="#core">CR-1</a>
@@ -292,7 +292,7 @@
앱이 핵심 기능과 관련되지 않은 경우 사용자가 비용을 지불할 수 있는 서비스(예: 전화 걸기 또는 SMS) 또는 민감한 데이터(예: 연락처 또는 시스템 로그)에 대한 액세스 권한을 요청하지 않습니다.
-
+
</p>
</td>
</tr>
@@ -594,7 +594,7 @@
</td>
<td>
정상적인 앱 사용 및 로드 시 음악 및 동영상 재생이 매끄럽고 잔금, 버벅거림 또는 기타 아티팩트가 없습니다.
-
+
</td>
<td>
<a href="#core">CR-all</a>, <a href="#SD-1">SD-1</a>, <a href="#HA-1">HA-1</a>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/quality/tablets.jd b/docs/html-intl/intl/ko/distribute/googleplay/quality/tablets.jd
index 6cf38c3..23ddbcb 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/quality/tablets.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/quality/tablets.jd
@@ -56,7 +56,7 @@
<p>뛰어난 태블릿 앱 경험을 제공하는 첫 번째 단계는 앱이 대상으로 삼은 모든 장치 및 폼 팩터에 대한 <em>핵심 앱 품질 기준</em>을 충족하는지 확인하는 것입니다.
- 자세한 내용은 <a href="{@docRoot}distribute/essentials/quality/core.html">핵심 앱 품질 가이드라인</a>을 참조하십시오.
+ 자세한 내용은 <a href="{@docRoot}distribute/essentials/quality/core.html">핵심 앱 품질 가이드라인</a>을 참조하십시오.
</p>
<p>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/quality/wear.jd b/docs/html-intl/intl/ko/distribute/googleplay/quality/wear.jd
index 7ab9367..e35e566 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/quality/wear.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/quality/wear.jd
@@ -331,7 +331,7 @@
</td>
<td>
<p style="margin-bottom:.5em;">
- 앱이 필요한 경우 확인 애니메이션을 표시합니다.
+ 앱이 필요한 경우 확인 애니메이션을 표시합니다.
(<a href="{@docRoot}design/wear/patterns.html#Countdown">방법 알아보기</a>)
</p>
</td>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/start.jd b/docs/html-intl/intl/ko/distribute/googleplay/start.jd
index f5dd1b3..495df80 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/start.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/start.jd
@@ -75,7 +75,7 @@
<li>해당 국가 또는 지역의 <strong>개발자 배포 계약</strong>을 읽고 동의합니다.
Google Play에 게시하는 앱 및 스토어 목록은 개발자 프로그램 정책 및 미국 수출 법규를 준수해야 합니다.
-
+
</li>
<li>Google Wallet을 사용하여 <strong>등록 수수료로 미화 25달러</strong>를 지불합니다. Google Wallet 계정이 없는 경우 프로세스 진행 중에 계정을 설정할 수 있습니다.
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/tv.jd b/docs/html-intl/intl/ko/distribute/googleplay/tv.jd
index 58f4c2e..3efa93b 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/tv.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/tv.jd
@@ -261,7 +261,7 @@
필요한 조정을 거친 후에 새로운 앱 버전을 개발자 콘솔에 업로드할 수 있습니다.
-
+
</p>
<p>
@@ -282,7 +282,7 @@
<li>
<em>승인됨</em> — 앱이 검토 후에 승인되었습니다. Android TV 사용자가 앱을 바로 사용할 수 있습니다.
-
+
</li>
<li>
diff --git a/docs/html-intl/intl/ko/distribute/googleplay/wear.jd b/docs/html-intl/intl/ko/distribute/googleplay/wear.jd
index 864f668..1f916c2 100644
--- a/docs/html-intl/intl/ko/distribute/googleplay/wear.jd
+++ b/docs/html-intl/intl/ko/distribute/googleplay/wear.jd
@@ -121,7 +121,7 @@
Wear 앱은 잘 작동하고 Android Wear에서 멋있게 보이고 최고의 사용자 경험을 제공하도록 디자인해야 합니다.
Google Play는 사용자가 쉽게 검색할 수 있도록 선정된 고품질 Wear 앱을 소개합니다.
다음과 같은 방법으로 참여하여 사용자에게 멋진 Android Wear 앱을 제공할 수 있습니다.
-
+
</p>
<ul>
diff --git a/docs/html-intl/intl/ko/distribute/tools/launch-checklist.jd b/docs/html-intl/intl/ko/distribute/tools/launch-checklist.jd
index a8a2dcd..623c129 100644
--- a/docs/html-intl/intl/ko/distribute/tools/launch-checklist.jd
+++ b/docs/html-intl/intl/ko/distribute/tools/launch-checklist.jd
@@ -197,7 +197,7 @@
<p>
Android 장치에서 Android 사용자는 검색에 사용할 완성도를 설정할 수 있습니다.
Google Play는 설정에 따라 앱을 필터링하므로 선택한 콘텐츠 등급은 사용자에게 앱을 배포하는 데 영향을 줄 수 있습니다.
- 앱 바이너리를 변경할 필요 없이 개발자 콘솔에서 앱의 콘텐츠 등급을 할당(또는 변경)할 수 있습니다.
+ 앱 바이너리를 변경할 필요 없이 개발자 콘솔에서 앱의 콘텐츠 등급을 할당(또는 변경)할 수 있습니다.
</p>
@@ -764,7 +764,7 @@
<p>
개발자 콘솔에서 앱의 대상 지역을 설정한 후에 지원하는 모든 언어에 대해 현지화된 스토어 목록, 홍보 그래픽 등을 추가하십시오.
-
+
</p>
diff --git a/docs/html-intl/intl/ko/distribute/tools/localization-checklist.jd b/docs/html-intl/intl/ko/distribute/tools/localization-checklist.jd
index cf46481..4cc9735 100644
--- a/docs/html-intl/intl/ko/distribute/tools/localization-checklist.jd
+++ b/docs/html-intl/intl/ko/distribute/tools/localization-checklist.jd
@@ -187,7 +187,7 @@
-
+
</p>
<p>
diff --git a/docs/html-intl/intl/ko/guide/components/activities.jd b/docs/html-intl/intl/ko/guide/components/activities.jd
index 001982f..255a111 100644
--- a/docs/html-intl/intl/ko/guide/components/activities.jd
+++ b/docs/html-intl/intl/ko/guide/components/activities.jd
@@ -44,31 +44,31 @@
-<p>{@link android.app.Activity}는 일종의 애플리케이션 구성 요소로서,
-사용자와 상호작용할 수 있는 화면을 제공하여 전화 걸기, 사진 찍기, 이메일 보내기 또는 지도 보기 등의 일을 할 수
-있습니다. 액티비티마다 창이 하나씩 주어져 이곳에 사용자 인터페이스를 끌어올 수 있습니다. 이 창은
-일반적으로 화면을 가득 채우지만, 작은 창으로 만들어 다른 창 위에 띄울 수도
+<p>{@link android.app.Activity}는 일종의 애플리케이션 구성 요소로서,
+사용자와 상호작용할 수 있는 화면을 제공하여 전화 걸기, 사진 찍기, 이메일 보내기 또는 지도 보기 등의 일을 할 수
+있습니다. 액티비티마다 창이 하나씩 주어져 이곳에 사용자 인터페이스를 끌어올 수 있습니다. 이 창은
+일반적으로 화면을 가득 채우지만, 작은 창으로 만들어 다른 창 위에 띄울 수도
있습니다.</p>
-<p> 하나의 애플리케이션은 보통 여러 개의 액티비티가 느슨하게 서로 묶여 있는 형태로
-구성됩니다. 통상 한 애플리케이션 내에서 하나의 액티비티가 "주요" 액티비티로 지정되며,
-사용자가 이 애플리케이션을 처음 실행할 때 이 액티비티가 사용자에게 표시됩니다. 그런 후
+<p> 하나의 애플리케이션은 보통 여러 개의 액티비티가 느슨하게 서로 묶여 있는 형태로
+구성됩니다. 통상 한 애플리케이션 내에서 하나의 액티비티가 "주요" 액티비티로 지정되며,
+사용자가 이 애플리케이션을 처음 실행할 때 이 액티비티가 사용자에게 표시됩니다. 그런 후
각각의 액티비티는 여러 가지 작업을 수행하기 위해 또 다른 액티비티를 시작할 수 있습니다. 새로운
액티비티가 시작될 때마다 이전 액티비티는 중단되지만 시스템은 해당 액티비티를
-스택("백 스택")에 보존합니다. 새로운 액티비티가 시작되면, 이것이 백 스택 위로 밀려와 사용자의
-시선을 끕니다. 백 스택은 기본적인 "후입선출" 방식을 지키므로,
-사용자가 현재 액티비티를 끝내고 <em>뒤로</em> 버튼을 누르면 해당 액티비티가
+스택("백 스택")에 보존합니다. 새로운 액티비티가 시작되면, 이것이 백 스택 위로 밀려와 사용자의
+시선을 끕니다. 백 스택은 기본적인 "후입선출" 방식을 지키므로,
+사용자가 현재 액티비티를 끝내고 <em>뒤로</em> 버튼을 누르면 해당 액티비티가
스택에서 튀어나와(소멸되고) 이전 액티비티를 재개합니다 (백 스택은
<a href="{@docRoot}guide/components/tasks-and-back-stack.html">작업
및 백 스택</a> 문서에서 상세하게 논의합니다).</p>
<p>한 액티비티가 새로운 액티비티의 시작으로 인해 중단된 경우, 이 상태 변경은
-액티비티의 수명 주기 콜백 메서드를 통해 알려집니다.
+액티비티의 수명 주기 콜백 메서드를 통해 알려집니다.
액티비티가 시스템 액티비티를 생성, 중단, 재시작, 제거하는 등의 상태 변화로 인해 받을 수 있는 콜백 메서드는 여러 가지가 있습니다.
각 콜백은 상태 변화에 알맞은 특정 작업을 수행할 기회를 제공합니다.
- 예를 들어 액티비티가 중단되면 네트워크 또는 데이터베이스 연결과 같이
-큰 개체는 모두 해제해야 합니다. 액티비티가 재개되면, 필요한 리소스를
+ 예를 들어 액티비티가 중단되면 네트워크 또는 데이터베이스 연결과 같이
+큰 개체는 모두 해제해야 합니다. 액티비티가 재개되면, 필요한 리소스를
다시 획득하여 중단된 작업을 재개할 수 있습니다. 이러한 상태 전환은
모두 액티비티 수명 주기의 일부입니다.</p>
@@ -83,52 +83,52 @@
<p>액티비티를 생성하려면 {@link android.app.Activity}의 하위 클래스(또는 이의
기존 하위 클래스)를 생성해야 합니다. 하위 클래스에서는
액티비티 생성, 중단, 재개, 소멸 시기 등과 같은
-수명 주기의 다양한 상태 간 액티비티가 전환될 때 시스템이 호출하는 콜백 메서드를 구현해야 합니다. 가장 중요한 두 가지 콜백 메서드는
+수명 주기의 다양한 상태 간 액티비티가 전환될 때 시스템이 호출하는 콜백 메서드를 구현해야 합니다. 가장 중요한 두 가지 콜백 메서드는
다음과 같습니다.</p>
<dl>
<dt>{@link android.app.Activity#onCreate onCreate()}</dt>
<dd>이 메서드는 반드시 구현해야 합니다. 시스템은 액티비티를 생성할 때 이것을 호출합니다.
- 구현하는 중에 액티비티의 필수 구성 요소를 초기화해야
+ 구현하는 중에 액티비티의 필수 구성 요소를 초기화해야
합니다.
무엇보다도 중요한 점은, 바로 여기서 {@link android.app.Activity#setContentView
setContentView()}를 호출해야 액티비티의 사용자 인터페이스 레이아웃을 정의할 수 있다는 점입니다.</dd>
<dt>{@link android.app.Activity#onPause onPause()}</dt>
- <dd>시스템이 이 메서드를 호출하는 것은 사용자가 액티비티를 떠난다는
-첫 번째 신호입니다(다만 이것이 항상 액티비티가 소멸 중이라는 뜻은 아닙니다). 현재 사용자 세션을 넘어서
-지속되어야 하는 변경 사항을 커밋하려면 보통 이곳에서 해아 합니다(사용자가
+ <dd>시스템이 이 메서드를 호출하는 것은 사용자가 액티비티를 떠난다는
+첫 번째 신호입니다(다만 이것이 항상 액티비티가 소멸 중이라는 뜻은 아닙니다). 현재 사용자 세션을 넘어서
+지속되어야 하는 변경 사항을 커밋하려면 보통 이곳에서 해아 합니다(사용자가
돌아오지 않을 수 있기 때문입니다).</dd>
</dl>
-<p>여러 액티비티 사이에서 원활한 사용자 경험을 제공하고, 액티비티 중단이나 심지어
-소멸을 초래할 수도 있는 예상치 못한 간섭을 처리하기 위해 사용해야 하는 다른 수명 주기
-콜백 메서드도 여러 가지 있습니다. 모든 수명 주기 콜백 메서드는 나중에
+<p>여러 액티비티 사이에서 원활한 사용자 경험을 제공하고, 액티비티 중단이나 심지어
+소멸을 초래할 수도 있는 예상치 못한 간섭을 처리하기 위해 사용해야 하는 다른 수명 주기
+콜백 메서드도 여러 가지 있습니다. 모든 수명 주기 콜백 메서드는 나중에
<a href="#Lifecycle">액티비티 수명 주기 관리</a> 섹션에서 자세히 논의할 것입니다.</p>
<h3 id="UI">사용자 인터페이스 구현하기</h3>
-<p> 한 액티비티에 대한 사용자 인터페이스는 보기 계층—즉,
+<p> 한 액티비티에 대한 사용자 인터페이스는 보기 계층—즉,
{@link android.view.View} 클래스에서 파생된 개체가 제공합니다. 각 보기는 액티비티 창 안의 특정한 직사각형 공간을
- 제어하며 사용자 상호 작용에 대응할 수 있습니다. 예를 들어, 어떤 보기는 사용자가 터치하면
+ 제어하며 사용자 상호 작용에 대응할 수 있습니다. 예를 들어, 어떤 보기는 사용자가 터치하면
작업을 시작하는 버튼일 수 있습니다.</p>
-<p>Android는 레이아웃을 디자인하고 정리하는 데 사용할 수 있도록 여러 가지 보기를 미리 만들어
-제공합니다. "위젯"이란 화면에 시각적(이자 대화형) 요소를 제공하는 보기입니다. 예를 들어
+<p>Android는 레이아웃을 디자인하고 정리하는 데 사용할 수 있도록 여러 가지 보기를 미리 만들어
+제공합니다. "위젯"이란 화면에 시각적(이자 대화형) 요소를 제공하는 보기입니다. 예를 들어
버튼, 텍스트 필드, 확인란이나 그저 하나의 이미지일 수도 있습니다. "레이아웃"은 선형 레이아웃, 격자형 레이아웃, 상대적 레이아웃과 같이 하위 레이아웃에 대해 독특한 레이아웃 모델을 제공하는 {@link
android.view.ViewGroup}에서 파생된
보기입니다. 또한, {@link android.view.View}와
{@link android.view.ViewGroup} 클래스(또는 기존 하위 클래스)의 아래로 내려가서 위젯과 레이아웃을 생성하고
이를 액티비티 레이아웃에 적용할 수 있습니다.</p>
-<p>보기를 사용하여 레이아웃을 정의하는 가장 보편적인 방식은 애플리케이션 리소스에 저장된
+<p>보기를 사용하여 레이아웃을 정의하는 가장 보편적인 방식은 애플리케이션 리소스에 저장된
XML 레이아웃 파일을 사용하는 것입니다. 이렇게 하면 액티비티의 동작을 정의하는
-소스 코드와 별개로 사용자 인터페이스 디자인을 유지할 수 있습니다.
+소스 코드와 별개로 사용자 인터페이스 디자인을 유지할 수 있습니다.
{@link android.app.Activity#setContentView(int) setContentView()}로 액티비티의 UI로서 레이아웃을 설정하고,
해당 레이아웃의 리소스 ID를 전달할 수 있습니다. 그러나 액티비티 코드에 새로운 {@link android.view.View}를 생성하고
새로운 {@link
-android.view.View}를 {@link android.view.ViewGroup}에 삽입하여 보기 계층을 구축한 뒤 루트
+android.view.View}를 {@link android.view.ViewGroup}에 삽입하여 보기 계층을 구축한 뒤 루트
{@link android.view.ViewGroup}을 {@link android.app.Activity#setContentView(View)
setContentView()}에 전달해도 해당 레이아웃을 사용할 수 있습니다.</p>
@@ -138,7 +138,7 @@
<h3 id="Declaring">매니페스트에서 액티비티 선언하기</h3>
-<p>시스템에서 액티비티에 액세스할 수 있게 하려면 이를 매니페스트 파일에서
+<p>시스템에서 액티비티에 액세스할 수 있게 하려면 이를 매니페스트 파일에서
선언해야만 합니다. 액티비티를 선언하려면 매니페스트 파일을 열고 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> 요소를
<a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a>
요소의 하위 항목으로 추가합니다. 예:</p>
@@ -169,12 +169,12 @@
<p><a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code
<activity>}</a> 요소 또한 여러 가지 인텐트 필터를 지정할 수 있습니다. 다른 애플리케이션 구성 요소가 이를 활성화하는 방법을 선언하기 위해 <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
-<intent-filter>}</a>를 사용하는
+<intent-filter>}</a>를 사용하는
것입니다.</p>
-<p>Android SDK 도구를 사용하여 새 애플리케이션을 생성하는 경우, 개발자를 위해
-생성되어 있는 스텁 액티비티에 자동으로 인텐트 필터가 포함되어 있어 "주요" 동작에
-응답하는 액티비티를 선언하며, 이는 "시작 관리자" 범주에 배치해야 합니다. 인텐트 필터는 다음과
+<p>Android SDK 도구를 사용하여 새 애플리케이션을 생성하는 경우, 개발자를 위해
+생성되어 있는 스텁 액티비티에 자동으로 인텐트 필터가 포함되어 있어 "주요" 동작에
+응답하는 액티비티를 선언하며, 이는 "시작 관리자" 범주에 배치해야 합니다. 인텐트 필터는 다음과
같은 형태를 띱니다.</p>
<pre>
@@ -188,23 +188,23 @@
<p><a href="{@docRoot}guide/topics/manifest/action-element.html">{@code
<action>}</a> 요소는 이것이 애플리케이션으로 가는 "주요" 진입 지점이라는 것을 나타냅니다. <a href="{@docRoot}guide/topics/manifest/category-element.html">{@code
-<category>}</a> 요소는 이 액티비티가 시스템의
+<category>}</a> 요소는 이 액티비티가 시스템의
애플리케이션 시작 관리자에 목록으로 나열되어야 한다는 것을 나타냅니다(사용자가 이 액티비티를 시작할 수 있도록 해줌).</p>
-<p>애플리케이션이 자체 포함 방식이기를 원하고 다른 애플리케이션이 이
-애플리케이션의 액티비티를 활성화하도록 허용하지 않고자 하면, 달리 인텐트 필터가 더 필요하지 않습니다. "주요" 동작과 "시작 관리자" 범주가 있는
-액티비티는 하나뿐이어야 합니다(이전 예시 참조). 다른 애플리케이션에서
-사용할 수 없게 하고자 하는 액티비티에는 인텐트 필터가 있으면 안 됩니다.
+<p>애플리케이션이 자체 포함 방식이기를 원하고 다른 애플리케이션이 이
+애플리케이션의 액티비티를 활성화하도록 허용하지 않고자 하면, 달리 인텐트 필터가 더 필요하지 않습니다. "주요" 동작과 "시작 관리자" 범주가 있는
+액티비티는 하나뿐이어야 합니다(이전 예시 참조). 다른 애플리케이션에서
+사용할 수 없게 하고자 하는 액티비티에는 인텐트 필터가 있으면 안 됩니다.
이러한 액티비티는 명시적인 인텐트를 사용해 직접 시작할 수 있습니다(이 내용은 다음 섹션에서 논의).</p>
-<p>그러나, 액티비티가 다른 애플리케이션(및 본인의 애플리케이션)에서
-전달된 암시적 인텐트에 응답하도록 하려면 액티비티에 추가로 인텐트 필터를 정의해야만
-합니다. 응답하게 하고자 하는 각 인텐트 유형별로
+<p>그러나, 액티비티가 다른 애플리케이션(및 본인의 애플리케이션)에서
+전달된 암시적 인텐트에 응답하도록 하려면 액티비티에 추가로 인텐트 필터를 정의해야만
+합니다. 응답하게 하고자 하는 각 인텐트 유형별로
<a href="{@docRoot}guide/topics/manifest/action-element.html">{@code
<action>}</a> 요소를 포함하는 <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a>를 하나씩 포함시켜야 하며, 선택 사항으로 <a href="{@docRoot}guide/topics/manifest/category-element.html">{@code
<category>}</a> 요소 및/또는 <a href="{@docRoot}guide/topics/manifest/data-element.html">{@code
-<data>}</a> 요소를 포함시킬 수 있습니다. 이와 같은 요소는 액티비티가 응답할 수 있는 인텐트의 유형을
+<data>}</a> 요소를 포함시킬 수 있습니다. 이와 같은 요소는 액티비티가 응답할 수 있는 인텐트의 유형을
나타냅니다.</p>
<p>액티비티가 인텐트에 응답하는 방식에 관한 자세한 정보는 <a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a>
@@ -215,15 +215,15 @@
<h2 id="StartingAnActivity">액티비티 시작하기</h2>
<p>다른 액티비티를 시작하려면 {@link android.app.Activity#startActivity
- startActivity()}를 호출한 다음 이에 시작하고자 하는 액티비티를 설명하는 {@link android.content.Intent}를
-전달하면 됩니다. 인텐트는 시작하고자 하는 액티비티를 정확히 나타내거나, 수행하고자 하는 작업의
-유형을 설명하는 것입니다(시스템이 적절한 액티비티를 선택하며,
+ startActivity()}를 호출한 다음 이에 시작하고자 하는 액티비티를 설명하는 {@link android.content.Intent}를
+전달하면 됩니다. 인텐트는 시작하고자 하는 액티비티를 정확히 나타내거나, 수행하고자 하는 작업의
+유형을 설명하는 것입니다(시스템이 적절한 액티비티를 선택하며,
이는
다른 애플리케이션에서 가져온 것일 수도 있습니다). 인텐트는 소량의 데이터를 운반하여 시작된 액티비티에서
사용할 수 있습니다.</p>
<p>본인의 애플리케이션 안에서 작업하는 경우에는, 알려진 액티비티를 시작하기만 하면 되는 경우가 잦습니다.
- 이렇게 하려면 시작하고자 하는 액티비티를 명시적으로 정의하는 인텐트를 클래스 이름을
+ 이렇게 하려면 시작하고자 하는 액티비티를 명시적으로 정의하는 인텐트를 클래스 이름을
사용하여 생성하면 됩니다. 예를 들어, 다음은 한 액티비티가 {@code
SignInActivity}라는 이름의 다른 액티비티를 시작하는 방법입니다.</p>
@@ -232,15 +232,15 @@
startActivity(intent);
</pre>
-<p>그러나, 애플리케이션이 다른 몇 가지 동작을 수행하고자 할 수도 있습니다. 예를 들어 이메일 보내기, 문자
-메시지 보내기 또는 상태 업데이트 등을 액티비티의 데이터를 사용하여 수행하는 것입니다. 이 경우, 본인의 애플리케이션에
-그러한 동작을 수행할 자체 액티비티가 없을 수도 있습니다. 따라서 기기에 있는 다른 애플리케이션이
-제공하는 액티비티를 대신 활용하여 동작을 수행하도록 할 수 있습니다. 바로 이 부분에서
-인텐트의 진가가 발휘됩니다. 수행하고자 하는 동작을 설명하는 인텐트를 생성하면
+<p>그러나, 애플리케이션이 다른 몇 가지 동작을 수행하고자 할 수도 있습니다. 예를 들어 이메일 보내기, 문자
+메시지 보내기 또는 상태 업데이트 등을 액티비티의 데이터를 사용하여 수행하는 것입니다. 이 경우, 본인의 애플리케이션에
+그러한 동작을 수행할 자체 액티비티가 없을 수도 있습니다. 따라서 기기에 있는 다른 애플리케이션이
+제공하는 액티비티를 대신 활용하여 동작을 수행하도록 할 수 있습니다. 바로 이 부분에서
+인텐트의 진가가 발휘됩니다. 수행하고자 하는 동작을 설명하는 인텐트를 생성하면
시스템이 적절한 액티비티를
다른 애플리케이션에서 시작하는 것입니다. 해당 인텐트를
처리할 수 있는 액티비티가 여러 개 있는 경우, 사용자가 어느 것을 사용할지 선택합니다. 예를
- 들어 사용자가 이메일 메시지를 보낼 수 있게 하려면, 다음과 같은 인텐트를
+ 들어 사용자가 이메일 메시지를 보낼 수 있게 하려면, 다음과 같은 인텐트를
생성하면 됩니다.</p>
<pre>
@@ -250,7 +250,7 @@
</pre>
<p>인텐트에 추가된 {@link android.content.Intent#EXTRA_EMAIL} 추가 사항은 이메일이 전송되어야 할 이메일 주소의
- 문자열 배열입니다. 이메일 애플리케이션이 이 인텐트에
+ 문자열 배열입니다. 이메일 애플리케이션이 이 인텐트에
응답하면, 애플리케이션은 추가 사항이 제공한 문자열 배열을 읽어낸 다음 이를 이메일 작성 양식의
"수신" 필드에 배치합니다. 이 상황에서 이메일 애플리케이션의 액티비티가 시작되고 사용자가
작업을 끝내면 본인의 액티비티가 재개되는 것입니다.</p>
@@ -263,14 +263,14 @@
<p>때로는 시작한 액티비티에서 결과를 받고 싶을 수도 있습니다. 그런 경우,
({@link android.app.Activity#startActivity
startActivity()} 대신) {@link android.app.Activity#startActivityForResult
- startActivityForResult()}를 호출해서 액티비티를 시작합니다. 그런 다음 후속 액티비티에서 결과를
+ startActivityForResult()}를 호출해서 액티비티를 시작합니다. 그런 다음 후속 액티비티에서 결과를
받으려면, {@link android.app.Activity#onActivityResult onActivityResult()} 콜백
메서드를 구현합니다. 해당 후속 액티비티가 완료되면, 이것이 {@link
android.content.Intent} 형식으로 결과를 {@link android.app.Activity#onActivityResult onActivityResult()}
메서드에 반환합니다.</p>
-<p>예를 들어 사용자가 연락처 중에서 하나를 고를 수 있도록 하고 싶을 수 있습니다.
-즉 여러분의 액티비티가 해당 연락처의 정보로 무언가 할 수 있도록 하는 것입니다. 그와 같은 인텐트를 생성하고 결과를 처리하려면
+<p>예를 들어 사용자가 연락처 중에서 하나를 고를 수 있도록 하고 싶을 수 있습니다.
+즉 여러분의 액티비티가 해당 연락처의 정보로 무언가 할 수 있도록 하는 것입니다. 그와 같은 인텐트를 생성하고 결과를 처리하려면
다음과 같이 하면 됩니다.</p>
<pre>
@@ -299,7 +299,7 @@
<p>이 예시는 액티비티 결과를 처리하기 위해 {@link
android.app.Activity#onActivityResult onActivityResult()} 메서드에서 사용해야 할 기본 논리를
나타낸 것입니다. 첫 번째 조건은 요청이 성공적인지 확인합니다. 요청에 성공했다면
-{@code resultCode}가 {@link android.app.Activity#RESULT_OK}가 됩니다. 또한, 이 결과가 응답하는 요청이
+{@code resultCode}가 {@link android.app.Activity#RESULT_OK}가 됩니다. 또한, 이 결과가 응답하는 요청이
알려져 있는지도 확인합니다. 이 경우에는 {@code requestCode}가
{@link android.app.Activity#startActivityForResult
startActivityForResult()}와 함께 전송된 두 번째 매개변수와 일치합니다. 여기서부터 코드가
@@ -317,58 +317,58 @@
<h2 id="ShuttingDown">액티비티 종료하기</h2>
<p>액티비티를 종료하려면 해당 액티비티의 {@link android.app.Activity#finish
-finish()} 메서드를 호출하면 됩니다.
+finish()} 메서드를 호출하면 됩니다.
{@link android.app.Activity#finishActivity finishActivity()}를 호출하여 이전에 시작한 별도의 액티비티를 종료할 수도 있습니다.</p>
-<p class="note"><strong>참고:</strong> 대부분의 경우, 이와 같은 메서드를 사용하여 액티비티를 명시적으로
-종료해서는 안 됩니다. 다음 섹션에서 액티비티 수명 주기에 관해 논의한 바와 같이,
-Android 시스템이 액티비티의 수명을 대신 관리해주므로 직접 액티비티를 종료하지
-않아도 됩니다. 이와 같은 메서드를 호출하면 예상되는 사용자
-환경에 부정적인 영향을 미칠 수 있으며, 따라서 사용자가 액티비티의 이 인스턴스에 돌아오는 것을 절대 바라지 않는 경우에만
+<p class="note"><strong>참고:</strong> 대부분의 경우, 이와 같은 메서드를 사용하여 액티비티를 명시적으로
+종료해서는 안 됩니다. 다음 섹션에서 액티비티 수명 주기에 관해 논의한 바와 같이,
+Android 시스템이 액티비티의 수명을 대신 관리해주므로 직접 액티비티를 종료하지
+않아도 됩니다. 이와 같은 메서드를 호출하면 예상되는 사용자
+환경에 부정적인 영향을 미칠 수 있으며, 따라서 사용자가 액티비티의 이 인스턴스에 돌아오는 것을 절대 바라지 않는 경우에만
사용해야 합니다.</p>
<h2 id="Lifecycle">액티비티 수명 주기 관리하기</h2>
-<p>콜백 메서드를 구현하여 액티비티의 수명 주기를 관리하는 것은
-강력하고 유연한 애플리케이션 개발에
-대단히 중요한 역할을 합니다. 액티비티의 수명 주기는 다른 액티비티와의 관계,
+<p>콜백 메서드를 구현하여 액티비티의 수명 주기를 관리하는 것은
+강력하고 유연한 애플리케이션 개발에
+대단히 중요한 역할을 합니다. 액티비티의 수명 주기는 다른 액티비티와의 관계,
액티비티의 작업과 백 스택 등에 직접적으로 영향을 받습니다.</p>
<p>액티비티는 기본적으로 세 가지 상태로 존재할 수 있습니다.</p>
<dl>
<dt><i>재개됨</i></dt>
- <dd>액티비티가 화면 전경에 있으며 사용자의 초점이 맞춰져 있습니다 (이 상태를 때로는
+ <dd>액티비티가 화면 전경에 있으며 사용자의 초점이 맞춰져 있습니다 (이 상태를 때로는
"실행 중"이라고 일컫기도 합니다).</dd>
<dt><i>일시정지됨</i></dt>
<dd>다른 액티비티가 전경에 나와 있고 사용자의 시선을 집중시키고 있지만, 이 액티비티도 여전히 표시되어 있습니다. 다시 말해,
-다른 액티비티가 이 액티비티 위에 표시되어 있으며 해당 액티비티는 부분적으로 투명하거나
+다른 액티비티가 이 액티비티 위에 표시되어 있으며 해당 액티비티는 부분적으로 투명하거나
전체 화면을 덮지 않는 상태라는 뜻입니다. 일시정지된 액티비티는 완전히 살아있지만({@link android.app.Activity}
-개체가 메모리에 보관되어 있고, 모든 상태 및 구성원 정보를 유지하며,
+개체가 메모리에 보관되어 있고, 모든 상태 및 구성원 정보를 유지하며,
창 관리자에 붙어 있는 상태로 유지됨), 메모리가 극히 부족한 경우 시스템이 중단시킬 수 있습니다.</dd>
<dt><i>정지됨</i></dt>
- <dd>이 액티비티가 다른 액티비티에 완전히 가려진 상태입니다(액티비티가 이제
+ <dd>이 액티비티가 다른 액티비티에 완전히 가려진 상태입니다(액티비티가 이제
"배경"에 위치함). 중단된 액티비티도 여전히 살아 있기는 마찬가지입니다({@link android.app.Activity}
개체가 메모리에 보관되어 있고, 모든 상태와 구성원 정보를 유지하시만 창 관리자에 붙어 있지 <em>않음</em>
-). 그러나, 이는 더 이상 사용자에게 표시되지 않으며
+). 그러나, 이는 더 이상 사용자에게 표시되지 않으며
다른 곳에 메모리가 필요하면 시스템이 종료시킬 수 있습니다.</dd>
</dl>
-<p>액티비티가 일시정지 또는 중단된 상태이면, 시스템이 이를 메모리에서 삭제할 수 있습니다. 이러기 위해서는
-종료를 요청하거나({@link android.app.Activity#finish finish()} 메서드를 호출) 단순히 이 액티비티의 프로세스를 중단시키면
-됩니다. 액티비티가 다시 열릴 때에는(종료 또는 중단된 후에) 처음부터 다시 생성해야
+<p>액티비티가 일시정지 또는 중단된 상태이면, 시스템이 이를 메모리에서 삭제할 수 있습니다. 이러기 위해서는
+종료를 요청하거나({@link android.app.Activity#finish finish()} 메서드를 호출) 단순히 이 액티비티의 프로세스를 중단시키면
+됩니다. 액티비티가 다시 열릴 때에는(종료 또는 중단된 후에) 처음부터 다시 생성해야
합니다.</p>
<h3 id="ImplementingLifecycleCallbacks">수명 주기 콜백 구현하기</h3>
-<p>위에서 설명한 바와 같이 액티비티가 여러 가지 상태를 오가며 전환되면, 이와 같은 내용이
-여러 가지 콜백 메서드를 통해 통지됩니다. 콜백 메서드는 모두 후크로서,
-액티비티 상태가 변경될 때 적절한 작업을 하기 위해 이를 재정의할 수 있습니다. 다음의 골격
+<p>위에서 설명한 바와 같이 액티비티가 여러 가지 상태를 오가며 전환되면, 이와 같은 내용이
+여러 가지 콜백 메서드를 통해 통지됩니다. 콜백 메서드는 모두 후크로서,
+액티비티 상태가 변경될 때 적절한 작업을 하기 위해 이를 재정의할 수 있습니다. 다음의 골격
액티비티에는 기본 수명 주기 메서드가 각각 하나씩 포함되어 있습니다.</p>
@@ -410,51 +410,51 @@
<p class="note"><strong>참고:</strong> 이와 같은 수명 주기 메서드를 구현하려면, 항상
슈퍼클래스 구현을 호출한 다음에만 다른 작업을 시작할 수 있습니다(위의 예시 참조).</p>
-<p>이와 같은 메서드를 모두 합쳐 한 액티비티의 수명 주기 전체를 정의합니다. 이러한 메서드를 구현함으로써
+<p>이와 같은 메서드를 모두 합쳐 한 액티비티의 수명 주기 전체를 정의합니다. 이러한 메서드를 구현함으로써
액티비티 수명 주기 내의 세 가지 중첩된 루프를 모니터링할 수 있습니다. </p>
<ul>
<li>한 액티비티의 <b>전체 수명</b>은 {@link
android.app.Activity#onCreate onCreate()} 호출과 {@link
-android.app.Activity#onDestroy} 호출 사이를 말합니다. 액티비티는 {@link android.app.Activity#onCreate onCreate()}에서
-"전체" 상태(레이아웃 정의 등)의 설정을 수행한 다음 나머지 리소스를
-모두 {@link android.app.Activity#onDestroy}에 해제해야 합니다. 예를 들어,
-액티비티에 네트워크에서 데이터를 다운로드하기 위해 배경에서 실행 중인 스레드가 있는 경우, 이는
+android.app.Activity#onDestroy} 호출 사이를 말합니다. 액티비티는 {@link android.app.Activity#onCreate onCreate()}에서
+"전체" 상태(레이아웃 정의 등)의 설정을 수행한 다음 나머지 리소스를
+모두 {@link android.app.Activity#onDestroy}에 해제해야 합니다. 예를 들어,
+액티비티에 네트워크에서 데이터를 다운로드하기 위해 배경에서 실행 중인 스레드가 있는 경우, 이는
해당 스레드를 {@link android.app.Activity#onCreate onCreate()}에서 생성한 다음 {@link
android.app.Activity#onDestroy}에서 그 스레드를 중단할 수 있습니다.</li>
<li><p>액티비티의 <b>가시적 수명</b>은 {@link
android.app.Activity#onStart onStart()} 호출에서 {@link
-android.app.Activity#onStop onStop()} 호출 사이를 말합니다. 이 기간 중에는 사용자가 액티비티를 화면에서 보고 이와
+android.app.Activity#onStop onStop()} 호출 사이를 말합니다. 이 기간 중에는 사용자가 액티비티를 화면에서 보고 이와
상호작용할 수 있습니다. 예컨대 {@link android.app.Activity#onStop onStop()}이 호출되어
- 새 액티비티가 시작되면 이 액티비티는 더 이상 표시되지 않게 됩니다. 이와 같은 두 가지 메서드 중에서
+ 새 액티비티가 시작되면 이 액티비티는 더 이상 표시되지 않게 됩니다. 이와 같은 두 가지 메서드 중에서
사용자에게 액티비티를 표시하는 데 필요한 리소스를 유지하면 됩니다. 예를 들어,
{@link
android.app.Activity#onStart onStart()}에서 {@link android.content.BroadcastReceiver}를 등록하고 UI에 영향을 미치는 변화를 모니터링하고
-{@link android.app.Activity#onStop onStop()}에서 등록을 해제하면 사용자는 여러분이 무엇을 표시하고 있는지 더 이상 볼 수
+{@link android.app.Activity#onStop onStop()}에서 등록을 해제하면 사용자는 여러분이 무엇을 표시하고 있는지 더 이상 볼 수
없게 됩니다. 시스템은 액티비티의 전체 수명 내내 {@link android.app.Activity#onStart onStart()} 및 {@link
-android.app.Activity#onStop onStop()}을 여러 번 호출할 수 있으며, 이때
+android.app.Activity#onStop onStop()}을 여러 번 호출할 수 있으며, 이때
액티비티는 사용자에게 표시되었다 숨겨지는 상태를 오가게 됩니다.</p></li>
<li><p>액티비티의 <b>전경 수명</b>은 {@link
android.app.Activity#onResume onResume()} 호출에서 {@link android.app.Activity#onPause
-onPause()} 호출 사이를 말합니다. 이 기간 중에는 이 액티비티가 화면에서 다른 모든 액티비티 앞에 표시되며 사용자 입력도
+onPause()} 호출 사이를 말합니다. 이 기간 중에는 이 액티비티가 화면에서 다른 모든 액티비티 앞에 표시되며 사용자 입력도
여기에 집중됩니다. 액티비티는 전경에 나타났다 숨겨지는 전환을 자주 반복할 수 있습니다. 예를 들어
-, 기기가 절전 모드에 들어가거나 대화 상자가
-나타나면 {@link android.app.Activity#onPause onPause()}가 호출됩니다. 이 상태는 자주 전환될 수 있으므로, 이 두 가지 메서드의 코드는
+, 기기가 절전 모드에 들어가거나 대화 상자가
+나타나면 {@link android.app.Activity#onPause onPause()}가 호출됩니다. 이 상태는 자주 전환될 수 있으므로, 이 두 가지 메서드의 코드는
상당히 가벼워야 합니다. 그래야 전환이 느려 사용자를 기다리게 하는 일을 피할 수 있습니다.</p></li>
</ul>
<p>그림 1은 액티비티가 상태 사이에서 취할 수 있는 이와 같은 루프와 경로를 나타낸 것입니다.
-직사각형이 액티비티가 여러 상태 사이를 전환할 때 작업을 수행하도록
+직사각형이 액티비티가 여러 상태 사이를 전환할 때 작업을 수행하도록
구현할 수 있는 콜백 메서드를 나타냅니다. <p>
<img src="{@docRoot}images/activity_lifecycle.png" alt="" />
<p class="img-caption"><strong>그림 1.</strong> 액티비티 수명 주기입니다.</p>
-<p>같은 수명 주기 콜백 메서드가 표 1에 나열되어 있으며, 이 표는 각 콜백
-메서드를 더욱 상세하게 설명하며 액티비티의 전반적인
-수명 주기 내에서 각 메서드의 위치를 나타내기도 합니다. 여기에는 콜백 메서드가 완료된 다음
+<p>같은 수명 주기 콜백 메서드가 표 1에 나열되어 있으며, 이 표는 각 콜백
+메서드를 더욱 상세하게 설명하며 액티비티의 전반적인
+수명 주기 내에서 각 메서드의 위치를 나타내기도 합니다. 여기에는 콜백 메서드가 완료된 다음
시스템이 액티비티를 중단시킬 수 있는지 여부도 포함되어 있습니다.</p>
<p class="table-caption"><strong>표 1.</strong> 액티비티 수명 주기
@@ -474,9 +474,9 @@
<tr>
<td colspan="3" align="left"><code>{@link android.app.Activity#onCreate onCreate()}</code></td>
<td>액티비티가 처음 생성되었을 때 호출됩니다.
- 이곳에서 일반적인 정적 설정을 모두 수행해야 합니다.
-즉 보기 생성, 목록에 데이터 바인딩하기 등을 말합니다. 이 메서드에는
-액티비티의 이전 상태가 캡처된 경우 해당 상태를 포함한
+ 이곳에서 일반적인 정적 설정을 모두 수행해야 합니다.
+즉 보기 생성, 목록에 데이터 바인딩하기 등을 말합니다. 이 메서드에는
+액티비티의 이전 상태가 캡처된 경우 해당 상태를 포함한
번들 개체가 전달됩니다(이 문서 나중에 나오는 <a href="#actstate">액티비티 상태 저장하기</a>를 참조하십시오
).
<p>이 뒤에는 항상 {@code onStart()}가 따라옵니다.</p></td>
@@ -508,7 +508,7 @@
<td rowspan="2" style="border-left: none;"> </td>
<td align="left"><code>{@link android.app.Activity#onResume onResume()}</code></td>
<td>액티비티가 시작되고 사용자와 상호 작용하기 직전에
-호출됩니다. 이 시점에서 액티비티는 액티비티
+호출됩니다. 이 시점에서 액티비티는 액티비티
스택의 맨 위에 있으며, 사용자 입력이 입력되고 있습니다.
<p>이 뒤에는 항상 {@code onPause()}가 따라옵니다.</p></td>
<td align="center">아니요</td>
@@ -517,10 +517,10 @@
<tr>
<td align="left"><code>{@link android.app.Activity#onPause onPause()}</code></td>
- <td>시스템이 다른 액티비티를 재개하기 직전에
-호출됩니다. 이 메서드는 일반적으로 데이터를 유지하기 위해 저장되지 않은 변경 사항을
-커밋하는 데, 애니메이션을 비롯하여 CPU를 소모하는 기타 작업을 중단하는 등
-여러 가지 용도에 사용됩니다. 이 메서드는 무슨 일을 하든 매우 빨리 끝내야 합니다.
+ <td>시스템이 다른 액티비티를 재개하기 직전에
+호출됩니다. 이 메서드는 일반적으로 데이터를 유지하기 위해 저장되지 않은 변경 사항을
+커밋하는 데, 애니메이션을 비롯하여 CPU를 소모하는 기타 작업을 중단하는 등
+여러 가지 용도에 사용됩니다. 이 메서드는 무슨 일을 하든 매우 빨리 끝내야 합니다.
이것이 반환될 때까지 다음 액티비티가 재개되지 않기 때문입니다.
<p>액티비티가 다시 전경으로 돌아오면 {@code onResume()}이 뒤에 따라오고
액티비티가 사용자에게 보이지 않게 되면{@code onStop()}이 뒤에 따라옵니다.
@@ -544,11 +544,11 @@
<tr>
<td colspan="3" align="left"><code>{@link android.app.Activity#onDestroy
onDestroy()}</code></td>
- <td>액티비티가 소멸되기 전에 호출됩니다. 이것이 액티비티가 받는
-마지막 호출입니다. 이것이 호출될 수 있는 경우는 액티비티가
+ <td>액티비티가 소멸되기 전에 호출됩니다. 이것이 액티비티가 받는
+마지막 호출입니다. 이것이 호출될 수 있는 경우는 액티비티가
완료되는 중이라서(누군가가 여기에 <code>{@link android.app.Activity#finish
- finish()}</code>를 호출해서)일 수도 있고, 시스템이 공간을 절약하기 위해 액티비티의 이 인스턴스를 일시적으로 소멸시키는
-중이기 때문일 수도 있습니다. 이와 같은
+ finish()}</code>를 호출해서)일 수도 있고, 시스템이 공간을 절약하기 위해 액티비티의 이 인스턴스를 일시적으로 소멸시키는
+중이기 때문일 수도 있습니다. 이와 같은
두 가지 시나리오는 <code>{@link
android.app.Activity#isFinishing isFinishing()}</code> 메서드로 구분할 수 있습니다.</td>
<td align="center"><strong style="color:#800000">예</strong></td>
@@ -558,49 +558,49 @@
</table>
<p>"완료 후 중단 가능?"이라는 레이블이 붙은 열은
- 시스템이 <em>메서드가 반환된 후</em> 액티비티 코드의 다른 줄을 실행하지 않고도
+ 시스템이 <em>메서드가 반환된 후</em> 액티비티 코드의 다른 줄을 실행하지 않고도
언제든 이 액티비티를 호스팅하는 프로세스를 중단시킬 수 있는지 여부를 나타냅니다. 다음 세 가지 메서드가 "예"로 표시되어 있습니다({@link
android.app.Activity#onPause
onPause()}, {@link android.app.Activity#onStop onStop()} 및 {@link android.app.Activity#onDestroy
onDestroy()}). {@link android.app.Activity#onPause onPause()}가 세 가지 메서드 중에서
첫 번째이므로, 액티비티가 생성되면 {@link android.app.Activity#onPause onPause()}는 프로세스가 <em>지워지기 전에</em>
-반드시 호출되는 마지막 메서드입니다.
+반드시 호출되는 마지막 메서드입니다.
시스템이 비상 시에 메모리를 복구해야 할 경우, {@link
android.app.Activity#onStop onStop()}와 {@link android.app.Activity#onDestroy onDestroy()}는
-호출되지 않을 수도 있습니다. 따라서, 중요한 영구적 데이터(사용자 편집 등)를 보관하기 위해 작성하는 경우에는 {@link android.app.Activity#onPause onPause()}를 사용해야
-합니다. 그러나, {@link android.app.Activity#onPause onPause()} 중에
-어느 정보를 유지해야 할지는 조심해서 선택해야 합니다. 이 메서드에 차단 절차가 있으면
-다음 액티비티로의 전환을 차단하고 사용자 경험을 느려지게 할 수 있기
+호출되지 않을 수도 있습니다. 따라서, 중요한 영구적 데이터(사용자 편집 등)를 보관하기 위해 작성하는 경우에는 {@link android.app.Activity#onPause onPause()}를 사용해야
+합니다. 그러나, {@link android.app.Activity#onPause onPause()} 중에
+어느 정보를 유지해야 할지는 조심해서 선택해야 합니다. 이 메서드에 차단 절차가 있으면
+다음 액티비티로의 전환을 차단하고 사용자 경험을 느려지게 할 수 있기
때문입니다.</p>
-<p> <b>중단 가능한</b> 열에 "아니요"로 표시된 메서드는 액티비티를 호스팅하는 프로세스를
-보호하여 호출된 즉시 중단되지 않도록 방지합니다. 따라서 액티비티는
-{@link android.app.Activity#onPause onPause()}가 반환되는 시기부터
-{@link android.app.Activity#onResume onResume()}이 호출되는 시기 사이에 중단시킬 수 있습니다. 다시 중단시킬 수 있는 상태가 되려면
+<p> <b>중단 가능한</b> 열에 "아니요"로 표시된 메서드는 액티비티를 호스팅하는 프로세스를
+보호하여 호출된 즉시 중단되지 않도록 방지합니다. 따라서 액티비티는
+{@link android.app.Activity#onPause onPause()}가 반환되는 시기부터
+{@link android.app.Activity#onResume onResume()}이 호출되는 시기 사이에 중단시킬 수 있습니다. 다시 중단시킬 수 있는 상태가 되려면
{@link android.app.Activity#onPause onPause()}가 다시 호출되어 반환되어야 합니다. </p>
-<p class="note"><strong>참고:</strong> 표 1에 나타난 이런 정의에
-따르면 엄밀히 말해 "중단 가능한" 것이 아닌 액티비티라도 시스템이 중단시킬 수는 있습니다. 다만 이것은 다른 리소스가 없는
-극단적인 상황에서만 발생합니다. 액티비티가 중단될 수 있는 시기가
+<p class="note"><strong>참고:</strong> 표 1에 나타난 이런 정의에
+따르면 엄밀히 말해 "중단 가능한" 것이 아닌 액티비티라도 시스템이 중단시킬 수는 있습니다. 다만 이것은 다른 리소스가 없는
+극단적인 상황에서만 발생합니다. 액티비티가 중단될 수 있는 시기가
언제인지는 <a href="{@docRoot}guide/components/processes-and-threads.html">프로세스 및
스레딩</a> 문서에서 보다 자세히 논의합니다.</p>
<h3 id="SavingActivityState">액티비티 상태 저장하기</h3>
-<p><a href="#Lifecycle">액티비티 수명 주기 관리하기</a> 도입부에서는 액티비티가
-일시중지되거나
-중단되었더라도 액티비티의 상태는 그대로 유지된다고 잠시 언급한 바 있습니다. 이것은
-{@link android.app.Activity} 개체가 일시중지되거나 중단된 경우에도
-메모리 안에 그대로 보관되었기 때문에 가능합니다. 즉 이 액티비티의 구성원과 현재 상태에 대한 모든 정보가 아직 살아 있다는 뜻입니다. 따라서, 사용자가
-액티비티 내에서 변경한 모든 내용도 그대로 유지되어 액티비티가 전경으로
+<p><a href="#Lifecycle">액티비티 수명 주기 관리하기</a> 도입부에서는 액티비티가
+일시중지되거나
+중단되었더라도 액티비티의 상태는 그대로 유지된다고 잠시 언급한 바 있습니다. 이것은
+{@link android.app.Activity} 개체가 일시중지되거나 중단된 경우에도
+메모리 안에 그대로 보관되었기 때문에 가능합니다. 즉 이 액티비티의 구성원과 현재 상태에 대한 모든 정보가 아직 살아 있다는 뜻입니다. 따라서, 사용자가
+액티비티 내에서 변경한 모든 내용도 그대로 유지되어 액티비티가 전경으로
돌아갈 때("재개"될 때) 그와 같은 변경 사항도 그대로 존재하게 됩니다.</p>
<p>그러나 시스템이 메모리를 복구하기 위해 액티비티를 소멸시키는 경우에는 {@link
-android.app.Activity} 개체가 소멸되므로 시스템이 액티비티의 상태를 온전히 유지한 채로 간단하게 재개할 수 없게
-됩니다. 대신, 사용자가 다시 이 액티비티로 이동해 오면 시스템이 {@link android.app.Activity} 개체를
-다시 생성해야 합니다. 하지만, 사용자는 시스템이
-해당 액티비티를 소멸시켰다가 다시 생성했다는 것을 모릅니다.
+android.app.Activity} 개체가 소멸되므로 시스템이 액티비티의 상태를 온전히 유지한 채로 간단하게 재개할 수 없게
+됩니다. 대신, 사용자가 다시 이 액티비티로 이동해 오면 시스템이 {@link android.app.Activity} 개체를
+다시 생성해야 합니다. 하지만, 사용자는 시스템이
+해당 액티비티를 소멸시켰다가 다시 생성했다는 것을 모릅니다.
따라서 액티비티가 예전과 똑같을 것이라고 예상할 것입니다. 이런 상황에서는
액티비티 상태에 관한 정보를 저장할 수 있는 추가 콜백 메서드
{@link
@@ -617,19 +617,19 @@
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}에게 전달합니다. 이들 메서드 중
하나를 사용하여 {@link android.os.Bundle}에서 저장된 상태를 추출하고 액티비티 상태
를 복원할 수 있습니다. 복구할 상태 정보가 없는 경우, 여러분에게 전달되는 {@link
-android.os.Bundle}은 null입니다(액티비티가 처음 생성되었을 때 이런 경우가
+android.os.Bundle}은 null입니다(액티비티가 처음 생성되었을 때 이런 경우가
발생합니다).</p>
<img src="{@docRoot}images/fundamentals/restore_instance.png" alt="" />
-<p class="img-caption"><strong>그림 2.</strong> 액티비티의 상태가 온전한 채로 사용자의
-초점에 다시 돌아오는 데에는 두 가지 방식이 있습니다. 하나는 액티비티가 소멸되었다가 다시 생성되어 액티비티가
-이전에 저장된 상태를 복구해야 하는 경우, 다른 하나는 액티비티가 중단되었다가 재개되었으며
+<p class="img-caption"><strong>그림 2.</strong> 액티비티의 상태가 온전한 채로 사용자의
+초점에 다시 돌아오는 데에는 두 가지 방식이 있습니다. 하나는 액티비티가 소멸되었다가 다시 생성되어 액티비티가
+이전에 저장된 상태를 복구해야 하는 경우, 다른 하나는 액티비티가 중단되었다가 재개되었으며
액티비티 상태가 온전히 유지된 경우입니다.</p>
<p class="note"><strong>참고:</strong> 상태를 저장할 필요가 없는 경우도 있으므로 액티비티가 소멸되기 전에 {@link
android.app.Activity#onSaveInstanceState onSaveInstanceState()}가 호출된다는 보장은 없습니다
-(예컨대 사용자가
+(예컨대 사용자가
명시적으로
액티비티를 닫기 위해 <em>뒤로</em> 버튼을 눌러서 액티비티를 떠날 때가 이에 해당합니다). 시스템이 {@link android.app.Activity#onSaveInstanceState
onSaveInstanceState()}를 호출하는 경우, {@link
@@ -642,9 +642,9 @@
android.app.Activity#onSaveInstanceState onSaveInstanceState()}가 일부 액티비티 상태를 복구합니다. 특히, 기본
구현은 레이아웃에서 {@link
android.view.View}가 나올 때마다 해당하는 {@link
-android.view.View#onSaveInstanceState onSaveInstanceState()} 메서드를 호출하고, 이 때문에 각 보기가 저장해야 하는 자체 관련 정보를 제공할 수
-있게 해줍니다. Android 프레임워크를 사용하는 위젯은 거의 대부분 이 메서드를
-필요에 따라 구현하므로, UI에 눈에 보이는 변경이 있으면 모두 자동으로 저장되며 액티비티를 다시
+android.view.View#onSaveInstanceState onSaveInstanceState()} 메서드를 호출하고, 이 때문에 각 보기가 저장해야 하는 자체 관련 정보를 제공할 수
+있게 해줍니다. Android 프레임워크를 사용하는 위젯은 거의 대부분 이 메서드를
+필요에 따라 구현하므로, UI에 눈에 보이는 변경이 있으면 모두 자동으로 저장되며 액티비티를 다시
생성하면 복구됩니다. 예를 들어, {@link android.widget.EditText} 위젯은 사용자가 입력한 모든 텍스트
를 저장하고 {@link android.widget.CheckBox} 위젯은 확인 여부를 저장합니다.
여러분이 해야 할 유일한 작업은 상태를 저장하고자 하는 각 위젯에 고유 ID(<a href="{@docRoot}guide/topics/resources/layout-resource.html#idvalue">{@code android:id}</a>
@@ -653,9 +653,9 @@
<div class="sidebox-wrapper">
<div class="sidebox">
-<p>또한,
-{@link android.R.attr#saveEnabled android:saveEnabled} 속성을 {@code "false"}로 설정하거나
-{@link android.view.View#setSaveEnabled setSaveEnabled()} 메서드를 호출해서 레이아웃의 보기가 상태를 저장하지 못하도록 명시적으로 막을 수 있습니다. 보통은 이것을 비활성화해서는
+<p>또한,
+{@link android.R.attr#saveEnabled android:saveEnabled} 속성을 {@code "false"}로 설정하거나
+{@link android.view.View#setSaveEnabled setSaveEnabled()} 메서드를 호출해서 레이아웃의 보기가 상태를 저장하지 못하도록 명시적으로 막을 수 있습니다. 보통은 이것을 비활성화해서는
안 되지만, 액티비티 UI의 상태를 다르게 복구하고자 하는 경우 그렇게 할 수도 있습니다.</p>
</div>
</div>
@@ -668,25 +668,25 @@
).</p>
<p>{@link
-android.app.Activity#onSaveInstanceState onSaveInstanceState()}의 기본 구현이 UI 상태를 저장하는 데 도움이 되기 때문에,
-추가 상태 정보를 저장하기 위해 이 메서드를 재정의하려면
+android.app.Activity#onSaveInstanceState onSaveInstanceState()}의 기본 구현이 UI 상태를 저장하는 데 도움이 되기 때문에,
+추가 상태 정보를 저장하기 위해 이 메서드를 재정의하려면
작업을 하기 전에 항상{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}의 슈퍼클래스 구현
을 호출해야 합니다. 이와 마찬가지로 {@link
-android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}를 재정의하는 경우, 이것의 슈퍼클래스 구현을 호출해야 하기도 합니다.
+android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}를 재정의하는 경우, 이것의 슈퍼클래스 구현을 호출해야 하기도 합니다.
이렇게 해야 기본 구현이 보기 상태를 복구할 수 있습니다.</p>
<p class="note"><strong>참고:</strong> {@link android.app.Activity#onSaveInstanceState
onSaveInstanceState()}의 호출이 보장되지 않으므로
이것은 액티비티의 일시적 상태(UI의 상태
-)를 기록하는 데에만 사용하고, 영구 데이터를 보관하는 데 사용해서는 안 됩니다. 대신, 사용자가 액티비티를 떠날 때 영구적인 데이터(데이터베이스에 저장되어야
+)를 기록하는 데에만 사용하고, 영구 데이터를 보관하는 데 사용해서는 안 됩니다. 대신, 사용자가 액티비티를 떠날 때 영구적인 데이터(데이터베이스에 저장되어야
하는 데이터 등)를 저장하려면 {@link
android.app.Activity#onPause onPause()}를 사용해야 합니다.</p>
<p>애플리케이션의 상태 저장 기능을 시험하는 좋은 방법은 기기를 회전해보고 화면 방향이
-바뀌는지 확인하는 것입니다. 화면 방향이 바뀌면 시스템은 액티비티를
-소멸시켰다가 다시 생성하여 새 화면 구성에서 이용할 수 있을지 모르는 대체
-리소스를 적용합니다. 이 이유 하나만으로도 액티비티가 다시 생성되었을 때 상태를
-완전히 복구할 수 있어야 한다는 점이 대단히 중요합니다. 사용자는 애플리케이션을 사용하면서 화면을
+바뀌는지 확인하는 것입니다. 화면 방향이 바뀌면 시스템은 액티비티를
+소멸시켰다가 다시 생성하여 새 화면 구성에서 이용할 수 있을지 모르는 대체
+리소스를 적용합니다. 이 이유 하나만으로도 액티비티가 다시 생성되었을 때 상태를
+완전히 복구할 수 있어야 한다는 점이 대단히 중요합니다. 사용자는 애플리케이션을 사용하면서 화면을
자주 돌리기 때문입니다.</p>
@@ -700,8 +700,8 @@
설계되었습니다
(예: 다양한 화면 방향과 크기에 대한 다양한 레이아웃).</p>
-<p>액티비티를 적절히 설계하여 화면 방향 변경으로 인한 재시작을 감당할 수 있으며
-위에 설명한 것처럼 액티비티 상태를 복구할 수 있도록 하면, 애플리케이션이 액티비티 수명 주기에서
+<p>액티비티를 적절히 설계하여 화면 방향 변경으로 인한 재시작을 감당할 수 있으며
+위에 설명한 것처럼 액티비티 상태를 복구할 수 있도록 하면, 애플리케이션이 액티비티 수명 주기에서
예기치 못한 이벤트가 일어나도 더욱 탄력적으로 복구될 수 있습니다.</p>
<p>이러한 재시작을 처리하는 가장 좋은 방법은 이전 섹션에서 논의한 바와 같이
@@ -710,22 +710,22 @@
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}(또는 {@link
android.app.Activity#onCreate onCreate()})를 사용하여 액티비티 상태를 저장하고 복구하는 것입니다.</p>
-<p>런타임에 발생하는 구성 변경과 그 처리 방법에 대한 자세한 정보는
-<a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경
+<p>런타임에 발생하는 구성 변경과 그 처리 방법에 대한 자세한 정보는
+<a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경
처리하기</a>에 대한 가이드를 읽어보십시오.</p>
<h3 id="CoordinatingActivities">액티비티 조정하기</h3>
- <p>한 액티비티가 다른 액티비티를 시작하면, 둘 모두 수명 주기 전환을 겪습니다. 첫 번째 액티비티는
-일시중지하고 중단되는 반면(배경에서 계속 보이는 경우에는 중단되지 않습니다만), 다른 액티비티는
-생성되는 것입니다. 이와 같은 액티비티가 디스크 또는 다른 속에 저장된 데이터를 공유하는 경우,
-첫 번째 액티비티는 두 번째 액티비티가 생성되기 전에 완전히 중단되지 않는다는 점을 이해하는 것이 중요합니다.
+ <p>한 액티비티가 다른 액티비티를 시작하면, 둘 모두 수명 주기 전환을 겪습니다. 첫 번째 액티비티는
+일시중지하고 중단되는 반면(배경에서 계속 보이는 경우에는 중단되지 않습니다만), 다른 액티비티는
+생성되는 것입니다. 이와 같은 액티비티가 디스크 또는 다른 속에 저장된 데이터를 공유하는 경우,
+첫 번째 액티비티는 두 번째 액티비티가 생성되기 전에 완전히 중단되지 않는다는 점을 이해하는 것이 중요합니다.
그렇다기보다는, 두 번째 액티비티의 시작 과정이 첫 번째 액티비티 중단 과정과 겹쳐 일어납니다.
</p>
-<p>수명 주기 콜백은 분명히 정의된 순서가 있으며 특히 두 개의 액티비티가
+<p>수명 주기 콜백은 분명히 정의된 순서가 있으며 특히 두 개의 액티비티가
같은 프로세스 안에 있으면서 하나가 다른 하나를 시작하는 경우 순서가 더욱 확실합니다. 다음은 액티비티 A가
액티비티 B를 시작할 때 발생하는 작업 순서입니다. </p>
@@ -741,8 +741,8 @@
</ol>
<p>이처럼 수명 주기 콜백의 순서를 예측할 수 있기 때문에 한 액티비티에서 다른 액티비티로 전환되는
- 정보를 관리할 수 있습니다. 예를 들어 첫 번째 액티비티가 중단될 때 데이터베이스에
-내용을 작성해서 다음 액티비티가 그 내용을 읽을 수 있도록 하려면, 데이터베이스에는
+ 정보를 관리할 수 있습니다. 예를 들어 첫 번째 액티비티가 중단될 때 데이터베이스에
+내용을 작성해서 다음 액티비티가 그 내용을 읽을 수 있도록 하려면, 데이터베이스에는
{@link android.app.Activity#onPause onPause()} 중에({@link
android.app.Activity#onStop onStop()} 중이 아니라) 쓰기 작업을 해야 합니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/components/bound-services.jd b/docs/html-intl/intl/ko/guide/components/bound-services.jd
index bf97b26..276ff24 100644
--- a/docs/html-intl/intl/ko/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/ko/guide/components/bound-services.jd
@@ -41,22 +41,22 @@
</div>
-<p>바인딩된 서비스란 클라이언트 서버 인터페이스 안의 서버를 말합니다. 바인딩된 서비스를 사용하면 구성 요소(활동 등)를
-서비스에 바인딩되게 하거나, 요청을 보내고 응답을 수신하며 심지어는
+<p>바인딩된 서비스란 클라이언트 서버 인터페이스 안의 서버를 말합니다. 바인딩된 서비스를 사용하면 구성 요소(활동 등)를
+서비스에 바인딩되게 하거나, 요청을 보내고 응답을 수신하며 심지어는
프로세스간 통신(IPC)까지 수행할 수 있게 됩니다. 일반적으로 바인딩된 서비스는 다른 애플리케이션
구성 요소를 도울 때까지만 살고 배경에서 무한히 실행되지 않습니다.</p>
<p>이 문서는 다른 애플리케이션 구성 요소의
-서비스에 바인딩하는 방법을 포함하여 바인딩된 서비스를 만드는 방법을 보여줍니다. 하지만 일반적인 서비스에 관한 정보도 알아두는 것이 좋습니다.
-서비스에서 알림을 전달하는 방법이나 서비스를 전경에서 실행되도록 설정하는 방법 등 여러 가지
+서비스에 바인딩하는 방법을 포함하여 바인딩된 서비스를 만드는 방법을 보여줍니다. 하지만 일반적인 서비스에 관한 정보도 알아두는 것이 좋습니다.
+서비스에서 알림을 전달하는 방법이나 서비스를 전경에서 실행되도록 설정하는 방법 등 여러 가지
추가 정보를 알아보려면 <a href="{@docRoot}guide/components/services.html">서비스</a> 문서를 참조하십시오.</p>
<h2 id="Basics">기본 정보</h2>
-<p>바인딩된 서비스란 일종의 {@link android.app.Service} 클래스 구현으로,
-이를 통해 다른 애플리케이션이 이 서비스에 바인딩하여 상호 작용할 수 있도록 해주는 것입니다. 한 서비스에 대한 바인딩을 제공하려면,
-{@link android.app.Service#onBind onBind()} 콜백 메서드를 구현해야 합니다.
+<p>바인딩된 서비스란 일종의 {@link android.app.Service} 클래스 구현으로,
+이를 통해 다른 애플리케이션이 이 서비스에 바인딩하여 상호 작용할 수 있도록 해주는 것입니다. 한 서비스에 대한 바인딩을 제공하려면,
+{@link android.app.Service#onBind onBind()} 콜백 메서드를 구현해야 합니다.
이 메서드는 클라이언트가 서비스와 상호 작용하는 데 사용하는 프로그래밍 인터페이스를 정의하는 {@link android.os.IBinder} 개체를
반환합니다.</p>
@@ -65,24 +65,24 @@
<h3>시작된 서비스에 바인딩</h3>
<p><a href="{@docRoot}guide/components/services.html">서비스</a>
-문서에서 논의된 바와 같이, 시작되었으면서도 바인딩된 서비스를 만들 수 있습니다. 다시 말해,
-{@link android.content.Context#startService startService()}를 호출하여 서비스를 시작할 수 있으며
+문서에서 논의된 바와 같이, 시작되었으면서도 바인딩된 서비스를 만들 수 있습니다. 다시 말해,
+{@link android.content.Context#startService startService()}를 호출하여 서비스를 시작할 수 있으며
이를 통해 서비스가 무한히 실행되도록 할 수 있으며, {@link
android.content.Context#bindService bindService()}를 호출하면 클라이언트가 해당 서비스에 바인딩되도록 할 수 있다는 것입니다.
- <p>서비스를 시작되고 바인딩되도록 허용한 다음 서비스가 시작되면
-시스템은 클라이언트가 모두 바인딩을 해제해도 서비스를 소멸시키지 <em>않습니다</em>. 대신,
+ <p>서비스를 시작되고 바인딩되도록 허용한 다음 서비스가 시작되면
+시스템은 클라이언트가 모두 바인딩을 해제해도 서비스를 소멸시키지 <em>않습니다</em>. 대신,
직접 서비스를 확실히 중단시켜야 합니다. 그러려면 {@link android.app.Service#stopSelf stopSelf()} 또는 {@link
android.content.Context#stopService stopService()}를 호출하면 됩니다.</p>
<p>보통은 {@link android.app.Service#onBind onBind()}
<em>또는</em> {@link android.app.Service#onStartCommand onStartCommand()}
-중 한 가지만 구현하지만, 둘 모두 구현해야 할 때도 있습니다. 예를 들어, 음악 플레이어의 경우 서비스를 무한히 실행하면서
-바인딩도 제공하도록 허용하는 것이 유용하다는 결론을 내릴 수 있습니다. 이렇게 하면, 한 액티비티가 서비스로 하여금 음악을 재생하도록
-시작한 다음 사용자가 애플리케이션을 떠나더라도 음악을 계속 재생하도록 할 수 있습니다. 그런 다음, 사용자가 애플리케이션으로
+중 한 가지만 구현하지만, 둘 모두 구현해야 할 때도 있습니다. 예를 들어, 음악 플레이어의 경우 서비스를 무한히 실행하면서
+바인딩도 제공하도록 허용하는 것이 유용하다는 결론을 내릴 수 있습니다. 이렇게 하면, 한 액티비티가 서비스로 하여금 음악을 재생하도록
+시작한 다음 사용자가 애플리케이션을 떠나더라도 음악을 계속 재생하도록 할 수 있습니다. 그런 다음, 사용자가 애플리케이션으로
다시 돌아오면 이 액티비티가 서비스를 바인딩하여 재생 제어권을 다시 획득할 수 있습니다.</p>
<p><a href="#Lifecycle">바인딩된 서비스 수명 주기 관리
-</a> 관련 섹션을 꼭 읽어보십시오. 시작된 서비스에 바인딩을
+</a> 관련 섹션을 꼭 읽어보십시오. 시작된 서비스에 바인딩을
추가할 때 서비스 수명 주기에 관한 자세한 정보를 얻을 수 있습니다.</p>
</div>
</div>
@@ -90,23 +90,23 @@
<p>클라이언트가 서비스에 바인딩하려면 {@link android.content.Context#bindService
bindService()}를 호출하면 됩니다. 이 때, 반드시 {@link
android.content.ServiceConnection}의 구현을 제공해야 하며 이것이 서비스와의 연결을 모니터링합니다. {@link
-android.content.Context#bindService bindService()} 메서드는 값 없이 즉시 반환됩니다.
-그러나 Android 시스템이 클라이언트와 서비스 사이의
+android.content.Context#bindService bindService()} 메서드는 값 없이 즉시 반환됩니다.
+그러나 Android 시스템이 클라이언트와 서비스 사이의
연결을 만드는 경우, 시스템은 {@link
android.content.ServiceConnection#onServiceConnected onServiceConnected()}를 {@link
-android.content.ServiceConnection}에서 호출하여 클라이언트가 서비스와 통신하는 데 사용할 수 있도록 {@link android.os.IBinder}를
+android.content.ServiceConnection}에서 호출하여 클라이언트가 서비스와 통신하는 데 사용할 수 있도록 {@link android.os.IBinder}를
전달하게 됩니다.</p>
-<p>여러 클라이언트가 한 번에 서비스에 연결될 수 있습니다. 그러나, 시스템이 서비스의
-{@link android.app.Service#onBind onBind()} 메서드를 호출하여 {@link android.os.IBinder}를 검색하는 경우는 첫 번째 클라이언트가
-바인딩되는 경우뿐입니다. 시스템은 그 후 같은 {@link android.os.IBinder}를 바인딩되는 추가
+<p>여러 클라이언트가 한 번에 서비스에 연결될 수 있습니다. 그러나, 시스템이 서비스의
+{@link android.app.Service#onBind onBind()} 메서드를 호출하여 {@link android.os.IBinder}를 검색하는 경우는 첫 번째 클라이언트가
+바인딩되는 경우뿐입니다. 시스템은 그 후 같은 {@link android.os.IBinder}를 바인딩되는 추가
클라이언트 모두에 전달하며 이때는 {@link android.app.Service#onBind onBind()}를 다시 호출하지 않습니다.</p>
<p>마지막 클라이언트가 서비스에서 바인딩을 해제하면 시스템은 서비스를 소멸시킵니다(
{@link android.content.Context#startService startService()}가 서비스를 시작했을 경우 제외).</p>
<p>바인딩된 서비스를 구현할 때 가장 중요한 부분은
-{@link android.app.Service#onBind onBind()} 콜백 메서드가 반환하는 인터페이스를 정의하는 것입니다.
+{@link android.app.Service#onBind onBind()} 콜백 메서드가 반환하는 인터페이스를 정의하는 것입니다.
서비스의 {@link android.os.IBinder} 인터페이스를 정의하는 방법에는 몇 가지가 있고, 다음
섹션에서는 각 기법에 관해 논의합니다.</p>
@@ -115,42 +115,42 @@
<h2 id="Creating">바인딩된 서비스 생성</h2>
<p>바인딩을 제공하는 서비스를 생성할 때는 클라이언트가 서비스와 상호 작용하는 데 사용할 수 있는 프로그래밍 인터페이스를 제공하는 {@link android.os.IBinder}
-를 제공해야 합니다.
+를 제공해야 합니다.
인터페이스를 정의하는 방법은 세 가지가 있습니다.</p>
<dl>
<dt><a href="#Binder">바인더 클래스 확장</a></dt>
- <dd>서비스가 본인의 애플리케이션 전용이며 클라이언트와 같은 과정으로 실행되는
+ <dd>서비스가 본인의 애플리케이션 전용이며 클라이언트와 같은 과정으로 실행되는
경우(이런 경우가 흔함), 인터페이스를 생성할 때 {@link android.os.Binder} 클래스를
- 확장하고 그 인스턴스를
-{@link android.app.Service#onBind onBind()}에서 반환하는 방식을 사용해야 합니다. 클라이언트가 {@link android.os.Binder}를 받으며,
-이를 사용하여 {@link android.os.Binder} 구현 또는 심지어 {@link android.app.Service}에서
+ 확장하고 그 인스턴스를
+{@link android.app.Service#onBind onBind()}에서 반환하는 방식을 사용해야 합니다. 클라이언트가 {@link android.os.Binder}를 받으며,
+이를 사용하여 {@link android.os.Binder} 구현 또는 심지어 {@link android.app.Service}에서
사용할 수 있는 공개 메서드에 직접 액세스할 수 있습니다.
- <p>이것은 서비스가 본인의 애플리케이션을 위해 단순히 배경에서 작동하는 요소에 그치는 경우
-선호되는 기법입니다. 인터페이스를 생성할 때 이 방식을 사용하지 않는 유일한 이유는
+ <p>이것은 서비스가 본인의 애플리케이션을 위해 단순히 배경에서 작동하는 요소에 그치는 경우
+선호되는 기법입니다. 인터페이스를 생성할 때 이 방식을 사용하지 않는 유일한 이유는
서비스를 다른 애플리케이션에서나 별도의 프로세스에 걸쳐 사용하고 있는 경우뿐입니다.</dd>
<dt><a href="#Messenger">메신저 사용</a></dt>
- <dd>인터페이스를 여러 프로세스에 걸쳐 적용되도록 해야 하는 경우, 서비스에 대한
-인터페이스를 {@link android.os.Messenger}로 생성할 수 있습니다.
+ <dd>인터페이스를 여러 프로세스에 걸쳐 적용되도록 해야 하는 경우, 서비스에 대한
+인터페이스를 {@link android.os.Messenger}로 생성할 수 있습니다.
이 방식을 사용하면 서비스가 여러 가지 유형의 {@link
android.os.Message} 개체에 응답하는 {@link android.os.Handler}를 정의합니다. 이 {@link android.os.Handler}
가 {@link android.os.Messenger}의 기초이며, 이를 통해 클라이언트와 함께 {@link android.os.IBinder}
를 공유할 수 있게 되어 클라이언트가 {@link
-android.os.Message} 개체를 사용해 서비스에 명령을 보낼 수 있게 해줍니다. 이외에도, 클라이언트가 자체적으로 {@link android.os.Messenger}를
+android.os.Message} 개체를 사용해 서비스에 명령을 보낼 수 있게 해줍니다. 이외에도, 클라이언트가 자체적으로 {@link android.os.Messenger}를
정의하여 서비스가 메시지를 돌려보낼 수 있도록 할 수도 있습니다.
<p>이것이 프로세스간 통신(IPC)을 수행하는 가장 간단한 방법입니다. {@link
-android.os.Messenger}가 모든 요청을 단일 스레드에 대기하게 해서, 서비스를 스레드로부터 안전하게
+android.os.Messenger}가 모든 요청을 단일 스레드에 대기하게 해서, 서비스를 스레드로부터 안전하게
설계하지 않아도 되기 때문입니다.</p>
</dd>
<dt>AIDL 사용하기</dt>
- <dd>AIDL(Android Interface Definition Language)은 개체를 운영 체제가 이해할 수 있는
-원시 데이터로 구성 해제한 다음 여러 프로세스에 걸쳐 집결하여 IPC를 수행하기 위해
-필요한 모든 작업을 수행합니다. 이전 기법은 {@link android.os.Messenger}를 사용했는데,
+ <dd>AIDL(Android Interface Definition Language)은 개체를 운영 체제가 이해할 수 있는
+원시 데이터로 구성 해제한 다음 여러 프로세스에 걸쳐 집결하여 IPC를 수행하기 위해
+필요한 모든 작업을 수행합니다. 이전 기법은 {@link android.os.Messenger}를 사용했는데,
사실 그 기본 구조가 AIDL을 기반으로 하고 있는 것입니다. 위에서 언급한 바와 같이 {@link android.os.Messenger}는 단일 스레드에 모든 클라이언트 요청
-대기열을 생성하므로 서비스는 한 번에 요청을 하나씩 수신합니다. 그러나,
-서비스가 동시에 여러 요청을 처리하도록 하고 싶은 경우에는 AIDL을 직접 사용해도
+대기열을 생성하므로 서비스는 한 번에 요청을 하나씩 수신합니다. 그러나,
+서비스가 동시에 여러 요청을 처리하도록 하고 싶은 경우에는 AIDL을 직접 사용해도
됩니다. 이 경우, 서비스가 다중 스레딩을 할 수 있어야 하며 스레드로부터 안전하게 구축되었어야 합니다.
<p>AIDL을 직접 사용하려면
프로그래밍 인터페이스를 정의하는 {@code .aidl} 파일을 생성해야 합니다. Android SDK 도구는
@@ -159,10 +159,10 @@
</dd>
</dl>
- <p class="note"><strong>참고:</strong> 대부분의 애플리케이션의 경우,
-바인딩된 서비스를 생성하기 위해 AIDL를 사용해서는 <strong>안 됩니다</strong>.
-그러려면 다중 스레딩 기능이 필요할 수 있고, 따라서 더 복잡한 구현을 초래할 수 있기 때문입니다. 따라서 AIDL은
-대부분의 애플리케이션에 적합하지 않으므로 이 문서에서는 여러분의 서비스에 이를 이용하는 방법에 대해 다루지 않습니다. AIDL을 직접 사용해야 한다는 확신이 드는 경우,
+ <p class="note"><strong>참고:</strong> 대부분의 애플리케이션의 경우,
+바인딩된 서비스를 생성하기 위해 AIDL를 사용해서는 <strong>안 됩니다</strong>.
+그러려면 다중 스레딩 기능이 필요할 수 있고, 따라서 더 복잡한 구현을 초래할 수 있기 때문입니다. 따라서 AIDL은
+대부분의 애플리케이션에 적합하지 않으므로 이 문서에서는 여러분의 서비스에 이를 이용하는 방법에 대해 다루지 않습니다. AIDL을 직접 사용해야 한다는 확신이 드는 경우,
<a href="{@docRoot}guide/components/aidl.html">AIDL</a> 문서를 참조하십시오.
</p>
@@ -172,12 +172,12 @@
<h3 id="Binder">바인더 클래스 확장</h3>
<p>서비스를 사용하는 것이 로컬 애플리케이션뿐이고 여러 프로세스에 걸쳐 작동할 필요가 없는 경우,
-나름의 {@link android.os.Binder} 클래스를 구현하여
+나름의 {@link android.os.Binder} 클래스를 구현하여
클라이언트로 하여금 서비스 내의 공개 메서드에 직접 액세스할 수 있도록 할 수도 있습니다.</p>
-<p class="note"><strong>참고:</strong> 이것은 클라이언트와 서비스가
-같은 애플리케이션 및 프로세스에 있는 경우에만 통하며, 이 경우가 가장 보편적입니다. 이 방식이 잘 통하는 경우를 예로 들면,
-음악 애플리케이션에서 자체 서비스에 액티비티를 바인딩하여 배경에서 음악을 재생하도록 해야 하는
+<p class="note"><strong>참고:</strong> 이것은 클라이언트와 서비스가
+같은 애플리케이션 및 프로세스에 있는 경우에만 통하며, 이 경우가 가장 보편적입니다. 이 방식이 잘 통하는 경우를 예로 들면,
+음악 애플리케이션에서 자체 서비스에 액티비티를 바인딩하여 배경에서 음악을 재생하도록 해야 하는
경우가 있습니다.</p>
<p>이렇게 설정하는 방법은 다음과 같습니다.</p>
@@ -185,7 +185,7 @@
<li>서비스에서 다음 중 한 가지에 해당하는 {@link android.os.Binder}의 인스턴스를 생성합니다.
<ul>
<li>클라이언트가 호출할 수 있는 공개 메서드 포함</li>
- <li>클라이언트가 호출할 수 있는 공개 메서드가 있는 현재{@link android.app.Service}
+ <li>클라이언트가 호출할 수 있는 공개 메서드가 있는 현재{@link android.app.Service}
인스턴스를 반환</li>
<li>클라이언트가 호출할 수 있는 공개 메서드가 포함된 서비스가 호스팅하는 다른 클래스의 인스턴스를 반환
</li>
@@ -193,16 +193,16 @@
<li>{@link
android.app.Service#onBind onBind()} 콜백 메서드에서 이 {@link android.os.Binder}의 인스턴스를 반환합니다.</li>
<li>클라이언트의 경우, {@link android.os.Binder}를 {@link
-android.content.ServiceConnection#onServiceConnected onServiceConnected()}
+android.content.ServiceConnection#onServiceConnected onServiceConnected()}
콜백 메서드에서 받아 제공된 메서드를 사용해 서비스를 바인딩하기 위해 호출합니다.</li>
</ol>
-<p class="note"><strong>참고:</strong> 서비스와 클라이언트가 같은 애플리케이션에
-있어야 하는 것은 그래야만 클라이언트가 반환된 개체를 캐스팅하여 해당 API를 적절하게 호출할 수 있기 때문입니다. 또한
-서비스와 클라이언트는 같은 프로세스에 있어야 하기도 합니다. 이 기법에서는
+<p class="note"><strong>참고:</strong> 서비스와 클라이언트가 같은 애플리케이션에
+있어야 하는 것은 그래야만 클라이언트가 반환된 개체를 캐스팅하여 해당 API를 적절하게 호출할 수 있기 때문입니다. 또한
+서비스와 클라이언트는 같은 프로세스에 있어야 하기도 합니다. 이 기법에서는
여러 프로세스에 걸친 집결 작업을 전혀 수행하지 않기 때문입니다.</p>
-<p>예컨대, 어떤 서비스가 클라이언트에게 {@link android.os.Binder} 구현을 통해 서비스 내의
+<p>예컨대, 어떤 서비스가 클라이언트에게 {@link android.os.Binder} 구현을 통해 서비스 내의
메서드에 액세스할 수 있도록 한다고 합시다.</p>
<pre>
@@ -303,12 +303,12 @@
}
</pre>
-<p>위 예시는 클라이언트가
+<p>위 예시는 클라이언트가
{@link android.content.ServiceConnection} 구현과 {@link
-android.content.ServiceConnection#onServiceConnected onServiceConnected()} 콜백을 사용하여 서비스에 바인딩하는 방법을 보여줍니다. 다음
+android.content.ServiceConnection#onServiceConnected onServiceConnected()} 콜백을 사용하여 서비스에 바인딩하는 방법을 보여줍니다. 다음
섹션에서는 서비스에 바인딩하는 이러한 과정에 대해 좀 더 자세한 정보를 제공합니다.</p>
-<p class="note"><strong>참고:</strong> 위 예시에서는 서비스에서 분명히 바인딩을 해제하지는 않습니다.
+<p class="note"><strong>참고:</strong> 위 예시에서는 서비스에서 분명히 바인딩을 해제하지는 않습니다.
그러나 모든 클라이언트는 적절한 시점에 바인딩을 해제해야 합니다(액티비티가 일시 중지될 때 등).</p>
<p>더 많은 샘플 코드를 보려면 <a href="{@docRoot}resources/samples/ApiDemos/index.html">ApiDemos</a>에서 <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LocalService.html">{@code
@@ -326,26 +326,26 @@
<h4>AIDL과 비교</h4>
<p>IPC를 수행해야 할 경우, 인터페이스에 대해 {@link android.os.Messenger}를 사용하는 것이
AIDL로 구현하는 것보다 간단합니다. 왜냐하면 {@link android.os.Messenger}는
-모든 호출을 서비스에 대기시키지만 순수한 AIDL 인터페이스는
+모든 호출을 서비스에 대기시키지만 순수한 AIDL 인터페이스는
서비스에 동시에 요청을 전송하여 다중 스레딩을 처리해야 하기 때문입니다.</p>
<p>대부분의 애플리이션에서는 서비스가 다중 스레딩을 수행할 필요가 없으므로 {@link
-android.os.Messenger}를 사용하면 호출을 한 번에 하나씩 처리할 수 있습니다. 서비스가
+android.os.Messenger}를 사용하면 호출을 한 번에 하나씩 처리할 수 있습니다. 서비스가
다중 스레딩되는 것이 중요한 경우, 인터페이스를 정의하는 데 <a href="{@docRoot}guide/components/aidl.html">AIDL</a>을 사용해야 합니다.</p>
</div>
</div>
-<p>서비스가 원격 프로세스와 통신해야 한다면 서비스에 인터페이스를 제공하는 데
-{@link android.os.Messenger}를 사용하면 됩니다. 이 기법을 사용하면
+<p>서비스가 원격 프로세스와 통신해야 한다면 서비스에 인터페이스를 제공하는 데
+{@link android.os.Messenger}를 사용하면 됩니다. 이 기법을 사용하면
AIDL을 쓰지 않고도 프로세스간 통신(IPC)을 수행할 수 있게 해줍니다.</p>
<p>다음은 {@link android.os.Messenger} 사용 방법을 간략하게 요약한 것입니다.</p>
<ul>
- <li>서비스가 클라이언트로부터 각 호출에 대해 콜백을 받는 {@link android.os.Handler}를
+ <li>서비스가 클라이언트로부터 각 호출에 대해 콜백을 받는 {@link android.os.Handler}를
구현합니다.</li>
<li>{@link android.os.Handler}를 사용하여 {@link android.os.Messenger} 개체를 생성합니다
(이것은 {@link android.os.Handler}에 대한 참조입니다).</li>
- <li>{@link android.os.Messenger}가 {@link android.os.IBinder}를 생성하여 서비스가
+ <li>{@link android.os.Messenger}가 {@link android.os.IBinder}를 생성하여 서비스가
{@link android.app.Service#onBind onBind()}로부터 클라이언트에게 반환하도록 합니다.</li>
<li>클라이언트는 {@link android.os.IBinder}를 사용하여 {@link android.os.Messenger}
(서비스의 {@link android.os.Handler}를 참조)를 인스턴트화하고, 이를 이용하여
@@ -356,8 +356,8 @@
</ul>
-<p>이렇게 하면, 클라이언트가 서비스에서 호출할 "메서드"가 없습니다. 대신 클라이언트는
-"메시지"({@link android.os.Message} 개체)를 전달하여 서비스가
+<p>이렇게 하면, 클라이언트가 서비스에서 호출할 "메서드"가 없습니다. 대신 클라이언트는
+"메시지"({@link android.os.Message} 개체)를 전달하여 서비스가
{@link android.os.Handler}로 받을 수 있도록 합니다.</p>
<p>다음은 {@link android.os.Messenger} 인터페이스를 사용하는 간단한 예시 서비스입니다.</p>
@@ -406,7 +406,7 @@
<p>클라이언트는 서비스가 반환한 {@link
android.os.IBinder}에 기초하여 {@link android.os.Messenger}를 생성하고 {@link
-android.os.Messenger#send send()}로 메시지를 전송하기만 하면 됩니다. 예를 들어, 다음은
+android.os.Messenger#send send()}로 메시지를 전송하기만 하면 됩니다. 예를 들어, 다음은
서비스에 바인딩하여 {@code MSG_SAY_HELLO} 메시지를 서비스에 전달하는 간단한 액티비티입니다.</p>
<pre>
@@ -477,7 +477,7 @@
</pre>
<p>이 예시에는 서비스가 클라이언트에 응답하는 방식이 나타나 있지 않다는 것을 유념하십시오. 서비스가 응답하게 하려면
- 클라이언트에도 {@link android.os.Messenger}를 생성해야 합니다.
+ 클라이언트에도 {@link android.os.Messenger}를 생성해야 합니다.
클라이언트가 {@link android.content.ServiceConnection#onServiceConnected
onServiceConnected()} 콜백을 받으면 {@link android.os.Messenger#send send()}메서드의 {@link android.os.Message#replyTo} 매개변수에서 클라이언트의 {@link android.os.Messenger}를 포함하는 {@link android.os.Message}를
서비스에 전송합니다.
@@ -493,7 +493,7 @@
<h2 id="Binding">서비스에 바인딩</h2>
-<p>애플리케이션 구성 요소(클라이언트)를 서비스에 바인딩하려면
+<p>애플리케이션 구성 요소(클라이언트)를 서비스에 바인딩하려면
{@link android.content.Context#bindService bindService()}를 호출하면 됩니다. 그러면 Android
system이 서비스의 {@link android.app.Service#onBind
onBind()} 메서드를 호출하고, 이는 서비스와의 상호 작용을 위해 {@link android.os.IBinder}를 반환합니다.</p>
@@ -505,7 +505,7 @@
bindService()}에 전달해야 합니다. {@link android.content.ServiceConnection}에는
{@link android.os.IBinder}를 전달하기 위해 시스템이 호출하는 콜백 메서드가 포함됩니다.</p>
-<p class="note"><strong>참고:</strong> 서비스에 바인딩할 수 있는 것은 액티비티, 서비스 및
+<p class="note"><strong>참고:</strong> 서비스에 바인딩할 수 있는 것은 액티비티, 서비스 및
콘텐츠 제공자뿐입니다. 브로드캐스트 수신자로부터는 서비스에 바인딩할 수 <strong>없습니다</strong>.</p>
<p>따라서, 클라이언트로부터 서비스에 바인딩하려면 다음과 같이 해야 합니다. </p>
@@ -514,12 +514,12 @@
<p>이 구현으로 두 가지 콜백 메서드를 재정의해야 합니다.</p>
<dl>
<dt>{@link android.content.ServiceConnection#onServiceConnected onServiceConnected()}</dt>
- <dd>시스템이 이것을 호출하여 서비스의
+ <dd>시스템이 이것을 호출하여 서비스의
{@link android.app.Service#onBind onBind()} 메서드가 반환한 {@link android.os.IBinder}를 전달합니다.</dd>
<dt>{@link android.content.ServiceConnection#onServiceDisconnected
onServiceDisconnected()}</dt>
- <dd>Android 시스템이 이것을 호출하는 경우는 서비스로의 연결이
-예기치 못하게 끊어졌을 때, 즉 서비스가 충돌했거나 중단되었을 때 등입니다.
+ <dd>Android 시스템이 이것을 호출하는 경우는 서비스로의 연결이
+예기치 못하게 끊어졌을 때, 즉 서비스가 충돌했거나 중단되었을 때 등입니다.
클라이언트가 바인딩을 해제한다고 이것이 호출되지는 <em>않습니다</em>.</dd>
</dl>
</li>
@@ -527,19 +527,19 @@
android.content.Context#bindService bindService()}를 호출하고 {@link
android.content.ServiceConnection} 구현을 전달합니다. </li>
<li>시스템이 {@link android.content.ServiceConnection#onServiceConnected
-onServiceConnected()} 콜백 메서드를 호출하면, 인터페이스가 정의한 메서드를 사용하여
+onServiceConnected()} 콜백 메서드를 호출하면, 인터페이스가 정의한 메서드를 사용하여
서비스에 호출을 시작해도 됩니다.</li>
<li>서비스로부터 연결을 해제하려면 {@link
android.content.Context#unbindService unbindService()}를 호출합니다.
- <p>클라이언트가 소멸되면 이는 서비스에서 바인딩을 해제하게 되지만,
-서비스와 상호 작용을 마쳤을 때 또는 액티비티가 일시 중지되었을 때에는 항상 바인딩을 해제해야 합니다.
-이렇게 해야 서비스가 사용 중이 아닐 때에는 중지할 수 있습니다
+ <p>클라이언트가 소멸되면 이는 서비스에서 바인딩을 해제하게 되지만,
+서비스와 상호 작용을 마쳤을 때 또는 액티비티가 일시 중지되었을 때에는 항상 바인딩을 해제해야 합니다.
+이렇게 해야 서비스가 사용 중이 아닐 때에는 중지할 수 있습니다
(바인딩과 바인딩 해제의 적절한 시기는 아래에서 좀 더 논의합니다).</p>
</li>
</ol>
-<p>예를 들어, 다음 코드 조각은 위와 같이
-<a href="#Binder">바인더 클래스를 확장해서</a> 생성한 서비스와 클라이언트를 연결합니다. 그러므로 이것이 해야 하는 일은 반환된
+<p>예를 들어, 다음 코드 조각은 위와 같이
+<a href="#Binder">바인더 클래스를 확장해서</a> 생성한 서비스와 클라이언트를 연결합니다. 그러므로 이것이 해야 하는 일은 반환된
{@link android.os.IBinder}를 {@code LocalService} 클래스에 캐스팅하고 {@code
LocalService} 인스턴스를 요청하는 것뿐입니다.</p>
@@ -564,7 +564,7 @@
};
</pre>
-<p>이 {@link android.content.ServiceConnection}이 있으면 클라이언트는
+<p>이 {@link android.content.ServiceConnection}이 있으면 클라이언트는
이것을 {@link android.content.Context#bindService bindService()}에 전달하여 서비스에 바인딩할 수 있습니다. 예:</p>
<pre>
@@ -573,12 +573,12 @@
</pre>
<ul>
- <li>{@link android.content.Context#bindService bindService()}의 첫 번째 매개변수는 바인딩할 서비스를 명시적으로 명명하는
-{@link android.content.Intent}입니다(인텐트는
+ <li>{@link android.content.Context#bindService bindService()}의 첫 번째 매개변수는 바인딩할 서비스를 명시적으로 명명하는
+{@link android.content.Intent}입니다(인텐트는
암시적일 수 있음).</li>
<li>두 번째 매개변수는 {@link android.content.ServiceConnection} 개체입니다.</li>
<li>세 번째 매개변수는 바인딩 옵션을 나타내는 플래그입니다. 서비스를 생성하기 위해 보통은 {@link
-android.content.Context#BIND_AUTO_CREATE}를 사용합니다(이미 살아 있는 상태가 아닌 경우).
+android.content.Context#BIND_AUTO_CREATE}를 사용합니다(이미 살아 있는 상태가 아닌 경우).
가능한 기타 값은 {@link android.content.Context#BIND_DEBUG_UNBIND}
및 {@link android.content.Context#BIND_NOT_FOREGROUND}, 또는 값이 없는 경우 {@code 0}입니다.</li>
</ul>
@@ -588,27 +588,27 @@
<p>다음은 서비스에 바인딩하는 데 관한 몇 가지 중요한 참고 사항입니다.</p>
<ul>
- <li>항상 {@link android.os.DeadObjectException} 예외를 트래핑해야 합니다.
+ <li>항상 {@link android.os.DeadObjectException} 예외를 트래핑해야 합니다.
이것은 연결이 끊어지면 발생합니다. 원격 메서드에 의해 발생하는 예외는 이것뿐입니다.</li>
<li>개체는 여러 프로세스에 걸쳐 감안된 참조입니다. </li>
<li>일반적으로, 클라이언트의 수명 주기를
결합하고 분해하는 순간을 일치시키면서 바인딩과 바인딩 해제를 페어링해야 합니다. 예:
<ul>
- <li>액티비티가 눈에 보이는 동안에만 서비스와 상호 작용해야 한다면
+ <li>액티비티가 눈에 보이는 동안에만 서비스와 상호 작용해야 한다면
{@link android.app.Activity#onStart onStart()}에는 바인딩하고 {@link
android.app.Activity#onStop onStop()}에는 바인딩을 해제해야 합니다.</li>
<li>
배경에서 중단되었을 때도 액티비티가 응답을 받게 하고 싶다면 {@link android.app.Activity#onCreate onCreate()}에는 바인딩하고
-{@link android.app.Activity#onDestroy onDestroy()} 중에는 바인딩을 해제합니다.
-이때, 사용자의 액티비티가 서비스가 실행되는 시간 전체에서(배경에서라도) 서비스를 사용한다는 것을 유념해야 합니다.
+{@link android.app.Activity#onDestroy onDestroy()} 중에는 바인딩을 해제합니다.
+이때, 사용자의 액티비티가 서비스가 실행되는 시간 전체에서(배경에서라도) 서비스를 사용한다는 것을 유념해야 합니다.
서비스가 다른 프로세스에 있을 경우, 사용자가 프로세스의 가중치를 높이면 시스템이
이를 중단할 가능성이 높아집니다.</li>
</ul>
<p class="note"><strong>참고:</strong> 일반적으로는, 액티비티의 {@link android.app.Activity#onResume onResume()}와 {@link
android.app.Activity#onPause onPause()}에는 바인딩하거나 바인딩을 해제하지 <strong>말아야</strong> 합니다. 이러한 콜백은 모든 수명 주기 전환에서 발생하고
이런 전환에서 발생하는 처리는
-최소한으로 유지해야 하기 때문입니다. 또한,
-사용자 애플리케이션의 여러 액티비티가 동일한 서비스에 바인딩되었고
+최소한으로 유지해야 하기 때문입니다. 또한,
+사용자 애플리케이션의 여러 액티비티가 동일한 서비스에 바인딩되었고
두 액티비티 사이에 전환이 있을 경우, 현재 액티비티의 바인딩이 해제된 후(일시중지 중) 다음 액티비티가 바인딩하기 전(재개 중)에
서비스가 제거되었다가 다시 생성될 수 있습니다 (수명 주기를 조절하기 위한 이러한 액티비티 전환은
<a href="{@docRoot}guide/components/activities.html#CoordinatingActivities">액티비티</a>
@@ -624,8 +624,8 @@
<h2 id="Lifecycle">바인딩된 서비스 수명 주기 관리</h2>
-<p>서비스가 모든 클라이언트로부터 바인딩 해제되면, Android 시스템이 이를 소멸시킵니다(다만
-{@link android.app.Service#onStartCommand onStartCommand()}와도 함께 시작된 경우는 예외).
+<p>서비스가 모든 클라이언트로부터 바인딩 해제되면, Android 시스템이 이를 소멸시킵니다(다만
+{@link android.app.Service#onStartCommand onStartCommand()}와도 함께 시작된 경우는 예외).
따라서, 서비스가 순전히 바인딩된 서비스일 경우에는 해당 서비스의 수명 주기를 관리하지 않아도 됩니다.
클라이언트에 바인딩되었는지를 근거로 Android 시스템이 대신 관리해주기 때문입니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/components/fragments.jd b/docs/html-intl/intl/ko/guide/components/fragments.jd
index a41250c..96bf7a1 100644
--- a/docs/html-intl/intl/ko/guide/components/fragments.jd
+++ b/docs/html-intl/intl/ko/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>참고 항목</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">프래그먼트로 동적 UI 구축하기</a></li>
@@ -46,79 +46,79 @@
</div>
</div>
-<p>{@link android.app.Fragment}는 동작 또는
-{@link android.app.Activity} 내에서 사용자 인터페이스의 일부를 나타냅니다. 여러 개의 프래그먼트를 하나의 액티비티에
-조합하여 창이 여러 개인 UI를 구축할 수 있으며, 하나의 프래그먼트를 여러 액티비티에서 재사용할 수 있습니다. 프래그먼트는 자체 수명 주기를 가지고, 자체 입력 이벤트를 받으며,
-액티비티 실행 중에 추가 및 제거가 가능한 액티비티의 모듈식 섹션이라고
-생각하면 됩니다(다른 액티비티에
+<p>{@link android.app.Fragment}는 동작 또는
+{@link android.app.Activity} 내에서 사용자 인터페이스의 일부를 나타냅니다. 여러 개의 프래그먼트를 하나의 액티비티에
+조합하여 창이 여러 개인 UI를 구축할 수 있으며, 하나의 프래그먼트를 여러 액티비티에서 재사용할 수 있습니다. 프래그먼트는 자체 수명 주기를 가지고, 자체 입력 이벤트를 받으며,
+액티비티 실행 중에 추가 및 제거가 가능한 액티비티의 모듈식 섹션이라고
+생각하면 됩니다(다른 액티비티에
재사용할 수 있는 "하위 액티비티"와 같은 개념).</p>
-<p>프래그먼트는 항상 액티비티 내에 포함되어 있어야 하며 해당 프래그먼트의 수명 주기는
-호스트 액티비티의 수명 주기에 직접적으로 영향을 받습니다. 예를 들어 액티비티가 일시정지되는 경우, 그 안의 모든 프래그먼트도
-일시정지되며 액티비티가 소멸되면 모든 프래그먼트도 마찬가지로 소멸됩니다. 그러나 액티비티가 실행 중인
-동안에는(<em>재개됨</em> <a href="{@docRoot}guide/components/activities.html#Lifecycle">수명 주기 상태</a>에 있을 때를 말합니다)
-각 프래그먼트를 추가 또는 제거하는 등 개별적으로 조작할 수 있습니다. 그와 같은 프래그먼트 트랜잭션을
-수행할 때에는 이를 액티비티가 관리하는 백 스택에도
-추가할 수 있습니다. 각 백 스택 항목이 발생한 프래그먼트 트랜잭션의
+<p>프래그먼트는 항상 액티비티 내에 포함되어 있어야 하며 해당 프래그먼트의 수명 주기는
+호스트 액티비티의 수명 주기에 직접적으로 영향을 받습니다. 예를 들어 액티비티가 일시정지되는 경우, 그 안의 모든 프래그먼트도
+일시정지되며 액티비티가 소멸되면 모든 프래그먼트도 마찬가지로 소멸됩니다. 그러나 액티비티가 실행 중인
+동안에는(<em>재개됨</em> <a href="{@docRoot}guide/components/activities.html#Lifecycle">수명 주기 상태</a>에 있을 때를 말합니다)
+각 프래그먼트를 추가 또는 제거하는 등 개별적으로 조작할 수 있습니다. 그와 같은 프래그먼트 트랜잭션을
+수행할 때에는 이를 액티비티가 관리하는 백 스택에도
+추가할 수 있습니다. 각 백 스택 항목이 발생한 프래그먼트 트랜잭션의
기록이 됩니다. 이 백 스택을 사용하면 사용자가 프래그먼트 트랜잭션을 거꾸로 돌릴 수 있습니다(뒤로 이동).
이때 <em>뒤로</em> 버튼을 누르면 됩니다.</p>
<p>프래그먼트를 액티비티 레이아웃의 일부로 추가하는 경우, 이는 액티비티의 보기 계층 내부의 {@link
-android.view.ViewGroup} 안에 살며, 해당 프래그먼트가 자신의 보기
+android.view.ViewGroup} 안에 살며, 해당 프래그먼트가 자신의 보기
레이아웃을 정의합니다.
-프래그먼트를 액티비티 레이아웃에 삽입하려면 해당 프래그먼트를
-액티비티의 레이아웃 파일에서 {@code <fragment>} 요소로 선언하거나, 애플리케이션 코드에서 이를
-기존의 {@link android.view.ViewGroup}에 추가하면 됩니다. 그러나 프래그먼트가
-액티비티 레이아웃의 일부분이어야만 하는 것은 아닙니다. 나름의 UI가 없는 프래그먼트도 액티비티를 위한
+프래그먼트를 액티비티 레이아웃에 삽입하려면 해당 프래그먼트를
+액티비티의 레이아웃 파일에서 {@code <fragment>} 요소로 선언하거나, 애플리케이션 코드에서 이를
+기존의 {@link android.view.ViewGroup}에 추가하면 됩니다. 그러나 프래그먼트가
+액티비티 레이아웃의 일부분이어야만 하는 것은 아닙니다. 나름의 UI가 없는 프래그먼트도 액티비티를 위한
보이지 않는 작업자로 사용할 수 있습니다.</p>
-<p>이 문서에서는 프래그먼트를 사용하도록 애플리케이션을 구축하는 법을
-설명합니다. 그중에는 프래그먼트를 액티비티의 백 스택에 추가했을 때 프래그먼트가 자신의 상태를 유지하는 방법,
-액티비티 및 액티비티 내의 다른 프래그먼트와 이벤트를 공유하는 방법과 액티비티의
+<p>이 문서에서는 프래그먼트를 사용하도록 애플리케이션을 구축하는 법을
+설명합니다. 그중에는 프래그먼트를 액티비티의 백 스택에 추가했을 때 프래그먼트가 자신의 상태를 유지하는 방법,
+액티비티 및 액티비티 내의 다른 프래그먼트와 이벤트를 공유하는 방법과 액티비티의
작업 모음에 참가하는 법 등등 여러 가지가 포함됩니다.</p>
<h2 id="Design">디자인 철학</h2>
-<p>Android가 프래그먼트를 처음 도입한 것은 Android 3.0(API 레벨 11)부터입니다. 기본적으로
-태블릿과 같은 큰 화면에서 보다 역동적이고 유연한 UI 디자인을 지원하는 것이 목적이었습니다. 태블릿의 화면은
-핸드셋 화면보다 훨씬 크기 때문에 UI 구성 요소를 조합하고 상호 교환할 공간이
-더 많습니다. 프래그먼트는 개발자가 보기 계층에 복잡한 변경 내용을 관리하지 않아도
-그러한 디자인을 사용할 수 있도록 해주는 것입니다. 한 액티비티의 레이아웃을 여러 프래그먼트로 나누면
-런타임에 액티비티의 외관을 수정할 수도 있고 그러한 변경 내용을 해당 액티비티가 관리하는
+<p>Android가 프래그먼트를 처음 도입한 것은 Android 3.0(API 레벨 11)부터입니다. 기본적으로
+태블릿과 같은 큰 화면에서 보다 역동적이고 유연한 UI 디자인을 지원하는 것이 목적이었습니다. 태블릿의 화면은
+핸드셋 화면보다 훨씬 크기 때문에 UI 구성 요소를 조합하고 상호 교환할 공간이
+더 많습니다. 프래그먼트는 개발자가 보기 계층에 복잡한 변경 내용을 관리하지 않아도
+그러한 디자인을 사용할 수 있도록 해주는 것입니다. 한 액티비티의 레이아웃을 여러 프래그먼트로 나누면
+런타임에 액티비티의 외관을 수정할 수도 있고 그러한 변경 내용을 해당 액티비티가 관리하는
백 스택에 보존할 수도 있습니다.</p>
-<p>예를 들어 뉴스 애플리케이션이라면 하나의 프래그먼트를 사용하여
-왼쪽에 기사 목록을 표시하도록 하고 또 다른 프래그먼트로 오른쪽에 기사 내용을 표시하도록 할 수 있습니다. 두 프래그먼트 모두
-한 액티비티에서 양쪽으로 나란히 나타나며, 각 프래그먼트에 나름의 수명 주기 콜백 메서드가 있고
-각자 사용자 입력 이벤트를 따로 처리하게 됩니다. 따라서, 사용자는 기사를 선택하는 데 한 액티비티를 쓰고
-기사를 읽는 데 또 다른 액티비티를 선택하는 대신에 같은 액티비티 안에서 기사를 선택하고 읽는 과정을
+<p>예를 들어 뉴스 애플리케이션이라면 하나의 프래그먼트를 사용하여
+왼쪽에 기사 목록을 표시하도록 하고 또 다른 프래그먼트로 오른쪽에 기사 내용을 표시하도록 할 수 있습니다. 두 프래그먼트 모두
+한 액티비티에서 양쪽으로 나란히 나타나며, 각 프래그먼트에 나름의 수명 주기 콜백 메서드가 있고
+각자 사용자 입력 이벤트를 따로 처리하게 됩니다. 따라서, 사용자는 기사를 선택하는 데 한 액티비티를 쓰고
+기사를 읽는 데 또 다른 액티비티를 선택하는 대신에 같은 액티비티 안에서 기사를 선택하고 읽는 과정을
모두 끝낼 수 있는 것입니다. 이것은 그림 1에 나타낸 태블릿 레이아웃과 같습니다.</p>
-<p>프래그먼트를 디자인할 때에는 각 프래그먼트를 모듈식이며 재사용 가능한 액티비티 구성 요소로 만들어야 합니다.
-다시 말해, 각 프래그먼트가 나름의 레이아웃을 따로 정의하고 자기만의 수명 주기 콜백으로 자기 나름의 동작을 정의하기 때문에
-한 프래그먼트를 여러 액티비티에 포함시킬 수 있습니다. 그러므로 재사용을 염두에 두고 디자인하며
-한 프래그먼트를 또 다른 프래그먼트로부터 직접 조작하는 것은 삼가야 합니다. 이것은 특히 모듈식 프래그먼트를 사용하면
-프래그먼트 조합을 여러 가지 화면 크기에 맞춰 변경할 수 있도록 해주기 때문에 중요한 요점입니다. 태블릿과 핸드셋을 모두 지원하는
-애플리케이션을 디자인하는 경우, 사용 가능한 화면 공간을 토대로 사용자 경험을 최적화하도록 프래그먼트를
-여러 레이아웃 구성에 재사용할 수 있습니다. 예를 들어 핸드셋에서의 경우
-프래그먼트를 분리해서 단일 창 UI를 제공하도록 해야할 수 있습니다. 같은 액티비티 안에 하나 이상이 들어가지 않을 수
+<p>프래그먼트를 디자인할 때에는 각 프래그먼트를 모듈식이며 재사용 가능한 액티비티 구성 요소로 만들어야 합니다.
+다시 말해, 각 프래그먼트가 나름의 레이아웃을 따로 정의하고 자기만의 수명 주기 콜백으로 자기 나름의 동작을 정의하기 때문에
+한 프래그먼트를 여러 액티비티에 포함시킬 수 있습니다. 그러므로 재사용을 염두에 두고 디자인하며
+한 프래그먼트를 또 다른 프래그먼트로부터 직접 조작하는 것은 삼가야 합니다. 이것은 특히 모듈식 프래그먼트를 사용하면
+프래그먼트 조합을 여러 가지 화면 크기에 맞춰 변경할 수 있도록 해주기 때문에 중요한 요점입니다. 태블릿과 핸드셋을 모두 지원하는
+애플리케이션을 디자인하는 경우, 사용 가능한 화면 공간을 토대로 사용자 경험을 최적화하도록 프래그먼트를
+여러 레이아웃 구성에 재사용할 수 있습니다. 예를 들어 핸드셋에서의 경우
+프래그먼트를 분리해서 단일 창 UI를 제공하도록 해야할 수 있습니다. 같은 액티비티 안에 하나 이상이 들어가지 않을 수
있기 때문입니다.</p>
<img src="{@docRoot}images/fundamentals/fragments.png" alt="" />
-<p class="img-caption"><strong>그림 1.</strong> 프래그먼트가 정의한 두 가지 UI 모듈이
-태블릿 디자인에서는 하나의 액티비티로 조합될 수 있는 반면 핸드셋 디자인에서는 분리될 수 있다는 것을
+<p class="img-caption"><strong>그림 1.</strong> 프래그먼트가 정의한 두 가지 UI 모듈이
+태블릿 디자인에서는 하나의 액티비티로 조합될 수 있는 반면 핸드셋 디자인에서는 분리될 수 있다는 것을
예시로 나타낸 것입니다.</p>
-<p>예를 들어—뉴스 애플리케이션 예시를 계속 사용하겠습니다—이 애플리케이션을 태블릿 크기의 기기에서 실행하는 경우,
-애플리케이션 내의 <em>액티비티 A</em> 안에 두 개의 프래그먼트를 포함시킬 수 있습니다. 그러나
-핸드셋 크기의 화면에서라면 두 프래그먼트를 모두 쓸 만큼 공간이 충분치 않습니다.
-따라서 <em>액티비티 A</em>에는 기사 목록에 해당되는 프래그먼트만 포함하고, 사용자가 기사를 하나 선택하면 이것이
-<em>액티비티 B</em>를 시작합니다. 여기에 기사를 읽을 두 번째 프래그먼트가 포함되어 있습니다. 따라서 이 애플리케이션은
-서로 다른 조합으로 프래그먼트를 재사용함으로써 태블릿과 핸드셋을 둘 다 지원하는
+<p>예를 들어—뉴스 애플리케이션 예시를 계속 사용하겠습니다—이 애플리케이션을 태블릿 크기의 기기에서 실행하는 경우,
+애플리케이션 내의 <em>액티비티 A</em> 안에 두 개의 프래그먼트를 포함시킬 수 있습니다. 그러나
+핸드셋 크기의 화면에서라면 두 프래그먼트를 모두 쓸 만큼 공간이 충분치 않습니다.
+따라서 <em>액티비티 A</em>에는 기사 목록에 해당되는 프래그먼트만 포함하고, 사용자가 기사를 하나 선택하면 이것이
+<em>액티비티 B</em>를 시작합니다. 여기에 기사를 읽을 두 번째 프래그먼트가 포함되어 있습니다. 따라서 이 애플리케이션은
+서로 다른 조합으로 프래그먼트를 재사용함으로써 태블릿과 핸드셋을 둘 다 지원하는
것입니다(그림 1 참조).</p>
-<p>여러 가지 화면 구성에 맞게 여러 가지 프래그먼트 조합으로 애플리케이션을 디자인하는 법에 대한 자세한 정보는
+<p>여러 가지 화면 구성에 맞게 여러 가지 프래그먼트 조합으로 애플리케이션을 디자인하는 법에 대한 자세한 정보는
<a href="{@docRoot}guide/practices/tablets-and-handsets.html">태블릿 및 핸드셋 지원</a>에 대한 가이드를 참조하십시오.</p>
@@ -132,36 +132,36 @@
</div>
<p>프래그먼트를 생성하려면 {@link android.app.Fragment}의 하위 클래스(또는 이의 기존
-하위 클래스)를 생성해야 합니다. {@link android.app.Fragment} 클래스에는
-{@link android.app.Activity}와 아주 유사해 보이는 코드가 있습니다. 여기에는 액티비티와 비슷한 콜백 메서드가 들어 있습니다.
+하위 클래스)를 생성해야 합니다. {@link android.app.Fragment} 클래스에는
+{@link android.app.Activity}와 아주 유사해 보이는 코드가 있습니다. 여기에는 액티비티와 비슷한 콜백 메서드가 들어 있습니다.
예를 들어 {@link android.app.Fragment#onCreate onCreate()}, {@link android.app.Fragment#onStart onStart()},
-{@link android.app.Fragment#onPause onPause()} 및 {@link android.app.Fragment#onStop onStop()} 등입니다. 사실,
-기존 Android 애플리케이션을 변환하여 프래그먼트를 사용하도록 하려면 그저
-액티비티의 콜백 메서드에서 프래그먼트에 해당되는 콜백 메서드로 코드를 옮기기만 하면
+{@link android.app.Fragment#onPause onPause()} 및 {@link android.app.Fragment#onStop onStop()} 등입니다. 사실,
+기존 Android 애플리케이션을 변환하여 프래그먼트를 사용하도록 하려면 그저
+액티비티의 콜백 메서드에서 프래그먼트에 해당되는 콜백 메서드로 코드를 옮기기만 하면
될 수도 있습니다.</p>
<p>보통은 최소한 다음과 같은 수명 주기 메서드를 구현해야 합니다.</p>
<dl>
<dt>{@link android.app.Fragment#onCreate onCreate()}</dt>
- <dd>시스템은 프래그먼트를 생성할 때 이것을 호출합니다. 구현 내에서 프래그먼트의 기본 구성 요소 중
-프래그먼트가 일시정지되거나 중단되었다가 재개되었을 때 유지하고자 하는 것을
+ <dd>시스템은 프래그먼트를 생성할 때 이것을 호출합니다. 구현 내에서 프래그먼트의 기본 구성 요소 중
+프래그먼트가 일시정지되거나 중단되었다가 재개되었을 때 유지하고자 하는 것을
초기화해야 합니다.</dd>
<dt>{@link android.app.Fragment#onCreateView onCreateView()}</dt>
- <dd>시스템은 프래그먼트가 자신의 사용자 인터페이스를 처음으로 그릴 시간이 되면
-이것을 호출합니다. 프래그먼트에 맞는 UI를 그리려면 메서드에서 {@link android.view.View}를 반환해야 합니다.
-이 메서드는 프래그먼트 레이아웃의 루트입니다. 프래그먼트가 UI를 제공하지 않는 경우 null을 반환하면
+ <dd>시스템은 프래그먼트가 자신의 사용자 인터페이스를 처음으로 그릴 시간이 되면
+이것을 호출합니다. 프래그먼트에 맞는 UI를 그리려면 메서드에서 {@link android.view.View}를 반환해야 합니다.
+이 메서드는 프래그먼트 레이아웃의 루트입니다. 프래그먼트가 UI를 제공하지 않는 경우 null을 반환하면
됩니다.</dd>
<dt>{@link android.app.Activity#onPause onPause()}</dt>
- <dd>시스템이 이 메서드를 호출하는 것은 사용자가 프래그먼트를 떠난다는
-첫 번째 신호입니다(다만 이것이 항상 프래그먼트가 소멸 중이라는 뜻은 아닙니다). 현재 사용자 세션을 넘어서
-지속되어야 하는 변경 사항을 커밋하려면 보통 이곳에서 해아 합니다(사용자가
+ <dd>시스템이 이 메서드를 호출하는 것은 사용자가 프래그먼트를 떠난다는
+첫 번째 신호입니다(다만 이것이 항상 프래그먼트가 소멸 중이라는 뜻은 아닙니다). 현재 사용자 세션을 넘어서
+지속되어야 하는 변경 사항을 커밋하려면 보통 이곳에서 해아 합니다(사용자가
돌아오지 않을 수 있기 때문입니다).</dd>
</dl>
-<p>대부분의 애플리케이션은 각각의 프래그먼트에 이와 같은 메서드를 최소한 세 개씩
-구현해야 하지만, 프래그먼트 수명 주기의 여러 단계를 처리하려면 사용해야 하는 다른 콜백 메서드도
-많이 있습니다. 모든 수명 주기 콜백 메서드는 나중에
+<p>대부분의 애플리케이션은 각각의 프래그먼트에 이와 같은 메서드를 최소한 세 개씩
+구현해야 하지만, 프래그먼트 수명 주기의 여러 단계를 처리하려면 사용해야 하는 다른 콜백 메서드도
+많이 있습니다. 모든 수명 주기 콜백 메서드는 나중에
<a href="#Lifecycle">프래그먼트 수명 주기 처리</a> 섹션에서 더욱 상세히 논의할 것입니다.</p>
@@ -170,45 +170,45 @@
<dl>
<dt>{@link android.app.DialogFragment}</dt>
- <dd>부동 대화 창을 표시합니다. 이 클래스를 사용하여 대화를 생성하면
-{@link android.app.Activity} 클래스의 대화 도우미 메서드를 사용하는 것의
-좋은 대안책이 됩니다. 이렇게 하면 프래그먼트 대화를 액티비티가 관리하는 프래그먼트의 백 스택에 통합시킬 수 있어,
+ <dd>부동 대화 창을 표시합니다. 이 클래스를 사용하여 대화를 생성하면
+{@link android.app.Activity} 클래스의 대화 도우미 메서드를 사용하는 것의
+좋은 대안책이 됩니다. 이렇게 하면 프래그먼트 대화를 액티비티가 관리하는 프래그먼트의 백 스택에 통합시킬 수 있어,
사용자가 무시된 프래그먼트를 반환할 수 있도록 해주기 때문입니다.</dd>
<dt>{@link android.app.ListFragment}</dt>
<dd>어댑터가 관리하는 항목의 목록(예: {@link
-android.widget.SimpleCursorAdapter})을 표시하며, {@link android.app.ListActivity}와 비슷합니다.
+android.widget.SimpleCursorAdapter})을 표시하며, {@link android.app.ListActivity}와 비슷합니다.
이것은 목록 보기를 관리하는 데 쓰는 몇 가지 메서드를 제공합니다. 예를 들어 {@link
-android.app.ListFragment#onListItemClick(ListView,View,int,long) onListItemClick()} 콜백을
+android.app.ListFragment#onListItemClick(ListView,View,int,long) onListItemClick()} 콜백을
제공하여 클릭 이벤트를 처리하는 것 등입니다.</dd>
<dt>{@link android.preference.PreferenceFragment}</dt>
- <dd>{@link android.preference.Preference} 객체의 계층을 목록으로 표시하며,
-{@link android.preference.PreferenceActivity}와 비슷합니다. 이것은
+ <dd>{@link android.preference.Preference} 객체의 계층을 목록으로 표시하며,
+{@link android.preference.PreferenceActivity}와 비슷합니다. 이것은
애플리케이션에 대한 "설정" 액티비티를 생성할 때 유용합니다.</dd>
</dl>
<h3 id="UI">사용자 인터페이스 추가하기</h3>
-<p>프래그먼트는 일반적으로 액티비티에 속한 사용자 인터페이스의 일부분으로 사용되며
+<p>프래그먼트는 일반적으로 액티비티에 속한 사용자 인터페이스의 일부분으로 사용되며
자기 나름의 레이아웃으로 액티비티에 참가합니다.</p>
<p>프래그먼트에 대해 레이아웃을 제공하려면 반드시 {@link
-android.app.Fragment#onCreateView onCreateView()} 콜백 메서드를 구현해야 합니다.
-이것은 프래그먼트가 자신의 레이아웃을 그릴 때가 되면 Android 시스템이 호출하는 것입니다. 이 메서드의 구현은 반드시
+android.app.Fragment#onCreateView onCreateView()} 콜백 메서드를 구현해야 합니다.
+이것은 프래그먼트가 자신의 레이아웃을 그릴 때가 되면 Android 시스템이 호출하는 것입니다. 이 메서드의 구현은 반드시
{@link android.view.View}를 반환해야 합니다. 이것은 프래그먼트 레이아웃의 루트입니다.</p>
<p class="note"><strong>참고:</strong> 프래그먼트가 {@link
-android.app.ListFragment}의 하위 클래스인 경우, 기본 구현이
+android.app.ListFragment}의 하위 클래스인 경우, 기본 구현이
{@link android.app.Fragment#onCreateView onCreateView()}로부터 {@link android.widget.ListView}를 반환하므로 이를 구현하지 않아도 됩니다.</p>
<p>{@link
-android.app.Fragment#onCreateView onCreateView()}로부터 레이아웃을 반환하려면 이를 XML에서 정의된 <a href="{@docRoot}guide/topics/resources/layout-resource.html">레이아웃 리소스</a>로부터 팽창시키면 됩니다. 이를 돕기 위해
-{@link android.app.Fragment#onCreateView onCreateView()}가
+android.app.Fragment#onCreateView onCreateView()}로부터 레이아웃을 반환하려면 이를 XML에서 정의된 <a href="{@docRoot}guide/topics/resources/layout-resource.html">레이아웃 리소스</a>로부터 팽창시키면 됩니다. 이를 돕기 위해
+{@link android.app.Fragment#onCreateView onCreateView()}가
{@link android.view.LayoutInflater} 객체를 제공합니다.</p>
-<p>예를 들어 다음은 {@link android.app.Fragment}의 하위 클래스입니다. 이것이
+<p>예를 들어 다음은 {@link android.app.Fragment}의 하위 클래스입니다. 이것이
{@code example_fragment.xml} 파일로부터 레이아웃을 로딩합니다.</p>
<pre>
@@ -225,49 +225,49 @@
<div class="sidebox-wrapper">
<div class="sidebox">
<h3>레이아웃 생성</h3>
- <p>위의 샘플에서 {@code R.layout.example_fragment}는
-애플리케이션 리소스에 저장된 {@code example_fragment.xml}이라는 레이아웃 리소스에 대한 참조입니다. 레이아웃을
+ <p>위의 샘플에서 {@code R.layout.example_fragment}는
+애플리케이션 리소스에 저장된 {@code example_fragment.xml}이라는 레이아웃 리소스에 대한 참조입니다. 레이아웃을
XML로 생성하는 방법에 대한 정보는 <a href="{@docRoot}guide/topics/ui/index.html">사용자 인터페이스</a>
문서를 참조하십시오.</p>
</div>
</div>
<p>{@link android.app.Fragment#onCreateView
-onCreateView()}로 전달된 {@code container} 매개변수가 상위 {@link android.view.ViewGroup}이며(액티비티의 레이아웃으로부터),
+onCreateView()}로 전달된 {@code container} 매개변수가 상위 {@link android.view.ViewGroup}이며(액티비티의 레이아웃으로부터),
이 안에 프래그먼트 레이아웃이 삽입됩니다.
- {@code savedInstanceState} 매개변수는 일종의 {@link android.os.Bundle}로,
-이것은 프래그먼트가 재개되는 중인 경우 프래그먼트의 이전 인스턴스에 대한 데이터를
-제공합니다(상태를 복원하는 것은 <a href="#Lifecycle">프래그먼트 수명 주기
+ {@code savedInstanceState} 매개변수는 일종의 {@link android.os.Bundle}로,
+이것은 프래그먼트가 재개되는 중인 경우 프래그먼트의 이전 인스턴스에 대한 데이터를
+제공합니다(상태를 복원하는 것은 <a href="#Lifecycle">프래그먼트 수명 주기
처리</a>에서 좀 더 논의합니다).</p>
-<p>{@link android.view.LayoutInflater#inflate(int,ViewGroup,boolean) inflate()} 메서드는
+<p>{@link android.view.LayoutInflater#inflate(int,ViewGroup,boolean) inflate()} 메서드는
다음과 같은 세 개의 인수를 취합니다.</p>
<ul>
<li>팽창시키고자 하는 레이아웃의 리소스 ID.</li>
<li>팽창된 레이아웃의 상위가 될 {@link android.view.ViewGroup}. {@code
-container}를 전달해야 시스템이 레이아웃 매개변수를 팽창된 레이아웃의 루트 보기에 실행 중인 상위 보기에서 지정한 것과 같이
+container}를 전달해야 시스템이 레이아웃 매개변수를 팽창된 레이아웃의 루트 보기에 실행 중인 상위 보기에서 지정한 것과 같이
적용할 수 있으므로 이는 중요한 부분입니다.</li>
<li>팽창된 레이아웃이 팽창 중에 {@link
-android.view.ViewGroup}(두 번째 매개변수)에 첨부되어야 하는지를 나타내는 부울 값 (이 경우,
+android.view.ViewGroup}(두 번째 매개변수)에 첨부되어야 하는지를 나타내는 부울 값 (이 경우,
이것은 거짓입니다. 시스템이 이미 팽창된 레이아웃을 {@code
container} 안에 삽입하고 있기 때문입니다. 참을 전달하면 최종 레이아웃에 중복된 보기 그룹을 생성하게 됩니다).</li>
</ul>
-<p>이제 레이아웃을 제공하는 프래그먼트 생성하는 법을 알게 되셨습니다. 다음은 프래그먼트를
+<p>이제 레이아웃을 제공하는 프래그먼트 생성하는 법을 알게 되셨습니다. 다음은 프래그먼트를
액티비티에 추가해야 합니다.</p>
<h3 id="Adding">액티비티에 프래그먼트 추가</h3>
-<p>프래그먼트는 보통 UI의 일부분으로 호스트 액티비티에 참가합니다. 이는 해당 액티비티의
-전반적인 보기 계층의 일부분으로 포함되게 됩니다. 프래그먼트를 액티비티 레이아웃에 추가하는 데에는 두 가지 방법이
+<p>프래그먼트는 보통 UI의 일부분으로 호스트 액티비티에 참가합니다. 이는 해당 액티비티의
+전반적인 보기 계층의 일부분으로 포함되게 됩니다. 프래그먼트를 액티비티 레이아웃에 추가하는 데에는 두 가지 방법이
있습니다.</p>
<ul>
<li><b>프래그먼트를 액티비티의 레이아웃 파일 안에서 선언합니다.</b>
-<p>이 경우, 프래그먼트에 대한 레이아웃 속성을 마치
-보기인 것처럼 나타낼 수 있습니다. 예를 들어 다음은 프래그먼트가 두 개 있는
+<p>이 경우, 프래그먼트에 대한 레이아웃 속성을 마치
+보기인 것처럼 나타낼 수 있습니다. 예를 들어 다음은 프래그먼트가 두 개 있는
한 액티비티에 대한 레이아웃 파일을 나타낸 것입니다.</p>
<pre>
<?xml version="1.0" encoding="utf-8"?>
@@ -290,31 +290,31 @@
<p>{@code <fragment>} 안의 {@code android:name} 속성이 레이아웃 안에서 인스턴트화할 {@link
android.app.Fragment} 클래스를 나타냅니다.</p>
-<p>시스템은 이 액티비티 레이아웃을 생성할 때 레이아웃에서 지정된 각 프래그먼트를 인스턴트화하며 각각에 대해
-{@link android.app.Fragment#onCreateView onCreateView()} 메서드를
-호출하여 각 프래그먼트의 레이아웃을 검색합니다. 시스템은 프래그먼트가 반환한 {@link android.view.View}를
+<p>시스템은 이 액티비티 레이아웃을 생성할 때 레이아웃에서 지정된 각 프래그먼트를 인스턴트화하며 각각에 대해
+{@link android.app.Fragment#onCreateView onCreateView()} 메서드를
+호출하여 각 프래그먼트의 레이아웃을 검색합니다. 시스템은 프래그먼트가 반환한 {@link android.view.View}를
{@code <fragment>} 요소 자리에 곧바로 삽입합니다.</p>
<div class="note">
- <p><strong>참고:</strong> 각 프래그먼트에는 액티비티가 재시작되는 경우
-프래그먼트를 복구하기 위해 시스템이 사용할 수 있는 고유한 식별자가 필요합니다(그리고, 개발자는 이것을 사용하여 프래그먼트를 캡처해
-이를 제거하는 등 여러 가지 트랜잭션을 수행할 수 있습니다). 프래그먼트에 ID를 제공하는 데에는
+ <p><strong>참고:</strong> 각 프래그먼트에는 액티비티가 재시작되는 경우
+프래그먼트를 복구하기 위해 시스템이 사용할 수 있는 고유한 식별자가 필요합니다(그리고, 개발자는 이것을 사용하여 프래그먼트를 캡처해
+이를 제거하는 등 여러 가지 트랜잭션을 수행할 수 있습니다). 프래그먼트에 ID를 제공하는 데에는
다음과 같은 세 가지 방법이 있습니다.</p>
<ul>
<li>고유한 ID와 함께 {@code android:id} 속성을 제공합니다.</li>
<li>고유한 문자열과 함께 {@code android:tag} 속성을 제공합니다.</li>
- <li>위의 두 가지 중 어느 것도 제공하지 않으면, 시스템은 컨테이너 보기의 ID를
+ <li>위의 두 가지 중 어느 것도 제공하지 않으면, 시스템은 컨테이너 보기의 ID를
사용합니다.</li>
</ul>
</div>
</li>
<li><b>또는, 프로그래밍 방식으로 프래그먼트를 기존의 {@link android.view.ViewGroup}에 추가합니다.</b>
-<p>액티비티가 실행 중인 동안에는 언제든 액티비티 레이아웃에 프래그먼트를 추가할 수 있습니다. 그저 프래그먼트를 배치할
+<p>액티비티가 실행 중인 동안에는 언제든 액티비티 레이아웃에 프래그먼트를 추가할 수 있습니다. 그저 프래그먼트를 배치할
{@link
android.view.ViewGroup}를 지정하기만 하면 됩니다.</p>
- <p>액티비티 내에서 프래그먼트 트랜잭션을 수행하려면(프래그먼트 추가, 제거 또는
-교체 등), {@link android.app.FragmentTransaction}에서 가져온 API를 사용해야 합니다.
+ <p>액티비티 내에서 프래그먼트 트랜잭션을 수행하려면(프래그먼트 추가, 제거 또는
+교체 등), {@link android.app.FragmentTransaction}에서 가져온 API를 사용해야 합니다.
{@link android.app.FragmentTransaction}의 인스턴스를 {@link android.app.Activity}에서 가져오는 방법은 다음과 같습니다.</p>
<pre>
@@ -323,7 +323,7 @@
</pre>
<p>그런 다음 {@link
-android.app.FragmentTransaction#add(int,Fragment) add()} 메서드를 사용하여 프래그먼트를 추가하고, 추가할 프래그먼트와 이를 삽입할
+android.app.FragmentTransaction#add(int,Fragment) add()} 메서드를 사용하여 프래그먼트를 추가하고, 추가할 프래그먼트와 이를 삽입할
보기를 지정하면 됩니다. 예:</p>
<pre>
@@ -332,11 +332,11 @@
fragmentTransaction.commit();
</pre>
- <p>{@link android.app.FragmentTransaction#add(int,Fragment) add()}에
-전달되는 첫 인수가 {@link android.view.ViewGroup}입니다.
+ <p>{@link android.app.FragmentTransaction#add(int,Fragment) add()}에
+전달되는 첫 인수가 {@link android.view.ViewGroup}입니다.
여기에 프래그먼트가 리소스 ID가 지정한 바와 같이 배치되어야 하며, 두 번째 매개변수는 추가할 프래그먼트입니다.</p>
<p>
-{@link android.app.FragmentTransaction}을 변경하고 나면, 반드시
+{@link android.app.FragmentTransaction}을 변경하고 나면, 반드시
{@link android.app.FragmentTransaction#commit}을 호출해야 변경 내용이 적용됩니다.</p>
</li>
</ul>
@@ -344,41 +344,41 @@
<h4 id="AddingWithoutUI">UI 없이 프래그먼트 추가</h4>
-<p>위의 예시에서는 UI를 제공하기 위해 프래그먼트를 액티비티에 추가하는 방법을 보여드렸습니다. 하지만
-추가로 UI를 제시하지 않고 액티비티에 대한 배경 동작을 제공하는 데에도 프래그먼트를 사용할 수
+<p>위의 예시에서는 UI를 제공하기 위해 프래그먼트를 액티비티에 추가하는 방법을 보여드렸습니다. 하지만
+추가로 UI를 제시하지 않고 액티비티에 대한 배경 동작을 제공하는 데에도 프래그먼트를 사용할 수
있습니다.</p>
<p>UI 없이 프래그먼트를 추가하려면 액티비티로부터 가져온 프래그먼트를 {@link
-android.app.FragmentTransaction#add(Fragment,String)}을 사용하여 추가합니다(이때, 프래그먼트에 대해
-보기 ID보다는 고유한 문자열 "태그"를 제공합니다). 이렇게 하면 프래그먼트가 추가되지만,
+android.app.FragmentTransaction#add(Fragment,String)}을 사용하여 추가합니다(이때, 프래그먼트에 대해
+보기 ID보다는 고유한 문자열 "태그"를 제공합니다). 이렇게 하면 프래그먼트가 추가되지만,
이것은 액티비티 레이아웃 안에 있는 보기와 연관되어 있지 않기 때문에 {@link
android.app.Fragment#onCreateView onCreateView()}로의 호출은 받지 않습니다. 따라서 그 메서드는 구현하지 않아도 됩니다.</p>
-<p>프래그먼트에 대해 문자열 태그를 제공하는 것은 엄밀히 말해 비 UI 프래그먼트에만 해당되는 것은 아닙니다. UI가 있는
-프래그먼트에도 문자열 태그를 제공할 수 있습니다. 하지만 프래그먼트에
-UI가 없는 경우라면 이를 식별할 방법은 문자열 태그뿐입니다. 액티비티에서 나중에
+<p>프래그먼트에 대해 문자열 태그를 제공하는 것은 엄밀히 말해 비 UI 프래그먼트에만 해당되는 것은 아닙니다. UI가 있는
+프래그먼트에도 문자열 태그를 제공할 수 있습니다. 하지만 프래그먼트에
+UI가 없는 경우라면 이를 식별할 방법은 문자열 태그뿐입니다. 액티비티에서 나중에
프래그먼트를 가져오고자 하는 경우, {@link android.app.FragmentManager#findFragmentByTag
findFragmentByTag()}를 사용해야 합니다.</p>
<p>예를 들어 어떤 액티비티에서 UI 없이 프래그먼트를 배경 작업자로 사용한다고 가정해봅시다. 이것의 예로 {@code
-FragmentRetainInstance.java} 샘플을 들 수 있으며
-이는 SDK 샘플에 포함되어 있고(Android SDK Manager를 통해 이용 가능), 시스템에는
+FragmentRetainInstance.java} 샘플을 들 수 있으며
+이는 SDK 샘플에 포함되어 있고(Android SDK Manager를 통해 이용 가능), 시스템에는
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code>로 찾을 수 있습니다.</p>
<h2 id="Managing">프래그먼트 관리</h2>
-<p>액티비티 내의 프래그먼트를 관리하려면 {@link android.app.FragmentManager}를 사용해야 합니다. 이것을
+<p>액티비티 내의 프래그먼트를 관리하려면 {@link android.app.FragmentManager}를 사용해야 합니다. 이것을
가져오려면 액티비티에서 {@link android.app.Activity#getFragmentManager()}를 호출하십시오.</p>
<p>{@link android.app.FragmentManager}를 가지고 할 수 있는 여러 가지 일 중에 예를 들면 다음과 같습니다.</p>
<ul>
<li>액티비티 내에 존재하는 프래그먼트를 {@link
-android.app.FragmentManager#findFragmentById findFragmentById()}로 가져오기(액티비티 레이아웃 내에서
+android.app.FragmentManager#findFragmentById findFragmentById()}로 가져오기(액티비티 레이아웃 내에서
UI를 제공하는 프래그먼트의 경우) 또는 {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()}로 가져오기(UI를 제공하거나 하지 않는 프래그먼트의 경우).</li>
+findFragmentByTag()}로 가져오기(UI를 제공하거나 하지 않는 프래그먼트의 경우).</li>
<li>백 스택에서 프래그먼트를 {@link
android.app.FragmentManager#popBackStack()}을 사용하여 튀어나오게 하기(사용자가 내린 <em>뒤로</em> 명령을 시뮬레이트함).</li>
<li>백 스택에 변경 내용이 있는지 알아보기 위해 {@link
@@ -388,18 +388,18 @@
<p>이와 같은 메서드와 그 외 다른 메서드에 대한 자세한 정보는 {@link
android.app.FragmentManager} 클래스 관련 문서를 참조하십시오.</p>
-<p>이전 섹션에서 설명한 바와 같이 {@link android.app.FragmentManager}를
+<p>이전 섹션에서 설명한 바와 같이 {@link android.app.FragmentManager}를
사용해서도 {@link android.app.FragmentTransaction}
을 열 수 있습니다. 이렇게 하면 프래그먼트 추가 및 제거 등 트랜잭션을 수행할 수 있게 해줍니다.</p>
<h2 id="Transactions">프래그먼트 트랜잭션 수행</h2>
-<p>액티비티에서 프래그먼트를 사용하는 경우 특히 유용한 점은 사용자 상호 작용에 응답하여 추가,
-제거, 교체 및 다른 작업을 수행할 수 있다는 것입니다. 액티비티에 적용한
+<p>액티비티에서 프래그먼트를 사용하는 경우 특히 유용한 점은 사용자 상호 작용에 응답하여 추가,
+제거, 교체 및 다른 작업을 수행할 수 있다는 것입니다. 액티비티에 적용한
변경 내용의 집합을 하나의 트랜잭션이라 칭합니다. 이것을 수행하려면 {@link
-android.app.FragmentTransaction} 내의 API를 사용하면 됩니다. 해당 액티비티가 관리하는 백 스택에 행해진 각 트랜잭션을
-저장할 수도 있습니다. 이렇게 하면 사용자가 프래그먼트 변경 내역을 거쳐 뒤로 탐색할 수 있습니다(액티비티를 통과해
+android.app.FragmentTransaction} 내의 API를 사용하면 됩니다. 해당 액티비티가 관리하는 백 스택에 행해진 각 트랜잭션을
+저장할 수도 있습니다. 이렇게 하면 사용자가 프래그먼트 변경 내역을 거쳐 뒤로 탐색할 수 있습니다(액티비티를 통과해
뒤로 탐색하는 것과 비슷합니다).</p>
<p>{@link android.app.FragmentTransaction}의 인스턴스를 {@link
@@ -410,20 +410,20 @@
FragmentTransaction fragmentTransaction = fragmentManager.{@link android.app.FragmentManager#beginTransaction()};
</pre>
-<p>각 트랜잭션은 동시에 수행하고자 하는 여러 변경을 집합적으로 일컫는 말입니다. 주어진
+<p>각 트랜잭션은 동시에 수행하고자 하는 여러 변경을 집합적으로 일컫는 말입니다. 주어진
트랜잭션에 대해 수행하고자 하는 모든 변경 사항을 설정하려면 {@link
android.app.FragmentTransaction#add add()}, {@link android.app.FragmentTransaction#remove remove()},
-및 {@link android.app.FragmentTransaction#replace replace()}와 같은 메서드를 사용하면 됩니다. 그런 다음,
+및 {@link android.app.FragmentTransaction#replace replace()}와 같은 메서드를 사용하면 됩니다. 그런 다음,
트랜잭션을 액티비티에 적용하려면 반드시 {@link android.app.FragmentTransaction#commit()}을 호출해야 합니다.</p>
</dl>
<p>하지만 {@link
android.app.FragmentTransaction#commit()}을 호출하기 전에 먼저 호출해야 할 것이 있습니다. 바로 {@link
-android.app.FragmentTransaction#addToBackStack addToBackStack()}입니다.
-이렇게 해야 트랜잭션을 프래그먼트 트랜잭션의 백 스택에 추가할 수 있습니다. 이 백 스택을 액티비티가 관리하며,
+android.app.FragmentTransaction#addToBackStack addToBackStack()}입니다.
+이렇게 해야 트랜잭션을 프래그먼트 트랜잭션의 백 스택에 추가할 수 있습니다. 이 백 스택을 액티비티가 관리하며,
이를 통해 사용자가 이전 프래그먼트 상태로 되돌아갈 수 있습니다. 이때 <em>뒤로</em> 버튼을 누르면 됩니다.</p>
-<p>예를 들어 다음은 한 프래그먼트를 다른 것으로 교체하고 이전 상태를 백 스택에 보존하는 법을
+<p>예를 들어 다음은 한 프래그먼트를 다른 것으로 교체하고 이전 상태를 백 스택에 보존하는 법을
나타낸 것입니다.</p>
<pre>
@@ -440,49 +440,49 @@
transaction.commit();
</pre>
-<p>이 예시에서 {@code newFragment}가 현재 레이아웃 컨테이너에 있는
+<p>이 예시에서 {@code newFragment}가 현재 레이아웃 컨테이너에 있는
프래그먼트(있는 경우)를 교체합니다. 이는 {@code R.id.fragment_container} ID로 식별할 수 있습니다. {@link
-android.app.FragmentTransaction#addToBackStack addToBackStack()}를 호출하면 교체 트랜잭션이
-백 스택에 저장되고, 따라서 사용자가 트랜잭션을 거꾸로 수행하여
+android.app.FragmentTransaction#addToBackStack addToBackStack()}를 호출하면 교체 트랜잭션이
+백 스택에 저장되고, 따라서 사용자가 트랜잭션을 거꾸로 수행하여
이전 프래그먼트를 도로 가져올 수 있습니다. <em>뒤로</em> 버튼을 사용하면 됩니다.</p>
<p>트랜잭션에 여러 개의 변경을 추가하고(예를 들어 또 다른 {@link
android.app.FragmentTransaction#add add()} 또는 {@link android.app.FragmentTransaction#remove
remove()}) {@link
-android.app.FragmentTransaction#addToBackStack addToBackStack()}을 호출하면, {@link android.app.FragmentTransaction#commit commit()}을 호출하기 전에 적용된 모든 변경 내용이
-백 스택에 하나의 트랜잭션으로 추가되며, <em>뒤로</em> 버튼을 누르면
+android.app.FragmentTransaction#addToBackStack addToBackStack()}을 호출하면, {@link android.app.FragmentTransaction#commit commit()}을 호출하기 전에 적용된 모든 변경 내용이
+백 스택에 하나의 트랜잭션으로 추가되며, <em>뒤로</em> 버튼을 누르면
모두 한꺼번에 역행하게 됩니다.</p>
-<p>{@link android.app.FragmentTransaction}에 변경 내용을 추가하는 순서는 중요하지 않습니다.
+<p>{@link android.app.FragmentTransaction}에 변경 내용을 추가하는 순서는 중요하지 않습니다.
다만 다음과 같은 예외가 있습니다.</p>
<ul>
<li>{@link android.app.FragmentTransaction#commit()}을 마지막으로 호출해야만 합니다.</li>
- <li>같은 컨테이너에 여러 개의 프래그먼트를 추가하는 경우, 이를 추가하는 순서가 이들이
+ <li>같은 컨테이너에 여러 개의 프래그먼트를 추가하는 경우, 이를 추가하는 순서가 이들이
보기 계층에 나타나는 순서를 결정 짓습니다.</li>
</ul>
<p>프래그먼트를 제거하는 트랜잭션을 수행하면서 {@link android.app.FragmentTransaction#addToBackStack(String)
-addToBackStack()}을 호출하지 않는 경우,
-해당 프래그먼트는 트랜잭션이 적용되면 소멸되고 사용자가 이를 되짚어 탐색할 수 없게 됩니다. 반면에
-프래그먼트를 제거하면서 {@link android.app.FragmentTransaction#addToBackStack(String) addToBackStack()}을 호출하면,
-해당 프래그먼트는 <em>중단</em>되고 사용자가 뒤로 탐색하면
+addToBackStack()}을 호출하지 않는 경우,
+해당 프래그먼트는 트랜잭션이 적용되면 소멸되고 사용자가 이를 되짚어 탐색할 수 없게 됩니다. 반면에
+프래그먼트를 제거하면서 {@link android.app.FragmentTransaction#addToBackStack(String) addToBackStack()}을 호출하면,
+해당 프래그먼트는 <em>중단</em>되고 사용자가 뒤로 탐색하면
재개됩니다.</p>
-<p class="note"><strong>팁:</strong> 각 프래그먼트 트랜잭션에 대해 전환 애니메이션을 적용하려면
-커밋하기 전에 {@link android.app.FragmentTransaction#setTransition setTransition()}을
+<p class="note"><strong>팁:</strong> 각 프래그먼트 트랜잭션에 대해 전환 애니메이션을 적용하려면
+커밋하기 전에 {@link android.app.FragmentTransaction#setTransition setTransition()}을
호출하면 됩니다.</p>
-<p>{@link android.app.FragmentTransaction#commit()}을 호출해도 그 즉시 트랜잭션을 수행하지는
-않습니다. 그보다는, 액티비티의 UI 스레드("주요" 스레드)를 스레드가 할 수 있는 한 빨리
+<p>{@link android.app.FragmentTransaction#commit()}을 호출해도 그 즉시 트랜잭션을 수행하지는
+않습니다. 그보다는, 액티비티의 UI 스레드("주요" 스레드)를 스레드가 할 수 있는 한 빨리
이 트랜잭션을 수행하도록 일정을 예약하는 것에 가깝습니다. 하지만 필요한 경우 UI 스레드로부터 {@link
-android.app.FragmentManager#executePendingTransactions()}를 호출하면
-{@link android.app.FragmentTransaction#commit()}이 제출한 트랜잭션을 즉시 실행할 수 있습니다. 트랜잭션이
+android.app.FragmentManager#executePendingTransactions()}를 호출하면
+{@link android.app.FragmentTransaction#commit()}이 제출한 트랜잭션을 즉시 실행할 수 있습니다. 트랜잭션이
다른 스레드의 작업에 대한 종속성이 아니라면 굳이 이렇게 해야만 하는 것은 아닙니다.</p>
<p class="caution"><strong>주의:</strong> 트랜잭션을 적용할 때 {@link
-android.app.FragmentTransaction#commit commit()}을 사용해도 되는 것은 액티비티가 <a href="{@docRoot}guide/components/activities.html#SavingActivityState">그 상태를
-저장</a>하기 전뿐입니다(사용자가 액티비티를 떠날 때). 그 시점 이후에 적용하려고 하면 예외가
-발생합니다. 이것은 액티비티를 복원해야 하는 경우 적용 이후의 상태가 손실될 수
+android.app.FragmentTransaction#commit commit()}을 사용해도 되는 것은 액티비티가 <a href="{@docRoot}guide/components/activities.html#SavingActivityState">그 상태를
+저장</a>하기 전뿐입니다(사용자가 액티비티를 떠날 때). 그 시점 이후에 적용하려고 하면 예외가
+발생합니다. 이것은 액티비티를 복원해야 하는 경우 적용 이후의 상태가 손실될 수
있기 때문입니다. 적용이 손실되어도 괜찮은 상황이라면, {@link
android.app.FragmentTransaction#commitAllowingStateLoss()}를 사용하십시오.</p>
@@ -491,19 +491,19 @@
<h2 id="CommunicatingWithActivity">액티비티와 통신</h2>
-<p>{@link android.app.Fragment}는
-{@link android.app.Activity}로부터 독립적인 객체로 구현되었고 여러 개의 액티비티 안에서 사용할 수 있는 것이 사실이지만,
+<p>{@link android.app.Fragment}는
+{@link android.app.Activity}로부터 독립적인 객체로 구현되었고 여러 개의 액티비티 안에서 사용할 수 있는 것이 사실이지만,
프래그먼트의 주어진 인스턴스는 그것을 포함하고 있는 액티비티에 직접적으로 연결되어 있습니다.</p>
<p>구체적으로 말하면, 이 프래그먼트는 {@link
-android.app.Fragment#getActivity()}를 사용하여 {@link android.app.Activity} 인스턴스에 액세스하여
+android.app.Fragment#getActivity()}를 사용하여 {@link android.app.Activity} 인스턴스에 액세스하여
액티비티 레이아웃에서 보기를 찾는 것과 같은 작업을 손쉽게 수행할 수 있습니다.</p>
<pre>
View listView = {@link android.app.Fragment#getActivity()}.{@link android.app.Activity#findViewById findViewById}(R.id.list);
</pre>
-<p>이와 마찬가지로, 액티비티도 프래그먼트 안의 메서드를 호출할 수 있습니다. 그러려면 {@link android.app.FragmentManager}로부터의
+<p>이와 마찬가지로, 액티비티도 프래그먼트 안의 메서드를 호출할 수 있습니다. 그러려면 {@link android.app.FragmentManager}로부터의
{@link android.app.Fragment}에 대한 참조를 가져와야 하며, 이때 {@link
android.app.FragmentManager#findFragmentById findFragmentById()} 또는 {@link
android.app.FragmentManager#findFragmentByTag findFragmentByTag()}를 사용합니다. 예:</p>
@@ -515,14 +515,14 @@
<h3 id="EventCallbacks">액티비티로의 이벤트 콜백 생성</h3>
-<p>어떤 경우에는 프래그먼트로 하여금 액티비티와 이벤트를 공유하게 해야 할 수 있습니다. 이렇게 하기 위한
-한 가지 좋은 방법은 프래그먼트 내부의 콜백 인터페이스를 정의한 다음 해당 호스트 액티비티가 이를 구현하도록
-하는 것입니다. 액티비티가 인터페이스를 통해 콜백을 수신하면, 필요에 따라 그 정보를 레이아웃 내의
+<p>어떤 경우에는 프래그먼트로 하여금 액티비티와 이벤트를 공유하게 해야 할 수 있습니다. 이렇게 하기 위한
+한 가지 좋은 방법은 프래그먼트 내부의 콜백 인터페이스를 정의한 다음 해당 호스트 액티비티가 이를 구현하도록
+하는 것입니다. 액티비티가 인터페이스를 통해 콜백을 수신하면, 필요에 따라 그 정보를 레이아웃 내의
다른 프래그먼트와 공유할 수 있습니다.</p>
-<p>예를 들어 어떤 뉴스 애플리케이션에서 액티비티 하나에 프래그먼트가 두 개 있습니다.
- 하나는 기사 목록을 표시(프래그먼트 A)하고 다른 하나는 기사 하나를 표시(프래그먼트 B)하는 경우 목록 항목이 선택되면
-프래그먼트 A가 액티비티에 알려야 프래그먼트 B에 해당 기사를 표시하라고 알릴 수 있습니다. 이 경우,
+<p>예를 들어 어떤 뉴스 애플리케이션에서 액티비티 하나에 프래그먼트가 두 개 있습니다.
+ 하나는 기사 목록을 표시(프래그먼트 A)하고 다른 하나는 기사 하나를 표시(프래그먼트 B)하는 경우 목록 항목이 선택되면
+프래그먼트 A가 액티비티에 알려야 프래그먼트 B에 해당 기사를 표시하라고 알릴 수 있습니다. 이 경우,
{@code OnArticleSelectedListener} 인터페이스는 프래그먼트 A 내부에 선언됩니다.</p>
<pre>
@@ -537,12 +537,12 @@
</pre>
<p>그러면 프래그먼트를 호스팅하는 액티비티가 {@code OnArticleSelectedListener}
- 인터페이스를
-구현하고 {@code onArticleSelected()}를 재정의하여 프래그먼트 A로부터 일어난 이벤트를
-프래그먼트 B에 알립니다. 호스트 액티비티가 이 인터페이스를 구현하도록
+ 인터페이스를
+구현하고 {@code onArticleSelected()}를 재정의하여 프래그먼트 A로부터 일어난 이벤트를
+프래그먼트 B에 알립니다. 호스트 액티비티가 이 인터페이스를 구현하도록
확실히 하려면 프래그먼트 A의 {@link
android.app.Fragment#onAttach onAttach()} 콜백 메서드(프래그먼트를 액티비티에 추가할 때 시스템이 호출하는 것)가 {@code OnArticleSelectedListener}의 인스턴스를 인스턴트화해야 합니다. 이때 {@link android.app.Fragment#onAttach
-onAttach()} 안으로 전달된 {@link android.app.Activity}를
+onAttach()} 안으로 전달된 {@link android.app.Activity}를
캐스팅하는 방법을 씁니다.</p>
<pre>
@@ -562,14 +562,14 @@
}
</pre>
-<p>액티비티가 인터페이스를 구현하지 않은 경우, 프래그먼트가
-{@link java.lang.ClassCastException}을 발생시킵니다.
-성공 시, {@code mListener} 구성원이 액티비티의
-{@code OnArticleSelectedListener} 구현에 대한 참조를 보유하므로, 프래그먼트 A가 액티비티와 이벤트를 공유할 수 있습니다.
-이때 {@code OnArticleSelectedListener} 인터페이스가 정의한 메서드를 호출하는 방법을 씁니다. 예를 들어 프래그먼트 A가
-{@link android.app.ListFragment}의 확장인 경우,
+<p>액티비티가 인터페이스를 구현하지 않은 경우, 프래그먼트가
+{@link java.lang.ClassCastException}을 발생시킵니다.
+성공 시, {@code mListener} 구성원이 액티비티의
+{@code OnArticleSelectedListener} 구현에 대한 참조를 보유하므로, 프래그먼트 A가 액티비티와 이벤트를 공유할 수 있습니다.
+이때 {@code OnArticleSelectedListener} 인터페이스가 정의한 메서드를 호출하는 방법을 씁니다. 예를 들어 프래그먼트 A가
+{@link android.app.ListFragment}의 확장인 경우,
사용자가 목록 항목을 클릭할 때마다 시스템이 프래그먼트 안의 {@link android.app.ListFragment#onListItemClick
-onListItemClick()}을 호출하고, 그러면 이것이 {@code onArticleSelected()}를 호출하여
+onListItemClick()}을 호출하고, 그러면 이것이 {@code onArticleSelected()}를 호출하여
해당 이벤트를 액티비티와 공유하는 것입니다.</p>
<pre>
@@ -588,42 +588,42 @@
</pre>
<p>{@link
-android.app.ListFragment#onListItemClick onListItemClick()}에 전달된 {@code id} 매개변수가 클릭한 항목의 행 ID이며,
+android.app.ListFragment#onListItemClick onListItemClick()}에 전달된 {@code id} 매개변수가 클릭한 항목의 행 ID이며,
액티비티(또는 다른 프래그먼트)가 이것을 사용해 애플리케이션의 {@link
android.content.ContentProvider}에서 기사를 가져옵니다.</p>
<p><!--To see a complete implementation of this kind of callback interface, see the <a
-href="{@docRoot}resources/samples/NotePad/index.html">NotePad sample</a>. -->콘텐츠 제공자 사용법에 대한 자세한 정보는
+href="{@docRoot}resources/samples/NotePad/index.html">NotePad sample</a>. -->콘텐츠 제공자 사용법에 대한 자세한 정보는
<a href="{@docRoot}guide/topics/providers/content-providers.html">콘텐츠 제공자</a> 문서에서 이용하실 수 있습니다.</p>
<h3 id="ActionBar">작업 모음에 항목 추가</h3>
-<p>프래그먼트는 액티비티의 <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">옵션 메뉴</a>에(결과적으로 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a>에도) 메뉴 항목으로 참가할 수 있습니다. 이때
-{@link android.app.Fragment#onCreateOptionsMenu(Menu,MenuInflater) onCreateOptionsMenu()}를 구현하는 방법을 씁니다. 이 메서드가
+<p>프래그먼트는 액티비티의 <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">옵션 메뉴</a>에(결과적으로 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a>에도) 메뉴 항목으로 참가할 수 있습니다. 이때
+{@link android.app.Fragment#onCreateOptionsMenu(Menu,MenuInflater) onCreateOptionsMenu()}를 구현하는 방법을 씁니다. 이 메서드가
호출을 수신하도록 하려면, {@link
android.app.Fragment#onCreate(Bundle) onCreate()} 중에 {@link
-android.app.Fragment#setHasOptionsMenu(boolean) setHasOptionsMenu()}를 호출하여 프래그먼트가
-옵션 메뉴에 항목을 추가하고자 한다는 것을 나타내야 합니다(그렇지 않으면 해당 프래그먼트가
+android.app.Fragment#setHasOptionsMenu(boolean) setHasOptionsMenu()}를 호출하여 프래그먼트가
+옵션 메뉴에 항목을 추가하고자 한다는 것을 나타내야 합니다(그렇지 않으면 해당 프래그먼트가
{@link android.app.Fragment#onCreateOptionsMenu onCreateOptionsMenu()}로의 호출을 받지 못하게 됩니다).</p>
-<p>그런 다음 프래그먼트로부터 옵션 메뉴에 추가하는 모든 항목은 기존의 메뉴 항목에
+<p>그런 다음 프래그먼트로부터 옵션 메뉴에 추가하는 모든 항목은 기존의 메뉴 항목에
추가됩니다. 해당 프래그먼트는 메뉴 항목을 선택하면 {@link
-android.app.Fragment#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}로의 콜백도
+android.app.Fragment#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}로의 콜백도
수신하게 됩니다.</p>
<p>또한 프래그먼트 레이아웃에 보기를 등록하여 컨텍스트 메뉴를 제공하도록 할 수도 있습니다. 이때 {@link
-android.app.Fragment#registerForContextMenu(View) registerForContextMenu()}를 호출하면 됩니다. 사용자가 컨텍스트 메뉴를 열면,
+android.app.Fragment#registerForContextMenu(View) registerForContextMenu()}를 호출하면 됩니다. 사용자가 컨텍스트 메뉴를 열면,
해당 프래그먼트가 {@link
android.app.Fragment#onCreateContextMenu(ContextMenu,View,ContextMenu.ContextMenuInfo)
onCreateContextMenu()}로의 호출을 받습니다. 사용자가 항목을 하나 선택하면, 해당 프래그먼트는 {@link
android.app.Fragment#onContextItemSelected(MenuItem) onContextItemSelected()}로의 호출을 받습니다.</p>
-<p class="note"><strong>참고:</strong> 프래그먼트는 추가한 각 메뉴 항목에 대해 '항목 선택됨' 콜백을
-하나씩 받게 되지만, 사용자가 메뉴 항목을 선택할 때 그에 상응하는 콜백을 가장 처음 받는 것은
-액티비티입니다. 액티비티가 구현한 '항목 선택됨' 콜백이 선택된 항목을 다루지 않는 경우,
-해당 이벤트는 프래그먼트의 콜백으로 전달됩니다. 이것은
+<p class="note"><strong>참고:</strong> 프래그먼트는 추가한 각 메뉴 항목에 대해 '항목 선택됨' 콜백을
+하나씩 받게 되지만, 사용자가 메뉴 항목을 선택할 때 그에 상응하는 콜백을 가장 처음 받는 것은
+액티비티입니다. 액티비티가 구현한 '항목 선택됨' 콜백이 선택된 항목을 다루지 않는 경우,
+해당 이벤트는 프래그먼트의 콜백으로 전달됩니다. 이것은
옵션 메뉴와 컨텍스트 메뉴에 모두 참입니다.</p>
<p>메뉴에 대한 더 자세한 정보는 <a href="{@docRoot}guide/topics/ui/menus.html">메뉴</a> 및 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a> 개발자 가이드를 참조하십시오.</p>
@@ -635,11 +635,11 @@
<div class="figure" style="width:350px">
<img src="{@docRoot}images/activity_fragment_lifecycle.png" alt="" />
-<p class="img-caption"><strong>그림 3.</strong> 액티비티 수명 주기가 프래그먼트 수명 주기에 미치는
+<p class="img-caption"><strong>그림 3.</strong> 액티비티 수명 주기가 프래그먼트 수명 주기에 미치는
영향입니다.</p>
</div>
-<p>프래그먼트의 수명 주기를 관리하는 것은 액티비티의 수명 주기를 관리하는 것과 매우 비슷합니다. 액티비티와 마찬가지로
+<p>프래그먼트의 수명 주기를 관리하는 것은 액티비티의 수명 주기를 관리하는 것과 매우 비슷합니다. 액티비티와 마찬가지로
프래그먼트는 세 가지 상태로 존재할 수 있습니다.</p>
<dl>
@@ -647,57 +647,57 @@
<dd>프래그먼트가 실행 중인 액티비티에 표시됩니다.</dd>
<dt><i>일시정지됨</i></dt>
- <dd>또 다른 액티비티가 전경에 나와 있고 사용자가 이에 초점을 맞추고 있지만,
-이 프래그먼트가 있는 액티비티도 여전히 표시되어 있습니다(전경의 액티비티가 부분적으로 투명하거나
+ <dd>또 다른 액티비티가 전경에 나와 있고 사용자가 이에 초점을 맞추고 있지만,
+이 프래그먼트가 있는 액티비티도 여전히 표시되어 있습니다(전경의 액티비티가 부분적으로 투명하거나
전체 화면을 뒤덮지 않습니다).</dd>
<dt><i>정지됨</i></dt>
- <dd>프래그먼트가 표시되지 않습니다. 호스트 액티비티가 정지되었거나
-프래그먼트가 액티비티에서 제거되었지만 백 스택에 추가되었습니다. 정지된 프래그먼트도
-여전히 표시는 됩니다(모든 상태 및 구성원 정보를 시스템이 보존합니다). 하지만, 사용자에게는
+ <dd>프래그먼트가 표시되지 않습니다. 호스트 액티비티가 정지되었거나
+프래그먼트가 액티비티에서 제거되었지만 백 스택에 추가되었습니다. 정지된 프래그먼트도
+여전히 표시는 됩니다(모든 상태 및 구성원 정보를 시스템이 보존합니다). 하지만, 사용자에게는
더 이상 표시되지 않으며 액티비티를 종료하면 이것도 종료됩니다.</dd>
</dl>
<p>이번에도 액티비티와 마찬가지로, 프래그먼트의 상태를 보존하려면 {@link
-android.os.Bundle}을 사용합니다. 이는 혹시나 액티비티의 프로세스가 종료되고 액티비티를
+android.os.Bundle}을 사용합니다. 이는 혹시나 액티비티의 프로세스가 종료되고 액티비티를
다시 만들 때 해당 프래그먼트의 상태를 복구해야 할 필요가 있을 때를 대비하는 것입니다. 상태를 저장하려면 프래그먼트의 {@link
-android.app.Fragment#onSaveInstanceState onSaveInstanceState()} 콜백 중에 저장할 수 있고, 복구는
+android.app.Fragment#onSaveInstanceState onSaveInstanceState()} 콜백 중에 저장할 수 있고, 복구는
{@link android.app.Fragment#onCreate onCreate()}, {@link
android.app.Fragment#onCreateView onCreateView()} 또는 {@link
-android.app.Fragment#onActivityCreated onActivityCreated()} 중 한 가지가 진행되는 동안 할 수 있습니다. 상태 저장에 관한 자세한 정보는
+android.app.Fragment#onActivityCreated onActivityCreated()} 중 한 가지가 진행되는 동안 할 수 있습니다. 상태 저장에 관한 자세한 정보는
<a href="{@docRoot}guide/components/activities.html#SavingActivityState">액티비티</a>
문서를 참조하십시오.</p>
-<p>액티비티와 프래그먼트의 수명 주기에서 가장 중대한 차이점은
-해당되는 백 스택에 저장되는 방법입니다. 액티비티는 중단되었을 때 시스템이 관리하는
-액티비티 백 스택 안에 배치되는 것이 기본입니다(따라서 사용자가 <em>뒤로</em> 버튼을 사용하여 다시 이 액티비티로
-뒤로 탐색할 수 있습니다. 이 내용은 <a href="{@docRoot}guide/components/tasks-and-back-stack.html">작업 및 백 스택</a>에서 설명하였습니다).
-하지만, 프래그먼트가 호스트 액티비티가 관리하는 백 스택 안에 배치되는 것은 해당 인스턴스를 저장하라고 명시적으로 요청하는 경우뿐입니다.
+<p>액티비티와 프래그먼트의 수명 주기에서 가장 중대한 차이점은
+해당되는 백 스택에 저장되는 방법입니다. 액티비티는 중단되었을 때 시스템이 관리하는
+액티비티 백 스택 안에 배치되는 것이 기본입니다(따라서 사용자가 <em>뒤로</em> 버튼을 사용하여 다시 이 액티비티로
+뒤로 탐색할 수 있습니다. 이 내용은 <a href="{@docRoot}guide/components/tasks-and-back-stack.html">작업 및 백 스택</a>에서 설명하였습니다).
+하지만, 프래그먼트가 호스트 액티비티가 관리하는 백 스택 안에 배치되는 것은 해당 인스턴스를 저장하라고 명시적으로 요청하는 경우뿐입니다.
이때 프래그먼트를 제거하는 트랜잭션 중 {@link
-android.app.FragmentTransaction#addToBackStack(String) addToBackStack()}을
+android.app.FragmentTransaction#addToBackStack(String) addToBackStack()}을
호출합니다.</p>
-<p>이것만 제외하면, 프래그먼트 수명 주기를 관리하는 것은 액티비티의 수명 주기를 관리하는 것과
-아주 비슷합니다. 따라서, <a href="{@docRoot}guide/components/activities.html#Lifecycle">액티비티
-수명 주기 관리</a>에 쓰이는 실례가 프래그먼트에도 똑같이 적용되는 것입니다. 하지만 또 한 가지 이해해두어야 하는 것이 있습니다. 즉,
+<p>이것만 제외하면, 프래그먼트 수명 주기를 관리하는 것은 액티비티의 수명 주기를 관리하는 것과
+아주 비슷합니다. 따라서, <a href="{@docRoot}guide/components/activities.html#Lifecycle">액티비티
+수명 주기 관리</a>에 쓰이는 실례가 프래그먼트에도 똑같이 적용되는 것입니다. 하지만 또 한 가지 이해해두어야 하는 것이 있습니다. 즉,
액티비티의 수명이 프래그먼트의 수명에 어떤 영향을 미치는지를 알아두어야 합니다.</p>
-<p class="caution"><strong>주의:</strong> {@link android.app.Fragment} 내에서 {@link android.content.Context}
-객체가 필요한 경우, {@link android.app.Fragment#getActivity()}를 호출하면 됩니다.
+<p class="caution"><strong>주의:</strong> {@link android.app.Fragment} 내에서 {@link android.content.Context}
+객체가 필요한 경우, {@link android.app.Fragment#getActivity()}를 호출하면 됩니다.
그러나 {@link android.app.Fragment#getActivity()}를 호출하는 것은 프래그먼트가 액티비티에
- 첨부되어 있는 경우뿐이니 유의하십시오. 프래그먼트가 아직 첨부되지 않았거나 수명 주기가 끝날 무렵 분리된 경우,
+ 첨부되어 있는 경우뿐이니 유의하십시오. 프래그먼트가 아직 첨부되지 않았거나 수명 주기가 끝날 무렵 분리된 경우,
{@link android.app.Fragment#getActivity()}가 null을 반환합니다.</p>
<h3 id="CoordinatingWithActivity">액티비티 수명 주기와 조화</h3>
-<p>프래그먼트가 있는 액티비티의 수명 주기는 해당 프래그먼트의 수명 주기에 직접적인
-영향을 미칩니다. 따라서 액티비티에 대한 각 수명 주기 콜백이 각 프래그먼트에 대한 비슷한 콜백을
-유발합니다. 예를 들어 액티비티가 {@link android.app.Activity#onPause}를 받으면,
+<p>프래그먼트가 있는 액티비티의 수명 주기는 해당 프래그먼트의 수명 주기에 직접적인
+영향을 미칩니다. 따라서 액티비티에 대한 각 수명 주기 콜백이 각 프래그먼트에 대한 비슷한 콜백을
+유발합니다. 예를 들어 액티비티가 {@link android.app.Activity#onPause}를 받으면,
해당 액티비티 내의 각 프래그먼트가 {@link android.app.Fragment#onPause}를 받습니다.</p>
-<p>하지만 프래그먼트에는 몇 가지 수명 주기 콜백이 더 있습니다. 이것은 액티비티와의
-고유한 상호 작용을 다루어 프래그먼트의 UI를 구축하고 소멸시키는 것과 같은
+<p>하지만 프래그먼트에는 몇 가지 수명 주기 콜백이 더 있습니다. 이것은 액티비티와의
+고유한 상호 작용을 다루어 프래그먼트의 UI를 구축하고 소멸시키는 것과 같은
작업을 수행합니다. 이러한 추가적인 콜백 메서드를 예로 들면 다음과 같습니다.</p>
<dl>
@@ -715,17 +715,17 @@
<dd>프래그먼트가 액티비티와 연결이 끊어지는 중일 때 호출됩니다.</dd>
</dl>
-<p>호스트 액티비티의 영향을 받을 프래그먼트 수명 주기의 흐름은 그림 3에서
-확인하십시오. 이 그림을 보면 액티비티의 각 연속된 상태가 프래그먼트가 어느
+<p>호스트 액티비티의 영향을 받을 프래그먼트 수명 주기의 흐름은 그림 3에서
+확인하십시오. 이 그림을 보면 액티비티의 각 연속된 상태가 프래그먼트가 어느
콜백 메서드를 받게 되는지 결정 짓는다는 것을 볼 수 있습니다. 예를 들어 액티비티가 자신의 {@link
-android.app.Activity#onCreate onCreate()} 콜백을 받은 경우, 해당 액티비티 안에 있는 프래그먼트는
+android.app.Activity#onCreate onCreate()} 콜백을 받은 경우, 해당 액티비티 안에 있는 프래그먼트는
{@link android.app.Fragment#onActivityCreated onActivityCreated()} 콜백을 받을 뿐입니다.</p>
-<p>액티비티가 재개된 상태에 도달하면 자유자재로 프래그먼트를 액티비티에 추가하거나 액티비티에서
-제거해도 됩니다. 따라서, 액티비티가 재개된 상태에 있는 동안에만 프래그먼트의 수명 주기를
+<p>액티비티가 재개된 상태에 도달하면 자유자재로 프래그먼트를 액티비티에 추가하거나 액티비티에서
+제거해도 됩니다. 따라서, 액티비티가 재개된 상태에 있는 동안에만 프래그먼트의 수명 주기를
독립적으로 변경할 수 있는 것입니다.</p>
-<p>그러나 액티비티가 재개된 상태를 떠나면 액티비티는 다시 프래그먼트를 그 수명 주기 안으로
+<p>그러나 액티비티가 재개된 상태를 떠나면 액티비티는 다시 프래그먼트를 그 수명 주기 안으로
밀어넣습니다.</p>
@@ -733,13 +733,13 @@
<h2 id="Example">예</h2>
-<p>이 문서에서 논의한 모든 것을 한 번에 모아 보기 위해, 다음은 두 개의 프래그먼트를 사용하여
-창이 두 개인 레이아웃을 생성하는 액티비티를 예시로 나타낸 것입니다. 아래의 액티비티에 포함된
-한 프래그먼트는 셰익스피어 희곡 제목 목록을 표시하고, 또 다른 하나는 목록에서 선택했을 때
-해당 희곡의 요약을 표시합니다. 또한 화면 구성을 근거로 프래그먼트를 여러 가지로 구성하여 제공하는 방법도
+<p>이 문서에서 논의한 모든 것을 한 번에 모아 보기 위해, 다음은 두 개의 프래그먼트를 사용하여
+창이 두 개인 레이아웃을 생성하는 액티비티를 예시로 나타낸 것입니다. 아래의 액티비티에 포함된
+한 프래그먼트는 셰익스피어 희곡 제목 목록을 표시하고, 또 다른 하나는 목록에서 선택했을 때
+해당 희곡의 요약을 표시합니다. 또한 화면 구성을 근거로 프래그먼트를 여러 가지로 구성하여 제공하는 방법도
보여줍니다.</p>
-<p class="note"><strong>참고:</strong> 이 액티비티에 대한 완전한 소스 코드는
+<p class="note"><strong>참고:</strong> 이 액티비티에 대한 완전한 소스 코드는
<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.html">{@code
FragmentLayout.java}</a>에서 이용하실 수 있습니다.</p>
@@ -752,44 +752,44 @@
{@sample development/samples/ApiDemos/res/layout-land/fragment_layout.xml layout}
-<p>시스템은 이 레이아웃을 사용하여 액티비티가 레이아웃을 로딩하자마자 {@code TitlesFragment}를 초기화합니다(이것이 희곡 제목을
+<p>시스템은 이 레이아웃을 사용하여 액티비티가 레이아웃을 로딩하자마자 {@code TitlesFragment}를 초기화합니다(이것이 희곡 제목을
목록으로 나열합니다). 반면 {@link android.widget.FrameLayout}
-(희곡 요약을 표시하는 프래그먼트가 배치될 곳)은 화면 오른쪽에 있는
-공간을 차지하기는 하지만 처음에는 텅 빈 상태로 유지됩니다. 아래에서 볼 수 있듯이, 사용자가 해당 목록에서
+(희곡 요약을 표시하는 프래그먼트가 배치될 곳)은 화면 오른쪽에 있는
+공간을 차지하기는 하지만 처음에는 텅 빈 상태로 유지됩니다. 아래에서 볼 수 있듯이, 사용자가 해당 목록에서
항목을 하나 선택해야만 프래그먼트가 {@link android.widget.FrameLayout} 안에 배치됩니다.</p>
-<p>그러나 희곡 목록과 요약을 둘 다 나란히 표시할 만큼 너비가 넓지 않은
-화면 구성도 있습니다. 따라서 위의 레이아웃은 가로 방향 화면 구성에만 사용되며,
+<p>그러나 희곡 목록과 요약을 둘 다 나란히 표시할 만큼 너비가 넓지 않은
+화면 구성도 있습니다. 따라서 위의 레이아웃은 가로 방향 화면 구성에만 사용되며,
이를 {@code res/layout-land/fragment_layout.xml}에 저장하여 씁니다.</p>
-<p>그러므로 화면이 세로 방향으로 구성된 경우, 시스템은 다음 레이아웃을 적용합니다. 이것은
+<p>그러므로 화면이 세로 방향으로 구성된 경우, 시스템은 다음 레이아웃을 적용합니다. 이것은
{@code res/layout/fragment_layout.xml}에 저장되어 있습니다.</p>
{@sample development/samples/ApiDemos/res/layout/fragment_layout.xml layout}
-<p>이 레이아웃에는 {@code TitlesFragment}만 포함되어 있습니다. 이는 다시 말해 기기가 세로 방향인 경우에는
-희곡 제목 목록만 표시된다는 뜻입니다. 따라서 사용자가 이 구성에서 목록 항목을 하나 클릭하면,
-애플리케이션이 두 번째 프래그먼트를 로딩하는 대신 새 액티비티를 시작하여 요약을
+<p>이 레이아웃에는 {@code TitlesFragment}만 포함되어 있습니다. 이는 다시 말해 기기가 세로 방향인 경우에는
+희곡 제목 목록만 표시된다는 뜻입니다. 따라서 사용자가 이 구성에서 목록 항목을 하나 클릭하면,
+애플리케이션이 두 번째 프래그먼트를 로딩하는 대신 새 액티비티를 시작하여 요약을
표시하게 됩니다.</p>
<p>다음으로, 프래그먼트 클래스에서 이것을 달성하는 방법을 보시겠습니다. 첫 번째가 {@code
TitlesFragment}로, 셰익스피어 희곡 제목 목록을 표시하는 것입니다. 이 프래그먼트는 {@link
android.app.ListFragment}를 확장하며 목록 보기 작업의 대부분을 처리하기 위해 여기에 의존합니다.</p>
-<p>이 코드를 살펴보면서 사용자가 목록 항목을 클릭하면 일어날 수 있는 두 가지 동작이
-있다는 점을 눈여겨 보십시오. 두 레이아웃 중 어느 것이 활성화 상태인지에 따라
+<p>이 코드를 살펴보면서 사용자가 목록 항목을 클릭하면 일어날 수 있는 두 가지 동작이
+있다는 점을 눈여겨 보십시오. 두 레이아웃 중 어느 것이 활성화 상태인지에 따라
같은 액티비티 내에서 세부 사항을 표시하기 위해 새 프래그먼트를 생성하거나 표시할 수도 있고(프래그먼트를 {@link
android.widget.FrameLayout}에 추가함으로써), 새 액티비티를 시작할 수도 있습니다(프래그먼트를 표시할 수 있는 곳).</p>
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java titles}
-<p>두 번째 프래그먼트인 {@code DetailsFragment}는 {@code TitlesFragment}에서 가져온 목록에서 선택한 항목에 대한 희곡 요약을
+<p>두 번째 프래그먼트인 {@code DetailsFragment}는 {@code TitlesFragment}에서 가져온 목록에서 선택한 항목에 대한 희곡 요약을
표시하는 것입니다.</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
-<p>{@code TitlesFragment} 클래스에서 다룬 것을 되살려 보면, 사용자가 목록 항목을 클릭하고
-현재 레이아웃이 {@code R.id.details} 보기를 포함하지 <em>않는</em> 경우(이 보기가
+<p>{@code TitlesFragment} 클래스에서 다룬 것을 되살려 보면, 사용자가 목록 항목을 클릭하고
+현재 레이아웃이 {@code R.id.details} 보기를 포함하지 <em>않는</em> 경우(이 보기가
{@code DetailsFragment}가 속하는 곳임), 애플리케이션은 항목의 내용을 표시하기 위해 {@code DetailsActivity}
액티비티를 시작하게 됩니다.</p>
@@ -798,14 +798,14 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
-<p>이 액티비티는 구성이 가로 방향인 경우 알아서 종료한다는 점을 눈여겨 보십시오. 따라서
+
+<p>이 액티비티는 구성이 가로 방향인 경우 알아서 종료한다는 점을 눈여겨 보십시오. 따라서
주요 액티비티가 작업을 인계 받아 {@code DetailsFragment}를 {@code TitlesFragment}와 함께 표시할 수 있는 것입니다.
-이것은 사용자가 세로 방향 구성에서 {@code DetailsActivity}를 시작했지만
+이것은 사용자가 세로 방향 구성에서 {@code DetailsActivity}를 시작했지만
그런 다음 가로 방향으로 돌리는 경우(현재 액티비티를 다시 시작함) 일어날 수 있습니다.</p>
-<p>프래그먼트 사용에 대한 더 많은 샘플(및 이 예시에 대한 완전한 소스 파일)을 보시려면
+<p>프래그먼트 사용에 대한 더 많은 샘플(및 이 예시에 대한 완전한 소스 파일)을 보시려면
<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/index.html#Fragment">
ApiDemos</a>에서 이용할 수 있는 API Demos 샘플 앱을 참조하십시오(<a href="{@docRoot}resources/samples/get.html">샘플 SDK 구성 요소</a>에서 다운로드할 수 있습니다).</p>
diff --git a/docs/html-intl/intl/ko/guide/components/fundamentals.jd b/docs/html-intl/intl/ko/guide/components/fundamentals.jd
index 608b5a2c..6bb5a9f 100644
--- a/docs/html-intl/intl/ko/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/ko/guide/components/fundamentals.jd
@@ -22,54 +22,54 @@
</div>
</div>
-<p>Android 앱은 Java 프로그래밍 언어로 작성됩니다. Android SDK 도구는
+<p>Android 앱은 Java 프로그래밍 언어로 작성됩니다. Android SDK 도구는
코드를 컴파일링하여 모든 데이터 및 리소스 파일과 함께 하나의 APK로 만듭니다. 이것은 즉, <i>Android 패키지</i>
-를 뜻하며, 이는 일종의 {@code .apk} 접미사가 있는 아카이브 파일입니다. 한 개의 APK 파일에는
+를 뜻하며, 이는 일종의 {@code .apk} 접미사가 있는 아카이브 파일입니다. 한 개의 APK 파일에는
Android 앱의 모든 콘텐츠가 들어 있으며 이 파일이 바로 Android로 구동하는 기기가 앱을 설치할 때 사용하는 파일입니다.</p>
<p>Android 앱은 일단 기기에 설치되고 나면 각자 나름의 보안 샌드박스 안에 살게 됩니다. </p>
<ul>
- <li>Android 운영 체제는 멀티 사용자 Linux 시스템으로, 여기서 각 앱은 각기 다른 사용자와
+ <li>Android 운영 체제는 멀티 사용자 Linux 시스템으로, 여기서 각 앱은 각기 다른 사용자와
같습니다.</li>
-<li>기본적으로 시스템이 각 앱에 고유한 Linux ID를 할당합니다(이 ID는 시스템만
-사용할 수 있으며 앱은 이것을 알지 못합니다). 시스템은 앱 안의 모든 파일에 대해 권한을 설정하여
+<li>기본적으로 시스템이 각 앱에 고유한 Linux ID를 할당합니다(이 ID는 시스템만
+사용할 수 있으며 앱은 이것을 알지 못합니다). 시스템은 앱 안의 모든 파일에 대해 권한을 설정하여
해당 앱에 할당된 사용자 ID만 이에 액세스할 수 있도록 합니다. </li>
-<li>각 프로세스에는 나름의 가상 머신(VM)이 있고, 그렇기 때문에 한 앱의 코드가 다른 여러 앱과는 격리된 상태로
+<li>각 프로세스에는 나름의 가상 머신(VM)이 있고, 그렇기 때문에 한 앱의 코드가 다른 여러 앱과는 격리된 상태로
실행됩니다.</li>
-<li>기본적으로 모든 앱이 나름의 Linux 프로세스에서 실행됩니다. Android는 앱의 구성 요소 중
-어느 것이라도 실행해야 하는 경우 프로세스를 시작하고, 이것이 더 이상 필요 없어지거나 시스템이 다른 앱을 위해
+<li>기본적으로 모든 앱이 나름의 Linux 프로세스에서 실행됩니다. Android는 앱의 구성 요소 중
+어느 것이라도 실행해야 하는 경우 프로세스를 시작하고, 이것이 더 이상 필요 없어지거나 시스템이 다른 앱을 위해
메모리를 회복해야 하는 경우 해당 프로세스를 종료합니다.</li>
</ul>
-<p>Android 시스템은 이런 방식으로 <em>최소 특권의 원리</em>를 구현하는 것입니다. 다시 말해,
-각 앱은 기본적으로 자신의 작업을 수행하기 위해 필요한 구성 요소에만 액세스 권한을 가지고
-그 이상은 허용되지 않습니다. 이렇게 하면 대단히 안전한 환경이 만들어져 앱이 시스템에서
+<p>Android 시스템은 이런 방식으로 <em>최소 특권의 원리</em>를 구현하는 것입니다. 다시 말해,
+각 앱은 기본적으로 자신의 작업을 수행하기 위해 필요한 구성 요소에만 액세스 권한을 가지고
+그 이상은 허용되지 않습니다. 이렇게 하면 대단히 안전한 환경이 만들어져 앱이 시스템에서
자신이 권한을 부여 받지 못한 부분에는 액세스할 수 없게 됩니다.</p>
-<p>그러나, 앱이 다른 여러 앱과 데이터를 공유하는 것과 앱이 시스템 서비스에 액세스하는 데에는
+<p>그러나, 앱이 다른 여러 앱과 데이터를 공유하는 것과 앱이 시스템 서비스에 액세스하는 데에는
여러 가지 방법이 있습니다.</p>
<ul>
- <li>두 개의 앱이 같은 Linux 사용자 ID를 공유하도록 설정할 수도 있습니다. 이 경우
-두 앱은 서로의 파일에 액세스할 수 있게 됩니다. 시스템 리소스를 절약하려면, 같은 사용자 ID를 가진 앱이
-같은 Linux 프로세스에서 실행되도록 설정하고 같은 VM을 공유하도록 할 수도 있습니다(이들 앱은 같은 인증서로
+ <li>두 개의 앱이 같은 Linux 사용자 ID를 공유하도록 설정할 수도 있습니다. 이 경우
+두 앱은 서로의 파일에 액세스할 수 있게 됩니다. 시스템 리소스를 절약하려면, 같은 사용자 ID를 가진 앱이
+같은 Linux 프로세스에서 실행되도록 설정하고 같은 VM을 공유하도록 할 수도 있습니다(이들 앱은 같은 인증서로
서명해야 합니다).</li>
- <li>앱은 사용자의 연락처, SMS 메시지, 마운트 가능한 저장소(SD 카드),
-카메라, Bluetooth를 비롯하여 이외에도 여러 가지 기기 데이터에 액세스할 권한을 요청할 수 있습니다. 모든
+ <li>앱은 사용자의 연락처, SMS 메시지, 마운트 가능한 저장소(SD 카드),
+카메라, Bluetooth를 비롯하여 이외에도 여러 가지 기기 데이터에 액세스할 권한을 요청할 수 있습니다. 모든
앱 권한은 설치 시점에 사용자가 허용해야 합니다.</li>
</ul>
-<p>이렇게 해서 Android 앱이 시스템 내에 어떤 식으로 존재하는지 기본 정보를 알아보았습니다. 이 문서의
+<p>이렇게 해서 Android 앱이 시스템 내에 어떤 식으로 존재하는지 기본 정보를 알아보았습니다. 이 문서의
나머지 부분에서 소개될 내용은 다음과 같습니다.</p>
<ul>
<li>앱을 정의하는 핵심 프레임워크 구성 요소.</li>
- <li>구성 요소를 선언하고 앱에 맞는 필수 기기 특징을 선언할 수 있는 매니페스트
+ <li>구성 요소를 선언하고 앱에 맞는 필수 기기 특징을 선언할 수 있는 매니페스트
파일.</li>
- <li>앱 코드로부터 별도로 분리되어 있으며 앱이 다양한 기기 구성에 맞게 자신의 행동을
+ <li>앱 코드로부터 별도로 분리되어 있으며 앱이 다양한 기기 구성에 맞게 자신의 행동을
안정적으로 최적화할 수 있도록 해주는 리소스.</li>
</ul>
@@ -77,13 +77,13 @@
<h2 id="Components">앱 구성 요소</h2>
-<p>앱 구성 요소는 Android 앱을 이루는 가장 기본적인 구성 단위입니다. 각
-구성 요소는 시스템이 앱으로 들어올 수 있는 각기 다른 통과 지점을 나타냅니다. 구성 요소 중에는
-실제 사용자가 쓸 수 있는 진입 지점이 아닌 것도 있고, 일부는 서로에게 의존하지만,
-각각의 구성 요소는 따로 떨어진 엔티티로서 존재하며 각기 특정한 역할을 수행합니다. 즉 하나하나가
+<p>앱 구성 요소는 Android 앱을 이루는 가장 기본적인 구성 단위입니다. 각
+구성 요소는 시스템이 앱으로 들어올 수 있는 각기 다른 통과 지점을 나타냅니다. 구성 요소 중에는
+실제 사용자가 쓸 수 있는 진입 지점이 아닌 것도 있고, 일부는 서로에게 의존하지만,
+각각의 구성 요소는 따로 떨어진 엔티티로서 존재하며 각기 특정한 역할을 수행합니다. 즉 하나하나가
앱의 전반적인 행동을 정의하는 데 유용한 고유한 구성 단위인 것입니다.</p>
-<p>앱 구성 요소에는 네 가지 서로 다른 유형이 있습니다. 각 유형이 뚜렷한 목적을 가지고 있으며
+<p>앱 구성 요소에는 네 가지 서로 다른 유형이 있습니다. 각 유형이 뚜렷한 목적을 가지고 있으며
각자 나름의 수명 주기가 있어 구성 요소의 생성 및 소멸 방식을 정의합니다.</p>
<p>다음은 네 가지 유형의 앱 구성 요소를 나타낸 것입니다.</p>
@@ -92,15 +92,15 @@
<dt><b>액티비티</b></dt>
-<dd>통상 <i>액티비티</i> 라고 하면, 사용자 인터페이스가 있는 화면 하나를 나타냅니다. 예를 들어
-이메일 앱이라면 새 이메일 목록을 표시하는 액티비티가 하나 있고,
-이메일을 작성하는 액티비티가 또 하나, 그리고 이메일을 읽는 데 쓰는 액티비티가 또 하나 있을 수 있습니다. 여러
-액티비티가 함께 작동하여 해당 이메일 앱에서 짜임새 있는 사용자 환경을 형성하는 것은 사실이지만, 각자 서로와는
-독립적인 형태입니다. 따라서, 다른 앱이 이와 같은 액티비티 중 어느 것이라도 하나만
-시작할 수 있습니다(이메일 앱이 그렇게 하도록 허용하는 경우). 예를 들어, 카메라 앱이라면 이메일 앱 안의
+<dd>통상 <i>액티비티</i> 라고 하면, 사용자 인터페이스가 있는 화면 하나를 나타냅니다. 예를 들어
+이메일 앱이라면 새 이메일 목록을 표시하는 액티비티가 하나 있고,
+이메일을 작성하는 액티비티가 또 하나, 그리고 이메일을 읽는 데 쓰는 액티비티가 또 하나 있을 수 있습니다. 여러
+액티비티가 함께 작동하여 해당 이메일 앱에서 짜임새 있는 사용자 환경을 형성하는 것은 사실이지만, 각자 서로와는
+독립적인 형태입니다. 따라서, 다른 앱이 이와 같은 액티비티 중 어느 것이라도 하나만
+시작할 수 있습니다(이메일 앱이 그렇게 하도록 허용하는 경우). 예를 들어, 카메라 앱이라면 이메일 앱 안의
액티비티를 시작하여 새 메일을 작성하도록 해서 사용자가 사진을 공유하도록 할 수 있습니다.
-<p>액티비티는 {@link android.app.Activity}의 하위 클래스로 구현되며 이에 대한 더 자세한 내용은
+<p>액티비티는 {@link android.app.Activity}의 하위 클래스로 구현되며 이에 대한 더 자세한 내용은
<a href="{@docRoot}guide/components/activities.html">액티비티</a>
개발자 가이드에서 확인하실 수 있습니다.</p>
</dd>
@@ -108,14 +108,14 @@
<dt><b>서비스</b></dt>
-<dd>통상 <i>서비스</i> 라고 하면 배경에서 실행되는 구성 요소로, 오랫동안 실행되는
-작업을 수행하거나 원격 프로세스를 위한 작업을 수행하는 것입니다. 서비스는
-사용자 인터페이스를 제공하지 않습니다. 예를 들어 서비스는 사용자가 다른 앱에 있는 동안에 배경에서 음악을 재생할 수도 있고,
-아니면 사용자와 액티비티 사이의 상호 작용을 차단하지 않고 네트워크를 가로질러
-데이터를 가져올 수도 있습니다. 또 다른 구성 요소(예: 액티비티)가 서비스를 시작한 다음
+<dd>통상 <i>서비스</i> 라고 하면 배경에서 실행되는 구성 요소로, 오랫동안 실행되는
+작업을 수행하거나 원격 프로세스를 위한 작업을 수행하는 것입니다. 서비스는
+사용자 인터페이스를 제공하지 않습니다. 예를 들어 서비스는 사용자가 다른 앱에 있는 동안에 배경에서 음악을 재생할 수도 있고,
+아니면 사용자와 액티비티 사이의 상호 작용을 차단하지 않고 네트워크를 가로질러
+데이터를 가져올 수도 있습니다. 또 다른 구성 요소(예: 액티비티)가 서비스를 시작한 다음
실행되도록 두거나 자신에게 바인딩하여 상호 작용하도록 할 수도 있습니다.
-<p>서비스는 {@link android.app.Service}의 하위 클래스로 구현되며 이에 대한 더 자세한 내용은
+<p>서비스는 {@link android.app.Service}의 하위 클래스로 구현되며 이에 대한 더 자세한 내용은
<a href="{@docRoot}guide/components/services.html">서비스</a>
개발자 가이드에서 확인하실 수 있습니다.</p>
</dd>
@@ -123,20 +123,20 @@
<dt><b>콘텐츠 제공자</b></dt>
-<dd>통상 <i>콘텐츠 제공자</i> 는 공유된 앱 데이터 집합을 관리합니다. 데이터는 파일 시스템이나 SQLite 데이터베이스,
-또는 웹이나 기타 영구적인 저장소 위치 중 앱이 액세스할 수 있는 곳이라면 어디에든 저장할 수
-있습니다. 다른 여러 앱은 콘텐츠 제공자를 통해 해당 데이터를 쿼리하거나, 심지어는 수정할 수도
-있습니다(콘텐츠 제공자가 그렇게 하도록 허용하는 경우). 예를 들어, Android 시스템은 사용자의 연락처 정보를
-관리하는 콘텐츠 제공자를 제공합니다. 따라서, 적절한 권한을 가진 앱이라면
+<dd>통상 <i>콘텐츠 제공자</i> 는 공유된 앱 데이터 집합을 관리합니다. 데이터는 파일 시스템이나 SQLite 데이터베이스,
+또는 웹이나 기타 영구적인 저장소 위치 중 앱이 액세스할 수 있는 곳이라면 어디에든 저장할 수
+있습니다. 다른 여러 앱은 콘텐츠 제공자를 통해 해당 데이터를 쿼리하거나, 심지어는 수정할 수도
+있습니다(콘텐츠 제공자가 그렇게 하도록 허용하는 경우). 예를 들어, Android 시스템은 사용자의 연락처 정보를
+관리하는 콘텐츠 제공자를 제공합니다. 따라서, 적절한 권한을 가진 앱이라면
어떤 것이든 해당 콘텐츠 제공자의 일부를 쿼리하여(예를 들어 {@link
android.provider.ContactsContract.Data} 등) 특정한 사람에 대한 정보를 읽고 쓸 수 있습니다.
-<p>콘텐츠 제공자는 앱에서 비공개이며 공유되지 않는 데이터를 읽고 쓰는 데에도
-유용합니다. 예를 들어 <a href="{@docRoot}resources/samples/NotePad/index.html">메모장</a> 샘플 앱은 메모한 내용을 저장하는 데
+<p>콘텐츠 제공자는 앱에서 비공개이며 공유되지 않는 데이터를 읽고 쓰는 데에도
+유용합니다. 예를 들어 <a href="{@docRoot}resources/samples/NotePad/index.html">메모장</a> 샘플 앱은 메모한 내용을 저장하는 데
콘텐츠 제공자를 사용합니다.</p>
<p>콘텐츠 제공자는 {@link android.content.ContentProvider}의
-하위 클래스로 구현되며, 다른 앱이 트랜잭션을 수행할 수 있도록 활성화하는 표준 API 집합을
+하위 클래스로 구현되며, 다른 앱이 트랜잭션을 수행할 수 있도록 활성화하는 표준 API 집합을
구현해야 합니다. 자세한 내용은 <a href="{@docRoot}guide/topics/providers/content-providers.html">콘텐츠 제공자</a> 개발자
가이드를 참조하십시오.</p>
</dd>
@@ -144,18 +144,18 @@
<dt><b>브로드캐스트 수신기</b></dt>
-<dd>통상 <i>브로드캐스트 수신기</i> 는 시스템 전체에 대한 브로드캐스트 공지에 응답하는 구성 요소를
-말합니다. 대다수의 브로드캐스트는 시스템에서 시작합니다. 예를 들어, 화면이 꺼졌다거나
+<dd>통상 <i>브로드캐스트 수신기</i> 는 시스템 전체에 대한 브로드캐스트 공지에 응답하는 구성 요소를
+말합니다. 대다수의 브로드캐스트는 시스템에서 시작합니다. 예를 들어, 화면이 꺼졌다거나
배터리 잔량이 부족하다거나, 사진을 캡처했다는 것을 알리는 브로드캐스트가 있습니다.
-앱도 브로드캐스트를 시작합니다. 예를 들어, 기기에 몇 가지 데이터를 다운로드하여 다른 앱도 사용할 수 있다는
-사실을 다른 여러 앱에게 알리는 것입니다. 브로드캐스트 수신기는 사용자 인터페이스를 표시하지 않지만,
-<a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 표시줄 알림을 생성</a>하여
-사용자에게 브로드캐스트 이벤트가 발생했다고 알릴 수 있습니다. 다만 브로드캐스트 수신기는
-그저 다른 구성 요소로의 "게이트웨이"인 경우가 더 보편적이고, 극소량의 작업만 수행하도록 만들어진 경우가 많습니다. 예컨대
+앱도 브로드캐스트를 시작합니다. 예를 들어, 기기에 몇 가지 데이터를 다운로드하여 다른 앱도 사용할 수 있다는
+사실을 다른 여러 앱에게 알리는 것입니다. 브로드캐스트 수신기는 사용자 인터페이스를 표시하지 않지만,
+<a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 표시줄 알림을 생성</a>하여
+사용자에게 브로드캐스트 이벤트가 발생했다고 알릴 수 있습니다. 다만 브로드캐스트 수신기는
+그저 다른 구성 요소로의 "게이트웨이"인 경우가 더 보편적이고, 극소량의 작업만 수행하도록 만들어진 경우가 많습니다. 예컨대
서비스를 시작하여 이벤트를 근거로 한 어떤 작업을 수행하도록 할 수 있습니다.
-<p>브로드캐스트 수신기는 {@link android.content.BroadcastReceiver}의
-하위 클래스로 구현되며 각 브로드캐스트는 {@link android.content.Intent} 객체로 전달됩니다. 자세한 정보는
+<p>브로드캐스트 수신기는 {@link android.content.BroadcastReceiver}의
+하위 클래스로 구현되며 각 브로드캐스트는 {@link android.content.Intent} 객체로 전달됩니다. 자세한 정보는
{@link android.content.BroadcastReceiver} 클래스를 참조하십시오.</p>
</dd>
@@ -163,72 +163,72 @@
-<p>Android 시스템 디자인의 독특한 점으로 어떤 앱이든 다른 앱의 구성 요소를 시작할 수 있다는 점을
-들 수 있습니다. 예를 들어 사용자가 기기 카메라로 사진을 캡처하기를 바라는 경우,
-그런 작업을 수행하는 또 다른 앱이 있을 가능성이 높습니다. 그러면 사진을 캡처하는 액티비티를 직접 개발하는 대신
-여러분의 앱이 그 앱을 사용하도록 하면 됩니다. 카메라 앱에
+<p>Android 시스템 디자인의 독특한 점으로 어떤 앱이든 다른 앱의 구성 요소를 시작할 수 있다는 점을
+들 수 있습니다. 예를 들어 사용자가 기기 카메라로 사진을 캡처하기를 바라는 경우,
+그런 작업을 수행하는 또 다른 앱이 있을 가능성이 높습니다. 그러면 사진을 캡처하는 액티비티를 직접 개발하는 대신
+여러분의 앱이 그 앱을 사용하도록 하면 됩니다. 카메라 앱에
통합하기는커녕 카메라 앱의 코드에 연결시킬 필요조차도 없습니다.
-그 대신, 그저 사진을 캡처하는 카메라 앱 안의 해당 액티비티를 시작하기만 하면
-됩니다. 작업이 완료되면 사진이 앱으로 반환되기까지 하여 바로 사용할 수 있습니다. 사용자에게는,
+그 대신, 그저 사진을 캡처하는 카메라 앱 안의 해당 액티비티를 시작하기만 하면
+됩니다. 작업이 완료되면 사진이 앱으로 반환되기까지 하여 바로 사용할 수 있습니다. 사용자에게는,
마치 카메라가 여러분의 앱의 일부분인 것처럼 보입니다.</p>
-<p>시스템이 구성 요소를 시작하는 경우, 그 앱에 대한 프로세스를 시작하는 것이며(이미
-실행 중이지 않은 경우), 해당 구성 요소에 필요한 클래스를 인스턴트화하는 것입니다. 예를 들어 여러분의 앱이
-카메라 앱 내에서 사진을 캡처하는 액티비티를 시작한다고 하면, 해당 액티비티는
-여러분 앱의 프로세스가 아니라 카메라 앱에 속한 프로세스에서 실행됩니다.
-따라서 대부분의 다른 시스템에서와는 달리 Android 앱에는 단일한 진입
+<p>시스템이 구성 요소를 시작하는 경우, 그 앱에 대한 프로세스를 시작하는 것이며(이미
+실행 중이지 않은 경우), 해당 구성 요소에 필요한 클래스를 인스턴트화하는 것입니다. 예를 들어 여러분의 앱이
+카메라 앱 내에서 사진을 캡처하는 액티비티를 시작한다고 하면, 해당 액티비티는
+여러분 앱의 프로세스가 아니라 카메라 앱에 속한 프로세스에서 실행됩니다.
+따라서 대부분의 다른 시스템에서와는 달리 Android 앱에는 단일한 진입
지점이 없습니다(예를 들어 {@code main()} 기능이 없습니다).</p>
-<p>시스템이 각 앱을 별도의 프로세스에서 실행하며 다른 앱에 대한 액세스를 제한하는
-파일 권한을 가지고 실행하기 때문에 여러분의 앱은 또 다른 앱에서 곧바로 구성 요소를
-활성화할 수는 없습니다. 하지만 Android 시스템은 할 수 있습니다. 그래서 또 다른 앱에 있는
-구성 요소를 활성화하려면 시스템에 메시지를 전달하여 특정 구성 요소를 시작하고자 하는 <em>인텐트</em>를
+<p>시스템이 각 앱을 별도의 프로세스에서 실행하며 다른 앱에 대한 액세스를 제한하는
+파일 권한을 가지고 실행하기 때문에 여러분의 앱은 또 다른 앱에서 곧바로 구성 요소를
+활성화할 수는 없습니다. 하지만 Android 시스템은 할 수 있습니다. 그래서 또 다른 앱에 있는
+구성 요소를 활성화하려면 시스템에 메시지를 전달하여 특정 구성 요소를 시작하고자 하는 <em>인텐트</em>를
밝혀야 합니다. 그러면 시스템이 대신 해당 구성 요소를 활성화해줍니다.</p>
<h3 id="ActivatingComponents">구성 요소 활성화</h3>
-<p>네 가지 구성 요소 중 세 가지—액티비티, 서비스 및
+<p>네 가지 구성 요소 중 세 가지—액티비티, 서비스 및
브로드캐스트 수신기—는 일명 <em>인텐트</em>라고 하는 비동기식 메시지가 활성화합니다.
-인텐트는 각각의 구성 요소를 런타임에 서로 바인딩하며(다른 구성 요소로부터 작업을 요청하는
-일종의 메신저로 생각하면 됩니다), 이는 구성 요소가 여러분의 앱에 속하든 아니든
+인텐트는 각각의 구성 요소를 런타임에 서로 바인딩하며(다른 구성 요소로부터 작업을 요청하는
+일종의 메신저로 생각하면 됩니다), 이는 구성 요소가 여러분의 앱에 속하든 아니든
무관합니다.</p>
-<p>인텐트는 {@link android.content.Intent} 객체로 생성되며, 이것이
-특정 구성 요소를 활성화할지 아니면 구성 요소의 특정 <em>유형</em>을 활성화할지를 나타내는 메시지를 정의합니다. 인텐트는
+<p>인텐트는 {@link android.content.Intent} 객체로 생성되며, 이것이
+특정 구성 요소를 활성화할지 아니면 구성 요소의 특정 <em>유형</em>을 활성화할지를 나타내는 메시지를 정의합니다. 인텐트는
각각 명시적이거나 암시적일 수 있습니다.</p>
-<p>액티비티와 서비스의 경우, 인텐트는 수행할 작업을 정의하며(예를 들어 무언가를 '보기" 또는
-"보내기"), 작업을 수행할 데이터의 URI를 나타낼 수 있습니다(시작되는 구성 요소가 알아야 할 것은
-이외에도 많이 있습니다). 예를 들어, 인텐트는 액티비티에 이미지를 표시하거나 웹 페이지를 열라는 요청을
-전달할 수 있습니다. 어떤 경우에는 액티비티를 시작하여
-결과를 받아오도록 할 수 있습니다. 이런 경우 이 액티비티는
-{@link android.content.Intent}로 결과를 반환하기도 합니다(예를 들어, 사용자가
-개인적인 연락처를 선택하도록 한 다음 그것을 반환하도록 하는 인텐트를 발행할 수 있습니다—반환 인텐트에
+<p>액티비티와 서비스의 경우, 인텐트는 수행할 작업을 정의하며(예를 들어 무언가를 '보기" 또는
+"보내기"), 작업을 수행할 데이터의 URI를 나타낼 수 있습니다(시작되는 구성 요소가 알아야 할 것은
+이외에도 많이 있습니다). 예를 들어, 인텐트는 액티비티에 이미지를 표시하거나 웹 페이지를 열라는 요청을
+전달할 수 있습니다. 어떤 경우에는 액티비티를 시작하여
+결과를 받아오도록 할 수 있습니다. 이런 경우 이 액티비티는
+{@link android.content.Intent}로 결과를 반환하기도 합니다(예를 들어, 사용자가
+개인적인 연락처를 선택하도록 한 다음 그것을 반환하도록 하는 인텐트를 발행할 수 있습니다—반환 인텐트에
선택한 연락처를 가리키는 URI가 포함됩니다).</p>
-<p>브로드캐스트 수신기의 경우, 인텐트는 단순히 브로드캐스트될 알림을
-정의할 뿐입니다(예를 들어, 기기 배터리 잔량이 낮다는 것을 나타내는 브로드캐스트에는
+<p>브로드캐스트 수신기의 경우, 인텐트는 단순히 브로드캐스트될 알림을
+정의할 뿐입니다(예를 들어, 기기 배터리 잔량이 낮다는 것을 나타내는 브로드캐스트에는
"배터리 부족"을 나타내는 알려진 작업 문자열만 포함됩니다).</p>
-<p>남은 하나의 구성 요소 유형, 즉 콘텐츠 제공자는 인텐트가 활성화하지 않습니다. 그보다는
-{@link android.content.ContentResolver}로부터의 요청으로 지정되면 활성화됩니다. 콘텐츠
-확인자는 콘텐츠 제공자와의 모든 직접적인 트랜잭션을 처리하여
+<p>남은 하나의 구성 요소 유형, 즉 콘텐츠 제공자는 인텐트가 활성화하지 않습니다. 그보다는
+{@link android.content.ContentResolver}로부터의 요청으로 지정되면 활성화됩니다. 콘텐츠
+확인자는 콘텐츠 제공자와의 모든 직접적인 트랜잭션을 처리하여
제공자와의 트랜잭션을 수행하는 구성 요소가 그런 일을 하지 않아도 되게 하고, 그 대신 {@link
-android.content.ContentResolver} 객체에서 메서드를 호출합니다. 이렇게 되면 콘텐츠 제공자와
+android.content.ContentResolver} 객체에서 메서드를 호출합니다. 이렇게 되면 콘텐츠 제공자와
정보를 요청하는 구성 요소 사이에 추상화 계층이 하나 남습니다(보안 목적).</p>
<p>각 유형의 구성 요소를 활성화하는 데에는 각기 별도의 메서드가 있습니다.</p>
<ul>
- <li>액티비티를 시작하려면(아니면 무언가 새로운 할 일을 주려면)
+ <li>액티비티를 시작하려면(아니면 무언가 새로운 할 일을 주려면)
{@link android.content.Intent}를 {@link android.content.Context#startActivity
-startActivity()} 또는 {@link android.app.Activity#startActivityForResult startActivityForResult()}에
+startActivity()} 또는 {@link android.app.Activity#startActivityForResult startActivityForResult()}에
전달하면 됩니다(액티비티가 결과를 반환하기를 원하는 경우).</li>
- <li>서비스를 시작하려면(또는 진행 중인 서비스에 새로운 지침을 주려면)
+ <li>서비스를 시작하려면(또는 진행 중인 서비스에 새로운 지침을 주려면)
{@link android.content.Intent}를 {@link android.content.Context#startService
-startService()}에 전달하면 됩니다. 아니면 {@link android.content.Intent}를
+startService()}에 전달하면 됩니다. 아니면 {@link android.content.Intent}를
{@link android.content.Context#bindService bindService()}에 전달하여 서비스에 바인딩할 수도 있습니다.</li>
- <li>브로드캐스트를 시작하려면 {@link android.content.Intent}를
+ <li>브로드캐스트를 시작하려면 {@link android.content.Intent}를
{@link android.content.Context#sendBroadcast(Intent) sendBroadcast()}, {@link
android.content.Context#sendOrderedBroadcast(Intent, String) sendOrderedBroadcast()} 또는 {@link
android.content.Context#sendStickyBroadcast sendStickyBroadcast()}와 같은 메서드에 전달하면 됩니다.</li>
@@ -236,29 +236,29 @@
android.content.ContentProvider#query query()}를 호출하면 됩니다.</li>
</ul>
-<p>인텐트 사용에 관한 자세한 정보는 <a href="{@docRoot}guide/components/intents-filters.html">인텐트 및
-인텐트 필터</a>문서를 참조하십시오. 특정 구성 요소를 활성화하는 데 관한 자세한 정보 또한 다음 문서에
+<p>인텐트 사용에 관한 자세한 정보는 <a href="{@docRoot}guide/components/intents-filters.html">인텐트 및
+인텐트 필터</a>문서를 참조하십시오. 특정 구성 요소를 활성화하는 데 관한 자세한 정보 또한 다음 문서에
제공되어 있습니다. <a href="{@docRoot}guide/components/activities.html">액티비티</a>, <a href="{@docRoot}guide/components/services.html">서비스</a>, {@link
android.content.BroadcastReceiver} 및 <a href="{@docRoot}guide/topics/providers/content-providers.html">콘텐츠 제공자</a>.</p>
<h2 id="Manifest">매니페스트 파일</h2>
-<p>Android 시스템이 앱 구성 요소를 시작하려면 시스템은 우선 해당 구성 요소가
+<p>Android 시스템이 앱 구성 요소를 시작하려면 시스템은 우선 해당 구성 요소가
존재하는지 알아야 합니다. 그러기 위해 앱의 {@code AndroidManifest.xml} 파일을 읽습니다(즉 "매니페스트"
-파일). 앱은 이 파일 안에 모든 구성 요소를 선언해야 하며, 이 파일은 앱 프로젝트 디렉터리의 루트에
+파일). 앱은 이 파일 안에 모든 구성 요소를 선언해야 하며, 이 파일은 앱 프로젝트 디렉터리의 루트에
있어야 합니다.</p>
<p>매니페스트는 앱의 구성 요소를 선언하는 것 이외에도 수많은 역할을 합니다.
예를 들면 다음과 같습니다.</p>
<ul>
- <li>앱이 요구하는 모든 사용자 권한 식별(예: 인터넷 액세스 또는 사용자의 연락처로의
+ <li>앱이 요구하는 모든 사용자 권한 식별(예: 인터넷 액세스 또는 사용자의 연락처로의
읽기 액세스)</li>
<li>앱이 어느 API를 사용하는지를 근거로 하여 앱에서 요구하는 최소 <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API 레벨</a>
선언</li>
- <li>앱에서 사용하거나 필요로 하는 하드웨어 및 소프트웨어 기능 선언(예: 카메라,
+ <li>앱에서 사용하거나 필요로 하는 하드웨어 및 소프트웨어 기능 선언(예: 카메라,
블루투스 서비스 또는 멀티터치 화면 등)</li>
- <li>앱이 링크되어야 하는 API 라이브러리(Android 프레임워크
+ <li>앱이 링크되어야 하는 API 라이브러리(Android 프레임워크
API 제외)(예: <a href="http://code.google.com/android/add-ons/google-apis/maps-overview.html">Google Maps
라이브러리</a>)</li>
<li>그 외 기타 등등</li>
@@ -267,7 +267,7 @@
<h3 id="DeclaringComponents">구성 요소 선언</h3>
-<p>매니페스트의 주요 작업은 시스템에 앱의 구성 요소에 대해 알리는 것입니다. 예를 들어
+<p>매니페스트의 주요 작업은 시스템에 앱의 구성 요소에 대해 알리는 것입니다. 예를 들어
매니페스트 파일은 액티비티를 다음과 같이 선언할 수 있습니다. </p>
<pre>
@@ -283,36 +283,36 @@
<p><code><a
href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-요소에서 {@code android:icon} 속성은 앱을 식별하는 아이콘에 대한 리소스를
+요소에서 {@code android:icon} 속성은 앱을 식별하는 아이콘에 대한 리소스를
가리킵니다.</p>
<p><code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> 요소에서는,
+href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> 요소에서는,
{@code android:name} 속성이 {@link
-android.app.Activity} 하위 클래스의 완전히 정규화된 클래스 이름을 나타내며 {@code android:label} 속성은 액티비티의
+android.app.Activity} 하위 클래스의 완전히 정규화된 클래스 이름을 나타내며 {@code android:label} 속성은 액티비티의
사용자에게 표시되는 레이블로 사용할 문자열을 나타냅니다.</p>
<p>모든 앱 구성 요소를 이렇게 선언해야 합니다.</p>
<ul>
- <li>액티비티는
+ <li>액티비티는
<code><a
href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> 요소</li>
- <li>서비스는
+ <li>서비스는
<code><a
href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> 요소</li>
- <li>브로드캐스트 수신기는
+ <li>브로드캐스트 수신기는
<code><a
href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code> 요소</li>
- <li>콘텐츠 제공자는
+ <li>콘텐츠 제공자는
<code><a
href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> 요소</li>
</ul>
-<p>액티비티, 서비스를 비롯하여 소스에는 포함시키지만 매니페스트에서는 선언하지 않는
-콘텐츠 제공자는 시스템에 표시되지 않으며, 따라서 실행될 수 없습니다. 그러나
+<p>액티비티, 서비스를 비롯하여 소스에는 포함시키지만 매니페스트에서는 선언하지 않는
+콘텐츠 제공자는 시스템에 표시되지 않으며, 따라서 실행될 수 없습니다. 그러나
브로드캐스트
수신기는 매니페스트에서 선언해도 되고 코드를 사용해(
-{@link android.content.BroadcastReceiver} 객체로) 동적으로 생성한 다음 시스템에 등록해도 됩니다. 이때
+{@link android.content.BroadcastReceiver} 객체로) 동적으로 생성한 다음 시스템에 등록해도 됩니다. 이때
{@link android.content.Context#registerReceiver registerReceiver()}를 호출하는 방법을 씁니다.</p>
<p>앱에 맞는 매니페스트 파일을 구성하는 방법에 대한 자세한 내용은 <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml 파일</a>을
@@ -322,26 +322,26 @@
<h3 id="DeclaringComponentCapabilities">구성 요소 기능 선언</h3>
-<p>위에서 논한 바와 같이, <a href="#ActivatingComponents">활성화 상태의 구성 요소</a>에서는
-{@link android.content.Intent}를 사용하여 액티비티, 서비스 및 브로드캐스트 수신기를 시작할 수 있습니다. 그렇게 하려면
-대상 구성 요소를 인텐트 내에서 명시적으로 명명하면 됩니다(구성 요소 클래스 이름을 사용). 그러나,
-인텐트의 진정한 힘은 <em>암시적 인텐트</em>의 개념에서 발휘됩니다. 암시적 인텐트는
-그저 수행할 작업의 유형을 설명할 뿐이며(또한, 선택 사항으로, 해당 작업을 수행하고자 하는
-데이터 위치도) 시스템에 기기에서 작업을 수행할 수 있는 구성 요소를 찾아
-시작하도록 해줍니다. 인텐트가 설명한 작업을 수행할 수 있는 구성 요소가 여러 개인 경우,
+<p>위에서 논한 바와 같이, <a href="#ActivatingComponents">활성화 상태의 구성 요소</a>에서는
+{@link android.content.Intent}를 사용하여 액티비티, 서비스 및 브로드캐스트 수신기를 시작할 수 있습니다. 그렇게 하려면
+대상 구성 요소를 인텐트 내에서 명시적으로 명명하면 됩니다(구성 요소 클래스 이름을 사용). 그러나,
+인텐트의 진정한 힘은 <em>암시적 인텐트</em>의 개념에서 발휘됩니다. 암시적 인텐트는
+그저 수행할 작업의 유형을 설명할 뿐이며(또한, 선택 사항으로, 해당 작업을 수행하고자 하는
+데이터 위치도) 시스템에 기기에서 작업을 수행할 수 있는 구성 요소를 찾아
+시작하도록 해줍니다. 인텐트가 설명한 작업을 수행할 수 있는 구성 요소가 여러 개인 경우,
어느 것을 사용할지 사용자가 선택합니다.</p>
-<p>시스템이 인텐트에 응답할 수 있는 구성 요소를 식별하는 방법은 수신한 인텐트를
- <i>인텐트 필터</i> 와 비교하는 것입니다. 이 인텐트 필터는 기기의 다른 여러 앱의 매니페스트
+<p>시스템이 인텐트에 응답할 수 있는 구성 요소를 식별하는 방법은 수신한 인텐트를
+ <i>인텐트 필터</i> 와 비교하는 것입니다. 이 인텐트 필터는 기기의 다른 여러 앱의 매니페스트
파일이 제공합니다.</p>
-<p>앱의 매니페스트에서 액티비티를 선언하는 경우, 선택 사항으로
-해당 액티비티의 기능을 선언하는 인텐트 필터를 포함시켜서 다른 앱으로부터의 인텐트에
-응답할 수 있도록 할 수 있습니다. 구성 요소에 대한 인텐트 필터를 선언하려면
+<p>앱의 매니페스트에서 액티비티를 선언하는 경우, 선택 사항으로
+해당 액티비티의 기능을 선언하는 인텐트 필터를 포함시켜서 다른 앱으로부터의 인텐트에
+응답할 수 있도록 할 수 있습니다. 구성 요소에 대한 인텐트 필터를 선언하려면
<a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a> 요소를 해당 구성 요소의 선언 요소 하위로 추가하면 됩니다.</p>
-<p>예를 들어, 새 이메일을 작성하는 데 쓰는 액티비티가 있는 이메일 앱을 구축했다고 가정합시다. 이때 "전송" 인텐트에
+<p>예를 들어, 새 이메일을 작성하는 데 쓰는 액티비티가 있는 이메일 앱을 구축했다고 가정합시다. 이때 "전송" 인텐트에
응답하는 인텐트 필터를 선언하려면(새 이메일을 전송하기 위해) 다음과 같이 하면 됩니다.</p>
<pre>
<manifest ... >
@@ -360,7 +360,7 @@
<p>그런 다음, 다른 앱이 {@link
android.content.Intent#ACTION_SEND} 작업을 가진 인텐트를 생성하여 그것을 {@link android.app.Activity#startActivity
-startActivity()}로 전달하면 시스템이 여러분의 액티비티를 시작하여 사용자가 이메일을 임시 보관하고 전송할 수
+startActivity()}로 전달하면 시스템이 여러분의 액티비티를 시작하여 사용자가 이메일을 임시 보관하고 전송할 수
있습니다.</p>
<p>인텐트 필터 생성에 관한 자세한 내용은 <a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a> 문서를 참조하십시오.
@@ -370,16 +370,16 @@
<h3 id="DeclaringRequirements">앱 요구 사항 선언</h3>
-<p>Android로 구동되는 기기는 수없이 많지만 모두 똑같은 특징을 갖고 같은
-기능을 제공하는 것은 아닙니다. 앱이 필요로 하는 기능이 부족한 기기에 앱을 설치하게 되는 불상사를 방지하려면,
-앱이 지원하는 기기 유형에 대한 프로필을 명확하게 정의하는 것이 중요합니다.
-그러려면 매니페스트 파일에 기기와 소프트웨어 요구 사항을
-선언하면 됩니다. 이와 같은 선언은 대부분 정보성일 뿐이며 시스템은 이를 읽지 않는 것이 일반적이지만,
-Google Play와 같은 외부 서비스는 사용자가 본인의 기기에서 앱을 검색할 때 필터링을 제공하기 위해
+<p>Android로 구동되는 기기는 수없이 많지만 모두 똑같은 특징을 갖고 같은
+기능을 제공하는 것은 아닙니다. 앱이 필요로 하는 기능이 부족한 기기에 앱을 설치하게 되는 불상사를 방지하려면,
+앱이 지원하는 기기 유형에 대한 프로필을 명확하게 정의하는 것이 중요합니다.
+그러려면 매니페스트 파일에 기기와 소프트웨어 요구 사항을
+선언하면 됩니다. 이와 같은 선언은 대부분 정보성일 뿐이며 시스템은 이를 읽지 않는 것이 일반적이지만,
+Google Play와 같은 외부 서비스는 사용자가 본인의 기기에서 앱을 검색할 때 필터링을 제공하기 위해
이와 같은 선언도 읽습니다.</p>
-<p>예를 들어, 앱에 카메라가 필요하고 Android 2.1부터 도입된 API를 사용하는 경우(<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API 레벨</a> 7)
-이과 같은 내용을 매니페스트 파일에 요구 사항으로 선언하려면 다음과 같이 합니다.</p>
+<p>예를 들어, 앱에 카메라가 필요하고 Android 2.1부터 도입된 API를 사용하는 경우(<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API 레벨</a> 7)
+이과 같은 내용을 매니페스트 파일에 요구 사항으로 선언하려면 다음과 같이 합니다.</p>
<pre>
<manifest ... >
@@ -390,15 +390,15 @@
</manifest>
</pre>
-<p>이제 카메라가 <em>없고</em> Android 버전이 2.1 <em>이하</em>인 기기는
+<p>이제 카메라가 <em>없고</em> Android 버전이 2.1 <em>이하</em>인 기기는
Google Play에서 여러분의 앱을 설치할 수 없습니다.</p>
-<p>그러나, 앱이 카메라를 사용하기는 하지만 꼭
+<p>그러나, 앱이 카메라를 사용하기는 하지만 꼭
<em>필요한</em> 것은 아니라고 선언할 수도 있습니다. 이 경우에는, 앱이 <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#required">{@code required}</a>
- 속성을 {@code "false"}에 설정하고 런타임을 확인하여
+ 속성을 {@code "false"}에 설정하고 런타임을 확인하여
해당 기기에 카메라가 있는지, 경우에 따라 모든 카메라 기능을 비활성화할 수 있는지 알아봅니다.</p>
-<p>여러 가지 기기와 앱의 호환성을 관리하는 방법에 대한 자세한 정보는
+<p>여러 가지 기기와 앱의 호환성을 관리하는 방법에 대한 자세한 정보는
<a href="{@docRoot}guide/practices/compatibility.html">기기 호환성</a>
문서를 참조하십시오.</p>
@@ -407,40 +407,40 @@
<h2 id="Resources">앱 리소스</h2>
<p>Android 앱을 이루는 것은 코드만이 아닙니다. 소스 코드와는 별개인 여러 리소스가 필요합니다.
-예를 들어 이미지, 오디오 파일과 앱을 시각적으로 표현하는 것과 관련된 모든 것들이 있습니다.
-예컨대 애니메이션, 메뉴, 스타일, 색상과 액티비티 사용자 인터페이스의 레이아웃을 XML 파일로
-정의해야 합니다. 앱 리소스를 사용하면 앱의 다양한 특성을
-쉽게 업데이트할 수 있으며 코드를 수정하지 않아도 되고 일련의 대체 리소스를
-제공함으로써 다양한 기기 구성에 맞게 앱을
+예를 들어 이미지, 오디오 파일과 앱을 시각적으로 표현하는 것과 관련된 모든 것들이 있습니다.
+예컨대 애니메이션, 메뉴, 스타일, 색상과 액티비티 사용자 인터페이스의 레이아웃을 XML 파일로
+정의해야 합니다. 앱 리소스를 사용하면 앱의 다양한 특성을
+쉽게 업데이트할 수 있으며 코드를 수정하지 않아도 되고 일련의 대체 리소스를
+제공함으로써 다양한 기기 구성에 맞게 앱을
최적화할 수도 있습니다(예: 여러 가지 언어 및 화면 크기).</p>
-<p>Android 프로젝트에 포함시키는 리소스마다 SDK 빌드 도구가 고유한
-정수 ID를 정의하므로, 이를 사용하여 앱 코드에서의 리소스나 XML로 정의된
+<p>Android 프로젝트에 포함시키는 리소스마다 SDK 빌드 도구가 고유한
+정수 ID를 정의하므로, 이를 사용하여 앱 코드에서의 리소스나 XML로 정의된
다른 리소스에서 참조할 수 있습니다. 예를 들어 앱에 {@code
-logo.png}라는 이름의 이미지 파일이 들어 있다고 하면({@code res/drawable/} 디렉터리에 저장됨) SDK 도구가
-{@code R.drawable.logo}라는 리소스 ID를 생성합니다. 이것을 사용하여 이미지를 참조하고 사용자 인터페이스에
+logo.png}라는 이름의 이미지 파일이 들어 있다고 하면({@code res/drawable/} 디렉터리에 저장됨) SDK 도구가
+{@code R.drawable.logo}라는 리소스 ID를 생성합니다. 이것을 사용하여 이미지를 참조하고 사용자 인터페이스에
삽입할 수 있습니다.</p>
-<p>소스 코드와는 별개로 리소스를 제공하는 것의 가장 중요한 측면 중 하나는
-여러 가지 기기 구성에 맞게 대체 리소스를 제공할 능력을 갖추게
-됩니다. 예를 들어 UI 문자열을 XML로 정의하면 이러한 문자열을 다른 언어로 변환한 뒤
+<p>소스 코드와는 별개로 리소스를 제공하는 것의 가장 중요한 측면 중 하나는
+여러 가지 기기 구성에 맞게 대체 리소스를 제공할 능력을 갖추게
+됩니다. 예를 들어 UI 문자열을 XML로 정의하면 이러한 문자열을 다른 언어로 변환한 뒤
그러한 문자열을 별개의 파일에 저장할 수 있습니다. 그런 다음, 리소스 디렉터리 이름에 추가한 언어 <em>한정자</em>
-(예를 들어 프랑스어 문자열 값의 경우 {@code res/values-fr/}) 및
-사용자의 언어 설정을 근거로 하여 Android 시스템이 적절한 언어 문자열을 UI에
+(예를 들어 프랑스어 문자열 값의 경우 {@code res/values-fr/}) 및
+사용자의 언어 설정을 근거로 하여 Android 시스템이 적절한 언어 문자열을 UI에
적용하는 것입니다.</p>
<p>Android는 대체 리소스에 대해 다양한 <em>한정자</em>를 지원합니다. 한정자란
- 리소스 디렉터리의 이름에 포함시키는 짧은 문자열로, 이를 사용해 해당 리소스를 사용할 기기 구성을
-정의합니다. 또 다른 예를 들자면,
-기기의 화면 방향과 크기에 따라 액티비티에 여러 가지 레이아웃을 생성해야 할 때가
-많습니다. 예를 들어 기기 화면이 세로
-방향(키가 큼)인 경우, 버튼이 세로 방향으로 되어 있는 레이아웃을 사용하는 것이 좋지만 화면이
-가로 방향(폭이 넓음)인 경우, 버튼이 가로 방향으로 정렬되어야 합니다. 방향에 따라 레이아웃을 변경하려면,
-서로 다른 두 가지 레이아웃을 정의하여 적절한 한정자를 각각의 레이아웃의 디렉터리 이름에
-적용하면 됩니다. 그러면 시스템이 현재 기기 방향에 따라 적절한 레이아웃을
+ 리소스 디렉터리의 이름에 포함시키는 짧은 문자열로, 이를 사용해 해당 리소스를 사용할 기기 구성을
+정의합니다. 또 다른 예를 들자면,
+기기의 화면 방향과 크기에 따라 액티비티에 여러 가지 레이아웃을 생성해야 할 때가
+많습니다. 예를 들어 기기 화면이 세로
+방향(키가 큼)인 경우, 버튼이 세로 방향으로 되어 있는 레이아웃을 사용하는 것이 좋지만 화면이
+가로 방향(폭이 넓음)인 경우, 버튼이 가로 방향으로 정렬되어야 합니다. 방향에 따라 레이아웃을 변경하려면,
+서로 다른 두 가지 레이아웃을 정의하여 적절한 한정자를 각각의 레이아웃의 디렉터리 이름에
+적용하면 됩니다. 그러면 시스템이 현재 기기 방향에 따라 적절한 레이아웃을
자동으로 적용합니다.</p>
-<p>애플리케이션에 포함할 수 있는 여러 가지 종류의 리소스와, 각기 다른 기기 구성에 따라
+<p>애플리케이션에 포함할 수 있는 여러 가지 종류의 리소스와, 각기 다른 기기 구성에 따라
대체 리소스를 생성하는 방법에 대한 자세한 내용은 <a href="{@docRoot}guide/topics/resources/providing-resources.html">리소스 제공</a>을 읽어보십시오.</p>
@@ -451,15 +451,15 @@
<dl>
<dt><a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a>
</dt>
- <dd>{@link android.content.Intent} API를 사용하여
-앱 구성 요소(예: 액티비티 및 서비스 등)를 활성화하는 방법, 앱 구성 요소를 다른 여러 앱이 사용할 수 있도록 하는 방법
+ <dd>{@link android.content.Intent} API를 사용하여
+앱 구성 요소(예: 액티비티 및 서비스 등)를 활성화하는 방법, 앱 구성 요소를 다른 여러 앱이 사용할 수 있도록 하는 방법
등에 관한 정보입니다.</dd>
<dt><a href="{@docRoot}guide/components/activities.html">액티비티</a></dt>
- <dd>{@link android.app.Activity} 클래스의 인스턴스를 생성하는 방법에 관한 정보로,
+ <dd>{@link android.app.Activity} 클래스의 인스턴스를 생성하는 방법에 관한 정보로,
애플리케이션에 사용자 인터페이스가 있는 독특한 화면을 제공합니다.</dd>
<dt><a href="{@docRoot}guide/topics/resources/providing-resources.html">리소스 제공</a></dt>
- <dd>Android 앱이 앱 코드와는 별개의 앱 리소스에 대해 구조화된 방식에 관한 정보로,
-특정 기기 구성에 맞게 대체 리소스를 제공하는 방법도 포함되어
+ <dd>Android 앱이 앱 코드와는 별개의 앱 리소스에 대해 구조화된 방식에 관한 정보로,
+특정 기기 구성에 맞게 대체 리소스를 제공하는 방법도 포함되어
있습니다.
</dd>
</dl>
@@ -468,11 +468,11 @@
<h2 class="norule">혹시 다음과 같은 내용에도 흥미가 있으신가요?</h2>
<dl>
<dt><a href="{@docRoot}guide/practices/compatibility.html">기기 호환성</a></dt>
- <dd>여러 가지 유형의 기기에서 Android의 작동 방식과 앱을 각 기기에 맞춰 최적화하는 방법
-또는 여러 가지 기기에 대해 앱의 가용성을 제한하는 방법 등에 관한
+ <dd>여러 가지 유형의 기기에서 Android의 작동 방식과 앱을 각 기기에 맞춰 최적화하는 방법
+또는 여러 가지 기기에 대해 앱의 가용성을 제한하는 방법 등에 관한
정보입니다.</dd>
<dt><a href="{@docRoot}guide/topics/security/permissions.html">시스템 권한</a></dt>
- <dd>Android가 특정 API에 대한 앱의 액세스를 제한하기 위해 권한 시스템을
+ <dd>Android가 특정 API에 대한 앱의 액세스를 제한하기 위해 권한 시스템을
사용하는 방법으로, 그러한 API를 사용하려면 앱에 대해 사용자의 승인이 필요합니다.</dd>
</dl>
</div>
diff --git a/docs/html-intl/intl/ko/guide/components/index.jd b/docs/html-intl/intl/ko/guide/components/index.jd
index 3662632..a860c0f 100644
--- a/docs/html-intl/intl/ko/guide/components/index.jd
+++ b/docs/html-intl/intl/ko/guide/components/index.jd
@@ -1,7 +1,7 @@
page.title=앱 구성 요소
page.landing=true
-page.landing.intro=Android의 애플리케이션 프레임워크는 일련의 재사용 가능한 구성 요소를 사용하여 풍성하고 혁신적인 앱을 생성할 수 있습니다. 이 섹션에서는 앱의 구성 단위를 정의 내리는 구성 요소를 구축하는 방법과 인텐트를 사용하여 이와 같은 구성 요소를 연결시키는 법을 설명합니다.
-page.metaDescription=Android의 애플리케이션 프레임워크는 일련의 재사용 가능한 구성 요소를 사용하여 풍성하고 혁신적인 앱을 생성할 수 있습니다. 이 섹션에서는 앱의 구성 단위를 정의 내리는 구성 요소를 구축하는 방법과 인텐트를 사용하여 이와 같은 구성 요소를 연결시키는 법을 설명합니다.
+page.landing.intro=Android의 애플리케이션 프레임워크는 일련의 재사용 가능한 구성 요소를 사용하여 풍성하고 혁신적인 앱을 생성할 수 있습니다. 이 섹션에서는 앱의 구성 단위를 정의 내리는 구성 요소를 구축하는 방법과 인텐트를 사용하여 이와 같은 구성 요소를 연결시키는 법을 설명합니다.
+page.metaDescription=Android의 애플리케이션 프레임워크는 일련의 재사용 가능한 구성 요소를 사용하여 풍성하고 혁신적인 앱을 생성할 수 있습니다. 이 섹션에서는 앱의 구성 단위를 정의 내리는 구성 요소를 구축하는 방법과 인텐트를 사용하여 이와 같은 구성 요소를 연결시키는 법을 설명합니다.
page.landing.image=images/develop/app_components.png
page.image=images/develop/app_components.png
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>블로그 문서</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>DialogFragment 사용하기</h4>
<p>이 포스트에서는 v4 지원 라이브러리와 함께 DialogFragment를 사용하여(Honeycomb 이전 기기에서 이전 버전과의 호환성을 위해) 간단한 편집 대화를 표시하고 인터페이스를 사용하여 호출 중인 액티비티에 결과를 반환하는 법을 보여드립니다.</p>
@@ -21,35 +21,35 @@
<h4>모두를 위한 프래그먼트</h4>
<p>Google에서는 오늘 같은 프래그먼트 API를 노출하는 정적 라이브러리를 출시했습니다(새로운 LoaderManager와 몇 가지 다른 클래스도 포함). 이 덕분에 Android 1.6 이후 버전과 호환되는 애플리케이션이 프래그먼트를 사용하여 태블릿과 호환되는 사용자 인터페이스를 생성할 수 있게 되었습니다. </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>성능을 위한 다중 스레딩</h4>
- <p>반응형 애플리케이션을 생성할 때에는 주요 UI 스레드가 최소한의 작업만
-하도록 하는 것이 좋습니다. 애플리케이션을 중단시킬 수 있는,
+ <p>반응형 애플리케이션을 생성할 때에는 주요 UI 스레드가 최소한의 작업만
+하도록 하는 것이 좋습니다. 애플리케이션을 중단시킬 수 있는,
길어질 수 있는 작업은 모두 다른 스레드에서 처리해야 합니다.</p>
</a>
</div>
<div class="col-6">
<h3>교육</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>액티비티 수명 주기 관리하기</h4>
- <p>이 클래스에서는 각각의 액티비티
-인스턴스가 수신하는 중요한 수명 주기 콜백 메서드를 설명합니다. 또한 이러한 콜백 메서드를 사용하여 액티비티가
+ <p>이 클래스에서는 각각의 액티비티
+인스턴스가 수신하는 중요한 수명 주기 콜백 메서드를 설명합니다. 또한 이러한 콜백 메서드를 사용하여 액티비티가
사용자가 원하는 작업을 하고, 액티비티가 필요로 하지 않을 때 시스템 리소스 사용을 방지하는 방법에 대해서도 설명합니다.</p>
</a>
<a href="http://developer.android.com/training/basics/fragments/index.html">
<h4>프래그먼트로 동적 UI 구축하기</h4>
- <p>이 클래스에서는 Android 1.6만큼 오래된 버전을 실행하는 기기도
-계속 지원하면서 프래그먼트로 동적 사용자 경험을 생성하고, 기기의 화면 크기에 따라 앱의 사용자 환경을
+ <p>이 클래스에서는 Android 1.6만큼 오래된 버전을 실행하는 기기도
+계속 지원하면서 프래그먼트로 동적 사용자 경험을 생성하고, 기기의 화면 크기에 따라 앱의 사용자 환경을
최적화할 수 있는 방법을 보여줍니다.</p>
</a>
<a href="http://developer.android.com/training/sharing/index.html">
<h4>콘텐츠 공유하기</h4>
- <p>이 클래스는 인텐트 API와 ActionProvider 객체를 사용하여 여러 애플리케이션 사이에서
+ <p>이 클래스는 인텐트 API와 ActionProvider 객체를 사용하여 여러 애플리케이션 사이에서
콘텐츠를 전송하고 수신하는 몇 가지 보편적인 방법을 다룹니다.</p>
</a>
</div>
diff --git a/docs/html-intl/intl/ko/guide/components/loaders.jd b/docs/html-intl/intl/ko/guide/components/loaders.jd
index cfbbb91..dd02e11 100644
--- a/docs/html-intl/intl/ko/guide/components/loaders.jd
+++ b/docs/html-intl/intl/ko/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>Key 클래스</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>관련 샘플</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -39,22 +39,22 @@
</div>
</div>
-<p>로더는 Android 3.0부터 도입된 것으로, 액티비티 또는 프래그먼트에서 비동기식으로 데이터를 쉽게
+<p>로더는 Android 3.0부터 도입된 것으로, 액티비티 또는 프래그먼트에서 비동기식으로 데이터를 쉽게
로딩할 수 있게 합니다. 로더의 특성은 다음과 같습니다.</p>
<ul>
<li>모든 {@link android.app.Activity}와 {@link
android.app.Fragment}에 사용할 수 있습니다.</li>
<li>데이터의 비동기식 로딩을 제공합니다.</li>
- <li>데이터의 출처를 모니터링하여 그 콘텐츠가 변경되면 새 결과를
+ <li>데이터의 출처를 모니터링하여 그 콘텐츠가 변경되면 새 결과를
전달합니다.</li>
- <li>구성 변경 후에 재생성된 경우, 마지막 로더의 커서로 자동으로
-다시 연결됩니다. 따라서 데이터를 다시 쿼리하지 않아도
+ <li>구성 변경 후에 재생성된 경우, 마지막 로더의 커서로 자동으로
+다시 연결됩니다. 따라서 데이터를 다시 쿼리하지 않아도
됩니다.</li>
</ul>
-
+
<h2 id="summary">로더 API 요약</h2>
-<p>애플리케이션 안에서 로더를 사용하는 데 관련된 클래스와 인터페이스는
+<p>애플리케이션 안에서 로더를 사용하는 데 관련된 클래스와 인터페이스는
여러 가지가 있습니다. 다음 표에서 요약되어 있습니다.</p>
<table>
@@ -64,16 +64,16 @@
</tr>
<tr>
<td>{@link android.app.LoaderManager}</td>
- <td>{@link android.app.Activity} 또는
+ <td>{@link android.app.Activity} 또는
{@link android.app.Fragment}와 연관된 추상 클래스로, 하나 이상의 {@link
-android.content.Loader} 인스턴스를 관리하는 데 쓰입니다. 이것을 사용하면 애플리케이션이
+android.content.Loader} 인스턴스를 관리하는 데 쓰입니다. 이것을 사용하면 애플리케이션이
{@link android.app.Activity}
- 또는 {@link android.app.Fragment} 수명 주기와 함께 실행 시간이 긴 작업을 관리하는 데 도움이 됩니다. 이것의 가장 보편적인 용법은
-{@link android.content.CursorLoader}와 함께 사용하는 것이지만,
+ 또는 {@link android.app.Fragment} 수명 주기와 함께 실행 시간이 긴 작업을 관리하는 데 도움이 됩니다. 이것의 가장 보편적인 용법은
+{@link android.content.CursorLoader}와 함께 사용하는 것이지만,
다른 유형의 데이터를 로드하기 위해 애플리케이션이 자체 로더를 작성하는 것도 얼마든지 가능합니다.
<br />
<br />
- 액티비티 또는 프래그먼트당 {@link android.app.LoaderManager}는 하나씩밖에 없습니다. 하지만 {@link android.app.LoaderManager}에는 로더가 여러 개 있어도
+ 액티비티 또는 프래그먼트당 {@link android.app.LoaderManager}는 하나씩밖에 없습니다. 하지만 {@link android.app.LoaderManager}에는 로더가 여러 개 있어도
됩니다.</td>
</tr>
<tr>
@@ -85,10 +85,10 @@
</tr>
<tr>
<td>{@link android.content.Loader}</td>
- <td>데이터의 비동기식 로딩을 수행하는 추상 클래스입니다. 이것이 로더의 기본
+ <td>데이터의 비동기식 로딩을 수행하는 추상 클래스입니다. 이것이 로더의 기본
클래스입니다. 보통은 {@link
-android.content.CursorLoader}를 사용하기 마련이지만, 자신만의 하위 클래스를 구현해도 됩니다. 로더가 활성 상태인 동안에는
-소속 데이터의 출처를 모니터링하고 콘텐츠가 변경되면 새 결과를
+android.content.CursorLoader}를 사용하기 마련이지만, 자신만의 하위 클래스를 구현해도 됩니다. 로더가 활성 상태인 동안에는
+소속 데이터의 출처를 모니터링하고 콘텐츠가 변경되면 새 결과를
전달하는 것이 정상입니다. </td>
</tr>
<tr>
@@ -97,118 +97,118 @@
</tr>
<tr>
<td>{@link android.content.CursorLoader}</td>
- <td>{@link android.content.AsyncTaskLoader}의 하위 클래스로, 이것이
+ <td>{@link android.content.AsyncTaskLoader}의 하위 클래스로, 이것이
{@link android.content.ContentResolver}를 쿼리하고 {@link
android.database.Cursor}를 반환합니다. 이 클래스는 커서 쿼리에 대한 표준 방식으로 {@link
-android.content.Loader} 프로토콜을 구현하며,
-{@link android.content.AsyncTaskLoader}에 구축되어
-배경 스레드에서 커서 쿼리를 수행하므로 애플리케이션의 UI를 차단하지 않습니다.
+android.content.Loader} 프로토콜을 구현하며,
+{@link android.content.AsyncTaskLoader}에 구축되어
+배경 스레드에서 커서 쿼리를 수행하므로 애플리케이션의 UI를 차단하지 않습니다.
이 로더를 사용하는 것이 프래그먼트나 액티비티의 API를 통해 관리된 쿼리를 수행하는 대신 {@link
-android.content.ContentProvider}에서
+android.content.ContentProvider}에서
비동기식으로 데이터를 로딩하는 최선의 방법입니다.</td>
</tr>
</table>
-<p>위의 표에 나열된 클래스와 인터페이스가 애플리케이션 내에서 로더를 구현하는 데
-사용할 기본적인 구성 요소입니다. 생성하는 로더마다
+<p>위의 표에 나열된 클래스와 인터페이스가 애플리케이션 내에서 로더를 구현하는 데
+사용할 기본적인 구성 요소입니다. 생성하는 로더마다
이 모든 것이 다 필요한 것은 아니지만, 로더를 초기화하려면 항상 {@link
android.app.LoaderManager}를 참조해야 하고 {@link
-android.content.CursorLoader}와 같은 {@link android.content.Loader}
-클래스도 구현해야 합니다. 다음 몇 섹션에서는 애플리케이션 안에서 이와 같은
+android.content.CursorLoader}와 같은 {@link android.content.Loader}
+클래스도 구현해야 합니다. 다음 몇 섹션에서는 애플리케이션 안에서 이와 같은
클래스와 인터페이스를 사용하는 법을 보여줍니다.</p>
<h2 id ="app">애플리케이션 안에서 로더 사용하기</h2>
-<p>이 섹션에서는 Android 애플리케이션 내에서 로더를 사용하는 방법을 설명합니다. 로더를
+<p>이 섹션에서는 Android 애플리케이션 내에서 로더를 사용하는 방법을 설명합니다. 로더를
사용하는 애플리케이션에는 보통 다음이 포함되어 있습니다.</p>
<ul>
<li>{@link android.app.Activity} 또는 {@link android.app.Fragment}.</li>
<li>{@link android.app.LoaderManager}의 인스턴스.</li>
<li>{@link
-android.content.ContentProvider}가 지원하는 데이터를 로딩할 {@link android.content.CursorLoader}. 아니면, 개발자 나름의
-{@link android.content.Loader} 또는 {@link android.content.AsyncTaskLoader} 하위 클래스를 구현하여
+android.content.ContentProvider}가 지원하는 데이터를 로딩할 {@link android.content.CursorLoader}. 아니면, 개발자 나름의
+{@link android.content.Loader} 또는 {@link android.content.AsyncTaskLoader} 하위 클래스를 구현하여
다른 출처에서 데이터를 로딩해도 됩니다.</li>
<li>{@link android.app.LoaderManager.LoaderCallbacks}의 구현.
-여기에서 새 로더를 생성하고 기존 로더에 대한 참조를
-관리합니다.</li>
+여기에서 새 로더를 생성하고 기존 로더에 대한 참조를
+관리합니다.</li>
<li>로더의 데이터를 표시하는 방법(예: {@link
android.widget.SimpleCursorAdapter})</li>
- <li>{@link android.content.ContentProvider}와 같은 데이터 출처로,
+ <li>{@link android.content.ContentProvider}와 같은 데이터 출처로,
{@link android.content.CursorLoader}를 사용하는 경우에 해당.</li>
</ul>
<h3 id="starting">로더 시작</h3>
-<p>{@link android.app.LoaderManager}는 {@link android.app.Activity} 또는
+<p>{@link android.app.LoaderManager}는 {@link android.app.Activity} 또는
{@link android.app.Fragment} 내에서 하나 이상의 {@link
android.content.Loader} 인스턴스를 관리합니다. 액티비티 또는 프래그먼트당 {@link
-android.app.LoaderManager}는 하나씩밖에 없습니다.</p>
+android.app.LoaderManager}는 하나씩밖에 없습니다.</p>
-<p>보통은
+<p>보통은
액티비티의 {@link
-android.app.Activity#onCreate onCreate()} 메서드 내에서, 또는 프래그먼트의
-{@link android.app.Fragment#onActivityCreated onActivityCreated()} 메서드 내에서 {@link android.content.Loader}를 초기화합니다. 이렇게 하려면
+android.app.Activity#onCreate onCreate()} 메서드 내에서, 또는 프래그먼트의
+{@link android.app.Fragment#onActivityCreated onActivityCreated()} 메서드 내에서 {@link android.content.Loader}를 초기화합니다. 이렇게 하려면
다음과 같은 방법을 따릅니다.</p>
<pre>// Prepare the loader. Either re-connect with an existing one,
// or start a new one.
getLoaderManager().initLoader(0, null, this);</pre>
-<p>{@link android.app.LoaderManager#initLoader initLoader()} 메서드는
+<p>{@link android.app.LoaderManager#initLoader initLoader()} 메서드는
다음과 같은 인수를 취합니다.</p>
<ul>
<li>로더를 식별하는 고유한 ID. 이 예시에서 ID는 0입니다.</li>
<li>생성 시 로더에 제공할 선택적 인수
-(이 예시에서는 <code>null</code>).</li>
+(이 예시에서는 <code>null</code>).</li>
-<li>{@link android.app.LoaderManager.LoaderCallbacks} 구현. 로더 이벤트를 보고하기 위해
+<li>{@link android.app.LoaderManager.LoaderCallbacks} 구현. 로더 이벤트를 보고하기 위해
{@link android.app.LoaderManager}가 이것을 호출합니다. 이 예시에서는
로컬 클래스가 {@link
-android.app.LoaderManager.LoaderCallbacks} 인터페이스를 구현하여 자신에 대한 참조인
-{@code this}를 통과합니다.</li>
+android.app.LoaderManager.LoaderCallbacks} 인터페이스를 구현하여 자신에 대한 참조인
+{@code this}를 통과합니다.</li>
</ul>
-<p>{@link android.app.LoaderManager#initLoader initLoader()} 호출로 로더가 초기화되었고 활성 상태이도록
+<p>{@link android.app.LoaderManager#initLoader initLoader()} 호출로 로더가 초기화되었고 활성 상태이도록
확실히 합니다. 이로써 발생할 수 있는 결과가 두 가지 있습니다.</p>
<ul>
- <li>ID가 지정한 로더가 이미 존재하는 경우, 마지막으로 생성된 로더를
+ <li>ID가 지정한 로더가 이미 존재하는 경우, 마지막으로 생성된 로더를
재사용합니다.</li>
- <li>ID가 지정한 로더가 존재하지 <em>않는</em> 경우,
-{@link android.app.LoaderManager#initLoader initLoader()}가
-{@link android.app.LoaderManager.LoaderCallbacks} 메서드 {@link android.app.LoaderManager.LoaderCallbacks#onCreateLoader onCreateLoader()}를 발생시킵니다.
+ <li>ID가 지정한 로더가 존재하지 <em>않는</em> 경우,
+{@link android.app.LoaderManager#initLoader initLoader()}가
+{@link android.app.LoaderManager.LoaderCallbacks} 메서드 {@link android.app.LoaderManager.LoaderCallbacks#onCreateLoader onCreateLoader()}를 발생시킵니다.
여기에서 인스턴트화할 코드를 구현하고 새 로더를 반환합니다.
자세한 논의는 <a href="#onCreateLoader">onCreateLoader</a> 섹션을 참조하십시오.</li>
</ul>
<p>어떤 경우에든 주어진 {@link android.app.LoaderManager.LoaderCallbacks}
-구현은 해당 로더와 연관되어 있으며, 로더 상태가 변경되면
-이것이 호출됩니다. 이 호출의 그러한 시점에서 발신자가
-시작된 상태에 있으며 요청한 로더가 이미 존재하고 자신의 데이터를
+구현은 해당 로더와 연관되어 있으며, 로더 상태가 변경되면
+이것이 호출됩니다. 이 호출의 그러한 시점에서 발신자가
+시작된 상태에 있으며 요청한 로더가 이미 존재하고 자신의 데이터를
생성해 놓은 경우, 시스템은 즉시 {@link
-android.app.LoaderManager.LoaderCallbacks#onLoadFinished onLoadFinished()}를
-호출합니다({@link android.app.LoaderManager#initLoader initLoader()} 도중).
+android.app.LoaderManager.LoaderCallbacks#onLoadFinished onLoadFinished()}를
+호출합니다({@link android.app.LoaderManager#initLoader initLoader()} 도중).
따라서 이런 일이 발생할 것에 대비해두어야만 합니다. 이 콜백에 대한 자세한 논의는 <a href="#onLoadFinished">
onLoadFinished</a>를 참조하십시오.</p>
<p>{@link android.app.LoaderManager#initLoader initLoader()}
-메서드는 생성된 {@link android.content.Loader}를 반환하지만, 이에 대한 참조를 캡처하지 않아도 된다는 점을
-유의하십시오. {@link android.app.LoaderManager}는 로더의 수명을
-자동으로 관리합니다. {@link android.app.LoaderManager}는
-필요에 따라 로딩을 시작하고 중단하며, 로더와 그에 연관된 콘텐츠의 상태를
-유지관리합니다. 이것이 시사하는 바와 같이, 로더와 직접적으로
-상호 작용하는 경우는 극히 드뭅니다(다만, 로더의 행동을 미세하게 조정하기 위해 로더 메서드를 사용하는 사례를 알아보려면
-<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> 샘플을 참조하면 좋습니다).
+메서드는 생성된 {@link android.content.Loader}를 반환하지만, 이에 대한 참조를 캡처하지 않아도 된다는 점을
+유의하십시오. {@link android.app.LoaderManager}는 로더의 수명을
+자동으로 관리합니다. {@link android.app.LoaderManager}는
+필요에 따라 로딩을 시작하고 중단하며, 로더와 그에 연관된 콘텐츠의 상태를
+유지관리합니다. 이것이 시사하는 바와 같이, 로더와 직접적으로
+상호 작용하는 경우는 극히 드뭅니다(다만, 로더의 행동을 미세하게 조정하기 위해 로더 메서드를 사용하는 사례를 알아보려면
+<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> 샘플을 참조하면 좋습니다).
가장 보편적으로 사용되는 메서드는 {@link
-android.app.LoaderManager.LoaderCallbacks}로, 이를 사용해 특정한 이벤트가 일어났을 때
+android.app.LoaderManager.LoaderCallbacks}로, 이를 사용해 특정한 이벤트가 일어났을 때
로딩 프로세스에 개입하게 됩니다. 이 주제에 대한 자세한 논의는 <a href="#callback">LoaderManager 콜백 사용하기</a>를 참조하십시오.</p>
<h3 id="restarting">로더 다시 시작</h3>
-<p>위에서 나타난 것과 같이 {@link android.app.LoaderManager#initLoader initLoader()}를 사용하는 경우,
-이것은 지정된 ID에 해당되는 기존 로더가 있으면 그것을 사용합니다.
-없으면, 하나 생성합니다. 하지만 때로는 오래된 데이터를 폐기하고 새로 시작하고 싶을 때가
+<p>위에서 나타난 것과 같이 {@link android.app.LoaderManager#initLoader initLoader()}를 사용하는 경우,
+이것은 지정된 ID에 해당되는 기존 로더가 있으면 그것을 사용합니다.
+없으면, 하나 생성합니다. 하지만 때로는 오래된 데이터를 폐기하고 새로 시작하고 싶을 때가
있습니다.</p>
<p>오래된 데이터를 폐기하려면 {@link
-android.app.LoaderManager#restartLoader restartLoader()}를 사용합니다. 예를 들어, 다음의
-{@link android.widget.SearchView.OnQueryTextListener} 구현은
-사용자의 쿼리가 변경되면 로더를 다시 시작합니다. 로더를 다시 시작해야 수정된 검색 필터를 사용하여
+android.app.LoaderManager#restartLoader restartLoader()}를 사용합니다. 예를 들어, 다음의
+{@link android.widget.SearchView.OnQueryTextListener} 구현은
+사용자의 쿼리가 변경되면 로더를 다시 시작합니다. 로더를 다시 시작해야 수정된 검색 필터를 사용하여
새 쿼리를 수행할 수 있습니다.</p>
<pre>
@@ -223,18 +223,18 @@
<h3 id="callback">LoaderManager 콜백 사용하기</h3>
-<p>{@link android.app.LoaderManager.LoaderCallbacks}는 클라이언트가
+<p>{@link android.app.LoaderManager.LoaderCallbacks}는 클라이언트가
{@link android.app.LoaderManager}와 상호 작용할 수 있게 해주는 콜백 인터페이스입니다. </p>
-<p>로더, 특히 {@link android.content.CursorLoader}는 중단된 후에도
-자신의 데이터를 유지할 것으로 기대됩니다. 이 때문에 애플리케이션이
+<p>로더, 특히 {@link android.content.CursorLoader}는 중단된 후에도
+자신의 데이터를 유지할 것으로 기대됩니다. 이 때문에 애플리케이션이
액티비티 또는 프래그먼트의 @link android.app.Activity#onStop
-onStop()} 및 {@link android.app.Activity#onStart onStart()}를 가로질러 데이터를 유지할 수 있고,
-따라서 사용자가 애플리케이션에 되돌아오면 데이터가 다시 로딩되기를 기다리지
-않아도 됩니다. 새 로더를 언제 생성해야 할지 알아보려면 {@link android.app.LoaderManager.LoaderCallbacks}
-메서드를 사용합니다. 또한 로더의 데이터 사용을 중단할 때가 되면
+onStop()} 및 {@link android.app.Activity#onStart onStart()}를 가로질러 데이터를 유지할 수 있고,
+따라서 사용자가 애플리케이션에 되돌아오면 데이터가 다시 로딩되기를 기다리지
+않아도 됩니다. 새 로더를 언제 생성해야 할지 알아보려면 {@link android.app.LoaderManager.LoaderCallbacks}
+메서드를 사용합니다. 또한 로더의 데이터 사용을 중단할 때가 되면
이를 애플리케이션에 알리는 데에도 이것을 사용할 수 있습니다.</p>
-<p>{@link android.app.LoaderManager.LoaderCallbacks}에는 다음과 같은 메서드가
+<p>{@link android.app.LoaderManager.LoaderCallbacks}에는 다음과 같은 메서드가
포함됩니다.</p>
<ul>
<li>{@link android.app.LoaderManager.LoaderCallbacks#onCreateLoader onCreateLoader()} -
@@ -246,7 +246,7 @@
</li></ul>
<ul>
<li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
-- 이전에 생성된 로더가 휴식 중이라서 해당되는 데이터를 사용할 수 없을 경우
+- 이전에 생성된 로더가 휴식 중이라서 해당되는 데이터를 사용할 수 없을 경우
호출됩니다.
</li>
</ul>
@@ -255,32 +255,32 @@
<h4 id ="onCreateLoader">onCreateLoader</h4>
<p>로더에 액세스하려 시도하는 경우(예를 들어 {@link
-android.app.LoaderManager#initLoader initLoader()}를 통해), 로더는 해당 ID가 지정하는 로더가 존재하는지
+android.app.LoaderManager#initLoader initLoader()}를 통해), 로더는 해당 ID가 지정하는 로더가 존재하는지
여부를 확인합니다. 그런 로더가 없으면, {@link
android.app.LoaderManager.LoaderCallbacks} 메서드 {@link
-android.app.LoaderManager.LoaderCallbacks#onCreateLoader onCreateLoader()}를 발생시킵니다. 여기에서
+android.app.LoaderManager.LoaderCallbacks#onCreateLoader onCreateLoader()}를 발생시킵니다. 여기에서
새 로더를 생성합니다. 이것은 보통 {@link
android.content.CursorLoader}이지만, 개발자 나름대로 {@link
android.content.Loader} 하위 클래스를 구현해도 됩니다. </p>
<p>이 예시에서는, {@link
android.app.LoaderManager.LoaderCallbacks#onCreateLoader onCreateLoader()}
- 콜백 메서드가 {@link android.content.CursorLoader}를 생성합니다.
-{@link android.content.CursorLoader}를 자체 생성자 메서드를 사용하여 구축해야 합니다. 이것은
+ 콜백 메서드가 {@link android.content.CursorLoader}를 생성합니다.
+{@link android.content.CursorLoader}를 자체 생성자 메서드를 사용하여 구축해야 합니다. 이것은
{@link
android.content.ContentProvider}로 쿼리를 수행하기 위해 필요한 모든 정보 집합을 필요로 합니다. 구체적으로 필요한 것은 다음과 같습니다.</p>
<ul>
<li><em>uri</em> — 검색할 콘텐츠의 URI입니다. </li>
- <li><em>예측</em> — 반환할 열 목록입니다.
+ <li><em>예측</em> — 반환할 열 목록입니다.
<code>null</code>을 전달하면 모든 열을 반환하며, 이는 비효율적입니다. </li>
- <li><em>선택</em> — 반환할 행을 선언하는 필터로,
-SQL WHERE 절로 형식이 설정됩니다(WHERE 자체는 제외).
+ <li><em>선택</em> — 반환할 행을 선언하는 필터로,
+SQL WHERE 절로 형식이 설정됩니다(WHERE 자체는 제외).
<code>null</code>을 반환하면 주어진 URI에 대한 모든 행을 반환합니다. </li>
- <li><em>selectionArgs</em> — 선택에 ?를 포함해도 됩니다. 이렇게 하면
-이것이 <em>selectionArgs</em>에서 가져온 값으로 교체되며, 이때 선택에 표시되는
+ <li><em>selectionArgs</em> — 선택에 ?를 포함해도 됩니다. 이렇게 하면
+이것이 <em>selectionArgs</em>에서 가져온 값으로 교체되며, 이때 선택에 표시되는
순서를 따릅니다. 값은 문자열로 바인딩됩니다. </li>
- <li><em>sortOrder</em> — SQL ORDER BY 절 형식으로 설정된
-행의 순서 지정 방법입니다(ORDER BY 자체는 제외). <code>null</code>을
+ <li><em>sortOrder</em> — SQL ORDER BY 절 형식으로 설정된
+행의 순서 지정 방법입니다(ORDER BY 자체는 제외). <code>null</code>을
전달하면 기본 정렬 순서를 사용하는데, 이는 순서가 없습니다.</li>
</ul>
<p>예:</p>
@@ -312,19 +312,19 @@
}</pre>
<h4 id="onLoadFinished">onLoadFinished</h4>
-<p>이 메서드는 이전에 생성된 로더가 로딩을 완료하면 호출됩니다.
-이 로더에 대해 제공된 마지막 데이터가 릴리스되기 전에 틀림없이
-이 메서드가 호출됩니다. 이 시점에서 오래된 데이터의
-사용 내용을 모두 제거해야 하지만(곧 릴리스될 것이므로), 데이터 릴리스를 직접 수행해서는 안 됩니다. 해당 데이터는
+<p>이 메서드는 이전에 생성된 로더가 로딩을 완료하면 호출됩니다.
+이 로더에 대해 제공된 마지막 데이터가 릴리스되기 전에 틀림없이
+이 메서드가 호출됩니다. 이 시점에서 오래된 데이터의
+사용 내용을 모두 제거해야 하지만(곧 릴리스될 것이므로), 데이터 릴리스를 직접 수행해서는 안 됩니다. 해당 데이터는
로더의 소유이며, 로더가 알아서 처리할 것이기 때문입니다.</p>
-<p>로더는 애플리케이션이 데이터를 더 이상 사용하지 않는다는 사실을 알게 되면 곧바로 해당 데이터를
+<p>로더는 애플리케이션이 데이터를 더 이상 사용하지 않는다는 사실을 알게 되면 곧바로 해당 데이터를
릴리스할 것입니다. 예를 들어 데이터가 {@link
android.content.CursorLoader}의 커서인 경우, 거기에서 직접 {@link
-android.database.Cursor#close close()}를 호출하면 안 됩니다. 커서가
+android.database.Cursor#close close()}를 호출하면 안 됩니다. 커서가
{@link android.widget.CursorAdapter}에 배치되는 경우, {@link
-android.widget.SimpleCursorAdapter#swapCursor swapCursor()} 메서드를 사용해야 합니다. 그래야
+android.widget.SimpleCursorAdapter#swapCursor swapCursor()} 메서드를 사용해야 합니다. 그래야
오래된 {@link android.database.Cursor}가 종료되지 않습니다. 예:</p>
<pre>
@@ -340,11 +340,11 @@
<h4 id="onLoaderReset">onLoaderReset</h4>
-<p>이 메서드는 이전에 생성된 로더가 휴식 중이라서 해당되는 데이터를 사용할 수 없는 경우
-호출됩니다. 이 콜백을 사용하면 데이터가 언제 릴리스될지 알아낼 수 있어
+<p>이 메서드는 이전에 생성된 로더가 휴식 중이라서 해당되는 데이터를 사용할 수 없는 경우
+호출됩니다. 이 콜백을 사용하면 데이터가 언제 릴리스될지 알아낼 수 있어
이에 대한 참조를 직접 제거할 수 있습니다. </p>
-<p>이 구현은
-{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}를 호출하며,
+<p>이 구현은
+{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}를 호출하며,
이때 값은 <code>null</code>을 씁니다.</p>
<pre>
@@ -363,12 +363,12 @@
<h2 id="example">예</h2>
<p>일례를 제시하기 위해 아래에 {@link android.widget.ListView}를 표시하는 {@link
-android.app.Fragment}의 전체 구현을 나타내었습니다. 여기에는
+android.app.Fragment}의 전체 구현을 나타내었습니다. 여기에는
연락처 콘텐츠 제공자에 대한 쿼리 결과가 들어 있습니다. 이것은 {@link
android.content.CursorLoader}를 사용하여 제공자에 대한 쿼리를 관리합니다.</p>
-
-<p>이 예시에서 나타낸 바와 같이 애플리케이션이 사용자의 연락처에 액세스하려면
-애플리케이션의 매니페스트에
+
+<p>이 예시에서 나타낸 바와 같이 애플리케이션이 사용자의 연락처에 액세스하려면
+애플리케이션의 매니페스트에
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS} 권한이 포함되어 있어야 합니다.</p>
<pre>
@@ -479,16 +479,16 @@
}</pre>
<h3 id="more_examples">추가 예</h3>
-<p>로더를 사용하는 법을 보여주는 몇 가지 다른 예가 <strong>ApiDemos</strong>에
+<p>로더를 사용하는 법을 보여주는 몇 가지 다른 예가 <strong>ApiDemos</strong>에
소개되어 있습니다.</p>
<ul>
<li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
-LoaderCursor</a> — 위에 표시된 코드 조각의 완전한
+LoaderCursor</a> — 위에 표시된 코드 조각의 완전한
버전입니다.</li>
- <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> — 데이터가 변경될 때 콘텐츠 제공자가
+ <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> — 데이터가 변경될 때 콘텐츠 제공자가
수행하는 쿼리의 수를 줄이기 위해 제한을 사용하는 방법을 예시로 나타낸 것입니다.</li>
</ul>
-<p>SDK 샘플을 다운로드하고 설치하는 데 대한 정보는 <a href="http://developer.android.com/resources/samples/get.html">샘플
+<p>SDK 샘플을 다운로드하고 설치하는 데 대한 정보는 <a href="http://developer.android.com/resources/samples/get.html">샘플
가져오기</a>를 참조하십시오. </p>
diff --git a/docs/html-intl/intl/ko/guide/components/processes-and-threads.jd b/docs/html-intl/intl/ko/guide/components/processes-and-threads.jd
index 850d55c..cad4917 100644
--- a/docs/html-intl/intl/ko/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/ko/guide/components/processes-and-threads.jd
@@ -28,10 +28,10 @@
<p>애플리케이션 구성 요소가 시작되고 애플리케이션에 실행 중인 다른 구성 요소가 없으면
Android 시스템은 하나의 실행 스레드로 애플리케이션의 Linux 프로세스를
시작합니다. 기본적으로 같은 애플리케이션의 모든 구성 요소는 같은 프로세스와 스레드에서 실행됩니다
-("기본" 스레드라고 합니다). 애플리케이션 구성 요소가 시작되고 (애플리케이션의 다른 구성 요소가 존재해서)
+("기본" 스레드라고 합니다). 애플리케이션 구성 요소가 시작되고 (애플리케이션의 다른 구성 요소가 존재해서)
해당 애플리케이션의 프로세스가 이미 존재하면 해당 구성 요소는
-프로세스 내에서 시작되고 같은 실행 스레드를 사용합니다. 하지만 애플리케이션 내의
-여러 가지 구성 요소가 각자 별도의 프로세스에서 실행되도록 할 수도 있고, 어느 프로세스에든 추가 스레드를
+프로세스 내에서 시작되고 같은 실행 스레드를 사용합니다. 하지만 애플리케이션 내의
+여러 가지 구성 요소가 각자 별도의 프로세스에서 실행되도록 할 수도 있고, 어느 프로세스에든 추가 스레드를
만들 수 있습니다.</p>
<p>이 문서는 프로세스와 스레드가 Android 애플리케이션에서 작동하는 방식을 설명합니다.</p>
@@ -48,8 +48,8 @@
<service>}</a>, <a href="{@docRoot}guide/topics/manifest/receiver-element.html">{@code
<receiver>}</a> 및 <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code
<provider>}</a>—의 각 유형에 대한 매니페스트 항목은 구성 요소를 실행할 프로세스를 지정하는 {@code android:process} 속성을 지원합니다.
- 이러한 속성을 설정하여 각 구성 요소를 자체 프로세스에서 실행시키거나
-다른 구성 요소를 제외한 일부 구성 요소만 프로세스를 공유하게 할 수 있습니다 또한,
+ 이러한 속성을 설정하여 각 구성 요소를 자체 프로세스에서 실행시키거나
+다른 구성 요소를 제외한 일부 구성 요소만 프로세스를 공유하게 할 수 있습니다 또한,
{@code android:process}를 설정하여 다른 애플리케이션의 구성 요소를 같은 프로세스에서 실행시킬 수 있습니다.
단, 이는 애플리케이션이 같은 Linux 사용자 ID를 공유하고 같은 인증서에
서명되었을 경우에 한합니다.</p>
@@ -58,35 +58,35 @@
<application>}</a> 요소도 {@code android:process} 속성을 지원하여,
모든 구성 요소에 적용되는 기본값을 설정합니다.</p>
-<p>Android는 어느 시점엔가 프로세스를 종료하기로 결정할 수도 있습니다. 즉 메모리가 부족하거나, 사용자에게 더욱 즉각적인 서비스를 제공하는
-다른 프로세스가 이 프로세스의 중단을 필요로 하는 경우 등입니다. 그러면 중단된
-프로세스에서 실행되고 있던 애플리케이션 구성 요소도 따라서 소멸됩니다. 그와 같은 구성 요소가 할 작업이 다시 생기면
+<p>Android는 어느 시점엔가 프로세스를 종료하기로 결정할 수도 있습니다. 즉 메모리가 부족하거나, 사용자에게 더욱 즉각적인 서비스를 제공하는
+다른 프로세스가 이 프로세스의 중단을 필요로 하는 경우 등입니다. 그러면 중단된
+프로세스에서 실행되고 있던 애플리케이션 구성 요소도 따라서 소멸됩니다. 그와 같은 구성 요소가 할 작업이 다시 생기면
그에 대한 프로세스도 다시 시작됩니다.</p>
-<p>어느 프로세스를 삭제할지 결정할 때, Android 시스템은
-사용자에 대한 이들의 상대적 중요성을 가늠합니다. 예를 들어, 눈에 보이는 액티비티를 호스팅하는 프로세스와 비교하여
-화면에 보이지 않는 액티비티를 호스팅하는 프로세스를 쉽게 종료할 수 있습니다. 프로세스 종료 결정은
-해당 프로세스에서 실행되는 구성 요소의 상태에 따라 달라집니다. 종료할
+<p>어느 프로세스를 삭제할지 결정할 때, Android 시스템은
+사용자에 대한 이들의 상대적 중요성을 가늠합니다. 예를 들어, 눈에 보이는 액티비티를 호스팅하는 프로세스와 비교하여
+화면에 보이지 않는 액티비티를 호스팅하는 프로세스를 쉽게 종료할 수 있습니다. 프로세스 종료 결정은
+해당 프로세스에서 실행되는 구성 요소의 상태에 따라 달라집니다. 종료할
프로세스를 결정하는 데 사용하는 규칙은 아래에 설명되어 있습니다. </p>
<h3 id="Lifecycle">프로세스 수명 주기</h3>
<p>Android 시스템은 최대한 오래 애플리케이션 프로세스를 유지하려고 시도하지만,
-결국 오래된 프로세스를 제거하고 새 프로세스나 더 중요한 프로세스에 사용할 메모리를 확보해야 합니다. 유지할
+결국 오래된 프로세스를 제거하고 새 프로세스나 더 중요한 프로세스에 사용할 메모리를 확보해야 합니다. 유지할
프로세스와 종료할 프로세스를 결정하기 위해
-시스템은 프로세스에서 실행되는 구성 요소와 해당 구성 요소의 상태에 기초하여 각 프로세스에
-"중요 계층"을 부여합니다. 중요도가 낮은
+시스템은 프로세스에서 실행되는 구성 요소와 해당 구성 요소의 상태에 기초하여 각 프로세스에
+"중요 계층"을 부여합니다. 중요도가 낮은
프로세스가 먼저 제거되고, 그 다음으로 중요도가 낮은 프로세스를 제거하는 식으로
필요에 따라 시스템 리소스를 회복하는 것입니다.</p>
-<p>중요 계층에는 다섯 가지 단계가 있습니다. 다음 목록은
-중요도 순서에 따른 프로세스 유형을 나타낸 것입니다(첫 번째 프로세스가 <em>가장 중요하고</em>
+<p>중요 계층에는 다섯 가지 단계가 있습니다. 다음 목록은
+중요도 순서에 따른 프로세스 유형을 나타낸 것입니다(첫 번째 프로세스가 <em>가장 중요하고</em>
<em>마지막으로 종료됩니다)</em>.</p>
<ol>
<li><b>전경 프로세스</b>
- <p>사용자가 현재 진행하는 작업에 필요한 프로세스입니다. 다음 조건 중
+ <p>사용자가 현재 진행하는 작업에 필요한 프로세스입니다. 다음 조건 중
하나가 참일 경우 프로세스가 전경에 있는 것으로 간주합니다.</p>
<ul>
@@ -108,19 +108,19 @@
android.content.BroadcastReceiver#onReceive onReceive()} 메서드를 실행하는 {@link android.content.BroadcastReceiver}를 호스팅할 경우.</li>
</ul>
- <p>일반적으로, 주어진 시간에 존재하는 전경 프로세스는 몇 개밖에 되지 않습니다. 이들은 최후의
-수단으로서만 종료됩니다. 즉, 메모리가 너무 부족해 계속 실행할 수 없는 경우를 말합니다. 일반적으로 그 시점이 되면
-기기가 메모리 페이징 상태에 도달한 것이므로 전경 프로세스 몇 개를 중단해야만
+ <p>일반적으로, 주어진 시간에 존재하는 전경 프로세스는 몇 개밖에 되지 않습니다. 이들은 최후의
+수단으로서만 종료됩니다. 즉, 메모리가 너무 부족해 계속 실행할 수 없는 경우를 말합니다. 일반적으로 그 시점이 되면
+기기가 메모리 페이징 상태에 도달한 것이므로 전경 프로세스 몇 개를 중단해야만
사용자 인터페이스의 반응성을 유지할 수 있습니다.</p></li>
<li><b>가시적 프로세스</b>
- <p>전경 구성 요소는 없지만
-사용자가 화면에서 보는 것에 영향을 미칠 수 있는 프로세스입니다. 다음 조건 중 하나가 참이면
+ <p>전경 구성 요소는 없지만
+사용자가 화면에서 보는 것에 영향을 미칠 수 있는 프로세스입니다. 다음 조건 중 하나가 참이면
가시적 프로세스로 간주합니다.</p>
<ul>
<li>전경에 있지는 않지만 사용자에게 보이는 {@link android.app.Activity}를 호스팅할 경우
-({@link android.app.Activity#onPause onPause()} 메서드가 호출되었을 경우).
+({@link android.app.Activity#onPause onPause()} 메서드가 호출되었을 경우).
예를 들어 이것은 전경 액티비티가 대화를 시작하여 이전 액티비티가 그 뒤에 보일 경우
발생합니다.</li>
@@ -128,59 +128,59 @@
</li>
</ul>
- <p>가시적인 프로세스는 매우 중요도가 높은 것으로 취급하고 모든 전경 프로세스를 실행하는 데 필요할 경우에만
+ <p>가시적인 프로세스는 매우 중요도가 높은 것으로 취급하고 모든 전경 프로세스를 실행하는 데 필요할 경우에만
종료됩니다. </p>
</li>
<li><b>서비스 프로세스</b>
<p>{@link
-android.content.Context#startService startService()} 메서드로 시작되었지만 두 개의 상위 계층 분류에
-들어가지 않는 서비스를 실행하는 프로세스입니다. 서비스 프로세스는 사용자가 보는 것과 직접 연결되어 있지는 않지만,
-일반적으로 사용자가 신경 쓰는 작업을 하므로(배경에서 음악 재생 또는 네트워크에서 데이터 다운로드)
-시스템은 모든 전경 및 가시적 프로세스와 함께 실행할 만큼 메모리가 충분하지 않을 경우에만
+android.content.Context#startService startService()} 메서드로 시작되었지만 두 개의 상위 계층 분류에
+들어가지 않는 서비스를 실행하는 프로세스입니다. 서비스 프로세스는 사용자가 보는 것과 직접 연결되어 있지는 않지만,
+일반적으로 사용자가 신경 쓰는 작업을 하므로(배경에서 음악 재생 또는 네트워크에서 데이터 다운로드)
+시스템은 모든 전경 및 가시적 프로세스와 함께 실행할 만큼 메모리가 충분하지 않을 경우에만
프로세스를 중단합니다. </p>
</li>
<li><b>배경 프로세스</b>
- <p>현재 사용자에게 보이지 않는 액티비티를 보유한 프로세스입니다(액티비티의
-{@link android.app.Activity#onStop onStop()} 메서드가 호출되었습니다). 이와 같은 프로세스는
-사용자 환경에 직접적 영향을 미치지 않고, 시스템은 언제든 이 프로세스를 중단시켜
+ <p>현재 사용자에게 보이지 않는 액티비티를 보유한 프로세스입니다(액티비티의
+{@link android.app.Activity#onStop onStop()} 메서드가 호출되었습니다). 이와 같은 프로세스는
+사용자 환경에 직접적 영향을 미치지 않고, 시스템은 언제든 이 프로세스를 중단시켜
전경,
-가시적 또는 서비스 프로세스를 위한 메모리를 확보할 수 있습니다. 보통 한번에 실행 중인 배경 프로세스가 많은 편이므로 이들은
-LRU(최저 사용 빈도) 목록에 보관하여 사용자가 가장 최근에 본 액티비티가 있는
-프로세스가 가장 마지막에 중단되도록 합니다. 액티비티가 수명 주기 메서드를 올바르게 구현하고
-자신의 현재 상태를 저장할 경우, 사용자가 액티비티로 다시 이동할 때 액티비티가 모든 가시적 상태를
-복원하므로 프로세스를 중단시키더라도 사용자 환경에는 눈에 띄게 영향을 미치지
+가시적 또는 서비스 프로세스를 위한 메모리를 확보할 수 있습니다. 보통 한번에 실행 중인 배경 프로세스가 많은 편이므로 이들은
+LRU(최저 사용 빈도) 목록에 보관하여 사용자가 가장 최근에 본 액티비티가 있는
+프로세스가 가장 마지막에 중단되도록 합니다. 액티비티가 수명 주기 메서드를 올바르게 구현하고
+자신의 현재 상태를 저장할 경우, 사용자가 액티비티로 다시 이동할 때 액티비티가 모든 가시적 상태를
+복원하므로 프로세스를 중단시키더라도 사용자 환경에는 눈에 띄게 영향을 미치지
않습니다. 상태 저장과 복원에 관한 정보는 <a href="{@docRoot}guide/components/activities.html#SavingActivityState">액티비티</a>
문서를 참조하십시오.</p>
</li>
<li><b>빈 프로세스</b>
- <p>활성 애플리케이션 구성 요소를 보유하지 않은 프로세스입니다. 이런 프로세스를
-유지하는 유일한 이유는 다음에 내부 구성 요소를 실행할 때 시작 시간을 절약하기 위한 캐싱
+ <p>활성 애플리케이션 구성 요소를 보유하지 않은 프로세스입니다. 이런 프로세스를
+유지하는 유일한 이유는 다음에 내부 구성 요소를 실행할 때 시작 시간을 절약하기 위한 캐싱
때문입니다. 시스템은 프로세스 캐시와 기본 커널 캐시 사이에서 전반적인 시스템 리소스의 균형을 맞추기 위해
이 프로세스를 중단시키는 경우가 많습니다.</p>
</li>
</ol>
- <p>Android는 프로세스에서 현재 활성 상태인 구성 요소의 중요도에 따라
-프로세스에 가장 높은 수준을 부여합니다. 예를 들어, 프로세스가 서비스와 가시적 액티비티를 호스팅할 경우,
+ <p>Android는 프로세스에서 현재 활성 상태인 구성 요소의 중요도에 따라
+프로세스에 가장 높은 수준을 부여합니다. 예를 들어, 프로세스가 서비스와 가시적 액티비티를 호스팅할 경우,
해당 프로세스는 서비스 프로세스가 아니라 가시적 프로세스 등급이 부여됩니다.</p>
<p>또한, 프로세스의 등급은 다른 프로세스가 이에 의존할 경우 상승할 수 있습니다.
-즉, 다른 프로세스에 서비스를 제공하는 프로세스가 서비스 제공 대상 프로세스보다
-등급이 낮은 경우는 있을 수 없습니다. 예를 들어 프로세스 A의 콘텐츠 제공자가 프로세스 B의 클라이언트에 서비스를 제공하거나
-프로세스 A의 서비스가 프로세스 B의 구성 요소에 바인딩되어 있을 경우 프로세스 A는 항상 중요도가
+즉, 다른 프로세스에 서비스를 제공하는 프로세스가 서비스 제공 대상 프로세스보다
+등급이 낮은 경우는 있을 수 없습니다. 예를 들어 프로세스 A의 콘텐츠 제공자가 프로세스 B의 클라이언트에 서비스를 제공하거나
+프로세스 A의 서비스가 프로세스 B의 구성 요소에 바인딩되어 있을 경우 프로세스 A는 항상 중요도가
프로세스 B와 같거나 그보다 높습니다.</p>
- <p>서비스를 실행하는 프로세스가 배경 액티비티가 포함된 프로세스보다 높으므로,
+ <p>서비스를 실행하는 프로세스가 배경 액티비티가 포함된 프로세스보다 높으므로,
장기 작업을 시작하는 액티비티는 작업자 스레드만 생성하기보다는 해당 작업에 대한 <a href="{@docRoot}guide/components/services.html">서비스</a>를 시작하는 것이 좋습니다.
-이는 특히 작업이 해당 액티비티보다 오래 지속될 경우 더욱 중요합니다.
-예를 들어, 웹사이트에 사진을 업로드하는 액티비티가 업로드를 수행하는 서비스를 시작해야
-사용자가 액티비티를 떠나더라도 배경에서 업로드를 지속할 수 있습니다.
-서비스를 사용하면 액티비티에 어떤 일이 발생하든 해당 작업에 반드시
-"서비스 프로세스" 우선 순위 이상이 부여됩니다. 이것이 브로드캐스트 수신기가 시간이 오래 걸리는 작업을
+이는 특히 작업이 해당 액티비티보다 오래 지속될 경우 더욱 중요합니다.
+예를 들어, 웹사이트에 사진을 업로드하는 액티비티가 업로드를 수행하는 서비스를 시작해야
+사용자가 액티비티를 떠나더라도 배경에서 업로드를 지속할 수 있습니다.
+서비스를 사용하면 액티비티에 어떤 일이 발생하든 해당 작업에 반드시
+"서비스 프로세스" 우선 순위 이상이 부여됩니다. 이것이 브로드캐스트 수신기가 시간이 오래 걸리는 작업을
스레드에 넣기보다는 서비스를 사용해야 하는 것과 같은 이유입니다.</p>
@@ -188,36 +188,36 @@
<h2 id="Threads">스레드</h2>
-<p> 애플리케이션이 시작되면 시스템이 애플리케이션에 대한 실행의 스레드를 생성하며, 이를
-"기본"이라고 합니다. 이 스레드는 드로어블 이벤트를 포함하여 적절한 사용자 인터페이스 위젯에
+<p> 애플리케이션이 시작되면 시스템이 애플리케이션에 대한 실행의 스레드를 생성하며, 이를
+"기본"이라고 합니다. 이 스레드는 드로어블 이벤트를 포함하여 적절한 사용자 인터페이스 위젯에
이벤트를 발송하는 역할을 맡기 때문에 중요합니다. 이것은 Android UI 도구 키트의 구성 요소({@link
android.widget}과 {@link android.view} 패키지의 구성 요소)와 개발자의 애플리케이션이
-상호 작용하는 스레드이기도 합니다. 따라서 기본 스레드는
+상호 작용하는 스레드이기도 합니다. 따라서 기본 스레드는
UI 스레드라고 불릴 때도 있습니다.</p>
-<p>시스템은 구성 요소의 각 인스턴스에 대해 별도의 스레드를 생성하지 <em>않습니다</em>. 같은
+<p>시스템은 구성 요소의 각 인스턴스에 대해 별도의 스레드를 생성하지 <em>않습니다</em>. 같은
프로세스에서 실행되는 모든 구성 요소는 UI 스레드에서 시작되고, 각 구성 요소를 호출하는 시스템이
-해당 스레드에서 발송됩니다. 따라서
-시스템 콜백에 응답하는 메서드(사용자 작업을 보고하는 {@link android.view.View#onKeyDown onKeyDown()} 또는
+해당 스레드에서 발송됩니다. 따라서
+시스템 콜백에 응답하는 메서드(사용자 작업을 보고하는 {@link android.view.View#onKeyDown onKeyDown()} 또는
수명 주기 콜백 메서드)는 항상 프로세스의 UI 스레드에서 실행됩니다.</p>
<p>예를 들어, 사용자가 화면의 버튼을 터치하면, 앱 UI 스레드가 위젯에 터치 이벤트를 발송하고,
-위젯은 눌린 상태를 설정하고 이벤트 대기열에
-무효화 요청을 게시합니다. UI 스레드가 이 요청을 대기열에서 해제하고 위젯에 스스로를 다시
+위젯은 눌린 상태를 설정하고 이벤트 대기열에
+무효화 요청을 게시합니다. UI 스레드가 이 요청을 대기열에서 해제하고 위젯에 스스로를 다시
그려야 한다고 알립니다.</p>
<p>앱이 사용자 상호작용에 응답하여 집약적인 작업을 수행할 때는 이 단일 스레드 모델은
애플리케이션을 제대로 구현하지 않으면 낮은 성능을 보일 수 있습니다. 특히,
-모든 것이 UI 스레드에서 발생하고 네트워크 액세스나 데이터 베이스 쿼리 등의 긴 작업을 수행하면
-UI가 통째로 차단됩니다. 스레드가 차단되면 드로잉 이벤트를 포함하여
-모든 이벤트가 발송되지 않습니다. 사용자가 보기에는 애플리케이션이
+모든 것이 UI 스레드에서 발생하고 네트워크 액세스나 데이터 베이스 쿼리 등의 긴 작업을 수행하면
+UI가 통째로 차단됩니다. 스레드가 차단되면 드로잉 이벤트를 포함하여
+모든 이벤트가 발송되지 않습니다. 사용자가 보기에는 애플리케이션이
중단된 것처럼 보입니다. 더 나쁜 경우, UI 스레드가 몇 초 이상 차단되어 있으면
-(현재 약 5초) 사용자에게 악명 높은 "<a href="http://developer.android.com/guide/practices/responsiveness.html">애플리케이션이 응답하지
-않습니다</a>"(ANR) 대화가 표시됩니다. 그러면 사용자가 여러분의 애플리케이션을 종료 할 수도 있고, 불만족한 경우 앱을
+(현재 약 5초) 사용자에게 악명 높은 "<a href="http://developer.android.com/guide/practices/responsiveness.html">애플리케이션이 응답하지
+않습니다</a>"(ANR) 대화가 표시됩니다. 그러면 사용자가 여러분의 애플리케이션을 종료 할 수도 있고, 불만족한 경우 앱을
제거할 수도 있습니다.</p>
-<p>또한, Andoid UI 도구 키트는 스레드로부터 안전하지 <em>않습니다</em>. 따라서 UI를
-작업자 스레드에서 조작해서는 안 됩니다. 사용자 인터페이스 조작 작업은 모두 UI
+<p>또한, Andoid UI 도구 키트는 스레드로부터 안전하지 <em>않습니다</em>. 따라서 UI를
+작업자 스레드에서 조작해서는 안 됩니다. 사용자 인터페이스 조작 작업은 모두 UI
스레드에서 해야만 합니다. 결론적으로, Android의 단일 스레드 모델에는 두 가지 단순한 규칙이 있습니다.</p>
<ol>
@@ -227,12 +227,12 @@
<h3 id="WorkerThreads">작업자 스레드</h3>
-<p>위에 설명한 단일 스레드 모델로 인해, 애플리케이션 UI의 반응성을 위해서는
-UI 스레드를 차단하지 않는 것이 매우 중요합니다. 수행해야 할 작업이 있는데
-이들이 즉각적인 조치를 요하지 않는 경우, 이런 작업은 반드시 별도의 스레드에서 수행해야 합니다("배경" 또는
+<p>위에 설명한 단일 스레드 모델로 인해, 애플리케이션 UI의 반응성을 위해서는
+UI 스레드를 차단하지 않는 것이 매우 중요합니다. 수행해야 할 작업이 있는데
+이들이 즉각적인 조치를 요하지 않는 경우, 이런 작업은 반드시 별도의 스레드에서 수행해야 합니다("배경" 또는
"작업자" 스레드).</p>
-<p>예를 들어, 아래는 별도의 스레드에서 이미지를 다운로드하고 이를
+<p>예를 들어, 아래는 별도의 스레드에서 이미지를 다운로드하고 이를
{@link android.widget.ImageView}에 표시하는 클릭 수신기에 대한 몇 가지 코드입니다.</p>
<pre>
@@ -246,10 +246,10 @@
}
</pre>
-<p>처음에는 네트워크 작업을 처리하기 위한 새 스레드를 생성하므로
-아무 문제 없이 작동하는 것처럼 보입니다. 하지만, 이것은 단일 스레드된 모델의 두 번째 규칙 즉, '<em>UI 스레드 외부에서
+<p>처음에는 네트워크 작업을 처리하기 위한 새 스레드를 생성하므로
+아무 문제 없이 작동하는 것처럼 보입니다. 하지만, 이것은 단일 스레드된 모델의 두 번째 규칙 즉, '<em>UI 스레드 외부에서
Android UI 도구 키트에 액세스하지 마세요.</em>'를 위반합니다. 이 샘플은 UI 스레드 대신 작업자 스레드에서 {@link
-android.widget.ImageView}를 수정합니다. 이렇게 되면
+android.widget.ImageView}를 수정합니다. 이렇게 되면
정의되지 않고 예기치 못한 동작이 발생하는 결과를 초래할 수 있고, 이는 추적하기 어려워 시간도 오래 걸립니다.</p>
<p>이 문제를 해결하기 위해 Android는 다른 스레드에서 UI 스레드에 액세스하는 여러 가지 방식을
@@ -281,28 +281,28 @@
}
</pre>
-<p>이 구현은 이제 스레드로부터 안전합니다. 네트워크 작업은 별도의 스레드에서 수행된 반면
+<p>이 구현은 이제 스레드로부터 안전합니다. 네트워크 작업은 별도의 스레드에서 수행된 반면
{@link android.widget.ImageView}는 UI 스레드에서 조작되었기 때문입니다.</p>
-<p>그러나, 작업이 복잡해질수록 이런 종류의 코드가 더 복잡해질 수 있고 유지 관리하기
-까다로워질 수 있습니다. 더 복잡한 상호 작용을 작업자 스레드로 처리하려면, 작업자 스레드에서
-{@link android.os.Handler}를 사용하여 UI 스레드에서 전달 받은 메시지를 처리하는 방안을
-고려해보십시오. 하지만 최선의 해결책은 {@link android.os.AsyncTask} 클래스를 확장하는 방법일 것입니다.
+<p>그러나, 작업이 복잡해질수록 이런 종류의 코드가 더 복잡해질 수 있고 유지 관리하기
+까다로워질 수 있습니다. 더 복잡한 상호 작용을 작업자 스레드로 처리하려면, 작업자 스레드에서
+{@link android.os.Handler}를 사용하여 UI 스레드에서 전달 받은 메시지를 처리하는 방안을
+고려해보십시오. 하지만 최선의 해결책은 {@link android.os.AsyncTask} 클래스를 확장하는 방법일 것입니다.
이것은 UI와 상호 작용해야 하는 작업자 스레드 작업의 실행을 단순화합니다.</p>
<h4 id="AsyncTask">AsyncTask 사용</h4>
-<p>{@link android.os.AsyncTask}를 사용하면 사용자 인터페이스에서 비동기식 작업을 수행할 수
-있게 해줍니다. 이것은 작업자 스레드에서 차단 작업을 수행하고 그런 다음 그 결과를 UI 스레드에
+<p>{@link android.os.AsyncTask}를 사용하면 사용자 인터페이스에서 비동기식 작업을 수행할 수
+있게 해줍니다. 이것은 작업자 스레드에서 차단 작업을 수행하고 그런 다음 그 결과를 UI 스레드에
게시하며, 개발자가 직접 스레드 및/또는 처리기를 처리할 필요가 없습니다.</p>
<p>이를 사용하려면 우선 {@link android.os.AsyncTask}를 하위 클래스로 한 다음 {@link
-android.os.AsyncTask#doInBackground doInBackground()} 콜백 메서드를 구현해야 합니다. 이것은 여러 가지
+android.os.AsyncTask#doInBackground doInBackground()} 콜백 메서드를 구현해야 합니다. 이것은 여러 가지
배경 스레드에서 실행됩니다. UI를 업데이트하려면 {@link
android.os.AsyncTask#onPostExecute onPostExecute()}를 구현해야 합니다. 이는 {@link
-android.os.AsyncTask#doInBackground doInBackground()}로부터의 결과를 전달하며 UI 스레드에서 실행되므로,
-안전하게 UI를 업데이트할 수 있습니다. 그런 다음 UI 스레드에서 {@link android.os.AsyncTask#execute execute()}를
+android.os.AsyncTask#doInBackground doInBackground()}로부터의 결과를 전달하며 UI 스레드에서 실행되므로,
+안전하게 UI를 업데이트할 수 있습니다. 그런 다음 UI 스레드에서 {@link android.os.AsyncTask#execute execute()}를
호출하여 해당 작업을 실행하면 됩니다.</p>
<p>예를 들어, 이런 방식으로 {@link android.os.AsyncTask}를 사용하여
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
@@ -328,21 +328,21 @@
}
</pre>
-<p>이제 UI는 안전하고 코드는 더욱 단순해졌습니다. 작업을 작업자 스레드에서 수행되어야 하는
+<p>이제 UI는 안전하고 코드는 더욱 단순해졌습니다. 작업을 작업자 스레드에서 수행되어야 하는
부분과 UI 스레드에서 수행되어야 하는 부분으로 구분하기 때문입니다.</p>
-<p>이 클래스를 사용하는 법을 완전히 숙지하려면 {@link android.os.AsyncTask} 참조를
+<p>이 클래스를 사용하는 법을 완전히 숙지하려면 {@link android.os.AsyncTask} 참조를
읽어보시는 것이 좋습니다. 개괄적인 작동 방식은 아래에 간략히 소개해 놓았습니다.</p>
<ul>
-<li>매개 변수의 유형, 진행률 값과 작업의 최종 값을 제네릭을 사용하여
+<li>매개 변수의 유형, 진행률 값과 작업의 최종 값을 제네릭을 사용하여
지정할 수 있습니다.</li>
<li>메서드 {@link android.os.AsyncTask#doInBackground doInBackground()}는 작업자 스레드에서 자동으로
실행됩니다.</li>
<li>{@link android.os.AsyncTask#onPreExecute onPreExecute()}, {@link
android.os.AsyncTask#onPostExecute onPostExecute()} 및 {@link
android.os.AsyncTask#onProgressUpdate onProgressUpdate()}는 모두 UI 스레드에서 호출됩니다.</li>
-<li>{@link android.os.AsyncTask#doInBackground doInBackground()}가 반환한 값이
+<li>{@link android.os.AsyncTask#doInBackground doInBackground()}가 반환한 값이
{@link android.os.AsyncTask#onPostExecute onPostExecute()}로 전송됩니다.</li>
<li>언제든 {@link android.os.AsyncTask#publishProgress publishProgress()}를 {@link
android.os.AsyncTask#doInBackground doInBackground()}에서 호출하여 UI 스레드에서 {@link
@@ -350,27 +350,27 @@
<li>모든 스레드에서 언제든 작업을 취소할 수 있습니다.</li>
</ul>
-<p class="caution"><strong>주의:</strong> 작업자 스레드를 사용할 때 마주칠 수 있는 또 한 가지 문제는
+<p class="caution"><strong>주의:</strong> 작업자 스레드를 사용할 때 마주칠 수 있는 또 한 가지 문제는
<a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 구성 변경</a>으로 인해 액티비티가 예기치 못하게 다시 시작되는 것입니다
-(예를 들어 사용자가 화면 방향을 바꾸는 경우). 이 경우 작업자 스레드를 소멸시킬 수 있습니다.
+(예를 들어 사용자가 화면 방향을 바꾸는 경우). 이 경우 작업자 스레드를 소멸시킬 수 있습니다.
스레드가 재시작될 때 작업을 지속하는 방법과 액티비티가 제거되었을 때 작업을 적절히 취소하는 방법은
<a href="http://code.google.com/p/shelves/">Shelves</a> 샘플 애플리케이션의 소스 코드를 참조하십시오.</p>
<h3 id="ThreadSafe">스레드로부터 안전한 메서드</h3>
-<p> 어떤 경우에는 구현하는 메서드가 하나 이상의 스레드에서 호출되는 일도 있습니다. 따라서
+<p> 어떤 경우에는 구현하는 메서드가 하나 이상의 스레드에서 호출되는 일도 있습니다. 따라서
이를 스레드로부터 안전하게 작성해야만 합니다. </p>
-<p>이것은 주로 원격으로 호출할 수 있는 메서드에 대해 참입니다. 예를 들어 <a href="{@docRoot}guide/components/bound-services.html">바인딩된 서비스</a> 내의 메서드 등이 해당됩니다.
-{@link android.os.IBinder}에서 구현된 메서드가
-{@link android.os.IBinder IBinder}가 실행되는 프로세스에서 호출될 경우, 해당 메서드는 발신자의 스레드에서 실행됩니다.
-그러나 호출이 다른 프로세스에서 발생하면, 해당 메서드는 시스템이
+<p>이것은 주로 원격으로 호출할 수 있는 메서드에 대해 참입니다. 예를 들어 <a href="{@docRoot}guide/components/bound-services.html">바인딩된 서비스</a> 내의 메서드 등이 해당됩니다.
+{@link android.os.IBinder}에서 구현된 메서드가
+{@link android.os.IBinder IBinder}가 실행되는 프로세스에서 호출될 경우, 해당 메서드는 발신자의 스레드에서 실행됩니다.
+그러나 호출이 다른 프로세스에서 발생하면, 해당 메서드는 시스템이
{@link android.os.IBinder
-IBinder}와 같은 프로세스에 유지하는 스레드 풀에서 선택된 스레드에서 실행됩니다(프로세스의 UI 스레드에서 실행되지 않습니다). 예를 들어, 어느 서비스의
-{@link android.app.Service#onBind onBind()} 메서드는 해당 서비스
+IBinder}와 같은 프로세스에 유지하는 스레드 풀에서 선택된 스레드에서 실행됩니다(프로세스의 UI 스레드에서 실행되지 않습니다). 예를 들어, 어느 서비스의
+{@link android.app.Service#onBind onBind()} 메서드는 해당 서비스
프로세스의 UI 스레드에서 호출되고, {@link android.app.Service#onBind
-onBind()}가 반환하는 객체에서 구현된 메서드는(예: RPC 메서드를 구현하는 하위 클래스) 해당 풀 안의 여러 스레드에서
+onBind()}가 반환하는 객체에서 구현된 메서드는(예: RPC 메서드를 구현하는 하위 클래스) 해당 풀 안의 여러 스레드에서
호출되게 됩니다. 서비스에 클라이언트가 하나 이상 있을 수 있으므로, 하나 이상의 풀이
동시에 같은 {@link android.os.IBinder IBinder} 메서드에 참여할 수 있습니다. 그러므로 {@link android.os.IBinder
IBinder} 메서드는 스레드로부터 안전하게 구현되어야 합니다.</p>
@@ -389,13 +389,13 @@
<h2 id="IPC">프로세스 간 통신</h2>
-<p>Android는 원격 프로시저 호출(RPC)을 사용한 프로세스 간 통신(IPC) 메커니즘을 제공합니다.
-여기서 메서드는 액티비티나 다른 애플리케이션 구성 요소에 호출되지만
-원격으로 (또 다른 프로세스에서) 실행되고, 결과는 모두 발신자에게 되돌려
-보냅니다. 메서드 호출과 메서드의 데이터는 운영 체제가 이해할 수 있는 수준으로 분해되고,
-로컬 프로세스와 주소 공간에서 원격 프로세스와 주소 공간으로 전송된 다음
-다시 결합되어 여기서 호출에 다시 응답합니다. 그런 다음 반환 값이
-반대 방향으로 전송됩니다. Android가 이와 같은 IPC 트랜잭션을 수행하는 데 필요한
+<p>Android는 원격 프로시저 호출(RPC)을 사용한 프로세스 간 통신(IPC) 메커니즘을 제공합니다.
+여기서 메서드는 액티비티나 다른 애플리케이션 구성 요소에 호출되지만
+원격으로 (또 다른 프로세스에서) 실행되고, 결과는 모두 발신자에게 되돌려
+보냅니다. 메서드 호출과 메서드의 데이터는 운영 체제가 이해할 수 있는 수준으로 분해되고,
+로컬 프로세스와 주소 공간에서 원격 프로세스와 주소 공간으로 전송된 다음
+다시 결합되어 여기서 호출에 다시 응답합니다. 그런 다음 반환 값이
+반대 방향으로 전송됩니다. Android가 이와 같은 IPC 트랜잭션을 수행하는 데 필요한
모든 코드를 제공하므로, 개발자는 그저 RPC 프로그래밍 인터페이스를 정의하고 구현하는 데에만 집중하면 됩니다. </p>
<p>IPC를 수행하려면 애플리케이션이 반드시 서비스에 바인딩되어야만 하며, 이때 {@link
diff --git a/docs/html-intl/intl/ko/guide/components/recents.jd b/docs/html-intl/intl/ko/guide/components/recents.jd
index cba3c45..28b3c68 100644
--- a/docs/html-intl/intl/ko/guide/components/recents.jd
+++ b/docs/html-intl/intl/ko/guide/components/recents.jd
@@ -38,50 +38,50 @@
<p>개요 화면(다른 말로 최근 사용 화면, 최근 작업 목록 또는 최근 앱이라고도 함)은
시스템 수준 UI로, 최근에 액세스한 <a href="{@docRoot}guide/components/activities.html">
-액티비티</a> 및 <a href="{@docRoot}guide/components/tasks-and-back-stack.html">작업</a>을 목록으로 나열한 것입니다. 사용자는
-목록을 가로질러 이동하며 작업을 선택해서 재개할 수도 있고, 아니면
-목록에서 한 작업을 스와이프하여 밀어내어 목록에서 제거할 수도 있습니다. Android 5.0 릴리스(API 레벨 21)의 경우, 같은 액티비티의 여러 인스턴스에
-각기 다른 문서가 담겨 있는 경우 이들이 개요 화면에 작업으로 나타날 수 있습니다. 예를 들어
-Google Drive에 여러 개의 Google 문서 각각에 대한 작업이 있을 수 있습니다. 각 문서는 개요 화면에 하나의
+액티비티</a> 및 <a href="{@docRoot}guide/components/tasks-and-back-stack.html">작업</a>을 목록으로 나열한 것입니다. 사용자는
+목록을 가로질러 이동하며 작업을 선택해서 재개할 수도 있고, 아니면
+목록에서 한 작업을 스와이프하여 밀어내어 목록에서 제거할 수도 있습니다. Android 5.0 릴리스(API 레벨 21)의 경우, 같은 액티비티의 여러 인스턴스에
+각기 다른 문서가 담겨 있는 경우 이들이 개요 화면에 작업으로 나타날 수 있습니다. 예를 들어
+Google Drive에 여러 개의 Google 문서 각각에 대한 작업이 있을 수 있습니다. 각 문서는 개요 화면에 하나의
작업으로 나타납니다.</p>
<img src="{@docRoot}images/components/recents.png" alt="" width="284" />
-<p class="img-caption"><strong>그림 1.</strong> 세 개의 Google Drive 문서가 각기 별도의
+<p class="img-caption"><strong>그림 1.</strong> 세 개의 Google Drive 문서가 각기 별도의
작업을 나타내는 모습을 표시한 개요 화면입니다.</p>
-<p>보통은 개요 화면에 작업과 액티비티가 어떻게 표현될지는 시스템이
-정의하도록 두어야 합니다. 이 행동을 개발자가 수정할 필요도 없습니다.
-하지만, 개요 화면에 액티비티가 언제, 어떻게 나타날지는 앱이 결정할 수 있습니다.
-{@link android.app.ActivityManager.AppTask} 클래스를 사용하면 작업을 관리할 수 있게 해주고,
-{@link android.content.Intent} 클래스의 액티비티 플래그를 사용하면 개요 화면에서 액티비티가 추가되거나 제거되는 시점을
+<p>보통은 개요 화면에 작업과 액티비티가 어떻게 표현될지는 시스템이
+정의하도록 두어야 합니다. 이 행동을 개발자가 수정할 필요도 없습니다.
+하지만, 개요 화면에 액티비티가 언제, 어떻게 나타날지는 앱이 결정할 수 있습니다.
+{@link android.app.ActivityManager.AppTask} 클래스를 사용하면 작업을 관리할 수 있게 해주고,
+{@link android.content.Intent} 클래스의 액티비티 플래그를 사용하면 개요 화면에서 액티비티가 추가되거나 제거되는 시점을
지정할 수 있습니다. 또한, <code><a href="{@docRoot}guide/topics/manifest/activity-element.html">
<activity></a></code> 특성을 사용하면 매니페스트에서의 동작을 설정할 수 있습니다.</p>
<h2 id="adding">개요 화면에 작업 추가</h2>
-<p>{@link android.content.Intent} 클래스의 플래그를 사용하여 작업을 추가하면
-개요 화면에서 문서가 열리거나 다시 열리는 시점과 방법을 보다 철저히 통제할 수 있습니다.
+<p>{@link android.content.Intent} 클래스의 플래그를 사용하여 작업을 추가하면
+개요 화면에서 문서가 열리거나 다시 열리는 시점과 방법을 보다 철저히 통제할 수 있습니다.
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
- 특성을 사용하는 경우, 문서를 항상 새 작업에서 여는 방법과 기존 작업을 해당 문서에 다시 사용하는 방법 중에서
+ 특성을 사용하는 경우, 문서를 항상 새 작업에서 여는 방법과 기존 작업을 해당 문서에 다시 사용하는 방법 중에서
선택할 수 있습니다.</p>
<h3 id="flag-new-doc">작업 추가에 인텐트 플래그 사용</h3>
-<p>액티비티를 위해 새 문서를 생성하는 경우,
-{@link android.app.ActivityManager.AppTask} 클래스의
+<p>액티비티를 위해 새 문서를 생성하는 경우,
+{@link android.app.ActivityManager.AppTask} 클래스의
{@link android.app.ActivityManager.AppTask#startActivity(android.content.Context, android.content.Intent, android.os.Bundle) startActivity()}
- 메서드를 호출하고, 이것을 액티비티를 시작하는 인텐트에 전달하면 됩니다. 논리적인 중단을 삽입하여 시스템이 개요 화면에서 액티비티를
-새 작업으로 처리하도록 하려면, {@link android.content.Intent}의
-{@link android.content.Intent#addFlags(int) addFlags()} 메서드에 있는 {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
+ 메서드를 호출하고, 이것을 액티비티를 시작하는 인텐트에 전달하면 됩니다. 논리적인 중단을 삽입하여 시스템이 개요 화면에서 액티비티를
+새 작업으로 처리하도록 하려면, {@link android.content.Intent}의
+{@link android.content.Intent#addFlags(int) addFlags()} 메서드에 있는 {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
플래그를 전달하여 액티비티를 시작하도록 합니다.</p>
<p class="note"><strong>참고:</strong> {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
-플래그가 {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET} 플래그를
+플래그가 {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET} 플래그를
대체합니다. 이것은 Android 5.0(API 레벨 21)부터 사용이 중단되었습니다.</p>
-<p>새 문서를 생성하면서 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그를 설정하는 경우,
-시스템은 항상 대상 액티비티를 루트로 하여 새 작업을 만듭니다.
-이렇게 설정하면 같은 문서를 하나 이상의 작업에서 열 수 있습니다. 다음 코드는 기본 액티비티가 이 작업을 수행하는 방법을
+<p>새 문서를 생성하면서 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그를 설정하는 경우,
+시스템은 항상 대상 액티비티를 루트로 하여 새 작업을 만듭니다.
+이렇게 설정하면 같은 문서를 하나 이상의 작업에서 열 수 있습니다. 다음 코드는 기본 액티비티가 이 작업을 수행하는 방법을
보여줍니다.</p>
<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
@@ -111,15 +111,15 @@
</pre>
<p class="note"><strong>참고:</strong> {@code FLAG_ACTIVITY_NEW_DOCUMENT}
- 플래그로 시작된 액티비티의 경우, 반드시 매니페스트에 {@code android:launchMode="standard"} 특성 값(기본)이 설정되어
+ 플래그로 시작된 액티비티의 경우, 반드시 매니페스트에 {@code android:launchMode="standard"} 특성 값(기본)이 설정되어
있어야 합니다.</p>
-<p>기본 액티비티가 새 액티비티를 시작하면 시스템은 기존의 작업을 검색하여 그 중
-해당 액티비티에 대한 인텐트 구성 요소 이름과 인텐트 데이터와 일치하는 인텐트를 가진 작업을 찾습니다. 그러한 작업을
+<p>기본 액티비티가 새 액티비티를 시작하면 시스템은 기존의 작업을 검색하여 그 중
+해당 액티비티에 대한 인텐트 구성 요소 이름과 인텐트 데이터와 일치하는 인텐트를 가진 작업을 찾습니다. 그러한 작업을
찾을 수 없거나 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK}
- 플래그에 들어 있는 인텐트를 찾을 수 없는 경우, 해당 액티비티를 루트로 하여 새 작업이 생성됩니다. 원하는 항목을 찾으면, 시스템은 해당 작업을 전경으로 가지고 와
-새 인텐트를 {@link android.app.Activity#onNewIntent onNewIntent()}에 전달합니다.
-새 액티비티가 인텐트를 받아 개요 화면에서 새 문서를 생성하며, 이는 다음 예시에 나타낸
+ 플래그에 들어 있는 인텐트를 찾을 수 없는 경우, 해당 액티비티를 루트로 하여 새 작업이 생성됩니다. 원하는 항목을 찾으면, 시스템은 해당 작업을 전경으로 가지고 와
+새 인텐트를 {@link android.app.Activity#onNewIntent onNewIntent()}에 전달합니다.
+새 액티비티가 인텐트를 받아 개요 화면에서 새 문서를 생성하며, 이는 다음 예시에 나타낸
것과 같습니다.</p>
<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
@@ -149,64 +149,64 @@
<h3 id="#attr-doclaunch">작업 추가에 액티비티 특성 사용</h3>
-<p>액티비티는 자신의 매니페스트에 새 작업을 시작할 때는 항상
+<p>액티비티는 자신의 매니페스트에 새 작업을 시작할 때는 항상
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
특성, <a href="{@docRoot}guide/topics/manifest/activity-element.html#dlmode">
-{@code android:documentLaunchMode}</a>를 사용한다고 나타낼 수도 있습니다. 이 특성에는 네 가지 값이 있어 사용자가 애플리케이션으로 문서를 열면
+{@code android:documentLaunchMode}</a>를 사용한다고 나타낼 수도 있습니다. 이 특성에는 네 가지 값이 있어 사용자가 애플리케이션으로 문서를 열면
다음과 같은 효과를 발생시킵니다.</p>
<dl>
<dt>"{@code intoExisting}"</dt>
- <dd>액티비티가 문서에 대해 기존의 작업을 재사용합니다. 이것은
-{@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} 플래그를 설정할 때
-{@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그 <em>없이</em> 설정하는 것과 같습니다.
+ <dd>액티비티가 문서에 대해 기존의 작업을 재사용합니다. 이것은
+{@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} 플래그를 설정할 때
+{@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그 <em>없이</em> 설정하는 것과 같습니다.
이는 위의 <a href="#flag-new-doc">작업 추가에 인텐트 플래그 사용</a>에서 설명한 것과 같습니다.</dd>
<dt>"{@code always}"</dt>
- <dd>액티비티가 문서에 대해 새 작업을 생성하며, 이는 문서가 이미 열려 있는 경우라도 마찬가지입니다. 이 값을
+ <dd>액티비티가 문서에 대해 새 작업을 생성하며, 이는 문서가 이미 열려 있는 경우라도 마찬가지입니다. 이 값을
사용하는 것은 {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
및 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그를 둘 다 설정하는 것과 같습니다.</dd>
<dt>"{@code none”}"</dt>
- <dd>액티비티가 문서에 대해 새 작업을 생성하지 않습니다. 개요 화면은 액티비티를 기본 상태에서와
-같이 다룹니다. 즉 앱에 대한 하나의 작업을 표시하며, 이때 사용자가
+ <dd>액티비티가 문서에 대해 새 작업을 생성하지 않습니다. 개요 화면은 액티비티를 기본 상태에서와
+같이 다룹니다. 즉 앱에 대한 하나의 작업을 표시하며, 이때 사용자가
마지막으로 호출한 작업이 무엇이든 관계 없이 그 작업에서부터 재개합니다.</dd>
<dt>"{@code never}"</dt>
- <dd>액티비티가 문서에 대해 새 작업을 생성하지 않습니다. 이 값을 설정하면
+ <dd>액티비티가 문서에 대해 새 작업을 생성하지 않습니다. 이 값을 설정하면
{@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
- 및 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그의 행동을
-재정의합니다(이들 중 하나가 인텐트에서 설정되어 있는 경우). 개요 화면은 앱에 대한 하나의 작업을 표시하고,
+ 및 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 플래그의 행동을
+재정의합니다(이들 중 하나가 인텐트에서 설정되어 있는 경우). 개요 화면은 앱에 대한 하나의 작업을 표시하고,
이것이 사용자가 마지막으로 호출한 액티비티가 무엇이든 그것부터 재개합니다.</dd>
</dl>
-<p class="note"><strong>참고:</strong> {@code none} 및 {@code never}를 제외한 다른 값의 경우,
-액티비티를 {@code launchMode="standard"}로 정의해야 합니다. 이 특성을 지정하지 않으면
+<p class="note"><strong>참고:</strong> {@code none} 및 {@code never}를 제외한 다른 값의 경우,
+액티비티를 {@code launchMode="standard"}로 정의해야 합니다. 이 특성을 지정하지 않으면
{@code documentLaunchMode="none"}이 사용됩니다.</p>
<h2 id="removing">작업 제거</h2>
-<p>기본적으로 문서 작업은 해당되는 액티비티가 완료되면 자동으로 개요 화면에서
-제거됩니다. 이 행동을 재정의하려면 {@link android.app.ActivityManager.AppTask} 클래스를 사용합니다. 이때
+<p>기본적으로 문서 작업은 해당되는 액티비티가 완료되면 자동으로 개요 화면에서
+제거됩니다. 이 행동을 재정의하려면 {@link android.app.ActivityManager.AppTask} 클래스를 사용합니다. 이때
{@link android.content.Intent} 플래그 또는 <code><a href="{@docRoot}guide/topics/manifest/activity-element.html">
<activity></a></code> 특성을 함께 사용하십시오.</p>
-<p>개요 화면에서 작업을 완전히 제외하려면 언제든
+<p>개요 화면에서 작업을 완전히 제외하려면 언제든
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
특성, <a href="{@docRoot}guide/topics/manifest/activity-element.html#exclude">
{@code android:excludeFromRecents}</a>를 {@code true}로 설정합니다.</p>
-<p>개요 화면에서 앱이 포함할 수 있는 작업의 최대 개수를 설정하려면
+<p>개요 화면에서 앱이 포함할 수 있는 작업의 최대 개수를 설정하려면
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
특성 <a href="{@docRoot}guide/topics/manifest/activity-element.html#maxrecents">{@code android:maxRecents}
-</a>를 정수 값으로 설정합니다. 기본은 16개입니다. 작업의 최대 대수에 도달하면 가장 예전에 사용된 작업이 개요 화면에서
-제거됩니다. {@code android:maxRecents} 최대값은
+</a>를 정수 값으로 설정합니다. 기본은 16개입니다. 작업의 최대 대수에 도달하면 가장 예전에 사용된 작업이 개요 화면에서
+제거됩니다. {@code android:maxRecents} 최대값은
50입니다(메모리 용량이 적은 기기에서는 25). 1 미만의 값은 유효하지 않습니다.</p>
<h3 id="#apptask-remove">작업 제거에 AppTask 클래스 사용</h3>
-<p>개요 화면에서 새 작업을 생성하는 액티비티에서는 작업을 언제 제거할 것인지와
-그와 관련된 모든 액티비티를 언제 완료할 것인지 지정할 수 있습니다.
+<p>개요 화면에서 새 작업을 생성하는 액티비티에서는 작업을 언제 제거할 것인지와
+그와 관련된 모든 액티비티를 언제 완료할 것인지 지정할 수 있습니다.
{@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()} 메서드를 호출하면 됩니다.</p>
<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
@@ -218,15 +218,15 @@
}
</pre>
-<p class="note"><strong>참고:</strong>
-{@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()} 메서드를
-사용하면 {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} 태그 사용을 재정의합니다.
+<p class="note"><strong>참고:</strong>
+{@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()} 메서드를
+사용하면 {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} 태그 사용을 재정의합니다.
이 내용은 아래에서 설명합니다.</p>
<h3 id="#retain-finished">완료된 작업 보존</h3>
-<p>작업을 개요 화면에 보존하려면(액티비티가 완료되었더라도),
-액티비티를 시작하는 인텐트의 {@link android.content.Intent#addFlags(int) addFlags()} 메서드에 있는
+<p>작업을 개요 화면에 보존하려면(액티비티가 완료되었더라도),
+액티비티를 시작하는 인텐트의 {@link android.content.Intent#addFlags(int) addFlags()} 메서드에 있는
{@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} 플래그를 전달합니다.</p>
<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
@@ -241,11 +241,11 @@
}
</pre>
-<p>같은 효과를 얻기 위해
+<p>같은 효과를 얻기 위해
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
특성 <a href="{@docRoot}guide/topics/manifest/activity-element.html#autoremrecents">
{@code android:autoRemoveFromRecents}</a>를 {@code false}로 설정해도 됩니다. 기본 값은 문서 액티비티의 경우 {@code true}
-이고, 일반 액티비티의 경우 {@code false}입니다. 이 특성을 사용하면 이전에 논한 것과 같이
+이고, 일반 액티비티의 경우 {@code false}입니다. 이 특성을 사용하면 이전에 논한 것과 같이
{@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} 플래그를 재정의하게 됩니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/components/services.jd b/docs/html-intl/intl/ko/guide/components/services.jd
index fb95ea5..71c2b50 100644
--- a/docs/html-intl/intl/ko/guide/components/services.jd
+++ b/docs/html-intl/intl/ko/guide/components/services.jd
@@ -49,52 +49,52 @@
</div>
-<p>{@link android.app.Service}는 배경에서 오래 실행되는 작업을
-수행할 수 있는 애플리케이션 구성 요소이며 사용자 인터페이스를 제공하지 않습니다. 또 다른
-애플리케이션 구성 요소가 서비스를 시작할 수 있으며, 이는 사용자가 또 다른
-애플리케이션으로 전환하더라도 배경에서 계속해서 실행됩니다. 이외에도, 구성 요소를 서비스에 바인딩하여
-서비스와 상호 작용할 수 있으며, 심지어는 프로세스 간 통신(IPC)도 수행할 수 있습니다. 예를 들어 한 서비스는
-네트워크 트랜잭션을 처리하고, 음악을 재생하고 파일 I/O를 수행하거나 콘텐츠 제공자와 상호 작용할 수 있으며
+<p>{@link android.app.Service}는 배경에서 오래 실행되는 작업을
+수행할 수 있는 애플리케이션 구성 요소이며 사용자 인터페이스를 제공하지 않습니다. 또 다른
+애플리케이션 구성 요소가 서비스를 시작할 수 있으며, 이는 사용자가 또 다른
+애플리케이션으로 전환하더라도 배경에서 계속해서 실행됩니다. 이외에도, 구성 요소를 서비스에 바인딩하여
+서비스와 상호 작용할 수 있으며, 심지어는 프로세스 간 통신(IPC)도 수행할 수 있습니다. 예를 들어 한 서비스는
+네트워크 트랜잭션을 처리하고, 음악을 재생하고 파일 I/O를 수행하거나 콘텐츠 제공자와 상호 작용할 수 있으며
이 모든 것을 배경에서 수행할 수 있습니다.</p>
<p>서비스는 본질적으로 두 가지 형식을 취합니다.</p>
<dl>
<dt>시작됨</dt>
- <dd>서비스가 "시작된" 상태가 되려면 애플리케이션 구성 요소(예: 액티비티)가
-{@link android.content.Context#startService startService()}를 호출하여 시작하면 됩니다. 서비스는 한 번 시작되고 나면
-배경에서 무기한으로 실행될 수 있으며, 이는 해당 서비스를 시작한 구성 요소가 소멸되었더라도 무관합니다. 보통,
+ <dd>서비스가 "시작된" 상태가 되려면 애플리케이션 구성 요소(예: 액티비티)가
+{@link android.content.Context#startService startService()}를 호출하여 시작하면 됩니다. 서비스는 한 번 시작되고 나면
+배경에서 무기한으로 실행될 수 있으며, 이는 해당 서비스를 시작한 구성 요소가 소멸되었더라도 무관합니다. 보통,
시작된 서비스는 한 작업을 수행하고 결과를 발신자에게 반환하지 않습니다.
-예를 들어 네트워크에서 파일을 다운로드하거나 업로드할 수 있습니다. 작업을 완료하면, 해당 서비스는
+예를 들어 네트워크에서 파일을 다운로드하거나 업로드할 수 있습니다. 작업을 완료하면, 해당 서비스는
알아서 중단되는 것이 정상입니다.</dd>
<dt>바인딩됨</dt>
<dd>서비스가 "바인딩된" 상태가 되려면 애플리케이션 구성 요소가 {@link
-android.content.Context#bindService bindService()}를 사용하여 해당 서비스에 바인딩되면 됩니다. 바인딩된 서비스는 클라이언트-서버
-인터페이스를 제공하여 구성 요소가 서비스와 상호 작용할 수 있도록 해주며, 결과를 가져올 수도 있고 심지어
-이와 같은 작업을 여러 프로세스에 걸쳐 프로세스 간 통신(IPC)으로 수행할 수도 있습니다. 바인딩된 서비스는 또 다른 애플리케이션 구성 요소가
-이에 바인딩되어 있는 경우에만 실행됩니다. 여러 개의 구성 요소가 서비스에 한꺼번에 바인딩될 수 있지만,
+android.content.Context#bindService bindService()}를 사용하여 해당 서비스에 바인딩되면 됩니다. 바인딩된 서비스는 클라이언트-서버
+인터페이스를 제공하여 구성 요소가 서비스와 상호 작용할 수 있도록 해주며, 결과를 가져올 수도 있고 심지어
+이와 같은 작업을 여러 프로세스에 걸쳐 프로세스 간 통신(IPC)으로 수행할 수도 있습니다. 바인딩된 서비스는 또 다른 애플리케이션 구성 요소가
+이에 바인딩되어 있는 경우에만 실행됩니다. 여러 개의 구성 요소가 서비스에 한꺼번에 바인딩될 수 있지만,
이 모든 것이 바인딩을 해제하면 해당 서비스는 소멸됩니다.</dd>
</dl>
-<p>이 문서는 주로 이러한 두 가지 유형의 서비스를 따로따로 논하지만, 서비스는
+<p>이 문서는 주로 이러한 두 가지 유형의 서비스를 따로따로 논하지만, 서비스는
두 가지 방식 모두로 작동할 수 있습니다. 즉 서비스가 시작될 수도 있고(나아가 무기한으로 실행되고) 바인딩도 허용할 수 있다는 뜻입니다.
이는 그저 두어 가지 콜백 메서드의 구현 여부에 달린 문제입니다. {@link
android.app.Service#onStartCommand onStartCommand()}를 사용하면 구성 요소가 서비스를 시작할 수 있게 허용하고, {@link
android.app.Service#onBind onBind()}를 사용하면 바인딩을 허용합니다.</p>
<p>애플리케이션이 시작되었든, 바인딩되었든 아니면 양쪽 모두이든 모든 애플리케이션 구성 요소가
-해당 서비스를 사용할 수 있으며(별도의 애플리케이션에서라도), 이는 어느 구성 요소든 액티비티를
-사용할 수 있는 것과 같습니다. 이를 {@link android.content.Intent}로 시작하면 됩니다. 그러나,
-매니페스트에서 서비스를 비공개로 선언하고 다른 애플리케이션으로부터의 액세스를 차단할 수도 있습니다. 이것은
-<a href="#Declaring">매니페스트에서 서비스
+해당 서비스를 사용할 수 있으며(별도의 애플리케이션에서라도), 이는 어느 구성 요소든 액티비티를
+사용할 수 있는 것과 같습니다. 이를 {@link android.content.Intent}로 시작하면 됩니다. 그러나,
+매니페스트에서 서비스를 비공개로 선언하고 다른 애플리케이션으로부터의 액세스를 차단할 수도 있습니다. 이것은
+<a href="#Declaring">매니페스트에서 서비스
선언하기</a>에 관한 섹션에서 더 자세히 이야기합니다.</p>
-<p class="caution"><strong>주의:</strong> 서비스는 자신의 호스팅 프로세스의
-기본 스레드에서 실행됩니다. 서비스는 자신의 스레드를 직접 생성하지 <strong>않으며</strong>,
-별도의 프로세스에서 실행되지도 <strong>않습니다</strong>(별도로 지정하는 경우는 예외). 이것은 즉,
-서비스가 CPU 집약적인 작업을 수행할 예정이거나 차단적인 작업을 수행할 예정인 경우(예를 들어 MP3
-재생 또는 네트워킹 등), 서비스 내에 새 스레드를 생성하여 해당 작업을 수행하도록 해야 한다는 뜻입니다. 별도의 스레드를 사용하면
-'애플리케이션이 응답하지 않습니다(ANR)' 오류가 일어날 위험을 줄일 수 있으며
+<p class="caution"><strong>주의:</strong> 서비스는 자신의 호스팅 프로세스의
+기본 스레드에서 실행됩니다. 서비스는 자신의 스레드를 직접 생성하지 <strong>않으며</strong>,
+별도의 프로세스에서 실행되지도 <strong>않습니다</strong>(별도로 지정하는 경우는 예외). 이것은 즉,
+서비스가 CPU 집약적인 작업을 수행할 예정이거나 차단적인 작업을 수행할 예정인 경우(예를 들어 MP3
+재생 또는 네트워킹 등), 서비스 내에 새 스레드를 생성하여 해당 작업을 수행하도록 해야 한다는 뜻입니다. 별도의 스레드를 사용하면
+'애플리케이션이 응답하지 않습니다(ANR)' 오류가 일어날 위험을 줄일 수 있으며
애플리케이션의 기본 스레드는 액티비티와 사용자 상호 작용 전용으로 유지될 수 있습니다.</p>
@@ -103,89 +103,89 @@
<div class="sidebox-wrapper">
<div class="sidebox">
<h3>서비스와 스레드 중 어느 것을 사용해야 할까요?</h3>
- <p>서비스는 그저 배경에서 실행될 수 있는 구성 요소일 뿐입니다. 이는 사용자가
-애플리케이션과 상호 작용하지 않아도 관계 없이 해당됩니다. 따라서, 서비스를 생성하는 것은 꼭 그것이 필요할 때만으로 국한되어야
+ <p>서비스는 그저 배경에서 실행될 수 있는 구성 요소일 뿐입니다. 이는 사용자가
+애플리케이션과 상호 작용하지 않아도 관계 없이 해당됩니다. 따라서, 서비스를 생성하는 것은 꼭 그것이 필요할 때만으로 국한되어야
합니다.</p>
- <p>기본 스레드 외부에서 작업을 수행해야 하지만 사용자가 애플리케이션과 상호 작용 중인
-동안에만 수행하면 되는 경우라면, 서비스가 아니라 그 대신 새 스레드를 생성해야 합니다. 예를 들어
-액티비티가 실행되는 중에만 음악을 재생하고자 하는 경우,
+ <p>기본 스레드 외부에서 작업을 수행해야 하지만 사용자가 애플리케이션과 상호 작용 중인
+동안에만 수행하면 되는 경우라면, 서비스가 아니라 그 대신 새 스레드를 생성해야 합니다. 예를 들어
+액티비티가 실행되는 중에만 음악을 재생하고자 하는 경우,
{@link android.app.Activity#onCreate onCreate()} 안에 스레드를 생성하고 이를 {@link
android.app.Activity#onStart onStart()}에서 실행하기 시작한 다음 {@link android.app.Activity#onStop
-onStop()}에서 중단하면 됩니다. 또한, 기존의 {@link java.lang.Thread} 클래스 대신
-{@link android.os.AsyncTask} 또는 {@link android.os.HandlerThread}를 사용하는 방안도 고려하십시오. 스레드에 관한 자세한 정보는 <a href="{@docRoot}guide/components/processes-and-threads.html#Threads">프로세스 및
+onStop()}에서 중단하면 됩니다. 또한, 기존의 {@link java.lang.Thread} 클래스 대신
+{@link android.os.AsyncTask} 또는 {@link android.os.HandlerThread}를 사용하는 방안도 고려하십시오. 스레드에 관한 자세한 정보는 <a href="{@docRoot}guide/components/processes-and-threads.html#Threads">프로세스 및
스레딩</a> 문서를 참조하십시오.</p>
- <p>서비스를 사용하는 경우 기본적으로 애플리케이션의 기본 스레드에서
-계속 실행되므로 서비스가 집약적이거나 차단적인 작업을 수행하는 경우 여전히 서비스 내에
+ <p>서비스를 사용하는 경우 기본적으로 애플리케이션의 기본 스레드에서
+계속 실행되므로 서비스가 집약적이거나 차단적인 작업을 수행하는 경우 여전히 서비스 내에
새 스레드를 생성해야 한다는 점을 명심하십시오.</p>
</div>
</div>
-<p>서비스를 생성하려면 {@link android.app.Service}의 하위 클래스를 생성해야 합니다(아니면 이의
-기존 하위 클래스 중 하나). 구현에서는 서비스 수명 주기의 주요 측면을 처리하는 콜백 메서드를
-몇 가지 재정의해야 하며 서비스에 바인딩할 구성 요소에 대한 메커니즘을
+<p>서비스를 생성하려면 {@link android.app.Service}의 하위 클래스를 생성해야 합니다(아니면 이의
+기존 하위 클래스 중 하나). 구현에서는 서비스 수명 주기의 주요 측면을 처리하는 콜백 메서드를
+몇 가지 재정의해야 하며 서비스에 바인딩할 구성 요소에 대한 메커니즘을
제공해야 합니다(해당되는 경우). 재정의해야 하는 가장 중요한 콜백 메서드는 다음과 같습니다.</p>
<dl>
<dt>{@link android.app.Service#onStartCommand onStartCommand()}</dt>
- <dd>시스템이 이 메서드를 호출하는 것은 또 다른 구성 요소(예: 액티비티)가 서비스를
+ <dd>시스템이 이 메서드를 호출하는 것은 또 다른 구성 요소(예: 액티비티)가 서비스를
시작하도록 요청하는 경우입니다. 이때 {@link android.content.Context#startService
-startService()}를 호출하는 방법을 씁니다. 이 메서드가 실행되면 서비스가 시작되고 배경에서 무기한으로 실행될 수
-있습니다. 이것을 구성하면 서비스의 작업이 완료되었을 때 해당 서비스를 중단하는 것은
+startService()}를 호출하는 방법을 씁니다. 이 메서드가 실행되면 서비스가 시작되고 배경에서 무기한으로 실행될 수
+있습니다. 이것을 구성하면 서비스의 작업이 완료되었을 때 해당 서비스를 중단하는 것은
개발자 본인의 책임입니다. 이때 {@link android.app.Service#stopSelf stopSelf()} 또는 {@link
-android.content.Context#stopService stopService()}를 호출하면 됩니다 (바인딩만 제공하고자 하는 경우, 이 메서드를 구현하지
+android.content.Context#stopService stopService()}를 호출하면 됩니다 (바인딩만 제공하고자 하는 경우, 이 메서드를 구현하지
않아도 됩니다).</dd>
<dt>{@link android.app.Service#onBind onBind()}</dt>
<dd>시스템이 이 메서드를 호출하는 것은 또 다른 구성 요소가 해당 서비스에 바인딩되고자 하는 경우
(예를 들어 RPC를 수행하기 위해)입니다. 이때 {@link android.content.Context#bindService
-bindService()}를 호출하는 방법을 씁니다. 이 메서드를 구현할 때에는 클라이언트가 서비스와 통신을 주고받기 위해 사용할
-인터페이스를 제공해야 합니다. 이때 {@link android.os.IBinder}를 반환하면 됩니다. 이 메서드는 항상
+bindService()}를 호출하는 방법을 씁니다. 이 메서드를 구현할 때에는 클라이언트가 서비스와 통신을 주고받기 위해 사용할
+인터페이스를 제공해야 합니다. 이때 {@link android.os.IBinder}를 반환하면 됩니다. 이 메서드는 항상
구현해야 하지만, 바인딩을 허용하지 않고자 하면 null을 반환해야 합니다.</dd>
<dt>{@link android.app.Service#onCreate()}</dt>
- <dd>시스템이 이 메서드를 호출하는 것은 서비스가 처음 생성되어 일회성 설정
-절차를 수행하는 경우입니다({@link android.app.Service#onStartCommand onStartCommand()} 또는
-{@link android.app.Service#onBind onBind()}를 호출하기 전에). 서비스가 이미 실행 중인 경우, 이 메서드는 호출되지
+ <dd>시스템이 이 메서드를 호출하는 것은 서비스가 처음 생성되어 일회성 설정
+절차를 수행하는 경우입니다({@link android.app.Service#onStartCommand onStartCommand()} 또는
+{@link android.app.Service#onBind onBind()}를 호출하기 전에). 서비스가 이미 실행 중인 경우, 이 메서드는 호출되지
않습니다.</dd>
<dt>{@link android.app.Service#onDestroy()}</dt>
- <dd>시스템이 이 메서드를 호출하는 것은 해당 서비스를 더 이상 사용하지 않고 소멸시키는 경우입니다.
-서비스에 이것을 구현해야 스레드, 등록된 각종 수신기(listener, receiver) 등
+ <dd>시스템이 이 메서드를 호출하는 것은 해당 서비스를 더 이상 사용하지 않고 소멸시키는 경우입니다.
+서비스에 이것을 구현해야 스레드, 등록된 각종 수신기(listener, receiver) 등
모든 리소스를 정리할 수 있습니다. 이것이 서비스가 수신하는 마지막 호출입니다.</dd>
</dl>
<p>한 구성 요소가 {@link
android.content.Context#startService startService()}를 호출하여 서비스를 시작하면({@link
-android.app.Service#onStartCommand onStartCommand()}로의 호출을 초래함), 해당 서비스는
-알아서 {@link android.app.Service#stopSelf()}로 스스로를 중단할 때까지 또는
+android.app.Service#onStartCommand onStartCommand()}로의 호출을 초래함), 해당 서비스는
+알아서 {@link android.app.Service#stopSelf()}로 스스로를 중단할 때까지 또는
또 다른 구성 요소가 {@link android.content.Context#stopService stopService()}를 호출하여 서비스를 중단시킬 때까지 실행 중인 상태로 유지됩니다.</p>
-<p>한 구성 요소가
+<p>한 구성 요소가
{@link android.content.Context#bindService bindService()}를 호출하여 서비스를 생성하는 경우(그리고 {@link
-android.app.Service#onStartCommand onStartCommand()}를 호출하지 <em>않은</em> 경우), 해당 서비스는
-해당 구성 요소가 바인딩되어 있는 경우에만 실행됩니다. 서비스가 모든 클라이언트로부터 바인딩 해제되면 시스템이 이를
+android.app.Service#onStartCommand onStartCommand()}를 호출하지 <em>않은</em> 경우), 해당 서비스는
+해당 구성 요소가 바인딩되어 있는 경우에만 실행됩니다. 서비스가 모든 클라이언트로부터 바인딩 해제되면 시스템이 이를
소멸시킵니다.</p>
-<p>Android 시스템이 서비스를 강제 중단시키는 것은 메모리가 부족하여 사용자가 초점을 집중하고 있는
-액티비티를 위해 시스템 리소스를 회복해야만 하는 경우로만 국한됩니다. 해당 서비스가 사용자의 주목을
-끌고 있는 액티비티에 바인딩되어 있다면 중단될 가능성이 낮고, 서비스가 <a href="#Foreground">전경에서 실행</a>된다고 선언된 경우(나중에 자세히 논함), 거의 절대 중단되지 않습니다.
-그렇지 않으면, 서비스가 시작되었고 오랫동안 실행되는 경우
-시간이 지나면서 시스템이 배경 작업 목록에서의 이 서비스의 위치를 점점 낮추고
-서비스는 중단되기 매우 쉬워집니다. 서비스가 시작되었다면 이를 시스템에 의한 재시작을 정상적으로
-처리하도록 디자인해야 합니다. 시스템이 서비스를 중단시키는 경우, 리소스를 다시 사용할 수 있게 되면
+<p>Android 시스템이 서비스를 강제 중단시키는 것은 메모리가 부족하여 사용자가 초점을 집중하고 있는
+액티비티를 위해 시스템 리소스를 회복해야만 하는 경우로만 국한됩니다. 해당 서비스가 사용자의 주목을
+끌고 있는 액티비티에 바인딩되어 있다면 중단될 가능성이 낮고, 서비스가 <a href="#Foreground">전경에서 실행</a>된다고 선언된 경우(나중에 자세히 논함), 거의 절대 중단되지 않습니다.
+그렇지 않으면, 서비스가 시작되었고 오랫동안 실행되는 경우
+시간이 지나면서 시스템이 배경 작업 목록에서의 이 서비스의 위치를 점점 낮추고
+서비스는 중단되기 매우 쉬워집니다. 서비스가 시작되었다면 이를 시스템에 의한 재시작을 정상적으로
+처리하도록 디자인해야 합니다. 시스템이 서비스를 중단시키는 경우, 리소스를 다시 사용할 수 있게 되면
시스템이 가능한 한 빨리 이를 다시 시작합니다(다만 이것은 개발자가 {@link
-android.app.Service#onStartCommand onStartCommand()}에서 반환하는 값에도 좌우됩니다. 이 내용은 나중에 논합니다). 시스템이 서비스를
+android.app.Service#onStartCommand onStartCommand()}에서 반환하는 값에도 좌우됩니다. 이 내용은 나중에 논합니다). 시스템이 서비스를
소멸시킬 수 있는 경우에 대한 자세한 정보는 <a href="{@docRoot}guide/components/processes-and-threads.html">프로세스 및 스레딩</a>
문서를 참조하십시오.</p>
-<p>다음 섹션에서는 각 유형의 서비스를 생성하는 방법과 다른 애플리케이션 구성 요소에서
+<p>다음 섹션에서는 각 유형의 서비스를 생성하는 방법과 다른 애플리케이션 구성 요소에서
이를 사용하는 방법을 배우게 됩니다.</p>
<h3 id="Declaring">매니페스트에서 서비스 선언하기</h3>
-<p>액티비티(및 다른 구성 요소)와 마찬가지로, 서비스는 모두 애플리케이션의 매니페스트
+<p>액티비티(및 다른 구성 요소)와 마찬가지로, 서비스는 모두 애플리케이션의 매니페스트
파일에서 선언해야 합니다.</p>
-<p>서비스를 선언하려면 <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a> 요소를
+<p>서비스를 선언하려면 <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a> 요소를
<a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a>
요소의 하위로 추가하면 됩니다. 예:</p>
@@ -199,28 +199,28 @@
</manifest>
</pre>
-<p>매니페스트에서 서비스를 선언하는 데 대한 자세한 정보는 <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
+<p>매니페스트에서 서비스를 선언하는 데 대한 자세한 정보는 <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
요소 참조를 확인하십시오.</p>
-<p><a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a> 요소에 포함시킬 수 있는 다른 속성도 있습니다.
-이를 포함시켜 서비스를 시작하는 데 필요한 권한과 서비스가 실행되어야 하는 프로세스 등의
+<p><a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a> 요소에 포함시킬 수 있는 다른 속성도 있습니다.
+이를 포함시켜 서비스를 시작하는 데 필요한 권한과 서비스가 실행되어야 하는 프로세스 등의
속성을 정의할 수 있습니다. <a href="{@docRoot}guide/topics/manifest/service-element.html#nm">{@code android:name}</a>
-속성이 유일한 필수 속성입니다. 이것은 서비스의 클래스 이름을 나타냅니다. 일단 애플리케이션을
-게시하고 나면 이 이름을 변경해서는 안 됩니다. 이름을 변경하면
+속성이 유일한 필수 속성입니다. 이것은 서비스의 클래스 이름을 나타냅니다. 일단 애플리케이션을
+게시하고 나면 이 이름을 변경해서는 안 됩니다. 이름을 변경하면
서비스를 시작하거나 바인딩할 명시적 인텐트에 대한 종속성으로 인해 코드를 단절시킬 위험이 있기 때문입니다(블로그 게시물의 <a href="http://android-developers.blogspot.com/2011/06/things-that-cannot-change.html">
바꿀 수 없는 항목</a>을 참조하십시오).
<p>앱의 보안을 보장하려면 <strong>
-{@link android.app.Service}을 시작하거나 바인딩할 때 항상 명시적 인텐트를 사용하고</strong> 서비스에 대한 인텐트 필터는 선언하지 마십시오. 어느
-서비스를 시작할지 어느 정도 모호성을 허용하는 것이 중요한 경우, 서비스에 대해
+{@link android.app.Service}을 시작하거나 바인딩할 때 항상 명시적 인텐트를 사용하고</strong> 서비스에 대한 인텐트 필터는 선언하지 마십시오. 어느
+서비스를 시작할지 어느 정도 모호성을 허용하는 것이 중요한 경우, 서비스에 대해
인텐트 필터를 제공하고 구성 요소 이름을 {@link
android.content.Intent}에서 배제할 수 있지만, 그러면 해당 인텐트에 대한 패키지를 {@link
-android.content.Intent#setPackage setPackage()}로 설정하여 대상 서비스에 대해 충분한 명확화를
+android.content.Intent#setPackage setPackage()}로 설정하여 대상 서비스에 대해 충분한 명확화를
제공하도록 해야 합니다.</p>
-<p>이외에도 서비스를 본인의 앱에만 사용 가능하도록 보장할 수도 있습니다.
+<p>이외에도 서비스를 본인의 앱에만 사용 가능하도록 보장할 수도 있습니다.
<a href="{@docRoot}guide/topics/manifest/service-element.html#exported">{@code android:exported}</a>
- 속성을 포함시킨 뒤 이를 {@code "false"}로 설정하면 됩니다. 이렇게 하면 다른 앱이 여러분의 서비스를 시작하지 못하도록 효과적으로 방지해주며,
+ 속성을 포함시킨 뒤 이를 {@code "false"}로 설정하면 됩니다. 이렇게 하면 다른 앱이 여러분의 서비스를 시작하지 못하도록 효과적으로 방지해주며,
이는 명시적 인텐트를 사용하는 경우에도 문제 없이 적용됩니다.</p>
@@ -229,71 +229,71 @@
<h2 id="CreatingStartedService">시작된 서비스 생성하기</h2>
<p>시작된 서비스란 다른 구성 요소가 {@link
-android.content.Context#startService startService()}를 호출하여 시작하고, 그 결과 서비스의
+android.content.Context#startService startService()}를 호출하여 시작하고, 그 결과 서비스의
{@link android.app.Service#onStartCommand onStartCommand()} 메서드를 호출하는 결과를 초래한 것을 말합니다.</p>
-<p>서비스가 시작되면 이를 시작한 구성 요소와 독립된 자신만의
-수명 주기를 가지며 해당 서비스는 배경에서 무기한으로 실행될 수 있습니다. 이는 해당 서비스를
-시작한 구성 요소가 소멸되었더라도 무관합니다. 따라서, 서비스는 작업이 완료되면
-{@link android.app.Service#stopSelf stopSelf()}를 호출하여 스스로 알아서 중단되는 것이 정상이며 아니면 다른 구성 요소가
+<p>서비스가 시작되면 이를 시작한 구성 요소와 독립된 자신만의
+수명 주기를 가지며 해당 서비스는 배경에서 무기한으로 실행될 수 있습니다. 이는 해당 서비스를
+시작한 구성 요소가 소멸되었더라도 무관합니다. 따라서, 서비스는 작업이 완료되면
+{@link android.app.Service#stopSelf stopSelf()}를 호출하여 스스로 알아서 중단되는 것이 정상이며 아니면 다른 구성 요소가
{@link android.content.Context#stopService stopService()}를 호출하여 중단시킬 수도 있습니다.</p>
<p>애플리케이션 구성 요소(예: 액티비티)가 서비스를 시작하려면 {@link
-android.content.Context#startService startService()}를 호출하고, {@link android.content.Intent}를
-전달하면 됩니다. 이것은 서비스를 나타내고 서비스가 사용할 모든 데이터를 포함합니다. 서비스는 이
+android.content.Context#startService startService()}를 호출하고, {@link android.content.Intent}를
+전달하면 됩니다. 이것은 서비스를 나타내고 서비스가 사용할 모든 데이터를 포함합니다. 서비스는 이
{@link android.content.Intent}를 {@link android.app.Service#onStartCommand
onStartCommand()} 메서드에서 수신합니다.</p>
-<p>예를 들어 어느 액티비티가 온라인 데이터베이스에 데이터를 약간 저장해야 한다고 가정합니다. 액티비티가
+<p>예를 들어 어느 액티비티가 온라인 데이터베이스에 데이터를 약간 저장해야 한다고 가정합니다. 액티비티가
동반자 서비스를 시작하여 저장할 데이터를 이에 전달할 수 있습니다. 이때 인텐트를 {@link
android.content.Context#startService startService()}에 전달하면 됩니다. 서비스는 이 인텐트를 {@link
-android.app.Service#onStartCommand onStartCommand()}에서 수신하고 인터넷에 연결한 다음 데이터베이스
-트랜잭션을 수행합니다. 작업을 완료하면, 해당 서비스는 알아서 스스로 중단되고
+android.app.Service#onStartCommand onStartCommand()}에서 수신하고 인터넷에 연결한 다음 데이터베이스
+트랜잭션을 수행합니다. 작업을 완료하면, 해당 서비스는 알아서 스스로 중단되고
소멸됩니다.</p>
-<p class="caution"><strong>주의:</strong> 서비스는 기본적으로 자신이 선언된 애플리케이션의 같은
-프로세스에서 실행되기도 하고 해당 애플리케이션의 기본 스레드에서 실행되기도 합니다. 따라서, 사용자가
-같은 애플리케이션의 액티비티와 상호 작용하는 동안 서비스가 집약적이거나 차단적인 작업을 수행하는 경우,
-해당 서비스 때문에 액티비티 성능이 느려지게 됩니다. 애플리케이션 성능에 영향을 미치는 것을 방지하려면,
+<p class="caution"><strong>주의:</strong> 서비스는 기본적으로 자신이 선언된 애플리케이션의 같은
+프로세스에서 실행되기도 하고 해당 애플리케이션의 기본 스레드에서 실행되기도 합니다. 따라서, 사용자가
+같은 애플리케이션의 액티비티와 상호 작용하는 동안 서비스가 집약적이거나 차단적인 작업을 수행하는 경우,
+해당 서비스 때문에 액티비티 성능이 느려지게 됩니다. 애플리케이션 성능에 영향을 미치는 것을 방지하려면,
서비스 내에서 새 스레드를 시작해야 합니다.</p>
<p>기존에는 시작된 서비스를 생성하기 위해 확장할 수 있는 클래스가 두 개 있었습니다.</p>
<dl>
<dt>{@link android.app.Service}</dt>
- <dd>이것이 모든 서비스의 기본 클래스입니다. 이 클래스를 확장하는 경우, 서비스의 모든 작업을 수행할
-새 스레드를 만드는 것이 중요합니다. 서비스가 기본적으로 애플리케이션의 기본 스레드를 사용하기
-때문인데, 이로 인해 애플리케이션이 실행 중인 모든 액티비티의 성능이
+ <dd>이것이 모든 서비스의 기본 클래스입니다. 이 클래스를 확장하는 경우, 서비스의 모든 작업을 수행할
+새 스레드를 만드는 것이 중요합니다. 서비스가 기본적으로 애플리케이션의 기본 스레드를 사용하기
+때문인데, 이로 인해 애플리케이션이 실행 중인 모든 액티비티의 성능이
느려질 수 있기 때문입니다.</dd>
<dt>{@link android.app.IntentService}</dt>
- <dd>이것은 {@link android.app.Service}의 하위 클래스로, 작업자 스레드를
-사용하여 모든 시작 요청을 처리하되 한 번에 하나씩 처리합니다. 서비스가 여러 개의 요청을
+ <dd>이것은 {@link android.app.Service}의 하위 클래스로, 작업자 스레드를
+사용하여 모든 시작 요청을 처리하되 한 번에 하나씩 처리합니다. 서비스가 여러 개의 요청을
동시에 처리하지 않아도 되는 경우 이것이 최선의 옵션입니다. 해야 할 일은 {@link
-android.app.IntentService#onHandleIntent onHandleIntent()}를 구현하는 것뿐으로, 이것이 각 시작 요청에 대한 인텐트를 수신하여
+android.app.IntentService#onHandleIntent onHandleIntent()}를 구현하는 것뿐으로, 이것이 각 시작 요청에 대한 인텐트를 수신하여
개발자는 배경 작업을 수행할 수 있습니다.</dd>
</dl>
-<p>다음 섹션에서는 이와 같은 클래스 중 하나를 사용하여 서비스를 구현하는 방법을
+<p>다음 섹션에서는 이와 같은 클래스 중 하나를 사용하여 서비스를 구현하는 방법을
설명합니다.</p>
<h3 id="ExtendingIntentService">IntentService 클래스 확장하기</h3>
<p>대부분의 시작된 서비스는 여러 개의 요청을 동시에 처리하지 않아도 되기 때문에
-(이는 사실 위험한 다중 스레딩 시나리오일 수 있습니다), 서비스를 구현할 때에는
+(이는 사실 위험한 다중 스레딩 시나리오일 수 있습니다), 서비스를 구현할 때에는
{@link android.app.IntentService} 클래스를 사용하는 것이 최선의 방안일 것입니다.</p>
<p>{@link android.app.IntentService}는 다음과 같은 작업을 수행합니다.</p>
<ul>
<li>애플리케이션의 기본 스레드와는 별도로 {@link
-android.app.Service#onStartCommand onStartCommand()}에 전달된 모든 인텐트를 실행하는 기본 작업자 스레드를
+android.app.Service#onStartCommand onStartCommand()}에 전달된 모든 인텐트를 실행하는 기본 작업자 스레드를
생성합니다.</li>
<li>한 번에 인텐트를 하나씩 {@link
-android.app.IntentService#onHandleIntent onHandleIntent()} 구현에 전달하는 작업 대기열을 생성하므로 다중 스레딩에 대해 염려할 필요가
+android.app.IntentService#onHandleIntent onHandleIntent()} 구현에 전달하는 작업 대기열을 생성하므로 다중 스레딩에 대해 염려할 필요가
전혀 없습니다.</li>
- <li>시작 요청이 모두 처리된 후 서비스를 중단하므로 개발자가
+ <li>시작 요청이 모두 처리된 후 서비스를 중단하므로 개발자가
{@link android.app.Service#stopSelf}를 호출할 필요가 전혀 없습니다.</li>
- <li>{@link android.app.IntentService#onBind onBind()}의 기본 구현을 제공하여 null을
+ <li>{@link android.app.IntentService#onBind onBind()}의 기본 구현을 제공하여 null을
반환하도록 합니다.</li>
<li>{@link android.app.IntentService#onStartCommand
onStartCommand()}의 기본 구현을 제공하여 인텐트를 작업 대기열에 보내고, 다음으로 {@link
@@ -301,7 +301,7 @@
</ul>
<p>이 모든 것은 결론적으로 개발자가 직접 할 일은 클라이언트가 제공한 작업을 수행할 {@link
-android.app.IntentService#onHandleIntent onHandleIntent()}를 구현하는 것뿐이라는 사실로
+android.app.IntentService#onHandleIntent onHandleIntent()}를 구현하는 것뿐이라는 사실로
이어집니다. (다만, 서비스에 대해 작은 생성자를 제공해야 하기도 합니다.)</p>
<p>다음은 {@link android.app.IntentService}의 구현을 예시로 나타낸 것입니다.</p>
@@ -345,10 +345,10 @@
<p>다른 콜백 메서드도 재정의하기로 결정하는 경우-예를 들어 {@link
android.app.IntentService#onCreate onCreate()}, {@link
android.app.IntentService#onStartCommand onStartCommand()} 또는 {@link
-android.app.IntentService#onDestroy onDestroy()}-슈퍼 구현을 꼭 호출해야 합니다.
+android.app.IntentService#onDestroy onDestroy()}-슈퍼 구현을 꼭 호출해야 합니다.
그래야 {@link android.app.IntentService}가 작업자 스레드의 수명을 적절하게 처리할 수 있습니다.</p>
-<p>예를 들어 {@link android.app.IntentService#onStartCommand onStartCommand()}는 반드시
+<p>예를 들어 {@link android.app.IntentService#onStartCommand onStartCommand()}는 반드시
기본 구현을 반환해야 합니다(이로써 인텐트가 {@link
android.app.IntentService#onHandleIntent onHandleIntent()}로 전달되는 것입니다).</p>
@@ -360,25 +360,25 @@
}
</pre>
-<p>{@link android.app.IntentService#onHandleIntent onHandleIntent()} 외에 슈퍼 클래스를
+<p>{@link android.app.IntentService#onHandleIntent onHandleIntent()} 외에 슈퍼 클래스를
호출하지 않아도 되는 유일한 메서드는 {@link android.app.IntentService#onBind
onBind()}입니다(다만 이를 구현하는 것은 서비스가 바인딩을 허용할 때에만 필요합니다).</p>
-<p>다음 섹션에서는 기본 {@link android.app.Service}
-클래스를 확장할 때 같은 종류의 서비스를 구현하는 방법을 배우게 됩니다. 이때에는 코드가 훨씬 많이 필요하지만,
+<p>다음 섹션에서는 기본 {@link android.app.Service}
+클래스를 확장할 때 같은 종류의 서비스를 구현하는 방법을 배우게 됩니다. 이때에는 코드가 훨씬 많이 필요하지만,
동시 시작 요청을 처리해야 하는 경우 이것이 적절할 수 있습니다.</p>
<h3 id="ExtendingService">서비스 클래스 확장하기</h3>
-<p>이전 섹션에서 본 것과 같이 {@link android.app.IntentService}를 사용하면
-시작된 서비스 구현이 매우 단순해집니다. 하지만 서비스가 다중 스레딩을
-수행해야 하는 경우(작업 대기열을 통해 시작 요청을 처리하는 대신), 그때는
+<p>이전 섹션에서 본 것과 같이 {@link android.app.IntentService}를 사용하면
+시작된 서비스 구현이 매우 단순해집니다. 하지만 서비스가 다중 스레딩을
+수행해야 하는 경우(작업 대기열을 통해 시작 요청을 처리하는 대신), 그때는
{@link android.app.Service} 클래스를 확장하여 각 인텐트를 처리하게 할 수 있습니다.</p>
<p>비교를 위해 다음 예시의 코드를 보겠습니다. 이는 {@link
android.app.Service} 클래스의 구현으로, 위의 예시에서 {@link
-android.app.IntentService}를 사용하여 수행한 것과 똑같은 작업을 수행합니다. 바꿔 말하면 각 시작 요청에 대해
+android.app.IntentService}를 사용하여 수행한 것과 똑같은 작업을 수행합니다. 바꿔 말하면 각 시작 요청에 대해
작업자 스레드를 사용하여 작업을 수행하고 한 번에 요청을 하나씩만 처리한다는 뜻입니다.</p>
<pre>
@@ -455,46 +455,46 @@
<p>보시다시피 {@link android.app.IntentService}를 사용할 때보다 훨씬 손이 많이 갑니다.</p>
<p>그러나, 각 호출을 {@link android.app.Service#onStartCommand
-onStartCommand()}로 직접 처리할 수 있기 때문에 여러 개의 요청을 동시에 수행할 수 있습니다. 이 예시는 그것을
-보여주는 것은 아니지만, 그런 작업을 원하는 경우 각 요청에 대해 새 스레드를
+onStartCommand()}로 직접 처리할 수 있기 때문에 여러 개의 요청을 동시에 수행할 수 있습니다. 이 예시는 그것을
+보여주는 것은 아니지만, 그런 작업을 원하는 경우 각 요청에 대해 새 스레드를
하나씩 생성한 다음 곧바로 실행하면 됩니다(이전 요청이 끝날 때까지 기다리는 대신).</p>
-<p>{@link android.app.Service#onStartCommand onStartCommand()} 메서드가 반드시
-정수를 반환해야 한다는 사실을 유의하십시오. 정수는 시스템이 서비스를 중단시킨 경우 시스템이 해당 서비스를
+<p>{@link android.app.Service#onStartCommand onStartCommand()} 메서드가 반드시
+정수를 반환해야 한다는 사실을 유의하십시오. 정수는 시스템이 서비스를 중단시킨 경우 시스템이 해당 서비스를
계속하는 방법에 대해 설명하는 값입니다(위에서 논한 바와 같이 {@link
-android.app.IntentService}의 기본 구현이 이것을 개발자 대신 처리해줍니다. 개발자가 이를 수정할 수도 있습니다).
-{@link android.app.Service#onStartCommand onStartCommand()}로부터의 반환 값은 반드시
+android.app.IntentService}의 기본 구현이 이것을 개발자 대신 처리해줍니다. 개발자가 이를 수정할 수도 있습니다).
+{@link android.app.Service#onStartCommand onStartCommand()}로부터의 반환 값은 반드시
다음 상수 중 하나여야 합니다.</p>
<dl>
<dt>{@link android.app.Service#START_NOT_STICKY}</dt>
<dd>시스템이 서비스를 {@link android.app.Service#onStartCommand
-onStartCommand()} 반환 후에 중단시키면 서비스를 재생성하면 <em>안 됩니다.</em> 다만 전달할
-보류 인텐트가 있는 경우는 예외입니다. 이것은 서비스가 불필요하게 실행되는 일을 피할 수 있는 가장 안전한 옵션이며,
+onStartCommand()} 반환 후에 중단시키면 서비스를 재생성하면 <em>안 됩니다.</em> 다만 전달할
+보류 인텐트가 있는 경우는 예외입니다. 이것은 서비스가 불필요하게 실행되는 일을 피할 수 있는 가장 안전한 옵션이며,
애플리케이션이 완료되지 않은 모든 작업을 단순히 재시작할 수 있을 때 좋습니다.</dd>
<dt>{@link android.app.Service#START_STICKY}</dt>
<dd>시스템이 서비스를 {@link android.app.Service#onStartCommand
onStartCommand()} 반환 후에 중단시키는 경우, 서비스를 재생성하고 {@link
-android.app.Service#onStartCommand onStartCommand()}를 호출하되 마지막 인텐트를 다시 전달하지는 <em>마십시오.</em>
-그 대신, 시스템이 null 인텐트로 {@link android.app.Service#onStartCommand onStartCommand()}를
-호출합니다. 다만 서비스를 시작할 보류 인텐트가 있는 경우만은 예외이며, 이럴 때에는
-그러한 인텐트를 전달합니다. 이것은 명령을 실행하지는 않지만 무기한으로 실행 중이며 작업을 기다리고 있는
+android.app.Service#onStartCommand onStartCommand()}를 호출하되 마지막 인텐트를 다시 전달하지는 <em>마십시오.</em>
+그 대신, 시스템이 null 인텐트로 {@link android.app.Service#onStartCommand onStartCommand()}를
+호출합니다. 다만 서비스를 시작할 보류 인텐트가 있는 경우만은 예외이며, 이럴 때에는
+그러한 인텐트를 전달합니다. 이것은 명령을 실행하지는 않지만 무기한으로 실행 중이며 작업을 기다리고 있는
미디어 플레이어(또는 그와 비슷한 서비스)에 적합합니다.</dd>
<dt>{@link android.app.Service#START_REDELIVER_INTENT}</dt>
<dd>시스템이 서비스를 {@link android.app.Service#onStartCommand
onStartCommand()} 반환 후에 중단시키는 경우, 서비스를 재생성하고 서비스에 전달된 마지막 인텐트로 {@link
-android.app.Service#onStartCommand onStartCommand()}를
-호출하십시오. 모든 보류 인텐트가 차례로 전달됩니다. 이것은 즉시 재개되어야 하는 작업을
+android.app.Service#onStartCommand onStartCommand()}를
+호출하십시오. 모든 보류 인텐트가 차례로 전달됩니다. 이것은 즉시 재개되어야 하는 작업을
능동적으로 수행 중인 서비스(예를 들어 파일 다운로드 등)에 적합합니다.</dd>
</dl>
-<p>이러한 반환 값에 대한 자세한 내용은 각 상수에 대해 링크로 연결된 참조 문서를
+<p>이러한 반환 값에 대한 자세한 내용은 각 상수에 대해 링크로 연결된 참조 문서를
확인하십시오.</p>
<h3 id="StartingAService">서비스 시작</h3>
-<p>액티비티나 다른 구성 요소에서 서비스를 시작하려면
+<p>액티비티나 다른 구성 요소에서 서비스를 시작하려면
{@link android.content.Intent}를(시작할 서비스를 나타냄) {@link
android.content.Context#startService startService()}에 전달하면 됩니다. Android 시스템이 서비스의 {@link
android.app.Service#onStartCommand onStartCommand()} 메서드를 호출하여 여기에 {@link
@@ -510,53 +510,53 @@
startService(intent);
</pre>
-<p>{@link android.content.Context#startService startService()} 메서드가 즉시 반환되며
+<p>{@link android.content.Context#startService startService()} 메서드가 즉시 반환되며
Android 시스템이 서비스의 {@link android.app.Service#onStartCommand
onStartCommand()} 메서드를 호출합니다. 서비스가 이미 실행 중이지 않은 경우, 시스템은 우선 {@link
android.app.Service#onCreate onCreate()}를 호출하고, 다음으로 {@link android.app.Service#onStartCommand
onStartCommand()}를 호출합니다.</p>
<p>서비스가 바인딩도 제공하지 않는 경우, {@link
-android.content.Context#startService startService()}와 함께 전달된 인텐트가 애플리케이션 구성 요소와 서비스 사이의
-유일한 통신 방법입니다. 그러나 서비스가 결과를 돌려보내기를 원하는 경우, 서비스를 시작한
-클라이언트가 브로드캐스트를 위해 {@link android.app.PendingIntent}를
-만들 수 있고({@link android.app.PendingIntent#getBroadcast getBroadcast()} 사용) 이를 서비스를 시작한
-{@link android.content.Intent} 내의 서비스에 전달할 수 있습니다. 그러면 서비스가
+android.content.Context#startService startService()}와 함께 전달된 인텐트가 애플리케이션 구성 요소와 서비스 사이의
+유일한 통신 방법입니다. 그러나 서비스가 결과를 돌려보내기를 원하는 경우, 서비스를 시작한
+클라이언트가 브로드캐스트를 위해 {@link android.app.PendingIntent}를
+만들 수 있고({@link android.app.PendingIntent#getBroadcast getBroadcast()} 사용) 이를 서비스를 시작한
+{@link android.content.Intent} 내의 서비스에 전달할 수 있습니다. 그러면 서비스가
이 브로드캐스트를 사용하여 결과를 전달할 수 있게 됩니다.</p>
-<p>서비스를 시작하기 위한 여러 개의 요청은 서비스의
-{@link android.app.Service#onStartCommand onStartCommand()}로의 상응하는 여러 개의 호출이라는 결과를 낳습니다. 하지만, 서비스를 중단하려면
+<p>서비스를 시작하기 위한 여러 개의 요청은 서비스의
+{@link android.app.Service#onStartCommand onStartCommand()}로의 상응하는 여러 개의 호출이라는 결과를 낳습니다. 하지만, 서비스를 중단하려면
이를 중단하라는 요청 하나({@link android.app.Service#stopSelf stopSelf()} 또는 {@link
android.content.Context#stopService stopService()} 사용)만 있으면 됩니다.</p>
<h3 id="Stopping">서비스 중단</h3>
-<p>시작된 서비스는 자신만의 수명 주기를 직접 관리해야 합니다. 다시 말해, 시스템이
-서비스를 중단하거나 소멸시키지 않는다는 뜻입니다. 다만 시스템 메모리를 회복해야 하고 서비스가
-{@link android.app.Service#onStartCommand onStartCommand()} 반환 후에도 계속 실행되는 경우는 예외입니다. 따라서,
-서비스는 {@link android.app.Service#stopSelf stopSelf()}를 호출하여 스스로 중단시켜야 하고, 아니면
+<p>시작된 서비스는 자신만의 수명 주기를 직접 관리해야 합니다. 다시 말해, 시스템이
+서비스를 중단하거나 소멸시키지 않는다는 뜻입니다. 다만 시스템 메모리를 회복해야 하고 서비스가
+{@link android.app.Service#onStartCommand onStartCommand()} 반환 후에도 계속 실행되는 경우는 예외입니다. 따라서,
+서비스는 {@link android.app.Service#stopSelf stopSelf()}를 호출하여 스스로 중단시켜야 하고, 아니면
다른 구성 요소가 {@link android.content.Context#stopService stopService()}를 호출하여 이를 중단시킬 수 있습니다.</p>
<p>일단 {@link android.app.Service#stopSelf stopSelf()} 또는 {@link
-android.content.Context#stopService stopService()}로 중단하기를 요청하고 나면 시스템이 서비스를 가능한 한 빨리
+android.content.Context#stopService stopService()}로 중단하기를 요청하고 나면 시스템이 서비스를 가능한 한 빨리
소멸시킵니다.</p>
<p>그러나, 서비스가 {@link
-android.app.Service#onStartCommand onStartCommand()}로의 요청을 동시에 여러 개 처리하기를 바라는 경우라면 시작 요청 처리를 완료한 뒤에도
-서비스를 중단하면 안 됩니다. 그 이후 새 시작 요청을 받았을 수 있기
-때문입니다(첫 요청 종료 시에 중단하면 두 번째 요청을 종료시킵니다). 이 문제를
-피하려면, {@link android.app.Service#stopSelf(int)}를 사용하여 서비스를
+android.app.Service#onStartCommand onStartCommand()}로의 요청을 동시에 여러 개 처리하기를 바라는 경우라면 시작 요청 처리를 완료한 뒤에도
+서비스를 중단하면 안 됩니다. 그 이후 새 시작 요청을 받았을 수 있기
+때문입니다(첫 요청 종료 시에 중단하면 두 번째 요청을 종료시킵니다). 이 문제를
+피하려면, {@link android.app.Service#stopSelf(int)}를 사용하여 서비스를
중단시키라는 개발자의 요청이 항상 최신 시작 요청에 기반하도록 해야 합니다. 다시 말해, {@link
-android.app.Service#stopSelf(int)}를 호출할 때면 시작 요청의 ID({@link android.app.Service#onStartCommand onStartCommand()}에 전달된
-<code>startId</code>)를 전달하게 됩니다. 여기에 중단 요청이
+android.app.Service#stopSelf(int)}를 호출할 때면 시작 요청의 ID({@link android.app.Service#onStartCommand onStartCommand()}에 전달된
+<code>startId</code>)를 전달하게 됩니다. 여기에 중단 요청이
부합됩니다. 그런 다음 개발자가 {@link
android.app.Service#stopSelf(int)}를 호출할 수 있기 전에 서비스가 새 시작 요청을 받은 경우, ID가 일치하지 않게 되고 서비스는 중단되지 않습니다.</p>
-<p class="caution"><strong>주의:</strong> 서비스가 작업을 완료한 다음 애플리케이션이
-소속 서비스를 중단할 수 있어야 한다는 점이 중요합니다. 그래야 시스템 리소스 낭비를 피하고 배터리 전력 소모를 줄일 수 있습니다. 필요한 경우
+<p class="caution"><strong>주의:</strong> 서비스가 작업을 완료한 다음 애플리케이션이
+소속 서비스를 중단할 수 있어야 한다는 점이 중요합니다. 그래야 시스템 리소스 낭비를 피하고 배터리 전력 소모를 줄일 수 있습니다. 필요한 경우
다른 구성 요소도 서비스를 중단시킬 수 있습니다. {@link
-android.content.Context#stopService stopService()}를 호출하면 됩니다. 서비스에 대해 바인딩을 활성화하더라도,
+android.content.Context#stopService stopService()}를 호출하면 됩니다. 서비스에 대해 바인딩을 활성화하더라도,
서비스가 {@link
android.app.Service#onStartCommand onStartCommand()}로의 호출을 한 번이라도 받았으면 항상 서비스를 직접 중단시켜야 합니다.</p>
@@ -571,32 +571,32 @@
(또한 보통은 구성 요소가 {@link
android.content.Context#startService startService()}를 호출하여 서비스를 <em>시작</em>하는 것을 허용하지 않습니다).</p>
-<p>액티비티와 애플리케이션의 다른 구성 요소에서 서비스와 상호 작용하기를 원하는 경우
-바인딩된 서비스를 생성해야 합니다. 아니면 애플리케이션의 기능 몇 가지를 프로세스 간 통신(IPC)을 통해
+<p>액티비티와 애플리케이션의 다른 구성 요소에서 서비스와 상호 작용하기를 원하는 경우
+바인딩된 서비스를 생성해야 합니다. 아니면 애플리케이션의 기능 몇 가지를 프로세스 간 통신(IPC)을 통해
다른 애플리케이션에 노출하고자 하는 경우에도 좋습니다.</p>
<p>바인딩된 서비스를 생성하려면 {@link
-android.app.Service#onBind onBind()} 콜백 메서드를 구현하여 서비스와의 통신을 위한 인터페이스를 정의하는
-{@link android.os.IBinder}를 반환하도록 해야 합니다. 그러면 다른 애플리케이션 구성 요소가
-{@link android.content.Context#bindService bindService()}를 호출하여 해당 인터페이스를 검색하고, 서비스에 있는 메서드를
-호출하기 시작할 수 있습니다. 서비스는 자신에게 바인딩된 애플리케이션 구성 요소에게 도움이 되기 위해서만
-존재하는 것이므로, 서비스에 바인딩된 구성 요소가 없으면 시스템이 이를 소멸시킵니다(바인딩된 서비스는 시작된 서비스처럼
-{@link android.app.Service#onStartCommand onStartCommand()}를 통해
+android.app.Service#onBind onBind()} 콜백 메서드를 구현하여 서비스와의 통신을 위한 인터페이스를 정의하는
+{@link android.os.IBinder}를 반환하도록 해야 합니다. 그러면 다른 애플리케이션 구성 요소가
+{@link android.content.Context#bindService bindService()}를 호출하여 해당 인터페이스를 검색하고, 서비스에 있는 메서드를
+호출하기 시작할 수 있습니다. 서비스는 자신에게 바인딩된 애플리케이션 구성 요소에게 도움이 되기 위해서만
+존재하는 것이므로, 서비스에 바인딩된 구성 요소가 없으면 시스템이 이를 소멸시킵니다(바인딩된 서비스는 시작된 서비스처럼
+{@link android.app.Service#onStartCommand onStartCommand()}를 통해
중단시키지 <em>않아도</em> 됩니다).</p>
-<p>바인딩된 서비스를 생성하려면 가장 먼저 해야 할 일은 클라이언트가 서비스와
-통신할 수 있는 방법을 나타내는 인터페이스를 정의하는 것입니다. 서비스와 클라이언트 사이에서 쓰이는 이 인터페이스는
-반드시 {@link android.os.IBinder}의 구현이어야 하며 이를
+<p>바인딩된 서비스를 생성하려면 가장 먼저 해야 할 일은 클라이언트가 서비스와
+통신할 수 있는 방법을 나타내는 인터페이스를 정의하는 것입니다. 서비스와 클라이언트 사이에서 쓰이는 이 인터페이스는
+반드시 {@link android.os.IBinder}의 구현이어야 하며 이를
서비스가 {@link android.app.Service#onBind
-onBind()} 콜백 메서드에서 반환해야 합니다. 클라이언트가 {@link android.os.IBinder}를 수신하면 해당 인터페이스를 통해 서비스와
+onBind()} 콜백 메서드에서 반환해야 합니다. 클라이언트가 {@link android.os.IBinder}를 수신하면 해당 인터페이스를 통해 서비스와
상호 작용을 시작할 수 있습니다.</p>
-<p>여러 클라이언트가 서비스에 한꺼번에 바인딩될 수 있습니다. 클라이언트가 서비스와의 상호 작용을 완료하면 이는
-{@link android.content.Context#unbindService unbindService()}를 호출하여 바인딩을 해제합니다. 서비스에
+<p>여러 클라이언트가 서비스에 한꺼번에 바인딩될 수 있습니다. 클라이언트가 서비스와의 상호 작용을 완료하면 이는
+{@link android.content.Context#unbindService unbindService()}를 호출하여 바인딩을 해제합니다. 서비스에
바인딩된 클라이언트가 하나도 없으면 시스템이 해당 서비스를 소멸시킵니다.</p>
-<p>바인딩된 서비스를 구현하는 데에는 여러 가지 방법이 있으며 그러한 구현은 시작된 서비스보다
-훨씬 복잡합니다. 따라서 바인딩된 서비스 논의는
+<p>바인딩된 서비스를 구현하는 데에는 여러 가지 방법이 있으며 그러한 구현은 시작된 서비스보다
+훨씬 복잡합니다. 따라서 바인딩된 서비스 논의는
<a href="{@docRoot}guide/components/bound-services.html">바인딩된 서비스</a>에 관한 별도의 문서에서 다룹니다.</p>
@@ -605,13 +605,13 @@
<p>서비스는 일단 실행되고 나면 사용자에게 <a href="{@docRoot}guide/topics/ui/notifiers/toasts.html">알림 메시지</a> 또는 <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 표시줄 알림</a> 등을 사용해 이벤트를 알릴 수 있습니다.</p>
-<p>알림 메시지란 현재 창의 표면에 잠시 나타났다가 사라지는 메시지이고,
-상태 표시줄 알림은 상태 표시줄에 메시지가 담긴 아이콘을 제공하여 사용자가 이를 선택하여
+<p>알림 메시지란 현재 창의 표면에 잠시 나타났다가 사라지는 메시지이고,
+상태 표시줄 알림은 상태 표시줄에 메시지가 담긴 아이콘을 제공하여 사용자가 이를 선택하여
조치를 취할 수 있게 하는 것입니다(예: 액티비티 시작).</p>
<p>보통, 일종의 배경 작업이 완료되었고
-(예: 파일 다운로드 완료) 이제 사용자가 그에 대해 조치를 취할 수 있는 경우 상태 표시줄 알림이
-최선의 기법입니다. 사용자가 확장된 보기에서 알림을 선택하면,
+(예: 파일 다운로드 완료) 이제 사용자가 그에 대해 조치를 취할 수 있는 경우 상태 표시줄 알림이
+최선의 기법입니다. 사용자가 확장된 보기에서 알림을 선택하면,
해당 알림이 액티비티를 시작할 수 있습니다(예: 다운로드한 파일 보기).</p>
<p>자세한 정보는 <a href="{@docRoot}guide/topics/ui/notifiers/toasts.html">알림 메시지</a> 또는 <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 표시줄 알림</a>
@@ -621,19 +621,19 @@
<h2 id="Foreground">전경에서 서비스 실행하기</h2>
-<p>전경 서비스는 사용자가 능동적으로 인식하고 있으므로 메모리 부족 시에도
-시스템이 중단할 후보로 고려되지 않는 서비스를 말합니다. 전경
-서비스는 상태 표시줄에 대한 알림을 제공해야 합니다. 이것은
-"진행 중" 제목 아래에 배치되며, 이는 곧 해당 알림은 서비스가 중단되었거나
+<p>전경 서비스는 사용자가 능동적으로 인식하고 있으므로 메모리 부족 시에도
+시스템이 중단할 후보로 고려되지 않는 서비스를 말합니다. 전경
+서비스는 상태 표시줄에 대한 알림을 제공해야 합니다. 이것은
+"진행 중" 제목 아래에 배치되며, 이는 곧 해당 알림은 서비스가 중단되었거나
전경에서 제거되지 않은 이상 무시할 수 없다는 뜻입니다.</p>
-<p>예를 들어 서비스에서 음악을 재생하는 음악 플레이어는 전경에서
-실행되도록 설정해야 합니다. 사용자가 이것의 작동을 분명히 인식하고 있기
-때문입니다. 상태 표시줄에 있는 알림은 현재 노래를 나타내고
+<p>예를 들어 서비스에서 음악을 재생하는 음악 플레이어는 전경에서
+실행되도록 설정해야 합니다. 사용자가 이것의 작동을 분명히 인식하고 있기
+때문입니다. 상태 표시줄에 있는 알림은 현재 노래를 나타내고
사용자로 하여금 음악 플레이어와 상호 작용할 액티비티를 시작하게 해줄 수도 있습니다.</p>
<p>서비스가 전경에서 실행되도록 요청하려면 {@link
-android.app.Service#startForeground startForeground()}를 호출하면 됩니다. 이 메서드는 두 개의 매개변수를 취합니다.
+android.app.Service#startForeground startForeground()}를 호출하면 됩니다. 이 메서드는 두 개의 매개변수를 취합니다.
그 중 하나는 해당 알림을 고유하게 식별하는 정수이고 다른 하나는 상태 표시줄에 해당되는 {@link
android.app.Notification}입니다. 예:</p>
@@ -652,48 +652,48 @@
<p>서비스를 전경에서 제거하려면 {@link
-android.app.Service#stopForeground stopForeground()}를 호출하면 됩니다. 이 메서드는 부울 값을 취하며, 이것이
+android.app.Service#stopForeground stopForeground()}를 호출하면 됩니다. 이 메서드는 부울 값을 취하며, 이것이
상태 표시줄 알림도 제거할지 여부를 나타냅니다. 이 메서드는 서비스를 중단시키지 <em>않습니다</em>.
- 그러나, 서비스가 전경에서 실행 중인 동안 서비스를 중단시키면
+ 그러나, 서비스가 전경에서 실행 중인 동안 서비스를 중단시키면
알림도 마찬가지로 제거됩니다.</p>
-<p>알림에 대한 자세한 정보는 <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 표시줄
+<p>알림에 대한 자세한 정보는 <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 표시줄
알림 생성</a>을 참조하십시오.</p>
<h2 id="Lifecycle">서비스 수명 주기 관리</h2>
-<p>서비스의 수명 주기는 액티비티의 수명 주기보다 훨씬 간단합니다. 하지만, 서비스를 생성하고
-소멸시키는 방법에 특히 주의를 기울여야 한다는 면에서 중요도는 이쪽이 더 높습니다. 서비스는 사용자가 모르는 채로
+<p>서비스의 수명 주기는 액티비티의 수명 주기보다 훨씬 간단합니다. 하지만, 서비스를 생성하고
+소멸시키는 방법에 특히 주의를 기울여야 한다는 면에서 중요도는 이쪽이 더 높습니다. 서비스는 사용자가 모르는 채로
배경에서 실행될 수 있기 때문입니다.</p>
-<p>서비스 수명 주기—생성되었을 때부터 소멸될 때까지—는 두 가지 서로 다른 경로를
+<p>서비스 수명 주기—생성되었을 때부터 소멸될 때까지—는 두 가지 서로 다른 경로를
따를 수 있습니다.</p>
<ul>
<li>시작된 서비스
<p>서비스는 또 다른 구성 요소가 {@link
-android.content.Context#startService startService()}를 호출하면 생성됩니다. 그러면 서비스가 무기한으로 실행될 수 있으며
+android.content.Context#startService startService()}를 호출하면 생성됩니다. 그러면 서비스가 무기한으로 실행될 수 있으며
스스로 알아서 중단되어야 합니다. 이때 {@link
-android.app.Service#stopSelf() stopSelf()}를 호출하는 방법을 씁니다. 또 다른 구성 요소도 서비스를 중단시킬 수
+android.app.Service#stopSelf() stopSelf()}를 호출하는 방법을 씁니다. 또 다른 구성 요소도 서비스를 중단시킬 수
있습니다. {@link android.content.Context#stopService
stopService()}를 호출하면 됩니다. 서비스가 중단되면 시스템이 이를 소멸시킵니다.</p></li>
<li>바인딩된 서비스
<p>서비스는 또 다른 구성 요소(클라이언트)가 {@link
-android.content.Context#bindService bindService()}를 호출하면 생성됩니다. 그러면 클라이언트가
-{@link android.os.IBinder} 인터페이스를 통해 서비스와 통신을 주고받을 수 있습니다. 클라이언트가 연결을 종료하려면
-{@link android.content.Context#unbindService unbindService()}를 호출하면 됩니다. 여러 클라이언트가 같은 서비스에
-바인딩될 수 있으며, 이 모두가 바인딩을 해제하면 시스템이 해당 서비스를 소멸시킵니다 (서비스가 스스로를 중단시키지
+android.content.Context#bindService bindService()}를 호출하면 생성됩니다. 그러면 클라이언트가
+{@link android.os.IBinder} 인터페이스를 통해 서비스와 통신을 주고받을 수 있습니다. 클라이언트가 연결을 종료하려면
+{@link android.content.Context#unbindService unbindService()}를 호출하면 됩니다. 여러 클라이언트가 같은 서비스에
+바인딩될 수 있으며, 이 모두가 바인딩을 해제하면 시스템이 해당 서비스를 소멸시킵니다 (서비스가 스스로를 중단시키지
<em>않아도</em> 됩니다).</p></li>
</ul>
-<p>이와 같은 두 가지 경로는 완전히 별개의 것은 아닙니다. 다시 말해, 이미
-{@link android.content.Context#startService startService()}로 시작된 서비스에 바인딩할 수도 있다는 뜻입니다. 예를
+<p>이와 같은 두 가지 경로는 완전히 별개의 것은 아닙니다. 다시 말해, 이미
+{@link android.content.Context#startService startService()}로 시작된 서비스에 바인딩할 수도 있다는 뜻입니다. 예를
들어, 배경 음악 서비스를 시작하려면 {@link android.content.Context#startService
-startService()}를 호출하되 재생할 음악을 식별하는 {@link android.content.Intent}를 사용하면 됩니다. 나중에,
-아마도 사용자가 플레이어에 좀 더 많은 통제권을 발휘하고자 하거나
+startService()}를 호출하되 재생할 음악을 식별하는 {@link android.content.Intent}를 사용하면 됩니다. 나중에,
+아마도 사용자가 플레이어에 좀 더 많은 통제권을 발휘하고자 하거나
현재 노래에 대한 정보를 얻고자 할 때, 액티비티가 서비스에 바인딩될 수 있습니다. {@link
android.content.Context#bindService bindService()}를 사용하면 됩니다. 이런 경우에는 {@link
android.content.Context#stopService stopService()} 또는 {@link android.app.Service#stopSelf
@@ -702,8 +702,8 @@
<h3 id="LifecycleCallbacks">수명 주기 콜백 구현하기</h3>
-<p>액티비티와 마찬가지로 서비스에도 수명 주기 콜백 메서드가 있어 이를 구현하면 서비스의
-상태 변경 내용을 모니터링할 수 있고 적절한 시기에 작업을 수행할 수 있습니다. 다음의 골격
+<p>액티비티와 마찬가지로 서비스에도 수명 주기 콜백 메서드가 있어 이를 구현하면 서비스의
+상태 변경 내용을 모니터링할 수 있고 적절한 시기에 작업을 수행할 수 있습니다. 다음의 골격
서비스는 각 수명 주기 메서드를 설명한 것입니다.</p>
<pre>
@@ -743,13 +743,13 @@
}
</pre>
-<p class="note"><strong>참고:</strong> 액티비티 수명 주기 콜백 메서드와는 달리 이와 같은 콜백 메서드를 구현하는 데에는
+<p class="note"><strong>참고:</strong> 액티비티 수명 주기 콜백 메서드와는 달리 이와 같은 콜백 메서드를 구현하는 데에는
슈퍼클래스 구현을 호출하지 <em>않아도</em> 됩니다.</p>
<img src="{@docRoot}images/service_lifecycle.png" alt="" />
-<p class="img-caption"><strong>그림 2.</strong> 서비스 수명 주기입니다. 왼쪽의 다이어그램은
+<p class="img-caption"><strong>그림 2.</strong> 서비스 수명 주기입니다. 왼쪽의 다이어그램은
서비스가 {@link android.content.Context#startService
-startService()}로 생성된 경우의 수명 주기를 나타내며 오른쪽의 다이어그램은 서비스가
+startService()}로 생성된 경우의 수명 주기를 나타내며 오른쪽의 다이어그램은 서비스가
{@link android.content.Context#bindService bindService()}로 생성된 경우의 수명 주기를 나타낸 것입니다.</p>
<p>이와 같은 메서드를 구현함으로써, 서비스 수명 주기의 두 가지 중첩된 루프를 모니터링할 수 있습니다. </p>
@@ -757,20 +757,20 @@
<ul>
<li>서비스의 <strong>수명 주기 전체</strong>는 {@link
android.app.Service#onCreate onCreate()}가 호출된 시점과 {@link
-android.app.Service#onDestroy}가 반환된 시점 사이에 일어납니다. 액티비티와 마찬가지로 서비스는 자신의 초기 설정을
+android.app.Service#onDestroy}가 반환된 시점 사이에 일어납니다. 액티비티와 마찬가지로 서비스는 자신의 초기 설정을
{@link android.app.Service#onCreate onCreate()}에서 수행하며 남은 리소스를 모두 {@link
-android.app.Service#onDestroy onDestroy()}에 릴리스합니다. 예를 들어
+android.app.Service#onDestroy onDestroy()}에 릴리스합니다. 예를 들어
음악 재생 서비스의 경우 음악이 재생될 스레드를 {@link
android.app.Service#onCreate onCreate()}로 생성하고, 그럼 다음 해당 스레드를 중단할 때에는 {@link
android.app.Service#onDestroy onDestroy()}에서 할 수도 있습니다.
<p>{@link android.app.Service#onCreate onCreate()}와 {@link android.app.Service#onDestroy
-onDestroy()} 메서드는 모든 서비스에 대해 호출됩니다. 이는 서비스가
+onDestroy()} 메서드는 모든 서비스에 대해 호출됩니다. 이는 서비스가
{@link android.content.Context#startService startService()}로 생성되었든 {@link
android.content.Context#bindService bindService()}로 생성되었든 관계 없이 적용됩니다.</p></li>
<li>서비스의 <strong>활성 수명 주기</strong>는 {@link
-android.app.Service#onStartCommand onStartCommand()} 또는 {@link android.app.Service#onBind onBind()}로의 호출과 함께 시작됩니다.
+android.app.Service#onStartCommand onStartCommand()} 또는 {@link android.app.Service#onBind onBind()}로의 호출과 함께 시작됩니다.
각 메서드에 {@link
android.content.Intent}가 전달되는데 이것은 각각 {@link android.content.Context#startService
startService()} 또는 {@link android.content.Context#bindService bindService()} 중 하나에 전달된 것입니다.
@@ -781,25 +781,25 @@
</li>
</ul>
-<p class="note"><strong>참고:</strong> 시작된 서비스를 중단하려면
+<p class="note"><strong>참고:</strong> 시작된 서비스를 중단하려면
{@link android.app.Service#stopSelf stopSelf()} 또는 {@link
-android.content.Context#stopService stopService()}를 호출하면 되지만, 서비스에 대한 상응하는 콜백은
-없습니다(즉 {@code onStop()} 콜백이 없습니다). 그러므로, 서비스가 클라이언트에 바인딩되어 있지 않은 한
+android.content.Context#stopService stopService()}를 호출하면 되지만, 서비스에 대한 상응하는 콜백은
+없습니다(즉 {@code onStop()} 콜백이 없습니다). 그러므로, 서비스가 클라이언트에 바인딩되어 있지 않은 한
시스템은 서비스가 중단되면 이를 소멸시킵니다. 수신되는 콜백은 {@link
android.app.Service#onDestroy onDestroy()}가 유일합니다.</p>
-<p>그림 2는 서비스에 대한 일반적인 콜백 메서드를 나타낸 것입니다. 이 그림에서는
-{@link android.content.Context#startService startService()}로 생성된 서비스와
-{@link android.content.Context#bindService bindService()}로 생성된 서비스를
+<p>그림 2는 서비스에 대한 일반적인 콜백 메서드를 나타낸 것입니다. 이 그림에서는
+{@link android.content.Context#startService startService()}로 생성된 서비스와
+{@link android.content.Context#bindService bindService()}로 생성된 서비스를
구분하고 있지만, 어떤 식으로 시작되었든 모든 서비스는 클라이언트가 자신에 바인딩되도록 허용할 수 있다는 점을 명심하십시오.
말하자면, {@link android.app.Service#onStartCommand
-onStartCommand()}로 처음 시작된 서비스(클라이언트가 {@link android.content.Context#startService startService()}를 호출해서)라고 해도
-여전히 {@link android.app.Service#onBind onBind()}로의 호출을 받을 수 있습니다(클라이언트가
+onStartCommand()}로 처음 시작된 서비스(클라이언트가 {@link android.content.Context#startService startService()}를 호출해서)라고 해도
+여전히 {@link android.app.Service#onBind onBind()}로의 호출을 받을 수 있습니다(클라이언트가
{@link android.content.Context#bindService bindService()}를 호출하는 경우).</p>
<p>바인딩을 제공하는 서비스 생성에 대한 자세한 내용은 <a href="{@docRoot}guide/components/bound-services.html">바인딩된 서비스</a> 문서를 참조하십시오. 이 안에는 {@link android.app.Service#onRebind onRebind()}
-콜백 메서드에 대한 자세한 정보가 <a href="{@docRoot}guide/components/bound-services.html#Lifecycle">바인딩된 서비스의
-수명 주기 관리</a>에 관한 섹션에
+콜백 메서드에 대한 자세한 정보가 <a href="{@docRoot}guide/components/bound-services.html#Lifecycle">바인딩된 서비스의
+수명 주기 관리</a>에 관한 섹션에
담겨 있습니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/ko/guide/components/tasks-and-back-stack.jd
index 6b896f9..166cedd 100644
--- a/docs/html-intl/intl/ko/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/ko/guide/components/tasks-and-back-stack.jd
@@ -37,23 +37,23 @@
</div>
-<p>하나의 애플리케이션에는 보통 여러 개의 <a href="{@docRoot}guide/components/activities.html">액티비티</a>가 들어있습니다. 각 액티비티는
-사용자가 수행할 수 있는 특정한 종류의 작업을 중심으로 디자인되어야 하며 다른 액티비티를
+<p>하나의 애플리케이션에는 보통 여러 개의 <a href="{@docRoot}guide/components/activities.html">액티비티</a>가 들어있습니다. 각 액티비티는
+사용자가 수행할 수 있는 특정한 종류의 작업을 중심으로 디자인되어야 하며 다른 액티비티를
시작할 수 있는 기능이 있습니다. 예를 들어 이메일 애플리케이션에는 새 메시지 목록을 표시하는 하나의 액티비티가 있을 수 있습니다.
사용자가 메시지를 하나 선택하면, 새 액티비티가 열려 해당 메시지를 볼 수 있게 합니다.</p>
-<p>액티비티는 기기에서 다른 애플리케이션에 존재하는 액티비티를 시작할 수도 있습니다. 예를 들어
-애플리케이션이 이메일 메시지를 보내고자 하는 경우, "전송" 작업을 수행할 인텐트를
-정의하여 이메일 주소와 메시지 등의 몇 가지 데이터를 포함시키면 됩니다. 그러면 다른 애플리케이션에서 가져온 액티비티 중
-이러한 종류의 인텐트를 처리한다고 스스로 선언한 것이 열립니다. 이 경우, 이 인텐트는
-이메일을 전송하기 위한 것이므로 이메일 애플리케이션의 "작성" 액티비티가 시작됩니다(같은 인텐트를
-지원하는 액티비티가 여러 개 있는 경우, 시스템은 사용자에게 어느 것을 사용할지 선택하도록 합니다). 이메일이 전송되면
-액티비티가 재개되고 해당 이메일 액티비티가 애플리케이션의 일부였던 것처럼 보입니다. 액티비티는
-서로 다른 애플리케이션에서 온 것일 수 있지만, Android는 두 액티비티를
+<p>액티비티는 기기에서 다른 애플리케이션에 존재하는 액티비티를 시작할 수도 있습니다. 예를 들어
+애플리케이션이 이메일 메시지를 보내고자 하는 경우, "전송" 작업을 수행할 인텐트를
+정의하여 이메일 주소와 메시지 등의 몇 가지 데이터를 포함시키면 됩니다. 그러면 다른 애플리케이션에서 가져온 액티비티 중
+이러한 종류의 인텐트를 처리한다고 스스로 선언한 것이 열립니다. 이 경우, 이 인텐트는
+이메일을 전송하기 위한 것이므로 이메일 애플리케이션의 "작성" 액티비티가 시작됩니다(같은 인텐트를
+지원하는 액티비티가 여러 개 있는 경우, 시스템은 사용자에게 어느 것을 사용할지 선택하도록 합니다). 이메일이 전송되면
+액티비티가 재개되고 해당 이메일 액티비티가 애플리케이션의 일부였던 것처럼 보입니다. 액티비티는
+서로 다른 애플리케이션에서 온 것일 수 있지만, Android는 두 액티비티를
모두 같은 <em>작업</em> 안에 유지하여 이처럼 막힘 없는 사용자 환경을 유지합니다.</p>
-<p>작업이란 액티비티 컬렉션을 일컫는 말로, 사용자가 특정 작업을 수행할 때 이것과
-상호 작용합니다. 액티비티는 스택 안에 정렬되며(<em>백 스택</em>), 이때
+<p>작업이란 액티비티 컬렉션을 일컫는 말로, 사용자가 특정 작업을 수행할 때 이것과
+상호 작용합니다. 액티비티는 스택 안에 정렬되며(<em>백 스택</em>), 이때
순서는 각 액티비티가 열린 순서와 같습니다.</p>
<!-- SAVE FOR WHEN THE FRAGMENT DOC IS ADDED
@@ -77,40 +77,40 @@
</div>
-->
-<p>기기 메인 스크린이 대다수 작업의 시작 지점입니다. 사용자가
-애플리케이션
-시작 관리자에 있는 아이콘(또는 메인 스크린의 바로 가기)을 터치하면 해당 애플리케이션의 작업이 전경으로 나옵니다. 해당 애플리케이션에 대한
-작업이 존재하지 않으면(이 애플리케이션을 최근에 사용한 적이 없는 경우), 새 작업이 생성되고
+<p>기기 메인 스크린이 대다수 작업의 시작 지점입니다. 사용자가
+애플리케이션
+시작 관리자에 있는 아이콘(또는 메인 스크린의 바로 가기)을 터치하면 해당 애플리케이션의 작업이 전경으로 나옵니다. 해당 애플리케이션에 대한
+작업이 존재하지 않으면(이 애플리케이션을 최근에 사용한 적이 없는 경우), 새 작업이 생성되고
해당 애플리케이션의 "기본" 액티비티가 스택에 있는 루트 액티비티로 열립니다.</p>
-<p>현재 액티비티가 또 다른 액티비티를 시작하는 경우, 새 액티비티가 스택의 맨 위로 밀어올려지고
-사용자의 초점이 이에 맞춰집니다. 이전 액티비티는 스택에 유지되지만, 중단됩니다. 액티비티가 중단되면
-시스템은 이 액티비티의 사용자 인터페이스의 현재 상태를 보존합니다. 사용자가
+<p>현재 액티비티가 또 다른 액티비티를 시작하는 경우, 새 액티비티가 스택의 맨 위로 밀어올려지고
+사용자의 초점이 이에 맞춰집니다. 이전 액티비티는 스택에 유지되지만, 중단됩니다. 액티비티가 중단되면
+시스템은 이 액티비티의 사용자 인터페이스의 현재 상태를 보존합니다. 사용자가
<em>뒤로</em>
- 버튼을 누르면, 현재 액티비티가 스택의 맨 위에서 튀어나오고(해당 액티비티는 소멸됩니다)
-이전 액티비티가 재개됩니다(이것의 UI 이전 상태가 복원됩니다). 스택에 있는 액티비티는
-결코 다시 정렬되지 않습니다. 다만 스택에서 밀어올려지거나 튀어나올 뿐입니다. 즉, 현재 액티비티에 의해
-시작되면 스택 위로 밀어올려지고, 사용자가 <em>뒤로</em> 버튼을 사용하여 액티비티를 떠나면 튀어나와 사라지는 것입니다. 따라서,
-백 스택은
-일종의 "후입선출" 객체 구조로서 작동한다고 할 수 있습니다. 그림 1은
-이 행동을 시간 표시 막대와 함께 표시하여 여러 액티비티 사이의 진행률을 보여주며,
+ 버튼을 누르면, 현재 액티비티가 스택의 맨 위에서 튀어나오고(해당 액티비티는 소멸됩니다)
+이전 액티비티가 재개됩니다(이것의 UI 이전 상태가 복원됩니다). 스택에 있는 액티비티는
+결코 다시 정렬되지 않습니다. 다만 스택에서 밀어올려지거나 튀어나올 뿐입니다. 즉, 현재 액티비티에 의해
+시작되면 스택 위로 밀어올려지고, 사용자가 <em>뒤로</em> 버튼을 사용하여 액티비티를 떠나면 튀어나와 사라지는 것입니다. 따라서,
+백 스택은
+일종의 "후입선출" 객체 구조로서 작동한다고 할 수 있습니다. 그림 1은
+이 행동을 시간 표시 막대와 함께 표시하여 여러 액티비티 사이의 진행률을 보여주며,
각 시점에서 현재 백 스택의 모습을 나타낸 것입니다.</p>
<img src="{@docRoot}images/fundamentals/diagram_backstack.png" alt="" />
-<p class="img-caption"><strong>그림 1.</strong> 작업에 있는 각각의 새 액티비티가 백 스택에 항목을 추가하는
-방법을 나타낸 것입니다. 사용자가 <em>뒤로</em> 버튼을 누르면 현재
-액티비티가
+<p class="img-caption"><strong>그림 1.</strong> 작업에 있는 각각의 새 액티비티가 백 스택에 항목을 추가하는
+방법을 나타낸 것입니다. 사용자가 <em>뒤로</em> 버튼을 누르면 현재
+액티비티가
소멸되고 이전 액티비티가 재개됩니다.</p>
-<p>사용자가 계속해서 <em>뒤로</em> 버튼을 누르면, 스택에 있는 각 액티비티가 하나씩 튀어나가
-이전 것을
-드러내고, 마침내는 사용자가 메인 스크린으로 되돌아가게 됩니다(아니면 작업이 시작되었을 때
+<p>사용자가 계속해서 <em>뒤로</em> 버튼을 누르면, 스택에 있는 각 액티비티가 하나씩 튀어나가
+이전 것을
+드러내고, 마침내는 사용자가 메인 스크린으로 되돌아가게 됩니다(아니면 작업이 시작되었을 때
실행 중이던 액티비티가 무엇이든 그것으로 되돌아갑니다). 스택에서 모든 액티비티가 제거되면 이 작업은 더 이상 존재하지 않게 됩니다.</p>
<div class="figure" style="width:287px">
<img src="{@docRoot}images/fundamentals/diagram_multitasking.png" alt="" /> <p
-class="img-caption"><strong>그림 2.</strong> 두 개의 작업: 작업 B가 전경에서 사용자 상호 작용을 수신하는 한편,
+class="img-caption"><strong>그림 2.</strong> 두 개의 작업: 작업 B가 전경에서 사용자 상호 작용을 수신하는 한편,
작업 A는 배경에서 재개되기를 기다립니다.</p>
</div>
<div class="figure" style="width:215px">
@@ -118,39 +118,39 @@
class="img-caption"><strong>그림 3.</strong> 하나의 액티비티가 여러 번 인스턴트화됩니다.</p>
</div>
-<p>작업이란 하나의 잘 짜여진 단위로 사용자가 새 작업을 시작할 때 "배경"으로 이동할 수도 있고
-<em>홈</em> 버튼을 통해 메인 스크린으로 이동할 수도 있습니다. 작업의 모든 액티비티는 배경에 있는 동안은
+<p>작업이란 하나의 잘 짜여진 단위로 사용자가 새 작업을 시작할 때 "배경"으로 이동할 수도 있고
+<em>홈</em> 버튼을 통해 메인 스크린으로 이동할 수도 있습니다. 작업의 모든 액티비티는 배경에 있는 동안은
중단되지만
-, 해당 작업에 대한 백 스택은 그대로 변함 없이 유지됩니다. 이 작업은 또 다른 작업이 발생하는 동안
-초점을 잃을 뿐입니다(그림 2 참조). 그런 다음 작업이 "전경"으로 되돌아와 사용자가
-이전에 하던 일을 계속할 수 있습니다. 예를 들어 현재 작업(작업 A)의 스택에 세 개의 액티비티가 있다고
+, 해당 작업에 대한 백 스택은 그대로 변함 없이 유지됩니다. 이 작업은 또 다른 작업이 발생하는 동안
+초점을 잃을 뿐입니다(그림 2 참조). 그런 다음 작업이 "전경"으로 되돌아와 사용자가
+이전에 하던 일을 계속할 수 있습니다. 예를 들어 현재 작업(작업 A)의 스택에 세 개의 액티비티가 있다고
가정하면 그 중 둘은 현재 액티비티 아래에 있습니다. 사용자가 <em>홈</em>
- 버튼을 누른 다음
-애플리케이션 시작 관리자로부터 새 애플리케이션을 시작합니다. 메인 스크린이 나타나면 작업 A는
+ 버튼을 누른 다음
+애플리케이션 시작 관리자로부터 새 애플리케이션을 시작합니다. 메인 스크린이 나타나면 작업 A는
배경으로 이동합니다. 새 애플리케이션이 시작되면 시스템은 해당 애플리케이션에 대한 작업을 시작하며
-(작업 B) 여기에는 나름의 액티비티 스택이 딸려 있습니다. 해당 애플리케이션과
-상호 작용한 후, 사용자는 다시 홈으로 돌아와 원래 작업 A를 시작한
+(작업 B) 여기에는 나름의 액티비티 스택이 딸려 있습니다. 해당 애플리케이션과
+상호 작용한 후, 사용자는 다시 홈으로 돌아와 원래 작업 A를 시작한
애플리케이션을 선택합니다. 이제 작업 A가 전경으로 옵니다.
-이 스택에 있는 액티비티 세 개는 모두 멀쩡하고, 스택 맨 위에 있는 액티비티가
-재개됩니다. 이 시점에서
-사용자는 작업 B로 도로 전환할 수도 있습니다. 홈으로 이동하여 해당 작업을
-시작한 애플리케이션 아이콘을 선택하면 됩니다(아니면
-<a href="{@docRoot}guide/components/recents.html">개요 화면</a>에서 해당 앱의 작업을 선택해도 됩니다).
+이 스택에 있는 액티비티 세 개는 모두 멀쩡하고, 스택 맨 위에 있는 액티비티가
+재개됩니다. 이 시점에서
+사용자는 작업 B로 도로 전환할 수도 있습니다. 홈으로 이동하여 해당 작업을
+시작한 애플리케이션 아이콘을 선택하면 됩니다(아니면
+<a href="{@docRoot}guide/components/recents.html">개요 화면</a>에서 해당 앱의 작업을 선택해도 됩니다).
이것이 Android에서 멀티태스킹을 하는 작업의 예시입니다.</p>
-<p class="note"><strong>참고:</strong> 여러 개의 작업을 배경에 한꺼번에 대기시킬 수 있습니다.
-하지만, 사용자가 수많은 배경 작업을 동시에 실행하면 시스템이 메모리를 복원하기 위해
-배경 액티비티를 소멸시키기 시작할 수 있고, 그러면 액티비티 상태가 손실됩니다.
+<p class="note"><strong>참고:</strong> 여러 개의 작업을 배경에 한꺼번에 대기시킬 수 있습니다.
+하지만, 사용자가 수많은 배경 작업을 동시에 실행하면 시스템이 메모리를 복원하기 위해
+배경 액티비티를 소멸시키기 시작할 수 있고, 그러면 액티비티 상태가 손실됩니다.
다음의 <a href="#ActivityState">액티비티 상태</a>에 관한 섹션을 참조하십시오.</p>
-<p>백 스택에 있는 액티비티는 결코 다시 정렬되지 않으므로, 애플리케이션에서
-사용자에게 하나 이상의 액티비티로부터 특정 액티비티를 시작하도록 허용하는 경우, 해당 액티비티의 새 인스턴스가
-생성되어 스택 위로 밀려옵니다(해당 액티비티의 기존 인스턴스를
-맨 위로 가져오는 대신). 따라서, 애플리케이션 안의 한 액티비티가 여러 번
-인스턴트화될 수 있으며(서로 다른 작업으로부터도 가능), 이를 나타낸 것이 그림 3입니다. 이 때문에 사용자가
+<p>백 스택에 있는 액티비티는 결코 다시 정렬되지 않으므로, 애플리케이션에서
+사용자에게 하나 이상의 액티비티로부터 특정 액티비티를 시작하도록 허용하는 경우, 해당 액티비티의 새 인스턴스가
+생성되어 스택 위로 밀려옵니다(해당 액티비티의 기존 인스턴스를
+맨 위로 가져오는 대신). 따라서, 애플리케이션 안의 한 액티비티가 여러 번
+인스턴트화될 수 있으며(서로 다른 작업으로부터도 가능), 이를 나타낸 것이 그림 3입니다. 이 때문에 사용자가
<em>뒤로</em> 버튼을 사용하여 뒤로 이동하는 경우, 액티비티의 각 인스턴스가 열린 순서대로 드러납니다
-(각자 나름의
-UI 상태를 가지고). 다만, 액티비티가 한 번 이상 인스턴트화되는 것을 원치 않으면 이 행동은 수정할 수
+(각자 나름의
+UI 상태를 가지고). 다만, 액티비티가 한 번 이상 인스턴트화되는 것을 원치 않으면 이 행동은 수정할 수
있습니다. 그 방법에 대해서는 <a href="#ManagingTasks">작업 관리하기</a>에 관한 이후 섹션에서 이야기합니다.</p>
@@ -159,16 +159,16 @@
<ul>
<li>액티비티 A가 액티비티 B를 시작하면 액티비티 A는 중단되지만, 시스템이 그 상태를
(예: 스크롤 위치 및 양식에 입력된 텍스트 등) 보존합니다.
-사용자가 액티비티 B에 있는 동안 <em>뒤로</em> 버튼을 누르면 액티비티 A가 재개되며 상태도
+사용자가 액티비티 B에 있는 동안 <em>뒤로</em> 버튼을 누르면 액티비티 A가 재개되며 상태도
복원됩니다.</li>
- <li>사용자가 <em>홈</em> 버튼을 눌러 작업을 떠나면 현재 액티비티가
-중단되고
-그 소속 작업이 배경으로 들어갑니다. 시스템은 작업에 속한 모든 액티비티의 상태를 보존합니다. 사용자가
-나중에 작업을 시작한 시작 관리자 아이콘을 선택하여 해당 작업을 재개하면, 그 작업이
+ <li>사용자가 <em>홈</em> 버튼을 눌러 작업을 떠나면 현재 액티비티가
+중단되고
+그 소속 작업이 배경으로 들어갑니다. 시스템은 작업에 속한 모든 액티비티의 상태를 보존합니다. 사용자가
+나중에 작업을 시작한 시작 관리자 아이콘을 선택하여 해당 작업을 재개하면, 그 작업이
전경으로 나오고 스택 맨 위에서 액티비티를 재개합니다.</li>
- <li>사용자가 <em>뒤로</em> 버튼을 누르면, 현재 액티비티가 스택에서 튀어나오고
+ <li>사용자가 <em>뒤로</em> 버튼을 누르면, 현재 액티비티가 스택에서 튀어나오고
소멸됩니다.
- 스택에 있던 이전 액티비티가 재개됩니다. 액티비티가 소멸되면, 시스템은 그 액티비티의 상태를
+ 스택에 있던 이전 액티비티가 재개됩니다. 액티비티가 소멸되면, 시스템은 그 액티비티의 상태를
보존하지 <em>않습니다.</em></li>
<li>액티비티는 여러 번 인스턴트화할 수 있으며, 다른 작업에서도 이를 수행할 수 있습니다.</li>
</ul>
@@ -182,20 +182,20 @@
<h2 id="ActivityState">액티비티 상태 저장하기</h2>
-<p>위에서 논한 바와 같이, 시스템의 기본 행동은 액티비티가 중단되면 그 상태를 보존해두는
-것입니다. 이렇게 하면, 사용자가 이전 액티비티로 도로 이동했을 때 그에 속한 사용자 인터페이스가 이전 상태
+<p>위에서 논한 바와 같이, 시스템의 기본 행동은 액티비티가 중단되면 그 상태를 보존해두는
+것입니다. 이렇게 하면, 사용자가 이전 액티비티로 도로 이동했을 때 그에 속한 사용자 인터페이스가 이전 상태
그대로 표시됩니다. 그러나 액티비티의 상태를 미리 보존할 수도 있으며 사전에 이렇게 <strong>해야 합니다.</strong>
-이때에는, 액티비티가 소멸되고 다시 만들어야 하는 경우를 대비해
+이때에는, 액티비티가 소멸되고 다시 만들어야 하는 경우를 대비해
콜백 메서드를 사용합니다.</p>
-<p>시스템이 액티비티 중 하나를 중단시키는 경우(예를 들어 새 액티비티가 시작되었을 때 또는 작업이
-배경으로 이동하는 경우), 시스템은 시스템 메모리를 회복해야 하는 경우 액티비티를
-완전히 소멸시켜버릴 수도 있습니다. 이런 상황이 벌어지면, 액티비티 상태에 대한 정보는 손실됩니다. 이런 일이 벌어지더라도,
-시스템은 여전히
-백 스택에 해당 액티비티의 자리가 있다는 것을 알고 있습니다. 다만 액티비티가 스택 맨 위로 올라오면
-시스템이 이를 (재개하는 것이 아니라) 재생성해야만 합니다. 사용자의 작업 내용을
-잃어버리는 불상사를 피하려면 그 내용을 미리 보존해두어야 합니다. 이때 액티비티의
-{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()} 콜백
+<p>시스템이 액티비티 중 하나를 중단시키는 경우(예를 들어 새 액티비티가 시작되었을 때 또는 작업이
+배경으로 이동하는 경우), 시스템은 시스템 메모리를 회복해야 하는 경우 액티비티를
+완전히 소멸시켜버릴 수도 있습니다. 이런 상황이 벌어지면, 액티비티 상태에 대한 정보는 손실됩니다. 이런 일이 벌어지더라도,
+시스템은 여전히
+백 스택에 해당 액티비티의 자리가 있다는 것을 알고 있습니다. 다만 액티비티가 스택 맨 위로 올라오면
+시스템이 이를 (재개하는 것이 아니라) 재생성해야만 합니다. 사용자의 작업 내용을
+잃어버리는 불상사를 피하려면 그 내용을 미리 보존해두어야 합니다. 이때 액티비티의
+{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()} 콜백
메서드를 구현하는 방법을 씁니다.</p>
<p>액티비티 상태를 저장하는 방법에 대한 자세한 정보는 <a href="{@docRoot}guide/components/activities.html#SavingActivityState">액티비티</a>
@@ -205,19 +205,19 @@
<h2 id="ManagingTasks">작업 관리하기</h2>
-<p>Android가 작업과 백 스택을 관리하는 방식은 위에 설명된 바와 같고—같은 작업 안에서
-연이어 시작된 모든 작업을 한곳에 배치하되 "후입선출" 스택에 두는 것—이 방식은
-대부분의 애플리케이션에 아주 효과적입니다. 여러분은 액티비티가 작업과 연관된 방식이나
-백 스택에서의 존재 방식에 대해 염려하지 않아도 됩니다. 그러나, 정상적인 동작을 인터럽트하기로 결정할 수도
-있습니다. 애플리케이션의 액티비티 하나가 시작되면 새 작업을 시작하려
-할 수도 있습니다(현재 작업 내에 배치되는 것 대신에). 아니면, 액티비티를 시작하면 그것의
-기존 인스턴스 하나를 앞으로 가져오고자 할 수도 있습니다(백 스택 맨 위에서 새 인스턴스를
-생성하는 것 대신에). 또는 백 스택에서 사용자가 작업을 떠날 때의 루트 액티비티를 제외하고
+<p>Android가 작업과 백 스택을 관리하는 방식은 위에 설명된 바와 같고—같은 작업 안에서
+연이어 시작된 모든 작업을 한곳에 배치하되 "후입선출" 스택에 두는 것—이 방식은
+대부분의 애플리케이션에 아주 효과적입니다. 여러분은 액티비티가 작업과 연관된 방식이나
+백 스택에서의 존재 방식에 대해 염려하지 않아도 됩니다. 그러나, 정상적인 동작을 인터럽트하기로 결정할 수도
+있습니다. 애플리케이션의 액티비티 하나가 시작되면 새 작업을 시작하려
+할 수도 있습니다(현재 작업 내에 배치되는 것 대신에). 아니면, 액티비티를 시작하면 그것의
+기존 인스턴스 하나를 앞으로 가져오고자 할 수도 있습니다(백 스택 맨 위에서 새 인스턴스를
+생성하는 것 대신에). 또는 백 스택에서 사용자가 작업을 떠날 때의 루트 액티비티를 제외하고
모든 액티비티를 지우고자 할 수도 있습니다.</p>
-<p>이 모든 것과 그 외에도 많은 것을 할 수 있는 것이 바로
+<p>이 모든 것과 그 외에도 많은 것을 할 수 있는 것이 바로
<a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
-매니페스트 요소 안에 있는 속성과,
+매니페스트 요소 안에 있는 속성과,
{@link android.app.Activity#startActivity startActivity()}에 전달한 인텐트에 있는 플래그입니다.</p>
<p>이런 면에서, 여러분이 사용할 수 있는 주요 <a href="{@docRoot}guide/topics/manifest/activity-element.html">
@@ -246,170 +246,170 @@
<li>{@link android.content.Intent#FLAG_ACTIVITY_SINGLE_TOP}</li>
</ul>
-<p>다음 섹션에서는 이와 같은 매니페스트 속성과 인텐트 플래그를 사용하여
+<p>다음 섹션에서는 이와 같은 매니페스트 속성과 인텐트 플래그를 사용하여
액티비티가 작업과 연관되는 방식을 정의하고 백 스택에서 액티비티가 동작하는 방식을 정의하는 방법을 배우게 됩니다.</p>
-<p>이외에도 별도로 작업과 액티비티를 표시하는 방법에 대한 고려 사항과
-개요 화면에서의 관리 방법을 논합니다. 자세한 정보는 <a href="{@docRoot}guide/components/recents.html">개요 화면</a>을
-참조하십시오. 보통은 개요 화면에 작업과 액티비티가 어떻게 표현될지는
+<p>이외에도 별도로 작업과 액티비티를 표시하는 방법에 대한 고려 사항과
+개요 화면에서의 관리 방법을 논합니다. 자세한 정보는 <a href="{@docRoot}guide/components/recents.html">개요 화면</a>을
+참조하십시오. 보통은 개요 화면에 작업과 액티비티가 어떻게 표현될지는
시스템이 정의하도록 두어야 합니다. 이 동작을 개발자가 수정할 필요도 없습니다.</p>
-<p class="caution"><strong>주의:</strong> 대부분의 애플리케이션은 액티비티와 작업에 대한
-기본 동작을 인터럽트하지 않는 것이 정상입니다. 액티비티가 기본 동작을 수정하는 것이 필요하다는
-판단이 서면, 시작 과정 중에 액티비티의 유용성을 테스트하십시오.
+<p class="caution"><strong>주의:</strong> 대부분의 애플리케이션은 액티비티와 작업에 대한
+기본 동작을 인터럽트하지 않는 것이 정상입니다. 액티비티가 기본 동작을 수정하는 것이 필요하다는
+판단이 서면, 시작 과정 중에 액티비티의 유용성을 테스트하십시오.
또한 다른 액티비티와 작업에서 <em>뒤로</em> 버튼을 써서 해당 액티비티로 돌아올 때에도 유용성을 테스트해야 합니다.
사용자의 예상되는 동작과 충돌할 가능성이 있는 탐색 동작을 꼭 테스트하십시오.</p>
<h3 id="TaskLaunchModes">시작 모드 정의하기</h3>
-<p>시작 모드를 사용하면 액티비티의 새 인스턴스가 현재 작업과 연관된 방식을 정의할 수 있게
+<p>시작 모드를 사용하면 액티비티의 새 인스턴스가 현재 작업과 연관된 방식을 정의할 수 있게
해줍니다. 여러 가지 시작 모드를 두 가지 방식으로 정의할 수 있습니다.</p>
<ul class="nolist">
<li><a href="#ManifestForTasks">매니페스트 파일 사용하기</a>
- <p>매니페스트 파일에서 액티비티를 선언하는 경우, 액티비티가 시작될 때 여러 작업과 어떤 식으로
+ <p>매니페스트 파일에서 액티비티를 선언하는 경우, 액티비티가 시작될 때 여러 작업과 어떤 식으로
연관을 맺어야 하는지 지정할 수 있습니다.</li>
<li><a href="#IntentFlagsForTasks">인텐트 플래그 사용하기</a>
- <p>{@link android.app.Activity#startActivity startActivity()}를 호출하는 경우
-{@link android.content.Intent}에 플래그를 포함시켜 새 액티비티가 현재 작업과 어떻게 연관되어야 할지(또는
+ <p>{@link android.app.Activity#startActivity startActivity()}를 호출하는 경우
+{@link android.content.Intent}에 플래그를 포함시켜 새 액티비티가 현재 작업과 어떻게 연관되어야 할지(또는
애초에 연관을 맺을지 아닐지) 선언하도록 할 수 있습니다.</p></li>
</ul>
-<p>따라서, 액티비티 A가 액티비티 B를 시작하면 액티비티 B는 자신의 매니페스트에서
-현재 작업과 연관을 맺는 데 적당한 방식(연관을 맺어야 한다면)을 정의할 수 있고 액티비티 A 또한
-액티비티 B가 현재 작업과 연관을 맺는 방식을 요청할 수 있습니다. 두 액티비티가 모두 액티비티 B가 작업과
-연관되는 방식을 정의하는 경우, 액티비티 A의 요청(인텐트에 정의된 바를 따름)을 액티비티 B의
+<p>따라서, 액티비티 A가 액티비티 B를 시작하면 액티비티 B는 자신의 매니페스트에서
+현재 작업과 연관을 맺는 데 적당한 방식(연관을 맺어야 한다면)을 정의할 수 있고 액티비티 A 또한
+액티비티 B가 현재 작업과 연관을 맺는 방식을 요청할 수 있습니다. 두 액티비티가 모두 액티비티 B가 작업과
+연관되는 방식을 정의하는 경우, 액티비티 A의 요청(인텐트에 정의된 바를 따름)을 액티비티 B의
요청(자신의 매니페스트에서 정의)보다 우위로 인식합니다.</p>
-<p class="note"><strong>참고:</strong> 매니페스트 파일에 사용할 수 있는 시작 모드 중에는
-인텐트의 플래그로 사용할 수는 없는 것도 있으며, 이와 마찬 가지로 인텐트의 플래그로 사용할 수 있는 시작 모드 중에는
+<p class="note"><strong>참고:</strong> 매니페스트 파일에 사용할 수 있는 시작 모드 중에는
+인텐트의 플래그로 사용할 수는 없는 것도 있으며, 이와 마찬 가지로 인텐트의 플래그로 사용할 수 있는 시작 모드 중에는
매니페스트에서 정의할 수 없는 것도 있습니다.</p>
<h4 id="ManifestForTasks">매니페스트 파일 사용하기</h4>
-<p>매니페스트 파일에서 액티비티를 선언하는 경우, 액티비티가 작업과
+<p>매니페스트 파일에서 액티비티를 선언하는 경우, 액티비티가 작업과
어떤 식으로 연관되어야 할지 지정하려면 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
요소의 <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
launchMode}</a> 속성을 사용하면 됩니다.</p>
<p><a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
-launchMode}</a> 속성은 액티비티가 작업 안으로 들어가며 시작되는 방법에 대한 지침을
-나타냅니다.
+launchMode}</a> 속성은 액티비티가 작업 안으로 들어가며 시작되는 방법에 대한 지침을
+나타냅니다.
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">launchMode</a></code>
속성에 할당할 수 있는 시작 모드는 네 가지가 있습니다.</p>
<dl>
<dt>{@code "standard"} (기본 모드)</dt>
- <dd>기본입니다. 시스템이 액티비티가 시작된 작업에서 액티비티의 새 인스턴스를 만들고
-인텐트의 경로를 이것으로 지정합니다. 액티비티는 여러 번 인스턴트화될 수 있고,
+ <dd>기본입니다. 시스템이 액티비티가 시작된 작업에서 액티비티의 새 인스턴스를 만들고
+인텐트의 경로를 이것으로 지정합니다. 액티비티는 여러 번 인스턴트화될 수 있고,
각 인스턴스는 서로 다른 작업에 속할 수 있으며 한 작업에 여러 개의 인스턴스가 있을 수 있습니다.</dd>
<dt>{@code "singleTop"}</dt>
- <dd>액티비티의 인스턴스가 이미 현재 작업의 맨 위에 존재하는 경우, 시스템은 인텐트의 경로를
+ <dd>액티비티의 인스턴스가 이미 현재 작업의 맨 위에 존재하는 경우, 시스템은 인텐트의 경로를
해당 인스턴스로 지정합니다. 이때 액티비티의 새 인스턴스를 만들기보다는 해당 인스턴스의 {@link
-android.app.Activity#onNewIntent onNewIntent()} 메서드를 호출하는 방법을
-통합니다. 액티비티는 여러 번 인스턴트화될 수 있고, 각 인스턴스는 서로 다른 작업에
-속할 수 있으며 한 작업에 여러 개의 인스턴스가 있을 수 있습니다(다만 백 스택의 맨 위에 있는
+android.app.Activity#onNewIntent onNewIntent()} 메서드를 호출하는 방법을
+통합니다. 액티비티는 여러 번 인스턴트화될 수 있고, 각 인스턴스는 서로 다른 작업에
+속할 수 있으며 한 작업에 여러 개의 인스턴스가 있을 수 있습니다(다만 백 스택의 맨 위에 있는
액티비티가 액티비티의 기존 인스턴스가 <em>아닌</em> 경우에만 이것이 적용됩니다).
- <p>예를 들어 어느 작업의 백 스택이 루트 액티비티 A와 액티비티 B, C, 그리고 맨 위의 액티비티 D로
+ <p>예를 들어 어느 작업의 백 스택이 루트 액티비티 A와 액티비티 B, C, 그리고 맨 위의 액티비티 D로
구성되어 있다고 가정합니다(이 스택은 A-B-C-D 형태를 띠며 D가 맨 위에 있습니다). 유형 D의 액티비티에 대한 인텐트가 도착합니다.
-D에 기본 {@code "standard"} 시작 모드가 있는 경우, 클래스의 새 인스턴스가 시작되고 이 스택은
-A-B-C-D-D가 됩니다. 하지만, D의 시작 모드가 {@code "singleTop"}인 경우, D의
+D에 기본 {@code "standard"} 시작 모드가 있는 경우, 클래스의 새 인스턴스가 시작되고 이 스택은
+A-B-C-D-D가 됩니다. 하지만, D의 시작 모드가 {@code "singleTop"}인 경우, D의
기존 인스턴스가 해당 인텐트를 {@link
-android.app.Activity#onNewIntent onNewIntent()}를 통해 받게 됩니다. 이것이 스택의 맨 위에 있기 때문입니다. 스택은
-계속 A-B-C-D로 유지됩니다. 그러나 유형 B의 액티비티에 대한 인텐트가 도착하는 경우,
+android.app.Activity#onNewIntent onNewIntent()}를 통해 받게 됩니다. 이것이 스택의 맨 위에 있기 때문입니다. 스택은
+계속 A-B-C-D로 유지됩니다. 그러나 유형 B의 액티비티에 대한 인텐트가 도착하는 경우,
B의 새 인스턴스가 스택에 추가되며 이는 액티비티의 시작 모드가 {@code "singleTop"}이더라도 무관하게 적용됩니다.</p>
- <p class="note"><strong>참고:</strong> 어느 액티비티의 새 인스턴스가 생성되면,
-사용자가 <em>뒤로</em> 버튼을 눌러 이전 액티비티로 되돌아갈 수 있게 됩니다. 그러나 액티비티의 기존
-인스턴스가
+ <p class="note"><strong>참고:</strong> 어느 액티비티의 새 인스턴스가 생성되면,
+사용자가 <em>뒤로</em> 버튼을 눌러 이전 액티비티로 되돌아갈 수 있게 됩니다. 그러나 액티비티의 기존
+인스턴스가
새 인텐트를 처리하는 경우, 사용자가 <em>뒤로</em> 버튼을 눌러도 새 인텐트가 {@link android.app.Activity#onNewIntent
-onNewIntent()}에 도착하기 전의 액티비티
-상태로
+onNewIntent()}에 도착하기 전의 액티비티
+상태로
되돌아갈 수 없습니다.</p>
</dd>
<dt>{@code "singleTask"}</dt>
<dd>시스템이 새 작업을 만들고 새 작업의 루트에 있는 액티비티를 인스턴트화합니다.
-하지만, 액티비티의 인스턴스가 이미 별개의 작업에 존재하는 경우, 시스템은 인텐트의 경로를
+하지만, 액티비티의 인스턴스가 이미 별개의 작업에 존재하는 경우, 시스템은 인텐트의 경로를
기존 인스턴스로 지정합니다. 이때 새 인스턴스를 만들기보다 해당 인스턴스의 {@link
-android.app.Activity#onNewIntent onNewIntent()} 메서드를 호출하는 방법을 통합니다. 한 번에
+android.app.Activity#onNewIntent onNewIntent()} 메서드를 호출하는 방법을 통합니다. 한 번에
액티비티 인스턴스 한 개씩만 존재할 수 있습니다.
- <p class="note"><strong>참고:</strong> 액티비티가 새 작업에서 시작되더라도,
+ <p class="note"><strong>참고:</strong> 액티비티가 새 작업에서 시작되더라도,
<em>뒤로</em> 버튼을 누르면 여전히 사용자를 이전 액티비티로 돌려보냅니다.</p></dd>
<dt>{@code "singleInstance"}.</dt>
- <dd>{@code "singleTask"}와 같습니다. 다만 시스템이 인스턴스를 보유하고 있는 작업 안으로
-다른 어떤 액티비티도 시작하지 않는다는 것은 예외입니다. 액티비티는 언제나 자신의 작업의 유일무이한 구성원입니다.
+ <dd>{@code "singleTask"}와 같습니다. 다만 시스템이 인스턴스를 보유하고 있는 작업 안으로
+다른 어떤 액티비티도 시작하지 않는다는 것은 예외입니다. 액티비티는 언제나 자신의 작업의 유일무이한 구성원입니다.
이것으로 시작한 액티비티는 모두 별개의 작업에서 열립니다.</dd>
</dl>
-<p>또 다른 예로 Android 브라우저 애플리케이션이 있습니다. 이것은 웹 브라우저 액티비티가 항상
-자신만의 작업에서 열려야 한다고 선언합니다. 이때 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> 요소에 {@code singleTask} 시작 모드를 지정하는 방법을 씁니다.
-다시 말해 애플리케이션이 Android 브라우저를 열라는 인텐트를 발행하면
-브라우저의 액티비티가 애플리케이션과 같은 작업에 배치되지 <em>않는다</em>는
-뜻입니다. 그 대신, 브라우저에 대한 새 작업이 시작되거나, 브라우저에 이미
-배경에서 실행 중인 작업이 있는 경우 해당 작업이 전경으로 불려나와 새 인텐트를 처리하게
+<p>또 다른 예로 Android 브라우저 애플리케이션이 있습니다. 이것은 웹 브라우저 액티비티가 항상
+자신만의 작업에서 열려야 한다고 선언합니다. 이때 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> 요소에 {@code singleTask} 시작 모드를 지정하는 방법을 씁니다.
+다시 말해 애플리케이션이 Android 브라우저를 열라는 인텐트를 발행하면
+브라우저의 액티비티가 애플리케이션과 같은 작업에 배치되지 <em>않는다</em>는
+뜻입니다. 그 대신, 브라우저에 대한 새 작업이 시작되거나, 브라우저에 이미
+배경에서 실행 중인 작업이 있는 경우 해당 작업이 전경으로 불려나와 새 인텐트를 처리하게
됩니다.</p>
-<p>액티비티가 새 작업에서 시작되었든 액티비티를 시작한 것과 같은 작업에서 시작되었든 관계 없이
-<em>뒤로</em> 버튼을 사용하면 언제나 사용자를 이전 액티비티로 돌려보냅니다. 다만,
-{@code singleTask} 시작 모드를 나타내는 액티비티를 시작한 다음 해당
-액티비티의 인스턴스가 이미 배경 작업에 존재하는 경우, 그 작업 전체가 전경에 불려나옵니다. 이 시점에서
-백 스택에는 이제 앞으로 가져온 작업에서 가져온 모든 액티비티가 포함되어 있으며, 이는 스택의
+<p>액티비티가 새 작업에서 시작되었든 액티비티를 시작한 것과 같은 작업에서 시작되었든 관계 없이
+<em>뒤로</em> 버튼을 사용하면 언제나 사용자를 이전 액티비티로 돌려보냅니다. 다만,
+{@code singleTask} 시작 모드를 나타내는 액티비티를 시작한 다음 해당
+액티비티의 인스턴스가 이미 배경 작업에 존재하는 경우, 그 작업 전체가 전경에 불려나옵니다. 이 시점에서
+백 스택에는 이제 앞으로 가져온 작업에서 가져온 모든 액티비티가 포함되어 있으며, 이는 스택의
맨 위에 위치합니다. 그림 4는 이와 같은 유형의 시나리오를 나타낸 것입니다.</p>
<img src="{@docRoot}images/fundamentals/diagram_backstack_singletask_multiactivity.png" alt="" />
-<p class="img-caption"><strong>그림 4.</strong> 시작 모드가 "singleTask"인 액티비티가
-백 스택에 추가되는 방법을 표현한 것입니다. 이 액티비티가 이미 자신의 백 스택을 가지고 있는
-배경 작업의 일부인 경우, 해당 백 스택도 모두 전경으로
+<p class="img-caption"><strong>그림 4.</strong> 시작 모드가 "singleTask"인 액티비티가
+백 스택에 추가되는 방법을 표현한 것입니다. 이 액티비티가 이미 자신의 백 스택을 가지고 있는
+배경 작업의 일부인 경우, 해당 백 스택도 모두 전경으로
불려나오며, 이는 현재 작업 위에 배치됩니다.</p>
-<p>매니페스트 파일에서 시작 모드를 사용하는 것에 대한 자세한 정보는
+<p>매니페스트 파일에서 시작 모드를 사용하는 것에 대한 자세한 정보는
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-요소 문서를 참조하십시오. 여기에서 {@code launchMode} 속성과 허용된 값을 더 자세히
+요소 문서를 참조하십시오. 여기에서 {@code launchMode} 속성과 허용된 값을 더 자세히
논합니다.</p>
-<p class="note"><strong>참고:</strong> 액티비티에 대하여 <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> 속성으로 지정한 동작을
-재정의하려면 액티비티를 시작한 인텐트에 포함된 플래그를 사용하면 됩니다. 이 내용은
+<p class="note"><strong>참고:</strong> 액티비티에 대하여 <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> 속성으로 지정한 동작을
+재정의하려면 액티비티를 시작한 인텐트에 포함된 플래그를 사용하면 됩니다. 이 내용은
다음 섹션에서 논합니다.</p>
<h4 id="#IntentFlagsForTasks">인텐트 플래그 사용하기</h4>
-<p>액티비티를 시작할 때면, 액티비티가 자신의 작업과 연관되는 기본 방식을 수정할 수 있습니다.
+<p>액티비티를 시작할 때면, 액티비티가 자신의 작업과 연관되는 기본 방식을 수정할 수 있습니다.
{@link
-android.app.Activity#startActivity startActivity()}에 전달한 인텐트 안에 있는 플래그를 포함시키면 됩니다. 기본 동작을 수정하는 데 사용할 수 있는
+android.app.Activity#startActivity startActivity()}에 전달한 인텐트 안에 있는 플래그를 포함시키면 됩니다. 기본 동작을 수정하는 데 사용할 수 있는
플래그는 다음과 같습니다.</p>
<p>
<dt>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</dt>
- <dd>액티비티를 새 작업에서 시작합니다. 지금 시작하고 있는 액티비티에 대해 이미 실행 중인 작업이 있으면,
-해당 작업의 마지막 상태를 복원하여 전경으로 불려나오고 액티비티는 새 인텐트를
+ <dd>액티비티를 새 작업에서 시작합니다. 지금 시작하고 있는 액티비티에 대해 이미 실행 중인 작업이 있으면,
+해당 작업의 마지막 상태를 복원하여 전경으로 불려나오고 액티비티는 새 인텐트를
{@link android.app.Activity#onNewIntent onNewIntent()}에서 수신합니다.
- <p>이렇게 하면 {@code "singleTask"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> 값에서와 같은 동작을 발생시키며,
+ <p>이렇게 하면 {@code "singleTask"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> 값에서와 같은 동작을 발생시키며,
이는 이전 섹션에서 논한 것과 같습니다.</p></dd>
<dt>{@link android.content.Intent#FLAG_ACTIVITY_SINGLE_TOP}</dt>
- <dd>시작되고 있는 액티비티가 현재 액티비티인 경우(백 스택 맨 위에 있는), 해당 액티비티의 새 인스턴스를 생성하는 대신 기존
-인스턴스가 {@link android.app.Activity#onNewIntent onNewIntent()}에
+ <dd>시작되고 있는 액티비티가 현재 액티비티인 경우(백 스택 맨 위에 있는), 해당 액티비티의 새 인스턴스를 생성하는 대신 기존
+인스턴스가 {@link android.app.Activity#onNewIntent onNewIntent()}에
대한 호출을 받습니다.
- <p>이렇게 하면 {@code "singleTop"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> 값에서와 같은 동작을 발생시키며,
+ <p>이렇게 하면 {@code "singleTop"} <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> 값에서와 같은 동작을 발생시키며,
이는 이전 섹션에서 논한 것과 같습니다.</p></dd>
<dt>{@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP}</dt>
- <dd>시작되고 있는 액티비티가 이미 현재 작업에서 실행 중인 경우, 해당 액티비티의
-새 인스턴스를 시작하는 대신 그 위에 있는 모든 다른 액티비티가
-소멸되고 이 인텐트는 해당 액티비티(이제 맨 위로 올라옴)의 재개된 인스턴스로,
+ <dd>시작되고 있는 액티비티가 이미 현재 작업에서 실행 중인 경우, 해당 액티비티의
+새 인스턴스를 시작하는 대신 그 위에 있는 모든 다른 액티비티가
+소멸되고 이 인텐트는 해당 액티비티(이제 맨 위로 올라옴)의 재개된 인스턴스로,
{@link android.app.Activity#onNewIntent onNewIntent()}를 통해 전달됩니다.
<p>이 동작을 발생시키는 <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a>
속성에 대한 값은 없습니다.</p>
- <p>{@code FLAG_ACTIVITY_CLEAR_TOP}는
-{@code FLAG_ACTIVITY_NEW_TASK}와 함께 쓰이는 경우가 가장 보편적입니다.
-이들 플래그를 함께 사용하면 다른 작업에 있는 기존 액티비티의 위치를
+ <p>{@code FLAG_ACTIVITY_CLEAR_TOP}는
+{@code FLAG_ACTIVITY_NEW_TASK}와 함께 쓰이는 경우가 가장 보편적입니다.
+이들 플래그를 함께 사용하면 다른 작업에 있는 기존 액티비티의 위치를
찾아 이를 인텐트에 응답할 수 있는 위치에 놓을 한 가지 방편이 됩니다. </p>
- <p class="note"><strong>참고:</strong> 지정된 액티비티의 시작 모드가
-{@code "standard"}인 경우,
-이것 또한 스택에서 제거되고 그 자리에 새 인스턴스가 대신 생성되어 수신되는 인텐트를
-처리하게 됩니다. 이는 시작 모드가
+ <p class="note"><strong>참고:</strong> 지정된 액티비티의 시작 모드가
+{@code "standard"}인 경우,
+이것 또한 스택에서 제거되고 그 자리에 새 인스턴스가 대신 생성되어 수신되는 인텐트를
+처리하게 됩니다. 이는 시작 모드가
{@code "standard"}인 경우, 새 인텐트에 대해서는 항상 새 인스턴스가 생성되기 때문입니다. </p>
</dd>
</dl>
@@ -420,65 +420,65 @@
<h3 id="Affinities">유사성 처리하기</h3>
-<p><em>유사성</em>이란 액티비티가 어느 작업에 소속되기를 선호하는지를 나타내는 것입니다. 기본적으로,
-같은 애플리케이션에서 나온 액티비티는 서로 유사성을 지니고 있습니다. 따라서, 기본적으로
-같은 애플리케이션 안에 있는 모든 액티비티는 같은 작업 안에 있는 것을 선호합니다. 하지만 액티비티에 대한 기본 유사성은 개발자가
-수정할 수 있습니다. 각기 다른 애플리케이션에서 정의된
-액티비티가 하나의 유사성을 공유할 수도 있고, 같은 애플리케이션에서 정의된 여러 액티비티에
+<p><em>유사성</em>이란 액티비티가 어느 작업에 소속되기를 선호하는지를 나타내는 것입니다. 기본적으로,
+같은 애플리케이션에서 나온 액티비티는 서로 유사성을 지니고 있습니다. 따라서, 기본적으로
+같은 애플리케이션 안에 있는 모든 액티비티는 같은 작업 안에 있는 것을 선호합니다. 하지만 액티비티에 대한 기본 유사성은 개발자가
+수정할 수 있습니다. 각기 다른 애플리케이션에서 정의된
+액티비티가 하나의 유사성을 공유할 수도 있고, 같은 애플리케이션에서 정의된 여러 액티비티에
서로 다른 작업 유사성을 할당할 수도 있습니다.</p>
<p>어느 액티비티라도 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
-요소의 <a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a> 속성을
+요소의 <a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a> 속성을
사용하여 유사성을 수정할 수 있습니다.</p>
<p><a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a>
-속성은 문자열 값을 취합니다. 이는
+속성은 문자열 값을 취합니다. 이는
<a href="{@docRoot}guide/topics/manifest/manifest-element.html">
{@code <manifest>}
-</a> 요소에서 선언한 기본 패키지 이름과 달리 고유해야 합니다. 왜냐하면 시스템이 이 이름을 사용하여 애플리케이션의 기본 작업 유사성을
+</a> 요소에서 선언한 기본 패키지 이름과 달리 고유해야 합니다. 왜냐하면 시스템이 이 이름을 사용하여 애플리케이션의 기본 작업 유사성을
식별하기 때문입니다.</p>
<p>유사성이 역할을 갖는 것은 다음과 같은 두 가지 상황에서입니다.</p>
<ul>
- <li>액티비티를 시작한 인텐트에
+ <li>액티비티를 시작한 인텐트에
{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}
플래그가 들어 있는 경우.
-<p>새로운 액티비티는 기본적으로
-{@link android.app.Activity#startActivity startActivity()}를 호출한 액티비티의 작업 안으로 들어가며 시작됩니다. 이것은 발신자와 같은
-백 스택 위로 밀어내집니다. 하지만
-{@link android.app.Activity#startActivity startActivity()}에
+<p>새로운 액티비티는 기본적으로
+{@link android.app.Activity#startActivity startActivity()}를 호출한 액티비티의 작업 안으로 들어가며 시작됩니다. 이것은 발신자와 같은
+백 스택 위로 밀어내집니다. 하지만
+{@link android.app.Activity#startActivity startActivity()}에
전달된 인텐트에 {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}
플래그가 들어있는 경우, 시스템은 새 액티비티를 담을 다른 작업을 찾습니다. 이는 새 작업인 경우가 많습니다.
-그렇지만 꼭 그래야 하는 것은 아닙니다. 새 액티비티와 같은 유사성을 가진 기존 작업이 이미 존재하는 경우,
+그렇지만 꼭 그래야 하는 것은 아닙니다. 새 액티비티와 같은 유사성을 가진 기존 작업이 이미 존재하는 경우,
해당 액티비티는 그 작업 안으로 들어가며 시작됩니다. 그렇지 않으면, 새 작업을 시작합니다.</p>
-<p>이 플래그 때문에 액티비티가 새 작업을 시작하게 되고 사용자가 <em>홈</em> 버튼을 눌러 이 액티비티를
-떠나고자
-하는 경우, 사용자가 작업으로 도로 이동할 방법이 있어야 합니다. 엔티티 중에는(예를 들어
-알림 관리자) 액티비티를 항상 외부 작업으로만 시작하고 자신의 일부로서는 절대 시작하지 않는 것이 있습니다.
-따라서 이들은 {@code FLAG_ACTIVITY_NEW_TASK}를
-{@link android.app.Activity#startActivity startActivity()}에 전달하는 인텐트에 포함시킵니다.
-이 플래그를 사용할 수 있는 외부 엔티티가
-호출할 수 있는 액티비티를 가지고 있는 경우, 사용자가 시작된 작업에 돌아갈 수 있는
-방법을 따로 가지고 있어야 합니다. 예를 들어 시작 관리자 아이콘을 이용한다든지 하는 방법입니다(작업의 루트 액티비티에
+<p>이 플래그 때문에 액티비티가 새 작업을 시작하게 되고 사용자가 <em>홈</em> 버튼을 눌러 이 액티비티를
+떠나고자
+하는 경우, 사용자가 작업으로 도로 이동할 방법이 있어야 합니다. 엔티티 중에는(예를 들어
+알림 관리자) 액티비티를 항상 외부 작업으로만 시작하고 자신의 일부로서는 절대 시작하지 않는 것이 있습니다.
+따라서 이들은 {@code FLAG_ACTIVITY_NEW_TASK}를
+{@link android.app.Activity#startActivity startActivity()}에 전달하는 인텐트에 포함시킵니다.
+이 플래그를 사용할 수 있는 외부 엔티티가
+호출할 수 있는 액티비티를 가지고 있는 경우, 사용자가 시작된 작업에 돌아갈 수 있는
+방법을 따로 가지고 있어야 합니다. 예를 들어 시작 관리자 아이콘을 이용한다든지 하는 방법입니다(작업의 루트 액티비티에
{@link android.content.Intent#CATEGORY_LAUNCHER} 인텐트 필터가 있습니다. 아래의 <a href="#Starting">작업 시작하기</a> 섹션을 참조하십시오).</p>
</li>
<li>액티비티의 <a href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">
{@code allowTaskReparenting}</a> 속성이 {@code "true"}로 설정된 경우.
- <p>이 경우, 액티비티는 자신이 시작한 작업에서 벗어나 유사성을 가진 다른 작업이 전경으로
+ <p>이 경우, 액티비티는 자신이 시작한 작업에서 벗어나 유사성을 가진 다른 작업이 전경으로
나오면 그 작업으로 이동할 수 있습니다.</p>
- <p>예를 들어 선택한 몇몇 도시에서 기상 상태를 예보하는 어느 액티비티가
-여행 애플리케이션의 일부로 정의되어 있다고 가정합니다. 이것은 같은 애플리케이션에 있는
-다른 여러 액티비티와 같은 유사성을 가지며(기본 애플리케이션 유사성) 이 속성으로 상위 재지정을 허용하기도 합니다.
-액티비티 중 하나가 일기 예보 액티비티를 시작하면, 이는 처음에는 액티비티와 같은 작업에
-속합니다. 하지만 여행 애플리케이션의 작업이 전경으로 불려나오면
+ <p>예를 들어 선택한 몇몇 도시에서 기상 상태를 예보하는 어느 액티비티가
+여행 애플리케이션의 일부로 정의되어 있다고 가정합니다. 이것은 같은 애플리케이션에 있는
+다른 여러 액티비티와 같은 유사성을 가지며(기본 애플리케이션 유사성) 이 속성으로 상위 재지정을 허용하기도 합니다.
+액티비티 중 하나가 일기 예보 액티비티를 시작하면, 이는 처음에는 액티비티와 같은 작업에
+속합니다. 하지만 여행 애플리케이션의 작업이 전경으로 불려나오면
일기 예보 액티비티는 그 작업에 다시 할당되며 그 안에 표시됩니다.</p>
</li>
</ul>
-<p class="note"><strong>팁:</strong> {@code .apk} 파일에 사용자 쪽에서 보기에 하나 이상의 "애플리케이션"이
+<p class="note"><strong>팁:</strong> {@code .apk} 파일에 사용자 쪽에서 보기에 하나 이상의 "애플리케이션"이
들어있는 경우, <a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">{@code taskAffinity}</a>
속성을 사용하여 각 "애플리케이션"과 연관된 액티비티에 서로 다른 유사성을 할당하는 것이 좋습니다.</p>
@@ -486,9 +486,9 @@
<h3 id="Clearing">백 스택 지우기</h3>
-<p>사용자가 작업을 오랜 시간 동안 떠나 있으면, 시스템이 루트 액티비티만 빼고 모든 액티비티를
-해당 작업에서 지웁니다. 사용자가 다시 작업으로 돌아오면, 루트 액티비티만 복원됩니다.
-시스템이 이런 식으로 동작하는 것은 오랜 시간이 지난 다음에는 사용자가 전에 하던 일을 중단하고
+<p>사용자가 작업을 오랜 시간 동안 떠나 있으면, 시스템이 루트 액티비티만 빼고 모든 액티비티를
+해당 작업에서 지웁니다. 사용자가 다시 작업으로 돌아오면, 루트 액티비티만 복원됩니다.
+시스템이 이런 식으로 동작하는 것은 오랜 시간이 지난 다음에는 사용자가 전에 하던 일을 중단하고
새로운 일을 시작하기 위해 작업에 돌아올 가능성이 크기 때문입니다. </p>
<p>이 동작을 수정하는 데 사용할 수 있는 액티비티 속성이 몇 가지 있습니다. </p>
@@ -497,27 +497,27 @@
<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#always">alwaysRetainTaskState</a></code>
</dt>
-<dd>이 속성이 작업의 루트 액티비티 안에서 {@code "true"}로 설정되어 있는 경우,
-방금 설명한 기본 동작이 일어나지 않습니다.
+<dd>이 속성이 작업의 루트 액티비티 안에서 {@code "true"}로 설정되어 있는 경우,
+방금 설명한 기본 동작이 일어나지 않습니다.
작업은 오랜 시간이 지난 뒤에도 자신의 스택에 있는 모든 액티비티를 유지합니다.</dd>
<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code></dt>
-<dd>이 속성이 작업의 루트 액티비티 안에서 {@code "true"}로 설정되어 있는 경우,
-사용자가 작업을 떠났다가 다시 돌아올 때마다 스택을 루트 액티비티까지
-지웁니다. 바꿔 말하면, 이것은
+<dd>이 속성이 작업의 루트 액티비티 안에서 {@code "true"}로 설정되어 있는 경우,
+사용자가 작업을 떠났다가 다시 돌아올 때마다 스택을 루트 액티비티까지
+지웁니다. 바꿔 말하면, 이것은
<a href="{@docRoot}guide/topics/manifest/activity-element.html#always">
-{@code alwaysRetainTaskState}</a>와 정반대입니다. 사용자는 항상 작업의 초기 상태로 돌아오게 되며,
+{@code alwaysRetainTaskState}</a>와 정반대입니다. 사용자는 항상 작업의 초기 상태로 돌아오게 되며,
이는 아주 잠깐 동안만 작업을 떠난 경우에도 마찬가지입니다.</dd>
<dt><code><a
href="{@docRoot}guide/topics/manifest/activity-element.html#finish">finishOnTaskLaunch</a></code>
</dt>
-<dd>이 속성은 <a href="{@docRoot}guide/topics/manifest/activity-element.html#clear">{@code clearTaskOnLaunch}</a>와 같지만,
-작업 전체가 아니라
-하나의 액티비티에서 작동합니다. 이것은 루트 액티비티를 포함한 모든 액티비티가 없어지게
-하기도 합니다. 이것을 {@code "true"}로 설정하면,
-액티비티는 현재 세션에 대해서만 작업의 일부로 유지됩니다. 사용자가 작업을 떠났다가
+<dd>이 속성은 <a href="{@docRoot}guide/topics/manifest/activity-element.html#clear">{@code clearTaskOnLaunch}</a>와 같지만,
+작업 전체가 아니라
+하나의 액티비티에서 작동합니다. 이것은 루트 액티비티를 포함한 모든 액티비티가 없어지게
+하기도 합니다. 이것을 {@code "true"}로 설정하면,
+액티비티는 현재 세션에 대해서만 작업의 일부로 유지됩니다. 사용자가 작업을 떠났다가
다시 돌아오면 이 작업은 더 이상 존재하지 않습니다.</dd>
</dl>
@@ -526,9 +526,9 @@
<h3 id="Starting">작업 시작하기</h3>
-<p>액티비티를 작업의 진입 지점으로 설정하려면 여기에 작업에서 지정한 대로
-{@code "android.intent.action.MAIN"}이 있는 인텐트 필터를 부여하고
-{@code "android.intent.category.LAUNCHER"}를
+<p>액티비티를 작업의 진입 지점으로 설정하려면 여기에 작업에서 지정한 대로
+{@code "android.intent.action.MAIN"}이 있는 인텐트 필터를 부여하고
+{@code "android.intent.category.LAUNCHER"}를
지정된 카테고리로 설정하면 됩니다. 예:</p>
<pre>
@@ -541,29 +541,29 @@
</activity>
</pre>
-<p>이런 종류의 인텐트 필터를 사용하면 액티비티에 대한 아이콘과 레이블이
-애플리케이션 시작 관리자에 표시되어 사용자에게 액티비티를 시작할 방법을 부여하며,
+<p>이런 종류의 인텐트 필터를 사용하면 액티비티에 대한 아이콘과 레이블이
+애플리케이션 시작 관리자에 표시되어 사용자에게 액티비티를 시작할 방법을 부여하며,
액티비티를 시작하고 나면 이것이 생성한 작업에 언제든 돌아올 수 있게 됩니다.
</p>
-<p>이 두 번째 능력이 중요합니다. 사용자는 작업을 떠났다가 이 액티비티 시작 관리자를 사용하여 나중에 작업에
+<p>이 두 번째 능력이 중요합니다. 사용자는 작업을 떠났다가 이 액티비티 시작 관리자를 사용하여 나중에 작업에
돌아올 수 있어야 합니다. 이러한 이유로, 액티비티가 항상 작업을 시작하는 것으로 표시하는 <a href="#LaunchModes">시작
-모드</a> 두 가지, 즉 {@code "singleTask"}와
-{@code "singleInstance"}는 액티비티에
+모드</a> 두 가지, 즉 {@code "singleTask"}와
+{@code "singleInstance"}는 액티비티에
{@link android.content.Intent#ACTION_MAIN}
- 및 {@link android.content.Intent#CATEGORY_LAUNCHER} 필터가 있을 때에만 사용해야 합니다. 예를 들어 필터가 누락되면 다음과 같은 일이
-발생합니다. 어느 인텐트가 {@code "singleTask"} 액티비티를 시작하여 새 작업을 시작하고,
+ 및 {@link android.content.Intent#CATEGORY_LAUNCHER} 필터가 있을 때에만 사용해야 합니다. 예를 들어 필터가 누락되면 다음과 같은 일이
+발생합니다. 어느 인텐트가 {@code "singleTask"} 액티비티를 시작하여 새 작업을 시작하고,
사용자가 이 작업에서 일하며 어느 정도 시간을 보냅니다. 그런 다음 사용자가 <em>홈</em>
- 버튼을 누릅니다. 이제 이 작업은 배경으로 전송되었으며 눈에 보이지 않습니다. 이제 사용자가 작업으로 되돌아갈
+ 버튼을 누릅니다. 이제 이 작업은 배경으로 전송되었으며 눈에 보이지 않습니다. 이제 사용자가 작업으로 되돌아갈
방법이 없어졌습니다. 이는 애플리케이션 시작 관리자에 표시되지 않기 때문입니다.</p>
-<p>사용자가 액티비티로 되돌아갈 수 있도록 하는 것을 원치 않는 경우,
+<p>사용자가 액티비티로 되돌아갈 수 있도록 하는 것을 원치 않는 경우,
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
- 요소의
+ 요소의
<a href="{@docRoot}guide/topics/manifest/activity-element.html#finish">{@code finishOnTaskLaunch}</a>
를 {@code "true"}로 설정하면 됩니다(<a href="#Clearing">스택 지우기</a>를 참조하십시오).</p>
-<p>작업과 액티비티가 개요 화면에서 어떻게 표시되고 관리되는지에 대한
+<p>작업과 액티비티가 개요 화면에서 어떻게 표시되고 관리되는지에 대한
자세한 정보는 <a href="{@docRoot}guide/components/recents.html">
개요 화면</a>에서 확인하실 수 있습니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/index.jd b/docs/html-intl/intl/ko/guide/index.jd
index 73af3df..debd053 100644
--- a/docs/html-intl/intl/ko/guide/index.jd
+++ b/docs/html-intl/intl/ko/guide/index.jd
@@ -4,16 +4,16 @@
<div class="sidebox" style="width:220px"><!-- width to match col-4 below -->
-<p>앱의 작동 원리를 배워보고자 한다면, 우선
+<p>앱의 작동 원리를 배워보고자 한다면, 우선
<a href="{@docRoot}guide/components/fundamentals.html">앱 기본 항목</a>부터 시작하십시오.</p>
<p>바로 코딩을 시작하려면, <a href="{@docRoot}training/basics/firstapp/index.html">첫 앱 구축하기</a>를 읽어보십시오.</p>
</div>
-<p>Android는 풍성한 애플리케이션 프레임워크를 제공하여 Java 언어 환경에서 실행되는
-모바일 기기에서 사용할 혁신적인 앱과 게임을 구축할 수 있습니다. 왼쪽 탐색 영역에 목록으로 나열된
+<p>Android는 풍성한 애플리케이션 프레임워크를 제공하여 Java 언어 환경에서 실행되는
+모바일 기기에서 사용할 혁신적인 앱과 게임을 구축할 수 있습니다. 왼쪽 탐색 영역에 목록으로 나열된
여러 문서에서 Android의 다양한 API를 사용하여 앱을 구축하는 방법에 대한 상세한 정보를 제공합니다.</p>
-<p>Android 개발을 처음 시도하신다면, 다음과 같은
+<p>Android 개발을 처음 시도하신다면, 다음과 같은
Android 앱 프레임워크 기본 개념을 숙지하는 것이 중요합니다.</p>
@@ -23,14 +23,14 @@
<h4>앱은 여러 개의 진입 지점을 제공합니다.</h4>
-<p>Android 앱은 여러 가지 고유한 구성 요소들의 조합으로 구축되며, 이러한 구성 요소는 개별적으로
-호출할 수도 있습니다. 예를 들어 어떤 하나의 <em>액티비티</em>가 사용자 인터페이스를 위한
-화면을 하나 제공하고, <em>서비스</em>가 배경에서 독립적으로 작업을 수행할
+<p>Android 앱은 여러 가지 고유한 구성 요소들의 조합으로 구축되며, 이러한 구성 요소는 개별적으로
+호출할 수도 있습니다. 예를 들어 어떤 하나의 <em>액티비티</em>가 사용자 인터페이스를 위한
+화면을 하나 제공하고, <em>서비스</em>가 배경에서 독립적으로 작업을 수행할
수 있습니다.</p>
-<p>한 구성 요소에서 또 다른 구성 요소를 시작하려면 <em>인텐트</em>를 사용하면 됩니다. 심지어 다른 앱에서도
-구성 요소를 시작할 수 있습니다. 지도 앱에서 주소를 표시하는 액티비티를 시작하는 것이 좋은 예입니다. 이 모델은
-하나의 앱에 대한 여러 개의 진입 지점을 제공하여 어느 앱이라도 다른 여러 앱이 호출할 수 있는 작업에 대해
+<p>한 구성 요소에서 또 다른 구성 요소를 시작하려면 <em>인텐트</em>를 사용하면 됩니다. 심지어 다른 앱에서도
+구성 요소를 시작할 수 있습니다. 지도 앱에서 주소를 표시하는 액티비티를 시작하는 것이 좋은 예입니다. 이 모델은
+하나의 앱에 대한 여러 개의 진입 지점을 제공하여 어느 앱이라도 다른 여러 앱이 호출할 수 있는 작업에 대해
사용자의 "기본" 앱 역할을 합니다.</p>
@@ -48,14 +48,14 @@
<h4>앱은 여러 가지 기기에 맞게 변경됩니다.</h4>
-<p>Android는 적응형 앱 프레임워크를 제공하여 여러 가지 기기 구성에 맞게
-고유한 리소스를 제공할 수 있습니다. 예를 들어, 여러 가지 화면 크기에 맞춰 각기 다른 XML
-레이아웃 파일을 생성하면 시스템이 현재 기기의 화면 크기를 근거로
+<p>Android는 적응형 앱 프레임워크를 제공하여 여러 가지 기기 구성에 맞게
+고유한 리소스를 제공할 수 있습니다. 예를 들어, 여러 가지 화면 크기에 맞춰 각기 다른 XML
+레이아웃 파일을 생성하면 시스템이 현재 기기의 화면 크기를 근거로
어느 레이아웃을 적용할지 결정합니다.</p>
-<p>앱 기능이 특정한 하드웨어(예: 카메라)를 필요로 하는 경우 런타임에
-기기 특징의 기능을 쿼리할 수 있습니다. 필요하다면 앱이 필요로 하는 기능을 선언할 수도 있습니다.
-그러면 Google Play Store와 같은 앱 마켓에서 해당 기능을 지원하지 않는 기기에서
+<p>앱 기능이 특정한 하드웨어(예: 카메라)를 필요로 하는 경우 런타임에
+기기 특징의 기능을 쿼리할 수 있습니다. 필요하다면 앱이 필요로 하는 기능을 선언할 수도 있습니다.
+그러면 Google Play Store와 같은 앱 마켓에서 해당 기능을 지원하지 않는 기기에서
설치를 허용하지 않습니다.</p>
diff --git a/docs/html-intl/intl/ko/preview/j8-jack.jd b/docs/html-intl/intl/ko/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/ko/preview/j8-jack.jd
rename to docs/html-intl/intl/ko/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/ko/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/ko/guide/topics/manifest/manifest-intro.jd
index c3550d0..2f397c7 100644
--- a/docs/html-intl/intl/ko/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/ko/guide/topics/manifest/manifest-intro.jd
@@ -20,38 +20,38 @@
</div>
<p>
- 모든 애플리케이션에는 루트 라이브러리에 AndroidManifest.xml 파일(정확히
-이 이름으로)이 있어야 합니다. <span itemprop="description">매니페스트 파일은
-Android 시스템에 대한 여러분의 앱 관련 필수 정보를 나타냅니다.
-즉 앱의 코드를 실행하기 전에 시스템이 반드시 필요로 하는 정보를
+ 모든 애플리케이션에는 루트 라이브러리에 AndroidManifest.xml 파일(정확히
+이 이름으로)이 있어야 합니다. <span itemprop="description">매니페스트 파일은
+Android 시스템에 대한 여러분의 앱 관련 필수 정보를 나타냅니다.
+즉 앱의 코드를 실행하기 전에 시스템이 반드시 필요로 하는 정보를
말합니다.</span> 매니페스트가 하는 일에는 여러 가지가 있지만, 그 중에서 몇 가지만 소개하면 다음과 같습니다.
</p>
<ul>
-<li>애플리케이션에 대한 Java 패키지의 이름을 나타냅니다.
+<li>애플리케이션에 대한 Java 패키지의 이름을 나타냅니다.
패키지 이름이 애플리케이션에 대한 고유한 식별자 역할을 합니다.</li>
-<li>애플리케이션의 구성 요소를 설명합니다. 액티비티,
-서비스, 브로드캐스트 수신기 및 콘텐츠 제공자 등 애플리케이션을 이루는 여러 항목을
-말합니다. 이것은 각 구성 요소를 구현하는 클래스의 이름을 나타내고
-각각의 기능을 게시합니다(예를 들어 처리할 수 있는 {@link android.content.Intent
-Intent} 메시지 종류 등). 이러한 선언을 통해 Android 시스템이 여러 구성 요소가
+<li>애플리케이션의 구성 요소를 설명합니다. 액티비티,
+서비스, 브로드캐스트 수신기 및 콘텐츠 제공자 등 애플리케이션을 이루는 여러 항목을
+말합니다. 이것은 각 구성 요소를 구현하는 클래스의 이름을 나타내고
+각각의 기능을 게시합니다(예를 들어 처리할 수 있는 {@link android.content.Intent
+Intent} 메시지 종류 등). 이러한 선언을 통해 Android 시스템이 여러 구성 요소가
각각 무엇인지 알게 되고, 어떤 조건에서 시작해야 하는지 알 수 있습니다.</li>
-<li>어느 프로세스가 애플리케이션 구성 요소를 호스팅할 것인지 결정합니다.</li>
+<li>어느 프로세스가 애플리케이션 구성 요소를 호스팅할 것인지 결정합니다.</li>
-<li>API의 보호된 부분에 액세스하여 다른 애플리케이션과 상호 작용하려면
-애플리케이션에 어느 권한이 꼭 필요한지 선언합니다.</li>
+<li>API의 보호된 부분에 액세스하여 다른 애플리케이션과 상호 작용하려면
+애플리케이션에 어느 권한이 꼭 필요한지 선언합니다.</li>
-<li>또한, 이 애플리케이션의 구성 요소와 상호 작용하려면 다른 애플리케이션이
+<li>또한, 이 애플리케이션의 구성 요소와 상호 작용하려면 다른 애플리케이션이
반드시 가지고 있어야 하는 권한도 선언합니다.</li>
-<li>이는 애플리케이션이 실행 중일 때 프로파일링과 기타 정보를 제공하는
-{@link android.app.Instrumentation} 클래스를 목록으로 표시합니다. 이러한 선언이 매니페스트에 나타나는 것은
-애플리케이션이 개발 중이고 테스트되는 단계에만 국한됩니다.
+<li>이는 애플리케이션이 실행 중일 때 프로파일링과 기타 정보를 제공하는
+{@link android.app.Instrumentation} 클래스를 목록으로 표시합니다. 이러한 선언이 매니페스트에 나타나는 것은
+애플리케이션이 개발 중이고 테스트되는 단계에만 국한됩니다.
이들은 애플리케이션이 게시되기 전에 제거됩니다.</li>
-<li>이는 애플리케이션이 필요로 하는 Android API의 최소 레벨을
+<li>이는 애플리케이션이 필요로 하는 Android API의 최소 레벨을
선언합니다.</li>
<li>애플리케이션이 연결되어야 하는 라이브러리를 목록으로 표시합니다.</li>
@@ -61,12 +61,12 @@
<h2 id="filestruct">매니페스트 파일의 구조</h2>
<p>
-아래의 다이어그램은 매니페스트 파일의 일반적인 구조와 매니페스트 파일에
-들어있을 수 있는 모든 요소를 표시한 것입니다. 각 요소와 각각의 속성을 모두 문서화한
-전문은 별도의 파일에서 확인하실 수 있습니다. 어떤 요소에 대해서든
-상세한 정보를 보려면 다이어그램에서 해당 요소 이름을 클릭하십시오.
-이름은 다이어그램 뒤에 나오는 요소 목록(알파벳 순) 또는
-요소 이름이 언급되는 기타 영역 어디서든 클릭할 수 있습니다.
+아래의 다이어그램은 매니페스트 파일의 일반적인 구조와 매니페스트 파일에
+들어있을 수 있는 모든 요소를 표시한 것입니다. 각 요소와 각각의 속성을 모두 문서화한
+전문은 별도의 파일에서 확인하실 수 있습니다. 어떤 요소에 대해서든
+상세한 정보를 보려면 다이어그램에서 해당 요소 이름을 클릭하십시오.
+이름은 다이어그램 뒤에 나오는 요소 목록(알파벳 순) 또는
+요소 이름이 언급되는 기타 영역 어디서든 클릭할 수 있습니다.
</p>
<pre>
@@ -126,9 +126,9 @@
</pre>
<p>
-매니페스트 파일에 표시될 수 있는 모든 요소는 아래에 알파벳 순서로
-목록으로 표시되어 있습니다. 합법적인 요소는 이들이 전부입니다. 개발자 나름대로 요소 또는 속성을
-추가해서는 안 됩니다.
+매니페스트 파일에 표시될 수 있는 모든 요소는 아래에 알파벳 순서로
+목록으로 표시되어 있습니다. 합법적인 요소는 이들이 전부입니다. 개발자 나름대로 요소 또는 속성을
+추가해서는 안 됩니다.
</p>
<p style="margin-left: 2em">
@@ -158,74 +158,74 @@
</p>
-
+
<h2 id="filec">파일 규칙</h2>
<p>
-몇몇 규칙과 규정은 매니페스트 내의 모든 요소와 속성에 전반적으로
+몇몇 규칙과 규정은 매니페스트 내의 모든 요소와 속성에 전반적으로
적용됩니다.
</p>
<dl>
<dt><b>요소</b></dt>
-<dd>필수 요소는
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> 및
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> 요소뿐으로,
-이들은 각기 따로 표시되어야 하며 한 번씩만 발생할 수 있습니다.
-나머지는 대부분 여러 번 발생할 수 있거나 전혀 발생하지 않기도 합니다. 다만,
-그 중 최소한 몇몇은 있어야 매니페스트가 무엇이든 의미 있는 작업을
+<dd>필수 요소는
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> 및
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> 요소뿐으로,
+이들은 각기 따로 표시되어야 하며 한 번씩만 발생할 수 있습니다.
+나머지는 대부분 여러 번 발생할 수 있거나 전혀 발생하지 않기도 합니다. 다만,
+그 중 최소한 몇몇은 있어야 매니페스트가 무엇이든 의미 있는 작업을
달성할 수 있습니다.
<p>
-요소에 무엇이든 들어있기만 하면 다른 요소가 그 요소에 들어 있는 것입니다.
+요소에 무엇이든 들어있기만 하면 다른 요소가 그 요소에 들어 있는 것입니다.
모든 값은 요소 내의 문자 데이터로서가 아니라 속성을 통해 설정됩니다.
</p>
<p>
-같은 레벨에 있는 여러 요소는 보통 순서가 지정되지 않습니다. 예를 들어
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> 및
-<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-요소는 어떤 순서로든 서로 섞여도 됩니다 (이 규칙에서
+같은 레벨에 있는 여러 요소는 보통 순서가 지정되지 않습니다. 예를 들어
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> 및
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
+요소는 어떤 순서로든 서로 섞여도 됩니다 (이 규칙에서
<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
-요소는 예외입니다. 이것은
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>의 별칭이므로
+요소는 예외입니다. 이것은
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>의 별칭이므로
이를 반드시 따라야 합니다).
</p></dd>
<dt><b>속성</b></dt>
-<dd>공식적인 의미에서 모든 속성은 선택 항목입니다. 그러나, 요소가 목적을 달성하기
-위해서 반드시 지정되어야 하는 것이 몇 가지 있습니다. 관련 문서를
-지침으로 사용하십시오. 정말로 선택적인 속성의 경우, 기본 값을 언급하거나
+<dd>공식적인 의미에서 모든 속성은 선택 항목입니다. 그러나, 요소가 목적을 달성하기
+위해서 반드시 지정되어야 하는 것이 몇 가지 있습니다. 관련 문서를
+지침으로 사용하십시오. 정말로 선택적인 속성의 경우, 기본 값을 언급하거나
사양이 없으면 어떤 일이 벌어지는지 진술합니다.
-<p>루트
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+<p>루트
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
요소의 몇 가지 속성을 제외하고 모든 속성 이름은 {@code android:alwaysRetainTaskState} 접두사로 시작합니다.
-예를 들어, {@code android:}와 같습니다. 이 접두사는 범용이기 때문에
-속성을 이름으로 참조하는 경우 관련 문서가 이를 생략하는 경우가
+예를 들어, {@code android:}와 같습니다. 이 접두사는 범용이기 때문에
+속성을 이름으로 참조하는 경우 관련 문서가 이를 생략하는 경우가
일반적입니다.</p></dd>
<dt><b>클래스 이름 선언</b></dt>
-<dd>대다수의 요소가 Java 객체에 상응합니다. 여기에는
+<dd>대다수의 요소가 Java 객체에 상응합니다. 여기에는
애플리케이션 자체에 대한 요소가 포함되며(
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-요소), 그것의 주 구성 요소도 포함됩니다. 즉, 액티비티
-(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+요소), 그것의 주 구성 요소도 포함됩니다. 즉, 액티비티
+(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
서비스
-(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
+(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
브로드캐스트 수신기
-(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>) 및
+(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>) 및
콘텐츠 제공자
-(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>) 등이 이에 해당됩니다.
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>) 등이 이에 해당됩니다.
<p>
하위 클래스를 정의하는 경우 구성 요소 클래스
-({@link android.app.Activity}, {@link android.app.Service},
-{@link android.content.BroadcastReceiver} 및 {@link android.content.ContentProvider})는 거의 항상 이렇게 하게 되는데,
-이때 하위 클래스는 {@code name} 속성을 통해 선언됩니다. 이 이름에 반드시
-완전한 패키지 지정이 포함되어 있어야 합니다.
+({@link android.app.Activity}, {@link android.app.Service},
+{@link android.content.BroadcastReceiver} 및 {@link android.content.ContentProvider})는 거의 항상 이렇게 하게 되는데,
+이때 하위 클래스는 {@code name} 속성을 통해 선언됩니다. 이 이름에 반드시
+완전한 패키지 지정이 포함되어 있어야 합니다.
예를 들어, {@link android.app.Service} 하위 클래스를 선언하려면 다음과 같이 할 수 있습니다.
</p>
@@ -239,12 +239,12 @@
</manifest></pre>
<p>
-그러나 일종의 줄임으로서 문자열의 첫 번째 글자가 마침표인 경우, 해당
+그러나 일종의 줄임으로서 문자열의 첫 번째 글자가 마침표인 경우, 해당
문자열은 애플리케이션의 패키지 이름에 추가됩니다(
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-요소의
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
-속성에서 지정한 바와 같이). 다음 할당은 위의 것과 같습니다.
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+요소의
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
+속성에서 지정한 바와 같이). 다음 할당은 위의 것과 같습니다.
</p>
<pre><manifest package="com.example.project" . . . >
@@ -257,13 +257,13 @@
</manifest></pre>
<p>
-Android는 구성 요소를 시작할 때 이름이 명명된 하위 클래스의 인스턴스를 생성합니다.
+Android는 구성 요소를 시작할 때 이름이 명명된 하위 클래스의 인스턴스를 생성합니다.
하위 클래스가 지정되지 않은 경우, 기본 클래스의 인스턴스를 생성합니다.
</p></dd>
<dt><b>여러 개의 값</b></dt>
-<dd>하나 이상의 값을 지정할 수 있는 경우, 해당 요소는
-한 요소 안에 여러 개의 값을 목록으로 표시하기보다 거의 항상 반복됩니다.
+<dd>하나 이상의 값을 지정할 수 있는 경우, 해당 요소는
+한 요소 안에 여러 개의 값을 목록으로 표시하기보다 거의 항상 반복됩니다.
예를 들어 한 인텐트 필터가 여러 개의 작업을 목록으로 표시할 수 있습니다.
<pre><intent-filter . . . >
@@ -274,9 +274,9 @@
</intent-filter></pre></dd>
<dt><b>리소스 값</b></dt>
-<dd>몇몇 속성에는 사용자에게 표시될 수 있는 값이 있습니다. 예를 들어
-액티비티에 대한 레이블과 아이콘 등이 이에 해당됩니다. 이러한 속성의 값은
-지역화해야 하며 따라서 리소스나 테마에서 설정됩니다. 리소스
+<dd>몇몇 속성에는 사용자에게 표시될 수 있는 값이 있습니다. 예를 들어
+액티비티에 대한 레이블과 아이콘 등이 이에 해당됩니다. 이러한 속성의 값은
+지역화해야 하며 따라서 리소스나 테마에서 설정됩니다. 리소스
값은 다음과 같은 형식으로 표현됩니다.</p>
<p style="margin-left: 2em">{@code @[<i>패키지</i>:]<i>유형</i>:<i>이름</i>}</p>
@@ -284,7 +284,7 @@
<p>
여기에서 <i>패키지</i> 이름은 리소스가 애플리케이션과 같은 패키지에 있으면 생략할 수 있고,
<i>유형</i> 은 "문자열" 또는 "그릴 수 있음" 같은 리소스 유형입니다. 그리고
- <i>이름</i> 은 특정 리소스를 식별하는 이름입니다.
+ <i>이름</i> 은 특정 리소스를 식별하는 이름입니다.
예:
</p>
@@ -299,8 +299,8 @@
</p></dd>
<dt><b>문자열 값</b></dt>
-<dd>속성 값이 문자열인 경우, 이중 백슬래시('{@code \\}')를 사용하여
-문자 이스케이프를 수행해야 합니다. 예를 들어 줄바꿈에는 {@code \\n},
+<dd>속성 값이 문자열인 경우, 이중 백슬래시('{@code \\}')를 사용하여
+문자 이스케이프를 수행해야 합니다. 예를 들어 줄바꿈에는 {@code \\n},
유니코드 문자에는 '{@code \\uxxxx}'를 쓰십시오.</dd>
</dl>
@@ -308,7 +308,7 @@
<h2 id="filef">파일 기능</h2>
<p>
-다음 섹션에서는 Android 기능을 매니페스트 파일에 반영하는
+다음 섹션에서는 Android 기능을 매니페스트 파일에 반영하는
몇 가지 방식을 설명합니다.
</p>
@@ -316,37 +316,37 @@
<h3 id="ifs">인텐트 필터</h3>
<p>
-애플리케이션의 핵심 구성 요소(액티비티, 서비스 및 브로드캐스트
-수신기)를 활성화하는 것은 <i>인텐트</i>입니다. 인텐트는
+애플리케이션의 핵심 구성 요소(액티비티, 서비스 및 브로드캐스트
+수신기)를 활성화하는 것은 <i>인텐트</i>입니다. 인텐트는
원하는 작업을 설명하는 정보 묶음입니다({@link android.content.Intent} 객체).
-여기에는 작업을 수행할 데이터, 작업을 수행할 구성 요소의 카테고리와
-기타 관련 지침 등이 포함됩니다.
-Android는 인텐트에 응답할 적절한 구성 요소를 찾아 필요한 경우 구성 요소의
-새 인스턴스를 시작하고, 이것을 인텐트 객체에
+여기에는 작업을 수행할 데이터, 작업을 수행할 구성 요소의 카테고리와
+기타 관련 지침 등이 포함됩니다.
+Android는 인텐트에 응답할 적절한 구성 요소를 찾아 필요한 경우 구성 요소의
+새 인스턴스를 시작하고, 이것을 인텐트 객체에
전달합니다.
</p>
<p>
-구성 요소는 자신의 능력을 알립니다. 즉, 자신이 응답할 수 있는
-인텐트 종류를 밝힙니다. 이때 사용하는 것이 <i>인텐트 필터</i>입니다. Android 시스템은
-구성 요소를 시작하기 전에 해당 구성 요소가 처리할 수 있는 인텐트에 대해 학습해야 하기 때문에,
-인텐트 필터는 매니페스트 파일에
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-요소로 지정됩니다. 구성 요소 하나에 필터는 얼마든지 있을 수 있으며, 각각 서로 다른 기능을
+구성 요소는 자신의 능력을 알립니다. 즉, 자신이 응답할 수 있는
+인텐트 종류를 밝힙니다. 이때 사용하는 것이 <i>인텐트 필터</i>입니다. Android 시스템은
+구성 요소를 시작하기 전에 해당 구성 요소가 처리할 수 있는 인텐트에 대해 학습해야 하기 때문에,
+인텐트 필터는 매니페스트 파일에
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
+요소로 지정됩니다. 구성 요소 하나에 필터는 얼마든지 있을 수 있으며, 각각 서로 다른 기능을
설명하게 됩니다.
</p>
<p>
대상 구성 요소를 명시적으로 지명하는 인텐트가 해당 구성 요소를 활성화합니다.
-필터는 아무런 역할을 하지 않습니다. 하지만 대상을 이름으로 지정하지 않는 인텐트의 경우에는
-자신이 구성 요소의 필터 중 하나를 통과할 수 있을 때에만 해당 구성 요소를 활성화할 수
+필터는 아무런 역할을 하지 않습니다. 하지만 대상을 이름으로 지정하지 않는 인텐트의 경우에는
+자신이 구성 요소의 필터 중 하나를 통과할 수 있을 때에만 해당 구성 요소를 활성화할 수
있습니다.
</p>
<p>
-인텐트 객체를 인텐트 필터에 대해 테스트하는 방법에 대한 자세한 방법은
-별도의 문서인
-<a href="{@docRoot}guide/components/intents-filters.html">인텐트
+인텐트 객체를 인텐트 필터에 대해 테스트하는 방법에 대한 자세한 방법은
+별도의 문서인
+<a href="{@docRoot}guide/components/intents-filters.html">인텐트
및 인텐트 필터</a>를 참조하십시오.
</p>
@@ -354,42 +354,42 @@
<h3 id="iconlabel">아이콘 및 레이블</h3>
<p>
-대다수의 요소에 {@code icon}과 {@code label} 속성이 있으며
-이것으로 사용자에게 표시될 수 있는 작은 아이콘과 텍스트 레이블을 나타냅니다. 몇몇 요소에는
-{@code description} 속성도 있어 좀 더 긴 설명 텍스트를 나타낼 수 있고, 이것 또한 화면에
-표시될 수 있습니다. 예를 들어
+대다수의 요소에 {@code icon}과 {@code label} 속성이 있으며
+이것으로 사용자에게 표시될 수 있는 작은 아이콘과 텍스트 레이블을 나타냅니다. 몇몇 요소에는
+{@code description} 속성도 있어 좀 더 긴 설명 텍스트를 나타낼 수 있고, 이것 또한 화면에
+표시될 수 있습니다. 예를 들어
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-요소는 이와 같은 속성을 셋 모두 가지고 있어 사용자가 이를 요청한 애플리케이션에 대한
-권한을 허가할 것인지 여부를 물으면 해당 권한,
-권한의 이름과 그에 수반되는 내용에 대한 설명을
+요소는 이와 같은 속성을 셋 모두 가지고 있어 사용자가 이를 요청한 애플리케이션에 대한
+권한을 허가할 것인지 여부를 물으면 해당 권한,
+권한의 이름과 그에 수반되는 내용에 대한 설명을
사용자에게 표시할 수 있습니다.
</p>
<p>
-어떤 경우에든, 요소에서 설정된 아이콘과 레이블이 해당 컨테이너의 모든 하위 요소에 대한 기본
-{@code icon}과 {@code label} 설정이 됩니다.
-따라서
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-요소에서 설정된 아이콘과 레이블이 애플리케이션의 각 요소에 대한 기본 아이콘과 레이블입니다.
-이와 유사하게, 구성 요소에 대해 설정된 아이콘과 레이블이 — 예를 들어
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-요소 — 각 구성 요소의
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-요소에 대한 기본 설정입니다.
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-요소가 레이블을 설정하지만 액티비티와 그 인텐트 필터는 이를 설정하지 않는 경우,
-애플리케이션 레이블을 액티비티와 인텐트 필터 양쪽 모두의 레이블인 것으로
+어떤 경우에든, 요소에서 설정된 아이콘과 레이블이 해당 컨테이너의 모든 하위 요소에 대한 기본
+{@code icon}과 {@code label} 설정이 됩니다.
+따라서
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+요소에서 설정된 아이콘과 레이블이 애플리케이션의 각 요소에 대한 기본 아이콘과 레이블입니다.
+이와 유사하게, 구성 요소에 대해 설정된 아이콘과 레이블이 — 예를 들어
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+요소 — 각 구성 요소의
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
+요소에 대한 기본 설정입니다.
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+요소가 레이블을 설정하지만 액티비티와 그 인텐트 필터는 이를 설정하지 않는 경우,
+애플리케이션 레이블을 액티비티와 인텐트 필터 양쪽 모두의 레이블인 것으로
취급합니다.
</p>
<p>
-인텐트 필터에 대해 설정된 아이콘과 레이블은 구성 요소가 사용자에게
-표시될 때마다 구성 요소를 나타내는 데 사용되며, 이는 필터가 알린 기능을
-충족하는 것입니다. 예를 들어
-"{@code android.intent.action.MAIN}" 및
-"{@code android.intent.category.LAUNCHER}"가 설정된 필터는
-액티비티를 애플리케이션을 초기화하는 주역으로 알립니다. 다시 말해,
-애플리케이션 시작 관리자에 표시되어야 하는 것이 됩니다. 따라서 필터에서 설정된 아이콘과 레이블이
+인텐트 필터에 대해 설정된 아이콘과 레이블은 구성 요소가 사용자에게
+표시될 때마다 구성 요소를 나타내는 데 사용되며, 이는 필터가 알린 기능을
+충족하는 것입니다. 예를 들어
+"{@code android.intent.action.MAIN}" 및
+"{@code android.intent.category.LAUNCHER}"가 설정된 필터는
+액티비티를 애플리케이션을 초기화하는 주역으로 알립니다. 다시 말해,
+애플리케이션 시작 관리자에 표시되어야 하는 것이 됩니다. 따라서 필터에서 설정된 아이콘과 레이블이
시작 관리자에 표시되는 아이콘과 레이블입니다.
</p>
@@ -397,14 +397,14 @@
<h3 id="perms">권한</h3>
<p>
-통상 <i>권한</i> 이란 기기에서 코드의 일부분 또는 데이터에 대한 액세스를 한정하는
-제한입니다. 이런 한계를 부과하는 것은 중요한 데이터와 코드를 보호하여
-이들이 남용되어서 사용자 환경을 왜곡하거나 손상시키지 않도록 하기 위해서입니다.
+통상 <i>권한</i> 이란 기기에서 코드의 일부분 또는 데이터에 대한 액세스를 한정하는
+제한입니다. 이런 한계를 부과하는 것은 중요한 데이터와 코드를 보호하여
+이들이 남용되어서 사용자 환경을 왜곡하거나 손상시키지 않도록 하기 위해서입니다.
</p>
<p>
-각 권한은 고유한 레이블로 식별할 수 있습니다. 레이블을 보면 자신이 어떤 작업을 제한하는지
-나타내는 경우가 잦습니다. 예를 들어 다음은 Android가 정의하는 몇 가지 권한을 나타낸
+각 권한은 고유한 레이블로 식별할 수 있습니다. 레이블을 보면 자신이 어떤 작업을 제한하는지
+나타내는 경우가 잦습니다. 예를 들어 다음은 Android가 정의하는 몇 가지 권한을 나타낸
것입니다.
</p>
@@ -418,26 +418,26 @@
</p>
<p>
-애플리케이션에서 권한으로 보호하는 기능에 액세스해야 하는 경우,
-해당 권한이 필요하다고 매니페스트의
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-요소로 선언해야 합니다. 그런 다음, 해당 애플리케이션이 기기에 설치되고 나면
-설치 관리자가 요청한 권한을 허가할지 여부를 판별합니다.
-이때 애플리케이션의 인증서를 서명한 권한을 확인하고 어떤 경우에는 사용자에게
-묻기도 합니다.
-권한이 허가되면 해당 애플리케이션은 보호된 기능을 사용할 수
-있습니다. 허가되지 않으면, 그러한 기능에 액세스하려는 애플리케이션의 시도가 단순히 실패하고 사용자에게는
-아무런 알림도 표시되지 않습니다.
+애플리케이션에서 권한으로 보호하는 기능에 액세스해야 하는 경우,
+해당 권한이 필요하다고 매니페스트의
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+요소로 선언해야 합니다. 그런 다음, 해당 애플리케이션이 기기에 설치되고 나면
+설치 관리자가 요청한 권한을 허가할지 여부를 판별합니다.
+이때 애플리케이션의 인증서를 서명한 권한을 확인하고 어떤 경우에는 사용자에게
+묻기도 합니다.
+권한이 허가되면 해당 애플리케이션은 보호된 기능을 사용할 수
+있습니다. 허가되지 않으면, 그러한 기능에 액세스하려는 애플리케이션의 시도가 단순히 실패하고 사용자에게는
+아무런 알림도 표시되지 않습니다.
</p>
<p>
-애플리케이션은 권한을 사용하여 자신의 구성 요소를(액티비티, 서비스,
-브로드캐스트 수신기 및 콘텐츠 제공자) 보호할 수도 있습니다. Android가 정의한
+애플리케이션은 권한을 사용하여 자신의 구성 요소를(액티비티, 서비스,
+브로드캐스트 수신기 및 콘텐츠 제공자) 보호할 수도 있습니다. Android가 정의한
권한이라면 어떤 것이든 사용할 수 있고(
-{@link android.Manifest.permission android.Manifest.permission}에 목록으로 나열),
-아니면 다른 애플리케이션이 선언한 권한을 사용해도 됩니다. 아예 직접 자신만의 권한을 정의해도 됩니다. 새 권한을 선언할 때에는
+{@link android.Manifest.permission android.Manifest.permission}에 목록으로 나열),
+아니면 다른 애플리케이션이 선언한 권한을 사용해도 됩니다. 아예 직접 자신만의 권한을 정의해도 됩니다. 새 권한을 선언할 때에는
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
요소를 사용합니다. 예를 들어 액티비티를 보호하려면 다음과 같이 하면 됩니다.
</p>
@@ -457,43 +457,43 @@
</pre>
<p>
-이 예시에서는 {@code DEBIT_ACCT} 권한이
+이 예시에서는 {@code DEBIT_ACCT} 권한이
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-요소로 선언하였을 뿐만 아니라, 해당 권한의 사용 또한
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-요소로 요청되었다는 점을 눈여겨 보십시오. 이것의 사용을 요청해야 애플리케이션의 다른 구성 요소가 보호된
-액티비티를 시작할 수 있습니다. 이는 해당 보호를 애플리케이션 자신이 부과한 것이더라도
-관계 없이 적용됩니다.
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+요소로 선언하였을 뿐만 아니라, 해당 권한의 사용 또한
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+요소로 요청되었다는 점을 눈여겨 보십시오. 이것의 사용을 요청해야 애플리케이션의 다른 구성 요소가 보호된
+액티비티를 시작할 수 있습니다. 이는 해당 보호를 애플리케이션 자신이 부과한 것이더라도
+관계 없이 적용됩니다.
</p>
<p>
-같은 예시에서, {@code permission} 속성이 다른 곳에서
+같은 예시에서, {@code permission} 속성이 다른 곳에서
선언한 권한에 설정된 경우
-(예: {@code android.permission.CALL_EMERGENCY_NUMBERS}), 이것을
+(예: {@code android.permission.CALL_EMERGENCY_NUMBERS}), 이것을
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-요소를 사용하여 다시 선언할 필요가 없습니다. 하지만 해당 권한의 사용은 여전히
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>로 요청해야 합니다.
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+요소를 사용하여 다시 선언할 필요가 없습니다. 하지만 해당 권한의 사용은 여전히
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>로 요청해야 합니다.
</p>
<p>
-<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-요소는 코드로 정의될 권한 그룹에 대한 네임스페이스를
-선언합니다. 그리고
+<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
+요소는 코드로 정의될 권한 그룹에 대한 네임스페이스를
+선언합니다. 그리고
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-가 권한 집합에 대한 레이블을 정의합니다(매니페스트에
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-요소로 선언한 것과 다른 곳에서 선언한 것 양쪽 모두). 이것은 권한이 사용자에게 표시될 때
-그룹 지정될 방식에만 영향을 미칩니다.
+가 권한 집합에 대한 레이블을 정의합니다(매니페스트에
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+요소로 선언한 것과 다른 곳에서 선언한 것 양쪽 모두). 이것은 권한이 사용자에게 표시될 때
+그룹 지정될 방식에만 영향을 미칩니다.
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-요소는 그룹에 어느 권한이 속해 있는지 지정하는 것이 아니라, 그저
-그룹에 이름을 부여할 뿐입니다. 그룹에 권한을 배치하려면 그룹 이름을
+요소는 그룹에 어느 권한이 속해 있는지 지정하는 것이 아니라, 그저
+그룹에 이름을 부여할 뿐입니다. 그룹에 권한을 배치하려면 그룹 이름을
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-요소의
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+요소의
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
속성에 할당하면 됩니다.
</p>
@@ -501,17 +501,17 @@
<h3 id="libs">라이브러리</h3>
<p>
-모든 애플리케이션은 기본 Android 라이브러리에 연결되어 있습니다. 여기에는
-애플리케이션 구축을 위한 기본적인 패키지(액티비티, 서비스,
-인텐트, 보기, 버튼, 애플리케이션, ContentProvider 등 보편적인 클래스 포함)가 포함되어
+모든 애플리케이션은 기본 Android 라이브러리에 연결되어 있습니다. 여기에는
+애플리케이션 구축을 위한 기본적인 패키지(액티비티, 서비스,
+인텐트, 보기, 버튼, 애플리케이션, ContentProvider 등 보편적인 클래스 포함)가 포함되어
있습니다.
</p>
<p>
-그러나 패키지 가운데에는 자신만의 라이브러리에 속한 것도 있습니다. 애플리케이션이
-사용하는 코드의 출처가 이러한 패키지 가운데 어느 한 가지에 해당되는 경우, 해당 패키지에 연결되도록
-명시적으로 요청해야만 합니다. 매니페스트에는 별도의
-<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
-요소가 들어 있어 각 라이브러리의 이름을 나타내야 합니다 (라이브러리 이름은 패키지에 대한
+그러나 패키지 가운데에는 자신만의 라이브러리에 속한 것도 있습니다. 애플리케이션이
+사용하는 코드의 출처가 이러한 패키지 가운데 어느 한 가지에 해당되는 경우, 해당 패키지에 연결되도록
+명시적으로 요청해야만 합니다. 매니페스트에는 별도의
+<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
+요소가 들어 있어 각 라이브러리의 이름을 나타내야 합니다 (라이브러리 이름은 패키지에 대한
관련 문서에서 찾을 수 있습니다).
</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/ko/guide/topics/providers/calendar-provider.jd
index 4d69b60..a2a20af 100644
--- a/docs/html-intl/intl/ko/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/ko/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">인텐트를 사용하여 캘린더 데이터 보기</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">동기화 어댑터</a></li>
</ol>
@@ -56,47 +56,47 @@
</div>
</div>
-<p>캘린더 제공자는 사용자의 캘린더 이벤트를 저장하는 리포지토리입니다.
-캘린더 제공자 API를 사용하면 캘린더, 이벤트, 참석자, 알림 등의 쿼리, 삽입, 업데이트 및
+<p>캘린더 제공자는 사용자의 캘린더 이벤트를 저장하는 리포지토리입니다.
+캘린더 제공자 API를 사용하면 캘린더, 이벤트, 참석자, 알림 등의 쿼리, 삽입, 업데이트 및
삭제 등의 작업을 수행할 수 있습니다.</p>
-<p>캘린더 제공자 API는 애플리케이션과 동기화 어댑터에서 사용할 수 있습니다.
-어떤 유형의 프로그램이 호출을 하는 주체인지에 따라 규칙이 각기 다릅니다.
-이 문서는 주로 캘린더 제공자 API를 애플리케이션으로 사용하는 것에 주안점을 두었습니다.
-여러 동기화 어댑터가 서로 어떻게 다른지 논의한 내용은
+<p>캘린더 제공자 API는 애플리케이션과 동기화 어댑터에서 사용할 수 있습니다.
+어떤 유형의 프로그램이 호출을 하는 주체인지에 따라 규칙이 각기 다릅니다.
+이 문서는 주로 캘린더 제공자 API를 애플리케이션으로 사용하는 것에 주안점을 두었습니다.
+여러 동기화 어댑터가 서로 어떻게 다른지 논의한 내용은
<a href="#sync-adapter">동기화 어댑터</a>를 참조하십시오.</p>
-<p>캘린더 데이터를 읽거나 쓰려면 보통 애플리케이션의 매니페스트에
-적절한 권한이 포함되어 있어야 합니다. 이는 <a href="#manifest">사용자
+<p>캘린더 데이터를 읽거나 쓰려면 보통 애플리케이션의 매니페스트에
+적절한 권한이 포함되어 있어야 합니다. 이는 <a href="#manifest">사용자
권한</a>에 설명되어 있습니다. 공통 작업을 쉽게 수행하기 위해 캘린더
제공자는 <a href="#intents">캘린더
-인텐트</a>에 설명된 바와 같이 인텐트 집합을 제공합니다. 이와 같은 인텐트는 사용자를 캘린더 애플리케이션으로 이동시켜
-이벤트 삽입, 보기 및 편집을 할 수 있게 해줍니다. 사용자는 캘린더 애플리케이션과 상호 작용한 다음
-원래 애플리케이션으로 돌아옵니다. 따라서, 여러분의 애플리케이션이 이벤트를 보거나
+인텐트</a>에 설명된 바와 같이 인텐트 집합을 제공합니다. 이와 같은 인텐트는 사용자를 캘린더 애플리케이션으로 이동시켜
+이벤트 삽입, 보기 및 편집을 할 수 있게 해줍니다. 사용자는 캘린더 애플리케이션과 상호 작용한 다음
+원래 애플리케이션으로 돌아옵니다. 따라서, 여러분의 애플리케이션이 이벤트를 보거나
생성하기 위해 권한 허가를 요청할 필요도 없고 사용자 인터페이스를 제공할 필요도 없는 것입니다.</p>
<h2 id="overview">기본 정보</h2>
-<p><a href="{@docRoot}guide/topics/providers/content-providers.html">콘텐츠 제공자</a>는 데이터를 저장하여 애플리케이션에서
+<p><a href="{@docRoot}guide/topics/providers/content-providers.html">콘텐츠 제공자</a>는 데이터를 저장하여 애플리케이션에서
이에 액세스할 수 있도록 합니다. 일반적으로, Android 플랫폼에서 제공하는 콘텐츠 제공자(캘린더 제공자 포함)는
관계 데이터베이스 모델에 기초하여 테이블 집합으로 데이터를 노출합니다. 이 모델에서 각 행은 레코드이고,
-각 열은 특정한 유형과 의미를 가진 데이터입니다. 애플리케이션과 동기화 어댑터는
-캘린더 제공자 API를 통해 사용자의 캘린더 데이터를 보관하고 있는 데이터베이스 테이블에
+각 열은 특정한 유형과 의미를 가진 데이터입니다. 애플리케이션과 동기화 어댑터는
+캘린더 제공자 API를 통해 사용자의 캘린더 데이터를 보관하고 있는 데이터베이스 테이블에
읽기/쓰기 액세스 권한을 얻을 수 있습니다.</p>
<p>모든 콘텐츠 제공자는 데이터 세트를 고유하게 식별하는 공개 URI(
-{@link android.net.Uri}
+{@link android.net.Uri}
개체로 래핑됨)를 노출합니다. 여러 데이터 세트(여러 테이블)를 제어하는 콘텐츠 제공자는
-각 데이터 세트에 별도의 URI를 노출합니다.
-제공자에 대한 URI는 모두 문자열 "content://"로 시작합니다.
-이것을 보면 데이터를 콘텐츠 제공자가 제어하고 있다는 것을 알아볼 수 있습니다.
-캘린더 제공자가 각각의 클래스(테이블)에 대한 URI의 상수를 정의합니다.
-이와 같은 URI는 <code><em><class></em>.CONTENT_URI</code> 형식을 취합니다.
+각 데이터 세트에 별도의 URI를 노출합니다.
+제공자에 대한 URI는 모두 문자열 "content://"로 시작합니다.
+이것을 보면 데이터를 콘텐츠 제공자가 제어하고 있다는 것을 알아볼 수 있습니다.
+캘린더 제공자가 각각의 클래스(테이블)에 대한 URI의 상수를 정의합니다.
+이와 같은 URI는 <code><em><class></em>.CONTENT_URI</code> 형식을 취합니다.
예를 들면 다음과 같습니다. {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}</p>
-<p>그림 1은 캘린더 제공자 데이터 모델을 그림으로 나타낸 것입니다.
+<p>그림 1은 캘린더 제공자 데이터 모델을 그림으로 나타낸 것입니다.
이 그림에는 메인 테이블과이들을 서로 연결하는 필드가 표시되어 있습니다.</p>
<img src="{@docRoot}images/providers/datamodel.png" alt="Calendar Provider Data Model" />
@@ -113,77 +113,77 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
+
<td>이 테이블에는 캘린더별 정보가 담겨 있습니다.
- 이 테이블의 행마다 한 캘린더의 세부 정보,
+ 이 테이블의 행마다 한 캘린더의 세부 정보,
예를 들어 이름, 색상, 동기화 정보 등이 들어갑니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>이 테이블에는 이벤트별 정보가 담겨 있습니다.
이 테이블의 행마다 한 이벤트의 세부 정보
예를 들어 이벤트 제목, 위치, 시작 시간, 종료 시간 등의 정보가 들어갑니다.
- 이벤트는 일회성일 수도 있고 여러 번 반복될 수도 있습니다.
-참석자, 알림 및 확장된 속성 등은 별도의 테이블에 저장됩니다.
-이들 테이블에는 각기 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}가 있어
+ 이벤트는 일회성일 수도 있고 여러 번 반복될 수도 있습니다.
+참석자, 알림 및 확장된 속성 등은 별도의 테이블에 저장됩니다.
+이들 테이블에는 각기 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}가 있어
이벤트 테이블의 {@link android.provider.BaseColumns#_ID}를 참조합니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
- <td>이 테이블에는 각 이벤트 발생의 시작 시간과 종료 시간이
+
+ <td>이 테이블에는 각 이벤트 발생의 시작 시간과 종료 시간이
담겨 있습니다. 이 테이블의 각 행이 하나의 이벤트 발생을 나타냅니다.
일회성 이벤트의 경우, 이벤트에 대한 1:1 인스턴스 매핑이 있습니다.
- 반복되는 이벤트의 경우, 해당 이벤트가 여러 번 발생하는 것에 맞추어
+ 반복되는 이벤트의 경우, 해당 이벤트가 여러 번 발생하는 것에 맞추어
자동으로 여러 행이 생성됩니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>이 테이블에는 이벤트 참석자(게스트) 정보가 담겨 있습니다.
각 행이 주어진 이벤트의 게스트 한 사람을 나타냅니다.
- 이것이 게스트의 유형과, 이벤트에 대한 해당 게스트의 참석 여부 응답을
+ 이것이 게스트의 유형과, 이벤트에 대한 해당 게스트의 참석 여부 응답을
나타냅니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>이 테이블에는 경고/알림 데이터가 담겨 있습니다.
- 각 행이 주어진 이벤트에 대한 경고 하나를 나타냅니다.
+ 각 행이 주어진 이벤트에 대한 경고 하나를 나타냅니다.
이벤트 하나에 여러 개의 알림이 있을 수 있습니다. 이벤트당 최대 알림 개수는
-{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS}에서 지정되고,
+{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS}에서 지정되고,
이는 주어진 캘린더를 소유한 동기화 어댑터가 설정합니다.
- 알림은 이벤트 몇 분 전에 지정되며 사용자에게 어떻게 경고할 것인지를
+ 알림은 이벤트 몇 분 전에 지정되며 사용자에게 어떻게 경고할 것인지를
결정하는 메서드를 가지고 있습니다.</td>
</tr>
-
+
</table>
-<p>캘린더 제공자 API는 유연성과 강력함을 염두에 두고 만들어진 것입니다.
-그와 동시에 우수한 최종 사용자 경험을 제공하고 캘린더와 그 데이터의
+<p>캘린더 제공자 API는 유연성과 강력함을 염두에 두고 만들어진 것입니다.
+그와 동시에 우수한 최종 사용자 경험을 제공하고 캘린더와 그 데이터의
무결성을 보호하는 것 또한 중요합니다. 이를 위해서
API를 사용할 때 유념해야 할 사항은 다음과 같습니다.</p>
<ul>
-<li><strong>캘린더 이벤트 삽입, 업데이트 및 보기.</strong> 캘린더 제공자로부터 직접 이벤트를 삽입, 변경하고 읽으려면 적절한 <a href="#manifest">권한</a>이 필요합니다. 그러나, 완전한 캘린더 애플리케이션 또는 동기화 어댑터를 구축하는 경우가 아니라면 이와 같은 권한을 요청할 필요가 없습니다. 대신 Android의 캘린더 애플리케이션이 지원하는 인텐트를 사용하여 해당 애플리케이션에 읽기 및 쓰기 작업을 분배하면 됩니다. 인텐트를 사용하면, 애플리케이션이 사용자를 캘린더 애플리케이션으로 보내 사전에 작성된 양식으로 원하는 작업을
-수행하게 합니다. 작업이 끝나면 사용자는 애플리케이션으로 돌아옵니다.
-캘린더를 통해 공통 작업을 수행하도록 애플리케이션을 설계함으로써 사용자에게 일관되고 강력한
+<li><strong>캘린더 이벤트 삽입, 업데이트 및 보기.</strong> 캘린더 제공자로부터 직접 이벤트를 삽입, 변경하고 읽으려면 적절한 <a href="#manifest">권한</a>이 필요합니다. 그러나, 완전한 캘린더 애플리케이션 또는 동기화 어댑터를 구축하는 경우가 아니라면 이와 같은 권한을 요청할 필요가 없습니다. 대신 Android의 캘린더 애플리케이션이 지원하는 인텐트를 사용하여 해당 애플리케이션에 읽기 및 쓰기 작업을 분배하면 됩니다. 인텐트를 사용하면, 애플리케이션이 사용자를 캘린더 애플리케이션으로 보내 사전에 작성된 양식으로 원하는 작업을
+수행하게 합니다. 작업이 끝나면 사용자는 애플리케이션으로 돌아옵니다.
+캘린더를 통해 공통 작업을 수행하도록 애플리케이션을 설계함으로써 사용자에게 일관되고 강력한
사용자 인터페이스를 제공하는 것입니다. 이것이 권장 방법입니다.
자세한 정보는 <a href="#intents">캘린더
인텐트</a>를 참조하십시오.</p>
-<li><strong>동기화 어댑터.</strong>
-동기화 어댑터는 사용자의 기기에 있는 캘린더 데이터를 다른 서버 또는 데이터 소스와 동기화합니다.
+<li><strong>동기화 어댑터.</strong>
+동기화 어댑터는 사용자의 기기에 있는 캘린더 데이터를 다른 서버 또는 데이터 소스와 동기화합니다.
{@link android.provider.CalendarContract.Calendars}와
{@link android.provider.CalendarContract.Events} 테이블에는
동기화 어댑터가 사용하도록 예약된 열이 있습니다.
-제공자와 애플리케이션은 이를 수정해서는 안 됩니다. 사실, 동기화 어댑터로 액세스하지 않는 한
-이 열이 표시되지 않습니다.
+제공자와 애플리케이션은 이를 수정해서는 안 됩니다. 사실, 동기화 어댑터로 액세스하지 않는 한
+이 열이 표시되지 않습니다.
동기화 어댑터에 대한 자세한 정보는 <a href="#sync-adapter">동기화 어댑터</a>를 참조하십시오.</li>
</ul>
@@ -192,8 +192,8 @@
<h2 id="manifest">사용자 권한</h2>
<p>캘린더 데이터를 읽으려면 애플리케이션의 매니페스트 파일에 {@link
-android.Manifest.permission#READ_CALENDAR} 권한이 포함되어 있어야 합니다.
-캘린더 데이터를 삭제, 삽입 또는 업데이트하려면{@link android.Manifest.permission#WRITE_CALENDAR}
+android.Manifest.permission#READ_CALENDAR} 권한이 포함되어 있어야 합니다.
+캘린더 데이터를 삭제, 삽입 또는 업데이트하려면{@link android.Manifest.permission#WRITE_CALENDAR}
권한이 포함되어 있어야 합니다.</p>
<pre>
@@ -209,10 +209,10 @@
<h2 id="calendar">캘린더 테이블</h2>
-<p>{@link android.provider.CalendarContract.Calendars}
-테이블에는 각각의 캘린더에 대한 세부 정보가 들어 있습니다.
-다음 캘린더 열은 애플리케이션과 <a href="#sync-adapter">동기화 어댑터</a> 모두 쓸 수 있는 것입니다.
-지원되는 필드의 전체 목록은
+<p>{@link android.provider.CalendarContract.Calendars}
+테이블에는 각각의 캘린더에 대한 세부 정보가 들어 있습니다.
+다음 캘린더 열은 애플리케이션과 <a href="#sync-adapter">동기화 어댑터</a> 모두 쓸 수 있는 것입니다.
+지원되는 필드의 전체 목록은
{@link android.provider.CalendarContract.Calendars} 참조를 확인하십시오.</p>
<table>
<tr>
@@ -229,8 +229,8 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
- <td>캘린더를 표시하기로 선택했는지를 나타내는 부울입니다.
+
+ <td>캘린더를 표시하기로 선택했는지를 나타내는 부울입니다.
값이 0이면 이 캘린더와 연관된 이벤트는 표시하면 안 된다는 뜻입니다.
값이 1이면 이 캘린더와 연관된 이벤트를 표시해야 한다는 뜻입니다.
이 값이 {@link
@@ -240,10 +240,10 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
- <td>캘린더를 동기화하고 이 캘린더의 이벤트를 기기에 저장해야할지를
-나타내는 부울입니다. 값이 0이면 이 캘린더를 동기화하거나 이에 속한 이벤트를
-기기에 저장하면 안 된다는 뜻입니다. 값이 1이면 이 캘린더에 대한 이벤트를 동기화하고 이에 속한
+
+ <td>캘린더를 동기화하고 이 캘린더의 이벤트를 기기에 저장해야할지를
+나타내는 부울입니다. 값이 0이면 이 캘린더를 동기화하거나 이에 속한 이벤트를
+기기에 저장하면 안 된다는 뜻입니다. 값이 1이면 이 캘린더에 대한 이벤트를 동기화하고 이에 속한
이벤트를 기기에 저장하라는 뜻입니다.</td>
</tr>
</table>
@@ -253,8 +253,8 @@
<p>다음은 특정한 사용자가 소유한 캘린더를 가져오는 법을 나타낸 예시입니다.
이 예시에서는 단순하게 나타내기 위해 쿼리 작업을 사용자 인터페이스 스레드("주 스레드")에 표시했습니다.
실제로는, 이 작업은 주 스레드 대신 비동기화 스레드에서 해야 합니다.
- 자세한 논의는
-<a href="{@docRoot}guide/components/loaders.html">로더</a>를 참조하십시오. 데이터를 읽기만 하는 것이 아니라 변경도 하는 경우라면,
+ 자세한 논의는
+<a href="{@docRoot}guide/components/loaders.html">로더</a>를 참조하십시오. 데이터를 읽기만 하는 것이 아니라 변경도 하는 경우라면,
{@link android.content.AsyncQueryHandler}를 참조하십시오.
</p>
@@ -268,90 +268,90 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>
ACCOUNT_TYPE을 반드시 포함시켜야 하는 이유는 무엇일까요?</h3> <p>{@link
android.provider.CalendarContract.Calendars#ACCOUNT_NAME
-Calendars.ACCOUNT_NAME}에 대해 쿼리하는 경우, 해당 선택에
+Calendars.ACCOUNT_NAME}에 대해 쿼리하는 경우, 해당 선택에
{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
-도 포함시켜야 합니다. 이는 주어진 계정을 고유하다고 간주하는 것은 해당 계정의
-<code>ACCOUNT_NAME</code> 및
-<code>ACCOUNT_TYPE</code>이 모두 있을 때뿐이기 때문입니다. <code>ACCOUNT_TYPE</code>은 계정이
+도 포함시켜야 합니다. 이는 주어진 계정을 고유하다고 간주하는 것은 해당 계정의
+<code>ACCOUNT_NAME</code> 및
+<code>ACCOUNT_TYPE</code>이 모두 있을 때뿐이기 때문입니다. <code>ACCOUNT_TYPE</code>은 계정이
{@link android.accounts.AccountManager}로 등록되었을 때 사용된 계정 인증자에 상응하는 문자열입니다. 기기와 연관되지 않은 캘린더에 적용되는 특별한 유형의 계정도 있으며 이를 {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}이라고 합니다.
{@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} 계정은 동기화되지 않습니다.
-</p> </div> </div>
+</p> </div> </div>
<p> 다음 예시에서는 여러분이 직접 나름의 쿼리를 생성해보십시오. 선택 영역이 쿼리의 기준을 나타냅니다.
- 이 예시에서 쿼리는
+ 이 예시에서 쿼리는
<code>ACCOUNT_NAME</code>
"sampleuser@google.com", <code>ACCOUNT_TYPE</code>
"com.google" 및 <code>OWNER_ACCOUNT</code>
-"sampleuser@google.com"을 가지고 있는 캘린더를 찾고 있습니다. 사용자가 소유한 캘린더뿐만 아니라 사용자가 전에 본 캘린더까지 모두 확인하려면
-<code>OWNER_ACCOUNT</code>를 생략합니다.
+"sampleuser@google.com"을 가지고 있는 캘린더를 찾고 있습니다. 사용자가 소유한 캘린더뿐만 아니라 사용자가 전에 본 캘린더까지 모두 확인하려면
+<code>OWNER_ACCOUNT</code>를 생략합니다.
쿼리가 {@link android.database.Cursor}
개체를 반환하여 이를 시용하면 데이터베이스 쿼리가 반환한 결과 집합을 트래버스할 수 있습니다.
- 콘텐츠 제공자에서 쿼리를 사용하는 법에 대한 자세한 논의는
+ 콘텐츠 제공자에서 쿼리를 사용하는 법에 대한 자세한 논의는
<a href="{@docRoot}guide/topics/providers/content-providers.html">콘텐츠 제공자</a>를 참조하십시오.</p>
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
-<p>다음에 표시된 섹션에서는 커서를 사용하여 결과 집합을 단계별로 살펴봅니다.
+<p>다음에 표시된 섹션에서는 커서를 사용하여 결과 집합을 단계별로 살펴봅니다.
여기에서는 예시의 시작 부분에서 설정된 상수를 사용하여 각 필드에 대한 값을 반환합니다.
</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">캘린더 수정</h3>
<p>캘린더 업데이트를 수행하려면 캘린더의 {@link
-android.provider.BaseColumns#_ID}를
+android.provider.BaseColumns#_ID}를
URI에 추가된 ID로
({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}), 또는 첫 번째 선택 항목으로 제공하면 됩니다.
-
-선택은 <code>"_id=?"</code>로 시작해야 하며, 첫 번째
+
+선택은 <code>"_id=?"</code>로 시작해야 하며, 첫 번째
<code>selectionArg</code>는 캘린더의 {@link
-android.provider.BaseColumns#_ID}여야 합니다.
-또한 ID를 URI에 인코딩해서도 업데이트를 수행할 수 있습니다. 이 예시에서는 캘린더의 표시 이름을
+android.provider.BaseColumns#_ID}여야 합니다.
+또한 ID를 URI에 인코딩해서도 업데이트를 수행할 수 있습니다. 이 예시에서는 캘린더의 표시 이름을
({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
방식으로 변경하였습니다.</p>
@@ -368,26 +368,26 @@
<h3 id="insert-calendar">캘린더 삽입</h2>
-<p>캘린더는 주로 동기화 어댑터가 관리하도록 설계되어 있습니다. 따라서 새 캘린더는
-동기화 어댑터로서만 삽입해야 합니다. 대다수의 경우 애플리케이션은 캘린더에
-표면적인 사항만 변경할 수 있게 되어 있습니다(예: 표시 이름 변경 등).
-어떤 애플리케이션이 로컬 캘린더를 생성해야 하는 경우, 캘린더 삽입을 동기화 어댑터로 수행하면 됩니다.
+<p>캘린더는 주로 동기화 어댑터가 관리하도록 설계되어 있습니다. 따라서 새 캘린더는
+동기화 어댑터로서만 삽입해야 합니다. 대다수의 경우 애플리케이션은 캘린더에
+표면적인 사항만 변경할 수 있게 되어 있습니다(예: 표시 이름 변경 등).
+어떤 애플리케이션이 로컬 캘린더를 생성해야 하는 경우, 캘린더 삽입을 동기화 어댑터로 수행하면 됩니다.
이때 {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}의 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE}을 사용합니다.
{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
은 기기 계정과 연관되지 않은 캘린더에 적용되는 특별한 유형의 계정입니다.
- 이 유형의 캘린더는 서버에 동기화되지 않습니다.
+ 이 유형의 캘린더는 서버에 동기화되지 않습니다.
동기화 어댑터에 대한 논의는 <a href="#sync-adapter">동기화 어댑터</a>를 참조하십시오.</p>
<h2 id="events">이벤트 테이블</h2>
-<p>{@link android.provider.CalendarContract.Events}
-테이블에는 각각의 이벤트에 대한 세부 정보가 들어 있습니다. 이벤트를 추가, 업데이트 또는 삭제하려면 애플리케이션의
+<p>{@link android.provider.CalendarContract.Events}
+테이블에는 각각의 이벤트에 대한 세부 정보가 들어 있습니다. 이벤트를 추가, 업데이트 또는 삭제하려면 애플리케이션의
<a href="#manifest">매니페스트 파일</a>에 {@link android.Manifest.permission#WRITE_CALENDAR}
권한이 포함되어 있어야 합니다.</p>
-<p>다음 이벤트 열은 애플리케이션과
+<p>다음 이벤트 열은 애플리케이션과
동기화 어댑터 모두 쓸 수 있는 것입니다. 지원되는 필드의 전체 목록은 {@link
android.provider.CalendarContract.Events} 참조를 확인하십시오.</p>
@@ -434,9 +434,9 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>이벤트 기간을 <a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a> 형식으로 나타낸 것입니다.
-예를 들어 <code>"PT1H"</code> 값을 보면 이벤트가 한 시간 지속될 것임을 알 수 있고,
+예를 들어 <code>"PT1H"</code> 값을 보면 이벤트가 한 시간 지속될 것임을 알 수 있고,
<code>"P2W"</code>는 2주의 지속 기간을 나타냅니다.
</td>
@@ -444,39 +444,39 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>값이 1이면 이 이벤트가 현지 시간대에서 정의한 바에 의해 하루 종일 걸린다는 것을 나타냅니다.
값이 0이면 이것이 하루 중 언제라도 시작하고 종료될 수 있는 정기 이벤트라는 것을 나타냅니다.
</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
- <td>이벤트 형식의 반복 규칙입니다.
-예를 들면 다음과 같습니다. <code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code> 더 많은 예시를 확인하려면
+
+ <td>이벤트 형식의 반복 규칙입니다.
+예를 들면 다음과 같습니다. <code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code> 더 많은 예시를 확인하려면
<a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">여기</a>를 참조하십시오.</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
- <td>이벤트의 반복 날짜입니다.
+ <td>이벤트의 반복 날짜입니다.
일반적으로 {@link android.provider.CalendarContract.EventsColumns#RDATE}
를 {@link android.provider.CalendarContract.EventsColumns#RRULE}
과 함께 사용하여 반복되는 발생의 집계 집합을 정의하게 됩니다.
자세한 논의는 <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">RFC5545 사양</a>을 참조하십시오.</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
+
<td>이 이벤트가 사용 중인 시간으로 간주되는지, 다시 일정을 예약할 수 있는 자유 시간으로 간주되는지를 나타냅니다.
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -494,7 +494,7 @@
<h3 id="add-event">이벤트 추가</h3>
-<p>애플리케이션이 새 이벤트를 추가하는 경우,
+<p>애플리케이션이 새 이벤트를 추가하는 경우,
{@link android.content.Intent#ACTION_INSERT INSERT} 인텐트를 사용하는 것이 좋습니다. 이때 <a href="#intent-insert">인텐트를 사용하여 이벤트 삽입</a>에서 설명한 대로 따릅니다. 그러나, 필요한 경우 직접 이벤트를 삽입해도 됩니다.
이 섹션에서는 이렇게 하는 방법을 설명합니다.
</p>
@@ -508,39 +508,39 @@
android.provider.CalendarContract.EventsColumns#DTSTART}를 포함해야 합니다.</li>
<li>{@link
-android.provider.CalendarContract.EventsColumns#EVENT_TIMEZONE}을 포함해야 합니다.
+android.provider.CalendarContract.EventsColumns#EVENT_TIMEZONE}을 포함해야 합니다.
시스템에 설치된 표준 시간대 ID 목록을 가져오려면 {@link
java.util.TimeZone#getAvailableIDs()}를 사용하십시오. 이 규칙은 <a href="#intent-insert">인텐트를 사용하여 이벤트 삽입</a>에서 설명한 바와 같이
{@link
android.content.Intent#ACTION_INSERT INSERT} 인텐트를 통해서 이벤트를 삽입할 경우에는 적용되지 않습니다. 이 시나리오의 경우,
기본 시간대가 제공됩니다.</li>
-
+
<li>비반복적인 이벤트의 경우, {@link
android.provider.CalendarContract.EventsColumns#DTEND}를 포함해야 합니다. </li>
-
-
+
+
<li>반복적인 이벤트의 경우 {@link
android.provider.CalendarContract.EventsColumns#DURATION}과 {@link
android.provider.CalendarContract.EventsColumns#RRULE} 또는 {@link
android.provider.CalendarContract.EventsColumns#RDATE}를 포함해야 합니다. 이 규칙은 <a href="#intent-insert">인텐트를 사용하여 이벤트 삽입</a>에서 설명한 바와 같이
{@link
-android.content.Intent#ACTION_INSERT INSERT} 인텐트를 통해서 이벤트를 삽입할 경우에는 적용되지 않습니다.
+android.content.Intent#ACTION_INSERT INSERT} 인텐트를 통해서 이벤트를 삽입할 경우에는 적용되지 않습니다.
이 시나리오에서는 {@link android.provider.CalendarContract.EventsColumns#DTSTART} 및 {@link android.provider.CalendarContract.EventsColumns#DTEND}와 함께 {@link
android.provider.CalendarContract.EventsColumns#RRULE}를 사용할 수 있고, 캘린더 애플리케이션이 이것을 기간으로 자동 변환해줍니다.
</li>
-
+
</ul>
<p>다음은 이벤트 삽입의 예입니다. 단순하게 나타내기 위해 UI 스레드에서 수행한 것입니다.
실제로, 삽입과 업데이트는 비동기화 스레드에서 수행해야 작업을 배경 스레드로 이동시킬 수 있습니다.
-
+
자세한 정보는 {@link android.content.AsyncQueryHandler}를 참조하십시오.</p>
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,13 +561,13 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
<p class="note"><strong>참고:</strong> 이벤트가 생성된 다음 이 예시가 이벤트 ID를 캡처하는 법을 눈여겨 보십시오.
- 이것이 이벤트 ID를 가져오는 가장 쉬운 방법입니다.
+ 이것이 이벤트 ID를 가져오는 가장 쉬운 방법입니다.
다른 캘린더 작업을 수행하기 위해 이벤트 ID가 필요한 경우가 자주 있습니다. 예를 들어 이벤트에 참석자나 알림을 추가하는 데 필요합니다.
</p>
@@ -577,15 +577,15 @@
<p>애플리케이션이 사용자에게 이벤트 편집을 허용할 경우, <a href="#intent-edit">인텐트로 이벤트 편집</a>에서 설명한 바와 같이
{@link android.content.Intent#ACTION_EDIT EDIT} 인텐트
를 사용하는 것이 좋습니다.
-그러나 필요한 경우 직접 이벤트를 편집해도 됩니다.
+그러나 필요한 경우 직접 이벤트를 편집해도 됩니다.
이벤트 업데이트를 수행하려면 이벤트의 <code>_ID</code>를 URI에 추가된 ID로({@link
-android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
또는 첫 번째 선택 항목으로 제공하면 됩니다.
-
-선택은 <code>"_id=?"</code>로 시작해야 하며, 첫 번째
-<code>selectionArg</code>는 이벤트의 <code>_ID</code>여야 합니다.
+
+선택은 <code>"_id=?"</code>로 시작해야 하며, 첫 번째
+<code>selectionArg</code>는 이벤트의 <code>_ID</code>여야 합니다.
ID 없이 선택을 사용해도 업데이트를 수행할 수 있습니다. 다음은 이벤트 업데이트의 예입니다.
- 여기에서는 이벤트 제목을 변경할 때
+ 여기에서는 이벤트 제목을 변경할 때
{@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}
방법을 사용합니다.</p>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -608,11 +608,11 @@
<p>이벤트를 삭제하려면 이벤트의 {@link
android.provider.BaseColumns#_ID}를 URI에 추가된 ID로 써도 되고, 표준 선택을 사용해도 됩니다.
추가된 ID를 사용하는 경우, 선택도 할 수 없습니다.
-삭제에는 두 가지 버전이 있습니다. 애플리케이션으로 삭제와 동기화 어댑터로의 삭제입니다.
-애플리케이션 삭제의 경우 <em>삭제된</em> 열을 1로 설정합니다.
-이것은 동기화 어댑터에 행이 삭제되었다고 알리는 플래그이며,
-이 삭제를 서버에 알려야 한다는 것을 나타내기도 합니다.
-동기화 어댑터 삭제의 경우, 이벤트를 연관된 데이터 일체와 함께 데이터베이스에서 제거합니다.
+삭제에는 두 가지 버전이 있습니다. 애플리케이션으로 삭제와 동기화 어댑터로의 삭제입니다.
+애플리케이션 삭제의 경우 <em>삭제된</em> 열을 1로 설정합니다.
+이것은 동기화 어댑터에 행이 삭제되었다고 알리는 플래그이며,
+이 삭제를 서버에 알려야 한다는 것을 나타내기도 합니다.
+동기화 어댑터 삭제의 경우, 이벤트를 연관된 데이터 일체와 함께 데이터베이스에서 제거합니다.
다음은 애플리케이션이 이벤트를 {@link android.provider.BaseColumns#_ID}를 통해 삭제하는 예입니다.</p>
@@ -625,22 +625,22 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">참석자 테이블</h2>
<p>{@link android.provider.CalendarContract.Attendees} 테이블의 각 행은
-이벤트의 참석자 또는 게스트 하나를 나타냅니다.
+이벤트의 참석자 또는 게스트 하나를 나타냅니다.
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
-를호출하면 주어진
-{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}와 함께 해당 이벤트의 참석자 목록을 반환합니다.
+를호출하면 주어진
+{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}와 함께 해당 이벤트의 참석자 목록을 반환합니다.
이 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}는
특정 이벤트의 {@link
-android.provider.BaseColumns#_ID}와 반드시 일치해야 합니다.</p>
+android.provider.BaseColumns#_ID}와 반드시 일치해야 합니다.</p>
<p>다음 표는 쓸 수 있는 필드를 목록으로 나열한 것입니다.
- 새 참석자를 삽입하는 경우 이 모두를 포함해야 하며,
+ 새 참석자를 삽입하는 경우 이 모두를 포함해야 하며,
단 <code>ATTENDEE_NAME</code>은 예외입니다.
</p>
@@ -697,7 +697,7 @@
<h3 id="add-attendees">참석자 추가</h3>
-<p>다음은 이벤트에 참석자 한 명을 추가하는 예입니다.
+<p>다음은 이벤트에 참석자 한 명을 추가하는 예입니다.
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
가 필수인 점을 유념하십시오.</p>
@@ -717,8 +717,8 @@
<h2 id="reminders">알림 테이블</h2>
-<p>{@link android.provider.CalendarContract.Reminders}
-테이블의 각 행은 이벤트의 알림 하나를 나타냅니다.
+<p>{@link android.provider.CalendarContract.Reminders}
+테이블의 각 행은 이벤트의 알림 하나를 나타냅니다.
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} 를 호출하면
주어진 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}와 함께 이벤트 알림 목록을 반환합니다.</p>
@@ -728,7 +728,7 @@
동기화 어댑터가 {@link
android.provider.CalendarContract.Calendars} 테이블에서 지원하는 알림을 나타낸다는 점을 눈여겨 보십시오.
자세한 내용은
-{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
+{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
를 참조하십시오.</p>
@@ -774,15 +774,15 @@
<h2 id="instances">인스턴스 테이블</h2>
<p>
-{@link android.provider.CalendarContract.Instances} 테이블에는
+{@link android.provider.CalendarContract.Instances} 테이블에는
이벤트 발생의 시작 및 종료 시간이 담겨 있습니다. 이 테이블의 각 행이 하나의 이벤트 발생을 나타냅니다.
이 인스턴스 테이블은 쓸 수 없으며 이벤트 발생 쿼리 방법을 제공할 뿐입니다.
</p>
-<p>다음 표에는 인스턴스에 대해 쿼리할 수 있는 몇 가지 필드를 목록으로 나열하였습니다.
-표준 시간대가
+<p>다음 표에는 인스턴스에 대해 쿼리할 수 있는 몇 가지 필드를 목록으로 나열하였습니다.
+표준 시간대가
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
- 및
+ 및
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES}에 의해 정의된다는 점을 눈여겨 보십시오.</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>인스턴스의 율리우스력 종료 날짜를 캘린더의 시간대에 비례하여 나타낸 것입니다.
-
-
+
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>인스턴스의 종료 시간(분 단위)을 캘린더 시간대의 자정부터 측정한 것입니다.
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>인스턴스의 율리우스력 시작 날짜를 캘린더의 시간대에 비례하여 나타낸 것입니다.
+ <td>인스턴스의 율리우스력 시작 날짜를 캘린더의 시간대에 비례하여 나타낸 것입니다.
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>인스턴스의 시작 시간(분 단위)을 캘린더 시간대에 비례하여 자정부터 측정한 것입니다.
-
+
</td>
-
+
</tr>
</table>
@@ -839,10 +839,10 @@
<p>인스턴스 테이블을 쿼리하려면, 해당 쿼리에 대한 범위 시간을 URI에 지정해야 합니다.
이 예시에서는 {@link android.provider.CalendarContract.Instances}
가 {@link
-android.provider.CalendarContract.EventsColumns#TITLE} 필드에 액세스 권한을 얻으며, 이때
-{@link android.provider.CalendarContract.EventsColumns} 인터페이스의 구현을 통합니다.
+android.provider.CalendarContract.EventsColumns#TITLE} 필드에 액세스 권한을 얻으며, 이때
+{@link android.provider.CalendarContract.EventsColumns} 인터페이스의 구현을 통합니다.
바꿔 말하면, {@link
-android.provider.CalendarContract.EventsColumns#TITLE}이
+android.provider.CalendarContract.EventsColumns#TITLE}이
데이터베이스 보기를 통해 반환되며 원시 {@link
android.provider.CalendarContract.Instances} 테이블 쿼리를 통해서가 아니라는 뜻입니다.</p>
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -922,9 +922,9 @@
<td><br>
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
-
-{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}로도 URI를 참조할 수 있습니다.
-이 인텐트 사용법의 예시를 보려면 <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">인텐트를 사용하여 캘린더 데이터 보기</a>를 참조하십시오.
+
+{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}로도 URI를 참조할 수 있습니다.
+이 인텐트 사용법의 예시를 보려면 <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">인텐트를 사용하여 캘린더 데이터 보기</a>를 참조하십시오.
</td>
<td>캘린더를 <code><ms_since_epoch></code>에 의해 지정된 시간으로 엽니다.</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
-
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}로도 URI를 참조할 수 있습니다.
+
+
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}로도 URI를 참조할 수 있습니다.
이 인텐트 사용법의 예시를 보려면 <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">인텐트를 사용하여 캘린더 데이터 보기</a>를 참조하십시오.
-
+
</td>
<td><code><event_id></code>에 의해 지정된 이벤트를 봅니다.</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
-
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}로도 URI를 참조할 수 있습니다.
+
+
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}로도 URI를 참조할 수 있습니다.
이 인텐트 사용법의 예시를 보려면 <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">인텐트를 사용하여 이벤트 편집</a>을 참조하십시오.
-
-
+
+
</td>
<td><code><event_id></code>에 의해 지정된 이벤트를 편집합니다.</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
-
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}로도 URI를 참조할 수 있습니다.
+
+
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}로도 URI를 참조할 수 있습니다.
이 인텐트 사용법의 예시를 보려면 <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">인텐트를 사용하여 이벤트 삽입</a>을 참조하십시오.
-
+
</td>
<td>이벤트를 생성합니다.</td>
@@ -996,7 +996,7 @@
<td>이벤트의 이름입니다.</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>이벤트 시작 시간을 Epoch로부터 밀리초 단위로 나타낸 것입니다.</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>이벤트 종료 시간을 Epoch로부터 밀리초 단위로 나타낸 것입니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
- <td>이벤트가 종일 이벤트인지 나타내는 부울입니다. 값은
+
+ <td>이벤트가 종일 이벤트인지 나타내는 부울입니다. 값은
<code>true</code> 또는 <code>false</code>가 될 수 있습니다.</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>이벤트 위치입니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>이벤트 설명입니다.</td>
</tr>
<tr>
@@ -1039,43 +1039,43 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>이벤트가 비공개인지 공개인지 나타냅니다.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>이 이벤트가 사용 중인 시간으로 간주되는지, 다시 일정을 예약할 수 있는 자유 시간으로 간주되는지를 나타냅니다.</td>
-
-</table>
+
+</table>
<p>아래 섹션에서는 이와 같은 인텐트의 사용법을 설명합니다.</p>
<h3 id="intent-insert">인텐트를 사용하여 이벤트 삽입</h3>
-<p>{@link android.content.Intent#ACTION_INSERT INSERT} 인텐트를 사용하면
+<p>{@link android.content.Intent#ACTION_INSERT INSERT} 인텐트를 사용하면
캘린더에 이벤트 삽입 작업을 분배할 수 있습니다.
이 방법을 사용하는 경우, 애플리케이션의 <a href="#manifest">매니페스트 파일</a>에 {@link
android.Manifest.permission#WRITE_CALENDAR} 권한을 포함할 필요가 없습니다.</p>
-
+
<p>사용자가 이 방법을 사용하는 애플리케이션을 실행하면 해당 애플리케이션이
사용자를 캘린더로 보내 이벤트 추가를 완료합니다. {@link
android.content.Intent#ACTION_INSERT INSERT} 인텐트는 추가 필드를 사용하여
-캘린더에 있는 이벤트 세부 정보로 양식을 미리 채웁니다.
-그러면 사용자가 이벤트를 취소하거나 양식을 필요에 따라 편집할 수 있고,
+캘린더에 있는 이벤트 세부 정보로 양식을 미리 채웁니다.
+그러면 사용자가 이벤트를 취소하거나 양식을 필요에 따라 편집할 수 있고,
이벤트를 본인의 캘린더에 저장할 수도 있습니다.</p>
-
-<p>다음은 2012년 1월 19일에 이벤트 일정을 예약하는 코드 조각으로,
+
+<p>다음은 2012년 1월 19일에 이벤트 일정을 예약하는 코드 조각으로,
이는 오전 7:30~오전 8:30까지 실행됩니다. 이 코드 조각에 관해서는 다음 내용을 주의하십시오.</p>
<ul>
<li>이것은 {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}를 URI로 지정합니다.
</li>
-
+
<li>이것은 {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} 및 {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} 추가 필드를 사용하여 이벤트 시간으로 양식을 미리 채웁니다.
이러한 시간에 해당하는 값은 Epoch로부터 UTC 밀리초 단위로 표시해야 합니다.
</li>
-
+
<li>이것은 {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
추가 필드를 사용하여 쉼표로 구분된 초청인 목록을 제공하며, 이는 이메일 주소로 나타납니다.</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1108,7 +1108,7 @@
<h3 id="intent-edit">인텐트를 사용하여 이벤트 편집</h3>
<p><a href="#update-event">이벤트 업데이트</a>에서 설명한 바와 같이 이벤트를 직접 업데이트할 수 있습니다. 그러나 {@link
-android.content.Intent#ACTION_EDIT EDIT} 인텐트를 사용하면
+android.content.Intent#ACTION_EDIT EDIT} 인텐트를 사용하면
캘린더 애플리케이션에 이벤트 편집을 분배할 권한이 없는 애플리케이션을 허용합니다.
사용자가 캘린더에서 이벤트 편집을 마치면 원래 애플리케이션으로 돌아오게 됩니다.
</p> <p>다음은 지정된 이벤트에 새 제목을 설정하여 사용자에게 캘린더에서 이벤트를 편집할 수 있도록 해주는 인텐트의 예입니다.
@@ -1158,18 +1158,18 @@
<ul>
<li>동기화 어댑터는 {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER}를 <code>true</code>로 설정하여 이것이 동기화 어댑터라는 것을 나타내야 합니다.</li>
-
-
+
+
<li>동기화 어댑터는 URI에서 쿼리 매개변수로 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME}과 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE}을 제공해야 합니다. </li>
-
+
<li>동기화 어댑터에는 애플리케이션 또는 위젯에 비해 더 많은 열에 대한 쓰기 액세스 권한이 있습니다.
- 예를 들어, 애플리케이션은 캘린더의 몇 가지 특성만 수정할 수 있습니다.
+ 예를 들어, 애플리케이션은 캘린더의 몇 가지 특성만 수정할 수 있습니다.
즉 이름, 표시 이름, 가시성 설정 및 캘린더 동기화 여부 등만 해당됩니다.
이에 비해 동기화 어댑터의 경우 이 열만이 아니라 다른 수많은 열에도 액세스할 수 있습니다.
예를 들어 캘린더 색상, 표준 시간대, 액세스 수준 등이 해당됩니다.
-다만, 동기화 어댑터는 지정된 <code>ACCOUNT_NAME</code> 및
+다만, 동기화 어댑터는 지정된 <code>ACCOUNT_NAME</code> 및
<code>ACCOUNT_TYPE</code>에 한정됩니다.</li> </ul>
<p>다음은 URI를 반환하여 동기화 어댑터와 사용하도록 할 때 쓸 수 있는 도우미 메서드입니다.</p>
@@ -1180,5 +1180,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>동기화 어댑터의 샘플 구현(캘린더에 구체적으로 관련된 것이 아님)은
+<p>동기화 어댑터의 샘플 구현(캘린더에 구체적으로 관련된 것이 아님)은
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdpater</a>를 참조하십시오.
diff --git a/docs/html-intl/intl/ko/guide/topics/providers/contacts-provider.jd b/docs/html-intl/intl/ko/guide/topics/providers/contacts-provider.jd
index 94d3295..ad60b6d 100644
--- a/docs/html-intl/intl/ko/guide/topics/providers/contacts-provider.jd
+++ b/docs/html-intl/intl/ko/guide/topics/providers/contacts-provider.jd
@@ -83,12 +83,12 @@
</div>
<p>
콘텐츠 제공자는 기기의 사람에 대한 중앙 데이터 리포지토리를 관리하는 강력하고 유연한
-Android 구성 요소입니다. 콘텐츠 제공자는 기기의 연락처 애플리케이션에서 개발자에게 표시되는
-데이터의 출처입니다. 여기의 데이터에는 개발자 자신의 애플리케이션에서
-액세스하여 기기와 온라인 서비스 사이에서 데이터를 전송할 수도 있습니다. 제공자는
-광범위한 데이터 소스를 수용하며 각 인물에 대해 가능한 한 많은 데이터를 관리하여야 하므로, 그 결과 조직이 무척
-복잡합니다. 이 때문에 이 제공자의 API에는
-광범위한 계약 클래스와 인터페이스 세트가 포함되어 있어 데이터 검색과 수정을 모두 한층
+Android 구성 요소입니다. 콘텐츠 제공자는 기기의 연락처 애플리케이션에서 개발자에게 표시되는
+데이터의 출처입니다. 여기의 데이터에는 개발자 자신의 애플리케이션에서
+액세스하여 기기와 온라인 서비스 사이에서 데이터를 전송할 수도 있습니다. 제공자는
+광범위한 데이터 소스를 수용하며 각 인물에 대해 가능한 한 많은 데이터를 관리하여야 하므로, 그 결과 조직이 무척
+복잡합니다. 이 때문에 이 제공자의 API에는
+광범위한 계약 클래스와 인터페이스 세트가 포함되어 있어 데이터 검색과 수정을 모두 한층
용이하게 해줍니다.
</p>
<p>
@@ -105,23 +105,23 @@
제공자에서 데이터를 수정하는 방법.
</li>
<li>
- 동기화 어댑터를 작성하여 서버에서 가져온 데이터를 연락처 제공자와
+ 동기화 어댑터를 작성하여 서버에서 가져온 데이터를 연락처 제공자와
동기화하는 방법.
</li>
</ul>
<p>
- 이 가이드는 독자가 Android 콘텐츠 제공자의 기본 정보를 알고 있는 것으로 간주합니다. Android 콘텐츠 제공자에
-관한 자세한 내용은
+ 이 가이드는 독자가 Android 콘텐츠 제공자의 기본 정보를 알고 있는 것으로 간주합니다. Android 콘텐츠 제공자에
+관한 자세한 내용은
<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
-콘텐츠 제공자 기본 정보</a> 가이드를 읽어보십시오.
+콘텐츠 제공자 기본 정보</a> 가이드를 읽어보십시오.
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">샘플 동기화 어댑터</a>
샘플 앱은 동기화 어댑터를 사용하여 연락처 제공자와 Google Web Services가 호스팅하는 샘플 애플리케이션 사이에서
데이터를 전송하는 동기화 어댑터의 사용 예시입니다.
</p>
<h2 id="InformationTypes">연락처 제공자 조직</h2>
<p>
- 연락처 제공자는 Android 콘텐츠 제공자 구성 요소입니다. 이것은 한 사람에 대해
-각기 세 가지 유형의 데이터를 관리합니다. 각 데이터는 그림 1에서 설명하는 바와 같이 제공자가 제공하는
+ 연락처 제공자는 Android 콘텐츠 제공자 구성 요소입니다. 이것은 한 사람에 대해
+각기 세 가지 유형의 데이터를 관리합니다. 각 데이터는 그림 1에서 설명하는 바와 같이 제공자가 제공하는
각 테이블에 상응합니다.
</p>
<img src="{@docRoot}images/providers/contacts_structure.png" alt="" height="364" id="figure1" />
@@ -129,7 +129,7 @@
<strong>그림 1.</strong> 연락처 제공자 테이블 구조입니다.
</p>
<p>
- 이 세 개의 테이블은 보통 자신의 계약 클래스의 이름으로 불립니다. 이들 클래스는
+ 이 세 개의 테이블은 보통 자신의 계약 클래스의 이름으로 불립니다. 이들 클래스는
테이블에서 사용하는 콘텐츠 URI, 열 이름 및 열 값의 상수를 정의합니다.
</p>
<dl>
@@ -153,29 +153,29 @@
</dd>
</dl>
<p>
- {@link android.provider.ContactsContract}의 계약 클래스가 대표하는 다른 테이블은
-보조 테이블로, 연락처 제공자는 이들을 사용하여 작업을 관리하거나 기기의 연락처에 있는
+ {@link android.provider.ContactsContract}의 계약 클래스가 대표하는 다른 테이블은
+보조 테이블로, 연락처 제공자는 이들을 사용하여 작업을 관리하거나 기기의 연락처에 있는
특정 기능 또는 전화 통신 애플리케이션 등을 지원합니다.
</p>
<h2 id="RawContactBasics">원시 연락처</h2>
<p>
- 원시 연락처는 단일 계정 유형과 계정 이름에서 가져오는
-한 사람의 데이터를 나타냅니다. 연락처 제공자는 한 사람에 대해 하나 이상의 온라인 서비스를 데이터의 출처로 허용하므로,
+ 원시 연락처는 단일 계정 유형과 계정 이름에서 가져오는
+한 사람의 데이터를 나타냅니다. 연락처 제공자는 한 사람에 대해 하나 이상의 온라인 서비스를 데이터의 출처로 허용하므로,
연락처 제공자에서는 같은 사람에 대해 여러 개의 원시 연락처를 허용합니다.
- 원시 연락처를 여러 개 사용하면 사용자가 같은 계정 유형의 하나 이상의 계정에서 가져온
+ 원시 연락처를 여러 개 사용하면 사용자가 같은 계정 유형의 하나 이상의 계정에서 가져온
한 사람의 여러 데이터를 조합할 수 있습니다.
</p>
<p>
- 원시 연락처의 데이터 대부분은
-{@link android.provider.ContactsContract.RawContacts} 테이블에 저장되지 않습니다. 대신,
+ 원시 연락처의 데이터 대부분은
+{@link android.provider.ContactsContract.RawContacts} 테이블에 저장되지 않습니다. 대신,
{@link android.provider.ContactsContract.Data} 테이블에서 하나 이상의 행에 저장됩니다. 각 데이터 행에는
-상위 {@link android.provider.ContactsContract.RawContacts} 행의 {@code android.provider.BaseColumns#_ID RawContacts._ID} 값을 포함하는
-열 {@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID Data.RAW_CONTACT_ID}가
+상위 {@link android.provider.ContactsContract.RawContacts} 행의 {@code android.provider.BaseColumns#_ID RawContacts._ID} 값을 포함하는
+열 {@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID Data.RAW_CONTACT_ID}가
있습니다.
</p>
<h3 id="RawContactsColumns">중요한 원시 연락처 열</h3>
<p>
- {@link android.provider.ContactsContract.RawContacts} 테이블의 중요한 열은
+ {@link android.provider.ContactsContract.RawContacts} 테이블의 중요한 열은
표 1에 나열되어 있습니다. 표 뒤에 이어지는 참고 사항을 꼭 읽어주십시오.
</p>
<p class="table-caption" id="table1">
@@ -193,13 +193,13 @@
</td>
<td>
이 원시 연락처의 소스인 계정 유형에 대한 계정 이름입니다.
- 예를 들어, Google 계정의 계정 이름은
-기기 소유자의 Gmail 주소 중 하나입니다. 자세한 정보는
-{@link android.provider.ContactsContract.SyncColumns#ACCOUNT_TYPE}의
+ 예를 들어, Google 계정의 계정 이름은
+기기 소유자의 Gmail 주소 중 하나입니다. 자세한 정보는
+{@link android.provider.ContactsContract.SyncColumns#ACCOUNT_TYPE}의
다음 항목을 참조하십시오.
</td>
<td>
- 이 이름의 형식은 각자의 계정 유형별로 다릅니다. 이것은 꼭
+ 이 이름의 형식은 각자의 계정 유형별로 다릅니다. 이것은 꼭
이메일 주소여야 하는 것은 아닙니다.
</td>
</tr>
@@ -208,13 +208,13 @@
{@link android.provider.ContactsContract.SyncColumns#ACCOUNT_TYPE}
</td>
<td>
- 이 원시 연락처의 소스인 계정 유형입니다. 예를 들어, Google 계정의
-계정 유형은 <code>com.google</code>입니다. 계정 유형을 정규화할 때에는 항상
-본인이 소유하거나 제어하는 도메인의 도메인 식별자를 사용하십시오. 이렇게 하면 계정 유형이 고유한 것이도록
+ 이 원시 연락처의 소스인 계정 유형입니다. 예를 들어, Google 계정의
+계정 유형은 <code>com.google</code>입니다. 계정 유형을 정규화할 때에는 항상
+본인이 소유하거나 제어하는 도메인의 도메인 식별자를 사용하십시오. 이렇게 하면 계정 유형이 고유한 것이도록
확실히 해둘 수 있습니다.
</td>
<td>
- 연락처 데이터를 제공하는 계정 유형은 대개 연락처 제공자와 동기화되는 동기화 어댑터와
+ 연락처 데이터를 제공하는 계정 유형은 대개 연락처 제공자와 동기화되는 동기화 어댑터와
연관되어 있습니다.
</tr>
<tr>
@@ -225,44 +225,44 @@
원시 연락처에 대한 "삭제됨" 플래그입니다.
</td>
<td>
- 이 플래그를 사용하면 연락처 제공자가 해당 행을 내부에 계속 유지할 수 있습니다.
-이는 동기화 어댑터가 해당 행을 자신의 서버에서 삭제하고 마침내는 행을 리포지토리에서도 삭제할 수 있을
+ 이 플래그를 사용하면 연락처 제공자가 해당 행을 내부에 계속 유지할 수 있습니다.
+이는 동기화 어댑터가 해당 행을 자신의 서버에서 삭제하고 마침내는 행을 리포지토리에서도 삭제할 수 있을
때까지만입니다.
</td>
</tr>
</table>
<h4>참고</h4>
<p>
- 다음은
+ 다음은
{@link android.provider.ContactsContract.RawContacts} 테이블에 관한 중요한 참고 사항입니다.
</p>
<ul>
<li>
- 원시 연락처의 이름은
-{@link android.provider.ContactsContract.RawContacts}에 있는 자신의 행에 저장되지 않습니다. 대신,
-{@link android.provider.ContactsContract.CommonDataKinds.StructuredName} 행에 있는
-{@link android.provider.ContactsContract.Data} 테이블에 저장됩니다. 원시 연락처 하나에는
+ 원시 연락처의 이름은
+{@link android.provider.ContactsContract.RawContacts}에 있는 자신의 행에 저장되지 않습니다. 대신,
+{@link android.provider.ContactsContract.CommonDataKinds.StructuredName} 행에 있는
+{@link android.provider.ContactsContract.Data} 테이블에 저장됩니다. 원시 연락처 하나에는
{@link android.provider.ContactsContract.Data} 테이블에서 이런 유형의 행이 하나씩만 있습니다.
</li>
<li>
- <strong>주의:</strong> 원시 연락처에서 본인의 계정 데이터를 사용하려면 이를 우선
-{@link android.accounts.AccountManager}로 등록해야 합니다. 이렇게 하려면,
-사용자에게 계정 유형과 본인의 계정 이름을 계정 목록에 추가하라는 프롬프트를 표시하십시오. 이렇게 하지 않으면,
+ <strong>주의:</strong> 원시 연락처에서 본인의 계정 데이터를 사용하려면 이를 우선
+{@link android.accounts.AccountManager}로 등록해야 합니다. 이렇게 하려면,
+사용자에게 계정 유형과 본인의 계정 이름을 계정 목록에 추가하라는 프롬프트를 표시하십시오. 이렇게 하지 않으면,
연락처 제공자가 원시 연락처 행을 자동으로 삭제합니다.
<p>
- 예를 들어, 앱에서 도메인 {@code com.example.dataservice}로 웹 베이스 서비스에 대한 연락처 데이터를 유지하고
-서비스에 대한 사용자 계정이
-{@code becky.sharp@dataservice.example.com}이라면, 사용자는 앱이 원시 연락처 행을 추가하기 전에
+ 예를 들어, 앱에서 도메인 {@code com.example.dataservice}로 웹 베이스 서비스에 대한 연락처 데이터를 유지하고
+서비스에 대한 사용자 계정이
+{@code becky.sharp@dataservice.example.com}이라면, 사용자는 앱이 원시 연락처 행을 추가하기 전에
계정 "유형"({@code com.example.dataservice})과 계정 "이름"
({@code becky.smart@dataservice.example.com})을 먼저 추가해야 합니다.
- 이 요구 사항을 사용자에게 설명하려면 관련 문서를 사용해도 되고, 아니면 사용자에게
-유형과 이름을 추가하라는 프롬프트를 표시해도 되고 두 가지 방법을 다 써도 됩니다. 계정 유형과 계정 이름은
+ 이 요구 사항을 사용자에게 설명하려면 관련 문서를 사용해도 되고, 아니면 사용자에게
+유형과 이름을 추가하라는 프롬프트를 표시해도 되고 두 가지 방법을 다 써도 됩니다. 계정 유형과 계정 이름은
다음 섹션에서 더 자세히 설명되어 있습니다.
</li>
</ul>
<h3 id="RawContactsExample">원시 연락처 데이터 소스</h3>
<p>
- 원시 연락처의 작동 원리를 이해하기 위해, 다음과 같이 기기에서 정의한 사용자 계정 세 가지를 보유한 사용자 "Emily Dickinson"이 있다고
+ 원시 연락처의 작동 원리를 이해하기 위해, 다음과 같이 기기에서 정의한 사용자 계정 세 가지를 보유한 사용자 "Emily Dickinson"이 있다고
가정해 봅시다.
</p>
<ul>
@@ -275,11 +275,11 @@
활성화했습니다.
</p>
<p>
- Emily Dickinson이 브라우저 창을 열고,
+ Emily Dickinson이 브라우저 창을 열고,
Gmail에 <code>emily.dickinson@gmail.com</code>으로 로그인하고,
-연락처를 열어서 "Thomas Higginson"을 추가한다고 가정하겠습니다. 이 사용자는 나중에 Gmail에
-<code>emilyd@gmail.com</code>으로 로그인하고 "Thomas Higginson"에게 이메일을 전송합니다.
-이렇게 하면 이 사람을 자동으로 연락처로 추가합니다. Emily는 Twitter에서 "colonel_tom"(Thomas Higginson의 Twitter ID)도
+연락처를 열어서 "Thomas Higginson"을 추가한다고 가정하겠습니다. 이 사용자는 나중에 Gmail에
+<code>emilyd@gmail.com</code>으로 로그인하고 "Thomas Higginson"에게 이메일을 전송합니다.
+이렇게 하면 이 사람을 자동으로 연락처로 추가합니다. Emily는 Twitter에서 "colonel_tom"(Thomas Higginson의 Twitter ID)도
팔로우합니다.
</p>
<p>
@@ -292,34 +292,34 @@
</li>
<li>
<code>emilyd@gmail.com</code>과 연관된 "Thomas Higginson"의 두 번째 원시 연락처입니다.
- 사용자 계정 유형은 마찬가지로 Google입니다. 이름이 이전 이름과 똑같더라도 두 번째 원시 연락처가
-더해집니다. 왜냐하면 이 사람은 아까와 다른
+ 사용자 계정 유형은 마찬가지로 Google입니다. 이름이 이전 이름과 똑같더라도 두 번째 원시 연락처가
+더해집니다. 왜냐하면 이 사람은 아까와 다른
사용자 계정에 추가되었기 때문입니다.
</li>
<li>
- "belle_of_amherst"와 연관된 "Thomas Higginson"의 세 번째 원시 연락처입니다. 사용자
+ "belle_of_amherst"와 연관된 "Thomas Higginson"의 세 번째 원시 연락처입니다. 사용자
계정 유형은 Twitter입니다.
</li>
</ol>
<h2 id="DataBasics">데이터</h2>
<p>
이전에 언급한 바와 같이, 원시 연락처의 데이터는
-원시 연락처의 <code>_ID</code> 값과 연결된{@link android.provider.ContactsContract.Data} 행에
-저장됩니다. 이렇게 하면 하나의 원시 연락처에 같은 유형의 데이터의 인스턴스가 여러 개 있을 수 있게 됩니다.
-예를 들어 이메일 주소 또는 전화 번호 등이 이에 해당됩니다. 예를 들어,
+원시 연락처의 <code>_ID</code> 값과 연결된{@link android.provider.ContactsContract.Data} 행에
+저장됩니다. 이렇게 하면 하나의 원시 연락처에 같은 유형의 데이터의 인스턴스가 여러 개 있을 수 있게 됩니다.
+예를 들어 이메일 주소 또는 전화 번호 등이 이에 해당됩니다. 예를 들어,
{@code emilyd@gmail.com}에 대한 "Thomas Higginson"(Google 계정 <code>emilyd@gmail.com</code>과 연관된 Thomas Higginson의
-원시 연락처)에는
+원시 연락처)에는
<code>thigg@gmail.com</code>이라는 집 이메일 주소와
<code>thomas.higginson@gmail.com</code>이라는 직장 이메일 주소가 있고, 연락처 제공자는 두 개의 이메일 주소 행을 저장하고
원시 연락처에 두 가지를 연결합니다.
</p>
<p>
- 이 테이블 하나에 여러 가지 유형의 데이터가 저장된 점에 주의하십시오. 표시 이름,
-전화 번호, 이메일, 우편 주소, 사진 및 웹사이트 세부 정보 행은 모두
-{@link android.provider.ContactsContract.Data} 테이블에서 찾을 수 있습니다. 이런 데이터 관리를 돕기 위해
-{@link android.provider.ContactsContract.Data} 테이블에는 설명이 포함된 이름이 있는 열이 몇 개 있고
-일반적 이름이 포함된 열도 몇 개 있습니다. 설명이 포함된 이름 열의 콘텐츠는 행 안의 데이터 유형과 관계 없이 모두 의미가 같고,
-일반적인 이름 열의 콘텐츠는 데이터 유형에 따라
+ 이 테이블 하나에 여러 가지 유형의 데이터가 저장된 점에 주의하십시오. 표시 이름,
+전화 번호, 이메일, 우편 주소, 사진 및 웹사이트 세부 정보 행은 모두
+{@link android.provider.ContactsContract.Data} 테이블에서 찾을 수 있습니다. 이런 데이터 관리를 돕기 위해
+{@link android.provider.ContactsContract.Data} 테이블에는 설명이 포함된 이름이 있는 열이 몇 개 있고
+일반적 이름이 포함된 열도 몇 개 있습니다. 설명이 포함된 이름 열의 콘텐츠는 행 안의 데이터 유형과 관계 없이 모두 의미가 같고,
+일반적인 이름 열의 콘텐츠는 데이터 유형에 따라
서로 의미가 다릅니다.
</p>
<h3 id="DescriptiveColumns">설명이 포함된 열 이름</h3>
@@ -337,9 +337,9 @@
{@link android.provider.ContactsContract.Data#MIMETYPE}
</dt>
<dd>
- 이 행에 저장되는 데이터 유형으로, 사용자 지정 MIME 유형으로 표현됩니다. 연락처 제공자는
-{@link android.provider.ContactsContract.CommonDataKinds}의 하위 클래스에서 정의된
-MIME 유형을 사용합니다. 이러한 MIME 유형은 오픈 소스이고,
+ 이 행에 저장되는 데이터 유형으로, 사용자 지정 MIME 유형으로 표현됩니다. 연락처 제공자는
+{@link android.provider.ContactsContract.CommonDataKinds}의 하위 클래스에서 정의된
+MIME 유형을 사용합니다. 이러한 MIME 유형은 오픈 소스이고,
연락처 제공자와 함께 사용할 수 있는 모든 애플리케이션 또는 동기화 어댑터가 사용할 수 있습니다.
</dd>
<dt>
@@ -347,25 +347,25 @@
</dt>
<dd>
이 유형의 데이터 행이 원시 연락처에서 한 번 이상 발생하는 경우,
-{@link android.provider.ContactsContract.DataColumns#IS_PRIMARY} 열은
-해당 유형의 기본 데이터가 들어있는 데이터 행을 플래그로 표시합니다. 예를 들어,
-사용자가 연락처의 전화 번호를 길게 누르고 <strong>기본값으로 설정</strong>을 선택하면
+{@link android.provider.ContactsContract.DataColumns#IS_PRIMARY} 열은
+해당 유형의 기본 데이터가 들어있는 데이터 행을 플래그로 표시합니다. 예를 들어,
+사용자가 연락처의 전화 번호를 길게 누르고 <strong>기본값으로 설정</strong>을 선택하면
그 번호가 들어있는 {@link android.provider.ContactsContract.Data} 행이
-{@link android.provider.ContactsContract.DataColumns#IS_PRIMARY} 열을
+{@link android.provider.ContactsContract.DataColumns#IS_PRIMARY} 열을
0이 아닌 값으로 설정합니다.
</dd>
</dl>
<h3 id="GenericColumns">일반 열 이름</h3>
<p>
- 15개의 일반 열 중에서 <code>DATA1</code>부터
-<code>DATA15</code>까지는 일반적으로 이용할 수 있고 이외에 추가로 마련된 네 개의 일반
-열, 즉 <code>SYNC1</code>부터 <code>SYNC4</code>까지는
-동기화 어댑터 전용입니다. 일반 열 이름 상수는 해당 행에 들어있는 데이터 유형과 관계 없이
+ 15개의 일반 열 중에서 <code>DATA1</code>부터
+<code>DATA15</code>까지는 일반적으로 이용할 수 있고 이외에 추가로 마련된 네 개의 일반
+열, 즉 <code>SYNC1</code>부터 <code>SYNC4</code>까지는
+동기화 어댑터 전용입니다. 일반 열 이름 상수는 해당 행에 들어있는 데이터 유형과 관계 없이
언제나 통합니다.
</p>
<p>
- <code>DATA1</code> 열은 색인됩니다. 연락처 제공자는 제공자가 가장 자주 쿼리의 대상이 될 것으로 예상하는
-데이터에 대해 항상 이 열을 사용합니다. 예컨대
+ <code>DATA1</code> 열은 색인됩니다. 연락처 제공자는 제공자가 가장 자주 쿼리의 대상이 될 것으로 예상하는
+데이터에 대해 항상 이 열을 사용합니다. 예컨대
이메일 행의 경우, 이 열에 실제 이메일 주소가 들어있습니다.
</p>
<p>
@@ -374,36 +374,36 @@
</p>
<h3 id="TypeSpecificNames">유형별 열 이름</h3>
<p>
- 특정 유형의 행에 대한 열과의 작업을 돕기 위해, 연락처 제공자는
- 유형별 열 이름 상수도 제공합니다. 이는
-{@link android.provider.ContactsContract.CommonDataKinds}의 하위 클래스에서 정의합니다. 이 상수는 그저 같은 열 이름에
-서로 다른 상수 이름을 부여할 뿐이며, 이렇게 하면 개발자가 특정 유형의 행에 있는 데이터에
+ 특정 유형의 행에 대한 열과의 작업을 돕기 위해, 연락처 제공자는
+ 유형별 열 이름 상수도 제공합니다. 이는
+{@link android.provider.ContactsContract.CommonDataKinds}의 하위 클래스에서 정의합니다. 이 상수는 그저 같은 열 이름에
+서로 다른 상수 이름을 부여할 뿐이며, 이렇게 하면 개발자가 특정 유형의 행에 있는 데이터에
액세스하기 쉽습니다.
</p>
<p>
- 예를 들어, {@link android.provider.ContactsContract.CommonDataKinds.Email} 클래스는
+ 예를 들어, {@link android.provider.ContactsContract.CommonDataKinds.Email} 클래스는
MIME 유형{@link android.provider.ContactsContract.CommonDataKinds.Email#CONTENT_ITEM_TYPE
Email.CONTENT_ITEM_TYPE}을 갖는
-{@link android.provider.ContactsContract.Data} 행에
+{@link android.provider.ContactsContract.Data} 행에
대한 유형별 열 이름 상수를 정의합니다. 이 클래스에는 이메일 주소 열에 대한
- 상수 {@link android.provider.ContactsContract.CommonDataKinds.Email#ADDRESS}가
-들어있습니다.
-{@link android.provider.ContactsContract.CommonDataKinds.Email#ADDRESS}의 실제 값은
+ 상수 {@link android.provider.ContactsContract.CommonDataKinds.Email#ADDRESS}가
+들어있습니다.
+{@link android.provider.ContactsContract.CommonDataKinds.Email#ADDRESS}의 실제 값은
"data1"이고, 이는 열의 일반 이름과 같습니다.
</p>
<p class="caution">
- <strong>주의:</strong> 개발자 본인의 사용자 지정 데이터를
-{@link android.provider.ContactsContract.Data} 테이블에
-추가할 때 제공자의 미리 정의된 MIME 유형 중 하나가 있는 행을 사용하면 안 됩니다. 그렇게 하면 데이터가 손실되거나 제공자의 오작동을
-유발할 수 있습니다. 예를 들어, MIME 유형
+ <strong>주의:</strong> 개발자 본인의 사용자 지정 데이터를
+{@link android.provider.ContactsContract.Data} 테이블에
+추가할 때 제공자의 미리 정의된 MIME 유형 중 하나가 있는 행을 사용하면 안 됩니다. 그렇게 하면 데이터가 손실되거나 제공자의 오작동을
+유발할 수 있습니다. 예를 들어, MIME 유형
{@link android.provider.ContactsContract.CommonDataKinds.Email#CONTENT_ITEM_TYPE
- Email.CONTENT_ITEM_TYPE} 안에
-<code>DATA1</code> 열에 있는 이메일 주소 대신 사용자 이름이 들어있는 행은 추가하면 안 됩니다. 해당 행에 개발자 나름의 사용자 지정 MIME 유형을 사용하는 경우
+ Email.CONTENT_ITEM_TYPE} 안에
+<code>DATA1</code> 열에 있는 이메일 주소 대신 사용자 이름이 들어있는 행은 추가하면 안 됩니다. 해당 행에 개발자 나름의 사용자 지정 MIME 유형을 사용하는 경우
본인만의 유형별 열 이름을 자유자재로 정의하고 이러한 열을 마음대로 사용해도 됩니다.
</p>
<p>
- 그림 2는
-{@link android.provider.ContactsContract.Data} 행에서 설명 열과 데이터 열이 나타나는 방식과 유형별 열 이름이
+ 그림 2는
+{@link android.provider.ContactsContract.Data} 행에서 설명 열과 데이터 열이 나타나는 방식과 유형별 열 이름이
일반 열 이름에 "오버레이"되는 방식을 나타낸 것입니다.
</p>
<img src="{@docRoot}images/providers/data_columns.png" alt="How type-specific column names map to generic column names" height="311" id="figure2" />
@@ -446,51 +446,51 @@
<td>{@link android.provider.ContactsContract.CommonDataKinds.GroupMembership}</td>
<td>원시 연락처를 연락처 제공자의 그룹 중 하나와 연결하는 식별자입니다.</td>
<td>
- 그룹은 계정 유형과 계정 이름의 선택적 기능입니다. 이러한 내용은
+ 그룹은 계정 유형과 계정 이름의 선택적 기능입니다. 이러한 내용은
<a href="#Groups">연락처 그룹</a> 섹션에 자세히 설명되어 있습니다.
</td>
</tr>
</table>
<h3 id="ContactBasics">연락처</h3>
<p>
- 연락처 제공자는 모든 계정 유형과 계정 이름을 통틀어 원시 연락처 행을 조합하여
-하나의 <strong>연락처</strong>를 형성합니다. 이렇게 하면 사용자가 한 사람에 대해 수집한
-모든 데이터를 표시하고 수정하기 쉽습니다. 연락처 제공자는 새 연락처 행의 생성을 관리하고
-원시 연락처를 기존 연락처 행과 통합하기도 합니다. 애플리케이션과
+ 연락처 제공자는 모든 계정 유형과 계정 이름을 통틀어 원시 연락처 행을 조합하여
+하나의 <strong>연락처</strong>를 형성합니다. 이렇게 하면 사용자가 한 사람에 대해 수집한
+모든 데이터를 표시하고 수정하기 쉽습니다. 연락처 제공자는 새 연락처 행의 생성을 관리하고
+원시 연락처를 기존 연락처 행과 통합하기도 합니다. 애플리케이션과
동기화 어댑터는 모두 연락처를 추가할 수 없으며, 연락처 행에 있는 열 중 몇몇은 읽기 전용입니다.
</p>
<p class="note">
- <strong>참고:</strong> 연락처 제공자에 연락처를 추가하려고
-{@link android.content.ContentResolver#insert(Uri,ContentValues) insert()}를 사용하는 경우,
-{@link java.lang.UnsupportedOperationException} 예외가 발생합니다. "읽기 전용"으로 표시된 열을 업데이트하려고 하면
+ <strong>참고:</strong> 연락처 제공자에 연락처를 추가하려고
+{@link android.content.ContentResolver#insert(Uri,ContentValues) insert()}를 사용하는 경우,
+{@link java.lang.UnsupportedOperationException} 예외가 발생합니다. "읽기 전용"으로 표시된 열을 업데이트하려고 하면
그 업데이트는 무시됩니다.
</p>
<p>
- 연락처 제공자는 기존 연락처 어느 것과도 일치하지 않는 새로운 원시 연락처가 추가되면
-새로운 연락처를 생성합니다. 제공자가 이 작업을 하는 또 다른 경우는
-기존 원시 연락처의 데이터가 변경되어 이전에 첨부되어 있던 연락처에 더 이상 일치하지 않는
-경우입니다. 애플리케이션이나 동기화 어댑터가
+ 연락처 제공자는 기존 연락처 어느 것과도 일치하지 않는 새로운 원시 연락처가 추가되면
+새로운 연락처를 생성합니다. 제공자가 이 작업을 하는 또 다른 경우는
+기존 원시 연락처의 데이터가 변경되어 이전에 첨부되어 있던 연락처에 더 이상 일치하지 않는
+경우입니다. 애플리케이션이나 동기화 어댑터가
기존 연락처와 <em>일치하는</em> 새로운 원시 연락처를 생성하면, 새로운 원시 연락처는
기존 연락처에 통합됩니다.
</p>
<p>
연락처 제공자는
-{@link android.provider.ContactsContract.Contacts Contacts} 테이블에 있는 연락처 행의 <code>_ID</code> 열로
-연락처 행과 원시 연락처 행를 연결합니다. 원시 연락처 테이블 {@link android.provider.ContactsContract.RawContacts}의 <code>CONTACT_ID</code> 행에는
-각 원시 연락처 행과 관련된 연락처 행에 대한 <code>_ID</code> 값이
+{@link android.provider.ContactsContract.Contacts Contacts} 테이블에 있는 연락처 행의 <code>_ID</code> 열로
+연락처 행과 원시 연락처 행를 연결합니다. 원시 연락처 테이블 {@link android.provider.ContactsContract.RawContacts}의 <code>CONTACT_ID</code> 행에는
+각 원시 연락처 행과 관련된 연락처 행에 대한 <code>_ID</code> 값이
들어있습니다.
</p>
<p>
{@link android.provider.ContactsContract.Contacts} 테이블에는 연락처 행에 대한 "영구" 링크인
{@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} 열도
-있습니다. 연락처 제공자가 연락처를 자동으로 관리하므로,
-통합이나 동기화에 응답하여 연락처 행의 {@code android.provider.BaseColumns#_ID} 값을
-변경할 수도 있습니다. 이런 일이 발생한다 하더라도 콘텐츠 URI
-{@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}와
-연락처의 {@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}는 여전히
-연락처 행을 가리키므로,
-{@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}를
-사용하여 "즐겨찾기" 연락처에 대한 연결 등을 그대로 유지할 수 있습니다. 이 열에는
+있습니다. 연락처 제공자가 연락처를 자동으로 관리하므로,
+통합이나 동기화에 응답하여 연락처 행의 {@code android.provider.BaseColumns#_ID} 값을
+변경할 수도 있습니다. 이런 일이 발생한다 하더라도 콘텐츠 URI
+{@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}와
+연락처의 {@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}는 여전히
+연락처 행을 가리키므로,
+{@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}를
+사용하여 "즐겨찾기" 연락처에 대한 연결 등을 그대로 유지할 수 있습니다. 이 열에는
{@code android.provider.BaseColumns#_ID} 열의 형식과 관련이 없는 나름의 형식이 있습니다.
</p>
<p>
@@ -502,17 +502,17 @@
</p>
<h2 id="Sources">동기화 어댑터의 데이터</h2>
<p>
- 사용자가 연락처 데이터를 기기에 직접 입력하기도 하지만, 데이터는 웹 서비스에서
-<strong>동기화 어댑터</strong>를 통해 연락처 제공자로 흘러들어가기도 합니다. 이것이 기기와
-서비스 사이에서 데이터의 전송을 자동화하는 것입니다. 동기화 어댑터는 시스템의 제어를 받으며
-배경에서 실행되고, {@link android.content.ContentResolver} 메서드를
+ 사용자가 연락처 데이터를 기기에 직접 입력하기도 하지만, 데이터는 웹 서비스에서
+<strong>동기화 어댑터</strong>를 통해 연락처 제공자로 흘러들어가기도 합니다. 이것이 기기와
+서비스 사이에서 데이터의 전송을 자동화하는 것입니다. 동기화 어댑터는 시스템의 제어를 받으며
+배경에서 실행되고, {@link android.content.ContentResolver} 메서드를
호출하여 데이터를 관리합니다.
</p>
<p>
Android에서 동기화 어댑터와 함께 작업하는 웹 서비스는 계정 유형으로 식별됩니다.
- 각 동기화 어댑터는 계정 유형 하나에 통하지만, 그 유형에 대한 여러 개의 계정이름을
-지원할 수 있습니다. 계정 유형과 계정 이름은
-<a href="#RawContactsExample">원시 연락처 데이터 소스</a> 섹션에 간단히 설명되어 있습니다. 다음 정의는 좀 더 자세한 내용을 제공하며,
+ 각 동기화 어댑터는 계정 유형 하나에 통하지만, 그 유형에 대한 여러 개의 계정이름을
+지원할 수 있습니다. 계정 유형과 계정 이름은
+<a href="#RawContactsExample">원시 연락처 데이터 소스</a> 섹션에 간단히 설명되어 있습니다. 다음 정의는 좀 더 자세한 내용을 제공하며,
계정 유형과 이름이 동기화 어댑터와 서비스에 관련되는 방식을 설명합니다.
</p>
<dl>
@@ -520,34 +520,34 @@
계정 유형
</dt>
<dd>
- 사용자가 데이터를 저장해둔 서비스를 식별합니다. 대부분의 경우, 사용자가
-서비스로 인증해야 합니다. 예를 들어, Google 주소록은 계정 유형이고, 이는
-코드 <code>google.com</code>으로 식별됩니다. 이 값은
+ 사용자가 데이터를 저장해둔 서비스를 식별합니다. 대부분의 경우, 사용자가
+서비스로 인증해야 합니다. 예를 들어, Google 주소록은 계정 유형이고, 이는
+코드 <code>google.com</code>으로 식별됩니다. 이 값은
{@link android.accounts.AccountManager}가 사용하는 계정 유형에 상응합니다.
</dd>
<dt>
계정 이름
</dt>
<dd>
- 하나의 계정 유형에 대한 특정 계정 또는 로그인을 식별합니다. Google 주소록 계정은
+ 하나의 계정 유형에 대한 특정 계정 또는 로그인을 식별합니다. Google 주소록 계정은
Google 계정과 같고, 이는 계정 이름으로 이메일 주소를 사용합니다.
다른 서비스는 한 단어로 된 사용자 이름이나 숫자 ID를 사용할 수 있습니다.
</dd>
</dl>
<p>
- 계정 유형은 고유하지 않아도 됩니다. 한 사람의 사용자가 여러 개의 Google 주소록을 구성할 수 있고
-그 데이터를 연락처 제공자에 다운로드할 수 있습니다. 이런 일은 사용자에게
-개인용 계정 이름에 대한 개인용 연락처가 한 세트 있고, 업무용으로 또 한 세트가 있는 경우 일어납니다. 계정 이름은 보통
-고유합니다. 이 둘은 함께 사용되어 연락처 제공자와 외부 서비스 사이의 특정 데이터
+ 계정 유형은 고유하지 않아도 됩니다. 한 사람의 사용자가 여러 개의 Google 주소록을 구성할 수 있고
+그 데이터를 연락처 제공자에 다운로드할 수 있습니다. 이런 일은 사용자에게
+개인용 계정 이름에 대한 개인용 연락처가 한 세트 있고, 업무용으로 또 한 세트가 있는 경우 일어납니다. 계정 이름은 보통
+고유합니다. 이 둘은 함께 사용되어 연락처 제공자와 외부 서비스 사이의 특정 데이터
흐름을 식별합니다.
</p>
<p>
- 서비스의 데이터를 연락처 제공자에 전송하려면, 나름의
-동기화 어댑터를 작성해야 합니다. 이 내용은
+ 서비스의 데이터를 연락처 제공자에 전송하려면, 나름의
+동기화 어댑터를 작성해야 합니다. 이 내용은
<a href="#SyncAdapters">연락처 제공자 동기화 어댑터</a> 섹션에 자세히 설명되어 있습니다.
</p>
<p>
- 그림 4는 연락처 제공자가 사람에 대한 데이터 흐름에
+ 그림 4는 연락처 제공자가 사람에 대한 데이터 흐름에
어떻게 들어맞는지 나타낸 것입니다. "동기화 어댑터"라고 표시된 상자에서, 각 어댑터에는 계정 유형에 따라 레이블이 붙어 있습니다.
</p>
<img src="{@docRoot}images/providers/ContactsDataFlow.png" alt="Flow of data about people" height="252" id="figure5" />
@@ -556,67 +556,67 @@
</p>
<h2 id="Permissions">필수 권한</h2>
<p>
- 연락처 제공자에 액세스하고자 하는 애플리케이션은 다음 권한을
+ 연락처 제공자에 액세스하고자 하는 애플리케이션은 다음 권한을
요청해야 합니다.
</p>
<dl>
<dt>하나 이상의 테이블에 대한 읽기 액세스</dt>
<dd>
- {@link android.Manifest.permission#READ_CONTACTS},
-<code>AndroidManifest.xml</code>에서
+ {@link android.Manifest.permission#READ_CONTACTS},
+<code>AndroidManifest.xml</code>에서
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">
- <uses-permission></a></code> 요소와 함께
+ <uses-permission></a></code> 요소와 함께
<code><uses-permission android:name="android.permission.READ_CONTACTS"></code>로 지정된 것.
</dd>
<dt>하나 이상의 테이블에 대한 쓰기 액세스</dt>
<dd>
- {@link android.Manifest.permission#WRITE_CONTACTS},
-<code>AndroidManifest.xml</code>에서
+ {@link android.Manifest.permission#WRITE_CONTACTS},
+<code>AndroidManifest.xml</code>에서
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">
- <uses-permission></a></code> 요소와 함께
+ <uses-permission></a></code> 요소와 함께
<code><uses-permission android:name="android.permission.WRITE_CONTACTS"></code>로 지정된 것.
</dd>
</dl>
<p>
- 이들 권한은 사용자 프로필 데이터로 확대되지 않습니다. 사용자 프로필과
-필수 권한은
+ 이들 권한은 사용자 프로필 데이터로 확대되지 않습니다. 사용자 프로필과
+필수 권한은
다음 섹션인 <a href="#UserProfile">사용자 프로필</a>에서 논의합니다.
</p>
<p>
- 사용자의 연락처 데이터는 중요한 개인 정보라는 사실을 명심하십시오. 사용자는 자신의
+ 사용자의 연락처 데이터는 중요한 개인 정보라는 사실을 명심하십시오. 사용자는 자신의
개인정보보호를 중요하게 생각하고 신경 쓰기 때문에 애플리케이션이 자신이나 자신의 연락처에 관한 정보를 수집하는 것을 바라지 않습니다.
- 사용자의 연락처 데이터에 액세스할 권한이 필요한 이유가 분명하지 않으면 여러분의
+ 사용자의 연락처 데이터에 액세스할 권한이 필요한 이유가 분명하지 않으면 여러분의
애플리케이션에 낮은 순위를 매기거나 설치를 거부할 수도 있습니다.
</p>
<h2 id="UserProfile">사용자 프로필</h2>
<p>
- {@link android.provider.ContactsContract.Contacts} 테이블에 있는 한 개의 행에는 기기의 사용자에 대한 프로필
-데이터가 담겨 있습니다. 이 데이터는 사용자의 연락처 중 하나라기보다는 기기의 <code>user</code>를
-설명하는 것입니다. 프로필 연락처 행은
+ {@link android.provider.ContactsContract.Contacts} 테이블에 있는 한 개의 행에는 기기의 사용자에 대한 프로필
+데이터가 담겨 있습니다. 이 데이터는 사용자의 연락처 중 하나라기보다는 기기의 <code>user</code>를
+설명하는 것입니다. 프로필 연락처 행은
프로필을 사용하는 각 시스템에 대한 원시 연락처 행에 연결되어 있습니다.
- 각 프로필 원시 연락처 행에는 여러 개의 데이터 행이 있을 수 있습니다. 사용자 프로필에 액세스하기 위한 상수는
+ 각 프로필 원시 연락처 행에는 여러 개의 데이터 행이 있을 수 있습니다. 사용자 프로필에 액세스하기 위한 상수는
{@link android.provider.ContactsContract.Profile} 클래스에서 이용할 수 있습니다.
</p>
<p>
- 사용자 프로필에 액세스하려면 특수 권한이 필요합니다. 읽기와 쓰기에 필요한
+ 사용자 프로필에 액세스하려면 특수 권한이 필요합니다. 읽기와 쓰기에 필요한
{@link android.Manifest.permission#READ_CONTACTS}와
-{@link android.Manifest.permission#WRITE_CONTACTS} 권한 외에도,
-사용자 프로필에 액세스하려면 각각 읽기와 쓰기 액세스를 위한{@code android.Manifest.permission#READ_PROFILE}과
-{@code android.Manifest.permission#WRITE_PROFILE} 권한이
+{@link android.Manifest.permission#WRITE_CONTACTS} 권한 외에도,
+사용자 프로필에 액세스하려면 각각 읽기와 쓰기 액세스를 위한{@code android.Manifest.permission#READ_PROFILE}과
+{@code android.Manifest.permission#WRITE_PROFILE} 권한이
필요합니다.
</p>
<p>
- 사용자의 프로필은 중요한 정보로 간주해야 한다는 점을 명심하십시오.
-{@code android.Manifest.permission#READ_PROFILE}권한을 사용하면 개발자가 기기 사용자의
-개인 식별 데이터에 액세스할 수 있게 해줍니다. 애플리케이션 설명에서
+ 사용자의 프로필은 중요한 정보로 간주해야 한다는 점을 명심하십시오.
+{@code android.Manifest.permission#READ_PROFILE}권한을 사용하면 개발자가 기기 사용자의
+개인 식별 데이터에 액세스할 수 있게 해줍니다. 애플리케이션 설명에서
사용자에게 왜 여러분이 사용자 프로필 권한을 필요로 하는지 밝혀두어야 합니다.
</p>
<p>
사용자 프로필이 포함된 연락처 행을 검색하려면,
{@link android.content.ContentResolver#query(Uri,String[], String, String[], String)
ContentResolver.query()}를 호출합니다. 콘텐츠 URI 를
-{@link android.provider.ContactsContract.Profile#CONTENT_URI}로 설정하고
-선택 기준은 아무것도 제공하지 마십시오. 이 콘텐츠 URI는 원시 연락처 또는 프로필에 대한 데이터를 검색하기 위한
+{@link android.provider.ContactsContract.Profile#CONTENT_URI}로 설정하고
+선택 기준은 아무것도 제공하지 마십시오. 이 콘텐츠 URI는 원시 연락처 또는 프로필에 대한 데이터를 검색하기 위한
기본 URI로도 쓸 수 있습니다. 예를 들어, 이 코드 조각은 프로필에 대한 데이터를 검색합니다.
</p>
<pre>
@@ -639,18 +639,18 @@
null);
</pre>
<p class="note">
- <strong>참고:</strong> 여러 개의 연락처 행을 검색하고 그 중 하나가
-사용자 프로필인지 판별하고자 하는 경우,
-행의 {@link android.provider.ContactsContract.ContactsColumns#IS_USER_PROFILE} 열을 테스트합니다. 이 열은
+ <strong>참고:</strong> 여러 개의 연락처 행을 검색하고 그 중 하나가
+사용자 프로필인지 판별하고자 하는 경우,
+행의 {@link android.provider.ContactsContract.ContactsColumns#IS_USER_PROFILE} 열을 테스트합니다. 이 열은
해당 연락처가 사용자 프로필이면 "1"로 설정됩니다.
</p>
<h2 id="ContactsProviderMetadata">연락처 제공자 메타데이터</h2>
<p>
- 연락처 제공자는 리포지토리에서 연락처 데이터 상태를
-추적하는 데이터를 관리합니다. 이 리포지토리 관련 데이터는
+ 연락처 제공자는 리포지토리에서 연락처 데이터 상태를
+추적하는 데이터를 관리합니다. 이 리포지토리 관련 데이터는
원시 연락처, 데이터 및 연락처 테이블 행,
-{@link android.provider.ContactsContract.Settings} 테이블 및
-{@link android.provider.ContactsContract.SyncState} 테이블 등의 여러 장소에 저장됩니다. 다음 표는 각 메타데이터 조각이 미치는
+{@link android.provider.ContactsContract.Settings} 테이블 및
+{@link android.provider.ContactsContract.SyncState} 테이블 등의 여러 장소에 저장됩니다. 다음 표는 각 메타데이터 조각이 미치는
영향을 나타낸 것입니다.
</p>
<p class="table-caption" id="table3">
@@ -667,14 +667,14 @@
<td rowspan="2">{@link android.provider.ContactsContract.SyncColumns#DIRTY}</td>
<td>"0" - 마지막 동기화 이후로 변경되지 않았습니다.</td>
<td rowspan="2">
- 기기에서 변경되었고 서버로 다시 동기화되어야 하는 원시 데이터를
-표시합니다. 이 값은 Android 애플리케이션이 행을 업데이트하면 연락처 제공자가
+ 기기에서 변경되었고 서버로 다시 동기화되어야 하는 원시 데이터를
+표시합니다. 이 값은 Android 애플리케이션이 행을 업데이트하면 연락처 제공자가
자동으로 설정합니다.
<p>
- 원시 연락처나 데이터 테이블을 수정하는 동기화 어댑터는
-언제나 문자열 {@link android.provider.ContactsContract#CALLER_IS_SYNCADAPTER}를
+ 원시 연락처나 데이터 테이블을 수정하는 동기화 어댑터는
+언제나 문자열 {@link android.provider.ContactsContract#CALLER_IS_SYNCADAPTER}를
자신이 사용하는 콘텐츠 URI에 추가해야 합니다. 이렇게 하면 제공자가 행을 변경(dirty)으로 표시하지 못하게 방지합니다.
- 그렇지 않으면, 동기화 어댑터 수정이 로컬 수정으로 나타나며
+ 그렇지 않으면, 동기화 어댑터 수정이 로컬 수정으로 나타나며
서버가 수정의 근원이었다 하더라도 이 내용이 다시 서버로 전송됩니다.
</p>
</td>
@@ -687,7 +687,7 @@
<td>{@link android.provider.ContactsContract.SyncColumns#VERSION}</td>
<td>이 행의 버전 번호입니다.</td>
<td>
- 연락처 제공자는 행이나 관련 데이터가 변경될 때마다 이 값을 자동으로
+ 연락처 제공자는 행이나 관련 데이터가 변경될 때마다 이 값을 자동으로
증가시킵니다.
</td>
</tr>
@@ -696,7 +696,7 @@
<td>{@link android.provider.ContactsContract.DataColumns#DATA_VERSION}</td>
<td>이 행의 버전 번호입니다.</td>
<td>
- 연락처 제공자는 데이터 행이 변경될 때마다 이 값을 자동으로
+ 연락처 제공자는 데이터 행이 변경될 때마다 이 값을 자동으로
증가시킵니다.
</td>
</tr>
@@ -704,33 +704,33 @@
<td>{@link android.provider.ContactsContract.RawContacts}</td>
<td>{@link android.provider.ContactsContract.SyncColumns#SOURCE_ID}</td>
<td>
- 이 원시 연락처를 자신이 생성된 계정에 대해 고유하게 식별하는
+ 이 원시 연락처를 자신이 생성된 계정에 대해 고유하게 식별하는
문자열 값입니다.
</td>
<td>
- 동기화 어댑터가 새로운 원시 연락처를 생성하면, 이 열이
-해당 원시 연락처에 대한 서버의 고유 ID로 설정되어야 합니다. Android 애플리케이션이 새로운 원시 연락처를 생성하면,
-애플리케이션은 이 열을 빈 채로 두어야 합니다. 이것은 동기화 어댑터에
-서버에 새 원시 데이터를 생성해야 한다고 신호하고,
+ 동기화 어댑터가 새로운 원시 연락처를 생성하면, 이 열이
+해당 원시 연락처에 대한 서버의 고유 ID로 설정되어야 합니다. Android 애플리케이션이 새로운 원시 연락처를 생성하면,
+애플리케이션은 이 열을 빈 채로 두어야 합니다. 이것은 동기화 어댑터에
+서버에 새 원시 데이터를 생성해야 한다고 신호하고,
{@link android.provider.ContactsContract.SyncColumns#SOURCE_ID}에 대한 값을 가져오라고 알립니다.
<p>
- 특히, 소스 ID는 각 계정 유형에 대해 <strong>고유</strong>해야 하고
+ 특히, 소스 ID는 각 계정 유형에 대해 <strong>고유</strong>해야 하고
동기화 전체에서 안정적이어야 합니다.
</p>
<ul>
<li>
- 고유: 하나의 계정에 대한 각 원시 연락처에는 나름의 소스 ID가 있어야 합니다. 개발자가
+ 고유: 하나의 계정에 대한 각 원시 연락처에는 나름의 소스 ID가 있어야 합니다. 개발자가
이것을 강제 적용하지 않으면 연락처 애플리케이션에 문제를 유발하게 됩니다.
- 같은 계정 <em>유형</em>에 대한 두 개의 원시 연락처는 소스 ID가
-같을 수 있다는 점을 유의하십시오. 예를 들어,
-{@code emily.dickinson@gmail.com} 계정에 대한 원시 연락처 "Thomas Higginson"은
-{@code emilyd@gmail.com} 계정에 대한
+ 같은 계정 <em>유형</em>에 대한 두 개의 원시 연락처는 소스 ID가
+같을 수 있다는 점을 유의하십시오. 예를 들어,
+{@code emily.dickinson@gmail.com} 계정에 대한 원시 연락처 "Thomas Higginson"은
+{@code emilyd@gmail.com} 계정에 대한
원시 연락처 "Thomas Higginson"과 소스 ID가 같을 수 있습니다.
</li>
<li>
- 안정적: 소스 ID는 원시 연락처에 대한 온라인 서비스의 데이터 중 영구적인
-부분입니다. 예를 들어, 사용자가 앱 설정에서 연락처 저장소를 삭제하고 다시 동기화하면
-복원된 원시 연락처의 소스 ID는 전과 같아야
+ 안정적: 소스 ID는 원시 연락처에 대한 온라인 서비스의 데이터 중 영구적인
+부분입니다. 예를 들어, 사용자가 앱 설정에서 연락처 저장소를 삭제하고 다시 동기화하면
+복원된 원시 연락처의 소스 ID는 전과 같아야
합니다. 개발자가 이것을 강제 적용하지 않으면 바로 가기가 더 이상
작동하지 않습니다.
</li>
@@ -742,7 +742,7 @@
<td rowspan="2">{@link android.provider.ContactsContract.GroupsColumns#GROUP_VISIBLE}</td>
<td>"0" - 이 그룹의 연락처는 Android 애플리케이션 UI에 표시되지 않아야 합니다.</td>
<td>
- 이 열은 사용자가 특정 그룹에 연락처를 숨길 수 있게 해주는 서버와의
+ 이 열은 사용자가 특정 그룹에 연락처를 숨길 수 있게 해주는 서버와의
호환성을 위한 것입니다.
</td>
</tr>
@@ -754,22 +754,22 @@
<td rowspan="2">
{@link android.provider.ContactsContract.SettingsColumns#UNGROUPED_VISIBLE}</td>
<td>
- "0" - 이 계정과 계정 유형의 경우, 그룹에 속하지 않는 연락처는 Android 애플리케이션 UI에
+ "0" - 이 계정과 계정 유형의 경우, 그룹에 속하지 않는 연락처는 Android 애플리케이션 UI에
표시되지 않습니다.
</td>
<td rowspan="2">
- 기본적으로, 연락처에 그룹에 속한 원시 데이터가 하나도 없는 경우 이는 표시되지 않습니다(원시 연락처의 그룹 구성원은
-{@link android.provider.ContactsContract.Data} 테이블에서
-하나 이상의 {@link android.provider.ContactsContract.CommonDataKinds.GroupMembership} 행으로
+ 기본적으로, 연락처에 그룹에 속한 원시 데이터가 하나도 없는 경우 이는 표시되지 않습니다(원시 연락처의 그룹 구성원은
+{@link android.provider.ContactsContract.Data} 테이블에서
+하나 이상의 {@link android.provider.ContactsContract.CommonDataKinds.GroupMembership} 행으로
표시됩니다).
- 계정 유형과 계정에 대한 {@link android.provider.ContactsContract.Settings} 테이블 행에서
+ 계정 유형과 계정에 대한 {@link android.provider.ContactsContract.Settings} 테이블 행에서
이 플래그를 설정하면 그룹이 없는 연락처가 표시되도록 강제할 수 있습니다.
이 플래그의 용도 중 하나는 그룹을 사용하지 않는 서버로부터 가져온 연락처를 표시하는 것입니다.
</td>
</tr>
<tr>
<td>
- "1" - 이 계정과 계정 유형의 경우, 그룹에 속하지 않는 연락처가 애플리케이션 UI에
+ "1" - 이 계정과 계정 유형의 경우, 그룹에 속하지 않는 연락처가 애플리케이션 UI에
표시됩니다.
</td>
@@ -781,14 +781,14 @@
이 테이블을 사용하여 동기화 어댑터의 메타데이터를 저장합니다.
</td>
<td>
- 이 테이블을 사용하면 동기화 상태와 기타 동기화 관련 데이터를 기기에 영구적으로
+ 이 테이블을 사용하면 동기화 상태와 기타 동기화 관련 데이터를 기기에 영구적으로
저장할 수 있습니다.
</td>
</tr>
</table>
<h2 id="Access">연락처 제공자 액세스</h2>
<p>
- 이 섹션은 연락처 제공자에서 가져온 데이터에 액세스하는 법에 대한 지침을 제공하며,
+ 이 섹션은 연락처 제공자에서 가져온 데이터에 액세스하는 법에 대한 지침을 제공하며,
요점은 다음과 같습니다.
</p>
<ul>
@@ -806,49 +806,49 @@
</li>
</ul>
<p>
- 동기화 어댑터에서 수정하는 방법은
+ 동기화 어댑터에서 수정하는 방법은
<a href="#SyncAdapters">연락처 제공자 동기화 어댑터</a> 섹션에도 자세히 설명되어 있습니다.
</p>
<h3 id="Entities">엔티티 쿼리</h3>
<p>
- 연락처 제공자 테이블은 계층을 사용하여 조직화되어 있으므로,
-행과 그 행에 연결된 모든 "하위" 행을 검색하는 것이 유용할 때가 많습니다. 예를 들어,
-어떤 개인의 모든 정보를 표시하려면
-하나의 {@link android.provider.ContactsContract.Contacts} 행에 대한 모든
-{@link android.provider.ContactsContract.RawContacts} 행을 검색하거나 하나의
-{@link android.provider.ContactsContract.RawContacts} 행에 대한 모든
-{@link android.provider.ContactsContract.CommonDataKinds.Email} 행을 검색하는 것이 좋습니다. 이를 용이하게 하기 위해,
-연락처 제공자는 테이블 사이를 연결하는 데이터베이스 역할을 하는 <strong>엔티티</strong> 구조를
+ 연락처 제공자 테이블은 계층을 사용하여 조직화되어 있으므로,
+행과 그 행에 연결된 모든 "하위" 행을 검색하는 것이 유용할 때가 많습니다. 예를 들어,
+어떤 개인의 모든 정보를 표시하려면
+하나의 {@link android.provider.ContactsContract.Contacts} 행에 대한 모든
+{@link android.provider.ContactsContract.RawContacts} 행을 검색하거나 하나의
+{@link android.provider.ContactsContract.RawContacts} 행에 대한 모든
+{@link android.provider.ContactsContract.CommonDataKinds.Email} 행을 검색하는 것이 좋습니다. 이를 용이하게 하기 위해,
+연락처 제공자는 테이블 사이를 연결하는 데이터베이스 역할을 하는 <strong>엔티티</strong> 구조를
제공합니다.
</p>
<p>
하나의 엔티티는 마치 상위 테이블과 그 하위 테이블에서 가져온 선택된 몇 개의 열로 이루어진 테이블과 같습니다.
- 엔티티를 쿼리하는 경우, 해당 엔티티에서 사용할 수 있는 열을 기반으로 하여 예측과 검색
-기준을 제공합니다. 그 결과도 도출되는 것이 {@link android.database.Cursor}이며,
-여기에 검색된 각 하위 테이블에 대해 행이 하나씩 들어있습니다. 예를 들어 연락처 이름에 대해
-{@link android.provider.ContactsContract.Contacts.Entity}를 쿼리하고
-그 이름에 대한 모든 원시 연락처에 대한 모든 {@link android.provider.ContactsContract.CommonDataKinds.Email} 행을 쿼리하면
-{@link android.database.Cursor}를 돌려받게 되며 이 안에
+ 엔티티를 쿼리하는 경우, 해당 엔티티에서 사용할 수 있는 열을 기반으로 하여 예측과 검색
+기준을 제공합니다. 그 결과도 도출되는 것이 {@link android.database.Cursor}이며,
+여기에 검색된 각 하위 테이블에 대해 행이 하나씩 들어있습니다. 예를 들어 연락처 이름에 대해
+{@link android.provider.ContactsContract.Contacts.Entity}를 쿼리하고
+그 이름에 대한 모든 원시 연락처에 대한 모든 {@link android.provider.ContactsContract.CommonDataKinds.Email} 행을 쿼리하면
+{@link android.database.Cursor}를 돌려받게 되며 이 안에
각 {@link android.provider.ContactsContract.CommonDataKinds.Email}행에 대한 행이 하나씩 들어있습니다.
</p>
<p>
- 엔티티는 쿼리를 단순화합니다. 엔티티를 사용하면 연락처나 원시 연락처에 대한 모든 연락처 데이터를
-한꺼번에 검색할 수 있습니다. 즉 우선 상위 테이블을 검색하여 ID를 가져오고, 그런 다음
-하위 테이블을 그 ID로 검색하지 않아도 된다는 뜻입니다. 또한, 연락처 제공자에는 엔티티에 대한 쿼리를
-하나의 트랜잭션으로 처리하므로, 검색된 데이터가 내부적으로 일관성을 유지하도록
+ 엔티티는 쿼리를 단순화합니다. 엔티티를 사용하면 연락처나 원시 연락처에 대한 모든 연락처 데이터를
+한꺼번에 검색할 수 있습니다. 즉 우선 상위 테이블을 검색하여 ID를 가져오고, 그런 다음
+하위 테이블을 그 ID로 검색하지 않아도 된다는 뜻입니다. 또한, 연락처 제공자에는 엔티티에 대한 쿼리를
+하나의 트랜잭션으로 처리하므로, 검색된 데이터가 내부적으로 일관성을 유지하도록
보장합니다.
</p>
<p class="note">
- <strong>참고:</strong> 하나의 엔티티에 상위 및 하위 테이블의 모든 열이 들어있지는 않은 것이
-보통입니다. 엔티티에 대한 열 이름 상수 목록에 없는 열 이름으로 작업하려 시도하면,
+ <strong>참고:</strong> 하나의 엔티티에 상위 및 하위 테이블의 모든 열이 들어있지는 않은 것이
+보통입니다. 엔티티에 대한 열 이름 상수 목록에 없는 열 이름으로 작업하려 시도하면,
{@link java.lang.Exception}이 발생합니다.
</p>
<p>
- 다음 조각은 하나의 연락처에 대해 모든 원시 연락처 행을 검색하는 방법을 나타낸 것입니다. 이 조각은
-두 개의 액티비티, 즉 "기본"과 "세부"를 가진 더 큰 애플리케이션의 일부입니다. 기본 액티비티는
-연락처 행 목록을 보여줍니다. 사용자가 하나를 선택하면, 이 액티비티가 해당 목록의 ID를
-세부 액티비티에 전송합니다. 세부 액티비티는 {@link android.provider.ContactsContract.Contacts.Entity}를 사용하여
-선택된 연락처와 연관된 모든 원시 연락처에서
+ 다음 조각은 하나의 연락처에 대해 모든 원시 연락처 행을 검색하는 방법을 나타낸 것입니다. 이 조각은
+두 개의 액티비티, 즉 "기본"과 "세부"를 가진 더 큰 애플리케이션의 일부입니다. 기본 액티비티는
+연락처 행 목록을 보여줍니다. 사용자가 하나를 선택하면, 이 액티비티가 해당 목록의 ID를
+세부 액티비티에 전송합니다. 세부 액티비티는 {@link android.provider.ContactsContract.Contacts.Entity}를 사용하여
+선택된 연락처와 연관된 모든 원시 연락처에서
모든 데이터 행을 표시합니다.
</p>
<p>
@@ -921,71 +921,71 @@
}
</pre>
<p>
- 로딩이 완료되면, {@link android.app.LoaderManager}가
+ 로딩이 완료되면, {@link android.app.LoaderManager}가
{@link android.app.LoaderManager.LoaderCallbacks#onLoadFinished(Loader, D)
-onLoadFinished()}에 대한 콜백을 호출합니다. 이 메서드로 수신되는 인수 중 하나가
-{@link android.database.Cursor}로, 여기에 쿼리 결과도 함께 들어옵니다. 개발자 본인의 앱에서는, 이
+onLoadFinished()}에 대한 콜백을 호출합니다. 이 메서드로 수신되는 인수 중 하나가
+{@link android.database.Cursor}로, 여기에 쿼리 결과도 함께 들어옵니다. 개발자 본인의 앱에서는, 이
{@link android.database.Cursor}에서 데이터를 가져와 이를 표시할 수도 있고 여기에 작업을 더할 수도 있습니다.
</p>
<h3 id="Transactions">일괄 수정</h3>
<p>
- 연락처 제공자에서 데이터를 삽입, 업데이트 및 삭제하는 경우 가급적이면
-"일괄 모드"를 쓰는 것이 좋습니다. 이때
-{@link android.content.ContentProviderOperation} 객체의 {@link java.util.ArrayList}를 생성하고
-{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}를 호출하면 됩니다. 연락처 제공자는
+ 연락처 제공자에서 데이터를 삽입, 업데이트 및 삭제하는 경우 가급적이면
+"일괄 모드"를 쓰는 것이 좋습니다. 이때
+{@link android.content.ContentProviderOperation} 객체의 {@link java.util.ArrayList}를 생성하고
+{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}를 호출하면 됩니다. 연락처 제공자는
-{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}에서의 모든 작업을
-하나의 트랜잭션으로 수행하기 때문에, 수정한 내용이 일관되지 않은 상태로 연락처 리포지토리를
-떠날 일이 결코 없습니다. 일괄 수정을 사용하면 원시 연락처와 그 세부 데이터를 동시에 삽입하는 것도
+{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}에서의 모든 작업을
+하나의 트랜잭션으로 수행하기 때문에, 수정한 내용이 일관되지 않은 상태로 연락처 리포지토리를
+떠날 일이 결코 없습니다. 일괄 수정을 사용하면 원시 연락처와 그 세부 데이터를 동시에 삽입하는 것도
쉽습니다.
</p>
<p class="note">
- <strong>참고:</strong> <em>하나의</em> 원시 연락처를 수정하려면 수정 작업을 앱에서 처리하는 것보다는
-인텐트를 기기의 연락처 애플리케이션에 보내는 방안을 고려하십시오.
-이렇게 하는 방법이
+ <strong>참고:</strong> <em>하나의</em> 원시 연락처를 수정하려면 수정 작업을 앱에서 처리하는 것보다는
+인텐트를 기기의 연락처 애플리케이션에 보내는 방안을 고려하십시오.
+이렇게 하는 방법이
<a href="#Intents">인텐트로 검색 및 수정</a> 섹션에 자세히 설명되어 있습니다.
</p>
<h4>양보 지점</h4>
<p>
- 대량의 작업이 들어있는 일괄 수정은 다른 프로세스를 차단하므로,
-그 결과 전반적으로 불량한 사용자 환경을 유발할 수 있습니다. 수행하고자 하는 모든 수정 작업을 가능한 한
-적은 수의 별도의 목록으로 정리하고 그와 동시에 이 작업이 시스템을 차단하지 못하도록 방지하려면
+ 대량의 작업이 들어있는 일괄 수정은 다른 프로세스를 차단하므로,
+그 결과 전반적으로 불량한 사용자 환경을 유발할 수 있습니다. 수행하고자 하는 모든 수정 작업을 가능한 한
+적은 수의 별도의 목록으로 정리하고 그와 동시에 이 작업이 시스템을 차단하지 못하도록 방지하려면
하나 이상의 작업에 <strong>양보 지점</strong>을 설정해야 합니다.
양보 지점은 {@link android.content.ContentProviderOperation#isYieldAllowed()} 값이 <code>true</code>로 설정된 {@link android.content.ContentProviderOperation} 객체입니다.
- 연락처 제공자가 양보 지점을 만나면
-다른 프로세스가 실행되도록 작업을 잠시 멈추고 현재 트랜잭션을 종료합니다. 제공자가 다시 시작되면, 이는
-{@link java.util.ArrayList}에서 다음 작업을 계속 진행하고
+ 연락처 제공자가 양보 지점을 만나면
+다른 프로세스가 실행되도록 작업을 잠시 멈추고 현재 트랜잭션을 종료합니다. 제공자가 다시 시작되면, 이는
+{@link java.util.ArrayList}에서 다음 작업을 계속 진행하고
새 트랜잭션을 시작합니다.
</p>
<p>
- 양보 지점을 사용하면 그 결과
-{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}로의 호출 한 건당 하나 이상의 트랜잭션이 생기는 것은 사실입니다. 이 때문에,
+ 양보 지점을 사용하면 그 결과
+{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}로의 호출 한 건당 하나 이상의 트랜잭션이 생기는 것은 사실입니다. 이 때문에,
양보 지점은 관련된 행 한 세트에서 마지막 작업에 설정해야 합니다.
- 예를 들어, 원시 연락처 행과 관련된 데이터 행을 추가하는 세트의 마지막 작업에
-양보 지점을 설정하거나, 하나의 연락처와 관련된 행 한 세트의
+ 예를 들어, 원시 연락처 행과 관련된 데이터 행을 추가하는 세트의 마지막 작업에
+양보 지점을 설정하거나, 하나의 연락처와 관련된 행 한 세트의
마지막 작업에 양보 지점을 설정해야 합니다.
</p>
<p>
- 양보 지점은 원자성 작업의 단위이기도 합니다. 두 개의 양보 지점 사이를 향한 액세스는 모두
-한 가지 단위로서 성공 또는 실패합니다. 양보 지점을 설정하지 않는 경우, 가장 작은
-원자성 작업은 작업 전체가 됩니다. 양보 지점을 사용하면, 작업이
-시스템 성능을 저하하지 않도록 방지하는 동시에 작업의 하위 세트가 원자성 작업이도록
+ 양보 지점은 원자성 작업의 단위이기도 합니다. 두 개의 양보 지점 사이를 향한 액세스는 모두
+한 가지 단위로서 성공 또는 실패합니다. 양보 지점을 설정하지 않는 경우, 가장 작은
+원자성 작업은 작업 전체가 됩니다. 양보 지점을 사용하면, 작업이
+시스템 성능을 저하하지 않도록 방지하는 동시에 작업의 하위 세트가 원자성 작업이도록
보장할 수 있습니다.
</p>
<h4>수정 역참조</h4>
<p>
- 새로운 원시 연락처 행과 관련 데이터 행을
-일련의 {@link android.content.ContentProviderOperation} 개체로 삽입할 때는,
- 원시 연락처의
+ 새로운 원시 연락처 행과 관련 데이터 행을
+일련의 {@link android.content.ContentProviderOperation} 개체로 삽입할 때는,
+ 원시 연락처의
{@code android.provider.BaseColumns#_ID} 값을
-{@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID} 값으로 삽입하여 데이터 행과 원시 연락처 행을 연결해야 합니다. 그러나, 이 값은
-데이터 행에 대하여 {@link android.content.ContentProviderOperation}을
+{@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID} 값으로 삽입하여 데이터 행과 원시 연락처 행을 연결해야 합니다. 그러나, 이 값은
+데이터 행에 대하여 {@link android.content.ContentProviderOperation}을
생성하는 경우에는 사용할 수 없습니다. 원시 연락처 행에 대해 {@link android.content.ContentProviderOperation}
-을 아직 적용하지 않았기 때문입니다. 이 문제를 해결하려면
+을 아직 적용하지 않았기 때문입니다. 이 문제를 해결하려면
{@link android.content.ContentProviderOperation.Builder} 클래스에
{@link android.content.ContentProviderOperation.Builder#withValueBackReference(String, int) withValueBackReference()} 메서드가 있어야 합니다.
- 이 메서드를 사용하면 열을 이전 작업의 결과로 삽입 또는 수정할 수
+ 이 메서드를 사용하면 열을 이전 작업의 결과로 삽입 또는 수정할 수
있습니다.
</p>
<p>
@@ -997,29 +997,29 @@
<code>key</code>
</dt>
<dd>
- 키-값 쌍의 키입니다. 이 인수의 값은 수정하는 테이블의
+ 키-값 쌍의 키입니다. 이 인수의 값은 수정하는 테이블의
열 이름이어야 합니다.
</dd>
<dt>
<code>previousResult</code>
</dt>
<dd>
-
+
{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}의 {@link android.content.ContentProviderResult} 객체 배열에 있는
-값의 0 기반 색인입니다.
-일괄 작업이 적용되면 각 작업의 결과가
-결과의 중간 배열에 저장됩니다. <code>previousResult</code> 값은
-이러한 결과 중 하나의 색인이고, 이는 <code>key</code> 값으로
+값의 0 기반 색인입니다.
+일괄 작업이 적용되면 각 작업의 결과가
+결과의 중간 배열에 저장됩니다. <code>previousResult</code> 값은
+이러한 결과 중 하나의 색인이고, 이는 <code>key</code> 값으로
검색 및 저장됩니다. 이것을 사용하면 새 원시 연락처 레코드를 삽입하고
-{@code android.provider.BaseColumns#_ID} 값을 다시 가져온 뒤,
+{@code android.provider.BaseColumns#_ID} 값을 다시 가져온 뒤,
{@link android.provider.ContactsContract.Data} 행을 추가할 때 해당 값을 "역참조"할 수 있게 해줍니다.
<p>
-
-{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}를 처음 호출할 때,
-개발자가 제공하는 {@link android.content.ContentProviderOperation} 객체의 {@link java.util.ArrayList} 크기와 같은 크기로
-전체 결과 배열이 생성됩니다. 그러나
-결과 배열의 모든 요소는 <code>null</code>로 설정되고,
-아직 적용되지 않은 작업 결과에 대한 역참조를 수행하려 시도하면
+
+{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}를 처음 호출할 때,
+개발자가 제공하는 {@link android.content.ContentProviderOperation} 객체의 {@link java.util.ArrayList} 크기와 같은 크기로
+전체 결과 배열이 생성됩니다. 그러나
+결과 배열의 모든 요소는 <code>null</code>로 설정되고,
+아직 적용되지 않은 작업 결과에 대한 역참조를 수행하려 시도하면
{@link android.content.ContentProviderOperation.Builder#withValueBackReference(String, int) withValueBackReference()}가
{@link java.lang.Exception}을 발생시킵니다.
@@ -1027,15 +1027,15 @@
</dd>
</dl>
<p>
- 다음 조각은 새로운 원시 연락처와 데이터를 일괄 삽입하는 방법을 나타낸 것입니다. 여기에는
-양보 지점을 지정하고 역참조를 사용하는 코드가 포함되어 있습니다. 이 조각은
-<code>createContacEntry()</code> 메서드의 확장 버전이며, 이는
+ 다음 조각은 새로운 원시 연락처와 데이터를 일괄 삽입하는 방법을 나타낸 것입니다. 여기에는
+양보 지점을 지정하고 역참조를 사용하는 코드가 포함되어 있습니다. 이 조각은
+<code>createContacEntry()</code> 메서드의 확장 버전이며, 이는
<code><a href="{@docRoot}resources/samples/ContactManager/index.html">
- Contact Manager</a></code> 샘플 애플리케이션에 있는 <code>ContactAdder</code> 클래스의
+ Contact Manager</a></code> 샘플 애플리케이션에 있는 <code>ContactAdder</code> 클래스의
일부입니다.
</p>
<p>
- 첫 번째 조각은 UI에서 연락처 데이터를 검색합니다. 이 시점에서 사용자는 이미
+ 첫 번째 조각은 UI에서 연락처 데이터를 검색합니다. 이 시점에서 사용자는 이미
새로운 원시 연락처를 추가할 계정을 선택하였습니다.
</p>
<pre>
@@ -1055,7 +1055,7 @@
mContactEmailTypeSpinner.getSelectedItemPosition());
</pre>
<p>
- 다음 조각은
+ 다음 조각은
{@link android.provider.ContactsContract.RawContacts} 테이블에 원시 연락처 행을 삽입하는 작업을 생성합니다.
</p>
<pre>
@@ -1086,18 +1086,18 @@
그런 다음, 코드가 표시 이름, 전화 및 이메일 행에 대한 데이터 행을 생성합니다.
</p>
<p>
- 각 작업 빌더 개체는
-{@link android.content.ContentProviderOperation.Builder#withValueBackReference(String, int) withValueBackReference()}를
+ 각 작업 빌더 개체는
+{@link android.content.ContentProviderOperation.Builder#withValueBackReference(String, int) withValueBackReference()}를
사용하여
-{@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID}를 가져옵니다. 참조는
-첫 번째 작업의 {@link android.content.ContentProviderResult} 객체를 다시 가리키고,
+{@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID}를 가져옵니다. 참조는
+첫 번째 작업의 {@link android.content.ContentProviderResult} 객체를 다시 가리키고,
이것이 원시 연락처 행을 추가한 뒤 이의 새 {@code android.provider.BaseColumns#_ID}
-값을 반환합니다. 그 결과, 각 데이터 행은 자동으로 자신의
+값을 반환합니다. 그 결과, 각 데이터 행은 자동으로 자신의
{@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID}
에 의해 자신이 속하는 새 {@link android.provider.ContactsContract.RawContacts} 행에 연결됩니다.
</p>
<p>
- 이메일 행을 추가하는 {@link android.content.ContentProviderOperation.Builder} 객체는
+ 이메일 행을 추가하는 {@link android.content.ContentProviderOperation.Builder} 객체는
양보 지점을 설정하는 {@link android.content.ContentProviderOperation.Builder#withYieldAllowed(boolean)
withYieldAllowed()}로 플래그 표시합니다.
</p>
@@ -1172,8 +1172,8 @@
ops.add(op.build());
</pre>
<p>
- 마지막 조각은 새로운 원시 연락처와 데이터 행을 삽입하는
-{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}에 대한 호출을
+ 마지막 조각은 새로운 원시 연락처와 데이터 행을 삽입하는
+{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}에 대한 호출을
나타낸 것입니다.
</p>
<pre>
@@ -1205,32 +1205,32 @@
}
</pre>
<p>
- 일괄 작업을 사용하면 <strong>낙관적 동시성 제어</strong>도 구현할 수 있습니다.
+ 일괄 작업을 사용하면 <strong>낙관적 동시성 제어</strong>도 구현할 수 있습니다.
이것은 기본 리포지토리를 잠그지 않고도 수정 트랜잭션을 적용할 수 있는 메서드입니다.
- 이 메서드를 사용하려면 트랜잭션을 적용하고 동시에 발생한
-다른 수정 사항이 있는지 확인합니다. 부합하지 않는 수정이 발생한 것을 발견하면
+ 이 메서드를 사용하려면 트랜잭션을 적용하고 동시에 발생한
+다른 수정 사항이 있는지 확인합니다. 부합하지 않는 수정이 발생한 것을 발견하면
트랜잭션을 롤백하고 다시 시도합니다.
</p>
<p>
- 낙관적 동시성 제어는 한 번에 한 명의 사용자만 존재하고 데이터 리포지토리에 대한 동시 액세스가 드문 모바일 기기에
-유용합니다. 잠금을 사용하지 않으므로
+ 낙관적 동시성 제어는 한 번에 한 명의 사용자만 존재하고 데이터 리포지토리에 대한 동시 액세스가 드문 모바일 기기에
+유용합니다. 잠금을 사용하지 않으므로
잠금을 설정하거나 다른 트랜잭션이 잠금을 해제하기를 기다리면서 시간을 낭비하지 않습니다.
</p>
<p>
- 하나의
+ 하나의
{@link android.provider.ContactsContract.RawContacts} 행을 업데이트하면서 동시에 낙관적 동시성 제어를 사용하려면, 다음 단계를 따르십시오.
</p>
<ol>
<li>
- 검색하는 다른 데이터와 함께 행 연락처의 {@link android.provider.ContactsContract.SyncColumns#VERSION}을
+ 검색하는 다른 데이터와 함께 행 연락처의 {@link android.provider.ContactsContract.SyncColumns#VERSION}을
검색합니다.
</li>
<li>
- 제약을 강제 적용하는 데 적합한
-{@link android.content.ContentProviderOperation.Builder} 객체를 하나 생성하되
-{@link android.content.ContentProviderOperation#newAssertQuery(Uri)} 메서드를 사용합니다. 콘텐츠 URI의 경우,
+ 제약을 강제 적용하는 데 적합한
+{@link android.content.ContentProviderOperation.Builder} 객체를 하나 생성하되
+{@link android.content.ContentProviderOperation#newAssertQuery(Uri)} 메서드를 사용합니다. 콘텐츠 URI의 경우,
{@link android.provider.ContactsContract.RawContacts#CONTENT_URI
- RawContacts.CONTENT_URI}를 사용하되
+ RawContacts.CONTENT_URI}를 사용하되
이에 추가된 원시 데이터의 {@code android.provider.BaseColumns#_ID}를 함께 씁니다.
</li>
<li>
@@ -1256,13 +1256,13 @@
</ol>
<p>
행을 읽고 수정하려고 시도하는 사이에 다른 작업이 원시 연락처 행을 업데이트하면,
-"어설션" {@link android.content.ContentProviderOperation}은
-실패하고 전체 일괄 작업이 취소됩니다. 그러면 일괄 작업을 다시 시도하거나
+"어설션" {@link android.content.ContentProviderOperation}은
+실패하고 전체 일괄 작업이 취소됩니다. 그러면 일괄 작업을 다시 시도하거나
다른 조치를 취하기로 선택할 수 있습니다.
</p>
<p>
- 다음 조각은 {@link android.content.CursorLoader}를 사용하여 단일 원시 연락처를 쿼리한 후
-"어설션" {@link android.content.ContentProviderOperation}을
+ 다음 조각은 {@link android.content.CursorLoader}를 사용하여 단일 원시 연락처를 쿼리한 후
+"어설션" {@link android.content.ContentProviderOperation}을
생성하는 방법을 나타낸 것입니다.
</p>
<pre>
@@ -1311,8 +1311,8 @@
</pre>
<h3 id="Intents">인텐트로 검색 및 수정</h3>
<p>
- 기기 연락처 애플리케이션에 인텐트를 전송하면 연락처 제공자에
-간접적으로 액세스할 수 있습니다. 인텐트는 기기의 연락처 애플리케이션 UI를 시작하고, 여기서 사용자는
+ 기기 연락처 애플리케이션에 인텐트를 전송하면 연락처 제공자에
+간접적으로 액세스할 수 있습니다. 인텐트는 기기의 연락처 애플리케이션 UI를 시작하고, 여기서 사용자는
연락처 관련 작업을 할 수 있습니다. 사용자가 이런 액세스 유형을 가지고 할 수 있는 일은 다음과 같습니다.
<ul>
<li>목록에서 연락처를 선택하고 추가 작업을 위해 앱에 반환시킵니다.</li>
@@ -1321,20 +1321,20 @@
<li>연락처 또는 연락처 데이터를 삭제합니다.</li>
</ul>
<p>
- 사용자가 데이터를 삽입하거나 업데이트하고 있다면, 먼저 데이터를 수집하고
+ 사용자가 데이터를 삽입하거나 업데이트하고 있다면, 먼저 데이터를 수집하고
인텐트의 일부로 전송할 수 있습니다.
</p>
<p>
- 인텐트를 사용하여 기기의 연락처 애플리케이션을 통해 연락처 제공자에 액세스하는 경우
-제공자에 액세스하기 위해 개발자 나름의 UI나 코드를 작성하지 않아도 됩니다. 제공자에 대한 읽기 또는 쓰기 권한도 요청하지 않아도
-됩니다. 기기 연락처 애플리케이션은
-연락처에 대한 읽기 권한을 위임할 수 있고, 다른 애플리케이션을 통해 수정하기 때문에
+ 인텐트를 사용하여 기기의 연락처 애플리케이션을 통해 연락처 제공자에 액세스하는 경우
+제공자에 액세스하기 위해 개발자 나름의 UI나 코드를 작성하지 않아도 됩니다. 제공자에 대한 읽기 또는 쓰기 권한도 요청하지 않아도
+됩니다. 기기 연락처 애플리케이션은
+연락처에 대한 읽기 권한을 위임할 수 있고, 다른 애플리케이션을 통해 수정하기 때문에
쓰기 권한도 필요 없습니다.
</p>
<p>
- 제공자에 액세스하기 위해 인텐트를 전송하는 일반적인 과정은
+ 제공자에 액세스하기 위해 인텐트를 전송하는 일반적인 과정은
"인텐트를 통한 데이터 액세스" 섹션의 <a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
-콘텐츠 제공자 기본 정보</a> 가이드에 상세히 설명되어 있습니다. 이용 가능한 작업에 대해 사용하는 동작,
+콘텐츠 제공자 기본 정보</a> 가이드에 상세히 설명되어 있습니다. 이용 가능한 작업에 대해 사용하는 동작,
MIME 유형 및 데이터 값은 표 4에 요약되어 있고,
{@link android.content.Intent#putExtra(String, String) putExtra()}와 함께 사용할 수 있는 추가 값은
@@ -1358,20 +1358,20 @@
다음 중 하나로 정해집니다.
<ul>
<li>
-{@link android.provider.ContactsContract.Contacts#CONTENT_URI Contacts.CONTENT_URI},
+{@link android.provider.ContactsContract.Contacts#CONTENT_URI Contacts.CONTENT_URI},
이는 연락처 목록을 표시합니다.
</li>
<li>
-{@link android.provider.ContactsContract.CommonDataKinds.Phone#CONTENT_URI Phone.CONTENT_URI},
+{@link android.provider.ContactsContract.CommonDataKinds.Phone#CONTENT_URI Phone.CONTENT_URI},
이는 원시 연락처에 대한 전화 번호 목록을 표시합니다.
</li>
<li>
{@link android.provider.ContactsContract.CommonDataKinds.StructuredPostal#CONTENT_URI
-StructuredPostal.CONTENT_URI},
+StructuredPostal.CONTENT_URI},
이는 원시 연락처에 대한 우편 주소 목록을 표시합니다.
</li>
<li>
-{@link android.provider.ContactsContract.CommonDataKinds.Email#CONTENT_URI Email.CONTENT_URI},
+{@link android.provider.ContactsContract.CommonDataKinds.Email#CONTENT_URI Email.CONTENT_URI},
이는 원시 연락처에 대한 이메일 주소 목록을 표시합니다.
</li>
</ul>
@@ -1380,15 +1380,15 @@
사용하지 않음
</td>
<td>
- 개발자가 제공하는 콘텐츠 URI에 따라 원시 연락처 목록이나 원시 연락처에서 가져온
+ 개발자가 제공하는 콘텐츠 URI에 따라 원시 연락처 목록이나 원시 연락처에서 가져온
데이터 목록을 표시합니다.
<p>
-
-{@link android.app.Activity#startActivityForResult(Intent, int) startActivityForResult()} 호출,
-이는 선택한 행의 콘텐츠 URI를 반환합니다. URI의 형태는
+
+{@link android.app.Activity#startActivityForResult(Intent, int) startActivityForResult()} 호출,
+이는 선택한 행의 콘텐츠 URI를 반환합니다. URI의 형태는
테이블의 콘텐츠 URI에 행의 <code>LOOKUP_ID</code>를 추가한 것입니다.
- 기기의 연락처 앱은 액티비티 수명 동안 이 콘텐츠 URI에
-읽기 및 쓰기 권한을 위임합니다. 자세한 내용은
+ 기기의 연락처 앱은 액티비티 수명 동안 이 콘텐츠 URI에
+읽기 및 쓰기 권한을 위임합니다. 자세한 내용은
<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
콘텐츠 제공자 기본 정보</a> 가이드를 참조하십시오.
</p>
@@ -1403,12 +1403,12 @@
RawContacts.CONTENT_TYPE}, 일련의 원시 연락처에 대한 MIME 유형입니다.
</td>
<td>
- 기기의 연락처 애플리케이션의 <strong>연락처 추가</strong> 화면을 표시합니다. 개발자가
-인텐트에 추가하는 추가 사항 값이 표시됩니다.
+ 기기의 연락처 애플리케이션의 <strong>연락처 추가</strong> 화면을 표시합니다. 개발자가
+인텐트에 추가하는 추가 사항 값이 표시됩니다.
{@link android.app.Activity#startActivityForResult(Intent, int) startActivityForResult()}와 함께 전송되는 경우,
-새로 추가된 원시 연락처의 콘텐츠 URI는
+새로 추가된 원시 연락처의 콘텐츠 URI는
"데이터" 필드의 {@link android.content.Intent} 인수에 있는 액티비티의 {@link android.app.Activity#onActivityResult(int, int, Intent) onActivityResult()}
-콜백 메서드로
+콜백 메서드로
다시 전달됩니다. 값을 가져오려면, {@link android.content.Intent#getData()}를 호출합니다.
</td>
</tr>
@@ -1416,16 +1416,16 @@
<td><strong>연락처 편집</strong></td>
<td>{@link android.content.Intent#ACTION_EDIT}</td>
<td>
- 연락처에 대한
-{@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}입니다. 편집자 액티비티를 사용하면 사용자가 이 연락처와 관련된 데이터를 어느 것이든
+ 연락처에 대한
+{@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}입니다. 편집자 액티비티를 사용하면 사용자가 이 연락처와 관련된 데이터를 어느 것이든
편집할 수 있습니다.
</td>
<td>
{@link android.provider.ContactsContract.Contacts#CONTENT_ITEM_TYPE
Contacts.CONTENT_ITEM_TYPE}, 하나의 연락처입니다.</td>
<td>
- 연락처 애플리케이션에 연락처 편집 화면을 표시합니다. 개발자가
-인텐트에 추가하는 추가 사항 값이 표시됩니다. 사용자가 <strong>완료</strong>를 클릭하여 편집 내용을 저장하면,
+ 연락처 애플리케이션에 연락처 편집 화면을 표시합니다. 개발자가
+인텐트에 추가하는 추가 사항 값이 표시됩니다. 사용자가 <strong>완료</strong>를 클릭하여 편집 내용을 저장하면,
액티비티가 전경으로 돌아옵니다.
</td>
</tr>
@@ -1439,31 +1439,31 @@
{@link android.provider.ContactsContract.Contacts#CONTENT_ITEM_TYPE}
</td>
<td>
- 이 인텐트는 항상 연락처 앱의 선택기 화면을 표시합니다. 사용자는
-편집할 연락처를 선택하거나 새 연락처를 추가할 수 있습니다. 사용자의 선택에 따라
-편집 또는 추가 화면이 나타나고 개발자가 인텐트에 전달하는 추가 사항 데이터가
-표시됩니다. 앱이 이메일이나 전화 번호 등의 연락처 데이터를 표시하는 경우,
-이 인텐트를 사용하면 사용자가 기존 연락처에 데이터를 추가할 수
+ 이 인텐트는 항상 연락처 앱의 선택기 화면을 표시합니다. 사용자는
+편집할 연락처를 선택하거나 새 연락처를 추가할 수 있습니다. 사용자의 선택에 따라
+편집 또는 추가 화면이 나타나고 개발자가 인텐트에 전달하는 추가 사항 데이터가
+표시됩니다. 앱이 이메일이나 전화 번호 등의 연락처 데이터를 표시하는 경우,
+이 인텐트를 사용하면 사용자가 기존 연락처에 데이터를 추가할 수
있습니다.
<p class="note">
- <strong>참고:</strong> 이 인텐트의 추가 사항에서는 이름 값을 전송하지 않아도 됩니다.
-사용자가 항상 기존의 이름을 선택하거나 새 이름을 추가하기 때문입니다. 게다가,
-개발자가 이름을 전송하고 사용자가 편집을 선택하면 연락처 앱은 개발자가 전송한 이름을 표시하면서
-이전 값을 재정의하게 됩니다. 사용자가
+ <strong>참고:</strong> 이 인텐트의 추가 사항에서는 이름 값을 전송하지 않아도 됩니다.
+사용자가 항상 기존의 이름을 선택하거나 새 이름을 추가하기 때문입니다. 게다가,
+개발자가 이름을 전송하고 사용자가 편집을 선택하면 연락처 앱은 개발자가 전송한 이름을 표시하면서
+이전 값을 재정의하게 됩니다. 사용자가
이를 눈치채지 못하고 편집 내용을 저장하면 이전 값은 손실됩니다.
</p>
</td>
</tr>
</table>
<p>
- 기기의 연락처 앱은 개발자가 인텐트로 원시 연락처 또는 그에 속한 모든 데이터를 삭제하도록
-허용하지 않습니다. 대신, 원시 연락처를 삭제하려면
-{@link android.content.ContentResolver#delete(Uri, String, String[]) ContentResolver.delete()}
+ 기기의 연락처 앱은 개발자가 인텐트로 원시 연락처 또는 그에 속한 모든 데이터를 삭제하도록
+허용하지 않습니다. 대신, 원시 연락처를 삭제하려면
+{@link android.content.ContentResolver#delete(Uri, String, String[]) ContentResolver.delete()}
또는 {@link android.content.ContentProviderOperation#newDelete(Uri)
ContentProviderOperation.newDelete()}를 사용합니다.
</p>
<p>
- 다음 조각은 새로운 원시 연락처와
+ 다음 조각은 새로운 원시 연락처와
데이터를 삽입하는 인텐트를 구성, 전송하는 방법을 나타낸 것입니다.
</p>
<pre>
@@ -1560,65 +1560,65 @@
</pre>
<h3 id="DataIntegrity">데이터 무결성</h3>
<p>
- 연락처 리포지토리에는 사용자 측에서 올바르고 최신일 것으로 기대하는 중요하고 민감한 데이터가 들어있으므로
-연락처 제공자는 데이터 무결성에 대한 잘 정의된 규칙이 있습니다. 개발자
-여러분에게는 연락처 데이터를 수정할 때 이와 같은 규칙을 준수할 의무가 있습니다. 아래에는 중요한 규칙을
+ 연락처 리포지토리에는 사용자 측에서 올바르고 최신일 것으로 기대하는 중요하고 민감한 데이터가 들어있으므로
+연락처 제공자는 데이터 무결성에 대한 잘 정의된 규칙이 있습니다. 개발자
+여러분에게는 연락처 데이터를 수정할 때 이와 같은 규칙을 준수할 의무가 있습니다. 아래에는 중요한 규칙을
몇 가지 나열해 놓았습니다.
</p>
<dl>
<dt>
- {@link android.provider.ContactsContract.RawContacts} 행을 추가할 때마다 언제나
+ {@link android.provider.ContactsContract.RawContacts} 행을 추가할 때마다 언제나
{@link android.provider.ContactsContract.CommonDataKinds.StructuredName} 행을 추가합니다.
</dt>
<dd>
- {@link android.provider.ContactsContract.Data} 테이블에 {@link android.provider.ContactsContract.CommonDataKinds.StructuredName} 행이 없는 {@link android.provider.ContactsContract.RawContacts} 행이 있으면
+ {@link android.provider.ContactsContract.Data} 테이블에 {@link android.provider.ContactsContract.CommonDataKinds.StructuredName} 행이 없는 {@link android.provider.ContactsContract.RawContacts} 행이 있으면
통합 과정에서
문제가 발생할 수 있습니다.
</dd>
<dt>
- 언제나 새로운 {@link android.provider.ContactsContract.Data} 행을
+ 언제나 새로운 {@link android.provider.ContactsContract.Data} 행을
해당 상위 {@link android.provider.ContactsContract.RawContacts} 행에 연결합니다.
</dt>
<dd>
- {@link android.provider.ContactsContract.RawContacts}에 연결되지 않은 {@link android.provider.ContactsContract.Data} 행은
-기기 연락처 애플리케이션에 표시되지 않고,
+ {@link android.provider.ContactsContract.RawContacts}에 연결되지 않은 {@link android.provider.ContactsContract.Data} 행은
+기기 연락처 애플리케이션에 표시되지 않고,
동기화 어댑터에서 문제를 발생시킬 수 있습니다.
</dd>
<dt>
개발자 본인의 소유인 원시 연락처에 대한 데이터만 변경하십시오.
</dt>
<dd>
- 연락처 제공자는 보통 여러 가지 서로 다른 계정 유형/온라인 서비스에서 가져온
-데이터를 관리한다는 점을 명심하십시오. 개발자의 애플리케이션은 본인에게
-속한 행에 대한 데이터만 수정 또는 삭제하도록 확실히 해두어야 하며, 데이터를 삽입할 때에도 개발자 본인이
+ 연락처 제공자는 보통 여러 가지 서로 다른 계정 유형/온라인 서비스에서 가져온
+데이터를 관리한다는 점을 명심하십시오. 개발자의 애플리케이션은 본인에게
+속한 행에 대한 데이터만 수정 또는 삭제하도록 확실히 해두어야 하며, 데이터를 삽입할 때에도 개발자 본인이
제어하는 계정 유형과 이름만 사용해야 합니다.
</dd>
<dt>
- 권한, 콘텐츠 URI, URI 경로, 열 이름, MIME 유형 및
-{@link android.provider.ContactsContract.CommonDataKinds.CommonColumns#TYPE} 값에 대해서는 항상
+ 권한, 콘텐츠 URI, URI 경로, 열 이름, MIME 유형 및
+{@link android.provider.ContactsContract.CommonDataKinds.CommonColumns#TYPE} 값에 대해서는 항상
{@link android.provider.ContactsContract} 및 그 하위 클래스에서 정의한 상수를 사용합니다.
</dt>
<dd>
- 이런 상수를 사용하면 오류를 피하는 데 도움이 됩니다. 이런 상수 중 하나라도 사용하지 않게 되는 경우 컴파일러로부터
+ 이런 상수를 사용하면 오류를 피하는 데 도움이 됩니다. 이런 상수 중 하나라도 사용하지 않게 되는 경우 컴파일러로부터
알림을 받기도 합니다.
</dd>
</dl>
<h3 id="CustomData">사용자 지정 데이터 행</h3>
<p>
사용자 지정 MIME 유형을 생성하여 사용하면,
-{@link android.provider.ContactsContract.Data} 테이블에 있는 본인의 데이터 행을 삽입, 편집, 삭제 및 검색할 수 있습니다. 개발자의 행은
-{@link android.provider.ContactsContract.DataColumns}에서
-정의된 열만 사용하도록 제한되어 있습니다. 다만 나름의 유형별 열 이름을
-기본 열 이름에 매핑할 수는 있습니다. 기기의 연락처 애플리케이션에서는
-개발자의 행에 대한 데이터가 표시는 되지만 편집이나 삭제는 할 수 없고, 사용자가 추가 데이터를
-추가할 수도 없습니다. 사용자가 개발자의 사용자 지정 데이터 행을 수정하도록 허용하려면, 본인의 애플리케이션에
+{@link android.provider.ContactsContract.Data} 테이블에 있는 본인의 데이터 행을 삽입, 편집, 삭제 및 검색할 수 있습니다. 개발자의 행은
+{@link android.provider.ContactsContract.DataColumns}에서
+정의된 열만 사용하도록 제한되어 있습니다. 다만 나름의 유형별 열 이름을
+기본 열 이름에 매핑할 수는 있습니다. 기기의 연락처 애플리케이션에서는
+개발자의 행에 대한 데이터가 표시는 되지만 편집이나 삭제는 할 수 없고, 사용자가 추가 데이터를
+추가할 수도 없습니다. 사용자가 개발자의 사용자 지정 데이터 행을 수정하도록 허용하려면, 본인의 애플리케이션에
편집기 액티비티를 제공해야 합니다.
</p>
<p>
- 개발자의 사용자 지정 데이터를 표시하려면, <code><ContactsAccountType></code> 요소와 하나 이상의 <code><ContactsDataKind></code> 하위 요소를 포함하는 <code>contacts.xml</code> 파일을
+ 개발자의 사용자 지정 데이터를 표시하려면, <code><ContactsAccountType></code> 요소와 하나 이상의 <code><ContactsDataKind></code> 하위 요소를 포함하는 <code>contacts.xml</code> 파일을
제공합니다.
- 이 내용은
+ 이 내용은
<a href="#SocialStreamDataKind"><code><ContactsDataKind> element</code></a> 섹션에 자세히 설명되어 있습니다.
</p>
<p>
@@ -1628,15 +1628,15 @@
</p>
<h2 id="SyncAdapters">연락처 제공자 동기화 어댑터</h2>
<p>
- 연락처 제공자는 기기와 온라인 서비스 사이에서 연락처 데이터의 <strong>동기화</strong>를
-처리한다는 구체적인 목적을 두고 디자인된 것입니다. 이것을 사용하면 사용자가 기존의
+ 연락처 제공자는 기기와 온라인 서비스 사이에서 연락처 데이터의 <strong>동기화</strong>를
+처리한다는 구체적인 목적을 두고 디자인된 것입니다. 이것을 사용하면 사용자가 기존의
데이터를 새 기기에 다운로드할 수도 있고, 기존의 데이터를 새 계정에 업로드할 수도 있습니다.
- 동기화를 사용하면 사용자가 추가나 변경의 출처와 관계 없이 최신 데이터를
-편리하게 사용할 수 있게 보장하기도 합니다. 동기화의 또 다른 장점은
+ 동기화를 사용하면 사용자가 추가나 변경의 출처와 관계 없이 최신 데이터를
+편리하게 사용할 수 있게 보장하기도 합니다. 동기화의 또 다른 장점은
기기가 네트워크에 연결되어 있지 않더라도 연락처 데이터를 사용할 수 있다는 것입니다.
</p>
<p>
- 다양한 방식으로 동기화를 구현할 수 있지만, Android 시스템은
+ 다양한 방식으로 동기화를 구현할 수 있지만, Android 시스템은
플러그인 동기화 프레임워크를 제공하여 다음과 같은 작업들을 자동화해줍니다.
<ul>
@@ -1651,40 +1651,40 @@
</li>
</ul>
<p>
- 이 프레임워크를 사용하려면 동기화 어댑터 플러그인은 개발자가 직접 제공해야 합니다. 동기화 어댑터는
-서비스와 콘텐츠 제공자마다 각기 다르지만, 같은 서비스에 대해 여러 개의 계정 이름을 처리할 수 있습니다. 이
+ 이 프레임워크를 사용하려면 동기화 어댑터 플러그인은 개발자가 직접 제공해야 합니다. 동기화 어댑터는
+서비스와 콘텐츠 제공자마다 각기 다르지만, 같은 서비스에 대해 여러 개의 계정 이름을 처리할 수 있습니다. 이
프레임워크 또한 같은 서비스와 제공자에 대해 여러 개의 동기화 어댑터를 허용합니다.
</p>
<h3 id="SyncClassesFiles">동기화 어댑터 클래스 및 파일</h3>
<p>
- 동기화 어댑터를
-{@link android.content.AbstractThreadedSyncAdapter}의
-하위 클래스로 구현하고 이를Android 애플리케이션의 일부로 설치합니다. 시스템은 애플리케이션 매니페스트의 요소와 매니페스트가 가리키는
-특수 XML 파일에서 동기화 어댑터에 관한 정보를 얻습니다. XML 파일은
-온라인 서비스와 콘텐츠 제공자의 권한에 대한 계정 유형을 정의하고,
-이들이 함께 어댑터를 고유하게 식별합니다. 동기화 어댑터가 활성화되려면 사용자가
-동기화 어댑터의 계정 유형에 대해 계정을 추가하고 해당 동기화 어댑터와 동기화하는 콘텐츠 제공자의 동기화를
-활성화해야 합니다. 이 시점에서, 시스템이 어댑터 관리를 시작하고,
+ 동기화 어댑터를
+{@link android.content.AbstractThreadedSyncAdapter}의
+하위 클래스로 구현하고 이를Android 애플리케이션의 일부로 설치합니다. 시스템은 애플리케이션 매니페스트의 요소와 매니페스트가 가리키는
+특수 XML 파일에서 동기화 어댑터에 관한 정보를 얻습니다. XML 파일은
+온라인 서비스와 콘텐츠 제공자의 권한에 대한 계정 유형을 정의하고,
+이들이 함께 어댑터를 고유하게 식별합니다. 동기화 어댑터가 활성화되려면 사용자가
+동기화 어댑터의 계정 유형에 대해 계정을 추가하고 해당 동기화 어댑터와 동기화하는 콘텐츠 제공자의 동기화를
+활성화해야 합니다. 이 시점에서, 시스템이 어댑터 관리를 시작하고,
콘텐츠 제공자와 서버 사이에서 동기화가 필요할 때 이를 호출합니다.
</p>
<p class="note">
- <strong>참고:</strong> 계정 유형을 동기화 어댑터 식별의 일부로 사용하면
-시스템이 동일한 같은 조직에서 여러 서비스에 액세스하는 동기화 어댑터를
-감지하고 그룹화할 수 있습니다. 예를 들어, Google 온라인 서비스의 동기화 어댑터는 계정 유형이 모두
-<code>com.google</code>로 같습니다. 사용자가 기기에 Google 계정을 추가하면,
-Google 서비스에 설치된 모든 동기화 어댑터가 함께 목록으로 표시됩니다. 목록에 게재된 각 동기화는
+ <strong>참고:</strong> 계정 유형을 동기화 어댑터 식별의 일부로 사용하면
+시스템이 동일한 같은 조직에서 여러 서비스에 액세스하는 동기화 어댑터를
+감지하고 그룹화할 수 있습니다. 예를 들어, Google 온라인 서비스의 동기화 어댑터는 계정 유형이 모두
+<code>com.google</code>로 같습니다. 사용자가 기기에 Google 계정을 추가하면,
+Google 서비스에 설치된 모든 동기화 어댑터가 함께 목록으로 표시됩니다. 목록에 게재된 각 동기화는
기기에서 각기 다른 콘텐츠 제공자와 동기화합니다.
</p>
<p>
- 대부분의 서비스에서는 사용자가 데이터에 액세스하기 전에
-ID를 확인해야 하기 때문에 Android에서는 동기화 어댑터 프레임워크와 비슷하면서 종종 이와 함께 쓰이기도 하는
-인증 프레임워크를 제공합니다. 인증 프레임워크는
-{@link android.accounts.AbstractAccountAuthenticator}의 하위 클래스인
-플러그인 인증자를 사용합니다. 인증자는 다음 절차에 따라
+ 대부분의 서비스에서는 사용자가 데이터에 액세스하기 전에
+ID를 확인해야 하기 때문에 Android에서는 동기화 어댑터 프레임워크와 비슷하면서 종종 이와 함께 쓰이기도 하는
+인증 프레임워크를 제공합니다. 인증 프레임워크는
+{@link android.accounts.AbstractAccountAuthenticator}의 하위 클래스인
+플러그인 인증자를 사용합니다. 인증자는 다음 절차에 따라
사용자의 ID를 확인합니다.
<ol>
<li>
- 사용자 이름, 암호 또는 유사한 정보(사용자의
+ 사용자 이름, 암호 또는 유사한 정보(사용자의
<strong>자격 증명</strong>)를 수집합니다.
</li>
<li>
@@ -1695,9 +1695,9 @@
</li>
</ol>
<p>
- 서비스가 자격 증명을 수락하면
-인증자가 자격 증명을 저장하여 나중에 사용할 수 있습니다. 플러그인 인증자 프레임워크로 인해,
-{@link android.accounts.AccountManager}는 Oauth2 authToken과 같이 인증자가 지원하고 노출하기로 선택하는 모든 authToken에 액세스를
+ 서비스가 자격 증명을 수락하면
+인증자가 자격 증명을 저장하여 나중에 사용할 수 있습니다. 플러그인 인증자 프레임워크로 인해,
+{@link android.accounts.AccountManager}는 Oauth2 authToken과 같이 인증자가 지원하고 노출하기로 선택하는 모든 authToken에 액세스를
제공합니다.
</p>
<p>
@@ -1706,18 +1706,18 @@
</p>
<h3 id="SyncAdapterImplementing">동기화 어댑터 구현</h3>
<p>
- 연락처 제공자에 대한 동기화 어댑터를 구현하려면,
+ 연락처 제공자에 대한 동기화 어댑터를 구현하려면,
다음이 들어있는 Android 애플리케이션을 생성하는 것으로 시작합니다.
</p>
<dl>
<dt>
- 시스템의 요청에 응답하여 동기화 어댑터에 바인딩하는 {@link android.app.Service}
+ 시스템의 요청에 응답하여 동기화 어댑터에 바인딩하는 {@link android.app.Service}
구성 요소.
</dt>
<dd>
- 시스템이 동기화를 실행하고자 하는 경우, 이는
+ 시스템이 동기화를 실행하고자 하는 경우, 이는
서비스의 {@link android.app.Service#onBind(Intent) onBind()} 메서드를 호출하여
-동기화 어댑터의 {@link android.os.IBinder}를 가져옵니다. 이렇게 하면 시스템이 어댑터의
+동기화 어댑터의 {@link android.os.IBinder}를 가져옵니다. 이렇게 하면 시스템이 어댑터의
메서드에 대해 프로세스간 호출을 수행할 수 있습니다.
<p>
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">
@@ -1726,18 +1726,18 @@
</p>
</dd>
<dt>
- {@link android.content.AbstractThreadedSyncAdapter}의
+ {@link android.content.AbstractThreadedSyncAdapter}의
하위 클래스로 구현된 실제 동기화 어댑터.
</dt>
<dd>
- 이 클래스는 서버에서 데이터를 다운로드하고, 기기에서 데이터를 업로드하고,
-충돌을 해결하는 작업을 수행합니다. 어댑터의 주요 작업은
+ 이 클래스는 서버에서 데이터를 다운로드하고, 기기에서 데이터를 업로드하고,
+충돌을 해결하는 작업을 수행합니다. 어댑터의 주요 작업은
{@link android.content.AbstractThreadedSyncAdapter#onPerformSync(
Account, Bundle, String, ContentProviderClient, SyncResult)
onPerformSync()} 메서드에서 실행합니다. 이 클래스는 반드시 단일 항목으로 인스턴트화해야 합니다.
<p>
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">
-샘플 동기화 어댑터</a> 샘플 앱에서 동기화 어댑터는
+샘플 동기화 어댑터</a> 샘플 앱에서 동기화 어댑터는
<code>com.example.android.samplesync.syncadapter.SyncAdapter</code> 클래스에서 정의됩니다.
</p>
</dd>
@@ -1745,23 +1745,23 @@
{@link android.app.Application}의 하위 클래스.
</dt>
<dd>
- 이 클래스는 동기화 어댑터 단일 항목의 팩터리 역할을 합니다.
-{@link android.app.Application#onCreate()} 메서드는
-동기화 어댑터를 인스턴트화하고, 단일 항목을 동기화 어댑터 서비스의
-{@link android.app.Service#onBind(Intent) onBind()} 메서드에 반환할 정적 "getter" 메서드를 제공하는 데
+ 이 클래스는 동기화 어댑터 단일 항목의 팩터리 역할을 합니다.
+{@link android.app.Application#onCreate()} 메서드는
+동기화 어댑터를 인스턴트화하고, 단일 항목을 동기화 어댑터 서비스의
+{@link android.app.Service#onBind(Intent) onBind()} 메서드에 반환할 정적 "getter" 메서드를 제공하는 데
사용하십시오.
</dd>
<dt>
- <strong>선택 항목:</strong> 사용자 인증에 대한 시스템으로부터의 요청에 응답하는 {@link android.app.Service}
+ <strong>선택 항목:</strong> 사용자 인증에 대한 시스템으로부터의 요청에 응답하는 {@link android.app.Service}
구성 요소.
</dt>
<dd>
- {@link android.accounts.AccountManager}가 이 서비스를 시작하여 인증
-절차를 시작합니다. 서비스의 {@link android.app.Service#onCreate()} 메서드가
-인증자 객체를 인스턴트화합니다. 시스템이 애플리케이션 동기화 어댑터의 사용자 계정을 인증하고자 하는 경우,
-시스템은 서비스의
-{@link android.app.Service#onBind(Intent) onBind()} 메서드를 호출하여
-인증자의 {@link android.os.IBinder}를 가져옵니다. 이렇게 하면 시스템이 인증자의
+ {@link android.accounts.AccountManager}가 이 서비스를 시작하여 인증
+절차를 시작합니다. 서비스의 {@link android.app.Service#onCreate()} 메서드가
+인증자 객체를 인스턴트화합니다. 시스템이 애플리케이션 동기화 어댑터의 사용자 계정을 인증하고자 하는 경우,
+시스템은 서비스의
+{@link android.app.Service#onBind(Intent) onBind()} 메서드를 호출하여
+인증자의 {@link android.os.IBinder}를 가져옵니다. 이렇게 하면 시스템이 인증자의
메서드에 대해 프로세스간 호출을 수행할 수 있습니다.
<p>
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">
@@ -1770,18 +1770,18 @@
</p>
</dd>
<dt>
- <strong>선택 항목:</strong> 인증에 대한 요청을 처리하는
-{@link android.accounts.AbstractAccountAuthenticator}의 구체적인
+ <strong>선택 항목:</strong> 인증에 대한 요청을 처리하는
+{@link android.accounts.AbstractAccountAuthenticator}의 구체적인
하위 클래스.
</dt>
<dd>
- 이 클래스는 {@link android.accounts.AccountManager}가
-서버로 사용자 자격 증명 인증을 호출하는 메서드를 제공합니다. 인증 절차의 세부 사항은
-사용하는 서버 기술에 따라 매우 차이가 있습니다. 인증에 대한
+ 이 클래스는 {@link android.accounts.AccountManager}가
+서버로 사용자 자격 증명 인증을 호출하는 메서드를 제공합니다. 인증 절차의 세부 사항은
+사용하는 서버 기술에 따라 매우 차이가 있습니다. 인증에 대한
자세한 정보는 각자의 서버 소프트웨어에 해당되는 관련 문서를 참조하십시오.
<p>
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">
-샘플 동기화 어댑터</a> 샘플 앱에서 인증자는
+샘플 동기화 어댑터</a> 샘플 앱에서 인증자는
<code>com.example.android.samplesync.authenticator.Authenticator</code> 클래스에서 정의됩니다.
</p>
</dd>
@@ -1789,31 +1789,31 @@
동기화 어댑터와 서버의 인증자를 정의하는 XML 파일.
</dt>
<dd>
- 이전에 설명한 동기화 어댑터와 인증자 서비스 구성 요소는
-애플리케이션 매니페스트의
-<code><<a href="{@docRoot}guide/topics/manifest/service-element.html">service</a>></code> 요소에서
-정의합니다. 이런 요소에는
-시스템에 특정 데이터를 제공하는
+ 이전에 설명한 동기화 어댑터와 인증자 서비스 구성 요소는
+애플리케이션 매니페스트의
+<code><<a href="{@docRoot}guide/topics/manifest/service-element.html">service</a>></code> 요소에서
+정의합니다. 이런 요소에는
+시스템에 특정 데이터를 제공하는
<code><<a href="{@docRoot}guide/topics/manifest/meta-data-element.html">meta-data</a>></code>
-하위 요소가
+하위 요소가
들어있습니다.
<ul>
<li>
- 동기화 어댑터 서비스에 대한
+ 동기화 어댑터 서비스에 대한
<code><<a href="{@docRoot}guide/topics/manifest/meta-data-element.html">meta-data</a>></code>
-요소는
-XML 파일 <code>res/xml/syncadapter.xml</code>을 가리킵니다. 그런가 하면
-이 파일은 연락처 제공자와 동기화될 웹 서비스에 대한 URI와 웹 서비스에 대한 계정 유형을
+요소는
+XML 파일 <code>res/xml/syncadapter.xml</code>을 가리킵니다. 그런가 하면
+이 파일은 연락처 제공자와 동기화될 웹 서비스에 대한 URI와 웹 서비스에 대한 계정 유형을
나타냅니다.
</li>
<li>
- <strong>선택 항목:</strong> 인증자의
+ <strong>선택 항목:</strong> 인증자의
<code><<a href="{@docRoot}guide/topics/manifest/meta-data-element.html">meta-data</a>></code>
-요소는 XML 파일
-<code>res/xml/authenticator.xml</code>을 가리킵니다. 이 파일은 다시
-이 인증이 지원하는 계정 유형과, 인증 과정 중에 표시되는 UI 리소스를
-나타냅니다. 이 요소에서 지정한 계정 유형은 반드시
-동기화 어댑터에 대해 지정된 계정 유형과
+요소는 XML 파일
+<code>res/xml/authenticator.xml</code>을 가리킵니다. 이 파일은 다시
+이 인증이 지원하는 계정 유형과, 인증 과정 중에 표시되는 UI 리소스를
+나타냅니다. 이 요소에서 지정한 계정 유형은 반드시
+동기화 어댑터에 대해 지정된 계정 유형과
같아야 합니다.
</li>
</ul>
@@ -1821,18 +1821,18 @@
</dl>
<h2 id="SocialStream">소셜 스트림 데이터</h2>
<p>
- {@code android.provider.ContactsContract.StreamItems}와
-{@code android.provider.ContactsContract.StreamItemPhotos} 테이블은
-소셜 네트워크에서 수신하는 데이터를 관리합니다. 개발자는 본인의 네트워크의 스트림 데이터를 이 테이블에 추가하는
-동기화 어댑터를 작성할 수도 있고, 이 테이블에서 스트림 데이터를 읽어서
-본인의 애플리케이션에 표시할 수도 있으며 두 가지를 모두 해도 됩니다. 이 기능을 사용하면 소셜 네트워킹
+ {@code android.provider.ContactsContract.StreamItems}와
+{@code android.provider.ContactsContract.StreamItemPhotos} 테이블은
+소셜 네트워크에서 수신하는 데이터를 관리합니다. 개발자는 본인의 네트워크의 스트림 데이터를 이 테이블에 추가하는
+동기화 어댑터를 작성할 수도 있고, 이 테이블에서 스트림 데이터를 읽어서
+본인의 애플리케이션에 표시할 수도 있으며 두 가지를 모두 해도 됩니다. 이 기능을 사용하면 소셜 네트워킹
서비스와 애플리케이션을 Android의 소셜 네트워킹 환경에 통합할 수 있습니다.
</p>
<h3 id="StreamText">소셜 스트림 텍스트</h3>
<p>
- 스트림 항목은 항상 원시 연락처와 연관됩니다.
-{@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}는
-원시 연락처의 <code>_ID</code> 값과 연관됩니다. 원시 연락처의 계정 유형과 계정 이름도
+ 스트림 항목은 항상 원시 연락처와 연관됩니다.
+{@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}는
+원시 연락처의 <code>_ID</code> 값과 연관됩니다. 원시 연락처의 계정 유형과 계정 이름도
스트림 항목 행에 저장됩니다.
</p>
<p>
@@ -1843,36 +1843,36 @@
{@code android.provider.ContactsContract.StreamItemsColumns#ACCOUNT_TYPE}
</dt>
<dd>
- <strong>필수입니다.</strong> 이 스트림 항목과 연관된 원시 연락처에 대한
+ <strong>필수입니다.</strong> 이 스트림 항목과 연관된 원시 연락처에 대한
사용자 계정입니다. 스트림 항목을 삽입할 때 이 값을 설정하는 것을 잊지 마십시오.
</dd>
<dt>
{@code android.provider.ContactsContract.StreamItemsColumns#ACCOUNT_NAME}
</dt>
<dd>
- <strong>필수입니다.</strong> 이 스트림 항목과 연관된 원시 연락처에 대한
+ <strong>필수입니다.</strong> 이 스트림 항목과 연관된 원시 연락처에 대한
사용자 계정 이름입니다. 스트림 항목을 삽입할 때 이 값을 설정하는 것을 잊지 마십시오.
</dd>
<dt>
식별자 열
</dt>
<dd>
- <strong>필수입니다.</strong> 스트림 항목을 삽입할 때
+ <strong>필수입니다.</strong> 스트림 항목을 삽입할 때
다음 식별자 열을 삽입해야 합니다.
<ul>
<li>
- {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_ID}: 이
-스트림 항목과 연관된 연락처의 {@code android.provider.BaseColumns#_ID}
+ {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_ID}: 이
+스트림 항목과 연관된 연락처의 {@code android.provider.BaseColumns#_ID}
값입니다.
</li>
<li>
- {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_LOOKUP_KEY}: 이
-스트림 항목과 연관된 연락처의 {@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}
+ {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_LOOKUP_KEY}: 이
+스트림 항목과 연관된 연락처의 {@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}
값입니다.
</li>
<li>
- {@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}: 이
-스트림 항목과 연관된 원시 연락처의 {@code android.provider.BaseColumns#_ID}
+ {@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}: 이
+스트림 항목과 연관된 원시 연락처의 {@code android.provider.BaseColumns#_ID}
값입니다.
</li>
</ul>
@@ -1887,19 +1887,19 @@
{@code android.provider.ContactsContract.StreamItemsColumns#TEXT}
</dt>
<dd>
- 스트림 항목의 텍스트로, 항목의 소스가 게시한 콘텐츠 또는
-스트림 항목을 생성하는 작업의 설명 중 하나입니다. 이 열에는
-{@link android.text.Html#fromHtml(String) fromHtml()}가 렌더링할 수 있는 모든 서식과 포함된 리소스 이미지가
-들어있을 수 있습니다. 제공자는 긴 콘텐츠를
+ 스트림 항목의 텍스트로, 항목의 소스가 게시한 콘텐츠 또는
+스트림 항목을 생성하는 작업의 설명 중 하나입니다. 이 열에는
+{@link android.text.Html#fromHtml(String) fromHtml()}가 렌더링할 수 있는 모든 서식과 포함된 리소스 이미지가
+들어있을 수 있습니다. 제공자는 긴 콘텐츠를
자르거나 생략할 수 있지만, 가능하면 태그를 손상시키는 것은 피하려 듭니다.
</dd>
<dt>
{@code android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP}
</dt>
<dd>
- 스트림 항목이 삽입되거나 업데이트된 시간이 들어있는 텍스트 문자열로, 형식은
-epoch 이후 <em>밀리초</em> 형태를 취합니다. 이 열을 관리할 책임은
-스트림 항목을 삽입 또는 업데이트하는 애플리케이션에 있으며, 이것은 연락처 제공자가 자동으로
+ 스트림 항목이 삽입되거나 업데이트된 시간이 들어있는 텍스트 문자열로, 형식은
+epoch 이후 <em>밀리초</em> 형태를 취합니다. 이 열을 관리할 책임은
+스트림 항목을 삽입 또는 업데이트하는 애플리케이션에 있으며, 이것은 연락처 제공자가 자동으로
유지 관리하지 않습니다.
</dd>
</dl>
@@ -1911,18 +1911,18 @@
리소스를 연결하십시오.
</p>
<p>
- {@code android.provider.ContactsContract.StreamItems} 테이블에도
+ {@code android.provider.ContactsContract.StreamItems} 테이블에도
동기화 어댑터가 독점적으로 사용하는 {@code android.provider.ContactsContract.StreamItemsColumns#SYNC1}에서
-{@code android.provider.ContactsContract.StreamItemsColumns#SYNC4}까지의 열이
+{@code android.provider.ContactsContract.StreamItemsColumns#SYNC4}까지의 열이
들어있습니다.
</p>
<h3 id="StreamPhotos">소셜 스트림 사진</h3>
<p>
- {@code android.provider.ContactsContract.StreamItemPhotos} 테이블은 스트림 항목과 연관된
-사진을 저장합니다. 테이블의
+ {@code android.provider.ContactsContract.StreamItemPhotos} 테이블은 스트림 항목과 연관된
+사진을 저장합니다. 테이블의
{@code android.provider.ContactsContract.StreamItemPhotosColumns#STREAM_ITEM_ID} 열은
-{@code android.provider.ContactsContract.StreamItems} 테이블의 {@code android.provider.BaseColumns#_ID} 열에 있는 값과
-연결됩니다. 사진 참조는
+{@code android.provider.ContactsContract.StreamItems} 테이블의 {@code android.provider.BaseColumns#_ID} 열에 있는 값과
+연결됩니다. 사진 참조는
다음 열의 테이블에 저장됩니다.
</p>
<dl>
@@ -1931,21 +1931,21 @@
</dt>
<dd>
사진의 바이너리 표현으로, 제공자가 저장하고 표시하기 위해 크기를 조정한 것입니다.
- 이 열은 사진을 저장하는 데 사용한 연락처 제공자의 이전 버전과
-호환됩니다. 그러나 현재 버전에서는
-이 열을 사진 저장에 사용하면 안 됩니다. 대신,
-{@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID} 또는
+ 이 열은 사진을 저장하는 데 사용한 연락처 제공자의 이전 버전과
+호환됩니다. 그러나 현재 버전에서는
+이 열을 사진 저장에 사용하면 안 됩니다. 대신,
+{@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID} 또는
{@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_URI}(
-다음 항목에서 두 가지 모두 설명)를 사용하여 사진을 파일로 저장합니다. 지금 이 열에는
+다음 항목에서 두 가지 모두 설명)를 사용하여 사진을 파일로 저장합니다. 지금 이 열에는
사진의 미리 보기가 들어있어 읽기 작업에 사용할 수 있습니다.
</dd>
<dt>
{@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID}
</dt>
<dd>
- 원시 연락처에 대한 사진의 숫자 식별자입니다. 이 값을
-상수 {@link android.provider.ContactsContract.DisplayPhoto#CONTENT_URI DisplayPhoto.CONTENT_URI}에 추가하여
-하나의 사진 파일을 가리키는 콘텐츠 URI를 가져온 다음,
+ 원시 연락처에 대한 사진의 숫자 식별자입니다. 이 값을
+상수 {@link android.provider.ContactsContract.DisplayPhoto#CONTENT_URI DisplayPhoto.CONTENT_URI}에 추가하여
+하나의 사진 파일을 가리키는 콘텐츠 URI를 가져온 다음,
{@link android.content.ContentResolver#openAssetFileDescriptor(Uri, String)
openAssetFileDescriptor()}를 호출하여 사진 파일에 대한 핸들을 가져옵니다.
</dd>
@@ -1965,91 +1965,91 @@
<ul>
<li>
이 테이블에는 추가 액세스 권한이 필요합니다. 여기서 읽기 작업을 수행하려면 애플리케이션에
-{@code android.Manifest.permission#READ_SOCIAL_STREAM} 권한이 있어야 합니다. 여기서 수정 작업을 수행하려면
+{@code android.Manifest.permission#READ_SOCIAL_STREAM} 권한이 있어야 합니다. 여기서 수정 작업을 수행하려면
애플리케이션에
{@code android.Manifest.permission#WRITE_SOCIAL_STREAM} 권한이 있어야 합니다.
</li>
<li>
- {@code android.provider.ContactsContract.StreamItems} 테이블의 경우, 각 원시 연락처에 저장되는
-행 개수가 제한되어 있습니다. 이 한계에 도달하면,
+ {@code android.provider.ContactsContract.StreamItems} 테이블의 경우, 각 원시 연락처에 저장되는
+행 개수가 제한되어 있습니다. 이 한계에 도달하면,
연락처 제공자가 새 스트림 항목 열에 필요한 공간을 만들어야 합니다.
-이때 가장 오래된 {@code android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP}가
-있는 행부터 자동으로 삭제하는 방법을 씁니다. 이 한계를
-가져오려면, 콘텐츠 URI
-{@code android.provider.ContactsContract.StreamItems#CONTENT_LIMIT_URI}에 쿼리를 발행합니다. 콘텐츠
-URI를 뺀 나머지 모든 인수는 <code>null</code>로 설정한 채 두면 됩니다. 이 쿼리는
-행이 하나 들어 있는 커서를 반환하며,
+이때 가장 오래된 {@code android.provider.ContactsContract.StreamItemsColumns#TIMESTAMP}가
+있는 행부터 자동으로 삭제하는 방법을 씁니다. 이 한계를
+가져오려면, 콘텐츠 URI
+{@code android.provider.ContactsContract.StreamItems#CONTENT_LIMIT_URI}에 쿼리를 발행합니다. 콘텐츠
+URI를 뺀 나머지 모든 인수는 <code>null</code>로 설정한 채 두면 됩니다. 이 쿼리는
+행이 하나 들어 있는 커서를 반환하며,
{@code android.provider.ContactsContract.StreamItems#MAX_ITEMS} 열 하나가 수반됩니다.
</li>
</ul>
<p>
- {@code android.provider.ContactsContract.StreamItems.StreamItemPhotos} 클래스는
-스트림 항목 하나의 사진 행을 포함하는 {@code android.provider.ContactsContract.StreamItemPhotos}의
+ {@code android.provider.ContactsContract.StreamItems.StreamItemPhotos} 클래스는
+스트림 항목 하나의 사진 행을 포함하는 {@code android.provider.ContactsContract.StreamItemPhotos}의
하위 테이블을 정의합니다.
</p>
<h3 id="SocialStreamInteraction">소셜 스트림 상호 작용</h3>
<p>
- 연락처 제공자가 기기 연락처 애플리케이션과 함께 관리하는 소셜 스트림 데이터는
-소셜 네트워킹 시스템과
+ 연락처 제공자가 기기 연락처 애플리케이션과 함께 관리하는 소셜 스트림 데이터는
+소셜 네트워킹 시스템과
기존 연락처를 연결하는 강력한 방법을 제공합니다. 사용할 수 있는 기능은 다음과 같습니다.
</p>
<ul>
<li>
- 소셜 네트워킹 서비스를 동기화 어댑터로 연락처 제공자에 동기화함으로써,
-사용자 연락처의 최근 활동을 검색하고 이를
-{@code android.provider.ContactsContract.StreamItems} 및
+ 소셜 네트워킹 서비스를 동기화 어댑터로 연락처 제공자에 동기화함으로써,
+사용자 연락처의 최근 활동을 검색하고 이를
+{@code android.provider.ContactsContract.StreamItems} 및
{@code android.provider.ContactsContract.StreamItemPhotos} 테이블에 저장해 두어 나중에 사용할 수 있습니다.
</li>
<li>
- 정기 동기화 외에도 사용자가 볼 연락처를 선택하면 동기화 어댑터를 트리거하여
-추가 데이터를 검색하게 할 수 있습니다. 이렇게 하면 동기화 어댑터가
+ 정기 동기화 외에도 사용자가 볼 연락처를 선택하면 동기화 어댑터를 트리거하여
+추가 데이터를 검색하게 할 수 있습니다. 이렇게 하면 동기화 어댑터가
해당 연락처의 고해상도 사진과 가장 최근 스트림 항목을 검색할 수 있습니다.
</li>
<li>
- 기기 연락처 애플리케이션과 연락처 제공자에 알림을 등록하면,
-연락처가 열람될 때 인텐트를 <em>수신</em>하고,
-그 시점에 개발자의 서비스로부터 연락처의 상태를 업데이트할 수 있습니다. 이 방법을 사용하면 동기화 어댑터로
+ 기기 연락처 애플리케이션과 연락처 제공자에 알림을 등록하면,
+연락처가 열람될 때 인텐트를 <em>수신</em>하고,
+그 시점에 개발자의 서비스로부터 연락처의 상태를 업데이트할 수 있습니다. 이 방법을 사용하면 동기화 어댑터로
완전 동기화를 수행하는 것보다 빠르고 대역폭도 적게 사용합니다.
</li>
<li>
- 사용자는 기기의 연락처 애플리케이션을 보면서 여러분의 소셜 네트워킹 서비스에
-연락처를 추가할 수 있습니다. 이는 "연락처 초대" 기능으로 사용할 수 있습니다.
-연락처 초대 기능은 기존 연락처를 네트워크에 추가하는 액티비티와
-기기의 연락처 애플리케이션을 제공하는 XML 파일,
+ 사용자는 기기의 연락처 애플리케이션을 보면서 여러분의 소셜 네트워킹 서비스에
+연락처를 추가할 수 있습니다. 이는 "연락처 초대" 기능으로 사용할 수 있습니다.
+연락처 초대 기능은 기존 연락처를 네트워크에 추가하는 액티비티와
+기기의 연락처 애플리케이션을 제공하는 XML 파일,
애플리케이션의 세부 정보가 포함된 연락처 제공자를 조합하여 활성화합니다.
</li>
</ul>
<p>
- 연락처 제공자로 스트림 항목을 정기 동기화하는 방법은
-다른 동기화와 같습니다. 동기화에 관한 자세한 내용은
-<a href="#SyncAdapters">연락처 제공자 동기화 어댑터</a> 섹션을 참조하십시오. 알림을 등록하고 연락처를 초대하는 방법은
+ 연락처 제공자로 스트림 항목을 정기 동기화하는 방법은
+다른 동기화와 같습니다. 동기화에 관한 자세한 내용은
+<a href="#SyncAdapters">연락처 제공자 동기화 어댑터</a> 섹션을 참조하십시오. 알림을 등록하고 연락처를 초대하는 방법은
다음 두 섹션에서 다룰 것입니다.
</p>
<h4>소셜 네트워킹 보기를 처리하기 위한 등록</h4>
<p>
- 동기화 어댑터를 등록하여 사용자가 동기화 어댑터에서 관리하는 연락처를 볼 때 알림을
+ 동기화 어댑터를 등록하여 사용자가 동기화 어댑터에서 관리하는 연락처를 볼 때 알림을
수신하는 방법:
</p>
<ol>
<li>
- 프로젝트의 <code>res/xml/</code> 디렉터리에 <code>contacts.xml</code> 파일을
+ 프로젝트의 <code>res/xml/</code> 디렉터리에 <code>contacts.xml</code> 파일을
만듭니다. 이미 이 파일이 있다면 이 절차를 건너뛰어도 됩니다.
</li>
<li>
- 이 파일에서,
+ 이 파일에서,
<code><ContactsAccountType xmlns:android="http://schemas.android.com/apk/res/android"></code> 요소를 추가합니다.
이 요소가 이미 존재한다면 이 절차를 건너뛰어도 됩니다.
</li>
<li>
- 사용자가 기기의 연락처 애플리케이션에서
+ 사용자가 기기의 연락처 애플리케이션에서
연락처 세부 정보 페이지를 열면 알림을 보내는 서비스를 등록하려면,
-<code>viewContactNotifyService="<em>serviceclass</em>"</code> 속성을 요소에 추가합니다.
-이 요소에서 <code><em>serviceclass</em></code>는 기기의 연락처 애플리케이션에서 인텐트를 수신하는 서비스의
-완전히 정규화된 클래스 이름입니다. 알림 서비스의 경우,
-{@link android.app.IntentService}를 확장하는 클래스를 사용하여 서비스가 인텐트를 수신하도록
-허용합니다. 수신되는 인텐트의 데이터에는
-사용자가 클릭한 원시 연락처의 콘텐츠 URI가 들어있습니다. 알림 서비스에서 동기화 어댑터에 바인딩한 다음 동기화 어댑터를 호출하여
+<code>viewContactNotifyService="<em>serviceclass</em>"</code> 속성을 요소에 추가합니다.
+이 요소에서 <code><em>serviceclass</em></code>는 기기의 연락처 애플리케이션에서 인텐트를 수신하는 서비스의
+완전히 정규화된 클래스 이름입니다. 알림 서비스의 경우,
+{@link android.app.IntentService}를 확장하는 클래스를 사용하여 서비스가 인텐트를 수신하도록
+허용합니다. 수신되는 인텐트의 데이터에는
+사용자가 클릭한 원시 연락처의 콘텐츠 URI가 들어있습니다. 알림 서비스에서 동기화 어댑터에 바인딩한 다음 동기화 어댑터를 호출하여
원시 연락처의 데이터를 업데이트할 수 있습니다.
</li>
</ol>
@@ -2058,31 +2058,31 @@
</p>
<ol>
<li>
- 프로젝트의 <code>res/xml/</code> 디렉터리에 <code>contacts.xml</code> 파일을
+ 프로젝트의 <code>res/xml/</code> 디렉터리에 <code>contacts.xml</code> 파일을
만듭니다. 이미 이 파일이 있다면 이 절차를 건너뛰어도 됩니다.
</li>
<li>
- 이 파일에서,
+ 이 파일에서,
<code><ContactsAccountType xmlns:android="http://schemas.android.com/apk/res/android"></code> 요소를 추가합니다.
이 요소가 이미 존재한다면 이 절차를 건너뛰어도 됩니다.
</li>
<li>
- 사용자가 기기의 연락처 애플리케이션에서 스트림 항목을 클릭했을 때
-처리할 액티비티를 등록하려면,
-<code>viewStreamItemActivity="<em>activityclass</em>"</code> 속성을 요소에 추가합니다.
-이 요소에서 <code><em>activityclass</em></code>는 기기의 연락처 애플리케이션에서 인텐트를 수신하는 액티비티의
+ 사용자가 기기의 연락처 애플리케이션에서 스트림 항목을 클릭했을 때
+처리할 액티비티를 등록하려면,
+<code>viewStreamItemActivity="<em>activityclass</em>"</code> 속성을 요소에 추가합니다.
+이 요소에서 <code><em>activityclass</em></code>는 기기의 연락처 애플리케이션에서 인텐트를 수신하는 액티비티의
완전히 정규화된 클래스 이름입니다.
</li>
<li>
- 사용자가 기기의 연락처 애플리케이션에서 스트림 사진을 클릭했을 때
+ 사용자가 기기의 연락처 애플리케이션에서 스트림 사진을 클릭했을 때
처리할 액티비티를 등록하려면,
<code>viewStreamItemPhotoActivity="<em>activityclass</em>"</code> 속성을 요소에 추가합니다.
-이 요소에서 <code><em>activityclass</em></code>는 기기의 연락처 애플리케이션에서 인텐트를 수신하는 액티비티의
+이 요소에서 <code><em>activityclass</em></code>는 기기의 연락처 애플리케이션에서 인텐트를 수신하는 액티비티의
완전히 정규화된 클래스 이름입니다.
</li>
</ol>
<p>
- <code><ContactsAccountType></code> 요소는
+ <code><ContactsAccountType></code> 요소는
<a href="#SocialStreamAcctType"><ContactsAccountType> 요소</a> 섹션에 자세히 설명되어 있습니다.
</p>
<p>
@@ -2091,17 +2091,17 @@
</p>
<h4>소셜 네트워킹 서비스로 상호 작용</h4>
<p>
- 사용자는 소셜 네트워킹 사이트에 연락처를 초대할 때
-기기의 연락처 애플리케이션을 떠나지 않아도 됩니다. 대신, 개발자가 기기의 연락처 앱에 액티비티 중 하나로 연락처를 초대하는 인텐트를
+ 사용자는 소셜 네트워킹 사이트에 연락처를 초대할 때
+기기의 연락처 애플리케이션을 떠나지 않아도 됩니다. 대신, 개발자가 기기의 연락처 앱에 액티비티 중 하나로 연락처를 초대하는 인텐트를
보내게 할 수 있습니다. 이렇게 설정하는 방법은 다음과 같습니다.
</p>
<ol>
<li>
- 프로젝트의 <code>res/xml/</code> 디렉터리에 <code>contacts.xml</code> 파일을
+ 프로젝트의 <code>res/xml/</code> 디렉터리에 <code>contacts.xml</code> 파일을
만듭니다. 이미 이 파일이 있다면 이 절차를 건너뛰어도 됩니다.
</li>
<li>
- 이 파일에서,
+ 이 파일에서,
<code><ContactsAccountType xmlns:android="http://schemas.android.com/apk/res/android"></code> 요소를 추가합니다.
이 요소가 이미 존재한다면 이 절차를 건너뛰어도 됩니다.
</li>
@@ -2113,25 +2113,25 @@
<code>inviteContactActionLabel="@string/<em>invite_action_label</em>"</code>
</li>
</ul>
- <code><em>activityclass</em></code> 값은 인텐트를 수신해야 하는 액티비티의
+ <code><em>activityclass</em></code> 값은 인텐트를 수신해야 하는 액티비티의
완전히 정규화된 클래스 이름입니다. <code><em>invite_action_label</em></code>
-값은 기기의 연락처 애플리케이션에 있는 <strong>연결 추가</strong> 메뉴에
+값은 기기의 연락처 애플리케이션에 있는 <strong>연결 추가</strong> 메뉴에
표시되는 텍스트 문자열입니다.
</li>
</ol>
<p class="note">
- <strong>참고:</strong> <code>ContactsSource</code>는
+ <strong>참고:</strong> <code>ContactsSource</code>는
<code>ContactsAccountType</code>에 대하여 이제 사용하지 않는 태그 이름입니다.
</p>
<h3 id="ContactsFile">contacts.xml 참조</h3>
<p>
- <code>contacts.xml</code> 파일에는 XML 요소가 들어있어 개발자의 동기화 어댑터와
-애플리케이션, 연락처 애플리케이션과 연락처 제공자 사이의 상호 작용을 제어합니다. 이런
+ <code>contacts.xml</code> 파일에는 XML 요소가 들어있어 개발자의 동기화 어댑터와
+애플리케이션, 연락처 애플리케이션과 연락처 제공자 사이의 상호 작용을 제어합니다. 이런
요소는 다음 섹션에 설명되어 있습니다.
</p>
<h4 id="SocialStreamAcctType"><ContactsAccountType> 요소</h4>
<p>
- <code><ContactsAccountType></code>요 요소는 개발자의 애플리케이션과
+ <code><ContactsAccountType></code>요 요소는 개발자의 애플리케이션과
연락처 애플리케이션 사이의 상호 작용을 제어합니다. 이 요소에는 다음 구문이 있습니다.
</p>
<pre>
@@ -2161,12 +2161,12 @@
<strong>설명:</strong>
</p>
<p>
- 사용자가 연락처 중 하나를 소셜 네트워크에 초대하고,
-소셜 네트워킹 스트림이 업데이트되면 사용자에게 알리는 등의 작업을 허용하는
+ 사용자가 연락처 중 하나를 소셜 네트워크에 초대하고,
+소셜 네트워킹 스트림이 업데이트되면 사용자에게 알리는 등의 작업을 허용하는
Android 구성 요소와 UI 레이블을 선언합니다.
</p>
<p>
- 속성 접두사 <code>android:</code>는
+ 속성 접두사 <code>android:</code>는
<code><ContactsAccountType></code>의 속성에는 필요하지 않다는 점을 눈여겨보십시오.
</p>
<p>
@@ -2175,48 +2175,48 @@
<dl>
<dt>{@code inviteContactActivity}</dt>
<dd>
- 사용자가 기기의 연락처 애플리케이션에서
-<strong>연결 추가</strong>를 선택했을 때 활성화하고자 하는
+ 사용자가 기기의 연락처 애플리케이션에서
+<strong>연결 추가</strong>를 선택했을 때 활성화하고자 하는
애플리케이션 액티비티의 완전히 정규화된 클래스 이름입니다.
</dd>
<dt>{@code inviteContactActionLabel}</dt>
<dd>
- <strong>연결 추가</strong> 메뉴의
+ <strong>연결 추가</strong> 메뉴의
{@code inviteContactActivity}에서 지정된 액티비티에 대해 표시되는 텍스트 문자열입니다.
- 예를 들어, 문자열 "제 네트워크를 팔로우하세요"를 사용할 수 있습니다. 이 레이블에 대한 문자열 리소스
+ 예를 들어, 문자열 "제 네트워크를 팔로우하세요"를 사용할 수 있습니다. 이 레이블에 대한 문자열 리소스
식별자를 사용할 수 있습니다.
</dd>
<dt>{@code viewContactNotifyService}</dt>
<dd>
- 사용자가 연락처를 볼 때 알림을 수신해야 하는
-애플리케이션 서비스의 완전히 정규화된 클래스 이름입니다. 이 알림은
-기기의 연락처 애플리케이션이 전송합니다. 이것을 사용하면 개발자의 애플리케이션이 데이터 집약적인 작업을 필요할 때까지
-연기할 수 있습니다. 예를 들어, 개발자의 애플리케이션은
-연락처의 고해상도 사진과 가장 최근 소셜 스트림 항목을 읽어서 표시함으로써
-이 알림에 응답할 수 있습니다. 이 기능은
-<a href="#SocialStreamInteraction">소셜 스트림 상호 작용</a>에 상세히 설명되어 있습니다. 알림 서비스의 예시를
+ 사용자가 연락처를 볼 때 알림을 수신해야 하는
+애플리케이션 서비스의 완전히 정규화된 클래스 이름입니다. 이 알림은
+기기의 연락처 애플리케이션이 전송합니다. 이것을 사용하면 개발자의 애플리케이션이 데이터 집약적인 작업을 필요할 때까지
+연기할 수 있습니다. 예를 들어, 개발자의 애플리케이션은
+연락처의 고해상도 사진과 가장 최근 소셜 스트림 항목을 읽어서 표시함으로써
+이 알림에 응답할 수 있습니다. 이 기능은
+<a href="#SocialStreamInteraction">소셜 스트림 상호 작용</a>에 상세히 설명되어 있습니다. 알림 서비스의 예시를
보려면 <a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>
- 샘플 앱에 있는 <code>NotifierService.java</code> 파일을
+ 샘플 앱에 있는 <code>NotifierService.java</code> 파일을
확인합니다.
</dd>
<dt>{@code viewGroupActivity}</dt>
<dd>
- 그룹 정보를 표시할 수 있는 애플리케이션 액티비티의
-완전히 정규화된 클래스 이름입니다. 사용자가 기기의 연락처 애플리케이션에서 그룹 레이블을 클릭하면,
+ 그룹 정보를 표시할 수 있는 애플리케이션 액티비티의
+완전히 정규화된 클래스 이름입니다. 사용자가 기기의 연락처 애플리케이션에서 그룹 레이블을 클릭하면,
이 액티비티의 UI가 표시됩니다.
</dd>
<dt>{@code viewGroupActionLabel}</dt>
<dd>
- 사용자가 개발자의 애플리케이션에서 그룹을 살펴볼 수 있도록 해주는 UI 제어에 대해
+ 사용자가 개발자의 애플리케이션에서 그룹을 살펴볼 수 있도록 해주는 UI 제어에 대해
연락처 애플리케이션이 표시하는 레이블입니다.
<p>
- 예를 들어, 기기에 Google+ 애플리케이션을 설치하고
-Google+를 연락처 애플리케이션과 동기화하면, Google+ 서클이
-연락처 애플리케이션의 <strong>그룹</strong> 탭에 표시되는 것을 볼 수 있습니다. Google+ 서클을
-클릭하면 해당 서클에서 "그룹"으로 표시된 사람들을 볼 수 있습니다. 이 표시의 맨 위에
-Google+ 아이콘이 표시되며, 이것을 클릭하면 제어가
-Google+ 앱으로 전환됩니다. 연락처 애플리케이션은 이 작업을
-{@code viewGroupActivity}로 수행하며, Google+ 아이콘을
+ 예를 들어, 기기에 Google+ 애플리케이션을 설치하고
+Google+를 연락처 애플리케이션과 동기화하면, Google+ 서클이
+연락처 애플리케이션의 <strong>그룹</strong> 탭에 표시되는 것을 볼 수 있습니다. Google+ 서클을
+클릭하면 해당 서클에서 "그룹"으로 표시된 사람들을 볼 수 있습니다. 이 표시의 맨 위에
+Google+ 아이콘이 표시되며, 이것을 클릭하면 제어가
+Google+ 앱으로 전환됩니다. 연락처 애플리케이션은 이 작업을
+{@code viewGroupActivity}로 수행하며, Google+ 아이콘을
{@code viewGroupActionLabel}의 값으로 사용합니다.
</p>
<p>
@@ -2225,19 +2225,19 @@
</dd>
<dt>{@code viewStreamItemActivity}</dt>
<dd>
- 사용자가 원시 연락처의 스트림 항목을 클릭할 때 기기의 연락처 애플리케이션이 시작하는
+ 사용자가 원시 연락처의 스트림 항목을 클릭할 때 기기의 연락처 애플리케이션이 시작하는
애플리케이션 액티비티의 완전히 정규화된 클래스 이름입니다.
</dd>
<dt>{@code viewStreamItemPhotoActivity}</dt>
<dd>
- 사용자가 원시 연락처 스트림 항목의 사진을 클릭할 때
-기기의 연락처 애플리케이션이 시작하는 애플리케이션 액티비티의
+ 사용자가 원시 연락처 스트림 항목의 사진을 클릭할 때
+기기의 연락처 애플리케이션이 시작하는 애플리케이션 액티비티의
완전히 정규화된 클래스 이름입니다.
</dd>
</dl>
<h4 id="SocialStreamDataKind"><ContactsDataKind> 요소</h4>
<p>
- <code><ContactsDataKind></code> 요소는 연락처 애플리케이션 UI에서 애플리케이션의 사용자 지정 데이터 행 표시를
+ <code><ContactsDataKind></code> 요소는 연락처 애플리케이션 UI에서 애플리케이션의 사용자 지정 데이터 행 표시를
제어합니다. 이 요소에는 다음 구문이 있습니다.
</p>
<pre>
@@ -2255,11 +2255,11 @@
<strong>설명:</strong>
</p>
<p>
- 이 요소를 사용하여 연락처 애플리케이션이 사용자 지정 데이터 행의 콘텐츠를
-원시 연락처 세부 정보의 일부로 표시하게 합니다. <code><ContactsAccountType></code>의 각 <code><ContactsDataKind></code> 하위 요소는
-동기화 어댑터가 {@link android.provider.ContactsContract.Data}에 추가하는
-사용자 지정 데이터 행의 유형을 나타냅니다. 개발자가 사용하는 사용자 지정 MIME 유형 하나마다
-<code><ContactsDataKind></code> 요소를 하나씩 추가합니다. 데이터를
+ 이 요소를 사용하여 연락처 애플리케이션이 사용자 지정 데이터 행의 콘텐츠를
+원시 연락처 세부 정보의 일부로 표시하게 합니다. <code><ContactsAccountType></code>의 각 <code><ContactsDataKind></code> 하위 요소는
+동기화 어댑터가 {@link android.provider.ContactsContract.Data}에 추가하는
+사용자 지정 데이터 행의 유형을 나타냅니다. 개발자가 사용하는 사용자 지정 MIME 유형 하나마다
+<code><ContactsDataKind></code> 요소를 하나씩 추가합니다. 데이터를
표시하는 것을 원치 않는 사용자 지정 데이터 행이 있으면, 이 요소를 추가하지 않아도 됩니다.
</p>
<p>
@@ -2268,35 +2268,35 @@
<dl>
<dt>{@code android:mimeType}</dt>
<dd>
- {@link android.provider.ContactsContract.Data} 테이블에서
-사용자 지정 데이터 행 유형 중 하나로 지정한 사용자 지정 MIME 유형입니다. 예를 들어,
-<code>vnd.android.cursor.item/vnd.example.locationstatus</code> 값은 연락처의 마지막으로 알려진 위치를 기록하는
+ {@link android.provider.ContactsContract.Data} 테이블에서
+사용자 지정 데이터 행 유형 중 하나로 지정한 사용자 지정 MIME 유형입니다. 예를 들어,
+<code>vnd.android.cursor.item/vnd.example.locationstatus</code> 값은 연락처의 마지막으로 알려진 위치를 기록하는
데이터 행에 대한 사용자 지정 MIME 유형이 될 수 있습니다.
</dd>
<dt>{@code android:icon}</dt>
<dd>
- 연락처 애플리케이션이 개발자의 데이터 옆에 표시하는
+ 연락처 애플리케이션이 개발자의 데이터 옆에 표시하는
Android <a href="{@docRoot}guide/topics/resources/drawable-resource.html">드로어블 리소스</a>
-입니다. 이 리소스를 사용하여 사용자에게
+입니다. 이 리소스를 사용하여 사용자에게
데이터 출처가 개발자의 서비스임을 나타내는 것입니다.
</dd>
<dt>{@code android:summaryColumn}</dt>
<dd>
- 데이터 행에서 검색한 두 개 값 중에서 첫 번째 값에 대한 열 이름입니다. 이 값은
-이 데이터 행에 대한 항목의 첫 번째 줄로 표시됩니다. 첫 번째 줄은
-데이터 요약으로 사용되는 것이 본 목적이지만, 이것은 선택 사항입니다.
+ 데이터 행에서 검색한 두 개 값 중에서 첫 번째 값에 대한 열 이름입니다. 이 값은
+이 데이터 행에 대한 항목의 첫 번째 줄로 표시됩니다. 첫 번째 줄은
+데이터 요약으로 사용되는 것이 본 목적이지만, 이것은 선택 사항입니다.
<a href="#detailColumn">android:detailColumn</a>도 참조하십시오.
</dd>
<dt>{@code android:detailColumn}</dt>
<dd>
데이터 행에서 검색한 두 개 값 중에서 두 번째 값에 대한 열 이름입니다. 이 값은
-이 데이터 행에 대한 항목의 두 번째 줄로 표시됩니다.
+이 데이터 행에 대한 항목의 두 번째 줄로 표시됩니다.
{@code android:summaryColumn}도 참조하십시오.
</dd>
</dl>
<h2 id="AdditionalFeatures">추가 연락처 제공자 기능</h2>
<p>
- 이전 섹션에서 설명한 주요 기능 외에도 연락처 제공자는 연락처 데이터를 다루는 데
+ 이전 섹션에서 설명한 주요 기능 외에도 연락처 제공자는 연락처 데이터를 다루는 데
유용한 기능을 많이 제공합니다. 예를 들면 다음과 같습니다.
</p>
<ul>
@@ -2305,52 +2305,52 @@
</ul>
<h3 id="Groups">연락처 그룹</h3>
<p>
- 연락처 제공자는 관련된 연락처 컬렉션에
-<strong>그룹</strong> 데이터로 레이블을 붙이기로 선택할 수 있습니다. 사용자 계정과 연관된 서버에서
-그룹을 관리하고자 하는 경우, 계정의 계정 유형에 대한 동기화 어댑터가
-연락처 제공자와 서버 사이에서 그룹 데이터를 전송해야 합니다. 사용자가 해당 서버에 새 연락처를 추가하고
+ 연락처 제공자는 관련된 연락처 컬렉션에
+<strong>그룹</strong> 데이터로 레이블을 붙이기로 선택할 수 있습니다. 사용자 계정과 연관된 서버에서
+그룹을 관리하고자 하는 경우, 계정의 계정 유형에 대한 동기화 어댑터가
+연락처 제공자와 서버 사이에서 그룹 데이터를 전송해야 합니다. 사용자가 해당 서버에 새 연락처를 추가하고
이 연락처를 새 그룹에 넣으면, 동기화 어댑터가 해당 새 그룹을
-{@link android.provider.ContactsContract.Groups} 테이블에 추가해야 합니다. 원시 연락처가 속한 그룹(또는 여러 그룹)은
-{@link android.provider.ContactsContract.Data} 테이블에 저장되며, 이때
+{@link android.provider.ContactsContract.Groups} 테이블에 추가해야 합니다. 원시 연락처가 속한 그룹(또는 여러 그룹)은
+{@link android.provider.ContactsContract.Data} 테이블에 저장되며, 이때
{@link android.provider.ContactsContract.CommonDataKinds.GroupMembership} MIME 유형을 사용합니다.
</p>
<p>
- 개발자가 서버에서 가져온 원시 연락처 데이터를 연락처 제공자에 추가할
-동기화 어댑터를 디자인하는 중이고 그룹은 사용하지 않는다면,
-제공자 쪽에 데이터를 표시하라고 지시해야 합니다. 사용자가 기기에 계정을 추가했을 때 실행되는 코드에서
-연락처 제공자가 계정에 추가하는{@link android.provider.ContactsContract.Settings} 행을
-업데이트하십시오. 이 행에서
+ 개발자가 서버에서 가져온 원시 연락처 데이터를 연락처 제공자에 추가할
+동기화 어댑터를 디자인하는 중이고 그룹은 사용하지 않는다면,
+제공자 쪽에 데이터를 표시하라고 지시해야 합니다. 사용자가 기기에 계정을 추가했을 때 실행되는 코드에서
+연락처 제공자가 계정에 추가하는{@link android.provider.ContactsContract.Settings} 행을
+업데이트하십시오. 이 행에서
{@link android.provider.ContactsContract.SettingsColumns#UNGROUPED_VISIBLE
-Settings.UNGROUPED_VISIBLE} 열의 값을 1로 설정합니다. 이렇게 하면 연락처 제공자가
+Settings.UNGROUPED_VISIBLE} 열의 값을 1로 설정합니다. 이렇게 하면 연락처 제공자가
개발자의 연락처 데이터를 항상 표시하게 되고, 이는 그룹을 사용하지 않더라도 관계 없습니다.
</p>
<h3 id="Photos">연락처 사진</h3>
<p>
{@link android.provider.ContactsContract.Data} 테이블은
{@link android.provider.ContactsContract.CommonDataKinds.Photo#CONTENT_ITEM_TYPE
-Photo.CONTENT_ITEM_TYPE} MIME 유형으로 사진을 행에 저장합니다. 이 행의
-{@link android.provider.ContactsContract.RawContactsColumns#CONTACT_ID} 열은
+Photo.CONTENT_ITEM_TYPE} MIME 유형으로 사진을 행에 저장합니다. 이 행의
+{@link android.provider.ContactsContract.RawContactsColumns#CONTACT_ID} 열은
행이 속한 원시 연락처의 {@code android.provider.BaseColumns#_ID} 열과 연결됩니다.
- 클래스 {@link android.provider.ContactsContract.Contacts.Photo}는
-연락처 기본 사진의 사진 정보가 들어있는 {@link android.provider.ContactsContract.Contacts} 하위 테이블을 정의합니다.
-연락처의 기본 사진은 연락처 기본 원시 연락처의 기본 사진입니다. 마찬가지로,
+ 클래스 {@link android.provider.ContactsContract.Contacts.Photo}는
+연락처 기본 사진의 사진 정보가 들어있는 {@link android.provider.ContactsContract.Contacts} 하위 테이블을 정의합니다.
+연락처의 기본 사진은 연락처 기본 원시 연락처의 기본 사진입니다. 마찬가지로,
{@link android.provider.ContactsContract.RawContacts.DisplayPhoto} 클래스는
원시 연락처의 기본 사진의 사진 정보가 들어있는 {@link android.provider.ContactsContract.RawContacts} 하위 테이블을
정의합니다.
</p>
<p>
- {@link android.provider.ContactsContract.Contacts.Photo} 및
-{@link android.provider.ContactsContract.RawContacts.DisplayPhoto}에 대한 참조 문서에
-사진 정보를 검색하는 예시가 들어있습니다. 원시 연락처에 대한 기본 미리 보기를 검색하는 데 쓰이는
-편의 클래스는 없습니다. 하지만
-{@link android.provider.ContactsContract.Data} 테이블에 쿼리를 보내 원시 연락처의
-{@code android.provider.BaseColumns#_ID},
+ {@link android.provider.ContactsContract.Contacts.Photo} 및
+{@link android.provider.ContactsContract.RawContacts.DisplayPhoto}에 대한 참조 문서에
+사진 정보를 검색하는 예시가 들어있습니다. 원시 연락처에 대한 기본 미리 보기를 검색하는 데 쓰이는
+편의 클래스는 없습니다. 하지만
+{@link android.provider.ContactsContract.Data} 테이블에 쿼리를 보내 원시 연락처의
+{@code android.provider.BaseColumns#_ID},
{@link android.provider.ContactsContract.CommonDataKinds.Photo#CONTENT_ITEM_TYPE
Photo.CONTENT_ITEM_TYPE}, 및 {@link android.provider.ContactsContract.Data#IS_PRIMARY}
열을 선택하면 해당 원시 연락처의 기본 사진 행을 찾을 수 있습니다.
</p>
<p>
- 한 사람의 소셜 스트림 데이터에도 사진이 포함되어 있을 수 있습니다. 이런 사진은
-{@code android.provider.ContactsContract.StreamItemPhotos} 테이블에 저장되며, 이 내용은
+ 한 사람의 소셜 스트림 데이터에도 사진이 포함되어 있을 수 있습니다. 이런 사진은
+{@code android.provider.ContactsContract.StreamItemPhotos} 테이블에 저장되며, 이 내용은
<a href="#StreamPhotos">소셜 스트림 사진</a>에 더 자세하게 설명되어 있습니다.
</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/ko/guide/topics/providers/content-provider-basics.jd
index 953f92a..68ed568 100644
--- a/docs/html-intl/intl/ko/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/ko/guide/topics/providers/content-provider-basics.jd
@@ -119,11 +119,11 @@
<!-- Intro paragraphs -->
<p>
- 콘텐츠 제공자는 데이터의 중앙 리포지토리로의 액세스를 관리합니다.
+ 콘텐츠 제공자는 데이터의 중앙 리포지토리로의 액세스를 관리합니다.
제공자는 Android 애플리케이션의 일부이며, 이는 종종 나름의 UI를 제공하여 데이터에 작용하도록 합니다.
- 그러나 콘텐츠 제공자는 기본적으로 다른 애플리케이션이 사용하도록 만들어진 것입니다.
-이들은 제공자 클라이언트 개체를 사용하여 제공자에 액세스합니다.
-제공자와 제공자 클라이언트가 결합되면 데이터에 하나의 일관적인 표준 인터페이스를 제공하여
+ 그러나 콘텐츠 제공자는 기본적으로 다른 애플리케이션이 사용하도록 만들어진 것입니다.
+이들은 제공자 클라이언트 개체를 사용하여 제공자에 액세스합니다.
+제공자와 제공자 클라이언트가 결합되면 데이터에 하나의 일관적인 표준 인터페이스를 제공하여
이것이 프로세스간 통신과 보안 데이터 액세스도 처리합니다.
</p>
<p>
@@ -139,14 +139,14 @@
<!-- Basics -->
<h2 id="Basics">개요</h2>
<p>
- 콘텐츠 제공자는 외부 애플리케이션에 데이터를 표시하며, 이때 데이터는
-관계형 데이터베이스에서 찾을 수 있는 테이블과 유사한 하나 이상의 테이블로서 표시됩니다.
-한 행은 제공자가 수집하는 어떤 유형의 데이터 인스턴스를 나타내며,
+ 콘텐츠 제공자는 외부 애플리케이션에 데이터를 표시하며, 이때 데이터는
+관계형 데이터베이스에서 찾을 수 있는 테이블과 유사한 하나 이상의 테이블로서 표시됩니다.
+한 행은 제공자가 수집하는 어떤 유형의 데이터 인스턴스를 나타내며,
행 안의 각 열은 인스턴스에 대해 수집된 개별적인 데이터를 나타냅니다.
</p>
<p>
- 예를 들어 Android 플랫폼 안에 내장된 여러 제공자 중에 사용자 사전이라는 것이 있습니다.
-이것은 사용자가 보관하고 싶어하는 비표준 단어의 철자를 저장합니다. 표 1은 이 제공자의 테이블에서
+ 예를 들어 Android 플랫폼 안에 내장된 여러 제공자 중에 사용자 사전이라는 것이 있습니다.
+이것은 사용자가 보관하고 싶어하는 비표준 단어의 철자를 저장합니다. 표 1은 이 제공자의 테이블에서
데이터가 어떤 형태를 띨 수 있는지를 나타낸 것입니다.
</p>
<p class="table-caption">
@@ -197,39 +197,39 @@
</tr>
</table>
<p>
- 표 1에서, 각 행은 일반적인 사전에 나오지 않는 단어의 인스턴스를
-나타냅니다. 각 열은 해당 단어에 대한 일부 데이터를 나타냅니다. 예를 들어
+ 표 1에서, 각 행은 일반적인 사전에 나오지 않는 단어의 인스턴스를
+나타냅니다. 각 열은 해당 단어에 대한 일부 데이터를 나타냅니다. 예를 들어
단어가 처음 나온 로케일 등을 들 수 있습니다. 열 헤더는 제공자에 저장된
-열 이름입니다. 행의 로케일을 참조하려면 그 행의 <code>locale</code> 열을 참조합니다.
+열 이름입니다. 행의 로케일을 참조하려면 그 행의 <code>locale</code> 열을 참조합니다.
이 제공자의 경우, <code>_ID</code> 열은 제공자가 자동으로 유지하는 "기본 키" 열
역할을 합니다.
</p>
<p class="note">
- <strong>참고:</strong> 제공자에 기본 키가 꼭 있어야 하는 것은 아니고,
-기본 키가 있는 경우 <code>_ID</code>를 열 이름으로 사용하지 않아도 됩니다. 그러나 제공자의 데이터를
-{@link android.widget.ListView}에 바인딩하려면
+ <strong>참고:</strong> 제공자에 기본 키가 꼭 있어야 하는 것은 아니고,
+기본 키가 있는 경우 <code>_ID</code>를 열 이름으로 사용하지 않아도 됩니다. 그러나 제공자의 데이터를
+{@link android.widget.ListView}에 바인딩하려면
열 이름 중 하나는<code>_ID</code>여야 합니다. 이 요구 사항은
<a href="#DisplayResults">쿼리 결과 표시</a> 섹션에 자세히 설명되어 있습니다.
</p>
<h3 id="ClientProvider">제공자 액세스</h3>
<p>
- 애플리케이션은 콘텐츠 제공자로부터의 데이터에
-{@link android.content.ContentResolver} 클라이언트 개체로 액세스합니다.
-이 개체에는 제공자 개체 내의 같은 이름을 가진 메서드를 호출하는 메서드가 있습니다.
-이는 {@link android.content.ContentProvider}의 구체적인 하위 클래스 중 하나의 인스턴스입니다.
-{@link android.content.ContentResolver} 메서드는
+ 애플리케이션은 콘텐츠 제공자로부터의 데이터에
+{@link android.content.ContentResolver} 클라이언트 개체로 액세스합니다.
+이 개체에는 제공자 개체 내의 같은 이름을 가진 메서드를 호출하는 메서드가 있습니다.
+이는 {@link android.content.ContentProvider}의 구체적인 하위 클래스 중 하나의 인스턴스입니다.
+{@link android.content.ContentResolver} 메서드는
영구적 저장소의 기본적인 "CRUD"(생성, 검색, 업데이트 및 삭제) 기능을 제공합니다.
</p>
<p>
클라이언트 애플리케이션의 프로세스 내에 있는 {@link android.content.ContentResolver} 개체와
- 제공자를 소유하는 애플리케이션 내의 {@link android.content.ContentProvider} 개체가
+ 제공자를 소유하는 애플리케이션 내의 {@link android.content.ContentProvider} 개체가
자동으로 프로세스간 통신을 처리합니다.
-{@link android.content.ContentProvider} 또한
+{@link android.content.ContentProvider} 또한
콘텐츠 제공자의 데이터 리포지토리와 외부에 테이블로 표시되는 데이터 모습 사이에서 추상화 계층 역할을 합니다.
</p>
<p class="note">
- <strong>참고:</strong> 제공자에 액세스하려면 보통은 애플리케이션이
-제공자의 매니페스트 파일에 있는 특정 권한을 요청해야 합니다. 이것은
+ <strong>참고:</strong> 제공자에 액세스하려면 보통은 애플리케이션이
+제공자의 매니페스트 파일에 있는 특정 권한을 요청해야 합니다. 이것은
<a href="#Permissions">콘텐츠 제공자 권한</a> 섹션에 더 자세히 설명되어 있습니다.
</p>
<p>
@@ -237,7 +237,7 @@
{@link android.content.ContentResolver#query ContentResolver.query()}를 호출하면 됩니다.
{@link android.content.ContentResolver#query query()} 메서드는 사용자 사전 제공자가 정의한
{@link android.content.ContentProvider#query ContentProvider.query()} 메서드를
-호출합니다. 다음 몇 줄의 코드는
+호출합니다. 다음 몇 줄의 코드는
{@link android.content.ContentResolver#query ContentResolver.query()} 호출을 나타낸 것입니다.
<p>
<pre>
@@ -292,26 +292,26 @@
<td align="center"><code>sortOrder</code></td>
<td align="center"><code>ORDER BY <em>col,col,...</em></code></td>
<td>
- <code>sortOrder</code>는 반환된
+ <code>sortOrder</code>는 반환된
{@link android.database.Cursor} 내에 행이 나타나는 순서를 지정합니다.
</td>
</tr>
</table>
<h3 id="ContentURIs">콘텐츠 URI</h3>
<p>
- <strong>콘텐츠 URI</strong>는 제공자에서 데이터를 식별하는 URI입니다.
+ <strong>콘텐츠 URI</strong>는 제공자에서 데이터를 식별하는 URI입니다.
콘텐츠 URI에는 전체 제공자의 상징적인 이름(제공자의 <strong>권한</strong>)과
-테이블을 가리키는 이름(<strong>경로</strong>)이 포함됩니다.
+테이블을 가리키는 이름(<strong>경로</strong>)이 포함됩니다.
제공자 내의 테이블에 액세스하기 위해 클라이언트 메서드를 호출하는 경우,
그 테이블에 대한 콘텐츠 URI는 인수 중 하나입니다.
</p>
<p>
앞선 몇 줄의 코드에서 상수
-{@link android.provider.UserDictionary.Words#CONTENT_URI}에
+{@link android.provider.UserDictionary.Words#CONTENT_URI}에
사용자 사전의 "단어" 테이블의 콘텐츠 URI가 들어있습니다. {@link android.content.ContentResolver}
개체가 이 URI의 권한을 구문 분석한 다음, 이를 이용해 제공자를 "확인"합니다. 즉 이 권한을 알려진 제공자로 이루어진 시스템 테이블과 비교하는 것입니다.
-
-그러면 {@link android.content.ContentResolver}가 쿼리 인수를
+
+그러면 {@link android.content.ContentResolver}가 쿼리 인수를
올바른 제공자에게 발송할 수 있습니다.
</p>
<p>
@@ -331,20 +331,20 @@
이것을 콘텐츠 URI로 식별합니다.
</p>
<p>
- 대다수의 제공자에서는 URI의 맨 끝에 ID 값을 추가하면
-테이블 내 하나의 행에 액세스할 수 있게 해줍니다. 예를 들어 <code>_ID</code>가
+ 대다수의 제공자에서는 URI의 맨 끝에 ID 값을 추가하면
+테이블 내 하나의 행에 액세스할 수 있게 해줍니다. 예를 들어 <code>_ID</code>가
사용자 사전의 <code>4</code>인 행을 검색하려면, 이 콘텐츠 URI를 사용하면 됩니다.
</p>
<pre>
Uri singleUri = ContentUris.withAppendedId(UserDictionary.Words.CONTENT_URI,4);
</pre>
<p>
- 일련의 행을 검색한 다음 그 중 하나를 업데이트하거나 삭제하고자 하는 경우 종종 ID 값을
+ 일련의 행을 검색한 다음 그 중 하나를 업데이트하거나 삭제하고자 하는 경우 종종 ID 값을
이용하곤 합니다.
</p>
<p class="note">
- <strong>참고:</strong> {@link android.net.Uri}와
-{@link android.net.Uri.Builder} 클래스에는 문자열에서 잘 구성된(Well-Formed) URI 개체를 구성하기 위한 편의 메서드가 들어 있습니다.
+ <strong>참고:</strong> {@link android.net.Uri}와
+{@link android.net.Uri.Builder} 클래스에는 문자열에서 잘 구성된(Well-Formed) URI 개체를 구성하기 위한 편의 메서드가 들어 있습니다.
{@link android.content.ContentUris}에는 URI에 ID 값을 추가하기 위한 편의 메서드가 들어 있습니다.
이전 조각은 {@link android.content.ContentUris#withAppendedId
withAppendedId()}를 사용하여 UserDictionary 콘텐츠 URI에 ID를 추가합니다.
@@ -358,10 +358,10 @@
방법을 설명합니다.
</p>
<p class="note">
- 명확히 나타내기 위해 이 섹션의 코드 조각은
-{@link android.content.ContentResolver#query ContentResolver.query()}를 "UI 스레드"에서 호출합니다.
+ 명확히 나타내기 위해 이 섹션의 코드 조각은
+{@link android.content.ContentResolver#query ContentResolver.query()}를 "UI 스레드"에서 호출합니다.
그러나 실제 코드의 경우 쿼리는 별도의 스레드에서 비동기식으로 수행해야 합니다. 이를 위한 한 가지 방식으로
-{@link android.content.CursorLoader}
+{@link android.content.CursorLoader}
클래스를 쓰는 것을 들 수 있습니다. 이 내용은 <a href="{@docRoot}guide/components/loaders.html">
로더</a> 가이드에 더 자세히 설명되어 있습니다. 또한, 이 코드 줄은 조각일 뿐이며 애플리케이션을 전체적으로 표시한 것이 아닙니다.
@@ -380,32 +380,32 @@
<h3 id="RequestPermissions">읽기 액세스 권한 요청</h3>
<p>
제공자에서 데이터를 검색하려면 애플리케이션에 해당 제공자에 대한 "읽기 액세스 권한"이 필요합니다.
- 런타임에는 이 권한을 요청할 수 없습니다. 대신 이 권한이 필요하다는 것을 매니페스트에 나타내야 합니다. 이때,
+ 런타임에는 이 권한을 요청할 수 없습니다. 대신 이 권한이 필요하다는 것을 매니페스트에 나타내야 합니다. 이때,
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
요소와 제공자가 정의한 정확한 권한 이름을 사용하면 됩니다.
- 매니페스트에서 이 요소를 지정하는 것은 사실상 애플리케이션을 위해 이 권한을 "요청"하는 것과
+ 매니페스트에서 이 요소를 지정하는 것은 사실상 애플리케이션을 위해 이 권한을 "요청"하는 것과
같습니다. 사용자가 애플리케이션을 설치할 때면, 이 요청을 암시적으로 허용하게 됩니다.
</p>
<p>
- 사용 중인 제공자에 대한 읽기 액세스 권한의 정확한 이름과 해당 제공자가 사용하는
+ 사용 중인 제공자에 대한 읽기 액세스 권한의 정확한 이름과 해당 제공자가 사용하는
다른 액세스 권한의 이름을 찾아보려면 제공자의 문서를 살펴보십시오.
</p>
<p>
- 제공자에 액세스하는 데 있어 권한이 어떤 역할을 하는지는
+ 제공자에 액세스하는 데 있어 권한이 어떤 역할을 하는지는
<a href="#Permissions">콘텐츠 제공자 권한</a> 섹션에 더 자세하게 설명되어 있습니다.
</p>
<p>
- 사용자 사전 제공자는
-<code>android.permission.READ_USER_DICTIONARY</code> 권한을 자신의 매니페스트 파일에 정의합니다. 따라서 해당 제공자에서
+ 사용자 사전 제공자는
+<code>android.permission.READ_USER_DICTIONARY</code> 권한을 자신의 매니페스트 파일에 정의합니다. 따라서 해당 제공자에서
읽기 작업을 하고자 하는 애플리케이션은 반드시 이 권한을 요청해야 합니다.
</p>
<!-- Constructing the query -->
<h3 id="Query">쿼리 구성</h3>
<p>
- 제공자에서 데이터를 검색할 때 다음 단계는 쿼리를 구성하는 것입니다. 다음의 첫 번째 조각은
+ 제공자에서 데이터를 검색할 때 다음 단계는 쿼리를 구성하는 것입니다. 다음의 첫 번째 조각은
사용자 사전 제공자에 액세스하는 데 필요한 몇 가지 변수를 정의한 것입니다.
</p>
<pre class="prettyprint">
@@ -426,9 +426,9 @@
</pre>
<p>
- 다음 조각은 사용자 사전 제공자를 예시로 사용하여
+ 다음 조각은 사용자 사전 제공자를 예시로 사용하여
{@link android.content.ContentResolver#query ContentResolver.query()}를
- 사용하는 방법을 나타낸 것입니다. 제공자 클라이언트 쿼리는 SQL 쿼리와 비슷하며,
+ 사용하는 방법을 나타낸 것입니다. 제공자 클라이언트 쿼리는 SQL 쿼리와 비슷하며,
반환할 열 집합과 선택 기준 집합, 그리고 정렬 순서가 이 안에 들어 있습니다.
</p>
<p>
@@ -438,13 +438,13 @@
<p>
검색할 행을 나타내는 식은 선택 절과 선택 인수로 분할되어 있습니다.
선택 절은 논리와 부울 식, 열 이름과 값
-(변수 <code>mSelectionClause</code>)을 조합한 것입니다.
-값 대신 대체 가능한 매개변수 <code>?</code>를 지정하면,
+(변수 <code>mSelectionClause</code>)을 조합한 것입니다.
+값 대신 대체 가능한 매개변수 <code>?</code>를 지정하면,
쿼리 메서드가 그 값을 선택 인수 배열에서 검색합니다(변수 <code>mSelectionArgs</code>).
</p>
<p>
- 다음 조각의 경우, 사용자가 단어를 입력하지 않으면 선택 절이
-<code>null</code>로 설정되고, 쿼리는 제공자 안의 모든 단어를 반환합니다.
+ 다음 조각의 경우, 사용자가 단어를 입력하지 않으면 선택 절이
+<code>null</code>로 설정되고, 쿼리는 제공자 안의 모든 단어를 반환합니다.
사용자가 단어를 입력하면 선택 절은 <code>UserDictionary.Words.WORD + " = ?"</code>로 설정되며
선택 인수의 첫 번째 요소가 사용자가 입력한 단어로 설정됩니다.
</p>
@@ -514,7 +514,7 @@
</p>
<h4 id="Injection">악의적인 입력에 대한 보호</h4>
<p>
- 콘텐츠 제공자가 관리하는 데이터가 SQL 데이터베이스에 있는 경우,
+ 콘텐츠 제공자가 관리하는 데이터가 SQL 데이터베이스에 있는 경우,
원시 SQL 문에 외부의 신뢰할 수 없는 데이터를 포함시키면 SQL 삽입을 초래할 수 있습니다.
</p>
<p>
@@ -526,17 +526,17 @@
</pre>
<p>
이렇게 하면 사용자로 하여금 여러분의 SQL 문에 악의적인 SQL을 연결할 수 있도록 허용합니다.
- 예를 들어 사용자가 <code>mUserInput</code>에 대해 "nothing; DROP TABLE *;"을 입력할 수 있습니다.
-그러면 그 결과로 선택 절 <code>var = nothing; DROP TABLE *;</code>이 나옵니다.
-선택 절이 일종의 SQL 문으로 취급되었기 때문에 제공자가 기본 SQLite 데이터베이스에서 테이블을
-모두 삭제하는 결과를 낳을 수도 있습니다(제공자가 <a href="http://en.wikipedia.org/wiki/SQL_injection">SQL 삽입</a>
+ 예를 들어 사용자가 <code>mUserInput</code>에 대해 "nothing; DROP TABLE *;"을 입력할 수 있습니다.
+그러면 그 결과로 선택 절 <code>var = nothing; DROP TABLE *;</code>이 나옵니다.
+선택 절이 일종의 SQL 문으로 취급되었기 때문에 제공자가 기본 SQLite 데이터베이스에서 테이블을
+모두 삭제하는 결과를 낳을 수도 있습니다(제공자가 <a href="http://en.wikipedia.org/wiki/SQL_injection">SQL 삽입</a>
시도를 잡아내도록 설정된 경우는 예외입니다).
</p>
<p>
- 이 문제를 피하려면 <code>?</code>를 대체 가능한 매개변수로 사용하는 선택 절과,
+ 이 문제를 피하려면 <code>?</code>를 대체 가능한 매개변수로 사용하는 선택 절과,
별도의 선택 인수 배열을 사용하면 됩니다. 이렇게 하면, 사용자 입력이 SQL 문의 일부로 해석되기보다 쿼리에 직접 바인딩됩니다.
- 이것은 SQL로 취급되지 않기 때문에 사용자 입력이 악의적인 SQL을 삽입할 수 없습니다.
+ 이것은 SQL로 취급되지 않기 때문에 사용자 입력이 악의적인 SQL을 삽입할 수 없습니다.
사용자 입력을 포함하는 데 연결을 사용하는 대신 다음 선택 절을 사용합니다.
</p>
<pre>
@@ -558,35 +558,35 @@
selectionArgs[0] = mUserInput;
</pre>
<p>
- <code>?</code>를 대체 가능한 매개변수로 사용하는 선택 절과
-선택 인수 배열을 사용하는 것이 선택을 지정하는 데 선호되는 방법입니다.
+ <code>?</code>를 대체 가능한 매개변수로 사용하는 선택 절과
+선택 인수 배열을 사용하는 것이 선택을 지정하는 데 선호되는 방법입니다.
이는 제공자가 SQL 데이터베이스 기반이 아닐 때에도 마찬가지입니다.
</p>
<!-- Displaying the results -->
<h3 id="DisplayResults">쿼리 결과 표시</h3>
<p>
- {@link android.content.ContentResolver#query ContentResolver.query()}
+ {@link android.content.ContentResolver#query ContentResolver.query()}
클라이언트 메서드는 언제나 쿼리 선택 기준과 일치하는 행에 대해 쿼리 프로젝션이 지정한 열을 포함하는
-{@link android.database.Cursor}를 반환합니다.
+{@link android.database.Cursor}를 반환합니다.
{@link android.database.Cursor} 개체가 자신이 포함한 행과 열에 무작위 읽기 액세스를 제공합니다.
- {@link android.database.Cursor} 메서드를 사용하면 행을 결과에서 반복할 수 있고,
+ {@link android.database.Cursor} 메서드를 사용하면 행을 결과에서 반복할 수 있고,
각 열의 데이터 유형을 결정하며 열에서 데이터를 꺼내거나 결과의 다른 속성을 검토할 수도 있습니다.
일부 {@link android.database.Cursor} 구현은 제공자의 데이터가 변경될 경우,
-{@link android.database.Cursor}가 변경될 때 관찰자 개체 내의 메서드를 트리거하는 경우
+{@link android.database.Cursor}가 변경될 때 관찰자 개체 내의 메서드를 트리거하는 경우
또는 두 가지가 한 번에 발생할 경우 자동으로 개체를 업데이트합니다.
</p>
<p class="note">
- <strong>참고:</strong> 제공자는 쿼리를 수행하는 개체의 성격을 근거로
-열에 대한 액세스를 제한할 수 있습니다. 예를 들어 연락처 제공자는 동기화 어댑터로의 몇몇 열에 대한 액세스를 제한합니다.
+ <strong>참고:</strong> 제공자는 쿼리를 수행하는 개체의 성격을 근거로
+열에 대한 액세스를 제한할 수 있습니다. 예를 들어 연락처 제공자는 동기화 어댑터로의 몇몇 열에 대한 액세스를 제한합니다.
이렇게 해야 액티비티 또는 서비스에 열을 반환하지 않기 때문입니다.
</p>
<p>
- 선택 기준에 일치하는 행이 없으면, 제공자는
-{@link android.database.Cursor} 개체를 반환합니다. 이 개체의
+ 선택 기준에 일치하는 행이 없으면, 제공자는
+{@link android.database.Cursor} 개체를 반환합니다. 이 개체의
{@link android.database.Cursor#getCount Cursor.getCount()}는 0(빈 커서)입니다.
</p>
<p>
- 내부 오류가 발생하는 경우, 쿼리 결과는 특정 제공자에 따라 달라집니다.
+ 내부 오류가 발생하는 경우, 쿼리 결과는 특정 제공자에 따라 달라집니다.
<code>null</code>을 반환하기로 선택할 수도 있고, {@link java.lang.Exception}을 발생시킬 수도 있습니다.
</p>
<p>
@@ -595,9 +595,9 @@
연결하는 것입니다.
</p>
<p>
- 다음 조각은 이전 조각으로부터 코드를 계속 이어가는 것입니다.
+ 다음 조각은 이전 조각으로부터 코드를 계속 이어가는 것입니다.
이는 해당 쿼리가 검색한 {@link android.database.Cursor}가 들어 있는
-{@link android.widget.SimpleCursorAdapter} 개체를 생성하며, 이 개체를
+{@link android.widget.SimpleCursorAdapter} 개체를 생성하며, 이 개체를
{@link android.widget.ListView}에 대한 어댑터로 설정합니다.
</p>
<pre class="prettyprint">
@@ -626,7 +626,7 @@
<p class="note">
<strong>참고:</strong> {@link android.database.Cursor}로 {@link android.widget.ListView}를 뒷받침하려면,
커서에 <code>_ID</code>라는 열이 포함되어야 합니다.
- 이것 때문에 이전에 표시된 쿼리가 "단어" 테이블에 대하여 <code>_ID</code> 열을
+ 이것 때문에 이전에 표시된 쿼리가 "단어" 테이블에 대하여 <code>_ID</code> 열을
검색하며, {@link android.widget.ListView}가 이를 표시하지 않더라도 무관합니다.
이 제한은 대부분의 제공자에 각 테이블에 대한 <code>_ID</code> 열이 있는 이유를 설명해주기도 합니다.
@@ -635,7 +635,7 @@
<!-- Getting data from query results -->
<h3 id="GettingResults">쿼리 결과에서 데이터 가져오기</h3>
<p>
- 쿼리 결과를 단순히 표시만 하는 것보다 이를 다른 작업에 사용할 수 있습니다.
+ 쿼리 결과를 단순히 표시만 하는 것보다 이를 다른 작업에 사용할 수 있습니다.
예를 들어, 사용자 사전에서 철자를 검색한 다음 이것을 다른 제공자 내에서 찾아볼 수 있습니다.
이렇게 하려면, {@link android.database.Cursor}에서 행을 계속 반복하면 됩니다.
</p>
@@ -672,10 +672,10 @@
}
</pre>
<p>
- {@link android.database.Cursor} 구현에는
-여러 개의 "가져오기" 메서드가 들어 있어 개체로부터 여러 가지 유형의 데이터를 검색합니다. 예를 들어 이전 조각에서는
-{@link android.database.Cursor#getString getString()}을 사용합니다.
-여기에는 해당 열의 데이터 유형을 나타내는 값을 반환하는
+ {@link android.database.Cursor} 구현에는
+여러 개의 "가져오기" 메서드가 들어 있어 개체로부터 여러 가지 유형의 데이터를 검색합니다. 예를 들어 이전 조각에서는
+{@link android.database.Cursor#getString getString()}을 사용합니다.
+여기에는 해당 열의 데이터 유형을 나타내는 값을 반환하는
{@link android.database.Cursor#getType getType()} 메서드도 있습니다.
</p>
@@ -683,33 +683,33 @@
<!-- Requesting permissions -->
<h2 id="Permissions">콘텐츠 제공자 권한</h2>
<p>
- 제공자의 애플리케이션은 해당 제공자의 데이터에 액세스하려면 다른 애플리케이션이 반드시 가지고 있어야 하는
-권한을 지정할 수 있습니다. 이와 같은 권한을 통해 사용자는 한 애플리케이션이 어느 데이터에 액세스하려 시도할지
-알 수 있습니다. 다른 애플리케이션은 제공자의 요구 사항을 근거로 해당 제공자에 액세스하기 위해 필요한
+ 제공자의 애플리케이션은 해당 제공자의 데이터에 액세스하려면 다른 애플리케이션이 반드시 가지고 있어야 하는
+권한을 지정할 수 있습니다. 이와 같은 권한을 통해 사용자는 한 애플리케이션이 어느 데이터에 액세스하려 시도할지
+알 수 있습니다. 다른 애플리케이션은 제공자의 요구 사항을 근거로 해당 제공자에 액세스하기 위해 필요한
권한을 요청합니다. 최종 사용자는 애플리케이션을 설치할 때 요청된 권한을 보게 됩니다.
</p>
<p>
- 제공자의 애플리케이션이 아무 권한도 지정하지 않은 경우, 다른 애플리케이션은 해당 제공자의
-데이터에 액세스할 수 없습니다. 그러나 제공자의 애플리케이션 내에 있는 구성 요소는
+ 제공자의 애플리케이션이 아무 권한도 지정하지 않은 경우, 다른 애플리케이션은 해당 제공자의
+데이터에 액세스할 수 없습니다. 그러나 제공자의 애플리케이션 내에 있는 구성 요소는
지정된 권한과 무관하게 항상 읽기 및 쓰기 액세스 권한을 모두 가지고 있습니다.
</p>
<p>
- 이전에 언급한 것과 같이 사용자 사전 제공자에서 데이터를 검색하려면
+ 이전에 언급한 것과 같이 사용자 사전 제공자에서 데이터를 검색하려면
<code>android.permission.READ_USER_DICTIONARY</code> 권한이 필요합니다.
이 제공자에게는 데이터 삽입, 업데이트 또는 삭제에 각각 별도의 <code>android.permission.WRITE_USER_DICTIONARY</code>
권한이 있습니다.
</p>
<p>
- 제공자에 액세스하는 데 필요한 권한을 얻으려면 애플리케이션은
+ 제공자에 액세스하는 데 필요한 권한을 얻으려면 애플리케이션은
자신의 매니페스트 파일에 있는 <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-으로 그러한 권한을 요청합니다. Android 패키지 관리자가 애플리케이션을 설치하는 경우,
+으로 그러한 권한을 요청합니다. Android 패키지 관리자가 애플리케이션을 설치하는 경우,
사용자는 애플리케이션이 요청하는 권한을 모두 승인해야 합니다. 사용자가 이를 모두 승인하면
패키지 관리자가 설치를 계속하지만, 사용자가 이를 승인하지 않으면 패키지 관리자는 설치를 중단합니다.
</p>
<p>
-
+
다음 <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
요소는 사용자 사전 제공자에 읽기 액세스 권한을 요청하는 것입니다.
</p>
@@ -717,7 +717,7 @@
<uses-permission android:name="android.permission.READ_USER_DICTIONARY">
</pre>
<p>
- 제공자 액세스 권한이 미치는 영향은
+ 제공자 액세스 권한이 미치는 영향은
<a href="{@docRoot}guide/topics/security/security.html">보안 및 권한</a> 가이드에 좀 더 자세히 설명되어 있습니다.
</p>
@@ -725,15 +725,15 @@
<!-- Inserting, Updating, and Deleting Data -->
<h2 id="Modifications">데이터 삽입, 업데이트 및 삭제</h2>
<p>
- 제공자로부터 데이터를 검색하는 것과 같은 방식으로, 데이터를 수정할 때에도 제공자 클라이언트와 제공자의
+ 제공자로부터 데이터를 검색하는 것과 같은 방식으로, 데이터를 수정할 때에도 제공자 클라이언트와 제공자의
{@link android.content.ContentProvider} 사이의 상호작용을 사용합니다.
- {@link android.content.ContentResolver}의 메서드를 호출하면서
-{@link android.content.ContentProvider}의 상응하는 메서드로 전달된 인수를 사용합니다.
+ {@link android.content.ContentResolver}의 메서드를 호출하면서
+{@link android.content.ContentProvider}의 상응하는 메서드로 전달된 인수를 사용합니다.
제공자와 제공자의 클라이언트가 보안과 프로세스간 통신을 자동으로 처리합니다.
</p>
<h3 id="Inserting">데이터 삽입</h3>
<p>
- 데이터를 제공자 안으로 삽입하려면,
+ 데이터를 제공자 안으로 삽입하려면,
{@link android.content.ContentResolver#insert ContentResolver.insert()}
메서드를 호출합니다. 이 메서드는 제공자에 새로운 행을 삽입하고 해당 열에 대한 콘텐츠 URI를 반환합니다.
이 조각은 사용자 사전 제공자에 새 단어를 삽입하는 방법을 나타낸 것입니다.
@@ -763,8 +763,8 @@
</pre>
<p>
새로운 행에 대한 데이터는 단일 행 커서와 형태가 유사한 단일 {@link android.content.ContentValues} 개체로
-이동합니다. 이 개체 내의 열은 모두 같은 데이터 유형을 가지지 않아도 됩니다.
-또한 아예 값을 지정하고 싶지 않은 경우라면 열을 <code>null</code>로 설정할 수 있습니다.
+이동합니다. 이 개체 내의 열은 모두 같은 데이터 유형을 가지지 않아도 됩니다.
+또한 아예 값을 지정하고 싶지 않은 경우라면 열을 <code>null</code>로 설정할 수 있습니다.
이때 {@link android.content.ContentValues#putNull ContentValues.putNull()}을 사용하면 됩니다.
</p>
<p>
@@ -790,11 +790,11 @@
</p>
<h3 id="Updating">데이터 업데이트</h3>
<p>
- 행을 업데이트하려면 업데이트된 값과 함께 {@link android.content.ContentValues} 개체를 사용합니다.
+ 행을 업데이트하려면 업데이트된 값과 함께 {@link android.content.ContentValues} 개체를 사용합니다.
이때 값은 삽입할 때와 똑같고, 선택 기준은 쿼리할 때와 같습니다.
사용하는 클라이언트 메서드는
-{@link android.content.ContentResolver#update ContentResolver.update()}입니다.
-값을 추가하는 것은 업데이트 중인 열에 대한 {@link android.content.ContentValues} 개체에만 하면 됩니다.
+{@link android.content.ContentResolver#update ContentResolver.update()}입니다.
+값을 추가하는 것은 업데이트 중인 열에 대한 {@link android.content.ContentValues} 개체에만 하면 됩니다.
열의 콘텐츠를 삭제하려면, 값을 <code>null</code>로 설정하십시오.
</p>
<p>
@@ -827,13 +827,13 @@
);
</pre>
<p>
-
+
{@link android.content.ContentResolver#update ContentResolver.update()}를 호출하는 경우에는 사용자 입력도 삭제해야 합니다. 이 내용에 관해 자세히 알아보려면
<a href="#Injection">악의적인 입력에 대한 보호</a> 섹션을 읽어 보십시오.
</p>
<h3 id="Deleting">데이터 삭제</h3>
<p>
- 행을 삭제하는 것은 행 데이터를 검색하는 것과 비슷합니다. 즉, 삭제하고자 하는 행에 대한 선택 기준을 지정하면
+ 행을 삭제하는 것은 행 데이터를 검색하는 것과 비슷합니다. 즉, 삭제하고자 하는 행에 대한 선택 기준을 지정하면
클라이언트 메서드가 삭제된 행 수를 반환하는 식입니다.
다음 조각은 앱 ID가 "user"와 일치하는 행을 삭제합니다. 메서드가 삭제된 행 수를 반환합니다.
@@ -857,14 +857,14 @@
);
</pre>
<p>
- {@link android.content.ContentResolver#delete ContentResolver.delete()}를
+ {@link android.content.ContentResolver#delete ContentResolver.delete()}를
호출하는 경우에는 사용자 입력도 삭제해야 합니다. 이 내용에 관해 자세히 알아보려면
<a href="#Injection">악의적인 입력에 대한 보호</a> 섹션을 읽어 보십시오.
</p>
<!-- Provider Data Types -->
<h2 id="DataTypes">제공자 데이터 유형</h2>
<p>
- 콘텐츠 제공자는 아주 다양한 데이터 유형을 제공할 수 있습니다.
+ 콘텐츠 제공자는 아주 다양한 데이터 유형을 제공할 수 있습니다.
사용자 사전 제공자는 텍스트만 제공하지만, 제공자는 다음과 같은 형식도 제공할 수 있습니다.
</p>
<ul>
@@ -883,29 +883,29 @@
</ul>
<p>
제공자가 종종 사용하는 또 다른 데이터 유형은 64KB 바이트 배열로 구현되는 BLOB(Binary Large OBject)입니다.
- 이용 가능한 데이터 유형을 확인하려면
+ 이용 가능한 데이터 유형을 확인하려면
{@link android.database.Cursor} 클래스 "가져오기" 메서드를 살펴보면 됩니다.
</p>
<p>
제공자 내의 각 열에 대한 데이터 유형은 보통 자신의 문서에 목록으로 나열되어 있습니다.
- 사용자 사전 제공자의 데이터 유형은 제공자의 계약 클래스
+ 사용자 사전 제공자의 데이터 유형은 제공자의 계약 클래스
{@link android.provider.UserDictionary.Words}의 참조 문서에 나열되어 있습니다(계약 클래스는
<a href="#ContractClasses">계약 클래스</a> 섹션에 설명되어 있습니다).
@link android.database.Cursor#getType
Cursor.getType()}을 호출해서도 데이터 유형을 결정할 수 있습니다.
</p>
<p>
- 제공자는 스스로 정의하는 각 콘텐츠 URI의 MIME 데이터 유형 정보도 유지관리합니다.
-MIME 유형 정보를 사용하면 애플리케이션이 제공자가 제공하는 데이터를 처리할 수 있을지 알아낼 수도 있고,
-MIME 유형을 근거로 처리 유형을 선택할 수도 있습니다.
+ 제공자는 스스로 정의하는 각 콘텐츠 URI의 MIME 데이터 유형 정보도 유지관리합니다.
+MIME 유형 정보를 사용하면 애플리케이션이 제공자가 제공하는 데이터를 처리할 수 있을지 알아낼 수도 있고,
+MIME 유형을 근거로 처리 유형을 선택할 수도 있습니다.
MIME 유형이 필요한 시점은 주로 복잡한 데이터 구조 또는 파일이 들어 있는 제공자를 다룰 때입니다.
예를 들어 연락처 제공자 내의 {@link android.provider.ContactsContract.Data}
테이블은 MIME 유형을 사용하여 각 행에 저장된 연락처 데이터의 유형에 레이블을 붙입니다.
- 콘텐츠 URI에 상응하는 MIME 유형을 가져오려면
+ 콘텐츠 URI에 상응하는 MIME 유형을 가져오려면
{@link android.content.ContentResolver#getType ContentResolver.getType()}을 호출하십시오.
</p>
<p>
- <a href="#MIMETypeReference">MIME 유형 참조</a> 섹션에서 표준 및 사용자 지정 MIME 유형의
+ <a href="#MIMETypeReference">MIME 유형 참조</a> 섹션에서 표준 및 사용자 지정 MIME 유형의
두 가지를 모두 설명하고 있습니다.
</p>
@@ -922,13 +922,13 @@
{@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}로 이를 적용할 수 있습니다.
</li>
<li>
- 비동기식 쿼리: 쿼리는 별도의 스레드에서 수행해야 합니다. 이 작업을 수행하는 한 가지 방법으로
-{@link android.content.CursorLoader} 개체를 사용하는 것이 있습니다. 이 사용 방법은
+ 비동기식 쿼리: 쿼리는 별도의 스레드에서 수행해야 합니다. 이 작업을 수행하는 한 가지 방법으로
+{@link android.content.CursorLoader} 개체를 사용하는 것이 있습니다. 이 사용 방법은
<a href="{@docRoot}guide/components/loaders.html">로더</a> 가이드에 있는 예시에서 설명합니다.
</li>
<li>
- <a href="#Intents">인텐트를 통한 데이터 액세스</a>:
+ <a href="#Intents">인텐트를 통한 데이터 액세스</a>:
인텐트를 제공자에 직접 보낼 수는 없지만, 인텐트를 제공자의 애플리케이션에 보낼 수는 있습니다.
보통은 이것이 제공자의 데이터를 수정하기에 가장 좋습니다.
</li>
@@ -938,23 +938,23 @@
</p>
<h3 id="Batch">일괄 액세스</h3>
<p>
- 제공자에 일괄 액세스를 하면 많은 수의 행을 삽입할 때, 같은 메서드 호출 내에서 여러 개의 테이블에 여러 행을 삽입할 때
+ 제공자에 일괄 액세스를 하면 많은 수의 행을 삽입할 때, 같은 메서드 호출 내에서 여러 개의 테이블에 여러 행을 삽입할 때
또는 전반적으로, 프로세스 경계를 가로질러 일련의 작업을 수행하는 경우(원자성 작업) 유용합니다.
</p>
<p>
"일괄 모드"로 제공자에 액세스하려면
-{@link android.content.ContentProviderOperation} 개체의 배열을 생성한 다음 이를 콘텐츠 제공자에게
+{@link android.content.ContentProviderOperation} 개체의 배열을 생성한 다음 이를 콘텐츠 제공자에게
{@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}로
- 발송하면 됩니다.
+ 발송하면 됩니다.
이 메서드에는 특정한 콘텐츠 URI보다는 콘텐츠 제공자의 <em>권한</em>을 전달합니다.
-이렇게 하면 배열 내의 각 {@link android.content.ContentProviderOperation} 개체가
+이렇게 하면 배열 내의 각 {@link android.content.ContentProviderOperation} 개체가
서로 다른 테이블에 대해 작용하도록 할 수 있습니다. {@link android.content.ContentResolver#applyBatch
ContentResolver.applyBatch()}를 호출하면 일련의 결과를 반환합니다.
</p>
<p>
{@link android.provider.ContactsContract.RawContacts} 계약 클래스의 설명에
- 일괄 삽입을 설명하는 코드 조각이 포함되어 있습니다.
+ 일괄 삽입을 설명하는 코드 조각이 포함되어 있습니다.
<a href="{@docRoot}resources/samples/ContactManager/index.html">연락처 관리자</a>
샘플 애플리케이션에는 <code>ContactAdder.java</code>
소스 파일의 일괄 액세스 예시가 포함되어 있습니다.
@@ -963,31 +963,31 @@
<div class="sidebox">
<h2>도우미 앱을 사용한 데이터 표시</h2>
<p>
- 애플리케이션에 액세스 권한이 <em>있더라도</em>
-다른 애플리케이션에 데이터를 표시할 인텐트를 사용하고자 할 수 있습니다. 예를 들어 캘린더 애플리케이션은
+ 애플리케이션에 액세스 권한이 <em>있더라도</em>
+다른 애플리케이션에 데이터를 표시할 인텐트를 사용하고자 할 수 있습니다. 예를 들어 캘린더 애플리케이션은
특정 날짜나 이벤트를 표시하는 {@link android.content.Intent#ACTION_VIEW}를 허용합니다.
이 때문에 나름의 UI를 직접 생성하지 않고도 캘린더 정보를 표시할 수 있습니다.
-이 기능에 대한 자세한 정보는
+이 기능에 대한 자세한 정보는
<a href="{@docRoot}guide/topics/providers/calendar-provider.html">캘린더 제공자</a> 가이드를 참조하십시오.
</p>
<p>
인텐트를 보낼 목적지인 애플리케이션은 제공자와 연관된 애플리케이션이 아니어도 됩니다.
- 예를 들어 연락처 제공자에서 연락처를 검색한 다음, 해당 연락처의 이미지에 대한 콘텐츠 URI가 들어 있는
-{@link android.content.Intent#ACTION_VIEW} 인텐트를
+ 예를 들어 연락처 제공자에서 연락처를 검색한 다음, 해당 연락처의 이미지에 대한 콘텐츠 URI가 들어 있는
+{@link android.content.Intent#ACTION_VIEW} 인텐트를
이미지 뷰어로 보낼 수 있습니다.
</p>
</div>
</div>
<h3 id="Intents">인텐트를 통한 데이터 액세스</h3>
<p>
- 인텐트는 콘텐츠 제공자에 간접 액세스를 제공할 수 있습니다. 애플리케이션에 액세스 권한이 없는데도
-사용자에게 제공자 내의 데이터에 액세스 권한을 허가하려면, 권한을 가지고 있는 애플리케이션에서 결과 인텐트를 다시 가져오거나
+ 인텐트는 콘텐츠 제공자에 간접 액세스를 제공할 수 있습니다. 애플리케이션에 액세스 권한이 없는데도
+사용자에게 제공자 내의 데이터에 액세스 권한을 허가하려면, 권한을 가지고 있는 애플리케이션에서 결과 인텐트를 다시 가져오거나
권한이 있는 애플리케이션을 활성화한 다음 사용자에게 그 애플리케이션에서 작업하도록 하면 됩니다.
</p>
<h4>임시 권한으로 액세스 얻기</h4>
<p>
- 적절한 액세스 권한이 없더라도 콘텐츠 제공자 내의 데이터에 액세스할 수는 있습니다.
+ 적절한 액세스 권한이 없더라도 콘텐츠 제공자 내의 데이터에 액세스할 수는 있습니다.
권한을 가지고 있는 애플리케이션에 인텐트를 보내 "URI" 권한이 들어 있는 결과 인텐트를 돌려받으면 됩니다.
이들 권한은 특정 콘텐츠 URI에 대한 권한으로, 이를 수신하는 액티비티가 완료될 때까지 유지됩니다.
@@ -1005,27 +1005,27 @@
</li>
</ul>
<p class="note">
- <strong>참고:</strong> 이와 같은 플래그는 콘텐츠 URI에 권한이 들어 있는 제공자에 일반적인 읽기 또는 쓰기 액세스
+ <strong>참고:</strong> 이와 같은 플래그는 콘텐츠 URI에 권한이 들어 있는 제공자에 일반적인 읽기 또는 쓰기 액세스
권한을 부여하지는 않습니다. 이 액세스는 URI 자체에만 해당됩니다.
</p>
<p>
- 제공자는 자신의 매니페스트 내의 콘텐츠 URI에 대한 URI 권한을 정의합니다. 이때
+ 제공자는 자신의 매니페스트 내의 콘텐츠 URI에 대한 URI 권한을 정의합니다. 이때
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
- 요소의
+ 요소의
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">android:grantUriPermission</a></code>
- 속성을 사용하며,
+ 속성을 사용하며,
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
- 요소의
+ 요소의
<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
- 하위 요소도 사용합니다.
+ 하위 요소도 사용합니다.
URI 권한 메커니즘은 "URI 권한" 섹션의 <a href="{@docRoot}guide/topics/security/security.html">보안 및 권한</a> 가이드에
자세히 설명되어 있습니다.
</p>
<p>
예를 들어, {@link android.Manifest.permission#READ_CONTACTS} 권한이 없더라도
-연락처 제공자 내의 연락처에 대한 데이터를 검색할 수 있습니다.
-이 작업을 하면 좋은 예로, 연락처에 기재된 사람의 생일에 전자 축하 카드를 보내주는 애플리케이션을 들 수 있습니다.
-{@link android.Manifest.permission#READ_CONTACTS}를 요청하면
+연락처 제공자 내의 연락처에 대한 데이터를 검색할 수 있습니다.
+이 작업을 하면 좋은 예로, 연락처에 기재된 사람의 생일에 전자 축하 카드를 보내주는 애플리케이션을 들 수 있습니다.
+{@link android.Manifest.permission#READ_CONTACTS}를 요청하면
사용자의 연락처 전체와 해당 정보 일체에 대한 액세스를 부여하므로, 그 대신 애플리케이션에서 어느 연락처를 사용할지 사용자가 직접 제어하도록 해주는 편이 낫습니다.
이렇게 하려면, 다음 절차를 사용합니다.
</p>
@@ -1043,13 +1043,13 @@
</li>
<li>
선택 액티비티에서 사용자가 업데이트할 연락처를 선택합니다.
- 이렇게 되면 선택 액티비티가
+ 이렇게 되면 선택 액티비티가
{@link android.app.Activity#setResult setResult(resultcode, intent)}
-를 호출하여 애플리케이션에 돌려줄 인텐트를 설정합니다.
-이 인텐트에 사용자가 선택한 연락처의 콘텐츠 URI와 "추가" 플래그
-{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}이 들어 있습니다.
-이러한 플래그가 URI에 앱으로의 권한을 허가하여 콘텐츠 URI가 가리킨 연락처에 대한 데이터를 읽을 수 있도록 합니다.
-그런 다음 선택 액티비티는 {@link android.app.Activity#finish()}를 호출하여
+를 호출하여 애플리케이션에 돌려줄 인텐트를 설정합니다.
+이 인텐트에 사용자가 선택한 연락처의 콘텐츠 URI와 "추가" 플래그
+{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}이 들어 있습니다.
+이러한 플래그가 URI에 앱으로의 권한을 허가하여 콘텐츠 URI가 가리킨 연락처에 대한 데이터를 읽을 수 있도록 합니다.
+그런 다음 선택 액티비티는 {@link android.app.Activity#finish()}를 호출하여
애플리케이션에 제어를 반환합니다.
</li>
<li>
@@ -1067,7 +1067,7 @@
</ol>
<h4>다른 애플리케이션 사용</h4>
<p>
- 개발자에게 액세스 권한이 없는 데이터를 사용자가 수정할 수 있도록 허용하는 간단한 방법은
+ 개발자에게 액세스 권한이 없는 데이터를 사용자가 수정할 수 있도록 허용하는 간단한 방법은
해당 권한을 가지고 있는 애플리케이션을 활성화한 다음 사용자에게 그곳에서 작업하도록 해주는 것입니다.
</p>
<p>
@@ -1082,18 +1082,18 @@
<h2 id="ContractClasses">계약 클래스</h2>
<p>
계약 클래스는 애플리케이션이 콘텐츠 URI, 열 이름, 인텐트 작업 및 콘텐츠 제공자의 다른 기능과
-작업할 수 있게 도와주는 상수를 정의합니다. 계약 클래스는 제공자와 함께 자동으로 포함되지 않습니다.
+작업할 수 있게 도와주는 상수를 정의합니다. 계약 클래스는 제공자와 함께 자동으로 포함되지 않습니다.
해당 제공자의 개발자가 이를 정의한 다음 다른 개발자가 사용할 수 있도록 해야 합니다.
- Android 플랫폼 내에 포함된 제공자는 대부분 패키지
+ Android 플랫폼 내에 포함된 제공자는 대부분 패키지
{@link android.provider} 안에 상응하는 계약 클래스를 가지고 있습니다.
</p>
<p>
예를 들어, 사용자 사전 제공자에는 콘텐츠 URI와 열 이름 상수가 들어 있는
-{@link android.provider.UserDictionary} 계약 클래스가 있습니다.
+{@link android.provider.UserDictionary} 계약 클래스가 있습니다.
"단어" 테이블에 대한 콘텐츠 URI는 상수
{@link android.provider.UserDictionary.Words#CONTENT_URI UserDictionary.Words.CONTENT_URI}에 정의됩니다.
- {@link android.provider.UserDictionary.Words} 클래스에도
-열 이름 상수가 들어 있으며, 이는 이 가이드의 예시 조각에서 사용됩니다.
+ {@link android.provider.UserDictionary.Words} 클래스에도
+열 이름 상수가 들어 있으며, 이는 이 가이드의 예시 조각에서 사용됩니다.
예를 들어 쿼리 프로젝션은 다음과 같이 정의될 수 있습니다.
</p>
<pre>
@@ -1106,7 +1106,7 @@
</pre>
<p>
또 다른 계약 클래스는 연락처 제공자의 {@link android.provider.ContactsContract}입니다.
- 이 클래스에 대한 참조 문서에는 예시 코드 조각이 포함되어 있습니다.
+ 이 클래스에 대한 참조 문서에는 예시 코드 조각이 포함되어 있습니다.
이것의 하위 클래스 중 하나인 {@link android.provider.ContactsContract.Intents.Insert}는
인텐트와 인텐트 데이터의 상수가 들어 있는 계약 클래스입니다.
</p>
@@ -1129,7 +1129,7 @@
해당 URI를 사용하는 쿼리가 HTML 태그가 들어 있는 텍스트를 반환할 것이라는 뜻입니다.
</p>
<p>
- 사용자 지정 MIME 유형 문자열은 "공급업체별" MIME 유형이라고도 불리며
+ 사용자 지정 MIME 유형 문자열은 "공급업체별" MIME 유형이라고도 불리며
이쪽의 <em>유형</em>과 <em>하위 유형</em> 값이 더 복잡합니다. <em>유형</em> 값은 경우에 따라 항상 다음과 같습니다.
</p>
<pre>
@@ -1184,13 +1184,13 @@
vnd.android.cursor.<strong>item</strong>/vnd.example.line2
</pre>
<p>
- 대부분의 콘텐츠 제공자는 자신이 사용하는 MIME 유형에 대한 계약 클래스 상수를 정의합니다.
+ 대부분의 콘텐츠 제공자는 자신이 사용하는 MIME 유형에 대한 계약 클래스 상수를 정의합니다.
예를 들어, 연락처 제공자 계약 클래스 {@link android.provider.ContactsContract.RawContacts}는
단일 연락처 행의 MIME 유행에 대한
상수 {@link android.provider.ContactsContract.RawContacts#CONTENT_ITEM_TYPE}을
정의합니다.
</p>
<p>
- 한 행에 대한 콘텐츠 URI는
+ 한 행에 대한 콘텐츠 URI는
<a href="#ContentURIs">콘텐츠 URI</a> 섹션에 설명되어 있습니다.
</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/ko/guide/topics/providers/content-provider-creating.jd
index 6757194..af7b584 100644
--- a/docs/html-intl/intl/ko/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/ko/guide/topics/providers/content-provider-creating.jd
@@ -95,16 +95,16 @@
<p>
- 콘텐츠 제공자는 데이터의 중앙 리포지토리로의 액세스를 관리합니다. Android 애플리케이션에서는
+ 콘텐츠 제공자는 데이터의 중앙 리포지토리로의 액세스를 관리합니다. Android 애플리케이션에서는
제공자를 하나 이상의 클래스로, 매니페스트 파일에 있는 요소와 함께 구현합니다.
- 클래스 중 하나가 하위 클래스
-{@link android.content.ContentProvider}를 구현하며,
-이것이 제공자와 다른 애플리케이션 사이의 인터페이스입니다. 콘텐츠 제공자는 다른 애플리케이션에 데이터를 사용할 수 있게 해주도록 만들어져 있지만,
-물론 애플리케이션 내에 사용자로 하여금 제공자가 관리하는 데이터를 쿼리하고 수정할 수 있게 허용하는
+ 클래스 중 하나가 하위 클래스
+{@link android.content.ContentProvider}를 구현하며,
+이것이 제공자와 다른 애플리케이션 사이의 인터페이스입니다. 콘텐츠 제공자는 다른 애플리케이션에 데이터를 사용할 수 있게 해주도록 만들어져 있지만,
+물론 애플리케이션 내에 사용자로 하여금 제공자가 관리하는 데이터를 쿼리하고 수정할 수 있게 허용하는
액티비티가 있을 수도 있습니다.
</p>
<p>
- 이 주제의 나머지 부분은 콘텐츠 제공자를 구축하기 위한 기본 단계 목록과
+ 이 주제의 나머지 부분은 콘텐츠 제공자를 구축하기 위한 기본 단계 목록과
사용할 API 목록으로 이루어져 있습니다.
</p>
@@ -124,12 +124,12 @@
<li>검색 프레임워크를 사용한 사용자 지정 검색 제안을 제공하고자 하는 경우</li>
</ul>
<p>
- 용도가 본인의 애플리케이션 안에서로 완전히 한정되어 있는 경우에는
+ 용도가 본인의 애플리케이션 안에서로 완전히 한정되어 있는 경우에는
제공자가 SQLite 데이터베이스를 사용하도록 하지 <em>않아도</em> 됩니다.
</p>
</li>
<li>
- 아직 읽지 않았다면, 지금 바로
+ 아직 읽지 않았다면, 지금 바로
<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
콘텐츠 제공자 기본 정보</a>를 읽고 제공자에 대해 자세히 알아보십시오.
</li>
@@ -146,8 +146,8 @@
</dt>
<dd>
일반적으로 사진, 오디오 또는 동영상과 같은
-파일에 들어가는 데이터입니다. 이런 파일을 애플리케이션의 비공개
-공간에 저장합니다. 제공자는 다른 애플리케이션으로부터 온 파일 요청에 응답하여
+파일에 들어가는 데이터입니다. 이런 파일을 애플리케이션의 비공개
+공간에 저장합니다. 제공자는 다른 애플리케이션으로부터 온 파일 요청에 응답하여
해당 파일로의 핸들을 제공할 수 있습니다.
</dd>
<dt>
@@ -155,9 +155,9 @@
</dt>
<dd>
일반적으로 데이터베이스, 배열 또는 유사 구조에 들어가는 데이터입니다.
- 이 데이터를 행과 열로 이루어진 테이블과 호환되는 형식으로 저장합니다.
-행은 사람이나 인벤토리의 항목과 같은 엔티티를 나타냅니다.
-열은 해당 엔티티에 대한 몇 가지 데이터, 예를 들어 사람 이름이나 항목 가격 등을 나타냅니다.
+ 이 데이터를 행과 열로 이루어진 테이블과 호환되는 형식으로 저장합니다.
+행은 사람이나 인벤토리의 항목과 같은 엔티티를 나타냅니다.
+열은 해당 엔티티에 대한 몇 가지 데이터, 예를 들어 사람 이름이나 항목 가격 등을 나타냅니다.
이 유형의 데이터를 저장하는 보편적인 방법은 SQLite 데이터베이스 안에 저장하는 것이지만,
모든 유형의 영구적인 저장소를 사용해도 됩니다. Android 시스템에서 사용할 수 있는 저장소 유형에 대해 자세히 알아보려면,
<a href="#DataStorage">
@@ -172,11 +172,11 @@
<a href="#ContentProvider">ContentProvider 클래스 구현</a> 섹션을 참조하십시오.
</li>
<li>
- 제공자의 권한 문자열, 그 콘텐츠 URI 및 열 이름을 정의합니다.
+ 제공자의 권한 문자열, 그 콘텐츠 URI 및 열 이름을 정의합니다.
제공자 애플리케이션이 인텐트를 처리하게 하려면, 인텐트 작업과 추가 데이터 및
-플래그도 정의합니다. 데이터에 액세스하기를 원하는 애플리케이션에 요구할 권한도
-정의합니다. 이 모든 값은 별도의 계약 클래스에서 상수로 정의하는 것을 고려해보는
-것이 좋습니다. 이 클래스를 나중에 다른 개발자에게 노출할 수 있습니다.
+플래그도 정의합니다. 데이터에 액세스하기를 원하는 애플리케이션에 요구할 권한도
+정의합니다. 이 모든 값은 별도의 계약 클래스에서 상수로 정의하는 것을 고려해보는
+것이 좋습니다. 이 클래스를 나중에 다른 개발자에게 노출할 수 있습니다.
콘텐츠 URI에 관한 자세한 정보는
<a href="#ContentURI">콘텐츠 URI 설계</a> 섹션을 참조하십시오.
인텐트에 관한 자세한 정보는
@@ -193,8 +193,8 @@
<!-- Designing Data Storage -->
<h2 id="DataStorage">데이터 저장소 설계</h2>
<p>
- 콘텐츠 제공자는 구조화된 형식으로 저장된 데이터로의 인터페이스입니다.
-인터페이스를 생성하기 전에 우선 데이터 저장 방식부터 결정해야 합니다.
+ 콘텐츠 제공자는 구조화된 형식으로 저장된 데이터로의 인터페이스입니다.
+인터페이스를 생성하기 전에 우선 데이터 저장 방식부터 결정해야 합니다.
데이터는 원하는 형식 아무 것으로나 저장할 수 있으며 그런 다음에 필요에 따라 해당 데이터를 읽고 쓸 인터페이스를 설계합니다.
</p>
<p>
@@ -203,26 +203,26 @@
<ul>
<li>
Android 시스템에는 Android 자체 제공자가 테이블 지향적 데이터를
-저장하는 데 사용하는 SQLite 데이터베이스 API가 포함됩니다.
+저장하는 데 사용하는 SQLite 데이터베이스 API가 포함됩니다.
{@link android.database.sqlite.SQLiteOpenHelper} 클래스는 데이터베이스를 생성할 수 있게 돕고,
{@link android.database.sqlite.SQLiteDatabase} 클래스는 데이터베이스 액세스를 위한
기본 클래스입니다.
<p>
- 리포지토리를 구현하기 위해 데이터베이스를 사용하지 않아도 된다는 점을 기억하십시오.
-제공자는 외부에 테이블 집합으로 나타나 관계적 데이터베이스와 비슷해 보이지만,
+ 리포지토리를 구현하기 위해 데이터베이스를 사용하지 않아도 된다는 점을 기억하십시오.
+제공자는 외부에 테이블 집합으로 나타나 관계적 데이터베이스와 비슷해 보이지만,
이것은 제공자의 내부 구현에 필요한 것은 아닙니다.
</p>
</li>
<li>
파일 데이터를 저장하는 데 있어 Android에는 다양한 파일 지향적 API가 있습니다.
파일 저장소에 관해 자세히 알아보려면
-<a href="{@docRoot}guide/topics/data/data-storage.html">데이터 저장소</a> 주제를 읽어 보십시오.
-음악이나 동영상 등 미디어 관련 데이터를 제공하는 제공자를 설계하는 경우,
+<a href="{@docRoot}guide/topics/data/data-storage.html">데이터 저장소</a> 주제를 읽어 보십시오.
+음악이나 동영상 등 미디어 관련 데이터를 제공하는 제공자를 설계하는 경우,
제공자가 테이블 데이터와 파일을 조합 할 수 있습니다.
</li>
<li>
- 네트워크 기반 데이터를 다루는 경우, {@link java.net} 및
-{@link android.net} 내의 클래스를 사용하십시오. 네트워크 기반 데이터를
+ 네트워크 기반 데이터를 다루는 경우, {@link java.net} 및
+{@link android.net} 내의 클래스를 사용하십시오. 네트워크 기반 데이터를
데이터베이스와 같은 로컬 데이터 스토어와 동기화한 다음, 해당 데이터를 테이블이나 파일로 제공할 수도 있습니다.
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">
샘플 동기화 어댑터</a> 샘플 애플리케이션이 이런 유형의 동기화를 보여줍니다.
@@ -237,7 +237,7 @@
<ul>
<li>
테이블 데이터는 언제나 제공자가 유지관리하는 "기본 키" 열을
-각 행의 고유한 숫자 값으로 보유하고 있어야 합니다. 이 값을 사용하여 해당 행을 다른 테이블의
+각 행의 고유한 숫자 값으로 보유하고 있어야 합니다. 이 값을 사용하여 해당 행을 다른 테이블의
관련 행에 연결시킬 수 있습니다(이를 "외래 키"로 사용). 이 열에는 어느 이름이든 사용할 수 있지만
{@link android.provider.BaseColumns#_ID BaseColumns._ID}를 사용하는 것이 가장 좋습니다.
왜냐하면 제공자 쿼리 결과를
@@ -246,8 +246,8 @@
</li>
<li>
비트맵 이미지나 파일 지향적 데이터의 매우 큰 조각을 제공하려면
-테이블 안에 직접 저장하기보다는 파일에 데이터를 저장한 뒤
-간접적으로 제공합니다. 이렇게 하는 경우, 제공자의 사용자들에게 데이터에 액세스하려면
+테이블 안에 직접 저장하기보다는 파일에 데이터를 저장한 뒤
+간접적으로 제공합니다. 이렇게 하는 경우, 제공자의 사용자들에게 데이터에 액세스하려면
{@link android.content.ContentResolver} 파일 메서드를 사용해야 한다고 알려야 합니다.
</li>
<li>
@@ -256,12 +256,12 @@
<a href="http://code.google.com/p/protobuf">프로토콜 버퍼</a> 또는
<a href="http://www.json.org">JSON 구조</a>를 저장할 수 있습니다.
<p>
- BLOB를 사용하여 <em>스키마에 종속되지 않은</em> 테이블을 구현할 수도 있습니다.
+ BLOB를 사용하여 <em>스키마에 종속되지 않은</em> 테이블을 구현할 수도 있습니다.
이 유형의 테이블에서는, 기본 키 열, MIME 유형 열 및 하나 이상의 일반적인 열을 BLOB로 정의합니다.
-
-BLOB 열에 있는 데이터의 의미는 MIME 유형 열에 있는 값으로 나타냅니다.
-이렇게 하면 같은 테이블에 여러 가지 행 유형을 저장할 수 있습니다. 연락처 제공자의 "데이터" 테이블
-{@link android.provider.ContactsContract.Data}가
+
+BLOB 열에 있는 데이터의 의미는 MIME 유형 열에 있는 값으로 나타냅니다.
+이렇게 하면 같은 테이블에 여러 가지 행 유형을 저장할 수 있습니다. 연락처 제공자의 "데이터" 테이블
+{@link android.provider.ContactsContract.Data}가
스키마에 종속되지 않은 테이블의 한 가지 예입니다.
</p>
</li>
@@ -269,11 +269,11 @@
<!-- Designing Content URIs -->
<h2 id="ContentURI">콘텐츠 URI 설계</h2>
<p>
- <strong>콘텐츠 URI</strong>는 제공자에서 데이터를 식별하는 URI입니다.
+ <strong>콘텐츠 URI</strong>는 제공자에서 데이터를 식별하는 URI입니다.
콘텐츠 URI에는 전체 제공자의 상징적인 이름(제공자의 <strong>권한</strong>)과
-테이블 또는 파일을 가리키는 이름(<strong>경로</strong>)이 포함됩니다.
-선택 항목 ID 부분은 테이블 내의 개별적인 행을 가리킵니다.
-{@link android.content.ContentProvider}의 모든 데이터 액세스 메서드는
+테이블 또는 파일을 가리키는 이름(<strong>경로</strong>)이 포함됩니다.
+선택 항목 ID 부분은 테이블 내의 개별적인 행을 가리킵니다.
+{@link android.content.ContentProvider}의 모든 데이터 액세스 메서드는
콘텐츠 URI를 인수로 가집니다. 이를 통해 액세스할 테이블, 행 또는 파일을 결정할 수 있습니다.
</p>
<p>
@@ -283,9 +283,9 @@
</p>
<h3>권한 설계</h3>
<p>
- 제공자에는 보통 하나의 권한이 있으며, 이것이 Android 내부 이름 역할을 합니다.
+ 제공자에는 보통 하나의 권한이 있으며, 이것이 Android 내부 이름 역할을 합니다.
다른 제공자와의 충돌을 피하려면, 제공자 권한의 기반으로 인터넷 도메인 소유권(역방향)을
-사용해야 합니다. 이 권장 사항은 Android 패키지 이름에도 적용되므로,
+사용해야 합니다. 이 권장 사항은 Android 패키지 이름에도 적용되므로,
제공자 권한을 제공자가 들어 있는 패키지의 이름 확장자로 정의해도 됩니다.
예를 들어, Android 패키지 이름이
<code>com.example.<appname></code>라면, 제공자에게
@@ -293,40 +293,40 @@
</p>
<h3>경로 구조 설계</h3>
<p>
- 개발자는 보통 권한으로부터 콘텐츠 URI를 생성할 때 개별적인 테이블을 가리키는
+ 개발자는 보통 권한으로부터 콘텐츠 URI를 생성할 때 개별적인 테이블을 가리키는
경로를 추가하는 방식을 사용합니다. 예를 들어, <em>table1</em>과
<em>table2</em>라는 테이블이 있다면, 이전 예시의 권한을 조합하여
-콘텐츠 URI<code>com.example.<appname>.provider/table1</code>와
+콘텐츠 URI<code>com.example.<appname>.provider/table1</code>와
<code>com.example.<appname>.provider/table2</code>를 도출합니다.
-
+
경로는 하나의 세그먼트에 국한되지 않으며, 경로의 각 수준에 대한 테이블이 아니어도 됩니다.
</p>
<h3>콘텐츠 URI ID 처리</h3>
<p>
- 규칙에 의하면, 제공자는 URI 맨 끝에서 행에 대한 ID 값이 있는 콘텐츠 URI를 허용하여
-테이블 내 하나의 행으로의 액세스를 제공합니다. 또한 규칙에 의해 제공자는
-이 ID 값을 테이블의 <code>_ID</code> 열에 일치시켜야 하며,
+ 규칙에 의하면, 제공자는 URI 맨 끝에서 행에 대한 ID 값이 있는 콘텐츠 URI를 허용하여
+테이블 내 하나의 행으로의 액세스를 제공합니다. 또한 규칙에 의해 제공자는
+이 ID 값을 테이블의 <code>_ID</code> 열에 일치시켜야 하며,
일치한 행에 대하여 요청된 액세스 허가를 수행해야 합니다.
</p>
<p>
- 이 규칙은 제공자에 액세스하는 앱을 위한 공통 설계 패턴을 세우는 데 유용합니다.
+ 이 규칙은 제공자에 액세스하는 앱을 위한 공통 설계 패턴을 세우는 데 유용합니다.
앱이 제공자에 대한 쿼리를 수행하고 그 결과로 나온 {@link android.database.Cursor}를
{@link android.widget.ListView}에 {@link android.widget.CursorAdapter}를 사용하여 표시합니다.
- {@link android.widget.CursorAdapter}의 정의에 따르면
+ {@link android.widget.CursorAdapter}의 정의에 따르면
{@link android.database.Cursor} 안의 열 중 하나는 <code>_ID</code>여야 합니다.
</p>
<p>
- 그러면 사용자가 데이터를 살펴보거나 수정하기 위하여
+ 그러면 사용자가 데이터를 살펴보거나 수정하기 위하여
UI에서 표시된 여러 행 중 하나를 선택합니다. 앱은 {@link android.widget.ListView}를 지원하는 {@link android.database.Cursor}에서 해당하는 열을 가져오고,
해당 열에 대한 <code>_ID</code> 값을 가져와서
-콘텐츠 URI에 추가하고, 제공자에 액세스 요청을 전송합니다. 그런 다음 제공자는
+콘텐츠 URI에 추가하고, 제공자에 액세스 요청을 전송합니다. 그런 다음 제공자는
사용자가 선택한 바로 그 행에 대해 쿼리 또는 수정 작업을 수행할 수 있습니다.
</p>
<h3>콘텐츠 URI 패턴</h3>
<p>
- 수신되는 콘텐츠 URI에 대해 어떤 조치를 취할지 선택하는 데 도움이 되도록 하기 위해 제공자 API에
-편의 클래스 {@link android.content.UriMatcher}가
-포함되어 있습니다. 이는 콘텐츠 URI "패턴"을 정수값으로 매핑합니다. 이 정수값은 특정 패턴에 일치하는
+ 수신되는 콘텐츠 URI에 대해 어떤 조치를 취할지 선택하는 데 도움이 되도록 하기 위해 제공자 API에
+편의 클래스 {@link android.content.UriMatcher}가
+포함되어 있습니다. 이는 콘텐츠 URI "패턴"을 정수값으로 매핑합니다. 이 정수값은 특정 패턴에 일치하는
콘텐츠 URI 또는 여러 URI에 대해 원하는 작업을 선택하는 데 <code>switch</code> 문에서 사용할 수 있습니다.
</p>
<p>
@@ -341,8 +341,8 @@
</li>
</ul>
<p>
- 콘텐츠 URI 처리의 설계와 코딩에 대한 예시로서 임의의 제공자를 들어 보겠습니다.
-이 제공자에는 권한 <code>com.example.app.provider</code>가 있고
+ 콘텐츠 URI 처리의 설계와 코딩에 대한 예시로서 임의의 제공자를 들어 보겠습니다.
+이 제공자에는 권한 <code>com.example.app.provider</code>가 있고
이 권한이 테이블을 가리키는 다음 콘텐츠 URI를 인식합니다.
</p>
<ul>
@@ -350,11 +350,11 @@
<code>content://com.example.app.provider/table1</code>: <code>table1</code>이라는 테이블입니다.
</li>
<li>
- <code>content://com.example.app.provider/table2/dataset1</code>:
+ <code>content://com.example.app.provider/table2/dataset1</code>:
<code>dataset1</code>이라는 테이블입니다.
</li>
<li>
- <code>content://com.example.app.provider/table2/dataset2</code>:
+ <code>content://com.example.app.provider/table2/dataset2</code>:
<code>dataset2</code>라는 테이블입니다.
</li>
<li>
@@ -363,7 +363,7 @@
</ul>
<p>
제공자는 추가된 행 ID가 있으면 이런 콘텐츠 URI도 인식합니다.
-예를 들어, <code>table3</code>에서 <code>1</code>이 식별한 행에 대한
+예를 들어, <code>table3</code>에서 <code>1</code>이 식별한 행에 대한
<code>content://com.example.app.provider/table3/1</code>이 이에 해당됩니다.
</p>
<p>
@@ -385,7 +385,7 @@
<code>table3</code>에 대한 콘텐츠 URI와 일치하지 않습니다.
</dd>
<dt>
- <code>content://com.example.app.provider/table3/#</code>:
+ <code>content://com.example.app.provider/table3/#</code>:
<code>table3</code>의 단일 행에 대한 콘텐츠 URI와 일치합니다. 예를 들어,
<code>6</code>이 식별한 행에 대한 <code>content://com.example.app.provider/table3/6</code>이 이에 해당됩니다.
@@ -393,8 +393,8 @@
</dl>
<p>
다음 코드 조각은 {@link android.content.UriMatcher} 작업에서 메서드의 작용 원리를 나타낸 것입니다.
- 이 코드는 테이블에 대한 콘텐츠 URI 패턴 <code>content://<authority>/<path></code>와
-단일 행에 대한 콘텐츠 URI 패턴 <code>content://<authority>/<path>/<id></code>를 사용하여
+ 이 코드는 테이블에 대한 콘텐츠 URI 패턴 <code>content://<authority>/<path></code>와
+단일 행에 대한 콘텐츠 URI 패턴 <code>content://<authority>/<path>/<id></code>를 사용하여
단일 행에 대한 URI와 전체 테이블에 대한 URI를 서로 다르게 처리합니다.
</p>
@@ -468,7 +468,7 @@
}
</pre>
<p>
- 또 다른 클래스, {@link android.content.ContentUris}가
+ 또 다른 클래스, {@link android.content.ContentUris}가
콘텐츠 URI의 <code>id</code> 부분을 다루기 위한 편의 메서드를 제공합니다. 클래스 {@link android.net.Uri}와
{@link android.net.Uri.Builder}에는
기존 {@link android.net.Uri} 개체를 구문 분석하고 새로운 개체를 구축하기 위한 편의 메서드가 포함되어 있습니다.
@@ -478,15 +478,15 @@
<h2 id="ContentProvider">ContentProvider 클래스 구현</h2>
<p>
{@link android.content.ContentProvider} 인스턴스는
-다른 애플리케이션으로부터의 요청을 처리하여 구조화된 데이터 세트로의 액세스를 관리합니다.
-모든 형태의 액세서가 궁극적으로 {@link android.content.ContentResolver}를 호출하며,
+다른 애플리케이션으로부터의 요청을 처리하여 구조화된 데이터 세트로의 액세스를 관리합니다.
+모든 형태의 액세서가 궁극적으로 {@link android.content.ContentResolver}를 호출하며,
그러면 이것이 액세스 권한을 얻기 위해 구체적인 {@link android.content.ContentProvider} 메서드를 호출합니다.
</p>
<h3 id="RequiredAccess">필수 메서드</h3>
<p>
- 추상 클래스 {@link android.content.ContentProvider}는
-개발자가 나름의 구체적인 하위 클래스의 일부분으로 구현해야만 하는 여섯 가지 추상 메서드를 정의합니다. 이와 같은 메서드는 모두
-({@link android.content.ContentProvider#onCreate() onCreate()}는 예외)
+ 추상 클래스 {@link android.content.ContentProvider}는
+개발자가 나름의 구체적인 하위 클래스의 일부분으로 구현해야만 하는 여섯 가지 추상 메서드를 정의합니다. 이와 같은 메서드는 모두
+({@link android.content.ContentProvider#onCreate() onCreate()}는 예외)
콘텐츠 제공자에 액세스하려 시도 중인 클라이언트 애플리케이션이 호출합니다.
</p>
<dl>
@@ -503,8 +503,8 @@
{@link android.content.ContentProvider#insert(Uri, ContentValues) insert()}
</dt>
<dd>
- 제공자에 새로운 행을 삽입합니다. 인수를 사용하여 대상 테이블을 선택하고
-사용할 열 값을 가져옵니다.
+ 제공자에 새로운 행을 삽입합니다. 인수를 사용하여 대상 테이블을 선택하고
+사용할 열 값을 가져옵니다.
새로 삽입된 행에 대한 콘텐츠 URI를 반환합니다.
</dd>
<dt>
@@ -512,7 +512,7 @@
update()}
</dt>
<dd>
- 제공자 내의 기존 행을 업데이트합니다. 인수를 사용하여
+ 제공자 내의 기존 행을 업데이트합니다. 인수를 사용하여
업데이트할 테이블과 행을 선택하고 업데이트한 열 값을 가져옵니다. 업데이트한 행 개수를 반환합니다.
</dd>
<dt>
@@ -526,20 +526,20 @@
{@link android.content.ContentProvider#getType(Uri) getType()}
</dt>
<dd>
- 콘텐츠 URI에 상응하는 MIME 유형을 반환합니다. 이 메서드는
+ 콘텐츠 URI에 상응하는 MIME 유형을 반환합니다. 이 메서드는
<a href="#MIMETypes">콘텐츠 제공자 MIME 유형</a> 섹션에 더 자세하게 설명되어 있습니다.
</dd>
<dt>
{@link android.content.ContentProvider#onCreate() onCreate()}
</dt>
<dd>
- 제공자를 초기화합니다. Android 시스템은 제공자를 생성한 직후
-이 메서드를 호출합니다.
+ 제공자를 초기화합니다. Android 시스템은 제공자를 생성한 직후
+이 메서드를 호출합니다.
{@link android.content.ContentResolver} 개체가 제공자에 액세스하려고 시도할 때까지는 제공자가 생성된 것이 아니라는 점을 유의하십시오.
</dd>
</dl>
<p>
- 이와 같은 메서드에는 동일하게 이름 붙여진
+ 이와 같은 메서드에는 동일하게 이름 붙여진
{@link android.content.ContentResolver} 메서드와 같은 서명이 있다는 것을 눈여겨 보십시오.
</p>
<p>
@@ -548,8 +548,8 @@
<ul>
<li>
이런 메서드는 모두({@link android.content.ContentProvider#onCreate() onCreate()}는 예외)
- 한꺼번에 여러 스레드가 호출할 수 있으므로, 스레드로부터 안전해야 합니다.
-다중 스레드에 대한 자세한 내용은
+ 한꺼번에 여러 스레드가 호출할 수 있으므로, 스레드로부터 안전해야 합니다.
+다중 스레드에 대한 자세한 내용은
<a href="{@docRoot}guide/components/processes-and-threads.html">
프로세스 및 스레드</a> 주제를 참조하십시오.
</li>
@@ -560,16 +560,16 @@
섹션에서 더욱 자세히 논의합니다.
</li>
<li>
- 이와 같은 메서드는 반드시 구현해야 하는 것이지만,
-예상되는 데이터 유형을 반환하는 것 외에 달리 코드가 해야 할 일은 없습니다.
+ 이와 같은 메서드는 반드시 구현해야 하는 것이지만,
+예상되는 데이터 유형을 반환하는 것 외에 달리 코드가 해야 할 일은 없습니다.
예를 들어 몇몇 테이블에 다른 애플리케이션이 데이터를 삽입하지 못하도록 방지하려고 합니다. 이렇게 하려면,
-{@link android.content.ContentProvider#insert(Uri, ContentValues) insert()}로의
+{@link android.content.ContentProvider#insert(Uri, ContentValues) insert()}로의
호출을 무시하고 0을 반환하면 됩니다.
</li>
</ul>
<h3 id="Query">query() 메서드 구현</h3>
<p>
-
+
{@link android.content.ContentProvider#query(Uri, String[], String, String[], String)
ContentProvider.query()} 메서드는 {@link android.database.Cursor} 개체를 반환해야 하고, 그렇지 못할 경우
{@link java.lang.Exception}을 발생시킵니다. SQLite 데이터베이스를 데이터 저장소로 사용하는 경우,
@@ -587,7 +587,7 @@
</p>
<p>
Android 시스템이 프로세스 경계를 가로질러 {@link java.lang.Exception}을
- 통신으로 전달할 수 있어야 한다는 점을 유의하십시오. Android가 이 작업을 할 수 있는 경우는
+ 통신으로 전달할 수 있어야 한다는 점을 유의하십시오. Android가 이 작업을 할 수 있는 경우는
쿼리 오류 처리에 유용할 수 있는 다음과 같은 예외에 해당될 때입니다.
</p>
<ul>
@@ -608,16 +608,16 @@
</p>
<p>
- 이 메서드가 새 행에 대한 콘텐츠 URI를 반환하는 것이 정상입니다. 이것을 구성하려면 새 행의
-<code>_ID</code>(또는 다른 기본 키) 값을 테이블의 콘텐츠 URI에 추가하며, 이때
+ 이 메서드가 새 행에 대한 콘텐츠 URI를 반환하는 것이 정상입니다. 이것을 구성하려면 새 행의
+<code>_ID</code>(또는 다른 기본 키) 값을 테이블의 콘텐츠 URI에 추가하며, 이때
{@link android.content.ContentUris#withAppendedId(Uri, long) withAppendedId()}를 사용합니다.
</p>
<h3 id="Delete">delete() 메서드 구현</h3>
<p>
{@link android.content.ContentProvider#delete(Uri, String, String[]) delete()} 메서드의 경우
- 데이터 저장소에서 물리적으로 행을 삭제하지 않아도 됩니다.
-제공자와 동기화 어댑터를 함께 사용하고 있는 경우,
-삭제된 행을 완전히 제거하기보다는 "삭제" 플래그로 표시하는 방법을 고려해볼 만합니다.
+ 데이터 저장소에서 물리적으로 행을 삭제하지 않아도 됩니다.
+제공자와 동기화 어댑터를 함께 사용하고 있는 경우,
+삭제된 행을 완전히 제거하기보다는 "삭제" 플래그로 표시하는 방법을 고려해볼 만합니다.
동기화 어댑터가 삭제된 행을 확인한 다음, 이를 제공자에서 삭제하기 전에 우선 서버에서 제거합니다.
</p>
<h3 id="Update">Update() 메서드 구현</h3>
@@ -633,20 +633,20 @@
<h3 id="OnCreate">onCreate() 메서드 구현</h3>
<p>
Android 시스템은 제공자를 시작할 때 {@link android.content.ContentProvider#onCreate()
-onCreate()}를 호출합니다. 이 메서드에서는 빠르게 실행되는 초기화만 수행해야 하며,
+onCreate()}를 호출합니다. 이 메서드에서는 빠르게 실행되는 초기화만 수행해야 하며,
데이터베이스 생성과 데이터 로딩은 제공자가 실제로 데이터에 대한 요청을 받을 때까지 미뤄두어야 합니다.
-
+
{@link android.content.ContentProvider#onCreate() onCreate()}에서 긴 작업을 수행하면
제공자의 시동 속도가 느려집니다. 이 때문에 제공자에서 다른 애플리케이션으로 전달되는 응답도 따라서 느려집니다.
</p>
<p>
예를 들어, SQLite 데이터베이스를 사용하는 경우
-{@link android.content.ContentProvider#onCreate() ContentProvider.onCreate()}에서
+{@link android.content.ContentProvider#onCreate() ContentProvider.onCreate()}에서
새로운 {@link android.database.sqlite.SQLiteOpenHelper} 개체를 생성하고,
그런 다음 데이터베이스를 처음 열 때 SQL 테이블을 생성할 수 있습니다. 이를 용이하게 하기 위해
{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase
-getWritableDatabase()}를 처음 호출하면 이것이 자동으로
+getWritableDatabase()}를 처음 호출하면 이것이 자동으로
{@link android.database.sqlite.SQLiteOpenHelper#onCreate(SQLiteDatabase)
SQLiteOpenHelper.onCreate()} 메서드를 호출합니다.
</p>
@@ -776,7 +776,7 @@
</p>
<p>
텍스트, HTML 또는 JPEG와 같은 보편적인 유형의 데이터라면
-{@link android.content.ContentProvider#getType(Uri) getType()}이
+{@link android.content.ContentProvider#getType(Uri) getType()}이
해당 데이터에 대한 표준 MIME 유형을 반환하는 것이 정상입니다. 이러한 표준 유형의 전체 목록은
<a href="http://www.iana.org/assignments/media-types/index.htm">IANA MIME 미디어 유형</a>
웹사이트에서 확인할 수 있습니다.
@@ -807,17 +807,17 @@
개발자가 <code><name></code>과 <code><type></code>을 제공합니다.
<code><name></code> 값은 전체적으로 고유해야 하고,
<code><type></code> 값은 상응하는 URI 패턴에 고유해야
-합니다. <code><name></code>으로 좋은 예는 회사 이름이나
-애플리케이션의 Android 패키지 이름을 들 수 있습니다.
-<code><type></code>으로 좋은 예는 URI와 연관된 테이블을 식별하는
+합니다. <code><name></code>으로 좋은 예는 회사 이름이나
+애플리케이션의 Android 패키지 이름을 들 수 있습니다.
+<code><type></code>으로 좋은 예는 URI와 연관된 테이블을 식별하는
문자열을 들 수 있습니다.
</p>
</li>
</ul>
<p>
- 예를 들어 어떤 제공자의 권한이
-<code>com.example.app.provider</code>이고, 이것이
+ 예를 들어 어떤 제공자의 권한이
+<code>com.example.app.provider</code>이고, 이것이
<code>table1</code>이라는 테이블을 노출하는 경우, <code>table1</code>의 여러 행에 대한 MIME 유형은 다음과 같습니다.
</p>
<pre>
@@ -833,8 +833,8 @@
<p>
제공자가 파일을 제공하는 경우,
{@link android.content.ContentProvider#getStreamTypes(Uri, String) getStreamTypes()}를 구현합니다.
- 이 메서드는 제공자가 주어진 콘텐츠 URI에 대해 반환할 수 있는 파일에 대한 MIME 유형의 {@link java.lang.String} 배열을 반환합니다.
-제공하는 MIME 유형을 MIME 유형 필터 인수 기준으로 필터링해야
+ 이 메서드는 제공자가 주어진 콘텐츠 URI에 대해 반환할 수 있는 파일에 대한 MIME 유형의 {@link java.lang.String} 배열을 반환합니다.
+제공하는 MIME 유형을 MIME 유형 필터 인수 기준으로 필터링해야
클라이언트가 처리하고자 하는 MIME 유형만 반환할 수 있습니다.
</p>
<p>
@@ -850,16 +850,16 @@
{ "image/jpeg", "image/png", "image/gif"}
</pre>
<p>
- 앱이 <code>.jpg</code> 파일에만 관심이 있는 경우에는
+ 앱이 <code>.jpg</code> 파일에만 관심이 있는 경우에는
필터 문자열 <code>*\/jpeg</code>으로 {@link android.content.ContentResolver#getStreamTypes(Uri, String)
- ContentResolver.getStreamTypes()}를 호출할 수 있습니다. 그러면
+ ContentResolver.getStreamTypes()}를 호출할 수 있습니다. 그러면
{@link android.content.ContentProvider#getStreamTypes(Uri, String)
ContentProvider.getStreamTypes()}가 다음과 같이 반환하는 것이 정상입니다.
<pre>
{"image/jpeg"}
</pre>
<p>
- 제공자가 필터 문자열에서 요청한 MIME 유형 중 제공하는 것이 없는 경우,
+ 제공자가 필터 문자열에서 요청한 MIME 유형 중 제공하는 것이 없는 경우,
{@link android.content.ContentProvider#getStreamTypes(Uri, String) getStreamTypes()}가
<code>null</code>을 반환하는 것이 정상입니다.
</p>
@@ -868,76 +868,76 @@
<!-- Implementing a Contract Class -->
<h2 id="ContractClass">계약 클래스 구현</h2>
<p>
- 계약 클래스는 <code>public final</code> 클래스로, 이 안에 URI, 열 이름, MIME 유형의
-상수 정의 및 제공자에 관련된 다른 메타 데이터가 들어 있습니다.
+ 계약 클래스는 <code>public final</code> 클래스로, 이 안에 URI, 열 이름, MIME 유형의
+상수 정의 및 제공자에 관련된 다른 메타 데이터가 들어 있습니다.
이 클래스는 URI, 열 이름 등의 실제 값에 변경된 내용이 있더라도
- 제공자에 올바르게 액세스할 수 있도록 보장하여 제공자와
+ 제공자에 올바르게 액세스할 수 있도록 보장하여 제공자와
다른 애플리케이션 사이의 계약을 확립합니다.
</p>
<p>
- 계약 클래스가 개발자에게 유용한 이유는 또 있습니다. 이 클래스는 보통 자신의 상수 이름으로
-니모닉 이름을 가지기 때문에 개발자가 열 이름 또는 URI에 잘못된 값을 사용할 가능성이 덜합니다.
-이것도 클래스의 일종이기 때문에 Javadoc 문서를 포함할 수 있습니다.
+ 계약 클래스가 개발자에게 유용한 이유는 또 있습니다. 이 클래스는 보통 자신의 상수 이름으로
+니모닉 이름을 가지기 때문에 개발자가 열 이름 또는 URI에 잘못된 값을 사용할 가능성이 덜합니다.
+이것도 클래스의 일종이기 때문에 Javadoc 문서를 포함할 수 있습니다.
Eclipse와 같은 통합 개발 환경은 계약 클래스의 상수 이름을 자동 완성하고
해당 상수에 대한 Javadoc을 표시할 수 있습니다.
</p>
<p>
- 개발자가 애플리케이션에서 계약 클래스의 클래스 파일에 액세스할 수는 없지만
+ 개발자가 애플리케이션에서 계약 클래스의 클래스 파일에 액세스할 수는 없지만
여러분이 제공하는 <code>.jar</code> 파일에서 이를 애플리케이션 안으로 정적으로 컴파일링할 수 있습니다.
</p>
<p>
- {@link android.provider.ContactsContract} 클래스와
+ {@link android.provider.ContactsContract} 클래스와
이에 중첩된 클래스가 계약 클래스의 예시입니다.
</p>
<h2 id="Permissions">콘텐츠 제공자 권한 구현</h2>
<p>
Android 시스템의 모든 측면에 대한 권한과 액세스는
<a href="{@docRoot}guide/topics/security/security.html">보안 및 권한</a> 주제에 설명되어 있습니다.
- <a href="{@docRoot}guide/topics/data/data-storage.html">데이터 저장소</a> 주제에서도
+ <a href="{@docRoot}guide/topics/data/data-storage.html">데이터 저장소</a> 주제에서도
다양한 유형의 저장소에 적용되는 보안 및 권한을 설명하고 있습니다.
간략히 말해 요점은 다음과 같습니다.
</p>
<ul>
<li>
- 기본적으로, 기기의 내부 저장소에 저장된 데이터 파일은
+ 기본적으로, 기기의 내부 저장소에 저장된 데이터 파일은
본인의 애플리케이션과 제공자 전용입니다.
</li>
<li>
- 본인이 생성한 {@link android.database.sqlite.SQLiteDatabase} 데이터베이스는
+ 본인이 생성한 {@link android.database.sqlite.SQLiteDatabase} 데이터베이스는
본인의 애플리케이션과 제공자만의 비공개 데이터입니다.
</li>
<li>
기본적으로 외부 저장소에 저장하는 데이터 파일은 <em>공개</em>이고
-<em>누구나 읽을 수 있습니다</em>. 외부 저장소에 있는 파일로의 액세스를 제공하는 데 콘텐츠 제공자를 쓸 수는
+<em>누구나 읽을 수 있습니다</em>. 외부 저장소에 있는 파일로의 액세스를 제공하는 데 콘텐츠 제공자를 쓸 수는
없습니다. 다른 애플리케이션이 다른 API 호출을 사용하여 해당 파일을 읽고 쓸 수 있기 때문입니다.
</li>
<li>
기기의 내부 저장소에 있는 파일 또는 SQLite 데이터베이스를 열거나 생성하기 위한 메서드 호출은
-다른 모든 애플리케이션에 읽기 및 쓰기 액세스 권한을 허가할 가능성이 있습니다.
+다른 모든 애플리케이션에 읽기 및 쓰기 액세스 권한을 허가할 가능성이 있습니다.
내부 파일이나 데이터베이스를 제공자의 리포지토리로 사용하고
-"누구나 읽을 수 있는" 또는 "누구나 쓸 수 있는" 액세스를 부여하면
-매니페스트에서 제공자에 대해 설정한 권한이 데이터를 보호하지 못합니다.
+"누구나 읽을 수 있는" 또는 "누구나 쓸 수 있는" 액세스를 부여하면
+매니페스트에서 제공자에 대해 설정한 권한이 데이터를 보호하지 못합니다.
내부 저장소 안에 있는 파일과 데이터베이스에 대한기본 액세스는 "비공개"이며, 제공자의 리포지토리가 이것을 변경하면 안 됩니다.
</li>
</ul>
<p>
- 데이터로의 액세스를 제어하기 위해 콘텐츠 제공자 권한을 쓰고자 하는 경우,
-데이터를 내부 파일, SQLite 데이터베이스 또는 "클라우드"(예: 원격 서버) 안의
+ 데이터로의 액세스를 제어하기 위해 콘텐츠 제공자 권한을 쓰고자 하는 경우,
+데이터를 내부 파일, SQLite 데이터베이스 또는 "클라우드"(예: 원격 서버) 안의
내부 파일로 저장해야 하고, 파일과 데이터베이스를 애플리케이션만의 비공개로 유지해야 합니다.
</p>
<h3>권한 구현</h3>
<p>
- 기본 데이터가 비공개라고 하더라도 모든 애플리케이션이 제공자를 읽고 제공자에 쓸 수 있습니다.
+ 기본 데이터가 비공개라고 하더라도 모든 애플리케이션이 제공자를 읽고 제공자에 쓸 수 있습니다.
기본적으로 제공자에는 권한이 설정되어 있지 않기 때문입니다. 이를 변경하려면,
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
<provider></a></code> 요소의 속성이나 하위 요소를 사용하여
-매니페스트 파일에 있는 제공자의 권한을 설정합니다. 권한은 제공자 전체에 적용되도록 설정할 수도 있고,
+매니페스트 파일에 있는 제공자의 권한을 설정합니다. 권한은 제공자 전체에 적용되도록 설정할 수도 있고,
특정 테이블에, 또는 심지어 특정 레코드에 적용되게 할 수도 있고 세 가지 모두를 택할 수도 있습니다.
</p>
<p>
- 제공자에 대한 권한은 매니페스트 파일에 있는 하나 이상의
+ 제공자에 대한 권한은 매니페스트 파일에 있는 하나 이상의
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">
- <permission></a></code> 요소로 정의합니다.
+ <permission></a></code> 요소로 정의합니다.
제공자에 고유한 권한을 설정하려면
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#nm">
android:name</a></code> 속성에 Java 스타일 범위를 사용합니다. 예를 들어 읽기 권한의 이름을
@@ -945,7 +945,7 @@
</p>
<p>
- 다음 목록은 제공자 권한의 범위를 설명한 것입니다.
+ 다음 목록은 제공자 권한의 범위를 설명한 것입니다.
제공자 전체에 적용되는 권한부터 시작하여 점차 세분화된 권한이 됩니다.
보다 세부화된 권한이 범위가 큰 것보다 우선합니다.
</p>
@@ -954,9 +954,9 @@
단일 읽기-쓰기 제공자 수준 권한
</dt>
<dd>
- 제공자 전체로의 읽기와 쓰기 액세스 양쪽 모두를 제어하는 하나의 권한으로,
+ 제공자 전체로의 읽기와 쓰기 액세스 양쪽 모두를 제어하는 하나의 권한으로,
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
- <provider></a></code> 요소의
+ <provider></a></code> 요소의
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">
android:permission</a></code> 속성으로 지정됩니다.
</dd>
@@ -978,14 +978,14 @@
경로 수준 권한
</dt>
<dd>
- 제공자의 콘텐츠 URI에 대한 읽기, 쓰기 또는 읽기/쓰기 권한입니다. 제어하고자 하는 각 URI를 직접 지정하되,
-이때
+ 제공자의 콘텐츠 URI에 대한 읽기, 쓰기 또는 읽기/쓰기 권한입니다. 제어하고자 하는 각 URI를 직접 지정하되,
+이때
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
- <provider></a></code> 요소의
+ <provider></a></code> 요소의
<code><a href="{@docRoot}guide/topics/manifest/path-permission-element.html">
- <path-permission></a></code> 하위 요소를 사용합니다. 지정하는 콘텐츠 URI마다
-읽기/쓰기 권한, 읽기 권한 또는 쓰기 권한을 하나씩 지정하거나 셋 모두를 지정할 수 있습니다.
-읽기 및 쓰기 권한이 읽기/쓰기 권한보다 우선합니다.
+ <path-permission></a></code> 하위 요소를 사용합니다. 지정하는 콘텐츠 URI마다
+읽기/쓰기 권한, 읽기 권한 또는 쓰기 권한을 하나씩 지정하거나 셋 모두를 지정할 수 있습니다.
+읽기 및 쓰기 권한이 읽기/쓰기 권한보다 우선합니다.
또한, 경로 수준 권한이 제공자 수준 권한보다 우선합니다.
</dd>
<dt>
@@ -993,18 +993,18 @@
</dt>
<dd>
애플리케이션에 임시 액세스를 허용하는 권한 수준입니다.
-해당 애플리케이션에 일반적으로 요구되는 권한이 없더라도 무관합니다.
+해당 애플리케이션에 일반적으로 요구되는 권한이 없더라도 무관합니다.
임시 액세스 기능은 매니페스트에서 요청해야 하는
-권한과 애플리케이션 개수를 줄여줍니다. 임시 권한을 사용하는 경우,
-제공자에 대하여 "영구" 권한을 필요로하는 애플리케이션은
+권한과 애플리케이션 개수를 줄여줍니다. 임시 권한을 사용하는 경우,
+제공자에 대하여 "영구" 권한을 필요로하는 애플리케이션은
모든 데이터에 지속적으로 액세스하는 것들뿐입니다.
<p>
- 이메일 제공자와 앱을 구현할 때 필요한 권한을 예로 들어 보겠습니다.
-외부 이미지 뷰어 애플리케이션으로 하여금 제공자에서 보낸 사진 첨부 파일을
-표시하도록 허용하고자 한다고 가정합니다. 권한을 요구하지 않고 이미지 뷰어에 필수 액세스를 부여하려면,
-사진에 대한 콘텐츠 URI에 해단되는 임시 권한을 설정하십시오.
+ 이메일 제공자와 앱을 구현할 때 필요한 권한을 예로 들어 보겠습니다.
+외부 이미지 뷰어 애플리케이션으로 하여금 제공자에서 보낸 사진 첨부 파일을
+표시하도록 허용하고자 한다고 가정합니다. 권한을 요구하지 않고 이미지 뷰어에 필수 액세스를 부여하려면,
+사진에 대한 콘텐츠 URI에 해단되는 임시 권한을 설정하십시오.
사용자가 사진을 표시하기를 원할 때 앱이 사진의 콘텐츠 URI와 권한 플래그를 포함하는 인텐트를
-이미지 뷰어에 보내도록 이메일 앱을 설계합니다. 그러면 해당 이미지 뷰어가
+이미지 뷰어에 보내도록 이메일 앱을 설계합니다. 그러면 해당 이미지 뷰어가
이메일 제공자에 사진 검색을 쿼리할 수 있으며, 이 뷰어에 제공자에 대한 정상적인 읽기 권한이 없더라도 무방합니다.
</p>
@@ -1017,29 +1017,29 @@
<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">
<grant-uri-permission></a></code> 하위 요소를
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
- <provider></a></code> 요소에 추가하면 됩니다. 임시 권한을 사용하는 경우,
+ <provider></a></code> 요소에 추가하면 됩니다. 임시 권한을 사용하는 경우,
제공자에서 콘텐츠 URI에 대한 지원을 제거할 때마다 {@link android.content.Context#revokeUriPermission(Uri, int)
- Context.revokeUriPermission()}을 호출해야 합니다.
+ Context.revokeUriPermission()}을 호출해야 합니다.
그러면 콘텐츠 URI가 임시 권한과 연관됩니다.
</p>
<p>
속성의 값에 따라 제공자에 액세스 가능한 정도가 결정됩니다.
- 속성이 <code>true</code>로 설정되어 있는 경우라면
-시스템이 제공자 전체에 임시 권한을 허용하며, 제공자 수준 또는
+ 속성이 <code>true</code>로 설정되어 있는 경우라면
+시스템이 제공자 전체에 임시 권한을 허용하며, 제공자 수준 또는
경로 수준 권한에서 요구하는 다른 모든 권한을 재정의합니다.
</p>
<p>
- 이 플래그가 <code>false</code>로 설정되면, 반드시
+ 이 플래그가 <code>false</code>로 설정되면, 반드시
<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">
<grant-uri-permission></a></code> 하위 요소를
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
- <provider></a></code> 요소에 추가해야 합니다. 각 하위 요소는 임시 권한을 허용한
+ <provider></a></code> 요소에 추가해야 합니다. 각 하위 요소는 임시 권한을 허용한
콘텐츠 URI(하나 또는 여러 개)를 나타냅니다.
</p>
<p>
애플리케이션에 임시 액세스를 위임하려면, 인텐트에
{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION} 또는
-{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION} 플래그, 또는 둘 모두가 들어 있어야 합니다. 이들은
+{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION} 플래그, 또는 둘 모두가 들어 있어야 합니다. 이들은
{@link android.content.Intent#setFlags(int) setFlags()} 메서드로 설정됩니다.
</p>
<p>
@@ -1087,7 +1087,7 @@
권한
</dt>
<dd>
- 제공자의 데이터에 액세스하기 위해 다른 애플리케이션이
+ 제공자의 데이터에 액세스하기 위해 다른 애플리케이션이
반드시 가지고 있어야 하는 권한을 나타내는 속성입니다.
<ul>
<li>
@@ -1108,7 +1108,7 @@
</li>
</ul>
<p>
- 각종 권한과 그에 상응하는 속성은
+ 각종 권한과 그에 상응하는 속성은
<a href="#Permissions">콘텐츠 제공자 권한 구현</a> 섹션에 자세히 설명되어 있습니다.
</p>
@@ -1117,7 +1117,7 @@
시작 및 제어 속성
</dt>
<dd>
- 이와 같은 속성은 Android 시스템이 제공자를 시작하는 방법과 시점,
+ 이와 같은 속성은 Android 시스템이 제공자를 시작하는 방법과 시점,
제공자의 프로세스 특징과 기타 런타임 설정 등을 결정합니다.
<ul>
<li>
@@ -1130,12 +1130,12 @@
</li>
<li>
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#init">
- android:initOrder</a></code>: 같은 프로세스 내의 다른 제공자와 비교하여
+ android:initOrder</a></code>: 같은 프로세스 내의 다른 제공자와 비교하여
이 제공자가 시작되어야 하는 순서입니다.
</li>
<li>
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#multi">
- android:multiProcess</a></code>: 클라이언트를 호출하는 것과
+ android:multiProcess</a></code>: 클라이언트를 호출하는 것과
같은 프로세스에서 시스템이 제공자를 시작할 수 있게 해주는 플래그입니다.
</li>
<li>
@@ -1145,7 +1145,7 @@
</li>
<li>
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#sync">
- android:syncable</a></code>: 제공자의 데이터가
+ android:syncable</a></code>: 제공자의 데이터가
서버에 있는 데이터와 동기화될 예정임을 나타내는 플래그입니다.
</li>
</ul>
@@ -1165,7 +1165,7 @@
<li>
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#icon">
android:icon</a></code>: 제공자의 아이콘이 들어 있는 드로어블 리소스입니다.
- 이 아이콘은
+ 이 아이콘은
<em>설정</em> > <em>앱</em> > <em>모두</em>에 있는 앱 목록에서 제공자의 레이블 옆에 표시됩니다.
</li>
<li>
@@ -1187,28 +1187,28 @@
<h2 id="Intents">인텐트 및 데이터 액세스</h2>
<p>
애플리케이션이 콘텐츠 제공자에 간접적으로 액세스하려면 {@link android.content.Intent}를 사용하면 됩니다.
- 이 애플리케이션은 {@link android.content.ContentResolver} 또는
-{@link android.content.ContentProvider}의 메서드 중 어느 하나도 호출하지 않습니다.
-대신, 액티비티를 시작하는 인텐트를 전송합니다. 이 인텐트는 제공자가 소유한 애플리케이션의 일부인 경우가 많습니다.
-대상 액티비티가 데이터를 자체 UI에서 검색하고 표시하는 역할을 맡습니다.
+ 이 애플리케이션은 {@link android.content.ContentResolver} 또는
+{@link android.content.ContentProvider}의 메서드 중 어느 하나도 호출하지 않습니다.
+대신, 액티비티를 시작하는 인텐트를 전송합니다. 이 인텐트는 제공자가 소유한 애플리케이션의 일부인 경우가 많습니다.
+대상 액티비티가 데이터를 자체 UI에서 검색하고 표시하는 역할을 맡습니다.
인텐트의 동작에 따라 대상 액티비티가 사용자에게 프롬프트를 표시하여 제공자의 데이터를 수정하도록 할 수도 있습니다.
인텐트에는 대상 액티비티가 UI에 표시하는 "추가" 데이터가 들어 있을 수도 있습니다.
-그러면 사용자에게 이 데이터를 변경할 수 있는 옵션이 주어지고, 그런 다음 이를 사용하여
+그러면 사용자에게 이 데이터를 변경할 수 있는 옵션이 주어지고, 그런 다음 이를 사용하여
제공자 내의 데이터를 수정할 수 있습니다.
</p>
<p>
</p>
<p>
- 데이터 무결성을 보장하는 데 유용한 것을 원하면 인텐트 액세스를 사용하는 것이 좋습니다.
-엄격하게 정의된 비즈니스 논리에 따라 데이터가 삽입, 업데이트되고 삭제되는 것이 제공자를 크게 좌우할 수도 있습니다.
-이런 경우에 해당되면, 다른 애플리케이션에 데이터를 직접 수정하도록 허용하면 데이터가 잘못되는
+ 데이터 무결성을 보장하는 데 유용한 것을 원하면 인텐트 액세스를 사용하는 것이 좋습니다.
+엄격하게 정의된 비즈니스 논리에 따라 데이터가 삽입, 업데이트되고 삭제되는 것이 제공자를 크게 좌우할 수도 있습니다.
+이런 경우에 해당되면, 다른 애플리케이션에 데이터를 직접 수정하도록 허용하면 데이터가 잘못되는
결과를 초래할 수 있습니다. 개발자들에게 인텐트 액세스 사용을 허용하려면, 그 내용을 철저히 기록해두어야 합니다.
- 개발자들에게 자기 애플리케이션의 UI를 사용한 인텐트 액세스가
+ 개발자들에게 자기 애플리케이션의 UI를 사용한 인텐트 액세스가
코드로 데이터를 수정하려 시도하는 것보다 나은 이유를 설명해주십시오.
</p>
<p>
제공자의 데이터를 수정하고자 하는 수신되는 인텐트 처리도 다른 인텐트 처리와 다를 바가 없습니다.
- 인텐트 사용에 대한 자세한 내용은
+ 인텐트 사용에 대한 자세한 내용은
<a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a> 주제를 읽으면 확인할 수 있습니다.
</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/providers/content-providers.jd b/docs/html-intl/intl/ko/guide/topics/providers/content-providers.jd
index ce98840..8671f7b7 100644
--- a/docs/html-intl/intl/ko/guide/topics/providers/content-providers.jd
+++ b/docs/html-intl/intl/ko/guide/topics/providers/content-providers.jd
@@ -47,31 +47,31 @@
</div>
</div>
<p>
- 콘텐츠 제공자는 구조화된 데이터 세트로의 액세스를 관리합니다.
-데이터를 캡슐화하여 데이터 보안을 정의하는 데 필요한 메커니즘을 제공하기도 합니다.
+ 콘텐츠 제공자는 구조화된 데이터 세트로의 액세스를 관리합니다.
+데이터를 캡슐화하여 데이터 보안을 정의하는 데 필요한 메커니즘을 제공하기도 합니다.
콘텐츠 제공자는 한 프로세스의 데이터에 다른 프로세스에서 실행 중인 코드를 연결하는 표준 인터페이스입니다.
</p>
<p>
- 콘텐츠 제공자 내의 데이터에 액세스하고자 하는 경우,
+ 콘텐츠 제공자 내의 데이터에 액세스하고자 하는 경우,
애플리케이션의 {@link android.content.Context}에 있는
{@link android.content.ContentResolver} 개체를 사용하여 클라이언트로서 제공자와 통신을 주고받으면 됩니다.
- {@link android.content.ContentResolver} 개체가 제공자 개체와 통신하며, 이 개체는
-{@link android.content.ContentProvider}를 구현하는 클래스의 인스턴스입니다.
+ {@link android.content.ContentResolver} 개체가 제공자 개체와 통신하며, 이 개체는
+{@link android.content.ContentProvider}를 구현하는 클래스의 인스턴스입니다.
제공자 개체가 클라이언트로부터 데이터 요청을 받아 요청된 작업을 수행하며 결과를 반환합니다.
</p>
<p>
데이터를 다른 애플리케이션과 공유할 생각이 없으면 나름의 제공자를 개발하지 않아도 됩니다.
그러나, 자체 애플리케이션에서 사용자 지정 검색 제안을 제공하려면 나름의 제공자가 꼭 필요합니다.
- 또한, 복잡한 데이터나 파일을 자신의 애플리케이션에서 다른 애플리케이션으로 복사하여 붙여넣고자 하는 경우에도
+ 또한, 복잡한 데이터나 파일을 자신의 애플리케이션에서 다른 애플리케이션으로 복사하여 붙여넣고자 하는 경우에도
나름의 제공자가 필요합니다.
</p>
<p>
- Android 자체에 오디오, 동영상, 이미지 및 개인 연락처 정보 등의 데이터를 관리하는 콘텐츠 제공자가
-포함되어 있습니다. 그중 몇 가지를 목록으로 나열한 것을
+ Android 자체에 오디오, 동영상, 이미지 및 개인 연락처 정보 등의 데이터를 관리하는 콘텐츠 제공자가
+포함되어 있습니다. 그중 몇 가지를 목록으로 나열한 것을
<code><a href="{@docRoot}reference/android/provider/package-summary.html">android.provider</a>
- </code> 패키지에 대한 참조 문서에서 확인할 수 있습니다. 이와 같은 제공자는 몇 가지 제약이 있지만,
+ </code> 패키지에 대한 참조 문서에서 확인할 수 있습니다. 이와 같은 제공자는 몇 가지 제약이 있지만,
어느 Android 애플리케이션에나 액세스할 수 있습니다.
</p><p>
다음 주제에서는 콘텐츠 제공자에 대해 좀 더 자세히 설명합니다.
diff --git a/docs/html-intl/intl/ko/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/ko/guide/topics/providers/document-provider.jd
index e356e22..665a72a 100644
--- a/docs/html-intl/intl/ko/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/ko/guide/topics/providers/document-provider.jd
@@ -75,96 +75,96 @@
</div>
-<p>Android 4.4(API 레벨 19)에서는 저장소 액세스 프레임워크(SAF)를 처음 도입하게 되었습니다. SAF는
-사용자가 선호하는 문서 저장소 제공자 전체를 걸쳐 문서, 이미지 및 각종 다른 파일을
-탐색하고 여는 작업을 간편하게 만들어줍니다. 표준형의, 사용하기 쉬운 UI로
+<p>Android 4.4(API 레벨 19)에서는 저장소 액세스 프레임워크(SAF)를 처음 도입하게 되었습니다. SAF는
+사용자가 선호하는 문서 저장소 제공자 전체를 걸쳐 문서, 이미지 및 각종 다른 파일을
+탐색하고 여는 작업을 간편하게 만들어줍니다. 표준형의, 사용하기 쉬운 UI로
사용자가 각종 앱과 제공자에 걸쳐 일관된 방식으로 파일을 탐색하고 최근 내용에 액세스할 수 있게 해줍니다.</p>
-<p>클라우드 또는 로컬 저장소 서비스가 이 에코시스템에 참가하려면 자신의 서비스를 캡슐화하는
-{@link android.provider.DocumentsProvider}를 구현하면 됩니다.
-제공자의 문서에 액세스해야 하는 클라이언트 앱의 경우 단 몇 줄의 코드만으로
+<p>클라우드 또는 로컬 저장소 서비스가 이 에코시스템에 참가하려면 자신의 서비스를 캡슐화하는
+{@link android.provider.DocumentsProvider}를 구현하면 됩니다.
+제공자의 문서에 액세스해야 하는 클라이언트 앱의 경우 단 몇 줄의 코드만으로
SAF와 통합할 수 있습니다.</p>
<p>SAF에는 다음과 같은 항목이 포함됩니다.</p>
<ul>
<li><strong>문서 제공자</strong>—일종의 콘텐츠 제공자로
-저장소 서비스(예: Google Drive 등)로 하여금 자신이 관리하는 파일을 드러내도록 허용합니다. 문서 제공자는
-{@link android.provider.DocumentsProvider} 클래스의 하위 클래스로 구현됩니다.
-문서 제공자 스키마는 기존의 파일 계층을 근거로 하지만,
-문서 제공자가 데이터를 저장하는 물리적인 방법은 개발자가 선택하기 나름입니다.
-Android 플랫폼에는 내장된 문서 제공자가 여러 개 있습니다.
+저장소 서비스(예: Google Drive 등)로 하여금 자신이 관리하는 파일을 드러내도록 허용합니다. 문서 제공자는
+{@link android.provider.DocumentsProvider} 클래스의 하위 클래스로 구현됩니다.
+문서 제공자 스키마는 기존의 파일 계층을 근거로 하지만,
+문서 제공자가 데이터를 저장하는 물리적인 방법은 개발자가 선택하기 나름입니다.
+Android 플랫폼에는 내장된 문서 제공자가 여러 개 있습니다.
예를 들어 다운로드, 이미지 및 비디오 등입니다.</li>
<li><strong>클라이언트 앱</strong>—일종의 사용자 지정 앱으로
{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 및/또는
-{@link android.content.Intent#ACTION_CREATE_DOCUMENT} 인텐트를 호출하고,
+{@link android.content.Intent#ACTION_CREATE_DOCUMENT} 인텐트를 호출하고,
문서 제공자가 반환하는 파일을 수신합니다.</li>
-<li><strong>선택기</strong>—일종의 시스템 UI로 사용자가 클라이언트 앱의
+<li><strong>선택기</strong>—일종의 시스템 UI로 사용자가 클라이언트 앱의
검색 기준을 만족하는 모든 문서 제공자에서 문서에 액세스할 수 있도록 해줍니다.</li>
</ul>
<p>SAF가 제공하는 기능을 몇 가지 예로 들면 다음과 같습니다.</p>
<ul>
<li>사용자들로 하여금 하나의 앱만이 아니라 모든 문서 제공자에서 콘텐츠를 탐색할 수 있게 해줍니다.</li>
-<li>여러분의 앱이 문서 제공자가 소유한 문서에 대한 장기적, 영구적 액세스 권한을 가질 수 있도록
-해줍니다. 이 액세스 권한을 통해 사용자가 제공자에 있는 파일을 추가, 편집,
+<li>여러분의 앱이 문서 제공자가 소유한 문서에 대한 장기적, 영구적 액세스 권한을 가질 수 있도록
+해줍니다. 이 액세스 권한을 통해 사용자가 제공자에 있는 파일을 추가, 편집,
저장 및 삭제할 수 있습니다.</li>
-<li>여러 개의 사용자 계정을 지원하며 USB 저장소 제공자와 같은 임시 루트도 지원합니다.
+<li>여러 개의 사용자 계정을 지원하며 USB 저장소 제공자와 같은 임시 루트도 지원합니다.
이는 드라이브가 연결되어 있을 때만 나타납니다. </li>
</ul>
<h2 id ="overview">개요</h2>
-<p>SAF는 {@link android.provider.DocumentsProvider} 클래스의
-하위 클래스인 콘텐츠 제공자를 중심으로 둘러싸고 있습니다. 데이터는 <em>문서 제공자</em> 내에서 일반적인 파일 계층으로
+<p>SAF는 {@link android.provider.DocumentsProvider} 클래스의
+하위 클래스인 콘텐츠 제공자를 중심으로 둘러싸고 있습니다. 데이터는 <em>문서 제공자</em> 내에서 일반적인 파일 계층으로
구조화됩니다.</p>
<p><img src="{@docRoot}images/providers/storage_datamodel.png" alt="data model" /></p>
-<p class="img-caption"><strong>그림 1.</strong> 문서 제공자 데이터 모델입니다. 루트 하나가 하나의 문서를 가리키며,
+<p class="img-caption"><strong>그림 1.</strong> 문서 제공자 데이터 모델입니다. 루트 하나가 하나의 문서를 가리키며,
이는 다시 트리 전체의 팬아웃을 시작합니다.</p>
<p>다음 내용을 참고하십시오.</p>
<ul>
-<li>각 문서 제공자는 하나 이상의 "루트"를 보고합니다.
+<li>각 문서 제공자는 하나 이상의 "루트"를 보고합니다.
이는 문서 트리 속을 탐색할 시작 지점입니다.
-각 루트에는 고유한 {@link android.provider.DocumentsContract.Root#COLUMN_ROOT_ID}가 있으며,
-이는 해당 루트 아래의 콘텐츠를 나타내는 문서(디렉터리)를
+각 루트에는 고유한 {@link android.provider.DocumentsContract.Root#COLUMN_ROOT_ID}가 있으며,
+이는 해당 루트 아래의 콘텐츠를 나타내는 문서(디렉터리)를
가리킵니다.
-루트는 설계상 동적으로 만들어져 있어 여러 개의 계정, 임시 USB 저장소 기기
+루트는 설계상 동적으로 만들어져 있어 여러 개의 계정, 임시 USB 저장소 기기
또는 사용자 로그인/로그아웃 등과 같은 경우를 지원하도록 되어 있습니다.</li>
-<li>각 루트 아래에 문서가 하나씩 있습니다. 해당 문서는 1부터 <em>N</em>까지의 문서를 가리키는데,
+<li>각 루트 아래에 문서가 하나씩 있습니다. 해당 문서는 1부터 <em>N</em>까지의 문서를 가리키는데,
이는 각각 1부터 <em>N</em>의 문서를 가리킬 수 있습니다. </li>
-<li>각 저장소의 백엔드가
-개별적인 파일과 디렉터리를 고유한
-{@link android.provider.DocumentsContract.Document#COLUMN_DOCUMENT_ID}로
-참조하여 드러냅니다.문서 ID는 고유해야 하며 한 번 발행되고 나면 변경되지 않습니다.
+<li>각 저장소의 백엔드가
+개별적인 파일과 디렉터리를 고유한
+{@link android.provider.DocumentsContract.Document#COLUMN_DOCUMENT_ID}로
+참조하여 드러냅니다.문서 ID는 고유해야 하며 한 번 발행되고 나면 변경되지 않습니다.
이들은 기기 재부팅을 통괄하여 영구적인 URI 허가에 사용되기 때문입니다.</li>
-<li>문서는 열 수 있는 파일이거나(특정 MIME 유형으로),
+<li>문서는 열 수 있는 파일이거나(특정 MIME 유형으로),
추가 문서가 들어있는 디렉터리일 수 있습니다(
{@link android.provider.DocumentsContract.Document#MIME_TYPE_DIR} MIME 유형으로).</li>
-<li>각 문서는 서로 다른 기능을 가지고 있을 수 있습니다. 이는
-{@link android.provider.DocumentsContract.Document#COLUMN_FLAGS COLUMN_FLAGS}에서 설명한 것과 같습니다.
- 예를 들어 {@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_WRITE},
-{@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_DELETE} 및
-{@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_THUMBNAIL} 등입니다.
-같은 {@link android.provider.DocumentsContract.Document#COLUMN_DOCUMENT_ID}가
+<li>각 문서는 서로 다른 기능을 가지고 있을 수 있습니다. 이는
+{@link android.provider.DocumentsContract.Document#COLUMN_FLAGS COLUMN_FLAGS}에서 설명한 것과 같습니다.
+ 예를 들어 {@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_WRITE},
+{@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_DELETE} 및
+{@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_THUMBNAIL} 등입니다.
+같은 {@link android.provider.DocumentsContract.Document#COLUMN_DOCUMENT_ID}가
여러 디렉터리에 포함되어 있을 수도 있습니다.</li>
</ul>
<h2 id="flow">제어 흐름</h2>
-<p>위에서 언급한 바와 같이, 문서 제공자 데이터 모델은 일반적인
-파일 계층을 기반으로 합니다. 그러나, 데이터를 물리적으로 저장하는 방식은 마음대로 선택할 수 있습니다. 다만
-{@link android.provider.DocumentsProvider} API를 통해 액세스할 수 있기만 하면 됩니다.
+<p>위에서 언급한 바와 같이, 문서 제공자 데이터 모델은 일반적인
+파일 계층을 기반으로 합니다. 그러나, 데이터를 물리적으로 저장하는 방식은 마음대로 선택할 수 있습니다. 다만
+{@link android.provider.DocumentsProvider} API를 통해 액세스할 수 있기만 하면 됩니다.
예를 들어, 데이터를 저장하기 위해 태그 기반 클라우드 저장소를 사용해도 됩니다.</p>
-<p>그림 2는 사진 앱이 SAF를 사용하여 저장된 데이터에 액세스할 수 있는 방법을
+<p>그림 2는 사진 앱이 SAF를 사용하여 저장된 데이터에 액세스할 수 있는 방법을
예시로 나타낸 것입니다.</p>
<p><img src="{@docRoot}images/providers/storage_dataflow.png" alt="app" /></p>
@@ -174,31 +174,31 @@
<ul>
<li>SAF에서는 제공자와 클라이언트가 직접 상호 작용하지 않습니다.
- 클라이언트가 파일과 상호 작용하기 위한 권한을 요청합니다(다시 말해,
+ 클라이언트가 파일과 상호 작용하기 위한 권한을 요청합니다(다시 말해,
파일을 읽고, 편집하고 생성 또는 삭제할 권한을 말합니다).</li>
-<li>상호 작용은 애플리케이션(이 예시에서는 주어진 사진 앱)이 인텐트
-{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 또는 {@link android.content.Intent#ACTION_CREATE_DOCUMENT}를 실행시키면 시작합니다. 이 인텐트에는
-기준을 한층 더 정밀하게 하기 위한 필터가 포함될 수 있습니다. 예를 들어, "열 수 있는 파일 중에서
+<li>상호 작용은 애플리케이션(이 예시에서는 주어진 사진 앱)이 인텐트
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 또는 {@link android.content.Intent#ACTION_CREATE_DOCUMENT}를 실행시키면 시작합니다. 이 인텐트에는
+기준을 한층 더 정밀하게 하기 위한 필터가 포함될 수 있습니다. 예를 들어, "열 수 있는 파일 중에서
'이미지' MIME 유형을 가진 파일을 모두 주세요"라고 할 수 있습니다.</li>
-<li>인텐트가 실행되면 시스템 선택기가 각각의 등록된 제공자로 이동하여 사용자에게
+<li>인텐트가 실행되면 시스템 선택기가 각각의 등록된 제공자로 이동하여 사용자에게
일치하는 콘텐츠 루트를 보여줍니다.</li>
-<li>선택기는 사용자에게 문서에 액세스하는 데 쓰는 표준 인터페이스를 부여합니다. 이는
-기본 문서 제공자 사이에 큰 차이가 있더라도 무관합니다. 예를 들어, 그림 2는
+<li>선택기는 사용자에게 문서에 액세스하는 데 쓰는 표준 인터페이스를 부여합니다. 이는
+기본 문서 제공자 사이에 큰 차이가 있더라도 무관합니다. 예를 들어, 그림 2는
Google Drive 제공자, USB 제공자와 클라우드 제공자를 나타낸 것입니다.</li>
</ul>
-<p>그림 3은 이미지를 검색 중인 사용자가 Google Drive 계정을 선택한
+<p>그림 3은 이미지를 검색 중인 사용자가 Google Drive 계정을 선택한
선택기를 나타낸 것입니다.</p>
<p><img src="{@docRoot}images/providers/storage_picker.png" width="340" alt="picker" style="border:2px solid #ddd" /></p>
<p class="img-caption"><strong>그림 3.</strong> 선택기</p>
-<p>사용자가 Google Drive를 선택하면 이미지가 그림 4에 나타난 것처럼
-표시됩니다. 그때부터 사용자는 제공자와 클라이언트 앱이 지원하는 방식이라면 어떤 식으로든
+<p>사용자가 Google Drive를 선택하면 이미지가 그림 4에 나타난 것처럼
+표시됩니다. 그때부터 사용자는 제공자와 클라이언트 앱이 지원하는 방식이라면 어떤 식으로든
이들 이미지와 상호 작용할 수 있게 됩니다.
<p><img src="{@docRoot}images/providers/storage_photos.png" width="340" alt="picker" style="border:2px solid #ddd" /></p>
@@ -207,45 +207,45 @@
<h2 id="client">클라이언트 앱 작성</h2>
-<p>Android 4.3 이하에서는 앱이 또 다른 앱에서 파일을 검색할 수 있도록 하려면
+<p>Android 4.3 이하에서는 앱이 또 다른 앱에서 파일을 검색할 수 있도록 하려면
{@link android.content.Intent#ACTION_PICK}
- 또는 {@link android.content.Intent#ACTION_GET_CONTENT}와 같은 인텐트를 호출해야만 했습니다. 그런 다음
-파일을 선택할 앱을 하나 선택하고, 선택한 앱이 사용자 인터페이스를 제공하여야 사용자가
+ 또는 {@link android.content.Intent#ACTION_GET_CONTENT}와 같은 인텐트를 호출해야만 했습니다. 그런 다음
+파일을 선택할 앱을 하나 선택하고, 선택한 앱이 사용자 인터페이스를 제공하여야 사용자가
이용 가능한 파일 중에서 탐색하고 선택할 수 있었습니다. </p>
-<p>Android 4.4 이상에는
-{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 인텐트를 사용할 수 있다는 추가 옵션이 있습니다.
-이는 시스템이 제어하는 선택기를 표시하여 사용자가 다른 앱에서 이용할 수 있게 만든 파일을
-모두 탐색할 수 있게 해줍니다. 이 하나의 UI로부터
+<p>Android 4.4 이상에는
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 인텐트를 사용할 수 있다는 추가 옵션이 있습니다.
+이는 시스템이 제어하는 선택기를 표시하여 사용자가 다른 앱에서 이용할 수 있게 만든 파일을
+모두 탐색할 수 있게 해줍니다. 이 하나의 UI로부터
사용자는 지원되는 모든 앱에서 파일을 선택할 수 있는 것입니다.</p>
-<p>{@link android.content.Intent#ACTION_OPEN_DOCUMENT}는
-{@link android.content.Intent#ACTION_GET_CONTENT}를
+<p>{@link android.content.Intent#ACTION_OPEN_DOCUMENT}는
+{@link android.content.Intent#ACTION_GET_CONTENT}를
대체할 목적으로 만들어진 것이 아닙니다. 어느 것을 사용해야 할지는 각자의 앱에 필요한 것이 무엇인지에 좌우됩니다.</p>
<ul>
-<li>앱이 단순히 데이터를 읽고/가져오기만을 바란다면
-{@link android.content.Intent#ACTION_GET_CONTENT}를 사용하십시오.
+<li>앱이 단순히 데이터를 읽고/가져오기만을 바란다면
+{@link android.content.Intent#ACTION_GET_CONTENT}를 사용하십시오.
이 방식을 사용하면 앱은 이미지 파일과 같은 데이터 사본을 가져오게 됩니다.</li>
-<li>앱이 문서 제공자가 보유한 문서에 장기적, 영구적 액세스 권한을 가지기를 바라는 경우
+<li>앱이 문서 제공자가 보유한 문서에 장기적, 영구적 액세스 권한을 가지기를 바라는 경우
{@link android.content.Intent#ACTION_OPEN_DOCUMENT}를 사용하십시오.
- 일례로 사용자들에게 문서 제공자에 저장된 이미지를 편집할 수 있게 해주는
+ 일례로 사용자들에게 문서 제공자에 저장된 이미지를 편집할 수 있게 해주는
사진 편집 앱을 들 수 있겠습니다. </li>
</ul>
-<p>이 섹션에서는
-{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 및
+<p>이 섹션에서는
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 및
{@link android.content.Intent#ACTION_CREATE_DOCUMENT} 인텐트를 근거로 클라이언트 앱을 작성하는 방법을 설명합니다.</p>
<h3 id="search">문서 검색</h3>
<p>
-다음 조각에서는 {@link android.content.Intent#ACTION_OPEN_DOCUMENT}를
-사용하여 이미지 파일이 들어 있는 문서 제공자를
+다음 조각에서는 {@link android.content.Intent#ACTION_OPEN_DOCUMENT}를
+사용하여 이미지 파일이 들어 있는 문서 제공자를
검색합니다.</p>
<pre>private static final int READ_REQUEST_CODE = 42;
@@ -277,7 +277,7 @@
<li>앱이 {@link android.content.Intent#ACTION_OPEN_DOCUMENT}
인텐트를 실행시키면 이는 일치하는 문서 제공자를 모두 표시하는 선택기를 시작합니다.</li>
-<li>{@link android.content.Intent#CATEGORY_OPENABLE} 카테고리를
+<li>{@link android.content.Intent#CATEGORY_OPENABLE} 카테고리를
인텐트에 추가하면 결과를 필터링하여 이미지 파일 등 열 수 있는 문서만 표시합니다.</li>
<li>{@code intent.setType("image/*")} 문으로 한층 더 필터링을 수행하여
@@ -286,10 +286,10 @@
<h3 id="results">결과 처리</h3>
-<p>사용자가 선택기에서 문서를 선택하면
-{@link android.app.Activity#onActivityResult onActivityResult()}가 호출됩니다.
+<p>사용자가 선택기에서 문서를 선택하면
+{@link android.app.Activity#onActivityResult onActivityResult()}가 호출됩니다.
선택한 문서를 가리키는 URI는 {@code resultData}
-매개변수 안에 들어있습니다. 이 URI를 {@link android.content.Intent#getData getData()}를 사용하여 추출합니다.
+매개변수 안에 들어있습니다. 이 URI를 {@link android.content.Intent#getData getData()}를 사용하여 추출합니다.
일단 이것을 가지게 되면 이를 사용하여 사용자가 원하는 문서를 검색하면 됩니다. 예:
</p>
@@ -318,7 +318,7 @@
<h3 id="metadata">문서 메타데이터 살펴보기</h3>
-<p>문서의 URI를 얻은 다음에는 그 문서의 메타데이터에 액세스할 수 있습니다. 이
+<p>문서의 URI를 얻은 다음에는 그 문서의 메타데이터에 액세스할 수 있습니다. 이
조각은 해당 URI가 나타내는 문서의 메타데이터를 가져와 다음과 같이 기록합니다.</p>
<pre>public void dumpImageMetaData(Uri uri) {
@@ -365,7 +365,7 @@
<h3 id="open-client">문서 열기</h3>
-<p>문서의 URI를 얻은 다음에는 문서를 열 수도 있고 원하는 대로 무엇이든
+<p>문서의 URI를 얻은 다음에는 문서를 열 수도 있고 원하는 대로 무엇이든
할 수 있습니다.</p>
<h4>비트맵</h4>
@@ -382,14 +382,14 @@
}
</pre>
-<p>이 작업을 UI 스레드에서 해서는 안 된다는 점을 유의하십시오. 이것은 배경에서 하되,
-{@link android.os.AsyncTask}를 사용합니다. 비트맵을 열고 나면 이를
+<p>이 작업을 UI 스레드에서 해서는 안 된다는 점을 유의하십시오. 이것은 배경에서 하되,
+{@link android.os.AsyncTask}를 사용합니다. 비트맵을 열고 나면 이를
{@link android.widget.ImageView}로 표시할 수 있습니다.
</p>
<h4>InputStream 가져오기</h4>
-<p>다음은 URI에서 {@link java.io.InputStream}을 가져오는 방법을 예시로 나타낸 것입니다. 이 조각에서
+<p>다음은 URI에서 {@link java.io.InputStream}을 가져오는 방법을 예시로 나타낸 것입니다. 이 조각에서
파일의 줄이 문자열로 읽히고 있습니다.</p>
<pre>private String readTextFromUri(Uri uri) throws IOException {
@@ -409,9 +409,9 @@
<h3 id="create">새 문서 생성하기</h3>
-<p>개발자의 앱은 문서 제공자에서 새 문서를 생성할 수 있습니다. 이때
+<p>개발자의 앱은 문서 제공자에서 새 문서를 생성할 수 있습니다. 이때
{@link android.content.Intent#ACTION_CREATE_DOCUMENT}
- 인텐트를 사용하면 됩니다. 파일을 생성하려면 인텐트에 MIME 유형과 파일 이름을 부여하고,
+ 인텐트를 사용하면 됩니다. 파일을 생성하려면 인텐트에 MIME 유형과 파일 이름을 부여하고,
고유한 요청 코드로 이를 시작하면 됩니다. 나머지는 여러분 대신 알아서 해드립니다.</p>
@@ -440,15 +440,15 @@
}
</pre>
-<p>새 문서를 생성하고 나면
-{@link android.app.Activity#onActivityResult onActivityResult()}에서 URI를 가져와 거기에 계속해서
+<p>새 문서를 생성하고 나면
+{@link android.app.Activity#onActivityResult onActivityResult()}에서 URI를 가져와 거기에 계속해서
쓸 수 있습니다.</p>
<h3 id="delete">문서 삭제하기</h3>
-<p>어느 문서에 대한 URI가 있고 해당 문서의
+<p>어느 문서에 대한 URI가 있고 해당 문서의
{@link android.provider.DocumentsContract.Document#COLUMN_FLAGS Document.COLUMN_FLAGS}
-에
+에
{@link android.provider.DocumentsContract.Document#FLAG_SUPPORTS_DELETE SUPPORTS_DELETE}가 들어 있는 경우,
해당 문서를 삭제할 수 있습니다. 예:</p>
@@ -459,9 +459,9 @@
<h3 id="edit">문서 편집하기</h3>
<p>준비된 텍스트 문서를 편집하는 데 SAF를 사용할 수 있습니다.
-이 조각은
-{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 인텐트를 실행하며
-{@link android.content.Intent#CATEGORY_OPENABLE} 카테고리를 사용해
+이 조각은
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 인텐트를 실행하며
+{@link android.content.Intent#CATEGORY_OPENABLE} 카테고리를 사용해
열 수 있는 문서만 표시하도록 합니다. 이것을 한층 더 필터링하여 텍스트 파일만 표시하게 하려면 다음과 같이 합니다.</p>
<pre>
@@ -486,10 +486,10 @@
</pre>
<p>다음으로, {@link android.app.Activity#onActivityResult onActivityResult()}
-(<a href="#results">결과 처리</a> 참조)에서 코드를 호출하여 편집 작업을 수행하도록 하면 됩니다.
+(<a href="#results">결과 처리</a> 참조)에서 코드를 호출하여 편집 작업을 수행하도록 하면 됩니다.
다음 조각은 {@link android.content.ContentResolver}에서 {@link java.io.FileOutputStream}
-을 가져온 것입니다. 이것은 기본적으로 "쓰기" 모드를 사용합니다.
-필요한 최소 수량의 액세스만을 요청하는 것이 가장 좋으니 쓰기만 필요하다면
+을 가져온 것입니다. 이것은 기본적으로 "쓰기" 모드를 사용합니다.
+필요한 최소 수량의 액세스만을 요청하는 것이 가장 좋으니 쓰기만 필요하다면
읽기/쓰기를 요청하지 마십시오.</p>
<pre>private void alterDocument(Uri uri) {
@@ -512,16 +512,16 @@
<h3 id="permissions">권한 유지</h3>
-<p>앱이 읽기 또는 쓰기 작업에 대한 파일을 열면 시스템이 앱에 해당 파일에 대한 URI 권한 허가를
+<p>앱이 읽기 또는 쓰기 작업에 대한 파일을 열면 시스템이 앱에 해당 파일에 대한 URI 권한 허가를
부여합니다. 이것은 사용자의 장치를 다시 시작할 때까지 유지됩니다.
-하지만 만일 앱이 이미지 편집 앱이고, 사용자가 여러분의 앱에서 바로 편집한 5개의 이미지에
-액세스할 수 있도록 하고자 한다고 가정해봅시다. 사용자의 기기가 재시작되면
-여러분이 사용자에게 시스템 선택기를 다시 보내 해당 파일을 검색하도록 해야 할 텐데,
+하지만 만일 앱이 이미지 편집 앱이고, 사용자가 여러분의 앱에서 바로 편집한 5개의 이미지에
+액세스할 수 있도록 하고자 한다고 가정해봅시다. 사용자의 기기가 재시작되면
+여러분이 사용자에게 시스템 선택기를 다시 보내 해당 파일을 검색하도록 해야 할 텐데,
이것은 물론 이상적인 것과는 거리가 멉니다.</p>
<p>이런 일이 일어나지 않도록 방지하기 위해 시스템이 앱에 부여한 권한을 유지할 수 있습니다.
-여러분의 앱은 시스템이 제공하는 유지 가능한 URI 권한 허가를
-효율적으로 "받아들입니다". 이렇게 하면 사용자가 여러분의 앱을 통해 파일에 지속적인 액세스 권한을 가질 수 있으며,
+여러분의 앱은 시스템이 제공하는 유지 가능한 URI 권한 허가를
+효율적으로 "받아들입니다". 이렇게 하면 사용자가 여러분의 앱을 통해 파일에 지속적인 액세스 권한을 가질 수 있으며,
이는 기기가 다시 시작되더라도 관계 없습니다.</p>
@@ -531,65 +531,65 @@
// Check for the freshest data.
getContentResolver().takePersistableUriPermission(uri, takeFlags);</pre>
-<p>마지막 한 단계가 남았습니다. 여러분의 앱이 액세스한 가장 최근의 URI를
-저장해두었을 수 있지만, 이는 더 이상 유효하지 않을 수 있습니다. 또 다른 앱이 문서를
-삭제하거나 수정했을 수 있기 때문입니다. 따라서, 항상
-{@code getContentResolver().takePersistableUriPermission()}을
+<p>마지막 한 단계가 남았습니다. 여러분의 앱이 액세스한 가장 최근의 URI를
+저장해두었을 수 있지만, 이는 더 이상 유효하지 않을 수 있습니다. 또 다른 앱이 문서를
+삭제하거나 수정했을 수 있기 때문입니다. 따라서, 항상
+{@code getContentResolver().takePersistableUriPermission()}을
호출하여 최신 데이터를 확인해야 합니다.</p>
<h2 id="custom">사용자 지정 문서 제공자 작성하기</h2>
<p>
-파일용 저장소 서비스를 제공하는 앱을 개발 중인 경우(예를 들어
-클라우드 저장 서비스 등), SAF를 통해 파일을 사용할 수 있도록 하려면 사용자 지정 문서 제공자를
+파일용 저장소 서비스를 제공하는 앱을 개발 중인 경우(예를 들어
+클라우드 저장 서비스 등), SAF를 통해 파일을 사용할 수 있도록 하려면 사용자 지정 문서 제공자를
작성하면 됩니다. 이 섹션에서는 이렇게 하는 방법을 설명합니다.
</p>
<h3 id="manifest">매니페스트</h3>
-<p>사용자 지정 문서 제공자를 구현하려면 애플리케이션의 매니페스트에 다음과 같은 항목을
+<p>사용자 지정 문서 제공자를 구현하려면 애플리케이션의 매니페스트에 다음과 같은 항목을
추가하십시오.</p>
<ul>
<li>API 레벨 19 이상의 대상.</li>
-<li>사용자 지정 저장소 제공자를 선언하는 <code><provider></code>
+<li>사용자 지정 저장소 제공자를 선언하는 <code><provider></code>
요소. </li>
-<li>제공자의 이름은 그 클래스 이름이며 여기에 패키지 이름도 포함됩니다.
+<li>제공자의 이름은 그 클래스 이름이며 여기에 패키지 이름도 포함됩니다.
예: <code>com.example.android.storageprovider.MyCloudProvider</code></li>
-<li>권한의 이름, 이는 패키지 이름과 같으며(이 예시에서는
+<li>권한의 이름, 이는 패키지 이름과 같으며(이 예시에서는
<code>com.example.android.storageprovider</code>)여기에 콘텐츠 제공자 유형을 더합니다
(<code>documents</code>). 예: {@code com.example.android.storageprovider.documents}</li>
<li><code>android:exported</code> 속성을 <code>"true"</code>로 설정.
제공자를 내보내 다른 앱이 볼 수 있도록 해야 합니다.</li>
-<li><code>android:grantUriPermissions</code> 속성을
-<code>"true"</code>로 설정. 이렇게 설정하면 시스템이 여러분의 제공자 안에 있는 콘텐츠에 액세스하도록 다른 앱에
-권한을 허가할 수 있게 해줍니다. 특정 문서에 대한 권한 부여를 유지하는 방법에 대한 논의는
+<li><code>android:grantUriPermissions</code> 속성을
+<code>"true"</code>로 설정. 이렇게 설정하면 시스템이 여러분의 제공자 안에 있는 콘텐츠에 액세스하도록 다른 앱에
+권한을 허가할 수 있게 해줍니다. 특정 문서에 대한 권한 부여를 유지하는 방법에 대한 논의는
<a href="#permissions">권한 유지</a>를 참조하십시오.</li>
<li>{@code MANAGE_DOCUMENTS} 권한. 기본적으로 제공자는 누구나 이용할 수 있습니다.
- 이 권한을 추가하면 여러분의 제공자를 시스템에 제한하게 됩니다.
+ 이 권한을 추가하면 여러분의 제공자를 시스템에 제한하게 됩니다.
이 제한은 보안상 매우 중요합니다.</li>
-<li>{@code android:enabled} 속성을 리소스 파일에서 정의한 부울 값으로
-설정합니다. 이 속성의 목적은 Android 4.3 이하에서 실행되는 기기에서 제공자를 비활성화하는 데 있습니다.
-예를 들어 {@code android:enabled="@bool/atLeastKitKat"} 등입니다. 이 속성을
+<li>{@code android:enabled} 속성을 리소스 파일에서 정의한 부울 값으로
+설정합니다. 이 속성의 목적은 Android 4.3 이하에서 실행되는 기기에서 제공자를 비활성화하는 데 있습니다.
+예를 들어 {@code android:enabled="@bool/atLeastKitKat"} 등입니다. 이 속성을
매니페스트에 추가하는 것 이외에도 다음과 같은 작업을 해야 합니다.
<ul>
-<li>{@code res/values/} 아래의 {@code bool.xml} 리소스 파일에
+<li>{@code res/values/} 아래의 {@code bool.xml} 리소스 파일에
이 라인을 추가합니다. <pre><bool name="atLeastKitKat">false</bool></pre></li>
-<li>{@code res/values-v19/} 아래의 {@code bool.xml} 리소스 파일에
+<li>{@code res/values-v19/} 아래의 {@code bool.xml} 리소스 파일에
이 라인을 추가합니다. <pre><bool name="atLeastKitKat">true</bool></pre></li>
</ul></li>
<li>
-{@code android.content.action.DOCUMENTS_PROVIDER} 동작을 포함한 인텐트 필터가 있어야
+{@code android.content.action.DOCUMENTS_PROVIDER} 동작을 포함한 인텐트 필터가 있어야
시스템이 제공자를 검색할 때 여러분의 제공자가 선택기에 나타날 수 있습니다.</li>
</ul>
@@ -619,31 +619,31 @@
<h4 id="43">Android 4.3 이하에서 실행되는 기기 지원</h4>
<p>
-{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 인텐트는
-Android 4.4 이상에서 실행되는 기기에서만 사용할 수 있습니다.
-애플리케이션이 {@link android.content.Intent#ACTION_GET_CONTENT}를 지원하도록 하여
-Android 4.3 이하에서 실행되는 기기에도 적용되도록 하려면 Android 4.4 이상에서 실행되는 기기용 매니페스트에 있는
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 인텐트는
+Android 4.4 이상에서 실행되는 기기에서만 사용할 수 있습니다.
+애플리케이션이 {@link android.content.Intent#ACTION_GET_CONTENT}를 지원하도록 하여
+Android 4.3 이하에서 실행되는 기기에도 적용되도록 하려면 Android 4.4 이상에서 실행되는 기기용 매니페스트에 있는
{@link android.content.Intent#ACTION_GET_CONTENT}
- 인텐트 필터를 비활성화해야 합니다.
-문서 제공자와 {@link android.content.Intent#ACTION_GET_CONTENT}는 상호 배타적인 것으로
-간주해야 합니다. 둘을 모두 동시에 지원하는 경우, 앱이 시스템 선택기 UI에
+ 인텐트 필터를 비활성화해야 합니다.
+문서 제공자와 {@link android.content.Intent#ACTION_GET_CONTENT}는 상호 배타적인 것으로
+간주해야 합니다. 둘을 모두 동시에 지원하는 경우, 앱이 시스템 선택기 UI에
두 번 나타나 저장된 데이터에 액세스할 두 가지 서로 다른 방법을 제안하게 됩니다.
이렇게 되면 사용자에게 혼동을 주게 되겠죠.</p>
-<p>다음은 Android 버전 4.4 이상에서 실행되는 기기용
-{@link android.content.Intent#ACTION_GET_CONTENT} 인텐트 필터를
+<p>다음은 Android 버전 4.4 이상에서 실행되는 기기용
+{@link android.content.Intent#ACTION_GET_CONTENT} 인텐트 필터를
비활성화하는 데 권장되는 방법입니다.</p>
<ol>
-<li>{@code res/values/} 아래의 {@code bool.xml} 리소스 파일에
+<li>{@code res/values/} 아래의 {@code bool.xml} 리소스 파일에
이 라인을 추가합니다. <pre><bool name="atMostJellyBeanMR2">true</bool></pre></li>
-<li>{@code res/values-v19/} 아래의 {@code bool.xml} 리소스 파일에
+<li>{@code res/values-v19/} 아래의 {@code bool.xml} 리소스 파일에
이 라인을 추가합니다. <pre><bool name="atMostJellyBeanMR2">false</bool></pre></li>
<li>
-<a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">액티비티
-별칭</a>을 추가하여 버전 4.4(API 레벨 19) 이상을 대상으로 한 {@link android.content.Intent#ACTION_GET_CONTENT}
+<a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">액티비티
+별칭</a>을 추가하여 버전 4.4(API 레벨 19) 이상을 대상으로 한 {@link android.content.Intent#ACTION_GET_CONTENT}
인텐트 필터를 비활성화합니다. 예:
<pre>
@@ -666,13 +666,13 @@
</ol>
<h3 id="contract">계약</h3>
-<p>사용자 지정 제공자를 작성할 때면 일반적으로 수반되는 작업 중 하나가
-계약 클래스를 구현하는 것입니다. 이는
+<p>사용자 지정 제공자를 작성할 때면 일반적으로 수반되는 작업 중 하나가
+계약 클래스를 구현하는 것입니다. 이는
<a href="{@docRoot}guide/topics/providers/content-provider-creating.html#ContractClass">
-콘텐츠 제공자</a> 개발자 가이드에서 설명한 것과 같습니다. 계약 클래스는 {@code public final} 클래스로,
-이 안에 URI에 대한 상수 정의, 열 이름, MIME 유형 및 제공자에 관련된
-다른 메타 데이터가 들어 있습니다. SAF가
-이와 같은 계약 클래스를 대신 제공해주므로 직접 쓰지 않아도
+콘텐츠 제공자</a> 개발자 가이드에서 설명한 것과 같습니다. 계약 클래스는 {@code public final} 클래스로,
+이 안에 URI에 대한 상수 정의, 열 이름, MIME 유형 및 제공자에 관련된
+다른 메타 데이터가 들어 있습니다. SAF가
+이와 같은 계약 클래스를 대신 제공해주므로 직접 쓰지 않아도
됩니다.</p>
<ul>
@@ -680,7 +680,7 @@
<li>{@link android.provider.DocumentsContract.Root}</li>
</ul>
-<p>예를 들어 다음은 여러분의 문서 제공자가 문서 또는 루트에 대해 쿼리된 경우
+<p>예를 들어 다음은 여러분의 문서 제공자가 문서 또는 루트에 대해 쿼리된 경우
커서로 반환할 수 있는 열을 나타낸 것입니다.</p>
<pre>private static final String[] DEFAULT_ROOT_PROJECTION =
@@ -696,7 +696,7 @@
<h3 id="subclass">하위 클래스 DocumentsProvider</h3>
-<p>사용자 지정 문서 제공자를 작성하기 위한 다음 단계는
+<p>사용자 지정 문서 제공자를 작성하기 위한 다음 단계는
추상 클래스 {@link android.provider.DocumentsProvider}를 하위 클래스로 만드는 것입니다. 최소한 다음과 같은 메서드를 구현해야 합니다.
</p>
@@ -710,22 +710,22 @@
<li>{@link android.provider.DocumentsProvider#openDocument openDocument()}</li>
</ul>
-<p>꼭 구현해야만 하는 메서드는 이들뿐이지만, 개발자 여러분이 구현하고자 하는 메서드는 이보다
-훨씬 많을 수도 있습니다. 자세한 내용은{@link android.provider.DocumentsProvider}
+<p>꼭 구현해야만 하는 메서드는 이들뿐이지만, 개발자 여러분이 구현하고자 하는 메서드는 이보다
+훨씬 많을 수도 있습니다. 자세한 내용은{@link android.provider.DocumentsProvider}
를 참조하십시오.</p>
<h4 id="queryRoots">QueryRoots 구현</h4>
<p>{@link android.provider.DocumentsProvider#queryRoots
-queryRoots()} 구현은 반드시 {@link android.database.Cursor}를 반환해야 하며,
-이는 문서 제공자의 모든 루트 디렉터리를 가리켜야 합니다. 이때
+queryRoots()} 구현은 반드시 {@link android.database.Cursor}를 반환해야 하며,
+이는 문서 제공자의 모든 루트 디렉터리를 가리켜야 합니다. 이때
{@link android.provider.DocumentsContract.Root}에서 정의한 열을 사용합니다.</p>
-<p>다음 조각에서 {@code projection} 매개변수는
+<p>다음 조각에서 {@code projection} 매개변수는
발신자가 돌려받고자 하는 특정 필드를 나타냅니다. 이 조각은 새 커서를 생성하며
-그에 하나의 행을 추가합니다. 하나의 루트,
-다운로드 또는 이미지와 같은 최상위 레벨 디렉터리가 해당됩니다. 대부분의 제공자에는 루트가 하나뿐입니다. 하나 이상이 있을 수도 있습니다.
-예를 들어 사용자 계정이 여러 개인 경우가 있습니다. 그런 경우에는 커서에 두 번째 행을
+그에 하나의 행을 추가합니다. 하나의 루트,
+다운로드 또는 이미지와 같은 최상위 레벨 디렉터리가 해당됩니다. 대부분의 제공자에는 루트가 하나뿐입니다. 하나 이상이 있을 수도 있습니다.
+예를 들어 사용자 계정이 여러 개인 경우가 있습니다. 그런 경우에는 커서에 두 번째 행을
추가하면 됩니다.</p>
<pre>
@@ -778,13 +778,13 @@
<p>
{@link android.provider.DocumentsProvider#queryChildDocuments queryChildDocuments()}
- 구현은 반드시 {@link android.database.Cursor}를 반환해야 하며,
-이는 지정된 디렉터리 내의 모든 파일을 가리켜야 합니다. 이때
+ 구현은 반드시 {@link android.database.Cursor}를 반환해야 하며,
+이는 지정된 디렉터리 내의 모든 파일을 가리켜야 합니다. 이때
{@link android.provider.DocumentsContract.Document}에서 정의한 열을 사용합니다.</p>
-<p>이 메서드는 선택기 UI에서 애플리케이션 루트를 선택하는 경우 호출됩니다.
-이는 해당 루트 아래 디렉터리의 하위 문서를 가져옵니다. 이것은 루트에서뿐만 아니라 파일 계층의 어느 레벨에서나
-호출할 수 있습니다. 이 조각은 요청한 열로 새 커서를 만든 다음,
+<p>이 메서드는 선택기 UI에서 애플리케이션 루트를 선택하는 경우 호출됩니다.
+이는 해당 루트 아래 디렉터리의 하위 문서를 가져옵니다. 이것은 루트에서뿐만 아니라 파일 계층의 어느 레벨에서나
+호출할 수 있습니다. 이 조각은 요청한 열로 새 커서를 만든 다음,
상위 디렉터리에 있는 모든 직속 하위에 대한 정보를 커서에 추가합니다.
하위는 이미지, 또 다른 디렉터리가 될 수도 있고
어느 파일이라도 될 수 있습니다.</p>
@@ -808,13 +808,13 @@
<p>
{@link android.provider.DocumentsProvider#queryDocument queryDocument()}
- 구현은 반드시 {@link android.database.Cursor}를 반환해야 하며,
+ 구현은 반드시 {@link android.database.Cursor}를 반환해야 하며,
이는 지정된 파일을 가리켜야 합니다. 이때 {@link android.provider.DocumentsContract.Document}에서 정의한 열을 사용합니다.
</p>
<p>{@link android.provider.DocumentsProvider#queryDocument queryDocument()}
- 메서드는
-{@link android.provider.DocumentsProvider#queryChildDocuments queryChildDocuments()}에서
+ 메서드는
+{@link android.provider.DocumentsProvider#queryChildDocuments queryChildDocuments()}에서
전달된 것과 같은 정보를 반환하지만, 특정한 파일에만 해당됩니다.</p>
@@ -832,12 +832,12 @@
<h4 id="openDocument">OpenDocument 구현</h4>
-<p>지정된 파일을 나타내는
+<p>지정된 파일을 나타내는
{@link android.os.ParcelFileDescriptor}를 반환하려면 {@link android.provider.DocumentsProvider#openDocument
openDocument()}를 구현해야 합니다. 다른 앱들이 반환된 {@link android.os.ParcelFileDescriptor}를
- 사용하여 데이터를 스트리밍할 수 있습니다. 시스템은 사용자가 파일을 선택하고
-클라이언트 앱이 이에 대한 액세스를 요청하면서
-{@link android.content.ContentResolver#openFileDescriptor openFileDescriptor()}를 사용할 때 이 메서드를 호출합니다.
+ 사용하여 데이터를 스트리밍할 수 있습니다. 시스템은 사용자가 파일을 선택하고
+클라이언트 앱이 이에 대한 액세스를 요청하면서
+{@link android.content.ContentResolver#openFileDescriptor openFileDescriptor()}를 사용할 때 이 메서드를 호출합니다.
예를 들면 다음과 같습니다.</p>
<pre>@Override
@@ -885,8 +885,8 @@
<h3 id="security">보안</h3>
<p>여러분의 문서 제공자가 암호로 보호된 클라우드 저장소 서비스이고
-여러분은 사용자가 파일을 공유하기 전에 우선 로그인부터 하도록 확실히 해두고 싶다고 가정합니다.
-사용자가 로그인되지 않은 경우 앱은 어떻게 해야 합니까? 해법은
+여러분은 사용자가 파일을 공유하기 전에 우선 로그인부터 하도록 확실히 해두고 싶다고 가정합니다.
+사용자가 로그인되지 않은 경우 앱은 어떻게 해야 합니까? 해법은
{@link android.provider.DocumentsProvider#queryRoots
queryRoots()} 구현에서 루트를 반환하지 않는 것입니다. 다시 말해, 텅 빈 루트 커서를 반환하는 것입니다.</p>
@@ -901,11 +901,11 @@
</pre>
<p>또 다른 단계는 {@code getContentResolver().notifyChange()}를 호출하는 것입니다.
-{@link android.provider.DocumentsContract}를 기억하십니까? 이것을 사용하는 이유는
-바로 이 URI를 만들기 위해서입니다. 다음 조각은 사용자의 로그인 상태가 변경될 때마다
-시스템이 문서 제공자의 루트를 쿼리하도록 지시하고 있습니다. 사용자가 로그인되어 있지 않은 상태에서
-{@link android.provider.DocumentsProvider#queryRoots queryRoots()}를 호출하면
-위에서 나타낸 것과 같이 빈 커서를 반환합니다. 이렇게 하면 사용자가 제공자에 로그인되었을 때만
+{@link android.provider.DocumentsContract}를 기억하십니까? 이것을 사용하는 이유는
+바로 이 URI를 만들기 위해서입니다. 다음 조각은 사용자의 로그인 상태가 변경될 때마다
+시스템이 문서 제공자의 루트를 쿼리하도록 지시하고 있습니다. 사용자가 로그인되어 있지 않은 상태에서
+{@link android.provider.DocumentsProvider#queryRoots queryRoots()}를 호출하면
+위에서 나타낸 것과 같이 빈 커서를 반환합니다. 이렇게 하면 사용자가 제공자에 로그인되었을 때만
제공자의 문서를 사용할 수 있도록 보장할 수 있습니다.</p>
<pre>private void onLoginButtonClick() {
diff --git a/docs/html-intl/intl/ko/guide/topics/resources/accessing-resources.jd b/docs/html-intl/intl/ko/guide/topics/resources/accessing-resources.jd
index be9dd6b..f323280 100644
--- a/docs/html-intl/intl/ko/guide/topics/resources/accessing-resources.jd
+++ b/docs/html-intl/intl/ko/guide/topics/resources/accessing-resources.jd
@@ -7,7 +7,7 @@
<div id="qv">
<h2>간략히 보기</h2>
<ul>
- <li>리소스는 {@code R.java}의 정수를 사용하는 코드, 예를 들어
+ <li>리소스는 {@code R.java}의 정수를 사용하는 코드, 예를 들어
{@code R.drawable.myimage}에서 참조할 수 있습니다.</li>
<li>리소스는 특수 XML 구문을 사용하는 리소스, 예를 들어 {@code
@drawable/myimage}에서 참조할 수 있습니다.</li>
@@ -42,25 +42,25 @@
-<p>일단 어떤 리소스를 애플리케이션에 제공한 다음에는(<a href="providing-resources.html">리소스 제공</a>에서 논의),
-해당 리소스의 리소스 ID를 참조함으로써 이를 적용할 수 있습니다. 모든 리소스 ID는
+<p>일단 어떤 리소스를 애플리케이션에 제공한 다음에는(<a href="providing-resources.html">리소스 제공</a>에서 논의),
+해당 리소스의 리소스 ID를 참조함으로써 이를 적용할 수 있습니다. 모든 리소스 ID는
{@code aapt} 도구가 자동으로 생성하는 프로젝트의 {@code R} 클래스에서 정의됩니다.</p>
<p>애플리케이션이 컴파일링되면, {@code aapt}가 {@code R} 클래스를 생성하며, 이 클래스 안에 {@code
-res/} 디렉터리에 있는 모든 리소스의
-리소스 ID가 들어있습니다. 각 리소스 유형에는 {@code R} 하위 클래스가 있고(예: 모든 드로어블 리소스에 대한
+res/} 디렉터리에 있는 모든 리소스의
+리소스 ID가 들어있습니다. 각 리소스 유형에는 {@code R} 하위 클래스가 있고(예: 모든 드로어블 리소스에 대한
{@code R.drawable}), 해당 유형의 각 리소스에는 정적
-정수가 있습니다(예: {@code R.drawable.icon}). 이 정수가
+정수가 있습니다(예: {@code R.drawable.icon}). 이 정수가
리소스를 검색하는 데 사용할 수 있는 리소스 ID입니다.</p>
-<p>{@code R} 클래스가 리소스 ID가 지정되는 곳이기는 하지만, 리소스 ID를 찾기 위해
+<p>{@code R} 클래스가 리소스 ID가 지정되는 곳이기는 하지만, 리소스 ID를 찾기 위해
이곳을 볼 필요는 전혀 없습니다. 하나의 리소스 ID는 항상 다음과 같이 구성됩니다.</p>
<ul>
<li><em>리소스 유형</em>: 각 리소스는 "유형"으로 그룹화됩니다. 예: {@code
string}, {@code drawable} 및 {@code layout} 다양한 유형에 관한 자세한 정보는 <a href="available-resources.html">리소스 유형</a>을 참조하십시오.
</li>
- <li><em>리소스 이름</em>:
-리소스가 단순 값(예: 문자열 등)일 경우,
+ <li><em>리소스 이름</em>:
+리소스가 단순 값(예: 문자열 등)일 경우,
확장자를 제외한 파일 이름이나 XML {@code android:name} 속성 값 중 하나입니다.</li>
</ul>
@@ -69,14 +69,14 @@
<li><strong>코드 내부에서:</strong> {@code R}
클래스의 하위 클래스에서 정적 정수를 사용합니다. 예:
<pre class="classic no-pretty-print">R.string.hello</pre>
- <p>{@code string}은 리소스 유형이고 {@code hello}는 리소스 이름입니다. 리소스 ID를 이 형식으로 제공하면 리소스에 액세스할 수 있는
-Android API가 많습니다.
+ <p>{@code string}은 리소스 유형이고 {@code hello}는 리소스 이름입니다. 리소스 ID를 이 형식으로 제공하면 리소스에 액세스할 수 있는
+Android API가 많습니다.
<a href="#ResourcesFromCode">코드 내 리소스 액세스</a>를 참조하십시오.</p>
</li>
- <li><strong>XML 내부에서:</strong> {@code R} 클래스에서 정의된
+ <li><strong>XML 내부에서:</strong> {@code R} 클래스에서 정의된
리소스 ID에 상응하기도 하는 특수 XML 구문을 사용합니다. 예:
<pre class="classic no-pretty-print">@string/hello</pre>
- <p>{@code string}은 리소스 유형이고 {@code hello}는 리소스 이름입니다. 이
+ <p>{@code string}은 리소스 유형이고 {@code hello}는 리소스 이름입니다. 이
구문은 리소스로 값을 제공할 것으로 예상되는 어느 곳에서나 XML 리소스 형태로 사용할 수 있습니다. <a href="#ResourcesFromXml">XML에서 리소스 액세스</a>를 참조하십시오.</p>
</li>
</ul>
@@ -94,20 +94,20 @@
</pre>
<p>{@link
-android.content.res.Resources}에서 메서드를 사용하는 개별 리소스를 검색할 수도 있으며, 이는
+android.content.res.Resources}에서 메서드를 사용하는 개별 리소스를 검색할 수도 있으며, 이는
{@link android.content.Context#getResources()}로 인스턴스를 가져올 수 있습니다.</p>
<div class="sidebox-wrapper">
<div class="sidebox">
<h2>원본 파일에 액세스</h2>
-<p>흔한 일은 아니지만, 원본 파일과 디렉터리에 액세스해야 하는 경우가 있습니다. 이 경우에는
-{@code res/}에 파일을 저장하더라도 소용이 없습니다.
-{@code res/}에서 리소스를 읽는 방법은 리소스 ID를 사용하는 것뿐이기 때문입니다. 그 대신 리소스를
+<p>흔한 일은 아니지만, 원본 파일과 디렉터리에 액세스해야 하는 경우가 있습니다. 이 경우에는
+{@code res/}에 파일을 저장하더라도 소용이 없습니다.
+{@code res/}에서 리소스를 읽는 방법은 리소스 ID를 사용하는 것뿐이기 때문입니다. 그 대신 리소스를
{@code assets/} 디렉터리에 저장하면 됩니다.</p>
<p>{@code assets/} 디렉터리에 저장된 파일은 리소스
-ID가 부여되지 <em>않으므로</em>, 이와 같은 리소스는 {@code R} 클래스나 XML 리소스에서 참조할 수 없습니다. 그 대신
-일반 파일 시스템처럼 {@code assets/} 디렉터리에 파일을 쿼리하고
+ID가 부여되지 <em>않으므로</em>, 이와 같은 리소스는 {@code R} 클래스나 XML 리소스에서 참조할 수 없습니다. 그 대신
+일반 파일 시스템처럼 {@code assets/} 디렉터리에 파일을 쿼리하고
{@link android.content.res.AssetManager}를 사용하여 원시 데이터를 읽을 수 있습니다.</p>
<p>하지만 필요한 것이 원시 데이터(동영상 또는 오디오 파일 등)를 읽는 능력뿐인 경우라면,
파일을 {@code res/raw/} 디렉터리에 저장한 다음 일련의 바이트 스트림을 {@link
@@ -184,10 +184,10 @@
<h2 id="ResourcesFromXml">XML에서 리소스 액세스</h2>
<p>기존 리소스에 대한 참조를 사용하여
-일부 XML 속성과 요소의 값을 정의할 수 있습니다. 이 작업은 레이아웃 파일을 생성할 때 위젯에 문자열과 이미지를 제공하기 위해
+일부 XML 속성과 요소의 값을 정의할 수 있습니다. 이 작업은 레이아웃 파일을 생성할 때 위젯에 문자열과 이미지를 제공하기 위해
자주 하게 됩니다.</p>
-<p>예를 들어, 레이아웃에 {@link android.widget.Button}을 추가하면
+<p>예를 들어, 레이아웃에 {@link android.widget.Button}을 추가하면
해당 버튼 텍스트에 <a href="string-resource.html">문자열 리소스</a>를 사용해야 합니다.</p>
<pre>
@@ -209,7 +209,7 @@
<ul>
<li>{@code <package_name>}은(는) 리소스가 위치한 패키지의 이름입니다(
같은 패키지의 리소스를 참조할 경우에는 필요하지 않습니다).</li>
- <li>{@code <resource_type>}은(는) 해당 리소스 유형의
+ <li>{@code <resource_type>}은(는) 해당 리소스 유형의
{@code R} 하위 클래스입니다.</li>
<li>{@code <resource_name>}은(는) 확장자가 없는 리소스 파일 이름이거나
XML 요소의 {@code android:name} 속성 값입니다(단순
@@ -234,7 +234,7 @@
</resources>
</pre>
-<p>텍스트 색상과
+<p>텍스트 색상과
텍스트 문자열을 설정하는 데 이와 같은 리소스를 다음의 레이아웃 파일에서 사용할 수 있습니다.</p>
<pre>
@@ -247,7 +247,7 @@
</pre>
<p>이 경우, 리소스를 자체 패키지에서 가져왔으므로 리소스 참조에 패키지 이름을
-지정하지 않아도 됩니다.
+지정하지 않아도 됩니다.
시스템 리소스를 참조하려면 패키지 이름을 포함해야 합니다. 예:</p>
<pre>
@@ -260,13 +260,13 @@
</pre>
<p class="note"><strong>참고:</strong> 항상 문자열 리소스를 사용해야
-사용자의 애플리케이션이 다른 언어에 맞게 지역화될 수 있습니다.
+사용자의 애플리케이션이 다른 언어에 맞게 지역화될 수 있습니다.
대체
리소스(예: 지역화된 문자열) 생성에 관한 자세한 정보는 <a href="providing-resources.html#AlternativeResources">대체
리소스 제공</a>을 참조하십시오. 다른 언어로 애플리케이션을 지역화하기 위한 전체 지침은
<a href="localization.html">지역화</a>를 참조하십시오.</p>
-<p>XML의 리소스를 사용하여 별명을 생성할 수도 있습니다. 예를 들어, 드로어블 리소스이면서
+<p>XML의 리소스를 사용하여 별명을 생성할 수도 있습니다. 예를 들어, 드로어블 리소스이면서
또 다른 드로어블 리소스의 별명인 것을 생성할 수 있습니다.</p>
<pre>
@@ -275,7 +275,7 @@
android:src="@drawable/other_drawable" />
</pre>
-<p>이것은 일견 중복되는 것처럼 들리지만, 대체 리소스를 사용할 때 매우 유용하게 쓰일 수 있습니다.
+<p>이것은 일견 중복되는 것처럼 들리지만, 대체 리소스를 사용할 때 매우 유용하게 쓰일 수 있습니다.
<a href="providing-resources.html#AliasResources">별명 리소스 생성</a>에 관해 자세히 알아보십시오.</p>
@@ -283,20 +283,20 @@
<h3 id="ReferencesToThemeAttributes">스타일 속성 참조</h3>
<p>스타일 속성 리소스는 현재 적용된 테마의 속성 값을
-참조할 수 있게 해줍니다. 스타일 속성을 참조하면
-하드 코드로 작성된 값을 제공하는 것 대신에 UI 요소의 외관을 사용자 지정하여
-현재 테마에서 제공한 표준 변형에 맞춰 스타일링할 수 있습니다. 스타일 속성을 참조하는 것은
+참조할 수 있게 해줍니다. 스타일 속성을 참조하면
+하드 코드로 작성된 값을 제공하는 것 대신에 UI 요소의 외관을 사용자 지정하여
+현재 테마에서 제공한 표준 변형에 맞춰 스타일링할 수 있습니다. 스타일 속성을 참조하는 것은
기본적으로 "이 속성이 정의한 스타일을 현재 테마로 사용하라"는 말과 같습니다.</p>
-<p>스타일 속성을 참조하는 경우, 이름 구문은 보통
-리소스와 거의 똑같습니다. 다만 앳 기호({@code @})를 사용하는 대신 물음표({@code ?})를 사용하며,
+<p>스타일 속성을 참조하는 경우, 이름 구문은 보통
+리소스와 거의 똑같습니다. 다만 앳 기호({@code @})를 사용하는 대신 물음표({@code ?})를 사용하며,
리소스 유형 부분이 선택 사항이라는 점만이 다릅니다. 예:</p>
<pre class="classic">
?[<em><package_name></em>:][<em><resource_type></em>/]<em><resource_name></em>
</pre>
-<p>예컨대 다음은 텍스트 색상을 시스템 테마의 "기본" 텍스트 색상에
+<p>예컨대 다음은 텍스트 색상을 시스템 테마의 "기본" 텍스트 색상에
일치하도록 설정하기 위해 속성을 참조하는 방법을 나타낸 것입니다.</p>
<pre>
@@ -307,7 +307,7 @@
android:text="@string/hello_world" />
</pre>
-<p>여기서 {@code android:textColor} 속성이 주어진 스타일 속성의 이름을 현재 테마대로
+<p>여기서 {@code android:textColor} 속성이 주어진 스타일 속성의 이름을 현재 테마대로
지정합니다. Android는 이제 {@code android:textColorSecondary}
스타일 속성에 적용된 값을 이 위젯의 {@code android:textColor}에 대한 값으로 사용합니다. 시스템
리소스 도구는 속성 리소스가 이 컨텍스트에서 예상된다는 것을 알기 때문에
@@ -319,9 +319,9 @@
<h2 id="PlatformResources">플랫폼 리소스 액세스</h2>
-<p>Android에는 스타일, 테마 및 레이아웃 등 여러 가지 표준 리소스가 포함되어 있습니다.
-이와 같은 리소스에 액세스하려면
-<code>android</code> 패키지 이름으로 리소스 참조를 한정합니다. 예를 들어 Android는
+<p>Android에는 스타일, 테마 및 레이아웃 등 여러 가지 표준 리소스가 포함되어 있습니다.
+이와 같은 리소스에 액세스하려면
+<code>android</code> 패키지 이름으로 리소스 참조를 한정합니다. 예를 들어 Android는
{@link android.widget.ListAdapter}의 목록 항목으로 사용할 수 있는 레이아웃 리소스를 제공합니다.</p>
<pre>
@@ -330,8 +330,8 @@
android.widget.ArrayAdapter}<String>(this, <strong>android.R.layout.simple_list_item_1</strong>, myarray));
</pre>
-<p>이 예시에서 {@link android.R.layout#simple_list_item_1}은
-{@link android.widget.ListView}의 항목에 대해 플랫폼이 정의한 레이아웃 리소스입니다. 목록 항목에 대해 나름의 레이아웃을
-만드는 대신 이것을 사용해도 됩니다. 자세한 내용은
+<p>이 예시에서 {@link android.R.layout#simple_list_item_1}은
+{@link android.widget.ListView}의 항목에 대해 플랫폼이 정의한 레이아웃 리소스입니다. 목록 항목에 대해 나름의 레이아웃을
+만드는 대신 이것을 사용해도 됩니다. 자세한 내용은
<a href="{@docRoot}guide/topics/ui/layout/listview.html">목록 보기</a> 개발자 가이드를 참조하십시오.</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/resources/overview.jd b/docs/html-intl/intl/ko/guide/topics/resources/overview.jd
index e98a677..7faab59 100644
--- a/docs/html-intl/intl/ko/guide/topics/resources/overview.jd
+++ b/docs/html-intl/intl/ko/guide/topics/resources/overview.jd
@@ -19,13 +19,13 @@
</div>
-<p>이미지나 문자열 같은 리소스는 항상 애플리케이션 코드에서
-외부화하여 독립적으로 유지해야 합니다. 리소스를 외부화하면
+<p>이미지나 문자열 같은 리소스는 항상 애플리케이션 코드에서
+외부화하여 독립적으로 유지해야 합니다. 리소스를 외부화하면
다양한 언어나 화면 크기와 같은 특정 기기 구성을 지원하는
대체 리소스를 제공할 수 있습니다. 이러한 기능은 Android 구동 장치를
-다양한 구성에서 이용하게 되면서 점점 더 중요해지고 있습니다. 여러 가지 구성에
-호환성을 제공하려면 프로젝트의
-{@code res/} 디렉터리 안에 리소스를 정리해야 합니다. 이때 여러 가지 하위 디렉터리를 사용하여 리소스를 유형과 구성
+다양한 구성에서 이용하게 되면서 점점 더 중요해지고 있습니다. 여러 가지 구성에
+호환성을 제공하려면 프로젝트의
+{@code res/} 디렉터리 안에 리소스를 정리해야 합니다. 이때 여러 가지 하위 디렉터리를 사용하여 리소스를 유형과 구성
기준으로 그룹화하면 좋습니다.</p>
<div class="figure" style="width:429px">
@@ -38,7 +38,7 @@
<div class="figure" style="width:429px">
<img src="{@docRoot}images/resources/resource_devices_diagram2.png" height="167" alt="" />
<p class="img-caption">
-<strong>그림 2.</strong> 서로 다른 두 개의 기기로, 각각 다른 화면 크기에 맞게 제공된 서로 다른
+<strong>그림 2.</strong> 서로 다른 두 개의 기기로, 각각 다른 화면 크기에 맞게 제공된 서로 다른
레이아웃을 사용하고 있습니다.</p>
</div>
@@ -46,42 +46,42 @@
<em>대체</em> 리소스를 지정할 수 있습니다.</p>
<ul>
<li>기본 리소스는 기기 구성에 관계없이 항상 사용하거나
-기존 구성에 일치하는 대체 리소스가 없을 때
+기존 구성에 일치하는 대체 리소스가 없을 때
사용합니다.</li>
- <li>대체 리소스는 특정 구성에서 사용하기 위해 개발자가 특별히 디자인한 것을
-말합니다. 리소스 그룹을 특정 구성용으로 지정하려면,
+ <li>대체 리소스는 특정 구성에서 사용하기 위해 개발자가 특별히 디자인한 것을
+말합니다. 리소스 그룹을 특정 구성용으로 지정하려면,
디렉터리 이름에 적절한 구성 한정자를 추가하십시오.</li>
</ul>
-<p>예를 들어 기본 UI 레이아웃은
-{@code res/layout/} 디렉터리에 저장되어 있더라도 화면이 가로 방향일 때 사용할
+<p>예를 들어 기본 UI 레이아웃은
+{@code res/layout/} 디렉터리에 저장되어 있더라도 화면이 가로 방향일 때 사용할
다른 레이아웃을 지정할 수도 있습니다. 이를 {@code res/layout-land/}
디렉터리에 저장하면 됩니다. Android는
기기의 현재 구성을 리소스 디렉터리 이름과 일치시켜서 적절한 리소스를 적용합니다.</p>
-<p>그림 1은 이용 가능한 대체 리소스가 없을 경우 시스템이 서로 다른 두 개의 기기에
-같은 레이아웃을 적용하는 방법을 보여줍니다. 그림 2는
+<p>그림 1은 이용 가능한 대체 리소스가 없을 경우 시스템이 서로 다른 두 개의 기기에
+같은 레이아웃을 적용하는 방법을 보여줍니다. 그림 2는
같은 애플리케이션에 큰 화면용 레이아웃 리소스를 추가한 모습을 나타낸 것입니다.</p>
-<p>다음 문서는 대체 리소스를 체계화하고,
+<p>다음 문서는 대체 리소스를 체계화하고,
대체 리소스를 지정하고, 애플리케이션에 액세스 하는 등의 방법에 관한 완전한 지침을 제공합니다.</p>
<dl>
<dt><strong><a href="providing-resources.html">리소스 제공</a></strong></dt>
- <dd>앱에 포함할 수 있는 여러 가지 종류의 리소스와, 이러한 리소스를 저장하는 장소, 특정 기기 구성에 대한
+ <dd>앱에 포함할 수 있는 여러 가지 종류의 리소스와, 이러한 리소스를 저장하는 장소, 특정 기기 구성에 대한
대체 리소스를 생성하는 방법입니다.</dd>
<dt><strong><a href="accessing-resources.html">리소스 액세스</a></strong></dt>
- <dd>제공한 리소스를 사용하는 방법입니다. 이를 애플리케이션 코드에서 참조하거나
+ <dd>제공한 리소스를 사용하는 방법입니다. 이를 애플리케이션 코드에서 참조하거나
다른 XML 리소스에서 참조하는 방식을 씁니다.</dd>
<dt><strong><a href="runtime-changes.html">런타임 변경 처리</a></strong></dt>
<dd>액티비티가 실행 중인 동안 발생한 구성 변경을 관리하는 방법입니다.</dd>
<dt><strong><a href="localization.html">지역화</a></strong></dt>
- <dd>대체 리소스를 사용하여 애플리케이션을 지역화하는 방법에 대한 상세한 가이드입니다. 이것은 대체
-리소스를 사용하는 한 가지 방법에 불과하지만, 더 많은 사용자에게 도달하려면 매우 중요한
+ <dd>대체 리소스를 사용하여 애플리케이션을 지역화하는 방법에 대한 상세한 가이드입니다. 이것은 대체
+리소스를 사용하는 한 가지 방법에 불과하지만, 더 많은 사용자에게 도달하려면 매우 중요한
방법입니다.</dd>
<dt><strong><a href="available-resources.html">리소스 유형</a></strong></dt>
- <dd>개발자가 제공할 수 있는 다양한 리소스 유형의 참조로, 각각의 XML 요소,
-속성과 구문을 설명하는 것입니다. 예를 들어, 이 참조는 애플리케이션 메뉴와 드로어블 리소스,
+ <dd>개발자가 제공할 수 있는 다양한 리소스 유형의 참조로, 각각의 XML 요소,
+속성과 구문을 설명하는 것입니다. 예를 들어, 이 참조는 애플리케이션 메뉴와 드로어블 리소스,
애니메이션에 대한 리소스를 생성하는 법을 보여줍니다.</dd>
</dl>
diff --git a/docs/html-intl/intl/ko/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/ko/guide/topics/resources/providing-resources.jd
index 681cbb3..bc631f2 100644
--- a/docs/html-intl/intl/ko/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/ko/guide/topics/resources/providing-resources.jd
@@ -9,7 +9,7 @@
<ul>
<li>{@code res/}의 여러 가지 하위 디렉터리에 속한 여러 가지 유형의 리소스</li>
<li>구성별 리소스 파일을 제공하는 대체 리소스</li>
- <li>항상 기본 리소스를 포함해야 앱이 특정 기기 구성에
+ <li>항상 기본 리소스를 포함해야 앱이 특정 기기 구성에
좌우되지 않습니다.</li>
</ul>
<h2>이 문서의 내용</h2>
@@ -29,23 +29,23 @@
<ol>
<li><a href="accessing-resources.html">리소스 액세스</a></li>
<li><a href="available-resources.html">리소스 유형</a></li>
- <li><a href="{@docRoot}guide/practices/screens_support.html">다중
+ <li><a href="{@docRoot}guide/practices/screens_support.html">다중
화면 지원</a></li>
</ol>
</div>
</div>
-<p>이미지나 문자열과 같은 애플리케이션 리소스는 항상 코드에서 외부화해야 합니다.
-그래야 이들을 독립적으로 유지관리할 수 있습니다. 특정 기기 구성에 대한 대체 리소스도
-제공해야 합니다. 이것은 특별하게 명명한 리소스 디렉터리에 그룹화하는 방법을 씁니다. Android는
-런타임에 현재 구성을 근거로 적절한 리소스를 사용합니다. 예를 들어
-여러 가지 화면 크기에 따라 여러 가지 UI 레이아웃을 제공하거나 언어 설정에 따라
+<p>이미지나 문자열과 같은 애플리케이션 리소스는 항상 코드에서 외부화해야 합니다.
+그래야 이들을 독립적으로 유지관리할 수 있습니다. 특정 기기 구성에 대한 대체 리소스도
+제공해야 합니다. 이것은 특별하게 명명한 리소스 디렉터리에 그룹화하는 방법을 씁니다. Android는
+런타임에 현재 구성을 근거로 적절한 리소스를 사용합니다. 예를 들어
+여러 가지 화면 크기에 따라 여러 가지 UI 레이아웃을 제공하거나 언어 설정에 따라
각기 다른 문자열을 제공하고자 할 수 있습니다.</p>
<p>애플리케이션 리소스를 외부화하면
프로젝트 {@code R} 클래스에서 발생하는 리소스 ID로 액세스할 수 있습니다. 애플리케이션에서
리소스를 사용하는 방법은 <a href="accessing-resources.html">리소스
-액세스</a>에서 설명합니다. 이 문서에서는 Android 프로젝트에서 리소스를 그룹화하는 방법과 특정 기기 구성에 대한
+액세스</a>에서 설명합니다. 이 문서에서는 Android 프로젝트에서 리소스를 그룹화하는 방법과 특정 기기 구성에 대한
대체 리소스를 제공하는 법을 보여드립니다.</p>
@@ -75,10 +75,10 @@
) 포함하는 것을 볼 수 있습니다. 리소스 디렉터리 이름은
중요하며 표1에 설명되어 있습니다.</p>
-<p class="note"><strong>참고:</strong> Mipmap 폴더를 사용하는 자세한 방법은
+<p class="note"><strong>참고:</strong> Mipmap 폴더를 사용하는 자세한 방법은
<a href="{@docRoot}tools/projects/index.html#mipmap">프로젝트 관리 개요</a>를 참조하십시오.</p>
-<p class="table-caption" id="table1"><strong>표 1</strong>. 프로젝트
+<p class="table-caption" id="table1"><strong>표 1</strong>. 프로젝트
{@code res/} 디렉터리 내부에서 지원하는 리소스 디렉터리입니다.</p>
<table>
@@ -89,13 +89,13 @@
<tr>
<td><code>animator/</code></td>
- <td><a href="{@docRoot}guide/topics/graphics/prop-animation.html">속성
+ <td><a href="{@docRoot}guide/topics/graphics/prop-animation.html">속성
애니메이션</a>을 정의하는 XML 파일입니다.</td>
</tr>
<tr>
<td><code>anim/</code></td>
- <td><a href="{@docRoot}guide/topics/graphics/view-animation.html#tween-animation">tween
+ <td><a href="{@docRoot}guide/topics/graphics/view-animation.html#tween-animation">tween
애니메이션</a>을 정의하는 XML 파일입니다 (속성 애니메이션도 이 디렉터리에 저장할 수 있지만
두 가지 유형을 구분하기 위해 속성 애니메이션에는 {@code animator/} 디렉터리가 기본 설정됩니다
).</td>
@@ -126,8 +126,8 @@
<tr>
<td><code>mipmap/</code></td>
- <td>각기 다른 시작 관리자 아이콘 밀도에 대한 드로어블 파일입니다.
-{@code mipmap/} 폴더로 시작 관리자 아이콘을 관리하는 자세한 방법은
+ <td>각기 다른 시작 관리자 아이콘 밀도에 대한 드로어블 파일입니다.
+{@code mipmap/} 폴더로 시작 관리자 아이콘을 관리하는 자세한 방법은
<a href="{@docRoot}tools/project/index.html#mipmap">프로젝트 관리 개요</a>를 참조하십시오.</td>
</tr>
@@ -139,32 +139,32 @@
<tr>
<td><code>menu/</code></td>
- <td>옵션 메뉴, 컨텍스트 메뉴 또는 하위
+ <td>옵션 메뉴, 컨텍스트 메뉴 또는 하위
메뉴 등과 같은 애플리케이션 메뉴를 정의하는 XML입니다. <a href="menu-resource.html">메뉴 리소스</a>를 참조하십시오.</td>
</tr>
<tr>
<td><code>raw/</code></td>
- <td><p>원시 형태로 저장하기 위한 임의의 파일입니다. 원시
+ <td><p>원시 형태로 저장하기 위한 임의의 파일입니다. 원시
{@link java.io.InputStream}으로 이런 리소스를 열려면 리소스 ID, {@code R.raw.<em>filename</em>}으로 {@link android.content.res.Resources#openRawResource(int)
Resources.openRawResource()}를 호출합니다.</p>
- <p>그러나 원본 파일 이름과 파일 계층에 액세스해야 하는 경우,
+ <p>그러나 원본 파일 이름과 파일 계층에 액세스해야 하는 경우,
({@code res/raw/}가 아니라) {@code
-assets/} 디렉터리에 몇몇 리소스를 저장해두는 것을 고려해 볼 수 있습니다. {@code assets/}에 있는 파일에는
+assets/} 디렉터리에 몇몇 리소스를 저장해두는 것을 고려해 볼 수 있습니다. {@code assets/}에 있는 파일에는
리소스 ID가 주어지지 않으므로, 이들을 읽는 유일한 방법은 {@link android.content.res.AssetManager}를 사용하는 것뿐입니다.</p></td>
</tr>
<tr>
<td><code>values/</code></td>
<td><p>문자열, 정수 및 색과 같은 단순 값이 들어있는 XML 파일입니다.</p>
- <p>다른 {@code res/} 하위 디렉터리에 있는 XML 리소스 파일은 XML 파일 이름을 근거로
+ <p>다른 {@code res/} 하위 디렉터리에 있는 XML 리소스 파일은 XML 파일 이름을 근거로
하나의 리소스를 정의하는 반면, {@code values/} 디렉터리에 있는 파일은 여러 개의 리소스를 설명합니다.
-이 디렉터리 안에 있는 파일의 경우, {@code <resources>} 요소의 각 하위 요소가 리소스를 하나씩
-정의합니다. 예를 들어 {@code <string>} 요소는
+이 디렉터리 안에 있는 파일의 경우, {@code <resources>} 요소의 각 하위 요소가 리소스를 하나씩
+정의합니다. 예를 들어 {@code <string>} 요소는
{@code R.string} 리소스를 생성하고 {@code <color>} 요소는 {@code R.color}
리소스를 생성합니다.</p>
<p>각 리소스가 자체 XML 요소로 정의되므로, 원하는 대로 파일을 정의하고 하나의 파일에 여러 가지 리소스 유형을
-배정할 수 있습니다. 하지만 명확히 하려면 여러 가지 파일에
+배정할 수 있습니다. 하지만 명확히 하려면 여러 가지 파일에
각기 고유한 리소스를 배치하는 것이 좋을 수도 있습니다. 예를 들어, 다음은 이 디렉터리에서 생성할 수 있는 리소스를 위한
파일 이름 명명법입니다.</p>
<ul>
@@ -176,7 +176,7 @@
<li><a href="style-resource.html">스타일</a>을 위한 styles.xml</li>
</ul>
<p><a href="string-resource.html">문자열 리소스</a>,
-<a href="style-resource.html">스타일 리소스</a> 및
+<a href="style-resource.html">스타일 리소스</a> 및
<a href="more-resources.html">자세한 리소스 유형</a>을 참조하십시오.</p>
</td>
</tr>
@@ -184,21 +184,21 @@
<tr>
<td><code>xml/</code></td>
<td>런타임에 읽을 수 있는 임의의 XML 파일로, 이때 {@link
-android.content.res.Resources#getXml(int) Resources.getXML()}을 호출하는 방법을 씁니다. 다양한 XML 구성 파일을 여기에 저장해야 합니다. 예를 들어
+android.content.res.Resources#getXml(int) Resources.getXML()}을 호출하는 방법을 씁니다. 다양한 XML 구성 파일을 여기에 저장해야 합니다. 예를 들어
<a href="{@docRoot}guide/topics/search/searchable-config.html">검색 가능한 구성</a> 등이 이에 해당됩니다.
<!-- or preferences configuration. --></td>
</tr>
</table>
-<p class="caution"><strong>주의:</strong> 리소스 파일을
+<p class="caution"><strong>주의:</strong> 리소스 파일을
{@code res/} 디렉터리에 직접 저장하면 절대로 안 됩니다. 컴파일러 오류를 초래하게 됩니다.</p>
<p>특정 유형의 리소스에 관한 자세한 정보는 <a href="available-resources.html">리소스 유형</a> 문서를 참조하십시오.</p>
<p>표1에 정의된 하위 디렉터리에 저장하는 리소스는 "기본"
-리소스입니다. 다시 말해, 이러한 리소스가 애플리케이션의 기본 디자인과 콘텐츠를 정의한다는 뜻입니다.
+리소스입니다. 다시 말해, 이러한 리소스가 애플리케이션의 기본 디자인과 콘텐츠를 정의한다는 뜻입니다.
그러나, 여러 가지 유형의 Android 구동 기기는 각기 다른 유형의 리소스를 호출할 수도 있습니다.
-예를 들어 어느 기기의 화면이 보통보다 큰 편이라면, 추가적인 화면 공간의 이점을 활용할 수 있는
+예를 들어 어느 기기의 화면이 보통보다 큰 편이라면, 추가적인 화면 공간의 이점을 활용할 수 있는
다른 레이아웃 리소스를 제공해야 합니다. 또는, 기기에 다른 언어 설정이 있을 경우
해당 텍스트를 사용자 인터페이스에 번역하는 다른 문자열 리소스를
제공해야 합니다. 여러 가지 기기 구성에 여러 가지 리소스를 제공하려면,
@@ -215,10 +215,10 @@
<strong>그림 1.</strong> 서로 다른 두 개의 기기로, 서로 다른 레이아웃 리소스를 사용합니다.</p>
</div>
-<p>거의 모든 애플리케이션이 특정 기기 구성을 지원하는
-대체 리소스를 제공해야 합니다. 예를 들어 여러 가지 화면 밀도에 맞는 대체 드로어블 리소스를
-포함시켜야 하며 여러 가지 언어에 맞게 대체 문자열 리소스도 포함시켜야 합니다. Android는 런타임에
-현재 기기 구성을 감지하고 애플리케이션에 대해 적절한 리소스를
+<p>거의 모든 애플리케이션이 특정 기기 구성을 지원하는
+대체 리소스를 제공해야 합니다. 예를 들어 여러 가지 화면 밀도에 맞는 대체 드로어블 리소스를
+포함시켜야 하며 여러 가지 언어에 맞게 대체 문자열 리소스도 포함시켜야 합니다. Android는 런타임에
+현재 기기 구성을 감지하고 애플리케이션에 대해 적절한 리소스를
로드합니다.</p>
<p>리소스 세트에 대하여 구성별로 적절한 대체를 지정하려면 다음과 같이 합니다.</p>
@@ -231,13 +231,13 @@
<li><em>{@code <qualifier>}</em>는 리소스를 사용할 개별 구성을 지정하는
이름입니다(표2에 정의).</li>
</ul>
- <p>하나 이상의 <em>{@code <qualifier>}</em>를 추가할 수 있습니다. 각기 대시로
+ <p>하나 이상의 <em>{@code <qualifier>}</em>를 추가할 수 있습니다. 각기 대시로
구분합니다.</p>
<p class="caution"><strong>주의:</strong> 여러 한정자를 추가할 때는
-표2에 나열된 것과 같은 순서로 배치해야 합니다. 한정자의 순서가 잘못 지정되면
+표2에 나열된 것과 같은 순서로 배치해야 합니다. 한정자의 순서가 잘못 지정되면
해당 리소스가 무시됩니다.</p>
</li>
- <li>해당되는 각 대체 리소스를 이 새 디렉터리에 저장하십시오. 이 리소스 파일은 기본 리소스 파일과
+ <li>해당되는 각 대체 리소스를 이 새 디렉터리에 저장하십시오. 이 리소스 파일은 기본 리소스 파일과
똑같은 이름을 지정해야 합니다.</li>
</ol>
@@ -254,21 +254,21 @@
</pre>
<p>{@code hdpi} 한정자는 해당 디렉터리의 리소스가
-고화질 화면 기기용이라는 것을 나타냅니다. 각 드로어블 디렉터리의 이미지는 특정 화면 화질에 맞추어
+고화질 화면 기기용이라는 것을 나타냅니다. 각 드로어블 디렉터리의 이미지는 특정 화면 화질에 맞추어
크기가 지정되었으나 파일 이름은
똑같습니다. 이렇게 하면 {@code icon.png} 또는 {@code
-background.png} 이미지를 참조하는 데 사용하는 리소스 ID는 항상 같지만 Android가 각 리소스 중에서 현재 기기에 가장 잘 일치하는
-버전을 선택하게 됩니다. 이때 리소스 디렉터리 이름의 한정자를 기기 구성 정보와
+background.png} 이미지를 참조하는 데 사용하는 리소스 ID는 항상 같지만 Android가 각 리소스 중에서 현재 기기에 가장 잘 일치하는
+버전을 선택하게 됩니다. 이때 리소스 디렉터리 이름의 한정자를 기기 구성 정보와
비교하는 방법을 씁니다.</p>
-<p>Android는 여러 가지 구성 한정자를 지원하며 한 디렉터리 이름에
-여러 개의 한정자를 추가할 수 있습니다. 각 한정자를 대시로 구분하면 됩니다. 표 2는
-유효한 구성 한정자를 우선 순위대로 나열한 것입니다. 리소스 디렉터리에 여러 개의
-한정자를 사용하는 경우, 해당 한정자를 디렉터리 이름에 추가할 때 이 표에 나열된 것과 같은
+<p>Android는 여러 가지 구성 한정자를 지원하며 한 디렉터리 이름에
+여러 개의 한정자를 추가할 수 있습니다. 각 한정자를 대시로 구분하면 됩니다. 표 2는
+유효한 구성 한정자를 우선 순위대로 나열한 것입니다. 리소스 디렉터리에 여러 개의
+한정자를 사용하는 경우, 해당 한정자를 디렉터리 이름에 추가할 때 이 표에 나열된 것과 같은
순서로 추가해야 합니다.</p>
-<p class="table-caption" id="table2"><strong>표 2.</strong> 구성 한정자
+<p class="table-caption" id="table2"><strong>표 2.</strong> 구성 한정자
이름입니다.</p>
<table>
<tr>
@@ -285,7 +285,7 @@
등.
</td>
<td>
- <p>이동통신 국가 코드(MCC)에 선택적으로 이동통신 네트워크 코드(MNC)가 이어지는 형태로,
+ <p>이동통신 국가 코드(MCC)에 선택적으로 이동통신 네트워크 코드(MNC)가 이어지는 형태로,
기기의 SIM 카드에서 가져옵니다. 예를 들어, <code>mcc310</code>은 모든 이동통신사를 포함한 미국이고,
<code>mcc310-mnc004</code>는 Verizon을 사용하는 미국, <code>mcc208-mnc00</code>은 Orange를 사용하는
프랑스입니다.</p>
@@ -293,11 +293,11 @@
SIM 카드에서 가져옵니다.</p>
<p>MCC만 단독으로 사용할 수도 있습니다(예를 들어, 애플리케이션에 국가별 합법적 리소스를
포함하는 경우). 언어에 기초해서만 지정해야 할 경우,
-<em>언어 및 지역</em> 한정자를 대신 사용합니다(아래에 설명). MCC와
+<em>언어 및 지역</em> 한정자를 대신 사용합니다(아래에 설명). MCC와
MNC 한정자를 사용할 경우, 조심해서 사용하고 예상한 대로 작동하는지 테스트해야 합니다.</p>
<p>또한, 구성 필드 {@link
android.content.res.Configuration#mcc}와 {@link
-android.content.res.Configuration#mnc}를 참조하십시오. 이 구성 필드는 각각 이동통신 국가 코드와
+android.content.res.Configuration#mnc}를 참조하십시오. 이 구성 필드는 각각 이동통신 국가 코드와
이동통신 네트워크 코드를 나타냅니다.</p>
</td>
</tr>
@@ -312,19 +312,19 @@
등.
</td>
<td><p>언어는 두 글자의 <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">ISO
-639-1</a> 언어 코드로 정의되고,
+639-1</a> 언어 코드로 정의되고,
뒤이어 두 글자의 <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO
3166-1-alpha-2</a> 지역 코드가 선택적으로 따라옵니다(소문자 "{@code r}" 뒤에 붙음).
</p><p>
- 코드는 대소문자를 구별하지 <em>않습니다</em>. {@code r} 접두사는
+ 코드는 대소문자를 구별하지 <em>않습니다</em>. {@code r} 접두사는
지역 부분을 구별하기 위해 사용합니다.
지역만 지정할 수는 없습니다.</p>
- <p>사용자가 시스템 설정에서 언어를 변경할 경우
+ <p>사용자가 시스템 설정에서 언어를 변경할 경우
애플리케이션 수명 중에 변경될 수 있습니다. 런타임에서 애플리케이션에 어떤 영향을 미치는지 자세히 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를 참조하십시오.
</p>
<p>다른 여러 언어에 맞게 애플리케이션을 지역화하기 위한 전체 지침은
<a href="localization.html">지역화</a>를 참조하십시오.</p>
- <p>또한, 현재 로케일을 나타내는 {@link android.content.res.Configuration#locale} 구성 필드도
+ <p>또한, 현재 로케일을 나타내는 {@link android.content.res.Configuration#locale} 구성 필드도
참조하십시오.</p>
</td>
</tr>
@@ -368,22 +368,22 @@
등.
</td>
<td>
- <p>화면의 기본 크기로, 사용 가능한 화면 영역의 가장 짧은 치수가
-나타냅니다. 구체적으로 기기의 smallestWidth는 해당 화면의 이용 가능한 높이와 너비의
-가장 짧은 치수를 말합니다(이것을 화면에 대한 "가능한 한 가장 좁은 너비"로 생각해도 됩니다). 이 한정자를 사용하면
-화면의 현재 방향에 관계 없이
+ <p>화면의 기본 크기로, 사용 가능한 화면 영역의 가장 짧은 치수가
+나타냅니다. 구체적으로 기기의 smallestWidth는 해당 화면의 이용 가능한 높이와 너비의
+가장 짧은 치수를 말합니다(이것을 화면에 대한 "가능한 한 가장 좁은 너비"로 생각해도 됩니다). 이 한정자를 사용하면
+화면의 현재 방향에 관계 없이
애플리케이션이 해당 UI에서 이용 가능한 너비 중 최소 {@code <N>}dps를 확보하도록 할 수 있습니다.</p>
- <p>예를 들어, 레이아웃에 언제나
+ <p>예를 들어, 레이아웃에 언제나
600dp 이상의 화면 최소 치수가 필요하다면, 이 한정자를 사용하여 레이아웃 리소스, {@code
-res/layout-sw600dp/}를 만들 수 있습니다. 시스템이 이러한 리소스를 사용하는 것은 사용 가능한 화면의 최소 치수가 적어도 600dp가
-되는 경우뿐이며, 이때 600dp라는 크기가 사용자 쪽에서 보기에 높이이든 너비이든
+res/layout-sw600dp/}를 만들 수 있습니다. 시스템이 이러한 리소스를 사용하는 것은 사용 가능한 화면의 최소 치수가 적어도 600dp가
+되는 경우뿐이며, 이때 600dp라는 크기가 사용자 쪽에서 보기에 높이이든 너비이든
관계 없습니다. 이 smallestWidth는 기기의 고정된 화면 크기 특성입니다. <strong>
기기의 smallestWidth는 화면 방향이 변경되어도 바뀌지 않습니다</strong>.</p>
<p>기기의 smallestWidth는 화면 장식과 시스템 UI를 감안합니다. 예를 들어,
화면 상에서 최소 너비의 축 주변 공간을 차지하는 영구 UI 요소가 있다면,
-시스템은 smallestWidth를 실제 화면 크기보다 작게 선언합니다.
-이것은 개발자의 UI가 사용할 수 없는 화면 픽셀이기 때문입니다. 따라서 개발자가 사용하는 값은
-<em>레이아웃에서 요구하는</em> 실제 최소 치수여야 합니다(일반적으로 이 값은 화면의 현재 방향과 관계없이
+시스템은 smallestWidth를 실제 화면 크기보다 작게 선언합니다.
+이것은 개발자의 UI가 사용할 수 없는 화면 픽셀이기 때문입니다. 따라서 개발자가 사용하는 값은
+<em>레이아웃에서 요구하는</em> 실제 최소 치수여야 합니다(일반적으로 이 값은 화면의 현재 방향과 관계없이
레이아웃이 지원하는 "최소 너비"가 됩니다.).</p>
<p>다음의 몇몇 값은 보편적인 화면 크기에 대하여 사용할 수 있습니다.</p>
<ul>
@@ -398,16 +398,16 @@
<li>600x1024mdpi (7인치 태블릿) 등의 화면에는 600을 사용합니다.</li>
<li>720x1280mdpi (10인치 태블릿) 등의 화면에는 720을 사용합니다.</li>
</ul>
- <p>애플리케이션이
-smallestWidth 한정자의 여러 값이 포함된 여러 리소스 디렉터리를 제공하면, 시스템은
+ <p>애플리케이션이
+smallestWidth 한정자의 여러 값이 포함된 여러 리소스 디렉터리를 제공하면, 시스템은
기기의 smallestWidth에 가장 가까운(그러나 이를 초과하지 않는) 값을 사용합니다. </p>
<p><em>API 레벨 13에서 추가되었습니다.</em></p>
<p>이외에도 애플리케이션과 호환되는 최소한의 smallestWidth를 선언하는 <a href="{@docRoot}guide/topics/manifest/supports-screens-element.html#requiresSmallest">{@code
-android:requiresSmallestWidthDp}</a> 속성과
+android:requiresSmallestWidthDp}</a> 속성과
기기의 smallestWidth 값을 보유한 {@link
-android.content.res.Configuration#smallestScreenWidthDp}
+android.content.res.Configuration#smallestScreenWidthDp}
구성 필드도 참조하십시오.</p>
- <p>여러 가지 화면에 맞는 디자인과 한정자 사용에 관한 자세한 정보는
+ <p>여러 가지 화면에 맞는 디자인과 한정자 사용에 관한 자세한 정보는
<a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a> 개발자 가이드를 참조하십시오.</p>
</td>
@@ -421,21 +421,21 @@
등.
</td>
<td>
- <p>리소스를 사용해야 하는 {@code dp} 단위에서 최소 이용 가능한 화면 너비를 지정합니다.
-이는 <code><N></code> 값이 정의합니다. 이 구성
-값은 현재 실제 너비에 맞추기 위해 화면 방향이 가로와 세로 사이를 오가며 바뀔 때
+ <p>리소스를 사용해야 하는 {@code dp} 단위에서 최소 이용 가능한 화면 너비를 지정합니다.
+이는 <code><N></code> 값이 정의합니다. 이 구성
+값은 현재 실제 너비에 맞추기 위해 화면 방향이 가로와 세로 사이를 오가며 바뀔 때
변경됩니다.</p>
<p>애플리케이션이 이 구성에 대해 서로 다른 값이 포함된 여러 개의 리소스 디렉터리를 제공하면,
-시스템은 기기의 현재 화면 너비에 가장 가까운(그러나 이를 초과하지 않는)
-값을 사용합니다. 이 값은
-화면 장식을 감안한 것이므로, 기기의 왼쪽이나 오른쪽 가장자리에
-영구 UI 요소가 있을 경우, 기기는
+시스템은 기기의 현재 화면 너비에 가장 가까운(그러나 이를 초과하지 않는)
+값을 사용합니다. 이 값은
+화면 장식을 감안한 것이므로, 기기의 왼쪽이나 오른쪽 가장자리에
+영구 UI 요소가 있을 경우, 기기는
이러한 UI 요소를 감안하여 애플리케이션의 이용 가능한 공간을 줄여서
실제 화면 크기보다 작은 너비 값을 사용합니다.</p>
<p><em>API 레벨 13에서 추가되었습니다.</em></p>
<p>현재 화면 너비를 보유한 {@link android.content.res.Configuration#screenWidthDp}
구성 필드도 참조하십시오.</p>
- <p>여러 가지 화면에 맞는 디자인과 한정자 사용에 관한 자세한 정보는
+ <p>여러 가지 화면에 맞는 디자인과 한정자 사용에 관한 자세한 정보는
<a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a> 개발자 가이드를 참조하십시오.</p>
</td>
@@ -449,25 +449,25 @@
등.
</td>
<td>
- <p>리소스가 사용되어야 하는 최소한의 사용 가능한 화면 높이를 "dp" 단위로 나타냅니다.
-이는 <code><N></code> 값이 정의합니다. 이 구성
-값은 현재 실제 높이에 맞추기 위해 화면 방향이 가로와 세로 사이를 오가며 바뀔 때
+ <p>리소스가 사용되어야 하는 최소한의 사용 가능한 화면 높이를 "dp" 단위로 나타냅니다.
+이는 <code><N></code> 값이 정의합니다. 이 구성
+값은 현재 실제 높이에 맞추기 위해 화면 방향이 가로와 세로 사이를 오가며 바뀔 때
변경됩니다.</p>
<p>애플리케이션이 이 구성에 대해 서로 다른 값이 포함된 여러 개의 리소스 디렉터리를 제공하면,
-시스템은 기기의 현재 화면 높이에 가장 가까운(그러나 이를 초과하지 않는)
-값을 사용합니다. 이 값은
-화면 장식을 감안한 것이므로, 기기의 상단이나 하단 가장자리에
-영구 UI 요소가 있을 경우, 기기는
+시스템은 기기의 현재 화면 높이에 가장 가까운(그러나 이를 초과하지 않는)
+값을 사용합니다. 이 값은
+화면 장식을 감안한 것이므로, 기기의 상단이나 하단 가장자리에
+영구 UI 요소가 있을 경우, 기기는
이러한 UI 요소를 감안하여 애플리케이션의 이용 가능한 공간을 줄여서
- 실제 화면 크기보다 작은 높이 값을 사용합니다.
-상태 표시줄에 고정되지 않은 화면 장식(예를 들어
-전화 상태 표시줄은 전체 화면에서 숨길 수 있음)은 여기에서 감안하지 <em>않았고</em>,
-제목 표시줄이나 작업 모음 등의 창 장식도 감안되지 않았으므로, 애플리케이션 입장에서는 자신이 지정한 것보다 어느 정도 작은 공간을
+ 실제 화면 크기보다 작은 높이 값을 사용합니다.
+상태 표시줄에 고정되지 않은 화면 장식(예를 들어
+전화 상태 표시줄은 전체 화면에서 숨길 수 있음)은 여기에서 감안하지 <em>않았고</em>,
+제목 표시줄이나 작업 모음 등의 창 장식도 감안되지 않았으므로, 애플리케이션 입장에서는 자신이 지정한 것보다 어느 정도 작은 공간을
받아들일 대비를 해야 합니다.
<p><em>API 레벨 13에서 추가되었습니다.</em></p>
<p>현재 화면 너비를 보유한 {@link android.content.res.Configuration#screenHeightDp}
구성 필드도 참조하십시오.</p>
- <p>여러 가지 화면에 맞는 디자인과 한정자 사용에 관한 자세한 정보는
+ <p>여러 가지 화면에 맞는 디자인과 한정자 사용에 관한 자세한 정보는
<a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a> 개발자 가이드를 참조하십시오.</p>
</td>
@@ -482,39 +482,39 @@
</td>
<td>
<ul class="nolist">
- <li>{@code small}: 저밀도 QVGA 화면과 비슷한
+ <li>{@code small}: 저밀도 QVGA 화면과 비슷한
크기의 화면입니다. 작은 화면의 최소 레이아웃 크기는
-약 320x426 dp단위입니다. 이 화면의 예시로는 QVGA 저밀도 및 VGA 고밀도가
+약 320x426 dp단위입니다. 이 화면의 예시로는 QVGA 저밀도 및 VGA 고밀도가
있습니다.</li>
- <li>{@code normal}: 중밀도 HVGA 화면과
+ <li>{@code normal}: 중밀도 HVGA 화면과
비슷한 크기의 화면입니다. 정상 화면의
- 최소 레이아웃 크기는 약 320x470 dp 단위입니다. 이 화면의 예로는
+ 최소 레이아웃 크기는 약 320x470 dp 단위입니다. 이 화면의 예로는
WQVGA 저밀도, HVGA 중밀도, WVGA 고밀도 등이 있습니다.
</li>
- <li>{@code large}: 중밀도 VGA 화면과
+ <li>{@code large}: 중밀도 VGA 화면과
비슷한 크기의 화면입니다.
큰 화면의 최소 레이아웃 크기는 약 480x640 dp 단위입니다.
이 화면의 예시로는 VGA 및 WVGA 중밀도 화면이 있습니다.</li>
- <li>{@code xlarge}: 일반적인 중밀도 HVGA 화면보다 상당히 큰 화면을
+ <li>{@code xlarge}: 일반적인 중밀도 HVGA 화면보다 상당히 큰 화면을
말합니다. 초대형 화면의
- 최소 레이아웃 크기는 약 720x960 dp 단위입니다. 대부분의 경우, 초대형 화면 기기는
-주머니에 넣어 다니기에 너무 큽니다. 따라서 태블릿 스타일의 기기일 가능성이
+ 최소 레이아웃 크기는 약 720x960 dp 단위입니다. 대부분의 경우, 초대형 화면 기기는
+주머니에 넣어 다니기에 너무 큽니다. 따라서 태블릿 스타일의 기기일 가능성이
높습니다. <em>API 레벨 9에서 추가되었습니다.</em></li>
</ul>
- <p class="note"><strong>참고:</strong> 크기 한정자를 사용하더라도 해당 리소스가 그 크기의 화면
-<em>전용</em>이라는 뜻은 아닙니다. 현재 기기 구성과 더욱 잘 맞는 한정자가 포함된 대체 리소스를
-제공하지 않으면,
+ <p class="note"><strong>참고:</strong> 크기 한정자를 사용하더라도 해당 리소스가 그 크기의 화면
+<em>전용</em>이라는 뜻은 아닙니다. 현재 기기 구성과 더욱 잘 맞는 한정자가 포함된 대체 리소스를
+제공하지 않으면,
시스템이 <a href="#BestMatch">가장 잘 일치하는</a> 리소스를 사용합니다.</p>
<p class="caution"><strong>주의:</strong> 모든 리소스가 현재 화면보다
<em>큰</em> 크기 한정자를 사용하는 경우, 시스템은 리소스를 사용하지 <strong>않으며</strong> 애플리케이션은 런타임에 작동이 중단됩니다(예를 들어, 모든 레이아웃 리소스에 {@code
xlarge} 한정자가 태그되어 있지만 기기는 일반 크기 화면일 경우
).</p>
<p><em>API 레벨 4에서 추가되었습니다.</em></p>
-
- <p>자세한 정보는 <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
+
+ <p>자세한 정보는 <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a>을 참조하십시오.</p>
- <p>{@link android.content.res.Configuration#screenLayout} 구성 필드도 참조하십시오.
-이것은 화면이 소형, 일반 크기 또는
+ <p>{@link android.content.res.Configuration#screenLayout} 구성 필드도 참조하십시오.
+이것은 화면이 소형, 일반 크기 또는
대형인지를 나타냅니다.</p>
</td>
</tr>
@@ -530,9 +530,9 @@
<li>{@code notlong}: QVGA, HVGA 및 VGA 등의 길지 않은 화면</li>
</ul>
<p><em>API 레벨 4에서 추가되었습니다.</em></p>
- <p>이것은 순전히 화면 비율에만 기초합니다("긴" 화면이 더 넓습니다). 이는
+ <p>이것은 순전히 화면 비율에만 기초합니다("긴" 화면이 더 넓습니다). 이는
화면 방향과 관계가 없습니다.</p>
- <p>{@link android.content.res.Configuration#screenLayout}도 참조하십시오.
+ <p>{@link android.content.res.Configuration#screenLayout}도 참조하십시오.
이것은 화면이 긴 화면인지 여부를 나타냅니다.</p>
</td>
</tr>
@@ -549,10 +549,10 @@
<li>{@code land}: 기기가 가로 방향(수평)입니다.</li>
<!-- Square mode is currently not used. -->
</ul>
- <p>이것은 사용자가 화면을 돌리는 경우 애플리케이션 수명 중에
-변경될 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면
+ <p>이것은 사용자가 화면을 돌리는 경우 애플리케이션 수명 중에
+변경될 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면
<a href="runtime-changes.html">런타임 변경 처리</a>를 참조하십시오.</p>
- <p>{@link android.content.res.Configuration#orientation} 구성 필드도 참조하십시오.
+ <p>{@link android.content.res.Configuration#orientation} 구성 필드도 참조하십시오.
이는 현재 기기 방향을 나타냅니다.</p>
</td>
</tr>
@@ -569,21 +569,21 @@
<ul class="nolist">
<li>{@code car}: 기기가 차량용 도크에서 표시되고 있습니다.</li>
<li>{@code desk}: 기기가 데스크용 도크에서 표시되고 있습니다.</li>
- <li>{@code television}: 기기가 텔레비전에서 표시되고 있으며,
-UI가 큰 화면에 있고 사용자가 여기에서 멀리 떨어져 있는
-"텐 풋(ten foot)" 환경을 제공하고 있습니다. 이는 주로 DPAD 또는
+ <li>{@code television}: 기기가 텔레비전에서 표시되고 있으며,
+UI가 큰 화면에 있고 사용자가 여기에서 멀리 떨어져 있는
+"텐 풋(ten foot)" 환경을 제공하고 있습니다. 이는 주로 DPAD 또는
기타 비-포인터 상호 작용 주변을 가리킵니다.</li>
- <li>{@code appliance}: 기기가 가전 제품 역할을 하고 있으며, 디스플레이
+ <li>{@code appliance}: 기기가 가전 제품 역할을 하고 있으며, 디스플레이
화면이 없습니다.</li>
<li>{@code watch}: 기기에 디스플레이 화면이 있고 손목에 착용됩니다.</li>
</ul>
<p><em>API 레벨 8에서 추가되었고, 텔레비전은 API 13에서, 시계는 API 20에서 추가되었습니다.</em></p>
- <p>기기가 도크에 삽입되거나 제거될 때 앱이 응답하는 방식에 관한 정보는
-<a href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">도킹 상태 및 유형
+ <p>기기가 도크에 삽입되거나 제거될 때 앱이 응답하는 방식에 관한 정보는
+<a href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">도킹 상태 및 유형
판별과 모니터링</a>을 읽어보십시오.</p>
- <p>이것은 사용자가 기기를 도크에 놓는 경우 애플리케이션 수명 중에
+ <p>이것은 사용자가 기기를 도크에 놓는 경우 애플리케이션 수명 중에
변경될 수 있습니다. 이러한 모드 중 몇 가지는 {@link
-android.app.UiModeManager}를 사용하여 활성화 또는 비활성화할 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
+android.app.UiModeManager}를 사용하여 활성화 또는 비활성화할 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
참조하십시오.</p>
</td>
</tr>
@@ -599,9 +599,9 @@
<li>{@code notnight}: 주간</li>
</ul>
<p><em>API 레벨 8에서 추가되었습니다.</em></p>
- <p>이것은 야간 모드가 자동 모드인 상태(기본)에서 애플리케이션의 수명 중에
-변경될 수 있습니다. 이 경우 모드는 하루 중 시간대를 기반으로 변경됩니다. 이 모드는
-{@link android.app.UiModeManager}를 사용하여 활성화 또는 비활성화할 수 있습니다. 이것이 런타임 중 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
+ <p>이것은 야간 모드가 자동 모드인 상태(기본)에서 애플리케이션의 수명 중에
+변경될 수 있습니다. 이 경우 모드는 하루 중 시간대를 기반으로 변경됩니다. 이 모드는
+{@link android.app.UiModeManager}를 사용하여 활성화 또는 비활성화할 수 있습니다. 이것이 런타임 중 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
참조하십시오.</p>
</td>
</tr>
@@ -623,33 +623,33 @@
<li>{@code mdpi}: 중밀도(일반적인 HVGA에서) 화면, 약
160dpi.</li>
<li>{@code hdpi}: 고밀도 화면, 약 240dpi.</li>
- <li>{@code xhdpi}: 초고밀도 화면, 약 320dpi. <em>API 레벨 8에서
+ <li>{@code xhdpi}: 초고밀도 화면, 약 320dpi. <em>API 레벨 8에서
추가되었습니다.</em></li>
- <li>{@code xxhdpi}: 슈퍼 초고밀도 화면, 약 480dpi. <em>API 레벨 16에서
+ <li>{@code xxhdpi}: 슈퍼 초고밀도 화면, 약 480dpi. <em>API 레벨 16에서
추가되었습니다.</em></li>
- <li>{@code xxxhdpi}: 울트라 슈퍼 초고밀도 화면 사용(시작 관리자 아이콘만 해당,
-<em>다중 화면 지원</em>의
-<a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">참고</a>를 참조하십시오), 약 640dpi. <em>API 레벨 18에서
+ <li>{@code xxxhdpi}: 울트라 슈퍼 초고밀도 화면 사용(시작 관리자 아이콘만 해당,
+<em>다중 화면 지원</em>의
+<a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">참고</a>를 참조하십시오), 약 640dpi. <em>API 레벨 18에서
추가되었습니다.</em></li>
- <li>{@code nodpi}: 이것은 기기 밀도에 일치하도록 크기를 조정하고자 하지 않는 비트맵 리소스에
+ <li>{@code nodpi}: 이것은 기기 밀도에 일치하도록 크기를 조정하고자 하지 않는 비트맵 리소스에
사용할 수 있습니다.</li>
- <li>{@code tvdpi}: Mdpi와 hdpi 사이 어딘가에 해당되는 화면, 약 213dpi. 이것은
-"기본" 밀도 그룹으로 간주되지 않습니다. 이는 대체로 텔레비전용으로 만들어진 것이며
-대부분의 앱에는 필요하지 않는 것이 정상입니다. mdpi 및 hdpi만 제공하면 대부분의 앱에는 충분하고
+ <li>{@code tvdpi}: Mdpi와 hdpi 사이 어딘가에 해당되는 화면, 약 213dpi. 이것은
+"기본" 밀도 그룹으로 간주되지 않습니다. 이는 대체로 텔레비전용으로 만들어진 것이며
+대부분의 앱에는 필요하지 않는 것이 정상입니다. mdpi 및 hdpi만 제공하면 대부분의 앱에는 충분하고
시스템이 필요에 따라 크기를 조정해줍니다. 이 한정자는 API 레벨 13과 함께 도입되었습니다.</li>
</ul>
- <p>여섯 가지 기본 밀도간에 3:4:6:8:12:16 비율 척도가 있습니다(tvdpi 밀도는
+ <p>여섯 가지 기본 밀도간에 3:4:6:8:12:16 비율 척도가 있습니다(tvdpi 밀도는
무시). 그러므로 ldpi의 9x9 비트맵은 mdpi에서 12x12이고, hdpi에서 18x18, xhdpi에서 24x24 등, 이런 식으로 적용됩니다.
</p>
- <p>이미지 리소스가 텔레비전이나 특정 기기에서 제대로 보이지 않는다고 결정하고
+ <p>이미지 리소스가 텔레비전이나 특정 기기에서 제대로 보이지 않는다고 결정하고
tvdpi 리소스를 사용하려 할 경우, 배율은 1.33*mdpi입니다. 예를 들어,
mdpi 화면의 100px x 100px 이미지는 tvdpi에서 133px x 133px가 되어야 합니다.</p>
- <p class="note"><strong>참고:</strong> 밀도 한정자를 사용하더라도 해당 리소스가 그 밀도의 화면
-<em>전용</em>이라는 뜻은 아닙니다. 현재 기기 구성과 더욱 잘 맞는 한정자가 포함된 대체 리소스를
-제공하지 않으면,
+ <p class="note"><strong>참고:</strong> 밀도 한정자를 사용하더라도 해당 리소스가 그 밀도의 화면
+<em>전용</em>이라는 뜻은 아닙니다. 현재 기기 구성과 더욱 잘 맞는 한정자가 포함된 대체 리소스를
+제공하지 않으면,
시스템이 <a href="#BestMatch">가장 잘 일치하는</a> 리소스를 사용합니다.</p>
- <p>다양한 화질을 처리하는 방법과
-Android가 현재 화질에 맞춰 비트맵을 축소하는 방법에 관한 자세한 정보는 <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
+ <p>다양한 화질을 처리하는 방법과
+Android가 현재 화질에 맞춰 비트맵을 축소하는 방법에 관한 자세한 정보는 <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a>을 참조하십시오.</p>
</td>
</tr>
@@ -662,10 +662,10 @@
<td>
<ul class="nolist">
<li>{@code notouch}: 기기에 터치 스크린이 없습니다.</li>
- <li>{@code finger}: 기기에 터치 스크린이 있으며 이를
+ <li>{@code finger}: 기기에 터치 스크린이 있으며 이를
사용자의 손가락을 사용한 방향 지시 상호 작용을 통해 쓰도록 되어 있습니다.</li>
</ul>
- <p>{@link android.content.res.Configuration#touchscreen} 구성 필드도 참조하십시오.
+ <p>{@link android.content.res.Configuration#touchscreen} 구성 필드도 참조하십시오.
이는 기기에서 사용되는 터치 스크린의 유형을 나타냅니다.</p>
</td>
</tr>
@@ -678,25 +678,25 @@
</td>
<td>
<ul class="nolist">
- <li>{@code keysexposed}: 기기에서 키보드를 사용할 수 있습니다. 키보드에
-소프트웨어 키보드가 활성화되어 있으면(이럴 가능성이 큽니다), 하드웨어 키보드가 사용자에게 노출되어 있지
-<em>않거나</em> 기기에 하드웨어 키보드가 없더라도 이 리소스를 사용할 수 있습니다. 소프트웨어
-키보드가 제공되어 있지 않거나 비활성화되어 있는 경우 이것은 하드웨어 키보드가 노출되어 있을 때에만
+ <li>{@code keysexposed}: 기기에서 키보드를 사용할 수 있습니다. 키보드에
+소프트웨어 키보드가 활성화되어 있으면(이럴 가능성이 큽니다), 하드웨어 키보드가 사용자에게 노출되어 있지
+<em>않거나</em> 기기에 하드웨어 키보드가 없더라도 이 리소스를 사용할 수 있습니다. 소프트웨어
+키보드가 제공되어 있지 않거나 비활성화되어 있는 경우 이것은 하드웨어 키보드가 노출되어 있을 때에만
사용할 수 있습니다.</li>
- <li>{@code keyshidden}: 기기에서 하드웨어 키보드를 사용할 수 있지만
+ <li>{@code keyshidden}: 기기에서 하드웨어 키보드를 사용할 수 있지만
숨겨져 있고 <em>이에 더하여</em> 기기에 소프트웨어 키보드가 활성화되어 있지 <em>않습니다</em>.</li>
- <li>{@code keyssoft}: 기기에 활성화된 소프트웨어 키보드가 있습니다(표시 여부는
+ <li>{@code keyssoft}: 기기에 활성화된 소프트웨어 키보드가 있습니다(표시 여부는
무관).</li>
</ul>
<p><code>keysexposed</code> 리소스를 제공하지만 <code>keyssoft</code>
-리소스는 제공하지 않는다면, 시스템은 소프트웨어 키보드가 활성화되어 있는 동안은 키보드가 보이는지 여부와 관계없이 <code>keysexposed</code>
+리소스는 제공하지 않는다면, 시스템은 소프트웨어 키보드가 활성화되어 있는 동안은 키보드가 보이는지 여부와 관계없이 <code>keysexposed</code>
리소스를 사용합니다.</p>
- <p>이것은 사용자가 하드웨어 키보드를 여는 경우 애플리케이션 수명 중에
-변경될 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
+ <p>이것은 사용자가 하드웨어 키보드를 여는 경우 애플리케이션 수명 중에
+변경될 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
참조하십시오.</p>
<p>또한, 구성 필드 {@link
android.content.res.Configuration#hardKeyboardHidden}과 {@link
-android.content.res.Configuration#keyboardHidden}을 참조하십시오. 이 필드는 각각 하드웨어 키보드의 가시성과
+android.content.res.Configuration#keyboardHidden}을 참조하십시오. 이 필드는 각각 하드웨어 키보드의 가시성과
모든 종류의 키보드(소프트웨어 포함)의 가시성을 나타냅니다.</p>
</td>
</tr>
@@ -710,13 +710,13 @@
<td>
<ul class="nolist">
<li>{@code nokeys}: 기기에 텍스트 입력을 위한 하드웨어 키가 없습니다.</li>
- <li>{@code qwerty}: 기기에 하드웨어 쿼티 키보드가 있습니다(이것이
+ <li>{@code qwerty}: 기기에 하드웨어 쿼티 키보드가 있습니다(이것이
사용자
에게 표시되는지 여부는 무관).</li>
- <li>{@code 12key}: 기기에 하드웨어 12-키 키보드가 있습니다(이것이 사용자에게 표시되는지 여부는
+ <li>{@code 12key}: 기기에 하드웨어 12-키 키보드가 있습니다(이것이 사용자에게 표시되는지 여부는
무관).</li>
</ul>
- <p>{@link android.content.res.Configuration#keyboard} 구성 필드도 참조하십시오.
+ <p>{@link android.content.res.Configuration#keyboard} 구성 필드도 참조하십시오.
이는 기본 텍스트 입력 메서드를 사용할 수 있는지 여부를 나타냅니다.</p>
</td>
</tr>
@@ -729,13 +729,13 @@
<td>
<ul class="nolist">
<li>{@code navexposed}: 사용자가 탐색 키를 사용할 수 있습니다.</li>
- <li>{@code navhidden}: 탐색 키를 사용할 수 없습니다(예: 닫힌 뚜껑 뒤에 있는
+ <li>{@code navhidden}: 탐색 키를 사용할 수 없습니다(예: 닫힌 뚜껑 뒤에 있는
경우).</li>
</ul>
- <p>이것은 사용자가 탐색 키를 드러내는 경우 애플리케이션 수명 중에
-변경될 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
+ <p>이것은 사용자가 탐색 키를 드러내는 경우 애플리케이션 수명 중에
+변경될 수 있습니다. 이것이 런타임에 애플리케이션에 어떤 영향을 미치는지 알아보려면 <a href="runtime-changes.html">런타임 변경 처리</a>를
참조하십시오.</p>
- <p>{@link android.content.res.Configuration#navigationHidden} 구성
+ <p>{@link android.content.res.Configuration#navigationHidden} 구성
필드도 참조하십시오. 이는 탐색 키가 숨겨져 있는지 여부를 나타냅니다.</p>
</td>
</tr>
@@ -749,13 +749,13 @@
</td>
<td>
<ul class="nolist">
- <li>{@code nonav}: 기기에 터치 스크린을 제외하고 다른 탐색 기능이
+ <li>{@code nonav}: 기기에 터치 스크린을 제외하고 다른 탐색 기능이
없습니다.</li>
<li>{@code dpad}: 기기에 탐색용 방향 패드(d-pad)가 있습니다.</li>
<li>{@code trackball}: 기기에 탐색용 트랙볼이 있습니다.</li>
<li>{@code wheel}: 기기에 탐색용 방향 휠이 있습니다.</li>
</ul>
- <p>{@link android.content.res.Configuration#navigation} 구성 필드도 참조하십시오.
+ <p>{@link android.content.res.Configuration#navigation} 구성 필드도 참조하십시오.
이는 사용 가능한 탐색 메서드의 유형을 나타냅니다.</p>
</td>
</tr>
@@ -792,11 +792,11 @@
<p class="note"><strong>참고:</strong> 일부 구성 한정자는 Android
-1.0 이후부터 추가되었으므로 모든 Android 버전이 모든 한정자를 지원하는 것은 아닙니다. 새로운 한정자를 사용하면 암시적으로
-플랫폼 버전 한정자도 추가하므로 구형 기기가 이를 무시하게 됩니다. 예를 들어
-<code>w600dp</code> 한정자를 사용하면 자동적으로 <code>v13</code> 한정자를 포함합니다.
-사용 가능한 너비 한정자가 API 레벨 13부터 새로 도입되었기 때문입니다. 문제를 애초에 피하려면, 항상
-기본 리소스를 한 세트 포함하세요(<em>한정자 없는</em> 리소스 한 세트). 자세한 정보는
+1.0 이후부터 추가되었으므로 모든 Android 버전이 모든 한정자를 지원하는 것은 아닙니다. 새로운 한정자를 사용하면 암시적으로
+플랫폼 버전 한정자도 추가하므로 구형 기기가 이를 무시하게 됩니다. 예를 들어
+<code>w600dp</code> 한정자를 사용하면 자동적으로 <code>v13</code> 한정자를 포함합니다.
+사용 가능한 너비 한정자가 API 레벨 13부터 새로 도입되었기 때문입니다. 문제를 애초에 피하려면, 항상
+기본 리소스를 한 세트 포함하세요(<em>한정자 없는</em> 리소스 한 세트). 자세한 정보는
<a href="#Compatibility">리소스와 연관된 최선의 기기 호환성 제공
</a>을 참조하십시오.</p>
@@ -808,7 +808,7 @@
<ul>
<li>한 가지 리소스 세트에 여러 개의 한정자를 사용할 수 있으며, 이를 대시로 구분하면 됩니다. 예를 들어,
-<code>drawable-en-rUS-land</code>는 수평 방향의
+<code>drawable-en-rUS-land</code>는 수평 방향의
US-English 기기에 적용합니다.</li>
<li>한정자는 <a href="#table2">표2</a>에 나열된 순서를 따라야 합니다. 예:
@@ -817,25 +817,25 @@
<li>맞는 배열: <code>drawable-port-hdpi/</code></li>
</ul>
</li>
- <li>대체 리소스 디렉터리는 중첩될 수 없습니다. 예를 들어,
+ <li>대체 리소스 디렉터리는 중첩될 수 없습니다. 예를 들어,
<code>res/drawable/drawable-en/</code>는 있을 수 없습니다.</li>
- <li>값은 대소문자를 구분하지 않습니다. 리소스 컴파일러가 처리 전에 디렉터리 이름을
-소문자로 바꿔 대소문자를 구분하지 않는
+ <li>값은 대소문자를 구분하지 않습니다. 리소스 컴파일러가 처리 전에 디렉터리 이름을
+소문자로 바꿔 대소문자를 구분하지 않는
파일 시스템에서 문제를 일으키지 않도록 방지합니다. 이름에 대문자가 있는 것은 오로지 가독성을 향상하기 위해서입니다.</li>
- <li>각 한정자 유형마다 한 개의 값만 지원됩니다. 예를 들어, 스페인과 프랑스에
-같은 드로어블 파일을 사용하고자 하는 경우 디렉터리 이름이
-<code>drawable-rES-rFR/</code>이면 <em>안 됩니다.</em> 대신
+ <li>각 한정자 유형마다 한 개의 값만 지원됩니다. 예를 들어, 스페인과 프랑스에
+같은 드로어블 파일을 사용하고자 하는 경우 디렉터리 이름이
+<code>drawable-rES-rFR/</code>이면 <em>안 됩니다.</em> 대신
<code>drawable-rES/</code>와 <code>drawable-rFR/</code> 같이 적절한 파일이 포함된 두 개의 리소스 디렉터리가 필요합니다.
-그러나 두 위치에서 같은 파일을 실제로 복제할 필요는 없습니다. 대신
+그러나 두 위치에서 같은 파일을 실제로 복제할 필요는 없습니다. 대신
리소스에 별명을 만들면 됩니다. 아래의 <a href="#AliasResources">별명 리소스
생성</a>을 참조하십시오.</li>
</ul>
-<p>이런 한정자로 이름을 지은 디렉터리에 대체 리소스를 저장하고 나면
+<p>이런 한정자로 이름을 지은 디렉터리에 대체 리소스를 저장하고 나면
Android가 현재 기기 구성에 기초하여 애플리케이션에 자동으로 리소스를 적용합니다.
리소스가 요청될 때마다 Android가 요청한 리소스 파일이 들어있는
-대체 리소스 디렉터리를 확인하고, 그런 다음 <a href="#BestMatch">가장 잘 일치하는
-리소스를 찾습니다</a>(아래에서 논함). 특정 기기 구성에 일치하는 대체 리소스가 없는 경우,
+대체 리소스 디렉터리를 확인하고, 그런 다음 <a href="#BestMatch">가장 잘 일치하는
+리소스를 찾습니다</a>(아래에서 논함). 특정 기기 구성에 일치하는 대체 리소스가 없는 경우,
Android는 상응하는 기본 리소스(구성 한정자를 포함하지 않는
특정 리소스 유형에 대한 리소스 세트
)를 사용합니다.</p>
@@ -844,31 +844,31 @@
<h3 id="AliasResources">별명 리소스 생성</h3>
-<p>어떤 리소스를 하나 이상의 기기 구성에서 사용하고자 하는 경우(그렇지만
-이를 기본 리소스를 제공하는 것은 원치 않는 경우), 같은 리소스를 하나 이상의 대체 리소스 디렉터리에
-넣지 않아도 됩니다. 대신, 기본 리소스 디렉터리에 저장된 리소스에 대해 별명 역할을 하는
-대체
+<p>어떤 리소스를 하나 이상의 기기 구성에서 사용하고자 하는 경우(그렇지만
+이를 기본 리소스를 제공하는 것은 원치 않는 경우), 같은 리소스를 하나 이상의 대체 리소스 디렉터리에
+넣지 않아도 됩니다. 대신, 기본 리소스 디렉터리에 저장된 리소스에 대해 별명 역할을 하는
+대체
리소스를 만들면 됩니다(경우에 따라).</p>
-<p class="note"><strong>참고:</strong> 모든 리소스가 다른 리소스에 대한
-별명을 생성할 수 있는 메커니즘을 제공하는 것은 아닙니다. 특히, {@code xml/} 디렉터리의 애니메이션, 메뉴, 원시 및 기타 지정되지 않은
+<p class="note"><strong>참고:</strong> 모든 리소스가 다른 리소스에 대한
+별명을 생성할 수 있는 메커니즘을 제공하는 것은 아닙니다. 특히, {@code xml/} 디렉터리의 애니메이션, 메뉴, 원시 및 기타 지정되지 않은
리소스는 이 기능을 제공하지 않습니다.</p>
-<p>예를 들어, 애플리케이션 아이콘 {@code icon.png}이 있고 서로 다른 로케일에서 이 아이콘의 고유 버전이
-필요한 경우가 있습니다. 그러나 두 로케일, English-Canadian과 French-Canadian은 같은 버전을
-사용해야 합니다. 같은 이미지를 English-Canadian과 French-Canadian 양쪽
-모두에 대한 리소스 디렉터리에 복사해야 한다고 생각할 수 있지만, 실은
+<p>예를 들어, 애플리케이션 아이콘 {@code icon.png}이 있고 서로 다른 로케일에서 이 아이콘의 고유 버전이
+필요한 경우가 있습니다. 그러나 두 로케일, English-Canadian과 French-Canadian은 같은 버전을
+사용해야 합니다. 같은 이미지를 English-Canadian과 French-Canadian 양쪽
+모두에 대한 리소스 디렉터리에 복사해야 한다고 생각할 수 있지만, 실은
그렇지 않습니다. 대신, 두 로케일에서 사용하는 이미지를 {@code icon_ca.png}(
-{@code icon.png} 이외에 어떤 이름이든 가능)로 저장하고 이를
+{@code icon.png} 이외에 어떤 이름이든 가능)로 저장하고 이를
기본 {@code res/drawable/} 디렉터리에 넣으면 됩니다. 그런 다음 {@code icon.xml} 파일을 {@code icon_ca.png}
리소스를 참조하는 {@code
-res/drawable-en-rCA/} 및 {@code res/drawable-fr-rCA/}로 생성합니다. 이때, {@code <bitmap>} 요소를 사용하면 됩니다. 이렇게 하면
+res/drawable-en-rCA/} 및 {@code res/drawable-fr-rCA/}로 생성합니다. 이때, {@code <bitmap>} 요소를 사용하면 됩니다. 이렇게 하면
PNG 파일 버전 하나와 그것을 가리키는 작은 XML 파일 두 개만 저장할 수 있습니다. (XML 파일 예시는 아래와 같습니다.)</p>
<h4>드로어블</h4>
-<p>기존 드로어블에 별명을 생성하려면 {@code <bitmap>} 요소를 사용합니다.
+<p>기존 드로어블에 별명을 생성하려면 {@code <bitmap>} 요소를 사용합니다.
예를 들면 다음과 같습니다.</p>
<pre>
@@ -896,13 +896,13 @@
</pre>
<p>파일을 {@code main.xml}로 저장하면, {@code R.layout.main}으로 참조할 수 있지만 실제로는 {@code R.layout.main_ltr}
- 리소스의 별명인 리소스로
+ 리소스의 별명인 리소스로
컴파일링됩니다.</p>
<h4>문자열 및 기타 단순 값</h4>
-<p>기존 문자열에 별명을 생성하려면 원하는 문자열의 리소스 ID를
+<p>기존 문자열에 별명을 생성하려면 원하는 문자열의 리소스 ID를
새 문자열의 값으로 사용하면 됩니다. 예:</p>
<pre>
@@ -915,7 +915,7 @@
<p>이제 {@code R.string.hi} 리소스는 {@code R.string.hello}의 별명입니다.</p>
-<p> <a href="{@docRoot}guide/topics/resources/more-resources.html">기타 단순 값도</a> 같은 방식으로
+<p> <a href="{@docRoot}guide/topics/resources/more-resources.html">기타 단순 값도</a> 같은 방식으로
동작합니다. 예를 들면 색상은 다음과 같습니다.</p>
<pre>
@@ -931,50 +931,50 @@
<h2 id="Compatibility">리소스와 연관된 최선의 기기 호환성 제공</h2>
-<p>애플리케이션이 여러 기기 구성을 지원하게 하려면,
+<p>애플리케이션이 여러 기기 구성을 지원하게 하려면,
언제나 애플리케이션이 사용하는 각 유형의 리소스에 기본 리소스를 제공하는 것이 매우 중요합니다.</p>
<p>예를 들어 애플리케이션이 여러 언어를 지원할 경우, 항상 <em>언어 및 지역 한정자</em> <a href="#LocaleQualifier">없이</a> {@code
-values/} 디렉터리(여기에 문자열 저장)를 포함시켜야 합니다. 그렇게 하지 않고 언어와 지역 한정자가 있는 디렉터리에
-모든 문자열을 넣으면, 문자열이 지원하지 않는 언어로 설정된 기기에서 애플리케이션을
-실행하면 작동이 중단됩니다. 그러나 기본
-{@code values/} 리소스를 제공하는 한은 애플리케이션이 제대로 실행됩니다(사용자가 이해하지 못하는
+values/} 디렉터리(여기에 문자열 저장)를 포함시켜야 합니다. 그렇게 하지 않고 언어와 지역 한정자가 있는 디렉터리에
+모든 문자열을 넣으면, 문자열이 지원하지 않는 언어로 설정된 기기에서 애플리케이션을
+실행하면 작동이 중단됩니다. 그러나 기본
+{@code values/} 리소스를 제공하는 한은 애플리케이션이 제대로 실행됩니다(사용자가 이해하지 못하는
언어로라도 작동합니다. 작동 중단보다 낫습니다.)</p>
-<p>마찬가지로 화면 방향에 기초하여 여러 가지 레이아웃 리소스를 제공하는 경우
+<p>마찬가지로 화면 방향에 기초하여 여러 가지 레이아웃 리소스를 제공하는 경우
하나의 방향을 기본값으로 선택해야 합니다. 예를 들어 가로 방향에는 {@code
-layout-land/}로, 세로 방향에는 {@code layout-port/}로 레이아웃 리소스를 제공하는 대신 하나를 기본으로 남겨두십시오.
+layout-land/}로, 세로 방향에는 {@code layout-port/}로 레이아웃 리소스를 제공하는 대신 하나를 기본으로 남겨두십시오.
가로 방향에 {@code layout/}, 세로 방향에 {@code layout-port/}와 같은 식으로 하면 됩니다.</p>
-<p>애플리케이션이 예상치 못한 구성에서 실행될 수 있을 뿐만 아니라
-Android의 새 버전에서 이전 버전에서는 지원하지 않는 구성 한정자를 추가할 수도 있으므로,
-기본 리소스를 제공하는 것이 중요합니다. 새 리소스 한정자를 사용하지만,
+<p>애플리케이션이 예상치 못한 구성에서 실행될 수 있을 뿐만 아니라
+Android의 새 버전에서 이전 버전에서는 지원하지 않는 구성 한정자를 추가할 수도 있으므로,
+기본 리소스를 제공하는 것이 중요합니다. 새 리소스 한정자를 사용하지만,
Android 이전 버전과 코드 호환성은 유지한 경우, 그 후 Android 이전 버전이
-애플리케이션을 실행하면 새로운 한정자로 이름을 지정한 리소스를 사용할 수 없으므로 기본 리소스를 제공하지 않으면
+애플리케이션을 실행하면 새로운 한정자로 이름을 지정한 리소스를 사용할 수 없으므로 기본 리소스를 제공하지 않으면
애플리케이션 작동이 중단됩니다. 예를 들어, <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
-minSdkVersion}</a>이 4로 설정되고 <a href="#NightQualifier">야간 모드</a>(API 레벨 8에서 추가된 {@code night} 또는 {@code notnight})를 사용하는 모든 드로어블 리소스를 한정할 경우, API 레벨 4 기기는
-드로어블 리소스에 액세스하지 못하고 사용이 중단됩니다. 이 경우,
-{@code notnight}를 기본 리소스로 제공하는 것이 좋습니다. 그래야 해당 한정자를 배제하고
+minSdkVersion}</a>이 4로 설정되고 <a href="#NightQualifier">야간 모드</a>(API 레벨 8에서 추가된 {@code night} 또는 {@code notnight})를 사용하는 모든 드로어블 리소스를 한정할 경우, API 레벨 4 기기는
+드로어블 리소스에 액세스하지 못하고 사용이 중단됩니다. 이 경우,
+{@code notnight}를 기본 리소스로 제공하는 것이 좋습니다. 그래야 해당 한정자를 배제하고
드로어블 리소스가 {@code drawable/} 또는 {@code drawable-night/}이 됩니다.</p>
-<p>그러므로 최선의 기기 호환성을 제공하려면 언제나
-애플리케이션에서 반드시 제대로 수행해야 하는 리소스에 대해 기본 리소스를 제공하십시오. 그런 다음 구성 한정자를 사용하여
+<p>그러므로 최선의 기기 호환성을 제공하려면 언제나
+애플리케이션에서 반드시 제대로 수행해야 하는 리소스에 대해 기본 리소스를 제공하십시오. 그런 다음 구성 한정자를 사용하여
특정 기기 구성에 대해 대체 리소스를 생성하면 됩니다.</p>
-<p>이 규칙에는 한 가지 예외가 있습니다. 애플리케이션의 <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a> 이 4 이상이면
-<a href="#DensityQualifier">화면 밀도</a> 한정자로 대체 드로어블 리소스를 제공할 때 기본 드로어블
-리소스가 <em>없어도 됩니다</em>. 기본
-드로어블 리소스가 없더라도 Android가 대체 화면 화질 중에서 가장 잘 맞는 리소스를 찾고
-필요에 따라 비트맵을 축소합니다. 그러나 모든 유형의 기기에서 최상의 경험을 제공하려면,
+<p>이 규칙에는 한 가지 예외가 있습니다. 애플리케이션의 <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a> 이 4 이상이면
+<a href="#DensityQualifier">화면 밀도</a> 한정자로 대체 드로어블 리소스를 제공할 때 기본 드로어블
+리소스가 <em>없어도 됩니다</em>. 기본
+드로어블 리소스가 없더라도 Android가 대체 화면 화질 중에서 가장 잘 맞는 리소스를 찾고
+필요에 따라 비트맵을 축소합니다. 그러나 모든 유형의 기기에서 최상의 경험을 제공하려면,
모든 세 가지 유형의 밀도에 대해 대체 드로어블을 제공해야 합니다.</p>
<h2 id="BestMatch">Android가 가장 잘 일치하는 리소스를 찾는 방법</h2>
-<p>개발자가 자신이 대체를 제공하는 리소스를 요청하면 Android가 런타임에 어느 대체 리소스를
-사용할지 현대 기기 구성에 따라 여러 가지로 선택합니다. Android가
-대체 리소스를 선택하는 방법을 보여주기 위해 다음 드로어블 디렉터리에 각각 같은 이미지의
+<p>개발자가 자신이 대체를 제공하는 리소스를 요청하면 Android가 런타임에 어느 대체 리소스를
+사용할지 현대 기기 구성에 따라 여러 가지로 선택합니다. Android가
+대체 리소스를 선택하는 방법을 보여주기 위해 다음 드로어블 디렉터리에 각각 같은 이미지의
서로 다른 버전이 들어있다고 가정하겠습니다.</p>
<pre class="classic no-pretty-print">
@@ -997,16 +997,16 @@
기본 텍스트 입력 메서드 = <code>12key</code>
</p>
-<p>Android는 기기 구성을 이용 가능한 대체 리소스와 비교하여,
+<p>Android는 기기 구성을 이용 가능한 대체 리소스와 비교하여,
{@code drawable-en-port}에서 드로어블을 선택합니다.</p>
-<p>시스템은 다음과 같은 논리에 따라
+<p>시스템은 다음과 같은 논리에 따라
어느 리소스를 사용할지 결정합니다.</p>
<div class="figure" style="width:371px">
<img src="{@docRoot}images/resources/res-selection-flowchart.png" alt="" height="471" />
-<p class="img-caption"><strong>그림 2.</strong> Android가 가장 잘 일치하는 리소스를 찾는 방법을 나타낸
+<p class="img-caption"><strong>그림 2.</strong> Android가 가장 잘 일치하는 리소스를 찾는 방법을 나타낸
흐름도입니다.</p>
</div>
@@ -1024,23 +1024,23 @@
drawable-port-ldpi/
drawable-port-notouch-12key/
</pre>
-<p class="note"><strong>예외:</strong> 화면 픽셀 밀도 한정자 하나만은 충돌을 이유로 제거되지
-않습니다. 기기의 화면 밀도가 hdpi라도,
+<p class="note"><strong>예외:</strong> 화면 픽셀 밀도 한정자 하나만은 충돌을 이유로 제거되지
+않습니다. 기기의 화면 밀도가 hdpi라도,
현 시점에서는 모든 화면 밀도가 일치로 간주되므로 <code>drawable-port-ldpi/</code>를 제거하지 않습니다.
- 자세한 정보는 <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
+ 자세한 정보는 <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a> 문서에서 이용하실 수 있습니다.</p></li>
<li>목록(<a href="#table2">표2</a>)에서 (그 다음으로) 우선 순위가 가장 높은 한정자를 선택합니다
(MCC부터 시작하여 아래로 내려가십시오). </li>
<li>리소스 디렉터리 중에 이 한정자를 포함한 것이 있나요? </li>
<ul>
- <li>없는 경우, 2단계로 돌아가 다음 한정자를 살펴보십시오 (이 예시의 경우
+ <li>없는 경우, 2단계로 돌아가 다음 한정자를 살펴보십시오 (이 예시의 경우
언어 한정자에 도달할 때까지 답은 "없습니다"입니다).</li>
<li>있는 경우, 4단계로 계속 진행합니다.</li>
</ul>
</li>
- <li>이 한정자를 포함하지 않는 디렉터리를 제거합니다. 이 예시에서는 시스템이
+ <li>이 한정자를 포함하지 않는 디렉터리를 제거합니다. 이 예시에서는 시스템이
언어 한정자를 포함하지 않는 디렉터리를 모두 제거합니다.</li>
<pre class="classic no-pretty-print">
<strike>drawable/</strike>
@@ -1050,15 +1050,15 @@
<strike>drawable-port-ldpi/</strike>
<strike>drawable-port-notouch-12key/</strike>
</pre>
-<p class="note"><strong>예외:</strong> 문제의 한정자가 화면 픽셀 밀도라면,
-Android는 기기 화면 밀도와 가장 가깝게 일치하는 옵션을 선택합니다.
+<p class="note"><strong>예외:</strong> 문제의 한정자가 화면 픽셀 밀도라면,
+Android는 기기 화면 밀도와 가장 가깝게 일치하는 옵션을 선택합니다.
일반적으로, Android는 작은 원본 이미지를 확대하는 것보다
-큰 원본 이미지를 축소하는 것을 선호합니다. <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
+큰 원본 이미지를 축소하는 것을 선호합니다. <a href="{@docRoot}guide/practices/screens_support.html">다중 화면
지원</a>을 참조하십시오.</p>
</li>
- <li>뒤로 돌아가 디렉터리가 한 개만 남을 때까지 2, 3 및 4단계를 반복합니다. 이 예시에서, 일치하는 것이 있는 다음 한정자는
-화면 방향입니다.
+ <li>뒤로 돌아가 디렉터리가 한 개만 남을 때까지 2, 3 및 4단계를 반복합니다. 이 예시에서, 일치하는 것이 있는 다음 한정자는
+화면 방향입니다.
그러므로 화면 방향을 지정하지 않는 리소스가 제거됩니다.
<pre class="classic no-pretty-print">
<strike>drawable-en/</strike>
@@ -1069,26 +1069,26 @@
</li>
</ol>
-<p>이 절차는 요청된 각 리소스에 대해 실행하지만, 시스템이 몇 가지 측면을 추가로
-최적화합니다. 그러한 최적화 가운데에는 일단 기기 구성을 알게 되고 나면 절대 일치할 가능성이 없는
-대체 리소스를 시스템이 제거할 수 있다는 점도 있습니다. 예를 들어, 구성 언어가
-영어("en")이고 영어 이외의 다른 언어 한정자로 설정된 리소스 디렉터리는
+<p>이 절차는 요청된 각 리소스에 대해 실행하지만, 시스템이 몇 가지 측면을 추가로
+최적화합니다. 그러한 최적화 가운데에는 일단 기기 구성을 알게 되고 나면 절대 일치할 가능성이 없는
+대체 리소스를 시스템이 제거할 수 있다는 점도 있습니다. 예를 들어, 구성 언어가
+영어("en")이고 영어 이외의 다른 언어 한정자로 설정된 리소스 디렉터리는
절대 확인된 리소스 풀에 포함되지 않습니다(
언어 한정자가 포함되지 <em>않는</em> 리소스 디렉터리는 여전히 포함됩니다).</p>
<p>화면 크기 한정자에 기초하여 리소스를 선택할 때 시스템은 가장 잘 일치하는 리소스가 없다면
현재 화면보다 작은 화면에 지정된 리소스를 사용합니다
-(예를 들어, 큰 화면은 필요에 따라 일반 크기 화면 리소스를 사용합니다). 그러나
+(예를 들어, 큰 화면은 필요에 따라 일반 크기 화면 리소스를 사용합니다). 그러나
이용 가능한 리소스가 현재 화면보다 <em>큰</em> 리소스뿐이라면, 시스템은
이를 사용하지 <strong>않고</strong>, 기기 구성에 일치하는 리소스가 없으면 애플리케이션 사용이 중단됩니다
(예를 들어 모든 레이아웃 리소스가 {@code xlarge} 한정자에 태그되어 있지만,
기기가 보통 크기 화면일 경우).</p>
-<p class="note"><strong>참고:</strong> 한정자의 <em>우선 순위</em>(<a href="#table2">표 2</a> 참조)가 기기와 정확하게 일치하는
-한정자 수보다 더 중요합니다. 예를 들어 위의 4단계에서
+<p class="note"><strong>참고:</strong> 한정자의 <em>우선 순위</em>(<a href="#table2">표 2</a> 참조)가 기기와 정확하게 일치하는
+한정자 수보다 더 중요합니다. 예를 들어 위의 4단계에서
목록의 마지막 선택에 기기와 정확히 일치하는 한정자가 세 개 포함되어 있지만(방향, 터치 스크린
-유형 및 입력 메서드), <code>drawable-en</code>에는 일치하는 매개변수가
-하나뿐입니다(언어). 다만, 언어가 이러한 다른 한정자보다 우선 순위가 높기 때문에
+유형 및 입력 메서드), <code>drawable-en</code>에는 일치하는 매개변수가
+하나뿐입니다(언어). 다만, 언어가 이러한 다른 한정자보다 우선 순위가 높기 때문에
<code>drawable-port-notouch-12key</code>는 탈락합니다.</p>
<p>애플리케이션에서 리소스를 사용하는 것에 대한 자세한 정보는 <a href="accessing-resources.html">리소스 액세스</a>로 계속 진행하여 알아보십시오.</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/resources/runtime-changes.jd b/docs/html-intl/intl/ko/guide/topics/resources/runtime-changes.jd
index a5e7f5b..720601fb 100644
--- a/docs/html-intl/intl/ko/guide/topics/resources/runtime-changes.jd
+++ b/docs/html-intl/intl/ko/guide/topics/resources/runtime-changes.jd
@@ -22,41 +22,41 @@
</div>
<p>몇몇 기기 구성은 런타임 중에 변경될 수 있습니다
-(예: 화면 방향, 키보드 가용성 및 언어 등). 그러한 변경이 일어나는 경우,
-Android는 실행 중인
+(예: 화면 방향, 키보드 가용성 및 언어 등). 그러한 변경이 일어나는 경우,
+Android는 실행 중인
{@link android.app.Activity}를 다시 시작합니다({@link android.app.Activity#onDestroy()} 호출, 뒤이어 {@link
-android.app.Activity#onCreate(Bundle) onCreate()} 호출). 이런 동작은 여러분이 제공한
+android.app.Activity#onCreate(Bundle) onCreate()} 호출). 이런 동작은 여러분이 제공한
대체 리소스로 애플리케이션을 자동으로 다시 로딩함으로써 새로운 기기 구성에 애플리케이션이 적응하는 것을 돕도록
설계되었습니다(예: 다양한 화면 방향과 크기에 대한 다양한 레이아웃).</p>
-<p>다시 시작을 적절히 처리하려면 액티비티가 정상적인
+<p>다시 시작을 적절히 처리하려면 액티비티가 정상적인
<a href="{@docRoot}guide/components/activities.html#Lifecycle">액티비티
-수명 주기</a>를 통해 이전 상태를 복원하는 것이 중요합니다. 여기에서 Android는
-{@link android.app.Activity#onSaveInstanceState(Bundle) onSaveInstanceState()}를 호출한 다음에 액티비티를 소멸시켜
-애플리케이션 상태에 대한 데이터를 저장할 수 있습니다. 그러면
+수명 주기</a>를 통해 이전 상태를 복원하는 것이 중요합니다. 여기에서 Android는
+{@link android.app.Activity#onSaveInstanceState(Bundle) onSaveInstanceState()}를 호출한 다음에 액티비티를 소멸시켜
+애플리케이션 상태에 대한 데이터를 저장할 수 있습니다. 그러면
{@link android.app.Activity#onCreate(Bundle) onCreate()} 또는 {@link
android.app.Activity#onRestoreInstanceState(Bundle) onRestoreInstanceState()} 중에 상태를 복원할 수 있습니다.</p>
-<p>애플리케이션이 애플리케이션 상태를 그대로 유지한 채 스스로 다시 시작할 수 있는지 시험해 보려면,
-구성 변경을 일으켜보아야 합니다(예를 들어 화면 방향 변경 등). 이는 애플리케이션에서 여러 가지 작업을 수행하는
-동안 해봅니다. 애플리케이션이 언제든 사용자 데이터나 상태를 손실하지 않고
-다시 시작할 수 있어야 합니다. 그래야 구성 변경과 같은 이벤트를 처리할 수 있기 때문입니다. 그렇지 않으면
-사용자가 걸려오는 전화를 받은 다음 한참 후에 애플리케이션으로 돌아오면 애플리케이션 프로세스가 이미
+<p>애플리케이션이 애플리케이션 상태를 그대로 유지한 채 스스로 다시 시작할 수 있는지 시험해 보려면,
+구성 변경을 일으켜보아야 합니다(예를 들어 화면 방향 변경 등). 이는 애플리케이션에서 여러 가지 작업을 수행하는
+동안 해봅니다. 애플리케이션이 언제든 사용자 데이터나 상태를 손실하지 않고
+다시 시작할 수 있어야 합니다. 그래야 구성 변경과 같은 이벤트를 처리할 수 있기 때문입니다. 그렇지 않으면
+사용자가 걸려오는 전화를 받은 다음 한참 후에 애플리케이션으로 돌아오면 애플리케이션 프로세스가 이미
소멸되어 있을 수 있습니다. 액티비티 상태를 복원하는 방법을 배우려면, <a href="{@docRoot}guide/components/activities.html#Lifecycle">액티비티 수명 주기</a>에 관해 읽어보십시오.</p>
-<p>하지만, 애플리케이션을 다시 시작하고 상당량의 데이터를 복원하면 비용도 많이 들고
-불량한 사용자 환경이 만들어지는 상황에 직면할 수도 있습니다. 그러한 상황이라면,
+<p>하지만, 애플리케이션을 다시 시작하고 상당량의 데이터를 복원하면 비용도 많이 들고
+불량한 사용자 환경이 만들어지는 상황에 직면할 수도 있습니다. 그러한 상황이라면,
두 가지 다른 옵션이 있습니다.</p>
<ol type="a">
<li><a href="#RetainingAnObject">구성 변경 중에 객체 보존하기</a>
- <p>구성이 변경되는 중에 액티비티가 다시 시작될 수 있게 허용하되, 액티비티의 새 인스턴스에 상태
+ <p>구성이 변경되는 중에 액티비티가 다시 시작될 수 있게 허용하되, 액티비티의 새 인스턴스에 상태
저장 객체를 넣습니다.</p>
</li>
<li><a href="#HandlingTheChange">구성 변경 직접 처리하기</a>
- <p>특정 구성 변경 중에 시스템이 액티비티를 다시 시작하도록 하지 못하게 방지하되,
-구성이 실제로 변경되면 콜백을 수신하도록 하여 필요에 따라 액티비티를 수동으로 업데이트할 수
+ <p>특정 구성 변경 중에 시스템이 액티비티를 다시 시작하도록 하지 못하게 방지하되,
+구성이 실제로 변경되면 콜백을 수신하도록 하여 필요에 따라 액티비티를 수동으로 업데이트할 수
있도록 합니다.</p>
</li>
</ol>
@@ -64,30 +64,30 @@
<h2 id="RetainingAnObject">구성 변경 중에 객체 보존하기</h2>
-<p>액티비티를 다시 시작하려면 많은 수의 데이터 세트를 복구해야 하는 경우, 네트워크 연결을
-다시 설정하거나 다른 집약적 작업을 수행한 다음 완전히 다시 시작하십시오.
-구성 변경 때문에 사용자 환경이 느려질 수 있습니다. 또한, 액티비티 상태를 완전히 복원하려면
+<p>액티비티를 다시 시작하려면 많은 수의 데이터 세트를 복구해야 하는 경우, 네트워크 연결을
+다시 설정하거나 다른 집약적 작업을 수행한 다음 완전히 다시 시작하십시오.
+구성 변경 때문에 사용자 환경이 느려질 수 있습니다. 또한, 액티비티 상태를 완전히 복원하려면
{@link android.os.Bundle}을 사용할 수도 있습니다. 이것은 시스템이 개발자 대신 {@link
-android.app.Activity#onSaveInstanceState(Bundle) onSaveInstanceState()} 콜백으로 저장해두는 것입니다. 이것은 대형 객체(예: 비트맵)를 담도록
-디자인된 것이 아니며 이 안의 데이터는 반드시 직렬화했다가 다시 역직렬화해야 합니다. 이렇게 하면
-메모리를 아주 많이 소모할 수 있으며 구성 변경이 느려질 수 있습니다. 이와 같은 상황에서는
+android.app.Activity#onSaveInstanceState(Bundle) onSaveInstanceState()} 콜백으로 저장해두는 것입니다. 이것은 대형 객체(예: 비트맵)를 담도록
+디자인된 것이 아니며 이 안의 데이터는 반드시 직렬화했다가 다시 역직렬화해야 합니다. 이렇게 하면
+메모리를 아주 많이 소모할 수 있으며 구성 변경이 느려질 수 있습니다. 이와 같은 상황에서는
액티비티를 다시 초기화해야 한다는 부담을 해결하기 위해 액티비티가 구성 변경으로 인해 다시 시작되었을 때 {@link
-android.app.Fragment}를 보존하면 됩니다. 이 프래그먼트에는
+android.app.Fragment}를 보존하면 됩니다. 이 프래그먼트에는
보존하고자 하는 상태 저장 객체에 대한 참조를 담을 수 있습니다.</p>
-<p>Android 시스템이 구성 변경으로 인하여 액티비티를 종료시킬 때, 액티비티에서 보존하기로 표시해둔
-프래그먼트는 소멸되지 않습니다. 그러한 프래그먼트를 액티비티에 추가하면
+<p>Android 시스템이 구성 변경으로 인하여 액티비티를 종료시킬 때, 액티비티에서 보존하기로 표시해둔
+프래그먼트는 소멸되지 않습니다. 그러한 프래그먼트를 액티비티에 추가하면
상태 저장 객체를 보존할 수 있습니다.</p>
<p>런타임 구성 변경 중에 상태 저장 객체를 프래그먼트에 보존해두는 방법은 다음과 같습니다.</p>
<ol>
- <li>{@link android.app.Fragment} 클래스를 확장하고 상태 저장
+ <li>{@link android.app.Fragment} 클래스를 확장하고 상태 저장
객체에 참조를 선언합니다.</li>
<li>프래그먼트가 생성되면 {@link android.app.Fragment#setRetainInstance(boolean)}를 호출합니다.
</li>
<li>해당 프래그먼트를 액티비티에 추가합니다.</li>
- <li>{@link android.app.FragmentManager}를 사용하여 액티비티가 다시 시작될 때 프래그먼트를
+ <li>{@link android.app.FragmentManager}를 사용하여 액티비티가 다시 시작될 때 프래그먼트를
검색합니다.</li>
</ol>
@@ -117,16 +117,16 @@
}
</pre>
-<p class="caution"><strong>주의:</strong> 어느 객체든 저장할 수 있지만,
+<p class="caution"><strong>주의:</strong> 어느 객체든 저장할 수 있지만,
{@link android.app.Activity}에 묶여 있는 객체는 절대로 전달하면 안 됩니다. 예를 들어 {@link
android.graphics.drawable.Drawable}, {@link android.widget.Adapter}, {@link android.view.View}
- 또는 {@link android.content.Context}와 연관된 기타 모든 객체가 이에 해당됩니다. 이런 것을 전달하면,
-원래 액티비티 인스턴스의 모든 보기와 리소스를 몽땅 누출시킵니다. (리소스 누출이란
-애플리케이션이 리소스에 대한 보유권을 유지하고 있어 가비지 수집의 대상이 될 수 없고, 따라서 엄청난 양의 메모리가
+ 또는 {@link android.content.Context}와 연관된 기타 모든 객체가 이에 해당됩니다. 이런 것을 전달하면,
+원래 액티비티 인스턴스의 모든 보기와 리소스를 몽땅 누출시킵니다. (리소스 누출이란
+애플리케이션이 리소스에 대한 보유권을 유지하고 있어 가비지 수집의 대상이 될 수 없고, 따라서 엄청난 양의 메모리가
손실된다는 뜻입니다.)</p>
-<p>그런 다음 {@link android.app.FragmentManager}를 사용하여 프래그먼트를 액티비티에 추가합니다.
-프래그먼트에서 데이터 객체를 가져오려면 런타임 구성 변경 중에 액티비티가 다시 시작될 때
+<p>그런 다음 {@link android.app.FragmentManager}를 사용하여 프래그먼트를 액티비티에 추가합니다.
+프래그먼트에서 데이터 객체를 가져오려면 런타임 구성 변경 중에 액티비티가 다시 시작될 때
가져오면 됩니다. 예를 들어, 액티비티를 다음과 같이 정의합니다.</p>
<pre>
@@ -165,10 +165,10 @@
}
</pre>
-<p>이 예시에서 {@link android.app.Activity#onCreate(Bundle) onCreate()}는 프래그먼트를 추가하거나
-이에 대한 참조를 복원합니다. {@link android.app.Activity#onCreate(Bundle) onCreate()} 또한
-프래그먼트 인스턴스 안에 상태 저장 객체를 저장합니다.
-{@link android.app.Activity#onDestroy() onDestroy()}는 보존된
+<p>이 예시에서 {@link android.app.Activity#onCreate(Bundle) onCreate()}는 프래그먼트를 추가하거나
+이에 대한 참조를 복원합니다. {@link android.app.Activity#onCreate(Bundle) onCreate()} 또한
+프래그먼트 인스턴스 안에 상태 저장 객체를 저장합니다.
+{@link android.app.Activity#onDestroy() onDestroy()}는 보존된
프래그먼트 인스턴스 내부의 상태 저장 객체를 업데이트합니다.</p>
@@ -177,26 +177,26 @@
<h2 id="HandlingTheChange">구성 변경 직접 처리하기</h2>
-<p>애플리케이션이 특정 구성 변경 중에 리소스를 업데이트하지 않아도 되고
-그와 <em>동시에</em> 성능 한계가 있어 액티비티 다시 시작을 피해야 하는 경우,
-액티비티가 구성 변경을 알아서 처리한다고 선언하면 됩니다.
+<p>애플리케이션이 특정 구성 변경 중에 리소스를 업데이트하지 않아도 되고
+그와 <em>동시에</em> 성능 한계가 있어 액티비티 다시 시작을 피해야 하는 경우,
+액티비티가 구성 변경을 알아서 처리한다고 선언하면 됩니다.
이렇게 하면 시스템이 액티비티를 다시 시작하지 않도록 방지할 수 있습니다.</p>
-<p class="note"><strong>참고:</strong> 구성 변경을 직접 처리하면 대체 리소스를 사용하는 것이
-훨씬 더 까다로워질 수 있습니다. 시스템이 개발자 대신 자동으로 이를 적용해주지 않기
-때문입니다. 이 기법은 구성 변경으로 인한 재시작을 반드시 피해야만 하는 경우 최후의 수단으로서만
+<p class="note"><strong>참고:</strong> 구성 변경을 직접 처리하면 대체 리소스를 사용하는 것이
+훨씬 더 까다로워질 수 있습니다. 시스템이 개발자 대신 자동으로 이를 적용해주지 않기
+때문입니다. 이 기법은 구성 변경으로 인한 재시작을 반드시 피해야만 하는 경우 최후의 수단으로서만
고려해야 하며 대부분의 애플리케이션에는 권장하지 않습니다.</p>
-<p>액티비티가 구성 변경을 직접 처리한다고 선언하려면, 매니페스트 파일의 적절한 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> 요소를 편집하여
+<p>액티비티가 구성 변경을 직접 처리한다고 선언하려면, 매니페스트 파일의 적절한 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> 요소를 편집하여
처리하고자 하는 구성을 나타내는 값이 있는 <a href="{@docRoot}guide/topics/manifest/activity-element.html#config">{@code
-android:configChanges}</a> 속성을 포함하도록
+android:configChanges}</a> 속성을 포함하도록
합니다. 가능한 값은 <a href="{@docRoot}guide/topics/manifest/activity-element.html#config">{@code
-android:configChanges}</a> 속성에 대한 관련 문서에 목록으로 나열되어 있습니다(가장 보편적으로 사용되는 값은 화면 방향이 변경될 때 다시 시작을 방지하는 {@code "orientation"}과
+android:configChanges}</a> 속성에 대한 관련 문서에 목록으로 나열되어 있습니다(가장 보편적으로 사용되는 값은 화면 방향이 변경될 때 다시 시작을 방지하는 {@code "orientation"}과
키보드 가용성이 변경될 때 다시 시작을 방지하는 {@code "keyboardHidden"}
-입니다). 이 속성에는 여러 개의 구성 값을 선언할 수 있습니다. 각각을
+입니다). 이 속성에는 여러 개의 구성 값을 선언할 수 있습니다. 각각을
파이프 {@code |} 문자로 구분하면 됩니다.</p>
-<p>예를 들어 다음 매니페스트 코드는 화면 방향 변경과 키보드 가용성 변경을 둘 다
+<p>예를 들어 다음 매니페스트 코드는 화면 방향 변경과 키보드 가용성 변경을 둘 다
처리하는 액티비티를 선언하는 것입니다.</p>
<pre>
@@ -205,29 +205,29 @@
android:label="@string/app_name">
</pre>
-<p>이제 이러한 구성 중 하나가 변경되어도 {@code MyActivity}는 다시 시작하지 않습니다.
+<p>이제 이러한 구성 중 하나가 변경되어도 {@code MyActivity}는 다시 시작하지 않습니다.
그 대신, {@code MyActivity}가 {@link
-android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()}로의 호출을 받습니다. 이 메서드는
-{@link android.content.res.Configuration} 객체로 전달되며, 이는 새 기기 구성을
-나타냅니다. {@link android.content.res.Configuration}의 필드를 읽어보면
-새 구성을 판별할 수 있고 적절한 변경을 할 수 있습니다. 그러려면 인터페이스에 사용된 리소스를
-업데이트하면 됩니다. 이 메서드가
-호출되면, 액티비티의 {@link android.content.res.Resources} 객체가
-업데이트되어 새 구성에 기반한 리소스를 반환하며, 따라서 시스템이 액티비티를 다시 시작하지 않아도
+android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()}로의 호출을 받습니다. 이 메서드는
+{@link android.content.res.Configuration} 객체로 전달되며, 이는 새 기기 구성을
+나타냅니다. {@link android.content.res.Configuration}의 필드를 읽어보면
+새 구성을 판별할 수 있고 적절한 변경을 할 수 있습니다. 그러려면 인터페이스에 사용된 리소스를
+업데이트하면 됩니다. 이 메서드가
+호출되면, 액티비티의 {@link android.content.res.Resources} 객체가
+업데이트되어 새 구성에 기반한 리소스를 반환하며, 따라서 시스템이 액티비티를 다시 시작하지 않아도
UI의 요소를 손쉽게 재설정할 수 있게 됩니다.</p>
-<p class="caution"><strong>주의:</strong> Android 3.2(API 레벨 13)부터 기기가
-세로 방향 및 가로 방향 사이를 전환할 때 <strong>"화면 크기"도
-같이 변경됩니다</strong>. 따라서,
+<p class="caution"><strong>주의:</strong> Android 3.2(API 레벨 13)부터 기기가
+세로 방향 및 가로 방향 사이를 전환할 때 <strong>"화면 크기"도
+같이 변경됩니다</strong>. 따라서,
API 레벨 13 이상(<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a> 및 <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code targetSdkVersion}</a>
속성에서 선언한 내용에 따름)을 대상으로 개발하는 경우 방향 변경으로 인한 런타임 다시 시작을 방지하고자 하면, {@code
"orientation"} 값 외에 {@code "screenSize"} 값도 포함시켜야 합니다. 다시 말해, {@code
-android:configChanges="orientation|screenSize"}를 선언해야 합니다. 하지만, 애플리케이션이 API 레벨 12 이하를
-대상으로 하는 경우라면 애플리케이션이 언제든 이 구성 변경을 알아서 처리합니다(이 구성 변경은
+android:configChanges="orientation|screenSize"}를 선언해야 합니다. 하지만, 애플리케이션이 API 레벨 12 이하를
+대상으로 하는 경우라면 애플리케이션이 언제든 이 구성 변경을 알아서 처리합니다(이 구성 변경은
액티비티를 다시 시작하지 않습니다. 이는 Android 3.2 이상 기기에서 실행되는 경우에도 마찬가지입니다).</p>
<p>예를 들어, 다음 {@link
-android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()} 구현은
+android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()} 구현은
현재 기기의 방향을 확인합니다.</p>
<pre>
@@ -244,36 +244,36 @@
}
</pre>
-<p>{@link android.content.res.Configuration} 객체는 변경된 것만이 아니라 현재
-구성 전체를 나타냅니다. 대부분의 경우에는 구성이 정확히 어떻게
-변경되었는지에는 관심이 없고 처리 중인 구성에 대체 리소스를 제공하는 모든 리소스를 그저
+<p>{@link android.content.res.Configuration} 객체는 변경된 것만이 아니라 현재
+구성 전체를 나타냅니다. 대부분의 경우에는 구성이 정확히 어떻게
+변경되었는지에는 관심이 없고 처리 중인 구성에 대체 리소스를 제공하는 모든 리소스를 그저
재할당하기만 하면 됩니다. 예를 들어 이제 {@link
android.content.res.Resources} 객체가 업데이트되었으니 {@link android.widget.ImageView#setImageResource(int)
-setImageResource()}가 있는 모든
-{@link android.widget.ImageView}와
+setImageResource()}가 있는 모든
+{@link android.widget.ImageView}와
새 구성에 대한 적절한 리소스를 재설정할 수 있습니다(<a href="providing-resources.html#AlternateResources">리소스 제공</a>에 설명된 바와 같음).</p>
<p>{@link
-android.content.res.Configuration} 필드에서 가져온 값이
-{@link android.content.res.Configuration} 클래스에서 가져온 특정 상수와 일치하는 정수라는 점을 눈여겨 보십시오. 각 필드에
+android.content.res.Configuration} 필드에서 가져온 값이
+{@link android.content.res.Configuration} 클래스에서 가져온 특정 상수와 일치하는 정수라는 점을 눈여겨 보십시오. 각 필드에
어느 상수를 써야 하는지에 대한 관련 문서는 {@link
android.content.res.Configuration} 참조에 있는 적절한 필드를 참조하십시오.</p>
-<p class="note"><strong>명심할 점:</strong> 액티비티가 직접 구성 변경을 처리한다고 선언하는 경우,
-대체를 제공하는 모든 요소에 대해 본인이 직접 책임을 지게 됩니다. 액티비티가 직접
-방향 변경을 처리하고 가로 및 세로 방향 사이에서 바뀌어야 하는 이미지가 있는 경우,
+<p class="note"><strong>명심할 점:</strong> 액티비티가 직접 구성 변경을 처리한다고 선언하는 경우,
+대체를 제공하는 모든 요소에 대해 본인이 직접 책임을 지게 됩니다. 액티비티가 직접
+방향 변경을 처리하고 가로 및 세로 방향 사이에서 바뀌어야 하는 이미지가 있는 경우,
각 리소스를 각 요소에 재할당해야 하며 이를 {@link
android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()} 중에 수행해야 합니다.</p>
-<p>이러한 구성 변경을 기반으로 애플리케이션을 업데이트하지 않아도 되는 경우,
+<p>이러한 구성 변경을 기반으로 애플리케이션을 업데이트하지 않아도 되는 경우,
대신 {@link
-android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()}를 구현하지 <em>않으면</em> 됩니다. 이런
-경우, 구성 변경 전에 쓰였던 리소스가 모두 그대로 사용되고 액티비티의 다시 시작만
-피한 것이 됩니다. 그러나, 애플리케이션은
-언제든 종료되고 이전 상태를 그대로 유지한 채 다시 시작될 수 있어야 합니다 정상적인 액티비티
-수명 주기 중에 상태 유지에서의 탈출 방안으로 이 기법을 고려해서는 안 됩니다. 이는 애플리케이션이
-다시 시작되지 않도록 방지할 수 없는, 다른 구성 변경도 여럿 있어서일뿐만 아니라, 사용자가
-애플리케이션을 떠났을 경우 해당 사용자가 다시 돌아오기 전에 소멸되는 것과 같은 이벤트를 처리해야 하기 때문이라는
+android.app.Activity#onConfigurationChanged(Configuration) onConfigurationChanged()}를 구현하지 <em>않으면</em> 됩니다. 이런
+경우, 구성 변경 전에 쓰였던 리소스가 모두 그대로 사용되고 액티비티의 다시 시작만
+피한 것이 됩니다. 그러나, 애플리케이션은
+언제든 종료되고 이전 상태를 그대로 유지한 채 다시 시작될 수 있어야 합니다 정상적인 액티비티
+수명 주기 중에 상태 유지에서의 탈출 방안으로 이 기법을 고려해서는 안 됩니다. 이는 애플리케이션이
+다시 시작되지 않도록 방지할 수 없는, 다른 구성 변경도 여럿 있어서일뿐만 아니라, 사용자가
+애플리케이션을 떠났을 경우 해당 사용자가 다시 돌아오기 전에 소멸되는 것과 같은 이벤트를 처리해야 하기 때문이라는
이유도 있습니다.</p>
<p>액티비티 내에서 처리할 수 있는 구성 변경이 무엇인지에 대한 자세한 내용은 <a href="{@docRoot}guide/topics/manifest/activity-element.html#config">{@code
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/controls.jd b/docs/html-intl/intl/ko/guide/topics/ui/controls.jd
index bf87398..9561ba05 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/controls.jd
@@ -7,11 +7,11 @@
<img src="{@docRoot}images/ui/ui-controls.png" alt="" style="margin:0" />
</div>
-<p>입력 제어는 앱의 사용자 인터페이스에 있는 대화형 구성 요소입니다.
+<p>입력 제어는 앱의 사용자 인터페이스에 있는 대화형 구성 요소입니다.
Android는 버튼, 텍스트 필드, 찾기 막대, 확인란, 확대 버튼, 전환 버튼 등과 같이
UI에서 사용할 수 있도록 매우 다양한 제어를 제공합니다.</p>
-<p>UI에 입력 제어를 추가하려면 단순히 <a href="{@docRoot}guide/topics/ui/declaring-layout.html">XML 레이아웃</a>에 XML 요소를 하나 추가하기만 하면 됩니다.
+<p>UI에 입력 제어를 추가하려면 단순히 <a href="{@docRoot}guide/topics/ui/declaring-layout.html">XML 레이아웃</a>에 XML 요소를 하나 추가하기만 하면 됩니다.
다음은 텍스트 필드와 버튼이 있는 레이아웃을 예시로 나타낸 것입니다.</p>
<pre style="clear:right">
@@ -33,16 +33,16 @@
</LinearLayout>
</pre>
-<p>각 입력 제어는 특정한 입력 이벤트를 지원하므로, 사용자가 텍스트를 입력할 때 또는 버튼을 터치할 때
+<p>각 입력 제어는 특정한 입력 이벤트를 지원하므로, 사용자가 텍스트를 입력할 때 또는 버튼을 터치할 때
이벤트를 처리할 수 있게 해줍니다.</p>
<h2 id="CommonControls">보편적인 제어</h2>
-<p>다음은 앱에서 사용할 수 있는 몇 가지 보편적인 제어를 목록으로 나열한 것입니다. 링크를 따라가면 각 제어에 대해
+<p>다음은 앱에서 사용할 수 있는 몇 가지 보편적인 제어를 목록으로 나열한 것입니다. 링크를 따라가면 각 제어에 대해
좀 더 자세히 알아볼 수 있습니다.</p>
<p class="note"><strong>참고:</strong> Android는 여기에 나열된 것보다 몇 가지 더 많은 제어를 제공합니다.
- 더 많은 내용을 알아보려면 {@link android.widget} 패키지를 탐색해보십시오.
+ 더 많은 내용을 알아보려면 {@link android.widget} 패키지를 탐색해보십시오.
앱에 특정한 종류의 입력 제어가 필요한 경우, 나름의 <a href="{@docRoot}guide/topics/ui/custom-components.html">사용자 지정 구성 요소</a>를 직접 구축해도 됩니다.</p>
<table>
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">무선 버튼</a></td>
<td>확인란과 비슷하지만, 예외가 있다면 그룹 내에서 하나만 선택할 수 있다는 점입니다.</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/declaring-layout.jd b/docs/html-intl/intl/ko/guide/topics/ui/declaring-layout.jd
index 7883236..97f9083 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/declaring-layout.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/declaring-layout.jd
@@ -34,14 +34,14 @@
<h2>참고 항목</h2>
<ol>
- <li><a href="{@docRoot}training/basics/firstapp/building-ui.html">간단한 사용자
+ <li><a href="{@docRoot}training/basics/firstapp/building-ui.html">간단한 사용자
인터페이스 구축</a></li> </div>
</div>
<p>레이아웃은 사용자 인터페이스에 대한 시각적 구조를 정의합니다. 예컨대 <a href="{@docRoot}guide/components/activities.html">액티비티</a> 또는 <a href="{@docRoot}guide/topics/appwidgets/index.html">앱 위젯</a>에 대한 UI가 이에 해당됩니다.
레이아웃을 선언하는 데에는 다음과 같은 두 가지 방법이 있습니다.</p>
<ul>
-<li><strong>UI 요소를 XML로 선언</strong>. Android가 위젯과 레이아웃 등과 같이
+<li><strong>UI 요소를 XML로 선언</strong>. Android가 위젯과 레이아웃 등과 같이
보기 클래스와 하위 클래스에 상응하는 간단한 XML 어휘를 제공합니다.</li>
<li><strong>런타임에 레이아웃 요소를 인스턴트화</strong>. 애플리케이션이
프로그래밍 방법으로 보기 및 ViewGroup객체를 만들 수 있습니다(그리고 그 속성을 조작하기도 합니다). </li>
@@ -55,26 +55,26 @@
<li><a href="{@docRoot}tools/sdk/eclipse-adt.html">Eclipse용 ADT
플러그인</a>이 XML의 레이아웃 미리보기를 제공합니다. —
XML 파일이 열린 상태에서 <strong>레이아웃</strong> 탭을 선택하십시오.</li>
- <li>또한,
-<a href="{@docRoot}tools/debugging/debugging-ui.html#hierarchyViewer">계층 뷰어</a> 도구로
-레이아웃 디버깅도 시도해 보아야 합니다.—이것은 레이아웃 속성 값을 드러내고,
-내부 여백/여백 표시기가 있는 와이어프레임을 그리며 개발자가 에뮬레이터 또는 기기에서 디버깅하는 동안
+ <li>또한,
+<a href="{@docRoot}tools/debugging/debugging-ui.html#hierarchyViewer">계층 뷰어</a> 도구로
+레이아웃 디버깅도 시도해 보아야 합니다.—이것은 레이아웃 속성 값을 드러내고,
+내부 여백/여백 표시기가 있는 와이어프레임을 그리며 개발자가 에뮬레이터 또는 기기에서 디버깅하는 동안
완전히 렌더링된 보기를 제공합니다.</li>
<li><a href="{@docRoot}tools/debugging/debugging-ui.html#layoutopt">layoutopt</a> 도구를
사용하면 레이아웃과 계층을 비효율성 또는 다른 문제에 대하여 재빨리 분석할 수 있게 해줍니다.</li>
</div>
</div>
-<p>UI를 XML로 선언하는 것의 이점은 이렇게 하면 애플리케이션을 그 행동을 제어하는 코드로부터 따로 표시하기가 더 좋다는 것입니다. UI 설명은 애플리케이션 코드의 외부에 있습니다. 이는 다시 말해 소스 코드를 수정하고 다시 컴파일링하지 않아도 이를 수정 또는 변경할 수 있다는 뜻입니다. 예를 들어, 서로 다른 화면 방향, 사로 다른 기기 화면 크기 및 서로 다른 언어에 대해 XML 레이아웃을 생성할 수 있습니다. 이외에도 레이아웃을 XML로 선언하면 UI의 구조를 시각화하기가 더 쉬우므로 문제를 디버깅하기도 더 쉽습니다. 따라서, 이 문서는 레이아웃을 XML로 선언하는 방법을 가르치는 데 주안점을 두고 있습니다. 런타임에 보기 객체를 인스턴트화하는 것에 흥미가 있는 경우,
-{@link android.view.ViewGroup} 및
+<p>UI를 XML로 선언하는 것의 이점은 이렇게 하면 애플리케이션을 그 행동을 제어하는 코드로부터 따로 표시하기가 더 좋다는 것입니다. UI 설명은 애플리케이션 코드의 외부에 있습니다. 이는 다시 말해 소스 코드를 수정하고 다시 컴파일링하지 않아도 이를 수정 또는 변경할 수 있다는 뜻입니다. 예를 들어, 서로 다른 화면 방향, 사로 다른 기기 화면 크기 및 서로 다른 언어에 대해 XML 레이아웃을 생성할 수 있습니다. 이외에도 레이아웃을 XML로 선언하면 UI의 구조를 시각화하기가 더 쉬우므로 문제를 디버깅하기도 더 쉽습니다. 따라서, 이 문서는 레이아웃을 XML로 선언하는 방법을 가르치는 데 주안점을 두고 있습니다. 런타임에 보기 객체를 인스턴트화하는 것에 흥미가 있는 경우,
+{@link android.view.ViewGroup} 및
{@link android.view.View} 클래스 참조를 참조하십시오.</p>
-<p>일반적으로 UI 요소를 선언하는 데 쓰이는 XML 어휘는 클래스와 메서드 명명을 충실히 따릅니다. 여기에서 요소 이름은 클래스 이름에 상응하며 속성 이름은 메서드에 상응합니다. 사실 이러한 일치성은 아주 직접적인 경우가 잦아 어느 XML 속성이 클래스 메서드에 상응하는지를 추측할 수 있고, 어느 클래스가 주어진 XML 요소에 상응하는지도 추측할 수 있습니다. 다만 모든 어휘가 다 같지는 않다는 점을 유의하십시오. 몇몇 경우에는 명명에 약간의 차이점이 있습니다. 예를 들어,
-EditText 요소에는 <code>text</code> 속성이 있으며 이는
+<p>일반적으로 UI 요소를 선언하는 데 쓰이는 XML 어휘는 클래스와 메서드 명명을 충실히 따릅니다. 여기에서 요소 이름은 클래스 이름에 상응하며 속성 이름은 메서드에 상응합니다. 사실 이러한 일치성은 아주 직접적인 경우가 잦아 어느 XML 속성이 클래스 메서드에 상응하는지를 추측할 수 있고, 어느 클래스가 주어진 XML 요소에 상응하는지도 추측할 수 있습니다. 다만 모든 어휘가 다 같지는 않다는 점을 유의하십시오. 몇몇 경우에는 명명에 약간의 차이점이 있습니다. 예를 들어,
+EditText 요소에는 <code>text</code> 속성이 있으며 이는
<code>EditText.setText()</code>에 상응합니다. </p>
<p class="note"><strong>팁:</strong> 여러 가지 레이아웃 유형에 대해서는 <a href="{@docRoot}guide/topics/ui/layout-objects.html">보편적인
-레이아웃 객체</a>를 참조하십시오. 여러 가지 레이아웃을 구축하는 데 대한 튜토리얼 모음도 있습니다.
+레이아웃 객체</a>를 참조하십시오. 여러 가지 레이아웃을 구축하는 데 대한 튜토리얼 모음도 있습니다.
<a href="{@docRoot}resources/tutorials/views/index.html">Hello 보기</a> 튜토리얼 가이드를 참조하십시오.</p>
<h2 id="write">XML 쓰기</h2>
@@ -100,20 +100,20 @@
</LinearLayout>
</pre>
-<p>레이아웃을 XML로 선언하고 나면 그 파일을 Android 프로젝트의 <code>res/layout/</code> 디렉터리 내에
+<p>레이아웃을 XML로 선언하고 나면 그 파일을 Android 프로젝트의 <code>res/layout/</code> 디렉터리 내에
<code>.xml</code> 확장자로 저장하여 적절하게 컴파일링되도록 합니다. </p>
<p>레이아웃 XML 파일의 구문에 대한 자세한 정보는 <a href="{@docRoot}guide/topics/resources/layout-resource.html">레이아웃 리소스</a> 문서에서 확인할 수 있습니다.</p>
<h2 id="load">XML 리소스 로딩</h2>
-<p>애플리케이션을 컴파일링하는 경우, 각 XML 레이아웃 파일이
-{@link android.view.View} 리소스 안에 컴파일링됩니다. 애플리케이션 코드로부터 가져온 레이아웃 리소스는
-{@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()} 콜백
+<p>애플리케이션을 컴파일링하는 경우, 각 XML 레이아웃 파일이
+{@link android.view.View} 리소스 안에 컴파일링됩니다. 애플리케이션 코드로부터 가져온 레이아웃 리소스는
+{@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()} 콜백
구현에 로딩해야 합니다.
-이렇게 하려면 <code>{@link android.app.Activity#setContentView(int) setContentView()}</code>를 호출한 다음, 이를
+이렇게 하려면 <code>{@link android.app.Activity#setContentView(int) setContentView()}</code>를 호출한 다음, 이를
<code>R.layout.<em>layout_file_name</em></code> 형태로 레이아웃 리소스의 참조에 전달합니다.
- 예를 들어, XML 레이아웃이 <code>main_layout.xml</code>로 저장된 경우, 이것을 액티비티에 대해 로딩하려면
+ 예를 들어, XML 레이아웃이 <code>main_layout.xml</code>로 저장된 경우, 이것을 액티비티에 대해 로딩하려면
다음과 같이 하면 됩니다.</p>
<pre>
public void onCreate(Bundle savedInstanceState) {
@@ -122,8 +122,8 @@
}
</pre>
-<p>액티비티 내의 <code>onCreate()</code> 콜백 메서드는 액티비티가 시작될 때
-Android 프레임워크가 호출합니다(수명 주기에 대한 논의는
+<p>액티비티 내의 <code>onCreate()</code> 콜백 메서드는 액티비티가 시작될 때
+Android 프레임워크가 호출합니다(수명 주기에 대한 논의는
<a href="{@docRoot}guide/components/activities.html#Lifecycle">액티비티</a>
문서에서 확인하십시오).</p>
@@ -134,24 +134,24 @@
몇몇 속성은 보기 객체에만 특화되어 있지만(예를 들어, TextView는 <code>textSize</code>
속성을 지원), 이와 같은 속성은 이 클래스를 확장할 수 있는 모든 보기 객체가 상속하기도 합니다.
모든 보기 객체에 공통으로 쓰이는 것도 몇 가지 있습니다. 왜냐하면 이들은 루트 보기 클래스에서 상속된 것이기 때문입니다(예:
-<code>id</code> 속성). 그리고 나머지 속성은 "레이아웃 매개변수"로 간주됩니다.
-이들은 보기 객체의 특정한 레이아웃 방향을 설명하는 것으로, 이는 해당 객체의 상위 VeiwGroup 객체에서
+<code>id</code> 속성). 그리고 나머지 속성은 "레이아웃 매개변수"로 간주됩니다.
+이들은 보기 객체의 특정한 레이아웃 방향을 설명하는 것으로, 이는 해당 객체의 상위 VeiwGroup 객체에서
정의된 바에 따릅니다.</p>
<h3 id="id">ID</h3>
<p>모든 보기 객체에는 연관된 정수 ID가 있을 수 있습니다. 이는 트리 내에서 해당 보기를 고유하게 식별하기 위한 것입니다.
-애플리케이션이 컴파일링되면 이 ID가 정수로 참조되지만, ID는
-일반적으로 레이아웃 XML 파일에 문자열로 할당되며, <code>id</code> 속성으로 쓰입니다.
+애플리케이션이 컴파일링되면 이 ID가 정수로 참조되지만, ID는
+일반적으로 레이아웃 XML 파일에 문자열로 할당되며, <code>id</code> 속성으로 쓰입니다.
이것은 모든 보기 객체에 공통적인 XML 속성으로
({@link android.view.View} 클래스가 정의) 이것을 매우 자주 사용하게 됩니다.
ID에 대한, XML 태그 내에 있는 구문은 다음과 같습니다.</p>
<pre>android:id="@+id/my_button"</pre>
-<p>문자열 시작 부분에 있는 앳 기호(@)는 XML 파서가 ID 문자열의 나머지를 구문 분석하고 확장하여
-ID 리소스로 식별해야 한다는 것을 나타냅니다. 더하기 기호(+)는 이것이 새 리소스 이름이며,
-이것을 반드시 생성하여 우리 리소스에 추가해야 한다는 것을 뜻합니다(<code>R.java</code> 파일에서). Android 프레임워크는 다른 ID 리소스도 아주 많이
-제공합니다. Android 리소스 ID를 참조할 때에는 더하기 기호는 필요하지 않지만
+<p>문자열 시작 부분에 있는 앳 기호(@)는 XML 파서가 ID 문자열의 나머지를 구문 분석하고 확장하여
+ID 리소스로 식별해야 한다는 것을 나타냅니다. 더하기 기호(+)는 이것이 새 리소스 이름이며,
+이것을 반드시 생성하여 우리 리소스에 추가해야 한다는 것을 뜻합니다(<code>R.java</code> 파일에서). Android 프레임워크는 다른 ID 리소스도 아주 많이
+제공합니다. Android 리소스 ID를 참조할 때에는 더하기 기호는 필요하지 않지만
<code>android</code> 패키지 네임스페이스를 다음과 같이 반드시 추가해야 합니다.</p>
<pre>android:id="@android:id/empty"</pre>
<p><code>android</code> 패키지 네임스페이스를 제자리에 넣으면 이제 ID를 로컬 리소스 클래스에서가 아니라 <code>android.R</code>
@@ -174,54 +174,54 @@
</pre>
</li>
</ol>
-<p>{@link android.widget.RelativeLayout}을 생성할 때에는 보기 객체의 ID를 정의하는 것이 중요합니다.
-관계 레이아웃에서는 형제 보기가 또 다른 형제 보기와 관련된 자신의 레이아웃을 정의할 수 있으며,
+<p>{@link android.widget.RelativeLayout}을 생성할 때에는 보기 객체의 ID를 정의하는 것이 중요합니다.
+관계 레이아웃에서는 형제 보기가 또 다른 형제 보기와 관련된 자신의 레이아웃을 정의할 수 있으며,
이를 고유한 ID로 참조하게 됩니다.</p>
-<p>ID는 트리 전체를 통틀어 고유할 필요는 없지만, 트리에서 검색하고 있는 부분 내에서는
-고유해야 합니다(이것이 트리 전체인 경우가 잦으므로, 가급적이면 완전히
+<p>ID는 트리 전체를 통틀어 고유할 필요는 없지만, 트리에서 검색하고 있는 부분 내에서는
+고유해야 합니다(이것이 트리 전체인 경우가 잦으므로, 가급적이면 완전히
고유한 것을 쓰는 것이 가장 좋습니다).</p>
<h3 id="layout-params">레이아웃 매개변수</h3>
-<p><code>layout_<em>something</em></code>이라는 XML 레이아웃 속성이
+<p><code>layout_<em>something</em></code>이라는 XML 레이아웃 속성이
보기가 상주하는 ViewGroup에 대해 적절한 보기의 레이아웃 매개변수를 정의합니다.</p>
<p>모든 ViewGroup 클래스가 중첩된 클래스를 하나씩 구현하며 이것이 {@link
-android.view.ViewGroup.LayoutParams}를 확장합니다. 이 하위 클래스에는
-각 하위 보기의 크기와 위치를 보기 그룹에 적절한 방식으로 정의하는
-속성 유형이 들어 있습니다. 그림 1에서 볼 수 있듯이, 상위 보기 그룹이
+android.view.ViewGroup.LayoutParams}를 확장합니다. 이 하위 클래스에는
+각 하위 보기의 크기와 위치를 보기 그룹에 적절한 방식으로 정의하는
+속성 유형이 들어 있습니다. 그림 1에서 볼 수 있듯이, 상위 보기 그룹이
각 하위 보기의 레이아웃 매개변수를 정의합니다(하위 보기 그룹 포함).</p>
<img src="{@docRoot}images/layoutparams.png" alt="" />
-<p class="img-caption"><strong>그림 1.</strong> 각 보기와 연관된 레이아웃 매개변수가
+<p class="img-caption"><strong>그림 1.</strong> 각 보기와 연관된 레이아웃 매개변수가
있는 보기 계층을 시각화한 것입니다.</p>
-<p>모든 LayoutParams 하위 클래스에는 설정 값에 대한 각기 자신만의 구문이 있다는 점을
-눈여겨 보십시오. 각 하위 요소는 자신의 상위에 적합한 LayoutParams를 정의해야 합니다.
+<p>모든 LayoutParams 하위 클래스에는 설정 값에 대한 각기 자신만의 구문이 있다는 점을
+눈여겨 보십시오. 각 하위 요소는 자신의 상위에 적합한 LayoutParams를 정의해야 합니다.
다만 이것은 자신의 하위에 대해 각기 다른 LayoutParams도 정의할 수 있습니다. </p>
-<p>모든 보기 그룹에는 너비와 높이가 포함되며(<code>layout_width</code> 및
-<code>layout_height</code>), 각 보기는 이들을 반드시 정의해야 합니다. 선택 사항으로
+<p>모든 보기 그룹에는 너비와 높이가 포함되며(<code>layout_width</code> 및
+<code>layout_height</code>), 각 보기는 이들을 반드시 정의해야 합니다. 선택 사항으로
여백과 테두리도 포함하는 LayoutParams도 많습니다. <p>
-<p>너비와 높이는 정확한 치수로 지정할 수 있습니다. 다만 이것은 자주 하지
-않는 것이 좋습니다. 그보다는 다음과 같은 상수 중 하나를 사용하여 너비 또는 높이를 설정하는 경우가
+<p>너비와 높이는 정확한 치수로 지정할 수 있습니다. 다만 이것은 자주 하지
+않는 것이 좋습니다. 그보다는 다음과 같은 상수 중 하나를 사용하여 너비 또는 높이를 설정하는 경우가
더 많습니다. </p>
<ul>
- <li><var>wrap_content</var> 보기에 콘텐츠에 필요한 치수대로 알아서
+ <li><var>wrap_content</var> 보기에 콘텐츠에 필요한 치수대로 알아서
크기를 조정하라고 합니다.</li>
<li><var>match_parent</var> (다른 이름은 <var>fill_parent</var> 로, API 레벨 8 이전에 해당)
보기에 상위 보기 그룹이 허용하는 한 최대한으로 커지라고 합니다.</li>
</ul>
-<p>일반적으로 픽셀과 같이 절대적인 단위를 사용하여 레이아웃 너비와 높이를 지정하는 것은
-권장하지 않습니다. 그 대신, 밀도 독립적인 픽셀 단위와 같이 상대적인 측정치를
+<p>일반적으로 픽셀과 같이 절대적인 단위를 사용하여 레이아웃 너비와 높이를 지정하는 것은
+권장하지 않습니다. 그 대신, 밀도 독립적인 픽셀 단위와 같이 상대적인 측정치를
사용하는 것(<var>dp</var>), <var>wrap_content</var>, 또는
-<var>match_parent</var>등이 더 낫습니다. 이렇게 하면
+<var>match_parent</var>등이 더 낫습니다. 이렇게 하면
애플리케이션이 다양한 기기 화면 크기에 걸쳐서도 적절하게 표시되도록 보장하는 데 도움이 되기 때문입니다.
-허용된 측정 유형은
+허용된 측정 유형은
<a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">
사용 가능한 리소스</a>에 정의되어 있습니다.</p>
@@ -229,23 +229,23 @@
<h2 id="Position">레이아웃 위치</h2>
<p>
보기의 모양은 직사각형입니다. 보기에는 위치가 있으며, 이는
- 한 쌍의 <em>왼쪽</em> 및 <em>상단</em> 좌표, 그리고 두 개의 치수가 너비와 높이를 나타내는
+ 한 쌍의 <em>왼쪽</em> 및 <em>상단</em> 좌표, 그리고 두 개의 치수가 너비와 높이를 나타내는
형식으로 표현됩니다. 위치와 치수의 단위는 픽셀입니다.
</p>
<p>
- 보기의 위치를 검색할 수 있습니다.
-{@link android.view.View#getLeft()} 및 {@link android.view.View#getTop()} 메서드를 호출하면 됩니다. 전자는 보기를
-나타내는 직사각형의 왼쪽, 즉 X 좌표를 반환합니다. 후자는 보기를
-나타내는 직사각형의 상단, 즉 Y 좌표를 반환합니다. 이들 메서드는 둘 다
-보기의 위치를 해당 보기의 상위와 관련지어 반환합니다. 예를 들어,
-<code>getLeft()</code>가 20을 반환하는 경우 이는 해당 보기가 그 보기의 바로 상위의 왼쪽 가장자리에서
+ 보기의 위치를 검색할 수 있습니다.
+{@link android.view.View#getLeft()} 및 {@link android.view.View#getTop()} 메서드를 호출하면 됩니다. 전자는 보기를
+나타내는 직사각형의 왼쪽, 즉 X 좌표를 반환합니다. 후자는 보기를
+나타내는 직사각형의 상단, 즉 Y 좌표를 반환합니다. 이들 메서드는 둘 다
+보기의 위치를 해당 보기의 상위와 관련지어 반환합니다. 예를 들어,
+<code>getLeft()</code>가 20을 반환하는 경우 이는 해당 보기가 그 보기의 바로 상위의 왼쪽 가장자리에서
오른쪽으로 20픽셀 떨어진 곳에 있다는 뜻입니다.
</p>
<p>
- 이외에도 불필요한 계산을 피하기 위해 여러 가지 편의 메서드가 제공됩니다.
+ 이외에도 불필요한 계산을 피하기 위해 여러 가지 편의 메서드가 제공됩니다.
구체적으로 {@link android.view.View#getRight()} 및 {@link android.view.View#getBottom()}을 들 수 있습니다.
이들 메서드는 해당 보기를 나타내는 직사각형의 오른쪽과 하단 가장자리의 좌표를 반환합니다.
예를 들어 {@link android.view.View#getRight()}를
@@ -255,46 +255,46 @@
<h2 id="SizePaddingMargins">크기, 안쪽 여백 및 여백</h2>
<p>
- 보기의 크기는 너비와 높이로 표현됩니다. 사실 하나의 보기는
+ 보기의 크기는 너비와 높이로 표현됩니다. 사실 하나의 보기는
두 쌍의 너비 및 높이 값을 소유합니다.
</p>
<p>
- 첫 번째 쌍을 <em>측정된 너비</em> 및
-<em>측정된 높이</em>라고 합니다. 이들 치수는 보기가
-상위 내에서 얼마나 커지고자 하는지를 정의합니다. 측정된
+ 첫 번째 쌍을 <em>측정된 너비</em> 및
+<em>측정된 높이</em>라고 합니다. 이들 치수는 보기가
+상위 내에서 얼마나 커지고자 하는지를 정의합니다. 측정된
치수를 가져오려면 {@link android.view.View#getMeasuredWidth()}
및 {@link android.view.View#getMeasuredHeight()}를 호출하면 됩니다.
</p>
<p>
- 두 번째 쌍은 단순히 <em>너비</em> 및 <em>높이</em>라고 일컬으며,
-때로는 <em>그리기 너비</em> 및 <em>그리기 높이</em>로 부를 때도 있습니다. 이러한
-치수는 그리기 시간 및 레이아웃 후에 보기가 화면에 표시되는 실제 크기를
-정의합니다. 이들 값은 측정된 너비 및 높이와 달라도 되지만
-꼭 달라야 하는 것은 아닙니다. 너비와 높이를 가져오려면
+ 두 번째 쌍은 단순히 <em>너비</em> 및 <em>높이</em>라고 일컬으며,
+때로는 <em>그리기 너비</em> 및 <em>그리기 높이</em>로 부를 때도 있습니다. 이러한
+치수는 그리기 시간 및 레이아웃 후에 보기가 화면에 표시되는 실제 크기를
+정의합니다. 이들 값은 측정된 너비 및 높이와 달라도 되지만
+꼭 달라야 하는 것은 아닙니다. 너비와 높이를 가져오려면
{@link android.view.View#getWidth()} 및 {@link android.view.View#getHeight()}를 호출하면 됩니다.
</p>
<p>
- 보기의 치수를 측정하려면 보기는 자신의 안쪽 여백을 감안합니다. 안쪽 여백은
+ 보기의 치수를 측정하려면 보기는 자신의 안쪽 여백을 감안합니다. 안쪽 여백은
보기의 왼쪽, 상단, 오른쪽 및 하단 부분에 대해 픽셀로 표시됩니다.
- 안쪽 여백은 정해진 픽셀 수를 사용하여 보기의 콘텐츠를 오프셋하는 데 쓰일 수도
-있습니다. 예를 들어 왼쪽 안쪽 여백을 2로 설정하면 해당 보기의 콘텐츠를 왼쪽 가장자리에서
-오른쪽으로 2픽셀 밀어냅니다. 안쪽 여백을 설정할 때에는
-{@link android.view.View#setPadding(int, int, int, int)} 메서드를 사용하면 되고, 이를 쿼리하려면
-{@link android.view.View#getPaddingLeft()}, {@link android.view.View#getPaddingTop()},
+ 안쪽 여백은 정해진 픽셀 수를 사용하여 보기의 콘텐츠를 오프셋하는 데 쓰일 수도
+있습니다. 예를 들어 왼쪽 안쪽 여백을 2로 설정하면 해당 보기의 콘텐츠를 왼쪽 가장자리에서
+오른쪽으로 2픽셀 밀어냅니다. 안쪽 여백을 설정할 때에는
+{@link android.view.View#setPadding(int, int, int, int)} 메서드를 사용하면 되고, 이를 쿼리하려면
+{@link android.view.View#getPaddingLeft()}, {@link android.view.View#getPaddingTop()},
{@link android.view.View#getPaddingRight()} 및 {@link android.view.View#getPaddingBottom()}을 사용하면 됩니다.
</p>
<p>
- 보기가 안쪽 여백을 정의할 수는 있지만, 여백에 대한 지원은 전혀 제공하지
-않습니다. 다만 보기 그룹이 그와 같은 지원을 제공합니다. 자세한 정보는
-{@link android.view.ViewGroup} 및
+ 보기가 안쪽 여백을 정의할 수는 있지만, 여백에 대한 지원은 전혀 제공하지
+않습니다. 다만 보기 그룹이 그와 같은 지원을 제공합니다. 자세한 정보는
+{@link android.view.ViewGroup} 및
{@link android.view.ViewGroup.MarginLayoutParams}를 참조하십시오.
</p>
- <p>치수에 대한 자세한 정보는
+ <p>치수에 대한 자세한 정보는
<a href="{@docRoot}guide/topics/resources/more-resources.html#Dimension">치수 값</a>을 참조하십시오.
</p>
@@ -320,13 +320,13 @@
<h2 id="CommonLayouts">보편적인 레이아웃</h2>
-<p>{@link android.view.ViewGroup} 클래스의 각 하위 클래스는 각기 고유한 방식으로 자신 안에
-중첩한 보기를 표시합니다. 아래는 Android 플랫폼에서 기본 제공되는, 보다 보편적인 레이아웃 유형을
+<p>{@link android.view.ViewGroup} 클래스의 각 하위 클래스는 각기 고유한 방식으로 자신 안에
+중첩한 보기를 표시합니다. 아래는 Android 플랫폼에서 기본 제공되는, 보다 보편적인 레이아웃 유형을
몇 가지 나타낸 것입니다.</p>
-<p class="note"><strong>참고:</strong> 하나 이상의 레이아웃을 또 다른 레이아웃에 중첩하여
-UI 디자인을 이룰 수도 있지만, 레이아웃 계층을 가능한 한 얕게 유지하도록
-애써야 합니다. 중첩된 레이아웃이 적을수록 레이아웃이 더욱 빠르게 그려집니다(가로로 넓은 보기 계층이
+<p class="note"><strong>참고:</strong> 하나 이상의 레이아웃을 또 다른 레이아웃에 중첩하여
+UI 디자인을 이룰 수도 있지만, 레이아웃 계층을 가능한 한 얕게 유지하도록
+애써야 합니다. 중첩된 레이아웃이 적을수록 레이아웃이 더욱 빠르게 그려집니다(가로로 넓은 보기 계층이
깊은 보기 계층보다 낫습니다).</p>
<!--
@@ -345,14 +345,14 @@
<div class="layout first">
<h4><a href="layout/linear.html">선형 레이아웃</a></h4>
<a href="layout/linear.html"><img src="{@docRoot}images/ui/linearlayout-small.png" alt="" /></a>
- <p>여러 하위를 하나의 가로 방향 또는 세로 방향 행으로 정리하는 레이아웃. 이것은
+ <p>여러 하위를 하나의 가로 방향 또는 세로 방향 행으로 정리하는 레이아웃. 이것은
창의 길이가 화면 길이를 웃도는 경우 스크롤 막대를 만듭니다.</p>
</div>
<div class="layout">
<h4><a href="layout/relative.html">관계 레이아웃</a></h4>
<a href="layout/relative.html"><img src="{@docRoot}images/ui/relativelayout-small.png" alt="" /></a>
- <p>여러 하위 객체의 위치를 서로 관련지어 나타내거나(하위 A가
+ <p>여러 하위 객체의 위치를 서로 관련지어 나타내거나(하위 A가
하위 B의 왼쪽), 상위와 관련지어 나타낼 수 있도록 해줍니다(상위의 맨 위에 맞춰 정렬).</p>
</div>
@@ -367,12 +367,12 @@
<h2 id="AdapterViews" style="clear:left">어댑터로 레이아웃 구축하기</h2>
-<p>레이아웃의 콘텐츠가 동적이거나 미리 정의되지 않은 경우,
-{@link android.widget.AdapterView}의 하위 클래스가 되는 레이아웃을 사용하여 런타임에 보기로 레이아웃을 채울 수 있습니다.
-{@link android.widget.AdapterView} 클래스의 하위 클래스는 {@link android.widget.Adapter}를
+<p>레이아웃의 콘텐츠가 동적이거나 미리 정의되지 않은 경우,
+{@link android.widget.AdapterView}의 하위 클래스가 되는 레이아웃을 사용하여 런타임에 보기로 레이아웃을 채울 수 있습니다.
+{@link android.widget.AdapterView} 클래스의 하위 클래스는 {@link android.widget.Adapter}를
사용하여 자신의 레이아웃에 데이터를 바인딩합니다. {@link android.widget.Adapter}가 데이터 소스와 {@link android.widget.AdapterView}
레이아웃 사이의 중개자 역할을 합니다. —{@link android.widget.Adapter}가
- 데이터를 검색하여(배열 또는 데이터베이스 쿼리와 같은 소스로부터)
+ 데이터를 검색하여(배열 또는 데이터베이스 쿼리와 같은 소스로부터)
각 항목을 보기로 변환해서 {@link android.widget.AdapterView} 레이아웃에 추가될 수 있도록 합니다.</p>
<p>어댑터로 지원되는 보편적인 레이아웃의 몇 가지 예는 다음과 같습니다.</p>
@@ -393,13 +393,13 @@
<h3 id="FillingTheLayout" style="clear:left">데이터로 어댑터 보기 채우기</h3>
-<p>{@link android.widget.ListView} 또는
-{@link android.widget.GridView}와 같은 {@link android.widget.AdapterView}를 채우려면 {@link android.widget.AdapterView} 인스턴스를
+<p>{@link android.widget.ListView} 또는
+{@link android.widget.GridView}와 같은 {@link android.widget.AdapterView}를 채우려면 {@link android.widget.AdapterView} 인스턴스를
{@link android.widget.Adapter}에 바인딩하면 됩니다. 이는 외부 소스로부터 데이터를 검색하여 각 데이터 항목을 나타내는 {@link
android.view.View}를 생성합니다.</p>
-<p>Android는 {@link android.widget.Adapter}의 하위 클래스를 여러 개 제공합니다.
-이는 여러 가지 종류의 데이터를 검색하고 {@link android.widget.AdapterView}에 대한 보기를 구축하는 데 유용합니다.
+<p>Android는 {@link android.widget.Adapter}의 하위 클래스를 여러 개 제공합니다.
+이는 여러 가지 종류의 데이터를 검색하고 {@link android.widget.AdapterView}에 대한 보기를 구축하는 데 유용합니다.
가장 보편적인 어댑터 두 가지를 예로 들면 다음과 같습니다.</p>
<dl>
@@ -409,7 +409,7 @@
java.lang.Object#toString()}를 호출하고 그 콘텐츠를 {@link
android.widget.TextView}에 배치함으로써 각 배열 항목에 대한 보기를 생성합니다.
<p>예를 들어, {@link
-android.widget.ListView}로 문자열 배열을 표시하고자 하는 경우, 생성자를 사용하여
+android.widget.ListView}로 문자열 배열을 표시하고자 하는 경우, 생성자를 사용하여
새로운 {@link android.widget.ArrayAdapter}를 초기화해서 각 문자열과 문자열 배열에 대한 레이아웃을 지정하면 됩니다.</p>
<pre>
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
@@ -421,7 +421,7 @@
<li>배열에 있는 각 문자열에 대한 {@link android.widget.TextView}가 들어있는 레이아웃</li>
<li>문자열 배열</li>
</ul>
-<p>그런 다음 {@link android.widget.ListView}에서
+<p>그런 다음 {@link android.widget.ListView}에서
{@link android.widget.ListView#setAdapter setAdapter()}를 호출하기만 하면 됩니다.</p>
<pre>
ListView listView = (ListView) findViewById(R.id.listview);
@@ -430,7 +430,7 @@
<p>각 항목의 외관을 사용자 지정하려면 배열의 객체에 대한 {@link
java.lang.Object#toString()} 메서드를 재정의하면 됩니다. 아니면, 각 항목에 대하여
-{@link android.widget.TextView}가 아닌 다른 보기를 생성하고자 하는 경우(예를 들어 각 배열 항목에
+{@link android.widget.TextView}가 아닌 다른 보기를 생성하고자 하는 경우(예를 들어 각 배열 항목에
{@link android.widget.ImageView}를 원하는 경우), {@link
android.widget.ArrayAdapter} 클래스를 확장하고 {@link android.widget.ArrayAdapter#getView
getView()}를 재정의하여 각 항목에 대해 원하는 유형의 보기를 반환하도록 할 수 있습니다.</p>
@@ -438,21 +438,21 @@
</dd>
<dt>{@link android.widget.SimpleCursorAdapter}</dt>
- <dd>이 어댑터는 데이터 출처가 {@link android.database.Cursor}일 때 사용하십시오.
-{@link android.widget.SimpleCursorAdapter}를 사용하는 경우,
+ <dd>이 어댑터는 데이터 출처가 {@link android.database.Cursor}일 때 사용하십시오.
+{@link android.widget.SimpleCursorAdapter}를 사용하는 경우,
{@link android.database.Cursor}에 있는 각 행에 대하여 사용할 레이아웃을 지정해야 합니다. 또한 {@link android.database.Cursor}
-의 어느 열이 레이아웃의 어느 보기에 삽입되어야 할지도 지정해야 합니다. 예를 들어 사람 이름과
+의 어느 열이 레이아웃의 어느 보기에 삽입되어야 할지도 지정해야 합니다. 예를 들어 사람 이름과
전화번호로 이루어진 목록을 생성하고자 하는 경우, 각 사람에 대해 행이 하나씩 있고 이름과 번호에 대해 열이 들어있는 {@link
android.database.Cursor}를 반환하는 쿼리를 수행하면 됩니다.
그런 다음 레이아웃에서 각 결과에 대하여 {@link
-android.database.Cursor}의 어느 열을 원하는지 지정하는 문자열 배열을 만들 수 있고, 각 열이 배치되어야 하는
+android.database.Cursor}의 어느 열을 원하는지 지정하는 문자열 배열을 만들 수 있고, 각 열이 배치되어야 하는
상응하는 보기를 지정하는 정수 배열을 만들면 됩니다.</p>
<pre>
String[] fromColumns = {ContactsContract.Data.DISPLAY_NAME,
ContactsContract.CommonDataKinds.Phone.NUMBER};
int[] toViews = {R.id.display_name, R.id.phone_number};
</pre>
-<p>{@link android.widget.SimpleCursorAdapter}를 인스턴트화하는 경우, 각 결과에 대해 사용할 레이아웃과
+<p>{@link android.widget.SimpleCursorAdapter}를 인스턴트화하는 경우, 각 결과에 대해 사용할 레이아웃과
결과가 들어있는 {@link android.database.Cursor}, 그리고 다음의 두 배열을 전달합니다.</p>
<pre>
SimpleCursorAdapter adapter = new SimpleCursorAdapter(this,
@@ -460,21 +460,21 @@
ListView listView = getListView();
listView.setAdapter(adapter);
</pre>
-<p>그러면 {@link android.widget.SimpleCursorAdapter}가
+<p>그러면 {@link android.widget.SimpleCursorAdapter}가
{@link android.database.Cursor}에 있는 각 행에 대한 보기를 하나씩 생성합니다. 이때 상응하는 {@code toViews} 보기 안에 각 {@code
fromColumns} 항목을 삽입함으로써 제공된 레이아웃을 사용합니다.</p>.</dd>
</dl>
-<p>애플리케이션의 수명이 진행되는 동안에 어댑터가 읽는 기본 데이터를 변경하는 경우,
-{@link android.widget.ArrayAdapter#notifyDataSetChanged()}를 호출해야 합니다.
+<p>애플리케이션의 수명이 진행되는 동안에 어댑터가 읽는 기본 데이터를 변경하는 경우,
+{@link android.widget.ArrayAdapter#notifyDataSetChanged()}를 호출해야 합니다.
이렇게 하면 첨부된 보기에 데이터가 변경되었으며 스스로 새로 고쳐야 한다는 사실을 알려줍니다.</p>
<h3 id="HandlingUserSelections">클릭 이벤트 처리</h3>
-<p>{@link android.widget.AdapterView}에 있는 각 항목에서의 클릭 이벤트에 응답하려면
+<p>{@link android.widget.AdapterView}에 있는 각 항목에서의 클릭 이벤트에 응답하려면
{@link android.widget.AdapterView.OnItemClickListener} 인터페이스를 구현하면 됩니다. 예:</p>
<pre>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/ko/guide/topics/ui/dialogs.jd
index 23e92c9..7fad584 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>참고 항목</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">대화 디자인 가이드</a></li>
@@ -41,24 +41,24 @@
</div>
</div>
-<p>대화는 사용자에게 결정을 내리거나 추가 정보를 입력하라는
-프롬프트를 보내는 작은 창입니다. 대화는 화면을 가득 채우지 않으며 보통 사용자가
+<p>대화는 사용자에게 결정을 내리거나 추가 정보를 입력하라는
+프롬프트를 보내는 작은 창입니다. 대화는 화면을 가득 채우지 않으며 보통 사용자가
다음으로 계속 진행하기 전에 조치를 취해야 하는 모달 이벤트에 쓰입니다.</p>
<div class="note design">
<p><strong>대화 디자인</strong></p>
- <p>언어 권장 사항을 비롯한 여러 가지 대화 디자인 방법에 관련된 정보는
+ <p>언어 권장 사항을 비롯한 여러 가지 대화 디자인 방법에 관련된 정보는
<a href="{@docRoot}design/building-blocks/dialogs.html">대화</a> 디자인 가이드를 읽어보십시오.</p>
</div>
<img src="{@docRoot}images/ui/dialogs.png" />
-<p>{@link android.app.Dialog} 클래스가 대화의 기본 클래스이지만,
+<p>{@link android.app.Dialog} 클래스가 대화의 기본 클래스이지만,
{@link android.app.Dialog}를 직접 인스턴트화하는 것은 삼가야 합니다.
대신 다음 하위 클래스 중 하나를 사용하십시오.</p>
<dl>
<dt>{@link android.app.AlertDialog}</dt>
- <dd>제목 하나, 최대 세 개의 버튼, 선택 가능한 품목 목록 또는
+ <dd>제목 하나, 최대 세 개의 버튼, 선택 가능한 품목 목록 또는
사용자 지정 레이아웃을 표시할 수 있는 대화입니다.</dd>
<dt>{@link android.app.DatePickerDialog} 또는 {@link android.app.TimePickerDialog}</dt>
<dd>미리 정의된 UI가 있는 대화로 사용자로 하여금 날짜 또는 시간을 선택할 수 있게 해줍니다.</dd>
@@ -66,55 +66,55 @@
<div class="sidebox">
<h2>ProgressDialog 피하기</h2>
-<p>Android에는
-{@link android.app.ProgressDialog}라고 하는 또 다른 대화 클래스가 있습니다. 이것은 진행률 표시줄이 있는 대화를 표시하는 것입니다. 그러나,
-로딩이나 확정되지 않은 진행률을 나타내야 하는 경우 이 대신 <a href="{@docRoot}design/building-blocks/progress.html">진행률 및
-액티비티</a>에 대한 디자인 지침을 따르고,
+<p>Android에는
+{@link android.app.ProgressDialog}라고 하는 또 다른 대화 클래스가 있습니다. 이것은 진행률 표시줄이 있는 대화를 표시하는 것입니다. 그러나,
+로딩이나 확정되지 않은 진행률을 나타내야 하는 경우 이 대신 <a href="{@docRoot}design/building-blocks/progress.html">진행률 및
+액티비티</a>에 대한 디자인 지침을 따르고,
레이아웃의 {@link android.widget.ProgressBar}를 사용해야 합니다.</p>
</div>
-<p>이러한 클래스가 대화의 스타일과 구조를 정의하지만, 대화의 컨테이너로는
+<p>이러한 클래스가 대화의 스타일과 구조를 정의하지만, 대화의 컨테이너로는
{@link android.support.v4.app.DialogFragment}를 사용해야 합니다.
{@link android.support.v4.app.DialogFragment}
- 클래스는 대화를 만들고 그 외관을 관리하는 데 필요한 모든 제어를 제공합니다.
+ 클래스는 대화를 만들고 그 외관을 관리하는 데 필요한 모든 제어를 제공합니다.
{@link android.app.Dialog} 객체에서 메서드를 호출하는 것 대신입니다.</p>
-<p>대화를 관리하기 위해 {@link android.support.v4.app.DialogFragment}를 사용하면
-사용자가 <em>뒤로</em> 버튼을 누르거나 화면을 돌릴 때 등
+<p>대화를 관리하기 위해 {@link android.support.v4.app.DialogFragment}를 사용하면
+사용자가 <em>뒤로</em> 버튼을 누르거나 화면을 돌릴 때 등
수명 주기 이벤트를 올바르게 처리하도록 보장할 수 있습니다. {@link
-android.support.v4.app.DialogFragment} 클래스를 사용하면 대화의 UI를 더 큰 UI에
+android.support.v4.app.DialogFragment} 클래스를 사용하면 대화의 UI를 더 큰 UI에
포함시킬 수 있는 구성 요소로 다시 사용할 수 있게 해주기도 합니다. 이것은 기존의 {@link
-android.support.v4.app.Fragment}와 똑같습니다(대화 UI를 크고 작은 화면에서 서로 다르게
+android.support.v4.app.Fragment}와 똑같습니다(대화 UI를 크고 작은 화면에서 서로 다르게
나타나도록 하고자 하는 경우 등).</p>
<p>이 가이드의 다음 섹션에서는 {@link
android.support.v4.app.DialogFragment}를 {@link android.app.AlertDialog}
- 객체와 함께 조합하여 사용하는 방법을 설명합니다. 날짜 또는 시간 선택기를 생성하고자 하는 경우, 대신
+ 객체와 함께 조합하여 사용하는 방법을 설명합니다. 날짜 또는 시간 선택기를 생성하고자 하는 경우, 대신
<a href="{@docRoot}guide/topics/ui/controls/pickers.html">선택기</a> 가이드를 읽으십시오.</p>
<p class="note"><strong>참고:</strong>
-{@link android.app.DialogFragment} 클래스는 원래
+{@link android.app.DialogFragment} 클래스는 원래
Android 3.0(API 레벨 11)에 추가되었기 때문에 이 문서에서는 <a href="{@docRoot}tools/support-library/index.html">지원 라이브러리</a>와 함께 제공된 {@link
-android.support.v4.app.DialogFragment} 클래스를 사용하는 법을 설명합니다. 이 라이브러리를 앱에 추가하면 Android 1.6 이상을 실행하는 기기에서
-{@link android.support.v4.app.DialogFragment}를 비롯하여
-다른 API도 다양하게 사용할 수 있습니다. 앱의 최소 버전이
+android.support.v4.app.DialogFragment} 클래스를 사용하는 법을 설명합니다. 이 라이브러리를 앱에 추가하면 Android 1.6 이상을 실행하는 기기에서
+{@link android.support.v4.app.DialogFragment}를 비롯하여
+다른 API도 다양하게 사용할 수 있습니다. 앱의 최소 버전이
API 레벨 11 이상인 경우, {@link
-android.app.DialogFragment}의 프레임워크 버전을 사용해도 되지만, 이 문서에 있는 링크는
-지원 라이브러리 API를 대상으로 한 것이라는 점을 유의하십시오. 지원 라이브러리를 사용할 때에는
+android.app.DialogFragment}의 프레임워크 버전을 사용해도 되지만, 이 문서에 있는 링크는
+지원 라이브러리 API를 대상으로 한 것이라는 점을 유의하십시오. 지원 라이브러리를 사용할 때에는
<code>android.support.v4.app.DialogFragment</code>
클래스를 가져와야 합니다. <code>android.app.DialogFragment</code>가 <em>아닙니다</em>.</p>
<h2 id="DialogFragment">대화 프래그먼트 생성</h2>
-<p>대단히 다양한 대화 디자인을 만들 수 있습니다. 사용자 지정 레이아웃은 물론
+<p>대단히 다양한 대화 디자인을 만들 수 있습니다. 사용자 지정 레이아웃은 물론
<a href="{@docRoot}design/building-blocks/dialogs.html">대화</a>
-디자인 가이드에서 설명한 것도 포함합니다.
+디자인 가이드에서 설명한 것도 포함합니다.
{@link android.support.v4.app.DialogFragment}를 확장하고 {@link android.support.v4.app.DialogFragment#onCreateDialog
onCreateDialog()} 콜백 메서드에 {@link android.app.AlertDialog}를
생성하면 됩니다.</p>
-<p>예를 들어 다음은 {@link android.app.AlertDialog}로, 이는
+<p>예를 들어 다음은 {@link android.app.AlertDialog}로, 이는
{@link android.support.v4.app.DialogFragment} 내에서 관리되는 것입니다.</p>
<pre>
@@ -147,14 +147,14 @@
</div>
<p>이 클래스의 인스턴스를 생성하고 해당 객체에서 {@link
-android.support.v4.app.DialogFragment#show show()}를 호출하면 대화는
+android.support.v4.app.DialogFragment#show show()}를 호출하면 대화는
그림 1에 표시된 것처럼 나타납니다.</p>
<p>다음 섹션에서는 {@link android.app.AlertDialog.Builder}
API를 사용하여 대화를 생성하는 것에 대해 좀 더 자세히 설명합니다.</p>
-<p>대화가 얼마나 복잡한지에 따라
-{@link android.support.v4.app.DialogFragment}에서 여러 가지 다른 콜백 메서드를 구현할 수 있습니다. 그중에는 기본적인
+<p>대화가 얼마나 복잡한지에 따라
+{@link android.support.v4.app.DialogFragment}에서 여러 가지 다른 콜백 메서드를 구현할 수 있습니다. 그중에는 기본적인
<a href="{@docRoot}guide/components/fragments.html#Lifecycle">조각 수명 주기 메서드</a>도 포함됩니다.
@@ -164,8 +164,8 @@
<h2 id="AlertDialog">경고 대화 구축</h2>
-<p>{@link android.app.AlertDialog} 클래스를 사용하면
-여러 가지 대화 디자인을 구축할 수 있으며, 필요한 대화 클래스는 이것뿐인 경우도 많습니다.
+<p>{@link android.app.AlertDialog} 클래스를 사용하면
+여러 가지 대화 디자인을 구축할 수 있으며, 필요한 대화 클래스는 이것뿐인 경우도 많습니다.
그림 2에 표시된 것과 같이 경고 대화에는 세 가지 영역이 있습니다.</p>
<div class="figure" style="width:311px;margin-top:0">
@@ -175,8 +175,8 @@
<ol>
<li><b>제목</b>
- <p>이것은 선택 항목이며 콘텐츠 영역에 상세한 메시지, 목록 또는
-사용자 지정 레이아웃이 채워져 있는 경우에만 사용해야 합니다. 단순한 메시지 또는
+ <p>이것은 선택 항목이며 콘텐츠 영역에 상세한 메시지, 목록 또는
+사용자 지정 레이아웃이 채워져 있는 경우에만 사용해야 합니다. 단순한 메시지 또는
질문(그림 1의 대화처럼)을 진술해야 하는 경우, 제목은 없어도 됩니다.</li>
<li><b>콘텐츠 영역</b>
<p>이것은 메시지, 목록 또는 다른 사용자 지정 레이아웃을 표시할 수 있습니다.</p></li>
@@ -202,7 +202,7 @@
AlertDialog dialog = builder.create();
</pre>
-<p>다음 주제는
+<p>다음 주제는
{@link android.app.AlertDialog.Builder} 클래스를 사용하여 다양한 대화 속성을 정의하는 방법을 나타낸 것입니다.</p>
@@ -210,8 +210,8 @@
<h3 id="AddingButtons">버튼 추가</h3>
-<p>그림 2에 표시된 것과 같은 작업 버튼을 추가하려면
-{@link android.app.AlertDialog.Builder#setPositiveButton setPositiveButton()} 및
+<p>그림 2에 표시된 것과 같은 작업 버튼을 추가하려면
+{@link android.app.AlertDialog.Builder#setPositiveButton setPositiveButton()} 및
{@link android.app.AlertDialog.Builder#setNegativeButton setNegativeButton()} 메서드를 호출하면 됩니다.</p>
<pre style="clear:right">
@@ -235,8 +235,8 @@
</pre>
<p><code>set...Button()</code> 메서드에는 버튼의 제목이 필요하고(
-<a href="{@docRoot}guide/topics/resources/string-resource.html">문자열 리소스</a>가 제공), 사용자가 버튼을 눌렀을 때 수행할 작업을 정의하는
-{@link android.content.DialogInterface.OnClickListener}가
+<a href="{@docRoot}guide/topics/resources/string-resource.html">문자열 리소스</a>가 제공), 사용자가 버튼을 눌렀을 때 수행할 작업을 정의하는
+{@link android.content.DialogInterface.OnClickListener}가
필요합니다.</p>
<p>추가할 수 있는 작업 버튼은 다음과 같은 세 가지가 있습니다.</p>
@@ -246,9 +246,9 @@
<dt>부정적</dt>
<dd>이것은 작업을 취소하는 데 사용해야 합니다.</dd>
<dt>중립적</dt>
- <dd>이것은 사용자가 작업을 계속하고 싶지 않을 수 있지만
+ <dd>이것은 사용자가 작업을 계속하고 싶지 않을 수 있지만
취소하고자 한다고 볼 수 없을 때 사용해야 합니다. 이것은 긍정적 버튼과 부정적 버튼 사이에 나타납니다.
- 이런 작업을 예로 들면 "나중에 알림" 등이 있습니다.</dd>
+ 이런 작업을 예로 들면 "나중에 알림" 등이 있습니다.</dd>
</dl>
<p>{@link
@@ -271,7 +271,7 @@
<li>영구적인 다중 선택 목록(확인란)</li>
</ul>
-<p>그림 3에 표시된 것과 같은 단일 선택 목록을 생성하려면
+<p>그림 3에 표시된 것과 같은 단일 선택 목록을 생성하려면
{@link android.app.AlertDialog.Builder#setItems setItems()} 메서드를 사용하면 됩니다.</p>
<pre style="clear:right">
@@ -289,23 +289,23 @@
}
</pre>
-<p>목록은 대화의 콘텐츠 영역에 나타나므로,
-대화는 메시지와 목록을 둘 다 표시할 수 없습니다. 대화에는
-{@link android.app.AlertDialog.Builder#setTitle setTitle()}로 제목을 설정해야 합니다.
+<p>목록은 대화의 콘텐츠 영역에 나타나므로,
+대화는 메시지와 목록을 둘 다 표시할 수 없습니다. 대화에는
+{@link android.app.AlertDialog.Builder#setTitle setTitle()}로 제목을 설정해야 합니다.
목록에 대한 항목을 지정하려면 {@link
android.app.AlertDialog.Builder#setItems setItems()}를 호출하여 배열을 하나 전달합니다.
아니면 {@link
-android.app.AlertDialog.Builder#setAdapter setAdapter()}를 사용하여 목록을 지정해도 됩니다. 이렇게 하면 동적인 데이터가 있는 목록(예: 데이터베이스에서 가져온 것)을
+android.app.AlertDialog.Builder#setAdapter setAdapter()}를 사용하여 목록을 지정해도 됩니다. 이렇게 하면 동적인 데이터가 있는 목록(예: 데이터베이스에서 가져온 것)을
{@link android.widget.ListAdapter}로 지원할 수 있게 해줍니다.</p>
-<p>{@link android.widget.ListAdapter}로 목록을 지원하기로 선택하는 경우,
-항상 {@link android.support.v4.content.Loader}를 사용해야 콘텐츠가 비동기식으로
-로딩됩니다.
-이것은 <a href="{@docRoot}guide/topics/ui/declaring-layout.html#AdapterViews">어댑터로 레이아웃
+<p>{@link android.widget.ListAdapter}로 목록을 지원하기로 선택하는 경우,
+항상 {@link android.support.v4.content.Loader}를 사용해야 콘텐츠가 비동기식으로
+로딩됩니다.
+이것은 <a href="{@docRoot}guide/topics/ui/declaring-layout.html#AdapterViews">어댑터로 레이아웃
구축하기</a> 및 <a href="{@docRoot}guide/components/loaders.html">로더</a>
가이드에 더 자세히 설명되어 있습니다.</p>
-<p class="note"><strong>참고:</strong> 기본적으로 목록 항목을 터치하면 대화를 무시하게 됩니다.
+<p class="note"><strong>참고:</strong> 기본적으로 목록 항목을 터치하면 대화를 무시하게 됩니다.
다만 다음과 같은 영구적인 선택 목록 중 하나를 사용하는 경우는 예외입니다.</p>
<div class="figure" style="width:290px;margin:-30px 0 0 40px">
@@ -317,15 +317,15 @@
<h4 id="Checkboxes">영구적 다중 선택 또는 단일 선택 목록 추가</h4>
-<p>다중 선택 항목 목록을 추가하거나(확인란)
-단일 선택 목록을 추가하려면(무선 버튼), 각각
+<p>다중 선택 항목 목록을 추가하거나(확인란)
+단일 선택 목록을 추가하려면(무선 버튼), 각각
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} 또는
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} 또는
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} 메서드를 사용합니다.</p>
-<p>예를 들어 다음은 그림 4에 표시된 것과 같이 다중 선택 목록을 생성하는 방법입니다.
-이것은 선택한 항목을
+<p>예를 들어 다음은 그림 4에 표시된 것과 같이 다중 선택 목록을 생성하는 방법입니다.
+이것은 선택한 항목을
{@link java.util.ArrayList}에 저장합니다.</p>
<pre style="clear:right">
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -371,11 +371,11 @@
}
</pre>
-<p>일반적인 목록과 무선 버튼이 있는 목록 양쪽 모두 "단일 선택" 작업을
+<p>일반적인 목록과 무선 버튼이 있는 목록 양쪽 모두 "단일 선택" 작업을
제공하지만, 사용자의 선택을 유지하고자 하는 경우 {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
-setSingleChoiceItems()}를 사용해야 합니다.
-다시 말해, 대화를 나중에 다시 여는 경우 사용자의 현재 선택이 무엇인지 나타내야 하며,
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+setSingleChoiceItems()}를 사용해야 합니다.
+다시 말해, 대화를 나중에 다시 여는 경우 사용자의 현재 선택이 무엇인지 나타내야 하며,
그러면 무선 버튼으로 목록을 생성할 수 있습니다.</p>
@@ -389,12 +389,12 @@
<p class="img-caption"><strong>그림 5.</strong> 사용자 지정 대화 레이아웃입니다.</p>
</div>
-<p>대화에서 사용자 지정 레이아웃을 원하는 경우, 레이아웃을 생성한 다음 이를
+<p>대화에서 사용자 지정 레이아웃을 원하는 경우, 레이아웃을 생성한 다음 이를
{@link android.app.AlertDialog}에 추가하면 됩니다. 이때 {@link
android.app.AlertDialog.Builder#setView setView()} on your {@link
android.app.AlertDialog.Builder} 객체를 호출하는 방법을 씁니다.</p>
-<p>기본적으로 사용자 지정 레이아웃이 대화창을 가득 채우지만, 여전히
+<p>기본적으로 사용자 지정 레이아웃이 대화창을 가득 채우지만, 여전히
{@link android.app.AlertDialog.Builder} 메서드를 사용하여 버튼과 제목을 추가할 수 있습니다.</p>
<p>예를 들어 다음은 그림 5에 표시된 대화에 대한 레이아웃 파일입니다.</p>
@@ -437,14 +437,14 @@
</pre>
<p class="note"><strong>팁:</strong> 기본적으로 {@link android.widget.EditText}
- 요소를 설정하여 {@code "textPassword"} 입력 유형을 사용하고자 하는 경우, 글꼴 패밀리가 고정 폭으로 설정되어 있으므로
-글꼴 패밀리를 {@code "sans-serif"}로 변경해야 합니다. 그래야 양쪽 텍스트 필드가 모두 일치하는 글꼴 스타일을
+ 요소를 설정하여 {@code "textPassword"} 입력 유형을 사용하고자 하는 경우, 글꼴 패밀리가 고정 폭으로 설정되어 있으므로
+글꼴 패밀리를 {@code "sans-serif"}로 변경해야 합니다. 그래야 양쪽 텍스트 필드가 모두 일치하는 글꼴 스타일을
사용할 수 있습니다.</p>
-<p>{@link android.support.v4.app.DialogFragment} 안의 레이아웃을 팽창시키려면,
-{@link android.view.LayoutInflater}를
-{@link android.app.Activity#getLayoutInflater()}로 가져와
-{@link android.view.LayoutInflater#inflate inflate()}를 호출합니다.
+<p>{@link android.support.v4.app.DialogFragment} 안의 레이아웃을 팽창시키려면,
+{@link android.view.LayoutInflater}를
+{@link android.app.Activity#getLayoutInflater()}로 가져와
+{@link android.view.LayoutInflater#inflate inflate()}를 호출합니다.
여기서 첫 번째 매개변수가 레이아웃 리소스 ID이고 두 번째 매개변수가 레이아웃의 상위 보기입니다.
그러므로 그런 다음 {@link android.app.AlertDialog#setView setView()}를
호출하여 레이아웃을 대화에 배치할 수 있습니다.</p>
@@ -470,16 +470,16 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
<div class="note">
-<p><strong>팁:</strong> 사용자 지정 대화를 원하는 경우,
-{@link android.app.Activity}를 대신 표시해도 됩니다. 이는
+<p><strong>팁:</strong> 사용자 지정 대화를 원하는 경우,
+{@link android.app.Activity}를 대신 표시해도 됩니다. 이는
{@link android.app.Dialog} API 대신 대화로 표시하는 것입니다. 단순히 액티비티를 하나 생성한 다음 그 테마를 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code
-<activity>}</a> 매니페스트 요소에 있는
+<activity>}</a> 매니페스트 요소에 있는
{@link android.R.style#Theme_Holo_Dialog Theme.Holo.Dialog}로
설정하면 됩니다.</p>
@@ -493,19 +493,19 @@
<h2 id="PassingEvents">이벤트를 대화의 호스트에 다시 전달</h2>
-<p>사용자가 대화의 작업 버튼 중 하나를 터치하거나 목록에서 항목을 하나 선택하면,
-{@link android.support.v4.app.DialogFragment}가
+<p>사용자가 대화의 작업 버튼 중 하나를 터치하거나 목록에서 항목을 하나 선택하면,
+{@link android.support.v4.app.DialogFragment}가
필요한 작업을 알아서 수행할 수도 있지만 대부분의 경우 이벤트를 대화를 연 액티비티 또는 프래그먼트에 직접 전달하고자 할 수 있습니다.
- 이렇게 하려면 각 클릭 이벤트의 유형별로 메서드가 있는 인터페이스를 정의합니다.
- 그런 다음 해당 인터페이스를 대화로부터 작업 이벤트를 수신할
+ 이렇게 하려면 각 클릭 이벤트의 유형별로 메서드가 있는 인터페이스를 정의합니다.
+ 그런 다음 해당 인터페이스를 대화로부터 작업 이벤트를 수신할
호스트 구성 요소에 구현하면 됩니다.</p>
-<p>예를 들어 다음은 인터페이스를 정의하는 {@link android.support.v4.app.DialogFragment}입니다.
+<p>예를 들어 다음은 인터페이스를 정의하는 {@link android.support.v4.app.DialogFragment}입니다.
이 인터페이스를 통해 이벤트를 호스트 액티비티에 도로 전달하게 됩니다.</p>
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -535,15 +535,15 @@
}
</pre>
-<p>대화를 호스팅하는 액티비티는 대화의 인스턴스를 만듭니다.
-이때 대화 프래그먼트의 생성자를 사용하며,
+<p>대화를 호스팅하는 액티비티는 대화의 인스턴스를 만듭니다.
+이때 대화 프래그먼트의 생성자를 사용하며,
{@code NoticeDialogListener} 인터페이스 구현을 통해 대화의 이벤트를 수신하게 됩니다.</p>
<pre>
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -568,8 +568,8 @@
</pre>
<p>액티비티가 {@code NoticeDialogListener}를 구현하기 때문에—위에 표시된 {@link android.support.v4.app.Fragment#onAttach onAttach()}
- 콜백 메서드가 강제 적용—해당 대화 프래그먼트는
-인터페이스 콜백 메서드를 사용하여 액티비티에 대한 클릭 이벤트를
+ 콜백 메서드가 강제 적용—해당 대화 프래그먼트는
+인터페이스 콜백 메서드를 사용하여 액티비티에 대한 클릭 이벤트를
전달할 수 있습니다.</p>
<pre>
@@ -604,11 +604,11 @@
<p>대화를 표시하고자 하는 경우, {@link
android.support.v4.app.DialogFragment}의 인스턴스를 생성한 다음 {@link android.support.v4.app.DialogFragment#show
-show()}를 호출하여 {@link android.support.v4.app.FragmentManager}와 대화 프래그먼트에 대한
+show()}를 호출하여 {@link android.support.v4.app.FragmentManager}와 대화 프래그먼트에 대한
태그 이름을 전달합니다.</p>
-<p>{@link android.support.v4.app.FragmentManager}를 가져오려면
-{@link android.support.v4.app.FragmentActivity}에서
+<p>{@link android.support.v4.app.FragmentManager}를 가져오려면
+{@link android.support.v4.app.FragmentActivity}에서
{@link android.support.v4.app.FragmentActivity#getSupportFragmentManager()}를 호출하거나 {@link
android.support.v4.app.Fragment}로부터 {@link
android.support.v4.app.Fragment#getFragmentManager()}를 호출합니다. 예:</p>
@@ -620,7 +620,7 @@
}
</pre>
-<p>두 번째 인수 {@code "missiles"}는 시스템이
+<p>두 번째 인수 {@code "missiles"}는 시스템이
필요에 따라 프래그먼트의 상태를 저장하고 복원하는 데 사용하는 고유한 태그 이름입니다. 이 태그를 사용하면 {@link android.support.v4.app.FragmentManager#findFragmentByTag
findFragmentByTag()}를 호출하여 해당 프래그먼트를 파악할 수도 있습니다.
</p>
@@ -630,20 +630,20 @@
<h2 id="FullscreenDialog">대화를 전체 화면으로 또는 포함된 프래그먼트로 표시</h2>
-<p>UI 디자인에서, 몇몇 상황 하에서는 UI의 한 조각을 대화로 나타내지만
-다른 상황에서는 전체 화면이나 포함된 프래그먼트로 나타내고자 하는 경우가 있을 수
+<p>UI 디자인에서, 몇몇 상황 하에서는 UI의 한 조각을 대화로 나타내지만
+다른 상황에서는 전체 화면이나 포함된 프래그먼트로 나타내고자 하는 경우가 있을 수
있습니다(이는 어쩌면 기기 화면이 대형인지 소형인지에 따라 달라질 수도 있습니다). {@link android.support.v4.app.DialogFragment}
클래스에서 이런 유연성을 제공하는 것은 이것이 여전히 포함 가능한 {@link
android.support.v4.app.Fragment} 역할을 할 수 있기 때문입니다.</p>
<p>그러나 이 경우에는 대화를 구축하는 데 {@link android.app.AlertDialog.Builder AlertDialog.Builder}
-또는 다른 {@link android.app.Dialog} 객체를 사용하면 안 됩니다.
-{@link android.support.v4.app.DialogFragment}를 포함 가능한 상태로 만들려면,
-레이아웃 안에 있는 대화의 UI를 정의해야 합니다. 그런 다음 레이아웃을
+또는 다른 {@link android.app.Dialog} 객체를 사용하면 안 됩니다.
+{@link android.support.v4.app.DialogFragment}를 포함 가능한 상태로 만들려면,
+레이아웃 안에 있는 대화의 UI를 정의해야 합니다. 그런 다음 레이아웃을
{@link android.support.v4.app.DialogFragment#onCreateView
onCreateView()} 콜백에 로딩합니다.</p>
-<p>다음은 대화 또는 포함 가능한 프래그먼트 중 어느 쪽으로든 표시될 수 있는
+<p>다음은 대화 또는 포함 가능한 프래그먼트 중 어느 쪽으로든 표시될 수 있는
{@link android.support.v4.app.DialogFragment} 예시입니다(<code>purchase_items.xml</code>이라는 레이아웃 사용).</p>
<pre>
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
@@ -695,14 +695,14 @@
}
</pre>
-<p>프래그먼트 트랜잭션을 수행하는 것에 대한 자세한 내용은
+<p>프래그먼트 트랜잭션을 수행하는 것에 대한 자세한 내용은
<a href="{@docRoot}guide/components/fragments.html">프래그먼트</a> 가이드를 참조하십시오.</p>
<p>이 예시에서는 <code>mIsLargeLayout</code> 부울이 현재 기기가 앱의 큰 레이아웃 디자인을 써야 할지를
나타냅니다(따라서 이 프래그먼트를 전체 화면보다는 대화로 표시).
- 이런 종류의 부울을 설정하는 가장 좋은 방법은
+ 이런 종류의 부울을 설정하는 가장 좋은 방법은
<a href="{@docRoot}guide/topics/resources/more-resources.html#Bool">부울 리소스 값</a>을
-여러 가지 화면 크기에 대한 <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">대체 리소스</a> 값으로 선언하는 것입니다.
+여러 가지 화면 크기에 대한 <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">대체 리소스</a> 값으로 선언하는 것입니다.
예를 들어 다음은 여러 가지 화면 크기에 대한 두 가지 버전의 부울 리소스입니다.</p>
<p class="code-caption">res/values/bools.xml</p>
@@ -721,7 +721,7 @@
</resources>
</pre>
-<p>그러면 액티비티의
+<p>그러면 액티비티의
{@link android.app.Activity#onCreate onCreate()} 메서드 중에 {@code mIsLargeLayout} 값을 초기화할 수 있습니다.</p>
<pre>
@@ -740,14 +740,14 @@
<h3 id="ActivityAsDialog">액티비티를 큰 화면에 대화로 표시</h3>
-<p>작은 화면의 경우 대화를 전체 화면 UI로 표시하는 대신, 큰 화면에 있을 때에는
+<p>작은 화면의 경우 대화를 전체 화면 UI로 표시하는 대신, 큰 화면에 있을 때에는
{@link android.app.Activity}를 대화로 표시함으로써 같은 결과를 얻을 수 있습니다.
- 어느 방식을 사용할 것인지는 앱 디자인에 따라 달라지지만,
-액티비티를 대화로 표시하면 앱이 이미 작은 화면용으로 디자인된 상태에서
-태블릿에서의 환경을 개선하기 위해 일시적인 액티비티를 대화로 표시하는 경우
+ 어느 방식을 사용할 것인지는 앱 디자인에 따라 달라지지만,
+액티비티를 대화로 표시하면 앱이 이미 작은 화면용으로 디자인된 상태에서
+태블릿에서의 환경을 개선하기 위해 일시적인 액티비티를 대화로 표시하는 경우
유용할 때가 많습니다.</p>
-<p>큰 화면의 경우 액티비티를 대화로만 표시하려면,
+<p>큰 화면의 경우 액티비티를 대화로만 표시하려면,
{@link android.R.style#Theme_Holo_DialogWhenLarge Theme.Holo.DialogWhenLarge}
테마를 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code
<activity>}</a> 매니페스트 요소에 적용하면 됩니다.</p>
@@ -762,11 +762,11 @@
<h2 id="DismissingADialog">대화 무시</h2>
-<p>사용자가
+<p>사용자가
{@link android.app.AlertDialog.Builder}로 생성한 작업 버튼 중 하나라도 터치하면 시스템이 대화를 대신 무시합니다.</p>
-<p>시스템은 사용자가 대화 목록에서 항목을 터치하는 경우에도 대화를 무시합니다.
-다만 목록이 무선 버튼이나 확인란을 사용하는 경우에는 예외입니다.
+<p>시스템은 사용자가 대화 목록에서 항목을 터치하는 경우에도 대화를 무시합니다.
+다만 목록이 무선 버튼이나 확인란을 사용하는 경우에는 예외입니다.
그렇지 않으면 대화를 수동으로 무시할 수도 있습니다. {@link
android.support.v4.app.DialogFragment}에서 {@link android.support.v4.app.DialogFragment#dismiss()}를 호출하면 됩니다.</p>
@@ -775,24 +775,24 @@
android.support.v4.app.DialogFragment}에서 @link
android.support.v4.app.DialogFragment#onDismiss onDismiss()}를 구현하면 됩니다.</p>
-<p>또한 대화를 <em>취소</em>할 수도 있습니다. 이것은 사용자가 작업을 완료하지 않고 대화를
-분명히 떠났다는 것을 나타내는 특수 이벤트입니다. 이것은 사용자가
-<em>뒤로</em> 버튼을 누르거나 대화 영역 바깥의 화면을 터치하거나,
+<p>또한 대화를 <em>취소</em>할 수도 있습니다. 이것은 사용자가 작업을 완료하지 않고 대화를
+분명히 떠났다는 것을 나타내는 특수 이벤트입니다. 이것은 사용자가
+<em>뒤로</em> 버튼을 누르거나 대화 영역 바깥의 화면을 터치하거나,
개발자가 {@link
android.app.Dialog}에서 명시적으로 {@link android.app.Dialog#cancel()}을 호출한 경우 발생합니다(예: 대화의 "취소" 버튼에 대한 응답으로).</p>
<p>위의 예시에 나타난 바와 같이 취소 이벤트에 응답하려면 {@link
-android.support.v4.app.DialogFragment} 클래스에서
+android.support.v4.app.DialogFragment} 클래스에서
{@link android.support.v4.app.DialogFragment#onCancel onCancel()}을 구현하면 됩니다.</p>
-<p class="note"><strong>참고:</strong> 시스템은
-{@link android.support.v4.app.DialogFragment#onCancel onCancel()} 콜백을 불러오는 이벤트가 발생할 때마다
-{@link android.support.v4.app.DialogFragment#onDismiss onDismiss()}를 호출합니다.
+<p class="note"><strong>참고:</strong> 시스템은
+{@link android.support.v4.app.DialogFragment#onCancel onCancel()} 콜백을 불러오는 이벤트가 발생할 때마다
+{@link android.support.v4.app.DialogFragment#onDismiss onDismiss()}를 호출합니다.
그러나 {@link android.app.Dialog#dismiss Dialog.dismiss()} 또는 {@link
-android.support.v4.app.DialogFragment#dismiss DialogFragment.dismiss()}를 호출하면
-시스템은 {@link android.support.v4.app.DialogFragment#onDismiss onDismiss()}는 호출하지만 {@link android.support.v4.app.DialogFragment#onCancel onCancel()}은
-호출하지 <em>않습니다</em>. 따라서 사용자가 대화를 보기에서 제거하기 위해 대화에 있는
-<em>긍정적인</em> 버튼을 누르는 경우, 일반적으로 {@link android.support.v4.app.DialogFragment#dismiss dismiss()}를
+android.support.v4.app.DialogFragment#dismiss DialogFragment.dismiss()}를 호출하면
+시스템은 {@link android.support.v4.app.DialogFragment#onDismiss onDismiss()}는 호출하지만 {@link android.support.v4.app.DialogFragment#onCancel onCancel()}은
+호출하지 <em>않습니다</em>. 따라서 사용자가 대화를 보기에서 제거하기 위해 대화에 있는
+<em>긍정적인</em> 버튼을 누르는 경우, 일반적으로 {@link android.support.v4.app.DialogFragment#dismiss dismiss()}를
사용해야 합니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/menus.jd b/docs/html-intl/intl/ko/guide/topics/ui/menus.jd
index c115c2a..924445d 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/menus.jd
@@ -72,7 +72,7 @@
<dl>
<dt><strong>옵션 메뉴 및 작업 모음</strong></dt>
<dd><a href="#options-menu">옵션 메뉴</a>는 액티비티에 대한 기본 메뉴 항목 컬렉션
-입니다.
+입니다.
이곳에 "검색", "이메일 작성" 및 "설정"과 같이 앱에 전체적인 영향을 미치는 작업을 배치해야 합니다.
<p>Android 2.3 이하를 대상으로 개발하는 경우 사용자는
<em>메뉴</em> 버튼을 눌러서 옵션 메뉴 패널을 표시할 수 있습니다.</p>
@@ -83,9 +83,9 @@
사용하기 시작해야 합니다.</p>
<p><a href="#options-menu">옵션 메뉴 만들기</a> 섹션을 참조하십시오.</p>
</dd>
-
+
<dt><strong>컨텍스트 메뉴 및 상황별 작업 모드</strong></dt>
-
+
<dd>컨텍스트 메뉴는 사용자가 요소를 길게 클릭하면 나타나는 <a href="#FloatingContextMenu">부동 메뉴</a>
입니다. 이것은 선택한 콘텐츠나 컨텍스트 프레임에
영향을 주는 작업을 제공합니다.
@@ -94,7 +94,7 @@
여러 항목을 선택할 수 있습니다.</p>
<p><a href="#context-menu">상황별 메뉴 만들기</a>에 관한 섹션을 참조하십시오.</p>
</dd>
-
+
<dt><strong>팝업 메뉴</strong></dt>
<dd>팝업 메뉴는 메뉴를 호출하는 보기에 고정된 수직 목록에서 항목 목록을
표시합니다. 이것은 정 콘텐츠와 관련이 되는 작업의 오버플로를 제공하거나
@@ -112,7 +112,7 @@
<p>모든 메뉴 유형에 대하여, Android는 표준 XML 형식으로 메뉴 항목을 정의합니다.
액티비티 코드에서 메뉴를 구축하는 대신
-XML <a href="{@docRoot}guide/topics/resources/menu-resource.html">메뉴 리소스</a>에서 메뉴와 모든 항목을 정의해야 합니다. 그러면
+XML <a href="{@docRoot}guide/topics/resources/menu-resource.html">메뉴 리소스</a>에서 메뉴와 모든 항목을 정의해야 합니다. 그러면
액티비티나 프래그먼트에서 메뉴 리소스를 팽창시킬 수 있습니다({@link android.view.Menu} 개체로 로딩하면 됩니다).
</p>
@@ -128,17 +128,17 @@
디렉터리에서 XML 파일을 생성하고 다음 요소로 메뉴를 구축합니다.</p>
<dl>
<dt><code><menu></code></dt>
- <dd>메뉴 항목의 컨테이너인 {@link android.view.Menu}를 정의합니다.
+ <dd>메뉴 항목의 컨테이너인 {@link android.view.Menu}를 정의합니다.
<code><menu></code> 요소는 파일의 루트 노드여야 하고 하나 이상의
<code><item></code>와 <code><group></code> 요소를 보유할 수 있습니다.</dd>
<dt><code><item></code></dt>
- <dd>메뉴 안의 항목 하나를 나타내는 {@link android.view.MenuItem}을 생성합니다.
+ <dd>메뉴 안의 항목 하나를 나타내는 {@link android.view.MenuItem}을 생성합니다.
이 요소 안에는 하위 메뉴를 생성하기 위한 중첩 <code><menu></code> 요소가 들어있을 수 있습니다.</dd>
-
+
<dt><code><group></code></dt>
<dd>{@code <item>} 요소를 위한 선택적인 투명 컨테이너입니다. 이것을 사용하면 활성 상태와 가시성 등의 속성을 공유할 수 있도록
-메뉴 항목을 분류하도록 해줍니다.
+메뉴 항목을 분류하도록 해줍니다.
자세한 정보를 보려면 <a href="#groups">메뉴 그룹 만들기</a>를 참조하십시오.</dd>
</dl>
@@ -207,7 +207,7 @@
<div class="figure" style="width:200px;margin:0">
<img src="{@docRoot}images/options_menu.png" height="333" alt="" />
- <p class="img-caption"><strong>그림 1.</strong> Android 2.3에서 실행되는
+ <p class="img-caption"><strong>그림 1.</strong> Android 2.3에서 실행되는
브라우저의 옵션 메뉴입니다.</p>
</div>
@@ -220,21 +220,21 @@
<ul>
<li><strong>Android 2.3.x(API 레벨 10)
이하</strong>에서 애플리케이션을 개발했을 경우,
-그림 1과 같이 사용자가 <em>메뉴</em> 버튼을 누르면 화면 아래에 옵션 메뉴의 콘텐츠가 나타납니다. 이것이 열렸을 때 가장 먼저 보이는 부분은
+그림 1과 같이 사용자가 <em>메뉴</em> 버튼을 누르면 화면 아래에 옵션 메뉴의 콘텐츠가 나타납니다. 이것이 열렸을 때 가장 먼저 보이는 부분은
아이콘
-메뉴이고, 이는 최대 여섯 개의 메뉴 항목을 보유합니다. 메뉴에 여섯 개를 넘는 항목이 포함되어 있는 경우, Android는
-여섯 번째 항목과 나머지 항목을 더보기 메뉴에 배치합니다. 이것은 사용자가
+메뉴이고, 이는 최대 여섯 개의 메뉴 항목을 보유합니다. 메뉴에 여섯 개를 넘는 항목이 포함되어 있는 경우, Android는
+여섯 번째 항목과 나머지 항목을 더보기 메뉴에 배치합니다. 이것은 사용자가
<em>더보기</em>를 선택하면 열 수 있습니다.</li>
<li><strong>Android 3.0(API 레벨 11)
이상</strong>에서 애플리케이션을 개발했을 경우, 옵션 메뉴의 항목은 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a>에서 이용할 수 있습니다. 기본적으로 시스템은 모든 항목을 작업 더보기에 배치합니다.
사용자는 작업 모음 오른쪽에 있는
-작업 더보기 아이콘으로 이를 표시할 수 있습니다(또는 이용할 수 있을 경우 기기 <em>메뉴</em> 버튼을 누르면 됩니다).
+작업 더보기 아이콘으로 이를 표시할 수 있습니다(또는 이용할 수 있을 경우 기기 <em>메뉴</em> 버튼을 누르면 됩니다).
중요한 작업에 대한 빠른 액세스를
활성화하려면
{@code android:showAsAction="ifRoom"}을 해당 {@code <item>} 요소에 추가하여 몇 가지 항목이 작업 모음에 표시되도록 수준을 올립니다(그림
2 참조). <p>작업 항목과 다른 작업 모음 동작에 관한 자세한 정보는 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a> 가이드를 참조하십시오. </p>
-<p class="note"><strong>참고:</strong> Andoid 3.0 이상을 대상으로 개발하지 <em>않더라도</em>
+<p class="note"><strong>참고:</strong> Andoid 3.0 이상을 대상으로 개발하지 <em>않더라도</em>
개발자 나름의 작업 모음 레이아웃을 구축하여 비슷한 효과를 낼 수 있습니다. 예를 들어,
작업 모음이 포함된 Android 이전 버전을 지원하는 방법은 <a href="{@docRoot}resources/samples/ActionBarCompat/index.html">작업 모음 호환성</a>
샘플을 참조하십시오.</p>
@@ -247,13 +247,13 @@
<p>{@link android.app.Activity}
하위 클래스나 {@link android.app.Fragment} 하위 클래스에서 옵션 메뉴용 항목을 선언할 수 있습니다. 액티비티와 프래그먼트가 모두
-옵션 메뉴용 항목을 선언할 경우, 이들은 UI에서 조합됩니다. 액티비티의 항목이 먼저 나타나고,
-뒤이어 각 프래그먼트의 항목이 나타나며 이때 순서는 각 프래그먼트가 액티비티에 추가된 순서를
+옵션 메뉴용 항목을 선언할 경우, 이들은 UI에서 조합됩니다. 액티비티의 항목이 먼저 나타나고,
+뒤이어 각 프래그먼트의 항목이 나타나며 이때 순서는 각 프래그먼트가 액티비티에 추가된 순서를
따릅니다. 필요한 경우 이동해야 하는 각 {@code <item>}에서{@code android:orderInCategory} 속성이 포함된
메뉴 항목을 다시 정렬할 수 있습니다.</p>
<p>액티비티에 대한 옵션 메뉴를 지정하려면 {@link
-android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()}를 재정의합니다(프래그먼트는
+android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()}를 재정의합니다(프래그먼트는
자신만의 {@link android.app.Fragment#onCreateOptionsMenu onCreateOptionsMenu()} 콜백을 제공합니다). 이 메서드에서
(<a href="#xml">XML에서 정의된</a>) 메뉴 리소스를 콜백에서 제공된 {@link
android.view.Menu}로 팽창할 수 있습니다. 예:</p>
@@ -283,7 +283,7 @@
<p>사용자가 옵션 메뉴에서 항목을 선택하면(작업 모음의 작업 항목 포함),
시스템이 액티비티의 {@link android.app.Activity#onOptionsItemSelected(MenuItem)
-onOptionsItemSelected()} 메서드를 호출합니다. 이 메서드가 선택한 {@link android.view.MenuItem}을 전달합니다. 항목을 식별하려면
+onOptionsItemSelected()} 메서드를 호출합니다. 이 메서드가 선택한 {@link android.view.MenuItem}을 전달합니다. 항목을 식별하려면
{@link android.view.MenuItem#getItemId()}을 호출하면 됩니다. 이 메서드는(메뉴 리소스의 {@code android:id} 속성으로 지정되거나
{@link android.view.Menu#add(int,int,int,int) add()} 메서드에 제공된 정수가 포함된) 메뉴 항목에 대한 고유 ID를 반환합니다
. 이 ID와
@@ -317,7 +317,7 @@
{@code true}를 반환하거나 모든 프래그먼트가 호출될 때까지 (각 프래그먼트가 추가된 순서대로) 각 프래그먼트에 대해 해당 메서드를 호출합니다.</p>
<p class="note"><strong>팁:</strong> Android 3.0에는
-{@code android:onClick} 속성을 사용하여 XML에 있는 메뉴 항목에 대한 온-클릭 동작을 정의하는 기능이 추가됩니다.
+{@code android:onClick} 속성을 사용하여 XML에 있는 메뉴 항목에 대한 온-클릭 동작을 정의하는 기능이 추가됩니다.
속성 값은 메뉴를 사용하여 액티비티가 정의한 메서드의 이름이어야 합니다. 메서드는
공개여야 하며 하나의 {@link android.view.MenuItem} 매개변수를 수락해야 합니다. 시스템이 이 메서드를 호출하면
메서드가 선택한 메뉴 항목을 전달합니다. 자세한 정보와 예시는 <a href="{@docRoot}guide/topics/resources/menu-resource.html">메뉴 리소스</a> 문서를 참조하십시오.</p>
@@ -326,14 +326,14 @@
{@link android.app.Activity#onCreateOptionsMenu(Menu)
onCreateOptionsMenu()}와 {@link android.app.Activity#onOptionsItemSelected(MenuItem)
-onOptionsItemSelected()} 메서드를 제외하고 아무것도 구현하지 않는 액티비티를 만드는 것을 고려해보십시오. 그런 다음 이 클래스를 같은 옵션 메뉴를 공유해야 하는 각 액티비티에 대해
+onOptionsItemSelected()} 메서드를 제외하고 아무것도 구현하지 않는 액티비티를 만드는 것을 고려해보십시오. 그런 다음 이 클래스를 같은 옵션 메뉴를 공유해야 하는 각 액티비티에 대해
확장하면 됩니다. 이렇게 하면 메뉴 작업을 처리하는 코드 세트 하나를 관리할 수 있고,
각 하위 클래스가 메뉴 동작을 상속합니다.
이런 하위 액티비티 중 하나에 메뉴 항목을 추가하려면,
해당 액티비티에서 {@link android.app.Activity#onCreateOptionsMenu(Menu)
onCreateOptionsMenu()}를 재정의하십시오. {@code super.onCreateOptionsMenu(menu)}를 호출하여
원래 메뉴 항목을 생성하고, {@link
-android.view.Menu#add(int,int,int,int) menu.add()}이 포함된 새로운 메뉴 항목을 추가합니다. 각각의 메뉴 항목에 대한 슈퍼클래스의 동작을
+android.view.Menu#add(int,int,int,int) menu.add()}이 포함된 새로운 메뉴 항목을 추가합니다. 각각의 메뉴 항목에 대한 슈퍼클래스의 동작을
재정의할 수도 있습니다.</p>
@@ -363,10 +363,10 @@
{@link android.app.Activity#invalidateOptionsMenu invalidateOptionsMenu()}를 호출하여
시스템이 {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}를 호출하도록 요청해야 합니다.</p>
-<p class="note"><strong>참고:</strong>
-현재 초점이 맞춰져 있는 {@link android.view.View}를 기반으로 한
-옵션 메뉴의 항목을 절대로 변경해서는 안 됩니다. 터치 모드에서는(사용자가 트랙볼이나 d-패드를 사용하지 않는 경우),
-보기가 초점을 취할 수 없으므로 옵션 메뉴에 있는 항목을 수정할
+<p class="note"><strong>참고:</strong>
+현재 초점이 맞춰져 있는 {@link android.view.View}를 기반으로 한
+옵션 메뉴의 항목을 절대로 변경해서는 안 됩니다. 터치 모드에서는(사용자가 트랙볼이나 d-패드를 사용하지 않는 경우),
+보기가 초점을 취할 수 없으므로 옵션 메뉴에 있는 항목을 수정할
근거로 초점을 사용해서는 결코 안 됩니다. {@link
android.view.View}의 컨텍스트에 민감한 메뉴를 제공하고자 하는 경우, <a href="#context-menu">컨텍스트 메뉴</a>를 사용하십시오.</p>
@@ -390,18 +390,18 @@
<ul>
<li><a href="#FloatingContextMenu">부동 컨텍스트 메뉴</a>를 사용합니다. 사용자가 컨텍스트 메뉴에 대한 지원을 선언하는 보기를 길게 클릭하면
(대화와 유사한) 메뉴 항목의 부동 목록이
-나타납니다. 사용자는 한 항목에서 한 번에 하나의 상황별
+나타납니다. 사용자는 한 항목에서 한 번에 하나의 상황별
작업을 수행할 수 있습니다.</li>
<li><a href="#CAB">상황별 작업 모드</a>를 사용합니다. 이 모드는 화면 위에 있는 막대에서 선택된 항목에 영향을 미치는 작업 항목이 포함된 <em>상황별 작업 막대</em>를 표시하는
{@link android.view.ActionMode}의 시스템 구현입니다.
- 이 모드가 활성 상태이면 사용자는
+ 이 모드가 활성 상태이면 사용자는
여러 개의 항목에서 한 작업을 한꺼번에 수행할 수 있습니다(앱이 이를 허용하는 경우).</li>
</ul>
<p class="note"><strong>참고:</strong> 상황별 작업 모드는 Android 3.0(API
레벨 11) 이상에서 이용할 수 있으며, 이용 가능할 때 컨텍스트 작업 표시용으로 기본 설정된 기술입니다.
- 앱이 3.0 이하의 버전을 지원할 경우 해당 기기에서는
+ 앱이 3.0 이하의 버전을 지원할 경우 해당 기기에서는
부동 컨텍스트 메뉴로 돌아가야 합니다.</p>
@@ -409,8 +409,8 @@
<p>부동 컨텍스트 메뉴를 제공하려면 다음과 같이 합니다.</p>
<ol>
- <li>컨텍스트 메뉴가 연관되어야 하는 {@link android.view.View}를 등록합니다. 그러려면
-{@link android.app.Activity#registerForContextMenu(View) registerForContextMenu()}를 호출하고 여기에
+ <li>컨텍스트 메뉴가 연관되어야 하는 {@link android.view.View}를 등록합니다. 그러려면
+{@link android.app.Activity#registerForContextMenu(View) registerForContextMenu()}를 호출하고 여기에
{@link android.view.View}를 전달하면 됩니다.
<p>액티비티가 {@link android.widget.ListView} 또는 {@link android.widget.GridView}를 사용하고
각 항목이 같은 컨텍스트 메뉴를 제공하게 하고 싶을 경우,
@@ -419,7 +419,7 @@
</li>
<li>{@link android.app.Activity}나 {@link android.app.Fragment}에서 {@link
-android.view.View.OnCreateContextMenuListener#onCreateContextMenu onCreateContextMenu()} 메서드를
+android.view.View.OnCreateContextMenuListener#onCreateContextMenu onCreateContextMenu()} 메서드를
구현합니다.
<p>등록된 보기가 롱-클릭 이벤트를 수신하면, 시스템이 {@link
android.view.View.OnCreateContextMenuListener#onCreateContextMenu onCreateContextMenu()}
@@ -437,9 +437,9 @@
<p>{@link android.view.MenuInflater}를 사용하면 <a href="{@docRoot}guide/topics/resources/menu-resource.html">메뉴 리소스</a>에서 컨텍스트 메뉴를 팽창하게 해줍니다. 콜백 메서드
매개변수에는 사용자가 선택한 {@link android.view.View}와
-선택한 항목에 대한 추가 정보를 제공하는 {@link android.view.ContextMenu.ContextMenuInfo} 객체가
-포함됩니다. 액티비티에 여러 개의 보기가 있고 이들이 각각 서로 다른 컨텍스트 메뉴를 제공하는 경우,
-이와 같은 매개변수를 사용하여 팽창할 컨텍스트 메뉴가 무엇인지
+선택한 항목에 대한 추가 정보를 제공하는 {@link android.view.ContextMenu.ContextMenuInfo} 객체가
+포함됩니다. 액티비티에 여러 개의 보기가 있고 이들이 각각 서로 다른 컨텍스트 메뉴를 제공하는 경우,
+이와 같은 매개변수를 사용하여 팽창할 컨텍스트 메뉴가 무엇인지
판별할 수 있습니다.</p>
</li>
@@ -470,8 +470,8 @@
XML에서 메뉴 정의</a> 섹션에 나타난 바와 같이 {@code
android:id} 속성을 사용하여 XML의 각 메뉴 항목에 이를 할당해야 합니다.</p>
-<p>메뉴 항목을 성공적으로 처리하면 {@code true}를 반환합니다. 메뉴 항목을 처리하지 않는 경우,
-해당 메뉴 항목을 슈퍼클래스 구현에 전달해야 합니다. 액티비티에 프래그먼트가 포함되어 있는 경우
+<p>메뉴 항목을 성공적으로 처리하면 {@code true}를 반환합니다. 메뉴 항목을 처리하지 않는 경우,
+해당 메뉴 항목을 슈퍼클래스 구현에 전달해야 합니다. 액티비티에 프래그먼트가 포함되어 있는 경우
해당 액티비티가 첫 번째로 이 콜백을 수신합니다. 처리되지 않을 때 슈퍼클래스를 호출하면 시스템이
이벤트를 각 프래그먼트의 각 콜백 메서드에 전달합니다.
{@code true} 또는 {@code false}가 반환될 때까지 (각 프래그먼트가 추가된 순서대로) 한 번에 하나씩 전달됩니다 (
@@ -484,7 +484,7 @@
<h3 id="CAB">상황별 동작 모드 사용</h3>
<p>상황별 작업 모드는 사용자 상호 작용을 컨텍스트 작업 수행에 집중시키는 {@link android.view.ActionMode}의
-시스템 구현입니다. 사용자가 항목을 선택하여
+시스템 구현입니다. 사용자가 항목을 선택하여
이 모드를 활성화하면, <em>상황별 작업 모음</em>이 화면 위에 나타나서
사용자가 현재 선택된 항목에서 수행할 수 있는 작업을 표시합니다. 이 모드가
활성화되면 사용자는 여러 항목을 선택하고(개발자가 이를 허용하는 경우), 항목을 선택 해제하고, 액티비티 내에서
@@ -492,15 +492,15 @@
작업 모음 왼쪽의 <em>완료</em> 작업을 누르면 작업 모드가 비활성화되고 상황별 작업 모음이 사라집니다.</p>
-<p class="note"><strong>참고:</strong> 상황별 작업 모음이
-반드시 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a>과 연관되어 있는 것은 아닙니다. 이들은 서로
-독립적으로 작동합니다. 이는 겉으로 보기에는 상황별 작업 모음이 작업 모음의 위치를 능가하는 것으로
+<p class="note"><strong>참고:</strong> 상황별 작업 모음이
+반드시 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a>과 연관되어 있는 것은 아닙니다. 이들은 서로
+독립적으로 작동합니다. 이는 겉으로 보기에는 상황별 작업 모음이 작업 모음의 위치를 능가하는 것으로
보이더라도 적용됩니다.</p>
-<p>Android 3.0 (API level 11) 이상을 대상으로 개발하는 경우,
+<p>Android 3.0 (API level 11) 이상을 대상으로 개발하는 경우,
일반적으로 상황별 작업 모드를 사용하여 <a href="#FloatingContextMenu">부동 컨텍스트 메뉴</a>가 아닌 상황별 작업을 표시합니다.</p>
-<p>상황별 작업을 제공하는 보기의 경우, 일반적으로 두 이벤트 중 하나(또는 두 가지 모두)에서 상황별 작업 모드를
+<p>상황별 작업을 제공하는 보기의 경우, 일반적으로 두 이벤트 중 하나(또는 두 가지 모두)에서 상황별 작업 모드를
호출해야 합니다.</p>
<ul>
<li>사용자가 보기에서 롱-클릭을 수행합니다.</li>
@@ -521,11 +521,11 @@
<h4 id="CABforViews">각각의 보기에 대한 상황별 작업 모드의 활성화</h4>
-<p>사용자가 특정 보기를 선택했을 때만 상황별 작업 모드를 호출하고자 하는 경우
+<p>사용자가 특정 보기를 선택했을 때만 상황별 작업 모드를 호출하고자 하는 경우
다음과 같이 해야 합니다.</p>
<ol>
- <li>{@link android.view.ActionMode.Callback} 인터페이스를 구현합니다. 콜백 메서드에서
-상황별 작업 모음의 작업을 지정하고, 작업 항목에 대한 클릭 이벤트에 응답하고, 작업 모드에 대한
+ <li>{@link android.view.ActionMode.Callback} 인터페이스를 구현합니다. 콜백 메서드에서
+상황별 작업 모음의 작업을 지정하고, 작업 항목에 대한 클릭 이벤트에 응답하고, 작업 모드에 대한
다른 수명 주기 이벤트를 처리합니다.</li>
<li>모음을 표시하고자 하는 경우{@link android.app.Activity#startActionMode startActionMode()}를 호출합니다
(사용자가 보기를 롱-클릭하는 경우).</li>
@@ -579,11 +579,11 @@
android.view.ActionMode} 객체를 전달합니다. {@link
android.view.ActionMode} API를 사용하여
{@link android.view.ActionMode#setTitle setTitle()}과 {@link
-android.view.ActionMode#setSubtitle setSubtitle()}이 포함된 제목과 하위 제목을 수정하는 등과 같이 CAB를 다양하게 변경합니다(몇 개의
+android.view.ActionMode#setSubtitle setSubtitle()}이 포함된 제목과 하위 제목을 수정하는 등과 같이 CAB를 다양하게 변경합니다(몇 개의
항목이 선택되었는지 나타낼 때 유용합니다).</p>
<p>또한, 위 샘플은 작업 모드가 소멸될 때 {@code mActionMode} 변수를 null로
-설정한다는 점도 유의하십시오. 다음 단계에서는 액티비티나 프래그먼트의 구성원 변수를 초기화하고 저장하는 방법을
+설정한다는 점도 유의하십시오. 다음 단계에서는 액티비티나 프래그먼트의 구성원 변수를 초기화하고 저장하는 방법을
볼 수 있습니다.</p>
</li>
@@ -608,10 +608,10 @@
</pre>
<p>{@link android.app.Activity#startActionMode startActionMode()}를 호출하면 시스템이
-생성된 {@link android.view.ActionMode}를 반환합니다. 이것을 구성원 변수에 저장하면
+생성된 {@link android.view.ActionMode}를 반환합니다. 이것을 구성원 변수에 저장하면
다른 이벤트에 대한 응답으로 상황별 작업 모음을 변경할 수 있습니다. 위 샘플에서
{@link android.view.ActionMode}를 사용하여 {@link android.view.ActionMode} 인스턴스가 이미 활성화되었을 경우
-작업 모드를 시작하기 전에 구성원이 null인지 여부를 점검하여
+작업 모드를 시작하기 전에 구성원이 null인지 여부를 점검하여
해당 인스턴스가 재생성되지 않게 합니다.</p>
</li>
</ol>
@@ -621,13 +621,13 @@
<h4 id="CABforListView">ListView 또는 GridView에서 일괄 상황별 작업 활성화</h4>
<p>{@link android.widget.ListView} 또는 {@link
-android.widget.GridView}(또는 {@link android.widget.AbsListView}의 또 다른 확장)에 항목 컬렉션이 있고
+android.widget.GridView}(또는 {@link android.widget.AbsListView}의 또 다른 확장)에 항목 컬렉션이 있고
사용자가 일괄 작업을 수행하도록 허용하려면 다음과 같이 해야 합니다.</p>
<ul>
- <li>{@link android.widget.AbsListView.MultiChoiceModeListener} 인터페이스를 구현하고 이를
+ <li>{@link android.widget.AbsListView.MultiChoiceModeListener} 인터페이스를 구현하고 이를
{@link android.widget.AbsListView#setMultiChoiceModeListener
-setMultiChoiceModeListener()}가 있는 보기 그룹에 대해 설정합니다. 수신기 콜백 메서드에서 상황별 작업 모음에 대한
+setMultiChoiceModeListener()}가 있는 보기 그룹에 대해 설정합니다. 수신기 콜백 메서드에서 상황별 작업 모음에 대한
작업을 지정하고, 작업 항목에 대한 클릭 이벤트에 대응하고,
{@link android.view.ActionMode.Callback} 인터페이스에서 상속한 다른 콜백을 처리할 수 있습니다.</li>
@@ -690,10 +690,10 @@
메서드를 호출하고 지정된 작업으로 상황별 작업 모음을 표시합니다. 상황별 작업 모음이 표시되는 동안
사용자가 추가 항목을 선택할 수 있습니다.</p>
-<p>상황별 작업이 공통 작업 항목을 제공하는 몇몇 경우,
-확인란이나 그와 비슷한 UI요소를 추가하여 사용자가 항목을 선택할 수 있도록 해주는 것이 좋습니다.
-사용자가 롱-클릭 동작을 발견하지 못할 수도 있기 때문입니다. 사용자가 확인란을 선택하면
-{@link android.widget.AbsListView#setItemChecked setItemChecked()}로
+<p>상황별 작업이 공통 작업 항목을 제공하는 몇몇 경우,
+확인란이나 그와 비슷한 UI요소를 추가하여 사용자가 항목을 선택할 수 있도록 해주는 것이 좋습니다.
+사용자가 롱-클릭 동작을 발견하지 못할 수도 있기 때문입니다. 사용자가 확인란을 선택하면
+{@link android.widget.AbsListView#setItemChecked setItemChecked()}로
확인된 상태에 각 목록 항목을 설정하여 상황별 작업 모드를 호출할 수 있습니다.</p>
@@ -703,19 +703,19 @@
<div class="figure" style="width:220px">
<img src="{@docRoot}images/ui/popupmenu.png" alt="" />
-<p><strong>그림 4.</strong> Gmail 앱의 팝업 메뉴는 오른쪽 위에 있는 더보기
+<p><strong>그림 4.</strong> Gmail 앱의 팝업 메뉴는 오른쪽 위에 있는 더보기
버튼에 고정되어 있습니다.</p>
</div>
<p>{@link android.widget.PopupMenu}는 {@link android.view.View}에 고정된 모달 메뉴입니다.
이것은 앵커 보기 아래에 공간이 있으면 아래에, 없으면 보기 위에 나타납니다. 이것은 다음과 같은 상황에 유용합니다.</p>
<ul>
- <li>특정 콘텐츠와 <em>관련된</em> 작업에 대한 더보기 스타일 메뉴를 제공합니다(예:
+ <li>특정 콘텐츠와 <em>관련된</em> 작업에 대한 더보기 스타일 메뉴를 제공합니다(예:
그림 4의 Gmail 이메일 헤더 등).
- <p class="note"><strong>참고:</strong> 이것은 컨텍스트 메뉴와는 다릅니다. 컨텍스트 메뉴는
+ <p class="note"><strong>참고:</strong> 이것은 컨텍스트 메뉴와는 다릅니다. 컨텍스트 메뉴는
일반적으로 선택된 콘텐츠에 <em>영향을 미치는</em> 작업입니다. 선택된
콘텐츠에 영향을 미치는 작업의 경우, <a href="#CAB">상황별 작업 모드</a> 또는 <a href="#FloatingContextMenu">부동 컨텍스트 메뉴</a>를 사용하십시오.</p></li>
- <li>명령문의 두 번째 부분을 제공합니다(예: "추가"라고 표시된 버튼으로,
+ <li>명령문의 두 번째 부분을 제공합니다(예: "추가"라고 표시된 버튼으로,
각기 다른 "추가" 옵션이 있는 팝업 메뉴를 발생시킵니다).</li>
<li>영구적인 선택이 포함되지 않은 {@link android.widget.Spinner}와 유사한 드롭다운을 제공합니다.
</li>
@@ -727,23 +727,23 @@
<p><a href="#xml">XML로 메뉴를 정의</a>하는 경우, 팝업 메뉴를 표시하는 방법은 다음과 같습니다.</p>
<ol>
- <li>자신의 생성자로 {@link android.widget.PopupMenu}를 인스턴트화합니다. 생성자는
-현재 애플리케이션 {@link android.content.Context} 및 {@link android.view.View}를
+ <li>자신의 생성자로 {@link android.widget.PopupMenu}를 인스턴트화합니다. 생성자는
+현재 애플리케이션 {@link android.content.Context} 및 {@link android.view.View}를
메뉴를 고정시켜야 하는 곳에 가져갑니다.</li>
<li>{@link android.view.MenuInflater}를 사용하여{@link
android.widget.PopupMenu#getMenu() PopupMenu.getMenu()}가 반환한 {@link
-android.view.Menu} 객체에 메뉴 리소스를 팽창합니다. API 레벨 14 이상에서는 이 대신
+android.view.Menu} 객체에 메뉴 리소스를 팽창합니다. API 레벨 14 이상에서는 이 대신
{@link android.widget.PopupMenu#inflate PopupMenu.inflate()}를 사용할 수 있습니다.</li>
<li>{@link android.widget.PopupMenu#show() PopupMenu.show()}를 호출합니다.</li>
</ol>
-<p>예를 들어, 다음은 팝업 메뉴를 표시하는 {@link android.R.attr#onClick android:onClick} 속성이
+<p>예를 들어, 다음은 팝업 메뉴를 표시하는 {@link android.R.attr#onClick android:onClick} 속성이
있는 버튼입니다.</p>
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -763,7 +763,7 @@
<p>API 레벨 14 이상의 경우, {@link
android.widget.PopupMenu#inflate PopupMenu.inflate()}로 메뉴를 팽창하는 두 개의 줄을 결합시킬 수 있습니다.</p>
-<p>사용자가 항목을 선택하거나 메뉴 영역 바깥쪽을 터치하면 이 메뉴는
+<p>사용자가 항목을 선택하거나 메뉴 영역 바깥쪽을 터치하면 이 메뉴는
무시됩니다. {@link
android.widget.PopupMenu.OnDismissListener}를 사용하여 무시 이벤트를 수신 대기할 수 있습니다.</p>
@@ -807,7 +807,7 @@
<h2 id="groups">메뉴 그룹 만들기</h2>
-<p>메뉴 그룹은 특정한 특성을 공유하는 메뉴 항목의 컬렉션입니다. 그룹으로 다음과 같은 작업을
+<p>메뉴 그룹은 특정한 특성을 공유하는 메뉴 항목의 컬렉션입니다. 그룹으로 다음과 같은 작업을
할 수 있습니다.</p>
<ul>
<li>{@link android.view.Menu#setGroupVisible(int,boolean)
@@ -840,11 +840,11 @@
</menu>
</pre>
-<p>그룹에 있는 항목은 첫 항목과 같은 레벨에서 표시됩니다. 메뉴 안에 있는 세 가지 항목은 모두
-형제입니다. 그러나 이 그룹에 있는 항목 두 개의 특성을 개발자가 수정할 수 있습니다.
-그룹 ID를 참조하고 위에 나령된 메서드를 사용하면 됩니다. 시스템 또한
+<p>그룹에 있는 항목은 첫 항목과 같은 레벨에서 표시됩니다. 메뉴 안에 있는 세 가지 항목은 모두
+형제입니다. 그러나 이 그룹에 있는 항목 두 개의 특성을 개발자가 수정할 수 있습니다.
+그룹 ID를 참조하고 위에 나령된 메서드를 사용하면 됩니다. 시스템 또한
그룹화된 항목은 절대 분리하지 않습니다. 예를 들어, 각 항목에 대해 {@code
-android:showAsAction="ifRoom"}을 선언하면, 두 가지 모두 작업 모음에 나타나거나
+android:showAsAction="ifRoom"}을 선언하면, 두 가지 모두 작업 모음에 나타나거나
작업 더보기에 나타납니다.</p>
@@ -852,23 +852,23 @@
<div class="figure" style="width:200px">
<img src="{@docRoot}images/radio_buttons.png" height="333" alt="" />
- <p class="img-caption"><strong>그림 5.</strong> 확인 가능한
+ <p class="img-caption"><strong>그림 5.</strong> 확인 가능한
항목이 있는 하위 메뉴의 스크린샷입니다.</p>
</div>
-<p>메뉴는 옵션을 켜고 끄거나, 독립적 옵션에 대한 확인란으로 사용하거나,
-상호 배타적인 옵션의 그룹에 대한 무선 버튼으로 사용하기 위한 인터페이스로
+<p>메뉴는 옵션을 켜고 끄거나, 독립적 옵션에 대한 확인란으로 사용하거나,
+상호 배타적인 옵션의 그룹에 대한 무선 버튼으로 사용하기 위한 인터페이스로
유용합니다. 그림 5는 무선 버튼이 있으며 확인 가능한 항목이 포함된 하위 메뉴를
표시합니다.</p>
-<p class="note"><strong>참고:</strong> (옵션 메뉴의) 아이콘 메뉴의 메뉴 항목은
-확인란이나 무선 버튼을 표시할 수 없습니다. 확인 가능한 아이콘 메뉴에서 항목을 만들기로 선택하는 경우,
-상태가 변경될 때마다 아이콘 및/또는 텍스트를 교체하여
+<p class="note"><strong>참고:</strong> (옵션 메뉴의) 아이콘 메뉴의 메뉴 항목은
+확인란이나 무선 버튼을 표시할 수 없습니다. 확인 가능한 아이콘 메뉴에서 항목을 만들기로 선택하는 경우,
+상태가 변경될 때마다 아이콘 및/또는 텍스트를 교체하여
확인된 상태를 수동으로 나타내야 합니다.</p>
<p>{@code <item>} 요소의 {@code
android:checkable} 속성을 사용하여 개별 메뉴 항목에 대한 확인 가능한 동작을 정의하거나
-{@code <group>} 요소에서 {@code android:checkableBehavior} 속성으로 전체 그룹에 대한 확인 가능한 동작을 사용할 수 있습니다.
+{@code <group>} 요소에서 {@code android:checkableBehavior} 속성으로 전체 그룹에 대한 확인 가능한 동작을 사용할 수 있습니다.
예를 들어, 이 메뉴 그룹의 모든 항목은 무선 버튼으로 확인할 수 있습니다.</p>
<pre>
@@ -893,15 +893,15 @@
<dd>확인할 수 있는 항목이 없습니다.</dd>
</dl>
-<p>{@code <item>} 요소의 {@code android:checked} 속성을 이용하여 항목에 기본 확인된 상태를 적용하고
+<p>{@code <item>} 요소의 {@code android:checked} 속성을 이용하여 항목에 기본 확인된 상태를 적용하고
{@link
android.view.MenuItem#setChecked(boolean) setChecked()} 메서드로 코드 내에서 이를 변경할 수 있습니다.</p>
<p>확인 가능한 항목이 선택되면, 시스템이 각 항목이 선택된 콜백 메서드를 호출합니다
-(예: {@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}). 바로 여기에서
-확인란의 상태를 설정해야 합니다. 확인란이나 무선 버튼은 자신의 상태를 자동으로
-변경하지 않기 때문입니다.
-{@link android.view.MenuItem#isChecked()}로 항목의 현재 상태를 (사용자가 이를 선택하기 전 상태 그대로) 쿼리하고 그런 다음
+(예: {@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}). 바로 여기에서
+확인란의 상태를 설정해야 합니다. 확인란이나 무선 버튼은 자신의 상태를 자동으로
+변경하지 않기 때문입니다.
+{@link android.view.MenuItem#isChecked()}로 항목의 현재 상태를 (사용자가 이를 선택하기 전 상태 그대로) 쿼리하고 그런 다음
{@link android.view.MenuItem#setChecked(boolean) setChecked()}로 확인된 상태를 설정할 수 있습니다. 예:</p>
<pre>
@@ -926,7 +926,7 @@
보이게 합니다.</p>
<p class="note"><strong>참고:</strong>
-확인 가능한 메뉴 항목은 세션별 기준으로만 사용하도록 만들어져 있으며 애플리케이션이 소멸된 후에는
+확인 가능한 메뉴 항목은 세션별 기준으로만 사용하도록 만들어져 있으며 애플리케이션이 소멸된 후에는
저장되지 않습니다. 사용자에 대해 저장하고자 하는 애플리케이션 설정이 있으면,
<a href="{@docRoot}guide/topics/data/data-storage.html#pref">공유 기본 설정</a>으로 해당 데이터를 저장해야 합니다.</p>
@@ -935,16 +935,16 @@
<h2 id="intents">인텐트에 기반한 메뉴 항목 추가</h2>
<p>{@link android.content.Intent}를 이용하여
-액티비티를 시작하는 메뉴 항목을 원할 수도 있습니다(액티비티가 본인의 애플리케이션 안에 있는 것이든 또 다른 애플리케이션에 있는 것이든 무관합니다). 사용하고자 하는 인텐트를 알고
+액티비티를 시작하는 메뉴 항목을 원할 수도 있습니다(액티비티가 본인의 애플리케이션 안에 있는 것이든 또 다른 애플리케이션에 있는 것이든 무관합니다). 사용하고자 하는 인텐트를 알고
인텐트를 시작해야 하는 특정 메뉴 항목이 있을 경우,
-항목에 대해 선택된 적절한 콜백 메서드에서 {@link android.app.Activity#startActivity(Intent) startActivity()}가
+항목에 대해 선택된 적절한 콜백 메서드에서 {@link android.app.Activity#startActivity(Intent) startActivity()}가
포함된 인텐트를 실행합니다(예: {@link
android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()} 콜백).</p>
-<p>그러나 사용자 기기에
+<p>그러나 사용자 기기에
해당 인텐트를 처리하는 애플리케이션이 있는지 모르는 경우, 이를 호출하는 메뉴 항목을 추가하면
해당 인텐트가 액티비티에 대해 확인되지 못해서 메뉴 항목이 기능하지 못할 수도 있습니다.
- 이것을 해결하기 위해 Android는 개발자가 동적으로 자신의 메뉴에 메뉴 항목을 추가할 수 있도록 허용합니다.
+ 이것을 해결하기 위해 Android는 개발자가 동적으로 자신의 메뉴에 메뉴 항목을 추가할 수 있도록 허용합니다.
이는 Android가 기기에서 개발자의 인텐트를 처리하는 액티비티를 찾을 경우에 해당됩니다.</p>
<p>인텐트를 수락하는 이용 가능한 액티비티에 기반하여 메뉴 항목을 추가하려면 다음과 같이 합니다.</p>
@@ -954,15 +954,15 @@
{@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE}, 기타 요구 사항으로 인텐트를 정의합니다.</li>
<li>{@link
android.view.Menu#addIntentOptions(int,int,int,ComponentName,Intent[],Intent,int,MenuItem[])
-Menu.addIntentOptions()}을 호출합니다. 그러면 Android가 인텐트를 수행하는 애플리케이션을 검색하고
+Menu.addIntentOptions()}을 호출합니다. 그러면 Android가 인텐트를 수행하는 애플리케이션을 검색하고
이들을 개발자의 메뉴에 추가합니다.</li>
</ol>
-<p>인텐트를 만족하는 애플리케이션이 설치되어 있지 않으면,
+<p>인텐트를 만족하는 애플리케이션이 설치되어 있지 않으면,
메뉴 항목이 추가되지 않습니다.</p>
<p class="note"><strong>참고:</strong>
-{@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE} 를 사용하여 화면에서 현재 선택된
+{@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE} 를 사용하여 화면에서 현재 선택된
요소를 처리합니다. 그러므로 이것은 {@link
android.app.Activity#onCreateContextMenu(ContextMenu,View,ContextMenuInfo)
onCreateContextMenu()}에서 메뉴를 생성할 때만 사용해야 합니다.</p>
@@ -995,7 +995,7 @@
<p>정의된 인텐트와 일치하는 인텐트 필터를 제공하는 것으로 발견된 각 액티비티에
인텐트 필터의 <code>android:label</code>를
-메뉴 항목 제목으로, 애플리케이션 아이콘을 메뉴 항목 아이콘으로 사용하여 메뉴 항목을 추가합니다.
+메뉴 항목 제목으로, 애플리케이션 아이콘을 메뉴 항목 아이콘으로 사용하여 메뉴 항목을 추가합니다.
{@link android.view.Menu#addIntentOptions(int,int,int,ComponentName,Intent[],Intent,int,MenuItem[])
addIntentOptions()} 메서드는 추가된 메뉴 항목 개수를 반환합니다.</p>
@@ -1007,10 +1007,10 @@
<h3 id="AllowingToAdd">다른 메뉴에 액티비티 추가 허용</h3>
-<p>본인의 액티비티의 서비스를 다른 애플리케이션에 제공하여 다른
+<p>본인의 액티비티의 서비스를 다른 애플리케이션에 제공하여 다른
애플리케이션의 메뉴에 본인의 애플리케이션이 추가되도록 할 수도 있습니다(위에서 설명한 것과 역할이 반대입니다).</p>
-<p>다른 애플리케이션 메뉴에 추가되려면, 인텐트 필터는 평소와 같이
+<p>다른 애플리케이션 메뉴에 추가되려면, 인텐트 필터는 평소와 같이
정의해야 하지만, 인텐트 필터 카테고리에 {@link android.content.Intent#CATEGORY_ALTERNATIVE}
및/또는{@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE} 값을
반드시 포함해야 합니다. 예:</p>
@@ -1023,9 +1023,9 @@
</intent-filter>
</pre>
-<p>인텐트 필터 작성에 관한 자세한 내용은
+<p>인텐트 필터 작성에 관한 자세한 내용은
<a href="/guide/components/intents-filters.html">인텐트와 인텐트 필터</a> 문서를 참조하십시오.</p>
-<p>이 기법을 사용하는 샘플 애플리케이션은
+<p>이 기법을 사용하는 샘플 애플리케이션은
<a href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">Note
Pad</a> 샘플 코드를 참조하십시오.</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..67305a9
--- /dev/null
+++ b/docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd
@@ -0,0 +1,589 @@
+page.title=다중 창 지원
+page.metaDescription=Android N에서 한 번에 둘 이상의 앱을 표시하도록 지원.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#overview">개요</a></li>
+ <li><a href="#lifecycle">다중 창 수명 주기</a></li>
+ <li><a href="#configuring">앱을 다중 창
+모드로 구성</a></li>
+ <li><a href="#running">앱을 다중 창 모드에서 실행</a></li>
+ <li><a href="#testing">앱의 다중 창 지원 테스트</a></li>
+ </ol>
+ <h2>참고 항목</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">다중 창
+ 플레이그라운드 샘플 앱</a></li>
+ <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Android N에서 다중 창을 준비하기 위한 5가지 팁</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N은 둘 이상의 앱을 동시에 표시하기 위한 지원을
+추가합니다. 핸드헬드 기기에서 두 개의 앱을 <em>화면 분할</em> 모드에서
+나란히 또는 상하로 실행할 수 있습니다. TV 기기에서 앱이
+<em>PIP(Picture-In-Picture)</em> 모드를 사용하는 경우 사용자가 다른 앱과 상호작용하는
+동안에 계속 동영상을 재생할 수 있습니다.
+</p>
+
+<p>
+ N Preview SDK로 앱을 빌드하는 경우, 앱이 다중 창
+표시를 처리하는 방식을 구성할 수 있습니다. 예를 들어, 액티비티의
+최소 허용 치수를 지정할 수 있습니다. 또한 앱에
+대해 다중 창 표시를 비활성화할 수도 있으며, 이 경우 시스템은 앱을 전체 화면 모드에서만
+표시합니다.
+</p>
+
+<h2 id="overview">개요</h2>
+
+<p>
+ Android N에서는 여러 앱이 동시에 화면을 공유할 수 있습니다. 예를 들어, 사용자가 화면을 분할하여 왼쪽에서는 웹페이지를
+보면서 오른쪽에서는 이메일을 작성할
+수 있습니다. 사용자 환경은 기기에 따라
+달라집니다.
+</p>
+
+<ul>
+ <li>Android N에서 실행되는 핸드헬드 기기는 화면 분할
+모드를 제공합니다. 이 모드에서 시스템은 화면을 두 개의 앱으로 채우고, 이
+앱을 나란히 또는 상하로 표시합니다. 사용자가 두 앱을 구분하는 분할선을 드래그하여 한 앱을 다른 앱보다
+더 크게 만들 수 있습니다.
+ </li>
+
+ <li>Android N을 실행하는 Nexus Player에서, 앱이
+<a href="picture-in-picture.html">PIP 모드</a>로 배치될 수 있으므로, 사용자가 검색을
+수행하거나 다른 앱과 상호작용하는 중에도 앱이 계속해서 콘텐츠를
+표시할 수 있습니다.
+ </li>
+
+ <li>더 큰 기기를 제조하는 업체는 자유형식
+모드를 선택할 수 있으며, 이 경우 사용자가 각 액티비티의 크기를 자유롭게 조정할 수 있습니다. 제조업체가 이 기능을 활성화하면, 기기는 화면 분할 모드 뿐만
+아니라 자유형식 모드를
+제공합니다.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>그림 1.</strong> 화면 분할 모드에서 나란히 실행 중인 두 앱.
+</p>
+
+<p>
+ 사용자가 다음과 같이 다중 창 모드로 전환할 수 있습니다.
+</p>
+
+<ul>
+ <li>사용자가 <a href="{@docRoot}guide/components/recents.html">Overview
+화면</a>을 열고 액티비티 제목을 길게 누르면,
+이 액티비티를 화면의 강조 표시된 부분으로 드래그하여
+다중 창 모드에 둘 수 있습니다.
+ </li>
+
+ <li>사용자가 Overview 버튼을 길게 누르면, 기기가 현재 액티비티를
+다중 창 모드에 두고 Overview 화면을 열며, 이 화면에서 사용자는 화면을
+공유하기 위한 또 다른 액티비티를 선택할 수 있습니다.
+ </li>
+</ul>
+
+<p>
+ 사용자는 여러 액티비티가 화면을 공유하는 동안 한 액티비티에서
+또 다른 액티비티로 데이터를 <a href="{@docRoot}guide/topics/ui/drag-drop.html">드래그 앤 드롭</a>할
+수 있습니다. (이전에는, 사용자가 단일 액티비티 내에서만
+데이터를 드래그 앤 드롭할 수 있었습니다.)
+</p>
+
+<h2 id="lifecycle">다중 창 수명 주기</h2>
+
+<p>
+ 다중 창 모드는 <a href="{@docRoot}training/basics/activity-lifecycle/index.html">액티비티
+수명 주기</a>를 변경하지 않습니다.
+</p>
+
+<p>
+ 다중 창 모드에서는, 사용자가 가장 최근에 상호작용했던 액티비티만
+지정된 시간에 활성화됩니다. 이 액티비티는 <em>최상위</em>로 간주됩니다.
+ 다른 모든 액티비티는 표시되어 있더라도 일시 정지된 상태입니다.
+ 그러나 시스템은 이러한 일시 정지되었지만 표시된 액티비티에게 표시되지
+않은 액티비티보다 더 높은 우선 순위를 부여합니다. 사용자가 일시 정지된 액티비티 중 하나와 상호작용하면, 해당
+액티비티가 재개되고 이전의 최상위 액티비티가 일시
+정지됩니다.
+</p>
+
+<p class="note">
+ <strong>참고:</strong> 다중 창 모드에서는 앱이 일시 정지된 상태에서도 여전히
+사용자에게 표시될 수 있습니다. 앱이 일시 정지된 동안에도 액티비티를
+계속해야 하는 경우도 있습니다. 예를 들어, 일시 정지 모드이지만 표시된
+동영상 재생 앱은 계속해서 동영상을 보여줘야 합니다. 이러한 이유로, 동영상을
+재생하는 액티비티는 {@link android.app.Activity#onPause onPause()} 핸들러에서
+동영상을 일시 정지하지 <em>않는</em> 것이 좋습니다.
+ 그 대신, {@link android.app.Activity#onStop
+ onStop()}에서 동영상을 일시 정지하고, {@link android.app.Activity#onStart
+ onStart()}에서 재생을 재개해야 합니다.
+</p>
+
+<p>
+ 사용자가 앱을 다중 창 모드에 놓으면
+시스템은, <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에 지정된 대로, 구성 변경을 액티비티에
+알려줍니다. 이 동작은 사용자가 앱의 크기를 조정하거나 앱을
+ 전체 화면 모드로 다시 전환할 때도 발생합니다.
+ 기본적으로, 이 변경에서 액티비티-수명 주기 관계는 기기 모드가
+ 세로 모드에서 가로 모드로 전환되었음을
+ 시스템이 앱에 알려줄 때와 동일합니다(단순 스왑 대신
+ 기기 치수가 변경되는 경우는 제외). <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에서 설명한
+대로, 액티비티 스스로 구성 변경을 처리하거나, 시스템이 액티비티를 소멸시키고
+새 치수로 다시 액티비티를 생성하도록 할 수
+있습니다.
+</p>
+
+<p>
+ 사용자가 창의 크기를 조정하여 한쪽 치수를 더 크게 만드는
+경우, 시스템은 사용자 작업에 맞게 액티비티의 크기를 조정하고 필요한
+경우 <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경</a>을 수행합니다. 앱이 새로 노출되는 영역에 그릴 때 지연이 발생하는 경우, 시스템은 {@link
+ android.R.attr#windowBackground windowBackground} 속성 또는 기본
+<code>windowBackgroundFallback</code> 스타일 속성에 의해
+지정된 색으로 이 영역을 임시로 채웁니다.
+</p>
+
+<h2 id="configuring">앱을 다중 창 모드로 구성</h2>
+
+<p>
+ 앱이 Android N을 대상으로 하는 경우, 앱의 액티비티가 다중
+창 표시를 지원하는지 여부와 지원 방법을 구성할 수 있습니다. 매니페스트에서 속성을 설정하여 크기와 레이아웃을 제어할
+수 있습니다.
+ 루트 액티비티의 속성 설정은 작업 스택 내의 모든
+ 액티비티에 적용됩니다. 예를 들어, 루트 액티비티의
+<code>android:resizeableActivity</code>가 true로 설정된 경우, 작업 스택에 있는 모든 액티비티의
+크기를 조정할 수 있습니다.
+</p>
+
+<p class="note">
+ <strong>참고:</strong> Android N보다 더 낮은 버전의 SDK로 다중 방향 앱을 빌드하는 경우
+사용자가 앱을 다중 창 모드에서 사용하면, 시스템이
+이 앱의 크기를 강제로 조정합니다. 앱이 예상치 못하게 동작할 수 있음을 사용자에게 경고하는
+대화 상자가 표시됩니다. 시스템은 고정
+방향 앱의 크기는 조정하지 <em>않습니다</em>. 사용자가
+다중 창 모드 하에서 고정 방향 앱을 열려고 시도하면,
+앱이 전체 화면을 차지합니다.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ 매니페스트의 <code><activity></code> 또는
+<code><application></code> 노드에서 이 속성을 설정하여 다중 창
+표시를 활성화하거나 비활성화합니다.
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ 이 속성을 true로 설정하면, 액티비티를 분할 화면 모드와 자유형식
+모드로 시작할 수 있습니다. 이 속성을 false로 설정하면, 액티비티가 다중 창 모드를 지원하지
+않습니다. 이 값이 false이고 사용자가
+다중 창 모드에서 액티비티를 시작하려고 시도하면, 액티비티가 전체 화면을
+차지합니다.
+</p>
+
+<p>
+ 앱이 Android N을 대상으로 하지만 이 속성에 값을 지정하지
+않은 경우, 이 속성의 기본값은 true가 됩니다.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ 이 속성을 매니페스트의 <code><activity></code> 노드에 설정하여
+액티비티가 PIP 표시를 지원하는지 여부를 나타냅니다. <code>android:resizeableActivity</code>가 false인 경우 이 속성이
+무시됩니다.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">레이아웃 속성</h3>
+
+<p>
+ Android N에서 <code><layout></code> 매니페스트 요소는
+다중 창 모드에서 액티비티가 동작하는 방식에 영향을 미치는
+여러 속성을 지원합니다.
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ 자유형식 모드에서 시작될 때 액티비티의 기본 너비.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ 자유형식 모드에서 시작될 때 액티비티의 기본 높이.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ 자유형식 모드에서 시작될 때 액티비티의 초기 배치. 적당한 값은
+{@link android.view.Gravity} 참조를 확인하세요.
+ </dd>
+
+ <dt>
+ <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
+ </dt>
+
+ <dd>
+ 화면 분할
+ 및 자유형식 모드에서 액티비티의 최소 높이 및 최소 너비. 사용자가 화면 분할 모드에서 디바이더를 이동하여 액티비티를
+지정된 최소값보다 더 작게 만드는 경우, 시스템은
+이 액티비티를 사용자가 요청한 크기로 자릅니다.
+ </dd>
+</dl>
+
+<p>
+ 예를 들어, 다음 코드는 액티비티가 자유형식 모드로 표시될
+때 이 액티비티의 기본 크기와 위치 및 최소 크기를
+지정하는 방법을 보여줍니다.
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalHeight="450dp"
+ android:minimalWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">앱을 다중 창 모드에서 실행</h2>
+
+<p>
+ Android N에서는 다중 창 모드에서 실행 가능한 앱을 지원하는 새로운
+기능을 제공합니다.
+</p>
+
+<h3 id="disabled-features">다중 창 모드에서 비활성화되는 기능</h3>
+
+<p>
+ 기기가 다중 창 모드에 있는 경우 일부 기능이 비활성화되거나
+무시되는데, 그 이유는 이들 기능은 기기 화면을 다른 액티비티
+또는 앱과 공유하는 액티비티에는 적합하지 않기 때문입니다. 이러한 기능에는 다음이 포함됩니다.
+
+<ul>
+ <li>일부 <a href="{@docRoot}training/system-ui/index.html">시스템 UI</a>
+사용자 지정 옵션이 비활성화됩니다. 예를 들어, 앱이 전체 화면 모드에서 실행되지
+않을 경우에는 상태 표시줄을 숨길 수 없습니다.
+ </li>
+
+ <li>시스템이 <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code> 속성의 변경을 무시합니다.
+ </li>
+</ul>
+
+<h3 id="change-notification">다중 창 변경 알림 및 쿼리</h3>
+
+<p>
+ 다중 창 표시를 지원하기 위해 다음과 같은 새 메서드가 {@link android.app.Activity}
+ 클래스에 추가되었습니다. 각 메서드에 대한 자세한 내용은
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
+참조</a>를 확인하세요.
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.isInMultiWindowMode()</code>
+ </dt>
+
+ <dd>
+ 액티비티가 다중 창 모드에 있는지를 알아내려면 이 메서드를 호출하세요.
+ </dd>
+
+ <dt>
+ <code>Activity.isInPictureInPictureMode()</code>
+ </dt>
+
+ <dd>
+ 액티비티가 PIP 모드에 있는지를 알아내려면 이 메서드를 호출하세요.
+
+ <p class="note">
+ <strong>참고:</strong> PIP 모드는 다중 창 모드의 특별한
+ 케이스입니다. <code>myActivity.isInPictureInPictureMode()</code>가
+true를 반환하면 <code>myActivity.isInMultiWindowMode()</code>도
+역시 true를 반환합니다.
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowModeChanged()</code>
+ </dt>
+
+ <dd>
+ 시스템은 액티비티가 다중 창 모드로 들어가거나
+ 이 모드에서 나올 때마다 이 메서드를 호출합니다. 시스템은 액티비티가 다중 창 모드로
+ 들어갈 때는 true 값을 메서드에 전달하고, 액티비티가 다중 창 모드에서
+ 나올 때는 false 값을 전달합니다.
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureModeChanged()</code>
+ </dt>
+
+ <dd>
+ 시스템은 액티비티가 PIP 모드로 들어가거나
+ 이 모드에서 나올 때마다 이 메서드를 호출합니다. 시스템은 액티비티가 PIP 모드로 들어갈 때는
+ true 값을 메서드에 전달하고, 액티비티가 PIP에서 나올 때는
+ false 값을 전달합니다.
+ </dd>
+</dl>
+
+<p>
+ 또한 이들 각 메서드의 {@link android.app.Fragment} 버전이
+있습니다(예: <code>Fragment.isInMultiWindowMode()</code>).
+</p>
+
+<h3 id="entering-pip">PIP 모드로 들어가기</h3>
+
+<p>
+ 액티비티를 PIP 모드에 두려면, 새로운 메서드인
+<code>Activity.enterPictureInPictureMode()</code>를 호출합니다. 기기가 PIP 모드를 지원하지 않으면 이 메서드는
+ 영향이 없습니다. 자세한 내용은
+<a href="picture-in-picture.html">PIP</a> 문서를 참조하세요.
+</p>
+
+<h3 id="launch">다중 창 모드에서 새 액티비티 시작</h3>
+
+<p>
+ 새 액티비티를 시작하는 경우, 가능하면 이 새 액티비티가 현재
+액티비티에 인접하여 표시되어야 함을 시스템에게 알려줄 수 있습니다. 이를 위해
+, 플래그
+<code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>를 사용합니다. 이 플래그를 전달하면
+다음과 같은 동작이 요청됩니다.
+</p>
+
+<ul>
+ <li>기기가 화면 분할 모드에 있는 경우,
+시스템은 시작한 액티비티 옆에 새 액티비티를 만들려고 시도하므로, 두 액티비티가
+화면을 공유합니다. 시스템이 이 작업을 수행할 수 있다고
+보장되지는 않지만, 가능하면 액티비티를 인접하게 만듭니다.
+ </li>
+
+ <li>기기가 화면 분할 모드에 있으면, 이 플래그가 영향을 미치지 않습니다.
+ </li>
+</ul>
+
+<p>
+ 기기가 자유형식 모드에 있고 새 액티비티를 시작 중인 경우,
+<code>ActivityOptions.setLaunchBounds()</code>를 호출하여 이 새 액티비티의 치수와 화면 위치를
+지정할 수 있습니다. 기기가 다중 창 모드에 있지 않으면, 이 메서드가 영향을
+미치지 않습니다.
+</p>
+
+<p class="note">
+ <strong>참고:</strong> 작업 스택 내에서 액티비티를 시작하는 경우,
+이 액티비티는 화면상의 액티비티를 대체하여, 모든 다중 창 속성을
+상속합니다. 새 액티비티를 다중 창 모드에서 별도 창으로 시작하려면,
+새 작업 스택에서 액티비티를 시작해야 합니다.
+</p>
+
+<h3 id="dnd">드래그 앤 드롭 지원</h3>
+
+<p>
+ 사용자는 두
+액티비티가 화면을 공유하는 동안 한 액티비티에서 다른 액티비티로 데이터를 <a href="{@docRoot}guide/topics/ui/drag-drop.html">드래그 앤 드롭</a>할
+수 있습니다. (이전에는, 사용자가 단일 액티비티 내에서만 데이터를 드래그 앤 드롭할
+ 수 있었습니다.) 이러한 이유로, 앱이 현재 지원하지 않는 경우에는 드래그 앤 드롭
+기능을 앱에 추가하는 것이 좋습니다.
+</p>
+
+<p>
+ N Preview SDK는 앱 간의 드래그 앤 드롭을 지원하기 위해 <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+패키지를 확장합니다. 다음과 같은 클래스와 메서드에 대한 자세한
+내용은, <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview
+SDK 참조</a>를 참조하세요.
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ 놓기를 수신하는 앱에 부여되는 권한을 지정하기
+위한 토큰 객체.
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ {@link android.view.View#startDrag View.startDrag()}의 새 별칭. 액티비티 간의 드래그 앤 드롭을 활성화하려면, 새 플래그
+<code>View.DRAG_FLAG_GLOBAL</code>을
+전달합니다. 수신자 액티비티에게 URI 권한을
+부여해야 하는 경우, 새 플래그
+<code>View.DRAG_FLAG_GLOBAL_URI_READ</code> 또는
+<code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>를 적절하게 전달합니다.
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ 현재 진행 중인 드래그 작업을 취소합니다. 드래그 작업을 발생시킨
+앱에 의해서만 호출될 수 있습니다.
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ 현재 진행 중인 드래그 작업의 드래그 그림자를 대체합니다. 드래그 작업을 발생시킨
+앱에 의해서만 호출될 수 있습니다.
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ {@link android.view.DragEvent}에 포함된 {@link
+android.content.ClipData}로 전달되는 콘텐츠 URI의 권한을 요청합니다.
+ </dd>
+</dl>
+
+<h2 id="testing">앱의 다중 창 지원 테스트</h2>
+
+<p>
+ 앱을 Android N용으로 업데이트하든 안하든 간에,
+Android N이 실행 중인 기기에서 사용자가 앱을 다중 창 모드로
+시작하려고 시도하는 경우, 앱이 다중 창 모드에서 어떻게 작동하는지 확인해야 합니다.
+</p>
+
+<h3 id="configuring">테스트 기기 구성</h3>
+
+<p>
+ 기기에 Android N을 설치하면, 화면 분할 모드가
+자동으로 지원됩니다.
+</p>
+
+<h3 id="test-non-n">앱이 N Preview SDK로 작성되지 않은 경우</h3>
+
+<p>
+ 앱을 N Preview SDK로 빌드하지 않았는데 사용자가
+앱을 다중 창 모드에서 사용하려고 시도하는 경우, 이 앱이 고정 방향을 선언하지
+않으면 시스템이 앱의 크기를 강제로 조정합니다.
+</p>
+
+<p>
+ 앱이 고정 방향을 선언하지 않은 경우, Android N이
+실행 중인 기기에서 앱을 시작해야 하며, 앱을 화면 분할 모드에
+두도록 시도해야 합니다. 앱의 크기를 강제로 조정하는 경우 사용자 환경이
+적절한지 확인하세요.
+</p>
+
+<p>
+ 앱이 고정 방향을 선언하는 경우, 앱을 다중 창 모드에
+두도록 시도해야 합니다. 이 때 앱이 전체 화면 모드에 남아있는지
+확인하세요.
+</p>
+
+<h3 id="test-mw">다중 창 모드를 지원하는 경우</h3>
+
+<p>
+ N Preview SDK로 앱을 작성했는데 다중 창 지원을 비활성화하지
+않은 경우, 화면 분할 및 자유형식 모드에서 다음과
+같은 동작을 확인하세요.
+</p>
+
+<ul>
+ <li>앱을 전체 화면 모드에서 시작한 다음, Overview 버튼을 길게 눌러서
+다중 창 모드로 전환합니다. 앱이 적절히 전환되는지 확인합니다.
+ </li>
+
+ <li>앱을 다중 창 모드에서 직접 시작하고, 이 앱이 적절히
+시작되는지 확인합니다. 다중 창 모드에서 앱을 시작하려면, Overview 버튼을
+누르고 앱의 제목 표시줄을 길게 누른 다음 화면의 강조 표시된 영역 중
+하나로 제목 표시줄을 끌어서 놓습니다.
+ </li>
+
+ <li>분할선을 끌어서 화면 분할 모드에서 앱의 크기를 조정합니다.
+ 작동 중단 없이 앱 크기가 조정되는지 확인하고, 필요한
+UI 요소가 표시되는지 확인합니다.
+ </li>
+
+ <li>앱에 최소 치수를 지정한 경우, 이 치수 아래로 앱 크기를
+조정해 봅니다. 지정된 최소값보다 더 작게 앱 크기를 조정할 수
+없는지 확인합니다.
+ </li>
+
+ <li>모든 테스트를 통해 앱의 성능이 적절한지 확인합니다. 예를 들어,
+앱 크기를 조정한 후 UI를 업데이트하기에 지연이
+너무 길지 않은지 확인합니다.
+ </li>
+</ul>
+
+<h4 id="test-checklist">테스트 검사 목록</h4>
+
+<p>
+ 다중 창 모드에서 앱의 성능을 확인하려면, 다음
+작업을 시도해 보세요. 별다른 설명이 없는 한, 화면 분할 및 다중 창 모드
+에서 모두 이들 작업을 시도해야 합니다.
+</p>
+
+<ul>
+ <li>다중 창 모드에 들어갔다 나갑니다.
+ </li>
+
+ <li>자신의 앱에서 다른 앱으로 전환하고, 앱이 표시는 되지만
+활성화되지 않은 동안에 적절히 동작하는지 확인합니다. 예를 들어, 앱이 동영상을 재생 중인 경우, 사용자가
+다른 앱과 상호작용하는 동안에 이 동영상이 계속 재생되는지
+확인합니다.
+ </li>
+
+ <li>화면 분할 모드에서, 분할선을 이동하여 앱을 더 크거나
+작게 만들어 봅니다. 앱을 나란히 또는 상하로 놓은 구성에서 이러한
+작업을 시도해 봅니다. 앱의 작동이 중단되지 않는지, 필수 기능이
+표시되는지, 그리고 크기 조정 작업이 너무 오래 걸리지 않는지
+확인합니다.
+ </li>
+
+ <li>빠르게 연속해서 여러 가지 크기 조정 작업을 수행합니다. 앱의 작동이 중단되거나 메모리가 누수되지
+않는지 확인합니다. 앱의 메모리 사용량을 확인하는
+방법에 대해서는 <a href="{@docRoot}tools/debugging/debugging-memory.html">RAM 사용량
+검사</a>를 참조하세요.
+ </li>
+
+ <li>여러 가지 다른 창 구성에서 앱을 정상적으로
+사용하고, 이 앱이 제대로 작동하는지 확인합니다. 텍스트를 읽을 수 있는지 확인하고, 해당
+UI 요소가 상호작용하기에 너무 작지 않은지 확인합니다.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">다중 창 지원을 비활성화한 경우</h3>
+
+<p>
+ <code>android:resizableActivity="false"</code>를 설정하여
+다중 창 지원을 비활성화한 경우, Android N을 실행 중인 기기에서
+앱을 시작해야 하며, 앱을 자유형식 및 화면
+분할 모드로 둬야 합니다. 이 때 앱이 전체 화면 모드에 남아있는지
+확인하세요.
+</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/ko/guide/topics/ui/notifiers/notifications.jd
index db55424..4d87df7 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/notifiers/notifications.jd
@@ -81,8 +81,8 @@
<strong>그림 2.</strong> 알림 창에 있는 알림입니다.
</p>
-<p class="note"><strong>참고:</strong> 따로 언급된 부분을 제외하고 이 가이드는
-버전 4 <a href="{@docRoot}tools/support-library/index.html">지원 라이브러리</a>의 {@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder} 클래스를
+<p class="note"><strong>참고:</strong> 따로 언급된 부분을 제외하고 이 가이드는
+버전 4 <a href="{@docRoot}tools/support-library/index.html">지원 라이브러리</a>의 {@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder} 클래스를
참조합니다.
클래스 {@link android.app.Notification.Builder Notification.Builder}는 Android
3.0(API 레벨 11)에 추가되었습니다.</p>
@@ -111,15 +111,15 @@
</p>
<ul>
<li>
-
+
{@link android.support.v4.app.NotificationCompat.Builder#setSmallIcon setSmallIcon()}이 설정한 작은 아이콘
</li>
<li>
-
+
{@link android.support.v4.app.NotificationCompat.Builder#setContentTitle setContentTitle()}이 설정한 제목
</li>
<li>
-
+
{@link android.support.v4.app.NotificationCompat.Builder#setContentText setContentText()}이 설정한 세부 텍스트
</li>
</ul>
@@ -132,8 +132,8 @@
<h3 id="Actions">알림 작업</h3>
<p>
선택 항목이기는 하지만 알림에 작업을 하나 이상 추가해야 합니다.
- 작업은 사용자가 알림에서
-애플리케이션의 {@link android.app.Activity}로 바로 갈 수 있게 하고, 여기에서 사용자는 하나 이상의 이벤트를 보거나
+ 작업은 사용자가 알림에서
+애플리케이션의 {@link android.app.Activity}로 바로 갈 수 있게 하고, 여기에서 사용자는 하나 이상의 이벤트를 보거나
더 많은 작업을 할 수 있습니다.
</p>
<p>
@@ -141,15 +141,15 @@
일반적으로 작업은
애플리케이션의 {@link android.app.Activity}를 엽니다. 또한, 알람 다시 알림이나 텍스트 메시지에 즉시 답장 등과 같은 추가 작업을 수행하는
알림 버튼을 추가할 수 있습니다.
-이 기능은 Android 4.1부터 사용할 수 있습니다. 추가 작업 버튼을 사용할 경우,
-앱의 {@link android.app.Activity}에서 해당 기능을 사용할 수 있게 해야 합니다.
+이 기능은 Android 4.1부터 사용할 수 있습니다. 추가 작업 버튼을 사용할 경우,
+앱의 {@link android.app.Activity}에서 해당 기능을 사용할 수 있게 해야 합니다.
자세한 정보는 <a href="#Compatibility">처리 호환성</a> 섹션을 참조하십시오.
</p>
<p>
- {@link android.app.Notification}에서 작업 자체는
-애플리케이션에서 {@link android.app.Activity}를 시작하는
-{@link android.content.Intent}가 포함된
-{@link android.app.PendingIntent}가 정의합니다.
+ {@link android.app.Notification}에서 작업 자체는
+애플리케이션에서 {@link android.app.Activity}를 시작하는
+{@link android.content.Intent}가 포함된
+{@link android.app.PendingIntent}가 정의합니다.
{@link android.app.PendingIntent}를 동작과 연관시키려면
{@link android.support.v4.app.NotificationCompat.Builder}의 적절한 메서드를 호출합니다. 예를 들어,
사용자가 알림 창의 알림 텍스트를 클릭했을 때 {@link android.app.Activity}를 시작하려면,
@@ -158,20 +158,20 @@
</p>
<p>
사용자가 알림을 클릭했을 때 {@link android.app.Activity}를 시작하는 동작이 가장 보편적인 작업
-시나리오입니다. 또한, 사용자가 알림을 무시했을 때 {@link android.app.Activity}를
-시작할 수도 있습니다. Android 4.1 이후부터는
+시나리오입니다. 또한, 사용자가 알림을 무시했을 때 {@link android.app.Activity}를
+시작할 수도 있습니다. Android 4.1 이후부터는
{@link android.app.Activity}를 작업 버튼에서 시작할 수 있습니다. 자세한 내용을 알아보려면
{@link android.support.v4.app.NotificationCompat.Builder} 참조 가이드를 읽어보십시오.
</p>
<!-- ------------------------------------------------------------------------------------------ -->
<h3 id="Priority">알림 우선 순위</h3>
<p>
- 원한다면, 알림에 우선 순위를 설정할 수 있습니다. 우선 순위는
+ 원한다면, 알림에 우선 순위를 설정할 수 있습니다. 우선 순위는
기기 UI에 알림 표시 방식을 암시하는 역할을 합니다.
알림 우선 순위를 설정하려면, {@link
android.support.v4.app.NotificationCompat.Builder#setPriority(int)
NotificationCompat.Builder.setPriority()}를 호출하고 {@link
-android.support.v4.app.NotificationCompat} 우선 순위 상수 중 하나에 전달합니다.
+android.support.v4.app.NotificationCompat} 우선 순위 상수 중 하나에 전달합니다.
우선 순위 수준은 {@link
android.support.v4.app.NotificationCompat#PRIORITY_MIN}(-2)에서 {@link
android.support.v4.app.NotificationCompat#PRIORITY_MAX}(2)까지 다섯 개가 있습니다. 별도의 설정이 없을 경우,
@@ -185,10 +185,10 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h3 id="SimpleNotification">단순 알림 만들기</h3>
<p>
- 다음 조각은 사용자가 알림을 클릭하면 알리는
+ 다음 조각은 사용자가 알림을 클릭하면 알리는
액티비티를 지정하는 단순한 알림을 나타냅니다. 이 코드는
-{@link android.support.v4.app.TaskStackBuilder} 객체를 생성하고 이를 사용하여
-해당 작업의 {@link android.app.PendingIntent}를 생성합니다. 이 패턴은
+{@link android.support.v4.app.TaskStackBuilder} 객체를 생성하고 이를 사용하여
+해당 작업의 {@link android.app.PendingIntent}를 생성합니다. 이 패턴은
<a href="#NotificationResponse">
액티비티를 시작할 때 탐색 보존</a> 섹션에서 자세히 설명합니다.
</p>
@@ -225,13 +225,13 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h3 id="ApplyStyle">알림에 확장 레이아웃 적용</h3>
<p>
- 확장된 보기에 알림을 나타나게 하려면,
+ 확장된 보기에 알림을 나타나게 하려면,
먼저 원하는 일반 보기 옵션으로 {@link android.support.v4.app.NotificationCompat.Builder} 객체를
생성합니다. 다음에는 확장된 레이아웃 객체의 인수로 {@link android.support.v4.app.NotificationCompat.Builder#setStyle
Builder.setStyle()}을 호출합니다.
</p>
<p>
- 확장 알림은 Android 4.1 이전 플랫폼에서 사용할 수 없다는 것을 명심하십시오.
+ 확장 알림은 Android 4.1 이전 플랫폼에서 사용할 수 없다는 것을 명심하십시오.
Android 4.1 이하 플랫폼에서 알림을 처리하는 방법은
<a href="#Compatibility">처리 호환성</a> 섹션을 참조하십시오.
</p>
@@ -264,7 +264,7 @@
<h3 id="Compatibility">처리 호환성</h3>
<p>
-
+
알림 기능을 설정하는 메서드가
지원 라이브러리 클래스 {@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder}에 있더라도 모든 알림 기능을 특정 버전에서 사용할 수 있는 것은 아닙니다.
예를 들어, 확장 알림에 따라 달라지는 작업 버튼은 Android
@@ -294,13 +294,13 @@
사용자가 알림을 클릭하면 알림을 시작시키는 방식으로 모든 사용자에게 {@link android.app.Activity}에서 알림 기능을
사용할 수 있게 합니다. 이를 위해,
-{@link android.app.Activity}를 위한 {@link android.app.PendingIntent}를 생성합니다.
+{@link android.app.Activity}를 위한 {@link android.app.PendingIntent}를 생성합니다.
{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent
setContentIntent()}를 호출하여 알림에 {@link android.app.PendingIntent}를 추가합니다.
</li>
<li>
이제 알림에서 사용하고자 하는 확장 알림 기능을 추가합니다. 또한, 사용자가 알림을 클릭하면 시작되는
-{@link android.app.Activity}에서 개발자가 추가한 모든 기능을
+{@link android.app.Activity}에서 개발자가 추가한 모든 기능을
사용할 수 있어야 합니다.
</li>
</ol>
@@ -310,18 +310,18 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h2 id="Managing">알림 관리</h2>
<p>
- 같은 유형의 이벤트에서 알림을 여러 번 발행해야 할 경우,
+ 같은 유형의 이벤트에서 알림을 여러 번 발행해야 할 경우,
완전히 새로운 알림을 만드는 것은 삼가야 합니다. 대신, 일부 값을 변경하거나 추가하거나, 두 가지 조치를 모두 취하여
이전 알림을 업데이트하는 것이 좋습니다.
</p>
<p>
예를 들어, Gmail은 읽지 않은 메시지 개수를 올리고 각 이메일의 요약을 알림에 추가하여
-새 이메일 도착을 알립니다. 이것을 일명
-알림을 "쌓는다"고 하며, 이는
+새 이메일 도착을 알립니다. 이것을 일명
+알림을 "쌓는다"고 하며, 이는
<a href="{@docRoot}design/patterns/notifications.html">알림</a> 디자인 가이드에 자세히 설명되어 있습니다.
</p>
<p class="note">
- <strong>참고:</strong> 이 Gmail 기능에는 "받은편지함" 확장 레이아웃이 필요한데,
+ <strong>참고:</strong> 이 Gmail 기능에는 "받은편지함" 확장 레이아웃이 필요한데,
이것은 Android 4.1부터 이용할 수 있는 확장 알림 기능의 일부입니다.
</p>
<p>
@@ -331,16 +331,16 @@
<p>
알림이 업데이트되도록 설정하려면,
{@link android.app.NotificationManager#notify(int, android.app.Notification) NotificationManager.notify()}를 호출하여 알림 ID와 함께 발행합니다.
- 알림을 발행한 후에 업데이트하려면,
-{@link android.support.v4.app.NotificationCompat.Builder} 객체를 업데이트하거나 생성하고,
-{@link android.app.Notification} 객체를 구축하고,
-이전에 사용한 것과 같은 ID로 {@link android.app.Notification}을 발행합니다. 이전 알림이
+ 알림을 발행한 후에 업데이트하려면,
+{@link android.support.v4.app.NotificationCompat.Builder} 객체를 업데이트하거나 생성하고,
+{@link android.app.Notification} 객체를 구축하고,
+이전에 사용한 것과 같은 ID로 {@link android.app.Notification}을 발행합니다. 이전 알림이
여전히 표시되는 경우, 시스템은
-{@link android.app.Notification} 객체의 콘텐츠에서 알림을 업데이트합니다. 이전 알림을 무시할 경우,
+{@link android.app.Notification} 객체의 콘텐츠에서 알림을 업데이트합니다. 이전 알림을 무시할 경우,
대신 새로운 알림이 생성됩니다.
</p>
<p>
- 다음 코드 조각은 발생한 이벤트 개수를 반영하여
+ 다음 코드 조각은 발생한 이벤트 개수를 반영하여
업데이트된 알림을 나타낸 것입니다. 이것은 알림을 쌓아 요약을 표시합니다.
</p>
<pre>
@@ -385,7 +385,7 @@
이 메서드도 현재 진행 중인 알림을 삭제합니다.
</li>
<li>
- {@link android.app.NotificationManager#cancelAll() cancelAll()}을 호출합니다.
+ {@link android.app.NotificationManager#cancelAll() cancelAll()}을 호출합니다.
이것은 이전에 발행한 알림을 모두 제거합니다.
</li>
</ul>
@@ -393,9 +393,9 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h2 id="NotificationResponse">액티비티를 시작할 때 탐색 보존</h2>
<p>
- 알림에서 {@link android.app.Activity}를 시작할 때는 사용자의 예상 탐색 경험을
-보존해야 합니다. <i>'뒤로'를 클릭하면</i> 사용자를 애플리케이션의 정상 작업 흐름을 거쳐 메인 스크린으로 보내고,
- <i>'최근'을 클릭하면</i>
+ 알림에서 {@link android.app.Activity}를 시작할 때는 사용자의 예상 탐색 경험을
+보존해야 합니다. <i>'뒤로'를 클릭하면</i> 사용자를 애플리케이션의 정상 작업 흐름을 거쳐 메인 스크린으로 보내고,
+ <i>'최근'을 클릭하면</i>
{@link android.app.Activity}를 별개의 작업으로 표시합니다. 탐색 경험을 보존하려면
새 작업에서 {@link android.app.Activity}를 시작해야 합니다. 새로운 작업을 부여하기 위한
{@link android.app.PendingIntent} 설정 방법은 시작하는
@@ -406,19 +406,19 @@
정규 액티비티
</dt>
<dd>
- 애플리케이션의 정상적 작업 흐름의 일부인 {@link android.app.Activity}를
+ 애플리케이션의 정상적 작업 흐름의 일부인 {@link android.app.Activity}를
시작합니다. 이 상황에서 {@link android.app.PendingIntent}를 설정하여
새 작업을 시작하고 애플리케이션의
정상적인 <i>'뒤로' </i>동작을 재현하는 백 스택으로 {@link android.app.PendingIntent}를 제공합니다.
<p>
- Gmail 앱에서 보낸 알림이 이것을 잘 보여줍니다. 하나의 이메일 메시지에 대한
-알림을 클릭하면 메시지 자체를 보게 됩니다. <b>뒤로</b>를 터치하면
+ Gmail 앱에서 보낸 알림이 이것을 잘 보여줍니다. 하나의 이메일 메시지에 대한
+알림을 클릭하면 메시지 자체를 보게 됩니다. <b>뒤로</b>를 터치하면
알림에서 들어간 것이 아니라 메인 스크린에서
Gmail에 들어간 것처럼 Gmail을 통해 메인 스크린으로 돌아갑니다.
</p>
<p>
- 이것은 알림을 터치하기만 하면 어느 애플리케이션에 있든 관계 없이 발생하는
-일입니다. 예를 들어, Gmail에서 메시지를 작성하다가
+ 이것은 알림을 터치하기만 하면 어느 애플리케이션에 있든 관계 없이 발생하는
+일입니다. 예를 들어, Gmail에서 메시지를 작성하다가
한 이메일에 대한 알림을 클릭하면 해당 이메일로 바로 이동합니다. <i>뒤로</i>
를 터치하면
작성 중인 메시지가 아니라 받은편지함과 메인 스크린으로 돌아갑니다.
@@ -429,18 +429,18 @@
</dt>
<dd>
{@link android.app.Activity}가 알림에서 시작될 경우 사용자에게는 이것만 보입니다.
- {@link android.app.Activity}는 알림 자체에서 표시하기 어려운 정보를 제공하므로
-어떤 면에서는 알림을 확장하는 셈입니다. 이 상황에서는,
-{@link android.app.PendingIntent}를 설정하고 새로운 작업에서 시작합니다.
-시작된 {@link android.app.Activity}는
-애플리케이션 액티비티 흐름의 일부가 아니므로 백 스택을 생성하지 않아도 됩니다. <i>뒤로</i>를 클릭하면 사용자는 여전히
+ {@link android.app.Activity}는 알림 자체에서 표시하기 어려운 정보를 제공하므로
+어떤 면에서는 알림을 확장하는 셈입니다. 이 상황에서는,
+{@link android.app.PendingIntent}를 설정하고 새로운 작업에서 시작합니다.
+시작된 {@link android.app.Activity}는
+애플리케이션 액티비티 흐름의 일부가 아니므로 백 스택을 생성하지 않아도 됩니다. <i>뒤로</i>를 클릭하면 사용자는 여전히
메인 스크린으로 돌아갑니다.
</dd>
</dl>
<!-- ------------------------------------------------------------------------------------------ -->
<h3 id="DirectEntry">정규 액티비티 PendingIntent 설정</h3>
<p>
- 직접 진입
+ 직접 진입
{@link android.app.Activity}를 시작하는 {@link android.app.PendingIntent}를 설정하려면 다음과 같은 단계를 따르십시오.
</p>
<ol>
@@ -448,7 +448,7 @@
매니페스트에서 애플리케이션의 {@link android.app.Activity} 계층을 정의합니다.
<ol style="list-style-type: lower-alpha;">
<li>
- Android 4.0.3 이전에 대한 지원을 추가합니다. 이렇게 하려면
+ Android 4.0.3 이전에 대한 지원을 추가합니다. 이렇게 하려면
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code>
요소를
@@ -506,39 +506,39 @@
TaskStackBuilder.create()}를 호출하여 스택 빌더를 생성합니다.
</li>
<li>
-
+
{@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()}을 호출하여 스택 빌더를 백 스택에 추가합니다.
매니페스트에서 정의한 계층의 각 {@link android.app.Activity}의 경우,
백 스택에
-{@link android.app.Activity}를 시작하는 {@link android.content.Intent} 객체가 포함됩니다. 이 메서드는 새로운 작업에서
+{@link android.app.Activity}를 시작하는 {@link android.content.Intent} 객체가 포함됩니다. 이 메서드는 새로운 작업에서
스택을 시작하는 플래그도 추가합니다.
<p class="note">
- <strong>참고:</strong>
+ <strong>참고:</strong>
{@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()}에 대한 인수가
-시작된 {@link android.app.Activity}의 참조이기는 하지만, 이 메서드 호출은
+시작된 {@link android.app.Activity}의 참조이기는 하지만, 이 메서드 호출은
{@link android.app.Activity}를 시작하는 {@link android.content.Intent}를 추가하지 않습니다. 대신, 그 부분은 다음 단계에서 해결합니다.
</p>
</li>
<li>
-
-{@link android.support.v4.app.TaskStackBuilder#addNextIntent addNextIntent()}를 호출하여 {@link android.app.Activity}를 시작하는 {@link android.content.Intent}를
+
+{@link android.support.v4.app.TaskStackBuilder#addNextIntent addNextIntent()}를 호출하여 {@link android.app.Activity}를 시작하는 {@link android.content.Intent}를
추가합니다.
첫 번째 단계에서 생성한 {@link android.content.Intent}를
{@link android.support.v4.app.TaskStackBuilder#addNextIntent addNextIntent()}에 대한 인수로 전달합니다.
</li>
<li>
- 필요할 경우
+ 필요할 경우
{@link android.support.v4.app.TaskStackBuilder#editIntentAt
TaskStackBuilder.editIntentAt()}을 호출하여 스택에서{@link android.content.Intent} 객체에 대한 인수를 추가합니다. 이것은 사용자가
<i>'뒤로'</i>를 사용하여 탐색할 때 대상{@link android.app.Activity}가 의미 있는 데이터를 표시하도록 보장하기 위해 때때로 필요한 절차입니다.
</li>
<li>
- 이 백 스택에 대한 {@link android.app.PendingIntent}를 가져옵니다. 이때
+ 이 백 스택에 대한 {@link android.app.PendingIntent}를 가져옵니다. 이때
{@link android.support.v4.app.TaskStackBuilder#getPendingIntent getPendingIntent()}를 호출하는 방법을 씁니다.
- 그러면 이 {@link android.app.PendingIntent}를
+ 그러면 이 {@link android.app.PendingIntent}를
{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent
setContentIntent()}에 대한 인수로 사용할 수 있습니다.
</li>
@@ -569,21 +569,21 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h3 id="ExtendedNotification">특수 액티비티 PendingIntent 설정</h3>
<p>
- 다음 섹션에서는 특수 액티비티
+ 다음 섹션에서는 특수 액티비티
{@link android.app.PendingIntent}를 설정하는 법을 설명합니다.
</p>
<p>
- 특수 {@link android.app.Activity}에는 백 스택이 필요하지 않습니다. 따라서 매니페스트에서 이것의
-{@link android.app.Activity} 계층을 정의하지 않아도 되고,
-백 스택을 구축하기 위해
-{@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()}을
-호출하지 않아도 됩니다. 대신 매니페스트를 사용하여 {@link android.app.Activity} 작업 옵션을 설정하고,
-{@link android.app.PendingIntent}를 생성하십시오. 이때
+ 특수 {@link android.app.Activity}에는 백 스택이 필요하지 않습니다. 따라서 매니페스트에서 이것의
+{@link android.app.Activity} 계층을 정의하지 않아도 되고,
+백 스택을 구축하기 위해
+{@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()}을
+호출하지 않아도 됩니다. 대신 매니페스트를 사용하여 {@link android.app.Activity} 작업 옵션을 설정하고,
+{@link android.app.PendingIntent}를 생성하십시오. 이때
{@link android.app.PendingIntent#getActivity getActivity()}를 호출하는 방법을 씁니다.
</p>
<ol>
<li>
- 매니페스트에서 다음 속성을 {@link android.app.Activity}에 대한
+ 매니페스트에서 다음 속성을 {@link android.app.Activity}에 대한
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
요소에 추가합니다.
<dl>
@@ -597,10 +597,10 @@
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">android:taskAffinity</a>=""</code>
</dt>
<dd>
- 이것은 개발자가 코드에서 설정하는
-{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK FLAG_ACTIVITY_NEW_TASK} 플래그와 더불어
-이 {@link android.app.Activity}가
-애플리케이션의 기본 작업으로 들어가지 않게 보장합니다. 애플리케이션의 기본 유사성을
+ 이것은 개발자가 코드에서 설정하는
+{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK FLAG_ACTIVITY_NEW_TASK} 플래그와 더불어
+이 {@link android.app.Activity}가
+애플리케이션의 기본 작업으로 들어가지 않게 보장합니다. 애플리케이션의 기본 유사성을
가지고 있는 기존 작업은 모두 영향을 받지 않습니다.
</dd>
<dt>
@@ -629,23 +629,23 @@
알림을 구축 및 발행합니다.
<ol style="list-style-type: lower-alpha;">
<li>
-
+
{@link android.app.Activity}를 시작하는 {@link android.content.Intent}를 생성합니다.
</li>
<li>
- {@link android.app.Activity}가 새로운, 빈 작업에서 시작되도록 설정합니다. 이때
-{@link android.content.Intent#setFlags setFlags()}를
+ {@link android.app.Activity}가 새로운, 빈 작업에서 시작되도록 설정합니다. 이때
+{@link android.content.Intent#setFlags setFlags()}를
{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK FLAG_ACTIVITY_NEW_TASK}
- 및
+ 및
{@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TASK FLAG_ACTIVITY_CLEAR_TASK} 플래그와 함께 호출하면 됩니다.
</li>
<li>
{@link android.content.Intent}에 필요한 다른 모든 옵션을 설정합니다.
</li>
<li>
- {@link android.app.PendingIntent}를 {@link android.content.Intent}로부터
+ {@link android.app.PendingIntent}를 {@link android.content.Intent}로부터
생성합니다. 이때 {@link android.app.PendingIntent#getActivity getActivity()}를 호출하면 됩니다.
- 그러면 이 {@link android.app.PendingIntent}를
+ 그러면 이 {@link android.app.PendingIntent}를
{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent
setContentIntent()}에 대한 인수로 사용할 수 있습니다.
</li>
@@ -687,24 +687,24 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h2 id="Progress">알림에서 진행 상태 표시</h2>
<p>
- 알림에는 사용자에게 진행 중인 작업의 상태를 보여주는
-애니메이션 진행 표시기를 포함할 수 있습니다. 작업이 얼마나 걸릴지, 주어진 시점에 어느 정도 완료되었는지를 추정할 수 있는 경우
-표시기의 "확정적" 형태(진행률 표시줄)를
-사용하십시오. 작업의 길이를 추정할 수 없으면, 표시기의
+ 알림에는 사용자에게 진행 중인 작업의 상태를 보여주는
+애니메이션 진행 표시기를 포함할 수 있습니다. 작업이 얼마나 걸릴지, 주어진 시점에 어느 정도 완료되었는지를 추정할 수 있는 경우
+표시기의 "확정적" 형태(진행률 표시줄)를
+사용하십시오. 작업의 길이를 추정할 수 없으면, 표시기의
"비확정적" 형태(액티비티 표시기)를 사용하십시오.
</p>
<p>
- 진행 상태 표시기는
+ 진행 상태 표시기는
{@link android.widget.ProgressBar} 클래스의 플랫폼 구현으로 표시됩니다.
</p>
<p>
- Android 4.0부터 시작되는 플랫폼에서 진행 상태 표시기를 사용하려면,
-{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}를 호출하십시오. 이전
-버전의 경우, 개발자 나름의 사용자 지정 알림 레이아웃을 생성해야 하며 여기에
+ Android 4.0부터 시작되는 플랫폼에서 진행 상태 표시기를 사용하려면,
+{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}를 호출하십시오. 이전
+버전의 경우, 개발자 나름의 사용자 지정 알림 레이아웃을 생성해야 하며 여기에
{@link android.widget.ProgressBar} 보기가 포함되어 있어야 합니다.
</p>
<p>
- 다음 섹션은
+ 다음 섹션은
{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}를 사용하여 알림의 진행 상태를 표시하는 법을 설명합니다.
</p>
<!-- ------------------------------------------------------------------------------------------ -->
@@ -712,15 +712,15 @@
<p>
확정적인 진행률 표시줄을 표시하려면
{@link android.support.v4.app.NotificationCompat.Builder#setProgress
-setProgress(max, progress, false)}를 호출하여 표시줄을 알림에 추가하고, 그 다음에 알림을 발행합니다. 작업이 진행되는 동안
-<code>progress</code>를 증가시키고 알림을 업데이트합니다. 작업이 끝날 무렵
-<code>progress</code>가 <code>max</code>와 같아야 합니다.
+setProgress(max, progress, false)}를 호출하여 표시줄을 알림에 추가하고, 그 다음에 알림을 발행합니다. 작업이 진행되는 동안
+<code>progress</code>를 증가시키고 알림을 업데이트합니다. 작업이 끝날 무렵
+<code>progress</code>가 <code>max</code>와 같아야 합니다.
{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}를 호출하는 보편적인 방법은
<code>max</code>를 100에 설정하고 작업에 대한 "완료 비율" 값에 따라 <code>progress</code>를
증가시키는 것입니다.
</p>
<p>
- 작업이 완료되면 진행률 표시줄이 표시되는 상태로 둘 수도 있고, 제거할 수도 있습니다. 어느 경우를 택하더라도
+ 작업이 완료되면 진행률 표시줄이 표시되는 상태로 둘 수도 있고, 제거할 수도 있습니다. 어느 경우를 택하더라도
알림 텍스트를 업데이트하여 작업이 완료되었다고 표시하는 것을 잊지 마십시오.
진행률 표시줄을 제거하려면,
{@link android.support.v4.app.NotificationCompat.Builder#setProgress
@@ -773,15 +773,15 @@
<p>
비확정적 액티비티 표시기를 표시하려면,
{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress(0, 0, true)}으로 알림에 표시기를 추가하고(처음의 인수 두 개는 무시합니다)
-, 알림을 발행합니다. 그 결과로
+, 알림을 발행합니다. 그 결과로
진행률 표시줄과 같은 스타일의 표시기가 나타납니다. 다만 이것은 애니메이션이 계속 진행 중입니다.
</p>
<p>
- 작업을 시작할 때 알림을 발행합니다. 애니메이션은
-알림을 수정할 때까지 실행됩니다. 작업이 완료되면,
+ 작업을 시작할 때 알림을 발행합니다. 애니메이션은
+알림을 수정할 때까지 실행됩니다. 작업이 완료되면,
{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress(0, 0, false)}를 호출하고
알림을 업데이트하여 액티비티 표시기를 제거합니다.
- 이 작업은 항상 해야 합니다. 하지 않으면, 작업이 완료되더라도 애니메이션이 계속 실행됩니다. 또한,
+ 이 작업은 항상 해야 합니다. 하지 않으면, 작업이 완료되더라도 애니메이션이 계속 실행됩니다. 또한,
알림 텍스트를 변경하여 작업이 완료되었음을 나타내는 것을 잊지 마십시오.
</p>
<p>
@@ -806,19 +806,19 @@
<h2 id="metadata">알림 메타데이터</h2>
-<p>알림은
+<p>알림은
다음 {@link android.support.v4.app.NotificationCompat.Builder} 메서드로 할당된 메타데이터에 따라 정렬할 수 있습니다.</p>
<ul>
- <li>{@link android.support.v4.app.NotificationCompat.Builder#setCategory(java.lang.String) setCategory()}는
+ <li>{@link android.support.v4.app.NotificationCompat.Builder#setCategory(java.lang.String) setCategory()}는
기기가 우선 순위 모드일 때 앱 알림을 처리하는 방법을 시스템에 전달합니다
(예를 들어, 알림이 수신 전화나 채팅 메시지, 알람 등을 나타낼 경우).</li>
- <li>{@link android.support.v4.app.NotificationCompat.Builder#setPriority(int) setPriority()}는
-우선 순위 필드가 포함된 알림을 {@code PRIORITY_MAX} 또는 {@code PRIORITY_HIGH}로 설정하고,
+ <li>{@link android.support.v4.app.NotificationCompat.Builder#setPriority(int) setPriority()}는
+우선 순위 필드가 포함된 알림을 {@code PRIORITY_MAX} 또는 {@code PRIORITY_HIGH}로 설정하고,
알림에 소리나 진동이 포함되어 있을 경우 작은 부동 창에 나타나게 합니다.</li>
- <li>{@link android.support.v4.app.NotificationCompat.Builder#addPerson(java.lang.String) addPerson()}을
-사용하면 알림에 사람 목록을 추가할 수 있게 해줍니다. 개발자의 앱은 이 신호를 사용하여
-시스템에 지정된 사람들로부터 받은 알림을 함께 그룹화해야 한다고 알리거나, 이런 사람들로부터 받은 알림을
+ <li>{@link android.support.v4.app.NotificationCompat.Builder#addPerson(java.lang.String) addPerson()}을
+사용하면 알림에 사람 목록을 추가할 수 있게 해줍니다. 개발자의 앱은 이 신호를 사용하여
+시스템에 지정된 사람들로부터 받은 알림을 함께 그룹화해야 한다고 알리거나, 이런 사람들로부터 받은 알림을
더욱 중요한 것으로 순위를 높일 수 있습니다.</li>
</ul>
@@ -832,10 +832,10 @@
<h2 id="Heads-up">헤드업 알림</h2>
<p>Android 5.0(API 레벨 21)에서는 알림을 작은 부동 창에 나타낼 수 있습니다
-(다른 말로 <em>헤드업 알림</em>이라고 부릅니다). 이것은 기기가 활성 상태일 때(즉,
-기기가 잠금 해제 상태이며 화면에 켜져 있는 경우) 해당됩니다. 이와 같은 알림은
-외견상 일반적인 알림의 소형 형태와 비슷해 보이지만,
-해드업 알림에서는 작업 버튼도 표시한다는 점이 다릅니다. 사용자는 현재 앱을 떠나지 않고도
+(다른 말로 <em>헤드업 알림</em>이라고 부릅니다). 이것은 기기가 활성 상태일 때(즉,
+기기가 잠금 해제 상태이며 화면에 켜져 있는 경우) 해당됩니다. 이와 같은 알림은
+외견상 일반적인 알림의 소형 형태와 비슷해 보이지만,
+해드업 알림에서는 작업 버튼도 표시한다는 점이 다릅니다. 사용자는 현재 앱을 떠나지 않고도
헤드업 알림에 조치를 취하거나 이를 무시할 수 있습니다.</p>
<p>헤드업 알림을 트리거할 수 있는 조건의 예시를 몇 가지 소개하면 다음과 같습니다.</p>
@@ -843,55 +843,55 @@
<ul>
<li>사용자 액티비티가 전체 화면 모드이거나(앱이
{@link android.app.Notification#fullScreenIntent}를 사용할 경우)</li>
- <li>알림의 우선 순위가 높고
+ <li>알림의 우선 순위가 높고
벨소리나 진동을 사용할 경우</li>
</ul>
<h2 id="lockscreenNotification">잠금 화면 알림</h2>
-<p>Android 5.0 (API 레벨 21) 릴리스부터 알림이 잠금 화면에도
-나타날 수 있게 되었습니다. 앱은 이 기능을 사용하면 미디어 재생 제어와 다른 보편적인 작업을
-제공할 수 있습니다. 사용자는 설정을 통해 잠금 화면에 알림 표시 여부를 선택할 수 있고,
+<p>Android 5.0 (API 레벨 21) 릴리스부터 알림이 잠금 화면에도
+나타날 수 있게 되었습니다. 앱은 이 기능을 사용하면 미디어 재생 제어와 다른 보편적인 작업을
+제공할 수 있습니다. 사용자는 설정을 통해 잠금 화면에 알림 표시 여부를 선택할 수 있고,
개발자는 앱의 알림이 잠금 화면에 표시될지 여부를 지정할 수 있습니다.</p>
<h3 id="visibility">가시성 설정</h3>
-<p>보안 잠금 화면에 알림이 얼마나 상세하게 표시될 것인지 그 수준을 앱이 제어할 수
-있습니다. {@link android.support.v4.app.NotificationCompat.Builder#setVisibility(int) setVisibility()}를 호출하고
+<p>보안 잠금 화면에 알림이 얼마나 상세하게 표시될 것인지 그 수준을 앱이 제어할 수
+있습니다. {@link android.support.v4.app.NotificationCompat.Builder#setVisibility(int) setVisibility()}를 호출하고
다음 값 중 하나를 지정합니다.</p>
<ul>
- <li>{@link android.support.v4.app.NotificationCompat#VISIBILITY_PUBLIC}은
+ <li>{@link android.support.v4.app.NotificationCompat#VISIBILITY_PUBLIC}은
알림의 전체 콘텐츠를 표시합니다.</li>
- <li>{@link android.support.v4.app.NotificationCompat#VISIBILITY_SECRET}은
+ <li>{@link android.support.v4.app.NotificationCompat#VISIBILITY_SECRET}은
이 알림의 어떤 부분도 화면에 표시하지 않습니다.</li>
- <li>{@link android.support.v4.app.NotificationCompat#VISIBILITY_PRIVATE}은
+ <li>{@link android.support.v4.app.NotificationCompat#VISIBILITY_PRIVATE}은
알림 아이콘과 콘텐츠 제목 등의 기본 정보는 표시하지만 알림의 전체 콘텐츠는 숨깁니다.</li>
</ul>
<p>{@link android.support.v4.app.NotificationCompat#VISIBILITY_PRIVATE}으로 설정하면 ,
-알림 콘텐츠의 대체 버전을 제공할 수도 있습니다. 이렇게 하면 특정 세부 사항만 숨깁니다. 예를 들어,
-SMS 앱에서 <em>3개의 새 문자 메시지가 있습니다.</em>라고 표시하면서도
-문자 메시지의 내용과 발신자는 숨길 수 있습니다. 이 대체 알림을 제공하려면, 우선 대체 알림을 생성합니다. 이때
-{@link android.support.v4.app.NotificationCompat.Builder}를 사용합니다. 비공개 알림 객체를
-생성하는 경우, 대체 알림을 이에 첨부할 때
+알림 콘텐츠의 대체 버전을 제공할 수도 있습니다. 이렇게 하면 특정 세부 사항만 숨깁니다. 예를 들어,
+SMS 앱에서 <em>3개의 새 문자 메시지가 있습니다.</em>라고 표시하면서도
+문자 메시지의 내용과 발신자는 숨길 수 있습니다. 이 대체 알림을 제공하려면, 우선 대체 알림을 생성합니다. 이때
+{@link android.support.v4.app.NotificationCompat.Builder}를 사용합니다. 비공개 알림 객체를
+생성하는 경우, 대체 알림을 이에 첨부할 때
{@link android.support.v4.app.NotificationCompat.Builder#setPublicVersion(android.app.Notification) setPublicVersion()}
메서드를 통합니다.</p>
<h3 id="controllingMedia">잠금 화면에서 미디어 재생 제어</h3>
-<p>Android 5.0(API 레벨 21)의 잠금 화면에서는 더 이상
-{@link android.media.RemoteControlClient}를 기반으로 한 미디어 제어를 표시하지 않습니다. 이는 사용되지 않고 있기 때문입니다. 대신,
-{@link android.app.Notification.MediaStyle} 템플릿을
+<p>Android 5.0(API 레벨 21)의 잠금 화면에서는 더 이상
+{@link android.media.RemoteControlClient}를 기반으로 한 미디어 제어를 표시하지 않습니다. 이는 사용되지 않고 있기 때문입니다. 대신,
+{@link android.app.Notification.MediaStyle} 템플릿을
{@link android.app.Notification.Builder#addAction(android.app.Notification.Action) addAction()}
메서드와 함께 사용하십시오. 이 메서드는 작업을 클릭할 수 있는 아이콘으로 변환해줍니다.</p>
-<p class="note"><strong>참고:</strong> 이 템플릿과 {@link android.app.Notification.Builder#addAction(android.app.Notification.Action) addAction()}
-메서드는 지원 라이브러리에 포함되어 있지 않으므로 이 기능은 Android 5.0 이상에서만
+<p class="note"><strong>참고:</strong> 이 템플릿과 {@link android.app.Notification.Builder#addAction(android.app.Notification.Action) addAction()}
+메서드는 지원 라이브러리에 포함되어 있지 않으므로 이 기능은 Android 5.0 이상에서만
실행됩니다.</p>
-<p>Android 5.0의 잠금 화면에서 미디어 재생 제어를 표시하려면,
-위에 설명한 바와 같이 가시성을 {@link android.support.v4.app.NotificationCompat#VISIBILITY_PUBLIC}으로 설정합니다. 그런 다음 다음 샘플 코드에서 설명한 바와 같이 작업을 추가하고
+<p>Android 5.0의 잠금 화면에서 미디어 재생 제어를 표시하려면,
+위에 설명한 바와 같이 가시성을 {@link android.support.v4.app.NotificationCompat#VISIBILITY_PUBLIC}으로 설정합니다. 그런 다음 다음 샘플 코드에서 설명한 바와 같이 작업을 추가하고
{@link android.app.Notification.MediaStyle} 템플릿을 설정합니다.
</p>
@@ -914,7 +914,7 @@
.build();
</pre>
-<p class="note"><strong>참고:</strong> {@link android.media.RemoteControlClient}를
+<p class="note"><strong>참고:</strong> {@link android.media.RemoteControlClient}를
사용하지 않게 된 것은 미디어 제어에 이외에도 더 많은 영향을 미칩니다. 미디어 세션을 관리하고 재생을 제어하기 위한 새 API에 관한 자세한 정보는
<a href="{@docRoot}about/versions/android-5.0.html#MediaPlaybackControl">미디어 재생 제어</a>를
참조하십시오.</p>
@@ -923,57 +923,57 @@
<!-- ------------------------------------------------------------------------------------------ -->
<h2 id="CustomNotification">사용자 지정 알림 레이아웃</h2>
<p>
- 알림 프레임워크를 사용하면 사용자 지정 레이아웃을 정의할 수 있습니다.
+ 알림 프레임워크를 사용하면 사용자 지정 레이아웃을 정의할 수 있습니다.
사용자 지정 레이아웃은 {@link android.widget.RemoteViews} 객체에서 알림의 외관을 정의합니다.
사용자 지정 레이아웃 알림은 일반적인 알림과 비슷하지만, 이들은 XML 레이아웃 파일에서
정의한 {@link android.widget.RemoteViews}에 기초합니다.
</p>
<p>
- 사용자 지정 알림 레이아웃에 사용할 수 있는 높이는 알림 보기에 따라 다릅니다. 일반
+ 사용자 지정 알림 레이아웃에 사용할 수 있는 높이는 알림 보기에 따라 다릅니다. 일반
보기 레이아웃은 64dp로 제한되어 있으며 확장 보기 레이아웃은 256dp로 제한되어 있습니다.
</p>
<p>
- 사용자 지정 레이아웃을 정의하려면
-XML 레이아웃 파일을 팽창하는 {@link android.widget.RemoteViews} 객체를 인스턴트화하는 것부터 시작합니다. 그런 다음,
+ 사용자 지정 레이아웃을 정의하려면
+XML 레이아웃 파일을 팽창하는 {@link android.widget.RemoteViews} 객체를 인스턴트화하는 것부터 시작합니다. 그런 다음,
-{@link android.support.v4.app.NotificationCompat.Builder#setContentTitle setContentTitle()}과 같은 메서드를 호출하는 대신
-{@link android.support.v4.app.NotificationCompat.Builder#setContent setContent()}를 호출합니다. 사용자 지정 알림에서
+{@link android.support.v4.app.NotificationCompat.Builder#setContentTitle setContentTitle()}과 같은 메서드를 호출하는 대신
+{@link android.support.v4.app.NotificationCompat.Builder#setContent setContent()}를 호출합니다. 사용자 지정 알림에서
콘텐츠 세부 정보를 설정하려면
{@link android.widget.RemoteViews}의 메서드를 사용하여 보기의 하위 요소에 대한 값을 설정합니다.
</p>
<ol>
<li>
- 알림에 대한 XML 레이아웃은 별도의 파일에 생성하십시오. 파일 이름은 원하는 대로
+ 알림에 대한 XML 레이아웃은 별도의 파일에 생성하십시오. 파일 이름은 원하는 대로
아무 것이나 사용해도 좋지만, 확장자는 <code>.xml</code>을 사용해야 합니다.
</li>
<li>
- 앱에서 {@link android.widget.RemoteViews} 메서드를 사용하여 알림의 아이콘과 텍스트를
-정의합니다. 이 {@link android.widget.RemoteViews} 객체를
-{@link android.support.v4.app.NotificationCompat.Builder} 안에 넣으십시오.
-{@link android.support.v4.app.NotificationCompat.Builder#setContent setContent()}를 호출하면 됩니다. 배경
-{@link android.graphics.drawable.Drawable}을
+ 앱에서 {@link android.widget.RemoteViews} 메서드를 사용하여 알림의 아이콘과 텍스트를
+정의합니다. 이 {@link android.widget.RemoteViews} 객체를
+{@link android.support.v4.app.NotificationCompat.Builder} 안에 넣으십시오.
+{@link android.support.v4.app.NotificationCompat.Builder#setContent setContent()}를 호출하면 됩니다. 배경
+{@link android.graphics.drawable.Drawable}을
{@link android.widget.RemoteViews} 객체에서 설정하는 것은 삼가하십시오. 텍스트 색상을 읽을 수 없게 될 수도 있습니다.
</li>
</ol>
<p>
- {@link android.widget.RemoteViews} 클래스에도 개발자가 손쉽게 사용할 수 있는 여러 가지 메서드가 포함되어 있습니다. 이를 이용해
-{@link android.widget.Chronometer} 또는 {@link android.widget.ProgressBar}를
+ {@link android.widget.RemoteViews} 클래스에도 개발자가 손쉽게 사용할 수 있는 여러 가지 메서드가 포함되어 있습니다. 이를 이용해
+{@link android.widget.Chronometer} 또는 {@link android.widget.ProgressBar}를
알림의 레이아웃에 추가하면 됩니다. 알림의 사용자 지정 레이아웃 생성에 관한 자세한 정보는
{@link android.widget.RemoteViews} 참조 문서를 참조하십시오.
</p>
<p class="caution">
- <strong>주의:</strong> 사용자 지정 레이아웃을 사용하는 경우,
-사용자 지정 레이아웃이 다양한 기기 방향과 해상도에서 작동하는지 각별히 주의를 기울여 확인하십시오. 이 조언은
-모든 보기 레이아웃에 공통적으로 적용되지만, 특히 알림에 중요한 의미를 지닙니다.
-알림 창에서는 공간이 굉장히 제한되어 있기 때문입니다. 사용자 지정 레이아웃을 너무 복잡하게 만들지 마시고,
+ <strong>주의:</strong> 사용자 지정 레이아웃을 사용하는 경우,
+사용자 지정 레이아웃이 다양한 기기 방향과 해상도에서 작동하는지 각별히 주의를 기울여 확인하십시오. 이 조언은
+모든 보기 레이아웃에 공통적으로 적용되지만, 특히 알림에 중요한 의미를 지닙니다.
+알림 창에서는 공간이 굉장히 제한되어 있기 때문입니다. 사용자 지정 레이아웃을 너무 복잡하게 만들지 마시고,
여러 가지 구성에서 테스트하는 것을 잊지 마십시오.
</p>
<!-- ------------------------------------------------------------------------------------------ -->
<h4>사용자 지정 알림 텍스트에 스타일 리소스 사용</h4>
<p>
- 사용자 지정 알림의 텍스트에는 항상 스타일 리소스를 사용하십시오. 알림의 배경 색상은 기기와 버전별로 다를 수 있습니다.
-스타일 리소스를 사용하면 이러한 차이를
-감안하는 데 도움이 됩니다. Android 2.3부터 시스템은
-표준 알림 레이아웃 텍스트의 스타일을 정의했습니다. Android 2.3 이상을 대상으로 하는
+ 사용자 지정 알림의 텍스트에는 항상 스타일 리소스를 사용하십시오. 알림의 배경 색상은 기기와 버전별로 다를 수 있습니다.
+스타일 리소스를 사용하면 이러한 차이를
+감안하는 데 도움이 됩니다. Android 2.3부터 시스템은
+표준 알림 레이아웃 텍스트의 스타일을 정의했습니다. Android 2.3 이상을 대상으로 하는
애플리케이션에서와 같은 스타일을 사용하면 텍스트가 디스플레이 배경에서도 잘 보이도록 할 수 있습니다.
</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/overview.jd b/docs/html-intl/intl/ko/guide/topics/ui/overview.jd
index eb288f1..72e5692 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/overview.jd
@@ -3,9 +3,9 @@
<p>Android 앱의 모든 사용자 인터페이스 요소는 {@link android.view.View}와
-{@link android.view.ViewGroup} 개체를 사용하여 구축합니다. {@link android.view.View}는 사용자가 상호 작용할 수 있는 무언가를
-화면에 그리는 객체입니다. {@link android.view.ViewGroup}은
-인터페이스 레이아웃을 정의하기 위해 다른 {@link android.view.View}(및{@link android.view.ViewGroup}) 객체를
+{@link android.view.ViewGroup} 개체를 사용하여 구축합니다. {@link android.view.View}는 사용자가 상호 작용할 수 있는 무언가를
+화면에 그리는 객체입니다. {@link android.view.ViewGroup}은
+인터페이스 레이아웃을 정의하기 위해 다른 {@link android.view.View}(및{@link android.view.ViewGroup}) 객체를
보유하는 객체입니다.</p>
<p>Android는 공통 입력 제어(버튼 및 텍스트 필드)와 다양한 레이아웃 모델(선형 또는 관계 레이아웃)을 제공하는 {@link android.view.View}와 {@link
@@ -16,30 +16,30 @@
<h2 id="Layout">사용자 인터페이스 레이아웃</h2>
<p>앱의 각 구성 요소에 대한 사용자 인터페이스는 그림 1에서 나타난 바와 같이 {@link
-android.view.View}와 {@link android.view.ViewGroup} 객체의 계층으로 정의됩니다. 각 보기 그룹은
-하위 보기를 체계화하는 투명한 컨테이너이고,
-하위 보기는 UI의 일부분을 그리는 제어나 다른 위젯일 수 있습니다.
-이 계층 트리는 개발자에게 필요한 만큼 단순하거나 복잡하게
+android.view.View}와 {@link android.view.ViewGroup} 객체의 계층으로 정의됩니다. 각 보기 그룹은
+하위 보기를 체계화하는 투명한 컨테이너이고,
+하위 보기는 UI의 일부분을 그리는 제어나 다른 위젯일 수 있습니다.
+이 계층 트리는 개발자에게 필요한 만큼 단순하거나 복잡하게
만들 수 있습니다(다만 단순한 것이 성능에는 가장 좋습니다).</p>
<img src="{@docRoot}images/viewgroup.png" alt="" />
-<p class="img-caption"><strong>그림 1.</strong> 보기 계층을 나타낸 것으로, 이것이
+<p class="img-caption"><strong>그림 1.</strong> 보기 계층을 나타낸 것으로, 이것이
UI 레이아웃을 정의합니다.</p>
-<p>레이아웃을 선언하려면 코드의 {@link android.view.View} 객체를 인스턴트화하고 트리를 구축하기 시작하면 되지만,
-레이아웃을 정의하는 가장 쉽고 효과적인 방법은 XML 파일을 사용하는 것입니다.
+<p>레이아웃을 선언하려면 코드의 {@link android.view.View} 객체를 인스턴트화하고 트리를 구축하기 시작하면 되지만,
+레이아웃을 정의하는 가장 쉽고 효과적인 방법은 XML 파일을 사용하는 것입니다.
XML은 HTML과 유사한, 인간이 읽을 수 있는 레이아웃 구조를 제공합니다.</p>
-<p>보기의 XML 요소 이름은 해당 요소가 나타내는 각각의 Android 클래스를 따릅니다. 말하자면
+<p>보기의 XML 요소 이름은 해당 요소가 나타내는 각각의 Android 클래스를 따릅니다. 말하자면
<code><TextView></code> 요소가 UI에서 {@link android.widget.TextView} 위젯을 생성하고,
-<code><LinearLayout></code> 요소는 {@link android.widget.LinearLayout} 보기
+<code><LinearLayout></code> 요소는 {@link android.widget.LinearLayout} 보기
그룹을 생성하는 것입니다. </p>
<p>예를 들어, 텍스트 보기와 버튼 하나가 있는 단순한 수직 레이아웃은 이런 모습을 띱니다.</p>
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -53,19 +53,19 @@
</LinearLayout>
</pre>
-<p>앱에 레이아웃 리소스를 로드하면 Android가 레이아웃의 각 노드를 초기화하여
-추가 동작을 정의하거나, 객체 상태를 쿼리 또는 레이아웃을 수정하는 데 쓸 수 있는 런타임 객체로
+<p>앱에 레이아웃 리소스를 로드하면 Android가 레이아웃의 각 노드를 초기화하여
+추가 동작을 정의하거나, 객체 상태를 쿼리 또는 레이아웃을 수정하는 데 쓸 수 있는 런타임 객체로
초기화합니다.</p>
-<p>UI 레이아웃 생성에 대한 완전한 가이드는 <a href="declaring-layout.html">XML
+<p>UI 레이아웃 생성에 대한 완전한 가이드는 <a href="declaring-layout.html">XML
레이아웃</a>을 참조하십시오.
-
+
<h2 id="UIComponents">사용자 인터페이스 구성 요소</h2>
<p>UI를 구축할 때 모두 {@link android.view.View} 및 {@link
-android.view.ViewGroup} 객체를 사용해야 하는 것은 아닙니다. Android가 표준형 UI 레이아웃을 제공하는 앱 구성 요소를 여러 개 제공하고 있으니,
-개발자 여러분은 이에 대한 콘텐츠만 정의하면 됩니다. 이와 같은 UI 구성 요소에는 각각
+android.view.ViewGroup} 객체를 사용해야 하는 것은 아닙니다. Android가 표준형 UI 레이아웃을 제공하는 앱 구성 요소를 여러 개 제공하고 있으니,
+개발자 여러분은 이에 대한 콘텐츠만 정의하면 됩니다. 이와 같은 UI 구성 요소에는 각각
고유한 API 세트가 있습니다. 이들은 <a href="{@docRoot}guide/topics/ui/actionbar.html">작업 모음</a>, <a href="{@docRoot}guide/topics/ui/dialogs.html">대화</a> 및 <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">상태 알림</a> 등 각각 다른 문서에서 설명하였습니다.</p>
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/settings.jd b/docs/html-intl/intl/ko/guide/topics/ui/settings.jd
index 36204e0..01b62ed 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/settings.jd
@@ -65,13 +65,13 @@
-<p>애플리케이션에는 종종 설정이 포함되어 있어 사용자가 앱 기능과 행동을 수정할 수 있게 해줍니다. 예를 들어
-몇몇 앱은 사용자에게 알림을 활성화할지 여부를 지정하거나 애플리케이션이
+<p>애플리케이션에는 종종 설정이 포함되어 있어 사용자가 앱 기능과 행동을 수정할 수 있게 해줍니다. 예를 들어
+몇몇 앱은 사용자에게 알림을 활성화할지 여부를 지정하거나 애플리케이션이
클라우드와 데이터를 동기화할 빈도를 지정할 수 있게 해줍니다.</p>
-<p>자신의 앱에 설정을 제공하고자 하는 경우, Android의
-{@link android.preference.Preference} API를 사용하여 다른 Android 앱(시스템 설정 포함)의 사용자 환경과
-일관성을 유지하는 인터페이스를 구축할 수 있게 해야 합니다. 이 문서에서는
+<p>자신의 앱에 설정을 제공하고자 하는 경우, Android의
+{@link android.preference.Preference} API를 사용하여 다른 Android 앱(시스템 설정 포함)의 사용자 환경과
+일관성을 유지하는 인터페이스를 구축할 수 있게 해야 합니다. 이 문서에서는
{@link android.preference.Preference} API를 사용하여 앱 설정을 구축하는 방법을 설명합니다.</p>
<div class="note design">
@@ -81,8 +81,8 @@
<img src="{@docRoot}images/ui/settings/settings.png" alt="" width="435" />
-<p class="img-caption"><strong>그림 1.</strong> Android 메시지 앱의 설정에서 가져온
-스크린샷입니다. {@link android.preference.Preference}가 정의한 항목을 선택하면
+<p class="img-caption"><strong>그림 1.</strong> Android 메시지 앱의 설정에서 가져온
+스크린샷입니다. {@link android.preference.Preference}가 정의한 항목을 선택하면
인터페이스가 열려 설정을 변경할 수 있게 됩니다.</p>
@@ -90,24 +90,24 @@
<h2 id="Overview">개요</h2>
-<p>사용자 인터페이스를 구축할 때에는 {@link android.view.View} 객체를 사용하지만, 설정은 그 대신
-{@link android.preference.Preference} 클래스의 다양한 하위 클래스를 사용하여 구축합니다.
+<p>사용자 인터페이스를 구축할 때에는 {@link android.view.View} 객체를 사용하지만, 설정은 그 대신
+{@link android.preference.Preference} 클래스의 다양한 하위 클래스를 사용하여 구축합니다.
이와 같은 하위 클래스는 XML 파일에서 선언합니다.</p>
-<p>{@link android.preference.Preference} 객체는 하나의 설정을 이루는 기본
-단위입니다. 각각의 {@link android.preference.Preference}는 목록의 항목으로
+<p>{@link android.preference.Preference} 객체는 하나의 설정을 이루는 기본
+단위입니다. 각각의 {@link android.preference.Preference}는 목록의 항목으로
나타나며 사용자가 설정을 수정하기에 적절한 UI를 제공합니다. 예를 들어 {@link
android.preference.CheckBoxPreference}는 확인란을 표시하는 목록 항목을 만들고, {@link
android.preference.ListPreference}는 선택 목록이 있는 대화를 여는 항목을 만듭니다.</p>
-<p>각각의 {@link android.preference.Preference}를 추가할 때마다 상응하는 키-값 쌍이 있어
+<p>각각의 {@link android.preference.Preference}를 추가할 때마다 상응하는 키-값 쌍이 있어
시스템이 이를 사용하여 해당 설정을 앱의 설정에 대한 기본 {@link android.content.SharedPreferences}
-파일에 저장합니다. 사용자가 설정을 변경하면 시스템이
-{@link android.content.SharedPreferences} 파일에 있는 상응하는 값을 개발자 대신 업데이트합니다. 개발자가 직접
-연관된 {@link android.content.SharedPreferences} 파일과 상호 작용을 해야 하는 경우는
+파일에 저장합니다. 사용자가 설정을 변경하면 시스템이
+{@link android.content.SharedPreferences} 파일에 있는 상응하는 값을 개발자 대신 업데이트합니다. 개발자가 직접
+연관된 {@link android.content.SharedPreferences} 파일과 상호 작용을 해야 하는 경우는
사용자의 설정을 기반으로 앱의 동작을 결정하기 위해 값을 읽어야 할 때뿐입니다.</p>
-<p>각 설정에 대하여 {@link android.content.SharedPreferences}에 저장된 값은 다음과 같은
+<p>각 설정에 대하여 {@link android.content.SharedPreferences}에 저장된 값은 다음과 같은
데이터 유형 중 한 가지를 취할 수 있습니다.</p>
<ul>
@@ -119,31 +119,31 @@
<li>String {@link java.util.Set}</li>
</ul>
-<p>앱의 설정 UI는
-{@link android.view.View} 객체 대신
-{@link android.preference.Preference} 객체를 사용하여 구축되기 때문에, 목록 설정을 표시하려면 특수 {@link android.app.Activity} 또는
+<p>앱의 설정 UI는
+{@link android.view.View} 객체 대신
+{@link android.preference.Preference} 객체를 사용하여 구축되기 때문에, 목록 설정을 표시하려면 특수 {@link android.app.Activity} 또는
{@link android.app.Fragment} 하위 클래스를 사용해야 합니다.</p>
<ul>
- <li>앱이 Android 3.0 이전 버전(API 레벨 10 이하)을 지원하는 경우, 액티비티를 구축할 때
+ <li>앱이 Android 3.0 이전 버전(API 레벨 10 이하)을 지원하는 경우, 액티비티를 구축할 때
{@link android.preference.PreferenceActivity} 클래스의 확장으로 구축해야 합니다.</li>
- <li>Android 3.0 이후의 경우에는 대신 기존의 {@link android.app.Activity}를
-사용해야 합니다. 이것은 앱 설정을 표시하는 {@link android.preference.PreferenceFragment}를 호스팅합니다.
-하지만, 여러 개의 설정 그룹이 있는 경우 {@link android.preference.PreferenceActivity}를 사용하여
+ <li>Android 3.0 이후의 경우에는 대신 기존의 {@link android.app.Activity}를
+사용해야 합니다. 이것은 앱 설정을 표시하는 {@link android.preference.PreferenceFragment}를 호스팅합니다.
+하지만, 여러 개의 설정 그룹이 있는 경우 {@link android.preference.PreferenceActivity}를 사용하여
대형 화면에 맞는 창 두 개짜리 레이아웃을 만들 수도 있습니다.</li>
</ul>
<p>{@link android.preference.PreferenceActivity}와 {@link
-android.preference.PreferenceFragment}의 인스턴스를 설정하는 방법은 <a href="#Activity">기본 설정 액티비티 만들기</a>와 <a href="#Fragment">기본 설정
+android.preference.PreferenceFragment}의 인스턴스를 설정하는 방법은 <a href="#Activity">기본 설정 액티비티 만들기</a>와 <a href="#Fragment">기본 설정
프래그먼트 사용하기</a>에 관련된 섹션에서 논합니다.</p>
<h3 id="SettingTypes">기본 설정</h3>
<p>앱에 대한 설정은 모두 {@link
-android.preference.Preference} 클래스의 특정 하위 클래스로 표현됩니다. 각 하위 클래스에 핵심 속성이 한 세트씩 포함되어 있어
-설정의 제목과 기본 값 등과 같은 것을 지정할 수 있게 해줍니다. 각 하위 클래스는 또한 자신만의
-특수 속성과 사용자 인터페이스도 제공합니다. 예를 들어, 그림 1에서는 메시지 앱의 설정에서
+android.preference.Preference} 클래스의 특정 하위 클래스로 표현됩니다. 각 하위 클래스에 핵심 속성이 한 세트씩 포함되어 있어
+설정의 제목과 기본 값 등과 같은 것을 지정할 수 있게 해줍니다. 각 하위 클래스는 또한 자신만의
+특수 속성과 사용자 인터페이스도 제공합니다. 예를 들어, 그림 1에서는 메시지 앱의 설정에서
가져온 스크린샷을 나타낸 것입니다. 설정 화면에 있는 각 목록 항목은 각기 서로 다른 {@link
android.preference.Preference} 객체로 지원됩니다.</p>
@@ -151,11 +151,11 @@
<dl>
<dt>{@link android.preference.CheckBoxPreference}</dt>
- <dd>활성화되었거나 비활성화된 설정에 대한 확인란이 있는 항목을 표시합니다. 저장된 값은
+ <dd>활성화되었거나 비활성화된 설정에 대한 확인란이 있는 항목을 표시합니다. 저장된 값은
부울입니다(확인란이 선택된 경우 <code>true</code>).</dd>
<dt>{@link android.preference.ListPreference}</dt>
- <dd>무선 버튼 목록이 있는 대화를 엽니다. 저장된 값은
+ <dd>무선 버튼 목록이 있는 대화를 엽니다. 저장된 값은
지원되는 값 유형(위에 목록으로 나열) 중 어느 것이라도 될 수 있습니다.</dd>
<dt>{@link android.preference.EditTextPreference}</dt>
@@ -166,36 +166,36 @@
<p>다른 모든 하위 클래스와 이에 상응하는 속성의 목록을 보려면 {@link android.preference.Preference}
클래스를 참조하십시오.</p>
-<p>물론 기본 제공 클래스만으로는 필요한 것을 모두 충족할 수 없고 앱에 무언가 좀 더 특수한 것이
+<p>물론 기본 제공 클래스만으로는 필요한 것을 모두 충족할 수 없고 앱에 무언가 좀 더 특수한 것이
필요할 수도 있습니다. 예를 들어 플랫폼은 현재 숫자나 날짜를 선택할 수 있는 {@link
-android.preference.Preference} 클래스를 제공하지 않습니다. 따라서 개발자 나름대로
+android.preference.Preference} 클래스를 제공하지 않습니다. 따라서 개발자 나름대로
{@link android.preference.Preference} 하위 클래스를 정의해야 할 수도 있습니다. 이 작업을 수행하는 데 유용한 내용인 <a href="#Custom">사용자 지정 기본 설정 구축하기</a>에 관한 섹션을 참조하십시오.</p>
<h2 id="DefiningPrefs">XML로 기본 설정 정의하기</h2>
-<p>새로운 {@link android.preference.Preference} 객체를 런타임에 인스턴트화하는 것도 가능하지만,
+<p>새로운 {@link android.preference.Preference} 객체를 런타임에 인스턴트화하는 것도 가능하지만,
설정 목록을 정의할 때에는 {@link android.preference.Preference}
-객체의 계층과 함께 XML을 사용해야 합니다. 설정 컬렉션을 정의하는 데 XM 파일을 사용하는 것이 선호되는 이유는 이 파일이
-읽기 쉬운 구조를 제공하여 업데이트가 단순하기 때문입니다. 또한, 앱의 설정은 보통
+객체의 계층과 함께 XML을 사용해야 합니다. 설정 컬렉션을 정의하는 데 XM 파일을 사용하는 것이 선호되는 이유는 이 파일이
+읽기 쉬운 구조를 제공하여 업데이트가 단순하기 때문입니다. 또한, 앱의 설정은 보통
미리 정의되어 있습니다. 다만 개발자도 여전히 런타임에 설정 컬렉션을 수정할 수 있습니다.</p>
-<p>각 {@link android.preference.Preference} 하위 클래스는 클래스 이름에 일치하는 XML 요소로
+<p>각 {@link android.preference.Preference} 하위 클래스는 클래스 이름에 일치하는 XML 요소로
선언하면 됩니다. 예를 들면 {@code <CheckBoxPreference>}가 이에 해당됩니다.</p>
-<p>이 XML 파일은 반드시 {@code res/xml/} 디렉터리에 저장해야 합니다. 파일의 이름은 무엇이든 원하는 대로 지정할 수 있지만,
-일반적으로는 {@code preferences.xml}이라고 명명합니다. 파일은 하나만 필요한 것이 보통입니다.
-왜냐하면 계층에 있는 분기(자신만의 설정 목록을 엶)는
+<p>이 XML 파일은 반드시 {@code res/xml/} 디렉터리에 저장해야 합니다. 파일의 이름은 무엇이든 원하는 대로 지정할 수 있지만,
+일반적으로는 {@code preferences.xml}이라고 명명합니다. 파일은 하나만 필요한 것이 보통입니다.
+왜냐하면 계층에 있는 분기(자신만의 설정 목록을 엶)는
{@link android.preference.PreferenceScreen}의 중첩된 인스턴스를 사용하여 선언되기 때문입니다.</p>
-<p class="note"><strong>참고:</strong> 설정에 다중 창 레이아웃을 만들고자 하는 경우,
+<p class="note"><strong>참고:</strong> 설정에 다중 창 레이아웃을 만들고자 하는 경우,
각 프래그먼트에 대해 별도의 XML 파일이 필요합니다.</p>
<p>XML 파일의 루트 노드는 반드시 {@link android.preference.PreferenceScreen
<PreferenceScreen>} 요소여야 합니다. 바로 이 요소 내에 각 {@link
-android.preference.Preference}를 추가하는 것입니다.
-{@link android.preference.PreferenceScreen <PreferenceScreen>} 요소 내에 추가하는 각 하위는 설정 목록에서
+android.preference.Preference}를 추가하는 것입니다.
+{@link android.preference.PreferenceScreen <PreferenceScreen>} 요소 내에 추가하는 각 하위는 설정 목록에서
각기 항목 하나씩으로 나타납니다.</p>
<p>예:</p>
@@ -224,11 +224,11 @@
<dl>
<dt>{@code android:key}</dt>
- <dd>이 속성은 데이터 값을 유지하는 기본 설정에 필수입니다. 이것은 고유키(문자)를
+ <dd>이 속성은 데이터 값을 유지하는 기본 설정에 필수입니다. 이것은 고유키(문자)를
나타내며, 시스템이 이것을 사용하여 이 설정의 값을 {@link
-android.content.SharedPreferences}에 저장합니다.
- <p>이 속성이 <em>필요하지 않은</em> 인스턴스는 기본 설정이
-{@link android.preference.PreferenceCategory} 또는 {@link android.preference.PreferenceScreen}인 경우, 또는
+android.content.SharedPreferences}에 저장합니다.
+ <p>이 속성이 <em>필요하지 않은</em> 인스턴스는 기본 설정이
+{@link android.preference.PreferenceCategory} 또는 {@link android.preference.PreferenceScreen}인 경우, 또는
기본 설정이 {@link android.content.Intent}를 호출할 것을 나타내거나(<a href="#Intents">{@code <intent>}</a> 요소로) {@link android.app.Fragment}를 표시하도록 지정하는 경우(<a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
android:fragment}</a> 속성으로)뿐입니다.</p>
</dd>
@@ -236,7 +236,7 @@
<dd>이것은 설정에 대하여 사용자가 볼 수 있는 이름을 제공합니다.</dd>
<dt>{@code android:defaultValue}</dt>
<dd>이것은 시스템이 {@link
-android.content.SharedPreferences} 파일에 설정해야 하는 초기 값을 나타냅니다. 모든 설정에 기본 값을 제공해야
+android.content.SharedPreferences} 파일에 설정해야 하는 초기 값을 나타냅니다. 모든 설정에 기본 값을 제공해야
합니다.</dd>
</dl>
@@ -248,21 +248,21 @@
<img src="{@docRoot}images/ui/settings/settings-titles.png" alt="" />
<p class="img-caption"><strong>그림 2.</strong> 제목이 있는 설정
카테고리입니다. <br/><b>1.</b> 카테고리는 {@link
-android.preference.PreferenceCategory <PreferenceCategory>} 요소가 지정합니다. <br/><b>2.</b> 제목은
+android.preference.PreferenceCategory <PreferenceCategory>} 요소가 지정합니다. <br/><b>2.</b> 제목은
{@code android:title} 속성으로 지정합니다.</p>
</div>
-<p>설정 목록이 약 10개 항목을 초과하면 제목을 추가하여
-설정 그룹을 정의하거나, 해당 그룹을 별도의
+<p>설정 목록이 약 10개 항목을 초과하면 제목을 추가하여
+설정 그룹을 정의하거나, 해당 그룹을 별도의
화면에 표시하는 것이 좋을 수도 있습니다. 이러한 옵션은 다음 섹션에 설명되어 있습니다.</p>
<h3 id="Groups">설정 그룹 만들기</h3>
-<p>10개 이상의 설정 목록을 제시하는 경우, 사용자가
-이들을 둘러보고 이해하며 처리하는 데 어려움을 겪을 수 있습니다. 이 문제를 해결하려면
-설정의 일부 또는 모두를 그룹으로 나누어 사실상 하나의 긴 목록을 여러 개의 더 짧은 목록으로
+<p>10개 이상의 설정 목록을 제시하는 경우, 사용자가
+이들을 둘러보고 이해하며 처리하는 데 어려움을 겪을 수 있습니다. 이 문제를 해결하려면
+설정의 일부 또는 모두를 그룹으로 나누어 사실상 하나의 긴 목록을 여러 개의 더 짧은 목록으로
바꿔주면 됩니다. 관련된 설정 그룹 하나를 나타낼 때에는 다음과 같은 두 가지 방식 중 하나를 택하면 됩니다.</p>
<ul>
@@ -270,14 +270,14 @@
<li><a href="#Subscreens">보조 화면 사용하기</a></li>
</ul>
-<p>이와 같은 그룹화 기법 중 하나 또는 둘 모두를 사용하여 앱의 설정을 조직화할 수 있습니다. 어느 것을
-사용할지, 설정을 어떻게 나눌지 결정할 때에는 Android
+<p>이와 같은 그룹화 기법 중 하나 또는 둘 모두를 사용하여 앱의 설정을 조직화할 수 있습니다. 어느 것을
+사용할지, 설정을 어떻게 나눌지 결정할 때에는 Android
디자인의 <a href="{@docRoot}design/patterns/settings.html">설정</a> 가이드에 있는 지침을 따라야 합니다.</p>
<h4 id="Titles">제목 사용하기</h4>
-<p>여러 개의 설정 그룹 사이에 구분선과 제목을 제공하고자 하는 경우(그림 2에 표시된 것과 같이),
+<p>여러 개의 설정 그룹 사이에 구분선과 제목을 제공하고자 하는 경우(그림 2에 표시된 것과 같이),
각 {@link android.preference.Preference} 객체 그룹을 {@link
android.preference.PreferenceCategory} 내부에 배치합니다.</p>
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -311,13 +311,13 @@
<h4 id="Subscreens">보조 화면 사용하기</h4>
-<p>설정 그룹 여러 개를 보조 화면에 배치하고자 하는 경우(그림 3에 표시된 것과 같이), 해당
+<p>설정 그룹 여러 개를 보조 화면에 배치하고자 하는 경우(그림 3에 표시된 것과 같이), 해당
{@link android.preference.Preference} 객체 그룹을 {@link
android.preference.PreferenceScreen} 안에 배치합니다.</p>
<img src="{@docRoot}images/ui/settings/settings-subscreen.png" alt="" />
<p class="img-caption"><strong>그림 3.</strong> 설정 보조 화면입니다. {@code
-<PreferenceScreen>} 요소가
+<PreferenceScreen>} 요소가
항목을 만들며, 이 항목이 선택되면 별도의 목록이 열려 중첩된 설정을 표시합니다.</p>
<p>예:</p>
@@ -352,7 +352,7 @@
<h3 id="Intents">인텐트 사용하기</h3>
-<p>어떤 경우에는 기본 설정 항목을 사용하여 설정 화면 대신 여러 가지 액티비티를
+<p>어떤 경우에는 기본 설정 항목을 사용하여 설정 화면 대신 여러 가지 액티비티를
열고자 할 수도 있습니다. 예를 들어 웹 브라우저를 열어 웹 페이지를 보는 것이 이에 해당됩니다. 사용자가 기본 설정 항목을 선택할 때 {@link
android.content.Intent}를 호출하도록 하려면, {@code <intent>}
요소를 상응하는 {@code <Preference>} 요소의 하위로 추가하면 됩니다.</p>
@@ -392,18 +392,18 @@
<p>설정을 액티비티에서 표시하려면 {@link
android.preference.PreferenceActivity} 클래스를 확장하면 됩니다. 이것은 일반적인 {@link
android.app.Activity} 클래스 확장의 일종입니다. 이는 {@link
-android.preference.Preference} 객체의 계층에 기반한 설정 목록을 표시합니다. {@link android.preference.PreferenceActivity}는
+android.preference.Preference} 객체의 계층에 기반한 설정 목록을 표시합니다. {@link android.preference.PreferenceActivity}는
사용자가 변경 작업을 하면 각 {@link
android.preference.Preference}와 연관된 설정을 유지합니다.</p>
-<p class="note"><strong>참고:</strong> Android 3.0 이상에 맞춰 애플리케이션을 개발하는 경우,
-대신 {@link android.preference.PreferenceFragment}를 사용해야 합니다. 다음 섹션의
+<p class="note"><strong>참고:</strong> Android 3.0 이상에 맞춰 애플리케이션을 개발하는 경우,
+대신 {@link android.preference.PreferenceFragment}를 사용해야 합니다. 다음 섹션의
<a href="#Fragment">기본 설정 프래그먼트 사용하기</a> 관련 내용을 참조하십시오.</p>
<p>여기서 기억해야 할 가장 중요한 점은 {@link
android.preference.PreferenceActivity#onCreate onCreate()} 콜백 중에 보기 레이아웃을 로딩해서는 안 된다는 것입니다. 그 대신 {@link
-android.preference.PreferenceActivity#addPreferencesFromResource addPreferencesFromResource()}를 호출하여
-XML 파일에서 선언한 기본 설정을 액티비티에 추가합니다. 예를 들어 다음은 기능적인
+android.preference.PreferenceActivity#addPreferencesFromResource addPreferencesFromResource()}를 호출하여
+XML 파일에서 선언한 기본 설정을 액티비티에 추가합니다. 예를 들어 다음은 기능적인
{@link android.preference.PreferenceActivity}에 필요한 가장 최소한의 코드를 나타낸 것입니다.</p>
<pre>
@@ -416,11 +416,11 @@
}
</pre>
-<p>사실 이 코드만으로 몇몇 앱에는 충분합니다. 사용자가 기본 설정을 수정하자마자
-시스템이 해당 변경을 기본 {@link android.content.SharedPreferences} 파일에 저장하여,
-사용자의 설정을 확인해야 할 때 다른 애플리케이션 구성 요소가 이를 읽을 수 있도록 하기 때문입니다. 하지만
+<p>사실 이 코드만으로 몇몇 앱에는 충분합니다. 사용자가 기본 설정을 수정하자마자
+시스템이 해당 변경을 기본 {@link android.content.SharedPreferences} 파일에 저장하여,
+사용자의 설정을 확인해야 할 때 다른 애플리케이션 구성 요소가 이를 읽을 수 있도록 하기 때문입니다. 하지만
대다수의 앱은 기본 설정에 일어나는 변경을 수신 대기하기 위해 약간의 코드가 더 필요합니다.
-{@link android.content.SharedPreferences} 파일에 일어나는 변경을 수신 대기하는 데 관한
+{@link android.content.SharedPreferences} 파일에 일어나는 변경을 수신 대기하는 데 관한
자세한 정보는 <a href="#ReadingPrefs">기본 설정 읽기</a>에 관한 섹션을 참조하십시오.</p>
@@ -430,17 +430,17 @@
<p>Android 3.0(API 레벨 11) 이상에 맞춰 개발하는 경우, {@link
android.preference.PreferenceFragment}를 사용하여 {@link android.preference.Preference}
-객체 목록을 표시해야 합니다. {@link android.preference.PreferenceFragment}는 모든 액티비티에 추가할 수 있습니다. 즉,
+객체 목록을 표시해야 합니다. {@link android.preference.PreferenceFragment}는 모든 액티비티에 추가할 수 있습니다. 즉,
{@link android.preference.PreferenceActivity}를 사용하지 않아도 됩니다.</p>
-<p><a href="{@docRoot}guide/components/fragments.html">프래그먼트</a>는 액티비티만
-사용하는 것에 비해 애플리케이션에 보다 유연한 아키텍처를 제공하며, 이는 구축하는
+<p><a href="{@docRoot}guide/components/fragments.html">프래그먼트</a>는 액티비티만
+사용하는 것에 비해 애플리케이션에 보다 유연한 아키텍처를 제공하며, 이는 구축하는
액티비티의 종류와 무관하게 적용됩니다. 따라서 설정 표시를 제어하는 데에는 {@link
android.preference.PreferenceFragment}를 {@link
android.preference.PreferenceActivity} 대신 사용하는 방안을 권장합니다(가능한 경우).</p>
<p>{@link android.preference.PreferenceFragment} 구현은 매우 간단합니다.
-{@link android.preference.PreferenceFragment#onCreate onCreate()} 메서드를 정의하여 기본 설정 파일을
+{@link android.preference.PreferenceFragment#onCreate onCreate()} 메서드를 정의하여 기본 설정 파일을
{@link android.preference.PreferenceFragment#addPreferencesFromResource
addPreferencesFromResource()}로 로딩하도록 하기만 하면 됩니다. 예:</p>
@@ -457,7 +457,7 @@
}
</pre>
-<p>그런 다음 이 프래그먼트를 {@link android.app.Activity}에 추가하기만 하면 되고, 이는 다른 모든
+<p>그런 다음 이 프래그먼트를 {@link android.app.Activity}에 추가하기만 하면 되고, 이는 다른 모든
{@link android.app.Fragment}에서와 마찬가지입니다. 예:</p>
<pre>
@@ -474,24 +474,24 @@
}
</pre>
-<p class="note"><strong>참고:</strong> {@link android.preference.PreferenceFragment}에는 자신만의
+<p class="note"><strong>참고:</strong> {@link android.preference.PreferenceFragment}에는 자신만의
{@link android.content.Context} 객체가 없습니다. {@link android.content.Context}
-객체가 필요한 경우, {@link android.app.Fragment#getActivity()}를 호출하면 됩니다. 하지만,
-{@link android.app.Fragment#getActivity()}를 호출하는 것은 프래그먼트가 액티비티에 첨부되어 있는 경우만으로 국한시켜야 한다는 점을 유의하십시오. 프래그먼트가
+객체가 필요한 경우, {@link android.app.Fragment#getActivity()}를 호출하면 됩니다. 하지만,
+{@link android.app.Fragment#getActivity()}를 호출하는 것은 프래그먼트가 액티비티에 첨부되어 있는 경우만으로 국한시켜야 한다는 점을 유의하십시오. 프래그먼트가
아직 첨부되지 않았거나 수명 주기가 끝날 무렵 분리된 경우, {@link
android.app.Fragment#getActivity()}가 null을 반환합니다.</p>
<h2 id="Defaults">설정 기본 값</h2>
-<p>여러분이 만드는 기본 설정은 애플리케이션에 중요한 동작을 정의하는 경우가 많을 것입니다. 따라서
-연관된 {@link android.content.SharedPreferences} 파일을
-각 {@link android.preference.Preference}에 대한 기본 값으로 초기화하여 사용자가 애플리케이션을 처음 열 때
+<p>여러분이 만드는 기본 설정은 애플리케이션에 중요한 동작을 정의하는 경우가 많을 것입니다. 따라서
+연관된 {@link android.content.SharedPreferences} 파일을
+각 {@link android.preference.Preference}에 대한 기본 값으로 초기화하여 사용자가 애플리케이션을 처음 열 때
적용하는 것이 중요합니다.</p>
<p>가장 먼저 해야 할 일은 XML 파일 내의 각 {@link
android.preference.Preference}
-객체에 대해 기본 값을 지정하는 것입니다. 이때 {@code android:defaultValue} 속성을 사용합니다. 이 값은 상응하는
+객체에 대해 기본 값을 지정하는 것입니다. 이때 {@code android:defaultValue} 속성을 사용합니다. 이 값은 상응하는
{@link android.preference.Preference} 객체에 대해 적절한 어느 데이터 유형이라도 될 수 있습니다. 예:
</p>
@@ -507,8 +507,8 @@
... />
</pre>
-<p>그런 다음, 애플리케이션의 기본 액티비티에 있는 {@link android.app.Activity#onCreate onCreate()}
-메서드로부터—또한 사용자가 애플리케이션에 처음으로 들어올 통로가 될 수 있는
+<p>그런 다음, 애플리케이션의 기본 액티비티에 있는 {@link android.app.Activity#onCreate onCreate()}
+메서드로부터—또한 사용자가 애플리케이션에 처음으로 들어올 통로가 될 수 있는
다른 모든 액티비티도 포함—{@link android.preference.PreferenceManager#setDefaultValues
setDefaultValues()}를 호출합니다.</p>
@@ -516,9 +516,9 @@
PreferenceManager.setDefaultValues(this, R.xml.advanced_preferences, false);
</pre>
-<p>이것을 {@link android.app.Activity#onCreate onCreate()} 중에 호출하면
-애플리케이션이 기본 설정으로 적절히 초기화되도록 보장할 수 있습니다. 이것은 애플리케이션이
-몇 가지 동작을 결정하기 위해 읽어야 할 수도 있습니다(예를 들어 셀룰러 네트워크에서 데이터를
+<p>이것을 {@link android.app.Activity#onCreate onCreate()} 중에 호출하면
+애플리케이션이 기본 설정으로 적절히 초기화되도록 보장할 수 있습니다. 이것은 애플리케이션이
+몇 가지 동작을 결정하기 위해 읽어야 할 수도 있습니다(예를 들어 셀룰러 네트워크에서 데이터를
다운로드할지 여부 등).</p>
<p>이 메서드는 다음과 같은 세 개의 인수를 취합니다.</p>
@@ -526,73 +526,73 @@
<li>애플리케이션 {@link android.content.Context}.</li>
<li>기본 값을 설정하고자 하는 기본 설정 XML 파일에 대한 리소스 ID입니다.</li>
<li>기본 값을 한 번 이상 설정해야 하는지 여부를 나타내는 부울 값입니다.
-<p><code>false</code>인 경우, 시스템은 이 메서드가 전에 한 번도 호출된 적이 없을 경우에만
+<p><code>false</code>인 경우, 시스템은 이 메서드가 전에 한 번도 호출된 적이 없을 경우에만
기본 값을 설정합니다(아니면 기본 값을 공유한 기본 설정 파일에 있는 {@link android.preference.PreferenceManager#KEY_HAS_SET_DEFAULT_VALUES}
가 안전합니다).</p></li>
</ul>
-<p>세 번째 인수를 <code>false</code>로 설정해 두는 한 이 메서드를 액티비티가 시작될 때마다
-안전하게 호출할 수 있으며, 그렇게 해도 사용자의 저장된 기본 설정을 기본값으로 초기화하여
-재정의하지 않습니다. 하지만 이를 <code>true</code>로 설정하면, 이전의 모든 값을
+<p>세 번째 인수를 <code>false</code>로 설정해 두는 한 이 메서드를 액티비티가 시작될 때마다
+안전하게 호출할 수 있으며, 그렇게 해도 사용자의 저장된 기본 설정을 기본값으로 초기화하여
+재정의하지 않습니다. 하지만 이를 <code>true</code>로 설정하면, 이전의 모든 값을
기본 값으로 재정의하게 됩니다.</p>
<h2 id="PreferenceHeaders">기본 설정 헤더 사용하기</h2>
-<p>드문 경우지만 설정을 디자인할 때 첫 화면에는
-<a href="#Subscreens">보조 화면</a> 목록만 표시하도록 하고자 할 수도 있습니다(예: 시스템 설정 앱,
-그림 4와 5 참조). 그러한 디자인을 Android 3.0 이상을 대상으로 개발하는 경우, Android 3.0에 있는
-새로운 "헤더" 기능을 사용해야 합니다. 이것이 중첩된
+<p>드문 경우지만 설정을 디자인할 때 첫 화면에는
+<a href="#Subscreens">보조 화면</a> 목록만 표시하도록 하고자 할 수도 있습니다(예: 시스템 설정 앱,
+그림 4와 5 참조). 그러한 디자인을 Android 3.0 이상을 대상으로 개발하는 경우, Android 3.0에 있는
+새로운 "헤더" 기능을 사용해야 합니다. 이것이 중첩된
{@link android.preference.PreferenceScreen} 요소를 사용하여 보조 화면을 구축하는 방안을 대신합니다.</p>
<p>헤더를 사용하여 설정을 구축하려면 다음과 같이 해야 합니다.</p>
<ol>
<li>각 설정 그룹을 별개의 {@link
-android.preference.PreferenceFragment} 인스턴스로 구분합니다. 다시 말해, 설정 그룹마다 별도의 XML 파일이 하나씩 있어야 한다는
+android.preference.PreferenceFragment} 인스턴스로 구분합니다. 다시 말해, 설정 그룹마다 별도의 XML 파일이 하나씩 있어야 한다는
뜻입니다.</li>
- <li>각 설정 그룹을 목록으로 나열하는 XML 헤더 파일을 생성하고 어느 프래그먼트에
+ <li>각 설정 그룹을 목록으로 나열하는 XML 헤더 파일을 생성하고 어느 프래그먼트에
상응하는 설정 목록이 들어있는지 선언합니다.</li>
<li>{@link android.preference.PreferenceActivity} 클래스를 확장하여 설정을 호스팅하도록 합니다.</li>
<li>{@link
-android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} 콜백을 구현하여 헤더 파일을
+android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} 콜백을 구현하여 헤더 파일을
나타냅니다.</li>
</ol>
-<p>이 디자인을 사용하는 데 있어 커다란 이점은 {@link android.preference.PreferenceActivity}가
+<p>이 디자인을 사용하는 데 있어 커다란 이점은 {@link android.preference.PreferenceActivity}가
(앱이) 대형 화면에서 실행될 때 그림 4에서 나타낸 것과 같이 창 두 개짜리 레이아웃을 자동으로 표시한다는 것입니다.</p>
-<p>애플리케이션이 Android 3.0 이전 버전을 지원한다 하더라도 애플리케이션이
-{@link android.preference.PreferenceFragment}를 사용하여
-신형 기기에서 창 두 개짜리 표시를 지원하도록 하면서도 구형 기기에서는 일반적인 다중 화면 계층을
-여전히 지원하도록 할 수도 있습니다(<a href="#BackCompatHeaders">기본 설정 헤더로
+<p>애플리케이션이 Android 3.0 이전 버전을 지원한다 하더라도 애플리케이션이
+{@link android.preference.PreferenceFragment}를 사용하여
+신형 기기에서 창 두 개짜리 표시를 지원하도록 하면서도 구형 기기에서는 일반적인 다중 화면 계층을
+여전히 지원하도록 할 수도 있습니다(<a href="#BackCompatHeaders">기본 설정 헤더로
이전 버전 지원하기</a>를 참조하십시오).</p>
<img src="{@docRoot}images/ui/settings/settings-headers-tablet.png" alt="" />
-<p class="img-caption"><strong>그림 4.</strong> 헤더가 있는 창 두 개짜리 레이아웃입니다. <br/><b>1.</b> 헤더는
-XML 헤더 파일로 정의됩니다. <br/><b>2.</b> 각 설정 그룹은
-{@link android.preference.PreferenceFragment}가 정의하며, 이는 헤더 파일에 있는 {@code <header>} 요소가
+<p class="img-caption"><strong>그림 4.</strong> 헤더가 있는 창 두 개짜리 레이아웃입니다. <br/><b>1.</b> 헤더는
+XML 헤더 파일로 정의됩니다. <br/><b>2.</b> 각 설정 그룹은
+{@link android.preference.PreferenceFragment}가 정의하며, 이는 헤더 파일에 있는 {@code <header>} 요소가
지정합니다.</p>
<img src="{@docRoot}images/ui/settings/settings-headers-handset.png" alt="" />
-<p class="img-caption"><strong>그림 5.</strong> 설정 헤더가 있는 핸드셋 기기입니다. 항목을 선택하면
-연관된 {@link android.preference.PreferenceFragment}가 헤더를
+<p class="img-caption"><strong>그림 5.</strong> 설정 헤더가 있는 핸드셋 기기입니다. 항목을 선택하면
+연관된 {@link android.preference.PreferenceFragment}가 헤더를
대체합니다.</p>
<h3 id="CreateHeaders" style="clear:left">헤더 파일 만들기</h3>
-<p>헤더 목록에 있는 각 설정 그룹은 루트 {@code <preference-headers>}
+<p>헤더 목록에 있는 각 설정 그룹은 루트 {@code <preference-headers>}
요소 안에 있는 {@code <header>} 요소 하나로 나타냅니다. 예:</p>
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -607,12 +607,12 @@
<p>{@code <extras>} 요소를 사용하면 키-값 쌍을 {@link
android.os.Bundle} 내의 프래그먼트에 전달할 수 있게 해줍니다. 이 프래그먼트가 인수를 검색하려면 {@link
-android.app.Fragment#getArguments()}를 호출하면 됩니다. 인수를 프래그먼트에 전달하는 데에는 여러 가지 이유가 있을 수 있지만,
+android.app.Fragment#getArguments()}를 호출하면 됩니다. 인수를 프래그먼트에 전달하는 데에는 여러 가지 이유가 있을 수 있지만,
한 가지 중요한 이유를 예로 들면 각 그룹에 대해 {@link
-android.preference.PreferenceFragment}의 같은 하위 클래스를 재사용하고, 이 인수를 사용하여 해당 프래그먼트가 로딩해야 하는
+android.preference.PreferenceFragment}의 같은 하위 클래스를 재사용하고, 이 인수를 사용하여 해당 프래그먼트가 로딩해야 하는
기본 설정 XML 파일이 무엇인지 나타낼 수 있다는 점입니다.</p>
-<p>예를 들어 다음은 여러 가지 설정 그룹에 재사용할 수 있는 프래그먼트입니다. 이것은
+<p>예를 들어 다음은 여러 가지 설정 그룹에 재사용할 수 있는 프래그먼트입니다. 이것은
각 헤더가 {@code "settings"} 키로 {@code <extra>} 인수를 정의하는 경우를 나타낸 것입니다.</p>
<pre>
@@ -636,7 +636,7 @@
<h3 id="DisplayHeaders">헤더 표시하기</h3>
<p>기본 설정 헤더를 표시하려면 {@link
-android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} 콜백 메서드를 구현하고
+android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} 콜백 메서드를 구현하고
{@link android.preference.PreferenceActivity#loadHeadersFromResource
loadHeadersFromResource()}를 호출해야 합니다. 예:</p>
@@ -654,56 +654,56 @@
<p class="note"><strong>참고:</strong> 기본 설정 헤더를 사용하는 경우, {@link
android.preference.PreferenceActivity}의 하위 클래스가 {@link
-android.preference.PreferenceActivity#onCreate onCreate()} 메서드를 구현하지 않아도 됩니다. 액티비티에 대한 필수 작업은
+android.preference.PreferenceActivity#onCreate onCreate()} 메서드를 구현하지 않아도 됩니다. 액티비티에 대한 필수 작업은
헤더를 로딩하는 것뿐이기 때문입니다.</p>
<h3 id="BackCompatHeaders">기본 설정 헤더로 이전 버전 지원하기</h3>
-<p>애플리케이션이 Android 3.0 이전 버전을 지원하는 경우에도 여전히 헤더를 사용하여
-Android 3.0 이상에서 창 두 개짜리 레이아웃을 제공하도록 할 수 있습니다. 개발자가 해야 할 일은 추가로 기본 설정 XML 파일을
+<p>애플리케이션이 Android 3.0 이전 버전을 지원하는 경우에도 여전히 헤더를 사용하여
+Android 3.0 이상에서 창 두 개짜리 레이아웃을 제공하도록 할 수 있습니다. 개발자가 해야 할 일은 추가로 기본 설정 XML 파일을
생성하는 것뿐입니다. 이 파일은 마치 헤더 항목처럼 동작하는 기본적인 {@link android.preference.Preference
-<Preference>} 요소를 사용합니다(이것을 이전 Android 버전이 사용하도록
+<Preference>} 요소를 사용합니다(이것을 이전 Android 버전이 사용하도록
할 예정).</p>
<p>하지만 새로운 {@link android.preference.PreferenceScreen}을 여는 대신 각 {@link
-android.preference.Preference <Preference>} 요소가 {@link android.content.Intent}를 하나씩
-{@link android.preference.PreferenceActivity}에 전송합니다. 이것이 로딩할 XML 파일이 무엇인지를
+android.preference.Preference <Preference>} 요소가 {@link android.content.Intent}를 하나씩
+{@link android.preference.PreferenceActivity}에 전송합니다. 이것이 로딩할 XML 파일이 무엇인지를
나타냅니다.</p>
-<p>예를 들어 다음은 Android 3.0 이상에서 사용되는 기본 설정 헤더에 대한
-XML 파일입니다({@code res/xml/preference_headers.xml}).</p>
+<p>예를 들어 다음은 Android 3.0 이상에서 사용되는 기본 설정 헤더에 대한
+XML 파일입니다({@code res/xml/preference_headers.xml}).</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
</preference-headers>
</pre>
-<p>그리고 다음은, Android 3.0 이전 버전에 같은 헤더를 제공하는 기본 설정
+<p>그리고 다음은, Android 3.0 이전 버전에 같은 헤더를 제공하는 기본 설정
파일입니다({@code res/xml/preference_headers_legacy.xml}).</p>
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -711,13 +711,13 @@
</PreferenceScreen>
</pre>
-<p>{@code <preference-headers>}에 대한 지원이 Android 3.0에서 추가되었기 때문에 시스템이
+<p>{@code <preference-headers>}에 대한 지원이 Android 3.0에서 추가되었기 때문에 시스템이
{@link android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()}를 {@link
-android.preference.PreferenceActivity}에서 호출하는 것은 Android 3.0 이상에서 실행될 때뿐입니다. "레거시" 헤더 파일을
-로딩하려면({@code preference_headers_legacy.xml}) 반드시 Android
+android.preference.PreferenceActivity}에서 호출하는 것은 Android 3.0 이상에서 실행될 때뿐입니다. "레거시" 헤더 파일을
+로딩하려면({@code preference_headers_legacy.xml}) 반드시 Android
버전을 확인해야 하며, 해당 버전이 Android 3.0 이전인 경우({@link
android.os.Build.VERSION_CODES#HONEYCOMB}), {@link
-android.preference.PreferenceActivity#addPreferencesFromResource addPreferencesFromResource()}를 호출하여
+android.preference.PreferenceActivity#addPreferencesFromResource addPreferencesFromResource()}를 호출하여
레거시 헤더 파일을 로딩해야 합니다. 예:</p>
<pre>
@@ -739,8 +739,8 @@
}
</pre>
-<p>이제 남은 할 일이라고는 {@link android.content.Intent}를 처리하는 것뿐입니다. 이것은
-액티비티로 전달되어 어느 기본 설정 파일을 로딩해야 하는지 식별하는 데 쓰입니다. 그럼 이제 인텐트의 작업을 검색하여 기본 설정 XML의
+<p>이제 남은 할 일이라고는 {@link android.content.Intent}를 처리하는 것뿐입니다. 이것은
+액티비티로 전달되어 어느 기본 설정 파일을 로딩해야 하는지 식별하는 데 쓰입니다. 그럼 이제 인텐트의 작업을 검색하여 기본 설정 XML의
{@code <intent>} 태그에서 사용한 알려진 작업 문자열에 비교해보겠습니다.</p>
<pre>
@@ -765,8 +765,8 @@
</pre>
<p>{@link
-android.preference.PreferenceActivity#addPreferencesFromResource addPreferencesFromResource()}를 연이어 호출하면
-모든 기본 설정을 하나의 목록에 쌓게 된다는 점을 유의하십시오. 따라서 이것은 'Else-if' 문이 있는 조건을 변경하여 딱 한 번만
+android.preference.PreferenceActivity#addPreferencesFromResource addPreferencesFromResource()}를 연이어 호출하면
+모든 기본 설정을 하나의 목록에 쌓게 된다는 점을 유의하십시오. 따라서 이것은 'Else-if' 문이 있는 조건을 변경하여 딱 한 번만
호출하도록 주의해야 합니다.</p>
@@ -775,15 +775,15 @@
<h2 id="ReadingPrefs">기본 설정 읽기</h2>
-<p>기본적으로 앱의 기본 설정은 모두
+<p>기본적으로 앱의 기본 설정은 모두
애플리케이션 내의 어디서든 정적 메서드 {@link
android.preference.PreferenceManager#getDefaultSharedPreferences
PreferenceManager.getDefaultSharedPreferences()}를 호출하면 액세스할 수 있는 파일에 저장됩니다. 이것은 {@link
android.content.SharedPreferences} 객체를 반환하며, 여기에 {@link
-android.preference.PreferenceActivity}에서 사용한 {@link android.preference.Preference} 객체와
+android.preference.PreferenceActivity}에서 사용한 {@link android.preference.Preference} 객체와
연관된 모든 키-값 쌍이 들어있습니다.</p>
-<p>예를 들어 다음은 기본 설정 값 중 하나를 애플리케이션 내의 다른 모든 액티비티에서 읽는 방법을
+<p>예를 들어 다음은 기본 설정 값 중 하나를 애플리케이션 내의 다른 모든 액티비티에서 읽는 방법을
나타낸 것입니다.</p>
<pre>
@@ -795,17 +795,17 @@
<h3 id="Listening">기본 설정 변경 수신 대기</h3>
-<p>사용자가 기본 설정 중 하나를 변경하자마자 이에 대해 알림을 받는 것이 좋은 데에는 몇 가지
-이유가 있습니다. 기본 설정 중 어느 하나에라도 변경이 발생했을 때 콜백을 받으려면,
+<p>사용자가 기본 설정 중 하나를 변경하자마자 이에 대해 알림을 받는 것이 좋은 데에는 몇 가지
+이유가 있습니다. 기본 설정 중 어느 하나에라도 변경이 발생했을 때 콜백을 받으려면,
{@link android.content.SharedPreferences.OnSharedPreferenceChangeListener
-SharedPreference.OnSharedPreferenceChangeListener} 인터페이스를 구현하고
+SharedPreference.OnSharedPreferenceChangeListener} 인터페이스를 구현하고
{@link android.content.SharedPreferences} 객체에 대한 수신기를 등록합니다. 이때 {@link
android.content.SharedPreferences#registerOnSharedPreferenceChangeListener
registerOnSharedPreferenceChangeListener()}를 호출하면 됩니다.</p>
<p>이 인터페이스에는 콜백 메서드가 {@link
android.content.SharedPreferences.OnSharedPreferenceChangeListener#onSharedPreferenceChanged
-onSharedPreferenceChanged()} 하나뿐이며, 인터페이스를 액티비티의 일부분으로 구현하는 것이
+onSharedPreferenceChanged()} 하나뿐이며, 인터페이스를 액티비티의 일부분으로 구현하는 것이
가장 쉬운 방법일 공산이 큽니다. 예:</p>
<pre>
@@ -825,19 +825,19 @@
}
</pre>
-<p>이 예시에서 메서드는 변경된 설정이 알려진 기본 설정 키에 대한 것인지 여부를 확인합니다. 이것은
-{@link android.preference.PreferenceActivity#findPreference findPreference()}를 호출하여
-변경된 {@link android.preference.Preference} 객체를 가져오는데, 이렇게 해야 항목의 요약을 수정하여
+<p>이 예시에서 메서드는 변경된 설정이 알려진 기본 설정 키에 대한 것인지 여부를 확인합니다. 이것은
+{@link android.preference.PreferenceActivity#findPreference findPreference()}를 호출하여
+변경된 {@link android.preference.Preference} 객체를 가져오는데, 이렇게 해야 항목의 요약을 수정하여
사용자의 선택에 대한 설명이 되도록 할 수 있습니다. 다시 말해, 설정이 {@link
android.preference.ListPreference} 또는 다른 다중 선택 설정인 경우, 설정이 변경되어 현재 상태를 표시하도록 하면 {@link
-android.preference.Preference#setSummary setSummary()}를 호출해야 한다는 뜻입니다(예를 들어
+android.preference.Preference#setSummary setSummary()}를 호출해야 한다는 뜻입니다(예를 들어
그림 5에 표시된 절전 모드 설정과 같음).</p>
-<p class="note"><strong>참고:</strong> Android 디자인 문서의 <a href="{@docRoot}design/patterns/settings.html">설정</a> 관련 내용에서 설명한 바와 같이, 사용자가 기본 설정을 변경할 때마다
-{@link android.preference.ListPreference}의 요약을 업데이트하는 것을 권장합니다. 이렇게 하여 현재 설정을
+<p class="note"><strong>참고:</strong> Android 디자인 문서의 <a href="{@docRoot}design/patterns/settings.html">설정</a> 관련 내용에서 설명한 바와 같이, 사용자가 기본 설정을 변경할 때마다
+{@link android.preference.ListPreference}의 요약을 업데이트하는 것을 권장합니다. 이렇게 하여 현재 설정을
나타내는 것입니다.</p>
-<p>액티비티에서 적절한 수명 주기 관리를 수행하려면
+<p>액티비티에서 적절한 수명 주기 관리를 수행하려면
{@link android.content.SharedPreferences.OnSharedPreferenceChangeListener}를 등록하고 등록 해제하는 작업은 각각 {@link
android.app.Activity#onResume} 및 {@link android.app.Activity#onPause} 콜백 중에 수행하는 것을 권장합니다.</p>
@@ -859,14 +859,14 @@
<p class="caution"><strong>주의:</strong> {@link
android.content.SharedPreferences#registerOnSharedPreferenceChangeListener
-registerOnSharedPreferenceChangeListener()}를 호출하면
-현재의 경우, 기본 설정 관리자가 수신기에 대한 강력한 참조를 저장하지 않습니다. 반드시 수신기에 대한 강력한
-참조를 저장해야 합니다. 그렇지 않으면 가비지 수집의 대상이 될 가능성이 높습니다. 권장 사항으로는
-수신기를 객체의 인스턴스 데이터 안에 보관하는 것을 추천합니다. 이 객체는
+registerOnSharedPreferenceChangeListener()}를 호출하면
+현재의 경우, 기본 설정 관리자가 수신기에 대한 강력한 참조를 저장하지 않습니다. 반드시 수신기에 대한 강력한
+참조를 저장해야 합니다. 그렇지 않으면 가비지 수집의 대상이 될 가능성이 높습니다. 권장 사항으로는
+수신기를 객체의 인스턴스 데이터 안에 보관하는 것을 추천합니다. 이 객체는
수신기를 필요로 하는 기간만큼 오래 존재할 것이 확실해야 합니다.</p>
-<p>예를 들어 다음 코드에서 발신자는 수신기에 대한 참조를
-보관하지 않습니다. 그 결과 해당 수신기가 가비지 수집의 대상이 되며
+<p>예를 들어 다음 코드에서 발신자는 수신기에 대한 참조를
+보관하지 않습니다. 그 결과 해당 수신기가 가비지 수집의 대상이 되며
향후 언젠가 알 수 없는 시점에 고장을 일으키게 될 것입니다.</p>
<pre>
@@ -879,7 +879,7 @@
});
</pre>
-<p>대신, 수신기에 대한 참조를 수신기가 필요한 기간만큼 오래 존재할 것이 확실한 객체의
+<p>대신, 수신기에 대한 참조를 수신기가 필요한 기간만큼 오래 존재할 것이 확실한 객체의
인스턴스 데이터 필드에 저장하십시오.</p>
<pre>
@@ -895,19 +895,19 @@
<h2 id="NetworkUsage">네트워크 사용량 관리하기</h2>
-<p>Android 4.0부터 시스템의 설정 애플리케이션을 사용하면 사용자가
-애플리케이션이 전경과 배경에 있는 동안 각각 얼마나 많은 네트워크 데이터를 사용하는지 알아볼 수 있게 되었습니다. 그런 다음
-사용자는 각각의 앱에 대해 배경 데이터 사용을 비활성화할 수 있습니다. 사용자가 여러분의 앱이 배경에서
-데이터에 액세스하는 기능을 비활성화하는 사태를 피하려면 데이터 연결을 효율적으로 사용하고
+<p>Android 4.0부터 시스템의 설정 애플리케이션을 사용하면 사용자가
+애플리케이션이 전경과 배경에 있는 동안 각각 얼마나 많은 네트워크 데이터를 사용하는지 알아볼 수 있게 되었습니다. 그런 다음
+사용자는 각각의 앱에 대해 배경 데이터 사용을 비활성화할 수 있습니다. 사용자가 여러분의 앱이 배경에서
+데이터에 액세스하는 기능을 비활성화하는 사태를 피하려면 데이터 연결을 효율적으로 사용하고
사용자가 애플리케이션 설정을 통하여 앱의 데이터 사용량을 미세 조정할 수 있도록 허용해야 합니다.<p>
-<p>예를 들어 사용자에게 앱의 데이터 동기화 빈도를 제어하도록 허용할 수 있습니다. 앱이 Wi-Fi에 있을 때에만
-업로드/다운로드를 수행하도록 할지 여부, 앱이 로밍 중에 데이터를 사용하도록 할지 여부 등을 이렇게 조절합니다. 사용자가
-이러한 제어 기능을 사용할 수 있게 되면 시스템 설정에서 설정한 한도에 가까워지고
-있을 때 앱의 데이터 액세스를 비활성화할 가능성이 낮아집니다. 그 대신 앱이 사용하는 데이터 양을
+<p>예를 들어 사용자에게 앱의 데이터 동기화 빈도를 제어하도록 허용할 수 있습니다. 앱이 Wi-Fi에 있을 때에만
+업로드/다운로드를 수행하도록 할지 여부, 앱이 로밍 중에 데이터를 사용하도록 할지 여부 등을 이렇게 조절합니다. 사용자가
+이러한 제어 기능을 사용할 수 있게 되면 시스템 설정에서 설정한 한도에 가까워지고
+있을 때 앱의 데이터 액세스를 비활성화할 가능성이 낮아집니다. 그 대신 앱이 사용하는 데이터 양을
정밀하게 제어할 수 있기 때문입니다.</p>
-<p>일단 필요한 기본 설정을 {@link android.preference.PreferenceActivity}에
+<p>일단 필요한 기본 설정을 {@link android.preference.PreferenceActivity}에
추가하여 앱의 데이터 습관을 제어하도록 했으면, 다음으로 매니페스트 파일에 있는 {@link
android.content.Intent#ACTION_MANAGE_NETWORK_USAGE}에 대한 인텐트 필터를 추가해야 합니다. 예:</p>
@@ -920,10 +920,10 @@
</activity>
</pre>
-<p>이 인텐트 필터는 이것이 애플리케이션의 데이터 사용량을 제어하는 액티비티라는
-사실을 시스템에 나타내는 역할을 합니다. 따라서, 사용자가 시스템의 설정 앱에서 여러분의 앱이
-얼마나 많은 데이터를 사용하는지 알아볼 때면 <em>애플리케이션 설정 보기</em> 버튼을 사용할 수 있어
-{@link android.preference.PreferenceActivity}를 시작하게 됩니다. 그러면 사용자는
+<p>이 인텐트 필터는 이것이 애플리케이션의 데이터 사용량을 제어하는 액티비티라는
+사실을 시스템에 나타내는 역할을 합니다. 따라서, 사용자가 시스템의 설정 앱에서 여러분의 앱이
+얼마나 많은 데이터를 사용하는지 알아볼 때면 <em>애플리케이션 설정 보기</em> 버튼을 사용할 수 있어
+{@link android.preference.PreferenceActivity}를 시작하게 됩니다. 그러면 사용자는
앱이 사용할 데이터 양을 미세하게 조정할 수 있습니다.</p>
@@ -934,22 +934,22 @@
<h2 id="Custom">사용자 지정 기본 설정 구축하기</h2>
-<p>Android 프레임워크에는 다양한 {@link android.preference.Preference} 하위 클래스가 포함되어 있어
-여러 가지 설정 유형에 맞게 UI를 구축할 수 있습니다.
-하지만, 기본 제공 솔루션이 없는 설정이 필요하게 되는 경우도 있습니다. 예를 들어 숫자 선택기 또는
-날짜 선택기 등이 이에 해당됩니다. 그러한 경우에는 사용자 지정 기본 설정을 만들어야 합니다. 이때
+<p>Android 프레임워크에는 다양한 {@link android.preference.Preference} 하위 클래스가 포함되어 있어
+여러 가지 설정 유형에 맞게 UI를 구축할 수 있습니다.
+하지만, 기본 제공 솔루션이 없는 설정이 필요하게 되는 경우도 있습니다. 예를 들어 숫자 선택기 또는
+날짜 선택기 등이 이에 해당됩니다. 그러한 경우에는 사용자 지정 기본 설정을 만들어야 합니다. 이때
{@link android.preference.Preference} 클래스 또는 다른 하위 클래스 중 하나를 확장하는 방법을 씁니다.</p>
-<p>{@link android.preference.Preference} 클래스를 확장하는 경우, 다음과 같이
+<p>{@link android.preference.Preference} 클래스를 확장하는 경우, 다음과 같이
몇 가지 중요한 해야 할 일이 있습니다.</p>
<ul>
<li>사용자가 설정을 선택하면 나타나는 사용자 인터페이스를 지정합니다.</li>
<li>필요에 따라 설정의 값을 저장합니다.</li>
- <li>{@link android.preference.Preference}가 보이게 되면
+ <li>{@link android.preference.Preference}가 보이게 되면
이를 현재(또는 기본) 값으로 초기화합니다.</li>
<li>시스템이 요청하는 경우 기본 값을 제공합니다.</li>
- <li>{@link android.preference.Preference}가 나름의 UI(예: 대화)를 제공하는 경우, 상태를
+ <li>{@link android.preference.Preference}가 나름의 UI(예: 대화)를 제공하는 경우, 상태를
저장하고 복원하여 수명 주기 변경을 처리할 수 있도록 합니다(예: 사용자가 화면을 돌리는 경우).</li>
</ul>
@@ -959,27 +959,27 @@
<h3 id="CustomSelected">사용자 인터페이스 지정하기</h3>
- <p>{@link android.preference.Preference} 클래스를 직접 확장하는 경우,
-{@link android.preference.Preference#onClick()}을 구현하여 사용자가
-항목을 선택할 때 일어날 동작을 정의해야 합니다. 그러나, 대부분의 사용자 지정 설정은 {@link android.preference.DialogPreference}를 확장하여
+ <p>{@link android.preference.Preference} 클래스를 직접 확장하는 경우,
+{@link android.preference.Preference#onClick()}을 구현하여 사용자가
+항목을 선택할 때 일어날 동작을 정의해야 합니다. 그러나, 대부분의 사용자 지정 설정은 {@link android.preference.DialogPreference}를 확장하여
대화를 표시하도록 합니다. 이렇게 하면 절차가 단순해집니다. {@link
android.preference.DialogPreference}를 확장하는 경우에는 클래스 생성자 중에 반드시 {@link
-android.preference.DialogPreference#setDialogLayoutResource setDialogLayoutResourcs()}를 호출하여
+android.preference.DialogPreference#setDialogLayoutResource setDialogLayoutResourcs()}를 호출하여
대화에 대한 레이아웃을 지정해야 합니다.</p>
<p>예를 들어 다음은 레이아웃을 선언하는 사용자 지정 {@link
-android.preference.DialogPreference}와 기본
+android.preference.DialogPreference}와 기본
긍정적 및 부정적 대화 버튼에 대한 텍스트를 지정하는 생성자입니다.</p>
<pre>
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -992,21 +992,21 @@
<p>설정에 대한 값은 언제든 저장할 수 있습니다. {@link
android.preference.Preference} 클래스의 {@code persist*()} 메서드 중 하나를 호출하기만 하면 됩니다. 예를 들어 설정의 값이 정수인 경우 {@link
-android.preference.Preference#persistInt persistInt()}를, 부울을 저장하려면
+android.preference.Preference#persistInt persistInt()}를, 부울을 저장하려면
{@link android.preference.Preference#persistBoolean persistBoolean()}을 호출하십시오.</p>
-<p class="note"><strong>참고:</strong> 각각의 {@link android.preference.Preference}는 데이터 유형 하나씩만
-저장할 수 있으므로, 사용자 지정
+<p class="note"><strong>참고:</strong> 각각의 {@link android.preference.Preference}는 데이터 유형 하나씩만
+저장할 수 있으므로, 사용자 지정
{@link android.preference.Preference}에서 사용한 데이터 유형에 적절한 {@code persist*()} 메서드를 사용해야 합니다.</p>
<p>설정을 유지하기로 선택하는 시점은 확장하는 지점이 {@link
android.preference.Preference} 클래스인지에 좌우될 수 있습니다. {@link
-android.preference.DialogPreference}를 확장하면 값을 유지하는 것은 대화가 긍정적인 결과로 인해
+android.preference.DialogPreference}를 확장하면 값을 유지하는 것은 대화가 긍정적인 결과로 인해
닫히는 경우만으로 국한해야 합니다(사용자가 "확인(OK)" 버튼을 선택하는 경우).</p>
<p>{@link android.preference.DialogPreference}가 닫히면 시스템이 {@link
-android.preference.DialogPreference#onDialogClosed onDialogClosed()} 메서드를 호출합니다. 이 메서드에는
-부울 인수가 포함되어 있어 사용자의 결과가 "긍정적"인지 아닌지를 나타냅니다. 이 값이
+android.preference.DialogPreference#onDialogClosed onDialogClosed()} 메서드를 호출합니다. 이 메서드에는
+부울 인수가 포함되어 있어 사용자의 결과가 "긍정적"인지 아닌지를 나타냅니다. 이 값이
<code>true</code>인 경우, 사용자가 긍정적 버튼을 선택한 것이고 새 값을 저장해야 합니다. 예:
</p>
@@ -1020,29 +1020,29 @@
}
</pre>
-<p>이 예시에서 <code>mNewValue</code>는 설정의 현재 값을 보유한 클래스
-구성원입니다. {@link android.preference.Preference#persistInt persistInt()}를 호출하면
-{@link android.content.SharedPreferences} 파일에 대한 값을 저장합니다(이
+<p>이 예시에서 <code>mNewValue</code>는 설정의 현재 값을 보유한 클래스
+구성원입니다. {@link android.preference.Preference#persistInt persistInt()}를 호출하면
+{@link android.content.SharedPreferences} 파일에 대한 값을 저장합니다(이
{@link android.preference.Preference}에 대하여 XML 파일에 지정된 키를 자동으로 사용합니다).</p>
<h3 id="CustomInitialize">현재 값 초기화하기</h3>
-<p>시스템이 {@link android.preference.Preference}를 화면에 추가하는 경우, 이는
-{@link android.preference.Preference#onSetInitialValue onSetInitialValue()}를 호출하여
-설정에 유지된 값이 있는지 없는지를 알립니다. 유지된 값이 없는 경우, 이 호출은 기본 값을
+<p>시스템이 {@link android.preference.Preference}를 화면에 추가하는 경우, 이는
+{@link android.preference.Preference#onSetInitialValue onSetInitialValue()}를 호출하여
+설정에 유지된 값이 있는지 없는지를 알립니다. 유지된 값이 없는 경우, 이 호출은 기본 값을
제공합니다.</p>
-<p>{@link android.preference.Preference#onSetInitialValue onSetInitialValue()} 메서드는
-부울 값 <code>restorePersistedValue</code>를 전달하여 해당 설정에 대해 이미 어떤 값이 유지되었는지
-아닌지를 나타냅니다. 만일 이것이 <code>true</code>라면, 유지된 값을 검색하되
+<p>{@link android.preference.Preference#onSetInitialValue onSetInitialValue()} 메서드는
+부울 값 <code>restorePersistedValue</code>를 전달하여 해당 설정에 대해 이미 어떤 값이 유지되었는지
+아닌지를 나타냅니다. 만일 이것이 <code>true</code>라면, 유지된 값을 검색하되
{@link
android.preference.Preference} 클래스의 {@code getPersisted*()} 메서드 중 하나를 호출하는 방법을 써야 합니다. 예를 들어 정수 값이라면 {@link
-android.preference.Preference#getPersistedInt getPersistedInt()}를 사용합니다. 보통은
-유지된 값을 검색하여, UI에 이전에 저장된 값을 반영하여 이를 적절하게 업데이트할 수
+android.preference.Preference#getPersistedInt getPersistedInt()}를 사용합니다. 보통은
+유지된 값을 검색하여, UI에 이전에 저장된 값을 반영하여 이를 적절하게 업데이트할 수
있도록 하는 것이 좋습니다.</p>
-<p><code>restorePersistedValue</code>가 <code>false</code>인 경우,
+<p><code>restorePersistedValue</code>가 <code>false</code>인 경우,
두 번째 인수로 전달된 기본 값을 사용해야 합니다.</p>
<pre>
@@ -1059,22 +1059,22 @@
}
</pre>
-<p>각 {@code getPersisted*()} 메서드는 기본 값을 나타내는 인수를 취하여
-사실은 유지된 값이 전혀 없거나 키 자체가 존재하지 않는 경우 사용하도록 합니다. 위의
+<p>각 {@code getPersisted*()} 메서드는 기본 값을 나타내는 인수를 취하여
+사실은 유지된 값이 전혀 없거나 키 자체가 존재하지 않는 경우 사용하도록 합니다. 위의
예시에서는 혹시 {@link
android.preference.Preference#getPersistedInt getPersistedInt()}가 유지된 값을 반환할 수 없는 경우에 사용하도록 기본 값을 나타내는 데 로컬 상수를 사용하였습니다.</p>
-<p class="caution"><strong>주의:</strong> {@code getPersisted*()} 메서드에서는
-<code>defaultValue</code>를 기본 값으로 사용하면 <strong>안 됩니다</strong>. 이것의 값은
+<p class="caution"><strong>주의:</strong> {@code getPersisted*()} 메서드에서는
+<code>defaultValue</code>를 기본 값으로 사용하면 <strong>안 됩니다</strong>. 이것의 값은
<code>restorePersistedValue</code>가 <code>true</code>이면 항상 null이기 때문입니다.</p>
<h3 id="CustomDefault">기본 값 제공하기</h3>
<p>{@link android.preference.Preference} 클래스의 인스턴스가 기본 값을 나타내는 경우
-({@code android:defaultValue} 속성으로), 시스템은
+({@code android:defaultValue} 속성으로), 시스템은
값을 검색하기 위해 객체를 인스턴트화할 때 {@link android.preference.Preference#onGetDefaultValue
-onGetDefaultValue()}를 호출합니다. 이 메서드를 구현해야
+onGetDefaultValue()}를 호출합니다. 이 메서드를 구현해야
시스템이 {@link
android.content.SharedPreferences}에 있는 기본 값을 저장할 수 있습니다. 예:</p>
@@ -1085,9 +1085,9 @@
}
</pre>
-<p>이 메서드 인수가 여러분에게 필요한 모든 것을 제공합니다. 즉 속성 배열과
-{@code android:defaultValue}의 위치로, 이는 반드시 검색해야 합니다. 이 메서드를
-반드시 구현하여 속성에서 기본 값을 추출해야만 하는 이유는 값이 정의되지 않은 경우, 속성에 대한
+<p>이 메서드 인수가 여러분에게 필요한 모든 것을 제공합니다. 즉 속성 배열과
+{@code android:defaultValue}의 위치로, 이는 반드시 검색해야 합니다. 이 메서드를
+반드시 구현하여 속성에서 기본 값을 추출해야만 하는 이유는 값이 정의되지 않은 경우, 속성에 대한
로컬 기본 값을 꼭 지정해야 하기 때문입니다.</p>
@@ -1095,25 +1095,25 @@
<h3 id="CustomSaveState">기본 설정의 상태 저장 및 복원하기</h3>
<p>레이아웃에서의 {@link android.view.View}와 마찬가지로 {@link android.preference.Preference}
-하위 클래스가 액티비티 또는 프래그먼트가 재시작했을 때
-그 상태를 저장하고 복원하는 역할을 맡습니다(예를 들어 사용자가 화면을 돌리는 경우 등).
-{@link android.preference.Preference} 클래스의 상태를 적절하게 저장하고 복원하려면,
+하위 클래스가 액티비티 또는 프래그먼트가 재시작했을 때
+그 상태를 저장하고 복원하는 역할을 맡습니다(예를 들어 사용자가 화면을 돌리는 경우 등).
+{@link android.preference.Preference} 클래스의 상태를 적절하게 저장하고 복원하려면,
수명 주기 콜백 메서드 {@link android.preference.Preference#onSaveInstanceState
onSaveInstanceState()} 및 {@link
android.preference.Preference#onRestoreInstanceState onRestoreInstanceState()}를 구현해야 합니다.</p>
-<p>{@link android.preference.Preference}의 상태를 정의하는 것은
-{@link android.os.Parcelable} 인터페이스를 구현하는 객체입니다. Android 프레임워크는
+<p>{@link android.preference.Preference}의 상태를 정의하는 것은
+{@link android.os.Parcelable} 인터페이스를 구현하는 객체입니다. Android 프레임워크는
그러한 객체를 제공하여 상태 객체를 정의하는 데 일종의 시작 지점으로 사용하도록 하고 있습니다. 즉 {@link
android.preference.Preference.BaseSavedState} 클래스가 이에 해당됩니다.</p>
-<p>{@link android.preference.Preference} 클래스가 자신의 상태를 저장하는 방법을 정의하려면
-{@link android.preference.Preference.BaseSavedState} 클래스를 확장해야 합니다. 아주 약간의 메서드를 재정의하고
+<p>{@link android.preference.Preference} 클래스가 자신의 상태를 저장하는 방법을 정의하려면
+{@link android.preference.Preference.BaseSavedState} 클래스를 확장해야 합니다. 아주 약간의 메서드를 재정의하고
{@link android.preference.Preference.BaseSavedState#CREATOR}
객체를 정의해야 합니다.</p>
-<p>대부분의 앱에서는 다음과 같은 구현을 복사한 다음,
-{@code value}를 처리하는 줄만 변경하면 됩니다. 이는 {@link android.preference.Preference} 하위 클래스가 정수보다는 데이터
+<p>대부분의 앱에서는 다음과 같은 구현을 복사한 다음,
+{@code value}를 처리하는 줄만 변경하면 됩니다. 이는 {@link android.preference.Preference} 하위 클래스가 정수보다는 데이터
유형을 저장하는 경우 해당됩니다.</p>
<pre>
@@ -1154,11 +1154,11 @@
}
</pre>
-<p>위의 {@link android.preference.Preference.BaseSavedState} 구현을 앱에
-추가하고 나면(주로 {@link android.preference.Preference} 하위 클래스의 하위 클래스로), 이제
+<p>위의 {@link android.preference.Preference.BaseSavedState} 구현을 앱에
+추가하고 나면(주로 {@link android.preference.Preference} 하위 클래스의 하위 클래스로), 이제
{@link android.preference.Preference#onSaveInstanceState
onSaveInstanceState()} 및 {@link
-android.preference.Preference#onRestoreInstanceState onRestoreInstanceState()} 메서드를 구현해야 합니다. 이것은
+android.preference.Preference#onRestoreInstanceState onRestoreInstanceState()} 메서드를 구현해야 합니다. 이것은
{@link android.preference.Preference} 하위 클래스를 위한 것입니다.</p>
<p>예:</p>
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/ko/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/ko/guide/topics/ui/ui-events.jd
index b059bd2..427051c 100644
--- a/docs/html-intl/intl/ko/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/ui-events.jd
@@ -16,67 +16,67 @@
</div>
</div>
-<p>Android에는 사용자와 애플리케이션의 상호 작용으로부터 이벤트를 가로채는 방법이 여러 가지 있습니다.
-사용자 인터페이스 내의 이벤트가 관련된 경우, 이러한 방식은 이벤트를 사용자가 상호 작용하는
+<p>Android에는 사용자와 애플리케이션의 상호 작용으로부터 이벤트를 가로채는 방법이 여러 가지 있습니다.
+사용자 인터페이스 내의 이벤트가 관련된 경우, 이러한 방식은 이벤트를 사용자가 상호 작용하는
특정 보기 객체로부터 캡처하는 것입니다. 이에 필요한 수단은 보기 클래스가 제공합니다.</p>
-<p>레이아웃을 작성하는 데 사용하게 되는 여러 가지 보기 클래스 안을 보면 UI 이벤트에 유용해 보이는 공개 콜백
-메서드가 여러 개 있는 것이 눈에 띕니다. 이러한 메서드는 해당 객체에서 각각의 작업이 발생할 때 Android 프레임워크가
-호출하는 것입니다. 예를 들어 보기(예: 버튼)를 하나 터치하면
-해당 객체에서 <code>onTouchEvent()</code> 메서드가 호출됩니다. 그러나 이것을 가로채려면 클래스를 확장하고
-메서드를 재정의해야 합니다. 다만 그런 이벤트를 처리하기 위해 모든 보기 객체를
-다 확장하는 것은 타당성이 없습니다. 이 때문에 보기 클래스에
-일련의 중첩된 인터페이스가 있고 거기에 훨씬 쉽게 정의할 수 있는 콜백에 있습니다. 이와 같은
+<p>레이아웃을 작성하는 데 사용하게 되는 여러 가지 보기 클래스 안을 보면 UI 이벤트에 유용해 보이는 공개 콜백
+메서드가 여러 개 있는 것이 눈에 띕니다. 이러한 메서드는 해당 객체에서 각각의 작업이 발생할 때 Android 프레임워크가
+호출하는 것입니다. 예를 들어 보기(예: 버튼)를 하나 터치하면
+해당 객체에서 <code>onTouchEvent()</code> 메서드가 호출됩니다. 그러나 이것을 가로채려면 클래스를 확장하고
+메서드를 재정의해야 합니다. 다만 그런 이벤트를 처리하기 위해 모든 보기 객체를
+다 확장하는 것은 타당성이 없습니다. 이 때문에 보기 클래스에
+일련의 중첩된 인터페이스가 있고 거기에 훨씬 쉽게 정의할 수 있는 콜백에 있습니다. 이와 같은
인터페이스를 일명 <a href="#EventListeners">이벤트 수신기</a>라고 하는데, 이것이 UI와 사용자 상호 작용을 캡처하는 데 아주 적합합니다.</p>
-<p>사용자 상호 작용을 수신 대기하는 데에는 이벤트 수신기를 사용하는 것이 좀 더 보편적이지만, 사용자 지정
-구성 요소를 구축하기 위해 보기 클래스를 확장하고자 하는 상황이 올 수도 있습니다.
+<p>사용자 상호 작용을 수신 대기하는 데에는 이벤트 수신기를 사용하는 것이 좀 더 보편적이지만, 사용자 지정
+구성 요소를 구축하기 위해 보기 클래스를 확장하고자 하는 상황이 올 수도 있습니다.
어쩌면 {@link android.widget.Button}
-클래스를 확장하여 무언가 더 복잡한 것을 만들고자 할 수도 있습니다. 이런 경우, 클래스에 대한 기본 이벤트 행동을 클래스
+클래스를 확장하여 무언가 더 복잡한 것을 만들고자 할 수도 있습니다. 이런 경우, 클래스에 대한 기본 이벤트 행동을 클래스
<a href="#EventHandlers">이벤트 처리기</a>를 사용하여 정의할 수 있습니다.</p>
<h2 id="EventListeners">이벤트 수신기</h2>
-<p>이벤트 수신기란 {@link android.view.View} 클래스 내에 있는 일종의 인터페이스로, 이 안에 하나의
-콜백 메서드가 들어있습니다. 이러한 메서드는 수신기가 등록된 보기가 UI 안의 항목과 사용자의 상호 작용으로 인하여 트리거되었을 때
+<p>이벤트 수신기란 {@link android.view.View} 클래스 내에 있는 일종의 인터페이스로, 이 안에 하나의
+콜백 메서드가 들어있습니다. 이러한 메서드는 수신기가 등록된 보기가 UI 안의 항목과 사용자의 상호 작용으로 인하여 트리거되었을 때
Android 프레임워크가 호출하는 것입니다.</p>
<p>이벤트 수신기 인터페이스에 포함된 콜백 메서드는 다음과 같습니다.</p>
<dl>
<dt><code>onClick()</code></dt>
- <dd>{@link android.view.View.OnClickListener}에서 온 것입니다.
+ <dd>{@link android.view.View.OnClickListener}에서 온 것입니다.
이것이 호출되는 것은 사용자가 항목을 터치하거나
-(터치 모드에 있을 때), 탐색 키 또는 트랙볼을 사용하여 해당 항목에 초점을 맞추고 있으면서
+(터치 모드에 있을 때), 탐색 키 또는 트랙볼을 사용하여 해당 항목에 초점을 맞추고 있으면서
적절한 "엔터" 키를 누르거나 트랙볼을 꾹 누를 때입니다.</dd>
<dt><code>onLongClick()</code></dt>
- <dd>{@link android.view.View.OnLongClickListener}에서 온 것입니다.
-이것이 호출되는 것은 사용자가 항목을 길게 누르거나(터치 모드에 있을 때),
-탐색 키 또는 트랙볼을 사용하여 해당 항목에 초점을 맞추고 있으면서
+ <dd>{@link android.view.View.OnLongClickListener}에서 온 것입니다.
+이것이 호출되는 것은 사용자가 항목을 길게 누르거나(터치 모드에 있을 때),
+탐색 키 또는 트랙볼을 사용하여 해당 항목에 초점을 맞추고 있으면서
적절한 "엔터" 키를 누르거나 트랙볼을 꾹 누를 때입니다(일 초간).</dd>
<dt><code>onFocusChange()</code></dt>
- <dd>{@link android.view.View.OnFocusChangeListener}에서 온 것입니다.
+ <dd>{@link android.view.View.OnFocusChangeListener}에서 온 것입니다.
이것이 호출되는 것은 사용자가 탐색 키 또는 트랙볼을 사용하여 항목 쪽으로 이동하거나 항목에서 멀어질 때입니다.</dd>
<dt><code>onKey()</code></dt>
- <dd>{@link android.view.View.OnKeyListener}에서 온 것입니다.
+ <dd>{@link android.view.View.OnKeyListener}에서 온 것입니다.
이것이 호출되는 것은 사용자가 항목에 초점을 맞추고 있으면서 기기에 있는 하드웨어 키를 누르거나 키에서 손을 떼는 경우입니다.</dd>
<dt><code>onTouch()</code></dt>
- <dd>{@link android.view.View.OnTouchListener}에서 온 것입니다.
-이것이 호출되는 것은 사용자가 터치 이벤트로서의 자격을 만족하는 작업을 수행하는 경우로, 여기에
+ <dd>{@link android.view.View.OnTouchListener}에서 온 것입니다.
+이것이 호출되는 것은 사용자가 터치 이벤트로서의 자격을 만족하는 작업을 수행하는 경우로, 여기에
누르기, 손 떼기와 화면에서 이루어지는 모든 움직임 동작(항목의 경계 내에서)이 포함됩니다.</dd>
<dt><code>onCreateContextMenu()</code></dt>
- <dd>{@link android.view.View.OnCreateContextMenuListener}에서 온 것입니다.
-이것을 호출하는 것은 컨텍스트 메뉴가 구축되는 중일 때입니다(정체된 "롱 클릭"의 결과로).
+ <dd>{@link android.view.View.OnCreateContextMenuListener}에서 온 것입니다.
+이것을 호출하는 것은 컨텍스트 메뉴가 구축되는 중일 때입니다(정체된 "롱 클릭"의 결과로).
<a href="{@docRoot}guide/topics/ui/menus.html#context-menu">메뉴</a>
개발자 가이드에 있는 컨텍스트 메뉴 관련 논의를 참조하십시오.</dd>
</dl>
-<p>이러한 메서드는 각자의 인터페이스 안에 거주하는 유일한 주민입니다. 이러한 메서드 중 하나를
-정의하고 이벤트를 처리하려면 액티비티 내의 중첩된 인터페이스를 구현하거나 익명의 클래스로 정의하면 됩니다.
-그런 다음 구현의 인스턴스 하나를
-각각의 <code>View.set...Listener()</code> 메서드에 전달하십시오 (예:
-<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>를
+<p>이러한 메서드는 각자의 인터페이스 안에 거주하는 유일한 주민입니다. 이러한 메서드 중 하나를
+정의하고 이벤트를 처리하려면 액티비티 내의 중첩된 인터페이스를 구현하거나 익명의 클래스로 정의하면 됩니다.
+그런 다음 구현의 인스턴스 하나를
+각각의 <code>View.set...Listener()</code> 메서드에 전달하십시오 (예:
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>를
호출한 다음 이를 {@link android.view.View.OnClickListener OnClickListener}의 구현에 전달합니다).</p>
<p>아래의 예시는 버튼에 대하여 온-클릭 수신기를 등록하는 방법을 나타낸 것입니다. </p>
@@ -117,57 +117,57 @@
}
</pre>
-<p>위의 예시에서 <code>onClick()</code> 콜백에는
-반환 값이 없지만 다른 이벤트 수신기 메서드 중에는 부울 값을 반환해야만 하는 것도 있다는 점을 유의하십시오. 그 이유는 이벤트에 따라
+<p>위의 예시에서 <code>onClick()</code> 콜백에는
+반환 값이 없지만 다른 이벤트 수신기 메서드 중에는 부울 값을 반환해야만 하는 것도 있다는 점을 유의하십시오. 그 이유는 이벤트에 따라
다릅니다. 이런 필수 사항이 적용되는 몇몇 메서드의 경우, 이유는 다음과 같습니다.</p>
<ul>
- <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
-이것은 부울 값을 반환하여 이벤트를 완전히 사용하였으며 더 이상 이를 담지 않아도 되는지 여부를 나타냅니다.
-다시 말해, <em>참</em>을 반환하면 이벤트를 처리했으며 여기에서 중단해야 한다는 것을 의미하며
-<em>거짓</em>을 반환하면 이벤트가 아직 미처리 상태이며/거나 이 이벤트를 다른
-온-클릭 수신기로 계속 진행해야 할지 나타내는 것입니다.</li>
- <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
+ <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
이것은 부울 값을 반환하여 이벤트를 완전히 사용하였으며 더 이상 이를 담지 않아도 되는지 여부를 나타냅니다.
- 다시 말해, <em>참</em>을 반환하면 이벤트를 처리했으며 여기에서 중단해야 한다는 것을 의미하며
-<em>거짓</em>을 반환하면 이벤트가 아직 미처리 상태이며/거나 이 이벤트를 다른
+다시 말해, <em>참</em>을 반환하면 이벤트를 처리했으며 여기에서 중단해야 한다는 것을 의미하며
+<em>거짓</em>을 반환하면 이벤트가 아직 미처리 상태이며/거나 이 이벤트를 다른
+온-클릭 수신기로 계속 진행해야 할지 나타내는 것입니다.</li>
+ <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
+이것은 부울 값을 반환하여 이벤트를 완전히 사용하였으며 더 이상 이를 담지 않아도 되는지 여부를 나타냅니다.
+ 다시 말해, <em>참</em>을 반환하면 이벤트를 처리했으며 여기에서 중단해야 한다는 것을 의미하며
+<em>거짓</em>을 반환하면 이벤트가 아직 미처리 상태이며/거나 이 이벤트를 다른
온-키 수신기로 계속 진행해야 할지 나타내는 것입니다.</li>
- <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
-이것은 부울 값을 반환하여 수신기가 이 이벤트를 사용하는지 아닌지를 나타냅니다. 여기서 중요한 점은
-이 이벤트에는 서로 연달아 발생하는 여러 개의 작업이 있을 수 있다는 것입니다. 그러므로 '아래로' 작업 이벤트를 수신했을 때 <em>거짓</em>을 반환하면,
-해당 이벤트를 사용하지 않았으며 이 이벤트로부터 이어지는 이후의 작업에
-흥미가 없음을 나타내는 것이 됩니다. 따라서 이 이벤트 내의 다른 모든 작업에 대해
+ <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
+이것은 부울 값을 반환하여 수신기가 이 이벤트를 사용하는지 아닌지를 나타냅니다. 여기서 중요한 점은
+이 이벤트에는 서로 연달아 발생하는 여러 개의 작업이 있을 수 있다는 것입니다. 그러므로 '아래로' 작업 이벤트를 수신했을 때 <em>거짓</em>을 반환하면,
+해당 이벤트를 사용하지 않았으며 이 이벤트로부터 이어지는 이후의 작업에
+흥미가 없음을 나타내는 것이 됩니다. 따라서 이 이벤트 내의 다른 모든 작업에 대해
호출되지 않습니다(예: 손가락 동작 또는 최종적인 '위로' 작업 이벤트 등).</li>
</ul>
-<p>하드웨어 키 이벤트는 항상 현재 초점의 중심에 있는 보기로 전달된다는 점을 명심하십시오. 이들은 보기 계층의 맨 위에서 시작하여
-아래 방향으로 발송되어 적절한 목적지에 도달할 때까지 계속합니다. 보기(또는 보기의 하위)에
+<p>하드웨어 키 이벤트는 항상 현재 초점의 중심에 있는 보기로 전달된다는 점을 명심하십시오. 이들은 보기 계층의 맨 위에서 시작하여
+아래 방향으로 발송되어 적절한 목적지에 도달할 때까지 계속합니다. 보기(또는 보기의 하위)에
현재 초점이 맞춰져 있으면, 이벤트가 <code>{@link android.view.View#dispatchKeyEvent(KeyEvent)
-dispatchKeyEvent()}</code> 메서드를 통과하여 이동하는 것을 확인할 수 있습니다. 보기를 통해 키 이벤트를 캡처하는 대신, 액티비티 내부의 모든 이벤트를 <code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code>및
+dispatchKeyEvent()}</code> 메서드를 통과하여 이동하는 것을 확인할 수 있습니다. 보기를 통해 키 이벤트를 캡처하는 대신, 액티비티 내부의 모든 이벤트를 <code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code>및
<code>{@link android.app.Activity#onKeyUp(int,KeyEvent) onKeyUp()}</code>을 사용하여 수신할 수도 있습니다.</p>
-<p>또한, 애플리케이션에 대한 텍스트 입력의 경우 대다수의 기기에는 소프트웨어 입력 메서드만 있다는 사실을
-명심하십시오. 그러한 메서드는 반드시 키 기반이 아니어도 됩니다. 음성 입력, 손글씨 등을 사용하는 것도 있습니다. 입력
-메서드가 키보드 같은 인터페이스를 표시하더라도 일반적으로
-<code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code> 이벤트군을 트리거하지는 <strong>않습니다</strong>. 특정 키 누름을
-제어해야만 하는 UI는 절대 구축하면 안 됩니다. 이렇게 하면 애플리케이션이 하드웨어 키보드가 있는
-기기에만 한정됩니다. 특히, 사용자가 리턴 키를 누르면 입력의 유효성을 검사하는 데 이와 같은 메서드에
-의존해서는 안 됩니다. 대신, {@link android.view.inputmethod.EditorInfo#IME_ACTION_DONE}과 같은 작업을 사용하여 애플리케이션이 반응할 것으로 기대되는 방식에 해당되는
-입력 메서드를 신호하여 의미 있는 방식으로 UI를 변경할 수 있게 하는 것이 좋습니다. 소프트웨어 입력 메서드가
+<p>또한, 애플리케이션에 대한 텍스트 입력의 경우 대다수의 기기에는 소프트웨어 입력 메서드만 있다는 사실을
+명심하십시오. 그러한 메서드는 반드시 키 기반이 아니어도 됩니다. 음성 입력, 손글씨 등을 사용하는 것도 있습니다. 입력
+메서드가 키보드 같은 인터페이스를 표시하더라도 일반적으로
+<code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code> 이벤트군을 트리거하지는 <strong>않습니다</strong>. 특정 키 누름을
+제어해야만 하는 UI는 절대 구축하면 안 됩니다. 이렇게 하면 애플리케이션이 하드웨어 키보드가 있는
+기기에만 한정됩니다. 특히, 사용자가 리턴 키를 누르면 입력의 유효성을 검사하는 데 이와 같은 메서드에
+의존해서는 안 됩니다. 대신, {@link android.view.inputmethod.EditorInfo#IME_ACTION_DONE}과 같은 작업을 사용하여 애플리케이션이 반응할 것으로 기대되는 방식에 해당되는
+입력 메서드를 신호하여 의미 있는 방식으로 UI를 변경할 수 있게 하는 것이 좋습니다. 소프트웨어 입력 메서드가
어떻게 작동할지 임의로 추정하지 마시고, 이미 서식 지정된 텍스트를 애플리케이션에 제공해줄 것이라 믿으면 됩니다.</p>
-<p class="note"><strong>참고:</strong> Androids는 우선 이벤트 처리기부터 호출하고, 그 다음에 클래스 정의로부터 가져온
-적절한 기본 처리기를 두 번째로 호출합니다. 따라서, 이와 같은 이벤트 수신기에서 <em>참</em>을 반환하면 이벤트가
-다른 이벤트 수신기로 전파되는 것을 중지시킬 뿐만 아니라 보기에 있는
+<p class="note"><strong>참고:</strong> Androids는 우선 이벤트 처리기부터 호출하고, 그 다음에 클래스 정의로부터 가져온
+적절한 기본 처리기를 두 번째로 호출합니다. 따라서, 이와 같은 이벤트 수신기에서 <em>참</em>을 반환하면 이벤트가
+다른 이벤트 수신기로 전파되는 것을 중지시킬 뿐만 아니라 보기에 있는
기본 이벤트 처리기로의 콜백도 차단하게 됩니다. 따라서 <em>참</em>을 반환하는 경우 해당 이벤트를 종료하고 싶은 것인지 확신해야 합니다.</p>
<h2 id="EventHandlers">이벤트 처리기</h2>
-<p>보기에서 사용자 지정 구성 요소를 구축하는 경우, 기본 이벤트 처리기로 사용될 콜백 메서드를
+<p>보기에서 사용자 지정 구성 요소를 구축하는 경우, 기본 이벤트 처리기로 사용될 콜백 메서드를
여러 개 정의할 수 있게 됩니다.
<a href="{@docRoot}guide/topics/ui/custom-components.html">사용자 지정
-구성 요소</a>에 대한 문서를 보면 이벤트 처리에 사용되는 몇 가지 보편적인 콜백을 확인할 수 있습니다.
+구성 요소</a>에 대한 문서를 보면 이벤트 처리에 사용되는 몇 가지 보편적인 콜백을 확인할 수 있습니다.
다음은 그 몇 가지 예입니다.</p>
<ul>
<li><code>{@link android.view.View#onKeyDown}</code> - 새로운 키 이벤트가 발생하면 호출합니다.</li>
@@ -176,68 +176,68 @@
<li><code>{@link android.view.View#onTouchEvent}</code> - 터치 스크린 동작 이벤트가 발생하면 호출합니다.</li>
<li><code>{@link android.view.View#onFocusChanged}</code> - 보기가 초점을 취하거나 이를 잃으면 호출합니다.</li>
</ul>
-<p>개발자 여러분이 알아두어야 하는 다른 메서드가 몇 가지 더 있습니다. 이들은 보기 클래스의 일부분이 아니지만,
-이벤트를 처리할 수 있는 방식에 직접적으로 영향을 미칠 수 있는 것들입니다. 그러니, 레이아웃 안에서 좀 더 복잡한 이벤트를 관리하는 경우,
+<p>개발자 여러분이 알아두어야 하는 다른 메서드가 몇 가지 더 있습니다. 이들은 보기 클래스의 일부분이 아니지만,
+이벤트를 처리할 수 있는 방식에 직접적으로 영향을 미칠 수 있는 것들입니다. 그러니, 레이아웃 안에서 좀 더 복잡한 이벤트를 관리하는 경우,
이와 같은 다른 메서드도 고려하십시오.</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code> - 이것을 사용하면 {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code> - 이것을 사용하면 {@link
android.app.Activity}로 하여금 모든 터치 이벤트가 창으로 발송되기 전에 이들을 가로채도록 할 수 있습니다.</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - 이것을 사용하면 {@link
android.view.ViewGroup}으로 하여금 이벤트가 하위 보기로 발송되는 것을 지켜보도록 할 수 있습니다.</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
- ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - 이것을
-호출하는 것은 상위 보기에 <code>{@link
+ ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - 이것을
+호출하는 것은 상위 보기에 <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>가 있는 터치 이벤트를 가로채면 안 된다고 나타낼 때입니다.</li>
</ul>
<h2 id="TouchMode">터치 모드</h2>
<p>
-사용자가 방향 키 또는 트랙볼을 사용하여 사용자 인터페이스를 탐색하고 있는 경우,
-조치 가능한 항목(예: 버튼)에 초점을 맞춰 어느 것이 입력을 허용할지 사용자가
-볼 수 있도록 해야 합니다. 하지만 기기에 터치 기능이 있고 사용자가
-인터페이스를 터치하여 인터페이스와의 상호 작용을 시작하는 경우라면, 더 이상 항목을 강조 표시하거나
-특정 보기에 초점을 맞추지 않아도 됩니다. 따라서 "터치 모드"라고 불리는 상호 작용에 대한
-모드가 따로 있습니다.
+사용자가 방향 키 또는 트랙볼을 사용하여 사용자 인터페이스를 탐색하고 있는 경우,
+조치 가능한 항목(예: 버튼)에 초점을 맞춰 어느 것이 입력을 허용할지 사용자가
+볼 수 있도록 해야 합니다. 하지만 기기에 터치 기능이 있고 사용자가
+인터페이스를 터치하여 인터페이스와의 상호 작용을 시작하는 경우라면, 더 이상 항목을 강조 표시하거나
+특정 보기에 초점을 맞추지 않아도 됩니다. 따라서 "터치 모드"라고 불리는 상호 작용에 대한
+모드가 따로 있습니다.
</p>
<p>
-터치 기능이 있는 기기의 경우, 사용자가 화면을 터치하면 기기가 터치 모드에
-진입하게 됩니다. 이 시점부터는
-{@link android.view.View#isFocusableInTouchMode}가 참인 보기에만 초점을 맞출 수 있습니다. 예를 들어 텍스트 편집 위젯이 이에 해당됩니다.
-버튼처럼 터치할 수 있는 다른 보기의 경우 터치해도 주의를 끌 수 없으며 이를 누르면 그저
+터치 기능이 있는 기기의 경우, 사용자가 화면을 터치하면 기기가 터치 모드에
+진입하게 됩니다. 이 시점부터는
+{@link android.view.View#isFocusableInTouchMode}가 참인 보기에만 초점을 맞출 수 있습니다. 예를 들어 텍스트 편집 위젯이 이에 해당됩니다.
+버튼처럼 터치할 수 있는 다른 보기의 경우 터치해도 주의를 끌 수 없으며 이를 누르면 그저
온-클릭 수신기를 실행시키기만 합니다.
</p>
<p>
-사용자가 방향 키를 누르거나 트랙볼로 스크롤 동작을 할 때마다 기기가
-터치 모드를 종료하고 초점을 맞출 보기를 찾습니다. 이제 사용자는 사용자 인터페이스와
+사용자가 방향 키를 누르거나 트랙볼로 스크롤 동작을 할 때마다 기기가
+터치 모드를 종료하고 초점을 맞출 보기를 찾습니다. 이제 사용자는 사용자 인터페이스와
상호 작용을 재개해도 되며, 화면을 터치하지 않아도 됩니다.
</p>
<p>
-터치 모드 상태는 시스템 전체를 통틀어 유지됩니다(모든 창과 액티비티 포함).
-현재 상태를 쿼리하려면
+터치 모드 상태는 시스템 전체를 통틀어 유지됩니다(모든 창과 액티비티 포함).
+현재 상태를 쿼리하려면
{@link android.view.View#isInTouchMode}를 호출하여 기기가 현재 터치 모드에 있는지 확인하면 됩니다.
</p>
<h2 id="HandlingFocus">초점 처리하기</h2>
-<p>프레임워크가 사용자 입력에 응답하여 일상적인 초점 이동을 처리합니다.
-여기에는 보기가 제거되거나 숨겨지는 것, 또는 새 보기를 사용할 수 있게 됨에 따라
-초점을 변경하는 것이 포함됩니다. 보기는 초점을 취하고자 하는 의향을
-<code>{@link android.view.View#isFocusable()}</code> 메서드를 통해 나타냅니다. 보기가 초점을 취할 수 있는지 여부를 변경하려면
-<code>{@link android.view.View#setFocusable(boolean) setFocusable()}</code>을 호출합니다. 터치 모드에 있는 경우,
-어느 보기가 <code>{@link android.view.View#isFocusableInTouchMode()}</code>로 초점을 취하는 것을 허용하는지 여부를 쿼리할 수 있습니다.
+<p>프레임워크가 사용자 입력에 응답하여 일상적인 초점 이동을 처리합니다.
+여기에는 보기가 제거되거나 숨겨지는 것, 또는 새 보기를 사용할 수 있게 됨에 따라
+초점을 변경하는 것이 포함됩니다. 보기는 초점을 취하고자 하는 의향을
+<code>{@link android.view.View#isFocusable()}</code> 메서드를 통해 나타냅니다. 보기가 초점을 취할 수 있는지 여부를 변경하려면
+<code>{@link android.view.View#setFocusable(boolean) setFocusable()}</code>을 호출합니다. 터치 모드에 있는 경우,
+어느 보기가 <code>{@link android.view.View#isFocusableInTouchMode()}</code>로 초점을 취하는 것을 허용하는지 여부를 쿼리할 수 있습니다.
이것은 <code>{@link android.view.View#setFocusableInTouchMode(boolean) setFocusableInTouchMode()}</code>로 변경하면 됩니다.
</p>
-<p>초점 이동은 주어진 방향에서 가장 가까운 이웃을 찾아내는 알고리즘을 기반으로
-합니다. 드문 일이지만 기본 알고리즘이 개발자가 의도한 행동과 일치하지 않는
-경우도 있습니다. 이러한 상황이라면, 레이아웃 파일에서 다음과 같은 XML 속성을
+<p>초점 이동은 주어진 방향에서 가장 가까운 이웃을 찾아내는 알고리즘을 기반으로
+합니다. 드문 일이지만 기본 알고리즘이 개발자가 의도한 행동과 일치하지 않는
+경우도 있습니다. 이러한 상황이라면, 레이아웃 파일에서 다음과 같은 XML 속성을
사용하여 명시적 재정의를 제공하면 됩니다.
<var>nextFocusDown</var>, <var>nextFocusLeft</var>, <var>nextFocusRight</var>, 및
-<var>nextFocusUp</var>입니다. 이와 같은 속성 중 한 가지를 초점이 <em>떠나고</em> 있는 보기에
-추가합니다. 속성의 값을 초점을
+<var>nextFocusUp</var>입니다. 이와 같은 속성 중 한 가지를 초점이 <em>떠나고</em> 있는 보기에
+추가합니다. 속성의 값을 초점을
<em>맞춰야 할</em> 보기의 ID가 되도록 정의합니다. 예:</p>
<pre>
<LinearLayout
@@ -252,18 +252,18 @@
</LinearLayout>
</pre>
-<p>보통은 이런 수직 레이아웃에서 첫 버튼부터 위로 이동하면 아무 데도 갈 수 없고,
-두 번째 버튼에서 아래로 이동해도 마찬가지입니다. 이제 맨 위 버튼이 맨 아래 버튼을 다음과 같이
-정의했습니다. <var>nextFocusUp</var> (반대쪽도 마찬가지) 따라서 이동 초점은 위에서 아래로 갔다가
+<p>보통은 이런 수직 레이아웃에서 첫 버튼부터 위로 이동하면 아무 데도 갈 수 없고,
+두 번째 버튼에서 아래로 이동해도 마찬가지입니다. 이제 맨 위 버튼이 맨 아래 버튼을 다음과 같이
+정의했습니다. <var>nextFocusUp</var> (반대쪽도 마찬가지) 따라서 이동 초점은 위에서 아래로 갔다가
아래에서 위로 순환하게 됩니다.</p>
-<p>보기를 UI에서 초점을 맞출 수 있는 것으로 선언하고자 하는 경우(일반적으로는 그렇지 않음),
-보기에 레이아웃 선언에서 <code>android:focusable</code> XML 속성을 추가합니다.
-이 값을 <var>참</var>으로 설정합니다. 터치 모드에 있을 때에도 보기를 초점을 맞출 수 있는 것으로
+<p>보기를 UI에서 초점을 맞출 수 있는 것으로 선언하고자 하는 경우(일반적으로는 그렇지 않음),
+보기에 레이아웃 선언에서 <code>android:focusable</code> XML 속성을 추가합니다.
+이 값을 <var>참</var>으로 설정합니다. 터치 모드에 있을 때에도 보기를 초점을 맞출 수 있는 것으로
선언할 수 있습니다. <code>android:focusableInTouchMode</code>를 사용하면 됩니다.</p>
<p>특정 보기에 초점을 맞추기를 요청하려면, <code>{@link android.view.View#requestFocus()}</code>를 호출하십시오.</p>
-<p>초점 이벤트를 수신 대기하려면(어떤 보기에 초점이 맞춰지거나 이를 잃는 경우 알림을 받으려면),
-<code>{@link android.view.View.OnFocusChangeListener#onFocusChange(View,boolean) onFocusChange()}</code>를 사용하면 됩니다.
+<p>초점 이벤트를 수신 대기하려면(어떤 보기에 초점이 맞춰지거나 이를 잃는 경우 알림을 받으려면),
+<code>{@link android.view.View.OnFocusChangeListener#onFocusChange(View,boolean) onFocusChange()}</code>를 사용하면 됩니다.
이는 위의 <a href="#EventListeners">이벤트 수신기</a> 섹션에서 이야기한 바와 같습니다.</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/ko/preview/_book.yaml b/docs/html-intl/intl/ko/preview/_book.yaml
deleted file mode 100644
index 17b1d96..0000000
--- a/docs/html-intl/intl/ko/preview/_book.yaml
+++ /dev/null
@@ -1,342 +0,0 @@
-toc:
-- title: 프로그램 개요
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ikhtisar Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: 지원 및 릴리스 노트
- path: /preview/support.html
-
-- title: Preview 설정
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Preview
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: 기기에 대한 테스트
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Pruebe en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: 동작 변경 사항
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: 백그라운드 최적화
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: 언어 및 로케일
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 總覽
- section:
- - title: 다중 창 지원
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: 알림
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: Data Saver
- path: /preview/features/data-saver.html
- - title: TV 녹화
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: 네트워크 보안 구성
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: ICU4J 지원
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: API de ICU4J del framework de Android
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android 框架 API
- - name: zh-tw-lang
- value: ICU4J Android 架構 API
- - title: Java 8 언어 기능
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 语言功能
- - name: zh-tw-lang
- value: Java 8 語言功能
- - title: Android for Work 업데이트
- path: /preview/features/afw.html
- - title: 범위가 지정된 디렉터리 액세스
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: 샘플
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: 라이선스 계약
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html-intl/intl/ko/preview/api-overview.jd b/docs/html-intl/intl/ko/preview/api-overview.jd
deleted file mode 100644
index fdae406..0000000
--- a/docs/html-intl/intl/ko/preview/api-overview.jd
+++ /dev/null
@@ -1,1039 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>주요 개발자 기능</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">다중 창 지원</a></li>
- <li><a href="#notification_enhancements">알림</a></li>
- <li><a href="#jit_aot">JIT/AOT 컴파일</a></li>
- <li><a href="#quick_path_to_app_install">앱 설치를 위한 빠른 경로</a></li>
- <li><a href="#doze_on_the_go">이동 중 잠자기 모드</a></li>
- <li><a href="#background_optimizations">백그라운드 최적화</a></li>
- <li><a href="#data_saver">Data Saver</a></li>
- <li><a href="#vulkan">Vulkan API</a></li>
- <li><a href="#tile_api">Quick Settings 타일 API</a></li>
- <li><a href="#number-blocking">번호 차단</a></li>
- <li><a href="#call_screening">통화 스크리닝</a></li>
- <li><a href="#multi-locale_languages">로케일 및 언어</a></li>
- <li><a href="#emoji">새 이모티콘</a></li>
- <li><a href="#icu4">Android의 ICU4J API</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Android TV 녹화</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">접근성</a></li>
- <li><a href="#direct_boot">직접 부팅</a></li>
- <li><a href="#key_attestation">Key Attestation</a></li>
- <li><a href="#network_security_config">네트워크 보안 구성</a></li>
- <li><a href="#default_trusted_ca">신뢰할 수 있는 기본 CA</a></li>
- <li><a href="#apk_signature_v2">APK Signature Scheme v2</a></li>
- <li><a href="#scoped_directory_access">범위가 지정된 디렉터리 액세스</a></li>
- <li><a href="#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a></li>
- <li><a href="#sustained_performance_api">지속적인 성능 API</a></li>
- <li><a href="#vr">VR 지원</a></li>
- <li><a href="#print_svc">인쇄 서비스 개선 사항</a></li>
- <li><a href="#virtual_files">가상 파일</a></li>
- <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N은 아직 한창 개발 중이지만, N Developer Preview를
-통해 지금 Android N을 일부 체험해 볼 수 있습니다. 아래 섹션에서는
-개발자를 위한 몇 가지 새로운 기능을 중점적으로 다룹니다. </p>
-
-<p>
- 플랫폼 변경 사항이 앱에 영향을 미칠 수도 있는 부분에
-대해 알아보려면 <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>을 살펴보고,
- 주요 기능에 대해 자세히 알아보려면 개발자 가이드를 참조하고, 새로운 API에 대한 자세한
-내용을 보려면 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>를 다운로드하세요.
-</p>
-
-<h2 id="multi-window_support">다중 창 지원</h2>
-
-
-<p>Android N에서 저희는 요청이 많은 새로운 멀티태스킹
-기능인 다중 창 지원을 플랫폼에 도입하고 있습니다. </p>
-
- <p>이제 사용자가 화면에서 두 개의 앱을 동시에 열 수 있습니다. </p>
- <ul>
- <li>Android N이 실행되는
-전화와 태블릿에서 사용자가 화면 분할 모드에서 두 개의 앱을
-나란히 또는 상하로 실행할 수 있습니다. 또한 앱 사이에 있는 분할선을 끌어서 앱의 크기를
-조정할 수 있습니다. </li>
-
-<li>Android TV 기기에서, 앱이 <a href="{@docRoot}preview/features/picture-in-picture.html">PIP(Picture-In-Picture)
-모드</a>로 배치될 수 있으므로, 사용자가 검색을 수행하거나 다른
-앱과 상호 작용하는 중에도 앱이 계속해서 콘텐츠를 표시할 수 있습니다.</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>그림 1.</strong> 화면 분할 모드에서 실행되는 앱.
-</p>
-
- </div>
-
-<p>특히 태블릿이나 다른 대형 화면 기기에서 다중 창
-지원을 통해 새로운 방식으로 사용자를 참여시킬 수 있습니다. 또한, 앱에서 드래그 앤 드롭 기능을 활성화하여
-사용자가 편리하게 앱에서나 앱으로 콘텐츠를 드래그할
-수 있으므로, 사용자 환경이 크게 개선됩니다. </p>
-
-<p>다중 창 지원을 앱에 추가하고 다중 창이 표시되는 방식을
-구성하는 것은 매우 간단합니다. 예를 들어, 액티비티의
-최소 허용 크기를 지정하면 사용자가 액티비티의 크기를 지정된 크기보다
-작게 조정하지 못합니다. 또한, 앱에 대해 다중 창 표시를 비활성화할 수도 있으며
- 이 경우 시스템은 전체 화면 모드에서만 앱을 표시합니다.</p>
-
-<p>
- 자세한 내용은 <a href="{@docRoot}preview/features/multi-window.html">다중 창 지원</a>
- 개발자 문서를 참조하세요.
-</p>
-
-<h2 id="notification_enhancements">알림 향상</h2>
-
-<p>Android N에서 저희는 알림을 더 쉽고 빠르게 사용할 수
-있도록 재설계했습니다. 몇 가지 변경 사항은 다음과 같습니다.</p>
-
-<ul>
- <li>
- <strong>템플릿 업데이트</strong>: 히어로 이미지와 아바타를 새롭게
- 강조하기 위해 알림 템플릿을 업데이트하는 중입니다. 개발자는 최소한의
- 코드 조정만으로 새로운 템플릿을 활용할 수 있습니다.
- </li>
-
- <li>
- <strong>메시지 스타일 사용자 지정</strong>: <code>MessageStyle</code> 클래스를 사용하여
- 알림과 관련된 사용자 인터페이스 레이블을 더 많이
-사용자 지정할 수 있습니다. 메시지, 대화 제목, 콘텐츠 뷰를
- 구성할 수 있습니다.
- </li>
-
- <li>
- <strong>묶음 알림</strong>: 시스템에서 메시지를 함께
- 그룹화하고(예: 메시지 주제별로 그룹화) 해당 그룹을 표시할 수 있습니다. 사용자는
- 이 그룹에 대해 해제 또는 보관과 같은 동작을 적절히 수행할 수 있습니다. Android
- Wear용 알림을 구현한 적이 있으시다면 이미 이 모델도 친숙하게 느껴질
- 것입니다.
- </li>
-
- <li>
- <strong>직접 회신</strong>: 실시간 통신 앱의 경우 Android 시스템은
- 인라인 회신을 지원하므로, 사용자가 알림 인터페이스
- 내에서 신속하게 SMS 또는 텍스트 메시지에 직접 응답할 수 있습니다.
- </li>
-
- <li>
- <strong>사용자 지정 뷰</strong>: 두 개의 새로운 API를 사용하면 알림에 사용자
- 지정 뷰를 사용할 때 시스템 장식(예: 알림 헤더 및 액션)을
- 활용할 수 있습니다.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>그림 2.</strong> 묶음 알림 및 직접 회신.
-</p>
-
-<p>새로운 기능을 구현하는 방법에 대해 알아보려면
- <a href="{@docRoot}preview/features/notification-updates.html">알림</a>
-가이드를 참조하세요.</p>
-
-
-
-<h2 id="jit_aot">프로필 가이드 방식의 JIT/AOT 컴파일</h2>
-
-<p>Android N에서 저희는 코드 프로파일링이 있는
-JIT(Just in Time) 컴파일러를 ART에 추가했습니다. 이를 통해 ART에서 Android 앱이 실행되는 동안
-그 성능을 계속 향상시킬 수 있습니다. JIT 컴파일러는 ART의 현재 AOT(Ahead of Time) 컴파일러를 보완하고
-런타임 성능을 개선하고, 저장 공간을 절약하고, 앱 업데이트와
-시스템 업데이트의 시간 단축을 도와줍니다.</p>
-
-<p>프로필 가이드 방식의 컴파일을 통해 ART는 실제 사용량과 기기의
-조건에 따라 각 앱의 AOT/JIT 컴파일을 관리할 수 있습니다. 예를 들어, ART는 최상의 성능을 위해 각 앱의 핫 메서드에 대한 프로필을
-유지 관리하고 이들 메서드를 미리 컴파일하고
-캐시할 수 있습니다. 이 경우 앱의 다른 부분들은
-실제로 사용될 때까지 컴파일되지 않고 유지됩니다.</p>
-
-<p>프로필 가이드 방식의
-컴파일은 앱의 주요 부분들의 성능을 높여줄 뿐만 아니라,
-관련 바이너리를 비롯한 앱의 전체 RAM 공간을 줄이는 데 도움이 됩니다. 이 기능은 저용량 메모리 기기에 특히 중요합니다.</p>
-
-<p>ART는 기기 배터리에 미치는 영향이 최소화되는 방식으로
-프로필 가이드 방식의 컴파일을 관리합니다. ART는 기기가 유휴 상태이고 충전 중일 때만 사전 컴파일을 수행하며,
-해당 작업을 미리 수행함으로써 시간과 배터리를 절약합니다.</p>
-
-<h2 id="quick_path_to_app_install">앱 설치를 위한 빠른 경로</h2>
-
-<p>ART의 JIT 컴파일러가 가진 가장 눈에 띄는 이점 중 하나는
-앱 설치 및 시스템 업데이트 속도가 빠르다는 것입니다. Android 6.0에서 최적화하고 설치하는 데
-몇 분이 걸리는 대용량 앱조차도 이제는 단 몇 초 만에 설치할 수
-있습니다. 또한, 더 이상 최적화 단계가 없으므로 시스템 업데이트도 더 빠르게 이루어집니다. </p>
-
-<h2 id="doze_on_the_go">이동 중 잠자기 모드...</h2>
-
-<p>Android 6.0에서는 기기가 테이블 위에 올려져 있거나 서랍 안에
-들어 있는 등의 유휴 상태일 때 앱이 CPU와 네트워크를 사용하는 작업을 지연시킴으로써 배터리를
-절약하는 시스템 모드인 잠자기 모드를 도입했습니다. </p>
-
-<p>이제 Android N에서 잠자기 모드는 한걸음 더 나아가서 이동 중에도
-배터리를 절약합니다. 화면이 일정 시간 동안 꺼져 있고 기기의 플러그가
-뽑혀 있으면 잠자기 모드는 친숙한 일부 CPU 및 네트워크 제한을 앱에 적용합니다.
-즉, 사용자가 기기를 주머니에 휴대하고 다닐 때도 배터리를
-절약할 수 있습니다.</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>그림 3.</strong> 이제 잠자기 모드는 기기가 정지 상태가 아니더라도
-배터리 수명을 개선할 수 있도록 제한을 적용합니다.
-</p>
-
-
-<p>기기의 배터리가 켜져 있는 동안 화면이 꺼지면 잠시 후에
-잠자기 모드는 네트워크 액세스를 제한하고 작업과 동기화를 지연시킵니다. 잠시 동안의 유지 관리 기간 중에
-애플리케이션의 네트워크 액세스가 허용되고
-지연된 작업/동기화가 실행됩니다. 화면을 켜거나 기기의 플러그를 꽂으면 기기가 잠자기 모드 상태에서
-벗어납니다.</p>
-
-<p>기기가 다시 일정 시간 동안 배터리로 켜져 있고 화면이 꺼진
-정지 상태가 되면, 잠자기 모드는 {@link
-android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} 알람 및
-GPS/Wi-Fi 스캔에 대해 전체 CPU 및 네트워크 제한을 적용합니다.</p>
-
-<p>앱을 잠자기 모드에 맞게 적용하는 최선의 방법은 기기가 움직이든
-움직이지 않든 동일합니다. 따라서 잠자기 모드를 효율적으로 처리하도록
-앱을 이미 업데이트했다면 모든 준비가 완료된 것입니다. 아직 업데이트하지 않았다면 지금 <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">앱을 잠자기 모드에 맞춰
-조정</a>해 보세요.</p>
-
-<h2 id="background_optimizations">Project Svelte: 백그라운드 최적화</h2>
-
-<p>Project Svelte는 에코시스템에 속한 전체 Android 기기에서 시스템 및 앱에
-의해 사용되는 RAM 크기를 최소화하기 위한 지속적인 노력입니다. Android N에서 Project
-Svelte는 앱이 백그라운드에서 실행되는 방식을 최적화하는 데 초점을 맞추고 있습니다. </p>
-
-<p>백그라운드 처리는 대부분의 앱에서 필수적인 부분입니다. 백그라운드 처리가 올바로
-수행된다면 즉각적이고 빠르고 상황에 맞는 멋진 사용자 환경을 만들 수 있지만, 백그라운드
-처리가 올바로 수행되지 않는다면 RAM과 배터리를 불필요하게 소모하고
-다른 앱의 시스템 성능에 영향을 미칠 것입니다. </p>
-
-<p>Android 5.0 이후로,
-사용자가 선호하는 백그라운드 작업
-수행 방식은 {@link android.app.job.JobScheduler}였습니다. 앱은 메모리, 전원 및 연결 상태에 따라 시스템을 최적화하면서도
-작업을 예약할 수 있습니다. JobScheduler는 제어 기능과 간편성을 함께
-제공하므로, 저희는 모든 앱에서 이것을 사용하기 원합니다. </p>
-
-<p>
- 또 한 가지 좋은 옵션은 <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
-<code>GCMNetworkManager</code></a>입니다. 이는 Google Play
- 서비스의 일부분으로, 레거시 Android 버전에서 호환성이
- 있는 유사한 작업 예약을 제공합니다.
-</p>
-
-<p>Google에서는 더 많은 사용 사례를 충족시키기 위해 <code>JobScheduler</code> 및
-<code>GCMNetworkManager</code>를 계속
-확장하고 있습니다. 예를 들어, 이제 Android N에서는 콘텐츠 공급자의 변화에 따라
- 백그라운드 작업을 예약할 수 있습니다. 이와 동시에, Google에서는 특히
-저용량 메모리 기기에서 시스템 성능을 저하시킬 수
-있는 일부 오래된 패턴들을 없애기 시작했습니다.</p>
-
-<p>Android N에서 저희는 자주 사용되는 세 가지 암시적 브로드캐스트인
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 및 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}를
-제거하는 중입니다. 왜냐하면 이것들은 여러 앱의 백그라운드 프로세스를 동시에 깨워서 메모리와 배터리를 과도하게 소모시킬 수 있기 때문입니다. 앱이
-이러한 브로드캐스트를 수신한다면, N Developer Preview를
- 활용하여 <code>JobScheduler</code> 및 관련 API로 마이그레이션하세요. </p>
-
-<p>
- 자세한 내용은 <a href="{@docRoot}preview/features/background-optimization.html">백그라운드
- 최적화</a> 문서를 참조하세요.
-</p>
-
-
-<h2 id="data_saver">Data Saver</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>그림 4.</strong> Settings의 Data Saver.
-</p>
- </div>
-
-<p>모바일 기기의 수명 전체에 걸쳐, 모바일 데이터 요금제에 따른 비용이
-기기 자체의 가격보다 일반적으로 많이 듭니다. 많은 사용자들에게 모바일 데이터는
-아껴 써야 하는 값비싼 자원입니다. </p>
-
-<p>Android N에서는 새로운 시스템 서비스인 Data Saver
-모드를 도입하며, Data Saver는 로밍 시나 결제 주기가 끝날 무렵
-또는 소액 선불 데이터 팩 사용 시에 앱에 의해 사용되는 모바일 데이터 사용량을 줄여줍니다. Data Saver를 통해 사용자는 앱이
-모바일 데이터를 사용하는 방식을 제어할 수 있으며, Data Saver가 켜져 있을 때 개발자가 더 효율적인 서비스를
-제공할 수 있습니다. </p>
-
-<p>사용자가 <strong>Settings</strong>에서 Data Saver를 활성화하고
-해당 기기가 데이터 통신 네트워크에 있는 경우, 시스템은 백그라운드
-데이터 사용을 차단하고, 가능하면 스트리밍의
-비트 전송률을 제한하거나 화질을 줄이거나 낙관적 사전 캐싱을
-지연시키는 등의 방식으로 포그라운드에서 데이터를 더 적게 사용하도록 앱에게 신호를 보냅니다. 사용자는 Data Saver가 켜진 경우에도 백그라운드 데이터 통신 연결을 허용하기 위해
-특정 앱을 허용 목록에 추가할 수 있습니다.</p>
-
-<p>Android N은 {@link android.net.ConnectivityManager}를 확장하여 <a href="{@docRoot}preview/features/data-saver.html#status">사용자의
-Data Saver 기본 설정을 검색</a>하고 <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">기본
-설정 변경을 모니터링</a>하는 방법을
-앱에 제공합니다. 모든 앱은 사용자가 Data Saver를 활성화했는지 여부를 확인해야 하며
-포그라운드 및 백그라운드 데이터 사용을 제한하도록 노력해야 합니다.</p>
-
-
-<h2 id="vulkan">Vulkan API</h2>
-
-<p>
- Android N은 새로운 3D 렌더링 API인 <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>을 플랫폼에 통합합니다.
-<a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
- ES</a>와 마찬가지로, Vulkan은 Khronos Group에 의해 관리되는 3D 그래픽 및 렌더링을 위한
- 공개 표준입니다.
-</p>
-
-<p>
- Vulkan은 처음부터 드라이버에서 CPU 오버헤드를 최소화하도록 설계되었고,
- 애플리케이션이 GPU 작업을 더욱 직접적으로 제어할 수 있게 해줍니다. 또한, Vulkan은
- 멀티스레드가 명령 버퍼 생성과 같은 작업을
-한 번에 수행하도록 허용하여 병렬 처리 성능을 높입니다.
-</p>
-
-<p>
- Vulkan 개발 도구와 라이브러리가 Android NDK에 배포되며, 그 포함 내역은
- 다음과 같습니다.
-</p>
-
-<ul>
- <li>헤더
- </li>
-
- <li>유효성 검사 계층(디버그 라이브러리)
- </li>
-
- <li>SPIR-V 셰이더 컴파일러
- </li>
-
- <li>SPIR-V 런타임 셰이더 컴파일 라이브러리
- </li>
-</ul>
-
-<p>
- Vulkan은 Nexus 5X, Nexus 6P 및 Nexus Player와 같은 Vulkan 지원 하드웨어가 있는 기기의
- 앱에만 사용될 수 있습니다. Google은
- 최대한 조속히 Vulkan을 더 많은 기기에 도입하기 위해 파트너들과 긴밀히 협력하고 있습니다.
-</p>
-
-<p>
- 자세한 내용은 <a href="{@docRoot}ndk/guides/graphics/index.html">API 문서</a>를 참조하세요.
-</p>
-
-<h2 id="tile_api">Quick Settings 타일 API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>그림 5.</strong> 알림 창의 Quick Settings 타일.
-</p>
-
-
- </div><p>Quick Settings는 키 설정 및 작업을 알림 창에서 직접 노출시키기
-위해 널리 사용되는 간단한 방법입니다. 더욱 유용하고 편리한 설정을
-위해 저희가 Android N에서 Quick Settings의 범위를 더욱 확장했습니다. </p>
-
-<p>Google에서는 Quick Settings 타일에 필요한 공간을 더 추가했으며,
-사용자는 페이지가 지정된 디스플레이 영역에서 왼쪽이나 오른쪽으로 스와이프하여 이들 타일에 액세스할 수 있습니다. 또한, 사용자가 Quick Settings 타일의
-모습과 표시 위치를 제어할 수 있도록 했습니다. 따라서 사용자는 끌어서 놓는 간단한 방법으로
-타일을 추가하거나 이동시킬 수 있습니다. </p>
-
-<p>또한, Android N은 개발자를 위해 새로운 API도 추가했으며
- 이를 통해 자신만의 Quick Settings 타일을 정의할 수 있으며, 사용자가 앱에서 키 컨트롤 및 작업에 쉽게 액세스할 수 있습니다.</p>
-
-<p>
- 빠른 설정 타일은 긴급하게 필요하거나 자주 사용되는 컨트롤 또는
-작업을 위해 예약되어 있으며, 앱을 시작하기 위한 바로가기로
-사용되어서는 안 됩니다.
-</p>
-
-<p>
- 타일을 정의한 후에는 이 타일을 사용자에게 표시할 수 있으며, 사용자가
- 드래그 앤 드롭하는 것만으로 이 타일을 Quick Settings에 추가할 수 있습니다.
-</p>
-
-<p>
- 앱 타일 만들기에 대한 자세한 내용은
-다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 <code>android.service.quicksettings.Tile</code>에 대한 문서를 참조하세요.
-</p>
-
-
-
-<h2 id="number-blocking">번호 차단</h2>
-
-<p>이제 Android N에서는 플랫폼에서 번호 차단을 지원하며,
-서비스 공급자가 차단된 번호 목록을 유지 관리할 수 있도록 프레임워크 API를 제공합니다. 기본
-SMS 앱, 기본 전화 앱 및 이동통신사 앱은
-차단된 번호 목록에서 읽기와 쓰기가 가능합니다. 다른 앱은 이 목록에 액세스할 수 없습니다.</p>
-
-<p>Android에서는 번호 차단을 플랫폼의 표준 기능으로 만들어,
-광범위한 기기에서 번호를 차단하기 위한 일관된 방식을 앱에
-제공합니다. 앱에서 활용할 수 있는 기타 이점은 다음과 같습니다.</p>
-
-<ul>
- <li> 통화에서 차단된 번호가 텍스트에서도 차단됩니다.
- <li> 차단된 번호는 재설정 시에도 백업 및 복원 기능을 통해
-기기에서 유지될 수 있습니다.
- <li> 여러 앱이 동일한 차단된 번호 목록을 사용할 수 있습니다.
-</ul>
-
-<p>또한 Android를 통한 이동통신사 앱 통합은 이동통신사들이 기기의
-차단된 번호 목록을 읽고 서비스측 차단을 수행할 수 있음을 의미하며,
-이를 통해 사용자들은 원치 않는 통화와 문자가
-특정 매체(예: VOIP 엔드포인트 또는 착신 전화)를 통해 자신들에게 도달하는 것을 차단할 수 있습니다.</p>
-
-<p>
- 자세한 내용은
- 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
- 참조</a>에서 <code>android.provider.BlockedNumberContract</code>를 참조하세요.
-</p>
-
-<h2 id="call_screening">통화 스크리닝</h2>
-
-<p>
- Android N에서는 기본 전화 앱이 수신 통화를 스크리닝하도록 허용합니다. 이를 위해
-전화 앱에는 새로운 <code>CallScreeningService</code>가 구현되며, 이를 통해 전화 앱은
-수신 통화의 {@link android.telecom.Call.Details Call.Details}에 따라
-다음과 같은 다양한 작업을 수행할 수 있습니다.
-</p>
-
-<ul>
- <li> 수신 통화 거절
- <li> 통화를 통화 기록에 허용하지 않음
- <li> 통화 알림을 사용자에게 표시하지 않음
-</ul>
-
-<p>
- 자세한 내용은
- 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
- 참조</a>에서 <code>android.telecom.CallScreeningService</code>를 참조하세요.
-</p>
-
-
-<h2 id="multi-locale_languages">다중 로케일 지원, 더 많은 언어 지원 추가</h2>
-
-
-<p>두 가지 언어로 된 사용 사례를 지원하기 위해 이제
-Android N에서는 사용자가 Settings에서 <strong>다중 로케일</strong>을 선택할 수 있습니다. 앱은 새로운
-API를 사용하여 사용자의 로케일을 가져온
-다음, 검색 결과를 여러 언어로 표시하거나 사용자가 이미 알고 있는
-언어로는 웹 페이지를 번역하지 않는 등의 더욱 정교한 사용자 환경을
-다중 로케일 사용자들에게 제공합니다.</p>
-
-<p>다중 로케일 지원과 함께 Android N에서는 또한 사용자가
-사용할 수 있는 언어의 범위도 더욱 넓혔습니다. 영어, 스페인어, 프랑스어,
-아랍어 등의 자주 사용되는 언어에 대해 각각 25가지 이상의 변형을 제공하며, 100가지 이상의 새로운 언어에 대한 부분적인
-지원도 추가합니다.</p>
-
-<p>앱은
-<code>LocaleList.GetDefault()</code>를 호출하여 사용자가 설정한 로케일 목록을 가져올 수 있습니다. 더 많은 수의 로케일을 지원하기 위해 Android N에서는 리소스 확인 방식을
-바꾸는 중에 있습니다. 새로운 리소스 확인 논리에서
-앱이 예상대로 작동하는지 테스트하고 확인해야 합니다.</p>
-
-<p>새로운 리소스 확인 동작과 따라야 하는 모범 사례에 대해
-알아보려면, <a href="{@docRoot}preview/features/multilingual-support.html">다국어 지원</a>을 참조하세요.</p>
-
-
-<h2 id="emoji">새 이모티콘</h2>
-
-<p>
- Android N에서는 피부 색조 그림 이모티콘과 변형 선택기 지원을
- 비롯한 추가적인 그림 이모티콘과 그림 이모티콘 관련
- 기능을 도입했습니다. 앱에서 그림 이모티콘을 지원하는 경우
- 아래 지침에 따라 이러한 그림 이모티콘에 관련된 기능을 잘 활용해 보세요.
-</p>
-
-<ul>
- <li>
- <strong>그림 이모티콘을 삽입하기 전에 기기에 해당 그림 이모티콘이 들어 있는지 확인하세요.</strong>
- 시스템 글꼴에 어떤 이모티콘이 있는지
- 확인하려면 {@link android.graphics.Paint#hasGlyph(String)} 메서드를 사용하세요.
- </li>
- <li>
- <strong>그림 이모티콘이 변형 선택기를 지원하는지 확인하세요.</strong>
- 변형 선택기를 사용하면 특정 이모티콘을 컬러나
- 흑백으로 표현할 수 있습니다.
- 모바일 기기에서는 앱이 흑백보다는 컬러로 이모티콘을 표시해야 합니다. 하지만
- 앱이 텍스트와 함께 이모티콘을 표시하는 경우에는 흑백 변형을 사용해야 합니다.
- 그림 이모티콘에 변형 이모티콘이 있는지 확인하려면 변형 선택기를 사용하세요.
- 변형이 있는 캐릭터의 전체 목록은
-<a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">변형에
-대한 유니코드 설명서</a>의 <em>그림 이모티콘 변형 시퀀스</em> 섹션을
-검토하세요.
- </li>
- <li>
- <strong>그림 이모티콘이 피부 색조를 지원하는지 확인하세요.</strong> Android N 사용자는 이모티콘의 렌더링된 피부 색조를
- 자신의 기본 설정에 맞게 수정할 수 있습니다. 키보드 앱은 여러 가지 피부 색조가 있는
-이모티콘에 대한 시각적 표시를 제공해야 하며, 사용자가 선호하는 피부 색조를 선택하도록
-허용해야 합니다. 어떤 시스템 이모티콘에 피부 색조
-한정자가 있는지 확인하려면 {@link android.graphics.Paint#hasGlyph(String)}
-메서드를 사용하세요.
-<a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
-유니코드 설명서</a>를 읽어보면 어떤 이모티콘에서 피부 색조가 사용되는지 확인할 수 있습니다.
- </li>
-</ul>
-
-
-<h2 id="icu4">Android의 ICU4J API</h2>
-
-<p>
- 이제 Android N에서는 <code>android.icu</code> 패키지 아래의 Android 프레임워크에 있는 <a href="http://site.icu-project.org/">ICU4J</a> API의 하위 세트를
- 제공합니다. 마이그레이션이
- 용이하며, 대개는 <code>com.java.icu</code> 네임스페이스를
- <code>android.icu</code>로 변경하는 것이 간단합니다. 앱에서 ICU4J 번들을
- 이미 사용 중이신 경우, Android 프레임워크에서 제공되는 <code>android.icu</code>
- API로 전환하면 APK 크기를 상당히 줄일 수 있습니다.
-</p>
-
-<p>
- Android ICU4J API에 대해 자세히 알아보려면 <a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J 지원</a>을 참조하세요.
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>Android N에서는 다음을 비롯하여 OpenGL ES 3.2용 프레임워크 인터페이스와 플랫폼 지원을 추가합니다.</p>
-
-<ul>
- <li> <code>EXT_texture_sRGB_decode</code>를 제외한 <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
-Android 확장 프로그램 팩</a></a>(AEP)의 모든 확장 프로그램.
- <li> HDR 및 지연 셰이딩을 위한 부동 소수점 프레임 버퍼.
- <li> 일괄처리 및 스트리밍 성능을 향상시키는 BaseVertex 그리기 호출.
- <li> WebGL 오버헤드를 줄여주는 강력한 버퍼 액세스 제어.
-</ul>
-
-<p>Android N에 있는 OpenGL ES 3.2용 프레임워크 API에는
-<code>GLES32</code> 클래스가 제공됩니다. OpenGL ES 3.2를 사용 중인
-경우 반드시 <code><uses-feature></code> 태그와 <code>android:glEsVersion</code>
-속성을 사용하여 매니페스트 파일에서 요구 사항을 선언하세요. </p>
-
-<p>기기의 지원되는 OpenGL ES 버전을 런타임에 확인하는
-방법을 비롯하여, OpenGL ES 사용에 대한 자세한 내용은 <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API 가이드</a>를 참조하세요.</p>
-
-
-<h2 id="android_tv_recording">Android TV 녹화</h2>
-
-<p>Android N에서는 새로운 녹화 API를 통해 Android TV 입력
-서비스로부터 콘텐츠를 녹화하고 재생하는 기능을 추가합니다. 기존의 타임 시프트 API를 기반으로 구축된 TV 입력
-서비스는 녹화 가능한 채널 데이터와 녹화된 세션의 저장 방식을 제어할 수 있으며,
-녹화된 콘텐츠와의 사용자 상호 작용을 관리할 수 있습니다. </p>
-
-<p>자세한 내용은 <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording API</a>를 참조하세요.</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work에서는 Android N이 실행되는 기기를
-위해 여러 가지 새로운 기능과 API를 추가합니다. 몇 가지 특징이 아래에 나와 있으며, 변경 사항의 전체 목록은
-<a href="{@docRoot}preview/features/afw.html">Android for Work 업데이트</a>를 참조하세요.</p>
-
-<h3 id="work_profile_security_challenge">작업 프로필 보안 인증 질문 </h3>
-
-<p>
- N SDK를
-대상으로 하는 프로필 소유자는 작업 프로필에서 작동하는 앱에 대해
-별개의 보안 인증 질문을 지정할 수 있습니다. 사용자가 업무용 앱을 열려고 시도할 때 작업 프로필 보안 인증 질문이
-표시됩니다. 보안 인증 질문에 올바로 답하면 작업 프로필의 잠금이 해제되고 필요하다면
-작업 프로필의 암호가 해독됩니다. 프로필 소유자의 경우,
-<code>ACTION_SET_NEW_PASSWORD</code>는
-작업 프로필 보안 인증 질문을 설정하라는 메시지를 사용자에게 표시하고, <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code>는 기기
-잠금을 설정하라는 메시지를 사용자에게 표시합니다.
-</p>
-
-<p>
- 프로필 소유자는 <code>setPasswordQuality()</code>, <code>setPasswordMinimumLength()</code> 및 관련 메서드를 사용하여
-작업 프로필 보안 인증 질문에 대해
-별개의 비밀번호 정책을 설정할 수
-있습니다(예: PIN의 길이는 얼마로 해야 할지 또는 프로필을 잠금 해제하기 위해 지문을 사용할 수 있는지 여부). 프로필 소유자는
-새 <code>getParentProfileInstance()</code> 메서드에 의해 반환되는 <code>DevicePolicyManager</code>
-인스턴스를 사용하여 기기 잠금을 설정할 수도 있습니다.
- 그 밖에도, 프로필 소유자는
-새 <code>setOrganizationColor()</code> 및 <code>setOrganizationName()</code> 메서드를 사용하여 작업 프로필 보안 인증 질문에 대한 자격 증명 화면을
-사용자 지정할 수 있습니다.
-</p>
-<h3 id="turn_off_work">작업 해제 </h3>
-
-<p>작업 프로필이 있는 기기에서는 사용자가 작업 모드를 설정하거나 해제할 수 있습니다. 작업 모드가
-해제되면 관리된 사용자가 일시적으로 종료되며, 이 경우 작업 프로필
-앱, 백그라운드 동기화 및 알림이 비활성화됩니다. 여기에는 프로필 소유자 애플리케이션이
-포함됩니다. 작업 모드가 해제되면 사용자가 업무용 앱을 실행할 수 없음을
-미리 알려주기 위한 영구적인 상태 아이콘이 표시됩니다. 런처는
-업무용 앱과 위젯에 액세스할 수 없음을 나타냅니다. </p>
-
-<h3 id="always_on_vpn">상시 접속 VPN </h3>
-
-<p>기기 소유자 및 프로필 소유자는 항상 지정된 VPN을 통해 업무용 앱을
-연결하도록 보장할 수 있습니다. 시스템은 기기가 부팅된
-후에 해당 VPN을 자동으로 시작합니다.</p>
-
-<p>
- 새로운 <code>DevicePolicyManager</code> 메서드는
- <code>setAlwaysOnVpnPackage()</code> 및
- <code>getAlwaysOnVpnPackage()</code>입니다.
-</p>
-
-<p>앱 상호 작용 없이 시스템에 의해
-VPN 서비스가 직접 바인딩될 수 있으므로, VPN 클라이언트는 상시 접속 VPN에 대해 새로운 진입점을 처리해야 합니다. 이전과
-마찬가지로, 서비스는 <code>android.net.VpnService</code> 액션과 일치하는 인텐트 필터에
-의해 시스템에 표시됩니다. </p>
-
-<p>
- 또한, <strong>Settings>More>Vpn</strong>을 사용하여 사용자는 기본 사용자에서
- <code>VPNService</code> 메서드를
- 구현하는 상시 접속 VPN 클라이언트를 수동으로 설정할 수도 있습니다.
-</p>
-
-<h3 id="custom_provisioning">사용자 지정 프로비저닝</h3>
-
-<p>
- 애플리케이션은 기업 색상과 로고로 프로필 소유자 및 기기 소유자 프로비저닝
- 흐름을 사용자 지정할 수 있습니다.
-<code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>가 흐름 색상을
-사용자 지정하고, <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>가
-기업 로고로 흐름을 사용자 지정합니다.
-</p>
-
-<h2 id="accessibility_enhancements">접근성 향상</h2>
-
-<p>이제 Android N에서는 새로운 기기 설치 시 Welcome 화면에서
-Vision Settings를 바로 제공합니다. 이렇게 하면 사용자가 자신의
-기기에서 확대 제스처, 글꼴 크기,
-디스플레이 크기 및 TalkBack 등과 같은 접근성 기능을 휠씬 더 쉽게 검색하고 구성할 수 있습니다. </p>
-
-<p>이렇게 눈에 띄는 위치에 접근성 기능을 배치하면, 사용자가 이
-기능을 활성화하여 앱을 사용할 가능성이 더욱 커집니다. 이들 설정을 활성화하여 조기에 앱을
-테스트해야 합니다. Settings >
-Accessibility에서 설정을 활성화할 수 있습니다.</p>
-
-<p>Android N에서도 마찬가지로, 운동 장애가 있는 사용자가
-이제 접근성 서비스를 통해 화면을 터치할 수 있습니다. 이 새로운 API를 사용하면 얼굴 추적, 시각 추적,
-지점 스캐닝 등의 기능으로 서비스를 구축하여 해당 사용자의
-요구를 충족시킬 수 있습니다.</p>
-
-<p>자세한 내용은
- 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 <code>android.accessibilityservice.GestureDescription</code>을 참조하세요.</p>
-
-
-<h2 id="direct_boot">직접 부팅</h2>
-
-<p>직접 부팅은 기기 시동 시간을 개선해주며, 예상치 못한 재부팅
-후에도 등록된 앱이 제한된 기능을 유지하도록 해줍니다. 예를 들어,
-사용자가 취침하는 중에 암호화된 기기가 재부팅되는 경우,
-이제는 등록되어 있는 알람, 메시지 및 수신 통화로 사용자에게 알려줄
-수 있습니다. 즉, 재시작 직후에도 접근성 서비스를
- 바로 사용할 수 있습니다.</p>
-
-<p>직접 부팅은 Android N의 파일 기반 암호화를 활용하여 시스템
-및 앱 데이터에 대해 정밀한 암호화 정책을 활성화합니다. 이 시스템은
-선택된 시스템 데이터와 명시적으로 등록된 앱
-데이터에 대해 기기 암호화 저장소를 사용합니다. 기본적으로, 다른 모든
- 시스템 데이터, 사용자 데이터, 앱 및 앱 데이터에 대해 자격 증명 암호화 저장소가 사용됩니다. </p>
-
-<p>부팅 시에 시스템은 제한된 모드에서 시작되며, 기기 암호화
-데이터에만 액세스할 수 있고 앱 또는 데이터에는 액세스하지
-못합니다. 이 모드에서 구성 요소를 실행하려는 경우,
-매니페스트에 플래그를 설정하여 구성 요소를 등록할 수 있습니다. 재시작 후에 시스템은 <code>LOCKED_BOOT_COMPLETED</code>
-인텐트를 브로드캐스트하여
-등록된 구성 요소를 활성화합니다. 잠금을 해제하기 전에, 시스템은 등록된 기기
-암호화 앱 데이터를 사용할 수 있는지 확인합니다. 사용자가 잠금 화면 자격 증명을 확인하여
- 암호를 풀기 전까지는 다른 모든 데이터를 사용할 수 없습니다. </p>
-
-자세한 내용은 <a href="{@docRoot}preview/features/direct-boot.html">직접 부팅</a>을 참조하세요.</p>
-</p>
-
-
-<h2 id="key_attestation">Key Attestation</h2>
-
-<p>하드웨어 기반 키 저장소는 Android 기기에서 암호화 키를
-만들고 저장하고 사용하기 위한 훨씬 더 안전한 방법입니다. 이
-키 저장소는 Linux 커널, 잠재적 Android 취약점, 루팅된 기기의
-공격으로부터 키를 보호해 줍니다.</p>
-
-<p>하드웨어 기반 키 저장소를 더욱 쉽고 안전하게 사용하도록
-Android N에서는 Key Attestation을 도입했습니다. Key Attestation을 사용하여 앱
-및 오프-기기는 RSA 또는 EC 키 쌍이 하드웨어 기반인지 여부를 결정할 수
-있으며, 키 쌍의 속성에는 어떤 것이 있고 어떠한 제약 조건이 사용성
-및 유효성에 적용되는지 여부를 결정할 수 있습니다. </p>
-
-<p>앱 및 오프-기기 서비스는 X.509 증명 인증서를 통해 키 쌍에 대한
-정보를 요청할 수 있으며 이 인증서는 유효한 증명 키로 서명되어야
-합니다. 증명 키는 공장에서 기기의 하드웨어 기반
-키 저장소에 주입되는 ECDSA 서명 키입니다. 따라서 유효한 증명 키에 의해
-서명된 증명 인증서는 하드웨어 기반 키 저장소에 있는 키 쌍의
-세부 정보와 함께 이 키 저장소의 존재 여부를
-확인합니다.</p>
-
-<p>안전한 공식 Android 공장 이미지가 기기에 사용 중인지
-확인하기 위해, Key Attestation은
-기기 <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">부트로더</a>가 다음의 정보를 <a class="external-link" href="https://source.android.com/security/trusty/index.html">TEE(Trusted Execution Environment)</a>에
-제공하도록 요구합니다.</p>
-
-<ul>
-<li>기기에 설치된 OS 버전 및 패치 수준</li>
-<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">확인된 부팅</a> 공개 키 및 잠금 상태</li>
- </ul>
-
-<p>하드웨어 기반 키 저장소 기능에 대한 자세한
-내용은 <a href="https://source.android.com/security/keystore/" class="external-link">하드웨어 기반 키 저장소</a> 가이드를 참조하세요.</p>
-
-<p>Key Attestation 이외에도 Android N에서는 지문 등록
-시 취소되지 않는 지문 바인드 키도 도입했습니다.</p>
-
-<h2 id="network_security_config">네트워크 보안 구성</h2>
-
-<p>Android N에서 앱은 오류가 발생하기 쉬운 기존의 프로그래밍 방식
-API(예: X509TrustManager)를 사용하는 대신 선언적
-<em>네트워크 보안 구성</em>을 사용하여 보안(HTTPS, TLS) 연결의 동작을 코드
-수정 없이 안전하게 사용자 지정할 수 있습니다.</p>
-
- <p>지원되는 기능:</p>
-<ul>
-<li><b>사용자 지정 신뢰 앵커.</b> 애플리케이션이 보안 연결을 위해
-어떤 인증 기관(CA)을 신뢰할 수 있는지 사용자 지정할 수 있게 해줍니다. 예를 들어,
-특정한 자체 서명 인증서를 신뢰하거나 제한적인 공용 CA 세트를 신뢰하도록 사용자 지정할 수 있습니다.
-</li>
-<li><b>디버그 전용 재정의.</b> 애플리케이션 개발자가 설치 기반에 위험을 더하지
-않고 애플리케이션의 보안 연결을 안전하게
-디버그할 수 있게 해줍니다.
-</li>
-<li><b>일반 텍스트 트래픽 옵트아웃.</b> 애플리케이션이 일반 텍스트 트래픽을 실수로 사용하지
-않도록 스스로를 보호할 수 있게 해줍니다.</li>
-<li><b>인증서 고정.</b> 애플리케이션이 보안 연결을 위해 어떤 서버 키를
- 신뢰할지 제한하도록 해주는 고급 기능입니다.</li>
-</ul>
-
-<p>자세한 내용은 <a href="{@docRoot}preview/features/security-config.html">네트워크 보안 구성</a>을
-참조하세요.</p>
-
-<h2 id="default_trusted_ca">신뢰할 수 있는 기본 인증 기관</h2>
-
-<p>기본적으로, Android N을 대상으로 하는 앱은 시스템에서
-제공되는 인증서만을 신뢰하며 사용자가 추가한 인증 기관(CA)은 더 이상 신뢰하지 않습니다. Android N을 대상으로 하는 앱이 사용자가
-추가한 CA를 신뢰하려는 경우에는
-<a href="{@docRoot}preview/features/security-config.html">네트워크 보안 구성</a>을 사용하여
-사용자 CA를 신뢰해야 하는 방법을 지정해야 합니다.</p>
-
-<h2 id="apk_signature_v2">APK Signature Scheme v2</h2>
-
-<p>
- Android N에서는 앱 설치 시간을 더욱 단축시켜 주고
-APK 파일을 무단으로 변경하지 못하도록 더욱 강력하게
-보호해주는 새로운 앱 서명 구성표인 APK Signature Scheme v2를 도입했습니다. 기본적으로, Android Studio 2.2 및 Android
- Plugin for Gradle 2.2는 APK Signature Scheme v2 뿐만 아니라 JAR 서명을 사용하는 기존의 서명 구성표를 둘다
- 사용하여 앱에 서명합니다.
-</p>
-
-<p>
- 앱에 APK Signature Scheme v2를 적용하는 것이 좋지만, 이 새로운
- 구성표를 반드시 적용해야 하는 것은 아닙니다. APK
- Signature Scheme v2를 사용할 때 앱이 올바로 빌드되지 않을 경우 이 새 구성표를 비활성화할 수 있습니다. 비활성화 프로세스가
-실행되면 Android Studio 2.2 및 Android Plugin for Gradle 2.2는 기존의 서명 구성표만 사용하여
-앱에 서명합니다. 기존 구성표만으로
-서명하려면 모듈 수준의 <code>build.gradle</code> 파일을 연 다음, 릴리스 서명
-구성에 <code>v2SigningEnabled false</code> 줄을
-추가하세요.
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>주의: </strong> APK
- Signature Scheme v2를 사용하여 앱에 서명하고 앱을 추가로 변경하는 경우 앱의 서명이
- 무효화됩니다. 따라서 <code>zipalign</code>과
- 같은 도구는 APK Signature Scheme v2를 사용하여 앱에 서명한 후가 아니라 서명하기 전에 사용되어야 합니다.
-</p>
-
-<p>
- 자세한 내용은 Android Studio에서
-<a href="{@docRoot}studio/publish/app-signing.html#release-mode">앱에
-서명</a>하는 방법을 설명하고 Android Plugin for Gradle을 사용하여 <a href="{@docRoot}studio/build/build-variants.html#signing">앱
- 서명을 위한 빌드 파일을 구성</a>하는 방법에 대해 설명하는 Android Studio 문서를 읽어보세요.
-</p>
-
-<h2 id="scoped_directory_access">범위가 지정된 디렉터리 액세스</h2>
-
-<p>Android N에서 앱은 새로운 API를 사용하여 특정
-<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">외부 저장소</a> 디렉터리(SD 카드와 같은 이동식 미디어의 디렉터리 포함)에
-대한 액세스를 요청할 수 있습니다. 새로운 API는 애플리케이션이
-표준 외부 저장소 디렉터리(예: <code>Pictures</code> 디렉터리)에 액세스하는 방식을 훨씬 단순화합니다. 사진
-앱과 같은 앱은 모든 저장소 디렉터리에 대해 액세스 권한을 부여하는
-<code>READ_EXTERNAL_STORAGE</code>를 사용하는 대신 또는 사용자가 디렉터리를 탐색하도록 하는 저장소 액세스 프레임워크(SAF)를
-사용하는 대신 이들 API를
-사용할 수 있습니다.</p>
-
-<p>또한, 새로운 API는 사용자가 외부 저장소 액세스 권한을
-앱에 부여하는 단계를 단순화합니다. 새로운 API를 사용하는 경우 시스템은
-애플리케이션이 어떤 디렉터리에 대한 액세스 권한을
-요청하는지를 명확하게 설명해주는 단순한 권한 UI를 사용합니다.</p>
-
-<p>자세한 내용은
-<a href="{@docRoot}preview/features/scoped-folder-access.html">범위가 지정된
-디렉터리 액세스</a> 개발자 문서를 참조하세요.</p>
-
-<h2 id="keyboard_shortcuts_helper">Keyboard Shortcuts Helper</h2>
-
-<p>
-Android N에서는 사용자가 "Alt + /" 키를 눌러 <em>Keyboard Shortcuts</em>
-화면을 트리거할 수 있는데, 이 화면에는 시스템과 해당 앱에서 둘다 사용할 수 있는 모든
-바로 가기가 표시됩니다. 이들 바로 가기는 앱의 메뉴에서 자동으로 검색되지만(사용 가능한 경우),
-개발자가 화면에 맞춰 스스로 미세 조정한 바로 가기 목록을
-제공할 수 있습니다. 이를 위해서는 다운로드 가능한
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에 설명되어 있는 새
-<code>Activity.onProvideKeyboardShortcuts()</code> 메서드를 재정의할 수 있습니다.
-</p>
-
-<p>
-앱의 어느 곳에서든 Keyboard Shortcuts Helper를 트리거하려면 관련 액티비티에 대해
-{@code Activity.requestKeyboardShortcutsHelper()}를 호출하세요.
-</p>
-
-<h2 id="sustained_performance_api">지속적인 성능 API</h2>
-
-<p>
-기기 구성 요소가 온도 제한에 도달할 때
-시스템에서는 시스템온칩(system-on-chip) 엔진을 조절하므로, 장시간 실행되는 앱의 성능이 크게 변동될
-수 있습니다. 이러한 변동은 장시간 실행되는 고성능 앱을 만들려는 앱 개발자
-입장에서는 일종의 움직이는 과녁과도 같은 것입니다.
-</p>
-
-<p>
-이러한 제한을 해결하기 위해, Android N에서는
-<em>지속적인 성능 모드</em>를 지원하며, 이 모드를 통해 OEM들은 장시간 실행되는 앱의
-기기 성능에 대한 힌트를 제공할 수 있습니다. 앱 개발자는
-이들 힌트를 사용하여 장기간에 걸쳐
-기기 성능을 예측 가능하고 이 성능을 일관된 수준으로 유지하기 위해 앱을 적절히 조정할 수 있습니다.
-</p>
-
-<p>
-앱 개발자는 N Developer Preview에 있는 이
-새 API를 Nexus 6P 기기에서만 시험해 볼 수 있습니다. 이 기능을 사용하려면
-지속적인 성능 모드에서 실행하려는 기간에 대해
-지속적인 성능 기간 플래그를 설정하세요.
-{@code Window.setSustainedPerformanceMode()} 메서드를 사용하여 이 플래그를 설정하세요. 해당 기간이 포커스 안에 없을 때는
-이 모드가 자동으로 비활성화됩니다.
-</p>
-
-<h2 id="vr">VR 지원</h2>
-
-<p>
-개발자가 사용자를 위한 고품질 모바일 VR 환경을 만들 수 있도록, Android N에서는
-새로운 VR 모드에 대한 플랫폼 지원과 최적화를 추가합니다. VR 앱 전용 CPU 코어에 대한 액세스를 비롯하여
-다수의 성능 개선 사항이 있습니다.
-지능적 머리 추적과
-VR용으로 작동하는 스테레오 알림 기능을 앱 내에서 이용할 수 있습니다. 가장 중요한 점은, 지연 시간이 매우 짧은
-그래픽을 Android N이 제공한다는 사실입니다. Android N용 VR 앱 만들기에 대한 자세한 정보는
-<a href="https://developers.google.com/vr/android/">Android용 Google VR SDK</a>를 참조하세요.
-</p>
-
-
-<h2 id="print_svc">인쇄 서비스 개선 사항</h2>
-
-<p>
- 이제 Android N에서는 인쇄 서비스 개발자가 개별 프린터와 인쇄 작업에
-대한 추가적인 정보를 노출시킬 수 있습니다.
-</p>
-
-<p>
- 개별 프린터를 나열할 때, 이제 인쇄 서비스가 다음 두 가지 방식으로 프린터마다
-아이콘을 설정할 수 있습니다.
-</p>
-
-<ul>
- <li><code>PrinterInfo.Builder.setResourceIconId()</code>를 호출하여 리소스 ID로부터
-아이콘을 설정할 수 있습니다.
- </li>
-
- <li><code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>을 호출하고,
-<code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>을 사용하여 아이콘이 요청될 때 콜백을 설정하여
-네트워크에서 아이콘을 표시할
- 수 있습니다.
- </li>
-</ul>
-
-<p>
- 또한, <code>PrinterInfo.Builder.setInfoIntent()</code>를 호출하여 추가적인 정보를 표시하도록
-프린터당 액티비티를 제공할 수 있습니다.
-</p>
-
-<p>
- <code>android.printservice.PrintJob.setProgress()</code> 및
-<code>android.printservice.PrintJob.setStatus()</code>를 각각 호출하여
-인쇄 작업 알림에서 인쇄 작업의
-진행률과 상태를 나타낼 수 있습니다.
-</p>
-
-<p>
- 이들 메서드에 대한 자세한 내용은 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>를 확인하세요.
-</p>
-
-<h2 id="framemetrics_api">FrameMetricsListener API</h2>
-
-<p>
-앱은 FrameMetricsListener API를 통해 UI 렌더링
-성능을 모니터링할 수 있습니다. 이 기능을 제공하기 위해 이 API는 앱의 현재 창에 대한 프레임 타이밍
-정보를 전송하는 스트리밍 Pub/Sub API를 노출시킵니다. 반환되는 데이터는
-<code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code>가 표시하는 데이터와 동일하지만, 지난 120개 프레임으로 제한되지 않습니다.
-</p>
-
-<p>
-FrameMetricsListener를 사용하면 USB 연결 없이 프로덕션 환경에서
-상호 작용 수준의 UI 성능을 측정할 수 있습니다. 이 API를
-사용하면
-{@code adb shell dumpsys gfxinfo}보다 훨씬 세분화된 수준에서 데이터를 수집할 수 있습니다. 시스템은 앱에서 발생하는 특정한 상호 작용에
-대한 데이터를 수집할 수 있기 때문에, 이처럼 높은 수준의 세분화가 가능합니다. 시스템은
-전체 앱의 성능에 대한 전체 요약을 캡처하거나
-전체 상태를 지울 필요가 없습니다. 이 기능을 사용하면
-앱 내에서의 실제 사용 사례에 대한 UI 성능에서
-성능 데이터를 수집하고 성능 저하를 찾아낼 수 있습니다.
-</p>
-
-<p>
-창을 모니터링하려면 <code>FrameMetricsListener.onMetricsAvailable()</code>
-콜백 메서드를 구현하고 해당 창에 등록하세요. 자세한 내용은 다운로드 가능한
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 {@code FrameMetricsListener} 클래스 문서를
-참조하세요.
-</p>
-
-<p>
-이 API는 {@code FrameMetrics} 객체를 제공하며 여기에는 렌더링 하위 시스템이 프레임 수명 주기의 다양한 이정표에 대해 보고하는
-타이밍 데이터가 포함됩니다.
-지원되는 지표는 {@code UNKNOWN_DELAY_DURATION},
-{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
-{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
-{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
-{@code TOTAL_DURATION}, {@code FIRST_DRAW_FRAME}입니다.
-</p>
-
-
-<h2 id="virtual_files">가상 파일</h2>
-
-<p>
- 이전 버전의 Android에서는 사용자가
-Google 드라이브와 같은 자신의 클라우드 저장소 계정에서 파일을 선택할 수 있도록, 앱이 저장소 액세스 프레임워크를
-사용할 수 있었습니다. 하지만 직접적인 바이트코드 표시가 없는
-파일을 표시하기 위한 방법이 없었으며, 모든 파일이 입력 스트림을
-제공해야 했습니다.
-</p>
-
-<p>
- Android N에서는 <em>가상 파일</em>이라는 개념을 저장소 액세스
- 프레임워크에 추가합니다. 가상 파일 기능을 사용하면,
-{@link android.content.Intent#ACTION_VIEW} 인텐트와 함께 사용될 수 있는
-문서 URI에 직접적인 바이트코드 표시가 없더라도 이 문서 URI를 {@link android.provider.DocumentsProvider}가 반환할 수
-있습니다. 또한 Android N에서는 가상 파일이든 아니든 간에, 사용자 파일에 대한
-대체 형식을 제공할 수 있습니다.
-</p>
-
-<p>
- 앱에서 가상 문서의 URI를 가져오려면 먼저
-{@link android.content.Intent}를 만들어 파일 선택기 UI를 여세요. 앱은 {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()}
- 메서드를 사용하여
- 가상 파일을
-직접 열 수 없으므로,
-{@link android.content.Intent#CATEGORY_OPENABLE} 카테고리를 포함하는 경우에는 앱이 어떤 가상 파일도 수신하지 못합니다.
-</p>
-
-<p>
- 사용자가 선택한 후에는, 시스템이
-{@link android.app.Activity#onActivityResult onActivityResult()} 메서드를 호출합니다.
- 아래의 코드 조각에서 볼 수 있듯이, 앱이 가상 파일의 URI를 검색하고
-입력 스트림을 가져올 수 있습니다.
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- 사용자 파일 액세스에 대한 자세한 내용은
-<a href="{@docRoot}guide/topics/providers/document-provider.html">저장소
-액세스 프레임워크 가이드</a>를 참조하세요.
-</p>
diff --git a/docs/html-intl/intl/ko/preview/behavior-changes.jd b/docs/html-intl/intl/ko/preview/behavior-changes.jd
deleted file mode 100644
index 709ccfc..0000000
--- a/docs/html-intl/intl/ko/preview/behavior-changes.jd
+++ /dev/null
@@ -1,610 +0,0 @@
-page.title=동작 변경 사항
-page.keywords=preview, sdk, 호환성
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>이 문서의 내용</h2>
-
-<ol>
- <li><a href="#perf">성능 향상</a>
- <ol>
- <li><a href="#doze">잠자기 모드</a></li>
- <li><a href="#bg-opt">백그라운드 최적화</a></li>
- </ol>
- </li>
- <li><a href="#perm">권한 변경</a>
- </li>
- <li><a href="#sharing-files">앱 사이의 파일 공유</a></li>
- <li><a href="#accessibility">접근성 향상</a>
- <ol>
- <li><a href="#screen-zoom">화면 확대/축소</a></li>
- <li><a href="#vision-settings">설정 마법사의 Vision Settings</a></li>
- </ol>
- </li>
- <li><a href="#ndk">플랫폼 라이브러리에 연결되는 NDK 앱</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">주석 보존</a></li>
- <li><a href="#other">기타 중요한 사항</a></li>
-</ol>
-
-<h2>참고 항목</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">
- Android N API 개요</a></li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Android N에는 새로운 기능 및 특징과 더불어
-다양한 시스템 변경 사항 및 API 동작 변경 사항이 포함되어 있습니다. 이 문서에서는
-여러분이 앱에서 숙지하고 고려해야 하는 몇 가지
-주요 변경 사항을 소개하겠습니다.
-</p>
-
-<p>
- 이전에 Android용 앱을 게시한 적이 있으신 경우, 이와 같은
- 플랫폼 변경으로 인해 앱이 영향을 받을 수 있다는 점을 유의하세요.
-</p>
-
-
-<h2 id="perf">배터리와 메모리</h2>
-
-<p>
-Android N에는 기기의 배터리 수명을 연장하고 RAM 사용량을 감소시키기 위한
-시스템 동작 변경 사항이 포함됩니다. 이러한 변경 사항은, 앱이 특정한 암시적 인텐트를 통해
-다른 앱과 상호 작용하는 방식과 함께, 시스템 리소스에 대한
-앱의 액세스에 영향을 미칠 수 있습니다.
-</p>
-
-<h3 id="doze">잠자기 모드</h3>
-
-<p>
- Android 6.0(API 레벨 23)에 도입된 잠자기 모드는 사용자가 기기의
-플러그를 뽑고 정지 상태에서 화면이 꺼져 있을 때 CPU 및
-네트워크 액티비티를 지연시켜서 배터리 수명을 개선해 줍니다. Android N에서는
-기기의 플러그를 뽑고 화면이 꺼져 있는 동안
-CPU 및 네트워크 제한의 하위 세트를 적용하여 잠자기 모드를 더욱
-향상시켜 주지만, 반드시 정지 상태일 필요는 없습니다(예: 핸드셋을 사용자의 주머니에 넣고 다니는 경우).
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>그림 1.</strong> 잠자기 모드에서 배터리 수명을 개선하기 위해 첫 번째 레벨의 시스템 액티비티 제한을
-적용하는 방법에 대한 그림.
-</p>
-
-<p>
- 기기가 배터리 전원에 연결되고 일정 시간 동안 화면이 꺼져 있는 경우
-기기가 잠자기 모드로 전환되고 첫 번째 하위 세트의 제한을 적용합니다. 기기는 앱
-네트워크 액세스를 차단하고, 작업과 동기화를 지연시킵니다. 기기가 잠자기 모드로
-전환된 후 일정 시간 동안 정지 상태에 있으면, 시스템은 잠자기 모드의 나머지 제한 사항을 {@link android.os.PowerManager.WakeLock},
-{@link android.app.AlarmManager} 알람, GPS 및 Wi-Fi 스캔에
-적용합니다. 일부 잠자기 모드 제한이
-적용되든 모든 잠자기 모드 제한이 적용되든 상관없이,
-시스템은 잠시 동안의 유지 관리 기간 중에 기기를 깨우며, 이 기간 중에는
-애플리케이션의 네트워크 액세스가 허용되고 지연된 작업/동기화가 실행됩니다.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>그림 2.</strong> 기기가 일정 시간 동안 정지 상태에 있은 후에
-잠자기 모드에서 두 번째 레벨의 시스템 액티비티 제한을 적용하는 방법에 대한 그림.
-</p>
-
-<p>
- 화면을 활성화하거나 기기의 플러그를 꽂으면 잠자기 모드가
-종료되고 이러한 처리 제한이 제거됩니다. <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">잠자기 및 앱 대기
-모드 최적화</a>에서 설명한 대로, Android 6.0(API 레벨 23)에 도입된
-이전 버전의 잠자기 모드에 맞춰 앱을 조정할 경우에는 이러한 추가적인 동작이
-권장 사항 및 모범
-사례에 영향을 미치지 않습니다. 하지만
-여전히 해당 권장 사항을 따라야 합니다. 예를 들어, GCM(Google Cloud Messaging)을 사용하여 메시지를
-송수신하고 추가적인 잠자기 모드 동작을 수용하기 위한 업데이트 계획을
-시작해야 합니다.
-</p>
-
-
-<h3 id="bg-opt">Project Svelte: 백그라운드 최적화</h3>
-
-<p>
- Android N에서는 메모리 사용량 및 전원 소비량을 최적화하기 위해
- 세 가지 암시적 브로드캐스트를 제거합니다. 이렇게 변경해야 하는
-이유는, 암시적 브로드캐스트는 백그라운드에서 브로드캐스트를
-수신하도록 등록된 앱을 자주 시작하기 때문입니다. 이들 브로드캐스트를 제거하면 기기 성능과 사용자 환경이
-상당히 향상될 수 있습니다.
-</p>
-
-<p>
- 모바일 기기의 경우 연결 변경이 자주 나타납니다(예: Wi-Fi와
- 모바일 데이터 간의 이동 시). 현재는
-암시적 {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} 브로드캐스트의 수신기를
-매니페스트에 등록하여 앱이 이러한 연결 변경을 모니터링할 수 있습니다. 많은 앱들이 이 브로드캐스트를 수신하도록
- 등록하기 때문에, 단일 네트워크 스위치가 모든 앱을 깨우고 이들 앱이 해당 브로드캐스트를
- 동시에 처리하도록 할 수 있습니다.
-</p>
-
-<p>
- 마찬가지로, 이전 버전의 Android에서는 앱이 다른 앱(예: 카메라)에서 암시적 {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 및 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} 브로드캐스트를
-수신하도록 등록할 수 있었습니다. 사용자가 카메라 앱으로 사진을 찍으면, 이들 앱이 깨어나서 해당 브로드캐스트를
- 처리합니다.
-</p>
-
-<p>
- 이런 문제를 완화하기 위해, Android N은 다음과 같은 최적화를
- 적용합니다.
-</p>
-
-<ul>
- <li>Android N을 대상으로 하는 앱은 해당 이벤트의 알림을 요청하는 매니페스트 항목이 있더라도 {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} 브로드캐스트를
-수신하지 않습니다. 실행 중인
-앱은 {@link android.content.BroadcastReceiver}로 알림을 요청하면
-여전히 기본 스레드에서 {@code CONNECTIVITY_CHANGE}를 수신할 수 있습니다.
- </li>
-
- <li>앱은 {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 또는 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} 브로드캐스트를 송수신할 수 없습니다. 이 최적화는 Android N을 대상으로
- 하는 앱뿐 아니라 모든 앱에 영향을 미칩니다.
- </li>
-</ul>
-
-<p>앱이 이들 인텐트 중 하나라도 사용하는 경우에는,
- Android N 기기를 올바로 대상으로 삼을 수 있도록 이들 인텐트에 대한 종속성을 최대한 빨리 제거해야 합니다.
- Android 프레임워크는 이러한 암시적 브로드캐스트의
- 필요성을 줄이기 위한 여러 가지 해결책을 제공합니다. 예를 들어, {@link
- android.app.job.JobScheduler} API는 지정된 조건(예:
-고정 요금제 네트워크에 연결)이 충족될 경우 네트워크 운영을 예약할 수 있는
-강력한 메커니즘을 제공합니다. 심지어 {@link
- android.app.job.JobScheduler}를 사용하여 콘텐츠 공급자의 변경 사항에 대응할 수도 있습니다.
-</p>
-
-<p>
- N에서 백그라운드 최적화와 앱을 조정하는 방법에 대한 자세한 내용은
- <a href="{@docRoot}preview/features/background-optimization.html">백그라운드 최적화</a>를
- 참조하세요.
-</p>
-
-<h2 id="perm">권한 변경</h2>
-
-<p>
- Android N에는 앱에 영향을 미칠 수도 있는 권한 변경이 포함되어 있습니다.
-</p>
-
-<h3 id="permfilesys">파일 시스템 권한 변경</h3>
-
-<p>
- 개인 파일의 보안을 강화하기 위해, Android N 이상을 대상으로 하는 앱의 개인
- 디렉터리는 액세스가 제한됩니다(<code>0700</code>).
- 이 설정은 크기 또는
-존재 여부와 같은 개인 파일의 메타데이터 유출을 막아줍니다. 이러한 권한 변경은 여러 가지 부작용이 있습니다.
-</p>
-
-<ul>
- <li>
- 소유자가 개인 파일의 파일 권한을
-더 이상 완화해서는 안 되며,
-{@link android.content.Context#MODE_WORLD_READABLE} 및/또는
-{@link android.content.Context#MODE_WORLD_WRITEABLE}을 사용하여 권한을 완화하려고 시도하면
-{@link java.lang.SecurityException}이 트리거됩니다.
- <p class="note">
- <strong>참고:</strong> 아직까지는 이 제한이 완전히 적용되지 않습니다.
- 앱이 여전히 기본
-API 또는 {@link java.io.File File} API를 사용하여 개인 디렉터리에 대한 권한을 수정할 수도 있습니다. 하지만
-개인 디렉터리에 대한 권한은 부득이한 경우가 아니라면 완화하지 않는 것이 좋습니다.
- </p>
- </li>
- <li>
- 패키지 도메인 외부에서 <code>file://</code> URI를 전달하면 수신기가 액세스 불가능한 경로로
- 남아 있을 수 있습니다. 따라서
-<code>file://</code> URI를 전달하려고 시도하면
-<code>FileUriExposedException</code>이 트리거됩니다. 개인 파일의 내용을 공유하기 위해
-권장되는 방법은 {@link
- android.support.v4.content.FileProvider}를 사용하는 것입니다.
- </li>
- <li>
- {@link android.app.DownloadManager}는 비공개로
-저장된 파일을 더 이상 파일 이름별로 공유할 수 없습니다. 레거시 애플리케이션은 {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME}에 액세스할 때
-액세스가 불가능한 경로가 될 수 있습니다. Android N 이상을
-대상으로 하는 앱은 {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}에 액세스할 때 {@link java.lang.SecurityException}을
-트리거합니다.
-
-
-{@link
- android.app.DownloadManager.Request#setDestinationInExternalFilesDir
- DownloadManager.Request.setDestinationInExternalFilesDir()} 또는
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalPublicDir
- DownloadManager.Request.setDestinationInExternalPublicDir()}
-을 사용하여 다운로드
-위치를 공용 위치로 설정하는 레거시 애플리케이션은
-{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}에 있는 경로에 여전히 액세스할 수 있지만, 이
- 메서드는 부득이한 경우가 아니라면 사용하지 않는 것이 좋습니다. {@link android.app.DownloadManager}에 의해 노출되는 파일에
-액세스하는 좋은 방법은
-{@link android.content.ContentResolver#openFileDescriptor
- ContentResolver.openFileDescriptor()}를 사용하는 것입니다.
- </li>
-</ul>
-
-<h2 id="sharing-files">앱 사이의 파일 공유</h2>
-
-<p>
-Android N을 대상으로 하는 앱의 경우, Android 프레임워크는 앱 외부에서 {@code file://} URI의 노출을
-금지하는 {@link android.os.StrictMode} API 정책을
-적용합니다. 파일 URI를 포함하는 인텐트가 앱을 떠나면
-{@code FileUriExposedException} 예외가 생기면서 앱에 오류가 발생합니다.
-</p>
-
-<p>
-애플리케이션 간에 파일을 공유하려면 {@code content://} URI를
-보내고 이 URI에 대해 임시 액세스 권한을 부여해야 합니다. 이 권한을 가장 쉽게 부여하는 방법은
-{@link android.support.v4.content.FileProvider} 클래스를 사용하는 방법입니다. 권한과 파일 공유에
-대한 자세한
-내용은 <a href="{@docRoot}training/secure-file-sharing/index.html">파일 공유</a>를 참조하세요.
-</p>
-
-<h2 id="accessibility">접근성 향상</h2>
-
-<p>
- Android N에는 시력이 나쁘거나 손상된 사용자를 위해 플랫폼의
- 사용성을 개선하기 위한 변경 사항이 포함되어 있습니다. 이러한 변경 사항에서는 일반적으로
- 앱의 코드를 변경할 필요가 없지만, 사용자 환경에
- 미치는 잠재적인 영향을 평가하기 위해 이들 기능을 검토하고
- 앱으로 테스트해야 합니다.
-</p>
-
-
-<h3 id="screen-zoom">화면 확대/축소</h3>
-
-<p>
- Android N에서는 사용자가 <strong>Display size</strong>를 설정할 수
-있으며, 이 설정에서 화면의 모든 요소를 확대하거나 축소할 수 있으므로, 시력이
-나쁜 사용자의 기기 접근성이 향상됩니다. 최소 화면 너비인 <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">sw320dp</a>를 초과하는 화면은 사용자가 확대/축소할
- 수 없으며, 이 너비는 일반적인 중간 크기 전화기인 Nexus 4의
- 너비입니다.
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>그림 3.</strong> 오른쪽 화면은 Android N 시스템 이미지가
-실행 중인 기기의 Display size를 늘릴 때의 효과를 보여줍니다.
-</p>
-
-
-<p>
- 기기 밀도가 변경되면 시스템은 다음과 같은 방식으로 실행 중인
- 앱에게 알립니다.
-</p>
-
-<ul>
- <li>앱이 API 레벨 23 이하를 대상으로 하는 경우 시스템에서는
-모든 백그라운드 프로세스를 자동으로 종료합니다. 즉, 사용자가 이들
- 앱으로부터 전환하여 <em>Settings</em> 화면을
- 열고 <strong>Display size</strong> 설정을 변경하면, 시스템은 저용량 메모리
- 상황에서와 동일한 방식으로 앱을 종료합니다. 앱에 포그라운드 프로세스가
- 있는 경우, <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에 설명된 대로, 시스템은
- 마치 기기의 방향이 변경된
- 것처럼 구성 변경을 해당 프로세스에 알립니다.
- </li>
-
- <li>앱이 Android N을 대상으로 하는 경우,
-<a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에 설명된
-대로, 구성 변경을 모든 프로세스(포그라운드 및 백그라운드)에
-알립니다.
- </li>
-</ul>
-
-<p>
- 앱이 Android 모범 사례를 따르기만 한다면, 대부분의 앱은 이 기능을
- 지원하기 위해 어떠한 변경도 수행할 필요가 없습니다. 확인할 사항은 구체적으로 다음과 같습니다.
-</p>
-
-<ul>
- <li>화면 너비가 <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>인 기기에서 앱을 테스트하고 적절하게 작동하는지
- 확인하세요.
- </li>
-
- <li>기기 구성이 변경되는 경우, 밀도에 종속된 모든 캐시된
-정보(예: 캐시된 비트맵 또는 네트워크에서 로드된 리소스)를
-업데이트하세요. 앱이 일시 정지 상태에서 다시 시작하는 경우 구성
- 변경을 확인하세요.
- <p class="note">
- <strong>참고:</strong> 구성에 종속된 데이터를 캐시하는 경우,
- 해당 데이터에 적절한 화면 크기 또는 픽셀 밀도와 같은 관련 메타데이터를
- 포함시키는 것이 좋습니다. 이 메타데이터를 저장해 놓으면,
- 구성이 변경된 후에 캐시된 데이터를 새로 고칠지 여부를
- 결정할 수 있습니다.
- </p>
- </li>
-
- <li>픽셀 단위는 화면 밀도에 따라
- 변하지 않으므로, 이 단위로 치수를 지정하지 마세요. 그 대신, <a href="{@docRoot}guide/practices/screens_support.html">밀도에 독립적인 픽셀</a>(<code>dp</code>) 단위로
- 치수를 지정하세요.
- </li>
-</ul>
-
-<h3 id="vision-settings">설정 마법사의 Vision Settings</h3>
-
-<p>
- Android N에는 Welcome 화면에 Vision Settings가 포함되어
-있으며, 여기서 사용자는
- <strong>Magnification gesture</strong>, <strong>Font size</strong>,
-<strong>Display size</strong> 및 <strong>TalkBack</strong>의 접근성 설정을 새 기기에 구성할 수 있습니다. 이러한
-변경은 다른 화면 설정에 관련된 버그의 가시성을 증대시킵니다. 이 기능의 영향을 평가하려면,
- 이들 설정을 활성화하여 앱을
- 테스트해야 합니다. 이 설정은 <strong>Settings >
- Accessibility</strong> 아래에 있습니다.
-</p>
-
-<h2 id="ndk">플랫폼 라이브러리에 연결되는 NDK 앱</h2>
-
-<p>
- 비공개 API가 로드되는 것을 막기 위해 Android N에는 네임스페이스 변경이 포함되어 있습니다.
- NDK를 사용하는 경우에는 Android 플랫폼에서
- 공개 API를 사용해야만 합니다. Android의 다음 번 공식 릴리스에서 비공개 API를 사용하면 앱 작동이 중단될 수
- 있습니다.
-</p>
-
-<p>
- 비공개 API의 사용을 여러분에게 경고하기 위해, Android N 기기에서 실행
- 중인 앱은 어떤 앱이 비공개 API를 호출할 때 logcat 출력에 오류를 생성합니다.
- 또한, 이런 상황이 잘 인식될 수 있도록
- 이 오류가 기기 화면에도 메시지로 표시됩니다. 여러분이 앱 코드를 검토하여
- 비공개 플랫폼 API의 사용을 제거해야 하며, 프리뷰 기기 또는
- 에뮬레이터를 사용하여 앱을 철저히 테스트해야 합니다.
-</p>
-
-<p>
- 앱이 플랫폼 라이브러리에 종속된 경우, 개인 API를 이와 동등한
- 공개 API로 바꾸기 위한 일반적인 수정 사항을 NDK 문서에서 참조하세요.
- 또한, 자신도 모르는 사이에 플랫폼 라이브러리에
- 연결되어 있을 수가 있으며, 특히 여러분의 앱이 사용하는 라이브러리가 플랫폼의
- 일부(예: <code>libpng</code>)이지만 NDK의 일부가 아닌 경우에는 더 그렇습니다. 이 경우에는 연결에
-필요한 모든 .so 파일이 APK에 포함되어 있는지 확인하세요.
-</p>
-
-<p class="caution">
- <strong>주의:</strong> 일부 타사 라이브러리가 비공개 API에
- 연결될 수도 있습니다. 앱이 이들 라이브러리를 사용하는 경우, Android의
- 다음 번 공식 릴리스에서 실행할 때 앱 작동이 중단될 수 있습니다.
-</p>
-
-<p>
- 앱은 NDK에 포함되지 않은 고유 라이브러리를 사용하거나
- 이에 종속되어서는 안 됩니다. 왜냐하면 이 라이브러리는 특정
- Android 릴리스에서 다른 릴리스로 변경되거나 제거될 수 있기 때문입니다. OpenSSL에서 BoringSSL로의 전환은 이러한 변경의 한 예입니다.
- 또한, NDK에 포함되지 않은
-플랫폼 라이브러리에는 호환성 요구 사항이 없기 때문에, 다른 장치에서는
-호환성 레벨이 다를 수도 있습니다. 구형 기기에 있는 비 NDK 라이브러리에 액세스해야 하는 경우
-Android API 레벨에 따라 로드를 수행하세요.
-</p>
-
-<p>
- 이러한 유형의 문제를 진단하는 데 도움을 주기 위해, 여기서는
- Android N으로 앱을 빌드할 때 발생할 수 있는 Java 및 NDK 오류의 몇 가지 예를 보여줍니다.
-</p>
-
-<p>Java 오류의 예:</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>NDK 오류의 예:</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- 다음은 이러한 유형의 오류가 발생한 앱의 몇 가지 일반적인 수정사항입니다.
-</p>
-
-<ul>
- <li>libandroid_runtime.so에서 getJavaVM 및 getJNIEnv 사용은 표준
- JNI 함수로 교체될 수 있습니다.
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>{@code libcutils.so}에서 {@code property_get} 기호 사용은 공개
- {@code alternative __system_property_get}으로 교체될 수 있습니다.
- 이렇게 하려면, 다음의 include와 함께 {@code __system_property_get}을 사용하세요.
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>{@code libcrypto.so}에서 {@code SSL_ctrl} 기호 사용은 앱
-로컬 버전으로 교체되어야 합니다. 예를 들어, {@code .so} 파일에서
- {@code libcyrpto.a}를 정적으로 링크하거나 BoringSSL 또는 OpenSSL에서
- {@code libcrypto.so}를 동적으로 앱에 포함시켜야 합니다.
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N에는 Android for Work를 대상으로 하는 앱에 대한 변경 사항이
-포함되어 있습니다. 인증서 설치, 비밀번호 재설정,
-보조 사용자 관리 및 기기 식별자 액세스에 대한 변경 사항이 이에 포함됩니다. Android for Work 환경용 앱을 빌드하는 경우에는 이러한
- 변경 사항을 검토하고 그에 따라
-앱을 수정해야 합니다.
-</p>
-
-<ul>
- <li>DPC가 인증서를 설정할 수 있으려면, 위임된 인증서 설치 관리자를 여러분이 먼저
- 설치해야 합니다. N SDK를 대상으로 하는 프로필 소유자
- 앱 및 기기 소유자 앱의 경우, 기기 정책 컨트롤러(DPC)가 <code>DevicePolicyManager.setCertInstallerPackage()</code>를 호출하기
- 전에, 위임된 인증서 설치 관리자를 여러분이 먼저
-설치해야 합니다. 아직 설치 관리자가
-설치되지 않은 경우 시스템에서 <code>IllegalArgumentException</code>이
-발생합니다.
- </li>
-
- <li>이제 기기 관리자의 비밀번호 재설정 제한이 프로필 소유자에게도
- 적용됩니다. 기기 관리자는 이미 설정된 암호를 변경하거나
- 지우기 위해 {@code DevicePolicyManager.resetPassword()}를 더 이상 사용할
- 수 없습니다. 기기 관리자는
- 기기에 비밀번호, PIN 또는 패턴이 없는 경우에만 비밀번호를 설정할 수 있습니다.
- </li>
-
- <li>제한이 설정되어 있더라도 기기 소유자 및 프로필 소유자는
- 계정을 관리할 수 있습니다. <code>DISALLOW_MODIFY_ACCOUNTS</code> 사용자
- 제한이 있더라도 기기 소유자 및 프로필 소유자는 계정 관리 API를 호출할 수 있습니다.
- </li>
-
- <li>기기 소유자는 보조 사용자를 보다 쉽게 관리할 수 있습니다. 기기가
-기기 소유자 모드에서 실행 중인 경우 <code>DISALLOW_ADD_USER</code> 제한이
-자동으로 설정됩니다. 이렇게 하면 사용자는 관리되지 않는 보조 사용자를 생성할 수
-없습니다. 또한, <code>CreateUser()</code> 및
- <code>createAndInitializeUser()</code> 메서드가 사용 중단되었으며, 새로운
-<code>DevicePolicyManager.createAndManageUser()</code> 메서드로 대체되었습니다.
- </li>
-
- <li>기기 소유자는 기기 식별자에 액세스할 수 있습니다. 기기
-소유자는 <code>DevicePolicyManagewr.getWifiMacAddress()</code>를 사용하여 기기의
- Wi-Fi MAC 주소에 액세스할 수 있습니다. 기기에서
-Wi-Fi가 활성화된 적이 없는 경우 이 메서드는 {@code null} 값을 반환합니다.
- </li>
-
- <li>Work Mode 설정은 업무용 앱에 대한 액세스를 제어합니다. 작업 모드가 해제되면
-시스템 런처에서는 업무용 앱을 회색으로 표시하여 해당 앱이 사용될 수 없음을 나타냅니다. 작업 모드를
- 다시 활성화하면 정상적인 동작이 복원됩니다.
-</ul>
-
-<p>
- Android N에서 Android for Work의 변경 사항에 대한 자세한 내용은
-<a href="{@docRoot}preview/features/afw.html">Android for Work 업데이트</a>를 참조하세요.
-</p>
-
-<h2 id="annotations">주석 보존</h2>
-
-<p>
-Android N에서는 주석의 표시 여부가 무시되던 버그가 수정되었습니다. 이 문제로 인해 런타임이 액세스할 수 없어야 하는 주석에 액세스할 수 있었습니다.
-
- 이러한 주석으로는 다음이 포함됩니다.
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}: 빌드 시에만 표시되어야 합니다.</li>
- <li>{@code VISIBILITY_SYSTEM}: 런타임에
-기본 시스템에만 표시되어야 합니다.</li>
-</ul>
-
-<p>
-앱이 이 동작에 의존했다면, 런타임에 사용할 수 있어야 하는
-주석에 보존 정책을 추가하세요. {@code @Retention(RetentionPolicy.RUNTIME)}을 사용하여 추가하면 됩니다.
-</p>
-
-<h2 id="other">기타 중요한 사항</h2>
-
-<ul>
-<li>앱이 Android N에서 실행 중일 때 API 레벨이 낮고 사용자가 표시
-크기를 변경하는 경우, 해당 앱 프로세스가 종료됩니다. 앱은 이
-시나리오를 매끄럽게 처리할 수 있어야 합니다. 그렇지 않으면 사용자가 Recents에서
-앱을 복원할 때 앱 작동이 중단됩니다.
-
-<p>
-이러한 동작이 발생하지 않도록 앱을 테스트해야 합니다.
-DDMS를 통해 수동으로 앱을 종료할 때
-동일한 작동 중단을 유발시킴으로써 테스트를 수행할
-수 있습니다.
-</p>
-
-<p>
-N 이상을 대상으로 하는 앱은 밀도 변경 시에 자동으로 종료되지 않지만,
-구성 변경에는 제대로 응답하지 못할 수도 있습니다.
-</p>
-</li>
-
-<li>
-Android N에서 앱은 구성 변경을 매끄럽게 처리할 수 있어야 하며,
-이후에 시작할 때도 작동이 중단되어서는 안 됩니다. 글꼴
-크기(<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>)를 변경하여 앱 동작을 검사한 다음, Recents에서
-앱을 복원할 수 있습니다.
-</li>
-
-<li>
-이전 버전의 Android에서는 버그 때문에, 시스템이 주 스레드에서
-TCP 소켓에 대한 쓰기를 엄격 모드 위반으로서 플래그하지 못했습니다. Android N에서는 이 버그가 수정되었습니다.
-이 동작을 보이는 앱에서는 이제 {@code android.os.NetworkOnMainThreadException}이 발생합니다.
-일반적으로, 주 스레드에서 네트워크 작업을 수행하면 일반적으로
-테일 지연 시간이 길어져 ANR 및 쟁크(jank)를 유발하므로, 이런 작업은 수행하지 않는 것이 좋습니다.
-</li>
-
-<li>
-{@code Debug.startMethodTracing()} 계열에 속하는 메서드는,
-SD 카드의 최상위 레벨에 저장하는 것이 아니라, 이제 공유 저장소의
-패키지별 디렉터리에 출력을 기본적으로
-저장합니다. 즉, 앱은 이들 API를 사용하기 위해 {@code WRITE_EXTERNAL_STORAGE} 권한을 요청할 필요가 더 이상 없습니다.
-</li>
-
-<li>
-상당수 플랫폼 API는 이제 대용량
-페이로드가 {@link android.os.Binder} 트랜잭션을 통해 전송되는 것을 확인하기 시작했으며, 시스템에서는
-이제 {@code TransactionTooLargeExceptions}를
-자동으로 로깅하거나 억제하는 대신 {@code RuntimeExceptions}로 다시 발생시킵니다. 한 가지
-공통적인 예는
-{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()}에
-너무 많은 데이터를 저장하는 바람에, 앱이 Android N을 대상으로 할 때 {@code ActivityThread.StopInfo}가
-{@code RuntimeException}을 발생시키는 경우입니다.
-</li>
-
-<li>
-앱이 {@link java.lang.Runnable} 작업을 {@link android.view.View}에 게시하고
-{@link android.view.View}가
-창에 연결되지 않은 경우, 시스템에서는
-{@link android.view.View}가 있는 {@link java.lang.Runnable} 작업을 큐에 넣으며,
-{@link java.lang.Runnable} 작업은
-{@link android.view.View}가 창에 연결될 때까지
-실행되지 않습니다. 이 동작은 다음과 같은 버그를 수정합니다.
-<ul>
- <li>의도한 창의 UI 스레드가 아닌 다른 스레드에서 {@link android.view.View}에 앱이 게시된 경우,
-결과적으로 {@link java.lang.Runnable}이 잘못된 스레드에서 실행될 수 있습니다.
- </li>
- <li>{@link java.lang.Runnable} 작업이 루퍼 스레드가 아닌 다른 스레드에서
-게시되었다면 해당 앱이 {@link java.lang.Runnable} 작업을 노출시킬 수도 있습니다.</li>
-</ul>
-</li>
-
-<li>
-{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
-권한이
-있는 Android N 상의 앱이 패키지를 삭제하려고 하지만, 해당 패키지를 다른 앱이 설치한 경우에는
-사용자의 확인이 필요합니다. 이 시나리오에서는 앱이
-{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}을 호출할 때
-{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}을
-반환 상태로 예상해야 합니다.
-</li>
-
-</ul>
-
diff --git a/docs/html-intl/intl/ko/preview/download-ota.jd b/docs/html-intl/intl/ko/preview/download-ota.jd
deleted file mode 100644
index 886b8a8..0000000
--- a/docs/html-intl/intl/ko/preview/download-ota.jd
+++ /dev/null
@@ -1,324 +0,0 @@
-page.title=기기 OTA 이미지 적용
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Android Preview SDK의 구성 요소를
-다운로드하고 설치하기 전에 우선 다음과 같은
-사용 약관에 동의해야 합니다.</p>
-
- <h2 class="norule">사용 약관</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-이것은 Android SDK Preview 라이선스 계약서입니다(이하 "라이선스 계약").
-
-1. 개요
-
-1.1 Android SDK Preview(본 라이선스 계약에서는 "Preview"라고 칭하며, 구체적으로 Android 시스템 파일, 패키지 API 및 Preview 라이브러리 파일이 이용 가능한 경우 및 이용 가능하게 전환된 경우 이를 포함한 것을 가리킴)는 본 라이선스 계약 조건에 따라 계약자에게 사용을 허여합니다. 본 라이선스 계약은 Preview 사용과 관련하여 계약자와 Google 간에 법적 구속력이 있는 계약을 체결합니다.
-
-1.2 "Android"는 기기를 위한 Android 소프트웨어 스택을 의미합니다. 이는 http://source.android.com/ URL에 위치하며 수시로 업데이트되는 Android 오픈 소스 프로젝트에서 제공됩니다.
-
-1.3 "Android 호환"은 (i) Android 호환성 웹사이트(http://source.android.com/compatibility)에서 찾을 수 있고 간혹 업데이트되는 Android 호환성 정의 문서를 준수하며; (ii) Android CTS(Compatibility Test Suite)를 성공적으로 통과한 모든 Android 구현을 의미합니다.
-
-1.4 "Google"은 미국 1600 Amphitheatre Parkway, Mountain View, CA 94043에 본사를 두고 있는 델라웨어주 법인인 Google Inc.를 의미합니다.
-
-2. 라이선스 계약에 동의
-
-2.1 이 Preview를 사용하려면, 먼저 라이선스 계약에 동의해야 합니다. 이 라이선스 계약에 동의하지 않고 Preview를 사용해서는 안 됩니다.
-
-2.2 수락을 클릭하거나 Preview를 사용, 또는 이 두 행위를 모두 수행하면 본 라이선스 계약 조건에 동의하는 것으로 간주됩니다.
-
-2.3 미국법 또는 현재 거주 중이거나 Preview를 사용하는 국가를 포함하여 다른 국가의 법에 따라 Preview를 받는 것이 금지된 경우, Preview를 사용할 수 없으며 본 라이선스 계약을 수락할 수 없습니다.
-
-2.4 회사 또는 단체 내에서 내부적으로 Preview를 사용하며 고용주 또는 기타 단체를 대신하여 본 라이선스 계약 준수에 동의하는 경우, 계약자의 고용주나 그 단체에 본 라이선스 계약에 대한 구속력을 부여할 수 있는 모든 법적 권한을 계약자가 갖고 있음을 진술하고 보증합니다. 구속력을 부여할 수 있는 법적 권한이 없을 경우, 고용주 또는 기타 단체를 대신하여 본 라이선스 계약에 동의하거나 Preview를 사용할 수 없습니다.
-
-3. Google의 Preview 라이선스
-
-3.1 본 라이선스 계약의 조건에 따라 Google은 계약자에게 한정적이며 전 세계적으로 무료로 사용이 가능하고 양도할 수 없고 비독점적이며 2차 라이선스를 불허하는 Preview 사용 라이선스를 부여합니다. 이 라이선스 하에서 계약자는 Android 플랫폼에서 실행되는 애플리케이션을 개발하는 경우에만 Preview를 사용할 수 있습니다.
-
-3.2 이 Preview를 사용하여 다른 플랫폼용 애플리케이션을 개발하거나(Android 비호환 구현 포함) 다른 SDK를 개발할 수 없습니다. 물론 이 Preview가 이러한 목적에 사용되지 않는 경우 Android의 비호환 구현을 포함한 다른 플랫폼용 애플리케이션을 자유롭게 개발할 수 있습니다.
-
-3.3 계약자는 Preview에 존재하는 지적 재산권을 포함하여 Preview에 대한 모든 법적인 권리, 소유권 및 이익이 Google 또는 제3자에게 있음에 동의합니다. "지적 재산권"은 모든 특허법, 저작권법, 영업비밀법, 상표법 하의 모든 권리 및 기타 모든 소유권을 의미합니다. Google은 계약자에게 명시적으로 부여하지 않은 모든 권리를 보유합니다.
-
-3.4 본 라이선스 계약에 명시적으로 허용된 용도 외에는 Preview를 사용할 수 없습니다. 해당 제3자 라이선스 요건이 허용하는 범위를 제외하고 계약자는 Preview의 파생 제품이나 Preview의 일부분을 (a) 복사(백업 목적 제외), 수정, 개작, 재배포, 역컴파일, 리버스 엔지니어링, 분해하거나 이를 통해 파생물을 생성하거나 (b) 개인 컴퓨터를 제외한 모바일 단말기 또는 기타 모든 하드웨어 기기에 Preview의 일부를 로드하거나, Preview의 일부를 다른 소프트웨어와 결합하거나 Preview의 일부가 통합된 일체의 소프트웨어나 기기를 배포해서는 안 됩니다.
-
-3.5 오픈 소스 소프트웨어 라이선스에 의거한 Preview 구성요소의 사용, 재생산, 배포에는 본 라이선스 계약이 아닌, 해당 오픈 소스 소프트웨어 라이선스의 조건이 적용됩니다. 계약자는 허용된 모든 권한 하에서 그러한 오픈 소스 소프트웨어 라이선스에 관해 충실한 피허가자로서의 자세를 견지할 것이며 그러한 권한을 종료, 일시 중단 또는 침해하는 행위를 삼갈 것을 동의합니다.
-
-3.6 계약자는 Google이 제공하는 Preview의 형태 및 특성이 사전 통지 없이 변경될 수 있음에 동의하며, 이전 버전의 Preview에서 개발된 애플리케이션이 이후 버전의 Preview와 호환되지 않을 수 있음에 동의합니다. 계약자는 계약자 또는 사용자에게 사전 통지 없이 Preview(또는 Preview에 포함된 기능) 제공을 (영구적 또는 일시적으로) 중단할 수 있는 권한이 Google에게 있음에 동의합니다.
-
-3.7 본 라이선스 계약은 계약자에게 Google의 상표명, 상표, 서비스 표시, 로고, 도메인 이름, 기타 독특한 브랜드 특징에 대한 사용 권한을 부여하지 않습니다.
-
-3.8 계약자는 Preview에 부착되어 있거나 포함되어 있는 모든 소유권 고지 사항(저작권 및 상표 고지 사항 포함)을 제거, 변경 또는 불분명하게 만들지 않을 것에 동의합니다.
-
-4. 계약자의 Preview 사용
-
-4.1 Google은 본 라이선스 계약의 어떤 조항도 계약자(또는 계약자의 사용 허가자)가 Preview를 사용하여 개발한 소프트웨어 애플리케이션에 대한 권리, 소유권 또는 이익, 그리고 해당 애플리케이션에 존재하는 모든 지적 재산권을 부여하지 않는다는 점에 동의합니다.
-
-4.2 계약자는 (a) 본 라이선스 계약 그리고 (b) 모든 준거법, 규정 또는 관련 관할권 내에서 일반적으로 수용되는 관행 또는 지침(미국 또는 기타 관련 국가로/에서의 데이터 또는 소프트웨어 수출과 관련된 모든 법률 포함)에서 허용하는 용도에 한하여 Preview를 사용하고 애플리케이션을 작성하는 것에 동의합니다.
-
-4.3 계약자는 일반 대중 사용자를 대상으로 Preview를 사용하여 애플리케이션을 개발하는 경우, 해당 사용자의 프라이버시 및 법적 권리를 보호하는 것에 동의합니다. 사용자가 계약자에게 사용자 이름, 비밀번호 또는 기타 로그인 정보나 개인 정보를 제공하는 경우, 계약자는 제공된 정보가 자신의 애플리케이션에 제공된다는 사실을 사용자에게 알려야 하며, 반드시 법적으로 적절한 개인정보 보호정책 고지 및 보호를 해당 사용자에게 제공해야 합니다. 애플리케이션에서 사용자가 제공한 개인 정보나 민감한 정보를 저장하는 경우, 이를 안전하게 처리해야 합니다. 사용자들이 애플리케이션에 Google 계정 정보를 제공하는 경우, 애플리케이션은 해당 사용자의 Google 계정에 액세스하는 목적으로만, 그리고 각 사용자가 허용한 범위 내의 한정된 목적으로만 이러한 정보를 사용해야 합니다.
-
-4.4 계약자는 Google 또는 기타 모든 타사의 서버, 네트워크 또는 기타 모든 재산 또는 서비스를 허가 없이 방해, 교란, 손상 또는 액세스하는 애플리케이션의 개발 또는 배포를 포함한 하등의 행위에 Preview를 이용하지 않을 것임을 동의합니다.
-
-4.5 계약자는 자신이 Android 및/또는 Android용 애플리케이션을 통해 생성, 전송 또는 표시하는 모든 데이터, 콘텐츠 또는 리소스 그리고 그로 인한 결과(Google이 입을 수 있는 모든 피해나 손실 포함)에 대해 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
-
-4.6 계약자는 본 라이선스 계약, 모든 해당 제3자 계약 또는 서비스 약관, 또는 모든 준거법 또는 규정에 의거한 계약자 의무 위반, 그리고 그로 인한 결과(Google 또는 제3자가 입을 수 있는 모든 피해나 손실 포함)에 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
-
-4.7 이 Preview는 현재 개발 단계에 있으며, 계약자의 테스트와 피드백은 그러한 개발 과정에 중요한 부분을 차지합니다. Preview를 사용함으로써 계약자는 일부 기능의 구현은 아직 개발 중인 상태이며 Preview가 안정된 릴리스처럼 완벽하게 기능할 것이라 믿고 사용해서는 안 된다는 점을 인지하는 것으로 간주합니다. 계약자는 이 Preview를 사용한 애플리케이션을 공개적으로 배포 또는 배송하지 않기로 동의합니다. 이 Preview는 공식 Android SDK가 출시된 이후에는 더 이상 지원되지 않기 때문입니다.
-
-5. 계약자의 개발자 자격 증명
-
-5.1 계약자는 Google이 발급했거나 자신이 선택한 모든 개발자 자격 증명에 대한 기밀성을 유지할 책임이 있으며 계약자의 개발자 자격 증명 하에 개발된 모든 애플리케이션에 대한 전적인 책임이 있음에 동의합니다.
-
-6. 개인정보 보호정책 및 정보
-
-6.1 Preview를 지속적으로 혁신하고 개선하기 위해, Google은 고유 식별자, 관련 IP 주소, 소프트웨어 버전 번호, Preview에서 사용 중인 도구 및/또는 서비스와 도구의 사용법에 대한 정보를 포함하되 이에 국한되지 않고 소프트웨어에서 특정 사용량 통계 정보를 수집할 수 있습니다. 그러한 정보를 수집하기 전에 Preview는 계약자에게 이를 통지하고 동의를 구할 것입니다. 계약자가 동의하지 않을 경우 정보를 수집하지 않습니다.
-
-6.2 수집된 데이터는 모두 취합된 형태로 Preview 개선을 위해 검토되며, Google의 개인정보 보호정책에 따라 유지 관리됩니다. 이 정보는 http://www.google.com/policies/privacy/를 참조하십시오.
-
-7. 제3자 애플리케이션
-
-7.1 제3자가 개발한 애플리케이션을 실행하거나 제3자가 제공한 데이터, 콘텐츠 또는 리소스에 액세스하기 위해 Preview를 사용하는 경우, 계약자는 Google이 그러한 애플리케이션, 데이터, 콘텐츠 또는 리소스에 대한 책임이 없음에 동의합니다. 계약자는 그러한 제3자 애플리케이션을 통해 자신이 액세스한 모든 데이터, 콘텐츠 또는 리소스에 대한 책임은 그것을 만든 사람에게 있음에 동의합니다. 또한 계약자가 그러한 모든 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스를 사용하거나 액세스함으로써 비롯된 모든 피해나 손실에 대한 책임이 Google에게 없음에 동의합니다.
-
-7.2 그러한 제3자 애플리케이션을 통해 계약자에게 제공된 데이터, 콘텐츠 그리고 리소스는 그것을 제공한 제공자(또는 제공자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 유의해야 합니다. 그러한 데이터, 콘텐츠 또는 리소스(전부 또는 일부)를 수정, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다. 단, 관련 소유자로부터 그러한 작업을 수행해도 좋다는 허락을 받은 경우에는 예외입니다.
-
-7.3 계약자는 그러한 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스의 사용은 계약자와 관련 제3자 간에 체결하는 별도의 계약 조건의 적용을 받는다는 것을 인정합니다.
-
-8. Google API 사용
-
-8.1 Google API
-
-8.1.1 Google에서 데이터를 검색하기 위해 API를 사용하는 경우, 그러한 데이터가 Google 또는 데이터를 제공하는 당사자(또는 당사자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 인정합니다. 그러한 API를 사용하는 경우, 추가적인 서비스 약관의 적용을 받을 수 있습니다. 관련 서비스 약관에 허용되지 않은 한, 그러한 데이터(전부 또는 일부)를 변경, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다.
-
-8.1.2 Google에서 사용자 데이터를 검색하기 위해 API를 사용하는 경우, 계약자는 사용자로부터 명시적인 동의를 얻은 경우에 한하여, 그리고 해당 사용자가 허용한 범위 내의 한정된 목적으로만 데이터를 검색해야 합니다.
-
-9. 라이선스 계약 종료
-
-9.1 본 라이선스 계약은 계약자 또는 Google에 의해 아래와 같은 조건 하에 종료될 때까지 계속 적용됩니다.
-
-9.2 계약자가 라이선스 계약을 종료하고자 하는 경우, Preview 및 관련 개발자 자격 증명 일체의 사용을 중단하는 것으로 그러한 의사를 피력할 수 있습니다.
-
-9.3 Google은 언제든 이유 여하를 불문하고 계약자에게 통고하여 라이선스 계약을 종료할 수 있습니다.
-
-9.4 본 라이선스 계약은 통보 또는 여타의 행위 없이도 자동으로 종료됩니다. 이에 해당되려면 다음과 같은 조건이 수반되어야 합니다.
-(A) Google이 계약자가 거주하는 국가 또는 계약자가 서비스를 사용하는 지역에서 Preview 또는 Preview의 특정 부분 제공을 중지하는 경우 및
-(B) Google이 Android SDK의 최종 릴리스 버전을 발행하는 경우.
-
-9.5 본 라이선스 계약이 종료되면 라이선스 계약으로 계약자에게 허용한 라이선스가 취소되며, 이에 따라 계약자는 Preview 사용을 즉시 모두 중단해야 하고 제 10, 11, 12 및 14절의 조항이 기한 없이 유지됩니다.
-
-10. 면책 조항
-
-10.1 계약자는 Preview 이용에 대한 위험 부담이 전적으로 본인에게 있으며, Google이 일체의 보증 없이 Preview를 "있는 그대로" 그리고 "이용 가능한" 상태로 제공한다는 것을 분명히 이해하고 동의합니다.
-
-10.2 Preview 이용 및 이용 과정에서 다운로드하거나 얻게 되는 모든 자료를 사용하는 것은 본인의 재량에 따르며 이에 대한 위험 부담이 전적으로 본인에게 있으며, 그러한 사용으로 인해 발생하는 컴퓨터 시스템 또는 다른 기기의 손상 또는 데이터 손실에 대한 책임은 전적으로 본인에게 있습니다. 전술한 조항을 제한하지 않는 범위 내에서 계약자는 미리 보기가 안정된 릴리스가 아니며 오류, 결함 및 보안 취약성이 포함되어 있을 수 있어 그 결과로 중대한 손상을 유발할 수 있다는 점을 이해하는 것으로 간주합니다. 여기에는 계약자의 컴퓨터 시스템 또는 기타 기기의 완전하고 돌이킬 수 없는 손실도 포함됩니다.
-
-10.3 더 나아가, Google은 상품성, 특정 목적에 대한 적합성 및 비침해의 묵시적 보증 등을 포함하되 이에 국한되지 않고 명시적이든 묵시적이든 모든 종류의 보증 및 조건을 명시적으로 부인합니다.
-
-11. 책임 한계
-
-11.1 계약자는 계약자에게 발생할 수 있는 직접, 간접, 부수적, 특별, 결과적 또는 징벌적 손해에 대해 그 어떤 책임 이론에 근거해서도 Google, 해당 자회사, 계열사 및 사용 허가자가 어떠한 책임도 지지 아니함을 분명히 이해하고 동의합니다. 이러한 손해에는 Google 또는 해당 대리자가 이러한 손실 발생 가능성에 대해 통지를 받았거나 이러한 사항을 인식했는지에 상관없이 모든 데이터 손실이 포함됩니다.
-
-12. 면책
-
-12.1 법률에 의해 허용되는 최대한의 범위 안에서 계약자는 (a) 미리 보기 사용, (b) 계약자가 미리 보기에서 개발한 일체의 애플리케이션에서 초래된 모든 사람의 저작권, 상표, 영업비밀, 트레이드 드레스, 특허 또는 기타 지적 재산권의 침해, 또는 어떤 사람의 명예를 훼손하거나 초상권 또는 개인정보 보호정책을 침해함 또는 (C)계약자 본인이 본 라이선스 계약을 위반함으로써 발생하거나 생기는 모든 청구, 조치, 소송 또는 절차, 그리고 모든 손실, 책임, 손해, 경비(합리적인 변호사 비용 포함)로부터 Google을 옹호하고, 면책시키고, Google이 손해를 입지 않도록 하는 데 동의합니다.
-
-13. 라이선스 계약 변경
-
-13.1 미리 보기의 새로운 버전을 배포할 때, Google은 본 라이선스 계약의 내용을 변경할 수 있습니다. 그러한 변경이 이뤄진 경우, Google은 미리 보기가 제공되는 웹사이트에 새로운 라이선스 계약 버전을 게재할 것입니다.
-
-14. 일반 법적 조건
-
-14.1 본 라이선스 계약은 계약자와 Google 간의 모든 법적 계약을 구성하며, 계약자의 미리 보기 사용을 규제하고(별도의 서면 계약을 통해 Google이 계약자에게 제공하는 모든 서비스는 제외), 미리 보기와 관련하여 이전에 계약자와 Google이 맺은 모든 계약을 완전히 대체합니다.
-
-14.2 계약자는 Google이 라이선스 계약에 포함된(또는 관련 법률에 의해 Google이 향유하는) 법적 권리 또는 구제수단을 행사하거나 집행하지 않더라도, Google이 권리를 공식적으로 포기한 것으로 간주하지 않으며, Google이 계속해서 그러한 권리 또는 구제수단을 이용할 수 있음에 동의합니다.
-
-14.3 본 라이선스 계약의 조항이 무효라고 이 사안에 관한 판결을 할 수 있는 관할권을 가진 법원이 판결할 경우, 그 조항은 라이선스 계약의 나머지 조항에 영향을 미치지 않는 형태로 라이선스 계약에서 제거됩니다. 본 라이선스 계약의 나머지 조항은 여전히 유효하며 집행 가능합니다.
-
-14.4 계약자는 Google이 모회사가 되는 회사 그룹에 속한 각 회사가 본 라이선스 계약의 제3수익자이며, 그러한 다른 회사들이 그들에게 이익(또는 유리한 권리)을 부여하는 본 라이선스 계약의 모든 조항을 직접 행사하고 적용할 수 있는 권리를 가진다는 데 동의합니다. 그 외에는 다른 어떤 개인이나 회사도 본 라이선스 계약의 제3수익자가 될 수 없습니다.
-
-14.5 수출 규제. Preview는 미국의 수출법과 규정의 적용을 받습니다. 계약자는 Preview에 적용되는 모든 국내 및 국제 수출법과 규정을 준수해야 합니다. 그러한 법에는 수출 대상국, 최종 사용자 및 최종 용도에 대한 제한이 포함됩니다.
-
-14.6 계약자 또는 Google은 상대 당사자의 사전 서면 승인 없이 본 라이선스 계약에서 부여된 권리를 제3자에게 양도하거나 이전할 수 없으며, 그러한 승인 없이 이루어진 양도 시도는 모두 무효입니다. 계약자는 Google의 사전 승인 없이 본 라이선스 계약 상의 책임 또는 의무를 위임할 수 없습니다.
-
-14.7 본 라이선스 계약, 그리고 본 라이선스 계약 상의 계약자와 Google의 관계는 법률 조항 간의 충돌과는 무관하게 캘리포니아주법에 의한 규제를 받습니다. 계약자와 Google은 본 라이선스 계약으로부터 발생하는 모든 법적 문제 해결을 캘리포니아주 산타 클라라(Santa Clara) 카운티 내에 소재한 전속 관할 법원에 의뢰하는 것에 동의합니다. 위 규정에도 불구하고, 계약자는 Google이 여전히 모든 관할권에서 강제 구제책(또는 동등한 유형의 긴급 법적 구제)을 신청할 수 있음에 동의합니다.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">본인은 상기 사용 약관을 읽었으며 이에 동의합니다.</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- 이 페이지에서는 OTA 기기 이미지의 링크를 제공하며, OTA 업데이트를 기기에
-수동으로 적용하는 방법에 대해 설명합니다. 이 절차는 Android 베타 프로그램을
-통해 OTA 업데이트를 받았는데 업데이트가 설치된 후 시작되지
-않는 기기를 복구하는 데 유용할 수 있습니다.
-</p>
-
-<h2 id="install-ota">OTA 이미지 설치</h2>
-
-<p></p>
-
-<p>OTA 패키지를 기기에 설치하려면:</p>
-
-<ol>
- <li>아래 표에서 OTA 기기 이미지를 다운로드합니다.</li>
- <li>기기를 복구 모드로 재부팅합니다. Nexus 기기를 이 모드로
-전환하는 방법에 대한 자세한 내용은
-<a href="https://support.google.com/nexus/answer/4596836">Nexus 기기를
-공장 설정으로 초기화</a>를 참조하세요.
- </li>
- <li>기기에서 <strong>ADB sideload</strong>를 선택합니다.</li>
- <li>Android 개발 환경이 로드되고 Android 디버그 브리지(adb) 도구가 설치된
-컴퓨터에 기기를 연결합니다.</li>
- <li>다음 명령을 실행합니다.
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">기기 OTA 이미지</h2>
-
-<table>
- <tr>
- <th scope="col">기기</th>
- <th scope="col">다운로드/체크섬</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-ota-npd35k-b8cfbd80.zip</a><br>
- MD5: 15fe2eba9b01737374196bdf0a792fe9<br>
- SHA-1: 5014b2bba77f9e1a680ac3f90729621c85a14283
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-ota-npd35k-078e6fa5.zip</a><br>
- MD5: e8b12f7721c53af9a450f7058928a5fc<br>
- SHA-1: b7a9b756f84a1d2e482ff9c16749d65f6e51425a
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-ota-npd35k-88457699.zip</a><br>
- MD5: 3fac09fef759dde26e57cb80b20b6477<br>
- SHA-1: 27d6caa786577d8a38b2da5bf94b33b4524a1a1c
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-ota-npd35k-51dbae76.zip</a><br>
- MD5: 58312c4a5971818ef5c77a3f446003da<br>
- SHA-1: aad9005be33d3e2bab480509a6ab74c3c3b9d921
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-ota-npd35k-834f047f.zip</a><br>
- MD5: 92b7d1fa252f7394e70f957c72d4aac8<br>
- SHA-1: b6c057c84d90893630e303cbb60530e20ddb8361
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-ota-npd35k-6ac91298.zip</a><br>
- MD5: 1461622ad53ea842b2722fa7b49b8172<br>
- SHA-1: 409c061668ab270774877d7f3eae44fa48d2b931
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-ota-npd35k-a0b2347f.zip</a><br>
- MD5: c60117f3640cc6db12386fd632289c7d<br>
- SHA-1: 87349c767c69efb4172c90ce1d88cf578c3d28b3
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G(Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-ota-npd35k-09897a1d.zip</a><br>
- MD5: a55cf94f7cce0393ec6c0b35041766b7<br>
- SHA-1: 6f33742290eb46f2561891f38ca2e754b4e50c6a
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/ko/preview/download.jd b/docs/html-intl/intl/ko/preview/download.jd
deleted file mode 100644
index 802420b..0000000
--- a/docs/html-intl/intl/ko/preview/download.jd
+++ /dev/null
@@ -1,543 +0,0 @@
-page.title=기기에서 테스트
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Android Preview SDK의 구성 요소를
-다운로드하고 설치하기 전에 우선 다음과 같은
-사용 약관에 동의해야 합니다.</p>
-
- <h2 class="norule">사용 약관</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-이것은 Android SDK Preview 라이선스 계약서입니다(이하 "라이선스 계약").
-
-1. 개요
-
-1.1 Android SDK Preview(본 라이선스 계약에서는 "Preview"라고 칭하며, 구체적으로 Android 시스템 파일, 패키지 API 및 Preview 라이브러리 파일이 이용 가능한 경우 및 이용 가능하게 전환된 경우 이를 포함한 것을 가리킴)는 본 라이선스 계약 조건에 따라 계약자에게 사용을 허여합니다. 본 라이선스 계약은 Preview 사용과 관련하여 계약자와 Google 간에 법적 구속력이 있는 계약을 체결합니다.
-
-1.2 "Android"는 기기를 위한 Android 소프트웨어 스택을 의미합니다. 이는 http://source.android.com/ URL에 위치하며 수시로 업데이트되는 Android 오픈 소스 프로젝트에서 제공됩니다.
-
-1.3 "Android 호환"은 (i) Android 호환성 웹사이트(http://source.android.com/compatibility)에서 찾을 수 있고 간혹 업데이트되는 Android 호환성 정의 문서를 준수하며; (ii) Android CTS(Compatibility Test Suite)를 성공적으로 통과한 모든 Android 구현을 의미합니다.
-
-1.4 "Google"은 미국 1600 Amphitheatre Parkway, Mountain View, CA 94043에 본사를 두고 있는 델라웨어주 법인인 Google Inc.를 의미합니다.
-
-2. 라이선스 계약에 동의
-
-2.1 이 Preview를 사용하려면, 먼저 라이선스 계약에 동의해야 합니다. 이 라이선스 계약에 동의하지 않고 Preview를 사용해서는 안 됩니다.
-
-2.2 수락을 클릭하거나 Preview를 사용, 또는 이 두 행위를 모두 수행하면 본 라이선스 계약 조건에 동의하는 것으로 간주됩니다.
-
-2.3 미국법 또는 현재 거주 중이거나 Preview를 사용하는 국가를 포함하여 다른 국가의 법에 따라 Preview를 받는 것이 금지된 경우, Preview를 사용할 수 없으며 본 라이선스 계약을 수락할 수 없습니다.
-
-2.4 회사 또는 단체 내에서 내부적으로 Preview를 사용하며 고용주 또는 기타 단체를 대신하여 본 라이선스 계약 준수에 동의하는 경우, 계약자의 고용주나 그 단체에 본 라이선스 계약에 대한 구속력을 부여할 수 있는 모든 법적 권한을 계약자가 갖고 있음을 진술하고 보증합니다. 구속력을 부여할 수 있는 법적 권한이 없을 경우, 고용주 또는 기타 단체를 대신하여 본 라이선스 계약에 동의하거나 Preview를 사용할 수 없습니다.
-
-3. Google의 Preview 라이선스
-
-3.1 본 라이선스 계약의 조건에 따라 Google은 계약자에게 한정적이며 전 세계적으로 무료로 사용이 가능하고 양도할 수 없고 비독점적이며 2차 라이선스를 불허하는 Preview 사용 라이선스를 부여합니다. 이 라이선스 하에서 계약자는 Android 플랫폼에서 실행되는 애플리케이션을 개발하는 경우에만 Preview를 사용할 수 있습니다.
-
-3.2 이 Preview를 사용하여 다른 플랫폼용 애플리케이션을 개발하거나(Android 비호환 구현 포함) 다른 SDK를 개발할 수 없습니다. 물론 이 Preview가 이러한 목적에 사용되지 않는 경우 Android의 비호환 구현을 포함한 다른 플랫폼용 애플리케이션을 자유롭게 개발할 수 있습니다.
-
-3.3 계약자는 Preview에 존재하는 지적 재산권을 포함하여 Preview에 대한 모든 법적인 권리, 소유권 및 이익이 Google 또는 제3자에게 있음에 동의합니다. "지적 재산권"은 모든 특허법, 저작권법, 영업비밀법, 상표법 하의 모든 권리 및 기타 모든 소유권을 의미합니다. Google은 계약자에게 명시적으로 부여하지 않은 모든 권리를 보유합니다.
-
-3.4 본 라이선스 계약에 명시적으로 허용된 용도 외에는 Preview를 사용할 수 없습니다. 해당 제3자 라이선스 요건이 허용하는 범위를 제외하고 계약자는 Preview의 파생 제품이나 Preview의 일부분을 (a) 복사(백업 목적 제외), 수정, 개작, 재배포, 역컴파일, 리버스 엔지니어링, 분해하거나 이를 통해 파생물을 생성하거나 (b) 개인 컴퓨터를 제외한 모바일 단말기 또는 기타 모든 하드웨어 기기에 Preview의 일부를 로드하거나, Preview의 일부를 다른 소프트웨어와 결합하거나 Preview의 일부가 통합된 일체의 소프트웨어나 기기를 배포해서는 안 됩니다.
-
-3.5 오픈 소스 소프트웨어 라이선스에 의거한 Preview 구성요소의 사용, 재생산, 배포에는 본 라이선스 계약이 아닌, 해당 오픈 소스 소프트웨어 라이선스의 조건이 적용됩니다. 계약자는 허용된 모든 권한 하에서 그러한 오픈 소스 소프트웨어 라이선스에 관해 충실한 피허가자로서의 자세를 견지할 것이며 그러한 권한을 종료, 일시 중단 또는 침해하는 행위를 삼갈 것을 동의합니다.
-
-3.6 계약자는 Google이 제공하는 Preview의 형태 및 특성이 사전 통지 없이 변경될 수 있음에 동의하며, 이전 버전의 Preview에서 개발된 애플리케이션이 이후 버전의 Preview와 호환되지 않을 수 있음에 동의합니다. 계약자는 계약자 또는 사용자에게 사전 통지 없이 Preview(또는 Preview에 포함된 기능) 제공을 (영구적 또는 일시적으로) 중단할 수 있는 권한이 Google에게 있음에 동의합니다.
-
-3.7 본 라이선스 계약은 계약자에게 Google의 상표명, 상표, 서비스 표시, 로고, 도메인 이름, 기타 독특한 브랜드 특징에 대한 사용 권한을 부여하지 않습니다.
-
-3.8 계약자는 Preview에 부착되어 있거나 포함되어 있는 모든 소유권 고지 사항(저작권 및 상표 고지 사항 포함)을 제거, 변경 또는 불분명하게 만들지 않을 것에 동의합니다.
-
-4. 계약자의 Preview 사용
-
-4.1 Google은 본 라이선스 계약의 어떤 조항도 계약자(또는 계약자의 사용 허가자)가 Preview를 사용하여 개발한 소프트웨어 애플리케이션에 대한 권리, 소유권 또는 이익, 그리고 해당 애플리케이션에 존재하는 모든 지적 재산권을 부여하지 않는다는 점에 동의합니다.
-
-4.2 계약자는 (a) 본 라이선스 계약 그리고 (b) 모든 준거법, 규정 또는 관련 관할권 내에서 일반적으로 수용되는 관행 또는 지침(미국 또는 기타 관련 국가로/에서의 데이터 또는 소프트웨어 수출과 관련된 모든 법률 포함)에서 허용하는 용도에 한하여 Preview를 사용하고 애플리케이션을 작성하는 것에 동의합니다.
-
-4.3 계약자는 일반 대중 사용자를 대상으로 Preview를 사용하여 애플리케이션을 개발하는 경우, 해당 사용자의 프라이버시 및 법적 권리를 보호하는 것에 동의합니다. 사용자가 계약자에게 사용자 이름, 비밀번호 또는 기타 로그인 정보나 개인 정보를 제공하는 경우, 계약자는 제공된 정보가 자신의 애플리케이션에 제공된다는 사실을 사용자에게 알려야 하며, 반드시 법적으로 적절한 개인정보 보호정책 고지 및 보호를 해당 사용자에게 제공해야 합니다. 애플리케이션에서 사용자가 제공한 개인 정보나 민감한 정보를 저장하는 경우, 이를 안전하게 처리해야 합니다. 사용자들이 애플리케이션에 Google 계정 정보를 제공하는 경우, 애플리케이션은 해당 사용자의 Google 계정에 액세스하는 목적으로만, 그리고 각 사용자가 허용한 범위 내의 한정된 목적으로만 이러한 정보를 사용해야 합니다.
-
-4.4 계약자는 Google 또는 기타 모든 타사의 서버, 네트워크 또는 기타 모든 재산 또는 서비스를 허가 없이 방해, 교란, 손상 또는 액세스하는 애플리케이션의 개발 또는 배포를 포함한 하등의 행위에 Preview를 이용하지 않을 것임을 동의합니다.
-
-4.5 계약자는 자신이 Android 및/또는 Android용 애플리케이션을 통해 생성, 전송 또는 표시하는 모든 데이터, 콘텐츠 또는 리소스 그리고 그로 인한 결과(Google이 입을 수 있는 모든 피해나 손실 포함)에 대해 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
-
-4.6 계약자는 본 라이선스 계약, 모든 해당 제3자 계약 또는 서비스 약관, 또는 모든 준거법 또는 규정에 의거한 계약자 의무 위반, 그리고 그로 인한 결과(Google 또는 제3자가 입을 수 있는 모든 피해나 손실 포함)에 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
-
-4.7 이 Preview는 현재 개발 단계에 있으며, 계약자의 테스트와 피드백은 그러한 개발 과정에 중요한 부분을 차지합니다. Preview를 사용함으로써 계약자는 일부 기능의 구현은 아직 개발 중인 상태이며 Preview가 안정된 릴리스처럼 완벽하게 기능할 것이라 믿고 사용해서는 안 된다는 점을 인지하는 것으로 간주합니다. 계약자는 이 Preview를 사용한 애플리케이션을 공개적으로 배포 또는 배송하지 않기로 동의합니다. 이 Preview는 공식 Android SDK가 출시된 이후에는 더 이상 지원되지 않기 때문입니다.
-
-5. 계약자의 개발자 자격 증명
-
-5.1 계약자는 Google이 발급했거나 자신이 선택한 모든 개발자 자격 증명에 대한 기밀성을 유지할 책임이 있으며 계약자의 개발자 자격 증명 하에 개발된 모든 애플리케이션에 대한 전적인 책임이 있음에 동의합니다.
-
-6. 개인정보 보호정책 및 정보
-
-6.1 Preview를 지속적으로 혁신하고 개선하기 위해, Google은 고유 식별자, 관련 IP 주소, 소프트웨어 버전 번호, Preview에서 사용 중인 도구 및/또는 서비스와 도구의 사용법에 대한 정보를 포함하되 이에 국한되지 않고 소프트웨어에서 특정 사용량 통계 정보를 수집할 수 있습니다. 그러한 정보를 수집하기 전에 Preview는 계약자에게 이를 통지하고 동의를 구할 것입니다. 계약자가 동의하지 않을 경우 정보를 수집하지 않습니다.
-
-6.2 수집된 데이터는 모두 취합된 형태로 Preview 개선을 위해 검토되며, Google의 개인정보 보호정책에 따라 유지 관리됩니다. 이 정보는 http://www.google.com/policies/privacy/를 참조하십시오.
-
-7. 제3자 애플리케이션
-
-7.1 제3자가 개발한 애플리케이션을 실행하거나 제3자가 제공한 데이터, 콘텐츠 또는 리소스에 액세스하기 위해 Preview를 사용하는 경우, 계약자는 Google이 그러한 애플리케이션, 데이터, 콘텐츠 또는 리소스에 대한 책임이 없음에 동의합니다. 계약자는 그러한 제3자 애플리케이션을 통해 자신이 액세스한 모든 데이터, 콘텐츠 또는 리소스에 대한 책임은 그것을 만든 사람에게 있음에 동의합니다. 또한 계약자가 그러한 모든 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스를 사용하거나 액세스함으로써 비롯된 모든 피해나 손실에 대한 책임이 Google에게 없음에 동의합니다.
-
-7.2 그러한 제3자 애플리케이션을 통해 계약자에게 제공된 데이터, 콘텐츠 그리고 리소스는 그것을 제공한 제공자(또는 제공자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 유의해야 합니다. 그러한 데이터, 콘텐츠 또는 리소스(전부 또는 일부)를 수정, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다. 단, 관련 소유자로부터 그러한 작업을 수행해도 좋다는 허락을 받은 경우에는 예외입니다.
-
-7.3 계약자는 그러한 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스의 사용은 계약자와 관련 제3자 간에 체결하는 별도의 계약 조건의 적용을 받는다는 것을 인정합니다.
-
-8. Google API 사용
-
-8.1 Google API
-
-8.1.1 Google에서 데이터를 검색하기 위해 API를 사용하는 경우, 그러한 데이터가 Google 또는 데이터를 제공하는 당사자(또는 당사자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 인정합니다. 그러한 API를 사용하는 경우, 추가적인 서비스 약관의 적용을 받을 수 있습니다. 관련 서비스 약관에 허용되지 않은 한, 그러한 데이터(전부 또는 일부)를 변경, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다.
-
-8.1.2 Google에서 사용자 데이터를 검색하기 위해 API를 사용하는 경우, 계약자는 사용자로부터 명시적인 동의를 얻은 경우에 한하여, 그리고 해당 사용자가 허용한 범위 내의 한정된 목적으로만 데이터를 검색해야 합니다.
-
-9. 라이선스 계약 종료
-
-9.1 본 라이선스 계약은 계약자 또는 Google에 의해 아래와 같은 조건 하에 종료될 때까지 계속 적용됩니다.
-
-9.2 계약자가 라이선스 계약을 종료하고자 하는 경우, Preview 및 관련 개발자 자격 증명 일체의 사용을 중단하는 것으로 그러한 의사를 피력할 수 있습니다.
-
-9.3 Google은 언제든 이유 여하를 불문하고 계약자에게 통고하여 라이선스 계약을 종료할 수 있습니다.
-
-9.4 본 라이선스 계약은 통보 또는 여타의 행위 없이도 자동으로 종료됩니다. 이에 해당되려면 다음과 같은 조건이 수반되어야 합니다.
-(A) Google이 계약자가 거주하는 국가 또는 계약자가 서비스를 사용하는 지역에서 Preview 또는 Preview의 특정 부분 제공을 중지하는 경우 및
-(B) Google이 Android SDK의 최종 릴리스 버전을 발행하는 경우.
-
-9.5 본 라이선스 계약이 종료되면 라이선스 계약으로 계약자에게 허용한 라이선스가 취소되며, 이에 따라 계약자는 Preview 사용을 즉시 모두 중단해야 하고 제 10, 11, 12 및 14절의 조항이 기한 없이 유지됩니다.
-
-10. 면책 조항
-
-10.1 계약자는 Preview 이용에 대한 위험 부담이 전적으로 본인에게 있으며, Google이 일체의 보증 없이 Preview를 "있는 그대로" 그리고 "이용 가능한" 상태로 제공한다는 것을 분명히 이해하고 동의합니다.
-
-10.2 Preview 이용 및 이용 과정에서 다운로드하거나 얻게 되는 모든 자료를 사용하는 것은 본인의 재량에 따르며 이에 대한 위험 부담이 전적으로 본인에게 있으며, 그러한 사용으로 인해 발생하는 컴퓨터 시스템 또는 다른 기기의 손상 또는 데이터 손실에 대한 책임은 전적으로 본인에게 있습니다. 전술한 조항을 제한하지 않는 범위 내에서 계약자는 미리 보기가 안정된 릴리스가 아니며 오류, 결함 및 보안 취약성이 포함되어 있을 수 있어 그 결과로 중대한 손상을 유발할 수 있다는 점을 이해하는 것으로 간주합니다. 여기에는 계약자의 컴퓨터 시스템 또는 기타 기기의 완전하고 돌이킬 수 없는 손실도 포함됩니다.
-
-10.3 더 나아가, Google은 상품성, 특정 목적에 대한 적합성 및 비침해의 묵시적 보증 등을 포함하되 이에 국한되지 않고 명시적이든 묵시적이든 모든 종류의 보증 및 조건을 명시적으로 부인합니다.
-
-11. 책임 한계
-
-11.1 계약자는 계약자에게 발생할 수 있는 직접, 간접, 부수적, 특별, 결과적 또는 징벌적 손해에 대해 그 어떤 책임 이론에 근거해서도 Google, 해당 자회사, 계열사 및 사용 허가자가 어떠한 책임도 지지 아니함을 분명히 이해하고 동의합니다. 이러한 손해에는 Google 또는 해당 대리자가 이러한 손실 발생 가능성에 대해 통지를 받았거나 이러한 사항을 인식했는지에 상관없이 모든 데이터 손실이 포함됩니다.
-
-12. 면책
-
-12.1 법률에 의해 허용되는 최대한의 범위 안에서 계약자는 (a) 미리 보기 사용, (b) 계약자가 미리 보기에서 개발한 일체의 애플리케이션에서 초래된 모든 사람의 저작권, 상표, 영업비밀, 트레이드 드레스, 특허 또는 기타 지적 재산권의 침해, 또는 어떤 사람의 명예를 훼손하거나 초상권 또는 개인정보 보호정책을 침해함 또는 (C)계약자 본인이 본 라이선스 계약을 위반함으로써 발생하거나 생기는 모든 청구, 조치, 소송 또는 절차, 그리고 모든 손실, 책임, 손해, 경비(합리적인 변호사 비용 포함)로부터 Google을 옹호하고, 면책시키고, Google이 손해를 입지 않도록 하는 데 동의합니다.
-
-13. 라이선스 계약 변경
-
-13.1 미리 보기의 새로운 버전을 배포할 때, Google은 본 라이선스 계약의 내용을 변경할 수 있습니다. 그러한 변경이 이뤄진 경우, Google은 미리 보기가 제공되는 웹사이트에 새로운 라이선스 계약 버전을 게재할 것입니다.
-
-14. 일반 법적 조건
-
-14.1 본 라이선스 계약은 계약자와 Google 간의 모든 법적 계약을 구성하며, 계약자의 미리 보기 사용을 규제하고(별도의 서면 계약을 통해 Google이 계약자에게 제공하는 모든 서비스는 제외), 미리 보기와 관련하여 이전에 계약자와 Google이 맺은 모든 계약을 완전히 대체합니다.
-
-14.2 계약자는 Google이 라이선스 계약에 포함된(또는 관련 법률에 의해 Google이 향유하는) 법적 권리 또는 구제수단을 행사하거나 집행하지 않더라도, Google이 권리를 공식적으로 포기한 것으로 간주하지 않으며, Google이 계속해서 그러한 권리 또는 구제수단을 이용할 수 있음에 동의합니다.
-
-14.3 본 라이선스 계약의 조항이 무효라고 이 사안에 관한 판결을 할 수 있는 관할권을 가진 법원이 판결할 경우, 그 조항은 라이선스 계약의 나머지 조항에 영향을 미치지 않는 형태로 라이선스 계약에서 제거됩니다. 본 라이선스 계약의 나머지 조항은 여전히 유효하며 집행 가능합니다.
-
-14.4 계약자는 Google이 모회사가 되는 회사 그룹에 속한 각 회사가 본 라이선스 계약의 제3수익자이며, 그러한 다른 회사들이 그들에게 이익(또는 유리한 권리)을 부여하는 본 라이선스 계약의 모든 조항을 직접 행사하고 적용할 수 있는 권리를 가진다는 데 동의합니다. 그 외에는 다른 어떤 개인이나 회사도 본 라이선스 계약의 제3수익자가 될 수 없습니다.
-
-14.5 수출 규제. Preview는 미국의 수출법과 규정의 적용을 받습니다. 계약자는 Preview에 적용되는 모든 국내 및 국제 수출법과 규정을 준수해야 합니다. 그러한 법에는 수출 대상국, 최종 사용자 및 최종 용도에 대한 제한이 포함됩니다.
-
-14.6 계약자 또는 Google은 상대 당사자의 사전 서면 승인 없이 본 라이선스 계약에서 부여된 권리를 제3자에게 양도하거나 이전할 수 없으며, 그러한 승인 없이 이루어진 양도 시도는 모두 무효입니다. 계약자는 Google의 사전 승인 없이 본 라이선스 계약 상의 책임 또는 의무를 위임할 수 없습니다.
-
-14.7 본 라이선스 계약, 그리고 본 라이선스 계약 상의 계약자와 Google의 관계는 법률 조항 간의 충돌과는 무관하게 캘리포니아주법에 의한 규제를 받습니다. 계약자와 Google은 본 라이선스 계약으로부터 발생하는 모든 법적 문제 해결을 캘리포니아주 산타 클라라(Santa Clara) 카운티 내에 소재한 전속 관할 법원에 의뢰하는 것에 동의합니다. 위 규정에도 불구하고, 계약자는 Google이 여전히 모든 관할권에서 강제 구제책(또는 동등한 유형의 긴급 법적 구제)을 신청할 수 있음에 동의합니다.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">본인은 상기 사용 약관을 읽었으며 이에 동의합니다.</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#device-preview">하드웨어 기기 설정</a>
- <ol>
- <li><a href="#ota">OTA 업데이트</a></li>
- <li><a href="#flash">수동 기기 플래시</a></li>
- <li><a href="#revertDevice">제거</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">에뮬레이터 설정</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- 새로운 플랫폼에서 앱을 실행하고 테스트하려면 Android N
-런타임 환경을 설정해야 합니다. 다음 두 가지 방법 중 하나를 사용할 수 있습니다.
-</p>
-
-<ul>
- <li>지원되는 하드웨어 기기에서 Android N 설치</li>
- <li>Android N이 실행되는 Android 에뮬레이터 설정</li>
-</ul>
-
-<p>
- 새로운 플랫폼에서 앱에 대한 기본적인 호환성 테스트를 수행할 환경이 필요한 경우,
-최신 APK와 하드웨어 기기 또는
-에뮬레이터만 있으면 됩니다. 기본 테스트를 위해 전체 개발 환경을
-업데이트할 필요가 없습니다.
-</p>
-
-<p>
- Android N을 대상으로 하도록 앱을 수정하거나 새로운 Android N API를 사용하고 싶다면,
-Android N을 지원하도록
-업데이트된 개발 환경을 설정해야 합니다. 자세한 내용은 <a href="{@docRoot}preview/setup-sdk.html">Android N용 개발
-설정</a>을 참조하세요.
-</p>
-
-
-<h2 id="device-preview">하드웨어 기기 설정</h2>
-
-<p>
- N Developer Preview는 전화에서 태블릿, TV에 이르기까지 앱을 테스트하는 데 사용할 수 있는
-다양한 하드웨어 기기의 시스템 업데이트를 제공합니다.
-</p>
-
-<p>
- 지원되는 기기에 액세스할 수 있다면, 다음 방법 중 하나를 사용하여 Developer Preview 마일스톤 빌드로
-업데이트할 수 있습니다.
-</p>
-
-<ul>
- <li><a href="https://g.co/androidbeta">Android 베타 프로그램</a>을 통해
-<strong>자동 OTA 시스템 업데이트에 기기를 등록합니다</strong>. 기기를 등록하면 N Developer Preview에서
-모든 마일스톤 빌드에 대해 정기적으로 OTA 업데이트를 받을 수 있습니다. 다양한 N Developer Preview 릴리스를 통해 현재
-환경을 매끄럽게 전환할 수 있으므로
-이 방법을 권장합니다.</li>
- <li><strong>Developer Preview 시스템 이미지를 다운로드하고 기기를 플래시합니다</strong>.
- 수동으로 플래시하는 기기에는 OTA 업데이트가 자동으로 제공되지 않지만,
-Android 베타 프로그램에 기기를 등록하면 OTA 업데이트를 받을 수 있습니다. </li>
-</ul>
-
-<h3 id="ota">자동 OTA 업데이트에 기기 등록</h3>
-
-<p>
- 지원되는 기기에 액세스할 수 있다면(아래 다운로드 표
-참조),
-해당 기기를 <a href="https://g.co/androidbeta">Android 베타 프로그램</a>에 등록해서 Android 프리뷰 버전에 대해 OTA 업데이트를 받을 수 있습니다. 이 업데이트는
-자동으로 다운로드되고 공식 시스템 업데이트처럼
-기기를 업데이트합니다.
-</p>
-
-<p>
- 언제든 기기의 등록을 해제할 수 있습니다. 기기는
-해당 기기에 사용 가능한 가장 최신의 Android 프로덕션 버전에 대한 OTA 업데이트를 받게 됩니다(예: Android 6.0 Marshmallow).
- 업데이트 시 기기가 완전히 초기화되므로
-기기의 사용자 데이터는 삭제됩니다. 따라서 기기 등록을 해제하기 전에 반드시 <strong>중요한
-데이터를 백업</strong>해야 합니다.
-</p>
-
-<p>
- 자세한 정보를 확인하고 기기를 등록하려면
-<a href="https://g.co/androidbeta">Android 베타 프로그램</a> 웹사이트를 참조하세요.
-</p>
-
-<p class="note"><strong>참고:</strong>
- 등록을 해제하면 기기가 완전히 초기화됩니다. 중요한 데이터를
-먼저 백업하세요.
-</p>
-
-<h3 id="flash">수동 기기 플래시</h3>
-
-<p>
- 언제든 최신 Developer Preview 시스템 이미지를 다운로드하고
-기기에 수동으로 플래시할 수 있습니다. 아래 표를 참조하여 기기 테스트용 시스템 이미지를
-다운로드하세요. 기기 수동 플래시는
-테스트 환경을 정확히 제어해야 하거나 자동 테스트 등을 위해 자주 재설치해야 하는 경우
-유용합니다.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- 기기에 시스템 이미지를 설치하면 <strong>기기에서 모든 데이터가
-삭제</strong>되므로 데이터를 먼저 백업하는 것이 좋습니다.
-</p>
-
-<p>
- 기기 데이터를 백업하고 아래에서 기기에 맞는 시스템 이미지를 다운로드한 뒤,
-<a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>의
-지침에 따라 기기에 이미지를 플래시합니다.
-</p>
-
-<p>
- 수동으로 플래시한 시스템 이미지는 최신
-Developer Preview 마일스톤 빌드에 대한 <strong>OTA 업데이트를 자동으로
-수신하지는 않습니다</strong>. 각 Developer Preview 마일스톤에서 환경을 최신으로 유지하고 새 시스템 이미지를
-플래시하세요.
-</p>
-
-<p>
- 기기를 수동으로 플래시한 후 OTA 업데이트를 받으시려면
-<a href="https://g.co/androidbeta">Android
-베타 프로그램</a>에 기기를 등록하기만 하면 됩니다. 언제든 기기를 등록하고 다음 Preview
-업데이트를 무선으로 받을 수 있습니다.
-</p>
-
-<table>
- <tr>
- <th scope="col">기기</th>
- <th scope="col">다운로드/체크섬</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npd35k-factory-5ba40535.tgz</a><br>
- MD5: b6c5d79a21815ee21db41822dcf61e9f<br>
- SHA-1: 5ba4053577007d15c96472206e3a79bc80ab194c
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npd35k-factory-a33bf20c.tgz</a><br>
- MD5: e1cf9c57cfb11bebe7f1f5bfbf05d7ab<br>
- SHA-1: a33bf20c719206bcf08d1edd8da6c0ff9d50f69c
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npd35k-factory-81c341d5.tgz</a><br>
- MD5: e93de7949433339856124c3729c15ebb<br>
- SHA-1: 81c341d57ef2cd139569b055d5d59e9e592a7abd
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npd35k-factory-2b50e19d.tgz</a><br>
- MD5: 565be87ebb2d5937e2abe1a42645864b<br>
- SHA-1: 2b50e19dae2667b27f911e3c61ed64860caf43e1
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npd35k-factory-2e89ebe6.tgz</a><br>
- MD5: a8464e15c6683fe2afa378a63e205fda<br>
- SHA-1: 2e89ebe67a46b2f3beb050746c13341cd11fa678
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npd35k-factory-1de74874.tgz</a><br>
- MD5: c0dbb7db671f61b2785da5001cedefcb<br>
- SHA-1: 1de74874f8d83e14d642f13b5a2130fc2aa55873
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npd35k-factory-b4eed85d.tgz</a><br>
- MD5: bdcb6f770e753668b5fadff2a6678e0d<br>
- SHA-1: b4eed85de0d42c200348a8629084f78e24f72ac2
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G(Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npd35k-factory-5ab1212b.tgz</a><br>
- MD5: 7d34a9774fdd6e025d485ce6cfc23c4c<br>
- SHA-1: 5ab1212bc9417269d391aacf1e672fff24b4ecc5
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> (D6603 및 D6653)</td>
- <td>다운로드: <a class="external-link" href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- 자세한 내용은 <a class="external-link" href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">Xperia Z3용 Android N Developer Preview 체험</a>을 참조하세요.
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">기기에서 Preview 제거</h3>
-
-<p>
- 기기에서 Preview를 제거하려면
-다음 중 한 가지 방법을 사용할 수 있습니다. </p>
- <ul>
- <li><strong>공장 사양 시스템 이미지</strong>를 획득한 다음 기기에 수동으로
-플래시합니다.
- <ul>
- <li><strong>Nexus 기기와 Pixel C 기기</strong>의 경우,
-<a href="http://developers.google.com/android/nexus/images">Nexus 기기용
-공장 이미지</a> 페이지에서 다운로드하세요. </li>
- <li><strong>다른 기기</strong>의 경우, 기기 제조업체에 직접
-문의하세요. 또는, Android 베타 프로그램에서 지원되는
-기기라면
-이 프로그램에 기기를 등록한 다음 등록을 해제할 수 있습니다(아래 참조).</li>
- </ul>
- </li>
- <li><strong>Android 베타 프로그램에서 기기 등록을 해제합니다</strong>. 기기가
-<a href="https://g.co/androidbeta">Android 베타
-프로그램</a>에 등록되었다면 기기와 관계없이 프로그램에서 기기를 해제하기만 하면 됩니다.
- <p>
- 기기는 해당 기기에 사용 가능한 가장 최신의 Android 프로덕션 버전에
-대한 OTA 업데이트를 받게 됩니다(예: Android 6.0 Marshmallow).
- 업데이트 시 기기가 완전히 초기화되므로 기기의 사용자 데이터는
-삭제됩니다. 따라서 기기 등록을 해제하기 전에 반드시 <strong>중요한 데이터를
-백업</strong>해야 합니다.
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>참고:</strong>
- 프로그램이 끝나기 전에 Developer Preview 시스템 이미지를 제거하는 경우,
-기기를 완전히 초기화해야 하고 기기에서 모든 사용자 데이터를
-삭제해야 합니다.
-</p>
-
-
-<h2 id="setupAVD">에뮬레이터 설정</h2>
-
-<p>Android 에뮬레이터를 사용하여 Android N Preview를 실행하려면
-Android N Preview SDK를 다운로드하고 에뮬레이터용 가상 기기를
-생성해야 합니다.</p>
-
-<p>먼저 다음과 같이 Android N Preview SDK를 다운로드합니다. <a href="{@docRoot}preview/setup-sdk.html">Android
-N용 개발 설정</a>
-시 이미 다운로드했다면 이 부분은 건너뛸 수 있습니다.
-
-<ol>
- <li>Android Studio에서 Settings 대화 상자를
-엽니다(Windows/Linux의 경우 <strong>File > Settings</strong>, Mac의 경우
-<strong>Android Studio > Preferences</strong>). 왼쪽 창에서
-<strong>Appearance & Behavior >
-System Settings > Android SDK</strong>를 선택합니다.
-
- <li><strong>SDK Platforms</strong> 탭을 클릭한 다음,
-<strong>Android N Preview</strong> 체크박스를 선택합니다.</li>
-
- <li><strong>SDK Tools</strong> 탭을 클릭한 다음,
-<strong>Android SDK Build Tools</strong>, <strong>Android SDK
-Platform-Tools</strong>, <strong>Android SDK Tools</strong> 체크박스를
-선택합니다.
- </li>
-
- <li><strong>OK</strong>를 클릭하고 설치할 패키지의
-사용권 계약에 동의합니다.
- </li>
-</ol>
-
-<p>이제 <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-<strong>Platform-Tools 24.0.0 rc1</strong> 및 <strong>SDK Tools
-25.0.9</strong>를 다운로드했습니다. SDK 도구를 25.0.9로 업데이트하지 않으면
-Android N에서 x86_64 시스템 이미지를 실행할 수 없습니다.</p>
-
-
-<p>이제 Android N 시스템 이미지로 가상 기기를 생성합니다.</p>
-
-<ol>
- <li><strong>Tools > Android >
-AVD Manager</strong>를 선택하여 AVD Manager를 엽니다.</li>
- <li><strong>Create Virtual Device</strong>를 클릭합니다.</li>
- <li>Nexus 5X, Nexus 6P, Nexus 9, Android TV 등의 기기를 선택하고
-<strong>Next</strong>를 클릭합니다.</li>
- <li><strong>N</strong> 시스템 이미지(<strong>x86</strong>
-ABI)를 선택하고 <strong>Next</strong>를 클릭합니다.
- (현재는 x86 시스템 이미지만 Android N Preview용 Android 에뮬레이터에서
-지원됩니다.)
- <li>나머지 AVD 구성을 완료하고
-<strong>Finish</strong>를 클릭합니다.</li>
-</ol>
-
-<p>이제 Android N Preview AVD에서 Android 에뮬레이터를 시작할 수 있습니다.</p>
-
-<p>
-Android 에뮬레이터에서 최상의 경험을 얻으려면
-Android Studio 2.1 이상의 버전을 사용해야 합니다. 이러한 버전에서는 Android Studio 1.5의 에뮬레이터에 비해
-더욱 빠른 성능을 제공하는 <a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0</a>이
-지원됩니다.</p>
-
-<p>가상 기기 생성에 대한 자세한 내용은 <a href="{@docRoot}tools/devices/index.html">가상 기기 관리</a>를 참조하세요.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/ko/preview/features/afw.jd b/docs/html-intl/intl/ko/preview/features/afw.jd
deleted file mode 100644
index 4c06451..0000000
--- a/docs/html-intl/intl/ko/preview/features/afw.jd
+++ /dev/null
@@ -1,552 +0,0 @@
-page.title=Android for Work 업데이트
-page.metaDescription=Android N의 새로운 Android for Work API와 기능.
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#qr">QR 코드 프로비저닝
- </a></li>
-
- <li><a href="#sec-challenge">작업 프로필 보안 인증 질문
- </a></li>
-
- <li><a href="#suspend">앱에 대한 액세스 비활성화
- </a></li>
-
- <li><a href="#toggle-work">작업 모드 전환
- </a></li>
-
- <li><a href="#always-on-vpn">상시 접속 VPN
- </a></li>
-
- <li><a href="#contacts">연락처와 작업 프로필 통합
- </a></li>
-
- <li><a href="#remote-reboot">원격 재부팅
- </a></li>
-
- <li><a href="#disable-roaming">데이터 로밍 비활성화
- </a></li>
-
- <li><a href="#process-logging">엔터프라이즈 프로세스 로깅
- </a></li>
-
- <li><a href="#bug-reports">원격 버그 보고서
- </a></li>
-
- <li><a href="#remove-cert">클라이언트 인증서 제거
- </a></li>
-
- <li><a href="#grant-cert-on-install">설치 시 클라이언트 인증서에 대한
- 액세스 권한 부여</a></li>
-
- <li><a href="#ui-policy">시스템 UI 정책 투명성
- </a></li>
-
- <li><a href="#restrictions-mgmt">앱 제한 관리 향상
- </a></li>
-
- <li><a href="#location-off">위치 해제 스위치
- </a></li>
-
- <li><a href="#custom-provisioning">사용자 지정 프로비저닝
- </a></li>
-
- <li><a href="#multi-wifi-ca">다중 Wi-Fi CA 인증서
- </a></li>
-
- <li><a href="#custom-lock">사용자 지정 잠금 화면 메시지
- </a></li>
-
- <li><a href="#work-connectionservice">작업 프로필 연결 서비스
- </a></li>
-
- <li><a href="#lock-wp">배경 화면 잠금
- </a></li>
-
- <li><a href="#lock-user-icon">사용자 아이콘 잠금
- </a></li>
-
- <li><a href="#health-monitoring">기기 상태 모니터링
- </a></li>
-
- </ol>
-
- <h2>참고 항목</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
- 참조</a></li>
- </ul>
- </div>
-</div>
-
-<p>이 문서에서는 Android N에서 제공되는 새로운 Android for Work 기능을
-설명합니다.</p>
-
-<h2 id="qr">QR 코드 프로비저닝</h2>
-
-<p>
- 이제 Android for Work는 기업에서 업무용으로 지급하는 기기를 프로비저닝할 때 QR 코드 사용을
- 지원합니다. 이제는 설치 마법사를 통해 QR 코드를 스캔하여 기기를
- 프로비저닝할 수 있습니다.
-</p>
-
-<h2 id="sec-challenge">작업 프로필 보안 인증 질문</h2>
-
-<p>
- 프로필 소유자는 작업 프로필에서 작동하는 앱에 대한 보안 인증 질문을
- 지정하도록 사용자에게 요구할 수 있습니다. 시스템에서는 사용자가 업무용 앱을 열려고 할 때
- 보안 인증 질문을 표시합니다. 사용자가 보안 인증 질문에 올바로
- 답하면 작업 프로필의 잠금이 해제되고 필요하다면 작업 프로필의 암호가
- 해독됩니다.
-</p>
-
-<p>
- 프로필 소유자가 {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD} 인텐트를 보내면
-, 보안 인증 질문을 설정하라는 메시지가 사용자에게 표시됩니다. 또한, 프로필 소유자는
- 사용자에게 기기 잠금을 설정하도록 하는 <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> 인텐트를
- 보낼 수 있습니다.
-</p>
-
-<p>
- 프로필 소유자는 작업 프로필 보안 인증 질문의 비밀번호 정책을 다른 기기
- 비밀번호의 정책과는 다르게 설정하도록 선택할 수 있습니다. 예를 들어, 기기 보안 질문 응답의 최소 길이는 다른 암호에 요구되는
-길이와
-다를 수 있습니다. 프로필 소유자는 {@link
- android.app.admin.DevicePolicyManager#setPasswordQuality
- setPasswordQuality()} 및 {@link
- android.app.admin.DevicePolicyManager#setPasswordMinimumLength
- setPasswordMinimumLength()}와 같은
- 일반적인 {@link android.app.admin.DevicePolicyManager}
- 메서드를 사용하여 보안 질문 정책을 설정합니다. 프로필 소유자는 새 <code>DevicePolicyManager.getParentProfileInstance()</code>
- 메서드에 의해 반환되는 {@link android.app.admin.DevicePolicyManager} 인스턴스를
- 사용하여 기기 잠금을
- 설정할 수도 있습니다. 그 밖에도, 프로필 소유자는 {@link android.app.admin.DevicePolicyManager}
- 클래스의 새로운 <code>setOrganizationColor()</code> 및
- <code>setOrganizationName()</code> 메서드를 사용하여 작업 프로필 보안 인증 질문에 대한 자격 증명 화면을
- 사용자 지정할 수 있습니다.
-</p>
-
-<p>
- 새로운 메서드와 상수에 대한 자세한 내용은
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 참조</a>의 <code>DevicePolicyManager</code> 참조 페이지를 참조하십시오.
-</p>
-
-<h2 id="suspend">앱에 대한 액세스 비활성화</h2>
-
-<p>
- 기기 소유자 및 프로필 소유자는 새 <code>DevicePolicyManager.setPackagesSuspended()</code>
- 메서드를 호출하여 패키지에 대한 액세스를 일시적으로 중단할 수
- 있습니다. 소유자는 이 메서드를 똑같이 사용하여 해당 패키지를 다시 활성화할 수 있습니다.
-</p>
-
-<p>
- 패키지가 일시 중단된 동안에는 액티비티를 시작할 수 없고, 패키지에 대한
- 알림이 억제되고, <a href="{@docRoot}guide/components/recents.html">개요 화면</a>에서 앱 항목이 숨겨집니다.
- 일시 중단된 패키지는 <a href="{@docRoot}guide/components/recents.html">개요 화면</a>에 표시되지 않고
- (toast와 snackbar를 포함한) 대화 상자를 표시할 수 없습니다. 이들 패키지는 또한 오디오를
- 재생하거나 기기를 진동시킬 수도 없습니다.
-</p>
-
-<p>
- 현재 사용할 수 없는 앱임을 표시하기 위해
-, 런처는 뚜렷이 구별되는 UI를 일시 중단된 앱에 적용해야 합니다. 예를 들어, 앱 아이콘이 회색으로 표시되도록 할 수
- 있습니다. 런처는 앱이 일시 중단된 상태인지
- 확인하기 위해 새 <code>DevicePolicyManager.getPackageSuspended()</code> 메서드를 호출할 수 있습니다.
-</p>
-
-<h2 id="toggle-work">작업 모드 전환</h2>
-
-<p>
- 듀얼 프로필 기기에서는 사용자가 작업 모드를 설정하거나 해제할 수 있습니다. 작업 모드가
- 해제된 중에는 관리된 프로필이 일시적으로 종료됩니다. 프로필
- 소유자 앱을 포함하여 작업 프로필 앱, 백그라운드 동기화 및 알림이 모두
- 비활성화됩니다. 작업 프로필이 비활성화된 중에는 사용자가
- 업무용 앱을 실행할 수 없음을 미리 알려주기 위한 영구적인 상태 아이콘이
- 표시됩니다. 시스템 런처는 업무용 앱과 위젯에 액세스할 수 없음을
- 나타냅니다.
-</p>
-
-<h2 id="always-on-vpn">상시 접속 VPN</h2>
-
-<p>
- 기기 소유자 및 프로필 소유자는 항상 지정된 VPN을 통해 업무용 앱을
- 네트워크에 연결하도록 요구할 수 있습니다. 소유자가 이 요구 사항을 설정하면
- 기기는 부팅 시 해당 VPN을 자동으로 시작합니다.
-</p>
-
-<p>
- 소유자는 새 <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code> 메서드를 호출하여 VPN을 사용하도록 요구할 수
- 있습니다. 소유자가
- VPN 요구 사항을 설정했는지 확인하려면 새
- <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code> 메서드를 호출하십시오.
-</p>
-
-<p>
- 시스템에서 앱 상호 작용 없이 VPN 서비스를 직접 바인딩할 수 있으므로,
- VPN 클라이언트는 상시 접속 VPN에 대해 새로운 진입점을 처리해야 합니다. 이전과 마찬가지로,
- {@link android.net.VpnService android.net.VpnService} 작업과 일치하는 인텐트 필터를 사용하여 활성 서비스를
- 찾을 수 있습니다.
-</p>
-
-<p>
- 사용자는 <strong>Settings > More >
- VPN</strong> 화면을 사용하여 {@link
- android.net.VpnService}를 구현하는 상시 접속 VPN 클라이언트를 수동으로 설정할 수 있습니다.
-</p>
-
-<h2 id="contacts">연락처와 작업 프로필 통합</h2>
-
-<p>
- 프로필 소유자는 기본 사용자의 업무용 연락처에 대한 로컬 검색 및 디렉터리 조회를
- 허용할 수 있습니다. 예를 들어, 사용자는 개인 다이얼러 또는 연락처 애플리케이션에서
- 개인용 및 업무용 디렉터리 연락처에 모두 액세스할 수 있습니다(프로필
- 관리자가 허용한 경우).
-</p>
-
-<p>
- Contact Provider를 활용하는 개발자는, 정책에 따라 허용되는 경우
-, Enterprise Contacts API를 사용하여 기본 사용자의 작업 프로필 디렉터리 항목에 액세스할 수
- 있습니다.
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- 프로필 소유자는 다음과 같은 새로운 메서드를 사용하여 기본 사용자의 업무용 연락처를 표시할지
-여부를 제어할 수 있습니다.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">원격 재부팅</h2>
-
-<p>
- 기기 소유자는 기기를 원격으로 재부팅할 수 있습니다. 경우에 따라, 구내의 공공 장소에 배치되어 있는
- 기기는 전원 버튼에 액세스하지 못하게 되어 있습니다. 기기를
- 재부팅해야 하는 경우 관리자가 새
- <code>DevicePolicyManager.reboot()</code> 메서드를 사용하여 재부팅할 수 있습니다.
-</p>
-
-<h2 id="disable-roaming">데이터 로밍 비활성화</h2>
-
-<p>
- 기기 소유자는 새로운 {@link
- android.os.UserManager} 사용자 제한 <code>DISALLOW_DATA_ROAMING</code>을 사용하여 데이터 로밍을 비활성화할 수 있습니다.
-</p>
-
-<h2 id="process-logging">엔터프라이즈 프로세스 로깅</h2>
-
-<p>
- 기기 소유자는 앱 실행, adb 액티비티 및 화면 잠금 해제를 비롯한 기기 액티비티를
- 원격으로 추적하여 의심스러운 액티비티를 식별할 수 있습니다. 프로세스
- 로그는 사용자 동의를 받을 필요가 없습니다. 로그를 검색하기 위해, 기기 소유자는 <code>DevicePolicyManager.setSecurityLoggingEnabled()</code>를 사용하여
- 기기 로깅을 활성화할 수 있습니다.
-</p>
-
-<p>
- API 변경 사항에는 다음이 포함됩니다.
-</p>
-
-<ul>
-
- <li>
- 새로운 클래스 <code>android.app.admin.SecurityLog</code>와 이 클래스의
- 메서드
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">원격 버그 보고서</h2>
-
-<p>
- 기기 소유자는 기기 상태 덤프 파일이 포함된 버그 보고서를
- 원격으로 트리거하고 검색할 수 있으며, 이를 통해 알려진 문제나 손상된 기기에 대한
- 포렌식 조사를 수행할 수 있습니다. 버그 보고서는 그 본질상 세세한 내용까지 담고 있으므로,
- 사용자 동의를 받아야 합니다.
-</p>
-
-<p>
- Android N에서는 이 기능을 지원하기 위해 다음과 같은 API를 포함합니다. 자세한
- 내용은 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
- 참조</a>를 확인하세요.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">클라이언트 인증서 제거</h2>
-
-<p>
- 프로필 소유자와 기기 소유자는 이제 새 <code>DevicePolicyManager.removeKeyPair()</code>
- 메서드를 호출하여, {@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()}를 통해 설치된 클라이언트 인증서를
- 제거할 수 있습니다.
-</p>
-
-<h2 id="grant-cert-on-install">설치 시 클라이언트 인증서에 대한
- 액세스 권한 부여</h2>
-
-<p>
- 프로필 소유자나 기기 소유자가 인증서 관리 권한을
- 타사 앱에 부여할 경우, 해당 앱은 소유자의 간섭을 전혀 받지 않고도 인증서에
- 액세스 권한을 부여할 수 있습니다.
-</p>
-
-<p>
- 인증서 관리를 위한 기존 API가 확장되었으며 다음을 포함합니다.
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">시스템 UI 정책 투명성</h2>
-
-<p>
- 사용자 환경에 영향을 미치는 정책이나 사용자 Settings를 제한하는 정책은
- 사용자에게 완전히 공개되며, 프로필 소유자와 기기 소유자는 해당 정책에 대한 책임을
- 회사의 IT 부서로 돌릴 수 있습니다. Settings에 일관되게 표시되는 “Action
- not allowed” 메시지 외에도, IT 관리자는
- 다음과 같은 새로운 {@link android.app.admin.DevicePolicyManager} 메서드를 사용하여 기기 설정에서 조직별 지원 메시지를
- 설정할 수 있습니다.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="restrictions-mgmt">앱 제한 관리 향상</h2>
-
-<p>
- 기기 소유자나 프로필 소유자는 새 <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code>
- 메서드를 통해 다른 애플리케이션이 앱 제한을
- 관리하도록 할 수
- 있습니다. 지정된 애플리케이션은 이 권한이 부여되었는지
-여부를 확인하기 위해 <code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code>를 호출할
-수 있습니다.
-</p>
-
-<p>
- 앱 제한을 관리하도록 지정된 애플리케이션은 해당 사용자 또는 프로필 내에 있는 어떤 패키지에 대해서도 {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
- setApplicationRestrictions()} 및 {@link
- android.app.admin.DevicePolicyManager#getApplicationRestrictions
- getApplicationRestrictions()}를 호출할 수 있습니다.
-</p>
-
-<h2 id="location-off">위치 해제 스위치</h2>
-
-<p>
- 사용자는 개인용 앱에서 위치 정보에 계속 액세스하는 동안에도
- 업무용 앱의 위치 권한을 비활성화할 수 있습니다. 사용자는
- Location Settings에 있는 별개의 위치 액세스 스위치를 사용하여 작업 프로필에서 실행 중인
- 앱의 위치 업데이트 또는 마지막 위치 쿼리를 거부할 수 있습니다.
-</p>
-
-<p>
- 최상위 수준 위치 해제 스위치를 사용하면 기본 프로필과 관리된 프로필에
- 대해 모두 위치 액세스를 비활성화할 수 있습니다.
-</p>
-
-<h2 id="custom-provisioning">사용자 지정 프로비저닝</h2>
-
-<p>
- 애플리케이션은 기업 색상과 로고를 사용하여 프로필 소유자 및 기기 소유자 프로비저닝
- 흐름을 사용자 지정할 수 있습니다.
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- 흐름 색상을 사용자 지정합니다.
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- 기업 로고를 사용하여 흐름을 사용자 지정합니다.
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">다중 Wi-Fi CA 인증서</h2>
-
-<p>
- 프로필 소유자와 기기 소유자는 주어진 Wi-Fi 구성에 대해 다중 CA 인증서를 설정할 수
- 있습니다. SSID가 동일한 별개의 액세스 지점에 대해
- 별개의 CA가 기업 Wi-Fi 네트워크에 있는 경우, IT 관리자가 새 메서드 <code>setCaCertificates()</code>를 사용하여
- 모든 관련 CA를 Wi-Fi 구성에 포함시킬 수
- 있습니다.
-</p>
-
-<p>
- 추가되는 API는 다음과 같습니다.
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">사용자 지정 잠금 화면 메시지</h2>
-
-<p>
- 기기 소유자는 잠금 화면에 표시될 소유자 정보를 제공할 수 있습니다.
- 이 정보는 사용자 잠금 화면 메시지(설정되어 있는 경우)보다
- 우선합니다. 새 {@link android.app.admin.DevicePolicyManager} 메서드는 다음과 같습니다.
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">작업 프로필 연결 서비스</h2>
-
-<p>
- 프로필 소유자는 호출 백엔드(호출 계정)용으로
- 작업별 {@link android.telecom.ConnectionService}를 사용하는 업무용 다이얼러 애플리케이션을
- 지정할 수 있습니다. 업무용 다이얼러는 업무 전용 통화 기록을
- 유지 관리하고 업무용 연락처에만 의존합니다. 사용자는 전화 걸기 애플리케이션에 상관없이 일관된 통화 UI
- 환경을 사용합니다. 업무 통화 계정으로 수신되는 업무 통화는
- 개인 통화 계정으로 수신되는 개인용 통화와
- 구분됩니다.
-</p>
-
-<p>
- 다이얼러는 새 플래그
- <code>android.telecom.Call.PROPERTY_WORK_CALL</code>을 검사하여 통화가
-업무 통화인지 결정합니다. 통화가 업무 통화인 경우, 다이얼러는 작업 배지를 추가하는 등의 방법으로
- 이를 표시해야 합니다.
-</p>
-
-<h2 id="lock-wp">배경 화면 잠금</h2>
-
-<p>
- 새 사용자 제한(<code>DISALLOW_SET_WALLPAPER</code>)에 따라 사용자는
- 배경 화면을 변경할 수 없습니다. 그래도 기기 소유자나 프로필 소유자는
- 배경 화면을 변경할 수 있지만, 자신이 관리하는 사용자나 프로필의
- 배경 화면만 변경할 수 있을 뿐입니다. 예를 들어, 프로필 소유자는 상위 사용자의 배경 화면은
- 변경할 수 없지만, 기본 프로필에 있는 프로필 소유자나 기기 소유자는
- 변경할 수 있습니다. 배경 화면을 변경하고 싶은 프로필 소유자나 기기 소유자는
- 자신이 관리하는 사용자 또는 프로필에
- 배경 화면이 있는지({@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}), 그리고 이를 변경하도록 허용되는지 여부를 확인해야 합니다(새 메서드
- <code>WallpaperManager.isWallpaperSettingAllowed()</code> 사용).
-</p>
-
-<h2 id="lock-user-icon">사용자 아이콘 잠금</h2>
-
-<p>
- 새 사용자 제한(<code>DISALLOW_SET_USER_ICON</code>)에 따라 사용자는
- 사용자 아이콘을 변경할 수 없습니다. 그래도 사용자의 기기 소유자나 프로필 소유자는
- 아이콘을 변경할 수 있습니다. 하지만, 프로필 소유자는 자신이 관리하는 프로필에 대한 사용자 아이콘만
- 변경할 수 있을 뿐입니다.
-</p>
-
-<h2 id="health-monitoring">기기 상태 모니터링</h2>
-
-<p>
- 기기 소유자나 프로필 소유자는 새
- <code>HardwarePropertiesManager</code> 인터페이스를 사용하여 CPU나 GPU의 온도, CPU 사용량 등, 기기 상태에 대한
- 정보를 검색할 수 있습니다. 새
- 모니터링 인터페이스는 원격 위치에서 지켜보는 사람이 없이 작동하는 기기를
- 모니터링하는 데 특히 유용합니다.
-</p>
diff --git a/docs/html-intl/intl/ko/preview/features/data-saver.jd b/docs/html-intl/intl/ko/preview/features/data-saver.jd
deleted file mode 100644
index a5e4741..0000000
--- a/docs/html-intl/intl/ko/preview/features/data-saver.jd
+++ /dev/null
@@ -1,234 +0,0 @@
-page.title=Data Saver
-metaDescription=User-enabled data usage optimization.
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- 이 문서의 내용
- </h2>
-
- <ol>
- <li>
- <a href="#status">Data Saver 기본 설정 확인</a>
- <ol>
- <li>
- <a href="#request-whitelist">허용 목록 권한 요청</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">Data Saver 기본 설정 변경 사항
-모니터링</a>
- </li>
-
- <li>
- <a href="#testing">Android 디버그 브리지 명령을 이용한 테스트</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- 스마트폰의 수명 전체에 걸쳐, 모바일 데이터 요금제에 따른 비용이
- 기기 자체의 가격을 쉽게 초과할 수 있습니다. N Developer Preview에서는 사용자들이
-로밍 중이든, 결제 주기가 끝날 무렵이든, 소액 선불 데이터 팩을 사용 중이든 상관없이, 데이터 사용량을 줄이기 위해 기기 전체에서
-Data Saver를 활성화할 수 있습니다.
-</p>
-
-<p>
- 사용자가 <strong>Settings</strong>에서 Data Saver를 활성화하고
- 해당 기기가 데이터 통신 네트워크에 있는 경우, 시스템은 백그라운드 데이터 사용을
-차단하고 가능하면 포그라운드에서 데이터를 더 적게 사용하도록 앱에게 신호를 보냅니다. 사용자는
-Data Saver가 켜진 경우에도 백그라운드 데이터 통신 연결을 허용하기 위해
-특정 앱을 허용 목록에 추가할 수 있습니다.
-</p>
-
-<p>
- N Developer Preview는 {@link android.net.ConnectivityManager}
- API를 확장하여 <a href="#status">사용자의 Data Saver 기본 설정을 검색</a>하고 <a href="#monitor-changes">기본
- 설정 변경을 모니터링</a>하는 방법을
- 앱에 제공합니다. 사용자가 Data Saver를 활성화했는지 여부를 앱이 확인하고
-포그라운드 및 백그라운드 데이터 사용을 제한하기 위해
-앱이 노력하는 것은 좋은 방법입니다.
-</p>
-
-<h2 id="status">
- Data Saver 기본 설정 확인
-</h2>
-
-<p>
- N Developer Preview에서 앱이 {@link
- android.net.ConnectivityManager} API를 사용하여, 어떤 데이터 사용량 제한이
-적용되고 있는지를 확인할 수 있습니다. {@code getRestrictBackgroundStatus()}
- 메서드는 다음 값 중 하나를 반환합니다.
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- Data Saver가 비활성화되었습니다.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- 사용자가 이 앱에 대해 Data Saver를 활성화했습니다. 앱은 포그라운드에서 데이터 사용량을
-제한하고, 백그라운드
-데이터 사용량에 대한 제한을 적절히 처리하기 위해 노력해야 합니다.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- 사용자가 Data Saver를 활성화했지만 앱이 허용 목록에 추가되어 있습니다. 앱은
-포그라운드 및 백그라운드 데이터 사용량을 제한하기 위해 여전히 노력해야 합니다.
- </dd>
-</dl>
-
-<p>
- Data Saver가 비활성화되어 있거나 앱이 허용 목록에 추가되어 있더라도,
-기기가 데이터 통신 네트워크에 연결될 때마다 항상
- 데이터 사용량을 제한하는 것이 좋은 방법입니다. 다음 샘플 코드에서는 {@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} 및 {@code
- ConnectivityManager.getRestrictBackgroundStatus()}를 사용하여 앱이 사용해야 하는 데이터의 양을
-결정합니다.
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- 허용 목록 권한 요청
-</h3>
-
-<p>
- 앱이 백그라운드에서 데이터를 사용해야 하는 경우, 앱의 패키지 이름의 URI가 포함된
-<code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
-인텐트(예:
-<code>package:MY_APP_ID</code>)를 앱이 보내서
-허용 목록 권한을 요청할 수 있습니다.
-</p>
-
-<p>
- 인텐트와 URI를 보내면 <strong>Settings</strong> 앱이 시작되고
-앱에 대한 데이터 사용량 설정이 표시됩니다. 그러면 사용자는 앱에 대해 백그라운드 데이터의
-사용 여부를 결정할 수 있습니다. 이 인텐트를 보내기 전에,
-백그라운드 데이터 사용을 활성화하기 위해
-<strong>Settings</strong> 앱 시작 여부를 사용자에게 먼저 묻는 것이
-좋습니다.
-</p>
-
-<h2 id="monitor-changes">
- Data Saver 기본 설정 변경 사항 모니터링
-</h2>
-
-<p>
- 앱은 {@code
- ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED}를 수신하기 위해 {@link
- android.content.BroadcastReceiver}를 만들고 수신기를 {@link android.content.Context#registerReceiver
- Context.registerReceiver()}에 동적으로 등록하여
-Data Saver 기본 설정의 변경 사항을 모니터링할 수 있습니다. 앱은 이 브로드캐스트를 수신할 때 {@code
- ConnectivityManager.getRestrictBackgroundStatus()}를 호출하여 <a href="#status">새로운 Data Saver 기본 설정이
-권한에 영향을 미치는지 확인</a>해야
-합니다.
-</p>
-
-<p class="note">
- <strong>참고:</strong> 시스템에서는 {@link
- android.content.Context#registerReceiver Context.registerReceiver()}로 동적으로 등록하는 앱에만 이
-브로드캐스트를 보냅니다. 이
-브로드캐스트를 수신하도록 매니페스트에 등록하는 앱은
-이를 수신하지 못합니다.
-</p>
-
-<h2 id="testing">
- Android 디버그 브리지 명령을 이용한 테스트
-</h2>
-
-<a href="{@docRoot}tools/help/adb.html">Android 디버그 브리지</a>는
-네트워크 권한을 확인하고 구성하는 데 사용될 수 있는 몇 가지 명령을
-제공합니다.
-
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- 현재 전역 백그라운드 네트워크
- 제한 설정, 허용 목록에 현재 있는 패키지 UID 및 알려진
-다른 패키지의 네트워크 권한이 포함된 보고서를 생성합니다.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- Network Policy Manager(netpolicy) 명령의 전체 목록을 표시합니다.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- <code>true</code> 또는
- <code>false</code>를 각각 전달할 때 Data Saver 모드를 활성화하거나 비활성화합니다.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- 지정된 패키지 UID를 허용 목록에 추가하여 백그라운드 데이터 통신 연결을
- 허용합니다.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- 지정된 패키지 UID를 허용 목록에서 제거하여, Data Saver가 활성화된 동안 백그라운드 데이터 통신 연결을
-차단합니다.
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/preview/features/direct-boot.jd b/docs/html-intl/intl/ko/preview/features/direct-boot.jd
deleted file mode 100644
index 981c3e0..0000000
--- a/docs/html-intl/intl/ko/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=직접 부팅
-page.keywords=preview, sdk, 직접 부팅
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#run">직접 부팅 시 실행하기 위한 액세스 요청</a></li>
- <li><a href="#access">기기 암호화 저장소 액세스</a></li>
- <li><a href="#notification">사용자 잠금 해제 알림 수신</a></li>
- <li><a href="#migrating">기존 데이터 마이그레이션</a></li>
- <li><a href="#testing">암호화 인식 앱 테스트</a></li>
- </ol>
-</div>
-</div>
-
-<p>기기에 전원이 들어와 있지만 <i>사용자가 기기의 잠금을 해제하지</i> 않았을 경우 Android N은 안전한
-직접 부팅
- 모드에서 실행됩니다. 이를 지원하기 위해 시스템에서 다음과 같은 두 가지 데이터 저장소 위치를 제공합니다.</p>
-
-<ul>
-<li><i>자격 증명 암호화 저장소:</i>기본 저장소 위치이며, 사용자가 기기의 잠금을 해제한 후에만
-사용할 수 있습니다.</li>
-<li><i>기기 암호화 저장소:</i>직접 부팅 모드와 사용자가 기기의 잠금을 해제한 후에
-모두 사용할 수 있는 저장소 위치입니다.</li>
-</ul>
-
-<p>기본적으로 직접 부팅 모드 시 앱이 실행되지 않습니다.
-직접 부팅 모드에서 조치가 필요한 경우,
-이 모드에서 실행되어야 하는 앱 구성 요소를 등록할 수 있습니다. 직접 부팅 모드 시 실행되어야 하는 앱의
-몇 가지 공통 사용 사례는 다음과 같습니다.</p>
-
-<ul>
-<li>알람 시계 앱과 같이 예약된 알림이 있는
-앱.</li>
-<li>SMS 앱처럼 중요한 사용자 알림을 제공하는 앱.</li>
-<li>Talkback처럼 접근성 서비스를 제공하는 앱.</li>
-</ul>
-
-<p>앱이 직접 부팅 모드에서 실행되는 동안 데이터에 액세스해야 하는 경우
-기기 암호화 저장소를 사용합니다. 기기 암호화 저장소에는
-기기가 성공적으로 확인된 부팅을 수행한 후에만
-사용할 수 있는 키로 암호화된 데이터가 포함됩니다.</p>
-
-<p>PIN이나 비밀번호와 같이 사용자 자격 증명과 연관된 키로 암호화해야 하는 데이터는
-자격 증명 암호화 저장소를 사용합니다.
-자격 증명 암호화 저장소는 사용자가 기기의 잠금을 해제한 뒤부터
-기기를 다시 시작할 때까지 사용할 수 있습니다. 사용자가
-기기의 잠금을 해제한 뒤 잠금 화면을 활성화해도
-자격 증명 암호화 저장소가 잠기지 않습니다.</p>
-
-<h2 id="run">직접 부팅 시 실행하기 위한 액세스 요청</h2>
-
-<p>앱은 직접 부팅 모드에서 실행되거나
-기기 암호화 저장소에 액세스하기 전까지
-시스템에 구성 요소를 등록해야 합니다. 앱은 구성 요소를 암호화 인식으로 표시하여
-<i>시스템에</i> 등록합니다. 구성 요소를 암호화 인식으로 표시하려면 매니페스트에서
-<code>android:directBootAware</code> 속성을 true로 설정합니다.<p>
-
-<p>암호화 인식 구성 요소로 등록하면 기기가 다시 시작되었을 때 시스템에서
-<code>LOCKED_BOOT_COMPLETED</code> 브로드캐스트 메시지를
-수신할 수 있습니다. 이 시점에서 기기 암호화 저장소를
-사용할 수 있고, 여러분의 구성 요소는
-예약된 알람 트리거 등과 같이 직접 부팅 모드에서 실행해야 하는 작업을 실행할 수 있습니다.</p>
-
-<p>다음 코드 조각은
-{@link android.content.BroadcastReceiver}를 암호화 인식으로 등록하고 앱 매니페스트에
-<code>LOCKED_BOOT_COMPLETED</code>의 인텐트 필터를 추가하는 예시입니다.</p>
-
-<pre>
-<receiver
- android:directBootAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>사용자가 기기의 잠금을 해제하면 모든 구성 요소가
-기기 암호화 저장소와 자격 증명 암호화 저장소에 액세스할 수 있습니다.</p>
-
-<h2 id="access">기기 암호화 저장소 액세스</h2>
-
-<p>기기 암호화 저장소에 액세스하려면
-<code>Context.createDeviceProtectedStorageContext()</code>를 호출하여 두 번째
-{@link android.content.Context} 인스턴스를 생성합니다. 이 컨텍스트를 사용하여 수행된 모든 저장소 API 호출은
-기기 암호화 저장소에 액세스합니다. 다음은
-기기 암호화 저장소에 액세스하고 기존
-앱 데이터 파일을 여는 예시입니다.</p>
-
-<pre>
-Context directBootContext = appContext.createDeviceProtectedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>직접 부팅 모드에서 액세스해야 하는 정보에만
-기기 암호화 저장소를 사용합니다.
-기기 암호화 저장소를 범용 암호화 저장소로 사용하지 마십시오.
-개인적인 사용자 정보 또는 직접 부팅 모드에서 필요하지 않은 암호화 데이터는
-자격 증명 암호화 저장소를 사용합니다.</p>
-
-<h2 id="notification">사용자 잠금 해제 알림 수신</h2>
-
-<p>사용자가 재시작 후 기기의 잠금을 해제하면
-앱이 자격 증명 암호화 저장소 액세스로 전환하고,
-사용자 자격 증명을 따르는 일반 시스템 서비스를 사용할 수 있습니다.</p>
-
-<p>사용자가 재부팅 후 기기의 잠금을 해제할 때 알림을 받으려면
-실행 중인 구성 요소에서 {@link android.content.BroadcastReceiver}를 등록하고
-<code>ACTION_USER_UNLOCKED</code> 메시지를 수신합니다. 또는,
-기존 {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED} 메시지를 수신할 수 있습니다. 이 메시지는 기기가 부팅되었으며 사용자가 기기의 잠금을
-해제했음을 나타냅니다.</p>
-
-<p>사용자가
-<code>UserManager.isUserUnlocked()</code>를 호출하여 기기 잠금을 해제했는지 직접 쿼리할 수 있습니다.</p>
-
-<h2 id="migrating">기존 데이터 마이그레이션</h2>
-
-<p>직접 부팅 모드를 사용하도록 사용자가 자신의 기기를 업데이트하는 경우,
-여러분이 기존 데이터를 기기 암호화 저장소로 마이그레이션해야 할 수도 있습니다.
-<code>Context.moveSharedPreferencesFrom()</code>과
-<code>Context.moveDatabaseFrom()</code>을 사용하여 자격 증명 암호화 저장소와 기기 암호화 저장소 간에
-기본 설정과 데이터베이스 데이터를 마이그레이션합니다.</p>
-
-<p>어떤 데이터를 자격 증명
-암호화 저장소에서 기기 암호화 저장소로 마이그레이션할지를 신중히 결정하세요. 암호나 인증 토큰 등의
-개인 사용자 정보는 기기 암호화 저장소로
-마이그레이션해서는 안 됩니다. 일부 시나리오에서
-두 가지 암호화 저장소에 있는 별도의 데이터 세트를 관리해야 할 수 있습니다.</p>
-
-<h2 id="testing">암호화 인식 앱 테스트</h2>
-
-<p>새로운 직접 부팅 모드로 암호화 인식 앱을 테스트하세요. 직접 부팅을
-활성화하는 방법은 두 가지가 있습니다.</p>
-
-<p class="caution"><strong>주의:</strong> 직접 부팅을 활성화하면
-기기에서 모든 사용자 데이터가 삭제됩니다.</p>
-
-<p>Android N이 설치된 지원 기기에서
-직접 부팅을 활성화하는 방법:</p>
-
-<ul>
-<li><b>Developer options</b>가 활성화되어 있지 않으면 기기에서
-<b>Settings > About phone</b>으로 이동하여 <b>Build number</b>를
-7번 탭하여 활성화합니다. 개발자 옵션 화면이 나오면
-<b>Settings > Developer options</b>로 이동해서
-<b>Convert to file encryption</b>을 선택합니다.</li>
-<li>다음 adb shell 명령을 사용하여 직접 부팅 모드를 활성화합니다.
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>테스트 기기에서 모드를 전환해야 할 경우
-에뮬레이션된 직접 부팅 모드도 사용할 수 있습니다. 에뮬레이션된 모드는 개발 시에만 사용해야 하며
-데이터가 손실될 수 있습니다. 에뮬레이션된 직접 부팅 모드를 활성화하려면
-기기에서 잠금 패턴을 설정합니다. 잠금 패턴을 설정할 때 안전 모드 화면으로 시작할지 묻는 메시지가 나오면 "No thanks"를
-선택한 뒤 다음
-adb shell 명령을 사용합니다.</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>에뮬레이션된 직접 부팅 모드를 끄려면 다음 명령을 사용합니다.</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>이 명령을 사용하면 기기가 재부팅됩니다.</p>
diff --git a/docs/html-intl/intl/ko/preview/features/icu4j-framework.jd b/docs/html-intl/intl/ko/preview/features/icu4j-framework.jd
index f626bff..921873d 100644
--- a/docs/html-intl/intl/ko/preview/features/icu4j-framework.jd
+++ b/docs/html-intl/intl/ko/preview/features/icu4j-framework.jd
@@ -50,7 +50,7 @@
<p>
Android N은
-<code>com.ibm.icu</code>가 아니라 <code>android.icu</code> 패키지를 통해 ICU4J API의 하위 세트를 노출합니다.
+<code>com.ibm.icu</code>가 아니라 <code>android.icu</code> 패키지를 통해 ICU4J API의 하위 세트를 노출합니다.
Android 프레임워크는 여러 가지 이유로
ICU4J API를 노출하지 않을 수 있습니다. 예컨대 Android N은
일부 사용 중단된 API나 ICU 팀에서 안정적이라고 선언하지 않은 API를
diff --git a/docs/html-intl/intl/ko/preview/features/multi-window.jd b/docs/html-intl/intl/ko/preview/features/multi-window.jd
deleted file mode 100644
index bd24d9f..0000000
--- a/docs/html-intl/intl/ko/preview/features/multi-window.jd
+++ /dev/null
@@ -1,589 +0,0 @@
-page.title=다중 창 지원
-page.metaDescription=Android N에서 한 번에 둘 이상의 앱을 표시하도록 지원.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#overview">개요</a></li>
- <li><a href="#lifecycle">다중 창 수명 주기</a></li>
- <li><a href="#configuring">앱을 다중 창
-모드로 구성</a></li>
- <li><a href="#running">앱을 다중 창 모드에서 실행</a></li>
- <li><a href="#testing">앱의 다중 창 지원 테스트</a></li>
- </ol>
- <h2>참고 항목</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">다중 창
- 플레이그라운드 샘플 앱</a></li>
- <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Android N에서 다중 창을 준비하기 위한 5가지 팁</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N은 둘 이상의 앱을 동시에 표시하기 위한 지원을
-추가합니다. 핸드헬드 기기에서 두 개의 앱을 <em>화면 분할</em> 모드에서
-나란히 또는 상하로 실행할 수 있습니다. TV 기기에서 앱이
-<em>PIP(Picture-In-Picture)</em> 모드를 사용하는 경우 사용자가 다른 앱과 상호작용하는
-동안에 계속 동영상을 재생할 수 있습니다.
-</p>
-
-<p>
- N Preview SDK로 앱을 빌드하는 경우, 앱이 다중 창
-표시를 처리하는 방식을 구성할 수 있습니다. 예를 들어, 액티비티의
-최소 허용 치수를 지정할 수 있습니다. 또한 앱에
-대해 다중 창 표시를 비활성화할 수도 있으며, 이 경우 시스템은 앱을 전체 화면 모드에서만
-표시합니다.
-</p>
-
-<h2 id="overview">개요</h2>
-
-<p>
- Android N에서는 여러 앱이 동시에 화면을 공유할 수 있습니다. 예를 들어, 사용자가 화면을 분할하여 왼쪽에서는 웹페이지를
-보면서 오른쪽에서는 이메일을 작성할
-수 있습니다. 사용자 환경은 기기에 따라
-달라집니다.
-</p>
-
-<ul>
- <li>Android N에서 실행되는 핸드헬드 기기는 화면 분할
-모드를 제공합니다. 이 모드에서 시스템은 화면을 두 개의 앱으로 채우고, 이
-앱을 나란히 또는 상하로 표시합니다. 사용자가 두 앱을 구분하는 분할선을 드래그하여 한 앱을 다른 앱보다
-더 크게 만들 수 있습니다.
- </li>
-
- <li>Android N을 실행하는 Nexus Player에서, 앱이
-<a href="picture-in-picture.html">PIP 모드</a>로 배치될 수 있으므로, 사용자가 검색을
-수행하거나 다른 앱과 상호작용하는 중에도 앱이 계속해서 콘텐츠를
-표시할 수 있습니다.
- </li>
-
- <li>더 큰 기기를 제조하는 업체는 자유형식
-모드를 선택할 수 있으며, 이 경우 사용자가 각 액티비티의 크기를 자유롭게 조정할 수 있습니다. 제조업체가 이 기능을 활성화하면, 기기는 화면 분할 모드 뿐만
-아니라 자유형식 모드를
-제공합니다.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>그림 1.</strong> 화면 분할 모드에서 나란히 실행 중인 두 앱.
-</p>
-
-<p>
- 사용자가 다음과 같이 다중 창 모드로 전환할 수 있습니다.
-</p>
-
-<ul>
- <li>사용자가 <a href="{@docRoot}guide/components/recents.html">Overview
-화면</a>을 열고 액티비티 제목을 길게 누르면,
-이 액티비티를 화면의 강조 표시된 부분으로 드래그하여
-다중 창 모드에 둘 수 있습니다.
- </li>
-
- <li>사용자가 Overview 버튼을 길게 누르면, 기기가 현재 액티비티를
-다중 창 모드에 두고 Overview 화면을 열며, 이 화면에서 사용자는 화면을
-공유하기 위한 또 다른 액티비티를 선택할 수 있습니다.
- </li>
-</ul>
-
-<p>
- 사용자는 여러 액티비티가 화면을 공유하는 동안 한 액티비티에서
-또 다른 액티비티로 데이터를 <a href="{@docRoot}guide/topics/ui/drag-drop.html">드래그 앤 드롭</a>할
-수 있습니다. (이전에는, 사용자가 단일 액티비티 내에서만
-데이터를 드래그 앤 드롭할 수 있었습니다.)
-</p>
-
-<h2 id="lifecycle">다중 창 수명 주기</h2>
-
-<p>
- 다중 창 모드는 <a href="{@docRoot}training/basics/activity-lifecycle/index.html">액티비티
-수명 주기</a>를 변경하지 않습니다.
-</p>
-
-<p>
- 다중 창 모드에서는, 사용자가 가장 최근에 상호작용했던 액티비티만
-지정된 시간에 활성화됩니다. 이 액티비티는 <em>최상위</em>로 간주됩니다.
- 다른 모든 액티비티는 표시되어 있더라도 일시 정지된 상태입니다.
- 그러나 시스템은 이러한 일시 정지되었지만 표시된 액티비티에게 표시되지
-않은 액티비티보다 더 높은 우선 순위를 부여합니다. 사용자가 일시 정지된 액티비티 중 하나와 상호작용하면, 해당
-액티비티가 재개되고 이전의 최상위 액티비티가 일시
-정지됩니다.
-</p>
-
-<p class="note">
- <strong>참고:</strong> 다중 창 모드에서는 앱이 일시 정지된 상태에서도 여전히
-사용자에게 표시될 수 있습니다. 앱이 일시 정지된 동안에도 액티비티를
-계속해야 하는 경우도 있습니다. 예를 들어, 일시 정지 모드이지만 표시된
-동영상 재생 앱은 계속해서 동영상을 보여줘야 합니다. 이러한 이유로, 동영상을
-재생하는 액티비티는 {@link android.app.Activity#onPause onPause()} 핸들러에서
-동영상을 일시 정지하지 <em>않는</em> 것이 좋습니다.
- 그 대신, {@link android.app.Activity#onStop
- onStop()}에서 동영상을 일시 정지하고, {@link android.app.Activity#onStart
- onStart()}에서 재생을 재개해야 합니다.
-</p>
-
-<p>
- 사용자가 앱을 다중 창 모드에 놓으면
-시스템은, <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에 지정된 대로, 구성 변경을 액티비티에
-알려줍니다. 이 동작은 사용자가 앱의 크기를 조정하거나 앱을
- 전체 화면 모드로 다시 전환할 때도 발생합니다.
- 기본적으로, 이 변경에서 액티비티-수명 주기 관계는 기기 모드가
- 세로 모드에서 가로 모드로 전환되었음을
- 시스템이 앱에 알려줄 때와 동일합니다(단순 스왑 대신
- 기기 치수가 변경되는 경우는 제외). <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경 처리</a>에서 설명한
-대로, 액티비티 스스로 구성 변경을 처리하거나, 시스템이 액티비티를 소멸시키고
-새 치수로 다시 액티비티를 생성하도록 할 수
-있습니다.
-</p>
-
-<p>
- 사용자가 창의 크기를 조정하여 한쪽 치수를 더 크게 만드는
-경우, 시스템은 사용자 작업에 맞게 액티비티의 크기를 조정하고 필요한
-경우 <a href="{@docRoot}guide/topics/resources/runtime-changes.html">런타임 변경</a>을 수행합니다. 앱이 새로 노출되는 영역에 그릴 때 지연이 발생하는 경우, 시스템은 {@link
- android.R.attr#windowBackground windowBackground} 속성 또는 기본
-<code>windowBackgroundFallback</code> 스타일 속성에 의해
-지정된 색으로 이 영역을 임시로 채웁니다.
-</p>
-
-<h2 id="configuring">앱을 다중 창 모드로 구성</h2>
-
-<p>
- 앱이 Android N을 대상으로 하는 경우, 앱의 액티비티가 다중
-창 표시를 지원하는지 여부와 지원 방법을 구성할 수 있습니다. 매니페스트에서 속성을 설정하여 크기와 레이아웃을 제어할
-수 있습니다.
- 루트 액티비티의 속성 설정은 작업 스택 내의 모든
- 액티비티에 적용됩니다. 예를 들어, 루트 액티비티의
-<code>android:resizeableActivity</code>가 true로 설정된 경우, 작업 스택에 있는 모든 액티비티의
-크기를 조정할 수 있습니다.
-</p>
-
-<p class="note">
- <strong>참고:</strong> Android N보다 더 낮은 버전의 SDK로 다중 방향 앱을 빌드하는 경우
-사용자가 앱을 다중 창 모드에서 사용하면, 시스템이
-이 앱의 크기를 강제로 조정합니다. 앱이 예상치 못하게 동작할 수 있음을 사용자에게 경고하는
-대화 상자가 표시됩니다. 시스템은 고정
-방향 앱의 크기는 조정하지 <em>않습니다</em>. 사용자가
-다중 창 모드 하에서 고정 방향 앱을 열려고 시도하면,
-앱이 전체 화면을 차지합니다.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- 매니페스트의 <code><activity></code> 또는
-<code><application></code> 노드에서 이 속성을 설정하여 다중 창
-표시를 활성화하거나 비활성화합니다.
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- 이 속성을 true로 설정하면, 액티비티를 분할 화면 모드와 자유형식
-모드로 시작할 수 있습니다. 이 속성을 false로 설정하면, 액티비티가 다중 창 모드를 지원하지
-않습니다. 이 값이 false이고 사용자가
-다중 창 모드에서 액티비티를 시작하려고 시도하면, 액티비티가 전체 화면을
-차지합니다.
-</p>
-
-<p>
- 앱이 Android N을 대상으로 하지만 이 속성에 값을 지정하지
-않은 경우, 이 속성의 기본값은 true가 됩니다.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- 이 속성을 매니페스트의 <code><activity></code> 노드에 설정하여
-액티비티가 PIP 표시를 지원하는지 여부를 나타냅니다. <code>android:resizeableActivity</code>가 false인 경우 이 속성이
-무시됩니다.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">레이아웃 속성</h3>
-
-<p>
- Android N에서 <code><layout></code> 매니페스트 요소는
-다중 창 모드에서 액티비티가 동작하는 방식에 영향을 미치는
-여러 속성을 지원합니다.
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- 자유형식 모드에서 시작될 때 액티비티의 기본 너비.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- 자유형식 모드에서 시작될 때 액티비티의 기본 높이.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- 자유형식 모드에서 시작될 때 액티비티의 초기 배치. 적당한 값은
-{@link android.view.Gravity} 참조를 확인하세요.
- </dd>
-
- <dt>
- <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
- </dt>
-
- <dd>
- 화면 분할
- 및 자유형식 모드에서 액티비티의 최소 높이 및 최소 너비. 사용자가 화면 분할 모드에서 디바이더를 이동하여 액티비티를
-지정된 최소값보다 더 작게 만드는 경우, 시스템은
-이 액티비티를 사용자가 요청한 크기로 자릅니다.
- </dd>
-</dl>
-
-<p>
- 예를 들어, 다음 코드는 액티비티가 자유형식 모드로 표시될
-때 이 액티비티의 기본 크기와 위치 및 최소 크기를
-지정하는 방법을 보여줍니다.
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalHeight="450dp"
- android:minimalWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">앱을 다중 창 모드에서 실행</h2>
-
-<p>
- Android N에서는 다중 창 모드에서 실행 가능한 앱을 지원하는 새로운
-기능을 제공합니다.
-</p>
-
-<h3 id="disabled-features">다중 창 모드에서 비활성화되는 기능</h3>
-
-<p>
- 기기가 다중 창 모드에 있는 경우 일부 기능이 비활성화되거나
-무시되는데, 그 이유는 이들 기능은 기기 화면을 다른 액티비티
-또는 앱과 공유하는 액티비티에는 적합하지 않기 때문입니다. 이러한 기능에는 다음이 포함됩니다.
-
-<ul>
- <li>일부 <a href="{@docRoot}training/system-ui/index.html">시스템 UI</a>
-사용자 지정 옵션이 비활성화됩니다. 예를 들어, 앱이 전체 화면 모드에서 실행되지
-않을 경우에는 상태 표시줄을 숨길 수 없습니다.
- </li>
-
- <li>시스템이 <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code> 속성의 변경을 무시합니다.
- </li>
-</ul>
-
-<h3 id="change-notification">다중 창 변경 알림 및 쿼리</h3>
-
-<p>
- 다중 창 표시를 지원하기 위해 다음과 같은 새 메서드가 {@link android.app.Activity}
- 클래스에 추가되었습니다. 각 메서드에 대한 자세한 내용은
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
-참조</a>를 확인하세요.
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- 액티비티가 다중 창 모드에 있는지를 알아내려면 이 메서드를 호출하세요.
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- 액티비티가 PIP 모드에 있는지를 알아내려면 이 메서드를 호출하세요.
-
- <p class="note">
- <strong>참고:</strong> PIP 모드는 다중 창 모드의 특별한
- 케이스입니다. <code>myActivity.isInPictureInPictureMode()</code>가
-true를 반환하면 <code>myActivity.isInMultiWindowMode()</code>도
-역시 true를 반환합니다.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- 시스템은 액티비티가 다중 창 모드로 들어가거나
- 이 모드에서 나올 때마다 이 메서드를 호출합니다. 시스템은 액티비티가 다중 창 모드로
- 들어갈 때는 true 값을 메서드에 전달하고, 액티비티가 다중 창 모드에서
- 나올 때는 false 값을 전달합니다.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- 시스템은 액티비티가 PIP 모드로 들어가거나
- 이 모드에서 나올 때마다 이 메서드를 호출합니다. 시스템은 액티비티가 PIP 모드로 들어갈 때는
- true 값을 메서드에 전달하고, 액티비티가 PIP에서 나올 때는
- false 값을 전달합니다.
- </dd>
-</dl>
-
-<p>
- 또한 이들 각 메서드의 {@link android.app.Fragment} 버전이
-있습니다(예: <code>Fragment.isInMultiWindowMode()</code>).
-</p>
-
-<h3 id="entering-pip">PIP 모드로 들어가기</h3>
-
-<p>
- 액티비티를 PIP 모드에 두려면, 새로운 메서드인
-<code>Activity.enterPictureInPictureMode()</code>를 호출합니다. 기기가 PIP 모드를 지원하지 않으면 이 메서드는
- 영향이 없습니다. 자세한 내용은
-<a href="picture-in-picture.html">PIP</a> 문서를 참조하세요.
-</p>
-
-<h3 id="launch">다중 창 모드에서 새 액티비티 시작</h3>
-
-<p>
- 새 액티비티를 시작하는 경우, 가능하면 이 새 액티비티가 현재
-액티비티에 인접하여 표시되어야 함을 시스템에게 알려줄 수 있습니다. 이를 위해
-, 플래그
-<code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>를 사용합니다. 이 플래그를 전달하면
-다음과 같은 동작이 요청됩니다.
-</p>
-
-<ul>
- <li>기기가 화면 분할 모드에 있는 경우,
-시스템은 시작한 액티비티 옆에 새 액티비티를 만들려고 시도하므로, 두 액티비티가
-화면을 공유합니다. 시스템이 이 작업을 수행할 수 있다고
-보장되지는 않지만, 가능하면 액티비티를 인접하게 만듭니다.
- </li>
-
- <li>기기가 화면 분할 모드에 있으면, 이 플래그가 영향을 미치지 않습니다.
- </li>
-</ul>
-
-<p>
- 기기가 자유형식 모드에 있고 새 액티비티를 시작 중인 경우,
-<code>ActivityOptions.setLaunchBounds()</code>를 호출하여 이 새 액티비티의 치수와 화면 위치를
-지정할 수 있습니다. 기기가 다중 창 모드에 있지 않으면, 이 메서드가 영향을
-미치지 않습니다.
-</p>
-
-<p class="note">
- <strong>참고:</strong> 작업 스택 내에서 액티비티를 시작하는 경우,
-이 액티비티는 화면상의 액티비티를 대체하여, 모든 다중 창 속성을
-상속합니다. 새 액티비티를 다중 창 모드에서 별도 창으로 시작하려면,
-새 작업 스택에서 액티비티를 시작해야 합니다.
-</p>
-
-<h3 id="dnd">드래그 앤 드롭 지원</h3>
-
-<p>
- 사용자는 두
-액티비티가 화면을 공유하는 동안 한 액티비티에서 다른 액티비티로 데이터를 <a href="{@docRoot}guide/topics/ui/drag-drop.html">드래그 앤 드롭</a>할
-수 있습니다. (이전에는, 사용자가 단일 액티비티 내에서만 데이터를 드래그 앤 드롭할
- 수 있었습니다.) 이러한 이유로, 앱이 현재 지원하지 않는 경우에는 드래그 앤 드롭
-기능을 앱에 추가하는 것이 좋습니다.
-</p>
-
-<p>
- N Preview SDK는 앱 간의 드래그 앤 드롭을 지원하기 위해 <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
-패키지를 확장합니다. 다음과 같은 클래스와 메서드에 대한 자세한
-내용은, <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview
-SDK 참조</a>를 참조하세요.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- 놓기를 수신하는 앱에 부여되는 권한을 지정하기
-위한 토큰 객체.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- {@link android.view.View#startDrag View.startDrag()}의 새 별칭. 액티비티 간의 드래그 앤 드롭을 활성화하려면, 새 플래그
-<code>View.DRAG_FLAG_GLOBAL</code>을
-전달합니다. 수신자 액티비티에게 URI 권한을
-부여해야 하는 경우, 새 플래그
-<code>View.DRAG_FLAG_GLOBAL_URI_READ</code> 또는
-<code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>를 적절하게 전달합니다.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- 현재 진행 중인 드래그 작업을 취소합니다. 드래그 작업을 발생시킨
-앱에 의해서만 호출될 수 있습니다.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- 현재 진행 중인 드래그 작업의 드래그 그림자를 대체합니다. 드래그 작업을 발생시킨
-앱에 의해서만 호출될 수 있습니다.
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- {@link android.view.DragEvent}에 포함된 {@link
-android.content.ClipData}로 전달되는 콘텐츠 URI의 권한을 요청합니다.
- </dd>
-</dl>
-
-<h2 id="testing">앱의 다중 창 지원 테스트</h2>
-
-<p>
- 앱을 Android N용으로 업데이트하든 안하든 간에,
-Android N이 실행 중인 기기에서 사용자가 앱을 다중 창 모드로
-시작하려고 시도하는 경우, 앱이 다중 창 모드에서 어떻게 작동하는지 확인해야 합니다.
-</p>
-
-<h3 id="configuring">테스트 기기 구성</h3>
-
-<p>
- 기기에 Android N을 설치하면, 화면 분할 모드가
-자동으로 지원됩니다.
-</p>
-
-<h3 id="test-non-n">앱이 N Preview SDK로 작성되지 않은 경우</h3>
-
-<p>
- 앱을 N Preview SDK로 빌드하지 않았는데 사용자가
-앱을 다중 창 모드에서 사용하려고 시도하는 경우, 이 앱이 고정 방향을 선언하지
-않으면 시스템이 앱의 크기를 강제로 조정합니다.
-</p>
-
-<p>
- 앱이 고정 방향을 선언하지 않은 경우, Android N이
-실행 중인 기기에서 앱을 시작해야 하며, 앱을 화면 분할 모드에
-두도록 시도해야 합니다. 앱의 크기를 강제로 조정하는 경우 사용자 환경이
-적절한지 확인하세요.
-</p>
-
-<p>
- 앱이 고정 방향을 선언하는 경우, 앱을 다중 창 모드에
-두도록 시도해야 합니다. 이 때 앱이 전체 화면 모드에 남아있는지
-확인하세요.
-</p>
-
-<h3 id="test-mw">다중 창 모드를 지원하는 경우</h3>
-
-<p>
- N Preview SDK로 앱을 작성했는데 다중 창 지원을 비활성화하지
-않은 경우, 화면 분할 및 자유형식 모드에서 다음과
-같은 동작을 확인하세요.
-</p>
-
-<ul>
- <li>앱을 전체 화면 모드에서 시작한 다음, Overview 버튼을 길게 눌러서
-다중 창 모드로 전환합니다. 앱이 적절히 전환되는지 확인합니다.
- </li>
-
- <li>앱을 다중 창 모드에서 직접 시작하고, 이 앱이 적절히
-시작되는지 확인합니다. 다중 창 모드에서 앱을 시작하려면, Overview 버튼을
-누르고 앱의 제목 표시줄을 길게 누른 다음 화면의 강조 표시된 영역 중
-하나로 제목 표시줄을 끌어서 놓습니다.
- </li>
-
- <li>분할선을 끌어서 화면 분할 모드에서 앱의 크기를 조정합니다.
- 작동 중단 없이 앱 크기가 조정되는지 확인하고, 필요한
-UI 요소가 표시되는지 확인합니다.
- </li>
-
- <li>앱에 최소 치수를 지정한 경우, 이 치수 아래로 앱 크기를
-조정해 봅니다. 지정된 최소값보다 더 작게 앱 크기를 조정할 수
-없는지 확인합니다.
- </li>
-
- <li>모든 테스트를 통해 앱의 성능이 적절한지 확인합니다. 예를 들어,
-앱 크기를 조정한 후 UI를 업데이트하기에 지연이
-너무 길지 않은지 확인합니다.
- </li>
-</ul>
-
-<h4 id="test-checklist">테스트 검사 목록</h4>
-
-<p>
- 다중 창 모드에서 앱의 성능을 확인하려면, 다음
-작업을 시도해 보세요. 별다른 설명이 없는 한, 화면 분할 및 다중 창 모드
-에서 모두 이들 작업을 시도해야 합니다.
-</p>
-
-<ul>
- <li>다중 창 모드에 들어갔다 나갑니다.
- </li>
-
- <li>자신의 앱에서 다른 앱으로 전환하고, 앱이 표시는 되지만
-활성화되지 않은 동안에 적절히 동작하는지 확인합니다. 예를 들어, 앱이 동영상을 재생 중인 경우, 사용자가
-다른 앱과 상호작용하는 동안에 이 동영상이 계속 재생되는지
-확인합니다.
- </li>
-
- <li>화면 분할 모드에서, 분할선을 이동하여 앱을 더 크거나
-작게 만들어 봅니다. 앱을 나란히 또는 상하로 놓은 구성에서 이러한
-작업을 시도해 봅니다. 앱의 작동이 중단되지 않는지, 필수 기능이
-표시되는지, 그리고 크기 조정 작업이 너무 오래 걸리지 않는지
-확인합니다.
- </li>
-
- <li>빠르게 연속해서 여러 가지 크기 조정 작업을 수행합니다. 앱의 작동이 중단되거나 메모리가 누수되지
-않는지 확인합니다. 앱의 메모리 사용량을 확인하는
-방법에 대해서는 <a href="{@docRoot}tools/debugging/debugging-memory.html">RAM 사용량
-검사</a>를 참조하세요.
- </li>
-
- <li>여러 가지 다른 창 구성에서 앱을 정상적으로
-사용하고, 이 앱이 제대로 작동하는지 확인합니다. 텍스트를 읽을 수 있는지 확인하고, 해당
-UI 요소가 상호작용하기에 너무 작지 않은지 확인합니다.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">다중 창 지원을 비활성화한 경우</h3>
-
-<p>
- <code>android:resizableActivity="false"</code>를 설정하여
-다중 창 지원을 비활성화한 경우, Android N을 실행 중인 기기에서
-앱을 시작해야 하며, 앱을 자유형식 및 화면
-분할 모드로 둬야 합니다. 이 때 앱이 전체 화면 모드에 남아있는지
-확인하세요.
-</p>
diff --git a/docs/html-intl/intl/ko/preview/features/picture-in-picture.jd b/docs/html-intl/intl/ko/preview/features/picture-in-picture.jd
deleted file mode 100644
index bc6ec62..0000000
--- a/docs/html-intl/intl/ko/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,213 +0,0 @@
-page.title=PIP
-page.keywords=preview, sdk, PIP, Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>이 문서의 내용</h2>
-<ol>
- <li><a href="#declaring">액티비티의
-PIP 지원 선언</a></li>
- <li><a href="#pip_button">액티비티를 PIP로 전환</a>
-</li>
- <li><a href="#handling_ui">PIP에서 UI 처리</a>
-</li>
- <li><a href="#continuing_playback">
-PIP에서 동영상 재생 계속</a></li>
- <li><a href="#single_playback">PIP를 위한 단일 재생 액티비티
-사용</a></li>
- <li><a href="#best">모범 사례</a></li>
-</ol>
-
-<h2>참고 항목</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">다중 창
-지원</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>Android N에서 Android TV 사용자는
-앱 안에서 탐색할 때 화면 모서리의 고정 창에서
-동영상을 볼 수 있습니다. PIP(Picture-In-Picture) 모드를 사용하면
-앱의 백그라운드에서 다른 액티비티를 계속하면서
-고정 창에서 동영상 액티비티를 실행할 수 있습니다. PIP 창에서 사용자는 앱을 사용하는 동안 멀티태스킹이 가능하므로
-생산성이 향상됩니다.</p>
-
-<p>앱이 PIP 모드를 실행할 시기를 결정할 수 있습니다. PIP 모드로 전환하는 시기와 관련된 몇 가지
-예시는 다음과 같습니다.</p>
-
-<ul>
-<li>사용자가 동영상에서 다른 콘텐츠를 탐색하러 이동할 때 앱이
-동영상을 PIP 모드로 전환할 수 있습니다.</li>
-<li>사용자가 콘텐츠 에피소드의 끝부분을 볼 때 앱이
-동영상을 PIP 모드로 전환할 수 있습니다. 메인 화면은 시리즈 다음 에피소드의
-홍보 또는 요약 정보를 표시합니다.</li>
-<li>사용자가 동영상을 보는 동안 앱이
-추가 콘텐츠를 대기열에 올릴 수 있는 방법을 제공할 수 있습니다. 메인 화면에 콘텐츠 선택 액티비티가 표시되는 동안
-동영상이 PIP 모드에서 계속 재생됩니다.</li>
-</ul>
-
-<p>PIP 창은 240x135dp이고
-화면 모서리 4개 중 하나에서 가장 위쪽 레이어에 표시되며, 시스템이 선택합니다. 사용자는
-리모컨의 <b>Home</b> 버튼을 눌러
-PIP 창을 전체 화면으로 전환하거나 PIP를 닫는 PIP 메뉴를 불러올 수 있습니다. 다른 동영상이
-메인 화면에서 재생되기 시작하면 PIP 창이
-자동으로 닫힙니다. 사용자가 Recents를 통해서 PIP 창을 닫을 수도 있습니다.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>그림 1.</strong> 사용자가 메인 화면에서 콘텐츠를 탐색하는 동안
-화면 모서리에 표시되는 PIP 동영상.
-</p>
-
-<p>PIP는 Android N에서 사용할 수 있는 다중 창 API를 사용하여
-고정된 동영상 오버레이 창을 제공합니다. 앱에 PIP를 추가하려면
-PIP를 지원하는 액티비티를 등록하고 필요한 경우 액티비티를 PIP 모드로 전환해야 합니다. 또한
-액티비티가 PIP 모드에 있을 때 UI 요소가 숨겨지고 동영상 재생이
-계속되는지 확인해야 합니다.</p>
-
-<h2 id="declaring">액티비티의 PIP 지원 선언</h2>
-
-<p>기본적으로 시스템은 앱에 대해 PIP를 자동으로 지원하지 않습니다.
-앱에서 PIP를 지원하려면
-<code>android:supportsPictureInPicture</code>와
-<code>android:resizeableActivity</code>를 <code>true</code>로 설정하여 매니페스트에서 동영상 액티비티를
-등록합니다. 또한,
-PIP 모드 전환 시 레이아웃 변경이 일어날 때 액티비티가 다시 시작되지 않도록
-액티비티가 레이아웃 구성 변화를 처리하게 지정합니다.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>액티비티를 등록할 때는 PIP 모드에서
-액티비티가 TV 화면의 작은 오버레이 창에 표시된다는 것을 기억하세요. 최소 UI를 포함한
-동영상 재생 액티비티가 가장 좋은 사용자 환경을 제공합니다. 작은 UI 요소를 포함한
-액티비티는 PIP 모드로 전환할 때
-사용자가 PIP 창의 UI 요소를 상세히 볼 수 없으므로
-좋은 사용자 환경을 제공하지 못할 수 있습니다.</p>
-
-<h2 id="pip_button">액티비티를 PIP로 전환</h2>
-
-액티비티를 PIP 모드로 전환해야 하는 경우
-<code>Activity.enterPictureInPictureMode()</code>를 호출합니다. 다음 예에서는 사용자가
-미디어 컨트롤 막대에서 전용 PIP 버튼을 선택했을 때
-PIP 모드로 전환합니다.</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>미디어 컨트롤 막대에 PIP 버튼을 추가하면
-사용자가 동영상 재생을 제어하면서 PIP 모드로 쉽게 전환할 수 있습니다.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>그림 1.</strong> 미디어 컨트롤 막대의 PIP
-버튼.</p>
-
-<p>Android N에는 컨트롤 막대 PIP 동작을 정의하고 PIP 아이콘을 사용하는 새로운
-<code>PlaybackControlsRow.PictureInPictureAction</code> 클래스가 포함되어 있습니다.
-</p>
-
-<h2 id="handling_ui">PIP에서 UI 처리</h2>
-
-<p>액티비티가 PIP 모드로 전환되면
-동영상 재생만 표시됩니다. 액티비티가 PIP 모드로 전환되기 전에 UI 요소를 제거하고
-액티비티가 다시 전체 화면이 되었을 때 이 요소를 복원합니다.
-필요에 따라 <code>Activity.onPictureInPictureModeChanged()</code> 또는
-<code>Fragment.onPictureInPictureModeChanged()</code>를 재정의하고
-UI 요소를 활성화/비활성화합니다. 예를 들면 다음과 같습니다.</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">PIP에서 동영상 재생 계속
-</h2>
-
-<p>액티비티가 PIP 모드로 전환되면 시스템은
-액티비티가 일시 정지된 상태에 있다고 간주하고 액티비티의 <code>onPause()</code> 메서드를 호출합니다. 동영상
-재생은 일시 정지되어서는 안되며 PIP 모드로 인해 액티비티가 일시 정지되었다면
-계속 재생되어야 합니다. 액티비티의
-<code>onPause()</code> 메서드에서 PIP를 확인하고 적절히 재생을 처리합니다. 예를 들면 다음과 같습니다.
-</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>액티비티가 PIP 모드에서 전체 화면 모드로 전환되면
-시스템이 액티비티를 재시작하고 <code>onResume()</code> 메서드를 호출합니다.</p>
-
-<h2 id="single_playback">PIP를 위한 단일 재생 액티비티
-사용</h2>
-
-<p>동영상 재생 액티비티가 PIP 모드에 있는 동안, 앱에서
-사용자가 메인 화면에서 콘텐츠를 찾아볼 때 새 동영상을 선택할 수도 있습니다. 이 때 새 액티비티를 시작하면
-사용자에게 혼동을 줄 수 있으므로, 새 액티비티를 시작하는 대신
-기존 재생 액티비티에서 새 동영상을 전체 화면 모드로 재생합니다.</p>
-
-<p>동영상 재생 요청에 단일 액티비티가 사용되도록 하고
-필요에 따라 PIP 모드로 들어가거나 PIP 모드에서 나오도록 하려면, 매니페스트에서 액티비티의
-<code>android:launchMode</code>를 <code>singleTask</code>로 설정합니다.
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>액티비티에서 {@link android.app.Activity#onNewIntent
-Activity.onNewIntent()}를 재정의하고 새 동영상을 처리하며, 필요한 경우 기존 동영상
-재생을 중단시키세요.</p>
-
-<h2 id="best">모범 사례</h2>
-
-<p>PIP는 전체 화면 동영상을 재생하는 액티비티용입니다. 액티비티를
-PIP 모드로 전환할 때는 동영상 콘텐츠만 표시하세요.
-<a href="#handling_ui">PIP에서 UI 처리</a>에서 설명한 바와 같이 액티비티가 PIP 모드로 전환되는 때를
-추적하고 UI 요소를 숨깁니다.</p>
-
-<p>PIP 창이 화면 모서리에 떠 있는 창으로 표시되므로
-PIP 창으로 가려질 수 있는 영역에는 메인 화면에서
-중요한 정보를 표시하지 말아야 합니다.</p>
-
-<p>액티비티가 PIP 모드일 때는 기본적으로 입력 포커스를 받지 않습니다. PIP 모드에서
-입력 이벤트를 수신하려면
-<code>MediaSession.setMediaButtonReceiver()</code>를 사용합니다.</p>
diff --git a/docs/html-intl/intl/ko/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/ko/preview/features/scoped-folder-access.jd
deleted file mode 100644
index 2fe02b1..0000000
--- a/docs/html-intl/intl/ko/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,148 +0,0 @@
-page.title=범위가 지정된 디렉터리 액세스
-page.keywords=preview, sdk, 범위가 지정된 디렉터리 액세스
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#accessing">외부 저장소 디렉터리 액세스</a></li>
- <li><a href="#removable">이동식 미디어의 디렉터리 액세스</a></li>
- <li><a href="#best">모범 사례</a></li>
- </ol>
-</div>
-</div>
-
-<p>일반적으로 사진 앱과 같은 앱은
-<code>Pictures</code> 디렉터리 등 외부 저장소의 특정 디렉터리에만 액세스하면 됩니다. 기존 외부 저장소 액세스 방식은
-이런 유형의 앱에 대상화된 디렉터리 액세스를 쉽게
-제공하지 못합니다. 예를 들면 다음과 같습니다.</p>
-
-<ul>
-<li>매니페스트에서 {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-또는 {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE}를 요청하면
-외부 저장소의 모든 공개 디렉터리에 액세스할 수 있습니다.
-이는 앱에 필요한 것보다 과도한 액세스를 제공할 수 있습니다.</li>
-<li>일반적으로,
-<a href="{@docRoot}guide/topics/providers/document-provider.html">저장소
-액세스 프레임워크</a>를 사용하면 시스템 UI를 통해 사용자가 디렉터리를
-선택할 수 있습니다. 앱이 항상 동일한 외부 디렉터리에 액세스한다면
-필요 없는 동작입니다.</li>
-</ul>
-
-<p>Android N은 일반 외부 저장소 디렉터리에 액세스하기 위한
-단순화된 새로운 API를 제공합니다. </p>
-
-<h2 id="accessing">외부 저장소 디렉터리 액세스</h2>
-
-<p><code>StorageManager</code> 클래스를 사용하여 적절한
-<code>StorageVolume</code> 인스턴스를 가져옵니다. 그 후, 해당 인스턴스의
-<code>StorageVolume.createAccessIntent()</code> 메서드를 호출하여 인텐트를 생성합니다.
-이 인텐트로 외부 저장소 디렉터리에 액세스합니다. 이동식 미디어 볼륨을 비롯한
-모든 사용 가능한 볼륨의 목록을 가져오려면
-<code>StorageManager.getVolumesList()</code>를 사용합니다.</p>
-
-<p>특정 파일에 대한 정보가 있으면
-<code>StorageManager.getStorageVolume(File)</code>을 사용하여 해당 파일이 들어 있는
-<code>StorageVolume</code>을 가져옵니다. 이 <code>StorageVolume</code>에서
-<code>createAccessIntent()</code>를 호출하여 파일의 외부 저장소 디렉터리에
-액세스합니다.</p>
-
-<p>
-외부 SD 카드와 같은 보조 볼륨에서는 특정 디렉터리 대신 전체 볼륨에 대한 액세스를 요청하려면
-<code>StorageVolume.createAccessIntent()</code>를 호출할 때
-null을 전달합니다. 기본 볼륨에 null을 전달하거나 잘못된 디렉터리 이름을 전달하는 경우
-<code>StorageVolume.createAccessIntent()</code>는 null을
-반환합니다.
-</p>
-
-<p>다음 코드 조각은 기본 공유 저장소에서
-<code>Pictures</code> 디렉터리를 여는 방법에 대한 예시입니다.</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>시스템이 외부 디렉터리에 액세스 권한을 부여하고자 시도하고,
-필요에 따라 단순화된 UI를 사용하는 사용자의 액세스를 확인합니다.</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>그림 1.</strong> Pictures 디렉터리에
-액세스를 요청하는 애플리케이션.</p>
-
-<p>사용자가 액세스 권한을 부여하면, 시스템이
-<code>Activity.RESULT_OK</code>의 결과 코드가 포함된
-<code>onActivityResult()</code> 재정의와 URI가 포함된 인텐트 데이터를 호출합니다. 제공된
-URI를 사용하여 디렉터리 정보에 액세스합니다.
-<a href="{@docRoot}guide/topics/providers/document-provider.html">저장소
-액세스 프레임워크</a>가
-반환한 URI를 사용하는 것과 유사합니다.</p>
-
-<p>사용자가 액세스 권한을 부여하지 않으면 시스템이
-<code>Activity.RESULT_CANCELED</code>의 결과 코드가 포함된
-<code>onActivityResult()</code> 재정의와 null 인텐트 데이터를 호출합니다.</p>
-
-<p class="note"><b>참고</b>: 특정 외부 디렉터리에 대한 액세스 권한을 얻으면
-해당 디렉터리의 하위 디렉터리에 대한 액세스 권한도 얻게 됩니다.</p>
-
-<h2 id="removable">이동식 미디어의 디렉터리 액세스</h2>
-
-<p>범위가 지정된 디렉터리 액세스를 사용하여 이동식 미디어의 디렉터리에 액세스하려면
-먼저 다음과 같은
-{@link android.os.Environment#MEDIA_MOUNTED} 알림을 수신하는 {@link android.content.BroadcastReceiver}를 추가합니다.</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>사용자가 SD 카드 등의 이동식 미디어를 장착하면 시스템이
-{@link android.os.Environment#MEDIA_MOUNTED} 알림을 보냅니다. 이 알림은
-이동식 미디어 디렉터리에 액세스하는 데 사용할 수 있는 인텐트 데이터의 <code>StorageVolume</code> 객체를
-제공합니다. 다음은
-이동식 미디어의 <code>Pictures</code> 디렉터리에 액세스하는 예시입니다.</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">모범 사례</h2>
-
-<p>가능하면, 사용자에게 액세스 권한을 반복적으로 요청하지 않도록 외부 디렉터리 액세스 URI를
-변경하지 마세요. 사용자가 액세스 권한을 부여하면 디렉터리 액세스 URI로
-<code>getContentResolver().takePersistableUriPermssion()</code>를
-호출합니다. 시스템이 URI를 유지하고 이후 액세스 요청에서는
-<code>RESULT_OK</code>를 반환하고 사용자에게 확인 UI를
-표시하지 않습니다.</p>
-
-<p>사용자가 외부 디렉터리 액세스를 거부하면
-다시 즉시 액세스를 요청하지 마세요. 액세스를 반복적으로 요청하면
-사용자 환경을 저해하는 결과를 낳습니다. 사용자가 요청을 거부하는데 앱이 다시 액세스를
-요청하면, UI에 <b>Don't ask again</b> 체크박스가 표시됩니다.</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>그림 1.</strong> 이동식 미디어에 대해
-다시 액세스 요청을 하는 애플리케이션.</p>
-
-<p>사용자가 <b>Don't ask again</b>을 선택하여 요청을 거부하면 앱에서 해당 디렉터리에 대한 이후의 모든
-요청이 자동으로 거부되고,
-사용자에게는 어떤 요청 UI도 표시되지 않습니다.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/preview/features/security-config.jd b/docs/html-intl/intl/ko/preview/features/security-config.jd
deleted file mode 100644
index 7e3f951..0000000
--- a/docs/html-intl/intl/ko/preview/features/security-config.jd
+++ /dev/null
@@ -1,747 +0,0 @@
-page.title=네트워크 보안 구성
-page.keywords=androidn, 보안, 네트워크
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>이 문서의 내용</h2>
-<ol>
- <li><a href="#manifest">보안 구성 파일 추가</a></li>
- <li><a href="#CustomTrust">신뢰할 수 있는 CA 사용자 지정</a>
- <ol>
- <li><a href="#ConfigCustom">신뢰할 수 있는 사용자 지정 CA 구성</a></li>
- <li><a href="#LimitingCas">신뢰할 수 있는 CA 세트 제한</a></li>
- <li><a href="#TrustingAdditionalCas">추가 CA 신뢰</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">디버그 전용 CA</a></li>
- <li><a href="#UsesCleartextTraffic">일반 텍스트 트래픽 옵트아웃</a></li>
- <li><a href="#CertificatePinning">인증서 고정</a></li>
- <li><a href="#ConfigInheritance">구성 상속 동작</a></li>
- <li><a href="#FileFormat">구성 파일 형식</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N에는 앱 코드를 수정하지 않고 앱이 안전한 선언
-구성 파일에서 네트워크 보안 설정을 사용자 지정할 수 있는
-네트워크 보안 구성 기능이 포함되어 있습니다. 이 설정은
-특정 도메인과 특정 앱에 대해 구성할 수 있습니다. 이 기능의
-핵심 기능:
-</p>
-
-<ul>
- <li>
- <b>사용자 지정 신뢰 앵커:</b> 앱의 보안 연결에 대해 신뢰할 수 있는 인증 기관(CA)을
-사용자 지정합니다. 예를 들어,
-특정한 자체 서명 인증서를 신뢰하거나
-앱이 신뢰하는 공개 CA 세트를 제한합니다.
- </li>
-
- <li>
- <b>디버그 전용 재정의:</b> 설치된 기반에 위험을 더하지 않고도, 앱의 보안 연결을 안전하게
-디버그할 수 있습니다.
- </li>
-
- <li>
- <b>일반 텍스트 트래픽 옵트아웃:</b> 일반 텍스트 트래픽을 실수로 사용하지
-않도록 앱을 보호합니다.
- </li>
-
- <li>
- <b>인증서 고정:</b> 앱의 안전한 연결을 특정 인증서로
-제한합니다.
- </li>
-</ul>
-
-
-<h2 id="manifest">보안 구성 파일 추가</h2>
-
-<p>
- 네트워크 보안 구성 기능은 XML 파일을 사용해서
-앱의 설정을 지정합니다. 앱 매니페스트에 이 파일을 가리키는 항목을
-포함해야 합니다. 매니페스트에서 발췌한 다음 코드는
-이 항목을 생성하는 방법을 보여줍니다.
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application ... >
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">신뢰할 수 있는 CA 사용자 지정</h2>
-
-<p>
- 앱에서 플랫폼 기본값 대신 사용자 지정 CA 세트를
-신뢰하고자 할 수 있습니다. 가장 일반적인 이유는 다음과 같습니다.
-</p>
-
-<ul>
- <li>사용자 지정 인증 기관(자체 서명한 인증서,
-국제 기업 CA에서 발급한 인증서 등)을 포함한 호스트에 연결.
- </li>
-
- <li>모든 사전 설치된 CA 대신 신뢰할 수 있는 CA로만
-CA 세트를 제한.
- </li>
-
- <li>시스템에 포함되지 않은 추가 CA 신뢰.
- </li>
-</ul>
-
-<p>
- 기본적으로 모든 앱으로부터 안전한(예: TLS, HTTPS) 연결은 사전 설치된 시스템 CA를 신뢰하고,
-API 레벨 23(Android M)
-이하를 대상으로 하는 앱도 사용자가 추가한 CA 저장소를 기본적으로 신뢰합니다. 앱은
-{@code base-config}(앱
-전체 사용자 지정) 또는 {@code domain-config}(도메인별
-사용자 지정)를 사용하여 연결을 사용자 지정할 수 있습니다.
-</p>
-
-
-<h3 id="ConfigCustom">사용자 지정 CA 구성</h3>
-
-<p>
- 자체 서명된
-인증서를 사용하는 호스트나 신뢰할 수 있는 비공개 CA(예: 사내 CA)에서 발급한 SSL 인증서를 사용하는 호스트에
-연결할 경우를 가정합시다.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- 자체 서명된 인증서 또는 비공개 CA 인증서를 PEM 또는 DER 형식으로
-{@code res/raw/my_ca}에 추가합니다.
-</p>
-
-
-<h3 id="LimitingCas">신뢰할 수 있는 CA 세트 제한</h3>
-
-<p>
- 앱에서 시스템이 신뢰하는 CA 중 일부를 신뢰하지 않으려면, 대신
-신뢰할 CA 세트를 줄여서 지정할 수 있습니다. 이 방법은
-다른 CA에서 발급된 허위 인증서로부터 앱을 보호해줍니다.
-</p>
-
-<p>
- 신뢰할 수 있는 CA 세트를 제한하는 구성은 특정 도메인에서 <a href="#TrustingACustomCa">사용자 지정 CA를 신뢰</a>하는 것과 비슷하지만
-여러 CA가 리소스에서 제공된다는 점이 다릅니다.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- 신뢰할 수 있는 CA를 PEM 또는 DER 형식으로 {@code res/raw/trusted_roots}에 추가합니다.
- PEM 형식을 사용할 경우 파일에 PEM 데이터<em>만</em> 포함되고
-다른 추가 텍스트가 포함되어서는 안 됩니다. 또한 한 개가 아니라 여러 개의
-<a href="#certificates"><code><certificates></code></a>
-요소를 제공할 수 있습니다.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- 추가 CA 신뢰
-</h3>
-
-<p>
- 앱에서 시스템이 신뢰하지 않는 CA를 신뢰하고자 한다면,
-이는 시스템에 해당 CA가 아직 포함되지 않았거나 CA가 Android 시스템에 포함되기 위한
-요구사항을 충족하지 못했기 때문일 수 있습니다. 앱은
-구성에 대해 여러 개의 인증서 소스를 지정하여
-신뢰할 수 있는 CA를 추가할 수 있습니다.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">디버그용 CA 구성</h2>
-
-<p>
- HTTPS로 연결되는 앱을 디버그할 때
-프로덕션 서버에 SSL 인증서가 없는 로컬 개발 서버로
-연결하고자 할 수도 있습니다. 앱 코드를 수정하지 않고 이 기능을 지원하려면,
-{@code debug-overrides}를
-사용하여 <i>오직</i> <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
-이 {@code true}일 때만 신뢰할 수 있는 디버그 전용 CA를 지정할 수 있습니다. 일반적으로 IDE 및 빌드 도구는 비 릴리스 빌드에 대해
- 이 플래그를 자동으로 설정합니다.
-</p>
-
-<p>
- 보안 예방 조치로 앱 스토어에서
-디버그 가능으로 표시된 앱은 허용하지 않기 때문에
-일반적인 조건 코드보다 안전합니다.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">일반 텍스트 트래픽 옵트아웃</h2>
-
-<p>
- 보안 연결만 사용하여 대상에 연결하는 애플리케이션은 해당
-대상에 대해 일반 텍스트를 지원하는 기능(HTTPS 대신 암호화되지 않은 HTTP
-프로토콜 사용)을 옵트아웃할 수 있습니다. 이 옵션은
-백엔드 서버 등의 외부 소스가 제공하는 URL의 변경 사항으로 인해
-앱에서 우연히 회귀가 일어나지 않도록 예방합니다.
- 자세한 내용은 {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()}를 참조하세요.
-</p>
-
-<p>
- 예를 들어, 앱에서 적대적 네트워크로부터 민감한 트래픽을 보호하기 위해 {@code
- secure.example.com}에 대한 연결은 항상 HTTPS를 통해서만 수행되도록
-할 수 있습니다.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">인증서 고정</h2>
-
-<p>
- 일반적으로 앱은 모든 사전 설치된 CA를 신뢰합니다. 이러한 CA에서
-허위 인증서를 발급한다면 앱이 MiTM
-공격에 노출될 위험이 있습니다. 일부 앱은 신뢰하는 CA 세트를 제한하거나
-인증서를 고정하는 방식으로 허용하는 인증서 세트를 제한합니다.
-</p>
-
-<p>
- 인증서 고정은
-공개 키 해시(X.509인증서의 SubjectPublicKeyInfo)로 인증서 세트를 제공하는 방식으로 수행됩니다. 그러면 인증서 체인에
-하나 이상의 고정된 공개 키가 있어야만
-인증서 체인이 유효합니다.
-</p>
-
-<p>
- 인증서 고정을 사용할 때는 언제나 백업 키를 포함해야
-새로운 키로 강제 전환하거나 CA를 변경할 경우(
-CA 인증서 또는 해당 CA의 중간 CA에 고정할 경우)
-앱 연결이 영향을 받지 않습니다. 그렇지 않으면
-연결을 복구하기 위해 앱에 업데이트를 내보내야 합니다.
-</p>
-
-<p>
- 또한, 고정을 수행하지 않게 되면 핀 만료 시간을
-설정할 수 있습니다. 이는 업데이트되지 않은 앱에서
-연결 문제를 예방해 줍니다. 그러나 핀에 만료 시간을 설정하면
-고정 우회가 가능할 수도 있습니다.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">구성 상속 동작</h2>
-
-<p>
- 특정 구성에서 설정되지 않은 값을 상속합니다. 이 동작은 구성 파일을 읽을 수 있게 유지하면서도
-더욱 복잡한 구성이 가능합니다.
-</p>
-
-<p>
- 특정 항목에 값이 설정되지 않았다면
-그 다음으로 일반적인 항목의 값이 사용됩니다. {@code domain-config}에서 설정되지 않은 값은
-중첩될 경우 상위 {@code domain-config}에서 가져오고 그렇지 않을 경우 {@code
- base-config}에서 가져옵니다. {@code base-config}에서 설정되지 않은 값은
-플랫폼 기본값을 사용합니다.
-</p>
-
-<p>
- 예를 들어, {@code
- example.com}의 하위 도메인에 대한 모든 연결은 사용자 지정 CA 세트를 사용해야 합니다. 또한, 이러한 도메인에 대한 일반 텍스트 트래픽은
-{@code
- secure.example.com}에 연결할 때를 <em>제외</em>하고 허용됩니다. {@code example.com} 구성 내부에 {@code
- secure.example.com} 구성을 중첩하면
-{@code trust-anchors}를 복제하지 않아도 됩니다.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">구성 파일 형식</h2>
-
-<p>
- 네트워크 보안 구성 기능은 XML 파일 형식을 사용합니다.
- 파일의 전반적 구조는 다음 코드 샘플에 나타나 있습니다.
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- 다음 섹션에서는 이 파일 형식의 구문과
-기타 세부 정보를 설명합니다.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 다음을 포함할 수 있습니다.
- </dt>
-
- <dd>
- <code><a href="#base-config"><base-config></a></code> 0 또는 1개<br>
- <code><a href=
- "#domain-config"><domain-config></a></code> 임의의 개수<br>
- <code><a href="#debug-overrides"><debug-overrides></a></code> 0 또는 1개
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 구문:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- 다음을 포함할 수 있습니다.
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 설명:
- </dt>
-
- <dd>
- 대상이
-<a href="#domain-config"><code>domain-config</code></a>에 포함되지 않는 모든 연결에서 사용하는 기본 구성.
-
-<p>
- 설정되지 않은 값은 플랫폼 기본값을 사용합니다. API 레벨 24 이상을 대상으로 하는
-앱의 기본 구성:
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-API 레벨 23 이하를 대상으로 하는 앱의 기본 구성:
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>구문:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>다음을 포함할 수 있습니다.</dt>
-
-<dd>
-<code><a href="#domain"><domain></a></code> 1개 이상
-<br/><code><a href="#trust-anchors"><trust-anchors></a></code> 0 또는 1개
-<br/><code><a href="#pin-set"><pin-set></code></a> 0 또는 1개
-<br/>중첩된 <code><domain-config></code> 임의의 개수</dd>
-
-<dt>설명</dt>
-<dd>{@code domain} 요소에서 정의한 특정 대상에 대한 연결에 사용되는 구성.
-
-<p>여러 {@code domain-config} 요소에서 대상을 포함하는 경우 가장 구체적인(긴)
-일치 도메인이 포함된 구성이 사용됩니다.</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- 구문:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- 속성:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- {@code "true"}인 경우 이 도메인 규칙이 도메인 및 모든 하위 도메인(하위 도메인의 하위 도메인 포함)과
-일치합니다. 그렇지 않을 경우 이 규칙은
-정확한 일치에만 적용됩니다.
- </dd>
- </dl>
- </dd>
-
- <dt>
- 설명:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- 구문:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- 다음을 포함할 수 있습니다.
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code> 0 또는 1개
- </dd>
-
- <dt>
- 설명:
- </dt>
-
- <dd>
- <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
-가 {@code "true"}일 때 재정의를 적용합니다. 일반적으로
-IDE와 빌드 도구에서 생성한 비 릴리스 빌드에 해당합니다. {@code
- debug-overrides}에서 지정된 신뢰 앵커를 모든 다른 구성에 추가하고,
-서버의 인증서 체인이 이러한
-디버그 전용 신뢰 앵커 중 하나를 사용하면 고정을 수행하지 않습니다. <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
-이 {@code "false"}이면 이 섹션은 완전히 무시합니다.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- 구문:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- 다음을 포함할 수 있습니다.
- </dt>
-
- <dd>
- <code><a href="#certificates"><certificates></a></code> 임의의 개수
- </dd>
-
- <dt>
- 설명:
- </dt>
-
- <dd>
- 보안 연결에 대한 신뢰 앵커 세트.
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>구문:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>설명:</dt>
-<dd>{@code trust-anchors} 요소에 대한 X.509 인증서 세트.</dd>
-
-<dt>속성:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-CA 인증서 소스는 다음 중 하나가 될 수 있습니다.
-<ul>
- <li>X.509 인증서를 포함한 파일을 가리키는 원시 리소스 ID.
- 인증서는 DER 또는 PEM 형식으로 암호화해야 합니다. PEM 인증서의 경우,
-파일에는 코멘트와 같은 PEM이 아닌 추가 데이터가
-포함되어서는 <em>안 됩니다</em>.
- </li>
-
- <li>사전 설치된 시스템 CA 인증서의 {@code "system"}
- </li>
-
- <li>사용자가 추가한 CA 인증서의 {@code "user"}
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- 이 소스의 CA가 인증서 고정을 우회할지 지정합니다. {@code
- "true"}이고 인증서 체인이 이 소스의 CA 중 하나를 통해 묶일 경우
-고정을 수행하지 않습니다. 디버그 CA 또는
-사용자가 앱의 보안 트래픽을 MiTM하도록 지원할 때 유용합니다.
- </p>
-
- <p>
- {@code debug-overrides}
-요소에서 지정되지 않은 경우 기본값은 {@code "false"}입니다. 지정된 경우 기본값은 {@code "true"}입니다.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- 구문:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- 다음을 포함할 수 있습니다.
- </dt>
-
- <dd>
- <code><a href="#pin"><pin></a></code> 임의의 개수
- </dd>
-
- <dt>
- 설명:
- </dt>
-
- <dd>
- 공개 키 핀 세트. 신뢰할 수 있는 보안 연결은
-신뢰 체인의 공개 키 중 하나가 핀 세트에 포함되어야 합니다. 핀 형식은
-<code><a href="#pin"><pin></a></code>를 참조하세요.
- </dd>
-
- <dt>
- 속성:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- 핀 만료 당일과 그 이후의 {@code yyyy-MM-dd} 형식 날짜로,
-핀이 비활성화됩니다. 이 속성이 설정되지 않으면
-핀이 만료되지 않습니다.
- <p>
- 만료는 어떤 이유(사용자가 앱 업데이트를 비활성화)로
- PIN 세트가 업데이트되지 않는 앱에서
- 연결 문제를 예방하는 데 유용합니다.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- 구문:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- 속성:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- PIN을 생성하는 데 사용된 다이제스트 알고리즘. 현재
-{@code "SHA-256"}만 지원됩니다.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/ko/preview/features/tv-recording-api.jd b/docs/html-intl/intl/ko/preview/features/tv-recording-api.jd
deleted file mode 100644
index f353cc6..0000000
--- a/docs/html-intl/intl/ko/preview/features/tv-recording-api.jd
+++ /dev/null
@@ -1,142 +0,0 @@
-page.title=TV 녹화
-page.keywords=preview, sdk, tv, 녹화
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#supporting">녹화 지원 나타내기</a></li>
- <li><a href="#recording">세션 녹화</a></li>
- <li><a href="#errors">녹화 오류 처리</a></li>
- <li><a href="#sessions">녹화된 세션 관리</a></li>
- <li><a href="#best">모범 사례</a></li>
- </ol>
-</div>
-</div>
-
-<p>TV 입력 서비스를 이용하면
-타임 시프팅 API를 통해 채널 재생을 일시 정지했다가 다시 시작할 수 있습니다. Android N에서는 사용자가 여러 개의 녹화된 세션을 저장할 수 있도록 함으로써
-타임 시프팅을 확장합니다.</p>
-
-<p>사용자는 미리 녹화를 예약하거나 프로그램을 보면서 녹화를
-시작할 수 있습니다. 시스템이 녹화물을 저장하면 사용자는 시스템 TV 앱을 사용하여
-녹화물을 탐색, 관리, 재생할 수 있습니다.</p>
-
-<p>TV 입력 서비스에 녹화 기능을 제공하고 싶다면,
-앱이 녹화를 지원함을 시스템에 나타내야 하고,
-프로그램 녹화 기능을 구현해야 하고, 녹화 중 발생하는 오류를 처리 및 전달해야 하고,
-녹화된 세션을 관리해야 합니다.</p>
-
-<p class="note"><strong>참고:</strong> Live Channels 앱에서는
-사용자가 녹화물을 만들거나 이에 액세스하는 방법을 아직 제공하지 않습니다. Live Channels 앱에
-대한 변경이 이루어질 때까지는, TV 입력 서비스에 대한 녹화
-환경을 완전히 테스트하기 어려울 수 있습니다.</p>
-
-<h2 id="supporting">녹화 지원 나타내기</h2>
-
-<p>TV 입력 서비스가 녹화를 지원함을 시스템에 알리려면
-서비스 메타데이터 XML 파일에서
-<code>android:canRecord</code> 속성을 <code>true</code>로 설정하세요.
-</p>
-
-<pre>
-<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
- <b>android:canRecord="true"</b>
- android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
-</pre>
-
-<p>서비스 메타데이터 파일에 대한 자세한 내용은
-<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">매니페스트에서 TV 입력
-서비스 선언</a>을 참조하세요.
-</p>
-
-<p>또는 다음 단계에 따라 녹화 지원 사실을 코드에
-표시할 수 있습니다.</p>
-
-<ol>
-<li><code>TvInputService.onCreate()</code> 메서드에서 <code>TvInputInfo.Builder</code>
-클래스를 사용하여 새로운
-<code>TvInputInfo</code> 객체를 생성합니다.</li>
-<li>새로운 <code>TvInputInfo</code> 객체를 생성할 때, <code>build()</code>를 호출하기 전에
-<code>setCanRecord(true)</code>를 호출하여
-서비스가 녹화를 지원함을 나타냅니다.</li>
-<li>
-<code>TvInputManager.updateTvInputInfo()</code>를 호출하여 시스템에 <code>TvInputInfo</code> 객체를 등록합니다.</li>
-</ol>
-
-<h2 id="recording">세션 녹화</h2>
-
-<p>TV 입력 서비스가 녹화 기능을 지원하도록 등록한 후,
-시스템은 앱의 녹화 구현에 액세스해야 할 때
-<code>TvInputService.onCreateRecordingSession()</code>을 호출합니다.
- 자체적인
-<code>TvInputService.RecordingSession</code> 서브클래스를 구현하고
-<code>onCreateRecordingSession()</code> 콜백이
-실행되면 이를 반환합니다. 이 서브클래스는 정확한 채널 데이터로 전환하고,
-요청된 데이터를 녹화하고, 녹화 상태와 오류를 시스템에
-전송하는 역할을 담당합니다.</p>
-
-<p>시스템이 <code>RecordingSession.onTune()</code>을 호출하면
-채널 URI에 전달되고, URI가 지정하는 채널에 맞춰 조정됩니다.
-<code>notifyTuned()</code>를 호출해서 앱이 원하는 채널에 맞춰졌음을 시스템에 알리거나
-앱이 적절한 채널에 맞출 수 없으면
-<code>notifyError()</code>를 호출합니다.</p>
-
-<p>이어서 시스템이 <code>RecordingSession.onStartRecording()</code>
-콜백을 호출합니다. 앱이 즉시 녹화를 시작해야 합니다. 시스템이 이 콜백을 호출하면,
-녹화될 프로그램에 관한 정보가 포함된 URI를 제공할 수 있습니다.
- 녹화가 완료되면 이
-데이터를 <code>RecordedPrograms</code> 데이터 테이블에 복사해야 합니다.</p>
-
-<p>마지막으로 시스템이 <code>RecordingSession.onStopRecording()</code>을 호출합니다.
-이 시점에서 앱이 즉시 녹화를 중단해야 합니다. 또한,
-<code>RecordedPrograms</code> 테이블에서 항목을 생성해야 합니다. 이 항목에는
-<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> 열의 녹화된 세션 데이터 URI,
-최초
-<code>onStartRecording()</code> 호출에서 시스템이 제공한 프로그램 정보가 포함됩니다.
-</p>
-
-<p><code>RecordedPrograms</code> 테이블에 액세스하는 자세한 방법은
-<a href="#sessions">녹화된 세션 관리</a>를 참조하세요.</p>
-
-<h2 id="errors">녹화 오류 처리</h2>
-
-<p>녹화 중에 오류가 발생해서 녹화된 데이터 렌더링을 사용할 수 없을 경우,
-<code>RecordingSession.notifyError()</code>를 호출하여 시스템에 알립니다.
-마찬가지로 녹화 세션이 생성된 이후 <code>notifyError()</code>를 호출하여
-앱이 더 이상 세션을 녹화하지 못한다는 것을 시스템에 알릴 수 있습니다.</p>
-
-<p>녹화 중에 오류가 발생했지만
-사용자에게 재생 가능한 부분 녹화물을 제공하고 싶다면
-<code>RecordingSession.notifyRecordingStopped()</code>를 호출하여 시스템이
-부분 세션을 사용할 수 있게 합니다.</p>
-
-<h2 id="sessions">녹화된 세션 관리</h2>
-
-<p>시스템은 <code>TvContract.RecordedPrograms</code>
-콘텐츠 제공자 테이블에 모든 녹화 가능한 채널 앱에서 녹화된
-모든 세션에 관한 정보를 보관합니다. 이 정보는
-<code>RecordedPrograms.Uri</code> 콘텐츠 URI를 통해 액세스할 수 있습니다. 콘텐츠 제공자 API를 사용하여
-이 테이블의 항목을 읽고, 추가하고, 삭제합니다.</p>
-
-<p>콘텐츠 제공자 데이터에 관한 자세한 정보는
-<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
-콘텐츠 제공자 기본 정보</a>를 참조하세요.</p>
-
-<h2 id="best">모범 사례</h2>
-
-<p>TV 기기는 저장소가 제한될 수 있으므로
-녹화된 세션을 저장할 저장소를 할당할 때는 신중히 판단하세요. 녹화된 세션을 저장할 공간이 부족할 때는
-<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code>를 사용하세요.
-</p>
-
-<p>사용자가 녹화를 시작하면 최대한 빨리 데이터 녹화를
-시작해야 합니다. 이를 용이하게 하려면
-시스템이
-<code>onCreateRecordingSession()</code> 콜백을 호출할 때 저장소 액세스 및 할당 등과 같이 선행 시간이 많이 걸리는 작업을 완료합니다. 이렇게 하면
-<code>onStartRecording()</code> 콜백이
-실행될 때 즉시 녹화를 시작할 수 있습니다.</p>
diff --git a/docs/html-intl/intl/ko/preview/guide.jd b/docs/html-intl/intl/ko/preview/guide.jd
deleted file mode 100644
index d7ea7e3..0000000
--- a/docs/html-intl/intl/ko/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=테스트 가이드
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>이 문서의 내용</h2>
- <ol>
- <li><a href="#runtime-permissions">권한 테스트</a></li>
- <li><a href="#doze-standby">잠자기 및 앱 대기 모드 테스트</a></li>
- <li><a href="#ids">자동 백업 및 기기 식별자</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N에서는 앱이 차기 버전의 플랫폼에서 제대로 작동하는지 확인해볼 수 있습니다.
- 이 프리뷰에는 앱에 영향을 미칠 수 있는 수많은 API와 동작 변경 사항이 포함되어 있습니다. 이에 대해서는 <a href="{@docRoot}preview/api-overview.html">API 개요</a>와 <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>에 설명되어 있습니다.
-
- 프리뷰로 앱을 테스트할 때에는 사용자에게 좋은 환경을 제공하기 위해 개발자 여러분이 꼭 초점을 맞춰야 하는 몇 가지 특정한 시스템 변경사항이 있습니다.
-
-
-</p>
-
-<p>
- 이 가이드에서는 앱에서 테스트할 프리뷰 기능은 어떤 것이고, 테스트 방법은 어떤지에 대해 설명합니다. 이와 같은 특정 프리뷰 기능을 먼저 테스트하는 것이 좋습니다. 왜냐하면 이들 기능은 앱의 동작에 큰 영향을 미칠 가능성이 높기 때문입니다.
-
-
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">권한</a>
- </li>
- <li><a href="#doze-standby">잠자기 및 앱 대기 모드</a>
- </li>
- <li><a href="#ids">자동 백업 및 기기 식별자</a></li>
-</ul>
-
-<p>
- 테스트용 프리뷰 시스템 이미지로 기기 또는 가상 기기를 설정하는 방법에 대한 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html">Android N SDK 설정</a>을 참조하세요.
-
-
-</p>
-
-
-<h2 id="runtime-permissions">권한 테스트</h2>
-
-<p>
- 새로운 <a href="{@docRoot}preview/features/runtime-permissions.html">권한</a> 모델은 사용자가 여러분의 앱에 권한을 할당하는 방법을 바꿔 놓습니다.
- 설치 절차 중에 모든 권한을 허용하는 것이 아니라, 앱이 런타임에 사용자에게 각각의 권한을 요청해야 합니다.
-
- 사용자 입장에서는 이러한 동작으로 각 앱의 액티비티에 대해 더 세분화된 제어권을 행사할 수 있을 뿐만 아니라 이 앱이 어째서 특정한 권한을 요청하고 있는 것인지 맥락을 더 잘 이해할 수 있게 되기도 합니다.
- 사용자는 언제든 앱에 개별적으로 권한을 허용할 수 있고, 이를 취소할 수도 있습니다.
- 미리 보기의 이러한 기능은 앱의 동작에 영향을 미칠 가능성이 가장 높고, 앱의 몇 가지 기능이 작동하지 않도록 막거나 저하된 상태로 작동하게 할 수도 있습니다.
-
-
-</p>
-
-<p class="caution">
- 이 변경 내용은 새 플랫폼에서 실행되는 모든 앱에 영향을 비치며, 새 플랫폼 버전을 대상으로 하지 않는 앱도 예외가 아닙니다.
- 레거시 앱에 대해 플랫폼이 제한된 호환성 동작을 제공하기는 하지만, 지금 바로 새 권한 모델로 앱의 마이그레이션 계획을 시작하는 편이 좋습니다. 플랫폼이 공식적으로 출시될 때에 맞춰 앱의 업데이트된 버전을 게시하는 것을 목표로 하십시오.
-
-
-</p>
-
-
-<h3 id="permission-test-tips">테스트 팁</h3>
-
-<p>
- 다음은 새 권한 동작에 대해 앱 테스트를 계획하고 실행하는 데 유용한 몇 가지 테스트 팁입니다.
-
-</p>
-
-<ul>
- <li>앱의 현재 권한과 관련된 코드 경로를 확인합니다.</li>
- <li>권한 보호된 서비스 및 데이터 전반에 걸친 사용자 흐름을 테스트합니다.</li>
- <li>허용된/취소된 권한을 여러 가지로 조합하여 테스트합니다.</li>
- <li>명령줄에서 권한을 관리할 때 {@code adb} 도구를 사용합니다.
- <ul>
- <li>권한과 상태를 그룹별로 목록으로 나열합니다.
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>하나 이상의 권한을 다음과 같은 구문을 사용하여 허용하거나 취소합니다.<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>권한을 사용하는 서비스에 대해 앱을 분석해봅니다.</li>
-</ul>
-
-<h3 id="permission-test-strategy">테스트 전략</h3>
-
-<p>
- 권한을 변경하면 앱의 구조와 디자인은 물론 사용자 환경과, 개발자가 사용자에게 제공하는 흐름에도 영향을 미칩니다.
- 앱의 현재 권한 사용 내용을 평가한 다음 제공하고자 하는 새로운 흐름을 계획하기 시작해야 합니다.
- 플랫폼의 공식 릴리스에서 호환성 동작을 제공할 예정이지만, 이와 같은 동작에만 의존하지 말고 앱 업데이트를 계획하는 것이 좋습니다.
-
-
-</p>
-
-<p>
- 앱이 실제로 필요로 하고 사용하는 권한을 확인한 다음, 권한 보호된 서비스를 사용하는 여러 가지 코드 경로를 찾습니다.
- 이렇게 하려면 새 플랫폼에서 여러 가지로 조합한 테스트를 거치고 코드 분석을 통해야 합니다.
- 테스트에서는 런타임 권한에 옵트인하는 것에 초점을 맞춰야 합니다. 이를 위해 앱의 {@code targetSdkVersion}을 프리뷰 버전으로 변경하세요.
- 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html#">Android N SDK 설정</a>을 참조하세요.
-
-
-</p>
-
-<p>
- 다양한 조합의 권한을 해지하고 추가하는 방식으로 테스트를 수행하여 권한에 종속되는 사용자 흐름을 파악합니다.
- 종속성이 분명하지 않거나 논리적인 경우, 리팩터링을 고려해 보거나 해당 흐름을 구분하여 종속성을 제거, 또는 해당 권한이 왜 필요한지 분명히 하는 방안을 고려해야 합니다.
-
-
-</p>
-
-<p>
- 런타임 권한의 동작, 테스트 및 모범 사례에 대한 자세한 정보는 <a href="{@docRoot}preview/features/runtime-permissions.html">권한</a> 개발자 미리 보기 페이지를 참조하십시오.
-
-
-</p>
-
-
-<h2 id="doze-standby">잠자기 및 앱 대기 모드 테스트</h2>
-
-<p>
- 잠자기 및 앱 대기 모드의 절전 기능은 기기가 유휴 상태에 있을 때 또는 사용자가 앱에 초점을 맞추고 있지 않을 때 앱이 수행할 수 있는 배경 처리의 양을 제한합니다.
- 시스템이 앱에 부과할 수 있는 제한 사항에는 네트워크 액세스를 제한하거나 없애기, 배경 작업을 일시 중지시키기, 알림 일시 중지, 절전 모드 해제 및 알람 요청 무시 등이 포함됩니다.
-
- 이러한 절전 기능에 앱이 적절히 동작하도록 확실히 해 두려면 이와 같은 저전력 상태를 시뮬레이트하여 앱을 테스트해보아야 합니다.
-
-
-</p>
-
-<h4 id="doze">앱에서 잠자기 모드 테스트하기</h4>
-
-<p>앱에서 잠자기 모드를 테스트하려면:</p>
-
-<ol>
-<li>Android N 시스템 이미지로 하드웨어 기기 또는 가상 기기를 구성합니다.</li>
-<li>기기를 개발 머신에 연결하고 앱을 설치합니다.</li>
-<li>앱을 실행시킨 다음 활성 상태로 그냥 둡니다.</li>
-<li>다음 명령을 실행하여 기기가 잠자기 모드에 들어가는 것을 시뮬레이션합니다.
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>기기가 다시 활성화되면 앱이 어떻게 동작하는지 살펴봅니다. 기기가 잠자기 모드를 종료할 때 정상적으로 복구되는지 확인해야 합니다.
-</li>
-</ol>
-
-
-<h4 id="standby">앱에서 앱 대기 모드 테스트하기</h4>
-
-<p>앱에서 앱 대기 모드를 테스트하려면:</p>
-
-<ol>
- <li>Android N 시스템 이미지로 하드웨어 기기 또는 가상 기기를 구성합니다.</li>
- <li>기기를 개발 머신에 연결하고 앱을 설치합니다.</li>
- <li>앱을 실행시킨 다음 활성 상태로 그냥 둡니다.</li>
- <li>다음 명령을 실행하여 앱이 대기 모드에 들어가는 것을 시뮬레이션합니다.
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>다음 명령을 사용하여 앱이 대기 모드에서 해제되는 것을 시뮬레이션합니다.
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>앱이 대기 모드에서 해제된 상태에서 어떻게 동작하는지 살펴봅니다. 대기 모드에서 정상적으로 복구되는지 확인해야 합니다.
- 특히, 앱의 알림과 배경 작업이 계속 예상했던 대로 기능하는지 확인해야 합니다.
-</li>
-</ol>
-
-<h2 id="ids">앱용 자동 백업 및 기기별 식별자</h2>
-
-<p>앱이 내부 저장소에서 각 기기에 따라 다른 식별자(예: Google Cloud Messaging 등록 ID)를 유지하는 경우, 모범 사례를 따라 저장소 위치를 자동 백업에서 배제해야 합니다. 이 내용은 <a href="{@docRoot}preview/backup/index.html">앱용 자동 백업</a>에 설명되어 있습니다.
-
-
-
- </p>
diff --git a/docs/html-intl/intl/ko/preview/license.jd b/docs/html-intl/intl/ko/preview/license.jd
deleted file mode 100644
index 875ec85..0000000
--- a/docs/html-intl/intl/ko/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=라이선스 계약
-
-@jd:body
-
-<p>
-Android SDK Preview를 시작하려면 우선 다음과 같은 사용 약관에 동의해야 합니다.
-아래에 설명한 바와 같이, 이것은 Android SDK의 프리뷰 버전이며 변경될 가능성이 있고 이를 사용하는 위험 부담은 계약자 본인에게 있음을 유의하십시오. Android SDK Preview는 안정된 릴리스가 아니며, 오류나 결함이 들어있을 수 있고 이 때문에 컴퓨터 시스템, 기기 및 데이터에 심각한 손상을 초래할 수 있습니다.
-</p>
-
-<p>
-이것은 Android SDK Preview 라이선스 계약서입니다(이하 "라이선스 계약").
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. 개요
-
-1.1 Android SDK Preview(본 라이선스 계약에서는 "Preview"라고 칭하며, 구체적으로 Android 시스템 파일, 패키지 API 및 Preview 라이브러리 파일이 사용 가능한 경우와 사용 가능해진 경우 이들 파일을 포함한 것임)는 본 라이선스 계약 조건에 따라 계약자에게 사용을 허여합니다. 본 라이선스 계약은 Preview 사용과 관련하여 계약자와 Google 간에 법적 구속력이 있는 계약을 체결합니다.
-
-1.2 "Android"는 기기를 위한 Android 소프트웨어 스택을 의미합니다. 이는 http://source.android.com/ URL에 위치하며 수시로 업데이트되는 Android 오픈 소스 프로젝트에서 제공됩니다.
-
-1.3 "Android 호환"은 (i) Android 호환성 웹사이트(http://source.android.com/compatibility)에서 찾을 수 있고 간혹 업데이트되는 Android 호환성 정의 문서를 준수하며; (ii) Android CTS(Compatibility Test Suite)를 성공적으로 통과한 모든 Android 구현을 의미합니다.
-
-1.4 "Google"은 미국 1600 Amphitheatre Parkway, Mountain View, CA 94043에 본사를 두고 있는 델라웨어주 법인인 Google Inc.를 의미합니다.
-
-2. 라이선스 계약에 동의
-
-2.1 이 Preview를 사용하려면, 먼저 라이선스 계약에 동의해야 합니다. 이 라이선스 계약에 동의하지 않고 Preview를 사용해서는 안 됩니다.
-
-2.2 수락을 클릭하거나 Preview를 사용, 또는 이 두 행위를 모두 수행하면 본 라이선스 계약 조건에 동의하는 것으로 간주됩니다.
-
-2.3 미국법 또는 현재 거주 중이거나 Preview를 사용하는 국가를 포함하여 다른 국가의 법에 따라 Preview를 받는 것이 금지된 경우, Preview를 사용할 수 없으며 본 라이선스 계약을 수락할 수 없습니다.
-
-2.4 회사 또는 단체 내에서 내부적으로 Preview를 사용하며 고용주 또는 기타 단체를 대신하여 본 라이선스 계약 준수에 동의하는 경우, 계약자의 고용주나 그 단체에 본 라이선스 계약에 대한 구속력을 부여할 수 있는 모든 법적 권한을 계약자가 갖고 있음을 진술하고 보증합니다. 구속력을 부여할 수 있는 법적 권한이 없을 경우, 고용주 또는 기타 단체를 대신하여 본 라이선스 계약에 동의하거나 Preview를 사용할 수 없습니다.
-
-3. Google의 Preview 라이선스
-
-3.1 본 라이선스 계약의 조건에 따라 Google은 계약자에게 한정적이며 전 세계적으로 무료로 사용이 가능하고 양도할 수 없고 비독점적이며 2차 라이선스를 불허하는 Preview 사용 라이선스를 부여합니다. 이 라이선스 하에서 계약자는 Android 플랫폼에서 실행되는 애플리케이션을 개발하는 경우에만 Preview를 사용할 수 있습니다.
-
-3.2 이 Preview를 사용하여 다른 플랫폼용 애플리케이션을 개발하거나(Android 비호환 구현 포함) 다른 SDK를 개발할 수 없습니다. 물론 이 Preview가 이러한 목적에 사용되지 않는 경우 Android의 비호환 구현을 포함한 다른 플랫폼용 애플리케이션을 자유롭게 개발할 수 있습니다.
-
-3.3 계약자는 Preview에 존재하는 지적 재산권을 포함하여 Preview에 대한 모든 법적인 권리, 소유권 및 이익이 Google 또는 제3자에게 있음에 동의합니다. "지적 재산권"은 모든 특허법, 저작권법, 영업비밀법, 상표법 하의 모든 권리 및 기타 모든 소유권을 의미합니다. Google은 계약자에게 명시적으로 부여하지 않은 모든 권리를 보유합니다.
-
-3.4 본 라이선스 계약에 명시적으로 허용된 용도 외에는 Preview를 사용할 수 없습니다. 해당 제3자 라이선스 요건이 허용하는 범위를 제외하고 계약자는 Preview의 파생 제품이나 Preview의 일부분을 (a) 복사(백업 목적 제외), 수정, 개작, 재배포, 역컴파일, 리버스 엔지니어링, 분해하거나 이를 통해 파생물을 생성하거나 (b) 개인 컴퓨터를 제외한 모바일 단말기 또는 기타 모든 하드웨어 기기에 Preview의 일부를 로드하거나, Preview의 일부를 다른 소프트웨어와 결합하거나 Preview의 일부가 통합된 일체의 소프트웨어나 기기를 배포해서는 안 됩니다.
-
-3.5 오픈 소스 소프트웨어 라이선스에 의거한 Preview 구성요소의 사용, 재생산, 배포에는 본 라이선스 계약이 아닌, 해당 오픈 소스 소프트웨어 라이선스의 조건이 적용됩니다. 계약자는 허용된 모든 권한 하에서 그러한 오픈 소스 소프트웨어 라이선스에 관해 충실한 피허가자로서의 자세를 견지할 것이며 그러한 권한을 종료, 일시 중단 또는 침해하는 행위를 삼갈 것을 동의합니다.
-
-3.6 계약자는 Google이 제공하는 Preview의 형태 및 특성이 사전 통지 없이 변경될 수 있음에 동의하며, 이전 버전의 Preview에서 개발된 애플리케이션이 이후 버전의 Preview와 호환되지 않을 수 있음에 동의합니다. 계약자는 계약자 또는 사용자에게 사전 통지 없이 Preview(또는 Preview에 포함된 기능) 제공을 (영구적 또는 일시적으로) 중단할 수 있는 권한이 Google에게 있음에 동의합니다.
-
-3.7 본 라이선스 계약은 계약자에게 Google의 상표명, 상표, 서비스 표시, 로고, 도메인 이름, 기타 독특한 브랜드 특징에 대한 사용 권한을 부여하지 않습니다.
-
-3.8 계약자는 Preview에 부착되어 있거나 포함되어 있는 모든 소유권 고지 사항(저작권 및 상표 고지 사항 포함)을 제거, 변경 또는 불분명하게 만들지 않을 것에 동의합니다.
-
-4. 계약자의 Preview 사용
-
-4.1 Google은 본 라이선스 계약의 어떤 조항도 계약자(또는 계약자의 사용 허가자)가 Preview를 사용하여 개발한 소프트웨어 애플리케이션에 대한 권리, 소유권 또는 이익, 그리고 해당 애플리케이션에 존재하는 모든 지적 재산권을 부여하지 않는다는 점에 동의합니다.
-
-4.2 계약자는 (a) 본 라이선스 계약 그리고 (b) 모든 준거법, 규정 또는 관련 관할권 내에서 일반적으로 수용되는 관행 또는 지침(미국 또는 기타 관련 국가로/에서의 데이터 또는 소프트웨어 수출과 관련된 모든 법률 포함)에서 허용하는 용도에 한하여 Preview를 사용하고 애플리케이션을 작성하는 것에 동의합니다.
-
-4.3 계약자는 일반 대중 사용자를 대상으로 Preview를 사용하여 애플리케이션을 개발하는 경우, 해당 사용자의 프라이버시 및 법적 권리를 보호하는 것에 동의합니다. 사용자가 계약자에게 사용자 이름, 비밀번호 또는 기타 로그인 정보나 개인 정보를 제공하는 경우, 계약자는 제공된 정보가 자신의 애플리케이션에 제공된다는 사실을 사용자에게 알려야 하며, 반드시 법적으로 적절한 개인정보 보호정책 고지 및 보호를 해당 사용자에게 제공해야 합니다. 애플리케이션에서 사용자가 제공한 개인 정보나 민감한 정보를 저장하는 경우, 이를 안전하게 처리해야 합니다. 사용자들이 애플리케이션에 Google 계정 정보를 제공하는 경우, 애플리케이션은 해당 사용자의 Google 계정에 액세스하는 목적으로만, 그리고 각 사용자가 허용한 범위 내의 한정된 목적으로만 이러한 정보를 사용해야 합니다.
-
-4.4 계약자는 Google 또는 기타 모든 타사의 서버, 네트워크 또는 기타 모든 재산 또는 서비스를 허가 없이 방해, 교란, 손상 또는 액세스하는 애플리케이션의 개발 또는 배포를 포함한 하등의 행위에 Preview를 이용하지 않을 것임을 동의합니다.
-
-4.5 계약자는 자신이 Android 및/또는 Android용 애플리케이션을 통해 생성, 전송 또는 표시하는 모든 데이터, 콘텐츠 또는 리소스 그리고 그로 인한 결과(Google이 입을 수 있는 모든 피해나 손실 포함)에 대해 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
-
-4.6 계약자는 본 라이선스 계약, 모든 해당 제3자 계약 또는 서비스 약관, 또는 모든 준거법 또는 규정에 의거한 계약자 의무 위반, 그리고 그로 인한 결과(Google 또는 제3자가 입을 수 있는 모든 피해나 손실 포함)에 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
-
-4.7 이 Preview는 현재 개발 단계에 있으며, 계약자의 테스트와 피드백은 그러한 개발 과정에 중요한 부분을 차지합니다. Preview를 사용함으로써 계약자는 일부 기능의 구현은 아직 개발 중인 상태이며 Preview가 안정된 릴리스처럼 완벽하게 기능할 것이라 믿고 사용해서는 안 된다는 점을 인지하는 것으로 간주합니다. 계약자는 이 Preview를 사용한 애플리케이션을 공개적으로 배포 또는 배송하지 않기로 동의합니다. 이 Preview는 공식 Android SDK가 출시된 이후에는 더 이상 지원되지 않기 때문입니다.
-
-5. 계약자의 개발자 자격 증명
-
-5.1 계약자는 Google이 발급했거나 자신이 선택한 모든 개발자 자격 증명에 대한 기밀성을 유지할 책임이 있으며 계약자의 개발자 자격 증명 하에 개발된 모든 애플리케이션에 대한 전적인 책임이 있음에 동의합니다.
-
-6. 개인정보 보호정책 및 정보
-
-6.1 Preview를 지속적으로 혁신하고 개선하기 위해, Google은 고유 식별자, 관련 IP 주소, 소프트웨어 버전 번호, Preview에서 사용 중인 도구 및/또는 서비스와 도구의 사용법에 대한 정보를 포함하되 이에 국한되지 않고 소프트웨어에서 특정 사용량 통계 정보를 수집할 수 있습니다. 그러한 정보를 수집하기 전에 Preview는 계약자에게 이를 통지하고 동의를 구할 것입니다. 계약자가 동의하지 않을 경우 정보를 수집하지 않습니다.
-
-6.2 수집된 데이터는 모두 취합된 형태로 Preview 개선을 위해 검토되며, Google의 개인정보 보호정책에 따라 유지 관리됩니다. 이 정보는 http://www.google.com/policies/privacy/를 참조하십시오.
-
-7. 제3자 애플리케이션
-
-7.1 제3자가 개발한 애플리케이션을 실행하거나 제3자가 제공한 데이터, 콘텐츠 또는 리소스에 액세스하기 위해 Preview를 사용하는 경우, 계약자는 Google이 그러한 애플리케이션, 데이터, 콘텐츠 또는 리소스에 대한 책임이 없음에 동의합니다. 계약자는 그러한 제3자 애플리케이션을 통해 자신이 액세스한 모든 데이터, 콘텐츠 또는 리소스에 대한 책임은 그것을 만든 사람에게 있음에 동의합니다. 또한 계약자가 그러한 모든 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스를 사용하거나 액세스함으로써 비롯된 모든 피해나 손실에 대한 책임이 Google에게 없음에 동의합니다.
-
-7.2 그러한 제3자 애플리케이션을 통해 계약자에게 제공된 데이터, 콘텐츠 그리고 리소스는 그것을 제공한 제공자(또는 제공자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 유의해야 합니다. 그러한 데이터, 콘텐츠 또는 리소스(전부 또는 일부)를 수정, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다. 단, 관련 소유자로부터 그러한 작업을 수행해도 좋다는 허락을 받은 경우에는 예외입니다.
-
-7.3 계약자는 그러한 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스의 사용은 계약자와 관련 제3자 간에 체결하는 별도의 계약 조건의 적용을 받는다는 것을 인정합니다.
-
-8. Google API 사용
-
-8.1 Google API
-
-8.1.1 Google에서 데이터를 검색하기 위해 API를 사용하는 경우, 그러한 데이터가 Google 또는 데이터를 제공하는 당사자(또는 당사자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 인정합니다. 그러한 API를 사용하는 경우, 추가적인 서비스 약관의 적용을 받을 수 있습니다. 관련 서비스 약관에 허용되지 않은 한, 그러한 데이터(전부 또는 일부)를 변경, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다.
-
-8.1.2 Google에서 사용자 데이터를 검색하기 위해 API를 사용하는 경우, 계약자는 사용자로부터 명시적인 동의를 얻은 경우에 한하여, 그리고 해당 사용자가 허용한 범위 내의 한정된 목적으로만 데이터를 검색해야 합니다.
-
-9. 라이선스 계약 종료
-
-9.1 본 라이선스 계약은 계약자 또는 Google에 의해 아래와 같은 조건 하에 종료될 때까지 계속 적용됩니다.
-
-9.2 계약자가 라이선스 계약을 종료하고자 하는 경우, Preview 및 관련 개발자 자격 증명 일체의 사용을 중단하는 것으로 그러한 의사를 피력할 수 있습니다.
-
-9.3 Google은 언제든 이유 여하를 불문하고 계약자에게 통고하여 라이선스 계약을 종료할 수 있습니다.
-
-9.4 본 라이선스 계약은 통보 또는 여타의 행위 없이도 자동으로 종료됩니다. 이에 해당되려면 다음과 같은 조건이 수반되어야 합니다.
-(A) Google이 계약자가 거주하는 국가 또는 계약자가 서비스를 사용하는 지역에서 Preview 또는 Preview의 특정 부분 제공을 중지하는 경우 및
-(B) Google이 Android SDK의 최종 릴리스 버전을 발행하는 경우.
-
-9.5 본 라이선스 계약이 종료되면 라이선스 계약으로 계약자에게 허용한 라이선스가 취소되며, 이에 따라 계약자는 Preview 사용을 즉시 모두 중단해야 하고 제 10, 11, 12 및 14절의 조항이 기한 없이 유지됩니다.
-
-10. 면책 조항
-
-10.1 계약자는 Preview 이용에 대한 위험 부담이 전적으로 본인에게 있으며, Google이 일체의 보증 없이 Preview를 "있는 그대로" 그리고 "이용 가능한" 상태로 제공한다는 것을 분명히 이해하고 동의합니다.
-
-10.2 Preview 이용 및 이용 과정에서 다운로드하거나 얻게 되는 모든 자료를 사용하는 것은 본인의 재량에 따르며 이에 대한 위험 부담이 전적으로 본인에게 있으며, 그러한 사용으로 인해 발생하는 컴퓨터 시스템 또는 다른 기기의 손상 또는 데이터 손실에 대한 책임은 전적으로 본인에게 있습니다. 전술한 조항을 제한하지 않는 범위 내에서 계약자는 미리 보기가 안정된 릴리스가 아니며 오류, 결함 및 보안 취약성이 포함되어 있을 수 있어 그 결과로 중대한 손상을 유발할 수 있다는 점을 이해하는 것으로 간주합니다. 여기에는 계약자의 컴퓨터 시스템 또는 기타 기기의 완전하고 돌이킬 수 없는 손실도 포함됩니다.
-
-10.3 더 나아가, Google은 상품성, 특정 목적에 대한 적합성 및 비침해의 묵시적 보증 등을 포함하되 이에 국한되지 않고 명시적이든 묵시적이든 모든 종류의 보증 및 조건을 명시적으로 부인합니다.
-
-11. 책임 한계
-
-11.1 계약자는 계약자에게 발생할 수 있는 직접, 간접, 부수적, 특별, 결과적 또는 징벌적 손해에 대해 그 어떤 책임 이론에 근거해서도 Google, 해당 자회사, 계열사 및 사용 허가자가 어떠한 책임도 지지 아니함을 분명히 이해하고 동의합니다. 이러한 손해에는 Google 또는 해당 대리자가 이러한 손실 발생 가능성에 대해 통지를 받았거나 이러한 사항을 인식했는지에 상관없이 모든 데이터 손실이 포함됩니다.
-
-12. 면책
-
-12.1 법률에 의해 허용되는 최대한의 범위 안에서 계약자는 (a) 미리 보기 사용, (b) 계약자가 미리 보기에서 개발한 일체의 애플리케이션에서 초래된 모든 사람의 저작권, 상표, 영업비밀, 트레이드 드레스, 특허 또는 기타 지적 재산권의 침해, 또는 어떤 사람의 명예를 훼손하거나 초상권 또는 개인정보 보호정책을 침해함 또는 (C)계약자 본인이 본 라이선스 계약을 위반함으로써 발생하거나 생기는 모든 청구, 조치, 소송 또는 절차, 그리고 모든 손실, 책임, 손해, 경비(합리적인 변호사 비용 포함)로부터 Google을 옹호하고, 면책시키고, Google이 손해를 입지 않도록 하는 데 동의합니다.
-
-13. 라이선스 계약 변경
-
-13.1 미리 보기의 새로운 버전을 배포할 때, Google은 본 라이선스 계약의 내용을 변경할 수 있습니다. 그러한 변경이 이뤄진 경우, Google은 미리 보기가 제공되는 웹사이트에 새로운 라이선스 계약 버전을 게재할 것입니다.
-
-14. 일반 법적 조건
-
-14.1 본 라이선스 계약은 계약자와 Google 간의 모든 법적 계약을 구성하며, 계약자의 미리 보기 사용을 규제하고(별도의 서면 계약을 통해 Google이 계약자에게 제공하는 모든 서비스는 제외), 미리 보기와 관련하여 이전에 계약자와 Google이 맺은 모든 계약을 완전히 대체합니다.
-
-14.2 계약자는 Google이 라이선스 계약에 포함된(또는 관련 법률에 의해 Google이 향유하는) 법적 권리 또는 구제수단을 행사하거나 집행하지 않더라도, Google이 권리를 공식적으로 포기한 것으로 간주하지 않으며, Google이 계속해서 그러한 권리 또는 구제수단을 이용할 수 있음에 동의합니다.
-
-14.3 본 라이선스 계약의 조항이 무효라고 이 사안에 관한 판결을 할 수 있는 관할권을 가진 법원이 판결할 경우, 그 조항은 라이선스 계약의 나머지 조항에 영향을 미치지 않는 형태로 라이선스 계약에서 제거됩니다. 본 라이선스 계약의 나머지 조항은 여전히 유효하며 집행 가능합니다.
-
-14.4 계약자는 Google이 모회사가 되는 회사 그룹에 속한 각 회사가 본 라이선스 계약의 제3수익자이며, 그러한 다른 회사들이 그들에게 이익(또는 유리한 권리)을 부여하는 본 라이선스 계약의 모든 조항을 직접 행사하고 적용할 수 있는 권리를 가진다는 데 동의합니다. 그 외에는 다른 어떤 개인이나 회사도 본 라이선스 계약의 제3수익자가 될 수 없습니다.
-
-14.5 수출 규제. Preview는 미국의 수출법과 규정의 적용을 받습니다. 계약자는 Preview에 적용되는 모든 국내 및 국제 수출법과 규정을 준수해야 합니다. 그러한 법에는 수출 대상국, 최종 사용자 및 최종 용도에 대한 제한이 포함됩니다.
-
-14.6 계약자 또는 Google은 상대 당사자의 사전 서면 승인 없이 본 라이선스 계약에서 부여된 권리를 제3자에게 양도하거나 이전할 수 없으며, 그러한 승인 없이 이루어진 양도 시도는 모두 무효입니다. 계약자는 Google의 사전 승인 없이 본 라이선스 계약 상의 책임 또는 의무를 위임할 수 없습니다.
-
-14.7 본 라이선스 계약, 그리고 본 라이선스 계약 상의 계약자와 Google의 관계는 법률 조항 간의 충돌과는 무관하게 캘리포니아주법에 의한 규제를 받습니다. 계약자와 Google은 본 라이선스 계약으로부터 발생하는 모든 법적 문제 해결을 캘리포니아주 산타 클라라(Santa Clara) 카운티 내에 소재한 전속 관할 법원에 의뢰하는 것에 동의합니다. 위 규정에도 불구하고, 계약자는 Google이 여전히 모든 관할권에서 강제 구제책(또는 동등한 유형의 긴급 법적 구제)을 신청할 수 있음에 동의합니다.
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/preview/overview.jd b/docs/html-intl/intl/ko/preview/overview.jd
deleted file mode 100644
index 0b14413..0000000
--- a/docs/html-intl/intl/ko/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=프로그램 개요
-page.metaDescription=앱에서 차기 버전의 Android를 사용할 수 있도록 준비하세요.
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- <strong>Android N Developer Preview</strong>에 오신 것을 환영합니다. 이 프로그램은 차기 버전의 Android에 대해 앱을 테스트하고 최적화하는 데 필요한 모든 것을 제공합니다.
-
- 이 프로그램은 무료이고, N Developer Preview 도구를 다운로드하기만 하면 바로 시작할 수 있습니다.
-
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- 하드웨어 및 에뮬레이터 이미지
- </h5>
-
- <p>
- 다양한 기기 또는 에뮬레이터에서 앱을 실행하고 테스트하세요.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 최신 플랫폼 코드
- </h5>
-
- <p>
- Preview 동안 월별 업데이트를 제공할 예정이며 따라서 여러분은 항상 최신 플랫폼 변경에 대해 테스트할 수 있습니다.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 개발자 문제에 우선 순위 부여
- </h5>
-
- <p>
- Google에서는 처음 몇 주 동안 개발자가 보고한 문제에 우선 순위를 부여할 예정이므로,
-가능한 빨리 테스트하고 피드백을 보내 주세요.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- 새로운 동작 및 기능
- </h5>
-
- <p>
- 새로운 플랫폼 동작을 지원하고 새로운 기능으로 개발하려면 작업을 일찍 시작하세요.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- OTA를 통한 업데이트 제공
- </h5>
-
- <p>
- Android 베타 프로그램을 통해 지원되는 모든 기기에 대해 원활한 OTA 업데이트가 제공됩니다.
- 플래시가 필요 없습니다.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 피드백 및 지원
- </h5>
-
- <p>
- Google의 <a href="{@docRoot}preview/bug">Issue Tracker</a>를 사용해 문제를 보고하고 피드백을 보내 주세요.
- <a href="{@docRoot}preview/dev-community">N 개발자 커뮤니티</a>에서는 다른 개발자들과 의견을 주고받을 수 있습니다.
-
-
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">일정 및 업데이트</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- N Developer Preview의 운영 기간은 2016년 3월 9일부터 2016년 3분기로 예정된 AOSP 및 OEM에 대한 Android N 최종 공개 릴리스 때까지입니다.
-
-</p>
-
-<p>
- 개발 단계의 중요 마일스톤에 다다를 때마다 개발 및 테스트 환경을 위한 업데이트가 제공될 것입니다.
- 일반적으로는 매월(4~6주 간격) 업데이트를 제공할 예정입니다.
- 마일스톤은 다음과 같습니다.
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong>(최초 릴리스, 알파)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong>(증분 업데이트, 알파)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong>(증분 업데이트, 베타)</li>
- <li><strong>Preview 4</strong>(최종 API 및 공식 SDK, Play 게시)</li>
- <li><strong>Preview 5</strong>(최종 테스트를 위한 거의 최종 시스템 이미지)</li>
- <li>AOSP 및 에코시스템에 <strong>최종 릴리스</strong></li>
-</ul>
-
-<p>
- 각 업데이트에는 SDK 도구, 프리뷰 시스템 이미지, 에뮬레이터, 참조 문서 및 API 차이 등이 포함됩니다.
-
-</p>
-
-<p>
- <strong>첫 3단계 프리뷰 마일스톤</strong>에서는 현재 앱의 호환성 문제를 확인하고 새 플랫폼을 대상으로 하는 데 필요한 마이그레이션 또는 주요 작업을 계획하는 데 도움이 되는 <strong>조기 테스트 및 개발 환경</strong>을 제공합니다.
-
-
- 이 기간은 기능과 API 및 파일 호환성 문제에 대한 피드백을 제공하는 우선 순위 기간입니다. 이 모든 경우에 대해 <a href="{@docRoot}preview/bug">Issue Tracker</a>를 사용하세요.
-
-
- 업데이트 과정에서 일부 API가 변경될 수 있습니다.
-</p>
-
-<p>
- <strong>Preview 4 및 5</strong>에서는 개발에 사용할 <strong>최종 N API 및 SDK</strong>와 최종 버전에 가까운 시스템 이미지에 액세스할 수 있으며, 시스템 동작과 기능을 테스트할 수 있습니다.
-
- 이 시점에서 Android N은 표준 API 레벨을 제공합니다.
- 레거시 앱의 최종 호환성 테스트를 시작할 수 있으며 N API 또는 기능을 사용하는 새 코드를 개선할 수 있습니다.
-
-</p>
-
-<p>
- 또한 Preview 4부터는 공식 API 레벨에서 Android N이 실행되는 <strong>기기(예: Android 베타 프로그램에 옵트인한 소비자 기기)에 앱을 게시</strong>할 수 있습니다.
-
- Google Play 알파 및 베타 채널에 먼저 게시할 수 있으므로, Play 스토어에 광범위하게 배포하기 전에 Android 베타 소비자를 통해 앱을 테스트할 수 있습니다.
-
-
-
-</p>
-
-<p>
- Android N에서 테스트와 개발을 수행하는 동안, 프리뷰 업데이트가 출시되는 것에 맞춰 <strong>개발 환경을 최신 상태로 유지</strong>할 것을 적극 권장합니다.
-
- 이 과정을 손쉽게 진행하기 위해 테스트 기기를 Android 베타 프로그램에 등록하고 각 마일스톤에서 <strong>OTA 업데이트</strong>를 받을 수 있습니다.
-
- 또는 업데이트된 프리뷰 이미지를 수동으로 다운로드하고 플래시할 수도 있습니다.
-
-</p>
-
-<p>
- 프리뷰 업데이트가 제공될 때마다 <a href="http://android-developers.blogspot.com/">Android 개발자 블로그</a>, 이 사이트 및 <a href="{@docRoot}preview/dev-community">Android N 개발자 커뮤니티</a>를 통해서 알려드릴 것입니다.
-
-
-</p>
-
-
-<h2 id="preview_tools">N Developer Preview에 포함된 내용</h2>
-
-<p>
- N Developer Preview에는
-기존 앱을 다양한 화면 크기, 네트워크 기술, CPU/GPU 칩셋
-및 하드웨어 아키텍처에서 테스트하는 데 필요한 모든 것이 포함되어 있습니다.
-</p>
-
-<h3 id="sdk_tools">SDK 도구</h3>
-
-<p>이러한 구성 요소는 <a href="{@docRoot}studio/intro/update.html">Android Studio</a>에서 SDK Manager를 통해 다운로드할 수 있습니다.</p>
-
-<ul>
- <li> N Developer Preview <strong>SDK 및 도구</strong>
- <li> N Developer Preview <strong>에뮬레이터 시스템 이미지</strong>(32비트 및 64비트)
- <li> N Developer Preview <strong>Android TV용 에뮬레이터 시스템 이미지</strong>(32비트)
- <li> N Developer Preview 지원 라이브러리(새로운 앱 템플릿용)
-</ul>
-
-<p>
- 필요에 따라 각 마일스톤에서 이러한 개발 도구를 업데이트할 것입니다.
-</p>
-
-<h3 id="hardware_system_images">하드웨어 시스템 이미지</h3>
-
-<p>
- N Developer Preview에는 물리적 기기에서 테스트하고 개발할 때 사용할 수 있는 다른 하드웨어 시스템 이미지와 Nexus가 포함되어 있습니다.
- 하드웨어 이미지의 전체 목록을 보려면 <a href="{@docRoot}preview/download.html">기기 이미지</a> 페이지를 참조하세요.
-
-</p>
-
-<p>
- 각 마일스톤 때마다 이들 기기에 대한 업데이트된 시스템 이미지가 제공될 것입니다. 업데이트된 시스템 이미지를 필요한 만큼 자주 다운로드하여 테스트 기기에 수동으로 플래시할 수 있습니다.
-
- 이것은 기기를 여러 번 다시 플래시해야 하는 자동화된 테스트 환경에 특히 유용합니다.
-
-
-</p>
-
-<p class="note"><strong>참고</strong>:
- <strong>수동으로 플래시된 기기는 지난 해 프리뷰와 마찬가지로 OTA 업데이트를 받지 못합니다</strong>.
- 올해에는 Android 베타 프로그램에 기기를 등록해야만 OTA 업데이트를 받을 수 있습니다. 자세한 내용은 다음 섹션을 참조하세요.
-
-</p>
-
-<h3 id="android_beta">Android 베타 프로그램을 통한 OTA 업데이트</h3>
-
-<p>
- Android N에서는 프로그램에 등록한 기기에 Android N의 최신 프리뷰 업데이트를 자동으로 직접 전송해 주는 OTA(Over-the-Air) 업데이트 프로그램을 새로 도입했습니다.
-
- 이 프로그램은 무료이고 Google 계정에 등록된 지원 기기를 가지고 계신 사람이라면 누구나 사용할 수 있습니다.
-
-</p>
-
-<p>
- 프로그램에 등록하려면 <a href="https://g.co/androidbeta">Android 베타 프로그램</a> 사이트를 방문하세요.
- 계정에 등록된 기기 중에서 Android 베타에 등록할 수 있는 기기를 모두 확인할 수 있습니다.
-
-
-</p>
-
-<ol>
- <li> Android N 업데이트를 받을 기기를 선택합니다.
- <li> Enroll을 클릭하고 사용 약관을 읽고 동의한 후, OK를 클릭합니다.
-</ol>
-
-<p>
- 등록을 마치면 곧바로 기기에서 업데이트를 수신합니다. 대부분의 경우, Android N으로 전환하기 위해 데이터를 완전히 초기화할 필요는 없지만, 잃고 싶지 않은 데이터가 있다면 기기를 등록하기 전에 이 데이터를 백업하는 것이 좋습니다.
-
-
-
-</p>
-
-<p>
- 업데이트가 기기에 전송되면, 가급적 빨리 업데이트를 다운로드하고 설치하는 것이 좋습니다.
- 시스템 UI, 동작, API 및 기능의 최신 변경사항에 맞춰 기기를 최신으로 유지할 수 있습니다.
-
-</p>
-
-<p>
- Developer Preview가 마무리되면, 귀하의 등록된 기기가 공식 Android N 릴리스 업데이트를 받게 됩니다.
-
-</p>
-
-<p>
- Android 베타 사이트에서 언제든지 Android 베타 프로그램으로부터 기기 등록을 해제할 수 있습니다.
- 등록을 해제하기 전에 기기에서 데이터를 백업하세요.
-
-</p>
-
- <p class="note"><strong>참고</strong>:
- 등록을 해제하면 Android 6.0 Marshmallow의 최신 버전(기기 등록 전에 설치한 버전이 아닐 수도 있음)으로 <strong>기기가 공장 초기화됩니다</strong>.
-
-
- 클린 설치를 위해서 연락처, 메시지, 사진 등의 데이터가 기기에서 지워집니다.
-
-
-</p>
-
-<h3 id="documentation_and_sample_code">문서 및 샘플 코드</h3>
-
-<p>
- Developer Preview 사이트에서 다음과 같은 문서 리소스를 이용할 수 있으며,
-Android N에 대해 익히는 데 유용합니다.
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Android
-N용 개발 설정</a>에는
-시작하는 데 필요한 단계별 지침이 포함되어 있습니다.</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>에서는 테스트할 주요 영역을 알려줍니다.
-</li>
- <li> 새 API에 관련된 문서 중에는 <a href="{@docRoot}preview/api-overview.html">API 개요</a>, 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a> 그리고 다중 창 지원, 묶음 알림, 다중 로케일 지원 등과 같은 주요 기능에 대한 상세 개발자 가이드도 포함되어 있습니다.
-
-
-
- <li> <a href="{@docRoot}preview/samples.html">샘플 코드</a>에서는 권한과 새로운 기타 기능을 지원하는 방법을 보여줍니다.
-
- <li> <a href="{@docRoot}preview/support.html#release-notes">릴리스 노트</a>를
-보면 N Developer Preview의 현재 버전에 대한 변경 사항과 차이점 보고서 등 관련 정보를
-확인할 수 있습니다.
-</ul>
-
-<h4 id="reference">다운로드 가능한 API 참조</h4>
-
-<p>
- 초기 프리뷰 업데이트 중에, 최신 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Android N 플랫폼용 API 참조</a>를 별도의 zip 아카이브로 다운로드할 수 있습니다.
-
- 이 참조 다운로드에는 또한 API 23 및 이전 업데이트에서 API 변경사항을 확인하는 데 유용한 차이점 보고서도 포함되어 있습니다.
-
-
-</p>
-
-<p>
- Android N API가 최종 버전이고 공식 API 레벨이 할당되면, 저희가 <a href="https://developer.android.com">https://developer.android.com</a>에서 온라인으로 API 참조를 제공해 드릴 것입니다.
-
-</p>
-
-<h3 id="support_resources">
- 지원 리소스
-</h3>
-
-<p>
- N Developer Preview에서 테스트와 개발을 수행하면서 다음 채널을 활용하여 문제를 보고하고 피드백을 제공해 주세요.
-
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue Tracker</a>는 <strong>기본 피드백 채널</strong>입니다.
- Issue Tracker를 통해 버그, 성능 문제 및 전반적인 피드백을 보고할 수 있습니다.
- 또한, <a href="{@docRoot}preview/bugs">알려진 문제</a>를 확인하고 해결 방법을 찾을 수 있습니다.
-
- 여러분이 보고한 문제가 분류되어 Android 엔지니어링 팀에게 검토하도록 보내질 때마다 알림을 받으실 것입니다.
- </li>
- <li> <a href="{@docRoot}preview/dev-community">Android N 개발자 커뮤니티</a>는
-일종의 Google+ 커뮤니티로,
-여기에서 여러분은 Android N으로 작업하는 <strong>다른 개발자들과 소통</strong>할 수 있습니다. 서로의 의견이나 아이디어를 나누고 Android N 관련 질문에 대한 대답을 찾을 수도 있습니다.
-저희는 커뮤니티를 조정하고 필요에 따라 답변과 지침을
-제공할 것입니다.</li>
-</ul>
-
-<h3 id="targeting">대상 지정, 프리뷰 API 및 게시</h3>
-
-<p>
- N Developer Preview에서는 <strong>표준 API 레벨이 없는</strong> 개발 전용 시스템 및 Android
-라이브러리를 제공합니다. 앱을 테스트하기 위해 호환성 동작에서 옵트아웃하려는 경우(적극 권장), Android N의 프리뷰 버전을 대상으로 지정하면 됩니다. 앱의 <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code>을 <code>“N”</code>으로 지정하세요.
-
-
-
-
-</p>
-
-<p>
- Android N Developer Preview에서는 <strong>프리뷰 API</strong>를 제공합니다. 이 API는 최종 SDK가 출시될 때까지는 공식 버전이 아닙니다. 현재 최종 SDK 릴리스는 2016년 3분기로 예정되어 있습니다.
-
- 즉, 시간이 지나면서 특히 프로그램 시작 후 초기 몇 주 동안에는 <strong>사소한 API 변경이 있을 수 있습니다</strong>.
-
- Android N Developer Preview를 업데이트할 때마다 변경 사항을 요약하여 제공해 드릴 것입니다.
-
-</p>
-
-<p class="note">
- <strong>참고</strong>: 프리뷰 API는 변경될 수 있지만, 기본 시스템 동작은 안정적이며 지금 바로 테스트가 가능한 상태입니다.
-
-
-</p>
-
-<p>
- Google Play에서는 <strong>N Developer Preview를 대상으로 하는 앱의 게시를 금지합니다.</strong>
- Android N 최종 SDK를 사용할 수 있게 되면 공식 Android N API 레벨을 대상으로 지정하고, 알파 및 베타 릴리스 채널을 통해 Google Play에 앱을 게시할 수 있습니다.
-
- 그때까지는 Android N을 대상으로 하는 앱을 테스터에게 배포하려는 경우, 이메일이나 여러분의 사이트에서 직접 다운로드를 통해 하면 됩니다.
-
-
-</p>
-
-<p>
- AOSP 및 OEM에 대한 Android N 전체 릴리스는 2016년 3분기로 예정되어 있습니다. 이때 Android N을 대상으로 하는 여러분의 앱을 Google Play의 공개 릴리스 채널에 게시할 수 있습니다.
-
-
-</p>
-
-
-<h2 id="how_to_get_started">시작 방법</h2>
-
-<p>
- Android N으로 앱 테스트를 시작하려면:
-</p>
-
-<ol>
- <li> <a href="{@docRoot}preview/api-overview.html">API 개요</a> 및 <a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>을 검토하여 새로운 사항과 이 사항이 여러분의 앱에 미치는 영향을 파악합니다.
-
- 특히, 새로운 <a href="{@docRoot}preview/features/notification-updates.html">알림</a> 기능과 <a href="{@docRoot}preview/features/multi-window.html">다중 창 지원</a>에 대해 알아봅니다.
-
-</li>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Preview SDK 설정</a> 및 테스트 기기 구성 지침에 따라 자신의 환경을 설정합니다.
-</li>
- <li> <a href="https://developers.google.com/android/nexus/images">플래시
-지침</a>에 따라 자신의 기기용 최신 Android N Developer Preview 시스템 이미지를 플래시합니다. </li>
- <li> <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>와
-<a href="{@docRoot}preview/samples.html">Android N 샘플</a>을 검토하여 새로운 API 기능과 앱에서
-그러한 기능을 사용하는 방법에 대해 좀 더 자세히 파악합니다.
- <li> <a href="{@docRoot}preview/dev-community">Android N 개발자
-커뮤니티</a>에 가입하여 최신 소식을 알아보고, 새 플랫폼으로 작업하는
-다른 개발자들과 이야기를 나눕니다.</li>
-</ol>
-
-<p>
- Android N Developer Preview 프로그램에 참가해 주셔서 대단히 감사합니다!
-</p>
diff --git a/docs/html-intl/intl/ko/preview/preview_toc.cs b/docs/html-intl/intl/ko/preview/preview_toc.cs
deleted file mode 100644
index 116b855..0000000
--- a/docs/html-intl/intl/ko/preview/preview_toc.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html" es-lang="Información general del programa" in-lang="Ikhtisar Program" ja-lang="プログラム概要" ko-lang="프로그램 개요" pt-br-lang="Visão geral do programa" ru-lang="Обзор программы" vi-lang="Tổng quan về Chương trình" zh-cn-lang="计划概览" zh-tw-lang="程式總覽"> 프로그램 개요</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html"> 지원 및 릴리스 노트</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html" es-lang="Configurar el SDK de la versión preliminar" in-lang="Menyiapkan Preview" ja-lang="Preview SDK のセットアップ" ko-lang="미리 보기 SDK 설정하기" pt-br-lang="Configuração do Preview SDK" ru-lang="Настройка пакета SDK Preview" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="设置预览版 SDK" zh-tw-lang="設定預覽版 SDK"> Preview 설정</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html" es-lang="Pruebe en un dispositivo" in-lang="Menguji pada Perangkat" ja-lang="デバイス上でテストする" ko-lang="기기에서 테스트" pt-br-lang="Testar em um dispositivo" ru-lang="Тестирование на устройстве" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="在设备上测试" zh-tw-lang="在裝置上測試"> 기기에 대한 테스트</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html" es-lang="Cambios en los comportamientos" in-lang="Perubahan Perilaku" ja-lang="動作の変更点" ko-lang="동작 변경" pt-br-lang="Mudanças de comportamento" ru-lang="Изменения в работе" vi-lang="Các thay đổi Hành vi" zh-cn-lang="行为变更" zh-tw-lang="行為變更">동작 변경 사항</a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html" es-lang="Optimizaciones en segundo plano" in-lang="Optimisasi Latar Belakang" ja-lang="バックグラウンド処理の最適化" ko-lang="백그라운드 최적화" pt-br-lang="Otimizações em segundo plano" ru-lang="Оптимизация фоновых процессов" vi-lang="Tối ưu hóa Chạy ngầm" zh-cn-lang="后台优化" zh-tw-lang="背景最佳化">백그라운드 최적화</a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html" es-lang="Idioma y configuración regional" in-lang="Bahasa dan Lokal" ja-lang="言語とロケール" ko-lang="언어 및 로케일" pt-br-lang="Idioma e localidade" ru-lang="Язык и языковой стандарт" vi-lang="Ngôn ngữ và Bản địa" zh-cn-lang="语言和区域设置" zh-tw-lang="語言和地區設定">언어 및 로케일 </a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html" es-lang="Información general de la API" in-lang="Android N untuk Pengembang" ja-lang="API の概要" ko-lang="API 개요" pt-br-lang="Visão geral da API" ru-lang="Обзор API-интерфейсов" vi-lang="Android N cho Nhà phát triển" zh-cn-lang="API 概览" zh-tw-lang="API 總覽">Android N for Developers</a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html" es-lang="Compatibilidad con ventanas múltiples" in-lang="Dukungan Multi-Jendela" ja-lang="マルチ ウィンドウのサポート" ko-lang="다중 창 지원" pt-br-lang="Suporte a várias janelas" ru-lang="Поддержка многооконного режима" vi-lang="Hỗ trợ đa cửa sổ" zh-cn-lang="多窗口支持" zh-tw-lang="多視窗支援"> 다중 창 지원</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html" es-lang="Notificaciones" in-lang="Pemberitahuan" ja-lang="通知" ko-lang="알림" pt-br-lang="Notificações" ru-lang="Уведомления" vi-lang="Thông báo" zh-cn-lang="通知" zh-tw-lang="通知"> 알림</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html"> Data Saver</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html" es-lang="Grabación de TV" in-lang="Perekaman TV" ja-lang="TV の録画" ko-lang="TV 녹화" pt-br-lang="Gravação para TV" ru-lang="Запись ТВ" vi-lang="Ghi lại TV" zh-cn-lang="TV 录制" zh-tw-lang="電視錄製"> TV 녹화</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html" es-lang="Configuración de seguridad de la red" in-lang="Network Security Configuration" ja-lang="ネットワーク セキュリティ構成" ko-lang="네트워크 보안 구성" pt-br-lang="Configurações de segurança de rede" ru-lang="Конфигурация сетевой безопасности" vi-lang="Cấu hình Bảo mật mạng" zh-cn-lang="网络安全配置" zh-tw-lang="網路安全性設定"> 네트워크 보안 구성</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html" es-lang="API de ICU4J del framework de Android" in-lang="ICU4J Android Framework API" ja-lang="ICU4J Android フレームワーク API" ko-lang="ICU4J Android 프레임워크 API" pt-br-lang="APIs de estrutura do Android para ICU4J" ru-lang="API-интерфейсы ICU4J в платформе Android" vi-lang="API Khuôn khổ Android ICU4J" zh-cn-lang="ICU4J Android 框架 API" zh-tw-lang="ICU4J Android 架構 API"> ICU4J 지원</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html" es-lang="Funciones del lenguaje Java 8" in-lang="Fitur Bahasa Java 8" ja-lang="Java 8 の機能" ko-lang="Java 8 언어 기능" pt-br-lang="Recursos de linguagem do Java 8" ru-lang="Возможности языка Java 8" vi-lang="Tính năng của Ngôn ngữ Java 8" zh-cn-lang="Java 8 语言功能" zh-tw-lang="Java 8 語言功能"> Java 8 언어 기능</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html"> Android for Work 업데이트</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html" es-lang="Acceso a directorios determinados" in-lang="Scoped Directory Access" ja-lang="特定のディレクトリへのアクセス" ko-lang="범위가 지정된 디렉터리 액세스" pt-br-lang="Acesso a diretórios com escopo" ru-lang="Доступ к выделенным каталогам" vi-lang="Truy cập Thư mục theo Phạm vi" zh-cn-lang="作用域目录访问" zh-tw-lang="限定範圍目錄存取"> 범위가 지정된 디렉터리 액세스</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html" es-lang="Ejemplos" in-lang="Contoh" ja-lang="サンプル" ko-lang="샘플" pt-br-lang="Exemplos" ru-lang="Примеры" zh-cn-lang="示例" zh-tw-lang="範例"> 샘플</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html" es-lang="Contrato de licencia" ja-lang="使用許諾契約" ko-lang="라이선스 계약" pt-br-lang="Contrato de licença" ru-lang="Лицензионное соглашение" zh-cn-lang="许可协议" zh-tw-lang="授權協議"> 라이선스 계약</a></div>
- </li>
-
-</ul>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/preview/samples.jd b/docs/html-intl/intl/ko/preview/samples.jd
deleted file mode 100644
index 1753bfa..0000000
--- a/docs/html-intl/intl/ko/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=샘플
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- Android N용으로 다음과 같은 코드 샘플이 제공됩니다. Android Studio에서 샘플을 다운로드하려면 <b>File > Import Samples</b> 메뉴 옵션을 선택합니다.
-
-
-</p>
-
-<p class="note">
- <strong>참고:</strong> 이러한 다운로드 가능 프로젝트는 Gradle 및 Android Studio와 함께 사용하도록 고안되었습니다.
-
-</p>
-
-
-<h3 id="mw">다중 창 플레이그라운드</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- 이 샘플은 앱으로 다중 창 사용자 인터페이스를 활용하는
-방법을 보여줍니다.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
-GitHub에서 가져오기</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">활성 알림</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 이것은 NotificationCompat를 사용하여 알림을 발송하는 간단한 서비스를 보여주는 기존 샘플입니다.
- 각각의 읽지 않은 사용자 대화는 고유한 알림으로 발송됩니다.
-
-</p>
-<p>
- 이 샘플은 Android N에서 사용할 수 있는 새로운 알림 기능을
-활용하도록 업데이트되었습니다.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
-GitHub에서 가져오기</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">메시징 서비스</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- NotificationManager를
-사용하여 현재 애플리케이션이 표시할 알림 개수를 지시하는
-방법을 보여주는 기존 샘플입니다.
-</p>
-<p>
- 이 샘플은 Android N에서 사용할 수 있는 새로운 알림 기능을
-활용하도록 업데이트되었습니다.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
-GitHub에서 가져오기</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">직접 부팅</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 이 샘플은 기기 암호화된 저장소에 데이터를 저장하고 액세스하는 방법을 보여줍니다.
-이 저장소는 기기가 부팅된 동안 항상 사용할 수 있습니다.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
-GitHub에서 가져오기</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">범위가 지정된 디렉터리 액세스</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 이 샘플은 적은 권한을 요구하면서도
-특정 디렉터리에서 데이터를 읽고 쓰는 방법을 보여줍니다.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
-GitHub에서 가져오기</a>
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/preview/setup-sdk.jd b/docs/html-intl/intl/ko/preview/setup-sdk.jd
deleted file mode 100644
index 03727a3..0000000
--- a/docs/html-intl/intl/ko/preview/setup-sdk.jd
+++ /dev/null
@@ -1,187 +0,0 @@
-page.title=Preview 설정
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Android Studio 2.1 가져오기</a></li>
- <li><a href="#get-sdk">Android N SDK 가져오기</a>
- <ol>
- <li><a href="#docs-dl">참조 문서</a>
- </ol>
- </li>
- <li><a href="#java8">Java 8 JDK 가져오기</a></li>
- <li><a href="#create-update">프로젝트 업데이트 또는 생성</a></li>
- <li><a href="#next">다음 단계</a></li>
-</ol>
- </div>
-</div>
-
-<p>Android N Preview용 앱을 개발하려면, 이 페이지의 설명에 따라
-개발자 환경을 약간 업데이트해야 합니다.</p>
-
-<p>Android N 시스템 이미지에서 앱의 호환성을 간단히
-테스트하려면, 가이드에 따라 <a href="{@docRoot}preview/download.html">Android N 기기에서 테스트</a>를 수행하세요.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Android Studio 2.1 가져오기</h2>
-
-<p>Android N 플랫폼에는 <a href="{@docRoot}preview/j8-jack.html">Java 8 언어 기능</a>에 대한 지원이 추가되었으며, 여기에는 Jack이라는 새 컴파일러가 필요합니다.
- 현재는 Android Studio 2.1에서만 최신 버전의 Jack이 지원됩니다. 따라서 Java 8 언어 기능을 사용하려면, Android Studio 2.1을 사용하여 앱을 빌드해야 합니다.
-
-
- 그렇지 않은 경우, Jack 컴파일러를 사용할 필요가 없지만 Android N 플랫폼에 대해 컴파일하려면 아래의 설명에 따라 JDK 8로 업데이트해야 합니다.
-
-</p>
-
-<p>Android Studio가 이미 설치된 경우 <strong>Help > Check for Update</strong>(Mac의 경우, <strong>Android Studio > Check for Updates</strong>)를 클릭하여 Android Studio 2.1 이상이 설치되어 있는지 확인해야 합니다.
-
-</p>
-
-<p>설치되어 있지 않은 경우 <a href="{@docRoot}studio/">여기서 Android Studio 2.1을 다운로드</a>하세요.
-</p>
-
-
-<h2 id="get-sdk">N Preview SDK 가져오기</h2>
-
-<p>Android N API를 사용한 개발을 시작하려면, 다음과 같이 Android N Preview SDK를 Android Studio에 설치해야 합니다.
-</p>
-
-<ol>
- <li><strong>Tools > Android > SDK Manager</strong>를 클릭하여 SDK Manager를 엽니다.
-</li>
-
- <li><strong>SDK Platforms</strong> 탭에서 <strong>Android N Preview</strong> 체크박스를 선택합니다.
-</li>
-
- <li><strong>SDK Tools</strong> 탭을 클릭한 다음,
-<strong>Android SDK Build Tools</strong>, <strong>Android SDK
-Platform-Tools</strong>, <strong>Android SDK Tools</strong> 체크박스를
-선택합니다.
- </li>
-
- <li><strong>OK</strong>를 클릭한 다음, 설치해야 하는 패키지의
-사용권 계약에 동의합니다.
- </li>
-</ol>
-
-<h3 id="docs-dl">N Preview 참조 문서 가져오기</h3>
-
-<p>
- Android N API에 대한 자세한 내용은 N Preview 참조 문서에서 볼 수 있으며, 이 문서는 다음 표에서 다운로드할 수 있습니다.
-
- 이 패키지에는 요약된 오프라인 버전의 Android 개발자 웹사이트가 포함되어 있고, Android N API용의 업데이트된 API 참조 문서와 API 차이점 보고서가 포함되어 있습니다.
-
-
-</p>
-
-<table>
- <tr>
- <th scope="col">문서</th>
- <th scope="col">체크섬</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip">n-preview-3-docs.zip</a></td>
- <td width="100%">
- MD5: 19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
- SHA-1: 9224bd4445cd7f653c4c294d362ccb195a2101e7
- </td>
- </tr>
-<table>
-
-
-
-<h2 id="java8">Java 8 JDK 가져오기</h2>
-
-<p>Android N 플랫폼에 대해 앱을 컴파일하고 Android Studio 2.1에서 일부 도구를 사용하려면 Java 8 개발자 키트(JDK 8)를 설치해야 합니다.
- 따라서 아직 최신 버전이 없는 경우, 지금 JDK 8을 다운로드하세요.
-</p>
-
-<p>그런 다음 Android Studio에서 다음과 같이 JDK 버전을 설정합니다.</p>
-
-<ol>
- <li>Android Studio에서 Android 프로젝트를 열고 <strong>File > Project Structure</strong>를 선택하여 Project Structure 대화 상자를 엽니다.
-
- (또는, <strong>File > Other Settings > Default Project Structure</strong>를 선택하여 모든 프로젝트에 대해 기본값을 설정할 수 있습니다.)
-
-
- </li>
- <li>대화 상자의 왼쪽 패널에서 <strong>SDK Location</strong>을 클릭합니다.
- </li>
- <li><strong>JDK Location</strong> 필드에,
-Java 8 JDK의 위치를 입력한 다음(오른쪽의 버튼을 클릭하여
-파일 탐색), <strong>OK</strong>를 클릭합니다.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">프로젝트 업데이트 또는 생성</h2>
-
-<p>
- Android N API를 사용하려면, 프로젝트를 적절하게 구성해야 합니다.
-</p>
-
-<p>Java 8 언어 기능을 사용할 계획인 경우에는,
-<a href="{@docRoot}preview/j8-jack.html">Java 8 언어 기능</a>에서 지원되는 Java 8 기능과
-Jack 컴파일러로 프로젝트를 구성하는 방법에 대해서도
-읽어봐야 합니다.</p>
-
-
-<h3 id="update">기존 프로젝트 업데이트</h3>
-
-<p>자신의 모듈에 대한
-<code>build.gradle</code>파일을 열고 다음과 같이 값을
-업데이트합니다.
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc3'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">새 프로젝트 생성</h3>
-
-
-<p>Android N Preview SDK를 사용한 개발에서 새 프로젝트를 만들려면:</p>
-
-<ol>
- <li><strong>File > New Project</strong>를 클릭하고
-Target Android Devices 페이지가 나올 때까지 단계를 따릅니다.
- </li>
- <li>이 페이지에서 <strong>Phone and Tablet</strong> 옵션을 선택합니다.</li>
- <li><strong>Phone and Tablet</strong> 옵션 아래의 <strong>Minimum
-SDK</strong> 옵션 목록에서
-<strong>N: Android API 23, N Preview (Preview)</strong>를 선택합니다.</li>
-</ol>
-
-
-<h2 id="next">다음 단계</h2>
-
-<ul>
- <li>가이드에 따라 <a href="{@docRoot}preview/download.html">Android N 기기에서 테스트</a>를 수행합니다.</li>
- <li><a href="{@docRoot}preview/behavior-changes.html">동작 변경 사항</a>
-및 <a href="{@docRoot}preview/api-overview.html">Android N API
-및 기능</a>에서 Android N 플랫폼에
-대해 자세히 알아봅니다.</li>
-</ul>
-
diff --git a/docs/html-intl/intl/ko/preview/support.jd b/docs/html-intl/intl/ko/preview/support.jd
deleted file mode 100644
index 3f83721..0000000
--- a/docs/html-intl/intl/ko/preview/support.jd
+++ /dev/null
@@ -1,1188 +0,0 @@
-page.title=지원 및 릴리스 노트
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>이 문서의 내용</h2>
-
-<ul>
- <li><a href="#dp3">Developer Preview 3</a>
- <ul>
- <li><a href="#general">일반 권고 사항</a></li>
- <li><a href="#new">DP3의 새로운 기능</a></li>
- <li><a href="#ki">알려진 문제</a></li>
- </ul>
- </li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- Android N Developer Preview를 사용하여 개발과 테스트를 수행할 때 두 가지 기본 지원 채널을 사용할 수 있습니다.
- 기기별 버그, 시스템 버그 및 Google 앱 버그의 경우 <a href="https://developer.android.com/preview/bug">https://developer.android.com/preview/bug</a>에 버그를 제출하세요.
- 기타 앱의 문제는 개발자에게 직접 문의하세요.
-
-</p>
-
-<p>Android N을 사용하는 다른 개발자들과 문제 또는 아이디어를 논의하려면 <a href="{@docRoot}preview/dev-community">Developer Preview Google+ 커뮤니티</a>에 가입하세요.
-</p>
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>날짜: 2016년 5월<br>
- 빌드: NPD35K<br>
- 에뮬레이터 지원: x86 및 ARM(32비트/64비트)<br>
- Google Play 서비스: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">일반 권고 사항</h3>
-
-<p>
- 이 Developer Preview 릴리스는 <strong>앱 개발자 및 기타 얼리 어댑터</strong>를 위한 것이며, 일상적인 용도로 사용하거나, 개발 또는 호환성 테스트에 사용할 수 있습니다.
-
- 이 릴리스에 대한 다음과 같은 일반적인 참고 사항을 숙지하시기 바랍니다.
-
-</p>
-
-<ul>
- <li>이 릴리스에서는 지원되는 기기에서 다양한 <strong>안정성 문제</strong>가 있을 수 있습니다.
- 사용자는 커널 패닉 및 작동 중단 등의 시스템 불안정 문제를 겪을 수 있습니다.
-
- </li>
-
- <li>일부 앱의 경우 새로운 플랫폼 버전에서 <strong>예상과 다르게 작동할 수 있습니다</strong>.
- 여기에는 Google 앱뿐만 아니라 다른 앱도 포함됩니다.
- </li>
-
- <li>Developer Preview 3는 Nexus 5X, Nexus 6, Nexus 6P 및 Pixel C 기기에서 <strong>CTS(Compatibility Test Suite) 승인을 받았습니다</strong>.
- CTS 승인 빌드를 사용하는 앱은 이들 기기에서 정상적으로 작동해야 합니다(예: Android Pay).
-
-
- </li>
-
- <li>Developer Preview 3는 <strong>지원되는 모든 기기에서 사용할 수 있습니다.</strong>
- 이러한 기기로는 Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player, Pixel C, General Mobile 4G(Android One) 뿐만 아니라 Sony Xperia Z3(D6603 및 D6653 모델)가 포함됩니다.
-
-
-
- </li>
-</ul>
-
-
-<h3 id="new">DP3의 새로운 기능</h3>
-
-<h4 id="">Android용 VR 모드</h4>
-
-<p>
- Android N에서는 개발자가 사용자를 위한 고품질 모바일 VR 환경을 만들 수 있도록 새로운 VR 모드에 대한 플랫폼 지원과 최적화 기능을 추가했습니다.
- VR 앱 전용 CPU 코어에 대한 액세스를 비롯하여, 다수의 성능 개선 사항이 있습니다.
-
- 지능적 머리 추적과 VR용으로 작동하는 스테레오 알림 기능을 앱 내에서 이용할 수 있습니다.
- 가장 중요한 점은, 지연 시간이 매우 짧은 그래픽을 Android N이 제공한다는 사실입니다.
-
-</p>
-
-<p>
- 자세한 내용은 <a href="https://developers.google.com/vr/android/">Android용 Google VR SDK</a>를 참조하세요.
-</p>
-
-<h4 id="">지속적인 성능 모드</h4>
-
-<p>
- Android N에는 <a href="{@docRoot}preview/api-overview.html#sustained_performance_api">지속적인 성능 모드</a>를 위한 지원 기능(선택 사항)이 포함되어 있으며, 이 모드를 통해 OEM들은 장시간 실행되는 애플리케이션의 기기 성능에 대한 힌트를 제공할 수 있습니다.
-
- 앱 개발자는 이런 힌트를 사용하여 장기간에 걸쳐 기기 성능을 예측 가능하고 일관된 수준으로 유지하기 위해 애플리케이션을 적절히 조정할 수 있습니다.
-
- 앱 개발자는 Developer Preview에 있는 이 새 API를 Nexus 6P 기기에서만 시험해 볼 수 있습니다.
-
-</p>
-
-<h4>Multiprocess WebView</h4>
-
-<p>
- Android N의 버전 51부터는 개발자 옵션 "Multiprocess WebView"가 활성화된 경우, WebView는 별도의 샌드박싱된 프로세스에서 웹 콘텐츠를 실행합니다.
-
- WebView 팀은 향후 Android 버전에서 Multiprocess WebView를 지원하기 전에 N에서의 호환성 및 런타임 성능에 대한 피드백을 기다리고 있습니다.
-
- 이 버전에서는 시작 시간, 총 메모리 사용량 및 소프트웨어 렌더링 성능에 관련된 성능 저하가 예상됩니다.
-
-</p>
-
-<p>
- 다중 프로세스 모드에서 예상치 못한 문제를 발견할 경우 이에 대해 알려주시기 바랍니다.
- <a href="https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">버그 제출</a>을 통해 WebView 팀에 연락하세요.
-
-</p>
-
-<h4 id="">Keyboard Shortcuts Helper</h4>
-
-<p>
- Android N에서는 사용자가 <code>Meta+/</code> 키를 눌러 <strong>Keyboard Shortcuts</strong> 화면을 트리거할 수 있으며, 이 화면에는 시스템과 해당 앱에서 둘다 사용할 수 있는 모든 바로 가기가 표시됩니다.
-
- 개발자는 자신의 바로 가기를 추가하거나 앱에서 Shortcuts 화면을 트리거할 수 있습니다.
- 자세한 내용은 <a href="{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a>를 참조하세요.
-
-</p>
-
-<h4 id="">FrameMetrics API</h4>
-
-<p>
- DP3에서는 새로운 <a href="{@docRoot}preview/api-overview.html#framemetrics_api">FrameMetrics API</a>를 추가했으며, 이를 통해 앱은 애플리케이션의 현재 창에 대한 프레임 타이밍 정보를 전송하기 위해 스트리밍 PubSub API를 노출함으로써 앱의 UI 렌더링 성능을 모니터링할 수 있습니다. <code>FrameMetricsListener</code>를 사용하면 USB 연결 없이 프로덕션 환경에서 상호 작용 수준의 UI 성능을 더욱 정밀하게 측정할 수 있습니다.
-
-
-
-
-
-</p>
-
-<h4 id="api-changes">기능 및 API 변경 사항</h4>
-
-<dl>
- <dt>
- 런처 바로 가기 및 런처 바로 가기 API
- </dt>
-
- <dd>
- 이 기능은 향후 Android 릴리스로 미루기로 결정되었습니다. 차기 Developer Preview부터는 런처 바로 가기 API(ShortcutManager 등)가 공개 Android N API에서 삭제될 계획입니다.
-
-
- </dd>
-
- <dt>
- 페이지 로드 전에 WebView Javascript 실행
- </dt>
-
- <dd>
- Android N을 대상으로 하는 앱부터는 새 페이지가 로드될 때 Javascript 컨텍스트가 초기화됩니다.
- 현재는 새 {@link android.webkit.WebView} 인스턴스에 로드된 첫 페이지에 대해 컨텍스트가 이월됩니다.
-
- Javascript를 {@link android.webkit.WebView}에 삽입하려는 개발자는 페이지 로드가 시작된 후에 스크립트를 실행해야 합니다.
-
-
- </dd>
-
- <dt>
- 비보안 출발지에서의 WebView Geolocation
- </dt>
-
- <dd>
- Android N을 대상으로 하는 앱부터는 보안 출발지(HTTPS를 통함)에서만 Geolocation API가 허용됩니다.
- 이 정책은 사용자가 비보안 연결을 사용하는 경우 사용자의 개인 정보를 보호할 목적으로 설계되었습니다.
-
- </dd>
-
- <dt>
- Data Saver
- </dt>
-
- <dd>
- Developer Preview 3부터는 앱이 인텐트를 사용하여 시스템 대화 상자를 표시할 수 있습니다. 사용자는 이 대화 상자를 통해 Data Saver 면제 허용 목록에 앱을 직접 추가할 수 있습니다.
-
- 자세한 내용은 <a href="{@docRoot}preview/api-overview.html#data_saver">Data Saver 문서</a>를 참조하세요.
-
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#number-blocking">번호 차단</a>
- </dt>
-
- <dd>
- 권한 없는 사용자가 번호를 차단하거나 차단 해제하려고 시도하면 이제 {@link java.lang.SecurityException}이 발생하고 작업이 실패합니다.
- (이전에는 작업에서 {@link java.lang.UnsupportedOperationException}을 발생시켰습니다.)
-
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">Quick Settings 타일 API</a>
-
- </dt>
-
- <dd>
- 이제 시스템에서는 액티비티의 메타데이터를 사용하여 타일 모드를 결정합니다.
- (이전에는 <code>TileService.onTileAdded()</code>의 반환 값으로 타일 모드가 결정되었습니다.)
- 자세한 내용은 다운로드 가능한 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 참조</a>에서 <code>TileService.META_DATA_ACTIVE_TILE</code>을 참조하세요.
-
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">개발자가 보고한 문제의 수정 사항</h4>
-
-<p>
- 다음을 비롯하여 개발자가 보고한 여러 문제가 수정되었습니다.
-</p>
-
-<ul>
- <li>노래가 하나 끝난 후 블루투스 오디오 재생이 중단됨(버그 <a href="https://code.google.com/p/android/issues/detail?id=206889">206889</a>)
- </li>
-
- <li>Pixel C가 지속적으로 작동 중단됨(버그 <a href="https://code.google.com/p/android/issues/detail?id=206962">206962</a>)
- </li>
-
- <li>시계 및 알림 메시지의 알림 문제(버그 <a href="https://code.google.com/p/android/issues/detail?id=203094">203094</a>)
- </li>
-
- <li>USB C 케이블을 통해 MacBook Pro에 연결된 경우 Pixel C가 재부팅됨(버그 <a href="https://code.google.com/p/android/issues/detail?id=205432">205432</a>)
-
- </li>
-
- <li>캘린더가 하루 오프셋됨(버그 <a href="https://code.google.com/p/android/issues/detail?id=203002">203002</a>)
- </li>
-
- <li>TelephonyManager.getAllCellInfo가 잘못된 데이터를 반환함(버그 <a href="https://code.google.com/p/android/issues/detail?id=203022">203022</a>)
- </li>
-
- <li>Nexus 6P, 블루투스의 연결이 계속 끊김(버그 <a href="https://code.google.com/p/android/issues/detail?id=208062">208062</a>)
- </li>
-</ul>
-
-<p>수정된 문제의 전체 목록을 보려면 <a href="https://goo.gl/6uCKtf">Issue Tracker</a>를 참조하세요.
-</p>
-
-<h3 id="ki">알려진 문제</h3>
-
-<h4>접근성</h4>
-
-<ul>
- <li>피치가 최대 수준에 가깝게 설정된 경우 TTS 출력을 들을 수 없습니다.
- </li>
-
- <li>확대 제스처 및 설정을 비롯한 접근성 기능 및 설정은 사용자가 작업 프로필을 추가하는 경우 중단될 수 있습니다.
- 접근성 상태는 사용자가 관련 설정을 다음 번에 터치할 때 복구됩니다.
-
- </li>
-</ul>
-
-<h4>카메라</h4>
-
-<ul>
- <li>카메라 앱이 불안정한 작동을 보였습니다. 이 앱은 다양한 경우(예: 다중 창 모드에서 실행되는 경우) 작동이 중단될 수 있습니다.
-
- </li>
-
- <li>파노라마 모드에서 셔터를 계속해서 누르면 카메라 앱의 작동이 중단될 수 있습니다.
-
- </li>
-</ul>
-
-<h4>오디오</h4>
-<ul>
- <li>플랫폼의 오디오 플레이어 문제로 인해 일부 앱이 정상적으로 작동하지 않습니다.
- 예를 들어, Skype 및 기타 앱이 이 문제의 영향을 받습니다.
- </li>
-</ul>
-
-<h4>연결</h4>
-
-
-<ul>
- <li>블루투스 저전력(Bluetooth Low Energy, BLE) 주변 역할 기기가 서비스를 알리고 있는데 BLE 중앙 역할 기기가 연결되면, 주변 역할 기기가 즉각적으로 연결을 해제합니다.
-
-
- </li>
-
- <li>화면이 꺼지면 Wi-Fi 연결이 끊길 수 있습니다.
- </li>
-
- <li>RFCOMM 연결이 불안정하며, 이로 인해 데이터 손상 및 연결 자주 끊김이 발생할 수 있습니다.
-
- </li>
-
- <li>일부 제한된 백그라운드 시나리오 중에, 활성 네트워크 상태({@link android.net.NetworkInfo#getState NetworkInfo.getState()} 및 {@link android.net.NetworkInfo#getDetailedState NetworkInfo.getDetailedState()})가 잘못된 값을 반환할 수 있습니다.
-
-
-
- </li>
-</ul>
-
-
-<h4>
- 런처
-</h4>
-
-<ul>
- <li>화면이 꺼졌다가 켜진 후 기본 런처의 All Apps 트레이가 응답하지 않을 수 있습니다.
- 홈 화면으로 돌아간 후 All Apps 트레이를 다시 실행하면 이 문제가 해결될 수 있습니다.
-
- </li>
-</ul>
-
-<h4>
- 키보드
-</h4>
-
-<ul>
- <li>Android 6.0 이전 버전이 실행되는 기기를 N Developer Preview로 업데이트하는 경우, Google 키보드가 최신 그림 이모티콘 및 소리 설정과 같은 기본 설정 데이터를 유지하지 않습니다.
-
-
- </li>
-
- <li>Google Indic Managed Keyboard는 불안정할 수 있습니다.
- </li>
-
- <li>비밀번호 필드에 텍스트를 입력할 때 사용자가 러시아어를 입력 언어로 선택할 수 있지만 키보드는 계속 영어를 유지합니다.
- 이로 인해 사용자가 러시아어 언어로 암호를 입력할 수 없습니다.
-
- </li>
-</ul>
-
-<h4>
- 로케일 및 언어
-</h4>
-
-<ul>
- <li>오른쪽에서 왼쪽으로 읽기(RTL) 로케일을 사용하는 경우, 기기를 재시작한 후 예기치 않게 왼쪽에서 오른쪽으로 읽기(LTR) 표시로 시스템이 전환될 수 있습니다.
-
- </li>
-</ul>
-
-<h4>미디어</h4>
-
-<ul>
- <li>HD 비디오 재생 문제를 비롯하여, Nexus 9 및 Nexus Player에서 미디어 재생이 불안정할 수 있습니다.
-
- </li>
-</ul>
-
-<h4>
- 다중 창 모드
-</h4>
-
-<ul>
- <li>다중 창 모드에서 방향을 변경하면 기기가 작동을 멈출 수 있습니다.
- </li>
-
- <li>현재 여러 앱에서 다중 창 모드와 관련하여 문제가 있습니다.
- <ul>
- <li>Settings > Display > Screen brightness를 다중 창에 도킹하면 시스템 UI의 작동이 중단될 수 있습니다.
-
- </li>
-
- <li>카메라 앱을 다중 창 모드에서 실행하면 작동이 중단될 수 있습니다.
- </li>
-
- <li>YouTube를 다중 창 모드에서 실행하면 작동이 중단될 수 있습니다. Storage > Apps > YouTube에서 YouTube 앱 데이터를 지워서 이 문제를 수정할 수 있습니다.
-
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Google Play 서비스
-</h4>
-
-<ul>
- <li>Google Play 서비스를 통해 Google Cast를 사용하는 앱의 경우, ASCII 범위에 속하지 않는 글자 및 숫자를 사용하는 시스템 로케일을 사용자가 선택하면 앱이 불안정해질 수 있습니다.
-
-
- </li>
-</ul>
-
-<h4>
- Android for Work 및 Google Apps Device Policy
-</h4>
-
-<ul>
- <li>사용자가 "device policy status" 화면이 고정된 상태로 기기의 잠금을 해제할 경우, Device Policy 앱의 작동이 중단될 수 있습니다.
-
- </li>
-
- <li>파일 기반 암호화가 설정된 채로 작업 프로필을 설정하고, Work를 끈 후에 사용자가 다시 한 번 더 기본 프로필 화면 잠금을 해제하여 Work 앱에 액세스해야 합니다.
-
-
- </li>
-
- <li>보안 패턴 잠금을 제거하고 업무용 앱/개인 앱을 다중 창에서 열면 기기가 재부팅됩니다.
-
- </li>
-
- <li>DISALLOW_VPN_CONFIG를 설정하면 Device Policy Client에 의해 설정되는 상시 접속 VPN 모드에 동의 대화 상자가 나타납니다.
-
- </li>
-
- <li>VPN이 상시 접속 VPN 모드에서 연결될 때까지는 트래픽이 잠기지 않습니다.
- </li>
-</ul>
-
-<h4>
- 외부 저장소
-</h4>
-
-<ul>
- <li>사용자가 앱을 내부 저장소에서 채택 가능 외부 저장소(SD 카드 또는 USB를 통해 연결된 기기 포함)로 이동하면 앱이 불안정해질 수 있습니다.
-
-
- </li>
-</ul>
-
-<h4>
- Google Play에서의 화면 확대/축소 및 다중 APK
-</h4>
-
-<ul>
- <li>Android N이 실행되는 기기에서 Google Play 서비스 9.0.83은 안정적인 화면 밀도 대신 현재 화면 밀도를 잘못 보고합니다.
- 이러한 기기에서 화면 확대/축소가 활성화된 경우, 이로 인해 Google Play는 더 작은 화면용으로 설계된 다중 APK 앱의 버전을 선택할 수가 있습니다.
-
- 이 문제는 차기 버전의 Google Play 서비스에서 수정되었으며, 나중에 Developer Preview 릴리스에 포함될 것입니다.
-
-
- </li>
-
- <li>Android N이 실행되는 기기에서 현재 Google Play 서비스 9.0.83은 Vulkan 버전이 아닌 Vulkan 지원을 보고합니다.
- 이로 인해 Google Play는 더 높은 버전이 지원되는 기기에서 더 낮은 Vulkan 지원용으로 설계된 다중 APK 앱의 버전을 선택할 수가 있습니다.
-
- 현재 Google Play Store에서는 Vulkan 버전 대상 지정을 사용하는 앱의 업로드를 허용하지 않습니다.
- 이 지원은 향후에 Google Play Store에 추가될 예정이고 차기 버전의 Google Play 서비스에서 수정되어 나중에 Developer Preview 릴리스에 포함될 것입니다. Google Play 서비스 9.0.83 버전을 사용하는 모든 N 기기는 기본 Vulkan 지원을 대상으로 하는 앱의 버전을 계속해서 수신합니다.
-
-
-
-
- </li>
-</ul>
-
-<h4 id="">알림</h4>
-
-<ul>
- <li>MessagingStyle에서는 "null"(본인 자신) 발신자인 알림을 표시하지 않습니다.
- </li>
-</ul>
-
-<h4 id="">개발자 도구</h4>
-
-<ul>
- <li>
- JDWP 디버깅을 사용하는 중에 <code>adb</code>의 연결이 가끔씩 끊길 수 있습니다.
- </li>
-</ul>
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-
-
-
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>날짜: 2016년 4월<br>
- 빌드: NPC91K, NPC91O<br>
- 에뮬레이터 지원: x86 및 ARM(32비트/64비트)<br>
- Google Play 서비스: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">DP2의 새로운 기능</h3>
-
-<ul>
- <li>Vulkan에 대한 플랫폼 지원. Vulkan은 새로운 3D 렌더링 API이며, 낮은 오버헤드의 명시적 GPU(Graphics Processor Unit, 그래픽 처리 장치) 컨트롤을 제공하고 그리기 호출이 잦은 애플리케이션에 향상된 성능을 제공합니다.
-
- 자세한 내용은 <a href="{@docRoot}ndk/guides/graphics/index.html">문서</a>를 참조하세요.
-
- </li>
-
- <li>피부 색조를 지원하는 새로운 사람 그림 이모티콘 및 새로운 유니코드 9 문자 모양.
- 피부 색조 및 새로운 그림 이모티콘은 키보드에 의해 이들 기능에 대한 지원이 색상표에 구축될 때까지는 표시되지 않습니다.
- 시스템에서 제공하지 않는 글꼴을 사용하지 않는 한, 앱은 이러한 새로운 그림 이모티콘을 활용하기 위해 어떠한 작업도 수행할 필요가 없습니다.
- IME 개발자는 새로운 그림 이모티콘에 대한 지원을 포함시켜야 합니다.
-
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">런처 바로 가기 API</a>:
- 앱은 <code>ShortcutManager</code>를 사용하여 해당 앱 내부의 시작점에 대한 바로 가기를 런처로 전송할 수 있습니다.
-
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">다중 창</a>:
- 이제 액티비티에 대해 최소 높이와 최소 너비를 별도로 지정할 수 있습니다.
- 또한, 여러 가지 API 이름이 약간 변경되었습니다.
- </li>
-</ul>
-
-<h4 id="dp2-fixes">개발자가 보고한 문제의 수정 사항</h4>
-
-<p>
- 다음을 비롯하여 개발자가 보고한 여러 문제가 수정되었습니다.
-</p>
-
-<ul>
- <li>숨겨진 SSID 또는 비-브로드캐스트 Wi-Fi에 연결할 수 없음(버그 <a href="https://code.google.com/p/android/issues/detail?id=203116">203116</a>)
- </li>
-
- <li>마이크 음소거 상태가 액티비티 간에 유지됨(버그 <a href="https://code.google.com/p/android/issues/detail?id=205922">205922</a>)
- </li>
-
- <li>다중 창의 포커스를 변경하면 YouTube가 일시 중지됨(버그 <a href="https://code.google.com/p/android/issues/detail?id=203424">203424</a>)
- </li>
-
- <li>열려 있는 액티비티를 직접 회신으로 닫을 수 있음(버그 <a href="https://code.google.com/p/android/issues/detail?id=204411">204411</a>)
- </li>
-
- <li>다양한 안정성 문제 수정
- </li>
-</ul>
-
-<h3 id="dp2-general">일반 권고 사항</h3>
-
-<p>
- 이 Developer Preview 릴리스는 <strong>앱 개발자 전용</strong>이며, 호환성 테스트 및 조기 개발 용도로만 사용하도록 설계되었습니다.
-
- 이 릴리스에 대한 다음과 같은 일반적인 참고 사항을 숙지하시기 바랍니다.
-</p>
-
-<ul>
-
- <li>개발 도구 구성 요소 및 지원 라이브러리가 DP2 릴리스에 대해 업데이트되었습니다.
- DP2용으로 개발하기 전에 Preview 개발 환경을 업데이트해야 합니다.
- 개발 환경을 설정하는 방법에 대한 지침은 <a href="{@docRoot}preview/setup-sdk.html">Preview 설정</a>을 참조하세요.
-
-
- </li>
-
- <li>이 릴리스의 경우 모든 기기에서 다양한 안정성 및 성능 문제가 있으므로 <strong>전화 또는 태블릿에서 일상적으로 사용하는 데 적합하지 않으며</strong>, 특히 개발자가 아닌 일반 사용자가 사용하기에 적합치 않습니다.
-
-
- </li>
-
- <li>배터리 수명 및 성능은 이 릴리스에서 아직 최적화되지 않았습니다.
-
-
- <ul>
- <li>시스템 및 앱 <strong>성능이 주기적으로 느려지고 저하되는 것으로 확인되었으며</strong>, 기기가 가끔씩 응답을 멈출 수 있습니다.
- 이러한 문제는 장기 사용 시 더 심해질 수 있습니다.
-
- </li>
-
- <li>이 릴리스에서 화면을 켜고 끄는 과정에서 배터리 수명이 감소할 수 있습니다.
-
- </li>
- </ul>
- </li>
-
- <li>일부 앱의 경우 Developer Preview 2에서 <strong>정상적으로 작동하지 않을 수 있습니다</strong>. 여기에는 Google 앱뿐만 아니라 다른 앱도 포함됩니다.
-
- </li>
-
- <li>이 조기 빌드는 <strong>CTS(Compatibility Test Suite) 승인</strong>을 받지 않았습니다.
- CTS 승인을 받은 빌드를 사용하는 앱은 작동하지 않습니다(예: Android Pay).
-
- </li>
-
- <li>이 프리뷰 릴리스에서는 Nexus 5X, Nexus 6, Nexus 6P, Nexus 9 및 Pixel C 뿐만 아니라 General Mobile 4G(Android One) 기기를 지원합니다.
-
- Nexus Player 지원은 곧 추가될 것입니다.
- </li>
-
-
- <li><a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a>는 DP1 및 DP2 사이의 API 변경 사항을 처리하도록 업데이트되었습니다.
-
- </li>
-</ul>
-
-<h3 id="dp2-ki">알려진 문제</h3>
-
-<h4>성능 및 배터리</h4>
-
-<ul>
- <li>시스템 및 앱 성능이 <strong>주기적으로 느려지고 저하</strong>되는 것으로 확인되었으며, 기기가 가끔씩 응답을 멈출 수 있습니다.
- 이러한 문제는 장기 사용 시 더 심해질 수 있습니다.
-
- </li>
-</ul>
-
-<h4>Google 계정</h4>
-
-<ul>
- <li>경우에 따라 <code>AccountManagerService</code>와 관련된 문제가 있을 수 있으며, 이로 인해 Google 계정에 로그인하지 못할 수 있습니다.
-
- </li>
-</ul>
-
-<h4>시스템 업데이트</h4>
-
-<ul>
- <li>DP2로 업데이트한 후 즉시 기기가 재시작될 수 있습니다.
- </li>
-</ul>
-
-<h4>접근성</h4>
-
-<ul>
- <li>피치가 최대 수준에 가깝게 설정된 경우 TTS(텍스트 음성 변환) 출력을 듣는 데 문제가 있습니다.
-
- </li>
-</ul>
-
-<h4>블루투스</h4>
-
-<ul>
- <li>블루투스 저전력(LE) GATT 특성이 잘못된 쓰기 유형을 사용하며 원격 기기로 전송되지 않습니다.
- 이에 따라 예를 들면 일부 피트니스 기기가 작동하지 않습니다.
-
- </li>
-</ul>
-
-<h4>설정 마법사</h4>
-
-<ul>
- <li>"Your Google Account"에서 새 기기(또는 새롭게 초기화된 기기)의 데이터를 복원하는 옵션이 설정 마법사에서 작동하지 않습니다.
- 설정 마법사에서 "다른 Android 기기"를 선택하여 기존 기기의 데이터를 복원하거나, 기존 기기를 새 기기로 설정해야 합니다.
-
-
- </li>
-</ul>
-
-<h4>OEM 잠금 해제</h4>
-
-<ul>
- <li>일부 기기에서, DP2를 실행하는 동안 "Developer Options"에서 <strong>Enable OEM unlock</strong>이 비활성화됩니다.
-<br>
- <strong>해결 방법:</strong> <a href="https://www.google.com/android/beta" class="external-link">www.google.com/android/beta</a>를 방문하여 Android 베타 프로그램에 옵트인합니다(아직 옵트인하지 않은 경우).
-
- 그런 다음 옵트아웃하고 다운그레이드 OTA를 수락합니다.
- 옵트아웃하면 기기가 Android 6.0으로 다운그레이드됩니다. 이제 "Developer Options"에서 <strong>Enable OEM unlock</strong>을 선택할 수 있을 것입니다.
-
- 기기를 다운그레이드하면 개인 데이터가 삭제되지만, 부트로더의 잠금을 해제하는 경우에도 이 데이터가 삭제됩니다.
-
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>작업 보안 인증 질문
- <ul>
- <li>N으로 마이그레이션한 후나 사용자가 작업 프로필을 생성한 후에, 사용자가 자신의 패턴, PIN 또는 비밀번호를 변경하거나 작업 인증 질문을 설정할 때까지는 작업 프로필에서 키 저장소에 키를 생성할 수 없습니다.
-
-
- </li>
-
- <li>직접 부팅 모드에서 비밀번호 제한을 기기에 적용하면, 기기가 잠겨 있는 경우에도 작업 프로필의 잠금이 해제됩니다.
-
- 이로 인해 작업 프로필이 기기 잠금 화면으로 보호되어야 하는 경우에도 작업 프로필에 액세스할 수 있게 됩니다.
-
- </li>
- </ul>
- </li>
-
- <li>상시 접속 VPN
- <ul>
- <li>상시 접속 VPN 모드가 설정되었는데도 VPN을 사용할 수 없는 경우, 앱이 일반 네트워크를 통해 연결합니다.
- VPN 연결을 사용할 수 없는 경우 앱은 오프라인이어야 합니다.
-
- </li>
-
- <li>상시 접속 모드가 설정된 경우 사용자가 보안 잠금 화면의 잠금을 해제한 후에도, 기기가 직접 부팅 모드로 재부팅된 후 VPN 연결이 설정되지 않습니다.
-
-
- </li>
- </ul>
- </li>
-
- <li>패키지 일시 중단
- <ul>
- <li>기기 관리자는 예상치 못한 동작(예: "Telephone disabled" 대화 상자가 표시되어 있는데도 전화가 걸림)을 초래할 수 있는 중대한 시스템 패키지를 일시 중단시킬 수 있습니다.
-
-
- </li>
- </ul>
- </li>
-
- <li>기타
- <ul>
- <li>{@link android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA}가 true로 설정된 경우, 사용자가 SD 카드와 같은 물리적 미디어를 삽입하면 Settings 앱이 실행 시에 작동을 멈춥니다.
-
-
- </li>
-
- <li>작업 프로필의 첫 번째 체크인은 완료되는 데 몇 분 정도 걸립니다.
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>바인딩 번호와 0이 아닌 첫 번째 바인딩 번호 사이에 격차가 있는 경우 {@code vkCreateGraphicsPipeline()}이 실패합니다.
-</li>
- <li>투영된 텍스처 좌표에서 Vulkan이 잘못된 샘플링 동작을 보입니다.</li>
- <li>multithreadCmdBuffer 샘플에서 N-DP2 드라이버와 함께 실행되는 경우 {@code vkCmdClearColorImage()}가 작동을 중단합니다.
-</li>
- <li>{@code vkGetPhysicalDeviceFormatProperties()}의 반환 값은 결과로 0 값을 취하는 {@code VkFormatProperties::linearTilingFeatures}의 값을 설정하지 않습니다.
-
-</li>
- <li>Vulkan 부동 소수점 프레임 버퍼 첨부 파일이 올바르게 처리되지 않습니다.</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>SPIR-V 셰이더가 드라이버 어설션을 트리거할 수 있습니다.</li>
- <li>일부 파이프라인 구성에서는 {@code vkCreateGraphicsPipeline()}이 작동을 중단할 수 있습니다.
-</li>
- </ul>
-</ul>
-
-<h4>기기별 문제</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- 기기가 슬롯 1에서 슬롯 2 SIM으로 전환된 경우 데이터 연결이 실패합니다.
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- 음성 검색 "Always On" 옵션을 전환할 수 없습니다.
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- HDR+ 사진을 제외하고, 세로 방향의 카메라 사진이 손상됩니다.
-
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- Nexus Player에서 Netflix HD 콘텐츠의 재생이 실패할 수 있습니다.
- </dd>
-
- <dd>
- 동적 비디오 해상도 변경에 의존하는 모든 애플리케이션이 Nexus Player에서 실패할 수 있습니다.
-
- </dd>
-
- <dd>
- VP9 비디오 코덱을 사용하는 모든 애플리케이션이 Nexus Player에서 실패할 수 있습니다.
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>날짜: 2016년 3월<br>
- 빌드: NPC56P, NPC56R, 업데이트됨: NPC56W, NPC56X<br>
- 에뮬레이터 지원: x86 및 ARM(32비트/64비트)<br>
- Google Play 서비스: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">일반 권고 사항</h3>
-
-<p>
- 이 Developer Preview 릴리스는 앱 개발자 전용이며, 호환성 테스트 및 조기 개발 용도로만 사용하도록 설계되었습니다.
- 이 릴리스에 대한
- 다음과 같은 일반적인 참고 사항을 숙지하시기 바랍니다.
-</p>
-<ul>
- <li>이 릴리스의 경우 모든 기기에서 다양한 안정성 및 성능 문제가 있으므로 <em>전화 또는 태블릿에서 일상적으로 사용하는 데 적합하지 않으며</em>, 특히 개발자가 아닌 일반 사용자가 사용하기에 적합치 않습니다.
-
-
- </li>
-
- <li>시스템 및 앱 성능이 <strong>주기적으로 느려지고 저하</strong>되는 것으로 확인되었으며, 기기가 가끔씩 응답을 멈출 수 있습니다.
- 이러한 문제는 장기 사용 시 더 심해질 수 있습니다.
-
- </li>
-
- <li>이 릴리스에서 화면을 켜고 끄는 과정에서 배터리 수명이 감소할 수 있습니다.
-
- </li>
-
- <li>일부 앱의 경우 Developer Preview 1에서 정상적으로 작동하지 않을 수 있습니다.
-여기에는 Google 앱뿐만 아니라 다른 앱도 포함됩니다.
- </li>
-
- <li>이 조기 빌드는 CTS(Compatibility Test Suite) 승인을 받지 않았습니다. CTS 승인을 받은 빌드를 사용하는 앱은 작동하지 않습니다(예: Android Pay).
-
- </li>
-
- <li>이 프리뷰 릴리스에서는 Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player 및 Pixel C 뿐만 아니라 General Mobile 4G(Android One) 기기를 지원합니다.
-
-
- </li>
-</ul>
-
-<h3 id="dp1-platform">플랫폼 문제</h3>
-
-<h4>성능 및 배터리</h4>
-
-<ul>
- <li>시스템 및 앱 성능이 <strong>주기적으로 느려지고 저하</strong>되는 것으로 확인되었으며, 기기가 가끔씩 응답을 멈출 수 있습니다.
- 이러한 문제는 장기 사용 시 더 심해질 수 있습니다.
-
- </li>
-
- <li>이 릴리스에서 화면을 켜고 끄는 과정에서 배터리 수명이 감소할 수 있습니다.
-
- </li>
-</ul>
-<h4 id="dialer">다이얼러</h4>
-
-<ul>
- <li>Dialer 앱이 직접 부팅을 지원하지 않습니다. 이 문제는 N Developer Preview에서 나중에 해결될 것입니다.
-
- </li>
-
- <li>음성사서함 재생이 작동하지 않습니다.
- </li>
-</ul>
-
-<h4>마이크</h4>
-
-<ul>
- <li>앱 및 재부팅에 걸쳐 시스템이 마이크 음소거 상태를 잘못 유지할 수 있습니다. 앱에서 마이크를 음소거하고 그 상태가 유지되는 경우, 마이크 음소거 컨트롤이 있는 앱을 열고 마이크의 음소거를 해제하세요.</li>
-</ul>
-
-<h4 id="ui">시스템 UI</h4>
-
-<ul>
- <li>시스템 UI에서 새로운 문자열이나 수정된 일부 문자열이 모든 언어로 번역되어 있지 않습니다.
-
- </li>
-
- <li>Overview UI는 여전히 개발 중에 있으므로 변경될 수 있습니다. 예를 들어, 사용자가 앱 사이를 전환할 때 나타나는 타이머를 저희가 삭제할 계획입니다.
-
-
- </li>
-
- <li>설정 컨트롤 및 토글이 느리거나 응답이 없는 것으로 나타날 수 있습니다.
- </li>
-
- <li>알림의 시각적 디자인이 변경될 수 있습니다.
- </li>
-
- <li>Gmail 앱에서, 알림 번들에 포함된 이메일의 직접 아카이빙 기능이 제대로 작동하지 않습니다.
-
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>작업 보안 인증 질문
- <ul>
- <li>N으로 마이그레이션한 후나 사용자가 작업 프로필을 생성한 후에, 사용자가 자신의 패턴, PIN 또는 비밀번호를 변경하거나 작업 인증 질문을 설정할 때까지는 작업 프로필에서 키 저장소에 키를 생성할 수 없습니다.
-
-
- </li>
-
- <li>직접 부팅 모드에서 비밀번호 제한을 기기에 적용하면, 기기가 잠겨 있는 경우에도 작업 프로필의 잠금이 해제됩니다.
-
- 이로 인해 작업 프로필이 기기 잠금 화면으로 보호되어야 하는 경우에도 작업 프로필에 액세스할 수 있게 됩니다.
-
- </li>
-
- <li>사용자가 잘못된 비밀번호와 PIN을 입력하면, 시스템이 정보 메시지를 표시하지 않고 그 대신 입력 필드의 내용을 지웁니다.
-
- 이 문제는 패턴 또는 지문 입력에는 영향을 주지 않습니다.
- </li>
-
- <li>태블릿에서 작업 인증 질문에 표시되는 배경이 비정상적으로 작습니다.
-
- </li>
-
- <li>N Developer Preview에 번들로 제공되는 <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">Google Apps Device Policy</a>의 버전은 아직 작업 프로필 보안 인증 질문 기능을 지원하지 않습니다.
-
-
- 개발자는 그 대신 <a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a>를 사용하여 이 기능을 테스트해야 합니다.
-
- </li>
- </ul>
- </li>
-
- <li>상시 접속 VPN
- <ul>
- <li>상시 접속 VPN 모드가 설정되었는데 VPN을 사용할 수 없는 경우, 상시 접속 정책에 대한 예외로 지정되지 않은 앱은 일반 네트워크를 통해 연결됩니다.
-
- 상시 접속 VPN 정책에 대한 예외로 지정되지 않은 한, VPN 연결을 사용할 수 없는 경우 앱은 오프라인이어야 합니다.
-
- <ul>
- <li>상시 접속 모드가 설정된 경우 사용자가 보안 잠금 화면의 잠금을 해제한 후에도, 기기가 직접 부팅 모드로 재부팅된 후 VPN 연결이 설정되지 않습니다.
-
-
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>향상된 연락처
- <ul>
- <li>블루투스 PBAP/MAP 기기가 업무용 연락처에 대해 발신번호를 표시하지 않습니다.
- Preview의 차기 릴리스에서 이 문제를 해결합니다.
- </li>
- </ul>
- </li>
-
- <li>작업 모드
- <ul>
- <li>Google Now 런처가 작업 모드의 켜짐 또는 꺼짐 여부를 표시하지 않습니다.
- 이 런처는 또한 앱 일시 중단 상태도 표시하지 않습니다.
- </li>
-
- <li>사용자가 작업 모드를 껏다가 켠 후, 시스템이 더 이상 작업 프로필 앱 위젯(예: 캘린더)을 표시하지 않습니다.
-
- </li>
- </ul>
- </li>
-
- <li>패키지 일시 중단
- </li>
-
- <li>기기 관리자는 예상치 못한 동작(예: "Telephone disabled" 대화 상자가 표시되어 있는데도 전화가 걸림)을 초래할 수 있는 중대한 시스템 패키지를 일시 중단시킬 수 있습니다.
-
-
- </li>
-
- <li>기타
- <ul>
- <li>{@link android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA}가 true로 설정된 경우, 사용자가 SD 카드와 같은 물리적 미디어를 삽입하면 Settings 앱이 실행 시에 작동을 멈춥니다.
-
-
- </li>
-
- <li>사용자가 앱을 제거한 후 다시 설치하면 {@code DPM.setPackagesSuspended} 상태가 유지되지 않습니다.
- 제거/재설치에 후 앱이 일시 중단 상태를 유지해야 하거나, 일시 중단된 앱이 제거가 불가능해야 합니다.
-
-
- </li>
-
- <li>작업 프로필의 첫 번째 체크인은 완료되는 데 몇 분 정도 걸립니다.
- 이로 인해 기기가 Play EMM API에서 보일 때까지 보통 때보다 더 오래 걸릴 수 있습니다.
-
- </li>
-
- <li>작업 프로필 앱으로부터 전송되는 알림은 개인 프로필에 설치된 알림 수신자에게는 표시되지 않습니다.
- 따라서 시스템에서 알림이 예상대로 표시되지 않습니다.
-
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >키보드</h4>
-
-<ul>
- <li>키보드 및 Android 기기 간의 블루투스 페어링이 불안정할 수 있습니다.
- </li>
-</ul>
-
-<h4 >비디오</h4>
-
-<ul>
-<li>비디오 재생이 지연되고 끊김 현상이 나타날 수 있습니다.</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>API 특수 사례 동작을 변경시킬 수도 있는 일부 리팩터링이 Wi-Fi에 발생했습니다.
- 특히, 특정 네트워크에 연결하려고 시도하는 애플리케이션이나 네트워크에 재연결하려고 시도하는 애플리케이션은 테스트를 다시 거쳐야 합니다.
-
- </li>
-
- <li>레거시 DHCP 클라이언트가 플랫폼에서 제거되었습니다. 플랫폼이 지원하는 유일한 DHCP 클라이언트는 M에 추가된 DHCP 클라이언트뿐입니다.
-
- </li>
-</ul>
-
-<h4>직접 부팅</h4>
-
-<ul>
- <li>최초 잠금 해제가 수행될 때까지는 NFC가 작동하지 않습니다.
- <ul>
- <li>블루투스가 활성화된 전화가 재시작될 때, 블루투스가 자동으로 켜지지 않습니다.
- 블루투스를 수동으로 다시 활성화해야 합니다.
- </li>
-
- <li>어떤 경우에는, 전화 및 메시지가 온 경우 기본 벨소리가 울리지 않을 수 있습니다.
- 이 동작은 차기 N Preview 릴리스에서 수정되었습니다. 단, 한 가지 예외가 있으며 이에 대한 내용과 해결 방법은 다음과 같습니다.
-
- </li>
-
- <li>직접 부팅 모드로 설정된 이후 최소 한 번 이상 부팅되었지만 완전히 초기화되지 않은 기기에서는 기본 알림 벨소리가 울리지 않습니다.
-
- 사용자가 Settings에서 벨소리를 수동으로 선택하여 이 문제를 해결할 수 있습니다.
-
- </li>
-
- <li>N Developer Preview 빌드가 실행되는 기기에서는 기본적으로 직접 부팅이 활성화되지 않습니다.
- 테스트 및 개발에 직접 부팅을 활성화하려면 Developer Options로 이동하고 Convert to File Encryption을 탭하세요.
-
- 이 Developer Preview에서는 파일 기반 암호화를 위해 기기를 다시 파티셔닝하고 다시 포맷하려면 공장 초기화를 수행해야 합니다.
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>PIP for Android TV</h4>
-
-<ul>
- <li>Recents UI에서의 PIP 통합은 완료되지 않았으며, 변경될 수 있습니다.
-
- <ul>
- <li>PIP 창의 애니메이션이 매끄럽지 않습니다. 향후 프리뷰 릴리스에서 이 문제가 개선될 것입니다.
-
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">향후 프리뷰 릴리스에서 PIP의 시각적 디자인과 레이아웃 맞춤이 개선될 것입니다.
-
- </li>
-</ul>
-
-<h4>버그 보고서</h4>
-
-<ul>
- <li>버그 보고서가 항상 성공적으로 완료되는 것은 아닙니다. 그 해결 방법으로, 내부 저장소에 있는 버그 보고서 문서 제공자를 통해 버그 보고서에 액세스할 수 있는 경우도 있습니다.
-
-
- </li>
-</ul>
-
-<h4>분할 화면 다중 창</h4>
-
-<ul>
- <li>분할 화면 모드로 전환하면 앱이 작동을 중단하고 예기치 않은 UI 동작이 발생할 수 있습니다.
- 이는 앱 개발자가 수정해야 하는 앱 문제입니다.
-
- </li>
-
- <li>앱이 N 이전 버전의 Android 플랫폼을 대상으로 하는 경우, 이 앱이 분할 화면에서 작동하지 않을 수 있으며, 알림 메시지가 여러 번 나타날 수 있습니다.
-
- </li>
-
- <li>방향이 고정된 상태로 앱을 사용하는 중에 Overview 버튼을 길게 누르면 예기치 않은 앱 동작이 발생할 수 있습니다.
-
- </li>
-
- <li>크기를 조정하는 중에 앱이 깜박일 수 있습니다.
- </li>
-
- <li>애니메이션은 아직 최종 버전이 아닙니다.
- </li>
-</ul>
-
-<h4>입력 방법</h4>
-
-<ul>
- <li><b>Use system language</b>가 설정된 경우 예기치 않게 Google 키보드가 일반 Google 키보드로 다시 돌아가지만, 시스템 언어 기본 설정에 선택된 언어를 Google 키보드가 지원하지 않습니다.
-
- Google 키보드는 미국식 영어로 돌아가야 합니다.
-
- <p>
- Google 키보드에서 지원하는 언어를 최소 하나 이상 추가하여 이 문제를 해결할 수 있습니다.
-
- </p>
- </li>
-</ul>
-
-<h4>접근성</h4>
-
-<ul>
- <li>알림, Quick Settings 타일 및 다중 창 표시를 비롯한 여러 기능에 대한 문제가 음성 안내 지원(TalkBack)에서 발생합니다. 이러한 문제로 인해 시스템 작동이 중단되거나 음성 안내 지원에서 음성 피드백이 제공되지 않을 수 있습니다.
-
- 향후 프리뷰 릴리스에서 이러한 문제가 해결될 것입니다.
-
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">기기별 참고 사항 및 문제</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>이 프리뷰 릴리스에서는 비디오 재생, 앱 호환성 및 안정성 문제가 Nexus Player에 있을 수 있습니다.
-
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>다중 창 크기를 조정하면 작동이 중단될 수 있습니다.</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Android 베타 프로그램을 통해 OTA(Over-The-Air) 업데이트를 받은 후에 Nexus 9 기기가 시작되지 않을 수 있습니다.
- 이 문제로부터 복구하기 위해 OTA 이미지를 수동으로 설치해 보실 수 있습니다.
- 자세한 내용은 <a href="{@docRoot}preview/download-ota.html">기기 OTA 이미지 적용</a>을 참조하세요.
-
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/ko/training/articles/direct-boot.jd b/docs/html-intl/intl/ko/training/articles/direct-boot.jd
new file mode 100644
index 0000000..2674481
--- /dev/null
+++ b/docs/html-intl/intl/ko/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=직접 부팅
+page.keywords=preview, sdk, 직접 부팅
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#run">직접 부팅 시 실행하기 위한 액세스 요청</a></li>
+ <li><a href="#access">기기 암호화 저장소 액세스</a></li>
+ <li><a href="#notification">사용자 잠금 해제 알림 수신</a></li>
+ <li><a href="#migrating">기존 데이터 마이그레이션</a></li>
+ <li><a href="#testing">암호화 인식 앱 테스트</a></li>
+ </ol>
+</div>
+</div>
+
+<p>기기에 전원이 들어와 있지만 <i>사용자가 기기의 잠금을 해제하지</i> 않았을 경우 Android N은 안전한
+직접 부팅
+ 모드에서 실행됩니다. 이를 지원하기 위해 시스템에서 다음과 같은 두 가지 데이터 저장소 위치를 제공합니다.</p>
+
+<ul>
+<li><i>자격 증명 암호화 저장소:</i>기본 저장소 위치이며, 사용자가 기기의 잠금을 해제한 후에만
+사용할 수 있습니다.</li>
+<li><i>기기 암호화 저장소:</i>직접 부팅 모드와 사용자가 기기의 잠금을 해제한 후에
+모두 사용할 수 있는 저장소 위치입니다.</li>
+</ul>
+
+<p>기본적으로 직접 부팅 모드 시 앱이 실행되지 않습니다.
+직접 부팅 모드에서 조치가 필요한 경우,
+이 모드에서 실행되어야 하는 앱 구성 요소를 등록할 수 있습니다. 직접 부팅 모드 시 실행되어야 하는 앱의
+몇 가지 공통 사용 사례는 다음과 같습니다.</p>
+
+<ul>
+<li>알람 시계 앱과 같이 예약된 알림이 있는
+앱.</li>
+<li>SMS 앱처럼 중요한 사용자 알림을 제공하는 앱.</li>
+<li>Talkback처럼 접근성 서비스를 제공하는 앱.</li>
+</ul>
+
+<p>앱이 직접 부팅 모드에서 실행되는 동안 데이터에 액세스해야 하는 경우
+기기 암호화 저장소를 사용합니다. 기기 암호화 저장소에는
+기기가 성공적으로 확인된 부팅을 수행한 후에만
+사용할 수 있는 키로 암호화된 데이터가 포함됩니다.</p>
+
+<p>PIN이나 비밀번호와 같이 사용자 자격 증명과 연관된 키로 암호화해야 하는 데이터는
+자격 증명 암호화 저장소를 사용합니다.
+자격 증명 암호화 저장소는 사용자가 기기의 잠금을 해제한 뒤부터
+기기를 다시 시작할 때까지 사용할 수 있습니다. 사용자가
+기기의 잠금을 해제한 뒤 잠금 화면을 활성화해도
+자격 증명 암호화 저장소가 잠기지 않습니다.</p>
+
+<h2 id="run">직접 부팅 시 실행하기 위한 액세스 요청</h2>
+
+<p>앱은 직접 부팅 모드에서 실행되거나
+기기 암호화 저장소에 액세스하기 전까지
+시스템에 구성 요소를 등록해야 합니다. 앱은 구성 요소를 암호화 인식으로 표시하여
+<i>시스템에</i> 등록합니다. 구성 요소를 암호화 인식으로 표시하려면 매니페스트에서
+<code>android:directBootAware</code> 속성을 true로 설정합니다.<p>
+
+<p>암호화 인식 구성 요소로 등록하면 기기가 다시 시작되었을 때 시스템에서
+<code>LOCKED_BOOT_COMPLETED</code> 브로드캐스트 메시지를
+수신할 수 있습니다. 이 시점에서 기기 암호화 저장소를
+사용할 수 있고, 여러분의 구성 요소는
+예약된 알람 트리거 등과 같이 직접 부팅 모드에서 실행해야 하는 작업을 실행할 수 있습니다.</p>
+
+<p>다음 코드 조각은
+{@link android.content.BroadcastReceiver}를 암호화 인식으로 등록하고 앱 매니페스트에
+<code>LOCKED_BOOT_COMPLETED</code>의 인텐트 필터를 추가하는 예시입니다.</p>
+
+<pre>
+<receiver
+ android:directBootAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>사용자가 기기의 잠금을 해제하면 모든 구성 요소가
+기기 암호화 저장소와 자격 증명 암호화 저장소에 액세스할 수 있습니다.</p>
+
+<h2 id="access">기기 암호화 저장소 액세스</h2>
+
+<p>기기 암호화 저장소에 액세스하려면
+<code>Context.createDeviceProtectedStorageContext()</code>를 호출하여 두 번째
+{@link android.content.Context} 인스턴스를 생성합니다. 이 컨텍스트를 사용하여 수행된 모든 저장소 API 호출은
+기기 암호화 저장소에 액세스합니다. 다음은
+기기 암호화 저장소에 액세스하고 기존
+앱 데이터 파일을 여는 예시입니다.</p>
+
+<pre>
+Context directBootContext = appContext.createDeviceProtectedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>직접 부팅 모드에서 액세스해야 하는 정보에만
+기기 암호화 저장소를 사용합니다.
+기기 암호화 저장소를 범용 암호화 저장소로 사용하지 마십시오.
+개인적인 사용자 정보 또는 직접 부팅 모드에서 필요하지 않은 암호화 데이터는
+자격 증명 암호화 저장소를 사용합니다.</p>
+
+<h2 id="notification">사용자 잠금 해제 알림 수신</h2>
+
+<p>사용자가 재시작 후 기기의 잠금을 해제하면
+앱이 자격 증명 암호화 저장소 액세스로 전환하고,
+사용자 자격 증명을 따르는 일반 시스템 서비스를 사용할 수 있습니다.</p>
+
+<p>사용자가 재부팅 후 기기의 잠금을 해제할 때 알림을 받으려면
+실행 중인 구성 요소에서 {@link android.content.BroadcastReceiver}를 등록하고
+<code>ACTION_USER_UNLOCKED</code> 메시지를 수신합니다. 또는,
+기존 {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED} 메시지를 수신할 수 있습니다. 이 메시지는 기기가 부팅되었으며 사용자가 기기의 잠금을
+해제했음을 나타냅니다.</p>
+
+<p>사용자가
+<code>UserManager.isUserUnlocked()</code>를 호출하여 기기 잠금을 해제했는지 직접 쿼리할 수 있습니다.</p>
+
+<h2 id="migrating">기존 데이터 마이그레이션</h2>
+
+<p>직접 부팅 모드를 사용하도록 사용자가 자신의 기기를 업데이트하는 경우,
+여러분이 기존 데이터를 기기 암호화 저장소로 마이그레이션해야 할 수도 있습니다.
+<code>Context.moveSharedPreferencesFrom()</code>과
+<code>Context.moveDatabaseFrom()</code>을 사용하여 자격 증명 암호화 저장소와 기기 암호화 저장소 간에
+기본 설정과 데이터베이스 데이터를 마이그레이션합니다.</p>
+
+<p>어떤 데이터를 자격 증명
+암호화 저장소에서 기기 암호화 저장소로 마이그레이션할지를 신중히 결정하세요. 암호나 인증 토큰 등의
+개인 사용자 정보는 기기 암호화 저장소로
+마이그레이션해서는 안 됩니다. 일부 시나리오에서
+두 가지 암호화 저장소에 있는 별도의 데이터 세트를 관리해야 할 수 있습니다.</p>
+
+<h2 id="testing">암호화 인식 앱 테스트</h2>
+
+<p>새로운 직접 부팅 모드로 암호화 인식 앱을 테스트하세요. 직접 부팅을
+활성화하는 방법은 두 가지가 있습니다.</p>
+
+<p class="caution"><strong>주의:</strong> 직접 부팅을 활성화하면
+기기에서 모든 사용자 데이터가 삭제됩니다.</p>
+
+<p>Android N이 설치된 지원 기기에서
+직접 부팅을 활성화하는 방법:</p>
+
+<ul>
+<li><b>Developer options</b>가 활성화되어 있지 않으면 기기에서
+<b>Settings > About phone</b>으로 이동하여 <b>Build number</b>를
+7번 탭하여 활성화합니다. 개발자 옵션 화면이 나오면
+<b>Settings > Developer options</b>로 이동해서
+<b>Convert to file encryption</b>을 선택합니다.</li>
+<li>다음 adb shell 명령을 사용하여 직접 부팅 모드를 활성화합니다.
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>테스트 기기에서 모드를 전환해야 할 경우
+에뮬레이션된 직접 부팅 모드도 사용할 수 있습니다. 에뮬레이션된 모드는 개발 시에만 사용해야 하며
+데이터가 손실될 수 있습니다. 에뮬레이션된 직접 부팅 모드를 활성화하려면
+기기에서 잠금 패턴을 설정합니다. 잠금 패턴을 설정할 때 안전 모드 화면으로 시작할지 묻는 메시지가 나오면 "No thanks"를
+선택한 뒤 다음
+adb shell 명령을 사용합니다.</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>에뮬레이션된 직접 부팅 모드를 끄려면 다음 명령을 사용합니다.</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>이 명령을 사용하면 기기가 재부팅됩니다.</p>
diff --git a/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..efd05f3
--- /dev/null
+++ b/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd
@@ -0,0 +1,148 @@
+page.title=범위가 지정된 디렉터리 액세스
+page.keywords=preview, sdk, 범위가 지정된 디렉터리 액세스
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#accessing">외부 저장소 디렉터리 액세스</a></li>
+ <li><a href="#removable">이동식 미디어의 디렉터리 액세스</a></li>
+ <li><a href="#best">모범 사례</a></li>
+ </ol>
+</div>
+</div>
+
+<p>일반적으로 사진 앱과 같은 앱은
+<code>Pictures</code> 디렉터리 등 외부 저장소의 특정 디렉터리에만 액세스하면 됩니다. 기존 외부 저장소 액세스 방식은
+이런 유형의 앱에 대상화된 디렉터리 액세스를 쉽게
+제공하지 못합니다. 예를 들면 다음과 같습니다.</p>
+
+<ul>
+<li>매니페스트에서 {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+또는 {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE}를 요청하면
+외부 저장소의 모든 공개 디렉터리에 액세스할 수 있습니다.
+이는 앱에 필요한 것보다 과도한 액세스를 제공할 수 있습니다.</li>
+<li>일반적으로,
+<a href="{@docRoot}guide/topics/providers/document-provider.html">저장소
+액세스 프레임워크</a>를 사용하면 시스템 UI를 통해 사용자가 디렉터리를
+선택할 수 있습니다. 앱이 항상 동일한 외부 디렉터리에 액세스한다면
+필요 없는 동작입니다.</li>
+</ul>
+
+<p>Android N은 일반 외부 저장소 디렉터리에 액세스하기 위한
+단순화된 새로운 API를 제공합니다. </p>
+
+<h2 id="accessing">외부 저장소 디렉터리 액세스</h2>
+
+<p><code>StorageManager</code> 클래스를 사용하여 적절한
+<code>StorageVolume</code> 인스턴스를 가져옵니다. 그 후, 해당 인스턴스의
+<code>StorageVolume.createAccessIntent()</code> 메서드를 호출하여 인텐트를 생성합니다.
+이 인텐트로 외부 저장소 디렉터리에 액세스합니다. 이동식 미디어 볼륨을 비롯한
+모든 사용 가능한 볼륨의 목록을 가져오려면
+<code>StorageManager.getVolumesList()</code>를 사용합니다.</p>
+
+<p>특정 파일에 대한 정보가 있으면
+<code>StorageManager.getStorageVolume(File)</code>을 사용하여 해당 파일이 들어 있는
+<code>StorageVolume</code>을 가져옵니다. 이 <code>StorageVolume</code>에서
+<code>createAccessIntent()</code>를 호출하여 파일의 외부 저장소 디렉터리에
+액세스합니다.</p>
+
+<p>
+외부 SD 카드와 같은 보조 볼륨에서는 특정 디렉터리 대신 전체 볼륨에 대한 액세스를 요청하려면
+<code>StorageVolume.createAccessIntent()</code>를 호출할 때
+null을 전달합니다. 기본 볼륨에 null을 전달하거나 잘못된 디렉터리 이름을 전달하는 경우
+<code>StorageVolume.createAccessIntent()</code>는 null을
+반환합니다.
+</p>
+
+<p>다음 코드 조각은 기본 공유 저장소에서
+<code>Pictures</code> 디렉터리를 여는 방법에 대한 예시입니다.</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>시스템이 외부 디렉터리에 액세스 권한을 부여하고자 시도하고,
+필요에 따라 단순화된 UI를 사용하는 사용자의 액세스를 확인합니다.</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>그림 1.</strong> Pictures 디렉터리에
+액세스를 요청하는 애플리케이션.</p>
+
+<p>사용자가 액세스 권한을 부여하면, 시스템이
+<code>Activity.RESULT_OK</code>의 결과 코드가 포함된
+<code>onActivityResult()</code> 재정의와 URI가 포함된 인텐트 데이터를 호출합니다. 제공된
+URI를 사용하여 디렉터리 정보에 액세스합니다.
+<a href="{@docRoot}guide/topics/providers/document-provider.html">저장소
+액세스 프레임워크</a>가
+반환한 URI를 사용하는 것과 유사합니다.</p>
+
+<p>사용자가 액세스 권한을 부여하지 않으면 시스템이
+<code>Activity.RESULT_CANCELED</code>의 결과 코드가 포함된
+<code>onActivityResult()</code> 재정의와 null 인텐트 데이터를 호출합니다.</p>
+
+<p class="note"><b>참고</b>: 특정 외부 디렉터리에 대한 액세스 권한을 얻으면
+해당 디렉터리의 하위 디렉터리에 대한 액세스 권한도 얻게 됩니다.</p>
+
+<h2 id="removable">이동식 미디어의 디렉터리 액세스</h2>
+
+<p>범위가 지정된 디렉터리 액세스를 사용하여 이동식 미디어의 디렉터리에 액세스하려면
+먼저 다음과 같은
+{@link android.os.Environment#MEDIA_MOUNTED} 알림을 수신하는 {@link android.content.BroadcastReceiver}를 추가합니다.</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>사용자가 SD 카드 등의 이동식 미디어를 장착하면 시스템이
+{@link android.os.Environment#MEDIA_MOUNTED} 알림을 보냅니다. 이 알림은
+이동식 미디어 디렉터리에 액세스하는 데 사용할 수 있는 인텐트 데이터의 <code>StorageVolume</code> 객체를
+제공합니다. 다음은
+이동식 미디어의 <code>Pictures</code> 디렉터리에 액세스하는 예시입니다.</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">모범 사례</h2>
+
+<p>가능하면, 사용자에게 액세스 권한을 반복적으로 요청하지 않도록 외부 디렉터리 액세스 URI를
+변경하지 마세요. 사용자가 액세스 권한을 부여하면 디렉터리 액세스 URI로
+<code>getContentResolver().takePersistableUriPermssion()</code>를
+호출합니다. 시스템이 URI를 유지하고 이후 액세스 요청에서는
+<code>RESULT_OK</code>를 반환하고 사용자에게 확인 UI를
+표시하지 않습니다.</p>
+
+<p>사용자가 외부 디렉터리 액세스를 거부하면
+다시 즉시 액세스를 요청하지 마세요. 액세스를 반복적으로 요청하면
+사용자 환경을 저해하는 결과를 낳습니다. 사용자가 요청을 거부하는데 앱이 다시 액세스를
+요청하면, UI에 <b>Don't ask again</b> 체크박스가 표시됩니다.</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>그림 1.</strong> 이동식 미디어에 대해
+다시 액세스 요청을 하는 애플리케이션.</p>
+
+<p>사용자가 <b>Don't ask again</b>을 선택하여 요청을 거부하면 앱에서 해당 디렉터리에 대한 이후의 모든
+요청이 자동으로 거부되고,
+사용자에게는 어떤 요청 UI도 표시되지 않습니다.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/training/articles/security-config.jd b/docs/html-intl/intl/ko/training/articles/security-config.jd
new file mode 100644
index 0000000..414c139
--- /dev/null
+++ b/docs/html-intl/intl/ko/training/articles/security-config.jd
@@ -0,0 +1,747 @@
+page.title=네트워크 보안 구성
+page.keywords=androidn, 보안, 네트워크
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>이 문서의 내용</h2>
+<ol>
+ <li><a href="#manifest">보안 구성 파일 추가</a></li>
+ <li><a href="#CustomTrust">신뢰할 수 있는 CA 사용자 지정</a>
+ <ol>
+ <li><a href="#ConfigCustom">신뢰할 수 있는 사용자 지정 CA 구성</a></li>
+ <li><a href="#LimitingCas">신뢰할 수 있는 CA 세트 제한</a></li>
+ <li><a href="#TrustingAdditionalCas">추가 CA 신뢰</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">디버그 전용 CA</a></li>
+ <li><a href="#UsesCleartextTraffic">일반 텍스트 트래픽 옵트아웃</a></li>
+ <li><a href="#CertificatePinning">인증서 고정</a></li>
+ <li><a href="#ConfigInheritance">구성 상속 동작</a></li>
+ <li><a href="#FileFormat">구성 파일 형식</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N에는 앱 코드를 수정하지 않고 앱이 안전한 선언
+구성 파일에서 네트워크 보안 설정을 사용자 지정할 수 있는
+네트워크 보안 구성 기능이 포함되어 있습니다. 이 설정은
+특정 도메인과 특정 앱에 대해 구성할 수 있습니다. 이 기능의
+핵심 기능:
+</p>
+
+<ul>
+ <li>
+ <b>사용자 지정 신뢰 앵커:</b> 앱의 보안 연결에 대해 신뢰할 수 있는 인증 기관(CA)을
+사용자 지정합니다. 예를 들어,
+특정한 자체 서명 인증서를 신뢰하거나
+앱이 신뢰하는 공개 CA 세트를 제한합니다.
+ </li>
+
+ <li>
+ <b>디버그 전용 재정의:</b> 설치된 기반에 위험을 더하지 않고도, 앱의 보안 연결을 안전하게
+디버그할 수 있습니다.
+ </li>
+
+ <li>
+ <b>일반 텍스트 트래픽 옵트아웃:</b> 일반 텍스트 트래픽을 실수로 사용하지
+않도록 앱을 보호합니다.
+ </li>
+
+ <li>
+ <b>인증서 고정:</b> 앱의 안전한 연결을 특정 인증서로
+제한합니다.
+ </li>
+</ul>
+
+
+<h2 id="manifest">보안 구성 파일 추가</h2>
+
+<p>
+ 네트워크 보안 구성 기능은 XML 파일을 사용해서
+앱의 설정을 지정합니다. 앱 매니페스트에 이 파일을 가리키는 항목을
+포함해야 합니다. 매니페스트에서 발췌한 다음 코드는
+이 항목을 생성하는 방법을 보여줍니다.
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application ... >
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">신뢰할 수 있는 CA 사용자 지정</h2>
+
+<p>
+ 앱에서 플랫폼 기본값 대신 사용자 지정 CA 세트를
+신뢰하고자 할 수 있습니다. 가장 일반적인 이유는 다음과 같습니다.
+</p>
+
+<ul>
+ <li>사용자 지정 인증 기관(자체 서명한 인증서,
+국제 기업 CA에서 발급한 인증서 등)을 포함한 호스트에 연결.
+ </li>
+
+ <li>모든 사전 설치된 CA 대신 신뢰할 수 있는 CA로만
+CA 세트를 제한.
+ </li>
+
+ <li>시스템에 포함되지 않은 추가 CA 신뢰.
+ </li>
+</ul>
+
+<p>
+ 기본적으로 모든 앱으로부터 안전한(예: TLS, HTTPS) 연결은 사전 설치된 시스템 CA를 신뢰하고,
+API 레벨 23(Android M)
+이하를 대상으로 하는 앱도 사용자가 추가한 CA 저장소를 기본적으로 신뢰합니다. 앱은
+{@code base-config}(앱
+전체 사용자 지정) 또는 {@code domain-config}(도메인별
+사용자 지정)를 사용하여 연결을 사용자 지정할 수 있습니다.
+</p>
+
+
+<h3 id="ConfigCustom">사용자 지정 CA 구성</h3>
+
+<p>
+ 자체 서명된
+인증서를 사용하는 호스트나 신뢰할 수 있는 비공개 CA(예: 사내 CA)에서 발급한 SSL 인증서를 사용하는 호스트에
+연결할 경우를 가정합시다.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ 자체 서명된 인증서 또는 비공개 CA 인증서를 PEM 또는 DER 형식으로
+{@code res/raw/my_ca}에 추가합니다.
+</p>
+
+
+<h3 id="LimitingCas">신뢰할 수 있는 CA 세트 제한</h3>
+
+<p>
+ 앱에서 시스템이 신뢰하는 CA 중 일부를 신뢰하지 않으려면, 대신
+신뢰할 CA 세트를 줄여서 지정할 수 있습니다. 이 방법은
+다른 CA에서 발급된 허위 인증서로부터 앱을 보호해줍니다.
+</p>
+
+<p>
+ 신뢰할 수 있는 CA 세트를 제한하는 구성은 특정 도메인에서 <a href="#TrustingACustomCa">사용자 지정 CA를 신뢰</a>하는 것과 비슷하지만
+여러 CA가 리소스에서 제공된다는 점이 다릅니다.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ 신뢰할 수 있는 CA를 PEM 또는 DER 형식으로 {@code res/raw/trusted_roots}에 추가합니다.
+ PEM 형식을 사용할 경우 파일에 PEM 데이터<em>만</em> 포함되고
+다른 추가 텍스트가 포함되어서는 안 됩니다. 또한 한 개가 아니라 여러 개의
+<a href="#certificates"><code><certificates></code></a>
+요소를 제공할 수 있습니다.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ 추가 CA 신뢰
+</h3>
+
+<p>
+ 앱에서 시스템이 신뢰하지 않는 CA를 신뢰하고자 한다면,
+이는 시스템에 해당 CA가 아직 포함되지 않았거나 CA가 Android 시스템에 포함되기 위한
+요구사항을 충족하지 못했기 때문일 수 있습니다. 앱은
+구성에 대해 여러 개의 인증서 소스를 지정하여
+신뢰할 수 있는 CA를 추가할 수 있습니다.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">디버그용 CA 구성</h2>
+
+<p>
+ HTTPS로 연결되는 앱을 디버그할 때
+프로덕션 서버에 SSL 인증서가 없는 로컬 개발 서버로
+연결하고자 할 수도 있습니다. 앱 코드를 수정하지 않고 이 기능을 지원하려면,
+{@code debug-overrides}를
+사용하여 <i>오직</i> <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+이 {@code true}일 때만 신뢰할 수 있는 디버그 전용 CA를 지정할 수 있습니다. 일반적으로 IDE 및 빌드 도구는 비 릴리스 빌드에 대해
+ 이 플래그를 자동으로 설정합니다.
+</p>
+
+<p>
+ 보안 예방 조치로 앱 스토어에서
+디버그 가능으로 표시된 앱은 허용하지 않기 때문에
+일반적인 조건 코드보다 안전합니다.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">일반 텍스트 트래픽 옵트아웃</h2>
+
+<p>
+ 보안 연결만 사용하여 대상에 연결하는 애플리케이션은 해당
+대상에 대해 일반 텍스트를 지원하는 기능(HTTPS 대신 암호화되지 않은 HTTP
+프로토콜 사용)을 옵트아웃할 수 있습니다. 이 옵션은
+백엔드 서버 등의 외부 소스가 제공하는 URL의 변경 사항으로 인해
+앱에서 우연히 회귀가 일어나지 않도록 예방합니다.
+ 자세한 내용은 {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()}를 참조하세요.
+</p>
+
+<p>
+ 예를 들어, 앱에서 적대적 네트워크로부터 민감한 트래픽을 보호하기 위해 {@code
+ secure.example.com}에 대한 연결은 항상 HTTPS를 통해서만 수행되도록
+할 수 있습니다.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">인증서 고정</h2>
+
+<p>
+ 일반적으로 앱은 모든 사전 설치된 CA를 신뢰합니다. 이러한 CA에서
+허위 인증서를 발급한다면 앱이 MiTM
+공격에 노출될 위험이 있습니다. 일부 앱은 신뢰하는 CA 세트를 제한하거나
+인증서를 고정하는 방식으로 허용하는 인증서 세트를 제한합니다.
+</p>
+
+<p>
+ 인증서 고정은
+공개 키 해시(X.509인증서의 SubjectPublicKeyInfo)로 인증서 세트를 제공하는 방식으로 수행됩니다. 그러면 인증서 체인에
+하나 이상의 고정된 공개 키가 있어야만
+인증서 체인이 유효합니다.
+</p>
+
+<p>
+ 인증서 고정을 사용할 때는 언제나 백업 키를 포함해야
+새로운 키로 강제 전환하거나 CA를 변경할 경우(
+CA 인증서 또는 해당 CA의 중간 CA에 고정할 경우)
+앱 연결이 영향을 받지 않습니다. 그렇지 않으면
+연결을 복구하기 위해 앱에 업데이트를 내보내야 합니다.
+</p>
+
+<p>
+ 또한, 고정을 수행하지 않게 되면 핀 만료 시간을
+설정할 수 있습니다. 이는 업데이트되지 않은 앱에서
+연결 문제를 예방해 줍니다. 그러나 핀에 만료 시간을 설정하면
+고정 우회가 가능할 수도 있습니다.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">구성 상속 동작</h2>
+
+<p>
+ 특정 구성에서 설정되지 않은 값을 상속합니다. 이 동작은 구성 파일을 읽을 수 있게 유지하면서도
+더욱 복잡한 구성이 가능합니다.
+</p>
+
+<p>
+ 특정 항목에 값이 설정되지 않았다면
+그 다음으로 일반적인 항목의 값이 사용됩니다. {@code domain-config}에서 설정되지 않은 값은
+중첩될 경우 상위 {@code domain-config}에서 가져오고 그렇지 않을 경우 {@code
+ base-config}에서 가져옵니다. {@code base-config}에서 설정되지 않은 값은
+플랫폼 기본값을 사용합니다.
+</p>
+
+<p>
+ 예를 들어, {@code
+ example.com}의 하위 도메인에 대한 모든 연결은 사용자 지정 CA 세트를 사용해야 합니다. 또한, 이러한 도메인에 대한 일반 텍스트 트래픽은
+{@code
+ secure.example.com}에 연결할 때를 <em>제외</em>하고 허용됩니다. {@code example.com} 구성 내부에 {@code
+ secure.example.com} 구성을 중첩하면
+{@code trust-anchors}를 복제하지 않아도 됩니다.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">구성 파일 형식</h2>
+
+<p>
+ 네트워크 보안 구성 기능은 XML 파일 형식을 사용합니다.
+ 파일의 전반적 구조는 다음 코드 샘플에 나타나 있습니다.
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ 다음 섹션에서는 이 파일 형식의 구문과
+기타 세부 정보를 설명합니다.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 다음을 포함할 수 있습니다.
+ </dt>
+
+ <dd>
+ <code><a href="#base-config"><base-config></a></code> 0 또는 1개<br>
+ <code><a href=
+ "#domain-config"><domain-config></a></code> 임의의 개수<br>
+ <code><a href="#debug-overrides"><debug-overrides></a></code> 0 또는 1개
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 구문:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ 다음을 포함할 수 있습니다.
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 설명:
+ </dt>
+
+ <dd>
+ 대상이
+<a href="#domain-config"><code>domain-config</code></a>에 포함되지 않는 모든 연결에서 사용하는 기본 구성.
+
+<p>
+ 설정되지 않은 값은 플랫폼 기본값을 사용합니다. API 레벨 24 이상을 대상으로 하는
+앱의 기본 구성:
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+API 레벨 23 이하를 대상으로 하는 앱의 기본 구성:
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>구문:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>다음을 포함할 수 있습니다.</dt>
+
+<dd>
+<code><a href="#domain"><domain></a></code> 1개 이상
+<br/><code><a href="#trust-anchors"><trust-anchors></a></code> 0 또는 1개
+<br/><code><a href="#pin-set"><pin-set></code></a> 0 또는 1개
+<br/>중첩된 <code><domain-config></code> 임의의 개수</dd>
+
+<dt>설명</dt>
+<dd>{@code domain} 요소에서 정의한 특정 대상에 대한 연결에 사용되는 구성.
+
+<p>여러 {@code domain-config} 요소에서 대상을 포함하는 경우 가장 구체적인(긴)
+일치 도메인이 포함된 구성이 사용됩니다.</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ 구문:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ 속성:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ {@code "true"}인 경우 이 도메인 규칙이 도메인 및 모든 하위 도메인(하위 도메인의 하위 도메인 포함)과
+일치합니다. 그렇지 않을 경우 이 규칙은
+정확한 일치에만 적용됩니다.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ 설명:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ 구문:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ 다음을 포함할 수 있습니다.
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code> 0 또는 1개
+ </dd>
+
+ <dt>
+ 설명:
+ </dt>
+
+ <dd>
+ <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+가 {@code "true"}일 때 재정의를 적용합니다. 일반적으로
+IDE와 빌드 도구에서 생성한 비 릴리스 빌드에 해당합니다. {@code
+ debug-overrides}에서 지정된 신뢰 앵커를 모든 다른 구성에 추가하고,
+서버의 인증서 체인이 이러한
+디버그 전용 신뢰 앵커 중 하나를 사용하면 고정을 수행하지 않습니다. <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+이 {@code "false"}이면 이 섹션은 완전히 무시합니다.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ 구문:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ 다음을 포함할 수 있습니다.
+ </dt>
+
+ <dd>
+ <code><a href="#certificates"><certificates></a></code> 임의의 개수
+ </dd>
+
+ <dt>
+ 설명:
+ </dt>
+
+ <dd>
+ 보안 연결에 대한 신뢰 앵커 세트.
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>구문:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>설명:</dt>
+<dd>{@code trust-anchors} 요소에 대한 X.509 인증서 세트.</dd>
+
+<dt>속성:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+CA 인증서 소스는 다음 중 하나가 될 수 있습니다.
+<ul>
+ <li>X.509 인증서를 포함한 파일을 가리키는 원시 리소스 ID.
+ 인증서는 DER 또는 PEM 형식으로 암호화해야 합니다. PEM 인증서의 경우,
+파일에는 코멘트와 같은 PEM이 아닌 추가 데이터가
+포함되어서는 <em>안 됩니다</em>.
+ </li>
+
+ <li>사전 설치된 시스템 CA 인증서의 {@code "system"}
+ </li>
+
+ <li>사용자가 추가한 CA 인증서의 {@code "user"}
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ 이 소스의 CA가 인증서 고정을 우회할지 지정합니다. {@code
+ "true"}이고 인증서 체인이 이 소스의 CA 중 하나를 통해 묶일 경우
+고정을 수행하지 않습니다. 디버그 CA 또는
+사용자가 앱의 보안 트래픽을 MiTM하도록 지원할 때 유용합니다.
+ </p>
+
+ <p>
+ {@code debug-overrides}
+요소에서 지정되지 않은 경우 기본값은 {@code "false"}입니다. 지정된 경우 기본값은 {@code "true"}입니다.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ 구문:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ 다음을 포함할 수 있습니다.
+ </dt>
+
+ <dd>
+ <code><a href="#pin"><pin></a></code> 임의의 개수
+ </dd>
+
+ <dt>
+ 설명:
+ </dt>
+
+ <dd>
+ 공개 키 핀 세트. 신뢰할 수 있는 보안 연결은
+신뢰 체인의 공개 키 중 하나가 핀 세트에 포함되어야 합니다. 핀 형식은
+<code><a href="#pin"><pin></a></code>를 참조하세요.
+ </dd>
+
+ <dt>
+ 속성:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ 핀 만료 당일과 그 이후의 {@code yyyy-MM-dd} 형식 날짜로,
+핀이 비활성화됩니다. 이 속성이 설정되지 않으면
+핀이 만료되지 않습니다.
+ <p>
+ 만료는 어떤 이유(사용자가 앱 업데이트를 비활성화)로
+ PIN 세트가 업데이트되지 않는 앱에서
+ 연결 문제를 예방하는 데 유용합니다.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ 구문:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ 속성:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ PIN을 생성하는 데 사용된 다이제스트 알고리즘. 현재
+{@code "SHA-256"}만 지원됩니다.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/index.jd b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/index.jd
index e66e8d1..4fd4af2 100644
--- a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/index.jd
+++ b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/index.jd
@@ -35,11 +35,11 @@
</div>
<p>사용자가 앱을 탐색하고, 앱에서 나가고, 앱으로 다시 돌아가면, 앱의
-{@link android.app.Activity} 인스턴스는
+{@link android.app.Activity} 인스턴스는
수명 주기 안에서 서로 다른 상태 간에 전환됩니다. 예를 들어
액티비티가 처음 시작되는 경우, 시스템의 전면에 표시되어 사용자의
포커스를 받습니다. 이 과정에서 Android 시스템은 사용자 인터페이스 및 다른 구성요소에 설정된
-액티비티에 대해 일련의 수명 주기 메서드를 호출합니다. 사용자가 다른 액티비티를 시작하거나 다른 앱으로 전환하는
+액티비티에 대해 일련의 수명 주기 메서드를 호출합니다. 사용자가 다른 액티비티를 시작하거나 다른 앱으로 전환하는
작업을 수행하면, 백그라운드(액티비티가 더
이상 보이지 않지만 인스턴스와 해당 상태는 그대로 유지되는 상태)로 전환되면서 시스템은 액티비티에 대해 또 다른
수명 주기 메서드 세트를 호출합니다.</p>
@@ -55,7 +55,7 @@
사용자가 원하는 작업을 하고, 액티비티가 필요로 하지 않을 때 시스템 리소스 소비를 방지하는 방법에 대해서도 설명합니다.</p>
<h2>과정</h2>
-
+
<dl>
<dt><b><a href="starting.html">액티비티 시작하기</a></b></dt>
<dd>액티비티 수명 주기의 기본사항, 사용자가 앱을 시작하는 방법, 그리고 기본 액티비티 생성 작업을 수행하는
@@ -68,5 +68,5 @@
<dt><b><a href="recreating.html">액티비티 재생성하기</a></b></dt>
<dd>액티비티가 소멸되면 어떤 동작이 발생하는지, 그리고 필요 시 액티비티
상태를 재구축하는 방법에 대해 설명합니다.</dd>
-</dl>
+</dl>
diff --git a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/pausing.jd b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/pausing.jd
index b0497cd..98e2afd 100644
--- a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>이 과정에서 다루는 내용</h2>
<ol>
<li><a href="#Pause">액티비티 일지정지하기</a></li>
<li><a href="#Resume">액티비티 재개하기</a></li>
</ol>
-
+
<h2>필독 항목</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">액티비티</a>
@@ -31,7 +31,7 @@
</div>
</div>
-<p>일반적인 앱 사용 중에 가끔 다른
+<p>일반적인 앱 사용 중에 가끔 다른
비주얼 구성요소로 인해 전면의 액티비티가 <em>일시정지</em>되는 경우가 있습니다. 예를 들어, 대화 상자 스타일과 같은 반투명
액티비티가 열리면, 그 이전 액티비티는 일시정지됩니다. 액티비티가
부분적으로 보이지만 현재 포커스 내에 있지 않는 한 일시정지된 상태로 유지됩니다.</p>
@@ -59,7 +59,7 @@
<h2 id="Pause">액티비티 일지정지하기</h2>
-
+
<p>시스템이 액티비티에 대해 {@link android.app.Activity#onPause()}를 호출하면, 이는
엄밀해 말해 액티비티가 여전히 부분적으로 보일 수 있음을 의미하지만,
대개의 경우 사용자가 액티비티를 떠나 곧 정지 상태로 전환될 것임을 나타냅니다. 일반적으로 다음 작업을 수행할 때
diff --git a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/recreating.jd b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/recreating.jd
index 79fb92b..2408cac 100644
--- a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>이 과정에서 다루는 내용</h2>
<ol>
<li><a href="#SaveState">액티비티 상태 저장하기</a></li>
<li><a href="#RestoreState">액티비티 상태 복원하기</a></li>
</ol>
-
+
<h2>필독 항목</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">다양한
@@ -105,7 +105,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -138,7 +138,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -157,12 +157,12 @@
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}를 구현하도록 선택할 수 있습니다. 시스템은 복원할 저장
상태가 있을 경우에만 {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}를 호출합니다. 따라서 {@link android.os.Bundle}이 null인지 확인할 필요가 없습니다.</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/starting.jd b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/starting.jd
index ef13487..68b4562 100644
--- a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>이 과정에서 다루는 내용</h2>
<ol>
<li><a href="#lifecycle-states">수명 주기 콜백 이해하기</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">새로운 인스턴스 생성하기</a></li>
<li><a href="#Destroy">액티비티 소멸하기</a></li>
</ol>
-
+
<h2>필독 항목</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">액티비티</a></li>
@@ -83,7 +83,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -138,7 +138,7 @@
-<h2 id="launching-activity">앱 시작 관리자 액티비티 지정하기</h2>
+<h2 id="launching-activity">앱 시작 관리자 액티비티 지정하기</h2>
<p>사용자가 홈 화면에서 앱 아이콘을 선택하면, 시스템이 앱에서 "시작 관리자"(또는 "메인") 액티비티로 선언한 {@link android.app.Activity}에 대한 {@link
android.app.Activity#onCreate onCreate()} 메서드를
@@ -151,7 +151,7 @@
<p>앱의 메인 액티비티는 {@link
android.content.Intent#ACTION_MAIN MAIN} 작업 및{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} 카테고리를 포함하는 <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a>와 함께
-매니페스트 파일에 선언되어야 합니다. 예를 들면 다음과 같습니다.</p>
+매니페스트 파일에 선언되어야 합니다. 예를 들면 다음과 같습니다.</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -200,10 +200,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -268,7 +268,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/stopping.jd b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/stopping.jd
index 79e713a..2800095 100644
--- a/docs/html-intl/intl/ko/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html-intl/intl/ko/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>이 과정에서 다루는 내용</h2>
<ol>
<li><a href="#Stop">액티비티 정지하기</a></li>
<li><a href="#Start">액티비티 시작/재시작하기</a></li>
</ol>
-
+
<h2>필독 항목</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">액티비티</a>
@@ -152,13 +152,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -169,8 +169,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html-intl/intl/ko/training/basics/data-storage/databases.jd b/docs/html-intl/intl/ko/training/basics/data-storage/databases.jd
index e7ca166..70f8961 100644
--- a/docs/html-intl/intl/ko/training/basics/data-storage/databases.jd
+++ b/docs/html-intl/intl/ko/training/basics/data-storage/databases.jd
@@ -118,15 +118,15 @@
액세스할 수 없기 때문에 저장된 데이터는 안전하게 유지됩니다.</p>
<p>유용한 API 집합이 {@link
-android.database.sqlite.SQLiteOpenHelper} 클래스에서 제공됩니다.
+android.database.sqlite.SQLiteOpenHelper} 클래스에서 제공됩니다.
데이터베이스에 대한 참조를 가져오기 위해 이 클래스를 사용하는 경우, 시스템은
-필요한 경우에 한해서만 데이터베이스 생성 및 업데이트와 같이
+필요한 경우에 한해서만 데이터베이스 생성 및 업데이트와 같이
장시간 실행될 수 있는 작업을
-수행하며, <em>앱이 시작되는 동안에는 이러한 작업을 수행하지 않습니다</em>.
-{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} 또는
+수행하며, <em>앱이 시작되는 동안에는 이러한 작업을 수행하지 않습니다</em>.
+{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} 또는
{@link android.database.sqlite.SQLiteOpenHelper#getReadableDatabase}를 호출하기만 하면 됩니다.</p>
-<p class="note"><strong>참고:</strong> 이러한 작업은 장시간 실행될 수도 있기 때문에
+<p class="note"><strong>참고:</strong> 이러한 작업은 장시간 실행될 수도 있기 때문에
{@link android.os.AsyncTask} 또는 {@link android.app.IntentService}와 같이 백그라운드 스레드에서 {@link
android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} 또는 {@link
android.database.sqlite.SQLiteOpenHelper#getReadableDatabase}를
diff --git a/docs/html-intl/intl/ko/training/basics/data-storage/files.jd b/docs/html-intl/intl/ko/training/basics/data-storage/files.jd
index 71652b5..0b717a8 100644
--- a/docs/html-intl/intl/ko/training/basics/data-storage/files.jd
+++ b/docs/html-intl/intl/ko/training/basics/data-storage/files.jd
@@ -183,7 +183,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -250,7 +250,7 @@
앱을 제거하면 같이 삭제됩니다. 이러한 파일은
엄밀히 말해 외부 저장소에 저장된 파일이기 때문에 사용자 및 다른 앱의 액세스가 가능하긴 하지만, 앱 외부에서
사용자에게 값을 실제로 제공하지는 않습니다. 사용자가 앱을 제거하면 앱의 외부 개인 디렉터리 내 모든 파일을 시스템에서
-삭제합니다.
+삭제합니다.
<p>예를 들어 앱에서 다운로드한 추가 리소스 또는 임시 미디어 파일이 이에 해당합니다.</p>
</dd>
</dl>
@@ -265,7 +265,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -287,7 +287,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -357,7 +357,7 @@
myFile.delete();
</pre>
-<p>파일이 내부 저장소에 저장되어 있는 경우, {@link android.content.Context}에 위치를 요청하고 {@link android.content.Context#deleteFile deleteFile()}을 호출하여 파일을
+<p>파일이 내부 저장소에 저장되어 있는 경우, {@link android.content.Context}에 위치를 요청하고 {@link android.content.Context#deleteFile deleteFile()}을 호출하여 파일을
삭제할 수도 있습니다.</p>
<pre>
@@ -366,7 +366,7 @@
<div class="note">
<p><strong>참고:</strong> 사용자가 앱을 제거하면 Android 시스템이
-다음 항목을 삭제합니다.</p>
+다음 항목을 삭제합니다.</p>
<ul>
<li>내부 저장소에 저장한 모든 파일</li>
<li>{@link
diff --git a/docs/html-intl/intl/ko/training/basics/network-ops/data-saver.jd b/docs/html-intl/intl/ko/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..3c22b5e
--- /dev/null
+++ b/docs/html-intl/intl/ko/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,234 @@
+page.title=Data Saver
+metaDescription=User-enabled data usage optimization.
+page.keywords="android N", "data usage", "metered network"
+page.image=images/cards/card-nyc_2x.jpg
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ 이 문서의 내용
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#status">Data Saver 기본 설정 확인</a>
+ <ol>
+ <li>
+ <a href="#request-whitelist">허용 목록 권한 요청</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#monitor-changes">Data Saver 기본 설정 변경 사항
+모니터링</a>
+ </li>
+
+ <li>
+ <a href="#testing">Android 디버그 브리지 명령을 이용한 테스트</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ 스마트폰의 수명 전체에 걸쳐, 모바일 데이터 요금제에 따른 비용이
+ 기기 자체의 가격을 쉽게 초과할 수 있습니다. N Developer Preview에서는 사용자들이
+로밍 중이든, 결제 주기가 끝날 무렵이든, 소액 선불 데이터 팩을 사용 중이든 상관없이, 데이터 사용량을 줄이기 위해 기기 전체에서
+Data Saver를 활성화할 수 있습니다.
+</p>
+
+<p>
+ 사용자가 <strong>Settings</strong>에서 Data Saver를 활성화하고
+ 해당 기기가 데이터 통신 네트워크에 있는 경우, 시스템은 백그라운드 데이터 사용을
+차단하고 가능하면 포그라운드에서 데이터를 더 적게 사용하도록 앱에게 신호를 보냅니다. 사용자는
+Data Saver가 켜진 경우에도 백그라운드 데이터 통신 연결을 허용하기 위해
+특정 앱을 허용 목록에 추가할 수 있습니다.
+</p>
+
+<p>
+ N Developer Preview는 {@link android.net.ConnectivityManager}
+ API를 확장하여 <a href="#status">사용자의 Data Saver 기본 설정을 검색</a>하고 <a href="#monitor-changes">기본
+ 설정 변경을 모니터링</a>하는 방법을
+ 앱에 제공합니다. 사용자가 Data Saver를 활성화했는지 여부를 앱이 확인하고
+포그라운드 및 백그라운드 데이터 사용을 제한하기 위해
+앱이 노력하는 것은 좋은 방법입니다.
+</p>
+
+<h2 id="status">
+ Data Saver 기본 설정 확인
+</h2>
+
+<p>
+ N Developer Preview에서 앱이 {@link
+ android.net.ConnectivityManager} API를 사용하여, 어떤 데이터 사용량 제한이
+적용되고 있는지를 확인할 수 있습니다. {@code getRestrictBackgroundStatus()}
+ 메서드는 다음 값 중 하나를 반환합니다.
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ Data Saver가 비활성화되었습니다.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ 사용자가 이 앱에 대해 Data Saver를 활성화했습니다. 앱은 포그라운드에서 데이터 사용량을
+제한하고, 백그라운드
+데이터 사용량에 대한 제한을 적절히 처리하기 위해 노력해야 합니다.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ 사용자가 Data Saver를 활성화했지만 앱이 허용 목록에 추가되어 있습니다. 앱은
+포그라운드 및 백그라운드 데이터 사용량을 제한하기 위해 여전히 노력해야 합니다.
+ </dd>
+</dl>
+
+<p>
+ Data Saver가 비활성화되어 있거나 앱이 허용 목록에 추가되어 있더라도,
+기기가 데이터 통신 네트워크에 연결될 때마다 항상
+ 데이터 사용량을 제한하는 것이 좋은 방법입니다. 다음 샘플 코드에서는 {@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} 및 {@code
+ ConnectivityManager.getRestrictBackgroundStatus()}를 사용하여 앱이 사용해야 하는 데이터의 양을
+결정합니다.
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ 허용 목록 권한 요청
+</h3>
+
+<p>
+ 앱이 백그라운드에서 데이터를 사용해야 하는 경우, 앱의 패키지 이름의 URI가 포함된
+<code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
+인텐트(예:
+<code>package:MY_APP_ID</code>)를 앱이 보내서
+허용 목록 권한을 요청할 수 있습니다.
+</p>
+
+<p>
+ 인텐트와 URI를 보내면 <strong>Settings</strong> 앱이 시작되고
+앱에 대한 데이터 사용량 설정이 표시됩니다. 그러면 사용자는 앱에 대해 백그라운드 데이터의
+사용 여부를 결정할 수 있습니다. 이 인텐트를 보내기 전에,
+백그라운드 데이터 사용을 활성화하기 위해
+<strong>Settings</strong> 앱 시작 여부를 사용자에게 먼저 묻는 것이
+좋습니다.
+</p>
+
+<h2 id="monitor-changes">
+ Data Saver 기본 설정 변경 사항 모니터링
+</h2>
+
+<p>
+ 앱은 {@code
+ ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED}를 수신하기 위해 {@link
+ android.content.BroadcastReceiver}를 만들고 수신기를 {@link android.content.Context#registerReceiver
+ Context.registerReceiver()}에 동적으로 등록하여
+Data Saver 기본 설정의 변경 사항을 모니터링할 수 있습니다. 앱은 이 브로드캐스트를 수신할 때 {@code
+ ConnectivityManager.getRestrictBackgroundStatus()}를 호출하여 <a href="#status">새로운 Data Saver 기본 설정이
+권한에 영향을 미치는지 확인</a>해야
+합니다.
+</p>
+
+<p class="note">
+ <strong>참고:</strong> 시스템에서는 {@link
+ android.content.Context#registerReceiver Context.registerReceiver()}로 동적으로 등록하는 앱에만 이
+브로드캐스트를 보냅니다. 이
+브로드캐스트를 수신하도록 매니페스트에 등록하는 앱은
+이를 수신하지 못합니다.
+</p>
+
+<h2 id="testing">
+ Android 디버그 브리지 명령을 이용한 테스트
+</h2>
+
+<a href="{@docRoot}tools/help/adb.html">Android 디버그 브리지</a>는
+네트워크 권한을 확인하고 구성하는 데 사용될 수 있는 몇 가지 명령을
+제공합니다.
+
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ 현재 전역 백그라운드 네트워크
+ 제한 설정, 허용 목록에 현재 있는 패키지 UID 및 알려진
+다른 패키지의 네트워크 권한이 포함된 보고서를 생성합니다.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ Network Policy Manager(netpolicy) 명령의 전체 목록을 표시합니다.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ <code>true</code> 또는
+ <code>false</code>를 각각 전달할 때 Data Saver 모드를 활성화하거나 비활성화합니다.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ 지정된 패키지 UID를 허용 목록에 추가하여 백그라운드 데이터 통신 연결을
+ 허용합니다.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ 지정된 패키지 UID를 허용 목록에서 제거하여, Data Saver가 활성화된 동안 백그라운드 데이터 통신 연결을
+차단합니다.
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/ko/training/material/animations.jd b/docs/html-intl/intl/ko/training/material/animations.jd
index e8c6267..79710c1 100644
--- a/docs/html-intl/intl/ko/training/material/animations.jd
+++ b/docs/html-intl/intl/ko/training/material/animations.jd
@@ -47,7 +47,7 @@
<ul>
<li>제한된 물결의 경우, <code>?android:attr/selectableItemBackground</code></li>
-<li>뷰를 넘어 확장되는 물결의 경우, <code>?android:attr/selectableItemBackgroundBorderless</code>
+<li>뷰를 넘어 확장되는 물결의 경우, <code>?android:attr/selectableItemBackgroundBorderless</code>
이 경우 물결이 null이 아닌 배경을 가진 뷰의 가장 가까운 상위 요소 위에 그려지고 해당 상위 요소까지로 제한됩니다.
</li>
</ul>
@@ -139,7 +139,7 @@
</video>
</div>
<div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
- <p class="img-caption" style="margin-top:3px;margin-bottom:10px"><strong>그림 1</strong> -
+ <p class="img-caption" style="margin-top:3px;margin-bottom:10px"><strong>그림 1</strong> -
공유 요소를 이용한 전환.</p>
<em>영화를 재생하려면 기기 화면을 클릭하세요.</em>
</div>
@@ -263,7 +263,7 @@
그렇지 않으면 호출하는 액티비티가 나가기 전환을 시작하지만, 배율 또는 페이드와 같은 창 전환이 나타납니다.
</p>
-<p>들어가기 전환을 최대한 빨리 시작하려면 호출되는 액티비티에서
+<p>들어가기 전환을 최대한 빨리 시작하려면 호출되는 액티비티에서
{@link android.view.Window#setAllowEnterTransitionOverlap Window.setAllowEnterTransitionOverlap()}
메서드를 사용하세요. 그러면 더욱 인상적인 들어가기 전환이 가능합니다.</p>
@@ -317,7 +317,7 @@
});
</pre>
-<p>코드에서 생성하는 공유된 동적 뷰의 경우,
+<p>코드에서 생성하는 공유된 동적 뷰의 경우,
{@link android.view.View#setTransitionName View.setTransitionName()} 메서드를 사용하여 두 액티비티의 공통 요소 이름을 지정합니다.
</p>
@@ -414,7 +414,7 @@
</selector>
</pre>
-<p>사용자지정 뷰 상태 애니메이션을 뷰에 첨부하려면 이 예와 같이 XML 리소스 파일의
+<p>사용자지정 뷰 상태 애니메이션을 뷰에 첨부하려면 이 예와 같이 XML 리소스 파일의
<code>selector</code> 요소를 사용하여 애니메이터를 정의한 후에 <code>android:stateListAnimator</code> 특성을 통해 뷰에 할당합니다.
코드에서 뷰에 상태 목록 애니메이터를 할당하려면 {@link android.animation.AnimatorInflater#loadStateListAnimator
AnimationInflater.loadStateListAnimator()} 메서드를 사용하고,
diff --git a/docs/html-intl/intl/ko/training/material/lists-cards.jd b/docs/html-intl/intl/ko/training/material/lists-cards.jd
index 28fdf22..b8d6e79 100644
--- a/docs/html-intl/intl/ko/training/material/lists-cards.jd
+++ b/docs/html-intl/intl/ko/training/material/lists-cards.jd
@@ -204,7 +204,7 @@
확장하고 카드 내의 정보를 플랫폼에서 일관된 모습으로 표시할 수 있도록 합니다. {@link
android.support.v7.widget.CardView} 위젯은 그림자와 둥근 모서리를 가질 수 있습니다.</p>
-<p>그림자가 있는 카드를 생성하려면 <code>card_view:cardElevation</code> 특성을 사용합니다.
+<p>그림자가 있는 카드를 생성하려면 <code>card_view:cardElevation</code> 특성을 사용합니다.
{@link android.support.v7.widget.CardView}는 Android 5.0(API 레벨 21) 이상에서 실제 엘리베이션 및 동적 그림자를 사용하며, 이전 버전에서는 이전의 프로그래밍 방식의 그림자 구현으로 환원됩니다. 자세한 내용은 <a href="{@docRoot}training/material/compatibility.html">호환성 유지</a>를 참조하세요.
diff --git a/docs/html-intl/intl/ko/training/material/shadows-clipping.jd b/docs/html-intl/intl/ko/training/material/shadows-clipping.jd
index e04d0c5..9d1a679 100644
--- a/docs/html-intl/intl/ko/training/material/shadows-clipping.jd
+++ b/docs/html-intl/intl/ko/training/material/shadows-clipping.jd
@@ -121,7 +121,7 @@
<p>뷰를 클리핑하면 뷰의 모양을 손쉽게 바꿀 수 있습니다. 다른 디자인 요소와의 일관성을 위해, 또는 사용자 입력에 응답하여 뷰의 모양을 바꾸기 위해 뷰를 클리핑할 수 있습니다. {@link android.view.View#setClipToOutline
View.setClipToOutline()} 메서드나 <code>android:clipToOutline</code> 특성을 사용하여 뷰를 해당 윤곽선 영역까지 클리핑할 수 있습니다.
-
+
{@link android.graphics.Outline#canClip Outline.canClip()} 메서드에서 결정된 대로 사각형, 원형 및 둥근 사각형의 윤곽선만 클리핑을 지원합니다.
</p>
diff --git a/docs/html-intl/intl/ko/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/battery-monitoring.jd
index 2eacccf..058cf85 100644
--- a/docs/html-intl/intl/ko/training/monitoring-device-state/battery-monitoring.jd
+++ b/docs/html-intl/intl/ko/training/monitoring-device-state/battery-monitoring.jd
@@ -7,8 +7,8 @@
next.link=docking-monitoring.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>강의 목표</h2>
@@ -24,9 +24,9 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a>
</ul>
-</div>
</div>
-
+</div>
+
<p>백그라운드 업데이트가 배터리 수명에 미치는 영향을 줄이기 위하여 백그라운드 업데이트 빈도수를 변경하는 경우, 현재 배터리 수준과 충전 상태부터 확인하는 것이 좋습니다.</p>
<p>애플리케이션 업데이트 수행이 배터리 수명에 미치는 영향은 배터리 수준 및 기기의 충전 상태에 따라 다릅니다. 기기를 AC 충전기로 충전하는 동안 업데이트 수행이 미치는 영향은 무시해도 좋습니다. 따라서 기기가 범용 충전기에 연결되어 있을 때는 대부분 새로고침 빈도를 최대화할 수 있습니다. 반대로 기기가 충전 중이 아니라면, 업데이트 빈도를 줄이는 것이 배터리 수명 연장에 도움이 됩니다.</p>
@@ -34,8 +34,8 @@
<p>마찬가지로 배터리가 거의 방전된 경우, 업데이트 빈도를 줄이거나 중단할 수 있습니다.</p>
-<h2 id="DetermineChargeState">현재 충전 상태 확인</h2>
-
+<h2 id="DetermineChargeState">현재 충전 상태 확인</h2>
+
<p>먼저 현재 충전 상태를 확인하는 것부터 시작합니다. {@link android.os.BatteryManager}는 배터리 충전 상태 등 충전 정보를 스티키 {@link android.content.Intent}를 통해 브로드캐스트합니다.</p>
<p>스티키 인텐트이므로 {@link android.content.BroadcastReceiver}를 등록할 필요가 없으며 아래 코드 상의 리시버와 같이 간단히 {@code registerReceiver}을(를) 호출하여 {@code null}에 제출하면 현재 배터리 상태가 담긴 인텐트가 반환됩니다. 여기에 실제 {@link android.content.BroadcastReceiver} 개체 사용할 수 있으나, 이후 섹션에서 업데이트를 다루게 되므로 그럴 필요는 없습니다.</p>
@@ -58,7 +58,7 @@
<p>일반적으로 기기가 AC 충전기에 연결된 경우 백그라운드 업데이트 빈도를 최대화합니다. USB를 통해 충전하는 경우 업데이트 빈도를 낮춥니다. 배터리가 방전 중이라면 빈도를 더 많이 낮추도록 합니다.</p>
-<h2 id="MonitorChargeState">충전 상태 변경사항 모니터링</h2>
+<h2 id="MonitorChargeState">충전 상태 변경사항 모니터링</h2>
<p>충전 상태는 수시로 변하므로 충전 상태의 변경사항을 확인하고 이에 따라 업데이트 주기를 변경하는 것이 중요합니다.</p>
@@ -75,11 +75,11 @@
<pre>public class PowerConnectionReceiver extends BroadcastReceiver {
@Override
- public void onReceive(Context context, Intent intent) {
+ public void onReceive(Context context, Intent intent) {
int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
status == BatteryManager.BATTERY_STATUS_FULL;
-
+
int chargePlug = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
boolean usbCharge = chargePlug == BATTERY_PLUGGED_USB;
boolean acCharge = chargePlug == BATTERY_PLUGGED_AC;
@@ -87,7 +87,7 @@
}</pre>
-<h2 id="CurrentLevel">현재 배터리 수준 확인</h2>
+<h2 id="CurrentLevel">현재 배터리 수준 확인</h2>
<p>현재 배터리 수준을 확인하는 것이 유용한 경우도 있습니다. 배터리 충전이 수준 이하인 경우 백그라운드 업데이트 빈도를 줄일 수 있습니다.</p>
@@ -99,7 +99,7 @@
float batteryPct = level / (float)scale;</pre>
-<h2 id="MonitorLevel">배터리 수준 중요 변경사항 모니터링</h2>
+<h2 id="MonitorLevel">배터리 수준 중요 변경사항 모니터링</h2>
<p>배터리 상태를 지속적으로 확인하는 것은 쉽지 않지만, 꼭 그럴 필요도 없습니다.</p>
diff --git a/docs/html-intl/intl/ko/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/connectivity-monitoring.jd
index 5666b98..377f85f 100644
--- a/docs/html-intl/intl/ko/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html-intl/intl/ko/training/monitoring-device-state/connectivity-monitoring.jd
@@ -11,7 +11,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>강의 목표</h2>
@@ -27,7 +27,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a>
</ul>
-</div>
+</div>
</div>
<p>반복 알람과 백그라운드 서비스는 일반적으로 인터넷 리소스 및 캐시 데이터로부터 애플리케이션의 업데이트를 예약하거나 긴 시간이 필요한 다운로드를 실행하는 데 사용됩니다. 하지만 인터넷에 연결되어 있지 않거나 연결이 매우 느려 다운로드를 완료하지 못한다면 업데이트 예약을 해도 소용이 없겠죠?</p>
@@ -35,18 +35,18 @@
<p>인터넷에 연결되었는지, 어떤 연결 방식인지를 확인하기 위하여 {@link android.net.ConnectivityManager}를 사용할 수 있습니다.</p>
-<h2 id="DetermineConnection">인터넷에 연결되어 있는지 확인</h2>
-
+<h2 id="DetermineConnection">인터넷에 연결되어 있는지 확인</h2>
+
<p>인터넷에 연결되어 있지 않는 경우 인터넷 리소스를 기반으로 한 업데이트 예약을 할 필요가 없습니다. 다음은 활성 네트워크를 쿼리하고 인터넷이 연결되어 있는지 확인하기 위한 {@link android.net.ConnectivityManager} 사용법을 보여줍니다.</p>
<pre>ConnectivityManager cm =
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
-<h2 id="DetermineType">인터넷 연결 유형 확인</h2>
+<h2 id="DetermineType">인터넷 연결 유형 확인</h2>
<p>현재 사용할 수 있는 인터넷 연결 유형을 확인할 수도 있습니다.</p>
@@ -59,7 +59,7 @@
<p>업데이트를 비활성화한 경우, 인터넷 연결이 재개되면 업데이트를 다시 시작하기 위해 연결 변경사항을 알고 있는 것이 중요합니다.</p>
-<h2 id="MonitorChanges">연결 변경사항 모니터링</h2>
+<h2 id="MonitorChanges">연결 변경사항 모니터링</h2>
<p>연결 정보가 변경될 때마다 {@link android.net.ConnectivityManager}는 {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}({@code "android.net.conn.CONNECTIVITY_CHANGE"}) 액션을 브로드캐스트합니다. 변경사항을 수신하거나 적절히 백그라운드 업데이트를 다시 시작 또는 일시 중지하기 위해 매니페스트에서 브로드캐스트 리시버를 등록할 수 있습니다.</p>
diff --git a/docs/html-intl/intl/ko/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/docking-monitoring.jd
index 0cd61a0..f3cf36d 100644
--- a/docs/html-intl/intl/ko/training/monitoring-device-state/docking-monitoring.jd
+++ b/docs/html-intl/intl/ko/training/monitoring-device-state/docking-monitoring.jd
@@ -10,7 +10,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>강의 목표</h2>
@@ -26,7 +26,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a>
</ul>
-</div>
+</div>
</div>
<p>Android 기기는 여러 종류의 도크로 도킹될 수 있습니다. 여기에는 카폰 또는 홈 도크와 디지털 및 아날로그 도크가 포함됩니다. 많은 도크가 도킹된 기기에 전기를 공급하므로 일반적으로 충전 상태와 도크 상태는 밀접한 관련이 있습니다.</p>
@@ -36,8 +36,8 @@
<p>도크 상태는 스티키 {@link android.content.Intent}로 브로드캐스트되어 기기가 도킹되었는지 여부와 도킹되었다면 어떤 종류의 도크인지 알아낼 수 있습니다. </p>
-<h2 id="CurrentDockState">현재 도킹 상태 확인</h2>
-
+<h2 id="CurrentDockState">현재 도킹 상태 확인</h2>
+
<p>도크 상태의 세부사항은 {@link android.content.Intent#ACTION_DOCK_EVENT} 액션의 스티키 브로드캐스트 내에 추가로 포함됩니다. 스티키 브로드캐스트이므로 {@link android.content.BroadcastReceiver}를 등록할 필요가 없습니다. 다음 스니펫에 표시된 브로드캐스트 수신기와 같이 간단히 {@link android.content.Context#registerReceiver registerReceiver()}를 호출하여 {@code null}에 제출할 수 있습니다. </p>
<pre>IntentFilter ifilter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
@@ -49,9 +49,9 @@
boolean isDocked = dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED;</pre>
-<h2 id="DockType">현재 도크 유형 확인</h2>
+<h2 id="DockType">현재 도크 유형 확인</h2>
-<p>4가지 유형의 도크가 있습니다.
+<p>4가지 유형의 도크가 있습니다.
<ul><li>카폰</li>
<li>데스크</li>
<li>저가형(아날로그) 데스크</li>
@@ -60,12 +60,12 @@
<p>마지막 두 가지 옵션은 API 수준 11의 Android에만 제공되어 있으므로, 디지털 또는 아날로그에 상관하지 않고 관심 있는 세 가지 도크 유형에 대해 확인하는 것이 좋습니다.</p>
<pre>boolean isCar = dockState == EXTRA_DOCK_STATE_CAR;
-boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
+boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
dockState == EXTRA_DOCK_STATE_LE_DESK ||
dockState == EXTRA_DOCK_STATE_HE_DESK;</pre>
-<h2 id="MonitorDockState">도크 상태 또는 유형 변경사항 모니터링</h2>
+<h2 id="MonitorDockState">도크 상태 또는 유형 변경사항 모니터링</h2>
<p>도킹 상태가 바뀌면 {@link android.content.Intent#ACTION_DOCK_EVENT} 액션이 브로드캐스트됩니다. 기기의 도크 상태 변경사항을 모니터링하려면 아래에 표시된 대로 애플리케이션 매니페스트에서 브로드캐스트 리시버를 등록하세요.</p>
diff --git a/docs/html-intl/intl/ko/training/monitoring-device-state/index.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/index.jd
index f96e2e1..030701f 100644
--- a/docs/html-intl/intl/ko/training/monitoring-device-state/index.jd
+++ b/docs/html-intl/intl/ko/training/monitoring-device-state/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
-<h2>요구사항과 선행조건</h2>
+<h2>요구사항과 선행조건</h2>
<ul>
<li>Android 2.0(API 수준 5) 또는 이상</li>
<li> <a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a> 사용 경험</li>
@@ -21,19 +21,19 @@
<li><a href="{@docRoot}guide/components/services.html">서비스</a>
</ul>
-</div>
+</div>
</div>
<p>좋은 앱은 호스트 기기의 배터리 수명에 미치는 영향이 미미해야 합니다. 강의를 통해 호스트 기기의 상태에 따라 기능과 동작을 수정하는 것을 모니터링하는 앱을 구축할 수 있게 됩니다.</p>
<p>연결이 끊겼을 때 백그라운드 서비스 업데이트를 사용 중지하거나, 배터리 수준이 낮을 때 업데이트 빈도를 줄이는 조치를 취하여, 사용자 환경을 손상시키지 않고 배터리 수명에 미치는 영향을 최소화할 수 있습니다.</p>
-<h2>강의</h2>
-
+<h2>강의</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
+will want to jump to a lesson or not.-->
+
<dl>
<dt><b><a href="battery-monitoring.html">배터리 수준 및 충전 상태 모니터링</a></b></dt>
<dd>충전 상태에서 현재 배터리 수준 및 변경사항을 확인 및 모니터링하여 앱의 업데이트 빈도를 변경하는 법을 알아보세요.</dd>
@@ -46,4 +46,4 @@
<dt><b><a href="manifest-receivers.html">온디맨드로 브로드캐스트 수신기 조작</a></b></dt>
<dd>매니페스트 내에 선언했던 브로드캐스트 리시버는 현재 기기 상태에서 필요 없는 것을 사용 중지하도록 런타임 때 전환될 수 있습니다. 기기가 특정 상태에 도달할 때까지 상태 변화 리시버 및 지연 액션을 전환 및 단계적으로 연결하여 효율성을 향상하는 법을 알아보세요.</dd>
-</dl>
\ No newline at end of file
+</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ko/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/ko/training/monitoring-device-state/manifest-receivers.jd
index c5c311b..0eefe08 100644
--- a/docs/html-intl/intl/ko/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html-intl/intl/ko/training/monitoring-device-state/manifest-receivers.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>강의 목표</h2>
@@ -23,7 +23,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">인텐트 및 인텐트 필터</a>
</ul>
-</div>
+</div>
</div>
<p>기기 상태 변경을 모니터링하는 가장 간단한 방법은 모니터링하는 각 상태에 대해 {@link android.content.BroadcastReceiver}를 만들어 각각을 애플리케이션 매니페스트에 등록하는 것입니다. 그러면 각 리시버 내에서 현재 기기 상태를 기반으로 반복 알람의 일정을 간단히 변경할 수 있습니다.</p>
@@ -31,10 +31,10 @@
<p>이 방법의 부작용은 리시버 중 하나라도 실행되면 매번 앱이 기기의 절전 모드를 해제시킨다는 것입니다.</p>
<p>더 나은 방법은 런타임 때 브로드캐스트 리시버를 사용 중지 또는 사용하도록 설정하는 것입니다. 이렇게 하면 매니페스트에 선언한 리시버를 필요할 때만 시스템 이벤트에 의해 실행되는 수동적인 알람으로 사용할 수 있습니다.</p>
-
-<h2 id="ToggleReceivers">효율성 향상을 위한 상태 변화 수신기의 전환 및 단계적 연결 </h2>
-
+
+<h2 id="ToggleReceivers">효율성 향상을 위한 상태 변화 수신기의 전환 및 단계적 연결 </h2>
+
<p>{@link android.content.pm.PackageManager}를 사용하여 아래에서 표시된 대로 모든 사용 또는 사용 중지하기 원하는 브로드캐스트 리시버를 포함하여 매니페스트 내에 정의된 모든 요소의 사용 가능 상태를 전환할 수 있습니다.</p>
<pre>ComponentName receiver = new ComponentName(context, myReceiver.class);
diff --git a/docs/html-intl/intl/ko/training/multiscreen/adaptui.jd b/docs/html-intl/intl/ko/training/multiscreen/adaptui.jd
index cb7b66c..a8d2fc1 100644
--- a/docs/html-intl/intl/ko/training/multiscreen/adaptui.jd
+++ b/docs/html-intl/intl/ko/training/multiscreen/adaptui.jd
@@ -10,9 +10,9 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
-
+<div id="tb-wrapper">
+<div id="tb">
+
<h2>강의 목표</h2>
<ol>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">태블릿 및 휴대전화 지원</a></li>
</ul>
-
+
<h2>다운로드 </h2>
-
+
<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">샘플 앱 다운로드</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>현재 애플리케이션이 표시하는 레이아웃에 따라 UI 플로가 달라질 수 있습니다. 예를 들어 애플리케이션이 이중 창 모드로 되어 있는 경우에는 왼쪽 창에 있는 항목을 클릭하면 오른쪽 창에 콘텐츠가 표시되고, 단일 창 모드로 되어 있는 경우에는 콘텐츠가 해당 창에 표시됩니다(다른 액티비티에서).</p>
@@ -56,7 +56,7 @@
setContentView(R.layout.main_layout);
View articleView = findViewById(R.id.article);
- mIsDualPane = articleView != null &&
+ mIsDualPane = articleView != null &&
articleView.getVisibility() == View.VISIBLE;
}
}
@@ -116,7 +116,7 @@
else {
/* use list navigation (spinner) */
actionBar.setNavigationMode(android.app.ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter adap = new ArrayAdapter<String>(this,
+ SpinnerAdapter adap = new ArrayAdapter<String>(this,
R.layout.headline_item, CATEGORIES);
actionBar.setListNavigationCallbacks(adap, handler);
}
@@ -168,7 +168,7 @@
public class HeadlinesFragment extends ListFragment {
...
@Override
- public void onItemClick(AdapterView<?> parent,
+ public void onItemClick(AdapterView<?> parent,
View view, int position, long id) {
if (null != mHeadlineSelectedListener) {
mHeadlineSelectedListener.onHeadlineSelected(position);
diff --git a/docs/html-intl/intl/ko/training/multiscreen/index.jd b/docs/html-intl/intl/ko/training/multiscreen/index.jd
index dd152ae..0a30f92 100644
--- a/docs/html-intl/intl/ko/training/multiscreen/index.jd
+++ b/docs/html-intl/intl/ko/training/multiscreen/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
-<div id="tb">
-
-<h2>요구사항과 선행조건</h2>
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>요구사항과 선행조건</h2>
<ul>
<li>Android 1.6 이상(샘플 앱의 경우 2.1 이상)</li>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/screens_support.html">다양한 화면 지원</a></li>
</ul>
-
-<h2>다운로드 </h2>
-
-<div class="download-box">
+
+<h2>다운로드 </h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">샘플 앱 다운로드</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
-
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
+
<p>Android는 소형 휴대전화에서부터 대형 TV에 이르기까지 다양한 화면 크기의 수많은 기기 유형을 지원합니다. 따라서 애플리케이션이 모든 화면 크기와 호환되어 최대한 많은 사용자가 사용할 수 있도록 디자인하는 것이 중요합니다.</p>
<p>하지만 다양한 기기 유형과 호환되는 것만으로는 충분하지 않습니다. 각 화면 크기에 따라 사용자 상호작용에 유리한 점과 불리한 점이 다릅니다. 따라서 사용자에게 만족을 주고 깊은 인상을 심어주려면 애플리케이션이 단지 여러 화면을 <em>지원</em>하는 데 그치지 않고 화면 구성별로 사용자 환경을 <em>최적화</em>해야 합니다.</p>
@@ -48,17 +48,17 @@
<p class="note"><strong>참고:</strong> 이 강의 및 강의와 관련된 샘플은 <a
href="{@docRoot}tools/support-library/index.html">호환성 라이브러리</a>를 사용하며 이는 Android 3.0 이하 버전에서 <PH>{@link android.app.Fragment}</PH> API를 사용하기 위해서입니다. 이 강의에서 API를 모두 사용하려면 라이브러리를 다운로드하여 애플리케이션에 추가해야 합니다.</p>
-
-<h2>강의</h2>
-
-<dl>
- <dt><b><a href="screensizes.html">다양한 화면 크기 지원</a></b></dt>
- <dd>이 강의에서는 여러 다양한 화면 크기에 조정되는 레이아웃을 디자인하는 방법(유연한 보기 크기, <PH>{@link android.widget.RelativeLayout}</PH>, 화면 크기 및 방향 한정자, 별칭 필터 및 나인-패치 비트맵 사용하기)을 안내합니다.</dd>
-
- <dt><b><a href="screendensities.html">다양한 화면 밀도 지원</a></b></dt>
- <dd>이 강의에서는 다양한 픽셀 밀도를 가진 화면을 지원하는 방법(밀도 독립형 픽셀(density-independent pixel) 사용하기 및 밀도별로 적합한 비트맵 제공하기)을 설명합니다.</dd>
-
- <dt><b><a href="adaptui.html">조정형 UI 플로우 구현</a></b></dt>
- <dd>이 강의에서는 여러 화면 크기/밀도 조합에 조정되도록 UI 플로우를 구현하는 방법(활성 레이아웃의 런타임 감지, 현재 레이아웃에 따른 대응, 화면 구성 변경 처리)을 설명합니다.</dd>
-</dl>
+
+<h2>강의</h2>
+
+<dl>
+ <dt><b><a href="screensizes.html">다양한 화면 크기 지원</a></b></dt>
+ <dd>이 강의에서는 여러 다양한 화면 크기에 조정되는 레이아웃을 디자인하는 방법(유연한 보기 크기, <PH>{@link android.widget.RelativeLayout}</PH>, 화면 크기 및 방향 한정자, 별칭 필터 및 나인-패치 비트맵 사용하기)을 안내합니다.</dd>
+
+ <dt><b><a href="screendensities.html">다양한 화면 밀도 지원</a></b></dt>
+ <dd>이 강의에서는 다양한 픽셀 밀도를 가진 화면을 지원하는 방법(밀도 독립형 픽셀(density-independent pixel) 사용하기 및 밀도별로 적합한 비트맵 제공하기)을 설명합니다.</dd>
+
+ <dt><b><a href="adaptui.html">조정형 UI 플로우 구현</a></b></dt>
+ <dd>이 강의에서는 여러 화면 크기/밀도 조합에 조정되도록 UI 플로우를 구현하는 방법(활성 레이아웃의 런타임 감지, 현재 레이아웃에 따른 대응, 화면 구성 변경 처리)을 설명합니다.</dd>
+</dl>
diff --git a/docs/html-intl/intl/ko/training/multiscreen/screendensities.jd b/docs/html-intl/intl/ko/training/multiscreen/screendensities.jd
index 5d6e2f3..dfaa44f 100644
--- a/docs/html-intl/intl/ko/training/multiscreen/screendensities.jd
+++ b/docs/html-intl/intl/ko/training/multiscreen/screendensities.jd
@@ -12,8 +12,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>강의 목표</h2>
<ol>
@@ -29,15 +29,15 @@
</ul>
<h2>다운로드 </h2>
-
-<div class="download-box">
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">샘플 앱 다운로드</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>이 강의에서는 다양한 리소스를 제공하고 해상도 독립형(resolution-independent) 측정 단위를 사용함으로써 다양한 화면 밀도를 지원하는 방법을 설명합니다.</p>
@@ -48,8 +48,8 @@
<p>예를 들어 두 개의 보기 사이에 여백을 지정할 때 <code>px</code>가 아닌 <code>dp</code>를 사용합니다.</p>
<pre>
-<Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+<Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/clickme"
android:layout_marginTop="20dp" />
</pre>
@@ -57,8 +57,8 @@
<p>텍스트 크기를 지정할 때에는 항상 <code>sp</code>를 사용합니다.</p>
<pre>
-<TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
+<TextView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:textSize="20sp" />
</pre>
diff --git a/docs/html-intl/intl/ko/training/multiscreen/screensizes.jd b/docs/html-intl/intl/ko/training/multiscreen/screensizes.jd
index f2e77a6..984923d 100644
--- a/docs/html-intl/intl/ko/training/multiscreen/screensizes.jd
+++ b/docs/html-intl/intl/ko/training/multiscreen/screensizes.jd
@@ -10,8 +10,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>강의 목표</h2>
<ol>
@@ -30,26 +30,26 @@
<li><a href="{@docRoot}guide/practices/screens_support.html">다양한 화면 지원</a></li>
</ul>
-<h2>다운로드 </h2>
-
-<div class="download-box">
+<h2>다운로드 </h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">샘플 앱 다운로드</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
<p>이 강의에서는 다양한 화면 크기를 지원하는 방법을 설명합니다.</p>
-<ul>
- <li>화면에 맞게 레이아웃 크기 조정</li>
- <li>화면 구성에 따라 적합한 UI 레이아웃 제공</li>
+<ul>
+ <li>화면에 맞게 레이아웃 크기 조정</li>
+ <li>화면 구성에 따라 적합한 UI 레이아웃 제공</li>
<li>올바른 화면에 올바른 레이아웃 적용</li>
- <li>정확하게 확대되는 비트맵 제공</li>
-</ul>
+ <li>정확하게 확대되는 비트맵 제공</li>
+</ul>
-<h2 id="TaskUseWrapMatchPar">'wrap_content' 및 'match_parent' 사용</h2>
+<h2 id="TaskUseWrapMatchPar">'wrap_content' 및 'match_parent' 사용</h2>
<p>레이아웃이 다양한 화면 크기에 따라 유연하게 조정되도록 하려면 일부 뷰 구성요소의 너비와 높이에 <code>"wrap_content"</code> 및 <code>"match_parent"</code>를 사용해야 합니다. <code>"wrap_content"</code>를 사용하면 뷰의 너비와 높이가 해당 뷰 내에 콘텐츠가 들어가는데 필요한 최소 크기로 설정되는 반면, <code>"match_parent"</code>(API 수준 8 이전에는 <code>"fill_parent"</code>라고도 함)를 사용하면 구성요소가 확장되어 부모뷰의 크기와 일치하게 됩니다.</p>
@@ -65,7 +65,7 @@
<p class="img-caption"><strong>그림 1.</strong> 세로 모드(왼쪽) 및 가로 모드(오른쪽)에서의 뉴스 리더 샘플 앱</p>
-<h2 id="TaskUseRelativeLayout">RelativeLayout 사용</h2>
+<h2 id="TaskUseRelativeLayout">RelativeLayout 사용</h2>
<p>비교적 복잡한 레이아웃을 만들려면 <PH>{@link android.widget.LinearLayout}의 중첩 인스턴스와</PH> <code>"wrap_content"</code> 및 <code>"match_parent"</code> 크기의 조합을 사용합니다. 하지만 <PH>{@link android.widget.LinearLayout}</PH> 을 사용하면 자식뷰의 여백 관계를 정확하게 제어할 수 없으며 <PH>{@link android.widget.LinearLayout}</PH> 단순히 나란하게 표시됩니다. 자식뷰를 일직선이 아닌 다양한 방향으로 표시해야 하는 경우 구성요소 사이의 여백 관계를 중심으로 레이아웃을 지정할 수 있는 <PH>{@link android.widget.RelativeLayout}</PH>을 사용하는 것이 더 좋은 방법일 수 있습니다. 예를 들어 화면 왼쪽에 하나의 자식뷰를, 오른쪽에 다른 자식뷰를 정렬할 수 있습니다.</p>
@@ -115,8 +115,8 @@
<p>구성요소의 크기가 변하더라도 여백 관계가 <PH>{@link android.widget.RelativeLayout.LayoutParams}</PH>.</p>
-
-<h2 id="TaskUseSizeQuali">크기 한정자 사용</h2>
+
+<h2 id="TaskUseSizeQuali">크기 한정자 사용</h2>
<p>이전 섹션에서 다룬 유연한 레이아웃이나 상대적 레이아웃으로는 한계가 있습니다. 이러한 레이아웃이 구성요소 내부 및 주위의 여백을 확장하여 다양한 화면에 맞게 조정되긴 하지만 화면 크기별로 최적의 사용자 환경을 제공하지는 못할 수 있습니다. 따라서 애플리케이션은 유연한 레이아웃을 구현할 뿐 아니라 다양한 화면 구성을 타겟팅할 수 있도록 다양한 대체 레이아웃을 제공해야 합니다. 그 방법은 런타임이 현재 기기의 구성에 따라 적합한 리소스(예: 화면 크기별로 다른 레이아웃 디자인)를 자동으로 선택하도록 해 주는 <a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">구성 한정자</a>를 사용하는 것입니다.</p>
@@ -158,7 +158,7 @@
<p>하지만 Android 3.2 이전 기기는 <code>sw600dp</code>를 크기 한정자로 인식하지 않기 때문에 최소 너비 한정자가 제대로 작동하지 않으며 따라서 <code>large</code> 한정자도 계속 사용해야 합니다. 따라서 <code>res/layout-large/main.xml</code>라는 이름의 파일이 있어야 하며 이 파일은 <code>res/layout-sw600dp/main.xml</code>과 동일한 파일입니다. 다음 섹션에서는 이런 식으로 레이아웃 파일이 중복되지 않게 하는 기술을 살펴보겠습니다.</p>
-<h2 id="TaskUseAliasFilters">레이아웃 별칭 사용</h2>
+<h2 id="TaskUseAliasFilters">레이아웃 별칭 사용</h2>
<p>최소 너비 한정자는 Android 3.2 이상 버전에서만 사용할 수 있습니다. 따라서 이전 버전과 호환되도록 하려면 추상화 크기 빈(소형, 보통, 대형 및 초대형)을 계속 사용해야 합니다. 예를 들어 휴대전화에서는 단일 창 UI가 표시되고 7인치 태블릿, TV 및 기타 대형 기기에서는 다중 창 UI가 표시되도록 UI를 디자인하려면 다음 파일을 제공해야 합니다.</p>
@@ -202,7 +202,7 @@
<PH>{@code large}</PH>,3.2 이후 버전은 <code>sw600dp</code>와 일치).</p>
-<h2 id="TaskUseOriQuali">방향 한정자 사용</h2>
+<h2 id="TaskUseOriQuali">방향 한정자 사용</h2>
<p>일부 레이아웃은 가로 및 세로 방향 모두에서 잘 작동하지만 대부분의 레이아웃은 조정을 통해 많은 이점을 누릴 수 있습니다. 다음은 뉴스 리더 샘플 앱에서 화면 크기와 방향별로 레이아웃이 어떻게 작동하는지 보여줍니다.</p>
diff --git a/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..15d85fa
--- /dev/null
+++ b/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,213 @@
+page.title=PIP
+page.keywords=preview, sdk, PIP, Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>이 문서의 내용</h2>
+<ol>
+ <li><a href="#declaring">액티비티의
+PIP 지원 선언</a></li>
+ <li><a href="#pip_button">액티비티를 PIP로 전환</a>
+</li>
+ <li><a href="#handling_ui">PIP에서 UI 처리</a>
+</li>
+ <li><a href="#continuing_playback">
+PIP에서 동영상 재생 계속</a></li>
+ <li><a href="#single_playback">PIP를 위한 단일 재생 액티비티
+사용</a></li>
+ <li><a href="#best">모범 사례</a></li>
+</ol>
+
+<h2>참고 항목</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">다중 창
+지원</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>Android N에서 Android TV 사용자는
+앱 안에서 탐색할 때 화면 모서리의 고정 창에서
+동영상을 볼 수 있습니다. PIP(Picture-In-Picture) 모드를 사용하면
+앱의 백그라운드에서 다른 액티비티를 계속하면서
+고정 창에서 동영상 액티비티를 실행할 수 있습니다. PIP 창에서 사용자는 앱을 사용하는 동안 멀티태스킹이 가능하므로
+생산성이 향상됩니다.</p>
+
+<p>앱이 PIP 모드를 실행할 시기를 결정할 수 있습니다. PIP 모드로 전환하는 시기와 관련된 몇 가지
+예시는 다음과 같습니다.</p>
+
+<ul>
+<li>사용자가 동영상에서 다른 콘텐츠를 탐색하러 이동할 때 앱이
+동영상을 PIP 모드로 전환할 수 있습니다.</li>
+<li>사용자가 콘텐츠 에피소드의 끝부분을 볼 때 앱이
+동영상을 PIP 모드로 전환할 수 있습니다. 메인 화면은 시리즈 다음 에피소드의
+홍보 또는 요약 정보를 표시합니다.</li>
+<li>사용자가 동영상을 보는 동안 앱이
+추가 콘텐츠를 대기열에 올릴 수 있는 방법을 제공할 수 있습니다. 메인 화면에 콘텐츠 선택 액티비티가 표시되는 동안
+동영상이 PIP 모드에서 계속 재생됩니다.</li>
+</ul>
+
+<p>PIP 창은 240x135dp이고
+화면 모서리 4개 중 하나에서 가장 위쪽 레이어에 표시되며, 시스템이 선택합니다. 사용자는
+리모컨의 <b>Home</b> 버튼을 눌러
+PIP 창을 전체 화면으로 전환하거나 PIP를 닫는 PIP 메뉴를 불러올 수 있습니다. 다른 동영상이
+메인 화면에서 재생되기 시작하면 PIP 창이
+자동으로 닫힙니다. 사용자가 Recents를 통해서 PIP 창을 닫을 수도 있습니다.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>그림 1.</strong> 사용자가 메인 화면에서 콘텐츠를 탐색하는 동안
+화면 모서리에 표시되는 PIP 동영상.
+</p>
+
+<p>PIP는 Android N에서 사용할 수 있는 다중 창 API를 사용하여
+고정된 동영상 오버레이 창을 제공합니다. 앱에 PIP를 추가하려면
+PIP를 지원하는 액티비티를 등록하고 필요한 경우 액티비티를 PIP 모드로 전환해야 합니다. 또한
+액티비티가 PIP 모드에 있을 때 UI 요소가 숨겨지고 동영상 재생이
+계속되는지 확인해야 합니다.</p>
+
+<h2 id="declaring">액티비티의 PIP 지원 선언</h2>
+
+<p>기본적으로 시스템은 앱에 대해 PIP를 자동으로 지원하지 않습니다.
+앱에서 PIP를 지원하려면
+<code>android:supportsPictureInPicture</code>와
+<code>android:resizeableActivity</code>를 <code>true</code>로 설정하여 매니페스트에서 동영상 액티비티를
+등록합니다. 또한,
+PIP 모드 전환 시 레이아웃 변경이 일어날 때 액티비티가 다시 시작되지 않도록
+액티비티가 레이아웃 구성 변화를 처리하게 지정합니다.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>액티비티를 등록할 때는 PIP 모드에서
+액티비티가 TV 화면의 작은 오버레이 창에 표시된다는 것을 기억하세요. 최소 UI를 포함한
+동영상 재생 액티비티가 가장 좋은 사용자 환경을 제공합니다. 작은 UI 요소를 포함한
+액티비티는 PIP 모드로 전환할 때
+사용자가 PIP 창의 UI 요소를 상세히 볼 수 없으므로
+좋은 사용자 환경을 제공하지 못할 수 있습니다.</p>
+
+<h2 id="pip_button">액티비티를 PIP로 전환</h2>
+
+액티비티를 PIP 모드로 전환해야 하는 경우
+<code>Activity.enterPictureInPictureMode()</code>를 호출합니다. 다음 예에서는 사용자가
+미디어 컨트롤 막대에서 전용 PIP 버튼을 선택했을 때
+PIP 모드로 전환합니다.</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>미디어 컨트롤 막대에 PIP 버튼을 추가하면
+사용자가 동영상 재생을 제어하면서 PIP 모드로 쉽게 전환할 수 있습니다.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>그림 1.</strong> 미디어 컨트롤 막대의 PIP
+버튼.</p>
+
+<p>Android N에는 컨트롤 막대 PIP 동작을 정의하고 PIP 아이콘을 사용하는 새로운
+<code>PlaybackControlsRow.PictureInPictureAction</code> 클래스가 포함되어 있습니다.
+</p>
+
+<h2 id="handling_ui">PIP에서 UI 처리</h2>
+
+<p>액티비티가 PIP 모드로 전환되면
+동영상 재생만 표시됩니다. 액티비티가 PIP 모드로 전환되기 전에 UI 요소를 제거하고
+액티비티가 다시 전체 화면이 되었을 때 이 요소를 복원합니다.
+필요에 따라 <code>Activity.onPictureInPictureModeChanged()</code> 또는
+<code>Fragment.onPictureInPictureModeChanged()</code>를 재정의하고
+UI 요소를 활성화/비활성화합니다. 예를 들면 다음과 같습니다.</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">PIP에서 동영상 재생 계속
+</h2>
+
+<p>액티비티가 PIP 모드로 전환되면 시스템은
+액티비티가 일시 정지된 상태에 있다고 간주하고 액티비티의 <code>onPause()</code> 메서드를 호출합니다. 동영상
+재생은 일시 정지되어서는 안되며 PIP 모드로 인해 액티비티가 일시 정지되었다면
+계속 재생되어야 합니다. 액티비티의
+<code>onPause()</code> 메서드에서 PIP를 확인하고 적절히 재생을 처리합니다. 예를 들면 다음과 같습니다.
+</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>액티비티가 PIP 모드에서 전체 화면 모드로 전환되면
+시스템이 액티비티를 재시작하고 <code>onResume()</code> 메서드를 호출합니다.</p>
+
+<h2 id="single_playback">PIP를 위한 단일 재생 액티비티
+사용</h2>
+
+<p>동영상 재생 액티비티가 PIP 모드에 있는 동안, 앱에서
+사용자가 메인 화면에서 콘텐츠를 찾아볼 때 새 동영상을 선택할 수도 있습니다. 이 때 새 액티비티를 시작하면
+사용자에게 혼동을 줄 수 있으므로, 새 액티비티를 시작하는 대신
+기존 재생 액티비티에서 새 동영상을 전체 화면 모드로 재생합니다.</p>
+
+<p>동영상 재생 요청에 단일 액티비티가 사용되도록 하고
+필요에 따라 PIP 모드로 들어가거나 PIP 모드에서 나오도록 하려면, 매니페스트에서 액티비티의
+<code>android:launchMode</code>를 <code>singleTask</code>로 설정합니다.
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>액티비티에서 {@link android.app.Activity#onNewIntent
+Activity.onNewIntent()}를 재정의하고 새 동영상을 처리하며, 필요한 경우 기존 동영상
+재생을 중단시키세요.</p>
+
+<h2 id="best">모범 사례</h2>
+
+<p>PIP는 전체 화면 동영상을 재생하는 액티비티용입니다. 액티비티를
+PIP 모드로 전환할 때는 동영상 콘텐츠만 표시하세요.
+<a href="#handling_ui">PIP에서 UI 처리</a>에서 설명한 바와 같이 액티비티가 PIP 모드로 전환되는 때를
+추적하고 UI 요소를 숨깁니다.</p>
+
+<p>PIP 창이 화면 모서리에 떠 있는 창으로 표시되므로
+PIP 창으로 가려질 수 있는 영역에는 메인 화면에서
+중요한 정보를 표시하지 말아야 합니다.</p>
+
+<p>액티비티가 PIP 모드일 때는 기본적으로 입력 포커스를 받지 않습니다. PIP 모드에서
+입력 이벤트를 수신하려면
+<code>MediaSession.setMediaButtonReceiver()</code>를 사용합니다.</p>
diff --git a/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd b/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd
new file mode 100644
index 0000000..fa557bc
--- /dev/null
+++ b/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd
@@ -0,0 +1,142 @@
+page.title=TV 녹화
+page.keywords=preview, sdk, tv, 녹화
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#supporting">녹화 지원 나타내기</a></li>
+ <li><a href="#recording">세션 녹화</a></li>
+ <li><a href="#errors">녹화 오류 처리</a></li>
+ <li><a href="#sessions">녹화된 세션 관리</a></li>
+ <li><a href="#best">모범 사례</a></li>
+ </ol>
+</div>
+</div>
+
+<p>TV 입력 서비스를 이용하면
+타임 시프팅 API를 통해 채널 재생을 일시 정지했다가 다시 시작할 수 있습니다. Android N에서는 사용자가 여러 개의 녹화된 세션을 저장할 수 있도록 함으로써
+타임 시프팅을 확장합니다.</p>
+
+<p>사용자는 미리 녹화를 예약하거나 프로그램을 보면서 녹화를
+시작할 수 있습니다. 시스템이 녹화물을 저장하면 사용자는 시스템 TV 앱을 사용하여
+녹화물을 탐색, 관리, 재생할 수 있습니다.</p>
+
+<p>TV 입력 서비스에 녹화 기능을 제공하고 싶다면,
+앱이 녹화를 지원함을 시스템에 나타내야 하고,
+프로그램 녹화 기능을 구현해야 하고, 녹화 중 발생하는 오류를 처리 및 전달해야 하고,
+녹화된 세션을 관리해야 합니다.</p>
+
+<p class="note"><strong>참고:</strong> Live Channels 앱에서는
+사용자가 녹화물을 만들거나 이에 액세스하는 방법을 아직 제공하지 않습니다. Live Channels 앱에
+대한 변경이 이루어질 때까지는, TV 입력 서비스에 대한 녹화
+환경을 완전히 테스트하기 어려울 수 있습니다.</p>
+
+<h2 id="supporting">녹화 지원 나타내기</h2>
+
+<p>TV 입력 서비스가 녹화를 지원함을 시스템에 알리려면
+서비스 메타데이터 XML 파일에서
+<code>android:canRecord</code> 속성을 <code>true</code>로 설정하세요.
+</p>
+
+<pre>
+<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
+ <b>android:canRecord="true"</b>
+ android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
+</pre>
+
+<p>서비스 메타데이터 파일에 대한 자세한 내용은
+<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">매니페스트에서 TV 입력
+서비스 선언</a>을 참조하세요.
+</p>
+
+<p>또는 다음 단계에 따라 녹화 지원 사실을 코드에
+표시할 수 있습니다.</p>
+
+<ol>
+<li><code>TvInputService.onCreate()</code> 메서드에서 <code>TvInputInfo.Builder</code>
+클래스를 사용하여 새로운
+<code>TvInputInfo</code> 객체를 생성합니다.</li>
+<li>새로운 <code>TvInputInfo</code> 객체를 생성할 때, <code>build()</code>를 호출하기 전에
+<code>setCanRecord(true)</code>를 호출하여
+서비스가 녹화를 지원함을 나타냅니다.</li>
+<li>
+<code>TvInputManager.updateTvInputInfo()</code>를 호출하여 시스템에 <code>TvInputInfo</code> 객체를 등록합니다.</li>
+</ol>
+
+<h2 id="recording">세션 녹화</h2>
+
+<p>TV 입력 서비스가 녹화 기능을 지원하도록 등록한 후,
+시스템은 앱의 녹화 구현에 액세스해야 할 때
+<code>TvInputService.onCreateRecordingSession()</code>을 호출합니다.
+ 자체적인
+<code>TvInputService.RecordingSession</code> 서브클래스를 구현하고
+<code>onCreateRecordingSession()</code> 콜백이
+실행되면 이를 반환합니다. 이 서브클래스는 정확한 채널 데이터로 전환하고,
+요청된 데이터를 녹화하고, 녹화 상태와 오류를 시스템에
+전송하는 역할을 담당합니다.</p>
+
+<p>시스템이 <code>RecordingSession.onTune()</code>을 호출하면
+채널 URI에 전달되고, URI가 지정하는 채널에 맞춰 조정됩니다.
+<code>notifyTuned()</code>를 호출해서 앱이 원하는 채널에 맞춰졌음을 시스템에 알리거나
+앱이 적절한 채널에 맞출 수 없으면
+<code>notifyError()</code>를 호출합니다.</p>
+
+<p>이어서 시스템이 <code>RecordingSession.onStartRecording()</code>
+콜백을 호출합니다. 앱이 즉시 녹화를 시작해야 합니다. 시스템이 이 콜백을 호출하면,
+녹화될 프로그램에 관한 정보가 포함된 URI를 제공할 수 있습니다.
+ 녹화가 완료되면 이
+데이터를 <code>RecordedPrograms</code> 데이터 테이블에 복사해야 합니다.</p>
+
+<p>마지막으로 시스템이 <code>RecordingSession.onStopRecording()</code>을 호출합니다.
+이 시점에서 앱이 즉시 녹화를 중단해야 합니다. 또한,
+<code>RecordedPrograms</code> 테이블에서 항목을 생성해야 합니다. 이 항목에는
+<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> 열의 녹화된 세션 데이터 URI,
+최초
+<code>onStartRecording()</code> 호출에서 시스템이 제공한 프로그램 정보가 포함됩니다.
+</p>
+
+<p><code>RecordedPrograms</code> 테이블에 액세스하는 자세한 방법은
+<a href="#sessions">녹화된 세션 관리</a>를 참조하세요.</p>
+
+<h2 id="errors">녹화 오류 처리</h2>
+
+<p>녹화 중에 오류가 발생해서 녹화된 데이터 렌더링을 사용할 수 없을 경우,
+<code>RecordingSession.notifyError()</code>를 호출하여 시스템에 알립니다.
+마찬가지로 녹화 세션이 생성된 이후 <code>notifyError()</code>를 호출하여
+앱이 더 이상 세션을 녹화하지 못한다는 것을 시스템에 알릴 수 있습니다.</p>
+
+<p>녹화 중에 오류가 발생했지만
+사용자에게 재생 가능한 부분 녹화물을 제공하고 싶다면
+<code>RecordingSession.notifyRecordingStopped()</code>를 호출하여 시스템이
+부분 세션을 사용할 수 있게 합니다.</p>
+
+<h2 id="sessions">녹화된 세션 관리</h2>
+
+<p>시스템은 <code>TvContract.RecordedPrograms</code>
+콘텐츠 제공자 테이블에 모든 녹화 가능한 채널 앱에서 녹화된
+모든 세션에 관한 정보를 보관합니다. 이 정보는
+<code>RecordedPrograms.Uri</code> 콘텐츠 URI를 통해 액세스할 수 있습니다. 콘텐츠 제공자 API를 사용하여
+이 테이블의 항목을 읽고, 추가하고, 삭제합니다.</p>
+
+<p>콘텐츠 제공자 데이터에 관한 자세한 정보는
+<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
+콘텐츠 제공자 기본 정보</a>를 참조하세요.</p>
+
+<h2 id="best">모범 사례</h2>
+
+<p>TV 기기는 저장소가 제한될 수 있으므로
+녹화된 세션을 저장할 저장소를 할당할 때는 신중히 판단하세요. 녹화된 세션을 저장할 공간이 부족할 때는
+<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code>를 사용하세요.
+</p>
+
+<p>사용자가 녹화를 시작하면 최대한 빨리 데이터 녹화를
+시작해야 합니다. 이를 용이하게 하려면
+시스템이
+<code>onCreateRecordingSession()</code> 콜백을 호출할 때 저장소 액세스 및 할당 등과 같이 선행 시간이 많이 걸리는 작업을 완료합니다. 이렇게 하면
+<code>onStartRecording()</code> 콜백이
+실행될 때 즉시 녹화를 시작할 수 있습니다.</p>
diff --git a/docs/html-intl/intl/pt-br/about/versions/android-5.0.jd b/docs/html-intl/intl/pt-br/about/versions/android-5.0.jd
index 23904b3..5408793 100644
--- a/docs/html-intl/intl/pt-br/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/pt-br/about/versions/android-5.0.jd
@@ -426,7 +426,7 @@
<p>Quando o sistema detectar uma rede adequada, ele se conectará à rede e chamará a chamada de retorno {@link android.net.ConnectivityManager.NetworkCallback#onAvailable(android.net.Network) onAvailable()}. É possível usar o objeto {@link android.net.Network} da chamada de retorno a fim de receber mais informações sobre a rede ou direcionar o tráfego para que a rede selecionada seja usada.</p>
<h3 id="BluetoothBroadcasting">Bluetooth Low Energy</h3>
-<p>O Android 4.3 apresentou o suporte de plataforma para o <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">Bluetooth Low Energy</a>(<em>Bluetooth LE</em>) na função central. No Android 5.0, um dispositivo Android agora pode agir como um <em>dispositivo periférico</em> de Bluetooth LE. Os apps podem usar esse recurso para fazer com que sua presença seja percebida pelos dispositivos vizinhos. É possível, por exemplo, criar apps que permitem que um dispositivo funcione como um pedômetro ou um monitor de integridade de dados e envie seus dados para outro dispositivo Bluetooth LE.</p>
+<p>O Android 4.3 apresentou o suporte de plataforma para o <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">Bluetooth Low Energy</a>(<em>Bluetooth LE</em>) na função central. No Android 5.0, um dispositivo Android agora pode agir como um <em>dispositivo periférico</em> de Bluetooth LE. Os apps podem usar esse recurso para fazer com que sua presença seja percebida pelos dispositivos vizinhos. É possível, por exemplo, criar apps que permitem que um dispositivo funcione como um pedômetro ou um monitor de integridade de dados e envie seus dados para outro dispositivo Bluetooth LE.</p>
<p>As novas APIs de {@link android.bluetooth.le} permitem que seus apps divulguem anúncios, verifiquem respostas e formem conexões com dispositivos Bluetooth LE vizinhos. Para usar os novos recursos de publicidade e varredura, adicione a permissão {@link android.Manifest.permission#BLUETOOTH_ADMIN BLUETOOTH_ADMIN} no manifesto. Quando os usuários atualizam ou fazem o download do seu app a partir da Play Store, eles são solicitados a conceder a seguinte permissão para seu app: "Informações da conexão Bluetooth: permite que o app controle o Bluetooth, incluindo a divulgação para dispositivos Bluetooth vizinhos ou a busca de informações sobre esses dispositivos."</p>
<p>Para começar a publicidade de Bluetooth LE para que outros dispositivos possam descobrir seu app, chame {@link android.bluetooth.le.BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback) startAdvertising()} e passe uma implementação da classe {@link android.bluetooth.le.AdvertiseCallback}. O objeto de chamada de retorno recebe um relatório do sucesso ou da falha da operação de publicidade.</p>
diff --git a/docs/html-intl/intl/pt-br/about/versions/marshmallow/android-6.0-testing.jd b/docs/html-intl/intl/pt-br/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..c00fd21
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Guia de teste
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Teste de permissões</a></li>
+ <li><a href="#doze-standby">Teste de soneca e App em espera</a></li>
+ <li><a href="#ids">Identificadores de dispositivo e backup automático</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ O Android N fornece uma oportunidade de garantir que os aplicativos funcionem
+ na próxima versão da plataforma. Esta prévia inclui uma série de mudanças de comportamento e APIs que podem
+ ter impacto no aplicativo, como descrito em <a href="{@docRoot}preview/api-overview.html">Visão geral da API
+</a> e <a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a>. No teste
+ do aplicativo com a prévia, há algumas alterações de sistema específicas em que você deve se concentrar
+ para garantir que os usuários tenham uma boa experiência.
+</p>
+
+<p>
+ Este guia descreve quais recursos de prévia testar e como testá-los com o aplicativo. Você deve
+ priorizar o teste destes recursos de prévia específicos devido ao grande impacto potencial no
+ comportamento do aplicativo:
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Permissões</a>
+ </li>
+ <li><a href="#doze-standby">Soneca e App em espera</a>
+ </li>
+ <li><a href="#ids">Identificadores de dispositivo e backup automático</a></li>
+</ul>
+
+<p>
+ Para obter mais informações sobre como configurar dispositivos físicos ou virtuais com uma imagem do sistema de prévia
+ para teste, consulte <a href="{@docRoot}preview/setup-sdk.html">Configuração
+do Android N SDK</a>.
+</p>
+
+
+<h2 id="runtime-permissions">Teste de permissões</h2>
+
+<p>
+ O novo modelo de <a href="{@docRoot}preview/features/runtime-permissions.html">permissões</a>
+ altera a maneira que as permissões são alocadas ao aplicativo pelo usuário. Em vez de conceder todas as permissões
+ durante o procedimento de instalação, o aplicativo deve pedir ao usuário permissões individuais
+ em tempo de execução. Para os usuários, este comportamento fornece um controle mais granular sobre as atividades de cada aplicativo, bem
+ como um melhor contexto para entender o porquê do aplicativo estar solicitando uma permissão específica. Os usuários
+ podem conceder ou revogar as permissões concedidas a um aplicativo individualmente a qualquer momento. É provável que este recurso
+ da prévia tenha um impacto no comportamento do aplicativo e pode impedir que alguns
+ dos recursos do aplicativo funcionem, ou funcionem em um estado degradado.
+</p>
+
+<p class="caution">
+ Esta alteração afeta todos os aplicativos em execução na nova plataforma, mesmo aqueles que não são destinados
+ para a versão nova da plataforma. A plataforma fornece um comportamento de compatibilidade limitado para aplicativos legados. No entanto,
+ você deve começar a planejar a migração do aplicativo para o novo modelo de permissões agora, com o objetivo
+ de publicar uma versão atualizada do aplicativo no lançamento oficial da plataforma.
+</p>
+
+
+<h3 id="permission-test-tips">Dicas de teste</h3>
+
+<p>
+ Use as seguintes dicas de teste para ajudar você a planejar e executar os testes do aplicativo com o novo
+ comportamento de permissões.
+</p>
+
+<ul>
+ <li>Identifique as permissões atuais do aplicativo e os caminhos de código relacionados.</li>
+ <li>Teste o fluxo de usuário entre serviços protegidos por permissão e dados.</li>
+ <li>Teste com várias combinações de permissões revogadas/concedidas.</li>
+ <li>Use a ferramenta {@code adb} para gerenciar as permissões da linha de comando:
+ <ul>
+ <li>Liste as permissões e o status por grupos:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Conceda ou revogue uma ou mais permissões usando a seguinte sintaxe:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analise o aplicativo para encontrar os serviços que usam permissões.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Estratégia de teste</h3>
+
+<p>
+ A mudança de permissões afeta a estrutura e o projeto do aplicativo, bem como
+ a experiência do usuário e os fluxos fornecidos a eles. Você deve avaliar o uso das permissões atuais
+ do aplicativo e começar a planejar novos fluxos que deseja oferecer. O lançamento oficial
+ da plataforma fornece comportamento de compatibilidade, mas deve-se planejar a atualização do aplicativo e
+ não confiar nestes comportamentos.
+</p>
+
+<p>
+ Identifique as permissões que o aplicativo realmente precisa e usa e, em seguida, encontre os vários caminhos
+ de código que usam os serviços protegidos por permissões. É possível fazer isto por meio de uma combinação de
+ testes na nova plataforma e análise de códigos. Nos testes, você deve se concentrar em usar
+ as permissões em tempo de execução alterando {@code targetSdkVersion} do aplicativo para a versão da prévia. Para
+ obter mais informações, consulte <a href="{@docRoot}preview/setup-sdk.html#">Configuração
+do Android N SDK</a>.
+</p>
+
+<p>
+ Teste com várias combinações de permissões revogadas e concedidas para destacar os fluxos de usuário
+que dependem de permissões. Onde uma dependência não for óbvia ou lógica, considere
+refatorar ou compartimentalizar este fluxo para eliminar a dependência ou para esclarecer por que
+a permissão é necessária.
+</p>
+
+<p>
+ Para obter mais informações sobre o comportamento das permissões em tempo de execução, de testes e de melhores práticas, consulte a página
+ <a href="{@docRoot}preview/features/runtime-permissions.html">Permissões</a> do Developer
+ Preview.
+</p>
+
+
+<h2 id="doze-standby">Teste de soneca e App em espera</h2>
+
+<p>
+ Os recursos de economia de energia de App em espera e soneca limitam a quantidade de processamento de segundo plano que o aplicativo
+ pode realizar quando um dispositivo está no estado ocioso ou enquanto não está em foco. As
+ restrições que o sistema pode impor nos aplicativos inclui acesso a rede limitado ou restrito,
+ tarefas de segundo plano suspensas, notificações suspensas, solicitações de soneca ignoradas e despertadores. Para garantir
+ que o aplicativo se comportará adequadamente com essas otimizações de economia de energia, deve-se testá-lo
+ simulando estes estados de baixa energia.
+</p>
+
+<h4 id="doze">Testar o aplicativo com Soneca</h4>
+
+<p>Para testar a Soneca com o aplicativo:</p>
+
+<ol>
+<li>Configure um dispositivo de hardware ou virtual com uma imagem do sistema Android N.</li>
+<li>Conecte o dispositivo à máquina de desenvolvimento e instale o aplicativo.</li>
+<li>Execute o aplicativo e deixe-o ativo.</li>
+<li>Simule o dispositivo acessando o modo Soneca executando os seguintes comandos:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Observe o comportamento do aplicativo quando o dispositivo é reativado. Certifique-se de que
+ ele se recupere corretamente quando o dispositivo sai do modo Soneca.</li>
+</ol>
+
+
+<h4 id="standby">Testar aplicativos com App em espera</h4>
+
+<p>Para testar o modo de espera do aplicativo:</p>
+
+<ol>
+ <li>Configure um dispositivo de hardware ou virtual com uma imagem do sistema Android N.</li>
+ <li>Conecte o dispositivo à máquina de desenvolvimento e instale o aplicativo.</li>
+ <li>Execute o aplicativo e deixe-o ativo.</li>
+ <li>Simule o aplicativo acessando o modo de espera executando os seguintes comandos:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simule o despertar do aplicativo usando o seguinte comando:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Observe o comportamento do aplicativo quando ele é despertado. Certifique-se de que ele se recupere corretamente
+ do modo de espera. Particularmente, deve-se verificar se as notificações e os trabalho de segundo plano
+ do aplicativo continuam a funcionar como o esperado.</li>
+</ol>
+
+<h2 id="ids">Backup automático para aplicativos e identificadores específicos do dispositivo</h2>
+
+<p>Caso o aplicativo esteja persistindo qualquer identificador específico do dispositivo, como o ID de registro do Google
+Cloud Messaging, no armazenamento interno,
+certifique-se de seguir as práticas recomendadas para excluir o local de armazenamento
+do backup automático, como descrito em <a href="{@docRoot}preview/backup/index.html">Backup automático
+para aplicativos</a>. </p>
diff --git a/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..18a08f4
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,610 @@
+page.title=Mudanças de comportamento
+page.keywords=preview,sdk,compatibility
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Neste documento</h2>
+
+<ol>
+ <li><a href="#perf">Melhorias no desempenho</a>
+ <ol>
+ <li><a href="#doze">Soneca</a></li>
+ <li><a href="#bg-opt">Otimizações em segundo plano</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">Alterações nas permissões</a>
+ </li>
+ <li><a href="#sharing-files">Compartilhamento de arquivos entre aplicativos</a></li>
+ <li><a href="#accessibility">Melhorias na acessibilidade</a>
+ <ol>
+ <li><a href="#screen-zoom">Zoom de tela</a></li>
+ <li><a href="#vision-settings">Configurações de visão no assistente de configuração</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">Aplicativos NDK vinculados a bibliotecas de plataforma</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">Retenção de anotações</a></li>
+ <li><a href="#other">Outros pontos importantes</a></li>
+</ol>
+
+<h2>Veja também</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">
+Visão geral da API do Android N</a></li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Junto com novos recursos e funcionalidades, o Android N
+inclui uma variedade de mudanças de comportamento do sistema e da API. Este documento
+destaca algumas das principais mudanças que você deve entender e considerar
+nos aplicativos.
+</p>
+
+<p>
+ Caso tenha publicado anteriormente um aplicativo para Android, saiba que ele pode ser afetado
+ pelas alterações na plataforma.
+</p>
+
+
+<h2 id="perf">Bateria e memória</h2>
+
+<p>
+O Android N inclui alterações de comportamento do sistema com o objetivo de melhorar a vida útil da bateria
+nos dispositivos e reduzir o uso de RAM. Essas alterações podem afetar o acesso do aplicativo aos
+recursos do sistema, bem como a forma como ele interage com outros aplicativos por meio de
+ certas intenções explícitas .
+</p>
+
+<h3 id="doze">Soneca</h3>
+
+<p>
+ Introduzido no Android 6.0 (nível da API 23), o modo soneca aumenta a vida útil da bateria
+ adiando atividades de CPU e rede quando um usuário deixa um dispositivo desconectado,
+ estacionário e com a tela desativada. O Android N aprimora
+ ainda mais o modo soneca aplicando um subconjunto de restrições de CPU e rede
+ quando o dispositivo está desconectado e com a tela desativada, mas não necessariamente
+ estacionário, como, por exemplo, quando o celular está no bolso do usuário.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>Figura 1.</strong> Ilustração de como o modo soneca aplica um primeiro nível de
+ restrições de atividades de sistema para aumentar a vida útil da bateria.
+</p>
+
+<p>
+ Quando o dispositivo estiver sendo alimentado pela bateria e a tela estiver desativada por um determinado
+ período, o dispositivo entrará no modo de soneca e aplicará o primeiro subconjunto de restrições: o
+acesso do aplicativo à rede será desativado e os trabalhos e sincronizações serão adiados. Se o dispositivo permanecer
+estacionário por um determinado período após entrar no modo soneca, o sistema aplicará
+as demais restrições de soneca a {@link android.os.PowerManager.WakeLock}, aos alarmes
+{@link android.app.AlarmManager} e às verificações de GPS e Wi-Fi. Independentemente
+ de as restrições de soneca serem aplicadas parcial ou totalmente, o sistema despertará o
+ dispositivo para breves janelas de manutenção, quando os aplicativos
+ poderão acessar a rede e executar todos os trabalhos/sincronizações adiados.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>Figura 2.</strong> Ilustração de como o modo soneca aplica um segundo nível de
+ restrições de atividades de sistema após o dispositivo permanecer estacionário por um determinado período.
+</p>
+
+<p>
+ Note que a ativação da tela ou do dispositivo encerra o modo soneca e
+ remove essas restrições de processamento. O comportamento adicional não
+ afeta as recomendações e práticas recomendadas para a adaptação do aplicativo à versão
+ anterior do modo soneca, introduzida no Android 6.0 (nível da API 23), como discutido em
+ <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
+ Otimização para soneca e aplicativo em espera</a>. Você deve continuar
+ a seguir essas recomendações, como o uso do Google Cloud Messaging (GCM) para
+ enviar e receber mensagens, e começar a planejar atualizações para acomodar o
+ comportamento adicional do modo soneca.
+</p>
+
+
+<h3 id="bg-opt">Project Svelte: Otimizações em segundo plano</h3>
+
+<p>
+ O Android N remove três transmissões implícitas para ajudar a otimizar o
+ uso de memória e o consumo de energia. Essa alteração é necessária porque transmissões
+ implícitas iniciam frequentemente em segundo plano aplicativos
+ registrados para escutá-las. A remoção dessas transmissões pode beneficiar consideravelmente o desempenho
+do dispositivo e a experiência do usuário.
+</p>
+
+<p>
+ Dispositivos móveis passam por alterações frequentes na conectividade, como a alternância
+ entre Wi-Fi e dados móveis. No momento, os aplicativos podem monitorar alterações de
+ conectividade registrando um receptor para a transmissão implícita {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} em seu
+ manifesto. Como vários aplicativos se registram para receber essa transmissão, uma única
+ mudança de rede pode fazer com que todos despertem e processem a transmissão
+ ao mesmo tempo.
+</p>
+
+<p>
+ De forma semelhante, em versões anteriores do Android, os aplicativos podiam se registrar para receber transmissões implícitas {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} e {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} de outros aplicativos, como
+ Câmera. Quando um usuário tira uma fotografia com o aplicativo Câmera, esses aplicativos são despertados
+ para processar a transmissão.
+</p>
+
+<p>
+ Para aliviar esses problemas, o Android N aplica a seguintes
+ otimizações:
+</p>
+
+<ul>
+ <li>Os aplicativos direcionados ao Android N não receberão transmissões {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION}, mesmo
+ se tiverem entradas no manifesto solicitando notificação desses eventos. Os aplicativos em execução
+ainda poderão escutar {@code CONNECTIVITY_CHANGE} no encadeamento principal
+ se solicitarem a notificação com {@link android.content.BroadcastReceiver}.
+ </li>
+
+ <li>Os aplicativos não podem enviar nem receber transmissões {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} ou {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}. Essa otimização
+ afeta todos os aplicativos e não apenas os direcionados ao Android N.
+ </li>
+</ul>
+
+<p>Se o seu aplicativo usar qualquer uma dessas intenções, remova as dependências
+ delas assim que possível para direcionar corretamente os dispositivos Android N.
+ A estrutura do Android oferece diversas soluções para reduzir a necessidade dessas
+ transmissões implícitas. Por exemplo, a API {@link
+ android.app.job.JobScheduler} oferece um mecanismo robusto para agendar
+ operações de rede quando ocorrem condições especificadas, como conexão a uma
+ rede ilimitada. Você pode até usar {@link
+android.app.job.JobScheduler} para reagir a mudanças em provedores de conteúdo.
+</p>
+
+<p>
+ Para obter mais informações sobre otimizações em segundo plano no N e como adaptar seu aplicativo,
+ consulte <a href="{@docRoot}preview/features/background-optimization.html">Otimizações
+em segundo plano</a>.
+</p>
+
+<h2 id="perm">Alterações nas permissões</h2>
+
+<p>
+ O Android N inclui alterações em permissões que podem afetar seu aplicativo.
+</p>
+
+<h3 id="permfilesys">Alterações nas permissões do sistema de arquivos</h3>
+
+<p>
+ Para aprimorar a segurança de arquivos privados, o diretório privado de
+ aplicativos direcionados ao Android N ou superior tem acesso restrito (<code>0700</code>).
+ Esta configuração impede o vazamento de metadados de arquivos privados, como tamanho
+ e existência. Esta alteração de permissão tem vários efeitos colaterais:
+</p>
+
+<ul>
+ <li>
+ O proprietário não deve mais relaxar as permissões para arquivos privados,
+ e qualquer tentativa de fazer isso usando
+ {@link android.content.Context#MODE_WORLD_READABLE} e/ou
+ {@link android.content.Context#MODE_WORLD_WRITEABLE} acionará uma
+ {@link java.lang.SecurityException}.
+ <p class="note">
+ <strong>Observação:</strong> Até agora, essa restrição não foi adotada em pleno vigor.
+ Aplicativos ainda podem modificar permissões para o diretório privado usando
+ APIs nativas ou a API {@link java.io.File File}. No entanto, o relaxamento
+ de permissões para o diretório privado é enfaticamente desencorajado.
+ </p>
+ </li>
+ <li>
+ A passagem de URIs <code>file://</code> para fora do domínio do pacote pode deixar o
+ receptor com um caminho inacessível. Sendo assim, tentativas de passar um URI
+ <code>file://</code> acionam uma
+ <code>FileUriExposedException</code>. A forma recomendada para compartilhamento do
+ conteúdo de um arquivo privado é o uso do {@link
+ android.support.v4.content.FileProvider}.
+ </li>
+ <li>
+ O {@link android.app.DownloadManager} não consegue mais compartilhar
+ arquivos armazenados de forma privada por nome de arquivo. Os aplicativos de legado podem acabar em um
+ caminho inacessível quando acessam {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Aplicativos direcionados para o
+ Android N ou superior acionam uma {@link java.lang.SecurityException} quando
+ tentam acessar
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
+ Aplicativos de legado que definem o local de download para um local público
+ usando
+ {@link
+android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+DownloadManager.Request.setDestinationInExternalFilesDir()} ou
+ {@link
+android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+DownloadManager.Request.setDestinationInExternalPublicDir()}
+ ainda conseguem acessar o caminho em
+{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}, no entanto, este
+ método é enfaticamente desencorajado. A forma preferencial para se acessar um arquivo
+ exposto pelo {@link android.app.DownloadManager} é o uso do
+{@link android.content.ContentResolver#openFileDescriptor
+ContentResolver.openFileDescriptor()}.
+ </li>
+</ul>
+
+<h2 id="sharing-files">Compartilhamento de arquivos entre aplicativos</h2>
+
+<p>
+Para aplicativos direcionados ao Android N, a estrutura do Android cumpre com
+a política de API {@link android.os.StrictMode} que proíbe a exposição de URIs {@code file://}
+fora do aplicativo. Se uma intenção que contenha o URI de um arquivo deixar o aplicativo, ele falhará
+ com uma exceção {@code FileUriExposedException}.
+</p>
+
+<p>
+Para compartilhar arquivos entre aplicativos, você deve enviar um URI {@code content://}
+e conceder uma permissão de acesso temporária ao URI. A forma mais fácil de conceder essa permissão é
+usar a classe {@link android.support.v4.content.FileProvider}. Para obter mais informações
+ sobre permissões e compartilhamento de arquivos,
+consulte <a href="{@docRoot}training/secure-file-sharing/index.html">Compartilhamento de Arquivos</a>.
+</p>
+
+<h2 id="accessibility">Melhorias na acessibilidade</h2>
+
+<p>
+ O Android N inclui mudanças criadas para aprimorar a facilidade de uso da
+ plataforma para usuários com visão reduzida ou deficiente. Normalmente, essas mudanças
+ não exigirão alterações de código no aplicativo. No entanto, analise
+ esse recurso e teste-o em seu aplicativo para avaliar possíveis impactos na experiência
+ do usuário.
+</p>
+
+
+<h3 id="screen-zoom">Zoom de tela</h3>
+
+<p>
+ O Android N permite que os usuários definam <strong>Display size</strong>, que amplia
+ ou reduz todos os elementos na tela, melhorando a acessibilidade do dispositivo
+ para usuários com visão deficiente. Os usuários não podem alterar o zoom da tela além da largura mínima de
+ tela de <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
+sw320dp</a>, que é a largura do Nexus 4, um telefone comum de tamanho médio.
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>Figura 3.</strong> A tela à direita mostra o efeito de
+ reduzir o Display size de um dispositivo executando uma imagem do sistema Android N.
+</p>
+
+
+<p>
+ Quando a densidade do dispositivo mudar, o sistema notificará os aplicativos em execução das
+ seguintes formas:
+</p>
+
+<ul>
+ <li>Se um aplicativo está direcionado ao nível da API 23 ou mais baixo, o sistema automaticamente elimina
+ todos os processos em segundo plano. Isso significa que, se um usuário sair
+ desse aplicativo para abrir a tela <em>Settings</em> e alterar a
+ configuração <strong>Display size</strong>, o sistema eliminará o aplicativo da mesma
+ forma que faria em uma situação de pouca memória. Se o aplicativo tiver processos
+ em primeiro plano, o sistema notificará esses processos sobre a mudança de configuração, como
+ descrito em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento
+ de alterações no tempo de execução</a>, como se a orientação do dispositivo tivesse mudado.
+ </li>
+
+ <li>Se um aplicativo for direcionado ao Android N, todos os seus processos
+ (em primeiro e segundo plano) serão notificados da mudança de configuração, como
+ descrito em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento
+ de alterações no tempo de execução</a>.
+ </li>
+</ul>
+
+<p>
+ A maioria dos aplicativos não precisa ser alterada para ser compatível com esse recurso, desde que
+ os aplicativos sigam as práticas recomendadas do Android. Os itens específicos a serem verificados são:
+</p>
+
+<ul>
+ <li>Teste o aplicativo em um dispositivo com largura de tela <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
+ e verifique se ele funciona adequadamente.
+ </li>
+
+ <li>Quando a configuração do dispositivo mudar, atualize todas as informações
+ dependentes de densidade armazenadas no cache, como bitmaps no cache ou recursos carregados da
+ rede. Verifique a ocorrência de alterações de configuração quando o aplicativo sair do estado pausado e retomar
+ a execução.
+ <p class="note">
+ <strong>Observação:</strong> se você armazenar em cache dados dependentes de configuração,
+recomendamos incluir metadados relevantes, como o tamanho de tela
+ adequado ou a densidade de pixels desses dados. Salvar esses dados permitirá que você
+ decida se será necessário atualizar os dados armazenados em cache após uma mudança
+ de configuração.
+ </p>
+ </li>
+
+ <li>Evite especificar dimensões com unidades px, pois elas não são redimensionadas de
+ acordo com a densidade de tela. Em vez disso, especifique dimensões com unidades de <a href="{@docRoot}guide/practices/screens_support.html">pixel independente de
+ densidade</a> (<code>dp</code>).
+ </li>
+</ul>
+
+<h3 id="vision-settings">Configurações de visão no assistente de configuração</h3>
+
+<p>
+ Agora, o Android N inclui Configurações de visão na tela de boas-vindas, onde os usuários podem
+ definir as configurações de acessibilidade a seguir em um novo dispositivo:
+ <strong>gesto de ampliação</strong>, <strong>tamanho da fonte</strong>
+, <strong>tamanho da tela</strong> e <strong>TalkBack</strong>. Essa alteração
+ aumenta a visibilidade de erros relacionados a configurações de tela diferentes. Para
+ avaliar o impacto do recurso, teste seus aplicativos com essas
+configurações ativadas. As configurações podem ser encontradas em <strong>Settings >
+ Accessibility</strong>.
+</p>
+
+<h2 id="ndk">Aplicativos NDK vinculados a bibliotecas de plataforma</h2>
+
+<p>
+ O Android N inclui mudanças no namespace para evitar o carregamento de APIs não públicas.
+ Se você usar o NDK, use apenas APIs públicas da plataforma
+ Android. O uso de APIs não públicas na próxima versão oficial do Android
+ poderá causar problemas no seu aplicativo.
+</p>
+
+<p>
+ Para alertar sobre o uso de APIs não públicas, os aplicativos executados em um dispositivo
+ Android N geram um erro na saída logcat quando um aplicativo chama uma API não pública.
+ Esse erro também é exibido na tela do dispositivo como mensagem para que o usuário
+fique ciente da situação. Revise o código do seu aplicativo para
+ remover o uso de APIs de plataformas não públicas e faça testes completos do aplicativo usando
+ um dispositivo de visualização ou um emulador.
+</p>
+
+<p>
+ Se o seu aplicativo depender de bibliotecas de plataforma, consulte a documentação do NDK
+ para obter soluções usuais de substituição de APIs privadas comuns por APIs públicas equivalentes.
+ Também é possível que você esteja vinculando bibliotecas de plataforma sem perceber,
+ particularmente se o aplicativo usar uma biblioteca que faz parte da plataforma (como
+ <code>libpng</code>), mas não faz parte do NDK. Nesse caso, verifique se
+o APK contém todos os arquivos .so que você pretende vincular.
+</p>
+
+<p class="caution">
+ <strong>Cuidado:</strong> Algumas bibliotecas de terceiros também podem conter links para APIs
+ não públicas. Se o aplicativo usar essas bibliotecas, poderá falhar quando executado
+ na próxima versão oficial do Android.
+</p>
+
+<p>
+ Os aplicativos não devem depender de nem usar bibliotecas nativas não incluídas
+ no NDK, pois elas podem ser alteradas ou removidas entre uma versão do Android
+ e outra. A mudança de OpenSSL para BoringSSL é um exemplo dessas alterações.
+ Além disso, dispositivos diferentes podem oferecer níveis distintos de compatibilidade, pois
+ não há requisitos de compatibilidade para bibliotecas de plataforma não incluídas
+no NDK. Se você precisar acessar bibliotecas que não são do NDK em dispositivos mais antigos, torne o carregamento
+dependente do nível da Android API.
+</p>
+
+<p>
+ Para ajudar a diagnosticar esses tipos de problemas, veja a seguir alguns exemplos de erros
+ de Java e NDK que podem ocorrer durante a compilação do aplicativo com o Android N:
+</p>
+
+<p>Exemplo de erro de Java:</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>Exemplo de erro de NDK:</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ Veja a seguir algumas correções comuns para aplicativos que encontram esses tipos de erro:
+</p>
+
+<ul>
+ <li>O uso de getJavaVM e getJNIEnv do libandroid_runtime.so pode ser substituído
+ por funções JNI padrão:
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>O uso do símbolo {@code property_get} de {@code libcutils.so} pode ser
+ substituído pelo {@code alternative __system_property_get} público.
+ Para fazer isso, use {@code __system_property_get} com o include abaixo:
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>O uso do símbolo {@code SSL_ctrl} de {@code libcrypto.so} deve ser
+ substituído por uma versão local do aplicativo. Por exemplo, vincule estaticamente
+ {@code libcyrpto.a} no arquivo {@code .so} ou inclua dinamicamente o seu próprio
+ {@code libcrypto.so} do BoringSSL ou OpenSSL no aplicativo.
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ O Android N contém mudanças para aplicativos direcionados ao Android for Work, incluindo
+ mudanças em instalação de certificados, redefinição de senha, gerenciamento de
+ usuários secundários e acesso a identificadores de dispositivos. Se você estiver criando aplicativos para
+ ambientes do Android for Work, examine essas mudanças e modifique
+ o aplicativo conforme necessário.
+</p>
+
+<ul>
+ <li>Você precisa instalar um instalador de certificado delegado antes que o DPC possa
+ configurá-lo. Para aplicativos de donos de perfil e dispositivo direcionados ao N SDK, você deve
+ instalar o instalador de certificado delegado antes de chamar o
+ controlador de políticas de dispositivo (DPC)
+ <code>DevicePolicyManager.setCertInstallerPackage()</code>. Se o instalador
+ não estiver instalado, o sistema gerará uma
+ <code>IllegalArgumentException</code>.
+ </li>
+
+ <li>As restrições de redefinição de senha de administradores do dispositivo agora se aplicam também a
+donos de perfil. Os administradores de dispositivo não podem mais usar
+ {@code DevicePolicyManager.resetPassword()} para limpar senhas nem para alterar
+ as já definidas. Os administradores de dispositivo ainda poderão definir uma senha, mas apenas
+ em dispositivos sem senha, PIN nem padrão.
+ </li>
+
+ <li>Donos de dispositivo e perfil poderão gerenciar contas, mesmo se restrições forem
+ definidas. Eles podem chamar as APIs de gerenciamento de contas,
+ mesmo se restrições de usuário <code>DISALLOW_MODIFY_ACCOUNTS</code> forem implementadas.
+ </li>
+
+ <li>Os donos de dispositivo podem gerenciar usuários secundários com maior facilidade. Quando um dispositivo
+ executar no modo de dono do dispositivo, a restrição <code>DISALLOW_ADD_USER</code>
+ será definida automaticamente. Isso evita que os usuários criem usuários secundários
+ não gerenciados. Além disso, os métodos <code>CreateUser()</code> e
+ <code>createAndInitializeUser()</code> ficaram obsoletos e foram substituídos
+ pelo novo método <code>DevicePolicyManager.createAndManageUser()</code>.
+ </li>
+
+ <li>Os donos de dispositivo podem acessar identificadores de dispositivo. O dono do dispositivo pode acessar o
+ endereço MAC Wi-Fi de um dispositivo usando
+ <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Se a rede Wi-Fi nunca
+ foi ativada no dispositivo, esse método retorna o valor {@code null}.
+ </li>
+
+ <li>A configuração modo de trabalho controla o acesso a aplicativos de trabalho. Quando o modo de trabalho está desativado, a
+ tela de início do sistema mostra os aplicativos de trabalho em cinza para indicar que estão indisponíveis. Quando é
+ reativado, o modo de trabalho retorna ao comportamento normal.
+</ul>
+
+<p>
+ Para obter mais informações sobre as mudanças no Android for Work no Android N, consulte
+ <a href="{@docRoot}preview/features/afw.html">Atualizações no Android for Work</a>.
+</p>
+
+<h2 id="annotations">Retenção de anotações</h2>
+
+<p>
+O Android N corrige um erro em que a visibilidade de anotações era ignorada.
+Este problema permitia que o tempo de execução acessasse anotações a que não deveria
+ter acesso. Entre essas anotações, estão:
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}: que só deveria estar visível em tempo de compilação.</li>
+ <li>{@code VISIBILITY_SYSTEM}: que deveria estar visível em tempo de execução, mas apenas para o
+sistema subjacente.</li>
+</ul>
+
+<p>
+Se o seu aplicativo se baseou neste comportamento, adicione uma política de retenção para anotações que deve
+ estar disponível em tempo de execução. É possível fazer isso usando {@code @Retention(RetentionPolicy.RUNTIME)}.
+</p>
+
+<h2 id="other">Outros pontos importantes</h2>
+
+<ul>
+<li>Quando um aplicativo for executado no Android N, mas for direcionado a um nível da API menor
+ e o usuário alterar o tamanho da tela, o processo do aplicativo será eliminado. O aplicativo
+deverá ser capaz de processar corretamente esse cenário. Caso contrário, ele falhará
+quando o usuário restaurá-lo usando Recents.
+
+<p>
+Você deve testar o aplicativo para verificar
+se esse comportamento não ocorre.
+Isso pode ser feito causando uma falha idêntica
+eliminando o aplicativo manualmente usando o DDMS.
+</p>
+
+<p>
+Aplicativos direcionados ao Android N e versões posteriores não serão eliminados automaticamente em mudanças de densidade.
+No entanto, podem continuar a responder a alterações de configurações de forma não ideal.
+</p>
+</li>
+
+<li>
+Os aplicativos no Android N devem ser capazes de processar corretamente mudanças de configuração
+e não devem falhar em inicializações subsequentes. Você pode verificar o comportamento do aplicativo
+alterando o tamanho da fonte (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>) e depois restaurando
+o aplicativo em Recents.
+</li>
+
+<li>
+Devido a um erro em versões anteriores do Android, o sistema não sinaliza gravações
+ em um soquete TCP no encadeamento principal como violações do modo estrito. O Android N corrigiu esse erro.
+Agora, os aplicativos que exibirem este comportamento gerarão uma{@code android.os.NetworkOnMainThreadException}.
+Geralmente, a realização de operações de rede no encadeamento principal é uma má ideia porque essas operações
+geralmente têm alta latência no final, causando ANRs e problemas.
+</li>
+
+<li>
+Agora, por padrão, a família de métodos {@code Debug.startMethodTracing()} armazena
+os resultados no diretório específico do pacote no armazenamento compartilhado,
+ e não no nível mais alto
+ do cartão SD. Isso significa que os aplicativos não precisam mais solicitar a permissão {@code WRITE_EXTERNAL_STORAGE} para usar estas APIs.
+</li>
+
+<li>
+Muitas APIs de plataformas começaram a verificar grandes cargas úteis enviadas
+por meio de transações {@link android.os.Binder}, e o
+sistema agora gera novamente{@code TransactionTooLargeExceptions}
+como {@code RuntimeExceptions}, em vez de registrá-las ou suprimi-las silenciosamente. Um
+exemplo comum é armazenar dados demais em
+{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
+que faz com que {@code ActivityThread.StopInfo} gere uma
+{@code RuntimeException} quando seu aplicativo é direcionado ao Android N.
+</li>
+
+<li>
+Se um aplicativo publica tarefas {@link java.lang.Runnable} para uma {@link android.view.View} e
+ esta {@link android.view.View}
+não está anexada a uma janela, o sistema
+coloca a tarefa {@link java.lang.Runnable} em fila com a {@link android.view.View}.
+A tarefa {@link java.lang.Runnable} não é executada até que a
+{@link android.view.View} esteja anexada
+a uma janela. Este comportamento corrige os seguintes erros:
+<ul>
+ <li>Se um aplicativo publicasse em uma {@link android.view.View} de um encadeamento que não fosse o encadeamento de IU da janela pretendida
+, o {@link java.lang.Runnable} poderia acabar sendo executado no encadeamento errado.
+ </li>
+ <li>Se a tarefa {@link java.lang.Runnable} fosse publicada de um encadeamento que não fosse
+ um encadeamento de looper, o aplicativo poderia expor a tarefa {@link java.lang.Runnable}.</li>
+</ul>
+</li>
+
+<li>
+Se um aplicativo no Android N com permissão
+{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
+tentar excluir um pacote instalado por outro aplicativo,
+o sistema solicitará a confirmação do usuário. Nesse cenário, os aplicativos devem esperar
+{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
+como status de retorno ao invocar
+{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
+</li>
+
+</ul>
+
diff --git a/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..7ed583f
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=Exemplos
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ Os exemplos de código a seguir são fornecidos para o Android N. Para
+ fazer o download dos exemplos no Android Studio, selecione a opção de menu <b>File > Import
+ Samples</b>.
+</p>
+
+<p class="note">
+ <strong>Observação:</strong> Esses projetos disponíveis para download são projetados
+ para uso com Gradle e Android Studio.
+</p>
+
+
+<h3 id="mw">Interface com várias janelas</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ Este exemplo demonstra como aproveitar as vantagens de interfaces de usuário com várias janelas
+ com seu aplicativo.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+Obter no GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">Notificações ativas</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Este é um exemplo pré-existente que mostra um serviço simples que envia
+ notificações usando NotificationCompat. Cada conversa não lida de um usuário
+ é enviada como uma notificação distinta.
+</p>
+<p>
+ Este exemplo foi atualizado para utilizar os novos recursos de notificação
+ disponíveis no Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+Obter no GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">Serviço de mensagens</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ Este é um exemplo pré-existente que demonstra como usar o
+ NotificationManager para identificar quantas notificações um aplicativo está mostrando
+ no momento.
+</p>
+<p>
+ Este exemplo foi atualizado para utilizar os novos recursos de notificação
+ disponíveis no Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+Obter no GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">Inicialização direta</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Este exemplo demonstra como armazenar e acessar dados no armazenamento criptografado de um dispositivo
+ que está sempre disponível enquanto o dispositivo é inicializado.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+Obter no GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">Acesso a diretórios com escopo</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Este exemplo demonstra como ler e gravar dados de diretórios
+ específicos exigindo menos permissões.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+Obter no GitHub</a>
+</p>
diff --git a/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-testing.jd b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..c00fd21
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Guia de teste
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Teste de permissões</a></li>
+ <li><a href="#doze-standby">Teste de soneca e App em espera</a></li>
+ <li><a href="#ids">Identificadores de dispositivo e backup automático</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ O Android N fornece uma oportunidade de garantir que os aplicativos funcionem
+ na próxima versão da plataforma. Esta prévia inclui uma série de mudanças de comportamento e APIs que podem
+ ter impacto no aplicativo, como descrito em <a href="{@docRoot}preview/api-overview.html">Visão geral da API
+</a> e <a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a>. No teste
+ do aplicativo com a prévia, há algumas alterações de sistema específicas em que você deve se concentrar
+ para garantir que os usuários tenham uma boa experiência.
+</p>
+
+<p>
+ Este guia descreve quais recursos de prévia testar e como testá-los com o aplicativo. Você deve
+ priorizar o teste destes recursos de prévia específicos devido ao grande impacto potencial no
+ comportamento do aplicativo:
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Permissões</a>
+ </li>
+ <li><a href="#doze-standby">Soneca e App em espera</a>
+ </li>
+ <li><a href="#ids">Identificadores de dispositivo e backup automático</a></li>
+</ul>
+
+<p>
+ Para obter mais informações sobre como configurar dispositivos físicos ou virtuais com uma imagem do sistema de prévia
+ para teste, consulte <a href="{@docRoot}preview/setup-sdk.html">Configuração
+do Android N SDK</a>.
+</p>
+
+
+<h2 id="runtime-permissions">Teste de permissões</h2>
+
+<p>
+ O novo modelo de <a href="{@docRoot}preview/features/runtime-permissions.html">permissões</a>
+ altera a maneira que as permissões são alocadas ao aplicativo pelo usuário. Em vez de conceder todas as permissões
+ durante o procedimento de instalação, o aplicativo deve pedir ao usuário permissões individuais
+ em tempo de execução. Para os usuários, este comportamento fornece um controle mais granular sobre as atividades de cada aplicativo, bem
+ como um melhor contexto para entender o porquê do aplicativo estar solicitando uma permissão específica. Os usuários
+ podem conceder ou revogar as permissões concedidas a um aplicativo individualmente a qualquer momento. É provável que este recurso
+ da prévia tenha um impacto no comportamento do aplicativo e pode impedir que alguns
+ dos recursos do aplicativo funcionem, ou funcionem em um estado degradado.
+</p>
+
+<p class="caution">
+ Esta alteração afeta todos os aplicativos em execução na nova plataforma, mesmo aqueles que não são destinados
+ para a versão nova da plataforma. A plataforma fornece um comportamento de compatibilidade limitado para aplicativos legados. No entanto,
+ você deve começar a planejar a migração do aplicativo para o novo modelo de permissões agora, com o objetivo
+ de publicar uma versão atualizada do aplicativo no lançamento oficial da plataforma.
+</p>
+
+
+<h3 id="permission-test-tips">Dicas de teste</h3>
+
+<p>
+ Use as seguintes dicas de teste para ajudar você a planejar e executar os testes do aplicativo com o novo
+ comportamento de permissões.
+</p>
+
+<ul>
+ <li>Identifique as permissões atuais do aplicativo e os caminhos de código relacionados.</li>
+ <li>Teste o fluxo de usuário entre serviços protegidos por permissão e dados.</li>
+ <li>Teste com várias combinações de permissões revogadas/concedidas.</li>
+ <li>Use a ferramenta {@code adb} para gerenciar as permissões da linha de comando:
+ <ul>
+ <li>Liste as permissões e o status por grupos:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Conceda ou revogue uma ou mais permissões usando a seguinte sintaxe:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analise o aplicativo para encontrar os serviços que usam permissões.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Estratégia de teste</h3>
+
+<p>
+ A mudança de permissões afeta a estrutura e o projeto do aplicativo, bem como
+ a experiência do usuário e os fluxos fornecidos a eles. Você deve avaliar o uso das permissões atuais
+ do aplicativo e começar a planejar novos fluxos que deseja oferecer. O lançamento oficial
+ da plataforma fornece comportamento de compatibilidade, mas deve-se planejar a atualização do aplicativo e
+ não confiar nestes comportamentos.
+</p>
+
+<p>
+ Identifique as permissões que o aplicativo realmente precisa e usa e, em seguida, encontre os vários caminhos
+ de código que usam os serviços protegidos por permissões. É possível fazer isto por meio de uma combinação de
+ testes na nova plataforma e análise de códigos. Nos testes, você deve se concentrar em usar
+ as permissões em tempo de execução alterando {@code targetSdkVersion} do aplicativo para a versão da prévia. Para
+ obter mais informações, consulte <a href="{@docRoot}preview/setup-sdk.html#">Configuração
+do Android N SDK</a>.
+</p>
+
+<p>
+ Teste com várias combinações de permissões revogadas e concedidas para destacar os fluxos de usuário
+que dependem de permissões. Onde uma dependência não for óbvia ou lógica, considere
+refatorar ou compartimentalizar este fluxo para eliminar a dependência ou para esclarecer por que
+a permissão é necessária.
+</p>
+
+<p>
+ Para obter mais informações sobre o comportamento das permissões em tempo de execução, de testes e de melhores práticas, consulte a página
+ <a href="{@docRoot}preview/features/runtime-permissions.html">Permissões</a> do Developer
+ Preview.
+</p>
+
+
+<h2 id="doze-standby">Teste de soneca e App em espera</h2>
+
+<p>
+ Os recursos de economia de energia de App em espera e soneca limitam a quantidade de processamento de segundo plano que o aplicativo
+ pode realizar quando um dispositivo está no estado ocioso ou enquanto não está em foco. As
+ restrições que o sistema pode impor nos aplicativos inclui acesso a rede limitado ou restrito,
+ tarefas de segundo plano suspensas, notificações suspensas, solicitações de soneca ignoradas e despertadores. Para garantir
+ que o aplicativo se comportará adequadamente com essas otimizações de economia de energia, deve-se testá-lo
+ simulando estes estados de baixa energia.
+</p>
+
+<h4 id="doze">Testar o aplicativo com Soneca</h4>
+
+<p>Para testar a Soneca com o aplicativo:</p>
+
+<ol>
+<li>Configure um dispositivo de hardware ou virtual com uma imagem do sistema Android N.</li>
+<li>Conecte o dispositivo à máquina de desenvolvimento e instale o aplicativo.</li>
+<li>Execute o aplicativo e deixe-o ativo.</li>
+<li>Simule o dispositivo acessando o modo Soneca executando os seguintes comandos:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Observe o comportamento do aplicativo quando o dispositivo é reativado. Certifique-se de que
+ ele se recupere corretamente quando o dispositivo sai do modo Soneca.</li>
+</ol>
+
+
+<h4 id="standby">Testar aplicativos com App em espera</h4>
+
+<p>Para testar o modo de espera do aplicativo:</p>
+
+<ol>
+ <li>Configure um dispositivo de hardware ou virtual com uma imagem do sistema Android N.</li>
+ <li>Conecte o dispositivo à máquina de desenvolvimento e instale o aplicativo.</li>
+ <li>Execute o aplicativo e deixe-o ativo.</li>
+ <li>Simule o aplicativo acessando o modo de espera executando os seguintes comandos:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simule o despertar do aplicativo usando o seguinte comando:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Observe o comportamento do aplicativo quando ele é despertado. Certifique-se de que ele se recupere corretamente
+ do modo de espera. Particularmente, deve-se verificar se as notificações e os trabalho de segundo plano
+ do aplicativo continuam a funcionar como o esperado.</li>
+</ol>
+
+<h2 id="ids">Backup automático para aplicativos e identificadores específicos do dispositivo</h2>
+
+<p>Caso o aplicativo esteja persistindo qualquer identificador específico do dispositivo, como o ID de registro do Google
+Cloud Messaging, no armazenamento interno,
+certifique-se de seguir as práticas recomendadas para excluir o local de armazenamento
+do backup automático, como descrito em <a href="{@docRoot}preview/backup/index.html">Backup automático
+para aplicativos</a>. </p>
diff --git a/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..e3d58cd
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1039 @@
+page.title=Android N for Developers
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>Principais recursos para desenvolvedores</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">Suporte a várias janelas</a></li>
+ <li><a href="#notification_enhancements">Notificações</a></li>
+ <li><a href="#jit_aot">Compilação JIT/AOT</a></li>
+ <li><a href="#quick_path_to_app_install">Caminho rápido para a instalação de aplicativos</a></li>
+ <li><a href="#doze_on_the_go">Modo soneca em movimento</a></li>
+ <li><a href="#background_optimizations">Otimizações em segundo plano</a></li>
+ <li><a href="#data_saver">Economia de dados</a></li>
+ <li><a href="#vulkan">Vulkan API</a></li>
+ <li><a href="#tile_api">Quick Settings Tile API</a></li>
+ <li><a href="#number-blocking">Bloqueio de número</a></li>
+ <li><a href="#call_screening">Triagem de chamadas</a></li>
+ <li><a href="#multi-locale_languages">Localidades e idiomas</a></li>
+ <li><a href="#emoji">Novos emoticons</a></li>
+ <li><a href="#icu4">ICU4J APIs no Android</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Gravação do Android TV</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">Acessibilidade</a></li>
+ <li><a href="#direct_boot">Inicialização direta</a></li>
+ <li><a href="#key_attestation">Confirmação de chaves</a></li>
+ <li><a href="#network_security_config">Configuração de segurança de rede</a></li>
+ <li><a href="#default_trusted_ca">CA confiável padrão</a></li>
+ <li><a href="#apk_signature_v2">Esquema de assinatura de APK v2</a></li>
+ <li><a href="#scoped_directory_access">Acesso a diretórios com escopo</a></li>
+ <li><a href="#keyboard_shortcuts_helper">Auxiliar de atalhos de teclado</a></li>
+ <li><a href="#sustained_performance_api">API de desempenho sustentado</a></li>
+ <li><a href="#vr">Suporte a RV</a></li>
+ <li><a href="#print_svc">Melhorias nos serviços de impressão</a></li>
+ <li><a href="#virtual_files">Arquivos virtuais</a></li>
+ <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>O Android N ainda está em desenvolvimento ativo, mas agora você já pode testá-lo
+como parte do N Developer Preview. As seções a seguir destacam alguns dos
+novos recursos para desenvolvedores. </p>
+
+<p>
+ Não deixe de conferir as <a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a> para saber mais sobre as
+ áreas onde as alterações de plataforma podem afetar os aplicativos, examine os
+ guias para desenvolvedores para saber mais sobre os principais recursos e faça o download da <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a> para obter detalhes sobre as
+ novas APIs.
+</p>
+
+<h2 id="multi-window_support">Suporte a várias janelas</h2>
+
+
+<p>No Android N, introduzimos um recurso de multitarefa novo e muito solicitado
+na plataforma — o suporte a várias janelas. </p>
+
+ <p>Agora os usuários podem abrir dois aplicativos na tela ao mesmo tempo. </p>
+ <ul>
+ <li>Em celulares e tablets
+executando o Android N, os usuários agora podem executar dois aplicativos lado a lado ou
+um acima do outro em modo de tela dividida. Os usuários podem redimensionar os aplicativos arrastando
+o divisor entre eles. </li>
+
+<li>Em dispositivos Android TV, os aplicativos podem assumir o <a href="{@docRoot}preview/features/picture-in-picture.html">modo imagem em
+imagem</a>, o que permite que continuem a exibir conteúdo enquanto o usuário navega ou
+interage com outros aplicativos.</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>Figura 1.</strong> Aplicativos executando em modo de tela dividida.
+</p>
+
+ </div>
+
+<p>O suporte a várias janelas oferece novas formas de envolver os usuários,
+particularmente em tablets e outros dispositivos com telas maiores. Você pode até ativar o recurso de arrastar e soltar
+no aplicativo para permitir que os usuários arrastem conteúdo de ou para o aplicativo — uma ótima
+maneira de aprimorar a experiência do usuário. </p>
+
+<p>É muito fácil adicionar suporte a várias janelas a seu aplicativo e configurar como ele
+lida com exibição em várias janelas. Por exemplo, você pode especificar as dimensões
+mínimas permitidas para sua atividade, evitando que os usuários redimensionem a atividade para abaixo
+deste tamanho. Você também pode desativar a exibição de várias janelas para o aplicativo, o que
+ garante que o sistema só mostrará o aplicativo em modo de tela inteira.</p>
+
+<p>
+ Para obter mais informações, consulte a documentação para desenvolvedores de <a href="{@docRoot}preview/features/multi-window.html">Suporte a várias janelas</a>
+.
+</p>
+
+<h2 id="notification_enhancements">Aprimoramentos de notificações</h2>
+
+<p>Reformulamos as notificações no Android N para facilitar e agilizar o
+uso. Entre as alterações estão:</p>
+
+<ul>
+ <li>
+ <strong>Atualizações de modelos</strong>: Estamos atualizando os modelos de notificação para
+ colocar mais ênfase na imagem do herói e do avatar. Os desenvolvedores poderão
+ aproveitar os novos modelos com ajustes mínimos no código.
+ </li>
+
+ <li>
+ <strong>Personalização de estilo de mensagem</strong>: Você pode personalizar mais
+rótulos de interface de usuário associados às suas notificações usando a classe
+<code>MessageStyle</code>. É possível configurar a mensagem, o título da conversa
+e a visualização de conteúdo.
+ </li>
+
+ <li>
+ <strong>Notificações empacotadas</strong>: O sistema pode agrupar mensagens
+ por tópico de mensagem, por exemplo, e exibir o grupo. Um usuário pode
+ executar ações, como Dismiss ou Archive, nessa exibição de grupo. Se você
+ já implementou notificações para o Android Wear, está familiarizado com
+ esse modelo.
+ </li>
+
+ <li>
+ <strong>Resposta direta</strong>: Para aplicativos de comunicação em tempo real, o
+ sistema Android oferece suporte a respostas em linha para que os usuários possam responder rapidamente a
+ mensagens SMS ou de texto diretamente dentro da interface de notificação.
+ </li>
+
+ <li>
+ <strong>Visualizações personalizadas</strong>: Duas APIs novas permitem utilizar decorações
+ do sistema, como cabeçalhos e ações de notificação, durante o uso de visualizações
+ personalizadas em notificações.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>Figura 2.</strong> Notificações empacotadas e resposta direta.
+</p>
+
+<p>Para saber como implementar os novos recursos, consulte o
+guia <a href="{@docRoot}preview/features/notification-updates.html">Notificações</a>
+.</p>
+
+
+
+<h2 id="jit_aot">Compilação JIT/AOT orientada a perfil</h2>
+
+<p>No Android N, adicionamos um compilador Just in Time (JIT) com perfis de código para
+ART, o que permite aprimorar constantemente o desempenho de aplicativos Android durante a
+execução. O compilador JIT complementa o compilador atual Ahead of Time (AOT)
+ do ART e ajuda a aprimorar o desempenho em tempo de execução, economizar espaço de armazenamento e acelerar atualizações
+ de aplicativos e de sistema.</p>
+
+<p>A compilação orientada a perfil permite que o ART gerencie a compilação AOT/JIT de cada aplicativo
+de acordo com o uso real e com as condições no dispositivo. Por
+exemplo, o ART mantém um perfil dos principais métodos do aplicativo e pode pré-compilar
+e armazenar esses métodos em cache para obter o melhor desempenho. As outras partes do aplicativo não são
+compiladas até que sejam realmente utilizadas.</p>
+
+<p>Além de aprimorar o desempenho para as principais partes do aplicativo, a compilação
+ajuda a reduzir o uso geral de recursos de RAM, incluindo os binários
+associados. Esse recurso é particularmente importante em dispositivos com pouca memória.</p>
+
+<p>O ART gerencia a compilação orientada a perfil de forma a minimizar o impacto sobre a
+bateria do dispositivo. A pré-compilação é executada apenas quando o dispositivo está ocioso e
+com a bateria sendo carregada, economizando tempo e bateria com a execução antecipada dessa tarefa.</p>
+
+<h2 id="quick_path_to_app_install">Caminho rápido para a instalação de aplicativos</h2>
+
+<p>Um dos benefícios mais tangíveis do compilador JIT do ART é a velocidade de instalação dos
+aplicativos e das atualizações do sistema. Até mesmo aplicativos grandes, que exigiam vários minutos para
+otimização e instalação no Android 6.0, podem agora ser instalados em
+segundos. As atualizações de sistema também ficaram mais rápidas, pois não existe mais a etapa de otimização. </p>
+
+<h2 id="doze_on_the_go">Modo soneca em movimento...</h2>
+
+<p>O Android 6.0 introduziu o modo soneca, um modo de sistema que economiza bateria adiando
+atividades de CPU e rede dos aplicativos quando o dispositivo está ocioso, como
+quando está em uma mesa ou gaveta. </p>
+
+<p>Agora, no Android N, o modo soneca foi aprimorado e economiza bateria quando em movimento.
+Sempre que a tela ficar desativada por um período e o dispositivo ficar desativado,
+o modo soneca aplicará um subconjunto das restrições familiares de CPU e rede aos aplicativos.
+Isso significa que os usuários podem economizar bateria transportando os dispositivos no
+bolso.</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>Figura 3.</strong> O modo soneca agora aplica
+ restrições para aumentar a vida útil da bateria mesmo quando o dispositivo não está estacionário.
+</p>
+
+
+<p>Pouco depois de a tela ser desativada com o dispositivo alimentado pela bateria, o modo soneca
+restringe o acesso de rede e adia trabalhos e sincronizações. Durante breves janelas de
+manutenção, os aplicativos podem acessar a rede e todos os
+trabalhos/sincronizações adiados são executados. A ativação da tela ou do dispositivo
+encerra o modo soneca.</p>
+
+<p>Quando o dispositivo voltar a ficar estacionário, com a tela desativada e alimentado por bateria por um
+período, o modo soneca aplicará as restrições completas de CPU e rede em {@link
+android.os.PowerManager.WakeLock}, alarmes {@link android.app.AlarmManager} e
+verificações de GPS/Wi-Fi.</p>
+
+<p>As práticas recomendadas para adaptar o aplicativo ao modo soneca são as mesmas para
+dispositivos estacionários ou em movimento. Portanto, se você já atualizou o aplicativo para
+processar o modo soneca corretamente, está pronto. Caso contrário, comece a <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">adaptar
+ o aplicativo para o modo soneca</a> agora.</p>
+
+<h2 id="background_optimizations">Project Svelte: Otimizações em segundo plano</h2>
+
+<p>O Project Svelte é um esforço contínuo para minimizar o uso de RAM pelo sistema e pelos aplicativos
+nos dispositivos Android existentes no ecossistema. No Android N, o Project
+Svelte se concentra em otimizar a forma de execução dos aplicativos em segundo plano. </p>
+
+<p>O processamento em segundo plano é parte essencial da maioria dos aplicativos. Quando executado corretamente, a experiência
+do usuário pode ficar incrível — imediata, rápida e sensível ao contexto.
+Quando executado incorretamente, o processamento em segundo plano pode consumir desnecessariamente RAM (e
+bateria) e afetar o desempenho do sistema para os outros aplicativos. </p>
+
+<p>Desde o Android 5.0, {@link android.app.job.JobScheduler} é a forma
+preferencial para execução de trabalho em segundo plano de uma maneira que beneficia
+os usuários. Os aplicativos podem agendar trabalhos e permitir que o sistema execute otimizações com base em
+condições de memória, energia e conectividade. O JobScheduler oferece controle e
+simplicidade, e queremos que seja usado por todos os aplicativos. </p>
+
+<p>
+ Outra boa opção é o <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+ <code>GCMNetworkManager</code></a>, parte do Google Play Services, que
+ oferece um agendamento de trabalhos similar, compatível com versões legadas do
+ Android.
+</p>
+
+<p>Continuamos a expandir o <code>JobScheduler</code> e o
+<code>GCMNetworkManager</code> para atender a mais
+casos de uso — por exemplo, no Android N, você já pode agendar trabalhos
+em segundo plano de acordo com mudanças nos provedores de conteúdo. Ao mesmo tempo, começamos a
+substituir alguns padrões mais antigos que podem reduzir o desempenho do sistema,
+particularmente em dispositivos com pouca memória.</p>
+
+<p>No Android N, estamos removendo três transmissões implícitas de uso comum —
+{@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+android.hardware.Camera#ACTION_NEW_PICTURE} e {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} —, pois podem despertar simultaneamente
+processos em segundo plano de vários aplicativos, aumentando o consumo de memória e bateria. Se
+o seu aplicativo receber essas transmissões, aproveite o N Developer Preview para
+ migrar para o <code>JobScheduler</code> e as APIs relacionadas. </p>
+
+<p>
+ Consulte a documentação de <a href="{@docRoot}preview/features/background-optimization.html">Otimizações
+em segundo plano</a> para obter mais detalhes.
+</p>
+
+
+<h2 id="data_saver">Economia de dados</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>Figura 4.</strong> Economia de dados em Settings.
+</p>
+ </div>
+
+<p>Normalmente, o custo de um plano de dados de celular ao longo da vida útil do dispositivo móvel
+excede o custo do próprio dispositivo. Para muitos usuários, os dados de celular
+são um recurso caro que querem economizar. </p>
+
+<p>O Android N introduz o modo de Economia de dados, um novo serviço do sistema que ajuda a reduzir
+o uso de dados de celular pelos aplicativos em situações de roaming, perto do final do ciclo de cobrança
+ou em pacotes de dados pré-pagos pequenos. A Economia de dados permite que os usuários controlem o
+uso de dados de celular e possibilita que os desenvolvedores ofereçam serviços mais eficientes quando o modo de Economia
+de dados estiver ativado. </p>
+
+<p>Quando um usuário ativa a Economia de dados em <strong>Settings</strong> e o dispositivo está
+em uma rede tarifada, o sistema bloqueia o uso de dados em segundo plano e avisa aos aplicativos
+para reduzir o uso de dados no primeiro plano sempre que possível — como, por exemplo, limitar a
+taxa de bits de streaming, reduzir a qualidade de imagens, adiar o armazenamento prévio otimista em cache
+e assim por diante. Os usuários podem autorizar aplicativos específicos a usar dados tarifados
+em segundo plano, mesmo com a Economia de dados ativada.</p>
+
+<p>O Android N estende o {@link android.net.ConnectivityManager} para oferecer aos aplicativos uma
+forma de <a href="{@docRoot}preview/features/data-saver.html#status">recuperar as
+preferências do usuário para a Economia de dados</a> e <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">monitorar
+as mudanças de preferências</a>. Todos os aplicativos devem verificar se o usuário ativou a Economia
+de dados e tentar limitar o uso de dados em primeiro e segundo plano.</p>
+
+
+<h2 id="vulkan">Vulkan API</h2>
+
+<p>
+ O Android N integra o <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>, uma nova API de renderização 3D, à plataforma. Como o
+ <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
+ ES</a>, o Vulkan é um padrão aberto para gráficos e renderização 3D mantido
+ pelo Khronos Group.
+</p>
+
+<p>
+ O Vulkan foi projetado desde o início para minimizar sobrecargas na CPU do driver
+ e permitir que seu aplicativo controle a operação de GPU de forma mais direta. O Vulkan
+ também oferece melhor paralelização ao permitir que vários encadeamento realizem
+ trabalhos como a construção de buffer de comando de uma só vez.
+</p>
+
+<p>
+ As ferramentas de desenvolvimento e bibliotecas do Vulkan se combinam ao Android NDK. Elas
+ incluem:
+</p>
+
+<ul>
+ <li>Cabeçalhos
+ </li>
+
+ <li>Camadas de validação (bibliotecas de depuração)
+ </li>
+
+ <li>Compilador de sombreadores SPIR-V
+ </li>
+
+ <li>Biblioteca de compilação de sombreadores SPIR-V em tempo de execução
+ </li>
+</ul>
+
+<p>
+ O Vulkan só está disponível para aplicativos em dispositivos com hardware com capacidade para Vulkan,
+ como Nexus 5X, Nexus 6P e Nexus Player Estamos trabalhando em estreita cooperação com nossos
+ parceiros para oferecer o Vulkan em mais dispositivos assim que possível.
+</p>
+
+<p>
+ Para obter mais informações, consulte a <a href="{@docRoot}ndk/guides/graphics/index.html">documentação da API</a>.
+</p>
+
+<h2 id="tile_api">Quick Settings Tile API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>Figura 5.</strong> Blocos de Configurações rápidas na aba de notificações.
+</p>
+
+
+ </div><p>As Configurações rápidas são uma forma popular e simples de expor as principais configurações e ações
+diretamente na aba de notificações. No Android N, ampliamos o escopo das
+Configurações rápidas para aumentar ainda mais a utilidade e a conveniência. </p>
+
+<p>Adicionamos mais espaço para os blocos de Configurações rápidas, que os usuários podem
+acessar em uma área de exibição paginada deslizando à direita ou à esquerda. Além disso,
+permitimos que os usuários controlem quais blocos de Configurações rápidas são exibidos, bem como o local
+em que são exibidos — para adicionar ou mover blocos, os usuários simplesmente arrastam e soltam os blocos. </p>
+
+<p>Para desenvolvedores, o Android N também adiciona uma API nova que permite definir os próprios
+blocos de Configurações rápidas para que os usuários possam acessar facilmente os principais controles e ações do seu aplicativo.</p>
+
+<p>
+ Os blocos de Configurações rápidas estão reservados para controles ou ações que são
+ urgentemente necessários ou frequentemente usados e não devem ser usados como atalhos para
+ iniciar aplicativos.
+</p>
+
+<p>
+ Após definir os blocos, você pode disponibilizá-los aos usuários, que por sua vez podem adicioná-los
+ às Configurações rápidas usando o recurso de arrastar e soltar.
+</p>
+
+<p>
+ Para obter informações sobre a criação de um bloco de aplicativo, consulte a documentação para
+ <code>android.service.quicksettings.Tile</code> na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
+</p>
+
+
+
+<h2 id="number-blocking">Bloqueio de número</h2>
+
+<p>O Android N agora oferece suporte a bloqueio de números na plataforma e disponibiliza uma
+API de estrutura para permitir que provedores de serviço mantenham uma lista de números bloqueados. O
+ aplicativo padrão de SMS, o aplicativo padrão de telefone e os aplicativos de provedor podem ler e gravar
+a lista de números bloqueados. A lista não está acessível para outros aplicativos.</p>
+
+<p>Ao oferecer o bloqueio de número como recurso padrão da plataforma, o Android oferece
+uma forma consistente de bloqueio de números em uma grande variedade de
+dispositivos. Alguns benefícios que podem ser aproveitados pelos aplicativos são:</p>
+
+<ul>
+ <li> Números bloqueados para chamadas também são bloqueados para mensagens de texto
+ <li> Números bloqueados podem persistir entre várias redefinições e dispositivos por meio do
+recurso Backup e restauração
+ <li> Vários aplicativos podem usar a mesma lista de números bloqueados
+</ul>
+
+<p>Além disso, a integração de aplicativos da operadora por meio do Android significa que as operadoras podem
+ler a lista de números bloqueados no dispositivo e executar um bloqueio do lado do servidor
+para o usuário, impedindo que chamadas e textos indesejados cheguem a ele
+por qualquer meio, como terminais de VOIP ou encaminhamento de telefones.</p>
+
+<p>
+ Para obter mais informações, consulte <code>android.provider.BlockedNumberContract</code>
+ na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
+da API</a>, disponível para download.
+</p>
+
+<h2 id="call_screening">Triagem de chamadas</h2>
+
+<p>
+ O Android N permite que o aplicativo de telefone padrão faça a triagem das chamadas recebidas. O aplicativo
+ de telefone faz isso implementando o novo <code>CallScreeningService</code>,
+ que permite a execução de diversas ações com base nos
+ {@link android.telecom.Call.Details Call.Details} da chamada recebida, como:
+</p>
+
+<ul>
+ <li> Rejeitar a chamada recebida
+ <li> Não incluir a chamada no registro de chamadas
+ <li> Não mostrar ao usuário a notificação da chamada
+</ul>
+
+<p>
+ Para obter mais informações, consulte <code>android.telecom.CallScreeningService</code>
+ na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
+da API</a>, disponível para download.
+</p>
+
+
+<h2 id="multi-locale_languages">Suporte a diversas localidades, mais idiomas</h2>
+
+
+<p>O Android N agora permite que os usuários selecionem <strong>diversas localidades</strong> em Settings
+para oferecer melhor suporte a casos de uso bilíngue. Os aplicativos podem usar
+uma API nova para obter as localidades selecionadas pelo usuário e oferecer
+experiências de usuário mais sofisticadas para usuários com diversas localidades — como, por exemplo, mostrar resultados de pesquisa em
+diversos idiomas e não oferecer a tradução de páginas da web que usam
+um idioma conhecido pelo usuário.</p>
+
+<p>Juntamente com o suporte a várias localidades, o Android N também amplia o número de idiomas
+disponíveis aos usuários. Ele oferece mais de 25 variantes para cada um dos idiomas
+mais comuns, como inglês, espanhol, francês e árabe. Além disso, adiciona suporte parcial
+a mais de 100 novos idiomas.</p>
+
+<p>Os aplicativos podem obter a lista de localidades definida pelo usuário chamando
+<code>LocaleList.GetDefault()</code>. Para oferecer suporte ao maior número de localidades, o Android N está
+alterando a forma como resolve recursos. Não deixe de testar e verificar se seus aplicativos
+funcionam da forma esperada com a nova lógica de resolução de recursos.</p>
+
+<p>Para saber mais sobre o novo comportamento de resolução de recursos e sobre as práticas recomendadas que você deve
+seguir, consulte <a href="{@docRoot}preview/features/multilingual-support.html">Suporte a vários idiomas</a>.</p>
+
+
+<h2 id="emoji">Novos emoticons</h2>
+
+<p>
+ O Android N apresenta emoticons adicionais e recursos relacionados, tais como
+ emoticons com diferentes tons de pele e suporte a seletores
+ de variação. Se o seu aplicativo suporta emoticons,
+ siga as diretrizes abaixo para aproveitar estes recursos próprios para emoticons.
+</p>
+
+<ul>
+ <li>
+ <strong>Verifique se o dispositivo contém um emoticon antes de inseri-lo.</strong>
+ Para conferir quais emoticons estão presentes
+ na fonte do sistema, use o método {@link android.graphics.Paint#hasGlyph(String)}.
+ </li>
+ <li>
+ <strong>Verifique se um emoticon suporta seletores de variação.</strong>
+ Os seletores de variação permitem que você
+ apresente determinados emoticons em cores ou preto e branco.
+ Em dispositivos móveis, os aplicativos devem representar os emoticons em cores, e não em preto e branco. Porém,
+ se o seu aplicativo exibe emoticons em linha com o texto, ele deve usar a variação preto e branco.
+ Para determinar se um emoticon tem variação ou não, use o seletor de variação.
+ Para obter uma lista completa de caracteres com variações, consulte a seção
+ <em>sequências de variação de emoticon</em> da
+ <a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
+ documentação sobre variações em Unicode</a>.
+ </li>
+ <li>
+ <strong>Verifique se um emoticon suporta tons de pele.</strong> O Android N permite que os usuários modifiquem o
+ tom de pele renderizado de emoticons como quiserem. Os aplicativos de teclado devem oferecer indicações
+ visuais para emoticons que tenham diversos tons de pele e permitir que os usuários
+ selecionem o tom preferido. Para determinar quais emoticons do sistema têm
+ modificadores de tom de pele, use o método {@link android.graphics.Paint#hasGlyph(String)}
+. Você pode determinar quais emoticons usam tons de pele lendo a
+ <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
+documentação do Unicode</a>.
+ </li>
+</ul>
+
+
+<h2 id="icu4">ICU4J APIs no Android</h2>
+
+<p>
+ Agora, o Android N oferece um subconjunto de <a href="http://site.icu-project.org/">ICU4J</a> APIs na estrutura do Android
+ no pacote <code>android.icu</code>. A migração é fácil e geralmente exige
+apenas a mudança do namespace <code>com.java.icu</code> para
+<code>android.icu</code>. Se você já usa um pacote ICU4J nos seus
+ aplicativos, a mudança para as APIs do <code>android.icu</code> disponibilizadas na estrutura do
+ Android pode reduzir substancialmente o tamanho do APK.
+</p>
+
+<p>
+ Para saber mais sobre as APIs ICU4J no Android, consulte <a href="{@docRoot}preview/features/icu4j-framework.html">Suporte ao ICU4J</a>.
+</p>
+
+
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>O Android N adiciona interfaces de estrutura e suporte de plataforma ao OpenGL ES 3.2, incluindo:</p>
+
+<ul>
+ <li> Todas as extensões do <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
+Pacote de extensão Android</a></a> (AEP), exceto <code>EXT_texture_sRGB_decode</code>.
+ <li> Framebuffers de ponto flutuante para HDR e sombreamento adiado.
+ <li> Chamadas de desenho a BaseVertex para possibilitar melhor organização em lotes e transmissão.
+ <li> Controle robusto de acesso a buffers para reduzir a sobrecarga do WebGL.
+</ul>
+
+<p>A API da estrutura do OpenGL ES 3.2 no Android N é fornecida pela classe
+<code>GLES32</code>. Ao usar o OpenGL ES 3.2, não deixe de declarar o
+requisito no arquivo manifesto usando o rótulo <code><uses-feature></code> e o
+atributo <code>android:glEsVersion</code>. </p>
+
+<p>Para obter mais informações sobre como usar o OpenGL ES, incluindo como verificar a versão do
+OpenGL ES compatível do dispositivo no tempo de execução, consulte o <a href="{@docRoot}guide/topics/graphics/opengl.html">guia da OpenGL ES API</a>.</p>
+
+
+<h2 id="android_tv_recording">Gravação do Android TV</h2>
+
+<p>O Android N adiciona a capacidade de gravar e reproduzir conteúdo de serviços de entrada
+do Android TV por meio de novas APIs de gravação. Criados usando as APIs atuais de time-shifting,
+os serviços de entrada de TV podem controlar quais dados de canal são gravados e como
+as sessões gravadas são salvas, bem como gerenciar a interação do usuário com o conteúdo gravado. </p>
+
+<p>Para obter mais informações, consulte <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording APIs</a>.</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>O Android for Work adiciona vários recursos e APIs para dispositivos que executam o Android N.
+Veja a seguir alguns destaques — para obter uma lista completa das mudanças, consulte
+<a href="{@docRoot}preview/features/afw.html">atualizações no Android for Work</a>.</p>
+
+<h3 id="work_profile_security_challenge">Desafio de segurança de perfil de trabalho </h3>
+
+<p>
+ Donos de perfis direcionados ao N SDK
+ podem especificar um desafio de segurança em separado para aplicativos em execução no
+ perfil de trabalho. O desafio de trabalho é exibido quando um usuário tenta abrir
+ qualquer aplicativo de trabalho. O preenchimento correto do desafio de segurança desbloqueia e,
+ se necessário, descriptografa o perfil de trabalho. Para donos de perfil,
+ <code>ACTION_SET_NEW_PASSWORD</code> solicita que o usuário defina um desafio
+ de trabalho e <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> um
+ bloqueio de dispositivo.
+</p>
+
+<p>
+ Os donos de perfil também podem definir políticas de senha distintas para o desafio de trabalho
+ (como o comprimento mínimo do PIN ou se é permitido usar a impressão digital
+para desbloquear o perfil) usando<code>setPasswordQuality()</code>,
+<code>setPasswordMinimumLength()</code> e métodos relacionados. O dono
+ de perfil também pode definir o bloqueio de dispositivo usando a instância de <code>DevicePolicyManager</code>
+ retornada pelo novo método <code>getParentProfileInstance()</code>.
+ Além disso, donos de perfil podem personalizar a tela de credenciais do
+ desafio de trabalho usando os novos métodos <code>setOrganizationColor()</code> e
+ <code>setOrganizationName()</code>.
+</p>
+<h3 id="turn_off_work">Desativar o trabalho </h3>
+
+<p>Os usuários podem alternar o modo de trabalho em dispositivos com um perfil de trabalho. Quando o modo de trabalho está
+desativado, o usuário gerenciado é encerrado temporariamente, o que desativa
+os aplicativos, a sincronização em segundo plano e as notificações do perfil de trabalho. Isso inclui o aplicativo do
+dono do perfil. Quando o modo de trabalho está desativado, o sistema exibe um ícone de status persistente
+ para lembrar ao usuário que não é possível iniciar aplicativos de trabalho. A tela de início
+indica que os aplicativos e widgets de trabalho não podem ser acessados. </p>
+
+<h3 id="always_on_vpn">Always on VPN </h3>
+
+<p>Os donos de dispositivo e perfil podem garantir que os aplicativos de trabalho se conectem sempre
+por meio de uma VPN especificada. O sistema inicia automaticamente a VPN após a
+ inicialização do dispositivo.</p>
+
+<p>
+ Os novos métodos <code>DevicePolicyManager</code> são
+ <code>setAlwaysOnVpnPackage()</code> e
+ <code>getAlwaysOnVpnPackage()</code>.
+</p>
+
+<p>Como os serviços de VPN podem ser vinculados diretamente pelo sistema sem interação com
+aplicativos, os clientes de VPN precisam processar novos pontos de entrada para o Always on VPN. Da
+ mesma forma que antes, os serviços são indicados ao sistema por um filtro de intenção
+ correspondente à ação <code>android.net.VpnService</code>. </p>
+
+<p>
+ Além disso, os usuários podem definir manualmente clientes do Always on VPN que implementam
+ métodos <code>VPNService</code> no usuário principal usando
+ <strong>Settings>More>Vpn</strong>.
+</p>
+
+<h3 id="custom_provisioning">Provisionamento personalizado</h3>
+
+<p>
+ Um aplicativo pode personalizar os fluxos de provisionamento do dono do perfil e do dispositivo
+ com cores e logos corporativos.
+ <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> personaliza
+ a cor do fluxo. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
+ personaliza o fluxo com um logo corporativo.
+</p>
+
+<h2 id="accessibility_enhancements">Aprimoramentos na acessibilidade</h2>
+
+<p>O Android N agora oferece Configurações de visão diretamente na tela de boas-vindas na instalação
+de novos dispositivos. Isso permite que os usuários descubram e configurem recursos de acessibilidade
+ em seus dispositivos de forma muito mais fácil, incluindo gesto de ampliação, tamanho
+da fonte, tamanho da tela e TalkBack. </p>
+
+<p>Com o posicionamento mais proeminente desses recursos de acessibilidade, os usuários
+ficarão mais propensos a experimentar o aplicativo com os recursos ativados. Não deixe de testar antecipadamente os aplicativos
+com essas configurações ativadas. Você pode ativá-las em Settings >
+Accessibility.</p>
+
+<p>Além disso, os serviços de acessibilidade no Android N podem ajudar usuários com deficiências
+motoras a tocar na tela. A nova API permite criar serviços com recursos
+como acompanhamento de face, acompanhamento de olho e varredura de pontos, entre outros, para atender
+às necessidades desses usuários.</p>
+
+<p>Para obter mais informações, consulte <code>android.accessibilityservice.GestureDescription</code>
+ na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.</p>
+
+
+<h2 id="direct_boot">Inicialização direta</h2>
+
+<p>A inicialização direta reduz os tempos de inicialização dos dispositivos e permite que aplicativos
+registrados tenham funcionalidade limitada, mesmo após uma reinicialização inesperada.
+Por exemplo, se um dispositivo criptografado reinicializar durante o sono do usuário,
+alarmes registrados, mensagens e chamadas recebidas podem agora continuar notificando
+o usuário normalmente. Isso também significa que serviços de acessibilidade podem ser
+disponibilizados imediatamente após um reinício.</p>
+
+<p>A inicialização direita aproveita a criptografia baseada em arquivo do Android N
+para ativar políticas de criptografia detalhadas para dados de sistema e aplicativos.
+O sistema usa um armazenamento criptografado pelo dispositivo para determinados dados de sistema e dados
+de aplicativos registrados explicitamente. Por padrão, um armazenamento criptografado por credencial é usado para todos
+os outros dados de sistema, dados de usuário, aplicativos e dados de aplicativos. </p>
+
+<p>Na inicialização, o sistema inicia em um modo restrito que permite
+acessar apenas dados criptografados pelo dispositivo, sem acesso geral a aplicativos ou dados.
+Se você deseja executar componentes nesse modo, pode registrá-los
+definindo um sinalizador no manifesto. Após a reinicialização, o sistema ativa
+componentes registrados transmitindo a intenção <code>LOCKED_BOOT_COMPLETED</code>
+. O sistema garante que dados de aplicativos registrados criptografados pelos dispositivos sejam disponibilizados
+antes do destravamento. Todos os outros dados ficarão indisponíveis até que o usuário confirme as credenciais
+ de tela de bloqueio para descriptografá-los. </p>
+
+Para obter mais informações, consulte <a href="{@docRoot}preview/features/direct-boot.html">Inicialização direta</a>.</p>
+</p>
+
+
+<h2 id="key_attestation">Confirmação de chaves</h2>
+
+<p>Os armazenamentos de chaves protegidos por hardware oferecem um método muito mais seguro para criar, armazenar
+e usar chaves de criptografia em dispositivos Android. Eles protegem chaves contra o kernel do Linux,
+possíveis vulnerabilidades do Android e extração
+em dispositivos com acesso root.</p>
+
+<p>Para permitir o uso de armazenamento de chaves protegido por hardware com maior facilidade e segurança,
+o Android N introduziu a confirmação de chaves. Aplicativos em dispositivos móveis e fora deles podem usar a confirmação de chaves
+para determinar com precisão se um par de chaves RSA ou EC
+está protegido por hardware, quais as propriedades do par de chaves e quais as restrições
+aplicadas ao uso e à validação. </p>
+
+<p>Aplicativos e serviços externos aos dispositivos móveis podem solicitar informações sobre um par de chaves
+por meio de um certificado de confirmação X.509, que deve estar assinado por uma
+chave de confirmação válida. A chave de confirmação é uma chave de assinatura ECDSA,
+injetada no armazenamento de chaves protegido por hardware do dispositivo na fábrica.
+Portanto, um certificado de confirmação assinado com uma chave de confirmação
+válida confirma a existência de um armazenamento de chaves protegido por hardware, além de
+detalhes dos pares de chaves desse armazenamento de chaves.</p>
+
+<p>Para garantir que o dispositivo esteja usando uma imagem Android oficial de fábrica
+e segura, a confirmação de chaves exige que o <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a>
+ do dispositivo forneça as seguintes informações ao <a class="external-link" href="https://source.android.com/security/trusty/index.html">Ambiente
+ de execução confiável (TEE)</a>:</p>
+
+<ul>
+<li>A versão do SO e o nível de correção instalado no dispositivo</li>
+<li>A chave pública <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> e seu status de bloqueio</li>
+ </ul>
+
+<p>Para obter mais informações sobre o recurso de armazenamento de chaves protegido por hardware,
+consulte o guia <a href="https://source.android.com/security/keystore/" class="external-link">Armazenamento de chaves protegido por hardware</a>.</p>
+
+<p>Além da confirmação de chaves, o Android N também introduziu
+ chaves associadas a impressões digitais que não são revogadas no cadastramento de impressões digitais.</p>
+
+<h2 id="network_security_config">Configuração de segurança de rede</h2>
+
+<p>No Android N, os aplicativos podem personalizar o comportamento de conexões seguras (HTTPS, TLS)
+de forma segura, sem modificação no código, usando a
+<em>Configuração de segurança de rede</em> declarativa em vez das
+APIs programáticas propensas a erro (por exemplo, X509TrustManager).</p>
+
+ <p>Recursos compatíveis:</p>
+<ul>
+<li><b>Âncoras de confiança personalizadas.</b> Permite que um aplicativo personalize quais
+autoridades de certificado (CA) são confiáveis para as conexões seguras. Por
+ exemplo, confiar em certificados autoassinados privados ou um restrito conjunto de CAs públicas.
+</li>
+<li><b>Substituições apenas em depuração.</b> Permite que um desenvolvedor de aplicativos depure
+conexões seguras do aplicativo com segurança, sem adicionar riscos à base
+instalada.
+</li>
+<li><b>Cancelamento do uso de tráfego de texto simples.</b> Permite que um aplicativo seja protegido contra
+o uso acidental de tráfego de texto simples.</li>
+<li><b>Fixação de certificados.</b> Um recurso avançado que permite que os aplicativos
+ limitem quais chaves de servidor são confiáveis para conexões seguras.</li>
+</ul>
+
+<p>Para obter mais configurações, consulte <a href="{@docRoot}preview/features/security-config.html">Configuração de segurança
+de rede</a>.</p>
+
+<h2 id="default_trusted_ca">Autoridade de certificado confiável padrão</h2>
+
+<p>Por padrão, os aplicativos direcionados ao Android N confiam apenas em certificados fornecidos pelo sistema
+e não confiam mais em Autoridades de certificado (CA) adicionadas pelo usuário. Os aplicativos direcionados ao Android
+N que querem confiar em CAs adicionadas pelo usuário devem usar a
+<a href="{@docRoot}preview/features/security-config.html">Configuração de segurança de rede</a> para
+especificar como confiar nas CAs de usuário.</p>
+
+<h2 id="apk_signature_v2">Esquema de assinatura de APK v2</h2>
+
+<p>
+ O Android N apresenta o esquema de assinatura de APK v2, um novo esquema de assinatura de aplicativo
+ que oferece instalações mais rápidas e maior proteção contra alterações não autorizadas
+ em arquivos APK. Por padrão, o Android Studio 2.2 e o plug-in do Android
+ para Gradle 2.2 assinam seu aplicativo usando o esquema de assinatura de APK v2 e
+ o esquema tradicional, que usa assinaturas JAR.
+</p>
+
+<p>
+ Embora seja recomendável aplicar o esquema de assinatura de APK v2 ao aplicativo, este novo
+ esquema não é obrigatório. Se o aplicativo não for compilado adequadamente ao usar o esquema
+de assinatura de APK v2, você poderá desativá-lo. O processo de desativação
+ faz com que o Android Studio 2.2 e o plug-in do Android para Gradle 2.2 assinem
+o aplicativo usando apenas o esquema de assinatura tradicional. Para assinar apenas com o
+ esquema tradicional, abra o arquivo do nível de módulo <code>build.gradle</code> e
+ adicione a linha <code>v2SigningEnabled false</code> à configuração de assinatura de sua
+ versão:
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>Cuidado: </strong>Se você assinar o aplicativo usando o esquema de assinatura de APK
+ v2 e fizer novas alterações posteriormente, a assinatura do app
+ será invalidada. Por essa razão, use ferramentas como <code>zipalign</code>
+ antes de assinar o aplicativo usando o esquema de assinatura de APK v2, não depois.
+</p>
+
+<p>
+ Para obter mais informações, leia os documentos do Android Studio que descrevem como
+<a href="{@docRoot}studio/publish/app-signing.html#release-mode">
+assinar um aplicativo</a> no Android Studio e como<a href="{@docRoot}studio/build/build-variants.html#signing"> configurar
+o arquivo de programação para assinar aplicativos</a> usando o plug-in do Android para Gradle.
+</p>
+
+<h2 id="scoped_directory_access">Acesso a diretórios com escopo</h2>
+
+<p>No Android N, os aplicativos podem usar novas APIs para solicitar acesso a determinados diretórios de <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">armazenamento
+externo</a>, incluindo diretórios em mídias removíveis, tais como cartões
+SD. As novas APIs simplificam consideravelmente como o aplicativo acessa os
+diretórios de armazenamento externo padrão, tais como o diretório<code>Pictures</code>. Os aplicativos,
+como aplicativos de fotografia, podem usar essas APIs em vez de
+<code>READ_EXTERNAL_STORAGE</code>, que concede acesso a todos os diretórios de
+armazenamento, ou da Estrutura de acesso ao armazenamento, que faz o usuário navegar até
+o diretório.</p>
+
+<p>Além disso, as novas APIs simplificam as etapas executadas pelo usuário para conceder ao aplicativo
+acesso ao armazenamento externo. Quando você usa as novas APIs, o sistema usa uma IU de permissões simples
+que detalha claramente a qual diretório o aplicativo
+está solicitando acesso.</p>
+
+<p>Para obter mais informações, consulte a documentação para desenvolvedores
+<a href="{@docRoot}preview/features/scoped-folder-access.html">Acessos
+ a diretório com escopo</a>.</p>
+
+<h2 id="keyboard_shortcuts_helper">Auxiliar de atalhos de teclado</h2>
+
+<p>
+No Android N, o usuário pode pressionar "Alt + /" para acionar uma tela de <em>atalhos de teclado</em>
+que exibe todos os atalhos disponíveis do sistema e do
+aplicativo em questão. Os atalhos são recuperados automaticamente do menu do aplicativo, se
+estiverem disponíveis, mas os desenvolvedores podem fornecer listas próprias de atalhos
+para a tela. É possível fazer isso substituindo o novo método
+<code>Activity.onProvideKeyboardShortcuts()</code>, conforme descrito na
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
+</p>
+
+<p>
+Para acionar o auxiliar de atalhos de teclado em qualquer ponto do aplicativo,
+chame {@code Activity.requestKeyboardShortcutsHelper()} para a atividade correspondente.
+</p>
+
+<h2 id="sustained_performance_api">API de desempenho sustentado</h2>
+
+<p>
+O desempenho pode flutuar drasticamente em aplicativos executados por muito tempo porque o
+sistema aciona os mecanismos de sistema-em-um-chip quando os componentes do dispositivo atingem o
+limite de temperatura. Esta flutuação representa um desafio para desenvolvedores de aplicativos
+ que criam aplicativos de alto desempenho e longo tempo de execução.
+</p>
+
+<p>
+Para tratar estas limitações, o Android N inclui compatibilidade opcional para
+<em>modo de desempenho sustentado</em>, permitindo que OEMs ofereçam dicas sobre
+ capacidades de desempenho em dispositivo para aplicativos de longa duração. Os desenvolvedores de aplicativos
+podem usar essas dicas para ajustar os aplicativos para um nível de desempenho do dispositivo previsível
+e consistente em períodos longos de tempo.
+</p>
+
+<p>
+Desenvolvedores de aplicativos podem testar essa nova API na N Developer Preview
+apenas em dispositivos Nexus 6P. Para usar este recurso,
+configure a janela de sinalização de desempenho sustentado para a janela
+que você quer executar em modo de desempenho sustentado. Configure esta sinalização usando o método
+{@code Window.setSustainedPerformanceMode()}. O sistema desativará este modo
+automaticamente quando a janela não estiver mais em foco.
+</p>
+
+<h2 id="vr">Suporte a RV</h2>
+
+<p>
+O Android N adiciona compatibilidade de plataformas e otimizações para um novo Modo RV Mode que dá aos
+ desenvolvedores a capacidade de projetar experiências de RV móveis de alta qualidade para os usuários. Há diversas melhorias de desempenho
+, incluindo acesso a um núcleo exclusivo da CPU para aplicativos de RV.
+ Dentro dos aplicativos, é possível tirar vantagem do rastreamento inteligente da cabeça
+e de notificações estéreo que funcionam para RV. Mais importante, o Android N oferece
+gráficos de latência muito baixa. Para obter informações completas sobre a criação de aplicativos de RV para Android N,
+consulte o <a href="https://developers.google.com/vr/android/">Google VR SDK para Android</a>.
+</p>
+
+
+<h2 id="print_svc">Melhorias nos serviços de impressão</h2>
+
+<p>
+ No Android N, agora os desenvolvedores de serviços de impressão podem exibir informações adicionais
+ sobre impressoras e trabalhos de impressão individuais.
+</p>
+
+<p>
+ Ao listar impressoras individuais, agora um serviço de impressão pode definir
+ícones por impressora de duas maneiras:
+</p>
+
+<ul>
+ <li>É possível definir um ícone de um ID de recurso chamando
+ <code>PrinterInfo.Builder.setResourceIconId()</code>
+ </li>
+
+ <li>É possível exibir um ícone da rede chamando
+<code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code> e definindo um
+retorno de chamada para quando o ícone for solicitado usando
+<code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>
+ </li>
+</ul>
+
+<p>
+ Além disso, você pode fornecer atividade por impressora para exibir
+informações adicionais chamando <code>PrinterInfo.Builder.setInfoIntent()</code>.
+</p>
+
+<p>
+ É possível indicar o progresso e o status de trabalhos de impressão na
+notificação de trabalhos de impressão chamando
+<code>android.printservice.PrintJob.setProgress()</code> e
+<code>android.printservice.PrintJob.setStatus()</code>, respectivamente.
+</p>
+
+<p>
+ Para obter mais informações sobre estes métodos, consulte a <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
+</p>
+
+<h2 id="framemetrics_api">FrameMetricsListener API</h2>
+
+<p>
+A FrameMetricsListener API permite que um aplicativo monitore o desempenho de renderização
+ da IU. A API oferece este recurso ao expor uma API Pub/Sub em streaming para transferir informações de precisão
+de quadro à janela atual do aplicativo. Os dados retornados são
+equivalentes aos que<code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code> exibe, mas não estão mais limitados a 120 quadros.
+</p>
+
+<p>
+É possível usar o FrameMetricsListener para medir o desempenho da IU
+em nível de interação na produção sem conexão USB. Esta API
+permite a coleta de dados com granularidade muito maior do que
+{@code adb shell dumpsys gfxinfo}. A granularidade maior é possível porque
+o sistema pode coletar dados para determinadas interações no aplicativo; o sistema
+não precisa capturar um resumo global do desempenho
+do aplicativo nem limpar qualquer estado global. É possível usar este
+recurso para reunir dados de desempenho e capturar regressões no desempenho da IU
+para casos de uso reais dentro do aplicativo.
+</p>
+
+<p>
+Para monitorar uma janela, implemente o método de retorno de chamada <code>FrameMetricsListener.onMetricsAvailable()</code>
+e registre-o nessa janela. Para obter mais informações, consulte a
+documentação da classe{@code FrameMetricsListener} na
+<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>,disponível para download.
+</p>
+
+<p>
+A API fornece um objeto {@code FrameMetrics}, que contém dados de quadro que
+o subsistema de renderização relata para vários marcos no ciclo de vida de um quadro.
+As métricas suportadas são: {@code UNKNOWN_DELAY_DURATION},
+{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
+{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
+{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
+{@code TOTAL_DURATION}e {@code FIRST_DRAW_FRAME}.
+</p>
+
+
+<h2 id="virtual_files">Arquivos virtuais</h2>
+
+<p>
+ Em versões anteriores do Android, o aplicativo podia usar a estrutura de
+ acesso ao armazenamento para permitir que os usuários selecionem arquivos de contas de armazenamento em nuvem,
+ como o Google Drive. No entanto, não é possível representar arquivos que
+não tenham uma representação direta de código de bytes; os arquivos precisam fornecer
+ um fluxo de entrada.
+</p>
+
+<p>
+ O Android N adiciona o conceito de <em>arquivos virtuais</em> à estrutura de acesso
+ ao armazenamento. O recurso de arquivos virtuais permite que seu
+{@link android.provider.DocumentsProvider} retorne URIs de documentos que possam ser
+usados com intenções {@link android.content.Intent#ACTION_VIEW} mesmo que não tenham
+uma representação direta de código de bytes. O Android N também permite que você
+ ofereça formatos alternativos para arquivos de usuário, sejam virtuais ou não.
+</p>
+
+<p>
+ Para obter o URI para um documento virtual em seu aplicativo, é preciso criar uma
+ {@link android.content.Intent} para abrir a IU do seletor de arquivos. Como um aplicativo
+não consegue abrir um arquivo virtual diretamente usando o método
+{@link android.content.ContentResolver#openInputStream(Uri) openInputStream()}
+, seu aplicativo não receberá arquivos virtuais se você não incluir a categoria
+{@link android.content.Intent#CATEGORY_OPENABLE}.
+</p>
+
+<p>
+ Depois que o usuário fizer uma seleção, o sistema chamará o método
+{@link android.app.Activity#onActivityResult onActivityResult()}.
+ O aplicativo pode recuperar o URI do arquivo virtual e obter um fluxo de resultados, como
+ demonstrado no snippet de código abaixo.
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ Para obter mais informações sobre como acessar arquivos de usuário, consulte o
+<a href="{@docRoot}guide/topics/providers/document-provider.html">guia da estrutura
+de acesso ao armazenamento</a>.
+</p>
diff --git a/docs/html-intl/intl/pt-br/preview/index.jd b/docs/html-intl/intl/pt-br/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/pt-br/preview/index.jd
rename to docs/html-intl/intl/pt-br/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/pt-br/design/get-started/principles.jd b/docs/html-intl/intl/pt-br/design/get-started/principles.jd
index 82e28cc..81b3524 100644
--- a/docs/html-intl/intl/pt-br/design/get-started/principles.jd
+++ b/docs/html-intl/intl/pt-br/design/get-started/principles.jd
@@ -8,7 +8,7 @@
tipos de dispositivo.</p>
<p>
-Considere estes princípios ao aplicar
+Considere estes princípios ao aplicar
sua criatividade e sua mentalidade de projeto. Desvie-se de forma objetiva.
</p>
@@ -18,7 +18,7 @@
<div class="col-7">
<h4 id="delight-me">Agrade-me de formas surpreendentes</h4>
-<p>Uma bela superfície, uma animação cuidadosamente posicionada ou um efeito sonoro no momento certo
+<p>Uma bela superfície, uma animação cuidadosamente posicionada ou um efeito sonoro no momento certo
contribui para a boa experiência. Efeitos sutis contribuem para uma sensação de facilidade e de que algo
poderoso está à mão.</p>
diff --git a/docs/html-intl/intl/pt-br/design/material/index.jd b/docs/html-intl/intl/pt-br/design/material/index.jd
index 5368d2d..e2f0b47 100644
--- a/docs/html-intl/intl/pt-br/design/material/index.jd
+++ b/docs/html-intl/intl/pt-br/design/material/index.jd
@@ -39,10 +39,10 @@
-<p itemprop="description">O Material Design é um guia abrangente para design visual, de movimento e de
+<p itemprop="description">O Material Design é um guia abrangente para design visual, de movimento e de
interação para diversas plataformas e dispositivos. O Android agora é compatível com
-aplicativos do Material Design. Para usar o Material Design nos aplicativos Android, siga as orientações definidas
-nas <a href="http://www.google.com/design/spec">especificações do Material Design</a> e use os novos
+aplicativos do Material Design. Para usar o Material Design nos aplicativos Android, siga as orientações definidas
+nas <a href="http://www.google.com/design/spec">especificações do Material Design</a> e use os novos
componentes e funcionalidades disponíveis no Android 5.0 (API de nível 21) e em posteriores.</p>
<p>O Android fornece os seguintes elementos para criar aplicativos do Material Design:</p>
@@ -59,7 +59,7 @@
<h3>Tema do Material</h3>
-<p>O tema do Material fornece um novo estilo para o seu aplicativo, widgets de sistema que permitem
+<p>O tema do Material fornece um novo estilo para o seu aplicativo, widgets de sistema que permitem
definir a paleta de cores e as animações padrão para feedback de toque e transições de atividades.</p>
<!-- two columns -->
@@ -79,13 +79,13 @@
<br style="clear:left"/>
</div>
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/theme.html">Como usar o tema
+<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/theme.html">Como usar o tema
do Material</a>.</p>
<h3>Listas e cartões</h3>
-<p>O Android fornece dois novos widgets para exibir cartões e listas com estilos e animações do
+<p>O Android fornece dois novos widgets para exibir cartões e listas com estilos e animações do
Material Design:</p>
<!-- two columns -->
@@ -97,19 +97,19 @@
</div>
<div style="float:left;width:250px;margin-right:0px;">
<img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
- <p>O novo widget <code>CardView</code> permite exibir informações importantes dentro de
+ <p>O novo widget <code>CardView</code> permite exibir informações importantes dentro de
cartões que têm aparência consistente.</p>
</div>
<br style="clear:left"/>
</div>
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/lists-cards.html">Como criar
+<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/lists-cards.html">Como criar
listas e cartões</a>.</p>
<h3>Sombras de vistas</h3>
-<p>Além das propriedades X e Y, vistas no Android agora têm uma propriedade
+<p>Além das propriedades X e Y, vistas no Android agora têm uma propriedade
Z. Essa nova propriedade representa a elevação de uma vista, que determina:</p>
<ul>
@@ -130,7 +130,7 @@
</div>
</div>
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/shadows-clipping.html">Como
+<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/shadows-clipping.html">Como
definir sombras e recortar visualizações</a>.</p>
@@ -165,7 +165,7 @@
<p>Animações de feedback de toque são integradas em várias vistas padrão, como botões. As novas APIs
permitem personalizar essas animações e adicioná-las às vistas personalizadas.</p>
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/animations.html">Como definir
+<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/animations.html">Como definir
animações personalizadas</a>.</p>
@@ -182,5 +182,5 @@
imagem de mapa de bits.</li>
</ul>
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/drawables.html">Como trabalhar
+<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/drawables.html">Como trabalhar
com desenháveis</a>.</p>
diff --git a/docs/html-intl/intl/pt-br/design/patterns/compatibility.jd b/docs/html-intl/intl/pt-br/design/patterns/compatibility.jd
index 775af0c..bd4ec30 100644
--- a/docs/html-intl/intl/pt-br/design/patterns/compatibility.jd
+++ b/docs/html-intl/intl/pt-br/design/patterns/compatibility.jd
@@ -57,7 +57,7 @@
<div class="col-6">
<h4>Aplicativos legados em telefones com controles de navegação virtuais</h4>
-<p>Ao executar um aplicativo que foi desenvolvido para Android 2.3 ou anterior em um telefone com controles de
+<p>Ao executar um aplicativo que foi desenvolvido para Android 2.3 ou anterior em um telefone com controles de
navegação virtuais, um controle de ações adicionais é exibido no lado direito da barra de navegação virtual. É possível
tocar no controle para exibir as ações do aplicativo no estilo tradicional de menu do Android.</p>
diff --git a/docs/html-intl/intl/pt-br/design/patterns/navigation.jd b/docs/html-intl/intl/pt-br/design/patterns/navigation.jd
index 8ed12f7..89eab9a 100644
--- a/docs/html-intl/intl/pt-br/design/patterns/navigation.jd
+++ b/docs/html-intl/intl/pt-br/design/patterns/navigation.jd
@@ -66,7 +66,7 @@
<li>Mudar características de exibição (como mudar o zoom)</li>
</ul>
<h4>Navegação entre telas de mesmo nível</h4>
-<p>Quando o aplicativo suporta navegação de uma lista de itens para uma vista de detalhes de um desses itens,
+<p>Quando o aplicativo suporta navegação de uma lista de itens para uma vista de detalhes de um desses itens,
frequentemente é desejável dar suporte à navegação de direção daquele item para outro anterior ou
posterior a ele na lista. Por exemplo, no Gmail, é fácil deslizar para a esquerda ou para a direita em uma
conversa para visualizar uma mais nova ou mais antiga na mesma Caixa de entrada. Assim como ao mudar a vista dentro de uma tela, tal
@@ -82,9 +82,9 @@
<img src="{@docRoot}design/media/navigation_between_siblings_market1.png">
-<p>Você tem a capacidade de deixar o comportamento de Para Cima ainda mais inteligente com base em seu conhecimento da
+<p>Você tem a capacidade de deixar o comportamento de Para Cima ainda mais inteligente com base em seu conhecimento da
vista de detalhe. Estendendo o exemplo da Play Store acima, imagine que o usuário navegou do último
-Livro visualizado para os detalhes da adaptação do Filme. Nesse caso, Para Cima pode retornar a um contêiner
+Livro visualizado para os detalhes da adaptação do Filme. Nesse caso, Para Cima pode retornar a um contêiner
(filmes) pelo qual o usuário não navegou anteriormente.</p>
<img src="{@docRoot}design/media/navigation_between_siblings_market2.png">
@@ -116,7 +116,7 @@
<h4>Notificações indiretas</h4>
-<p>Quando o aplicativo precisa apresentar simultaneamente informações sobre vários eventos, ele pode usar
+<p>Quando o aplicativo precisa apresentar simultaneamente informações sobre vários eventos, ele pode usar
uma única notificação que direcione o usuário a uma tela intersticial. Essa tela resume esses
eventos e fornece caminhos para que o usuário mergulhe profundamente no aplicativo. Notificações desse estilo são
chamadas de <em>notificações indiretas</em>.</p>
@@ -128,7 +128,7 @@
navegando dentro do aplicativo em vez de voltar à tela intersticial.</p>
<p>Por exemplo, suponha que um usuário no Gmail receba uma notificação indireta do Agenda. Tocar nessa
-notificação abrirá a tela intersticial, que exibirá lembretes para vários
+notificação abrirá a tela intersticial, que exibirá lembretes para vários
eventos. Tocar em Voltar na tela intersticial retornará o usuário ao Gmail. Tocar em um determinado evento
levará o usuário da tela intersticial ao aplicativo completo do Agenda para exibir detalhes do
evento. Dos detalhes do evento, Para Cima e Voltar navegam para a vista de nível superior do Agenda.</p>
@@ -169,7 +169,7 @@
atividades, consistindo em atividades que você cria e naquelas que reutiliza de outros aplicativos.</p>
<p>Uma <strong>tarefa</strong> é a sequência de atividades que um usuário segue para atingir um objetivo. Uma
-única tarefa pode usar atividades apenas de um aplicativo ou pode retirar atividades de uma série
+única tarefa pode usar atividades apenas de um aplicativo ou pode retirar atividades de uma série
de outros aplicativos.</p>
<p>Uma <strong>intenção</strong> é um mecanismo para que um aplicativo sinalize que gostaria a assistência de outro
@@ -188,7 +188,7 @@
<img src="{@docRoot}design/media/navigation_between_apps_inward.png">
-<p>Quando o usuário seleciona o compartilhamento via Gmail, a atividade de composição do Gmail é adicionada como uma continuação da
+<p>Quando o usuário seleciona o compartilhamento via Gmail, a atividade de composição do Gmail é adicionada como uma continuação da
Tarefa A — nenhuma tarefa nova é criada. Se o Gmail tivesse a própria tarefa em execução em segundo plano, ela não
seria afetada.</p>
@@ -209,5 +209,5 @@
pela Tarefa B — o contexto anterior é abandonado em favor do novo objetivo do usuário.</p>
<p>Quando o aplicativo é registrado para tratar intenções com uma atividade em um ponto profundo da hierarquia do aplicativo,
-consulte <a href="#into-your-app">Navegação para o seu aplicativo pelos widgets de tela
+consulte <a href="#into-your-app">Navegação para o seu aplicativo pelos widgets de tela
inicial e notificações</a> para ver orientações sobre como especificar a navegação Para Cima.</p>
diff --git a/docs/html-intl/intl/pt-br/design/patterns/notifications.jd b/docs/html-intl/intl/pt-br/design/patterns/notifications.jd
deleted file mode 100644
index efea610..0000000
--- a/docs/html-intl/intl/pt-br/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=Notificações
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>Documentos do desenvolvedor</h3>
- <p>Notificação ao usuário</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Notificações no Android 4.4 e em anteriores</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>Vídeo</h3>
- <p>DevBytes: Notificações na pré-visualização do desenvolvedor do Android L</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>O sistema de notificações permite que os usuários se mantenham informados sobre eventos relevantes e
-imediatos
-no aplicativo, como novas mensagens de bate-papo de um amigo ou um evento de calendário.
-Pense nas notificações como um canal de notícias que alerta o usuário sobre eventos
-importantes à
-medida que acontecem ou sobre um registro que grava eventos enquanto o usuário não está prestando
-atenção — e que é sincronizado conforme apropriado em todos os dispositivos Android dele.</p>
-
-<h4 id="New"><strong>Novo no Android 5.0</strong></h4>
-
-<p>No Android 5.0, as notificações recebem atualizações importantes: em termos estruturais, visuais e
-funcionais:</p>
-
-<ul>
- <li>As notificações passaram por mudanças visuais consistentes com o novo
-tema do Material Design.</li>
- <li> As notificações agora estão disponíveis na tela de bloqueio do dispositivo, enquanto que
-o conteúdo sensível ainda pode
-ficar oculto atrás dela.</li>
- <li>Notificações de alta prioridade recebidas enquanto o dispositivo está em uso agora usam um novo formato, chamado de
-notificações heads-up.</li>
- <li>Notificações sincronizadas na nuvem: descartar uma notificação em um dos
-dispositivos Android a descarta
-também nos outros.</li>
-</ul>
-
-<p class="note"><strong>Observação:</strong> o projeto de notificação nesta versão do
-Android é uma mudança
-significativa em relação às versões anteriores. Para obter informações sobre o projeto de notificação em versões
-anteriores, consulte <a href="./notifications_k.html">Notificações no Android 4.4 ou em anteriores</a>.</p>
-
-<h2 id="Anatomy">Anatomia de uma notificação</h2>
-
-<p>Esta seção aborda as partes básicas de uma notificação e como elas
-podem aparecer em diferentes tipos de dispositivos.</p>
-
-<h3 id="BaseLayout">Layout básico</h3>
-
-<p>No mínimo, todas as notificações consistem em um layout básico, incluindo:</p>
-
-<ul>
- <li> O <strong>ícone</strong> da notificação. O ícone simboliza o
-aplicativo de origem. Ele também
- pode indicar o tipo de notificação, caso o aplicativo gere mais de um
-tipo.</li>
- <li> Um <strong>título</strong> da notificação e
-<strong>texto</strong> adicional.</li>
- <li> Uma <strong>marcação de data e hora</strong>.</li>
-</ul>
-
-<p>Notificações criadas com {@link android.app.Notification.Builder Notification.Builder}
-para versões anteriores da plataforma têm a mesma aparência e o mesmo funcionamento no Android
-5.0, com apenas mudanças menores de estilo que o sistema
-entrega a você. Para obter mais informações sobre notificações em versões
-anteriores do Android, consulte
-<a href="./notifications_k.html">Notificações no Android 4.4 ou em anteriores</a>.</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- Layout básico de uma notificação em dispositivo portátil (à esquerda) e a mesma notificação em Wear (à direita),
-com uma foto do usuário e um ícone de notificação
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">Layouts expandidos</h3>
-
-
-<p>Você pode escolher o nível de detalhe que as notificações de seu aplicativo
-devem fornecer. Elas podem mostrar as primeiras
-linhas de uma mensagem ou exibir uma visualização de imagem maior. As informações
-adicionais fornecem ao usuário mais
-contexto e — em alguns casos — podem permitir que o usuário leia uma mensagem
-em sua totalidade. O usuário pode
-pinçar para aproximar ou afastar a vista ou realizar deslizamento de um dedo para alternar entre os layouts
-compacto e expandido.
- Para notificações de um evento, o Android fornece três modelos de layout
-expandido (texto, caixa de entrada e
- imagem) para usar em seu aplicativo. As imagens a seguir mostram como
-se parecem notificações de um evento em
- dispositivos portáteis (à esquerda) e usados junto ao corpo (à direita).</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">Ações</h3>
-
-<p>O Android tem suporte para ações opcionais que são exibidas na parte inferior
-da notificação.
-Com ações, os usuários podem tratar as tarefas mais comuns para
-determinada notificação de dentro da sombra da notificação sem precisar abrir o
-aplicativo de origem.
-Isso acelera a interação e, em conjunto com deslizar-para-descartar, ajuda os usuários a
-se concentrarem em notificações que sejam importantes.</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">Tenha cuidado com o número de ações que inclui em uma
-notificação. Quanto mais
-ações incluir, maior será a complexidade cognitiva criada. Limite-se
-ao menor número possível
-de ações, incluindo apenas as ações efetivamente mais importantes e
-significativas.</p>
-
-<p>Boas candidatas a ações em notificações são ações que:</p>
-
-<ul>
- <li> Sejam essenciais, frequentes e típicas para o tipo de conteúdo
-exibido
- <li> Permitam que o usuário realize tarefas rapidamente
-</ul>
-
-<p>Evite ações que sejam:</p>
-
-<ul>
- <li> Ambíguas
- <li> Idênticas à ação padrão da notificação (como "Ler" ou
-"Abrir")
-</ul>
-
-
-
-<p>Você pode especificar no máximo três ações, cada uma consistindo em um ícone
-e um nome de ação.
- Adicionar ações a um layout básico simples torna a notificação expansível,
-mesmo se a
-notificação não tiver um layout expandido. Como as ações são exibidas apenas para notificações
-expandidas
- e que ficam de outra forma ocultas, certifique-se de que qualquer ação que um
-usuário possa invocar de dentro de uma
- notificação esteja disponível também dentro do aplicativo
-associado.</p>
-
-<h2 style="clear:left">Notificação heads-up</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- Exemplo de uma notificação heads-up (chamada telefônica recebida, alta prioridade)
-que aparece sobre um
-aplicativo imersivo
- </p>
-</div>
-
-<p>Quando uma notificação de alta prioridade chega (veja à direita), ela é apresentada
-aos usuários por
-um período curto com um layout expandido mostrando possíveis ações.</p>
-<p> Depois desse período, a notificação recua para a sombra
-de notificação. Se a <a href="#correctly_set_and_manage_notification_priority">prioridade</a> de uma notificação for
-marcada como Alta, Máxima ou tela cheia, ela receberá uma notificação heads-up.</p>
-
-<p><b>Bons exemplos de notificações heads-up</b></p>
-
-<ul>
- <li> Chamada telefônica recebida durante o uso do dispositivo</li>
- <li> Alarme durante o uso do dispositivo</li>
- <li> Nova mensagem SMS</li>
- <li> Bateria fraca</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">Diretrizes</h2>
-
-
-<h3 id="MakeItPersonal">Torne-a pessoal</h3>
-
-<p>Para notificações de itens enviados por outra pessoa (como uma mensagem ou
-atualização de status), inclua a imagem da pessoa usando
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()}. Anexe também informações sobre
-a pessoa nos metadados da notificação (consulte {@link android.app.Notification#EXTRA_PEOPLE}).</p>
-
-<p>O ícone principal de sua notificação ainda é mostrado, portanto, o usuário pode associá-lo
-ao ícone
-visível na barra de status.</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- Notificação que mostra a pessoa que a ativou e o conteúdo enviado.
-</p>
-
-
-<h3 id="navigate_to_the_right_place">Navegação para o lugar certo</h3>
-
-<p>Quando o usuário toca no corpo de uma notificação (fora dos botões
-de ação), abra o aplicativo
-no lugar em que o usuário possa visualizar e agir sobre os dados referenciados na
-notificação. Na maioria dos casos, será a exibição detalhada de um único item de dado, como uma mensagem,
-mas também poderá ser uma
-vista resumida se a notificação estiver empilhada. Se o aplicativo
-levar o usuário a qualquer lugar abaixo do nível superior do aplicativo, insira a navegação na pilha de retorno do aplicativo para que
-o usuário possa pressionar o botão Voltar do sistema para voltar ao nível superior. Para obter mais informações, consulte
-<em>Navegação para o seu aplicativo pelos widgets de página inicial e notificações</em> no padrão de projeto de <a href="{@docRoot}design/patterns/navigation.html#into-your-app">Navegação</a>.
-</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">Definição e gerenciamento
-corretos da prioridade das
-notificações</h3>
-
-<p>O Android tem suporte para um sinalizador de prioridade para notificações. Esse sinalizador permite
-influenciar o local em que a notificação é exibida em relação a outras notificações e
-ajuda a garantir
-que os usuários sempre vejam primeiro as notificações mais importantes. Você pode escolher entre
-os seguintes
-níveis de prioridade ao publicar uma notificação:</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>Prioridade</strong></p>
-</td>
- <td class="tab0">
-<p><strong>Uso</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>Use para notificações críticas e urgentes que alertam o usuário sobre uma condição
-que depende
-do tempo ou que precisa ser resolvida antes que o usuário possa continuar
-com uma determinada tarefa.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>Use principalmente para comunicações importantes, como uma mensagem ou
-eventos de bate-papo com conteúdo particularmente interessante para o usuário.
-Notificações de alta prioridade acionam a exibição de uma notificação heads-up.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>Use para todas as notificações que não recaiam em nenhuma das outras prioridades descritas aqui.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>Use para notificações sobre as quais deseja que o usuário seja informado, mas
-que sejam menos urgentes. Notificações de baixa prioridade tendem a ser exibidas na parte inferior da lista,
-o que as torna uma boa
-opção para coisas como atualizações públicas ou sociais não direcionadas: o usuário pediu para
-ser notificado sobre
-elas, mas essas notificações nunca devem ter precedência sobre comunicações
-urgentes ou diretas.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>Use para informações contextuais ou de histórico, como informações sobre clima ou
-informações contextuais de localização.
-Notificações de prioridade mínima não aparecem na barra de status. O usuário
-as descobre expandindo a sombra da notificação.</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>Como escolher uma prioridade
-adequada
-</strong></h4>
-
-<p><code>DEFAULT</code>, <code>HIGH</code> e <code>MAX</code> são níveis de prioridade de interrupção e arriscam
-interromper a atividade
-do usuário. Para evitar irritar os usuários de seu aplicativo, reserve níveis de prioridade de interrupção para
-notificações que:</p>
-
-<ul>
- <li> Envolvam outra pessoa</li>
- <li> Dependam do tempo</li>
- <li> Possam mudar imediatamente o comportamento do usuário no mundo real</li>
-</ul>
-
-<p>Notificações definidas como <code>LOW</code> e <code>MIN</code> ainda podem
-ser valiosas para o usuário: muitas, se não a maioria, das notificações não precisam demandar a atenção
-imediata do usuário, ou vibrar o pulso do usuário, mas ainda contêm informações que o usuário
-achará valiosas ao decidir procurar
-notificações. Os critérios para notificações de prioridade <code>LOW</code> e <code>MIN</code>
-incluem:</p>
-
-<ul>
- <li> Não envolver outras pessoas</li>
- <li> Não depender de tempo</li>
- <li> Ter conteúdo no qual o usuário pode estar interessado, mas que pode decidir
-verificar no momento em que desejar</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">Definição de uma categoria
-de notificação</h3>
-
-<p>Se a sua notificação recair em uma das categorias predefinidas (veja
-abaixo), atribua-a
-adequadamente. Aspectos da IU do sistema, como a sombra da notificação (ou qualquer
-outra escuta
-de notificação), podem usar essas informações para tomar decisões de classificação e filtragem.</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>Chamada recebida (voz ou vídeo) ou solicitação similar de
-comunicação síncrona</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>Mensagem direta recebida (SMS, mensagem instantânea etc.)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>Mensagens assíncronas em lote (e-mail)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>Evento de calendário</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>Promoção ou publicidade</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>Alarme ou cronômetro</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>Andamento de uma operação de execução longa em segundo plano</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>Atualização de rede social ou de compartilhamento</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>Erro em operação de segundo plano ou no status de autenticação</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>Controle de transporte de mídia para reprodução</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>Atualização do sistema ou do status do dispositivo. Reservado para uso do sistema.</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>Indicação de serviço de segundo plano em execução</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>Uma recomendação específica e oportuna para uma única coisa. Por exemplo, um aplicativo
-de notícias pode querer
-recomendar uma notícia que acredita que o usuário desejará ler em seguida.</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>Informações contínuas sobre o dispositivo ou o status contextual</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">Resuma as notificações</h3>
-
-<p>Se uma notificação de um certo tipo já estiver pendente quando o aplicativo tentar enviar uma nova
-notificação do mesmo tipo, combine-as em uma única notificação de resumo para o aplicativo. Não
-crie um novo objeto.</p>
-
-<p>Uma notificação de resumo cria uma descrição resumida e permite que o
-usuário entenda quantas notificações
-de um determinado tipo estão pendentes.</p>
-
-<div class="col-6">
-
-<p><strong>O que não fazer</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>O que fazer</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">Você pode fornecer
-mais detalhes sobre as notificações individuais que compõem um
-resumo usando o layout resumido expandido. Essa abordagem permite que os usuários
-entendam melhor quais
-notificações estão pendentes e decidam se estão interessados o suficiente para lê-las
-em detalhes dentro
-do aplicativo associado.</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- Notificação expandida e contraída que é um resumo (usando <code>InboxStyle</code>)
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">Torne as notificações
-opcionais</h3>
-
-<p>Os usuários devem sempre controlar as notificações. Permita que o usuário
-desative as notificações
-de seu aplicativo ou altere as propriedades de alerta, como som de alerta e
-se a vibração será usada,
-adicionando um item de configuração da notificação nas configurações do aplicativo.</p>
-
-<h3 id="use_distinct_icons">Use ícones distintos</h3>
-<p>Ao olhar para a área de notificação, o usuário deverá ser capaz de discernir
-que tipos de
-notificações estão atualmente pendentes.</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>O que fazer</strong></p>
- <p>Verifique os ícones de notificação que os aplicativos do Android já fornecem e crie
-ícones de notificação para o seu
-aplicativo que tenham aparência suficientemente distinta.</p>
-
- <p><strong>O que fazer</strong></p>
- <p>Use o <a href="/design/style/iconography.html#notification">estilo de ícone de notificação</a> apropriado
- para ícones pequenos e o
- <a href="/design/style/iconography.html#action-bar">estilo de ícone de barra
-de ação</a> da luminosidade do Material para os ícones
- de ação.</p>
-<p ><strong>O que fazer</strong></p>
-<p >Mantenha os ícones visualmente simples, evitando detalhes excessivos que sejam
-difíceis de discernir.</p>
-
- <div><p><strong>O que não fazer</strong></p>
- <p>Coloque um alfa adicional (esmaecimento ou redução de intensidade) nos ícones pequenos
-e nos ícones de
- ação; eles podem ter bordas suavizadas, mas, como o Android usa esses
-ícones como máscaras (ou seja, somente
- o canal alfa é usado), a imagem normalmente deve ser desenhada com
-opacidade total.</p>
-
-</div>
-<p style="clear:both"><strong>O que não fazer</strong></p>
-
-<p>Use cores para distinguir o seu aplicativo dos outros. Ícones de notificação devem
-somente ser uma imagem com fundo branco sobre transparente.</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">Pisque o LED de notificação
-adequadamente</h3>
-
-<p>Muitos dispositivos Android contêm um LED de notificação, que é usado para manter o
-usuário informado sobre
-eventos enquanto a tela está desligada. Notificações com um nível de prioridade de <code>MAX</code>,
-<code>HIGH</code> ou <code>DEFAULT</code> devem
-fazer com que o LED brilhe, enquanto que os de prioridade mais baixa (<code>LOW</code> e
-<code>MIN</code>) não devem.</p>
-
-<p>O controle do usuário sobre as notificações deve se estender ao LED. Ao usar
-DEFAULT_LIGHTS, o
-LED brilhará na cor branca. Suas notificações não devem usar uma cor
-diferente, a não ser que o
-usuário as tenha explicitamente personalizado.</p>
-
-<h2 id="building_notifications_that_users_care_about">Criação de notificações
-que agradam aos usuários</h2>
-
-<p>Para criar um aplicativo que os usuários amem, é importante projetar as
-notificações cuidadosamente.
-As notificações personificam a voz do seu aplicativo e contribuem para
-a personalidade dele. Notificações indesejadas ou
-irrelevantes podem irritar o usuário ou fazer com que ele reprove a
-quantidade de atenção que o
-aplicativo exige. Portanto, use notificações de forma cuidadosa.</p>
-
-<h3 id="when_to_display_a_notification">Quando exibir uma notificação</h3>
-
-<p>Para criar um aplicativo que as pessoas gostem de usar, é importante
-reconhecer que a atenção e o foco
-do usuário são recursos que devem ser protegidos. Apesar de o sistema de
-notificação do Android ter
-sido projetado para minimizar o impacto das notificações na atenção do usuário,
-ainda é
-importante ter ciência do fato de que as notificações interrompem o
-fluxo de tarefas do usuário.
-Ao planejar as notificações, pergunte-se se elas são importantes o suficiente para
-justificar uma interrupção. Se não tiver certeza, permita que o usuário decida se quer
-uma notificação usando as configurações de notificação do seu aplicativo ou ajuste
-o sinalizador de prioridade das notificações para <code>LOW</code> ou <code>MIN</code> para
-evitar distrair o usuário enquanto ele faz
-alguma outra coisa.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- Exemplos de notificação que depende de tempo
- </p>
-
-<p>Apesar de aplicativos bem comportados geralmente se manifestarem apenas quando ocorre interação com eles, alguns
-casos justificam que o aplicativo interrompa o usuário com uma notificação não solicitada.</p>
-
-<p>Use notificações principalmente para <strong>eventos que dependam de tempo</strong>, especialmente
- se esses eventos síncronos <strong>envolverem outras pessoas</strong>. Por
-exemplo, um bate-papo recebido
-é uma forma síncrona em tempo real de comunicação: outro usuário
-espera ativamente a resposta. Eventos de calendário são outro exemplo bom de quando usar uma
-notificação e atrair a
-atenção do usuário, pois o evento é iminente e eventos de calendário frequentemente
-envolvem outras pessoas.</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">Quando não exibir
-uma notificação</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>Em muitos outros casos, notificações não são adequadas:</p>
-
-<ul>
- <li> Evite notificar o usuário sobre informações que não são especificamente
-direcionadas a ele ou
-que não dependam realmente de tempo. Por exemplo, as atualizações
-assíncronas e não direcionadas
-que fluem por uma rede social geralmente não justificam uma interrupção
-em tempo real. Para os usuários que se importam
-com elas, deixe que decidam recebê-las.</li>
- <li> Não crie uma notificação se as informações novas relevantes estiverem
-atualmente na tela. Em vez disso,
-use a IU do próprio aplicativo para notificar o usuário das novas informações
-diretamente no contexto.
- Por exemplo, um aplicativo de bate-papo não deve criar notificações de sistema enquanto o
-usuário estiver conversando ativamente com outro usuário.</li>
- <li> Não interrompa o usuário para realizar operações técnicas de baixo nível, como salvar
-ou sincronizar informações, nem atualize um aplicativo se o aplicativo ou o sistema puder resolver
-o problema sem envolver o usuário.</li>
- <li> Não interrompa o usuário para informar um erro se o aplicativo
-puder se recuperar dele por conta própria, sem que o usuário
-tome qualquer ação.</li>
- <li> Não crie notificações que não tenham conteúdo real de notificação e
-que meramente anunciem o seu
-aplicativo. Uma notificação deve fornecer informações úteis, oportunas e novas e
-não deve ser usada
-meramente para executar um aplicativo.</li>
- <li> Não crie notificações supérfluas apenas para colocar sua marca na frente
-dos usuários.
- Tais notificações frustram e provavelmente alienam seu público-alvo. A
-melhor forma de fornecer
- pequenas quantidades de informações atualizadas e manter o usuário envolvido
-com o seu
- aplicativo é desenvolver um widget que ele possa colocar na
-tela inicial.</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">Interação com
-notificações</h2>
-
-<p>Notificações são indicadas por ícones na barra de status e podem ser acessadas
-abrindo a
-gaveta de notificações.</p>
-
-<p>Tocar em uma notificação abre o aplicativo associado com o conteúdo
-detalhado que corresponde à notificação.
-Deslizar à esquerda ou à direita em uma notificação a remove da gaveta.</p>
-
-<h3 id="ongoing_notifications">Notificações contínuas</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- Notificação contínua devido à reprodução de música
- </p>
-</div>
-<p>Notificações contínuas mantêm os usuários informados sobre um processo em andamento em
-segundo plano.
-Por exemplo, reprodutores de música anunciam a faixa em reprodução no
-sistema de notificação e
-continuam a fazer isso até que o usuário interrompa a reprodução. Notificações contínuas também podem
-mostrar ao usuário
-feedback sobre tarefas mais longas, como o download de um arquivo ou a codificação de um vídeo. Um usuário não pode remover
-manualmente uma notificação contínua da gaveta de notificações.</p>
-
-<h3 id="ongoing_notifications">Reprodução de mídia</h3>
-<p>No Android 5.0, a tela de bloqueio não mostra controles de transporte por causa da classe
-{@link android.media.RemoteControlClient} obsoleta. Mas ela <em>mostra</em> notificações, portanto, a notificação de reprodução
-de cada aplicativo agora é a forma
-principal para que os usuários controlem a reprodução em um estado bloqueado. Esse comportamento dá aos aplicativos mais
-controle sobre quais
-botões exibir e de que forma, ao mesmo tempo em que fornece uma experiência consistente
-para o usuário, com a tela bloqueada ou não.</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">Diálogos
-e avisos</h3>
-
-<p>O seu aplicativo não deve criar uma caixa de diálogo ou um aviso se não estiver
-atualmente na tela. Uma caixa de diálogo ou um aviso
- deve ser exibido somente como uma resposta imediata ao usuário tomando uma ação
-dentro do seu aplicativo.
-Para obter orientação adicional sobre o uso de caixas de diálogo e avisos, consulte
-<a href="/design/patterns/confirming-acknowledging.html">Confirmação e reconhecimento</a>.</p>
-
-<h3>Avaliação e classificação</h3>
-
-<p>Notificações são notícias e, portanto, são essencialmente exibidas
-em ordem cronológica inversa, com
-consideração especial para a
-<a href="#correctly_set_and_manage_notification_priority">prioridade</a> da notificação declarada no aplicativo.</p>
-
-<p>Notificações são uma parte importante da tela de bloqueio e são exibidas proeminentemente
-sempre
-que a tela do dispositivo é exibida. O espaço na tela de bloqueio é restrito, portanto,
-é mais importante
-do que nunca identificar as notificações mais urgentes ou relevantes. Por esse
-motivo, o Android tem um
-algoritmo de classificação mais sofisticado para notificações, levando em conta:</p>
-
-<ul>
- <li> A marcação de data e hora e a prioridade declarada no aplicativo.</li>
- <li> Se a notificação incomodou recentemente o usuário com som ou
-vibração (ou seja,
- se o celular acabou de fazer um ruído e o usuário deseja saber "O que acabou de
-acontecer?", a tela de bloqueio
- deve responder com um olhar rápido).</li>
- <li> Qualquer pessoa anexada à notificação usando {@link android.app.Notification#EXTRA_PEOPLE}
- e, em particular, se é contato especial (com estrelas).</li>
-</ul>
-
-<p>Para aproveitar ao máximo essa classificação, concentre-se na experiência
-do usuário que deseja
-criar, e não em um determinado local na lista.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Notificações do Gmail têm
-prioridade padrão e normalmente
- são classificadas abaixo de mensagens de um aplicativo de mensagem instantânea, como o Hangouts, mas
-recebem
- uma promoção temporária quando novas mensagens chegam.
- </p>
-
-
-<h3>Na tela de bloqueio</h3>
-
-<p>Como as notificações são visíveis na tela de bloqueio, a privacidade do usuário é uma consideração
-especialmente
- importante. Notificações frequentemente contêm informações sensíveis e
-não devem necessariamente estar visíveis
-para qualquer pessoa que ligar a tela do dispositivo.</p>
-
-<ul>
- <li> Para dispositivos que têm uma tela de bloqueio segura (PIN, padrão ou senha), a interface tem
-partes públicas e privadas. A interface pública pode ser exibida em uma tela de bloqueio segura e,
-portanto, vista por qualquer pessoa. A interface privada é o mundo atrás da tela de bloqueio e
-só é revelada depois que o usuário faz login no dispositivo.</li>
-</ul>
-
-<h3>Controle do usuário sobre as informações exibidas na tela de bloqueio segura</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- Notificações na tela de bloqueio com conteúdo revelado depois que o usuário desbloqueia o dispositivo.
- </p>
-</div>
-
-<p>Ao definir uma tela de bloqueio segura, o usuário poderá escolher ocultar
-detalhes sensíveis da tela de bloqueio segura. Nesse caso, a IU do sistema
-considerará o <em>nível de visibilidade</em> da notificação para descobrir o que pode
-ser exibido com segurança.</p>
-<p> Para controlar o nível de visibilidade, chame
-<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>
-e especifique um destes valores:</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>.
-Exibe o conteúdo inteiro da notificação.
- Esse é o padrão do sistema se a visibilidade não for especificada.</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>.
-Na tela de bloqueio, exibe informações básicas sobre essa notificação, incluindo o
-ícone e o nome do aplicativo que a publicou. O restante dos detalhes da notificação não é exibido.
-Alguns pontos a ter em mente são:
- <ul>
- <li> Se você quer fornecer uma versão pública diferente da sua notificação
-para que o sistema a exiba em uma tela de bloqueio segura, forneça um objeto
-Notificação substituto no campo <code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code>.
-
- <li> Essa configuração dá ao aplicativo uma oportunidade de criar uma versão alternativa do
-conteúdo que ainda é útil, mas não revela informações pessoais. Considere o exemplo de um
-aplicativo de SMS cujas notificações incluem o texto da mensagem SMS, o nome do remetente e o ícone do contato.
-Essa notificação deve ser <code>VISIBILITY_PRIVATE</code>, mas <code>publicVersion</code> ainda pode
-conter informações úteis, como "3 novas mensagens", sem outros detalhes
-de identificação.
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>. Mostra apenas as informações mínimas, excluindo até mesmo
-o ícone da notificação.</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Notificações no
-Android Wear</h2>
-
-<p>Notificações e suas <em>ações</em> são enviadas a dispositivos Wear por padrão.
-Os desenvolvedores podem controlar que notificações são enviadas do
-celular ao relógio
-e vice-versa. Os desenvolvedores também podem controlar quais ações são transmitidas. Se o
-seu aplicativo inclui
-ações que não podem ser executadas com um toque, oculte essas ações
-na sua notificação do Wear
-ou considere colocá-las em um aplicativo do Wear, permitindo que o usuário
-termine a ação
-no relógio.</p>
-
-<h4>Transmissão de notificações e ações</h4>
-
-<p>Um dispositivo conectado, como um celular, pode transmitir notificações para um dispositivo Wear para que as
-notificações sejam exibidas nele. De forma similar, ele pode transmitir ações para que o usuário possa agir
-sobre as notificações diretamente do dispositivo Wear.</p>
-
-<p><strong>Transmitir</strong></p>
-
-<ul>
- <li> Novas mensagens instantâneas</li>
- <li> Ações de um toque, como +1, Curtir, Coração</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>Não transmitir</strong></p>
-
-<ul>
- <li> Notificações de podcasts recém-chegados</li>
- <li> Ações que mapeiem para recursos que não são possíveis no relógio</li>
-</ul>
-
-
-
-<p><h4>Ações exclusivas a definir para Wear</h4></p>
-
-<p>Há algumas ações que só podem ser realizadas em Wear. Elas incluem:</p>
-
-<ul>
- <li> Listas rápidas de respostas prontas, como "Volto logo"</li>
- <li> Abrir no celular</li>
- <li> Uma ação "Comentar" ou "Responder" que abre a tela de entrada de voz</li>
- <li> Ações que executam aplicativos específicos de Wear</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/pt-br/guide/components/bound-services.jd b/docs/html-intl/intl/pt-br/guide/components/bound-services.jd
index aa02494..032950e 100644
--- a/docs/html-intl/intl/pt-br/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/bound-services.jd
@@ -334,7 +334,7 @@
</div>
</div>
-<p>Caso precise que o serviço comunique-se com processos remotos, é possível usar
+<p>Caso precise que o serviço comunique-se com processos remotos, é possível usar
o {@link android.os.Messenger} para fornecer a interface ao serviço. Esta técnica permite
estabelecer comunicação entre processos (IPC) sem precisar usar a AIDL.</p>
@@ -348,7 +348,7 @@
<li>O {@link android.os.Messenger} cria um {@link android.os.IBinder} que o serviço
retorna aos clientes a partir de {@link android.app.Service#onBind onBind()}.</li>
<li>Os clientes usam {@link android.os.IBinder} para instanciar o {@link android.os.Messenger}
-(que menciona o {@link android.os.Handler} do serviço), que usam para enviar objetos
+(que menciona o {@link android.os.Handler} do serviço), que usam para enviar objetos
{@link android.os.Message} para o serviço.</li>
<li>O serviço recebe cada {@link android.os.Message} em seu {@link
android.os.Handler} — especificamente, no método {@link android.os.Handler#handleMessage
@@ -538,7 +538,7 @@
</li>
</ol>
-<p>Por exemplo, o fragmento a seguir conecta o cliente ao serviço criado acima
+<p>Por exemplo, o fragmento a seguir conecta o cliente ao serviço criado acima
<a href="#Binder">estendendo a classe Binder</a> para que tudo que ele tenha que fazer seja lançar
o {@link android.os.IBinder} retornado para a classe {@code LocalService} e solicitar a instância de {@code
LocalService}:</p>
@@ -637,7 +637,7 @@
com qualquer cliente.</p>
<p>Além disso, se o serviço for iniciado e aceitar vínculos, quando o sistema chamar
-o método {@link android.app.Service#onUnbind onUnbind()}, será possível retornar
+o método {@link android.app.Service#onUnbind onUnbind()}, será possível retornar
{@code true} opcionalmente se você quiser receber uma chamada de {@link android.app.Service#onRebind
onRebind()} na próxima vez em que um cliente vincular-se ao serviço (em vez de receber uma chamada de {@link
android.app.Service#onBind onBind()}). {@link android.app.Service#onRebind
diff --git a/docs/html-intl/intl/pt-br/guide/components/fragments.jd b/docs/html-intl/intl/pt-br/guide/components/fragments.jd
index 7b1acf9e..74f3dfe 100644
--- a/docs/html-intl/intl/pt-br/guide/components/fragments.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>Veja também</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Construção de uma IU dinâmica com Fragmentos</a></li>
@@ -361,8 +361,8 @@
findFragmentByTag()}.</p>
<p>Para ver uma atividade de exemplo que usa um fragmento como um trabalhador de segundo plano, sem uma IU, consulte o exemplo de {@code
-FragmentRetainInstance.java}, incluso nos exemplos do SDK (disponibilizados pelo
-Android SDK Manager) e localizado no sistema como
+FragmentRetainInstance.java}, incluso nos exemplos do SDK (disponibilizados pelo
+Android SDK Manager) e localizado no sistema como
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code>.</p>
@@ -378,7 +378,7 @@
<li>Adquirir fragmentos existentes na atividade, com {@link
android.app.FragmentManager#findFragmentById findFragmentById()} (para fragmentos que forneçam uma IU
no layout da atividade) ou {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()} (para fragmentos que forneçam ou não uma IU).</li>
+findFragmentByTag()} (para fragmentos que forneçam ou não uma IU).</li>
<li>Retire os fragmentos da pilha de retorno com {@link
android.app.FragmentManager#popBackStack()} (simulando um comando de <em>Voltar</em> do usuário).</li>
<li>Registre uma escuta para as alterações na pilha de retorno com {@link
@@ -600,7 +600,7 @@
<h3 id="ActionBar">Adição de itens à barra de ação</h3>
-<p>Os fragmentos podem contribuir com itens de menu para o <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">menu de opções</a> da atividade (e, consequentemente, para a <a href="{@docRoot}guide/topics/ui/actionbar.html">barra de ação</a>) implementando
+<p>Os fragmentos podem contribuir com itens de menu para o <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">menu de opções</a> da atividade (e, consequentemente, para a <a href="{@docRoot}guide/topics/ui/actionbar.html">barra de ação</a>) implementando
{@link android.app.Fragment#onCreateOptionsMenu(Menu,MenuInflater) onCreateOptionsMenu()}. Para que este método
receba chamadas, no entanto, você deve chamar {@link
android.app.Fragment#setHasOptionsMenu(boolean) setHasOptionsMenu()} durante {@link
@@ -785,7 +785,7 @@
<p>O segundo fragmento, {@code DetailsFragment}, exibe o resumo da peça para o item selecionado
na lista de {@code TitlesFragment}:</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>Uma nova chamada da classe {@code TitlesFragment}, ou seja, se o usuário clicar em um item de lista
@@ -798,7 +798,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>Observe que esta atividade finaliza-se se a configuração for de paisagem,
pois a atividade principal pode tomar o controle e exibir {@code DetailsFragment} juntamente com {@code TitlesFragment}.
Isto pode acontecer se o usuário iniciar {@code DetailsActivity} enquanto estiver na orientação de retrato,
diff --git a/docs/html-intl/intl/pt-br/guide/components/fundamentals.jd b/docs/html-intl/intl/pt-br/guide/components/fundamentals.jd
index 47b9845..2fb8553 100644
--- a/docs/html-intl/intl/pt-br/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/fundamentals.jd
@@ -379,7 +379,7 @@
aos usuários quando buscam esses aplicativos para seu dispositivo.</p>
<p>Por exemplo: se o aplicativo exige uma câmera e usa APIs introduzidas no Android 2.1 (<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API de nível</a> 7),
-deve-se declarar esses requisitos no arquivo de manifesto da seguinte forma:</p>
+deve-se declarar esses requisitos no arquivo de manifesto da seguinte forma:</p>
<pre>
<manifest ... >
@@ -393,7 +393,7 @@
<p>Assim, dispositivos que <em>não</em> tenham câmera e tenham
versão Android <em>anterior</em> a 2.1 não poderão instalar o aplicativo a partir do Google Play.</p>
-<p>No entanto, também é possível declarar que o aplicativo usa a câmera como recurso
+<p>No entanto, também é possível declarar que o aplicativo usa a câmera como recurso
<em>não obrigatório</em>. Nesse caso, o aplicativo precisa definir o atributo <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#required">{@code required}</a>
como {@code "false"} e verificar em tempo de execução
se o dispositivo tem câmera e desativar os recursos da câmera conforme o necessário.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/components/index.jd b/docs/html-intl/intl/pt-br/guide/components/index.jd
index 02fcaa6..5131ead 100644
--- a/docs/html-intl/intl/pt-br/guide/components/index.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/index.jd
@@ -1,7 +1,7 @@
page.title=Componentes do aplicativo
page.landing=true
-page.landing.intro=A estrutura de aplicativo do Android permite criar aplicativos ricos e inovadores usando um conjunto de componentes reutilizáveis. Esta seção explica como criar os componentes que definem os blocos de construção do aplicativo e como conectá-los usando intenções.
-page.metaDescription=A estrutura de aplicativo do Android permite criar aplicativos ricos e inovadores usando um conjunto de componentes reutilizáveis. Esta seção mostra como criar os componentes que definem os blocos de construção do aplicativo e como conectá-los usando intenções.
+page.landing.intro=A estrutura de aplicativo do Android permite criar aplicativos ricos e inovadores usando um conjunto de componentes reutilizáveis. Esta seção explica como criar os componentes que definem os blocos de construção do aplicativo e como conectá-los usando intenções.
+page.metaDescription=A estrutura de aplicativo do Android permite criar aplicativos ricos e inovadores usando um conjunto de componentes reutilizáveis. Esta seção mostra como criar os componentes que definem os blocos de construção do aplicativo e como conectá-los usando intenções.
page.landing.image=images/develop/app_components.png
page.image=images/develop/app_components.png
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>Artigos de blogue</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>Uso de DialogFragments</h4>
<p>Nesta publicação, mostrarei como usar DialogFragments com a biblioteca de suporte v4 (para compatibilidade retroativa em dispositivos anteriores a Honeycomb) para mostrar uma caixa de diálogo de edição simples e retornar um resultado para a Atividade chamadora usando uma interface.</p>
@@ -21,7 +21,7 @@
<h4>Fragmentos para todos</h4>
<p>Hoje, lançamos uma biblioteca estática que expõe a mesma API Fragments (bem como o novo LoaderManager e algumas outras classes) para que aplicativos compatíveis com Android 1.6 e posteriores possam usar fragmentos para criar interfaces de usuário compatíveis com tablets. </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>Multiencadeamento para desempenho</h4>
<p>Uma boa prática para criar aplicativos responsivos é garantir que o encadeamento principal da IU
@@ -32,11 +32,11 @@
<div class="col-6">
<h3>Treinamento</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>Gerenciamento do ciclo de vida da atividade</h4>
<p>Essa lição explica a importância dos métodos de retorno de chamada do ciclo de vida que cada instância de
-Atividade recebe e como utilizá-los para que a atividade faça o que o usuário espera e não consuma recursos
+Atividade recebe e como utilizá-los para que a atividade faça o que o usuário espera e não consuma recursos
do sistema quando não estiver em uso.</p>
</a>
diff --git a/docs/html-intl/intl/pt-br/guide/components/loaders.jd b/docs/html-intl/intl/pt-br/guide/components/loaders.jd
index f3c4209..c69cbbfd 100644
--- a/docs/html-intl/intl/pt-br/guide/components/loaders.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>Classes principais</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>Exemplos relacionados</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -51,7 +51,7 @@
quando são recriados após uma alteração de configuração. Portanto, eles não precisam reconsultar
os dados.</li>
</ul>
-
+
<h2 id="summary">Resumo da API de carregador</h2>
<p>Há várias classes e interfaces que podem ser envolvidas no uso
@@ -68,7 +68,7 @@
{@link android.app.Fragment} para gerenciar uma ou mais instâncias de {@link
android.content.Loader}. Isto ajuda um aplicativo a gerenciar
operações executadas por longos períodos juntamente com o ciclo de vida de {@link android.app.Activity}
-ou {@link android.app.Fragment}; o uso mais comum disto é com
+ou {@link android.app.Fragment}; o uso mais comum disto é com
{@link android.content.CursorLoader}. No entanto, os aplicativos têm a liberdade de criar
os próprios carregadores para outros tipos de dados.
<br />
@@ -129,7 +129,7 @@
para carregar dados de outra origem.</li>
<li>Uma implementação de {@link android.app.LoaderManager.LoaderCallbacks}.
É aqui que é possível criar novos carregadores e gerenciar as referências
-a carregadores existentes.</li>
+a carregadores existentes.</li>
<li>Uma maneira de exibir os dados do carregador, como um {@link
android.widget.SimpleCursorAdapter}.</li>
<li>Uma origem de dados, como um {@link android.content.ContentProvider}, ao usar
@@ -140,7 +140,7 @@
<p>O {@link android.app.LoaderManager} gerencia uma ou mais instâncias de {@link
android.content.Loader} dentro de uma {@link android.app.Activity}
ou um {@link android.app.Fragment}. Há apenas um {@link
-android.app.LoaderManager} por atividade ou fragmento.</p>
+android.app.LoaderManager} por atividade ou fragmento.</p>
<p>Geralmente,
inicializa-se um {@link android.content.Loader} dentro do método {@link
@@ -157,13 +157,13 @@
<ul>
<li>Um ID único que identifica o carregador. Neste exemplo, o ID é 0.</li>
<li>Argumentos opcionais para fornecer ao carregador
-em construção (<code>null</code> neste exemplo).</li>
+em construção (<code>null</code> neste exemplo).</li>
<li>Uma implementação de {@link android.app.LoaderManager.LoaderCallbacks},
que {@link android.app.LoaderManager} chama para relatar eventos do carregador. Nesse exemplo,
a classe local implementa a interface de {@link
android.app.LoaderManager.LoaderCallbacks}, para que ela passe uma referência
-para si, {@code this}.</li>
+para si, {@code this}.</li>
</ul>
<p>A chamada de {@link android.app.LoaderManager#initLoader initLoader()} garante que o carregador
foi inicializado e que está ativo. Ela possui dois possíveis resultados:</p>
@@ -193,7 +193,7 @@
inicia e interrompe o carregamento quando necessário, além de manter o estado do carregador
e do conteúdo associado. À medida que isso ocorre, você raramente interage com os carregadores
diretamente (para ver um exemplo de métodos para aprimorar o comportamento
-de um carregador, consulte o exemplo de <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
+de um carregador, consulte o exemplo de <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
Geralmente, usam-se os métodos {@link
android.app.LoaderManager.LoaderCallbacks} para intervir no processo de carregamento
quando determinados eventos ocorrem. Para obter mais informações sobre este assunto, consulte <a href="#callback">Uso dos retornos de chamada de LoaderManager</a>.</p>
@@ -245,7 +245,7 @@
— chamado quando um carregador anteriormente criado termina o seu carregamento.
</li></ul>
<ul>
- <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
+ <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
— chamado quando um carregador anteriormente criado é reiniciado,
tornando os dados indisponíveis.
</li>
@@ -343,7 +343,7 @@
<p>Este método é chamado quando um carregador anteriormente criado é reiniciado,
tornando os dados indisponíveis. Este retorno de chamada permite que você descubra quando os dados
estão prestes a serem liberados para que seja possível remover a referência a eles. </p>
-<p>Esta implementação chama
+<p>Esta implementação chama
{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
com um valor de <code>null</code>:</p>
@@ -366,7 +366,7 @@
android.app.Fragment} que exibe uma {@link android.widget.ListView} contendo
os resultados de uma consulta aos provedores de conteúdo de contatos. Ela usa um {@link
android.content.CursorLoader} para gerenciar a consulta no provedor.</p>
-
+
<p>Para um aplicativo acessar os contatos de um usuário, como neste exemplo,
o manifesto deverá incluir a permissão
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS}.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/components/processes-and-threads.jd b/docs/html-intl/intl/pt-br/guide/components/processes-and-threads.jd
index c8e636d..9bd335d 100644
--- a/docs/html-intl/intl/pt-br/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/processes-and-threads.jd
@@ -120,7 +120,7 @@
<ul>
<li>Se ele hospedar um {@link android.app.Activity} que não esteja em primeiro plano,
-mas ainda seja visível para o usuário (o seu método {@link android.app.Activity#onPause onPause()} tiver sido chamado).
+mas ainda seja visível para o usuário (o seu método {@link android.app.Activity#onPause onPause()} tiver sido chamado).
Isto poderá ocorrer, por exemplo, se a atividade em primeiro plano iniciar um diálogo, o que permitirá
que a atividade anterior seja vista por trás dela.</li>
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
diff --git a/docs/html-intl/intl/pt-br/guide/components/recents.jd b/docs/html-intl/intl/pt-br/guide/components/recents.jd
index 467f620..9f75885 100644
--- a/docs/html-intl/intl/pt-br/guide/components/recents.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/recents.jd
@@ -41,7 +41,7 @@
atividades</a> e <a href="{@docRoot}guide/components/tasks-and-back-stack.html">tarefas</a> acessadas recentemente. O
usuário pode navegar pela lista e selecionar uma tarefa a retomar ou remover uma tarefa da
lista deslizando-a para fora. Com a versão 5.0 do Android (API de nível 21), várias instâncias da
-mesma atividade contendo diferentes documentos podem aparecer como tarefas na tela de visão geral. Por exemplo, o
+mesma atividade contendo diferentes documentos podem aparecer como tarefas na tela de visão geral. Por exemplo, o
Google Drive pode ter uma tarefa para cada um dos vários documentos do Google. Cada documento aparece como uma
tarefa na tela de visão geral.</p>
@@ -158,8 +158,8 @@
<dl>
<dt>"{@code intoExisting}"</dt>
<dd>A atividade reutiliza uma tarefa existente para o documento. Isso é o mesmo que configurar o
- sinalizador {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} <em>sem</em> configurar
- o sinalizador {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK}, como descrito em
+ sinalizador {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} <em>sem</em> configurar
+ o sinalizador {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK}, como descrito em
<a href="#flag-new-doc">Uso do sinalizador Intent para adicionar uma tarefa</a> acima.</dd>
<dt>"{@code always}"</dt>
@@ -169,7 +169,7 @@
<dt>"{@code none”}"</dt>
<dd>A atividade não cria uma nova tarefa para o documento. A tela de visão geral trata a
- atividade como aconteceria por padrão: ela exibe uma tarefa para o aplicativo, que
+ atividade como aconteceria por padrão: ela exibe uma tarefa para o aplicativo, que
retoma a atividade invocada por último pelo usuário.</dd>
<dt>"{@code never}"</dt>
@@ -205,7 +205,7 @@
<h3 id="#apptask-remove">Uso da classe AppTask para remover tarefas</h3>
-<p>Na atividade que cria uma nova tarefa na tela de visão geral, é possível
+<p>Na atividade que cria uma nova tarefa na tela de visão geral, é possível
especificar quando remover a tarefa e terminar todas as atividades associadas a ela chamando
o método {@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()}.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/components/services.jd b/docs/html-intl/intl/pt-br/guide/components/services.jd
index 123d90a..564ac80 100644
--- a/docs/html-intl/intl/pt-br/guide/components/services.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/services.jd
@@ -185,7 +185,7 @@
<p>Como atividades (e outros componentes), você deve declarar todos os serviços no arquivo de manifesto
do aplicativo.</p>
-<p>Para declarar o serviço, adicione um elemento <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
+<p>Para declarar o serviço, adicione um elemento <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
como filho do elemento <a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a>
. Por exemplo:</p>
@@ -494,7 +494,7 @@
<h3 id="StartingAService">Início de um serviço</h3>
-<p>É possível iniciar um dispositivo de uma atividade ou outro componente do aplicativo passando uma
+<p>É possível iniciar um dispositivo de uma atividade ou outro componente do aplicativo passando uma
{@link android.content.Intent} a {@link
android.content.Context#startService startService()}. O sistema Android chama o método {@link
android.app.Service#onStartCommand onStartCommand()} do serviço e passa a ele a {@link
diff --git a/docs/html-intl/intl/pt-br/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/pt-br/guide/components/tasks-and-back-stack.jd
index d309c67..8e485b0 100644
--- a/docs/html-intl/intl/pt-br/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/pt-br/guide/components/tasks-and-back-stack.jd
@@ -77,7 +77,7 @@
</div>
-->
-<p>A tela inicial do dispositivo é o ponto de partida para a maioria das tarefas. Quando o usuário toca em um ícone no inicializador do
+<p>A tela inicial do dispositivo é o ponto de partida para a maioria das tarefas. Quando o usuário toca em um ícone no inicializador do
aplicativo
(ou em um atalho na tela inicial), essa tarefa do aplicativo acontece em primeiro plano. Se não
existir nenhuma tarefa para o aplicativo (se o aplicativo não tiver sido usado recentemente), uma nova tarefa
@@ -85,7 +85,7 @@
<p>Quando a atividade atual inicia outra, a nova atividade é colocada no topo da pilha
e recebe foco. A atividade anterior permanece na pilha, mas é interrompida. Quando uma atividade
-para, o sistema retém o estado atual da interface do usuário. Quando o usuário pressiona o botão
+para, o sistema retém o estado atual da interface do usuário. Quando o usuário pressiona o botão
<em>Voltar</em>
, a atividade atual é retirada do topo da pilha (a atividade é destruída)
e a atividade anterior reinicia (o estado anterior da IU é restaurado). Atividades na pilha nunca
@@ -103,7 +103,7 @@
destruída e a atividade anterior reinicia.</p>
-<p>Se o usuário continua pressionando <em>Voltar</em>, cada atividade na pilha é retirada para
+<p>Se o usuário continua pressionando <em>Voltar</em>, cada atividade na pilha é retirada para
revelar
a anterior até que o usuário retorne à tela inicial (ou a qualquer atividade que estivesse em execução
no começo da tarefa). Quando todas as atividades forem removidas da pilha, a tarefa não existirá mais.</p>
@@ -295,7 +295,7 @@
<p>O atributo <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
launchMode}</a> especifica uma instrução sobre como a atividade deve ser inicializada
-em uma tarefa. Há quatro modos diferentes de inicialização que podem ser designados ao atributo
+em uma tarefa. Há quatro modos diferentes de inicialização que podem ser designados ao atributo
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">launchMode</a></code>:
</p>
@@ -334,7 +334,7 @@
a intenção àquela instância por meio de uma chamada do método {@link
android.app.Activity#onNewIntent onNewIntent()} em vez de criar uma nova instância. Somente
uma instância da atividade pode existir por vez.
- <p class="note"><strong>Observação:</strong> embora a atividade inicie em uma nova tarefa, o botão
+ <p class="note"><strong>Observação:</strong> embora a atividade inicie em uma nova tarefa, o botão
<em>Voltar</em> ainda direciona o usuário à atividade anterior.</p></dd>
<dt>{@code "singleInstance"}.</dt>
<dd>Igual à {@code "singleTask"}, exceto que o sistema não inicializa nenhuma outra atividade
@@ -505,7 +505,7 @@
href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code></dt>
<dd>Se esse atributo for definido como {@code "true"} na atividade raiz de uma tarefa,
a pilha será apagada da atividade raiz sempre que o usuário sair da tarefa
-e retornar a ela. Em outras palavras, é o oposto de
+e retornar a ela. Em outras palavras, é o oposto de
<a href="{@docRoot}guide/topics/manifest/activity-element.html#always">
{@code alwaysRetainTaskState}</a>. O usuário sempre retorna à tarefa
no estado inicial, mesmo ao retirar-se da tarefa somente por um momento.</dd>
@@ -557,13 +557,13 @@
<em>Página inicial</em>. A tarefa é enviada para segundo plano e não fica mais visível. O usuário não tem como voltar
à tarefa porque ela não é representada no inicializador do aplicativo.</p>
-<p>Para esses casos em que se deseja que o usuário não seja capaz de retornar a uma atividade, defina
+<p>Para esses casos em que se deseja que o usuário não seja capaz de retornar a uma atividade, defina
<a href="{@docRoot}guide/topics/manifest/activity-element.html#finish">{@code finishOnTaskLaunch}</a>
- do elemento
+ do elemento
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
como {@code "true"} (consulte <a href="#Clearing">Apagar a pilha</a>).</p>
-<p>Veja mais informações sobre a representação e o gerenciamento de atividades
+<p>Veja mais informações sobre a representação e o gerenciamento de atividades
na tela de visão geral em <a href="{@docRoot}guide/components/recents.html">
Tela de visão geral</a>.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/index.jd b/docs/html-intl/intl/pt-br/guide/index.jd
index ab39647..74151cc 100644
--- a/docs/html-intl/intl/pt-br/guide/index.jd
+++ b/docs/html-intl/intl/pt-br/guide/index.jd
@@ -29,7 +29,7 @@
em segundo plano de forma independente.</p>
<p>De um componente, é possível executar outro componente usando uma <em>intenção</em>. É possível até mesmo
-iniciar um componente em um aplicativo diferente, como uma atividade em um aplicativo de mapas para mostrar um endereço. Esse modelo
+iniciar um componente em um aplicativo diferente, como uma atividade em um aplicativo de mapas para mostrar um endereço. Esse modelo
fornece vários pontos de entrada para um único aplicativo e permite que qualquer aplicativo se comporte como o "padrão" de um usuário
para uma ação que outros aplicativos podem invocar.</p>
@@ -53,7 +53,7 @@
de layout para diversos tamanhos de tela e o sistema
determina qual layout deverá aplicar com base no tamanho da tela do dispositivo atual.</p>
-<p>Você pode consultar a disponibilidade dos recursos do dispositivo em tempo de execução se qualquer recurso do
+<p>Você pode consultar a disponibilidade dos recursos do dispositivo em tempo de execução se qualquer recurso do
aplicativo exigir hardware específico, como uma câmera. Se necessário, também é possível declarar recursos que o aplicativo exige,
para que mercados como a Google Play Store não permitam a instalação em dispositivos que não sejam compatíveis
com aquele recurso.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/platform/j8-jack.jd b/docs/html-intl/intl/pt-br/guide/platform/j8-jack.jd
new file mode 100644
index 0000000..22f4b67
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/guide/platform/j8-jack.jd
@@ -0,0 +1,197 @@
+page.title=Recursos de linguagem do Java 8
+page.keywords="android N", "Java 8", "Jack"
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <ol>
+ <li>
+ <a href="#supported-features">Recursos de linguagem e APIs do Java 8 com suporte</a>
+ </li>
+ <li>
+ <a href="#configuration">Como ativar os recursos do Java 8 e a cadeia de ferramentas Jack</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>O Android N introduz o suporte aos recursos de linguagem do Java 8
+ que podem ser usados ao desenvolver aplicativos direcionados ao Android N.
+ Esta página descreve os novos recursos de linguagem com suporte no Android N
+ Preview, como configurar seu projeto para usá-los e os
+ problemas conhecidos que você poderá encontrar.
+</p>
+
+<p>Para começar a usar esses recursos, primeiro faça o download e instale o Android
+Studio 2.1 e o Android N Preview SDK, que inclui a
+cadeia de ferramentas Jack obrigatória e o Android Plugin for Gradle atualizado. Se você ainda não
+instalou o Android N Preview SDK, consulte <a href="{@docRoot}preview/setup-sdk.html">Preparação para desenvolver para o Android N</a>.</p>
+
+
+
+<p class="note">
+ <strong>Observação:</strong> O uso dos novos recursos de linguagem do Java 8 não é
+ obrigatório para desenvolver aplicativos direcionados à plataforma Android N. Se
+ não quiser escrever código com os recursos de linguagem do Java 8, você poderá manter
+ os valores de compatibilidade de origem e destino do seu projeto definidos para o Java 7, mas ainda
+ será necessário compilar com o JDK 8 para desenvolver para a plataforma Android N.
+</p>
+
+<h2 id="supported-features">
+ Recursos de linguagem e APIs do Java 8 com suporte
+</h2>
+
+<p>
+ Atualmente, o Android não oferece suporte a todos os recursos de linguagem do Java 8. No entanto, os
+ recursos a seguir agora estão disponíveis para o desenvolvimento de aplicativos direcionados ao
+ Android N Preview:
+</p>
+
+<ul>
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">Métodos
+ de interface padrão e estáticos</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html">
+ Expressões Lambda</a> (também disponíveis em nível da API 23 ou anterior)
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/annotations/repeating.html">Anotações
+ repetíveis</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/methodreferences.html">
+ Referências de método</a> (também disponíveis em nível da API 23 ou anterior)
+ </li>
+</ul>
+
+<p class="note">
+ <strong>Observação:</strong> Para testar expressões Lambda ou referências de método em
+ versões mais antigas do Android, acesse o arquivo {@code build.gradle}
+ e configure {@code compileSdkVersion} e {@code targetSdkVersion} como 23 ou
+anterior. Você precisará <a href="#configuration">permitir que a
+ cadeia de ferramentas Jack</a> use esses recursos do Java 8.
+</p>
+
+<p>
+ Além disso, as seguintes APIs de recursos de linguagem do Java 8 agora estão disponíveis:
+</p>
+
+<ul>
+ <li>APIs relacionadas a reflexo e linguagem:
+ <ul>
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/FunctionalInterface.html">
+ {@code java.lang.FunctionalInterface}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Repeatable.html">
+ {@code java.lang.annotation.Repeatable}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#isDefault--">
+ {@code java.lang.reflect.Method.isDefault()}</a>
+ </li>
+
+ <li>e Reflection APIs associadas a anotações repetíveis, como
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType-java.lang.Class-">
+ {@code AnnotatedElement.getAnnotationsByType(Class)}</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>Utility APIs:
+ <ul>
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">
+ {@code java.util.function}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html">
+ {@code java.util.stream}</a>
+ </li>
+ </ul>
+ </li>
+</ul>
+
+<h2 id="configuration">
+ Como ativar os recursos do Java 8 e a cadeia de ferramentas Jack
+</h2>
+
+<p>
+ Para usar os novos recursos de linguagem do Java 8, você também deve usar a
+ nova <a class="external-link" href="https://source.android.com/source/jack.html">cadeia de ferramentas Jack</a>. Essa nova
+ cadeia de ferramentas Android compila o código-fonte de linguagem Java em um código de bytes dex que pode ser lido no Android,
+ tem o próprio formato de biblioteca {@code .jack} e fornece a maioria dos recursos
+ de uma cadeia de ferramentas em uma só ferramenta: reempacotamento, redução, ofuscação e
+ multidex.
+</p>
+
+<p>Veja uma comparação entre duas cadeias de ferramentas usadas para compilar arquivos Android DEX:</p>
+<ul>
+ <li>Cadeia de ferramentas legada javac:<br>
+ <b>javac</b> ({@code .java} --> {@code .class}) --> <b>dx</b> ({@code
+ .class} --> {@code .dex})
+ </li>
+
+ <li>Nova cadeia de ferramentas Jack:<br>
+ <b>Jack</b> ({@code .java} --> {@code .jack} --> {@code .dex})
+ </li>
+</ul>
+
+<h3>
+ Configuração do Gradle
+</h3>
+
+<p>
+ Para ativar os recursos de linguagem do Java 8 e o Jack para seu projeto, insira
+ o seguinte no arquivo {@code build.gradle} de nível do módulo:
+</p>
+
+<pre>
+android {
+ ...
+ defaultConfig {
+ ...
+ jackOptions {
+ enabled true
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+</pre>
+
+<h3 id="known-issues">
+ Problemas conhecidos
+</h3>
+
+<p>
+ <a href="{@docRoot}tools/building/building-studio.html#instant-run">O Instant
+ Run</a> não funciona com o Jack e será desativado enquanto
+ a nova cadeia de ferramentas estiver em uso.
+</p>
+
+<p>Como o Jack não gera arquivos de classe intermediária ao compilar um
+aplicativo, ferramentas que dependem desses arquivos não funcionam com o Jack. Alguns
+exemplos dessas ferramentas são:</p>
+
+<ul>
+ <li>Detectores de códigos suspeitos que operam em arquivos de classe
+ </li>
+
+ <li>Ferramentas e bibliotecas que exigem os arquivos de classe do aplicativo (como
+ testes de instrumentação com JaCoCo)
+ </li>
+</ul>
+
+<p>Se encontrar outros problemas ao usar o Jack, <a href="http://tools.android.com/filing-bugs">envie um relatório de erros</a>.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/pt-br/guide/topics/manifest/manifest-intro.jd
index e337796..639b6db 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/manifest/manifest-intro.jd
@@ -34,14 +34,14 @@
<li>Descrever os componentes do aplicativo — as atividades,
os serviços, os receptores de transmissão e os provedores de conteúdo que compõem
o aplicativo. Nomear as classes que implementam os componentes
-e publicam seus recursos (por exemplo, que mensagens {@link android.content.Intent
+e publicam seus recursos (por exemplo, que mensagens {@link android.content.Intent
Intent} eles podem tratar). Essas declarações permitem ao sistema Android
saber quais são os componentes e em que condições eles podem ser iniciados.</li>
-<li>Determinar que processos hospedarão componentes de aplicativo.</li>
+<li>Determinar que processos hospedarão componentes de aplicativo.</li>
<li>Declarar as permissões que o aplicativo deve ter para acessar
-partes protegidas da API e interagir com outros aplicativos.</li>
+partes protegidas da API e interagir com outros aplicativos.</li>
<li>Declarar também as permissões que outros devem ter
para interagir com os componentes do aplicativo.</li>
@@ -66,7 +66,7 @@
são documentados na totalidade em um arquivo separado. Para exibir informações detalhadas
sobre cada elemento, clique no nome do elemento no diagrama,
na lista de elementos em ordem alfabética que acompanha o diagrama
-ou em qualquer outra menção ao nome do elemento.
+ou em qualquer outra menção ao nome do elemento.
</p>
<pre>
@@ -128,7 +128,7 @@
<p>
Todos os elementos que podem aparecer no arquivo de manifesto estão
relacionados abaixo em ordem alfabética. Estes são os únicos elementos legais. Não é possível
-adicionar elementos ou atributos próprios.
+adicionar elementos ou atributos próprios.
</p>
<p style="margin-left: 2em">
@@ -158,7 +158,7 @@
</p>
-
+
<h2 id="filec">Convenções de arquivos</h2>
@@ -172,25 +172,25 @@
<dd>Somente os elementos
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
e <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-são necessários — eles devem estar presentes e ocorrer somente uma vez.
+são necessários — eles devem estar presentes e ocorrer somente uma vez.
A maioria dos outros pode ocorrer diversas vezes ou nunca — embora
pelo menos alguns deles devam estar presentes para que o manifesto
realize algo significativo.
<p>
-Se um elemento contiver qualquer coisa, ele conterá outros elementos.
+Se um elemento contiver qualquer coisa, ele conterá outros elementos.
Todos os valores são definidos por meio de atributos, e não como dados de caracteres dentro de um elemento.
</p>
<p>
Elementos de mesmo nível geralmente não são ordenados. Por exemplo: os elementos
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
-e <code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-podem ser combinados entre si em qualquer sequência. (O elemento
+e <code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
+podem ser combinados entre si em qualquer sequência. (O elemento
<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
-é uma exceção a essa regra: ele deve seguir o
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+é uma exceção a essa regra: ele deve seguir o
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
para o qual é alias.)
</p></dd>
@@ -200,32 +200,32 @@
a documentação como guia. Para atributos verdadeiramente opcionais, ele menciona
um valor padrão ou declara o que acontece na ausência de uma especificação.
-<p>Exceto por alguns atributos do elemento
+<p>Exceto por alguns atributos do elemento
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-raiz, todos os nomes de atributo têm um prefixo {@code android:} —
+raiz, todos os nomes de atributo têm um prefixo {@code android:} —
por exemplo, {@code android:alwaysRetainTaskState}. Como o prefixo é universal,
a documentação geralmente o omite ao referir-se a atributos
pelo nome.</p></dd>
<dt><b>Declaração de nomes de classe</b></dt>
<dd>Muitos elementos correspondem a objetos Java, inclusive elementos do próprio
-aplicativo (o elemento
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-) e seus componentes principais — atividades
-(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
-serviços
-(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
-receptores de transmissão
-(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>)
-e provedores de conteúdo
-(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
+aplicativo (o elemento
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+) e seus componentes principais — atividades
+(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
+serviços
+(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
+receptores de transmissão
+(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>)
+e provedores de conteúdo
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
<p>
-Se uma subclasse for definida, como quase sempre acontece para classes de componentes
-({@link android.app.Activity}, {@link android.app.Service},
-{@link android.content.BroadcastReceiver} e {@link android.content.ContentProvider}),
+Se uma subclasse for definida, como quase sempre acontece para classes de componentes
+({@link android.app.Activity}, {@link android.app.Service},
+{@link android.content.BroadcastReceiver} e {@link android.content.ContentProvider}),
a subclasse será declarada por meio de um atributo {@code name}. O nome deve conter
-toda a designação do pacote.
+toda a designação do pacote.
Por exemplo: uma subclasse {@link android.app.Service} pode ser declarada assim:
</p>
@@ -240,11 +240,11 @@
<p>
No entanto, para encurtar, se o primeiro caractere da string for um ponto,
-a string será acrescentada ao nome do pacote do aplicativo (conforme especificado pelo atributo
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
- do elemento
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-). A seguinte atribuição é igual à atribuição acima:
+a string será acrescentada ao nome do pacote do aplicativo (conforme especificado pelo atributo
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
+ do elemento
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+). A seguinte atribuição é igual à atribuição acima:
</p>
<pre><manifest package="com.example.project" . . . >
@@ -257,13 +257,13 @@
</manifest></pre>
<p>
-Ao iniciar um componente, o Android cria uma instância da subclasse nomeada.
+Ao iniciar um componente, o Android cria uma instância da subclasse nomeada.
Se nenhuma subclasse for especificada, ele criará uma instância da classe base.
</p></dd>
<dt><b>Vários valores</b></dt>
<dd>Se for especificado mais de um valor, o elemento sempre será repetido
-em vez de listar os vários valores dentro de um único elemento.
+em vez de listar os vários valores dentro de um único elemento.
Por exemplo, um filtro de intenção pode listar algumas ações:
<pre><intent-filter . . . >
@@ -276,22 +276,22 @@
<dt><b>Valores de recurso</b></dt>
<dd>Alguns atributos têm valores que podem ser exibidos aos usuários — por exemplo,
uma etiqueta e um ícone de uma atividade. Os valores desses atributos
-devem ser localizados e, por tanto, definidos a partir de um recurso ou tema. Os valores
+devem ser localizados e, por tanto, definidos a partir de um recurso ou tema. Os valores
de recurso são expressos no formato a seguir:</p>
<p style="margin-left: 2em">{@code @[<i>pacote</i>:]<i>tipo</i>:<i>nome</i>}</p>
<p>
em que o nome do <i>pacote</i> pode ser omitido se o recurso estiver no mesmo pacote
-que o aplicativo <i>tipo</i> é um tipo de recurso — como uma "string" ou
-"drawable" (desenhável) — e <i>nome</i> é o nome que identifica o recurso específico.
+que o aplicativo <i>tipo</i> é um tipo de recurso — como uma "string" ou
+"drawable" (desenhável) — e <i>nome</i> é o nome que identifica o recurso específico.
Por exemplo:
</p>
<pre><activity android:icon="@drawable/smallPic" . . . ></pre>
<p>
-Os valores de um tema são expressos de forma semelhante, mas, com um '{@code ?}'
+Os valores de um tema são expressos de forma semelhante, mas, com um '{@code ?}'
em vez de '{@code @}':
</p>
@@ -299,8 +299,8 @@
</p></dd>
<dt><b>Valores de string</b></dt>
-<dd>Quando o valor de um atributo é uma string, devem-se usar duas barras invertidas ('{@code \\}')
-para caracteres de escape — por exemplo, '{@code \\n}' para
+<dd>Quando o valor de um atributo é uma string, devem-se usar duas barras invertidas ('{@code \\}')
+para caracteres de escape — por exemplo, '{@code \\n}' para
uma nova linha ou '{@code \\uxxxx}' para um caractere Unicode.</dd>
</dl>
@@ -320,7 +320,7 @@
de transmissão) são ativados por <i>intenções</i>. Intenções são
pacotes de informações (objetos {@link android.content.Intent}) que descrevem
uma ação desejada — inclusive os dados usados em ações, a categoria
-do componente que deve executar a ação e outras instruções pertinentes.
+do componente que deve executar a ação e outras instruções pertinentes.
O Android localiza um componente adequado para responder à intenção, inicia
uma nova instância do componente se necessário e passa-o
ao objeto da intenção.
@@ -330,7 +330,7 @@
Os componentes anunciam seus recursos — os tipos de intenção aos quais eles podem
responder — por meio de <i>filtros de intenções</i>. Como o sistema Android
precisa saber que intenções um componente pode tratar antes de iniciá-lo, os filtros
-de intenções são especificados no manifesto como elementos
+de intenções são especificados no manifesto como elementos
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
. Os componentes podem ter qualquer quantidade de filtros, em que cada um descreve
um recurso diferente.
@@ -345,8 +345,8 @@
<p>
Para ver como os objetos de intenção são testados em relação aos filtros de intenções,
-consulte o documento
-<a href="{@docRoot}guide/components/intents-filters.html">Intenções
+consulte o documento
+<a href="{@docRoot}guide/components/intents-filters.html">Intenções
e filtros de intenções</a> em separado.
</p>
@@ -355,41 +355,41 @@
<p>
Alguns elementos têm atributos {@code icon} e {@code label} de um pequeno ícone
-e uma etiqueta de texto que pode ficar visível para os usuários. Alguns deles também têm um atributo
-{@code description} para um texto explicativo mais longo que também pode ser
-exibido na tela. Por exemplo: o elemento
+e uma etiqueta de texto que pode ficar visível para os usuários. Alguns deles também têm um atributo
+{@code description} para um texto explicativo mais longo que também pode ser
+exibido na tela. Por exemplo: o elemento
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-tem todos os três atributos; assim, quando o usuário é consultado para dar
-permissão a um aplicativo que a solicitou, serão apresentados ao usuário um ícone
-que representa a permissão, o nome da permissão e uma descrição
+tem todos os três atributos; assim, quando o usuário é consultado para dar
+permissão a um aplicativo que a solicitou, serão apresentados ao usuário um ícone
+que representa a permissão, o nome da permissão e uma descrição
de tudo o que está envolvido.
</p>
<p>
-Em todo caso, o ícone e a etiqueta definidos em um elemento recipiente se tornam as configurações
-{@code icon} e {@code label} padrão de todos os subelementos do contêiner.
-Assim, o ícone e a etiqueta definidos no elemento
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-são o ícone e a etiqueta padrão para cada um dos componentes do aplicativo.
-Da mesma forma, o ícone e a etiqueta definidos para um componente — por exemplo, um elemento
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
- — são as configurações padrão para cada um dos elementos
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
+Em todo caso, o ícone e a etiqueta definidos em um elemento recipiente se tornam as configurações
+{@code icon} e {@code label} padrão de todos os subelementos do contêiner.
+Assim, o ícone e a etiqueta definidos no elemento
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+são o ícone e a etiqueta padrão para cada um dos componentes do aplicativo.
+Da mesma forma, o ícone e a etiqueta definidos para um componente — por exemplo, um elemento
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+ — são as configurações padrão para cada um dos elementos
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
do componente. Se um elemento
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-define uma etiqueta, mas uma atividade e seu filtro de intenção não definem,
-a etiqueta do aplicativo é tratada como a etiqueta de atividade
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+define uma etiqueta, mas uma atividade e seu filtro de intenção não definem,
+a etiqueta do aplicativo é tratada como a etiqueta de atividade
e do filtro de intenção.
</p>
<p>
-O ícone e a etiqueta definidos para um filtro de intenção são usados para representar um componente
+O ícone e a etiqueta definidos para um filtro de intenção são usados para representar um componente
apresentado para o usuário para preencher a função
-anunciada pelo filtro. Por exemplo: um filtro com as configurações
-"{@code android.intent.action.MAIN}" e
-"{@code android.intent.category.LAUNCHER}" anuncia uma atividade
+anunciada pelo filtro. Por exemplo: um filtro com as configurações
+"{@code android.intent.action.MAIN}" e
+"{@code android.intent.category.LAUNCHER}" anuncia uma atividade
como uma que inicia um aplicativo — ou seja,
-que deve ser exibida no inicializador do aplicativo. O ícone e a etiqueta
+que deve ser exibida no inicializador do aplicativo. O ícone e a etiqueta
definidos no filtro são, portanto, as exibidas no inicializador.
</p>
@@ -397,14 +397,14 @@
<h3 id="perms">Permissões</h3>
<p>
-As <i>permissões</i> são restrições que limitam o acesso a parte do código
-ou aos dados de um dispositivo. A limitação é imposta para proteger dados
-essenciais que podem sofrer mau uso e distorções ou prejudicar a experiência do usuário.
+As <i>permissões</i> são restrições que limitam o acesso a parte do código
+ou aos dados de um dispositivo. A limitação é imposta para proteger dados
+essenciais que podem sofrer mau uso e distorções ou prejudicar a experiência do usuário.
</p>
<p>
-Cada permissão é identificada por uma etiqueta exclusiva. Geralmente a etiqueta indica
-a ação que foi restringida. A seguir há alguns exemplos de permissões definidas
+Cada permissão é identificada por uma etiqueta exclusiva. Geralmente a etiqueta indica
+a ação que foi restringida. A seguir há alguns exemplos de permissões definidas
pelo Android:
</p>
@@ -418,25 +418,25 @@
</p>
<p>
-Se um aplicativo precisar de acesso a um recurso protegido por uma permissão,
-ele deve declarar que precisa da permissão com um elemento
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-no manifesto. Assim, quando o aplicativo é instalado
-no dispositivo, o instalador determina se concederá ou não a permissão
-solicitada, marcando as autoridades que assinaram os certificados
-do aplicativo e, em alguns casos, perguntando ao usuário.
-Se a permissão for concedida, o aplicativo será capaz de usar os recursos
-protegidos. Caso contrário, sua tentativa de acessar esses recursos simplesmente falhará
-sem nenhuma notificação ao usuário.
+Se um aplicativo precisar de acesso a um recurso protegido por uma permissão,
+ele deve declarar que precisa da permissão com um elemento
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+no manifesto. Assim, quando o aplicativo é instalado
+no dispositivo, o instalador determina se concederá ou não a permissão
+solicitada, marcando as autoridades que assinaram os certificados
+do aplicativo e, em alguns casos, perguntando ao usuário.
+Se a permissão for concedida, o aplicativo será capaz de usar os recursos
+protegidos. Caso contrário, sua tentativa de acessar esses recursos simplesmente falhará
+sem nenhuma notificação ao usuário.
</p>
<p>
-Um aplicativo também pode proteger seus componentes (atividades, serviços,
-receptores de transmissão e provedores de conteúdo) com permissões. Ele pode empregar
-qualquer uma das permissões definidas pelo Android (listadas em
-{@link android.Manifest.permission android.Manifest.permission}) ou declaradas
-por outros aplicativos. Ou então, ele pode definir as suas próprias. As novas permissões são declaradas
-com o elemento
+Um aplicativo também pode proteger seus componentes (atividades, serviços,
+receptores de transmissão e provedores de conteúdo) com permissões. Ele pode empregar
+qualquer uma das permissões definidas pelo Android (listadas em
+{@link android.Manifest.permission android.Manifest.permission}) ou declaradas
+por outros aplicativos. Ou então, ele pode definir as suas próprias. As novas permissões são declaradas
+com o elemento
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>.
Por exemplo: uma atividade pode ser protegida da seguinte forma:
</p>
@@ -458,41 +458,41 @@
<p>
Observe que, nesse exemplo, a permissão {@code DEBIT_ACCT}, além de declarada
-com o elemento
+com o elemento
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-, tem seu uso solicitado com o elemento
+, tem seu uso solicitado com o elemento
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
Ela deve ser solicitada para que outros componentes do aplicativo
-iniciem a atividade protegida, mesmo que a proteção
-seja imposta pelo próprio aplicativo.
+iniciem a atividade protegida, mesmo que a proteção
+seja imposta pelo próprio aplicativo.
</p>
<p>
Se, no mesmo exemplo, o atributo {@code permission} fosse definido
-como uma permissão declarada em outro lugar
+como uma permissão declarada em outro lugar
(como {@code android.permission.CALL_EMERGENCY_NUMBERS}), não seria
-necessário declará-la novamente com um elemento
+necessário declará-la novamente com um elemento
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>.
- No entanto, ainda seria necessário solicitar seu uso com
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
+ No entanto, ainda seria necessário solicitar seu uso com
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
</p>
<p>
-O elemento
-<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-declara um espaço de nome de um grupo de permissões que será definido
-no código. E
+O elemento
+<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
+declara um espaço de nome de um grupo de permissões que será definido
+no código. E
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-define um etiqueta de um conjunto de permissões (os dois declarados no manifesto com elementos
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-e as declaradas em outro lugar). Ele afeta somente a forma com que as permissões estão
-agrupadas quando apresentadas ao usuário. O elemento
+define um etiqueta de um conjunto de permissões (os dois declarados no manifesto com elementos
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+e as declaradas em outro lugar). Ele afeta somente a forma com que as permissões estão
+agrupadas quando apresentadas ao usuário. O elemento
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-não especifica que permissões pertencem ao grupo;
+não especifica que permissões pertencem ao grupo;
ele só dá um nome ao grupo. Para incluir uma permissão no grupo,
-designa-se o nome do grupo ao atributo
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
- do elemento
+designa-se o nome do grupo ao atributo
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
+ do elemento
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>.
</p>
@@ -501,17 +501,17 @@
<h3 id="libs">Bibliotecas</h3>
<p>
-Todo aplicativo está vinculado à biblioteca Android padrão, que
-contém os pacotes básicos para programar aplicativos (com classes comuns
+Todo aplicativo está vinculado à biblioteca Android padrão, que
+contém os pacotes básicos para programar aplicativos (com classes comuns
tais como Activity, Service, Intent, View, Button, Application, ContentProvider
etc.).
</p>
<p>
-No entanto, alguns pacotes residem em suas próprias bibliotecas. Se o aplicativo
-usar código de algum desses pacotes, ele deve receber solicitação explícita para ser
-vinculado a eles. O manifesto deve conter um elemento
+No entanto, alguns pacotes residem em suas próprias bibliotecas. Se o aplicativo
+usar código de algum desses pacotes, ele deve receber solicitação explícita para ser
+vinculado a eles. O manifesto deve conter um elemento
<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
- separado para nomear cada uma das bibliotecas (o nome da biblioteca se encontra
+ separado para nomear cada uma das bibliotecas (o nome da biblioteca se encontra
na documentação do pacote).
</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/pt-br/guide/topics/providers/calendar-provider.jd
index ce72b7d..42a517b 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">Uso de intenções para exibir dados de agenda</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">Adaptadores de sincronização</a></li>
</ol>
@@ -113,26 +113,26 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
+
<td>Essa tabela contém
as informações específicas da agenda. Cada linha nessa tabela contém os detalhes
de uma única agenda, como nome, cor, informações de sincronização etc.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>Essa tabela contém
as informações específicas do evento. Cada linha nessa tabela tem as informações de um único
evento — por exemplo: título do evento, local, horário de início, horário
de término etc. O evento pode ocorrer uma vez ou diversas vezes. Os participantes,
-lembretes e propriedades estendidas são armazenados em tabelas separadas.
+lembretes e propriedades estendidas são armazenados em tabelas separadas.
Cada um deles tem um {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
que referencia o {@link android.provider.BaseColumns#_ID} na tabela de eventos.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>Essa tabela contém os
horários de início e término para cada ocorrência em um evento. Cada linha nessa tabela
representa uma única ocorrência do evento. Para eventos de ocorrência única, há um mapeamento 1:1
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>Essa tabela contém
as informações dos participantes (convidados) do evento. Cada linha representa um único convidado
de um evento. Ela especifica o tipo de convidado e a resposta quanto à participação do convidado
@@ -149,7 +149,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>Essa tabela contém os
dados de alerta/notificação. Cada linha representa um único alerta de um evento. Um evento
pode ter vários lembretes. O número máximo de lembretes por evento
@@ -159,7 +159,7 @@
que possui a agenda fornecida. Os lembretes são especificados em minutos antes do evento
e têm um método que determina a forma de alertar o usuário.</td>
</tr>
-
+
</table>
<p>A API do Provedor de Agenda é projetada para ser flexível e poderosa. Ao mesmo tempo,
@@ -211,7 +211,7 @@
<p>A tabela {@link android.provider.CalendarContract.Calendars} contém detalhes
de agendas individuais. As colunas
-Agendas a seguir são graváveis tanto por aplicativos quanto por <a href="#sync-adapter">adaptadores de sincronização</a>.
+Agendas a seguir são graváveis tanto por aplicativos quanto por <a href="#sync-adapter">adaptadores de sincronização</a>.
Para obter uma lista completa de campos compatíveis, consulte
a referência {@link android.provider.CalendarContract.Calendars}</p>
<table>
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>Um booleano indicando se a agenda foi selecionada para ser exibida. Um valor
de 0 indica que eventos associados a essa agenda não devem ser
exibidos. Um valor de 1 indica que eventos associados a essa agenda devem
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>Um booleano que indica se a agenda deve ser sincronizada e ter
os eventos armazenados no dispositivo. Um valor de 0 indica a não sincronização dessa agenda
e o não armazenamento dos eventos no dispositivo. Um valor de 1 indica a sincronização dos eventos dessa agenda
@@ -253,7 +253,7 @@
<p>A seguir há um exemplo que mostra como obter as agendas de propriedade de determinado
usuário. Para simplificar o exemplo, a operação de consulta é exibida no
encadeamento da interface do usuário ("encadeamento principal"). Na prática, isso deve ser feito em um encadeamento
-assíncrono em vez de no encadeamento principal. Para ver mais discussões, consulte
+assíncrono em vez de no encadeamento principal. Para ver mais discussões, consulte
<a href="{@docRoot}guide/components/loaders.html">Carregadores</a>. Se você não estiver somente
lendo dados, mas modificando-os, consulte {@link android.content.AsyncQueryHandler}.
</p>
@@ -268,13 +268,13 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>Por que incluir
ACCOUNT_TYPE?</h3> <p>Ao consultar um {@link
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} para agendas
não associadas a nenhuma conta do dispositivo. Contas {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} não são
-sincronizadas.</p> </div> </div>
+sincronizadas.</p> </div> </div>
<p> Na próxima parte do exemplo, você construirá a consulta. A seleção
@@ -308,38 +308,38 @@
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>Essa próxima seção usa o cursor para avançar pelo conjunto de resultados. Ele usa
as constantes definidas no início do exemplo para retornar os valores
de cada campo.</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">Modificação de uma agenda</h3>
<p>Para realizar uma atualização de uma agenda, é possível fornecer o {@link
@@ -350,7 +350,7 @@
ou como o primeiro item de seleção. A seleção
deve iniciar com <code>"_id=?"</code> e o primeiro
<code>selectionArg</code> deve ser o {@link
-android.provider.BaseColumns#_ID} da agenda.
+android.provider.BaseColumns#_ID} da agenda.
Também é possível realizar atualizações com codificações do ID na URI. Este exemplo altera
o nome de exibição de uma agenda usando a
abordagem
@@ -377,14 +377,14 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}.
{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
é um tipo de conta especial para agendas
-não associado a nenhuma conta do dispositivo. Agendas desse tipo não são sincronizadas com um servidor. Para
+não associado a nenhuma conta do dispositivo. Agendas desse tipo não são sincronizadas com um servidor. Para
ver discussões sobre adaptadores de sincronização, consulte <a href="#sync-adapter">Adaptadores de sincronização</a>.</p>
<h2 id="events">Tabela de eventos</h2>
<p>A tabela {@link android.provider.CalendarContract.Events} contém detalhes
de eventos individuais. Para adicionar, atualizar ou excluir eventos, um aplicativo deve
-conter a permissão {@link android.Manifest.permission#WRITE_CALENDAR}
+conter a permissão {@link android.Manifest.permission#WRITE_CALENDAR}
no <a href="#manifest">arquivo de manifesto</a>.</p>
<p>As colunas de Eventos a seguir são graváveis tanto por um aplicativo quanto por um adaptador
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>A duração do evento em formato <a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RCF5545</a>.
Por exemplo, um valor de <code>"PT1H"</code> indica que o evento
deve durar uma hora, e um valor de <code>"P2W"</code> indica
@@ -444,39 +444,39 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>Um valor de 1 indica que esse evento ocupa o dia inteiro, como definido
pelo fuso horário local. Um valor de 0 indica que é um evento comum que pode iniciar
e terminar a qualquer momento durante um dia.</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>A regra de recorrência do formato do evento. Por
exemplo, <code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>. Veja
mais exemplos <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">aqui</a>.</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
- <td>As datas de recorrência do evento.
- Normalmente, usa-se {@link android.provider.CalendarContract.EventsColumns#RDATE}
- em conjunto com {@link android.provider.CalendarContract.EventsColumns#RRULE}
+ <td>As datas de recorrência do evento.
+ Normalmente, usa-se {@link android.provider.CalendarContract.EventsColumns#RDATE}
+ em conjunto com {@link android.provider.CalendarContract.EventsColumns#RRULE}
para definir um conjunto agregado
de ocorrências repetidas. Para ver mais discussões, consulte <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">Especificação RFC5545</a>.</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
+
<td>Se esse evento considera tempo ocupado ou se há tempo livre que pode ser
reagendado. </td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -514,11 +514,11 @@
a inserções de evento pela intenção {@link
android.content.Intent#ACTION_INSERT INSERT} descrita em <a href="#intent-insert">Uso de uma intenção para inserir um evento</a> — nesta
situação, é fornecido um fuso horário padrão.</li>
-
+
<li>Para eventos não recorrentes, é preciso incluir {@link
android.provider.CalendarContract.EventsColumns#DTEND}. </li>
-
-
+
+
<li>Para eventos recorrentes, é necessário incluir uma {@link
android.provider.CalendarContract.EventsColumns#DURATION} além de uma {@link
android.provider.CalendarContract.EventsColumns#RRULE} ou {@link
@@ -528,7 +528,7 @@
é possível usar uma {@link
android.provider.CalendarContract.EventsColumns#RRULE} em conjunto com {@link android.provider.CalendarContract.EventsColumns#DTSTART} e {@link android.provider.CalendarContract.EventsColumns#DTEND}. Desta forma, o aplicativo Agenda
a converte em uma duração automaticamente.</li>
-
+
</ul>
<p>A seguir há um exemplo de inserção de um evento: para simplificar, isso está sendo realizado
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -581,7 +581,7 @@
de um evento, é possível fornecer o <code>_ID</code>
do evento como um ID anexado à URI ({@link
android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
-ou como o primeiro item de seleção.
+ou como o primeiro item de seleção.
A seleção deve iniciar com <code>"_id=?"</code> e o primeiro
<code>selectionArg</code> deve ser o <code>_ID</code> do evento. Você também
pode realizar atualizações usando uma seleção sem ID. A seguir há um exemplo de como atualizar
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -608,7 +608,7 @@
<p>Pode-se excluir um evento tanto pelo {@link
android.provider.BaseColumns#_ID} como um ID anexado na URI quanto usando-se
a seleção padrão. Ao usar um ID anexado, não é possível fazer seleções.
-Há duas versões de exclusão: como aplicativo e como adaptador de sincronização.
+Há duas versões de exclusão: como aplicativo e como adaptador de sincronização.
A exclusão por um aplicativo define as colunas <em>excluídas</em> como 1. Esse sinalizador é que diz
ao adaptador de sincronização que a linha foi excluída e que essa exclusão deve ser
propagada para o servidor. A exclusão por um adaptador de sincronização remove o evento
@@ -625,7 +625,7 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">Tabela de participantes</h2>
@@ -634,10 +634,10 @@
representa um único participante ou convidado de um evento. Chamar
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
retorna uma lista de participantes para
-o evento com o {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} dado.
+o evento com o {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} dado.
Esse {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
deve corresponder ao {@link
-android.provider.BaseColumns#_ID} de determinado evento.</p>
+android.provider.BaseColumns#_ID} de determinado evento.</p>
<p>A tabela a seguir lista
os campos graváveis. Ao inserir um novo participante, é necessário incluir todos eles
@@ -773,7 +773,7 @@
<h2 id="instances">Tabela de instâncias</h2>
-<p>A tabela
+<p>A tabela
{@link android.provider.CalendarContract.Instances} contém
os horários de início e término das ocorrência de um evento. Cada linha nessa tabela
representa uma única ocorrência do evento. A tabela de instâncias não é gravável e fornece
@@ -782,7 +782,7 @@
<p>A tabela a seguir relaciona alguns dos campos passíveis de consulta de uma instância. Observe
que o fuso horário é definido por
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
-e
+e
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES}.</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>O dia final juliano da instância relativo ao fuso horário
-do Agenda.
-
+do Agenda.
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>O minuto final da instância calculado a partir de meia-noite
no fuso horário do Agenda.</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>O dia inicial juliano da instância relativo ao fuso horário do Agenda.
+ <td>O dia inicial juliano da instância relativo ao fuso horário do Agenda.
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>O minuto inicial da instância calculado a partir de meia-noite, relativo
-ao fuso horário do Agenda.
+ao fuso horário do Agenda.
</td>
-
+
</tr>
</table>
@@ -840,7 +840,7 @@
na URI. Neste exemplo, {@link android.provider.CalendarContract.Instances}
obtém acesso ao campo {@link
android.provider.CalendarContract.EventsColumns#TITLE} por meio
-da sua implementação da interface {@link android.provider.CalendarContract.EventsColumns}.
+da sua implementação da interface {@link android.provider.CalendarContract.EventsColumns}.
Em outras palavras, {@link
android.provider.CalendarContract.EventsColumns#TITLE} é retornado por uma
vista do banco de dados, não pela consulta da tabela {@link
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -923,8 +923,8 @@
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
Também pode-se consultar a URI com
-{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
-Para ver um exemplo do uso dessa intenção, consulte <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Uso de intenções para exibir dados de calendários</a>.
+{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
+Para ver um exemplo do uso dessa intenção, consulte <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Uso de intenções para exibir dados de calendários</a>.
</td>
<td>Abre a agenda no horário especificado por <code><ms_since_epoch></code>.</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
+
Também é possível consultar a URI com
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Para ver um exemplo do uso dessa intenção, consulte <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Uso de intenções para exibir dados de calendários</a>.
-
+
</td>
<td>Exibe o evento especificado por <code><event_id></code>.</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
+
Também é possível consultar a URI com
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Para ver um exemplo do uso dessa intenção, consulte <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">Uso de uma intenção para editar um evento</a>.
-
-
+
+
</td>
<td>Edita o evento especificado por <code><event_id></code>.</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
+
Também é possível consultar a URI com
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Para ver um exemplo do uso dessa intenção, consulte <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">Uso de uma intenção para inserir um evento</a>.
-
+
</td>
<td>Cria um evento.</td>
@@ -996,7 +996,7 @@
<td>Nome do evento.</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>Horário de início do evento em milissegundos a partir da época.</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>Horário de término do evento em milissegundos a partir da época.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
+
<td>Um booleano que indica que um evento acontece o dia inteiro. O valor pode ser
<code>true</code> ou <code>false</code>.</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>Local do evento.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>Descrição do evento.</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>Se o evento é privado ou público.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>Se esse evento considera tempo ocupado na contagem ou se há tempo livre que pode ser reagendado.</td>
-
-</table>
+
+</table>
<p>As seções a seguir descrevem como usar estas intenções.</p>
@@ -1059,14 +1059,14 @@
Com essa abordagem, o aplicativo não precisará ter a permissão {@link
android.Manifest.permission#WRITE_CALENDAR} contida no <a href="#manifest">arquivo de manifesto</a>.</p>
-
+
<p>Quando usuários executam um aplicativo que usa essa abordagem, ele os direciona
ao Agenda para finalizar a adição do evento. A intenção {@link
android.content.Intent#ACTION_INSERT INSERT} usa campos extras para
pré-preencher um formulário com os detalhes do evento na Agenda. Os usuários podem,
então, cancelar o evento, editar o formulário conforme o necessário ou salvar o evento nas suas
agendas.</p>
-
+
<p>A seguir há um fragmento de código que agenda um evento em 19 de janeiro de 2012, que acontece
@@ -1075,7 +1075,7 @@
<ul>
<li>Ele especifica {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
como a URI.</li>
-
+
<li>Ele usa os campos extras {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} e {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} para pré-preencher o formulário
com o horário do evento. Os valores desses horários devem estar em milissegundos UTC
da época.</li>
-
+
<li>Ele usa o campo extra {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
para fornecer uma lista de termos separados por vírgula de convidados, especificados por endereço de e-mail.</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,12 +1158,12 @@
<ul>
<li>Um adaptador de sincronização precisa especificar que é um adaptador de sincronização que define {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} como <code>true</code>.</li>
-
-
+
+
<li>Os adaptadores de sincronização precisam fornecer um {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} e um {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} como parâmetros da consulta na URI. </li>
-
+
<li>Os adaptadores de sincronização têm acesso de gravação a mais colunas do que um aplicativo ou widget.
Por exemplo: um aplicativo só pode modificar algumas características de uma agenda,
como nome, nome de exibição, configurações de visibilidade e se a agenda está
@@ -1180,5 +1180,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>Para obter uma implementação de exemplo de um adaptador de sincronização (não especificamente relacionada ao Agenda), consulte
+<p>Para obter uma implementação de exemplo de um adaptador de sincronização (não especificamente relacionada ao Agenda), consulte
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>.
diff --git a/docs/html-intl/intl/pt-br/guide/topics/providers/contacts-provider.jd b/docs/html-intl/intl/pt-br/guide/topics/providers/contacts-provider.jd
index 0d42d2d..f3b7c58 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/providers/contacts-provider.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/providers/contacts-provider.jd
@@ -113,14 +113,14 @@
Este guia considera que o leitor conhece os preceitos dos provedores de conteúdo do Android. Para saber mais
sobre provedores de conteúdo do Android, leia o guia
<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
- Preceitos do provedor de conteúdo</a>.
+ Preceitos do provedor de conteúdo</a>.
O aplicativo <a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">Exemplo de adaptador de sincronização</a>
é um exemplo de uso de um adaptador de sincronização que transfere dados entre o Provedor
de contatos e um aplicativo de amostra hospedado pelo Google Web Services.
</p>
<h2 id="InformationTypes">Organização do Provedor de Contatos</h2>
<p>
- O Provedor de Contatos é um componente do provedor de conteúdo do Android. Ele mantém três tipos de
+ O Provedor de Contatos é um componente do provedor de conteúdo do Android. Ele mantém três tipos de
dados sobre uma pessoa, sendo cada um deles correspondente a uma tabela fornecida pelo provedor, como
ilustrado na figura 1:
</p>
@@ -199,7 +199,7 @@
{@link android.provider.ContactsContract.SyncColumns#ACCOUNT_TYPE}.
</td>
<td>
- O formato desse nome é específico deste tipo de conta.
+ O formato desse nome é específico deste tipo de conta.
Não se trata necessariamente de um endereço de e-mail.
</td>
</tr>
@@ -239,7 +239,7 @@
<ul>
<li>
O nome de um contato bruto não é armazenado em sua linha em
- {@link android.provider.ContactsContract.RawContacts}. Em vez disso, é armazenado na
+ {@link android.provider.ContactsContract.RawContacts}. Em vez disso, é armazenado na
tabela {@link android.provider.ContactsContract.Data}, em uma
linha {@link android.provider.ContactsContract.CommonDataKinds.StructuredName}. Os contatos brutos
têm apenas uma linha desse tipo na tabela {@link android.provider.ContactsContract.Data}.
@@ -275,7 +275,7 @@
Configurações da <em>conta</em>.
</p>
<p>
- Suponhamos que Emily Dickinson abra uma janela do navegador, acesse o Gmail como
+ Suponhamos que Emily Dickinson abra uma janela do navegador, acesse o Gmail como
<code>emily.dickinson@gmail.com</code>, abra
Contatos e adicione "Thomas Higginson". Mais tarde, ela acessa o Gmail como
<code>emilyd@gmail.com</code> e envia um e-mail para "Thomas Higginson", o que automaticamente
@@ -309,7 +309,7 @@
tipo de dados, como endereços de e-mail ou números de telefone. Por exemplo: se
"Thomas Higginson" para {@code emilyd@gmail.com} (a linha do contato bruto de Thomas Higginson
associada à conta Google <code>emilyd@gmail.com</code>) tem um endereço de e-mail pessoal
- <code>thigg@gmail.com</code> e um de trabalho
+ <code>thigg@gmail.com</code> e um de trabalho
<code>thomas.higginson@gmail.com</code>, o Provedor de Contatos armazena as duas linhas de endereço de e-mail
e vincula ambas ao contato bruto.
</p>
@@ -490,7 +490,7 @@
{@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} do contato continuará
apontado para a linha do contato para permitir o uso de
{@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}
- e manter ligações com contatos "favoritos" e assim por diante. Essa coluna tem o próprio formato, que
+ e manter ligações com contatos "favoritos" e assim por diante. Essa coluna tem o próprio formato, que
não tem nenhuma relação com o formato da coluna {@code android.provider.BaseColumns#_ID}.
</p>
<p>
@@ -981,7 +981,7 @@
{@code android.provider.BaseColumns#_ID} do contato bruto como
o valor {@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID}. Contudo, esse
valor não está disponível ao criar a {@link android.content.ContentProviderOperation}
- para a linha de dados porque
+ para a linha de dados porque
{@link android.content.ContentProviderOperation} ainda não foi aplicada à linha de contato bruto. Para trabalhar com isso,
a classe {@link android.content.ContentProviderOperation.Builder} tem o método
{@link android.content.ContentProviderOperation.Builder#withValueBackReference(String, int) withValueBackReference()}.
@@ -1403,7 +1403,7 @@
RawContacts.CONTENT_TYPE}, tipo MIME para um grupo de contatos brutos.
</td>
<td>
- Exibe a tela <strong>Adicionar contato</strong> do aplicativo de contatos do dispositivo.
+ Exibe a tela <strong>Adicionar contato</strong> do aplicativo de contatos do dispositivo.
São exibidos os valores extras adicionados à intenção. Se enviada com
{@link android.app.Activity#startActivityForResult(Intent, int) startActivityForResult()},
a URI de conteúdo do contato bruto recentemente adicionado é passada de volta
@@ -1636,7 +1636,7 @@
a disponibilidade dos dados dos contatos mesmo quando o dispositivo não está conectado à rede.
</p>
<p>
- Embora seja possível implementar a sincronização de diversos modos, o sistema Android fornece
+ Embora seja possível implementar a sincronização de diversos modos, o sistema Android fornece
uma estrutura de sincronização de extensão que automatiza as seguintes tarefas:
<ul>
@@ -1652,7 +1652,7 @@
</ul>
<p>
Para usar essa estrutura, deve-se fornecer uma extensão do adaptador de sincronização. Cada adaptador de sincronização é exclusivo
- de um serviço e um provedor de conteúdo, mas pode tratar diversos nomes de conta do mesmo serviço.
+ de um serviço e um provedor de conteúdo, mas pode tratar diversos nomes de conta do mesmo serviço.
A estrutura também permite diversos adaptadores de sincronização para o mesmo serviço e provedor.
</p>
<h3 id="SyncClassesFiles">Classes e arquivos do adaptador de sincronização</h3>
@@ -1830,7 +1830,7 @@
</p>
<h3 id="StreamText">Textos de fluxos sociais</h3>
<p>
- Itens de fluxo sempre são associados a um contato bruto.
+ Itens de fluxo sempre são associados a um contato bruto.
O {@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID} conecta-se ao
valor <code>_ID</code> do contato bruto. O tipo e o nome da conta do contato
bruto também são armazenados na linha do item de fluxo.
@@ -1861,17 +1861,17 @@
ao inserir um item de fluxo:
<ul>
<li>
- {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_ID}:
+ {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_ID}:
o valor {@code android.provider.BaseColumns#_ID} do contato ao qual esse item
de fluxo está associado.
</li>
<li>
- {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_LOOKUP_KEY}:
+ {@code android.provider.ContactsContract.StreamItemsColumns#CONTACT_LOOKUP_KEY}:
o valor{@code android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} do
contato ao qual esse item de fluxo está associado.
</li>
<li>
- {@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}:
+ {@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID}:
o valor {@code android.provider.BaseColumns#_ID} do contato bruto ao qual esse item
de fluxo está associado.
</li>
@@ -2275,14 +2275,14 @@
</dd>
<dt>{@code android:icon}</dt>
<dd>
-
+
<a href="{@docRoot}guide/topics/resources/drawable-resource.html">Recurso desenhável</a> do Android
que o aplicativo de contatos exibe próximo aos dados. Use isso para indicar
ao usuário que os dados são advindos do seu serviço.
</dd>
<dt>{@code android:summaryColumn}</dt>
<dd>
- O nome de coluna do primeiro de dois valores recuperados da linha de dados.
+ O nome de coluna do primeiro de dois valores recuperados da linha de dados.
O valor é exibido como a primeira linha da entrada para essa linha de dados. A primeira linha
destina-se ao uso como um resumo dos dados, mas isso é opcional. Veja também
<a href="#detailColumn">android:detailColumn</a>.
diff --git a/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-basics.jd
index 5005f92..7bbca94 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-basics.jd
@@ -216,7 +216,7 @@
Os aplicativos acessam dados a partir de um provedor de conteúdo
com um objeto cliente {@link android.content.ContentResolver}. Esse objeto tem métodos que chamam
métodos de nome idêntico no objeto do provedor, uma instância de uma das subclasses
- concretas de {@link android.content.ContentProvider}.
+ concretas de {@link android.content.ContentProvider}.
Os métodos {@link android.content.ContentResolver} fornecem as funções básicas
do "CRUD" (criar, recuperar, atualizar e excluir) de armazenamento persistente.
</p>
@@ -251,7 +251,7 @@
</pre>
<p>
A tabela 2 mostra como os argumentos para
- {@link android.content.ContentResolver#query
+ {@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} correspondem a uma declaração SQL SELECT:
</p>
<p class="table-caption">
@@ -310,7 +310,7 @@
{@link android.provider.UserDictionary.Words#CONTENT_URI} contém a URI de conteúdo
da tabela de "palavras" do dicionário do usuário. O objeto {@link android.content.ContentResolver}
analisa a autoridade da URI e usa-na para "determinar" o provedor
- comparando a autoridade a uma tabela de provedores conhecidos do sistema.
+ comparando a autoridade a uma tabela de provedores conhecidos do sistema.
O {@link android.content.ContentResolver} pode, então, enviar os argumentos da consulta ao provedor
correto.
</p>
@@ -344,7 +344,7 @@
</p>
<p class="note">
<strong>Observação:</strong> as classes {@link android.net.Uri} e {@link android.net.Uri.Builder}
- contêm métodos convenientes para a construção de objetos de URI bem formados a partir de strings.
+ contêm métodos convenientes para a construção de objetos de URI bem formados a partir de strings.
As {@link android.content.ContentUris} contêm métodos conveniente para anexar valores de ID
a uma URI. O fragmento anterior usa {@link android.content.ContentUris#withAppendedId
withAppendedId()} para anexar um ID à URI de conteúdo UserDictionary.
@@ -359,7 +359,7 @@
</p>
<p class="note">
Por uma questão de clareza, os fragmentos de código nesta seção chamam
- {@link android.content.ContentResolver#query ContentResolver.query()} no "encadeamento da IU".
+ {@link android.content.ContentResolver#query ContentResolver.query()} no "encadeamento da IU".
No código atual, contudo, deve-se realizar consultas assincronamente em um encadeamento separado. Um modo de fazê-lo
é usar a classe {@link android.content.CursorLoader}, descrita
com mais detalhes no guia <a href="{@docRoot}guide/components/loaders.html">
@@ -567,7 +567,7 @@
<p>
O método cliente {@link android.content.ContentResolver#query ContentResolver.query()} sempre
retorna um {@link android.database.Cursor} contendo as colunas especificadas pela projeção
- da consulta para as linhas que atendem aos critérios de seleção da consulta.
+ da consulta para as linhas que atendem aos critérios de seleção da consulta.
Um objeto {@link android.database.Cursor} fornece acesso para leitura aleatório para as linhas e colunas que
contém. Usando métodos {@link android.database.Cursor}, é possível repetir as linhas
nos resultados, determinar o tipo dos dados de cada coluna, extrair os dados de uma coluna e examinar
@@ -946,7 +946,7 @@
Para acessar um provedor em "modo de lote",
cria-se uma matriz de objetos {@link android.content.ContentProviderOperation} e, em seguida,
envia-os a um provedor de conteúdo com
- {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. Confere-se a
+ {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. Confere-se a
<em>autoridade</em> do provedor de conteúdo para esse método em vez de para uma URI de conteúdo específica.
Isso permite que cada objeto {@link android.content.ContentProviderOperation} na matriz trabalhe
com uma tabela diferente. Chamar {@link android.content.ContentResolver#applyBatch
@@ -954,7 +954,7 @@
</p>
<p>
A descrição da classe de contrato {@link android.provider.ContactsContract.RawContacts}
- contém um fragmento de código que demonstra a inserção em lote.
+ contém um fragmento de código que demonstra a inserção em lote.
O aplicativo de exemplo do <a href="{@docRoot}resources/samples/ContactManager/index.html">Gerente de contato</a>
contém um exemplo de acesso em lote em seu
arquivo de origem <code>ContactAdder.java</code>.
@@ -1089,7 +1089,7 @@
</p>
<p>
Por exemplo: o Provedor de Dicionário do Usuário tem uma classe de contrato
- {@link android.provider.UserDictionary} que contém constantes de URI de conteúdo e de nome de coluna.
+ {@link android.provider.UserDictionary} que contém constantes de URI de conteúdo e de nome de coluna.
A URI de conteúdo da tabela de "palavras" é definida na constante
{@link android.provider.UserDictionary.Words#CONTENT_URI UserDictionary.Words.CONTENT_URI}.
A classe {@link android.provider.UserDictionary.Words} também contém constantes de nome de coluna
@@ -1184,7 +1184,7 @@
vnd.android.cursor.<strong>item</strong>/vnd.example.line2
</pre>
<p>
- A maioria dos provedores define constantes de classe de contrato para os tipos MIME que usam.
+ A maioria dos provedores define constantes de classe de contrato para os tipos MIME que usam.
A classe de contrato {@link android.provider.ContactsContract.RawContacts} do Provedor de Contatos,
por exemplo, define a constante
{@link android.provider.ContactsContract.RawContacts#CONTENT_ITEM_TYPE} para o tipo MIME
diff --git a/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-creating.jd
index 11ad4c3..6ae7b2d 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/providers/content-provider-creating.jd
@@ -203,7 +203,7 @@
<ul>
<li>
O sistema Android contém uma API de banco de dados SQLite que os provedores do Android usam
- para armazenar dados orientados a tabela.
+ para armazenar dados orientados a tabela.
A classe {@link android.database.sqlite.SQLiteOpenHelper} ajuda a criar bancos de dados
e a classe {@link android.database.sqlite.SQLiteDatabase} é a classe de base para acessar
banco de dados.
@@ -539,7 +539,7 @@
</dd>
</dl>
<p>
- Observe que esses métodos têm a mesma assinatura dos métodos
+ Observe que esses métodos têm a mesma assinatura dos métodos
{@link android.content.ContentResolver} de mesmo nome.
</p>
<p>
@@ -569,7 +569,7 @@
</ul>
<h3 id="Query">Implementação do método query()</h3>
<p>
-
+
O método {@link android.content.ContentProvider#query(Uri, String[], String, String[], String)
ContentProvider.query()} precisa retornar um objeto {@link android.database.Cursor} ou, se
falhar, gerar uma {@link java.lang.Exception}. Se você estiver usando um banco de dados SQLite
@@ -778,7 +778,7 @@
Para tipos de dados comuns como texto, HTML ou JPEG,
{@link android.content.ContentProvider#getType(Uri) getType()} deve retornar o tipo MIME
padrão daqueles dados. Há uma lista completa desse tipos de padrão
- no site de
+ no site de
<a href="http://www.iana.org/assignments/media-types/index.htm">Tipos de mídia MIME IANA</a>.
</p>
<p>
@@ -981,7 +981,7 @@
Permissão de leitura, gravação ou leitura/gravação para uma URI de conteúdo no provedor. Especifica-se
cada URI que se deseja controlar
com um elemento filho <code><a href="{@docRoot}guide/topics/manifest/path-permission-element.html">
- <path-permission></a></code>
+ <path-permission></a></code>
do elemento <code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
<provider></a></code>. Para cada URI de conteúdo, pode-se especificar
uma permissão de leitura/gravação, uma permissão de leitura, uma permissão de gravação ou as três. As permissões
diff --git a/docs/html-intl/intl/pt-br/guide/topics/providers/content-providers.jd b/docs/html-intl/intl/pt-br/guide/topics/providers/content-providers.jd
index c9574f6..48f4cd4 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/providers/content-providers.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/providers/content-providers.jd
@@ -52,12 +52,12 @@
padrão que conecta dados em um processo com código em execução em outro processo.
</p>
<p>
- Quando desejar acessar dados em um provedor de conteúdo, você usa o
- objeto {@link android.content.ContentResolver} no
+ Quando desejar acessar dados em um provedor de conteúdo, você usa o
+ objeto {@link android.content.ContentResolver} no
{@link android.content.Context} do aplicativo para se comunicar com o provedor como cliente.
O objeto {@link android.content.ContentResolver} se comunica com o objeto provedor, uma
instância de uma classe que implementa {@link android.content.ContentProvider}. O objeto
- provedor recebe solicitações de dados de clientes, realiza a ação solicitada e
+ provedor recebe solicitações de dados de clientes, realiza a ação solicitada e
devolve os resultados.
</p>
<p>
@@ -68,10 +68,10 @@
</p>
<p>
O Android propriamente dito inclui provedores de conteúdo que gerenciam dados como áudio, vídeo, imagens e
- informações de contato pessoais. Alguns deles estão listados na documentação de
- referência do
+ informações de contato pessoais. Alguns deles estão listados na documentação de
+ referência do
pacote <code><a href="{@docRoot}reference/android/provider/package-summary.html">android.provider</a>
- </code>. Com algumas restrições, esses provedores podem ser acessados por qualquer aplicativo
+ </code>. Com algumas restrições, esses provedores podem ser acessados por qualquer aplicativo
Android.
</p><p>
Os tópicos a seguir descrevem provedores de conteúdo em mais detalhes:
diff --git a/docs/html-intl/intl/pt-br/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/pt-br/guide/topics/providers/document-provider.jd
index 25aab7a..b2e040e 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/providers/document-provider.jd
@@ -139,7 +139,7 @@
cada um deles, por sua vez, podem indicar 1 a <em>N</em> documentos. </li>
<li>Cada back-end de armazenamento apresenta
-arquivos e diretórios individuais referenciando-os com um
+arquivos e diretórios individuais referenciando-os com um
{@link android.provider.DocumentsContract.Document#COLUMN_DOCUMENT_ID} exclusivo.
IDs de documentos devem ser exclusivos e não podem mudar depois de emitidos, pois são usados para concessões persistentes
da URI em reinicializações do dispositivo.</li>
@@ -236,7 +236,7 @@
</ul>
-<p>Esta seção descreve como programar aplicativos clientes com base nas intenções
+<p>Esta seção descreve como programar aplicativos clientes com base nas intenções
{@link android.content.Intent#ACTION_OPEN_DOCUMENT}
e {@link android.content.Intent#ACTION_CREATE_DOCUMENT}.</p>
@@ -521,7 +521,7 @@
<p>Para evitar que isso aconteça, você pode manter as permissões que o sistema
forneceu ao aplicativo. Efetivamente, o aplicativo "toma" a concessão de permissão da URI persistente
-que o sistema está oferecendo. Isso concede ao usuário um acesso contínuo aos arquivos
+que o sistema está oferecendo. Isso concede ao usuário um acesso contínuo aos arquivos
por meio do aplicativo mesmo se o dispositivo for reiniciado:</p>
@@ -624,7 +624,7 @@
Se você deseja que o aplicativo seja compatível com {@link android.content.Intent#ACTION_GET_CONTENT}
para adaptar-se a dispositivos que executam o Android 4.3 ou versões anteriores, é necessário
desativar o filtro de intenção {@link android.content.Intent#ACTION_GET_CONTENT}
-no manifesto para dispositivos que executam Android 4.4 ou versões posteriores.
+no manifesto para dispositivos que executam Android 4.4 ou versões posteriores.
Um provedor de documentos e {@link android.content.Intent#ACTION_GET_CONTENT} devem ser avaliados
de forma mutuamente exclusiva. Se houver compatibilidade com ambos simultaneamente, o aplicativo
aparecerá duas vezes na IU do seletor do sistema, oferecendo dois meios de acesso
diff --git a/docs/html-intl/intl/pt-br/guide/topics/resources/accessing-resources.jd b/docs/html-intl/intl/pt-br/guide/topics/resources/accessing-resources.jd
index f196dfe..de8b5df 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/resources/accessing-resources.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/resources/accessing-resources.jd
@@ -11,7 +11,7 @@
{@code R.drawable.myimage}</li>
<li>Recursos podem ser referenciados de recursos usando uma sintaxe XML especial, como {@code
@drawable/myimage}</li>
- <li>Também é possível acessar os recursos do aplicativo com métodos em
+ <li>Também é possível acessar os recursos do aplicativo com métodos em
{@link android.content.res.Resources}</li>
</ul>
@@ -43,10 +43,10 @@
<p>Depois de fornecer um recurso no aplicativo (discutido em <a href="providing-resources.html">Fornecimento de recursos</a>), é possível aplicá-lo
-referenciando seu ID de recurso. Todos os IDs de recursos são definidos na classe {@code R} do projeto, que
+referenciando seu ID de recurso. Todos os IDs de recursos são definidos na classe {@code R} do projeto, que
a ferramenta {@code aapt} gera automaticamente.</p>
-<p>Quando o aplicativo é compilado, {@code aapt} gera a classe {@code R}, que contém
+<p>Quando o aplicativo é compilado, {@code aapt} gera a classe {@code R}, que contém
IDs de recursos para todos os recursos no diretório {@code
res/}. Para cada tipo de recurso, há uma subclasse {@code R} (por exemplo,
{@code R.drawable} para todos os recursos desenháveis) e, para cada recurso daquele tipo, há um número inteiro
@@ -60,7 +60,7 @@
string}, {@code drawable} e {@code layout}. Para saber mais sobre os diferentes tipos, consulte <a href="available-resources.html">Tipos de recursos</a>.
</li>
<li>O <em>nome do recurso</em>, que é: o nome do arquivo,
-excluindo a extensão; ou o valor no atributo {@code android:name} do XML, se o
+excluindo a extensão; ou o valor no atributo {@code android:name} do XML, se o
recurso for um valor simples (como uma string).</li>
</ul>
@@ -101,7 +101,7 @@
<div class="sidebox">
<h2>Acesso aos arquivos originais</h2>
-<p>Apesar de ser incomum, pode ser necessário acessar os arquivos e os diretórios originais. Nesse caso,
+<p>Apesar de ser incomum, pode ser necessário acessar os arquivos e os diretórios originais. Nesse caso,
salvar os arquivos em {@code res/} não funcionará, pois a única forma de ler um recurso de
{@code res/} é com o ID do recurso. Em vez disso, é possível salvar os recursos no
diretório {@code assets/}.</p>
@@ -139,7 +139,7 @@
<h3>Casos de uso</h3>
-<p>Há muitos métodos que aceitam um parâmetro de ID de recurso e você pode recuperar recursos usando
+<p>Há muitos métodos que aceitam um parâmetro de ID de recurso e você pode recuperar recursos usando
métodos em {@link android.content.res.Resources}. É possível obter uma instância de {@link
android.content.res.Resources} com {@link android.content.Context#getResources
Context.getResources()}.</p>
@@ -176,7 +176,7 @@
<p class="caution"><strong>Atenção:</strong> nunca modifique o arquivo {@code
-R.java} manualmente — ele é gerado pela ferramenta {@code aapt} quando o projeto é
+R.java} manualmente — ele é gerado pela ferramenta {@code aapt} quando o projeto é
compilado. As alterações serão sobrepostas na próxima compilação.</p>
@@ -209,7 +209,7 @@
<ul>
<li>{@code <package_name>} é o nome do pacote no qual o recurso está localizado (não
é obrigatório ao referenciar recursos do mesmo pacote).</li>
- <li>{@code <resource_type>} é a subclasse
+ <li>{@code <resource_type>} é a subclasse
{@code R} do tipo de recurso.</li>
<li>{@code <resource_name>} é o nome do arquivo do recurso
sem a extensão ou o valor do atributo {@code android:name} no elemento XML (para valores
@@ -260,10 +260,10 @@
</pre>
<p class="note"><strong>Observação:</strong> você deve usar recursos de string
-o tempo inteiro para que o seu aplicativo possa ser localizado para outros idiomas.
+o tempo inteiro para que o seu aplicativo possa ser localizado para outros idiomas.
Para obter informações sobre a criação de recursos
-alternativos (como strings localizadas), consulte <a href="providing-resources.html#AlternativeResources">Fornecimento de recursos
-alternativos</a>. Para obter um guia completo para localizar o aplicativo para outros idiomas,
+alternativos (como strings localizadas), consulte <a href="providing-resources.html#AlternativeResources">Fornecimento de recursos
+alternativos</a>. Para obter um guia completo para localizar o aplicativo para outros idiomas,
consulte <a href="localization.html">Localização</a>.</p>
<p>Você pode até mesmo usar recursos em XML para criar alias. Por exemplo, é possível criar um recurso
@@ -289,14 +289,14 @@
essencialmente significa "usar o estilo que é definido por esse atributo no tema atual".</p>
<p>Para referenciar um atributo de estilo, a sintaxe do nome é quase idêntica ao formato normal de recurso,
-mas, em vez de o símbolo arroba ({@code @}), use um ponto de interrogação ({@code ?}). Além disso,
+mas, em vez de o símbolo arroba ({@code @}), use um ponto de interrogação ({@code ?}). Além disso,
a parte do tipo de recurso é opcional. Por exemplo:</p>
<pre class="classic">
?[<em><package_name></em>:][<em><resource_type></em>/]<em><resource_name></em>
</pre>
-<p>Por exemplo, abaixo apresenta-se como você pode referenciar um atributo para definir a cor do texto para que corresponda à
+<p>Por exemplo, abaixo apresenta-se como você pode referenciar um atributo para definir a cor do texto para que corresponda à
cor "principal" do texto do tema do sistema:</p>
<pre>
@@ -320,7 +320,7 @@
<h2 id="PlatformResources">Acesso aos recursos da plataforma</h2>
<p>O Android contém uma série de recursos padrão, como estilos, temas e layouts. Para
-acessá-los, qualifique a referência de recurso com o
+acessá-los, qualifique a referência de recurso com o
nome do pacote <code>android</code>. Por exemplo, o Android fornece um recurso de layout que pode ser usado para
listar itens em um {@link android.widget.ListAdapter}:</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/resources/overview.jd b/docs/html-intl/intl/pt-br/guide/topics/resources/overview.jd
index 5bf37e6..b34c01b 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/resources/overview.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/resources/overview.jd
@@ -24,8 +24,8 @@
também permite fornecer recursos alternativos que sejam compatíveis com configurações
de dispositivos específicos, como idiomas ou tamanhos de tela diferentes, que se tornam cada vez
mais importantes à medida que mais dispositivos com Android são disponibilizados com configurações diferentes. Para fornecer
-compatibilidade com diferentes configurações, é preciso organizar recursos no
-diretório {@code res/} de seu projeto usando vários subdiretórios que agrupem recursos por tipo e
+compatibilidade com diferentes configurações, é preciso organizar recursos no
+diretório {@code res/} de seu projeto usando vários subdiretórios que agrupem recursos por tipo e
configuração.</p>
<div class="figure" style="width:429px">
diff --git a/docs/html-intl/intl/pt-br/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/pt-br/guide/topics/resources/providing-resources.jd
index 1118fd5..b45018d 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/resources/providing-resources.jd
@@ -71,7 +71,7 @@
</pre>
<p>Como pode ver neste exemplo, o diretório {@code res/} contém todos os recursos (em subdiretórios):
-um recurso de imagem, dois recursos de layout, diretórios {@code mipmap/} para ícones de
+um recurso de imagem, dois recursos de layout, diretórios {@code mipmap/} para ícones de
inicialização e um arquivo de recurso de string. Os nomes dos diretórios
de recursos são importantes e são descritos na tabela 1.</p>
@@ -161,7 +161,7 @@
com base no nome do arquivo XML, os arquivos no diretório {@code values/} descrevem vários recursos.
Para cada arquivo neste diretório, cada filho do elemento {@code <resources>} define um único
recurso. Por exemplo, um elemento {@code <string>} cria
-um recurso {@code R.string} e um elemento {@code <color>} cria um recurso
+um recurso {@code R.string} e um elemento {@code <color>} cria um recurso
{@code R.color}.</p>
<p>Como cada recurso é definido com seu próprio elemento XML, é possível nomear o arquivo
da forma que quiser e colocar tipos de recurso variados em um arquivo. No entanto, para esclarecer, você pode
@@ -510,7 +510,7 @@
e o aplicativo apresentará um erro em tempo de execução (por exemplo, se todos os recursos de layout receberem tag com o qualificador {@code
xlarge}, mas o dispositivo tiver uma tela de tamanho normal).</p>
<p><em>Adicionado à API de nível 4.</em></p>
-
+
<p>Consulte <a href="{@docRoot}guide/practices/screens_support.html">Compatibilidade com
várias telas</a> para obter mais informações.</p>
<p>Consulte também o campo de configuração {@link android.content.res.Configuration#screenLayout},
@@ -627,8 +627,8 @@
nível 8</em></li>
<li>{@code xxhdpi}: Telas de densidade extra-extra-alta, aproximadamente 480 dpi. <em>Adicionado à API de
nível 16</em></li>
- <li>{@code xxxhdpi}: Usos de densidade extra-extra-extra-alta (somente ícone do inicializador, consulte a
- <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">observação</a>
+ <li>{@code xxxhdpi}: Usos de densidade extra-extra-extra-alta (somente ícone do inicializador, consulte a
+ <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">observação</a>
em <em>Compatibilidade com várias telas</em>), aproximadamente 640 dpi. <em>Adicionado à API de
nível 18</em></li>
<li>{@code nodpi}: Isto pode ser usado para recursos de bitmap que você não deseja dimensionar
@@ -823,7 +823,7 @@
para letras minúsculas antes de processar para evitar problemas nos sistemas de arquivo
que não diferenciam maiúsculas e minúsculas. Qualquer letra maiúscula nos nomes é apenas para o benefício da leitura.</li>
<li>Somente um valor para cada tipo de qualificador é suportado. Por exemplo, se quiser usar
-os mesmos arquivos desenháveis para Espanha e França, <em>não</em> é possível ter um diretório chamado
+os mesmos arquivos desenháveis para Espanha e França, <em>não</em> é possível ter um diretório chamado
<code>drawable-rES-rFR/</code>. Em vez disso, você precisa de dois diretórios de recursos, como
<code>drawable-rES/</code> e <code>drawable-rFR/</code>, que contenham arquivos adequados.
No entanto, não é necessário duplicar os mesmos arquivos em ambos os locais. Em vez disso,
@@ -1088,7 +1088,7 @@
do que o número de qualificadores que correspondem exatamente ao dispositivo. Por exemplo, na etapa 4 acima, a última
escolha na lista inclui três qualificadores que correspondem exatamente ao dispositivo (orientação, tipo de
tela sensível ao toque e método de entrada), enquanto que <code>drawable-en</code> possui apenas um parâmetro que corresponde
-(idioma). No entanto, o idioma tem uma precedência maior que esses outros qualificadores, então
+(idioma). No entanto, o idioma tem uma precedência maior que esses outros qualificadores, então
<code>drawable-port-notouch-12key</code> está fora.</p>
<p>Para obter mais informações sobre como usar os recursos no aplicativo, acesse <a href="accessing-resources.html">Acesso aos recursos</a>.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/resources/runtime-changes.jd b/docs/html-intl/intl/pt-br/guide/topics/resources/runtime-changes.jd
index 366ce0d..416bce9 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/resources/runtime-changes.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/resources/runtime-changes.jd
@@ -125,7 +125,7 @@
significa que o aplicativo mantém a retenção deles, que não podem ser recolhidos, o que
causa perda de memória).</p>
-<p>Em seguida, use {@link android.app.FragmentManager} para adicionar o fragmento à atividade.
+<p>Em seguida, use {@link android.app.FragmentManager} para adicionar o fragmento à atividade.
É possível obter o objeto de dados do fragmento quando a atividade reiniciar durante as alterações
de configuração em tempo de execução. Por exemplo: defina a atividade da seguinte forma:</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/controls.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/controls.jd
index 58a4fcd..1cd6d52 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">Botão de opção</a></td>
<td>Similar às caixas de seleção, exceto que somente uma opção pode ser selecionada no grupo.</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/declaring-layout.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/declaring-layout.jd
index 09dbd2c..8782ba2 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/declaring-layout.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/declaring-layout.jd
@@ -43,7 +43,7 @@
<ul>
<li><strong>Declarar elementos da IU em XML</strong>. O Android fornece um vocabulário XML
direto que corresponde às classes e subclasses de View, como as de widgets e layouts.</li>
-<li><strong>Instanciar elementos do layout em tempo de execução</strong>.
+<li><strong>Instanciar elementos do layout em tempo de execução</strong>.
O aplicativo pode criar objetos de View e ViewGroup (e manipular suas propriedades) programaticamente. </li>
</ul>
@@ -123,7 +123,7 @@
</pre>
<p>O método de retorno de chamada <code>onCreate()</code> na Atividade é chamado pela estrutura do Android quando
-ela é inicializada (veja a discussão sobre ciclos de vida no documento
+ela é inicializada (veja a discussão sobre ciclos de vida no documento
<a href="{@docRoot}guide/components/activities.html#Lifecycle">Atividades</a>
).</p>
@@ -201,7 +201,7 @@
valores. Cada elemento filho deve definir LayoutParams apropriados para seu pai,
embora possa também definir diferentes LayoutParams para os próprios filhos. </p>
-<p>Todos os grupos de vistas contêm largura e altura (<code>layout_width</code> e
+<p>Todos os grupos de vistas contêm largura e altura (<code>layout_width</code> e
<code>layout_height</code>) e cada vista é obrigatória para defini-las. Muitos
LayoutParams também contêm margens e bordas opcionais. <p>
@@ -229,7 +229,7 @@
<h2 id="Position">Posição do layout</h2>
<p>
A geometria de uma vista de um retângulo. As vistas têm uma localização,
- expressa como um par de coordenadas <em>esquerda</em> e <em>topo</em>
+ expressa como um par de coordenadas <em>esquerda</em> e <em>topo</em>
e duas dimensões, expressas como largura e altura. A unidade de localização
e de dimensões é o pixel.
</p>
@@ -262,7 +262,7 @@
<p>
O primeiro par é conhecido como <em>largura medida</em>
e <em>altura medida</em>. Essas dimensões definem o tamanho que a vista terá
- dentro da vista pai.
+ dentro da vista pai.
Para obter as dimensões medidas, chamam-se {@link android.view.View#getMeasuredWidth()}
e {@link android.view.View#getMeasuredHeight()}.
</p>
@@ -368,7 +368,7 @@
<h2 id="AdapterViews" style="clear:left">Criação de layouts com um adaptador</h2>
<p>Quando o conteúdo do layout é dinâmico ou não predeterminado, é possível usar um layout que
-torne {@link android.widget.AdapterView} uma subclasse para preencher o layout com vistas em tempo de execução.
+torne {@link android.widget.AdapterView} uma subclasse para preencher o layout com vistas em tempo de execução.
Uma subclasse da classe {@link android.widget.AdapterView} usa um {@link android.widget.Adapter}
para agrupar dados ao seu layout. O {@link android.widget.Adapter} se comporta como um intermediário entre a fonte
dos dados e o layout do {@link android.widget.AdapterView} — o {@link android.widget.Adapter}
@@ -399,7 +399,7 @@
android.view.View} que representa cada entrada de dados.</p>
<p>O Android oferece diversas subclasses de {@link android.widget.Adapter} que são úteis para
-recuperar diferentes tipos de dados e criar vistas de um {@link android.widget.AdapterView}.
+recuperar diferentes tipos de dados e criar vistas de um {@link android.widget.AdapterView}.
Os dois adaptadores mais comuns são:</p>
<dl>
@@ -438,7 +438,7 @@
</dd>
<dt>{@link android.widget.SimpleCursorAdapter}</dt>
- <dd>Use este adaptador quando os dados vierem de um {@link android.database.Cursor}.
+ <dd>Use este adaptador quando os dados vierem de um {@link android.database.Cursor}.
Ao usar {@link android.widget.SimpleCursorAdapter}, é necessário especificar um layout a usar para cada
linha no {@link android.database.Cursor} e que colunas no {@link android.database.Cursor}
devem ser inseridas em determinadas vistas do layout. Por exemplo: se você deseja criar uma lista
@@ -466,7 +466,7 @@
</dl>
-<p>Se durante o curso de vida do aplicativo, você mudar os dados subjacentes lidos
+<p>Se durante o curso de vida do aplicativo, você mudar os dados subjacentes lidos
pelo adaptador, chame {@link android.widget.ArrayAdapter#notifyDataSetChanged()}. Isso
notificará à vista anexada que os dados foram alterados e que ela deve se atualizar.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/dialogs.jd
index 2cbedbe..71e6176 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>Veja também</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">Guia de projeto de caixas de diálogo</a></li>
@@ -235,8 +235,8 @@
</pre>
<p>Os métodos <code>set...Button()</code> exigem um título para o botão (fornecido
-por um <a href="{@docRoot}guide/topics/resources/string-resource.html">recurso de string</a>) e um
-{@link android.content.DialogInterface.OnClickListener} que defina a ação a realizar
+por um <a href="{@docRoot}guide/topics/resources/string-resource.html">recurso de string</a>) e um
+{@link android.content.DialogInterface.OnClickListener} que defina a ação a realizar
quando o usuário pressionar o botão.</p>
<p>Há três botões de ação diferente que podem ser adicionados:</p>
@@ -248,7 +248,7 @@
<dt>Neutro</dt>
<dd>É o que se deve usar quando houver a opção de o usuário não querer continuar a ação,
mas não necessariamente cancelá-la. Ele aparece entre os botões positivo
- e negativo. Por exemplo: a ação pode ser "Notifique-me mais tarde".</dd>
+ e negativo. Por exemplo: a ação pode ser "Notifique-me mais tarde".</dd>
</dl>
<p>É possível adicionar somente um de cada tipo de botão a uma {@link
@@ -271,7 +271,7 @@
<li>Lista de escolhas múltiplas persistentes (caixas de seleção)</li>
</ul>
-<p>Para criar uma lista de escolha única como a da figura 3,
+<p>Para criar uma lista de escolha única como a da figura 3,
use o método {@link android.app.AlertDialog.Builder#setItems setItems()}:</p>
<pre style="clear:right">
@@ -291,7 +291,7 @@
<p>Como a lista aparece na área do conteúdo da caixa de diálogo,
a caixa não pode exibir uma mensagem e uma lista, e será preciso definir um título
-para ela com {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
+para ela com {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
Para especificar os itens da lista, chame {@link
android.app.AlertDialog.Builder#setItems setItems()} passando uma matriz.
Alternativamente, é possível especificar uma lista com {@link
@@ -320,8 +320,8 @@
<p>Para adicionar uma lista de itens de múltipla escolha (caixas de seleção)
ou itens de escolha única (botões de rádio), use os métodos
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} ou
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} ou
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} respectivamente.</p>
<p>Por exemplo, a seguir apresenta-se como criar uma lista de múltipla escolha como
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -373,7 +373,7 @@
<p>Embora a lista tradicional e uma lista com botões de opção
forneçam uma ação de "escolha única", deve-se usar {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} se você desejar manter a escolha do usuário.
Ou seja, se a caixa de diálogo abrir novamente mais tarde, deve indicar qual é a escolha atual do usuário,
portanto deve-se criar uma lista com botões de opção.</p>
@@ -442,7 +442,7 @@
um estilo de fonte compatível.</p>
<p>Para inflar o layout no {@link android.support.v4.app.DialogFragment},
-obtenha um {@link android.view.LayoutInflater} com
+obtenha um {@link android.view.LayoutInflater} com
{@link android.app.Activity#getLayoutInflater()} e chame
{@link android.view.LayoutInflater#inflate inflate()}, em que o primeiro parâmetro
é o ID de recurso do layout e o segundo é uma vista pai do layout.
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
@@ -695,7 +695,7 @@
}
</pre>
-<p>Para obter mais informações sobre a realização de operações de fragmentos, consulte o guia
+<p>Para obter mais informações sobre a realização de operações de fragmentos, consulte o guia
<a href="{@docRoot}guide/components/fragments.html">Fragmentos</a>.</p>
<p>Nesse exemplo, o booleano <code>mIsLargeLayout</code> especifica se o dispositivo atual
@@ -721,7 +721,7 @@
</resources>
</pre>
-<p>Assim, é possível inicializar o valor {@code mIsLargeLayout} durante o método
+<p>Assim, é possível inicializar o valor {@code mIsLargeLayout} durante o método
{@link android.app.Activity#onCreate onCreate()} da atividade:</p>
<pre>
@@ -776,7 +776,7 @@
android.support.v4.app.DialogFragment}.</p>
<p>Também é possível <em>cancelar</em> uma caixa de diálogo. Trata-se de um evento especial que indica que o usuário
-se retirou explicitamente da caixa de diálogo sem concluir a tarefa. Isso ocorre se o usuário pressionar o botão
+se retirou explicitamente da caixa de diálogo sem concluir a tarefa. Isso ocorre se o usuário pressionar o botão
<em>Voltar</em>, tocar na tela fora da área da caixa de diálogo
ou se você chamar {@link android.app.Dialog#cancel()} explicitamente no {@link
android.app.Dialog} (como em resposta a um botão "Cancelar" na caixa de diálogo).</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/menus.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/menus.jd
index 833f896..6bdb370 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/menus.jd
@@ -83,9 +83,9 @@
e outras opções.</p>
<p>Consulte a seção <a href="#options-menu">Criação de um menu de opções</a>.</p>
</dd>
-
+
<dt><strong>Modo de ação contextual e menu de contexto</strong></dt>
-
+
<dd>Um menu de contexto é um <a href="#FloatingContextMenu">menu flutuante</a> que aparece quando
o usuário realiza um clique longo em um elemento. Ele fornece ações que afetam o conteúdo selecionado
ou a estrutura do contexto.
@@ -94,7 +94,7 @@
selecione vários itens.</p>
<p>Consulte a seção <a href="#context-menu">Criação de menus contextuais</a>.</p>
</dd>
-
+
<dt><strong>Menu pop-up</strong></dt>
<dd>Um menu pop-up exibe itens em uma lista vertical ancorada à vista
que apresentou o menu. É bom para fornecer um estouro de ações relacionado a conteúdo específico
@@ -135,7 +135,7 @@
<dt><code><item></code></dt>
<dd>Cria um {@link android.view.MenuItem}, que representa um único item em um menu. Este
elemento pode conter um elemento <code><menu></code> aninhado para criar um submenu.</dd>
-
+
<dt><code><group></code></dt>
<dd>Um recipiente invisível e opcional para os elementos {@code <item>}. Ele permite que você categorize
itens de menu para que eles compartilhem propriedades como estado ativo e visibilidade. Para obter mais informações,
@@ -218,7 +218,7 @@
foi desenvolvido:</p>
<ul>
- <li>Caso tenha desenvolvido o aplicativo para <strong>Android 2.3.x (API de nível 10) ou
+ <li>Caso tenha desenvolvido o aplicativo para <strong>Android 2.3.x (API de nível 10) ou
inferior</strong>, os conteúdos do menu de opções aparecerão na parte inferior da tela, quando o usuário
pressionar o botão <em>Menu</em>, como exibido na figura 1. Quando aberto, a primeira parte visível é
o menu
@@ -363,7 +363,7 @@
você deve chamar {@link android.app.Activity#invalidateOptionsMenu invalidateOptionsMenu()} para pedir
que o sistema chame {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}.</p>
-<p class="note"><strong>Observação:</strong>
+<p class="note"><strong>Observação:</strong>
você nunca deve alterar os itens no menu de opções com base no {@link android.view.View} atualmente
em foco. Quando estiver no modo de toque (quando o usuário não está usando cursor de bola ou um teclado), as vistas
não podem ter foco, então você nunca deve usar o foco como base para modificar
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -901,7 +901,7 @@
(como {@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}). É aqui
que você deve definir o estado da caixa de seleção, pois a caixa de seleção ou o botão de rádio
não altera o seu estado automaticamente. É possível consultar o estado do item (como ele era antes
-do usuário selecioná-lo) com {@link android.view.MenuItem#isChecked()} e, em seguida, definir o estado marcado com
+do usuário selecioná-lo) com {@link android.view.MenuItem#isChecked()} e, em seguida, definir o estado marcado com
{@link android.view.MenuItem#setChecked(boolean) setChecked()}. Por exemplo:</p>
<pre>
@@ -1023,9 +1023,9 @@
</intent-filter>
</pre>
-<p>Leia mais sobre a criação de filtros de intenção no documento
+<p>Leia mais sobre a criação de filtros de intenção no documento
<a href="/guide/components/intents-filters.html">Intenções e filtros de intenções</a>.</p>
-<p>Para obter um exemplo de aplicativo que usa esta técnica, consulte o código de exemplo do
+<p>Para obter um exemplo de aplicativo que usa esta técnica, consulte o código de exemplo do
<a href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">Bloco
de notas</a>.</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..26259f6
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd
@@ -0,0 +1,589 @@
+page.title=Suporte a várias janelas
+page.metaDescription=Novo suporte à exibição de mais de um aplicativo ao mesmo tempo no Android N.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#overview">Visão geral</a></li>
+ <li><a href="#lifecycle">Ciclo de vida do modo de várias janelas</a></li>
+ <li><a href="#configuring">Configuração do aplicativo para o modo
+ de várias janelas</a></li>
+ <li><a href="#running">Execução do aplicativo no modo de várias janelas</a></li>
+ <li><a href="#testing">Teste do suporte a várias janelas em seu aplicativo</a></li>
+ </ol>
+ <h2>Veja também</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Playground — aplicativo de exemplo
+ do modo de várias janelas</a></li>
+ <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Cinco dicas para preparar o modo de várias janelas no Android N</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ O Android N adiciona suporte à exibição de mais de um aplicativo ao
+ mesmo tempo. Em dispositivos portáteis, dois aplicativos podem ser executados lado a lado ou
+ um acima do outro no modo de <em>tela dividida</em>. Em dispositivos de TV, os aplicativos podem
+ usar o modo de <em>imagem em imagem</em> para continuar a reprodução do vídeo enquanto os usuários
+ interagem com outro aplicativo.
+</p>
+
+<p>
+ Se você compilar o aplicativo com o N Preview SDK, poderá configurar como o aplicativo
+ processa a exibição de várias janelas. Por exemplo, você pode especificar as dimensões
+mínimas permitidas para a atividade. Você também pode desativar a exibição de várias janelas para
+ o aplicativo, garantindo que o sistema mostre o aplicativo apenas
+em modo de tela inteira.
+</p>
+
+<h2 id="overview">Visão geral</h2>
+
+<p>
+ O Android N permite que diversos aplicativos compartilhem a tela ao mesmo tempo. Por
+ exemplo, um usuário pode dividir a tela para visualizar uma página da web no lado esquerdo
+ e compor um e-mail no lado direito. A experiência do usuário depende do
+ dispositivo:
+</p>
+
+<ul>
+ <li>Os dispositivos portáteis que executam o Android N oferecem o
+ modo de tela dividida. Nesse modo, o sistema preenche a tela com dois aplicativos, exibindo-os
+ lado a lado ou um acima do outro. O usuário pode arrastar a linha divisória
+ que separa os dois para que um aplicativo fique maior e o outro menor.
+ </li>
+
+ <li>No Nexus Player executando Android N, os aplicativos podem entrar
+ no <a href="picture-in-picture.html">modo de imagem em imagem</a>, o que permite
+ que continuem a exibir conteúdo enquanto o usuário navega ou interage com
+ outros aplicativos.
+ </li>
+
+ <li>Fabricantes de dispositivos maiores podem optar pelo modo de
+ forma livre, em que o usuário pode redimensionar livremente cada atividade. Se o
+ fabricante ativar esse recurso, o dispositivo oferecerá o modo de forma livre
+ e o modo de tela dividida.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>Figura 1.</strong> Dois aplicativos executando lado a lado em modo de tela dividida.
+</p>
+
+<p>
+ O usuário pode mudar para o modo de várias janelas das seguintes maneiras:
+</p>
+
+<ul>
+ <li>Se o usuário abrir a <a href="{@docRoot}guide/components/recents.html">tela
+ Overview</a> e pressionar longamente um
+ título de atividade, poderá arrastá-la para uma parte destacada da
+ tela para colocá-la no modo de várias janelas.
+ </li>
+
+ <li>Se o usuário pressionar longamente o botão Overview, o dispositivo colocará
+ a atividade atual no modo de várias janelas e abrirá a tela Overview para
+ permitir que o usuário escolha outra atividade para compartilhar a tela.
+ </li>
+</ul>
+
+<p>
+ Os usuários podem <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastar e
+ soltar</a> dados de uma atividade para outra enquanto as atividades compartilham
+ a tela. (Anteriormente, os usuários podiam apenas arrastar e soltar dados em uma única
+ atividade.)
+</p>
+
+<h2 id="lifecycle">Ciclo de vida do modo de várias janelas</h2>
+
+<p>
+ O modo de várias janelas não altera o <a href="{@docRoot}training/basics/activity-lifecycle/index.html">ciclo de vida
+ da atividade</a>.
+</p>
+
+<p>
+ No modo de várias janelas, somente a atividade com a qual o usuário interagiu mais recentemente
+ fica ativa em um determinado momento. Essa atividade é considerada a atividade <em>superior</em>.
+ Todas as outras atividades ficam no estado pausado, mesmo se visíveis.
+ No entanto, o sistema atribui a essas atividades pausadas, mas visíveis, uma prioridade maior
+ que a das atividades não visíveis. Se o usuário interagir com uma das
+ atividades pausadas, ela será retomada e a atividade previamente superior
+ será pausada.
+</p>
+
+<p class="note">
+ <strong>Observação:</strong> em modo de suporte a várias janelas, um aplicativo pode estar no estado
+ pausado e continuar visível ao usuário. Pode ser necessário que um aplicativo continue com suas
+ atividades, mesmo se pausado. Por exemplo, um aplicativo que reproduz vídeo e que está no
+ modo pausado, mas visível, deve continuar a exibir o vídeo. Por esse
+ motivo, recomendamos que atividades que reproduzem vídeo <em>não</em> pausem o
+ vídeo nos manipuladores {@link android.app.Activity#onPause onPause()}.
+ Em vez disso, o vídeo deve ser pausado em {@link android.app.Activity#onStop
+ onStop()} e a reprodução retomada em {@link android.app.Activity#onStart
+ onStart()}.
+</p>
+
+<p>
+ Quando o usuário coloca um aplicativo no modo de várias janelas, o sistema notifica a
+ atividade sobre a mudança de configuração, como especificado em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento de alterações
+ no tempo de execução</a>. Isso também acontece quando o usuário redimensiona o aplicativo ou
+ coloca-o novamente no modo de tela cheia.
+ Essencialmente, essa alteração afeta
+ o ciclo de vida da atividade da mesma forma que quando o sistema notifica o aplicativo de que o dispositivo mudou
+ do modo de retrato para paisagem, exceto que as dimensões do dispositivo são
+ alteradas, em vez de simplesmente permutadas. Como discutido em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento de alterações
+ no tempo de execução</a>, a sua atividade pode processar ela mesma a mudança de configuração ou
+ permitir que o sistema destrua a atividade e recrie-a com as novas
+ dimensões.
+</p>
+
+<p>
+ Se o usuário redimensionar uma janela e aumentar uma de suas dimensões, o
+ sistema redimensionará a atividade para corresponder à ação do usuário e emitirá <a href="{@docRoot}guide/topics/resources/runtime-changes.html">mudanças de tempo de execução</a>
+ conforme necessário. Se o aplicativo demorar a desenhar nas áreas recém-expostas, o
+ sistema preencherá temporariamente essas áreas com a cor especificada pelo atributo {@link
+ android.R.attr#windowBackground windowBackground} ou pelo atributo de estilo padrão
+ <code>windowBackgroundFallback</code>.
+</p>
+
+<h2 id="configuring">Configuração do aplicativo para o modo de várias janelas</h2>
+
+<p>
+ Se o seu aplicativo for direcionado ao Android N, você poderá configurar como
+ e se as atividades do aplicativo suportam a exibição em várias janelas. Você pode definir
+ atributos no manifesto para controlar o tamanho e o layout.
+ As configurações de atributos de uma atividade raiz se aplicam a todas as atividades
+ em sua pilha de tarefas. Por exemplo, se a atividade raiz tiver
+ <code>android:resizeableActivity</code> definido como true, todas as atividades
+ na pilha de tarefas serão redimensionáveis.
+</p>
+
+<p class="note">
+ <strong>Observação:</strong> se você compilar um aplicativo com várias orientações usando uma versão
+ do SDK anterior ao Android N e o usuário usar o aplicativo em
+ modo de suporte a várias janelas, o sistema redimensionará forçosamente o aplicativo. O sistema apresenta uma
+ caixa de diálogo avisando o usuário de que o aplicativo pode se comportar de forma inesperada. O sistema
+ <em>não</em> redimensiona aplicativos de orientação fixa; se
+ o usuário tentar abrir um aplicativo de orientação fixa no modo de várias janelas,
+ o aplicativo ocupará toda a tela.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ Defina esse atributo no nó <code><activity></code> ou
+ <code><application></code> em seu manifesto para ativar ou desativar a exibição em
+ várias telas:
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ Se esse atributo for definido como verdadeiro, a atividade poderá ser inicializada nos
+ modos de tela dividida e forma livre. Se o atributo for definido como falso, a
+ atividade não oferecerá suporte ao modo de várias janelas. Se esse valor for falso e o
+ usuário tentar iniciar a atividade no modo de várias janelas, a atividade ocupará
+ a tela inteira.
+</p>
+
+<p>
+ Se o aplicativo for direcionado ao Android N, mas o valor desse atributo não for
+ especificado, o atributo assumirá o valor padrão de verdadeiro.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ Defina esse atributo no nó <code><activity></code> ou no seu manifesto para
+ indicar se a atividade oferece suporte à exibição no modo de imagem em imagem. Esse
+ atributo será ignorado se <code>android:resizeableActivity</code> for falso.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">Atributos de layout</h3>
+
+<p>
+ No Android N, o elemento de manifesto <code><layout></code>
+ oferece suporte a diversos atributos que afetam o comportamento da atividade no
+ modo de várias janelas:
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ Largura padrão da atividade quando iniciada no modo de forma livre.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ Altura padrão da atividade quando iniciada no modo de forma livre.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ Posicionamento inicial da atividade quando iniciada no modo de forma livre. Consulte a
+ referência de {@link android.view.Gravity} para obter os valores adequados.
+ </dd>
+
+ <dt>
+ <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
+ </dt>
+
+ <dd>
+ Altura mínima e largura mínima para a atividade nos modos de tela dividida
+ e forma livre. Se o usuário mover o divisor no modo de tela dividida
+ para tornar uma atividade menor que o mínimo especificado, o sistema recortará
+ a atividade para o tamanho solicitado pelo usuário.
+ </dd>
+</dl>
+
+<p>
+ Por exemplo, o código a seguir mostra como especificar um tamanho e uma localização
+ padrão para a atividade, bem como o tamanho mínimo, quando a atividade é exibida no
+ modo de forma livre:
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalHeight="450dp"
+ android:minimalWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">Execução do aplicativo no modo de várias janelas</h2>
+
+<p>
+ O Android N oferece nova funcionalidade para dar suporte a aplicativos que podem ser executados
+ no modo de várias janelas.
+</p>
+
+<h3 id="disabled-features">Recursos desativados no modo de várias janelas</h3>
+
+<p>
+ Alguns recursos são desativados ou ignorados quando um dispositivo está no modo de
+ várias janelas, pois não fazem sentido para uma atividade que pode estar compartilhando a
+ tela do dispositivo com outras atividades ou aplicativos. Esses recursos incluem:
+
+<ul>
+ <li>Algumas opções de personalização de <a href="{@docRoot}training/system-ui/index.html">IU do sistema</a>
+ são desativadas. Por exemplo, os aplicativos não podem ocultar a barra de status
+ se não estiverem executando no modo de tela cheia.
+ </li>
+
+ <li>O sistema ignora as alterações no atributo <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code>.
+ </li>
+</ul>
+
+<h3 id="change-notification">Notificações e consultas de mudança no modo de várias janelas</h3>
+
+<p>
+ Os novos métodos a seguir foram adicionados à classe {@link android.app.Activity}
+ para oferecer suporte à exibição em várias janelas. Para obter detalhes sobre cada método, consulte a
+ <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
+ do N Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.isInMultiWindowMode()</code>
+ </dt>
+
+ <dd>
+ Chame para descobrir se a atividade está no modo de várias janelas.
+ </dd>
+
+ <dt>
+ <code>Activity.isInPictureInPictureMode()</code>
+ </dt>
+
+ <dd>
+ Chame para descobrir se a atividade está no modo de imagem em imagem.
+
+ <p class="note">
+ <strong>Observação:</strong> o modo de imagem em imagem é um caso especial do
+ modo de várias janelas. Se <code>myActivity.isInPictureInPictureMode()</code>
+ retornar true, <code>myActivity.isInMultiWindowMode()</code> também
+ retornará true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowModeChanged()</code>
+ </dt>
+
+ <dd>
+ O sistema chama esse método sempre que a atividade entra ou sai do
+ modo de várias janelas. O sistema passará ao método o valor true se a
+ atividade entrar no modo de várias janelas e false se a atividade
+ sair do modo de várias janelas.
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureModeChanged()</code>
+ </dt>
+
+ <dd>
+ O sistema chama esse método sempre que a atividade entra ou sai do
+ modo de imagem em imagem. O sistema passará ao método o valor true se
+ a atividade entrar no modo de várias janelas e false se a atividade
+ sair do modo de várias janelas.
+ </dd>
+</dl>
+
+<p>
+ Existem também versões de {@link android.app.Fragment} para cada um desses
+ métodos como, por exemplo, <code>Fragment.isInMultiWindowMode()</code>.
+</p>
+
+<h3 id="entering-pip">Entrar no modo de imagem em imagem</h3>
+
+<p>
+ Para colocar uma atividade no modo de imagem em imagem, chame o novo método
+ <code>Activity.enterPictureInPictureMode()</code>. Esse método não terá efeito se
+ o dispositivo não oferecer suporte ao modo de imagem em imagem. Para obter mais informações,
+ consulte a documentação do modo <a href="picture-in-picture.html">imagem em imagem</a>.
+</p>
+
+<h3 id="launch">Iniciar novas atividades no modo de várias janelas</h3>
+
+<p>
+ Quando você iniciar uma nova atividade, poderá indicar ao sistema que a
+ a nova atividade deverá ser exibida adjacente à atual, se possível. Para fazer
+ isso, use o sinalizador
+ <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. A passagem
+ desse sinalizador solicita o seguinte comportamento:
+</p>
+
+<ul>
+ <li>Se o dispositivo estiver no modo de tela dividida, o sistema tentará criar a
+ nova atividade ao lado da atividade que a iniciou para que as duas atividades
+ compartilhem a tela. Nem sempre o sistema conseguirá fazer isso, mas as
+ atividades ficarão adjacentes, se possível.
+ </li>
+
+ <li>Se o dispositivo não estiver no modo de tela dividida, esse sinalizador não terá efeito.
+ </li>
+</ul>
+
+<p>
+ Se um dispositivo estiver no modo de forma livre e você iniciar uma nova atividade, poderá
+ especificar as dimensões e a posição na tela da nova atividade chamando
+ <code>ActivityOptions.setLaunchBounds()</code>. Esse método não terá efeito se
+ o dispositivo não estiver no modo de várias janelas.
+</p>
+
+<p class="note">
+ <strong>Observação:</strong> se você iniciar uma atividade em uma pilha de tarefas, essa
+ atividade substituirá a atividade na tela, herdando todas as
+ propriedades de suporte a várias janelas. Se você quiser iniciar a nova atividade como janela
+ separada no modo de várias janelas, inicie essa atividade em uma nova pilha de tarefas.
+</p>
+
+<h3 id="dnd">Suporte a arrastar e soltar</h3>
+
+<p>
+ Os usuários podem <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastar e
+ soltar</a> dados de uma atividade para outra enquanto as duas atividades
+ compartilham a tela. (Anteriormente, os usuários podiam apenas arrastar e soltar dados em uma
+ única atividade.) Por esse motivo, se o aplicativo não tem a funcionalidade de arrastar e soltar,
+ pode ser uma boa ideia adicioná-la.
+</p>
+
+<p>
+ O N Preview SDK estende o pacote <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+ para oferecer suporte ao recurso arrastar e soltar entre aplicativos. Para obter detalhes sobre os seguintes
+ métodos e classes, consulte a <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
+ do Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ Objeto token responsável por especificar as permissões concedidas ao aplicativo
+ que recebe uma ação de soltar.
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Novo alias de {@link android.view.View#startDrag View.startDrag()}. Para
+ ativar o recurso de arrastar e soltar entre atividades, passe o novo sinalizador
+ <code>View.DRAG_FLAG_GLOBAL</code>. Se você precisar conceder permissões de URI à
+ atividade de destino, passe os novos sinalizadores,
+ <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> ou
+ <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, conforme o caso.
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Cancela uma operação de arrastar em andamento. Somente pode ser chamado
+ pelo aplicativo que originou a operação de arrastar.
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ Substitui a sombra de arrastar para uma operação de arrastar em andamento. Somente
+ pode ser chamado pelo aplicativo que originou a operação de arrastar.
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ Solicita as permissões dos URIs de conteúdo passados com {@link
+ android.content.ClipData} contidos em {@link android.view.DragEvent}.
+ </dd>
+</dl>
+
+<h2 id="testing">Teste do suporte a várias janelas em seu aplicativo</h2>
+
+<p>
+ Atualizando ou não o seu aplicativo para o Android N, você deve
+ verificar como ele se comporta no modo de várias janelas, pois um usuário pode tentar iniciá-lo
+ no modo de várias janelas em um dispositivo executando o Android N.
+</p>
+
+<h3 id="configuring">Configuração de um dispositivo de teste</h3>
+
+<p>
+ Se você instalar o Android N em um dispositivo, o modo de tela dividida
+ será instalado automaticamente.
+</p>
+
+<h3 id="test-non-n">Se o aplicativo não foi compilado com o N Preview SDK</h3>
+
+<p>
+ Se você não compilou o aplicativo com o N Preview SDK e o usuário tentar usar
+ o aplicativo no modo de várias janelas, o sistema redimensionará obrigatoriamente o aplicativo, a menos que este
+ declare uma orientação fixa.
+</p>
+
+<p>
+ Se o aplicativo não declarar uma orientação fixa, inicie o aplicativo
+ em um dispositivo executando Android N e tente colocar o aplicativo no modo
+ de tela dividida. Verifique se a experiência do usuário é
+ aceitável quando o aplicativo é redimensionado obrigatoriamente.
+</p>
+
+<p>
+ Se o aplicativo declarar uma orientação fixa, você deverá tentar colocá-lo no
+ modo de várias janelas. Verifique se, ao fazê-lo, o aplicativo continua
+ no modo de tela cheia.
+</p>
+
+<h3 id="test-mw">Se você oferecer suporte ao modo de várias janelas</h3>
+
+<p>
+ Se você compilar o aplicativo com o N Preview SDK e não tiver desativado o
+ suporte a várias janelas, verifique o comportamento a seguir nos modos de tela dividida
+ e forma livre.
+</p>
+
+<ul>
+ <li>Inicie o aplicativo em modo de tela inteira e mude para o modo de várias janelas
+ pressionando longamente o botão Overview. Verifique se o aplicativo alterna corretamente.
+ </li>
+
+ <li>Inicie o aplicativo diretamente no modo de várias janelas e verifique se o aplicativo
+ é iniciado corretamente. Você pode iniciar um aplicativo no modo de várias telas pressionando o
+ botão Overview, pressionando longamente a barra de título do aplicativo e arrastando-o
+ para uma das áreas destacadas na tela.
+ </li>
+
+ <li>Redimensione o aplicativo no modo de tela dividida, arrastando a linha divisora.
+ Verifique se o aplicativo é redimensionado sem falhar e se os elementos de IU necessários
+ estão visíveis.
+ </li>
+
+ <li>Se você especificou dimensões mínimas para o aplicativo, tente redimensionar
+ o aplicativo abaixo dessas dimensões. Verifique se não é possível redimensionar o aplicativo
+ para um tamanho menor que o mínimo especificado.
+ </li>
+
+ <li>Em todos os testes, verifique se o desempenho do aplicativo é aceitável. Por
+ exemplo, verifique se há uma demora muito grande para atualizar a IU após o
+ redimensionamento do aplicativo.
+ </li>
+</ul>
+
+<h4 id="test-checklist">Lista de verificação de teste</h4>
+
+<p>
+ Para verificar o desempenho do aplicativo no modo de várias janelas, experimente as operações
+ a seguir. Você deve tentar essas operações nos modos de tela dividida e
+ várias telas, exceto onde houver instruções diferentes.
+</p>
+
+<ul>
+ <li>Entre e saia do modo de várias janelas.
+ </li>
+
+ <li>Alterne do seu aplicativo para outro e verifique se o seu aplicativo se comporta
+ corretamente enquanto visível, mas não ativo. Por exemplo, se o seu aplicativo estiver
+ reproduzindo vídeo, verifique se a reprodução não é interrompida quando o usuário
+ interage com outro aplicativo.
+ </li>
+
+ <li>No modo de tela dividida, tente mover a barra divisora para aumentar e reduzir
+ o tamanho do aplicativo. Tente essas operações nas configurações lado a lado
+ e um acima do outro. Verifique se o aplicativo não falha,
+ se a funcionalidade essencial fica visível e se a operação de redimensionamento não demora
+ demais.
+ </li>
+
+ <li>Execute várias operações de redimensionamento em rápida sucessão. Verifique se o
+ aplicativo não falha nem apresenta vazamento de memória. Para obter informações sobre como verificar o uso de memória
+ do aplicativo, consulte <a href="{@docRoot}tools/debugging/debugging-memory.html">
+ Investigação do uso de RAM</a>.
+ </li>
+
+ <li>Use o aplicativo normalmente em diversas configurações diferentes de janela e
+ verifique se o aplicativo se comporta corretamente. Verifique se o texto é legível e se os
+ elementos de IU não ficam pequenos demais para a interação.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">Se você desativou o suporte a várias janelas</h3>
+
+<p>
+ Se você desativou o suporte a várias janelas definindo
+ <code>android:resizableActivity="false"</code>, inicie o aplicativo em
+ um dispositivo executando Android N e tente colocá-lo nos modos
+ de forma livre e tela dividida. Verifique se, ao fazê-lo, o aplicativo continua
+ no modo de tela cheia.
+</p>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/notifiers/notifications.jd
index 42563ac..d3fb4cf 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/notifiers/notifications.jd
@@ -92,7 +92,7 @@
<p>As notificações, como parte importante da interface do usuário do Android, possuem as próprias diretrizes de projeto.
As alterações do Material Design introduzidas no Android 5.0 (API de nível 21) são de importância
específica e, por isso, recomenda-se revisar o treinamento do <a href="{@docRoot}training/material/index.html">Material Design</a>
- para obter mais informações. Para saber como projetar notificações e suas interações, leia o guia de projeto
+ para obter mais informações. Para saber como projetar notificações e suas interações, leia o guia de projeto
<a href="{@docRoot}design/patterns/notifications.html">Notificações</a>.</p>
<h2 id="CreateNotification">Criação de uma notificação</h2>
@@ -451,14 +451,14 @@
Adicione compatibilidade com Android 4.0.3 e mais antigos. Para fazer isto, especifique o pai
da {@link android.app.Activity} que está iniciando adicionando um elemento
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code>
- como o filho de
+ como o filho de
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>.
<p>
- Para este elemento, defina
+ Para este elemento, defina
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#nm">android:name</a>="android.support.PARENT_ACTIVITY"</code>.
Defina
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#val">android:value</a>="<parent_activity_name>"</code>,
- onde <code><parent_activity_name></code> é o valor de
+ onde <code><parent_activity_name></code> é o valor de
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#nm">android:name</a></code>
para o elemento
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/overview.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/overview.jd
index d12bfe5..d82ecf7 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/overview.jd
@@ -4,12 +4,12 @@
<p>Todos os elementos da interface do usuário em um aplicativo para Android são criados usando objetos {@link android.view.View} e
{@link android.view.ViewGroup}. Uma {@link android.view.View} é um objeto que desenha
-algo na tela com o qual o usuário pode interagir. Um {@link android.view.ViewGroup} é um
+algo na tela com o qual o usuário pode interagir. Um {@link android.view.ViewGroup} é um
objeto que contém outros objetos {@link android.view.View} (e {@link android.view.ViewGroup}) para
definir o layout da interface.</p>
<p>O Android fornece uma coleção de subclasses {@link android.view.View} e {@link
-android.view.ViewGroup} que oferecem controles de entrada comuns (como botões e campos de
+android.view.ViewGroup} que oferecem controles de entrada comuns (como botões e campos de
texto) e vários modelos de layout (como um layout linear ou relativo).</p>
@@ -30,7 +30,7 @@
criar uma árvore. Mas a forma mais fácil e efetiva de definir o layout é com um arquivo XML.
O XML oferece uma estrutura legível por humanos para o layout, similar a HTML.</p>
-<p>O nome de um elemento XML para uma vista é respectivo à classe do Android que ele representa. Portanto, um elemento
+<p>O nome de um elemento XML para uma vista é respectivo à classe do Android que ele representa. Portanto, um elemento
<code><TextView></code> cria um widget {@link android.widget.TextView} na IU
e um elemento <code><LinearLayout></code> cria um grupo de vistas de {@link android.widget.LinearLayout}
. </p>
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>Para obter um guia completo para criar um layout de IU, consulte <a href="declaring-layout.html">Layouts
XML</a>.
-
+
<h2 id="UIComponents">Componentes da interface do usuário</h2>
<p>Você não precisa criar toda a IU usando objetos {@link android.view.View} e {@link
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/settings.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/settings.jd
index f95966c..c00b461 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/settings.jd
@@ -82,7 +82,7 @@
<img src="{@docRoot}images/ui/settings/settings.png" alt="" width="435" />
<p class="img-caption"><strong>Figura 1.</strong> Capturas de tela das configurações do aplicativo Mensagens
-do Android. A seleção de um item definido por uma {@link android.preference.Preference}
+do Android. A seleção de um item definido por uma {@link android.preference.Preference}
abre uma interface para alterar a configuração.</p>
@@ -120,8 +120,8 @@
</ul>
<p>Como a IU de configurações do aplicativo é criada com objetos {@link android.preference.Preference}
- em vez de objetos
-{@link android.view.View}, é preciso usar uma subclasse {@link android.app.Activity} ou
+ em vez de objetos
+{@link android.view.View}, é preciso usar uma subclasse {@link android.app.Activity} ou
{@link android.app.Fragment} especializada para exibir as configurações de lista:</p>
<ul>
@@ -226,8 +226,8 @@
<dt>{@code android:key}</dt>
<dd>Esse atributo é necessário para preferências que persistem a um valor de dados. Ele especifica a chave
exclusiva (uma string) que o sistema usa ao salvar o valor dessa configuração em {@link
-android.content.SharedPreferences}.
- <p>As únicas instâncias em que esse atributo é <em>dispensável</em> ocorrem quando a preferência é um
+android.content.SharedPreferences}.
+ <p>As únicas instâncias em que esse atributo é <em>dispensável</em> ocorrem quando a preferência é um
{@link android.preference.PreferenceCategory} ou {@link android.preference.PreferenceScreen},
ou quando a preferência especifica um {@link android.content.Intent} para invocar (com um elemento <a href="#Intents">{@code <intent>}</a>) ou um {@link android.app.Fragment} para exibir (com um atributo <a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
android:fragment}</a>).</p>
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -311,7 +311,7 @@
<h4 id="Subscreens">Uso de subtelas</h4>
-<p>Para usar grupos de configurações em uma subtela (como ilustrado na figura 3), coloque o grupo
+<p>Para usar grupos de configurações em uma subtela (como ilustrado na figura 3), coloque o grupo
de objetos {@link android.preference.Preference} dentro de {@link
android.preference.PreferenceScreen}.</p>
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -636,7 +636,7 @@
<h3 id="DisplayHeaders">Exibição de cabeçalhos</h3>
<p>Para exibir os cabeçalhos de preferência, é preciso implementar o método de retorno de chamada {@link
-android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} e chamar
+android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} e chamar
{@link android.preference.PreferenceActivity#loadHeadersFromResource
loadHeadersFromResource()}. Por exemplo:</p>
@@ -672,15 +672,15 @@
carregar.</p>
<p>Por exemplo, abaixo há um arquivo XML de cabeçalhos de preferência usado no Android 3.0
-e posterior ({@code res/xml/preference_headers.xml}):</p>
+e posterior ({@code res/xml/preference_headers.xml}):</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -692,18 +692,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/pt-br/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/ui-events.jd
index e0ace1d..2f88248 100644
--- a/docs/html-intl/intl/pt-br/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/ui-events.jd
@@ -30,7 +30,7 @@
chamadas de <a href="#EventListeners">escutas de evento</a>, são a sua passagem para capturar a interação do usuário com a IU.</p>
<p>Geralmente, as escutas de evento são usadas para escutar a interação do usuário.
-No entanto, há casos em que você pode querer estender uma classe View para criar um componente personalizado.
+No entanto, há casos em que você pode querer estender uma classe View para criar um componente personalizado.
Talvez você queira estender a classe {@link android.widget.Button}
para deixar algo mais extravagante. Neste caso, você poderá definir os comportamentos de evento padrão
para a classe usando <a href="#EventHandlers">manipuladores de evento</a>.</p>
@@ -46,27 +46,27 @@
<dl>
<dt><code>onClick()</code></dt>
- <dd>De {@link android.view.View.OnClickListener}.
+ <dd>De {@link android.view.View.OnClickListener}.
Isto é chamado quando o usuário toca no item
(no modo de toque), ou atribui foco ao item com as teclas de navegação ou cursor de bola
e pressiona a tecla "enter" adequada ou pressiona o cursor de bola.</dd>
<dt><code>onLongClick()</code></dt>
- <dd>De {@link android.view.View.OnLongClickListener}.
+ <dd>De {@link android.view.View.OnLongClickListener}.
Isto é chamado quando o usuário toca e mantém o item pressionado (no modo de toque),
ou atribui foco ao item com as teclas de navegação ou cursor de bola
e mantém pressionada a tecla "enter" adequada ou o cursor de bola (por um segundo).</dd>
<dt><code>onFocusChange()</code></dt>
- <dd>De {@link android.view.View.OnFocusChangeListener}.
+ <dd>De {@link android.view.View.OnFocusChangeListener}.
Isto é chamado quando o usuário navega no ou do item, usando as teclas de navegação ou cursor de bola.</dd>
<dt><code>onKey()</code></dt>
- <dd>De {@link android.view.View.OnKeyListener}.
+ <dd>De {@link android.view.View.OnKeyListener}.
Isto é chamado quando o usuário está com foco no item ou solta uma tecla de hardware no dispositivo.</dd>
<dt><code>onTouch()</code></dt>
- <dd>De {@link android.view.View.OnTouchListener}.
+ <dd>De {@link android.view.View.OnTouchListener}.
Isto é chamado quando o usuário realiza uma ação qualificada como um toque de evento, incluindo o pressionamento, a liberação,
ou qualquer outro gesto de movimento na tela (dentro dos limites do item).</dd>
<dt><code>onCreateContextMenu()</code></dt>
- <dd>De {@link android.view.View.OnCreateContextMenuListener}.
+ <dd>De {@link android.view.View.OnCreateContextMenuListener}.
Isto é chamado quando um menu de contexto está sendo construído (como resultado de um "clique longo"). Consulte a discussão
sobre menus de contexto no guia do desenvolvedor <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Menus</a>
.</dd>
@@ -75,8 +75,8 @@
<p>Esses métodos são os únicos habitantes de suas respectivas interfaces. Para definir um desses métodos
e lidar com seus eventos, implemente a interface aninhada na atividade ou defina-a como uma classe anônima.
Em seguida, passe uma instância da implementação
-para o respectivo método <code>View.set...Listener()</code>. (Ex.:, chame
-<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
+para o respectivo método <code>View.set...Listener()</code>. (Ex.:, chame
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
e passe-o à implementação de {@link android.view.View.OnClickListener OnClickListener}.)</p>
<p>O exemplo abaixo mostra como registrar uma escuta de clique para um botão. </p>
@@ -121,17 +121,17 @@
não tem valor de retorno, mas outros métodos de escuta de evento podem retornar um booleano. O motivo
depende do evento. Para os poucos que retornam, apresenta-se a razão:</p>
<ul>
- <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
- Isto retorna um booleano para indicar se você consumiu o evento e se ele deve ser levado adiante.
- Ou seja, ele retorna <em>verdadeiro</em> para indicar que você lidou com o evento e não deve seguir adiante;
+ <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
+ Isto retorna um booleano para indicar se você consumiu o evento e se ele deve ser levado adiante.
+ Ou seja, ele retorna <em>verdadeiro</em> para indicar que você lidou com o evento e não deve seguir adiante;
ou retorna <em>falso</em> caso você não tenha lidado com ele e/ou o evento deva continuar para qualquer
outra escuta de clique.</li>
- <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
+ <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
Isto retorna um booleano para indicar se você consumiu o evento e se ele deve ser levado adiante.
- Ou seja, ele retorna <em>verdadeiro</em> para indicar que você lidou com o evento e não deve seguir adiante;
+ Ou seja, ele retorna <em>verdadeiro</em> para indicar que você lidou com o evento e não deve seguir adiante;
ou retorna <em>falso</em> caso você não tenha lidado com ele e/ou o evento deva continuar para qualquer
outra escuta de tecla.</li>
- <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
+ <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
Isto retorna um booleano para indicar se a escuta consome este evento. O importante é que este evento
pode possuir várias ações que se seguem mutuamente. Portanto, se retornar <em>falso</em> quando
o evento de ação inferior for recebido, você indicará que não consumiu o evento e que não está
@@ -181,14 +181,14 @@
dentro de um layout, considere esses outros métodos:</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code> - Isto permite que {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code> - Isto permite que {@link
android.app.Activity} intercepte todos os evento de toque antes de serem enviados à janela.</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - Isto permite que {@link
android.view.ViewGroup} assista aos eventos à medida que são enviados para as vistas filho.</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - Chame isto
- sobre uma Vista pai para indicar que ela não deve interceptar eventos de toque com <code>{@link
+ sobre uma Vista pai para indicar que ela não deve interceptar eventos de toque com <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>.</li>
</ul>
@@ -199,7 +199,7 @@
ver o que aceitará entrada. Se o dispositivo tiver capacidades de toque, no entanto, e o usuário
começar a interagir com a interface por meio de toque, então não é mais necessário
destacar itens ou fornecer foco para uma vista específica. Contudo, há um modo
-de interação chamado "modo de toque".
+de interação chamado "modo de toque".
</p>
<p>
Para dispositivos com capacidades de toque, quando o usuário toca na tela, o dispositivo
@@ -214,7 +214,7 @@
com a interface do usuário sem tocar na tela.
</p>
<p>
-O estado de modo de toque é mantido em todo o sistema (todas as janelas e atividades).
+O estado de modo de toque é mantido em todo o sistema (todas as janelas e atividades).
Para consultar o estado atual, é possível chamar
{@link android.view.View#isInTouchMode} para ver se o dispositivo está no modo de toque no momento.
</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/pt-br/preview/_book.yaml b/docs/html-intl/intl/pt-br/preview/_book.yaml
deleted file mode 100644
index 8f75c9a..0000000
--- a/docs/html-intl/intl/pt-br/preview/_book.yaml
+++ /dev/null
@@ -1,342 +0,0 @@
-toc:
-- title: Visão geral do programa
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ikhtisar Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: Suporte e notas da versão
- path: /preview/support.html
-
-- title: Configuração do Preview
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Preview
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: Testar em um dispositivo
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Pruebe en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: Mudanças de comportamento
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: Otimizações em segundo plano
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: Idioma e localidade
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 總覽
- section:
- - title: Suporte a várias janelas
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: Notificações
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: Economia de dados
- path: /preview/features/data-saver.html
- - title: Gravação para TV
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: Configurações de segurança de rede
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: Suporte a ICU4J
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: APIs de estrutura do Android para ICU4J
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android 框架 API
- - name: zh-tw-lang
- value: ICU4J Android 架構 API
- - title: Recursos de linguagem do Java 8
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 语言功能
- - name: zh-tw-lang
- value: Java 8 語言功能
- - title: Atualizações no Android for Work
- path: /preview/features/afw.html
- - title: Acesso a diretórios com escopo
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: Amostras
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: Contrato de licença
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html-intl/intl/pt-br/preview/api-overview.jd b/docs/html-intl/intl/pt-br/preview/api-overview.jd
deleted file mode 100644
index c16d847..0000000
--- a/docs/html-intl/intl/pt-br/preview/api-overview.jd
+++ /dev/null
@@ -1,1039 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Principais recursos para desenvolvedores</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">Suporte a várias janelas</a></li>
- <li><a href="#notification_enhancements">Notificações</a></li>
- <li><a href="#jit_aot">Compilação JIT/AOT</a></li>
- <li><a href="#quick_path_to_app_install">Caminho rápido para a instalação de aplicativos</a></li>
- <li><a href="#doze_on_the_go">Modo soneca em movimento</a></li>
- <li><a href="#background_optimizations">Otimizações em segundo plano</a></li>
- <li><a href="#data_saver">Economia de dados</a></li>
- <li><a href="#vulkan">Vulkan API</a></li>
- <li><a href="#tile_api">Quick Settings Tile API</a></li>
- <li><a href="#number-blocking">Bloqueio de número</a></li>
- <li><a href="#call_screening">Triagem de chamadas</a></li>
- <li><a href="#multi-locale_languages">Localidades e idiomas</a></li>
- <li><a href="#emoji">Novos emoticons</a></li>
- <li><a href="#icu4">ICU4J APIs no Android</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Gravação do Android TV</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">Acessibilidade</a></li>
- <li><a href="#direct_boot">Inicialização direta</a></li>
- <li><a href="#key_attestation">Confirmação de chaves</a></li>
- <li><a href="#network_security_config">Configuração de segurança de rede</a></li>
- <li><a href="#default_trusted_ca">CA confiável padrão</a></li>
- <li><a href="#apk_signature_v2">Esquema de assinatura de APK v2</a></li>
- <li><a href="#scoped_directory_access">Acesso a diretórios com escopo</a></li>
- <li><a href="#keyboard_shortcuts_helper">Auxiliar de atalhos de teclado</a></li>
- <li><a href="#sustained_performance_api">API de desempenho sustentado</a></li>
- <li><a href="#vr">Suporte a RV</a></li>
- <li><a href="#print_svc">Melhorias nos serviços de impressão</a></li>
- <li><a href="#virtual_files">Arquivos virtuais</a></li>
- <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>O Android N ainda está em desenvolvimento ativo, mas agora você já pode testá-lo
-como parte do N Developer Preview. As seções a seguir destacam alguns dos
-novos recursos para desenvolvedores. </p>
-
-<p>
- Não deixe de conferir as <a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a> para saber mais sobre as
- áreas onde as alterações de plataforma podem afetar os aplicativos, examine os
- guias para desenvolvedores para saber mais sobre os principais recursos e faça o download da <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a> para obter detalhes sobre as
- novas APIs.
-</p>
-
-<h2 id="multi-window_support">Suporte a várias janelas</h2>
-
-
-<p>No Android N, introduzimos um recurso de multitarefa novo e muito solicitado
-na plataforma — o suporte a várias janelas. </p>
-
- <p>Agora os usuários podem abrir dois aplicativos na tela ao mesmo tempo. </p>
- <ul>
- <li>Em celulares e tablets
-executando o Android N, os usuários agora podem executar dois aplicativos lado a lado ou
-um acima do outro em modo de tela dividida. Os usuários podem redimensionar os aplicativos arrastando
-o divisor entre eles. </li>
-
-<li>Em dispositivos Android TV, os aplicativos podem assumir o <a href="{@docRoot}preview/features/picture-in-picture.html">modo imagem em
-imagem</a>, o que permite que continuem a exibir conteúdo enquanto o usuário navega ou
-interage com outros aplicativos.</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>Figura 1.</strong> Aplicativos executando em modo de tela dividida.
-</p>
-
- </div>
-
-<p>O suporte a várias janelas oferece novas formas de envolver os usuários,
-particularmente em tablets e outros dispositivos com telas maiores. Você pode até ativar o recurso de arrastar e soltar
-no aplicativo para permitir que os usuários arrastem conteúdo de ou para o aplicativo — uma ótima
-maneira de aprimorar a experiência do usuário. </p>
-
-<p>É muito fácil adicionar suporte a várias janelas a seu aplicativo e configurar como ele
-lida com exibição em várias janelas. Por exemplo, você pode especificar as dimensões
-mínimas permitidas para sua atividade, evitando que os usuários redimensionem a atividade para abaixo
-deste tamanho. Você também pode desativar a exibição de várias janelas para o aplicativo, o que
- garante que o sistema só mostrará o aplicativo em modo de tela inteira.</p>
-
-<p>
- Para obter mais informações, consulte a documentação para desenvolvedores de <a href="{@docRoot}preview/features/multi-window.html">Suporte a várias janelas</a>
-.
-</p>
-
-<h2 id="notification_enhancements">Aprimoramentos de notificações</h2>
-
-<p>Reformulamos as notificações no Android N para facilitar e agilizar o
-uso. Entre as alterações estão:</p>
-
-<ul>
- <li>
- <strong>Atualizações de modelos</strong>: Estamos atualizando os modelos de notificação para
- colocar mais ênfase na imagem do herói e do avatar. Os desenvolvedores poderão
- aproveitar os novos modelos com ajustes mínimos no código.
- </li>
-
- <li>
- <strong>Personalização de estilo de mensagem</strong>: Você pode personalizar mais
-rótulos de interface de usuário associados às suas notificações usando a classe
-<code>MessageStyle</code>. É possível configurar a mensagem, o título da conversa
-e a visualização de conteúdo.
- </li>
-
- <li>
- <strong>Notificações empacotadas</strong>: O sistema pode agrupar mensagens
- por tópico de mensagem, por exemplo, e exibir o grupo. Um usuário pode
- executar ações, como Dismiss ou Archive, nessa exibição de grupo. Se você
- já implementou notificações para o Android Wear, está familiarizado com
- esse modelo.
- </li>
-
- <li>
- <strong>Resposta direta</strong>: Para aplicativos de comunicação em tempo real, o
- sistema Android oferece suporte a respostas em linha para que os usuários possam responder rapidamente a
- mensagens SMS ou de texto diretamente dentro da interface de notificação.
- </li>
-
- <li>
- <strong>Visualizações personalizadas</strong>: Duas APIs novas permitem utilizar decorações
- do sistema, como cabeçalhos e ações de notificação, durante o uso de visualizações
- personalizadas em notificações.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>Figura 2.</strong> Notificações empacotadas e resposta direta.
-</p>
-
-<p>Para saber como implementar os novos recursos, consulte o
-guia <a href="{@docRoot}preview/features/notification-updates.html">Notificações</a>
-.</p>
-
-
-
-<h2 id="jit_aot">Compilação JIT/AOT orientada a perfil</h2>
-
-<p>No Android N, adicionamos um compilador Just in Time (JIT) com perfis de código para
-ART, o que permite aprimorar constantemente o desempenho de aplicativos Android durante a
-execução. O compilador JIT complementa o compilador atual Ahead of Time (AOT)
- do ART e ajuda a aprimorar o desempenho em tempo de execução, economizar espaço de armazenamento e acelerar atualizações
- de aplicativos e de sistema.</p>
-
-<p>A compilação orientada a perfil permite que o ART gerencie a compilação AOT/JIT de cada aplicativo
-de acordo com o uso real e com as condições no dispositivo. Por
-exemplo, o ART mantém um perfil dos principais métodos do aplicativo e pode pré-compilar
-e armazenar esses métodos em cache para obter o melhor desempenho. As outras partes do aplicativo não são
-compiladas até que sejam realmente utilizadas.</p>
-
-<p>Além de aprimorar o desempenho para as principais partes do aplicativo, a compilação
-ajuda a reduzir o uso geral de recursos de RAM, incluindo os binários
-associados. Esse recurso é particularmente importante em dispositivos com pouca memória.</p>
-
-<p>O ART gerencia a compilação orientada a perfil de forma a minimizar o impacto sobre a
-bateria do dispositivo. A pré-compilação é executada apenas quando o dispositivo está ocioso e
-com a bateria sendo carregada, economizando tempo e bateria com a execução antecipada dessa tarefa.</p>
-
-<h2 id="quick_path_to_app_install">Caminho rápido para a instalação de aplicativos</h2>
-
-<p>Um dos benefícios mais tangíveis do compilador JIT do ART é a velocidade de instalação dos
-aplicativos e das atualizações do sistema. Até mesmo aplicativos grandes, que exigiam vários minutos para
-otimização e instalação no Android 6.0, podem agora ser instalados em
-segundos. As atualizações de sistema também ficaram mais rápidas, pois não existe mais a etapa de otimização. </p>
-
-<h2 id="doze_on_the_go">Modo soneca em movimento...</h2>
-
-<p>O Android 6.0 introduziu o modo soneca, um modo de sistema que economiza bateria adiando
-atividades de CPU e rede dos aplicativos quando o dispositivo está ocioso, como
-quando está em uma mesa ou gaveta. </p>
-
-<p>Agora, no Android N, o modo soneca foi aprimorado e economiza bateria quando em movimento.
-Sempre que a tela ficar desativada por um período e o dispositivo ficar desativado,
-o modo soneca aplicará um subconjunto das restrições familiares de CPU e rede aos aplicativos.
-Isso significa que os usuários podem economizar bateria transportando os dispositivos no
-bolso.</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>Figura 3.</strong> O modo soneca agora aplica
- restrições para aumentar a vida útil da bateria mesmo quando o dispositivo não está estacionário.
-</p>
-
-
-<p>Pouco depois de a tela ser desativada com o dispositivo alimentado pela bateria, o modo soneca
-restringe o acesso de rede e adia trabalhos e sincronizações. Durante breves janelas de
-manutenção, os aplicativos podem acessar a rede e todos os
-trabalhos/sincronizações adiados são executados. A ativação da tela ou do dispositivo
-encerra o modo soneca.</p>
-
-<p>Quando o dispositivo voltar a ficar estacionário, com a tela desativada e alimentado por bateria por um
-período, o modo soneca aplicará as restrições completas de CPU e rede em {@link
-android.os.PowerManager.WakeLock}, alarmes {@link android.app.AlarmManager} e
-verificações de GPS/Wi-Fi.</p>
-
-<p>As práticas recomendadas para adaptar o aplicativo ao modo soneca são as mesmas para
-dispositivos estacionários ou em movimento. Portanto, se você já atualizou o aplicativo para
-processar o modo soneca corretamente, está pronto. Caso contrário, comece a <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">adaptar
- o aplicativo para o modo soneca</a> agora.</p>
-
-<h2 id="background_optimizations">Project Svelte: Otimizações em segundo plano</h2>
-
-<p>O Project Svelte é um esforço contínuo para minimizar o uso de RAM pelo sistema e pelos aplicativos
-nos dispositivos Android existentes no ecossistema. No Android N, o Project
-Svelte se concentra em otimizar a forma de execução dos aplicativos em segundo plano. </p>
-
-<p>O processamento em segundo plano é parte essencial da maioria dos aplicativos. Quando executado corretamente, a experiência
-do usuário pode ficar incrível — imediata, rápida e sensível ao contexto.
-Quando executado incorretamente, o processamento em segundo plano pode consumir desnecessariamente RAM (e
-bateria) e afetar o desempenho do sistema para os outros aplicativos. </p>
-
-<p>Desde o Android 5.0, {@link android.app.job.JobScheduler} é a forma
-preferencial para execução de trabalho em segundo plano de uma maneira que beneficia
-os usuários. Os aplicativos podem agendar trabalhos e permitir que o sistema execute otimizações com base em
-condições de memória, energia e conectividade. O JobScheduler oferece controle e
-simplicidade, e queremos que seja usado por todos os aplicativos. </p>
-
-<p>
- Outra boa opção é o <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GCMNetworkManager</code></a>, parte do Google Play Services, que
- oferece um agendamento de trabalhos similar, compatível com versões legadas do
- Android.
-</p>
-
-<p>Continuamos a expandir o <code>JobScheduler</code> e o
-<code>GCMNetworkManager</code> para atender a mais
-casos de uso — por exemplo, no Android N, você já pode agendar trabalhos
-em segundo plano de acordo com mudanças nos provedores de conteúdo. Ao mesmo tempo, começamos a
-substituir alguns padrões mais antigos que podem reduzir o desempenho do sistema,
-particularmente em dispositivos com pouca memória.</p>
-
-<p>No Android N, estamos removendo três transmissões implícitas de uso comum —
-{@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
-android.hardware.Camera#ACTION_NEW_PICTURE} e {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} —, pois podem despertar simultaneamente
-processos em segundo plano de vários aplicativos, aumentando o consumo de memória e bateria. Se
-o seu aplicativo receber essas transmissões, aproveite o N Developer Preview para
- migrar para o <code>JobScheduler</code> e as APIs relacionadas. </p>
-
-<p>
- Consulte a documentação de <a href="{@docRoot}preview/features/background-optimization.html">Otimizações
-em segundo plano</a> para obter mais detalhes.
-</p>
-
-
-<h2 id="data_saver">Economia de dados</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>Figura 4.</strong> Economia de dados em Settings.
-</p>
- </div>
-
-<p>Normalmente, o custo de um plano de dados de celular ao longo da vida útil do dispositivo móvel
-excede o custo do próprio dispositivo. Para muitos usuários, os dados de celular
-são um recurso caro que querem economizar. </p>
-
-<p>O Android N introduz o modo de Economia de dados, um novo serviço do sistema que ajuda a reduzir
-o uso de dados de celular pelos aplicativos em situações de roaming, perto do final do ciclo de cobrança
-ou em pacotes de dados pré-pagos pequenos. A Economia de dados permite que os usuários controlem o
-uso de dados de celular e possibilita que os desenvolvedores ofereçam serviços mais eficientes quando o modo de Economia
-de dados estiver ativado. </p>
-
-<p>Quando um usuário ativa a Economia de dados em <strong>Settings</strong> e o dispositivo está
-em uma rede tarifada, o sistema bloqueia o uso de dados em segundo plano e avisa aos aplicativos
-para reduzir o uso de dados no primeiro plano sempre que possível — como, por exemplo, limitar a
-taxa de bits de streaming, reduzir a qualidade de imagens, adiar o armazenamento prévio otimista em cache
-e assim por diante. Os usuários podem autorizar aplicativos específicos a usar dados tarifados
-em segundo plano, mesmo com a Economia de dados ativada.</p>
-
-<p>O Android N estende o {@link android.net.ConnectivityManager} para oferecer aos aplicativos uma
-forma de <a href="{@docRoot}preview/features/data-saver.html#status">recuperar as
-preferências do usuário para a Economia de dados</a> e <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">monitorar
-as mudanças de preferências</a>. Todos os aplicativos devem verificar se o usuário ativou a Economia
-de dados e tentar limitar o uso de dados em primeiro e segundo plano.</p>
-
-
-<h2 id="vulkan">Vulkan API</h2>
-
-<p>
- O Android N integra o <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a>, uma nova API de renderização 3D, à plataforma. Como o
- <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
- ES</a>, o Vulkan é um padrão aberto para gráficos e renderização 3D mantido
- pelo Khronos Group.
-</p>
-
-<p>
- O Vulkan foi projetado desde o início para minimizar sobrecargas na CPU do driver
- e permitir que seu aplicativo controle a operação de GPU de forma mais direta. O Vulkan
- também oferece melhor paralelização ao permitir que vários encadeamento realizem
- trabalhos como a construção de buffer de comando de uma só vez.
-</p>
-
-<p>
- As ferramentas de desenvolvimento e bibliotecas do Vulkan se combinam ao Android NDK. Elas
- incluem:
-</p>
-
-<ul>
- <li>Cabeçalhos
- </li>
-
- <li>Camadas de validação (bibliotecas de depuração)
- </li>
-
- <li>Compilador de sombreadores SPIR-V
- </li>
-
- <li>Biblioteca de compilação de sombreadores SPIR-V em tempo de execução
- </li>
-</ul>
-
-<p>
- O Vulkan só está disponível para aplicativos em dispositivos com hardware com capacidade para Vulkan,
- como Nexus 5X, Nexus 6P e Nexus Player Estamos trabalhando em estreita cooperação com nossos
- parceiros para oferecer o Vulkan em mais dispositivos assim que possível.
-</p>
-
-<p>
- Para obter mais informações, consulte a <a href="{@docRoot}ndk/guides/graphics/index.html">documentação da API</a>.
-</p>
-
-<h2 id="tile_api">Quick Settings Tile API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>Figura 5.</strong> Blocos de Configurações rápidas na aba de notificações.
-</p>
-
-
- </div><p>As Configurações rápidas são uma forma popular e simples de expor as principais configurações e ações
-diretamente na aba de notificações. No Android N, ampliamos o escopo das
-Configurações rápidas para aumentar ainda mais a utilidade e a conveniência. </p>
-
-<p>Adicionamos mais espaço para os blocos de Configurações rápidas, que os usuários podem
-acessar em uma área de exibição paginada deslizando à direita ou à esquerda. Além disso,
-permitimos que os usuários controlem quais blocos de Configurações rápidas são exibidos, bem como o local
-em que são exibidos — para adicionar ou mover blocos, os usuários simplesmente arrastam e soltam os blocos. </p>
-
-<p>Para desenvolvedores, o Android N também adiciona uma API nova que permite definir os próprios
-blocos de Configurações rápidas para que os usuários possam acessar facilmente os principais controles e ações do seu aplicativo.</p>
-
-<p>
- Os blocos de Configurações rápidas estão reservados para controles ou ações que são
- urgentemente necessários ou frequentemente usados e não devem ser usados como atalhos para
- iniciar aplicativos.
-</p>
-
-<p>
- Após definir os blocos, você pode disponibilizá-los aos usuários, que por sua vez podem adicioná-los
- às Configurações rápidas usando o recurso de arrastar e soltar.
-</p>
-
-<p>
- Para obter informações sobre a criação de um bloco de aplicativo, consulte a documentação para
- <code>android.service.quicksettings.Tile</code> na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
-</p>
-
-
-
-<h2 id="number-blocking">Bloqueio de número</h2>
-
-<p>O Android N agora oferece suporte a bloqueio de números na plataforma e disponibiliza uma
-API de estrutura para permitir que provedores de serviço mantenham uma lista de números bloqueados. O
- aplicativo padrão de SMS, o aplicativo padrão de telefone e os aplicativos de provedor podem ler e gravar
-a lista de números bloqueados. A lista não está acessível para outros aplicativos.</p>
-
-<p>Ao oferecer o bloqueio de número como recurso padrão da plataforma, o Android oferece
-uma forma consistente de bloqueio de números em uma grande variedade de
-dispositivos. Alguns benefícios que podem ser aproveitados pelos aplicativos são:</p>
-
-<ul>
- <li> Números bloqueados para chamadas também são bloqueados para mensagens de texto
- <li> Números bloqueados podem persistir entre várias redefinições e dispositivos por meio do
-recurso Backup e restauração
- <li> Vários aplicativos podem usar a mesma lista de números bloqueados
-</ul>
-
-<p>Além disso, a integração de aplicativos da operadora por meio do Android significa que as operadoras podem
-ler a lista de números bloqueados no dispositivo e executar um bloqueio do lado do servidor
-para o usuário, impedindo que chamadas e textos indesejados cheguem a ele
-por qualquer meio, como terminais de VOIP ou encaminhamento de telefones.</p>
-
-<p>
- Para obter mais informações, consulte <code>android.provider.BlockedNumberContract</code>
- na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
-da API</a>, disponível para download.
-</p>
-
-<h2 id="call_screening">Triagem de chamadas</h2>
-
-<p>
- O Android N permite que o aplicativo de telefone padrão faça a triagem das chamadas recebidas. O aplicativo
- de telefone faz isso implementando o novo <code>CallScreeningService</code>,
- que permite a execução de diversas ações com base nos
- {@link android.telecom.Call.Details Call.Details} da chamada recebida, como:
-</p>
-
-<ul>
- <li> Rejeitar a chamada recebida
- <li> Não incluir a chamada no registro de chamadas
- <li> Não mostrar ao usuário a notificação da chamada
-</ul>
-
-<p>
- Para obter mais informações, consulte <code>android.telecom.CallScreeningService</code>
- na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
-da API</a>, disponível para download.
-</p>
-
-
-<h2 id="multi-locale_languages">Suporte a diversas localidades, mais idiomas</h2>
-
-
-<p>O Android N agora permite que os usuários selecionem <strong>diversas localidades</strong> em Settings
-para oferecer melhor suporte a casos de uso bilíngue. Os aplicativos podem usar
-uma API nova para obter as localidades selecionadas pelo usuário e oferecer
-experiências de usuário mais sofisticadas para usuários com diversas localidades — como, por exemplo, mostrar resultados de pesquisa em
-diversos idiomas e não oferecer a tradução de páginas da web que usam
-um idioma conhecido pelo usuário.</p>
-
-<p>Juntamente com o suporte a várias localidades, o Android N também amplia o número de idiomas
-disponíveis aos usuários. Ele oferece mais de 25 variantes para cada um dos idiomas
-mais comuns, como inglês, espanhol, francês e árabe. Além disso, adiciona suporte parcial
-a mais de 100 novos idiomas.</p>
-
-<p>Os aplicativos podem obter a lista de localidades definida pelo usuário chamando
-<code>LocaleList.GetDefault()</code>. Para oferecer suporte ao maior número de localidades, o Android N está
-alterando a forma como resolve recursos. Não deixe de testar e verificar se seus aplicativos
-funcionam da forma esperada com a nova lógica de resolução de recursos.</p>
-
-<p>Para saber mais sobre o novo comportamento de resolução de recursos e sobre as práticas recomendadas que você deve
-seguir, consulte <a href="{@docRoot}preview/features/multilingual-support.html">Suporte a vários idiomas</a>.</p>
-
-
-<h2 id="emoji">Novos emoticons</h2>
-
-<p>
- O Android N apresenta emoticons adicionais e recursos relacionados, tais como
- emoticons com diferentes tons de pele e suporte a seletores
- de variação. Se o seu aplicativo suporta emoticons,
- siga as diretrizes abaixo para aproveitar estes recursos próprios para emoticons.
-</p>
-
-<ul>
- <li>
- <strong>Verifique se o dispositivo contém um emoticon antes de inseri-lo.</strong>
- Para conferir quais emoticons estão presentes
- na fonte do sistema, use o método {@link android.graphics.Paint#hasGlyph(String)}.
- </li>
- <li>
- <strong>Verifique se um emoticon suporta seletores de variação.</strong>
- Os seletores de variação permitem que você
- apresente determinados emoticons em cores ou preto e branco.
- Em dispositivos móveis, os aplicativos devem representar os emoticons em cores, e não em preto e branco. Porém,
- se o seu aplicativo exibe emoticons em linha com o texto, ele deve usar a variação preto e branco.
- Para determinar se um emoticon tem variação ou não, use o seletor de variação.
- Para obter uma lista completa de caracteres com variações, consulte a seção
- <em>sequências de variação de emoticon</em> da
- <a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
- documentação sobre variações em Unicode</a>.
- </li>
- <li>
- <strong>Verifique se um emoticon suporta tons de pele.</strong> O Android N permite que os usuários modifiquem o
- tom de pele renderizado de emoticons como quiserem. Os aplicativos de teclado devem oferecer indicações
- visuais para emoticons que tenham diversos tons de pele e permitir que os usuários
- selecionem o tom preferido. Para determinar quais emoticons do sistema têm
- modificadores de tom de pele, use o método {@link android.graphics.Paint#hasGlyph(String)}
-. Você pode determinar quais emoticons usam tons de pele lendo a
- <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">
-documentação do Unicode</a>.
- </li>
-</ul>
-
-
-<h2 id="icu4">ICU4J APIs no Android</h2>
-
-<p>
- Agora, o Android N oferece um subconjunto de <a href="http://site.icu-project.org/">ICU4J</a> APIs na estrutura do Android
- no pacote <code>android.icu</code>. A migração é fácil e geralmente exige
-apenas a mudança do namespace <code>com.java.icu</code> para
-<code>android.icu</code>. Se você já usa um pacote ICU4J nos seus
- aplicativos, a mudança para as APIs do <code>android.icu</code> disponibilizadas na estrutura do
- Android pode reduzir substancialmente o tamanho do APK.
-</p>
-
-<p>
- Para saber mais sobre as APIs ICU4J no Android, consulte <a href="{@docRoot}preview/features/icu4j-framework.html">Suporte ao ICU4J</a>.
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>O Android N adiciona interfaces de estrutura e suporte de plataforma ao OpenGL ES 3.2, incluindo:</p>
-
-<ul>
- <li> Todas as extensões do <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
-Pacote de extensão Android</a></a> (AEP), exceto <code>EXT_texture_sRGB_decode</code>.
- <li> Framebuffers de ponto flutuante para HDR e sombreamento adiado.
- <li> Chamadas de desenho a BaseVertex para possibilitar melhor organização em lotes e transmissão.
- <li> Controle robusto de acesso a buffers para reduzir a sobrecarga do WebGL.
-</ul>
-
-<p>A API da estrutura do OpenGL ES 3.2 no Android N é fornecida pela classe
-<code>GLES32</code>. Ao usar o OpenGL ES 3.2, não deixe de declarar o
-requisito no arquivo manifesto usando o rótulo <code><uses-feature></code> e o
-atributo <code>android:glEsVersion</code>. </p>
-
-<p>Para obter mais informações sobre como usar o OpenGL ES, incluindo como verificar a versão do
-OpenGL ES compatível do dispositivo no tempo de execução, consulte o <a href="{@docRoot}guide/topics/graphics/opengl.html">guia da OpenGL ES API</a>.</p>
-
-
-<h2 id="android_tv_recording">Gravação do Android TV</h2>
-
-<p>O Android N adiciona a capacidade de gravar e reproduzir conteúdo de serviços de entrada
-do Android TV por meio de novas APIs de gravação. Criados usando as APIs atuais de time-shifting,
-os serviços de entrada de TV podem controlar quais dados de canal são gravados e como
-as sessões gravadas são salvas, bem como gerenciar a interação do usuário com o conteúdo gravado. </p>
-
-<p>Para obter mais informações, consulte <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording APIs</a>.</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>O Android for Work adiciona vários recursos e APIs para dispositivos que executam o Android N.
-Veja a seguir alguns destaques — para obter uma lista completa das mudanças, consulte
-<a href="{@docRoot}preview/features/afw.html">atualizações no Android for Work</a>.</p>
-
-<h3 id="work_profile_security_challenge">Desafio de segurança de perfil de trabalho </h3>
-
-<p>
- Donos de perfis direcionados ao N SDK
- podem especificar um desafio de segurança em separado para aplicativos em execução no
- perfil de trabalho. O desafio de trabalho é exibido quando um usuário tenta abrir
- qualquer aplicativo de trabalho. O preenchimento correto do desafio de segurança desbloqueia e,
- se necessário, descriptografa o perfil de trabalho. Para donos de perfil,
- <code>ACTION_SET_NEW_PASSWORD</code> solicita que o usuário defina um desafio
- de trabalho e <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> um
- bloqueio de dispositivo.
-</p>
-
-<p>
- Os donos de perfil também podem definir políticas de senha distintas para o desafio de trabalho
- (como o comprimento mínimo do PIN ou se é permitido usar a impressão digital
-para desbloquear o perfil) usando<code>setPasswordQuality()</code>,
-<code>setPasswordMinimumLength()</code> e métodos relacionados. O dono
- de perfil também pode definir o bloqueio de dispositivo usando a instância de <code>DevicePolicyManager</code>
- retornada pelo novo método <code>getParentProfileInstance()</code>.
- Além disso, donos de perfil podem personalizar a tela de credenciais do
- desafio de trabalho usando os novos métodos <code>setOrganizationColor()</code> e
- <code>setOrganizationName()</code>.
-</p>
-<h3 id="turn_off_work">Desativar o trabalho </h3>
-
-<p>Os usuários podem alternar o modo de trabalho em dispositivos com um perfil de trabalho. Quando o modo de trabalho está
-desativado, o usuário gerenciado é encerrado temporariamente, o que desativa
-os aplicativos, a sincronização em segundo plano e as notificações do perfil de trabalho. Isso inclui o aplicativo do
-dono do perfil. Quando o modo de trabalho está desativado, o sistema exibe um ícone de status persistente
- para lembrar ao usuário que não é possível iniciar aplicativos de trabalho. A tela de início
-indica que os aplicativos e widgets de trabalho não podem ser acessados. </p>
-
-<h3 id="always_on_vpn">Always on VPN </h3>
-
-<p>Os donos de dispositivo e perfil podem garantir que os aplicativos de trabalho se conectem sempre
-por meio de uma VPN especificada. O sistema inicia automaticamente a VPN após a
- inicialização do dispositivo.</p>
-
-<p>
- Os novos métodos <code>DevicePolicyManager</code> são
- <code>setAlwaysOnVpnPackage()</code> e
- <code>getAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>Como os serviços de VPN podem ser vinculados diretamente pelo sistema sem interação com
-aplicativos, os clientes de VPN precisam processar novos pontos de entrada para o Always on VPN. Da
- mesma forma que antes, os serviços são indicados ao sistema por um filtro de intenção
- correspondente à ação <code>android.net.VpnService</code>. </p>
-
-<p>
- Além disso, os usuários podem definir manualmente clientes do Always on VPN que implementam
- métodos <code>VPNService</code> no usuário principal usando
- <strong>Settings>More>Vpn</strong>.
-</p>
-
-<h3 id="custom_provisioning">Provisionamento personalizado</h3>
-
-<p>
- Um aplicativo pode personalizar os fluxos de provisionamento do dono do perfil e do dispositivo
- com cores e logos corporativos.
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> personaliza
- a cor do fluxo. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- personaliza o fluxo com um logo corporativo.
-</p>
-
-<h2 id="accessibility_enhancements">Aprimoramentos na acessibilidade</h2>
-
-<p>O Android N agora oferece Configurações de visão diretamente na tela de boas-vindas na instalação
-de novos dispositivos. Isso permite que os usuários descubram e configurem recursos de acessibilidade
- em seus dispositivos de forma muito mais fácil, incluindo gesto de ampliação, tamanho
-da fonte, tamanho da tela e TalkBack. </p>
-
-<p>Com o posicionamento mais proeminente desses recursos de acessibilidade, os usuários
-ficarão mais propensos a experimentar o aplicativo com os recursos ativados. Não deixe de testar antecipadamente os aplicativos
-com essas configurações ativadas. Você pode ativá-las em Settings >
-Accessibility.</p>
-
-<p>Além disso, os serviços de acessibilidade no Android N podem ajudar usuários com deficiências
-motoras a tocar na tela. A nova API permite criar serviços com recursos
-como acompanhamento de face, acompanhamento de olho e varredura de pontos, entre outros, para atender
-às necessidades desses usuários.</p>
-
-<p>Para obter mais informações, consulte <code>android.accessibilityservice.GestureDescription</code>
- na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.</p>
-
-
-<h2 id="direct_boot">Inicialização direta</h2>
-
-<p>A inicialização direta reduz os tempos de inicialização dos dispositivos e permite que aplicativos
-registrados tenham funcionalidade limitada, mesmo após uma reinicialização inesperada.
-Por exemplo, se um dispositivo criptografado reinicializar durante o sono do usuário,
-alarmes registrados, mensagens e chamadas recebidas podem agora continuar notificando
-o usuário normalmente. Isso também significa que serviços de acessibilidade podem ser
-disponibilizados imediatamente após um reinício.</p>
-
-<p>A inicialização direita aproveita a criptografia baseada em arquivo do Android N
-para ativar políticas de criptografia detalhadas para dados de sistema e aplicativos.
-O sistema usa um armazenamento criptografado pelo dispositivo para determinados dados de sistema e dados
-de aplicativos registrados explicitamente. Por padrão, um armazenamento criptografado por credencial é usado para todos
-os outros dados de sistema, dados de usuário, aplicativos e dados de aplicativos. </p>
-
-<p>Na inicialização, o sistema inicia em um modo restrito que permite
-acessar apenas dados criptografados pelo dispositivo, sem acesso geral a aplicativos ou dados.
-Se você deseja executar componentes nesse modo, pode registrá-los
-definindo um sinalizador no manifesto. Após a reinicialização, o sistema ativa
-componentes registrados transmitindo a intenção <code>LOCKED_BOOT_COMPLETED</code>
-. O sistema garante que dados de aplicativos registrados criptografados pelos dispositivos sejam disponibilizados
-antes do destravamento. Todos os outros dados ficarão indisponíveis até que o usuário confirme as credenciais
- de tela de bloqueio para descriptografá-los. </p>
-
-Para obter mais informações, consulte <a href="{@docRoot}preview/features/direct-boot.html">Inicialização direta</a>.</p>
-</p>
-
-
-<h2 id="key_attestation">Confirmação de chaves</h2>
-
-<p>Os armazenamentos de chaves protegidos por hardware oferecem um método muito mais seguro para criar, armazenar
-e usar chaves de criptografia em dispositivos Android. Eles protegem chaves contra o kernel do Linux,
-possíveis vulnerabilidades do Android e extração
-em dispositivos com acesso root.</p>
-
-<p>Para permitir o uso de armazenamento de chaves protegido por hardware com maior facilidade e segurança,
-o Android N introduziu a confirmação de chaves. Aplicativos em dispositivos móveis e fora deles podem usar a confirmação de chaves
-para determinar com precisão se um par de chaves RSA ou EC
-está protegido por hardware, quais as propriedades do par de chaves e quais as restrições
-aplicadas ao uso e à validação. </p>
-
-<p>Aplicativos e serviços externos aos dispositivos móveis podem solicitar informações sobre um par de chaves
-por meio de um certificado de confirmação X.509, que deve estar assinado por uma
-chave de confirmação válida. A chave de confirmação é uma chave de assinatura ECDSA,
-injetada no armazenamento de chaves protegido por hardware do dispositivo na fábrica.
-Portanto, um certificado de confirmação assinado com uma chave de confirmação
-válida confirma a existência de um armazenamento de chaves protegido por hardware, além de
-detalhes dos pares de chaves desse armazenamento de chaves.</p>
-
-<p>Para garantir que o dispositivo esteja usando uma imagem Android oficial de fábrica
-e segura, a confirmação de chaves exige que o <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a>
- do dispositivo forneça as seguintes informações ao <a class="external-link" href="https://source.android.com/security/trusty/index.html">Ambiente
- de execução confiável (TEE)</a>:</p>
-
-<ul>
-<li>A versão do SO e o nível de correção instalado no dispositivo</li>
-<li>A chave pública <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> e seu status de bloqueio</li>
- </ul>
-
-<p>Para obter mais informações sobre o recurso de armazenamento de chaves protegido por hardware,
-consulte o guia <a href="https://source.android.com/security/keystore/" class="external-link">Armazenamento de chaves protegido por hardware</a>.</p>
-
-<p>Além da confirmação de chaves, o Android N também introduziu
- chaves associadas a impressões digitais que não são revogadas no cadastramento de impressões digitais.</p>
-
-<h2 id="network_security_config">Configuração de segurança de rede</h2>
-
-<p>No Android N, os aplicativos podem personalizar o comportamento de conexões seguras (HTTPS, TLS)
-de forma segura, sem modificação no código, usando a
-<em>Configuração de segurança de rede</em> declarativa em vez das
-APIs programáticas propensas a erro (por exemplo, X509TrustManager).</p>
-
- <p>Recursos compatíveis:</p>
-<ul>
-<li><b>Âncoras de confiança personalizadas.</b> Permite que um aplicativo personalize quais
-autoridades de certificado (CA) são confiáveis para as conexões seguras. Por
- exemplo, confiar em certificados autoassinados privados ou um restrito conjunto de CAs públicas.
-</li>
-<li><b>Substituições apenas em depuração.</b> Permite que um desenvolvedor de aplicativos depure
-conexões seguras do aplicativo com segurança, sem adicionar riscos à base
-instalada.
-</li>
-<li><b>Cancelamento do uso de tráfego de texto simples.</b> Permite que um aplicativo seja protegido contra
-o uso acidental de tráfego de texto simples.</li>
-<li><b>Fixação de certificados.</b> Um recurso avançado que permite que os aplicativos
- limitem quais chaves de servidor são confiáveis para conexões seguras.</li>
-</ul>
-
-<p>Para obter mais configurações, consulte <a href="{@docRoot}preview/features/security-config.html">Configuração de segurança
-de rede</a>.</p>
-
-<h2 id="default_trusted_ca">Autoridade de certificado confiável padrão</h2>
-
-<p>Por padrão, os aplicativos direcionados ao Android N confiam apenas em certificados fornecidos pelo sistema
-e não confiam mais em Autoridades de certificado (CA) adicionadas pelo usuário. Os aplicativos direcionados ao Android
-N que querem confiar em CAs adicionadas pelo usuário devem usar a
-<a href="{@docRoot}preview/features/security-config.html">Configuração de segurança de rede</a> para
-especificar como confiar nas CAs de usuário.</p>
-
-<h2 id="apk_signature_v2">Esquema de assinatura de APK v2</h2>
-
-<p>
- O Android N apresenta o esquema de assinatura de APK v2, um novo esquema de assinatura de aplicativo
- que oferece instalações mais rápidas e maior proteção contra alterações não autorizadas
- em arquivos APK. Por padrão, o Android Studio 2.2 e o plug-in do Android
- para Gradle 2.2 assinam seu aplicativo usando o esquema de assinatura de APK v2 e
- o esquema tradicional, que usa assinaturas JAR.
-</p>
-
-<p>
- Embora seja recomendável aplicar o esquema de assinatura de APK v2 ao aplicativo, este novo
- esquema não é obrigatório. Se o aplicativo não for compilado adequadamente ao usar o esquema
-de assinatura de APK v2, você poderá desativá-lo. O processo de desativação
- faz com que o Android Studio 2.2 e o plug-in do Android para Gradle 2.2 assinem
-o aplicativo usando apenas o esquema de assinatura tradicional. Para assinar apenas com o
- esquema tradicional, abra o arquivo do nível de módulo <code>build.gradle</code> e
- adicione a linha <code>v2SigningEnabled false</code> à configuração de assinatura de sua
- versão:
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>Cuidado: </strong>Se você assinar o aplicativo usando o esquema de assinatura de APK
- v2 e fizer novas alterações posteriormente, a assinatura do app
- será invalidada. Por essa razão, use ferramentas como <code>zipalign</code>
- antes de assinar o aplicativo usando o esquema de assinatura de APK v2, não depois.
-</p>
-
-<p>
- Para obter mais informações, leia os documentos do Android Studio que descrevem como
-<a href="{@docRoot}studio/publish/app-signing.html#release-mode">
-assinar um aplicativo</a> no Android Studio e como<a href="{@docRoot}studio/build/build-variants.html#signing"> configurar
-o arquivo de programação para assinar aplicativos</a> usando o plug-in do Android para Gradle.
-</p>
-
-<h2 id="scoped_directory_access">Acesso a diretórios com escopo</h2>
-
-<p>No Android N, os aplicativos podem usar novas APIs para solicitar acesso a determinados diretórios de <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">armazenamento
-externo</a>, incluindo diretórios em mídias removíveis, tais como cartões
-SD. As novas APIs simplificam consideravelmente como o aplicativo acessa os
-diretórios de armazenamento externo padrão, tais como o diretório<code>Pictures</code>. Os aplicativos,
-como aplicativos de fotografia, podem usar essas APIs em vez de
-<code>READ_EXTERNAL_STORAGE</code>, que concede acesso a todos os diretórios de
-armazenamento, ou da Estrutura de acesso ao armazenamento, que faz o usuário navegar até
-o diretório.</p>
-
-<p>Além disso, as novas APIs simplificam as etapas executadas pelo usuário para conceder ao aplicativo
-acesso ao armazenamento externo. Quando você usa as novas APIs, o sistema usa uma IU de permissões simples
-que detalha claramente a qual diretório o aplicativo
-está solicitando acesso.</p>
-
-<p>Para obter mais informações, consulte a documentação para desenvolvedores
-<a href="{@docRoot}preview/features/scoped-folder-access.html">Acessos
- a diretório com escopo</a>.</p>
-
-<h2 id="keyboard_shortcuts_helper">Auxiliar de atalhos de teclado</h2>
-
-<p>
-No Android N, o usuário pode pressionar "Alt + /" para acionar uma tela de <em>atalhos de teclado</em>
-que exibe todos os atalhos disponíveis do sistema e do
-aplicativo em questão. Os atalhos são recuperados automaticamente do menu do aplicativo, se
-estiverem disponíveis, mas os desenvolvedores podem fornecer listas próprias de atalhos
-para a tela. É possível fazer isso substituindo o novo método
-<code>Activity.onProvideKeyboardShortcuts()</code>, conforme descrito na
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
-</p>
-
-<p>
-Para acionar o auxiliar de atalhos de teclado em qualquer ponto do aplicativo,
-chame {@code Activity.requestKeyboardShortcutsHelper()} para a atividade correspondente.
-</p>
-
-<h2 id="sustained_performance_api">API de desempenho sustentado</h2>
-
-<p>
-O desempenho pode flutuar drasticamente em aplicativos executados por muito tempo porque o
-sistema aciona os mecanismos de sistema-em-um-chip quando os componentes do dispositivo atingem o
-limite de temperatura. Esta flutuação representa um desafio para desenvolvedores de aplicativos
- que criam aplicativos de alto desempenho e longo tempo de execução.
-</p>
-
-<p>
-Para tratar estas limitações, o Android N inclui compatibilidade opcional para
-<em>modo de desempenho sustentado</em>, permitindo que OEMs ofereçam dicas sobre
- capacidades de desempenho em dispositivo para aplicativos de longa duração. Os desenvolvedores de aplicativos
-podem usar essas dicas para ajustar os aplicativos para um nível de desempenho do dispositivo previsível
-e consistente em períodos longos de tempo.
-</p>
-
-<p>
-Desenvolvedores de aplicativos podem testar essa nova API na N Developer Preview
-apenas em dispositivos Nexus 6P. Para usar este recurso,
-configure a janela de sinalização de desempenho sustentado para a janela
-que você quer executar em modo de desempenho sustentado. Configure esta sinalização usando o método
-{@code Window.setSustainedPerformanceMode()}. O sistema desativará este modo
-automaticamente quando a janela não estiver mais em foco.
-</p>
-
-<h2 id="vr">Suporte a RV</h2>
-
-<p>
-O Android N adiciona compatibilidade de plataformas e otimizações para um novo Modo RV Mode que dá aos
- desenvolvedores a capacidade de projetar experiências de RV móveis de alta qualidade para os usuários. Há diversas melhorias de desempenho
-, incluindo acesso a um núcleo exclusivo da CPU para aplicativos de RV.
- Dentro dos aplicativos, é possível tirar vantagem do rastreamento inteligente da cabeça
-e de notificações estéreo que funcionam para RV. Mais importante, o Android N oferece
-gráficos de latência muito baixa. Para obter informações completas sobre a criação de aplicativos de RV para Android N,
-consulte o <a href="https://developers.google.com/vr/android/">Google VR SDK para Android</a>.
-</p>
-
-
-<h2 id="print_svc">Melhorias nos serviços de impressão</h2>
-
-<p>
- No Android N, agora os desenvolvedores de serviços de impressão podem exibir informações adicionais
- sobre impressoras e trabalhos de impressão individuais.
-</p>
-
-<p>
- Ao listar impressoras individuais, agora um serviço de impressão pode definir
-ícones por impressora de duas maneiras:
-</p>
-
-<ul>
- <li>É possível definir um ícone de um ID de recurso chamando
- <code>PrinterInfo.Builder.setResourceIconId()</code>
- </li>
-
- <li>É possível exibir um ícone da rede chamando
-<code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code> e definindo um
-retorno de chamada para quando o ícone for solicitado usando
-<code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>
- </li>
-</ul>
-
-<p>
- Além disso, você pode fornecer atividade por impressora para exibir
-informações adicionais chamando <code>PrinterInfo.Builder.setInfoIntent()</code>.
-</p>
-
-<p>
- É possível indicar o progresso e o status de trabalhos de impressão na
-notificação de trabalhos de impressão chamando
-<code>android.printservice.PrintJob.setProgress()</code> e
-<code>android.printservice.PrintJob.setStatus()</code>, respectivamente.
-</p>
-
-<p>
- Para obter mais informações sobre estes métodos, consulte a <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
-</p>
-
-<h2 id="framemetrics_api">FrameMetricsListener API</h2>
-
-<p>
-A FrameMetricsListener API permite que um aplicativo monitore o desempenho de renderização
- da IU. A API oferece este recurso ao expor uma API Pub/Sub em streaming para transferir informações de precisão
-de quadro à janela atual do aplicativo. Os dados retornados são
-equivalentes aos que<code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code> exibe, mas não estão mais limitados a 120 quadros.
-</p>
-
-<p>
-É possível usar o FrameMetricsListener para medir o desempenho da IU
-em nível de interação na produção sem conexão USB. Esta API
-permite a coleta de dados com granularidade muito maior do que
-{@code adb shell dumpsys gfxinfo}. A granularidade maior é possível porque
-o sistema pode coletar dados para determinadas interações no aplicativo; o sistema
-não precisa capturar um resumo global do desempenho
-do aplicativo nem limpar qualquer estado global. É possível usar este
-recurso para reunir dados de desempenho e capturar regressões no desempenho da IU
-para casos de uso reais dentro do aplicativo.
-</p>
-
-<p>
-Para monitorar uma janela, implemente o método de retorno de chamada <code>FrameMetricsListener.onMetricsAvailable()</code>
-e registre-o nessa janela. Para obter mais informações, consulte a
-documentação da classe{@code FrameMetricsListener} na
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>,disponível para download.
-</p>
-
-<p>
-A API fornece um objeto {@code FrameMetrics}, que contém dados de quadro que
-o subsistema de renderização relata para vários marcos no ciclo de vida de um quadro.
-As métricas suportadas são: {@code UNKNOWN_DELAY_DURATION},
-{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
-{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
-{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
-{@code TOTAL_DURATION}e {@code FIRST_DRAW_FRAME}.
-</p>
-
-
-<h2 id="virtual_files">Arquivos virtuais</h2>
-
-<p>
- Em versões anteriores do Android, o aplicativo podia usar a estrutura de
- acesso ao armazenamento para permitir que os usuários selecionem arquivos de contas de armazenamento em nuvem,
- como o Google Drive. No entanto, não é possível representar arquivos que
-não tenham uma representação direta de código de bytes; os arquivos precisam fornecer
- um fluxo de entrada.
-</p>
-
-<p>
- O Android N adiciona o conceito de <em>arquivos virtuais</em> à estrutura de acesso
- ao armazenamento. O recurso de arquivos virtuais permite que seu
-{@link android.provider.DocumentsProvider} retorne URIs de documentos que possam ser
-usados com intenções {@link android.content.Intent#ACTION_VIEW} mesmo que não tenham
-uma representação direta de código de bytes. O Android N também permite que você
- ofereça formatos alternativos para arquivos de usuário, sejam virtuais ou não.
-</p>
-
-<p>
- Para obter o URI para um documento virtual em seu aplicativo, é preciso criar uma
- {@link android.content.Intent} para abrir a IU do seletor de arquivos. Como um aplicativo
-não consegue abrir um arquivo virtual diretamente usando o método
-{@link android.content.ContentResolver#openInputStream(Uri) openInputStream()}
-, seu aplicativo não receberá arquivos virtuais se você não incluir a categoria
-{@link android.content.Intent#CATEGORY_OPENABLE}.
-</p>
-
-<p>
- Depois que o usuário fizer uma seleção, o sistema chamará o método
-{@link android.app.Activity#onActivityResult onActivityResult()}.
- O aplicativo pode recuperar o URI do arquivo virtual e obter um fluxo de resultados, como
- demonstrado no snippet de código abaixo.
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- Para obter mais informações sobre como acessar arquivos de usuário, consulte o
-<a href="{@docRoot}guide/topics/providers/document-provider.html">guia da estrutura
-de acesso ao armazenamento</a>.
-</p>
diff --git a/docs/html-intl/intl/pt-br/preview/behavior-changes.jd b/docs/html-intl/intl/pt-br/preview/behavior-changes.jd
deleted file mode 100644
index 1e56a99..0000000
--- a/docs/html-intl/intl/pt-br/preview/behavior-changes.jd
+++ /dev/null
@@ -1,610 +0,0 @@
-page.title=Mudanças de comportamento
-page.keywords=preview,sdk,compatibility
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Neste documento</h2>
-
-<ol>
- <li><a href="#perf">Melhorias no desempenho</a>
- <ol>
- <li><a href="#doze">Soneca</a></li>
- <li><a href="#bg-opt">Otimizações em segundo plano</a></li>
- </ol>
- </li>
- <li><a href="#perm">Alterações nas permissões</a>
- </li>
- <li><a href="#sharing-files">Compartilhamento de arquivos entre aplicativos</a></li>
- <li><a href="#accessibility">Melhorias na acessibilidade</a>
- <ol>
- <li><a href="#screen-zoom">Zoom de tela</a></li>
- <li><a href="#vision-settings">Configurações de visão no assistente de configuração</a></li>
- </ol>
- </li>
- <li><a href="#ndk">Aplicativos NDK vinculados a bibliotecas de plataforma</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">Retenção de anotações</a></li>
- <li><a href="#other">Outros pontos importantes</a></li>
-</ol>
-
-<h2>Veja também</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">
-Visão geral da API do Android N</a></li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Junto com novos recursos e funcionalidades, o Android N
-inclui uma variedade de mudanças de comportamento do sistema e da API. Este documento
-destaca algumas das principais mudanças que você deve entender e considerar
-nos aplicativos.
-</p>
-
-<p>
- Caso tenha publicado anteriormente um aplicativo para Android, saiba que ele pode ser afetado
- pelas alterações na plataforma.
-</p>
-
-
-<h2 id="perf">Bateria e memória</h2>
-
-<p>
-O Android N inclui alterações de comportamento do sistema com o objetivo de melhorar a vida útil da bateria
-nos dispositivos e reduzir o uso de RAM. Essas alterações podem afetar o acesso do aplicativo aos
-recursos do sistema, bem como a forma como ele interage com outros aplicativos por meio de
- certas intenções explícitas .
-</p>
-
-<h3 id="doze">Soneca</h3>
-
-<p>
- Introduzido no Android 6.0 (nível da API 23), o modo soneca aumenta a vida útil da bateria
- adiando atividades de CPU e rede quando um usuário deixa um dispositivo desconectado,
- estacionário e com a tela desativada. O Android N aprimora
- ainda mais o modo soneca aplicando um subconjunto de restrições de CPU e rede
- quando o dispositivo está desconectado e com a tela desativada, mas não necessariamente
- estacionário, como, por exemplo, quando o celular está no bolso do usuário.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>Figura 1.</strong> Ilustração de como o modo soneca aplica um primeiro nível de
- restrições de atividades de sistema para aumentar a vida útil da bateria.
-</p>
-
-<p>
- Quando o dispositivo estiver sendo alimentado pela bateria e a tela estiver desativada por um determinado
- período, o dispositivo entrará no modo de soneca e aplicará o primeiro subconjunto de restrições: o
-acesso do aplicativo à rede será desativado e os trabalhos e sincronizações serão adiados. Se o dispositivo permanecer
-estacionário por um determinado período após entrar no modo soneca, o sistema aplicará
-as demais restrições de soneca a {@link android.os.PowerManager.WakeLock}, aos alarmes
-{@link android.app.AlarmManager} e às verificações de GPS e Wi-Fi. Independentemente
- de as restrições de soneca serem aplicadas parcial ou totalmente, o sistema despertará o
- dispositivo para breves janelas de manutenção, quando os aplicativos
- poderão acessar a rede e executar todos os trabalhos/sincronizações adiados.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>Figura 2.</strong> Ilustração de como o modo soneca aplica um segundo nível de
- restrições de atividades de sistema após o dispositivo permanecer estacionário por um determinado período.
-</p>
-
-<p>
- Note que a ativação da tela ou do dispositivo encerra o modo soneca e
- remove essas restrições de processamento. O comportamento adicional não
- afeta as recomendações e práticas recomendadas para a adaptação do aplicativo à versão
- anterior do modo soneca, introduzida no Android 6.0 (nível da API 23), como discutido em
- <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
- Otimização para soneca e aplicativo em espera</a>. Você deve continuar
- a seguir essas recomendações, como o uso do Google Cloud Messaging (GCM) para
- enviar e receber mensagens, e começar a planejar atualizações para acomodar o
- comportamento adicional do modo soneca.
-</p>
-
-
-<h3 id="bg-opt">Project Svelte: Otimizações em segundo plano</h3>
-
-<p>
- O Android N remove três transmissões implícitas para ajudar a otimizar o
- uso de memória e o consumo de energia. Essa alteração é necessária porque transmissões
- implícitas iniciam frequentemente em segundo plano aplicativos
- registrados para escutá-las. A remoção dessas transmissões pode beneficiar consideravelmente o desempenho
-do dispositivo e a experiência do usuário.
-</p>
-
-<p>
- Dispositivos móveis passam por alterações frequentes na conectividade, como a alternância
- entre Wi-Fi e dados móveis. No momento, os aplicativos podem monitorar alterações de
- conectividade registrando um receptor para a transmissão implícita {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} em seu
- manifesto. Como vários aplicativos se registram para receber essa transmissão, uma única
- mudança de rede pode fazer com que todos despertem e processem a transmissão
- ao mesmo tempo.
-</p>
-
-<p>
- De forma semelhante, em versões anteriores do Android, os aplicativos podiam se registrar para receber transmissões implícitas {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} e {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} de outros aplicativos, como
- Câmera. Quando um usuário tira uma fotografia com o aplicativo Câmera, esses aplicativos são despertados
- para processar a transmissão.
-</p>
-
-<p>
- Para aliviar esses problemas, o Android N aplica a seguintes
- otimizações:
-</p>
-
-<ul>
- <li>Os aplicativos direcionados ao Android N não receberão transmissões {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION}, mesmo
- se tiverem entradas no manifesto solicitando notificação desses eventos. Os aplicativos em execução
-ainda poderão escutar {@code CONNECTIVITY_CHANGE} no encadeamento principal
- se solicitarem a notificação com {@link android.content.BroadcastReceiver}.
- </li>
-
- <li>Os aplicativos não podem enviar nem receber transmissões {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} ou {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}. Essa otimização
- afeta todos os aplicativos e não apenas os direcionados ao Android N.
- </li>
-</ul>
-
-<p>Se o seu aplicativo usar qualquer uma dessas intenções, remova as dependências
- delas assim que possível para direcionar corretamente os dispositivos Android N.
- A estrutura do Android oferece diversas soluções para reduzir a necessidade dessas
- transmissões implícitas. Por exemplo, a API {@link
- android.app.job.JobScheduler} oferece um mecanismo robusto para agendar
- operações de rede quando ocorrem condições especificadas, como conexão a uma
- rede ilimitada. Você pode até usar {@link
-android.app.job.JobScheduler} para reagir a mudanças em provedores de conteúdo.
-</p>
-
-<p>
- Para obter mais informações sobre otimizações em segundo plano no N e como adaptar seu aplicativo,
- consulte <a href="{@docRoot}preview/features/background-optimization.html">Otimizações
-em segundo plano</a>.
-</p>
-
-<h2 id="perm">Alterações nas permissões</h2>
-
-<p>
- O Android N inclui alterações em permissões que podem afetar seu aplicativo.
-</p>
-
-<h3 id="permfilesys">Alterações nas permissões do sistema de arquivos</h3>
-
-<p>
- Para aprimorar a segurança de arquivos privados, o diretório privado de
- aplicativos direcionados ao Android N ou superior tem acesso restrito (<code>0700</code>).
- Esta configuração impede o vazamento de metadados de arquivos privados, como tamanho
- e existência. Esta alteração de permissão tem vários efeitos colaterais:
-</p>
-
-<ul>
- <li>
- O proprietário não deve mais relaxar as permissões para arquivos privados,
- e qualquer tentativa de fazer isso usando
- {@link android.content.Context#MODE_WORLD_READABLE} e/ou
- {@link android.content.Context#MODE_WORLD_WRITEABLE} acionará uma
- {@link java.lang.SecurityException}.
- <p class="note">
- <strong>Observação:</strong> Até agora, essa restrição não foi adotada em pleno vigor.
- Aplicativos ainda podem modificar permissões para o diretório privado usando
- APIs nativas ou a API {@link java.io.File File}. No entanto, o relaxamento
- de permissões para o diretório privado é enfaticamente desencorajado.
- </p>
- </li>
- <li>
- A passagem de URIs <code>file://</code> para fora do domínio do pacote pode deixar o
- receptor com um caminho inacessível. Sendo assim, tentativas de passar um URI
- <code>file://</code> acionam uma
- <code>FileUriExposedException</code>. A forma recomendada para compartilhamento do
- conteúdo de um arquivo privado é o uso do {@link
- android.support.v4.content.FileProvider}.
- </li>
- <li>
- O {@link android.app.DownloadManager} não consegue mais compartilhar
- arquivos armazenados de forma privada por nome de arquivo. Os aplicativos de legado podem acabar em um
- caminho inacessível quando acessam {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Aplicativos direcionados para o
- Android N ou superior acionam uma {@link java.lang.SecurityException} quando
- tentam acessar
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
- Aplicativos de legado que definem o local de download para um local público
- usando
- {@link
-android.app.DownloadManager.Request#setDestinationInExternalFilesDir
-DownloadManager.Request.setDestinationInExternalFilesDir()} ou
- {@link
-android.app.DownloadManager.Request#setDestinationInExternalPublicDir
-DownloadManager.Request.setDestinationInExternalPublicDir()}
- ainda conseguem acessar o caminho em
-{@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}, no entanto, este
- método é enfaticamente desencorajado. A forma preferencial para se acessar um arquivo
- exposto pelo {@link android.app.DownloadManager} é o uso do
-{@link android.content.ContentResolver#openFileDescriptor
-ContentResolver.openFileDescriptor()}.
- </li>
-</ul>
-
-<h2 id="sharing-files">Compartilhamento de arquivos entre aplicativos</h2>
-
-<p>
-Para aplicativos direcionados ao Android N, a estrutura do Android cumpre com
-a política de API {@link android.os.StrictMode} que proíbe a exposição de URIs {@code file://}
-fora do aplicativo. Se uma intenção que contenha o URI de um arquivo deixar o aplicativo, ele falhará
- com uma exceção {@code FileUriExposedException}.
-</p>
-
-<p>
-Para compartilhar arquivos entre aplicativos, você deve enviar um URI {@code content://}
-e conceder uma permissão de acesso temporária ao URI. A forma mais fácil de conceder essa permissão é
-usar a classe {@link android.support.v4.content.FileProvider}. Para obter mais informações
- sobre permissões e compartilhamento de arquivos,
-consulte <a href="{@docRoot}training/secure-file-sharing/index.html">Compartilhamento de Arquivos</a>.
-</p>
-
-<h2 id="accessibility">Melhorias na acessibilidade</h2>
-
-<p>
- O Android N inclui mudanças criadas para aprimorar a facilidade de uso da
- plataforma para usuários com visão reduzida ou deficiente. Normalmente, essas mudanças
- não exigirão alterações de código no aplicativo. No entanto, analise
- esse recurso e teste-o em seu aplicativo para avaliar possíveis impactos na experiência
- do usuário.
-</p>
-
-
-<h3 id="screen-zoom">Zoom de tela</h3>
-
-<p>
- O Android N permite que os usuários definam <strong>Display size</strong>, que amplia
- ou reduz todos os elementos na tela, melhorando a acessibilidade do dispositivo
- para usuários com visão deficiente. Os usuários não podem alterar o zoom da tela além da largura mínima de
- tela de <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
-sw320dp</a>, que é a largura do Nexus 4, um telefone comum de tamanho médio.
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>Figura 3.</strong> A tela à direita mostra o efeito de
- reduzir o Display size de um dispositivo executando uma imagem do sistema Android N.
-</p>
-
-
-<p>
- Quando a densidade do dispositivo mudar, o sistema notificará os aplicativos em execução das
- seguintes formas:
-</p>
-
-<ul>
- <li>Se um aplicativo está direcionado ao nível da API 23 ou mais baixo, o sistema automaticamente elimina
- todos os processos em segundo plano. Isso significa que, se um usuário sair
- desse aplicativo para abrir a tela <em>Settings</em> e alterar a
- configuração <strong>Display size</strong>, o sistema eliminará o aplicativo da mesma
- forma que faria em uma situação de pouca memória. Se o aplicativo tiver processos
- em primeiro plano, o sistema notificará esses processos sobre a mudança de configuração, como
- descrito em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento
- de alterações no tempo de execução</a>, como se a orientação do dispositivo tivesse mudado.
- </li>
-
- <li>Se um aplicativo for direcionado ao Android N, todos os seus processos
- (em primeiro e segundo plano) serão notificados da mudança de configuração, como
- descrito em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento
- de alterações no tempo de execução</a>.
- </li>
-</ul>
-
-<p>
- A maioria dos aplicativos não precisa ser alterada para ser compatível com esse recurso, desde que
- os aplicativos sigam as práticas recomendadas do Android. Os itens específicos a serem verificados são:
-</p>
-
-<ul>
- <li>Teste o aplicativo em um dispositivo com largura de tela <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
- e verifique se ele funciona adequadamente.
- </li>
-
- <li>Quando a configuração do dispositivo mudar, atualize todas as informações
- dependentes de densidade armazenadas no cache, como bitmaps no cache ou recursos carregados da
- rede. Verifique a ocorrência de alterações de configuração quando o aplicativo sair do estado pausado e retomar
- a execução.
- <p class="note">
- <strong>Observação:</strong> se você armazenar em cache dados dependentes de configuração,
-recomendamos incluir metadados relevantes, como o tamanho de tela
- adequado ou a densidade de pixels desses dados. Salvar esses dados permitirá que você
- decida se será necessário atualizar os dados armazenados em cache após uma mudança
- de configuração.
- </p>
- </li>
-
- <li>Evite especificar dimensões com unidades px, pois elas não são redimensionadas de
- acordo com a densidade de tela. Em vez disso, especifique dimensões com unidades de <a href="{@docRoot}guide/practices/screens_support.html">pixel independente de
- densidade</a> (<code>dp</code>).
- </li>
-</ul>
-
-<h3 id="vision-settings">Configurações de visão no assistente de configuração</h3>
-
-<p>
- Agora, o Android N inclui Configurações de visão na tela de boas-vindas, onde os usuários podem
- definir as configurações de acessibilidade a seguir em um novo dispositivo:
- <strong>gesto de ampliação</strong>, <strong>tamanho da fonte</strong>
-, <strong>tamanho da tela</strong> e <strong>TalkBack</strong>. Essa alteração
- aumenta a visibilidade de erros relacionados a configurações de tela diferentes. Para
- avaliar o impacto do recurso, teste seus aplicativos com essas
-configurações ativadas. As configurações podem ser encontradas em <strong>Settings >
- Accessibility</strong>.
-</p>
-
-<h2 id="ndk">Aplicativos NDK vinculados a bibliotecas de plataforma</h2>
-
-<p>
- O Android N inclui mudanças no namespace para evitar o carregamento de APIs não públicas.
- Se você usar o NDK, use apenas APIs públicas da plataforma
- Android. O uso de APIs não públicas na próxima versão oficial do Android
- poderá causar problemas no seu aplicativo.
-</p>
-
-<p>
- Para alertar sobre o uso de APIs não públicas, os aplicativos executados em um dispositivo
- Android N geram um erro na saída logcat quando um aplicativo chama uma API não pública.
- Esse erro também é exibido na tela do dispositivo como mensagem para que o usuário
-fique ciente da situação. Revise o código do seu aplicativo para
- remover o uso de APIs de plataformas não públicas e faça testes completos do aplicativo usando
- um dispositivo de visualização ou um emulador.
-</p>
-
-<p>
- Se o seu aplicativo depender de bibliotecas de plataforma, consulte a documentação do NDK
- para obter soluções usuais de substituição de APIs privadas comuns por APIs públicas equivalentes.
- Também é possível que você esteja vinculando bibliotecas de plataforma sem perceber,
- particularmente se o aplicativo usar uma biblioteca que faz parte da plataforma (como
- <code>libpng</code>), mas não faz parte do NDK. Nesse caso, verifique se
-o APK contém todos os arquivos .so que você pretende vincular.
-</p>
-
-<p class="caution">
- <strong>Cuidado:</strong> Algumas bibliotecas de terceiros também podem conter links para APIs
- não públicas. Se o aplicativo usar essas bibliotecas, poderá falhar quando executado
- na próxima versão oficial do Android.
-</p>
-
-<p>
- Os aplicativos não devem depender de nem usar bibliotecas nativas não incluídas
- no NDK, pois elas podem ser alteradas ou removidas entre uma versão do Android
- e outra. A mudança de OpenSSL para BoringSSL é um exemplo dessas alterações.
- Além disso, dispositivos diferentes podem oferecer níveis distintos de compatibilidade, pois
- não há requisitos de compatibilidade para bibliotecas de plataforma não incluídas
-no NDK. Se você precisar acessar bibliotecas que não são do NDK em dispositivos mais antigos, torne o carregamento
-dependente do nível da Android API.
-</p>
-
-<p>
- Para ajudar a diagnosticar esses tipos de problemas, veja a seguir alguns exemplos de erros
- de Java e NDK que podem ocorrer durante a compilação do aplicativo com o Android N:
-</p>
-
-<p>Exemplo de erro de Java:</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>Exemplo de erro de NDK:</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- Veja a seguir algumas correções comuns para aplicativos que encontram esses tipos de erro:
-</p>
-
-<ul>
- <li>O uso de getJavaVM e getJNIEnv do libandroid_runtime.so pode ser substituído
- por funções JNI padrão:
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>O uso do símbolo {@code property_get} de {@code libcutils.so} pode ser
- substituído pelo {@code alternative __system_property_get} público.
- Para fazer isso, use {@code __system_property_get} com o include abaixo:
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>O uso do símbolo {@code SSL_ctrl} de {@code libcrypto.so} deve ser
- substituído por uma versão local do aplicativo. Por exemplo, vincule estaticamente
- {@code libcyrpto.a} no arquivo {@code .so} ou inclua dinamicamente o seu próprio
- {@code libcrypto.so} do BoringSSL ou OpenSSL no aplicativo.
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- O Android N contém mudanças para aplicativos direcionados ao Android for Work, incluindo
- mudanças em instalação de certificados, redefinição de senha, gerenciamento de
- usuários secundários e acesso a identificadores de dispositivos. Se você estiver criando aplicativos para
- ambientes do Android for Work, examine essas mudanças e modifique
- o aplicativo conforme necessário.
-</p>
-
-<ul>
- <li>Você precisa instalar um instalador de certificado delegado antes que o DPC possa
- configurá-lo. Para aplicativos de donos de perfil e dispositivo direcionados ao N SDK, você deve
- instalar o instalador de certificado delegado antes de chamar o
- controlador de políticas de dispositivo (DPC)
- <code>DevicePolicyManager.setCertInstallerPackage()</code>. Se o instalador
- não estiver instalado, o sistema gerará uma
- <code>IllegalArgumentException</code>.
- </li>
-
- <li>As restrições de redefinição de senha de administradores do dispositivo agora se aplicam também a
-donos de perfil. Os administradores de dispositivo não podem mais usar
- {@code DevicePolicyManager.resetPassword()} para limpar senhas nem para alterar
- as já definidas. Os administradores de dispositivo ainda poderão definir uma senha, mas apenas
- em dispositivos sem senha, PIN nem padrão.
- </li>
-
- <li>Donos de dispositivo e perfil poderão gerenciar contas, mesmo se restrições forem
- definidas. Eles podem chamar as APIs de gerenciamento de contas,
- mesmo se restrições de usuário <code>DISALLOW_MODIFY_ACCOUNTS</code> forem implementadas.
- </li>
-
- <li>Os donos de dispositivo podem gerenciar usuários secundários com maior facilidade. Quando um dispositivo
- executar no modo de dono do dispositivo, a restrição <code>DISALLOW_ADD_USER</code>
- será definida automaticamente. Isso evita que os usuários criem usuários secundários
- não gerenciados. Além disso, os métodos <code>CreateUser()</code> e
- <code>createAndInitializeUser()</code> ficaram obsoletos e foram substituídos
- pelo novo método <code>DevicePolicyManager.createAndManageUser()</code>.
- </li>
-
- <li>Os donos de dispositivo podem acessar identificadores de dispositivo. O dono do dispositivo pode acessar o
- endereço MAC Wi-Fi de um dispositivo usando
- <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Se a rede Wi-Fi nunca
- foi ativada no dispositivo, esse método retorna o valor {@code null}.
- </li>
-
- <li>A configuração modo de trabalho controla o acesso a aplicativos de trabalho. Quando o modo de trabalho está desativado, a
- tela de início do sistema mostra os aplicativos de trabalho em cinza para indicar que estão indisponíveis. Quando é
- reativado, o modo de trabalho retorna ao comportamento normal.
-</ul>
-
-<p>
- Para obter mais informações sobre as mudanças no Android for Work no Android N, consulte
- <a href="{@docRoot}preview/features/afw.html">Atualizações no Android for Work</a>.
-</p>
-
-<h2 id="annotations">Retenção de anotações</h2>
-
-<p>
-O Android N corrige um erro em que a visibilidade de anotações era ignorada.
-Este problema permitia que o tempo de execução acessasse anotações a que não deveria
-ter acesso. Entre essas anotações, estão:
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}: que só deveria estar visível em tempo de compilação.</li>
- <li>{@code VISIBILITY_SYSTEM}: que deveria estar visível em tempo de execução, mas apenas para o
-sistema subjacente.</li>
-</ul>
-
-<p>
-Se o seu aplicativo se baseou neste comportamento, adicione uma política de retenção para anotações que deve
- estar disponível em tempo de execução. É possível fazer isso usando {@code @Retention(RetentionPolicy.RUNTIME)}.
-</p>
-
-<h2 id="other">Outros pontos importantes</h2>
-
-<ul>
-<li>Quando um aplicativo for executado no Android N, mas for direcionado a um nível da API menor
- e o usuário alterar o tamanho da tela, o processo do aplicativo será eliminado. O aplicativo
-deverá ser capaz de processar corretamente esse cenário. Caso contrário, ele falhará
-quando o usuário restaurá-lo usando Recents.
-
-<p>
-Você deve testar o aplicativo para verificar
-se esse comportamento não ocorre.
-Isso pode ser feito causando uma falha idêntica
-eliminando o aplicativo manualmente usando o DDMS.
-</p>
-
-<p>
-Aplicativos direcionados ao Android N e versões posteriores não serão eliminados automaticamente em mudanças de densidade.
-No entanto, podem continuar a responder a alterações de configurações de forma não ideal.
-</p>
-</li>
-
-<li>
-Os aplicativos no Android N devem ser capazes de processar corretamente mudanças de configuração
-e não devem falhar em inicializações subsequentes. Você pode verificar o comportamento do aplicativo
-alterando o tamanho da fonte (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>) e depois restaurando
-o aplicativo em Recents.
-</li>
-
-<li>
-Devido a um erro em versões anteriores do Android, o sistema não sinaliza gravações
- em um soquete TCP no encadeamento principal como violações do modo estrito. O Android N corrigiu esse erro.
-Agora, os aplicativos que exibirem este comportamento gerarão uma{@code android.os.NetworkOnMainThreadException}.
-Geralmente, a realização de operações de rede no encadeamento principal é uma má ideia porque essas operações
-geralmente têm alta latência no final, causando ANRs e problemas.
-</li>
-
-<li>
-Agora, por padrão, a família de métodos {@code Debug.startMethodTracing()} armazena
-os resultados no diretório específico do pacote no armazenamento compartilhado,
- e não no nível mais alto
- do cartão SD. Isso significa que os aplicativos não precisam mais solicitar a permissão {@code WRITE_EXTERNAL_STORAGE} para usar estas APIs.
-</li>
-
-<li>
-Muitas APIs de plataformas começaram a verificar grandes cargas úteis enviadas
-por meio de transações {@link android.os.Binder}, e o
-sistema agora gera novamente{@code TransactionTooLargeExceptions}
-como {@code RuntimeExceptions}, em vez de registrá-las ou suprimi-las silenciosamente. Um
-exemplo comum é armazenar dados demais em
-{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
-que faz com que {@code ActivityThread.StopInfo} gere uma
-{@code RuntimeException} quando seu aplicativo é direcionado ao Android N.
-</li>
-
-<li>
-Se um aplicativo publica tarefas {@link java.lang.Runnable} para uma {@link android.view.View} e
- esta {@link android.view.View}
-não está anexada a uma janela, o sistema
-coloca a tarefa {@link java.lang.Runnable} em fila com a {@link android.view.View}.
-A tarefa {@link java.lang.Runnable} não é executada até que a
-{@link android.view.View} esteja anexada
-a uma janela. Este comportamento corrige os seguintes erros:
-<ul>
- <li>Se um aplicativo publicasse em uma {@link android.view.View} de um encadeamento que não fosse o encadeamento de IU da janela pretendida
-, o {@link java.lang.Runnable} poderia acabar sendo executado no encadeamento errado.
- </li>
- <li>Se a tarefa {@link java.lang.Runnable} fosse publicada de um encadeamento que não fosse
- um encadeamento de looper, o aplicativo poderia expor a tarefa {@link java.lang.Runnable}.</li>
-</ul>
-</li>
-
-<li>
-Se um aplicativo no Android N com permissão
-{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
-tentar excluir um pacote instalado por outro aplicativo,
-o sistema solicitará a confirmação do usuário. Nesse cenário, os aplicativos devem esperar
-{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
-como status de retorno ao invocar
-{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
-</li>
-
-</ul>
-
diff --git a/docs/html-intl/intl/pt-br/preview/download-ota.jd b/docs/html-intl/intl/pt-br/preview/download-ota.jd
deleted file mode 100644
index 693aa92..0000000
--- a/docs/html-intl/intl/pt-br/preview/download-ota.jd
+++ /dev/null
@@ -1,324 +0,0 @@
-page.title=Aplicação de uma imagem OTA de dispositivo
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Antes de fazer o download ou instalar componentes do
- Android Preview SDK, você deve concordar com os seguintes termos e
- condições.</p>
-
- <h2 class="norule">Termos e condições</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Este é o contrato de licença do Android SDK Preview (o “Contrato de Licença”).
-
-1. Introdução
-
-1.1 O Android SDK Preview (que este Contrato de licença chama de "Preview", incluindo especificamente os arquivos de sistema do Android, APIs integradas e arquivos da biblioteca Preview, se e quando estiverem disponíveis) é licenciado por meio da concordância com os termos deste contrato. O Contrato de licença forma um vínculo contratual legal entre o contratante e a Google em relação ao uso do Preview.
-
-1.2 "Android" refere-se à pilha de software do Android para dispositivos, conforme disponibilizado no Projeto de código aberto do Android, localizado no URL a seguir: http://source.android.com/, atualizado periodicamente.
-
-1.3 “Compatível com Android” significa qualquer implementação do Android que (i) obedece ao documento Definição de Compatibilidade com Android, que pode ser encontrado no site de compatibilidade do Android (http://source.android.com/compatibility) que pode ser atualizado de tempos em tempos; e (ii) seja aprovado no Android Compatibility Test Suite (CTS).
-
-1.4 “Google” se refere à Google Inc, uma corporação de Delaware, com sede em 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
-
-2. Aceitação do Contrato de Licença
-
-2.1 A fim de usar o Preview, é necessário concordar com este Contrato de licença. O uso do Preview é proibido àqueles que não concordam com este Contrato de licença.
-
-2.2 Ao clicar em aceitar e/ou usar o Preview, você concorda com os termos do Contrato de licença
-
-2.3 É proibido o uso do Preview e a aceitação deste contrato pelo indivíduo que tenha impedimento legal sobre o recebimento do Preview sob as leis dos Estados Unidos ou de outros países, incluindo o país de residência ou no qual usa o Preview.
-
-2.4 Se for usar o Preview internamente na empresa ou organização, você deverá concordar com o vínculo com este contrato em nome do empregador ou de outra entidade e declarar e garantir que tem total autoridade legal para tanto. Se você não tem a autoridade necessária, não deve concordar com este contrato nem usar o Preview em nome do empregador ou de outra entidade.
-
-3. Licença do Preview da Google
-
-3.1 Sujeito aos termos deste Contrato de licença, a Google confere uma licença limitada, mundial, sem royalties, intransmissível, não exclusiva e não sublicenciável unicamente para o uso do Preview exclusivamente para o desenvolvimento de aplicativos executados para implementações compatíveis do Android.
-
-3.2 Você não poderá usar este Preview para desenvolver aplicativos para outras plataformas (incluindo implementações não compatíveis do Android) nem para desenvolver outro SDK. Você tem a liberdade para desenvolver aplicativos para outras plataformas, incluindo implementações não compatíveis do Android, desde que este Preview não seja usado para essa finalidade.
-
-3.3 Você concorda que a Google ou terceiros detêm todos os direitos legais, títulos e interesses relativos ao Preview, incluindo quaisquer direitos de propriedade intelectual que subsistam no Preview. "Direitos de propriedade intelectual" se referem a todo e qualquer direito sob as leis de patentes, de direitos autorais, de segredo comercial, de marca registrada e todos os outros direitos de propriedade. A Google reserva todos os direitos não conferidos expressamente a você.
-
-3.4 O uso do Preview não é autorizado para qualquer finalidade não expressamente permitida por este Contrato de licença. Salvo na extensão exigida por licenças aplicáveis de terceiros, é proibido: (a) copiar (exceto para fins de cópia de segurança), modificar, adaptar, redistribuir, descompilar, fazer engenharia reversa, desmontar ou criar trabalhos derivados do Preview ou qualquer parte dele; ou (b) carregar qualquer parte do Preview em um aparelho celular ou outro dispositivo de hardware, exceto em computador pessoal, combinar qualquer parte do Preview com outros softwares ou distribuir qualquer software ou dispositivo que contenha uma parte do Preview.
-
-3.5 O uso, a reprodução e a distribuição de componentes do Preview licenciado sob uma licença de software de código aberto são regidos exclusivamente pelos termos daquela licença de software de código aberto, e não por este Contrato de licença. Você concorda em manter uma licença em situação regular para as licenças de software de código aberto sob todos os direitos concedidos e deter quaisquer ações que possam limitar, suspender ou romper tais direitos.
-
-3.6 Você concorda que a forma e a natureza do Preview que a Google fornece podem mudar sem aviso prévio e que as versões futuras do Preview podem ser incompatíveis com aplicativos desenvolvidos em versões anteriores do Preview. Você concorda que a Google pode cessar (permanente ou temporariamente) o fornecimento do Preview (ou quaisquer recursos dentro dele) a você ou a usuários em geral sob critério exclusivo da Google, sem aviso prévio.
-
-3.7 Nada neste Contrato de licença confere o direito de uso de quaisquer nomes comerciais, marcas comerciais, marcas de serviço, logomarcas, nomes de domínios e outros recursos de marcas especiais da Google.
-
-3.8 Você concorda que não removerá, ocultará nem alterará quaisquer observações de direitos de propriedade (incluindo observações de direitos autorais e de marcas registradas) que possam estar afixadas ou contidas no Preview.
-
-4. O uso do Preview
-
-4.1 A Google entende que nada no Contrato de Licença dá a ela direitos, título nem interesse sobre o usuário (ou sobre os seus licenciadores) sob o presente Contrato de licença nem sobre quaisquer aplicativos de software que o usuário desenvolver usando o Preview, incluindo quaisquer direitos de propriedade intelectual que subsistem nos referidos aplicativos.
-
-4.2 Você concorda em usar o Preview e desenvolver aplicativos somente para as finalidades permitidas por (a) este Contrato de licença e (b) quaisquer leis, normas, diretrizes geralmente aceitas ou orientações aplicáveis nas jurisdições relevantes (incluindo quaisquer leis acerca da exportação de dados ou softwares dos e para os Estados Unidos ou outros países relevantes.
-
-4.3 Você concorda que, se usar o Preview para o desenvolvimento de aplicativos, deverá proteger a privacidade e os direitos legais dos usuários. Se nomes de usuário, senhas ou outras informações de acesso ou informações pessoais forem fornecidos ao aplicativo, deve-se informá-los de que tais dados estarão disponíveis para o aplicativo, além de fornecer observações de privacidade e proteção legalmente adequadas a esses usuários. Se o aplicativo armazenar informações pessoais ou confidenciais fornecidas pelos usuários, deve fazê-lo com segurança. Se o usuário fornecer informações da conta do Google, o aplicativo poderá usar essas informações exclusivamente para acessar a conta da Google do usuário quando houver autorização para fazê-lo e para os fins limitados pela autorização.
-
-4.4 Você concorda que não se envolverá em qualquer atividade com o Preview, incluindo o desenvolvimento e a distribuição de um aplicativo que interfira, perturbe, danifique ou acesse, de modo não autorizado, servidores, redes ou outras propriedades ou serviços da Google ou qualquer outro terceiro.
-
-4.5 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) quaisquer dados, conteúdo ou recursos que criar, transmitir ou exibir por meio do Android e/ou de aplicativos do Android e pelas consequências que suas ações (incluindo perda ou dano que a Google possa sofrer) podem gerar.
-
-4.6 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) qualquer violação das obrigações exigidas neste Contrato de licença, qualquer contrato ou termos de serviço aplicáveis a terceiros, qualquer lei ou norma aplicável e pelas consequências (incluindo a perda ou dano que a Google ou qualquer terceiro possa sofrer) de quaisquer violações.
-
-4.7 O Preview está em desenvolvimento e o seu teste e feedback são uma parte importante deste processo. Ao usar o Preview, você está ciente de que a implementação de alguns recursos ainda estão em desenvolvimento e que não se deve confiar que o Preview tem a funcionalidade completa de uma versão estável. Você concorda em não distribuir nem enviar publicamente quaisquer aplicativos usando este Preview, pois ele não será mais suportado após o lançamento oficial do Android SDK.
-
-5. Suas credenciais de desenvolvedor
-
-5.1 Você é responsável pela manutenção da confidencialidade de quaisquer credenciais de desenvolvedor que possam ser emitidas pela Google ou escolhidas por você e será o único responsável por todos os aplicativos que forem desenvolvidos sob suas credenciais de desenvolvedor.
-
-6. Privacidade e informações
-
-6.1 A fim de inovar e aprimorar continuamente o Preview, a Google pode coletar certas estatísticas de uso do software, incluindo, sem limitar-se, um identificador exclusivo, endereço IP associado, número de versão do software e informações sobre quais ferramentas e/ou serviços no Preview estão sendo usados e como estão sendo usados. Antes de coletar quaisquer dessas informações, o Preview o notificará e buscará seu consentimento. Se você recusar, as informações não serão coletadas.
-
-6.2 Os dados coletados são examinados coletivamente para aprimorar o Preview e são mantidos em conformidade com a Política de privacidade da Google acessível em http://www.google.com/policies/privacy/.
-
-7. Aplicativos de terceiros
-
-7.1 Ao usar o Preview para executar aplicativos desenvolvidos por terceiros ou que acessam dados, conteúdo ou recursos fornecidos por terceiros, você concorda que a Google não é responsável por tais aplicativos, dados, conteúdo ou recursos. Você compreende que quaisquer dados, conteúdo ou recursos que possa acessar por meio de tais aplicativos de terceiros imputam responsabilidade exclusiva ao indivíduo que os originou. A Google não é responsável por qualquer perda ou dano que possa ocorrer como resultado do uso ou acesso de quaisquer aplicativos, dados, conteúdo ou recursos de terceiros.
-
-7.2 Você deve estar ciente de que os dados, conteúdo e recursos apresentados a você por aplicativos de terceiros podem ser protegidos pelos direitos de propriedade intelectual de posse dos fornecedores (ou de outras pessoas ou empresas em seus nomes). Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados com base nestes dados, conteúdo ou recursos (na totalidade ou em parte), salvo se houver permissão explícita especificada pelos respectivos proprietários.
-
-7.3 Você reconhece que o uso de tais aplicativos, dados, conteúdo ou recursos de terceiros pode estar sujeito a termos adicionais entre você e o terceiro em questão.
-
-8. Uso de APIs da Google
-
-8.1 APIs da Google
-
-8.1.1 Ao usar qualquer API para recuperar dados da Google, você reconhece que eles podem ser protegidos por direitos de propriedade intelectual de posse da Google ou dos terceiros que fornecem os dados (ou de pessoas ou empresas em nomes deles). O uso de tal API pode estar sujeito a termos de serviço adicionais. Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados baseados nesses dados (na totalidade ou em parte), salvo se permitido pelos termos de serviço pertinentes.
-
-8.1.2 Se você usar qualquer API para recuperar dados de um usuário a partir da Google, reconhece e concorda que deve recuperar dados somente com consentimento explícito do usuário e somente quando, e para os fins limitados aos quais, o usuário conceder permissão para fazê-lo.
-
-9. Rescisão do Contrato de licença
-
-9.1 O Contrato de licença continuará a se aplicar até que ocorra uma rescisão sua ou da Google, como definido abaixo.
-
-9.2 Caso queira rescindir o Contrato de licença, você pode fazer isto cessando o uso do Preview e de qualquer credencial de desenvolvedor relevante.
-
-9.3 A Google pode, a qualquer momento, rescindir o Contrato de licença, com ou sem causa, com uma notificação.
-
-9.4 O Contrato de licença será encerrado automaticamente sem aviso ou outras ações na ocorrência de:
-(A) a Google interromper o fornecimento do Preview ou de determinadas partes do Preview aos usuários no país em que você reside ou de onde o serviço é usado; e
-(B) a Google emitir uma versão de lançamento final do Android SDK.
-
-9.5 Quando o Contrato de licença é rescindido, a licença concedida a você no Contrato de licença é finalizada, todo o uso do Preview será interrompido e as provisões dos parágrafos 10, 11, 12 e 14 deverão permanecer indefinidamente.
-
-10. EXCLUSÕES
-
-10.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE O RISCO DO USO DO PREVIEW É EXCLUSIVAMENTE SEU E QUE O PREVIEW É FORNECIDO NA FORMA EM QUE SE ENCONTRA E COMO DISPONIBILIZADO, SEM GARANTIA DE QUALQUER TIPO DA GOOGLE.
-
-10.2 O USO DO PREVIEW E DE QUALQUER MATERIAL BAIXADO OU OBTIDO DE OUTRO MODO PELO USO DO PREVIEW ESTÁ A SEU CRITÉRIO E RISCO E VOCÊ É O ÚNICO RESPONSÁVEL POR QUALQUER DANO AO SEU SISTEMA OPERACIONAL OU OUTRO DISPOSITIVO OU PELA PERDA DE DADOS QUE RESULTEM DE TAL USO. SEM LIMITAR OS PRECEDENTES, VOCÊ ENTENDE QUE O PREVIEW NÃO É UMA VERSÃO ESTÁVEL E QUE PODE CONTER ERROS, DEFEITOS E VULNERABILIDADES DE SEGURANÇA QUE PODEM RESULTAR EM DANOS SIGNIFICANTES, INCLUINDO A PERDA IRRECUPERÁVEL OU COMPLETA DO USO DO SISTEMA DO COMPUTADOR OU DE OUTROS DISPOSITIVOS.
-
-10.3 A GOOGLE EXCLUI EXPRESSAMENTE TODAS AS GARANTIAS E CONDIÇOES DE QUALQUER TIPO, EXPRESSAS OU IMPLÍCITAS, INCLUINDO, MAS NÃO LIMITADO A, GARANTIAS E CONDIÇÕES DE COMERCIALIZAÇÃO IMPLÍCITAS, ADEQUAÇÃO A UMA FINALIDADE PARTICULAR E A NÃO VIOLAÇÃO.
-
-11. LIMITAÇÃO DE RESPONSABILIDADE
-
-11.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE A GOOGLE, SUAS SUBSIDIÁRIAS, AFILIADAS E SEUS LICENCIADORES NÃO SERÃO RESPONSABILIZADOS POR VOCÊ SOB QUALQUER TEORIA DE RESPONSABILIDADE POR QUAISQUER DANOS, SEJAM ELES DIRETOS, INDIRETOS, INCIDENTAIS, ESPECIAIS, CONSEQUENCIAIS OU DE EXEMPLO QUE POSSAM INCORRER, INCLUINDO QUALQUER PERDA DE DADOS, INDEPENDENTE DE AVISO À GOOGLE OU A SEUS REPRESENTANTES OU DA NECESSIDADE DE AVISO SOBRE A POSSIBILIDADE DA INCORRÊNCIA DE TAIS PERDAS.
-
-12. Indenização
-
-12.1 Ao limite máximo permitido por lei, você concorda em defender, indenizar e isentar a Google, suas afiliadas e respectivos conselheiros, diretores, empregados e agentes com relação a todas e quaisquer reivindicações, ações, processos ou procedimentos, bem como todas e quaisquer perdas, responsabilidades, danos, custos e despesas (incluindo honorários advocatícios) decorrentes ou provenientes de: (a) seu uso do Preview, (b) qualquer aplicativo desenvolvido no Preview que infrinja direitos de propriedade intelectual de qualquer pessoa, difame qualquer pessoa ou viole seus direitos de publicidade ou privacidade e (c) qualquer não cumprimento deste Contrato de licença.
-
-13. Mudanças no Contrato de licença
-
-13.1 A Google pode realizar mudanças no Contrato de licença à medida que distribui novas versões do Preview. Quando essas mudanças forem realizadas, a Google fará uma nova versão do Contrato de licença disponível no site em que o Preview estiver disponível.
-
-14. Termos legais gerais
-
-14.1 Esse Contrato de licença constitui o contrato legal integral entre você e a Google e rege o uso do Preview (excluindo quaisquer serviços que a Google possa fornecer a você sob um contrato escrito em separado), e substitui inteiramente quaisquer contratos anteriores entre você e a Google em relação ao Preview.
-
-14.2 Você concorda que, se a Google não exercer nem impetrar qualquer direito ou recurso legal que esteja contido no Contrato de licença (ou que a Google detenha direitos nos termos de qualquer lei aplicável), não se considerará esse fato como uma renúncia formal aos direitos da Google e esses direitos ou recursos continuarão disponíveis à Google.
-
-14.3 Se qualquer tribunal de justiça que tiver a competência para decidir sobre esse tema determinar que qualquer cláusula do Contrato de licença é inválida, tal cláusula será removida do contrato sem afetar as cláusulas restantes ou sua vigência. As cláusulas restantes do Contrato de licença continuarão válidas e obrigatórias.
-
-14.4 Você reconhece e concorda que cada membro do grupo de empresas das quais a Google é a empresa controladora deve ser beneficiário terceiro do Contrato de licença e que essas outras empresas terão o poder de aplicar diretamente, e apoiar-se em, qualquer cláusula do Contrato de licença que confira um direito (ou direitos em favor) deles. Além disso, nenhuma outra pessoa nem empresa deve ser beneficiário terceiro do Contrato de licença.
-
-14.5 RESTRIÇÕES DE EXPORTAÇÃO. O PREVIEW ESTÁ SUJEITO ÀS LEIS E NORMAS DE EXPORTAÇÃO DOS ESTADOS UNIDOS. VOCÊ DEVE CUMPRIR TODAS AS LEIS E NORMAS DOMÉSTICAS E INTERNACIONAIS QUE SE APLICAREM AO PREVIEW. ESSAS LEIS INCLUEM RESTRIÇÕES SOBRE DESTINOS, USUÁRIOS FINAIS E USO FINAL.
-
-14.6 O Contrato de licença não pode ser atribuído nem transferido por você sem a aprovação prévia por escrito da Google. Qualquer tentativa de atribuição sem a aprovação será inválida. Você não deve delegar as próprias responsabilidades ou obrigações nos termos do Contrato de licença sem aprovação prévia por escrito da Google.
-
-14.7 O Contrato de licença e sua relação com a Google nos termos do contrato serão regidos pelas leis do estado da Califórnia sem considerar conflitos de disposições legais. Você e a Google concordam em se submeter à competência exclusiva dos tribunais localizados na comarca de Santa Clara, Califórnia, para dirimir quaisquer questões legais decorrentes do Contrato de licença. Não obstante a isso, você concorda que a Google continua habilitada a impetrar medidas cautelares (ou mecanismo legal urgente equivalente) em qualquer jurisdição.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">Li e concordo com todos os termos e condições expressos acima</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- Esta página fornece links para imagens OTA de dispositivo e descreve
- como aplicar manualmente uma atualização OTA em um dispositivo. Esse procedimento pode ser útil
- para recuperar dispositivos que receberam atualizações OTA usando o programa beta
-do Android e não estão ligando após a instalação.
-</p>
-
-<h2 id="install-ota">Instalação de imagens OTA</h2>
-
-<p></p>
-
-<p>Para instalar um pacote OTA em um dispositivo:</p>
-
-<ol>
- <li>Baixe uma imagem OTA de dispositivo na tabela abaixo.</li>
- <li>Reinicialize o dispositivo para ficar em modo Recovery. Para obter mais informações sobre como colocar
- dispositivos Nexus nesse modo, consulte
- <a href="https://support.google.com/nexus/answer/4596836">Redefinição do
-dispositivo Nexus para voltar à configuração de fábrica</a>.
- </li>
- <li>No dispositivo, selecione <strong>ADB sideload</strong>.</li>
- <li>Conecte o dispositivo a um computador que tenha o ambiente de desenvolvimento Android
- carregado e a ferramenta Android Debug Bridge (adb) instalada.</li>
- <li>Execute o seguinte comando:
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">Imagem OTA de dispositivo</h2>
-
-<table>
- <tr>
- <th scope="col">Dispositivo</th>
- <th scope="col">Download / Checksums</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-ota-npd35k-b8cfbd80.zip</a><br>
- MD5: 15fe2eba9b01737374196bdf0a792fe9<br>
- SHA-1: 5014b2bba77f9e1a680ac3f90729621c85a14283
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-ota-npd35k-078e6fa5.zip</a><br>
- MD5: e8b12f7721c53af9a450f7058928a5fc<br>
- SHA-1: b7a9b756f84a1d2e482ff9c16749d65f6e51425a
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-ota-npd35k-88457699.zip</a><br>
- MD5: 3fac09fef759dde26e57cb80b20b6477<br>
- SHA-1: 27d6caa786577d8a38b2da5bf94b33b4524a1a1c
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-ota-npd35k-51dbae76.zip</a><br>
- MD5: 58312c4a5971818ef5c77a3f446003da<br>
- SHA-1: aad9005be33d3e2bab480509a6ab74c3c3b9d921
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-ota-npd35k-834f047f.zip</a><br>
- MD5: 92b7d1fa252f7394e70f957c72d4aac8<br>
- SHA-1: b6c057c84d90893630e303cbb60530e20ddb8361
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-ota-npd35k-6ac91298.zip</a><br>
- MD5: 1461622ad53ea842b2722fa7b49b8172<br>
- SHA-1: 409c061668ab270774877d7f3eae44fa48d2b931
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-ota-npd35k-a0b2347f.zip</a><br>
- MD5: c60117f3640cc6db12386fd632289c7d<br>
- SHA-1: 87349c767c69efb4172c90ce1d88cf578c3d28b3
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-ota-npd35k-09897a1d.zip</a><br>
- MD5: a55cf94f7cce0393ec6c0b35041766b7<br>
- SHA-1: 6f33742290eb46f2561891f38ca2e754b4e50c6a
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/pt-br/preview/download.jd b/docs/html-intl/intl/pt-br/preview/download.jd
deleted file mode 100644
index b0f23e5..0000000
--- a/docs/html-intl/intl/pt-br/preview/download.jd
+++ /dev/null
@@ -1,543 +0,0 @@
-page.title=Testes em um dispositivo
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Antes de fazer o download ou instalar componentes do
- Android Preview SDK, você deve concordar com os seguintes termos e
- condições.</p>
-
- <h2 class="norule">Termos e condições</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Este é o contrato de licença do Android SDK Preview (o “Contrato de Licença”).
-
-1. Introdução
-
-1.1 O Android SDK Preview (que este Contrato de licença chama de "Preview", incluindo especificamente os arquivos de sistema do Android, APIs integradas e arquivos da biblioteca Preview, se e quando estiverem disponíveis) é licenciado por meio da concordância com os termos deste contrato. O Contrato de licença forma um vínculo contratual legal entre o contratante e a Google em relação ao uso do Preview.
-
-1.2 "Android" refere-se à pilha de software do Android para dispositivos, conforme disponibilizado no Projeto de código aberto do Android, localizado no URL a seguir: http://source.android.com/, atualizado periodicamente.
-
-1.3 “Compatível com Android” significa qualquer implementação do Android que (i) obedece ao documento Definição de Compatibilidade com Android, que pode ser encontrado no site de compatibilidade do Android (http://source.android.com/compatibility) que pode ser atualizado de tempos em tempos; e (ii) seja aprovado no Android Compatibility Test Suite (CTS).
-
-1.4 “Google” se refere à Google Inc, uma corporação de Delaware, com sede em 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
-
-2. Aceitação do Contrato de Licença
-
-2.1 A fim de usar o Preview, é necessário concordar com este Contrato de licença. O uso do Preview é proibido àqueles que não concordam com este Contrato de licença.
-
-2.2 Ao clicar em aceitar e/ou usar o Preview, você concorda com os termos do Contrato de licença
-
-2.3 É proibido o uso do Preview e a aceitação deste contrato pelo indivíduo que tenha impedimento legal sobre o recebimento do Preview sob as leis dos Estados Unidos ou de outros países, incluindo o país de residência ou no qual usa o Preview.
-
-2.4 Se for usar o Preview internamente na empresa ou organização, você deverá concordar com o vínculo com este contrato em nome do empregador ou de outra entidade e declarar e garantir que tem total autoridade legal para tanto. Se você não tem a autoridade necessária, não deve concordar com este contrato nem usar o Preview em nome do empregador ou de outra entidade.
-
-3. Licença do Preview da Google
-
-3.1 Sujeito aos termos deste Contrato de licença, a Google confere uma licença limitada, mundial, sem royalties, intransmissível, não exclusiva e não sublicenciável unicamente para o uso do Preview exclusivamente para o desenvolvimento de aplicativos executados para implementações compatíveis do Android.
-
-3.2 Você não poderá usar este Preview para desenvolver aplicativos para outras plataformas (incluindo implementações não compatíveis do Android) nem para desenvolver outro SDK. Você tem a liberdade para desenvolver aplicativos para outras plataformas, incluindo implementações não compatíveis do Android, desde que este Preview não seja usado para essa finalidade.
-
-3.3 Você concorda que a Google ou terceiros detêm todos os direitos legais, títulos e interesses relativos ao Preview, incluindo quaisquer direitos de propriedade intelectual que subsistam no Preview. "Direitos de propriedade intelectual" se referem a todo e qualquer direito sob as leis de patentes, de direitos autorais, de segredo comercial, de marca registrada e todos os outros direitos de propriedade. A Google reserva todos os direitos não conferidos expressamente a você.
-
-3.4 O uso do Preview não é autorizado para qualquer finalidade não expressamente permitida por este Contrato de licença. Salvo na extensão exigida por licenças aplicáveis de terceiros, é proibido: (a) copiar (exceto para fins de cópia de segurança), modificar, adaptar, redistribuir, descompilar, fazer engenharia reversa, desmontar ou criar trabalhos derivados do Preview ou qualquer parte dele; ou (b) carregar qualquer parte do Preview em um aparelho celular ou outro dispositivo de hardware, exceto em computador pessoal, combinar qualquer parte do Preview com outros softwares ou distribuir qualquer software ou dispositivo que contenha uma parte do Preview.
-
-3.5 O uso, a reprodução e a distribuição de componentes do Preview licenciado sob uma licença de software de código aberto são regidos exclusivamente pelos termos daquela licença de software de código aberto, e não por este Contrato de licença. Você concorda em manter uma licença em situação regular para as licenças de software de código aberto sob todos os direitos concedidos e deter quaisquer ações que possam limitar, suspender ou romper tais direitos.
-
-3.6 Você concorda que a forma e a natureza do Preview que a Google fornece podem mudar sem aviso prévio e que as versões futuras do Preview podem ser incompatíveis com aplicativos desenvolvidos em versões anteriores do Preview. Você concorda que a Google pode cessar (permanente ou temporariamente) o fornecimento do Preview (ou quaisquer recursos dentro dele) a você ou a usuários em geral sob critério exclusivo da Google, sem aviso prévio.
-
-3.7 Nada neste Contrato de licença confere o direito de uso de quaisquer nomes comerciais, marcas comerciais, marcas de serviço, logomarcas, nomes de domínios e outros recursos de marcas especiais da Google.
-
-3.8 Você concorda que não removerá, ocultará nem alterará quaisquer observações de direitos de propriedade (incluindo observações de direitos autorais e de marcas registradas) que possam estar afixadas ou contidas no Preview.
-
-4. O uso do Preview
-
-4.1 A Google entende que nada no Contrato de Licença dá a ela direitos, título nem interesse sobre o usuário (ou sobre os seus licenciadores) sob o presente Contrato de licença nem sobre quaisquer aplicativos de software que o usuário desenvolver usando o Preview, incluindo quaisquer direitos de propriedade intelectual que subsistem nos referidos aplicativos.
-
-4.2 Você concorda em usar o Preview e desenvolver aplicativos somente para as finalidades permitidas por (a) este Contrato de licença e (b) quaisquer leis, normas, diretrizes geralmente aceitas ou orientações aplicáveis nas jurisdições relevantes (incluindo quaisquer leis acerca da exportação de dados ou softwares dos e para os Estados Unidos ou outros países relevantes.
-
-4.3 Você concorda que, se usar o Preview para o desenvolvimento de aplicativos, deverá proteger a privacidade e os direitos legais dos usuários. Se nomes de usuário, senhas ou outras informações de acesso ou informações pessoais forem fornecidos ao aplicativo, deve-se informá-los de que tais dados estarão disponíveis para o aplicativo, além de fornecer observações de privacidade e proteção legalmente adequadas a esses usuários. Se o aplicativo armazenar informações pessoais ou confidenciais fornecidas pelos usuários, deve fazê-lo com segurança. Se o usuário fornecer informações da conta do Google, o aplicativo poderá usar essas informações exclusivamente para acessar a conta da Google do usuário quando houver autorização para fazê-lo e para os fins limitados pela autorização.
-
-4.4 Você concorda que não se envolverá em qualquer atividade com o Preview, incluindo o desenvolvimento e a distribuição de um aplicativo que interfira, perturbe, danifique ou acesse, de modo não autorizado, servidores, redes ou outras propriedades ou serviços da Google ou qualquer outro terceiro.
-
-4.5 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) quaisquer dados, conteúdo ou recursos que criar, transmitir ou exibir por meio do Android e/ou de aplicativos do Android e pelas consequências que suas ações (incluindo perda ou dano que a Google possa sofrer) podem gerar.
-
-4.6 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) qualquer violação das obrigações exigidas neste Contrato de licença, qualquer contrato ou termos de serviço aplicáveis a terceiros, qualquer lei ou norma aplicável e pelas consequências (incluindo a perda ou dano que a Google ou qualquer terceiro possa sofrer) de quaisquer violações.
-
-4.7 O Preview está em desenvolvimento e o seu teste e feedback são uma parte importante deste processo. Ao usar o Preview, você está ciente de que a implementação de alguns recursos ainda estão em desenvolvimento e que não se deve confiar que o Preview tem a funcionalidade completa de uma versão estável. Você concorda em não distribuir nem enviar publicamente quaisquer aplicativos usando este Preview, pois ele não será mais suportado após o lançamento oficial do Android SDK.
-
-5. Suas credenciais de desenvolvedor
-
-5.1 Você é responsável pela manutenção da confidencialidade de quaisquer credenciais de desenvolvedor que possam ser emitidas pela Google ou escolhidas por você e será o único responsável por todos os aplicativos que forem desenvolvidos sob suas credenciais de desenvolvedor.
-
-6. Privacidade e informações
-
-6.1 A fim de inovar e aprimorar continuamente o Preview, a Google pode coletar certas estatísticas de uso do software, incluindo, sem limitar-se, um identificador exclusivo, endereço IP associado, número de versão do software e informações sobre quais ferramentas e/ou serviços no Preview estão sendo usados e como estão sendo usados. Antes de coletar quaisquer dessas informações, o Preview o notificará e buscará seu consentimento. Se você recusar, as informações não serão coletadas.
-
-6.2 Os dados coletados são examinados coletivamente para aprimorar o Preview e são mantidos em conformidade com a Política de privacidade da Google acessível em http://www.google.com/policies/privacy/.
-
-7. Aplicativos de terceiros
-
-7.1 Ao usar o Preview para executar aplicativos desenvolvidos por terceiros ou que acessam dados, conteúdo ou recursos fornecidos por terceiros, você concorda que a Google não é responsável por tais aplicativos, dados, conteúdo ou recursos. Você compreende que quaisquer dados, conteúdo ou recursos que possa acessar por meio de tais aplicativos de terceiros imputam responsabilidade exclusiva ao indivíduo que os originou. A Google não é responsável por qualquer perda ou dano que possa ocorrer como resultado do uso ou acesso de quaisquer aplicativos, dados, conteúdo ou recursos de terceiros.
-
-7.2 Você deve estar ciente de que os dados, conteúdo e recursos apresentados a você por aplicativos de terceiros podem ser protegidos pelos direitos de propriedade intelectual de posse dos fornecedores (ou de outras pessoas ou empresas em seus nomes). Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados com base nestes dados, conteúdo ou recursos (na totalidade ou em parte), salvo se houver permissão explícita especificada pelos respectivos proprietários.
-
-7.3 Você reconhece que o uso de tais aplicativos, dados, conteúdo ou recursos de terceiros pode estar sujeito a termos adicionais entre você e o terceiro em questão.
-
-8. Uso de APIs da Google
-
-8.1 APIs da Google
-
-8.1.1 Ao usar qualquer API para recuperar dados da Google, você reconhece que eles podem ser protegidos por direitos de propriedade intelectual de posse da Google ou dos terceiros que fornecem os dados (ou de pessoas ou empresas em nomes deles). O uso de tal API pode estar sujeito a termos de serviço adicionais. Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados baseados nesses dados (na totalidade ou em parte), salvo se permitido pelos termos de serviço pertinentes.
-
-8.1.2 Se você usar qualquer API para recuperar dados de um usuário a partir da Google, reconhece e concorda que deve recuperar dados somente com consentimento explícito do usuário e somente quando, e para os fins limitados aos quais, o usuário conceder permissão para fazê-lo.
-
-9. Rescisão do Contrato de licença
-
-9.1 O Contrato de licença continuará a se aplicar até que ocorra uma rescisão sua ou da Google, como definido abaixo.
-
-9.2 Caso queira rescindir o Contrato de licença, você pode fazer isto cessando o uso do Preview e de qualquer credencial de desenvolvedor relevante.
-
-9.3 A Google pode, a qualquer momento, rescindir o Contrato de licença, com ou sem causa, com uma notificação.
-
-9.4 O Contrato de licença será encerrado automaticamente sem aviso ou outras ações na ocorrência de:
-(A) a Google interromper o fornecimento do Preview ou de determinadas partes do Preview aos usuários no país em que você reside ou de onde o serviço é usado; e
-(B) a Google emitir uma versão de lançamento final do Android SDK.
-
-9.5 Quando o Contrato de licença é rescindido, a licença concedida a você no Contrato de licença é finalizada, todo o uso do Preview será interrompido e as provisões dos parágrafos 10, 11, 12 e 14 deverão permanecer indefinidamente.
-
-10. EXCLUSÕES
-
-10.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE O RISCO DO USO DO PREVIEW É EXCLUSIVAMENTE SEU E QUE O PREVIEW É FORNECIDO NA FORMA EM QUE SE ENCONTRA E COMO DISPONIBILIZADO, SEM GARANTIA DE QUALQUER TIPO DA GOOGLE.
-
-10.2 O USO DO PREVIEW E DE QUALQUER MATERIAL BAIXADO OU OBTIDO DE OUTRO MODO PELO USO DO PREVIEW ESTÁ A SEU CRITÉRIO E RISCO E VOCÊ É O ÚNICO RESPONSÁVEL POR QUALQUER DANO AO SEU SISTEMA OPERACIONAL OU OUTRO DISPOSITIVO OU PELA PERDA DE DADOS QUE RESULTEM DE TAL USO. SEM LIMITAR OS PRECEDENTES, VOCÊ ENTENDE QUE O PREVIEW NÃO É UMA VERSÃO ESTÁVEL E QUE PODE CONTER ERROS, DEFEITOS E VULNERABILIDADES DE SEGURANÇA QUE PODEM RESULTAR EM DANOS SIGNIFICANTES, INCLUINDO A PERDA IRRECUPERÁVEL OU COMPLETA DO USO DO SISTEMA DO COMPUTADOR OU DE OUTROS DISPOSITIVOS.
-
-10.3 A GOOGLE EXCLUI EXPRESSAMENTE TODAS AS GARANTIAS E CONDIÇOES DE QUALQUER TIPO, EXPRESSAS OU IMPLÍCITAS, INCLUINDO, MAS NÃO LIMITADO A, GARANTIAS E CONDIÇÕES DE COMERCIALIZAÇÃO IMPLÍCITAS, ADEQUAÇÃO A UMA FINALIDADE PARTICULAR E A NÃO VIOLAÇÃO.
-
-11. LIMITAÇÃO DE RESPONSABILIDADE
-
-11.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE A GOOGLE, SUAS SUBSIDIÁRIAS, AFILIADAS E SEUS LICENCIADORES NÃO SERÃO RESPONSABILIZADOS POR VOCÊ SOB QUALQUER TEORIA DE RESPONSABILIDADE POR QUAISQUER DANOS, SEJAM ELES DIRETOS, INDIRETOS, INCIDENTAIS, ESPECIAIS, CONSEQUENCIAIS OU DE EXEMPLO QUE POSSAM INCORRER, INCLUINDO QUALQUER PERDA DE DADOS, INDEPENDENTE DE AVISO À GOOGLE OU A SEUS REPRESENTANTES OU DA NECESSIDADE DE AVISO SOBRE A POSSIBILIDADE DA INCORRÊNCIA DE TAIS PERDAS.
-
-12. Indenização
-
-12.1 Ao limite máximo permitido por lei, você concorda em defender, indenizar e isentar a Google, suas afiliadas e respectivos conselheiros, diretores, empregados e agentes com relação a todas e quaisquer reivindicações, ações, processos ou procedimentos, bem como todas e quaisquer perdas, responsabilidades, danos, custos e despesas (incluindo honorários advocatícios) decorrentes ou provenientes de: (a) seu uso do Preview, (b) qualquer aplicativo desenvolvido no Preview que infrinja direitos de propriedade intelectual de qualquer pessoa, difame qualquer pessoa ou viole seus direitos de publicidade ou privacidade e (c) qualquer não cumprimento deste Contrato de licença.
-
-13. Mudanças no Contrato de licença
-
-13.1 A Google pode realizar mudanças no Contrato de licença à medida que distribui novas versões do Preview. Quando essas mudanças forem realizadas, a Google fará uma nova versão do Contrato de licença disponível no site em que o Preview estiver disponível.
-
-14. Termos legais gerais
-
-14.1 Esse Contrato de licença constitui o contrato legal integral entre você e a Google e rege o uso do Preview (excluindo quaisquer serviços que a Google possa fornecer a você sob um contrato escrito em separado), e substitui inteiramente quaisquer contratos anteriores entre você e a Google em relação ao Preview.
-
-14.2 Você concorda que, se a Google não exercer nem impetrar qualquer direito ou recurso legal que esteja contido no Contrato de licença (ou que a Google detenha direitos nos termos de qualquer lei aplicável), não se considerará esse fato como uma renúncia formal aos direitos da Google e esses direitos ou recursos continuarão disponíveis à Google.
-
-14.3 Se qualquer tribunal de justiça que tiver a competência para decidir sobre esse tema determinar que qualquer cláusula do Contrato de licença é inválida, tal cláusula será removida do contrato sem afetar as cláusulas restantes ou sua vigência. As cláusulas restantes do Contrato de licença continuarão válidas e obrigatórias.
-
-14.4 Você reconhece e concorda que cada membro do grupo de empresas das quais a Google é a empresa controladora deve ser beneficiário terceiro do Contrato de licença e que essas outras empresas terão o poder de aplicar diretamente, e apoiar-se em, qualquer cláusula do Contrato de licença que confira um direito (ou direitos em favor) deles. Além disso, nenhuma outra pessoa nem empresa deve ser beneficiário terceiro do Contrato de licença.
-
-14.5 RESTRIÇÕES DE EXPORTAÇÃO. O PREVIEW ESTÁ SUJEITO ÀS LEIS E NORMAS DE EXPORTAÇÃO DOS ESTADOS UNIDOS. VOCÊ DEVE CUMPRIR TODAS AS LEIS E NORMAS DOMÉSTICAS E INTERNACIONAIS QUE SE APLICAREM AO PREVIEW. ESSAS LEIS INCLUEM RESTRIÇÕES SOBRE DESTINOS, USUÁRIOS FINAIS E USO FINAL.
-
-14.6 O Contrato de licença não pode ser atribuído nem transferido por você sem a aprovação prévia por escrito da Google. Qualquer tentativa de atribuição sem a aprovação será inválida. Você não deve delegar as próprias responsabilidades ou obrigações nos termos do Contrato de licença sem aprovação prévia por escrito da Google.
-
-14.7 O Contrato de licença e sua relação com a Google nos termos do contrato serão regidos pelas leis do estado da Califórnia sem considerar conflitos de disposições legais. Você e a Google concordam em se submeter à competência exclusiva dos tribunais localizados na comarca de Santa Clara, Califórnia, para dirimir quaisquer questões legais decorrentes do Contrato de licença. Não obstante a isso, você concorda que a Google continua habilitada a impetrar medidas cautelares (ou mecanismo legal urgente equivalente) em qualquer jurisdição.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">Li e concordo com todos os termos e condições expressos acima</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#device-preview">Configurar um dispositivo de hardware</a>
- <ol>
- <li><a href="#ota">Obter atualizações OTA</a></li>
- <li><a href="#flash">Atualizar um dispositivo manualmente</a></li>
- <li><a href="#revertDevice">Desinstalar</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">Configurar um emulador</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Para executar e testar o aplicativo na nova plataforma, você deve configurar um ambiente de tempo de execução do
- Android N. Isso pode ser feito das seguintes maneiras:
-</p>
-
-<ul>
- <li>Instale o Android N em um dispositivo de hardware compatível ou</li>
- <li>Configure um emulador do Android que execute o Android N</li>
-</ul>
-
-<p>
- Se quiser um ambiente para fazer testes básicos de compatibilidade do seu aplicativo na
- nova plataforma, você só precisará do APK atual e de um dispositivo de hardware ou
- emulador. Não é necessário atualizar o ambiente de desenvolvimento completo
- para fazer testes básicos.
-</p>
-
-<p>
- Se quiser modificar seu aplicativo para direcioná-lo ao Android N ou usar as novas APIs do Android N,
- você deverá configurar um ambiente de desenvolvimento atualizado para oferecer suporte ao
- Android N. O documento <a href="{@docRoot}preview/setup-sdk.html">Preparação para desenvolver para o
- Android N</a> oferece os detalhes.
-</p>
-
-
-<h2 id="device-preview">Configurar um dispositivo de hardware</h2>
-
-<p>
- O N Developer Preview oferece atualizações de sistema para diversos dispositivos de hardware
- que podem ser usados para testar o aplicativo, de celulares a tablets e televisões.
-</p>
-
-<p>
- Se você tiver acesso a um dispositivo compatível, poderá atualizá-lo para uma versão de marco do Developer
- Preview de uma das seguintes maneiras:
-</p>
-
-<ul>
- <li><strong>Inscreva o dispositivo nas atualizações de sistema automáticas por OTA</strong> usando o
- <a href="https://g.co/androidbeta"> Android Beta Program</a>. Após a inscrição, seu dispositivo receberá atualizações regulares
- por OTA de todas as versões de marco do N Developer Preview. Essa
- abordagem é recomendada porque ela permite que você faça uma transição tranquila do ambiente
- atual para as várias versões do N Developer Preview.</li>
- <li><strong>Faça o download de uma imagem de sistema do Developer Preview e atualize o dispositivo manualmente</strong>.
- Atualizações por OTA não são fornecidas automaticamente para dispositivos que são atualizados manualmente, mas
- é possível inscrever esses dispositivos no programa beta do Android para receber atualizações por OTA. </li>
-</ul>
-
-<h3 id="ota">Inscrever o dispositivo para receber atualizações automáticas por OTA</h3>
-
-<p>
- Se você tiver acesso a um dispositivo compatível (veja a lista na tabela de
- downloads), poderá receber atualizações por OTA de versões do Preview do Android
- ao inscrever esse dispositivo no <a href="https://g.co/androidbeta">programa beta do Android</a>. Essas atualizações são
- baixadas automaticamente e serão aplicadas no dispositivo da mesma maneira que
- atualizações de sistema oficiais.
-</p>
-
-<p>
- Você pode cancelar a inscrição do dispositivo a qualquer momento. O dispositivo receberá uma atualização por OTA
- para a versão de produção mais recente disponível do Android para o dispositivo em questão
- (por exemplo, o Android 6.0 Marshmallow). Essa atualização exige que o dispositivo seja totalmente
- redefinido, portanto, os dados do usuário serão removidos. Não deixe de <strong>fazer o backup
- de dados importantes</strong> antes de cancelar a inscrição de um dispositivo.
-</p>
-
-<p>
- Para saber mais e para inscrever seu dispositivo, consulte
- o site do <a href="https://g.co/androidbeta">programa beta do Android</a>.
-</p>
-
-<p class="note"><strong>Observação:</strong>
- Cancelar um dispositivo exige uma redefinição total. Faça primeiro o backup
- de dados importantes.
-</p>
-
-<h3 id="flash">Atualizar um dispositivo manualmente</h3>
-
-<p>
- A qualquer momento, você pode fazer o download da imagem de sistema mais recente do Developer Preview e
- aplicá-la manualmente ao dispositivo. Consulte a tabela abaixo para fazer o download da
- imagem de sistema para o dispositivo de teste. A atualização manual de um dispositivo é útil se você precisa de um
- controle preciso sobre o ambiente de teste ou se precisa reinstalar com frequência,
- como em testes automatizados.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- Instalar uma imagem de sistema em um dispositivo <strong>remove todos os dados
- do dispositivo</strong>, portanto, faça primeiro o backup dos dados.
-</p>
-
-<p>
- Após fazer o backup dos dados do dispositivo e baixar a imagem de sistema abaixo que
- corresponda ao seu dispositivo, siga as instruções em<a href="https://developers.google.com/android/nexus/images#instructions"> developers.google.com/android</a>
- para aplicar a imagem no dispositivo.
-</p>
-
-<p>
- Imagens de sistema atualizadas manualmente <strong>não recebem
- atualizações por OTA automaticamente</strong> para versões de marco posteriores do
- Developer Preview. Mantenha o ambiente atualizado e aplique
- uma nova imagem de sistema a cada marco do Developer Preview.
-</p>
-
-<p>
- Se decidir que deseja obter atualizações por OTA após atualizar um dispositivo manualmente,
-basta inscrevê-lo no <a href="https://g.co/androidbeta">programa beta
- do Android</a>. É possível inscrever dispositivos a qualquer momento para receber a próxima atualização do Preview
- por OTA.
-</p>
-
-<table>
- <tr>
- <th scope="col">Dispositivo</th>
- <th scope="col">Download / Checksums</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npd35k-factory-5ba40535.tgz</a><br>
- MD5: b6c5d79a21815ee21db41822dcf61e9f<br>
- SHA-1: 5ba4053577007d15c96472206e3a79bc80ab194c
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npd35k-factory-a33bf20c.tgz</a><br>
- MD5: e1cf9c57cfb11bebe7f1f5bfbf05d7ab<br>
- SHA-1: a33bf20c719206bcf08d1edd8da6c0ff9d50f69c
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npd35k-factory-81c341d5.tgz</a><br>
- MD5: e93de7949433339856124c3729c15ebb<br>
- SHA-1: 81c341d57ef2cd139569b055d5d59e9e592a7abd
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npd35k-factory-2b50e19d.tgz</a><br>
- MD5: 565be87ebb2d5937e2abe1a42645864b<br>
- SHA-1: 2b50e19dae2667b27f911e3c61ed64860caf43e1
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npd35k-factory-2e89ebe6.tgz</a><br>
- MD5: a8464e15c6683fe2afa378a63e205fda<br>
- SHA-1: 2e89ebe67a46b2f3beb050746c13341cd11fa678
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npd35k-factory-1de74874.tgz</a><br>
- MD5: c0dbb7db671f61b2785da5001cedefcb<br>
- SHA-1: 1de74874f8d83e14d642f13b5a2130fc2aa55873
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npd35k-factory-b4eed85d.tgz</a><br>
- MD5: bdcb6f770e753668b5fadff2a6678e0d<br>
- SHA-1: b4eed85de0d42c200348a8629084f78e24f72ac2
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npd35k-factory-5ab1212b.tgz</a><br>
- MD5: 7d34a9774fdd6e025d485ce6cfc23c4c<br>
- SHA-1: 5ab1212bc9417269d391aacf1e672fff24b4ecc5
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> (D6603 e D6653)</td>
- <td>Download: <a class="external-link" href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- Para obter mais informações, consulte <a class="external-link" href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">Experimente o Android N Developer Preview para Xperia Z3</a>.
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">Desinstalar o Preview de um dispositivo</h3>
-
-<p>
- O Preview pode ser desinstalado de um dispositivo de uma das
- seguintes maneiras: </p>
- <ul>
- <li><strong>Obtenha uma imagem de sistema com especificações de fábrica</strong> e aplique-a
- manualmente no dispositivo.
- <ul>
- <li>Para <strong>dispositivos Nexus e Pixel C</strong>, consulte
- a página de downloads de <a href="http://developers.google.com/android/nexus/images">Imagens de fábrica
- para dispositivos Nexus</a>. </li>
- <li>Para <strong>outros dispositivos</strong>, entre em contato
- diretamente com o fabricante. Alternativamente, se o dispositivo for compatível
- com o programa beta do Android, será possível inscrevê-lo no
- programa e depois cancelar a inscrição (veja abaixo).</li>
- </ul>
- </li>
- <li><strong>Cancele a inscrição do dispositivo no programa beta do Android</strong>. Se o
- dispositivo estiver inscrito no <a href="https://g.co/androidbeta">programa beta
-do Android</a>, independentemente de qual ele seja, você poderá simplesmente cancelar a inscrição.
- <p>
- O dispositivo receberá uma atualização por OTA para a versão
- de produção mais recente disponível do Android para o dispositivo em questão (por exemplo, o Android 6.0 Marshmallow).
- Essa atualização exige que o dispositivo seja totalmente redefinido, portanto, os dados do usuário serão
- removidos. Não deixe de <strong>fazer o backup de dados importantes</strong> antes de
- cancelar a inscrição de um dispositivo.
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>Observação:</strong>
- Para desinstalar uma imagem de sistema do Developer Preview antes do
- fim do programa, é preciso redefinir o dispositivo por completo e remover todos os dados
- do usuário no dispositivo.
-</p>
-
-
-<h2 id="setupAVD">Configurar um emulador</h2>
-
-<p>Para usar o emulador do Android para executar o Android N Preview, você deve
-fazer o download do Android N Preview SDK e criar um dispositivo virtual para o
-emulador.</p>
-
-<p>Primeiro, faça o download do Android N Preview SDK da seguinte maneira (se você
-já adquiriu esse recurso ao <a href="{@docRoot}preview/setup-sdk.html">se preparar
-para desenvolver para o Android N</a>, pule esta etapa):
-
-<ol>
- <li>No Android Studio, abra a caixa de diálogo Settings
- (<strong>File > Settings</strong> no Windows/Linux ou
- <strong>Android Studio > Preferences</strong> no Mac). No
- painel à esquerda, selecione <strong>Appearance & Behavior >
- System Settings > Android SDK</strong>.
-
- <li>Clique na guia <strong>SDK Platforms</strong> e marque a caixa de seleção
- <strong>Android N Preview</strong>.</li>
-
- <li>Clique na guia <strong>SDK Tools</strong> e marque as caixas de seleção
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong> e <strong>Android SDK Tools</strong>
-.
- </li>
-
- <li>Clique em <strong>OK</strong> e aceite os termos de licença
- de qualquer pacote que precise ser instalado.
- </li>
-</ol>
-
-<p>Agora, você deve ter o <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-o <strong>Platform-Tools 24.0.0 rc1</strong> e o <strong>SDK Tools
-25.0.9</strong>. Se você não atualizar o SDK Tools para a versão 25.0.9, não será
-possível executar as imagens de sistema x86_64 para o Android N.</p>
-
-
-<p>Agora, crie um dispositivo virtual com a imagem de sistema do Android N:</p>
-
-<ol>
- <li>Abra o AVD Manager selecionando <strong>Tools > Android >
- AVD Manager</strong>.</li>
- <li>Clique em <strong>Create Virtual Device</strong>.</li>
- <li>Selecione um dispositivo como Nexus 5X, Nexus 6P, Nexus 9 ou Android TV
- e clique em <strong>Next</strong>.</li>
- <li>Selecione a imagem de sistema <strong>N</strong> (com ABI
- <strong>x86</strong>) e clique em <strong>Next</strong>.
- (Apenas imagens de sistema x86 atualmente são compatíveis com o emulador do Android
-para o Android N Preview.)
- <li>Conclua a configuração do AVD e clique em
- <strong>Finish</strong>.</li>
-</ol>
-
-<p>Agora, é possível iniciar o emulador do Android com o AVD Android N Preview.</p>
-
-<p>
-Para ter a melhor experiência possível com o emulador do Android, instale o
-Android Studio 2.1 ou mais recente, que oferece suporte ao <a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0</a>,
-cujo desempenho é muito superior ao do emulador no
-Android Studio 1.5.</p>
-
-<p>Para saber mais sobre como criar dispositivos virtuais para teste, consulte <a href="{@docRoot}tools/devices/index.html">Gerenciamento de dispositivos virtuais</a>.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/pt-br/preview/features/afw.jd b/docs/html-intl/intl/pt-br/preview/features/afw.jd
deleted file mode 100644
index c16cff9..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/afw.jd
+++ /dev/null
@@ -1,552 +0,0 @@
-page.title=Atualizações no Android for Work
-page.metaDescription=Novas APIs do Android for Work e novos recursos do Android N.
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#qr">Provisionamento de código QR
-</a></li>
-
- <li><a href="#sec-challenge">Desafio de segurança de perfil de trabalho
-</a></li>
-
- <li><a href="#suspend">Desativar acesso a aplicativos
-</a></li>
-
- <li><a href="#toggle-work">Alternar modo de trabalho
-</a></li>
-
- <li><a href="#always-on-vpn">Always-On VPN
-</a></li>
-
- <li><a href="#contacts">Integração de contatos com perfil de trabalho
-</a></li>
-
- <li><a href="#remote-reboot">Reinicialização remota
-</a></li>
-
- <li><a href="#disable-roaming">Desativação de roaming de dados
-</a></li>
-
- <li><a href="#process-logging">Registro do processo empresarial
-</a></li>
-
- <li><a href="#bug-reports">Relatórios de erros remotos
-</a></li>
-
- <li><a href="#remove-cert">Remoção de certificado do cliente
-</a></li>
-
- <li><a href="#grant-cert-on-install">Concessão de acesso a certificado do cliente
-na instalação</a></li>
-
- <li><a href="#ui-policy">Transparência da política de IU do sistema
-</a></li>
-
- <li><a href="#restrictions-mgmt">Melhorias no gerenciamento de restrições de aplicativos
-</a></li>
-
- <li><a href="#location-off">Interruptor para desativar localidade
-</a></li>
-
- <li><a href="#custom-provisioning">Provisionamento personalizado
-</a></li>
-
- <li><a href="#multi-wifi-ca">Diversos certificados de CA para Wi-Fi
-</a></li>
-
- <li><a href="#custom-lock">Mensagem de tela de bloqueio personalizada
-</a></li>
-
- <li><a href="#work-connectionservice">Perfil de trabalho ConnectionService
-</a></li>
-
- <li><a href="#lock-wp">Bloqueio de plano de fundo
-</a></li>
-
- <li><a href="#lock-user-icon">Bloqueio de ícone de usuário
-</a></li>
-
- <li><a href="#health-monitoring">Monitoramento da saúde do dispositivo
-</a></li>
-
- </ol>
-
- <h2>Veja também</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
-do N Preview SDK</a></li>
- </ul>
- </div>
-</div>
-
-<p>Este documento descreve os novos recursos do Android for Work oferecidos no
-Android N.</p>
-
-<h2 id="qr">Provisionamento de código QR</h2>
-
-<p>
- O Android for Work agora é compatível com o uso de códigos QR para fornecimento de dispositivos
-de responsabilidade corporativa. Este assistente de configuração permite a digitalização de um código QR para fornecer
-ao dispositivo.
-</p>
-
-<h2 id="sec-challenge">Desafio de segurança de perfil de trabalho</h2>
-
-<p>
- Donos de perfis podem exigir que os usuários especifiquem um desafio de segurança para aplicativos
-em execução no perfil de trabalho. O sistema mostra o desafio de segurança quando o
-usuário tenta abrir qualquer aplicativo de trabalho. Se o usuário preencher corretamente o
- desafio de segurança, o sistema desbloqueará e, se necessário, descriptografará o
-perfil de trabalho.
-</p>
-
-<p>
- Se um dono de perfil enviar uma intenção {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD}, o
- sistema solicitará que o usuário defina um desafio de segurança. O dono de perfil também
- pode enviar uma intenção <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> para
- solicitar que o usuário defina um bloqueio de dispositivo.
-</p>
-
-<p>
- Os donos de perfil podem escolher políticas de senha diferentes
- das políticas de outros dispositivos para o desafio de trabalho. Por exemplo, o
- tamanho mínimo da resposta do desafio no dispositivo pode ser diferente do tamanho
- exigido para outras senhas. Os donos de perfis definem as
-políticas do desafio por meio dos métodos {@link android.app.admin.DevicePolicyManager}
-usuais, como {@link
-android.app.admin.DevicePolicyManager#setPasswordQuality
-setPasswordQuality()} e {@link
-android.app.admin.DevicePolicyManager#setPasswordMinimumLength
-setPasswordMinimumLength()}. O dono de perfil também pode definir o bloqueio de dispositivo
-usando a instância de {@link android.app.admin.DevicePolicyManager} retornada
-pelo novo método <code>DevicePolicyManager.getParentProfileInstance()</code>
-. Além disso, donos de perfil podem personalizar a tela de credenciais do
-desafio de trabalho usando os novos métodos <code>setOrganizationColor()</code> e
- <code>setOrganizationName()</code> da classe {@link android.app.admin.DevicePolicyManager}
-.
-</p>
-
-<p>
- Para obter detalhes sobre os novos métodos e constantes, consulte a
-página de referência <code>DevicePolicyManager</code> na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referência do N Preview SDK</a>.
-</p>
-
-<h2 id="suspend">Desativar acesso a aplicativos</h2>
-
-<p>
- Donos de dispositivos e perfis podem suspender temporariamente o acesso a pacotes
- chamando o novo método <code>DevicePolicyManager.setPackagesSuspended()</code>
-. Os donos podem usar o mesmo método para reativar esses pacotes.
-</p>
-
-<p>
- Enquanto está suspenso, um pacote não consegue iniciar atividades, as notificações
- são suspensas e a entrada do aplicativo na <a href="{@docRoot}guide/components/recents.html">tela de visão geral</a> é ocultada.
- Os pacotes suspensos não são exibidos na <a href="{@docRoot}guide/components/recents.html">tela de visão geral</a> e não
- podem mostrar caixas de diálogo (incluindo avisos e snackbars). Também não conseguem reproduzir
- áudio nem vibrar o dispositivo.
-</p>
-
-<p>
- A tela de início pode aplicar uma IU destacada ao aplicativos suspensos para mostrar que
- não estão disponíveis. Podem, por exemplo, exibir o ícone do aplicativo
- em cinza. A tela de início pode descobrir se um aplicativo está suspenso chamando o novo método
- <code>DevicePolicyManager.getPackageSuspended()</code>.
-</p>
-
-<h2 id="toggle-work">Alternar modo de trabalho</h2>
-
-<p>
- Em dispositivos com dois perfis, o usuário pode ativar ou desativar o modo de trabalho. Quando o modo de trabalho
- é desativado, o perfil gerenciado é encerrado temporariamente. Os aplicativos,
- a sincronização em segundo plano e as notificações do perfil de trabalho são desativados, inclusive
- o aplicativo do dono do perfil. Quando o modo de trabalho está desativado, o sistema
- exibe um ícone de status persistente para lembrar ao usuário que não é possível iniciar aplicativos
-de trabalho. A tela de início indica que os aplicativos e widgets de trabalho não podem
- ser acessados.
-</p>
-
-<h2 id="always-on-vpn">Always-On VPN</h2>
-
-<p>
- Os donos de dispositivo e perfil podem exigir que os aplicativos de trabalho se conectem sempre
-por meio de uma VPN especificada. Se os donos definirem este requisito, o
- dispositivo iniciará a VPN automaticamente na inicialização.
-</p>
-
-<p>
- Os donos podem exigir o uso de uma VPN chamando o novo
-método <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code>. Para descobrir
- se o dono definiu um requisito de VPN, chame o novo
- método <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>
- Como o sistema pode vincular os serviços de VPN diretamente sem interação com aplicativos,
- os clientes de VPN precisam processar novos pontos de entrada para a Always-on VPN. Como antes, você
- pode encontrar serviços ativos usando um filtro de intenção que corresponda à ação
- {@link android.net.VpnService android.net.VpnService}.
-</p>
-
-<p>
- Os usuários podem configurar manualmente um cliente de VPN always-on que implemente {@link
-android.net.VpnService} usando a tela <strong>Settings > More >
- VPN</strong>.
-</p>
-
-<h2 id="contacts">Integração de contatos com perfil de trabalho</h2>
-
-<p>
- Os donos de perfil podem permitir pesquisa local e busca no diretório de contatos de trabalho
- do usuário principal. Por exemplo, um usuário pode acessar os diretórios de contatos
- pessoais e de trabalho no telefone ou no aplicativo de contatos particular (se
- permitido pelo administrador do perfil).
-</p>
-
-<p>
- Desenvolvedores que se valem do Provedor de Contatos podem usar a Enterprise Contacts API
- para acessar as entradas do diretório do perfil de trabalho do usuário principal se permitido
- pela política:
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- Donos de perfis podem controlar a visibilidade de contatos de trabalho no usuário
- principal usando os seguintes novos métodos:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">Reinicialização remota</h2>
-
-<p>
- Donos de dispositivos podem reinicializá-los remotamente. Em alguns casos, dispositivos implementados
- dentro de compartimentos em locais públicos podem impedir o acesso ao botão liga/desliga. Se um
- dispositivo precisar de reinicialização, os administradores poderão fazer isso usando o novo
- método <code>DevicePolicyManager.reboot()</code>.
-</p>
-
-<h2 id="disable-roaming">Desativação de roaming de dados</h2>
-
-<p>
- Os donos de dispositivos podem desativar o roaming de dados usando a nova restrição de usuário <code>DISALLOW_DATA_ROAMING</code> do {@link
-android.os.UserManager}.
-</p>
-
-<h2 id="process-logging">Registro do processo empresarial</h2>
-
-<p>
- Donos de dispositivos podem monitorá-los remotamente
- para identificar atividades suspeitas, incluindo inicialização de aplicativos, atividade adb e desbloqueios de tela. Registros de processo
- não exigem consentimento do usuário. Para recuperar os registros, os donos de dispositivos precisam ativar
-o registro no dispositivo usando <code>DevicePolicyManager.setSecurityLoggingEnabled()</code>.
-</p>
-
-<p>
- As mudanças na API incluem:
-</p>
-
-<ul>
-
- <li>
- A nova classe <code>android.app.admin.SecurityLog</code> e seus
- métodos
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">Relatórios de erros remotos</h2>
-
-<p>
- Donos de dispositivos podem acionar e recuperar remotamente um relatório de erros que contém um
- arquivo de despejo, o que permite a investigação forense de um incidente
- conhecido ou um dispositivo danificado. Devido à natureza detalhada do relatório de erros,
- ele só é gerado com o consentimento do usuário.
-</p>
-
-<p>
- O Android N inclui as seguintes adições de API para dar suporte a este recurso. Para
-obter detalhes, consulte a <a href="{@docRoot}preview/setup-sdk.html#docs-dl"> Referência do N
- Preview SDK</a>.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">Remoção de certificado do cliente</h2>
-
-<p>
- Agora, donos de perfis e dispositivos podem remover certificados de cliente que foram
-instalados por meio do {@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()} chamando o novo método
- <code>DevicePolicyManager.removeKeyPair()</code>.
-</p>
-
-<h2 id="grant-cert-on-install">Concessão de acesso a certificado do cliente
-na instalação</h2>
-
-<p>
- Se um dono de perfil ou dispositivo conceder a um aplicativo de terceiros a capacidade de
- gerenciar certificados, o próprio aplicativo poderá conceder acesso a certificados que
- tenha instalado sem qualquer intervenção do dono.
-</p>
-
-<p>
- A API existente para gerenciamento de certificados foi expandida para incluir:
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">Transparência da política de IU do sistema</h2>
-
-<p>
- Políticas que afetem a experiência do usuário ou restrinjam Settings são
- totalmente divulgadas e os donos de perfis e dispositivos podem atribuir a
- política ao departamento de TI da empresa. Além de incluir uma mensagem consistente de "Ação
- não permitida” em Settings, os administradores de TI podem definir uma
- mensagem de suporte específica para a organização nas configurações do dispositivo com os seguintes
- novos métodos {@link android.app.admin.DevicePolicyManager}:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="restrictions-mgmt">Melhorias no gerenciamento de restrições de aplicativos</h2>
-
-<p>
- O dono do dispositivo ou perfil pode habilitar outro aplicativo para gerenciar restrições de aplicativo
- por meio do novo
- método <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code>
-. O aplicativo indicado pode verificar se a permissão foi
-concedida chamando
- <code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code>.
-</p>
-
-<p>
- Um aplicativo indicado para gerenciar restrições de aplicativos pode chamar {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
-setApplicationRestrictions()} e {@link
-android.app.admin.DevicePolicyManager#getApplicationRestrictions
-getApplicationRestrictions()} para quaisquer pacotes dentro daquele usuário ou perfil.
-</p>
-
-<h2 id="location-off">Interruptor para desativar localidade</h2>
-
-<p>
- Os usuários podem desativar as permissões de localidade para aplicativos de trabalho sem deixar de
- acessar informações de localidade em seus aplicativos pessoais. Um interruptor de acesso de localidade
- em separado em Location Settings permite que o usuário impeça atualizações de localização ou
- consultas de última localidade em aplicativos executados no perfil de trabalho.
-</p>
-
-<p>
- O interruptor de desligamento de localidade em nível superior desativa o acesso à localidade para o
- perfil principal e o perfil gerenciado.
-</p>
-
-<h2 id="custom-provisioning">Provisionamento personalizado</h2>
-
-<p>
- Um aplicativo pode personalizar os fluxos de provisionamento do dono do perfil e do dispositivo
- com cores e logos corporativos.
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- Personaliza a cor do fluxo.
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- Personaliza o fluxo com um logo corporativo.
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">Diversos certificados de CA para Wi-Fi</h2>
-
-<p>
- Donos de dispositivos e perfis podem definir vários certificados de CA para uma determinada
- configuração de Wi-Fi. Quando redes Wi-Fi corporativas têm CA separadas para
- pontos de acesso separados com o mesmo SSID, os administradores de TI podem incluir todas as
- CA correspondentes na configuração de Wi-Fi usando o novo método
- <code>setCaCertificates()</code>.
-</p>
-
-<p>
- As APIs adicionadas foram:
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">Mensagem de tela de bloqueio personalizada</h2>
-
-<p>
- Donos de dispositivos podem fornecer informações a ser exibidas na tela de bloqueio.
- Essas informações têm prioridade sobre a mensagem do usuário na tela de bloqueio (se houver uma
- definida). Os novos métodos {@link android.app.admin.DevicePolicyManager} são:
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">Perfil de trabalho ConnectionService</h2>
-
-<p>
- Os donos de perfil podem especificar um aplicativo de telefone de trabalho que usa um
- {@link android.telecom.ConnectionService} específico para trabalho para o back-end de
- chamada (contas de chamada). O telefone de trabalho só mantém um registro de chamadas de trabalho
- e baseia-se apenas em contatos de trabalho. Os usuários têm uma experiência consistente
- de IU em chamada em qualquer aplicativo de ligação. As chamadas recebidas pelas contas de trabalho
- são distintas das chamadas recebidas pelas
-contas pessoais.
-</p>
-
-<p>
- O telefone deve verificar o novo sinalizador
- <code>android.telecom.Call.PROPERTY_WORK_CALL</code> para determinar se a chamada
- é de trabalho. Se for de trabalho, o telefone deverá indicar o fato
- adicionando um distintivo de trabalho, por exemplo.
-</p>
-
-<h2 id="lock-wp">Bloqueio de plano de fundo</h2>
-
-<p>
- Uma nova restrição de usuário (<code>DISALLOW_SET_WALLPAPER</code>) impede que
- o usuário altere o plano de fundo. O dono do dispositivo ou perfil ainda pode
- alterar o plano de fundo, mas só consegue mudar o plano de fundo
- do usuário ou perfil que controla. Por exemplo, um dono de perfil não consegue mudar o
-plano de fundo do usuário pai, mas o dono de um perfil principal e
- o dono do dispositivo conseguem. Um dono de perfil ou dispositivo que queira alterar o
- plano de fundo precisa verificar se o usuário ou perfil que gerencia tem um
- plano de fundo ({@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}) e se possui permissão para alterá-lo (com o
- novo método <code>WallpaperManager.isWallpaperSettingAllowed()</code>)
-</p>
-
-<h2 id="lock-user-icon">Bloqueio de ícone de usuário</h2>
-
-<p>
- Uma nova restrição de usuário (<code>DISALLOW_SET_USER_ICON</code>) impede que
- o usuário altere o ícone de usuário. O dono do dispositivo ou perfil
- ainda pode alterar o ícone. No entanto, um dono de perfil só consegue alterar o
- ícone de usuário do perfil que controla.
-</p>
-
-<h2 id="health-monitoring">Monitoramento da saúde do dispositivo</h2>
-
-<p>
- Um dono de perfil ou dispositivo pode usar a nova interface
- <code>HardwarePropertiesManager</code> para recuperar informações importantes
- sobre a integridade do dispositivo, como temperatura da CPU ou da GPU e uso de CPU. A nova
- interface de monitoramento é especialmente útil para monitorar dispositivos não assistidos
- executados em uma localidade remota.
-</p>
diff --git a/docs/html-intl/intl/pt-br/preview/features/background-optimization.jd b/docs/html-intl/intl/pt-br/preview/features/background-optimization.jd
index 073fd5e..cf4bbe9 100644
--- a/docs/html-intl/intl/pt-br/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/pt-br/preview/features/background-optimization.jd
@@ -62,7 +62,7 @@
<li>Os aplicativos direcionados ao Preview não receberão transmissões {@link
android.net.ConnectivityManager#CONNECTIVITY_ACTION} se estiverem
registrados para recebê-las no seu manifesto. Os aplicativos em execução ainda
-poderão escutar {@code CONNECTIVITY_CHANGE} no encadeamento principal registrando um
+poderão escutar {@code CONNECTIVITY_CHANGE} no encadeamento principal registrando um
{@link android.content.BroadcastReceiver} em {@link
android.content.Context#registerReceiver Context.registerReceiver()}.
</li>
@@ -111,7 +111,7 @@
</p>
<p class="note">
- <strong>Observação:</strong> Um {@link android.content.BroadcastReceiver} registrado em
+ <strong>Observação:</strong> Um {@link android.content.BroadcastReceiver} registrado em
{@link android.content.Context#registerReceiver Context.registerReceiver()}
continuará a receber essas transmissões enquanto o aplicativo estiver em execução.
</p>
@@ -185,7 +185,7 @@
</p>
<p>
- O aplicativo continuará a receber retornos de chamada até que o aplicativo encerre ou chame
+ O aplicativo continuará a receber retornos de chamada até que o aplicativo encerre ou chame
{@link android.net.ConnectivityManager#unregisterNetworkCallback
unregisterNetworkCallback()}.
</p>
diff --git a/docs/html-intl/intl/pt-br/preview/features/data-saver.jd b/docs/html-intl/intl/pt-br/preview/features/data-saver.jd
deleted file mode 100644
index 29c9ee4..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/data-saver.jd
+++ /dev/null
@@ -1,234 +0,0 @@
-page.title=Economia de dados
-metaDescription=User-enabled otimização de uso de dados.
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- Neste documento
- </h2>
-
- <ol>
- <li>
- <a href="#status">Verificação de preferências da Economia de dados</a>
- <ol>
- <li>
- <a href="#request-whitelist">Solicitação de permissão para colocar na lista de permissões</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">Monitoramento de preferências do
- Economia de dados</a>
- </li>
-
- <li>
- <a href="#testing">Teste com comandos do Android Debug Bridge</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- Durante a vida útil de um smartphone, o custo do plano de dados pode
-facilmente exceder o custo do próprio dispositivo. No N Developer Preview, os usuários podem
- ativar a Economia de dados no dispositivo como um todo para usar menos dados, seja
- em roaming, perto do final do período de cobrança ou em pacotes de dados pré-pagos pequenos.
-</p>
-
-<p>
- Quando um usuário ativa a Economia de dados em <strong>Settings</strong> e o dispositivo está
-em uma rede tarifada, o sistema bloqueia o uso de dados em segundo plano e avisa
- aos aplicativos para reduzir o uso de dados no primeiro plano sempre que possível. Os usuários podem
-autorizar aplicativos específicos a usar dados tarifados em segundo plano, mesmo com a Economia
- de dados ativada.
-</p>
-
-<p>
- O N Developer Preview estende a API {@link android.net.ConnectivityManager}
- para oferecer aos aplicativos uma forma de <a href="#status">recuperar as
-preferências do usuário para a Economia de dados</a> e <a href="#monitor-changes">monitorar
-as mudanças de preferências</a>. Como prática recomendada, os aplicativos devem verificar se o
- usuário ativou a Economia de dados e tentar limitar o uso de dados em primeiro e
- segundo plano.
-</p>
-
-<h2 id="status">
- Verificação de preferências da Economia de dados
-</h2>
-
-<p>
- No N Developer Preview, aplicativos podem usar a API {@link
- android.net.ConnectivityManager} para determinar quais restrições
- de uso de dados estão sendo aplicadas. O método {@code getRestrictBackgroundStatus()}
- retorna um dos seguintes valores:
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- A Economia de dados está desativada.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- O usuário ativou a Economia de dados para este aplicativo. Os aplicativos tentarão limitar o
- uso de dados em primeiro plano e gerenciar as restrições ao
- uso de dados em segundo plano.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- O usuário ativou a Economia de dados, mas o aplicativo está na lista de permissões. Os aplicativos
- ainda tentarão limitar o uso de dados em primeiro e segundo plano.
- </dd>
-</dl>
-
-<p>
- É prática recomendada limitar o uso de dados sempre que o dispositivo
- estiver conectado a uma rede tarifada, mesmo que a Economia de dados esteja desativada e o aplicativo
- esteja na lista de permissões. O modelo de código a seguir usa {@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} e {@code
- ConnectivityManager.getRestrictBackgroundStatus()} para determinar o volume máximo de dados
- que o aplicativo pode usar:
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- Solicitação de permissão para colocar na lista de permissões
-</h3>
-
-<p>
- Se o seu aplicativo precisa usar dados em segundo plano, ele pode solicitar permissão para
- entrar na lista de permissões enviando uma intenção
- <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
- que contenha o URI no nome de pacote do aplicativo, por exemplo,
- <code>package:MY_APP_ID</code>.
-</p>
-
-<p>
- O envio da intenção e do URI abre o aplicativo <strong>Settings</strong> e
- exibe as configurações de uso de dados de seu aplicativo. O usuário pode decidir então se
- ativará os dados em segundo plano para o aplicativo. Antes de enviar a intenção, é
- prática recomendada perguntar primeiro ao usuário se ele deseja iniciar o
-aplicativo <strong>Settings</strong> com o objetivo de ativar o uso
- de dados em segundo plano.
-</p>
-
-<h2 id="monitor-changes">
- Monitoramento de alterações nas preferências da Economia de dados
-</h2>
-
-<p>
- Os aplicativos podem monitorar alterações nas preferências da Economia de dados criando um {@link
- android.content.BroadcastReceiver} para escutar {@code
-ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} e registrar
- dinamicamente o receptor em {@link android.content.Context#registerReceiver
- Context.registerReceiver()}. Quando recebe esta transmissão, o aplicativo deve
- <a href="#status">verificar se as novas preferências da Economia de dados afetam
- as permissões</a> chamando {@code
- ConnectivityManager.getRestrictBackgroundStatus()}.
-</p>
-
-<p class="note">
- <strong>Observação:</strong> O sistema só envia esta transmissão para aplicativos que
- se registram dinamicamente para recebê-la em {@link
- android.content.Context#registerReceiver Context.registerReceiver()}. Os aplicativos
- que se registrarem para receber a transmissão no manifesto não a
- receberão.
-</p>
-
-<h2 id="testing">
- Teste com comandos do Android Debug Bridge
-</h2>
-
-O <a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
-oferece alguns comandos que podem ser usados para verificar e configurar permissões
-de rede:
-
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- Gera um relatório que inclui a configuração de restrição atual da rede de segundo plano global
-, os UIDs do pacote em lista de permissões e as permissões de rede
- de outros pacotes conhecidos.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- Exibe uma lista completa de comandos do Gerenciador de políticas de rede (netpolicy).
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- Ativa ou desativa o modo da Economia de dados ao passar <code>true</code> ou
- <code>false</code>, respectivamente.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Adiciona o UID do pacote especificado à lista de permissões para permitir o uso de dados de segundo plano
- tarifados.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Adiciona o UID do pacote especificado à lista de permissões para bloquear o uso de dados
- de segundo plano tarifados enquanto a Economia de dados estiver ativada.
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/preview/features/direct-boot.jd b/docs/html-intl/intl/pt-br/preview/features/direct-boot.jd
deleted file mode 100644
index d14449f..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=Inicialização direta
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#run">Solicitar acesso para executar durante a inicialização direta</a></li>
- <li><a href="#access">Acesso ao armazenamento criptografado do dispositivo</a></li>
- <li><a href="#notification">Receber notificação quando o usuário desbloquear</a></li>
- <li><a href="#migrating">Migrar dados existentes</a></li>
- <li><a href="#testing">Testar seu aplicativo com reconhecimento de criptografia</a></li>
- </ol>
-</div>
-</div>
-
-<p>O Android N é executado em um modo seguro de <i>inicialização direta</i>
-quando o dispositivo é ligado, mas o usuário não o
-desbloqueia. Para isso, o sistema oferece dois locais de armazenamento para dados:</p>
-
-<ul>
-<li><i>O armazenamento criptografado de credenciais</i>, que é o local de armazenamento padrão
-e é disponibilizado apenas depois que o usuário desbloqueia o dispositivo.</li>
-<li><i>O armazenamento criptografado do dispositivo</i>, que é um local de armazenamento disponibilizado
-durante o modo de inicialização direta e depois que o usuário desbloqueia o dispositivo.</li>
-</ul>
-
-<p>Por padrão, aplicativos não são executados no modo de inicialização direta.
-Se seu aplicativo precisa executar ações durante esse modo, você pode registrar os
-componentes que devem ser executados. Alguns casos comuns
-para aplicativos que precisam ser executados no modo de inicialização direta:</p>
-
-<ul>
-<li>Aplicativos com notificações programadas, como aplicativos de
-despertador.</li>
-<li>Aplicativos que fornecem notificações importantes ao usuário, como aplicativos de SMS.</li>
-<li>Aplicativos que fornecem serviços de acessibilidade, como o Talkback.</li>
-</ul>
-
-<p>Se seu aplicativo precisar acessar dados enquanto estiver no modo de inicialização direta, use
-o armazenamento criptografado do dispositivo. O armazenamento criptografado do dispositivo contém dados
-criptografados com uma chave que só é disponibilizada depois que o dispositivo realizou
-uma inicialização verificada com sucesso.</p>
-
-<p>Para dados que devem ser criptografados com uma chave associada às credenciais
-do usuário, como um PIN ou uma senha, use o armazenamento criptografado de credenciais.
-Esse armazenamento só é disponibilizado depois que o usuário
-desbloquear o dispositivo com sucesso e até que ele reinicie o dispositivo novamente. Se o
-usuário ativar a tela de bloqueio após desbloquear o dispositivo, isso não bloqueará
-o armazenamento criptografado de credenciais.</p>
-
-<h2 id="run">Solicitar acesso para executar durante a inicialização direta</h2>
-
-<p>Aplicativos devem registrar seus componentes com o sistema antes de
-poderem ser executados no modo de inicialização direta ou acessar o armazenamento criptografado
-do dispositivo. Os aplicativos são registrados com o sistema ao marcar os componentes como
-<i>tendo reconhecimento de criptografia</i>. Para marcar seu componente como tendo reconhecimento de criptografia, defina o atributo
-<code>android:directBootAware</code> como true no manifesto.<p>
-
-<p>Componentes com reconhecimento de criptografia podem se registrar para receber uma mensagem de transmissão
-<code>LOCKED_BOOT_COMPLETED</code> do
-sistema quando o dispositivo é reiniciado. Nesse momento, o armazenamento criptografado do
-dispositivo é disponibilizado e pode executar tarefas
-necessárias durante o modo de inicialização, como o acionamento de um alarme programado.</p>
-
-<p>O snippet de código a seguir é um exemplo de como registrar um
-{@link android.content.BroadcastReceiver} como tendo reconhecimento de criptografia e adicionar um
-filtro de intenção para <code>LOCKED_BOOT_COMPLETED</code> no manifesto do aplicativo:</p>
-
-<pre>
-<receiver
- android:directBootAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Quando o usuário desbloquear o dispositivo, todos os componentes poderão acessar o armazenamento
-criptografado do dispositivo e o armazenamento criptografado de credenciais.</p>
-
-<h2 id="access">Acesso ao armazenamento criptografado do dispositivo</h2>
-
-<p>Para acessar o armazenamento criptografado do dispositivo, crie uma segunda instância de
-{@link android.content.Context} chamando
-<code>Context.createDeviceProtectedStorageContext()</code>. Todas as chamadas da API
-de armazenamento que usam esse contexto acessam o armazenamento criptografado do dispositivo. O
-exemplo a seguir acessa o armazenamento criptografado do dispositivo e abre um
-arquivo de dados existente do aplicativo:</p>
-
-<pre>
-Context directBootContext = appContext.createDeviceProtectedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>Use o armazenamento criptografado do dispositivo somente para
-informações que precisem ser acessadas durante o modo de inicialização direta.
-Não use o armazenamento criptografado do dispositivo como um repositório criptografado para fins gerais.
-Para informações particulares do usuário ou dados criptografados que não são necessários durante
-o modo de inicialização direta, use o armazenamento criptografado de credenciais.</p>
-
-<h2 id="notification">Receber notificação quando o usuário desbloquear</h2>
-
-<p>Quando o usuário desbloquear o dispositivo após a reinicialização, seu aplicativo poderá voltar
-a acessar o armazenamento criptografado de credenciais e usar serviços regulares do sistema que
-dependem das credenciais do usuário.</p>
-
-<p>Para receber uma notificação quando o usuário desbloquear o dispositivo após uma reinicialização,
-registre um {@link android.content.BroadcastReceiver} do componente em execução
-para ouvir a mensagem <code>ACTION_USER_UNLOCKED</code>. Você também pode
-receber a mensagem {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED} existente, que agora indica que o dispositivo foi inicializado e que
-o usuário o desbloqueou.</p>
-
-<p>Você pode enviar uma consulta diretamente se o usuário desbloquear o dispositivo chamando
-<code>UserManager.isUserUnlocked()</code>.</p>
-
-<h2 id="migrating">Migrar dados existentes</h2>
-
-<p>Se um usuário atualizar o dispositivo para usar o modo de inicialização direta, você poderá ter dados
-existentes que precisem ser migrados para o armazenamento criptografado do dispositivo. Use
-<code>Context.moveSharedPreferencesFrom()</code> e
-<code>Context.moveDatabaseFrom()</code> para migrar dados de preferências e do banco de
-dados entre o armazenamento criptografado de credenciais e o armazenamento criptografado do dispositivo.</p>
-
-<p>Tenha bom senso ao decidir quais dados migrar do armazenamento
-criptografado de credenciais para o armazenamento criptografado do dispositivo. Não migre
-informações particulares do usuário, como senhas ou tokens de autorização, para o
-armazenamento criptografado do dispositivo. Em alguns casos, pode ser necessário gerenciar
-conjuntos separados de dados nos dois repositórios criptografados.</p>
-
-<h2 id="testing">Testar seu aplicativo com reconhecimento de criptografia</h2>
-
-<p>Teste seu aplicativo com reconhecimento de criptografia usando o novo modo de inicialização direta. Existem duas
-maneiras de ativar a inicialização direta.</p>
-
-<p class="caution"><strong>Cuidado:</strong> ao ativar a inicialização direta,
-você apaga todos os dados do usuário no dispositivo.</p>
-
-<p>Em dispositivos compatíveis com o Android N instalado, ative a
-inicialização direta seguindo um destes procedimentos:</p>
-
-<ul>
-<li>No dispositivo, ative <b>Developer options</b>, se ainda não tiver feito isso,
-acessando <b>Settings > About phone</b> e tocando em <b>Build number</b>
-sete vezes. Quando a tela de opções do desenvolvedor for disponibilizada, acesse
-<b>Settings > Developer options</b> e selecione
-<b>Convert to file encryption</b>.</li>
-<li>Use os seguintes comandos de shell adb para ativar o modo de inicialização direta:
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>Um modo de inicialização direta emulado também está disponível, caso você precise trocar
-de modo nos dispositivos de teste. O modo emulado só deve ser usado durante
-o desenvolvimento e pode causar perda de dados. Para ativar o modo de inicialização direta,
-defina um padrão de bloqueio no dispositivo, escolha "No thanks", caso seja solicitada
-uma tela de inicialização segura ao definir esse padrão, e, em seguida, use o
-seguinte comando de shell adb:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>Para desativar o modo de inicialização direta emulado, use o seguinte comando:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>O uso desses comandos faz com que o dispositivo seja reinicializado.</p>
diff --git a/docs/html-intl/intl/pt-br/preview/features/multi-window.jd b/docs/html-intl/intl/pt-br/preview/features/multi-window.jd
deleted file mode 100644
index 7742182..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/multi-window.jd
+++ /dev/null
@@ -1,589 +0,0 @@
-page.title=Suporte a várias janelas
-page.metaDescription=Novo suporte à exibição de mais de um aplicativo ao mesmo tempo no Android N.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#overview">Visão geral</a></li>
- <li><a href="#lifecycle">Ciclo de vida do modo de várias janelas</a></li>
- <li><a href="#configuring">Configuração do aplicativo para o modo
- de várias janelas</a></li>
- <li><a href="#running">Execução do aplicativo no modo de várias janelas</a></li>
- <li><a href="#testing">Teste do suporte a várias janelas em seu aplicativo</a></li>
- </ol>
- <h2>Veja também</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Playground — aplicativo de exemplo
- do modo de várias janelas</a></li>
- <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">Cinco dicas para preparar o modo de várias janelas no Android N</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- O Android N adiciona suporte à exibição de mais de um aplicativo ao
- mesmo tempo. Em dispositivos portáteis, dois aplicativos podem ser executados lado a lado ou
- um acima do outro no modo de <em>tela dividida</em>. Em dispositivos de TV, os aplicativos podem
- usar o modo de <em>imagem em imagem</em> para continuar a reprodução do vídeo enquanto os usuários
- interagem com outro aplicativo.
-</p>
-
-<p>
- Se você compilar o aplicativo com o N Preview SDK, poderá configurar como o aplicativo
- processa a exibição de várias janelas. Por exemplo, você pode especificar as dimensões
-mínimas permitidas para a atividade. Você também pode desativar a exibição de várias janelas para
- o aplicativo, garantindo que o sistema mostre o aplicativo apenas
-em modo de tela inteira.
-</p>
-
-<h2 id="overview">Visão geral</h2>
-
-<p>
- O Android N permite que diversos aplicativos compartilhem a tela ao mesmo tempo. Por
- exemplo, um usuário pode dividir a tela para visualizar uma página da web no lado esquerdo
- e compor um e-mail no lado direito. A experiência do usuário depende do
- dispositivo:
-</p>
-
-<ul>
- <li>Os dispositivos portáteis que executam o Android N oferecem o
- modo de tela dividida. Nesse modo, o sistema preenche a tela com dois aplicativos, exibindo-os
- lado a lado ou um acima do outro. O usuário pode arrastar a linha divisória
- que separa os dois para que um aplicativo fique maior e o outro menor.
- </li>
-
- <li>No Nexus Player executando Android N, os aplicativos podem entrar
- no <a href="picture-in-picture.html">modo de imagem em imagem</a>, o que permite
- que continuem a exibir conteúdo enquanto o usuário navega ou interage com
- outros aplicativos.
- </li>
-
- <li>Fabricantes de dispositivos maiores podem optar pelo modo de
- forma livre, em que o usuário pode redimensionar livremente cada atividade. Se o
- fabricante ativar esse recurso, o dispositivo oferecerá o modo de forma livre
- e o modo de tela dividida.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>Figura 1.</strong> Dois aplicativos executando lado a lado em modo de tela dividida.
-</p>
-
-<p>
- O usuário pode mudar para o modo de várias janelas das seguintes maneiras:
-</p>
-
-<ul>
- <li>Se o usuário abrir a <a href="{@docRoot}guide/components/recents.html">tela
- Overview</a> e pressionar longamente um
- título de atividade, poderá arrastá-la para uma parte destacada da
- tela para colocá-la no modo de várias janelas.
- </li>
-
- <li>Se o usuário pressionar longamente o botão Overview, o dispositivo colocará
- a atividade atual no modo de várias janelas e abrirá a tela Overview para
- permitir que o usuário escolha outra atividade para compartilhar a tela.
- </li>
-</ul>
-
-<p>
- Os usuários podem <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastar e
- soltar</a> dados de uma atividade para outra enquanto as atividades compartilham
- a tela. (Anteriormente, os usuários podiam apenas arrastar e soltar dados em uma única
- atividade.)
-</p>
-
-<h2 id="lifecycle">Ciclo de vida do modo de várias janelas</h2>
-
-<p>
- O modo de várias janelas não altera o <a href="{@docRoot}training/basics/activity-lifecycle/index.html">ciclo de vida
- da atividade</a>.
-</p>
-
-<p>
- No modo de várias janelas, somente a atividade com a qual o usuário interagiu mais recentemente
- fica ativa em um determinado momento. Essa atividade é considerada a atividade <em>superior</em>.
- Todas as outras atividades ficam no estado pausado, mesmo se visíveis.
- No entanto, o sistema atribui a essas atividades pausadas, mas visíveis, uma prioridade maior
- que a das atividades não visíveis. Se o usuário interagir com uma das
- atividades pausadas, ela será retomada e a atividade previamente superior
- será pausada.
-</p>
-
-<p class="note">
- <strong>Observação:</strong> em modo de suporte a várias janelas, um aplicativo pode estar no estado
- pausado e continuar visível ao usuário. Pode ser necessário que um aplicativo continue com suas
- atividades, mesmo se pausado. Por exemplo, um aplicativo que reproduz vídeo e que está no
- modo pausado, mas visível, deve continuar a exibir o vídeo. Por esse
- motivo, recomendamos que atividades que reproduzem vídeo <em>não</em> pausem o
- vídeo nos manipuladores {@link android.app.Activity#onPause onPause()}.
- Em vez disso, o vídeo deve ser pausado em {@link android.app.Activity#onStop
- onStop()} e a reprodução retomada em {@link android.app.Activity#onStart
- onStart()}.
-</p>
-
-<p>
- Quando o usuário coloca um aplicativo no modo de várias janelas, o sistema notifica a
- atividade sobre a mudança de configuração, como especificado em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento de alterações
- no tempo de execução</a>. Isso também acontece quando o usuário redimensiona o aplicativo ou
- coloca-o novamente no modo de tela cheia.
- Essencialmente, essa alteração afeta
- o ciclo de vida da atividade da mesma forma que quando o sistema notifica o aplicativo de que o dispositivo mudou
- do modo de retrato para paisagem, exceto que as dimensões do dispositivo são
- alteradas, em vez de simplesmente permutadas. Como discutido em <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Processamento de alterações
- no tempo de execução</a>, a sua atividade pode processar ela mesma a mudança de configuração ou
- permitir que o sistema destrua a atividade e recrie-a com as novas
- dimensões.
-</p>
-
-<p>
- Se o usuário redimensionar uma janela e aumentar uma de suas dimensões, o
- sistema redimensionará a atividade para corresponder à ação do usuário e emitirá <a href="{@docRoot}guide/topics/resources/runtime-changes.html">mudanças de tempo de execução</a>
- conforme necessário. Se o aplicativo demorar a desenhar nas áreas recém-expostas, o
- sistema preencherá temporariamente essas áreas com a cor especificada pelo atributo {@link
- android.R.attr#windowBackground windowBackground} ou pelo atributo de estilo padrão
- <code>windowBackgroundFallback</code>.
-</p>
-
-<h2 id="configuring">Configuração do aplicativo para o modo de várias janelas</h2>
-
-<p>
- Se o seu aplicativo for direcionado ao Android N, você poderá configurar como
- e se as atividades do aplicativo suportam a exibição em várias janelas. Você pode definir
- atributos no manifesto para controlar o tamanho e o layout.
- As configurações de atributos de uma atividade raiz se aplicam a todas as atividades
- em sua pilha de tarefas. Por exemplo, se a atividade raiz tiver
- <code>android:resizeableActivity</code> definido como true, todas as atividades
- na pilha de tarefas serão redimensionáveis.
-</p>
-
-<p class="note">
- <strong>Observação:</strong> se você compilar um aplicativo com várias orientações usando uma versão
- do SDK anterior ao Android N e o usuário usar o aplicativo em
- modo de suporte a várias janelas, o sistema redimensionará forçosamente o aplicativo. O sistema apresenta uma
- caixa de diálogo avisando o usuário de que o aplicativo pode se comportar de forma inesperada. O sistema
- <em>não</em> redimensiona aplicativos de orientação fixa; se
- o usuário tentar abrir um aplicativo de orientação fixa no modo de várias janelas,
- o aplicativo ocupará toda a tela.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- Defina esse atributo no nó <code><activity></code> ou
- <code><application></code> em seu manifesto para ativar ou desativar a exibição em
- várias telas:
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- Se esse atributo for definido como verdadeiro, a atividade poderá ser inicializada nos
- modos de tela dividida e forma livre. Se o atributo for definido como falso, a
- atividade não oferecerá suporte ao modo de várias janelas. Se esse valor for falso e o
- usuário tentar iniciar a atividade no modo de várias janelas, a atividade ocupará
- a tela inteira.
-</p>
-
-<p>
- Se o aplicativo for direcionado ao Android N, mas o valor desse atributo não for
- especificado, o atributo assumirá o valor padrão de verdadeiro.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- Defina esse atributo no nó <code><activity></code> ou no seu manifesto para
- indicar se a atividade oferece suporte à exibição no modo de imagem em imagem. Esse
- atributo será ignorado se <code>android:resizeableActivity</code> for falso.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">Atributos de layout</h3>
-
-<p>
- No Android N, o elemento de manifesto <code><layout></code>
- oferece suporte a diversos atributos que afetam o comportamento da atividade no
- modo de várias janelas:
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- Largura padrão da atividade quando iniciada no modo de forma livre.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- Altura padrão da atividade quando iniciada no modo de forma livre.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- Posicionamento inicial da atividade quando iniciada no modo de forma livre. Consulte a
- referência de {@link android.view.Gravity} para obter os valores adequados.
- </dd>
-
- <dt>
- <code>android:minimalHeight</code>, <code>android:minimalWidth</code>
- </dt>
-
- <dd>
- Altura mínima e largura mínima para a atividade nos modos de tela dividida
- e forma livre. Se o usuário mover o divisor no modo de tela dividida
- para tornar uma atividade menor que o mínimo especificado, o sistema recortará
- a atividade para o tamanho solicitado pelo usuário.
- </dd>
-</dl>
-
-<p>
- Por exemplo, o código a seguir mostra como especificar um tamanho e uma localização
- padrão para a atividade, bem como o tamanho mínimo, quando a atividade é exibida no
- modo de forma livre:
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalHeight="450dp"
- android:minimalWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">Execução do aplicativo no modo de várias janelas</h2>
-
-<p>
- O Android N oferece nova funcionalidade para dar suporte a aplicativos que podem ser executados
- no modo de várias janelas.
-</p>
-
-<h3 id="disabled-features">Recursos desativados no modo de várias janelas</h3>
-
-<p>
- Alguns recursos são desativados ou ignorados quando um dispositivo está no modo de
- várias janelas, pois não fazem sentido para uma atividade que pode estar compartilhando a
- tela do dispositivo com outras atividades ou aplicativos. Esses recursos incluem:
-
-<ul>
- <li>Algumas opções de personalização de <a href="{@docRoot}training/system-ui/index.html">IU do sistema</a>
- são desativadas. Por exemplo, os aplicativos não podem ocultar a barra de status
- se não estiverem executando no modo de tela cheia.
- </li>
-
- <li>O sistema ignora as alterações no atributo <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code>.
- </li>
-</ul>
-
-<h3 id="change-notification">Notificações e consultas de mudança no modo de várias janelas</h3>
-
-<p>
- Os novos métodos a seguir foram adicionados à classe {@link android.app.Activity}
- para oferecer suporte à exibição em várias janelas. Para obter detalhes sobre cada método, consulte a
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
- do N Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- Chame para descobrir se a atividade está no modo de várias janelas.
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- Chame para descobrir se a atividade está no modo de imagem em imagem.
-
- <p class="note">
- <strong>Observação:</strong> o modo de imagem em imagem é um caso especial do
- modo de várias janelas. Se <code>myActivity.isInPictureInPictureMode()</code>
- retornar true, <code>myActivity.isInMultiWindowMode()</code> também
- retornará true.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- O sistema chama esse método sempre que a atividade entra ou sai do
- modo de várias janelas. O sistema passará ao método o valor true se a
- atividade entrar no modo de várias janelas e false se a atividade
- sair do modo de várias janelas.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- O sistema chama esse método sempre que a atividade entra ou sai do
- modo de imagem em imagem. O sistema passará ao método o valor true se
- a atividade entrar no modo de várias janelas e false se a atividade
- sair do modo de várias janelas.
- </dd>
-</dl>
-
-<p>
- Existem também versões de {@link android.app.Fragment} para cada um desses
- métodos como, por exemplo, <code>Fragment.isInMultiWindowMode()</code>.
-</p>
-
-<h3 id="entering-pip">Entrar no modo de imagem em imagem</h3>
-
-<p>
- Para colocar uma atividade no modo de imagem em imagem, chame o novo método
- <code>Activity.enterPictureInPictureMode()</code>. Esse método não terá efeito se
- o dispositivo não oferecer suporte ao modo de imagem em imagem. Para obter mais informações,
- consulte a documentação do modo <a href="picture-in-picture.html">imagem em imagem</a>.
-</p>
-
-<h3 id="launch">Iniciar novas atividades no modo de várias janelas</h3>
-
-<p>
- Quando você iniciar uma nova atividade, poderá indicar ao sistema que a
- a nova atividade deverá ser exibida adjacente à atual, se possível. Para fazer
- isso, use o sinalizador
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. A passagem
- desse sinalizador solicita o seguinte comportamento:
-</p>
-
-<ul>
- <li>Se o dispositivo estiver no modo de tela dividida, o sistema tentará criar a
- nova atividade ao lado da atividade que a iniciou para que as duas atividades
- compartilhem a tela. Nem sempre o sistema conseguirá fazer isso, mas as
- atividades ficarão adjacentes, se possível.
- </li>
-
- <li>Se o dispositivo não estiver no modo de tela dividida, esse sinalizador não terá efeito.
- </li>
-</ul>
-
-<p>
- Se um dispositivo estiver no modo de forma livre e você iniciar uma nova atividade, poderá
- especificar as dimensões e a posição na tela da nova atividade chamando
- <code>ActivityOptions.setLaunchBounds()</code>. Esse método não terá efeito se
- o dispositivo não estiver no modo de várias janelas.
-</p>
-
-<p class="note">
- <strong>Observação:</strong> se você iniciar uma atividade em uma pilha de tarefas, essa
- atividade substituirá a atividade na tela, herdando todas as
- propriedades de suporte a várias janelas. Se você quiser iniciar a nova atividade como janela
- separada no modo de várias janelas, inicie essa atividade em uma nova pilha de tarefas.
-</p>
-
-<h3 id="dnd">Suporte a arrastar e soltar</h3>
-
-<p>
- Os usuários podem <a href="{@docRoot}guide/topics/ui/drag-drop.html">arrastar e
- soltar</a> dados de uma atividade para outra enquanto as duas atividades
- compartilham a tela. (Anteriormente, os usuários podiam apenas arrastar e soltar dados em uma
- única atividade.) Por esse motivo, se o aplicativo não tem a funcionalidade de arrastar e soltar,
- pode ser uma boa ideia adicioná-la.
-</p>
-
-<p>
- O N Preview SDK estende o pacote <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- para oferecer suporte ao recurso arrastar e soltar entre aplicativos. Para obter detalhes sobre os seguintes
- métodos e classes, consulte a <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência
- do Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- Objeto token responsável por especificar as permissões concedidas ao aplicativo
- que recebe uma ação de soltar.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- Novo alias de {@link android.view.View#startDrag View.startDrag()}. Para
- ativar o recurso de arrastar e soltar entre atividades, passe o novo sinalizador
- <code>View.DRAG_FLAG_GLOBAL</code>. Se você precisar conceder permissões de URI à
- atividade de destino, passe os novos sinalizadores,
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> ou
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, conforme o caso.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- Cancela uma operação de arrastar em andamento. Somente pode ser chamado
- pelo aplicativo que originou a operação de arrastar.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- Substitui a sombra de arrastar para uma operação de arrastar em andamento. Somente
- pode ser chamado pelo aplicativo que originou a operação de arrastar.
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- Solicita as permissões dos URIs de conteúdo passados com {@link
- android.content.ClipData} contidos em {@link android.view.DragEvent}.
- </dd>
-</dl>
-
-<h2 id="testing">Teste do suporte a várias janelas em seu aplicativo</h2>
-
-<p>
- Atualizando ou não o seu aplicativo para o Android N, você deve
- verificar como ele se comporta no modo de várias janelas, pois um usuário pode tentar iniciá-lo
- no modo de várias janelas em um dispositivo executando o Android N.
-</p>
-
-<h3 id="configuring">Configuração de um dispositivo de teste</h3>
-
-<p>
- Se você instalar o Android N em um dispositivo, o modo de tela dividida
- será instalado automaticamente.
-</p>
-
-<h3 id="test-non-n">Se o aplicativo não foi compilado com o N Preview SDK</h3>
-
-<p>
- Se você não compilou o aplicativo com o N Preview SDK e o usuário tentar usar
- o aplicativo no modo de várias janelas, o sistema redimensionará obrigatoriamente o aplicativo, a menos que este
- declare uma orientação fixa.
-</p>
-
-<p>
- Se o aplicativo não declarar uma orientação fixa, inicie o aplicativo
- em um dispositivo executando Android N e tente colocar o aplicativo no modo
- de tela dividida. Verifique se a experiência do usuário é
- aceitável quando o aplicativo é redimensionado obrigatoriamente.
-</p>
-
-<p>
- Se o aplicativo declarar uma orientação fixa, você deverá tentar colocá-lo no
- modo de várias janelas. Verifique se, ao fazê-lo, o aplicativo continua
- no modo de tela cheia.
-</p>
-
-<h3 id="test-mw">Se você oferecer suporte ao modo de várias janelas</h3>
-
-<p>
- Se você compilar o aplicativo com o N Preview SDK e não tiver desativado o
- suporte a várias janelas, verifique o comportamento a seguir nos modos de tela dividida
- e forma livre.
-</p>
-
-<ul>
- <li>Inicie o aplicativo em modo de tela inteira e mude para o modo de várias janelas
- pressionando longamente o botão Overview. Verifique se o aplicativo alterna corretamente.
- </li>
-
- <li>Inicie o aplicativo diretamente no modo de várias janelas e verifique se o aplicativo
- é iniciado corretamente. Você pode iniciar um aplicativo no modo de várias telas pressionando o
- botão Overview, pressionando longamente a barra de título do aplicativo e arrastando-o
- para uma das áreas destacadas na tela.
- </li>
-
- <li>Redimensione o aplicativo no modo de tela dividida, arrastando a linha divisora.
- Verifique se o aplicativo é redimensionado sem falhar e se os elementos de IU necessários
- estão visíveis.
- </li>
-
- <li>Se você especificou dimensões mínimas para o aplicativo, tente redimensionar
- o aplicativo abaixo dessas dimensões. Verifique se não é possível redimensionar o aplicativo
- para um tamanho menor que o mínimo especificado.
- </li>
-
- <li>Em todos os testes, verifique se o desempenho do aplicativo é aceitável. Por
- exemplo, verifique se há uma demora muito grande para atualizar a IU após o
- redimensionamento do aplicativo.
- </li>
-</ul>
-
-<h4 id="test-checklist">Lista de verificação de teste</h4>
-
-<p>
- Para verificar o desempenho do aplicativo no modo de várias janelas, experimente as operações
- a seguir. Você deve tentar essas operações nos modos de tela dividida e
- várias telas, exceto onde houver instruções diferentes.
-</p>
-
-<ul>
- <li>Entre e saia do modo de várias janelas.
- </li>
-
- <li>Alterne do seu aplicativo para outro e verifique se o seu aplicativo se comporta
- corretamente enquanto visível, mas não ativo. Por exemplo, se o seu aplicativo estiver
- reproduzindo vídeo, verifique se a reprodução não é interrompida quando o usuário
- interage com outro aplicativo.
- </li>
-
- <li>No modo de tela dividida, tente mover a barra divisora para aumentar e reduzir
- o tamanho do aplicativo. Tente essas operações nas configurações lado a lado
- e um acima do outro. Verifique se o aplicativo não falha,
- se a funcionalidade essencial fica visível e se a operação de redimensionamento não demora
- demais.
- </li>
-
- <li>Execute várias operações de redimensionamento em rápida sucessão. Verifique se o
- aplicativo não falha nem apresenta vazamento de memória. Para obter informações sobre como verificar o uso de memória
- do aplicativo, consulte <a href="{@docRoot}tools/debugging/debugging-memory.html">
- Investigação do uso de RAM</a>.
- </li>
-
- <li>Use o aplicativo normalmente em diversas configurações diferentes de janela e
- verifique se o aplicativo se comporta corretamente. Verifique se o texto é legível e se os
- elementos de IU não ficam pequenos demais para a interação.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">Se você desativou o suporte a várias janelas</h3>
-
-<p>
- Se você desativou o suporte a várias janelas definindo
- <code>android:resizableActivity="false"</code>, inicie o aplicativo em
- um dispositivo executando Android N e tente colocá-lo nos modos
- de forma livre e tela dividida. Verifique se, ao fazê-lo, o aplicativo continua
- no modo de tela cheia.
-</p>
diff --git a/docs/html-intl/intl/pt-br/preview/features/multilingual-support.jd b/docs/html-intl/intl/pt-br/preview/features/multilingual-support.jd
index 072e55b..c00eb9b 100644
--- a/docs/html-intl/intl/pt-br/preview/features/multilingual-support.jd
+++ b/docs/html-intl/intl/pt-br/preview/features/multilingual-support.jd
@@ -29,7 +29,7 @@
esperada. Por fim, garanta que seu aplicativo possa lidar corretamente
com idiomas que ele não tenha sido explicitamente projetado para suportar.</p>
-<p>Este documento começa explicando a estratégia de resolução de recursos anterior ao
+<p>Este documento começa explicando a estratégia de resolução de recursos anterior ao
Android N. Em seguida, ele descreve a estratégia
de resolução de recursos aprimorada do Android N. Por fim, ele explica como aproveitar as vantagens
do maior número de localidades para oferecer suporte a usuários multilíngues.</p>
@@ -215,7 +215,7 @@
<p>Um bom exemplo é o árabe, cujo suporte no Android N foi expandido de
uma {@code ar_EG} para 27 localidades de árabe. Essas localidades podem compartilhar a maioria dos recursos,
mas algumas preferem dígitos ASCII, enquanto outras preferem dígitos nativos. Por exemplo,
-quando você quer criar uma frase com uma variável em dígito, como
+quando você quer criar uma frase com uma variável em dígito, como
“Choose a 4 digit pin”, use formatadores como mostrado abaixo:</p>
<pre> format(locale, "Choose a %d-digit PIN", 4)</pre>
diff --git a/docs/html-intl/intl/pt-br/preview/features/notification-updates.jd b/docs/html-intl/intl/pt-br/preview/features/notification-updates.jd
index 72c2fe6..36988da 100644
--- a/docs/html-intl/intl/pt-br/preview/features/notification-updates.jd
+++ b/docs/html-intl/intl/pt-br/preview/features/notification-updates.jd
@@ -212,7 +212,7 @@
<h2 id="bundle">Notificações empacotadas</h2>
<p>O Android N oferece aos desenvolvedores uma nova forma de representar
- uma fila de notificações: <i>notificações empacotadas</i>. Essa forma é semelhante ao recurso
+ uma fila de notificações: <i>notificações empacotadas</i>. Essa forma é semelhante ao recurso
<a href="{@docRoot}training/wearables/notifications/stacks.html">Pilhas
de Notificações</a> no Android Wear. Por exemplo, se o aplicativo criar notificações
para mensagens recebidas, quando mais de uma mensagem for recebida, empacote as
@@ -243,8 +243,8 @@
sistema as agrupará automaticamente.
</p>
-<p>Para saber como adicionar notificações a um grupo, consulte
-<a href="{@docRoot}training/wearables/notifications/stacks.html#AddGroup">Adicionar
+<p>Para saber como adicionar notificações a um grupo, consulte
+<a href="{@docRoot}training/wearables/notifications/stacks.html#AddGroup">Adicionar
cada notificação a um grupo</a>.</p>
@@ -278,7 +278,7 @@
<p>
Os exemplos de casos em que uma única notificação é preferível
incluem mensagens individuais de uma única pessoa ou uma representação em lista
- de itens de texto com uma única linha. Você pode usar
+ de itens de texto com uma única linha. Você pode usar
({@link android.app.Notification.InboxStyle InboxStyle} ou
{@link android.app.Notification.BigTextStyle BigTextStyle}) para
isso.
@@ -354,7 +354,7 @@
<p>Para usar essa nova API, chame o método {@code setStyle()}, passando o
estilo de visualização personalizada desejado.</p>
-<p>O snippet mostra como construir um objeto de notificação personalizada com o método
+<p>O snippet mostra como construir um objeto de notificação personalizada com o método
{@code DecoratedCustomViewStyle()}.</p>
<pre>
@@ -370,7 +370,7 @@
<h2 id="style">Estilo de mensagens</h2>
<p>
O Android N traz uma nova API para personalização do estilo de uma notificação.
- Usando a classe <code>MessageStyle</code>, você pode alterar vários
+ Usando a classe <code>MessageStyle</code>, você pode alterar vários
rótulos exibidos na notificação, incluindo o título da conversa,
mensagens adicionais e a visualização de conteúdo para a notificação.
</p>
diff --git a/docs/html-intl/intl/pt-br/preview/features/picture-in-picture.jd b/docs/html-intl/intl/pt-br/preview/features/picture-in-picture.jd
deleted file mode 100644
index 3a7dec4..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,213 +0,0 @@
-page.title=Imagem em imagem
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Neste documento</h2>
-<ol>
- <li><a href="#declaring">Declarar que sua atividade oferece suporte ao modo de
-imagem em imagem</a></li>
- <li><a href="#pip_button">Alternar a atividade para o modo de imagem em imagem</a>
-</li>
- <li><a href="#handling_ui">Lidar com a IU durante o modo de imagem em imagem</a>
-</li>
- <li><a href="#continuing_playback">Continuar reprodução de vídeo no modo de
-imagem em imagem</a></li>
- <li><a href="#single_playback">Usar uma única atividade de reprodução para
-imagem em imagem</a></li>
- <li><a href="#best">Práticas recomendadas</a></li>
-</ol>
-
-<h2>Veja também</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">Suporte a
-várias janelas</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>No Android N, os usuários do Android TV agora podem assistir a um vídeo
-em uma janela fixada em um canto da tela enquanto navegam em
-aplicativos. O modo de imagem em imagem (PIP) permite que os aplicativos executem uma atividade de vídeo
-na janela fixada enquanto outra atividade continua em
-segundo plano. A janela do PIP permite que os usuários realizem várias tarefas enquanto usam seu aplicativo, o que os
-ajuda a ser mais produtivos.</p>
-
-<p>Seu aplicativo pode decidir quando acionar o modo de PIP. Veja alguns exemplos de
-quando entrar no modo de PIP:</p>
-
-<ul>
-<li>Seu aplicativo pode passar um vídeo para o modo de PIP quando o usuário
-sai do vídeo para procurar outro conteúdo.</li>
-<li>Seu aplicativo pode passar um vídeo para o modo de PIP quando um usuário assiste ao final
-de um episódio de conteúdo. A janela principal exibe informações promocionais ou de resumo
-sobre o próximo episódio da série.</li>
-<li>Seu aplicativo pode fornecer uma maneira de os usuários colocarem conteúdo adicional em uma fila enquanto
-assistem a um vídeo. O vídeo continua a ser reproduzido no modo de PIP enquanto a tela principal
-exibe uma atividade de seleção de conteúdo.</li>
-</ul>
-
-<p>A janela do modo de PIP tem 240x135 dp e é mostrada na camada superior de um dos
-quatro cantos da tela, escolhido pelo sistema. O usuário pode exibir um
-menu de PIP que permite que coloque a janela do PIP em tela inteira ou feche-a
-ao pressionar o botão <b>Home</b> do controle remoto. Se outro
-vídeo começar a ser reproduzido na tela principal, a janela do PIP será fechada
-automaticamente. Os usuários também podem fechar a janela do PIP em Recents.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>Figura 1.</strong> Um vídeo no modo de imagem em imagem
-visível no canto da tela enquanto o usuário navega por conteúdo
-na janela principal.</p>
-
-<p>O PIP utiliza as APIs de várias janelas disponíveis no Android N para
-fornecer a janela sobreposta de vídeo fixo. Para adicionar o modo de PIP ao seu aplicativo, você deve
-registrar as atividades que oferecem suporte a PIP, alternar a atividade para o modo de PIP conforme
-a necessidade e garantir que os elementos de IU sejam ocultados e que a reprodução do vídeo continue quando
-a atividade estiver no modo de PIP.</p>
-
-<h2 id="declaring">Declarar que sua atividade oferece suporte ao modo de imagem em imagem</h2>
-
-<p>Por padrão, o sistema não oferece suporte ao modo de PIP automaticamente para seus aplicativos.
-Se quiser esse suporte para seu aplicativo, registre a atividade
-de vídeo no manifesto definindo
-<code>android:supportsPictureInPicture</code> e
-<code>android:resizeableActivity</code> como <code>true</code>. Além disso, especifique
-que a atividade processa alterações na configuração de layout de forma que a atividade
-não seja reiniciada quando ocorrem essas alterações durante as transições do modo de PIP.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>Ao registrar a atividade, lembre-se de que, no modo de PIP, ela
-é mostrada em uma pequena janela sobreposta em uma tela de TV. Atividades de reprodução de
-vídeo com uma quantidade mínima de itens de IU oferecem a melhor experiência do usuário. Atividades que contêm
-pequenos elementos de IU podem não oferecer uma boa experiência do usuário
-no modo de PIP, pois ele não conseguirá enxergar os detalhes desses elementos
-na janela do PIP.</p>
-
-<h2 id="pip_button">Alternar a atividade para o modo de imagem em imagem</h2>
-
-Quando precisar colocar a atividade no modo de PIP, chame
-<code>Activity.enterPictureInPictureMode()</code>. O exemplo a seguir
-entra no modo de PIP quando o usuário seleciona um botão dedicado ao PIP na barra de controle de
-uma mídia:</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>Adicionar um botão de PIP à barra de controle de mídia permite que o usuário entre no
-modo de PIP com facilidade ao controlar a reprodução de um vídeo.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>Figura 1.</strong> Um botão do
-modo de imagem em imagem em uma barra de controle de mídia.</p>
-
-<p>O Android N inclui uma nova classe
-<code>PlaybackControlsRow.PictureInPictureAction</code> que define ações do PIP
-para a barra de controle e usa o ícone do PIP.</p>
-
-<h2 id="handling_ui">Lidar com a IU durante o modo de imagem em imagem</h2>
-
-<p>Quando a atividade entra no modo de PIP, ela deve mostrar apenas a reprodução do
-vídeo. Remova elementos de IU antes que a atividade entre no modo de PIP
-e restaure esses elementos quando a atividade voltar ao modo de tela inteira.
-Substitua <code>Activity.onPictureInPictureModeChanged()</code> ou
-<code>Fragment.onPictureInPictureModeChanged()</code> e ative ou
-desative os elementos de interface conforme for necessário. Por exemplo:</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">Continuar reprodução de vídeo no modo de
-imagem em imagem</h2>
-
-<p>Quando a atividade entra no modo de PIP, o sistema a considera
-pausada e chama o método <code>onPause()</code> da atividade. A reprodução
-de vídeos não deverá ser pausada se a atividade
-for pausada devido ao modo de PIP. Verifique o PIP no método
-<code>onPause()</code> da atividade e realize a reprodução da forma apropriada. Por
-exemplo:</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>Quando a atividade sai do modo de PIP e volta à tela inteira, o
-sistema retoma a atividade e chama o método <code>onResume()</code>.</p>
-
-<h2 id="single_playback">Usar uma única atividade de reprodução para
-imagem em imagem</h2>
-
-<p>Ao navegar pelo conteúdo
- da tela principal de seu aplicativo, um usuário pode selecionar um novo vídeo enquanto uma atividade de reprodução de vídeo estiver em modo de PIP. Reproduza o novo
- vídeo na atividade de reprodução existente em modo de tela cheia em vez de
-lançar uma nova atividade que pode confundir o usuário.</p>
-
-<p>Para que uma única atividade seja usada para solicitações de reprodução de vídeo e
-com o modo de PIP ativado ou desativado, conforme necessário, configure o
-<code>android:launchMode</code> da atividade para <code>singleTask</code> em seu manifesto.
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>Na atividade, modifique {@link android.app.Activity#onNewIntent
-Activity.onNewIntent()} e processe o novo vídeo, interrompendo qualquer
-reprodução existente, caso necessário.</p>
-
-<h2 id="best">Práticas recomendadas</h2>
-
-<p>O PIP é destinado a atividades que reproduzem vídeos em tela inteira. Ao passar
-a atividade para o modo de PIP, evite mostrar qualquer coisa que não seja o conteúdo do vídeo.
-Rastreie quando a atividade entrar no modo de PIP e oculte os elementos de IU, conforme descrito
-em <a href="#handling_ui">Lidar com a interface durante o modo de imagem em imagem</a>.</p>
-
-<p>Como a janela do PIP é mostrada como uma janela flutuante no canto da
-tela, você deve evitar exibir informações essenciais em qualquer área
-da janela principal que possa ser ocultada pela janela do PIP.</p>
-
-<p>Quando uma atividade está no modo de PIP, ela não recebe foco de entrada por padrão. Para
-receber eventos de entrada no modo de PIP, use
-<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/pt-br/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/pt-br/preview/features/scoped-folder-access.jd
deleted file mode 100644
index ef9ba65..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,148 +0,0 @@
-page.title=Acesso a diretórios com escopo
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#accessing">Acessar um diretório de armazenamento externo</a></li>
- <li><a href="#removable">Acessar um diretório em uma mídia removível</a></li>
- <li><a href="#best">Práticas recomendadas</a></li>
- </ol>
-</div>
-</div>
-
-<p>Alguns aplicativos, como aplicativos de fotos, normalmente só precisam acessar diretórios específicos de um
-armazenamento externo, como o diretório <code>Pictures</code>. As abordagens
-existentes para o acesso de armazenamentos externos não foram desenvolvidas para fornecer com facilidade
-acesso direcionado a diretórios para esses tipos de aplicativos. Por exemplo:</p>
-
-<ul>
-<li>Solicitar {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-ou {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} em seu manifesto
-permite o acesso a todos os diretórios públicos no armazenamento externo, o que pode ser mais do
-que o aplicativo precisa.</li>
-<li>Usar a
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Estrutura de
-acesso ao armazenamento</a> geralmente faz com que o usuário selecione diretórios
-por meio de uma IU de sistema, o que é desnecessário se seu aplicativo sempre acessa o mesmo
-diretório externo.</li>
-</ul>
-
-<p>O Android N fornece uma nova API simplificada para acessar
-diretórios de armazenamento externo comuns. </p>
-
-<h2 id="accessing">Acessar um diretório de armazenamento externo</h2>
-
-<p>Use a classe <code>StorageManager</code> para obter a instância
-<code>StorageVolume</code> apropriada. Em seguida, crie uma intenção chamando o método
-<code>StorageVolume.createAccessIntent()</code> dessa instância.
-Use essa intenção para acessar os diretórios de armazenamento externo. Para obter uma lista de
-todos os volumes disponíveis, incluindo volumes de mídias removíveis, use
-<code>StorageManager.getVolumesList()</code>.</p>
-
-<p>Se você tiver informações sobre um arquivo específico, use
-<code>StorageManager.getStorageVolume(File)</code> para obter o
-<code>StorageVolume</code> que contém o arquivo. Chame
-<code>createAccessIntent()</code> neste <code>StorageVolume</code> para acessar
-o diretório de armazenamento externo para o arquivo.</p>
-
-<p>
-Em volumes secundários, como cartões SD externos, passe nulo ao chamar
-<code>StorageVolume.createAccessIntent()</code> para solicitar acesso ao
-volume todo em vez de um diretório específico.
-<code>StorageVolume.createAccessIntent()</code> retornará nulo se você passar
-nulo no volume principal ou se passar um nome de diretório inválido.
-</p>
-
-<p>O fragmento de código a seguir é um exemplo de como abrir o diretório
-<code>Pictures</code> no armazenamento compartilhado principal:</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>O sistema tenta conceder acesso ao diretório externo e,
-se necessário, confirma o acesso com o usuário usando uma IU simplificada:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>Figura 1.</strong> Um aplicativo solicitando
-acesso ao diretório Pictures.</p>
-
-<p>Se o usuário conceder o acesso, o sistema chamará sua substituição de
-<code>onActivityResult()</code> com um código de resultado de
-<code>Activity.RESULT_OK</code> e os dados de intenção que contêm o URI. Use
-o URI fornecido para acessar as informações do diretório, o que é semelhante a usar URIs
-retornados pela
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Estrutura de
-acesso ao armazenamento</a>.</p>
-
-<p>Se o usuário não conceder o acesso, o sistema chamará sua substituição de
-<code>onActivityResult()</code> com um código de resultado de
-<code>Activity.RESULT_CANCELED</code> e dados de intenção nulos.</p>
-
-<p class="note"><b>Observação</b>: Ao obter acesso a um diretório externo específico,
-você também obtém acesso aos subdiretórios dentro do diretório em questão.</p>
-
-<h2 id="removable">Acessar um diretório em uma mídia removível</h2>
-
-<p>Para usar o Acesso a diretórios com escopo para acessar diretórios em uma mídia removível,
-primeiro adicione um {@link android.content.BroadcastReceiver} que escute a notificação
-{@link android.os.Environment#MEDIA_MOUNTED}. Por exemplo:</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Quando o usuário monta uma mídia removível, como um cartão SD, o sistema envia uma notificação
-{@link android.os.Environment#MEDIA_MOUNTED}. Essa notificação
-fornece um objeto <code>StorageVolume</code> nos dados de intenção que
-você pode usar para acessar os diretórios na mídia removível. O exemplo a seguir
-acessa o diretório <code>Pictures</code> na mídia removível:</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">Práticas recomendadas</h2>
-
-<p>Quando possível, mantenha o URI de acesso a diretórios externos para que você não precise
-solicitar acesso ao usuário várias vezes. Quando o usuário conceder o acesso, chame
-<code>getContentResolver().takePersistableUriPermssion()</code> com o
-URI de acesso ao diretório. O sistema manterá o URI e as solicitações de acesso
-subsequentes retornarão <code>RESULT_OK</code> e não mostrarão a IU de confirmação para o
-usuário.</p>
-
-<p>Se o usuário negar acesso a um diretório externo, não repita a
-solicitação imediatamente. Insistir em solicitações de acesso repetidas vezes gera uma experiência
-negativa para o usuário. Se uma solicitação for negada pelo usuário e o aplicativo solicitar acesso
-novamente, a IU exibirá uma caixa de seleção <b>Não perguntar novamente</b>.</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>Figura 1.</strong> Um aplicativo que faz uma
-segunda solicitação para acesso à mídia removível.</p>
-
-<p>Se o usuário selecionar <b>Não perguntar novamente</b> e negar a solicitação, todas
-as solicitações futuras para o diretório provenientes do aplicativo serão automaticamente
-negadas e a IU de solicitação não será apresentada ao usuário.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/preview/features/security-config.jd b/docs/html-intl/intl/pt-br/preview/features/security-config.jd
deleted file mode 100644
index 27d8f2e..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/security-config.jd
+++ /dev/null
@@ -1,747 +0,0 @@
-page.title=Configuração de segurança de rede
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Neste documento</h2>
-<ol>
- <li><a href="#manifest">Adicionar um arquivo de configurações de segurança</a></li>
- <li><a href="#CustomTrust">Personalizar CAs confiáveis</a>
- <ol>
- <li><a href="#ConfigCustom">Configurar uma CA personalizada confiável</a></li>
- <li><a href="#LimitingCas">Limitar o conjunto de CAs confiáveis</a></li>
- <li><a href="#TrustingAdditionalCas">Confiar em CAs adicionais</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">CAs somente de depuração</a></li>
- <li><a href="#UsesCleartextTraffic">Cancelar uso de tráfego de texto simples</a></li>
- <li><a href="#CertificatePinning">Fixar certificados</a></li>
- <li><a href="#ConfigInheritance">Comportamento de herança de configuração</a></li>
- <li><a href="#FileFormat">Formato do arquivo de configurações</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- O Android N inclui um recurso de configurações de segurança de rede
- que permite que os aplicativos personalizem as configurações de segurança de rede em um arquivo de configurações declarativo e seguro
- sem modificar o código do aplicativo. Essas configurações podem
- ser definidas para domínios específicos e para um aplicativo específico. Os principais
- recursos são:
-</p>
-
-<ul>
- <li>
- <b>Âncoras de confiança personalizadas:</b> personalize quais autoridades de certificado (CA)
- são confiáveis para as conexões seguras de um aplicativo. Por
- exemplo, confiar em certificados autoassinados privados ou restringir
- o conjunto de CAs públicas nas quais o aplicativo confia.
- </li>
-
- <li>
- <b>Substituições somente de depuração:</b> depure conexões seguras do aplicativo com segurança,
- sem adicionar riscos à base instalada.
- </li>
-
- <li>
- <b>Cancelar uso de tráfego de texto simples:</b> proteja aplicativos contra
- o uso acidental de tráfego de texto simples.
- </li>
-
- <li>
- <b>Fixar certificados:</b> restrinja a conexão segura de um aplicativo
- a certificados específicos.
- </li>
-</ul>
-
-
-<h2 id="manifest">Adicionar um arquivo de configurações de segurança</h2>
-
-<p>
- O recurso de configurações de segurança de rede usa um arquivo XML no qual você especifica
- as configurações do seu aplicativo. Inclua uma entrada no manifesto do seu
- aplicativo para apontar para esse arquivo. Este trecho de código de um manifesto
- demonstra como criar essa entrada:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application ... >
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">Personalizar CAs confiáveis</h2>
-
-<p>
- Um aplicativo pode querer confiar em um conjunto personalizado de CAs em vez de no padrão
- da plataforma. Os motivos mais comuns para isso são:
-</p>
-
-<ul>
- <li>Conectar-se a um host com uma autoridade de certificado personalizada (autoassinada,
- emitida por uma CA corporativa interna etc.).
- </li>
-
- <li>Limitar o conjunto de CAs para apenas aquelas nas quais você confia em vez de todas
- as CAs pré-instaladas.
- </li>
-
- <li>Confiar em CAs adicionais não incluídas no sistema.
- </li>
-</ul>
-
-<p>
- Por padrão, conexões seguras (por exemplo, TLS, HTTPS) de todos os aplicativos confiam
- nas CAs pré-instaladas do sistema e os aplicativos direcionados ao nível da API 23
- (Android M) e inferior também confiam no repositório de CAs adicionadas pelo usuário por padrão. Um
- aplicativo pode personalizar as próprias conexões usando {@code base-config} (para
- personalização em todo o aplicativo) ou {@code domain-config} (para personalização
- por domínio).
-</p>
-
-
-<h3 id="ConfigCustom">Configurar uma CA personalizada</h3>
-
-<p>
- Suponhamos que você queira se conectar a um host que use um certificado SSL autoassinado
- ou a um host cujo certificado SSL foi emitido por uma CA não pública
- na qual confia, como a CA interna da sua empresa.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Adicione o certificado da CA autoassinada ou não pública em formato PEM ou DER em
- {@code res/raw/my_ca}.
-</p>
-
-
-<h3 id="LimitingCas">Limitar o conjunto de CAs confiáveis</h3>
-
-<p>
- Um aplicativo que não queira confiar em todas as CAs nas quais o sistema confia
- pode especificar o próprio conjunto limitado de CAs confiáveis. Isso protege o
- aplicativo contra certificados fraudulentos emitidos por qualquer outra CA.
-</p>
-
-<p>
- A configuração para limitar o conjunto de CAs confiáveis é semelhante a <a href="#TrustingACustomCa">confiar em uma CA personalizada</a> para um domínio específico, mas
- fornecendo várias CAs no recurso.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Adicione as CAs confiáveis em formato PEM ou DER em {@code res/raw/trusted_roots}.
- Observe que, ao usar o formato PEM, o arquivo deve conter <em>somente</em> dados PEM,
- sem texto adicional. Você também pode fornecer vários elementos
- <a href="#certificates"><code><certificates></code></a>
-em vez de um.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- Confiar em CAs adicionais
-</h3>
-
-<p>
- Um aplicativo pode querer confiar em CAs adicionais nas quais o sistema não confia.
- Isso pode ocorrer se o sistema ainda não incluiu a CA ou se a CA
- não atender aos requisitos de inclusão no sistema Android. O
- aplicativo pode fazer isso ao especificar várias fontes de certificados para uma
- configuração.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">Configurar CAs para depuração</h2>
-
-<p>
- Ao depurar um aplicativo conectado por HTTPS, você pode querer
- se conectar a um servidor de desenvolvimento local que não tenha o certificado SSL
- do seu servidor de produção. Para fazer isso sem
- modificar o código do aplicativo, você pode especificar CAs somente de depuração que
- sejam confiáveis <i>apenas</i> quando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- for {@code true} ao usar {@code debug-overrides}. Normalmente, IDEs e ferramentas de compilação
- definem esse sinalizador automaticamente para compilações de não lançamento.
-</p>
-
-<p>
- Isso é mais seguro do que o código condicional normal, pois, como medida
- de segurança, os repositórios do aplicativo não aceitam aplicativos marcados como
- depuráveis.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">Cancelar uso de tráfego de texto simples</h2>
-
-<p>
- Aplicativos que pretendem se conectar a destinos usando apenas conexões
- seguras podem cancelar o uso de texto simples de suporte (usando o protocolo HTTP não criptografado
- em vez de HTTPS) para esses destinos. Essa opção ajuda a evitar
- regressões acidentais em aplicativos devido a alterações nos URLs fornecidos por fontes externas,
- como servidores de back-end.
- Consulte {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()} para saber mais.
-</p>
-
-<p>
- Por exemplo, um aplicativo pode querer garantir que todas as conexões com {@code
- secure.example.com} sejam sempre realizadas por HTTPS para proteger o tráfego confidencial
- de redes hostis.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">Fixar certificados</h2>
-
-<p>
- Normalmente, um aplicativo confia em todas as CAs pré-instaladas. Se qualquer uma dessas CAs
- emitir um certificado fraudulento, o aplicativo estará em risco de ataques
- MiTM. Alguns aplicativos optam por limitar o conjunto de certificados que aceitam
- restringindo o conjunto de CAs ou fixando certificados.
-</p>
-
-<p>
- A fixação de certificados é realizada ao fornecer um conjunto de certificados pelo hash da
- chave pública (SubjectPublicKeyInfo do certificado X.509). Uma cadeia de certificados
- é válida somente se contiver pelo menos uma
- das chaves públicas fixadas.
-</p>
-
-<p>
- Observe que, ao usar a fixação de certificados, você deve sempre incluir uma chave de backup
- para que, se você for forçado a alternar para novas chaves ou alterar as CAs (ao
- fixar um certificado de CA ou um intermediário dessa CA), a
- conectividade do seu aplicativo não seja afetada. Caso contrário, você precisará enviar
- uma atualização ao aplicativo para restaurar a conectividade.
-</p>
-
-<p>
- Além disso, é possível definir um tempo de expiração para as fixações, após o qual
- elas não sejam mais realizadas. Isso ajuda a evitar problemas de conectividade
- em aplicativos que não foram atualizados. No entanto, definir um tempo de expiração
- para fixações pode permitir que as fixações sejam ignoradas.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">Comportamento de herança de configuração</h2>
-
-<p>
- Valores não definidos em uma configuração específica são herdados. Esse comportamento permite
- configurações mais complexas, mantendo o arquivo de configuração legível.
-</p>
-
-<p>
- Se um valor não for definido em uma entrada específica, o valor da próxima entrada
- mais genérica será usado. Valores não definidos em um {@code domain-config} são
- obtidos pelo {@code domain-config} pai, se aninhados, ou, caso contrário, pelo {@code
- base-config}. Valores não definidos no {@code base-config} usam os
- valores padrão da plataforma.
-</p>
-
-<p>
- Por exemplo, considere um caso no qual todas as conexões para subdomínios de {@code
- example.com} devem usar um conjunto personalizado de CAs. Além disso, o tráfego de texto simples para esses
- domínios é permitido <em>exceto</em> ao se conectar com {@code
- secure.example.com}. Ao aninhar a configuração para {@code
- secure.example.com} dentro da configuração para {@code example.com}, o
- {@code trust-anchors} não precisa ser duplicado.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">Formato do arquivo de configurações</h2>
-
-<p>
- O recurso de configurações de segurança de rede usa um formato do arquivo XML.
- A estrutura geral desse arquivo é mostrada no seguinte exemplo de código:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- As seções a seguir descrevem a sintaxe e outros detalhes do formato do
- arquivo.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- pode conter:
- </dt>
-
- <dd>
- 0 ou 1 de <code><a href="#base-config"><base-config></a></code><br>
- Qualquer número de <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 ou 1 de <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- sintaxe:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- pode conter:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- descrição:
- </dt>
-
- <dd>
- A configuração padrão usada por todas as conexões cujo destino não é
- coberto por um <a href="#domain-config"><code>domain-config</code></a>.
-
-<p>
- Qualquer valor não definido usa os valores padrão da plataforma. A configuração padrão
- para aplicativos direcionados a níveis de API acima do 24:
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-A configuração padrão para aplicativos direcionados a níveis de API 23 e inferiores:
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>sintaxe:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>Pode conter:</dt>
-
-<dd>
-1 ou mais <code><a href="#domain"><domain></a></code>
-<br/>0 ou 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 ou 1 <code><a href="#pin-set"><pin-set></code></a>
-<br/>Qualquer número de <code><domain-config></code> aninhados</dd>
-
-<dt>Descrição</dt>
-<dd>A configuração usada para conexões com destinos específicos, conforme é definido pelos elementos {@code domain}.
-
-<p>Observe que, se vários elementos {@code domain-config} cobrirem um destino, a configuração com a regra de domínio correspondente
-mais específica (mais longa) será usada.</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- sintaxe:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- Atributos:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- Se {@code "true"}, a regra de domínio corresponderá ao domínio e a todos os
- subdomínios, incluindo subdomínios de subdomínios. Caso contrário, a regra
- se aplica apenas a correspondências exatas.
- </dd>
- </dl>
- </dd>
-
- <dt>
- Descrição:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- sintaxe:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- Pode conter:
- </dt>
-
- <dd>
- 0 ou 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- Descrição:
- </dt>
-
- <dd>
- Substituições a serem aplicadas quando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- for {@code "true"}, o que normalmente ocorre em compilações de não lançamento
- geradas por IDEs e ferramentas de compilação. Âncoras de confiança especificadas em {@code
- debug-overrides} são adicionadas a todas as demais configurações e a fixação
- de certificados não é realizada quando a cadeia de certificados do servidor usa uma
- dessas âncoras de confiança somente de depuração. Se <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- for {@code "false"}, esta seção será ignorada por completo.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- sintaxe:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- Pode conter:
- </dt>
-
- <dd>
- Qualquer número de <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- Descrição:
- </dt>
-
- <dd>
- Conjunto de âncoras de confiança para conexões seguras.
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>sintaxe:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>descrição:</dt>
-<dd>Conjunto de certificados X.509 para elementos {@code trust-anchors}.</dd>
-
-<dt>atributos:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-A fonte de certificados de CA, que pode ser um dos
-<ul>
- <li>IDs de recursos brutos que apontam para um arquivo que contém certificados X.509.
- Os certificados devem ser codificados em formato DER ou PEM. No caso de certificados PEM,
- o arquivo <em>não deve</em> conter dados não PEM adicionais, como
- comentários.
- </li>
-
- <li>{@code "system"} para os certificados de CA pré-instalados do sistema
- </li>
-
- <li>{@code "user"} para certificados de CA adicionados pelo usuário
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- Especifica se as CAs dessa fonte ignoram a fixação de certificados. Se {@code
- “true”} e forem certificadas cadeias de certificados que incluam uma das CAs dessa
- fonte, a fixação não será realizada. Isso pode ser útil para depurar CAs
- ou permitir que o usuário execute ataques MiTM no tráfego seguro do seu aplicativo.
- </p>
-
- <p>
- O padrão é {@code "false"} a não ser que seja especificado em um elemento {@code debug-overrides}
-. Nesse caso, o padrão será {@code "true"}.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- sintaxe:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- Pode conter:
- </dt>
-
- <dd>
- Qualquer número de <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- Descrição:
- </dt>
-
- <dd>
- Um conjunto de fixações de chave pública. Para que uma conexão segura seja confiável, uma das
- chaves públicas na cadeia de confiança deve estar presente no conjunto de fixações. Consulte
- <code><a href="#pin"><pin></a></code> para saber mais sobre o formato das fixações.
- </dd>
-
- <dt>
- Atributos:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- A data, no formato {@code yyyy-MM-dd}, após a qual as fixações
- expiram e são desativadas. Se o atributo não for definido, as fixações
- não expirarão.
- <p>
- A expiração ajuda a evitar problemas de conectividade em aplicativos que não
- recebem atualizações para o conjunto de fixações, por exemplo, porque o usuário
- desativou as atualizações do aplicativo.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- sintaxe:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- Atributos:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- O algoritmo de resumo usado para gerar a fixação. No momento, apenas
- {@code "SHA-256"} é permitido.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/pt-br/preview/features/tv-recording-api.jd b/docs/html-intl/intl/pt-br/preview/features/tv-recording-api.jd
deleted file mode 100644
index 15d22d1..0000000
--- a/docs/html-intl/intl/pt-br/preview/features/tv-recording-api.jd
+++ /dev/null
@@ -1,142 +0,0 @@
-page.title=Gravação para TV
-page.keywords=preview,sdk,tv,recording
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#supporting">Indicar suporte para gravação</a></li>
- <li><a href="#recording">Gravar uma sessão</a></li>
- <li><a href="#errors">Solucionar erros de gravação</a></li>
- <li><a href="#sessions">Gerenciar sessões gravadas</a></li>
- <li><a href="#best">Práticas recomendadas</a></li>
- </ol>
-</div>
-</div>
-
-<p>Serviços de entrada de TV permitem que o usuário pause e retome a reprodução do canal por meio de
-APIs de time-shifting. O Android N expande o time-shifting
-ao permitir que o usuário salve várias sessões gravadas.</p>
-
-<p>Os usuários podem programar gravações antecipadamente ou iniciar uma gravação enquanto assistem a
-um programa. Quando o sistema salvar a gravação, o usuário poderá procurar, gerenciar
-e reproduzir a gravação usando o aplicativo de TV do sistema.</p>
-
-<p>Se quiser fornecer recursos de gravação para seu serviço de entrada de TV,
-indique para o sistema que o aplicativo oferece suporte a gravação, implemente
-a capacidade de gravar programas, solucione e comunique erros ocorridos
-durante a gravação e gerencie as sessões gravadas.</p>
-
-<p class="note"><strong>Observação:</strong> O aplicativo Live Channels ainda não
-oferece aos usuários uma forma de criar ou acessar gravações. Enquanto o aplicativo Live Channels não sofrer
- alterações, será difícil testar toda a experiência de
-gravação de seu serviço de entrada de TV.</p>
-
-<h2 id="supporting">Indicar suporte para gravação</h2>
-
-<p>Para informar ao sistema que seu serviço de entrada de TV oferece suporte a gravação, defina
- o atributo <code>android:canRecord</code> no arquivo XML de metadados do serviço
- como <code>true</code>:
-</p>
-
-<pre>
-<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
- <b>android:canRecord="true"</b>
- android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
-</pre>
-
-<p>Para obter mais informações sobre o arquivo de metadados do serviço, consulte
-<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">Declarar seu serviço
-de entrada de TV no manifesto</a> (em inglês).
-</p>
-
-<p>Como alternativa, você pode indicar suporte a gravação em seu código usando
-estas etapas:</p>
-
-<ol>
-<li>No método <code>TvInputService.onCreate()</code>, crie um novo objeto
-<code>TvInputInfo</code> usando a classe <code>TvInputInfo.Builder</code>
-.</li>
-<li>Ao criar o novo objeto <code>TvInputInfo</code>, chame
-<code>setCanRecord(true)</code> antes de chamar <code>build()</code> para
-indicar que seu serviço oferece suporte a gravação.</li>
-<li>Registre seu objeto <code>TvInputInfo</code> com o sistema chamando
-<code>TvInputManager.updateTvInputInfo()</code>.</li>
-</ol>
-
-<h2 id="recording">Gravar uma sessão</h2>
-
-<p>Depois que o serviço de entrada de TV registrar que oferece suporte ao recurso
-de gravação, o sistema chamará seu
-<code>TvInputService.onCreateRecordingSession()</code> quando precisar acessar
-a implementação de gravação do seu aplicativo. Implemente sua própria subclasse
-<code>TvInputService.RecordingSession</code> e retorne-a
-quando o retorno de chamada <code>onCreateRecordingSession()</code>
-for acionado. Essa subclasse é responsável por alternar para os dados de canal corretos,
-gravando os dados solicitados e comunicando o status de gravação e os erros ao
-sistema.</p>
-
-<p>Quando o sistema chamar <code>RecordingSession.onTune()</code>, passando um
-URI de canal, acesse o canal especificado pelo URI. Notifique o sistema de que
-seu aplicativo acessou o canal desejado ao chamar <code>notifyTuned()</code>
-ou, se o aplicativo não conseguiu acessar o canal correto, chame
-<code>notifyError()</code>.</p>
-
-<p>Em seguida, o sistema invoca o retorno de chamada <code>RecordingSession.onStartRecording()</code>
-. O aplicativo deve iniciar a gravação imediatamente. Quando o sistema invoca
-esse retorno de chamada, ele pode fornecer um URI que contenha informações sobre o programa
-que será gravado. Quando a gravação for concluída, você deverá copiar esses
-dados para a tabela de dados <code>RecordedPrograms</code>.</p>
-
-<p>Por fim, o sistema chama <code>RecordingSession.onStopRecording()</code>.
-Nesse momento, o aplicativo deve interromper a gravação imediatamente. Também é preciso
-criar uma entrada na tabela <code>RecordedPrograms</code>. Essa entrada deve
-incluir o URI dos dados da sessão gravada na coluna
-<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> e qualquer informação
-sobre o programa fornecida pelo sistema na chamada inicial em
-<code>onStartRecording()</code>.</p>
-
-<p>Para saber mais sobre como acessar a tabela <code>RecordedPrograms</code>,
-consulte <a href="#sessions">Gerenciar sessões gravadas</a>.</p>
-
-<h2 id="errors">Solucionar erros de gravação</h2>
-
-<p>Se um erro ocorrer durante a gravação, inutilizando os dados gravados,
-notifique o sistema chamando <code>RecordingSession.notifyError()</code>.
-Também é possível chamar <code>notifyError()</code> depois que uma sessão de gravação é
-criada para informar ao sistema que seu aplicativo não pode mais gravar sessões.</p>
-
-<p>Se um erro ocorrer durante a gravação, mas você quiser fornecer uma gravação
-parcial que pode ser usada pelos usuários para reprodução, chame
-<code>RecordingSession.notifyRecordingStopped()</code> para permitir que o sistema
-use a sessão parcial.</p>
-
-<h2 id="sessions">Gerenciar sessões gravadas</h2>
-
-<p>O sistema mantém as informações de todas as sessões gravadas de todos
-os aplicativos de canais com recursos de gravação na tabela de provedor de conteúdo <code>TvContract.RecordedPrograms</code>
-. Essas informações podem ser acessadas pelo URI de conteúdo
-<code>RecordedPrograms.Uri</code>. Use APIs de provedores de conteúdo para
-ler, adicionar e excluir entradas dessa tabela.</p>
-
-<p>Para saber mais sobre como trabalhar com dados de provedores de conteúdo, consulte
-<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
-Fundamentos do provedor de conteúdo</a> .</p>
-
-<h2 id="best">Práticas recomendadas</h2>
-
-<p>Dispositivos de TV podem ter armazenamento limitado, então tenha bom senso ao
-alocar armazenamento para salvar sessões gravadas. Use
-<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code> quando
-não houver espaço suficiente para salvar uma sessão gravada.</p>
-
-<p>Quando o usuário iniciar a gravação, comece a gravar os dados assim
-que possível. Para facilitar esse processo, realize qualquer tarefa demorada imediatamente,
-como acessar e alocar o espaço de armazenamento, quando o sistema invocar o retorno de chamada
-<code>onCreateRecordingSession()</code>. Isso permite que você comece
-a gravar imediatamente após o acionamento do retorno de chamada <code>onStartRecording()</code>
-.</p>
diff --git a/docs/html-intl/intl/pt-br/preview/guide.jd b/docs/html-intl/intl/pt-br/preview/guide.jd
deleted file mode 100644
index b33369e..0000000
--- a/docs/html-intl/intl/pt-br/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=Guia de teste
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Neste documento</h2>
- <ol>
- <li><a href="#runtime-permissions">Teste de permissões</a></li>
- <li><a href="#doze-standby">Teste de soneca e App em espera</a></li>
- <li><a href="#ids">Identificadores de dispositivo e backup automático</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- O Android N fornece uma oportunidade de garantir que os aplicativos funcionem
- na próxima versão da plataforma. Esta prévia inclui uma série de mudanças de comportamento e APIs que podem
- ter impacto no aplicativo, como descrito em <a href="{@docRoot}preview/api-overview.html">Visão geral da API
-</a> e <a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a>. No teste
- do aplicativo com a prévia, há algumas alterações de sistema específicas em que você deve se concentrar
- para garantir que os usuários tenham uma boa experiência.
-</p>
-
-<p>
- Este guia descreve quais recursos de prévia testar e como testá-los com o aplicativo. Você deve
- priorizar o teste destes recursos de prévia específicos devido ao grande impacto potencial no
- comportamento do aplicativo:
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">Permissões</a>
- </li>
- <li><a href="#doze-standby">Soneca e App em espera</a>
- </li>
- <li><a href="#ids">Identificadores de dispositivo e backup automático</a></li>
-</ul>
-
-<p>
- Para obter mais informações sobre como configurar dispositivos físicos ou virtuais com uma imagem do sistema de prévia
- para teste, consulte <a href="{@docRoot}preview/setup-sdk.html">Configuração
-do Android N SDK</a>.
-</p>
-
-
-<h2 id="runtime-permissions">Teste de permissões</h2>
-
-<p>
- O novo modelo de <a href="{@docRoot}preview/features/runtime-permissions.html">permissões</a>
- altera a maneira que as permissões são alocadas ao aplicativo pelo usuário. Em vez de conceder todas as permissões
- durante o procedimento de instalação, o aplicativo deve pedir ao usuário permissões individuais
- em tempo de execução. Para os usuários, este comportamento fornece um controle mais granular sobre as atividades de cada aplicativo, bem
- como um melhor contexto para entender o porquê do aplicativo estar solicitando uma permissão específica. Os usuários
- podem conceder ou revogar as permissões concedidas a um aplicativo individualmente a qualquer momento. É provável que este recurso
- da prévia tenha um impacto no comportamento do aplicativo e pode impedir que alguns
- dos recursos do aplicativo funcionem, ou funcionem em um estado degradado.
-</p>
-
-<p class="caution">
- Esta alteração afeta todos os aplicativos em execução na nova plataforma, mesmo aqueles que não são destinados
- para a versão nova da plataforma. A plataforma fornece um comportamento de compatibilidade limitado para aplicativos legados. No entanto,
- você deve começar a planejar a migração do aplicativo para o novo modelo de permissões agora, com o objetivo
- de publicar uma versão atualizada do aplicativo no lançamento oficial da plataforma.
-</p>
-
-
-<h3 id="permission-test-tips">Dicas de teste</h3>
-
-<p>
- Use as seguintes dicas de teste para ajudar você a planejar e executar os testes do aplicativo com o novo
- comportamento de permissões.
-</p>
-
-<ul>
- <li>Identifique as permissões atuais do aplicativo e os caminhos de código relacionados.</li>
- <li>Teste o fluxo de usuário entre serviços protegidos por permissão e dados.</li>
- <li>Teste com várias combinações de permissões revogadas/concedidas.</li>
- <li>Use a ferramenta {@code adb} para gerenciar as permissões da linha de comando:
- <ul>
- <li>Liste as permissões e o status por grupos:
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>Conceda ou revogue uma ou mais permissões usando a seguinte sintaxe:<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>Analise o aplicativo para encontrar os serviços que usam permissões.</li>
-</ul>
-
-<h3 id="permission-test-strategy">Estratégia de teste</h3>
-
-<p>
- A mudança de permissões afeta a estrutura e o projeto do aplicativo, bem como
- a experiência do usuário e os fluxos fornecidos a eles. Você deve avaliar o uso das permissões atuais
- do aplicativo e começar a planejar novos fluxos que deseja oferecer. O lançamento oficial
- da plataforma fornece comportamento de compatibilidade, mas deve-se planejar a atualização do aplicativo e
- não confiar nestes comportamentos.
-</p>
-
-<p>
- Identifique as permissões que o aplicativo realmente precisa e usa e, em seguida, encontre os vários caminhos
- de código que usam os serviços protegidos por permissões. É possível fazer isto por meio de uma combinação de
- testes na nova plataforma e análise de códigos. Nos testes, você deve se concentrar em usar
- as permissões em tempo de execução alterando {@code targetSdkVersion} do aplicativo para a versão da prévia. Para
- obter mais informações, consulte <a href="{@docRoot}preview/setup-sdk.html#">Configuração
-do Android N SDK</a>.
-</p>
-
-<p>
- Teste com várias combinações de permissões revogadas e concedidas para destacar os fluxos de usuário
-que dependem de permissões. Onde uma dependência não for óbvia ou lógica, considere
-refatorar ou compartimentalizar este fluxo para eliminar a dependência ou para esclarecer por que
-a permissão é necessária.
-</p>
-
-<p>
- Para obter mais informações sobre o comportamento das permissões em tempo de execução, de testes e de melhores práticas, consulte a página
- <a href="{@docRoot}preview/features/runtime-permissions.html">Permissões</a> do Developer
- Preview.
-</p>
-
-
-<h2 id="doze-standby">Teste de soneca e App em espera</h2>
-
-<p>
- Os recursos de economia de energia de App em espera e soneca limitam a quantidade de processamento de segundo plano que o aplicativo
- pode realizar quando um dispositivo está no estado ocioso ou enquanto não está em foco. As
- restrições que o sistema pode impor nos aplicativos inclui acesso a rede limitado ou restrito,
- tarefas de segundo plano suspensas, notificações suspensas, solicitações de soneca ignoradas e despertadores. Para garantir
- que o aplicativo se comportará adequadamente com essas otimizações de economia de energia, deve-se testá-lo
- simulando estes estados de baixa energia.
-</p>
-
-<h4 id="doze">Testar o aplicativo com Soneca</h4>
-
-<p>Para testar a Soneca com o aplicativo:</p>
-
-<ol>
-<li>Configure um dispositivo de hardware ou virtual com uma imagem do sistema Android N.</li>
-<li>Conecte o dispositivo à máquina de desenvolvimento e instale o aplicativo.</li>
-<li>Execute o aplicativo e deixe-o ativo.</li>
-<li>Simule o dispositivo acessando o modo Soneca executando os seguintes comandos:
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>Observe o comportamento do aplicativo quando o dispositivo é reativado. Certifique-se de que
- ele se recupere corretamente quando o dispositivo sai do modo Soneca.</li>
-</ol>
-
-
-<h4 id="standby">Testar aplicativos com App em espera</h4>
-
-<p>Para testar o modo de espera do aplicativo:</p>
-
-<ol>
- <li>Configure um dispositivo de hardware ou virtual com uma imagem do sistema Android N.</li>
- <li>Conecte o dispositivo à máquina de desenvolvimento e instale o aplicativo.</li>
- <li>Execute o aplicativo e deixe-o ativo.</li>
- <li>Simule o aplicativo acessando o modo de espera executando os seguintes comandos:
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>Simule o despertar do aplicativo usando o seguinte comando:
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>Observe o comportamento do aplicativo quando ele é despertado. Certifique-se de que ele se recupere corretamente
- do modo de espera. Particularmente, deve-se verificar se as notificações e os trabalho de segundo plano
- do aplicativo continuam a funcionar como o esperado.</li>
-</ol>
-
-<h2 id="ids">Backup automático para aplicativos e identificadores específicos do dispositivo</h2>
-
-<p>Caso o aplicativo esteja persistindo qualquer identificador específico do dispositivo, como o ID de registro do Google
-Cloud Messaging, no armazenamento interno,
-certifique-se de seguir as práticas recomendadas para excluir o local de armazenamento
-do backup automático, como descrito em <a href="{@docRoot}preview/backup/index.html">Backup automático
-para aplicativos</a>. </p>
diff --git a/docs/html-intl/intl/pt-br/preview/j8-jack.jd b/docs/html-intl/intl/pt-br/preview/j8-jack.jd
deleted file mode 100644
index 5047396..0000000
--- a/docs/html-intl/intl/pt-br/preview/j8-jack.jd
+++ /dev/null
@@ -1,197 +0,0 @@
-page.title=Recursos de linguagem do Java 8
-page.keywords="android N", "Java 8", "Jack"
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <ol>
- <li>
- <a href="#supported-features">Recursos de linguagem e APIs do Java 8 com suporte</a>
- </li>
- <li>
- <a href="#configuration">Como ativar os recursos do Java 8 e a cadeia de ferramentas Jack</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>O Android N introduz o suporte aos recursos de linguagem do Java 8
- que podem ser usados ao desenvolver aplicativos direcionados ao Android N.
- Esta página descreve os novos recursos de linguagem com suporte no Android N
- Preview, como configurar seu projeto para usá-los e os
- problemas conhecidos que você poderá encontrar.
-</p>
-
-<p>Para começar a usar esses recursos, primeiro faça o download e instale o Android
-Studio 2.1 e o Android N Preview SDK, que inclui a
-cadeia de ferramentas Jack obrigatória e o Android Plugin for Gradle atualizado. Se você ainda não
-instalou o Android N Preview SDK, consulte <a href="{@docRoot}preview/setup-sdk.html">Preparação para desenvolver para o Android N</a>.</p>
-
-
-
-<p class="note">
- <strong>Observação:</strong> O uso dos novos recursos de linguagem do Java 8 não é
- obrigatório para desenvolver aplicativos direcionados à plataforma Android N. Se
- não quiser escrever código com os recursos de linguagem do Java 8, você poderá manter
- os valores de compatibilidade de origem e destino do seu projeto definidos para o Java 7, mas ainda
- será necessário compilar com o JDK 8 para desenvolver para a plataforma Android N.
-</p>
-
-<h2 id="supported-features">
- Recursos de linguagem e APIs do Java 8 com suporte
-</h2>
-
-<p>
- Atualmente, o Android não oferece suporte a todos os recursos de linguagem do Java 8. No entanto, os
- recursos a seguir agora estão disponíveis para o desenvolvimento de aplicativos direcionados ao
- Android N Preview:
-</p>
-
-<ul>
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">Métodos
- de interface padrão e estáticos</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html">
- Expressões Lambda</a> (também disponíveis em nível da API 23 ou anterior)
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/annotations/repeating.html">Anotações
- repetíveis</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/tutorial/java/javaOO/methodreferences.html">
- Referências de método</a> (também disponíveis em nível da API 23 ou anterior)
- </li>
-</ul>
-
-<p class="note">
- <strong>Observação:</strong> Para testar expressões Lambda ou referências de método em
- versões mais antigas do Android, acesse o arquivo {@code build.gradle}
- e configure {@code compileSdkVersion} e {@code targetSdkVersion} como 23 ou
-anterior. Você precisará <a href="#configuration">permitir que a
- cadeia de ferramentas Jack</a> use esses recursos do Java 8.
-</p>
-
-<p>
- Além disso, as seguintes APIs de recursos de linguagem do Java 8 agora estão disponíveis:
-</p>
-
-<ul>
- <li>APIs relacionadas a reflexo e linguagem:
- <ul>
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/FunctionalInterface.html">
- {@code java.lang.FunctionalInterface}</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Repeatable.html">
- {@code java.lang.annotation.Repeatable}</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#isDefault--">
- {@code java.lang.reflect.Method.isDefault()}</a>
- </li>
-
- <li>e Reflection APIs associadas a anotações repetíveis, como
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType-java.lang.Class-">
- {@code AnnotatedElement.getAnnotationsByType(Class)}</a>
- </li>
- </ul>
- </li>
-
- <li>Utility APIs:
- <ul>
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">
- {@code java.util.function}</a>
- </li>
-
- <li>
- <a class="external-link" href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html">
- {@code java.util.stream}</a>
- </li>
- </ul>
- </li>
-</ul>
-
-<h2 id="configuration">
- Como ativar os recursos do Java 8 e a cadeia de ferramentas Jack
-</h2>
-
-<p>
- Para usar os novos recursos de linguagem do Java 8, você também deve usar a
- nova <a class="external-link" href="https://source.android.com/source/jack.html">cadeia de ferramentas Jack</a>. Essa nova
- cadeia de ferramentas Android compila o código-fonte de linguagem Java em um código de bytes dex que pode ser lido no Android,
- tem o próprio formato de biblioteca {@code .jack} e fornece a maioria dos recursos
- de uma cadeia de ferramentas em uma só ferramenta: reempacotamento, redução, ofuscação e
- multidex.
-</p>
-
-<p>Veja uma comparação entre duas cadeias de ferramentas usadas para compilar arquivos Android DEX:</p>
-<ul>
- <li>Cadeia de ferramentas legada javac:<br>
- <b>javac</b> ({@code .java} --> {@code .class}) --> <b>dx</b> ({@code
- .class} --> {@code .dex})
- </li>
-
- <li>Nova cadeia de ferramentas Jack:<br>
- <b>Jack</b> ({@code .java} --> {@code .jack} --> {@code .dex})
- </li>
-</ul>
-
-<h3>
- Configuração do Gradle
-</h3>
-
-<p>
- Para ativar os recursos de linguagem do Java 8 e o Jack para seu projeto, insira
- o seguinte no arquivo {@code build.gradle} de nível do módulo:
-</p>
-
-<pre>
-android {
- ...
- defaultConfig {
- ...
- jackOptions {
- enabled true
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
-</pre>
-
-<h3 id="known-issues">
- Problemas conhecidos
-</h3>
-
-<p>
- <a href="{@docRoot}tools/building/building-studio.html#instant-run">O Instant
- Run</a> não funciona com o Jack e será desativado enquanto
- a nova cadeia de ferramentas estiver em uso.
-</p>
-
-<p>Como o Jack não gera arquivos de classe intermediária ao compilar um
-aplicativo, ferramentas que dependem desses arquivos não funcionam com o Jack. Alguns
-exemplos dessas ferramentas são:</p>
-
-<ul>
- <li>Detectores de códigos suspeitos que operam em arquivos de classe
- </li>
-
- <li>Ferramentas e bibliotecas que exigem os arquivos de classe do aplicativo (como
- testes de instrumentação com JaCoCo)
- </li>
-</ul>
-
-<p>Se encontrar outros problemas ao usar o Jack, <a href="http://tools.android.com/filing-bugs">envie um relatório de erros</a>.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/preview/license.jd b/docs/html-intl/intl/pt-br/preview/license.jd
deleted file mode 100644
index 7228bb0..0000000
--- a/docs/html-intl/intl/pt-br/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=Contrato de licença
-
-@jd:body
-
-<p>
-Para começar a usar o Android SDK Preview, você deve concordar com os seguintes termos e condições.
-Como descrito abaixo, observe que esta é uma versão de prévia do Android SDK, sujeita a alterações, que deve ser usada por seu risco. O Android SDK Preview não é uma versão estável e pode conter erros e defeitos que podem resultar em danos sérios aos sistemas de computador, aos dispositivos e aos dados.
-</p>
-
-<p>
-Este é o contrato de licença do Android SDK Preview (o “Contrato de Licença”).
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. Introdução
-
-1.1 O Android SDK Preview (que este Contrato de licença chama de "Preview", incluindo especificamente os arquivos de sistema do Android, APIs integradas e arquivos da biblioteca Preview, se e quando estiverem disponíveis) é licenciado por meio da concordância com os termos deste contrato. O Contrato de licença forma um vínculo contratual legal entre o contratante e a Google em relação ao uso do Preview.
-
-1.2 "Android" refere-se à pilha de software do Android para dispositivos, conforme disponibilizado no Projeto de código aberto do Android, localizado no URL a seguir: http://source.android.com/, atualizado periodicamente.
-
-1.3 “Compatível com Android” significa qualquer implementação do Android que (i) obedece ao documento Definição de Compatibilidade com Android, que pode ser encontrado no site de compatibilidade do Android (http://source.android.com/compatibility) que pode ser atualizado de tempos em tempos; e (ii) seja aprovado no Android Compatibility Test Suite (CTS).
-
-1.4 “Google” se refere à Google Inc, uma corporação de Delaware, com sede em 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
-
-2. Aceitação do Contrato de Licença
-
-2.1 A fim de usar o Preview, é necessário concordar com este Contrato de licença. O uso do Preview é proibido àqueles que não concordam com este Contrato de licença.
-
-2.2 Ao clicar em aceitar e/ou usar o Preview, você concorda com os termos do Contrato de licença
-
-2.3 É proibido o uso do Preview e a aceitação deste contrato pelo indivíduo que tenha impedimento legal sobre o recebimento do Preview sob as leis dos Estados Unidos ou de outros países, incluindo o país de residência ou no qual usa o Preview.
-
-2.4 Se for usar o Preview internamente na empresa ou organização, você deverá concordar com o vínculo com este contrato em nome do empregador ou de outra entidade e declarar e garantir que tem total autoridade legal para tanto. Se você não tem a autoridade necessária, não deve concordar com este contrato nem usar o Preview em nome do empregador ou de outra entidade.
-
-3. Licença do Preview da Google
-
-3.1 Sujeito aos termos deste Contrato de licença, a Google confere uma licença limitada, mundial, sem royalties, intransmissível, não exclusiva e não sublicenciável unicamente para o uso do Preview exclusivamente para o desenvolvimento de aplicativos executados para implementações compatíveis do Android.
-
-3.2 Você não poderá usar este Preview para desenvolver aplicativos para outras plataformas (incluindo implementações não compatíveis do Android) nem para desenvolver outro SDK. Você tem a liberdade para desenvolver aplicativos para outras plataformas, incluindo implementações não compatíveis do Android, desde que este Preview não seja usado para essa finalidade.
-
-3.3 Você concorda que a Google ou terceiros detêm todos os direitos legais, títulos e interesses relativos ao Preview, incluindo quaisquer direitos de propriedade intelectual que subsistam no Preview. "Direitos de propriedade intelectual" se referem a todo e qualquer direito sob as leis de patentes, de direitos autorais, de segredo comercial, de marca registrada e todos os outros direitos de propriedade. A Google reserva todos os direitos não conferidos expressamente a você.
-
-3.4 O uso do Preview não é autorizado para qualquer finalidade não expressamente permitida por este Contrato de licença. Salvo na extensão exigida por licenças aplicáveis de terceiros, é proibido: (a) copiar (exceto para fins de cópia de segurança), modificar, adaptar, redistribuir, descompilar, fazer engenharia reversa, desmontar ou criar trabalhos derivados do Preview ou qualquer parte dele; ou (b) carregar qualquer parte do Preview em um aparelho celular ou outro dispositivo de hardware, exceto em computador pessoal, combinar qualquer parte do Preview com outros softwares ou distribuir qualquer software ou dispositivo que contenha uma parte do Preview.
-
-3.5 O uso, a reprodução e a distribuição de componentes do Preview licenciado sob uma licença de software de código aberto são regidos exclusivamente pelos termos daquela licença de software de código aberto, e não por este Contrato de licença. Você concorda em manter uma licença em situação regular para as licenças de software de código aberto sob todos os direitos concedidos e deter quaisquer ações que possam limitar, suspender ou romper tais direitos.
-
-3.6 Você concorda que a forma e a natureza do Preview que a Google fornece podem mudar sem aviso prévio e que as versões futuras do Preview podem ser incompatíveis com aplicativos desenvolvidos em versões anteriores do Preview. Você concorda que a Google pode cessar (permanente ou temporariamente) o fornecimento do Preview (ou quaisquer recursos dentro dele) a você ou a usuários em geral sob critério exclusivo da Google, sem aviso prévio.
-
-3.7 Nada neste Contrato de licença confere o direito de uso de quaisquer nomes comerciais, marcas comerciais, marcas de serviço, logomarcas, nomes de domínios e outros recursos de marcas especiais da Google.
-
-3.8 Você concorda que não removerá, ocultará nem alterará quaisquer observações de direitos de propriedade (incluindo observações de direitos autorais e de marcas registradas) que possam estar afixadas ou contidas no Preview.
-
-4. O uso do Preview
-
-4.1 A Google entende que nada no Contrato de Licença dá a ela direitos, título nem interesse sobre o usuário (ou sobre os seus licenciadores) sob o presente Contrato de licença nem sobre quaisquer aplicativos de software que o usuário desenvolver usando o Preview, incluindo quaisquer direitos de propriedade intelectual que subsistem nos referidos aplicativos.
-
-4.2 Você concorda em usar o Preview e desenvolver aplicativos somente para as finalidades permitidas por (a) este Contrato de licença e (b) quaisquer leis, normas, diretrizes geralmente aceitas ou orientações aplicáveis nas jurisdições relevantes (incluindo quaisquer leis acerca da exportação de dados ou softwares dos e para os Estados Unidos ou outros países relevantes.
-
-4.3 Você concorda que, se usar o Preview para o desenvolvimento de aplicativos, deverá proteger a privacidade e os direitos legais dos usuários. Se nomes de usuário, senhas ou outras informações de acesso ou informações pessoais forem fornecidos ao aplicativo, deve-se informá-los de que tais dados estarão disponíveis para o aplicativo, além de fornecer observações de privacidade e proteção legalmente adequadas a esses usuários. Se o aplicativo armazenar informações pessoais ou confidenciais fornecidas pelos usuários, deve fazê-lo com segurança. Se o usuário fornecer informações da conta do Google, o aplicativo poderá usar essas informações exclusivamente para acessar a conta da Google do usuário quando houver autorização para fazê-lo e para os fins limitados pela autorização.
-
-4.4 Você concorda que não se envolverá em qualquer atividade com o Preview, incluindo o desenvolvimento e a distribuição de um aplicativo que interfira, perturbe, danifique ou acesse, de modo não autorizado, servidores, redes ou outras propriedades ou serviços da Google ou qualquer outro terceiro.
-
-4.5 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) quaisquer dados, conteúdo ou recursos que criar, transmitir ou exibir por meio do Android e/ou de aplicativos do Android e pelas consequências que suas ações (incluindo perda ou dano que a Google possa sofrer) podem gerar.
-
-4.6 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) qualquer violação das obrigações exigidas neste Contrato de licença, qualquer contrato ou termos de serviço aplicáveis a terceiros, qualquer lei ou norma aplicável e pelas consequências (incluindo a perda ou dano que a Google ou qualquer terceiro possa sofrer) de quaisquer violações.
-
-4.7 O Preview está em desenvolvimento e o seu teste e feedback são uma parte importante deste processo. Ao usar o Preview, você está ciente de que a implementação de alguns recursos ainda estão em desenvolvimento e que não se deve confiar que o Preview tem a funcionalidade completa de uma versão estável. Você concorda em não distribuir nem enviar publicamente quaisquer aplicativos usando este Preview, pois ele não será mais suportado após o lançamento oficial do Android SDK.
-
-5. Suas credenciais de desenvolvedor
-
-5.1 Você é responsável pela manutenção da confidencialidade de quaisquer credenciais de desenvolvedor que possam ser emitidas pela Google ou escolhidas por você e será o único responsável por todos os aplicativos que forem desenvolvidos sob suas credenciais de desenvolvedor.
-
-6. Privacidade e informações
-
-6.1 A fim de inovar e aprimorar continuamente o Preview, a Google pode coletar certas estatísticas de uso do software, incluindo, sem limitar-se, um identificador exclusivo, endereço IP associado, número de versão do software e informações sobre quais ferramentas e/ou serviços no Preview estão sendo usados e como estão sendo usados. Antes de coletar quaisquer dessas informações, o Preview o notificará e buscará seu consentimento. Se você recusar, as informações não serão coletadas.
-
-6.2 Os dados coletados são examinados coletivamente para aprimorar o Preview e são mantidos em conformidade com a Política de privacidade da Google acessível em http://www.google.com/policies/privacy/.
-
-7. Aplicativos de terceiros
-
-7.1 Ao usar o Preview para executar aplicativos desenvolvidos por terceiros ou que acessam dados, conteúdo ou recursos fornecidos por terceiros, você concorda que a Google não é responsável por tais aplicativos, dados, conteúdo ou recursos. Você compreende que quaisquer dados, conteúdo ou recursos que possa acessar por meio de tais aplicativos de terceiros imputam responsabilidade exclusiva ao indivíduo que os originou. A Google não é responsável por qualquer perda ou dano que possa ocorrer como resultado do uso ou acesso de quaisquer aplicativos, dados, conteúdo ou recursos de terceiros.
-
-7.2 Você deve estar ciente de que os dados, conteúdo e recursos apresentados a você por aplicativos de terceiros podem ser protegidos pelos direitos de propriedade intelectual de posse dos fornecedores (ou de outras pessoas ou empresas em seus nomes). Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados com base nestes dados, conteúdo ou recursos (na totalidade ou em parte), salvo se houver permissão explícita especificada pelos respectivos proprietários.
-
-7.3 Você reconhece que o uso de tais aplicativos, dados, conteúdo ou recursos de terceiros pode estar sujeito a termos adicionais entre você e o terceiro em questão.
-
-8. Uso de APIs da Google
-
-8.1 APIs da Google
-
-8.1.1 Ao usar qualquer API para recuperar dados da Google, você reconhece que eles podem ser protegidos por direitos de propriedade intelectual de posse da Google ou dos terceiros que fornecem os dados (ou de pessoas ou empresas em nomes deles). O uso de tal API pode estar sujeito a termos de serviço adicionais. Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados baseados nesses dados (na totalidade ou em parte), salvo se permitido pelos termos de serviço pertinentes.
-
-8.1.2 Se você usar qualquer API para recuperar dados de um usuário a partir da Google, reconhece e concorda que deve recuperar dados somente com consentimento explícito do usuário e somente quando, e para os fins limitados aos quais, o usuário conceder permissão para fazê-lo.
-
-9. Rescisão do Contrato de licença
-
-9.1 O Contrato de licença continuará a se aplicar até que ocorra uma rescisão sua ou da Google, como definido abaixo.
-
-9.2 Caso queira rescindir o Contrato de licença, você pode fazer isto cessando o uso do Preview e de qualquer credencial de desenvolvedor relevante.
-
-9.3 A Google pode, a qualquer momento, rescindir o Contrato de licença, com ou sem causa, com uma notificação.
-
-9.4 O Contrato de licença será encerrado automaticamente sem aviso ou outras ações na ocorrência de:
-(A) a Google interromper o fornecimento do Preview ou de determinadas partes do Preview aos usuários no país em que você reside ou de onde o serviço é usado; e
-(B) a Google emitir uma versão de lançamento final do Android SDK.
-
-9.5 Quando o Contrato de licença é rescindido, a licença concedida a você no Contrato de licença é finalizada, todo o uso do Preview será interrompido e as provisões dos parágrafos 10, 11, 12 e 14 deverão permanecer indefinidamente.
-
-10. EXCLUSÕES
-
-10.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE O RISCO DO USO DO PREVIEW É EXCLUSIVAMENTE SEU E QUE O PREVIEW É FORNECIDO NA FORMA EM QUE SE ENCONTRA E COMO DISPONIBILIZADO, SEM GARANTIA DE QUALQUER TIPO DA GOOGLE.
-
-10.2 O USO DO PREVIEW E DE QUALQUER MATERIAL BAIXADO OU OBTIDO DE OUTRO MODO PELO USO DO PREVIEW ESTÁ A SEU CRITÉRIO E RISCO E VOCÊ É O ÚNICO RESPONSÁVEL POR QUALQUER DANO AO SEU SISTEMA OPERACIONAL OU OUTRO DISPOSITIVO OU PELA PERDA DE DADOS QUE RESULTEM DE TAL USO. SEM LIMITAR OS PRECEDENTES, VOCÊ ENTENDE QUE O PREVIEW NÃO É UMA VERSÃO ESTÁVEL E QUE PODE CONTER ERROS, DEFEITOS E VULNERABILIDADES DE SEGURANÇA QUE PODEM RESULTAR EM DANOS SIGNIFICANTES, INCLUINDO A PERDA IRRECUPERÁVEL OU COMPLETA DO USO DO SISTEMA DO COMPUTADOR OU DE OUTROS DISPOSITIVOS.
-
-10.3 A GOOGLE EXCLUI EXPRESSAMENTE TODAS AS GARANTIAS E CONDIÇOES DE QUALQUER TIPO, EXPRESSAS OU IMPLÍCITAS, INCLUINDO, MAS NÃO LIMITADO A, GARANTIAS E CONDIÇÕES DE COMERCIALIZAÇÃO IMPLÍCITAS, ADEQUAÇÃO A UMA FINALIDADE PARTICULAR E A NÃO VIOLAÇÃO.
-
-11. LIMITAÇÃO DE RESPONSABILIDADE
-
-11.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE A GOOGLE, SUAS SUBSIDIÁRIAS, AFILIADAS E SEUS LICENCIADORES NÃO SERÃO RESPONSABILIZADOS POR VOCÊ SOB QUALQUER TEORIA DE RESPONSABILIDADE POR QUAISQUER DANOS, SEJAM ELES DIRETOS, INDIRETOS, INCIDENTAIS, ESPECIAIS, CONSEQUENCIAIS OU DE EXEMPLO QUE POSSAM INCORRER, INCLUINDO QUALQUER PERDA DE DADOS, INDEPENDENTE DE AVISO À GOOGLE OU A SEUS REPRESENTANTES OU DA NECESSIDADE DE AVISO SOBRE A POSSIBILIDADE DA INCORRÊNCIA DE TAIS PERDAS.
-
-12. Indenização
-
-12.1 Ao limite máximo permitido por lei, você concorda em defender, indenizar e isentar a Google, suas afiliadas e respectivos conselheiros, diretores, empregados e agentes com relação a todas e quaisquer reivindicações, ações, processos ou procedimentos, bem como todas e quaisquer perdas, responsabilidades, danos, custos e despesas (incluindo honorários advocatícios) decorrentes ou provenientes de: (a) seu uso do Preview, (b) qualquer aplicativo desenvolvido no Preview que infrinja direitos de propriedade intelectual de qualquer pessoa, difame qualquer pessoa ou viole seus direitos de publicidade ou privacidade e (c) qualquer não cumprimento deste Contrato de licença.
-
-13. Mudanças no Contrato de licença
-
-13.1 A Google pode realizar mudanças no Contrato de licença à medida que distribui novas versões do Preview. Quando essas mudanças forem realizadas, a Google fará uma nova versão do Contrato de licença disponível no site em que o Preview estiver disponível.
-
-14. Termos legais gerais
-
-14.1 Esse Contrato de licença constitui o contrato legal integral entre você e a Google e rege o uso do Preview (excluindo quaisquer serviços que a Google possa fornecer a você sob um contrato escrito em separado), e substitui inteiramente quaisquer contratos anteriores entre você e a Google em relação ao Preview.
-
-14.2 Você concorda que, se a Google não exercer nem impetrar qualquer direito ou recurso legal que esteja contido no Contrato de licença (ou que a Google detenha direitos nos termos de qualquer lei aplicável), não se considerará esse fato como uma renúncia formal aos direitos da Google e esses direitos ou recursos continuarão disponíveis à Google.
-
-14.3 Se qualquer tribunal de justiça que tiver a competência para decidir sobre esse tema determinar que qualquer cláusula do Contrato de licença é inválida, tal cláusula será removida do contrato sem afetar as cláusulas restantes ou sua vigência. As cláusulas restantes do Contrato de licença continuarão válidas e obrigatórias.
-
-14.4 Você reconhece e concorda que cada membro do grupo de empresas das quais a Google é a empresa controladora deve ser beneficiário terceiro do Contrato de licença e que essas outras empresas terão o poder de aplicar diretamente, e apoiar-se em, qualquer cláusula do Contrato de licença que confira um direito (ou direitos em favor) deles. Além disso, nenhuma outra pessoa nem empresa deve ser beneficiário terceiro do Contrato de licença.
-
-14.5 RESTRIÇÕES DE EXPORTAÇÃO. O PREVIEW ESTÁ SUJEITO ÀS LEIS E NORMAS DE EXPORTAÇÃO DOS ESTADOS UNIDOS. VOCÊ DEVE CUMPRIR TODAS AS LEIS E NORMAS DOMÉSTICAS E INTERNACIONAIS QUE SE APLICAREM AO PREVIEW. ESSAS LEIS INCLUEM RESTRIÇÕES SOBRE DESTINOS, USUÁRIOS FINAIS E USO FINAL.
-
-14.6 O Contrato de licença não pode ser atribuído nem transferido por você sem a aprovação prévia por escrito da Google. Qualquer tentativa de atribuição sem a aprovação será inválida. Você não deve delegar as próprias responsabilidades ou obrigações nos termos do Contrato de licença sem aprovação prévia por escrito da Google.
-
-14.7 O Contrato de licença e sua relação com a Google nos termos do contrato serão regidos pelas leis do estado da Califórnia sem considerar conflitos de disposições legais. Você e a Google concordam em se submeter à competência exclusiva dos tribunais localizados na comarca de Santa Clara, Califórnia, para dirimir quaisquer questões legais decorrentes do Contrato de licença. Não obstante a isso, você concorda que a Google continua habilitada a impetrar medidas cautelares (ou mecanismo legal urgente equivalente) em qualquer jurisdição.
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/preview/overview.jd b/docs/html-intl/intl/pt-br/preview/overview.jd
deleted file mode 100644
index eaa3c0c..0000000
--- a/docs/html-intl/intl/pt-br/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=Visão geral do programa
-page.metaDescription=Prepare seus aplicativos para a próxima versão do Android.
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- Bem-vindo ao <strong>Android N Developer Preview</strong>, um programa que
- fornece tudo que é necessário para testar e otimizar os aplicativos para a próxima
- versão do Android. É de graça e você pode começar agora mesmo:
- basta fazer o download das ferramentas N Developer Preview.
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- Imagens de emulador e hardware
- </h5>
-
- <p>
- Execute e teste seus aplicativos em diversos dispositivos ou em um emulador.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Código de plataforma mais recente
- </h5>
-
- <p>
- Forneceremos atualizações mensais durante o Preview. Portanto, você testará de acordo com as alterações mais recentes da plataforma.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Prioridade para problemas de desenvolvimento
- </h5>
-
- <p>
- Durante as primeiras semanas, nós daremos prioridade aos problemas informados
- por desenvolvedores. Portanto, teste e forneça-nos feedback o quanto antes.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- Novos comportamentos e recursos
- </h5>
-
- <p>
- Comece a trabalhar mais cedo para oferecer suporte aos novos comportamentos da plataforma e desenvolver seus aplicativos com novos recursos.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Atualizações entregues por OTA
- </h5>
-
- <p>
- Atualizações OTA eficientes para qualquer dispositivo compatível por meio do
- programa beta do Android. Não é preciso atualizar manualmente.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Feedback e suporte
- </h5>
-
- <p>
- Informe problemas e dê-nos feedback usando o
-<a href="{@docRoot}preview/bug">issue tracker</a>. Conecte-se a outros
- desenvolvedores na
- <a href="{@docRoot}preview/dev-community">Comunidade N Developer</a>.
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">Cronograma e atualizações</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- O N Developer Preview será executado a partir de 3 de março de 2016 até o último lançamento público do Android N
- para AOSP e OEMs, planejado para o terceiro trimestre de 2016.
-</p>
-
-<p>
- Nos marcos mais importantes do desenvolvimento, forneceremos atualizações para seu ambiente de teste e
- desenvolvimento. De modo geral, você pode esperar atualizações mensais (intervalo de
- 4 a 6 semanas). Os marcos estão listados abaixo.
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (versão inicial, alfa)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (atualização incremental, alfa)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong> (atualização incremental, beta)</li>
- <li><strong>Preview 4</strong> (APIs finais e SDK oficial, publicação no Play)</li>
- <li><strong>Preview 5</strong> (imagens de sistema quase finalizadas para o teste final)</li>
- <li><strong>Versão final</strong> para AOSP e ecossistema</li>
-</ul>
-
-<p>
- Cada atualização inclui ferramentas do SDK, imagens de sistema do Preview, emuladores, documentação de
- referência e diferenças entre as APIs.
-</p>
-
-<p>
- Os <strong>três primeiros marcos do Preview</strong> oferecem um <strong>ambiente
- de teste e desenvolvimento antecipado</strong> para ajudar você a identificar
- problemas de compatibilidade em seus aplicativos atuais e planejar a migração ou o trabalho em recursos
- necessários para desenvolver para a nova plataforma. Esse é o período prioritário no qual você deve
- fornecer feedback sobre os recursos e as APIs e informar problemas de compatibilidade
- — para isso, use o <a href="{@docRoot}preview/bug">issue
- tracker</a>. As APIs sofrerão algumas alterações nessas atualizações.
-</p>
-
-<p>
- Nos <strong>Previews 4 e 5</strong>, você terá acesso às <strong>versões finais
- das APIs e do SDK do N</strong>, com as quais poderá desenvolver, além de imagens de sistema quase finalizadas
- para testar comportamentos e recursos do sistema. O Android N fornecerá um
- nível da API padrão no momento. Você poderá iniciar os testes finais de compatibilidade dos seus aplicativos
- legados e refinar códigos novos que usem as APIs ou os recursos do N.
-</p>
-
-<p>
- Também a partir do Preview 4, você poderá <strong>publicar aplicativos
- para dispositivos</strong> que executem o Android N no nível da API oficial, como
- dispositivos de consumidor que optaram pelo programa beta do Android. Será possível
- publicar nos canais alfa e beta do Google Play primeiro para testar
- seus aplicativos com clientes beta do Android antes de distribuir para os demais clientes
- da loja.
-</p>
-
-<p>
- Ao testar e desenvolver no Android N, recomendamos que você <strong>mantenha
- o ambiente de desenvolvimento atualizado</strong> à medida que atualizações do Preview são
- lançadas. Para facilitar o processo, você pode inscrever seus dispositivos de teste no
- programa beta do Android e receber <strong>atualizações por OTA</strong> em
- cada marco. Como alternativa, imagens atualizadas do Preview estão disponíveis para
- download e atualização manual.
-</p>
-
-<p>
- Notificaremos você quando as atualizações do Preview estiverem disponíveis por meio do <a href="http://android-developers.blogspot.com/">Android Developers Blog</a>, além
- deste site e da <a href="{@docRoot}preview/dev-community">Comunidade
- Android N Developer</a>.
-</p>
-
-
-<h2 id="preview_tools">O que o N Developer Preview inclui?</h2>
-
-<p>
- O N Developer Preview inclui tudo o que é necessário para testar seus aplicativos existentes
- em uma variedade de tamanhos de tela, tecnologias de rede, chipsets de CPU/GPU
- e arquiteturas de hardware.
-</p>
-
-<h3 id="sdk_tools">Ferramentas do SDK</h3>
-
-<p>É possível fazer o download desses componentes pelo SDK Manager no <a href="{@docRoot}studio/intro/update.html">Android Studio</a>:</p>
-
-<ul>
- <li> <strong>SDK e ferramentas</strong> do N Developer Preview
- <li> <strong>Imagem do sistema de emulador</strong> (32 bits e 64 bits) do N Developer Preview
- <li> <strong>Imagem do sistema de emulador para Android TV</strong> (32 bits) do N Developer Preview
- <li> Bibliotecas de suporte do N Developer Preview (para novos modelos de aplicativos)
-</ul>
-
-<p>
- Forneceremos atualizações para essas ferramentas de desenvolvimento em cada marco, conforme a necessidade.
-</p>
-
-<h3 id="hardware_system_images">Imagens do sistema de hardware</h3>
-
-<p>
- O N Developer Preview inclui imagens do Nexus e de outros sistemas de hardware que podem ser usadas ao
- testar e desenvolver em dispositivos físicos. Consulte a página <a href="{@docRoot}preview/download.html">Imagens de dispositivo</a> para ver a lista completa
- de imagens de hardware.
-</p>
-
-<p>
- Forneceremos imagens de sistema atualizadas para esses dispositivos em cada marco. Você
- pode fazer o download e atualizar as imagens de sistema manualmente
- em seus dispositivos de teste com a frequência necessária. Isso é especialmente útil para ambientes
- de teste automatizados nos quais seja preciso atualizar o dispositivo várias
- vezes.
-</p>
-
-<p class="note"><strong>Observação</strong>:
- <strong>dispositivos atualizados manualmente não receberão atualizações por OTA</strong> como no
- Preview do ano anterior. Neste ano, você recebe OTAs ao inscrever os dispositivos no
- programa beta do Android — veja detalhes na próxima seção.
-</p>
-
-<h3 id="android_beta">Atualizações por OTA no programa beta do Android</h3>
-
-<p>
- Uma novidade do Android N é um programa de atualização por OTA que automaticamente
- fornece as últimas atualizações da prévia do Android N diretamente para os dispositivos inscritos
- no programa. O programa é gratuito e está aberto a todos que tenham
- um dispositivo compatível registrado na conta do Google.
-</p>
-
-<p>
- Para se inscrever no programa, acesse o site do <a href="https://g.co/androidbeta">programa beta
- do Android</a>. Você
- verá uma lista de todos os dispositivos registrados em sua conta que estejam qualificados para inscrição no
- programa beta do Android.
-</p>
-
-<ol>
- <li> Escolha os dispositivos nos quais deseja receber atualizações do Android N
- <li> Clique em Enroll, leia e concorde com os termos de serviço e clique em OK
-</ol>
-
-<p>
- Seu dispositivo receberá uma atualização pouco tempo depois da inscrição. Na maioria dos casos,
- não é necessário fazer uma redefinição completa para migrar para o Android N, mas
- é recomendável fazer o backup de qualquer dado que você não queira perder antes de
- inscrever o dispositivo.
-</p>
-
-<p>
- Conforme as atualizações são enviadas ao seu dispositivo, recomendamos que elas sejam baixadas e
- instaladas assim que possível. Mantenha-se atualizado com as
- últimas mudanças na IU, no comportamento, nas APIs e nos recursos do sistema.
-</p>
-
-<p>
- Quando o Developer Preview for concluído, os dispositivos inscritos
- receberão uma atualização para a versão oficial do Android N.
-</p>
-
-<p>
- É possível cancelar a inscrição dos seus dispositivos no programa beta do Android a qualquer momento no
- site do beta do Android. Antes de cancelar a inscrição, não deixe de fazer o backup dos dados
- no dispositivo.
-</p>
-
- <p class="note"><strong>Observação</strong>:
- Ao cancelar a inscrição, <strong>seu dispositivo será redefinido para as configurações de fábrica</strong>
-, recebendo a última versão
- do Android 6.0 Marshmallow (não necessariamente a versão instalada
- antes da inscrição do dispositivo). Para garantir uma instalação limpa,
- seus dados serão apagados do dispositivo, incluindo contatos, mensagens,
- fotos etc.
-</p>
-
-<h3 id="documentation_and_sample_code">Exemplo de código e documentação</h3>
-
-<p>
- Estes recursos de documentação estão disponíveis no site do Developer Preview para
- ajudar você a saber mais sobre o Android N:
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Preparação para desenvolver para o
-Android N</a> tem
- instruções passo a passo para você iniciar o trabalho.</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">Mudanças
- de comportamento</a> indicam as principais áreas a serem testadas.</li>
- <li> Documentação de novas APIs, incluindo uma <a href="{@docRoot}preview/api-overview.html">visão geral das APIs</a>, a
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">referência da
-API</a> disponível para download e guias de desenvolvedor detalhados sobre os recursos principais, como
-suporte para várias janelas, notificações agrupadas, suporte para vários idiomas e outros.
- <li> <a href="{@docRoot}preview/samples.html">Exemplo de código</a> que
- demonstra como oferecer suporte a permissões e outros novos recursos.
- <li> <a href="{@docRoot}preview/support.html#release-notes">Notas de versão</a>
- para a versão atual do N Developer Preview, incluindo notas de mudanças e
- relatórios de diferenças.
-</ul>
-
-<h4 id="reference">Referência da API para download</h4>
-
-<p>
- Durante as primeiras atualizações do Preview, você pode fazer o download da
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referência da API
- mais recente para a plataforma Android N</a> como um arquivo zip separado. Esse download
- também inclui um relatório de diferenças que ajuda você a identificar as mudanças da API em relação à
- API 23 e à atualização anterior.
-</p>
-
-<p>
- Quando as APIs do Android N forem finalizadas e um nível da API oficial for atribuído,
- forneceremos a referência da API on-line em <a href="https://developer.android.com">https://developer.android.com</a>.
-</p>
-
-<h3 id="support_resources">
- Recursos de suporte
-</h3>
-
-<p>
- Ao testar e desenvolver no N Developer Preview, use estes canais para
- informar problemas e enviar feedback.
-</p>
-
-<ul>
- <li> O <a href="https://code.google.com/p/android-developer-preview/">Issue
- Tracker do N Developer Preview</a> é o <strong>canal principal de feedback.</strong> É possível informar erros,
- problemas de desempenho e feedback geral pelo issue tracker. Também é possível verificar os
-<a href="{@docRoot}preview/bugs">erros conhecidos</a> e
- encontrar etapas de resolução. Manteremos você atualizado sobre seu problema conforme ele seja avaliado e
- enviado para a equipe de engenharia do Android para análise. </li>
- <li> A <a href="{@docRoot}preview/dev-community">Comunidade Android N Developer</a> é
- uma comunidade do Google+ onde é possível <strong>se conectar a outros desenvolvedores</strong> que trabalham com o
- Android N. É possível compartilhar observações ou ideias, além de encontrar respostas
- para as dúvidas sobre o Android N. Moderaremos a comunidade e fornecemos respostas e
- orientações conforme for necessário.</li>
-</ul>
-
-<h3 id="targeting">Direcionamento, APIs do Preview e publicação</h3>
-
-<p>
- O N Developer Preview fornece um sistema apenas para desenvolvimento e uma biblioteca Android
- que <strong>não tem um nível da API padrão</strong>. Caso opte
- pelos comportamentos de compatibilidade para testar o aplicativo (o que é muito
- recomendado), é possível destinar a versão de prévia do Android N
-configurando o <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code> do aplicativo
- para <code>“N”</code>.
-</p>
-
-<p>
- O Android N Developer Preview fornece <strong>APIs de prévia</strong>
- — as APIs não serão oficiais até o lançamento do SDK final,
- atualmente planejado para o terceiro trimestre de 2016. Isto significa que é possível
- <strong>esperar alterações secundárias de APIs</strong> com o tempo, especialmente
- durante as semanas iniciais do programa. Forneceremos um resumo das alterações
- com cada atualização do Android N Developer Preview.
-</p>
-
-<p class="note">
- <strong>Observação</strong>: Apesar de as APIs do Preview poderem ser alteradas, os
- comportamentos essenciais do sistema são estáveis e estão prontos para
- serem testados.
-</p>
-
-<p>
- O Google Play <strong>evita a publicação de aplicativos destinados para o N Developer
- Preview</strong>. Quando o SDK final do Android N estiver disponível, você poderá
- destinar o nível da API do Android N oficial e publicar o aplicativo no Google
- Play pelos canais de lançamento alfa e beta. Enquanto isso, caso queira
- distribuir um aplicativo destinado para Android N para testadores, é possível fazê-lo por e-mail ou
- por download direto do site.
-</p>
-
-<p>
- No lançamento completo do Android N para AOSP e OEMs, planejado para o terceiro trimestre de 2016,
- você poderá publicar seus aplicativos direcionados ao Android N no canal de lançamento
- público do Google Play.
-</p>
-
-
-<h2 id="how_to_get_started">Como começar</h2>
-
-<p>
- Para começar o teste do aplicativo com o Android N:
-</p>
-
-<ol>
- <li> Revise a <a href="{@docRoot}preview/api-overview.html">Visão geral da API</a>
- e as <a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a> para
- ter uma ideia do que há de novo e como isto afeta os aplicativos. Especificamente,
- obtenha informações sobre os novos recursos de <a href="{@docRoot}preview/features/notification-updates.html">notificações</a> e
- o <a href="{@docRoot}preview/features/multi-window.html">suporte a várias janelas</a>.</li>
- <li> Configure seu ambiente seguindo as instruções para <a href="{@docRoot}preview/setup-sdk.html">Configurar o Preview SDK</a>
- e configurar os dispositivos de teste.</li>
- <li> Siga as instruções de <a href="https://developers.google.com/android/nexus/images">atualização
- manual</a> para instalar a última imagem de sistema do Android N no seu dispositivo. </li>
- <li> Consulte a <a href="{@docRoot}preview/setup-sdk.html#docs-dl">referência da API</a>
- e os <a href="{@docRoot}preview/samples.html">exemplos do Android N</a> para obter mais
- informações sobre os novos recursos de API e como usá-los no seu aplicativo.
- <li> Participe da <a href="{@docRoot}preview/dev-community">Comunidade Android N
- Developer</a> para obter as notícias mais recentes e conectar-se a outros
- desenvolvedores que trabalham com a nova plataforma.</li>
-</ol>
-
-<p>
- Agradecemos sua participação no programa Android N Developer Preview!
-</p>
diff --git a/docs/html-intl/intl/pt-br/preview/preview_toc.cs b/docs/html-intl/intl/pt-br/preview/preview_toc.cs
deleted file mode 100644
index 12cb423..0000000
--- a/docs/html-intl/intl/pt-br/preview/preview_toc.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html" es-lang="Información general del programa" in-lang="Ikhtisar Program" ja-lang="プログラム概要" ko-lang="프로그램 개요" pt-br-lang="Visão geral do programa" ru-lang="Обзор программы" vi-lang="Tổng quan về Chương trình" zh-cn-lang="计划概览" zh-tw-lang="程式總覽"> Visão geral do programa</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html"> Suporte e notas da versão</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html" es-lang="Configurar el SDK de la versión preliminar" in-lang="Menyiapkan Preview" ja-lang="Preview SDK のセットアップ" ko-lang="미리 보기 SDK 설정하기" pt-br-lang="Configuração do Preview SDK" ru-lang="Настройка пакета SDK Preview" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="设置预览版 SDK" zh-tw-lang="設定預覽版 SDK"> Configurar o Preview</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html" es-lang="Pruebe en un dispositivo" in-lang="Menguji pada Perangkat" ja-lang="デバイス上でテストする" ko-lang="기기에서 테스트" pt-br-lang="Testar em um dispositivo" ru-lang="Тестирование на устройстве" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="在设备上测试" zh-tw-lang="在裝置上測試"> Testar em um dispositivo</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html" es-lang="Cambios en los comportamientos" in-lang="Perubahan Perilaku" ja-lang="動作の変更点" ko-lang="동작 변경" pt-br-lang="Mudanças de comportamento" ru-lang="Изменения в работе" vi-lang="Các thay đổi Hành vi" zh-cn-lang="行为变更" zh-tw-lang="行為變更">Alterações de comportamento</a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html" es-lang="Optimizaciones en segundo plano" in-lang="Optimisasi Latar Belakang" ja-lang="バックグラウンド処理の最適化" ko-lang="백그라운드 최적화" pt-br-lang="Otimizações em segundo plano" ru-lang="Оптимизация фоновых процессов" vi-lang="Tối ưu hóa Chạy ngầm" zh-cn-lang="后台优化" zh-tw-lang="背景最佳化">Otimizações em segundo plano</a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html" es-lang="Idioma y configuración regional" in-lang="Bahasa dan Lokal" ja-lang="言語とロケール" ko-lang="언어 및 로케일" pt-br-lang="Idioma e localidade" ru-lang="Язык и языковой стандарт" vi-lang="Ngôn ngữ và Bản địa" zh-cn-lang="语言和区域设置" zh-tw-lang="語言和地區設定">Idioma e localidade</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html" es-lang="Información general de la API" in-lang="Android N untuk Pengembang" ja-lang="API の概要" ko-lang="API 개요" pt-br-lang="Visão geral da API" ru-lang="Обзор API-интерфейсов" vi-lang="Android N cho Nhà phát triển" zh-cn-lang="API 概览" zh-tw-lang="API 總覽">Android N for Developers</a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html" es-lang="Compatibilidad con ventanas múltiples" in-lang="Dukungan Multi-Jendela" ja-lang="マルチ ウィンドウのサポート" ko-lang="다중 창 지원" pt-br-lang="Suporte a várias janelas" ru-lang="Поддержка многооконного режима" vi-lang="Hỗ trợ đa cửa sổ" zh-cn-lang="多窗口支持" zh-tw-lang="多視窗支援"> Suporte a várias janelas</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html" es-lang="Notificaciones" in-lang="Pemberitahuan" ja-lang="通知" ko-lang="알림" pt-br-lang="Notificações" ru-lang="Уведомления" vi-lang="Thông báo" zh-cn-lang="通知" zh-tw-lang="通知">Notificações</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html"> Economia de dados</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html" es-lang="Grabación de TV" in-lang="Perekaman TV" ja-lang="TV の録画" ko-lang="TV 녹화" pt-br-lang="Gravação para TV" ru-lang="Запись ТВ" vi-lang="Ghi lại TV" zh-cn-lang="TV 录制" zh-tw-lang="電視錄製"> Gravação para TV</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html" es-lang="Configuración de seguridad de la red" in-lang="Network Security Configuration" ja-lang="ネットワーク セキュリティ構成" ko-lang="네트워크 보안 구성" pt-br-lang="Configurações de segurança de rede" ru-lang="Конфигурация сетевой безопасности" vi-lang="Cấu hình Bảo mật mạng" zh-cn-lang="网络安全配置" zh-tw-lang="網路安全性設定"> Configurações de segurança de rede</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html" es-lang="API de ICU4J del framework de Android" in-lang="ICU4J Android Framework API" ja-lang="ICU4J Android フレームワーク API" ko-lang="ICU4J Android 프레임워크 API" pt-br-lang="APIs de estrutura do Android para ICU4J" ru-lang="API-интерфейсы ICU4J в платформе Android" vi-lang="API Khuôn khổ Android ICU4J" zh-cn-lang="ICU4J Android 框架 API" zh-tw-lang="ICU4J Android 架構 API"> Suporte a ICU4J</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html" es-lang="Funciones del lenguaje Java 8" in-lang="Fitur Bahasa Java 8" ja-lang="Java 8 の機能" ko-lang="Java 8 언어 기능" pt-br-lang="Recursos de linguagem do Java 8" ru-lang="Возможности языка Java 8" vi-lang="Tính năng của Ngôn ngữ Java 8" zh-cn-lang="Java 8 语言功能" zh-tw-lang="Java 8 語言功能"> Recursos de linguagem do Java 8</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html"> Mudanças no Android for Work</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html" es-lang="Acceso a directorios determinados" in-lang="Scoped Directory Access" ja-lang="特定のディレクトリへのアクセス" ko-lang="범위가 지정된 디렉터리 액세스" pt-br-lang="Acesso a diretórios com escopo" ru-lang="Доступ к выделенным каталогам" vi-lang="Truy cập Thư mục theo Phạm vi" zh-cn-lang="作用域目录访问" zh-tw-lang="限定範圍目錄存取"> Acesso a diretórios com escopo</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html" es-lang="Ejemplos" in-lang="Contoh" ja-lang="サンプル" ko-lang="샘플" pt-br-lang="Exemplos" ru-lang="Примеры" zh-cn-lang="示例" zh-tw-lang="範例"> Exemplos</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html" es-lang="Contrato de licencia" ja-lang="使用許諾契約" ko-lang="라이선스 계약" pt-br-lang="Contrato de licença" ru-lang="Лицензионное соглашение" zh-cn-lang="许可协议" zh-tw-lang="授權協議"> Contrato de licença</a></div>
- </li>
-
-</ul>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/preview/samples.jd b/docs/html-intl/intl/pt-br/preview/samples.jd
deleted file mode 100644
index 16515e4..0000000
--- a/docs/html-intl/intl/pt-br/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=Exemplos
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- Os exemplos de código a seguir são fornecidos para o Android N. Para
- fazer o download dos exemplos no Android Studio, selecione a opção de menu <b>File > Import
- Samples</b>.
-</p>
-
-<p class="note">
- <strong>Observação:</strong> Esses projetos disponíveis para download são projetados
- para uso com Gradle e Android Studio.
-</p>
-
-
-<h3 id="mw">Interface com várias janelas</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- Este exemplo demonstra como aproveitar as vantagens de interfaces de usuário com várias janelas
- com seu aplicativo.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
-Obter no GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">Notificações ativas</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Este é um exemplo pré-existente que mostra um serviço simples que envia
- notificações usando NotificationCompat. Cada conversa não lida de um usuário
- é enviada como uma notificação distinta.
-</p>
-<p>
- Este exemplo foi atualizado para utilizar os novos recursos de notificação
- disponíveis no Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
-Obter no GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">Serviço de mensagens</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- Este é um exemplo pré-existente que demonstra como usar o
- NotificationManager para identificar quantas notificações um aplicativo está mostrando
- no momento.
-</p>
-<p>
- Este exemplo foi atualizado para utilizar os novos recursos de notificação
- disponíveis no Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
-Obter no GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">Inicialização direta</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Este exemplo demonstra como armazenar e acessar dados no armazenamento criptografado de um dispositivo
- que está sempre disponível enquanto o dispositivo é inicializado.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
-Obter no GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">Acesso a diretórios com escopo</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Este exemplo demonstra como ler e gravar dados de diretórios
- específicos exigindo menos permissões.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
-Obter no GitHub</a>
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/preview/setup-sdk.jd b/docs/html-intl/intl/pt-br/preview/setup-sdk.jd
deleted file mode 100644
index 6db456c..0000000
--- a/docs/html-intl/intl/pt-br/preview/setup-sdk.jd
+++ /dev/null
@@ -1,187 +0,0 @@
-page.title=Configuração do Preview
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Obter o Android Studio 2.1</a></li>
- <li><a href="#get-sdk">Obter o Android N SDK</a>
- <ol>
- <li><a href="#docs-dl">Documentação de referência</a>
- </ol>
- </li>
- <li><a href="#java8">Obter o Java 8 JDK</a></li>
- <li><a href="#create-update">Atualizar ou criar um projeto</a></li>
- <li><a href="#next">Próximas etapas</a></li>
-</ol>
- </div>
-</div>
-
-<p>Para desenvolver aplicativos para o Android N Preview, você precisa fazer algumas atualizações
-no ambiente de desenvolvedor, conforme é descrito nesta página.</p>
-
-<p>Para simplesmente testar a compatibilidade do seu aplicativo na imagem do sistema
-Android N, siga o guia para <a href="{@docRoot}preview/download.html">Testar em um dispositivo Android N</a>.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Obter o Android Studio 2.1</h2>
-
-<p>A plataforma Android N adiciona suporte para <a href="{@docRoot}preview/j8-jack.html">recursos de linguagem do Java 8</a>,
- o que requer um novo compilador chamado Jack. A versão mais recente do Jack
-só é compatível com o Android Studio 2.1 no momento. Portanto, se quiser
-usar os recursos de linguagem do Java 8, será preciso usar o Android Studio 2.1 para
-compilar seu aplicativo. Caso contrário, não será preciso usar o Jack, mas ainda será
-necessário atualizar para o JDK 8 para desenvolver para a plataforma Android N,
-conforme descrito abaixo.</p>
-
-<p>Se você já instalou o Android Studio, verifique se tem o Android
-Studio 2.1 ou superior clicando em <strong>Help > Check for Update</strong>
-(no Mac, <strong>Android Studio > Check for Updates</strong>).</p>
-
-<p>Se não o tiver, <a href="{@docRoot}studio/">baixe o Android
-Studio 2.1 aqui</a>.</p>
-
-
-<h2 id="get-sdk">Obter o N Preview SDK</h2>
-
-<p>Para começar a desenvolver com as APIs do Android N, instale o
-Android N Preview SDK no Android Studio da seguinte maneira:</p>
-
-<ol>
- <li>Abra o SDK Manager selecionando <strong>Tools > Android >
- SDK Manager</strong>.</li>
-
- <li>Na guia <strong>SDK Platforms</strong>, marque a caixa de seleção
- <strong>Android N Preview</strong>.</li>
-
- <li>Clique na guia <strong>SDK Tools</strong> e marque as caixas de seleção
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong> e <strong>Android SDK Tools</strong>
-.
- </li>
-
- <li>Clique em <strong>OK</strong> e aceite os termos de licença
- de qualquer pacote que precise ser instalado.
- </li>
-</ol>
-
-<h3 id="docs-dl">Obter a documentação de referência do N Preview SDK</h3>
-
-<p>
- Informações detalhadas sobre as APIs do Android N são disponibilizadas na documentação de referência do N Preview
-, que pode ser baixada pela tabela a seguir.
- Este pacote contém uma versão off-line resumida do site de desenvolvedores do Android
- e inclui uma referência de API atualizada para as APIs do Android N, além de um relatório
- das diferenças entre as APIs.
-</p>
-
-<table>
- <tr>
- <th scope="col">Documentação</th>
- <th scope="col">Checksums</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip">n-preview-3-docs.zip</a></td>
- <td width="100%">
- MD5: 19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
- SHA-1: 9224bd4445cd7f653c4c294d362ccb195a2101e7
- </td>
- </tr>
-<table>
-
-
-
-<h2 id="java8">Obter o Java 8 JDK</h2>
-
-<p>Para compilar o aplicativo para a plataforma Android N e usar algumas ferramentas com o
-Android Studio 2.1, é preciso instalar o Java 8 Developer Kit (JDK 8). Portanto, se
-não tiver a versão mais recente, baixe o JDK 8 agora mesmo.</p>
-
-<p>Em seguida, defina a versão do JDK no Android Studio da seguinte maneira:</p>
-
-<ol>
- <li>Abra um projeto Android no Android Studio e, em seguida, abra a caixa de diálogo
- Project Structure selecionando <strong>File >
- Project Structure</strong>. (Como alternativa, é possível definir o padrão
- para todos os projetos selecionando <strong>File > Other Settings >
- Default Project Structure</strong>.)
- </li>
- <li>No painel à esquerda da caixa de diálogo, clique em <strong>SDK Location</strong>.
- </li>
- <li>No campo <strong>JDK Location</strong>, insira o local do
- Java 8 JDK (clique no botão à direita
- para procurar em seus arquivos) e clique em <strong>OK</strong>.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">Atualizar ou criar um projeto</h2>
-
-<p>
- Para usar as APIs do Android N, seu projeto deve ser configurado da maneira apropriada.
-</p>
-
-<p>Se planeja usar os recursos de linguagem do Java 8, consulte
-<a href="{@docRoot}preview/j8-jack.html">Recursos de linguagem do Java 8</a>
-para saber mais sobre os recursos do Java 8 com suporte e
-como configurar seu projeto com o compilador Jack.</p>
-
-
-<h3 id="update">Atualizar um projeto existente</h3>
-
-<p>Abra o arquivo
- <code>build.gradle</code> de seu módulo e atualize os valores da seguinte
- forma:
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc3'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">Criar um novo projeto</h3>
-
-
-<p>Para criar um novo projeto para desenvolvimento com o Android N Preview SDK:</p>
-
-<ol>
- <li>Clique em <strong>File > New Project</strong> e siga as etapas
- até chegar na página Target Android Devices.
- </li>
- <li>Nela, selecione a opção <strong>Phone and Tablet</strong>.</li>
- <li>Na opção <strong>Phone and Tablet</strong>, na lista <strong>Minimum
- SDK</strong>, selecione
- <strong>N: Android API 23, N Preview (Preview)</strong>.</li>
-</ol>
-
-
-<h2 id="next">Próximas etapas</h2>
-
-<ul>
- <li>Siga o guia para <a href="{@docRoot}preview/download.html">Testar em um dispositivo Android N</a>.</li>
- <li>Saiba mais sobre a plataforma Android N com
-<a href="{@docRoot}preview/behavior-changes.html">Mudanças de comportamento</a>
-e <a href="{@docRoot}preview/api-overview.html">Recursos de APIs do
-Android N</a>.</li>
-</ul>
-
diff --git a/docs/html-intl/intl/pt-br/preview/support.jd b/docs/html-intl/intl/pt-br/preview/support.jd
deleted file mode 100644
index 4580887..0000000
--- a/docs/html-intl/intl/pt-br/preview/support.jd
+++ /dev/null
@@ -1,1188 +0,0 @@
-page.title=Notas da versão e suporte
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Neste documento</h2>
-
-<ul>
- <li><a href="#dp3">Developer Preview 3</a>
- <ul>
- <li><a href="#general">Alertas gerais</a></li>
- <li><a href="#new">Novidades no DP3</a></li>
- <li><a href="#ki">Problemas conhecidos</a></li>
- </ul>
- </li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- Estão disponíveis dois canais de suporte principais para quem está desenvolvendo ou testando
- com o Android N Developer Preview: Registre relatórios de erro em <a href="https://developer.android.com/preview/bug">https://developer.android.com/preview/bug</a> para
- erros específicos de dispositivo, do sistema e do Google App. Para problemas com outros aplicativos,
- entre em contato diretamente com o desenvolvedor.
-</p>
-
-<p>Para discutir problemas ou ideias com outros desenvolvedores que trabalham com o Android N, junte-se à
-<a href="{@docRoot}preview/dev-community">comunidade Developer Preview do Google+</a>.</p>
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Data: Maio de 2016<br>
- Versão: NPD35K<br>
- Suporte do emulador: x86 & ARM (32/64 bits)<br>
- Serviços Google Play: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">Alertas gerais</h3>
-
-<p>
- Esta versão do Developer Preview é para <strong>desenvolvedores de aplicativos e outros
- usuários iniciais</strong> e está disponível para uso diário, desenvolvimento ou
- testes de compatibilidade. Esteja ciente destas notas gerais sobre a
- versão:
-</p>
-
-<ul>
- <li>Esta versão pode ter vários <strong>problemas de estabilidade</strong> em
- dispositivos compatíveis. Os usuários podem encontrar instabilidade no sistema, como
- panes e falhas do kernel.
- </li>
-
- <li>Alguns aplicativos <strong>podem não funcionar como esperado</strong> na nova
- versão da plataforma. Isso inclui aplicativos do Google e outros aplicativos.
- </li>
-
- <li>O Developer Preview 3 foi <strong>aprovado pelo Compatibility Test Suite (CTS)
-</strong> nestes dispositivos: Nexus 5X, Nexus 6, Nexus 6P e Pixel
- C. Aplicativos que dependem de versões aprovadas pelo CTS
- funcionam normalmente nesses dispositivos (por exemplo, Android Pay).
- </li>
-
- <li>O Developer Preview 3 está <strong>disponível em todos os
- dispositivos compatíveis:</strong> Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player, Pixel
- C, General Mobile 4G (Android One), assim como Sony Xperia Z3 (modelos D6603 e
- D6653).
-
- </li>
-</ul>
-
-
-<h3 id="new">Novidades no DP3</h3>
-
-<h4 id="">Modo RV para Android</h4>
-
-<p>
- O Android N adiciona compatibilidade de plataformas e otimizações para um novo Modo RV que dá aos
- desenvolvedores a capacidade de projetar experiências de RV móveis de alta qualidade para os usuários. Há
- diversas melhorias de desempenho, incluindo o acesso a um núcleo exclusivo da CPU
- para aplicativos de RV. Dentro dos aplicativos, é possível aproveitar o rastreamento inteligente
- da cabeça e notificações estéreo que funcionam para RV. Mais importante,
-o Android N oferece gráficos de latência muito baixa.
-</p>
-
-<p>
- Para obter mais informações, consulte o <a href="https://developers.google.com/vr/android/">Google VR SDK para Android</a>.
-</p>
-
-<h4 id="">Modo de desempenho sustentado</h4>
-
-<p>
- O Android N inclui compatibilidade opcional para <a href="{@docRoot}preview/api-overview.html#sustained_performance_api">modo de desempenho
-sustentado</a>, permitindo que OEMs ofereçam dicas sobre
- capacidades de desempenho do dispositivo para aplicativos de longa duração. Desenvolvedores de aplicativos podem usar
- essas dicas para ajustar os aplicativos para um nível de
- desempenho do dispositivo previsível e consistente em períodos longos de tempo. Desenvolvedores de aplicativos podem testar essa nova
- API na prévia para desenvolvedores apenas em dispositivos Nexus 6P.
-</p>
-
-<h4>Multiprocess WebView</h4>
-
-<p>
- A partir da versão 51 do Android N, o WebView executará conteúdo da web em um
- processo de segurança separado quando a opção de desenvolvedor “Multiprocess WebView”
- estiver ativada. A equipe do WebView quer ouvir comentários sobre compatibilidade e
- desempenho durante a execução no N antes de ativar o Multiprocess WebView em uma
- versão futura do Android. Nesta versão, regressões no tempo de inicialização, no
- uso de memória total e no desempenho de renderização do software são esperadas.
-</p>
-
-<p>
- Queremos
- ser informados se você encontrar problemas inesperados no modo multiprocesso. Entre em contato com a equipe WebView <a href="https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">
- enviando um relatório de erros</a>.
-</p>
-
-<h4 id="">Auxiliar de atalhos de teclado</h4>
-
-<p>
- No Android N, o usuário pode pressionar <code>Meta+/</code> para acionar uma tela de <strong>atalhos
- de teclado</strong> que exibe todos os atalhos disponíveis do
- sistema e do aplicativo em questão. Os desenvolvedores podem adicionar os próprios atalhos ou
- ativar a tela de atalhos nos aplicativos. Consulte o <a href="{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">Auxiliar de
-atalhos de teclado</a> para saber mais.
-</p>
-
-<h4 id="">FrameMetrics API</h4>
-
-<p>
- O DP3 introduz uma nova <a href="{@docRoot}preview/api-overview.html#framemetrics_api">FrameMetrics API</a>
- que permite que um aplicativo monitore o desempenho de renderização da IU ao expor uma API pubsub de
- transmissão para transferir informações sobre sincronização de quadros para a
- janela atual do aplicativo. <code>FrameMetricsListener</code> pode ser usado para medir
- o desempenho da IU em nível de interação em produção com granularidade maior e
- sem precisar de uma conexão USB.
-</p>
-
-<h4 id="api-changes">Alterações de recursos e API</h4>
-
-<dl>
- <dt>
- Atalhos do inicializador e a Launcher Shortcuts API
- </dt>
-
- <dd>
- Decidimos adiar esse recurso para uma versão futura do Android. Planejamos
- remover as Launcher Shortcuts APIs (ShortcutManager e outros) da
- API pública do Android N a partir da próxima prévia para desenvolvedores.
- </dd>
-
- <dt>
- WebView JavaScript executado antes do carregamento da página
- </dt>
-
- <dd>
- Começando em aplicativos destinados para o Android N, o contexto do JavaScript é redefinido
- quando uma nova página é carregada. Atualmente, o contexto é transferido para
- a primeira página carregada em uma nova situação de {@link android.webkit.WebView}.
- Os desenvolvedores que desejam inserir JavaScript no {@link
- android.webkit.WebView} devem executar o script antes de a página
- começar a carregar.
- </dd>
-
- <dt>
- WebView de Geolocalização em origens desprotegidas
- </dt>
-
- <dd>
- Começando em aplicativos destinados ao Android N, a API de geolocalização será
- permitida apenas em origens seguras (por HTTPS). Essa política tem como objetivo proteger
- as informações privadas dos usuários quando eles estiverem usando uma conexão desprotegida.
- </dd>
-
- <dt>
- Economia de dados
- </dt>
-
- <dd>
- Começando no Developer Preview 3, os aplicativos podem usar uma intenção para exibir uma
- caixa de diálogo do sistema que permite que os usuários adicionem o aplicativo diretamente na
- lista de permissões da Economia de dados. Consulte a <a href="{@docRoot}preview/api-overview.html#data_saver">documentação sobre a Economia de dados
-</a> para obter mais detalhes.
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#number-blocking">Bloqueio de números</a>
- </dt>
-
- <dd>
- Se um usuário não autorizado tenta bloquear ou desbloquear um número, agora a
- operação falha com {@link java.lang.SecurityException}. (Anteriormente,
- a operação lançava {@link java.lang.UnsupportedOperationException}.)
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">Quick Settings Tile
-API</a>
- </dt>
-
- <dd>
- Agora o sistema usa os metadados da atividade para decidir o modo do bloco.
- (Anteriormente, o modo do bloco era determinado pelo valor de retorno do
- <code>TileService.onTileAdded()</code>.) Para obter mais informações, consulte
-<code>TileService.META_DATA_ACTIVE_TILE</code> na <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Referência da API</a>, disponível para download.
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">Correções de problemas relatados por desenvolvedores</h4>
-
-<p>
- Diversos problemas relatados por desenvolvedores foram corrigidos, incluindo:
-</p>
-
-<ul>
- <li>Reprodução de áudio por Bluetooth interrompida após 1 música (erro <a href="https://code.google.com/p/android/issues/detail?id=206889">206889</a>)
- </li>
-
- <li>Pixel C falha consistentemente (erro <a href="https://code.google.com/p/android/issues/detail?id=206962">206962</a>)
- </li>
-
- <li>Problemas de notificação do Relógio e Aviso (erro <a href="https://code.google.com/p/android/issues/detail?id=203094">203094</a>)
- </li>
-
- <li>Pixel C reinicia quando conectado ao MacBook Pro via cabo USB C (erro
- <a href="https://code.google.com/p/android/issues/detail?id=205432">205432</a>)
- </li>
-
- <li>Agenda errada por um dia (erro <a href="https://code.google.com/p/android/issues/detail?id=203002">203002</a>)
- </li>
-
- <li>TelephonyManager.getAllCellInfo retorna dados inválidos (erro <a href="https://code.google.com/p/android/issues/detail?id=203022">203022</a>)
- </li>
-
- <li>No Nexus 6p, o Bluetooth desconecta continuamente (erro <a href="https://code.google.com/p/android/issues/detail?id=208062">208062</a>)
- </li>
-</ul>
-
-<p>Para obter a lista completa de problemas corrigidos, consulte<a href="https://goo.gl/6uCKtf"> o
-issue tracker</a>.</p>
-
-<h3 id="ki">Problemas conhecidos</h3>
-
-<h4>Acessibilidade</h4>
-
-<ul>
- <li>Impossível ouvir a produção de TTS quando o valor de inclinação está configurado quase no nível máximo.
- </li>
-
- <li>Recursos e configurações de acessibilidade podem ser interrompidos quando o usuário adiciona um
- perfil de trabalho, incluindo gesto e configuração de ampliação. O
- estado de acessibilidade é restaurado na próxima vez em que o usuário toca nas configurações relacionadas.
- </li>
-</ul>
-
-<h4>Câmera</h4>
-
-<ul>
- <li>O aplicativo Câmera mostrou instabilidade; ele pode falhar em diversas
- circunstâncias, como quando é inicializado em modo de várias janelas.
- </li>
-
- <li>Pressionar o obturador continuamente no modo panorama pode fazer o
- aplicativo Câmera falhar.
- </li>
-</ul>
-
-<h4>Áudio</h4>
-<ul>
- <li>Um problema na plataforma do reprodutor de áudio impede alguns aplicativos de funcionarem
- normalmente. Por exemplo, o Skype e outros aplicativos são afetados por esse problema.
- </li>
-</ul>
-
-<h4>Conectividade</h4>
-
-
-<ul>
- <li>Quando um dispositivo Bluetooth Low Energy (BLE) de função periférica anuncia um
- serviço e um dispositivo BLE de função central é conectado, o dispositivo de função periférica
- é desconectado rapidamente.
- </li>
-
- <li>A conexão Wi-Fi pode cair quando a tela está desligada.
- </li>
-
- <li>Conexões RFCOMM são instáveis e podem resultar em corrompimento de dados e
- oscilação na conexão.
- </li>
-
- <li>Os estados de rede ativos ({@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} e {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}) podem retornar valores incorretos durante algumas
- situações de segundo plano restritas.
- </li>
-</ul>
-
-
-<h4>
- Inicializador
-</h4>
-
-<ul>
- <li>A bandeja Todos os Aplicativos padrão do inicializador pode parar de responder após
- desligar e ligar a tela. Retornar à tela inicial e reinicializar
- a bandeja Todos os Aplicativos pode resolver o problema.
- </li>
-</ul>
-
-<h4>
- Teclado
-</h4>
-
-<ul>
- <li>Ao atualizar um dispositivo com Android 6.0 ou anterior para o N Developer
- Preview, o Teclado do Google não preserva os dados de preferências como configurações recentes de
- emoticons e som.
- </li>
-
- <li>O Teclado do Google em idioma indiano pode ficar instável.
- </li>
-
- <li>Ao inserir texto em um campo de senha, o usuário pode selecionar russo como
- o idioma de entrada, mas o teclado continua em inglês. Isso impede que o
- usuário insira senhas no idioma russo.
- </li>
-</ul>
-
-<h4>
- Localidades e idiomas
-</h4>
-
-<ul>
- <li>Ao usar localidade da direita para esquerda (RTL), o sistema pode
- alterar inesperadamente para apresentação de esquerda para direita (LTR) após a reinicialização do dispositivo.
- </li>
-</ul>
-
-<h4>Mídia</h4>
-
-<ul>
- <li>Reprodução de mídia instável no Nexus 9 e Nexus Player, incluindo
- problemas ao reproduzir vídeos em HD.
- </li>
-</ul>
-
-<h4>
- Modo de várias janelas
-</h4>
-
-<ul>
- <li>O dispositivo pode congelar após mudar a orientação em modo de várias janelas.
- </li>
-
- <li>Atualmente, diversos aplicativos apresentam problemas no modo de várias janelas:
- <ul>
- <li>A IU do sistema pode falhar ao ancorar o brilho de Settings > Display >
- Screen no modo de várias janelas.
- </li>
-
- <li>O aplicativo Câmera pode falhar quando inicializado em modo de várias janelas.
- </li>
-
- <li>O YouTube pode falhar quando inicializado em modo de várias janelas. Para corrigir o
- problema, você deve limpar os dados do aplicativo do YouTube em Storage > Apps >
- YouTube.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Google Play Services
-</h4>
-
-<ul>
- <li>Aplicativos que usam Google Cast via Google Play Services podem ficar instáveis quando
- o usuário seleciona uma localidade do sistema que usa letras e números fora do
- intervalo ASCII.
- </li>
-</ul>
-
-<h4>
- Política do dispositivo do Android for Work e Google Apps
-</h4>
-
-<ul>
- <li>O aplicativo de Política do dispositivo pode falhar quando o usuário desbloqueia o dispositivo com a
- tela de “status da política do dispositivo” fixada.
- </li>
-
- <li>Depois de configurar o perfil de trabalho com a criptografia baseada em arquivos habilitada e
- desativar o perfil de trabalho, os usuários devem desbloquear o bloqueio de tela de perfil primário para poder
- acessar novamente os aplicativos do Work.
- </li>
-
- <li>O dispositivo é reinicializado após remover o padrão de bloqueio de segurança e abrir
- aplicativos de trabalho/pessoal no modo de várias janelas.
- </li>
-
- <li>A configuração DISALLOW_VPN_CONFIG faz com que a caixa de diálogo de autorização apareça como
- always-on-vpn pelo Cliente de política do dispositivo.
- </li>
-
- <li>O tráfego não é bloqueado até a VPN conectar no modo always-on-vpn.
- </li>
-</ul>
-
-<h4>
- Armazenamento externo
-</h4>
-
-<ul>
- <li>Aplicativos podem ficar instáveis quando o usuário os transfere do armazenamento interno
- para o armazenamento externo adotável (isso pode incluir um cartão SD ou dispositivos conectados
- via USB).
- </li>
-</ul>
-
-<h4>
- Zoom de tela e vários APKs no Google Play
-</h4>
-
-<ul>
- <li>Em dispositivos com Android N, o Google Play Services 9.0.83 relata incorretamente
- a densidade de tela atual em vez da densidade de tela estável. Quando o
- zoom de tela é habilitado nesses dispositivos, isso pode fazer com que o Google Play selecione uma
- versão de um aplicativo com vários APKs projetada para telas menores. Esse problema foi
- corrigido na próxima versão do Google Play Services e será incluído em uma versão
- próxima do Developer Preview.
- </li>
-
- <li>Em dispositivos com Android N, o Google Play Services 9.0.83 atualmente relata
- compatibilidade com Vulkan, mas não com a versão do Vulkan. Isso pode fazer com que o Google Play selecione uma
- versão de um aplicativo com vários APKs projetado para compatibilidade com versões anteriores do Vulkan em
- dispositivos compatíveis com versões mais recentes. Atualmente, o Google Play Store
- não aceita carregamento de aplicativos que usam segmentação de versão do Vulkan. Essa compatibilidade
- será adicionada ao Google Play Store no futuro e corrigida na próxima
- versão do Google Play Services (a ser incluída em uma versão futura do Developer Preview
-). Qualquer dispositivo N que estiver usando a versão 9.0.83 do Google Play Services
- continuará a receber versões dos aplicativos com segmentação básica de compatibilidade com o Vulkan.
- </li>
-</ul>
-
-<h4 id="">Notificações</h4>
-
-<ul>
- <li>MessagingStyle não exibe notificações com emissor “null” (próprio).
- </li>
-</ul>
-
-<h4 id="">Ferramentas para desenvolvedor</h4>
-
-<ul>
- <li>
- <code>adb</code> pode às vezes se desconectar durante o uso da depuração JDWP.
- </li>
-</ul>
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-
-
-
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Data: Abril de 2016<br>
- Versões: NPC91K, NPC91O<br>
- Suporte do emulador: x86 & ARM (32/64 bits)<br>
- Serviços Google Play: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">Novidades no DP2</h3>
-
-<ul>
- <li>Compatibilidade da plataforma com Vulkan, uma nova API de renderização 3D que fornece
- controle explícito e com baixa sobrecarga da GPU (unidade de processamento gráfico), além de oferecer
- desempenho aprimorado para aplicativos com muitas chamadas de desenho. Para saber mais, consulte a
- <a href="{@docRoot}ndk/guides/graphics/index.html">documentação</a>.
- </li>
-
- <li>Novos emoticons de pessoas com compatibilidade com variações de tons de pele e glifos do Unicode 9.
- Os tons de pele e os novos emoticons não aparecerão até que os teclados adicionem compatibilidade para
- eles na paleta. Os aplicativos não precisam tomar medidas para
- aproveitar esses novos emoticons, a menos que usem uma fonte que não seja no sistema. Desenvolvedores
- IME devem incorporar a compatibilidade para os novos emoticons.
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">Launcher
- Shortcuts API</a>: Aplicativos que usam <code>ShortcutManager</code> para enviar
- atalhos para pontos de partida dentro deles mesmos para o inicializador.
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">Várias janelas</a>:
- Agora você pode especificar uma altura e um comprimento mínimos separados para uma
- atividade. Além disso, vários nomes de API foram ligeiramente alterados.
- </li>
-</ul>
-
-<h4 id="dp2-fixes">Correções de problemas relatados por desenvolvedores</h4>
-
-<p>
- Diversos problemas relatados por desenvolvedores foram corrigidos, incluindo:
-</p>
-
-<ul>
- <li>Impossível conectar com SSID oculto ou Wi-Fi sem transmissão. (erro <a href="https://code.google.com/p/android/issues/detail?id=203116">203116</a>)
- </li>
-
- <li>O estado mudo do microfone persiste em várias atividades. (erro <a href="https://code.google.com/p/android/issues/detail?id=205922">205922</a>)
- </li>
-
- <li>Alterar o foco no modo de várias janelas pausa o YouTube. (erro <a href="https://code.google.com/p/android/issues/detail?id=203424">203424</a>)
- </li>
-
- <li>Resposta direta pode fechar atividades abertas. (erro <a href="https://code.google.com/p/android/issues/detail?id=204411">204411</a>)
- </li>
-
- <li>Diversas correções de estabilidade.
- </li>
-</ul>
-
-<h3 id="dp2-general">Alertas gerais</h3>
-
-<p>
- Esta versão do Developer Preview é apenas para <strong>desenvolvedores de aplicativos</strong>
- e foi projetada para uso apenas em testes de compatibilidade e desenvolvimento inicial.
- Esteja ciente destas notas gerais sobre a versão:
-</p>
-
-<ul>
-
- <li>Os componentes da ferramenta de desenvolvimento e bibliotecas de suporte foram atualizados
- para a versão DP2. Lembre-se de atualizar seu ambiente de desenvolvimento de prévia
- antes de desenvolver para o DP2. Para obter instruções sobre como configurar seu ambiente
- de desenvolvimento, consulte
- <a href="{@docRoot}preview/setup-sdk.html">Configuração do Preview</a>.
- </li>
-
- <li>Esta versão tem diversos problemas de estabilidade e desempenho em todos os dispositivos,
- portanto, <strong>não é adequada para uso diário em celulares ou tablets</strong>,
- especialmente para quem não é desenvolvedor.
- </li>
-
- <li>A vida útil da bateria e o desempenho não foram otimizados nesta
- versão:
-
- <ul>
- <li>Sabe-se que o <strong>desempenho do sistema e de aplicativos fica lento/instável
- periodicamente</strong> e dispositivos podem parar de responder ocasionalmente. Esses
- problemas podem aumentar com o uso prolongado.
- </li>
-
- <li>A vida útil da bateria pode regredir nesta versão em casos de uso de ligar e
- desligar a tela.
- </li>
- </ul>
- </li>
-
- <li>Alguns <strong>aplicativos podem não funcionar normalmente</strong> no Developer Preview
- 2. Isso inclui aplicativos do Google e outros aplicativos.
- </li>
-
- <li>Esta versão inicial não foi aprovada pelo <strong>Compatibility Test Suite (CTS)
-</strong>. Aplicativos que dependem de versões aprovadas pelo CTS não funcionarão
- (por exemplo, o Android Pay).
- </li>
-
- <li>Essa versão de prévia é compatível com os dispositivos a seguir: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9 e Pixel C, além do General Mobile 4G
- (Android One). Compatibilidade com o Nexus Player em breve.
- </li>
-
-
- <li><a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> foi
- atualizado para lidar com alterações na API entre o DP1 e o DP2.
- </li>
-</ul>
-
-<h3 id="dp2-ki">Problemas conhecidos</h3>
-
-<h4>Desempenho e bateria</h4>
-
-<ul>
- <li>Sabe-se que o desempenho do sistema e de aplicativos fica <strong>lento/instável
- periodicamente</strong> e o dispositivo pode parar de responder ocasionalmente. Esses
- problemas podem aumentar com o uso prolongado.
- </li>
-</ul>
-
-<h4>Contas do Google</h4>
-
-<ul>
- <li>Em alguns casos, podem ocorrer problemas com o
- <code>AccountManagerService</code> que impedem o login em contas do Google.
- </li>
-</ul>
-
-<h4>Atualização do sistema</h4>
-
-<ul>
- <li>O dispositivo pode reinicializar imediatamente após atualizar para o DP2.
- </li>
-</ul>
-
-<h4>Acessibilidade</h4>
-
-<ul>
- <li>Problemas ao ouvir a produção de texto para voz (TTS) quando o valor de inclinação está configurado
- quase no nível máximo.
- </li>
-</ul>
-
-<h4>Bluetooth</h4>
-
-<ul>
- <li>Características do Bluetooth Low Energy (LE) GATT usam o tipo de gravação
- errado e não serão enviadas a um dispositivo remoto. Assim, por exemplo, alguns dispositivos de fitness
- não funcionarão.
- </li>
-</ul>
-
-<h4>Assistente de configuração</h4>
-
-<ul>
- <li>A opção de restaurar dados em um dispositivo novo (ou dispositivo recentemente redefinido) da
- “Your Google Account” não pode ser realizada no assistente de configuração. Você deve restaurar os
- dados de um dispositivo existente selecionando “another Android device” no
- assistente de configuração ou configurá-lo como um novo dispositivo.
- </li>
-</ul>
-
-<h4>Desbloquear OEM</h4>
-
-<ul>
- <li>Em alguns dispositivos, <strong>Enable OEM unlock</strong> está desabilitado em
- “Developer Options” durante o uso do DP2.<br>
- <strong>Solução alternativa:</strong> Inscreva-se no
- programa beta do Android (se ainda não estiver inscrito) acessando
- <a href="https://www.google.com/android/beta" class="external-link">www.google.com/android/beta</a>. Depois, inscreva-se e aceite fazer
- o downgrade OTA. Cancelar a inscrição causa o downgrade para o Android 6.0. Agora você
- deve poder escolher <strong>Enable OEM unlock</strong> em
- “Developer Options”. Os dados pessoais são apagados após o downgrade do
- dispositivo; entretanto, o desbloqueio do bootloader pode já ter apagado esses dados.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Desafio de segurança de perfil de trabalho
- <ul>
- <li>Após a migração para o N ou após o usuário criar perfis de trabalho, os
- perfis de trabalho não podem criar chaves no armazenamento de chaves até o usuário alterar o
- padrão, o PIN ou a senha ou configurar um Desafio do Work.
- </li>
-
- <li>No modo de inicialização direta, aplicar as restrições de senha ao dispositivo
- faz com que o perfil de trabalho seja desbloqueado, mesmo se o dispositivo estiver bloqueado.
- Isso torna o perfil de trabalho acessível, mesmo que ele deva estar protegido
- pela tela de bloqueio do dispositivo.
- </li>
- </ul>
- </li>
-
- <li>Always on VPN
- <ul>
- <li>Se modo Always on VPN estiver ativado, mas uma VPN não estiver disponível, os aplicativos
- se conectarão pela rede comum. Os aplicativos devem ficar off-line se não há nenhuma
- conexão VPN disponível.
- </li>
-
- <li>Quando o modo Always On estiver ativado, a conexão por VPN não será estabelecida após
- um dispositivo reiniciar no modo de reinicialização direta, mesmo se o usuário desbloquear a
- tela de bloqueio protegida.
- </li>
- </ul>
- </li>
-
- <li>Suspensão de pacotes
- <ul>
- <li>Os administradores do dispositivo podem suspender pacotes críticos do sistema, o que pode provocar
- comportamentos inesperados, como realizar chamadas apesar de a caixa de diálogo “Telephone
- disabled” ser exibida.
- </li>
- </ul>
- </li>
-
- <li>Outros
- <ul>
- <li>O aplicativo de Configurações falha durante a inicialização se {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} está configurado como verdadeiro quando
- o usuário insere mídias físicas, como um cartão SD.
- </li>
-
- <li>A primeira verificação em um Perfil de trabalho leva vários minutos para
- ser concluída.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan:</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>Lacunas entre números de vinculação e outro número diferente de zero
- como o primeiro número de vinculação faz com que {@code vkCreateGraphicsPipeline()} falhe.</li>
- <li>O Vulkan exibe comportamento de amostragem incorreto em coordenadas projetadas de textura.</li>
- <li>na amostra multithreadCmdBuffer, {@code vkCmdClearColorImage()} falha quando
- é executado com o driver N-DP2.</li>
- <li>Valores de retorno do {@code vkGetPhysicalDeviceFormatProperties()} não configuram um valor
- para {@code VkFormatProperties::linearTilingFeatures}, que considera um valor de 0 como
- um resultado.</li>
- <li>Anexos do buffer de quadro de ponto flutuante do Vulkan não são tratados corretamente.</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>Sombreadores SPIR-V podem acionar afirmações de driver.</li>
- <li>Algumas configurações de pipeline podem fazer {@code vkCreateGraphicsPipeline()}
- falhar.</li>
- </ul>
-</ul>
-
-<h4>Problemas específicos de dispositivos</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- A conexão de dados falha quando o dispositivo é alternado do slot 1 para o slot 2 do SIM.
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- Impossível ativar a opção “Always On” da Pesquisa de voz.
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- Fotos da Câmera na orientação retrato ficam corrompidas, exceto em
- fotos HDR+.
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- A reprodução de conteúdo HD do Netflix pode falhar no Nexus Player.
- </dd>
-
- <dd>
- Qualquer aplicativo que depende de alterações dinâmicas da resolução de vídeo pode falhar no
- Nexus Player.
- </dd>
-
- <dd>
- Qualquer aplicativo que usa o codec de vídeo VP9 pode falhar no Nexus Player.
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Data: Março de 2016<br>
- Versões: NPC56P, NPC56R, atualizada: NPC56W, NPC56X<br>
- Suporte do emulador: x86 & ARM (32/64 bits)<br>
- Serviços Google Play: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">Alertas gerais</h3>
-
-<p>
- Esta versão do Developer Preview é apenas para desenvolvedores de aplicativos e foi projetada para
- uso apenas em testes de compatibilidade e desenvolvimento inicial. Esteja ciente
- destas notas gerais sobre a versão:
-</p>
-<ul>
- <li>Esta versão tem diversos problemas de estabilidade e desempenho em todos os dispositivos,
- portanto, <em>não é adequada para uso diário em celulares ou tablets</em>,
- especialmente para quem não é desenvolvedor.
- </li>
-
- <li>Sabe-se que o desempenho do sistema e de aplicativos fica <strong>lento/instável
- periodicamente</strong> e o dispositivo pode parar de responder ocasionalmente. Esses
- problemas podem aumentar com o uso prolongado.
- </li>
-
- <li>A vida útil da bateria pode regredir nesta versão em casos de uso de ligar e
- desligar a tela.
- </li>
-
- <li>Alguns aplicativos podem não funcionar normalmente no Developer Preview 1. Isso inclui
- aplicativos do Google e outros aplicativos.
- </li>
-
- <li>Esta versão inicial não foi aprovada pelo Compatibility Test Suite (CTS). Aplicativos
- que dependem de versões aprovadas pelo CTS não funcionarão (por exemplo, o Android Pay).
- </li>
-
- <li>Essa versão de prévia é compatível com os dispositivos a seguir: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, Nexus Player e Pixel C, assim como o General Mobile 4G
- (Android One).
- </li>
-</ul>
-
-<h3 id="dp1-platform">Problemas da plataforma</h3>
-
-<h4>Desempenho e bateria</h4>
-
-<ul>
- <li>Sabe-se que o desempenho do sistema e de aplicativos fica <strong>lento/instável
- periodicamente</strong> e o dispositivo pode parar de responder ocasionalmente. Esses
- problemas podem aumentar com o uso prolongado.
- </li>
-
- <li>A vida útil da bateria pode regredir nesta versão em casos de uso de ligar e
- desligar a tela.
- </li>
-</ul>
-<h4 id="dialer">Discador</h4>
-
-<ul>
- <li>O aplicativo Discador não é compatível com a inicialização direta. Isso será resolvido mais tarde no
- N Developer Preview.
- </li>
-
- <li>A reprodução do correio de voz não funciona.
- </li>
-</ul>
-
-<h4>Microfone</h4>
-
-<ul>
- <li>O sistema pode incorretamente manter o microfone no estado mudo em todos os aplicativos e reinicializações. Se você colocar o microfone no mudo em um aplicativo e o estado persistir, abra qualquer aplicativo que tenha controles de som do telefone e desative o mudo.</li>
-</ul>
-
-<h4 id="ui">IU do sistema</h4>
-
-<ul>
- <li>Algumas strings novas ou modificadas na IU do sistema não foram traduzidas para todos
- os idiomas.
- </li>
-
- <li>A IU de visão geral ainda está em desenvolvimento e está sujeita a alterações. Por exemplo,
- pretendemos remover o temporizador que aparece quando o usuário alterna entre
- aplicativos.
- </li>
-
- <li>Os controles e botões de alternância das configurações podem ficar lentos ou parecer que pararam de responder.
- </li>
-
- <li>O design visual das notificações está sujeito a alterações.
- </li>
-
- <li>No aplicativo Gmail, o arquivamento direto de e-mails inclusos em um
- pacote de notificações não funciona corretamente.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Desafio de segurança de perfil de trabalho
- <ul>
- <li>Após a migração para o N ou após o usuário criar perfis de trabalho, os
- perfis de trabalho não podem criar chaves no armazenamento de chaves até o usuário alterar o
- padrão, o PIN ou a senha ou configurar um Desafio do Work.
- </li>
-
- <li>No modo de inicialização direta, aplicar as restrições de senha ao dispositivo
- faz com que o perfil de trabalho seja desbloqueado, mesmo se o dispositivo estiver bloqueado.
- Isso torna o perfil de trabalho acessível, mesmo que ele deva estar protegido
- pela tela de bloqueio do dispositivo.
- </li>
-
- <li>Quando o usuário insere senha e PIN errados, o sistema não
- exibe nenhuma mensagem informativa; em vez disso, ele apenas limpa o campo
- de entrada. Esse problema não afeta a entrada de padrão ou impressão digital.
- </li>
-
- <li>Em um tablet, o segundo plano exibido com o desafio do perfil de trabalho é
- desproporcionalmente pequeno.
- </li>
-
- <li>A versão da <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">
- Política do dispositivo do Google Apps</a> empacotada com o N Developer Preview
- ainda não é compatível com o recurso de Desafio de segurança de perfil de trabalho.
- Em vez disso, os desenvolvedores devem usar <a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a>
- para testar esse recurso.
- </li>
- </ul>
- </li>
-
- <li>Always on VPN
- <ul>
- <li>Se o modo Always on VPN estiver ativado, mas uma VPN não estiver disponível, os aplicativos
- não especificados como exceções na política Always on se conectarão via
- rede comum. Exceto quando especificados como exceções na política Always on,
- os aplicativos deverão ficar off-line se não houver nenhuma conexão VPN disponível.
- <ul>
- <li>Quando o modo Always On estiver ativado, a conexão por VPN não será estabelecida
- após um dispositivo reiniciar no modo de reinicialização direta, mesmo se o usuário
- desbloquear a tela de bloqueio protegida.
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>Contatos aprimorados
- <ul>
- <li>Dispositivos Bluetooth PBAP/MAP não exibem a identificação de chamadas para
- contatos de trabalho. A próxima versão do Preview corrige esse problema.
- </li>
- </ul>
- </li>
-
- <li>Modo de trabalho
- <ul>
- <li>O Google Now Launcher não mostra se o Modo de trabalho está ativado ou
- desativado. O Launcher também não exibe o estado de suspensão do aplicativo.
- </li>
-
- <li>Após o usuário desativar e ativar o Modo de trabalho, o sistema não exibe mais os
- widgets de aplicativos do perfil de trabalho, como a Agenda.
- </li>
- </ul>
- </li>
-
- <li>Suspensão de pacotes
- </li>
-
- <li>Os administradores do dispositivo podem suspender pacotes críticos do sistema, o que pode provocar
- comportamentos inesperados, como realizar chamadas apesar de a caixa de diálogo Telephone
- disabled ser exibida.
- </li>
-
- <li>Outros
- <ul>
- <li>O aplicativo de Configurações falha durante a inicialização se {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} está configurado como verdadeiro quando
- o usuário insere mídias físicas, como um cartão SD.
- </li>
-
- <li>O estado {@code DPM.setPackagesSuspended} não persiste quando o
- usuário desinstala e reinstala um aplicativo. O aplicativo deve continuar
- suspenso após a desinstalação/reinstalação ou os aplicativos suspensos não podem ser
- desinstalados.
- </li>
-
- <li>A primeira verificação em um Perfil de trabalho leva vários minutos para
- ser concluída. Isso pode fazer com que o aplicativo demore mais que o normal para se tornar
- visível na Play EMM API.
- </li>
-
- <li>Notificações dos aplicativos do perfil de trabalho não são visíveis para
- detectores de notificações instalados no perfil pessoal. Como resultado, o sistema
- não exibe Notificações conforme esperado.
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >Teclado</h4>
-
-<ul>
- <li>O pareamento por Bluetooth entre teclados e dispositivos Android pode ser instável.
- </li>
-</ul>
-
-<h4 >Vídeo</h4>
-
-<ul>
-<li>A reprodução de vídeos pode demorar e exibir interrupções.</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>Wi-Fi passou por refatoramento que pode alterar o
- comportamento de caso isolado da API. Especificamente, aplicativos que tentarem se conectar
- a redes específicas ou que tentarem se reconectar a redes deverão ser testados novamente.
- </li>
-
- <li>O cliente DHCP legado foi removido da plataforma. O único
- cliente DHCP compatível com a plataforma é o cliente DHCP introduzido no M.
- </li>
-</ul>
-
-<h4>Inicialização direta</h4>
-
-<ul>
- <li>NFC não funciona até o primeiro desbloqueio.
- <ul>
- <li>Quando um celular com Bluetooth habilitado é reiniciado, o Bluetooth não
- ativa automaticamente. Você deve reativar o Bluetooth manualmente.
- </li>
-
- <li>Sob certas circunstâncias, o toque padrão pode não soar para
- chamadas e mensagens de telefone. Esse comportamento foi corrigido na próxima
- versão do N Preview, com uma exceção (e solução alternativa):
- </li>
-
- <li>Em um dispositivos que não tenha sido apagado recentemente -- um que foi inicializado pelo
- menos uma vez desde que foi configurado no modo de inicialização direta -- o
- toque padrão de notificação não soa. O usuário pode resolver esse problema
- selecionando um toque manualmente em Settings.
- </li>
-
- <li>A inicialização direta não está ativa por padrão em dispositivos com uma versão do N
- Developer Preview. Para ativar a inicialização direta para testes e
- desenvolvimento, acesse Developer Options e toque em Convert to File Encryption.
- Nesta prévia de desenvolvedor, isso requer uma reconfiguração de fábrica para fazer o reparticionamento e
- a reformatação do dispositivo para a criptografia baseada em arquivos.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>Imagem em imagem para Android TV</h4>
-
-<ul>
- <li>A integração PIP na IU de Recents não foi finalizada e está sujeita a
- alterações.
- <ul>
- <li>A animação da janela PIP não é perfeita. Versões futuras do
- Preview melhorarão isso.
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">Versões futuras do Preview melhorarão
- o design visual e o alinhamento do layout de PIP.
- </li>
-</ul>
-
-<h4>Relatórios de erros</h4>
-
-<ul>
- <li>Os relatórios de erros nem sempre são completados com sucesso (como solução alternativa,
- às vezes eles ainda podem ser acessados usando o fornecedor de documentação do relatório de erros
- no armazenamento interno).
- </li>
-</ul>
-
-<h4>Várias janelas em tela dividida</h4>
-
-<ul>
- <li>Os aplicativos podem falhar e apresentar comportamentos inesperados da IU quando colocados em
- modo de tela dividida. Esses são problemas de aplicativo que devem ser corrigidos pelo
- desenvolvedor do aplicativo.
- </li>
-
- <li>Quando o aplicativo é destinado para uma versão da plataforma Android anterior ao N,
- ele pode não funcionar com avisos de tela dividida que aparecem diversas vezes.
- </li>
-
- <li>Manter pressionado o botão Overview enquanto usa um aplicativo com uma
- orientação corrigida pode provocar um comportamento inesperado do aplicativo.
- </li>
-
- <li>Os aplicativos podem tremular durante o redimensionamento.
- </li>
-
- <li>As animações ainda não estão finalizadas.
- </li>
-</ul>
-
-<h4>Método de entrada</h4>
-
-<ul>
- <li>O Teclado do Google volta inesperadamente ao teclado genérico do Google
- quando <b>usa idiomas do sistema</b>, mas o Teclado do Google não é compatível com nenhum
- dos idiomas selecionados nas preferências de idioma do sistema. Ele deve
- voltar para inglês americano.
- <p>
- Alternativamente, você pode solucionar esse problema adicionando ao menos um idioma compatível com o
- Teclado do Google.
- </p>
- </li>
-</ul>
-
-<h4>Acessibilidade</h4>
-
-<ul>
- <li>TalkBack exibe problemas com recursos, incluindo Notifications, Quick
- Settings Tiles e exibição de várias janelas, que podem causar falhas no sistema ou
- uma falta de feedback falado do TalkBack. Versões futuras do Preview
- resolverão esses problemas.
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">Observações e problemas específicos de dispositivos</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>Problemas de reprodução de vídeo, compatibilidade de aplicativo e estabilidade são esperados no
- Nexus Player nesta versão do Preview.
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>O redimensionamento de várias janelas pode causar falhas.</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Dispositivos Nexus 9 podem não ligar após receberem atualizações OTA
- via programa beta do Android. Para se recuperar desse problema, você deve tentar
- instalar manualmente a imagem OTA. Para obter mais informações, consulte
- <a href="{@docRoot}preview/download-ota.html">Aplicação de uma imagem OTA de dispositivo</a>.
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd b/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd
new file mode 100644
index 0000000..8f58841
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=Inicialização direta
+page.keywords=preview,sdk,direct boot
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#run">Solicitar acesso para executar durante a inicialização direta</a></li>
+ <li><a href="#access">Acesso ao armazenamento criptografado do dispositivo</a></li>
+ <li><a href="#notification">Receber notificação quando o usuário desbloquear</a></li>
+ <li><a href="#migrating">Migrar dados existentes</a></li>
+ <li><a href="#testing">Testar seu aplicativo com reconhecimento de criptografia</a></li>
+ </ol>
+</div>
+</div>
+
+<p>O Android N é executado em um modo seguro de <i>inicialização direta</i>
+quando o dispositivo é ligado, mas o usuário não o
+desbloqueia. Para isso, o sistema oferece dois locais de armazenamento para dados:</p>
+
+<ul>
+<li><i>O armazenamento criptografado de credenciais</i>, que é o local de armazenamento padrão
+e é disponibilizado apenas depois que o usuário desbloqueia o dispositivo.</li>
+<li><i>O armazenamento criptografado do dispositivo</i>, que é um local de armazenamento disponibilizado
+durante o modo de inicialização direta e depois que o usuário desbloqueia o dispositivo.</li>
+</ul>
+
+<p>Por padrão, aplicativos não são executados no modo de inicialização direta.
+Se seu aplicativo precisa executar ações durante esse modo, você pode registrar os
+componentes que devem ser executados. Alguns casos comuns
+para aplicativos que precisam ser executados no modo de inicialização direta:</p>
+
+<ul>
+<li>Aplicativos com notificações programadas, como aplicativos de
+despertador.</li>
+<li>Aplicativos que fornecem notificações importantes ao usuário, como aplicativos de SMS.</li>
+<li>Aplicativos que fornecem serviços de acessibilidade, como o Talkback.</li>
+</ul>
+
+<p>Se seu aplicativo precisar acessar dados enquanto estiver no modo de inicialização direta, use
+o armazenamento criptografado do dispositivo. O armazenamento criptografado do dispositivo contém dados
+criptografados com uma chave que só é disponibilizada depois que o dispositivo realizou
+uma inicialização verificada com sucesso.</p>
+
+<p>Para dados que devem ser criptografados com uma chave associada às credenciais
+do usuário, como um PIN ou uma senha, use o armazenamento criptografado de credenciais.
+Esse armazenamento só é disponibilizado depois que o usuário
+desbloquear o dispositivo com sucesso e até que ele reinicie o dispositivo novamente. Se o
+usuário ativar a tela de bloqueio após desbloquear o dispositivo, isso não bloqueará
+o armazenamento criptografado de credenciais.</p>
+
+<h2 id="run">Solicitar acesso para executar durante a inicialização direta</h2>
+
+<p>Aplicativos devem registrar seus componentes com o sistema antes de
+poderem ser executados no modo de inicialização direta ou acessar o armazenamento criptografado
+do dispositivo. Os aplicativos são registrados com o sistema ao marcar os componentes como
+<i>tendo reconhecimento de criptografia</i>. Para marcar seu componente como tendo reconhecimento de criptografia, defina o atributo
+<code>android:directBootAware</code> como true no manifesto.<p>
+
+<p>Componentes com reconhecimento de criptografia podem se registrar para receber uma mensagem de transmissão
+<code>LOCKED_BOOT_COMPLETED</code> do
+sistema quando o dispositivo é reiniciado. Nesse momento, o armazenamento criptografado do
+dispositivo é disponibilizado e pode executar tarefas
+necessárias durante o modo de inicialização, como o acionamento de um alarme programado.</p>
+
+<p>O snippet de código a seguir é um exemplo de como registrar um
+{@link android.content.BroadcastReceiver} como tendo reconhecimento de criptografia e adicionar um
+filtro de intenção para <code>LOCKED_BOOT_COMPLETED</code> no manifesto do aplicativo:</p>
+
+<pre>
+<receiver
+ android:directBootAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Quando o usuário desbloquear o dispositivo, todos os componentes poderão acessar o armazenamento
+criptografado do dispositivo e o armazenamento criptografado de credenciais.</p>
+
+<h2 id="access">Acesso ao armazenamento criptografado do dispositivo</h2>
+
+<p>Para acessar o armazenamento criptografado do dispositivo, crie uma segunda instância de
+{@link android.content.Context} chamando
+<code>Context.createDeviceProtectedStorageContext()</code>. Todas as chamadas da API
+de armazenamento que usam esse contexto acessam o armazenamento criptografado do dispositivo. O
+exemplo a seguir acessa o armazenamento criptografado do dispositivo e abre um
+arquivo de dados existente do aplicativo:</p>
+
+<pre>
+Context directBootContext = appContext.createDeviceProtectedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>Use o armazenamento criptografado do dispositivo somente para
+informações que precisem ser acessadas durante o modo de inicialização direta.
+Não use o armazenamento criptografado do dispositivo como um repositório criptografado para fins gerais.
+Para informações particulares do usuário ou dados criptografados que não são necessários durante
+o modo de inicialização direta, use o armazenamento criptografado de credenciais.</p>
+
+<h2 id="notification">Receber notificação quando o usuário desbloquear</h2>
+
+<p>Quando o usuário desbloquear o dispositivo após a reinicialização, seu aplicativo poderá voltar
+a acessar o armazenamento criptografado de credenciais e usar serviços regulares do sistema que
+dependem das credenciais do usuário.</p>
+
+<p>Para receber uma notificação quando o usuário desbloquear o dispositivo após uma reinicialização,
+registre um {@link android.content.BroadcastReceiver} do componente em execução
+para ouvir a mensagem <code>ACTION_USER_UNLOCKED</code>. Você também pode
+receber a mensagem {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED} existente, que agora indica que o dispositivo foi inicializado e que
+o usuário o desbloqueou.</p>
+
+<p>Você pode enviar uma consulta diretamente se o usuário desbloquear o dispositivo chamando
+<code>UserManager.isUserUnlocked()</code>.</p>
+
+<h2 id="migrating">Migrar dados existentes</h2>
+
+<p>Se um usuário atualizar o dispositivo para usar o modo de inicialização direta, você poderá ter dados
+existentes que precisem ser migrados para o armazenamento criptografado do dispositivo. Use
+<code>Context.moveSharedPreferencesFrom()</code> e
+<code>Context.moveDatabaseFrom()</code> para migrar dados de preferências e do banco de
+dados entre o armazenamento criptografado de credenciais e o armazenamento criptografado do dispositivo.</p>
+
+<p>Tenha bom senso ao decidir quais dados migrar do armazenamento
+criptografado de credenciais para o armazenamento criptografado do dispositivo. Não migre
+informações particulares do usuário, como senhas ou tokens de autorização, para o
+armazenamento criptografado do dispositivo. Em alguns casos, pode ser necessário gerenciar
+conjuntos separados de dados nos dois repositórios criptografados.</p>
+
+<h2 id="testing">Testar seu aplicativo com reconhecimento de criptografia</h2>
+
+<p>Teste seu aplicativo com reconhecimento de criptografia usando o novo modo de inicialização direta. Existem duas
+maneiras de ativar a inicialização direta.</p>
+
+<p class="caution"><strong>Cuidado:</strong> ao ativar a inicialização direta,
+você apaga todos os dados do usuário no dispositivo.</p>
+
+<p>Em dispositivos compatíveis com o Android N instalado, ative a
+inicialização direta seguindo um destes procedimentos:</p>
+
+<ul>
+<li>No dispositivo, ative <b>Developer options</b>, se ainda não tiver feito isso,
+acessando <b>Settings > About phone</b> e tocando em <b>Build number</b>
+sete vezes. Quando a tela de opções do desenvolvedor for disponibilizada, acesse
+<b>Settings > Developer options</b> e selecione
+<b>Convert to file encryption</b>.</li>
+<li>Use os seguintes comandos de shell adb para ativar o modo de inicialização direta:
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>Um modo de inicialização direta emulado também está disponível, caso você precise trocar
+de modo nos dispositivos de teste. O modo emulado só deve ser usado durante
+o desenvolvimento e pode causar perda de dados. Para ativar o modo de inicialização direta,
+defina um padrão de bloqueio no dispositivo, escolha "No thanks", caso seja solicitada
+uma tela de inicialização segura ao definir esse padrão, e, em seguida, use o
+seguinte comando de shell adb:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>Para desativar o modo de inicialização direta emulado, use o seguinte comando:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>O uso desses comandos faz com que o dispositivo seja reinicializado.</p>
diff --git a/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..a4c51ab
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd
@@ -0,0 +1,148 @@
+page.title=Acesso a diretórios com escopo
+page.keywords=preview,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#accessing">Acessar um diretório de armazenamento externo</a></li>
+ <li><a href="#removable">Acessar um diretório em uma mídia removível</a></li>
+ <li><a href="#best">Práticas recomendadas</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Alguns aplicativos, como aplicativos de fotos, normalmente só precisam acessar diretórios específicos de um
+armazenamento externo, como o diretório <code>Pictures</code>. As abordagens
+existentes para o acesso de armazenamentos externos não foram desenvolvidas para fornecer com facilidade
+acesso direcionado a diretórios para esses tipos de aplicativos. Por exemplo:</p>
+
+<ul>
+<li>Solicitar {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+ou {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} em seu manifesto
+permite o acesso a todos os diretórios públicos no armazenamento externo, o que pode ser mais do
+que o aplicativo precisa.</li>
+<li>Usar a
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Estrutura de
+acesso ao armazenamento</a> geralmente faz com que o usuário selecione diretórios
+por meio de uma IU de sistema, o que é desnecessário se seu aplicativo sempre acessa o mesmo
+diretório externo.</li>
+</ul>
+
+<p>O Android N fornece uma nova API simplificada para acessar
+diretórios de armazenamento externo comuns. </p>
+
+<h2 id="accessing">Acessar um diretório de armazenamento externo</h2>
+
+<p>Use a classe <code>StorageManager</code> para obter a instância
+<code>StorageVolume</code> apropriada. Em seguida, crie uma intenção chamando o método
+<code>StorageVolume.createAccessIntent()</code> dessa instância.
+Use essa intenção para acessar os diretórios de armazenamento externo. Para obter uma lista de
+todos os volumes disponíveis, incluindo volumes de mídias removíveis, use
+<code>StorageManager.getVolumesList()</code>.</p>
+
+<p>Se você tiver informações sobre um arquivo específico, use
+<code>StorageManager.getStorageVolume(File)</code> para obter o
+<code>StorageVolume</code> que contém o arquivo. Chame
+<code>createAccessIntent()</code> neste <code>StorageVolume</code> para acessar
+o diretório de armazenamento externo para o arquivo.</p>
+
+<p>
+Em volumes secundários, como cartões SD externos, passe nulo ao chamar
+<code>StorageVolume.createAccessIntent()</code> para solicitar acesso ao
+volume todo em vez de um diretório específico.
+<code>StorageVolume.createAccessIntent()</code> retornará nulo se você passar
+nulo no volume principal ou se passar um nome de diretório inválido.
+</p>
+
+<p>O fragmento de código a seguir é um exemplo de como abrir o diretório
+<code>Pictures</code> no armazenamento compartilhado principal:</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>O sistema tenta conceder acesso ao diretório externo e,
+se necessário, confirma o acesso com o usuário usando uma IU simplificada:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>Figura 1.</strong> Um aplicativo solicitando
+acesso ao diretório Pictures.</p>
+
+<p>Se o usuário conceder o acesso, o sistema chamará sua substituição de
+<code>onActivityResult()</code> com um código de resultado de
+<code>Activity.RESULT_OK</code> e os dados de intenção que contêm o URI. Use
+o URI fornecido para acessar as informações do diretório, o que é semelhante a usar URIs
+retornados pela
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Estrutura de
+acesso ao armazenamento</a>.</p>
+
+<p>Se o usuário não conceder o acesso, o sistema chamará sua substituição de
+<code>onActivityResult()</code> com um código de resultado de
+<code>Activity.RESULT_CANCELED</code> e dados de intenção nulos.</p>
+
+<p class="note"><b>Observação</b>: Ao obter acesso a um diretório externo específico,
+você também obtém acesso aos subdiretórios dentro do diretório em questão.</p>
+
+<h2 id="removable">Acessar um diretório em uma mídia removível</h2>
+
+<p>Para usar o Acesso a diretórios com escopo para acessar diretórios em uma mídia removível,
+primeiro adicione um {@link android.content.BroadcastReceiver} que escute a notificação
+{@link android.os.Environment#MEDIA_MOUNTED}. Por exemplo:</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Quando o usuário monta uma mídia removível, como um cartão SD, o sistema envia uma notificação
+{@link android.os.Environment#MEDIA_MOUNTED}. Essa notificação
+fornece um objeto <code>StorageVolume</code> nos dados de intenção que
+você pode usar para acessar os diretórios na mídia removível. O exemplo a seguir
+acessa o diretório <code>Pictures</code> na mídia removível:</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">Práticas recomendadas</h2>
+
+<p>Quando possível, mantenha o URI de acesso a diretórios externos para que você não precise
+solicitar acesso ao usuário várias vezes. Quando o usuário conceder o acesso, chame
+<code>getContentResolver().takePersistableUriPermssion()</code> com o
+URI de acesso ao diretório. O sistema manterá o URI e as solicitações de acesso
+subsequentes retornarão <code>RESULT_OK</code> e não mostrarão a IU de confirmação para o
+usuário.</p>
+
+<p>Se o usuário negar acesso a um diretório externo, não repita a
+solicitação imediatamente. Insistir em solicitações de acesso repetidas vezes gera uma experiência
+negativa para o usuário. Se uma solicitação for negada pelo usuário e o aplicativo solicitar acesso
+novamente, a IU exibirá uma caixa de seleção <b>Não perguntar novamente</b>.</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>Figura 1.</strong> Um aplicativo que faz uma
+segunda solicitação para acesso à mídia removível.</p>
+
+<p>Se o usuário selecionar <b>Não perguntar novamente</b> e negar a solicitação, todas
+as solicitações futuras para o diretório provenientes do aplicativo serão automaticamente
+negadas e a IU de solicitação não será apresentada ao usuário.</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/pt-br/training/articles/security-config.jd b/docs/html-intl/intl/pt-br/training/articles/security-config.jd
new file mode 100644
index 0000000..2ba9b60
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/training/articles/security-config.jd
@@ -0,0 +1,747 @@
+page.title=Configuração de segurança de rede
+page.keywords=androidn,security,network
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Neste documento</h2>
+<ol>
+ <li><a href="#manifest">Adicionar um arquivo de configurações de segurança</a></li>
+ <li><a href="#CustomTrust">Personalizar CAs confiáveis</a>
+ <ol>
+ <li><a href="#ConfigCustom">Configurar uma CA personalizada confiável</a></li>
+ <li><a href="#LimitingCas">Limitar o conjunto de CAs confiáveis</a></li>
+ <li><a href="#TrustingAdditionalCas">Confiar em CAs adicionais</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">CAs somente de depuração</a></li>
+ <li><a href="#UsesCleartextTraffic">Cancelar uso de tráfego de texto simples</a></li>
+ <li><a href="#CertificatePinning">Fixar certificados</a></li>
+ <li><a href="#ConfigInheritance">Comportamento de herança de configuração</a></li>
+ <li><a href="#FileFormat">Formato do arquivo de configurações</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ O Android N inclui um recurso de configurações de segurança de rede
+ que permite que os aplicativos personalizem as configurações de segurança de rede em um arquivo de configurações declarativo e seguro
+ sem modificar o código do aplicativo. Essas configurações podem
+ ser definidas para domínios específicos e para um aplicativo específico. Os principais
+ recursos são:
+</p>
+
+<ul>
+ <li>
+ <b>Âncoras de confiança personalizadas:</b> personalize quais autoridades de certificado (CA)
+ são confiáveis para as conexões seguras de um aplicativo. Por
+ exemplo, confiar em certificados autoassinados privados ou restringir
+ o conjunto de CAs públicas nas quais o aplicativo confia.
+ </li>
+
+ <li>
+ <b>Substituições somente de depuração:</b> depure conexões seguras do aplicativo com segurança,
+ sem adicionar riscos à base instalada.
+ </li>
+
+ <li>
+ <b>Cancelar uso de tráfego de texto simples:</b> proteja aplicativos contra
+ o uso acidental de tráfego de texto simples.
+ </li>
+
+ <li>
+ <b>Fixar certificados:</b> restrinja a conexão segura de um aplicativo
+ a certificados específicos.
+ </li>
+</ul>
+
+
+<h2 id="manifest">Adicionar um arquivo de configurações de segurança</h2>
+
+<p>
+ O recurso de configurações de segurança de rede usa um arquivo XML no qual você especifica
+ as configurações do seu aplicativo. Inclua uma entrada no manifesto do seu
+ aplicativo para apontar para esse arquivo. Este trecho de código de um manifesto
+ demonstra como criar essa entrada:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application ... >
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">Personalizar CAs confiáveis</h2>
+
+<p>
+ Um aplicativo pode querer confiar em um conjunto personalizado de CAs em vez de no padrão
+ da plataforma. Os motivos mais comuns para isso são:
+</p>
+
+<ul>
+ <li>Conectar-se a um host com uma autoridade de certificado personalizada (autoassinada,
+ emitida por uma CA corporativa interna etc.).
+ </li>
+
+ <li>Limitar o conjunto de CAs para apenas aquelas nas quais você confia em vez de todas
+ as CAs pré-instaladas.
+ </li>
+
+ <li>Confiar em CAs adicionais não incluídas no sistema.
+ </li>
+</ul>
+
+<p>
+ Por padrão, conexões seguras (por exemplo, TLS, HTTPS) de todos os aplicativos confiam
+ nas CAs pré-instaladas do sistema e os aplicativos direcionados ao nível da API 23
+ (Android M) e inferior também confiam no repositório de CAs adicionadas pelo usuário por padrão. Um
+ aplicativo pode personalizar as próprias conexões usando {@code base-config} (para
+ personalização em todo o aplicativo) ou {@code domain-config} (para personalização
+ por domínio).
+</p>
+
+
+<h3 id="ConfigCustom">Configurar uma CA personalizada</h3>
+
+<p>
+ Suponhamos que você queira se conectar a um host que use um certificado SSL autoassinado
+ ou a um host cujo certificado SSL foi emitido por uma CA não pública
+ na qual confia, como a CA interna da sua empresa.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Adicione o certificado da CA autoassinada ou não pública em formato PEM ou DER em
+ {@code res/raw/my_ca}.
+</p>
+
+
+<h3 id="LimitingCas">Limitar o conjunto de CAs confiáveis</h3>
+
+<p>
+ Um aplicativo que não queira confiar em todas as CAs nas quais o sistema confia
+ pode especificar o próprio conjunto limitado de CAs confiáveis. Isso protege o
+ aplicativo contra certificados fraudulentos emitidos por qualquer outra CA.
+</p>
+
+<p>
+ A configuração para limitar o conjunto de CAs confiáveis é semelhante a <a href="#TrustingACustomCa">confiar em uma CA personalizada</a> para um domínio específico, mas
+ fornecendo várias CAs no recurso.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Adicione as CAs confiáveis em formato PEM ou DER em {@code res/raw/trusted_roots}.
+ Observe que, ao usar o formato PEM, o arquivo deve conter <em>somente</em> dados PEM,
+ sem texto adicional. Você também pode fornecer vários elementos
+ <a href="#certificates"><code><certificates></code></a>
+em vez de um.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ Confiar em CAs adicionais
+</h3>
+
+<p>
+ Um aplicativo pode querer confiar em CAs adicionais nas quais o sistema não confia.
+ Isso pode ocorrer se o sistema ainda não incluiu a CA ou se a CA
+ não atender aos requisitos de inclusão no sistema Android. O
+ aplicativo pode fazer isso ao especificar várias fontes de certificados para uma
+ configuração.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">Configurar CAs para depuração</h2>
+
+<p>
+ Ao depurar um aplicativo conectado por HTTPS, você pode querer
+ se conectar a um servidor de desenvolvimento local que não tenha o certificado SSL
+ do seu servidor de produção. Para fazer isso sem
+ modificar o código do aplicativo, você pode especificar CAs somente de depuração que
+ sejam confiáveis <i>apenas</i> quando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ for {@code true} ao usar {@code debug-overrides}. Normalmente, IDEs e ferramentas de compilação
+ definem esse sinalizador automaticamente para compilações de não lançamento.
+</p>
+
+<p>
+ Isso é mais seguro do que o código condicional normal, pois, como medida
+ de segurança, os repositórios do aplicativo não aceitam aplicativos marcados como
+ depuráveis.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">Cancelar uso de tráfego de texto simples</h2>
+
+<p>
+ Aplicativos que pretendem se conectar a destinos usando apenas conexões
+ seguras podem cancelar o uso de texto simples de suporte (usando o protocolo HTTP não criptografado
+ em vez de HTTPS) para esses destinos. Essa opção ajuda a evitar
+ regressões acidentais em aplicativos devido a alterações nos URLs fornecidos por fontes externas,
+ como servidores de back-end.
+ Consulte {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()} para saber mais.
+</p>
+
+<p>
+ Por exemplo, um aplicativo pode querer garantir que todas as conexões com {@code
+ secure.example.com} sejam sempre realizadas por HTTPS para proteger o tráfego confidencial
+ de redes hostis.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">Fixar certificados</h2>
+
+<p>
+ Normalmente, um aplicativo confia em todas as CAs pré-instaladas. Se qualquer uma dessas CAs
+ emitir um certificado fraudulento, o aplicativo estará em risco de ataques
+ MiTM. Alguns aplicativos optam por limitar o conjunto de certificados que aceitam
+ restringindo o conjunto de CAs ou fixando certificados.
+</p>
+
+<p>
+ A fixação de certificados é realizada ao fornecer um conjunto de certificados pelo hash da
+ chave pública (SubjectPublicKeyInfo do certificado X.509). Uma cadeia de certificados
+ é válida somente se contiver pelo menos uma
+ das chaves públicas fixadas.
+</p>
+
+<p>
+ Observe que, ao usar a fixação de certificados, você deve sempre incluir uma chave de backup
+ para que, se você for forçado a alternar para novas chaves ou alterar as CAs (ao
+ fixar um certificado de CA ou um intermediário dessa CA), a
+ conectividade do seu aplicativo não seja afetada. Caso contrário, você precisará enviar
+ uma atualização ao aplicativo para restaurar a conectividade.
+</p>
+
+<p>
+ Além disso, é possível definir um tempo de expiração para as fixações, após o qual
+ elas não sejam mais realizadas. Isso ajuda a evitar problemas de conectividade
+ em aplicativos que não foram atualizados. No entanto, definir um tempo de expiração
+ para fixações pode permitir que as fixações sejam ignoradas.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">Comportamento de herança de configuração</h2>
+
+<p>
+ Valores não definidos em uma configuração específica são herdados. Esse comportamento permite
+ configurações mais complexas, mantendo o arquivo de configuração legível.
+</p>
+
+<p>
+ Se um valor não for definido em uma entrada específica, o valor da próxima entrada
+ mais genérica será usado. Valores não definidos em um {@code domain-config} são
+ obtidos pelo {@code domain-config} pai, se aninhados, ou, caso contrário, pelo {@code
+ base-config}. Valores não definidos no {@code base-config} usam os
+ valores padrão da plataforma.
+</p>
+
+<p>
+ Por exemplo, considere um caso no qual todas as conexões para subdomínios de {@code
+ example.com} devem usar um conjunto personalizado de CAs. Além disso, o tráfego de texto simples para esses
+ domínios é permitido <em>exceto</em> ao se conectar com {@code
+ secure.example.com}. Ao aninhar a configuração para {@code
+ secure.example.com} dentro da configuração para {@code example.com}, o
+ {@code trust-anchors} não precisa ser duplicado.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">Formato do arquivo de configurações</h2>
+
+<p>
+ O recurso de configurações de segurança de rede usa um formato do arquivo XML.
+ A estrutura geral desse arquivo é mostrada no seguinte exemplo de código:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ As seções a seguir descrevem a sintaxe e outros detalhes do formato do
+ arquivo.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ pode conter:
+ </dt>
+
+ <dd>
+ 0 ou 1 de <code><a href="#base-config"><base-config></a></code><br>
+ Qualquer número de <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 ou 1 de <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ sintaxe:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ pode conter:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ descrição:
+ </dt>
+
+ <dd>
+ A configuração padrão usada por todas as conexões cujo destino não é
+ coberto por um <a href="#domain-config"><code>domain-config</code></a>.
+
+<p>
+ Qualquer valor não definido usa os valores padrão da plataforma. A configuração padrão
+ para aplicativos direcionados a níveis de API acima do 24:
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+A configuração padrão para aplicativos direcionados a níveis de API 23 e inferiores:
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>sintaxe:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>Pode conter:</dt>
+
+<dd>
+1 ou mais <code><a href="#domain"><domain></a></code>
+<br/>0 ou 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 ou 1 <code><a href="#pin-set"><pin-set></code></a>
+<br/>Qualquer número de <code><domain-config></code> aninhados</dd>
+
+<dt>Descrição</dt>
+<dd>A configuração usada para conexões com destinos específicos, conforme é definido pelos elementos {@code domain}.
+
+<p>Observe que, se vários elementos {@code domain-config} cobrirem um destino, a configuração com a regra de domínio correspondente
+mais específica (mais longa) será usada.</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ sintaxe:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ Atributos:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ Se {@code "true"}, a regra de domínio corresponderá ao domínio e a todos os
+ subdomínios, incluindo subdomínios de subdomínios. Caso contrário, a regra
+ se aplica apenas a correspondências exatas.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ Descrição:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ sintaxe:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ Pode conter:
+ </dt>
+
+ <dd>
+ 0 ou 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ Descrição:
+ </dt>
+
+ <dd>
+ Substituições a serem aplicadas quando <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ for {@code "true"}, o que normalmente ocorre em compilações de não lançamento
+ geradas por IDEs e ferramentas de compilação. Âncoras de confiança especificadas em {@code
+ debug-overrides} são adicionadas a todas as demais configurações e a fixação
+ de certificados não é realizada quando a cadeia de certificados do servidor usa uma
+ dessas âncoras de confiança somente de depuração. Se <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ for {@code "false"}, esta seção será ignorada por completo.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ sintaxe:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ Pode conter:
+ </dt>
+
+ <dd>
+ Qualquer número de <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ Descrição:
+ </dt>
+
+ <dd>
+ Conjunto de âncoras de confiança para conexões seguras.
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>sintaxe:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>descrição:</dt>
+<dd>Conjunto de certificados X.509 para elementos {@code trust-anchors}.</dd>
+
+<dt>atributos:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+A fonte de certificados de CA, que pode ser um dos
+<ul>
+ <li>IDs de recursos brutos que apontam para um arquivo que contém certificados X.509.
+ Os certificados devem ser codificados em formato DER ou PEM. No caso de certificados PEM,
+ o arquivo <em>não deve</em> conter dados não PEM adicionais, como
+ comentários.
+ </li>
+
+ <li>{@code "system"} para os certificados de CA pré-instalados do sistema
+ </li>
+
+ <li>{@code "user"} para certificados de CA adicionados pelo usuário
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ Especifica se as CAs dessa fonte ignoram a fixação de certificados. Se {@code
+ “true”} e forem certificadas cadeias de certificados que incluam uma das CAs dessa
+ fonte, a fixação não será realizada. Isso pode ser útil para depurar CAs
+ ou permitir que o usuário execute ataques MiTM no tráfego seguro do seu aplicativo.
+ </p>
+
+ <p>
+ O padrão é {@code "false"} a não ser que seja especificado em um elemento {@code debug-overrides}
+. Nesse caso, o padrão será {@code "true"}.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ sintaxe:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ Pode conter:
+ </dt>
+
+ <dd>
+ Qualquer número de <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ Descrição:
+ </dt>
+
+ <dd>
+ Um conjunto de fixações de chave pública. Para que uma conexão segura seja confiável, uma das
+ chaves públicas na cadeia de confiança deve estar presente no conjunto de fixações. Consulte
+ <code><a href="#pin"><pin></a></code> para saber mais sobre o formato das fixações.
+ </dd>
+
+ <dt>
+ Atributos:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ A data, no formato {@code yyyy-MM-dd}, após a qual as fixações
+ expiram e são desativadas. Se o atributo não for definido, as fixações
+ não expirarão.
+ <p>
+ A expiração ajuda a evitar problemas de conectividade em aplicativos que não
+ recebem atualizações para o conjunto de fixações, por exemplo, porque o usuário
+ desativou as atualizações do aplicativo.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ sintaxe:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ Atributos:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ O algoritmo de resumo usado para gerar a fixação. No momento, apenas
+ {@code "SHA-256"} é permitido.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/index.jd b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/index.jd
index 5912058..ff22642 100644
--- a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/index.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/index.jd
@@ -45,7 +45,7 @@
está visível, mas a instância e seu estado permanecem intactos).</p>
<p>Dentro dos métodos de retorno de chamada do ciclo de vida, você pode declarar como a atividade deve se comportar quando o
-usuário sai e retorna da atividade. Por exemplo, se estiver construindo um reprodutor de vídeos de transmissão em sequência,
+usuário sai e retorna da atividade. Por exemplo, se estiver construindo um reprodutor de vídeos de transmissão em sequência,
você pode pausar o vídeo e encerrar a conexão da rede quando o usuário alternar para outro
aplicativo. Quando o usuário retornar, será possível reconectar a rede e permitir que ele reinicie o vídeo
de onde parou.</p>
@@ -55,7 +55,7 @@
usuário espera e não consuma recursos do sistema quando não estiver em uso.</p>
<h2>Lições</h2>
-
+
<dl>
<dt><b><a href="starting.html">Iniciando uma atividade</a></b></dt>
<dd>Aprenda os fundamentos sobre ciclo de vida da atividade, como o usuário pode iniciar seu aplicativo e como
@@ -68,5 +68,5 @@
<dt><b><a href="recreating.html">Recriando uma atividade</a></b></dt>
<dd>Aprenda sobre o que acontece quando sua atividade é destruída e como reconstruir o estado
da atividade quando necessário.</dd>
-</dl>
+</dl>
diff --git a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/pausing.jd b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/pausing.jd
index 55f772e..9851579 100644
--- a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Esta lição ensina a</h2>
<ol>
<li><a href="#Pause">Pausar sua atividade</a></li>
<li><a href="#Resume">Reiniciar sua atividade</a></li>
</ol>
-
+
<h2>Leia também</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Atividades</a>
@@ -31,12 +31,12 @@
</div>
</div>
-<p>Durante o uso normal do aplicativo, a atividade em primeiro plano as vezes é obstruída por outros
+<p>Durante o uso normal do aplicativo, a atividade em primeiro plano as vezes é obstruída por outros
componentes visuais que causam a <em>pausa</em>. Por exemplo, quando uma atividade
- semitransparente é aberta (como uma no estilo de um diálogo), a atividade anterior pausa. Enquanto a
+ semitransparente é aberta (como uma no estilo de um diálogo), a atividade anterior pausa. Enquanto a
atividade estiver parcialmente visível, mas não for o foco da atividade, ela permanecerá pausada.</p>
-<p>No entanto, se a atividade estiver completamente obstruída e não visível, ela <em>para</em> (o que será
+<p>No entanto, se a atividade estiver completamente obstruída e não visível, ela <em>para</em> (o que será
discutido na próxima lição).</p>
<p>Conforme a atividade entra no estado pausado, o sistema chama o método {@link
@@ -59,7 +59,7 @@
<h2 id="Pause">Pausar sua atividade</h2>
-
+
<p>Quando o sistema chama {@link android.app.Activity#onPause()} para sua atividade, teoricamente
significa que a atividade ainda está parcialmente visível, mas geralmente é um indício
de que o usuário está saindo da atividade e logo entrará em estado Interrompido. Use
diff --git a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/recreating.jd b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/recreating.jd
index 7cb122f..9746a65 100644
--- a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Esta lição ensina a</h2>
<ol>
<li><a href="#SaveState">Salvar o estado da atividade</a></li>
<li><a href="#RestoreState">Restaurar o estado da atividade</a></li>
</ol>
-
+
<h2>Leia também</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">Compatibilidade
@@ -57,7 +57,7 @@
rastreiam o progresso do usuário na atividade.</p>
<p class="note"><strong>Observação:</strong> para que o sistema Android restaure o estado das
-visualizações em sua atividade, <strong>cada visualização precisa ter uma ID exclusiva</strong>, fornecido pelo atributo
+visualizações em sua atividade, <strong>cada visualização precisa ter uma ID exclusiva</strong>, fornecido pelo atributo
<a href="{@docRoot}reference/android/view/View.html#attr_android:id">{@code
android:id}</a>.</p>
@@ -105,7 +105,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -138,7 +138,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -157,12 +157,12 @@
depois do método {@link android.app.Activity#onStart()}. O sistema chama {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} se houver um estado
salvo para ser restaurado. Portanto, não é necessário verificar se {@link android.os.Bundle} é null:</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/starting.jd b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/starting.jd
index efe2bad..4c1a9b8 100644
--- a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Esta lição ensina a</h2>
<ol>
<li><a href="#lifecycle-states">Entender o ciclo de vida do retorno de chamada</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">Criar uma nova instância</a></li>
<li><a href="#Destroy">Destruir a atividade</a></li>
</ol>
-
+
<h2>Leia também</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Atividades</a></li>
@@ -83,7 +83,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -138,7 +138,7 @@
-<h2 id="launching-activity">Especificar a atividade da tela de início do aplicativo</h2>
+<h2 id="launching-activity">Especificar a atividade da tela de início do aplicativo</h2>
<p>Quando o usuário seleciona seu aplicativo na tela inicial, o sistema chama o método {@link
android.app.Activity#onCreate onCreate()} para {@link android.app.Activity} no aplicativo
@@ -151,7 +151,7 @@
<p>A principal atividade do aplicativo deve ser declarada no manifesto com um <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a> que inclui a ação {@link
android.content.Intent#ACTION_MAIN MAIN} e categoria
-{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER}. Por exemplo:</p>
+{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER}. Por exemplo:</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -200,10 +200,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -268,7 +268,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/stopping.jd b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/stopping.jd
index 2eba3772..1c00d99 100644
--- a/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Esta lição ensina a</h2>
<ol>
<li><a href="#Stop">Interromper sua atividade</a></li>
<li><a href="#Start">Iniciar/reiniciar sua atividade</a></li>
</ol>
-
+
<h2>Leia também</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Atividades</a>
@@ -152,13 +152,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -169,8 +169,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html-intl/intl/pt-br/training/basics/data-storage/databases.jd b/docs/html-intl/intl/pt-br/training/basics/data-storage/databases.jd
index 37d0d43..68b5518 100644
--- a/docs/html-intl/intl/pt-br/training/basics/data-storage/databases.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/data-storage/databases.jd
@@ -118,12 +118,12 @@
pode ser acessada por outros aplicativos.</p>
<p>Um conjunto de APIs está disponível na classe {@link
-android.database.sqlite.SQLiteOpenHelper}.
+android.database.sqlite.SQLiteOpenHelper}.
Ao usar esta classe para obter referências para seu banco de dados, o sistema
realiza operações
de possível longa execução para criar e atualizar o banco de dados apenas quando
-necessário e <em>não durante a inicialização do aplicativo</em>. Basta chamar
-{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} ou
+necessário e <em>não durante a inicialização do aplicativo</em>. Basta chamar
+{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} ou
{@link android.database.sqlite.SQLiteOpenHelper#getReadableDatabase}.</p>
<p class="note"><strong>Observação:</strong> devido à possibilidade de serem de longa execução,
diff --git a/docs/html-intl/intl/pt-br/training/basics/data-storage/files.jd b/docs/html-intl/intl/pt-br/training/basics/data-storage/files.jd
index d071d39..0e00645 100644
--- a/docs/html-intl/intl/pt-br/training/basics/data-storage/files.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/data-storage/files.jd
@@ -183,7 +183,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -250,12 +250,12 @@
. Embora esses arquivos estejam teoricamente à disposição do usuário e de outros aplicativo por estarem
no armazenamento externo, na verdade são arquivos que não têm valor para o usuário
fora do aplicativo. Ao desinstalar o aplicativo, o sistema exclui
-todos os arquivos no diretório privado externo do aplicativo.
+todos os arquivos no diretório privado externo do aplicativo.
<p>Por exemplo, recursos adicionais baixados através do aplicativo ou arquivos de mídia temporários.</p>
</dd>
</dl>
-<p>Para salvar arquivos públicos no armazenamento externo, use o método
+<p>Para salvar arquivos públicos no armazenamento externo, use o método
{@link android.os.Environment#getExternalStoragePublicDirectory
getExternalStoragePublicDirectory()} para obter um {@link java.io.File} que representa
o diretório correto no armazenamento externo. O método exige um argumento que especifica
@@ -265,7 +265,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -287,7 +287,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -366,7 +366,7 @@
<div class="note">
<p><strong>Observação:</strong> quando o usuário desinstala o aplicativo, o sistema Android também
-exclui:</p>
+exclui:</p>
<ul>
<li>Todos os arquivos salvos no armazenamento interno</li>
<li>Todos os arquivos salvos no armazenamento externo usando {@link
diff --git a/docs/html-intl/intl/pt-br/training/basics/intents/filters.jd b/docs/html-intl/intl/pt-br/training/basics/intents/filters.jd
index f3b3b12..596f35c 100644
--- a/docs/html-intl/intl/pt-br/training/basics/intents/filters.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/intents/filters.jd
@@ -154,7 +154,7 @@
<p>Quando sua atividade iniciar, chame {@link android.app.Activity#getIntent()} para retomar a
{@link android.content.Intent} que iniciou a atividade. Pode-se fazer isso a qualquer momento durante
-o ciclo de vida da atividade, mas recomenda-se fazê-lo no início do retorno de chamada como
+o ciclo de vida da atividade, mas recomenda-se fazê-lo no início do retorno de chamada como
{@link android.app.Activity#onCreate onCreate()} ou {@link android.app.Activity#onStart()}.</p>
<p>Por exemplo:</p>
diff --git a/docs/html-intl/intl/pt-br/training/basics/intents/result.jd b/docs/html-intl/intl/pt-br/training/basics/intents/result.jd
index ecb5a47..abb880b 100644
--- a/docs/html-intl/intl/pt-br/training/basics/intents/result.jd
+++ b/docs/html-intl/intl/pt-br/training/basics/intents/result.jd
@@ -29,7 +29,7 @@
startActivityForResult()} (em vez de {@link android.app.Activity#startActivity
startActivity()}).</p>
-<p>Por exemplo, o aplicativo pode iniciar um aplicativo de câmera e receber a foto capturada como resultado. Ou,
+<p>Por exemplo, o aplicativo pode iniciar um aplicativo de câmera e receber a foto capturada como resultado. Ou,
ao iniciar o aplicativo Pessoas para que o usuário selecione um
contato, você receberá os detalhes do contato como resultado.</p>
@@ -104,7 +104,7 @@
aplicativos Contatos ou Pessoas do Android fornece um conteúdo {@link android.net.Uri} que identifica o
contato escolhido pelo usuário.</p>
-<p>Para que o resultado seja tratado de forma adequada, é preciso saber o formato do resultado
+<p>Para que o resultado seja tratado de forma adequada, é preciso saber o formato do resultado
{@link android.content.Intent}. Isso é fácil quando umas das suas atividades
retorna o resultado. Os aplicativos incluídos na plataforma Android oferecem suas próprias APIs que
podem ser usadas para dados de resultado específicos. Por exemplo, o aplicativo Pessoas (Contatos em algumas versões mais
@@ -155,7 +155,7 @@
<p class="note"><strong>Observação:</strong> antes do Android 2.3 (API nível 9), executar uma consulta
no {@link android.provider.ContactsContract.Contacts Contacts Provider} (como mostrado
acima) exige que o aplicativo declare a permissão {@link
-android.Manifest.permission#READ_CONTACTS} (consulte <a href="{@docRoot}guide/topics/security/security.html">Segurança e permissões</a>). Contudo,
+android.Manifest.permission#READ_CONTACTS} (consulte <a href="{@docRoot}guide/topics/security/security.html">Segurança e permissões</a>). Contudo,
iniciar com Android 2.3, o aplicativo Contatos/Pessoas dá ao aplicativo permissão
temporária para ler no Provedor de Contatos quando retornar um resultado. A permissão temporária
aplica-se apenas a pedidos de contato específicos, portanto, não é possível consultar um contato diferente daquele
diff --git a/docs/html-intl/intl/pt-br/training/basics/network-ops/data-saver.jd b/docs/html-intl/intl/pt-br/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..a9803b8
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,234 @@
+page.title=Economia de dados
+metaDescription=User-enabled otimização de uso de dados.
+page.keywords="android N", "data usage", "metered network"
+page.image=images/cards/card-nyc_2x.jpg
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ Neste documento
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#status">Verificação de preferências da Economia de dados</a>
+ <ol>
+ <li>
+ <a href="#request-whitelist">Solicitação de permissão para colocar na lista de permissões</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#monitor-changes">Monitoramento de preferências do
+ Economia de dados</a>
+ </li>
+
+ <li>
+ <a href="#testing">Teste com comandos do Android Debug Bridge</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Durante a vida útil de um smartphone, o custo do plano de dados pode
+facilmente exceder o custo do próprio dispositivo. No N Developer Preview, os usuários podem
+ ativar a Economia de dados no dispositivo como um todo para usar menos dados, seja
+ em roaming, perto do final do período de cobrança ou em pacotes de dados pré-pagos pequenos.
+</p>
+
+<p>
+ Quando um usuário ativa a Economia de dados em <strong>Settings</strong> e o dispositivo está
+em uma rede tarifada, o sistema bloqueia o uso de dados em segundo plano e avisa
+ aos aplicativos para reduzir o uso de dados no primeiro plano sempre que possível. Os usuários podem
+autorizar aplicativos específicos a usar dados tarifados em segundo plano, mesmo com a Economia
+ de dados ativada.
+</p>
+
+<p>
+ O N Developer Preview estende a API {@link android.net.ConnectivityManager}
+ para oferecer aos aplicativos uma forma de <a href="#status">recuperar as
+preferências do usuário para a Economia de dados</a> e <a href="#monitor-changes">monitorar
+as mudanças de preferências</a>. Como prática recomendada, os aplicativos devem verificar se o
+ usuário ativou a Economia de dados e tentar limitar o uso de dados em primeiro e
+ segundo plano.
+</p>
+
+<h2 id="status">
+ Verificação de preferências da Economia de dados
+</h2>
+
+<p>
+ No N Developer Preview, aplicativos podem usar a API {@link
+ android.net.ConnectivityManager} para determinar quais restrições
+ de uso de dados estão sendo aplicadas. O método {@code getRestrictBackgroundStatus()}
+ retorna um dos seguintes valores:
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ A Economia de dados está desativada.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ O usuário ativou a Economia de dados para este aplicativo. Os aplicativos tentarão limitar o
+ uso de dados em primeiro plano e gerenciar as restrições ao
+ uso de dados em segundo plano.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ O usuário ativou a Economia de dados, mas o aplicativo está na lista de permissões. Os aplicativos
+ ainda tentarão limitar o uso de dados em primeiro e segundo plano.
+ </dd>
+</dl>
+
+<p>
+ É prática recomendada limitar o uso de dados sempre que o dispositivo
+ estiver conectado a uma rede tarifada, mesmo que a Economia de dados esteja desativada e o aplicativo
+ esteja na lista de permissões. O modelo de código a seguir usa {@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} e {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} para determinar o volume máximo de dados
+ que o aplicativo pode usar:
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ Solicitação de permissão para colocar na lista de permissões
+</h3>
+
+<p>
+ Se o seu aplicativo precisa usar dados em segundo plano, ele pode solicitar permissão para
+ entrar na lista de permissões enviando uma intenção
+ <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
+ que contenha o URI no nome de pacote do aplicativo, por exemplo,
+ <code>package:MY_APP_ID</code>.
+</p>
+
+<p>
+ O envio da intenção e do URI abre o aplicativo <strong>Settings</strong> e
+ exibe as configurações de uso de dados de seu aplicativo. O usuário pode decidir então se
+ ativará os dados em segundo plano para o aplicativo. Antes de enviar a intenção, é
+ prática recomendada perguntar primeiro ao usuário se ele deseja iniciar o
+aplicativo <strong>Settings</strong> com o objetivo de ativar o uso
+ de dados em segundo plano.
+</p>
+
+<h2 id="monitor-changes">
+ Monitoramento de alterações nas preferências da Economia de dados
+</h2>
+
+<p>
+ Os aplicativos podem monitorar alterações nas preferências da Economia de dados criando um {@link
+ android.content.BroadcastReceiver} para escutar {@code
+ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} e registrar
+ dinamicamente o receptor em {@link android.content.Context#registerReceiver
+ Context.registerReceiver()}. Quando recebe esta transmissão, o aplicativo deve
+ <a href="#status">verificar se as novas preferências da Economia de dados afetam
+ as permissões</a> chamando {@code
+ ConnectivityManager.getRestrictBackgroundStatus()}.
+</p>
+
+<p class="note">
+ <strong>Observação:</strong> O sistema só envia esta transmissão para aplicativos que
+ se registram dinamicamente para recebê-la em {@link
+ android.content.Context#registerReceiver Context.registerReceiver()}. Os aplicativos
+ que se registrarem para receber a transmissão no manifesto não a
+ receberão.
+</p>
+
+<h2 id="testing">
+ Teste com comandos do Android Debug Bridge
+</h2>
+
+O <a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
+oferece alguns comandos que podem ser usados para verificar e configurar permissões
+de rede:
+
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ Gera um relatório que inclui a configuração de restrição atual da rede de segundo plano global
+, os UIDs do pacote em lista de permissões e as permissões de rede
+ de outros pacotes conhecidos.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ Exibe uma lista completa de comandos do Gerenciador de políticas de rede (netpolicy).
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ Ativa ou desativa o modo da Economia de dados ao passar <code>true</code> ou
+ <code>false</code>, respectivamente.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Adiciona o UID do pacote especificado à lista de permissões para permitir o uso de dados de segundo plano
+ tarifados.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Adiciona o UID do pacote especificado à lista de permissões para bloquear o uso de dados
+ de segundo plano tarifados enquanto a Economia de dados estiver ativada.
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/pt-br/training/material/drawables.jd b/docs/html-intl/intl/pt-br/training/material/drawables.jd
index 4eb9f36..900fbb1 100644
--- a/docs/html-intl/intl/pt-br/training/material/drawables.jd
+++ b/docs/html-intl/intl/pt-br/training/material/drawables.jd
@@ -38,7 +38,7 @@
<p>Você pode aplicar um tingimento aos objetos {@link android.graphics.drawable.BitmapDrawable} ou {@link
android.graphics.drawable.NinePatchDrawable} com o método {@code setTint()}. Você também
-pode configurar a cor e o modo do tingimento nos layouts com os atributos <code>android:tint</code> e
+pode configurar a cor e o modo do tingimento nos layouts com os atributos <code>android:tint</code> e
<code>android:tintMode</code>.</p>
diff --git a/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..14f5209
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,213 @@
+page.title=Imagem em imagem
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Neste documento</h2>
+<ol>
+ <li><a href="#declaring">Declarar que sua atividade oferece suporte ao modo de
+imagem em imagem</a></li>
+ <li><a href="#pip_button">Alternar a atividade para o modo de imagem em imagem</a>
+</li>
+ <li><a href="#handling_ui">Lidar com a IU durante o modo de imagem em imagem</a>
+</li>
+ <li><a href="#continuing_playback">Continuar reprodução de vídeo no modo de
+imagem em imagem</a></li>
+ <li><a href="#single_playback">Usar uma única atividade de reprodução para
+imagem em imagem</a></li>
+ <li><a href="#best">Práticas recomendadas</a></li>
+</ol>
+
+<h2>Veja também</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">Suporte a
+várias janelas</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>No Android N, os usuários do Android TV agora podem assistir a um vídeo
+em uma janela fixada em um canto da tela enquanto navegam em
+aplicativos. O modo de imagem em imagem (PIP) permite que os aplicativos executem uma atividade de vídeo
+na janela fixada enquanto outra atividade continua em
+segundo plano. A janela do PIP permite que os usuários realizem várias tarefas enquanto usam seu aplicativo, o que os
+ajuda a ser mais produtivos.</p>
+
+<p>Seu aplicativo pode decidir quando acionar o modo de PIP. Veja alguns exemplos de
+quando entrar no modo de PIP:</p>
+
+<ul>
+<li>Seu aplicativo pode passar um vídeo para o modo de PIP quando o usuário
+sai do vídeo para procurar outro conteúdo.</li>
+<li>Seu aplicativo pode passar um vídeo para o modo de PIP quando um usuário assiste ao final
+de um episódio de conteúdo. A janela principal exibe informações promocionais ou de resumo
+sobre o próximo episódio da série.</li>
+<li>Seu aplicativo pode fornecer uma maneira de os usuários colocarem conteúdo adicional em uma fila enquanto
+assistem a um vídeo. O vídeo continua a ser reproduzido no modo de PIP enquanto a tela principal
+exibe uma atividade de seleção de conteúdo.</li>
+</ul>
+
+<p>A janela do modo de PIP tem 240x135 dp e é mostrada na camada superior de um dos
+quatro cantos da tela, escolhido pelo sistema. O usuário pode exibir um
+menu de PIP que permite que coloque a janela do PIP em tela inteira ou feche-a
+ao pressionar o botão <b>Home</b> do controle remoto. Se outro
+vídeo começar a ser reproduzido na tela principal, a janela do PIP será fechada
+automaticamente. Os usuários também podem fechar a janela do PIP em Recents.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>Figura 1.</strong> Um vídeo no modo de imagem em imagem
+visível no canto da tela enquanto o usuário navega por conteúdo
+na janela principal.</p>
+
+<p>O PIP utiliza as APIs de várias janelas disponíveis no Android N para
+fornecer a janela sobreposta de vídeo fixo. Para adicionar o modo de PIP ao seu aplicativo, você deve
+registrar as atividades que oferecem suporte a PIP, alternar a atividade para o modo de PIP conforme
+a necessidade e garantir que os elementos de IU sejam ocultados e que a reprodução do vídeo continue quando
+a atividade estiver no modo de PIP.</p>
+
+<h2 id="declaring">Declarar que sua atividade oferece suporte ao modo de imagem em imagem</h2>
+
+<p>Por padrão, o sistema não oferece suporte ao modo de PIP automaticamente para seus aplicativos.
+Se quiser esse suporte para seu aplicativo, registre a atividade
+de vídeo no manifesto definindo
+<code>android:supportsPictureInPicture</code> e
+<code>android:resizeableActivity</code> como <code>true</code>. Além disso, especifique
+que a atividade processa alterações na configuração de layout de forma que a atividade
+não seja reiniciada quando ocorrem essas alterações durante as transições do modo de PIP.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>Ao registrar a atividade, lembre-se de que, no modo de PIP, ela
+é mostrada em uma pequena janela sobreposta em uma tela de TV. Atividades de reprodução de
+vídeo com uma quantidade mínima de itens de IU oferecem a melhor experiência do usuário. Atividades que contêm
+pequenos elementos de IU podem não oferecer uma boa experiência do usuário
+no modo de PIP, pois ele não conseguirá enxergar os detalhes desses elementos
+na janela do PIP.</p>
+
+<h2 id="pip_button">Alternar a atividade para o modo de imagem em imagem</h2>
+
+Quando precisar colocar a atividade no modo de PIP, chame
+<code>Activity.enterPictureInPictureMode()</code>. O exemplo a seguir
+entra no modo de PIP quando o usuário seleciona um botão dedicado ao PIP na barra de controle de
+uma mídia:</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>Adicionar um botão de PIP à barra de controle de mídia permite que o usuário entre no
+modo de PIP com facilidade ao controlar a reprodução de um vídeo.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>Figura 1.</strong> Um botão do
+modo de imagem em imagem em uma barra de controle de mídia.</p>
+
+<p>O Android N inclui uma nova classe
+<code>PlaybackControlsRow.PictureInPictureAction</code> que define ações do PIP
+para a barra de controle e usa o ícone do PIP.</p>
+
+<h2 id="handling_ui">Lidar com a IU durante o modo de imagem em imagem</h2>
+
+<p>Quando a atividade entra no modo de PIP, ela deve mostrar apenas a reprodução do
+vídeo. Remova elementos de IU antes que a atividade entre no modo de PIP
+e restaure esses elementos quando a atividade voltar ao modo de tela inteira.
+Substitua <code>Activity.onPictureInPictureModeChanged()</code> ou
+<code>Fragment.onPictureInPictureModeChanged()</code> e ative ou
+desative os elementos de interface conforme for necessário. Por exemplo:</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">Continuar reprodução de vídeo no modo de
+imagem em imagem</h2>
+
+<p>Quando a atividade entra no modo de PIP, o sistema a considera
+pausada e chama o método <code>onPause()</code> da atividade. A reprodução
+de vídeos não deverá ser pausada se a atividade
+for pausada devido ao modo de PIP. Verifique o PIP no método
+<code>onPause()</code> da atividade e realize a reprodução da forma apropriada. Por
+exemplo:</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>Quando a atividade sai do modo de PIP e volta à tela inteira, o
+sistema retoma a atividade e chama o método <code>onResume()</code>.</p>
+
+<h2 id="single_playback">Usar uma única atividade de reprodução para
+imagem em imagem</h2>
+
+<p>Ao navegar pelo conteúdo
+ da tela principal de seu aplicativo, um usuário pode selecionar um novo vídeo enquanto uma atividade de reprodução de vídeo estiver em modo de PIP. Reproduza o novo
+ vídeo na atividade de reprodução existente em modo de tela cheia em vez de
+lançar uma nova atividade que pode confundir o usuário.</p>
+
+<p>Para que uma única atividade seja usada para solicitações de reprodução de vídeo e
+com o modo de PIP ativado ou desativado, conforme necessário, configure o
+<code>android:launchMode</code> da atividade para <code>singleTask</code> em seu manifesto.
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>Na atividade, modifique {@link android.app.Activity#onNewIntent
+Activity.onNewIntent()} e processe o novo vídeo, interrompendo qualquer
+reprodução existente, caso necessário.</p>
+
+<h2 id="best">Práticas recomendadas</h2>
+
+<p>O PIP é destinado a atividades que reproduzem vídeos em tela inteira. Ao passar
+a atividade para o modo de PIP, evite mostrar qualquer coisa que não seja o conteúdo do vídeo.
+Rastreie quando a atividade entrar no modo de PIP e oculte os elementos de IU, conforme descrito
+em <a href="#handling_ui">Lidar com a interface durante o modo de imagem em imagem</a>.</p>
+
+<p>Como a janela do PIP é mostrada como uma janela flutuante no canto da
+tela, você deve evitar exibir informações essenciais em qualquer área
+da janela principal que possa ser ocultada pela janela do PIP.</p>
+
+<p>Quando uma atividade está no modo de PIP, ela não recebe foco de entrada por padrão. Para
+receber eventos de entrada no modo de PIP, use
+<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd b/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd
new file mode 100644
index 0000000..890e140
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd
@@ -0,0 +1,142 @@
+page.title=Gravação para TV
+page.keywords=preview,sdk,tv,recording
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#supporting">Indicar suporte para gravação</a></li>
+ <li><a href="#recording">Gravar uma sessão</a></li>
+ <li><a href="#errors">Solucionar erros de gravação</a></li>
+ <li><a href="#sessions">Gerenciar sessões gravadas</a></li>
+ <li><a href="#best">Práticas recomendadas</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Serviços de entrada de TV permitem que o usuário pause e retome a reprodução do canal por meio de
+APIs de time-shifting. O Android N expande o time-shifting
+ao permitir que o usuário salve várias sessões gravadas.</p>
+
+<p>Os usuários podem programar gravações antecipadamente ou iniciar uma gravação enquanto assistem a
+um programa. Quando o sistema salvar a gravação, o usuário poderá procurar, gerenciar
+e reproduzir a gravação usando o aplicativo de TV do sistema.</p>
+
+<p>Se quiser fornecer recursos de gravação para seu serviço de entrada de TV,
+indique para o sistema que o aplicativo oferece suporte a gravação, implemente
+a capacidade de gravar programas, solucione e comunique erros ocorridos
+durante a gravação e gerencie as sessões gravadas.</p>
+
+<p class="note"><strong>Observação:</strong> O aplicativo Live Channels ainda não
+oferece aos usuários uma forma de criar ou acessar gravações. Enquanto o aplicativo Live Channels não sofrer
+ alterações, será difícil testar toda a experiência de
+gravação de seu serviço de entrada de TV.</p>
+
+<h2 id="supporting">Indicar suporte para gravação</h2>
+
+<p>Para informar ao sistema que seu serviço de entrada de TV oferece suporte a gravação, defina
+ o atributo <code>android:canRecord</code> no arquivo XML de metadados do serviço
+ como <code>true</code>:
+</p>
+
+<pre>
+<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
+ <b>android:canRecord="true"</b>
+ android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
+</pre>
+
+<p>Para obter mais informações sobre o arquivo de metadados do serviço, consulte
+<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">Declarar seu serviço
+de entrada de TV no manifesto</a> (em inglês).
+</p>
+
+<p>Como alternativa, você pode indicar suporte a gravação em seu código usando
+estas etapas:</p>
+
+<ol>
+<li>No método <code>TvInputService.onCreate()</code>, crie um novo objeto
+<code>TvInputInfo</code> usando a classe <code>TvInputInfo.Builder</code>
+.</li>
+<li>Ao criar o novo objeto <code>TvInputInfo</code>, chame
+<code>setCanRecord(true)</code> antes de chamar <code>build()</code> para
+indicar que seu serviço oferece suporte a gravação.</li>
+<li>Registre seu objeto <code>TvInputInfo</code> com o sistema chamando
+<code>TvInputManager.updateTvInputInfo()</code>.</li>
+</ol>
+
+<h2 id="recording">Gravar uma sessão</h2>
+
+<p>Depois que o serviço de entrada de TV registrar que oferece suporte ao recurso
+de gravação, o sistema chamará seu
+<code>TvInputService.onCreateRecordingSession()</code> quando precisar acessar
+a implementação de gravação do seu aplicativo. Implemente sua própria subclasse
+<code>TvInputService.RecordingSession</code> e retorne-a
+quando o retorno de chamada <code>onCreateRecordingSession()</code>
+for acionado. Essa subclasse é responsável por alternar para os dados de canal corretos,
+gravando os dados solicitados e comunicando o status de gravação e os erros ao
+sistema.</p>
+
+<p>Quando o sistema chamar <code>RecordingSession.onTune()</code>, passando um
+URI de canal, acesse o canal especificado pelo URI. Notifique o sistema de que
+seu aplicativo acessou o canal desejado ao chamar <code>notifyTuned()</code>
+ou, se o aplicativo não conseguiu acessar o canal correto, chame
+<code>notifyError()</code>.</p>
+
+<p>Em seguida, o sistema invoca o retorno de chamada <code>RecordingSession.onStartRecording()</code>
+. O aplicativo deve iniciar a gravação imediatamente. Quando o sistema invoca
+esse retorno de chamada, ele pode fornecer um URI que contenha informações sobre o programa
+que será gravado. Quando a gravação for concluída, você deverá copiar esses
+dados para a tabela de dados <code>RecordedPrograms</code>.</p>
+
+<p>Por fim, o sistema chama <code>RecordingSession.onStopRecording()</code>.
+Nesse momento, o aplicativo deve interromper a gravação imediatamente. Também é preciso
+criar uma entrada na tabela <code>RecordedPrograms</code>. Essa entrada deve
+incluir o URI dos dados da sessão gravada na coluna
+<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> e qualquer informação
+sobre o programa fornecida pelo sistema na chamada inicial em
+<code>onStartRecording()</code>.</p>
+
+<p>Para saber mais sobre como acessar a tabela <code>RecordedPrograms</code>,
+consulte <a href="#sessions">Gerenciar sessões gravadas</a>.</p>
+
+<h2 id="errors">Solucionar erros de gravação</h2>
+
+<p>Se um erro ocorrer durante a gravação, inutilizando os dados gravados,
+notifique o sistema chamando <code>RecordingSession.notifyError()</code>.
+Também é possível chamar <code>notifyError()</code> depois que uma sessão de gravação é
+criada para informar ao sistema que seu aplicativo não pode mais gravar sessões.</p>
+
+<p>Se um erro ocorrer durante a gravação, mas você quiser fornecer uma gravação
+parcial que pode ser usada pelos usuários para reprodução, chame
+<code>RecordingSession.notifyRecordingStopped()</code> para permitir que o sistema
+use a sessão parcial.</p>
+
+<h2 id="sessions">Gerenciar sessões gravadas</h2>
+
+<p>O sistema mantém as informações de todas as sessões gravadas de todos
+os aplicativos de canais com recursos de gravação na tabela de provedor de conteúdo <code>TvContract.RecordedPrograms</code>
+. Essas informações podem ser acessadas pelo URI de conteúdo
+<code>RecordedPrograms.Uri</code>. Use APIs de provedores de conteúdo para
+ler, adicionar e excluir entradas dessa tabela.</p>
+
+<p>Para saber mais sobre como trabalhar com dados de provedores de conteúdo, consulte
+<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
+Fundamentos do provedor de conteúdo</a> .</p>
+
+<h2 id="best">Práticas recomendadas</h2>
+
+<p>Dispositivos de TV podem ter armazenamento limitado, então tenha bom senso ao
+alocar armazenamento para salvar sessões gravadas. Use
+<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code> quando
+não houver espaço suficiente para salvar uma sessão gravada.</p>
+
+<p>Quando o usuário iniciar a gravação, comece a gravar os dados assim
+que possível. Para facilitar esse processo, realize qualquer tarefa demorada imediatamente,
+como acessar e alocar o espaço de armazenamento, quando o sistema invocar o retorno de chamada
+<code>onCreateRecordingSession()</code>. Isso permite que você comece
+a gravar imediatamente após o acionamento do retorno de chamada <code>onStartRecording()</code>
+.</p>
diff --git a/docs/html-intl/intl/ru/about/versions/android-5.0.jd b/docs/html-intl/intl/ru/about/versions/android-5.0.jd
index 5dbbac8..8267252 100644
--- a/docs/html-intl/intl/ru/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/ru/about/versions/android-5.0.jd
@@ -429,7 +429,7 @@
<p>При обнаружении подходящей сети система подключается к ней и отправляет ответ {@link android.net.ConnectivityManager.NetworkCallback#onAvailable(android.net.Network) onAvailable()}. Для получения дополнительных сведений о сети можно использовать объект {@link android.net.Network} в ответе. Он же применяется для перенаправления трафика в выбранную сеть.</p>
<h3 id="BluetoothBroadcasting">Низкоэнергетический Bluetooth</h3>
-<p>В Android версии 4.3 была представлена поддержка <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">низкоэнергетического Bluetooth</a> (<em>Bluetooth LE</em>) как основного способа передачи данных. Устройство на Android 5.0 может быть <em>периферийным</em> с поддержкой Bluetooth низкой мощности. Эта функция позволяет приложениям связываться с устройствами, расположенными неподалеку. Например, ваше приложение может работать как шагомер или отслеживать иные показатели, передавая данные на другое близко расположенное устройство по сети Bluetooth.</p>
+<p>В Android версии 4.3 была представлена поддержка <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">низкоэнергетического Bluetooth</a> (<em>Bluetooth LE</em>) как основного способа передачи данных. Устройство на Android 5.0 может быть <em>периферийным</em> с поддержкой Bluetooth низкой мощности. Эта функция позволяет приложениям связываться с устройствами, расположенными неподалеку. Например, ваше приложение может работать как шагомер или отслеживать иные показатели, передавая данные на другое близко расположенное устройство по сети Bluetooth.</p>
<p>Новый API {@link android.bluetooth.le} позволяет приложениям передавать рекламу, получать отчеты и устанавливать связь с другими устройствами, поддерживающими Bluetooth LE. Чтобы воспользоваться новыми функциями, добавьте в манифест разрешение {@link android.Manifest.permission#BLUETOOTH_ADMIN BLUETOOTH_ADMIN}. Скачивая приложение или обновления для него в Google Play, пользователи должны дать разрешение на сбор данных о Bluetooth, управление этой функцией, а также на обмен информацией с устройствами по соседству.</p>
<p>Чтобы начать передачу рекламы по Bluetooth LE на другие устройства, вызовите {@link android.bluetooth.le.BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback) startAdvertising()} и передайте данные о внедрении класса {@link android.bluetooth.le.AdvertiseCallback}. Объект обратного вызова получает отчет об успешном или неуспешном показе рекламы.</p>
diff --git a/docs/html-intl/intl/ru/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/ru/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..11a2495
--- /dev/null
+++ b/docs/html-intl/intl/ru/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,480 @@
+page.title=Изменения в работе
+page.keywords=preview,sdk,compatibility
+meta.tags="предварительная версия", "совместимость"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Содержание документа</h2>
+
+<ol>
+ <li><a href="#perf">Повышение производительности</a>
+ <ol>
+ <li><a href="#doze">Режим Doze</a></li>
+ <li><a href="#bg-opt">Оптимизация фоновых процессов</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">Изменения разрешений</a></li>
+ <li><a href="#accessibility">Улучшенные специальные возможности</a>
+ <ol>
+ <li><a href="#screen-zoom">Масштабирование экрана</a></li>
+ <li><a href="#vision-settings">Vision Settings в мастере настройки</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">Связь приложений NDK с библиотеками платформы</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+</ol>
+
+<h2>Дополнительно</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">Обзор API-интерфейсов Android N</a>
+</li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Наряду с новыми функциями и возможностями в Android N появились различные изменения
+работы системы и API. В этом документе рассматриваются некоторые наиболее важные
+изменения, которые следует понимать и учитывать при разработке приложений.
+
+</p>
+
+<p>
+ Если вы ранее публиковали приложения для Android, то примите во внимание,
+что эти изменения в платформе могут повлиять на работу ваших уже опубликованных приложений.
+</p>
+
+
+<h2 id="perf">Повышение производительности</h2>
+
+<p>
+ Изменения в работе системы Android N нацелены на более экономное использование заряда аккумулятора
+и оперативной памяти, а также на повышение производительности приложений. Эти изменения могут повлиять
+на системные уведомления и доступность системных ресурсов для вашего приложения. Вам следует
+ознакомиться с этими изменениями и оценить, какие исправления могут понадобиться вашему приложению для соответствия этим изменениям.
+
+</p>
+
+<h3 id="doze">Режим Doze</h3>
+
+<p>
+ Появившийся в Android 6.0 (уровень API 23), режим Doze экономит заряд аккумулятора,
+откладывая процессорные и сетевые операции, когда устройство находится не на зарядке,
+оно неподвижно, и его экран погашен. Android N расширяет возможности
+режима Doze, применяя частичный набор процессорных и сетевых ограничений
+в тех случаях, когда устройство находится не на зарядке, с погашенным экраном, но не обязательно неподвижно,
+например, когда оно находится в кармане пользователя.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>Рис. 1.</strong> Иллюстрация применения первого уровня ограничений активности системы в режиме Doze
+для экономии заряда аккумулятора.
+</p>
+
+<p>
+ Когда устройство питается от аккумулятора и его экран отключен в течение некоторого промежутка времени,
+устройство переходит в режим Doze и применяет первый частичный набор ограничений: закрывается доступ приложений
+к сети, откладывается выполнение заданий и синхронизации. Если устройство
+остается неподвижным в течение определенного времени после перехода в режим Doze, система применяет
+остальные ограничения Doze для {@link android.os.PowerManager.WakeLock},
+оповещений {@link android.app.AlarmManager}, сканирования GPS и Wi-Fi. Независимо от того, были применены
+все или только некоторые ограничения режима Doze, устройство периодически пробуждается на короткий промежуток времени,
+в течение которого приложениям разрешается сетевой доступ
+и выполнение отложенных заданий или синхронизации.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>Рис. 2.</strong> Иллюстрация применения второго уровня ограничений активности системы в режиме Doze
+после того, как устройство неподвижно в течение определенного времени.
+</p>
+
+<p>
+ Следует отметить, что включение экрана или подключение к источнику питания приводит
+к выходу устройства из режима Doze и
+снимает эти ограничения обработки. Эти дополнительные особенности поведения
+не влияют на советы и рекомендации по адаптации приложений к предыдущей
+версии режима Doze из Android 6.0 (уровень API 23), которые были рассмотрены в документе
+<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">Оптимизация для режима Doze и режима ожидания для приложений</a>.
+Вы должны следовать этим рекомендациям (например, использовать Google Cloud Messaging (GCM)
+для отправки и получения сообщений) и приступить к планированию обновлений для соответствия дополнительному поведению режима
+Doze.
+</p>
+
+
+<h3 id="bg-opt">Проект Svelte: оптимизация фоновых процессов</h3>
+
+<p>
+ В Android N удалены три неявных широковещательной рассылки с целью оптимизации
+потребления памяти и энергии. Причиной этого изменения стало то, что неявные
+широковещательные рассылки часто запускали приложения, которые прослушивали их в
+фоновом режиме. Удаление этих рассылок может существенно улучшить производительность устройства
+и работу интерфейса пользователя.
+</p>
+
+<p>
+ На мобильных устройствах часто могут происходить изменения подключения, например, при переключении
+между Wi-Fi и мобильным трафиком. Сейчас приложения могут следить за изменениями
+подключения, зарегистрировавшись в качестве получателя для неявных широковещательных рассылок {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} в своем манифесте.
+Поскольку для получения этих рассылок регистрируются многие приложения, каждое
+переключение сети может вызвать их активацию и одновременную обработку рассылки.
+
+</p>
+
+<p>
+ Подобным образом приложения могут регистрироваться для получения неявных широковещательных рассылок {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} и {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} от других приложений, например от камеры.
+Когда пользователь делает снимок с помощью приложения камеры, эти приложения активируются
+для обработки широковещательной рассылки.
+</p>
+
+<p>
+ Для устранения этих проблем Android N применяет следующие
+способы оптимизации.
+</p>
+
+<ul>
+ <li>Приложения для Android N не получают широковещательные рассылки {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION}, даже если в их манифесте
+указаны требования получения уведомлений об этих событиях. Приложения в активном режиме
+могут следить за событиями {@code CONNECTIVITY_CHANGE} в своем
+основном потоке, если они запрашивают уведомление через {@link
+ android.content.BroadcastReceiver}.
+ </li>
+
+ <li>Приложения не могут отправлять или получать широковещательные рассылки {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} и {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}. Эта оптимизация влияет на все приложения, включая те, которые не предназначены для Android N.
+
+ </li>
+</ul>
+
+<p>
+ В будущих выпусках Android могут быть отменены другие неявные широковещательные рассылки,
+а также отменена привязка некоторых фоновых служб. Поэтому следует избегать зависимостей
+(или удалить их) в виде объявленных в манифесте получателей неявных широковещательных рассылок
+или фоновых служб.
+</p>
+
+<p>
+ Платформа Android предоставляет несколько решений, позволяющих отказаться от таких
+неявных широковещательных рассылок или фоновых служб. Например, в API {@link
+ android.app.job.JobScheduler} реализован надежный механизм планирования сетевых операций,
+который запускается при выполнении определенных условий, например при подключении к безлимитной сети. Вы можете даже использовать {@link
+ android.app.job.JobScheduler}, чтобы реагировать на изменения поставщиков контента.
+
+</p>
+
+<p>
+ Дополнительная информация об этом изменении в работе системы и соответствующей
+адаптации приложений содержится в документе <a href="{@docRoot}preview/features/background-optimization.html">Оптимизация фоновых процессов</a>.
+
+</p>
+
+
+<h2 id="perm">Изменения разрешений</h2>
+
+<p>
+ В Android N внесены изменения разрешений, которые могут повлиять на ваше приложение,
+включая разрешения учетных записей пользователей и новое разрешение на запись
+во внешнем хранилище. Ниже приводится краткое описание разрешений, измененных в
+предварительной версии.
+</p>
+
+<ul>
+ <li>{@code GET_ACCOUNTS} (устарело)
+ <p>
+ Разрешение GET_ACCOUNTS теперь считается устаревшим. Система игнорирует это разрешение
+для приложений, разработанных для Android N.
+ </p>
+ </li>
+
+</ul>
+
+
+
+<h2 id="accessibility">Улучшенные специальные возможности</h2>
+
+<p>
+ В Android N внесены изменения, которые должны сделать платформу более удобной для пользователей
+со слабым или нарушенным зрением. Эти изменения в целом
+не требуют исправления кода вашего приложения, однако вам следует проверить их
+и протестировать на своем приложении, чтобы оценить их возможное влияние на интерфейс
+пользователя.
+</p>
+
+
+<h3 id="screen-zoom">Масштабирование экрана</h3>
+
+<p>
+ Android N позволяет пользователям установить параметр <strong>Display size</strong>, который увеличивает или уменьшает
+все элементы на экране, делая таким образом устройство более удобным
+для пользователей со слабым зрением. Пользователи не могут масштабировать экран до ширины менее
+<a href="http://developer.android.com/guide/topics/resources/providing-resources.html"> sw320dp</a> (ширина экрана Nexus 4, обычного телефона среднего размера).
+
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>Рис. 3.</strong> На экране справа показан эффект
+увеличения параметра Display size на устройстве под управлением Android N.
+</p>
+
+
+<p>
+ При изменении плотности экрана устройства система уведомляет запущенные приложения следующим способами.
+
+</p>
+
+<ul>
+ <li>Если приложение предназначено для API уровня 23 или ниже, система автоматически завершает
+все его фоновые процессы. Это означает, что если пользователь переходит из такого приложения
+на экран <em>Settings</em> и изменяет параметр
+<strong>Display size</strong>, то система завершает работу приложения таким же образом,
+как в случае нехватки памяти. Если у приложения имеются процессы, работающие в активном режиме,
+система уведомляет эти процессы об изменении конфигурации согласно описанию в документе
+<a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений
+в режиме выполнения</a>, как в случае изменения ориентации устройства.
+ </li>
+
+ <li>Если приложение разработано для Android N, все его процессы
+(активные и фоновые) уведомляются об изменении конфигурации, как это описано в документе
+<a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений в режиме выполнения</a>.
+
+ </li>
+</ul>
+
+<p>
+ Большинству приложений не требуются какие-либо изменения для поддержки этой возможности при условии,
+что эти приложения соответствуют рекомендациям по разработке для Android. Необходимо проверить следующие моменты.
+</p>
+
+<ul>
+ <li>Протестируйте свое приложение на устройстве с шириной экрана <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
+и убедитесь в его корректной работе.
+ </li>
+
+ <li>При изменении конфигурации устройства обновите в кэше все данные, зависящие от плотности экрана,
+такие как кэшированные растровые изображения или ресурсы, загруженные из сети.
+Проверьте изменения конфигурации, когда приложение возобновляет свою работу после паузы.
+
+ <p class="note">
+ <strong>Примечание.</strong> Если вы кэшируете данные, зависящие от конфигурации, рекомендуется
+добавить к ним релевантные метаданные, описывающие, например, подходящий размер экрана
+или плотность пикселей для этих данных. Эти метаданные помогут решить,
+нужно ли обновлять кэшированные данные после изменения конфигурации.
+
+ </p>
+ </li>
+
+ <li>Избегайте указания абсолютных размеров в пикселях, поскольку они не масштабируются вместе с изменением плотности экрана.
+Вместо этого указывайте размеры в <a href="{@docRoot}guide/practices/screens_support.html">независимых от плотности пикселях</a> (<code>dp</code>).
+
+ </li>
+</ul>
+
+<h3 id="vision-settings">Vision Settings в мастере настройки</h3>
+
+<p>
+ В Android N появились настройки Vision Settings на экране приветствия, где пользователи могут установить
+следующие параметры специальных возможностей на новом устройстве:
+<strong>Magnification gesture</strong>, <strong>Font size</strong>,
+<strong>Display size</strong> и <strong>TalkBack</strong>. В результате этого изменения
+становятся более заметными ошибки, связанные с различными настройками экрана. Чтобы
+оценить влияние этой функции, следует протестировать свое приложение, включив эти настройки
+на экране <strong>Settings >
+Accessibility</strong>.
+</p>
+
+<h2 id="ndk">Связь приложений NDK с библиотеками платформы</h2>
+
+<p>
+ В Android N внесены изменения пространства имен, предотвращающие загрузку закрытых API-интерфейсов.
+Если вы используете NDK, то вы должны использовать только открытые API-интерфейсы платформы Android.
+Использование закрытых API в следующем официальном выпуске Android
+может привести к ошибке и завершению работы приложения.
+</p>
+
+<p>
+ Чтобы предупредить вас об использовании закрытых API, приложения, запущенные на устройстве с Android N,
+создают сообщение об ошибке в журнале устройства (logcat) при вызове закрытого API.
+Эта ошибка также отображается на экране устройства в виде сообщения, информирующего о ситуации.
+Вам следует проверить код приложения, отказаться от применения
+закрытых API и тщательно протестировать приложение на
+тестовом устройстве или эмуляторе.
+</p>
+
+<p>
+ Если ваше приложение зависит от библиотек платформы, ознакомьтесь в документации NDK
+со стандартными способами замены общих закрытых API их открытыми эквивалентами.
+Вы можете ссылаться на библиотеки платформы, не замечая этого,
+особенно если ваше приложение использует библиотеку, которая является частью платформы (например,
+<code>libpng</code>), но не входит в состав NDK. В этом случае убедитесь, что ваш
+пакет APK содержит все файлы .so, на которые вы намеревались ссылаться.
+</p>
+
+<p class="caution">
+ <strong>Внимание!</strong> Некоторые сторонние библиотеки могут ссылаться на закрытые
+API. Приложение, использующее такие библиотеки, может завершиться с ошибкой при запуске в следующем
+официальном выпуске Android.
+</p>
+
+<p>
+ Приложения не должны зависеть от библиотек платформы (или использовать их), которые не входят в состав
+NDK, поскольку эти библиотеки могут изменяться или отсутствовать в разных выпусках Android.
+Примером такого изменения может служить переход от OpenSSL к BoringSSL.
+Разные устройства также могут обладать разными уровнями совместимости, поскольку
+для библиотек платформы, не включенных в
+NDK, отсутствуют требования к совместимости. Если вам необходимо обратиться к библиотекам не из состава NDK на более старых устройствах, эту загрузку следует
+сделать зависимой от уровня Android API.
+</p>
+
+<p>
+ Для помощи в диагностике проблем подобного рода ниже приведены несколько примеров ошибок Java и NDK,
+с которым вы можете столкнуться при создании приложения для Android N.
+</p>
+
+<p>Пример ошибки Java:</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>Пример ошибки NDK:</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ Ниже приведены некоторые стандартные способы устранения подобных ошибок в приложениях.
+</p>
+
+<ul>
+ <li>Использование getJavaVM и getJNIEnv из libandroid_runtime.so может быть заменено
+стандартными функциями JNI:
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>Использование символа {@code property_get} из {@code libcutils.so} может быть
+заменено открытой альтернативой {@code __system_property_get}.
+Для этого используйте {@code __system_property_get} со следующим включением include:
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>Использование символа {@code SSL_ctrl} из {@code libcrypto.so} должно быть заменено локальной версией.
+Например, вы должны статически связать
+{@code libcyrpto.a} в своем файле {@code .so} или динамически включить в свое приложение собственную библиотеку
+{@code libcrypto.so} из BoringSSL или OpenSSL.
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N содержит изменения для приложений, предназначенных для Android for Work, включая изменения установки сертификата,
+сброса пароля, управления вторичным пользователем,
+и доступа к идентификаторам устройства. Если вы создаете приложение для среды
+Android for Work, вам следует ознакомиться с этими изменениями и откорректировать
+приложение соответствующим образом.
+</p>
+
+<ul>
+ <li>Вы должны установить делегированный установщик сертификатов, прежде чем DPC сможет его настроить.
+ Для приложений владельца профиля и устройства, разработанных под N SDK, необходимо установить
+ делегированный установщик сертификатов, прежде чем контроллер политик устройства
+(DPC) вызовет метод
+<code>DevicePolicyManager.setCertInstallerPackage()</code>. В случае отсутствия установщика
+система выдаст ошибку
+<code>IllegalArgumentException</code>.
+ </li>
+
+ <li>Ограничения сброса пароля для администраторов устройства теперь применяются для владельцев
+профиля. Администраторы устройства более не могут использовать
+<code>DevicePolicyManager.resetPassword()</code> для сброса или изменения
+установленных паролей. Администраторы по-прежнему могут установить пароль, но только тогда, когда для устройства не установлен
+пароль, PIN-код или графический шаблон.
+ </li>
+
+ <li>Владельцы устройства и профиля могут управлять учетными записями даже при наличии ограничений.
+Они могут вызывать API-интерфейсы управления учетными записями
+даже при установленных ограничениях пользователя <code>DISALLOW_MODIFY_ACCOUNTS</code>.
+ </li>
+
+ <li>Владельцам устройства стало проще управлять дополнительными пользователями. Когда устройство
+находится в режиме владельца устройства, автоматически включается ограничение <code>DISALLOW_ADD_USER</code>.
+Это предотвращает создание неуправляемых дополнительных пользователей.
+Кроме того, прекращено использование методов <code>CreateUser()</code> и
+<code>createAndInitial()</code>, которые заменены новым методом
+<code>DevicePolicyManager.createAndManageUser()</code>.
+ </li>
+
+ <li>Владельцы устройства получили доступ к идентификаторам устройства. Владелец устройства может получить MAC-адрес
+Wi-Fi для устройства, используя метод
+<code>DevicePolicyManagewr.getWifiMacAddress()</code>. Если интерфейс Wi-Fi никогда не включался
+на устройстве, этот метод возвращает значение {@code null}.
+ </li>
+</ul>
+
+<p>
+ Дополнительная информация об изменениях Android for Work в Android N содержится в документе
+<a href="{@docRoot}preview/features/afw.html">Обновления Android for Work</a>.
+</p>
+
+<h2 id="other">Другие важные моменты</h2>
+
+<ul>
+<li>Процесс приложения, запущенного под Android N, но разработанного для API более низкого уровня,
+завершается, если пользователь изменяет размер экрана. Приложение
+должно корректно обработать такой сценарий. В противном случае оно завершится с ошибкой, если пользователь
+запустит его с экрана последних задач.
+
+<p>
+Вы должны протестировать свое приложение и убедиться,
+что оно не будет работать подобным образом.
+Для этого можно вызвать аналогичную ошибку,
+принудительно завершив процесс приложения через DDMS.
+</p>
+
+<p>
+Приложения для N и последующих версий Android не завершаются автоматически при изменении плотности экрана,
+однако они могут плохо реагировать на изменения конфигурации.
+</p>
+</li>
+
+<li>
+Приложения для Android N должны уметь корректно обрабатывать изменения конфигурации
+и не должны завершаться с ошибкой при последующих запусках. Вы можете проверить поведение приложения,
+изменив размер шрифта (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>) и перезапустив затем приложение
+с экрана последних задач.
+</li>
+</ul>
+
diff --git a/docs/html-intl/intl/ru/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/ru/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..d1dcdb7
--- /dev/null
+++ b/docs/html-intl/intl/ru/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=Примеры
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ Следующие примеры кода представлены для Android N. Чтобы
+загрузить примеры в Android Studio, выберите в меню <b>File > Import
+Samples</b>.
+</p>
+
+<p class="note">
+ <strong>Примечание.</strong> Эти загружаемые проекты предназначены для
+использования с Gradle и Android Studio.
+</p>
+
+
+<h3 id="mw">Многооконный режим</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ В данном примере показаны преимущества многооконного
+интерфейса для вашего приложения.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+Загрузить с сайта GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">Активные уведомления</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ В этом ранее созданном примере показана простая служба, которая отправляет
+уведомления с помощью NotificationCompat. Каждое непрочитанное сообщение от пользователя
+отправляется отдельным уведомлением.
+</p>
+<p>
+ Этот пример был обновлен с использованием новых функций уведомлений,
+доступных в Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+Загрузить с сайта GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">Служба сообщений</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ В этом предварительно созданном примере показано, как использовать
+NotificationManager для определения количества уведомлений,
+отображаемого приложением.
+</p>
+<p>
+ Этот пример был обновлен с использованием новых функций уведомлений,
+доступных в Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+Загрузить с сайта GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">Режим Direct Boot</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ В данном примере показано как сохранять и считывать данные в зашифрованном
+хранилище, которое всегда доступно только на загруженном устройстве.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+Загрузить с сайта GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">Доступ к выделенным каталогам</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ В данном примере показано, как выполнять чтение и запись данных из определенных
+каталогов при уменьшении числа требуемых разрешений.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+Загрузить с сайта GitHub</a>
+</p>
diff --git a/docs/html-intl/intl/ru/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/ru/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..24a93a8
--- /dev/null
+++ b/docs/html-intl/intl/ru/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,676 @@
+page.title=Android N для разработчиков
+meta.tags="предварительная версия", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>Основные возможности для разработчиков</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">Поддержка многооконного режима</a></li>
+ <li><a href="#notification_enhancements">Уведомления</a></li>
+ <li><a href="#jit_aot">Динамическая/предварительная компиляция</a></li>
+ <li><a href="#quick_path_to_app_install">Быстрый способ установки приложения</a></li>
+ <li><a href="#doze_on_the_go">Сон на ходу: режим Doze</a></li>
+ <li><a href="#background_optimizations">Оптимизация фоновых процессов</a></li>
+ <li><a href="#data_saver">Экономия трафика</a></li>
+ <li><a href="#tile_api">API панели быстрых настроек</a></li>
+ <li><a href="#number-blocking">Блокировка номеров</a></li>
+ <li><a href="#call_screening">Фильтрация вызовов</a></li>
+ <li><a href="#multi-locale_languages">Языки и языковые настройки</a></li>
+ <li><a href="#icu4">API-интерфейсы ICU4J в Android</a></li>
+ <li><a href="#gles_32">API OpenGL ES 3.2</a></li>
+ <li><a href="#android_tv_recording">Запись Android TV</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">Специальные возможности</a></li>
+ <li><a href="#direct_boot">Режим Direct Boot</a></li>
+ <li><a href="#key_attestation">Аттестация ключей</a></li>
+ <li><a href="#network_security_config">Конфигурация сетевой безопасности</a></li>
+ <li><a href="#default_trusted_ca">Доверенный центр сертификации по умолчанию</a></li>
+ <li><a href="apk_signature_v2">Схема получения подписи APK, версия 2</a></li>
+ <li><a href="#scoped_directory_access">Доступ к выделенным каталогам</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Система Android N еще находится в активной стадии разработки, но ее уже можно опробовать в виде предварительной версии
+N Developer Preview. В следующих разделах рассматриваются некоторые из
+ ее новых возможностей для разработчиков. </p>
+
+<p>
+ Обязательно изучите раздел <a href="{@docRoot}preview/behavior-changes.html">Изменения в работе</a>, в котором описаны
+изменения платформы, способные повлиять на работу приложений, ознакомьтесь более подробно с основными возможностями
+в руководствах для разработчиков и загрузите <a href="{@docRoot}preview/setup-sdk.html#docs-dl">справочник по API</a> с подробным описанием новых
+API-интерфейсов.
+</p>
+
+<h2 id="multi-window_support">Поддержка многооконного режима</h2>
+
+
+<p>В Android N представлена новая долгожданная функция многозадачности
+– многооконный режим. </p>
+
+ <p>Теперь пользователи смогут открывать на экране два приложения одновременно. </p>
+ <ul>
+ <li>На телефонах и планшетах под управлением
+Android N пользователи могут запустить два приложения рядом или друг над другом
+в режиме разделенного экрана. Размеры окон приложений можно изменить с помощью
+разделителя между ними. </li>
+
+<li>На устройствах Android TV для приложений будет доступен <a href="{@docRoot}preview/features/picture-in-picture.html">режим
+"картинка в картинке"</a>, который позволит приложению отображать контент, пока пользователь просматривает другие приложения или
+взаимодействует с ними. Более подробная информация приведена ниже. </li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>Рис. 1.</strong> Приложения в режиме разделенного экрана.
+</p>
+ </div>
+
+<p>Поддержка многооконного режима открывает новые возможности привлечения пользователей,
+особенно на планшетах и других устройствах с большим размером экрана. Вы можете даже включить в своем приложении функцию перетаскивания
+для удобного перемещения контента между приложениями – отличный
+способ улучшить пользовательский интерфейс. </p>
+
+<p>Вы можете легко добавить поддержку многооконного режима в свое приложение и настроить его
+работу с окнами экрана. Например, вы можете определить минимальные допустимые размеры,
+до которых пользователи могут уменьшить окно приложения.
+Вы можете также отключить многооконный режим для своего приложения, чтобы
+система отображала его только в полноэкранном режиме.</p>
+
+<p>
+ Дополнительная информация содержится в документе для разработчиков <a href="{@docRoot}preview/features/multi-window.html">Поддержка многооконного режима</a>.
+
+</p>
+
+<h2 id="notification_enhancements">Новые возможности уведомлений</h2>
+
+<p>В Android N изменен дизайн уведомлений, которые стали проще и удобнее.
+Ниже приведены некоторые изменения.</p>
+
+<ul>
+ <li>
+ <strong>Обновления шаблонов</strong>. В новых шаблонах уведомлений
+сделан акцент на изображении и аватаре контакта. Разработчики смогут
+использовать новые шаблоны с минимальными изменениями своего кода.
+ </li>
+
+ <li>
+ <strong>Группы уведомлений</strong>. Система может группировать уведомления,
+например по теме сообщений, и отображать группу. Пользователь может применять к группам
+действия, например, закрывать их или архивировать. Если вы ранее выполняли реализацию
+уведомлений для Android Wear, то вам уже должна быть знакома эта
+модель.
+ </li>
+
+ <li>
+ <strong>Непосредственный ответ в уведомлении</strong>.
+Android теперь поддерживает функцию внутренних ответов в приложениях для общения в режиме реального времени. Это позволяет быстро ответить на
+СМС или текстовое сообщение непосредственно в интерфейсе уведомления.
+ </li>
+
+ <li>
+ <strong>Собственные представления</strong>. Два новых API-интерфейса позволяют применять системные элементы,
+такие как заголовки и действия уведомлений, при использовании собственных представлений в
+уведомлениях.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>Рис. 2.</strong> Группы уведомлений и непосредственный ответ.
+</p>
+
+<p>Способы реализации новых возможностей описаны в руководстве
+<a href="{@docRoot}preview/features/notification-updates.html">Уведомления</a>.
+</p>
+
+
+
+<h2 id="jit_aot">Профильная динамическая/предварительная компиляция</h2>
+
+<p>В Android N добавлен динамический (JIT) компилятор с профилированием кода для среды
+ART, который позволяет постоянно улучшать производительность приложений Android во время их работы.
+JIT-компилятор дополняет текущий предварительный (AOT) компилятор ART
+и помогает повысить производительность, сократить потребление памяти, а также ускорить обновления приложений и системы.
+</p>
+
+<p>Профильная компиляция позволяет ART управлять AOT/JIT-компиляцией каждого приложения
+в соответствии с его фактическим использованием и характеристиками устройства. Например,
+ART ведет профиль часто используемых методов каждого приложения, которые она может предварительно скомпилировать
+и кэшировать для оптимальной производительности. Компиляция остальных частей приложения откладывается до того момента,
+когда они действительно понадобятся.</p>
+
+<p>Кроме повышения производительности основных частей приложения профильная
+компиляция помогает сократить общее использование оперативной памяти приложением, в том числе связанными двоичными файлами.
+Эта возможность особенно важна для устройств с небольшим объемом памяти.</p>
+
+<p>ART управляет профильной компиляцией с минимальным потреблением заряда
+аккумулятора. Предварительная компиляция выполняется только тогда, когда устройство неактивно
+и находится на зарядке, поэтому заблаговременное выполнение этой работы экономит время и энергию.</p>
+
+<h2 id="quick_path_to_app_install">Быстрый способ установки приложения</h2>
+
+<p>Одним из наиболее ощутимых преимуществ JIT-компилятора ART является скорость установки приложений
+и обновлений системы. Даже большие приложения, требовавшие нескольких минут для своей оптимизации и установки на
+Android 6.0 , теперь могут быть установлены за секунды.
+ Обновления системы также выполняются быстрее, поскольку стадия оптимизации теперь отсутствует. </p>
+
+<h2 id="doze_on_the_go">Сон на ходу: режим Doze</h2>
+
+<p>В Android 6.0 был введен системный режим Doze для экономии заряда аккумулятора. В этом режиме
+выполнение процессорных и сетевых операций приложений откладывается, когда устройство не используется и неподвижно – например, лежит на столе или в ящике.
+ </p>
+
+<p>В Android N режим Doze сделал шаг вперед и экономит заряд аккумулятора на ходу.
+Каждый раз, когда экран выключается на определенный промежуток времени и устройство не заряжается,
+Doze применяет частичный набор знакомых ограничений процессорной и сетевой активности приложений.
+Это означает, что пользователи могут экономить заряд аккумулятора, даже когда их устройство лежит в кармане.
+</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>Рис. 3.</strong> Режим Doze теперь применяет
+энергосберегающие ограничения, даже когда устройство находится в движении.
+</p>
+
+
+<p>Вскоре после блокировки экрана, когда устройство питается от аккумулятора, режим Doze
+ограничивает сетевой доступ и откладывает выполнение заданий и синхронизации. В течение коротких периодов пробуждения
+для приложений открывается доступ к сети и разрешается выполнение отложенных
+заданий и операций синхронизации. Включение экрана или подключение к источнику питания выводит
+устройство из режима Doze.</p>
+
+<p>Если устройство снова остается неподвижным в течение определенного периода времени (с погашенным экраном и питанием от аккумулятора),
+Doze применяет полный набор процессорных и сетевых ограничений к {@link
+android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} оповещениям и сканированию
+GPS/Wi-Fi.</p>
+
+<p>Рекомендации по адаптации приложения для режима Doze не зависят от того, двигается устройство или нет,
+поэтому если вы уже обновили свое приложение для оптимальной работы
+в режиме Doze, то все уже готово. Если нет, начните <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">адаптацию
+приложения для режима Doze</a> прямо сейчас.</p>
+
+<h2 id="background_optimizations">Проект Svelte: оптимизация фоновых процессов</h2>
+
+<p>Продолжено развитие проекта Svelte, нацеленного на сокращение использования оперативной памяти системой и приложениями
+в различных устройствах экосистемы Android. В Android N проект
+Svelte уделяет особое внимание оптимизации работы приложений в фоновом режиме. </p>
+
+<p>Работа в фоновом режиме является важной частью большинства приложений. Организация ее надлежащим образом
+может сделать интерфейс пользователя быстрым, отзывчивым и контекстно-зависимым.
+В противном случае фоновая обработка может напрасно потреблять оперативную память (и
+заряд аккумулятора) и негативно влиять на производительность других приложений. </p>
+
+<p>Начиная с Android 5.0, предпочтительным и оптимальным для пользователей способом выполнения фоновых операций стало использование планировщика {@link android.app.job.JobScheduler}.
+Приложения могут планировать свои задания, позволяя системе оптимизировать их на основе состояния памяти,
+питания и сетевого соединения. Планировщик JobScheduler прост в использовании и обеспечивает необходимый контроль,
+поэтому он рекомендуется для применения во всех приложениях.
+ </p>
+
+<p>
+ Другим хорошим вариантом является планировщик <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+<code>GCMNetworkManager</code></a> в составе служб Google Play, который
+предлагает аналогичные возможности планирования заданий и совместимость с прежними версиями
+Android.
+</p>
+
+<p>Мы продолжаем расширять область применения планировщиков <code>JobScheduler</code> и
+<code>GCMNetworkManager</code>.
+Например, в Android N теперь можно планировать фоновую обработку на основании
+изменений поставщиков контента. В то же время мы начинаем исключать некоторые
+устаревшие шаблоны, которые могут ухудшить производительность системы,
+особенно на устройствах с малым объемом памяти.</p>
+
+<p>В Android N удалены три часто используемые неявные рассылки —
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+android.hardware.Camera#ACTION_NEW_PICTURE} и {@link
+android.hardware.Camera#ACTION_NEW_VIDEO}, — поскольку они могут пробудить
+фоновые процессы сразу нескольких приложений, повысив потребление памяти и заряда аккумулятора. Если
+ваше приложение получает эти рассылки, используйте преимущество N Developer Preview для миграции на
+<code>JobScheduler</code> и связанные с ним API-интерфейсы. </p>
+
+<p>
+ Дополнительная информация содержится в документе <a href="{@docRoot}preview/features/background-optimization.html">Оптимизация
+фоновых процессов</a>.
+</p>
+
+
+<h2 id="data_saver">Экономия трафика</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>Рис. 4.</strong> Настройка экономии трафика.
+</p>
+ </div>
+
+<p>В течение срока эксплуатации мобильного устройства стоимость сотового трафика обычно
+превышает стоимость самого устройства. Для многих пользователей сотовый трафик является
+весьма дорогим ресурсом, который они хотели бы сэкономить. </p>
+
+<p>В Android N появился режим экономии трафика – новая системная служба, которая помогает сократить
+использование сотового трафика приложениями в роуминге, в конце периода тарификации
+или для небольших предоплаченных пакетов трафика. Режим экономии трафика дает пользователям возможность контроля использования сотового трафика приложениями
+и позволяет разработчикам повысить эффективность работы служб.
+ </p>
+
+<p>Когда пользователь включает экономию трафика в панели <strong>Settings</strong> и устройство подключено к тарифицируемой сети,
+ система блокирует использование фонового трафика и сигнализирует приложениям
+о необходимости сократить по возможности использование трафика в активном режиме, например: ограничить скорость передачи данных
+потокового вещания, уменьшить качество изображений, отложить оптимистичное предварительное кэширование
+и т.д. Пользователи могут поместить определенные приложения в белый список, разрешив им тарифицируемую фоновую передачу данных
+даже при включенном режиме экономии трафика.</p>
+
+<p>Android N расширяет применение класса {@link android.net.ConnectivityManager}, позволяя приложениям
+<a href="{@docRoot}preview/features/data-saver.html#status">выяснять пользовательские настройки
+экономии трафика</a> и <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">отслеживать
+изменения этих настроек</a>. Все приложения должны проверять, был ли включен режим экономии трафика,
+и пытаться ограничить использование трафика в фоновом и активном режимах.</p>
+
+
+<h2 id="tile_api">API панели быстрых настроек</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>Рис. 5.</strong> Плитки быстрых настроек в панели уведомлений.
+</p>
+
+
+ </div><p>Быстрые настройки являются простым и популярным способом доступа к основным настройкам и действиям
+непосредственно из панели уведомлений. В Android N возможности быстрых настроек
+были расширены – они стали еще более полезными и удобными. </p>
+
+<p>Добавлено пространство для дополнительных плиток быстрых настроек, к которым можно
+обратиться с разбитой на страницы области экрана, проведя пальцем влево или вправо. Пользователи
+также могут контролировать состав и место отображения этих элементов – их можно добавлять или двигать обычным перетаскиванием.
+ </p>
+
+<p>Для разработчиков Android N также предлагает новый API, который позволяет определить собственные плитки
+быстрых настроек для удобного доступа пользователей к основным элементам управления и действиям вашего приложения.</p>
+
+<p>
+ Плитки быстрых настроек резервируются для элементов управления или действий, которые либо требуются срочно,
+ либо часто используются. Их не следует использовать в качестве ярлыков
+для запуска приложений.
+</p>
+
+<p>
+ После определения плитки можно показать пользователям, которые смогут добавить их на
+панель быстрых настроек обычным перетаскиванием.
+</p>
+
+<p>
+ Дополнительную информацию о создании плиток приложений можно найти в описании
+<code>android.service.quicksettings.Tile</code> в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.
+</p>
+
+
+
+<h2 id="number-blocking">Блокировка номеров</h2>
+
+<p>Платформа Android N теперь поддерживает блокировку номеров и предоставляет
+API-интерфейс платформы, который позволяет поставщикам услуг вести список блокируемых номеров. Этот список доступен для чтения и записи стандартным приложениям
+для СМС, звонков и приложениям поставщика.
+Для других приложений это список недоступен.</p>
+
+<p>Сделав блокировку номеров стандартной функцией платформы, Android предоставляет приложениям
+единообразный способ поддержки блокировки номеров на разных устройствах.
+Приложения также получают следующие преимущества:</p>
+
+<ul>
+ <li> Номера, блокируемые при вызовах, также блокируются в текстовых сообщениях.
+ <li> Заблокированные номера могут быть сохранены при переустановках и переносах на другие устройства с помощью функции резервного копирования и восстановления.
+
+ <li> Разные приложения могут использовать один и тот же список блокируемых номеров.
+</ul>
+
+<p>Кроме того, возможность интеграции приложения оператора мобильной сети в Android означает, что операторы могут
+читать список блокируемых номеров на устройстве и выполнять блокировку для пользователя на своей стороне,
+предотвращая доставку пользователю нежелательных вызовов и текстовых сообщений через какого-либо посредника,
+например, через конечную точку VOIP или переадресацию звонков.</p>
+
+<p>
+ Дополнительную информацию можно найти в описании <code>android.provider.BlockedNumberContract</code>
+в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.
+
+</p>
+
+<h2 id="call_screening">Фильтрация вызовов</h2>
+
+<p>
+ Android N дает возможность стандартному приложению для звонков фильтровать входящие вызовы. Для этого
+в приложении для звонков реализована новая служба <code>CallScreeningService</code>,
+которая позволяет приложению выполнять ряд действий на основании
+{@link android.telecom.Call.Details Call.Details} входящего вызова, например:
+</p>
+
+<ul>
+ <li> отклонить входящий вызов;
+ <li> не регистрировать вызов в журнале вызовов;
+ <li> не показывать пользователю уведомление о вызове.
+</ul>
+
+<p>
+ Дополнительную информацию можно найти в описании <code>android.telecom.CallScreeningService</code>
+в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.
+
+</p>
+
+
+<h2 id="multi-locale_languages">Поддержка нескольких языковых настроек, дополнительные языки</h2>
+
+
+<p>Android N теперь позволяет пользователям выбрать <strong>несколько языковых настроек</strong>
+для улучшенной поддержки случаев двуязычного применения. Приложения могут использовать
+новый API для получения выбранных пользователем языковых настроек и затем предоставлять более сложные
+интерфейсы для многоязычных пользователей, например: показывать результаты поиска
+на нескольких языках; не предлагать перевод веб-страниц с того языка, который уже знаком пользователю.
+</p>
+
+<p>Вместе с поддержкой нескольких языковых настроек Android N также расширяет список доступных языков.
+Для каждого распространенного
+языка, такого как английский, испанский, французский и арабский, предлагается более 25 вариантов. Также добавлена частичная
+поддержка более 100 новых языков.</p>
+
+<p>Приложения могут получить список языковых настроек, установленных пользователем, вызвав метод <code>LocaleList.GetDefault()</code>. Для поддержки расширенного количества языковых настроек в Android N изменен способ
+разрешения ресурсов. Вам следует обязательно проверить и убедиться в том,
+что ваши приложения работают надлежащим образом с новой логикой разрешения ресурсов.</p>
+
+<p>Дополнительная информация о новом способе разрешения ресурсов и соответствующие рекомендации содержатся
+в документе <a href="{@docRoot}preview/features/multilingual-support.html">Поддержка нескольких языков</a>.</p>
+
+<h2 id="icu4">API-интерфейсы ICU4J в Android</h2>
+
+<p>
+ Платформа Android N теперь предлагает частичный набор API-интерфейсов <a href="http://site.icu-project.org/">ICU4J</a> в
+пакете <code>android.icu</code>. Миграция выполняется легко и в основном заключается
+в простом изменении пространства имен с <code>com.java.icu</code> на
+<code>android.icu</code>. Если вы уже используете пакет ICU4J в своих приложениях,
+переход на API-интерфейсы <code>android.icu</code>, предоставленные платформой Android,
+может существенно сократить размер пакетов APK.
+</p>
+
+<p>
+ Дополнительные сведения по Android ICU4J API содержатся в документе <a href="{@docRoot}preview/features/icu4j-framework.html">Поддержка ICU4J</a>.
+</p>
+
+
+
+<h2 id="gles_32">API OpenGL™ ES 3.2</h2>
+
+<p>В платформу Android N добавлены интерфейсы и поддержка OpenGL ES 3.2, включая следующие возможности.</p>
+
+<ul>
+ <li> Все расширения из <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Android Extension Pack</a></a> (AEP) кроме <code>EXT_texture_sRGB_decode</code>.
+ <li> Кадровые буферы с плавающей запятой для HDR и отложенного затенения.
+ <li> Вызовы отрисовки BaseVertex для улучшения пакетной обработки и потоковой передачи данных.
+ <li> Эффективный контроль обращений к буферу для сокращения служебных операций WebGL.
+</ul>
+
+<p>API-интерфейс платформы для OpenGL ES 3.2 в Android N предоставляется классом
+<code>GLES32</code>. При использовании OpenGL ES 3.2 обязательно следует объявить требование
+в файле манифеста с помощью тега <code><uses-feature></code> и атрибута
+<code>android:glEsVersion</code>. </p>
+
+<p>Для получения дополнительных сведений об использовании OpenGL ES, включая
+определение версии, поддерживаемой устройством, см. <a href="{@docRoot}guide/topics/graphics/opengl.html">Руководство по API OpenGL ES</a>.</p>
+
+
+<h2 id="android_tv_recording">Запись Android TV</h2>
+
+<p>В Android N добавлена возможность записи и воспроизведения контента из служб Android TV
+через новые API-интерфейсы записи. Службы телевидения на основе существующих API
+с временным сдвигом могут контролировать выбор данных телеканала для записи, сохранение
+сеансов записи и управлять взаимодействием пользователя с записанным контентом. </p>
+
+<p>Дополнительная информация содержится в документе <a href="{@docRoot}preview/features/tv-recording-api.html">API-интерфейсы записи Android TV</a>.</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>В Android for Work добавлены много новых возможностей и API-интерфейсов для устройств под управлением Android N.
+Некоторые из них приведены ниже. Полный список обновлений Android for Work, касающихся
+Android N, содержится в списке изменений Android for Work.</p>
+
+<h3 id="work_profile_security_challenge">Пароль безопасности для рабочего профиля </h3>
+
+<p>
+ Владельцы профиля могут установить отдельный пароль безопасности для приложений, запускаемых в рабочем профиле.
+Когда пользователь пытается открыть любые рабочие
+приложения, выводится запрос пароля. Успешный ввод пароля снимает блокировку рабочего профиля
+и, при необходимости, дешифрует его. Владельцы профиля
+могут отправить пользователю запрос <code>ACTION_SET_NEW_PASSWORD</code>, предлагающий установить рабочий пароль,
+ или запрос <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code>, предлагающий установить пароль блокировки устройства.
+
+</p>
+
+<p>
+ Владельцы профиля могут устанавливать различные политики паролей для рабочей проверки безопасности
+(например, длину PIN-кода, возможность использования отпечатка пальца
+для разблокировки профиля) с помощью <code>setPasswordQuality()</code>,
+<code>setPasswordMinimumLength()</code> и других связанных методов. Владелец
+профиля может также установить блокировку устройства с помощью экземпляра <code>DevicePolicyManager</code>,
+возвращаемого новым методом <code>getParentProfileInstance()</code>.
+Кроме того, владельцы профиля могут настроить экран учетных данных для рабочей проверки безопасности
+с помощью новых методов <code>setOrganizationColor()</code> и
+<code>setOrganizationName()</code>.
+</p>
+<h3 id="turn_off_work">Выключение рабочего режима </h3>
+
+<p>Пользователи устройства с рабочим профилем могут переключать рабочий режим. Когда рабочий режим
+выключен, управляемый им пользователь временно выходит из системы, что отключает приложения рабочего профиля,
+фоновую синхронизацию и уведомления. Также отключается приложение владельца профиля.
+При выключенном рабочем режиме система отображает постоянный значок состояния,
+напоминая пользователю о том, что он не может запустить рабочие приложения. Средство запуска при этом указывает,
+что рабочие приложения и виджеты недоступны. </p>
+
+<h3 id="always_on_vpn">Постоянное подключение к VPN </h3>
+
+<p>Владельцы устройства и профиля могут обеспечить постоянное подключение рабочих приложений через указанную сеть
+VPN. Система автоматически подключается к этой VPN после загрузки устройства.
+</p>
+
+<p>
+ Для этого в интерфейсе <code>DevicePolicyManager</code> используются новые методы
+<code>setAlwaysOnVpnPackage()</code> и
+<code>getAlwaysOnVpnPackage()</code>.
+</p>
+
+<p>Поскольку привязка служб VPN может быть выполнена непосредственно системой без взаимодействия с приложениями,
+клиентам VPN требуется обрабатывать новые точки доступа для постоянного подключения к VPN. Как и раньше,
+службы для системы указываются фильтром намерений, соответствующим действию
+<code>android.net.VpnService</code>. </p>
+
+<p>
+ Пользователи могут вручную установить клиентов постоянного подключения к VPN, реализующих методы
+<code>VPNService</code>, на экране настроек основного пользователя
+<strong>Settings>More>Vpn</strong>.
+</p>
+
+<h2 id="accessibility_enhancements">Расширение специальных возможностей</h2>
+
+<p>Android N теперь предлагает настройки Vision Settings непосредственно на экране приветствия при начальной установке нового устройства.
+Это значительно упрощает пользователям обнаружение и настройку на своих устройствах
+специальных возможностей, включая жесты увеличения, размер шрифта, размер экрана и
+функцию TalkBack. </p>
+
+<p>Благодаря более приметному расположению этих настроек пользователи
+чаще будут пробовать ваше приложение с включенными специальными возможностями. Обязательно протестируйте ваше приложение с этими настройками,
+включив их на экране Settings >
+Accessibility.</p>
+
+<p>Также в Android N предусмотрены службы специальных возможностей которые помогут пользователям с нарушениями двигательных функций
+касаться экрана. Новый API позволяет встроить в службы такие
+возможности, как отслеживание лица, отслеживание взгляда, сканирование точек и другой функционал, соответствующий потребностям
+этих пользователей.</p>
+
+<p>Дополнительную информацию можно найти в описании <code>android.accessibilityservice.GestureDescription</code>
+ в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.</p>
+
+
+<h2 id="direct_boot">Режим Direct Boot</h2>
+
+<p>Режим Direct Boot ускоряет загрузку устройства и позволяет зарегистрированным приложениям
+сохранить ограниченную функциональность даже после непредвиденной перезагрузки.
+Например, если зашифрованное устройство перезагрузится, когда пользователь спит,
+уведомления о зарегистрированных предупреждениях, сообщениях и входящих вызовах будут поступать пользователю, как в обычном режиме.
+Это также означает, что специальные возможности могут быть доступны сразу после перезагрузки.
+</p>
+
+<p>Режим Direct Boot использует преимущество шифрования на уровне файлов в Android N
+для применения детализированных политик шифрования к данным системы и приложений.
+Система использует хранилище, зашифрованное на уровне устройства, для выбранных системных данных и данных из явным образом зарегистрированных приложений.
+По умолчанию для всех остальных системных данных, пользовательских данных, приложений и
+данных приложений используется хранилище, зашифрованное на уровне учетной записи. </p>
+
+<p>При загрузке система запускается в ограниченном режиме с доступом к данным, зашифрованным
+на уровне устройства, и без общего доступа к приложениям и данным.
+Если у вас есть компоненты, которые должны быть запущены в этом режиме, их можно зарегистрировать,
+установив соответствующий флаг в манифесте. После перезагрузки система активирует зарегистрированные
+компоненты с помощью рассылки намерения <code>LOCKED_BOOT_COMPLETED</code>.
+ Система обеспечивает доступность зарегистрированных данных приложений, зашифрованных на уровне устройства,
+до разблокировки экрана. Все остальные данные остаются недоступными, пока пользователь не подтвердит свои учетную информацию на экране блокировки,
+после чего данные будут расшифрованы. </p>
+
+Дополнительная информация приведена в документе <a href="{@docRoot}preview/features/direct-boot.html">Direct Boot</a>.</p>
+</p>
+
+
+<h2 id="key_attestation">Аттестация ключей</h2>
+
+<p>Аппаратные хранилища ключей обеспечивают безопасный метод создания, хранения,
+и использования криптографических ключей на устройствах Android. Они защищают ключи от
+ядра Linux, потенциальных уязвимостей Android и извлечения из устройств
+с корневым доступом.</p>
+
+<p>Чтобы упростить и повысить безопасность использования аппаратных хранилищ ключей
+в Android N введена возможность аттестации ключей. Приложения и внешние хранилища ключей могут использовать аттестацию,
+чтобы определить, является ли пара ключей RSA или EC
+аппаратной, какие свойства имеет эта пара ключей и какие ограничения применяются
+к ее использованию и сроку действия. </p>
+
+<p>Приложения и службы внешних хранилищ могут запросить информацию о паре ключей
+через сертификат аттестации X.509, который должен быть подписан действительным ключом
+аттестации. Ключ аттестации представляет собой ключ подписи ECDSA, который
+встраивается в аппаратное хранилище ключей устройства при его изготовлении на заводе.
+Поэтому сертификат аттестации, подписанный действительным ключом аттестации,
+подтверждает существование аппаратного хранилища ключей вместе со сведениями о парах ключей в таком хранилище.
+</p>
+
+<p>Чтобы убедиться в том, что устройство использует безопасный официальный заводской образ Android,
+для аттестации ключей требуется предоставление <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">загрузчиком</a> устройства
+следующей информации о <a class="external-link" href="https://source.android.com/security/trusty/index.html">доверенной
+среде выполнения (TEE)</a>:</p>
+
+<ul>
+<li>версия ОС и исправлений, установленных на устройстве;</li>
+<li>открытый ключ <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">подтвержденной загрузки</a> и состояние блокировки.</li>
+ </ul>
+
+<p>Дополнительная информация об аппаратном хранилище ключей содержится
+в соответствующем <a href="https://source.android.com/security/keystore/" class="external-link">руководстве</a>.</p>
+
+<p>В дополнение к аттестации ключей в Android N также добавлены ключи,
+привязанные к отпечаткам пальцев, которые не отменяются при регистрации новых отпечатков.</p>
+
+<h2 id="network_security_config">Конфигурация сетевой безопасности</h2>
+
+<p>В Android N приложения могут безопасно настраивать поведение своих защищенных (HTTPS, TLS)
+подключений, без каких-либо изменений кода, используя декларативную
+<em>конфигурацию сетевой безопасности</em> вместо обычных ненадежных
+программных API-интерфейсов (например, X509TrustManager).</p>
+
+ <p>Поддерживаемые возможности:</p>
+<ul>
+<li><b>Пользовательские якоря доверия.</b> Позволяют приложению определить доверенные
+центры сертификации (ЦС) для его защищенных соединений. Например,
+приложение может доверять определенным самозаверенным сертификатам или ограниченному набору общих ЦС.
+</li>
+<li><b>Замена при отладке.</b> Позволяет разработчику безопасно отладить
+защищенные соединения своего приложения без дополнительного риска для установленной базы.
+
+</li>
+<li><b>Отказ от передачи данных открытым текстом.</b> Позволяет приложению защитить себя от
+случайной передачи данных открытым текстом.</li>
+<li><b>Прикрепление сертификатов.</b> Дополнительная возможность, позволяющая приложению
+ограничить доверенные ключи сервера для защищенных соединений.</li>
+</ul>
+
+<p>Дополнительная информация содержится в документе <a href="{@docRoot}preview/features/security-config.html">Конфигурация сетевой безопасности</a>.
+</p>
+
+<h2 id="default_trusted_ca">Доверенный центр сертификации по умолчанию</h2>
+
+<p>По умолчанию приложения для Android N могут доверять только системным сертификатам
+и не доверяют ЦС, добавленным пользователем. Если приложению для Android N
+требуется доверять пользовательским ЦС, ему следует указать в
+<a href="{@docRoot}preview/features/security-config.html">конфигурации сетевой безопасности</a> эти доверенные пользовательские ЦС.
+</p>
+
+<h2 id="apk_signature_v2">Схема получения подписи APK, версия 2</h2>
+
+<p>Класс PackageManager теперь поддерживает подтверждение приложений с использованием схемы подписи APK
+версии 2. Вторая версия схемы подписи APK применяется ко всему файлу,
+что существенно ускоряет подтверждение и повышает надежность, позволяя обнаруживать любые несанкционированные изменения файлов APK.
+</p>
+
+<p>Для поддержки обратной совместимости пакет APK должен быть подписан с помощью первой версии схемы
+(схема подписи JAR) до того, как он будет подписан по схеме версии 2.
+Подпись по схеме версии 2 не пройдет подтверждение, если APK будет подписан дополнительным сертификатом
+после добавления подписи по схеме версии 2. </p>
+
+<p>Поддержка подписи APK по схеме версии 2 будет доступна в последующих выпусках N Developer
+Preview.</p>
+
+<h2 id="scoped_directory_access">Доступ к выделенным каталогам</h2>
+
+<p>В Android N приложения могут использовать новые API-интерфейсы для запроса доступа к конкретным каталогам <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">внешнего хранилища</a>,
+включая каталоги на съемных носителях, таких как SD-карты.
+Новые API-интерфейсы значительно упрощают доступ к стандартным каталогам
+внешнего хранилища, таким как <code>Pictures</code>. Например, приложения, работающие с фотографиями,
+могут использовать эти API-интерфейсы вместо
+<code>READ_EXTERNAL_STORAGE</code>, который разрешает доступ ко всем каталогам
+хранилища или платформы Storage Access Framework, благодаря чему выполняется переход к указанному каталогу.
+</p>
+
+<p>Кроме того, новые API-интерфейсы упрощают процедуру предоставления доступа к внешнему хранилищу для приложения.
+Если вы применяете новые API, система использует простой интерфейс разрешений,
+в котором четко указаны каталоги, к которым приложение запрашивает доступ.
+</p>
+
+<p>Дополнительная информация содержится в документации для разработчиков
+<a href="{@docRoot}preview/features/scoped-folder-access.html">Доступ к выделенным каталогам</a>.
+</p>
+
+
+
+
+
+
diff --git a/docs/html-intl/intl/ru/preview/index.jd b/docs/html-intl/intl/ru/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/ru/preview/index.jd
rename to docs/html-intl/intl/ru/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/ru/design/get-started/principles.jd b/docs/html-intl/intl/ru/design/get-started/principles.jd
index 7e4ea12..4eb0f5d 100644
--- a/docs/html-intl/intl/ru/design/get-started/principles.jd
+++ b/docs/html-intl/intl/ru/design/get-started/principles.jd
@@ -260,7 +260,7 @@
<div class="col-7">
<h4 id="sprinkle-encouragement">Не скупитесь на поддержку пользователя</h4>
-<p>Разбейте сложные задачи на более мелкие, легко выполнимые этапы. Обеспечьте обратную связь,
+<p>Разбейте сложные задачи на более мелкие, легко выполнимые этапы. Обеспечьте обратную связь,
даже при незначительных операциях.</p>
</div>
@@ -295,7 +295,7 @@
<div class="col-7">
<h4 id="make-important-things-fast">Важные действия должны происходить быстро</h4>
-<p>Не все действия равноценны. Решите, какие функции вашего приложения являются самыми важными, и обеспечьте возможность
+<p>Не все действия равноценны. Решите, какие функции вашего приложения являются самыми важными, и обеспечьте возможность
быстро найти и использовать их. Например, это может быть кнопка спуска затвора в фотокамере или кнопка паузы в музыкальном плеере.</p>
</div>
diff --git a/docs/html-intl/intl/ru/design/material/index.jd b/docs/html-intl/intl/ru/design/material/index.jd
index da0352a..f585a0d 100644
--- a/docs/html-intl/intl/ru/design/material/index.jd
+++ b/docs/html-intl/intl/ru/design/material/index.jd
@@ -165,7 +165,7 @@
<p>Анимация для реакции на касание встроена в некоторые стандартные представления, например кнопки. Новые API-интерфейсы
позволяют разработчику настраивать эти анимации и добавлять их в свои нестандартные представления.</p>
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/animations.html">Определение настраиваемой
+<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/animations.html">Определение настраиваемой
анимации</a>.</p>
@@ -182,5 +182,5 @@
растровых изображений.</li>
</ul>
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/drawables.html">Работа с
+<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/drawables.html">Работа с
элементами дизайна</a>.</p>
diff --git a/docs/html-intl/intl/ru/design/patterns/navigation.jd b/docs/html-intl/intl/ru/design/patterns/navigation.jd
index 3a0fc6e..817ec33 100644
--- a/docs/html-intl/intl/ru/design/patterns/navigation.jd
+++ b/docs/html-intl/intl/ru/design/patterns/navigation.jd
@@ -15,7 +15,7 @@
глобальное поведение навигации претерпело значительные изменения. Тщательное следование
инструкциям по применению кнопок "Назад" и "Вверх" сделает навигацию в вашем приложении предсказуемой и надежной с точки зрения пользователей.</p>
<p>В Android 2.3 и в более ранних версиях для навигации внутри приложения использовалась системная кнопка <em>Назад</em>.
- С появлением панели действий в Android 3.0 стал доступен второй механизм
+ С появлением панели действий в Android 3.0 стал доступен второй механизм
навигации – кнопка <em>Вверх</em>, содержащая значок приложения и левую угловую скобку.</p>
<img src="{@docRoot}design/media/navigation_with_back_and_up.png">
@@ -33,7 +33,7 @@
экранов, недавно открытых пользователем. Такая навигация основана на порядке появления
экранов, а не на иерархии приложения.</p>
-<p>Если предыдущий экран одновременно является иерархическим родителем текущего,
+<p>Если предыдущий экран одновременно является иерархическим родителем текущего,
кнопка "Назад" имеет то же действие, что и кнопка "Вверх", — и это случается довольно
часто. Однако, в отличие от кнопки "Вверх", гарантирующей, что пользователь остается в приложении, кнопка "Назад"
может перевести его на главный экран или даже в другое приложение.</p>
@@ -98,12 +98,12 @@
<p>В обоих этих случаях реализуйте следующее поведение кнопки "Вверх":</p>
<ul>
-<li><em>Если целевой экран, как правило, достигается из одного конкретного экрана
+<li><em>Если целевой экран, как правило, достигается из одного конкретного экрана
приложения</em>, кнопка "Вверх" должна осуществлять переход на этот экран.</li>
<li><em>В противном случае</em> кнопка "Вверх" должна осуществлять переход на самый верхний (главный) экран приложения.</li>
</ul>
-<p>Что касается кнопки "Назад", необходимо обеспечить более предсказуемую навигацию, вставив в
+<p>Что касается кнопки "Назад", необходимо обеспечить более предсказуемую навигацию, вставив в
стек переходов назад полный путь навигации вверх к самому верхнему экрану приложения. Это позволит пользователям,
забывшим, как они вошли в приложение, перейти к его главному экрану перед выходом из
приложения.</p>
@@ -139,7 +139,7 @@
<p><em>Всплывающие уведомления</em> появляются непосредственно перед пользователем,
в обход панели уведомлений. Они используются редко и <strong>должны быть зарезервированы для ситуаций, в которых требуется немедленная
-реакция пользователя, и прерывание его действий оправдано</strong>. Например,
+реакция пользователя, и прерывание его действий оправдано</strong>. Например,
приложение Talk с помощью таких уведомлений извещает пользователя о поступившем от друга приглашении присоединиться к видеочату, поскольку срок действия этого
приглашения истекает через несколько секунд.</p>
@@ -153,7 +153,7 @@
<h2 id="between-apps">Навигация между приложениями</h2>
<p>Одним из фундаментальных достоинств системы Android является способность взаимного запуска приложений,
-что дает пользователю возможность переходить непосредственно из одного приложения в другое. Например,
+что дает пользователю возможность переходить непосредственно из одного приложения в другое. Например,
приложение, которому нужно сделать снимок, может активировать приложение Camera, которое передаст фотографию
вызвавшему его приложению. Это огромное преимущество как для разработчика, имеющего возможность без проблем воспользоваться
кодом других приложений, так и для пользователя, получающего согласованный интерфейс для часто выполняемых
@@ -182,7 +182,7 @@
<p>Чтобы понять, как действия, задачи и намерения взаимодействуют друг с другом, разберемся, как одно приложение позволяет пользователям
поделиться содержимым с помощью другого приложения. Например, при запуске приложения Play Store с главного экрана создается
новая задача, Task A (см. рисунок ниже). Когда пользователь выполнит навигацию по Play Store и коснется интересующей его книги,
-чтобы просмотреть информацию о ней, он остается в той же задаче, расширяя ее с помощью добавленных действий. Запуск
+чтобы просмотреть информацию о ней, он остается в той же задаче, расширяя ее с помощью добавленных действий. Запуск
действия "Поделиться" выводит перед пользователем диалоговое окно со списком действий (из разных приложений),
зарегистрированных для выполнения намерения "Поделиться".</p>
@@ -198,16 +198,16 @@
<img src="{@docRoot}design/media/navigation_between_apps_back.png">
-<p>Однако, коснувшись кнопки "Вверх" во время действия "Составление сообщения", пользователь выскажет пожелание остаться в приложении
+<p>Однако, коснувшись кнопки "Вверх" во время действия "Составление сообщения", пользователь выскажет пожелание остаться в приложении
Gmail. Откроется экран действия "Переписка" приложения Gmail, и для него будет создана новая задача Task B. Новые задачи
всегда имеют корень на главном экране, поэтому касание кнопки "Назад" на экране переписки возвращает пользователя именно туда.</p>
<img src="{@docRoot}design/media/navigation_between_apps_up.png">
-<p>Задача Task A остается в фоновом режиме, и пользователь может вернуться к ней впоследствии (например, с помощью
+<p>Задача Task A остается в фоновом режиме, и пользователь может вернуться к ней впоследствии (например, с помощью
экрана с последними приложениями). Если в фоновом режиме уже работает собственная задача Gmail, она будет замещена
задачей Task B. Произойдет отказ от предыдущего контекста ради новой цели пользователя.</p>
<p>Если для обработки намерений ваше приложение зарегистрирует действие, расположенное в глубине своей иерархии,
-следуйте инструкциям по реализации навигации с помощью кнопки "Вверх", изложенным в разделе <a href="#into-your-app">Навигация внутрь приложения с помощью виджетов и
+следуйте инструкциям по реализации навигации с помощью кнопки "Вверх", изложенным в разделе <a href="#into-your-app">Навигация внутрь приложения с помощью виджетов и
уведомлений главного экрана</a>.</p>
diff --git a/docs/html-intl/intl/ru/design/patterns/notifications.jd b/docs/html-intl/intl/ru/design/patterns/notifications.jd
deleted file mode 100644
index db46ad5..0000000
--- a/docs/html-intl/intl/ru/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=Уведомления
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>Документация для разработчиков</h3>
- <p>Уведомление пользователя</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Уведомления в Android версии 4.4 и ниже</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>Видеоролик</h3>
- <p>DevBytes: Уведомления в Android L Developer Preview</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>Уведомления позволяют извещать пользователя о релевантных и
-периодически возникающих
-событиях в приложении, таких как новые сообщения в чате или события в календаре.
-Систему уведомлений можно рассматривать как канал новостей, извещающий пользователя о важных
-событиях по мере
-их возникновения, или как журнал, ведущий хронику событий, пока пользователь не обращает на них
-внимания, и синхронизируемый должным образом на всех устройствах Android этого пользователя.</p>
-
-<h4 id="New"><strong>Новые возможности Android 5.0</strong></h4>
-
-<p>В Android 5.0 уведомления были существенно обновлены структурно,
-визуально, и функционально:</p>
-
-<ul>
- <li>был изменен внешний вид уведомлений в соответствии с новой
-темой Material Design;</li>
- <li> теперь уведомления доступны на экране блокировки, в то время как
-конфиденциальная информация по-прежнему
- может быть скрыта;</li>
- <li>уведомления с высоким приоритетом, полученные при включенном устройстве, теперь имеют новый формат и называются
- уведомлениями Heads-up;</li>
- <li>уведомления синхронизируются с облаком: если удалить уведомление на одном из устройств
-Android, оно будет удалено
- и на остальных устройствах.</li>
-</ul>
-
-<p class="note"><strong>Примечание.</strong> Разработка уведомлений в этой версии
-Android значительно
-отличается от их разработки в предыдущих версиях. Информацию о разработке уведомлений в предыдущих
-версиях можно найти в разделе <a href="./notifications_k.html">Уведомления в Android версии 4.4 и ниже</a>.</p>
-
-<h2 id="Anatomy">Структура уведомления</h2>
-
-<p>В этом разделе описываются основные компоненты уведомления и их
-отображение на устройствах различных типов.</p>
-
-<h3 id="BaseLayout">Базовая компоновка</h3>
-
-<p>Все уведомления имеют, как минимум, базовую компоновку, которую составляют следующие элементы.</p>
-
-<ul>
- <li> <strong>Значок</strong> уведомления. Значок символизирует
-инициирующее приложение. Он также может
- указывать на тип уведомления, если приложение генерирует уведомления нескольких
-типов.</li>
- <li> <strong>Заголовок</strong> уведомления и дополнительный
-<strong>текст</strong>.</li>
- <li> <strong>Временная метка</strong>.</li>
-</ul>
-
-<p>Уведомления, созданные с помощью {@link android.app.Notification.Builder Notification.Builder}
-для предыдущих версий платформы, выглядят и функционируют в Android
-5.0 так же, как и прежде, за исключением незначительных стилистических отличий, вносимых
-системой. Дополнительную информацию о внешнем виде и функциональности уведомлений в предыдущих версиях
-Android можно найти в разделе
-<a href="./notifications_k.html">Уведомления в Android версии 4.4 и ниже</a>.</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- Уведомление в базовой компоновке на мобильном устройстве (слева) и то же уведомление на носимом устройстве (справа)
- с фотографией пользователя и значком уведомления
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">Расширенная компоновка</h3>
-
-
-<p>Разработчик может выбрать степень подробности уведомлений, генерируемых его
-приложением. Уведомление может содержать первые
-несколько строк сообщения или миниатюру изображения. В качестве дополнительной
-информации можно предоставлять пользователю
-контекст и, —в некоторых случаях, —давать ему возможность прочитать сообщение
-целиком. Чтобы переключаться
- между компактной и расширенной компоновкой, пользователь может применить жест сжатия/масштабирования или
-провести пальцем по экрану.
- Для уведомлений о единичных событиях Android предоставляет
- разработчику приложения три шаблона расширенной компоновки
-(текст, входящая почта и изображения). Ниже приведены скриншоты уведомлений о единичных
-событиях на мобильных устройствах (слева)
- и на носимых устройствах (справа).</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">Действия</h3>
-
-<p>Android поддерживает дополнительные действия, отображаемые в нижней части
-уведомления.
-Благодаря этому пользователи могут выполнять операции, типичные для данного
-уведомления, непосредственно из него, не открывая
-само приложение.
-Это ускоряет взаимодействие и, вместе с операцией "провести пальцем, чтобы удалить", позволяет пользователю сосредоточиться на
-важных для него уведомлениях.</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">При определении количества действий в уведомлении следует проявлять
-благоразумие. Чем больше
-действий предоставлено пользователю, тем выше когнитивная сложность приложения. Ограничьтесь
-минимальным количеством
-действий, предоставив пользователю наиболее важные и
-значимые.</p>
-
-<p>В уведомлениях отдавайте предпочтение действиям</p>
-
-<ul>
- <li> важным, выполняемым наиболее часто и типичным для отображаемого
-содержимого;
- <li> позволяющим пользователю быстрее решить задачу.
-</ul>
-
-<p>Избегайте действий</p>
-
-<ul>
- <li> неоднозначных;
- <li> совпадающих с действиями, выполняемыми для данного уведомления по умолчанию (например, "Прочитать" или
-"Открыть").
-</ul>
-
-
-
-<p>Следует предоставлять не более трех действий, указав для каждого
-значок и название.
- Добавление действий в базовую компоновку делает уведомление расширяемым,
-даже если
- оно не имеет расширенной компоновки. Поскольку действия отображаются только у
-расширенных
- уведомлений, необходимо, чтобы любое действие,
-которое пользователь может выполнить из
- уведомления, было доступно и в соответствующем
-приложении.</p>
-
-<h2 style="clear:left">Уведомления heads-up</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- Пример уведомления heads-up (входящий телефонный звонок, высокий приоритет),
-появляющегося поверх
- приложения с эффектом присутствия
- </p>
-</div>
-
-<p>Когда поступает уведомление с высоким приоритетом (см. изображение справа), оно в течение короткого времени
-отображается
-в расширенной компоновке, позволяя выполнить допустимые действия.</p>
-<p> Затем уведомление принимает обычный
-вид. Если для уведомления установлен высокий, максимальный или полноэкранный <a href="#correctly_set_and_manage_notification_priority">приоритет</a>
-, оно становится уведомлением heads-up.</p>
-
-<p><b>Хорошими примерами событий для уведомлений heads-up являются</b></p>
-
-<ul>
- <li> входящий телефонный звонок, во время использования устройства;</li>
- <li> сигнал будильника во время использования устройства;</li>
- <li> новое SMS-сообщение;</li>
- <li> низкий уровень заряда аккумулятора.</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">Основные рекомендации</h2>
-
-
-<h3 id="MakeItPersonal">Персонализируете уведомление</h3>
-
-<p>Уведомление о событии, инициированном другим пользователем (например, сообщение или
-обновление статуса), должно содержать изображение пользователя, добавленное с помощью
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()}. Кроме того, в метаданные уведомления необходимо включить информацию о
-пользователе (см. {@link android.app.Notification#EXTRA_PEOPLE}).</p>
-
-<p>Главный значок уведомления будет по-прежнему отображаться, чтобы пользователь мог связать
-его со значком
-на строке состояния.</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- Уведомление, идентифицирующее пользователя-инициатора, и отображающее отправленное содержимое.
-</p>
-
-
-<h3 id="navigate_to_the_right_place">Выполняйте переход в нужное место</h3>
-
-<p>Когда пользователь касается тела уведомления (за пределами кнопок
-с действиями), должен осуществляться переход в то место приложения,
-где пользователь сможет просмотреть информацию, о которой извещает уведомление, и действовать в соответствии
-с нею. В большинстве случаев там будет находиться подробное представление одного элемента данных, например, сообщения,
-но возможно и
-сокращенное представление, если накопилось несколько уведомлений. Если приложение переводит
-пользователя на какой-либо уровень, отличный от верхнего, реализуйте навигацию в стеке переходов назад в приложении, чтобы
-пользователь мог нажать системную кнопку "Назад" и вернуться на верхний уровень. Дополнительную информацию можно найти в разделе
-<em>Навигация внутрь приложения с помощью виджетов и уведомлений главного экрана</em> в шаблоне проектирования
-<a href="{@docRoot}design/patterns/navigation.html#into-your-app">Навигация</a>.</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">Правильно выполняйте расстановку приоритетов уведомлений и
-управление ими
-</h3>
-
-<p>Android поддерживает флаг приоритета для уведомлений. Это флаг позволяет
-влиять на позицию уведомления среди других уведомлений и
-гарантировать,
-что пользователь в первую очередь увидит самые важные уведомления. При отправке уведомления можно выбрать один
-из
-следующих уровней приоритета:</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>Приоритет</strong></p>
-</td>
- <td class="tab0">
-<p><strong>Использование</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>Применяйте для наиболее важных и неотложных уведомлений, извещающих пользователя
-о ситуации,
-критичной по времени или такой, на которую необходимо отреагировать, чтобы продолжить
-выполнение задачи.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>Применяйте, в основном, для передачи важной информации, например, о сообщениях или событиях
-в чате с содержимым, представляющим особый интерес для пользователя.
-Уведомления с высоким приоритетом отображаются как уведомления heads-up.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>Применяйте для всех уведомлений, не входящих ни в одну из описанных здесь категорий.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>Применяйте для уведомлений, которые должны быть переданы пользователю, но
-не являются неотложными. Низкоприоритетные уведомления обычно появляются в конце списка,
-что позволяет использовать их
-для передачи информации, представляющей всеобщий интерес и не имеющей конкретной направленности. Например, если пользователь подписался
-на новости,
- эта информация не должна иметь преимущество перед неотложными или адресными
-сообщениями.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>Применяйте для уведомлений, с контекстной или фоновой информацией, такой как прогноз погоды, или с информацией,
-связанной с местоположением пользователя.
-Уведомления с минимальным приоритетом не отображаются в строке состояния. Пользователь
-обнаруживает их при раскрытии панели уведомления.</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>Как выбрать
-подходящий
-приоритет</strong></h4>
-
-<p>При выдаче уведомлений с приоритетами <code>DEFAULT</code>, <code>HIGH</code> и <code>MAX</code> существует риск, что деятельность
-пользователя будет прервана
-в самом разгаре. Чтобы не раздражать пользователей вашего приложения, применяйте приоритеты этих уровней для
-уведомлений,</p>
-
-<ul>
- <li> имеющих отношение к другим пользователям;</li>
- <li> быстро теряющих актуальность;</li>
- <li> способных немедленно повлиять на поведение пользователя в реальном мире.</li>
-</ul>
-
-<p>Уведомления с приоритетом <code>LOW</code> и <code>MIN</code> могут представлять определенную ценность
-для пользователя. Значительное количество, если не большинство, уведомлений не требует немедленной
-реакции пользователя, но, тем не менее, содержит информацию, которую пользователь сочтет
-ценной, когда решит
-просмотреть поступившие уведомления. Приоритеты уровней <code>LOW</code> и <code>MIN</code>
- следует присваивать уведомлениям,</p>
-
-<ul>
- <li> не имеющим прямого отношения к другим пользователям;</li>
- <li> долго не теряющим актуальность;</li>
- <li> содержащим информацию, способную заинтересовать пользователя, если он решит
-просмотреть их в свободное время.</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">Определите категорию
-уведомления</h3>
-
-<p>Если уведомление попадает в одну из заранее определенных категорий (см.
-ниже), укажите его
-категорию. Процессы системного пользовательского интерфейса, например, панель уведомления (или любой
-другой процесс-слушатель
-уведомлений) могут воспользоваться этой информацией при классификации и фильтрации уведомлений.</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>Входящий звонок (голосовой или по видеосвязи) или алогичный запрос синхронной
-связи</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>Входящее личное сообщение (SMS-сообщение, мгновенное сообщение и т. д.)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>Асинхронное массовое сообщение (по электронной почте)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>Событие в календаре</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>Промоакция или реклама</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>Сигнал будильника или таймера</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>Информация о ходе выполнения длительной фоновой операции</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>Новости, поступившие из социальной сети или касающиеся совместного использования ресурсов</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>Ошибка в фоновой операции или статусе аутентификации</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>Управление передачей медиаданных для воспроизведения</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>Обновление статуса системы или устройства. Зарезервировано для использования системой.</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>Индикация работающей фоновой службы</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>Конкретная и привязанная ко времени рекомендация относительно одного объекта. Например, приложение
-новостей может
-порекомендовать пользователю, какую новость читать следующей.</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>Текущая информация о статусе устройства или контекста</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">Суммируйте уведомления</h3>
-
-<p>Если при наличии ожидающего уведомления определенного типа приложение пытается отправить новое
-уведомление того же типа, объедините их в одно сводное уведомление от этого приложения. Не
-создавайте новый объект.</p>
-
-<p>Сводное уведомление формирует сводное описание и дает пользователю возможность
-понять, сколько
-имеется ожидающих уведомлений того или иного типа.</p>
-
-<div class="col-6">
-
-<p><strong>Неправильно</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>Правильно</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">Разработчик может сообщить
-подробности об отдельных уведомлениях, образующих
- сводное, используя расширенную компоновку для резюме. Такой подход позволит пользователям
-лучше разобраться, какие
-уведомления ожидают прочтения, и достаточно ли они интересны, чтобы ознакомиться с ними
-более подробно в
- соответствующем приложении.</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- Расширенное и сжатое сводное уведомление (с использованием <code>InboxStyle</code>)
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">Сделайте уведомления
-необязательными</h3>
-
-<p>В распоряжении пользователей всегда должен быть метод управления уведомлениями. Предоставьте пользователю возможность
-отключать уведомления, поступающие от вашего приложения,
-или изменять способы оповещения, такие как звуковой сигнал и
-вибрация.
- С этой целью следует предусмотреть пункт настройки уведомлений в настройках приложения.</p>
-
-<h3 id="use_distinct_icons">Используйте отчетливые значки</h3>
-<p>Беглого взгляда на область уведомлений должно быть достаточно, чтобы распознать
-типы
-ожидающих уведомлений.</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>Правильно</strong></p>
- <p>Рассмотрите уже существующие значки уведомлений от приложений Android и создайте
-собственные,
- достаточно уникальные.</p>
-
- <p><strong>Правильно</strong></p>
- <p>Придерживайтесь подходящего <a href="/design/style/iconography.html#notification">стиля значков уведомления</a>
- для мелких значков, и
- <a href="/design/style/iconography.html#action-bar">стиля строки
-действий</a> Material Light для значков
- действий.</p>
-<p ><strong>Правильно</strong></p>
-<p >Стремитесь к визуальной простоте значков, избегайте излишних трудноразличимых
-деталей.</p>
-
- <div><p><strong>Неправильно</strong></p>
- <p>Применяйте к мелким значкам и значкам действий дополнительные альфа-эффекты
-(постепенное появление/исчезание).
- К их краям может быть применено сглаживание, но, поскольку в Android эти значки
-служат масками (то есть,
- используется только альфа-канал), изображение, как правило, должно отображаться полностью
-непрозрачным.</p>
-
-</div>
-<p style="clear:both"><strong>Неправильно</strong></p>
-
-<p>Чтобы ваше приложение отличалось от других, используйте цвет. Значки уведомлений должны
-представлять собой изображение белого цвета на прозрачном фоне.</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">Правильно используйте индикатор
-уведомлений</h3>
-
-<p>На многих устройствах Android имеется светодиодный индикатор уведомлений,
-информирующий пользователя о
-событиях, когда экран выключен. Уведомления с приоритетом <code>MAX</code>,
-<code>HIGH</code> или <code>DEFAULT</code> должны
-вызывать свечение индикатора, а уведомления с низким приоритетом (<code>LOW</code> и
-<code>MIN</code>) не должны.</p>
-
-<p>Возможности пользователя управлять уведомлениями должны распространяться на светодиодный индикатор. Когда разработчик использует
-DEFAULT_LIGHTS,
-индикатор светится белым цветом. Ваши уведомления не должны вызывать свечение другим
-цветом, если
-пользователь не указал этого явным образом.</p>
-
-<h2 id="building_notifications_that_users_care_about">Создание уведомлений,
- важных для пользователя</h2>
-
-<p>Чтобы пользователям понравилось ваше приложение, необходимо тщательно
-продумать его уведомления.
-Уведомления — это голос приложения. Они определяют его
-индивидуальность. Ненужные или
-несущественные уведомления раздражают пользователя и заставляют его возмущаться тем, как много
-внимания требует от него
-приложение. Поэтому необходимо применять уведомления взвешенно.</p>
-
-<h3 id="when_to_display_a_notification">Ситуации, в которых следует показывать уведомления</h3>
-
-<p>Чтобы создать приложение, от работы с которым пользователи получат удовольствие, необходимо
-осознать, что внимание пользователя
- является ресурсом, требующим бережного обращения. Система уведомлений
-Android была разработана
-так, чтобы как можно меньше отвлекать пользователя.
-Однако
-вы должны отдавать себе отчет в том, что уведомления прерывают
-деятельность пользователя.
-Планируя уведомления, спрашивайте себя, достаточно ли они важны, чтобы
-послужить основанием для такого прерывания. В случае сомнений предоставьте пользователю возможность запросить
-в настройках приложения получение уведомления или измените
-приоритет уведомления на <code>LOW</code> или <code>MIN</code>, чтобы
-не отвлекать пользователя от
-текущих занятий.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- Примеры уведомлений, быстро теряющих актуальность
- </p>
-
-<p>Хотя правильно работающие приложения ведут себя неназойливо, бывают ситуации,
-заслуживающие того, чтобы приложение по своей инициативе прервало деятельность пользователя уведомлением.</p>
-
-<p>Отправляйте уведомления только в случае <strong>событий, требующих неотложной реакции</strong>, особенно
- если эти синхронные события <strong>имеют прямое отношение к другим пользователям</strong>. Например,
-чат
- представляет собой форму синхронного общения в реальном времени, — другой пользователь
-с нетерпением ожидает вашего ответа. События в календаре являются еще одним хорошим примером ситуации, в которой следует выдать
-уведомление и завладеть
- вниманием пользователя, потому что в приближающееся календарное событие часто
-вовлечены другие люди.</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">Ситуации,
-в которых не следует показывать уведомления</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>В большинстве остальных случаев уведомления неуместны.</p>
-
-<ul>
- <li> Не следует извещать пользователя о событиях, не имеющих отношения
-к нему конкретно, или
- не теряющих актуальность со временем. Например, асинхронные
-и безадресные новости,
- циркулирующие в социальных сетях, как правило, не требуют немедленного
-привлечения внимания. Пользователям,
- действительно интересующимся таким новостями, предоставьте возможность запросить соответствующие уведомления.</li>
- <li> Не генерируйте уведомление, если релевантная свежая информация уже находится
-на экране. Вместо этого
- воспользуйтесь интерфейсом самого приложения, чтобы донести до пользователя новую информацию
-непосредственно в контексте.
- Например, приложение-чат не должно генерировать системные уведомления,
-пока пользователь активно общается с собеседником.</li>
- <li> Не отвлекайте пользователя ради низкоуровневых технических действий, такие как сохранение
-или синхронизация информации или обновление приложения, если приложение или система способны выполнить задачу
-без вмешательства пользователя.</li>
- <li> Не отвлекайте пользователя, чтобы проинформировать его об ошибке, если
-приложение может восстановиться после нее самостоятельно, не требуя от пользователя
-никаких действий.</li>
- <li> Не создавайте уведомления, не имеющие осмысленного содержимого и
-всего лишь рекламирующие ваше
-приложение. Уведомление должно нести полезную, актуальную и новую информацию. Не следует
-использовать его
- исключительно для презентации приложения.</li>
- <li> Не создавайте избыточные уведомления только для того, чтобы продемонстрировать свой бренд
-пользователям.
- Такие уведомления раздражают и отталкивают аудиторию. Лучший
-способ сообщать
- новую информацию небольшими порциями и поддерживать связь пользователей
-с вашим
- приложением заключается в том, чтобы разработать виджет, который они смогут поместить на
- главный экран.</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">Взаимодействие с
-уведомлениями</h2>
-
-<p>Уведомления обозначаются значками в строке состояния. Чтобы получить к ним доступ,
-следует открыть
-панель уведомлений.</p>
-
-<p>Если коснуться уведомления, откроется соответствующее приложение с подробным содержимым,
-связанным с эти уведомлением.
-Если провести пальцем по уведомлению влево или вправо, оно будет удалено из панели.</p>
-
-<h3 id="ongoing_notifications">Постоянные уведомления</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- Постоянные уведомления при воспроизведении музыки
- </p>
-</div>
-<p>Постоянные уведомления информируют пользователя о текущих фоновых
-процессах.
-Например, плееры сообщают через систему уведомлений информацию о дорожке,
-воспроизводимой в данный момент, и
-это продолжается, пока пользователь не остановит воспроизведение. Кроме того, постоянные уведомления могут
-информировать пользователя
-о ходе выполнения длительных задач, таких как загрузка файла или кодирование видеоданных. Пользователь не может вручную
-удалить постоянное уведомление из панели уведомлений.</p>
-
-<h3 id="ongoing_notifications">Воспроизведение медиаданных</h3>
-<p>В Android 5.0 на экране блокировки не отображаются элементы управления воспроизведением от устаревшего
-класса {@link android.media.RemoteControlClient}. Однако на нем <em>отображаются</em> уведомления, так что теперь каждое
-уведомление приложения о воспроизведении является для пользователей основным
-способом управления воспроизведением в заблокированном состоянии. В результате у приложения появляется больше возможностей
-управлять тем, какие
-кнопки отображать, и каким образом. При этом с точки зрения пользователя система ведет себя непротиворечиво,
-независимо от того, заблокирован ли экран.</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">Диалоговые окна
-и всплывающие уведомления</h3>
-
-<p>Приложение, не отображаемое на экране, не должно генерировать диалоговое окно или всплывающее
-уведомление. Диалоговое окно или всплывающее уведомление
- должно появляться исключительно в качестве немедленной реакции на действия пользователя
-в приложении.
-Более подробные рекомендации по использованию диалоговых окон и всплывающих уведомлений см. в разделе
-<a href="/design/patterns/confirming-acknowledging.html">Подтверждение и уведомление</a>.</p>
-
-<h3>Упорядочение уведомлений по степени важности</h3>
-
-<p>По своей сути уведомления — это новости, и поэтому они принципиально отображаются в
-обратном хронологическом порядке.
-При этом обязательно принимается во внимание
-<a href="#correctly_set_and_manage_notification_priority">приоритет</a>, установленный приложением.</p>
-
-<p>Уведомления являются важной составляющей экрана блокировки и отображаются на видном месте
-каждый
-раз, когда включается дисплей устройства. На экране блокировки мало свободного места, поэтому
-исключительно важно
-выявлять неотложные или наиболее релевантные уведомления. По этой
-причине Android применяет
-сложный алгоритм сортировки уведомлений, в котором учитываются</p>
-
-<ul>
- <li> временная метка и приоритет, установленный приложением;</li>
- <li> тот факт, что уведомление только что оповестило пользователя звуковым сигналом
-или вибрацией (иными словами,
- если телефон издает звуки, и пользователь хочет узнать, в чем
-дело, то на экране блокировки
- должен находиться ответ, понятный с первого взгляда);</li>
- <li> пользователи, связанные с уведомлением при помощи {@link android.app.Notification#EXTRA_PEOPLE},
- и, в частности, присутствие их в списке помеченных контактов.</li>
-</ul>
-
-<p>Чтобы воспользоваться преимуществами этой сортировки наилучшим образом, думайте в первую очередь о создании
-удобных условий для
-пользователя, и не нацеливайтесь на конкретное место в рейтинге.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Уведомления от Gmail имеют
-приоритет DEFAULT, поэтому они
- обычно оказываются ниже уведомлений от приложений мгновенного обмена сообщениями, таких как Hangouts, но
-поднимаются в списке
- на некоторое время, когда поступают новые сообщения.
- </p>
-
-
-<h3>Уведомления на экране блокировки</h3>
-
-<p>Поскольку уведомления видны на экране блокировки, защита конфиденциальной информации пользователей приобретает
-особо
-важное значение. Уведомления нередко содержат частную информацию, и они
-не должны быть доступны
-каждому, кто взял в руки устройство и включил дисплей.</p>
-
-<ul>
- <li> У устройств, экран блокировки которых защищен (при помощи PIN-кода, графического ключа или пароля), интерфейс имеет
- общедоступную и закрытую части. Элементы общедоступного интерфейса отображаются на защищенном экране блокировки и
- следовательно, видны всем. Закрытый интерфейс находится "позади" экрана блокировки и
- доступен только пользователю, выполнившему вход в устройство.</li>
-</ul>
-
-<h3>Возможности пользователя контролировать информацию, отображаемую на экране блокировки</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- Уведомления на экране блокировки с содержимым, отображаемым после того, как пользователь разблокирует устройство.
- </p>
-</div>
-
-<p>При настройке защиты экрана блокировки пользователь может предпочесть,
- чтобы конфиденциальные данные не отображались на защищенном экране блокировки. В этом случае системный пользовательский интерфейс
-учитывает <em>уровень видимости</em> уведомления, чтобы выяснить, какую информацию
-можно отображать без риска.</p>
-<p> Чтобы установить уровень видимости, вызовите
-<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>
-и укажите одно из следующих значений:</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>.
-Содержимое уведомления отображается полностью.
- Это значение принимается системой по умолчанию, если уровень видимости не указан.</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>.
-На экране блокировки отображается основная информация о наличии уведомления, включая его
-значок и название приложения, отправившего его. Прочие данные уведомления скрыты.
-Здесь уместно дать разработчику пару рекомендаций.
- <ul>
- <li> Если вы хотите реализовать отдельную общедоступную версию уведомления,
-которую система будет отображать на экране блокировки, создайте замещающий
-объект Notification в поле<code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code>.
-
- <li> Этот параметр предоставляет приложению возможность создавать "цензурированную" версию
-содержимого, достаточно информативную, но скрывающую личную информацию. Рассмотрим в качестве примера приложение для отправки
-SMS-сообщений. Его уведомления содержат текст SMS-сообщения и имя и контактный значок отправителя.
-Такое уведомление должно иметь атрибут <code>VISIBILITY_PRIVATE</code>, но его версия <code>publicVersion</code> может
-содержать полезную информацию, например, "3 новых сообщения", без уточняющих
-подробностей.
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>. Отображается минимум информации,
-даже без значка уведомления.</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Уведомления на
-Android Wear</h2>
-
-<p>По умолчанию уведомления и их <em>действия</em> передаются на носимые устройства.
-Разработчики могут управлять тем, какие уведомления следует передавать с
-телефона на часы,
-и наоборот. У разработчиков также есть возможность управлять передачей действий. Если
-приложение включает в себя
-действия, которые невозможно выполнить одним касанием, нужно либо скрывать их
-в уведомлениях, отображаемых на носимом
-устройстве, либо обеспечить их привязку к приложению под управлением Android Wear, позволив пользователю
-совершать действие
-на часах.</p>
-
-<h4>Передача уведомлений и действий на другое устройство</h4>
-
-<p>Подключенное устройство, например, телефон, может передавать уведомления на носимое устройство,
-чтобы они отображались и на нем. Аналогичным образом можно передавать действия, чтобы пользователь мог реагировать
-на уведомления непосредственно на носимом устройстве.</p>
-
-<p><strong>Передавайте</strong></p>
-
-<ul>
- <li> новые мгновенные сообщения;</li>
- <li> действия, выполняемые одним касанием, например, "+1", "Лайк", "Сердечко".</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>Не передавайте</strong></p>
-
-<ul>
- <li> уведомления о новых подкастах;</li>
- <li> действия, соответствующие функциям, недоступным на часах.</li>
-</ul>
-
-
-
-<p><h4>Уникальные действия, определяемые для носимых устройств</h4></p>
-
-<p>Некоторые действия можно выполнить только на носимых устройствах, например:</p>
-
-<ul>
- <li> выбор из списка шаблонных ответов, например, "Скоро вернусь"</li>
- <li> действие "Открыть на телефоне";</li>
- <li> действия "Прокомментировать" или "Ответить", открывающие окно речевого ввода;</li>
- <li> действия, запускающие приложения, специфичные для Android Wear.</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/about.jd b/docs/html-intl/intl/ru/distribute/googleplay/about.jd
index d5eaafe..1c2bc96 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/about.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/about.jd
@@ -6,7 +6,7 @@
@jd:body
- <div id="qv-wrapper">
+ <div id="qv-wrapper">
<div id="qv">
<h2>О Google Play</h2>
<ol style="list-style-type:none;">
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/auto.jd b/docs/html-intl/intl/ru/distribute/googleplay/auto.jd
index 3fc82dd..3550b36 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/auto.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/auto.jd
@@ -133,7 +133,7 @@
<ul>
<li>В манифесте приложения должна быть декларирована запись метаданных <code>com.google.android.gms.car.application</code>
с функциональными возможностями автомобиля, используемыми приложением. Чтобы получить более подробную информацию
- о конфигурации приложения для Android Auto, см.
+ о конфигурации приложения для Android Auto, см.
<a href="{@docRoot}training/auto/start/index.html#auto-metadata">Начало работы с Android Auto</a>.
</li>
</ul>
@@ -152,7 +152,7 @@
После принятия условий и сохранения изменений вы можете загрузить и опубликовать свое приложение в обычном порядке.
Перед тем, как открыть доступ к приложению пользователям Android Auto, Google Play передает
приложение на проверку его соответствия критериям <a href="{@docRoot}distribute/essentials/quality/auto.html">качества автоприложений</a>
-и уведомляет о ее результатах. Если приложение было одобрено, Google Play делает его
+и уведомляет о ее результатах. Если приложение было одобрено, Google Play делает его
доступным пользователям Android Auto. Подробная информация о том, как отслеживать статус подтверждения приложения, приведена
в следующем разделе.
</p>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/developer-console.jd b/docs/html-intl/intl/ru/distribute/googleplay/developer-console.jd
index cb62c2f..7510202 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/developer-console.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/developer-console.jd
@@ -4,8 +4,8 @@
Xnonavpage=true
@jd:body
-
- <div id="qv-wrapper">
+
+ <div id="qv-wrapper">
<div id="qv">
<h2>Возможности для публикации приложений</h2>
<ol>
@@ -204,7 +204,7 @@
<p>
В случае добавления функций или исправления проблем обновленный двоичный файл
можно опубликовать в любое время. Новая версия сразу же становится доступной, а существующие пользователи
- получают уведомление о готовом к загрузке обновлении. Пользователи также могут
+ получают уведомление о готовом к загрузке обновлении. Пользователи также могут
принимать автоматические обновления приложения, которые будут
передаваться и устанавливаться сразу после публикации. Вы можете отменить публикацию своих приложений в любое
время.
@@ -441,7 +441,7 @@
<p>
Управляйте распространением своих приложений по странам и регионам. Для
некоторых стран можно указать операторов мобильной связи, на которых будут нацелены ваши продажи. Вы также можете просмотреть
- список устройств, которым доступно ваше приложение, составленный на основании правил распространения
+ список устройств, которым доступно ваше приложение, составленный на основании правил распространения
из файла манифеста приложения.
</p>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/families/faq.jd b/docs/html-intl/intl/ru/distribute/googleplay/families/faq.jd
index 9551108..664539f 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/families/faq.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>Содержание документа</h2>
@@ -141,7 +141,7 @@
приложение семейным пользователям. Если приложение удовлетворяет всем
требованиям программы, срок его публикации будет не больше обычного. Однако
если в процессе проверки приложение было отклонено, срок его публикации
- задержится.
+ задержится.
</dd>
<dt>
@@ -281,7 +281,7 @@
за собой право отклонять приложения, использующие излишне агрессивные коммерческие методы. Продажа контента во всех приложениях
программы "Для всей семьи", предназначенных в основном для детской
аудитории, будет защищена паролем, чтобы покупки подтверждались
- родителями, а не детьми. Следует отметить, что эта защита не распространяется на приложения,
+ родителями, а не детьми. Следует отметить, что эта защита не распространяется на приложения,
предназначенные для общей аудитории.
</dd>
</dl>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/families/start.jd b/docs/html-intl/intl/ru/distribute/googleplay/families/start.jd
index fcb0d34..9274732 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/families/start.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/families/start.jd
@@ -78,7 +78,7 @@
<p class="note">
<strong>Примечание</strong>. Опубликованные в рамках программы "Для всей семьи" приложения также доступны для
- всех пользователей Google Play.
+ всех пользователей Google Play.
</p>
<p>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/quality/core.jd b/docs/html-intl/intl/ru/distribute/googleplay/quality/core.jd
index ca1b671..8af9d91 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/quality/core.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/quality/core.jd
@@ -12,7 +12,7 @@
<li><a href="#listing">Соответствие требованиям Google Play</a></li>
</ol>
-
+
<h2>Тестирование</h2>
<ol>
<li><a href="#test-environment">Настройка среды тестирования</a></li>
@@ -24,7 +24,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">Качество приложений для планшетных ПК</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">Оптимизация приложений</a></li>
</ol>
-
+
</div>
</div>
@@ -84,7 +84,7 @@
<th style="width:54px;">
ИД
</th>
-
+
<th>
Описание
@@ -182,7 +182,7 @@
</td>
<td>
<p style="margin-bottom:.5em;">
- Уведомления должны соответствовать <a href="{@docRoot}design/patterns/notifications.html">рекомендациям</a> по дизайну Android. В
+ Уведомления должны соответствовать <a href="{@docRoot}design/patterns/notifications.html">рекомендациям</a> по дизайну Android. В
частности, должны быть соблюдены следующие правила.
</p>
@@ -290,7 +290,7 @@
<td>
<p style="margin-bottom:.5em;">
Приложение не запрашивает прав доступа к наиболее важным данным (например,
- к контактам или системному журналу), а также к платным сервисам
+ к контактам или системному журналу), а также к платным сервисам
(например, службам дозвона или отправки СМС), если это не связано с основной функциональностью данного
приложения.
</p>
@@ -311,7 +311,7 @@
<p style="margin-bottom:.25em;">
Поддержка установки на SD-карту рекомендована для всех больших приложений
- (превышающих 10 МБ). См. в руководстве разработчика в разделе <a href="{@docRoot}guide/topics/data/install-location.html">Место
+ (превышающих 10 МБ). См. в руководстве разработчика в разделе <a href="{@docRoot}guide/topics/data/install-location.html">Место
установки приложения</a> информацию о том,
какие типы приложений должны поддерживать установку на SD-карты.
</p>
@@ -490,7 +490,7 @@
его состояние должно быть восстановлено максимально близко к предыдущему состоянию.
</li>
- <li>При нажатии кнопки "Назад" приложение позволяет сохранить свое текущее состояние или
+ <li>При нажатии кнопки "Назад" приложение позволяет сохранить свое текущее состояние или
состояние пользователя, которое в противном случае будет потеряно при переходе назад.
</li>
</ol>
@@ -1048,8 +1048,8 @@
</p>
<p style="margin-bottom:.25em;">
- Чтобы принудительно задействовать аппаратное ускорение (если оно поддерживается
- устройством), добавьте параметр <code>hardware-accelerated="true"</code> к разделу
+ Чтобы принудительно задействовать аппаратное ускорение (если оно поддерживается
+ устройством), добавьте параметр <code>hardware-accelerated="true"</code> к разделу
<code><application></code> в манифесте приложения и выполните его повторную компиляцию.
</p>
</td>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/quality/tablets.jd b/docs/html-intl/intl/ru/distribute/googleplay/quality/tablets.jd
index 4e0322f..4c25d88 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/quality/tablets.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/quality/tablets.jd
@@ -56,7 +56,7 @@
<p>Первым шагом к созданию хорошего планшетного приложения будет соблюдение
<em>основных критериев качества</em> для всех устройств
- и форм-факторов, для которых предназначается приложение. Полную информацию об этом см. в руководстве <a href="{@docRoot}distribute/essentials/quality/core.html">Основные критерии качества приложений</a>.
+ и форм-факторов, для которых предназначается приложение. Полную информацию об этом см. в руководстве <a href="{@docRoot}distribute/essentials/quality/core.html">Основные критерии качества приложений</a>.
</p>
<p>
@@ -174,7 +174,7 @@
<p>Планшеты обеспечивают значительно больше полезной площади экрана
для вашего приложения, особенно в альбомной ориентации. Особенно этот прирост заметен на 10-дюймовых планшетах, но даже 7-дюмовые
- планшеты добавляют значительное количество места для отображения контента
+ планшеты добавляют значительное количество места для отображения контента
и привлечения пользователей. </p>
<p>Планируя интерфейс пользователя для работы на планшетах, убедитесь, что в нем будут
@@ -196,20 +196,20 @@
<img src="{@docRoot}images/ui-ex-single-panes.png" style="width:490px;padding:4px;margin-bottom:0em;" align="middle">
<img src="{@docRoot}images/ui-ex-multi-pane.png" style="width:490px;padding:4px;margin-bottom:0em;">
<p class="image-caption" style="padding:.5em"><span
-style="font-weight:500;">Составные представления</span> объединяют несколько простых представлений из
+style="font-weight:500;">Составные представления</span> объединяют несколько простых представлений из
интерфейса для смартфонов<em>(см. верхнюю часть рисунка)</em> в информативном и более эффективном
интерфейсе для планшетов <em>(см. нижнюю часть рисунка)</em>. </p>
</div>
</div>
-<li>Хотя отдельные экраны реализуются с помощью подкласса {@link android.app.Activity},
+<li>Хотя отдельные экраны реализуются с помощью подкласса {@link android.app.Activity},
старайтесь реализовать отдельные составные панели с помощью подкласса {@link
android.app.Fragment}. Это позволит повысить
применимость программного кода для использующих один и тот же контент экранов,
отличающихся форм-факторами и размерами.</li>
<li>Примите решение, для каких размеров экранов будет использоваться интерфейс с
- несколькими панелями, а затем предложите разные макеты для подобных размеров экранов (например, для категорий
-<code>large</code>/<code>xlarge</code>) или для экранов с минимальной шириной (таких, как категории
+ несколькими панелями, а затем предложите разные макеты для подобных размеров экранов (например, для категорий
+<code>large</code>/<code>xlarge</code>) или для экранов с минимальной шириной (таких, как категории
<code>sw600dp</code>/<code>sw720</code>).</li>
</ul>
@@ -496,7 +496,7 @@
которые <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#permissions">подразумевают наличие аппаратных
возможностей</a>, не применимых к планшетам. Если вы обнаружите декларацию таких прав доступа,
обязательно явным образом задекларируйте соответствующий элемент
-<code><uses-feature></code> для подразумеваемых возможностей и включите в него атрибут
+<code><uses-feature></code> для подразумеваемых возможностей и включите в него атрибут
<code>android:required=”false”</code>.</li>
</ul>
@@ -539,11 +539,11 @@
<code>android:xlargeScreens="true"</code>.</li>
</ul>
-<p>Если в манифесте приложения задекларирован элемент
+<p>Если в манифесте приложения задекларирован элемент
<a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html"><code><compatible-screens></code></a>,
в нем должны быть атрибуты, указывающие
<em>все комбинации размеров и разрешений для планшетных экранов</em>,
- поддерживаемые приложением. Обратите внимание, что там, где это возможно, вы должны избегать использования элемента
+ поддерживаемые приложением. Обратите внимание, что там, где это возможно, вы должны избегать использования элемента
<a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html"><code><compatible-screens></code></a>
для своего приложения.</p>
@@ -804,7 +804,7 @@
<p>
Сравнив <a href="{@docRoot}distribute/essentials/quality/core.html#test-environment">рекомендуемую
среду тестирования</a> для проверки с основными критериями качества приложения,
- включите в нее планшеты среднего размера и планшеты с большим или меньшим количеством
+ включите в нее планшеты среднего размера и планшеты с большим или меньшим количеством
аппаратных или программных функциональных возможностей.
</p>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/tv.jd b/docs/html-intl/intl/ru/distribute/googleplay/tv.jd
index 31a40ce..747c6d9 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/tv.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/tv.jd
@@ -78,7 +78,7 @@
<h3 id="develop_app">2. Создайте качественное телеприложение</h3>
<p>
- Качественное телеприложение предназначено для использования на
+ Качественное телеприложение предназначено для использования на
телевизионном экране, в нем реализованы возможности Android TV, а также соответствующих
устройств ввода: джойстиков, навигационных кнопок и пультов дистанционного управления. Это приложение тщательно проработано, обладает отлаженным и качественным
интерфейсом для больших экранов, предлагает привлекательный для пользователей
@@ -89,7 +89,7 @@
Обдумывая свое будущее телеприложение, изучите <a href="{@docRoot}training/tv/start/index.html">документацию для разработчиков</a> и
рекомендации относительно эргономики и постарайтесь максимально их
придерживаться. Позаботьтесь о максимальном удобстве работы для пользователей и обеспечьте
- его с помощью специальной библиотеки Leanback, входящей в SDK. Возможно, потребуется оптимизировать другие
+ его с помощью специальной библиотеки Leanback, входящей в SDK. Возможно, потребуется оптимизировать другие
части вашего приложения для использования на телеэкране, правильно будет определить это
в начальной стадии процесса разработки.
</p>
@@ -145,7 +145,7 @@
<li>Предусмотрите соблюдение критериев <a href="{@docRoot}distribute/essentials/quality/tv.html">Качества
телеприложений</a>.
<ul>
- <li>Используйте передовые
+ <li>Используйте передовые
методы <a href="{@docRoot}training/tv/index.html">разработки телеприложений</a>.</li>
<li>Убедитесь в том, что приложение соответствует всем критериям <a href="{@docRoot}distribute/essentials/quality/tv.html">качества телеприложений</a>.</li>
</ul>
@@ -181,7 +181,7 @@
<ul>
<li>В манифесте приложения для объекта Intent должен быть установлен тип <a href="{@docRoot}reference/android/content/Intent.html#ACTION_MAIN"><code>ACTION_MAIN</code></a>
- с категорией<a href="{@docRoot}reference/android/content/Intent.html#CATEGORY_LEANBACK_LAUNCHER">
+ с категорией<a href="{@docRoot}reference/android/content/Intent.html#CATEGORY_LEANBACK_LAUNCHER">
<code>CATEGORY_LEANBACK_LAUNCHER</code></a>. Дополнительную информацию см. <a href="{@docRoot}training/tv/start/start.html#tv-activity">здесь</a>.
</li>
@@ -261,7 +261,7 @@
соответствует критериям, вы получите <strong>уведомление на адрес электронной почты,
указанный в учетной записи разработчика</strong>, с описанием проблем, которые следует устранить. После
внесения необходимых исправлений вы можете загрузить новую версию своего приложения в консоль
- разработчика.
+ разработчика.
</p>
<p>
@@ -282,7 +282,7 @@
<li>
<em>Утверждено</em> – ваше приложение было проверено и утверждено. Приложение
- становится доступно пользователям программы Android TV.
+ становится доступно пользователям программы Android TV.
</li>
<li>
diff --git a/docs/html-intl/intl/ru/distribute/googleplay/wear.jd b/docs/html-intl/intl/ru/distribute/googleplay/wear.jd
index 1c6b270..9274401 100644
--- a/docs/html-intl/intl/ru/distribute/googleplay/wear.jd
+++ b/docs/html-intl/intl/ru/distribute/googleplay/wear.jd
@@ -152,7 +152,7 @@
<p>
Создав готовый к выпуску пакет APK и проверив его на соответствие всем критериям <a href="{@docRoot}distribute/essentials/quality/wear.html">качества приложений Android Wear</a>,
загрузите пакет в консоль разработчика. Добавьте снимки экранов Android Wear на страницу своего каталога
- и установите нужные параметры распространения. Если вы не знаете, как подготовить приложение к выпуску в Google Play, изучите
+ и установите нужные параметры распространения. Если вы не знаете, как подготовить приложение к выпуску в Google Play, изучите
<a href="{@docRoot}distribute/googleplay/publish/preparing.html">контрольный список при выпуске приложения.</a>
</p>
diff --git a/docs/html-intl/intl/ru/distribute/tools/launch-checklist.jd b/docs/html-intl/intl/ru/distribute/tools/launch-checklist.jd
index a62e3f1..303ab5b 100644
--- a/docs/html-intl/intl/ru/distribute/tools/launch-checklist.jd
+++ b/docs/html-intl/intl/ru/distribute/tools/launch-checklist.jd
@@ -692,7 +692,7 @@
</div>
<p>
- Прежде чем выпускать свои приложения всегда полезно получить отзывы
+ Прежде чем выпускать свои приложения всегда полезно получить отзывы
от настоящих пользователей — даже в большем количестве, чем при запуске новых приложений. Поэтому
настоятельно рекомендуется распространить предварительную версию приложения среди
таких тестирующих пользователей на ключевых для вас рынках и обеспечить для них удобный
@@ -983,7 +983,7 @@
<li>
<p>
- Помимо окна автоматического возмещения, предлагаемого Google Play, будьте щедрыми
+ Помимо окна автоматического возмещения, предлагаемого Google Play, будьте щедрыми
в своей собственной политике возмещения, удовлетворенные пользователи скорее совершат повторную
покупку в будущем.
</p>
diff --git a/docs/html-intl/intl/ru/distribute/tools/localization-checklist.jd b/docs/html-intl/intl/ru/distribute/tools/localization-checklist.jd
index 7aef25c..dccfb11 100644
--- a/docs/html-intl/intl/ru/distribute/tools/localization-checklist.jd
+++ b/docs/html-intl/intl/ru/distribute/tools/localization-checklist.jd
@@ -103,7 +103,7 @@
После определения намеченных для локализации языков оцените свои потребности
для их поддержки в своих приложениях и заранее спланируйте работу.
Следует учесть расширение лексики, требования к написанию, ограничению интервалов между знаками и
- переноса слов, поддержку написания слева направо и справа налево, а также другие
+ переноса слов, поддержку написания слева направо и справа налево, а также другие
потенциальные факторы каждого языка.
</p>
diff --git a/docs/html-intl/intl/ru/google/play/filters.jd b/docs/html-intl/intl/ru/google/play/filters.jd
index 0059a1a..ccac3894b 100644
--- a/docs/html-intl/intl/ru/google/play/filters.jd
+++ b/docs/html-intl/intl/ru/google/play/filters.jd
@@ -45,21 +45,21 @@
</div>
</div>
-<p>Когда пользователь просматривает каталог Google Play или ищет там приложения для загрузки,
-отображаемые результаты фильтруются с учетом того, какие приложения совместимы с его устройством.
+<p>Когда пользователь просматривает каталог Google Play или ищет там приложения для загрузки,
+отображаемые результаты фильтруются с учетом того, какие приложения совместимы с его устройством.
Например, если для приложения требуется камера, Google Play не отобразит его для устройств,
не оборудованных камерами. Такая <em>фильтрация</em> помогает разработчикам управлять
распространением своих приложений, а также обеспечивает максимальный уровень удобства для
пользователей.</p>
-<p>Для фильтрация в Google Play используется несколько типов метаданных приложений и
+<p>Для фильтрация в Google Play используется несколько типов метаданных приложений и
настройки конфигурации, включая декларированные в манифесте сведения, необходимые
библиотеки, архитектурные требования, и набор средств контроля за распространением, предусмотренный в консоли разработчика Google
Play, например, геотаргетинг, ценообразование и т. п.</p>
<p>Фильтрация в Google Play частично основывается на декларациях в манифесте и прочих
-аспектах платформы Android, но фактические функции фильтрации определяются
-именно самой платформой и не связаны с конкретными уровнями API-интерфейсов. В этом документе
+аспектах платформы Android, но фактические функции фильтрации определяются
+именно самой платформой и не связаны с конкретными уровнями API-интерфейсов. В этом документе
описываются действующие сейчас правила фильтрации в Google Play.</p>
@@ -81,7 +81,7 @@
специально запрашивает данное приложение или пытается перейти к нему по внешней ссылке, прямо указывающей на
идентификатор этого приложения в Google Play.</p>
-<p>Можно использовать любые комбинации доступных фильтров для своих приложений. Например, можно установить для
+<p>Можно использовать любые комбинации доступных фильтров для своих приложений. Например, можно установить для
<code>minSdkVersion</code> требуемое значение <code>"4"</code> и задать <code>smallScreens="false"</code>
в самом приложении, тогда при загрузке приложения в Google Play можно будет нацелить приложение
только на определенные европейские страны (или операторов связи). Таким образом, фильтры Google Play делают приложение недоступным на любом устройстве,
@@ -171,7 +171,7 @@
<strong>Результат</strong>: Google Play показывает это приложение пользователям всех устройств,
пока не будут применены другие фильтры. </p>
<p><strong>Пример 3<br />
- </strong>В манифесте декларируется <code><uses-sdk android:minSdkVersion="4"></code>
+ </strong>В манифесте декларируется <code><uses-sdk android:minSdkVersion="4"></code>
и не содержится элемент <code><supports-screens></code>.
<strong>Результат</strong>: Google Play показывает это приложение всем пользователям,
пока не будут применены другие фильтры. </p>
@@ -268,7 +268,7 @@
<tr id="uses-permission-filtering">
<td valign="top" style="white-space:nowrap;"><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code></td>
<td valign="top"> </td>
- <td valign="top">Собственно, Google Play не выполняет фильтрацию по элементам
+ <td valign="top">Собственно, Google Play не выполняет фильтрацию по элементам
<code><uses-permission></code>. Однако эти элементы считываются
для определения того, есть ли у приложения какие-либо требования к аппаратным компонентам,
которые, возможно, не были правильно задекларированы элементами <code><uses-feature></code>.
@@ -279,7 +279,7 @@
камеры.</p>
<p>В целом, если приложение запрашивает доступ к каким-то аппаратным компонентам,
Google Play считает, что для приложения необходимо наличие
-этих компонентов, даже когда это не отражено в соответствующих декларациях
+этих компонентов, даже когда это не отражено в соответствующих декларациях
<code><uses-feature></code>. Затем Google Play осуществляет
фильтрацию с учетом таких функциональных возможностей, подразумеваемых декларациями <code><uses-feature></code>
в манифесте.</p>
diff --git a/docs/html-intl/intl/ru/guide/components/activities.jd b/docs/html-intl/intl/ru/guide/components/activities.jd
index 5f55a35..3fab970 100644
--- a/docs/html-intl/intl/ru/guide/components/activities.jd
+++ b/docs/html-intl/intl/ru/guide/components/activities.jd
@@ -50,8 +50,8 @@
отображается во весь экран, однако его размер может быть меньше, и оно может размещаться поверх других
окон.</p>
-<p> Как правило, приложение состоит из нескольких операций, которые слабо
-связаны друг с другом. Обычно одна из операций в приложении обозначается как «основная»,
+<p> Как правило, приложение состоит из нескольких операций, которые слабо
+связаны друг с другом. Обычно одна из операций в приложении обозначается как «основная»,
предлагаемая пользователю при первом запуске приложения. В свою очередь, каждая
операция может запустить другую операцию для выполнения различных действий. Каждый раз, когда
запускается новая операция, предыдущая операция останавливается, однако система сохраняет ее
@@ -115,11 +115,11 @@
кнопка, нажатие на которую приводит к выполнению определенного действия.</p>
<p>В Android предусмотрен набор уже готовых представлений, которые можно использовать для создания дизайна макета и его
-организации. Виджеты — это представления с визуальными (и интерактивными) элементами, например,
+организации. Виджеты — это представления с визуальными (и интерактивными) элементами, например,
кнопками, текстовыми полями, чекбоксами или просто изображениями. Макеты — это представления, полученные из класса {@link
android.view.ViewGroup}, обеспечивающие уникальную модель компоновки для своих дочерних представлений, таких как линейный
макет, сетка или относительный макет. Также можно создать подкласс для классов {@link android.view.View} и
-{@link android.view.ViewGroup} (или воспользоваться существующими подклассами), чтобы создать собственные виджеты и
+{@link android.view.ViewGroup} (или воспользоваться существующими подклассами), чтобы создать собственные виджеты и
макеты, и затем применить их к макету своей операции.</p>
<p>Чаще всего для задания макета с помощью представлений используется XML-файл макета, сохраненный в
@@ -343,8 +343,8 @@
также иногда называется «Выполняется».)</dd>
<dt><i>Приостановлена</i></dt>
- <dd>На переднем фоне выполняется другая операция, которая отображается для пользователя, однако эта операция по-прежнему не скрыта. То есть
-поверх текущей операции отображается другая операция, частично прозрачная или не занимающая
+ <dd>На переднем фоне выполняется другая операция, которая отображается для пользователя, однако эта операция по-прежнему не скрыта. То есть
+поверх текущей операции отображается другая операция, частично прозрачная или не занимающая
полностью весь экран. Приостановленная операция полностью активна (объект {@link android.app.Activity}
по-прежнему находится в памяти, в нем сохраняются все сведения о состоянии и информация об элементах, и он также остается связанным с
диспетчером окон), однако в случае острой нехватки памяти система может завершить ее.</dd>
@@ -357,7 +357,7 @@
может завершить ее.</dd>
</dl>
-<p>Если операция приостановлена или полностью остановлена, система может очистить ее из памяти путем
+<p>Если операция приостановлена или полностью остановлена, система может очистить ее из памяти путем
завершения самой операции (с помощью метода {@link android.app.Activity#finish finish()}) или просто завершить ее
процесс. В случае повторного открытия операции (после ее завершения) ее потребуется создать
полностью.</p>
@@ -366,7 +366,7 @@
<h3 id="ImplementingLifecycleCallbacks">Реализация обратных вызовов жизненного цикла</h3>
-<p>При переходе операции из одного вышеописанного состояния в другое, уведомления об этом
+<p>При переходе операции из одного вышеописанного состояния в другое, уведомления об этом
реализуются через различные методы обратного вызова. Все методы обратного вызова представляют собой привязки, которые
можно переопределить для выполнения подходящего действия при изменении состояния операции. Указанная ниже базовая
операция включает каждый из основных методов жизненного цикла.</p>
@@ -431,7 +431,7 @@
сохранить ресурсы, необходимые для отображения операции для пользователя. Например, можно зарегистрировать объект
{@link android.content.BroadcastReceiver} в методе {@link
android.app.Activity#onStart onStart()} для отслеживания изменений, влияющих на пользовательский интерфейс, а затем отменить его регистрацию
-в методе {@link android.app.Activity#onStop onStop()}, когда пользователь больше не видит
+в методе {@link android.app.Activity#onStop onStop()}, когда пользователь больше не видит
отображаемого. В течение всего жизненного цикла операции система может несколько раз вызывать методы {@link android.app.Activity#onStart onStart()} и {@link
android.app.Activity#onStop onStop()}, поскольку
операция то отображается для пользователя, то скрывается от него.</p></li>
@@ -629,7 +629,7 @@
<p class="note"><strong>Примечание.</strong> Нет никаких гарантий, что метод {@link
android.app.Activity#onSaveInstanceState onSaveInstanceState()} будет вызван до того, как ваша
операция будет уничтожена, поскольку существуют случаи, когда нет необходимости сохранять состояние
-(например, когда пользователь покидает вашу операцию нажатием кнопки <em>Назад</em>,
+(например, когда пользователь покидает вашу операцию нажатием кнопки <em>Назад</em>,
явным образом
закрывая ее). Если система вызывает метод {@link android.app.Activity#onSaveInstanceState
onSaveInstanceState()}, она делает это до вызова метода {@link
@@ -719,7 +719,7 @@
<h3 id="CoordinatingActivities">Согласование операций</h3>
<p>Когда одна операция запускает другую, в жизненных циклах обеих из них происходит переход из одного состояния в другое. Первая операция
-приостанавливается и заврешается (однако она не будет остановлена, если она по-прежнему видима на фоне), а вторая
+приостанавливается и заврешается (однако она не будет остановлена, если она по-прежнему видима на фоне), а вторая
операция создается. В случае, если эти операции обмениваются данным, сохраненными на диске или в другом месте, важно понимать,
что первая операция не останавливается полностью до тех пор, пока не будет создана вторая операция.
Наоборот, процесс запуска второй операции накладывается на процесс остановки первой
diff --git a/docs/html-intl/intl/ru/guide/components/bound-services.jd b/docs/html-intl/intl/ru/guide/components/bound-services.jd
index ad690b7..4b2ae26 100644
--- a/docs/html-intl/intl/ru/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/ru/guide/components/bound-services.jd
@@ -46,9 +46,9 @@
IPC. Привязанная служба обычно работает, пока другой компонент приложения
привязан к ней. Она не работает постоянно в фоновом режиме.</p>
-<p>В этом документе рассказывается, как создать привязанную службу, включая привязку
+<p>В этом документе рассказывается, как создать привязанную службу, включая привязку
службы к другим компонентам приложения. Также рекомендуем обратиться к статье <a href="{@docRoot}guide/components/services.html">Службы</a>, чтобы узнать подробнее
-о службах, например, об организации отправки уведомлений от службы, настройке службы
+о службах, например, об организации отправки уведомлений от службы, настройке службы
на работу на переднем плане и т. д.</p>
@@ -91,7 +91,7 @@
bindService()}. После привязки он должен предоставить реализацию метода {@link
android.content.ServiceConnection}, который служит для отслеживания подключения к службе. Метод {@link
android.content.Context#bindService bindService()} возвращается незамедлительно без значения, однако
-, когда система Android устанавливает подключение
+, когда система Android устанавливает подключение
клиент-служба, она вызывает метод {@link
android.content.ServiceConnection#onServiceConnected onServiceConnected()} для {@link
android.content.ServiceConnection}, чтобы выдать объект {@link android.os.IBinder}, который
@@ -127,7 +127,7 @@
после чего он может использовать его для получения прямого доступа к общедоступным методам, имеющимся либо в реализации {@link android.os.Binder},
либо даже в {@link android.app.Service}.
<p>Этот способ является предпочтительным, когда служба просто выполняется в фоновом режиме для
-вашего приложения. Этот способ не подходит для создания интерфейса только тогда,
+вашего приложения. Этот способ не подходит для создания интерфейса только тогда,
когда ваша служба используется другими приложениями или в отдельных процессах.</dd>
<dt><a href="#Messenger">Использование объекта Messenger</a></dt>
@@ -149,7 +149,7 @@
примитивы, которые операционная система может распознать и распределить по процессам для организации
взаимодействия между ними (IPC). Предыдущий способ с использованием объекта {@link android.os.Messenger} фактически основан на AIDL, поскольку это его
базовая структура. Как уже упоминалось выше, объект {@link android.os.Messenger} создает очередь из всех
-запросов клиентов в рамках одного потока, поэтому служба одновременно получает только один запрос. Однако,
+запросов клиентов в рамках одного потока, поэтому служба одновременно получает только один запрос. Однако,
если необходимо, чтобы служба обрабатывала одновременно сразу несколько запросов, можно использовать AIDL
напрямую. В таком случае ваша служба должна поддерживать многопоточность и должна быть потокобезопасной.
<p>Чтобы использовать AIDL напрямую, необходимо
@@ -499,7 +499,7 @@
onBind()} службы, который возвращает объект {@link android.os.IBinder} для взаимодействия со службой.</p>
<p>Привязка выполняется асинхронно. {@link android.content.Context#bindService
-bindService()} возвращается сразу же и <em>не</em> возвращает клиенту объект
+bindService()} возвращается сразу же и <em>не</em> возвращает клиенту объект
{@link android.os.IBinder}. Для получения объекта {@link android.os.IBinder} клиенту необходимо создать экземпляр {@link
android.content.ServiceConnection} и передать его в метод {@link android.content.Context#bindService
bindService()}. Интерфейс {@link android.content.ServiceConnection} включает метод обратного вызова,
@@ -608,7 +608,7 @@
во время выполнения методов {@link android.app.Activity#onResume onResume()} и {@link
android.app.Activity#onPause onPause()} вашей операции, поскольку такие обратные вызовы происходят при каждом переходе из одного состояния в другое,
а обработка данных, выполняемая при таких переходах, должна быть минимальной. Кроме того, если к одной и той же
-службе привязано несколько операций в вашем приложении, и имеется переход между
+службе привязано несколько операций в вашем приложении, и имеется переход между
двумя этими операциями, служба может быть уничтожена и создана повторно, поскольку текущая операция выполняет отмену привязки
(во время приостановки) до того, как следующая служба выполнит привязку (во время возобновления). (Подробные сведения о согласовании жизненных циклов операций при таких переходах
представлены в статье
diff --git a/docs/html-intl/intl/ru/guide/components/fragments.jd b/docs/html-intl/intl/ru/guide/components/fragments.jd
index b13fcc3..6fc39b7 100644
--- a/docs/html-intl/intl/ru/guide/components/fragments.jd
+++ b/docs/html-intl/intl/ru/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>См. также:</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Создание динамического интерфейса пользователя с использованием фрагментов</a></li>
@@ -56,10 +56,10 @@
<p>Фрагмент всегда должен быть встроен в операцию, и на его жизненный цикл напрямую
влияет жизненный цикл операции. Например, когда операция приостановлена, в том же состоянии находятся и все
фрагменты внутри нее, а когда операция уничтожается, уничтожаются и все фрагменты. Однако пока
-операция выполняется (это соответствует состоянию <em>возобновлена</em> <a href="{@docRoot}guide/components/activities.html#Lifecycle">жизненного цикла</a>), можно
+операция выполняется (это соответствует состоянию <em>возобновлена</em> <a href="{@docRoot}guide/components/activities.html#Lifecycle">жизненного цикла</a>), можно
манипулировать каждым фрагментом независимо, например добавлять или удалять их. Когда разработчик выполняет такие
транзакции с фрагментами, он может также добавить их в стек переходов назад, которым управляет
-операция. Каждый элемент стека переходов назад в операции является записью
+операция. Каждый элемент стека переходов назад в операции является записью
выполненной транзакции с фрагментом. Стек переходов назад позволяет пользователю обратить транзакцию с фрагментом (выполнить навигацию в обратном направлении),
нажимая кнопку <em>Назад</em>.</p>
@@ -96,7 +96,7 @@
операции, как на планшете, изображенном на рисунке 1.</p>
<p>Следует разрабатывать каждый фрагмент как модульный и повторно используемый компонент операции. Поскольку
- каждый фрагмент определяет собственный макет и собственное поведение со своими обратными вызовами жизненного цикла, разработчик может
+ каждый фрагмент определяет собственный макет и собственное поведение со своими обратными вызовами жизненного цикла, разработчик может
включить один фрагмент в несколько операций. Поэтому он должен предусмотреть повторное использование фрагмента и не допускать,
чтобы один фрагмент непосредственно манипулировал другим. Это особенно важно, потому что модульность фрагментов
позволяет изменять их сочетания в соответствии с различными размерами экранов. Если
@@ -335,7 +335,7 @@
<p>Первый аргумент, передаваемый методу {@link android.app.FragmentTransaction#add(int,Fragment) add()},
представляет собой контейнерный объект {@link android.view.ViewGroup} для фрагмента, указанный при помощи
идентификатора ресурса. Второй параметр — это фрагмент, который нужно добавить.</p>
- <p>Выполнив изменения с помощью
+ <p>Выполнив изменения с помощью
{@link android.app.FragmentTransaction}, необходимо
вызвать метод {@link android.app.FragmentTransaction#commit}, чтобы они вступили в силу.</p>
</li>
@@ -355,14 +355,14 @@
android.app.Fragment#onCreateView onCreateView()}. Поэтому в реализации этого метода нет необходимости.</p>
<p>Передача строкового тега свойственна не только фрагментам без пользовательского интерфейса, поэтому можно
-передавать строковые теги и фрагментам, имеющим пользовательский интерфейс. Однако, если у фрагмента нет
+передавать строковые теги и фрагментам, имеющим пользовательский интерфейс. Однако, если у фрагмента нет
пользовательского интерфейса, то строковый тег является единственным способом его идентификации. Если впоследствии потребуется получить фрагмент от
операции, нужно будет вызвать метод {@link android.app.FragmentManager#findFragmentByTag
findFragmentByTag()}.</p>
<p>Пример операции, использующей фрагмент в качестве фонового потока, без пользовательского интерфейса, приведен в образце кода {@code
-FragmentRetainInstance.java}, входящем в число образцов в SDK (и доступном при помощи
-Android SDK Manager). Путь к нему в системе —
+FragmentRetainInstance.java}, входящем в число образцов в SDK (и доступном при помощи
+Android SDK Manager). Путь к нему в системе —
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code>.</p>
@@ -378,7 +378,7 @@
<li>получать фрагменты, имеющиеся в операции, с помощью метода {@link
android.app.FragmentManager#findFragmentById findFragmentById()} (для фрагментов, предоставляющих пользовательский интерфейс в
макете операции) или {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()} (как для фрагментов, имеющих пользовательский интерфейс, так и для фрагментов без него);</li>
+findFragmentByTag()} (как для фрагментов, имеющих пользовательский интерфейс, так и для фрагментов без него);</li>
<li>снимать фрагменты со стека переходов назад методом {@link
android.app.FragmentManager#popBackStack()} (имитируя нажатие кнопки <em>Назад</em> пользователем);</li>
<li>регистрировать процесс-слушатель изменений в стеке переходов назад при помощи метода {@link
@@ -475,7 +475,7 @@
<p>Вызов метода {@link android.app.FragmentTransaction#commit()} не приводит к немедленному выполнению
транзакции. Метод запланирует ее выполнение в потоке пользовательского интерфейса операции (в «главном» потоке), как только
у потока появится возможность для этого. Впрочем, при необходимости можно вызвать {@link
-android.app.FragmentManager#executePendingTransactions()} из потока пользовательского интерфейса, чтобы
+android.app.FragmentManager#executePendingTransactions()} из потока пользовательского интерфейса, чтобы
транзакции, запланированные методом {@link android.app.FragmentTransaction#commit()} были выполнены немедленно. Как правило,
в этом нет необходимости, за исключением случаев, когда транзакция является зависимостью для заданий в других потоках.</p>
@@ -600,7 +600,7 @@
<h3 id="ActionBar">Добавление элементов в строку действий</h3>
-<p>Фрагменты могут добавлять пункты меню в <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">Меню вариантов</a> операции (и, следовательно, в <a href="{@docRoot}guide/topics/ui/actionbar.html">Строку действий</a>), реализовав
+<p>Фрагменты могут добавлять пункты меню в <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">Меню вариантов</a> операции (и, следовательно, в <a href="{@docRoot}guide/topics/ui/actionbar.html">Строку действий</a>), реализовав
{@link android.app.Fragment#onCreateOptionsMenu(Menu,MenuInflater) onCreateOptionsMenu()}. Однако, чтобы этот метод мог
принимать вызовы, необходимо вызывать {@link
android.app.Fragment#setHasOptionsMenu(boolean) setHasOptionsMenu()} во время выполнения метода {@link
@@ -639,7 +639,7 @@
фрагмента</p>
</div>
-<p>Управление жизненным циклом фрагмента во многом аналогично управлению жизненным циклом операции. Как и
+<p>Управление жизненным циклом фрагмента во многом аналогично управлению жизненным циклом операции. Как и
операция, фрагмент может существовать в одном из трех состояний:</p>
<dl>
@@ -677,7 +677,7 @@
android.app.FragmentTransaction#addToBackStack(String) addToBackStack()} во время транзакции,
удаляющей фрагмент.</p>
-<p>В остальном управление жизненным циклом фрагмента очень похоже на управление жизненным циклом
+<p>В остальном управление жизненным циклом фрагмента очень похоже на управление жизненным циклом
операции. Поэтому практические рекомендации по <a href="{@docRoot}guide/components/activities.html#Lifecycle">управлению жизненным циклом
операций</a> применимы и к фрагментам. При этом разработчику необходимо понимать, как жизненный цикл
операции влияет на жизненный цикл фрагмента.</p>
@@ -722,7 +722,7 @@
{@link android.app.Fragment#onActivityCreated onActivityCreated()}.</p>
<p>Когда операция переходит в состояние «возобновлена», можно свободно добавлять в нее фрагменты и удалять
-их. Таким образом, жизненный цикл фрагмента может быть независимо изменен, только пока операция остается
+их. Таким образом, жизненный цикл фрагмента может быть независимо изменен, только пока операция остается
в состоянии «возобновлена».</p>
<p>Однако, когда операция выходит из этого состояния, продвижение фрагмента по его
@@ -785,7 +785,7 @@
<p>Второй фрагмент, {@code DetailsFragment}, отображает краткое содержание пьесы, выбранной в
списке {@code TitlesFragment}:</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>Вспомним код класса {@code TitlesFragment}: если пользователь нажимает на пункт списка, а
@@ -798,7 +798,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>Обратите внимание, что в альбомной конфигурации эта операция самостоятельно завершается, чтобы главная
операция могла принять управление и отобразить фрагмент {@code DetailsFragment} рядом с фрагментом{@code TitlesFragment}.
Это может произойти, если пользователь запустит операцию {@code DetailsActivity} в книжной ориентации экрана, а
diff --git a/docs/html-intl/intl/ru/guide/components/fundamentals.jd b/docs/html-intl/intl/ru/guide/components/fundamentals.jd
index 181cbbd..07f001a 100644
--- a/docs/html-intl/intl/ru/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/ru/guide/components/fundamentals.jd
@@ -165,7 +165,7 @@
<p>Уникальной особенностью системы Android является то, что любое приложение может запустить компонент
другого приложения. Например, если вы хотите дать пользователю возможность фотографировать, используя
-камеру устройства, то, поскольку наверняка имеется другое приложение, которое может выполнить это действие, вместо того чтобы разработать операцию фотографирования в своем приложении, вы можете вызвать
+камеру устройства, то, поскольку наверняка имеется другое приложение, которое может выполнить это действие, вместо того чтобы разработать операцию фотографирования в своем приложении, вы можете вызвать
такое приложение. Вам не
нужно внедрять код из приложения для камеры или даже устанавливать на него ссылку.
Вместо этого вы можете просто запустить операцию фотографирования
@@ -212,7 +212,7 @@
содержит только строку "аккумулятор разряжен").</p>
<p>Компоненты четвертого типа – поставщики контента – сообщениями Intent не активируются. Они
-активируются по запросу от {@link android.content.ContentResolver}. Процедура определения
+активируются по запросу от {@link android.content.ContentResolver}. Процедура определения
контента (content resolver) обрабатывает все прямые транзакции с поставщиком контента, с тем чтобы этого не пришлось делать компоненту, который
выполняет транзакции с поставщиком. Вместо этого он вызывает методы для объекта {@link
android.content.ContentResolver}. Это формирует слой, абстрагирующий (в целях безопасности) поставщика
@@ -224,7 +224,7 @@
передав объект {@link android.content.Intent} методу {@link android.content.Context#startActivity
startActivity()} или {@link android.app.Activity#startActivityForResult startActivityForResult()}
(если требуется, чтобы операция вернула результат).</li>
- <li>Можно запустить службу (либо выдать работающей службе новые инструкции),
+ <li>Можно запустить службу (либо выдать работающей службе новые инструкции),
передав объект {@link android.content.Intent} методу {@link android.content.Context#startService
startService()}. Либо можно установить привязку к службе, передав объект{@link android.content.Intent} методу
{@link android.content.Context#bindService bindService()}.</li>
@@ -236,7 +236,7 @@
android.content.ContentProvider#query query()} для объекта {@link android.content.ContentResolver}.</li>
</ul>
-<p>Подробные сведения об использовании объектов Intent приведены в документе <a href="{@docRoot}guide/components/intents-filters.html">Объекты Intent и
+<p>Подробные сведения об использовании объектов Intent приведены в документе <a href="{@docRoot}guide/components/intents-filters.html">Объекты Intent и
фильтры объектов Intent</a>. Более подробная информация об активации определенных компонентов также приведена
в следующих документах: <a href="{@docRoot}guide/components/activities.html">Операции</a>, <a href="{@docRoot}guide/components/services.html">Службы</a>, {@link
android.content.BroadcastReceiver} и <a href="{@docRoot}guide/topics/providers/content-providers.html">Поставщики контента</a>.</p>
@@ -312,7 +312,7 @@
в манифесте, поэтому они не могут быть запущены. А вот
приемники широковещательных сообщений
можно либо объявить в манифесте, либо создать динамически в коде (как объекты
-{@link android.content.BroadcastReceiver}) и зарегистрировать в системе путем вызова
+{@link android.content.BroadcastReceiver}) и зарегистрировать в системе путем вызова
{@link android.content.Context#registerReceiver registerReceiver()}.</p>
<p>Подробные сведения о структуризации файла манифеста для приложения см. в документе <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">Файл AndroidManifest.xml</a>
@@ -331,7 +331,7 @@
действие, и запустить его. При наличии нескольких компонентов, которые могут выполнить действие, описанное в сообщении
Intent, пользователь выбирает, какой из них будет использоваться.</p>
-<p>Система определяет компоненты, которые могут ответить на сообщение Intent, путем сравнения
+<p>Система определяет компоненты, которые могут ответить на сообщение Intent, путем сравнения
полученного сообщения Intent с <i>фильтрами объектов Intent,</i> указанными в файле манифеста других приложений, имеющихся
на устройстве.</p>
@@ -373,13 +373,13 @@
<p>Существует огромное количество устройств, работающих под управлением Android, и не все они имеют
одинаковые функциональные возможности. Чтобы ваше приложение не могло быть установлено на устройствах,
в которых отсутствуют функции, необходимые приложению, важно четко определить профиль для
-типов устройств, поддерживаемых вашим приложением, указав требования к аппаратному и программному обеспечению в
+типов устройств, поддерживаемых вашим приложением, указав требования к аппаратному и программному обеспечению в
файле манифеста. Эти объявления по большей части носят информационный характер, система их не
читает. Однако их читают внешние службы, например Google Play, с целью обеспечения
фильтрации для пользователей, которые ищут приложения для своих устройств.</p>
<p>Например, если вашему приложению требуется камера и оно использует API-интерфейсы из Android 2.1 (<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">уровень API</a> 7),
-эти параметры следует объявить в файле манифеста в качестве требований следующим образом:</p>
+эти параметры следует объявить в файле манифеста в качестве требований следующим образом:</p>
<pre>
<manifest ... >
@@ -390,7 +390,7 @@
</manifest>
</pre>
-<p>Теперь ваше приложение нельзя будет установить из Google Play на устройствах, в которых <em>нет</em> камеры, а также на устройствах, работающих под управлением
+<p>Теперь ваше приложение нельзя будет установить из Google Play на устройствах, в которых <em>нет</em> камеры, а также на устройствах, работающих под управлением
Android версии <em>ниже</em> 2.1.</p>
<p>Однако можно также объявить, что приложение использует камеру, но для его работы она не является
@@ -430,7 +430,7 @@
соответствующем языке.</p>
<p>Android поддерживает разные <em>квалификаторы</em> для соответствующих ресурсов. Квалификатор
- представляет собой короткую строку, которая включается в имена каталогов ресурсов с целью
+ представляет собой короткую строку, которая включается в имена каталогов ресурсов с целью
определения конфигурации устройства, для которой эти ресурсы следует использовать. В качестве другого
примера можно сказать, что для своих операций следует создавать разные макеты, которые будут соответствовать
размеру и ориентации экрана устройства. Например, когда экран устройства имеет книжную
@@ -469,7 +469,7 @@
<dl>
<dt><a href="{@docRoot}guide/practices/compatibility.html">Совместимость устройств</a></dt>
<dd>Сведения о том, каким образом система Android работает на устройствах разных типов, и общие сведения о том,
- как оптимизировать свое приложение для каждого устройства или ограничить круг устройств, на которых может быть установлено
+ как оптимизировать свое приложение для каждого устройства или ограничить круг устройств, на которых может быть установлено
приложение.</dd>
<dt><a href="{@docRoot}guide/topics/security/permissions.html">Системные разрешения</a></dt>
<dd>Сведения о том, как система Android ограничивает доступ приложений к определенным API-интерфейсам с помощью системы
diff --git a/docs/html-intl/intl/ru/guide/components/index.jd b/docs/html-intl/intl/ru/guide/components/index.jd
index 41d5a34..13050f2 100644
--- a/docs/html-intl/intl/ru/guide/components/index.jd
+++ b/docs/html-intl/intl/ru/guide/components/index.jd
@@ -1,7 +1,7 @@
page.title=Компоненты приложения
page.landing=true
-page.landing.intro=Платформа приложений системы Android позволяет создавать функциональные и инновационные приложения с помощью набора компонентов, которые можно использовать многократно. В этом разделе рассказывается о том, как создавать компоненты, определяющие элементы структуры вашего приложения, и как связывать их воедино с помощью объектов Intent.
-page.metaDescription=Платформа приложений системы Android позволяет создавать функциональные и инновационные приложения с помощью набора компонентов, которые можно использовать многократно. В этом разделе рассказывается о том, как создавать компоненты, определяющие элементы структуры вашего приложения, и как связывать их воедино с помощью объектов Intent.
+page.landing.intro=Платформа приложений системы Android позволяет создавать функциональные и инновационные приложения с помощью набора компонентов, которые можно использовать многократно. В этом разделе рассказывается о том, как создавать компоненты, определяющие элементы структуры вашего приложения, и как связывать их воедино с помощью объектов Intent.
+page.metaDescription=Платформа приложений системы Android позволяет создавать функциональные и инновационные приложения с помощью набора компонентов, которые можно использовать многократно. В этом разделе рассказывается о том, как создавать компоненты, определяющие элементы структуры вашего приложения, и как связывать их воедино с помощью объектов Intent.
page.landing.image=images/develop/app_components.png
page.image=images/develop/app_components.png
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>Статьи блога</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>Использование класса DialogFragment</h4>
<p>В этой статье я расскажу, как с помощью DialogFragment с использованием вспомогательной библиотеки v4 (в целях обеспечения совместимости с устройствами, работающими под управлением системы с версией ниже, чем Honeycomb) можно отобразить простое диалоговое окно редактирования и вернуть результат в вызывающую операцию с помощью интерфейса.</p>
@@ -21,7 +21,7 @@
<h4>Фрагменты для всех</h4>
<p>Сегодня мы выпустили библиотеку статических элементов, которая предоставляет доступ к тому же Fragments API (а также новому классу LoaderManager и нескольким другим классам), с тем чтобы приложения, совместимые с Android 1.6 и более поздними версиями, могли использовать фрагменты для создания пользовательских интерфейсов для планшетов. </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>Многопоточность для повышения производительности</h4>
<p>Для создания быстро реагирующих приложений рекомендуется, чтобы в основном потоке пользовательского интерфейса
@@ -32,7 +32,7 @@
<div class="col-6">
<h3>Обучение</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>Управление жизненным циклом операций</h4>
<p>В этом учебном курсе разъясняются важные методы обратного вызова жизненного цикла, которые получает каждый экземпляр
diff --git a/docs/html-intl/intl/ru/guide/components/loaders.jd b/docs/html-intl/intl/ru/guide/components/loaders.jd
index eea72a2..a554067 100644
--- a/docs/html-intl/intl/ru/guide/components/loaders.jd
+++ b/docs/html-intl/intl/ru/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>Основные классы</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>Образцы кода по теме</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -51,7 +51,7 @@
воссоздании после изменения конфигурации. Таким образом, им не требуется повторно запрашивать свои
данные.</li>
</ul>
-
+
<h2 id="summary">Сводная информация об API-интерфейсе загрузчика</h2>
<p>Имеется несколько классов и интерфейсов, которые могут использовать
@@ -68,7 +68,7 @@
{@link android.app.Fragment} для управления одним или несколькими интерфейсами {@link
android.content.Loader}. Это позволяет приложению управлять
длительно выполняющимися операциями вместе с жизненным циклом {@link android.app.Activity}
-или {@link android.app.Fragment}; чаще всего этот класс используется с
+или {@link android.app.Fragment}; чаще всего этот класс используется с
{@link android.content.CursorLoader}, однако приложения могут писать
свои собственные загрузчики для работы с другими типами данных.
<br />
@@ -129,10 +129,10 @@
загрузки данных из другого источника;</li>
<li>реализация для {@link android.app.LoaderManager.LoaderCallbacks}.
Именно здесь создаются новые загрузчики и ведется управление ссылками на существующие
-загрузчики;</li>
+загрузчики;</li>
<li>способ отображения данных загрузчика, например {@link
android.widget.SimpleCursorAdapter};</li>
- <li>источник данных, например {@link android.content.ContentProvider}, когда используется
+ <li>источник данных, например {@link android.content.ContentProvider}, когда используется
{@link android.content.CursorLoader}.</li>
</ul>
<h3 id="starting">Запуск загрузчика</h3>
@@ -140,11 +140,11 @@
<p>{@link android.app.LoaderManager} управляет одним или несколькими экземплярами {@link
android.content.Loader} в {@link android.app.Activity} или
{@link android.app.Fragment}. Имеется только один {@link
-android.app.LoaderManager} на каждую операцию или каждый фрагмент.</p>
+android.app.LoaderManager} на каждую операцию или каждый фрагмент.</p>
<p>{@link android.content.Loader} обычно
инициализируется в методе {@link
-android.app.Activity#onCreate onCreate()} операции или в методе фрагмента
+android.app.Activity#onCreate onCreate()} операции или в методе фрагмента
{@link android.app.Fragment#onActivityCreated onActivityCreated()}. Делается
это следующим образом:</p>
@@ -157,13 +157,13 @@
<ul>
<li>уникальный идентификатор, обозначающий загрузчик. В данном примере идентификатором является 0;</li>
<li>необязательные аргументы, которые передаются загрузчику при
-построении (в данном примере это <code>null</code>);</li>
+построении (в данном примере это <code>null</code>);</li>
<li>реализация {@link android.app.LoaderManager.LoaderCallbacks}, которая
вызывает класс {@link android.app.LoaderManager} для выдачи событий загрузчика. В данном
примере локальный класс реализует интерфейс {@link
android.app.LoaderManager.LoaderCallbacks}, поэтому он передает ссылку
-самому себе: {@code this}.</li>
+самому себе: {@code this}.</li>
</ul>
<p>Вызов {@link android.app.LoaderManager#initLoader initLoader()} обеспечивает инициализацию
загрузчика. Возможен один из двух результатов:</p>
@@ -193,7 +193,7 @@
начинает загрузку и заканчивает ее при необходимости, а также поддерживает состояние загрузчика
и связанного с ним контента. А это подразумевает, что вы будете редко взаимодействовать с загрузчиками
напрямую (однако пример использования методов загрузчика для тонкой настройки его
-поведения см. в образце кода <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
+поведения см. в образце кода <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
Для вмешательства в процесс загрузки при возникновении определенных событий обычно используются методы {@link
android.app.LoaderManager.LoaderCallbacks}
. Более подробные сведения об этом см. в разделе <a href="#callback">Использование обратных вызовов LoaderManager</a>.</p>
@@ -343,8 +343,8 @@
<p>Этот метод вызывается, когда состояние созданного ранее загрузчика сбрасывается, в результате чего
его данные теряются. Этот обратный вызов позволяет узнать, когда данные
вот-вот будут высвобождены, с тем чтобы можно было удалить свою ссылку на них. </p>
-<p>Данная реализация вызывает
-{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
+<p>Данная реализация вызывает
+{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
со значением <code>null</code>:</p>
<pre>
@@ -366,7 +366,7 @@
android.app.Fragment}, который отображает {@link android.widget.ListView} с
результатами запроса к поставщику такого контента, как контакты. Для управления запросом к поставщику используется класс {@link
android.content.CursorLoader}.</p>
-
+
<p>Чтобы приложение могло обращаться к контактам пользователя, как показано в этом примере, в его
манифесте должно присутствовать разрешение
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS}.</p>
diff --git a/docs/html-intl/intl/ru/guide/components/processes-and-threads.jd b/docs/html-intl/intl/ru/guide/components/processes-and-threads.jd
index fd298e0..c9b7dbe 100644
--- a/docs/html-intl/intl/ru/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/ru/guide/components/processes-and-threads.jd
@@ -120,7 +120,7 @@
<ul>
<li>Он содержит действие {@link android.app.Activity}, которое не находится на переднем плане, но
-видно пользователю (вызван метод {@link android.app.Activity#onPause onPause()}).
+видно пользователю (вызван метод {@link android.app.Activity#onPause onPause()}).
Например, это может происходить, если действие на переднем плане запустило диалоговое окно, которое позволяет видеть
предыдущее действие позади него.</li>
@@ -142,7 +142,7 @@
</li>
<li><b>Фоновый процесс</b>
- <p>Процесс, содержащий действия, которые не видны пользователю в настоящее время (вызван метод
+ <p>Процесс, содержащий действия, которые не видны пользователю в настоящее время (вызван метод
{@link android.app.Activity#onStop onStop()} действия). Эти процессы не оказывают непосредственного
воздействия на работу пользователя, и система может удалить их в любой момент, чтобы освободить память для
процессов переднего плана,
@@ -168,7 +168,7 @@
компонентов, активных в процессе в текущее время. Например, если процесс содержит служебное и видимое действие,
процесс считается видимым, а не служебным процессом.</p>
- <p>Кроме того, уровень процесса может быть повышен, поскольку имеются другие процессы, зависимые от него.
+ <p>Кроме того, уровень процесса может быть повышен, поскольку имеются другие процессы, зависимые от него.
Например, процесс, обслуживающий другой процесс, не может иметь уровень ниже уровня обслуживаемого
процесса. Например, если поставщик контента в процессе A обслуживает клиента в процессе B или
служебный процесс A связан с компонентом в процессе B, процесс A всегда считается не менее
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
diff --git a/docs/html-intl/intl/ru/guide/components/services.jd b/docs/html-intl/intl/ru/guide/components/services.jd
index 62a6a7e..28e9daa 100644
--- a/docs/html-intl/intl/ru/guide/components/services.jd
+++ b/docs/html-intl/intl/ru/guide/components/services.jd
@@ -291,7 +291,7 @@
<li>Создает рабочую очередь, которая передает намерения по одному в вашу реализацию метода {@link
android.app.IntentService#onHandleIntent onHandleIntent()}, поэтому вы не должны беспокоиться
относительно многопоточности.</li>
- <li>Останавливает службу после обработки всех запросов запуска, поэтому вам никогда не требуется вызывать
+ <li>Останавливает службу после обработки всех запросов запуска, поэтому вам никогда не требуется вызывать
{@link android.app.Service#stopSelf}.</li>
<li>Предоставляет реализацию метода {@link android.app.IntentService#onBind onBind()} по умолчанию, которая
возвращает null.</li>
@@ -668,7 +668,7 @@
уделить пристальное внимание тому, как ваша служба создается и уничтожается, так как служба
может работать в фоновом режиме без ведома пользователя.</p>
-<p>Жизненный цикл службы от создания до уничтожения может следовать двум
+<p>Жизненный цикл службы от создания до уничтожения может следовать двум
разным путям:</p>
<ul>
diff --git a/docs/html-intl/intl/ru/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/ru/guide/components/tasks-and-back-stack.jd
index c9fdc0e..8bdb394 100644
--- a/docs/html-intl/intl/ru/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/ru/guide/components/tasks-and-back-stack.jd
@@ -29,7 +29,7 @@
<ol>
<li><a href="{@docRoot}design/patterns/navigation.html">Дизайн Android:
навигация</a></li>
- <li><a href="{@docRoot}guide/topics/manifest/activity-element.html">Элемент манифеста
+ <li><a href="{@docRoot}guide/topics/manifest/activity-element.html">Элемент манифеста
{@code <activity>}</a></li>
<li><a href="{@docRoot}guide/components/recents.html">Экран обзора</a></li>
</ol>
@@ -43,7 +43,7 @@
Когда пользователь выбирает сообщение, открывается новая операция для просмотра этого сообщения.</p>
<p>Операция может даже запускать операции, существующие в других приложениях на устройстве. Например,
-если ваше приложение хочет отправить сообщение электронной почты, вы можете определить намерение для выполнения
+если ваше приложение хочет отправить сообщение электронной почты, вы можете определить намерение для выполнения
действия «отправить» и включить в него некоторые данные, например, адрес электронной почты и текст сообщения. После этого открывается операция из другого
приложения, которая объявила, что она обрабатывает намерения такого типа. В этом случае намерение состоит в том, чтобы
отправить сообщение электронной почты, поэтому в приложении электронной почты запускается операция «составить сообщение» (если одно намерение
@@ -127,7 +127,7 @@
в своем стеке — две операции под текущей операцией. Пользователь нажимает кнопку <em>Домой</em>,
затем запускает
новое приложение из средства запуска приложений. Когда появляется главный экран, Задача A переходит
-в фоновый режим. Когда запускается новое приложение, система запускает задачу для этого приложения
+в фоновый режим. Когда запускается новое приложение, система запускает задачу для этого приложения
(Задачу B) со своим собственным стеком операций. После взаимодействия с этим
приложением пользователь снова возвращается на главный экран и выбирает изначально запущенную
Задачу A. Теперь Задача A переходит на передний
@@ -290,7 +290,7 @@
<p>При объявлении операции в вашем файле манифеста вы можете указать, как операция должна
быть связана с задачей посредством атрибута <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
-launchMode}</a>
+launchMode}</a>
элемента <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>.</p>
<p>Атрибут <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
@@ -351,7 +351,7 @@
имеет задачу, работающую в фоновом режиме, эта задача переводится на передний план для обработки нового
намерения.</p>
-<p>И при запуске операции в новой задаче, и при запуске операции в существующей задаче,
+<p>И при запуске операции в новой задаче, и при запуске операции в существующей задаче,
кнопка <em>Назад</em> всегда возвращает пользователя к предыдущей операции. Однако, если вы
запускаете операцию, которая указывает режим запуска {@code singleTask}, вся задача переводится на передний план, если экземпляр
этой операции существует в фоновой задаче. В этот момент
@@ -505,7 +505,7 @@
href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code></dt>
<dd>Если для этого атрибута установлено значение {@code "true"} в корневой операции задачи,
стек очищается до корневой операции каждый раз, когда пользователь выходит из задачи
-и возвращается в нее. Другими словами, этот атрибут противоположен атрибуту
+и возвращается в нее. Другими словами, этот атрибут противоположен атрибуту
<a href="{@docRoot}guide/topics/manifest/activity-element.html#always">
{@code alwaysRetainTaskState}</a>. Пользователь всегда возвращается в задачу в ее
исходном состоянии, даже после кратковременного выхода из нее.</dd>
@@ -526,7 +526,7 @@
<h3 id="Starting">Запуск задачи</h3>
-<p>Вы можете сделать операцию точкой входа, назначая ей фильтр намерений со значением
+<p>Вы можете сделать операцию точкой входа, назначая ей фильтр намерений со значением
{@code "android.intent.action.MAIN"} в качестве указанного действия и
{@code "android.intent.category.LAUNCHER"}
в качестве указанной категории. Например:</p>
diff --git a/docs/html-intl/intl/ru/guide/index.jd b/docs/html-intl/intl/ru/guide/index.jd
index b073272..703700b 100644
--- a/docs/html-intl/intl/ru/guide/index.jd
+++ b/docs/html-intl/intl/ru/guide/index.jd
@@ -4,7 +4,7 @@
<div class="sidebox" style="width:220px"><!-- width to match col-4 below -->
-<p>Чтобы узнать, как работают приложения, начните с раздела
+<p>Чтобы узнать, как работают приложения, начните с раздела
<a href="{@docRoot}guide/components/fundamentals.html">Основы создания приложений</a>.</p>
<p>Чтобы сразу приступить к программированию, читайте раздел <a href="{@docRoot}training/basics/firstapp/index.html">Создание первого приложения</a>.</p>
</div>
diff --git a/docs/html-intl/intl/ru/preview/j8-jack.jd b/docs/html-intl/intl/ru/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/ru/preview/j8-jack.jd
rename to docs/html-intl/intl/ru/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/ru/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/ru/guide/topics/manifest/manifest-intro.jd
index f2c5a9e0..63d3a46 100644
--- a/docs/html-intl/intl/ru/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/ru/guide/topics/manifest/manifest-intro.jd
@@ -31,27 +31,27 @@
<li>Он задает имя пакета Java для приложения.
Это имя пакета служит уникальным идентификатором приложения.</li>
-<li>Он описывает компоненты приложения — операции,
+<li>Он описывает компоненты приложения — операции,
службы, приемники широковещательных сообщений и поставщиков контента, из которых состоит
-приложение. Он содержит имена классов, которые реализуют каждый компонент, и
-публикует их возможности (указывает, например, какие сообщения {@link android.content.Intent
-Intent} они могут принимать). На основании этих деклараций система Android
+приложение. Он содержит имена классов, которые реализуют каждый компонент, и
+публикует их возможности (указывает, например, какие сообщения {@link android.content.Intent
+Intent} они могут принимать). На основании этих деклараций система Android
может определить, из каких компонентов состоит приложение и при каких условиях их можно запускать.</li>
-<li>Он определяет, в каких процессах будут размещаться компоненты приложения.</li>
+<li>Он определяет, в каких процессах будут размещаться компоненты приложения.</li>
-<li>Он объявляет, какие разрешения должны быть выданы приложению, чтобы оно могло получить
-доступ к защищенным частям API-интерфейса и взаимодействовать с другими приложениями.</li>
+<li>Он объявляет, какие разрешения должны быть выданы приложению, чтобы оно могло получить
+доступ к защищенным частям API-интерфейса и взаимодействовать с другими приложениями.</li>
-<li>Он также объявляет разрешения, требуемые для
+<li>Он также объявляет разрешения, требуемые для
взаимодействия с компонентами данного приложения.</li>
-<li>Он содержит список классов {@link android.app.Instrumentation}, которые при выполнении приложения предоставляют
-сведения о профиле и прочую информацию. Эти объявления
-присутствуют в файле манифеста только во время разработки и отладки
+<li>Он содержит список классов {@link android.app.Instrumentation}, которые при выполнении приложения предоставляют
+сведения о профиле и прочую информацию. Эти объявления
+присутствуют в файле манифеста только во время разработки и отладки
приложения и удаляются перед его публикацией.</li>
-<li>Он объявляет минимальный уровень API-интерфейса Android, который требуется
+<li>Он объявляет минимальный уровень API-интерфейса Android, который требуется
приложению.</li>
<li>Он содержит список библиотек, с которыми должно быть связано приложение.</li>
@@ -61,12 +61,12 @@
<h2 id="filestruct">Структура файла манифеста</h2>
<p>
-Приведенная далее схема позволяет ознакомиться с общей структурой файла манифеста и
-всеми элементами, которые могут в нем содержаться. Каждый элемент вместе со всеми своими
-атрибутами, полностью описывается в отдельном файле. Для просмотра подробных
-сведений о любом элементе, щелкните имя элемента на схеме,
-в алфавитном списке элементов, приведенном после схемы, или
-в любом другом месте, где этот элемент упоминается.
+Приведенная далее схема позволяет ознакомиться с общей структурой файла манифеста и
+всеми элементами, которые могут в нем содержаться. Каждый элемент вместе со всеми своими
+атрибутами, полностью описывается в отдельном файле. Для просмотра подробных
+сведений о любом элементе, щелкните имя элемента на схеме,
+в алфавитном списке элементов, приведенном после схемы, или
+в любом другом месте, где этот элемент упоминается.
</p>
<pre>
@@ -126,9 +126,9 @@
</pre>
<p>
-Далее приведен список всех элементов, расположенных в алфавитном порядке, которые могут
+Далее приведен список всех элементов, расположенных в алфавитном порядке, которые могут
присутствовать в файле манифеста. Там могут находиться только эти элементы, а никакие другие
-элементы или атрибуты добавлять нельзя.
+элементы или атрибуты добавлять нельзя.
</p>
<p style="margin-left: 2em">
@@ -158,74 +158,74 @@
</p>
-
+
<h2 id="filec">Соглашения о компонентах файла</h2>
<p>
-Ко всем элементам и атрибутам
+Ко всем элементам и атрибутам
из файла манифеста применяется рад соглашений и правил:
</p>
<dl>
<dt><b>Элементы</b></dt>
-<dd>Обязательными
+<dd>Обязательными
являются только элементы<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> и
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-. Оба они должны присутствовать в файле манифеста, при этом указать их можно только один раз.
-Большинство других элементов можно указывать по нескольку раз или не указывать вовсе — хотя по
-крайней мере некоторые из них нужны, чтобы файл манифеста был сколько-нибудь
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+. Оба они должны присутствовать в файле манифеста, при этом указать их можно только один раз.
+Большинство других элементов можно указывать по нескольку раз или не указывать вовсе — хотя по
+крайней мере некоторые из них нужны, чтобы файл манифеста был сколько-нибудь
информативным.
<p>
-Если в элементе и есть какое-то содержимое, то это другие элементы.
+Если в элементе и есть какое-то содержимое, то это другие элементы.
Все значения задаются с помощью атрибутов, а не как символьные данные в элементе.
</p>
<p>
Элементы, находящиеся на одном уровне, обычно не упорядочиваются. Например,
- элементы <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> и
-<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-можно указать в любой последовательности. (Элемент
+ элементы <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> и
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
+можно указать в любой последовательности. (Элемент
<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
-является исключением из этого правила. Он должен следовать за элементом
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+является исключением из этого правила. Он должен следовать за элементом
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
псевдонимом которого он является.)
</p></dd>
<dt><b>Атрибуты</b></dt>
-<dd>Формально все атрибуты являются необязательными. Однако некоторые их них
+<dd>Формально все атрибуты являются необязательными. Однако некоторые их них
указывать необходимо, чтобы файл мог выполнять свое предназначение. В качестве руководства используйте эту
-документацию. В отношении атрибутов, которые являются и вправду необязательными, в ней указывается значение,
+документацию. В отношении атрибутов, которые являются и вправду необязательными, в ней указывается значение,
используемое по умолчанию, или говорится, что произойдет, если такой атрибут не будет указан.
-<p>За исключением некоторых атрибутов корневого элемента
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-, имена всех атрибутов должны начинаться с префикса {@code android:} —
-например, {@code android:alwaysRetainTaskState}. Поскольку этот префикс является
-универсальным, в документации при указании атрибутов по имени
+<p>За исключением некоторых атрибутов корневого элемента
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+, имена всех атрибутов должны начинаться с префикса {@code android:} —
+например, {@code android:alwaysRetainTaskState}. Поскольку этот префикс является
+универсальным, в документации при указании атрибутов по имени
он обычно опускается.</p></dd>
<dt><b>Объявление имен классов</b></dt>
-<dd>Многие элементы соответствуют объектам Java, в том числе элементы для самого
-приложения (элемент
+<dd>Многие элементы соответствуют объектам Java, в том числе элементы для самого
+приложения (элемент
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-) и основных его компонентов — операций
-(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
-служб
-(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
-приемников широковещательных сообщений
-(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>)
-и поставщиков контента
-(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
+) и основных его компонентов — операций
+(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
+служб
+(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
+приемников широковещательных сообщений
+(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>)
+и поставщиков контента
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
<p>
-Если вы определяете подкласс, а это практически всегда делается для классов компонентов
-({@link android.app.Activity}, {@link android.app.Service},
-{@link android.content.BroadcastReceiver} и {@link android.content.ContentProvider}),
-выполняется это с помощью атрибута {@code name}. В состав имени должно входить
-полное обозначение пакета.
+Если вы определяете подкласс, а это практически всегда делается для классов компонентов
+({@link android.app.Activity}, {@link android.app.Service},
+{@link android.content.BroadcastReceiver} и {@link android.content.ContentProvider}),
+выполняется это с помощью атрибута {@code name}. В состав имени должно входить
+полное обозначение пакета.
Например, подкласс {@link android.app.Service} можно объявить следующим образом:
</p>
@@ -239,12 +239,12 @@
</manifest></pre>
<p>
-Однако его можно укоротить. Если первым символом в строке указать точку, эта
-строка будет добавляться к имени пакета приложения (указанного атрибутом
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
-элемента
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
-). Следующее назначение является таким же, как приведенное выше:
+Однако его можно укоротить. Если первым символом в строке указать точку, эта
+строка будет добавляться к имени пакета приложения (указанного атрибутом
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
+элемента
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
+). Следующее назначение является таким же, как приведенное выше:
</p>
<pre><manifest package="com.example.project" . . . >
@@ -257,13 +257,13 @@
</manifest></pre>
<p>
-При запуске компонента Android создает экземпляр подкласса, указанного по имени.
+При запуске компонента Android создает экземпляр подкласса, указанного по имени.
Если подкласс не указан, система создает экземпляр базового класса.
</p></dd>
<dt><b>Несколько значений</b></dt>
-<dd>Если можно указать несколько значений, элемент почти всегда
-приводится повторно. Делается это вместо перечисления нескольких значений в одном элементе.
+<dd>Если можно указать несколько значений, элемент почти всегда
+приводится повторно. Делается это вместо перечисления нескольких значений в одном элементе.
Например, в фильтре Intent может быть перечислено несколько действий:
<pre><intent-filter . . . >
@@ -274,24 +274,24 @@
</intent-filter></pre></dd>
<dt><b>Значения ресурсов</b></dt>
-<dd>Значения некоторых атрибутов могут отображаться на экране — например,
-метка и значок операции. Значения этих атрибутов
-следует локализовать, поэтому они должны задаваться в ресурсе или теме. Значения
+<dd>Значения некоторых атрибутов могут отображаться на экране — например,
+метка и значок операции. Значения этих атрибутов
+следует локализовать, поэтому они должны задаваться в ресурсе или теме. Значения
ресурсов выражаются в следующем формате:</p>
<p style="margin-left: 2em">{@code @[<i>пакет</i>:]<i>тип</i>:<i>имя</i>}</p>
<p>
-где <i>имя пакета</i> можно опустить, если ресурс находится в одном пакете
-с приложением, <i>тип —</i> это тип ресурса, — например "string" или
-"drawable", — а <i>имя —</i> это имя, определяющее ресурс.
+где <i>имя пакета</i> можно опустить, если ресурс находится в одном пакете
+с приложением, <i>тип —</i> это тип ресурса, — например "string" или
+"drawable", — а <i>имя —</i> это имя, определяющее ресурс.
Например:
</p>
<pre><activity android:icon="@drawable/smallPic" . . . ></pre>
<p>
-Значения из темы выражаются схожим образом, только в начале у них идет "{@code ?}",
+Значения из темы выражаются схожим образом, только в начале у них идет "{@code ?}",
а не "{@code @}":
</p>
@@ -299,8 +299,8 @@
</p></dd>
<dt><b>Строковые значения</b></dt>
-<dd>Когда значением атрибута является строка, следует использовать двойную обратную косую черту ("{@code \\}")
-для выделения управляющей последовательности символов, — например "{@code \\n}" для
+<dd>Когда значением атрибута является строка, следует использовать двойную обратную косую черту ("{@code \\}")
+для выделения управляющей последовательности символов, — например "{@code \\n}" для
новой строки или "{@code \\uxxxx}" для символа Юникода.</dd>
</dl>
@@ -308,7 +308,7 @@
<h2 id="filef">Отображение функций в файле</h2>
<p>
-В следующих разделах описано, как некоторые функции Android отображаются
+В следующих разделах описано, как некоторые функции Android отображаются
в файле манифеста.
</p>
@@ -316,37 +316,37 @@
<h3 id="ifs">Фильтры объектов Intent</h3>
<p>
-Базовые компоненты приложения (его операции, службы и
-приемники широковещательных сообщений) активируются <i>объектами Intent</i>. Intent —
-это совокупность информации (объект {@link android.content.Intent}), описывающей
-требуемое действие, — в том числе в ней указаны данные, с которыми следует выполнить это действие, категория
-компонентов, которые должны выполнять это действие, и другие уместные инструкции.
-Система Android находит компонент, который отреагирует на объект Intent, запускает
-новый экземпляр компонента, если он требуется, и передает ему
+Базовые компоненты приложения (его операции, службы и
+приемники широковещательных сообщений) активируются <i>объектами Intent</i>. Intent —
+это совокупность информации (объект {@link android.content.Intent}), описывающей
+требуемое действие, — в том числе в ней указаны данные, с которыми следует выполнить это действие, категория
+компонентов, которые должны выполнять это действие, и другие уместные инструкции.
+Система Android находит компонент, который отреагирует на объект Intent, запускает
+новый экземпляр компонента, если он требуется, и передает ему
объект Intent.
</p>
<p>
-Компоненты объявляют свои возможности — виды объектов Intent, на которые они могут
-реагировать, — с помощью <i>фильтров Intent</i>. Поскольку система Android
-должна узнать, какие объекты Intent может обрабатывать тот или иной компонент, до того как она его запустит,
-фильтры Intent указываются в файле манифеста как
-элементы <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-. Компонент может иметь любое количество фильтров, каждый из которых описывает
+Компоненты объявляют свои возможности — виды объектов Intent, на которые они могут
+реагировать, — с помощью <i>фильтров Intent</i>. Поскольку система Android
+должна узнать, какие объекты Intent может обрабатывать тот или иной компонент, до того как она его запустит,
+фильтры Intent указываются в файле манифеста как
+элементы <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
+. Компонент может иметь любое количество фильтров, каждый из которых описывает
отдельную возможность компонента.
</p>
<p>
-Объект Intent, в котором целевой компонент явно указан по имени, активирует этот компонент,
-и фильтр при этом не учитывается. Но объект Intent, в котором имя целевого
-компонента не указано, может активировать компонент, только если он может пройти через один из фильтров
+Объект Intent, в котором целевой компонент явно указан по имени, активирует этот компонент,
+и фильтр при этом не учитывается. Но объект Intent, в котором имя целевого
+компонента не указано, может активировать компонент, только если он может пройти через один из фильтров
компонента.
</p>
<p>
-Сведения о том, каким образом объекты Intent проверяются по фильтрам Intent,
-см. в отдельном документе
-<a href="{@docRoot}guide/components/intents-filters.html">Объекты Intent
+Сведения о том, каким образом объекты Intent проверяются по фильтрам Intent,
+см. в отдельном документе
+<a href="{@docRoot}guide/components/intents-filters.html">Объекты Intent
и фильтры объектов Intent</a>.
</p>
@@ -354,42 +354,42 @@
<h3 id="iconlabel">Значки и метки</h3>
<p>
-У ряда элементов есть атрибуты {@code icon} и {@code label} для
-небольшого значка и текстовой метки, которые могут отображаться на экране. У некоторых из них также есть атрибут
-{@code description} для более длинного описательного текста, который также может
-отображаться на экране. Например, элемент
+У ряда элементов есть атрибуты {@code icon} и {@code label} для
+небольшого значка и текстовой метки, которые могут отображаться на экране. У некоторых из них также есть атрибут
+{@code description} для более длинного описательного текста, который также может
+отображаться на экране. Например, элемент
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-имеет все три таких атрибута, поэтому, когда пользователю задается вопрос, предоставить ли
-разрешение запросившему его приложению, на экране может отображаться значок,
-представляющий разрешение, имя разрешения и описание того, что оно
+имеет все три таких атрибута, поэтому, когда пользователю задается вопрос, предоставить ли
+разрешение запросившему его приложению, на экране может отображаться значок,
+представляющий разрешение, имя разрешения и описание того, что оно
за собой влечет.
</p>
<p>
-В любом случае значок и метка, заданные в элементе-контейнере, становятся параметрами
-{@code icon} и {@code label}, используемыми по умолчанию для всех вложенных в этот контейнер дочерних элементов.
-Так, значок и метка, заданные в элементе
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>,
-являются значком и меткой, используемыми по умолчанию для каждого компонента приложения.
-Точно так же, значок и метка, заданные для компонента, — например элемента
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>, —
-являются параметрами, используемыми по умолчанию для каждого элемента
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
- компонента. Если в элементе
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-задана метка, а в операции и ее фильтре Intent — нет,
-метка приложения будет считаться меткой и для операции, и для
+В любом случае значок и метка, заданные в элементе-контейнере, становятся параметрами
+{@code icon} и {@code label}, используемыми по умолчанию для всех вложенных в этот контейнер дочерних элементов.
+Так, значок и метка, заданные в элементе
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>,
+являются значком и меткой, используемыми по умолчанию для каждого компонента приложения.
+Точно так же, значок и метка, заданные для компонента, — например элемента
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>, —
+являются параметрами, используемыми по умолчанию для каждого элемента
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
+ компонента. Если в элементе
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+задана метка, а в операции и ее фильтре Intent — нет,
+метка приложения будет считаться меткой и для операции, и для
фильтра Intent.
</p>
<p>
-Значок и метка, заданные для фильтра Intent, используются для обозначения компонента,
+Значок и метка, заданные для фильтра Intent, используются для обозначения компонента,
когда он представляется пользователю, для указания функции,
-которую анонсирует фильтр. Например, фильтр с параметрами
-"{@code android.intent.action.MAIN}" и
-"{@code android.intent.category.LAUNCHER}" сообщает, что эта операция
+которую анонсирует фильтр. Например, фильтр с параметрами
+"{@code android.intent.action.MAIN}" и
+"{@code android.intent.category.LAUNCHER}" сообщает, что эта операция
инициирует приложение, — то есть он обозначает ее как
- операцию, которая должна быть отображена в средстве запуска приложений. Отсюда следует, что значок и метка,
+ операцию, которая должна быть отображена в средстве запуска приложений. Отсюда следует, что значок и метка,
заданные в фильтре, отображаются в средстве запуска.
</p>
@@ -397,14 +397,14 @@
<h3 id="perms">Разрешения</h3>
<p>
-Разрешение <i>представляет</i> собой ограничение на доступ к части кода
-или к данным, имеющимся на устройстве. Это ограничение накладывается для защиты важных
-данных и кода, ненадлежащее использование которых может пагубно сказаться на работе приложения.
+Разрешение <i>представляет</i> собой ограничение на доступ к части кода
+или к данным, имеющимся на устройстве. Это ограничение накладывается для защиты важных
+данных и кода, ненадлежащее использование которых может пагубно сказаться на работе приложения.
</p>
<p>
-Каждое разрешение обозначается уникальной меткой. Зачастую метка обозначает
-действие, выполнение которого ограничивается. Например, вот некоторые разрешения, определенные
+Каждое разрешение обозначается уникальной меткой. Зачастую метка обозначает
+действие, выполнение которого ограничивается. Например, вот некоторые разрешения, определенные
системой Android:
</p>
@@ -418,25 +418,25 @@
</p>
<p>
-Если приложению требуется доступ к функции, защищенной разрешением,
-оно должно объявить, что ему необходимо это разрешение, с помощью элемента
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-в файле манифеста. Затем, когда приложение устанавливается на
-устройство, установщик определяет, выдать ли запрошенное
-разрешение, проверяя полномочия органов, подписавших сертификаты
-приложения, а также, в некоторых случаях, спрашивая об этом пользователя.
-Если разрешение предоставляется, приложение сможет использовать защищенные
+Если приложению требуется доступ к функции, защищенной разрешением,
+оно должно объявить, что ему необходимо это разрешение, с помощью элемента
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+в файле манифеста. Затем, когда приложение устанавливается на
+устройство, установщик определяет, выдать ли запрошенное
+разрешение, проверяя полномочия органов, подписавших сертификаты
+приложения, а также, в некоторых случаях, спрашивая об этом пользователя.
+Если разрешение предоставляется, приложение сможет использовать защищенные
функции. В противном случае его попытки доступа к этим функциям будут безуспешными,
-причем пользователь не получит никакого уведомления об этом.
+причем пользователь не получит никакого уведомления об этом.
</p>
<p>
-Приложение также может защищать с помощью разрешений собственные компоненты (операции, службы,
-приемники широковещательных сообщений и поставщиков контента). Оно может использовать
-любые разрешения, определенные системой Android (они приведены в объекте
-{@link android.Manifest.permission android.Manifest.permission}) или объявленные
-другими приложениями. Либо оно может определить разрешения самостоятельно. Новое разрешение объявляется
-с помощью элемента
+Приложение также может защищать с помощью разрешений собственные компоненты (операции, службы,
+приемники широковещательных сообщений и поставщиков контента). Оно может использовать
+любые разрешения, определенные системой Android (они приведены в объекте
+{@link android.Manifest.permission android.Manifest.permission}) или объявленные
+другими приложениями. Либо оно может определить разрешения самостоятельно. Новое разрешение объявляется
+с помощью элемента
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
. Например, операцию можно защитить следующим образом:
</p>
@@ -457,43 +457,43 @@
</pre>
<p>
-Обратите внимание, что в этом примере разрешение {@code DEBIT_ACCT} не только
-объявляется с помощью элемента
+Обратите внимание, что в этом примере разрешение {@code DEBIT_ACCT} не только
+объявляется с помощью элемента
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-, его использование также запрашивается с помощью элемента
+, его использование также запрашивается с помощью элемента
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
. Чтобы другие компоненты приложения запускали защищенную
-операцию, ее использование должно быть запрошено, даже несмотря на то, что защита
-наложена самим приложением.
+операцию, ее использование должно быть запрошено, даже несмотря на то, что защита
+наложена самим приложением.
</p>
<p>
-В этом же примере: если атрибут {@code permission} был бы задан как
-разрешение, объявленное где-то еще
-(например, {@code android.permission.CALL_EMERGENCY_NUMBERS}), его бы не
-нужно было объявлять еще раз с помощью элемента
+В этом же примере: если атрибут {@code permission} был бы задан как
+разрешение, объявленное где-то еще
+(например, {@code android.permission.CALL_EMERGENCY_NUMBERS}), его бы не
+нужно было объявлять еще раз с помощью элемента
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-. Однако все равно нужно было бы запрашивать его использование с помощью
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
+. Однако все равно нужно было бы запрашивать его использование с помощью
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
</p>
<p>
-Элемент
-<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-объявляет пространство имен для группы разрешений, которые будут определены в
-коде. А элемент
+Элемент
+<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
+объявляет пространство имен для группы разрешений, которые будут определены в
+коде. А элемент
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-определяет метку для набора разрешений (как для разрешений, объявленных в файле манифеста с помощью элементов
+определяет метку для набора разрешений (как для разрешений, объявленных в файле манифеста с помощью элементов
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-, так и для объявленных где-то еще). Это влияет только на то, каким образом разрешения
-группируются, когда отображаются пользователю. Элемент
+, так и для объявленных где-то еще). Это влияет только на то, каким образом разрешения
+группируются, когда отображаются пользователю. Элемент
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-не указывает, какие разрешения относятся к группе.
+не указывает, какие разрешения относятся к группе.
Он просто дает группе имя. Чтобы включить разрешение в группу,
-атрибуту
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
- его элемента
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+атрибуту
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
+ его элемента
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
необходимо присвоить имя группы.
</p>
@@ -501,17 +501,17 @@
<h3 id="libs">Библиотеки</h3>
<p>
-Каждое приложение связывается с используемой по умолчанию библиотекой Android, в которой
-имеются базовые пакеты для построения приложений (со стандартными классами,
-например Activity, Service, Intent, View, Button, Application, ContentProvider
+Каждое приложение связывается с используемой по умолчанию библиотекой Android, в которой
+имеются базовые пакеты для построения приложений (со стандартными классами,
+например Activity, Service, Intent, View, Button, Application, ContentProvider
и так далее).
</p>
<p>
-Однако некоторые пакеты находятся в собственных библиотеках. Если ваше приложение
-использует код из одного из таких пакетов, оно должно в явном виде потребовать, чтобы его связали
-с этим пакетом. Файл манифеста должен содержать отдельный элемент
-<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
-для указания имени каждой библиотеки. (Имя библиотеки можно найти в
+Однако некоторые пакеты находятся в собственных библиотеках. Если ваше приложение
+использует код из одного из таких пакетов, оно должно в явном виде потребовать, чтобы его связали
+с этим пакетом. Файл манифеста должен содержать отдельный элемент
+<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
+для указания имени каждой библиотеки. (Имя библиотеки можно найти в
документации по пакету.)
</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/ru/guide/topics/providers/calendar-provider.jd
index 2d12e12..3533ad0 100644
--- a/docs/html-intl/intl/ru/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/ru/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">Использование намерения для просмотра данных календаря</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">Адаптеры синхронизации</a></li>
</ol>
@@ -113,26 +113,26 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
+
<td>В этой таблице находится
информация о календарях. В каждой строке этой таблицы представлены сведения
об отдельном календаре, например, его название, цвет, информация о синхронизации и т. д.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>В этой таблице находится
информация о событиях. В каждой строке этой таблицы содержится информация об отдельном
событии —например, заголовок события, место проведения, время начала, время
завершения и т. д. Событие может быть однократным или повторяющимся. Сведения об участниках,
-напоминаниях и расширенные свойства хранятся в отдельных таблицах.
+напоминаниях и расширенные свойства хранятся в отдельных таблицах.
В каждой из них имеется целочисленная переменная {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID},
которая ссылается на объект {@link android.provider.BaseColumns#_ID} в таблице событий.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>В этой таблице содержатся данные о времени
начала и окончания каждого повторения события. В каждой строке этой таблицы
представлено одно повторение события. Однократные события сопоставляются с повторениями
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>В этой таблице находится
информация об участниках (гостях). В каждой строке этой таблицы указан один
гость. В ней указываются тип гостя и информация о том,
@@ -149,7 +149,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>В этой таблице находятся
данные уведомлений или оповещений. В каждой строке этой таблицы указано одно уведомление или оповещение. Для одного
события можно создать несколько напоминаний. Максимальное количество таких напоминаний для события
@@ -159,7 +159,7 @@
указанным календарем. Напоминания задаются в минутах до начала события и
имеют метод, который определяет порядок уведомления пользователя.</td>
</tr>
-
+
</table>
<p>API поставщика календаря обеспечивает достаточную гибкость и эффективность. В то же время
@@ -211,7 +211,7 @@
<p>В таблице {@link android.provider.CalendarContract.Calendars} содержатся подробные сведения
о каждом отдельном календаре. Выполнять запись в указанные ниже столбцы
-этой таблицы могут и приложение, и <a href="#sync-adapter">адаптер синхронизации</a>.
+этой таблицы могут и приложение, и <a href="#sync-adapter">адаптер синхронизации</a>.
Полный список поддерживаемых полей представлен в справке по классу
{@link android.provider.CalendarContract.Calendars}.</p>
<table>
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>Логическое значение, обозначающее, выбран ли календарь для отображения. Значение
«0» указывает на то, что события, связанные с
этим календарем, не отображаются. Значение «1» указывает на то, что события, связанные с
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>Логическое значение, обозначающее, следует ли синхронизировать календарь и хранить имеющиеся в нем события
на устройстве. Значение «0» указывает, что не следует синхронизировать этот календарь или
хранить имеющиеся в нем события на устройстве. Значение «1» указывает, что этот календарь следует синхронизировать и
@@ -268,13 +268,13 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>Зачем необходимо указывать параметр
ACCOUNT_TYPE?</h3> <p>При создании запроса {@link
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}. Он используется для календарей,
которые не связаны с аккаунтом устройства. Аккаунты {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} не
-синхронизируются.</p> </div> </div>
+синхронизируются.</p> </div> </div>
<p> В следующей части примера создается запрос. С помощью выбора определяются
@@ -308,38 +308,38 @@
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>В следующем разделе кода выполняется пошаговый обзор набора результатов с помощью курсора. В нем
используются константы, которые были заданы в начале примера, для получения значений
для каждого из полей.</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">Изменение календаря</h3>
<p>Чтобы обновить календарь, можно указать {@link
@@ -350,7 +350,7 @@
либо в качестве первого элемента выделения. Выделение
должно начинаться с <code>"_id=?"</code>, а первым аргументом
<code>selectionArg</code> должен быть {@link
-android.provider.BaseColumns#_ID} календаря.
+android.provider.BaseColumns#_ID} календаря.
Также для выполнения обновлений можно закодировать идентификатор в URI. В этом примере для
изменения отображаемого имени календаря используется
подход
@@ -387,7 +387,7 @@
в <a href="#manifest">файл манифеста</a>
приложения необходимо включить разрешение {@link android.Manifest.permission#WRITE_CALENDAR}.</p>
-<p>Выполнять запись в указанные ниже столбцы этой таблицы могут и приложение, и
+<p>Выполнять запись в указанные ниже столбцы этой таблицы могут и приложение, и
адаптер синхронизации. Полный список поддерживаемых полей представлен в справке по классу {@link
android.provider.CalendarContract.Events}.</p>
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>Продолжительность события в формате <a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a>.
Например, значение <code>"PT1H"</code> обозначает, что событие
должно длиться один час, а значение <code>"P2W"</code> указывает на продолжительность
@@ -444,39 +444,39 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>Значение «1» обозначает, что это событие занимает весь день по
местному часовому поясу. Значение «0» указывает на то, что это регулярное событие, которое может начаться
и завершиться в любое время в течение дня.</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>Правило повторения для формата события. Например,
<code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>. С другими
примерами можно ознакомиться <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">здесь</a>.</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
- <td>Даты повторения события.
+ <td>Даты повторения события.
Обычно {@link android.provider.CalendarContract.EventsColumns#RDATE}
используется вместе с {@link android.provider.CalendarContract.EventsColumns#RRULE}
для определения агрегированного набора
повторяющихся событий. Дополнительные сведения представлены в <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">спецификации RFC5545</a>.</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
+
<td>Если событие считается как занятое или как свободное время,
доступное для планирования. </td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -514,11 +514,11 @@
вставке события с помощью намерения {@link
android.content.Intent#ACTION_INSERT INSERT}, как описано в разделе <a href="#intent-insert">Использование намерения для вставки события</a>, — в этом
случае используется часовой пояс по умолчанию.</li>
-
+
<li>Для однократных событий необходимо указать {@link
android.provider.CalendarContract.EventsColumns#DTEND}. </li>
-
-
+
+
<li>Для повторяющихся событий необходимо указать {@link
android.provider.CalendarContract.EventsColumns#DURATION} в дополнение к {@link
android.provider.CalendarContract.EventsColumns#RRULE} или {@link
@@ -528,7 +528,7 @@
случае можно использовать {@link
android.provider.CalendarContract.EventsColumns#RRULE} в сочетании с {@link android.provider.CalendarContract.EventsColumns#DTSTART} и {@link android.provider.CalendarContract.EventsColumns#DTEND}; кроме того, приложение «Календарь»
автоматически преобразует указанный период в продолжительность.</li>
-
+
</ul>
<p>Ниже представлен пример вставки события. Для простоты все это выполняется в потоке
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -625,7 +625,7 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">Таблица участников</h2>
@@ -634,10 +634,10 @@
указан один участник или гость события. При вызове метода
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
возвращается список участников для события
-с заданным {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}.
+с заданным {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}.
Этот {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
должен соответствовать {@link
-android.provider.BaseColumns#_ID} определенного события.</p>
+android.provider.BaseColumns#_ID} определенного события.</p>
<p>В таблице ниже указаны
поля, доступные для записи. При вставке нового участника необходимо указать все эти поля, кроме
@@ -720,7 +720,7 @@
<p>В каждой строке таблицы {@link android.provider.CalendarContract.Reminders}
указано одно напоминание о событии. При вызове метода
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}возвращается список напоминаний для события
-с заданным
+с заданным
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}.</p>
@@ -780,9 +780,9 @@
возможность запрашивать повторения событий. </p>
<p>В таблице ниже перечислены некоторые из полей, которые можно запросить для экземпляра. Обратите внимание,
-что часовой пояс задается параметрами
-{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
-и
+что часовой пояс задается параметрами
+{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
+и
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES}.</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>День окончания экземпляра по юлианскому календарю относительно часового пояса
-приложения «Календарь».
-
+приложения «Календарь».
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>Минута окончания экземпляра, вычисленная от полуночи по часовому поясу
приложения «Календарь».</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,27 +820,27 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>День начала экземпляра по юлианскому календарю относительно часового пояса приложения «Календарь».
+ <td>День начала экземпляра по юлианскому календарю относительно часового пояса приложения «Календарь».
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>Минута начала экземпляра, вычисленная от полуночи по часовому поясу
-приложения «Календарь».
+приложения «Календарь».
</td>
-
+
</tr>
</table>
<h3 id="query-instances">Запрос таблицы экземпляров</h3>
-<p>Чтобы запросить таблицу экземпляров, необходимо указать промежуток времени для запроса в
+<p>Чтобы запросить таблицу экземпляров, необходимо указать промежуток времени для запроса в
URI. В этом примере {@link android.provider.CalendarContract.Instances}
получает доступ к полю {@link
android.provider.CalendarContract.EventsColumns#TITLE} посредством своей реализации
-интерфейса {@link android.provider.CalendarContract.EventsColumns}.
+интерфейса {@link android.provider.CalendarContract.EventsColumns}.
Другими словами, {@link
android.provider.CalendarContract.EventsColumns#TITLE}
возвращается посредством обращения к базе данных, а не путем запроса таблицы {@link
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -923,8 +923,8 @@
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
Сослаться на URI также можно с помощью
-{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
-Пример использования этого намерения представлен в разделе <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Использование намерений для просмотра данных календаря</a>.
+{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
+Пример использования этого намерения представлен в разделе <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Использование намерений для просмотра данных календаря</a>.
</td>
<td>Открытие календаря во время, заданное параметром <code><ms_since_epoch></code>.</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
+
Сослаться на URI также можно с помощью
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Пример использования этого намерения представлен в разделе <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Использование намерений для просмотра данных календаря</a>.
-
+
</td>
<td>Просмотр события, указанного с помощью <code><event_id></code>.</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
+
Сослаться на URI также можно с помощью
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Пример использования этого намерения представлен в разделе <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">Использование намерения для редактирования события</a>.
-
-
+
+
</td>
<td>Редактирование события, указанного с помощью <code><event_id></code>.</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
+
Сослаться на URI также можно с помощью
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Пример использования этого намерения представлен в разделе <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">Использование намерения для редактирования события</a>.
-
+
</td>
<td>Создание события.</td>
@@ -996,7 +996,7 @@
<td>Название события.</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>Время начала события (в миллисекундах) от эпохи.</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>Время окончания события (в миллисекундах) от эпохи.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
+
<td>Логическое значение, обозначающее, что это событие на весь день. Значение может быть
<code>true</code> или <code>false</code>.</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>Место проведения события.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>Описание события.</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>Указывает на то, является ли событие общедоступным или закрытым.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>Если событие считается как занятое или как свободное время, доступное для планирования.</td>
-
-</table>
+
+</table>
<p>В разделах ниже указан порядок использования этих намерений.</p>
@@ -1059,14 +1059,14 @@
Благодаря этому в <a href="#manifest">файл манифеста</a> вашего приложения не нужно включать разрешение {@link
android.Manifest.permission#WRITE_CALENDAR}.</p>
-
+
<p>Когда пользователи работают с приложением, в котором используется такой подход, приложение отправляет
их в «Календарь» для завершения добавления события. Намерение {@link
android.content.Intent#ACTION_INSERT INSERT} использует дополнительные поля
для предварительного указания в форме сведений о событии в приложении «Календарь». После этого пользователи
могут отменить событие, отредактировать форму или сохранить событие в своем
календаре.</p>
-
+
<p>Ниже представлен фрагмент кода, в котором на 19 января 2012 г. планируется событие, которое будет проходить с
@@ -1075,7 +1075,7 @@
<ul>
<li>В качестве URI в нем задается
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.</li>
-
+
<li>В нем используются дополнительные поля {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} и {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} для предварительного указания в форме
сведений о времени события. Значения времени должны быть указаны в формате UTC и в миллисекундах от
эпохи.</li>
-
+
<li>В нем используется дополнительное поле {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
для предоставления списка участников, разделенных запятыми (их адреса эл. почты).</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,12 +1158,12 @@
<ul>
<li>Адаптеру синхронизации необходимо указать, что он является таковым, задав для параметра {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} значение <code>true</code>.</li>
-
-
+
+
<li>Адаптеру синхронизации необходимо предоставить {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} и {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} в качестве параметров запроса в URI. </li>
-
+
<li>Адаптер синхронизации имеет доступ на запись к большему числу столбцов, чем приложение или виджет.
Например, приложение может изменять только некоторые характеристики календаря,
такие как название, отображаемое имя, настройки видимости и
diff --git a/docs/html-intl/intl/ru/guide/topics/providers/contacts-provider.jd b/docs/html-intl/intl/ru/guide/topics/providers/contacts-provider.jd
index 4d07856..151f75b 100644
--- a/docs/html-intl/intl/ru/guide/topics/providers/contacts-provider.jd
+++ b/docs/html-intl/intl/ru/guide/topics/providers/contacts-provider.jd
@@ -467,7 +467,7 @@
</p>
<p>
При добавлении нового необработанного контакта,
-который не соответствует ни одному из существующих контактов, поставщик контактов создает новый контакт. Поставщик поступает аналогично в случае, если
+который не соответствует ни одному из существующих контактов, поставщик контактов создает новый контакт. Поставщик поступает аналогично в случае, если
данные в строке существующего необработанного контакта изменяются таким образом, что они больше не соответствуют контакту,
с которым они ранее были связаны. При создании приложением или адаптером синхронизации нового контакта,
который <em></em> соответствует существующему контакту, то новый контакт объединяется с
@@ -543,7 +543,7 @@
</p>
<p>
Если необходимо передать данные из службы в поставщик контактов, необходимо создать
-собственный адаптер синхронизации. Дополнительные сведения об этом представлены в разделе
+собственный адаптер синхронизации. Дополнительные сведения об этом представлены в разделе
<a href="#SyncAdapters">Адаптеры синхронизации поставщика контактов</a>.
</p>
<p>
@@ -672,7 +672,7 @@
Android.
<p>
Адаптеры синхронизации, которые вносят изменения в необработанные контакты или таблицы данных, должны всегда добавлять к используемому ими URI
-контента строку
+контента строку
{@link android.provider.ContactsContract#CALLER_IS_SYNCADAPTER}. Это позволяет предотвратить пометку таких строк поставщиком как «грязных».
В противном случае изменения, внесенные адаптером синхронизации, будут рассматриваться как локальные изменения,
которые подлежат отправке на сервер, даже если источником таких изменений был сам сервер.
@@ -1809,7 +1809,7 @@
<li>
<strong>Необязательно:</strong> элемент
<code><<a href="{@docRoot}guide/topics/manifest/meta-data-element.html">meta-data</a>></code>
-для структуры проверки подлинности указывает на файл XML
+для структуры проверки подлинности указывает на файл XML
<code>res/xml/authenticator.xml</code>. В свою очередь, в этом файле задается
тип аккаунта, который поддерживает структура проверки подлинности, а также ресурсы пользовательского интерфейса,
которые отображаются в процессе аутентификации. Тип аккаунта, указанный в этом
@@ -2022,7 +2022,7 @@
</ul>
<p>
Регулярная синхронизация элементов потока с помощью поставщика контактов выполняется так же,
-как и любая другая синхронизация. Дополнительные сведения о синхронизации представлены в разделе
+как и любая другая синхронизация. Дополнительные сведения о синхронизации представлены в разделе
<a href="#SyncAdapters">Адаптеры синхронизации поставщика контактов</a>. Регистрация уведомлений
и приглашение контактов рассматриваются в следующих двух разделах.
</p>
@@ -2092,7 +2092,7 @@
<h4>Взаимодействие со службой социальной сети</h4>
<p>
Пользователям не обязательно выходить из приложения для работы с контактами, которое имеется на устройстве, чтобы пригласить контакт на сайт
-социальной сети. Вместо этого приложение для работы с контактами может отправить намерение для приглашения
+социальной сети. Вместо этого приложение для работы с контактами может отправить намерение для приглашения
контакта в одну из ваших операций. Для этого выполните указанные ниже действия.
</p>
<ol>
diff --git a/docs/html-intl/intl/ru/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/ru/guide/topics/providers/content-provider-basics.jd
index c912dbc..4d520e8 100644
--- a/docs/html-intl/intl/ru/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/ru/guide/topics/providers/content-provider-basics.jd
@@ -251,7 +251,7 @@
</pre>
<p>
В таблице 2 указано соответствие аргументов для метода
-{@link android.content.ContentResolver#query
+{@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} SQL-инструкции SELECT.
</p>
<p class="table-caption">
@@ -701,7 +701,7 @@
для вставки, обновления или удаления данных.
</p>
<p>
- Чтобы получить разрешения, необходимые для доступа к поставщику, приложение запрашивает их с помощью элемента
+ Чтобы получить разрешения, необходимые для доступа к поставщику, приложение запрашивает их с помощью элемента
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
в файле манифеста. При установке менеджером пакетов Android приложения пользователю необходимо
утвердить все разрешения, запрашиваемые приложением. В случае утверждения всех разрешений
diff --git a/docs/html-intl/intl/ru/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/ru/guide/topics/providers/content-provider-creating.jd
index d8f7873..d669757 100644
--- a/docs/html-intl/intl/ru/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/ru/guide/topics/providers/content-provider-creating.jd
@@ -485,7 +485,7 @@
<h3 id="RequiredAccess">Необходимые методы</h3>
<p>
В абстрактном классе {@link android.content.ContentProvider} определены шесть абстрактных методов,
-которые необходимо реализовать в рамках вашего собственного конкретного подкласса. Все указанные ниже методы, кроме
+которые необходимо реализовать в рамках вашего собственного конкретного подкласса. Все указанные ниже методы, кроме
{@link android.content.ContentProvider#onCreate() onCreate()}, вызываются клиентским приложением,
которое пытается получить доступ к вашему поставщику контента.
</p>
@@ -777,7 +777,7 @@
<p>
Для общих типов данных, таких как текст, HTML или JPEG, метод
{@link android.content.ContentProvider#getType(Uri) getType()} должен возвращать стандартный тип
-MIME. Полный список стандартных типов представлен на
+MIME. Полный список стандартных типов представлен на
веб-сайте
<a href="http://www.iana.org/assignments/media-types/index.htm">IANA MIME Media Types</a>.
</p>
@@ -870,8 +870,8 @@
<p>
Класс-контракт представляет собой класс <code>public final</code>, в котором содержатся определения констант для
URI, имен столбцов, типов MIME и других метаданных поставщика. Класс
-устанавливает контрактные отношения между поставщиком и другими приложениями путем обеспечения
-прямого доступа к поставщику даже в случае изменения фактических значений URI, имен столбцов и
+устанавливает контрактные отношения между поставщиком и другими приложениями путем обеспечения
+прямого доступа к поставщику даже в случае изменения фактических значений URI, имен столбцов и
т. д.
</p>
<p>
@@ -928,7 +928,7 @@
<h3>Реализация разрешений</h3>
<p>
Любое приложение может выполнять чтение данных в поставщике или записывать их, даже если соответствующие данные
-являются закрытыми, поскольку по умолчанию для поставщика не заданы разрешения. Чтобы изменить эти настройки,
+являются закрытыми, поскольку по умолчанию для поставщика не заданы разрешения. Чтобы изменить эти настройки,
задайте разрешения для поставщика в файле манифеста с помощью атрибутов элемента
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
<provider></a></code> или его дочерних элементов. Можно задать разрешения, которые применяются ко всему поставщику
diff --git a/docs/html-intl/intl/ru/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/ru/guide/topics/providers/document-provider.jd
index c594968..c394e60 100644
--- a/docs/html-intl/intl/ru/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/ru/guide/topics/providers/document-provider.jd
@@ -567,7 +567,7 @@
<li>Атрибут <code>android:exported</code>, установленный в значение <code>"true"</code>.
Необходимо экспортировать поставщик, чтобы он был виден другим приложениям.</li>
-<li>Атрибут <code>android:grantUriPermissions</code>, установленный в значение
+<li>Атрибут <code>android:grantUriPermissions</code>, установленный в значение
<code>"true"</code>. Этот параметр позволяет системе предоставлять другим приложениям доступ
к контенту поставщика. Обсуждение того, как следует удерживать права доступа
к конкретному документу см. в разделе <a href="#permissions">Удержание прав доступа</a>.</li>
@@ -776,7 +776,7 @@
<h4 id="queryChildDocuments">Реализация метода queryChildDocuments</h4>
-<p>Реализация метода
+<p>Реализация метода
{@link android.provider.DocumentsProvider#queryChildDocuments queryChildDocuments()}
должна возвращать объект{@link android.database.Cursor}, указывающий на все файлы в
заданном каталоге, используя столбцы, определенные в
diff --git a/docs/html-intl/intl/ru/guide/topics/resources/accessing-resources.jd b/docs/html-intl/intl/ru/guide/topics/resources/accessing-resources.jd
index 3d59ceb..ccb7ad8 100644
--- a/docs/html-intl/intl/ru/guide/topics/resources/accessing-resources.jd
+++ b/docs/html-intl/intl/ru/guide/topics/resources/accessing-resources.jd
@@ -209,7 +209,7 @@
<ul>
<li>{@code <package_name>} — это имя пакета, в котором находится ресурс (не
требуется при создании ссылок на ресурсы из одного и того же пакета).</li>
- <li>{@code <resource_type>} — это подкласс
+ <li>{@code <resource_type>} — это подкласс
{@code R} для типа ресурса.</li>
<li>{@code <resource_name>} — это либо имя файла
ресурса (без расширения), либо значение атрибута {@code android:name} в элементе XML (для простых
@@ -222,7 +222,7 @@
<h3>Примеры использования</h3>
-<p>В некоторых случаях ресурс необходимо использовать в качестве значения в элементе XML (например, чтобы применить графическое изображение к
+<p>В некоторых случаях ресурс необходимо использовать в качестве значения в элементе XML (например, чтобы применить графическое изображение к
виджету), однако вы также можете использовать ресурс в любом фрагменте XML, где ожидается простое значение. Например,
если имеется следующий файл ресурса, включающий <a href="more-resources.html#Color">цветовой ресурс</a> и <a href="string-resource.html">строковый ресурс</a>:</p>
@@ -260,13 +260,13 @@
</pre>
<p class="note"><strong>Примечание.</strong> Всегда используйте строковые ресурсы,
-поскольку ваше приложение может потребоваться перевести на другие языки.
+поскольку ваше приложение может потребоваться перевести на другие языки.
Сведения о создании альтернативных
ресурсов (например, локализованных строк) представлены в разделе <a href="providing-resources.html#AlternativeResources">Предоставление альтернативных
ресурсов</a>. В разделе <a href="localization.html">Локализация</a> приведено полное руководство по локализации
приложения.</p>
-<p>Вы даже можете использовать ресурсы в XML для создания псевдонимов. Например, можно создать
+<p>Вы даже можете использовать ресурсы в XML для создания псевдонимов. Например, можно создать
элемент дизайна, который будет служить псевдонимом для другого элемента дизайна:</p>
<pre>
diff --git a/docs/html-intl/intl/ru/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/ru/guide/topics/resources/providing-resources.jd
index be0af95..6a287b8 100644
--- a/docs/html-intl/intl/ru/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/ru/guide/topics/resources/providing-resources.jd
@@ -495,7 +495,7 @@
экрану VGA средней плотности.
Минимальный размер макета для большого экрана составляет приблизительно 480x640 пикселов.
Примерами являются экраны VGA и WVGA средней плотности.</li>
- <li>{@code xlarge}: Экраны значительно крупнее обычного
+ <li>{@code xlarge}: Экраны значительно крупнее обычного
экрана HVGA средней плотности. Минимальный размер макета для очень большого экрана составляет
приблизительно 720x960 пикселов. В большинстве случаев устройства с очень большими
экранами слишком велики для карманного использования и, скорее всего,
@@ -510,7 +510,7 @@
аварийно завершится во время выполнения (например, если все ресурсы макета отмечены квалификатором {@code
xlarge}, но устройство оснащено экраном нормального размера).</p>
<p><em>Добавлено в API уровня 4.</em></p>
-
+
<p>Дополнительную информацию см. в разделе <a href="{@docRoot}guide/practices/screens_support.html">Поддержка нескольких
экранов</a>.</p>
<p>См. также поле конфигурации {@link android.content.res.Configuration#screenLayout}, которое
@@ -1088,7 +1088,7 @@
чем число квалификаторов, которые точно соответствуют устройству. Например, на шаге 4 выше, последний
вариант в списке содержит три квалификатора, которые точно соответствуют устройству (ориентация, тип
сенсорного экрана и способ ввода), в то время как <code>drawable-en</code> содержит только один подходящий параметр
-(язык). Однако язык имеет более высокий приоритет, чем эти остальные квалификаторы, поэтому
+(язык). Однако язык имеет более высокий приоритет, чем эти остальные квалификаторы, поэтому
<code>drawable-port-notouch-12key</code> вычеркивается.</p>
<p>Для получения более подробной информации об использовании ресурсов в приложении перейдите к разделу <a href="accessing-resources.html">Доступ к ресурсам</a>.</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/resources/runtime-changes.jd b/docs/html-intl/intl/ru/guide/topics/resources/runtime-changes.jd
index 5dc59c8..5133751 100644
--- a/docs/html-intl/intl/ru/guide/topics/resources/runtime-changes.jd
+++ b/docs/html-intl/intl/ru/guide/topics/resources/runtime-changes.jd
@@ -125,7 +125,7 @@
означает, что приложение удерживает их, и система не может очистить от них память, поэтому
может теряться значительный объем памяти).</p>
-<p>Затем используйте {@link android.app.FragmentManager} для добавления фрагмента в операцию.
+<p>Затем используйте {@link android.app.FragmentManager} для добавления фрагмента в операцию.
Можно получить объект данных из фрагмента, когда операция повторно запускается в результате изменения конфигурации
в режиме выполнения. В качестве примера операция определена следующим образом:</p>
@@ -168,7 +168,7 @@
<p>В этом примере {@link android.app.Activity#onCreate(Bundle) onCreate()} добавляет фрагмент
или восстанавливает ссылку на него. Метод {@link android.app.Activity#onCreate(Bundle) onCreate()} также
хранит объект, сохраняющий состояние, внутри экземпляра фрагмента.
-Метод {@link android.app.Activity#onDestroy() onDestroy()} обновляет объект, сохраняющий состояние, внутри
+Метод {@link android.app.Activity#onDestroy() onDestroy()} обновляет объект, сохраняющий состояние, внутри
сохраненного экземпляра фрагмента.</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/controls.jd b/docs/html-intl/intl/ru/guide/topics/ui/controls.jd
index 62f4c76..7e15a72 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">Переключатель</a></td>
<td>Этот элемент управления аналогичен флажку, за исключением того, что в группе элементов можно выбрать только один вариант.</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/declaring-layout.jd b/docs/html-intl/intl/ru/guide/topics/ui/declaring-layout.jd
index 71428f6..b5db656 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/declaring-layout.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/declaring-layout.jd
@@ -219,9 +219,9 @@
<p>Как правило, не рекомендуется задавать абсолютные значения ширины и высоты макета
(например, в пикселах). Вместо этого используйте относительные единицы измерения, такие как
пикселы, не зависящие от разрешения экрана (<var>dp</var>), <var>wrap_content</var>или
-<var>match_parent</var>Это гарантирует одинаковое отображение
+<var>match_parent</var>Это гарантирует одинаковое отображение
вашего приложения на устройствах с экранами разных размеров.
-Принятые типы измерения определены в
+Принятые типы измерения определены в
документе
<a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">Доступные ресурсы</a>.</p>
@@ -325,7 +325,7 @@
Android.</p>
<p class="note"><strong>Примечание.</strong> Несмотря на то, что для формирования пользовательского интерфейса один
-макет может содержать один или несколько вложенных макетов, рекомендуется использовать как можно более простую
+макет может содержать один или несколько вложенных макетов, рекомендуется использовать как можно более простую
иерархию макетов. Чем меньше в макете вложенных элементов, тем быстрее выполняется его отрисовка (горизонтальная иерархия
представлений намного лучше вертикальной).</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/ru/guide/topics/ui/dialogs.jd
index 515ecc6..7e5d908 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>См. также:</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">Руководство по дизайну диалоговых окон</a></li>
@@ -235,8 +235,8 @@
</pre>
<p>Методы <code>set...Button()</code> предполагают заголовок для кнопки (реализуемый
-через <a href="{@docRoot}guide/topics/resources/string-resource.html">строковый ресурс</a>) и
-{@link android.content.DialogInterface.OnClickListener}, который определяет действие,
+через <a href="{@docRoot}guide/topics/resources/string-resource.html">строковый ресурс</a>) и
+{@link android.content.DialogInterface.OnClickListener}, который определяет действие,
следующее за нажатием кнопки пользователем.</p>
<p>Реализована возможность добавлять три различных вида кнопок действий:</p>
@@ -248,7 +248,7 @@
<dt>Нейтральные</dt>
<dd>Используются в случаях, когда пользователь может не желать продолжить действие,
но при этом необязательно хочет его отменить. Появляется между положительными и отрицательнымиI
- кнопками. Примером такого действия может быть «Напомнить позже».</dd>
+ кнопками. Примером такого действия может быть «Напомнить позже».</dd>
</dl>
<p>Можно добавлять только одну кнопку каждого вида в {@link
@@ -271,7 +271,7 @@
<li>Интерактивный список с выбором нескольких вариантов (флажки)</li>
</ul>
-<p>Для создания списка с выбором одного варианта, как на рисунке 3,
+<p>Для создания списка с выбором одного варианта, как на рисунке 3,
используйте метод{@link android.app.AlertDialog.Builder#setItems setItems()}:</p>
<pre style="clear:right">
@@ -289,9 +289,9 @@
}
</pre>
-<p>Поскольку список отображается в области содержимого диалогового окна,
+<p>Поскольку список отображается в области содержимого диалогового окна,
диалоговое окно не может показать одновременно сообщение и список, поэтому необходимо задать заголовок
-диалогового окна с помощью {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
+диалогового окна с помощью {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
Для указания элементов списка необходимо вызвать {@link
android.app.AlertDialog.Builder#setItems setItems()}, передающий указатель.
В качестве другого варианта можно указать список с помощью {@link
@@ -320,8 +320,8 @@
<p>Для добавления списка с несколькими вариантами ответов (флажки) или
списка с одним вариантом ответа (переключатели) используйте методы
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} или
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} или
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} соответственно.</p>
<p>Например, таким образом можно создать список с несколькими вариантами ответов, как на
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -371,9 +371,9 @@
}
</pre>
-<p>Несмотря на то, что и традиционный список, и список с переключателями
+<p>Несмотря на то, что и традиционный список, и список с переключателями
предполагают действие по выбору одного элемента, вам необходимо использовать {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()}, чтобы сохранить выбор пользователя.
Это значит, что при повторном открытии диалогового окна будет отображаться текущий выбор пользователя,
а затем создается список с переключателями.</p>
@@ -442,7 +442,7 @@
одинаковые стили шрифта.</p>
<p>Для применения макета в вашем {@link android.support.v4.app.DialogFragment}
-вам понадобится {@link android.view.LayoutInflater} с
+вам понадобится {@link android.view.LayoutInflater} с
{@link android.app.Activity#getLayoutInflater()} и вызов
{@link android.view.LayoutInflater#inflate inflate()}, где первым параметром будет являться
ID ресурса макета, а вторым параметром — исходный вид макета.
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -638,7 +638,7 @@
<p>Тем не менее, в этом случае нельзя использовать{@link android.app.AlertDialog.Builder AlertDialog.Builder}
или другие объекты {@link android.app.Dialog} для построения диалогового окна. Если
-необходимо сделать {@link android.support.v4.app.DialogFragment}
+необходимо сделать {@link android.support.v4.app.DialogFragment}
встраиваемым, нужно определить пользовательский интерфейс диалогового окна в макете методом обратного вызова
{@link android.support.v4.app.DialogFragment#onCreateView
onCreateView()}.</p>
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
@@ -695,12 +695,12 @@
}
</pre>
-<p>Подробные сведения о выполнении операций с фрагментами приведены в руководстве
+<p>Подробные сведения о выполнении операций с фрагментами приведены в руководстве
<a href="{@docRoot}guide/components/fragments.html">Фрагменты</a>.</p>
<p>В приведенном примере <code>mIsLargeLayout</code> булеан указывает, должно ли текущее устройство использовать
большой макет приложения (и отображать фрагмент как диалоговое окно, а не
-в полноэкранном режиме). Лучшим способом установить такой вид булеана является объявление
+в полноэкранном режиме). Лучшим способом установить такой вид булеана является объявление
<a href="{@docRoot}guide/topics/resources/more-resources.html#Bool">значения булевой переменной</a>
с <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">альтернативным</a> значением для других размеров экранов. В качестве примера приведены два
варианта булевых ресурсов для различных размеров экранов:</p>
@@ -776,7 +776,7 @@
android.support.v4.app.DialogFragment}.</p>
<p>Также можно <em>отменить</em> диалоговое окно. Это особое событие, возникающее, когда пользователь
-покинул диалоговое окно, не завершив задачу. Так происходит, когда пользователь нажимает кнопку
+покинул диалоговое окно, не завершив задачу. Так происходит, когда пользователь нажимает кнопку
<em>Назад</em>, касается экрана за областью диалогового окна,
либо когда задано {@link android.app.Dialog#cancel()} в {@link
android.app.Dialog} (например, в качестве отклика на нажатие кнопки «Отмена» в диалоговом окне).</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/menus.jd b/docs/html-intl/intl/ru/guide/topics/ui/menus.jd
index 2f3ce1e..885918f 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/menus.jd
@@ -66,13 +66,13 @@
<p>Несмотря на то что оформление и поведение некоторых пунктов меню изменились, семантика для определения
набора действий и вариантов по-прежнему основана на API-интерфейсах класса {@link android.view.Menu}. В этом
-руководстве рассказывается, как создавать три основополагающих типа меню или представлений действий в системе
+руководстве рассказывается, как создавать три основополагающих типа меню или представлений действий в системе
Android всех версий:</p>
<dl>
<dt><strong>Меню параметров и строка действий</strong></dt>
<dd>Пункты <a href="#options-menu">меню параметров</a> представляют собой основные варианты выбора действий в пределах
-операции. Именно здесь следует размещать действия, которые затрагивают приложение в целом, например:
+операции. Именно здесь следует размещать действия, которые затрагивают приложение в целом, например:
"Поиск", "Составить сообщение эл. почты" и "Настройки".
<p>При разработке приложений для версии Android 2.3 или более ранних версий пользователи могут
открыть панель меню параметров нажатием кнопки <em>Меню</em>.</p>
@@ -83,9 +83,9 @@
строки действий.</p>
<p>См. раздел <a href="#options-menu">Создание меню параметров</a></p>
</dd>
-
+
<dt><strong>Контекстное меню и режим контекстных действий</strong></dt>
-
+
<dd>Контекстное меню ― это <a href="#FloatingContextMenu">плавающее меню</a>, которое открывается, когда
пользователь длительно нажимает на элемент. В нем содержатся действия, которые затрагивают выбранный контент или
контекстный кадр.
@@ -94,11 +94,11 @@
выбрать сразу несколько элементов.</p>
<p>См. раздел <a href="#context-menu">Создание контекстного меню</a></p>
</dd>
-
+
<dt><strong>Всплывающее меню</strong></dt>
<dd>Во всплывающем меню отображается вертикальный список пунктов, который привязан к представлению,
вызвавшему меню. Он хорошо подходит для предоставления возможности дополнительных вариантов действий, относящихся к определенному контенту или
-для выдачи вариантов для второй части команды. Действия во всплывающем меню
+для выдачи вариантов для второй части команды. Действия во всплывающем меню
<strong>не</strong> должны напрямую затрагивать соответствующий контент — для этого предназначены контекстные
действия. Всплывающее меню предназначено для расширенных действий, относящихся к областям контента в вашей
операции.
@@ -135,7 +135,7 @@
<dt><code><item></code></dt>
<dd>Создает класс {@link android.view.MenuItem}, который представляет один пункт меню. Этот
элемент может содержать вложенный элемент <code><menu></code> для создания вложенных меню.</dd>
-
+
<dt><code><group></code></dt>
<dd>Необязательный, невидимый контейнер для элементов {@code <item>}. Он позволяет
разделять пункты меню на категории и назначать им одинаковые свойства, такие как активное состояние и видимость. Подробные
@@ -322,7 +322,7 @@
должен быть общедоступным и принимать один параметр {@link android.view.MenuItem}, — когда система
вызывает этот метод, она передает ему выбранный пункт меню. Подробные сведения и пример см. в документе <a href="{@docRoot}guide/topics/resources/menu-resource.html">Ресурс меню</a>.</p>
-<p class="note"><strong>Совет.</strong> Если в приложении предусмотрено несколько операций и
+<p class="note"><strong>Совет.</strong> Если в приложении предусмотрено несколько операций и
в некоторых из них имеются одинаковые меню параметров, рассмотрите возможность создания
операции, которая будет использовать исключительно методы {@link android.app.Activity#onCreateOptionsMenu(Menu)
onCreateOptionsMenu()} и {@link android.app.Activity#onOptionsItemSelected(MenuItem)
@@ -346,7 +346,7 @@
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} следует использовать только для создания начального
состояния меню, а не для внесения в него изменений в течение жизненного цикла операции.</p>
-<p>Если вам требуется изменять меню параметров в зависимости от
+<p>Если вам требуется изменять меню параметров в зависимости от
событий, которые возникают в течение жизненного цикла операции, сделать это можно в
методе{@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}. Этот
метод передает объект {@link android.view.Menu} в том виде, в котором он в данный момент существует. Его-то и можно изменить
@@ -363,7 +363,7 @@
вызвать метод {@link android.app.Activity#invalidateOptionsMenu invalidateOptionsMenu()}, чтобы запросить у
системы вызов метода {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}.</p>
-<p class="note"><strong>Примечание.</strong>
+<p class="note"><strong>Примечание.</strong>
Никогда не следует изменять пункты меню параметров с учетом класса {@link android.view.View}, действующего
в данный момент. В сенсорном режиме (когда пользователь не использует трекбол или кнопки направления движения) фокус
не может переводиться на представления, поэтому никогда не следует использовать фокус в качестве основы для изменения
@@ -525,7 +525,7 @@
представления, то вам следует:</p>
<ol>
<li>Реализовать интерфейс {@link android.view.ActionMode.Callback}. В его методах обратного вызова вы
-можете указать действия для строки контекстных действий, реагировать на нажатия пунктов действий и
+можете указать действия для строки контекстных действий, реагировать на нажатия пунктов действий и
обрабатывать другие события жизненного цикла для режима действий.</li>
<li>Вызывайте {@link android.app.Activity#startActionMode startActionMode()}, когда требуется показать
строку (например, когда пользователь выполняет длительное нажатие представления).</li>
@@ -582,12 +582,12 @@
android.view.ActionMode#setSubtitle setSubtitle()} (удобно для указания количества выбранных
элементов).</p>
-<p>Также обратите внимание, что приведенный выше образец кода задает для переменной {@code mActionMode} значение null, когда
+<p>Также обратите внимание, что приведенный выше образец кода задает для переменной {@code mActionMode} значение null, когда
режим действия прекращает свое существование. Далее вы узнаете, каким образом он инициализируется и чем может быть
полезно сохранение составной переменной в операции или фрагменте.</p>
</li>
- <li>Для включения режима контекстных действий, когда это необходимо,
+ <li>Для включения режима контекстных действий, когда это необходимо,
например, в ответ на длительное нажатие {@link
android.view.View}, вызывайте {@link android.app.Activity#startActionMode startActionMode()}:</p>
@@ -727,7 +727,7 @@
<p>Если для <a href="#xml">определения меню используется XML</a>, вот каким образом можно показать всплывающее меню:</p>
<ol>
- <li>Создайте экземпляр класса {@link android.widget.PopupMenu} с помощью его конструктора, принимающий
+ <li>Создайте экземпляр класса {@link android.widget.PopupMenu} с помощью его конструктора, принимающий
текущие {@link android.content.Context} и {@link android.view.View} приложения, к которым
должно быть привязано меню.</li>
<li>С помощью {@link android.view.MenuInflater} загрузите свой ресурс меню в объект {@link
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -901,7 +901,7 @@
(например {@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}). Именно
здесь необходимо задать состояние флажка, поскольку флажок или переключатель не
изменяет свое состояние автоматически. Запросить текущее состояние пункта (в котором он находился до того, как был
-выбран пользователем) можно с помощью{@link android.view.MenuItem#isChecked()}, а затем задать помеченное состояние с помощью
+выбран пользователем) можно с помощью{@link android.view.MenuItem#isChecked()}, а затем задать помеченное состояние с помощью
{@link android.view.MenuItem#setChecked(boolean) setChecked()}. Например:</p>
<pre>
@@ -1023,9 +1023,9 @@
</intent-filter>
</pre>
-<p>Подробные сведения о написании фильтров Intent см. в документе
+<p>Подробные сведения о написании фильтров Intent см. в документе
<a href="/guide/components/intents-filters.html">Объекты Intent и фильтры объектов Intent</a>.</p>
-<p>Образец приложения, в котором используется эта методика, см. в образце кода
+<p>Образец приложения, в котором используется эта методика, см. в образце кода
<a href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">Note
Pad</a>.</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/ru/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..3583616
--- /dev/null
+++ b/docs/html-intl/intl/ru/guide/topics/ui/multi-window.jd
@@ -0,0 +1,582 @@
+page.title=Поддержка многооконного режима
+page.metaDescription=Новые возможности в Android N для одновременного отображения нескольких приложений.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Содержание документа</h2>
+ <ol>
+ <li><a href="#overview">Обзор</a></li>
+ <li><a href="#lifecycle">Жизненный цикл многооконного режима</a></li>
+ <li><a href="#configuring">Настройка приложения для многооконного
+ режима</a></li>
+ <li><a href="#running">Запуск приложения в многооконном режиме</a></li>
+ <li><a href="#testing">Тестирование приложения в многооконном режиме</a></li>
+ </ol>
+ <h2>См. также:</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Пример
+ многооконного демонстрационного приложения</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ В Android N добавлена поддержка отображения нескольких приложений
+ одновременно. На мобильных устройствах два приложения могут быть запущены рядом
+ или друг над другом в режиме <em>разделения экрана</em>. На телевизорах приложения могут
+ использовать режим <em>"картинка в картинке"</em>, чтобы воспроизводить видео,
+ пока пользователи работают с другим приложением.
+</p>
+
+<p>
+ Если вы создаете приложение с использованием N Preview SDK, вы можете указать, как оно
+ будет действовать в многооконном режиме. Например, можно задать минимальные
+ допустимые размеры окна приложения. Также можно отключить многооконный режим для приложения,
+ чтобы оно отображалось только в полноэкранном
+ режиме.
+</p>
+
+<h2 id="overview">Обзор</h2>
+
+<p>
+ В Android N несколько приложений могут одновременно находиться на экране. Например,
+ пользователь может разделить экран, чтобы просматривать веб-страницу
+ слева и писать сообщение электронной почты справа. Возможности пользователя зависят от
+ устройства.
+</p>
+
+<ul>
+ <li>На мобильных устройствах с Android N доступен режим
+ разделения экрана. В этом режиме два приложения отображаются рядом
+ или друг над другом. Пользователь может перетащить
+ линию разделения, чтобы увеличить окно одного приложения и уменьшить окно другого.
+ </li>
+
+ <li>На устройствах Nexus Player с Android N для приложений
+ будет доступен <a href="picture-in-picture.html">режим "картинка в картинке"</a>, который
+ позволит приложению отображать контент, пока пользователь просматривает
+ другие приложения или взаимодействует с ними.
+ </li>
+
+ <li>Производители более крупных устройств могут активировать
+ режим произвольной формы, где пользователь может любым образом изменять размер каждого окна. В этом случае
+ помимо режима разделения экрана
+ на устройстве будет доступен и этот режим.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>Рис. 1.</strong> Два приложения отображаются рядом в режиме разделения экрана.
+</p>
+
+<p>
+ Пользователь может перейти в многооконный режим следующими способами.
+</p>
+
+<ul>
+ <li>Если пользователь откроет <a href="{@docRoot}guide/components/recents.html">экран
+ обзора</a> и длительно нажмет
+ название операции, ее можно будет перетащить в выделенную часть
+ экрана и переключить в многооконный режим.
+ </li>
+
+ <li>Если пользователь длительно нажмет кнопку "Обзор", устройство
+ переключит текущую операцию в многооконный режим и откроет экран обзора,
+ где пользователь сможет выбрать другую операцию для совместного отображения.
+ </li>
+</ul>
+
+<p>
+ Пользователи могут <a href="{@docRoot}guide/topics/ui/drag-drop.html">перетаскивать</a>
+данные между окнами операций в режиме
+ совместного отображения. (Ранее перетаскивать данные можно было только в рамках
+ одной операции).
+</p>
+
+<h2 id="lifecycle">Жизненный цикл многооконного режима</h2>
+
+<p>
+ Многооконный режим не меняет <a href="{@docRoot}training/basics/activity-lifecycle/index.html">жизненный
+ цикл операции</a>.
+</p>
+
+<p>
+ В этом режиме в каждый момент времени активной
+ является только последняя операция, с которой взаимодействовал пользователь. Такая операция считается <em>самой верхней</em>.
+ Все другие операции приостановлены, даже если они отображаются.
+ Однако система отдает приостановленным, но видимым операциям более
+ высокий приоритет, чем невидимым. Если пользователь взаимодействует с
+ одной из приостановленных операций, она возобновляется, а прежняя самая верхняя
+ операция приостанавливается.
+</p>
+
+<p class="note">
+ <strong>Примечание.</strong> В многооконном режиме приложение может быть приостановлено
+ и по-прежнему видимо для пользователя. Приложению может потребоваться
+ продолжать свои операции, даже если оно приостановлено. Например, видимое приостановленное приложение,
+ воспроизводящее видео, будет по-прежнему показывать видео. Поэтому
+ мы <em>не</em> рекомендуем приостанавливать воспроизведение
+ в обработчиках {@link android.app.Activity#onPause onPause()} таких приложений.
+ Вместо этого следует приостановить видео в {@link android.app.Activity#onStop
+ onStop()} и возобновить воспроизведение в {@link android.app.Activity#onStart
+ onStart()}.
+</p>
+
+<p>
+ Если пользователь переводит приложение в многооконный режим, система
+ уведомляет операцию об изменении конфигурации, как указано в документе <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений
+ во время выполнения</a>. По сути это изменение так же действует
+на жизненный цикл операции, как уведомление приложения системой
+о переходе устройства из вертикальной ориентации в
+ горизонтальную, только изменяются размеры экрана, а не ориентация. Как описано в документе <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений
+ во время выполнения</a>, операция может обработать изменение
+ конфигурации самостоятельно или может позволить системе
+ удалить окно операции и создать его заново с новыми размерами.
+</p>
+
+<p>
+ Если пользователь увеличивает одну из сторон окна, система меняет
+ размер окна операции в соответствии с действием пользователя и применяет <a href="{@docRoot}guide/topics/resources/runtime-changes.html">изменения в режиме выполнения</a>
+ по мере необходимости. Если приложение не успевает отрисовать новые области, система
+ временно заполняет их цветом, заданным атрибутом {@link
+ android.R.attr#windowBackground windowBackground} или атрибутом стиля
+ <code>windowBackgroundFallback</code> по умолчанию.
+</p>
+
+<h2 id="configuring">Настройка приложения для многооконного режима</h2>
+
+<p>
+ Если ваше приложение предназначено для Android N, вы
+ можете указать, каким образом поддерживают (и поддерживают ли) операции вашего приложения многооконный режим. Атрибуты управления размером и макетом устанавливаются
+ в манифесте.
+ Настройки атрибутов корневой операции применяются
+ ко всем операциям в ее стеке задач.
+</p>
+
+<p class="note">
+ <strong>Примечание.</strong> Если приложение с поддержкой различной
+ ориентации было создано с версией SDK,
+ более ранней, чем Android N, и пользователь запустит это приложение в многооконном режиме, система принудительно изменит размер приложения. Система отображает диалоговое окно
+ с предупреждением о том, что приложение может работать непредвиденным образом. Система
+ <em>не</em> меняет размер окна для приложений с
+ фиксированной ориентацией. Если пользователь попытается открыть такое приложение
+ в многооконном режиме, оно займет весь экран.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ Установите этот атрибут в узле <code><activity></code> или
+ <code><application></code> манифеста, чтобы включить или отключить многооконный
+ режим:
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ Если для этого атрибута задано значение true, операцию можно запускать
+ в режимах разделения экрана и произвольной формы. Если для атрибута задано значение false,
+ операция не поддерживает многооконный режим. Если значение равно false и
+ пользователь пытается запустить операцию в многооконном режиме, она
+ занимает весь экран.
+</p>
+
+<p>
+ Если приложение предназначено для Android N, но
+значение для этого атрибута не было указано, то по умолчанию используется значение true.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ Установите этот атрибут в узле <code><activity></code> манифеста,
+ чтобы указать, поддерживает ли операция режим "картинка в картинке". Этот
+ атрибут не принимается во внимание, если для <code>android:resizeableActivity</code> установлено значение false.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">Атрибуты макета</h3>
+
+<p>
+ В Android N элемент манифеста <code><layout></code> поддерживает
+ несколько атрибутов, которые определяют поведение
+ операции в многооконном режиме.
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ Ширина окна операции по умолчанию в режиме произвольной формы.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ Высота окна операции по умолчанию в режиме произвольной формы.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ Начальная позиция окна операции в режиме произвольной формы. Допустимые значения
+ см. в описании класса {@link android.view.Gravity}.
+ </dd>
+
+ <dt>
+ <code>android:minimalSize</code>
+ </dt>
+
+ <dd>
+ Минимальные значения высоты и ширины окна операции в режимах разделения экрана
+ и произвольной формы. Если пользователь перемещает разделительную линию
+ в режиме разделения экрана, чтобы сделать размер окна операции
+ меньше указанного минимума, система обрезает его до запрошенного пользователем размера.
+ </dd>
+</dl>
+
+<p>
+ В следующем примере кода показано, как задать размер и
+ позицию окна операции по умолчанию, а также ее минимальный размер в
+ режиме произвольной формы:
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalSize="450dp" />
+</activity>
+</pre>
+
+<h2 id="running">Запуск приложения в многооконном режиме</h2>
+
+<p>
+ Android N предоставляет новые возможности для поддержки
+ приложений в многооконном режиме.
+</p>
+
+<h3 id="disabled-features">Недоступные возможности в многооконном режиме</h3>
+
+<p>
+ Некоторые возможности отключены или игнорируются в многооконном
+ режиме, потому что они не имеют смысла для операции, которая отображается
+ на экране устройства одновременно с другими операциями или приложениями. Ниже приведены примеры таких возможностей.
+
+<ul>
+ <li>Отключены некоторые параметры настройки <a href="{@docRoot}training/system-ui/index.html">системного интерфейса</a>.
+ Например, приложения не могут
+ скрыть строку состояния, если они не работают в полноэкранном режиме.
+ </li>
+
+ <li>Система не учитывает изменения атрибута <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code>.
+ </li>
+</ul>
+
+<h3 id="change-notification">Уведомления об изменениях и запросы в многооконном режиме</h3>
+
+<p>
+ Для поддержки многооконного режима в класс {@link android.app.Activity}
+ были добавлены следующие методы. Подробнее о каждом из них см. в
+ <a href="{@docRoot}preview/setup-sdk.html#docs-dl">справочнике по N Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.inMultiWindow()</code>
+ </dt>
+
+ <dd>
+ Вызовите этот метод, чтобы узнать, находится ли операция в многооконном режиме.
+ </dd>
+
+ <dt>
+ <code>Activity.inPictureInPicture()</code>
+ </dt>
+
+ <dd>
+ Вызовите этот метод, чтобы узнать, находится ли операция в режиме "картинка в картинке".
+
+ <p class="note">
+ <strong>Примечание.</strong> Режим "картинка в картинке" — это частный
+ случай многооконного режима. Если метод <code>myActivity.inPictureInPicture()</code>
+ возвращает значение true, <code>myActivity.inMultiWindow()</code> также возвращает
+ true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowChanged()</code>
+ </dt>
+
+ <dd>
+ Система вызывает этот метод, когда операция переходит в многооконный
+ режим или выходит из него. Система передает методу значение true, если
+ операция входит в многооконный режим, и значение false, если
+ она выходит из него.
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureChanged()</code>
+ </dt>
+
+ <dd>
+ Система вызывает этот метод, когда операция переходит в режим
+ "картинка в картинке". Система передает методу значение true,
+ если операция входит в режим "картинка в картинке", и значение false,
+ если она выходит из него.
+ </dd>
+</dl>
+
+<p>
+ Также существуют версии {@link android.app.Fragment} для этих методов,
+например, <code>Fragment.inMultiWindow()</code>.
+</p>
+
+<h3 id="entering-pip">Переход в режим "картинка в картинке"</h3>
+
+<p>
+ Чтобы перевести операцию в режим "картинка в картинке",
+ вызовите новый метод <code>Activity.enterPictureInPicture()</code>. Этот метод игнорируется, если
+ устройство не поддерживает режим "картинка в картинке". Дополнительная информация содержится в документации
+ <a href="picture-in-picture.html">Режим "картинка в картинке"</a>.
+</p>
+
+<h3 id="launch">Запуск новых операций в многооконном режиме</h3>
+
+<p>
+ При запуске новой операции можно сообщить системе, что окно новой
+ операции следует показать рядом с текущим, если это возможно. Для этого
+ используйте флаг
+ <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Этот
+ флаг запрашивает следующее поведение.
+</p>
+
+<ul>
+ <li>Если устройство находится в режиме разделения экрана, система пытается
+ создать окно новой операции рядом с окном запустившей ее операции,
+ чтобы разместить две операции на экране. Не гарантируется, что система сможет это сделать, но если
+ это возможно, операции отображаются рядом друг с другом.
+ </li>
+
+ <li>Если устройство не находится в режиме разделения экрана, этот флаг не учитывается.
+ </li>
+</ul>
+
+<p>
+ Если при запуске
+ новой операции устройство находится в режиме произвольной формы, вы можете задать размеры и позицию окна новой операции,
+ вызвав метод <code>ActivityOptions.setLaunchBounds()</code>. Этот метод игнорируется, если
+ устройство не находится в многооконном режиме.
+</p>
+
+<p class="note">
+ <strong>Примечание.</strong> Если запустить операцию в стеке задач,
+ она заменит операцию на экране, унаследовав все ее
+ свойства многооконного режима. Чтобы запустить новую операцию в отдельном
+ окне в многооконном режиме, ее следует запустить в новом стеке задач.
+</p>
+
+<h3 id="dnd">Поддержка перетаскивания</h3>
+
+<p>
+ Пользователи могут <a href="{@docRoot}guide/topics/ui/drag-drop.html">перетаскивать</a> данные
+ между окнами операций в режиме
+ совместного отображения. (Ранее перетаскивать данные можно было только в рамках
+ одной операции). Поэтому вы можете реализовать функции перетаскивания
+ в своем приложении, если оно еще их не поддерживает.
+</p>
+
+<p>
+ В N Preview SDK пакет <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+ расширен для поддержки перетаскивания между приложениями. Дополнительная информация о нижеприведенных классах
+ и методах содержится в <a href="{@docRoot}preview/setup-sdk.html#docs-dl">справочнике по N
+ Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ Объект токена для указания разрешений
+ приложению, в которое перетаскиваются данные.
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Новый псевдоним для {@link android.view.View#startDrag View.startDrag()}. Чтобы
+ разрешить перетаскивание между операциями, передайте
+ новый флаг <code>View.DRAG_FLAG_GLOBAL</code>. Если вам нужно предоставить принимающей операции разрешения на чтение или запись URI,
+ передайте новый флаг
+ <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> или
+ <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code> соответственно.
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Отменяет текущую операцию перетаскивания. Этот метод может вызвать только
+ приложение, в котором была инициирована операция перетаскивания.
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ Заменяет тень текущей операции перетаскивания. Этот метод может вызвать только приложение,
+ в котором была инициирована операция перетаскивания.
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ Запрашивает разрешения для URI контента, переданных в объекте {@link
+ android.content.ClipData} в {@link android.view.DragEvent}.
+ </dd>
+</dl>
+
+<h2 id="testing">Тестирование приложения в многооконном режиме</h2>
+
+<p>
+ Независимо от того, обновляете ли вы свое приложение для Android N, вам необходимо
+ подтвердить его поведение в многооконном
+ режиме на тот случай, если пользователь попытается запустить его в этом режиме на устройстве с Android N.
+</p>
+
+<h3 id="configuring">Настройка тестового устройства</h3>
+
+<p>
+ Если установить Android N на устройстве, режим разделения
+ экрана будет поддерживаться автоматически.
+</p>
+
+<h3 id="test-non-n">Если приложение было создано без использования N Preview SDK</h3>
+
+<p>
+ Если вы не применяли N Preview SDK для создания приложения и пользователь
+ попытается запустить его в многооконном режиме, система принудительно
+ изменит размер окна приложения, если его ориентация не зафиксирована.
+</p>
+
+<p>
+ Если для приложения не задана фиксированная ориентация, вам
+ следует запустить его на устройстве с Android N и попытаться
+ перевести его в режим разделения экрана. Убедитесь, что приложение
+ работает нормально после принудительного изменения размера.
+</p>
+
+<p>
+ Если для приложения задана фиксированная ориентация, попытайтесь
+ перевести его в многооконный режим. Убедитесь, что при этом
+ приложение остается в полноэкранном режиме.
+</p>
+
+<h3 id="test-mw">Если приложение поддерживает многооконный режим</h3>
+
+<p>
+ Если вы использовали N Preview SDK для создания приложения и не
+ отключили поддержку многооконного режима, проверьте работу
+ приложения, как описано далее, в режимах разделения экрана и произвольной формы.
+</p>
+
+<ul>
+ <li>Запустите приложение в полноэкранном режиме, а затем переключитесь
+ в многооконный режим долгим нажатием кнопки "Обзор". Убедитесь, что приложение корректно переключается между режимами.
+ </li>
+
+ <li>Запустите приложение непосредственно в многооконном режиме
+ и убедитесь, что оно работает нормально. Вы можете запустить приложение в многооконном режиме, нажав
+ кнопку "Обзор", затем длительно нажав строку заголовка приложения и
+ перетащив ее в одну из выделенных областей на экране.
+ </li>
+
+ <li>Измените размер окна приложения в режиме разделения экрана, перетащив линию разделения.
+ Убедитесь, что изменение размера не приводит к сбою и что необходимые
+ элементы интерфейса остаются видимыми.
+ </li>
+
+ <li>Если вы указали минимальные размеры окна приложения, попытайтесь
+ установить размер меньше минимального. Убедитесь в невозможности установить размер
+ меньше указанного минимума.
+ </li>
+
+ <li>Во время всех тестов следите за производительностью приложения — она должна быть приемлемой. Например,
+ убедитесь, что после изменения размера окна приложения не возникает большой
+ задержки обновления интерфейса.
+ </li>
+</ul>
+
+<h4 id="test-checklist">Контрольный список тестирования</h4>
+
+<p>
+ Для проверки производительности приложения в многооконном режиме
+ выполните следующие операции. Попытайтесь выполнить их в режиме разделения экрана и
+ в многооконном режиме, если не указано иное.
+</p>
+
+<ul>
+ <li>Перейдите в многооконный режим и выйдите из него.
+ </li>
+
+ <li>Переключитесь из своего приложения в другое приложение и убедитесь,
+ что приложение работает нормально, если оно видимо, но не активно. Например, если приложение
+ показывает видео, оно должно продолжать воспроизведение, когда
+ пользователь работает с другим приложением.
+ </li>
+
+ <li>В режиме разделения экрана попробуйте перемещать линию
+ разделения, увеличивая и уменьшая окно приложения. Попробуйте выполнить эти операции, когда окна двух
+ приложений находятся рядом и друг над другом. Убедитесь, что приложение не завершается с ошибкой,
+ необходимые элементы видны и изменение размера не занимает
+ слишком много времени.
+ </li>
+
+ <li>Быстро измените размер окна приложения несколько раз подряд. Убедитесь, что
+ приложение не зависает и не вызывает утечку памяти. Информация о проверке использования памяти
+ приложением содержится в документе <a href="{@docRoot}tools/debugging/debugging-memory.html">
+Анализ использования оперативной памяти</a>.
+ </li>
+
+ <li>Поработайте с приложением в различных оконных конфигурациях и
+ убедитесь, что оно ведет себя должным образом. Текст должен легко читаться, а
+ элементы интерфейса не должны быть слишком маленькими.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">Если вы отключили поддержку многооконного режима</h3>
+
+<p>
+ Если вы отключили поддержку многооконного режима,
+ установив атрибут <code>android:resizableActivity="false"</code>, запустите
+ приложение на устройстве с Android N и
+ попытайтесь перевести его в режимы произвольной формы и разделения экрана. Убедитесь, что при этом
+ приложение остается в полноэкранном режиме.
+</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/ru/guide/topics/ui/notifiers/notifications.jd
index d072b77..c286431 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/notifiers/notifications.jd
@@ -92,7 +92,7 @@
<p>Поскольку уведомления являются как важной составной частью пользовательского интерфейса Android, для них имеются собственные инструкции по проектированию.
Появившиеся в Android 5.0 (уровень API 21) значительные изменения дизайна имеют особо важное
значение, поэтому для получения более подробной информации вам следует ознакомиться с учебником по интерфейсу <a href="{@docRoot}training/material/index.html">Material Design</a>
-. Чтобы узнать, как проектировать уведомления и взаимодействие с ними, прочитайте руководство по проектированию
+. Чтобы узнать, как проектировать уведомления и взаимодействие с ними, прочитайте руководство по проектированию
<a href="{@docRoot}design/patterns/notifications.html">Уведомления</a>.</p>
<h2 id="CreateNotification">Создание уведомления</h2>
@@ -294,7 +294,7 @@
Обеспечьте доступ к этой функции операции {@link android.app.Activity} всех пользователей,
сделав так, чтобы эта операция запускалась, когда пользователь нажимает уведомление. Для этого
создайте объект {@link android.app.PendingIntent}
- для операции {@link android.app.Activity}. Вызовите
+ для операции {@link android.app.Activity}. Вызовите
{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent
setContentIntent()}, чтобы добавить объект {@link android.app.PendingIntent} в уведомление.
</li>
@@ -333,7 +333,7 @@
вызова метода {@link android.app.NotificationManager#notify(int, android.app.Notification) NotificationManager.notify()}.
Чтобы изменить это уведомление, после того как оно выдано,
обновите или создайте объект {@link android.support.v4.app.NotificationCompat.Builder},
- постройте на его основе объект {@link android.app.Notification} и выдайте
+ постройте на его основе объект {@link android.app.Notification} и выдайте
объект {@link android.app.Notification} с тем же идентификатором, который использовался ранее. Если
предыдущее уведомление все еще отображается на экране, система обновит его с использованием содержимого
объекта{@link android.app.Notification}. Если предыдущее уведомление было закрыто, то
@@ -451,14 +451,14 @@
Добавьте поддержку для версии Android 4.0.3 и более ранних версий. Для этого укажите родительский объект операции
{@link android.app.Activity}, которую запускаете, добавив элемент
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code>
- в качестве дочернего для элемента
+ в качестве дочернего для элемента
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>.
<p>
Для этого элемента задайте
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#nm">android:name</a>="android.support.PARENT_ACTIVITY"</code>.
Задайте
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#val">android:value</a>="<parent_activity_name>"</code>,
- где <code><parent_activity_name></code> ― это значение
+ где <code><parent_activity_name></code> ― это значение
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#nm">android:name</a></code>
для родительского элемента
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
@@ -466,7 +466,7 @@
</p>
</li>
<li>
- Также добавьте поддержку для версии Android 4.1 и более поздних версий. Для этого добавьте атрибут
+ Также добавьте поддержку для версии Android 4.1 и более поздних версий. Для этого добавьте атрибут
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#parent">android:parentActivityName</a></code>
в элемент
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
@@ -513,7 +513,7 @@
запускает {@link android.app.Activity}. Этот метод также добавляет флаги, которые запускают
стек в новой задаче.
<p class="note">
- <strong>Примечание.</strong> Несмотря на то что аргумент
+ <strong>Примечание.</strong> Несмотря на то что аргумент
{@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()}
является ссылкой на запускаемую операцию {@link android.app.Activity}, при вызове этого метода
не добавляется объект {@link android.content.Intent}, который запускает операцию
@@ -536,7 +536,7 @@
в нее с помощью действия <i>"Назад"</i>.
</li>
<li>
- Получите объект {@link android.app.PendingIntent} для этого стека переходов назад путем вызова метода
+ Получите объект {@link android.app.PendingIntent} для этого стека переходов назад путем вызова метода
{@link android.support.v4.app.TaskStackBuilder#getPendingIntent getPendingIntent()}.
Затем этот объект {@link android.app.PendingIntent} можно будет использовать в качестве аргумента для метода
{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent
@@ -576,7 +576,7 @@
Особой операции {@link android.app.Activity} не требуется стек перехода назад, поэтому не нужно
определять иерархию объектов {@link android.app.Activity} в файле манифеста и
вызывать
- метод {@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()} для построения
+ метод {@link android.support.v4.app.TaskStackBuilder#addParentStack addParentStack()} для построения
стека перехода назад. Вместо этого в файле манифеста задайте параметры задачи {@link android.app.Activity}
и создайте объект {@link android.app.PendingIntent} путем вызова метода
{@link android.app.PendingIntent#getActivity getActivity()}:
@@ -597,7 +597,7 @@
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">android:taskAffinity</a>=""</code>
</dt>
<dd>
- В сочетании с
+ В сочетании с
флагом {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK FLAG_ACTIVITY_NEW_TASK},
который вы задали в коде, это гарантирует, что данная операция {@link android.app.Activity} не
перейдет в задачу приложения, используемую по умолчанию. Любые существующие задачи, имеющие
@@ -629,11 +629,11 @@
Построение и выдача уведомления:
<ol style="list-style-type: lower-alpha;">
<li>
- Создайте объект {@link android.content.Intent}, который запускает операцию
+ Создайте объект {@link android.content.Intent}, который запускает операцию
{@link android.app.Activity}.
</li>
<li>
- Настройте операцию {@link android.app.Activity}, запускаемую в новой пустой задаче, путем вызова метода
+ Настройте операцию {@link android.app.Activity}, запускаемую в новой пустой задаче, путем вызова метода
{@link android.content.Intent#setFlags setFlags()} с флагами
{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK FLAG_ACTIVITY_NEW_TASK}
и
@@ -714,7 +714,7 @@
{@link android.support.v4.app.NotificationCompat.Builder#setProgress
setProgress(max, progress, false)}, а затем выдайте уведомление. По мере выполнения
увеличивайте значение <code>progress</code> и обновляйте уведомление. По окончании операции
- <code>progress</code> должен быть равен <code>max</code>. Стандартный способ вызова метода
+ <code>progress</code> должен быть равен <code>max</code>. Стандартный способ вызова метода
{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}
заключается в следующем: задать значение <code>max</code> равным 100 с последующим увеличением <code>progress</code> в виде
величины "процента выполнения" операции.
@@ -841,7 +841,7 @@
<p>Примеры ситуаций, в которых могут быть вызваны уведомления heads-up:</p>
<ul>
- <li>операция пользователя выполняется в полноэкранном режиме (приложение использует
+ <li>операция пользователя выполняется в полноэкранном режиме (приложение использует
{@link android.app.Notification#fullScreenIntent}) или;</li>
<li>уведомление имеет высокий приоритет и использует рингтоны или
вибрацию.</li>
@@ -915,7 +915,7 @@
</pre>
<p class="note"><strong>Примечание.</strong> Прекращение использования класса {@link android.media.RemoteControlClient}
-имеет и другие последствия для управления мультимедиа. Подробные сведения о новых API-интерфейсах для управления сеансами воспроизведения мультимедиа см. в разделе
+имеет и другие последствия для управления мультимедиа. Подробные сведения о новых API-интерфейсах для управления сеансами воспроизведения мультимедиа см. в разделе
<a href="{@docRoot}about/versions/android-5.0.html#MediaPlaybackControl">Управление воспроизведением мультимедиа</a>
.</p>
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/overview.jd b/docs/html-intl/intl/ru/guide/topics/ui/overview.jd
index 0e9628b..8bb953f 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>Полное руководство по созданию макета пользовательского интерфейса см. в документе <a href="declaring-layout.html">Макеты
XML</a>.
-
+
<h2 id="UIComponents">Компоненты пользовательского интерфейса</h2>
<p>Не обязательно создавать все элементы пользовательского интерфейса с помощью объектов {@link android.view.View} и {@link
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/settings.jd b/docs/html-intl/intl/ru/guide/topics/ui/settings.jd
index 4325439..9adfd62 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/settings.jd
@@ -82,7 +82,7 @@
<img src="{@docRoot}images/ui/settings/settings.png" alt="" width="435" />
<p class="img-caption"><strong>Рисунок 1.</strong> Снимки экранов настроек приложения Android
-для обмена сообщениями. Выбор элемента, заданного посредством {@link android.preference.Preference},
+для обмена сообщениями. Выбор элемента, заданного посредством {@link android.preference.Preference},
открывает интерфейс для изменения значения.</p>
@@ -143,7 +143,7 @@
<p>Каждая настройка для вашего приложения представлена конкретным подклассом класса {@link
android.preference.Preference}. Каждый подкласс содержит набор основных свойств, которые позволяют вам
указывать, например, заголовок для настройки и ее значение по умолчанию. Каждый подкласс также содержит
-собственные специализированные свойства и пользовательский интерфейс. В качестве примера на рисунке 1 показан снимок экрана настроек
+собственные специализированные свойства и пользовательский интерфейс. В качестве примера на рисунке 1 показан снимок экрана настроек
приложения Android для обмена сообщениями. Каждый элемент списка на экране настроек возвращается отдельным объектом {@link
android.preference.Preference}.</p>
@@ -226,7 +226,7 @@
<dt>{@code android:key}</dt>
<dd>Этот атрибут необходим для предпочтений, которые сохраняют значение данных. Он задает уникальный
ключ (строку), который использует система при сохранении значения этой настройки в {@link
-android.content.SharedPreferences}.
+android.content.SharedPreferences}.
<p>Этот атрибут <em>не является обязательным</em> только когда предпочтение представляет собой
{@link android.preference.PreferenceCategory} или {@link android.preference.PreferenceScreen}, либо
предпочтение указывает намерение {@link android.content.Intent} для вызова (посредством элемента <a href="#Intents">{@code <intent>}</a>) или фрагмент {@link android.app.Fragment} для отображения (с помощью атрибута <a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
@@ -271,7 +271,7 @@
</ul>
<p>Вы можете пользоваться одним или обоими из этих методов группировки для организации настроек в вашем приложении. Принимая
-решение об используемом варианте и о разделении настроек на группы, вы должны следовать инструкциям в разделе
+решение об используемом варианте и о разделении настроек на группы, вы должны следовать инструкциям в разделе
<a href="{@docRoot}design/patterns/settings.html">Настройки</a> руководства «Дизайн для Android».</p>
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -430,7 +430,7 @@
<p>При разработке приложений для Android 3.0 (API уровня 11) и более поздних версий необходимо использовать {@link
android.preference.PreferenceFragment} для отображения списка
-объектов {@link android.preference.Preference}. Вы можете добавить {@link android.preference.PreferenceFragment} в любую операцию, при этом
+объектов {@link android.preference.Preference}. Вы можете добавить {@link android.preference.PreferenceFragment} в любую операцию, при этом
необязательно использовать {@link android.preference.PreferenceActivity}.</p>
<p><a href="{@docRoot}guide/components/fragments.html">Фрагменты</a> обеспечивают более
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -636,7 +636,7 @@
<h3 id="DisplayHeaders">Отображение заголовков</h3>
<p>Чтобы отобразить заголовки предпочтений, вы должны реализовать метод обратного вызова {@link
-android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} и вызвать
+android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} и вызвать
{@link android.preference.PreferenceActivity#loadHeadersFromResource
loadHeadersFromResource()}. Например:</p>
@@ -672,38 +672,38 @@
для загрузки.</p>
<p>В качестве примера приведен XML-файл для заголовков предпочтений, который используется в Android версии 3.0
-и более поздних версий ({@code res/xml/preference_headers.xml}):</p>
+и более поздних версий ({@code res/xml/preference_headers.xml}):</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
</preference-headers>
</pre>
-<p>А здесь представлен файл предпочтений, который содержит те же самые заголовки для версий старше
+<p>А здесь представлен файл предпочтений, который содержит те же самые заголовки для версий старше
Android 3.0 ({@code res/xml/preference_headers_legacy.xml}):</p>
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -992,7 +992,7 @@
<p>Вы можете сохранить значение настройки в любой момент, вызвав один из методов {@code persist*()} класса {@link
android.preference.Preference}, например, {@link
-android.preference.Preference#persistInt persistInt()}, если настройка имеет целое значение, или
+android.preference.Preference#persistInt persistInt()}, если настройка имеет целое значение, или
{@link android.preference.Preference#persistBoolean persistBoolean()} для сохранения логического значения.</p>
<p class="note"><strong>Примечание.</strong> Каждое предпочтение {@link android.preference.Preference} может сохранять только один
@@ -1071,7 +1071,7 @@
<h3 id="CustomDefault">Предоставление значения по умолчанию</h3>
-<p>Если экземпляр вашего класса {@link android.preference.Preference} указывает значение по умолчанию
+<p>Если экземпляр вашего класса {@link android.preference.Preference} указывает значение по умолчанию
(с помощью атрибута {@code android:defaultValue}),
система вызывает {@link android.preference.Preference#onGetDefaultValue
onGetDefaultValue()}, когда она создает экземпляр объекта для извлечения значения. Вы должны реализовать
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/ru/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/ru/guide/topics/ui/ui-events.jd
index cd2b481..9f3609b 100644
--- a/docs/html-intl/intl/ru/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/ui-events.jd
@@ -30,7 +30,7 @@
которые называются <a href="#EventListeners">приемниками событий</a>, и служат перехватчиками действий пользователя с вашим пользовательским интерфейсом.</p>
<p>Несмотря на то, что вы будете чаще использовать приемники событий для перехвата действий пользователя, может
-наступить момент, когда вам не захочется наследовать класс View, чтобы создать нестандартный компонент.
+наступить момент, когда вам не захочется наследовать класс View, чтобы создать нестандартный компонент.
Возможно, вы захотите наследовать класс {@link android.widget.Button},
чтобы сделать нечто более необычное. В этом случае вы сможете определить поведение события по умолчанию для своего
класса с помощью <a href="#EventHandlers">обработчиков событий</a> класса.</p>
@@ -46,27 +46,27 @@
<dl>
<dt><code>onClick()</code></dt>
- <dd>Из объекта {@link android.view.View.OnClickListener}.
+ <dd>Из объекта {@link android.view.View.OnClickListener}.
Этот метод вызывается, когда пользователь касается элемента
(в режиме касания), или переводит фокус на элемент с помощью клавиш перемещения или трекбола и
нажимает соответствующую клавишу «ввода» или нажимает на трекбол.</dd>
<dt><code>onLongClick()</code></dt>
- <dd>Из объекта {@link android.view.View.OnLongClickListener}.
+ <dd>Из объекта {@link android.view.View.OnLongClickListener}.
Этот метод вызывается, когда пользователь касается элемента и удерживает его (в режиме касания),
или переводит фокус на элемент с помощью клавиш перемещения или трекбола и
нажимает и удерживает соответствующую клавишу «ввода» или трекбол (в течение одной секунды).</dd>
<dt><code>onFocusChange()</code></dt>
- <dd>Из объекта {@link android.view.View.OnFocusChangeListener}.
+ <dd>Из объекта {@link android.view.View.OnFocusChangeListener}.
Этот метод вызывается, когда пользователь перемещается в элемент или из него с помощью клавиш перемещения или трекбола.</dd>
<dt><code>onKey()</code></dt>
- <dd>Из объекта {@link android.view.View.OnKeyListener}.
+ <dd>Из объекта {@link android.view.View.OnKeyListener}.
Этот метод вызывается, когда пользователь переносит фокус на элемент и нажимает или отпускает аппаратную клавишу на устройстве.</dd>
<dt><code>onTouch()</code></dt>
- <dd>Из объекта {@link android.view.View.OnTouchListener}.
+ <dd>Из объекта {@link android.view.View.OnTouchListener}.
Этот метод вызывается, когда пользователь выполняет действие, считающееся событием касания, например, нажимает, отпускает
или выполняет любой жест на экране (в пределах границ элемента).</dd>
<dt><code>onCreateContextMenu()</code></dt>
- <dd>Из объекта {@link android.view.View.OnCreateContextMenuListener}.
+ <dd>Из объекта {@link android.view.View.OnCreateContextMenuListener}.
Этот метод вызывается, когда создается контекстное меню (в результате длительного «длительного нажатия»). См. обсуждение
контекстных меню в руководстве
для разработчиков <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Меню</a>.</dd>
@@ -75,8 +75,8 @@
<p>Эти методы являются единственными составными частями соответствующих интерфейсов. Чтобы определить один из этих методов
и обрабатывать события, реализуйте вложенный интерфейс в вашем процесс или определите его, как анонимный класс.
Затем передайте экземпляр реализации
-в соответствующий метод <code>View.set...Listener()</code>. (Например, вызовите
-<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
+в соответствующий метод <code>View.set...Listener()</code>. (Например, вызовите
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
и передайте ему свою реализацию {@link android.view.View.OnClickListener OnClickListener}.)</p>
<p>В следующем примере показано, как зарегистрировать приемник события «по клику» (on-click) для кнопки. </p>
@@ -122,7 +122,7 @@
зависит от события. Для некоторых методов, которые возвращают значения, причина описана ниже:</p>
<ul>
<li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> —
-этот метод возвращает логическое значение, указывающее, что вы обработали это событие и его более не следует хранить.
+этот метод возвращает логическое значение, указывающее, что вы обработали это событие и его более не следует хранить.
А именно, верните значение <em>true</em>, чтобы указать, что вы обработали событие и его следует остановить;
верните значение <em>false</em>, если вы не обработали его и/или событие должно продолжаться для любых других
приемников события on-click.</li>
@@ -181,14 +181,14 @@
макета, учитывайте и другие методы:</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code> — этот метод позволяет вашей операции {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code> — этот метод позволяет вашей операции {@link
android.app.Activity} перехватывать все события касаний перед их отправкой в окно.</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> — этот метод позволяет объекту {@link
android.view.ViewGroup} просматривать события перед их отправкой в дочерние отображаемые объекты.</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> — вызовите этот метод
-в родительском отображаемом объекте, чтобы указать ему, что он не должен перехватывать события касания с помощью <code>{@link
+в родительском отображаемом объекте, чтобы указать ему, что он не должен перехватывать события касания с помощью <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>.</li>
</ul>
@@ -199,7 +199,7 @@
какой элемент будет принимать ввод. Однако, если устройство поддерживает сенсорный ввод, и пользователь
начинает взаимодействовать с интерфейсом, прикасаясь к его элементам, исчезает необходимость
выделять элементы или передавать фокус определенному отображаемому объекту. Следовательно, существует режим
-взаимодействия, который называется «режимом касания».
+взаимодействия, который называется «режимом касания».
</p>
<p>
Как только пользователь касается экрана, устройство, поддерживающее сенсорный ввод,
@@ -214,7 +214,7 @@
с пользовательским интерфейсом без касания экрана.
</p>
<p>
-Состояние режима касания поддерживается во всей системе (для всех окон и операций).
+Состояние режима касания поддерживается во всей системе (для всех окон и операций).
Чтобы узнать текущее состояние, можно вызвать
{@link android.view.View#isInTouchMode} и посмотреть, находится ли устройство в режиме касания.
</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/ru/preview/api-overview.jd b/docs/html-intl/intl/ru/preview/api-overview.jd
deleted file mode 100644
index d4e6042..0000000
--- a/docs/html-intl/intl/ru/preview/api-overview.jd
+++ /dev/null
@@ -1,676 +0,0 @@
-page.title=Android N для разработчиков
-meta.tags="предварительная версия", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Основные возможности для разработчиков</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">Поддержка многооконного режима</a></li>
- <li><a href="#notification_enhancements">Уведомления</a></li>
- <li><a href="#jit_aot">Динамическая/предварительная компиляция</a></li>
- <li><a href="#quick_path_to_app_install">Быстрый способ установки приложения</a></li>
- <li><a href="#doze_on_the_go">Сон на ходу: режим Doze</a></li>
- <li><a href="#background_optimizations">Оптимизация фоновых процессов</a></li>
- <li><a href="#data_saver">Экономия трафика</a></li>
- <li><a href="#tile_api">API панели быстрых настроек</a></li>
- <li><a href="#number-blocking">Блокировка номеров</a></li>
- <li><a href="#call_screening">Фильтрация вызовов</a></li>
- <li><a href="#multi-locale_languages">Языки и языковые настройки</a></li>
- <li><a href="#icu4">API-интерфейсы ICU4J в Android</a></li>
- <li><a href="#gles_32">API OpenGL ES 3.2</a></li>
- <li><a href="#android_tv_recording">Запись Android TV</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">Специальные возможности</a></li>
- <li><a href="#direct_boot">Режим Direct Boot</a></li>
- <li><a href="#key_attestation">Аттестация ключей</a></li>
- <li><a href="#network_security_config">Конфигурация сетевой безопасности</a></li>
- <li><a href="#default_trusted_ca">Доверенный центр сертификации по умолчанию</a></li>
- <li><a href="apk_signature_v2">Схема получения подписи APK, версия 2</a></li>
- <li><a href="#scoped_directory_access">Доступ к выделенным каталогам</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Система Android N еще находится в активной стадии разработки, но ее уже можно опробовать в виде предварительной версии
-N Developer Preview. В следующих разделах рассматриваются некоторые из
- ее новых возможностей для разработчиков. </p>
-
-<p>
- Обязательно изучите раздел <a href="{@docRoot}preview/behavior-changes.html">Изменения в работе</a>, в котором описаны
-изменения платформы, способные повлиять на работу приложений, ознакомьтесь более подробно с основными возможностями
-в руководствах для разработчиков и загрузите <a href="{@docRoot}preview/setup-sdk.html#docs-dl">справочник по API</a> с подробным описанием новых
-API-интерфейсов.
-</p>
-
-<h2 id="multi-window_support">Поддержка многооконного режима</h2>
-
-
-<p>В Android N представлена новая долгожданная функция многозадачности
-– многооконный режим. </p>
-
- <p>Теперь пользователи смогут открывать на экране два приложения одновременно. </p>
- <ul>
- <li>На телефонах и планшетах под управлением
-Android N пользователи могут запустить два приложения рядом или друг над другом
-в режиме разделенного экрана. Размеры окон приложений можно изменить с помощью
-разделителя между ними. </li>
-
-<li>На устройствах Android TV для приложений будет доступен <a href="{@docRoot}preview/features/picture-in-picture.html">режим
-"картинка в картинке"</a>, который позволит приложению отображать контент, пока пользователь просматривает другие приложения или
-взаимодействует с ними. Более подробная информация приведена ниже. </li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>Рис. 1.</strong> Приложения в режиме разделенного экрана.
-</p>
- </div>
-
-<p>Поддержка многооконного режима открывает новые возможности привлечения пользователей,
-особенно на планшетах и других устройствах с большим размером экрана. Вы можете даже включить в своем приложении функцию перетаскивания
-для удобного перемещения контента между приложениями – отличный
-способ улучшить пользовательский интерфейс. </p>
-
-<p>Вы можете легко добавить поддержку многооконного режима в свое приложение и настроить его
-работу с окнами экрана. Например, вы можете определить минимальные допустимые размеры,
-до которых пользователи могут уменьшить окно приложения.
-Вы можете также отключить многооконный режим для своего приложения, чтобы
-система отображала его только в полноэкранном режиме.</p>
-
-<p>
- Дополнительная информация содержится в документе для разработчиков <a href="{@docRoot}preview/features/multi-window.html">Поддержка многооконного режима</a>.
-
-</p>
-
-<h2 id="notification_enhancements">Новые возможности уведомлений</h2>
-
-<p>В Android N изменен дизайн уведомлений, которые стали проще и удобнее.
-Ниже приведены некоторые изменения.</p>
-
-<ul>
- <li>
- <strong>Обновления шаблонов</strong>. В новых шаблонах уведомлений
-сделан акцент на изображении и аватаре контакта. Разработчики смогут
-использовать новые шаблоны с минимальными изменениями своего кода.
- </li>
-
- <li>
- <strong>Группы уведомлений</strong>. Система может группировать уведомления,
-например по теме сообщений, и отображать группу. Пользователь может применять к группам
-действия, например, закрывать их или архивировать. Если вы ранее выполняли реализацию
-уведомлений для Android Wear, то вам уже должна быть знакома эта
-модель.
- </li>
-
- <li>
- <strong>Непосредственный ответ в уведомлении</strong>.
-Android теперь поддерживает функцию внутренних ответов в приложениях для общения в режиме реального времени. Это позволяет быстро ответить на
-СМС или текстовое сообщение непосредственно в интерфейсе уведомления.
- </li>
-
- <li>
- <strong>Собственные представления</strong>. Два новых API-интерфейса позволяют применять системные элементы,
-такие как заголовки и действия уведомлений, при использовании собственных представлений в
-уведомлениях.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>Рис. 2.</strong> Группы уведомлений и непосредственный ответ.
-</p>
-
-<p>Способы реализации новых возможностей описаны в руководстве
-<a href="{@docRoot}preview/features/notification-updates.html">Уведомления</a>.
-</p>
-
-
-
-<h2 id="jit_aot">Профильная динамическая/предварительная компиляция</h2>
-
-<p>В Android N добавлен динамический (JIT) компилятор с профилированием кода для среды
-ART, который позволяет постоянно улучшать производительность приложений Android во время их работы.
-JIT-компилятор дополняет текущий предварительный (AOT) компилятор ART
-и помогает повысить производительность, сократить потребление памяти, а также ускорить обновления приложений и системы.
-</p>
-
-<p>Профильная компиляция позволяет ART управлять AOT/JIT-компиляцией каждого приложения
-в соответствии с его фактическим использованием и характеристиками устройства. Например,
-ART ведет профиль часто используемых методов каждого приложения, которые она может предварительно скомпилировать
-и кэшировать для оптимальной производительности. Компиляция остальных частей приложения откладывается до того момента,
-когда они действительно понадобятся.</p>
-
-<p>Кроме повышения производительности основных частей приложения профильная
-компиляция помогает сократить общее использование оперативной памяти приложением, в том числе связанными двоичными файлами.
-Эта возможность особенно важна для устройств с небольшим объемом памяти.</p>
-
-<p>ART управляет профильной компиляцией с минимальным потреблением заряда
-аккумулятора. Предварительная компиляция выполняется только тогда, когда устройство неактивно
-и находится на зарядке, поэтому заблаговременное выполнение этой работы экономит время и энергию.</p>
-
-<h2 id="quick_path_to_app_install">Быстрый способ установки приложения</h2>
-
-<p>Одним из наиболее ощутимых преимуществ JIT-компилятора ART является скорость установки приложений
-и обновлений системы. Даже большие приложения, требовавшие нескольких минут для своей оптимизации и установки на
-Android 6.0 , теперь могут быть установлены за секунды.
- Обновления системы также выполняются быстрее, поскольку стадия оптимизации теперь отсутствует. </p>
-
-<h2 id="doze_on_the_go">Сон на ходу: режим Doze</h2>
-
-<p>В Android 6.0 был введен системный режим Doze для экономии заряда аккумулятора. В этом режиме
-выполнение процессорных и сетевых операций приложений откладывается, когда устройство не используется и неподвижно – например, лежит на столе или в ящике.
- </p>
-
-<p>В Android N режим Doze сделал шаг вперед и экономит заряд аккумулятора на ходу.
-Каждый раз, когда экран выключается на определенный промежуток времени и устройство не заряжается,
-Doze применяет частичный набор знакомых ограничений процессорной и сетевой активности приложений.
-Это означает, что пользователи могут экономить заряд аккумулятора, даже когда их устройство лежит в кармане.
-</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>Рис. 3.</strong> Режим Doze теперь применяет
-энергосберегающие ограничения, даже когда устройство находится в движении.
-</p>
-
-
-<p>Вскоре после блокировки экрана, когда устройство питается от аккумулятора, режим Doze
-ограничивает сетевой доступ и откладывает выполнение заданий и синхронизации. В течение коротких периодов пробуждения
-для приложений открывается доступ к сети и разрешается выполнение отложенных
-заданий и операций синхронизации. Включение экрана или подключение к источнику питания выводит
-устройство из режима Doze.</p>
-
-<p>Если устройство снова остается неподвижным в течение определенного периода времени (с погашенным экраном и питанием от аккумулятора),
-Doze применяет полный набор процессорных и сетевых ограничений к {@link
-android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} оповещениям и сканированию
-GPS/Wi-Fi.</p>
-
-<p>Рекомендации по адаптации приложения для режима Doze не зависят от того, двигается устройство или нет,
-поэтому если вы уже обновили свое приложение для оптимальной работы
-в режиме Doze, то все уже готово. Если нет, начните <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">адаптацию
-приложения для режима Doze</a> прямо сейчас.</p>
-
-<h2 id="background_optimizations">Проект Svelte: оптимизация фоновых процессов</h2>
-
-<p>Продолжено развитие проекта Svelte, нацеленного на сокращение использования оперативной памяти системой и приложениями
-в различных устройствах экосистемы Android. В Android N проект
-Svelte уделяет особое внимание оптимизации работы приложений в фоновом режиме. </p>
-
-<p>Работа в фоновом режиме является важной частью большинства приложений. Организация ее надлежащим образом
-может сделать интерфейс пользователя быстрым, отзывчивым и контекстно-зависимым.
-В противном случае фоновая обработка может напрасно потреблять оперативную память (и
-заряд аккумулятора) и негативно влиять на производительность других приложений. </p>
-
-<p>Начиная с Android 5.0, предпочтительным и оптимальным для пользователей способом выполнения фоновых операций стало использование планировщика {@link android.app.job.JobScheduler}.
-Приложения могут планировать свои задания, позволяя системе оптимизировать их на основе состояния памяти,
-питания и сетевого соединения. Планировщик JobScheduler прост в использовании и обеспечивает необходимый контроль,
-поэтому он рекомендуется для применения во всех приложениях.
- </p>
-
-<p>
- Другим хорошим вариантом является планировщик <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
-<code>GCMNetworkManager</code></a> в составе служб Google Play, который
-предлагает аналогичные возможности планирования заданий и совместимость с прежними версиями
-Android.
-</p>
-
-<p>Мы продолжаем расширять область применения планировщиков <code>JobScheduler</code> и
-<code>GCMNetworkManager</code>.
-Например, в Android N теперь можно планировать фоновую обработку на основании
-изменений поставщиков контента. В то же время мы начинаем исключать некоторые
-устаревшие шаблоны, которые могут ухудшить производительность системы,
-особенно на устройствах с малым объемом памяти.</p>
-
-<p>В Android N удалены три часто используемые неявные рассылки —
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
-android.hardware.Camera#ACTION_NEW_PICTURE} и {@link
-android.hardware.Camera#ACTION_NEW_VIDEO}, — поскольку они могут пробудить
-фоновые процессы сразу нескольких приложений, повысив потребление памяти и заряда аккумулятора. Если
-ваше приложение получает эти рассылки, используйте преимущество N Developer Preview для миграции на
-<code>JobScheduler</code> и связанные с ним API-интерфейсы. </p>
-
-<p>
- Дополнительная информация содержится в документе <a href="{@docRoot}preview/features/background-optimization.html">Оптимизация
-фоновых процессов</a>.
-</p>
-
-
-<h2 id="data_saver">Экономия трафика</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>Рис. 4.</strong> Настройка экономии трафика.
-</p>
- </div>
-
-<p>В течение срока эксплуатации мобильного устройства стоимость сотового трафика обычно
-превышает стоимость самого устройства. Для многих пользователей сотовый трафик является
-весьма дорогим ресурсом, который они хотели бы сэкономить. </p>
-
-<p>В Android N появился режим экономии трафика – новая системная служба, которая помогает сократить
-использование сотового трафика приложениями в роуминге, в конце периода тарификации
-или для небольших предоплаченных пакетов трафика. Режим экономии трафика дает пользователям возможность контроля использования сотового трафика приложениями
-и позволяет разработчикам повысить эффективность работы служб.
- </p>
-
-<p>Когда пользователь включает экономию трафика в панели <strong>Settings</strong> и устройство подключено к тарифицируемой сети,
- система блокирует использование фонового трафика и сигнализирует приложениям
-о необходимости сократить по возможности использование трафика в активном режиме, например: ограничить скорость передачи данных
-потокового вещания, уменьшить качество изображений, отложить оптимистичное предварительное кэширование
-и т.д. Пользователи могут поместить определенные приложения в белый список, разрешив им тарифицируемую фоновую передачу данных
-даже при включенном режиме экономии трафика.</p>
-
-<p>Android N расширяет применение класса {@link android.net.ConnectivityManager}, позволяя приложениям
-<a href="{@docRoot}preview/features/data-saver.html#status">выяснять пользовательские настройки
-экономии трафика</a> и <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">отслеживать
-изменения этих настроек</a>. Все приложения должны проверять, был ли включен режим экономии трафика,
-и пытаться ограничить использование трафика в фоновом и активном режимах.</p>
-
-
-<h2 id="tile_api">API панели быстрых настроек</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>Рис. 5.</strong> Плитки быстрых настроек в панели уведомлений.
-</p>
-
-
- </div><p>Быстрые настройки являются простым и популярным способом доступа к основным настройкам и действиям
-непосредственно из панели уведомлений. В Android N возможности быстрых настроек
-были расширены – они стали еще более полезными и удобными. </p>
-
-<p>Добавлено пространство для дополнительных плиток быстрых настроек, к которым можно
-обратиться с разбитой на страницы области экрана, проведя пальцем влево или вправо. Пользователи
-также могут контролировать состав и место отображения этих элементов – их можно добавлять или двигать обычным перетаскиванием.
- </p>
-
-<p>Для разработчиков Android N также предлагает новый API, который позволяет определить собственные плитки
-быстрых настроек для удобного доступа пользователей к основным элементам управления и действиям вашего приложения.</p>
-
-<p>
- Плитки быстрых настроек резервируются для элементов управления или действий, которые либо требуются срочно,
- либо часто используются. Их не следует использовать в качестве ярлыков
-для запуска приложений.
-</p>
-
-<p>
- После определения плитки можно показать пользователям, которые смогут добавить их на
-панель быстрых настроек обычным перетаскиванием.
-</p>
-
-<p>
- Дополнительную информацию о создании плиток приложений можно найти в описании
-<code>android.service.quicksettings.Tile</code> в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.
-</p>
-
-
-
-<h2 id="number-blocking">Блокировка номеров</h2>
-
-<p>Платформа Android N теперь поддерживает блокировку номеров и предоставляет
-API-интерфейс платформы, который позволяет поставщикам услуг вести список блокируемых номеров. Этот список доступен для чтения и записи стандартным приложениям
-для СМС, звонков и приложениям поставщика.
-Для других приложений это список недоступен.</p>
-
-<p>Сделав блокировку номеров стандартной функцией платформы, Android предоставляет приложениям
-единообразный способ поддержки блокировки номеров на разных устройствах.
-Приложения также получают следующие преимущества:</p>
-
-<ul>
- <li> Номера, блокируемые при вызовах, также блокируются в текстовых сообщениях.
- <li> Заблокированные номера могут быть сохранены при переустановках и переносах на другие устройства с помощью функции резервного копирования и восстановления.
-
- <li> Разные приложения могут использовать один и тот же список блокируемых номеров.
-</ul>
-
-<p>Кроме того, возможность интеграции приложения оператора мобильной сети в Android означает, что операторы могут
-читать список блокируемых номеров на устройстве и выполнять блокировку для пользователя на своей стороне,
-предотвращая доставку пользователю нежелательных вызовов и текстовых сообщений через какого-либо посредника,
-например, через конечную точку VOIP или переадресацию звонков.</p>
-
-<p>
- Дополнительную информацию можно найти в описании <code>android.provider.BlockedNumberContract</code>
-в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.
-
-</p>
-
-<h2 id="call_screening">Фильтрация вызовов</h2>
-
-<p>
- Android N дает возможность стандартному приложению для звонков фильтровать входящие вызовы. Для этого
-в приложении для звонков реализована новая служба <code>CallScreeningService</code>,
-которая позволяет приложению выполнять ряд действий на основании
-{@link android.telecom.Call.Details Call.Details} входящего вызова, например:
-</p>
-
-<ul>
- <li> отклонить входящий вызов;
- <li> не регистрировать вызов в журнале вызовов;
- <li> не показывать пользователю уведомление о вызове.
-</ul>
-
-<p>
- Дополнительную информацию можно найти в описании <code>android.telecom.CallScreeningService</code>
-в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.
-
-</p>
-
-
-<h2 id="multi-locale_languages">Поддержка нескольких языковых настроек, дополнительные языки</h2>
-
-
-<p>Android N теперь позволяет пользователям выбрать <strong>несколько языковых настроек</strong>
-для улучшенной поддержки случаев двуязычного применения. Приложения могут использовать
-новый API для получения выбранных пользователем языковых настроек и затем предоставлять более сложные
-интерфейсы для многоязычных пользователей, например: показывать результаты поиска
-на нескольких языках; не предлагать перевод веб-страниц с того языка, который уже знаком пользователю.
-</p>
-
-<p>Вместе с поддержкой нескольких языковых настроек Android N также расширяет список доступных языков.
-Для каждого распространенного
-языка, такого как английский, испанский, французский и арабский, предлагается более 25 вариантов. Также добавлена частичная
-поддержка более 100 новых языков.</p>
-
-<p>Приложения могут получить список языковых настроек, установленных пользователем, вызвав метод <code>LocaleList.GetDefault()</code>. Для поддержки расширенного количества языковых настроек в Android N изменен способ
-разрешения ресурсов. Вам следует обязательно проверить и убедиться в том,
-что ваши приложения работают надлежащим образом с новой логикой разрешения ресурсов.</p>
-
-<p>Дополнительная информация о новом способе разрешения ресурсов и соответствующие рекомендации содержатся
-в документе <a href="{@docRoot}preview/features/multilingual-support.html">Поддержка нескольких языков</a>.</p>
-
-<h2 id="icu4">API-интерфейсы ICU4J в Android</h2>
-
-<p>
- Платформа Android N теперь предлагает частичный набор API-интерфейсов <a href="http://site.icu-project.org/">ICU4J</a> в
-пакете <code>android.icu</code>. Миграция выполняется легко и в основном заключается
-в простом изменении пространства имен с <code>com.java.icu</code> на
-<code>android.icu</code>. Если вы уже используете пакет ICU4J в своих приложениях,
-переход на API-интерфейсы <code>android.icu</code>, предоставленные платформой Android,
-может существенно сократить размер пакетов APK.
-</p>
-
-<p>
- Дополнительные сведения по Android ICU4J API содержатся в документе <a href="{@docRoot}preview/features/icu4j-framework.html">Поддержка ICU4J</a>.
-</p>
-
-
-
-<h2 id="gles_32">API OpenGL™ ES 3.2</h2>
-
-<p>В платформу Android N добавлены интерфейсы и поддержка OpenGL ES 3.2, включая следующие возможности.</p>
-
-<ul>
- <li> Все расширения из <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Android Extension Pack</a></a> (AEP) кроме <code>EXT_texture_sRGB_decode</code>.
- <li> Кадровые буферы с плавающей запятой для HDR и отложенного затенения.
- <li> Вызовы отрисовки BaseVertex для улучшения пакетной обработки и потоковой передачи данных.
- <li> Эффективный контроль обращений к буферу для сокращения служебных операций WebGL.
-</ul>
-
-<p>API-интерфейс платформы для OpenGL ES 3.2 в Android N предоставляется классом
-<code>GLES32</code>. При использовании OpenGL ES 3.2 обязательно следует объявить требование
-в файле манифеста с помощью тега <code><uses-feature></code> и атрибута
-<code>android:glEsVersion</code>. </p>
-
-<p>Для получения дополнительных сведений об использовании OpenGL ES, включая
-определение версии, поддерживаемой устройством, см. <a href="{@docRoot}guide/topics/graphics/opengl.html">Руководство по API OpenGL ES</a>.</p>
-
-
-<h2 id="android_tv_recording">Запись Android TV</h2>
-
-<p>В Android N добавлена возможность записи и воспроизведения контента из служб Android TV
-через новые API-интерфейсы записи. Службы телевидения на основе существующих API
-с временным сдвигом могут контролировать выбор данных телеканала для записи, сохранение
-сеансов записи и управлять взаимодействием пользователя с записанным контентом. </p>
-
-<p>Дополнительная информация содержится в документе <a href="{@docRoot}preview/features/tv-recording-api.html">API-интерфейсы записи Android TV</a>.</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>В Android for Work добавлены много новых возможностей и API-интерфейсов для устройств под управлением Android N.
-Некоторые из них приведены ниже. Полный список обновлений Android for Work, касающихся
-Android N, содержится в списке изменений Android for Work.</p>
-
-<h3 id="work_profile_security_challenge">Пароль безопасности для рабочего профиля </h3>
-
-<p>
- Владельцы профиля могут установить отдельный пароль безопасности для приложений, запускаемых в рабочем профиле.
-Когда пользователь пытается открыть любые рабочие
-приложения, выводится запрос пароля. Успешный ввод пароля снимает блокировку рабочего профиля
-и, при необходимости, дешифрует его. Владельцы профиля
-могут отправить пользователю запрос <code>ACTION_SET_NEW_PASSWORD</code>, предлагающий установить рабочий пароль,
- или запрос <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code>, предлагающий установить пароль блокировки устройства.
-
-</p>
-
-<p>
- Владельцы профиля могут устанавливать различные политики паролей для рабочей проверки безопасности
-(например, длину PIN-кода, возможность использования отпечатка пальца
-для разблокировки профиля) с помощью <code>setPasswordQuality()</code>,
-<code>setPasswordMinimumLength()</code> и других связанных методов. Владелец
-профиля может также установить блокировку устройства с помощью экземпляра <code>DevicePolicyManager</code>,
-возвращаемого новым методом <code>getParentProfileInstance()</code>.
-Кроме того, владельцы профиля могут настроить экран учетных данных для рабочей проверки безопасности
-с помощью новых методов <code>setOrganizationColor()</code> и
-<code>setOrganizationName()</code>.
-</p>
-<h3 id="turn_off_work">Выключение рабочего режима </h3>
-
-<p>Пользователи устройства с рабочим профилем могут переключать рабочий режим. Когда рабочий режим
-выключен, управляемый им пользователь временно выходит из системы, что отключает приложения рабочего профиля,
-фоновую синхронизацию и уведомления. Также отключается приложение владельца профиля.
-При выключенном рабочем режиме система отображает постоянный значок состояния,
-напоминая пользователю о том, что он не может запустить рабочие приложения. Средство запуска при этом указывает,
-что рабочие приложения и виджеты недоступны. </p>
-
-<h3 id="always_on_vpn">Постоянное подключение к VPN </h3>
-
-<p>Владельцы устройства и профиля могут обеспечить постоянное подключение рабочих приложений через указанную сеть
-VPN. Система автоматически подключается к этой VPN после загрузки устройства.
-</p>
-
-<p>
- Для этого в интерфейсе <code>DevicePolicyManager</code> используются новые методы
-<code>setAlwaysOnVpnPackage()</code> и
-<code>getAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>Поскольку привязка служб VPN может быть выполнена непосредственно системой без взаимодействия с приложениями,
-клиентам VPN требуется обрабатывать новые точки доступа для постоянного подключения к VPN. Как и раньше,
-службы для системы указываются фильтром намерений, соответствующим действию
-<code>android.net.VpnService</code>. </p>
-
-<p>
- Пользователи могут вручную установить клиентов постоянного подключения к VPN, реализующих методы
-<code>VPNService</code>, на экране настроек основного пользователя
-<strong>Settings>More>Vpn</strong>.
-</p>
-
-<h2 id="accessibility_enhancements">Расширение специальных возможностей</h2>
-
-<p>Android N теперь предлагает настройки Vision Settings непосредственно на экране приветствия при начальной установке нового устройства.
-Это значительно упрощает пользователям обнаружение и настройку на своих устройствах
-специальных возможностей, включая жесты увеличения, размер шрифта, размер экрана и
-функцию TalkBack. </p>
-
-<p>Благодаря более приметному расположению этих настроек пользователи
-чаще будут пробовать ваше приложение с включенными специальными возможностями. Обязательно протестируйте ваше приложение с этими настройками,
-включив их на экране Settings >
-Accessibility.</p>
-
-<p>Также в Android N предусмотрены службы специальных возможностей которые помогут пользователям с нарушениями двигательных функций
-касаться экрана. Новый API позволяет встроить в службы такие
-возможности, как отслеживание лица, отслеживание взгляда, сканирование точек и другой функционал, соответствующий потребностям
-этих пользователей.</p>
-
-<p>Дополнительную информацию можно найти в описании <code>android.accessibilityservice.GestureDescription</code>
- в загружаемом <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочнике по API</a>.</p>
-
-
-<h2 id="direct_boot">Режим Direct Boot</h2>
-
-<p>Режим Direct Boot ускоряет загрузку устройства и позволяет зарегистрированным приложениям
-сохранить ограниченную функциональность даже после непредвиденной перезагрузки.
-Например, если зашифрованное устройство перезагрузится, когда пользователь спит,
-уведомления о зарегистрированных предупреждениях, сообщениях и входящих вызовах будут поступать пользователю, как в обычном режиме.
-Это также означает, что специальные возможности могут быть доступны сразу после перезагрузки.
-</p>
-
-<p>Режим Direct Boot использует преимущество шифрования на уровне файлов в Android N
-для применения детализированных политик шифрования к данным системы и приложений.
-Система использует хранилище, зашифрованное на уровне устройства, для выбранных системных данных и данных из явным образом зарегистрированных приложений.
-По умолчанию для всех остальных системных данных, пользовательских данных, приложений и
-данных приложений используется хранилище, зашифрованное на уровне учетной записи. </p>
-
-<p>При загрузке система запускается в ограниченном режиме с доступом к данным, зашифрованным
-на уровне устройства, и без общего доступа к приложениям и данным.
-Если у вас есть компоненты, которые должны быть запущены в этом режиме, их можно зарегистрировать,
-установив соответствующий флаг в манифесте. После перезагрузки система активирует зарегистрированные
-компоненты с помощью рассылки намерения <code>LOCKED_BOOT_COMPLETED</code>.
- Система обеспечивает доступность зарегистрированных данных приложений, зашифрованных на уровне устройства,
-до разблокировки экрана. Все остальные данные остаются недоступными, пока пользователь не подтвердит свои учетную информацию на экране блокировки,
-после чего данные будут расшифрованы. </p>
-
-Дополнительная информация приведена в документе <a href="{@docRoot}preview/features/direct-boot.html">Direct Boot</a>.</p>
-</p>
-
-
-<h2 id="key_attestation">Аттестация ключей</h2>
-
-<p>Аппаратные хранилища ключей обеспечивают безопасный метод создания, хранения,
-и использования криптографических ключей на устройствах Android. Они защищают ключи от
-ядра Linux, потенциальных уязвимостей Android и извлечения из устройств
-с корневым доступом.</p>
-
-<p>Чтобы упростить и повысить безопасность использования аппаратных хранилищ ключей
-в Android N введена возможность аттестации ключей. Приложения и внешние хранилища ключей могут использовать аттестацию,
-чтобы определить, является ли пара ключей RSA или EC
-аппаратной, какие свойства имеет эта пара ключей и какие ограничения применяются
-к ее использованию и сроку действия. </p>
-
-<p>Приложения и службы внешних хранилищ могут запросить информацию о паре ключей
-через сертификат аттестации X.509, который должен быть подписан действительным ключом
-аттестации. Ключ аттестации представляет собой ключ подписи ECDSA, который
-встраивается в аппаратное хранилище ключей устройства при его изготовлении на заводе.
-Поэтому сертификат аттестации, подписанный действительным ключом аттестации,
-подтверждает существование аппаратного хранилища ключей вместе со сведениями о парах ключей в таком хранилище.
-</p>
-
-<p>Чтобы убедиться в том, что устройство использует безопасный официальный заводской образ Android,
-для аттестации ключей требуется предоставление <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">загрузчиком</a> устройства
-следующей информации о <a class="external-link" href="https://source.android.com/security/trusty/index.html">доверенной
-среде выполнения (TEE)</a>:</p>
-
-<ul>
-<li>версия ОС и исправлений, установленных на устройстве;</li>
-<li>открытый ключ <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">подтвержденной загрузки</a> и состояние блокировки.</li>
- </ul>
-
-<p>Дополнительная информация об аппаратном хранилище ключей содержится
-в соответствующем <a href="https://source.android.com/security/keystore/" class="external-link">руководстве</a>.</p>
-
-<p>В дополнение к аттестации ключей в Android N также добавлены ключи,
-привязанные к отпечаткам пальцев, которые не отменяются при регистрации новых отпечатков.</p>
-
-<h2 id="network_security_config">Конфигурация сетевой безопасности</h2>
-
-<p>В Android N приложения могут безопасно настраивать поведение своих защищенных (HTTPS, TLS)
-подключений, без каких-либо изменений кода, используя декларативную
-<em>конфигурацию сетевой безопасности</em> вместо обычных ненадежных
-программных API-интерфейсов (например, X509TrustManager).</p>
-
- <p>Поддерживаемые возможности:</p>
-<ul>
-<li><b>Пользовательские якоря доверия.</b> Позволяют приложению определить доверенные
-центры сертификации (ЦС) для его защищенных соединений. Например,
-приложение может доверять определенным самозаверенным сертификатам или ограниченному набору общих ЦС.
-</li>
-<li><b>Замена при отладке.</b> Позволяет разработчику безопасно отладить
-защищенные соединения своего приложения без дополнительного риска для установленной базы.
-
-</li>
-<li><b>Отказ от передачи данных открытым текстом.</b> Позволяет приложению защитить себя от
-случайной передачи данных открытым текстом.</li>
-<li><b>Прикрепление сертификатов.</b> Дополнительная возможность, позволяющая приложению
-ограничить доверенные ключи сервера для защищенных соединений.</li>
-</ul>
-
-<p>Дополнительная информация содержится в документе <a href="{@docRoot}preview/features/security-config.html">Конфигурация сетевой безопасности</a>.
-</p>
-
-<h2 id="default_trusted_ca">Доверенный центр сертификации по умолчанию</h2>
-
-<p>По умолчанию приложения для Android N могут доверять только системным сертификатам
-и не доверяют ЦС, добавленным пользователем. Если приложению для Android N
-требуется доверять пользовательским ЦС, ему следует указать в
-<a href="{@docRoot}preview/features/security-config.html">конфигурации сетевой безопасности</a> эти доверенные пользовательские ЦС.
-</p>
-
-<h2 id="apk_signature_v2">Схема получения подписи APK, версия 2</h2>
-
-<p>Класс PackageManager теперь поддерживает подтверждение приложений с использованием схемы подписи APK
-версии 2. Вторая версия схемы подписи APK применяется ко всему файлу,
-что существенно ускоряет подтверждение и повышает надежность, позволяя обнаруживать любые несанкционированные изменения файлов APK.
-</p>
-
-<p>Для поддержки обратной совместимости пакет APK должен быть подписан с помощью первой версии схемы
-(схема подписи JAR) до того, как он будет подписан по схеме версии 2.
-Подпись по схеме версии 2 не пройдет подтверждение, если APK будет подписан дополнительным сертификатом
-после добавления подписи по схеме версии 2. </p>
-
-<p>Поддержка подписи APK по схеме версии 2 будет доступна в последующих выпусках N Developer
-Preview.</p>
-
-<h2 id="scoped_directory_access">Доступ к выделенным каталогам</h2>
-
-<p>В Android N приложения могут использовать новые API-интерфейсы для запроса доступа к конкретным каталогам <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">внешнего хранилища</a>,
-включая каталоги на съемных носителях, таких как SD-карты.
-Новые API-интерфейсы значительно упрощают доступ к стандартным каталогам
-внешнего хранилища, таким как <code>Pictures</code>. Например, приложения, работающие с фотографиями,
-могут использовать эти API-интерфейсы вместо
-<code>READ_EXTERNAL_STORAGE</code>, который разрешает доступ ко всем каталогам
-хранилища или платформы Storage Access Framework, благодаря чему выполняется переход к указанному каталогу.
-</p>
-
-<p>Кроме того, новые API-интерфейсы упрощают процедуру предоставления доступа к внешнему хранилищу для приложения.
-Если вы применяете новые API, система использует простой интерфейс разрешений,
-в котором четко указаны каталоги, к которым приложение запрашивает доступ.
-</p>
-
-<p>Дополнительная информация содержится в документации для разработчиков
-<a href="{@docRoot}preview/features/scoped-folder-access.html">Доступ к выделенным каталогам</a>.
-</p>
-
-
-
-
-
-
diff --git a/docs/html-intl/intl/ru/preview/behavior-changes.jd b/docs/html-intl/intl/ru/preview/behavior-changes.jd
deleted file mode 100644
index a048660..0000000
--- a/docs/html-intl/intl/ru/preview/behavior-changes.jd
+++ /dev/null
@@ -1,480 +0,0 @@
-page.title=Изменения в работе
-page.keywords=preview,sdk,compatibility
-meta.tags="предварительная версия", "совместимость"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Содержание документа</h2>
-
-<ol>
- <li><a href="#perf">Повышение производительности</a>
- <ol>
- <li><a href="#doze">Режим Doze</a></li>
- <li><a href="#bg-opt">Оптимизация фоновых процессов</a></li>
- </ol>
- </li>
- <li><a href="#perm">Изменения разрешений</a></li>
- <li><a href="#accessibility">Улучшенные специальные возможности</a>
- <ol>
- <li><a href="#screen-zoom">Масштабирование экрана</a></li>
- <li><a href="#vision-settings">Vision Settings в мастере настройки</a></li>
- </ol>
- </li>
- <li><a href="#ndk">Связь приложений NDK с библиотеками платформы</a></li>
- <li><a href="#afw">Android for Work</a></li>
-</ol>
-
-<h2>Дополнительно</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">Обзор API-интерфейсов Android N</a>
-</li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Наряду с новыми функциями и возможностями в Android N появились различные изменения
-работы системы и API. В этом документе рассматриваются некоторые наиболее важные
-изменения, которые следует понимать и учитывать при разработке приложений.
-
-</p>
-
-<p>
- Если вы ранее публиковали приложения для Android, то примите во внимание,
-что эти изменения в платформе могут повлиять на работу ваших уже опубликованных приложений.
-</p>
-
-
-<h2 id="perf">Повышение производительности</h2>
-
-<p>
- Изменения в работе системы Android N нацелены на более экономное использование заряда аккумулятора
-и оперативной памяти, а также на повышение производительности приложений. Эти изменения могут повлиять
-на системные уведомления и доступность системных ресурсов для вашего приложения. Вам следует
-ознакомиться с этими изменениями и оценить, какие исправления могут понадобиться вашему приложению для соответствия этим изменениям.
-
-</p>
-
-<h3 id="doze">Режим Doze</h3>
-
-<p>
- Появившийся в Android 6.0 (уровень API 23), режим Doze экономит заряд аккумулятора,
-откладывая процессорные и сетевые операции, когда устройство находится не на зарядке,
-оно неподвижно, и его экран погашен. Android N расширяет возможности
-режима Doze, применяя частичный набор процессорных и сетевых ограничений
-в тех случаях, когда устройство находится не на зарядке, с погашенным экраном, но не обязательно неподвижно,
-например, когда оно находится в кармане пользователя.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>Рис. 1.</strong> Иллюстрация применения первого уровня ограничений активности системы в режиме Doze
-для экономии заряда аккумулятора.
-</p>
-
-<p>
- Когда устройство питается от аккумулятора и его экран отключен в течение некоторого промежутка времени,
-устройство переходит в режим Doze и применяет первый частичный набор ограничений: закрывается доступ приложений
-к сети, откладывается выполнение заданий и синхронизации. Если устройство
-остается неподвижным в течение определенного времени после перехода в режим Doze, система применяет
-остальные ограничения Doze для {@link android.os.PowerManager.WakeLock},
-оповещений {@link android.app.AlarmManager}, сканирования GPS и Wi-Fi. Независимо от того, были применены
-все или только некоторые ограничения режима Doze, устройство периодически пробуждается на короткий промежуток времени,
-в течение которого приложениям разрешается сетевой доступ
-и выполнение отложенных заданий или синхронизации.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>Рис. 2.</strong> Иллюстрация применения второго уровня ограничений активности системы в режиме Doze
-после того, как устройство неподвижно в течение определенного времени.
-</p>
-
-<p>
- Следует отметить, что включение экрана или подключение к источнику питания приводит
-к выходу устройства из режима Doze и
-снимает эти ограничения обработки. Эти дополнительные особенности поведения
-не влияют на советы и рекомендации по адаптации приложений к предыдущей
-версии режима Doze из Android 6.0 (уровень API 23), которые были рассмотрены в документе
-<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">Оптимизация для режима Doze и режима ожидания для приложений</a>.
-Вы должны следовать этим рекомендациям (например, использовать Google Cloud Messaging (GCM)
-для отправки и получения сообщений) и приступить к планированию обновлений для соответствия дополнительному поведению режима
-Doze.
-</p>
-
-
-<h3 id="bg-opt">Проект Svelte: оптимизация фоновых процессов</h3>
-
-<p>
- В Android N удалены три неявных широковещательной рассылки с целью оптимизации
-потребления памяти и энергии. Причиной этого изменения стало то, что неявные
-широковещательные рассылки часто запускали приложения, которые прослушивали их в
-фоновом режиме. Удаление этих рассылок может существенно улучшить производительность устройства
-и работу интерфейса пользователя.
-</p>
-
-<p>
- На мобильных устройствах часто могут происходить изменения подключения, например, при переключении
-между Wi-Fi и мобильным трафиком. Сейчас приложения могут следить за изменениями
-подключения, зарегистрировавшись в качестве получателя для неявных широковещательных рассылок {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} в своем манифесте.
-Поскольку для получения этих рассылок регистрируются многие приложения, каждое
-переключение сети может вызвать их активацию и одновременную обработку рассылки.
-
-</p>
-
-<p>
- Подобным образом приложения могут регистрироваться для получения неявных широковещательных рассылок {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} и {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} от других приложений, например от камеры.
-Когда пользователь делает снимок с помощью приложения камеры, эти приложения активируются
-для обработки широковещательной рассылки.
-</p>
-
-<p>
- Для устранения этих проблем Android N применяет следующие
-способы оптимизации.
-</p>
-
-<ul>
- <li>Приложения для Android N не получают широковещательные рассылки {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION}, даже если в их манифесте
-указаны требования получения уведомлений об этих событиях. Приложения в активном режиме
-могут следить за событиями {@code CONNECTIVITY_CHANGE} в своем
-основном потоке, если они запрашивают уведомление через {@link
- android.content.BroadcastReceiver}.
- </li>
-
- <li>Приложения не могут отправлять или получать широковещательные рассылки {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} и {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}. Эта оптимизация влияет на все приложения, включая те, которые не предназначены для Android N.
-
- </li>
-</ul>
-
-<p>
- В будущих выпусках Android могут быть отменены другие неявные широковещательные рассылки,
-а также отменена привязка некоторых фоновых служб. Поэтому следует избегать зависимостей
-(или удалить их) в виде объявленных в манифесте получателей неявных широковещательных рассылок
-или фоновых служб.
-</p>
-
-<p>
- Платформа Android предоставляет несколько решений, позволяющих отказаться от таких
-неявных широковещательных рассылок или фоновых служб. Например, в API {@link
- android.app.job.JobScheduler} реализован надежный механизм планирования сетевых операций,
-который запускается при выполнении определенных условий, например при подключении к безлимитной сети. Вы можете даже использовать {@link
- android.app.job.JobScheduler}, чтобы реагировать на изменения поставщиков контента.
-
-</p>
-
-<p>
- Дополнительная информация об этом изменении в работе системы и соответствующей
-адаптации приложений содержится в документе <a href="{@docRoot}preview/features/background-optimization.html">Оптимизация фоновых процессов</a>.
-
-</p>
-
-
-<h2 id="perm">Изменения разрешений</h2>
-
-<p>
- В Android N внесены изменения разрешений, которые могут повлиять на ваше приложение,
-включая разрешения учетных записей пользователей и новое разрешение на запись
-во внешнем хранилище. Ниже приводится краткое описание разрешений, измененных в
-предварительной версии.
-</p>
-
-<ul>
- <li>{@code GET_ACCOUNTS} (устарело)
- <p>
- Разрешение GET_ACCOUNTS теперь считается устаревшим. Система игнорирует это разрешение
-для приложений, разработанных для Android N.
- </p>
- </li>
-
-</ul>
-
-
-
-<h2 id="accessibility">Улучшенные специальные возможности</h2>
-
-<p>
- В Android N внесены изменения, которые должны сделать платформу более удобной для пользователей
-со слабым или нарушенным зрением. Эти изменения в целом
-не требуют исправления кода вашего приложения, однако вам следует проверить их
-и протестировать на своем приложении, чтобы оценить их возможное влияние на интерфейс
-пользователя.
-</p>
-
-
-<h3 id="screen-zoom">Масштабирование экрана</h3>
-
-<p>
- Android N позволяет пользователям установить параметр <strong>Display size</strong>, который увеличивает или уменьшает
-все элементы на экране, делая таким образом устройство более удобным
-для пользователей со слабым зрением. Пользователи не могут масштабировать экран до ширины менее
-<a href="http://developer.android.com/guide/topics/resources/providing-resources.html"> sw320dp</a> (ширина экрана Nexus 4, обычного телефона среднего размера).
-
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>Рис. 3.</strong> На экране справа показан эффект
-увеличения параметра Display size на устройстве под управлением Android N.
-</p>
-
-
-<p>
- При изменении плотности экрана устройства система уведомляет запущенные приложения следующим способами.
-
-</p>
-
-<ul>
- <li>Если приложение предназначено для API уровня 23 или ниже, система автоматически завершает
-все его фоновые процессы. Это означает, что если пользователь переходит из такого приложения
-на экран <em>Settings</em> и изменяет параметр
-<strong>Display size</strong>, то система завершает работу приложения таким же образом,
-как в случае нехватки памяти. Если у приложения имеются процессы, работающие в активном режиме,
-система уведомляет эти процессы об изменении конфигурации согласно описанию в документе
-<a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений
-в режиме выполнения</a>, как в случае изменения ориентации устройства.
- </li>
-
- <li>Если приложение разработано для Android N, все его процессы
-(активные и фоновые) уведомляются об изменении конфигурации, как это описано в документе
-<a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений в режиме выполнения</a>.
-
- </li>
-</ul>
-
-<p>
- Большинству приложений не требуются какие-либо изменения для поддержки этой возможности при условии,
-что эти приложения соответствуют рекомендациям по разработке для Android. Необходимо проверить следующие моменты.
-</p>
-
-<ul>
- <li>Протестируйте свое приложение на устройстве с шириной экрана <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
-и убедитесь в его корректной работе.
- </li>
-
- <li>При изменении конфигурации устройства обновите в кэше все данные, зависящие от плотности экрана,
-такие как кэшированные растровые изображения или ресурсы, загруженные из сети.
-Проверьте изменения конфигурации, когда приложение возобновляет свою работу после паузы.
-
- <p class="note">
- <strong>Примечание.</strong> Если вы кэшируете данные, зависящие от конфигурации, рекомендуется
-добавить к ним релевантные метаданные, описывающие, например, подходящий размер экрана
-или плотность пикселей для этих данных. Эти метаданные помогут решить,
-нужно ли обновлять кэшированные данные после изменения конфигурации.
-
- </p>
- </li>
-
- <li>Избегайте указания абсолютных размеров в пикселях, поскольку они не масштабируются вместе с изменением плотности экрана.
-Вместо этого указывайте размеры в <a href="{@docRoot}guide/practices/screens_support.html">независимых от плотности пикселях</a> (<code>dp</code>).
-
- </li>
-</ul>
-
-<h3 id="vision-settings">Vision Settings в мастере настройки</h3>
-
-<p>
- В Android N появились настройки Vision Settings на экране приветствия, где пользователи могут установить
-следующие параметры специальных возможностей на новом устройстве:
-<strong>Magnification gesture</strong>, <strong>Font size</strong>,
-<strong>Display size</strong> и <strong>TalkBack</strong>. В результате этого изменения
-становятся более заметными ошибки, связанные с различными настройками экрана. Чтобы
-оценить влияние этой функции, следует протестировать свое приложение, включив эти настройки
-на экране <strong>Settings >
-Accessibility</strong>.
-</p>
-
-<h2 id="ndk">Связь приложений NDK с библиотеками платформы</h2>
-
-<p>
- В Android N внесены изменения пространства имен, предотвращающие загрузку закрытых API-интерфейсов.
-Если вы используете NDK, то вы должны использовать только открытые API-интерфейсы платформы Android.
-Использование закрытых API в следующем официальном выпуске Android
-может привести к ошибке и завершению работы приложения.
-</p>
-
-<p>
- Чтобы предупредить вас об использовании закрытых API, приложения, запущенные на устройстве с Android N,
-создают сообщение об ошибке в журнале устройства (logcat) при вызове закрытого API.
-Эта ошибка также отображается на экране устройства в виде сообщения, информирующего о ситуации.
-Вам следует проверить код приложения, отказаться от применения
-закрытых API и тщательно протестировать приложение на
-тестовом устройстве или эмуляторе.
-</p>
-
-<p>
- Если ваше приложение зависит от библиотек платформы, ознакомьтесь в документации NDK
-со стандартными способами замены общих закрытых API их открытыми эквивалентами.
-Вы можете ссылаться на библиотеки платформы, не замечая этого,
-особенно если ваше приложение использует библиотеку, которая является частью платформы (например,
-<code>libpng</code>), но не входит в состав NDK. В этом случае убедитесь, что ваш
-пакет APK содержит все файлы .so, на которые вы намеревались ссылаться.
-</p>
-
-<p class="caution">
- <strong>Внимание!</strong> Некоторые сторонние библиотеки могут ссылаться на закрытые
-API. Приложение, использующее такие библиотеки, может завершиться с ошибкой при запуске в следующем
-официальном выпуске Android.
-</p>
-
-<p>
- Приложения не должны зависеть от библиотек платформы (или использовать их), которые не входят в состав
-NDK, поскольку эти библиотеки могут изменяться или отсутствовать в разных выпусках Android.
-Примером такого изменения может служить переход от OpenSSL к BoringSSL.
-Разные устройства также могут обладать разными уровнями совместимости, поскольку
-для библиотек платформы, не включенных в
-NDK, отсутствуют требования к совместимости. Если вам необходимо обратиться к библиотекам не из состава NDK на более старых устройствах, эту загрузку следует
-сделать зависимой от уровня Android API.
-</p>
-
-<p>
- Для помощи в диагностике проблем подобного рода ниже приведены несколько примеров ошибок Java и NDK,
-с которым вы можете столкнуться при создании приложения для Android N.
-</p>
-
-<p>Пример ошибки Java:</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>Пример ошибки NDK:</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- Ниже приведены некоторые стандартные способы устранения подобных ошибок в приложениях.
-</p>
-
-<ul>
- <li>Использование getJavaVM и getJNIEnv из libandroid_runtime.so может быть заменено
-стандартными функциями JNI:
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>Использование символа {@code property_get} из {@code libcutils.so} может быть
-заменено открытой альтернативой {@code __system_property_get}.
-Для этого используйте {@code __system_property_get} со следующим включением include:
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>Использование символа {@code SSL_ctrl} из {@code libcrypto.so} должно быть заменено локальной версией.
-Например, вы должны статически связать
-{@code libcyrpto.a} в своем файле {@code .so} или динамически включить в свое приложение собственную библиотеку
-{@code libcrypto.so} из BoringSSL или OpenSSL.
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N содержит изменения для приложений, предназначенных для Android for Work, включая изменения установки сертификата,
-сброса пароля, управления вторичным пользователем,
-и доступа к идентификаторам устройства. Если вы создаете приложение для среды
-Android for Work, вам следует ознакомиться с этими изменениями и откорректировать
-приложение соответствующим образом.
-</p>
-
-<ul>
- <li>Вы должны установить делегированный установщик сертификатов, прежде чем DPC сможет его настроить.
- Для приложений владельца профиля и устройства, разработанных под N SDK, необходимо установить
- делегированный установщик сертификатов, прежде чем контроллер политик устройства
-(DPC) вызовет метод
-<code>DevicePolicyManager.setCertInstallerPackage()</code>. В случае отсутствия установщика
-система выдаст ошибку
-<code>IllegalArgumentException</code>.
- </li>
-
- <li>Ограничения сброса пароля для администраторов устройства теперь применяются для владельцев
-профиля. Администраторы устройства более не могут использовать
-<code>DevicePolicyManager.resetPassword()</code> для сброса или изменения
-установленных паролей. Администраторы по-прежнему могут установить пароль, но только тогда, когда для устройства не установлен
-пароль, PIN-код или графический шаблон.
- </li>
-
- <li>Владельцы устройства и профиля могут управлять учетными записями даже при наличии ограничений.
-Они могут вызывать API-интерфейсы управления учетными записями
-даже при установленных ограничениях пользователя <code>DISALLOW_MODIFY_ACCOUNTS</code>.
- </li>
-
- <li>Владельцам устройства стало проще управлять дополнительными пользователями. Когда устройство
-находится в режиме владельца устройства, автоматически включается ограничение <code>DISALLOW_ADD_USER</code>.
-Это предотвращает создание неуправляемых дополнительных пользователей.
-Кроме того, прекращено использование методов <code>CreateUser()</code> и
-<code>createAndInitial()</code>, которые заменены новым методом
-<code>DevicePolicyManager.createAndManageUser()</code>.
- </li>
-
- <li>Владельцы устройства получили доступ к идентификаторам устройства. Владелец устройства может получить MAC-адрес
-Wi-Fi для устройства, используя метод
-<code>DevicePolicyManagewr.getWifiMacAddress()</code>. Если интерфейс Wi-Fi никогда не включался
-на устройстве, этот метод возвращает значение {@code null}.
- </li>
-</ul>
-
-<p>
- Дополнительная информация об изменениях Android for Work в Android N содержится в документе
-<a href="{@docRoot}preview/features/afw.html">Обновления Android for Work</a>.
-</p>
-
-<h2 id="other">Другие важные моменты</h2>
-
-<ul>
-<li>Процесс приложения, запущенного под Android N, но разработанного для API более низкого уровня,
-завершается, если пользователь изменяет размер экрана. Приложение
-должно корректно обработать такой сценарий. В противном случае оно завершится с ошибкой, если пользователь
-запустит его с экрана последних задач.
-
-<p>
-Вы должны протестировать свое приложение и убедиться,
-что оно не будет работать подобным образом.
-Для этого можно вызвать аналогичную ошибку,
-принудительно завершив процесс приложения через DDMS.
-</p>
-
-<p>
-Приложения для N и последующих версий Android не завершаются автоматически при изменении плотности экрана,
-однако они могут плохо реагировать на изменения конфигурации.
-</p>
-</li>
-
-<li>
-Приложения для Android N должны уметь корректно обрабатывать изменения конфигурации
-и не должны завершаться с ошибкой при последующих запусках. Вы можете проверить поведение приложения,
-изменив размер шрифта (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>) и перезапустив затем приложение
-с экрана последних задач.
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/ru/preview/download.jd b/docs/html-intl/intl/ru/preview/download.jd
deleted file mode 100644
index b286cad..0000000
--- a/docs/html-intl/intl/ru/preview/download.jd
+++ /dev/null
@@ -1,541 +0,0 @@
-page.title=Тестирование на устройстве
-meta.tags="предварительная версия", "nexus","образ системы"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Прежде чем приступить к загрузке и установке компонентов
-пакета SDK для Android Preview, примите следующие положения и
-условия.</p>
-
- <h2 class="norule">Положения и условия</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Это лицензионное соглашение для пакета Android SDK Preview (далее "Лицензионное соглашение").
-
-1. Введение
-
-1.1. Лицензия на пакет Android SDK Preview (далее по тексту настоящего Лицензионного соглашения – "Preview", который включает системные файлы Android, пакеты API-интерфейсов и файлы библиотеки Preview, если такие доступны) передается в соответствии с положениями настоящего Лицензионного соглашения. Настоящее Лицензионное соглашение является юридически обязывающим договором между компанией Google и любым лицом, использующим Preview.
-
-1.2. В настоящем Лицензионном соглашении термин "Android" означает набор программного обеспечения Android для устройств, предлагаемый к использованию в рамках проекта Android Open Source Project, который доступен на веб-сайте http://source.android.com/ (сведения, размещенные на этом сайте, могут периодически обновляться).
-
-1.3 "Совместимость с Android" означает любую реализацию Android, которая (i) соответствует документу "Определение совместимости с Android", доступному на веб-сайте о совместимости Android (http://source.android.com/compatibility), где оно периодически обновляется; а также (ii) успешно прошедшему проверку с помощью пакета Android Compatibility Test Suite (CTS).
-
-1.4. Под термином "Google" понимается корпорация Google Inc., главный офис которой находится по адресу 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States (США).
-
-2. Принятие лицензионного соглашения
-
-2.1. Использование Preview возможно только после принятия условий настоящего Лицензионного соглашения. Запрещается использовать Preview, если вы не согласны с указанными в настоящем документе условиями и положениями.
-
-2.2. Нажатие кнопки принятия условий и/или использование Preview означает, что вы согласны с положениями настоящего Лицензионного соглашения.
-
-2.3. Вы не вправе использовать Preview и принимать условия данного Лицензионного соглашения, если по законам США или иных стран, включая страну вашего проживания или использования Preview, запрещается передавать Preview в ваш адрес.
-
-2.4. Если вы используете Preview в рамках своей компании или организации, вы соглашаетесь взять на себя обязательства по соблюдению настоящего Лицензионного соглашения от имени своего работодателя или другого юридического лица, и вы тем самым подтверждаете и гарантируете, что обладаете полными юридическими полномочиями связать вашего работодателя или иное подобное юридическое лицо обязательствами по настоящему Лицензионному соглашению. Если вы не обладаете требуемыми полномочиями, вы не вправе принимать указанные в настоящем документе условия и положения или использовать Preview от имени вашего работодателя или другого юридического лица.
-
-3. Лицензия на Preview от Google
-
-3.1. В соответствии с условиями настоящего Лицензионного соглашения Google предоставляет вам ограниченную, бесплатную, неэксклюзивную лицензию, действующую во всем мире и не подлежащую сублицензированию, которая разрешает использовать Preview исключительно в целях разработки приложений для совместимых реализаций платформы Android.
-
-3.2 Вы не должны использовать Preview для разработки приложений для других платформ (включая несовместимые реализации Android) или для разработки других SDK. У вас есть право разрабатывать приложения для других платформ (включая несовместимые реализации Android) при условии, что Preview не используется для этих целей.
-
-3.3. Вы соглашаетесь с тем, что Google или третьим сторонам принадлежат все юридические и имущественные права, а также правовой интерес в отношении Preview, в том числе любые права на объекты интеллектуальной собственности, которые имеются в Preview. Термин "Права на интеллектуальную собственность" означает все возможные права в рамках патентного права, авторского права, закона о коммерческой тайне, закона о товарных знаках, а также иные возможные имущественные права. Google оставляет за собой все права, не предоставленные вам в явном виде.
-
-3.4. Вам запрещается использовать Preview в любых целях, которые однозначно не определены в настоящем Лицензионном соглашении. За исключением случаев, предусмотренных применимыми сторонними лицензиями, вам запрещается: (a) копировать (за исключением резервного копирования), изменять, адаптировать, повторно распространять, декомпилировать, осуществлять инженерный анализ, деассемблировать или создавать производные элементы Preview или иной его части; а также (b) загружать любую часть Preview в мобильные телефоны или иные устройства, помимо персонального компьютера, объединять любые части Preview с другим программным обеспечением, распространять любое программное обеспечение или устройства, содержащие части Preview.
-
-3.5. Использование, воспроизведение и распространение компонентов Preview, на которые распространяется лицензия на программное обеспечение с открытым исходным кодом, регулируются исключительно положениями и условиями такой лицензии на программное обеспечение с открытым исходным кодом, а не настоящим Лицензионным соглашением. Вы соглашаетесь обеспечивать хорошую репутацию получателя лицензии в отношении таких лицензии на программное обеспечение с открытым исходным кодом в рамках всех предоставленных ему прав, а также не допускать каких-либо действий, которые могут привести к аннулированию, приостановлению или нарушению таких прав
-
-3.6. Вы соглашаетесь с тем, что форма и содержание Preview , предоставляемого Google, могут быть изменены без предварительного уведомления, а также с тем, что будущие версии Preview могут оказаться несовместимыми с приложениями, разработанными в предыдущих версиях Preview. Вы соглашаетесь с тем, что Google вправе на свое собственное усмотрение и без предварительного уведомления прекратить (временно или навсегда) предоставление Preview (или любых функций в составе Preview) вам или пользователям.
-
-3.7. Ни одна из частей настоящего Лицензионного соглашения не предусматривает предоставления вам права использовать любые торговые наименования, товарные знаки, знаки обслуживания, логотипы, имена доменов или иные отличительные фирменные знаки, принадлежащие Google.
-
-3.8. Вы соглашаетесь с тем, что обязуетесь не удалять, не скрывать или не изменять любые уведомления об имущественных правах (включая уведомления об авторских правах и товарных знаках), которые могут сопровождать Preview или содержаться в нем.
-
-4. Использование Preview
-
-4.1. Компания Google выражает согласие с тем, что ни по какому положению настоящего Лицензионного соглашения не получает от вас (или ваших лицензиаров) каких-либо юридических и имущественных прав, а также правового интереса в отношении любых программных приложений, разработанных вами с помощью Preview, включая любые права на объекты интеллектуальной собственности, которые имеются в таких приложениях.
-
-4.2. Вы соглашаетесь использовать Preview и создавать приложения исключительно в целях, предусмотренных (a) настоящим Лицензионным соглашением и (b) любым применимым законом, нормативным актом или общепринятыми правилами или рекомендациями в соответствующей юрисдикции (включая любые законы, касающиеся экспорта данных или программного обеспечения из США или иных соответствующих стран, а также импорта в них).
-
-4.3. Вы соглашаетесь с тем, что при использовании Preview для разработки приложений вы обязуетесь обеспечивать конфиденциальность и защищать юридические права пользователей. В случае если пользователи предоставляют вам свои имена, пароли или иные данные для входа либо свои персональные сведения, вы обязуетесь уведомить пользователей о том, что такая информация будет присутствовать в вашем приложении, и вы также обязуетесь предоставить таким пользователям юридически соответствующее уведомление о конфиденциальности и средства правовой защиты. Если в вашем приложении хранится персональная или конфиденциальная информация, предоставленная пользователями, вы обязуетесь обеспечить ее надлежащую защиту. Если пользователь предоставляет вам сведения о своей учетной записи Google, то ваше приложение может использовать такую информацию для доступа к учетной записи Google пользователя только тогда, когда пользователь предоставил вам разрешение на это, и только в тех целях, которые обозначил пользователь.
-
-4.4. Вы соглашаетесь с тем, что обязуетесь не использовать Preview для любого рода деятельности, в том числе для разработки или распространения приложений, в целях нарушения работы и повреждения серверов, сетей или иной собственности или служб Google или любой третьей стороны.
-
-4.5. Вы соглашаетесь с тем, что несете единоличную ответственность (и признаете, что компания Google не несет ответственности ни перед вами, ни перед любой третьей стороной) за любые данные, содержимое или ресурсы, которые вы создаете, передаете или демонстрируете посредством Android и/или приложений для Android, а также за любые последствия ваших действий, связанных с этим (в том числе за любые убытки и любой ущерб, которые могут быть причинены Google).
-
-4.6. Вы соглашаетесь с тем, что несете единоличную ответственность (и признаете, что компания Google не несет ответственности ни перед вами, ни перед любой третьей стороной) за любое несоблюдение обязательств по настоящему Лицензионному соглашению, обязательств по любому применимому договору с третьей стороной или предусмотренных Условиями и положениями, за нарушение любых применимых законов или нормативных актов, а также за любые последствия ваших действий, связанных с таким нарушением (в том числе за любые убытки и любой ущерб, которые могут быть причинены Google).
-
-4.7 Preview находится на стадии разработки, поэтому ваши отзывы и результаты тестирования являются важной частью процесса разработки. Используя Preview, вы признаете, что реализация некоторых функций по-прежнему находится на этапе разработки и вам не следует рассчитывать на полную функциональность стабильной версии. Вы соглашаетесь не распространять или предоставлять любые приложения, использующие Preview, поскольку поддержка Preview будет прекращена после выпуска официальной версии пакета Android SDK.
-
-Ваши учетные данные разработчика
-
-5.1. Вы соглашаетесь с тем, что несете ответственность за обеспечение конфиденциальности любых учетных данных разработчика, которые компания Google может вам предоставить или которые вы можете самостоятельно выбрать, а также с тем, что вы несете единоличную ответственность за все приложения, разработанные с использованием ваших учетных данных разработчика.
-
-6. Конфиденциальность и личная информация
-
-6.1. В целях постоянного совершенствования и улучшения Preview компания Google вправе собирать определенные статистические данные об использовании программного обеспечения, включая уникальный идентификатор, связанный IP-адрес, номер версии программного обеспечения, а также сведения об используемых в Preview инструментах и/или службах и способах их применения. Перед тем как любые из таких данных будут отправлены в Google, в Preview отобразится соответствующее уведомление с просьбой дать свое согласие. В случае вашего отказа предоставить такие сведения соответствующие данные собираться не будут.
-
-6.2. Собранные данные изучаются в обобщенном виде с целью улучшения Preview и хранятся в соответствии с Политикой конфиденциальности Google, которая опубликована на веб-сайте по адресу http://www.google.com/policies/privacy/.
-
-7. Сторонние приложения
-
-7.1. Если вы используете Preview для запуска приложений, разработанных третьими сторонами или получающих доступ к данным, содержимому или ресурсам, предоставляемым третьей стороной, вы соглашаетесь с тем, что Google не несет ответственности за такие приложения, данные, содержимое или ресурсы. Вы осознаете, что единоличную ответственность за все данные, содержимое или ресурсы, доступ к которым вы можете получить посредством таких приложений третьих сторон, несет лицо, предоставившее их, а также то, что Google не несет ответственности за любые убытки или любой ущерб, которые могут возникнуть в результате использования вами любых таких сторонних приложений, данных, содержимого или ресурсов и в результате обращения к ним.
-
-7.2. Вы должны быть осведомлены о том, что данные, содержимое и ресурсы, предоставляемые вам посредством таких сторонних приложений, могут быть защищены правами на объекты интеллектуальной собственности, принадлежащие предоставляющим их лицам (или иным лицам либо компаниям от их имени). Вам запрещается изменять, сдавать в аренду, передавать, продавать, распространять такие данные, содержимое или ресурсы (полностью или частично), а также создавать на их основе производные элементы, если у вас нет на это разрешения от соответствующих владельцев.
-
-7.3. Вы осознаете, что использование вами таких сторонних приложений, данных или ресурсов может регулироваться отдельными условиями, заключенными между вами и соответствующей третьей стороной.
-
-8. Использование API-интерфейсов Google
-
-8.1. API-интерфейсы для получения данных Google.
-
-8.1.1. В случае использования вами любых API для получения данных из Google вы осознаете, что такие данные могут быть защищены правами на объекты интеллектуальной собственности, принадлежащие Google или предоставляющим их сторонам (или иным лицам либо компаниям от их имени). Использование вами подобных API может регулироваться дополнительными Условиями использования. Вам запрещается изменять, сдавать в аренду, передавать, продавать, распространять такие данные (полностью или частично), а также создавать на их основе производные элементы, если это не разрешено соответствующими Условиями использования.
-
-8.1.2. Если вы используете какие-либо API-интерфейсы для получения данных пользователя из Google, вы осознаете и соглашаетесь с тем, что вы обязуетесь получать такие данные исключительно с прямого согласия пользователя и только в тех целях, которые обозначил пользователь.
-
-9. Прекращение действия Лицензионного соглашения
-
-9.1 Настоящее Лицензионное соглашение остается в силе до тех пор, пока его действие не будет прекращено вами или Google, как указано ниже.
-
-9.2. Если вы желаете прекратить действие настоящего Лицензионного соглашения, вы вправе сделать это, прекратив использование Preview и любых соответствующих учетных данных разработчика.
-
-9.3. Google вправе в любое время прекратить действие настоящего Лицензионного соглашения, отправив предварительное уведомление или без него.
-
-9.4 Действие настоящего Лицензионного соглашения автоматически прекращается без предварительного уведомления или выполнения иных действий сразу после следующего:
-(A) компания Google прекращает предоставление Preview или определенных частей Preview пользователям в той стране, в которой вы проживаете или используете услуги компании;
-(B) компания Google выпускает окончательную версию Android SDK.
-
-9.5 В случае прекращения действия настоящего Лицензионного соглашения прекращается действие лицензии, предоставленной в рамках Лицензионного соглашения, и вам следует незамедлительно прекратить любое использование Preview, тогда как положения, изложенные в разделах 10, 11, 12 и 14 продолжают действовать бессрочно.
-
-10. ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ
-
-10.1. ВЫ ЧЕТКО ОСОЗНАЕТЕ И БЕЗОГОВОРОЧНО СОГЛАШАЕТЕСЬ С ТЕМ, ЧТО ВЫ ИСПОЛЬЗУЕТЕ PREVIEW ИСКЛЮЧИТЕЛЬНО НА СВОЙ СТРАХ И РИСК И ЧТО PREVIEW ПРЕДОСТАВЛЯЕТСЯ ВАМ НА УСЛОВИЯХ "КАК ЕСТЬ" И "КАК ДОСТУПНО" БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ СО СТОРОНЫ КОМПАНИИ GOOGLE.
-
-10.2 ИСПОЛЬЗОВАНИЕ ВАМИ PREVIEW И ЗАГРУЗКА ЛЮБЫХ МАТЕРИАЛОВ И ИХ ПОЛУЧЕНИЕ ИНЫМ СПОСОБОМ С ПОМОЩЬЮ PREVIEW ВЫПОЛНЯЕТСЯ ПО ВАШЕМУ СОБСТВЕННОМУ УСМОТРЕНИЮ НА СВОЙ СТРАХ И РИСК. ВСЯ ОТВЕТСТВЕННОСТЬ ЗА ЛЮБОЙ УЩЕРБ, ПРИЧИНЕННЫЙ ВАШЕЙ ВЫЧИСЛИТЕЛЬНОЙ СИСТЕМЕ ИЛИ ДРУГОМУ ОБОРУДОВАНИЮ, А ТАКЖЕ ЗА ПОТЕРЮ ДАННЫХ, ВЫЗВАННУЮ ПОДОБНЫМ ИСПОЛЬЗОВАНИЕМ, ВОЗЛАГАЕТСЯ НА ВАС. НЕ ОГРАНИЧИВАЯ ВЫШЕСКАЗАННОЕ, ВЫ ПОНИМАЕТЕ, ЧТО PREVIEW НЕ ЯВЛЯЕТСЯ СТАБИЛЬНЫМ ВЫПУСКОМ И МОЖЕТ СОДЕРЖАТЬ ОШИБКИ, ДЕФЕКТЫ И УЯЗВИМОСТИ В СИСТЕМЕ БЕЗОПАСНОСТИ, КОТОРЫЕ МОГУТ ПРИВЕСТИ К СЕРЬЕЗНЫМ ПОВРЕЖДЕНИЯМ, ВКЛЮЧАЯ ПОЛНУЮ И БЕЗВОЗВРАТНУЮ ПОТЕРЮ РАБОТОСПОСОБНОСТИ ВАШЕГО КОМПЬЮТЕРА ИЛИ ИНОГО УСТРОЙСТВА.
-
-10.3. КОМПАНИЯ GOOGLE БЕЗОГОВОРОЧНО ОТКАЗЫВАЕТСЯ ОТ ЯВНЫХ И НЕЯВНЫХ ГАРАНТИЙ И УСЛОВИЙ ЛЮБОГО РОДА, ВКЛЮЧАЯ ПОМИМО ПРОЧЕГО НЕЯВНЫЕ ГАРАНТИИ И УСЛОВИЯ ТОВАРНОГО СОСТОЯНИЯ, ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ И ОТСУТСТВИЯ НАРУШЕНИЙ ПРАВ СОБСТВЕННОСТИ.
-
-11. ОГРАНИЧЕНИЕ ОТВЕТСТВЕННОСТИ
-
-11.1. ВЫ ЧЕТКО ОСОЗНАЕТЕ И БЕЗОГОВОРОЧНО СОГЛАШАЕТЕСЬ С ТЕМ, ЧТО КОМПАНИЯ GOOGLE, ЕЕ ДОЧЕРНИЕ И АФФИЛИРОВАННЫЕ КОМПАНИИ И ЛИЦЕНЗИАРЫ НЕ НЕСУТ ПЕРЕД ВАМИ ОТВЕТСТВЕННОСТИ, НЕЗАВИСИМО ОТ ЕЕ ПРИЧИНЫ И ВИДА, ЗА КАКИЕ-ЛИБО ПРЯМЫЕ, КОСВЕННЫЕ, СЛУЧАЙНЫЕ, СПЕЦИАЛЬНЫЕ, ОПОСРЕДОВАННЫЕ И ШТРАФНЫЕ УБЫТКИ, ПОНЕСЕННЫЕ ВАМИ, ВКЛЮЧАЯ ПОМИМО ПРОЧЕГО ПОТЕРЮ ДАННЫХ, ВНЕ ЗАВИСИМОСТИ ОТ ТОГО, БЫЛА ЛИ КОМПАНИЯ GOOGLE ИЛИ ЕЕ ПРЕДСТАВИТЕЛИ ИЗВЕЩЕНЫ О ВОЗМОЖНОСТИ ТАКОГО УЩЕРБА.
-
-12. Освобождение от ответственности
-
-12.1. В максимально допустимой законом степени вы соглашаетесь защищать, освобождать от ответственности и возможных претензий компанию Google, ее аффилированные компании и их соответствующих руководителей, служащих, сотрудников и агентов от всех возможных правовых требований, действий, судебных исков или разбирательств, а также от всех возможных убытков, обязательств, ущерба, издержек и расходов (включая обоснованные вознаграждения для адвокатов), возникающих (a) в связи с использованием вами Preview, (b) в связи с любыми приложениями, разрабатываемыми вами с помощью Preview и нарушающими любые права на объекты интеллектуальной собственности любого лица, а также порочащие любое лицо либо нарушающие права таких лиц на публичность и конфиденциальность, а также (c) в связи с любым несоблюдением вами положений настоящего Лицензионного соглашения.
-
-13. Изменения в Лицензионном соглашении
-
-13.1. Компания Google вправе вносить изменения в настоящее Лицензионное соглашение по мере выхода новых версий Preview. При внесении изменений Google создает новую версию Лицензионного соглашения и размещает ее на веб-сайте, на котором размещена Preview.
-
-14. Общие правовые условия
-
-14.1. Настоящее Лицензионное соглашение составляет полный текст юридического соглашения между вами и компанией Google, регулирует использование вами Preview (за исключением услуг, которые Google предоставляет на основании отдельного письменного соглашения) и полностью заменяет собой все предыдущие соглашения между вами и компанией Google в отношении Preview.
-
-14.2. Вы соглашаетесь с тем, что отсутствие каких-либо действий или судебных исков со стороны Google, направленных на соблюдение каких-либо правовых норм или исполнение средств правовой защиты, установленных настоящим Лицензионным соглашением (или которыми Google обладает в соответствии с каким-либо действующим законом), не означает отказ компании Google от своих прав и не препятствует компании Google использовать эти права или средства защиты.
-
-14.3. Если какой-либо судебный орган, уполномоченный рассматривать этот вопрос, признает недействительность какого-либо положения данного Лицензионного соглашения, то соответствующее положение будет исключено из Лицензионного соглашения с сохранением действия всех остальных его положений. Остальные положения Лицензионного соглашения по-прежнему будут действовать, и их соблюдение может обеспечиваться в судебном порядке.
-
-14.4. Вы признаете и соглашаетесь с тем, что все участники группы компаний, среди которых Google является материнской компанией, являются сторонними бенефициарами Лицензионного соглашения и что эти компании имеют право пользоваться привилегиями (или правами), предоставляемыми по настоящему Лицензионному соглашению, и напрямую требовать их соблюдения в судебном порядке. Все остальные физические и юридические лица не являются сторонними бенефициарами Лицензионного соглашения.
-
-14.5. ОГРАНИЧЕНИЯ НА ЭКСПОРТ. ИСПОЛЬЗОВАНИЕ PREVIEW РЕГУЛИРУЕТСЯ ЗАКОНАМИ И НОРМАТИВНЫМИ АКТАМИ США, КАСАЮЩИМИСЯ ЭКСПОРТА. ВЫ ОБЯЗУЕТЕСЬ СОБЛЮДАТЬ ВСЕ НАЦИОНАЛЬНЫЕ И МЕЖДУНАРОДНЫЕ ЗАКОНЫ ОБ ЭКСПОРТЕ, ПРИМЕНИМЫЕ К PREVIEW. ДАННЫЕ ЗАКОНЫ НАЛАГАЮТ ОГРАНИЧЕНИЯ НА РЕГИОНЫ, КРУГ ЛИЦ И СПОСОБ КОНЕЧНОГО ИСПОЛЬЗОВАНИЯ.
-
-14.6. Вы не вправе переуступать либо передавать права, предоставляемые по настоящему Лицензионному соглашению, без предварительного письменного согласия Google; любые попытки переуступки без такого согласия считаются недействительными. Вы обязуетесь не делегировать свои полномочия или обязательства по настоящему Лицензионному соглашению без предварительного письменного согласия Google.
-
-14.7. Лицензионное соглашение, а также взаимоотношения между вами и компанией Google в рамках настоящего Лицензионного соглашения регулируются законодательством штата Калифорния за исключением его норм коллизионного права. Вы и компания Google признаете, что урегулирование любых правовых вопросов, связанных с данным Лицензионным соглашением, относится исключительно к юрисдикции судов округа Санта-Клара, штат Калифорния. Несмотря на это, вы соглашаетесь с тем, что компания Google по-прежнему имеет право обращаться за наложением судебного запрета (или за получением аналогичного вида неотложной судебной защиты) в суды любой юрисдикции.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">Я ознакомился и принимаю указанные выше положения и условия.</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Содержание документа</h2>
- <ol>
- <li><a href="#device-preview">Настройка устройства</a>
- <ol>
- <li><a href="#ota">Получение обновлений по беспроводной связи</a></li>
- <li><a href="#flash">Запись во флэш-память устройства вручную</a></li>
- <li><a href="#revertDevice">Удаление</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">Настройка эмулятора</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Для запуска и тестирования приложения на новой платформе необходимо настроить среду выполнения Android N
-. Это можно выполнить одним из следующих способов:
-</p>
-
-<ul>
- <li>установить Android N на поддерживаемом устройстве;</li>
- <li>настроить эмулятор Android с операционной системой Android N.</li>
-</ul>
-
-<p>
- Если вы хотите выполнить просто тестирование совместимости приложения и
-новой платформы, вам нужен только текущий APK и устройство или
-эмулятор. Для простого тестирования не требуется обновлять всю среду
-разработки.
-</p>
-
-<p>
- Если вы хотите изменить приложение, сделав Android N целевой ОС, или использовать новые API-интерфейсы Android N,
-необходимо настроить среду разработки, которая поддерживает
-Android N. <a href="{@docRoot}preview/setup-sdk.html">Настройка в целях разработки для
-Android N</a> имеет ряд особенностей.
-</p>
-
-
-<h2 id="device-preview">Настройка устройства</h2>
-
-<p>
- Программа N Developer Preview предлагает системные обновления,
-которые можно использовать для тестирования приложений на различных устройствах: от телефонов до планшетов и телевизоров.
-</p>
-
-<p>
- Если у вас есть поддерживаемое устройство, вы сможете обновить его до ключевой сборки Developer
-Preview одним из следующих способов.
-</p>
-
-<ul>
- <li><strong>Зарегистрируйте устройство для получения автоматических обновлений системы по беспроводной связи</strong> в рамках
-<a href="https://g.co/androidbeta">программы бета-тестирования Android</a>. После регистрации ваше устройство будет регулярно получать
-по беспроводной связи обновления всех ключевых сборок в N Developer Preview. Такой
-способ рекомендуется потому, что он обеспечивает простой переход с текущей
-среды с помощью различных выпусков N Developer Preview.</li>
- <li><strong>Загрузите системный образ Developer Preview и запишите его во флэш-память устройства</strong>.
-Обновления по беспроводной связи не предоставляются для устройств, запись во флэш-память которых выполнялась вручную, но такие
-устройства можно зарегистрировать в программе бета-тестирования Android для получения обновлений по беспроводной связи. </li>
-</ul>
-
-<h3 id="ota">Регистрация устройства для получения автоматических обновлений по беспроводной связи</h3>
-
-<p>
- Если у вас есть поддерживаемое устройство (см. список в таблице "Загрузки"),
-вы можете получать обновления предварительных версий Android по беспроводной связи,
-зарегистрировав устройство в <a href="https://g.co/androidbeta">программе бета-тестирования Android</a>. Эти обновления автоматически
-загружаются и устанавливаются на устройство как официальные
-системные обновления.
-</p>
-
-<p>
- Отменить регистрацию устройства можно в любое время. Устройство будет по беспроводной связи получать последнюю
-версию Android, доступную для него
-(например, Android 6.0 Marshmallow). Для обновления потребуется полный сброс
-настроек устройства в целях удаления с устройства всех данных пользователя. Перед отменой регистрации устройства <strong>выполните резервное копирование
-наиболее важных данных</strong>.
-</p>
-
-<p>
- Для получения дополнительной информации по регистрации устройства см.
-веб-сайт <a href="https://g.co/androidbeta">программы бета-тестирование Android</a>.
-</p>
-
-<p class="note"><strong>Примечание.</strong>
-Для отмены регистрации требуется полный сброс настроек устройства. Выполните
-резервное копирование наиболее важных данных.
-</p>
-
-<h3 id="flash">Запись во флэш-память устройства вручную</h3>
-
-<p>
- В любое время вы можете загрузить последний системный образ Developer Preview и
-вручную записать его во флэш-память устройства. См. информацию в следующей таблице, чтобы загрузить системный образ
-для своего тестового устройства. Запись вручную во флэш-память устройства удобна, если требуется
-точное управление средой тестирования или частая переустановка,
-например при автоматическом тестировании.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- При установке системного образа <strong>с устройства будут удалены все
-данные</strong>, поэтому сначала необходимо выполнить резервное копирование данных.
-</p>
-
-<p>
- После резервного копирования данных устройства и загрузки системного образа,
- соответствующего этому устройству, выполните инструкции, которые приведены по адресу <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>,
-чтобы записать этот образ во флэш-память устройства.
-</p>
-
-<p>
- Записанные вручную системные образы <strong>не
-получают автоматические обновления</strong> ключевых сборок Developer Preview
-по беспроводной связи. Регулярно обновляйте свою среду и выполняйте запись
-нового системного образа во флэш-память устройства при каждом выпуске ключевой сборки Developer Preview.
-</p>
-
-<p>
- Если вы захотите получить обновления по беспроводной связи после записи на устройство вручную,
-вам нужно просто зарегистрировать устройство в <a href="https://g.co/androidbeta">программе
-бета-тестировании Android</a>. Вы можете зарегистрировать устройство в любое время для получения следующего обновления предварительной версии
-по беспроводной связи.
-</p>
-
-<table>
- <tr>
- <th scope="col">Устройство</th>
- <th scope="col">Файлы для загрузки и контрольные суммы</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npc56p-preview-6c877a3d.tgz</a><br>
- MD5: b5cf874021023b398f5b983b24913f5d<br>
- SHA-1: 6c877a3d9fae7ec8a1678448e325b77b7a7b143a
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npc56p-preview-54b13c67.tgz</a><br>
- MD5: af183638cf34e0eb944a1957d7696f60<br>
- SHA-1: 54b13c6703d369cc79a8fd8728fe4103c6343973
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npc56p-preview-85ffc1b1.tgz</a><br>
- MD5: bc4934ea7bd325753eee1606d3725a24<br>
- SHA-1: 85ffc1b1be402b1b96f9ba10929e86bba6c6c588
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npc56p-preview-0e8ec8ef.tgz</a><br>
- MD5: c901334c6158351e945f188167ae56f4<br>
- SHA-1: 0e8ec8ef98c7a8d4f58d15f90afc5176303efca4
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npc56p-preview-1bafdbfb.tgz</a><br>
- MD5: 7bb95bebc478d7257cccb4652899d1b4<br>
- SHA-1: 1bafdbfb502e979a9fe4c257a379c4c7af8a3ae6
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npc56r-preview-7027d5b6.tgz</a><br>
- MD5: f5d3d8f75836ccfe4c70e8162e498be4<br>
- SHA-1: 7027d5b662bceda4c80a91a0a14ef0e5a7ba795b
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npc56p-preview-335a86a4.tgz</a><br>
- MD5: 4e21fb183bbbf467bee91598d587fd2e<br>
- SHA-1: 335a86a435ee51f18464de343ad2e071c38f0e92
- </td>
- </tr>
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npc56p-preview-82472ebc.tgz</a><br>
- MD5: 983e083bc7cd0c4a2d39d6ebaa20202a<br>
- SHA-1: 82472ebc9a6054a103f53cb400a1351913c95127
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">Удаление предварительной версии с устройства</h3>
-
-<p>
- Удаление предварительной версии с устройства можно выполнить одним из
-следующих способов. </p>
- <ul>
- <li><strong>Получить заводской образ системы</strong> и вручную
-записать его во флэш-память устройства.
- <ul>
- <li>При использовании <strong>устройств Nexus и Pixel C</strong> ссылки для загрузки см. на странице
-<a href="http://developers.google.com/android/nexus/images">Заводские образы
-для устройств Nexus</a>. </li>
- <li>Для <strong>других устройств</strong> обратитесь напрямую к производителю устройства.
- Если устройство поддерживается
-программой бета-тестирования Android, вы можете зарегистрировать его для
-участия в программе, а затем, если потребуется, отменить регистрацию (см. ниже).</li>
- </ul>
- </li>
- <li><strong>Отмена регистрации устройства в программе бета-тестировании Android</strong>. Если
-устройство зарегистрировано в <a href="https://g.co/androidbeta">программе бета-тестировании
-Android</a>, можно в любое время отменить регистрацию независимо от типа устройства.
- <p>
- Устройство будет получать по беспроводной связи последнюю версию
-Android, доступную для устройства (например, Android 6.0 Marshmallow).
- Для обновления требуется полный сброс настроек устройства в целях удаления с устройства
-всех данных пользователя. Поэтому перед отменой регистрации устройства <strong>выполните резервное копирование наиболее важных данных</strong>.
-
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>Примечание.</strong>
-Удаление системного образа Developer Preview до
-завершения программы требует полного сброса настроек устройства и приводит к удалению всех данных пользователя
-на этом устройстве.
-</p>
-
-
-<h2 id="setupAVD">Настройка эмулятора</h2>
-
-<p>Чтобы использовать эмулятор Android для запуска Android N Preview, необходимо
-загрузить Android N Preview SDK и создать виртуальное устройство для
-эмулятора.</p>
-
-<p>Сначала загрузите Android N Preview SDK, сделав это следующим образом (если вы получили его
-во время <a href="{@docRoot}preview/setup-sdk.html">настройки
-в целях разработки для Android N</a>, этот шаг можно пропустить).
-
-<ol>
- <li>В Android Studio откройте окно "Settings"
-(<strong>File > Settings</strong> в Windows/Linux или
-<strong>Android Studio > Preferences</strong> для Mac). В левой
-панели выберите <strong>Appearance & Behavior >
-System Settings > Android SDK</strong>.
-
- <li>Перейдите на вкладку <strong>SDK Platforms</strong> и установите флажок
-<strong>Android N Preview</strong>.</li>
-
- <li>Откройте вкладку <strong>SDK Tools</strong> и затем установите флажки
-<strong>Android SDK Build Tools</strong>, <strong>Android SDK
-Platform-Tools</strong>, <strong>Android SDK Tools</strong>.
-
- </li>
-
- <li>Нажмите <strong>OK</strong> и примите лицензионные
-соглашения для всех устанавливаемых пакетов.
- </li>
-</ol>
-
-<p>У вас должны быть пакеты <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-<strong>Platform-Tools 24.0.0 rc1</strong> и <strong>SDK Tools
-25.0.9</strong>. Если вы не обновите SDK Tools до версии 25.0.9, вы не сможете
-запустить системный образ x86_64 для Android N.</p>
-
-
-<p>Теперь необходимо создать виртуальное устройство с системным образом Android N.</p>
-
-<ol>
- <li>Откройте AVD Manager, выбрав <strong>Tools > Android >
-AVD Manager</strong>.</li>
- <li>Нажмите <strong>Create Virtual Device</strong>.</li>
- <li>Выберите устройство, например: Nexus 5X, Nexus 6P, Nexus 9 или Android TV,
-затем нажмите <strong>Next</strong>.</li>
- <li>Выберите системный образ <strong>N</strong> (с
-<strong>x86</strong> ABI), затем нажмите <strong>Next</strong>.
-(Эмулятором Android в настоящий момент поддерживаются только системные образы x86
-для Android N Preview.)
- <li>Выполните остальные настройки конфигурации AVD и нажмите
-<strong>Finish</strong>.</li>
-</ol>
-
-<p>Теперь можно запустить эмулятор Android с Android N Preview AVD.</p>
-
-<p>
-Для обеспечения эффективной работы эмулятора Android установите
-Android Studio 2.1 Preview с поддержкой <a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0 Beta</a>,
-который обеспечивает более высокую производительность по сравнению с эмулятором в
-Android Studio 1.5.</p>
-
-<p class="note"><strong>Примечание.</strong>
-Если вы используете Android Studio 2.0 Beta, в нем есть известная неисправность,
-которая не позволяет создавать AVD с системными образами N Preview, поэтому вам потребуется
-использовать Android Studio 2.1 Preview для создания AVD.
-</p>
-
-<p>Для получения дополнительной информации о создании виртуальных устройств см. страницу <a href="{@docRoot}tools/devices/index.html">Управление виртуальными устройствами</a>.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/ru/preview/features/direct-boot.jd b/docs/html-intl/intl/ru/preview/features/direct-boot.jd
deleted file mode 100644
index b49624b..0000000
--- a/docs/html-intl/intl/ru/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=Режим Direct Boot
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Содержание документа</h2>
- <ol>
- <li><a href="#run">Запрос доступа для запуска в режиме Direct Boot</a></li>
- <li><a href="#access">Доступ к шифрованному хранилищу данных устройства</a></li>
- <li><a href="#notification">Уведомление о разблокировке пользователем</a></li>
- <li><a href="#migrating">Перенос имеющихся данных</a></li>
- <li><a href="#testing">Тестирование приложения с поддержкой шифрования</a></li>
- </ol>
-</div>
-</div>
-
-<p>Android N работает в защищенном режиме <i>Direct Boot,</i> когда
-устройство было включено, но не разблокировано пользователем.
- Для поддержки такого режима работы в системе имеется два хранилища данных:</p>
-
-<ul>
-<li><i>Хранилище, зашифрованное на уровне учетных данных.</i>Это хранилище используется по умолчанию
-и доступно только тогда, когда пользователь разблокирует устройство.</li>
-<li><i>Хранилище, зашифрованное на уровне устройства.</i>Это хранилище доступно в режиме
-Direct Boot и тогда, когда пользователь разблокирует устройство.</li>
-</ul>
-
-<p>По умолчанию в режиме Direct Boot приложения не работают.
-Если вашему приложению требуется выполнять какие-то действия в режиме Direct Boot, вы можете зарегистрировать
-компоненты приложения, которые должны быть запущены в этом режиме. Некоторые распространенные примеры использования
-приложений, выполняющих операции в режиме Direct Boot:</p>
-
-<ul>
-<li>Приложения с уведомлениями по расписанию, например,
-будильники.</li>
-<li>Приложения, посылающие пользователю важные уведомления, например, приложения СМС.</li>
-<li>Приложения для лиц с ограниченными возможностями, например, Talkback.</li>
-</ul>
-
-<p>Если вашему приложению требуется доступ к данным в режиме Direct Boot, используйте
-шифрованное хранилище устройства. Шифрованное хранилище устройства содержит данные,
-зашифрованные с помощью ключа, доступного только после
-успешной подтвержденной загрузки устройства.</p>
-
-<p>Если данные следует шифровать с помощью ключа, связанного с учетными данными
-пользователя (например, с PIN-кодом или паролем), используйте хранилище, требующее ввода учетных данных.
-Такое хранилище доступно только после успешной
-разблокировки устройства пользователем и до тех пор, пока пользователь не перезапустит устройство. Если
-пользователь включает экран блокировки после разблокировки устройства, шифрованное хранилище,
-требующее ввода учетных данных, не блокируется.</p>
-
-<h2 id="run">Запрос доступа для запуска в режиме Direct Boot</h2>
-
-<p>Прежде
-чем работать в режиме Direct Boot или получать доступ к шифрованному
-хранилищу устройства, приложения должны зарегистрировать свои компоненты в системе. Приложения регистрируются в системе, помечая компоненты как
-<i>поддерживающие шифрование</i>. Чтобы пометить компонент как поддерживающий шифрование, нужно установить для атрибута
-<code>android:encryptionAware</code> в манифесте значение true.<p>
-
-<p>Компоненты, поддерживающие шифрование, можно регистрировать для получения
-<code>LOCKED_BOOT_COMPLETED</code> широковещательных сообщений от
-системы после перезапуска устройства. В этот момент шифрованное хранилище устройства
-доступно, и компонент может выполнять необходимые задачи в режиме
-Direct Boot, например, включать будильник по расписанию.</p>
-
-<p>В следующем фрагменте кода приведен пример регистрации компонента
-{@link android.content.BroadcastReceiver} как поддерживающего шифрование и добавления
-фильтра намерения <code>LOCKED_BOOT_COMPLETED</code> в манифест приложения:</p>
-
-<pre>
-<receiever
- android:encryptionAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>После разблокировки устройства пользователем все компоненты имеют доступ к шифрованному хранилищу устройства
-и к шифрованному хранилищу, требующему ввода учетных данных.</p>
-
-<h2 id="access">Доступ к шифрованному хранилищу данных устройства</h2>
-
-<p>Для получения доступа к шифрованному хранилищу устройства следует создать второй экземпляр
-{@link android.content.Context} посредством вызова
-<code>Context.createDeviceEncryptedStorageContext()</code>. Все вызовы API
-системы хранения данных с использованием этого контекста получают доступ к шифрованному хранилищу устройства. В
-следующем примере показано, как получить доступ к шифрованному хранилищу устройства и открыть существующий
-файл данных приложения:</p>
-
-<pre>
-Context directBootContext = Context.createDeviceEncryptedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>Шифрованное хранилище устройства следует использовать только для
-информации, которая должна быть доступна в режиме Direct Boot.
-Шифрованное хранилище устройства не следует использовать в качестве шифрованного хранилища общего назначения.
-Для хранения данных пользователя или шифрованных данных, которые не требуются в режиме
-Direct Boot, следует использовать шифрованное хранилище, требующее ввода учетных данных.</p>
-
-<h2 id="notification">Уведомление о разблокировке пользователем</h2>
-
-<p>Когда после перезагрузки устройства пользователь разблокирует его, ваше приложение может переключиться на
-шифрованное хранилище, требующее ввода учетных данных, и использовать обычные системные службы,
-зависящие от учетных данных пользователя.</p>
-
-<p>Чтобы приложение получало уведомления о разблокировке устройства пользователем после перезагрузки,
-необходимо зарегистрировать {@link android.content.BroadcastReceiver} работающего компонента
-для отслеживания сообщения <code>ACTION_USER_UNLOCKED</code>. Также приложение может
-получать существующее сообщение {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED}, которое теперь указывает, что устройство загружено и разблокировано
-пользователем.</p>
-
-<p>Приложение может направлять запрос напрямую, если пользователь разблокирует устройство посредством вызова
-<code>UserManager.isUserUnlocked()</code>.</p>
-
-<h2 id="migrating">Перенос имеющихся данных</h2>
-
-<p>Если пользователь обновит свое устройство для использования режима Direct Boot, вашему приложению может потребоваться перенести
-имеющиеся данные в шифрованное хранилище устройства. Используйте
-<code>Context.migrateSharedPreferencesFrom()</code> и
-<code>Context.migrateDatabaseFrom()</code> для переноса данных о настройках и содержимого баз данных
-между шифрованным хранилищем, требующим ввода учетных данных, и шифрованным хранилищем устройства.</p>
-
-<p>Хорошо обдумайте, какие данные следует перенести из
-шифрованного хранилища, требующего ввода учетных данных, в шифрованное хранилище устройства. Не следует переносить в
-шифрованное хранилище устройства личные данные пользователя, такие как
-пароли или токены авторизации. В некоторых случаях вашему приложению может потребоваться работать
-с отдельными наборами данных в двух шифрованных хранилищах.</p>
-
-<h2 id="testing">Тестирование приложения с поддержкой шифрования</h2>
-
-<p>Протестируйте свое приложение с поддержкой шифрования в новом режиме Direct Boot. Существуют
-два способа включить режим Direct Boot.</p>
-
-<p class="caution"><strong>Внимание!</strong> При включении режима Direct Boot
-с устройства удаляются все данные пользователя.</p>
-
-<p>Чтобы включить режим
-Direct Boot на поддерживаемых устройствах с Android N, выполните одну из следующих последовательностей действий.</p>
-
-<ul>
-<li>Включите на устройстве параметры разработчика <b>Developer options</b>, если вы еще не сделали этого ранее. Для этого
-перейдите на экран <b>Settings > About phone</b> и нажмите семь раз <b>Build number</b>.
- Когда параметры разработчика станут доступны, откройте раздел
-<b>Settings > Developer options</b> и выберите
-<b>Convert to file encryption</b>.</li>
-<li>Используйте следующие команды оболочки adb для включения режима Direct Boot:
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>Если вам требуется переключать
-режимы на тестовых устройствах, вы можете использовать эмуляцию режима Direct Boot. Режим эмуляции следует использовать только для целей
-разработки, в нем возможна потеря данных. Чтобы включить эмуляцию режима Direct Boot,
-установите режим блокировки устройства, выберите пункт "No thanks", если система предлагает открыть
-защищенный экран запуска при установке режима блокировки, а затем используйте
-следующую команду оболочки adb:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>Для отключения эмуляции режима Direct Boot нужно использовать следующую команду:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>При использовании этих команд устройство перезагружается.</p>
diff --git a/docs/html-intl/intl/ru/preview/features/multi-window.jd b/docs/html-intl/intl/ru/preview/features/multi-window.jd
deleted file mode 100644
index f1a8ea6..0000000
--- a/docs/html-intl/intl/ru/preview/features/multi-window.jd
+++ /dev/null
@@ -1,582 +0,0 @@
-page.title=Поддержка многооконного режима
-page.metaDescription=Новые возможности в Android N для одновременного отображения нескольких приложений.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Содержание документа</h2>
- <ol>
- <li><a href="#overview">Обзор</a></li>
- <li><a href="#lifecycle">Жизненный цикл многооконного режима</a></li>
- <li><a href="#configuring">Настройка приложения для многооконного
- режима</a></li>
- <li><a href="#running">Запуск приложения в многооконном режиме</a></li>
- <li><a href="#testing">Тестирование приложения в многооконном режиме</a></li>
- </ol>
- <h2>См. также:</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Пример
- многооконного демонстрационного приложения</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- В Android N добавлена поддержка отображения нескольких приложений
- одновременно. На мобильных устройствах два приложения могут быть запущены рядом
- или друг над другом в режиме <em>разделения экрана</em>. На телевизорах приложения могут
- использовать режим <em>"картинка в картинке"</em>, чтобы воспроизводить видео,
- пока пользователи работают с другим приложением.
-</p>
-
-<p>
- Если вы создаете приложение с использованием N Preview SDK, вы можете указать, как оно
- будет действовать в многооконном режиме. Например, можно задать минимальные
- допустимые размеры окна приложения. Также можно отключить многооконный режим для приложения,
- чтобы оно отображалось только в полноэкранном
- режиме.
-</p>
-
-<h2 id="overview">Обзор</h2>
-
-<p>
- В Android N несколько приложений могут одновременно находиться на экране. Например,
- пользователь может разделить экран, чтобы просматривать веб-страницу
- слева и писать сообщение электронной почты справа. Возможности пользователя зависят от
- устройства.
-</p>
-
-<ul>
- <li>На мобильных устройствах с Android N доступен режим
- разделения экрана. В этом режиме два приложения отображаются рядом
- или друг над другом. Пользователь может перетащить
- линию разделения, чтобы увеличить окно одного приложения и уменьшить окно другого.
- </li>
-
- <li>На устройствах Nexus Player с Android N для приложений
- будет доступен <a href="picture-in-picture.html">режим "картинка в картинке"</a>, который
- позволит приложению отображать контент, пока пользователь просматривает
- другие приложения или взаимодействует с ними.
- </li>
-
- <li>Производители более крупных устройств могут активировать
- режим произвольной формы, где пользователь может любым образом изменять размер каждого окна. В этом случае
- помимо режима разделения экрана
- на устройстве будет доступен и этот режим.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>Рис. 1.</strong> Два приложения отображаются рядом в режиме разделения экрана.
-</p>
-
-<p>
- Пользователь может перейти в многооконный режим следующими способами.
-</p>
-
-<ul>
- <li>Если пользователь откроет <a href="{@docRoot}guide/components/recents.html">экран
- обзора</a> и длительно нажмет
- название операции, ее можно будет перетащить в выделенную часть
- экрана и переключить в многооконный режим.
- </li>
-
- <li>Если пользователь длительно нажмет кнопку "Обзор", устройство
- переключит текущую операцию в многооконный режим и откроет экран обзора,
- где пользователь сможет выбрать другую операцию для совместного отображения.
- </li>
-</ul>
-
-<p>
- Пользователи могут <a href="{@docRoot}guide/topics/ui/drag-drop.html">перетаскивать</a>
-данные между окнами операций в режиме
- совместного отображения. (Ранее перетаскивать данные можно было только в рамках
- одной операции).
-</p>
-
-<h2 id="lifecycle">Жизненный цикл многооконного режима</h2>
-
-<p>
- Многооконный режим не меняет <a href="{@docRoot}training/basics/activity-lifecycle/index.html">жизненный
- цикл операции</a>.
-</p>
-
-<p>
- В этом режиме в каждый момент времени активной
- является только последняя операция, с которой взаимодействовал пользователь. Такая операция считается <em>самой верхней</em>.
- Все другие операции приостановлены, даже если они отображаются.
- Однако система отдает приостановленным, но видимым операциям более
- высокий приоритет, чем невидимым. Если пользователь взаимодействует с
- одной из приостановленных операций, она возобновляется, а прежняя самая верхняя
- операция приостанавливается.
-</p>
-
-<p class="note">
- <strong>Примечание.</strong> В многооконном режиме приложение может быть приостановлено
- и по-прежнему видимо для пользователя. Приложению может потребоваться
- продолжать свои операции, даже если оно приостановлено. Например, видимое приостановленное приложение,
- воспроизводящее видео, будет по-прежнему показывать видео. Поэтому
- мы <em>не</em> рекомендуем приостанавливать воспроизведение
- в обработчиках {@link android.app.Activity#onPause onPause()} таких приложений.
- Вместо этого следует приостановить видео в {@link android.app.Activity#onStop
- onStop()} и возобновить воспроизведение в {@link android.app.Activity#onStart
- onStart()}.
-</p>
-
-<p>
- Если пользователь переводит приложение в многооконный режим, система
- уведомляет операцию об изменении конфигурации, как указано в документе <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений
- во время выполнения</a>. По сути это изменение так же действует
-на жизненный цикл операции, как уведомление приложения системой
-о переходе устройства из вертикальной ориентации в
- горизонтальную, только изменяются размеры экрана, а не ориентация. Как описано в документе <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Обработка изменений
- во время выполнения</a>, операция может обработать изменение
- конфигурации самостоятельно или может позволить системе
- удалить окно операции и создать его заново с новыми размерами.
-</p>
-
-<p>
- Если пользователь увеличивает одну из сторон окна, система меняет
- размер окна операции в соответствии с действием пользователя и применяет <a href="{@docRoot}guide/topics/resources/runtime-changes.html">изменения в режиме выполнения</a>
- по мере необходимости. Если приложение не успевает отрисовать новые области, система
- временно заполняет их цветом, заданным атрибутом {@link
- android.R.attr#windowBackground windowBackground} или атрибутом стиля
- <code>windowBackgroundFallback</code> по умолчанию.
-</p>
-
-<h2 id="configuring">Настройка приложения для многооконного режима</h2>
-
-<p>
- Если ваше приложение предназначено для Android N, вы
- можете указать, каким образом поддерживают (и поддерживают ли) операции вашего приложения многооконный режим. Атрибуты управления размером и макетом устанавливаются
- в манифесте.
- Настройки атрибутов корневой операции применяются
- ко всем операциям в ее стеке задач.
-</p>
-
-<p class="note">
- <strong>Примечание.</strong> Если приложение с поддержкой различной
- ориентации было создано с версией SDK,
- более ранней, чем Android N, и пользователь запустит это приложение в многооконном режиме, система принудительно изменит размер приложения. Система отображает диалоговое окно
- с предупреждением о том, что приложение может работать непредвиденным образом. Система
- <em>не</em> меняет размер окна для приложений с
- фиксированной ориентацией. Если пользователь попытается открыть такое приложение
- в многооконном режиме, оно займет весь экран.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- Установите этот атрибут в узле <code><activity></code> или
- <code><application></code> манифеста, чтобы включить или отключить многооконный
- режим:
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- Если для этого атрибута задано значение true, операцию можно запускать
- в режимах разделения экрана и произвольной формы. Если для атрибута задано значение false,
- операция не поддерживает многооконный режим. Если значение равно false и
- пользователь пытается запустить операцию в многооконном режиме, она
- занимает весь экран.
-</p>
-
-<p>
- Если приложение предназначено для Android N, но
-значение для этого атрибута не было указано, то по умолчанию используется значение true.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- Установите этот атрибут в узле <code><activity></code> манифеста,
- чтобы указать, поддерживает ли операция режим "картинка в картинке". Этот
- атрибут не принимается во внимание, если для <code>android:resizeableActivity</code> установлено значение false.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">Атрибуты макета</h3>
-
-<p>
- В Android N элемент манифеста <code><layout></code> поддерживает
- несколько атрибутов, которые определяют поведение
- операции в многооконном режиме.
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- Ширина окна операции по умолчанию в режиме произвольной формы.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- Высота окна операции по умолчанию в режиме произвольной формы.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- Начальная позиция окна операции в режиме произвольной формы. Допустимые значения
- см. в описании класса {@link android.view.Gravity}.
- </dd>
-
- <dt>
- <code>android:minimalSize</code>
- </dt>
-
- <dd>
- Минимальные значения высоты и ширины окна операции в режимах разделения экрана
- и произвольной формы. Если пользователь перемещает разделительную линию
- в режиме разделения экрана, чтобы сделать размер окна операции
- меньше указанного минимума, система обрезает его до запрошенного пользователем размера.
- </dd>
-</dl>
-
-<p>
- В следующем примере кода показано, как задать размер и
- позицию окна операции по умолчанию, а также ее минимальный размер в
- режиме произвольной формы:
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalSize="450dp" />
-</activity>
-</pre>
-
-<h2 id="running">Запуск приложения в многооконном режиме</h2>
-
-<p>
- Android N предоставляет новые возможности для поддержки
- приложений в многооконном режиме.
-</p>
-
-<h3 id="disabled-features">Недоступные возможности в многооконном режиме</h3>
-
-<p>
- Некоторые возможности отключены или игнорируются в многооконном
- режиме, потому что они не имеют смысла для операции, которая отображается
- на экране устройства одновременно с другими операциями или приложениями. Ниже приведены примеры таких возможностей.
-
-<ul>
- <li>Отключены некоторые параметры настройки <a href="{@docRoot}training/system-ui/index.html">системного интерфейса</a>.
- Например, приложения не могут
- скрыть строку состояния, если они не работают в полноэкранном режиме.
- </li>
-
- <li>Система не учитывает изменения атрибута <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code>.
- </li>
-</ul>
-
-<h3 id="change-notification">Уведомления об изменениях и запросы в многооконном режиме</h3>
-
-<p>
- Для поддержки многооконного режима в класс {@link android.app.Activity}
- были добавлены следующие методы. Подробнее о каждом из них см. в
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">справочнике по N Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>Activity.inMultiWindow()</code>
- </dt>
-
- <dd>
- Вызовите этот метод, чтобы узнать, находится ли операция в многооконном режиме.
- </dd>
-
- <dt>
- <code>Activity.inPictureInPicture()</code>
- </dt>
-
- <dd>
- Вызовите этот метод, чтобы узнать, находится ли операция в режиме "картинка в картинке".
-
- <p class="note">
- <strong>Примечание.</strong> Режим "картинка в картинке" — это частный
- случай многооконного режима. Если метод <code>myActivity.inPictureInPicture()</code>
- возвращает значение true, <code>myActivity.inMultiWindow()</code> также возвращает
- true.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowChanged()</code>
- </dt>
-
- <dd>
- Система вызывает этот метод, когда операция переходит в многооконный
- режим или выходит из него. Система передает методу значение true, если
- операция входит в многооконный режим, и значение false, если
- она выходит из него.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureChanged()</code>
- </dt>
-
- <dd>
- Система вызывает этот метод, когда операция переходит в режим
- "картинка в картинке". Система передает методу значение true,
- если операция входит в режим "картинка в картинке", и значение false,
- если она выходит из него.
- </dd>
-</dl>
-
-<p>
- Также существуют версии {@link android.app.Fragment} для этих методов,
-например, <code>Fragment.inMultiWindow()</code>.
-</p>
-
-<h3 id="entering-pip">Переход в режим "картинка в картинке"</h3>
-
-<p>
- Чтобы перевести операцию в режим "картинка в картинке",
- вызовите новый метод <code>Activity.enterPictureInPicture()</code>. Этот метод игнорируется, если
- устройство не поддерживает режим "картинка в картинке". Дополнительная информация содержится в документации
- <a href="picture-in-picture.html">Режим "картинка в картинке"</a>.
-</p>
-
-<h3 id="launch">Запуск новых операций в многооконном режиме</h3>
-
-<p>
- При запуске новой операции можно сообщить системе, что окно новой
- операции следует показать рядом с текущим, если это возможно. Для этого
- используйте флаг
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Этот
- флаг запрашивает следующее поведение.
-</p>
-
-<ul>
- <li>Если устройство находится в режиме разделения экрана, система пытается
- создать окно новой операции рядом с окном запустившей ее операции,
- чтобы разместить две операции на экране. Не гарантируется, что система сможет это сделать, но если
- это возможно, операции отображаются рядом друг с другом.
- </li>
-
- <li>Если устройство не находится в режиме разделения экрана, этот флаг не учитывается.
- </li>
-</ul>
-
-<p>
- Если при запуске
- новой операции устройство находится в режиме произвольной формы, вы можете задать размеры и позицию окна новой операции,
- вызвав метод <code>ActivityOptions.setLaunchBounds()</code>. Этот метод игнорируется, если
- устройство не находится в многооконном режиме.
-</p>
-
-<p class="note">
- <strong>Примечание.</strong> Если запустить операцию в стеке задач,
- она заменит операцию на экране, унаследовав все ее
- свойства многооконного режима. Чтобы запустить новую операцию в отдельном
- окне в многооконном режиме, ее следует запустить в новом стеке задач.
-</p>
-
-<h3 id="dnd">Поддержка перетаскивания</h3>
-
-<p>
- Пользователи могут <a href="{@docRoot}guide/topics/ui/drag-drop.html">перетаскивать</a> данные
- между окнами операций в режиме
- совместного отображения. (Ранее перетаскивать данные можно было только в рамках
- одной операции). Поэтому вы можете реализовать функции перетаскивания
- в своем приложении, если оно еще их не поддерживает.
-</p>
-
-<p>
- В N Preview SDK пакет <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- расширен для поддержки перетаскивания между приложениями. Дополнительная информация о нижеприведенных классах
- и методах содержится в <a href="{@docRoot}preview/setup-sdk.html#docs-dl">справочнике по N
- Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- Объект токена для указания разрешений
- приложению, в которое перетаскиваются данные.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- Новый псевдоним для {@link android.view.View#startDrag View.startDrag()}. Чтобы
- разрешить перетаскивание между операциями, передайте
- новый флаг <code>View.DRAG_FLAG_GLOBAL</code>. Если вам нужно предоставить принимающей операции разрешения на чтение или запись URI,
- передайте новый флаг
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> или
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code> соответственно.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- Отменяет текущую операцию перетаскивания. Этот метод может вызвать только
- приложение, в котором была инициирована операция перетаскивания.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- Заменяет тень текущей операции перетаскивания. Этот метод может вызвать только приложение,
- в котором была инициирована операция перетаскивания.
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- Запрашивает разрешения для URI контента, переданных в объекте {@link
- android.content.ClipData} в {@link android.view.DragEvent}.
- </dd>
-</dl>
-
-<h2 id="testing">Тестирование приложения в многооконном режиме</h2>
-
-<p>
- Независимо от того, обновляете ли вы свое приложение для Android N, вам необходимо
- подтвердить его поведение в многооконном
- режиме на тот случай, если пользователь попытается запустить его в этом режиме на устройстве с Android N.
-</p>
-
-<h3 id="configuring">Настройка тестового устройства</h3>
-
-<p>
- Если установить Android N на устройстве, режим разделения
- экрана будет поддерживаться автоматически.
-</p>
-
-<h3 id="test-non-n">Если приложение было создано без использования N Preview SDK</h3>
-
-<p>
- Если вы не применяли N Preview SDK для создания приложения и пользователь
- попытается запустить его в многооконном режиме, система принудительно
- изменит размер окна приложения, если его ориентация не зафиксирована.
-</p>
-
-<p>
- Если для приложения не задана фиксированная ориентация, вам
- следует запустить его на устройстве с Android N и попытаться
- перевести его в режим разделения экрана. Убедитесь, что приложение
- работает нормально после принудительного изменения размера.
-</p>
-
-<p>
- Если для приложения задана фиксированная ориентация, попытайтесь
- перевести его в многооконный режим. Убедитесь, что при этом
- приложение остается в полноэкранном режиме.
-</p>
-
-<h3 id="test-mw">Если приложение поддерживает многооконный режим</h3>
-
-<p>
- Если вы использовали N Preview SDK для создания приложения и не
- отключили поддержку многооконного режима, проверьте работу
- приложения, как описано далее, в режимах разделения экрана и произвольной формы.
-</p>
-
-<ul>
- <li>Запустите приложение в полноэкранном режиме, а затем переключитесь
- в многооконный режим долгим нажатием кнопки "Обзор". Убедитесь, что приложение корректно переключается между режимами.
- </li>
-
- <li>Запустите приложение непосредственно в многооконном режиме
- и убедитесь, что оно работает нормально. Вы можете запустить приложение в многооконном режиме, нажав
- кнопку "Обзор", затем длительно нажав строку заголовка приложения и
- перетащив ее в одну из выделенных областей на экране.
- </li>
-
- <li>Измените размер окна приложения в режиме разделения экрана, перетащив линию разделения.
- Убедитесь, что изменение размера не приводит к сбою и что необходимые
- элементы интерфейса остаются видимыми.
- </li>
-
- <li>Если вы указали минимальные размеры окна приложения, попытайтесь
- установить размер меньше минимального. Убедитесь в невозможности установить размер
- меньше указанного минимума.
- </li>
-
- <li>Во время всех тестов следите за производительностью приложения — она должна быть приемлемой. Например,
- убедитесь, что после изменения размера окна приложения не возникает большой
- задержки обновления интерфейса.
- </li>
-</ul>
-
-<h4 id="test-checklist">Контрольный список тестирования</h4>
-
-<p>
- Для проверки производительности приложения в многооконном режиме
- выполните следующие операции. Попытайтесь выполнить их в режиме разделения экрана и
- в многооконном режиме, если не указано иное.
-</p>
-
-<ul>
- <li>Перейдите в многооконный режим и выйдите из него.
- </li>
-
- <li>Переключитесь из своего приложения в другое приложение и убедитесь,
- что приложение работает нормально, если оно видимо, но не активно. Например, если приложение
- показывает видео, оно должно продолжать воспроизведение, когда
- пользователь работает с другим приложением.
- </li>
-
- <li>В режиме разделения экрана попробуйте перемещать линию
- разделения, увеличивая и уменьшая окно приложения. Попробуйте выполнить эти операции, когда окна двух
- приложений находятся рядом и друг над другом. Убедитесь, что приложение не завершается с ошибкой,
- необходимые элементы видны и изменение размера не занимает
- слишком много времени.
- </li>
-
- <li>Быстро измените размер окна приложения несколько раз подряд. Убедитесь, что
- приложение не зависает и не вызывает утечку памяти. Информация о проверке использования памяти
- приложением содержится в документе <a href="{@docRoot}tools/debugging/debugging-memory.html">
-Анализ использования оперативной памяти</a>.
- </li>
-
- <li>Поработайте с приложением в различных оконных конфигурациях и
- убедитесь, что оно ведет себя должным образом. Текст должен легко читаться, а
- элементы интерфейса не должны быть слишком маленькими.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">Если вы отключили поддержку многооконного режима</h3>
-
-<p>
- Если вы отключили поддержку многооконного режима,
- установив атрибут <code>android:resizableActivity="false"</code>, запустите
- приложение на устройстве с Android N и
- попытайтесь перевести его в режимы произвольной формы и разделения экрана. Убедитесь, что при этом
- приложение остается в полноэкранном режиме.
-</p>
diff --git a/docs/html-intl/intl/ru/preview/features/multilingual-support.jd b/docs/html-intl/intl/ru/preview/features/multilingual-support.jd
index 83dd2b4..83e9968 100644
--- a/docs/html-intl/intl/ru/preview/features/multilingual-support.jd
+++ b/docs/html-intl/intl/ru/preview/features/multilingual-support.jd
@@ -208,7 +208,7 @@
конечных пользователей. Поэтому при разработке приложений для Android N
следует использовать средства форматирования, а не жесткое кодирование строк с числами и датами.</p>
-<p>В качестве наглядного примера можно привести арабский язык, поддержка которого в Android N расширена
+<p>В качестве наглядного примера можно привести арабский язык, поддержка которого в Android N расширена
с одного {@code ar_EG} до 27 языковых стандартов. Большинство ресурсов этих языковых стандартов общие, но
в некоторых из них используются цифры формата ASCII, а в других — собственные цифры. Например,
если вы хотите создать предложение с числовой переменной
diff --git a/docs/html-intl/intl/ru/preview/features/notification-updates.jd b/docs/html-intl/intl/ru/preview/features/notification-updates.jd
index 9c7cb93..54b3bc3 100644
--- a/docs/html-intl/intl/ru/preview/features/notification-updates.jd
+++ b/docs/html-intl/intl/ru/preview/features/notification-updates.jd
@@ -203,7 +203,7 @@
</p>
-<p>Добавление уведомлений в группу описано в разделе
+<p>Добавление уведомлений в группу описано в разделе
<a href="{@docRoot}training/wearables/notifications/stacks.html#AddGroup">Добавление
каждого уведомления в группу</a>.</p>
diff --git a/docs/html-intl/intl/ru/preview/features/picture-in-picture.jd b/docs/html-intl/intl/ru/preview/features/picture-in-picture.jd
deleted file mode 100644
index 5be0bff..0000000
--- a/docs/html-intl/intl/ru/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Режим "картинка в картинке"
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Содержание документа</h2>
-<ol>
- <li><a href="#declaring">Декларация поддержки операцией режима
-"картинка в картинке"</a></li>
- <li><a href="#pip_button">Переключение операции в режим "картинка в картинке"</a>
-</li>
- <li><a href="#handling_ui">Работа пользовательского интерфейса в режиме "картинка в картинке"</a>
-</li>
- <li><a href="#continuing_playback">Продолжение воспроизведения видео в режиме
-"картинка в картинке"</a></li>
- <li><a href="#best">Советы и рекомендации</a></li>
-</ol>
-
-<h2>См. также:</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">Поддержка
-многооконного режима</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>В Android N пользователи Android TV могут смотреть видео
-в закрепленном окне в углу экрана во время работы в
-приложениях. Режим "картинка в картинке" (PIP) позволяет приложениям отображать видео
-в закрепленном окне одновременно с выполнением другой операции
-фоновом режиме. Окно PIP обеспечивает возможность многозадачности внутри вашего приложения, что
-повышает продуктивность работы пользователей.</p>
-
-<p>Ваше приложение может определить момент активации режима PIP. Ниже приведено несколько примеров
-моментов перехода в режим PIP:</p>
-
-<ul>
-<li>Ваше приложение может перевести видео в режим PIP, когда пользователь переходит
-от видео к просмотру другого контента.</li>
-<li>Ваше приложение может переключить видео в режим PIP, когда пользователь смотрит конец
-эпизода контента. На основном экране отображается рекламная или сводная информация
-о следующем эпизоде серии.</li>
-<li>Ваше приложение может предоставить пользователям возможность добавлять в очередь дополнительный контент при
-просмотре видео. В режиме PIP видео продолжает воспроизводиться, когда на основном
-экране отображается операция выбора контента.</li>
-</ul>
-
-<p>Окно PIP имеет размеры 240x135 dp и отображается на самом верхнем слое в одном из
-четырех углов экрана по выбору системы. Пользователь может вызвать
-меню PIP, позволяющее переключать окно PIP в полноэкранный режим, или закрыть окно
-PIP долгим нажатием кнопки <b>Home</b> на пульте дистанционного управления. Если на главном экране начнется воспроизведение другого
-видео, окно PIP автоматически
-закроется. Пользователи также могут закрыть окно PIP, используя экран последних задач.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>Рисунок 1.</strong> Видео в режиме "картинка в картинке"
- отображается в углу экрана, пока пользователь просматривает
-контент на главном экране.</p>
-
-<p>Режим PIP использует многооконные API-интерфейсы в Android N для
-отображения закрепленного окна с видео на верхнем слое. Чтобы добавить в приложение функцию PIP, вам нужно зарегистрировать
-операции, поддерживающие PIP, добавить необходимые переключения операции в режим PIP,
-а также обеспечить скрытие элементов пользовательского интерфейса и воспроизведение видео в то время, когда
-операция находится в режиме PIP.</p>
-
-<h2 id="declaring">Декларация поддержки операцией режима "картинка в картинке"</h2>
-
-<p>По умолчанию в системе отсутствует автоматическая поддержка режима PIP для приложений.
-Если вы хотите, чтобы ваше приложение поддерживало режим PIP, зарегистрируйте операцию
-воспроизведения видео в манифесте приложения, установив для параметров
-<code>android:supportsPictureInPicture</code> и
-<code>android:resizeableActivity</code> значение <code>true</code>. Также укажите, что
-ваша операция обрабатывает изменения конфигурации макета экрана, чтобы эта операция не
-запускалась заново в случае изменения макета при переходах в режиме PIP.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>При регистрации операции помните, что в режиме PIP она
-отображается в небольшом наложенном окне на экране телевизора. Для пользователей наиболее удобны операции
-воспроизведения видео с минимальным пользовательским интерфейсом. Операции
-с небольшими элементами пользовательского интерфейса могут оказаться неудобными для пользователей
-в режиме PIP, потому что в окне PIP пользователи
-не видят деталей этих элементов.</p>
-
-<h2 id="pip_button">Переключение операции в режим "картинка в картинке"</h2>
-
-Если вам нужно переключить операцию в режим PIP, вызовите метод
-<code>Activity.enterPictureInPicture()</code>. В следующем примере показано переключение
-в режим PIP, когда пользователь нажимает кнопку PIP на панели
-управления мультимедиа:</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPicture();
- return;
- }
- ...
-</pre>
-
-<p>Добавление кнопки PIP на панель управления мультимедиа позволяет пользователям легко переключаться
-в режим PIP с сохранением возможностей управления воспроизведением видео.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>Рисунок 1.</strong> Кнопка режима "картинка в картинке"
-на панели управления мультимедиа.</p>
-
-<p>В Android N входит новый класс
-<code>PlaybackControlsRow.PictureInPictureAction</code>, который определяет действия PIP
-на панели управления и использует значок PIP.</p>
-
-<h2 id="handling_ui">Работа пользовательского интерфейса в режиме "картинка в картинке"</h2>
-
-<p>Когда операция переходит в режим PIP, она должна отображать только воспроизведение
-видео. Уберите элементы пользовательского интерфейса перед переходом операции в режим PIP
-и восстановите их после возвращения операции в полноэкранный режим.
-Переопределите <code>Activity.onPictureInPictureChanged()</code> или
-<code>Fragment.onPictureInPictureChanged()</code> и включайте или
-отключайте элементы пользовательского интерфейса по мере необходимости, например:</p>
-
-<pre>
-@Override
-public void onPictureInPictureChanged(boolean inPictureInPicture) {
- if (inPictureInPicture) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">Продолжение воспроизведения видео в режиме
-"картинка в картинке"</h2>
-
-<p>Когда операция переключается в режим PIP, система видит ее в состоянии
-паузы и вызывает метод <code>onPause()</code> этой операции. При этом воспроизведение видео
-должно продолжаться без паузы, если операция
-приостановлена в режиме PIP. Проверьте режим PIP в методе
-<code>onPause()</code> своей операции и обеспечьте обработку воспроизведения соответствующим образом,
-например:</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called due to PIP, do not pause playback
- if (inPictureInPicture()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>Когда операция возвращается из режима PIP в полноэкранный режим, система
-возобновляет выполнение операции и вызывает метод<code>onResume()</code> вашего приложения.</p>
-
-<h2 id="best">Советы и рекомендации</h2>
-
-<p>Режим PIP предназначается для операций, воспроизводящих видео в полноэкранном режиме. При переключении
-операции в режим PIP следует избегать отображения любых элементов, кроме видео.
-Отслеживайте моменты перехода операции в режим PIP и скрывайте элементы пользовательского интерфейса, как описано в
-разделе <a href="#handling_ui">Работа пользовательского интерфейса в режиме "картинка в картинке"</a>.</p>
-
-<p>Поскольку окно PIP отображается в виде плавающего окна в углу экрана,
-следует избегать отображения критически важной информации на основном экране
-в любой области, которая может быть закрыта окном PIP.</p>
-
-<p>По умолчанию фокус ввода не переключается на операцию, которая находится в режиме PIP. Для
-получения событий ввода в режиме PIP следует использовать
-<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/ru/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/ru/preview/features/scoped-folder-access.jd
deleted file mode 100644
index a39230c..0000000
--- a/docs/html-intl/intl/ru/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,124 +0,0 @@
-page.title=Доступ к выделенным каталогам
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Содержание документа</h2>
- <ol>
- <li><a href="#accessing">Доступ к каталогу во внешнем хранилище</a></li>
- <li><a href="#removable">Доступ к каталогу на съемном носителе</a></li>
- <li><a href="#best">Советы и рекомендации</a></li>
- </ol>
-</div>
-</div>
-
-<p>Некоторым приложениям (например, фотоприложениям) обычно требуется доступ только к отдельным каталогам
-внешнего хранилища, например, к каталогу <code>Pictures</code>. Существующие
-методы доступа к внешним хранилищам не предназначены для обеспечения приложениям такого типа удобного
-доступа к выделенным каталогам. Например:</p>
-
-<ul>
-<li>Запросы {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-или {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} в манифесте
-разрешают доступ ко всем общедоступным каталогам внешнего хранилища, хотя
-вашему приложению может не требоваться такой уровень доступа.</li>
-<li>При использовании инфраструктуры
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
-Access Framework</a> пользователь обычно выбирает каталоги через
-системный пользовательский интерфейс, что не требуется, если приложение всегда использует один
-и тот же внешний каталог.</li>
-</ul>
-
-<p>Android N предоставляет новый упрощенный API для доступа
-к распространенным каталогам внешнего хранилища. </p>
-
-<h2 id="accessing">Доступ к каталогу во внешнем хранилище</h2>
-
-<p>Используйте класс <code>StorageManager</code> для получения соответствующего экземпляра
-<code>StorageVolume</code>. Затем создайте намерение, вызвав метод
-<code>StorageVolume.createAccessIntent()</code> этого экземпляра.
-Используйте это намерение для доступа к каталогам внешнего хранилища. Чтобы получить список
-всех доступных томов, в том числе томов на съемных носителях, используйте
-<code>StorageManager.getVolumesList()</code>.</p>
-
-<p>В следующем фрагменте кода приведен пример того, как открывать каталог
-<code>Pictures</code> в главном общем хранилище:</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>Система пытается предоставить доступ к внешнему каталогу и, при необходимости,
-запрашивает подтверждение доступа у пользователя с помощью упрощенного пользовательского интерфейса:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>Рисунок 1.</strong> Приложение запрашивает
-доступ к каталогу Pictures.</p>
-
-<p>Если пользователь предоставляет доступ, система вызывает переопределенный метод
-<code>onActivityResult()</code> с кодом результата
-<code>Activity.RESULT_OK</code>, а также данные намерения, содержащие URI. Используйте
-предоставленный URI для доступа к данным каталога аналогично использованию URI,
-возвращаемых
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
-Access Framework</a>.</p>
-
-<p>Если пользователь не предоставляет доступ, система вызывает переопределенный метод
-<code>onActivityResult()</code> с кодом результата
-<code>Activity.RESULT_CANCELED</code> и отсутствующими данными намерения.</p>
-
-<p class="note"><b>Примечание.</b> При получении доступа к определенному внешнему каталогу
-приложение также получает доступ к вложенным в него каталогам.</p>
-
-<h2 id="removable">Доступ к каталогу на съемном носителе</h2>
-
-<p>Чтобы использовать доступ к выделенным каталогам на съемном носителе,
-сначала нужно добавить объект {@link android.content.BroadcastReceiver}, отслеживающий уведомления
-{@link android.os.Environment#MEDIA_MOUNTED}, например:</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Когда пользователь подключает съемный носитель, например SD-карту, система отправляет уведомление
-{@link android.os.Environment#MEDIA_MOUNTED}. Это уведомление
-предоставляет в данных намерения объект <code>StorageVolume</code>, который вы можете использовать
-для доступа к каталогам на съемном носителе. В следующем примере показано,
-как осуществляется доступ к каталогу <code>Pictures</code> на съемном носителе:</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">Советы и рекомендации</h2>
-
-<p>По возможности оставляйте постоянный URI для доступа к внешнему каталогу, чтобы приложению не
-приходилось многократно запрашивать у пользователя разрешение на доступ. После предоставления доступа пользователем вызовите метод
-<code>getContentResolver().takePersistableUriPermssion()</code> для
-URI доступа к каталогу. Система сохранит постоянный URI и при последующих запросах
-доступа будет возвращать ответ <code>RESULT_OK</code>. Таким образом, приложение не будет постоянно выводить
-окно с запросом подтверждения пользователя.</p>
-
-<p>Если пользователь запрещает доступ к внешнему каталогу, не нужно сразу
-же запрашивать доступ повторно. Пользователю может не понравиться, если приложение будет постоянно настаивать на
-получении доступа.</p>
diff --git a/docs/html-intl/intl/ru/preview/features/security-config.jd b/docs/html-intl/intl/ru/preview/features/security-config.jd
deleted file mode 100644
index de117d6..0000000
--- a/docs/html-intl/intl/ru/preview/features/security-config.jd
+++ /dev/null
@@ -1,745 +0,0 @@
-page.title=Конфигурация сетевой безопасности
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Содержание документа</h2>
-<ol>
- <li><a href="#manifest">Добавление файла конфигурации безопасности</a></li>
- <li><a href="#CustomTrust">Настройка доверенных ЦС</a>
- <ol>
- <li><a href="#ConfigCustom">Настройка доверенного пользовательского ЦС</a></li>
- <li><a href="#LimitingCas">Ограничение набора доверенных ЦС</a></li>
- <li><a href="#TrustingAdditionalCas">Добавление дополнительных ЦС в доверенные</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">ЦС для отладки</a></li>
- <li><a href="#UsesCleartextTraffic">Отказ от передачи данных открытым текстом</a></li>
- <li><a href="#CertificatePinning">Прикрепление сертификатов</a></li>
- <li><a href="#ConfigInheritance">Поведение при наследовании конфигурации</a></li>
- <li><a href="#FileFormat">Формат файла конфигурации</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- В Android N имеется функция "Конфигурация сетевой безопасности",
- позволяющая приложениям настраивать свои параметры сетевой безопасности в защищенном
- декларативном файле конфигурации без изменения программного кода приложения. Эти параметры можно
- настроить для определенных областей и приложений. Основные
- возможности этой функции:
-</p>
-
-<ul>
- <li>
- <b>Пользовательские якоря доверия.</b> Настройка доверенных центров сертификации (ЦС)
- для защищенных соединений приложения. Примером может служить
- настройка доверия определенным самозаверенным сертификатам или ограничение
- набора общих ЦС, которым доверяет приложение.
- </li>
-
- <li>
- <b>Замена при отладке.</b> Безопасная отладка защищенных соединений приложения
- без дополнительного риска для установленной базы.
- </li>
-
- <li>
- <b>Отказ от передачи данных открытым текстом.</b> Защита приложений от
- случайной передачи данных открытым текстом.
- </li>
-
- <li>
- <b>Прикрепление сертификатов.</b> Ограничение защищенных соединений приложения
- определенными сертификатами.
- </li>
-</ul>
-
-
-<h2 id="manifest">Добавление файла конфигурации безопасности</h2>
-
-<p>
- Функция конфигурации сетевой безопасности использует файл XML, где вы можете указать
- настройки своего приложения. Вы должны включить в манифест своего приложения
- запись, указывающую на этот файл. В следующем отрывке кода из манифеста
- показано, как создать такую запись:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-...
-<app ...>
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
-</app>
-</pre>
-
-<h2 id="CustomTrust">Настройка доверенных ЦС</h2>
-
-<p>
- Приложению может потребоваться возможность доверять пользовательскому набору центров сертификации (ЦС) вместо набора ЦС платформы, установленного по умолчанию.
- Наиболее распространенные причины:
-</p>
-
-<ul>
- <li>Подключение к узлу с пользовательским ЦС (самозаверенным,
- внутренним корпоративным ЦС и т. д.)
- </li>
-
- <li>Ограничение списка только доверенными ЦС вместо
- предустановленных.
- </li>
-
- <li>Добавление дополнительных ЦС, не установленных в системе, в список доверенных.
- </li>
-</ul>
-
-<p>
- По умолчанию защищенные соединения всех приложений (например, TLS, HTTPS) доверяют
- предустановленным системным ЦС, а приложения для API уровня 23
- (Android M) и ниже также по умолчанию доверяют ЦС, добавленным пользователем. Приложение
- может настраивать свои соединения, используя {@code base-config} (для
- настройки на уровне приложения) или {@code domain-config} (для настройки на уровне
- доменов).
-</p>
-
-
-<h3 id="ConfigCustom">Настройка пользовательского ЦС</h3>
-
-<p>
- Предположим, вы хотите подключиться к своему узлу, использующему самозаверенный сертификат SSL,
- или к узлу, чей сертификат SSL был выпущен закрытым ЦС,
- которому вы доверяете, например внутренним ЦС вашей компании.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Добавьте самозаверенный сертификат или сертификат закрытого ЦС в формате PEM или DER в
- {@code res/raw/my_ca}.
-</p>
-
-
-<h3 id="LimitingCas">Ограничение набора доверенных ЦС</h3>
-
-<p>
- Если приложению не нужно доверять всем ЦС, которым доверяет система, для него
- можно указать сокращенный набор доверенных ЦС. Это позволит защитить
- приложение от поддельных сертификатов, выпущенных любыми другими ЦС.
-</p>
-
-<p>
- Настройка ограниченного набора доверенных ЦС похожа на <a href="#TrustingACustomCa">настройку доверия пользовательскому ЦС</a> для определенного домена, за тем исключением,
- что в ресурсе указывается несколько ЦС.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Добавьте список доверенных ЦС в формате PEM или DER в {@code res/raw/trusted_roots}.
- Обратите внимание, что файл в формате PEM должен содержать <em>только</em> данные PEM
- без какого-либо дополнительного текста. Вы также можете указать несколько элементов
- <a href="#certificates"><code><certificates></code></a>
-вместо одного.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- Добавление дополнительных ЦС в доверенные
-</h3>
-
-<p>
- Приложению может потребоваться доверять дополнительным ЦС, которые не входят в список доверенных ЦС системы.
- Это может быть связано с тем, что эти ЦС еще не добавлены в систему или
- не соответствуют требованиям для включения в систему Android. Приложение
- может добавить такие ЦС в доверенные, указав несколько источников сертификатов для
- конфигурации.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">Настройка конфигурации ЦС для отладки</h2>
-
-<p>
- При отладке приложения, которое использует для подключения протокол HTTPS, вам может потребоваться
- подключение к локальному серверу разработки, у которого нет сертификата SSL
- для рабочего сервера. Чтобы выполнить отладку без изменения кода
- приложения, вы можете указать ЦС для отладки,
- которые входят в число доверенных, <i>только</i> если для параметра <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- установлено значение {@code true} с использованием {@code debug-overrides}. Обычно среды разработки и инструменты
- сборки устанавливают этот флаг автоматически для всех сборок, кроме выпускаемой версии.
-</p>
-
-<p>
- Такая схема работы более безопасна, чем использование обычного условного кода, поскольку в качестве
- меры предосторожности магазины приложений не принимают приложения, помеченные
- как доступные для отладки.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">Отказ от передачи данных открытым текстом</h2>
-
-<p>
- Приложения, которым нужно подключаться к узлам только через защищенные соединения,
- могут отказаться от поддержки передачи данных открытым текстом (с использованием нешифрованного протокола HTTP
- вместо HTTPS) на эти узлы. Эта возможность помогает предотвратить
- случайные неполадки в приложениях, связанные с изменениями URL-адресов, предоставленных внешними
- источниками, например, инфраструктурными серверами.
- Дополнительную информацию можно найти в описании метода {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()}.
-</p>
-
-<p>
- Например, приложение может потребовать обязательное использование протокола HTTPS для всех соединений с {@code
- secure.example.com}, чтобы защитить важный трафик
- от небезопасных сетей.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">Прикрепление сертификатов</h2>
-
-<p>
- Обычно приложение доверяет всем предустановленным ЦС. Если любой из этих ЦС выпустит
- поддельный сертификат, приложение подвергается риску атаки с перехватом данных.
- Некоторым приложениям требуется ограничить принимаемый набор сертификатов
- либо ограничением списка доверенных ЦС, либо прикреплением сертификатов.
-</p>
-
-<p>
- Прикрепление сертификатов осуществляется путем предоставления набора сертификатов через хэш
- открытого ключа (SubjectPublicKeyInfo сертификата X.509). В этом случае цепочка
- сертификатов будет действительна, только если она содержит хотя бы один
- прикрепленный открытый ключ.
-</p>
-
-<p>
- При использовании прикрепления сертификатов всегда необходимо добавлять резервный
- ключ, чтобы работа приложения не пострадала при необходимости перехода на новые ключи или смены ЦС (при
- прикреплении сертификата ЦС или посредника этого ЦС).
- Без резервного ключа для восстановления возможности подключения приложения потребуется срочно выпускать
- его обновление.
-</p>
-
-<p>
- Кроме того, существует возможность установить срок прикрепления, по истечении которого
- прикрепление не выполняется. Это помогает предотвратить проблемы с подключением
- приложений, которые не были обновлены. Однако установка срока действия
- прикреплений позволяет обойти их ограничения.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">Поведение при наследовании конфигурации</h2>
-
-<p>
- Значения, не установленные в определенной конфигурации, наследуются. Такое поведение позволяет создавать более
- сложные конфигурации, сохраняя при этом файл конфигурации в читаемом виде.
-</p>
-
-<p>
- Если в определенной записи не установлено значение, используется значение из следующей более общей записи.
- Значения, не установленные в {@code domain-config},
- берутся из родительского элемента {@code domain-config} в многоуровневых конфигурациях или из элемента {@code
- base-config} в простых конфигурациях. Для значений, не установленных в {@code base-config}, используются
- значения по умолчанию для платформы.
-</p>
-
-<p>
- Рассмотрим пример, где все соединения с доменами нижнего уровня {@code
- example.com} должны использовать пользовательский набор ЦС. Кроме того, для этих доменов разрешена
- передача данных открытым текстом, <em>кроме</em> случаев подключения к {@code
- secure.example.com}. При вложении конфигурации {@code
- secure.example.com} в конфигурацию {@code example.com} не требуется дублирование
- {@code trust-anchors}.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">Формат файла конфигурации</h2>
-
-<p>
- Функция конфигурации сетевой безопасности использует формат файлов XML.
- Общая структура файла показана в следующем примере кода:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- В следующих разделах содержится описание синтаксиса и других деталей формата
- файла.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- Может содержать:
- </dt>
-
- <dd>
- 0 или 1 <code><a href="#base-config"><base-config></a></code><br>
- Любое количество <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 или 1 <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- Синтаксис:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- Может содержать:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- Описание:
- </dt>
-
- <dd>
- Конфигурация по умолчанию, используемая всеми подключениями к узлам, не входящим в <a href="#domain-config"><code>domain-config</code></a>.
-
-
-<p>
- Если значения не установлены, используются значения по умолчанию для платформы. Конфигурация по умолчанию
- для приложений, использующих API уровня 24 или выше:
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-Конфигурация по умолчанию для приложений, использующих API уровня 23 или ниже:
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>Синтаксис:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>Может содержать:</dt>
-
-<dd>
-1 или более <code><a href="#domain"><domain></a></code>
-<br/>0 или 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 или 1 <code><a href="#pin-set"><pin-set></code></a>
-<br/>Любое количество вложенных <code><domain-config></code></dd>
-
-<dt>Описание</dt>
-<dd>Конфигурация, используемая для подключения к конкретным узлам, определенными элементами {@code domain}.
-
-<p>Если для узла назначения существует несколько элементов {@code domain-config}, используется правило для наиболее конкретного (самого длинного) совпадающего домена.
-</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- Синтаксис:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- Атрибуты:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- Если значение равно {@code "true"}, то правило домена соответствует указанному домену и всем доменам его
- нижних уровней. В противном случае правило действует
- только для полных совпадений.
- </dd>
- </dl>
- </dd>
-
- <dt>
- Описание:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- Синтаксис:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- Может содержать:
- </dt>
-
- <dd>
- 0 или 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- Описание:
- </dt>
-
- <dd>
- Переопределения применяются, когда параметр <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- имеет значение {@code "true"}, что обычно верно для промежуточных сборок,
- создаваемых средами разработки и инструментами сборки. Якоря доверия, указанные в {@code
- debug-overrides}, добавляются ко всем другим конфигурациям, и прикрепление
- сертификатов не выполняется, если цепочка сертификатов сервера использует один из этих
- якорей доверия, предназначенных только для отладки. Если параметр <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- имеет значение {@code "false"}, этот раздел полностью игнорируется.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- Синтаксис:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- Может содержать:
- </dt>
-
- <dd>
- Любое количество <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- Описание:
- </dt>
-
- <dd>
- Набор якорей доверия для защищенных соединений.
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>Синтаксис:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>Описание:</dt>
-<dd>Набор сертификатов X.509 для элементов {@code trust-anchors}.</dd>
-
-<dt>Атрибуты:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-Источник сертификатов ЦС может представлять собой
-<ul>
- <li>идентификатор исходного ресурса, указывающий на файл с сертификатами X.509.
- Сертификаты должны быть закодированы в формате DER или PEM. При использовании сертификатов PEM
- файл <em>не должен</em> содержать ничего, кроме данных PEM, например,
- комментариев.
- </li>
-
- <li>{@code "system"} для предустановленных в системе сертификатов ЦС
- </li>
-
- <li>{@code "user"} для добавленных пользователем сертификатов ЦС
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- Указывает, пропускается ли прикрепление сертификатов для ЦС из этого источника. Если значение равно {@code
- "true"}, то прикрепление сертификатов не выполняется для цепочек сертификатов, проходящих через один из ЦС этого
- источника. Это применяется для отладки ЦС
- или для разрешения пользователю перехватывать защищенный трафик вашего приложения.
- </p>
-
- <p>
- По умолчанию используется значение {@code "false"}, но если указан элемент {@code debug-overrides},
- то по умолчанию используется значение {@code "true"}.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- Синтаксис:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- Может содержать:
- </dt>
-
- <dd>
- Любое количество <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- Описание:
- </dt>
-
- <dd>
- Набор прикрепленных открытых ключей. Чтобы защищенное соединение было доверенным, один из
- открытых ключей в цепочке доверия должен входить в набор прикрепленных ключей. Формат ключей указан в
- <code><a href="#pin"><pin></a></code>.
- </dd>
-
- <dt>
- Атрибуты:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- Дата в формате {@code yyyy-MM-dd}, начиная с которой истекает срок прикрепления
- и оно отключается. Если этот атрибут не установлен,
- срок прикрепления не истекает.
- <p>
- Истечение срока прикрепления помогает предотвратить проблемы с подключением в приложениях, которые
- не получают обновления набора прикрепленных элементов, например в связи с тем, что пользователь
- отключил обновления приложений.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- Синтаксис:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- Атрибуты:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- Алгоритм хэширования, используемый для создания прикреплений. В настоящее время поддерживается только алгоритм
- {@code "SHA-256"}.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/ru/preview/overview.jd b/docs/html-intl/intl/ru/preview/overview.jd
deleted file mode 100644
index 303e9ce..0000000
--- a/docs/html-intl/intl/ru/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=Обзор программы
-page.metaDescription=Подготовьте свои приложения к выходу следующей версии Android.
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="предварительная версия", "разработчик", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- Добро пожаловать в программу <strong>Android N Developer Preview</strong>, участники
-которой получают все необходимое для тестирования и оптимизации
-своих приложений для следующей версии платформы Android. Участие в программе бесплатно, вам предоставляется возможность использовать
-инструменты N Developer Preview сразу же после их загрузки.
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- Образы для эмулятора и оборудования
- </h5>
-
- <p>
- Запустите и протестируйте свои приложения на широком спектре устройств или на эмуляторе.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Самый актуальный код платформы
- </h5>
-
- <p>
- Во время знакомства с предварительной версией платформы мы будем предоставлять ежемесячные обновления, поэтому вы сможете протестировать самые актуальные изменения в платформе.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Приоритетное исправление ошибок, зафиксированных разработчиками
- </h5>
-
- <p>
- В течение первых нескольких недель мы будем рассматривать отчеты об ошибках, поступающие от разработчиков, в приоритетном порядке,
-поэтому не теряйте времени и приступайте к тестированию и составлению отзывов как можно раньше.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- Новые возможности и новые функции
- </h5>
-
- <p>
- Заранее начните реализовывать в своих приложениях поддержку расширенной функциональности платформы.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Получение обновлений по беспроводной связи
- </h5>
-
- <p>
- Простое и удобное получение обновлений по беспроводной связи для поддерживаемых устройств в рамках программы бета-тестирования
-Android. Запись во флэш-память устройства не требуется.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Отзывы и поддержка
- </h5>
-
- <p>
- Отправляйте отзывы и сообщайте о проблемах с помощью нашей
-<a href="{@docRoot}preview/bug">системы отслеживания ошибок</a>. Общайтесь с другими
-разработчиками в
-<a href="{@docRoot}preview/dev-community">сообществе разработчиков для Android N</a>.
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">График и обновления</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- Срок действия программы N Developer Preview запланирован с 9 марта 2016 г. и до выпуска окончательной версии Android N
-для AOSP и OEM, который состоится в третьем квартале 2016 г.
-</p>
-
-<p>
- На ключевых этапах разработки платформы мы предоставим обновления для среды разработки и
-тестирования. Выход обновлений запланирован каждый месяц (с интервалом
-4-6 недель). Основные этапы показаны ниже.
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Предварительная версия 1</a></strong> (первоначальный выпуск, альфа-версия)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Предварительная версия 2</a></strong> (инкрементальное обновление, альфа-версия)</li>
- <li><strong>Предварительная версия 3</strong> (инкрементальное обновление, бета-версия)</li>
- <li><strong>Предварительная версия 4</strong> (окончательные версии API и официальный SDK, публикация в Google Play)</li>
- <li><strong>Предварительная версия 5</strong> (практически готовые системные образы для заключительного тестирования)</li>
- <li><strong>Выпуск окончательной версии</strong> в AOSP и экосистеме</li>
-</ul>
-
-<p>
- Каждое обновление включает инструменты SDK, системные образы предварительной версии, эмуляторы, справочную
-документацию и описание отличий в API.
-</p>
-
-<p>
- На <strong>первых трех ключевых этапах предварительной версии</strong> предоставляется <strong>начальная среда
-тестирования и разработки</strong>, которая позволяет выявить
-проблемы совместимости в текущих приложениях и спланировать миграцию или доработку функций,
-требуемых для новой платформы. В течение этого времени вы можете предоставлять
-отзывы о функциях и API, а также проблемах совместимости файлов
-с помощью <a href="{@docRoot}preview/bug">системы отслеживания
-ошибок</a>. Обновления могут включать некоторые изменения API.
-</p>
-
-<p>
- В <strong>предварительных версиях 4 и 5</strong> вам будет предоставлен доступ к <strong>окончательным
-версиям API-интерфейсов и SDK системы N</strong>, а также к практически готовым системным образам
-для тестирования работоспособности и возможностей системы. Android N будет содержать API
-стандартного уровня. Вы сможете начать заключительное тестирование совместимости старых
-приложений и отладить новый код, в котором используются API-интерфейсы или возможности системы N.
-</p>
-
-<p>
- Начиная с предварительной версии 4, вы сможете <strong>публиковать приложения на
-устройствах</strong> под управлением Android N, используя API-интерфейсы официального уровня, например на
-пользовательских устройствах, участвующих в программе бета-тестирования Android. Вы можете
-выполнить публикацию сначала на альфа- и бета-каналах Google Play для тестирования
-приложений с помощью пользователей бета-версии Android перед их размещением в
-магазине для общего доступа.
-</p>
-
-<p>
- Мы настоятельно рекомендуем вам в ходе тестирования и разработки приложений для Android N <strong>постоянно
-обновлять вашу среду разработки</strong> по мере выхода обновлений
-предварительной версии. Для упрощения процесса вы можете зарегистрировать тестовые устройства в программе
-бета-тестирования Android и получать <strong>обновления по беспроводной связи</strong> на
-каждом ключевом этапе. Кроме того, обновленные образы предварительной версии можно загрузить
-и записать во флэш-память устройства вручную.
-</p>
-
-<p>
- Мы будем сообщать о появлении обновлений предварительной версии в <a href="http://android-developers.blogspot.com/">блоге разработчиков Android</a>, а
-также на этом сайте и в <a href="{@docRoot}preview/dev-community">сообществе разработчиков для
-Android N</a>.
-</p>
-
-
-<h2 id="preview_tools">Состав программы N Developer Preview</h2>
-
-<p>
- N Developer Preview содержит все, что необходимо для тестирования ваших существующих
-приложений на экранах различных размеров, тестирования с использованием различных сетевых технологий, наборов микросхем ЦП и графических процессоров,
-а также различных архитектур оборудования.
-</p>
-
-<h3 id="sdk_tools">Инструменты SDK</h3>
-
-<p>С помощью менеджера SDK в <a href="{@docRoot}sdk/installing/adding-packages.html">Android Studio</a> вы сможете загрузить следующие компоненты:</p>
-
-<ul>
- <li> <strong>SDK и инструменты</strong> N Developer Preview;
- <li> <strong>системный образ эмулятора</strong> (32- и 64-разрядная версии) для N Developer Preview;
- <li> <strong>системный образ эмулятора для Android TV</strong> (32-разрядная версия) N Developer Preview;
- <li> поддерживаемые библиотеки N Developer Preview (для новых шаблонов приложений).
-</ul>
-
-<p>
- При необходимости мы предоставляем обновления инструментов разработки на каждом ключевом этапе.
-</p>
-
-<h3 id="hardware_system_images">Системные образы оборудования</h3>
-
-<p>
- N Developer Preview включает системные образы для Nexus и других устройств, которые можно использовать при
-тестировании и разработке на физических устройствах. См. полный список аппаратных образов на странице <a href="{@docRoot}preview/download.html">Образы устройств</a>.
-
-</p>
-
-<p>
- Мы будем предоставлять обновленные системные образы для этих устройств на каждом ключевом этапе. Вы
-также сможете загружать и записывать обновленные системные образы во флэш-память тестовых устройств
-вручную всегда, когда это будет необходимо. Это особенно удобно для автоматических
-сред тестирования, где может требоваться многократная перезапись в флэш-память
-устройства.
-</p>
-
-<p class="note"><strong>Примечание</strong>.
-<strong>В отличие от предварительной версии прошлого года, для устройств, запись во флэш-память которых выполнялась вручную, обновления по беспроводной связи предоставляться не будут</strong>.
-В этом году вы можете получать обновления по беспроводной связи, зарегистрировав устройства в программе
-бета-тестирования Android, см. подробные сведения в следующем разделе.
-</p>
-
-<h3 id="android_beta">Обновления по беспроводной связи в рамках программы бета-тестирования Android</h3>
-
-<p>
- Новой функцией Android N является программа получения обновлений по сети, которая автоматически
-предоставляет последние обновления предварительной версии Android N непосредственно на устройства, зарегистрированные
-в программе тестирования. Участие в программе бесплатно и доступно всем, кто имеет поддерживаемые устройства,
-привязанные к учетной записи Google.
-</p>
-
-<p>
- Для регистрации посетите веб-сайт <a href="https://g.co/androidbeta">программы бета-тестирования
-Android</a>. Вы увидите
-список всех устройств, привязанных к учетной записи, которые можно зарегистрировать
-в программе бета-тестирования Android.
-</p>
-
-<ol>
- <li> Выберите устройства, для которых требуется получать обновления Android N.
- <li> Нажмите Enroll, прочтите условия использования и подтвердите согласие с ними, затем нажмите OK.
-</ol>
-
-<p>
- После регистрации на устройство придет обновление. В большинстве случаев
-для перехода на Android N не требуется выполнять полный сброс конфигурационных данных, однако,
-рекомендуется выполнить резервное копирование важных данных перед
-регистрацией устройства в программе.
-</p>
-
-<p>
- При получении устройством обновлений рекомендуется загружать и
-устанавливать максимально быстро. Это требуется, чтобы быть в курсе
-последних изменений системного интерфейса, возможностей системы, особенностей API-интерфейсов и функций.
-</p>
-
-<p>
- По завершению программы тестирования Developer Preview на зарегистрированные устройства
-будет отправлено обновление с официальной версией Android N.
-</p>
-
-<p>
- Вы можете отменить регистрацию устройств в программе бета-тестирования Android в любое время на сайте
-программы. Перед отменой регистрации выполните резервное копирование данных на
-устройстве.
-</p>
-
- <p class="note"><strong>Примечание</strong>.
-При отмене регистрации <strong>на вашем устройстве выполняется восстановление заводских настроек</strong>
-для последней версии
-Android 6.0 Marshmallow (не обязательно той версии, которая
-была установлена до регистрации устройства). Для обеспечения правильности установки
-ваши данные будут удалены с устройства, включая контакты, сообщения,
-фотографии и др.
-</p>
-
-<h3 id="documentation_and_sample_code">Документация и примеры кода</h3>
-
-<p>
- Для ознакомления с Android N на сайте программы Developer Preview
-представлены следующие документы.
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Настройка в целях разработки для
-Android N</a> – содержит
-пошаговые инструкции по началу работы.</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">Обзор изменений в
-работе системы</a> – указывает ключевые области для тестирования.</li>
- <li> Документация по новым API-интерфейсам, включая <a href="{@docRoot}preview/api-overview.html">Обзор API</a>, доступный для загрузки
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочник по
-API</a> и подробные руководства для разработчиков, в которых освещаются такие ключевые возможности, как поддержка многооконного режима,
-группирование уведомлений, поддержка нескольких языковых настроек и др.
- <li> <a href="{@docRoot}preview/samples.html">Примеры кода</a>, где
-можно посмотреть реализацию поддержки разрешений доступа и других новых функций.
- <li> <a href="{@docRoot}preview/support.html#release-notes">Примечания к выпуску</a>
-для текущей версии N Developer Preview, включая информацию об изменениях и
-отчеты о различиях.
-</ul>
-
-<h4 id="reference">Справочник по API, доступный для загрузки</h4>
-
-<p>
- На этапе ранних обновлений предварительной версии вы сможете загрузить последний
-<a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочник по API
-для платформы Android N</a> в виде zip-архива. В нем также
-содержится отчет о различиях, позволяющий легко определить изменения в API-интерфейсах между
-API 23 и предыдущими версиями.
-</p>
-
-<p>
- После окончательного утверждения API-интерфейсов Android N и назначения официального уровня API,
-вам будет предоставлен онлайн-справочник по этому API-интерфейсу по адресу <a href="https://developer.android.com">https://developer.android.com</a>.
-</p>
-
-<h3 id="support_resources">
- Ресурсы поддержки
-</h3>
-
-<p>
- При тестировании и разработке приложений в рамках программы N Developer Preview используйте следующие каналы
-для отправки отчетов о проблемах и отзывов.
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">Система отслеживания ошибок
-в N Developer Preview</a> является <strong>основным каналом для отправки отзывов.</strong> С его помощью можно сообщать об ошибках, проблемах
-производительности и отправлять общие отзывы. Вы также сможете ознакомиться со списком
-<a href="{@docRoot}preview/bug">известных проблем</a> и
-выполнить поиск обходных путей для них. Мы будем держать вас в курсе по вашему вопросу после его сортировки и отправки
-на рассмотрение инженерам Android. </li>
- <li> <a href="{@docRoot}preview/dev-community">Сообщество разработчиков для Android N</a> – это
-сообщество Google+, где можно <strong>общаться с другими разработчиками</strong>, работающими с
-Android N. Делитесь в сообществе своими наблюдениями и идеями, а также находите ответы на
-вопросы об Android N. Мы будем просматривать ваши сообщения и предоставлять ответы
-и необходимые рекомендации.</li>
-</ul>
-
-<h3 id="targeting">Выбор целевого уровня, предварительные версии API и публикация приложений</h3>
-
-<p>
- Платформа N Developer Preview предоставляет ориентированные на разработку систему и библиотеку Android,
-в которых <strong>отсутствуют API-интерфейсы стандартного уровня</strong>. Если вы не хотите
-проверять свое приложение на совместимость (хотя мы настоятельно
-рекомендуем сделать это), выберите целевую предварительную версию Android N, задав для
-параметра <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code>
-своего приложения значение <code>“N”</code>.
-</p>
-
-<p>
- В Android N Developer Preview представлены <strong>предварительные версии API-интерфейсов</strong>.
-Они не будут официально публиковаться до выпуска окончательной версии пакета SDK,
-намеченного на третий квартал 2016 г. Это значит, что в
-<strong>API-интерфейсы могут вноситься небольшие изменения</strong>, особенно в первые недели после
-запуска программы. Мы будем предоставлять вам сводку об изменениях с каждым
-обновлением Android N Developer Preview.
-</p>
-
-<p class="note">
- <strong>Примечание</strong>. Несмотря на возможные изменения в предварительных версиях API-интерфейсов,
-соответствующие функциональные возможности системы работают стабильно и уже готовы для
-тестирования.
-</p>
-
-<p>
- Политика Google Play <strong>однозначно запрещает публикацию приложений, разработанных для N Developer
-Preview</strong>. Когда будет доступен окончательный SDK для Android N, вы сможете
-установить в качестве целевого API-интерфейс Android N официального уровня и опубликовать приложение в Google
-Play через альфа- и бета-каналы выпуска. Тем временем, если вы хотите распространить приложение, предназначенное для проверки под
-Android N, используйте для этого электронную почту или разместите такие приложения на своем сайте
-для прямой загрузки.
-</p>
-
-<p>
- После выхода полной версии Android N для AOSP и OEM, запланированного на третий квартал 2016 г.,
-можно будет публиковать приложения для Android N в общем доступе на
-Google Play.
-</p>
-
-
-<h2 id="how_to_get_started">Начало работы</h2>
-
-<p>
- Чтобы приступить к тестированию своего приложения в Android N, выполните следующие действия.
-</p>
-
-<ol>
- <li> Ознакомьтесь с <a href="{@docRoot}preview/api-overview.html">Обзором API</a>
-и сведениями об <a href="{@docRoot}preview/behavior-changes.html">изменениях в работе</a>, чтобы
-получить представление о новых возможностях платформы и о том, как это может повлиять на ваши приложения. В частности, узнайте подробнее
-о новых возможностях в отношении <a href="{@docRoot}preview/features/notification-updates.html">уведомлений</a> и
-<a href="{@docRoot}preview/features/multi-window.html">поддержки многооконного режима</a>.</li>
- <li> Настройте свою среду, руководствуясь инструкциями в документе <a href="{@docRoot}preview/setup-sdk.html">Настройка пакета SDK для предварительной версии</a>
-и рекомендациями по конфигурированию тестовых устройств.</li>
- <li> Соблюдайте <a href="https://developers.google.com/android/nexus/images">инструкции
-по записи во флэш-память</a> при выполнении записи системного образа Android N на устройство. </li>
- <li> Просмотрите <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Справочник по API</a>
-и <a href="{@docRoot}preview/samples.html">примеры кода Android N</a>, чтобы узнать больше
-о новых возможностях API-интерфейсов и о том, как использовать их в ваших приложениях.
- <li> Присоединяйтесь к <a href="{@docRoot}preview/dev-community">сообществу разработчиков
-Android N</a>, чтобы всегда быть в курсе последних новостей и общаться с другими
-разработчиками, работающими с новой платформой.</li>
-</ol>
-
-<p>
- Благодарим за участие в программе Android N Developer Preview!
-</p>
diff --git a/docs/html-intl/intl/ru/preview/samples.jd b/docs/html-intl/intl/ru/preview/samples.jd
deleted file mode 100644
index 1f674f3..0000000
--- a/docs/html-intl/intl/ru/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=Примеры
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- Следующие примеры кода представлены для Android N. Чтобы
-загрузить примеры в Android Studio, выберите в меню <b>File > Import
-Samples</b>.
-</p>
-
-<p class="note">
- <strong>Примечание.</strong> Эти загружаемые проекты предназначены для
-использования с Gradle и Android Studio.
-</p>
-
-
-<h3 id="mw">Многооконный режим</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- В данном примере показаны преимущества многооконного
-интерфейса для вашего приложения.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
-Загрузить с сайта GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">Активные уведомления</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- В этом ранее созданном примере показана простая служба, которая отправляет
-уведомления с помощью NotificationCompat. Каждое непрочитанное сообщение от пользователя
-отправляется отдельным уведомлением.
-</p>
-<p>
- Этот пример был обновлен с использованием новых функций уведомлений,
-доступных в Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
-Загрузить с сайта GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">Служба сообщений</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- В этом предварительно созданном примере показано, как использовать
-NotificationManager для определения количества уведомлений,
-отображаемого приложением.
-</p>
-<p>
- Этот пример был обновлен с использованием новых функций уведомлений,
-доступных в Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
-Загрузить с сайта GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">Режим Direct Boot</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- В данном примере показано как сохранять и считывать данные в зашифрованном
-хранилище, которое всегда доступно только на загруженном устройстве.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
-Загрузить с сайта GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">Доступ к выделенным каталогам</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- В данном примере показано, как выполнять чтение и запись данных из определенных
-каталогов при уменьшении числа требуемых разрешений.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
-Загрузить с сайта GitHub</a>
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ru/preview/setup-sdk.jd b/docs/html-intl/intl/ru/preview/setup-sdk.jd
deleted file mode 100644
index 6ae86e9..0000000
--- a/docs/html-intl/intl/ru/preview/setup-sdk.jd
+++ /dev/null
@@ -1,223 +0,0 @@
-page.title=Установка предварительной
-версииmeta.keywords="предварительная версия", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Установка Android Studio 2.1</a></li>
- <li><a href="#get-sdk">Установка Android N SDK</a>
- <ol>
- <li><a href="#docs-dl">Справочная документация</a>
- </ol>
- </li>
- <li><a href="#java8">Установка Java 8 JDK и JRE</a></li>
- <li><a href="#create-update">Обновление или создание проекта</a></li>
- <li><a href="#next">Дальнейшие действия</a></li>
-</ol>
- </div>
-</div>
-
-<p>Создание приложений для Android N Preview требует некоторых обновлений среды разработки,
-описанных в этом документе.</p>
-
-<p>Чтобы просто протестировать совместимость вашего приложения на системном образе
-Android N, следуйте рекомендациям руководства <a href="{@docRoot}preview/download.html">Тест на устройстве Android N</a>.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Установка Android Studio 2.1 (предварительная версия)</h2>
-
-<p>Платформа Android N добавляет поддержку <a href="{@docRoot}preview/j8-jack.html">возможностей языка Java 8</a>,
-которые требуют наличия нового компилятора, именуемого Jack. Последняя версия Jack
-в настоящее время поддерживается только в Android Studio 2.1. Поэтому если вы хотите использовать возможности
-языка Java 8 для
-разработки своего приложения, вам понадобится Android Studio 2.1. В противном случае вам не потребуется использовать компилятор Jack,
-однако все равно придется выполнить обновление до JDK 8 для компиляции под платформу Android N,
-как описано ниже.
-</p>
-
-<p>Предварительная версия Android Studio 2.1 в настоящее время доступна на канале обновлений Canary.
-Если у вас уже есть Android Studio
-и вы не хотите обновлять ее до версии канала Canary, вы можете загрузить
-Android Studio 2.1 для отдельной установки и использовать ее для разработки
-под Android N, не затрагивая основную среду Android Studio.
-</p>
-
-<p>Чтобы загрузить Android Studio 2.1 для отдельной установки, выполните следующие шаги
-(если вы хотите обновить существующую установку Android Studio до версии 2.1, начните с шага 4).
-</p>
-
-<ol>
- <li>Измените название существующей установки Android Studio, добавив к ней номер версии.
-Таким образом, при установке новая версия не заменит собой существующую.
-</li>
- <li>Загрузите соответствующий ZIP-архив для своей операционной системы со
-<a href="http://tools.android.com/download/studio/canary/latest">страницы загрузки канала Canary</a>.
- </li>
- <li>Разархивируйте пакет и переместите содержимое Android Studio 2.1 в подходящее
-место для приложений вашей системы, затем запустите программу установки.</li>
- <li>Откройте окно "Settings"
-(<strong>File > Settings</strong> для Windows/Linux, или
-<strong>Android Studio > Preferences</strong> для Mac). В левой
-панели выберите <strong>Appearance & Behavior > System Settings >
-Updates</strong>.
- </li>
- <li>На панели "Updates" установите флажок <strong>Automatically
-check updates for</strong> и выберите
-<strong>Canary Channel</strong> в выпадающем списке.
- </li>
-</ol>
-
-<p>Оставьте это окно настроек открытым для следующего шага.</p>
-
-
-<h2 id="get-sdk">Установка N Preview SDK</h2>
-
-<p>Чтобы начать разработку с использованием API-интерфейсов Android N, необходимо установить
-Android N Preview SDK в Android Studio, выполнив следующие шаги.</p>
-
-<ol>
- <li>На открытой панели "Updates" (шаг 4 выше)
-установите флажок <strong>Automatically
-check updates for Android SDK</strong> и выберите
-<strong>Preview Channel</strong> в выпадающем списке.
- </li>
- <li>Щелкните <strong>Check Now</strong>.</li>
-
- <li>В левой панели выберите <strong>Appearance & Behavior > System
-Settings > Android SDK</strong>.
-
- <li>Выберите вкладку <strong>SDK Platforms</strong> и установите флажок
-<strong>Android N Preview</strong>.</li>
-
- <li>Откройте вкладку <strong>SDK Tools</strong> и установите флажки
-<strong>Android SDK Build Tools</strong>, <strong>Android SDK
-Platform-Tools</strong> и <strong>Android SDK Tools</strong>.
-
- </li>
-
- <li>Нажмите <strong>OK</strong> и примите лицензионные
-соглашения для всех устанавливаемых пакетов.
- </li>
-</ol>
-
-<h3 id="docs-dl">Загрузка справочной документации по N Preview</h3>
-
-<p>
- Подробная информация по API-интерфейсам Android N содержится в справочной документации N Preview,
-которую можно загрузить из следующей таблицы.
-Этот пакет содержит сокращенную автономную версию веб-сайта для разработчиков Android
-и включает в себя обновленный справочник по API-интерфейсам Android N, а также сведения о различиях
-API.
-</p>
-
-<table>
- <tr>
- <th scope="col">Документация</th>
- <th scope="col">Контрольные суммы</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-1-docs.zip">n-preview-1-docs.zip</a></td>
- <td width="100%">
- MD5: 4ab33ccbe698f46f125cc5b807cf9c2f<br>
- SHA-1: 6a3880b3ccd19614daae5a4d0698ea6ae11c20a5
- </td>
- </tr>
-</table>
-
-
-
-<h2 id="java8">Установка Java 8 JDK и JRE</h2>
-
-<p>Чтобы скомпилировать ваше приложение для платформы Android N, необходимо использовать
-Java 8 Developer Kit (JDK 8), а для использования некоторых инструментов с Android
-Studio 2.1 необходимо установить Java 8 Runtime Environment (JRE 8). Поэтому если у вас еще
-нет последних версий каждого из этих пакетов, загрузите JDK 8 и JRE 8
-прямо сейчас.</p>
-
-<p>Установите версию JDK в Android Studio, выполнив следующие шаги.</p>
-
-<ol>
- <li>Откройте проект Android в Android Studio, затем откройте
-окно "Project Structure", выбрав <strong>File > Project
-Structure</strong>. (Вы также можете установить структуру по умолчанию для всех проектов,
-выбрав <strong>File > Other Settings > Default Project Structure</strong>).
-
- </li>
- <li>В левой панели окна щелкните <strong>SDK Location</strong>.
- </li>
- <li>В поле <strong>JDK Location</strong> укажите расположение
-Java 8 JDK (нажмите кнопку справа
-для просмотра своих файлов), затем нажмите <strong>OK</strong>.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">Обновление или создание проекта</h2>
-
-<p>
- Для использования API-интерфейсов Android N ваш проект должен быть сконфигурирован соответствующим образом.
-</p>
-
-<p>Если вы планируете использовать возможности языка Java 8, ознакомьтесь в документе
-<a href="{@docRoot}preview/j8-jack.html">Возможности языка Java 8</a>
-с информацией о поддерживаемых возможностях Java 8 и о настройке
-проекта с компилятором Jack.</p>
-
-
-<h3 id="update">Обновление существующего проекта</h3>
-
-<p>Откройте файл
-<code>build.gradle</code> для своего модуля и укажите в нем следующие значения:
-
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc1'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">Создание нового проекта</h3>
-
-
-<p>Чтобы создать новый проект разработки с использованием Android N Preview SDK выполните следующие действия.</p>
-
-<ol>
- <li>Выберите <strong>File > New Project</strong> и выполняйте указания, пока не перейдете на страницу
-"Target Android Devices".
- </li>
- <li>На этой странице выберите вариант <strong>Phone and Tablet</strong>.</li>
- <li>В разделе <strong>Phone and Tablet</strong> перейдите в список <strong>Minimum
-SDK</strong> и выберите
-<strong>N: Android API 23, N Preview (Preview)</strong>.</li>
-</ol>
-
-
-<h2 id="next">Дальнейшие действия</h2>
-
-<ul>
- <li>Выполните рекомендации руководства <a href="{@docRoot}preview/download.html">Тест на устройстве Android N</a>.</li>
- <li>Более подробную информацию о платформе Android N можно найти в документе
-<a href="{@docRoot}preview/behavior-changes.html">Изменения в работе</a>
-и в описании <a href="{@docRoot}preview/api-overview.html">API-интерфейсов и возможностей Android N</a>.
-</li>
-</ul>
diff --git a/docs/html-intl/intl/ru/training/articles/direct-boot.jd b/docs/html-intl/intl/ru/training/articles/direct-boot.jd
new file mode 100644
index 0000000..3392c13
--- /dev/null
+++ b/docs/html-intl/intl/ru/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=Режим Direct Boot
+page.keywords=preview,sdk,direct boot
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Содержание документа</h2>
+ <ol>
+ <li><a href="#run">Запрос доступа для запуска в режиме Direct Boot</a></li>
+ <li><a href="#access">Доступ к шифрованному хранилищу данных устройства</a></li>
+ <li><a href="#notification">Уведомление о разблокировке пользователем</a></li>
+ <li><a href="#migrating">Перенос имеющихся данных</a></li>
+ <li><a href="#testing">Тестирование приложения с поддержкой шифрования</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Android N работает в защищенном режиме <i>Direct Boot,</i> когда
+устройство было включено, но не разблокировано пользователем.
+ Для поддержки такого режима работы в системе имеется два хранилища данных:</p>
+
+<ul>
+<li><i>Хранилище, зашифрованное на уровне учетных данных.</i>Это хранилище используется по умолчанию
+и доступно только тогда, когда пользователь разблокирует устройство.</li>
+<li><i>Хранилище, зашифрованное на уровне устройства.</i>Это хранилище доступно в режиме
+Direct Boot и тогда, когда пользователь разблокирует устройство.</li>
+</ul>
+
+<p>По умолчанию в режиме Direct Boot приложения не работают.
+Если вашему приложению требуется выполнять какие-то действия в режиме Direct Boot, вы можете зарегистрировать
+компоненты приложения, которые должны быть запущены в этом режиме. Некоторые распространенные примеры использования
+приложений, выполняющих операции в режиме Direct Boot:</p>
+
+<ul>
+<li>Приложения с уведомлениями по расписанию, например,
+будильники.</li>
+<li>Приложения, посылающие пользователю важные уведомления, например, приложения СМС.</li>
+<li>Приложения для лиц с ограниченными возможностями, например, Talkback.</li>
+</ul>
+
+<p>Если вашему приложению требуется доступ к данным в режиме Direct Boot, используйте
+шифрованное хранилище устройства. Шифрованное хранилище устройства содержит данные,
+зашифрованные с помощью ключа, доступного только после
+успешной подтвержденной загрузки устройства.</p>
+
+<p>Если данные следует шифровать с помощью ключа, связанного с учетными данными
+пользователя (например, с PIN-кодом или паролем), используйте хранилище, требующее ввода учетных данных.
+Такое хранилище доступно только после успешной
+разблокировки устройства пользователем и до тех пор, пока пользователь не перезапустит устройство. Если
+пользователь включает экран блокировки после разблокировки устройства, шифрованное хранилище,
+требующее ввода учетных данных, не блокируется.</p>
+
+<h2 id="run">Запрос доступа для запуска в режиме Direct Boot</h2>
+
+<p>Прежде
+чем работать в режиме Direct Boot или получать доступ к шифрованному
+хранилищу устройства, приложения должны зарегистрировать свои компоненты в системе. Приложения регистрируются в системе, помечая компоненты как
+<i>поддерживающие шифрование</i>. Чтобы пометить компонент как поддерживающий шифрование, нужно установить для атрибута
+<code>android:encryptionAware</code> в манифесте значение true.<p>
+
+<p>Компоненты, поддерживающие шифрование, можно регистрировать для получения
+<code>LOCKED_BOOT_COMPLETED</code> широковещательных сообщений от
+системы после перезапуска устройства. В этот момент шифрованное хранилище устройства
+доступно, и компонент может выполнять необходимые задачи в режиме
+Direct Boot, например, включать будильник по расписанию.</p>
+
+<p>В следующем фрагменте кода приведен пример регистрации компонента
+{@link android.content.BroadcastReceiver} как поддерживающего шифрование и добавления
+фильтра намерения <code>LOCKED_BOOT_COMPLETED</code> в манифест приложения:</p>
+
+<pre>
+<receiever
+ android:encryptionAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>После разблокировки устройства пользователем все компоненты имеют доступ к шифрованному хранилищу устройства
+и к шифрованному хранилищу, требующему ввода учетных данных.</p>
+
+<h2 id="access">Доступ к шифрованному хранилищу данных устройства</h2>
+
+<p>Для получения доступа к шифрованному хранилищу устройства следует создать второй экземпляр
+{@link android.content.Context} посредством вызова
+<code>Context.createDeviceEncryptedStorageContext()</code>. Все вызовы API
+системы хранения данных с использованием этого контекста получают доступ к шифрованному хранилищу устройства. В
+следующем примере показано, как получить доступ к шифрованному хранилищу устройства и открыть существующий
+файл данных приложения:</p>
+
+<pre>
+Context directBootContext = Context.createDeviceEncryptedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>Шифрованное хранилище устройства следует использовать только для
+информации, которая должна быть доступна в режиме Direct Boot.
+Шифрованное хранилище устройства не следует использовать в качестве шифрованного хранилища общего назначения.
+Для хранения данных пользователя или шифрованных данных, которые не требуются в режиме
+Direct Boot, следует использовать шифрованное хранилище, требующее ввода учетных данных.</p>
+
+<h2 id="notification">Уведомление о разблокировке пользователем</h2>
+
+<p>Когда после перезагрузки устройства пользователь разблокирует его, ваше приложение может переключиться на
+шифрованное хранилище, требующее ввода учетных данных, и использовать обычные системные службы,
+зависящие от учетных данных пользователя.</p>
+
+<p>Чтобы приложение получало уведомления о разблокировке устройства пользователем после перезагрузки,
+необходимо зарегистрировать {@link android.content.BroadcastReceiver} работающего компонента
+для отслеживания сообщения <code>ACTION_USER_UNLOCKED</code>. Также приложение может
+получать существующее сообщение {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED}, которое теперь указывает, что устройство загружено и разблокировано
+пользователем.</p>
+
+<p>Приложение может направлять запрос напрямую, если пользователь разблокирует устройство посредством вызова
+<code>UserManager.isUserUnlocked()</code>.</p>
+
+<h2 id="migrating">Перенос имеющихся данных</h2>
+
+<p>Если пользователь обновит свое устройство для использования режима Direct Boot, вашему приложению может потребоваться перенести
+имеющиеся данные в шифрованное хранилище устройства. Используйте
+<code>Context.migrateSharedPreferencesFrom()</code> и
+<code>Context.migrateDatabaseFrom()</code> для переноса данных о настройках и содержимого баз данных
+между шифрованным хранилищем, требующим ввода учетных данных, и шифрованным хранилищем устройства.</p>
+
+<p>Хорошо обдумайте, какие данные следует перенести из
+шифрованного хранилища, требующего ввода учетных данных, в шифрованное хранилище устройства. Не следует переносить в
+шифрованное хранилище устройства личные данные пользователя, такие как
+пароли или токены авторизации. В некоторых случаях вашему приложению может потребоваться работать
+с отдельными наборами данных в двух шифрованных хранилищах.</p>
+
+<h2 id="testing">Тестирование приложения с поддержкой шифрования</h2>
+
+<p>Протестируйте свое приложение с поддержкой шифрования в новом режиме Direct Boot. Существуют
+два способа включить режим Direct Boot.</p>
+
+<p class="caution"><strong>Внимание!</strong> При включении режима Direct Boot
+с устройства удаляются все данные пользователя.</p>
+
+<p>Чтобы включить режим
+Direct Boot на поддерживаемых устройствах с Android N, выполните одну из следующих последовательностей действий.</p>
+
+<ul>
+<li>Включите на устройстве параметры разработчика <b>Developer options</b>, если вы еще не сделали этого ранее. Для этого
+перейдите на экран <b>Settings > About phone</b> и нажмите семь раз <b>Build number</b>.
+ Когда параметры разработчика станут доступны, откройте раздел
+<b>Settings > Developer options</b> и выберите
+<b>Convert to file encryption</b>.</li>
+<li>Используйте следующие команды оболочки adb для включения режима Direct Boot:
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>Если вам требуется переключать
+режимы на тестовых устройствах, вы можете использовать эмуляцию режима Direct Boot. Режим эмуляции следует использовать только для целей
+разработки, в нем возможна потеря данных. Чтобы включить эмуляцию режима Direct Boot,
+установите режим блокировки устройства, выберите пункт "No thanks", если система предлагает открыть
+защищенный экран запуска при установке режима блокировки, а затем используйте
+следующую команду оболочки adb:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>Для отключения эмуляции режима Direct Boot нужно использовать следующую команду:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>При использовании этих команд устройство перезагружается.</p>
diff --git a/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..f70c92c
--- /dev/null
+++ b/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd
@@ -0,0 +1,124 @@
+page.title=Доступ к выделенным каталогам
+page.keywords=preview,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Содержание документа</h2>
+ <ol>
+ <li><a href="#accessing">Доступ к каталогу во внешнем хранилище</a></li>
+ <li><a href="#removable">Доступ к каталогу на съемном носителе</a></li>
+ <li><a href="#best">Советы и рекомендации</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Некоторым приложениям (например, фотоприложениям) обычно требуется доступ только к отдельным каталогам
+внешнего хранилища, например, к каталогу <code>Pictures</code>. Существующие
+методы доступа к внешним хранилищам не предназначены для обеспечения приложениям такого типа удобного
+доступа к выделенным каталогам. Например:</p>
+
+<ul>
+<li>Запросы {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+или {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} в манифесте
+разрешают доступ ко всем общедоступным каталогам внешнего хранилища, хотя
+вашему приложению может не требоваться такой уровень доступа.</li>
+<li>При использовании инфраструктуры
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+Access Framework</a> пользователь обычно выбирает каталоги через
+системный пользовательский интерфейс, что не требуется, если приложение всегда использует один
+и тот же внешний каталог.</li>
+</ul>
+
+<p>Android N предоставляет новый упрощенный API для доступа
+к распространенным каталогам внешнего хранилища. </p>
+
+<h2 id="accessing">Доступ к каталогу во внешнем хранилище</h2>
+
+<p>Используйте класс <code>StorageManager</code> для получения соответствующего экземпляра
+<code>StorageVolume</code>. Затем создайте намерение, вызвав метод
+<code>StorageVolume.createAccessIntent()</code> этого экземпляра.
+Используйте это намерение для доступа к каталогам внешнего хранилища. Чтобы получить список
+всех доступных томов, в том числе томов на съемных носителях, используйте
+<code>StorageManager.getVolumesList()</code>.</p>
+
+<p>В следующем фрагменте кода приведен пример того, как открывать каталог
+<code>Pictures</code> в главном общем хранилище:</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>Система пытается предоставить доступ к внешнему каталогу и, при необходимости,
+запрашивает подтверждение доступа у пользователя с помощью упрощенного пользовательского интерфейса:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>Рисунок 1.</strong> Приложение запрашивает
+доступ к каталогу Pictures.</p>
+
+<p>Если пользователь предоставляет доступ, система вызывает переопределенный метод
+<code>onActivityResult()</code> с кодом результата
+<code>Activity.RESULT_OK</code>, а также данные намерения, содержащие URI. Используйте
+предоставленный URI для доступа к данным каталога аналогично использованию URI,
+возвращаемых
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+Access Framework</a>.</p>
+
+<p>Если пользователь не предоставляет доступ, система вызывает переопределенный метод
+<code>onActivityResult()</code> с кодом результата
+<code>Activity.RESULT_CANCELED</code> и отсутствующими данными намерения.</p>
+
+<p class="note"><b>Примечание.</b> При получении доступа к определенному внешнему каталогу
+приложение также получает доступ к вложенным в него каталогам.</p>
+
+<h2 id="removable">Доступ к каталогу на съемном носителе</h2>
+
+<p>Чтобы использовать доступ к выделенным каталогам на съемном носителе,
+сначала нужно добавить объект {@link android.content.BroadcastReceiver}, отслеживающий уведомления
+{@link android.os.Environment#MEDIA_MOUNTED}, например:</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Когда пользователь подключает съемный носитель, например SD-карту, система отправляет уведомление
+{@link android.os.Environment#MEDIA_MOUNTED}. Это уведомление
+предоставляет в данных намерения объект <code>StorageVolume</code>, который вы можете использовать
+для доступа к каталогам на съемном носителе. В следующем примере показано,
+как осуществляется доступ к каталогу <code>Pictures</code> на съемном носителе:</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">Советы и рекомендации</h2>
+
+<p>По возможности оставляйте постоянный URI для доступа к внешнему каталогу, чтобы приложению не
+приходилось многократно запрашивать у пользователя разрешение на доступ. После предоставления доступа пользователем вызовите метод
+<code>getContentResolver().takePersistableUriPermssion()</code> для
+URI доступа к каталогу. Система сохранит постоянный URI и при последующих запросах
+доступа будет возвращать ответ <code>RESULT_OK</code>. Таким образом, приложение не будет постоянно выводить
+окно с запросом подтверждения пользователя.</p>
+
+<p>Если пользователь запрещает доступ к внешнему каталогу, не нужно сразу
+же запрашивать доступ повторно. Пользователю может не понравиться, если приложение будет постоянно настаивать на
+получении доступа.</p>
diff --git a/docs/html-intl/intl/ru/training/articles/security-config.jd b/docs/html-intl/intl/ru/training/articles/security-config.jd
new file mode 100644
index 0000000..dee9b77b
--- /dev/null
+++ b/docs/html-intl/intl/ru/training/articles/security-config.jd
@@ -0,0 +1,745 @@
+page.title=Конфигурация сетевой безопасности
+page.keywords=androidn,security,network
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Содержание документа</h2>
+<ol>
+ <li><a href="#manifest">Добавление файла конфигурации безопасности</a></li>
+ <li><a href="#CustomTrust">Настройка доверенных ЦС</a>
+ <ol>
+ <li><a href="#ConfigCustom">Настройка доверенного пользовательского ЦС</a></li>
+ <li><a href="#LimitingCas">Ограничение набора доверенных ЦС</a></li>
+ <li><a href="#TrustingAdditionalCas">Добавление дополнительных ЦС в доверенные</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">ЦС для отладки</a></li>
+ <li><a href="#UsesCleartextTraffic">Отказ от передачи данных открытым текстом</a></li>
+ <li><a href="#CertificatePinning">Прикрепление сертификатов</a></li>
+ <li><a href="#ConfigInheritance">Поведение при наследовании конфигурации</a></li>
+ <li><a href="#FileFormat">Формат файла конфигурации</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ В Android N имеется функция "Конфигурация сетевой безопасности",
+ позволяющая приложениям настраивать свои параметры сетевой безопасности в защищенном
+ декларативном файле конфигурации без изменения программного кода приложения. Эти параметры можно
+ настроить для определенных областей и приложений. Основные
+ возможности этой функции:
+</p>
+
+<ul>
+ <li>
+ <b>Пользовательские якоря доверия.</b> Настройка доверенных центров сертификации (ЦС)
+ для защищенных соединений приложения. Примером может служить
+ настройка доверия определенным самозаверенным сертификатам или ограничение
+ набора общих ЦС, которым доверяет приложение.
+ </li>
+
+ <li>
+ <b>Замена при отладке.</b> Безопасная отладка защищенных соединений приложения
+ без дополнительного риска для установленной базы.
+ </li>
+
+ <li>
+ <b>Отказ от передачи данных открытым текстом.</b> Защита приложений от
+ случайной передачи данных открытым текстом.
+ </li>
+
+ <li>
+ <b>Прикрепление сертификатов.</b> Ограничение защищенных соединений приложения
+ определенными сертификатами.
+ </li>
+</ul>
+
+
+<h2 id="manifest">Добавление файла конфигурации безопасности</h2>
+
+<p>
+ Функция конфигурации сетевой безопасности использует файл XML, где вы можете указать
+ настройки своего приложения. Вы должны включить в манифест своего приложения
+ запись, указывающую на этот файл. В следующем отрывке кода из манифеста
+ показано, как создать такую запись:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+...
+<app ...>
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+</app>
+</pre>
+
+<h2 id="CustomTrust">Настройка доверенных ЦС</h2>
+
+<p>
+ Приложению может потребоваться возможность доверять пользовательскому набору центров сертификации (ЦС) вместо набора ЦС платформы, установленного по умолчанию.
+ Наиболее распространенные причины:
+</p>
+
+<ul>
+ <li>Подключение к узлу с пользовательским ЦС (самозаверенным,
+ внутренним корпоративным ЦС и т. д.)
+ </li>
+
+ <li>Ограничение списка только доверенными ЦС вместо
+ предустановленных.
+ </li>
+
+ <li>Добавление дополнительных ЦС, не установленных в системе, в список доверенных.
+ </li>
+</ul>
+
+<p>
+ По умолчанию защищенные соединения всех приложений (например, TLS, HTTPS) доверяют
+ предустановленным системным ЦС, а приложения для API уровня 23
+ (Android M) и ниже также по умолчанию доверяют ЦС, добавленным пользователем. Приложение
+ может настраивать свои соединения, используя {@code base-config} (для
+ настройки на уровне приложения) или {@code domain-config} (для настройки на уровне
+ доменов).
+</p>
+
+
+<h3 id="ConfigCustom">Настройка пользовательского ЦС</h3>
+
+<p>
+ Предположим, вы хотите подключиться к своему узлу, использующему самозаверенный сертификат SSL,
+ или к узлу, чей сертификат SSL был выпущен закрытым ЦС,
+ которому вы доверяете, например внутренним ЦС вашей компании.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Добавьте самозаверенный сертификат или сертификат закрытого ЦС в формате PEM или DER в
+ {@code res/raw/my_ca}.
+</p>
+
+
+<h3 id="LimitingCas">Ограничение набора доверенных ЦС</h3>
+
+<p>
+ Если приложению не нужно доверять всем ЦС, которым доверяет система, для него
+ можно указать сокращенный набор доверенных ЦС. Это позволит защитить
+ приложение от поддельных сертификатов, выпущенных любыми другими ЦС.
+</p>
+
+<p>
+ Настройка ограниченного набора доверенных ЦС похожа на <a href="#TrustingACustomCa">настройку доверия пользовательскому ЦС</a> для определенного домена, за тем исключением,
+ что в ресурсе указывается несколько ЦС.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Добавьте список доверенных ЦС в формате PEM или DER в {@code res/raw/trusted_roots}.
+ Обратите внимание, что файл в формате PEM должен содержать <em>только</em> данные PEM
+ без какого-либо дополнительного текста. Вы также можете указать несколько элементов
+ <a href="#certificates"><code><certificates></code></a>
+вместо одного.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ Добавление дополнительных ЦС в доверенные
+</h3>
+
+<p>
+ Приложению может потребоваться доверять дополнительным ЦС, которые не входят в список доверенных ЦС системы.
+ Это может быть связано с тем, что эти ЦС еще не добавлены в систему или
+ не соответствуют требованиям для включения в систему Android. Приложение
+ может добавить такие ЦС в доверенные, указав несколько источников сертификатов для
+ конфигурации.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">Настройка конфигурации ЦС для отладки</h2>
+
+<p>
+ При отладке приложения, которое использует для подключения протокол HTTPS, вам может потребоваться
+ подключение к локальному серверу разработки, у которого нет сертификата SSL
+ для рабочего сервера. Чтобы выполнить отладку без изменения кода
+ приложения, вы можете указать ЦС для отладки,
+ которые входят в число доверенных, <i>только</i> если для параметра <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ установлено значение {@code true} с использованием {@code debug-overrides}. Обычно среды разработки и инструменты
+ сборки устанавливают этот флаг автоматически для всех сборок, кроме выпускаемой версии.
+</p>
+
+<p>
+ Такая схема работы более безопасна, чем использование обычного условного кода, поскольку в качестве
+ меры предосторожности магазины приложений не принимают приложения, помеченные
+ как доступные для отладки.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">Отказ от передачи данных открытым текстом</h2>
+
+<p>
+ Приложения, которым нужно подключаться к узлам только через защищенные соединения,
+ могут отказаться от поддержки передачи данных открытым текстом (с использованием нешифрованного протокола HTTP
+ вместо HTTPS) на эти узлы. Эта возможность помогает предотвратить
+ случайные неполадки в приложениях, связанные с изменениями URL-адресов, предоставленных внешними
+ источниками, например, инфраструктурными серверами.
+ Дополнительную информацию можно найти в описании метода {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()}.
+</p>
+
+<p>
+ Например, приложение может потребовать обязательное использование протокола HTTPS для всех соединений с {@code
+ secure.example.com}, чтобы защитить важный трафик
+ от небезопасных сетей.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">Прикрепление сертификатов</h2>
+
+<p>
+ Обычно приложение доверяет всем предустановленным ЦС. Если любой из этих ЦС выпустит
+ поддельный сертификат, приложение подвергается риску атаки с перехватом данных.
+ Некоторым приложениям требуется ограничить принимаемый набор сертификатов
+ либо ограничением списка доверенных ЦС, либо прикреплением сертификатов.
+</p>
+
+<p>
+ Прикрепление сертификатов осуществляется путем предоставления набора сертификатов через хэш
+ открытого ключа (SubjectPublicKeyInfo сертификата X.509). В этом случае цепочка
+ сертификатов будет действительна, только если она содержит хотя бы один
+ прикрепленный открытый ключ.
+</p>
+
+<p>
+ При использовании прикрепления сертификатов всегда необходимо добавлять резервный
+ ключ, чтобы работа приложения не пострадала при необходимости перехода на новые ключи или смены ЦС (при
+ прикреплении сертификата ЦС или посредника этого ЦС).
+ Без резервного ключа для восстановления возможности подключения приложения потребуется срочно выпускать
+ его обновление.
+</p>
+
+<p>
+ Кроме того, существует возможность установить срок прикрепления, по истечении которого
+ прикрепление не выполняется. Это помогает предотвратить проблемы с подключением
+ приложений, которые не были обновлены. Однако установка срока действия
+ прикреплений позволяет обойти их ограничения.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">Поведение при наследовании конфигурации</h2>
+
+<p>
+ Значения, не установленные в определенной конфигурации, наследуются. Такое поведение позволяет создавать более
+ сложные конфигурации, сохраняя при этом файл конфигурации в читаемом виде.
+</p>
+
+<p>
+ Если в определенной записи не установлено значение, используется значение из следующей более общей записи.
+ Значения, не установленные в {@code domain-config},
+ берутся из родительского элемента {@code domain-config} в многоуровневых конфигурациях или из элемента {@code
+ base-config} в простых конфигурациях. Для значений, не установленных в {@code base-config}, используются
+ значения по умолчанию для платформы.
+</p>
+
+<p>
+ Рассмотрим пример, где все соединения с доменами нижнего уровня {@code
+ example.com} должны использовать пользовательский набор ЦС. Кроме того, для этих доменов разрешена
+ передача данных открытым текстом, <em>кроме</em> случаев подключения к {@code
+ secure.example.com}. При вложении конфигурации {@code
+ secure.example.com} в конфигурацию {@code example.com} не требуется дублирование
+ {@code trust-anchors}.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">Формат файла конфигурации</h2>
+
+<p>
+ Функция конфигурации сетевой безопасности использует формат файлов XML.
+ Общая структура файла показана в следующем примере кода:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ В следующих разделах содержится описание синтаксиса и других деталей формата
+ файла.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ Может содержать:
+ </dt>
+
+ <dd>
+ 0 или 1 <code><a href="#base-config"><base-config></a></code><br>
+ Любое количество <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 или 1 <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ Синтаксис:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ Может содержать:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ Описание:
+ </dt>
+
+ <dd>
+ Конфигурация по умолчанию, используемая всеми подключениями к узлам, не входящим в <a href="#domain-config"><code>domain-config</code></a>.
+
+
+<p>
+ Если значения не установлены, используются значения по умолчанию для платформы. Конфигурация по умолчанию
+ для приложений, использующих API уровня 24 или выше:
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+Конфигурация по умолчанию для приложений, использующих API уровня 23 или ниже:
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>Синтаксис:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>Может содержать:</dt>
+
+<dd>
+1 или более <code><a href="#domain"><domain></a></code>
+<br/>0 или 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 или 1 <code><a href="#pin-set"><pin-set></code></a>
+<br/>Любое количество вложенных <code><domain-config></code></dd>
+
+<dt>Описание</dt>
+<dd>Конфигурация, используемая для подключения к конкретным узлам, определенными элементами {@code domain}.
+
+<p>Если для узла назначения существует несколько элементов {@code domain-config}, используется правило для наиболее конкретного (самого длинного) совпадающего домена.
+</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ Синтаксис:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ Атрибуты:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ Если значение равно {@code "true"}, то правило домена соответствует указанному домену и всем доменам его
+ нижних уровней. В противном случае правило действует
+ только для полных совпадений.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ Описание:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ Синтаксис:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ Может содержать:
+ </dt>
+
+ <dd>
+ 0 или 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ Описание:
+ </dt>
+
+ <dd>
+ Переопределения применяются, когда параметр <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ имеет значение {@code "true"}, что обычно верно для промежуточных сборок,
+ создаваемых средами разработки и инструментами сборки. Якоря доверия, указанные в {@code
+ debug-overrides}, добавляются ко всем другим конфигурациям, и прикрепление
+ сертификатов не выполняется, если цепочка сертификатов сервера использует один из этих
+ якорей доверия, предназначенных только для отладки. Если параметр <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ имеет значение {@code "false"}, этот раздел полностью игнорируется.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ Синтаксис:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ Может содержать:
+ </dt>
+
+ <dd>
+ Любое количество <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ Описание:
+ </dt>
+
+ <dd>
+ Набор якорей доверия для защищенных соединений.
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>Синтаксис:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>Описание:</dt>
+<dd>Набор сертификатов X.509 для элементов {@code trust-anchors}.</dd>
+
+<dt>Атрибуты:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+Источник сертификатов ЦС может представлять собой
+<ul>
+ <li>идентификатор исходного ресурса, указывающий на файл с сертификатами X.509.
+ Сертификаты должны быть закодированы в формате DER или PEM. При использовании сертификатов PEM
+ файл <em>не должен</em> содержать ничего, кроме данных PEM, например,
+ комментариев.
+ </li>
+
+ <li>{@code "system"} для предустановленных в системе сертификатов ЦС
+ </li>
+
+ <li>{@code "user"} для добавленных пользователем сертификатов ЦС
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ Указывает, пропускается ли прикрепление сертификатов для ЦС из этого источника. Если значение равно {@code
+ "true"}, то прикрепление сертификатов не выполняется для цепочек сертификатов, проходящих через один из ЦС этого
+ источника. Это применяется для отладки ЦС
+ или для разрешения пользователю перехватывать защищенный трафик вашего приложения.
+ </p>
+
+ <p>
+ По умолчанию используется значение {@code "false"}, но если указан элемент {@code debug-overrides},
+ то по умолчанию используется значение {@code "true"}.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ Синтаксис:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ Может содержать:
+ </dt>
+
+ <dd>
+ Любое количество <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ Описание:
+ </dt>
+
+ <dd>
+ Набор прикрепленных открытых ключей. Чтобы защищенное соединение было доверенным, один из
+ открытых ключей в цепочке доверия должен входить в набор прикрепленных ключей. Формат ключей указан в
+ <code><a href="#pin"><pin></a></code>.
+ </dd>
+
+ <dt>
+ Атрибуты:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ Дата в формате {@code yyyy-MM-dd}, начиная с которой истекает срок прикрепления
+ и оно отключается. Если этот атрибут не установлен,
+ срок прикрепления не истекает.
+ <p>
+ Истечение срока прикрепления помогает предотвратить проблемы с подключением в приложениях, которые
+ не получают обновления набора прикрепленных элементов, например в связи с тем, что пользователь
+ отключил обновления приложений.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ Синтаксис:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ Атрибуты:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ Алгоритм хэширования, используемый для создания прикреплений. В настоящее время поддерживается только алгоритм
+ {@code "SHA-256"}.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/index.jd b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/index.jd
index b8de11e..29f1730 100644
--- a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/index.jd
+++ b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/index.jd
@@ -34,12 +34,12 @@
</div>
</div>
-<p>Во время навигации пользователя по вашему приложению экземпляры
+<p>Во время навигации пользователя по вашему приложению экземпляры
{@link android.app.Activity} внутри приложения переключаются между разными состояниями их
жизненного цикла Например, при первом запуске
операции она получает высокий приоритет в системе и привлекает внимание
пользователя. Во время этого процесса система Android вызывает серию методов жизненного цикла
-операции, позволяя настроить пользовательский интерфейс и другие компоненты. Если пользователь выполняет
+операции, позволяя настроить пользовательский интерфейс и другие компоненты. Если пользователь выполняет
действие, запускающее другую операцию, или переключается на другое приложение, система вызывает другой набор
методов жизненного цикла для операции, поскольку она переносится на фоновый уровень (операция больше не
отображается, но экземпляр и состояние остаются без изменений).</p>
@@ -50,12 +50,12 @@
а сетевое соединение разрывалось. После возврата пользователя проигрыватель может снова подключиться к сети, и пользователь сможет возобновить воспроизведение
видео с того же самого места.</p>
-<p>В этом учебном курсе разъясняются важные методы обратного вызова жизненного цикла, которые получает каждый экземпляр {@link
+<p>В этом учебном курсе разъясняются важные методы обратного вызова жизненного цикла, которые получает каждый экземпляр {@link
android.app.Activity}, и описывается как их использовать, чтобы операция выполнялась так, как этого ожидает
пользователь, и не потребляла системные ресурсы, когда они ей не нужны.</p>
<h2>Уроки</h2>
-
+
<dl>
<dt><b><a href="starting.html">Запуск операции</a></b></dt>
<dd>Из этого урока вы узнаете об основах жизненного цикла операций, способах запуска вашего приложения пользователями и вариантах
@@ -68,5 +68,5 @@
<dt><b><a href="recreating.html">Повторное создание операции</a></b></dt>
<dd>Вы узнаете, что происходит при полном прекращении операции, и как можно восстановить ее состояние
в случае необходимости.</dd>
-</dl>
+</dl>
diff --git a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/pausing.jd b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/pausing.jd
index c483780..8d1ce92 100644
--- a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Содержание этого урока</h2>
<ol>
<li><a href="#Pause">Приостановка операции</a></li>
<li><a href="#Resume">Возобновление операции</a></li>
</ol>
-
+
<h2>См. также:</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Операции</a>
@@ -59,7 +59,7 @@
<h2 id="Pause">Приостановка операции</h2>
-
+
<p>Когда система вызывает {@link android.app.Activity#onPause()} для операции, это
технически означает, что операция остается частично видимой. Однако чаще всего это означает, что
пользователь покидает операцию, и вскоре она войдет в состояние остановки. Обратный вызов
diff --git a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/recreating.jd b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/recreating.jd
index acb89fa..c36ccf4 100644
--- a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Содержание этого урока</h2>
<ol>
<li><a href="#SaveState">Сохранение состояния операции</a></li>
<li><a href="#RestoreState">Восстановление состояния операции</a></li>
</ol>
-
+
<h2>См. также:</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">Поддержка
@@ -105,7 +105,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -138,7 +138,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -157,12 +157,12 @@
после метода {@link android.app.Activity#onStart()}. Система вызывает {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} только при наличии сохраненного состояния
для восстановления, и поэтому вам не нужно проверять, имеет ли {@link android.os.Bundle} значение null:</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/starting.jd b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/starting.jd
index ef8be5b..19f7134 100644
--- a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Содержание этого урока</h2>
<ol>
<li><a href="#lifecycle-states">Изучение обратных вызовов жизненного цикла</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">Создание нового экземпляра</a></li>
<li><a href="#Destroy">Уничтожение операции</a></li>
</ol>
-
+
<h2>См. также:</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Операции</a></li>
@@ -34,7 +34,7 @@
</div>
<p>В отличие от других парадигм программирования, где приложения запускаются с использованием метода {@code main()}, система
-Android запускает код в {@link android.app.Activity}экземпляре посредством активации определенных
+Android запускает код в {@link android.app.Activity}экземпляре посредством активации определенных
методов обратного вызова, соответствующих определенным этапам его
жизненного цикла. Существует последовательность методов обратного вызова, которые запускают операцию и последовательность
методов обратного вызова, уничтожающих операцию.</p>
@@ -83,7 +83,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -138,7 +138,7 @@
-<h2 id="launching-activity">Указание операции, запускающей приложение</h2>
+<h2 id="launching-activity">Указание операции, запускающей приложение</h2>
<p>Когда пользователь выбирает значок приложения на главном экране, система вызывает метод {@link
android.app.Activity#onCreate onCreate()} для {@link android.app.Activity} в вашем приложении
@@ -151,7 +151,7 @@
<p>Основная операция приложения должна декларироваться в манифесте с помощью фильтра <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a>, включающего действие {@link
android.content.Intent#ACTION_MAIN MAIN} и категорию
-{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER}. Например:</p>
+{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER}. Например:</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -200,10 +200,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -221,7 +221,7 @@
<p>После завершения выполнения {@link android.app.Activity#onCreate onCreate()} система
быстро вызывает методы {@link android.app.Activity#onStart()} и {@link android.app.Activity#onResume()} по
очереди. Операция никогда не остается в состоянии создания или запуска. Технически
-операция становится видимой для пользователя при вызове {@link android.app.Activity#onStart()}, однако затем сразу же происходит
+операция становится видимой для пользователя при вызове {@link android.app.Activity#onStart()}, однако затем сразу же происходит
{@link android.app.Activity#onResume()} и операция остается в состоянии возобновления,
пока что-то не произойдет, например пока не поступит телефонный звонок, пользователь не переключится
на другую операцию или экран устройства не выключится.</p>
@@ -268,7 +268,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/stopping.jd b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/stopping.jd
index 27c771f..f78e4ef 100644
--- a/docs/html-intl/intl/ru/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html-intl/intl/ru/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>Содержание этого урока</h2>
<ol>
<li><a href="#Stop">Остановка операции</a></li>
<li><a href="#Start">Запуск/перезапуск операции</a></li>
</ol>
-
+
<h2>См. также:</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Операции</a>
@@ -118,7 +118,7 @@
<p class="note"><strong>Примечание.</strong> Даже если система уничтожит операцию в период остановки,
она сохранит состояние объектов {@link android.view.View} (например, текста в {@link
android.widget.EditText}) в {@link android.os.Bundle} (наборе пар "ключ-значение") и восстановит
-их, если пользователь вернется в тот же экземпляр операции (на <a href="recreating.html">следующем уроке</a> мы более подробно поговорим об использовании {@link android.os.Bundle} для сохранения
+их, если пользователь вернется в тот же экземпляр операции (на <a href="recreating.html">следующем уроке</a> мы более подробно поговорим об использовании {@link android.os.Bundle} для сохранения
других данных состояния в случае уничтожения и воссоздания вашей операции).</p>
@@ -152,13 +152,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -169,8 +169,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html-intl/intl/ru/training/basics/data-storage/databases.jd b/docs/html-intl/intl/ru/training/basics/data-storage/databases.jd
index 418d288..bd1a4b7 100644
--- a/docs/html-intl/intl/ru/training/basics/data-storage/databases.jd
+++ b/docs/html-intl/intl/ru/training/basics/data-storage/databases.jd
@@ -118,11 +118,11 @@
по умолчанию недоступна другим приложениям.</p>
<p>Полезный набор API-интерфейсов содержится в классе {@link
-android.database.sqlite.SQLiteOpenHelper}.
+android.database.sqlite.SQLiteOpenHelper}.
Если вы используете этот класс для получения ссылок на свою базу данных, система
выполняет потенциально
долговременные операции создания и обновления базы данных только тогда, когда это
-необходимо, а <em>не при запуске приложения</em>. Для этого нужно использовать вызов
+необходимо, а <em>не при запуске приложения</em>. Для этого нужно использовать вызов
{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} или
{@link android.database.sqlite.SQLiteOpenHelper#getReadableDatabase}.</p>
@@ -245,7 +245,7 @@
);
</pre>
-<p>Чтобы посмотреть на строку в месте курсора, используйте один из методов перемещения
+<p>Чтобы посмотреть на строку в месте курсора, используйте один из методов перемещения
{@link android.database.Cursor}, которые всегда нужно вызывать перед считыванием значений. Обычно следует начинать
с вызова {@link android.database.Cursor#moveToFirst}, который помещает "позицию чтения"
на первую запись в результатах. Для каждой строки значение столбца можно прочитать, вызвав один из методов
diff --git a/docs/html-intl/intl/ru/training/basics/data-storage/files.jd b/docs/html-intl/intl/ru/training/basics/data-storage/files.jd
index 2afecea..2b8f880 100644
--- a/docs/html-intl/intl/ru/training/basics/data-storage/files.jd
+++ b/docs/html-intl/intl/ru/training/basics/data-storage/files.jd
@@ -183,7 +183,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -250,7 +250,7 @@
вашего приложения пользователем. Хотя технически эти файлы доступны для пользователя и других приложений, поскольку находятся
во внешнем хранилище, они не имеют никакой ценности для пользователей
вне вашего приложения. Когда пользователь удаляет ваше приложение, система удаляет
-все файлы из каталога закрытых файлов вашего приложения во внешнем хранилище.
+все файлы из каталога закрытых файлов вашего приложения во внешнем хранилище.
<p>Например, к этой категории относятся дополнительные ресурсы, загруженные приложением, и временные мультимедийные файлы.</p>
</dd>
</dl>
@@ -265,7 +265,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -287,7 +287,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -332,7 +332,7 @@
общее пространство в хранилище. Эта информация также позволять
избежать переполнения объема хранилища сверх определенного уровня.</p>
-<p>Однако система не гарантирует возможность записи такого же количества байт, как указано
+<p>Однако система не гарантирует возможность записи такого же количества байт, как указано
в {@link java.io.File#getFreeSpace}. Если выводимое число на
несколько мегабайт превышает размер данных, которые вы хотите сохранить, или если файловая система заполнена
менее, чем на 90%, дальше можно действовать спокойно.
@@ -366,13 +366,13 @@
<div class="note">
<p><strong>Примечание.</strong> При удалении пользователем вашего приложения система Android удаляет
-следующие элементы:</p>
+следующие элементы:</p>
<ul>
<li>Все файлы, сохраненные во внутреннем хранилище</li>
<li>Все файлы, сохраненные во внешнем хранилище с использованием {@link
android.content.Context#getExternalFilesDir getExternalFilesDir()}.</li>
</ul>
-<p>Однако вам следует регулярно вручную очищать кэш-память, чтобы удалить файлы, созданные с помощью
+<p>Однако вам следует регулярно вручную очищать кэш-память, чтобы удалить файлы, созданные с помощью
{@link android.content.Context#getCacheDir()}, а также удалять любые
другие ненужные файлы.</p>
</div>
diff --git a/docs/html-intl/intl/ru/training/basics/data-storage/shared-preferences.jd b/docs/html-intl/intl/ru/training/basics/data-storage/shared-preferences.jd
index 61a0037..9a52e3e 100644
--- a/docs/html-intl/intl/ru/training/basics/data-storage/shared-preferences.jd
+++ b/docs/html-intl/intl/ru/training/basics/data-storage/shared-preferences.jd
@@ -79,7 +79,7 @@
SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE);
</pre>
-<p class="caution"><strong>Внимание!</strong> Если вы создадите общий файл настроек
+<p class="caution"><strong>Внимание!</strong> Если вы создадите общий файл настроек
с {@link android.content.Context#MODE_WORLD_READABLE} или {@link
android.content.Context#MODE_WORLD_WRITEABLE}, ваши данные будут доступны всем другим приложениям, которым известен идентификатор
файла.</p>
diff --git a/docs/html-intl/intl/ru/training/basics/intents/result.jd b/docs/html-intl/intl/ru/training/basics/intents/result.jd
index 8ab03d4..c413725 100644
--- a/docs/html-intl/intl/ru/training/basics/intents/result.jd
+++ b/docs/html-intl/intl/ru/training/basics/intents/result.jd
@@ -37,7 +37,7 @@
результат отправляется как другой объект {@link android.content.Intent}. Ваша операция получает
его в обратном вызове {@link android.app.Activity#onActivityResult onActivityResult()}.</p>
-<p class="note"><strong>Примечание.</strong> Вы можете использовать явные и неявные результаты при вызове
+<p class="note"><strong>Примечание.</strong> Вы можете использовать явные и неявные результаты при вызове
{@link android.app.Activity#startActivityForResult startActivityForResult()}. При запуске собственной
операции для получения результата вы должны использовать явные результаты, чтобы получить
именно ожидаемый результат.</p>
@@ -104,7 +104,7 @@
Android Контакты или Люди, предоставляют контент {@link android.net.Uri}, который идентифицирует
выбранный пользователем контакт.</p>
-<p>Для успешной обработки результатов необходимо понимать, каким будет формат этих результатов
+<p>Для успешной обработки результатов необходимо понимать, каким будет формат этих результатов
{@link android.content.Intent}. Это просто, если результат возвращается одной из ваших
собственных операций. Приложения, входящие в состав платформы Android, имеют собственные прикладные интерфейсы, так что
вы можете рассчитывать на получение определенных результатов. Например, приложение "Люди" (приложение "Контакты" в старых
diff --git a/docs/html-intl/intl/ru/training/material/animations.jd b/docs/html-intl/intl/ru/training/material/animations.jd
index 9808a9f..ab59ea5 100644
--- a/docs/html-intl/intl/ru/training/material/animations.jd
+++ b/docs/html-intl/intl/ru/training/material/animations.jd
@@ -173,7 +173,7 @@
</ul>
<p>Любой переход, являющийся наследованием класса {@link android.transition.Visibility}, поддерживается как начальный или конечный переход.
- Дополнительные сведения представлены в справке по API для класса
+ Дополнительные сведения представлены в справке по API для класса
{@link android.transition.Transition}.</p>
<p>В Android 5.0 (уровень API 21) также поддерживаются следующие переходы общих элементов:</p>
@@ -230,7 +230,7 @@
{@link android.transition.ChangeImageTransform}. Дополнительные сведения представлены в справке по API для {@link android.transition.Transition}.
</p>
-<p>Чтобы активировать в своем коде переходы содержимого окна, вызовите метод
+<p>Чтобы активировать в своем коде переходы содержимого окна, вызовите метод
{@link android.view.Window#requestFeature Window.requestFeature()}:</p>
<pre>
@@ -263,7 +263,7 @@
В противном случае вызывающая операция запустит конечный переход, однако будет выполнен переход окна (например, масштабирование или затемнение).
</p>
-<p>Чтобы запустить начальный переход как можно раньше, используйте в вызываемой операции метод
+<p>Чтобы запустить начальный переход как можно раньше, используйте в вызываемой операции метод
{@link android.view.Window#setAllowEnterTransitionOverlap Window.setAllowEnterTransitionOverlap()}
. Это позволит сделать начальные переходы более эффектными.</p>
@@ -289,7 +289,7 @@
<li>Активируйте в своей теме переходы содержимого окна.</li>
<li>В определении стиля укажите переходы общих элементов.</li>
<li>Определите свой переход как XML-ресурс.</li>
-<li>Присвойте одинаковое имя общим элементам в обоих макетах, используя для этого атрибут
+<li>Присвойте одинаковое имя общим элементам в обоих макетах, используя для этого атрибут
<code>android:transitionName</code>.</li>
<li>Воспользуйтесь методом {@link android.app.ActivityOptions#makeSceneTransitionAnimation
ActivityOptions.makeSceneTransitionAnimation()}.</li>
@@ -321,7 +321,7 @@
{@link android.view.View#setTransitionName View.setTransitionName()} для определения одинакового имени элемента в обеих операциях.
</p>
-<p>Чтобы выполнить анимацию обратного перехода по завершении второй операции, вызовите метод
+<p>Чтобы выполнить анимацию обратного перехода по завершении второй операции, вызовите метод
{@link android.app.Activity#finishAfterTransition Activity.finishAfterTransition()}
вместо{@link android.app.Activity#finish Activity.finish()}.</p>
@@ -414,15 +414,15 @@
</selector>
</pre>
-<p>Чтобы присоединить к представлению настраиваемые анимации состояния представления, определите аниматор, используя элемент
+<p>Чтобы присоединить к представлению настраиваемые анимации состояния представления, определите аниматор, используя элемент
<code>selector</code> в файле XML-ресурса (как в этом примере), а затем назначьте его своему представлению
с помощью атрибута <code>android:stateListAnimator</code>. Чтобы в своем коде назначить представлению аниматор
списка состояний, используйте метод {@link android.animation.AnimatorInflater#loadStateListAnimator
-AnimationInflater.loadStateListAnimator()}, а затем назначьте аниматор своему представлению с помощью метода
+AnimationInflater.loadStateListAnimator()}, а затем назначьте аниматор своему представлению с помощью метода
{@link android.view.View#setStateListAnimator View.setStateListAnimator()}.</p>
<p>Если ваша тема является расширением темы Material Design, по умолчанию у кнопок имеется возможность анимации по оси Z. Чтобы отключить
-такое поведение кнопок, задайте для атрибута <code>android:stateListAnimator</code> значение
+такое поведение кнопок, задайте для атрибута <code>android:stateListAnimator</code> значение
<code>@null</code>.</p>
<p>С помощью класса {@link android.graphics.drawable.AnimatedStateListDrawable} можно создавать элементы, которые служат для отображения анимации между изменениями состояния связанного представления.
diff --git a/docs/html-intl/intl/ru/training/material/drawables.jd b/docs/html-intl/intl/ru/training/material/drawables.jd
index 2554f07..c1924e3 100644
--- a/docs/html-intl/intl/ru/training/material/drawables.jd
+++ b/docs/html-intl/intl/ru/training/material/drawables.jd
@@ -38,7 +38,7 @@
<p>Тонирование можно применить к объектам {@link android.graphics.drawable.BitmapDrawable} и {@link
android.graphics.drawable.NinePatchDrawable} с помощью метода {@code setTint()}. Также можно
-задать цвет и способ тонирования в макетах, используя для этого атрибуты <code>android:tint</code> и
+задать цвет и способ тонирования в макетах, используя для этого атрибуты <code>android:tint</code> и
<code>android:tintMode</code>.</p>
diff --git a/docs/html-intl/intl/ru/training/material/get-started.jd b/docs/html-intl/intl/ru/training/material/get-started.jd
index 476de7f..6a0340d 100644
--- a/docs/html-intl/intl/ru/training/material/get-started.jd
+++ b/docs/html-intl/intl/ru/training/material/get-started.jd
@@ -59,7 +59,7 @@
<h2 id="ApplyTheme">Применение темы Material Design</h2>
-<p>Чтобы применить тему Material Design в своем приложении, укажите стиль, который наследует от
+<p>Чтобы применить тему Material Design в своем приложении, укажите стиль, который наследует от
<code>android:Theme.Material</code>:</p>
<pre>
diff --git a/docs/html-intl/intl/ru/training/material/index.jd b/docs/html-intl/intl/ru/training/material/index.jd
index 0b3f1c4..e609557 100644
--- a/docs/html-intl/intl/ru/training/material/index.jd
+++ b/docs/html-intl/intl/ru/training/material/index.jd
@@ -1,7 +1,7 @@
-page.title=Создание приложений с помощью Material Design
-page.type=проектирование
+page.title=Создание приложений с помощью Material Design
+page.type=проектирование
page.image=images/cards/material_2x.png
-page.metaDescription=Научитесь применять Material Design к своим приложениям.
+page.metaDescription=Научитесь применять Material Design к своим приложениям.
@jd:body
diff --git a/docs/html-intl/intl/ru/training/material/lists-cards.jd b/docs/html-intl/intl/ru/training/material/lists-cards.jd
index 44ff160..fa0db14 100644
--- a/docs/html-intl/intl/ru/training/material/lists-cards.jd
+++ b/docs/html-intl/intl/ru/training/material/lists-cards.jd
@@ -90,7 +90,7 @@
<h3 id="RVExamples">Примеры</h3>
-<p>В следующем примере демонстрируется, как включить в макет виджет
+<p>В следующем примере демонстрируется, как включить в макет виджет
{@link android.support.v7.widget.RecyclerView}:</p>
<pre>
@@ -253,7 +253,7 @@
<p> Виджеты {@link android.support.v7.widget.RecyclerView} и {@link android.support.v7.widget.CardView}
входят во <a href="{@docRoot}tools/support-library/features.html#v7">вспомогательные
-библиотеки v7</a>. Чтобы использовать эти виджеты в своем проекте, добавьте в модуль приложения следующие
+библиотеки v7</a>. Чтобы использовать эти виджеты в своем проекте, добавьте в модуль приложения следующие
<a href="{@docRoot}sdk/installing/studio-build.html#dependencies">зависимости Gradle</a>:
</p>
diff --git a/docs/html-intl/intl/ru/training/material/shadows-clipping.jd b/docs/html-intl/intl/ru/training/material/shadows-clipping.jd
index a1c41fc..293b525 100644
--- a/docs/html-intl/intl/ru/training/material/shadows-clipping.jd
+++ b/docs/html-intl/intl/ru/training/material/shadows-clipping.jd
@@ -31,7 +31,7 @@
<p>Установка высоты также полезна для создания анимации, когда виджеты временно поднимаются выше плоскости представления при выполнении какого-либо действия.
</p>
-<p>Дополнительные сведения об установке высоты в Material Design представлены на странице
+<p>Дополнительные сведения об установке высоты в Material Design представлены на странице
<a href="http://www.google.com/design/spec/what-is-material/objects-in-3d-space.html">Объекты в трехмерном пространстве</a>.
</p>
@@ -59,13 +59,13 @@
<p>Новые методы {@link android.view.ViewPropertyAnimator#z ViewPropertyAnimator.z()} и {@link
android.view.ViewPropertyAnimator#translationZ ViewPropertyAnimator.translationZ()} позволяют с легкостью анимировать изменение высоты представлений.
- Дополнительные сведения см. в справке по API для
+ Дополнительные сведения см. в справке по API для
{@link android.view.ViewPropertyAnimator}, а также в руководстве по <a href="{@docRoot}guide/topics/graphics/prop-animation.html">анимации свойств</a> для разработчиков.
</p>
<p>Также можно использовать класс {@link android.animation.StateListAnimator} для декларирования этих анимаций.
Это особенно полезно в тех случаях, когда анимация запускается при изменении состояния, например, когда пользователь нажимает на кнопку.
- Дополнительные сведения см. в разделе
+ Дополнительные сведения см. в разделе
<a href="{@docRoot}training/material/animations.html#ViewState">Анимация изменений состояния представления</a>.</p>
<p>Значения Z измеряются в dp (пиксели, не зависящие от плотности).</p>
@@ -110,7 +110,7 @@
android.view.View#setOutlineProvider View.setOutlineProvider()}.</li>
</ol>
-<p>Можно создавать овальные и прямоугольные контуры со скругленными углами, используя для этого методы класса
+<p>Можно создавать овальные и прямоугольные контуры со скругленными углами, используя для этого методы класса
{@link android.graphics.Outline}. Стандартный источник контуров получает контуры из фона представления.
Чтобы представление не отбрасывало тень, задайте для источника контуров значение <code>null</code>.
</p>
diff --git a/docs/html-intl/intl/ru/training/material/theme.jd b/docs/html-intl/intl/ru/training/material/theme.jd
index 320f308..62c310f 100644
--- a/docs/html-intl/intl/ru/training/material/theme.jd
+++ b/docs/html-intl/intl/ru/training/material/theme.jd
@@ -42,7 +42,7 @@
<li><code>@android:style/Theme.Material.Light.DarkActionBar</code>.</li>
</ul>
-<p>Список доступных стилей Material Design см. в справке по API для
+<p>Список доступных стилей Material Design см. в справке по API для
{@link android.R.style R.style}.</p>
<!-- two columns, dark/light material theme example -->
@@ -66,7 +66,7 @@
<strong>Примечание.</strong> Темы Material Design доступны только в ОС Android 5.0 (уровень API 21) и более поздних версий.
Во <a href="{@docRoot}tools/support-library/features.html#v7">вспомогательных библиотеках v7</a>
представлены темы со стилями Material Design для некоторых виджетов. Эти библиотеки также обеспечивают поддержку настройки цветовой палитры.
- Дополнительные сведения см. на странице
+ Дополнительные сведения см. на странице
<a href="{@docRoot}training/material/compatibility.html">Обеспечение совместимости</a>.
</p>
@@ -108,7 +108,7 @@
<p>Кроме того, можно самостоятельно разместить элемент за строкой состояния. Например, если требуется наложить прозрачную строку состояния поверх фотографии, применив еле уловимый темный градиент, чтобы были видны белые значки состояния.
- Для этого задайте для атрибута <code>android:statusBarColor</code> значение
+ Для этого задайте для атрибута <code>android:statusBarColor</code> значение
<code>@android:color/transparent</code> и настройте флаги окна требуемым образом. Также можно воспользоваться
методом {@link android.view.Window#setStatusBarColor Window.setStatusBarColor()} для применения анимации или эффекта постепенного исчезания.
</p>
diff --git a/docs/html-intl/intl/ru/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/battery-monitoring.jd
index 26daf04..a8e5843 100644
--- a/docs/html-intl/intl/ru/training/monitoring-device-state/battery-monitoring.jd
+++ b/docs/html-intl/intl/ru/training/monitoring-device-state/battery-monitoring.jd
@@ -7,8 +7,8 @@
next.link=docking-monitoring.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>Содержание урока</h2>
@@ -24,9 +24,9 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Намерения и фильтры намерений</a>
</ul>
-</div>
</div>
-
+</div>
+
<p>Если вы хотите изменить частоту фоновых обновлений, чтобы продлить время работы устройства от батареи, сначала рекомендуется проверить текущий уровень заряда и состояние зарядки.</p>
<p>Именно от этих двух факторов зависит, как обновления повлияют на время работы устройства от батареи. Когда устройство подключено к сети переменного тока, приложение можно обновлять максимально часто, поскольку процесс обновления не будет сказываться на уровне заряда батареи. Если устройство не подключено к сети, следует воздержаться от обновлений, чтобы продлить время его работы от батареи.</p>
@@ -34,8 +34,8 @@
<p>Если заряд батареи практически исчерпан, можно снизить частоту обновлений (вплоть до их полного прекращения).</p>
-<h2 id="DetermineChargeState">Определение текущего состояния зарядки</h2>
-
+<h2 id="DetermineChargeState">Определение текущего состояния зарядки</h2>
+
<p>Начните с определения текущего состояния зарядки. {@link android.os.BatteryManager} передает все сведения о батарее и зарядке в закрепленном намерении {@link android.content.Intent}, которое содержит также информацию о состоянии зарядки.</p>
<p>Поскольку это намерение является закрепленным, регистрировать {@link android.content.BroadcastReceiver} не нужно. Чтобы получить текущее состояние батареи в виде намерения, нужно вызвать {@code registerReceiver}, передав {@code null} в качестве приемника, как показано в коде ниже. Можно также передать фактический объект {@link android.content.BroadcastReceiver}, но это необязательно, поскольку обработка обновлений будет выполняться позднее.</p>
@@ -58,7 +58,7 @@
<p>Как правило, если устройство подключено к сети переменного тока, фоновые обновления можно выполнять с максимальной частотой. Если устройство заряжается через USB, частоту можно несколько сократить, а если устройство не подключено к сети – сократить еще больше.</p>
-<h2 id="MonitorChargeState">Отслеживание изменений состояния зарядки</h2>
+<h2 id="MonitorChargeState">Отслеживание изменений состояния зарядки</h2>
<p>Состояние зарядки изменяется всякий раз, когда пользователь подключает устройство к источнику питания. Поскольку это случается довольно часто, важно отслеживать изменения этого состояния и соответствующим образом корректировать частоту обновления приложения.</p>
@@ -75,11 +75,11 @@
<pre>public class PowerConnectionReceiver extends BroadcastReceiver {
@Override
- public void onReceive(Context context, Intent intent) {
+ public void onReceive(Context context, Intent intent) {
int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
status == BatteryManager.BATTERY_STATUS_FULL;
-
+
int chargePlug = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
boolean usbCharge = chargePlug == BATTERY_PLUGGED_USB;
boolean acCharge = chargePlug == BATTERY_PLUGGED_AC;
@@ -87,7 +87,7 @@
}</pre>
-<h2 id="CurrentLevel">Определение текущего уровня заряда батареи</h2>
+<h2 id="CurrentLevel">Определение текущего уровня заряда батареи</h2>
<p>В некоторых случаях целесообразно определять текущий уровень заряда батареи. Если он ниже определенного значения, частоту фоновых обновлений следует уменьшить.</p>
@@ -99,7 +99,7 @@
float batteryPct = level / (float)scale;</pre>
-<h2 id="MonitorLevel">Отслеживание существенных изменений уровня заряда батареи</h2>
+<h2 id="MonitorLevel">Отслеживание существенных изменений уровня заряда батареи</h2>
<p>Отслеживать состояние батареи непрерывно не следует,</p>
diff --git a/docs/html-intl/intl/ru/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/connectivity-monitoring.jd
index ca1a942..d372431 100644
--- a/docs/html-intl/intl/ru/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html-intl/intl/ru/training/monitoring-device-state/connectivity-monitoring.jd
@@ -11,7 +11,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>Содержание урока</h2>
@@ -27,7 +27,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Намерения и фильтры намерений</a>
</ul>
-</div>
+</div>
</div>
<p>Чаще всего повторяющиеся оповещения и фоновые службы используются для планового обновления приложения из Интернета, кэширования или загрузки больших объемов данных. Однако если подключение к Интернету не установлено или скорость соединения слишком низкая, выполнять загрузку не имеет смысла.</p>
@@ -35,18 +35,18 @@
<p>Проверить наличие подключения к Интернету и его тип можно с помощью {@link android.net.ConnectivityManager}.</p>
-<h2 id="DetermineConnection">Определение наличия подключения к Интернету</h2>
-
+<h2 id="DetermineConnection">Определение наличия подключения к Интернету</h2>
+
<p>Если подключение отсутствует, нет смысла планировать обновление из Интернета. В приведенном ниже коде показано, как использовать {@link android.net.ConnectivityManager} для отправки запросов об активной сети и определять возможности подключения.</p>
<pre>ConnectivityManager cm =
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
-<h2 id="DetermineType">Определение типа подключения к Интернету</h2>
+<h2 id="DetermineType">Определение типа подключения к Интернету</h2>
<p>Также можно определить тип доступного в настоящий момент подключения к Интернету.</p>
@@ -59,7 +59,7 @@
<p>Когда обновления отключены, необходимо отслеживать изменения доступных соединений, чтобы возобновить их сразу после подключения устройства к Интернету.</p>
-<h2 id="MonitorChanges">Отслеживание изменения возможностей подключения</h2>
+<h2 id="MonitorChanges">Отслеживание изменения возможностей подключения</h2>
<p>{@link android.net.ConnectivityManager} передает действие {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION} ({@code "android.net.conn.CONNECTIVITY_CHANGE"}) при каждом изменении сведений о подключении. Зарегистрируйте в манифесте приемник широковещательных намерений, чтобы отслеживать эти изменения и запускать (или приостанавливать) фоновые обновления соответствующим образом.</p>
diff --git a/docs/html-intl/intl/ru/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/docking-monitoring.jd
index d94f357..002f351 100644
--- a/docs/html-intl/intl/ru/training/monitoring-device-state/docking-monitoring.jd
+++ b/docs/html-intl/intl/ru/training/monitoring-device-state/docking-monitoring.jd
@@ -10,7 +10,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>Содержание урока</h2>
@@ -26,7 +26,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Намерения и фильтры намерений</a>
</ul>
-</div>
+</div>
</div>
<p>Устройства под управлением ОС Android можно подключать к нескольким типам док-станций: настольным, которые делятся на цифровые и аналоговые, и автомобильным. В большинстве случаев устройства заряжаются при подключении к док-станции, поэтому состояние подключения к док-станции часто связано с состоянием зарядки.</p>
@@ -36,8 +36,8 @@
<p>Состояние подключения к док-станции также передается в виде закрепленного намерения {@link android.content.Intent}, что позволяет запрашивать сведения о наличии подключения к док-станции и ее типе.</p>
-<h2 id="CurrentDockState">Определение текущего состояния подключения к док-станции</h2>
-
+<h2 id="CurrentDockState">Определение текущего состояния подключения к док-станции</h2>
+
<p>Сведения о состоянии подключения к док-станции передаются в качестве дополнительных данных в закрепленном оповещении действия {@link android.content.Intent#ACTION_DOCK_EVENT}. Поскольку это закрепленное намерение, регистрировать {@link android.content.BroadcastReceiver} не требуется. Достаточно вызвать {@link android.content.Context#registerReceiver registerReceiver()}, передав {@code null} в качестве приемника широковещательных намерений, как показано в коде ниже.</p>
<pre>IntentFilter ifilter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
@@ -49,9 +49,9 @@
boolean isDocked = dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED;</pre>
-<h2 id="DockType">Определение типа док-станции</h2>
+<h2 id="DockType">Определение типа док-станции</h2>
-<p>Док-станция, к которой подключено устройство, может быть одного из четырех типов:
+<p>Док-станция, к которой подключено устройство, может быть одного из четырех типов:
<ul><li>автомобильная;</li>
<li>настольная;</li>
<li>настольная с минимальным набором функций (аналоговая);</li>
@@ -60,12 +60,12 @@
<p>Обратите внимание, что последние два типа поддерживаются только на уровне API 11, поэтому, даже если вас не интересует, является ли док-станция цифровой или аналоговой, а интересует только ее тип, рекомендуется выполнять проверку по всем трем типам:</p>
<pre>boolean isCar = dockState == EXTRA_DOCK_STATE_CAR;
-boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
+boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
dockState == EXTRA_DOCK_STATE_LE_DESK ||
dockState == EXTRA_DOCK_STATE_HE_DESK;</pre>
-<h2 id="MonitorDockState">Отслеживание изменений состояния подключения к док-станции и ее типа</h2>
+<h2 id="MonitorDockState">Отслеживание изменений состояния подключения к док-станции и ее типа</h2>
<p>При каждом подключении устройства к док-станции или отключении от нее передается действие {@link android.content.Intent#ACTION_DOCK_EVENT}. Чтобы отслеживать состояние подключения к док-станции, достаточно зарегистрировать в манифесте приложения приемник широковещательных намерений, как показано ниже.</p>
diff --git a/docs/html-intl/intl/ru/training/monitoring-device-state/index.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/index.jd
index c87d9af..e26af09 100644
--- a/docs/html-intl/intl/ru/training/monitoring-device-state/index.jd
+++ b/docs/html-intl/intl/ru/training/monitoring-device-state/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
-<h2>Требования</h2>
+<h2>Требования</h2>
<ul>
<li>Android 2.0 (API уровня 5) или более поздней версии</li>
<li>Опыт работы с <a href="{@docRoot}guide/components/intents-filters.html">намерениями и фильтрами намерений</a></li>
@@ -21,19 +21,19 @@
<li><a href="{@docRoot}guide/components/services.html">Службы</a>
</ul>
-</div>
+</div>
</div>
<p>Качественное приложение должно оказывать минимальное влияние на время работы устройства от батареи. В этом уроке вы научитесь создавать приложения, способные изменять функционал и режим работы в зависимости от состояния устройства.</p>
<p>Отключение обновления данных фоновых служб при потере подключения и снижение частоты обновления при низком заряде батареи позволяет снизить расход энергии и продлить работу устройства без подзарядки.</p>
-<h2>Уроки</h2>
-
+<h2>Уроки</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
+will want to jump to a lesson or not.-->
+
<dl>
<dt><b><a href="battery-monitoring.html">Отслеживание уровня заряда батареи и состояния зарядки</a></b></dt>
<dd>Вы узнаете, как изменять частоту обновления приложения, определяя и отслеживая текущий уровень заряда батареи и изменение состояния зарядки.</dd>
@@ -46,4 +46,4 @@
<dt><b><a href="manifest-receivers.html">Операции с приемниками широковещательных намерений по запросу</a></b></dt>
<dd>Приемники широковещательных намерений, объявленные в манифесте, можно включать и отключать во время работы приложения. Это позволяет отключать ненужные приемники в зависимости от состояния устройства. Вы узнаете, как повысить эффективность путем включения, отключения или каскадирования приемников изменения состояния и как отложить действие до момента перехода устройства в заданное состояние.</dd>
-</dl>
\ No newline at end of file
+</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/ru/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/ru/training/monitoring-device-state/manifest-receivers.jd
index 724ee93..2bd0fb9 100644
--- a/docs/html-intl/intl/ru/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html-intl/intl/ru/training/monitoring-device-state/manifest-receivers.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>Содержание урока</h2>
@@ -23,7 +23,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Намерения и фильтры намерений</a>
</ul>
-</div>
+</div>
</div>
<p>Самый простой способ отслеживать изменения состояния устройства – создать приемники {@link android.content.BroadcastReceiver} для каждого отслеживаемого состояния и зарегистрировать их в манифесте приложения. Затем в каждом из этих приемников можно переопределять график повторяющихся оповещений в зависимости от текущего состояния устройства.</p>
@@ -31,10 +31,10 @@
<p>Этот способ имеет недостатки: приложение активирует устройство при каждом запуске любого из этих приемников, что далеко не всегда оправданно.</p>
<p>Оптимальный вариант – включать и выключать приемники широковещательных намерений во время работы приложения. Это позволяет использовать приемники, объявленные в манифесте, как пассивные оповещения, которые инициируются системными событиями только в случае необходимости.</p>
-
-<h2 id="ToggleReceivers">Включение, отключение и каскадирование приемников изменения состояния для повышения эффективности </h2>
-
+
+<h2 id="ToggleReceivers">Включение, отключение и каскадирование приемников изменения состояния для повышения эффективности </h2>
+
<p>{@link android.content.pm.PackageManager} позволяет включать и выключать любые компоненты, определенные в манифесте, в том числе все приемники широковещательных намерений:</p>
<pre>ComponentName receiver = new ComponentName(context, myReceiver.class);
diff --git a/docs/html-intl/intl/ru/training/multiscreen/adaptui.jd b/docs/html-intl/intl/ru/training/multiscreen/adaptui.jd
index 490a64a..ee1dd9d 100644
--- a/docs/html-intl/intl/ru/training/multiscreen/adaptui.jd
+++ b/docs/html-intl/intl/ru/training/multiscreen/adaptui.jd
@@ -10,9 +10,9 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
-
+<div id="tb-wrapper">
+<div id="tb">
+
<h2>Содержание урока</h2>
<ol>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Поддержка планшетных ПК и мобильных телефонов</a></li>
</ul>
-
+
<h2>Упражнение</h2>
-
+
<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Загрузить учебное приложение</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>Алгоритм пользовательского интерфейса зависит от макета, который в данный момент отображается. Например, если приложение работает в двухпанельном режиме, то при нажатии на элемент в левой панели содержание отобразится в правой. В однопанельном режиме содержание откроется отдельно (в другой активности).</p>
@@ -56,7 +56,7 @@
setContentView(R.layout.main_layout);
View articleView = findViewById(R.id.article);
- mIsDualPane = articleView != null &&
+ mIsDualPane = articleView != null &&
articleView.getVisibility() == View.VISIBLE;
}
}
@@ -116,7 +116,7 @@
else {
/* use list navigation (spinner) */
actionBar.setNavigationMode(android.app.ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter adap = new ArrayAdapter<String>(this,
+ SpinnerAdapter adap = new ArrayAdapter<String>(this,
R.layout.headline_item, CATEGORIES);
actionBar.setListNavigationCallbacks(adap, handler);
}
@@ -168,7 +168,7 @@
public class HeadlinesFragment extends ListFragment {
...
@Override
- public void onItemClick(AdapterView<?> parent,
+ public void onItemClick(AdapterView<?> parent,
View view, int position, long id) {
if (null != mHeadlineSelectedListener) {
mHeadlineSelectedListener.onHeadlineSelected(position);
diff --git a/docs/html-intl/intl/ru/training/multiscreen/index.jd b/docs/html-intl/intl/ru/training/multiscreen/index.jd
index 84b9b8b..66cf968 100644
--- a/docs/html-intl/intl/ru/training/multiscreen/index.jd
+++ b/docs/html-intl/intl/ru/training/multiscreen/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
-<div id="tb">
-
-<h2>Требования</h2>
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Требования</h2>
<ul>
<li>Android 1.6 или более поздней версии (для запуска учебного приложения требуется версия 2.1 или более поздняя)</li>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/screens_support.html">Поддержка нескольких экранов</a></li>
</ul>
-
-<h2>Упражнение</h2>
-
-<div class="download-box">
+
+<h2>Упражнение</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Загрузить учебное приложение</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
-
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
+
<p>На платформе Android работают устройства с самыми разными размерами экрана: от телефонов до телевизоров. Чтобы с вашим приложением могли работать как можно больше пользователей, оно должно корректно отображаться на всех этих устройствах.</p>
<p>Однако совместимость с разными типами устройств – это еще не все. От размера экрана зависит, какие возможности будет иметь пользователь при работе с приложением. Чтобы пользователи действительно остались довольны вашим приложением, оно должно не просто <em>поддерживать</em> разные экраны, но и быть <em>оптимизировано</em> для каждого из них.</p>
@@ -48,17 +48,17 @@
<p class="note"><strong>Примечание</strong>. В этом модуле и в учебном приложении используется <a
href="{@docRoot}tools/support-library/index.html">вспомогательная библиотека</a>, позволяющая работать с API <PH>{@link android.app.Fragment}</PH> в версиях до Android 3.0. Чтобы иметь возможность использовать все необходимые API, загрузите библиотеку и добавьте ее в свое приложение.</p>
-
-<h2>Уроки</h2>
-
-<dl>
- <dt><b><a href="screensizes.html">Поддержка разных размеров экрана</a></b></dt>
- <dd>В этом уроке рассказывается, как создать макет, который адаптируется к разным размерам экрана, используя масштабируемые представления, объекты <PH>{@link android.widget.RelativeLayout}</PH>, квалификаторы размера и ориентации, фильтры псевдонимов и растровые изображений формата nine-patch.</dd>
-
- <dt><b><a href="screendensities.html">Поддержка разных разрешений экрана</a></b></dt>
- <dd>В этом уроке рассказывается, как работать с экранами разного разрешения с помощью не зависящих от разрешения пикселей и как подготовить растровые изображения для каждого из них.</dd>
-
- <dt><b><a href="adaptui.html">Реализация адаптируемых алгоритмов работы пользовательского интерфейса</a></b></dt>
- <dd>В этом уроке рассказывается, как реализовать алгоритм работы интерфейса, адаптирующийся к размеру и разрешению экрана, то есть способный определять активный макет во время выполнения приложения, выбирать дальнейшие действия на основе текущего макета и обрабатывать изменения конфигурации экрана.</dd>
-</dl>
+
+<h2>Уроки</h2>
+
+<dl>
+ <dt><b><a href="screensizes.html">Поддержка разных размеров экрана</a></b></dt>
+ <dd>В этом уроке рассказывается, как создать макет, который адаптируется к разным размерам экрана, используя масштабируемые представления, объекты <PH>{@link android.widget.RelativeLayout}</PH>, квалификаторы размера и ориентации, фильтры псевдонимов и растровые изображений формата nine-patch.</dd>
+
+ <dt><b><a href="screendensities.html">Поддержка разных разрешений экрана</a></b></dt>
+ <dd>В этом уроке рассказывается, как работать с экранами разного разрешения с помощью не зависящих от разрешения пикселей и как подготовить растровые изображения для каждого из них.</dd>
+
+ <dt><b><a href="adaptui.html">Реализация адаптируемых алгоритмов работы пользовательского интерфейса</a></b></dt>
+ <dd>В этом уроке рассказывается, как реализовать алгоритм работы интерфейса, адаптирующийся к размеру и разрешению экрана, то есть способный определять активный макет во время выполнения приложения, выбирать дальнейшие действия на основе текущего макета и обрабатывать изменения конфигурации экрана.</dd>
+</dl>
diff --git a/docs/html-intl/intl/ru/training/multiscreen/screendensities.jd b/docs/html-intl/intl/ru/training/multiscreen/screendensities.jd
index cfd4724..ffcdbbca 100644
--- a/docs/html-intl/intl/ru/training/multiscreen/screendensities.jd
+++ b/docs/html-intl/intl/ru/training/multiscreen/screendensities.jd
@@ -12,8 +12,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>Содержание урока</h2>
<ol>
@@ -29,15 +29,15 @@
</ul>
<h2>Упражнение</h2>
-
-<div class="download-box">
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Загрузить учебное приложение</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>В этом уроке рассказывается, как создать интерфейс, поддерживающий разные разрешения экрана, за счет использования разных ресурсов и не зависящих от разрешения единиц измерения.</p>
@@ -48,8 +48,8 @@
<p>Например, если вы задаете расстояние между двумя представлениями, рекомендуется использовать <code>dp</code>, а не <code>px</code>:</p>
<pre>
-<Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+<Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/clickme"
android:layout_marginTop="20dp" />
</pre>
@@ -57,8 +57,8 @@
<p>Для определения размера шрифта всегда используйте <code>sp</code>:</p>
<pre>
-<TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
+<TextView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:textSize="20sp" />
</pre>
diff --git a/docs/html-intl/intl/ru/training/multiscreen/screensizes.jd b/docs/html-intl/intl/ru/training/multiscreen/screensizes.jd
index 9684d77..57496d9 100644
--- a/docs/html-intl/intl/ru/training/multiscreen/screensizes.jd
+++ b/docs/html-intl/intl/ru/training/multiscreen/screensizes.jd
@@ -10,8 +10,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>Содержание урока</h2>
<ol>
@@ -30,26 +30,26 @@
<li><a href="{@docRoot}guide/practices/screens_support.html">Поддержка нескольких экранов</a></li>
</ul>
-<h2>Упражнение</h2>
-
-<div class="download-box">
+<h2>Упражнение</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Загрузить учебное приложение</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
<p>В этом уроке описаны следующие аспекты обеспечения совместимости интерфейса с разными экранами:</p>
-<ul>
- <li>обеспечение способности макета адаптироваться к размеру экрана;</li>
- <li>выбор макета интерфейса, отвечающего конфигурации экрана;</li>
+<ul>
+ <li>обеспечение способности макета адаптироваться к размеру экрана;</li>
+ <li>выбор макета интерфейса, отвечающего конфигурации экрана;</li>
<li>контроль правильности применяемого макета;</li>
- <li>использование масштабируемых растровых изображений.</li>
-</ul>
+ <li>использование масштабируемых растровых изображений.</li>
+</ul>
-<h2 id="TaskUseWrapMatchPar">Использование параметров wrap_content и match_parent</h2>
+<h2 id="TaskUseWrapMatchPar">Использование параметров wrap_content и match_parent</h2>
<p>Чтобы создать масштабируемый макет, способный адаптироваться к разным экранам, используйте в качестве значений ширины и высоты отдельных компонентов представления параметры <code>"wrap_content"</code> и <code>"match_parent"</code>. Если используется <code>"wrap_content"</code>, для ширины или высоты представления устанавливается минимальное значение, позволяющее уместить содержание на экран, а параметр <code>"match_parent"</code> (известный как <code>"fill_parent"</code> в API до 8 уровня) служит для растягивания компонента по размеру родительского представления.</p>
@@ -65,7 +65,7 @@
<p class="img-caption"><strong>Рисунок 1</strong>. Приложение News Reader при вертикальной (слева) и горизонтальной (справа) ориентации.</p>
-<h2 id="TaskUseRelativeLayout">Использование объекта RelativeLayout</h2>
+<h2 id="TaskUseRelativeLayout">Использование объекта RelativeLayout</h2>
<p>С помощью вложенных экземпляров объекта <PH>{@link android.widget.LinearLayout}</PH> и параметров <code>"wrap_content"</code> и <code>"match_parent"</code> можно создавать достаточно сложные макеты. Однако <PH>{@link android.widget.LinearLayout}</PH> не дает возможности точно управлять взаимным расположением дочерних представлений: в <PH>{@link android.widget.LinearLayout}</PH> они просто помещаются в ряд друг за другом. Если необходимо расположить дочерние представления иным образом, используйте объект <PH>{@link android.widget.RelativeLayout}</PH>, позволяющий задать относительные позиции компонентов. Например, одно дочернее представление можно выровнять по левому краю экрана, а другое – по правому.</p>
@@ -115,8 +115,8 @@
<p>Обратите внимание: несмотря на изменение размера компонентов их взаимное расположение остается прежним, так как оно задано объектом <PH>{@link android.widget.RelativeLayout.LayoutParams}</PH>.</p>
-
-<h2 id="TaskUseSizeQuali">Использование квалификаторов размера</h2>
+
+<h2 id="TaskUseSizeQuali">Использование квалификаторов размера</h2>
<p>Масштабируемые или относительные макеты, один из которых продемонстрирован выше, имеют свои ограничения. Хотя они позволяют создать интерфейс, способный адаптироваться к разным экранам за счет растягивания пространства внутри и вокруг компонентов, пользователю может оказаться не слишком удобно работать с таким интерфейсом. Поэтому в приложении должен использоваться не один масштабируемый макет, а несколько альтернативных вариантов для разных конфигураций экрана. Их можно создать с помощью <a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">квалификаторов конфигураций</a>, которые позволяют оперативно выбирать ресурсы, отвечающие текущим параметрам экрана (например, разные варианты макетов для экранов разных размеров).</p>
@@ -158,7 +158,7 @@
<p>Следует учесть, что на Android-устройствах до версии 3.2 квалификатор <code>sw600dp</code> не будет работать, поэтому для них по-прежнему нужно использовать <code>large</code>. Таким образом, вам потребуется еще один файл с названием <code>res/layout-large/main.xml</code>, идентичный файлу <code>res/layout-sw600dp/main.xml</code>. В следующем разделе вы познакомитесь с методом, который позволяет избежать дублирования таких файлов макета.</p>
-<h2 id="TaskUseAliasFilters">Использование псевдонимов макетов</h2>
+<h2 id="TaskUseAliasFilters">Использование псевдонимов макетов</h2>
<p>Квалификатор Smallest-width работает только на устройствах Android 3.2 или более поздних версий. Для совместимости с более ранними устройствами по-прежнему следует использовать абстрактные размеры (small, normal, large и xlarge). Например, чтобы интерфейс открывался в однопанельном режиме на телефонах и в многопанельном на планшетных ПК с 7-дюймовым экраном, телевизорах и других крупных устройствах, подготовьте следующие файлы:</p>
@@ -202,7 +202,7 @@
<PH>{@code large}</PH>, а для более новых – <code>sw600dp</code>).</p>
-<h2 id="TaskUseOriQuali">Использование квалификаторов ориентации</h2>
+<h2 id="TaskUseOriQuali">Использование квалификаторов ориентации</h2>
<p>Хотя некоторые макеты одинаково хорошо смотрятся в вертикальной и горизонтальной ориентациях, в большинстве случаев интерфейс все же приходится адаптировать. Ниже показано, как изменяется макет в приложении News Reader в зависимости от размера и ориентации экрана.</p>
diff --git a/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..f0ffd48
--- /dev/null
+++ b/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,186 @@
+page.title=Режим "картинка в картинке"
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Содержание документа</h2>
+<ol>
+ <li><a href="#declaring">Декларация поддержки операцией режима
+"картинка в картинке"</a></li>
+ <li><a href="#pip_button">Переключение операции в режим "картинка в картинке"</a>
+</li>
+ <li><a href="#handling_ui">Работа пользовательского интерфейса в режиме "картинка в картинке"</a>
+</li>
+ <li><a href="#continuing_playback">Продолжение воспроизведения видео в режиме
+"картинка в картинке"</a></li>
+ <li><a href="#best">Советы и рекомендации</a></li>
+</ol>
+
+<h2>См. также:</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">Поддержка
+многооконного режима</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>В Android N пользователи Android TV могут смотреть видео
+в закрепленном окне в углу экрана во время работы в
+приложениях. Режим "картинка в картинке" (PIP) позволяет приложениям отображать видео
+в закрепленном окне одновременно с выполнением другой операции
+фоновом режиме. Окно PIP обеспечивает возможность многозадачности внутри вашего приложения, что
+повышает продуктивность работы пользователей.</p>
+
+<p>Ваше приложение может определить момент активации режима PIP. Ниже приведено несколько примеров
+моментов перехода в режим PIP:</p>
+
+<ul>
+<li>Ваше приложение может перевести видео в режим PIP, когда пользователь переходит
+от видео к просмотру другого контента.</li>
+<li>Ваше приложение может переключить видео в режим PIP, когда пользователь смотрит конец
+эпизода контента. На основном экране отображается рекламная или сводная информация
+о следующем эпизоде серии.</li>
+<li>Ваше приложение может предоставить пользователям возможность добавлять в очередь дополнительный контент при
+просмотре видео. В режиме PIP видео продолжает воспроизводиться, когда на основном
+экране отображается операция выбора контента.</li>
+</ul>
+
+<p>Окно PIP имеет размеры 240x135 dp и отображается на самом верхнем слое в одном из
+четырех углов экрана по выбору системы. Пользователь может вызвать
+меню PIP, позволяющее переключать окно PIP в полноэкранный режим, или закрыть окно
+PIP долгим нажатием кнопки <b>Home</b> на пульте дистанционного управления. Если на главном экране начнется воспроизведение другого
+видео, окно PIP автоматически
+закроется. Пользователи также могут закрыть окно PIP, используя экран последних задач.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>Рисунок 1.</strong> Видео в режиме "картинка в картинке"
+ отображается в углу экрана, пока пользователь просматривает
+контент на главном экране.</p>
+
+<p>Режим PIP использует многооконные API-интерфейсы в Android N для
+отображения закрепленного окна с видео на верхнем слое. Чтобы добавить в приложение функцию PIP, вам нужно зарегистрировать
+операции, поддерживающие PIP, добавить необходимые переключения операции в режим PIP,
+а также обеспечить скрытие элементов пользовательского интерфейса и воспроизведение видео в то время, когда
+операция находится в режиме PIP.</p>
+
+<h2 id="declaring">Декларация поддержки операцией режима "картинка в картинке"</h2>
+
+<p>По умолчанию в системе отсутствует автоматическая поддержка режима PIP для приложений.
+Если вы хотите, чтобы ваше приложение поддерживало режим PIP, зарегистрируйте операцию
+воспроизведения видео в манифесте приложения, установив для параметров
+<code>android:supportsPictureInPicture</code> и
+<code>android:resizeableActivity</code> значение <code>true</code>. Также укажите, что
+ваша операция обрабатывает изменения конфигурации макета экрана, чтобы эта операция не
+запускалась заново в случае изменения макета при переходах в режиме PIP.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>При регистрации операции помните, что в режиме PIP она
+отображается в небольшом наложенном окне на экране телевизора. Для пользователей наиболее удобны операции
+воспроизведения видео с минимальным пользовательским интерфейсом. Операции
+с небольшими элементами пользовательского интерфейса могут оказаться неудобными для пользователей
+в режиме PIP, потому что в окне PIP пользователи
+не видят деталей этих элементов.</p>
+
+<h2 id="pip_button">Переключение операции в режим "картинка в картинке"</h2>
+
+Если вам нужно переключить операцию в режим PIP, вызовите метод
+<code>Activity.enterPictureInPicture()</code>. В следующем примере показано переключение
+в режим PIP, когда пользователь нажимает кнопку PIP на панели
+управления мультимедиа:</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPicture();
+ return;
+ }
+ ...
+</pre>
+
+<p>Добавление кнопки PIP на панель управления мультимедиа позволяет пользователям легко переключаться
+в режим PIP с сохранением возможностей управления воспроизведением видео.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>Рисунок 1.</strong> Кнопка режима "картинка в картинке"
+на панели управления мультимедиа.</p>
+
+<p>В Android N входит новый класс
+<code>PlaybackControlsRow.PictureInPictureAction</code>, который определяет действия PIP
+на панели управления и использует значок PIP.</p>
+
+<h2 id="handling_ui">Работа пользовательского интерфейса в режиме "картинка в картинке"</h2>
+
+<p>Когда операция переходит в режим PIP, она должна отображать только воспроизведение
+видео. Уберите элементы пользовательского интерфейса перед переходом операции в режим PIP
+и восстановите их после возвращения операции в полноэкранный режим.
+Переопределите <code>Activity.onPictureInPictureChanged()</code> или
+<code>Fragment.onPictureInPictureChanged()</code> и включайте или
+отключайте элементы пользовательского интерфейса по мере необходимости, например:</p>
+
+<pre>
+@Override
+public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ if (inPictureInPicture) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">Продолжение воспроизведения видео в режиме
+"картинка в картинке"</h2>
+
+<p>Когда операция переключается в режим PIP, система видит ее в состоянии
+паузы и вызывает метод <code>onPause()</code> этой операции. При этом воспроизведение видео
+должно продолжаться без паузы, если операция
+приостановлена в режиме PIP. Проверьте режим PIP в методе
+<code>onPause()</code> своей операции и обеспечьте обработку воспроизведения соответствующим образом,
+например:</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called due to PIP, do not pause playback
+ if (inPictureInPicture()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>Когда операция возвращается из режима PIP в полноэкранный режим, система
+возобновляет выполнение операции и вызывает метод<code>onResume()</code> вашего приложения.</p>
+
+<h2 id="best">Советы и рекомендации</h2>
+
+<p>Режим PIP предназначается для операций, воспроизводящих видео в полноэкранном режиме. При переключении
+операции в режим PIP следует избегать отображения любых элементов, кроме видео.
+Отслеживайте моменты перехода операции в режим PIP и скрывайте элементы пользовательского интерфейса, как описано в
+разделе <a href="#handling_ui">Работа пользовательского интерфейса в режиме "картинка в картинке"</a>.</p>
+
+<p>Поскольку окно PIP отображается в виде плавающего окна в углу экрана,
+следует избегать отображения критически важной информации на основном экране
+в любой области, которая может быть закрыта окном PIP.</p>
+
+<p>По умолчанию фокус ввода не переключается на операцию, которая находится в режиме PIP. Для
+получения событий ввода в режиме PIP следует использовать
+<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/ru/preview/features/tv-recording-api.jd b/docs/html-intl/intl/ru/training/tv/tif/content-recording.jd
similarity index 100%
rename from docs/html-intl/intl/ru/preview/features/tv-recording-api.jd
rename to docs/html-intl/intl/ru/training/tv/tif/content-recording.jd
diff --git a/docs/html-intl/intl/vi/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/vi/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..58834a5
--- /dev/null
+++ b/docs/html-intl/intl/vi/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,480 @@
+page.title=Các thay đổi Hành vi
+page.keywords=preview,sdk,compatibility
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Trong tài liệu này</h2>
+
+<ol>
+ <li><a href="#perf">Cải thiện Hiệu năng</a>
+ <ol>
+ <li><a href="#doze">Chế độ Ngủ sâu</a></li>
+ <li><a href="#bg-opt">Tối ưu hóa Chạy ngầm</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">Thay đổi Quyền</a></li>
+ <li><a href="#accessibility">Cải thiện Trợ năng</a>
+ <ol>
+ <li><a href="#screen-zoom">Thu phóng Màn hình</a></li>
+ <li><a href="#vision-settings">Cài đặt Khả năng nhìn trong Trình Thiết lập</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">Liên kết Ứng dụng NDK với Thư viện Nền tảng</a></li>
+ <li><a href="#afw">Android cho Công việc</a></li>
+</ol>
+
+<h2>Xem thêm</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">
+ Tổng quan về API Android N</a></li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Với các tính năng và khả năng mới, Android N
+ cũng có một số các thay đổi hành vi của hệ thống và API. Tài liệu
+ này nêu bật một số các thay đổi quan trọng mà bạn cần biết và cân nhắc cho
+ ứng dụng của mình.
+</p>
+
+<p>
+ Nếu bạn đã từng phát hành ứng dụng cho Android, hãy lưu ý rằng các thay đổi
+ trong nền tảng này có thể tác động đến ứng dụng của bạn.
+</p>
+
+
+<h2 id="perf">Cải thiện Hiệu năng</h2>
+
+<p>
+ Android N có chứa các thay đổi hành vi của hệ thống nhằm cải thiện thời lượng
+ pin của thiết bị, sử dụng RAM và hiệu năng ứng dụng. Các thay đổi này có thể tác động đến
+ tính khả dụng của tài nguyên và các thông báo hệ thống đối tới ứng dụng. Bạn
+ nên tìm hiểu các thay đổi này và đánh giá xem ứng dụng cần phải điều chỉnh như thế nào đối với
+ các thay đổi.
+</p>
+
+<h3 id="doze">Chế độ Ngủ sâu</h3>
+
+<p>
+ Được đưa vào Android 6.0 (Mức API 23), Chế độ Ngủ sâu cải thiện thời lượng pin bằng cách
+ trì hoãn các hoạt động của CPU và mạng khi người dùng không cắm sạc,
+ không di chuyển và tắt màn hình thiết bị. Android N
+ thêm các cải tiến cho Chế độ Ngủ sâu bằng cách sử dụng một tập con các hạn chế của CPU và mạng
+ khi thiết bị không được cắm sạc với màn hình bị tắt, nhưng không nhất thiết
+ phải để một chỗ, ví dụ như một thiết bị cầm tay di chuyển trong túi của người dùng.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>Hình 1.</strong> Minh họa cách thức Chế độ Ngủ sâu áp dụng ở cấp đầu tiên của
+ các hạn chế hoạt động hệ thống nhằm cải thiện thời lượng pin.
+</p>
+
+<p>
+ Khi một thiết bị dùng nguồn điện từ pin và màn hình bị tắt trong một khoảng thời gian
+ nhất định, thiết bị sẽ chuyển vào Chế độ Ngủ sâu và áp dụng tập con đầu tiên của các hạn chế: Nó
+ sẽ ngắt truy cập mạng của ứng dụng và trì hoãn các tác vụ và các đồng bộ. Nếu thiết bị
+ được đặt một chỗ trong một khoảng thời gian nhất định sau khi vào Chế độ Ngủ sâu thì hệ thống sẽ áp dụng
+ các hạn chế còn lại của Chế độ Ngủ sâu thành {@link android.os.PowerManager.WakeLock}, báo thức
+{@link android.app.AlarmManager}, GPS, quét Wi-Fi. Cho dù
+ một số hoặc tất cả các hạn chế của Chế độ Ngủ sâu có được áp dụng hay không thì hệ thống sẽ đánh thức
+ thiết bị trong các khoảng thời gian bảo trì ngắn, trong đó các ứng dụng được phép
+ truy cập mạng và có thể thực thi mọi tác vụ/đồng bộ bị trì hoãn.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>Hình 2.</strong> Minh họa cách Chế độ Ngủ sâu áp dụng cấp thứ hai của
+ các hạn chế hoạt động hệ thống sau khi thiết bị được đặt một chỗ trong một khoảng thời gian nhất định.
+</p>
+
+<p>
+ Lưu ý rằng việc bật màn hình hoặc cắm sạc sẽ đưa thiết bị thoát Chế độ Ngủ sâu và
+ loại bỏ các hạn chế xử lý này. Hành vi bổ sung này không
+ ảnh hưởng đến các khuyến nghị và các thực hành tốt nhất khi thích ứng cho ứng dụng của bạn với phiên bản
+ Chế độ Ngủ sâu được đưa vào Android 6.0 (API mức 23) trước đó, như mô tả trong
+ <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
+ Tối ưu hóa Chế độ Ngủ sâu và Chế độ Chờ của Ứng dụng</a>. Bạn nên tiếp tục
+ làm theo các khuyến nghị đó, ví dụ như sử dụng Google Cloud Messaging (GCM) để
+ gửi và nhận tin nhắn, và hãy tiến hành áp dụng các bản cập nhật để nhận
+ hành vi Chế độ Ngủ sâu bổ sung.
+</p>
+
+
+<h3 id="bg-opt">Dự án Svelte: Tối ưu hóa Chạy ngầm</h3>
+
+<p>
+ Android N gỡ bỏ ba truyền phát không biểu thị để giúp tối ưu hóa cả
+ việc sử dụng bộ nhớ lẫn tiêu thụ điện năng. Thay đổi này là điều cần thiết bởi các truyền phát
+ không biểu thị thường xuyên khởi động các ứng dụng đã được đăng ký để lắng nghe chúng dưới
+ nền. Gỡ bỏ các truyền phát này có thể đem lại lợi ích lớn đối với hiệu năng
+ của thiết bị và trải nghiệm người dùng.
+</p>
+
+<p>
+ Các thiết bị di động thường xuyên gặp phải những thay đổi về kết nối, chẳng hạn như khi di chuyển
+ giữa Wi-Fi và dữ liệu di động. Hiện tại, các ứng dụng có thể theo dõi những thay đổi về
+ kết nối bằng cách đăng ký một bộ thu truyền phát cho {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} không biểu thị trong bản kê khai
+ của chúng. Vì nhiều ứng dụng đăng ký để nhận truyền phát này do đó một hoạt động chuyển mạng
+ duy nhất cũng có thể khiến tất cả các ứng dụng thức dậy và xử lý truyền phát đó ngay
+ lập tức.
+</p>
+
+<p>
+ Tương tự, các ứng dụng có thể đăng ký nhận truyền phát {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} và {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} không biểu thị từ các ứng dụng khác, ví dụ như
+ứng dụng Camera. Khi một người dùng chụp ảnh với ứng dụng Camera thì những ứng dụng này sẽ thức dậy
+ để xử lý truyền phát đó.
+</p>
+
+<p>
+ Để loại bỏ các vấn đề này, Android N áp dụng các cách tối ưu hóa
+ sau:
+</p>
+
+<ul>
+ <li>Ứng dụng nhắm mục tiêu Android N sẽ không nhận các truyền phát {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION}, ngay cả khi chúng
+ có các mục nhập của trong bản kê khai yêu cầu thông báo về các sự kiện này. Những ứng dụng đang chạy
+ ở tiền cảnh vẫn có thể lắng nghe {@code CONNECTIVITY_CHANGE} qua
+ luồng chính của chúng nếu yêu cầu thông báo bằng {@link
+ android.content.BroadcastReceiver}.
+ </li>
+
+ <li>Ứng dụng không thể gửi hoặc nhận các truyền phát {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} hoặc {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO}. Cách tối ưu này
+ tác động đến mọi ứng dụng, không chỉ các ứng dụng nhắm mục tiêu Android N.
+ </li>
+</ul>
+
+<p>
+ Các lần phát hành Android sau này có thể loại bỏ thêm các truyền phát không biểu thị, cũng
+ như các dịch vụ chạy ngầm không còn liên kết. Vì lý do này, bạn nên tránh dùng hoặc
+ gỡ bỏ các phụ thuộc trên các bộ thu được khai báo trong bản kê khai đối với các truyền phát không biểu thị,
+ cũng như các dịch vụ chạy ngầm.
+</p>
+
+<p>
+ Khuôn khổ Android cung cấp một số giải pháp để giảm thiểu sự cần thiết đối với
+ các truyền phát không biểu thị hoặc các dịch vụ chạy ngầm này. Ví dụ, API {@link
+ android.app.job.JobScheduler} cung cấp một cơ chế lên lịch hiệu quả
+ cho các hoạt động mạng khi đáp ứng các điều kiện được chỉ định, ví dụ như kết nối tới một
+ mạng không đo lưu lượng. Bạn còn có thể sử dụng {@link
+ android.app.job.JobScheduler} để phản ứng lại các thay đổi đối với trình cung cấp nội dung.
+</p>
+
+<p>
+ Để biết thêm thông tin về thay đổi hành vi này và cách thích ứng ứng dụng của bạn,
+ hãy xem <a href="{@docRoot}preview/features/background-optimization.html">Tối ưu hóa
+ Chạy ngầm</a>.
+</p>
+
+
+<h2 id="perm">Thay đổi Quyền</h2>
+
+<p>
+ Android N có các thay đổi đối với quyền có thể tác động đến ứng dụng của bạn,
+ bao gồm các quyền tài khoản người dùng và một quyền mới cho phép ghi vào
+ bộ nhớ ngoài. Sau đây là phần tóm tắt các quyền đã thay đổi trong
+ bản xem trước:
+</p>
+
+<ul>
+ <li>{@code GET_ACCOUNTS} (Bị loại bỏ)
+ <p>
+ Quyền GET_ACCOUNTS nay đã bị loại bỏ. Hệ thống sẽ bỏ qua quyền
+ này đối với các ứng dụng nhắm mục tiêu Android N.
+ </p>
+ </li>
+
+</ul>
+
+
+
+<h2 id="accessibility">Cải thiện Trợ năng</h2>
+
+<p>
+ Android N có các thay đổi nhằm nâng cao khả năng sử dụng
+ của nền tảng cho những người dùng có thị lực kém hoặc khiếm thị. Nhìn chung, các thay đổi này sẽ không
+ yêu cầu thay đổi mã nguồn trong ứng dụng của bạn. Tuy nhiên, bạn cần xem lại
+ các tính năng này và kiểm thử chúng với ứng dụng của mình để đánh giá các tác động tiềm tàng đối với trải nghiệm
+ người dùng.
+</p>
+
+
+<h3 id="screen-zoom">Thu phóng Màn hình</h3>
+
+<p>
+ Android N cho phép người dùng đặt <strong>Display size</strong> để phóng to
+ hoặc thu nhỏ tất cả các phần tử trên màn hình, nhờ đó cải thiện trợ năng của thiết bị
+ cho những người dùng có thị lực kém. Người dùng không thể thu phóng màn hình vượt quá chiều rộng màn hình
+ tối thiểu <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
+ sw320dp</a>. Đây là chiều rộng của Nexus 4, một máy điện thoại phổ biến có kích cỡ trung bình.
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>Hình 3.</strong> Màn hình bên phải hiển thị tác động của
+ việc tăng kích cỡ Hiển thị của một thiết bị đang chạy ảnh hệ thống Android N.
+</p>
+
+
+<p>
+ Khi mật độ của thiết bị thay đổi, hệ thống sẽ thông báo cho các ứng dụng đang chạy theo
+ những cách sau:
+</p>
+
+<ul>
+ <li>Nếu một ứng dụng nhắm mục tiêu mức API 23 hoặc thấp hơn thì hệ thống sẽ tự động tắt
+ tất cả các tiến trình chạy ngầm của ứng dụng đó. Điều này có nghĩa là nếu một người dùng rời khỏi
+ ứng dụng đó để mở màn hình <em>Settings</em> và thay đổi
+ <strong>Display size</strong> thì hệ thống sẽ tắt ứng dụng giống
+ như trong trường hợp thiết bị thiếu bộ nhớ. Nếu ứng dụng đó có bất kỳ tiến trình nào
+ chạy ở tiền cảnh thì hệ thống sẽ thông báo cho các tiến trình đó về thay đổi cấu hình như
+ mô tả trong <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý
+ Thay đổi Thời gian chạy</a>, giống như hướng của thiết bị vừa thay đổi.
+ </li>
+
+ <li>Nếu ứng dụng nhắm mục tiêu Android N thì mọi tiến trình của nó
+ (chạy ở tiền cảnh và chạy ngầm) đều được thông báo về thay đổi cấu hình như
+ mô tả trong <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý
+ Thay đổi Thời gian chạy</a>.
+ </li>
+</ul>
+
+<p>
+ Hầu hết các ứng dụng không cần thực hiện bất kỳ thay đổi nào để hỗ trợ tính năng này, miễn là
+ các ứng dụng đó tuân theo các thực hành tốt nhất của Android. Những điều cụ thể cần kiểm tra:
+</p>
+
+<ul>
+ <li>Kiểm thử ứng dụng của bạn trên một thiết bị có chiều rộng màn hình <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
+ và đảm bảo nó hoạt động đúng.
+ </li>
+
+ <li>Khi cấu hình của thiết bị thay đổi, hãy cập nhật mọi thông tin được lưu trữ trong bộ đệm
+ phụ thuộc vào mật độ, ví dụ như các ảnh bitmap được lưu đệm hoặc các tài nguyên được tải từ
+ mạng. Hãy kiểm tra các thay đổi cấu hình khi ứng dụng khôi phục từ trạng thái
+ tạm dừng.
+ <p class="note">
+ <strong>Lưu ý:</strong> Nếu bạn lưu trữ trong bộ đệm các dữ liệu phụ thuộc vào cấu hình thì nên
+ thêm siêu dữ liệu liên quan như kích cỡ
+ màn hình phù hợp hoặc mật độ điểm ảnh cho dữ liệu đó. Việc lưu siêu dữ liệu này cho phép bạn
+ quyết định liệu bạn có cần phải làm mới dữ liệu được lưu trữ đệm sau khi một cấu hình
+ thay đổi.
+ </p>
+ </li>
+
+ <li>Tránh chỉ định các kích thước theo đơn vị px vì chúng không thay đổi tỉ lệ theo
+ mật độ màn hình. Thay vào đó, hãy chỉ định các kích thước bằng các đơn vị <a href="{@docRoot}guide/practices/screens_support.html">điểm ảnh
+ độc lập với mật độ</a> (<code>dp</code>).
+ </li>
+</ul>
+
+<h3 id="vision-settings">Cài đặt Khả năng nhìn trong Trình Thiết lập</h3>
+
+<p>
+ Android N có Cài đặt Khả năng nhìn trên màn hình Chào mừng, nơi người dùng có thể
+ thiết lập các cài đặt trợ năng sau đây trên một thiết bị mới:
+ <strong>Magnification gesture</strong>, <strong>Font size</strong>,
+ <strong>Display size</strong> và <strong>TalkBack</strong>. Thay đổi này
+ sẽ tăng khả năng thấy được các khiếm khuyết liên quan đến những cài đặt màn hình khác nhau. Để
+ đánh giá tác động của tính năng này, bạn có thể kiểm thử ứng dụng của mình với các
+ cài đặt sau được bật. Bạn có thể tìm các cài đặt này trong <strong>Settings >
+ Accessibility</strong>.
+</p>
+
+<h2 id="ndk">Liên kết Ứng dụng NDK với Thư viện Nền tảng</h2>
+
+<p>
+ Android N có các thay đổi đối với không gian tên để ngăn việc tải các API không công khai.
+ Nếu bạn sử dụng NDK, bạn chỉ nên sử dụng các API công khai từ nền tảng
+ Android. Sử dụng các API không công khai trong bản phát hành chính thức tiếp theo của Android
+ có thể khiến ứng dụng bị treo.
+</p>
+
+<p>
+ Để cảnh báo cho bạn việc sử dụng các API không công khai, các ứng dụng chạy trên thiết bị
+ Android N sẽ tạo ra một lỗi trong phần xuất ra của logcat khi một ứng dụng gọi một API không công khai.
+ Lỗi này cũng được hiển thị trên màn hình thiết bị dưới dạng thông báo để hỗ trợ
+ nâng cao nhận biết đối với tình huống này. Bạn nên xem lại mã của ứng dụng để
+ gỡ bỏ phần sử dụng các API nền tảng không công khai và kiểm thử kỹ lưỡng ứng dụng bằng
+ một thiết bị hoặc bộ giả lập của bản xem trước.
+</p>
+
+<p>
+ Nếu ứng dụng của bạn phụ thuộc vào các thư viện của nền tảng, hãy xem tài liệu NDK để biết
+ các cách khắc phục cơ bản nhằm thay thế các API không công khai bằng các API công khai tương ứng.
+ Bạn cũng có thể liên kết với các thư viện của nền tảng mà không nhận biết ứng dụng,
+ đặc biệt nếu ứng dụng của bạn sử dụng thư viện thuộc một phần của nền tảng (như
+ <code>libpng</code>), nhưng không thuộc NDK. Trong trường hợp đó, hãy đảm bảo rằng
+ tệp APK của bạn có chứa tất cả các tệp .so bạn dự định liên kết với.
+</p>
+
+<p class="caution">
+ <strong>Cẩn trọng:</strong> Một số thư viện của bên thứ ba có thể liên kết với các API
+ không công khai. Nếu ứng dụng của bạn sử dụng các thư viện này thì ứng dụng của bạn có thể gặp lỗi sụp đổ khi đang chạy
+ trong lần phát hành Android chính thức kế tiếp.
+</p>
+
+<p>
+ Các ứng dụng không nên phụ thuộc vào hoặc sử dụng các thư viện gốc không kèm theo trong
+ NDK bởi vì chúng có thể thay đổi hoặc bị gỡ bỏ khỏi khi phát hành bản Android khác
+ thay cho bản cũ. Việc chuyển từ OpenSSL sang BoringSSL là một ví dụ về sự thay đổi đó.
+ Ngoài ra, các thiết bị khác nhau có thể cung cấp các mức độ tương thích khác nhau bởi
+ không có yêu cầu nào về khả năng tương thích cho các thư viện nền tảng không đi kèm với
+ NDK. Nếu bạn buộc phải sử dụng các thư viện không thuộc NDK trên các thiết bị cũ, hãy thực hiện
+ quá trình tải phụ thuộc vào mức Android API.
+</p>
+
+<p>
+ Nhằm giúp bạn chẩn đoán các loại vấn đề này, sau đây là một số lỗi Java và NDK
+ ví dụ bạn có thể gặp phải khi cố dựng ứng dụng với Android N:
+</p>
+
+<p>Ví dụ lỗi Java:</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>Ví dụ lỗi NDK:</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ Sau đây là một số cách khắc phục đối với ứng dụng gặp phải các kiểu lỗi này:
+</p>
+
+<ul>
+ <li>Việc sử dụng getJavaVM và getJNIEnv trong libandroid_runtime.so có thể được thay
+ bằng các hàm JNI chuẩn:
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>Việc sử dụng ký hiệu {@code property_get} trong {@code libcutils.so} có thể được
+ thay bằng phương thức {@code __system_property_get} công khai thay thế.
+ Để làm điều này, hãy dùng {@code __system_property_get} với câu lệnh include sau:
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>Việc sử dụng ký hiệu {@code SSL_ctrl} trong {@code libcrypto.so} nên được
+ thay bằng một ký hiệu cục bộ của ứng dụng. Ví dụ, bạn nên liên kết tĩnh
+ {@code libcyrpto.a} trong tệp {@code .so} hoặc thêm tham chiếu
+ {@code libcrypto.so} động của riêng mình từ BoringSSL hoặc OpenSSL trong ứng dụng của bạn.
+ </li>
+</ul>
+
+<h2 id="afw">Android cho Công việc</h2>
+<p>
+ Android N có các thay đổi cho ứng dụng nhắm mục tiêu Android cho Công việc, bao gồm
+ các thay đổi đối với cài đặt chứng chỉ, đặt lại mật khẩu, quản lý người dùng
+ thứ hai và truy cập các mã định danh của thiết bị. Nếu bạn đang dựng các ứng dụng dành cho
+ các môi trường Android cho Công việc thì bạn nên xem lại các thay đổi này và chỉnh sửa
+ ứng dụng của mình cho phù hợp.
+</p>
+
+<ul>
+ <li>Bạn phải cài đặt một trình cài đặt chứng chỉ ủy thác trước khi DPC có thể đặt
+ nó. Đối với cả ứng dụng người sở hữu cấu hình và ứng dụng người sở hữu thiết bị nhắm mục tiêu SDK N, bạn cần
+ cài đặt trình cài đặt chứng chỉ ủy thác trước khi trình kiểm soát
+ chính sách của thiết bị (DPC) gọi
+ <code>DevicePolicyManager.setCertInstallerPackage()</code>. Nếu trình cài đặt
+ chưa được cài thì hệ thống sẽ đưa ra một
+ <code>IllegalArgumentException</code>.
+ </li>
+
+ <li>Giờ đây các hạn chế đặt lại mật khẩu cho người quản lý thiết bị sẽ áp dụng với người sở hữu
+ cấu hình. Người quản lý thiết bị không thể sử dụng
+ <code>DevicePolicyManager.resetPassword()</code> được nữa để xóa mật khẩu hoặc thay đổi
+ các mật khẩu đã đặt. Người quản lý thiết bị vẫn có thể đặt một mật khẩu nhưng chỉ
+ khi thiết bị không có mật khẩu, mã PIN hoặc mẫu hình.
+ </li>
+
+ <li>Người sở hữu thiết bị hoặc cấu hình có thể quản lý các tài khoản ngay cả khi các hạn chế được
+ đặt. Người sở hữu thiết bị và người sở hữu cấu hình có thể gọi các API Quản lý tài khoản
+ ngay cả khi các hạn chế người dùng <code>DISALLOW_MODIFY_ACCOUNTS</code> đã có sẵn.
+ </li>
+
+ <li>Người sở hữu thiết bị có thể quản lý những người dùng thứ cấp dễ dàng hơn. Khi một thiết bị
+ đang chạy trong chế độ người sở hữu thiết bị, hạn chế <code>DISALLOW_ADD_USER</code>
+ sẽ được đặt tự động. Điều này ngăn người dùng tạo các người dùng
+ thứ cấp không được quản lý. Ngoài ra, các phương thức <code>CreateUser()</code> và
+ <code>createAndInitial()</code> đã bị loại bỏ; phương thức
+<code>DevicePolicyManager.createAndManageUser()</code> mới sẽ thay thế chúng.
+ </li>
+
+ <li>Người sở hữu thiết bị có thể truy cập các mã định danh của thiết bị. Một người sở hữu thiết bị có thể truy cập
+ địa chỉ MAC của Wi-Fi của một thiết bị, bằng phương thức
+ <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Nếu Wi-Fi chưa từng
+ được bật trên thiết bị đó thì phương thức này sẽ trả về một giá trị {@code null}.
+ </li>
+</ul>
+
+<p>
+ Để biết thêm thông tin về các thay đổi đối với Android cho Công việc trong Android N, hãy xem
+ <a href="{@docRoot}preview/features/afw.html">Cập nhật của Android cho Công việc</a>.
+</p>
+
+<h2 id="other">Các điểm quan trọng khác</h2>
+
+<ul>
+<li>Khi một ứng dụng đang chạy trên Android N nhưng nhắm mục tiêu mức API thấp hơn,
+và người dùng thay đổi kích cỡ hiển thị thì tiến trình của ứng dụng sẽ bị tắt. Ứng dụng
+phải có khả năng xử lý tình huống này một cách tinh tế. Nếu không, ứng dụng sẽ bị lỗi sụp đổ
+khi người dùng khôi phục nó từ mục Gần đây.
+
+<p>
+Bạn cần kiểm thử ứng dụng để đảm bảo
+rằng hành vi này không xảy ra.
+Bạn có thể thực hiện điều đó bằng cách gây ra một lỗi sụp đổ giống vậy
+khi tắt ứng dụng một cách thủ công qua DDMS.
+</p>
+
+<p>
+Các ứng dụng nhắm mục tiêu N và cao hơn sẽ không bị tắt tự động khi có các thay đổi về mật độ;
+tuy nhiên, chúng có thể phản hồi khó khăn đối với các thay đổi cấu hình.
+</p>
+</li>
+
+<li>
+Các ứng dụng trên Android N cần có khả năng xử lý các thay đổi cấu hình một cách tinh tế,
+và không bị lỗi sụp đổ trong các lần khởi động tiếp theo. Bạn có thể kiểm tra hành vi ứng dụng
+bằng cách thay đổi kích cỡ phông chữ (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>), và sau đó khôi phục
+ứng dụng từ mục Gần đây.
+</li>
+</ul>
+
diff --git a/docs/html-intl/intl/vi/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/vi/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..448c39d
--- /dev/null
+++ b/docs/html-intl/intl/vi/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=Samples
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ Các mã mẫu sau được dành cho Android N. Để
+ tải xuống mã mẫu cho Android Studio, hãy chọn tùy chọn trong menu <b>File > Import
+ Samples</b>.
+</p>
+
+<p class="note">
+ <strong>Chú ý:</strong>Các dự án có thể tải xuống này được thiết kế
+ để sử dụng với Gradle và Android Studio.
+</p>
+
+
+<h3 id="mw">Dùng thử đa cửa sổ</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ Ví dụ này minh họa cách tận dụng giao diện người dùng
+ đa cửa sổ với ứng dụng của bạn.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+ Tải mã trên GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">Thông báo đang Hoạt động</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Đây là ví dụ đã có sẵn, minh họa một dịch vụ đơn giản để gửi
+ thông báo bằng cách sử dụng NotificationCompat. Mỗi cuộc hội thoại chưa đọc từ một người dùng
+ sẽ được gửi dưới dạng một thông báo riêng.
+</p>
+<p>
+ Ví dụ này đã được cập nhật để tận dụng các tính năng thông báo mới
+ có trong Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+ Tải mã trên GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">Dịch vụ Nhắn tin</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ Đây là một ví dụ đã có sẵn, minh họa cách sử dụng
+ NotificationManager để cho biết có bao nhiêu thông báo một ứng dụng hiện
+ đang hiển thị.
+</p>
+<p>
+ Ví dụ này đã được cập nhật để tận dụng các tính năng thông báo mới
+ có trong Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+ Tải mã trên GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">Khởi động Trực tiếp</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Ví dụ này minh họa cách lưu trữ và truy cập dữ liệu trên bộ lưu trữ
+ mã hóa thiết bị, luôn khả dụng khi thiết bị được khởi động.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+ Tải mã trên GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">Truy cập Thư mục theo Phạm vi</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ Ví dụ này minh họa cách đọc và ghi dữ liệu từ các thư mục
+ cụ thể trong khi cần ít quyền hơn.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+ Tải mã trên GitHub</a>
+</p>
diff --git a/docs/html-intl/intl/vi/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/vi/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..b218a4e
--- /dev/null
+++ b/docs/html-intl/intl/vi/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,676 @@
+page.title=Android N cho Nhà phát triển
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>Các tính năng chính cho nhà phát triển</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">Hỗ trợ đa cửa sổ</a></li>
+ <li><a href="#notification_enhancements">Thông báo</a></li>
+ <li><a href="#jit_aot">Biên dịch JIT/AOT</a></li>
+ <li><a href="#quick_path_to_app_install">Cài đặt ứng dụng nhanh chóng</a></li>
+ <li><a href="#doze_on_the_go">Chế độ Ngủ sâu khi di chuyển</a></li>
+ <li><a href="#background_optimizations">Tối ưu hóa chạy ngầm</a></li>
+ <li><a href="#data_saver">Tiết kiệm dữ liệu</a></li>
+ <li><a href="#tile_api">API cho ô Cài đặt nhanh</a></li>
+ <li><a href="#number-blocking">Chặn số</a></li>
+ <li><a href="#call_screening">Sàng lọc cuộc gọi</a></li>
+ <li><a href="#multi-locale_languages">Bản địa và ngôn ngữ</a></li>
+ <li><a href="#icu4">API ICU4J trong Android</a></li>
+ <li><a href="#gles_32">API OpenGL ES 3.2</a></li>
+ <li><a href="#android_tv_recording">Ghi lại trên Android TV</a></li>
+ <li><a href="#android_for_work">Android cho Công việc</a></li>
+ <li><a href="#accessibility_enhancements">Trợ năng</a></li>
+ <li><a href="#direct_boot">Khởi động Trực tiếp</a></li>
+ <li><a href="#key_attestation">Chứng thực khóa</a></li>
+ <li><a href="#network_security_config">Cấu hình Bảo mật mạng</a></li>
+ <li><a href="#default_trusted_ca">CA an toàn mặc định</a></li>
+ <li><a href="apk_signature_v2">Lược đồ chữ ký số v2 cho tệp APK</a></li>
+ <li><a href="#scoped_directory_access">Truy cập thư mục theo phạm vi</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N vẫn đang trong quá trình phát triển nhưng bây giờ bạn có thể dùng thử
+dưới dạng N Developer Preview. Các phần dưới đây sẽ nêu bật một số
+tính năng mới cho nhà phát triển. </p>
+
+<p>
+ Bạn cần xem <a href="{@docRoot}preview/behavior-changes.html">Các thay đổi Hành vi</a> để biết được
+ những phần thay đổi của nền tảng có thể ảnh hưởng đến ứng dụng của bạn, hãy xem
+ các hướng dẫn cho nhà phát triển để biết thêm về những tính năng chính và tải xuống tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a> để biết chi tiết về
+ các API mới.
+</p>
+
+<h2 id="multi-window_support">Hỗ trợ đa cửa sổ</h2>
+
+
+<p>Trong Android N, chúng tôi sẽ đưa vào nền tảng một tính năng đa nhiệm mới
+ rất được mong đợi — hỗ trợ đa cửa sổ. </p>
+
+ <p>Giờ đây người dùng có thể nhanh chóng mở đồng thời hai ứng dụng trên màn hình. </p>
+ <ul>
+ <li>Trên điện thoại và máy tính bảng
+chạy Android N, người dùng có thể chạy hai ứng dụng song song hai bên hoặc
+ trên dưới trong chế độ chia đôi màn hình. Người dùng có thể thay đổi kích thước của ứng dụng bằng cách kéo
+thanh phân chia ở giữa. </li>
+
+<li>Trên thiết bị Android TV, các ứng dụng có thể tự đặt vào <a href="{@docRoot}preview/features/picture-in-picture.html">chế độ
+hình-trong-hình</a>, cho phép ứng dụng tiếp tục hiển thị nội dung khi người dùng duyệt web hoặc
+tương tác với ứng dụng khác. Hãy xem bên dưới để biết thêm thông tin. </li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>Hình 1.</strong> Các ứng dụng chạy trong chế độ chia màn hình.
+</p>
+ </div>
+
+<p>Đặc biệt là trên máy tính bảng và các thiết bị màn hình lớn khác, việc hỗ trợ đa cửa sổ
+cho phép bạn mang lại những cách thức mới thu hút người dùng. Thậm chí bạn còn có thể cho phép kéo thả trong
+ứng dụng để người dùng kéo nội dung một cách thuận tiện vào hoặc ra ngoài ứng dụng của bạn — đây là một cách
+nâng cao trải nghiệm của người dùng rất hiệu quả. </p>
+
+<p>Thêm tính năng hỗ trợ đa màn hình vào ứng dụng của bạn và cấu hình cách thức
+xử lý hiển thị đa cửa sổ là điều rất đơn giản. Ví dụ, bạn có thể chỉ định kích thước
+tối thiểu cho phép của hoạt động, ngăn người dùng thay đổi kích thước của hoạt động nhỏ hơn
+kích thước đó. Bạn cũng có thể vô hiệu hóa hiển thị đa cửa sổ cho ứng dụng của mình, giúp
+ đảm bảo hệ thống sẽ chỉ hiển thị ứng dụng của bạn ở chế độ toàn màn hình.</p>
+
+<p>
+ Để biết thêm thông tin, hãy xem tài liệu cho nhà phát triển <a href="{@docRoot}preview/features/multi-window.html">Hỗ trợ đa cửa sổ</a>
+.
+</p>
+
+<h2 id="notification_enhancements">Cải tiến thông báo</h2>
+
+<p>Chúng tôi đã thiết kế lại thông báo trong Android N để chúng được sử dụng dễ dàng và nhanh
+hơn. Một số các thay đổi bao gồm:</p>
+
+<ul>
+ <li>
+ <strong>Cập nhật Mẫu</strong>: Chúng tôi đã cập nhật các mẫu thông báo để
+ tạo điểm nhấn mới cho ảnh gây ấn tượng và ảnh đại diện. Nhà phát triển sẽ có thể
+ tận dụng các mẫu mới nhưng chỉ cần thực hiện một số chỉnh sửa nhỏ trong mã nguồn của họ.
+ </li>
+
+ <li>
+ <strong>Thông báo gộp</strong>: Hệ thống có thể nhóm các tin nhắn
+ lại với nhau, ví dụ như theo chủ đề tin nhắn và hiển thị thành nhóm. Người dùng có thể
+ thực hiện các thao tác như Hủy hoặc Lưu trữ chúng ngay tại chỗ. Nếu bạn từng
+ triển khai các thông báo cho Android Wear thì bạn đã làm quen với
+ mô hình này.
+ </li>
+
+ <li>
+ <strong>Trả lời trực tiếp</strong>: Đối với những ứng dụng giao tiếp theo thời gian thực,
+ hệ thống Android sẽ hỗ trợ trả lời ngay tại chỗ để người dùng có thể nhanh chóng phản hồi lại
+ một tin nhắn SMS hoặc tin nhắn văn bản trực tiếp bên trong giao diện thông báo đó.
+ </li>
+
+ <li>
+ <strong>Dạng xem tùy chỉnh</strong>: Hai API mới cho phép bạn sử dụng các trang trí
+ hệ thống như tiêu đề và hành động của thông báo khi sử dụng các dạng xem
+ tùy chỉnh trong thông báo.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>Hình 2.</strong> Thông báo gộp và trả lời trực tiếp.
+</p>
+
+<p>Hãy xem
+ hướng dẫn về <a href="{@docRoot}preview/features/notification-updates.html">Thông báo</a>
+ để biết cách triển khai các tính năng mới này.</p>
+
+
+
+<h2 id="jit_aot">Biên dịch JIT/AOT theo cấu hình</h2>
+
+<p>Trong Android N, chúng tôi đã bổ sung một trình biên dịch Just in Time (JIT) có mã được cấu hình cho
+ART, cho phép nó nâng cao hiệu năng của các ứng dụng Android tức thì khi
+chạy. Trình biên dịch JIT bổ trợ thêm cho trình biên dịch Ahead of Time (AOT) của ART
+và giúp cải hiện hiệu năng thời gian chạy, tiết kiệm không gian lưu trữ và tăng tốc độ các bản cập nhật của
+ứng dụng và cập nhật của hệ thống.</p>
+
+<p>Biên dịch theo cấu hình cho phép ART quản lý quá trình biên dịch AOT/JIT của từng ứng dụng
+tùy theo sử dụng thực tế cũng như các điều kiện trên thiết bị. Ví
+dụ, ART sẽ duy trì một cấu hình cho các phương thức hay dùng nhất của mỗi ứng dụng và có thể biên dịch trước
+rồi tạo bộ đệm cho các phương thức đó để có hiệu năng cao nhất. Những phần khác của ứng dụng
+sẽ được giữ nguyên không biên dịch cho đến khi chúng thực sự được sử dụng.</p>
+
+<p>Bên cạnh nâng cao hiệu năng cho các phần chính của ứng dụng, quá trình biên dịch
+theo cấu hình còn giúp giảm tổng lượng RAM được sử dụng của ứng dụng, bao gồm cả các
+tệp nhị phân liên quan. Tính năng này đặc biệt quan trọng trên các thiết bị ít bộ nhớ.</p>
+
+<p>ART sẽ quản lý quá trình biên dịch theo cấu hình bằng cách giảm tối thiểu tác động đến
+pin của thiết bị. Nó sẽ tiến hành quá trình biên dịch trước chỉ khi nào thiết bị nhàn rỗi và
+đang sạc, giúp tiết kiệm thời gian và pin bằng cách thực hiện công việc đó trước.</p>
+
+<h2 id="quick_path_to_app_install">Cài đặt ứng dụng nhanh chóng</h2>
+
+<p>Một trong những lợi ích dễ thấy nhất của trình biên dịch JIT của ART là tốc độ cài đặt
+ứng dụng và cập nhật hệ thống. Ngay cả các ứng dụng lớn cần vài phút để
+tối ưu và cài đặt trong Android 6.0 thì giờ đây có thể cài đặt chỉ trong một vài
+giây. Các cập nhật cho hệ thống cũng sẽ nhanh hơn vì không còn bước tối ưu hóa nữa. </p>
+
+<h2 id="doze_on_the_go">Chế độ Ngủ sâu khi di chuyển...</h2>
+
+<p>Chế độ Ngủ sâu đã được giới thiệu trong Android 6.0. Đây là một chế độ của hệ thống giúp tiết kiệm pin bằng cách trì hoãn
+các hoạt động CPU và mạng của ứng dụng khi thiết bị đang nhàn rỗi, ví dụ như khi thiết bị
+đang nằm trên bàn hoặc trong ngăn kéo. </p>
+
+<p>Giờ đây Chế độ Ngủ sâu trong Android N đã được cải tiến thêm và tiết kiệm pin ngay cả khi đang di chuyển.
+Bất kỳ khi nào màn hình đang tắt trong một khoảng thời gian và thiết bị không được cắm sạc thì
+Chế độ Ngủ sâu sẽ áp dụng tập con của các hạn chế CPU và mạng quen thuộc đối với các ứng dụng.
+Điều này có nghĩa là người dùng có thể tiết kiệm pin ngay cả khi đang mang thiết bị trong túi
+của họ.</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>Hình 3.</strong> Chế độ Ngủ sâu đang áp dụng
+ các hạn chế để cải thiện thời lượng pin ngay cả khi thiết bị không được đặt một chỗ.
+</p>
+
+
+<p>Sau một khoảng thời gian ngắn khi màn hình tắt và thiết bị chỉ chạy bằng nguồn pin, Chế độ Ngủ sâu
+sẽ hạn chế truy cập mạng và trì hoãn các tác vụ, đồng bộ. Trong các khoảng thời gian
+bảo trì ngắn, các ứng dụng sẽ được phép truy cập mạng và mọi tác vụ/đồng bộ
+bị trì hoãn sẽ được thực thi. Bật màn hình hoặc cắm sạc vào thiết bị sẽ đưa
+thiết bị thoát khỏi Chế độ Ngủ sâu.</p>
+
+<p>Khi để thiết bị nằm một chỗ lần nữa với màn hình được tắt và chạy bằng pin trong một
+khoảng thời gian thì Chế độ Ngủ sâu sẽ áp dụng toàn bộ các hạn chế CPU và mạng đối với {@link
+android.os.PowerManager.WakeLock}, báo thức {@link android.app.AlarmManager} và quét
+GPS/Wi-Fi.</p>
+
+<p>Bạn có thể áp dụng các thực hành tốt nhất tương tự để điều chỉnh ứng dụng của mình cho Chế độ Ngủ sâu cho dù
+thiết bị có đang di chuyển hay đứng yên. Do đó, nếu bạn đã cập nhật ứng dụng để xử lý
+Chế độ Ngủ sâu một cách tinh tế thì bạn hoàn toàn yên tâm. Nếu không, hãy tiến hành <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">làm cho
+ ứng dụng thích ứng với Chế độ Ngủ sâu</a> ngay.</p>
+
+<h2 id="background_optimizations">Dự án Svelte: Tối ưu hóa chạy ngầm</h2>
+
+<p>Dự án Svelte là một nỗ lực liên tục nhằm tối giảm sử dụng RAM của hệ thống và các ứng dụng
+trên khắp hệ sinh thái các thiết bị Android. Trong Android N, dự án
+Svelte tập trung vào việc tối ưu hóa cách thức các ứng dụng chạy ngầm. </p>
+
+<p>Xử lý chạy ngầm là một phần quan trọng của hầu hết các ứng dụng. Khi sử dụng đúng cách, nó
+có thể giúp cho trải nghiệm người dùng của bạn trở nên tuyệt vời — tức thì, nhanh chóng và nhận biết được bối cảnh.
+Khi không sử dụng đúng cách, xử lý chạy ngầm có thể tiêu tốn RAM (và
+pin) một cách không cần thiết cũng như ảnh hưởng đến hiệu năng hệ thống cho các ứng dụng khác. </p>
+
+<p>Kể từ Android 5.0, {@link android.app.job.JobScheduler} đã trở thành
+cách thức được ưu tiên để thực hiện công việc chạy ngầm thích hợp
+cho người dùng. Ứng dụng có thể lên lịch cho các tác vụ trong khi cho phép hệ thống tối ưu hóa dựa trên
+các điều kiện về bộ nhớ, nguồn điện và kết nối. JobScheduler đem lại khả năng kiểm soát và
+sự đơn giản, và chúng tôi muốn mọi ứng dụng đều sử dụng nó. </p>
+
+<p>
+ Một giải pháp hiệu quả khác là <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+ <code>GCMNetworkManager</code></a>, thuộc một phần của Dịch vụ Google Play, cho phép
+ lên lịch tác vụ tương tự với khả năng tương thích trên các phiên bản Android
+ cũ.
+</p>
+
+<p>Chúng tôi đang tiếp tục kế thừa <code>JobScheduler</code> và
+<code>GCMNetworkManager</code> để đáp ứng nhiều hơn
+các trường hợp sử dụng của bạn — ví dụ như trong Android N giờ đây bạn đã có thể lên lịch cho công việc
+chạy ngầm dựa vào những thay đổi trong các Trình cung cấp Nội dung. Đồng thời, chúng tôi đang tiến hành
+loại bỏ một số mẫu cũ có thể làm giảm hiệu năng hệ thống,
+đặc biệt trên các thiết bị ít bộ nhớ.</p>
+
+<p>Trong Android N, chúng tôi sẽ loại bỏ ba truyền phát không biểu thị được sử dụng phổ biến —
+{@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} và {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} — bởi vì các truyền phát này có thể đánh thức
+các tiến trình chạy ngầm của nhiều ứng dụng cùng lúc và sử dụng quá mức bộ nhớ và pin. Nếu
+ứng dụng của bạn đang nhận các truyền phát này thì hãy tận dụng N Developer Preview để
+ chuyển sang <code>JobScheduler</code> và các API liên quan khác thay thế. </p>
+
+<p>
+ Hãy xem tài liệu <a href="{@docRoot}preview/features/background-optimization.html">Tối ưu hóa
+ Chạy ngầm</a> để biết thêm chi tiết.
+</p>
+
+
+<h2 id="data_saver">Tiết kiệm dữ liệu</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>Hình 4.</strong> Tính năng Tiết kiệm dữ liệu trong mục Settings.
+</p>
+ </div>
+
+<p>Trong vòng đời của một thiết bị di động thì chi phí gói cước dữ liệu di động về cơ bản
+sẽ cao hơn giá thành của chính thiết bị đó. Đối với nhiều người dùng, dữ liệu di động là một
+tài nguyên đắt đỏ họ muốn sử dụng tiết kiệm. </p>
+
+<p>Android N đã đưa vào chế độ Tiết kiệm dữ liệu, một dịch vụ hệ thống mới giúp giảm
+sử dụng dữ liệu di động, cho dù là chuyển vùng, gần đến kỳ thanh toán cước,
+hoặc trên một gói dữ liệu trả trước khiêm tốn. Tiết kiệm dữ liệu cho người dùng kiểm soát cách thức ứng dụng
+sử dụng dữ liệu di động và cho phép nhà phát triển cung cấp dịch vụ hiệu quả hơn khi Tiết kiệm
+dữ liệu được bật. </p>
+
+<p>Khi người dùng bật Tiết kiệm dữ liệu trong <strong>Settings</strong> và thiết bị đang
+sử dụng một mạng có đo lưu lượng thì hệ thống sẽ chặn việc sử dụng dữ liệu chạy ngầm và truyền tín hiệu cho ứng dụng
+để sử dụng ít dữ liệu hơn ở tiền cảnh bất cứ khi nào có thể — chẳng hạn như bằng cách giới hạn
+bit rate để truyền phát, giảm chất lượng hình ảnh, trì hoãn tạo trước bộ đệm để tối ưu,
+v.v. Người dùng có thể lập danh sách các ứng dụng cụ thể được phép sử dụng
+dữ liệu có tính lưu lượng được chạy ngầm ngay cả khi Tiết kiệm dữ liệu được bật.</p>
+
+<p>Android N mở rộng lớp {@link android.net.ConnectivityManager} để cung cấp cho các ứng dụng một
+cách thức <a href="{@docRoot}preview/features/data-saver.html#status">truy xuất
+các tùy chọn Tiết kiệm dữ liệu của người dùng</a> và <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">theo dõi
+các thay đổi của tùy chọn</a>. Mọi ứng dụng cần kiểm tra xem người dùng đó đã bật Tiết kiệm
+Dữ liệu hay chưa và cố gắng giới hạn sử dụng dữ liệu chạy ở tiền cảnh và chạy ngầm.</p>
+
+
+<h2 id="tile_api">API cho ô Cài đặt nhanh</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>Hình 5.</strong> Các ô Cài đặt nhanh trong vùng hiển thị thông báo.
+</p>
+
+
+ </div><p>Cài đặt nhanh là một cách phổ biến và đơn giản để hiển thị các cài đặt và hành động quan trọng,
+trực tiếp từ khu vực thông báo. Trong Android N, chúng tôi đã mở rộng phạm vi của
+Cài đặt nhanh để khiến nó trở nên hữu ích và thuận tiện hơn nữa. </p>
+
+<p>Chúng tôi đã thêm không gian cho các ô Cài đặt nhanh mà người dùng có thể
+truy cập trên toàn bộ một vùng hiển thị được phân trang bằng cách vuốt sang trái hoặc phải. Chúng tôi cũng
+cho người dùng kiểm soát những ô Cài đặt nhanh nào sẽ xuất hiện và vị trí xuất hiện
+của chúng — người dùng chỉ cần kéo và thả để thêm hoặc di chuyển các ô. </p>
+
+<p>Đối với nhà phát triển, Android N cũng bổ sung một API mới cho phép định nghĩa các ô
+ Cài đặt nhanh của riêng bạn giúp người dùng dễ dàng truy cập tới các điều khiển và hành động quan trọng trong ứng dụng của bạn.</p>
+
+<p>
+ Các ô Cài đặt nhanh được dành riêng cho các điều khiển hoặc hành động
+ khẩn cấp hoặc thường xuyên được sử dụng, không nên dùng làm lối tắt để
+ khởi chạy một ứng dụng.
+</p>
+
+<p>
+ Một khi đã định nghĩa các ô của mình bạn có thể làm nổi chúng lên trước người dùng để họ có thể thêm
+ các ô này vào Cài đặt nhanh bằng cách chỉ cần kéo và thả.
+</p>
+
+<p>
+ Để biết thêm thông tin về việc tạo một ô ứng dụng, hãy xem
+ <code>android.service.quicksettings.Tile</code> trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a> có thể tải xuống.
+</p>
+
+
+
+<h2 id="number-blocking">Chặn số</h2>
+
+<p>Android N đã hỗ trợ chặn số điện thoại trong nền tảng này và cung cấp một
+ API khuôn khổ cho phép các nhà cung cấp dịch vụ duy trì một danh sách số bị chặn.
+Ứng dụng SMS mặc định, ứng dụng gọi điện mặc định và các ứng dụng của nhà cung cấp có thể đọc và
+ghi vào danh sách số bị chặn. Các ứng dụng khác không thể truy cập vào danh sách này.</p>
+
+<p>Thông qua việc đưa chặn số thành một tính năng tiêu chuẩn của nền tảng, Android sẽ cung cấp
+cách thức thống nhất để các ứng dụng hỗ trợ chặn số trên một loạt các
+thiết bị. Những lợi ích mà ứng dụng có thể tận dụng gồm:</p>
+
+<ul>
+ <li> Số bị chặn cuộc gọi cũng sẽ bị chặn tin nhắn văn bản
+ <li> Số bị chặn có thể được duy trì qua các lần thiết lập lại và qua nhiều thiết bị thông qua tính năng Sao lưu &
+Khôi phục
+ <li> Nhiều ứng dụng có thể sử dụng cùng một danh sách số bị chặn
+</ul>
+
+<p>Ngoài ra, việc tích hợp ứng dụng của nhà mạng thông qua Android cũng đồng nghĩa là các nhà mạng có thể
+đọc danh sách số bị chặn trên thiết bị và thực hiện chặn số từ phía nhà cung cấp dịch vụ
+cho người dùng để ngăn các cuộc gọi và tin nhắn văn bản không mong muốn tiếp cận người dùng
+thông qua bất kỳ phương tiện nào, ví dụ như điểm cuối VOIP hoặc điện thoại chuyển cuộc gọi.</p>
+
+<p>
+ Để biết thêm thông tin, hãy xem <code>android.provider.BlockedNumberContract</code>
+ trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo
+ API</a> có thể tải xuống.
+</p>
+
+<h2 id="call_screening">Sàng lọc cuộc gọi</h2>
+
+<p>
+ Android N cho phép ứng dụng gọi điện mặc định sàng lọc các cuộc gọi đến. Ứng dụng
+ gọi điện thực hiện điều này bằng cách thực thi <code>CallScreeningService</code> mới,
+ cho phép ứng dụng gọi điện thực hiện một số hành động dựa trên
+ {@link android.telecom.Call.Details Call.Details} của cuộc gọi đến như:
+</p>
+
+<ul>
+ <li> Từ chối cuộc gọi đến
+ <li> Không cho phép cuộc gọi lưu trong nhật ký cuộc gọi
+ <li> Không hiển thị thông báo về cuộc gọi cho người dùng
+</ul>
+
+<p>
+ Để biết thêm thông tin, hãy xem <code>android.telecom.CallScreeningService</code>
+ trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo
+ API</a> có thể tải xuống.
+</p>
+
+
+<h2 id="multi-locale_languages">Hỗ trợ đa bản địa, thêm nhiều ngôn ngữ</h2>
+
+
+<p>Android N cho phép người dùng chọn <strong>đa bản địa</strong> trong Settings,
+để hỗ trợ tốt hơn cho các trường hợp song ngữ. Các ứng dụng có thể sử dụng
+một API mới để truy xuất các bản địa được chọn của người dùng và sau đó mang đến
+trải nghiệm người dùng tinh tế hơn cho người dùng đa bản địa — như hiển thị các kết quả tìm kiếm bằng
+nhiều ngôn ngữ và không yêu cầu dịch các trang web sang ngôn ngữ mà
+người dùng đã biết.</p>
+
+<p>Ngoài hỗ trợ đa bản địa, Android N cũng mở rộng danh sách các ngôn ngữ
+khả dụng đối với người dùng. Nền tảng này cung cấp hơn 25 biến thể cho các ngôn ngữ
+được sử dụng phổ biến như Tiếng Anh, Tây Ban Nha, Pháp và Ả-rập. Nó cũng bổ sung hỗ trợ
+một phần cho hơn 100 ngôn ngữ mới.</p>
+
+<p>Các ứng dụng có thể truy xuất danh sách bộ bản địa theo người dùng bằng cách gọi <code>LocaleList.GetDefault()</code>. Để hỗ trợ số lượng bản địa mở rộng, Android N đang thay đổi cách thức
+phân giải tài nguyên. Hãy đảm bảo bạn kiểm tra và xác minh rằng ứng dụng của mình
+đang hoạt động như mong muốn theo lô-gic phân giải tài nguyên mới này.</p>
+
+<p>Để tìm hiểu về hành vi phân giải tài nguyên mới và các thực hành tốt nhất bạn nên
+thực hiện theo, hãy xem mục <a href="{@docRoot}preview/features/multilingual-support.html">Hỗ trợ đa ngôn ngữ</a>.</p>
+
+<h2 id="icu4">API ICU4J trong Android</h2>
+
+<p>
+ Android N đã cung cấp một tập nhỏ các API <a href="http://site.icu-project.org/">ICU4J</a> trong khuôn khổ Android thuộc
+ gói <code>android.icu</code>. Việc chuyển nhập sang rất dễ dàng và hầu hết chỉ liên quan đến
+ việc đổi từ không gian tên <code>com.java.icu</code> thành
+ <code>android.icu</code>. Nếu bạn đang sử dụng gói ICU4J trong ứng dụng
+ của mình thì việc chuyển đổi sang các API <code>android.icu</code> được cung cấp trong khuôn khổ
+ Android có thể giúp làm giảm đáng kể kích thước của tệp APK.
+</p>
+
+<p>
+ Để tìm hiểu thêm về API ICU4J trên Android, hãy xem <a href="{@docRoot}preview/features/icu4j-framework.html">Hỗ trợ ICU4J</a>.
+</p>
+
+
+
+<h2 id="gles_32">API OpenGL™ ES 3.2</h2>
+
+<p>Android N bổ sung các giao diện khuôn khổ và hỗ trợ nền tảng cho OpenGL ES 3.2, bao gồm:</p>
+
+<ul>
+ <li> Mọi phần mở rộng trong <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Gói Tiện ích mở rộng Android</a></a> (AEP) ngoại trừ <code>EXT_texture_sRGB_decode</code>
+ <li> Bộ đệm khung hình dấu chấm động cho HDR và tạo bóng trì hoãn.
+ <li> Các lệnh vẽ BaseVertex cho phép chia gói và truyền phát hiệu quả hơn.
+ <li> Kiểm soát truy cập bộ đệm mạnh mẽ để giảm phí tổn quản lý của WebGL.
+</ul>
+
+<p>API khuôn khổ cho OpenGL ES 3.2 trên Android N được cung cấp với lớp
+<code>GLES32</code>. Khi sử dụng OpenGL ES 3.2, hãy đảm bảo khai báo
+yêu cầu trong tệp bản kê khai của bạn bằng thẻ <code><uses-feature></code> và
+thuộc tính <code>android:glEsVersion</code>. </p>
+
+<p>Để biết thông tin về sử dụng OpenGL ES, bao gồm cách kiểm tra phiên bản
+ OpenGL ES được hỗ trợ của thiết bị tại thời gian chạy, hãy xem mục <a href="{@docRoot}guide/topics/graphics/opengl.html">Hướng dẫn API OpenGL ES</a>.</p>
+
+
+<h2 id="android_tv_recording">Ghi lại trên Android TV</h2>
+
+<p>Android N bổ sung khả năng ghi và phát lại nội dung từ các dịch vụ
+nguồn vào của Android TV thông qua các API ghi lại. Được xây dựng dựa trên các API
+chuyển dịch thời gian sẵn có, các dịch vụ nguồn vào TV có thể kiểm soát dữ liệu của kênh nào được phép ghi lại, cách thức
+lưu trữ các phiên được ghi lại cũng như quản lý tương tác của người dùng với nội dung ghi lại. </p>
+
+<p>Để biết thêm thông tin, hãy xem <a href="{@docRoot}preview/features/tv-recording-api.html">API ghi lại của Android TV</a>.</p>
+
+
+<h2 id="android_for_work">Android cho Công việc</h2>
+
+<p>Android cho Công việc bổ sung nhiều tính năng mới và các API cho thiết bị chạy Android N.
+Dưới đây là một số điểm nổi bật — để xem danh sách đầy đủ các cập nhật của Android N
+liên quan đến Android cho Công việc, vui lòng xem Các thay đổi của Android cho Công việc.</p>
+
+<h3 id="work_profile_security_challenge">Thử thách bảo mật cấu hình công việc </h3>
+
+<p>
+ Người sở hữu cấu hình có thể chỉ định một thử thách bảo mật riêng cho các ứng dụng đang chạy trong
+ cấu hình công việc. Thử thách công việc được hiển thị khi người dùng cố gắng mở
+ bất kỳ ứng dụng công việc nào. Hoàn tất thành công thử thách bảo mật sẽ mở khóa
+ cấu hình công việc và giải mã nó nếu cần. Đối với người sở hữu cấu hình,
+ <code>ACTION_SET_NEW_PASSWORD</code> sẽ yêu cầu người dùng đặt một thử thách
+ công việc và <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> sẽ yêu cầu
+ người dùng đặt khóa thiết bị.
+</p>
+
+<p>
+ Người sở hữu cấu hình có thể đặt các chính sách mật khẩu riêng biệt cho thử thách công việc
+ (như độ dài mã PIN cần thiết hoặc có thể sử dụng dấu vân tay
+ để mở khóa cấu hình hay không) bằng <code>setPasswordQuality()</code>,
+ <code>setPasswordMinimumLength()</code> và các phương thức liên quan. Người sở hữu
+ cấu hình cũng có thể cài khóa thiết bị bằng thực thể <code>DevicePolicyManager</code>
+ được trả về bởi phương thức <code>getParentProfileInstance()</code> mới.
+ Ngoài ra, người sở hữu cấu hình có thể tùy chỉnh màn hình xác thực thông tin cho
+ thử thách công việc bằng các phương thức <code>setOrganizationColor()</code> và
+ <code>setOrganizationName()</code> mới.
+</p>
+<h3 id="turn_off_work">Tắt công việc </h3>
+
+<p>Trên một thiết bị có cấu hình công việc, người dùng có thể bật hoặc tắt chế độ công việc. Khi chế độ công việc được
+tắt người dùng được quản lý sẽ tạm thời bị tắt, khiến vô hiệu hóa các ứng dụng
+cấu hình công việc, đồng bộ chạy ngầm và các thông báo. Điều này bao gồm cả ứng dụng
+của người sở hữu cấu hình. Khi chế độ công việc bị tắt, hệ thống sẽ hiển thị biểu tượng
+trạng thái liên tục để nhắc người dùng đó rằng họ không thể khởi chạy các ứng dụng công việc. Trình khởi chạy
+sẽ chỉ báo rằng các ứng dụng và widget công việc không khả dụng. </p>
+
+<h3 id="always_on_vpn">VPN luôn bật </h3>
+
+<p>Người sở hữu thiết bị và người sở hữu cấu hình có thể đảm bảo rằng những ứng dụng công việc luôn kết nối
+thông qua một VPN chỉ định. Hệ thống sẽ tự động khởi động VPN đó sau khi
+thiết bị khởi động.</p>
+
+<p>
+ Các phương thức <code>DevicePolicyManager</code> mới gồm
+ <code>setAlwaysOnVpnPackage()</code> và
+ <code>getAlwaysOnVpnPackage()</code>.
+</p>
+
+<p>Do các dịch vụ VPN có thể được gắn kết trực tiếp bởi hệ thống mà không cần tương tác
+của ứng dụng, các máy khách VPN cần xử lý các điểm bắt đầu cho VPN luôn bật. Giống
+trước đây, các dịch vụ được chỉ định tới hệ thống bằng một bộ lọc ý định phù hợp với
+hành động <code>android.net.VpnService</code>. </p>
+
+<p>
+ Người dùng cũng có thể đặt thủ công các máy khách VPN luôn bật có cài đặt các phương thức
+ <code>VPNService</code> trong người dùng chính bằng
+ <strong>Settings>More>Vpn</strong>.
+</p>
+
+<h2 id="accessibility_enhancements">Cải tiến trợ năng</h2>
+
+<p>Android N nay đã hỗ trợ Cài đặt Khả năng nhìn trực tiếp trên màn hình Chào mừng khi thiết lập
+thiết bị mới. Điều này giúp người dùng rất dễ dàng khám phá và cấu hình
+các tính năng trợ năng trên thiết bị của họ, bao gồm cử chỉ phóng đại, cỡ
+phông chữ, kích thước hiển thị và TalkBack. </p>
+
+<p>Với các tính năng trợ năng được bố trí ngày càng dễ thấy hơn, khi được bật
+khả năng người dùng sẽ thử ứng dụng của bạn sẽ cao hơn. Hãy đảm bảo bạn kiểm thử ứng dụng của mình
+trước với các cài đặt này được bật. Bạn có thể bật chúng trong Settings >
+Accessibility.</p>
+
+<p>Ngoài ra, trong Android N, các dịch vụ trợ năng đã có thể trợ giúp người dùng bị các tổn thương
+vận động chạm vào màn hình. API mới cho phép xây dựng các dịch vụ với những
+tính năng như theo dõi chuyển động của khuôn mặt, theo dõi chuyển động của mắt, quét điểm, v.v. nhằm
+đáp ứng nhu cầu những người dùng này.</p>
+
+<p>Để biết thêm thông tin, hãy xem <code>android.accessibilityservice.GestureDescription</code>
+ trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a> có thể tải xuống.</p>
+
+
+<h2 id="direct_boot">Khởi động Trực tiếp</h2>
+
+<p>Khởi động Trực tiếp cải thiện thời gian khởi động của thiết bị và cho phép các ứng dụng
+đã đăng ký có chức năng hạn chế ngay cả sau khi khởi động lại ngoài dự kiến.
+Ví dụ, nếu một thiết bị được mã hóa khởi động lại khi người dùng đang ngủ thì
+báo thức, tin nhắn và các cuộc gọi đến đã đăng ký có thể tiếp tục thông báo
+cho người dùng như thường lệ. Điều này cũng có nghĩa là các dịch vụ trợ năng cũng sẽ
+ khả dụng ngay sau khi khởi động xong.</p>
+
+<p>Khởi động Trực tiếp sử dụng mã hóa theo tệp trong Android N
+để bật các chính sách mã hóa chi tiết cho cả dữ liệu của hệ thống và ứng dụng.
+Hệ thống sẽ sử dụng một bộ lưu trữ mã hóa thiết bị cho dữ liệu hệ thống được chọn và dữ liệu ứng dụng
+đã đăng ký công khai. Theo mặc định, một bộ lưu trữ mã hóa thông tin xác thực sẽ được sử dụng cho mọi
+ dữ liệu hệ thống, dữ liệu người dùng, ứng dụng và dữ liệu của ứng dụng khác. </p>
+
+<p>Trong quá trình khởi động, hệ thống sẽ khởi động vào chế độ hạn chế và chỉ có quyền truy cập tới
+dữ liệu mã hóa thiết bị mà thôi, và không có quyền truy cập thông thường tới ứng dụng hoặc dữ liệu.
+Nếu bạn có các thành phần muốn chạy trong chế độ này thì bạn có thể đăng ký
+chúng bằng cách đặt cờ trong bản kê khai. Sau khi khởi động, hệ thống sẽ kích hoạt
+các thành phần đã đăng ký bằng cách truyền phát ý định <code>LOCKED_BOOT_COMPLETED</code>
+. Hệ thống sẽ đảm bảo cho dữ liệu mã hóa thiết bị đã đăng ký sẽ khả dụng
+trước khi mở khóa. Mọi dữ liệu khác sẽ không khả dụng cho tới khi Người dùng xác nhận thông tin xác thực trên màn hình khóa
+ của họ để giải mã nó. </p>
+
+Để biết thêm thông tin, hãy xem <a href="{@docRoot}preview/features/direct-boot.html">Khởi động Trực tiếp</a>.</p>
+</p>
+
+
+<h2 id="key_attestation">Chứng thực khóa</h2>
+
+<p>Các bộ lưu trữ khóa dựa trên phần cứng cung cấp một phương thức an toàn hơn rất nhiều để tạo, lưu trữ,
+và sử dụng các khóa mật mã trên thiết bị Android. Chúng bảo vệ các khóa trước
+nhân Linux, trước các lỗ hổng bảo mật tiềm tàng của Android và trước việc trích xuất
+từ các máy bị giành quyền điều khiển và bị can thiệp vào các tệp hệ thống (máy bị root).</p>
+
+<p>Android N đã đưa ra tính năng Chứng thực khóa để sử dụng các bộ lưu trữ khóa dựa trên phần cứng một cách
+ dễ dàng và bảo mật hơn. Các ứng dụng và dịch vụ không thuộc thiết bị có thể sử dụng Chứng thực
+khóa để xác định chắc chắn xem một cặp khóa RSA hoặc EC có
+dựa trên phần cứng hay không, các đặc điểm của cặp khóa đó là gì và
+ các ràng buộc nào được áp dụng cho việc sử dụng và tính hợp lệ của cặp khóa đó. </p>
+
+<p>Các ứng dụng và dịch vụ không thuộc thiết bị có thể yêu cầu thông tin về một cặp khóa
+thông qua chứng chỉ chứng thực X.509. Chứng chỉ này phải được ký bởi một khóa
+chứng thực hợp lệ. Khóa chứng thực là một khóa ký ECDSA, được
+đưa vào bộ lưu trữ khóa dựa trên phần cứng của thiết bị tại nhà máy.
+Do đó, một chứng chỉ chứng thực được ký bởi khóa
+chứng thực hợp lệ sẽ xác nhận sự tồn tại của bộ lưu trữ khóa dựa trên phần cứng, kèm theo
+ chi tiết về các cặp khóa trong bộ lưu trữ khóa đó.</p>
+
+<p>Để chắc chắn thiết bị đang sử dụng ảnh
+Android bảo mật, chính thức từ nhà máy, Chứng thực khóa yêu cầu <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a>
+ của thiết bị cung cấp thông tin sau cho <a class="external-link" href="https://source.android.com/security/trusty/index.html">Môi trường Thực thi
+ An toàn (TEE)</a>:</p>
+
+<ul>
+<li>Phiên bản HĐH và cấp vá lỗi được cài đặt trên thiết bị</li>
+<li>Khóa công khai <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Khởi động được xác thực</a> và trạng thái khóa</li>
+ </ul>
+
+<p>Để biết thêm thông tin về tính năng bộ lưu trữ khóa dựa trên phần cứng,
+hãy xem hướng dẫn <a href="https://source.android.com/security/keystore/" class="external-link">Bộ lưu trữ khóa dựa trên phần cứng</a>.</p>
+
+<p>Ngoài Chứng thực khóa, Android N cũng giới thiệu
+ các khóa dựa vào vân tay mà không được thu hồi khi đăng ký vân tay.</p>
+
+<h2 id="network_security_config">Cấu hình Bảo mật mạng</h2>
+
+<p>Trong Android N, các ứng dụng có thể tùy biến hành vi của các kết nối
+bảo mật (HTTPS, TLS) của chúng một cách an toàn mà không cần chỉnh sửa mã nhờ sử dụng khai báo
+<em>Cấu hình Bảo mật mạng</em> thay vì sử dụng các API lập trình truyền thống
+dễ xảy ra lỗi (vd: X509TrustManager).</p>
+
+ <p>Các tính năng được hỗ trợ:</p>
+<ul>
+<li><b>Nguồn tin cậy tùy chỉnh.</b> Cho phép một ứng dụng tùy chỉnh
+Nhà cung cấp chứng chỉ (CA) nào sẽ được tin cậy cho các kết nối bảo mật của ứng dụng. Ví
+dụ, tin cậy các chứng chỉ tự ký cụ thể hoặc một bộ giới hạn các CA công khai.
+</li>
+<li><b>Chỉ khống chế khi gỡ lỗi.</b> Cho phép nhà phát triển ứng dụng an toàn gỡ lỗi
+các kết nối bảo mật của ứng dụng mà không tạo thêm rủi ro cho phần cơ sở
+đã cài đặt.
+</li>
+<li><b>Không sử dụng truyền gửi văn bản chưa mã hóa.</b> Cho phép một ứng dụng tự bảo vệ mình khỏi việc
+vô tình sử dụng truyền gửi văn bản chưa mã hóa cleartext.</li>
+<li><b>Ghim chứng chỉ.</b> Một tính năng nâng cao cho phép một ứng dụng
+ giới hạn các khóa máy chủ nào là an toàn đối với các kết nối bảo mật.</li>
+</ul>
+
+<p>Để biết thêm thông tin, hãy xem <a href="{@docRoot}preview/features/security-config.html">Cấu hình Bảo mật
+ mạng</a>.</p>
+
+<h2 id="default_trusted_ca">Nhà cung cấp Chứng chỉ An toàn mặc định</h2>
+
+<p>Theo mặc định, các ứng dụng nhắm mục tiêu Android N chỉ tin cậy các chứng chỉ do hệ thống cấp
+và không còn tin cậy các Nhà cung cấp chứng chỉ (CA) do người dùng thêm vào. Các ứng dụng nhắm mục tiêu Android
+N muốn tin cậy các CA do người dùng thêm vào nên sử dụng
+<a href="{@docRoot}preview/features/security-config.html">Cấu hình Bảo mật mạng</a> để
+chỉ định cách thức tin cậy các CA của người dùng.</p>
+
+<h2 id="apk_signature_v2">Lược đồ chữ ký số v2 cho tệp APK</h2>
+
+<p>Lớp PackageManager nay đã hỗ trợ xác thực ứng dụng bằng Lược đồ chữ ký số v2
+APK. Lược đồ chữ ký số v2 APK là một lược đồ chữ ký số trên toàn bộ tệp
+làm tăng đáng kể tốc độ xác thực và tăng cường sự bảo đảm
+ toàn vẹn bằng cách phát hiện các thay đổi trái phép đối với các tệp APK.</p>
+
+<p>Để bảo đảm tương thích ngược, một tệp APK phải được ký bằng lược đồ
+chữ ký số v1 (Lược đồ chữ ký số JAR) trước khi được ký bằng lược đồ chữ ký số v2.
+Với lược đồ chữ ký số v2, quá trình xác thực sẽ thất bại nếu bạn ký tệp APK bằng một
+ chứng chỉ khác sau khi ký bằng lược đồ v2. </p>
+
+<p>Hỗ trợ cho lược đồ chữ ký số v2 cho tệp AKP sẽ có sau trong N Developer
+Preview.</p>
+
+<h2 id="scoped_directory_access">Truy cập thư mục theo phạm vi</h2>
+
+<p>Trong Android N, ứng dụng có thể sử dụng các API mới để yêu cầu truy cập vào các thư mục <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">bộ nhớ lưu trữ
+ngoài</a> riêng, bao gồm các thư mục trên phương tiện có thể tháo ra như thẻ
+SD. Các API mới đã tối giản cách thức ứng dụng của bạn truy cập các thư mục lưu trữ ngoài
+tiêu chuẩn như thư mục <code>Pictures</code>. Các ứng dụng
+như ứng dụng quản lý ảnh có thể sử dụng các API này thay vì sử dụng
+<code>READ_EXTERNAL_STORAGE</code> để cấp quyền truy cập tới mọi thư mục
+lưu trữ, hoặc Khuôn khổ Truy cập Lưu trữ để giúp người dùng di chuyển tới
+thư mục đó.</p>
+
+<p>Ngoài ra, các API mới này cũng đơn giản hóa các bước mà người dùng thực hiện để cấp quyền truy cập
+bộ nhớ lưu trữ ngoài cho ứng dụng của bạn. Khi bạn sử dụng các API mới, hệ thống sẽ sử dụng một UI cấp quyền
+đơn giản cung cấp các thông tin chi tiết rõ ràng về thư mục nào ứng dụng đang
+yêu cầu quyền truy cập.</p>
+
+<p>Để biết thêm thông tin, hãy xem tài liệu cho nhà phát triển
+<a href="{@docRoot}preview/features/scoped-folder-access.html">Truy cập
+Thư mục theo Phạm vi</a>.</p>
+
+
+
+
+
+
diff --git a/docs/html-intl/intl/vi/preview/index.jd b/docs/html-intl/intl/vi/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/vi/preview/index.jd
rename to docs/html-intl/intl/vi/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/vi/design/patterns/navigation.jd b/docs/html-intl/intl/vi/design/patterns/navigation.jd
index 98490db..a3d6003 100644
--- a/docs/html-intl/intl/vi/design/patterns/navigation.jd
+++ b/docs/html-intl/intl/vi/design/patterns/navigation.jd
@@ -168,7 +168,7 @@
thông tin và tất cả hành động liên kết mà người dùng có thể thực hiện. Ứng dụng của bạn là tập hợp
của nhiều hoạt động, bao gồm cả hoạt động do bạn tạo và hoạt động mà bạn sử dụng lại từ các ứng dụng khác.</p>
-<p><strong>Tác vụ</strong> là trình tự các hoạt động mà một người dùng tuân theo để hoàn thành một mục tiêu.
+<p><strong>Tác vụ</strong> là trình tự các hoạt động mà một người dùng tuân theo để hoàn thành một mục tiêu.
Tác vụ đơn có thể sử dụng các hoạt động từ chỉ một ứng dụng, hoặc có thể dựa trên hoạt động từ nhiều
ứng dụng khác nhau.</p>
diff --git a/docs/html-intl/intl/vi/guide/components/activities.jd b/docs/html-intl/intl/vi/guide/components/activities.jd
index 83e7669..304b73c 100644
--- a/docs/html-intl/intl/vi/guide/components/activities.jd
+++ b/docs/html-intl/intl/vi/guide/components/activities.jd
@@ -57,7 +57,7 @@
mới bắt đầu, hoạt động trước đó sẽ bị dừng lại, nhưng hệ thống vẫn giữ nguyên hoạt động
trong một ngăn xếp ("back stack"). Khi một hoạt động mới bắt đầu, nó được đẩy lên ngăn xếp và
chiếm lấy tiêu điểm của người dùng. Ngăn xếp sẽ tuân theo cơ chế xếp chồng cơ bản "vào cuối, ra đầu",
-vì thế, khi người dùng kết thúc hoạt động hiện tại và nhấn nút <em>Quay lại</em>, nó
+vì thế, khi người dùng kết thúc hoạt động hiện tại và nhấn nút <em>Quay lại</em>, nó
sẽ được đẩy ra khỏi ngăn xếp (và bị hủy) và hoạt động trước đó sẽ tiếp tục. (Ngăn xếp được
đề cập kỹ hơn trong tài liệu <a href="{@docRoot}guide/components/tasks-and-back-stack.html">Tác vụ
và Ngăn Xếp</a>.)</p>
@@ -139,7 +139,7 @@
<h3 id="Declaring">Khai báo hoạt động trong bản kê khai</h3>
<p>Bạn phải khai báo hoạt động của mình trong tệp bản kê khai để hoạt động
-có thể truy cập được vào hệ thống. Để khai báo hoạt động của mình, hãy mở tệp bản kê khai của bạn và thêm một phần tử <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
+có thể truy cập được vào hệ thống. Để khai báo hoạt động của mình, hãy mở tệp bản kê khai của bạn và thêm một phần tử <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
làm con của phần tử <a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a>
. Ví dụ:</p>
@@ -161,7 +161,7 @@
một số tính năng, chẳng hạn như các lối tắt của ứng dụng (hãy đọc bài đăng trên blog, <a href="http://android-developers.blogspot.com/2011/06/things-that-cannot-change.html">Những Điều
Không Thay Đổi Được</a>).</p>
-<p>Xem tài liệu tham khảo phần tử <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
+<p>Xem tài liệu tham khảo phần tử <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a>
để biết thêm thông tin về việc khai báo hoạt động của bạn trong bản kê khai.</p>
@@ -200,7 +200,7 @@
<p>Tuy nhiên, nếu bạn muốn hoạt động của mình phản hồi lại những ý định ngầm mà được chuyển giao từ
các ứng dụng khác (và chính bạn), thì bạn phải định nghĩa các bộ lọc ý định bổ sung cho hoạt động
của mình. Với mỗi loại ý định mà bạn muốn phản hồi, bạn phải nêu một <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
-<intent-filter>}</a> bao gồm một phần tử
+<intent-filter>}</a> bao gồm một phần tử
<a href="{@docRoot}guide/topics/manifest/action-element.html">{@code
<action>}</a> và, không bắt buộc, một phần tử <a href="{@docRoot}guide/topics/manifest/category-element.html">{@code
<category>}</a> và/hoặc một phần tử <a href="{@docRoot}guide/topics/manifest/data-element.html">{@code
@@ -324,7 +324,7 @@
bằng cách sử dụng những phương pháp này. Như đề cập trong phần sau về vòng đời của hoạt động, hệ thống
Android quản lý tuổi thọ của một hoạt động cho bạn, vì vậy bạn không cần kết thúc các hoạt động
của chính mình. Việc gọi những phương pháp này có thể ảnh hưởng tiêu cực tới trải nghiệm người dùng
-kỳ vọng và chỉ nên được sử dụng khi bạn tuyệt đối không muốn người dùng quay lại thực thể này của
+kỳ vọng và chỉ nên được sử dụng khi bạn tuyệt đối không muốn người dùng quay lại thực thể này của
hoạt động.</p>
@@ -350,7 +350,7 @@
trình quản lý cửa sổ), nhưng có thể bị hệ thống tắt bỏ trong trường hợp bộ nhớ cực kỳ thấp.</dd>
<dt><i>Dừng</i></dt>
- <dd>Hoạt động bị che khuất hoàn toàn bởi một hoạt động khác (hoạt động hiện đang
+ <dd>Hoạt động bị che khuất hoàn toàn bởi một hoạt động khác (hoạt động hiện đang
“dưới nền"). Hoạt động dừng cũng vẫn đang hoạt động ({@link android.app.Activity}
đối tượng được giữ lại trong bộ nhớ, nó duy trì tất cả thông tin về trạng thái và thành viên, nhưng <em>không</em>
gắn với trình quản lý cửa sổ). Tuy nhiên, hoạt động không còn hiển thị với người dùng nữa và hệ thống
@@ -608,7 +608,7 @@
<p>Hệ thống gọi {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}
trước khi khiến hoạt động dễ bị hủy. Hệ thống chuyển cho phương pháp này
-một {@link android.os.Bundle} trong đó bạn có thể lưu
+một {@link android.os.Bundle} trong đó bạn có thể lưu
thông tin trạng thái về hoạt động như cặp tên giá trị, bằng cách sử dụng các phương pháp như {@link
android.os.Bundle#putString putString()} và {@link
android.os.Bundle#putInt putInt()}. Sau đó, nếu hệ thống tắt bỏ tiến trình ứng dụng của bạn
diff --git a/docs/html-intl/intl/vi/guide/components/bound-services.jd b/docs/html-intl/intl/vi/guide/components/bound-services.jd
index 7a2ddba..9d19e05 100644
--- a/docs/html-intl/intl/vi/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/vi/guide/components/bound-services.jd
@@ -357,7 +357,7 @@
<p>Theo cách này, không có "phương pháp" nào để máy khách gọi đối với dịch vụ. Thay vào đó, máy khách
-gửi “thông báo” (đối tượng {@link android.os.Message}) mà dịch vụ nhận được trong
+gửi “thông báo” (đối tượng {@link android.os.Message}) mà dịch vụ nhận được trong
{@link android.os.Handler} của mình.</p>
<p>Sau đây là một dịch vụ ví dụ đơn giản sử dụng một giao diện {@link android.os.Messenger}:</p>
@@ -539,7 +539,7 @@
</ol>
<p>Ví dụ, đoạn mã HTML sau sẽ kết nối máy khách với dịch vụ được tạo bên trên bằng cách
-<a href="#Binder">mở rộng lớp Trình gắn kết</a>, vì vậy tất cả những việc mà nó phải làm là đổi kiểu
+<a href="#Binder">mở rộng lớp Trình gắn kết</a>, vì vậy tất cả những việc mà nó phải làm là đổi kiểu
{@link android.os.IBinder} được trả về thành lớp {@code LocalService} và yêu cầu thực thể {@code
LocalService}:</p>
diff --git a/docs/html-intl/intl/vi/guide/components/fragments.jd b/docs/html-intl/intl/vi/guide/components/fragments.jd
index 95d9c76..7b6346c 100644
--- a/docs/html-intl/intl/vi/guide/components/fragments.jd
+++ b/docs/html-intl/intl/vi/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>Xem thêm</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Xây dựng một UI Động bằng các Phân đoạn</a></li>
@@ -148,7 +148,7 @@
khởi tạo các thành phần thiết yếu của phân đoạn mà bạn muốn giữ lại khi phân đoạn
bị tạm dừng hoặc dừng hẳn, sau đó tiếp tục.</dd>
<dt>{@link android.app.Fragment#onCreateView onCreateView()}</dt>
- <dd>Hệ thống sẽ gọi phương pháp này khi đến lúc phân đoạn vẽ giao diện người dùng của nó
+ <dd>Hệ thống sẽ gọi phương pháp này khi đến lúc phân đoạn vẽ giao diện người dùng của nó
lần đầu tiên. Để vẽ một UI cho phân đoạn của mình, bạn phải trả về một {@link android.view.View} từ phương pháp
này, đây là gốc của bố trí phân đoạn của bạn. Bạn có thể trả về giá trị rỗng nếu phân đoạn không
cung cấp UI.</dd>
@@ -303,7 +303,7 @@
<ul>
<li>Cung cấp thuộc tính {@code android:id} với một ID duy nhất.</li>
<li>Cung cấp thuộc tính {@code android:tag} với một xâu duy nhất.</li>
- <li>Nếu bạn không cung cấp được thuộc tính nào, hệ thống sẽ sử dụng ID của dạng xem
+ <li>Nếu bạn không cung cấp được thuộc tính nào, hệ thống sẽ sử dụng ID của dạng xem
của bộ chứa.</li>
</ul>
</div>
@@ -362,7 +362,7 @@
<p>Để biết ví dụ về hoạt động sử dụng phân đoạn như một trình thực hiện nền, không có UI, hãy xem mẫu {@code
FragmentRetainInstance.java}, mẫu này có trong các mẫu SDK (có sẵn thông qua
-Trình quản lý SDK Android) và nằm trên hệ thống của bạn như là
+Trình quản lý SDK Android) và nằm trên hệ thống của bạn như là
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code>.</p>
@@ -378,7 +378,7 @@
<li>Nhận các phân đoạn tồn tại trong hoạt động, bằng {@link
android.app.FragmentManager#findFragmentById findFragmentById()} (đối với các phân đoạn cung cấp UI trong
bố trí hoạt động) hoặc {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()} (đối với các phân đoạn có hoặc không cung cấp UI).</li>
+findFragmentByTag()} (đối với các phân đoạn có hoặc không cung cấp UI).</li>
<li>Lấy phân đoạn ra khỏi ngăn xếp, bằng {@link
android.app.FragmentManager#popBackStack()} (mô phỏng một câu lệnh <em>Quay lại</em> của người dùng).</li>
<li>Đăng ký một đối tượng theo dõi cho những thay đổi đối với ngăn xếp, bằng {@link
@@ -562,9 +562,9 @@
}
</pre>
-<p>Nếu hoạt động chưa triển khai giao diện, khi đó phân đoạn sẽ đưa ra lỗi
+<p>Nếu hoạt động chưa triển khai giao diện, khi đó phân đoạn sẽ đưa ra lỗi
{@link java.lang.ClassCastException}.
-Nếu thành công, thành viên {@code mListener} giữ một tham chiếu tới triển khai
+Nếu thành công, thành viên {@code mListener} giữ một tham chiếu tới triển khai
{@code OnArticleSelectedListener}của hoạt động, sao cho phân đoạn A có thể chia sẻ sự kiện với hoạt động bằng cách gọi các phương pháp
được định nghĩa bởi giao diện {@code OnArticleSelectedListener}. Ví dụ, nếu phân đoạn A là một
phần mở rộng của {@link android.app.ListFragment}, mỗi lần
@@ -785,7 +785,7 @@
<p>Phân đoạn thứ hai, {@code DetailsFragment} sẽ hiển thị tóm tắt vở kịch cho mục được chọn từ
danh sách trong {@code TitlesFragment}:</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>Nhớ lại ở lớp {@code TitlesFragment} rằng, nếu người dùng nhấp vào một mục danh sách và bố trí
@@ -798,7 +798,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>Lưu ý rằng hoạt động này tự kết thúc nếu cấu hình là khổ ngang, sao cho hoạt động
chính có thể chiếm lấy và hiển thị {@code DetailsFragment} bên cạnh {@code TitlesFragment}.
Điều này có thể xảy ra nếu người dùng bắt đầu {@code DetailsActivity} ở dạng hướng đứng, nhưng
diff --git a/docs/html-intl/intl/vi/guide/components/fundamentals.jd b/docs/html-intl/intl/vi/guide/components/fundamentals.jd
index 4b70140..725c68d 100644
--- a/docs/html-intl/intl/vi/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/vi/guide/components/fundamentals.jd
@@ -295,16 +295,16 @@
<p>Bạn phải khai báo tất cả thành phần của ứng dụng như sau:</p>
<ul>
<li>Các phần tử <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
cho hoạt động</li>
<li>Các phần tử <code><a
href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> cho
dịch vụ</li>
<li>Các phần tử <code><a
-href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>
+href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>
cho hàm nhận quảng bá</li>
<li>Các phần tử <code><a
-href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
+href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
cho trình cung cấp nội dung</li>
</ul>
@@ -379,7 +379,7 @@
cho người dùng khi họ tìm kiếm ứng dụng từ thiết bị của mình.</p>
<p>Ví dụ, nếu ứng dụng của bạn yêu cầu máy ảnh và sử dụng các API được giới thiệu trong Android 2.1 (<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Mức</a> 7),
-bạn cần khai báo những điều này như yêu cầu trong tệp bản kê khai của mình như sau:</p>
+bạn cần khai báo những điều này như yêu cầu trong tệp bản kê khai của mình như sau:</p>
<pre>
<manifest ... >
diff --git a/docs/html-intl/intl/vi/guide/components/index.jd b/docs/html-intl/intl/vi/guide/components/index.jd
index 966597d..87b51c2 100644
--- a/docs/html-intl/intl/vi/guide/components/index.jd
+++ b/docs/html-intl/intl/vi/guide/components/index.jd
@@ -1,7 +1,7 @@
page.title=Thành phần Ứng dụng
page.landing=true
-page.landing.intro=Khuôn khổ ứng dụng của Android cho phép bạn tạo lập nhiều ứng dụng đa dạng và sáng tạo bằng cách sử dụng một tập hợp các thành phần có thể tái sử dụng. Phần này giải thích cách bạn có thể xây dựng các thành phần định nghĩa các khối dựng cho ứng dụng của mình và cách kết nối chúng với nhau bằng cách sử dụng ý định.
-page.metaDescription=Khuôn khổ ứng dụng của Android cho phép bạn tạo lập nhiều ứng dụng đa dạng và sáng tạo bằng cách sử dụng một tập hợp các thành phần có thể tái sử dụng. Phần này giải thích cách bạn có thể xây dựng các thành phần định nghĩa các khối dựng cho ứng dụng của mình và cách kết nối chúng với nhau bằng cách sử dụng ý định.
+page.landing.intro=Khuôn khổ ứng dụng của Android cho phép bạn tạo lập nhiều ứng dụng đa dạng và sáng tạo bằng cách sử dụng một tập hợp các thành phần có thể tái sử dụng. Phần này giải thích cách bạn có thể xây dựng các thành phần định nghĩa các khối dựng cho ứng dụng của mình và cách kết nối chúng với nhau bằng cách sử dụng ý định.
+page.metaDescription=Khuôn khổ ứng dụng của Android cho phép bạn tạo lập nhiều ứng dụng đa dạng và sáng tạo bằng cách sử dụng một tập hợp các thành phần có thể tái sử dụng. Phần này giải thích cách bạn có thể xây dựng các thành phần định nghĩa các khối dựng cho ứng dụng của mình và cách kết nối chúng với nhau bằng cách sử dụng ý định.
page.landing.image=images/develop/app_components.png
page.image=images/develop/app_components.png
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>Bài viết Blog</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>Sử dụng DialogFragments</h4>
<p>Trong bài viết này, tôi sẽ trình bày cách sử dụng DialogFragments bằng thư viện hỗ trợ v4 (cho khả năng tương thích ngược trên các thiết bị chạy phiên bản trước Honeycomb) để hiển thị một hộp thoại chỉnh sửa đơn giản và trả về một kết quả cho lệnh gọi Hoạt động bằng cách sử dụng một giao diện.</p>
@@ -21,7 +21,7 @@
<h4>Phân đoạn cho Tất cả</h4>
<p>Hôm nay, chúng tôi đã phát hành một thư viện tĩnh giới thiệu API Phân đoạn (cũng như LoaderManager mới và một vài lớp khác) tương tự sao cho các ứng dụng tương thích với phiên bản Android 1.6 hoặc mới hơn có thể sử dụng phân đoạn để tạo các giao diện người dùng tương thích với máy tính bảng. </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>Tạo đa luồng cho Hiệu năng</h4>
<p>Một cách làm hay trong khi tạo các ứng dụng hồi đáp đó là đảm bảo luồng UI chính của bạn
@@ -32,7 +32,7 @@
<div class="col-6">
<h3>Đào tạo</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>Quản lý Vòng đời của Hoạt động</h4>
<p>Lớp này giải thích các phương pháp gọi lại vòng đời quan trọng mà mỗi thực thể
diff --git a/docs/html-intl/intl/vi/guide/components/loaders.jd b/docs/html-intl/intl/vi/guide/components/loaders.jd
index b6d277f..0585076 100644
--- a/docs/html-intl/intl/vi/guide/components/loaders.jd
+++ b/docs/html-intl/intl/vi/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>Lớp khóa</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>Các mẫu liên quan</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -51,7 +51,7 @@
tạo lại sau khi cấu hình thay đổi. Vì thế, chúng không cần truy vấn lại dữ liệu
của mình.</li>
</ul>
-
+
<h2 id="summary">Tổng quan về API Trình tải</h2>
<p>Có nhiều lớp và giao diện có thể có liên quan trong khi sử dụng
@@ -129,10 +129,10 @@
dữ liệu từ một số nguồn khác.</li>
<li>Một triển khai cho {@link android.app.LoaderManager.LoaderCallbacks}.
Đây là nơi bạn tạo trình tải mới và quản lý các tham chiếu của mình tới các
-trình tải hiện có.</li>
+trình tải hiện có.</li>
<li>Một cách để hiển thị dữ liệu của trình tải, chẳng hạn như {@link
android.widget.SimpleCursorAdapter}.</li>
- <li>Một nguồn dữ liệu, chẳng hạn như một {@link android.content.ContentProvider}, khi sử dụng một
+ <li>Một nguồn dữ liệu, chẳng hạn như một {@link android.content.ContentProvider}, khi sử dụng một
{@link android.content.CursorLoader}.</li>
</ul>
<h3 id="starting">Khởi động một Trình tải</h3>
@@ -140,7 +140,7 @@
<p>{@link android.app.LoaderManager} quản lý một hoặc nhiều thực thể {@link
android.content.Loader} trong một {@link android.app.Activity} hoặc
{@link android.app.Fragment}. Chỉ có một {@link
-android.app.LoaderManager} trên mỗi hoạt động hoặc phân đoạn.</p>
+android.app.LoaderManager} trên mỗi hoạt động hoặc phân đoạn.</p>
<p>Thông thường, bạn
sẽ khởi tạo một {@link android.content.Loader} bên trong phương pháp {@link
@@ -157,13 +157,13 @@
<ul>
<li>Một ID duy nhất xác định trình tải. Trong ví dụ này, ID là 0.</li>
<li>Các tham đối tùy chọn để cung cấp cho trình tải khi
-xây dựng (<code>null</code> trong ví dụ này).</li>
+xây dựng (<code>null</code> trong ví dụ này).</li>
-<li>Triển khai {@link android.app.LoaderManager.LoaderCallbacks}, phương pháp mà
+<li>Triển khai {@link android.app.LoaderManager.LoaderCallbacks}, phương pháp mà
{@link android.app.LoaderManager} gọi để báo cáo các sự kiện trình tải. Trong ví dụ này
, lớp cục bộ triển khai giao diện {@link
android.app.LoaderManager.LoaderCallbacks}, vì thế nó chuyển một tham chiếu
-tới chính nó, {@code this}.</li>
+tới chính nó, {@code this}.</li>
</ul>
<p>Lệnh gọi {@link android.app.LoaderManager#initLoader initLoader()} đảm bảo rằng một trình tải
được khởi tạo và hiện hoạt. Nó có hai kết quả có thể xảy ra:</p>
@@ -193,7 +193,7 @@
khởi động và dừng tải khi cần và duy trì trạng thái của trình tải
và nội dung đi kèm của nó. Như hàm ý, bạn hiếm khi tương tác trực tiếp với các trình tải
(thông qua một ví dụ về việc sử dụng các phương pháp trình tải để tinh chỉnh hành vi
-của một trình tải, hãy xem ví dụ <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
+của một trình tải, hãy xem ví dụ <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a>).
Bạn thường sử dụng nhất là các phương pháp {@link
android.app.LoaderManager.LoaderCallbacks} để can thiệp vào tiến trình tải
khi diễn ra một sự kiện đặc biệt. Để thảo luận thêm về chủ đề này, hãy xem phần <a href="#callback">Sử dụng Phương pháp Gọi lại LoaderManager</a>.</p>
@@ -245,7 +245,7 @@
— Được gọi khi một trình tải được tạo trước đó đã hoàn tất việc tải.
</li></ul>
<ul>
- <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
+ <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
— Được gọi khi một trình tải được tạo trước đó đang được đặt lại, vì thế mà khiến dữ liệu
của nó không sẵn có.
</li>
@@ -315,7 +315,7 @@
<p>Phương pháp này được gọi khi một trình tải được tạo trước đó đã hoàn thành việc tải của mình.
Phương pháp này được bảo đảm sẽ được gọi trước khi giải phóng dữ liệu cuối cùng
được cung cấp cho trình tải này. Tại điểm này, bạn nên loại bỏ mọi trường hợp sử dụng
-dữ liệu cũ (do nó sẽ được giải phóng sớm), nhưng không nên
+dữ liệu cũ (do nó sẽ được giải phóng sớm), nhưng không nên
tự mình giải phóng dữ liệu do trình tải sở hữu dữ liệu và sẽ đảm nhận việc này.</p>
@@ -340,11 +340,11 @@
<h4 id="onLoaderReset">onLoaderReset</h4>
-<p>Phương pháp này được gọi khi một trình tải được tạo trước đó đang được đặt lại, vì thế mà khiến
+<p>Phương pháp này được gọi khi một trình tải được tạo trước đó đang được đặt lại, vì thế mà khiến
dữ liệu của nó không sẵn có. Lệnh gọi lại này cho phép bạn tìm hiểu xem khi nào thì dữ liệu
sẽ được giải phóng để bạn có thể loại bỏ tham chiếu của mình tới nó. </p>
-<p>Sự triển khai này gọi ra
-{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
+<p>Sự triển khai này gọi ra
+{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
với một giá trị <code>null</code>:</p>
<pre>
@@ -366,7 +366,7 @@
android.app.Fragment} có chức năng hiển thị một {@link android.widget.ListView} chứa
kết quả của một truy vấn đối với trình cung cấp nội dung danh bạ. Nó sử dụng một {@link
android.content.CursorLoader} để quản lý truy vấn trên trình cung cấp.</p>
-
+
<p>Để một ứng dụng truy cập danh bạ của một người dùng, như minh họa trong ví dụ này, bản kê khai
của nó phải bao gồm quyền
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS}.</p>
diff --git a/docs/html-intl/intl/vi/guide/components/processes-and-threads.jd b/docs/html-intl/intl/vi/guide/components/processes-and-threads.jd
index 390ca15..b9933ed 100644
--- a/docs/html-intl/intl/vi/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/vi/guide/components/processes-and-threads.jd
@@ -120,7 +120,7 @@
<ul>
<li>Nó lưu trữ một {@link android.app.Activity} mà không nằm trong tiền cảnh, nhưng vẫn
-hiển thị với người dùng (phương pháp {@link android.app.Activity#onPause onPause()} của nó đã được gọi).
+hiển thị với người dùng (phương pháp {@link android.app.Activity#onPause onPause()} của nó đã được gọi).
Điều này có thể xảy ra, ví dụ, nếu hoạt động tiền cảnh đã bắt đầu một hộp thoại, nó cho phép
hoạt động trước được nhìn thấy phía sau nó.</li>
@@ -202,7 +202,7 @@
hoặc một phương pháp gọi lại vòng đời) sẽ luôn chạy trong luồng UI của tiến trình.</p>
<p>Ví dụ, khi người dùng chạm vào một nút trên màn hình, luồng UI của ứng dụng của bạn sẽ phân phối
-sự kiện chạm tới widget, đến lượt mình, widget sẽ đặt trạng thái được nhấn và đăng một yêu cầu vô hiệu hóa tới
+sự kiện chạm tới widget, đến lượt mình, widget sẽ đặt trạng thái được nhấn và đăng một yêu cầu vô hiệu hóa tới
hàng đợi sự kiện. Luồng UI loại yêu cầu khỏi hàng đợi và thông báo với widget rằng nó nên tự vẽ lại
.</p>
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
diff --git a/docs/html-intl/intl/vi/guide/components/recents.jd b/docs/html-intl/intl/vi/guide/components/recents.jd
index 0a17614..271c05d 100644
--- a/docs/html-intl/intl/vi/guide/components/recents.jd
+++ b/docs/html-intl/intl/vi/guide/components/recents.jd
@@ -180,7 +180,7 @@
bất kỳ hoạt động nào mà người dùng đã gọi ra cuối cùng.</dd>
</dl>
-<p class="note"><strong>Lưu ý:</strong> Đối với những giá trị ngoài {@code none} và {@code never}
+<p class="note"><strong>Lưu ý:</strong> Đối với những giá trị ngoài {@code none} và {@code never}
hoạt động phải được định nghĩa bằng {@code launchMode="standard"}. Nếu thuộc tính này không được quy định thì
{@code documentLaunchMode="none"} sẽ được sử dụng.</p>
@@ -191,7 +191,7 @@
bằng một cờ {@link android.content.Intent}, hoặc bằng một thuộc tính<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">
<activity></a></code>.</p>
-<p>Bạn có thể luôn loại trừ hoàn toàn một tác vụ khỏi màn hình tổng quan bằng cách thiết đặt thuộc tính
+<p>Bạn có thể luôn loại trừ hoàn toàn một tác vụ khỏi màn hình tổng quan bằng cách thiết đặt thuộc tính
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
, <a href="{@docRoot}guide/topics/manifest/activity-element.html#exclude">
{@code android:excludeFromRecents}</a> thành {@code true}.</p>
diff --git a/docs/html-intl/intl/vi/guide/components/services.jd b/docs/html-intl/intl/vi/guide/components/services.jd
index 9e3e6c7..fc2a7eae 100644
--- a/docs/html-intl/intl/vi/guide/components/services.jd
+++ b/docs/html-intl/intl/vi/guide/components/services.jd
@@ -199,7 +199,7 @@
</manifest>
</pre>
-<p>Xem tham chiếu phần tử <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
+<p>Xem tham chiếu phần tử <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a>
để biết thêm thông tin về việc khai báo dịch vụ của bạn trong bản kê khai.</p>
<p>Có các thuộc tính khác mà bạn có thể bao gồm trong phần tử <a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a> để
@@ -605,7 +605,7 @@
<p>Sau khi chạy, một dịch vụ có thể thông báo cho người dùng về sự kiện bằng cách sử dụng <a href="{@docRoot}guide/topics/ui/notifiers/toasts.html">Thông báo Cửa sổ</a> hoặc <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">Thông báo Thanh Trạng thái</a>.</p>
-<p>Thông báo cửa sổ là một thông báo xuất hiện một lúc trên bề mặt của cửa sổ hiện tại
+<p>Thông báo cửa sổ là một thông báo xuất hiện một lúc trên bề mặt của cửa sổ hiện tại
rồi biến mất, trong khi thông báo thanh trạng thái cung cấp một biểu tượng trong thanh trạng thái cùng một
thông báo, người dùng có thể chọn nó để thực hiện một hành động (chẳng hạn như bắt đầu một hoạt động).</p>
diff --git a/docs/html-intl/intl/vi/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/vi/guide/components/tasks-and-back-stack.jd
index 85affff..76df1dd 100644
--- a/docs/html-intl/intl/vi/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/vi/guide/components/tasks-and-back-stack.jd
@@ -190,7 +190,7 @@
<p>Khi hệ thống dừng một trong các hoạt động của bạn (chẳng hạn như khi một hoạt động mới bắt đầu hoặc tác vụ
di chuyển về nền), hệ thống có thể hoàn toàn hủy hoạt động đó nếu nó cần khôi phục
-bộ nhớ hệ thống. Khi điều này xảy ra, thông tin về trạng thái của hoạt động sẽ bị mất. Nếu điều này xảy ra,
+bộ nhớ hệ thống. Khi điều này xảy ra, thông tin về trạng thái của hoạt động sẽ bị mất. Nếu điều này xảy ra,
hệ thống vẫn
biết rằng hoạt động có một vị trí trong ngăn xếp, nhưng khi hoạt động được đưa tới vị trí trên cùng
của chồng, hệ thống phải tạo lại nó (thay vì tiếp tục). Để tránh
@@ -314,7 +314,7 @@
<p>Ví dụ, giả sử ngăn xếp của một tác vụ bao gồm hoạt động gốc A với các hoạt động B, C,
và D ở trên cùng (chồng là A-B-C-D; D ở trên cùng). Một ý định đến cho loại hoạt động D.
Nếu D có chế độ khởi chạy {@code "standard"} mặc định, một thực thể mới của lớp sẽ được khởi chạy và
-chồng trở thành A-B-C-D-D. Tuy nhiên, nếu chế độ khởi chạy của D là {@code "singleTop"}, thực thể hiện tại
+chồng trở thành A-B-C-D-D. Tuy nhiên, nếu chế độ khởi chạy của D là {@code "singleTop"}, thực thể hiện tại
của D sẽ nhận ý định thông qua {@link
android.app.Activity#onNewIntent onNewIntent()}, bởi nó nằm ở vị trí trên cùng của chồng—chồng
vẫn là A-B-C-D. Tuy nhiên, nếu một ý định đến cho hoạt động loại B, khi đó một thực thể
@@ -557,9 +557,9 @@
. Lúc này, tác vụ được gửi tới nền và không hiển thị. Bây giờ, người dùng không có cách nào để quay lại
tác vụ bởi nó không được biểu diễn trong trình khởi chạy ứng dụng.</p>
-<p>Đối với những trường hợp mà bạn không muốn người dùng có thể quay lại một hoạt động, hãy đặt giá trị của phần tử
+<p>Đối với những trường hợp mà bạn không muốn người dùng có thể quay lại một hoạt động, hãy đặt giá trị của phần tử
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-,
+,
<a href="{@docRoot}guide/topics/manifest/activity-element.html#finish">{@code finishOnTaskLaunch}</a>
thành {@code "true"} (xem <a href="#Clearing">Xóa chồng</a>).</p>
diff --git a/docs/html-intl/intl/vi/preview/j8-jack.jd b/docs/html-intl/intl/vi/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/vi/preview/j8-jack.jd
rename to docs/html-intl/intl/vi/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/vi/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/vi/guide/topics/manifest/manifest-intro.jd
index ca2ed26..06668b4 100644
--- a/docs/html-intl/intl/vi/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/vi/guide/topics/manifest/manifest-intro.jd
@@ -31,27 +31,27 @@
<li>Nó đặt tên gói Java cho ứng dụng.
Tên gói đóng vai trò như một mã nhận diện duy nhất cho ứng dụng.</li>
-<li>Nó mô tả các thành phần của ứng dụng — hoạt động,
-dịch vụ, hàm nhận quảng bá, và trình cung cấp nội dung mà ứng dụng
-được soạn bởi. Nó đặt tên các lớp triển khai từng thành phần và
-công bố các khả năng của chúng (ví dụ, những tin nhắn {@link android.content.Intent
-Intent} mà chúng có thể xử lý). Những khai báo này cho phép hệ thống Android
+<li>Nó mô tả các thành phần của ứng dụng — hoạt động,
+dịch vụ, hàm nhận quảng bá, và trình cung cấp nội dung mà ứng dụng
+được soạn bởi. Nó đặt tên các lớp triển khai từng thành phần và
+công bố các khả năng của chúng (ví dụ, những tin nhắn {@link android.content.Intent
+Intent} mà chúng có thể xử lý). Những khai báo này cho phép hệ thống Android
biết các thành phần là gì và chúng có thể được khởi chạy trong những điều kiện nào.</li>
-<li>Nó xác định những tiến trình nào sẽ lưu trữ các thành phần ứng dụng.</li>
+<li>Nó xác định những tiến trình nào sẽ lưu trữ các thành phần ứng dụng.</li>
-<li>Nó khai báo các quyền mà ứng dụng phải có để
-truy cập các phần được bảo vệ của API và tương tác với các ứng dụng khác.</li>
+<li>Nó khai báo các quyền mà ứng dụng phải có để
+truy cập các phần được bảo vệ của API và tương tác với các ứng dụng khác.</li>
-<li>Nó cũng khai báo các quyền mà ứng dụng khác phải có để
+<li>Nó cũng khai báo các quyền mà ứng dụng khác phải có để
tương tác với các thành phần của ứng dụng.</li>
-<li>Nó liệt kê các lớp {@link android.app.Instrumentation} cung cấp
-tính năng tạo hồ sơ và các thông tin khác khi ứng dụng đang chạy. Những khai báo này
-chỉ xuất hiện trong bản kê khai khi ứng dụng đang được phát triển và
+<li>Nó liệt kê các lớp {@link android.app.Instrumentation} cung cấp
+tính năng tạo hồ sơ và các thông tin khác khi ứng dụng đang chạy. Những khai báo này
+chỉ xuất hiện trong bản kê khai khi ứng dụng đang được phát triển và
thử nghiệm; chúng bị loại bỏ trước khi ứng dụng được công bố.</li>
-<li>Nó khai báo mức tối thiểu của API Android mà ứng dụng
+<li>Nó khai báo mức tối thiểu của API Android mà ứng dụng
yêu cầu.</li>
<li>Nó liệt kê các thư viện mà ứng dụng phải được liên kết với.</li>
@@ -61,12 +61,12 @@
<h2 id="filestruct">Cấu trúc của Tệp Bản kê khai</h2>
<p>
-Sơ đồ bên dưới minh họa cấu trúc chung của tệp bản kê khai và mọi
-phần tử mà nó có thể chứa. Từng phần tử, cùng với tất cả thuộc tính
-của mình, sẽ được lập tài liệu theo dõi đầy đủ vào một tệp riêng. Để xem thông tin
-chi tiết về mọi phần tử, hãy nhấp vào tên phần tử trong sơ đồ,
+Sơ đồ bên dưới minh họa cấu trúc chung của tệp bản kê khai và mọi
+phần tử mà nó có thể chứa. Từng phần tử, cùng với tất cả thuộc tính
+của mình, sẽ được lập tài liệu theo dõi đầy đủ vào một tệp riêng. Để xem thông tin
+chi tiết về mọi phần tử, hãy nhấp vào tên phần tử trong sơ đồ,
trong danh sách các phần tử theo thứ tự chữ cái mà tuân theo sơ đồ, hoặc trên bất kỳ
-nội dung nào khác đề cập tới tên phần tử.
+nội dung nào khác đề cập tới tên phần tử.
</p>
<pre>
@@ -126,9 +126,9 @@
</pre>
<p>
-Tất cả phần tử có thể xuất hiện trong tệp bản kê khai được liệt kê ở bên dưới
-theo thứ tự chữ cái. Đây là những phần tử hợp pháp duy nhất; bạn không thể
-thêm các phần tử hay thuộc tính của chính mình.
+Tất cả phần tử có thể xuất hiện trong tệp bản kê khai được liệt kê ở bên dưới
+theo thứ tự chữ cái. Đây là những phần tử hợp pháp duy nhất; bạn không thể
+thêm các phần tử hay thuộc tính của chính mình.
</p>
<p style="margin-left: 2em">
@@ -158,74 +158,74 @@
</p>
-
+
<h2 id="filec">Các Quy ước Tệp</h2>
<p>
-Một số quy ước và quy tắc áp dụng chung cho tất cả các phần tử và thuộc tính
+Một số quy ước và quy tắc áp dụng chung cho tất cả các phần tử và thuộc tính
trong bản kê khai:
</p>
<dl>
<dt><b>Phần tử</b></dt>
-<dd>Chỉ các phần tử
+<dd>Chỉ các phần tử
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> và
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-là bắt buộc phải có, chúng đều phải có mặt và chỉ có thể xảy ra một lần.
-Hầu hết các phần tử khác có thể xảy ra nhiều lần hoặc không xảy ra — mặc dù ít
-nhất một vài trong số chúng phải có mặt để bản kê khai thực sự có
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+là bắt buộc phải có, chúng đều phải có mặt và chỉ có thể xảy ra một lần.
+Hầu hết các phần tử khác có thể xảy ra nhiều lần hoặc không xảy ra — mặc dù ít
+nhất một vài trong số chúng phải có mặt để bản kê khai thực sự có
ý nghĩa nào đó.
<p>
-Nếu một phần tử chứa bất kỳ nội dung nào, nó có thể chứa các phần tử khác.
+Nếu một phần tử chứa bất kỳ nội dung nào, nó có thể chứa các phần tử khác.
Tất cả giá trị sẽ được đặt thông qua thuộc tính, chứ không phải là dữ liệu ký tự trong một phần tử.
</p>
<p>
Các phần tử cùng cấp thường không theo thứ tự. Ví dụ, các phần tử
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, và
-<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-có thể được trộn lẫn với nhau theo bất kỳ trình tự nào. (Phần tử
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, và
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
+có thể được trộn lẫn với nhau theo bất kỳ trình tự nào. (Phần tử
<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
-là trường hợp ngoại lệ đối với quy tắc này: Nó phải tuân theo
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+là trường hợp ngoại lệ đối với quy tắc này: Nó phải tuân theo
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
, đối tượng mà nó là bí danh cho.)
</p></dd>
<dt><b>Thuộc tính</b></dt>
-<dd>Theo cách hiểu thông thường, tất cả thuộc tính đều mang tính tùy chọn. Tuy nhiên, có một số thuộc tính
-phải được quy định cho một phần tử để hoàn thành mục đích của nó. Sử dụng
+<dd>Theo cách hiểu thông thường, tất cả thuộc tính đều mang tính tùy chọn. Tuy nhiên, có một số thuộc tính
+phải được quy định cho một phần tử để hoàn thành mục đích của nó. Sử dụng
tài liệu làm hướng dẫn. Đối với những thuộc tính thực sự tùy chọn, nó đề cập tới một giá trị
mặc định hoặc thông báo điều gì sẽ xảy ra nếu không có một đặc tả.
-<p>Ngoài một số thuộc tính của phần tử
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-gốc, tất cả tên thuộc tính đều bắt đầu bằng một tiền tố {@code android:}—
-ví dụ, {@code android:alwaysRetainTaskState}. Do tiền tố này
-phổ dụng, tài liệu thường bỏ sót nó khi tham chiếu tới các thuộc tính
+<p>Ngoài một số thuộc tính của phần tử
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+gốc, tất cả tên thuộc tính đều bắt đầu bằng một tiền tố {@code android:}—
+ví dụ, {@code android:alwaysRetainTaskState}. Do tiền tố này
+phổ dụng, tài liệu thường bỏ sót nó khi tham chiếu tới các thuộc tính
theo tên.</p></dd>
<dt><b>Khai báo tên lớp</b></dt>
-<dd>Nhiều thuộc tính tương ứng với các đối tượng Java, bao gồm các phần tử cho
-chính ứng dụng (phần tử
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-) và các thành phần chính của nó — hoạt động
-(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
-dịch vụ
-(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
-hàm nhận quảng bá
-(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>),
-và trình cung cấp nội dung
-(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
+<dd>Nhiều thuộc tính tương ứng với các đối tượng Java, bao gồm các phần tử cho
+chính ứng dụng (phần tử
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+) và các thành phần chính của nó — hoạt động
+(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
+dịch vụ
+(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
+hàm nhận quảng bá
+(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>),
+và trình cung cấp nội dung
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>).
<p>
-Nếu bạn định nghĩa một lớp con như vẫn luôn làm đối với lớp thành phần
-({@link android.app.Activity}, {@link android.app.Service},
-{@link android.content.BroadcastReceiver}, và {@link android.content.ContentProvider}),
-lớp con sẽ được khai báo thông qua một thuộc tính {@code name}. Tên phải bao gồm
-chỉ định gói đầy đủ.
+Nếu bạn định nghĩa một lớp con như vẫn luôn làm đối với lớp thành phần
+({@link android.app.Activity}, {@link android.app.Service},
+{@link android.content.BroadcastReceiver}, và {@link android.content.ContentProvider}),
+lớp con sẽ được khai báo thông qua một thuộc tính {@code name}. Tên phải bao gồm
+chỉ định gói đầy đủ.
Ví dụ, một lớp con {@link android.app.Service} có thể được khai báo như sau:
</p>
@@ -239,12 +239,12 @@
</manifest></pre>
<p>
-Tuy nhiên, do cách viết tốc ký, nếu ký tự đầu tiên của xâu là một dấu chấm,
-xâu sẽ được nối với tên gói của ứng dụng (như được quy định bởi
-thuộc tính của phần tử <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
+Tuy nhiên, do cách viết tốc ký, nếu ký tự đầu tiên của xâu là một dấu chấm,
+xâu sẽ được nối với tên gói của ứng dụng (như được quy định bởi
+thuộc tính của phần tử <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-<code>, <a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
-). Cách gán sau cũng giống như trên:
+<code>, <a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
+). Cách gán sau cũng giống như trên:
</p>
<pre><manifest package="com.example.project" . . . >
@@ -257,13 +257,13 @@
</manifest></pre>
<p>
-Khi khởi động một thành phần, Android sẽ tạo một thực thể của lớp con được nêu tên.
+Khi khởi động một thành phần, Android sẽ tạo một thực thể của lớp con được nêu tên.
Nếu lớp con không được quy định, nó sẽ tạo một thực thể của lớp cơ sở.
</p></dd>
<dt><b>Nhiều giá trị</b></dt>
-<dd>Nếu có thể quy định nhiều hơn một giá trị, phần tử gần như luôn
-được lặp lại, thay vì liệt kê nhiều giá trị trong một phần tử duy nhất.
+<dd>Nếu có thể quy định nhiều hơn một giá trị, phần tử gần như luôn
+được lặp lại, thay vì liệt kê nhiều giá trị trong một phần tử duy nhất.
Ví dụ, một bộ lọc ý định có thể liệt kê vài hành động:
<pre><intent-filter . . . >
@@ -274,24 +274,24 @@
</intent-filter></pre></dd>
<dt><b>Giá trị tài nguyên</b></dt>
-<dd>Một số thuộc tính có các giá trị có thể được hiển thị với người dùng — ví
-dụ, một nhãn và một biểu tượng cho một hoạt động. Giá trị của những thuộc tính này
-cần được cục bộ hóa và vì thế phải được thiết đặt từ một tài nguyên hoặc chủ đề. Giá trị
+<dd>Một số thuộc tính có các giá trị có thể được hiển thị với người dùng — ví
+dụ, một nhãn và một biểu tượng cho một hoạt động. Giá trị của những thuộc tính này
+cần được cục bộ hóa và vì thế phải được thiết đặt từ một tài nguyên hoặc chủ đề. Giá trị
tài nguyên được biểu diễn theo định dạng sau,</p>
<p style="margin-left: 2em">{@code @[<i>gói</i>:]<i>kiểu</i>:<i>tên</i>}</p>
<p>
-trong đó <i>gói</i> có thể được bỏ qua nếu tài nguyên nằm trong cùng gói
-với ứng dụng, <i>kiểu</i> là kiểu của tài nguyên — chẳng hạn như "xâu" hoặc
-— "vẽ được" và <i>tên</i> là tên nhận biết tài nguyên cụ thể.
+trong đó <i>gói</i> có thể được bỏ qua nếu tài nguyên nằm trong cùng gói
+với ứng dụng, <i>kiểu</i> là kiểu của tài nguyên — chẳng hạn như "xâu" hoặc
+— "vẽ được" và <i>tên</i> là tên nhận biết tài nguyên cụ thể.
Ví dụ:
</p>
<pre><activity android:icon="@drawable/smallPic" . . . ></pre>
<p>
-Các giá trị từ một chủ đề được biểu diễn theo cách tương tự, nhưng với một '{@code ?}'
+Các giá trị từ một chủ đề được biểu diễn theo cách tương tự, nhưng với một '{@code ?}'
thay vì '{@code @}' ở đầu:
</p>
@@ -299,8 +299,8 @@
</p></dd>
<dt><b>Giá trị xâu</b></dt>
-<dd>Trường hợp giá trị của một thuộc tính là một xâu, phải sử dụng hai dấu xuyệc ngược ('{@code \\}')
-để thoát các ký tự — ví dụ, '{@code \\n}' đối với
+<dd>Trường hợp giá trị của một thuộc tính là một xâu, phải sử dụng hai dấu xuyệc ngược ('{@code \\}')
+để thoát các ký tự — ví dụ, '{@code \\n}' đối với
một dòng tin tức hoặc '{@code \\uxxxx}' đối với một ký tự Unicode.</dd>
</dl>
@@ -308,7 +308,7 @@
<h2 id="filef">Các Tính năng Tệp</h2>
<p>
-Phần sau đây mô tả cách phản ánh một số tính năng của Android
+Phần sau đây mô tả cách phản ánh một số tính năng của Android
trong tệp bản kê khai.
</p>
@@ -316,23 +316,23 @@
<h3 id="ifs">Bộ lọc Ý định</h3>
<p>
-Các thành phần cốt lõi của một ứng dụng (hoạt động, dịch vụ và hàm nhận
-quảng bá) được kích hoạt bởi <i>ý định</i>. Ý định là một
-gói thông tin (một đối tượng {@link android.content.Intent}) mô tả một
-hành động mong muốn — bao gồm dữ liệu sẽ được dựa trên, thể loại của
-thành phần mà sẽ thực hiện hành động, và các chỉ dẫn thích hợp khác.
-Android định vị một thành phần phù hợp để hồi đáp ý định, khởi chạy
-một thực thể mới của thành phần nếu cần, và chuyển cho nó đối tượng đó
+Các thành phần cốt lõi của một ứng dụng (hoạt động, dịch vụ và hàm nhận
+quảng bá) được kích hoạt bởi <i>ý định</i>. Ý định là một
+gói thông tin (một đối tượng {@link android.content.Intent}) mô tả một
+hành động mong muốn — bao gồm dữ liệu sẽ được dựa trên, thể loại của
+thành phần mà sẽ thực hiện hành động, và các chỉ dẫn thích hợp khác.
+Android định vị một thành phần phù hợp để hồi đáp ý định, khởi chạy
+một thực thể mới của thành phần nếu cần, và chuyển cho nó đối tượng đó
Ý định.
</p>
<p>
-Các thành phần sẽ quảng cáo khả năng của mình — các kiểu ý định mà chúng có thể
-hồi đáp — thông qua <i>các bộ lọc ý định</i>. Do hệ thống Android phải
-tìm hiểu một thành phần có thể xử lý những ý định nào trước khi khởi chạy thành phần đó,
-bộ lọc ý định được quy định trong bản kê khai như là các phần tử
+Các thành phần sẽ quảng cáo khả năng của mình — các kiểu ý định mà chúng có thể
+hồi đáp — thông qua <i>các bộ lọc ý định</i>. Do hệ thống Android phải
+tìm hiểu một thành phần có thể xử lý những ý định nào trước khi khởi chạy thành phần đó,
+bộ lọc ý định được quy định trong bản kê khai như là các phần tử
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-. Một thành phần có thể có nhiều bộ lọc, mỗi bộ lọc lại mô tả
+. Một thành phần có thể có nhiều bộ lọc, mỗi bộ lọc lại mô tả
một khả năng khác nhau.
</p>
@@ -344,9 +344,9 @@
</p>
<p>
-Để biết thông tin về cách các đối tượng Ý định được kiểm tra thông qua bộ lọc ý định,
-hãy xem tài liệu riêng có tiêu đề
-<a href="{@docRoot}guide/components/intents-filters.html">Ý định
+Để biết thông tin về cách các đối tượng Ý định được kiểm tra thông qua bộ lọc ý định,
+hãy xem tài liệu riêng có tiêu đề
+<a href="{@docRoot}guide/components/intents-filters.html">Ý định
và Bộ lọc Ý định</a>.
</p>
@@ -354,42 +354,42 @@
<h3 id="iconlabel">Biểu tượng và Nhãn</h3>
<p>
-Nhiều phần tử có thuộc tính {@code icon} và {@code label} cho một
-biểu tượng nhỏ và nhãn văn bản mà có thể được hiển thị với người dùng. Một số cũng có thuộc tính
-{@code description} cho văn bản giải trình dài hơn mà cũng có thể
-được hiển thị trên màn hình. Ví dụ, phần tử
+Nhiều phần tử có thuộc tính {@code icon} và {@code label} cho một
+biểu tượng nhỏ và nhãn văn bản mà có thể được hiển thị với người dùng. Một số cũng có thuộc tính
+{@code description} cho văn bản giải trình dài hơn mà cũng có thể
+được hiển thị trên màn hình. Ví dụ, phần tử
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-có cả ba thuộc tính này, vì thế khi người dùng được hỏi xem có
-cấp quyền cho một ứng dụng yêu cầu hay không, biểu tượng thể hiện
+có cả ba thuộc tính này, vì thế khi người dùng được hỏi xem có
+cấp quyền cho một ứng dụng yêu cầu hay không, biểu tượng thể hiện
quyền, tên của quyền, và mô tả nội dung
của quyền đó đều có thể được trình bày cho người dùng xem.
</p>
<p>
-Trong mọi trường hợp, biểu tượng và nhãn được đặt trong một phần tử chứa sẽ trở thành các thiết đặt
-{@code icon} và {@code label} mặc định cho tất cả phần tử con của bộ chứa đó.
-Vì thế, biểu tượng và nhãn được đặt trong phần tử
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-là biểu tượng và nhãn mặc định cho từng thành phần của ứng dụng.
-Tương tự, biểu tượng và nhãn được đặt cho một thành phần — ví dụ, một phần tử
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-— sẽ là các cài đặt mặc định cho từng phần tử
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
+Trong mọi trường hợp, biểu tượng và nhãn được đặt trong một phần tử chứa sẽ trở thành các thiết đặt
+{@code icon} và {@code label} mặc định cho tất cả phần tử con của bộ chứa đó.
+Vì thế, biểu tượng và nhãn được đặt trong phần tử
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+là biểu tượng và nhãn mặc định cho từng thành phần của ứng dụng.
+Tương tự, biểu tượng và nhãn được đặt cho một thành phần — ví dụ, một phần tử
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
+— sẽ là các cài đặt mặc định cho từng phần tử
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
của thành phần đó. Nếu một phần tử
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-thiết đặt một nhãn, nhưng hoạt động và bộ lọc ý định của nó thì không,
-nhãn ứng dụng sẽ được coi là nhãn của cả hoạt động và
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+thiết đặt một nhãn, nhưng hoạt động và bộ lọc ý định của nó thì không,
+nhãn ứng dụng sẽ được coi là nhãn của cả hoạt động và
bộ lọc ý định.
</p>
<p>
-Biểu tượng và nhãn được đặt cho một bộ lọc ý định sẽ được sử dụng để biểu diễn một thành phần
+Biểu tượng và nhãn được đặt cho một bộ lọc ý định sẽ được sử dụng để biểu diễn một thành phần
bất cứ khi nào thành phần đó được trình bày với người dùng để thực hiện chức năng
-mà bộ lọc đã quảng cáo. Ví dụ, một bộ lọc với các thiết đặt
-"{@code android.intent.action.MAIN}" và
-"{@code android.intent.category.LAUNCHER}" quảng cáo một hoạt động
+mà bộ lọc đã quảng cáo. Ví dụ, một bộ lọc với các thiết đặt
+"{@code android.intent.action.MAIN}" và
+"{@code android.intent.category.LAUNCHER}" quảng cáo một hoạt động
là hoạt động khởi đầu một ứng dụng — cụ thể, là
-hoạt động sẽ được hiển thị trong trình khởi chạy ứng dụng. Vì thế, biểu tượng và nhãn
+hoạt động sẽ được hiển thị trong trình khởi chạy ứng dụng. Vì thế, biểu tượng và nhãn
được đặt trong bộ lọc là những nội dung được hiển thị trong trình khởi chạy.
</p>
@@ -397,14 +397,14 @@
<h3 id="perms">Quyền</h3>
<p>
-Một <i>quyền</i> là sự hạn chế giới hạn truy cập vào một phần của mã
-hoặc vào dữ liệu trên thiết bị. Giới hạn này được áp đặt nhằm bảo vệ dữ liệu
-và mã trọng yếu, có thể bị lạm dụng để bóp méo hoặc làm hỏng trải nghiệm người dùng.
+Một <i>quyền</i> là sự hạn chế giới hạn truy cập vào một phần của mã
+hoặc vào dữ liệu trên thiết bị. Giới hạn này được áp đặt nhằm bảo vệ dữ liệu
+và mã trọng yếu, có thể bị lạm dụng để bóp méo hoặc làm hỏng trải nghiệm người dùng.
</p>
<p>
-Mỗi quyền được nhận biết bằng một nhãn duy nhất. Thông thường, nhãn cho biết
-hành động bị hạn chế. Ví dụ, sau đây là một số quyền được định nghĩa
+Mỗi quyền được nhận biết bằng một nhãn duy nhất. Thông thường, nhãn cho biết
+hành động bị hạn chế. Ví dụ, sau đây là một số quyền được định nghĩa
bởi Android:
</p>
@@ -418,25 +418,25 @@
</p>
<p>
-Nếu một ứng dụng cần truy cập vào một tính năng được bảo vệ bởi một quyền,
-nó phải khai báo rằng nó yêu cầu quyền đó cùng với một phần tử
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-trong bản kê khai. Lúc đó, khi ứng dụng được cài đặt trên
-thiết bị, trình cài đặt sẽ xác định xem có cấp quyền
-được yêu cầu hay không bằng cách kiểm tra các thẩm quyền đã ký chứng chỉ
-của ứng dụng và trong một số trường hợp, bằng cách hỏi người dùng.
-Nếu quyền được cấp, ứng dụng có thể sử dụng các tính năng
+Nếu một ứng dụng cần truy cập vào một tính năng được bảo vệ bởi một quyền,
+nó phải khai báo rằng nó yêu cầu quyền đó cùng với một phần tử
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+trong bản kê khai. Lúc đó, khi ứng dụng được cài đặt trên
+thiết bị, trình cài đặt sẽ xác định xem có cấp quyền
+được yêu cầu hay không bằng cách kiểm tra các thẩm quyền đã ký chứng chỉ
+của ứng dụng và trong một số trường hợp, bằng cách hỏi người dùng.
+Nếu quyền được cấp, ứng dụng có thể sử dụng các tính năng
được bảo vệ. Nếu không, việc thử truy cập những tính năng đó sẽ thất bại
-mà không có bất kỳ thông báo nào cho người dùng.
+mà không có bất kỳ thông báo nào cho người dùng.
</p>
<p>
-Một ứng dụng cũng có thể bảo vệ các thành phần của chính nó (hoạt động, dịch vụ,
-hàm nhận quảng bá và trình cung cấp nội dung) bằng các quyền. Nó có thể sử dụng
-bất kỳ quyền nào được định nghĩa bởi Android (được liệt kê trong
-{@link android.Manifest.permission android.Manifest.permission}) hoặc được khai báo
-bởi các ứng dụng khác. Hoặc nó có thể tự định nghĩa quyền của mình. Một quyền mới được khai báo
-bằng phần tử
+Một ứng dụng cũng có thể bảo vệ các thành phần của chính nó (hoạt động, dịch vụ,
+hàm nhận quảng bá và trình cung cấp nội dung) bằng các quyền. Nó có thể sử dụng
+bất kỳ quyền nào được định nghĩa bởi Android (được liệt kê trong
+{@link android.Manifest.permission android.Manifest.permission}) hoặc được khai báo
+bởi các ứng dụng khác. Hoặc nó có thể tự định nghĩa quyền của mình. Một quyền mới được khai báo
+bằng phần tử
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
. Ví dụ, một hoạt động có thể được bảo vệ như sau:
</p>
@@ -457,43 +457,43 @@
</pre>
<p>
-Lưu ý rằng trong ví dụ này, quyền {@code DEBIT_ACCT} không chỉ
-được khai báo bằng phần tử
+Lưu ý rằng trong ví dụ này, quyền {@code DEBIT_ACCT} không chỉ
+được khai báo bằng phần tử
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-, việc sử dụng quyền cũng được yêu cầu bằng phần tử
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-. Phải yêu cầu sử dụng quyền để các thành phần khác của
-ứng dụng nhằm khởi chạy hoạt động được bảo vệ, mặc dù việc bảo vệ
-do chính ứng dụng áp đặt.
+, việc sử dụng quyền cũng được yêu cầu bằng phần tử
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+. Phải yêu cầu sử dụng quyền để các thành phần khác của
+ứng dụng nhằm khởi chạy hoạt động được bảo vệ, mặc dù việc bảo vệ
+do chính ứng dụng áp đặt.
</p>
<p>
-Trong cùng ví dụ này, nếu thuộc tính {@code permission} được đặt thành một quyền
-được khai báo ở nơi khác
-(chẳng hạn như {@code android.permission.CALL_EMERGENCY_NUMBERS}, sẽ không
-cần phải khai báo lại nó bằng một phần tử
+Trong cùng ví dụ này, nếu thuộc tính {@code permission} được đặt thành một quyền
+được khai báo ở nơi khác
+(chẳng hạn như {@code android.permission.CALL_EMERGENCY_NUMBERS}, sẽ không
+cần phải khai báo lại nó bằng một phần tử
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-. Tuy nhiên, sẽ vẫn cần phải yêu cầu sử dụng nó bằng
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
+. Tuy nhiên, sẽ vẫn cần phải yêu cầu sử dụng nó bằng
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
</p>
<p>
-Phần tử
-<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-sẽ khai báo một vùng tên cho nhóm quyền mà sẽ được định nghĩa trong
-mã. Và
+Phần tử
+<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
+sẽ khai báo một vùng tên cho nhóm quyền mà sẽ được định nghĩa trong
+mã. Và
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-sẽ định nghĩa một nhãn cho một tập hợp quyền (cả được khai báo trong bản kê khai bằng phần tử
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-và được khai báo ở chỗ khác). Nó chỉ ảnh hưởng tới cách các quyền được
-nhóm lại khi được trình bày với người dùng. Phần tử
+sẽ định nghĩa một nhãn cho một tập hợp quyền (cả được khai báo trong bản kê khai bằng phần tử
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+và được khai báo ở chỗ khác). Nó chỉ ảnh hưởng tới cách các quyền được
+nhóm lại khi được trình bày với người dùng. Phần tử
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-không quy định những quyền nào thuộc về nhóm;
+không quy định những quyền nào thuộc về nhóm;
nó chỉ đặt cho nhóm một cái tên. Một quyền được đặt vào nhóm
bằng cách gán tên nhóm với thuộc tính của phần tử
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-,
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+,
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code>
.
</p>
@@ -501,17 +501,17 @@
<h3 id="libs">Thư viện</h3>
<p>
-Mọi ứng dụng đều được liên kết với thư viện Android mặc định, nó
-bao gồm các gói cơ bản để xây dựng ứng dụng (bằng các lớp thông dụng
-chẳng hạn như Hoạt động, Dịch vụ, Ý định, Dạng xem, Nút, Ứng dụng, Trình cung cấp Nội dung,
+Mọi ứng dụng đều được liên kết với thư viện Android mặc định, nó
+bao gồm các gói cơ bản để xây dựng ứng dụng (bằng các lớp thông dụng
+chẳng hạn như Hoạt động, Dịch vụ, Ý định, Dạng xem, Nút, Ứng dụng, Trình cung cấp Nội dung,
v.v.).
</p>
<p>
-Tuy nhiên, một số gói nằm trong thư viện của chính mình. Nếu ứng dụng của bạn
-sử dụng mã từ bất kỳ gói nào trong những gói này, nó phải công khai yêu cầu được liên kết
-với chúng. Bản kê khai phải chứa một phần tử
-<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
-riêng để đặt tên cho từng thư viện. (Tên thư viện có thể được tìm thấy trong tài liệu
+Tuy nhiên, một số gói nằm trong thư viện của chính mình. Nếu ứng dụng của bạn
+sử dụng mã từ bất kỳ gói nào trong những gói này, nó phải công khai yêu cầu được liên kết
+với chúng. Bản kê khai phải chứa một phần tử
+<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
+riêng để đặt tên cho từng thư viện. (Tên thư viện có thể được tìm thấy trong tài liệu
của gói.)
</p>
diff --git a/docs/html-intl/intl/vi/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/vi/guide/topics/providers/calendar-provider.jd
index e2ecdb3..c9d779b 100644
--- a/docs/html-intl/intl/vi/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/vi/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">Sử dụng ý định để xem dữ liệu lịch</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">Trình điều hợp Đồng bộ</a></li>
</ol>
@@ -63,8 +63,8 @@
<p>API Trình cung cấp Lịch có thể được sử dụng bởi các ứng dụng và trình điều hợp đồng bộ. Các quy tắc
thay đổi tùy vào loại chương trình đang thực hiện lệnh gọi. Tài liệu này
-tập trung chủ yếu vào việc sử dụng API Trình cung cấp Lịch như một ứng dụng. Để bàn
-về việc các trình điều hợp đồng bộ khác nhau như thế nào, hãy xem phần
+tập trung chủ yếu vào việc sử dụng API Trình cung cấp Lịch như một ứng dụng. Để bàn
+về việc các trình điều hợp đồng bộ khác nhau như thế nào, hãy xem phần
<a href="#sync-adapter">Trình điều hợp Đồng bộ</a>.</p>
@@ -79,17 +79,17 @@
<h2 id="overview">Nội dung Cơ bản</h2>
-<p><a href="{@docRoot}guide/topics/providers/content-providers.html">Các trình cung cấp nội dung</a> sẽ lưu trữ dữ liệu và cho phép truy cập
+<p><a href="{@docRoot}guide/topics/providers/content-providers.html">Các trình cung cấp nội dung</a> sẽ lưu trữ dữ liệu và cho phép truy cập
ứng dụng. Trình cung cấp nội dung được nền tảng Android giới thiệu (bao gồm Trình cung cấp Lịch) thường trình bày dữ liệu như một tập hợp gồm nhiều bảng dựa trên một
mô hình cơ sở dữ liệu quan hệ, trong đó mỗi hàng là một bản ghi và mỗi cột là dữ liệu thuộc
một loại và có ý nghĩa cụ thể. Thông qua API Trình cung cấp Lịch, các ứng dụng
và trình điều hợp đồng bộ có thể nhận được quyền truy cập đọc/ghi vào các bảng trong cơ sở dữ liệu là nơi chứa
dữ liệu lịch của người dùng.</p>
-<p>Mọi trình cung cấp nội dung đều đưa ra một URI công khai (được bẻ dòng như một đối tượng
+<p>Mọi trình cung cấp nội dung đều đưa ra một URI công khai (được bẻ dòng như một đối tượng
{@link android.net.Uri}
) để xác định tập dữ liệu của nó một cách duy nhất. Trình cung cấp nội dung mà kiểm soát nhiều
- tập dữ liệu (nhiều bảng) sẽ đưa ra một URI riêng cho từng bảng. Tất cả
+ tập dữ liệu (nhiều bảng) sẽ đưa ra một URI riêng cho từng bảng. Tất cả
URI cho trình cung cấp đều bắt đầu bằng xâu "content://". Điều này
sẽ xác định dữ liệu là đang được kiểm soát bởi một trình cung cấp nội dung. Trình cung cấp
Lịch định nghĩa các hằng số cho URI đối với từng lớp (bảng) của nó. Những URI
@@ -113,26 +113,26 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
- <td>Bảng này chứa
+
+ <td>Bảng này chứa
thông tin riêng của lịch. Mỗi hàng trong bảng này chứa chi tiết của
một lịch duy nhất, chẳng hạn như tên, màu, thông tin đồng bộ, v.v.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>Bảng này chứa
thông tin riêng theo sự kiện. Mỗi hàng trong bảng có thông tin cho một
sự kiện duy nhất—ví dụ: tiêu đề sự kiện, địa điểm, thời gian bắt đầu
, thời gian kết thúc, v.v. Sự kiện có thể xảy ra một lần hoặc lặp lại nhiều lần. Người dự,
-nhắc nhở, và các tính chất mở rộng được lưu trữ trong các bảng riêng.
-Mỗi mục đều có một {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+nhắc nhở, và các tính chất mở rộng được lưu trữ trong các bảng riêng.
+Mỗi mục đều có một {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
tham chiếu tới {@link android.provider.BaseColumns#_ID} trong bảng Sự kiện.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>Bảng này chứa
thời gian bắt đầu và thời gian kết thúc của mỗi lần xảy ra một sự kiện. Mỗi hàng trong bảng này
đại diện cho một lần xảy ra sự kiện. Với các sự kiện xảy ra một lần thì có một ánh xạ 1:1
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>Bảng này chứa
thông tin về người dự (khách) của sự kiện. Mỗi hàng đại diện một khách duy nhất của
một sự kiện. Nó quy định loại khách và phản hồi tham dự của khách
@@ -149,17 +149,17 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>Bảng này chứa
dữ liệu về cảnh báo/thông báo. Mỗi hàng đại diện một cảnh báo duy nhất cho một sự kiện. Một
sự kiện có thể có nhiều nhắc nhở. Số nhắc nhở tối đa của một sự kiện
-được quy định trong
-{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS},
+được quy định trong
+{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS},
được đặt bởi trình điều hợp đồng bộ đang
sở hữu lịch đã cho. Nhắc nhở được quy định bằng số phút trước khi diễn ra sự kiện
và có một phương pháp để xác định cách người dùng sẽ được cảnh báo.</td>
</tr>
-
+
</table>
<p>API Trình cung cấp Lịch được thiết kế để linh hoạt và mạnh mẽ. Đồng
@@ -178,9 +178,9 @@
<li><strong>Trình điều hợp đồng bộ.</strong> Trình điều hợp đồng bộ có chức năng đồng bộ dữ liệu lịch
-lên thiết bị của một người dùng bằng một máy chủ hoặc nguồn dữ liệu khác. Trong bảng
+lên thiết bị của một người dùng bằng một máy chủ hoặc nguồn dữ liệu khác. Trong bảng
{@link android.provider.CalendarContract.Calendars} và
-{@link android.provider.CalendarContract.Events},
+{@link android.provider.CalendarContract.Events},
có các cột để cho trình điều hợp đồng bộ sử dụng.
Trình cung cấp và ứng dụng không nên sửa đổi chúng. Trên thực tế, chúng không
hiển thị trừ khi được truy cập như một trình điều hợp đồng bộ. Để biết thêm thông tin về
@@ -209,9 +209,9 @@
<h2 id="calendar">Bảng Lịch</h2>
-<p>Bảng {@link android.provider.CalendarContract.Calendars} chứa thông tin chi tiết
+<p>Bảng {@link android.provider.CalendarContract.Calendars} chứa thông tin chi tiết
cho từng lịch. Các cột
-Lịch sau có thể ghi được bởi cả ứng dụng và <a href="#sync-adapter">trình điều hợp đồng bộ</a>.
+Lịch sau có thể ghi được bởi cả ứng dụng và <a href="#sync-adapter">trình điều hợp đồng bộ</a>.
Để xem danh sách đầy đủ về các trường được hỗ trợ, hãy xem tài liệu tham khảo
{@link android.provider.CalendarContract.Calendars}.</p>
<table>
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>Một boolean cho biết lịch có được chọn để hiển thị hay không. Giá trị
bằng 0 cho biết các sự kiện liên kết với lịch này sẽ không được
hiển thị. Giá trị bằng 1 cho biết các sự kiện liên kết với lịch này sẽ được
@@ -240,10 +240,10 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>Một boolean cho biết lịch sẽ được đồng bộ và có các sự kiện
của mình được lưu trữ trên thiết bị hay không. Giá trị bằng 0 tức là không đồng bộ lịch này hay
-lưu giữ các sự kiện của nó lên thiết bị. Giá trị bằng 1 tức là đồng bộ các sự kiện cho lịch này
+lưu giữ các sự kiện của nó lên thiết bị. Giá trị bằng 1 tức là đồng bộ các sự kiện cho lịch này
và lưu trữ các sự kiện của nó lên thiết bị.</td>
</tr>
</table>
@@ -253,8 +253,8 @@
<p>Sau đây là một ví dụ về cách nhận được lịch do một người dùng
cụ thể sở hữu. Để đơn giản, trong ví dụ này, thao tác truy vấn được thể hiện trong
luồng giao diện người dùng ("luồng chính"). Trong thực hành, nên làm điều này trong một luồng
-không đồng bộ thay vì trên luồng chính. Để bàn thêm, hãy xem phần
-<a href="{@docRoot}guide/components/loaders.html">Trình tải</a>. Nếu bạn đang không chỉ
+không đồng bộ thay vì trên luồng chính. Để bàn thêm, hãy xem phần
+<a href="{@docRoot}guide/components/loaders.html">Trình tải</a>. Nếu bạn đang không chỉ
đọc dữ liệu mà còn sửa đổi nó, hãy xem {@link android.content.AsyncQueryHandler}.
</p>
@@ -268,18 +268,18 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>Tại sao bạn phải nêu
ACCOUNT_TYPE?</h3> <p>Nếu bạn truy vấn trên một {@link
android.provider.CalendarContract.Calendars#ACCOUNT_NAME
-Calendars.ACCOUNT_NAME}, bạn cũng phải nêu
+Calendars.ACCOUNT_NAME}, bạn cũng phải nêu
{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
trong lựa chọn. Đó là vì một tài khoản đã cho chỉ
được coi là duy nhất nếu có cả <code>ACCOUNT_NAME</code> và
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} dành cho các lịch
không liên kết với một tài khoản thiết bị. Tài khoản {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} không được
-đồng bộ.</p> </div> </div>
+đồng bộ.</p> </div> </div>
<p> Trong phần tiếp theo của ví dụ, bạn sẽ xây dựng truy vấn của mình. Lựa chọn
@@ -301,58 +301,58 @@
đã xem, không chỉ các lịch mà người dùng sở hữu, hãy bỏ qua <code>OWNER_ACCOUNT</code>.
Truy vấn sẽ trả về đối tượng {@link android.database.Cursor}
mà bạn có thể sử dụng để xem xét tập kết quả được trả về bởi truy vấn
-cơ sở dữ liệu. Để bàn thêm về việc sử dụng các truy vấn trong trình cung cấp nội dung,
+cơ sở dữ liệu. Để bàn thêm về việc sử dụng các truy vấn trong trình cung cấp nội dung,
hãy xem phần <a href="{@docRoot}guide/topics/providers/content-providers.html">Trình cung cấp Nội dung</a>.</p>
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>Phần tiếp theo sử dụng con chạy để duyệt qua tập kết quả. Nó sử dụng
các hằng số được thiết lập ngay từ đầu ví dụ để trả về các giá trị
cho mỗi trường.</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">Sửa đổi một lịch</h3>
<p>Để thực hiện cập nhật một lịch, bạn có thể cung cấp {@link
android.provider.BaseColumns#_ID} của lịch hoặc dưới dạng ID được nối vào cho
-Uri
+Uri
-({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
hoặc dưới dạng mục chọn đầu tiên. Lựa chọn
nên bắt đầu bằng <code>"_id=?"</code>, và
<code>selectionArg</code> đầu tiên sẽ là {@link
-android.provider.BaseColumns#_ID} của lịch.
+android.provider.BaseColumns#_ID} của lịch.
Bạn cũng có thể thực hiện cập nhật bằng cách mã hóa ID trong URI. Ví dụ này thay đổi tên hiển thị
-của một lịch bằng cách sử dụng phương pháp
+của một lịch bằng cách sử dụng phương pháp
({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
:</p>
@@ -375,7 +375,7 @@
chèn lịch dưới dạng một trình điều hợp đồng bộ, sử dụng {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} của {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}.
-{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
+{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
là một loại tài khoản đặc biệt dành cho các lịch không
liên kết với một tài khoản thiết bị. Các lịch loại này không được đồng bộ với một máy chủ. Để
bàn về trình điều hợp đồng bộ, hãy xem phần <a href="#sync-adapter">Trình điều hợp Đồng bộ</a>.</p>
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>Thời lượng của sự kiện theo định dạng <a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a>.
Ví dụ, giá trị bằng <code>"PT1H"</code> cho biết sự kiện sẽ kéo dài
một giờ và giá trị bằng <code>"P2W"</code> cho biết
@@ -444,39 +444,39 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>Giá trị bằng 1 cho biết sự kiện này chiếm cả ngày, được xác định bởi
múi giờ tại địa phương. Giá trị bằng 0 cho biết đó là một sự kiện thường xuyên mà có thể bắt đầu
và kết thúc vào bất cứ lúc nào trong một ngày.</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>Quy tắc lặp lại đối với định dạng sự kiện. Ví
dụ, <code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>. Bạn có thể tìm thêm
nhiều ví dụ hơn <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">ở đây</a>.</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
- <td>Ngày lặp lại đối với sự kiện.
- Bạn thường sử dụng {@link android.provider.CalendarContract.EventsColumns#RDATE}
- cùng với {@link android.provider.CalendarContract.EventsColumns#RRULE}
+ <td>Ngày lặp lại đối với sự kiện.
+ Bạn thường sử dụng {@link android.provider.CalendarContract.EventsColumns#RDATE}
+ cùng với {@link android.provider.CalendarContract.EventsColumns#RRULE}
để định nghĩa một tập tổng hợp
các trường hợp xảy ra lặp lại. Để bàn thêm, hãy xem phần <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">RFC5545 spec</a>.</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
- <td>Xem sự kiện này được tính là thời gian bận hay là thời gian rảnh có thể được
+
+ <td>Xem sự kiện này được tính là thời gian bận hay là thời gian rảnh có thể được
xếp lại lịch. </td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -514,11 +514,11 @@
bạn đang chèn một sự kiện thông qua Ý định {@link
android.content.Intent#ACTION_INSERT INSERT} như được mô tả trong <a href="#intent-insert">Sử dụng ý định để chèn một sự kiện</a>—trong kịch bản
đó, một múi giờ mặc định sẽ được cung cấp.</li>
-
+
<li>Đối với các sự kiện không định kỳ, bạn phải đưa vào {@link
android.provider.CalendarContract.EventsColumns#DTEND}. </li>
-
-
+
+
<li>Đối với các sự kiện định kỳ, bạn phải đưa vào một {@link
android.provider.CalendarContract.EventsColumns#DURATION} bên cạnh {@link
android.provider.CalendarContract.EventsColumns#RRULE} hay {@link
@@ -526,9 +526,9 @@
bạn đang chèn một sự kiện thông qua Ý định {@link
android.content.Intent#ACTION_INSERT INSERT} như được mô tả trong <a href="#intent-insert">Sử dụng ý định để chèn một sự kiện</a>—trong kịch bản
đó, bạn có thể sử dụng một {@link
-android.provider.CalendarContract.EventsColumns#RRULE} cùng với {@link android.provider.CalendarContract.EventsColumns#DTSTART} và {@link android.provider.CalendarContract.EventsColumns#DTEND}, và ứng dụng Lịch
+android.provider.CalendarContract.EventsColumns#RRULE} cùng với {@link android.provider.CalendarContract.EventsColumns#DTSTART} và {@link android.provider.CalendarContract.EventsColumns#DTEND}, và ứng dụng Lịch
sẽ tự động chuyển nó thành một thời lượng.</li>
-
+
</ul>
<p>Sau đây là một ví dụ về cách chèn một sự kiện. Ví dụ này đang được thực hiện trong luồng
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -578,14 +578,14 @@
bạn nên sử dụng một Ý định {@link android.content.Intent#ACTION_EDIT EDIT} như được mô tả
trong <a href="#intent-edit">Sử dụng ý định để chỉnh sửa một sự kiện</a>.
Tuy nhiên, nếu cần, bạn có thể chỉnh sửa sự kiện trực tiếp. Để thực hiện cập nhật
-một Sự kiện, bạn có thể cung cấp <code>_ID</code> của sự kiện
+một Sự kiện, bạn có thể cung cấp <code>_ID</code> của sự kiện
hoặc dưới dạng ID được nối vào cho Uri ({@link
-android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
-hoặc dưới dạng mục chọn đầu tiên.
+android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+hoặc dưới dạng mục chọn đầu tiên.
Lựa chọn nên bắt đầu bằng <code>"_id=?"</code>, và
<code>selectionArg</code> đầu tiên nên là <code>_ID</code> của sự kiện. Bạn cũng có thể
thực hiện cập nhật bằng cách sử dụng một lựa chọn không có ID. Sau đây là một ví dụ về cách cập nhật một
-sự kiện. Nó thay đổi tiêu đề của sự kiện bằng cách sử dụng phương pháp
+sự kiện. Nó thay đổi tiêu đề của sự kiện bằng cách sử dụng phương pháp
{@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}
:</p>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -625,22 +625,22 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">Bảng Người dự</h2>
<p>Mỗi hàng của bảng {@link android.provider.CalendarContract.Attendees} đại diện
-cho một người dự hoặc khách duy nhất của một sự kiện. Gọi
-{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
+cho một người dự hoặc khách duy nhất của một sự kiện. Gọi
+{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
sẽ trả về một danh sách người dự cho sự kiện
-với {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} đã cho.
+với {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} đã cho.
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} này
phải khớp với {@link
-android.provider.BaseColumns#_ID} của một sự kiện cụ thể.</p>
+android.provider.BaseColumns#_ID} của một sự kiện cụ thể.</p>
<p>Bảng sau liệt kê các trường
-có thể ghi được. Khi chèn một người dự mới, bạn phải điền tất cả
+có thể ghi được. Khi chèn một người dự mới, bạn phải điền tất cả
ngoại trừ <code>ATTENDEE_NAME</code>.
</p>
@@ -698,7 +698,7 @@
<h3 id="add-attendees">Thêm Người dự</h3>
<p>Sau đây là một ví dụ về cách thêm một người dự vào một sự kiện. Lưu ý rằng
-{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
là bắt buộc:</p>
<pre>
@@ -718,17 +718,17 @@
<h2 id="reminders">Bảng Nhắc nhở</h2>
<p>Mỗi hàng của bảng {@link android.provider.CalendarContract.Reminders} đại diện
-cho một nhắc nhở của một sự kiện. Gọi
+cho một nhắc nhở của một sự kiện. Gọi
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} sẽ trả về một danh sách nhắc nhở cho
-sự kiện với
+sự kiện với
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} đã cho.</p>
<p>Bảng sau liệt kê các trường ghi được đối với nhắc nhở. Tất cả đều phải được
đưa vào khi chèn một nhắc nhở mới. Lưu ý rằng các trình điều hợp đồng bộ quy định
các loại nhắc nhở chúng hỗ trợ trong bảng {@link
-android.provider.CalendarContract.Calendars}. Xem
-{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
+android.provider.CalendarContract.Calendars}. Xem
+{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
để biết chi tiết.</p>
@@ -773,16 +773,16 @@
<h2 id="instances">Bảng Thực thể</h2>
-<p>Bảng
+<p>Bảng
{@link android.provider.CalendarContract.Instances} chứa
thời gian bắt đầu và thời gian kết thúc của các lần xảy ra một sự kiện. Mỗi hàng trong bảng này
đại diện cho một lần xảy ra sự kiện. Bảng thực thể không ghi được và chỉ
đưa ra một cách để truy vấn các lần xảy ra sự kiện. </p>
-<p>Bảng sau liệt kê một số trường mà bạn có thể truy vấn đối với một thực thể. Lưu ý
-rằng múi giờ được định nghĩa bởi
-{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
-và
+<p>Bảng sau liệt kê một số trường mà bạn có thể truy vấn đối với một thực thể. Lưu ý
+rằng múi giờ được định nghĩa bởi
+{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
+và
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES}.</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>Ngày kết thúc theo lịch Julian của thực thể theo múi giờ
-của Lịch.
-
+của Lịch.
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>Phút kết thúc của thực thể được xác định từ nửa đêm theo múi giờ
của Lịch.</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>Ngày bắt đầu theo lịch Julian của thực thể theo múi giờ của Lịch.
+ <td>Ngày bắt đầu theo lịch Julian của thực thể theo múi giờ của Lịch.
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>Phút bắt đầu của thực thể được xác định từ nửa đêm theo múi giờ
-của Lịch.
+của Lịch.
</td>
-
+
</tr>
</table>
@@ -840,7 +840,7 @@
trong URI. Trong ví dụ này, {@link android.provider.CalendarContract.Instances}
có quyền truy cập trường {@link
android.provider.CalendarContract.EventsColumns#TITLE} thông qua việc
-triển khai giao diện {@link android.provider.CalendarContract.EventsColumns} của nó.
+triển khai giao diện {@link android.provider.CalendarContract.EventsColumns} của nó.
Nói cách khác, {@link
android.provider.CalendarContract.EventsColumns#TITLE} được trả về qua một
chế độ xem cơ sở dữ liệu, chứ không qua việc truy vấn bảng {@link
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -922,9 +922,9 @@
<td><br>
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
- Bạn cũng có thể tham khảo tới URI bằng
-{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
-Để xem một ví dụ về cách sử dụng ý định này, hãy xem <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Sử dụng ý định để xem dữ liệu lịch</a>.
+ Bạn cũng có thể tham khảo tới URI bằng
+{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
+Để xem một ví dụ về cách sử dụng ý định này, hãy xem <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Sử dụng ý định để xem dữ liệu lịch</a>.
</td>
<td>Mở lịch đến thời gian được chỉ định bởi <code><ms_since_epoch></code>.</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- Bạn cũng có thể tham khảo tới URI bằng
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ Bạn cũng có thể tham khảo tới URI bằng
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Để xem một ví dụ về cách sử dụng ý định này, hãy xem <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Sử dụng ý định để xem dữ liệu lịch</a>.
-
+
</td>
<td>Xem sự kiện được chỉ định bởi <code><event_id></code>.</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- Bạn cũng có thể tham khảo tới URI bằng
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ Bạn cũng có thể tham khảo tới URI bằng
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Để xem một ví dụ về cách sử dụng ý định này, hãy xem <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">Sử dụng ý định để chỉnh sửa một sự kiện</a>.
-
-
+
+
</td>
<td>Chỉnh sửa sự kiện được chỉ định bởi <code><event_id></code>.</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
- Bạn cũng có thể tham khảo tới URI bằng
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ Bạn cũng có thể tham khảo tới URI bằng
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
Để xem một ví dụ về cách sử dụng ý định này, hãy xem <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">Sử dụng ý định để chèn một sự kiện</a>.
-
+
</td>
<td>Tạo một sự kiện.</td>
@@ -996,7 +996,7 @@
<td>Tên cho sự kiện.</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>Thời gian bắt đầu sự kiện tính bằng mili giây trôi qua kể từ giờ epoch.</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>Thời gian kết thúc sự kiện tính bằng mili giây trôi qua kể từ giờ epoch.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
+
<td>Một boolean cho biết đó là một sự kiện cả ngày. Giá trị có thể bằng
<code>true</code> hoặc <code>false</code>.</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>Địa điểm của sự kiện.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>Mô tả sự kiện.</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>Sự kiện là riêng tư hay công khai.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>Xem sự kiện này tính là thời gian bận hay là thời gian rảnh có thể được xếp lại lịch.</td>
-
-</table>
+
+</table>
<p>Các phần sau mô tả cách sử dụng những ý định này.</p>
@@ -1059,23 +1059,23 @@
Bằng cách này, ứng dụng của bạn thậm chí không cần phải có quyền {@link
android.Manifest.permission#WRITE_CALENDAR} được bao gồm trong <a href="#manifest">tệp bản kê khai</a> của mình.</p>
-
+
<p>Khi người dùng chạy một ứng dụng mà sử dụng cách này, ứng dụng sẽ gửi
chúng tới Lịch để hoàn thành việc thêm một sự kiện. Ý định {@link
android.content.Intent#ACTION_INSERT INSERT} sử dụng các trường phụ thêm để
điền trước vào một mẫu bằng các chi tiết của sự kiện trong Lịch. Khi đó, người dùng có thể
hủy bỏ sự kiện, chỉnh sửa mẫu nếu cần, hoặc lưu sự kiện vào lịch
của mình.</p>
-
+
<p>Sau đây là một đoạn mã HTML lập biểu một sự kiện vào ngày 19/1/2012, diễn ra
từ 7:30 sáng đến 8:30 sáng. Lưu ý điều sau đây về đoạn mã HTML này:</p>
<ul>
- <li>Nó quy định {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
+ <li>Nó quy định {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
là Uri.</li>
-
+
<li>Nó sử dụng các trường phụ {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} và {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} để điền trước thời gian của sự kiện
vào mẫu. Các giá trị đối với những thời gian này phải tính bằng mili giây UTC
trôi qua kể từ giờ epoch.</li>
-
+
<li>Nó sử dụng trường phụ {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
để cung cấp một danh sách người được mời phân cách bằng dấu phẩy, được chỉ định theo địa chỉ e-mail.</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,18 +1158,18 @@
<ul>
<li>Trình điều hợp đồng bộ cần chỉ định rằng nó là một trình điều hợp đồng bộ bằng cách đặt {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} thành <code>true</code>.</li>
-
-
+
+
<li>Trình điều hợp đồng bộ cần cung cấp một {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} và một {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} làm tham số truy vấn trong URI. </li>
-
+
<li>Trình điều hợp đồng bộ có quyền truy nhập ghi vào nhiều cột hơn ứng dụng hay widget.
- Ví dụ, một ứng dụng chỉ có thể sửa đổi một vài đặc điểm của một lịch,
+ Ví dụ, một ứng dụng chỉ có thể sửa đổi một vài đặc điểm của một lịch,
chẳng hạn như tên lịch, tên hiển thị, thiết đặt hiển thị, và lịch có được
đồng bộ hay không. Nếu so sánh, một trình điều hợp đồng bộ có thể truy cập không chỉ những cột đó, mà còn nhiều cột khác,
chẳng hạn như màu lịch, múi giờ, mức truy nhập, địa điểm, v.v.
-Tuy nhiên, trình điều hợp đồng bộ bị hạn chế đối với <code>ACCOUNT_NAME</code> và
+Tuy nhiên, trình điều hợp đồng bộ bị hạn chế đối với <code>ACCOUNT_NAME</code> và
<code>ACCOUNT_TYPE</code> mà nó quy định.</li> </ul>
<p>Sau đây là một phương pháp hữu ích hơn mà bạn có thể sử dụng để trả về một URI để dùng với một trình điều hợp đồng bộ:</p>
@@ -1180,5 +1180,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>Để biết việc triển khai mẫu trình điều hợp đồng bộ (không liên quan cụ thể tới Lịch), hãy xem phần
+<p>Để biết việc triển khai mẫu trình điều hợp đồng bộ (không liên quan cụ thể tới Lịch), hãy xem phần
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>.
diff --git a/docs/html-intl/intl/vi/guide/topics/providers/contacts-provider.jd b/docs/html-intl/intl/vi/guide/topics/providers/contacts-provider.jd
index 2fa2ed3..2d94e10 100644
--- a/docs/html-intl/intl/vi/guide/topics/providers/contacts-provider.jd
+++ b/docs/html-intl/intl/vi/guide/topics/providers/contacts-provider.jd
@@ -253,7 +253,7 @@
Ví dụ, nếu bạn muốn ứng dụng của mình duy trì dữ liệu danh bạ cho dịch vụ dựa trên nền web của mình
với miền {@code com.example.dataservice}, và tài khoản của người dùng cho dịch vụ của bạn
là {@code becky.sharp@dataservice.example.com}, trước tiên, người dùng phải thêm
- "loại" tài khoản ({@code com.example.dataservice}) và "tên" tài khoản
+ "loại" tài khoản ({@code com.example.dataservice}) và "tên" tài khoản
({@code becky.smart@dataservice.example.com}) trước khi ứng dụng của bạn có thể thêm hàng liên lạc thô.
Bạn có thể giải thích yêu cầu này với người dùng bằng tài liệu, hoặc bạn có thể nhắc
người dùng thêm loại và tên này, hoặc cả hai. Loại tài khoản và tên tài khoản
@@ -1697,7 +1697,7 @@
<p>
Nếu dịch vụ chấp nhận thông tin xác thực, trình xác thực có thể
lưu giữ thông tin xác thực đó để sử dụng sau. Vì khuôn khổ trình xác thực bổ trợ,
- {@link android.accounts.AccountManager} có thể cung cấp quyền truy cập bất kỳ token xác thực nào mà một trình xác thực
+ {@link android.accounts.AccountManager} có thể cung cấp quyền truy cập bất kỳ token xác thực nào mà một trình xác thực
hỗ trợ và chọn hiện ra, chẳng hạn như token xác thực OAuth2.
</p>
<p>
@@ -1821,7 +1821,7 @@
</dl>
<h2 id="SocialStream">Dữ liệu từ Luồng Xã hội</h2>
<p>
- Các bảng {@code android.provider.ContactsContract.StreamItems} và
+ Các bảng {@code android.provider.ContactsContract.StreamItems} và
{@code android.provider.ContactsContract.StreamItemPhotos} quản lý
dữ liệu đến từ các mạng xã hội. Bạn có thể ghi một trình điều hợp đồng bộ mà thêm dữ liệu luồng từ
mạng của chính mình vào những bảng này, hoặc bạn có thể đọc dữ liệu luồng từ những bảng này và
@@ -1830,7 +1830,7 @@
</p>
<h3 id="StreamText">Văn bản từ luồng xã hội</h3>
<p>
- Các mục dòng dữ liệu luôn được liên kết với một liên lạc thô.
+ Các mục dòng dữ liệu luôn được liên kết với một liên lạc thô.
{@code android.provider.ContactsContract.StreamItemsColumns#RAW_CONTACT_ID} liên kết với giá trị
<code>_ID</code> của liên lạc thô mới. Loại tài khoản và tên tài khoản của liên lạc thô
cũng được lưu giữ trong hàng mục dòng.
@@ -1934,7 +1934,7 @@
Cột này có sẵn để tương thích ngược với các phiên bản trước của Trình cung cấp
Danh bạ mà đã sử dụng nó để lưu giữ ảnh. Tuy nhiên, trong phiên bản hiện tại
bạn không nên sử dụng cột này để lưu giữ ảnh. Thay vào đó, hãy sử dụng
- hoặc {@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID} hoặc
+ hoặc {@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_FILE_ID} hoặc
{@code android.provider.ContactsContract.StreamItemPhotosColumns#PHOTO_URI} (cả hai
đều được mô tả trong các điểm sau) để lưu giữ ảnh trong một tệp. Lúc này, cột này
chứa một hình thu nhỏ của ảnh sẵn sàng để đọc.
@@ -2344,7 +2344,7 @@
việc truy xuất thông tin ảnh. Không có lớp thuận tiện cho việc truy xuất hình thu nhỏ
chính đối với một liên lạc thô, nhưng bạn có thể gửi một truy vấn tới bảng
{@link android.provider.ContactsContract.Data}, chọn
- {@code android.provider.BaseColumns#_ID} của liên lạc thô,
+ {@code android.provider.BaseColumns#_ID} của liên lạc thô,
{@link android.provider.ContactsContract.CommonDataKinds.Photo#CONTENT_ITEM_TYPE
Photo.CONTENT_ITEM_TYPE}, và cột {@link android.provider.ContactsContract.Data#IS_PRIMARY}
để tìm hàng ảnh chính của liên lạc thô.
diff --git a/docs/html-intl/intl/vi/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/vi/guide/topics/providers/content-provider-basics.jd
index 5f868ca..808c0f7 100644
--- a/docs/html-intl/intl/vi/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/vi/guide/topics/providers/content-provider-basics.jd
@@ -236,7 +236,7 @@
Ví dụ, để có một danh sách các từ và nội dung bản địa của chúng từ Trình cung cấp Từ điển Người dùng,
bạn hãy gọi {@link android.content.ContentResolver#query ContentResolver.query()}.
Phương pháp {@link android.content.ContentResolver#query query()} sẽ gọi phương pháp
- {@link android.content.ContentProvider#query ContentProvider.query()} được định nghĩa bởi
+ {@link android.content.ContentProvider#query ContentProvider.query()} được định nghĩa bởi
Trình cung cấp Từ điển Người dùng. Các dòng mã sau thể hiện một lệnh gọi
{@link android.content.ContentResolver#query ContentResolver.query()}:
<p>
@@ -251,7 +251,7 @@
</pre>
<p>
Bảng 2 cho biết các tham đối tới
- {@link android.content.ContentResolver#query
+ {@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} khớp với một câu lệnh SQL SELECT như thế nào:
</p>
<p class="table-caption">
@@ -292,7 +292,7 @@
<td align="center"><code>sortOrder</code></td>
<td align="center"><code>ORDER BY <em>col,col,...</em></code></td>
<td>
- <code>sortOrder</code> quy định thứ tự các hàng xuất hiện trong
+ <code>sortOrder</code> quy định thứ tự các hàng xuất hiện trong
{@link android.database.Cursor} được trả về.
</td>
</tr>
@@ -344,7 +344,7 @@
</p>
<p class="note">
<strong>Lưu ý:</strong> Các lớp {@link android.net.Uri} và {@link android.net.Uri.Builder}
- chứa các phương pháp thuận tiện để xây dựng đối tượng URI định dạng tốt từ các xâu.
+ chứa các phương pháp thuận tiện để xây dựng đối tượng URI định dạng tốt từ các xâu.
{@link android.content.ContentUris} chứa các phương pháp thuận tiện để nối các giá trị id với
một URI. Đoạn mã HTML trước sử dụng {@link android.content.ContentUris#withAppendedId
withAppendedId()} để nối một id với URI nội dung Từ điển Người dùng.
@@ -359,8 +359,8 @@
</p>
<p class="note">
Để giải thích rõ, đoạn mã HTML trong phần này gọi
- {@link android.content.ContentResolver#query ContentResolver.query()} trên "luồng UI"". Tuy nhiên, trong
- mã thực sự, bạn nên thực hiện các truy vấn không đồng bộ trên một luồng riêng. Một cách để làm
+ {@link android.content.ContentResolver#query ContentResolver.query()} trên "luồng UI"". Tuy nhiên, trong
+ mã thực sự, bạn nên thực hiện các truy vấn không đồng bộ trên một luồng riêng. Một cách để làm
điều này đó là sử dụng lớp {@link android.content.CursorLoader}, nó được mô tả chi tiết hơn
trong hướng dẫn <a href="{@docRoot}guide/components/loaders.html">
Trình tải</a>. Bênh cạnh đó, các dòng mã chỉ là đoạn mã HTML; chúng không thể hiện một ứng dụng
@@ -428,7 +428,7 @@
<p>
Đoạn mã HTML tiếp theo cho biết cách sử dụng
{@link android.content.ContentResolver#query ContentResolver.query()}, bằng cách sử dụng Trình cung cấp Từ điển
- Người dùng như một ví dụ. Truy vấn máy khách trình cung cấp tương tự như một truy vấn SQL, và nó chứa một
+ Người dùng như một ví dụ. Truy vấn máy khách trình cung cấp tương tự như một truy vấn SQL, và nó chứa một
tập hợp các cột để trả về, một tập hợp các tiêu chí lựa chọn, và một thứ tự sắp xếp.
</p>
<p>
@@ -438,8 +438,8 @@
<p>
Biểu thức để chỉ định các hàng cần truy xuất sẽ được chia thành một mệnh đề lựa chọn và
tham đối lựa chọn. Mệnh đề lựa chọn là sự kết hợp giữa các biểu thức lô-gic và biểu thức Boolean,
- tên cột, và giá trị (biến <code>mSelectionClause</code>). Nếu bạn chỉ định
- tham số thay thế được <code>?</code> thay vì một giá trị, phương pháp truy vấn sẽ truy xuất giá trị
+ tên cột, và giá trị (biến <code>mSelectionClause</code>). Nếu bạn chỉ định
+ tham số thay thế được <code>?</code> thay vì một giá trị, phương pháp truy vấn sẽ truy xuất giá trị
từ mảng tham đối lựa chọn (biến <code>mSelectionArgs</code>).
</p>
<p>
@@ -565,14 +565,14 @@
<!-- Displaying the results -->
<h3 id="DisplayResults">Hiển thị các kết quả truy vấn</h3>
<p>
- Phương pháp máy khách {@link android.content.ContentResolver#query ContentResolver.query()} luôn trả về
- một {@link android.database.Cursor} chứa các cột được chỉ định bởi dự thảo của
- truy vấn cho các hàng khớp với các tiêu chí lựa chọn của truy vấn. Một đối tượng
- {@link android.database.Cursor} cung cấp truy cập đọc ngẫu nhiên vào các hàng và cột mà nó
- chứa. Bằng cách sử dụng phương pháp {@link android.database.Cursor}, bạn có thể lặp lại các hàng trong
+ Phương pháp máy khách {@link android.content.ContentResolver#query ContentResolver.query()} luôn trả về
+ một {@link android.database.Cursor} chứa các cột được chỉ định bởi dự thảo của
+ truy vấn cho các hàng khớp với các tiêu chí lựa chọn của truy vấn. Một đối tượng
+ {@link android.database.Cursor} cung cấp truy cập đọc ngẫu nhiên vào các hàng và cột mà nó
+ chứa. Bằng cách sử dụng phương pháp {@link android.database.Cursor}, bạn có thể lặp lại các hàng trong
kết quả, xác định kiểu dữ liệu của từng cột, lấy dữ liệu ra khỏi cột, và kiểm tra các tính chất khác
- của kết quả. Một số triển khai {@link android.database.Cursor} sẽ tự động
- cập nhật đối tượng khi dữ liệu của trình cung cấp thay đổi, hoặc kích khởi các phương pháp trong một đối tượng quan sát
+ của kết quả. Một số triển khai {@link android.database.Cursor} sẽ tự động
+ cập nhật đối tượng khi dữ liệu của trình cung cấp thay đổi, hoặc kích khởi các phương pháp trong một đối tượng quan sát
khi {@link android.database.Cursor} thay đổi, hoặc cả hai.
</p>
<p class="note">
@@ -703,14 +703,14 @@
<p>
Để nhận các quyền cần để truy cập một trình cung cấp, ứng dụng yêu cầu chúng bằng một phần tử
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
- trong tệp bản kê khai của nó. Khi Trình quản lý Gói Android cài đặt các ứng dụng, người dùng
+ trong tệp bản kê khai của nó. Khi Trình quản lý Gói Android cài đặt các ứng dụng, người dùng
phải phê chuẩn tất cả quyền mà ứng dụng yêu cầu. Nếu người dùng phê chuẩn tất cả quyền, khi đó
Trình quản lý Gói sẽ tiếp tục cài đặt; nếu người dùng không phê chuẩn chúng, Trình quản lý Gói sẽ
hủy bỏ việc cài đặt.
</p>
<p>
Phần tử
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
sau yêu cầu quyền truy cập đọc vào Trình cung cấp Từ điển Người dùng:
</p>
<pre>
@@ -793,8 +793,8 @@
Để cập nhật một hàng, bạn sử dụng một đối tượng {@link android.content.ContentValues} với các giá trị
được cập nhật giống như cách bạn làm với việc chèn, và các tiêu chí lựa chọn giống như cách bạn làm với truy vấn.
Phương pháp máy khách mà bạn sử dụng là
- {@link android.content.ContentResolver#update ContentResolver.update()}. Bạn chỉ cần thêm
- các giá trị vào đối tượng {@link android.content.ContentValues} cho các cột mà bạn đang cập nhật. Nếu bạn
+ {@link android.content.ContentResolver#update ContentResolver.update()}. Bạn chỉ cần thêm
+ các giá trị vào đối tượng {@link android.content.ContentValues} cho các cột mà bạn đang cập nhật. Nếu bạn
muốn xóa các nội dung của một cột, hãy đặt giá trị thành <code>null</code>.
</p>
<p>
@@ -828,7 +828,7 @@
</pre>
<p>
Bạn cũng nên thanh lọc thông tin đầu vào của người dùng khi gọi
- {@link android.content.ContentResolver#update ContentResolver.update()}. Để tìm hiểu thêm về
+ {@link android.content.ContentResolver#update ContentResolver.update()}. Để tìm hiểu thêm về
điều này, hãy đọc phần <a href="#Injection">Bảo vệ trước mục nhập độc hại</a>.
</p>
<h3 id="Deleting">Xóa dữ liệu</h3>
@@ -858,7 +858,7 @@
</pre>
<p>
Bạn cũng nên thanh lọc thông tin đầu vào của người dùng khi gọi
- {@link android.content.ContentResolver#delete ContentResolver.delete()}. Để tìm hiểu thêm về
+ {@link android.content.ContentResolver#delete ContentResolver.delete()}. Để tìm hiểu thêm về
điều này, hãy đọc phần <a href="#Injection">Bảo vệ trước mục nhập độc hại</a>.
</p>
<!-- Provider Data Types -->
@@ -929,7 +929,7 @@
</li>
<li>
<a href="#Intents">Truy cập dữ liệu thông qua ý định</a>: Mặc dù không thể gửi một ý định
- trực tiếp tới một trình cung cấp, bạn có thể gửi một ý định tới ứng dụng của trình cung cấp đó,
+ trực tiếp tới một trình cung cấp, bạn có thể gửi một ý định tới ứng dụng của trình cung cấp đó,
đây thường là cách tốt nhất để sửa đổi dữ liệu của trình cung cấp.
</li>
</ul>
@@ -947,14 +947,14 @@
bạn tạo một mảng đối tượng {@link android.content.ContentProviderOperation} rồi
phân phối chúng tới một trình cung cấp nội dung bằng
{@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. Bạn chuyển
- <em>quyền</em> của trình cung cấp nội dung cho phương pháp này thay vì một URI nội dung cụ thể.
+ <em>quyền</em> của trình cung cấp nội dung cho phương pháp này thay vì một URI nội dung cụ thể.
Điều này cho phép đối tượng {@link android.content.ContentProviderOperation} trong mảng có tác dụng
đối với một bảng khác. Một lệnh gọi tới {@link android.content.ContentResolver#applyBatch
ContentResolver.applyBatch()} trả về một mảng kết quả.
</p>
<p>
Mô tả lớp hợp đồng {@link android.provider.ContactsContract.RawContacts}
- bao gồm một đoạn mã HTML thể hiện việc chèn hàng loạt. Ứng dụng mẫu
+ bao gồm một đoạn mã HTML thể hiện việc chèn hàng loạt. Ứng dụng mẫu
<a href="{@docRoot}resources/samples/ContactManager/index.html">Trình quản lý Danh bạ</a>
có một ví dụ về truy cập hàng loạt trong tệp nguồn <code>ContactAdder.java</code>
của nó.
@@ -1053,7 +1053,7 @@
trả kiểm soát về ứng dụng của bạn.
</li>
<li>
- Hoạt động của bạn trả về tiền cảnh, và hệ thống sẽ gọi phương pháp
+ Hoạt động của bạn trả về tiền cảnh, và hệ thống sẽ gọi phương pháp
{@link android.app.Activity#onActivityResult onActivityResult()}
của hoạt động của bạn. Phương pháp này nhận được ý định kết quả do hoạt động lựa chọn tạo trong
ứng dụng Danh bạ.
diff --git a/docs/html-intl/intl/vi/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/vi/guide/topics/providers/content-provider-creating.jd
index 2e8579a..fcc9b0e 100644
--- a/docs/html-intl/intl/vi/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/vi/guide/topics/providers/content-provider-creating.jd
@@ -221,7 +221,7 @@
có một trình cung cấp cho phép kết hợp dữ liệu bảng và các tệp.
</li>
<li>
- Để làm việc với dữ liệu trên nền mạng, hãy sử dụng các lớp trong {@link java.net} và
+ Để làm việc với dữ liệu trên nền mạng, hãy sử dụng các lớp trong {@link java.net} và
{@link android.net}. Bạn cũng có thể đồng bộ hoá dữ liệu trên nền mạng với một kho lưu trữ dữ liệu cục bộ
chẳng hạn như một cơ sở dữ liệu, rồi cung cấp dữ liệu dưới dạng bảng hoặc tệp.
Ứng dụng mẫu <a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">
@@ -381,7 +381,7 @@
</dt>
<dd>
Khớp với một URI nội dung cho các bảng <code>dataset1</code>
- và <code>dataset2</code>, nhưng không khớp với URI nội dung cho <code>table1</code> hoặc
+ và <code>dataset2</code>, nhưng không khớp với URI nội dung cho <code>table1</code> hoặc
<code>table3</code>.
</dd>
<dt>
@@ -614,7 +614,7 @@
</p>
<h3 id="Delete">Triển khai phương pháp delete()</h3>
<p>
- Phương pháp {@link android.content.ContentProvider#delete(Uri, String, String[]) delete()}
+ Phương pháp {@link android.content.ContentProvider#delete(Uri, String, String[]) delete()}
không cần phải xóa hàng thực chất khỏi kho lưu trữ dữ liệu của bạn. Nếu bạn đang sử dụng một trình điều hợp đồng bộ
với trình cung cấp của mình, bạn nên cân nhắc đánh dấu một hàng đã xóa
bằng cờ "xóa" thay vì gỡ bỏ hàng một cách hoàn toàn. Trình điều hợp đồng bộ có thể
@@ -626,7 +626,7 @@
update()} lấy cùng tham đối {@link android.content.ContentValues} được sử dụng bởi
{@link android.content.ContentProvider#insert(Uri, ContentValues) insert()}, và
cùng tham đối <code>selection</code> và <code>selectionArgs</code> được sử dụng bởi
- {@link android.content.ContentProvider#delete(Uri, String, String[]) delete()} và
+ {@link android.content.ContentProvider#delete(Uri, String, String[]) delete()} và
{@link android.content.ContentProvider#query(Uri, String[], String, String[], String)
ContentProvider.query()}. Điều này có thể cho phép bạn sử dụng lại mã giữa những phương pháp này.
</p>
diff --git a/docs/html-intl/intl/vi/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/vi/guide/topics/providers/document-provider.jd
index 30844d7..7948fc2 100644
--- a/docs/html-intl/intl/vi/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/vi/guide/topics/providers/document-provider.jd
@@ -146,7 +146,7 @@
<li>Tài liệu có thể là một tệp mở được (có một kiểu MIME cụ thể), hoặc một
-thư mục chứa các tài liệu bổ sung (có kiểu MIME
+thư mục chứa các tài liệu bổ sung (có kiểu MIME
{@link android.provider.DocumentsContract.Document#MIME_TYPE_DIR}).</li>
<li>Mỗi tài liệu có thể có các khả năng khác nhau như được mô tả bởi
@@ -177,7 +177,7 @@
trực tiếp với nhau. Một máy khách yêu cầu quyền để tương tác
với tệp (cụ thể là quyền đọc, chỉnh sửa, tạo hoặc xóa tệp).</li>
-<li>Tương tác bắt đầu khi một ứng dụng (trong ví dụ này này một ứng dụng ảnh) thể hiện ý định
+<li>Tương tác bắt đầu khi một ứng dụng (trong ví dụ này này một ứng dụng ảnh) thể hiện ý định
{@link android.content.Intent#ACTION_OPEN_DOCUMENT} hoặc {@link android.content.Intent#ACTION_CREATE_DOCUMENT}. Ý định có thể bao gồm các bộ lọc
để cụ thể hơn các tiêu chí—ví dụ, "cấp cho tôi tất cả tệp mở được
có kiểu MIME là 'image'."</li>
diff --git a/docs/html-intl/intl/vi/guide/topics/resources/accessing-resources.jd b/docs/html-intl/intl/vi/guide/topics/resources/accessing-resources.jd
index b5491dc..0054562 100644
--- a/docs/html-intl/intl/vi/guide/topics/resources/accessing-resources.jd
+++ b/docs/html-intl/intl/vi/guide/topics/resources/accessing-resources.jd
@@ -259,8 +259,8 @@
android:text="@string/hello" />
</pre>
-<p class="note"><strong>Lưu ý:</strong> Bạn nên sử dụng các tài nguyên xâu
-vào mọi lúc, để ứng dụng của bạn có thể được bản địa hóa cho các ngôn ngữ khác.
+<p class="note"><strong>Lưu ý:</strong> Bạn nên sử dụng các tài nguyên xâu
+vào mọi lúc, để ứng dụng của bạn có thể được bản địa hóa cho các ngôn ngữ khác.
Để biết thông tin về việc tạo các tài nguyên
thay thế (chẳng hạn như xâu được bản địa hóa), hãy xem phần <a href="providing-resources.html#AlternativeResources">Cung cấp Tài nguyên
Thay thế</a>. Để được hướng dẫn đầy đủ về việc bản địa hóa ứng dụng của bạn cho các ngôn ngữ khác,
diff --git a/docs/html-intl/intl/vi/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/vi/guide/topics/resources/providing-resources.jd
index b733643..ef1c6b6 100644
--- a/docs/html-intl/intl/vi/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/vi/guide/topics/resources/providing-resources.jd
@@ -190,7 +190,7 @@
</tr>
</table>
-<p class="caution"><strong>Chú ý:</strong> Không được lưu tệp tài nguyên trực tiếp vào trong thư mục
+<p class="caution"><strong>Chú ý:</strong> Không được lưu tệp tài nguyên trực tiếp vào trong thư mục
{@code res/}—nó sẽ gây ra lỗi với trình biên dịch.</p>
<p>Để biết thêm thông tin về các loại tài nguyên, hãy xem tài liệu <a href="available-resources.html">Các Loại Tài nguyên</a>.</p>
@@ -312,7 +312,7 @@
v.v.
</td>
<td><p>Ngôn ngữ được định nghĩa bằng một mã ngôn ngữ <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">ISO
- 639-1</a> gồm hai chữ cái, có thể theo sau là một mã khu vực
+ 639-1</a> gồm hai chữ cái, có thể theo sau là một mã khu vực
<a href="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO
3166-1-alpha-2</a> dài hai chữ cái (đằng trước là "{@code r}" chữ thường).
</p><p>
@@ -498,7 +498,7 @@
<li>{@code xlarge}: Các màn hình lớn hơn đáng kể so với màn hình
HVGA mật độ trung bình truyền thống. Kích cỡ bố trí tối thiểu đối với một màn hình siêu lớn
bằng xấp xỉ 720x960 đơn vị dp. Trong hầu hết trường hợp, những thiết bị có màn hình
- siêu lớn sẽ quá lớn để mang trong túi và gần như là
+ siêu lớn sẽ quá lớn để mang trong túi và gần như là
thiết bị kiểu máy tính bảng. <em>Được thêm trong API mức 9.</em></li>
</ul>
<p class="note"><strong>Lưu ý:</strong> Việc sử dụng một hạn định kích cỡ không hàm ý rằng các
@@ -510,7 +510,7 @@
ứng dụng của bạn sẽ bị lỗi vào thời gian chạy (ví dụ, nếu tất cả tài nguyên bố trí được gắn thẻ hạn định {@code
xlarge} nhưng thiết bị lại có màn hình kích cỡ bình thường).</p>
<p><em>Được thêm trong API mức 4.</em></p>
-
+
<p>Xem <a href="{@docRoot}guide/practices/screens_support.html">Hỗ trợ Nhiều
Màn hình</a> để biết thêm thông tin.</p>
<p>Xem thêm trường cấu hình {@link android.content.res.Configuration#screenLayout},
@@ -530,7 +530,7 @@
<li>{@code notlong}: Màn hình không dài, chẳng hạn như QVGA, HVGA và VGA</li>
</ul>
<p><em>Được thêm trong API mức 4.</em></p>
- <p>Giá trị này thuần túy được dựa trên tỷ lệ khung ảnh của màn hình (màn hình "dài" sẽ rộng hơn). Nó
+ <p>Giá trị này thuần túy được dựa trên tỷ lệ khung ảnh của màn hình (màn hình "dài" sẽ rộng hơn). Nó
không liên quan tới hướng của màn hình.</p>
<p>Xem thêm trường cấu hình {@link android.content.res.Configuration#screenLayout},
ở đó cho biết màn hình có dài không.</p>
@@ -628,7 +628,7 @@
<li>{@code xxhdpi}: Màn hình mật độ siêu siêu cao; xấp xỉ 480dpi. <em>Được thêm trong API
Mức 16</em></li>
<li>{@code xxxhdpi}: Mật độ siêu siêu siêu cao sử dụng (chỉ biểu tượng trình khởi chạy, xem
- <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">ghi chú</a>
+ <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">ghi chú</a>
trong <em>Hỗ trợ Nhiều Màn hình</em>); xấp xỉ 640dpi. <em>Được thêm trong API
Mức 18</em></li>
<li>{@code nodpi}: Loại này có thể được sử dụng cho tài nguyên bitmap mà bạn không muốn được định cỡ
@@ -950,7 +950,7 @@
cấu hình mà bạn chưa nghĩ đến, mà còn bởi các phiên bản Android mới đôi khi thêm
hạn định cấu hình mà những phiên bản cũ hơn không hỗ trợ. Nếu bạn sử dụng một hạn định tài nguyên mới,
nhưng vẫn duy trì tính tương thích về mã với các phiên bản cũ hơn của Android thì khi một phiên bản cũ hơn của
-Android chạy trên ứng dụng của bạn, nó sẽ bị lỗi nếu bạn không cung cấp tài nguyên mặc định, do nó
+Android chạy trên ứng dụng của bạn, nó sẽ bị lỗi nếu bạn không cung cấp tài nguyên mặc định, do nó
không thể sử dụng tài nguyên được đặt tên bằng hạn định mới. Ví dụ, nếu <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
minSdkVersion}</a> của bạn được đặt bằng 4, và bạn xác định tất cả tài nguyên vẽ được của mình bằng cách sử dụng <a href="#NightQualifier">chế độ ban đêm</a> ({@code night} hoặc {@code notnight}, đã được thêm trong API
Mức 8), khi đó một thiết bị API mức 4 sẽ không thể truy cập tài nguyên vẽ được của bạn và sẽ bị lỗi. Trong trường hợp
diff --git a/docs/html-intl/intl/vi/guide/topics/resources/runtime-changes.jd b/docs/html-intl/intl/vi/guide/topics/resources/runtime-changes.jd
index 4a9c38c..328b8ec 100644
--- a/docs/html-intl/intl/vi/guide/topics/resources/runtime-changes.jd
+++ b/docs/html-intl/intl/vi/guide/topics/resources/runtime-changes.jd
@@ -82,12 +82,12 @@
<p>Để giữ lại các đối tượng có trạng thái trong một phân đoạn trong khi thay đổi cấu hình thời gian chạy:</p>
<ol>
- <li>Mở rộng lớp {@link android.app.Fragment} và khai báo các tham chiếu tới đối tượng
+ <li>Mở rộng lớp {@link android.app.Fragment} và khai báo các tham chiếu tới đối tượng
có trạng thái của bạn.</li>
<li>Gọi {@link android.app.Fragment#setRetainInstance(boolean)} khi phân đoạn được tạo.
</li>
<li>Thêm phân đoạn vào hoạt động của bạn.</li>
- <li>Sử dụng {@link android.app.FragmentManager} để truy xuất phân đoạn khi hoạt động
+ <li>Sử dụng {@link android.app.FragmentManager} để truy xuất phân đoạn khi hoạt động
được khởi động lại.</li>
</ol>
@@ -125,8 +125,8 @@
có nghĩa là ứng dụng của bạn duy trì việc lưu giữ tài nguyên và chúng không thể được thu dọn bộ nhớ rác, vì thế
rất nhiều bộ nhớ có thể bị mất.)</p>
-<p>Khi đó, hãy sử dụng {@link android.app.FragmentManager} để thêm phân đoạn vào hoạt động.
-Bạn có thể thu được đối tượng dữ liệu từ phân đoạn khi hoạt động bắt đầu lại trong khi
+<p>Khi đó, hãy sử dụng {@link android.app.FragmentManager} để thêm phân đoạn vào hoạt động.
+Bạn có thể thu được đối tượng dữ liệu từ phân đoạn khi hoạt động bắt đầu lại trong khi
thay đổi cấu hình thời gian chạy. Ví dụ, định nghĩa hoạt động của bạn như sau:</p>
<pre>
@@ -168,7 +168,7 @@
<p>Trong ví dụ này, {@link android.app.Activity#onCreate(Bundle) onCreate()} thêm một phân đoạn
hoặc khôi phục một tham chiếu đến nó. {@link android.app.Activity#onCreate(Bundle) onCreate()} cũng
lưu trữ đối tượng có trạng thái bên trong thực thể phân đoạn đó.
-{@link android.app.Activity#onDestroy() onDestroy()} cập nhật đối tượng có trạng thái bên trong
+{@link android.app.Activity#onDestroy() onDestroy()} cập nhật đối tượng có trạng thái bên trong
thực thể phân đoạn được giữ lại.</p>
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/controls.jd b/docs/html-intl/intl/vi/guide/topics/ui/controls.jd
index 37fe81c..eda0050 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">Nút chọn một</a></td>
<td>Tương tự như hộp kiểm, chỉ khác ở chỗ chỉ có thể chọn một tùy chọn trong nhóm.</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/declaring-layout.jd b/docs/html-intl/intl/vi/guide/topics/ui/declaring-layout.jd
index 6add812..5485200 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/declaring-layout.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/declaring-layout.jd
@@ -107,7 +107,7 @@
<h2 id="load">Nạp Tài nguyên XML</h2>
-<p>Khi bạn biên dịch ứng dụng của mình, từng tệp bố trí XML được biên dịch thành một tài nguyên
+<p>Khi bạn biên dịch ứng dụng của mình, từng tệp bố trí XML được biên dịch thành một tài nguyên
{@link android.view.View}. Bạn nên nạp tài nguyên bố trí từ mã ứng dụng của mình, trong triển khai gọi lại
{@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()} của bạn.
Làm vậy bằng cách gọi <code>{@link android.app.Activity#setContentView(int) setContentView()}</code>,
@@ -260,7 +260,7 @@
</p>
<p>
- Cặp thứ nhất được gọi là <em>chiều rộng đo được</em> và
+ Cặp thứ nhất được gọi là <em>chiều rộng đo được</em> và
<em>chiều cao đo được</em>. Những kích thước này xác định một dạng xem muốn phóng lớn bao nhiêu
trong dạng xem mẹ của nó. Các
kích thước đo được có thể thu được bằng cách gọi {@link android.view.View#getMeasuredWidth()}
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/vi/guide/topics/ui/dialogs.jd
index 1fa4550..00d5230 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>Xem thêm</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">Hướng dẫn thiết kế hộp thoại</a></li>
@@ -235,8 +235,8 @@
</pre>
<p>Các phương pháp <code>set...Button()</code> yêu cầu một tiêu đề cho nút (được cung cấp
-bởi một <a href="{@docRoot}guide/topics/resources/string-resource.html">tài nguyên xâu</a>) và một
-{@link android.content.DialogInterface.OnClickListener} có chức năng định nghĩa hành động sẽ tiến hành
+bởi một <a href="{@docRoot}guide/topics/resources/string-resource.html">tài nguyên xâu</a>) và một
+{@link android.content.DialogInterface.OnClickListener} có chức năng định nghĩa hành động sẽ tiến hành
khi người dùng nhấn nút.</p>
<p>Có ba nút hành động khác nhau mà bạn có thể thêm:</p>
@@ -248,7 +248,7 @@
<dt>Trung lập</dt>
<dd>Bạn nên sử dụng nút này khi người dùng có thể không muốn tiếp tục với hành động,
nhưng không hẳn muốn hủy bỏ. Nó nằm ở giữa nút
- tích cực và tiêu cực. Ví dụ, hành động có thể là "Nhắc tôi sau."</dd>
+ tích cực và tiêu cực. Ví dụ, hành động có thể là "Nhắc tôi sau."</dd>
</dl>
<p>Bạn chỉ có thể thêm một nút mỗi loại vào một {@link
@@ -271,7 +271,7 @@
<li>Danh sách nhiều lựa chọn cố định (hộp kiểm)</li>
</ul>
-<p>Để tạo danh sách một lựa chọn như danh sách trong hình 3,
+<p>Để tạo danh sách một lựa chọn như danh sách trong hình 3,
hãy sử dụng phương pháp {@link android.app.AlertDialog.Builder#setItems setItems()}:</p>
<pre style="clear:right">
@@ -291,7 +291,7 @@
<p>Vì danh sách xuất hiện trong vùng nội dung của hộp thoại,
hộp thoại không thể hiển thị cả thông báo và danh sách và bạn nên đặt một tiêu đề cho hộp thoại
-bằng {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
+bằng {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
Để chỉ định các mục cho danh sách, hãy gọi {@link
android.app.AlertDialog.Builder#setItems setItems()}, chuyển một mảng.
Hoặc, bạn có thể chỉ định một danh sách bằng cách sử dụng {@link
@@ -317,11 +317,11 @@
<h4 id="Checkboxes">Thêm một danh sách nhiều lựa chọn hoặc một lựa chọn cố định</h4>
-<p>Để thêm một danh sách nhiều lựa chọn (hộp kiểm) hoặc
+<p>Để thêm một danh sách nhiều lựa chọn (hộp kiểm) hoặc
một lựa chọn (nút chọn một), hãy sử dụng các phương pháp
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} hoặc
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} hoặc
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} tương ứng.</p>
<p>Ví dụ, sau đây là cách bạn có thể tạo một danh sách nhiều lựa chọn như
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -373,7 +373,7 @@
<p>Mặc dù cả danh sách truyền thống và danh sách có nút chọn một
đều cung cấp hành động "một lựa chọn", bạn nên sử dụng {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} nếu bạn muốn cố định lựa chọn của người dùng.
Cụ thể, nếu việc mở hộp thoại lại sau này báo hiệu lựa chọn hiện tại của người dùng, khi đó
bạn hãy tạo một danh sách với các nút chọn một.</p>
@@ -442,7 +442,7 @@
một kiểu phông thống nhất.</p>
<p>Để bung bố trí ra trong {@link android.support.v4.app.DialogFragment} của bạn,
-hãy lấy một {@link android.view.LayoutInflater} với
+hãy lấy một {@link android.view.LayoutInflater} với
{@link android.app.Activity#getLayoutInflater()} và gọi
{@link android.view.LayoutInflater#inflate inflate()}, trong đó tham số đầu tiên
là ID tài nguyên bố trí và tham số thứ hai là một dạng xem mẹ cho bố trí.
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
@@ -776,7 +776,7 @@
android.support.v4.app.DialogFragment} của mình.</p>
<p>Bạn cũng có thể <em>hủy bỏ</em> một hộp thoại. Đây là một sự kiện đặc biệt chỉ báo người dùng
-chủ ý rời khỏi hộp thoại mà không hoàn thành tác vụ. Điều này xảy ra nếu người dùng nhấn nút
+chủ ý rời khỏi hộp thoại mà không hoàn thành tác vụ. Điều này xảy ra nếu người dùng nhấn nút
<em>Quay lại</em>, chạm vào màn hình ngoài vùng hộp thoại,
hoặc nếu bạn công khai gọi {@link android.app.Dialog#cancel()} trên {@link
android.app.Dialog} (chẳng hạn như khi hồi đáp lại một nút "Hủy bỏ" trong hộp thoại).</p>
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/menus.jd b/docs/html-intl/intl/vi/guide/topics/ui/menus.jd
index 8e9e1c4..7950907 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/menus.jd
@@ -83,9 +83,9 @@
các tùy chọn khác.</p>
<p>Xem phần về <a href="#options-menu">Tạo một Menu Tùy chọn</a>.</p>
</dd>
-
+
<dt><strong>Menu ngữ cảnh và chế độ hành động theo ngữ cảnh</strong></dt>
-
+
<dd>Menu ngữ cảnh là một <a href="#FloatingContextMenu">menu nổi</a> xuất hiện khi
người dùng thực hiện nhấp giữ trên một phần tử. Nó cung cấp các hành động ảnh hưởng tới nội dung hoặc
khung ngữ cảnh được chọn.
@@ -94,7 +94,7 @@
chọn nhiều mục.</p>
<p>Xem phần nói về <a href="#context-menu">Tạo Menu Ngữ cảnh</a>.</p>
</dd>
-
+
<dt><strong>Menu bật lên</strong></dt>
<dd>Menu bật lên sẽ hiển thị danh sách các mục trong một danh sách thẳng đứng được neo vào dạng xem
đã gọi ra menu. Nên cung cấp một phần tràn gồm các hành động liên quan tới nội dung cụ thể hoặc
@@ -128,14 +128,14 @@
dự án của bạn và xây dựng menu với các phần tử sau:</p>
<dl>
<dt><code><menu></code></dt>
- <dd>Định nghĩa một {@link android.view.Menu}, đó là một bộ chứa các mục menu. Phần tử
+ <dd>Định nghĩa một {@link android.view.Menu}, đó là một bộ chứa các mục menu. Phần tử
<code><menu></code> phải là một nút gốc cho tệp và có thể giữ một hoặc nhiều phần tử
<code><item></code> và <code><group></code>.</dd>
<dt><code><item></code></dt>
<dd>Tạo một {@link android.view.MenuItem}, nó biểu diễn một mục đơn trong một menu. Phần tử
này có thể chứa một phần tử <code><menu></code> được lồng nhau để tạo một menu con.</dd>
-
+
<dt><code><group></code></dt>
<dd>Một bộ chứa tùy chọn, vô hình cho các phần tử {@code <item>}. Nó cho phép bạn
phân loại các mục menu sao cho chúng chia sẻ các tính chất như trạng thái hiện hoạt và khả năng hiển thị. Để biết thêm
@@ -273,7 +273,7 @@
<p>Nếu bạn phát triển ứng dụng của mình cho phiên bản Android 2.3.x và thấp hơn, hệ thống gọi {@link
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} để tạo menu tùy chọn
-khi người dùng mở menu lần đầu tiên. Nếu bạn phát triển cho phiên bản Android 3.0 vào cao hơn,
+khi người dùng mở menu lần đầu tiên. Nếu bạn phát triển cho phiên bản Android 3.0 vào cao hơn,
hệ thống sẽ gọi {@link android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} khi
bắt đầu hoạt động để hiển thị các mục cho thanh hành động.</p>
@@ -346,7 +346,7 @@
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} để tạo trạng thái menu
ban đầu chứ không phải để thực hiện thay đổi trong vòng đời của hoạt động.</p>
-<p>Nếu bạn muốn sửa đổi menu tùy chọn dựa trên
+<p>Nếu bạn muốn sửa đổi menu tùy chọn dựa trên
các sự kiện xảy ra trong vòng đời của hoạt động, bạn có thể làm vậy trong phương pháp
{@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}. Phương pháp
này chuyển cho bạn đối tượng {@link android.view.Menu} như hiện đang có để bạn có thể sửa đổi nó,
@@ -363,7 +363,7 @@
gọi {@link android.app.Activity#invalidateOptionsMenu invalidateOptionsMenu()} để yêu cầu
hệ thống gọi {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}.</p>
-<p class="note"><strong>Lưu ý:</strong>
+<p class="note"><strong>Lưu ý:</strong>
Bạn không nên thay đổi các mục trong menu tùy chọn dựa trên {@link android.view.View} đang
trong tiêu điểm. Khi ở chế độ cảm ứng (khi người dùng không sử dụng bi xoay hay d-pad), các dạng xem
không thể lấy tiêu điểm, vì thế bạn không nên sử dụng tiêu điểm làm cơ sở để sửa đổi
@@ -609,7 +609,7 @@
<p>Khi bạn gọi {@link android.app.Activity#startActionMode startActionMode()}, hệ thống sẽ trả về
{@link android.view.ActionMode} được tạo. Bằng cách lưu điều này trong một biến thành viên, bạn có thể
-thực hiện thay đổi thanh hành động theo ngữ cảnh để hồi đáp những sự kiện khác. Trong mẫu trên,
+thực hiện thay đổi thanh hành động theo ngữ cảnh để hồi đáp những sự kiện khác. Trong mẫu trên,
{@link android.view.ActionMode} được sử dụng để đảm bảo rằng thực thể {@link android.view.ActionMode} không
được tạo lại nếu nó đã hiện hoạt, bằng cách kiểm tra xem thành viên có rỗng không trước khi khởi động
chế độ hành động.</p>
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -1026,6 +1026,6 @@
<p>Tìm hiểu thêm về việc ghi các bộ lọc ý định trong tài liệu
<a href="/guide/components/intents-filters.html">Ý định và Bộ lọc Ý định</a>.</p>
-<p>Để tham khảo một ứng dụng mẫu sử dụng kỹ thuật này, hãy xem mã mẫu
+<p>Để tham khảo một ứng dụng mẫu sử dụng kỹ thuật này, hãy xem mã mẫu
<a href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">Note
Pad</a>.</p>
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/vi/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..3317d1c
--- /dev/null
+++ b/docs/html-intl/intl/vi/guide/topics/ui/multi-window.jd
@@ -0,0 +1,582 @@
+page.title=Hỗ trợ đa cửa sổ
+page.metaDescription=Hỗ trợ mới trong Android N để hiển thị nhiều hơn một ứng dụng cùng lúc.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>Trong tài liệu này</h2>
+ <ol>
+ <li><a href="#overview">Tổng quan</a></li>
+ <li><a href="#lifecycle">Vòng đời đa cửa sổ</a></li>
+ <li><a href="#configuring">Cấu hình Ứng dụng của bạn cho Chế độ
+ Đa cửa sổ</a></li>
+ <li><a href="#running">Chạy Ứng dụng của bạn trong Chế độ Đa cửa sổ</a></li>
+ <li><a href="#testing">Kiểm thử Hỗ trợ Đa cửa sổ của Ứng dụng của bạn</a></li>
+ </ol>
+ <h2>Xem thêm</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Ứng dụng mẫu Multi-Windows
+ Playground</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N thêm hỗ trợ cho hiển thị đồng thời nhiều hơn một ứng dụng
+ vào cùng một thời điểm. Trên thiết bị cầm tay, hai ứng dụng có thể chạy song song hoặc
+ trên dưới nhau trong chế độ <em>chia màn hình</em>. Trên thiết bị TV, ứng dụng có thể
+ sử dụng chế độ <em>ảnh trong ảnh</em> để tiếp tục phát lại video trong khi người dùng
+ đang tương tác với ứng dụng khác.
+</p>
+
+<p>
+ Nếu bạn dựng ứng dụng của bạn bằng N Preview SDK, bạn có thể cấu hình cách ứng dụng của bạn
+ xử lý hiển thị đa cửa sổ. Ví dụ, bạn có thể quy định
+ các kích thước tối thiểu cho phép của hoạt động của bạn. Bạn cũng có thể vô hiệu hóa hiển thị đa cửa sổ cho
+ ứng dụng của bạn, đảm bảo rằng hệ thống chỉ hiển thị ứng dụng của bạn trong chế độ
+ toàn màn hình.
+</p>
+
+<h2 id="overview">Tổng quan</h2>
+
+<p>
+ Android N cho phép một vài ứng dụng chia sẻ màn hình ngay lập tức. Ví
+ dụ, người dùng có thể chia đôi màn hình ra, xem một trang web ở bên trái màn hình
+ trong khi đang tạo email ở bên phải màn hình. Trải nghiệm này của người dùng phụ thuộc vào
+ thiết bị:
+</p>
+
+<ul>
+ <li>Thiết bị cầm tay đang chạy Android N có chế độ
+ chia màn hình. Trong chế độ này, hệ thống sẽ lấp đầy màn hình bằng hai ứng dụng
+ song song nhau hoặc trên dưới. Người dùng có thể kéo đường chia
+ phân tách hai ứng dụng để hiển thị một ứng dụng rộng hơn và ứng dụng còn lại nhỏ đi.
+ </li>
+
+ <li>Trên Trình phát Nexus đang chạy Android N, các ứng dụng có thể tự đặt chúng
+ vào trong <a href="picture-in-picture.html">chế độ ảnh trong ảnh</a>, cho phép
+ các ứng dụng này tiếp tục hiển thị nội dung khi người dùng duyệt web hoặc tương tác với
+ ứng dụng khác.
+ </li>
+
+ <li>Các nhà sản xuất thiết bị có kích cỡ lớn hơn có thể chọn kích hoạt chế độ
+ hình dạng tự do, trong đó người dùng có thể tự do thay đổi kích thước mỗi hoạt động. Nếu
+ nhà sản xuất đã kích hoạt tính năng này, ngoài
+ chế độ chia màn hình, thiết bị sẽ còn có chế độ hình dạng tự do.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>Hình 1.</strong> Hai ứng dụng chạy trong chế độ chia màn hình.
+</p>
+
+<p>
+ Người dùng có thể chuyển vào trong chế độ đa cửa sổ bằng các cách sau:
+</p>
+
+<ul>
+ <li>Nếu người dùng mở màn hình <a href="{@docRoot}guide/components/recents.html">Overview
+ </a> và thực hiện nhấn giữ
+ tiêu đề của hoạt động, họ có thể kéo hoạt động đó đến phần được tô sáng của
+ màn hình để đặt hoạt động đó vào trong chế độ đa cửa sổ.
+ </li>
+
+ <li>Nếu người dùng thực hiện nhấn giữ nút Overview, thiết bị sẽ đặt
+ hoạt động hiện tại vào trong chế độ đa cửa sổ, và mở màn hình Overview để
+ cho phép người dùng chọn một hoạt động khác để chia sẻ màn hình.
+ </li>
+</ul>
+
+<p>
+ Người dùng có thể <a href="{@docRoot}guide/topics/ui/drag-drop.html">kéo và
+ thả</a> từ một hoạt động sang một hoạt động khác trong khi các hoạt động này vẫn đang chia sẻ
+ cùng một màn hình. (Trước đó, người dùng chỉ có thể kéo và thả dữ liệu trong một hoạt động
+ đơn lẻ.)
+</p>
+
+<h2 id="lifecycle">Vòng đời đa cửa sổ</h2>
+
+<p>
+ Chế độ đa cửa sổ không thay đổi <a href="{@docRoot}training/basics/activity-lifecycle/index.html">vòng đời
+ của hoạt động</a>.
+</p>
+
+<p>
+ Trong chế độ đa cửa sổ, chỉ hoạt động mà người dùng đã tương tác gần đây nhất
+ mới hoạt động trong khoảng thời gian xác định. Hoạt động này được cân nhắc <em>ở trên cùng</em>.
+ Tất cả các hoạt động khác sẽ ở trong tình trạng tạm dừng, ngay cả khi chúng vẫn hiển thị.
+ Tuy nhiên, hệ thống sẽ cấp mức ưu tiên cao hơn cho hoạt động bị tạm dừng nhưng vẫn hiển thị này
+ so với các hoạt động không hiển thị. Nếu người dùng tương tác với một trong những
+ hoạt động bị tạm dừng, hoạt động đó sẽ được tiếp tục, và hoạt động trên cùng trước đó
+ sẽ bị tạm dừng.
+</p>
+
+<p class="note">
+ <strong>Lưu ý:</strong> Trong chế độ đa cửa sổ, một ứng dụng có thể trong trạng thái
+ tạm dừng và vẫn hiển thị với người dùng. Ứng dụng có thể cần tiếp tục
+ các hoạt động của nó thậm chí trong khi đamg bị tạm dừng. Ví dụ, một ứng dụng phát video đang ở trong
+ chế độ tạm dừng nhưng vẫn hiển thị thì sẽ tiếp tục hiển thị video của nó. Vì lý do
+ này, chúng tôi đề nghị các hoạt động phát video <em>không</em> tạm dừng
+ video trong trình xử lý{@link android.app.Activity#onPause onPause()}.
+ Thay vào đó, các ứng dụng nên tạm dừng video trong {@link android.app.Activity#onStop
+ onStop()}, và tiếp tục phát lại trong {@link android.app.Activity#onStart
+ onStart()}.
+</p>
+
+<p>
+ Khi người dùng đặt một ứng dụng vào trong chế độ đa cửa sổ, hệ thống sẽ thông báo về
+ hoạt động thay đổi cấu hình đó, như được quy định trong <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý Thay đổi
+ Thời gian chạy</a>. Về cơ bản, thay đổi này có ngụ ý về vòng đời hoạt động tương tự
+ vì khi hệ thống thông báo cho ứng dụng rằng thiết bị đã chuyển
+ từ chế độ hướng dọc sang chế độ ngang, ngoại trừ trường hợp các kích thước của thiết bị
+ đã được thay đổi thay vì chỉ bị hoán đổi. Như đã thảo luận trong phần <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý Thay đổi
+ Thời gian chạy</a>, hoạt động của bạn có thể tự xử lý thay đổi cấu hình này, hoặc nó
+ có thể cho phép hệ thống hủy hoạt động này và tạo lại nó với
+ các kích thước mới.
+</p>
+
+<p>
+ Nếu người dùng thay đổi kích thước của một cửa sổ và làm nó rộng hơn ở bất kỳ kích thước nào,
+ hệ thống sẽ thay đổi kích thước của hoạt động để khớp với hành động của người dùng và phát hành <a href="{@docRoot}guide/topics/resources/runtime-changes.html">các thay đổi thời gian chạy</a>
+ nếu cần. Nếu ứng dụng bị trễ lại trong khi vẽ các vùng mới được hiển thị,
+ hệ thống sẽ tạm thời lấp đầy các vùng đó bằng một màu được quy định bởi thuộc tính {@link
+ android.R.attr#windowBackground windowBackground} hoặc bằng thuộc tính kiểu
+ <code>windowBackgroundFallback</code> mặc định.
+</p>
+
+<h2 id="configuring">Cấu hình Ứng dụng của bạn cho Chế độ Đa cửa sổ</h2>
+
+<p>
+ Nếu ứng dụng của bạn nhắm đến Android N, bạn có thể cấu hình cách thức và
+ liệu các hoạt động của ứng dụng có hỗ trợ hiển thị đa cửa sổ không. Bạn có thể đặt
+ các thuộc tính trong bản kê khai của bạn để kiểm soát cả kích cỡ và bố trí.
+ Cài đặt thuộc tính của hoạt động gốc sẽ áp dụng cho tất cả các hoạt động
+ nằm trong ngăn xếp hoạt động của nó.
+</p>
+
+<p class="note">
+ <strong>Lưu ý:</strong> Nếu bạn dựng một ứng dụng đa hướng bằng phiên bản
+ SDK thấp hơn Android N, và người dùng sử dụng ứng dụng đó trong
+ chế độ đa cửa sổ, hệ thống sẽ bắt buộc thay đổi kích thước của ứng dụng đó. Hệ thống sẽ hiển thị một
+ hộp hội thoại cảnh báo người dùng rằng ứng dụng này có thể có hành vi không như kỳ vọng. Hệ thống
+ <em>không</em> thay đổi kích cỡ của ứng dụng có hướng cố định; nếu
+ người dùng cố mở một ứng dụng có hướng cố định dưới chế độ đa cửa sổ,
+ ứng dụng này sẽ chiếm toàn bộ màn hình.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ Đặt thuộc tính này trong <code><activity></code> của bản kê khai của bạn hoặc node
+ <code><application></code> để kích hoạt hoặc vô hiệu hóa hiển thị
+ đa cửa sổ:
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ Nếu thuộc tính này được đặt thành true, hoạt động có thể được khởi chạy trong
+ chế độ chia màn hình và hình dạng tự do. Nếu thuộc tính này được đặt thành false,
+ hoạt động sẽ không hỗ trợ chế độ đa cửa sổ. Nếu giá trị này là false, và
+ người dùng cố khởi chạy hoạt động trong chế độ đa cửa sổ, hoạt động đó sẽ
+ chiếm toàn màn hình.
+</p>
+
+<p>
+ Nếu ứng dụng của bạn nhắm đến Android N, nhưng bạn chưa quy định giá trị
+ cho thuộc tính này, giá trị của thuộc tính sẽ mặc định đặt là true.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ Đặt thuộc tính này trong node <code><activity></code> của bản kê khai của bạn để
+ cho biết liệu hoạt động này có hỗ trợ hiển thị ảnh trong ảnh hay không. Thuộc tính
+ này được bỏ qua nếu <code>android:resizeableActivity</code> là false.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">Thuộc tính bố trí</h3>
+
+<p>
+ Với Android N, phần tử bản kê khai <code><layout></code>
+ có hỗ trợ một số thuộc tính sẽ ảnh hưởng đến cách hoạt động có hành vi như thế nào trong
+ chế độ đa cửa sổ:
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ Chiều rộng mặc định của hoạt động khi được khởi chạy trong chế độ hình dạng tự do.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ Chiều cao mặc định của hoạt động khi được khởi chạy trong chế độ hình dạng tự do.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ Vị trí ban đầu của hoạt động khi được khởi chạy trong chế độ hình dạng tự do. Xem tham chiếu
+ {@link android.view.Gravity} về các giá trị phù hợp.
+ </dd>
+
+ <dt>
+ <code>android:minimalSize</code>
+ </dt>
+
+ <dd>
+ Chiều cao và chiều rộng tối thiểu cho hoạt động trong cả chế độ chia màn hình
+ và chế độ hình dạng tự do. Nếu người dùng di chuyển thanh phân chia trong chế độ chia màn hình
+ để làm cho hoạt động nhỏ hơn mức tối thiểu quy định, hệ thống sẽ cắt xén
+ hoạt động đó thành kích cỡ mà người dùng yêu cầu.
+ </dd>
+</dl>
+
+<p>
+ Ví dụ, đoạn mã sau đây sẽ cho biết cách quy định kích thước và vị trí mặc định
+ của một hoạt động và kích thước tối thiểu của nó, khi hoạt động được hiển thị trong
+ chế độ hình dạng tự do:
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalSize="450dp" />
+</activity>
+</pre>
+
+<h2 id="running">Chạy Ứng dụng của bạn trong Chế độ Đa cửa sổ</h2>
+
+<p>
+ Android N có tính năng mới để hỗ trợ các ứng dụng có thể chạy
+ trong chế độ đa cửa sổ.
+</p>
+
+<h3 id="disabled-features">Các tính năng bị vô hiệu hóa trong Chế độ Đa cửa sổ</h3>
+
+<p>
+ Một số tính năng bị vô hiệu hóa hoặc bỏ qua khi một thiết bị đang ở chế độ
+ đa cửa sổ bởi các tính năng này không có ý nghĩa đối với một hoạt động có thể đang chia sẻ
+ màn hình thiết bị với các hoạt động hoặc ứng dụng khác. Các tính năng đó bao gồm:
+
+<ul>
+ <li>Ví dụ, một vài tùy chọn tùy chỉnh <a href="{@docRoot}training/system-ui/index.html">System UI</a>
+ sẽ bị vô hiệu hóa, ứng dụng không thể ẩn thanh trạng thái
+ nếu chúng đang chạy trong chế độ toàn màn hình.
+ </li>
+
+ <li>Hệ thống sẽ bỏ qua các thay đổi đối với thuộc tính <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code>.
+ </li>
+</ul>
+
+<h3 id="change-notification">Thông báo và truy vấn thay đổi đa cửa sổ</h3>
+
+<p>
+ Các phương thức mới sau đây đã được thêm vào lớp {@link android.app.Activity}
+ để hỗ trợ hiển thị đa cửa sổ. Để biết chi tiết về mỗi phương thức, xem
+ <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham chiếu N Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.inMultiWindow()</code>
+ </dt>
+
+ <dd>
+ Lệnh gọi để tìm hiểu xem hoạt động có đang ở chế độ đa cửa sổ hay không.
+ </dd>
+
+ <dt>
+ <code>Activity.inPictureInPicture()</code>
+ </dt>
+
+ <dd>
+ Lệnh gọi để tìm hiểu xem hoạt động có đang ở chế độ ảnh trong ảnh hay không.
+
+ <p class="note">
+ <strong>Lưu ý:</strong> Chế độ Ảnh trong ảnh là trường hợp đặc biệt
+ của chế độ đa cửa sổ. Nếu <code>myActivity.inPictureInPicture()</code>
+ trả về là true, thì <code>myActivity.inMultiWindow()</code> cũng trả về là
+ true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowChanged()</code>
+ </dt>
+
+ <dd>
+ Hệ thống sẽ gọi phương thức này bất cứ khi nào hoạt động đi vào trong hay ra ngoài
+ chế độ đa cửa sổ. Hệ thống sẽ chuyển cho phương thức giá trị true nếu
+ hoạt động đang đi vào chế độ đa cửa sổ, và false nếu hoạt động
+ đang rời chế độ đa cửa sổ.
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureChanged()</code>
+ </dt>
+
+ <dd>
+ Hệ thống sẽ gọi phương thức này bất cứ khi nào hoạt động đi vào trong hay ra ngoài
+ chế độ ảnh trong ảnh. Hệ thống sẽ chuyển cho phương thức một giá trị true nếu
+ hoạt động đang đi vào chế độ ảnh trong ảnh, và false nếu hoạt động
+ đang rời chế độ ảnh trong ảnh.
+ </dd>
+</dl>
+
+<p>
+ Cũng có các phiên bản {@link android.app.Fragment} của từng phương thức
+ này, ví dụ như <code>Fragment.inMultiWindow()</code>.
+</p>
+
+<h3 id="entering-pip">Vào chế độ ảnh trong ảnh</h3>
+
+<p>
+ Để đặt một hoạt động vào trong chế độ ảnh trong ảnh, hãy gọi phương thức mới
+ <code>Activity.enterPictureInPicture()</code>. Phương thức này sẽ không có ảnh hưởng nếu
+ thiết bị không hỗ trợ chế độ ảnh trong ảnh. Để biết thêm thông tin,
+ hãy xem tài liệu <a href="picture-in-picture.html">Ảnh trong ảnh</a>.
+</p>
+
+<h3 id="launch">Khởi chạy Hoạt động Mới trong Chế độ Đa cửa sổ</h3>
+
+<p>
+ Khi bạn khởi chạy một hoạt động mới, bạn có thể gợi ý cho hệ thống rằng hoạt động
+ mới sẽ được hiển thị liền kề hoạt động hiện tại, nếu có thể. Để thực hiện điều
+ này, hãy dùng cờ
+ <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Việc chuyển
+ cờ này yêu cầu hành vi sau:
+</p>
+
+<ul>
+ <li>Nếu thiết bị đang ở chế độ chia màn hình, hệ thống sẽ cố tạo ra
+ hoạt động mới bên cạnh hoạt động đã khởi chạy nó, vì vậy hai hoạt động này
+ sẽ chia sẻ cùng một màn hình. Hệ thống không được đảm bảo có thể làm được điều này, nhưng nó
+ làm cho các hoạt động ở liền kề nhau nếu có thể.
+ </li>
+
+ <li>Nếu thiết bị không ở chế độ chia màn hình, cờ này sẽ không có tác dụng.
+ </li>
+</ul>
+
+<p>
+ Nếu thiết bị đang ở chế độ hình dạng tự do và bạn đang khởi chạy một hoạt động mới, bạn có thể
+ quy định kích thước của hoạt động mới và vị trí màn hình bằng cách gọi
+ <code>ActivityOptions.setLaunchBounds()</code>. Phương thức này sẽ không có ảnh hưởng nếu
+ thiết bị không ở chế độ đa cửa sổ.
+</p>
+
+<p class="note">
+ <strong>Lưu ý:</strong> Nếu bạn khởi chạy một hoạt động trong một ngăn xếp tác vụ, hoạt động
+ này sẽ thay thế hoạt động trên màn hình, kế thừa tất cả các thuộc tính đa cửa sổ
+ của nó. Nếu bạn muốn khởi chạy hoạt động mới dưới dạng một cửa sổ
+ riêng trong chế độ đa cửa sổ, bạn phải khởi chạy nó trong một ngăn xếp tác vụ mới.
+</p>
+
+<h3 id="dnd">Hỗ trợ kéo và thả</h3>
+
+<p>
+ Người dùng có thể <a href="{@docRoot}guide/topics/ui/drag-drop.html">kéo và
+ thả</a> dữ liệu từ một hoạt động này sang một hoạt động khác trong khi các hoạt động này vẫn đang
+ chia sẻ cùng một màn hình. (Trước đó, người dùng chỉ có thể kéo và thả dữ liệu trong một
+ hoạt động đơn lẻ.) Vì lý do này, bạn có thể muốn thêm tính năng kéo và thả
+ vào ứng dụng của bạn nếu ứng dụng của bạn hiện không hỗ trợ tính năng này.
+</p>
+
+<p>
+ N Preview SDK mở rộng gói <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+ để hỗ trợ kéo và thả giữa các ứng dụng. Để biết chi tiết về các lớp và phương thức
+ sau, hãy xem <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham chiếu N
+ Preview SDK</a>.
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ Đối tượng mã thông báo chịu trách nhiệm về việc quy định các quyền cấp cho ứng dụng
+ nhận được thao tác thả.
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Bí danh mới cho {@link android.view.View#startDrag View.startDrag()}. Để
+ kích hoạt kéo và thả giữa các hoạt động, hãy chuyển cờ mới
+ <code>View.DRAG_FLAG_GLOBAL</code>. Nếu bạn cần cấp quyền URI cho
+ hoạt động của đối tượng nhận, hãy chuyển các cờ mới
+ <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> hoặc
+ <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, nếu phù hợp.
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ Hủy thao tác kéo hiện đang diễn ra. Chỉ có thể được gọi bằng
+ ứng dụng đã khởi nguồn thao tác kéo đó.
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ Thay thế bóng kéo cho thao tác kéo hiện đang diễn ra. Chỉ có thể
+ được gọi bằng ứng dụng đã khởi nguồn thao tác kéo đó.
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ Yêu cầu các quyền cho URI nội dung đã chuyển với {@link
+ android.content.ClipData} có chứa trong {@link android.view.DragEvent}.
+ </dd>
+</dl>
+
+<h2 id="testing">Kiểm thử Hỗ trợ Đa cửa sổ của Ứng dụng của bạn</h2>
+
+<p>
+ Dù cho bạn có cập nhật ứng dụng của mình lên Android N hay không, bạn cũng nên
+ xác minh cách thiết bị có hành vi như thế nào trong chế độ đa cửa sổ trong trường hợp người dùng cố khởi chạy nó
+ ở chế độ đa cửa sổ trên thiết bị chạy Android N.
+</p>
+
+<h3 id="configuring">Cấu hình Thiết bị Kiểm thử</h3>
+
+<p>
+ Nếu bạn cài đặt Android N trên thiết bị, chế độ chia màn hình
+ sẽ được tự động hỗ trợ.
+</p>
+
+<h3 id="test-non-n">Nếu ứng dụng của bạn không được dựng bằng N Preview SDK</h3>
+
+<p>
+ Nếu bạn dựng ứng dụng của mình bằng N Preview SDK, và người dùng cố sử dụng ứng dụng này
+ trong chế độ đa cửa sổ, hệ thống sẽ bắt buộc thay đổi kích thước của ứng dụng đó trừ khi ứng dụng này
+ khai báo hướng cố định.
+</p>
+
+<p>
+ Nếu ứng dụng không khai báo hướng cố định, bạn nên khởi chạy ứng dụng của bạn
+ trên thiết bị đang chạy Android N và cố đặt ứng dụng vào trong
+ chế độ chia màn hình. Xác minh rằng trải nghiệm người dùng là
+ chấp nhận được khi ứng dụng bị bắt buộc thay đổi kích cỡ.
+</p>
+
+<p>
+ Nếu ứng dụng khai báo hướng cố định, bạn nên cố đặt ứng dụng vào trong
+ chế độ đa cửa sổ. Xác minh xem khi bạn làm như vậy, ứng dụng vẫn giữ
+ ở chế độ toàn màn hình.
+</p>
+
+<h3 id="test-mw">Nếu bạn hỗ trợ chế độ đa cửa sổ</h3>
+
+<p>
+ Nếu bạn dựng ứng dụng của bạn bằng N Preview SDK và chưa vô hiệu hóa
+ hỗ trợ đa cửa sổ, hãy xác minh hành vi sau dưới chế độ chia màn hình
+ và chế độ hình dạng tự do.
+</p>
+
+<ul>
+ <li>Khởi chạy ứng dụng trong chế độ toàn màn hình, rồi chuyển sang chế độ đa cửa sổ bằng cách
+ nhấn giữ nút Overview. Xác minh rằng ứng dụng đã chuyển đổi đúng cách.
+ </li>
+
+ <li>Khởi chạy ứng dụng trực tiếp trong chế độ đa cửa sổ, và xác thực rằng ứng dụng này
+ khởi chạy đúng cách. Bạn có thể khởi chạy ứng dụng trong chế độ đa cửa sổ bằng cách nhấn vào nút
+ Overview, rồi nhấn giữ vào thanh tiều đề của ứng dụng của bạn và kéo nó
+ đến một trong những vùng được tô sáng trên màn hình.
+ </li>
+
+ <li>Thay đổi kích thước ứng dụng của bạn trong chế độ chia màn hình bằng cách kéo đường phân chia.
+ Xác minh rằng ứng dụng thay đổi kích thước mà không bị lỗi, và các phần tử UI cần thiết
+ vẫn hiển thị.
+ </li>
+
+ <li>Nếu bạn đã quy định các kích cỡ tối thiểu cho ứng dụng của bạn, hãy cố thay đổi kích thước của ứng dụng
+ sao cho nhỏ hơn các kích thước đã quy định đó. Xác minh rằng bạn không thể thay đổi kích cỡ của ứng dụng để
+ nhỏ hơn kích cỡ tối thiểu đã quy định.
+ </li>
+
+ <li>Thông qua tất cả các bài kiểm thử, hãy xác minh rằng hiệu năng của ứng dụng của bạn là có thể chấp nhận được. Ví
+ dụ, xác minh rằng sẽ không bị trễ quá lâu để cập nhật UI sau khi
+ ứng dụng bị thay đổi kích thước.
+ </li>
+</ul>
+
+<h4 id="test-checklist">Danh sách kiểm thử</h4>
+
+<p>
+ Để xác minh hiệu năng ứng dụng của bạn trong chế độ đa cửa sổ, hãy thử các thao tác
+ sau. Bạn nên thử các thao tác này trong cả chế độ chia màn hình và
+ chế độ đa cửa sổ, trừ khi có lưu ý khác.
+</p>
+
+<ul>
+ <li>Vào và rời chế độ đa cửa sổ.
+ </li>
+
+ <li>Hãy chuyển từ ứng dụng của bạn sang ứng dụng khác, và xác minh rằng ứng dụng có hành vi
+ đúng cách trong khi nó hiển thị nhưng không hoạt động. Ví dụ nếu ứng dụng của bạn đang
+ phát video, hãy xác minh rằng video tiếp tục phát trong khi người dùng đang
+ tương tác với một ứng dụng khác.
+ </li>
+
+ <li>Trong chế độ chia màn hình, hãy thử di chuyển thanh phân chia để làm cho ứng dụng của bạn
+ rộng hơn và nhỏ hơn. Thử các thao tác này trong cả cấu hình song song và
+ trên dưới. Xác minh rằng ứng dụng không bị treo,
+ các chức năng thiết yếu vẫn hiển thị, và thao tác thay đổi kích cỡ không quá
+ lâu.
+ </li>
+
+ <li>Thực hiện một vài thao tác thay đổi kích cỡ nối tiếp nhau thật nhanh. Xác minh rằng ứng dụng
+ của bạn không bị lỗi hoặc bị rò rỉ bộ nhớ. Để biết thông tin về kiểm tra việc sử dụng bộ nhớ của
+ ứng dụng, xem <a href="{@docRoot}tools/debugging/debugging-memory.html">
+ Kiểm tra Sử dụng RAM của bạn</a>.
+ </li>
+
+ <li>Sử dụng ứng dụng của bạn như thông thường trong một số cấu hình cửa sổ khác nhau, và
+ xác minh rằng ứng dụng có hành vi bình thường. Xác minh rằng có thể đọc được các chữ và
+ các phần tử UI không quá nhỏ để tương tác với chúng.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">Nếu bạn đã vô hiệu hóa hỗ trợ đa cửa sổ</h3>
+
+<p>
+ Nếu bạn đã vô hiệu hóa hỗ trợ đa cửa sổ bằng cách đặt
+ <code>android:resizableActivity="false"</code>, bạn nên khởi chạy ứng dụng của mình trên
+ thiết bị chạy Android N và cố đặt ứng dụng này vào trong
+ cả chế độ hình dạng tự do và chế độ chia màn hình. Xác minh xem khi bạn làm như vậy, ứng dụng vẫn giữ
+ ở chế độ toàn màn hình.
+</p>
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/vi/guide/topics/ui/notifiers/notifications.jd
index 5890cb3..8b6e1c84 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/notifiers/notifications.jd
@@ -150,7 +150,7 @@
{@link android.app.PendingIntent} chứa một
{@link android.content.Intent} có chức năng bắt đầu
một {@link android.app.Activity} trong ứng dụng của bạn. Để liên kết
- {@link android.app.PendingIntent} với một cử chỉ, hãy gọi phương pháp
+ {@link android.app.PendingIntent} với một cử chỉ, hãy gọi phương pháp
{@link android.support.v4.app.NotificationCompat.Builder} phù hợp. Ví dụ, nếu bạn muốn bắt đầu
{@link android.app.Activity} khi người dùng nhấp vào văn bản thông báo trong
ngăn kéo thông báo, bạn hãy thêm {@link android.app.PendingIntent} bằng cách gọi
@@ -449,7 +449,7 @@
<ol style="list-style-type: lower-alpha;">
<li>
Thêm hỗ trợ cho phiên bản Android 4.0.3 và trước đó. Để làm điều này, hãy quy định mẹ của
- {@link android.app.Activity} mà bạn đang bắt đầu bằng cách thêm phần tử
+ {@link android.app.Activity} mà bạn đang bắt đầu bằng cách thêm phần tử
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code>
làm con của
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>.
@@ -466,9 +466,9 @@
</p>
</li>
<li>
- Cũng thêm hỗ trợ cho phiên bản Android 4.1 và sau đó. Để làm điều này, hãy thêm thuộc tính
+ Cũng thêm hỗ trợ cho phiên bản Android 4.1 và sau đó. Để làm điều này, hãy thêm thuộc tính
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#parent">android:parentActivityName</a></code>
- vào phần tử
+ vào phần tử
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
của {@link android.app.Activity} mà bạn đang bắt đầu.
</li>
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/overview.jd b/docs/html-intl/intl/vi/guide/topics/ui/overview.jd
index 7bd4552..260b40d 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>Để xem hướng dẫn đầy đủ về tạo bố trí UI, hãy xem phần <a href="declaring-layout.html">Bố trí
XML</a>.
-
+
<h2 id="UIComponents">Thành phần Giao diện Người dùng</h2>
<p>Bạn không phải xây dựng tất cả UI của mình bằng cách sử dụng các đối tượng {@link android.view.View} và {@link
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/settings.jd b/docs/html-intl/intl/vi/guide/topics/ui/settings.jd
index 8e19b97..47a5c27 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/settings.jd
@@ -82,7 +82,7 @@
<img src="{@docRoot}images/ui/settings/settings.png" alt="" width="435" />
<p class="img-caption"><strong>Hình 1.</strong> Ảnh chụp màn hình từ thiết đặt của ứng dụng
-Messaging trên Android. Chọn một mục được định nghĩa bởi một {@link android.preference.Preference}
+Messaging trên Android. Chọn một mục được định nghĩa bởi một {@link android.preference.Preference}
sẽ mở ra một giao diện để thay đổi thiết đặt.</p>
@@ -121,7 +121,7 @@
<p>Vì thiết đặt của ứng dụng của bạn được xây dựng bằng cách sử dụng các đối tượng {@link android.preference.Preference}
thay vì đối tượng
-{@link android.view.View}, bạn nên sử dụng một lớp con {@link android.app.Activity} hoặc
+{@link android.view.View}, bạn nên sử dụng một lớp con {@link android.app.Activity} hoặc
{@link android.app.Fragment} chuyên dụng để hiển thị thiết đặt danh sách:</p>
<ul>
@@ -226,7 +226,7 @@
<dt>{@code android:key}</dt>
<dd>Thuộc tính này được yêu cầu cho các tùy chọn duy trì một giá trị dữ liệu. Nó quy định khóa
(xâu) duy nhất mà hệ thống sử dụng khi lưu giá trị của thiết đặt này trong {@link
-android.content.SharedPreferences}.
+android.content.SharedPreferences}.
<p>Các thực thể duy nhất mà thuộc tính này không <em>được yêu cầu</em> là khi tùy chọn là một
{@link android.preference.PreferenceCategory} hoặc {@link android.preference.PreferenceScreen}, hoặc
tùy chọn quy định một {@link android.content.Intent} để gọi ra (bằng phần tử <a href="#Intents">{@code <intent>}</a>) hoặc {@link android.app.Fragment} để hiển thị (bằng thuộc tính <a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -569,7 +569,7 @@
với tiêu đề tùy chọn</a>).</p>
<img src="{@docRoot}images/ui/settings/settings-headers-tablet.png" alt="" />
-<p class="img-caption"><strong>Hình 4.</strong> Bố trí có hai bảng với tiêu đề. <br/><b>1.</b>
+<p class="img-caption"><strong>Hình 4.</strong> Bố trí có hai bảng với tiêu đề. <br/><b>1.</b>
Tiêu đề được định nghĩa trong một tệp tiêu đề XML. <br/><b>2.</b> Mỗi nhóm thiết đặt được định nghĩa bởi một
{@link android.preference.PreferenceFragment}, được quy định bởi một phần tử {@code <header>} trong tệp tiêu đề
.</p>
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -672,15 +672,15 @@
tải.</p>
<p>Ví dụ, sau đây là một tệp XML cho các tiêu đề tùy chọn được sử dụng trên Android 3.0
-trở lên ({@code res/xml/preference_headers.xml}):</p>
+trở lên ({@code res/xml/preference_headers.xml}):</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -692,18 +692,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -834,7 +834,7 @@
trạng thái hiện tại (chẳng hạn như thiết đặt Ngủ như minh họa trong hình 5).</p>
<p class="note"><strong>Lưu ý:</strong> Như đã mô tả trong tài liệu Thiết kế Android về <a href="{@docRoot}design/patterns/settings.html">Thiết đặt</a>, chúng tôi khuyên bạn nên cập nhật
-tóm tắt cho {@link android.preference.ListPreference} mỗi khi người dùng thay đổi tùy chọn để
+tóm tắt cho {@link android.preference.ListPreference} mỗi khi người dùng thay đổi tùy chọn để
mô tả thiết đặt hiện tại.</p>
<p>Để quản lý vòng đời trong hoạt động cho phù hợp, chúng tôi khuyên rằng bạn nên đăng ký và bỏ đăng ký
@@ -902,7 +902,7 @@
người dùng tinh chỉnh mức sử dụng dữ liệu cho ứng dụng của bạn thông qua thiết đặt ứng dụng.<p>
<p>Ví dụ, bạn có thể cho phép người dùng kiểm soát tần suất ứng dụng của bạn đồng bộ dữ liệu, ứng dụng của bạn
-chỉ được thực hiện tải lên/tải xuống khi trên Wi-Fi, ứng dụng của bạn sử dụng dữ liệu trong khi đang chuyển vùng dữ liệu, v.v... hay không. Với
+chỉ được thực hiện tải lên/tải xuống khi trên Wi-Fi, ứng dụng của bạn sử dụng dữ liệu trong khi đang chuyển vùng dữ liệu, v.v... hay không. Với
những kiểm soát này, người dùng sẽ ít có khả năng vô hiệu hóa truy cập dữ liệu của ứng dụng của bạn
hơn nhiều khi họ đạt gần mức giới hạn đặt ra trong Thiết đặt hệ thống, vì thay vào đó, họ có thể kiểm soát chính xác
lượng dữ liệu mà ứng dụng của bạn sử dụng.</p>
@@ -946,7 +946,7 @@
<ul>
<li>Quy định giao diện người dùng sẽ xuất hiện khi người dùng chọn thiết đặt.</li>
<li>Lưu giá trị của thiết đặt khi phù hợp.</li>
- <li>Khởi tạo {@link android.preference.Preference} bằng giá trị hiện tại (hoặc mặc định)
+ <li>Khởi tạo {@link android.preference.Preference} bằng giá trị hiện tại (hoặc mặc định)
khi xét tới dạng xem.</li>
<li>Cung cấp giá trị mặc định khi hệ thống yêu cầu.</li>
<li>Nếu {@link android.preference.Preference} cung cấp UI của chính mình (chẳng hạn như một hộp thoại), hãy lưu
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1034,7 +1034,7 @@
cho bạn giá trị mặc định.</p>
<p>Phương pháp {@link android.preference.Preference#onSetInitialValue onSetInitialValue()} chuyển một
-boolean, <code>restorePersistedValue</code>, để cho biết liệu giá trị đã được duy trì
+boolean, <code>restorePersistedValue</code>, để cho biết liệu giá trị đã được duy trì
cho thiết đặt hay không. Nếu nó là <code>true</code>, khi đó bạn nên truy xuất giá trị được duy trì bằng cách gọi
một trong các phương pháp của lớp {@link
android.preference.Preference}, {@code getPersisted*()}, chẳng hạn như {@link
@@ -1060,7 +1060,7 @@
</pre>
<p>Mỗi phương pháp {@code getPersisted*()} sẽ lấy một tham đối quy định
-giá trị mặc định sẽ sử dụng trong trường hợp thực sự không có giá trị được duy trì hoặc khóa không tồn tại. Trong
+giá trị mặc định sẽ sử dụng trong trường hợp thực sự không có giá trị được duy trì hoặc khóa không tồn tại. Trong
ví dụ trên, một hằng số cục bộ được sử dụng để quy định giá trị mặc định trong trường hợp {@link
android.preference.Preference#getPersistedInt getPersistedInt()} không thể trả về một giá trị được duy trì.</p>
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/vi/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/vi/guide/topics/ui/ui-events.jd
index b4d1635..c2b337c 100644
--- a/docs/html-intl/intl/vi/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/ui-events.jd
@@ -20,8 +20,8 @@
Khi xem xét các sự kiện trong giao diện người dùng của bạn, cách tiếp cận là chụp lại sự kiện từ
đối tượng Dạng xem cụ thể mà người dùng tương tác với. Lớp Dạng xem sẽ cung cấp phương thức để làm việc này.</p>
-<p>Trong các lớp Dạng xem khác nhau mà bạn sẽ sử dụng để soạn bố trí của mình, bạn có thể thấy một vài phương pháp gọi lại
-công khai dường như hữu ích đối với sự kiện UI. Những phương pháp này được khuôn khổ Android gọi khi
+<p>Trong các lớp Dạng xem khác nhau mà bạn sẽ sử dụng để soạn bố trí của mình, bạn có thể thấy một vài phương pháp gọi lại
+công khai dường như hữu ích đối với sự kiện UI. Những phương pháp này được khuôn khổ Android gọi khi
xảy ra hành động tương ứng trên đối tượng đó. Ví dụ, khi một Dạng xem (chẳng hạn như một Nút) được chạm vào,
phương pháp <code>onTouchEvent()</code> được gọi trên đối tượng đó. Tuy nhiên, để can thiệp vào điều này, bạn phải mở rộng
lớp và khống chế phương pháp đó. Tuy nhiên, việc mở rộng mọi đối tượng Dạng xem
@@ -30,7 +30,7 @@
được gọi là <a href="#EventListeners">đối tượng theo dõi sự kiện</a>, là tấm vé để bạn chụp lại tương tác giữa người dùng với UI của bạn.</p>
<p>Trong khi các đối tượng theo dõi sự kiện sẽ thường được sử dụng để theo dõi tương tác của người dùng, có thể
-có lúc bạn muốn mở rộng một lớp Dạng xem để xây dựng một thành phần tùy chỉnh.
+có lúc bạn muốn mở rộng một lớp Dạng xem để xây dựng một thành phần tùy chỉnh.
Có thể là bạn muốn mở rộng lớp {@link android.widget.Button}
để khiến cái gì đó trông ấn tượng hơn. Trong trường hợp này, bạn sẽ có thể định nghĩa các hành vi sự kiện mặc định cho lớp
của mình bằng cách sử dụng <a href="#EventHandlers">bộ xử lý sự kiện</a> của lớp.</p>
@@ -38,7 +38,7 @@
<h2 id="EventListeners">Đối tượng theo dõi Sự kiện</h2>
-<p>Đối tượng theo dõi sự kiện là một giao diện trong lớp {@link android.view.View} chứa một phương pháp gọi lại
+<p>Đối tượng theo dõi sự kiện là một giao diện trong lớp {@link android.view.View} chứa một phương pháp gọi lại
đơn lẻ. Những phương pháp này sẽ được khuôn khổ Android gọi khi Dạng xem mà đối tượng theo dõi đã
được đăng ký với bị kích khởi bởi tương tác giữa người dùng với mục trong UI.</p>
@@ -46,27 +46,27 @@
<dl>
<dt><code>onClick()</code></dt>
- <dd>Từ {@link android.view.View.OnClickListener}.
- Phương pháp này được gọi khi người dùng chạm vào mục
+ <dd>Từ {@link android.view.View.OnClickListener}.
+ Phương pháp này được gọi khi người dùng chạm vào mục
(khi ở chế độ cảm ứng), hoặc lấy tiêu điểm vào một mục bằng phím điều hướng hoặc bi xoay và
nhấn phím "enter" phù hợp hoặc nhấn bi xoay.</dd>
<dt><code>onLongClick()</code></dt>
- <dd>Từ {@link android.view.View.OnLongClickListener}.
- Phương pháp này được gọi khi người gọi chạm và giữ mục (khi ở chế độ cảm ứng), hoặc
+ <dd>Từ {@link android.view.View.OnLongClickListener}.
+ Phương pháp này được gọi khi người gọi chạm và giữ mục (khi ở chế độ cảm ứng), hoặc
lấy tiêu điểm vào một mục bằng phím điều hướng hoặc bi xoay và
nhấn và giữ phím "enter" phù hợp hoặc nhấn và giữ bi xoay (trong một giây).</dd>
<dt><code>onFocusChange()</code></dt>
- <dd>Từ {@link android.view.View.OnFocusChangeListener}.
+ <dd>Từ {@link android.view.View.OnFocusChangeListener}.
Phương pháp này được gọi khi người dùng điều hướng lên hoặc ra khỏi một mục bằng cách sử dụng các phím điều hướng hoặc bi xoay.</dd>
<dt><code>onKey()</code></dt>
- <dd>Từ {@link android.view.View.OnKeyListener}.
+ <dd>Từ {@link android.view.View.OnKeyListener}.
Phương pháp này được gọi khi người dùng được lấy tiêu điểm vào một mục và nhấn hoặc nhả phím cứng trên thiết bị.</dd>
<dt><code>onTouch()</code></dt>
- <dd>Từ {@link android.view.View.OnTouchListener}.
+ <dd>Từ {@link android.view.View.OnTouchListener}.
Phương pháp này được gọi khi người dùng thực hiện một hành động được coi như một sự kiện chạm, bao gồm nhấn, nhả,
hoặc bất kỳ động tác chuyển động nào trên màn hình (trong đường biên của mục đó).</dd>
<dt><code>onCreateContextMenu()</code></dt>
- <dd>Từ {@link android.view.View.OnCreateContextMenuListener}.
+ <dd>Từ {@link android.view.View.OnCreateContextMenuListener}.
Phương pháp này được gọi khi một Menu Ngữ cảnh đang được xây dựng (kết quả của một sự kiện "nhấp giữ" kéo dài). Xem phần thảo luận về
menu ngữ cảnh trong hướng dẫn dành cho nhà phát triển <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Menu</a>
.</dd>
@@ -75,8 +75,8 @@
<p>Những phương pháp này là phương pháp duy nhất nằm trong giao diện tương ứng của chúng. Để định nghĩa một trong những phương pháp này
và xử lý sự kiện của bạn, hãy triển khai giao diện lồng nhau trong Hoạt động của bạn hoặc định nghĩa nó thành một lớp vô danh.
Sau đó, chuyển một thực thể triển khai của bạn
-tới phương pháp <code>View.set...Listener()</code> tương ứng. (Ví dụ, gọi
-<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
+tới phương pháp <code>View.set...Listener()</code> tương ứng. (Ví dụ, gọi
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
và chuyển cho nó triển khai {@link android.view.View.OnClickListener OnClickListener} của bạn.)</p>
<p>Ví dụ bên dưới cho biết cách đăng ký một đối tượng theo dõi khi nhấp cho một Nút. </p>
@@ -121,17 +121,17 @@
trả về, nhưng một số phương pháp đối tượng theo dõi sự kiện khác phải trả về một boolean. Lý do
này phụ thuộc vào sự kiện. Với số ít sự kiện thực hiện như vậy, sau đây là lý do:</p>
<ul>
- <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
- Trả về một boolean cho biết bạn đã xử lý sự kiện và sự kiện không nên được tiếp tục hay không.
- Cụ thể, trả về <em>true</em> để cho biết rằng bạn đã xử lý sự kiện và nó nên dừng ở đây;
+ <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
+ Trả về một boolean cho biết bạn đã xử lý sự kiện và sự kiện không nên được tiếp tục hay không.
+ Cụ thể, trả về <em>true</em> để cho biết rằng bạn đã xử lý sự kiện và nó nên dừng ở đây;
trả về <em>false</em> nếu bạn chưa xử lý nó và/hoặc sự kiện sẽ tiếp tục đối với bất kỳ
đối tượng theo dõi khi nhấp nào khác.</li>
- <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
+ <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
Trả về một boolean cho biết bạn đã xử lý sự kiện và sự kiện không nên được tiếp tục hay không.
- Cụ thể, trả về <em>true</em> sẽ cho biết rằng bạn đã xử lý sự kiện và nó nên dừng ở đây;
+ Cụ thể, trả về <em>true</em> sẽ cho biết rằng bạn đã xử lý sự kiện và nó nên dừng ở đây;
trả về <em>false</em> nếu bạn chưa xử lý nó và/hoặc sự kiện sẽ tiếp tục đối với bất kỳ
đối tượng theo dõi trên phím nào khác.</li>
- <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
+ <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
Trả về một boolean cho biết đối tượng theo dõi của bạn có xử lý sự kiện này hay không. Điều quan trọng đó là
sự kiện này có thể có nhiều hành động nối tiếp nhau. Vì vậy, nếu bạn trả về <em>false</em> khi
nhận được sự kiện hành động hướng xuống, bạn sẽ cho biết rằng mình chưa xử lý sự kiện và cũng
@@ -176,19 +176,19 @@
<li><code>{@link android.view.View#onTouchEvent}</code> - Được gọi khi xảy ra một sự kiện chuyển động màn hình cảm ứng.</li>
<li><code>{@link android.view.View#onFocusChanged}</code> - Được gọi khi dạng xem có hoặc mất tiêu điểm.</li>
</ul>
-<p>Có một số phương pháp khác mà bạn cần lưu ý, chúng không thuộc lớp Dạng xem,
-nhưng có thể tác động trực tiếp tới cách bạn có thể xử lý sự kiện. Vì thế, khi quản lý các sự kiện phức tạp hơn bên trong
+<p>Có một số phương pháp khác mà bạn cần lưu ý, chúng không thuộc lớp Dạng xem,
+nhưng có thể tác động trực tiếp tới cách bạn có thể xử lý sự kiện. Vì thế, khi quản lý các sự kiện phức tạp hơn bên trong
một bố trí, hãy xét những phương pháp khác sau:</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code> - Phương pháp này cho phép {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code> - Phương pháp này cho phép {@link
android.app.Activity} của bạn can thiệp vào tất cả sự kiện chạm trước khi chúng được phân phối tới cửa sổ.</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - Phương pháp này cho phép một {@link
android.view.ViewGroup} xem sự kiện khi chúng được phân phối tới Dạng xem con.</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - Gọi phương pháp
- này trên Dạng xem mẹ để cho biết rằng nó sẽ không can thiệp vào các sự kiện chạm bằng <code>{@link
+ này trên Dạng xem mẹ để cho biết rằng nó sẽ không can thiệp vào các sự kiện chạm bằng <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>.</li>
</ul>
@@ -199,7 +199,7 @@
mục nào sẽ chấp nhận nhập liệu. Tuy nhiên, nếu thiết bị có khả năng cảm ứng, và người dùng
bắt đầu tương tác với giao diện bằng cách chạm vào nó, khi đó không còn cần
tô sáng mục hay lấy tiêu điểm tới một Dạng xem cụ thể nữa. Do đó, có một chế độ cho
-tương tác có tên là "chế độ cảm ứng."
+tương tác có tên là "chế độ cảm ứng."
</p>
<p>
Đối với thiết bị có khả năng cảm ứng, sau khi người dùng chạm vào màn hình, thiết bị
@@ -214,7 +214,7 @@
với giao diện người dùng mà không chạm vào màn hình.
</p>
<p>
-Trạng thái chế độ cảm ứng sẽ được duy trì trên toàn bộ hệ thống (tất cả cửa sổ và hoạt động).
+Trạng thái chế độ cảm ứng sẽ được duy trì trên toàn bộ hệ thống (tất cả cửa sổ và hoạt động).
Để truy vấn trạng thái hiện tại, bạn có thể gọi
{@link android.view.View#isInTouchMode} để xem liệu thiết bị có đang ở trong chế độ cảm ứng hay không.
</p>
@@ -254,10 +254,10 @@
<p>Thông thưởng, trong bố trí thẳng đứng này, việc điều hướng lên từ Nút đầu tiên sẽ không
đi tới đâu hết và việc điều hướng xuống từ Nút thứ hai cũng vậy. Giờ thì khi Nút trên cùng
-đã định nghĩa Nút dưới cùng là <var>nextFocusUp</var> (và ngược lại), tiêu điểm điều hướng sẽ
+đã định nghĩa Nút dưới cùng là <var>nextFocusUp</var> (và ngược lại), tiêu điểm điều hướng sẽ
luân chuyển từ trên-xuống-dưới và dưới-lên-trên.</p>
-<p>Nếu bạn muốn khai báo một Dạng xem là có thể lấy tiêu điểm trong UI của mình (thông thường thì không),
+<p>Nếu bạn muốn khai báo một Dạng xem là có thể lấy tiêu điểm trong UI của mình (thông thường thì không),
hãy thêm thuộc tính XML <code>android:focusable</code> vào Dạng xem, trong khai báo bố trí của bạn.
Đặt giá trị <var>true</var>. Bạn cũng có thể khai báo một Dạng xem
là có thể lấy tiêu điểm trong khi ở Chế độ Cảm ứng bằng <code>android:focusableInTouchMode</code>.</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/vi/preview/api-overview.jd b/docs/html-intl/intl/vi/preview/api-overview.jd
deleted file mode 100644
index 0e2c35e..0000000
--- a/docs/html-intl/intl/vi/preview/api-overview.jd
+++ /dev/null
@@ -1,676 +0,0 @@
-page.title=Android N cho Nhà phát triển
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Các tính năng chính cho nhà phát triển</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">Hỗ trợ đa cửa sổ</a></li>
- <li><a href="#notification_enhancements">Thông báo</a></li>
- <li><a href="#jit_aot">Biên dịch JIT/AOT</a></li>
- <li><a href="#quick_path_to_app_install">Cài đặt ứng dụng nhanh chóng</a></li>
- <li><a href="#doze_on_the_go">Chế độ Ngủ sâu khi di chuyển</a></li>
- <li><a href="#background_optimizations">Tối ưu hóa chạy ngầm</a></li>
- <li><a href="#data_saver">Tiết kiệm dữ liệu</a></li>
- <li><a href="#tile_api">API cho ô Cài đặt nhanh</a></li>
- <li><a href="#number-blocking">Chặn số</a></li>
- <li><a href="#call_screening">Sàng lọc cuộc gọi</a></li>
- <li><a href="#multi-locale_languages">Bản địa và ngôn ngữ</a></li>
- <li><a href="#icu4">API ICU4J trong Android</a></li>
- <li><a href="#gles_32">API OpenGL ES 3.2</a></li>
- <li><a href="#android_tv_recording">Ghi lại trên Android TV</a></li>
- <li><a href="#android_for_work">Android cho Công việc</a></li>
- <li><a href="#accessibility_enhancements">Trợ năng</a></li>
- <li><a href="#direct_boot">Khởi động Trực tiếp</a></li>
- <li><a href="#key_attestation">Chứng thực khóa</a></li>
- <li><a href="#network_security_config">Cấu hình Bảo mật mạng</a></li>
- <li><a href="#default_trusted_ca">CA an toàn mặc định</a></li>
- <li><a href="apk_signature_v2">Lược đồ chữ ký số v2 cho tệp APK</a></li>
- <li><a href="#scoped_directory_access">Truy cập thư mục theo phạm vi</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N vẫn đang trong quá trình phát triển nhưng bây giờ bạn có thể dùng thử
-dưới dạng N Developer Preview. Các phần dưới đây sẽ nêu bật một số
-tính năng mới cho nhà phát triển. </p>
-
-<p>
- Bạn cần xem <a href="{@docRoot}preview/behavior-changes.html">Các thay đổi Hành vi</a> để biết được
- những phần thay đổi của nền tảng có thể ảnh hưởng đến ứng dụng của bạn, hãy xem
- các hướng dẫn cho nhà phát triển để biết thêm về những tính năng chính và tải xuống tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a> để biết chi tiết về
- các API mới.
-</p>
-
-<h2 id="multi-window_support">Hỗ trợ đa cửa sổ</h2>
-
-
-<p>Trong Android N, chúng tôi sẽ đưa vào nền tảng một tính năng đa nhiệm mới
- rất được mong đợi — hỗ trợ đa cửa sổ. </p>
-
- <p>Giờ đây người dùng có thể nhanh chóng mở đồng thời hai ứng dụng trên màn hình. </p>
- <ul>
- <li>Trên điện thoại và máy tính bảng
-chạy Android N, người dùng có thể chạy hai ứng dụng song song hai bên hoặc
- trên dưới trong chế độ chia đôi màn hình. Người dùng có thể thay đổi kích thước của ứng dụng bằng cách kéo
-thanh phân chia ở giữa. </li>
-
-<li>Trên thiết bị Android TV, các ứng dụng có thể tự đặt vào <a href="{@docRoot}preview/features/picture-in-picture.html">chế độ
-hình-trong-hình</a>, cho phép ứng dụng tiếp tục hiển thị nội dung khi người dùng duyệt web hoặc
-tương tác với ứng dụng khác. Hãy xem bên dưới để biết thêm thông tin. </li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>Hình 1.</strong> Các ứng dụng chạy trong chế độ chia màn hình.
-</p>
- </div>
-
-<p>Đặc biệt là trên máy tính bảng và các thiết bị màn hình lớn khác, việc hỗ trợ đa cửa sổ
-cho phép bạn mang lại những cách thức mới thu hút người dùng. Thậm chí bạn còn có thể cho phép kéo thả trong
-ứng dụng để người dùng kéo nội dung một cách thuận tiện vào hoặc ra ngoài ứng dụng của bạn — đây là một cách
-nâng cao trải nghiệm của người dùng rất hiệu quả. </p>
-
-<p>Thêm tính năng hỗ trợ đa màn hình vào ứng dụng của bạn và cấu hình cách thức
-xử lý hiển thị đa cửa sổ là điều rất đơn giản. Ví dụ, bạn có thể chỉ định kích thước
-tối thiểu cho phép của hoạt động, ngăn người dùng thay đổi kích thước của hoạt động nhỏ hơn
-kích thước đó. Bạn cũng có thể vô hiệu hóa hiển thị đa cửa sổ cho ứng dụng của mình, giúp
- đảm bảo hệ thống sẽ chỉ hiển thị ứng dụng của bạn ở chế độ toàn màn hình.</p>
-
-<p>
- Để biết thêm thông tin, hãy xem tài liệu cho nhà phát triển <a href="{@docRoot}preview/features/multi-window.html">Hỗ trợ đa cửa sổ</a>
-.
-</p>
-
-<h2 id="notification_enhancements">Cải tiến thông báo</h2>
-
-<p>Chúng tôi đã thiết kế lại thông báo trong Android N để chúng được sử dụng dễ dàng và nhanh
-hơn. Một số các thay đổi bao gồm:</p>
-
-<ul>
- <li>
- <strong>Cập nhật Mẫu</strong>: Chúng tôi đã cập nhật các mẫu thông báo để
- tạo điểm nhấn mới cho ảnh gây ấn tượng và ảnh đại diện. Nhà phát triển sẽ có thể
- tận dụng các mẫu mới nhưng chỉ cần thực hiện một số chỉnh sửa nhỏ trong mã nguồn của họ.
- </li>
-
- <li>
- <strong>Thông báo gộp</strong>: Hệ thống có thể nhóm các tin nhắn
- lại với nhau, ví dụ như theo chủ đề tin nhắn và hiển thị thành nhóm. Người dùng có thể
- thực hiện các thao tác như Hủy hoặc Lưu trữ chúng ngay tại chỗ. Nếu bạn từng
- triển khai các thông báo cho Android Wear thì bạn đã làm quen với
- mô hình này.
- </li>
-
- <li>
- <strong>Trả lời trực tiếp</strong>: Đối với những ứng dụng giao tiếp theo thời gian thực,
- hệ thống Android sẽ hỗ trợ trả lời ngay tại chỗ để người dùng có thể nhanh chóng phản hồi lại
- một tin nhắn SMS hoặc tin nhắn văn bản trực tiếp bên trong giao diện thông báo đó.
- </li>
-
- <li>
- <strong>Dạng xem tùy chỉnh</strong>: Hai API mới cho phép bạn sử dụng các trang trí
- hệ thống như tiêu đề và hành động của thông báo khi sử dụng các dạng xem
- tùy chỉnh trong thông báo.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>Hình 2.</strong> Thông báo gộp và trả lời trực tiếp.
-</p>
-
-<p>Hãy xem
- hướng dẫn về <a href="{@docRoot}preview/features/notification-updates.html">Thông báo</a>
- để biết cách triển khai các tính năng mới này.</p>
-
-
-
-<h2 id="jit_aot">Biên dịch JIT/AOT theo cấu hình</h2>
-
-<p>Trong Android N, chúng tôi đã bổ sung một trình biên dịch Just in Time (JIT) có mã được cấu hình cho
-ART, cho phép nó nâng cao hiệu năng của các ứng dụng Android tức thì khi
-chạy. Trình biên dịch JIT bổ trợ thêm cho trình biên dịch Ahead of Time (AOT) của ART
-và giúp cải hiện hiệu năng thời gian chạy, tiết kiệm không gian lưu trữ và tăng tốc độ các bản cập nhật của
-ứng dụng và cập nhật của hệ thống.</p>
-
-<p>Biên dịch theo cấu hình cho phép ART quản lý quá trình biên dịch AOT/JIT của từng ứng dụng
-tùy theo sử dụng thực tế cũng như các điều kiện trên thiết bị. Ví
-dụ, ART sẽ duy trì một cấu hình cho các phương thức hay dùng nhất của mỗi ứng dụng và có thể biên dịch trước
-rồi tạo bộ đệm cho các phương thức đó để có hiệu năng cao nhất. Những phần khác của ứng dụng
-sẽ được giữ nguyên không biên dịch cho đến khi chúng thực sự được sử dụng.</p>
-
-<p>Bên cạnh nâng cao hiệu năng cho các phần chính của ứng dụng, quá trình biên dịch
-theo cấu hình còn giúp giảm tổng lượng RAM được sử dụng của ứng dụng, bao gồm cả các
-tệp nhị phân liên quan. Tính năng này đặc biệt quan trọng trên các thiết bị ít bộ nhớ.</p>
-
-<p>ART sẽ quản lý quá trình biên dịch theo cấu hình bằng cách giảm tối thiểu tác động đến
-pin của thiết bị. Nó sẽ tiến hành quá trình biên dịch trước chỉ khi nào thiết bị nhàn rỗi và
-đang sạc, giúp tiết kiệm thời gian và pin bằng cách thực hiện công việc đó trước.</p>
-
-<h2 id="quick_path_to_app_install">Cài đặt ứng dụng nhanh chóng</h2>
-
-<p>Một trong những lợi ích dễ thấy nhất của trình biên dịch JIT của ART là tốc độ cài đặt
-ứng dụng và cập nhật hệ thống. Ngay cả các ứng dụng lớn cần vài phút để
-tối ưu và cài đặt trong Android 6.0 thì giờ đây có thể cài đặt chỉ trong một vài
-giây. Các cập nhật cho hệ thống cũng sẽ nhanh hơn vì không còn bước tối ưu hóa nữa. </p>
-
-<h2 id="doze_on_the_go">Chế độ Ngủ sâu khi di chuyển...</h2>
-
-<p>Chế độ Ngủ sâu đã được giới thiệu trong Android 6.0. Đây là một chế độ của hệ thống giúp tiết kiệm pin bằng cách trì hoãn
-các hoạt động CPU và mạng của ứng dụng khi thiết bị đang nhàn rỗi, ví dụ như khi thiết bị
-đang nằm trên bàn hoặc trong ngăn kéo. </p>
-
-<p>Giờ đây Chế độ Ngủ sâu trong Android N đã được cải tiến thêm và tiết kiệm pin ngay cả khi đang di chuyển.
-Bất kỳ khi nào màn hình đang tắt trong một khoảng thời gian và thiết bị không được cắm sạc thì
-Chế độ Ngủ sâu sẽ áp dụng tập con của các hạn chế CPU và mạng quen thuộc đối với các ứng dụng.
-Điều này có nghĩa là người dùng có thể tiết kiệm pin ngay cả khi đang mang thiết bị trong túi
-của họ.</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>Hình 3.</strong> Chế độ Ngủ sâu đang áp dụng
- các hạn chế để cải thiện thời lượng pin ngay cả khi thiết bị không được đặt một chỗ.
-</p>
-
-
-<p>Sau một khoảng thời gian ngắn khi màn hình tắt và thiết bị chỉ chạy bằng nguồn pin, Chế độ Ngủ sâu
-sẽ hạn chế truy cập mạng và trì hoãn các tác vụ, đồng bộ. Trong các khoảng thời gian
-bảo trì ngắn, các ứng dụng sẽ được phép truy cập mạng và mọi tác vụ/đồng bộ
-bị trì hoãn sẽ được thực thi. Bật màn hình hoặc cắm sạc vào thiết bị sẽ đưa
-thiết bị thoát khỏi Chế độ Ngủ sâu.</p>
-
-<p>Khi để thiết bị nằm một chỗ lần nữa với màn hình được tắt và chạy bằng pin trong một
-khoảng thời gian thì Chế độ Ngủ sâu sẽ áp dụng toàn bộ các hạn chế CPU và mạng đối với {@link
-android.os.PowerManager.WakeLock}, báo thức {@link android.app.AlarmManager} và quét
-GPS/Wi-Fi.</p>
-
-<p>Bạn có thể áp dụng các thực hành tốt nhất tương tự để điều chỉnh ứng dụng của mình cho Chế độ Ngủ sâu cho dù
-thiết bị có đang di chuyển hay đứng yên. Do đó, nếu bạn đã cập nhật ứng dụng để xử lý
-Chế độ Ngủ sâu một cách tinh tế thì bạn hoàn toàn yên tâm. Nếu không, hãy tiến hành <a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">làm cho
- ứng dụng thích ứng với Chế độ Ngủ sâu</a> ngay.</p>
-
-<h2 id="background_optimizations">Dự án Svelte: Tối ưu hóa chạy ngầm</h2>
-
-<p>Dự án Svelte là một nỗ lực liên tục nhằm tối giảm sử dụng RAM của hệ thống và các ứng dụng
-trên khắp hệ sinh thái các thiết bị Android. Trong Android N, dự án
-Svelte tập trung vào việc tối ưu hóa cách thức các ứng dụng chạy ngầm. </p>
-
-<p>Xử lý chạy ngầm là một phần quan trọng của hầu hết các ứng dụng. Khi sử dụng đúng cách, nó
-có thể giúp cho trải nghiệm người dùng của bạn trở nên tuyệt vời — tức thì, nhanh chóng và nhận biết được bối cảnh.
-Khi không sử dụng đúng cách, xử lý chạy ngầm có thể tiêu tốn RAM (và
-pin) một cách không cần thiết cũng như ảnh hưởng đến hiệu năng hệ thống cho các ứng dụng khác. </p>
-
-<p>Kể từ Android 5.0, {@link android.app.job.JobScheduler} đã trở thành
-cách thức được ưu tiên để thực hiện công việc chạy ngầm thích hợp
-cho người dùng. Ứng dụng có thể lên lịch cho các tác vụ trong khi cho phép hệ thống tối ưu hóa dựa trên
-các điều kiện về bộ nhớ, nguồn điện và kết nối. JobScheduler đem lại khả năng kiểm soát và
-sự đơn giản, và chúng tôi muốn mọi ứng dụng đều sử dụng nó. </p>
-
-<p>
- Một giải pháp hiệu quả khác là <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GCMNetworkManager</code></a>, thuộc một phần của Dịch vụ Google Play, cho phép
- lên lịch tác vụ tương tự với khả năng tương thích trên các phiên bản Android
- cũ.
-</p>
-
-<p>Chúng tôi đang tiếp tục kế thừa <code>JobScheduler</code> và
-<code>GCMNetworkManager</code> để đáp ứng nhiều hơn
-các trường hợp sử dụng của bạn — ví dụ như trong Android N giờ đây bạn đã có thể lên lịch cho công việc
-chạy ngầm dựa vào những thay đổi trong các Trình cung cấp Nội dung. Đồng thời, chúng tôi đang tiến hành
-loại bỏ một số mẫu cũ có thể làm giảm hiệu năng hệ thống,
-đặc biệt trên các thiết bị ít bộ nhớ.</p>
-
-<p>Trong Android N, chúng tôi sẽ loại bỏ ba truyền phát không biểu thị được sử dụng phổ biến —
-{@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} và {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} — bởi vì các truyền phát này có thể đánh thức
-các tiến trình chạy ngầm của nhiều ứng dụng cùng lúc và sử dụng quá mức bộ nhớ và pin. Nếu
-ứng dụng của bạn đang nhận các truyền phát này thì hãy tận dụng N Developer Preview để
- chuyển sang <code>JobScheduler</code> và các API liên quan khác thay thế. </p>
-
-<p>
- Hãy xem tài liệu <a href="{@docRoot}preview/features/background-optimization.html">Tối ưu hóa
- Chạy ngầm</a> để biết thêm chi tiết.
-</p>
-
-
-<h2 id="data_saver">Tiết kiệm dữ liệu</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>Hình 4.</strong> Tính năng Tiết kiệm dữ liệu trong mục Settings.
-</p>
- </div>
-
-<p>Trong vòng đời của một thiết bị di động thì chi phí gói cước dữ liệu di động về cơ bản
-sẽ cao hơn giá thành của chính thiết bị đó. Đối với nhiều người dùng, dữ liệu di động là một
-tài nguyên đắt đỏ họ muốn sử dụng tiết kiệm. </p>
-
-<p>Android N đã đưa vào chế độ Tiết kiệm dữ liệu, một dịch vụ hệ thống mới giúp giảm
-sử dụng dữ liệu di động, cho dù là chuyển vùng, gần đến kỳ thanh toán cước,
-hoặc trên một gói dữ liệu trả trước khiêm tốn. Tiết kiệm dữ liệu cho người dùng kiểm soát cách thức ứng dụng
-sử dụng dữ liệu di động và cho phép nhà phát triển cung cấp dịch vụ hiệu quả hơn khi Tiết kiệm
-dữ liệu được bật. </p>
-
-<p>Khi người dùng bật Tiết kiệm dữ liệu trong <strong>Settings</strong> và thiết bị đang
-sử dụng một mạng có đo lưu lượng thì hệ thống sẽ chặn việc sử dụng dữ liệu chạy ngầm và truyền tín hiệu cho ứng dụng
-để sử dụng ít dữ liệu hơn ở tiền cảnh bất cứ khi nào có thể — chẳng hạn như bằng cách giới hạn
-bit rate để truyền phát, giảm chất lượng hình ảnh, trì hoãn tạo trước bộ đệm để tối ưu,
-v.v. Người dùng có thể lập danh sách các ứng dụng cụ thể được phép sử dụng
-dữ liệu có tính lưu lượng được chạy ngầm ngay cả khi Tiết kiệm dữ liệu được bật.</p>
-
-<p>Android N mở rộng lớp {@link android.net.ConnectivityManager} để cung cấp cho các ứng dụng một
-cách thức <a href="{@docRoot}preview/features/data-saver.html#status">truy xuất
-các tùy chọn Tiết kiệm dữ liệu của người dùng</a> và <a href="{@docRoot}preview/features/data-saver.html#monitor-changes">theo dõi
-các thay đổi của tùy chọn</a>. Mọi ứng dụng cần kiểm tra xem người dùng đó đã bật Tiết kiệm
-Dữ liệu hay chưa và cố gắng giới hạn sử dụng dữ liệu chạy ở tiền cảnh và chạy ngầm.</p>
-
-
-<h2 id="tile_api">API cho ô Cài đặt nhanh</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>Hình 5.</strong> Các ô Cài đặt nhanh trong vùng hiển thị thông báo.
-</p>
-
-
- </div><p>Cài đặt nhanh là một cách phổ biến và đơn giản để hiển thị các cài đặt và hành động quan trọng,
-trực tiếp từ khu vực thông báo. Trong Android N, chúng tôi đã mở rộng phạm vi của
-Cài đặt nhanh để khiến nó trở nên hữu ích và thuận tiện hơn nữa. </p>
-
-<p>Chúng tôi đã thêm không gian cho các ô Cài đặt nhanh mà người dùng có thể
-truy cập trên toàn bộ một vùng hiển thị được phân trang bằng cách vuốt sang trái hoặc phải. Chúng tôi cũng
-cho người dùng kiểm soát những ô Cài đặt nhanh nào sẽ xuất hiện và vị trí xuất hiện
-của chúng — người dùng chỉ cần kéo và thả để thêm hoặc di chuyển các ô. </p>
-
-<p>Đối với nhà phát triển, Android N cũng bổ sung một API mới cho phép định nghĩa các ô
- Cài đặt nhanh của riêng bạn giúp người dùng dễ dàng truy cập tới các điều khiển và hành động quan trọng trong ứng dụng của bạn.</p>
-
-<p>
- Các ô Cài đặt nhanh được dành riêng cho các điều khiển hoặc hành động
- khẩn cấp hoặc thường xuyên được sử dụng, không nên dùng làm lối tắt để
- khởi chạy một ứng dụng.
-</p>
-
-<p>
- Một khi đã định nghĩa các ô của mình bạn có thể làm nổi chúng lên trước người dùng để họ có thể thêm
- các ô này vào Cài đặt nhanh bằng cách chỉ cần kéo và thả.
-</p>
-
-<p>
- Để biết thêm thông tin về việc tạo một ô ứng dụng, hãy xem
- <code>android.service.quicksettings.Tile</code> trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a> có thể tải xuống.
-</p>
-
-
-
-<h2 id="number-blocking">Chặn số</h2>
-
-<p>Android N đã hỗ trợ chặn số điện thoại trong nền tảng này và cung cấp một
- API khuôn khổ cho phép các nhà cung cấp dịch vụ duy trì một danh sách số bị chặn.
-Ứng dụng SMS mặc định, ứng dụng gọi điện mặc định và các ứng dụng của nhà cung cấp có thể đọc và
-ghi vào danh sách số bị chặn. Các ứng dụng khác không thể truy cập vào danh sách này.</p>
-
-<p>Thông qua việc đưa chặn số thành một tính năng tiêu chuẩn của nền tảng, Android sẽ cung cấp
-cách thức thống nhất để các ứng dụng hỗ trợ chặn số trên một loạt các
-thiết bị. Những lợi ích mà ứng dụng có thể tận dụng gồm:</p>
-
-<ul>
- <li> Số bị chặn cuộc gọi cũng sẽ bị chặn tin nhắn văn bản
- <li> Số bị chặn có thể được duy trì qua các lần thiết lập lại và qua nhiều thiết bị thông qua tính năng Sao lưu &
-Khôi phục
- <li> Nhiều ứng dụng có thể sử dụng cùng một danh sách số bị chặn
-</ul>
-
-<p>Ngoài ra, việc tích hợp ứng dụng của nhà mạng thông qua Android cũng đồng nghĩa là các nhà mạng có thể
-đọc danh sách số bị chặn trên thiết bị và thực hiện chặn số từ phía nhà cung cấp dịch vụ
-cho người dùng để ngăn các cuộc gọi và tin nhắn văn bản không mong muốn tiếp cận người dùng
-thông qua bất kỳ phương tiện nào, ví dụ như điểm cuối VOIP hoặc điện thoại chuyển cuộc gọi.</p>
-
-<p>
- Để biết thêm thông tin, hãy xem <code>android.provider.BlockedNumberContract</code>
- trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo
- API</a> có thể tải xuống.
-</p>
-
-<h2 id="call_screening">Sàng lọc cuộc gọi</h2>
-
-<p>
- Android N cho phép ứng dụng gọi điện mặc định sàng lọc các cuộc gọi đến. Ứng dụng
- gọi điện thực hiện điều này bằng cách thực thi <code>CallScreeningService</code> mới,
- cho phép ứng dụng gọi điện thực hiện một số hành động dựa trên
- {@link android.telecom.Call.Details Call.Details} của cuộc gọi đến như:
-</p>
-
-<ul>
- <li> Từ chối cuộc gọi đến
- <li> Không cho phép cuộc gọi lưu trong nhật ký cuộc gọi
- <li> Không hiển thị thông báo về cuộc gọi cho người dùng
-</ul>
-
-<p>
- Để biết thêm thông tin, hãy xem <code>android.telecom.CallScreeningService</code>
- trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo
- API</a> có thể tải xuống.
-</p>
-
-
-<h2 id="multi-locale_languages">Hỗ trợ đa bản địa, thêm nhiều ngôn ngữ</h2>
-
-
-<p>Android N cho phép người dùng chọn <strong>đa bản địa</strong> trong Settings,
-để hỗ trợ tốt hơn cho các trường hợp song ngữ. Các ứng dụng có thể sử dụng
-một API mới để truy xuất các bản địa được chọn của người dùng và sau đó mang đến
-trải nghiệm người dùng tinh tế hơn cho người dùng đa bản địa — như hiển thị các kết quả tìm kiếm bằng
-nhiều ngôn ngữ và không yêu cầu dịch các trang web sang ngôn ngữ mà
-người dùng đã biết.</p>
-
-<p>Ngoài hỗ trợ đa bản địa, Android N cũng mở rộng danh sách các ngôn ngữ
-khả dụng đối với người dùng. Nền tảng này cung cấp hơn 25 biến thể cho các ngôn ngữ
-được sử dụng phổ biến như Tiếng Anh, Tây Ban Nha, Pháp và Ả-rập. Nó cũng bổ sung hỗ trợ
-một phần cho hơn 100 ngôn ngữ mới.</p>
-
-<p>Các ứng dụng có thể truy xuất danh sách bộ bản địa theo người dùng bằng cách gọi <code>LocaleList.GetDefault()</code>. Để hỗ trợ số lượng bản địa mở rộng, Android N đang thay đổi cách thức
-phân giải tài nguyên. Hãy đảm bảo bạn kiểm tra và xác minh rằng ứng dụng của mình
-đang hoạt động như mong muốn theo lô-gic phân giải tài nguyên mới này.</p>
-
-<p>Để tìm hiểu về hành vi phân giải tài nguyên mới và các thực hành tốt nhất bạn nên
-thực hiện theo, hãy xem mục <a href="{@docRoot}preview/features/multilingual-support.html">Hỗ trợ đa ngôn ngữ</a>.</p>
-
-<h2 id="icu4">API ICU4J trong Android</h2>
-
-<p>
- Android N đã cung cấp một tập nhỏ các API <a href="http://site.icu-project.org/">ICU4J</a> trong khuôn khổ Android thuộc
- gói <code>android.icu</code>. Việc chuyển nhập sang rất dễ dàng và hầu hết chỉ liên quan đến
- việc đổi từ không gian tên <code>com.java.icu</code> thành
- <code>android.icu</code>. Nếu bạn đang sử dụng gói ICU4J trong ứng dụng
- của mình thì việc chuyển đổi sang các API <code>android.icu</code> được cung cấp trong khuôn khổ
- Android có thể giúp làm giảm đáng kể kích thước của tệp APK.
-</p>
-
-<p>
- Để tìm hiểu thêm về API ICU4J trên Android, hãy xem <a href="{@docRoot}preview/features/icu4j-framework.html">Hỗ trợ ICU4J</a>.
-</p>
-
-
-
-<h2 id="gles_32">API OpenGL™ ES 3.2</h2>
-
-<p>Android N bổ sung các giao diện khuôn khổ và hỗ trợ nền tảng cho OpenGL ES 3.2, bao gồm:</p>
-
-<ul>
- <li> Mọi phần mở rộng trong <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Gói Tiện ích mở rộng Android</a></a> (AEP) ngoại trừ <code>EXT_texture_sRGB_decode</code>
- <li> Bộ đệm khung hình dấu chấm động cho HDR và tạo bóng trì hoãn.
- <li> Các lệnh vẽ BaseVertex cho phép chia gói và truyền phát hiệu quả hơn.
- <li> Kiểm soát truy cập bộ đệm mạnh mẽ để giảm phí tổn quản lý của WebGL.
-</ul>
-
-<p>API khuôn khổ cho OpenGL ES 3.2 trên Android N được cung cấp với lớp
-<code>GLES32</code>. Khi sử dụng OpenGL ES 3.2, hãy đảm bảo khai báo
-yêu cầu trong tệp bản kê khai của bạn bằng thẻ <code><uses-feature></code> và
-thuộc tính <code>android:glEsVersion</code>. </p>
-
-<p>Để biết thông tin về sử dụng OpenGL ES, bao gồm cách kiểm tra phiên bản
- OpenGL ES được hỗ trợ của thiết bị tại thời gian chạy, hãy xem mục <a href="{@docRoot}guide/topics/graphics/opengl.html">Hướng dẫn API OpenGL ES</a>.</p>
-
-
-<h2 id="android_tv_recording">Ghi lại trên Android TV</h2>
-
-<p>Android N bổ sung khả năng ghi và phát lại nội dung từ các dịch vụ
-nguồn vào của Android TV thông qua các API ghi lại. Được xây dựng dựa trên các API
-chuyển dịch thời gian sẵn có, các dịch vụ nguồn vào TV có thể kiểm soát dữ liệu của kênh nào được phép ghi lại, cách thức
-lưu trữ các phiên được ghi lại cũng như quản lý tương tác của người dùng với nội dung ghi lại. </p>
-
-<p>Để biết thêm thông tin, hãy xem <a href="{@docRoot}preview/features/tv-recording-api.html">API ghi lại của Android TV</a>.</p>
-
-
-<h2 id="android_for_work">Android cho Công việc</h2>
-
-<p>Android cho Công việc bổ sung nhiều tính năng mới và các API cho thiết bị chạy Android N.
-Dưới đây là một số điểm nổi bật — để xem danh sách đầy đủ các cập nhật của Android N
-liên quan đến Android cho Công việc, vui lòng xem Các thay đổi của Android cho Công việc.</p>
-
-<h3 id="work_profile_security_challenge">Thử thách bảo mật cấu hình công việc </h3>
-
-<p>
- Người sở hữu cấu hình có thể chỉ định một thử thách bảo mật riêng cho các ứng dụng đang chạy trong
- cấu hình công việc. Thử thách công việc được hiển thị khi người dùng cố gắng mở
- bất kỳ ứng dụng công việc nào. Hoàn tất thành công thử thách bảo mật sẽ mở khóa
- cấu hình công việc và giải mã nó nếu cần. Đối với người sở hữu cấu hình,
- <code>ACTION_SET_NEW_PASSWORD</code> sẽ yêu cầu người dùng đặt một thử thách
- công việc và <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> sẽ yêu cầu
- người dùng đặt khóa thiết bị.
-</p>
-
-<p>
- Người sở hữu cấu hình có thể đặt các chính sách mật khẩu riêng biệt cho thử thách công việc
- (như độ dài mã PIN cần thiết hoặc có thể sử dụng dấu vân tay
- để mở khóa cấu hình hay không) bằng <code>setPasswordQuality()</code>,
- <code>setPasswordMinimumLength()</code> và các phương thức liên quan. Người sở hữu
- cấu hình cũng có thể cài khóa thiết bị bằng thực thể <code>DevicePolicyManager</code>
- được trả về bởi phương thức <code>getParentProfileInstance()</code> mới.
- Ngoài ra, người sở hữu cấu hình có thể tùy chỉnh màn hình xác thực thông tin cho
- thử thách công việc bằng các phương thức <code>setOrganizationColor()</code> và
- <code>setOrganizationName()</code> mới.
-</p>
-<h3 id="turn_off_work">Tắt công việc </h3>
-
-<p>Trên một thiết bị có cấu hình công việc, người dùng có thể bật hoặc tắt chế độ công việc. Khi chế độ công việc được
-tắt người dùng được quản lý sẽ tạm thời bị tắt, khiến vô hiệu hóa các ứng dụng
-cấu hình công việc, đồng bộ chạy ngầm và các thông báo. Điều này bao gồm cả ứng dụng
-của người sở hữu cấu hình. Khi chế độ công việc bị tắt, hệ thống sẽ hiển thị biểu tượng
-trạng thái liên tục để nhắc người dùng đó rằng họ không thể khởi chạy các ứng dụng công việc. Trình khởi chạy
-sẽ chỉ báo rằng các ứng dụng và widget công việc không khả dụng. </p>
-
-<h3 id="always_on_vpn">VPN luôn bật </h3>
-
-<p>Người sở hữu thiết bị và người sở hữu cấu hình có thể đảm bảo rằng những ứng dụng công việc luôn kết nối
-thông qua một VPN chỉ định. Hệ thống sẽ tự động khởi động VPN đó sau khi
-thiết bị khởi động.</p>
-
-<p>
- Các phương thức <code>DevicePolicyManager</code> mới gồm
- <code>setAlwaysOnVpnPackage()</code> và
- <code>getAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>Do các dịch vụ VPN có thể được gắn kết trực tiếp bởi hệ thống mà không cần tương tác
-của ứng dụng, các máy khách VPN cần xử lý các điểm bắt đầu cho VPN luôn bật. Giống
-trước đây, các dịch vụ được chỉ định tới hệ thống bằng một bộ lọc ý định phù hợp với
-hành động <code>android.net.VpnService</code>. </p>
-
-<p>
- Người dùng cũng có thể đặt thủ công các máy khách VPN luôn bật có cài đặt các phương thức
- <code>VPNService</code> trong người dùng chính bằng
- <strong>Settings>More>Vpn</strong>.
-</p>
-
-<h2 id="accessibility_enhancements">Cải tiến trợ năng</h2>
-
-<p>Android N nay đã hỗ trợ Cài đặt Khả năng nhìn trực tiếp trên màn hình Chào mừng khi thiết lập
-thiết bị mới. Điều này giúp người dùng rất dễ dàng khám phá và cấu hình
-các tính năng trợ năng trên thiết bị của họ, bao gồm cử chỉ phóng đại, cỡ
-phông chữ, kích thước hiển thị và TalkBack. </p>
-
-<p>Với các tính năng trợ năng được bố trí ngày càng dễ thấy hơn, khi được bật
-khả năng người dùng sẽ thử ứng dụng của bạn sẽ cao hơn. Hãy đảm bảo bạn kiểm thử ứng dụng của mình
-trước với các cài đặt này được bật. Bạn có thể bật chúng trong Settings >
-Accessibility.</p>
-
-<p>Ngoài ra, trong Android N, các dịch vụ trợ năng đã có thể trợ giúp người dùng bị các tổn thương
-vận động chạm vào màn hình. API mới cho phép xây dựng các dịch vụ với những
-tính năng như theo dõi chuyển động của khuôn mặt, theo dõi chuyển động của mắt, quét điểm, v.v. nhằm
-đáp ứng nhu cầu những người dùng này.</p>
-
-<p>Để biết thêm thông tin, hãy xem <code>android.accessibilityservice.GestureDescription</code>
- trong tài liệu <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a> có thể tải xuống.</p>
-
-
-<h2 id="direct_boot">Khởi động Trực tiếp</h2>
-
-<p>Khởi động Trực tiếp cải thiện thời gian khởi động của thiết bị và cho phép các ứng dụng
-đã đăng ký có chức năng hạn chế ngay cả sau khi khởi động lại ngoài dự kiến.
-Ví dụ, nếu một thiết bị được mã hóa khởi động lại khi người dùng đang ngủ thì
-báo thức, tin nhắn và các cuộc gọi đến đã đăng ký có thể tiếp tục thông báo
-cho người dùng như thường lệ. Điều này cũng có nghĩa là các dịch vụ trợ năng cũng sẽ
- khả dụng ngay sau khi khởi động xong.</p>
-
-<p>Khởi động Trực tiếp sử dụng mã hóa theo tệp trong Android N
-để bật các chính sách mã hóa chi tiết cho cả dữ liệu của hệ thống và ứng dụng.
-Hệ thống sẽ sử dụng một bộ lưu trữ mã hóa thiết bị cho dữ liệu hệ thống được chọn và dữ liệu ứng dụng
-đã đăng ký công khai. Theo mặc định, một bộ lưu trữ mã hóa thông tin xác thực sẽ được sử dụng cho mọi
- dữ liệu hệ thống, dữ liệu người dùng, ứng dụng và dữ liệu của ứng dụng khác. </p>
-
-<p>Trong quá trình khởi động, hệ thống sẽ khởi động vào chế độ hạn chế và chỉ có quyền truy cập tới
-dữ liệu mã hóa thiết bị mà thôi, và không có quyền truy cập thông thường tới ứng dụng hoặc dữ liệu.
-Nếu bạn có các thành phần muốn chạy trong chế độ này thì bạn có thể đăng ký
-chúng bằng cách đặt cờ trong bản kê khai. Sau khi khởi động, hệ thống sẽ kích hoạt
-các thành phần đã đăng ký bằng cách truyền phát ý định <code>LOCKED_BOOT_COMPLETED</code>
-. Hệ thống sẽ đảm bảo cho dữ liệu mã hóa thiết bị đã đăng ký sẽ khả dụng
-trước khi mở khóa. Mọi dữ liệu khác sẽ không khả dụng cho tới khi Người dùng xác nhận thông tin xác thực trên màn hình khóa
- của họ để giải mã nó. </p>
-
-Để biết thêm thông tin, hãy xem <a href="{@docRoot}preview/features/direct-boot.html">Khởi động Trực tiếp</a>.</p>
-</p>
-
-
-<h2 id="key_attestation">Chứng thực khóa</h2>
-
-<p>Các bộ lưu trữ khóa dựa trên phần cứng cung cấp một phương thức an toàn hơn rất nhiều để tạo, lưu trữ,
-và sử dụng các khóa mật mã trên thiết bị Android. Chúng bảo vệ các khóa trước
-nhân Linux, trước các lỗ hổng bảo mật tiềm tàng của Android và trước việc trích xuất
-từ các máy bị giành quyền điều khiển và bị can thiệp vào các tệp hệ thống (máy bị root).</p>
-
-<p>Android N đã đưa ra tính năng Chứng thực khóa để sử dụng các bộ lưu trữ khóa dựa trên phần cứng một cách
- dễ dàng và bảo mật hơn. Các ứng dụng và dịch vụ không thuộc thiết bị có thể sử dụng Chứng thực
-khóa để xác định chắc chắn xem một cặp khóa RSA hoặc EC có
-dựa trên phần cứng hay không, các đặc điểm của cặp khóa đó là gì và
- các ràng buộc nào được áp dụng cho việc sử dụng và tính hợp lệ của cặp khóa đó. </p>
-
-<p>Các ứng dụng và dịch vụ không thuộc thiết bị có thể yêu cầu thông tin về một cặp khóa
-thông qua chứng chỉ chứng thực X.509. Chứng chỉ này phải được ký bởi một khóa
-chứng thực hợp lệ. Khóa chứng thực là một khóa ký ECDSA, được
-đưa vào bộ lưu trữ khóa dựa trên phần cứng của thiết bị tại nhà máy.
-Do đó, một chứng chỉ chứng thực được ký bởi khóa
-chứng thực hợp lệ sẽ xác nhận sự tồn tại của bộ lưu trữ khóa dựa trên phần cứng, kèm theo
- chi tiết về các cặp khóa trong bộ lưu trữ khóa đó.</p>
-
-<p>Để chắc chắn thiết bị đang sử dụng ảnh
-Android bảo mật, chính thức từ nhà máy, Chứng thực khóa yêu cầu <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a>
- của thiết bị cung cấp thông tin sau cho <a class="external-link" href="https://source.android.com/security/trusty/index.html">Môi trường Thực thi
- An toàn (TEE)</a>:</p>
-
-<ul>
-<li>Phiên bản HĐH và cấp vá lỗi được cài đặt trên thiết bị</li>
-<li>Khóa công khai <a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Khởi động được xác thực</a> và trạng thái khóa</li>
- </ul>
-
-<p>Để biết thêm thông tin về tính năng bộ lưu trữ khóa dựa trên phần cứng,
-hãy xem hướng dẫn <a href="https://source.android.com/security/keystore/" class="external-link">Bộ lưu trữ khóa dựa trên phần cứng</a>.</p>
-
-<p>Ngoài Chứng thực khóa, Android N cũng giới thiệu
- các khóa dựa vào vân tay mà không được thu hồi khi đăng ký vân tay.</p>
-
-<h2 id="network_security_config">Cấu hình Bảo mật mạng</h2>
-
-<p>Trong Android N, các ứng dụng có thể tùy biến hành vi của các kết nối
-bảo mật (HTTPS, TLS) của chúng một cách an toàn mà không cần chỉnh sửa mã nhờ sử dụng khai báo
-<em>Cấu hình Bảo mật mạng</em> thay vì sử dụng các API lập trình truyền thống
-dễ xảy ra lỗi (vd: X509TrustManager).</p>
-
- <p>Các tính năng được hỗ trợ:</p>
-<ul>
-<li><b>Nguồn tin cậy tùy chỉnh.</b> Cho phép một ứng dụng tùy chỉnh
-Nhà cung cấp chứng chỉ (CA) nào sẽ được tin cậy cho các kết nối bảo mật của ứng dụng. Ví
-dụ, tin cậy các chứng chỉ tự ký cụ thể hoặc một bộ giới hạn các CA công khai.
-</li>
-<li><b>Chỉ khống chế khi gỡ lỗi.</b> Cho phép nhà phát triển ứng dụng an toàn gỡ lỗi
-các kết nối bảo mật của ứng dụng mà không tạo thêm rủi ro cho phần cơ sở
-đã cài đặt.
-</li>
-<li><b>Không sử dụng truyền gửi văn bản chưa mã hóa.</b> Cho phép một ứng dụng tự bảo vệ mình khỏi việc
-vô tình sử dụng truyền gửi văn bản chưa mã hóa cleartext.</li>
-<li><b>Ghim chứng chỉ.</b> Một tính năng nâng cao cho phép một ứng dụng
- giới hạn các khóa máy chủ nào là an toàn đối với các kết nối bảo mật.</li>
-</ul>
-
-<p>Để biết thêm thông tin, hãy xem <a href="{@docRoot}preview/features/security-config.html">Cấu hình Bảo mật
- mạng</a>.</p>
-
-<h2 id="default_trusted_ca">Nhà cung cấp Chứng chỉ An toàn mặc định</h2>
-
-<p>Theo mặc định, các ứng dụng nhắm mục tiêu Android N chỉ tin cậy các chứng chỉ do hệ thống cấp
-và không còn tin cậy các Nhà cung cấp chứng chỉ (CA) do người dùng thêm vào. Các ứng dụng nhắm mục tiêu Android
-N muốn tin cậy các CA do người dùng thêm vào nên sử dụng
-<a href="{@docRoot}preview/features/security-config.html">Cấu hình Bảo mật mạng</a> để
-chỉ định cách thức tin cậy các CA của người dùng.</p>
-
-<h2 id="apk_signature_v2">Lược đồ chữ ký số v2 cho tệp APK</h2>
-
-<p>Lớp PackageManager nay đã hỗ trợ xác thực ứng dụng bằng Lược đồ chữ ký số v2
-APK. Lược đồ chữ ký số v2 APK là một lược đồ chữ ký số trên toàn bộ tệp
-làm tăng đáng kể tốc độ xác thực và tăng cường sự bảo đảm
- toàn vẹn bằng cách phát hiện các thay đổi trái phép đối với các tệp APK.</p>
-
-<p>Để bảo đảm tương thích ngược, một tệp APK phải được ký bằng lược đồ
-chữ ký số v1 (Lược đồ chữ ký số JAR) trước khi được ký bằng lược đồ chữ ký số v2.
-Với lược đồ chữ ký số v2, quá trình xác thực sẽ thất bại nếu bạn ký tệp APK bằng một
- chứng chỉ khác sau khi ký bằng lược đồ v2. </p>
-
-<p>Hỗ trợ cho lược đồ chữ ký số v2 cho tệp AKP sẽ có sau trong N Developer
-Preview.</p>
-
-<h2 id="scoped_directory_access">Truy cập thư mục theo phạm vi</h2>
-
-<p>Trong Android N, ứng dụng có thể sử dụng các API mới để yêu cầu truy cập vào các thư mục <a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">bộ nhớ lưu trữ
-ngoài</a> riêng, bao gồm các thư mục trên phương tiện có thể tháo ra như thẻ
-SD. Các API mới đã tối giản cách thức ứng dụng của bạn truy cập các thư mục lưu trữ ngoài
-tiêu chuẩn như thư mục <code>Pictures</code>. Các ứng dụng
-như ứng dụng quản lý ảnh có thể sử dụng các API này thay vì sử dụng
-<code>READ_EXTERNAL_STORAGE</code> để cấp quyền truy cập tới mọi thư mục
-lưu trữ, hoặc Khuôn khổ Truy cập Lưu trữ để giúp người dùng di chuyển tới
-thư mục đó.</p>
-
-<p>Ngoài ra, các API mới này cũng đơn giản hóa các bước mà người dùng thực hiện để cấp quyền truy cập
-bộ nhớ lưu trữ ngoài cho ứng dụng của bạn. Khi bạn sử dụng các API mới, hệ thống sẽ sử dụng một UI cấp quyền
-đơn giản cung cấp các thông tin chi tiết rõ ràng về thư mục nào ứng dụng đang
-yêu cầu quyền truy cập.</p>
-
-<p>Để biết thêm thông tin, hãy xem tài liệu cho nhà phát triển
-<a href="{@docRoot}preview/features/scoped-folder-access.html">Truy cập
-Thư mục theo Phạm vi</a>.</p>
-
-
-
-
-
-
diff --git a/docs/html-intl/intl/vi/preview/behavior-changes.jd b/docs/html-intl/intl/vi/preview/behavior-changes.jd
deleted file mode 100644
index 2c287504..0000000
--- a/docs/html-intl/intl/vi/preview/behavior-changes.jd
+++ /dev/null
@@ -1,480 +0,0 @@
-page.title=Các thay đổi Hành vi
-page.keywords=preview,sdk,compatibility
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Trong tài liệu này</h2>
-
-<ol>
- <li><a href="#perf">Cải thiện Hiệu năng</a>
- <ol>
- <li><a href="#doze">Chế độ Ngủ sâu</a></li>
- <li><a href="#bg-opt">Tối ưu hóa Chạy ngầm</a></li>
- </ol>
- </li>
- <li><a href="#perm">Thay đổi Quyền</a></li>
- <li><a href="#accessibility">Cải thiện Trợ năng</a>
- <ol>
- <li><a href="#screen-zoom">Thu phóng Màn hình</a></li>
- <li><a href="#vision-settings">Cài đặt Khả năng nhìn trong Trình Thiết lập</a></li>
- </ol>
- </li>
- <li><a href="#ndk">Liên kết Ứng dụng NDK với Thư viện Nền tảng</a></li>
- <li><a href="#afw">Android cho Công việc</a></li>
-</ol>
-
-<h2>Xem thêm</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">
- Tổng quan về API Android N</a></li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Với các tính năng và khả năng mới, Android N
- cũng có một số các thay đổi hành vi của hệ thống và API. Tài liệu
- này nêu bật một số các thay đổi quan trọng mà bạn cần biết và cân nhắc cho
- ứng dụng của mình.
-</p>
-
-<p>
- Nếu bạn đã từng phát hành ứng dụng cho Android, hãy lưu ý rằng các thay đổi
- trong nền tảng này có thể tác động đến ứng dụng của bạn.
-</p>
-
-
-<h2 id="perf">Cải thiện Hiệu năng</h2>
-
-<p>
- Android N có chứa các thay đổi hành vi của hệ thống nhằm cải thiện thời lượng
- pin của thiết bị, sử dụng RAM và hiệu năng ứng dụng. Các thay đổi này có thể tác động đến
- tính khả dụng của tài nguyên và các thông báo hệ thống đối tới ứng dụng. Bạn
- nên tìm hiểu các thay đổi này và đánh giá xem ứng dụng cần phải điều chỉnh như thế nào đối với
- các thay đổi.
-</p>
-
-<h3 id="doze">Chế độ Ngủ sâu</h3>
-
-<p>
- Được đưa vào Android 6.0 (Mức API 23), Chế độ Ngủ sâu cải thiện thời lượng pin bằng cách
- trì hoãn các hoạt động của CPU và mạng khi người dùng không cắm sạc,
- không di chuyển và tắt màn hình thiết bị. Android N
- thêm các cải tiến cho Chế độ Ngủ sâu bằng cách sử dụng một tập con các hạn chế của CPU và mạng
- khi thiết bị không được cắm sạc với màn hình bị tắt, nhưng không nhất thiết
- phải để một chỗ, ví dụ như một thiết bị cầm tay di chuyển trong túi của người dùng.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>Hình 1.</strong> Minh họa cách thức Chế độ Ngủ sâu áp dụng ở cấp đầu tiên của
- các hạn chế hoạt động hệ thống nhằm cải thiện thời lượng pin.
-</p>
-
-<p>
- Khi một thiết bị dùng nguồn điện từ pin và màn hình bị tắt trong một khoảng thời gian
- nhất định, thiết bị sẽ chuyển vào Chế độ Ngủ sâu và áp dụng tập con đầu tiên của các hạn chế: Nó
- sẽ ngắt truy cập mạng của ứng dụng và trì hoãn các tác vụ và các đồng bộ. Nếu thiết bị
- được đặt một chỗ trong một khoảng thời gian nhất định sau khi vào Chế độ Ngủ sâu thì hệ thống sẽ áp dụng
- các hạn chế còn lại của Chế độ Ngủ sâu thành {@link android.os.PowerManager.WakeLock}, báo thức
-{@link android.app.AlarmManager}, GPS, quét Wi-Fi. Cho dù
- một số hoặc tất cả các hạn chế của Chế độ Ngủ sâu có được áp dụng hay không thì hệ thống sẽ đánh thức
- thiết bị trong các khoảng thời gian bảo trì ngắn, trong đó các ứng dụng được phép
- truy cập mạng và có thể thực thi mọi tác vụ/đồng bộ bị trì hoãn.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>Hình 2.</strong> Minh họa cách Chế độ Ngủ sâu áp dụng cấp thứ hai của
- các hạn chế hoạt động hệ thống sau khi thiết bị được đặt một chỗ trong một khoảng thời gian nhất định.
-</p>
-
-<p>
- Lưu ý rằng việc bật màn hình hoặc cắm sạc sẽ đưa thiết bị thoát Chế độ Ngủ sâu và
- loại bỏ các hạn chế xử lý này. Hành vi bổ sung này không
- ảnh hưởng đến các khuyến nghị và các thực hành tốt nhất khi thích ứng cho ứng dụng của bạn với phiên bản
- Chế độ Ngủ sâu được đưa vào Android 6.0 (API mức 23) trước đó, như mô tả trong
- <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
- Tối ưu hóa Chế độ Ngủ sâu và Chế độ Chờ của Ứng dụng</a>. Bạn nên tiếp tục
- làm theo các khuyến nghị đó, ví dụ như sử dụng Google Cloud Messaging (GCM) để
- gửi và nhận tin nhắn, và hãy tiến hành áp dụng các bản cập nhật để nhận
- hành vi Chế độ Ngủ sâu bổ sung.
-</p>
-
-
-<h3 id="bg-opt">Dự án Svelte: Tối ưu hóa Chạy ngầm</h3>
-
-<p>
- Android N gỡ bỏ ba truyền phát không biểu thị để giúp tối ưu hóa cả
- việc sử dụng bộ nhớ lẫn tiêu thụ điện năng. Thay đổi này là điều cần thiết bởi các truyền phát
- không biểu thị thường xuyên khởi động các ứng dụng đã được đăng ký để lắng nghe chúng dưới
- nền. Gỡ bỏ các truyền phát này có thể đem lại lợi ích lớn đối với hiệu năng
- của thiết bị và trải nghiệm người dùng.
-</p>
-
-<p>
- Các thiết bị di động thường xuyên gặp phải những thay đổi về kết nối, chẳng hạn như khi di chuyển
- giữa Wi-Fi và dữ liệu di động. Hiện tại, các ứng dụng có thể theo dõi những thay đổi về
- kết nối bằng cách đăng ký một bộ thu truyền phát cho {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} không biểu thị trong bản kê khai
- của chúng. Vì nhiều ứng dụng đăng ký để nhận truyền phát này do đó một hoạt động chuyển mạng
- duy nhất cũng có thể khiến tất cả các ứng dụng thức dậy và xử lý truyền phát đó ngay
- lập tức.
-</p>
-
-<p>
- Tương tự, các ứng dụng có thể đăng ký nhận truyền phát {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} và {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} không biểu thị từ các ứng dụng khác, ví dụ như
-ứng dụng Camera. Khi một người dùng chụp ảnh với ứng dụng Camera thì những ứng dụng này sẽ thức dậy
- để xử lý truyền phát đó.
-</p>
-
-<p>
- Để loại bỏ các vấn đề này, Android N áp dụng các cách tối ưu hóa
- sau:
-</p>
-
-<ul>
- <li>Ứng dụng nhắm mục tiêu Android N sẽ không nhận các truyền phát {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION}, ngay cả khi chúng
- có các mục nhập của trong bản kê khai yêu cầu thông báo về các sự kiện này. Những ứng dụng đang chạy
- ở tiền cảnh vẫn có thể lắng nghe {@code CONNECTIVITY_CHANGE} qua
- luồng chính của chúng nếu yêu cầu thông báo bằng {@link
- android.content.BroadcastReceiver}.
- </li>
-
- <li>Ứng dụng không thể gửi hoặc nhận các truyền phát {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} hoặc {@link
- android.hardware.Camera#ACTION_NEW_VIDEO}. Cách tối ưu này
- tác động đến mọi ứng dụng, không chỉ các ứng dụng nhắm mục tiêu Android N.
- </li>
-</ul>
-
-<p>
- Các lần phát hành Android sau này có thể loại bỏ thêm các truyền phát không biểu thị, cũng
- như các dịch vụ chạy ngầm không còn liên kết. Vì lý do này, bạn nên tránh dùng hoặc
- gỡ bỏ các phụ thuộc trên các bộ thu được khai báo trong bản kê khai đối với các truyền phát không biểu thị,
- cũng như các dịch vụ chạy ngầm.
-</p>
-
-<p>
- Khuôn khổ Android cung cấp một số giải pháp để giảm thiểu sự cần thiết đối với
- các truyền phát không biểu thị hoặc các dịch vụ chạy ngầm này. Ví dụ, API {@link
- android.app.job.JobScheduler} cung cấp một cơ chế lên lịch hiệu quả
- cho các hoạt động mạng khi đáp ứng các điều kiện được chỉ định, ví dụ như kết nối tới một
- mạng không đo lưu lượng. Bạn còn có thể sử dụng {@link
- android.app.job.JobScheduler} để phản ứng lại các thay đổi đối với trình cung cấp nội dung.
-</p>
-
-<p>
- Để biết thêm thông tin về thay đổi hành vi này và cách thích ứng ứng dụng của bạn,
- hãy xem <a href="{@docRoot}preview/features/background-optimization.html">Tối ưu hóa
- Chạy ngầm</a>.
-</p>
-
-
-<h2 id="perm">Thay đổi Quyền</h2>
-
-<p>
- Android N có các thay đổi đối với quyền có thể tác động đến ứng dụng của bạn,
- bao gồm các quyền tài khoản người dùng và một quyền mới cho phép ghi vào
- bộ nhớ ngoài. Sau đây là phần tóm tắt các quyền đã thay đổi trong
- bản xem trước:
-</p>
-
-<ul>
- <li>{@code GET_ACCOUNTS} (Bị loại bỏ)
- <p>
- Quyền GET_ACCOUNTS nay đã bị loại bỏ. Hệ thống sẽ bỏ qua quyền
- này đối với các ứng dụng nhắm mục tiêu Android N.
- </p>
- </li>
-
-</ul>
-
-
-
-<h2 id="accessibility">Cải thiện Trợ năng</h2>
-
-<p>
- Android N có các thay đổi nhằm nâng cao khả năng sử dụng
- của nền tảng cho những người dùng có thị lực kém hoặc khiếm thị. Nhìn chung, các thay đổi này sẽ không
- yêu cầu thay đổi mã nguồn trong ứng dụng của bạn. Tuy nhiên, bạn cần xem lại
- các tính năng này và kiểm thử chúng với ứng dụng của mình để đánh giá các tác động tiềm tàng đối với trải nghiệm
- người dùng.
-</p>
-
-
-<h3 id="screen-zoom">Thu phóng Màn hình</h3>
-
-<p>
- Android N cho phép người dùng đặt <strong>Display size</strong> để phóng to
- hoặc thu nhỏ tất cả các phần tử trên màn hình, nhờ đó cải thiện trợ năng của thiết bị
- cho những người dùng có thị lực kém. Người dùng không thể thu phóng màn hình vượt quá chiều rộng màn hình
- tối thiểu <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
- sw320dp</a>. Đây là chiều rộng của Nexus 4, một máy điện thoại phổ biến có kích cỡ trung bình.
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>Hình 3.</strong> Màn hình bên phải hiển thị tác động của
- việc tăng kích cỡ Hiển thị của một thiết bị đang chạy ảnh hệ thống Android N.
-</p>
-
-
-<p>
- Khi mật độ của thiết bị thay đổi, hệ thống sẽ thông báo cho các ứng dụng đang chạy theo
- những cách sau:
-</p>
-
-<ul>
- <li>Nếu một ứng dụng nhắm mục tiêu mức API 23 hoặc thấp hơn thì hệ thống sẽ tự động tắt
- tất cả các tiến trình chạy ngầm của ứng dụng đó. Điều này có nghĩa là nếu một người dùng rời khỏi
- ứng dụng đó để mở màn hình <em>Settings</em> và thay đổi
- <strong>Display size</strong> thì hệ thống sẽ tắt ứng dụng giống
- như trong trường hợp thiết bị thiếu bộ nhớ. Nếu ứng dụng đó có bất kỳ tiến trình nào
- chạy ở tiền cảnh thì hệ thống sẽ thông báo cho các tiến trình đó về thay đổi cấu hình như
- mô tả trong <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý
- Thay đổi Thời gian chạy</a>, giống như hướng của thiết bị vừa thay đổi.
- </li>
-
- <li>Nếu ứng dụng nhắm mục tiêu Android N thì mọi tiến trình của nó
- (chạy ở tiền cảnh và chạy ngầm) đều được thông báo về thay đổi cấu hình như
- mô tả trong <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý
- Thay đổi Thời gian chạy</a>.
- </li>
-</ul>
-
-<p>
- Hầu hết các ứng dụng không cần thực hiện bất kỳ thay đổi nào để hỗ trợ tính năng này, miễn là
- các ứng dụng đó tuân theo các thực hành tốt nhất của Android. Những điều cụ thể cần kiểm tra:
-</p>
-
-<ul>
- <li>Kiểm thử ứng dụng của bạn trên một thiết bị có chiều rộng màn hình <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
- và đảm bảo nó hoạt động đúng.
- </li>
-
- <li>Khi cấu hình của thiết bị thay đổi, hãy cập nhật mọi thông tin được lưu trữ trong bộ đệm
- phụ thuộc vào mật độ, ví dụ như các ảnh bitmap được lưu đệm hoặc các tài nguyên được tải từ
- mạng. Hãy kiểm tra các thay đổi cấu hình khi ứng dụng khôi phục từ trạng thái
- tạm dừng.
- <p class="note">
- <strong>Lưu ý:</strong> Nếu bạn lưu trữ trong bộ đệm các dữ liệu phụ thuộc vào cấu hình thì nên
- thêm siêu dữ liệu liên quan như kích cỡ
- màn hình phù hợp hoặc mật độ điểm ảnh cho dữ liệu đó. Việc lưu siêu dữ liệu này cho phép bạn
- quyết định liệu bạn có cần phải làm mới dữ liệu được lưu trữ đệm sau khi một cấu hình
- thay đổi.
- </p>
- </li>
-
- <li>Tránh chỉ định các kích thước theo đơn vị px vì chúng không thay đổi tỉ lệ theo
- mật độ màn hình. Thay vào đó, hãy chỉ định các kích thước bằng các đơn vị <a href="{@docRoot}guide/practices/screens_support.html">điểm ảnh
- độc lập với mật độ</a> (<code>dp</code>).
- </li>
-</ul>
-
-<h3 id="vision-settings">Cài đặt Khả năng nhìn trong Trình Thiết lập</h3>
-
-<p>
- Android N có Cài đặt Khả năng nhìn trên màn hình Chào mừng, nơi người dùng có thể
- thiết lập các cài đặt trợ năng sau đây trên một thiết bị mới:
- <strong>Magnification gesture</strong>, <strong>Font size</strong>,
- <strong>Display size</strong> và <strong>TalkBack</strong>. Thay đổi này
- sẽ tăng khả năng thấy được các khiếm khuyết liên quan đến những cài đặt màn hình khác nhau. Để
- đánh giá tác động của tính năng này, bạn có thể kiểm thử ứng dụng của mình với các
- cài đặt sau được bật. Bạn có thể tìm các cài đặt này trong <strong>Settings >
- Accessibility</strong>.
-</p>
-
-<h2 id="ndk">Liên kết Ứng dụng NDK với Thư viện Nền tảng</h2>
-
-<p>
- Android N có các thay đổi đối với không gian tên để ngăn việc tải các API không công khai.
- Nếu bạn sử dụng NDK, bạn chỉ nên sử dụng các API công khai từ nền tảng
- Android. Sử dụng các API không công khai trong bản phát hành chính thức tiếp theo của Android
- có thể khiến ứng dụng bị treo.
-</p>
-
-<p>
- Để cảnh báo cho bạn việc sử dụng các API không công khai, các ứng dụng chạy trên thiết bị
- Android N sẽ tạo ra một lỗi trong phần xuất ra của logcat khi một ứng dụng gọi một API không công khai.
- Lỗi này cũng được hiển thị trên màn hình thiết bị dưới dạng thông báo để hỗ trợ
- nâng cao nhận biết đối với tình huống này. Bạn nên xem lại mã của ứng dụng để
- gỡ bỏ phần sử dụng các API nền tảng không công khai và kiểm thử kỹ lưỡng ứng dụng bằng
- một thiết bị hoặc bộ giả lập của bản xem trước.
-</p>
-
-<p>
- Nếu ứng dụng của bạn phụ thuộc vào các thư viện của nền tảng, hãy xem tài liệu NDK để biết
- các cách khắc phục cơ bản nhằm thay thế các API không công khai bằng các API công khai tương ứng.
- Bạn cũng có thể liên kết với các thư viện của nền tảng mà không nhận biết ứng dụng,
- đặc biệt nếu ứng dụng của bạn sử dụng thư viện thuộc một phần của nền tảng (như
- <code>libpng</code>), nhưng không thuộc NDK. Trong trường hợp đó, hãy đảm bảo rằng
- tệp APK của bạn có chứa tất cả các tệp .so bạn dự định liên kết với.
-</p>
-
-<p class="caution">
- <strong>Cẩn trọng:</strong> Một số thư viện của bên thứ ba có thể liên kết với các API
- không công khai. Nếu ứng dụng của bạn sử dụng các thư viện này thì ứng dụng của bạn có thể gặp lỗi sụp đổ khi đang chạy
- trong lần phát hành Android chính thức kế tiếp.
-</p>
-
-<p>
- Các ứng dụng không nên phụ thuộc vào hoặc sử dụng các thư viện gốc không kèm theo trong
- NDK bởi vì chúng có thể thay đổi hoặc bị gỡ bỏ khỏi khi phát hành bản Android khác
- thay cho bản cũ. Việc chuyển từ OpenSSL sang BoringSSL là một ví dụ về sự thay đổi đó.
- Ngoài ra, các thiết bị khác nhau có thể cung cấp các mức độ tương thích khác nhau bởi
- không có yêu cầu nào về khả năng tương thích cho các thư viện nền tảng không đi kèm với
- NDK. Nếu bạn buộc phải sử dụng các thư viện không thuộc NDK trên các thiết bị cũ, hãy thực hiện
- quá trình tải phụ thuộc vào mức Android API.
-</p>
-
-<p>
- Nhằm giúp bạn chẩn đoán các loại vấn đề này, sau đây là một số lỗi Java và NDK
- ví dụ bạn có thể gặp phải khi cố dựng ứng dụng với Android N:
-</p>
-
-<p>Ví dụ lỗi Java:</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>Ví dụ lỗi NDK:</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- Sau đây là một số cách khắc phục đối với ứng dụng gặp phải các kiểu lỗi này:
-</p>
-
-<ul>
- <li>Việc sử dụng getJavaVM và getJNIEnv trong libandroid_runtime.so có thể được thay
- bằng các hàm JNI chuẩn:
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>Việc sử dụng ký hiệu {@code property_get} trong {@code libcutils.so} có thể được
- thay bằng phương thức {@code __system_property_get} công khai thay thế.
- Để làm điều này, hãy dùng {@code __system_property_get} với câu lệnh include sau:
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>Việc sử dụng ký hiệu {@code SSL_ctrl} trong {@code libcrypto.so} nên được
- thay bằng một ký hiệu cục bộ của ứng dụng. Ví dụ, bạn nên liên kết tĩnh
- {@code libcyrpto.a} trong tệp {@code .so} hoặc thêm tham chiếu
- {@code libcrypto.so} động của riêng mình từ BoringSSL hoặc OpenSSL trong ứng dụng của bạn.
- </li>
-</ul>
-
-<h2 id="afw">Android cho Công việc</h2>
-<p>
- Android N có các thay đổi cho ứng dụng nhắm mục tiêu Android cho Công việc, bao gồm
- các thay đổi đối với cài đặt chứng chỉ, đặt lại mật khẩu, quản lý người dùng
- thứ hai và truy cập các mã định danh của thiết bị. Nếu bạn đang dựng các ứng dụng dành cho
- các môi trường Android cho Công việc thì bạn nên xem lại các thay đổi này và chỉnh sửa
- ứng dụng của mình cho phù hợp.
-</p>
-
-<ul>
- <li>Bạn phải cài đặt một trình cài đặt chứng chỉ ủy thác trước khi DPC có thể đặt
- nó. Đối với cả ứng dụng người sở hữu cấu hình và ứng dụng người sở hữu thiết bị nhắm mục tiêu SDK N, bạn cần
- cài đặt trình cài đặt chứng chỉ ủy thác trước khi trình kiểm soát
- chính sách của thiết bị (DPC) gọi
- <code>DevicePolicyManager.setCertInstallerPackage()</code>. Nếu trình cài đặt
- chưa được cài thì hệ thống sẽ đưa ra một
- <code>IllegalArgumentException</code>.
- </li>
-
- <li>Giờ đây các hạn chế đặt lại mật khẩu cho người quản lý thiết bị sẽ áp dụng với người sở hữu
- cấu hình. Người quản lý thiết bị không thể sử dụng
- <code>DevicePolicyManager.resetPassword()</code> được nữa để xóa mật khẩu hoặc thay đổi
- các mật khẩu đã đặt. Người quản lý thiết bị vẫn có thể đặt một mật khẩu nhưng chỉ
- khi thiết bị không có mật khẩu, mã PIN hoặc mẫu hình.
- </li>
-
- <li>Người sở hữu thiết bị hoặc cấu hình có thể quản lý các tài khoản ngay cả khi các hạn chế được
- đặt. Người sở hữu thiết bị và người sở hữu cấu hình có thể gọi các API Quản lý tài khoản
- ngay cả khi các hạn chế người dùng <code>DISALLOW_MODIFY_ACCOUNTS</code> đã có sẵn.
- </li>
-
- <li>Người sở hữu thiết bị có thể quản lý những người dùng thứ cấp dễ dàng hơn. Khi một thiết bị
- đang chạy trong chế độ người sở hữu thiết bị, hạn chế <code>DISALLOW_ADD_USER</code>
- sẽ được đặt tự động. Điều này ngăn người dùng tạo các người dùng
- thứ cấp không được quản lý. Ngoài ra, các phương thức <code>CreateUser()</code> và
- <code>createAndInitial()</code> đã bị loại bỏ; phương thức
-<code>DevicePolicyManager.createAndManageUser()</code> mới sẽ thay thế chúng.
- </li>
-
- <li>Người sở hữu thiết bị có thể truy cập các mã định danh của thiết bị. Một người sở hữu thiết bị có thể truy cập
- địa chỉ MAC của Wi-Fi của một thiết bị, bằng phương thức
- <code>DevicePolicyManagewr.getWifiMacAddress()</code>. Nếu Wi-Fi chưa từng
- được bật trên thiết bị đó thì phương thức này sẽ trả về một giá trị {@code null}.
- </li>
-</ul>
-
-<p>
- Để biết thêm thông tin về các thay đổi đối với Android cho Công việc trong Android N, hãy xem
- <a href="{@docRoot}preview/features/afw.html">Cập nhật của Android cho Công việc</a>.
-</p>
-
-<h2 id="other">Các điểm quan trọng khác</h2>
-
-<ul>
-<li>Khi một ứng dụng đang chạy trên Android N nhưng nhắm mục tiêu mức API thấp hơn,
-và người dùng thay đổi kích cỡ hiển thị thì tiến trình của ứng dụng sẽ bị tắt. Ứng dụng
-phải có khả năng xử lý tình huống này một cách tinh tế. Nếu không, ứng dụng sẽ bị lỗi sụp đổ
-khi người dùng khôi phục nó từ mục Gần đây.
-
-<p>
-Bạn cần kiểm thử ứng dụng để đảm bảo
-rằng hành vi này không xảy ra.
-Bạn có thể thực hiện điều đó bằng cách gây ra một lỗi sụp đổ giống vậy
-khi tắt ứng dụng một cách thủ công qua DDMS.
-</p>
-
-<p>
-Các ứng dụng nhắm mục tiêu N và cao hơn sẽ không bị tắt tự động khi có các thay đổi về mật độ;
-tuy nhiên, chúng có thể phản hồi khó khăn đối với các thay đổi cấu hình.
-</p>
-</li>
-
-<li>
-Các ứng dụng trên Android N cần có khả năng xử lý các thay đổi cấu hình một cách tinh tế,
-và không bị lỗi sụp đổ trong các lần khởi động tiếp theo. Bạn có thể kiểm tra hành vi ứng dụng
-bằng cách thay đổi kích cỡ phông chữ (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>), và sau đó khôi phục
-ứng dụng từ mục Gần đây.
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/vi/preview/download.jd b/docs/html-intl/intl/vi/preview/download.jd
deleted file mode 100644
index f6aa7cc..0000000
--- a/docs/html-intl/intl/vi/preview/download.jd
+++ /dev/null
@@ -1,541 +0,0 @@
-page.title=Kiểm thử trên Thiết bị
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Trước khi tải xuống và cài đặt các thành phần của
- Android Preview SDK, bạn phải đồng ý với các điều khoản và
- điều kiện sau.</p>
-
- <h2 class="norule">Điều khoản và Điều kiện</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-Đây là Thỏa thuận Cấp phép Android SDK Preview (gọi là “Thỏa thuận Cấp phép”).
-
-1. Giới thiệu
-
-1.1 Android SDK Preview (trong Thỏa thuận Cấp phép này gọi là “Preview” và cụ thể bao gồm các tệp hệ thống Android, các API dạng gói, và các tệp thư viện Preview, nếu và khi nào chúng được cung cấp) được cấp phép cho bạn theo các điều khoản của Thỏa thuận Cấp phép này. Thỏa thuận Cấp phép này hợp thành một hợp đồng ràng buộc pháp lý giữa bạn và Google liên quan đến việc bạn sử dụng Preview.
-
-1.2 "Android" có nghĩa là chồng phần mềm Android cho thiết bị, được cung cấp theo Dự án Nguồn mở Android, nằm ở địa chỉ URL sau: http://source.android.com/, được cập nhật trong từng thời kỳ.
-
-1.3 “Tương thích Android” nghĩa là bất cứ triển khai Android nào (i) tuân thủ theo tài liệu Định nghĩa Tính tương thích Android, có thể được tìm thấy tại trang web về tính tương thích Android (http://source.android.com/compatibility) và có thể được cập nhật theo thời gian; và (ii) vượt qua thành công Gói Kiểm tra Tính tương thích Android (CTS).
-
-1.4 "Google" có nghĩa là Google Inc., một công ty ở Delaware với trụ sở kinh doanh chính tại 1600 Amphitheatre Parkway, Mountain View, CA 94043, Hoa Kỳ.
-
-2. Chấp thuận Thỏa thuận Cấp phép
-
-2.1 Để sử dụng Preview, trước tiên bạn phải đồng ý với Thỏa thuận Cấp phép. Bạn không được sử dụng Preview nếu không chấp nhận Thỏa thuận Cấp phép này.
-
-2.2 Bằng việc nhấp vào chấp nhận và/hoặc sử dụng Preview, theo đây bạn đồng ý với các điều khoản của Thỏa thuận Cấp phép này.
-
-2.3 Bạn không được sử dụng Preview và không được chấp nhận Thỏa thuận Cấp phép nếu bạn là người bị cấm nhận Preview theo pháp luật của Hoa Kỳ hoặc các quốc gia khác bao gồm quốc gia nơi bạn cư trú hoặc nơi mà bạn sử dụng Preview từ đó.
-
-2.4 Nếu bạn sẽ sử dụng Preview trong nội bộ công ty hoặc tổ chức của bạn thì bạn đồng ý chịu ràng buộc bởi Thỏa thuận Cấp phép này đại diện cho bên tuyển dụng của mình hoặc đơn vị khác, và bạn tuyên bố và bảo đảm rằng bạn có đầy đủ thẩm quyền pháp lý để ràng buộc bên tuyển dụng của mình hoặc đơn vị đó với Thỏa thuận Cấp phép này. Nếu bạn không có thẩm quyền cần thiết, bạn không được chấp nhận Thỏa thuận Cấp phép này hoặc sử dụng Preview đại diện cho bên tuyển dụng của mình hoặc đơn vị khác.
-
-3. Giấy phép Preview từ Google
-
-3.1 Tùy thuộc vào các điều khoản của Thỏa thuận Cấp phép này, Google cấp cho bạn một giấy phép giới hạn, toàn cầu, miễn phí sử dụng, không thể chuyển nhượng, không độc quyền và không thể cấp phép lại để sử dụng Preview cho mục đích duy nhất là phát triển các ứng dụng cho các triển khai Android tương thích.
-
-3.2 Bạn không được sử dụng Preview này để phát triển các ứng dụng cho các nền tảng khác (bao gồm các triển khai Android không tương thích) hoặc để phát triển một bộ SDK khác. Bạn dĩ nhiên được phát triển các ứng dụng cho các nền tảng khác, bao gồm các triển khai Android không tương thích, miễn là Preview này không được sử dụng cho mục đích đó.
-
-3.3 Bạn đồng ý rằng Google hoặc các bên thứ ba sở hữu tất cả quyền, quyền sở hữu hoặc lợi ích hợp pháp trong và đối với Preview, bao gồm bất kỳ Quyền Sở hữu Trí tuệ nào nằm trong Preview. "Quyền Sở hữu Trí tuệ" có nghĩa là bất kỳ và tất cả các quyền theo luật về bằng sáng chế, luật về bản quyền, luật về bí mật thương mại, luật về nhãn hiệu thương mại và bất kỳ và tất cả các quyền sở hữu khác. Google bảo lưu tất cả các quyền không được cấp phép rõ ràng cho bạn.
-
-3.4 Bạn không được sử dụng Preview cho bất kỳ mục đích nào không được cho phép rõ ràng bởi Thỏa thuận Cấp phép này. Trừ trường hợp được yêu cầu bởi giấy phép của bên thứ ba có liên quan, bạn không được: (a) sao chép (trừ trường hợp sao lưu), sửa đổi, điều chỉnh cho phù hợp, phân phối lại, biên dịch ngược, kỹ thuật đảo ngược, phân rã, hoặc tạo sản phẩm phái sinh từ Preview hay bất kỳ phần nào của Preview; hoặc (b) tải bất kỳ phần nào của Preview lên một thiết bị cầm tay di động hoặc bất kỳ thiết bị phần cứng nào khác ngoại trừ máy tính cá nhân, kết hợp bất kỳ phần nào của Preview với phần mềm khác, hay phân phối bất kỳ phần mềm hay thiết bị nào tích hợp một phần của Preview.
-
-3.5 Việc sử dụng, tái tạo lại và phân phối các thành phần của Preview được cấp phép theo một giấy phép phần mềm nguồn mở được chi phối chủ yếu bởi các điều khoản của giấy phép phần mềm nguồn mở đó chứ không phải Thỏa thuận Cấp phép này. Bạn đồng ý duy trì một giấy phép có uy tín liên quan đến các giấy phép phần mềm mã nguồn mở theo tất cả các quyền được cấp và phải tránh bất kỳ hành động nào có thể chấm dứt, đình chỉ hoặc vi phạm các quyền đó.
-
-3.6 Bạn đồng ý rằng hình thức và tính chất của Preview mà Google cung cấp có thể thay đổi mà không có thông báo trước cho bạn và rằng các phiên bản sau này của Preview có thể không tương thích với các ứng dụng được phát triển trên những phiên bản trước của Preview. Bạn đồng ý rằng Google có thể ngừng (vĩnh viễn hoặc tạm thời) việc cung cấp Preview (hoặc bất kỳ tính năng nào trong Preview) cho bạn hoặc cho người dùng nói chung toàn quyền theo quyết định của Google, mà không cần thông báo trước cho bạn.
-
-3.7 Không có bất cứ nội dung nào trong Thỏa thuận Cấp phép này trao cho bạn quyền sử dụng bất kỳ tên thương mại, thương hiệu, dấu hiệu dịch vụ, logo, tên miền, hoặc các tính năng nhãn hiệu đặc biệt nào khác.
-
-3.8 Bạn đồng ý rằng bạn sẽ không gỡ bỏ, che đậy, hoặc sửa đổi bất kỳ thông báo quyền sở hữu nào (bao gồm các thông báo về bản quyền và thương hiệu) mà có thể gắn với hoặc có trong Preview.
-
-4. Việc Bạn sử dụng Preview
-
-4.1 Google đồng ý rằng không có bất cứ nội dung nào trong Thỏa thuận Cấp phép này cấp cho Google bất cứ quyền, quyền sở hữu hay lợi ích nào từ bạn (hay bên cấp phép của bạn) theo Thỏa thuận Cấp phép này trong hoặc đối với bất kỳ ứng dụng phần mềm nào mà bạn phát triển bằng cách sử dụng Preview, bao gồm bất kỳ quyền sở hữu trí tuệ nào nằm trong những ứng dụng đó.
-
-4.2 Bạn đồng ý sử dụng Preview và viết ứng dụng chỉ cho các mục đích được cho phép bởi (a) Thỏa thuận Cấp phép này và (b) bất kỳ luật, quy định hoặc thực hành áp dụng nào hoặc hướng dẫn được chấp nhận chung ở các vùng tài phán liên quan (bao gồm bất kỳ luật nào về việc xuất dữ liệu hoặc phần mềm đến và từ Hoa Kỳ hoặc các quốc gia có liên quan khác).
-
-4.3 Bạn đồng ý rằng nếu bạn sử dụng Preview để phát triển ứng dụng, bạn sẽ bảo vệ quyền riêng tư và các quyền hợp pháp của người dùng. Nếu người dùng cung cấp cho bạn tên người dùng, mật khẩu hoặc thông tin đăng nhập hay thông tin cá nhân khác, bạn phải thông báo cho người dùng rằng thông tin sẽ có sẵn cho ứng dụng của bạn, và bạn phải cung cấp thông báo về quyền riêng tư và sự bảo vệ thỏa đáng về mặt pháp lý cho những người dùng đó. Nếu ứng dụng của bạn lưu trữ thông tin cá nhân hoặc nhạy cảm được cung cấp bởi người dùng, ứng dụng phải làm vậy một cách bảo mật. Nếu người dùng cung cấp cho bạn thông tin về Tài khoản Google, ứng dụng của bạn chỉ được sử dụng thông tin đó để truy cập Tài khoản Google của người dùng khi, và chỉ cho các mục đích giới hạn mà mỗi người dùng đã cấp phép cho bạn để thực hiện.
-
-4.4 Bạn đồng ý rằng bạn sẽ không tham gia vào bất kỳ hoạt động nào với Preview, bao gồm việc phát triển hoặc phân phối một ứng dụng, mà can thiệp vào, làm gián đoạn, gây thiệt hại, hoặc truy cập một cách trái phép vào máy chủ, mạng hoặc tài sản hay dịch vụ khác của Google hoặc bất kỳ bên thứ ba nào.
-
-4.5 Bạn đồng ý rằng bạn hoàn toàn chịu trách nhiệm về (và rằng Google không có trách nhiệm đối với bạn hay bất kỳ bên thứ ba nào về) bất kỳ dữ liệu, nội dung hay tài nguyên nào mà bạn tạo lập, truyền hoặc hiển thị thông qua Android và/hoặc các ứng dụng cho Android, và về hậu quả của những hành động của bạn (bao gồm bất kỳ tổn thất hay thiệt hại nào mà Google có thể phải gánh chịu) bởi việc làm như vậy.
-
-4.6 Bạn đồng ý rằng bạn hoàn toàn chịu trách nhiệm về (và rằng Google không có trách nhiệm đối với bạn hay bất kỳ bên thứ ba nào về) bất kỳ sự vi phạm nào đối với các nghĩa vụ của bạn theo Thỏa thuận Cấp phép này, bất kỳ hợp đồng với bên thứ ba áp dụng nào hoặc các Điều khoản Dịch vụ, hoặc bất kỳ luật hay quy định áp dụng nào, và về hậu quả của những hành động của bạn (bao gồm bất kỳ tổn thất hay thiệt hại nào mà Google hoặc bất kỳ bên thứ ba nào có thể phải gánh chịu) do bất kỳ sự vi phạm nào như vậy.
-
-4.7 Preview đang được phát triển, và việc kiểm thử và phản hồi của bạn là một phần quan trọng trong quá trình phát triển này. Bằng việc sử dụng Preview, bạn thừa nhận rằng việc triển khai một số tính năng vẫn còn đang được phát triển và rằng bạn không nên dựa vào Preview có đầy đủ chức năng của một phiên bản ổn định. Bạn đồng ý không công khai phân phối hoặc gửi bất kỳ ứng dụng nào bằng Preview này bởi Preview này sẽ không còn được hỗ trợ sau khi Android SDK bản chính thức được phát hành.
-
-5. Thông tin Xác thực Nhà phát triển của bạn
-
-5.1 Bạn đồng ý rằng bạn chịu trách nhiệm duy trì tính bảo mật của bất kỳ thông tin xác thực nhà phát triển nào mà có thể được phát hành cho bạn bởi Google hoặc bạn có thể tự chọn và rằng bạn sẽ hoàn toàn chịu trách nhiệm về tất cả ứng dụng được phát triển theo thông tin xác thực nhà phát triển của bạn.
-
-6. Quyền riêng tư và Thông tin
-
-6.1 Để tiếp tục đổi mới và cải thiện Preview, Google có thể thu thập một số thống kê về sử dụng từ phần mềm bao gồm nhưng không giới hạn mã định danh duy nhất, địa chỉ IP liên kết, số phiên bản của phần mềm, và thông tin về những công cụ và/hoặc dịch vụ trong Preview đang được sử dụng và chúng đang được sử dụng như thế nào. Trước khi bất kỳ thông tin nào được thu thập, Preview sẽ thông báo cho bạn và xin phép sự đồng ý của bạn. Nếu bạn từ chối cho phép, thông tin sẽ không được thu thập.
-
-6.2 Dữ liệu thu thập được kiểm tra chung để cải thiện Preview và được duy trì theo Chính sách Quyền riêng tư của Google tại http://www.google.com/policies/privacy/.
-
-7. Ứng dụng của Bên thứ ba
-
-7.1 Nếu bạn sử dụng Preview để chạy các ứng dụng được phát triển bởi một bên thứ ba hoặc truy cập dữ liệu, nội dung hoặc tài nguyên được cung cấp bởi một bên thứ ba, bạn đồng ý rằng Google không chịu trách nhiệm về những ứng dụng, dữ liệu, nội dung hoặc tài nguyên đó. Bạn hiểu rằng tất cả dữ liệu, nội dung hoặc tài nguyên mà bạn có thể truy cập thông qua các ứng dụng của bên thứ ba như vậy hoàn toàn thuộc trách nhiệm của người cung cấp chúng và rằng Google không chịu trách nhiệm về bất kỳ tổn thất hay thiệt hại nào mà bạn có thể gặp phải do kết quả từ việc sử dụng hay truy cập bất kỳ ứng dụng của bên thứ ba, dữ liệu, nội dung hay tài nguyên nào như vậy.
-
-7.2 Bạn cần ý thức được rằng dữ liệu, nội dung và tài nguyên được trình chiếu cho bạn thông qua một ứng dụng của bên thứ ba như vậy có thể được bảo vệ bởi các quyền sở hữu trí tuệ thuộc sở hữu của các nhà cung cấp (hoặc bởi cá nhân hoặc công ty khác đại diện cho họ). Bạn không được sửa đổi, thuê, cho thuê, cho vay, bán, phân phối hoặc tạo sản phẩm phái sinh dựa trên những dữ liệu, nội dung hoặc tài nguyên này (hoặc toàn bộ hoặc một phần) trừ khi bạn đã được cấp phép cụ thể để làm vậy bởi chủ sở hữu có liên quan.
-
-7.3 Bạn hiểu rằng việc bạn sử dụng các ứng dụng, dữ liệu, nội dung hoặc tài nguyên của bên thứ ba như vậy có thể phải tuân thủ các điều khoản riêng giữa bạn và bên thứ ba có liên quan.
-
-8. Sử dụng các API Google
-
-8.1 Các API Google
-
-8.1.1 Nếu bạn sử dụng bất kỳ API nào để truy xuất dữ liệu từ Google, bạn hiểu rằng dữ liệu có thể được bảo vệ bởi quyền sở hữu trí tuệ thuộc sở hữu của Google hoặc những bên cung cấp dữ liệu (hoặc bởi cá nhân hoặc công ty khác đại diện cho họ). Việc bạn sử dụng bất kỳ API nào như vậy có thể phải tuân theo các Điều khoản Dịch vụ bổ sung. Bạn không được sửa đổi, thuê, cho thuê, cho vay, bán, phân phối hoặc tạo sản phẩm phái sinh dựa trên dữ liệu này (hoặc toàn bộ hoặc một phần) trừ khi được cho phép bởi các Điều khoản Dịch vụ có liên quan.
-
-8.1.2 Nếu bạn sử dụng bất kỳ API nào để truy xuất dữ liệu của một người dùng từ Google, bạn hiểu và đồng ý rằng bạn sẽ chỉ truy xuất dữ liệu với sự cho phép rõ ràng của người dùng và chỉ khi, và cho các mục đích giới hạn mà người dùng đã được cấp quyền để thực hiện.
-
-9. Chấm dứt Thỏa thuận Cấp phép
-
-9.1 Thỏa thuận Cấp phép sẽ tiếp tục áp dụng cho đến khi được chấm dứt hoặc bởi bạn hoặc Google như quy định dưới đây.
-
-9.2 Nếu bạn muốn chấm dứt Thỏa thuận Cấp phép, bạn có thể làm như vậy bằng cách ngừng sử dụng Preview và bất kỳ thông tin nhà phát triển nào có liên quan.
-
-9.3 Bất cứ lúc nào, Google đều có thể chấm dứt Thỏa thuận Cấp phép này, có hoặc không có nguyên nhân, sau khi thông báo cho bạn.
-
-9.4 Thỏa thuận Cấp phép sẽ tự động chấm dứt mà không cần có thông báo hay hành động khác tùy theo sự việc nào sớm hơn:
-(A) khi Google ngừng cung cấp Preview hoặc một số thành phần nhất định của Preview cho người dùng ở quốc gia mà bạn đang cư trú hoặc nơi bạn đang sử dụng dịch vụ; và
-(B) Google phát hành một phiên bản phát hành cuối cùng của Android SDK.
-
-9.5 Khi Thỏa thuận Cấp phép bị chấm dứt, giấy phép đã cấp cho bạn trong Thỏa thuận Cấp phép sẽ chấm dứt, ngay lập tức bạn sẽ ngừng tất cả việc sử dụng Preview này, và các quy định tại khoản 10, 11, 12 và 14 sẽ vẫn còn hiệu lực mãi mãi.
-
-10. ĐIỀU KHOẢN MIỄN TRỪ
-
-10.1 BẠN HIỂU VÀ ĐỒNG Ý RÕ RÀNG RẰNG VIỆC BẠN SỬ DỤNG PREVIEW HOÀN TOÀN LÀ RỦI RO CỦA BẠN VÀ RẰNG PREVIEW ĐƯỢC CUNG CẤP TRÊN CƠ SỞ “NGUYÊN TRẠNG” VÀ “CÓ SẴN” MÀ KHÔNG CÓ BẤT KỲ SỰ BẢO ĐẢM NÀO TỪ GOOGLE.
-
-10.2 VIỆC BẠN SỬ DỤNG PREVIEW VÀ BẤT KỲ TÀI NGUYÊN NÀO ĐƯỢC TẢI XUỐNG HOẶC CÓ ĐƯỢC BẰNG CÁCH KHÁC THÔNG QUA VIỆC SỬ DỤNG PREVIEW LÀ QUYẾT ĐỊNH VÀ RỦI RO CỦA CHÍNH BẠN VÀ BẠN HOÀN TOÀN CHỊU TRÁCH NHIỆM VỀ BẤT KỲ THIỆT HẠI NÀO ĐỐI VỚI HỆ THỐNG MÁY TÍNH HOẶC THIẾT BỊ KHÁC HOẶC VIỆC MẤT DỮ LIỆU LÀ KẾT QUẢ TỪ VIỆC SỬ DỤNG ĐÓ. KHÔNG GIỚI HẠN TRONG NỘI DUNG TRÊN, BẠN HIỂU RẰNG PREVIEW KHÔNG PHẢI LÀ BẢN PHÁT HÀNH ỔN ĐỊNH VÀ CÓ THỂ CHỨA LỖI, KHIẾM KHUYẾT VÀ CÁC LỖ HỔNG BẢO MẬT CÓ THỂ DẪN ĐẾN THIỆT HẠI ĐÁNG KỂ, BAO GỒM MẤT KHẢ NĂNG SỬ DỤNG HOÀN TOÀN, KHÔNG THỂ PHỤC HỒI ĐƯỢC CỦA HỆ THỐNG MÁY TÍNH HAY THIẾT BỊ KHÁC CỦA BẠN.
-
-10.3 GOOGLE CÔNG KHAI TUYÊN BỐ MIỄN TRỪ TRÁCH NHIỆM ĐỐI VỚI TẤT CẢ BẢO ĐẢM VÀ ĐIỀU KIỆN CÁC LOẠI, DÙ RÕ RÀNG HAY NGỤ Ý, BAO GỒM, NHƯNG KHÔNG GIỚI HẠN NHỮNG BẢO ĐẢM VÀ ĐIỀU KIỆN NGỤ Ý VỀ KHẢ NĂNG MUA BÁN ĐƯỢC, SỰ PHÙ HỢP CHO MỘT MỤC ĐÍCH CỤ THỂ VÀ KHÔNG XÂM PHẠM.
-
-11. GIỚI HẠN TRÁCH NHIỆM
-
-11.1 BẠN HIỂU VÀ ĐỒNG Ý RÕ RÀNG RẰNG GOOGLE, CÁC CÔNG TY CON VÀ CÔNG TY LIÊN KẾT CỦA GOOGLE, VÀ CÁC BÊN CẤP PHÉP CỦA GOOGLE SẼ KHÔNG CHỊU TRÁCH NHIỆM ĐỐI VỚI BẠN THEO BẤT KỲ LÝ THUYẾT TRÁCH NHIỆM NÀO VỀ BẤT KỲ THIỆT HẠI MANG TÍNH TRỰC TIẾP, GIÁN TIẾP, NGẪU NHIÊN, ĐẶC BIỆT, HẬU QUẢ HOẶC BẤT THƯỜNG NÀO MÀ BẠN CÓ THỂ PHẢI CHỊU, BAO GỒM BẤT KỲ TRƯỜNG HỢP MẤT DỮ LIỆU NÀO, DÙ GOOGLE HAY ĐẠI DIỆN CỦA GOOGLE CÓ BIẾT VỀ KHẢ NĂNG PHÁT SINH MẤT MÁT NHƯ VẬY HAY KHÔNG.
-
-12. Bồi thường
-
-12.1 Trong giới hạn tối đa mà pháp luật cho phép, bạn đồng ý bảo vệ, bồi thường và đảm bảo Google, các công ty liên kết của họ và các giám đốc, cán bộ, nhân viên và đại lý tương ứng của họ không bị thiệt hại trước và đối với bất kỳ và tất cả khiếu nại, hành động, kiện tụng hoặc thủ tục cũng như bất kỳ và tất cả tổn thất, trách nhiệm, thiệt hại, chi phí và phí tổn nào (bao gồm phí luật sư hợp lý) phát sinh từ hoặc phải trả từ (a) việc bạn sử dụng Preview, (b) bất kỳ ứng dụng nào do bạn phát triển trên Preview mà xâm phạm bất kỳ Quyền Sở hữu Trí tuệ của bất kỳ người nào hay bôi nhọ bất kỳ người nào hoặc vi phạm các quyền công khai hoặc riêng tư của họ, và (c) bất kỳ sự không tuân thủ nào của bạn đối với Thỏa thuận Cấp phép này.
-
-13. Thay đổi Thỏa thuận Cấp phép
-
-13.1 Google có thể thực hiện các thay đổi về Thỏa thuận Cấp phép khi họ phân phối các phiên bản mới của Preview. Khi những thay đổi này được thực hiện, Google sẽ lập một phiên bản Thỏa thuận Cấp phép mới có sẵn trên trang web nơi Preview được cung cấp.
-
-14. Các Điều khoản Pháp lý Chung
-
-14.1 Thỏa thuận Cấp phép này cấu thành toàn bộ thỏa thuận pháp lý giữa bạn và Google và chi phối việc bạn sử dụng Preview (không bao gồm bất kỳ dịch vụ nào mà Google có thể cung cấp cho bạn theo một thỏa thuận riêng bằng văn bản), và hoàn toàn thay thế bất kỳ thỏa thuận nào trước đây giữa bạn và Google liên quan tới Preview.
-
-14.2 Bạn đồng ý rằng nếu Google không thực hiện hay thi hành bất kỳ quyền hay chế tài hợp pháp nào có trong Thỏa thuận Cấp phép này (hoặc Google được hưởng lợi theo bất kỳ luật áp dụng nào), điều này sẽ không được coi như sự khước từ hình thức đối với các quyền của Google và rằng các quyền hoặc chế tài đó sẽ vẫn dành cho Google.
-
-14.3 Nếu bất kỳ tòa án pháp luật nào, có thẩm quyền tài phán đối với vấn đề này, phán rằng bất kỳ quy định nào của Thỏa thuận Cấp phép này không có hiệu lực, quy định đó sẽ bị xóa bỏ khỏi Thỏa thuận Cấp phép này mà không ảnh hưởng tới phần còn lại của Thỏa thuận Cấp phép này. Các quy định còn lại của Thỏa thuận Cấp phép này sẽ tiếp tục có giá trị và thi hành được.
-
-14.4 Bạn hiểu và đồng ý rằng mỗi thành viên trong nhóm các công ty mà trong đó Google là công ty mẹ sẽ là bên thụ hưởng thứ ba của Thỏa thuận Cấp phép và rằng những công ty khác đó sẽ có quyền trực tiếp thi hành, và dựa vào, bất kỳ quy định nào của Thỏa thuận Cấp phép này mà trao lợi ích cho họ (hoặc trao quyền có lợi cho họ). Ngoài điều này ra, không người hay công ty nào khác sẽ là bên thụ hưởng thứ ba của Thỏa thuận Cấp phép này.
-
-14.5 HẠN CHẾ VỀ XUẤT KHẨU. PREVIEW PHẢI TUÂN THEO PHÁP LUẬT VÀ QUY ĐỊNH VỀ XUẤT KHẨU CỦA HOA KỲ. BẠN PHẢI TUÂN THỦ TẤT CẢ PHÁP LUẬT VÀ QUY ĐỊNH VỀ XUẤT KHẨU TRONG NƯỚC VÀ QUỐC TẾ ÁP DỤNG CHO PREVIEW. NHỮNG LUẬT NÀY BAO GỒM CÁC HẠN CHẾ VỀ ĐIỂM ĐẾN, NGƯỜI DÙNG CUỐI VÀ MỤC ĐÍCH SỬ DỤNG CUỐI.
-
-14.6 Bạn không được phép chỉ định hoặc chuyển nhượng Thỏa thuận Cấp phép mà không có sự chấp thuận trước bằng văn bản của Google, và mọi nỗ lực chuyển nhượng mà không có chấp thuận như vậy sẽ vô hiệu lực. Bạn sẽ không được giao phó các trách nhiệm hoặc nghĩa vụ của mình theo Thỏa thuận Cấp phép này khi chưa có sự phê duyệt trước bằng văn bản của Google.
-
-14.7 Thỏa thuận Cấp phép này và mối quan hệ giữa bạn với Google theo Thỏa thuận Cấp phép sẽ được điều chỉnh bởi pháp luật của Tiểu bang California, không xét tới các quy định về xung đột pháp luật của họ. Bạn và Google đồng ý trình lên theo thẩm quyền tài phán duy nhất của các tòa án bên trong quận Santa Clara, California để giải quyết bất kỳ vấn đề pháp lý nào phát sinh từ Thỏa thuận Cấp phép này. Không kể điều này, bạn đồng ý rằng Google sẽ vẫn được phép xin các lệnh chế tài của tòa (hoặc một hình thức chế tài pháp lý khẩn cấp tương đương) ở bất kỳ vùng tài phán nào.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">Tôi đã đọc và đồng ý với các điều khoản và điều kiện trên</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Trong tài liệu này</h2>
- <ol>
- <li><a href="#device-preview">Thiết lập thiết bị phần cứng</a>
- <ol>
- <li><a href="#ota">Nhận cập nhật qua sóng vô tuyến</a></li>
- <li><a href="#flash">Flash thủ công thiết bị</a></li>
- <li><a href="#revertDevice">Gỡ cài đặt</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">Thiết lập bộ giả lập</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Để chạy và kiểm thử ứng dụng của bạn trên nền tảng mới, bạn cần phải thiết lập môi trường thời gian chạy Android N
-. Bạn có thể thực hiện điều đó bằng một trong các cách sau:
-</p>
-
-<ul>
- <li>Cài đặt Android N trên một thiết bị phần cứng được hỗ trợ, hoặc</li>
- <li>Thiết lập một bộ giả lập Android chạy Android N</li>
-</ul>
-
-<p>
- Nếu bạn muốn có một môi trường để kiểm thử khả năng tương thích cơ bản của ứng dụng của bạn trên
- nền tảng mới này, tất cả những gì bạn cần là APK hiện tại của bạn và một thiết bị phần cứng hoặc
- bộ giả lập. Bạn không nhất thiết phải cập nhật môi trường phát triển đầy đủ
- để thực hiện kiểm thử cơ bản.
-</p>
-
-<p>
- Nếu bạn muốn sửa đổi ứng dụng của mình để nhắm mục tiêu đến Android N hoặc sử dụng các API Android N mới,
- bạn cần thiết lập một môi trường phát triển được cập nhật để hỗ trợ
- Android N. <a href="{@docRoot}preview/setup-sdk.html">Thiết lập để Phát triển dành cho
- Android N</a> có các chi tiết.
-</p>
-
-
-<h2 id="device-preview">Thiết lập thiết bị phần cứng</h2>
-
-<p>
- Bản N Developer Preview cung cấp các cập nhật hệ thống cho một loạt các thiết bị phần cứng
- mà bạn có thể sử dụng để kiểm thử ứng dụng của bạn, từ điện thoại tới máy tính bảng và TV.
-</p>
-
-<p>
- Nếu bạn có quyền truy cập vào một thiết bị được hỗ trợ, bạn có thể cập nhật nó thành bản dựng theo mốc của Preview dành cho
- Nhà phát triển bằng một trong những cách sau:
-</p>
-
-<ul>
- <li><strong>Đăng ký cập nhật hệ thống tự động qua vô tuyến cho thiết bị</strong> thông qua
- <a href="https://g.co/androidbeta">Chương trình Android Beta</a>. Sau khi đăng ký, thiết bị của bạn sẽ nhận được
- qua sóng vô tuyến các cập nhật định kỳ về tất cả bản dựng theo mốc trong bản N Developer Preview. Cách tiếp cận này
- được khuyến khích bởi nó cho phép bạn chuyển tiếp liền mạch từ môi trường hiện tại của bạn
- qua nhiều bản phát hành khác nhau của N Developer Preview.</li>
- <li><strong>Tải xuống ảnh hệ thống của Developer Preview và flash thiết bị</strong>.
- Các cập nhật qua vô tuyến không được cung cấp tự động cho các thiết bị mà bạn flash thủ công, nhưng
- bạn có thể đăng ký Chương trình Android Beta cho các thiết bị đó để nhận cập nhật qua vô tuyến. </li>
-</ul>
-
-<h3 id="ota">Đăng ký cập nhật tự động qua vô tuyến cho thiết bị</h3>
-
-<p>
- Nếu bạn có quyền truy cập vào một thiết bị được hỗ trợ (xem danh sách trong bảng
- Tải xuống), bạn có thể nhận được cập nhật qua sóng vô tuyến để xem trước các phiên bản của Android
- bằng cách đăng ký <a href="https://g.co/androidbeta">Chương trình Android Beta</a> cho thiết bị. Các cập nhật này được
- tự động tải xuống và sẽ cập nhật thiết bị của bạn giống như các bản cập nhật
- hệ thống chính thức.
-</p>
-
-<p>
- Bạn có thể hủy đăng ký thiết bị bất cứ lúc nào. Thiết bị sẽ nhận được bản cập nhật qua vô tuyến
- của phiên bản Android sản xuất mới nhất khả dụng cho thiết bị đó
- (ví dụ, Android 6.0 Marshmallow). Việc cập nhật yêu cầu phải thiết lập lại thiết bị
- hoàn toàn, vì vậy dữ liệu người dùng trên thiết bị sẽ được gỡ bỏ. Hãy đảm bảo <strong>sao lưu
- dữ liệu quan trọng</strong> trước khi hủy đăng ký thiết bị.
-</p>
-
-<p>
- Để biết thêm thông tin và đăng ký thiết bị của bạn, xem
- trang web <a href="https://g.co/androidbeta">Chương trình Android Beta</a>.
-</p>
-
-<p class="note"><strong>Lưu ý:</strong>
- Việc hủy đăng ký yêu cầu phải cài đặt lại toàn bộ thiết bị. Trước hết hãy sao lưu
- các dữ liệu quan trọng.
-</p>
-
-<h3 id="flash">Flash thiết bị thủ công</h3>
-
-<p>
- Bất cứ lúc nào bạn cũng có thể tải xuống ảnh hệ thống mới nhất của Developer Preview và
- flash thủ công nó vào thiết bị của bạn. Xem bảng dưới đây để tải xuống ảnh hệ thống
- cho thiết bị kiểm thử của bạn. Việc flash thủ công thiết bị sẽ hữu ích nếu bạn cần
- kiểm soát chính xác môi trường kiểm thử hoặc cần phải cài đặt lại thường xuyên,
- chẳng hạn như cho kiểm thử tự động.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- Việc cài đặt ảnh hệ thống trên thiết bị <strong>sẽ gỡ bỏ tất cả dữ liệu khỏi
- thiết bị</strong>, vì vậy trước hết bạn nên sao lưu dữ liệu của mình.
-</p>
-
-<p>
- Sau khi sao lưu dữ liệu thiết bị và tải xuống ảnh hệ thống bên dưới
- khớp với thiết bị của bạn, hãy làm theo hướng dẫn tại <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
- để flash ảnh này vào thiết bị của bạn.
-</p>
-
-<p>
- Các ảnh hệ thống được flash thủ công <strong>không
- tự động nhận cập nhật qua vô tuyến</strong> cho các bản dựng theo mốc sau này của
- Developer Preview. Hãy đảm bảo giữ cho môi trường của bạn được cập nhật và flash một
- ảnh hệ thống mới tại mỗi mốc của Developer Preview.
-</p>
-
-<p>
- Nếu bạn quyết định muốn nhận cập nhật qua vô tuyến sau khi đã flash thủ công thiết bị,
- tất cả những gì bạn cần làm là đăng ký <a href="https://g.co/androidbeta">Chương trình Android
- Beta</a> cho thiết bị. Bạn có thể đăng ký thiết bị bất cứ lúc nào để nhận được
- bản cập nhật qua vô tuyến tiếp theo của Preview.
-</p>
-
-<table>
- <tr>
- <th scope="col">Thiết bị</th>
- <th scope="col">Tải xuống / Tổng kiểm</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npc56p-preview-6c877a3d.tgz</a><br>
- MD5: b5cf874021023b398f5b983b24913f5d<br>
- SHA-1: 6c877a3d9fae7ec8a1678448e325b77b7a7b143a
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npc56p-preview-54b13c67.tgz</a><br>
- MD5: af183638cf34e0eb944a1957d7696f60<br>
- SHA-1: 54b13c6703d369cc79a8fd8728fe4103c6343973
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npc56p-preview-85ffc1b1.tgz</a><br>
- MD5: bc4934ea7bd325753eee1606d3725a24<br>
- SHA-1: 85ffc1b1be402b1b96f9ba10929e86bba6c6c588
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npc56p-preview-0e8ec8ef.tgz</a><br>
- MD5: c901334c6158351e945f188167ae56f4<br>
- SHA-1: 0e8ec8ef98c7a8d4f58d15f90afc5176303efca4
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npc56p-preview-1bafdbfb.tgz</a><br>
- MD5: 7bb95bebc478d7257cccb4652899d1b4<br>
- SHA-1: 1bafdbfb502e979a9fe4c257a379c4c7af8a3ae6
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npc56r-preview-7027d5b6.tgz</a><br>
- MD5: f5d3d8f75836ccfe4c70e8162e498be4<br>
- SHA-1: 7027d5b662bceda4c80a91a0a14ef0e5a7ba795b
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npc56p-preview-335a86a4.tgz</a><br>
- MD5: 4e21fb183bbbf467bee91598d587fd2e<br>
- SHA-1: 335a86a435ee51f18464de343ad2e071c38f0e92
- </td>
- </tr>
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npc56p-preview-82472ebc.tgz</a><br>
- MD5: 983e083bc7cd0c4a2d39d6ebaa20202a<br>
- SHA-1: 82472ebc9a6054a103f53cb400a1351913c95127
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">Gỡ cài đặt Preview khỏi thiết bị</h3>
-
-<p>
- Nếu bạn muốn gỡ cài đặt preview khỏi thiết bị, bạn có thể thực hiện điều đó bằng một trong
- những cách sau: </p>
- <ul>
- <li><strong>Lấy thông số kỹ thuật của ảnh hệ thống nguyên gốc</strong> và sau đó flash thủ công
- nó cho thiết bị.
- <ul>
- <li>Đối với <strong>các thiết bị Nexus và Pixel C</strong>, xem
- trang <a href="http://developers.google.com/android/nexus/images">Ảnh Cài đặt Gốc
- cho Thiết bị Nexus</a> để tìm bản tải xuống. </li>
- <li>Đối với <strong>các thiết bị khác</strong>, vui lòng liên hệ trực tiếp với nhà sản xuất
-thiết bị. Hoặc, nếu thiết bị được hỗ trợ
- trong Chương trình Android Beta, bạn có thể đăng ký
- chương trình cho thiết bị và sau đó hủy đăng ký thiết bị (xem bên dưới).</li>
- </ul>
- </li>
- <li><strong>Hủy đăng ký thiết bị khỏi Chương trình Android Beta</strong>. Nếu
- thiết bị được đăng ký <a href="https://g.co/androidbeta">Chương trình Android Beta
- </a>, không quan trọng là thiết bị nào, bạn có thể dễ dàng hủy đăng ký thiết bị khỏi chương trình này.
- <p>
- Thiết bị sẽ nhận được bản cập nhật qua vô tuyến của phiên bản Android sản xuất
- mới nhất có sẵn cho thiết bị đó (ví dụ, Android 6.0 Marshmallow).
- Bản cập nhật yêu cầu thiết lập lại toàn bộ thiết bị, vì vậy dữ liệu người dùng trên thiết bị sẽ được
- gỡ bỏ. Hãy đảm bảo rằng bạn đã <strong>sao lưu dữ liệu quan trọng</strong> trước khi
- hủy đăng ký thiết bị.
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>Lưu ý:</strong>
- Việc gỡ cài đặt ảnh hệ thống của Developer Preview trước khi
- kết thúc chương trình yêu cầu phải thiết lập lại toàn bộ thiết bị và gỡ bỏ tất cả dữ liệu người dùng
- trên thiết bị.
-</p>
-
-
-<h2 id="setupAVD">Thiết lập bộ giả lập</h2>
-
-<p>Để sử dụng Bộ Giả Lập Android chạy Android N Preview, bạn cần
-tải xuống Android N Preview SDK và tạo một thiết bị ảo cho
-bộ giả lập.</p>
-
-<p>Đầu tiên, tải xuống Android N Preview SDK như sau (nếu bạn
-đã có nó trong khi <a href="{@docRoot}preview/setup-sdk.html">thiết lập
-để phát triển dành cho Android N</a>, bạn có thể bỏ qua phần này):
-
-<ol>
- <li>Trong Android Studio, Mở hộp thoại Settings
- (<strong>File > Settings</strong> trên Windows/Linux, hoặc
- <strong>Android Studio > Preferences</strong> trên Mac). Trong bảng điều khiển
- bên trái, chọn <strong>Appearance & Behavior >
- System Settings > Android SDK</strong>.
-
- <li>Nhấp vào tab <strong>SDK Platforms</strong>, rồi chọn hộp kiểm
- <strong>Android N Preview</strong>.</li>
-
- <li>Nhấp vào tab <strong>SDK Tools</strong>, rồi chọn
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong>, và các hộp kiểm <strong>Android SDK Tools</strong>
-.
- </li>
-
- <li>Nhấp vào <strong>OK</strong> và chấp nhận thỏa thuận
- giấy phép cho bất kỳ gói nào sẽ được cài đặt.
- </li>
-</ol>
-
-<p>Giờ đây bạn sẽ có <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-<strong>Platform-Tools 24.0.0 rc1</strong>, và <strong>SDK Tools
-25.0.9</strong>. Nếu bạn không cập nhật Các Công cụ SDK lên 25.0.9, bạn sẽ không
-thể chạy ảnh hệ thống x86_64 cho Android N.</p>
-
-
-<p>Bây giờ, hãy tạo một thiết bị ảo với ảnh hệ thống Android N:</p>
-
-<ol>
- <li>Mở Trình quản lý AVD bằng cách chọn <strong>Tools > Android >
- AVD Manager</strong>.</li>
- <li>Nhấp vào <strong>Create Virtual Device</strong>.</li>
- <li>Chọn một thiết bị chẳng hạn như Nexus 5X, Nexus 6P, Nexus 9, hoặc Android TV,
- rồi nhấp vào <strong>Next</strong>.</li>
- <li>Chọn ảnh hệ thống <strong>N</strong> (với
- <strong>x86</strong> ABI), rồi nhấp vào <strong>Next</strong>.
- (Hiện chỉ có ảnh hệ thống x86 được hỗ trợ với Bộ giả lập Android
-dành cho Preview Android N.)
- <li>Hoàn thành các bước cấu hình AVD còn lại và nhấp vào
- <strong>Finish</strong>.</li>
-</ol>
-
-<p>Giờ đây bạn có thể khởi chạy Bộ giả lập Android với AVD Preview Android N.</p>
-
-<p>
-Để có trải nghiệm tốt nhất trong Bộ giả lập Android, hãy cài đặt
-Android Studio 2.1 Preview, có hỗ trợ <a href="http://tools.android.com/tech-docs/emulator">Bộ giả lập Android 2.0 Beta</a>
-với hiệu suất nhanh hơn nhiều so với Bộ giả lập trong
-Android Studio 1.5.</p>
-
-<p class="note"><strong>Lưu ý:</strong>
- Nếu bạn hiện đang sử dụng Android Studio 2.0 Beta, một vấn đề đã được biết đến
- sẽ ngăn cản bạn tạo AVD bằng ảnh hệ thống của N Preview, vì vậy
- hiện bạn cần sử dụng preview của Android Studio 2.1 để tạo các AVD.
-</p>
-
-<p>Để biết thêm thông tin về tạo thiết bị ảo, hãy xem <a href="{@docRoot}tools/devices/index.html">Quản lý Thiết bị ảo</a>.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/vi/preview/features/background-optimization.jd b/docs/html-intl/intl/vi/preview/features/background-optimization.jd
index 9554725..39e1c15 100644
--- a/docs/html-intl/intl/vi/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/vi/preview/features/background-optimization.jd
@@ -60,7 +60,7 @@
<ul>
<li>Các ứng dụng nhắm đến Preview không nhận được truyền phát {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} nếu chúng
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} nếu chúng
đăng ký nhận truyền phát trong bản kê khai của chúng. Các ứng dụng đang chạy ở tiền cảnh
vẫn có thể theo dõi {@code CONNECTIVITY_CHANGE} trên luồng chính của chúng bằng cách
đăng ký{@link android.content.BroadcastReceiver} với {@link
@@ -119,7 +119,7 @@
</h3>
<p>
- Khi sử dụng lớp{@link android.app.job.JobInfo.Builder JobInfo.Builder}
+ Khi sử dụng lớp{@link android.app.job.JobInfo.Builder JobInfo.Builder}
để xây dựng đối tượng {@link android.app.job.JobInfo} của bạn, hãy áp dụng phương thức {@link
android.app.job.JobInfo.Builder#setRequiredNetworkType
setRequiredNetworkType()} và chuyển {@link android.app.job.JobInfo
@@ -145,7 +145,7 @@
</pre>
<p>
- Khi các điều kiện cho tác vụ của bạn đã được đáp ứng, ứng dụng của bạn sẽ nhận được lệnh gọi lại để chạy
+ Khi các điều kiện cho tác vụ của bạn đã được đáp ứng, ứng dụng của bạn sẽ nhận được lệnh gọi lại để chạy
phương thức{@link android.app.job.JobService#onStartJob onStartJob()}trong
{@code JobService.class} được chỉ định. Để xem thêm các ví dụ về triển khai {@link
android.app.job.JobScheduler} , hãy xem <a href="{@docRoot}samples/JobScheduler/index.html">ứng dụng mẫu JobScheduler</a>.
@@ -243,7 +243,7 @@
</dl>
<p class="note">
- <strong>Lưu ý:</strong> {@code TriggerContentUri()} không thể được sử dụng
+ <strong>Lưu ý:</strong> {@code TriggerContentUri()} không thể được sử dụng
kết hợp với {@link android.app.job.JobInfo.Builder#setPeriodic
setPeriodic()} hoặc {@link android.app.job.JobInfo.Builder#setPersisted
setPersisted()}. Để tiếp tục theo dõi các thay đổi nội dung, hãy lên lịch một
@@ -313,7 +313,7 @@
<p>
Mã mẫu sau sẽ ghi đè lên phương thức {@link
- android.app.job.JobService#onStartJob JobService.onStartJob()} và
+ android.app.job.JobService#onStartJob JobService.onStartJob()} và
và ghi lại các thẩm quyền nội dung và URI đã kích hoạt tác vụ.
</p>
@@ -357,7 +357,7 @@
bộ nhớ ít có thể cải thiện hiệu suất và trải nghiệm của người dùng. Loại bỏ
các thành phần phụ thuộc trên các dịch vụ chạy ngầm và bộ thu truyền phát không biểu thị đã đăng ký tĩnh
có thể giúp ứng dụng của bạn chạy tốt hơn trên các thiết bị như vậy. Mặc dù
- N Developer Preview thực hiện các bước để giảm bớt một vài trong số các vấn đề này, nhưng chúng tôi
+ N Developer Preview thực hiện các bước để giảm bớt một vài trong số các vấn đề này, nhưng chúng tôi
khuyến nghị bạn nên tối ưu ứng dụng của bạn để chạy hoàn toàn không cần sử dụng
các tiến trình chạy ngầm này.
</p>
diff --git a/docs/html-intl/intl/vi/preview/features/direct-boot.jd b/docs/html-intl/intl/vi/preview/features/direct-boot.jd
deleted file mode 100644
index d95d831..0000000
--- a/docs/html-intl/intl/vi/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=Khởi động Trực tiếp
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Trong tài liệu này</h2>
- <ol>
- <li><a href="#run">Yêu cầu Truy cập để Chạy trong quá trình Khởi động Trực tiếp</a></li>
- <li><a href="#access">Truy cập Bộ nhớ Lưu trữ Mã hóa của Thiết bị</a></li>
- <li><a href="#notification">Nhận thông báo Mở khóa của Người dùng</a></li>
- <li><a href="#migrating">Chuyển nhập Dữ liệu Có sẵn</a></li>
- <li><a href="#testing">Kiểm thử Ứng dụng Nhận biết Mã hóa của bạn</a></li>
- </ol>
-</div>
-</div>
-
-<p>Android N chạy trong chế độ <i>Khởi động Trực tiếp</i> an toàn
-khi thiết bị đã được bật nguồn nhưng người dùng chưa mở khóa
-thiết bị. Để hỗ trợ chế độ này, hệ thống cung cấp hai vị trí lưu trữ dữ liệu:</p>
-
-<ul>
-<li><i>Lưu trữ mã hóa thông tin xác thực</i>, là vị trí lưu trữ mặc định
-và chỉ khả dụng sau khi người dùng đã mở khóa thiết bị.</li>
-<li><i>Lưu trữ mã hóa thiết bị</i>, là vị trí lưu trữ khả dụng cho cả
-chế độ Khởi động Trực tiếp và sau khi người dùng đã mở khóa thiết bị.</li>
-</ul>
-
-<p>Theo mặc định, các ứng dụng không chạy trong quá trình chế độ Khởi động Trực tiếp.
-Nếu ứng dụng của bạn cần thực hiện hành động trong chế độ Khởi động Trực tiếp thì bạn có thể đăng ký
-các thành phần ứng dụng cần chạy trong chế độ này. Một số trường hợp sử dụng phổ biến
-cho các ứng dụng cần chạy trong chế độ Khởi động Trực tiếp gồm:</p>
-
-<ul>
-<li>Ứng dụng có thông báo theo lịch, như ứng dụng
-đồng hồ báo thức.</li>
-<li>Ứng dụng cung cấp các thông báo quan trọng cho người dùng như ứng dụng SMS.</li>
-<li>Ứng dụng cung cấp các dịch vụ trợ năng như Talkback.</li>
-</ul>
-
-<p>Nếu ứng dụng của bạn cần truy cập dữ liệu khi đang chạy trong chế độ Khởi động Trực tiếp thì hãy sử dụng
-lưu trữ mã hóa thiết bị. Bộ nhớ lưu trữ được mã hóa của thiết bị có chứa dữ liệu
-được mã hóa bằng một khóa chỉ khả dụng sau khi thiết bị đã thực hiện một
-lần khởi động được xác thực thành công.</p>
-
-<p>Đối với dữ liệu cần được mã hóa bằng một khóa liên kết tới thông tin xác thực
-của người dùng như mã PIN hoặc mật khẩu thì hãy sử dụng bộ nhớ lưu trữ mã hóa thông tin xác thực.
-Bộ nhớ lưu trữ mã hóa thông tin xác thực chỉ khả dụng sau khi người dùng đã mở khóa
-thành công thiết bị, tính đến khi người dùng khởi động lại thiết bị một lần nữa. Nếu
-người dùng mở màn hình khóa sau khi mở khóa thiết bị thì thao tác này không khóa
-bộ nhớ mã hóa thông tin xác thực.</p>
-
-<h2 id="run">Yêu cầu Truy cập để Chạy trong quá trình Khởi động Trực tiếp</h2>
-
-<p>Các ứng dụng phải đăng ký các thành phần của chúng với hệ thống trước khi chúng
-có thể chạy trong chế độ Khởi động Trực tiếp hoặc truy cập bộ nhớ lưu trữ
-mã hóa thiết bị. Ứng dụng đăng ký với hệ thống bằng cách đánh dấu các thành phần là
-<i>nhận biết mã hóa</i>. Để đánh dấu các thành phần của bạn là nhận biết mã hóa, hãy đặt thuộc tính
-<code>android:encryptionAware</code> thành true trong bản kê khai.<p>
-
-<p>Các thành phần nhận biết mã hóa có thể đăng ký để nhận một thông điệp truyền phát
-<code>LOCKED_BOOT_COMPLETED</code> từ
-hệ thống khi thiết bị được khởi động lại. Lúc này, bộ nhớ lưu trữ
-mã hóa thiết bị sẽ khả dụng và thành phần của bạn có thể thực thi các tác vụ cần được
-chạy trong chế độ Khởi động Trực tiếp, như kích hoạt báo thức đã đặt.</p>
-
-<p>Đoạn mã sau là một ví dụ về cách đăng ký một
-{@link android.content.BroadcastReceiver} là nhận biết mã hóa và thêm một
-bộ lọc ý định cho <code>LOCKED_BOOT_COMPLETED</code> trong bản kê khai của ứng dụng:</p>
-
-<pre>
-<receiever
- android:encryptionAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Khi người dùng đã mở khóa thiết bị thì mọi thành phần có thể truy cập
-cả bộ nhớ lưu trữ mã hóa thiết bị lẫn bộ nhớ lưu trữ mã hóa thông tin xác thực.</p>
-
-<h2 id="access">Truy cập Bộ nhớ Lưu trữ Mã hóa của Thiết bị</h2>
-
-<p>Để truy cập bộ nhớ lưu trữ mã hóa thiết bị, hãy tạo một thực thể
-{@link android.content.Context} thứ hai bằng cách gọi
-<code>Context.createDeviceEncryptedStorageContext()</code>. Tất cả các lệnh gọi
-API bộ nhớ lưu trữ đều sử dụng bối cảnh này để truy cập bộ nhớ lưu trữ mã hóa thiết bị.
-Ví dụ sau sẽ truy cập bộ nhớ lưu trữ mã hóa của thiết bị và mở một tệp
-dữ liệu ứng dụng có sẵn:</p>
-
-<pre>
-Context directBootContext = Context.createDeviceEncryptedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>Chỉ sử dụng bộ nhớ lưu trữ mã hóa của thiết bị
-cho thông tin phải truy cập được trong chế độ Khởi động Trực tiếp.
-Không sử dụng bộ nhớ lưu trữ mã hóa của thiết bị làm bộ lưu trữ mã hóa cho mục đích chung.
-Đối với thông tin cá nhân của người dùng, hoặc dữ liệu được mã hóa không cần thiết
-trong chế độ Khởi động Trực tiếp thì hãy sử dụng bộ nhớ lưu trữ mã hóa thông tin xác thực.</p>
-
-<h2 id="notification">Nhận thông báo Mở khóa của Người dùng</h2>
-
-<p>Một khi người dùng mở khóa thiết bị sau khi khởi động lại, ứng dụng của bạn có thể chuyển sang
-truy cập bộ nhớ lưu trữ mã hóa thông tin xác thực và sử dụng các dịch vụ thông thường của hệ thống
-phụ thuộc vào thông tin xác thực người dùng.</p>
-
-<p>Để nhận thông báo khi người dùng mở khóa thiết bị sau khi khởi động lại,
-hãy đăng ký một {@link android.content.BroadcastReceiver} từ một thành phần đang chạy
-để lắng nghe thông báo <code>ACTION_USER_UNLOCKED</code>. Hoặc bạn có thể
-nhận thông báo có sẵn {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED} lúc này sẽ chỉ báo thiết bị đã khởi động xong và
-người dùng đã mở khóa thiết bị.</p>
-
-<p>Bạn có thể truy vấn trực tiếp để biết người dùng đã mở khóa thiết bị hay chưa bằng cách gọi
-<code>UserManager.isUserUnlocked()</code>.</p>
-
-<h2 id="migrating">Chuyển nhập Dữ liệu Có sẵn</h2>
-
-<p>Nếu người dùng cập nhật thiết bị của họ để sử dụng chế độ Khởi động Trực tiếp thì bạn có thể có dữ liệu
-hiện hữu cần được chuyển nhập sang bộ nhớ lưu trữ mã hóa của thiết bị. Sử dụng
-<code>Context.migrateSharedPreferencesFrom()</code> và
-<code>Context.migrateDatabaseFrom()</code> để chuyển nhập dữ liệu về tùy chọn và cơ sở dữ liệu
-giữa bộ nhớ lưu trữ mã hóa thông tin xác thực và bộ nhớ lưu trữ mã hóa thiết bị.</p>
-
-<p>Hãy phán đoán hợp lý nhất khi quyết định dữ liệu nào nên chuyển nhập từ bộ nhớ lưu trữ mã hóa
-thông tin xác thực sang bộ nhớ lưu trữ mã hóa thiết bị. Bạn không nên di chuyển
-thông tin cá nhân của người dùng như mật khẩu hoặc các mã thông báo cấp quyền sang
-bộ nhớ lưu trữ mã hóa thiết bị. Trong một số trường hợp, bạn có thể cần quản lý
-các bộ dữ liệu riêng biệt trong hai bộ lưu trữ mã hóa.</p>
-
-<h2 id="testing">Kiểm thử Ứng dụng Nhận biết Mã hóa của bạn</h2>
-
-<p>Kiểm thử ứng dụng nhận biết mã hóa bằng cách sử dụng chế độ Khởi động Trực tiếp mới. Có
-hai cách để kích hoạt Khởi động Trực tiếp.</p>
-
-<p class="caution"><strong>Cẩn trọng:</strong> Kích hoạt Khởi động Trực tiếp
-sẽ xóa sạch mọi dữ liệu người dùng trên thiết bị.</p>
-
-<p>Trên các thiết bị được hỗ trợ có Android N được cài đặt, kích hoạt
-Khởi động Trực tiếp bằng cách thực hiện một trong các thao tác sau:</p>
-
-<ul>
-<li>Trên thiết bị, bật <b>Developer options</b> nếu chưa hãy bật bằng cách
-vào <b>Settings > About phone</b> và nhấn vào <b>Build number</b>
-bảy lần. Khi màn hình tùy chọn cho nhà phát triển khả dụng, hãy vào
-<b>Settings > Developer options</b> và chọn
-<b>Convert to file encryption</b>.</li>
-<li>Sử dụng các lệnh shell adb sau để kích hoạt chế độ Khởi động Trực tiếp:
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>Cũng có một chế độ Khởi động Trực tiếp giả lập trong trường hợp bạn cần chuyển đổi
-các chế độ trên thiết bị thử nghiệm. Chỉ nên sử dụng chế độ Giả lập trong quá trình
-phát triển và có thể làm mất dữ liệu. Để kích hoạt chế độ Khởi động Trực tiếp giả lập,
-hãy đặt mẫu hình khóa cho thiết bị, chọn "No thanks" nếu được yêu cầu
- bật màn hình khởi động bảo mật khi đặt một mẫu hình khóa và sau đó sử dụng
-lệnh shell adb sau:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>Hãy sử dụng lệnh sau để tắt chế độ Khởi động Trực tiếp giả lập:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>Sử dụng các lệnh này có thể khiến cho thiết bị khởi động lại.</p>
diff --git a/docs/html-intl/intl/vi/preview/features/icu4j-framework.jd b/docs/html-intl/intl/vi/preview/features/icu4j-framework.jd
index 63f6825..ffb5799 100644
--- a/docs/html-intl/intl/vi/preview/features/icu4j-framework.jd
+++ b/docs/html-intl/intl/vi/preview/features/icu4j-framework.jd
@@ -51,7 +51,7 @@
<p>
Android N cung cấp một tập nhỏ các API ICU4J thông qua
- gói <code>android.icu</code> thay vì gói <code>com.ibm.icu</code>.
+ gói <code>android.icu</code> thay vì gói <code>com.ibm.icu</code>.
Khuôn khổ Android có thể chọn không
cung cấp các API ICU4J vì nhiều lý do; ví dụ, Android N không cung cấp
một số API bị loại bỏ hoặc những API chưa được đội ngũ ICU công bố là
@@ -79,7 +79,7 @@
<ul>
<li>Các API khuôn khổ Android ICU4J không có tất cả các API của ICU4J.</li>
<li>Các nhà phát triển NDK cần biết rằng ICU4C Android không được hỗ trợ.</li>
-<li>Các API trong khuôn khổ Android không thay thế hỗ trợ của Android cho
+<li>Các API trong khuôn khổ Android không thay thế hỗ trợ của Android cho
<a href="{@docRoot}guide/topics/resources/localization.html">việc bản địa hóa bằng
các tài nguyên</a>.</li>
</ul>
@@ -87,7 +87,7 @@
<h2 id="migration">Chuyển nhập sang gói android.icu từ com.ibm.icu</h2>
<p>
- Nếu bạn đã sử dụng các API ICU4J trong ứng dụng và
+ Nếu bạn đã sử dụng các API ICU4J trong ứng dụng và
các API <code>android.icu</code> đáp ứng yêu cầu của bạn thì việc chuyển nhập sang
các API của khuôn khổ đòi hỏi bạn phải thay đổi thành phần nhập vào của Java
từ <code>com.ibm.icu</code> sang <code>android.icu</code>. Khi đó bạn có thể
diff --git a/docs/html-intl/intl/vi/preview/features/multi-window.jd b/docs/html-intl/intl/vi/preview/features/multi-window.jd
deleted file mode 100644
index 485bc28..0000000
--- a/docs/html-intl/intl/vi/preview/features/multi-window.jd
+++ /dev/null
@@ -1,582 +0,0 @@
-page.title=Hỗ trợ đa cửa sổ
-page.metaDescription=Hỗ trợ mới trong Android N để hiển thị nhiều hơn một ứng dụng cùng lúc.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>Trong tài liệu này</h2>
- <ol>
- <li><a href="#overview">Tổng quan</a></li>
- <li><a href="#lifecycle">Vòng đời đa cửa sổ</a></li>
- <li><a href="#configuring">Cấu hình Ứng dụng của bạn cho Chế độ
- Đa cửa sổ</a></li>
- <li><a href="#running">Chạy Ứng dụng của bạn trong Chế độ Đa cửa sổ</a></li>
- <li><a href="#testing">Kiểm thử Hỗ trợ Đa cửa sổ của Ứng dụng của bạn</a></li>
- </ol>
- <h2>Xem thêm</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">Ứng dụng mẫu Multi-Windows
- Playground</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N thêm hỗ trợ cho hiển thị đồng thời nhiều hơn một ứng dụng
- vào cùng một thời điểm. Trên thiết bị cầm tay, hai ứng dụng có thể chạy song song hoặc
- trên dưới nhau trong chế độ <em>chia màn hình</em>. Trên thiết bị TV, ứng dụng có thể
- sử dụng chế độ <em>ảnh trong ảnh</em> để tiếp tục phát lại video trong khi người dùng
- đang tương tác với ứng dụng khác.
-</p>
-
-<p>
- Nếu bạn dựng ứng dụng của bạn bằng N Preview SDK, bạn có thể cấu hình cách ứng dụng của bạn
- xử lý hiển thị đa cửa sổ. Ví dụ, bạn có thể quy định
- các kích thước tối thiểu cho phép của hoạt động của bạn. Bạn cũng có thể vô hiệu hóa hiển thị đa cửa sổ cho
- ứng dụng của bạn, đảm bảo rằng hệ thống chỉ hiển thị ứng dụng của bạn trong chế độ
- toàn màn hình.
-</p>
-
-<h2 id="overview">Tổng quan</h2>
-
-<p>
- Android N cho phép một vài ứng dụng chia sẻ màn hình ngay lập tức. Ví
- dụ, người dùng có thể chia đôi màn hình ra, xem một trang web ở bên trái màn hình
- trong khi đang tạo email ở bên phải màn hình. Trải nghiệm này của người dùng phụ thuộc vào
- thiết bị:
-</p>
-
-<ul>
- <li>Thiết bị cầm tay đang chạy Android N có chế độ
- chia màn hình. Trong chế độ này, hệ thống sẽ lấp đầy màn hình bằng hai ứng dụng
- song song nhau hoặc trên dưới. Người dùng có thể kéo đường chia
- phân tách hai ứng dụng để hiển thị một ứng dụng rộng hơn và ứng dụng còn lại nhỏ đi.
- </li>
-
- <li>Trên Trình phát Nexus đang chạy Android N, các ứng dụng có thể tự đặt chúng
- vào trong <a href="picture-in-picture.html">chế độ ảnh trong ảnh</a>, cho phép
- các ứng dụng này tiếp tục hiển thị nội dung khi người dùng duyệt web hoặc tương tác với
- ứng dụng khác.
- </li>
-
- <li>Các nhà sản xuất thiết bị có kích cỡ lớn hơn có thể chọn kích hoạt chế độ
- hình dạng tự do, trong đó người dùng có thể tự do thay đổi kích thước mỗi hoạt động. Nếu
- nhà sản xuất đã kích hoạt tính năng này, ngoài
- chế độ chia màn hình, thiết bị sẽ còn có chế độ hình dạng tự do.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>Hình 1.</strong> Hai ứng dụng chạy trong chế độ chia màn hình.
-</p>
-
-<p>
- Người dùng có thể chuyển vào trong chế độ đa cửa sổ bằng các cách sau:
-</p>
-
-<ul>
- <li>Nếu người dùng mở màn hình <a href="{@docRoot}guide/components/recents.html">Overview
- </a> và thực hiện nhấn giữ
- tiêu đề của hoạt động, họ có thể kéo hoạt động đó đến phần được tô sáng của
- màn hình để đặt hoạt động đó vào trong chế độ đa cửa sổ.
- </li>
-
- <li>Nếu người dùng thực hiện nhấn giữ nút Overview, thiết bị sẽ đặt
- hoạt động hiện tại vào trong chế độ đa cửa sổ, và mở màn hình Overview để
- cho phép người dùng chọn một hoạt động khác để chia sẻ màn hình.
- </li>
-</ul>
-
-<p>
- Người dùng có thể <a href="{@docRoot}guide/topics/ui/drag-drop.html">kéo và
- thả</a> từ một hoạt động sang một hoạt động khác trong khi các hoạt động này vẫn đang chia sẻ
- cùng một màn hình. (Trước đó, người dùng chỉ có thể kéo và thả dữ liệu trong một hoạt động
- đơn lẻ.)
-</p>
-
-<h2 id="lifecycle">Vòng đời đa cửa sổ</h2>
-
-<p>
- Chế độ đa cửa sổ không thay đổi <a href="{@docRoot}training/basics/activity-lifecycle/index.html">vòng đời
- của hoạt động</a>.
-</p>
-
-<p>
- Trong chế độ đa cửa sổ, chỉ hoạt động mà người dùng đã tương tác gần đây nhất
- mới hoạt động trong khoảng thời gian xác định. Hoạt động này được cân nhắc <em>ở trên cùng</em>.
- Tất cả các hoạt động khác sẽ ở trong tình trạng tạm dừng, ngay cả khi chúng vẫn hiển thị.
- Tuy nhiên, hệ thống sẽ cấp mức ưu tiên cao hơn cho hoạt động bị tạm dừng nhưng vẫn hiển thị này
- so với các hoạt động không hiển thị. Nếu người dùng tương tác với một trong những
- hoạt động bị tạm dừng, hoạt động đó sẽ được tiếp tục, và hoạt động trên cùng trước đó
- sẽ bị tạm dừng.
-</p>
-
-<p class="note">
- <strong>Lưu ý:</strong> Trong chế độ đa cửa sổ, một ứng dụng có thể trong trạng thái
- tạm dừng và vẫn hiển thị với người dùng. Ứng dụng có thể cần tiếp tục
- các hoạt động của nó thậm chí trong khi đamg bị tạm dừng. Ví dụ, một ứng dụng phát video đang ở trong
- chế độ tạm dừng nhưng vẫn hiển thị thì sẽ tiếp tục hiển thị video của nó. Vì lý do
- này, chúng tôi đề nghị các hoạt động phát video <em>không</em> tạm dừng
- video trong trình xử lý{@link android.app.Activity#onPause onPause()}.
- Thay vào đó, các ứng dụng nên tạm dừng video trong {@link android.app.Activity#onStop
- onStop()}, và tiếp tục phát lại trong {@link android.app.Activity#onStart
- onStart()}.
-</p>
-
-<p>
- Khi người dùng đặt một ứng dụng vào trong chế độ đa cửa sổ, hệ thống sẽ thông báo về
- hoạt động thay đổi cấu hình đó, như được quy định trong <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý Thay đổi
- Thời gian chạy</a>. Về cơ bản, thay đổi này có ngụ ý về vòng đời hoạt động tương tự
- vì khi hệ thống thông báo cho ứng dụng rằng thiết bị đã chuyển
- từ chế độ hướng dọc sang chế độ ngang, ngoại trừ trường hợp các kích thước của thiết bị
- đã được thay đổi thay vì chỉ bị hoán đổi. Như đã thảo luận trong phần <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Xử lý Thay đổi
- Thời gian chạy</a>, hoạt động của bạn có thể tự xử lý thay đổi cấu hình này, hoặc nó
- có thể cho phép hệ thống hủy hoạt động này và tạo lại nó với
- các kích thước mới.
-</p>
-
-<p>
- Nếu người dùng thay đổi kích thước của một cửa sổ và làm nó rộng hơn ở bất kỳ kích thước nào,
- hệ thống sẽ thay đổi kích thước của hoạt động để khớp với hành động của người dùng và phát hành <a href="{@docRoot}guide/topics/resources/runtime-changes.html">các thay đổi thời gian chạy</a>
- nếu cần. Nếu ứng dụng bị trễ lại trong khi vẽ các vùng mới được hiển thị,
- hệ thống sẽ tạm thời lấp đầy các vùng đó bằng một màu được quy định bởi thuộc tính {@link
- android.R.attr#windowBackground windowBackground} hoặc bằng thuộc tính kiểu
- <code>windowBackgroundFallback</code> mặc định.
-</p>
-
-<h2 id="configuring">Cấu hình Ứng dụng của bạn cho Chế độ Đa cửa sổ</h2>
-
-<p>
- Nếu ứng dụng của bạn nhắm đến Android N, bạn có thể cấu hình cách thức và
- liệu các hoạt động của ứng dụng có hỗ trợ hiển thị đa cửa sổ không. Bạn có thể đặt
- các thuộc tính trong bản kê khai của bạn để kiểm soát cả kích cỡ và bố trí.
- Cài đặt thuộc tính của hoạt động gốc sẽ áp dụng cho tất cả các hoạt động
- nằm trong ngăn xếp hoạt động của nó.
-</p>
-
-<p class="note">
- <strong>Lưu ý:</strong> Nếu bạn dựng một ứng dụng đa hướng bằng phiên bản
- SDK thấp hơn Android N, và người dùng sử dụng ứng dụng đó trong
- chế độ đa cửa sổ, hệ thống sẽ bắt buộc thay đổi kích thước của ứng dụng đó. Hệ thống sẽ hiển thị một
- hộp hội thoại cảnh báo người dùng rằng ứng dụng này có thể có hành vi không như kỳ vọng. Hệ thống
- <em>không</em> thay đổi kích cỡ của ứng dụng có hướng cố định; nếu
- người dùng cố mở một ứng dụng có hướng cố định dưới chế độ đa cửa sổ,
- ứng dụng này sẽ chiếm toàn bộ màn hình.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- Đặt thuộc tính này trong <code><activity></code> của bản kê khai của bạn hoặc node
- <code><application></code> để kích hoạt hoặc vô hiệu hóa hiển thị
- đa cửa sổ:
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- Nếu thuộc tính này được đặt thành true, hoạt động có thể được khởi chạy trong
- chế độ chia màn hình và hình dạng tự do. Nếu thuộc tính này được đặt thành false,
- hoạt động sẽ không hỗ trợ chế độ đa cửa sổ. Nếu giá trị này là false, và
- người dùng cố khởi chạy hoạt động trong chế độ đa cửa sổ, hoạt động đó sẽ
- chiếm toàn màn hình.
-</p>
-
-<p>
- Nếu ứng dụng của bạn nhắm đến Android N, nhưng bạn chưa quy định giá trị
- cho thuộc tính này, giá trị của thuộc tính sẽ mặc định đặt là true.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- Đặt thuộc tính này trong node <code><activity></code> của bản kê khai của bạn để
- cho biết liệu hoạt động này có hỗ trợ hiển thị ảnh trong ảnh hay không. Thuộc tính
- này được bỏ qua nếu <code>android:resizeableActivity</code> là false.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">Thuộc tính bố trí</h3>
-
-<p>
- Với Android N, phần tử bản kê khai <code><layout></code>
- có hỗ trợ một số thuộc tính sẽ ảnh hưởng đến cách hoạt động có hành vi như thế nào trong
- chế độ đa cửa sổ:
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- Chiều rộng mặc định của hoạt động khi được khởi chạy trong chế độ hình dạng tự do.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- Chiều cao mặc định của hoạt động khi được khởi chạy trong chế độ hình dạng tự do.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- Vị trí ban đầu của hoạt động khi được khởi chạy trong chế độ hình dạng tự do. Xem tham chiếu
- {@link android.view.Gravity} về các giá trị phù hợp.
- </dd>
-
- <dt>
- <code>android:minimalSize</code>
- </dt>
-
- <dd>
- Chiều cao và chiều rộng tối thiểu cho hoạt động trong cả chế độ chia màn hình
- và chế độ hình dạng tự do. Nếu người dùng di chuyển thanh phân chia trong chế độ chia màn hình
- để làm cho hoạt động nhỏ hơn mức tối thiểu quy định, hệ thống sẽ cắt xén
- hoạt động đó thành kích cỡ mà người dùng yêu cầu.
- </dd>
-</dl>
-
-<p>
- Ví dụ, đoạn mã sau đây sẽ cho biết cách quy định kích thước và vị trí mặc định
- của một hoạt động và kích thước tối thiểu của nó, khi hoạt động được hiển thị trong
- chế độ hình dạng tự do:
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalSize="450dp" />
-</activity>
-</pre>
-
-<h2 id="running">Chạy Ứng dụng của bạn trong Chế độ Đa cửa sổ</h2>
-
-<p>
- Android N có tính năng mới để hỗ trợ các ứng dụng có thể chạy
- trong chế độ đa cửa sổ.
-</p>
-
-<h3 id="disabled-features">Các tính năng bị vô hiệu hóa trong Chế độ Đa cửa sổ</h3>
-
-<p>
- Một số tính năng bị vô hiệu hóa hoặc bỏ qua khi một thiết bị đang ở chế độ
- đa cửa sổ bởi các tính năng này không có ý nghĩa đối với một hoạt động có thể đang chia sẻ
- màn hình thiết bị với các hoạt động hoặc ứng dụng khác. Các tính năng đó bao gồm:
-
-<ul>
- <li>Ví dụ, một vài tùy chọn tùy chỉnh <a href="{@docRoot}training/system-ui/index.html">System UI</a>
- sẽ bị vô hiệu hóa, ứng dụng không thể ẩn thanh trạng thái
- nếu chúng đang chạy trong chế độ toàn màn hình.
- </li>
-
- <li>Hệ thống sẽ bỏ qua các thay đổi đối với thuộc tính <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code>.
- </li>
-</ul>
-
-<h3 id="change-notification">Thông báo và truy vấn thay đổi đa cửa sổ</h3>
-
-<p>
- Các phương thức mới sau đây đã được thêm vào lớp {@link android.app.Activity}
- để hỗ trợ hiển thị đa cửa sổ. Để biết chi tiết về mỗi phương thức, xem
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham chiếu N Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>Activity.inMultiWindow()</code>
- </dt>
-
- <dd>
- Lệnh gọi để tìm hiểu xem hoạt động có đang ở chế độ đa cửa sổ hay không.
- </dd>
-
- <dt>
- <code>Activity.inPictureInPicture()</code>
- </dt>
-
- <dd>
- Lệnh gọi để tìm hiểu xem hoạt động có đang ở chế độ ảnh trong ảnh hay không.
-
- <p class="note">
- <strong>Lưu ý:</strong> Chế độ Ảnh trong ảnh là trường hợp đặc biệt
- của chế độ đa cửa sổ. Nếu <code>myActivity.inPictureInPicture()</code>
- trả về là true, thì <code>myActivity.inMultiWindow()</code> cũng trả về là
- true.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowChanged()</code>
- </dt>
-
- <dd>
- Hệ thống sẽ gọi phương thức này bất cứ khi nào hoạt động đi vào trong hay ra ngoài
- chế độ đa cửa sổ. Hệ thống sẽ chuyển cho phương thức giá trị true nếu
- hoạt động đang đi vào chế độ đa cửa sổ, và false nếu hoạt động
- đang rời chế độ đa cửa sổ.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureChanged()</code>
- </dt>
-
- <dd>
- Hệ thống sẽ gọi phương thức này bất cứ khi nào hoạt động đi vào trong hay ra ngoài
- chế độ ảnh trong ảnh. Hệ thống sẽ chuyển cho phương thức một giá trị true nếu
- hoạt động đang đi vào chế độ ảnh trong ảnh, và false nếu hoạt động
- đang rời chế độ ảnh trong ảnh.
- </dd>
-</dl>
-
-<p>
- Cũng có các phiên bản {@link android.app.Fragment} của từng phương thức
- này, ví dụ như <code>Fragment.inMultiWindow()</code>.
-</p>
-
-<h3 id="entering-pip">Vào chế độ ảnh trong ảnh</h3>
-
-<p>
- Để đặt một hoạt động vào trong chế độ ảnh trong ảnh, hãy gọi phương thức mới
- <code>Activity.enterPictureInPicture()</code>. Phương thức này sẽ không có ảnh hưởng nếu
- thiết bị không hỗ trợ chế độ ảnh trong ảnh. Để biết thêm thông tin,
- hãy xem tài liệu <a href="picture-in-picture.html">Ảnh trong ảnh</a>.
-</p>
-
-<h3 id="launch">Khởi chạy Hoạt động Mới trong Chế độ Đa cửa sổ</h3>
-
-<p>
- Khi bạn khởi chạy một hoạt động mới, bạn có thể gợi ý cho hệ thống rằng hoạt động
- mới sẽ được hiển thị liền kề hoạt động hiện tại, nếu có thể. Để thực hiện điều
- này, hãy dùng cờ
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Việc chuyển
- cờ này yêu cầu hành vi sau:
-</p>
-
-<ul>
- <li>Nếu thiết bị đang ở chế độ chia màn hình, hệ thống sẽ cố tạo ra
- hoạt động mới bên cạnh hoạt động đã khởi chạy nó, vì vậy hai hoạt động này
- sẽ chia sẻ cùng một màn hình. Hệ thống không được đảm bảo có thể làm được điều này, nhưng nó
- làm cho các hoạt động ở liền kề nhau nếu có thể.
- </li>
-
- <li>Nếu thiết bị không ở chế độ chia màn hình, cờ này sẽ không có tác dụng.
- </li>
-</ul>
-
-<p>
- Nếu thiết bị đang ở chế độ hình dạng tự do và bạn đang khởi chạy một hoạt động mới, bạn có thể
- quy định kích thước của hoạt động mới và vị trí màn hình bằng cách gọi
- <code>ActivityOptions.setLaunchBounds()</code>. Phương thức này sẽ không có ảnh hưởng nếu
- thiết bị không ở chế độ đa cửa sổ.
-</p>
-
-<p class="note">
- <strong>Lưu ý:</strong> Nếu bạn khởi chạy một hoạt động trong một ngăn xếp tác vụ, hoạt động
- này sẽ thay thế hoạt động trên màn hình, kế thừa tất cả các thuộc tính đa cửa sổ
- của nó. Nếu bạn muốn khởi chạy hoạt động mới dưới dạng một cửa sổ
- riêng trong chế độ đa cửa sổ, bạn phải khởi chạy nó trong một ngăn xếp tác vụ mới.
-</p>
-
-<h3 id="dnd">Hỗ trợ kéo và thả</h3>
-
-<p>
- Người dùng có thể <a href="{@docRoot}guide/topics/ui/drag-drop.html">kéo và
- thả</a> dữ liệu từ một hoạt động này sang một hoạt động khác trong khi các hoạt động này vẫn đang
- chia sẻ cùng một màn hình. (Trước đó, người dùng chỉ có thể kéo và thả dữ liệu trong một
- hoạt động đơn lẻ.) Vì lý do này, bạn có thể muốn thêm tính năng kéo và thả
- vào ứng dụng của bạn nếu ứng dụng của bạn hiện không hỗ trợ tính năng này.
-</p>
-
-<p>
- N Preview SDK mở rộng gói <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- để hỗ trợ kéo và thả giữa các ứng dụng. Để biết chi tiết về các lớp và phương thức
- sau, hãy xem <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham chiếu N
- Preview SDK</a>.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- Đối tượng mã thông báo chịu trách nhiệm về việc quy định các quyền cấp cho ứng dụng
- nhận được thao tác thả.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- Bí danh mới cho {@link android.view.View#startDrag View.startDrag()}. Để
- kích hoạt kéo và thả giữa các hoạt động, hãy chuyển cờ mới
- <code>View.DRAG_FLAG_GLOBAL</code>. Nếu bạn cần cấp quyền URI cho
- hoạt động của đối tượng nhận, hãy chuyển các cờ mới
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> hoặc
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, nếu phù hợp.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- Hủy thao tác kéo hiện đang diễn ra. Chỉ có thể được gọi bằng
- ứng dụng đã khởi nguồn thao tác kéo đó.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- Thay thế bóng kéo cho thao tác kéo hiện đang diễn ra. Chỉ có thể
- được gọi bằng ứng dụng đã khởi nguồn thao tác kéo đó.
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- Yêu cầu các quyền cho URI nội dung đã chuyển với {@link
- android.content.ClipData} có chứa trong {@link android.view.DragEvent}.
- </dd>
-</dl>
-
-<h2 id="testing">Kiểm thử Hỗ trợ Đa cửa sổ của Ứng dụng của bạn</h2>
-
-<p>
- Dù cho bạn có cập nhật ứng dụng của mình lên Android N hay không, bạn cũng nên
- xác minh cách thiết bị có hành vi như thế nào trong chế độ đa cửa sổ trong trường hợp người dùng cố khởi chạy nó
- ở chế độ đa cửa sổ trên thiết bị chạy Android N.
-</p>
-
-<h3 id="configuring">Cấu hình Thiết bị Kiểm thử</h3>
-
-<p>
- Nếu bạn cài đặt Android N trên thiết bị, chế độ chia màn hình
- sẽ được tự động hỗ trợ.
-</p>
-
-<h3 id="test-non-n">Nếu ứng dụng của bạn không được dựng bằng N Preview SDK</h3>
-
-<p>
- Nếu bạn dựng ứng dụng của mình bằng N Preview SDK, và người dùng cố sử dụng ứng dụng này
- trong chế độ đa cửa sổ, hệ thống sẽ bắt buộc thay đổi kích thước của ứng dụng đó trừ khi ứng dụng này
- khai báo hướng cố định.
-</p>
-
-<p>
- Nếu ứng dụng không khai báo hướng cố định, bạn nên khởi chạy ứng dụng của bạn
- trên thiết bị đang chạy Android N và cố đặt ứng dụng vào trong
- chế độ chia màn hình. Xác minh rằng trải nghiệm người dùng là
- chấp nhận được khi ứng dụng bị bắt buộc thay đổi kích cỡ.
-</p>
-
-<p>
- Nếu ứng dụng khai báo hướng cố định, bạn nên cố đặt ứng dụng vào trong
- chế độ đa cửa sổ. Xác minh xem khi bạn làm như vậy, ứng dụng vẫn giữ
- ở chế độ toàn màn hình.
-</p>
-
-<h3 id="test-mw">Nếu bạn hỗ trợ chế độ đa cửa sổ</h3>
-
-<p>
- Nếu bạn dựng ứng dụng của bạn bằng N Preview SDK và chưa vô hiệu hóa
- hỗ trợ đa cửa sổ, hãy xác minh hành vi sau dưới chế độ chia màn hình
- và chế độ hình dạng tự do.
-</p>
-
-<ul>
- <li>Khởi chạy ứng dụng trong chế độ toàn màn hình, rồi chuyển sang chế độ đa cửa sổ bằng cách
- nhấn giữ nút Overview. Xác minh rằng ứng dụng đã chuyển đổi đúng cách.
- </li>
-
- <li>Khởi chạy ứng dụng trực tiếp trong chế độ đa cửa sổ, và xác thực rằng ứng dụng này
- khởi chạy đúng cách. Bạn có thể khởi chạy ứng dụng trong chế độ đa cửa sổ bằng cách nhấn vào nút
- Overview, rồi nhấn giữ vào thanh tiều đề của ứng dụng của bạn và kéo nó
- đến một trong những vùng được tô sáng trên màn hình.
- </li>
-
- <li>Thay đổi kích thước ứng dụng của bạn trong chế độ chia màn hình bằng cách kéo đường phân chia.
- Xác minh rằng ứng dụng thay đổi kích thước mà không bị lỗi, và các phần tử UI cần thiết
- vẫn hiển thị.
- </li>
-
- <li>Nếu bạn đã quy định các kích cỡ tối thiểu cho ứng dụng của bạn, hãy cố thay đổi kích thước của ứng dụng
- sao cho nhỏ hơn các kích thước đã quy định đó. Xác minh rằng bạn không thể thay đổi kích cỡ của ứng dụng để
- nhỏ hơn kích cỡ tối thiểu đã quy định.
- </li>
-
- <li>Thông qua tất cả các bài kiểm thử, hãy xác minh rằng hiệu năng của ứng dụng của bạn là có thể chấp nhận được. Ví
- dụ, xác minh rằng sẽ không bị trễ quá lâu để cập nhật UI sau khi
- ứng dụng bị thay đổi kích thước.
- </li>
-</ul>
-
-<h4 id="test-checklist">Danh sách kiểm thử</h4>
-
-<p>
- Để xác minh hiệu năng ứng dụng của bạn trong chế độ đa cửa sổ, hãy thử các thao tác
- sau. Bạn nên thử các thao tác này trong cả chế độ chia màn hình và
- chế độ đa cửa sổ, trừ khi có lưu ý khác.
-</p>
-
-<ul>
- <li>Vào và rời chế độ đa cửa sổ.
- </li>
-
- <li>Hãy chuyển từ ứng dụng của bạn sang ứng dụng khác, và xác minh rằng ứng dụng có hành vi
- đúng cách trong khi nó hiển thị nhưng không hoạt động. Ví dụ nếu ứng dụng của bạn đang
- phát video, hãy xác minh rằng video tiếp tục phát trong khi người dùng đang
- tương tác với một ứng dụng khác.
- </li>
-
- <li>Trong chế độ chia màn hình, hãy thử di chuyển thanh phân chia để làm cho ứng dụng của bạn
- rộng hơn và nhỏ hơn. Thử các thao tác này trong cả cấu hình song song và
- trên dưới. Xác minh rằng ứng dụng không bị treo,
- các chức năng thiết yếu vẫn hiển thị, và thao tác thay đổi kích cỡ không quá
- lâu.
- </li>
-
- <li>Thực hiện một vài thao tác thay đổi kích cỡ nối tiếp nhau thật nhanh. Xác minh rằng ứng dụng
- của bạn không bị lỗi hoặc bị rò rỉ bộ nhớ. Để biết thông tin về kiểm tra việc sử dụng bộ nhớ của
- ứng dụng, xem <a href="{@docRoot}tools/debugging/debugging-memory.html">
- Kiểm tra Sử dụng RAM của bạn</a>.
- </li>
-
- <li>Sử dụng ứng dụng của bạn như thông thường trong một số cấu hình cửa sổ khác nhau, và
- xác minh rằng ứng dụng có hành vi bình thường. Xác minh rằng có thể đọc được các chữ và
- các phần tử UI không quá nhỏ để tương tác với chúng.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">Nếu bạn đã vô hiệu hóa hỗ trợ đa cửa sổ</h3>
-
-<p>
- Nếu bạn đã vô hiệu hóa hỗ trợ đa cửa sổ bằng cách đặt
- <code>android:resizableActivity="false"</code>, bạn nên khởi chạy ứng dụng của mình trên
- thiết bị chạy Android N và cố đặt ứng dụng này vào trong
- cả chế độ hình dạng tự do và chế độ chia màn hình. Xác minh xem khi bạn làm như vậy, ứng dụng vẫn giữ
- ở chế độ toàn màn hình.
-</p>
diff --git a/docs/html-intl/intl/vi/preview/features/notification-updates.jd b/docs/html-intl/intl/vi/preview/features/notification-updates.jd
index d80cf6c..f60646a 100644
--- a/docs/html-intl/intl/vi/preview/features/notification-updates.jd
+++ b/docs/html-intl/intl/vi/preview/features/notification-updates.jd
@@ -37,7 +37,7 @@
thông báo, từng thông báo một từ khu vực hiển thị thông báo.
</p>
-<p>Cuối cùng, Android N cũng thêm các API mới cho phép bạn tận dụng các trang trí
+<p>Cuối cùng, Android N cũng thêm các API mới cho phép bạn tận dụng các trang trí
của hệ thống trong các dạng xem thông báo tùy chỉnh của ứng dụng của bạn. Các API này giúp
đảm bảo rằng dạng xem thông báo có chung một cách trình bày nhất quán
với các mẫu tiêu chuẩn.</p>
@@ -69,9 +69,9 @@
</p>
<ol>
-<li>Tạo thực thể{@link android.support.v4.app.RemoteInput.Builder}
+<li>Tạo thực thể{@link android.support.v4.app.RemoteInput.Builder}
mà bạn có thể thêm vào hành động
-thông báo của bạn. Hàm dựng của lớp này sẽ chấp nhận xâu mà hệ thống sử dụng làm khóa
+thông báo của bạn. Hàm dựng của lớp này sẽ chấp nhận xâu mà hệ thống sử dụng làm khóa
cho nhập liệu văn bản. Sau đó, ứng dụng cầm tay của bạn sử dụng khóa đó để truy xuất văn bản
nhập liệu.
diff --git a/docs/html-intl/intl/vi/preview/features/picture-in-picture.jd b/docs/html-intl/intl/vi/preview/features/picture-in-picture.jd
deleted file mode 100644
index 4b3cb40..0000000
--- a/docs/html-intl/intl/vi/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Ảnh trong ảnh
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Trong tài liệu này</h2>
-<ol>
- <li><a href="#declaring">Khai báo Hoạt động hỗ trợ
-Ảnh trong ảnh</a></li>
- <li><a href="#pip_button">Chuyển Hoạt động sang Ảnh trong ảnh</a>
-</li>
- <li><a href="#handling_ui">Xử lý UI trong chế độ Ảnh trong ảnh</a>
-</li>
- <li><a href="#continuing_playback">Tiếp tục phát lại video ở chế độ
-Ảnh trong ảnh</a></li>
- <li><a href="#best">Thực hành Tốt nhất</a></li>
-</ol>
-
-<h2>Xem thêm</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">Hỗ trợ
-đa cửa sổ</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>Trong Android N, người dùng Android TV đã có thể xem video
-trong một cửa sổ được ghim vào một góc màn hình khi điều hướng bên trong
-các ứng dụng. Chế độ Ảnh trong ảnh (PIP) cho phép ứng dụng chạy một hoạt động
-video trong cửa sổ được ghim trong khi một hoạt động khác tiếp tục chạy
-ngầm. Cửa sổ PIP cho phép người dùng thực hiện nhiều việc khi đang sử dụng ứng dụng của bạn,
-giúp cho người dùng năng suất hơn.</p>
-
-<p>Ứng dụng của bạn có thể quyết định khi nào thì kích hoạt chế độ PIP. Sau đây là một vài ví dụ về
-thời điểm chuyển vào chế độ PIP:</p>
-
-<ul>
-<li>Ứng dụng của bạn có thể chuyển một video vào chế độ PIP khi người dùng điều hướng
-rời khỏi video đó để duyệt nội dung khác.</li>
-<li>Ứng dụng của bạn có thể chuyển một video sang chế độ PIP khi người dùng xem đoạn cuối
- của một tập nội dung. Màn hình chính sẽ hiển thị thông tin quảng cáo
-hoặc tóm tắt về tập tiếp theo trong loạt video đó.</li>
-<li>Ứng dụng của bạn có thể mang lại cho người dùng một cách để xếp hàng các nội dung bổ sung khi
-họ đang xem một video. Video đó sẽ tiếp tục được phát trong chế độ PIP trong khi màn hình
-chính hiển thị hoạt động chọn nội dung.</li>
-</ul>
-
-<p>Cửa sổ PIP có kích thước 240x135 dp và được hiển thị trên lớp trên cùng ở một trong
-bốn góc của màn hình được hệ thống chọn. Người dùng có thể gọi ra một menu PIP
-, cho phép họ bật tắt cửa sổ PIP lên toàn màn hình hoặc đóng cửa sổ
-PIP bằng cách bấm giữ nút <b>Home</b> trên điều khiển từ xa. Nếu một video
-khác bắt đầu phát trên màn hình chính, cửa sổ PIP sẽ tự động
-được đóng. Người dùng cũng có thể đóng cửa sổ PIP thông qua nút Recents.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>Hình 1.</strong> Một video Ảnh trong ảnh
-được hiển thị ở góc màn hình khi người dùng duyệt nội dung
-trên màn hình chính.</p>
-
-<p>PIP sử dụng các API đa cửa sổ có trong Android N để
-tạo cửa sổ video nằm chồng được ghim. Để thêm chế độ PIP vào ứng dụng bạn cần
-đăng ký các hoạt động hỗ trợ PIP, chuyển hoạt động của bạn sang chế độ PIP khi
-cần và đảm bảo cho các phần tử UI sẽ bị ẩn đi và phát lại video vẫn tiếp tục khi
-hoạt động đó ở trong chế độ PIP.</p>
-
-<h2 id="declaring">Khai báo Hoạt động hỗ trợ Ảnh trong ảnh</h2>
-
-<p>Theo mặc định, hệ thống không tự động hỗ trợ PIP cho các ứng dụng.
-Nếu bạn muốn hỗ trợ chế độ PIP trong ứng dụng của mình, hãy đăng ký hoạt động
-video trong bản kê khai bằng cách đặt
-<code>android:supportsPictureInPicture</code> và
-<code>android:resizeableActivity</code> thành <code>true</code>. Ngoài ra, hãy chỉ định
-hoạt động của bạn xử lý các thay đổi cấu hình bố trí để hoạt động đó
-không khởi chạy lại khi có các thay đổi về bố trí trong quá trình chuyển tiếp chế độ PIP.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>Khi đăng ký hoạt động của bạn, hãy nhớ rằng trong chế độ PIP, hoạt động
-của bạn sẽ được hiển thị trong một cửa sổ nhỏ nằm chồng trên màn hình TV. Các hoạt động
-phát lại video với UI tối giản sẽ đem đến trải nghiệm người dùng tốt nhất. Các hoạt động
-có chứa những phần tử UI nhỏ có thể không đem lại trải nghiệm người dùng đạt yêu cầu
-khi được chuyển sang chế độ PIP bởi người dùng không thể thấy các chi tiết của phần tử UI
-trong cửa sổ PIP.</p>
-
-<h2 id="pip_button">Chuyển Hoạt động sang Ảnh trong ảnh</h2>
-
-Khi bạn cần chuyển hoạt động của mình sang chế độ PIP, hãy gọi
-<code>Activity.enterPictureInPicture()</code>. Ví dụ sau sẽ chuyển
-sang chế độ PIP khi người dùng chọn một nút PIP riêng trên thanh điều khiển
-media:</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPicture();
- return;
- }
- ...
-</pre>
-
-<p>Thêm một nút PIP vào thanh điều khiển media của bạn sẽ cho phép người dùng dễ dàng chuyển
-sang chế độ PIP khi điều khiển phát lại video.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>Hình 1.</strong> Một nút Ảnh trong ảnh
-trên thanh điều khiển media.</p>
-
-<p>Android N có một lớp
-<code>PlaybackControlsRow.PictureInPictureAction</code> mới định nghĩa
-các hành động ở chế độ PIP trên thanh điều khiển và sử dụng biểu tượng PIP.</p>
-
-<h2 id="handling_ui">Xử lý UI trong chế độ Ảnh trong ảnh</h2>
-
-<p>Khi hoạt động của bạn vào trong chế độ PIP thì hoạt động đó chỉ nên hiển thị phát lại
-video. Hãy xóa các phần tử UI trước khi hoạt động của bạn vào chế độ PIP,
-và khôi phục các phần tử này khi hoạt động quay lại chế độ toàn màn hình.
-Ghi đè phương thức <code>Activity.onPictureInPictureChanged()</code> hoặc
-<code>Fragment.onPictureInPictureChanged()</code> và bật hoặc
-tắt các phần tử UI khi cần thiết, ví dụ:</p>
-
-<pre>
-@Override
-public void onPictureInPictureChanged(boolean inPictureInPicture) {
- if (inPictureInPicture) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">Tiếp tục phát lại video ở chế độ
-Ảnh trong ảnh</h2>
-
-<p>Khi hoạt động của bạn chuyển sang chế độ PIP thì hệ thống sẽ coi hoạt động đó đang ở trong
-trạng thái tạm dừng và sẽ gọi phương thức <code>onPause()</code> của hoạt động. Việc phát lại
-video không nên được tạm dừng và cần được tiếp tục phát nếu hoạt động
-bị tạm dừng do chế độ PIP. Hãy kiểm tra chế độ PIP trong phương thức
-<code>onPause()</code> của hoạt động và xử lý việc phát lại cho phù hợp, ví
-dụ:</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called due to PIP, do not pause playback
- if (inPictureInPicture()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>Khi hoạt động của bạn chuyển ra khỏi chế độ PIP để quay trở về chế độ toàn màn hình thì
-hệ thống sẽ tiếp tục hoạt động của bạn và gọi phương thức <code>onResume()</code>.</p>
-
-<h2 id="best">Thực hành Tốt nhất</h2>
-
-<p>PIP được dành cho các hoạt động phát lại video toàn màn hình. Khi chuyển
-hoạt động của bạn vào chế độ PIP, hãy tránh hiển thị bất kỳ nội dung nào ngoài video.
-Theo dõi khi hoạt động của bạn vào chế độ PIP và ẩn đi các phần tử UI, như mô tả
-trong <a href="#handling_ui">Xử lý UI trong chế độ Ảnh trong ảnh</a>.</p>
-
-<p>Vì cửa sổ PIP được hiển thị dưới dạng cửa sổ nổi ở góc
-màn hình do đó bạn cần tránh hiển thị các thông tin quan trọng trong màn hình chính
-ở bất kỳ vùng nào có thể bị che khuất bởi cửa sổ PIP.</p>
-
-<p>Theo mặc định, khi một hoạt động đang ở trong chế độ PIP thì nó sẽ không nhận tiêu điểm nhập vào. Để
-tiếp nhận các sự kiện nhập vào khi ở chế độ PIP, hãy sử dụng
-<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/vi/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/vi/preview/features/scoped-folder-access.jd
deleted file mode 100644
index d6db0ec..0000000
--- a/docs/html-intl/intl/vi/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,124 +0,0 @@
-page.title=Truy cập Thư mục theo Phạm vi
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Trong tài liệu này</h2>
- <ol>
- <li><a href="#accessing">Truy cập một Thư mục lưu trữ bên ngoài</a></li>
- <li><a href="#removable">Truy cập một Thư mục trên Phương tiện tháo lắp được</a></li>
- <li><a href="#best">Thực hành Tốt nhất</a></li>
- </ol>
-</div>
-</div>
-
-<p>Các ứng dụng như ứng dụng ảnh thường chỉ cần truy cập đến các thư mục đã quy định trong
-bộ nhớ ngoài như thư mục <code>Pictures</code>. Các phương pháp
- hiện tại để truy cập bộ nhớ lưu trữ ngoài vẫn chưa được thiết kế để dễ dàng cho phép
-truy cập thư mục đích cho những kiểu ứng dụng này. Ví dụ:</p>
-
-<ul>
-<li>Việc yêu cầu {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-hoặc {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} trong bản kê khai của bạn
-sẽ cho phép truy cập đến tất cả các thư mục công khai trên bộ nhớ lưu trữ ngoài, mà có thể
-cấp nhiều quyền truy cập hơn những gì ứng dụng của bạn cần.</li>
-<li>Sử dụng
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Khuôn khổ
- Truy cập Kho lưu trữ</a> thường khiến người dùng chọn thư mục
-thông qua UI hệ thống. Đây là điều không cần thiết nếu ứng dụng của bạn luôn truy cập cùng
-một thư mục bên ngoài.</li>
-</ul>
-
-<p>Android N cung cấp một API mới được đơn giản hóa để truy cập
-các thư mục lưu trữ bên ngoài thường dùng. </p>
-
-<h2 id="accessing">Truy cập một Thư mục lưu trữ bên ngoài</h2>
-
-<p>Sử dụng lớp <code>StorageManager</code> để lấy thực thể
-<code>StorageVolume</code> phù hợp. Sau đó tạo một ý định bằng cách gọi phương thức
-<code>StorageVolume.createAccessIntent()</code> của thực thể đó.
-Sử dụng ý định này để truy cập các thư mục lưu trữ bên ngoài. Để lấy danh sách
-tất cả các ổ đĩa, bao gồm các ổ đĩa media có thể tháo lắp, hãy sử dụng
-<code>StorageManager.getVolumesList()</code>.</p>
-
-<p>Đoạn mã sau là một ví dụ về cách mở thư mục
-<code>Pictures</code> trong bộ nhớ lưu trữ chính được chia sẻ:</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>Hệ thống sẽ cố gắng cấp quyền truy cập tới thư mục bên ngoài và nếu
-cần sẽ xác nhận quyền truy cập với người dùng bằng một UI được đơn giản hóa:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>Hình 1.</strong> Một ứng dụng yêu cầu
-truy cập tới thư mục Pictures.</p>
-
-<p>Nếu người dùng cấp quyền truy cập, hệ thống sẽ gọi phương thức ghi đè
-<code>onActivityResult()</code> của bạn với mã kết quả là
-<code>Activity.RESULT_OK</code> và dữ liệu ý định có chứa URI. Hãy sử dụng
-URI được cung cấp để truy cập thông tin thư mục, giống như sử dụng các URI
-được trả về bởi
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Khuôn khổ
- Truy cập Kho lưu trữ</a>.</p>
-
-<p>Nếu người dùng không cấp quyền truy cập, hệ thống sẽ gọi phương thức ghi đè
-<code>onActivityResult()</code> của bạn với mã kết quả là
-<code>Activity.RESULT_CANCELED</code> và dữ liệu ý định có giá trị null.</p>
-
-<p class="note"><b>Lưu ý</b>: Lấy quyền truy cập tới một thư mục bên ngoài được chỉ định
-cũng sẽ cấp quyền truy cập tới các thư mục con thuộc thư mục đó.</p>
-
-<h2 id="removable">Truy cập một Thư mục trên phương tiện tháo lắp được</h2>
-
-<p>Để sử dụng Truy cập Thư mục theo Phạm vi nhằm truy cập các thư mục trên phương tiện có thể tháo lắp,
-trước hết, hãy thêm một {@link android.content.BroadcastReceiver} để lắng nghe
-thông báo {@link android.os.Environment#MEDIA_MOUNTED}, ví dụ:</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Khi người dùng kết nối một phương tiện có thể tháo lắp như thẻ SD thì hệ thống sẽ gửi một thông báo
-{@link android.os.Environment#MEDIA_MOUNTED}. Thông báo này
-sẽ cung cấp một đối tượng <code>StorageVolume</code> trong dữ liệu ý định mà bạn có thể
-sử dụng để truy cập các thư mục trên phương tiện có thể tháo lắp đó. Ví dụ sau
-sẽ truy cập thư mục <code>Pictures</code> trên phương tiện có thể tháo lắp:</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">Thực hành Tốt nhất</h2>
-
-<p>Khi có thể, hãy duy trì URI truy cập thư mục bên ngoài để bạn không phải
-lặp lại yêu cầu người dùng cấp quyền truy cập. Khi người dùng đã cấp quyền truy cập, hãy gọi
-<code>getContentResolver().takePersistableUriPermssion()</code> với
-URI truy cập thư mục. Hệ thống sẽ duy trì URI và các yêu cầu
-truy cập sau này sẽ trả về <code>RESULT_OK</code> và không hiển thị UI xác nhận cho
-người dùng nữa.</p>
-
-<p>Nếu người dùng từ chối quyền truy cập đến một thư mục bên ngoài thì đừng
-yêu cầu truy cập lại ngay lập tức. Lặp đi lặp lại yêu cầu truy cập sẽ dẫn đến trải nghiệm
-người dùng không tốt.</p>
diff --git a/docs/html-intl/intl/vi/preview/features/security-config.jd b/docs/html-intl/intl/vi/preview/features/security-config.jd
deleted file mode 100644
index 797e198..0000000
--- a/docs/html-intl/intl/vi/preview/features/security-config.jd
+++ /dev/null
@@ -1,745 +0,0 @@
-page.title=Cấu hình Bảo mật mạng
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Trong tài liệu này</h2>
-<ol>
- <li><a href="#manifest">Thêm một tệp Cấu hình Bảo mật mạng</a></li>
- <li><a href="#CustomTrust">Tùy chỉnh các CA đáng tin cậy</a>
- <ol>
- <li><a href="#ConfigCustom">Cấu hình một CA tùy chỉnh đáng tin cậy</a></li>
- <li><a href="#LimitingCas">Giới hạn bộ CA đáng tin cậy</a></li>
- <li><a href="#TrustingAdditionalCas">Tin cậy các CA bổ sung</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">Các CA chỉ trong chế độ gỡ lỗi</a></li>
- <li><a href="#UsesCleartextTraffic">Không sử dụng truyền gửi văn bản chưa mã hóa</a></li>
- <li><a href="#CertificatePinning">Ghim chứng chỉ</a></li>
- <li><a href="#ConfigInheritance">Hành vi Kế thừa cấu hình</a></li>
- <li><a href="#FileFormat">Định dạng Tệp cấu hình</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N có tính năng Cấu hình Bảo mật mạng
- cho phép ứng dụng tùy chỉnh các cài đặt bảo mật mạng trong một tệp
- cấu hình khai báo an toàn mà không cần sửa đổi mã nguồn ứng dụng. Các cài đặt này có thể
- được cấu hình cho các miền cụ thể và cho một ứng dụng cụ thể. Các khả năng
- chính của tính năng này như sau:
-</p>
-
-<ul>
- <li>
- <b>Nguồn tin cậy tùy chỉnh:</b> Tùy chính các Nhà cung cấp chứng chỉ (CA)
- nào được tin cậy cho các kết nối bảo mật của một ứng dụng. Ví
- dụ, tin cậy các chứng chỉ tự ký đặc biệt hoặc hạn chế
- bộ CA công khai mà ứng dụng tin cậy.
- </li>
-
- <li>
- <b>Chỉ khống chế khi gỡ lỗi:</b> Gỡ lỗi các kết nối bảo mật một cách an toàn trong một ứng dụng
- mà không thêm rủi ro cho cơ sở cài đặt.
- </li>
-
- <li>
- <b>Không sử dụng truyền gửi văn bản chưa mã hóa:</b> Bảo vệ các ứng dụng khỏi việc
- vô tình sử dụng truyền gửi văn bản chưa mã hóa.
- </li>
-
- <li>
- <b>Ghim chứng chỉ:</b> Giới hạn kết nối bảo mật của ứng dụng
- trong các chứng chỉ đặc biệt.
- </li>
-</ul>
-
-
-<h2 id="manifest">Thêm một Tệp Cấu hình Bảo mật mạng</h2>
-
-<p>
- Tính năng Cấu hình Bảo mật mạng sử dụng một tệp XML làm nơi bạn sẽ chỉ định
- các cài đặt cho ứng dụng của mình. Bạn phải bổ sung một mục nhập trong bản kê khai của
- ứng dụng để trỏ đến tệp này. Đoạn mã sau của một bản kê khai
- minh họa cách tạo mục nhập này:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-...
-<app ...>
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
-</app>
-</pre>
-
-<h2 id="CustomTrust">Tùy chỉnh các CA đáng tin cậy</h2>
-
-<p>
- Một ứng dụng có thể muốn tin cậy một bộ các CA tùy chỉnh thay vì mặc định
- của nền tảng. Những lý do phổ biến nhất cho điều này là:
-</p>
-
-<ul>
- <li>Kết nối tới một máy chủ có nhà cung cấp chứng chỉ riêng (tự ký,
- được cấp bởi một CA nội bộ của công ty, v.v.).
- </li>
-
- <li>Giới hạn bộ CA chỉ trong các CA mà bạn tin cậy thay vì mọi
- CA được cài đặt trước.
- </li>
-
- <li>Tin cậy các CA bổ sung không được kèm theo trong hệ thống.
- </li>
-</ul>
-
-<p>
- Theo mặc định, các kết nối bảo mật (vd: TLS, HTTPS) từ mọi ứng dụng sẽ tin cậy
- các CA của hệ thống được cài đặt trước và các ứng dụng nhắm mục tiêu mức API 23
- (Android M) và thấp hơn theo mặc định cũng tin cậy kho lưu trữ CA được người dùng bổ sung. Một
- ứng dụng có thể tùy chỉnh các kết nối của riêng nó bằng cách sử dụng {@code base-config} (dành cho
- tùy chỉnh trên phạm vi ứng dụng) hoặc {@code domain-config} (tùy chỉnh
- cho mỗi miền).
-</p>
-
-
-<h3 id="ConfigCustom">Cấu hình một CA tùy chỉnh</h3>
-
-<p>
- Giả sử bạn muốn kết nối tới máy chủ của mình có sử dụng các chứng chỉ
- SSL tự ký hoặc tới một máy chủ có chứng chỉ SSL được cấp bởi một CA không công khai
- mà bạn tin cậy, chẳng hạn như CA nội bộ của công ty.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Thêm chứng chỉ CA tự ký hoặc không công khai theo định dạng PEM hoặc DER vào
- {@code res/raw/my_ca}.
-</p>
-
-
-<h3 id="LimitingCas">Giới hạn bộ CA đáng tin cậy</h3>
-
-<p>
- Một ứng dụng không muốn tin cậy mọi CA được hệ thống tin cậy có thể
- chỉ định bộ CA hạn chế của riêng nó để tin cậy. Điều này sẽ bảo vệ
- ứng dụng khỏi các chứng chỉ lừa đảo được cấp bởi bất kỳ CA nào khác.
-</p>
-
-<p>
- Cấu hình để giới hạn bộ CA đáng tin cậy cũng giống như <a href="#TrustingACustomCa">Tin cậy một CA tùy chỉnh</a> cho một miền cụ thể ngoại trừ
- việc nhiều CA được cung cấp trong tài nguyên.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Thêm các CA đáng tin cậy theo định dạng PEM hoặc DER vào {@code res/raw/trusted_roots}.
- Lưu ý rằng nếu sử dụng định dạng PEM thì tệp <em>chỉ</em> được chứa dữ liệu PEM
- và không có thêm dữ liệu văn bản. Bạn cũng có thể cung cấp nhiều
- phần tử <a href="#certificates"><code><certificates></code></a>
- thay vì một phần tử.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- Tin cậy các CA bổ sung
-</h3>
-
-<p>
- Một ứng dụng có thể muốn tin cậy các CA bổ sung không được hệ thống tin cậy,
- điều này có thể do hệ thống chưa thêm CA đó hoặc một CA không
- đáp ứng các yêu cầu để đưa vào hệ thống Android. Một
- ứng dụng có thể thực hiện điều này bằng cách chỉ định nhiều nguồn chứng chỉ cho một
- cấu hình.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">Cấu hình các CA để gỡ lỗi</h2>
-
-<p>
- Khi gỡ lỗi một ứng dụng kết nối qua HTTPS thì bạn có thể muốn
- kết nối tới một máy chủ phát triển cục bộ không có chứng chỉ
- SSL dành cho máy chủ thương mại của bạn. Để hỗ trợ cho trường hợp này mà không cần
- chỉnh sửa mã nguồn ứng dụng của bạn thì bạn có thể chỉ định các CA chỉ dùng cho gỡ lỗi
- mà <i>chỉ</i> được tin cậy khi <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- là {@code true} bằng cách sử dụng {@code debug-overrides}. Thông thường các IDE và công cụ
- dựng sẽ đặt cờ này tự động đối với các bản dựng không dùng để phát hành.
-</p>
-
-<p>
- Làm như vậy an toàn hơn so với mã điều kiện thông thường bởi, là điều kiện
- bảo mật tiên quyết, các cửa hàng ứng dụng không chấp nhận các ứng dụng được đánh dấu
- là hỗ trợ gỡ lỗi.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">Không sử dụng truyền gửi văn bản chưa mã hóa</h2>
-
-<p>
- Các ứng dụng có ý định kết nối tới các điểm đích chỉ sử dụng các kết nối
- bảo mật có thể bỏ hỗ trợ truyền gửi văn bản không mã hóa (bằng giao thức
- HTTP không mã hóa thay vì HTTPS) tới các đích đó. Tùy chọn này giúp ngăn
- các hồi quy tiềm tàng trong ứng dụng do thay đổi trong các URL được cung cấp bởi các nguồn
- bên ngoài như các máy chủ phụ trợ.
- Hãy xem {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()} để biết thêm chi tiết.
-</p>
-
-<p>
- Ví dụ, một ứng dụng có thể đảm bảo rằng mọi kết nối tới {@code
- secure.example.com} luôn được thực hiện qua HTTPS để bảo vệ việc truyền gửi dữ liệu nhạy cảm
- khỏi các mạng có hại.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">Ghim chứng chỉ</h2>
-
-<p>
- Thông thường thì một ứng dụng sẽ tin cậy mọi CA được cài đặt sẵn. Nếu bất kỳ CA nào trong số này sẽ
- phát hành một chứng chỉ lừa đảo thì ứng dụng sẽ gặp phải rủi ro từ một cuộc tấn công
- MiTM. Một số ứng dụng chọn cách giới hạn bộ chứng chỉ được chúng chấp nhận
- bằng cách giới hạn bộ CA được ứng dụng tin cậy hoặc bằng cách ghim chứng chỉ.
-</p>
-
-<p>
- Ghim chứng chỉ được thực hiện bằng cách cung cấp một bộ chứng chỉ theo mã hash của
- khóa công khai (SubjectPublicKeyInfo của chứng chỉ X.509). Một chuỗi
- chứng chỉ khi đó chỉ hợp lệ nếu như chuỗi chứng chỉ có chứa ít nhất một trong
- các khóa công khai được ghim.
-</p>
-
-<p>
- Lưu ý rằng khi sử dụng ghim chứng chỉ bạn phải luôn kèm thêm một khóa
- dự phòng để nếu bạn bị buộc phải chuyển sang các khóa mới hoặc thay đổi các CA (khi
- ghim vào một chứng chỉ CA hoặc một chứng chỉ trung gian của CA đó) thì
- kết nối của ứng dụng sẽ không bị ảnh hưởng. Nếu không bạn phải đưa ra một
- bản cập nhật cho ứng dụng để khôi phục khả năng kết nối.
-</p>
-
-<p>
- Ngoài ra, có thể đặt thời gian hết hạn cho các ghim, sau thời gian đó
- sẽ không tiến hành ghim được. Điều này giúp phòng ngừa các vấn đề về kết nối trong
- ứng dụng chưa được cập nhật. Tuy nhiên, việc đặt thời gian hết hạn
- trên các ghim này có thể khiến ghim bị bỏ qua.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">Hành vi Kế thừa cấu hình</h2>
-
-<p>
- Các giá trị chưa được đặt trong một cấu hình cụ thể sẽ được kế thừa. Hành vi này cho phép tạo ra các cấu hình phức tạp
- hơn trong khi vẫn giữ cho tệp cấu hình có thể đọc được.
-</p>
-
-<p>
- Nếu một giá trị không được đặt trong một mục nhập cụ thể thì giá trị thuộc mục nhập
- bao quát hơn tiếp theo sẽ được sử dụng. Các giá trị chưa được đặt trong {@code domain-config} sẽ được
- lấy từ phần tử cha {@code domain-config} nếu như được lồng, hoặc từ {@code
- base-config} nếu không được lồng. Các giá trị chưa được đặt trong {@code base-config} sẽ sử dụng
- các giá trị mặc định của nền tảng.
-</p>
-
-<p>
- Ví dụ: hãy xem xét trường hợp tất cả các kết nối tới miền con của {@code
- example.com} phải sử dụng một bộ CA tùy chỉnh. Ngoài ra, truyền gửi văn bản không mã hóa tới
- các miền này được cho phép <em>trừ khi</em> kết nối tới {@code
- secure.example.com}. Bằng cách lồng cấu hình cho {@code
- secure.example.com} bên trong cấu hình cho {@code example.com} thì
- {@code trust-anchors} không cần phải được sao lặp.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">Định dạng Tệp cấu hình</h2>
-
-<p>
- Tính năng Cấu hình Bảo mật mạng sử dụng một định dạng tệp XML.
- Cấu trúc chung của tệp này được thể hiện trong đoạn mẫu mã nguồn sau:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- Các phần sau sẽ mô tả cú pháp và các chi tiết khác của định dạng
- tệp này.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- có thể chứa:
- </dt>
-
- <dd>
- 0 hoặc 1 của <code><a href="#base-config"><base-config></a></code><br>
- Bất kỳ số nào của <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 hoặc 1 của <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- cú pháp:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- có thể chứa:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- mô tả:
- </dt>
-
- <dd>
- Cấu hình mặc định được sử dụng bởi mọi kết nối có đích đến không được
- bao gồm bởi một <a href="#domain-config"><code>domain-config</code></a>.
-
-<p>
- Bất kỳ giá trị nào chưa được đặt sẽ sử dụng các giá trị mặc định của nền tảng. Cấu hình
- mặc định cho các ứng dụng nhắm mục tiêu API mức 24 trở lên:
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-Cấu hình mặc định cho các ứng dụng nhắm mục tiêu API mức 23 trở xuống:
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>cú pháp:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>Có thể chứa:</dt>
-
-<dd>
-1 hoặc nhiều <code><a href="#domain"><domain></a></code>
-<br/>0 hoặc 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 hoặc 1 <code><a href="#pin-set"><pin-set></code></a>
-<br/>Bất kỳ số nào của <code><domain-config></code> được lồng</dd>
-
-<dt>Mô tả</dt>
-<dd>Cấu hình được sử dụng cho các kết nối tới các điểm đích cụ thể theo như định nghĩa bởi các phần tử {@code domain}.
-
-<p>Lưu ý rằng nếu nhiều phần tử {@code domain-config} chứa một điểm đích thì cấu hình có quy tắc miền trùng khớp
-cụ thể nhất (dài nhất) sẽ được sử dụng.</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- cú pháp:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- Thuộc tính:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- Nếu {@code "true"} thì quy tắc miền này sẽ trùng với miền đó và tất cả
- các miền con, bao gồm các miền con của miền con, nếu không quy tắc đó chỉ
- áp dụng cho các trùng khớp tuyệt đối.
- </dd>
- </dl>
- </dd>
-
- <dt>
- Mô tả:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- cú pháp:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- Có thể chứa:
- </dt>
-
- <dd>
- 0 hoặc 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- Mô tả:
- </dt>
-
- <dd>
- Ghi đè được thực hiện khi <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- là {@code "true"} thì thường là trường hợp dành cho các bản dựng không phát hành
- được tạo ra bởi các IDE hoặc công cụ dựng. Các nguồn tin cậy được chỉ định trong {@code
- debug-overrides} được thêm vào tất cả các cấu hình khác và ghim
- chứng chỉ không được thực hiện khi chuỗi chứng chỉ của máy chủ sử dụng một trong
- các nguồn tin cậy chỉ dành cho gỡ lỗi này. Nếu <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- là {@code "false"} thì phần này bị bỏ qua hoàn toàn.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- cú pháp:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- Có thể chứa:
- </dt>
-
- <dd>
- Bất kỳ số nào của <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- Mô tả:
- </dt>
-
- <dd>
- Đặt nguồn tin cậy cho các kết nối bảo mật:
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>cú pháp:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>mô tả:</dt>
-<dd>Bộ các chứng chỉ X.509 cho các phần tử {@code trust-anchors}.</dd>
-
-<dt>thuộc tính:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-Nguồn của các chứng chỉ CA, có thể là một
-<ul>
- <li>id nguồn thô trỏ tới một tệp có chứa các chứng chỉ X.509.
- Các chứng chỉ phải được mã hóa theo định dạng DER hoặc PEM. Trong trường hợp của các chứng chỉ
-PEM thì tệp đó <em>không được</em> chứa dữ liệu không phải PEM khác như
- các chú thích.
- </li>
-
- <li>{@code "system"} cho các chứng chỉ CA hệ thống được cài đặt sẵn
- </li>
-
- <li>{@code "user"} cho các chứng chỉ CA do người dùng thêm vào
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- Xác định xem liệu các CA từ nguồn này có bỏ qua việc ghim chứng chỉ hay không. Nếu {@code
- "true"} thì các chuỗi chứng chỉ mà xâu qua một trong các CA từ nguồn
- này thì khi đó ghim sẽ không được thực hiện. Đây có thể là điều có ích cho các CA gỡ lỗi
- hoặc để hỗ trợ cho người dùng tấn công MiTM hoạt động truyền gửi bảo mật của ứng dụng.
- </p>
-
- <p>
- Mặc định là {@code "false"} trừ khi được chỉ định trong một phần tử {@code debug-overrides}
-, khi đó mặc định là {@code "true"}.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- cú pháp:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- Có thể chứa:
- </dt>
-
- <dd>
- Bất kỳ số nào của <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- Mô tả:
- </dt>
-
- <dd>
- Một bộ các ghim khóa công khai. Để một kết nối bảo mật được tin cậy, một trong các
- khóa công khai trong chuỗi tin cậy phải nằm trong bộ các ghim này. Xem
- <code><a href="#pin"><pin></a></code> để biết định dạng của các ghim.
- </dd>
-
- <dt>
- Thuộc tính:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- Ngày tháng, theo định dạng {@code yyyy-MM-dd}, vào và sau thời điểm các ghim
- hết hạn và do đó vô hiệu hóa ghim. Nếu thuộc tính này chưa được đặt thì khi đó các
- ghim không hết hạn.
- <p>
- Việc hết hạn giúp phòng ngừa các vấn đề về khả năng kết nối trong ứng dụng làm cho không
- nhận được các bản cập nhật cho bộ ghim, chẳng hạn như do người dùng
- vô hiệu hóa các bản cập nhật ứng dụng.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- cú pháp:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- Thuộc tính:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- Thuật toán băm được sử dụng để tạo ghim. Hiện tại, chỉ có
- {@code "SHA-256"} được hỗ trợ.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/vi/preview/overview.jd b/docs/html-intl/intl/vi/preview/overview.jd
deleted file mode 100644
index a71bf61..0000000
--- a/docs/html-intl/intl/vi/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=Tổng quan về Chương trình
-page.metaDescription=Hãy chuẩn bị ứng dụng sẵn sàng cho phiên bản Android tiếp theo.
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- Chào mừng bạn đến với <strong>Android N Developer Preview</strong>, một chương trình
- cung cấp cho bạn mọi thứ cần thiết để kiểm thử và tối ưu hóa các ứng dụng cho phiên bản
- Android tiếp theo. Đây là chương trình miễn phí và bạn có thể bắt đầu ngay bằng cách
- tải xuống các công cụ của N Developer Preview.
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- Thiết bị phần cứng và ảnh của bộ giả lập
- </h5>
-
- <p>
- Chạy và kiểm thử ứng dụng của bạn trên một loạt các thiết bị hoặc trên bộ giả lập.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Mã nền tảng mới nhất
- </h5>
-
- <p>
- Chúng tôi sẽ cung cấp các bản cập nhật hàng tháng trong thời gian của Preview vì vậy bạn sẽ được kiểm tra các thay đổi nền tảng mới nhất.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Ưu tiên các vấn đề của nhà phát triển
- </h5>
-
- <p>
- Trong một vài tuần đầu, chúng tôi sẽ dành ưu tiên cho các vấn đề
- được nhà phát triển báo cáo, vì vậy hãy kiểm thử và gửi phản hồi sớm nhất có thể.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- Các hành vi và khả năng mới
- </h5>
-
- <p>
- Tiến hành công việc sớm để hỗ trợ các hành vi mới của nền tảng và phát triển với các tính năng mới.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Cập nhật qua OTA
- </h5>
-
- <p>
- Các bản cập nhật liền mạch qua sóng vô tuyến cho bất kỳ thiết bị nào được hỗ trợ thông qua
- Chương trình Android Beta. Không cần phải flash.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Phản hồi và hỗ trợ
- </h5>
-
- <p>
- Báo cáo các vấn đề và gửi phản hồi về cho chúng tôi thông qua
- <a href="{@docRoot}preview/bug">bộ theo dõi vấn đề</a> của chúng tôi. Kết nối với các nhà phát triển
- khác trong
- <a href="{@docRoot}preview/dev-community">Cộng đồng Nhà phát triển N</a>.
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">Tiến trình thời gian và các bản cập nhật</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- N Developer Preview sẽ kéo dài từ 9 tháng 3 năm 2016 đến khi phát hành công chúng
- bản Android N cuối cùng cho AOSP và OEM, dự kiến trong Q3 2016.
-</p>
-
-<p>
- Tại các mốc phát triển chính chúng tôi sẽ cung cấp các bản cập nhật cho môi trường phát triển và
- kiểm thử của bạn. Nói chung, bạn có thể nhận một bản cập nhật hàng tháng (khoảng cách
- 4 đến 6 tuần). Các mốc được liệt kê dưới đây.
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (phát hành lần đầu, alpha)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (bản cập nhật tăng dần, alpha)</li>
- <li><strong>Preview 3</strong> (bản cập nhật tăng dần, beta)</li>
- <li><strong>Preview 4</strong> (các API cuối cùng và SDK chính thức, phát hành Play)</li>
- <li><strong>Preview 5</strong> (các ảnh hệ thống gần hoàn thiện để kiểm thử cuối cùng)</li>
- <li><strong>Phát hành bản cuối</strong> cho AOSP và hệ sinh thái</li>
-</ul>
-
-<p>
- Mỗi bản cập nhật sẽ có các công cụ SDK, ảnh hệ thống xem trước, bộ giả lập, tài liệu
- tham khảo và những khác biệt về API.
-</p>
-
-<p>
- <strong>Ba phiên bản Preview đầu tiên</strong> sẽ cung cấp một <strong>môi trường
- kiểm thử và phát triển sớm</strong> để giúp bạn xác định
- các vấn đề tương thích trong ứng dụng hiện tại và lập kế hoạch di chuyển hoặc trang bị hoạt động
- cần thiết để nhắm tới nền tảng mới. Đây là giai đoạn ưu tiên để bạn
- gửi phản hồi cho chúng tôi về các tính năng, khả năng tương thích của API và tệp
- — đối với mọi vấn đề đó, vui lòng sử dụng <a href="{@docRoot}preview/bug">bộ theo dõi
- vấn đề</a>. Sẽ có một số thay đổi với API giữa các bản cập nhật này.
-</p>
-
-<p>
- Tại <strong>Preview 4 và 5</strong> bạn sẽ được sử dụng <strong>các
-API và SDK N cuối cùng</strong> để phát triển, và cả các ảnh hệ thống gần hoàn thiện
- để kiểm thử các hành vi, tính năng của hệ thống. Android N sẽ cung cấp một mức
- API chuẩn vào thời điểm này. Bạn có thể tiến hành kiểm thử khả năng tương thích cuối cùng đối với các ứng dụng
- cũ và tinh chỉnh mã nguồn mới có sử dụng các API hoặc tính năng mới của N.
-</p>
-
-<p>
- Ngoài ra, bắt đầu từ Preview 4 bạn có thể <strong>phát hành ứng dụng lên
- các thiết bị</strong> chạy Android N ở cấp API chính thức, chẳng hạn như
- thiết bị người dùng được chọn cho chương trình Android Beta. Bạn có thể
- phát hành ứng dụng lên kênh alpha và beta của Google Play trước do đó bạn có thể kiểm thử
- ứng dụng của mình với người dùng Android Beta trước khi phân phối rộng rãi trên
- cửa hàng.
-</p>
-
-<p>
- Khi bạn kiểm thử và phát triển trên Android N, chúng tôi khuyến cáo bạn <strong>duy trì
- môi trường phát triển được cập nhật</strong> khi các cập nhật Preview được
- phát hành. Để giúp cho quá trình này thuận tiện hơn, bạn có thể đăng ký các thiết bị kiểm thử của mình vào
- chương trình Android Beta và lấy <strong>các bản cập nhật qua sóng vô tuyến (OTA)</strong> tại
- mỗi mốc. Ngoài ra, các ảnh xem trước cũng có sẵn để bạn
- tải xuống và flash thủ công.
-</p>
-
-<p>
- Chúng tôi sẽ thông báo cho bạn khi các cập nhật Preview xuất hiện thông qua <a href="http://android-developers.blogspot.com/">Blog Nhà phát triển Android</a>, cũng
- như thông qua trang này và <a href="{@docRoot}preview/dev-community">Cộng đồng
- Nhà phát triển Android N</a>.
-</p>
-
-
-<h2 id="preview_tools">Có gì trong N Developer Preview?</h2>
-
-<p>
- N Developer Preview có tất cả mọi thứ bạn cần để kiểm thử ứng dụng
- sẵn có của bạn trên nhiều loại kích cỡ màn hình, công nghệ mạng, chipset CPU/GPU
- và kiến trúc phần cứng.
-</p>
-
-<h3 id="sdk_tools">Bộ công cụ SDK</h3>
-
-<p>Bạn có thể tải xuống các thành phần này thông qua Trình quản lý SDK trong <a href="{@docRoot}sdk/installing/adding-packages.html">Android Studio</a>:</p>
-
-<ul>
- <li> N Developer Preview <strong>SDK và công cụ</strong>
- <li> <strong>Ảnh hệ thống cho bộ giả lập</strong> (32-bit và 64-bit) của N Developer Preview
- <li> <strong>Ảnh hệ thống cho bộ giả lập cho Android TV</strong> (32-bit) của N Developer Preview
- <li> Các thư viện hỗ trợ của N Developer Preview (dành cho các mẫu ứng dụng mới)
-</ul>
-
-<p>
- Chúng tôi sẽ cung cấp các bản cập nhật cho các công cụ phát triển này theo từng mốc khi cần thiết.
-</p>
-
-<h3 id="hardware_system_images">Ảnh hệ thống cho phần cứng</h3>
-
-<p>
- N Developer Preview bao gồm các ảnh hệ thống cho Nexus và phần cứng khác mà bạn có thể sử dụng khi
- kiểm thử và phát triển trên các thiết bị vật lý. Hãy xem trang <a href="{@docRoot}preview/download.html">Ảnh cho Thiết bị</a> để có danh sách đầy đủ
- các ảnh cho phần cứng.
-</p>
-
-<p>
- Chúng tôi sẽ cung cấp các ảnh hệ thống cập nhật cho những thiết bị này tại mỗi mốc. Bạn
- có thể tải xuống và flash các ảnh hệ thống cập nhật vào các thiết bị kiểm thử
- một cách thủ công nhiều lần theo nhu cầu. Điều này đặc biệt hữu ích đối với các môi trường
- kiểm thử tự động, trong đó bạn có thể cần flash lại thiết bị nhiều
- lần.
-</p>
-
-<p class="note"><strong>Lưu ý</strong>:
- <strong>Các thiết bị được flash thủ công sẽ không nhận các bản cập nhật qua OTA</strong> giống như trong
- preview của năm ngoái. Năm nay bạn có thể nhận qua OTA bằng cách đăng ký các thiết bị trong
- Chương trình Android Beta — hãy xem chi tiết trong phần tiếp theo.
-</p>
-
-<h3 id="android_beta">Các bản cập nhật OTA thông qua Chương trình Android Beta</h3>
-
-<p>
- Tính năng mới cho Android N là một chương trình cập nhật qua sóng vô tuyến (OTA) sẽ tự động
- phát hành các cập nhật Preview mới nhất của Android N trực tiếp tới thiết bị đã đăng ký
- trong chương trình. Đây là chương trình miễn phí và mở đối với bất cứ ai có một
- thiết bị được hỗ trợ đã đăng ký với tài khoản Google của họ.
-</p>
-
-<p>
- Để đăng ký vào chương trình, hãy truy cập trang <a href="https://g.co/androidbeta">Chương trình
- Android Beta</a>. Bạn sẽ thấy
- tất cả các thiết bị đã đăng ký với tài khoản của bạn có đủ điều kiện để đăng ký
- Android Beta.
-</p>
-
-<ol>
- <li> Hãy chọn các thiết bị bạn muốn nhận bản cập nhật Android N
- <li> Nhấp vào Đăng ký, đọc và đồng ý với các điều khoản dịch vụ và sau đó nhấp OK
-</ol>
-
-<p>
- Một khi đã đăng ký, thiết bị của bạn sẽ sớm nhận được một bản cập nhật. Trong hầu hết trường hợp,
- bạn sẽ không cần thực hiện thiết lập lại toàn bộ dữ liệu để chuyển sang Android N. Tuy nhiên,
- chúng tôi khuyến cáo bạn sao lưu bất kỳ dữ liệu nào bạn không muốn bị mất trước khi
- đăng ký thiết bị.
-</p>
-
-<p>
- Khi các bản cập nhật được phát hành tới thiết bị của bạn, chúng tôi khuyến cáo bạn tải xuống và
- cài đặt sớm nhất có thể. Bạn sẽ muốn cập nhật các
- thay đổi mới nhất về UI, hành vi, API và các tính năng của hệ thống.
-</p>
-
-<p>
- Khi kết thúc Developer Preview, các thiết bị đăng ký của bạn sẽ
- nhận một bản cập nhật của bản phát hành Android N chính thức.
-</p>
-
-<p>
- Bạn có thể hủy đăng ký các thiết bị của mình trong chương trình Android Beta bất kỳ lúc nào thông qua
- trang Android Beta. Trước khi hủy đăng ký, hãy chắc chắn sao lưu dự phòng dữ liệu của bạn trên
- thiết bị đó.
-</p>
-
- <p class="note"><strong>Lưu ý</strong>:
- Khi bạn hủy đăng ký, <strong>thiết bị của bạn sẽ được khôi phục cài đặt gốc</strong>
- về phiên bản mới nhất
- của Android 6.0 Marshmallow (không nhất thiết là phiên bản bạn từng
- được cài đặt trước khi đăng ký thiết bị). Để đảm bảo cài đặt mới hoàn toàn,
- dữ liệu của bạn sẽ bị xóa khỏi thiết bị, bao gồm danh bạ, tin nhắn,
- ảnh, v.v...
-</p>
-
-<h3 id="documentation_and_sample_code">Tài liệu và mã mẫu</h3>
-
-<p>
- Các nguồn tài liệu này có trên trang Developer Preview để
- trợ giúp bạn tìm hiểu về Android N:
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Thiết lập để Phát triển dành cho
-Android N</a> có
- các hướng dẫn từng bước để bắt đầu.</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">Các thay đổi
- Hành vi</a> chỉ ra cho bạn các phần chính yếu để kiểm thử.</li>
- <li> Tổng quan về các API mới, bao gồm một phần <a href="{@docRoot}preview/api-overview.html">Tổng quan về API</a>, bản tải xuống được
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo
- API</a> và các hướng dẫn chi tiết cho nhà phát triển đối với các tính năng quan trọng như
- hỗ trợ đa cửa sổ, thông báo gộp, hỗ trợ đa bản địa và các tính năng khác.
- <li> <a href="{@docRoot}preview/samples.html">Mã mẫu</a> trong đó
- minh họa cách hỗ trợ các quyền và tính năng mới.
- <li> <a href="{@docRoot}preview/support.html#release-notes">Ghi chú phát hành</a>
- cho phiên bản hiện hành của N Developer Preview, bao gồm các ghi chú về thay đổi và
- các báo cáo về sự khác biệt.
-</ul>
-
-<h4 id="reference">Tham khảo API có thể tải xuống</h4>
-
-<p>
- Trong các cập nhật preview có sớm bạn có thể tải xuống
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API
- mới nhất cho nền tảng Android N</a> dưới dạng tệp lưu trữ zip riêng biệt. Bản tải xuống
- tham khảo này cũng có một báo cáo về các khác biệt để giúp bạn nhận biết các thay đổi API từ
- API 23 và bản cập nhật trước đó.
-</p>
-
-<p>
- Khi các API Android N hoàn thiện và được chỉ định một mức API chính thức,
- chúng tôi sẽ cung cấp tham khảo API cho bạn trực tuyến tại <a href="https://developer.android.com">https://developer.android.com</a>.
-</p>
-
-<h3 id="support_resources">
- Tài nguyên Hỗ trợ
-</h3>
-
-<p>
- Khi bạn kiểm thử và phát triển trên N Developer Preview, xin vui lòng sử dụng các kênh sau
- để thông báo các vấn đề và gửi phản hồi.
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">Bộ theo dõi Vấn đề N Developer Preview
- </a> là <strong>kênh phản hồi chính</strong> của bạn. Bạn có thể thông báo lỗi, các vấn đề về
- hiệu năng và phản hồi chung thông qua bộ theo dõi vấn đề. Bạn cũng có thể kiểm tra
-<a href="{@docRoot}preview/bug">các vấn đề đã biết</a> và
- tìm các bước khắc phục. Chúng tôi sẽ cập nhật thông tin cho bạn về vấn đề của bạn khi nó đã được phân loại và gửi tới
- nhóm kỹ thuật Android xem xét. </li>
- <li> <a href="{@docRoot}preview/dev-community">Cộng đồng Nhà phát triển Android N</a> là
- một cộng đồng Google+ nơi bạn có thể <strong>kết nối với các nhà phát triển khác</strong> đang thử nghiệm
- Android N. Bạn có thể chia sẻ các phát hiện hoặc ý tưởng hoặc tìm câu trả lời cho các
- thắc mắc về Android N. Chúng tôi sẽ điều hành cộng đồng này và cung cấp các câu trả lời và
- hướng dẫn khi cần thiết.</li>
-</ul>
-
-<h3 id="targeting">Nhắm mục tiêu, API xem trước và phát hành</h3>
-
-<p>
- N Developer Preview sẽ cung cấp một hệ thống và thư viện
- Android chỉ dành cho phát triển mà <strong>không có mức API tiêu chuẩn</strong>. Nếu bạn muốn
- bỏ các hành vi về khả năng tương thích để kiểm thử ứng dụng của mình (đặc biệt
- khuyến cáo), bạn có thể nhắm mục tiêu phiên bản xem trước của Android N bằng cách thiết lập
- <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code>
- của ứng dụng thành <code>“N”</code>.
-</p>
-
-<p>
- Android N Developer Preview cung cấp các <strong>API xem trước</strong>
- — các API này không phải bản chính thức cho đến khi SDK cuối cùng được phát hành,
- hiện được dự kiến phát hành vào quý ba năm 2016. Điều này có nghĩa là có thể
- <strong>có các thay đổi API nhỏ</strong> sau này, đặc biệt trong
- các tuần đầu của chương trình. Chúng tôi sẽ cung cấp bản tóm tắt các thay đổi cho bạn theo
- mỗi bản cập nhật của Android N Developer Preview.
-</p>
-
-<p class="note">
- <strong>Lưu ý</strong>: Mặc dù các API xem trước có thể thay đổi nhưng
- các hành vi hệ thống cơ bản vẫn ổn định và sẵn sàng để kiểm thử
- ngay.
-</p>
-
-<p>
- Google Play <strong>không cho phép phát hành các ứng dụng nhắm mục tiêu tới N Developer
- Preview</strong>. Khi có bản SDK cuối cùng của Android N bạn sẽ có thể
- nhắm mục tiêu mức API Android N chính thức và phát hành ứng dụng của mình lên Google
- Play thông qua các kênh phát hành alpha và beta. Trong thời gian này, nếu bạn muốn
- phân phối một ứng dụng nhắm mục tiêu Android N cho người kiểm thử thì bạn có thể thực hiện phân phối qua email hoặc
- bằng cách tải trực tiếp trên trang web của bạn.
-</p>
-
-<p>
- Khi Android N được phát hành hoàn chỉnh cho AOSP và OEM, dự kiến vào Q3 2016,
- bạn có thể phát hành ứng dụng của mình nhắm mục tiêu Android N lên kênh
- phát hành công chúng trong Google Play.
-</p>
-
-
-<h2 id="how_to_get_started">Cách thức bắt đầu</h2>
-
-<p>
- Để bắt đầu kiểm thử ứng dụng của bạn với Android N:
-</p>
-
-<ol>
- <li> Xem lại <a href="{@docRoot}preview/api-overview.html">Tổng quan về API</a>
- và <a href="{@docRoot}preview/behavior-changes.html">Các thay đổi Hành vi</a> để
- biết được có những gì mới và nó sẽ tác động đến ứng dụng của bạn như thế nào. Đặc biệt,
- hãy tìm hiểu về các tính năng <a href="{@docRoot}preview/features/notification-updates.html">thông báo</a> mới và
- <a href="{@docRoot}preview/features/multi-window.html">hỗ trợ đa cửa sổ</a>.</li>
- <li> Thiết lập môi trường của bạn bằng cách làm theo các hướng dẫn để <a href="{@docRoot}preview/setup-sdk.html">Preview SDK</a>
- và cấu hình các thiết bị kiểm thử.</li>
- <li> Làm theo <a href="https://developers.google.com/android/nexus/images">các hướng dẫn
- flash</a> để flash ảnh hệ thống Android N mới nhất cho thiết bị của bạn. </li>
- <li> Xem lại <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Tham khảo API</a>
- và <a href="{@docRoot}preview/samples.html">các ví dụ về Android N</a> để hiểu
- sâu hơn về các tính năng API mới cũng như cách sử dụng chúng trong ứng dụng của bạn.
- <li> Tham gia <a href="{@docRoot}preview/dev-community">Cộng đồng
- Nhà phát triển Android N</a> để nhận được thông tin mới nhất và kết nối với các
- nhà phát triển khác đang thử nghiệm với nền tảng mới.</li>
-</ol>
-
-<p>
- Cảm ơn bạn đã tham gia chương trình Android N Developer Preview!
-</p>
diff --git a/docs/html-intl/intl/vi/preview/samples.jd b/docs/html-intl/intl/vi/preview/samples.jd
deleted file mode 100644
index aa1a8c6..0000000
--- a/docs/html-intl/intl/vi/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=Samples
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- Các mã mẫu sau được dành cho Android N. Để
- tải xuống mã mẫu cho Android Studio, hãy chọn tùy chọn trong menu <b>File > Import
- Samples</b>.
-</p>
-
-<p class="note">
- <strong>Chú ý:</strong>Các dự án có thể tải xuống này được thiết kế
- để sử dụng với Gradle và Android Studio.
-</p>
-
-
-<h3 id="mw">Dùng thử đa cửa sổ</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- Ví dụ này minh họa cách tận dụng giao diện người dùng
- đa cửa sổ với ứng dụng của bạn.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
- Tải mã trên GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">Thông báo đang Hoạt động</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Đây là ví dụ đã có sẵn, minh họa một dịch vụ đơn giản để gửi
- thông báo bằng cách sử dụng NotificationCompat. Mỗi cuộc hội thoại chưa đọc từ một người dùng
- sẽ được gửi dưới dạng một thông báo riêng.
-</p>
-<p>
- Ví dụ này đã được cập nhật để tận dụng các tính năng thông báo mới
- có trong Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
- Tải mã trên GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">Dịch vụ Nhắn tin</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- Đây là một ví dụ đã có sẵn, minh họa cách sử dụng
- NotificationManager để cho biết có bao nhiêu thông báo một ứng dụng hiện
- đang hiển thị.
-</p>
-<p>
- Ví dụ này đã được cập nhật để tận dụng các tính năng thông báo mới
- có trong Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
- Tải mã trên GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">Khởi động Trực tiếp</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Ví dụ này minh họa cách lưu trữ và truy cập dữ liệu trên bộ lưu trữ
- mã hóa thiết bị, luôn khả dụng khi thiết bị được khởi động.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
- Tải mã trên GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">Truy cập Thư mục theo Phạm vi</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- Ví dụ này minh họa cách đọc và ghi dữ liệu từ các thư mục
- cụ thể trong khi cần ít quyền hơn.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
- Tải mã trên GitHub</a>
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/vi/preview/setup-sdk.jd b/docs/html-intl/intl/vi/preview/setup-sdk.jd
deleted file mode 100644
index bdba713..0000000
--- a/docs/html-intl/intl/vi/preview/setup-sdk.jd
+++ /dev/null
@@ -1,223 +0,0 @@
-page.title=Thiết lập Preview
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Tải Android Studio 2.1</a></li>
- <li><a href="#get-sdk">Tải SDK Android N</a>
- <ol>
- <li><a href="#docs-dl">Tài liệu tham khảo</a>
- </ol>
- </li>
- <li><a href="#java8">Tải JDK và JRE của Java 8</a></li>
- <li><a href="#create-update">Cập nhật hoặc Tạo một dự án</a></li>
- <li><a href="#next">Các bước tiếp theo</a></li>
-</ol>
- </div>
-</div>
-
-<p>Để phát triển các ứng dụng cho Android N Preview bạn cần thực hiện một số cập nhật
-đối với môi trường phát triển của mình như mô tả trên trang này.</p>
-
-<p>Để đơn thuần thử khả năng tương thích của ứng dụng trên
-ảnh hệ thống Android N, hãy làm theo hướng dẫn <a href="{@docRoot}preview/download.html">Kiểm thử trên một Thiết bị Android N</a>.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Tải Android Studio 2.1 (bản xem trước)</h2>
-
-<p>Nền tảng Android N bổ sung hỗ trợ cho <a href="{@docRoot}preview/j8-jack.html">các tính năng của ngôn ngữ Java 8</a>,
-yêu cầu phải có một trình biên dịch mới có tên là Jack. Phiên bản Jack mới nhất
-hiện chỉ được hỗ trợ trong Android Studio 2.1. Do đó, nếu bạn muốn
-sử dụng các tính năng của ngôn ngữ Java 8 thì bạn cần sử dụng Android Studio 2.1 để
-dựng ứng dụng. Nếu không, bạn không cần sử dụng trình biên dịch Jack nhưng bạn
-vẫn cần cập nhật lên JDK 8 để biên dịch cho nền tảng Android N,
-như mô tả dưới đây.
-</p>
-
-<p>Android Studio 2.1 hiện đang có dưới dạng bản xem trước trong kênh
-phát hành Canary. Nếu bạn đã
-có Android Studio và không muốn cập nhật lên kênh canary thì bạn có thể
-tải xuống Android Studio 2.1 dưới dạng bản cài đặt riêng và sử dụng
-để phát triển với Android N để không làm ảnh hưởng đến môi trường Android Studio
-chính của bạn.</p>
-
-<p>Để tải xuống Android Studio 2.1 dưới dạng bản cài đặt riêng, hãy thực hiện
-các bước sau (hoặc nếu bạn muốn nhận Android Studio 2.1 dưới dạng bản cập nhật cho
-bản cài đặt có sẵn thì hãy chuyển đến bước 4):</p>
-
-<ol>
- <li>Chỉnh sửa tên của
- bản cài đặt Android Studio có sẵn và thêm số phiên bản. Làm như vậy
- để khi bạn cài đặt, phiên bản mới sẽ không ghi đè lên phiên bản có sẵn.</li>
- <li>Tải xuống tệp ZIP phù hợp cho hệ điều hành của bạn từ
- <a href="http://tools.android.com/download/studio/canary/latest">trang tải xuống của kênh canary</a>.
- </li>
- <li>Giải nén gói đó và chuyển các thành phần của Android Studio 2.1 tới
- vị trí phù hợp cho các ứng dụng của bạn trên hệ thống rồi khởi chạy nó.</li>
- <li>Mở hộp thoại Settings
- (<strong>File > Settings</strong> trên Windows/Linux, hoặc
- <strong>Android Studio > Preferences</strong> trên Mac). Trong khung
- bên trái, chọn<strong>Appearance & Behavior > System Settings >
- Updates</strong>.
- </li>
- <li>Trên khung Updates, chọn hộp kiểm <strong>Automatically
- check updates for</strong> và chọn
- <strong>Canary Channel</strong> từ danh sách thả xuống.
- </li>
-</ol>
-
-<p>Hãy để cửa sổ cài đặt này mở cho bước tiếp theo.</p>
-
-
-<h2 id="get-sdk">Tải N Preview SDK</h2>
-
-<p>Để bắt đầu phát triển với các API Android N, bạn cần cài đặt
- Android N Preview SDK trong Android Studio như sau:</p>
-
-<ol>
- <li>Vẫn tại khung Updates (bước 4 bên trên),
- hãy chọn hộp kiểm <strong>Automatically
- check updates for Android SDK</strong> và chọn
- <strong>Preview Channel</strong> từ danh sách thả xuống.
- </li>
- <li>Nhấp vào <strong>Check Now</strong>.</li>
-
- <li>Trong khung bên trái, chọn <strong>Appearance & Behavior >
- System Settings > Android SDK</strong>.
-
- <li>Nhấp vào tab <strong>SDK Platforms</strong>, rồi chọn hộp kiểm
- <strong>Android N Preview</strong>.</li>
-
- <li>Nhấp vào tab <strong>SDK Tools</strong>, rồi chọn
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong>, và các hộp kiểm <strong>Android SDK Tools</strong>
-.
- </li>
-
- <li>Nhấp vào <strong>OK</strong>, sau đó đồng ý với các thỏa thuận
- cấp phép cho các gói cần được cài đặt.
- </li>
-</ol>
-
-<h3 id="docs-dl">Tải tài liệu tham khảo cho N Preview</h3>
-
-<p>
- Thông tin chi tiết về các API Android N có trong tài liệu tham khảo của
- Bản xem trước N mà bạn có thể tải xuống từ bảng sau.
- Gói này có một bản ngoại tuyến được rút gọn của trang web
- cho nhà phát triển Android và có một bản tham khảo API được cập nhật cho API Android N, một
- báo cáo về sự khác biệt API.
-</p>
-
-<table>
- <tr>
- <th scope="col">Tài liệu</th>
- <th scope="col">Tổng kiểm</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-1-docs.zip">n-preview-1-docs.zip</a></td>
- <td width="100%">
- MD5: 4ab33ccbe698f46f125cc5b807cf9c2f<br>
- SHA-1: 6a3880b3ccd19614daae5a4d0698ea6ae11c20a5
- </td>
- </tr>
-</table>
-
-
-
-<h2 id="java8">Tải JDK và JRE của Java 8</h2>
-
-<p>Để biên dịch ứng dụng của bạn cho nền tảng Android N, bạn cần sử dụng
-Bộ công cụ phát triển Java 8 (JDK 8) và để sử dụng một số công cụ với Android
-Studio 2.1 thì bạn cần cài đặt Java 8 Runtime Environment (JRE). Vì vậy, nếu
-bạn không có phiên bản mới nhất của mỗi bộ thì hãy tải xuống JDK 8 và JRE 8
-ngay.</p>
-
-<p>Sau đó đặt phiên bản JDK trong Android Studio như sau:</p>
-
-<ol>
- <li>Mở một dự án Android trong Android Studio, sau đó mở
- hộp thoại Project Structure bằng cách chọn <strong>File >
- Project Structure</strong>. (Bằng cách khác, bạn có thể đặt mặc định
- cho mọi dự án bằng cách chọn <strong>File > Other Settings >
- Default Project Structure</strong>.)
- </li>
- <li>Trong khung bên trái của hộp thoại, hãy nhấp <strong>SDK Location</strong>.
- </li>
- <li>Trong ô <strong>JDK Location</strong>, hãy nhập vị trí của
- Java 8 JDK (nhấp vào nút bên phải
- để duyệt tìm tệp của bạn), sau đó nhấp <strong>OK</strong>.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">Cập nhật hoặc Tạo một dự án</h2>
-
-<p>
- Dự án của bạn phải được cấu hình phù hợp để sử dụng các API Android N.
-</p>
-
-<p>Nếu bạn dự định sử dụng các tính năng của ngôn ngữ Java 8 thì bạn cũng nên đọc mục
-<a href="{@docRoot}preview/j8-jack.html">Các tính năng của Ngôn ngữ Java 8</a>
-để biết thêm thông tin về các tính năng của Java 8 được hỗ trợ và
-cách cấu hình dự án với trình biên dịch Jack.</p>
-
-
-<h3 id="update">Cập nhật một dự án có sẵn</h3>
-
-<p>Mở tệp
- <code>build.gradle</code> cho mô-đun của bạn và cập nhật các giá trị như
- sau:
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc1'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">Tạo một dự án mới</h3>
-
-
-<p>Để tạo một dự án mới để phát triển với Android N Preview SDK:</p>
-
-<ol>
- <li>Nhấp vào <strong>File > New Project</strong>. và thực hiện theo các bước đến khi
- bạn đến trang Target Android Devices.
- </li>
- <li>Trong trang này, hãy chọn tùy chọn <strong>Phone and Tablet</strong>.</li>
- <li>Dưới tùy chọn <strong>Phone and Tablet</strong>, trong danh sách tùy chọn <strong>Minimum
- SDK</strong> hãy chọn
- <strong>N: Android API 23, N Preview (Preview)</strong>.</li>
-</ol>
-
-
-<h2 id="next">Các bước tiếp theo</h2>
-
-<ul>
- <li>Làm theo hướng dẫn <a href="{@docRoot}preview/download.html">Kiểm thử trên một Thiết bị Android N</a>.</li>
- <li>Tìm hiểu thêm về nền tảng Android N với
-<a href="{@docRoot}preview/behavior-changes.html">Các thay đổi Hành vi</a>
-và<a href="{@docRoot}preview/api-overview.html">API Android N
-và Các tính năng</a>.</li>
-</ul>
diff --git a/docs/html-intl/intl/vi/training/articles/direct-boot.jd b/docs/html-intl/intl/vi/training/articles/direct-boot.jd
new file mode 100644
index 0000000..9b2a557
--- /dev/null
+++ b/docs/html-intl/intl/vi/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=Khởi động Trực tiếp
+page.keywords=preview,sdk,direct boot
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Trong tài liệu này</h2>
+ <ol>
+ <li><a href="#run">Yêu cầu Truy cập để Chạy trong quá trình Khởi động Trực tiếp</a></li>
+ <li><a href="#access">Truy cập Bộ nhớ Lưu trữ Mã hóa của Thiết bị</a></li>
+ <li><a href="#notification">Nhận thông báo Mở khóa của Người dùng</a></li>
+ <li><a href="#migrating">Chuyển nhập Dữ liệu Có sẵn</a></li>
+ <li><a href="#testing">Kiểm thử Ứng dụng Nhận biết Mã hóa của bạn</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Android N chạy trong chế độ <i>Khởi động Trực tiếp</i> an toàn
+khi thiết bị đã được bật nguồn nhưng người dùng chưa mở khóa
+thiết bị. Để hỗ trợ chế độ này, hệ thống cung cấp hai vị trí lưu trữ dữ liệu:</p>
+
+<ul>
+<li><i>Lưu trữ mã hóa thông tin xác thực</i>, là vị trí lưu trữ mặc định
+và chỉ khả dụng sau khi người dùng đã mở khóa thiết bị.</li>
+<li><i>Lưu trữ mã hóa thiết bị</i>, là vị trí lưu trữ khả dụng cho cả
+chế độ Khởi động Trực tiếp và sau khi người dùng đã mở khóa thiết bị.</li>
+</ul>
+
+<p>Theo mặc định, các ứng dụng không chạy trong quá trình chế độ Khởi động Trực tiếp.
+Nếu ứng dụng của bạn cần thực hiện hành động trong chế độ Khởi động Trực tiếp thì bạn có thể đăng ký
+các thành phần ứng dụng cần chạy trong chế độ này. Một số trường hợp sử dụng phổ biến
+cho các ứng dụng cần chạy trong chế độ Khởi động Trực tiếp gồm:</p>
+
+<ul>
+<li>Ứng dụng có thông báo theo lịch, như ứng dụng
+đồng hồ báo thức.</li>
+<li>Ứng dụng cung cấp các thông báo quan trọng cho người dùng như ứng dụng SMS.</li>
+<li>Ứng dụng cung cấp các dịch vụ trợ năng như Talkback.</li>
+</ul>
+
+<p>Nếu ứng dụng của bạn cần truy cập dữ liệu khi đang chạy trong chế độ Khởi động Trực tiếp thì hãy sử dụng
+lưu trữ mã hóa thiết bị. Bộ nhớ lưu trữ được mã hóa của thiết bị có chứa dữ liệu
+được mã hóa bằng một khóa chỉ khả dụng sau khi thiết bị đã thực hiện một
+lần khởi động được xác thực thành công.</p>
+
+<p>Đối với dữ liệu cần được mã hóa bằng một khóa liên kết tới thông tin xác thực
+của người dùng như mã PIN hoặc mật khẩu thì hãy sử dụng bộ nhớ lưu trữ mã hóa thông tin xác thực.
+Bộ nhớ lưu trữ mã hóa thông tin xác thực chỉ khả dụng sau khi người dùng đã mở khóa
+thành công thiết bị, tính đến khi người dùng khởi động lại thiết bị một lần nữa. Nếu
+người dùng mở màn hình khóa sau khi mở khóa thiết bị thì thao tác này không khóa
+bộ nhớ mã hóa thông tin xác thực.</p>
+
+<h2 id="run">Yêu cầu Truy cập để Chạy trong quá trình Khởi động Trực tiếp</h2>
+
+<p>Các ứng dụng phải đăng ký các thành phần của chúng với hệ thống trước khi chúng
+có thể chạy trong chế độ Khởi động Trực tiếp hoặc truy cập bộ nhớ lưu trữ
+mã hóa thiết bị. Ứng dụng đăng ký với hệ thống bằng cách đánh dấu các thành phần là
+<i>nhận biết mã hóa</i>. Để đánh dấu các thành phần của bạn là nhận biết mã hóa, hãy đặt thuộc tính
+<code>android:encryptionAware</code> thành true trong bản kê khai.<p>
+
+<p>Các thành phần nhận biết mã hóa có thể đăng ký để nhận một thông điệp truyền phát
+<code>LOCKED_BOOT_COMPLETED</code> từ
+hệ thống khi thiết bị được khởi động lại. Lúc này, bộ nhớ lưu trữ
+mã hóa thiết bị sẽ khả dụng và thành phần của bạn có thể thực thi các tác vụ cần được
+chạy trong chế độ Khởi động Trực tiếp, như kích hoạt báo thức đã đặt.</p>
+
+<p>Đoạn mã sau là một ví dụ về cách đăng ký một
+{@link android.content.BroadcastReceiver} là nhận biết mã hóa và thêm một
+bộ lọc ý định cho <code>LOCKED_BOOT_COMPLETED</code> trong bản kê khai của ứng dụng:</p>
+
+<pre>
+<receiever
+ android:encryptionAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Khi người dùng đã mở khóa thiết bị thì mọi thành phần có thể truy cập
+cả bộ nhớ lưu trữ mã hóa thiết bị lẫn bộ nhớ lưu trữ mã hóa thông tin xác thực.</p>
+
+<h2 id="access">Truy cập Bộ nhớ Lưu trữ Mã hóa của Thiết bị</h2>
+
+<p>Để truy cập bộ nhớ lưu trữ mã hóa thiết bị, hãy tạo một thực thể
+{@link android.content.Context} thứ hai bằng cách gọi
+<code>Context.createDeviceEncryptedStorageContext()</code>. Tất cả các lệnh gọi
+API bộ nhớ lưu trữ đều sử dụng bối cảnh này để truy cập bộ nhớ lưu trữ mã hóa thiết bị.
+Ví dụ sau sẽ truy cập bộ nhớ lưu trữ mã hóa của thiết bị và mở một tệp
+dữ liệu ứng dụng có sẵn:</p>
+
+<pre>
+Context directBootContext = Context.createDeviceEncryptedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>Chỉ sử dụng bộ nhớ lưu trữ mã hóa của thiết bị
+cho thông tin phải truy cập được trong chế độ Khởi động Trực tiếp.
+Không sử dụng bộ nhớ lưu trữ mã hóa của thiết bị làm bộ lưu trữ mã hóa cho mục đích chung.
+Đối với thông tin cá nhân của người dùng, hoặc dữ liệu được mã hóa không cần thiết
+trong chế độ Khởi động Trực tiếp thì hãy sử dụng bộ nhớ lưu trữ mã hóa thông tin xác thực.</p>
+
+<h2 id="notification">Nhận thông báo Mở khóa của Người dùng</h2>
+
+<p>Một khi người dùng mở khóa thiết bị sau khi khởi động lại, ứng dụng của bạn có thể chuyển sang
+truy cập bộ nhớ lưu trữ mã hóa thông tin xác thực và sử dụng các dịch vụ thông thường của hệ thống
+phụ thuộc vào thông tin xác thực người dùng.</p>
+
+<p>Để nhận thông báo khi người dùng mở khóa thiết bị sau khi khởi động lại,
+hãy đăng ký một {@link android.content.BroadcastReceiver} từ một thành phần đang chạy
+để lắng nghe thông báo <code>ACTION_USER_UNLOCKED</code>. Hoặc bạn có thể
+nhận thông báo có sẵn {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED} lúc này sẽ chỉ báo thiết bị đã khởi động xong và
+người dùng đã mở khóa thiết bị.</p>
+
+<p>Bạn có thể truy vấn trực tiếp để biết người dùng đã mở khóa thiết bị hay chưa bằng cách gọi
+<code>UserManager.isUserUnlocked()</code>.</p>
+
+<h2 id="migrating">Chuyển nhập Dữ liệu Có sẵn</h2>
+
+<p>Nếu người dùng cập nhật thiết bị của họ để sử dụng chế độ Khởi động Trực tiếp thì bạn có thể có dữ liệu
+hiện hữu cần được chuyển nhập sang bộ nhớ lưu trữ mã hóa của thiết bị. Sử dụng
+<code>Context.migrateSharedPreferencesFrom()</code> và
+<code>Context.migrateDatabaseFrom()</code> để chuyển nhập dữ liệu về tùy chọn và cơ sở dữ liệu
+giữa bộ nhớ lưu trữ mã hóa thông tin xác thực và bộ nhớ lưu trữ mã hóa thiết bị.</p>
+
+<p>Hãy phán đoán hợp lý nhất khi quyết định dữ liệu nào nên chuyển nhập từ bộ nhớ lưu trữ mã hóa
+thông tin xác thực sang bộ nhớ lưu trữ mã hóa thiết bị. Bạn không nên di chuyển
+thông tin cá nhân của người dùng như mật khẩu hoặc các mã thông báo cấp quyền sang
+bộ nhớ lưu trữ mã hóa thiết bị. Trong một số trường hợp, bạn có thể cần quản lý
+các bộ dữ liệu riêng biệt trong hai bộ lưu trữ mã hóa.</p>
+
+<h2 id="testing">Kiểm thử Ứng dụng Nhận biết Mã hóa của bạn</h2>
+
+<p>Kiểm thử ứng dụng nhận biết mã hóa bằng cách sử dụng chế độ Khởi động Trực tiếp mới. Có
+hai cách để kích hoạt Khởi động Trực tiếp.</p>
+
+<p class="caution"><strong>Cẩn trọng:</strong> Kích hoạt Khởi động Trực tiếp
+sẽ xóa sạch mọi dữ liệu người dùng trên thiết bị.</p>
+
+<p>Trên các thiết bị được hỗ trợ có Android N được cài đặt, kích hoạt
+Khởi động Trực tiếp bằng cách thực hiện một trong các thao tác sau:</p>
+
+<ul>
+<li>Trên thiết bị, bật <b>Developer options</b> nếu chưa hãy bật bằng cách
+vào <b>Settings > About phone</b> và nhấn vào <b>Build number</b>
+bảy lần. Khi màn hình tùy chọn cho nhà phát triển khả dụng, hãy vào
+<b>Settings > Developer options</b> và chọn
+<b>Convert to file encryption</b>.</li>
+<li>Sử dụng các lệnh shell adb sau để kích hoạt chế độ Khởi động Trực tiếp:
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>Cũng có một chế độ Khởi động Trực tiếp giả lập trong trường hợp bạn cần chuyển đổi
+các chế độ trên thiết bị thử nghiệm. Chỉ nên sử dụng chế độ Giả lập trong quá trình
+phát triển và có thể làm mất dữ liệu. Để kích hoạt chế độ Khởi động Trực tiếp giả lập,
+hãy đặt mẫu hình khóa cho thiết bị, chọn "No thanks" nếu được yêu cầu
+ bật màn hình khởi động bảo mật khi đặt một mẫu hình khóa và sau đó sử dụng
+lệnh shell adb sau:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>Hãy sử dụng lệnh sau để tắt chế độ Khởi động Trực tiếp giả lập:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>Sử dụng các lệnh này có thể khiến cho thiết bị khởi động lại.</p>
diff --git a/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..d3b7174
--- /dev/null
+++ b/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd
@@ -0,0 +1,124 @@
+page.title=Truy cập Thư mục theo Phạm vi
+page.keywords=preview,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Trong tài liệu này</h2>
+ <ol>
+ <li><a href="#accessing">Truy cập một Thư mục lưu trữ bên ngoài</a></li>
+ <li><a href="#removable">Truy cập một Thư mục trên Phương tiện tháo lắp được</a></li>
+ <li><a href="#best">Thực hành Tốt nhất</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Các ứng dụng như ứng dụng ảnh thường chỉ cần truy cập đến các thư mục đã quy định trong
+bộ nhớ ngoài như thư mục <code>Pictures</code>. Các phương pháp
+ hiện tại để truy cập bộ nhớ lưu trữ ngoài vẫn chưa được thiết kế để dễ dàng cho phép
+truy cập thư mục đích cho những kiểu ứng dụng này. Ví dụ:</p>
+
+<ul>
+<li>Việc yêu cầu {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+hoặc {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} trong bản kê khai của bạn
+sẽ cho phép truy cập đến tất cả các thư mục công khai trên bộ nhớ lưu trữ ngoài, mà có thể
+cấp nhiều quyền truy cập hơn những gì ứng dụng của bạn cần.</li>
+<li>Sử dụng
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Khuôn khổ
+ Truy cập Kho lưu trữ</a> thường khiến người dùng chọn thư mục
+thông qua UI hệ thống. Đây là điều không cần thiết nếu ứng dụng của bạn luôn truy cập cùng
+một thư mục bên ngoài.</li>
+</ul>
+
+<p>Android N cung cấp một API mới được đơn giản hóa để truy cập
+các thư mục lưu trữ bên ngoài thường dùng. </p>
+
+<h2 id="accessing">Truy cập một Thư mục lưu trữ bên ngoài</h2>
+
+<p>Sử dụng lớp <code>StorageManager</code> để lấy thực thể
+<code>StorageVolume</code> phù hợp. Sau đó tạo một ý định bằng cách gọi phương thức
+<code>StorageVolume.createAccessIntent()</code> của thực thể đó.
+Sử dụng ý định này để truy cập các thư mục lưu trữ bên ngoài. Để lấy danh sách
+tất cả các ổ đĩa, bao gồm các ổ đĩa media có thể tháo lắp, hãy sử dụng
+<code>StorageManager.getVolumesList()</code>.</p>
+
+<p>Đoạn mã sau là một ví dụ về cách mở thư mục
+<code>Pictures</code> trong bộ nhớ lưu trữ chính được chia sẻ:</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>Hệ thống sẽ cố gắng cấp quyền truy cập tới thư mục bên ngoài và nếu
+cần sẽ xác nhận quyền truy cập với người dùng bằng một UI được đơn giản hóa:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>Hình 1.</strong> Một ứng dụng yêu cầu
+truy cập tới thư mục Pictures.</p>
+
+<p>Nếu người dùng cấp quyền truy cập, hệ thống sẽ gọi phương thức ghi đè
+<code>onActivityResult()</code> của bạn với mã kết quả là
+<code>Activity.RESULT_OK</code> và dữ liệu ý định có chứa URI. Hãy sử dụng
+URI được cung cấp để truy cập thông tin thư mục, giống như sử dụng các URI
+được trả về bởi
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Khuôn khổ
+ Truy cập Kho lưu trữ</a>.</p>
+
+<p>Nếu người dùng không cấp quyền truy cập, hệ thống sẽ gọi phương thức ghi đè
+<code>onActivityResult()</code> của bạn với mã kết quả là
+<code>Activity.RESULT_CANCELED</code> và dữ liệu ý định có giá trị null.</p>
+
+<p class="note"><b>Lưu ý</b>: Lấy quyền truy cập tới một thư mục bên ngoài được chỉ định
+cũng sẽ cấp quyền truy cập tới các thư mục con thuộc thư mục đó.</p>
+
+<h2 id="removable">Truy cập một Thư mục trên phương tiện tháo lắp được</h2>
+
+<p>Để sử dụng Truy cập Thư mục theo Phạm vi nhằm truy cập các thư mục trên phương tiện có thể tháo lắp,
+trước hết, hãy thêm một {@link android.content.BroadcastReceiver} để lắng nghe
+thông báo {@link android.os.Environment#MEDIA_MOUNTED}, ví dụ:</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Khi người dùng kết nối một phương tiện có thể tháo lắp như thẻ SD thì hệ thống sẽ gửi một thông báo
+{@link android.os.Environment#MEDIA_MOUNTED}. Thông báo này
+sẽ cung cấp một đối tượng <code>StorageVolume</code> trong dữ liệu ý định mà bạn có thể
+sử dụng để truy cập các thư mục trên phương tiện có thể tháo lắp đó. Ví dụ sau
+sẽ truy cập thư mục <code>Pictures</code> trên phương tiện có thể tháo lắp:</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">Thực hành Tốt nhất</h2>
+
+<p>Khi có thể, hãy duy trì URI truy cập thư mục bên ngoài để bạn không phải
+lặp lại yêu cầu người dùng cấp quyền truy cập. Khi người dùng đã cấp quyền truy cập, hãy gọi
+<code>getContentResolver().takePersistableUriPermssion()</code> với
+URI truy cập thư mục. Hệ thống sẽ duy trì URI và các yêu cầu
+truy cập sau này sẽ trả về <code>RESULT_OK</code> và không hiển thị UI xác nhận cho
+người dùng nữa.</p>
+
+<p>Nếu người dùng từ chối quyền truy cập đến một thư mục bên ngoài thì đừng
+yêu cầu truy cập lại ngay lập tức. Lặp đi lặp lại yêu cầu truy cập sẽ dẫn đến trải nghiệm
+người dùng không tốt.</p>
diff --git a/docs/html-intl/intl/vi/training/articles/security-config.jd b/docs/html-intl/intl/vi/training/articles/security-config.jd
new file mode 100644
index 0000000..1d8670d
--- /dev/null
+++ b/docs/html-intl/intl/vi/training/articles/security-config.jd
@@ -0,0 +1,745 @@
+page.title=Cấu hình Bảo mật mạng
+page.keywords=androidn,security,network
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Trong tài liệu này</h2>
+<ol>
+ <li><a href="#manifest">Thêm một tệp Cấu hình Bảo mật mạng</a></li>
+ <li><a href="#CustomTrust">Tùy chỉnh các CA đáng tin cậy</a>
+ <ol>
+ <li><a href="#ConfigCustom">Cấu hình một CA tùy chỉnh đáng tin cậy</a></li>
+ <li><a href="#LimitingCas">Giới hạn bộ CA đáng tin cậy</a></li>
+ <li><a href="#TrustingAdditionalCas">Tin cậy các CA bổ sung</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">Các CA chỉ trong chế độ gỡ lỗi</a></li>
+ <li><a href="#UsesCleartextTraffic">Không sử dụng truyền gửi văn bản chưa mã hóa</a></li>
+ <li><a href="#CertificatePinning">Ghim chứng chỉ</a></li>
+ <li><a href="#ConfigInheritance">Hành vi Kế thừa cấu hình</a></li>
+ <li><a href="#FileFormat">Định dạng Tệp cấu hình</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N có tính năng Cấu hình Bảo mật mạng
+ cho phép ứng dụng tùy chỉnh các cài đặt bảo mật mạng trong một tệp
+ cấu hình khai báo an toàn mà không cần sửa đổi mã nguồn ứng dụng. Các cài đặt này có thể
+ được cấu hình cho các miền cụ thể và cho một ứng dụng cụ thể. Các khả năng
+ chính của tính năng này như sau:
+</p>
+
+<ul>
+ <li>
+ <b>Nguồn tin cậy tùy chỉnh:</b> Tùy chính các Nhà cung cấp chứng chỉ (CA)
+ nào được tin cậy cho các kết nối bảo mật của một ứng dụng. Ví
+ dụ, tin cậy các chứng chỉ tự ký đặc biệt hoặc hạn chế
+ bộ CA công khai mà ứng dụng tin cậy.
+ </li>
+
+ <li>
+ <b>Chỉ khống chế khi gỡ lỗi:</b> Gỡ lỗi các kết nối bảo mật một cách an toàn trong một ứng dụng
+ mà không thêm rủi ro cho cơ sở cài đặt.
+ </li>
+
+ <li>
+ <b>Không sử dụng truyền gửi văn bản chưa mã hóa:</b> Bảo vệ các ứng dụng khỏi việc
+ vô tình sử dụng truyền gửi văn bản chưa mã hóa.
+ </li>
+
+ <li>
+ <b>Ghim chứng chỉ:</b> Giới hạn kết nối bảo mật của ứng dụng
+ trong các chứng chỉ đặc biệt.
+ </li>
+</ul>
+
+
+<h2 id="manifest">Thêm một Tệp Cấu hình Bảo mật mạng</h2>
+
+<p>
+ Tính năng Cấu hình Bảo mật mạng sử dụng một tệp XML làm nơi bạn sẽ chỉ định
+ các cài đặt cho ứng dụng của mình. Bạn phải bổ sung một mục nhập trong bản kê khai của
+ ứng dụng để trỏ đến tệp này. Đoạn mã sau của một bản kê khai
+ minh họa cách tạo mục nhập này:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+...
+<app ...>
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+</app>
+</pre>
+
+<h2 id="CustomTrust">Tùy chỉnh các CA đáng tin cậy</h2>
+
+<p>
+ Một ứng dụng có thể muốn tin cậy một bộ các CA tùy chỉnh thay vì mặc định
+ của nền tảng. Những lý do phổ biến nhất cho điều này là:
+</p>
+
+<ul>
+ <li>Kết nối tới một máy chủ có nhà cung cấp chứng chỉ riêng (tự ký,
+ được cấp bởi một CA nội bộ của công ty, v.v.).
+ </li>
+
+ <li>Giới hạn bộ CA chỉ trong các CA mà bạn tin cậy thay vì mọi
+ CA được cài đặt trước.
+ </li>
+
+ <li>Tin cậy các CA bổ sung không được kèm theo trong hệ thống.
+ </li>
+</ul>
+
+<p>
+ Theo mặc định, các kết nối bảo mật (vd: TLS, HTTPS) từ mọi ứng dụng sẽ tin cậy
+ các CA của hệ thống được cài đặt trước và các ứng dụng nhắm mục tiêu mức API 23
+ (Android M) và thấp hơn theo mặc định cũng tin cậy kho lưu trữ CA được người dùng bổ sung. Một
+ ứng dụng có thể tùy chỉnh các kết nối của riêng nó bằng cách sử dụng {@code base-config} (dành cho
+ tùy chỉnh trên phạm vi ứng dụng) hoặc {@code domain-config} (tùy chỉnh
+ cho mỗi miền).
+</p>
+
+
+<h3 id="ConfigCustom">Cấu hình một CA tùy chỉnh</h3>
+
+<p>
+ Giả sử bạn muốn kết nối tới máy chủ của mình có sử dụng các chứng chỉ
+ SSL tự ký hoặc tới một máy chủ có chứng chỉ SSL được cấp bởi một CA không công khai
+ mà bạn tin cậy, chẳng hạn như CA nội bộ của công ty.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Thêm chứng chỉ CA tự ký hoặc không công khai theo định dạng PEM hoặc DER vào
+ {@code res/raw/my_ca}.
+</p>
+
+
+<h3 id="LimitingCas">Giới hạn bộ CA đáng tin cậy</h3>
+
+<p>
+ Một ứng dụng không muốn tin cậy mọi CA được hệ thống tin cậy có thể
+ chỉ định bộ CA hạn chế của riêng nó để tin cậy. Điều này sẽ bảo vệ
+ ứng dụng khỏi các chứng chỉ lừa đảo được cấp bởi bất kỳ CA nào khác.
+</p>
+
+<p>
+ Cấu hình để giới hạn bộ CA đáng tin cậy cũng giống như <a href="#TrustingACustomCa">Tin cậy một CA tùy chỉnh</a> cho một miền cụ thể ngoại trừ
+ việc nhiều CA được cung cấp trong tài nguyên.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Thêm các CA đáng tin cậy theo định dạng PEM hoặc DER vào {@code res/raw/trusted_roots}.
+ Lưu ý rằng nếu sử dụng định dạng PEM thì tệp <em>chỉ</em> được chứa dữ liệu PEM
+ và không có thêm dữ liệu văn bản. Bạn cũng có thể cung cấp nhiều
+ phần tử <a href="#certificates"><code><certificates></code></a>
+ thay vì một phần tử.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ Tin cậy các CA bổ sung
+</h3>
+
+<p>
+ Một ứng dụng có thể muốn tin cậy các CA bổ sung không được hệ thống tin cậy,
+ điều này có thể do hệ thống chưa thêm CA đó hoặc một CA không
+ đáp ứng các yêu cầu để đưa vào hệ thống Android. Một
+ ứng dụng có thể thực hiện điều này bằng cách chỉ định nhiều nguồn chứng chỉ cho một
+ cấu hình.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">Cấu hình các CA để gỡ lỗi</h2>
+
+<p>
+ Khi gỡ lỗi một ứng dụng kết nối qua HTTPS thì bạn có thể muốn
+ kết nối tới một máy chủ phát triển cục bộ không có chứng chỉ
+ SSL dành cho máy chủ thương mại của bạn. Để hỗ trợ cho trường hợp này mà không cần
+ chỉnh sửa mã nguồn ứng dụng của bạn thì bạn có thể chỉ định các CA chỉ dùng cho gỡ lỗi
+ mà <i>chỉ</i> được tin cậy khi <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ là {@code true} bằng cách sử dụng {@code debug-overrides}. Thông thường các IDE và công cụ
+ dựng sẽ đặt cờ này tự động đối với các bản dựng không dùng để phát hành.
+</p>
+
+<p>
+ Làm như vậy an toàn hơn so với mã điều kiện thông thường bởi, là điều kiện
+ bảo mật tiên quyết, các cửa hàng ứng dụng không chấp nhận các ứng dụng được đánh dấu
+ là hỗ trợ gỡ lỗi.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">Không sử dụng truyền gửi văn bản chưa mã hóa</h2>
+
+<p>
+ Các ứng dụng có ý định kết nối tới các điểm đích chỉ sử dụng các kết nối
+ bảo mật có thể bỏ hỗ trợ truyền gửi văn bản không mã hóa (bằng giao thức
+ HTTP không mã hóa thay vì HTTPS) tới các đích đó. Tùy chọn này giúp ngăn
+ các hồi quy tiềm tàng trong ứng dụng do thay đổi trong các URL được cung cấp bởi các nguồn
+ bên ngoài như các máy chủ phụ trợ.
+ Hãy xem {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()} để biết thêm chi tiết.
+</p>
+
+<p>
+ Ví dụ, một ứng dụng có thể đảm bảo rằng mọi kết nối tới {@code
+ secure.example.com} luôn được thực hiện qua HTTPS để bảo vệ việc truyền gửi dữ liệu nhạy cảm
+ khỏi các mạng có hại.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">Ghim chứng chỉ</h2>
+
+<p>
+ Thông thường thì một ứng dụng sẽ tin cậy mọi CA được cài đặt sẵn. Nếu bất kỳ CA nào trong số này sẽ
+ phát hành một chứng chỉ lừa đảo thì ứng dụng sẽ gặp phải rủi ro từ một cuộc tấn công
+ MiTM. Một số ứng dụng chọn cách giới hạn bộ chứng chỉ được chúng chấp nhận
+ bằng cách giới hạn bộ CA được ứng dụng tin cậy hoặc bằng cách ghim chứng chỉ.
+</p>
+
+<p>
+ Ghim chứng chỉ được thực hiện bằng cách cung cấp một bộ chứng chỉ theo mã hash của
+ khóa công khai (SubjectPublicKeyInfo của chứng chỉ X.509). Một chuỗi
+ chứng chỉ khi đó chỉ hợp lệ nếu như chuỗi chứng chỉ có chứa ít nhất một trong
+ các khóa công khai được ghim.
+</p>
+
+<p>
+ Lưu ý rằng khi sử dụng ghim chứng chỉ bạn phải luôn kèm thêm một khóa
+ dự phòng để nếu bạn bị buộc phải chuyển sang các khóa mới hoặc thay đổi các CA (khi
+ ghim vào một chứng chỉ CA hoặc một chứng chỉ trung gian của CA đó) thì
+ kết nối của ứng dụng sẽ không bị ảnh hưởng. Nếu không bạn phải đưa ra một
+ bản cập nhật cho ứng dụng để khôi phục khả năng kết nối.
+</p>
+
+<p>
+ Ngoài ra, có thể đặt thời gian hết hạn cho các ghim, sau thời gian đó
+ sẽ không tiến hành ghim được. Điều này giúp phòng ngừa các vấn đề về kết nối trong
+ ứng dụng chưa được cập nhật. Tuy nhiên, việc đặt thời gian hết hạn
+ trên các ghim này có thể khiến ghim bị bỏ qua.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">Hành vi Kế thừa cấu hình</h2>
+
+<p>
+ Các giá trị chưa được đặt trong một cấu hình cụ thể sẽ được kế thừa. Hành vi này cho phép tạo ra các cấu hình phức tạp
+ hơn trong khi vẫn giữ cho tệp cấu hình có thể đọc được.
+</p>
+
+<p>
+ Nếu một giá trị không được đặt trong một mục nhập cụ thể thì giá trị thuộc mục nhập
+ bao quát hơn tiếp theo sẽ được sử dụng. Các giá trị chưa được đặt trong {@code domain-config} sẽ được
+ lấy từ phần tử cha {@code domain-config} nếu như được lồng, hoặc từ {@code
+ base-config} nếu không được lồng. Các giá trị chưa được đặt trong {@code base-config} sẽ sử dụng
+ các giá trị mặc định của nền tảng.
+</p>
+
+<p>
+ Ví dụ: hãy xem xét trường hợp tất cả các kết nối tới miền con của {@code
+ example.com} phải sử dụng một bộ CA tùy chỉnh. Ngoài ra, truyền gửi văn bản không mã hóa tới
+ các miền này được cho phép <em>trừ khi</em> kết nối tới {@code
+ secure.example.com}. Bằng cách lồng cấu hình cho {@code
+ secure.example.com} bên trong cấu hình cho {@code example.com} thì
+ {@code trust-anchors} không cần phải được sao lặp.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">Định dạng Tệp cấu hình</h2>
+
+<p>
+ Tính năng Cấu hình Bảo mật mạng sử dụng một định dạng tệp XML.
+ Cấu trúc chung của tệp này được thể hiện trong đoạn mẫu mã nguồn sau:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ Các phần sau sẽ mô tả cú pháp và các chi tiết khác của định dạng
+ tệp này.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ có thể chứa:
+ </dt>
+
+ <dd>
+ 0 hoặc 1 của <code><a href="#base-config"><base-config></a></code><br>
+ Bất kỳ số nào của <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 hoặc 1 của <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ cú pháp:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ có thể chứa:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ mô tả:
+ </dt>
+
+ <dd>
+ Cấu hình mặc định được sử dụng bởi mọi kết nối có đích đến không được
+ bao gồm bởi một <a href="#domain-config"><code>domain-config</code></a>.
+
+<p>
+ Bất kỳ giá trị nào chưa được đặt sẽ sử dụng các giá trị mặc định của nền tảng. Cấu hình
+ mặc định cho các ứng dụng nhắm mục tiêu API mức 24 trở lên:
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+Cấu hình mặc định cho các ứng dụng nhắm mục tiêu API mức 23 trở xuống:
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>cú pháp:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>Có thể chứa:</dt>
+
+<dd>
+1 hoặc nhiều <code><a href="#domain"><domain></a></code>
+<br/>0 hoặc 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 hoặc 1 <code><a href="#pin-set"><pin-set></code></a>
+<br/>Bất kỳ số nào của <code><domain-config></code> được lồng</dd>
+
+<dt>Mô tả</dt>
+<dd>Cấu hình được sử dụng cho các kết nối tới các điểm đích cụ thể theo như định nghĩa bởi các phần tử {@code domain}.
+
+<p>Lưu ý rằng nếu nhiều phần tử {@code domain-config} chứa một điểm đích thì cấu hình có quy tắc miền trùng khớp
+cụ thể nhất (dài nhất) sẽ được sử dụng.</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ cú pháp:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ Thuộc tính:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ Nếu {@code "true"} thì quy tắc miền này sẽ trùng với miền đó và tất cả
+ các miền con, bao gồm các miền con của miền con, nếu không quy tắc đó chỉ
+ áp dụng cho các trùng khớp tuyệt đối.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ Mô tả:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ cú pháp:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ Có thể chứa:
+ </dt>
+
+ <dd>
+ 0 hoặc 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ Mô tả:
+ </dt>
+
+ <dd>
+ Ghi đè được thực hiện khi <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ là {@code "true"} thì thường là trường hợp dành cho các bản dựng không phát hành
+ được tạo ra bởi các IDE hoặc công cụ dựng. Các nguồn tin cậy được chỉ định trong {@code
+ debug-overrides} được thêm vào tất cả các cấu hình khác và ghim
+ chứng chỉ không được thực hiện khi chuỗi chứng chỉ của máy chủ sử dụng một trong
+ các nguồn tin cậy chỉ dành cho gỡ lỗi này. Nếu <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ là {@code "false"} thì phần này bị bỏ qua hoàn toàn.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ cú pháp:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ Có thể chứa:
+ </dt>
+
+ <dd>
+ Bất kỳ số nào của <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ Mô tả:
+ </dt>
+
+ <dd>
+ Đặt nguồn tin cậy cho các kết nối bảo mật:
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>cú pháp:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>mô tả:</dt>
+<dd>Bộ các chứng chỉ X.509 cho các phần tử {@code trust-anchors}.</dd>
+
+<dt>thuộc tính:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+Nguồn của các chứng chỉ CA, có thể là một
+<ul>
+ <li>id nguồn thô trỏ tới một tệp có chứa các chứng chỉ X.509.
+ Các chứng chỉ phải được mã hóa theo định dạng DER hoặc PEM. Trong trường hợp của các chứng chỉ
+PEM thì tệp đó <em>không được</em> chứa dữ liệu không phải PEM khác như
+ các chú thích.
+ </li>
+
+ <li>{@code "system"} cho các chứng chỉ CA hệ thống được cài đặt sẵn
+ </li>
+
+ <li>{@code "user"} cho các chứng chỉ CA do người dùng thêm vào
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ Xác định xem liệu các CA từ nguồn này có bỏ qua việc ghim chứng chỉ hay không. Nếu {@code
+ "true"} thì các chuỗi chứng chỉ mà xâu qua một trong các CA từ nguồn
+ này thì khi đó ghim sẽ không được thực hiện. Đây có thể là điều có ích cho các CA gỡ lỗi
+ hoặc để hỗ trợ cho người dùng tấn công MiTM hoạt động truyền gửi bảo mật của ứng dụng.
+ </p>
+
+ <p>
+ Mặc định là {@code "false"} trừ khi được chỉ định trong một phần tử {@code debug-overrides}
+, khi đó mặc định là {@code "true"}.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ cú pháp:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ Có thể chứa:
+ </dt>
+
+ <dd>
+ Bất kỳ số nào của <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ Mô tả:
+ </dt>
+
+ <dd>
+ Một bộ các ghim khóa công khai. Để một kết nối bảo mật được tin cậy, một trong các
+ khóa công khai trong chuỗi tin cậy phải nằm trong bộ các ghim này. Xem
+ <code><a href="#pin"><pin></a></code> để biết định dạng của các ghim.
+ </dd>
+
+ <dt>
+ Thuộc tính:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ Ngày tháng, theo định dạng {@code yyyy-MM-dd}, vào và sau thời điểm các ghim
+ hết hạn và do đó vô hiệu hóa ghim. Nếu thuộc tính này chưa được đặt thì khi đó các
+ ghim không hết hạn.
+ <p>
+ Việc hết hạn giúp phòng ngừa các vấn đề về khả năng kết nối trong ứng dụng làm cho không
+ nhận được các bản cập nhật cho bộ ghim, chẳng hạn như do người dùng
+ vô hiệu hóa các bản cập nhật ứng dụng.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ cú pháp:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ Thuộc tính:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ Thuật toán băm được sử dụng để tạo ghim. Hiện tại, chỉ có
+ {@code "SHA-256"} được hỗ trợ.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/vi/training/material/animations.jd b/docs/html-intl/intl/vi/training/material/animations.jd
index e93c99d..9299d3c 100644
--- a/docs/html-intl/intl/vi/training/material/animations.jd
+++ b/docs/html-intl/intl/vi/training/material/animations.jd
@@ -21,7 +21,7 @@
</div>
-<p>Hoạt hình theo phong cách material design phản hồi hành động của người dùng và cung cấp
+<p>Hoạt hình theo phong cách material design phản hồi hành động của người dùng và cung cấp
tính liên tục trực quan khi người dùng tương tác với ứng dụng của bạn. Giao diện material cung cấp một số hoạt hình
mặc định cho các nút và chuyển tiếp hoạt động, và Android 5.0 (API mức 21) và cao hơn cho phép bạn tùy chỉnh
những hoạt hình này và tạo các hoạt hình mới:</p>
@@ -160,7 +160,7 @@
<li>Chuyển tiếp <strong>phần tử chung</strong> xác định các dạng xem chung giữa hai hoạt động
sẽ chuyển tiếp như thế nào giữa những hoạt động này. Ví dụ, nếu hai hoạt động có cùng
-hình ảnh ở các vị trí và kích cỡ khác nhau, chuyển tiếp phần tử chung <em>changeImageTransform</em>
+hình ảnh ở các vị trí và kích cỡ khác nhau, chuyển tiếp phần tử chung <em>changeImageTransform</em>
sẽ thể hiện và co giãn hình ảnh một cách mượt mà giữa những hoạt động này.</li>
</ul>
@@ -329,7 +329,7 @@
<p>Để tạo một hoạt hình chuyển tiếp cảnh giữa hai hoạt động có nhiều hơn một phần tử
chung, hãy định nghĩa các phần tử chung trong cả hai bố trí bằng thuộc tính <code>android:transitionName</code>
- (hoặc sử dụng phương thức {@link android.view.View#setTransitionName View.setTransitionName()}
+ (hoặc sử dụng phương thức {@link android.view.View#setTransitionName View.setTransitionName()}
trong cả hai hoạt động), và tạo một đối tượng {@link android.app.ActivityOptions} như sau:</p>
<pre>
diff --git a/docs/html-intl/intl/vi/training/material/compatibility.jd b/docs/html-intl/intl/vi/training/material/compatibility.jd
index e19a745..2f5c016 100644
--- a/docs/html-intl/intl/vi/training/material/compatibility.jd
+++ b/docs/html-intl/intl/vi/training/material/compatibility.jd
@@ -94,7 +94,7 @@
<h3>Bảng màu</h3>
-<p>Để có được các kiểu phong cách material design và tùy chỉnh bảng màu bằng Thư viện Hỗ trợ v7
+<p>Để có được các kiểu phong cách material design và tùy chỉnh bảng màu bằng Thư viện Hỗ trợ v7
của Android, hãy áp dụng một trong các chủ đề <code>Theme.AppCompat</code>:</p>
<pre>
diff --git a/docs/html-intl/intl/vi/training/material/drawables.jd b/docs/html-intl/intl/vi/training/material/drawables.jd
index 175e77d..db69412 100644
--- a/docs/html-intl/intl/vi/training/material/drawables.jd
+++ b/docs/html-intl/intl/vi/training/material/drawables.jd
@@ -57,7 +57,7 @@
<li>Sáng lặng</li>
</ul>
-<p>Để trích xuất những màu này, hãy chuyển một đối tượng {@link android.graphics.Bitmap} cho phương thức tĩnh
+<p>Để trích xuất những màu này, hãy chuyển một đối tượng {@link android.graphics.Bitmap} cho phương thức tĩnh
{@link android.support.v7.graphics.Palette#generate Palette.generate()} trong
luồng chạy ngầm nơi bạn tải hình ảnh của mình. Nếu bạn không thể sử dụng luồng đó, hãy gọi phương thức
{@link android.support.v7.graphics.Palette#generateAsync Palette.generateAsync()} và
diff --git a/docs/html-intl/intl/vi/training/material/get-started.jd b/docs/html-intl/intl/vi/training/material/get-started.jd
index 9e612ad..45d7c09 100644
--- a/docs/html-intl/intl/vi/training/material/get-started.jd
+++ b/docs/html-intl/intl/vi/training/material/get-started.jd
@@ -94,7 +94,7 @@
<h2 id="Depth">Quy định Độ cao trong Dạng xem của Bạn</h2>
-<p>Dạng xem có thể đổ bóng và giá trị độ cao của một dạng xem
+<p>Dạng xem có thể đổ bóng và giá trị độ cao của một dạng xem
xác định kích cỡ bóng và thứ tự vẽ của nó. Để đặt độ cao của một dạng xem, hãy sử dụng thuộc tính
<code>android:elevation</code> trong bố trí của bạn:</p>
@@ -122,7 +122,7 @@
<p>{@link android.support.v7.widget.RecyclerView} là một phiên bản dễ ghép nối hơn của {@link
android.widget.ListView} có hỗ trợ các kiểu bố trí khác nhau và cung cấp những cải tiến về hiệu năng.
{@link android.support.v7.widget.CardView} cho phép bạn hiện các mẩu thông tin bên trong thẻ với
-một diện mạo nhất quán giữa các ứng dụng. Ví dụ về mã sau đây minh họa cách thêm
+một diện mạo nhất quán giữa các ứng dụng. Ví dụ về mã sau đây minh họa cách thêm
{@link android.support.v7.widget.CardView} vào bố trí của bạn:</p>
<pre>
diff --git a/docs/html-intl/intl/vi/training/material/index.jd b/docs/html-intl/intl/vi/training/material/index.jd
index 44b74e1..eb489457 100644
--- a/docs/html-intl/intl/vi/training/material/index.jd
+++ b/docs/html-intl/intl/vi/training/material/index.jd
@@ -17,7 +17,7 @@
<p>Material design là một hướng dẫn toàn diện về thiết kế trực quan, chuyển động
và tương tác giữa nhiều nền tảng và thiết bị. Để sử dụng material design trong ứng dụng Androi của mình, hãy làm theo hướng dẫn
-mô tả trong
+mô tả trong
<a href="http://www.google.com/design/spec/material-design/introduction.html">đặc tả
material design</a> và sử dụng những thành phần và tính năng mới sẵn có trong Android 5.0
(API mức 21).</p>
diff --git a/docs/html-intl/intl/vi/training/material/lists-cards.jd b/docs/html-intl/intl/vi/training/material/lists-cards.jd
index 7127649..47a7d6f 100644
--- a/docs/html-intl/intl/vi/training/material/lists-cards.jd
+++ b/docs/html-intl/intl/vi/training/material/lists-cards.jd
@@ -210,7 +210,7 @@
Để biết thêm thông tin, hãy xem phần <a href="{@docRoot}training/material/compatibility.html">Duy trì
Tính tương thích</a>.</p>
-<p>Sử dụng những thuộc tính sau để tùy chỉnh diện mạo của widget
+<p>Sử dụng những thuộc tính sau để tùy chỉnh diện mạo của widget
{@link android.support.v7.widget.CardView}:</p>
<ul>
diff --git a/docs/html-intl/intl/vi/training/material/shadows-clipping.jd b/docs/html-intl/intl/vi/training/material/shadows-clipping.jd
index e9091f2..f4ce402 100644
--- a/docs/html-intl/intl/vi/training/material/shadows-clipping.jd
+++ b/docs/html-intl/intl/vi/training/material/shadows-clipping.jd
@@ -22,7 +22,7 @@
tầm quan trọng tương đối của từng phần tử và tập chung sự chú ý của họ vào tác vụ hiện có.</p>
<p>Độ cao của một dạng xem, được biểu diễn bằng thuộc tính Z, sẽ xác định diện mạo trực quan của
-bóng đổ: dạng xem có giá trị Z cao hơn sẽ đổ bóng lớn hơn, mềm hơn. Dạng xem có giá trị Z cao hơn sẽ che khuất dạng xem
+bóng đổ: dạng xem có giá trị Z cao hơn sẽ đổ bóng lớn hơn, mềm hơn. Dạng xem có giá trị Z cao hơn sẽ che khuất dạng xem
có giá trị Z thấp hơn; tuy nhiên, giá trị Z của một dạng xem không ảnh hưởng tới kích cỡ của dạng xem.</p>
<p>Đổ bóng được vẽ bởi dạng xem mẹ của dạng xem cao hơn, do vậy nó phụ thuộc vào tiêu chuẩn cắt dạng xem,
@@ -51,7 +51,7 @@
<p class="img-caption"><strong>Hình 1</strong> - Đổ bóng cho các độ cao dạng xem khác nhau.</p>
<p>Để đặt độ cao của dạng xem trong một định nghĩa bố trí, hãy sử dụng thuộc tính <code>android:elevation</code>
-. Để đặt độ cao của dạng xem trong mã của một hoạt động, hãy sử dụng phương thức
+. Để đặt độ cao của dạng xem trong mã của một hoạt động, hãy sử dụng phương thức
{@link android.view.View#setElevation View.setElevation()}.</p>
<p>Để đặt độ dịch của dạng xem, hãy sử dụng phương thức {@link android.view.View#setTranslationZ
@@ -59,7 +59,7 @@
<p>Các phương thức {@link android.view.ViewPropertyAnimator#z ViewPropertyAnimator.z()} và {@link
android.view.ViewPropertyAnimator#translationZ ViewPropertyAnimator.translationZ()} mới cho phép
-bạn dễ dàng tạo hiệu ứng hoạt hình cho độ cao của dạng xem. Để biết thêm thông tin, hãy xem tài liệu tham khảo API cho
+bạn dễ dàng tạo hiệu ứng hoạt hình cho độ cao của dạng xem. Để biết thêm thông tin, hãy xem tài liệu tham khảo API cho
{@link android.view.ViewPropertyAnimator} và hướng dẫn cho nhà phát triển về <a href="{@docRoot}guide/topics/graphics/prop-animation.html">Hoạt hình Thuộc tính</a>
.</p>
diff --git a/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..8146a15
--- /dev/null
+++ b/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,186 @@
+page.title=Ảnh trong ảnh
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Trong tài liệu này</h2>
+<ol>
+ <li><a href="#declaring">Khai báo Hoạt động hỗ trợ
+Ảnh trong ảnh</a></li>
+ <li><a href="#pip_button">Chuyển Hoạt động sang Ảnh trong ảnh</a>
+</li>
+ <li><a href="#handling_ui">Xử lý UI trong chế độ Ảnh trong ảnh</a>
+</li>
+ <li><a href="#continuing_playback">Tiếp tục phát lại video ở chế độ
+Ảnh trong ảnh</a></li>
+ <li><a href="#best">Thực hành Tốt nhất</a></li>
+</ol>
+
+<h2>Xem thêm</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">Hỗ trợ
+đa cửa sổ</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>Trong Android N, người dùng Android TV đã có thể xem video
+trong một cửa sổ được ghim vào một góc màn hình khi điều hướng bên trong
+các ứng dụng. Chế độ Ảnh trong ảnh (PIP) cho phép ứng dụng chạy một hoạt động
+video trong cửa sổ được ghim trong khi một hoạt động khác tiếp tục chạy
+ngầm. Cửa sổ PIP cho phép người dùng thực hiện nhiều việc khi đang sử dụng ứng dụng của bạn,
+giúp cho người dùng năng suất hơn.</p>
+
+<p>Ứng dụng của bạn có thể quyết định khi nào thì kích hoạt chế độ PIP. Sau đây là một vài ví dụ về
+thời điểm chuyển vào chế độ PIP:</p>
+
+<ul>
+<li>Ứng dụng của bạn có thể chuyển một video vào chế độ PIP khi người dùng điều hướng
+rời khỏi video đó để duyệt nội dung khác.</li>
+<li>Ứng dụng của bạn có thể chuyển một video sang chế độ PIP khi người dùng xem đoạn cuối
+ của một tập nội dung. Màn hình chính sẽ hiển thị thông tin quảng cáo
+hoặc tóm tắt về tập tiếp theo trong loạt video đó.</li>
+<li>Ứng dụng của bạn có thể mang lại cho người dùng một cách để xếp hàng các nội dung bổ sung khi
+họ đang xem một video. Video đó sẽ tiếp tục được phát trong chế độ PIP trong khi màn hình
+chính hiển thị hoạt động chọn nội dung.</li>
+</ul>
+
+<p>Cửa sổ PIP có kích thước 240x135 dp và được hiển thị trên lớp trên cùng ở một trong
+bốn góc của màn hình được hệ thống chọn. Người dùng có thể gọi ra một menu PIP
+, cho phép họ bật tắt cửa sổ PIP lên toàn màn hình hoặc đóng cửa sổ
+PIP bằng cách bấm giữ nút <b>Home</b> trên điều khiển từ xa. Nếu một video
+khác bắt đầu phát trên màn hình chính, cửa sổ PIP sẽ tự động
+được đóng. Người dùng cũng có thể đóng cửa sổ PIP thông qua nút Recents.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>Hình 1.</strong> Một video Ảnh trong ảnh
+được hiển thị ở góc màn hình khi người dùng duyệt nội dung
+trên màn hình chính.</p>
+
+<p>PIP sử dụng các API đa cửa sổ có trong Android N để
+tạo cửa sổ video nằm chồng được ghim. Để thêm chế độ PIP vào ứng dụng bạn cần
+đăng ký các hoạt động hỗ trợ PIP, chuyển hoạt động của bạn sang chế độ PIP khi
+cần và đảm bảo cho các phần tử UI sẽ bị ẩn đi và phát lại video vẫn tiếp tục khi
+hoạt động đó ở trong chế độ PIP.</p>
+
+<h2 id="declaring">Khai báo Hoạt động hỗ trợ Ảnh trong ảnh</h2>
+
+<p>Theo mặc định, hệ thống không tự động hỗ trợ PIP cho các ứng dụng.
+Nếu bạn muốn hỗ trợ chế độ PIP trong ứng dụng của mình, hãy đăng ký hoạt động
+video trong bản kê khai bằng cách đặt
+<code>android:supportsPictureInPicture</code> và
+<code>android:resizeableActivity</code> thành <code>true</code>. Ngoài ra, hãy chỉ định
+hoạt động của bạn xử lý các thay đổi cấu hình bố trí để hoạt động đó
+không khởi chạy lại khi có các thay đổi về bố trí trong quá trình chuyển tiếp chế độ PIP.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>Khi đăng ký hoạt động của bạn, hãy nhớ rằng trong chế độ PIP, hoạt động
+của bạn sẽ được hiển thị trong một cửa sổ nhỏ nằm chồng trên màn hình TV. Các hoạt động
+phát lại video với UI tối giản sẽ đem đến trải nghiệm người dùng tốt nhất. Các hoạt động
+có chứa những phần tử UI nhỏ có thể không đem lại trải nghiệm người dùng đạt yêu cầu
+khi được chuyển sang chế độ PIP bởi người dùng không thể thấy các chi tiết của phần tử UI
+trong cửa sổ PIP.</p>
+
+<h2 id="pip_button">Chuyển Hoạt động sang Ảnh trong ảnh</h2>
+
+Khi bạn cần chuyển hoạt động của mình sang chế độ PIP, hãy gọi
+<code>Activity.enterPictureInPicture()</code>. Ví dụ sau sẽ chuyển
+sang chế độ PIP khi người dùng chọn một nút PIP riêng trên thanh điều khiển
+media:</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPicture();
+ return;
+ }
+ ...
+</pre>
+
+<p>Thêm một nút PIP vào thanh điều khiển media của bạn sẽ cho phép người dùng dễ dàng chuyển
+sang chế độ PIP khi điều khiển phát lại video.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>Hình 1.</strong> Một nút Ảnh trong ảnh
+trên thanh điều khiển media.</p>
+
+<p>Android N có một lớp
+<code>PlaybackControlsRow.PictureInPictureAction</code> mới định nghĩa
+các hành động ở chế độ PIP trên thanh điều khiển và sử dụng biểu tượng PIP.</p>
+
+<h2 id="handling_ui">Xử lý UI trong chế độ Ảnh trong ảnh</h2>
+
+<p>Khi hoạt động của bạn vào trong chế độ PIP thì hoạt động đó chỉ nên hiển thị phát lại
+video. Hãy xóa các phần tử UI trước khi hoạt động của bạn vào chế độ PIP,
+và khôi phục các phần tử này khi hoạt động quay lại chế độ toàn màn hình.
+Ghi đè phương thức <code>Activity.onPictureInPictureChanged()</code> hoặc
+<code>Fragment.onPictureInPictureChanged()</code> và bật hoặc
+tắt các phần tử UI khi cần thiết, ví dụ:</p>
+
+<pre>
+@Override
+public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ if (inPictureInPicture) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">Tiếp tục phát lại video ở chế độ
+Ảnh trong ảnh</h2>
+
+<p>Khi hoạt động của bạn chuyển sang chế độ PIP thì hệ thống sẽ coi hoạt động đó đang ở trong
+trạng thái tạm dừng và sẽ gọi phương thức <code>onPause()</code> của hoạt động. Việc phát lại
+video không nên được tạm dừng và cần được tiếp tục phát nếu hoạt động
+bị tạm dừng do chế độ PIP. Hãy kiểm tra chế độ PIP trong phương thức
+<code>onPause()</code> của hoạt động và xử lý việc phát lại cho phù hợp, ví
+dụ:</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called due to PIP, do not pause playback
+ if (inPictureInPicture()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>Khi hoạt động của bạn chuyển ra khỏi chế độ PIP để quay trở về chế độ toàn màn hình thì
+hệ thống sẽ tiếp tục hoạt động của bạn và gọi phương thức <code>onResume()</code>.</p>
+
+<h2 id="best">Thực hành Tốt nhất</h2>
+
+<p>PIP được dành cho các hoạt động phát lại video toàn màn hình. Khi chuyển
+hoạt động của bạn vào chế độ PIP, hãy tránh hiển thị bất kỳ nội dung nào ngoài video.
+Theo dõi khi hoạt động của bạn vào chế độ PIP và ẩn đi các phần tử UI, như mô tả
+trong <a href="#handling_ui">Xử lý UI trong chế độ Ảnh trong ảnh</a>.</p>
+
+<p>Vì cửa sổ PIP được hiển thị dưới dạng cửa sổ nổi ở góc
+màn hình do đó bạn cần tránh hiển thị các thông tin quan trọng trong màn hình chính
+ở bất kỳ vùng nào có thể bị che khuất bởi cửa sổ PIP.</p>
+
+<p>Theo mặc định, khi một hoạt động đang ở trong chế độ PIP thì nó sẽ không nhận tiêu điểm nhập vào. Để
+tiếp nhận các sự kiện nhập vào khi ở chế độ PIP, hãy sử dụng
+<code>MediaSession.setMediaButtonReceiver()</code>.</p>
diff --git a/docs/html-intl/intl/vi/preview/features/tv-recording-api.jd b/docs/html-intl/intl/vi/training/tv/tif/content-recording.jd
similarity index 100%
rename from docs/html-intl/intl/vi/preview/features/tv-recording-api.jd
rename to docs/html-intl/intl/vi/training/tv/tif/content-recording.jd
diff --git a/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd b/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd
index 8e20975..8159145 100644
--- a/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd
@@ -430,7 +430,7 @@
<p>当系统检测到合适的网络时，它将连接到该网络并调用 {@link android.net.ConnectivityManager.NetworkCallback#onAvailable(android.net.Network) onAvailable()} 回调。您可以在回调中使用 {@link android.net.Network} 对象来获取关于该网络的更多信息，或者指示通信使用选定的网络。</p>
<h3 id="BluetoothBroadcasting">低功耗蓝牙</h3>
-<p>Android 4.3 中作为重头戏引入了对<a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">低功耗蓝牙</a>（“低功耗蓝牙”<em></em>）的平台支持。在 Android 5.0 中，Android 设备现在可以用作低功耗蓝牙<em>外围设备</em>。应用可以使用此功能使附近的设备知道它的存在。例如，您可以构建相应的应用来允许设备用作计步器或健康检测器并与另一低功耗蓝牙设备交换其数据。</p>
+<p>Android 4.3 中作为重头戏引入了对<a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">低功耗蓝牙</a>（“低功耗蓝牙”<em></em>）的平台支持。在 Android 5.0 中，Android 设备现在可以用作低功耗蓝牙<em>外围设备</em>。应用可以使用此功能使附近的设备知道它的存在。例如，您可以构建相应的应用来允许设备用作计步器或健康检测器并与另一低功耗蓝牙设备交换其数据。</p>
<p>新的 {@link android.bluetooth.le} API 允许您的应用对公告进行广播，扫描响应，以及与附近的低功能蓝牙设备建立连接。要使用新的公告和扫描功能，请在您的清单中添加 {@link android.Manifest.permission#BLUETOOTH_ADMIN BLUETOOTH_ADMIN} 权限。当用户从 Play 商店更新或下载您的应用时，会要求他们向您的应用授予以下权限：“蓝牙连接信息：允许应用控制蓝牙，包括向附近的蓝牙设备进行广播以及获取关于这些设备的信息。”</p>
<p>要开始低功耗蓝牙公告以便其他设备可以发现您的应用，请调用 {@link android.bluetooth.le.BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback) startAdvertising()} 并传入 {@link android.bluetooth.le.AdvertiseCallback} 类的一个实施。回调对象将收到关于公告操作成功或失败的报告。</p>
diff --git a/docs/html-intl/intl/zh-cn/about/versions/marshmallow/android-6.0-testing.jd b/docs/html-intl/intl/zh-cn/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..d1e1187
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=测试指南
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>本文内容</h2>
+ <ol>
+ <li><a href="#runtime-permissions">测试权限</a></li>
+ <li><a href="#doze-standby">测试低电耗模式和应用待机模式</a></li>
+ <li><a href="#ids">自动备份和设备标识符</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ 利用 Android N，您有机会确保应用可使用下一平台版本。
+如 <a href="{@docRoot}preview/api-overview.html">API 概览</a>和<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>中所述，该 Preview 包括大量 API 和可能影响应用的行为变更。
+
+使用 Preview 测试应用时，您应重点关注一些特定的系统变更，确保用户拥有愉悦的体验。
+
+
+</p>
+
+<p>
+ 本指南介绍可使用您的应用测试 Preview 的哪些功能以及如何测试。您应确定优先测试以下特定 Preview 功能，因为它们可能会对应用行为产生较大影响。
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">权限</a>
+ </li>
+ <li><a href="#doze-standby">低电耗模式和应用待机模式</a>
+ </li>
+ <li><a href="#ids">自动备份和设备标识符</a></li>
+</ul>
+
+<p>
+ 如需了解有关如何使用 Preview 系统映像设置设备或虚拟设备以进行测试的详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html">设置 Android N SDK</a>。
+
+
+</p>
+
+
+<h2 id="runtime-permissions">测试权限</h2>
+
+<p>
+ 新<a href="{@docRoot}preview/features/runtime-permissions.html">权限</a>模型改变了用户向您的应用分配权限的方式。
+您的应用必须在运行时要求用户提供各项权限，而不是在安装过程中要求授予所有权限。
+
+对于用户而言，此行为有助于他们更精细地控制每个应用的 Activity，并更深入地了解应用为何请求提供特定权限的上下文信息。
+用户可以随时向应用授予某项权限或撤销其某项权限。
+预览版的这种功能最有可能会对应用行为产生影响，而且可能会阻止某些应用功能运行或只能在降级状态中运行。
+
+
+</p>
+
+<p class="caution">
+ 这一变更会影响在新平台上运行的所有应用，即便这些应用并非面向新平台版本开发亦是如此。
+该平台为旧版应用提供有限的兼容性行为，但您现在应当开始计划将应用迁移到新权限模型，以便在官方平台启动时发布更新的应用版本。
+
+
+</p>
+
+
+<h3 id="permission-test-tips">测试提示</h3>
+
+<p>
+ 使用以下测试提示有助于您计划并通过新权限行为执行应用测试。
+
+</p>
+
+<ul>
+ <li>识别应用的当前权限和相关的代码路径</li>
+ <li>跨受权限保护的服务和数据测试用户流程</li>
+ <li>使用授予/撤销权限的各种组合进行测试</li>
+ <li>使用 {@code adb} 工具从命令行管理权限：
+ <ul>
+ <li>按组列出权限和状态：
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>使用以下语法授予或撤销一项或多项权限：<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>针对使用权限的服务对应用进行分析</li>
+</ul>
+
+<h3 id="permission-test-strategy">测试策略</h3>
+
+<p>
+ 权限更改会影响应用的结构和设计，以及您为用户提供的用户体验和流程。
+您应评估应用的当前权限使用情况并开始计划要提供的新流程。
+平台的正式版本提供兼容性行为，但您应计划更新应用，而不是依赖于这些行为。
+
+
+</p>
+
+<p>
+ 确定应用实际需要和使用的权限，然后找出各种使用受权限保护的服务的代码路径。
+您可通过结合使用新平台测试和代码分析完成此操作。
+在测试中，您应通过将应用的 {@code targetSdkVersion} 更改为预览版，重点关注选择运行时权限。
+如需了解详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html#">设置 Android N SDK</a>。
+
+
+</p>
+
+<p>
+ 使用已撤销和已添加权限的各种组合进行测试，突出显示依赖于权限的用户流程。
+如果依赖关系不明显或不符合逻辑，则您应考虑重构或划分该流程，以消除依赖关系或阐明需要权限的原因。
+
+
+</p>
+
+<p>
+ 如需了解有关运行时权限行为、测试和最佳做法的详细信息，请参阅<a href="{@docRoot}preview/features/runtime-permissions.html">权限</a>开发者预览版页面。
+
+
+</p>
+
+
+<h2 id="doze-standby">测试低电耗模式和应用待机模式</h2>
+
+<p>
+ 当设备处于空闲状态或应用未聚焦时，低电耗模式和应用待机模式的节能功能将限制应用可执行的后台处理工作量。
+系统可对应用实施的限制包括：限制或禁止访问网络、暂停后台任务、暂停通知、忽略唤醒请求和闹铃。
+
+要确保应用在完成这些节能优化后正常运行，您应通过模拟这些低功耗状态对应用进行测试。
+
+
+</p>
+
+<h4 id="doze">在低电耗模式下测试您的应用</h4>
+
+<p>要在低电耗模式下测试您的应用，请执行以下操作：</p>
+
+<ol>
+<li>使用 Android N 系统映像配置硬件设备或虚拟设备</li>
+<li>将设备连接到开发计算机并安装应用</li>
+<li>运行应用并使其保持活动状态</li>
+<li>通过运行以下命令，模拟进入低电耗模式的设备：
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>观察重新激活设备时的应用行为。确保应用在设备退出低电耗模式时正常恢复
+</li>
+</ol>
+
+
+<h4 id="standby">在应用待机模式下测试您的应用</h4>
+
+<p>要在应用待机模式下测试您的应用，请执行以下操作：</p>
+
+<ol>
+ <li>使用 Android N 系统映像配置硬件设备或虚拟设备</li>
+ <li>将设备连接到开发计算机并安装应用</li>
+ <li>运行应用并使其保持活动状态</li>
+ <li>通过运行以下命令，模拟进入待机模式的应用：
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>使用以下命令模拟如何唤醒应用：
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>观察唤醒后的应用行为。确保应用从待机模式中正常恢复。
+特别地，您应检查应用的通知和后台作业是否按预期继续运行
+</li>
+</ol>
+
+<h2 id="ids">自动备份应用和设备特定的标识符</h2>
+
+<p>如果应用坚持在内部存储中使用任何设备特定的标识符，如 Google 云消息传递注册 ID，请确保遵循最佳做法将存储位置从自动备份中排除，如<a href="{@docRoot}preview/backup/index.html">自动备份应用</a>中所述。
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..71aff37
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,610 @@
+page.title=行为变更
+page.keywords=Preview、SDK、兼容性
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>本文内容</h2>
+
+<ol>
+ <li><a href="#perf">性能提升</a>
+ <ol>
+ <li><a href="#doze">低电耗模式</a></li>
+ <li><a href="#bg-opt">后台优化</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">权限更改</a>
+ </li>
+ <li><a href="#sharing-files">应用间共享文件</a></li>
+ <li><a href="#accessibility">无障碍改进</a>
+ <ol>
+ <li><a href="#screen-zoom">屏幕缩放</a></li>
+ <li><a href="#vision-settings">设置向导中的视觉设置</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">NDK 应用链接至平台库</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">注解保留</a></li>
+ <li><a href="#other">其他重要说明</a></li>
+</ol>
+
+<h2>另请参阅</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">Android N API 概览</a>
+</li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Android N 除了提供诸多新特性和功能外，还对系统和 API 行为做出了各种变更。
+本文重点介绍您应该了解并在开发应用时加以考虑的一些重要变更。
+
+
+</p>
+
+<p>
+ 如果您之前发布过 Android 应用，请注意您的应用可能受到这些平台变更的影响。
+
+</p>
+
+
+<h2 id="perf">电池和内存</h2>
+
+<p>
+Android N 包括旨在延长设备电池寿命和减少 RAM 使用的系统行为变更。
+这些变更可能会影响您的应用访问系统资源，以及您的系统通过特定隐式 Intent 与其他应用互动的方式。
+
+
+</p>
+
+<h3 id="doze">低电耗模式</h3>
+
+<p>
+ Android 6.0（API 级别 23）引入了低电耗模式，当用户设备未插接电源、处于静止状态且屏幕关闭时，该模式会推迟 CPU 和网络活动，从而延长电池寿命。而 Android N 则通过在设备未插接电源且屏幕关闭状态下、但不一定要处于静止状态（例如用户外出时把手持式设备装在口袋里）时应用部分 CPU 和网络限制，进一步增强了低电耗模式。
+
+
+
+
+
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>图 1.</strong> 低电耗模式如何应用第一级系统活动限制以延长电池寿命的图示。
+
+</p>
+
+<p>
+ 当设备处于充电状态且屏幕已关闭一定时间后，设备会进入低电耗模式并应用第一部分限制：
+关闭应用网络访问、推迟作业和同步。
+如果进入低电耗模式后设备处于静止状态达到一定时间，系统则会对 {@link android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} 闹铃、GPS 和 Wi-Fi 扫描应用余下的低电耗模式限制。
+
+
+无论是应用部分还是全部低电耗模式限制，系统都会唤醒设备以提供简短的维护时间窗口，在此窗口期间，应用程序可以访问网络并执行任何被推迟的作业/同步。
+
+
+
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>图 2.</strong> 低电耗模式如何在设备处于静止状态达到一定时间后应用第二级系统活动限制的图示。
+
+</p>
+
+<p>
+ 请注意，激活屏幕或插接设备电源时，系统将退出低电耗模式并取消这些处理限制。
+此项新增的行为不会影响有关使您的应用适应 Android 6.0（API 级别 23）中所推出的旧版本低电耗模式的建议和最佳实践，如<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">低电耗模式和应用待机模式优化</a>中所讨论。
+
+
+
+您仍应遵循这些建议（例如使用 Google Cloud Messaging (GCM) 发送和接收消息）并开始安排更新计划以适应新增的低电耗模式行为。
+
+
+
+</p>
+
+
+<h3 id="bg-opt">Project Svelte：后台优化</h3>
+
+<p>
+ Android N 删除了三项隐式广播，以帮助优化内存使用和电量消耗。
+此项变更很有必要，因为隐式广播会在后台频繁启动已注册侦听这些广播的应用。
+
+删除这些广播可以显著提升设备性能和用户体验。
+
+</p>
+
+<p>
+ 移动设备会经历频繁的连接变更，例如在 Wi-Fi 和移动数据之间切换时。
+目前，可以通过在应用清单中注册一个接收器来侦听隐式 {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION} 广播，让应用能够监控这些变更。
+
+
+由于很多应用会注册接收此广播，因此单次网络切换即会导致所有应用被唤醒并同时处理此广播。
+
+
+</p>
+
+<p>
+ 同理，应用可以注册接收来自其他应用（例如相机）的隐式 {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 和 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} 广播。
+当用户使用相机应用拍摄照片时，这些应用即会被唤醒以处理广播。
+
+</p>
+
+<p>
+ 为缓解这些问题，Android N 应用了以下优化措施：
+
+</p>
+
+<ul>
+ <li>面向 Android N 开发的应用不会收到 {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} 广播，即使它们已有清单条目来请求接受这些事件的通知。
+在前台运行的应用如果使用{@link android.content.BroadcastReceiver} 请求接收通知，则仍可以在主线程中侦听 {@code CONNECTIVITY_CHANGE}。
+
+
+ </li>
+
+ <li>应用无法发送或接收 {@link
+android.hardware.Camera#ACTION_NEW_PICTURE} 或 {@link
+android.hardware.Camera#ACTION_NEW_VIDEO} 广播。此项优化会影响所有应用，而不仅仅是面向 Android N 的应用。
+
+ </li>
+</ul>
+
+<p>如果您的应用使用任何 Intent，您仍需要尽快移除它们的依赖关系，以正确适配 Android N 设备。
+
+ Android 框架提供多个解决方案来缓解对这些隐式广播的需求。
+例如，{@link
+ android.app.job.JobScheduler} API 提供了一个稳健可靠的机制来安排满足指定条件（例如连入无限流量网络）时所执行的网络操作。
+
+您甚至可以使用 {@link
+ android.app.job.JobScheduler} 来适应内容提供程序变化。
+</p>
+
+<p>
+ 如需了解有关 Android N 中后台优化以及如何改写应用的详细信息，请参阅<a href="{@docRoot}preview/features/background-optimization.html">后台优化</a>。
+
+
+</p>
+
+<h2 id="perm">权限更改</h2>
+
+<p>
+ Android N 做了一些权限更改，这些更改可能会影响您的应用。
+</p>
+
+<h3 id="permfilesys">系统权限更改</h3>
+
+<p>
+ 为了提高私有文件的安全性，面向 Android N 或更高版本的应用私有目录被限制访问 (<code>0700</code>)。
+
+ 此设置可防止私有文件的元数据泄漏，如它们的大小或存在。
+此权限更改有多重副作用：
+</p>
+
+<ul>
+ <li>
+ 私有文件的文件权限不应再由所有者放宽，为使用 {@link android.content.Context#MODE_WORLD_READABLE} 和/或 {@link android.content.Context#MODE_WORLD_WRITEABLE} 而进行的此类尝试将触发 {@link java.lang.SecurityException}。
+
+
+
+
+ <p class="note">
+ <strong>注：</strong>迄今为止，这种限制尚不能完全执行。
+ 应用仍可能使用原生 API 或 {@link java.io.File File} API 来修改它们的私有目录权限。
+但是，我们强烈反对放宽私有目录的权限。
+
+ </p>
+ </li>
+ <li>
+ 传递软件包网域外的 <code>file://</code> URI 可能给接收器留下无法访问的路径。
+因此，尝试传递 <code>file://</code> URI 会触发 <code>FileUriExposedException</code>。
+
+分享私有文件内容的推荐方法是使用 {@link
+ android.support.v4.content.FileProvider}。
+
+ </li>
+ <li>
+ {@link android.app.DownloadManager} 不再按文件名分享私人存储的文件。
+旧版应用在访问 {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME} 时可能出现无法访问的路径。
+面向 Android N 或更高版本的应用在尝试访问 {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} 时会触发 {@link java.lang.SecurityException}。
+
+
+
+ 通过使用 {@link
+ android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+ DownloadManager.Request.setDestinationInExternalFilesDir()} 或 {@link
+ android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+ DownloadManager.Request.setDestinationInExternalPublicDir()} 将下载位置设置为公共位置的旧版应用仍可以访问 {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} 中的路径，但是我们强烈反对使用这种方法。
+
+
+
+
+
+访问由 {@link android.app.DownloadManager} 公开的文件的首选方式是使用 {@link android.content.ContentResolver#openFileDescriptor
+ ContentResolver.openFileDescriptor()}。
+
+
+ </li>
+</ul>
+
+<h2 id="sharing-files">应用间共享文件</h2>
+
+<p>
+对于面向 Android N 的应用，Android 框架执行的 {@link android.os.StrictMode} API 政策禁止向您的应用外公开 {@code file://} URI。
+
+如果一项包含文件 URI 的 Intent 离开您的应用，应用失败，并出现 {@code FileUriExposedException} 异常。
+
+</p>
+
+<p>
+若要在应用间共享文件，您应发送一项 {@code content://} URI，并授予 URI 临时访问权限。
+进行此授权的最简单方式是使用 {@link android.support.v4.content.FileProvider} 类。
+如需有关权限和共享文件的更多信息，请参阅<a href="{@docRoot}training/secure-file-sharing/index.html">共享文件</a>。
+
+
+</p>
+
+<h2 id="accessibility">无障碍改进</h2>
+
+<p>
+ 为提高平台对于视力不佳或视力受损用户的可用性，Android N 做出了一些更改。这些更改一般并不要求更改您的应用代码，不过您应仔细检查并使用您的应用测试这些功能，以评估它们对用户体验的潜在影响。
+
+
+
+
+</p>
+
+
+<h3 id="screen-zoom">屏幕缩放</h3>
+
+<p>
+ Android N 支持用户设置<strong>显示尺寸</strong>，以放大或缩小屏幕上的所有元素，从而提升设备对视力不佳用户的可访问性。用户无法将屏幕缩放至低于最小屏幕宽度<a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
+ sw320dp</a>，该宽度是 Nexus 4 的宽度，也是常规中等大小手机的宽度。
+
+
+
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>图 3.</strong> 右侧屏幕显示的是一台运行 Android N 系统映像的设备增大显示尺寸后的效果。
+
+</p>
+
+
+<p>
+ 当设备密度发生更改时，系统会以如下方式通知正在运行的应用：
+
+</p>
+
+<ul>
+ <li>如果是面向 API 级别 23 或更低版本系统的应用，系统会自动终止其所有后台进程。
+这意味着如果用户切换离开此类应用，转而打开“Settings”屏幕并更改 <strong>Display size</strong> 设置，则系统会像处理内存不足的情况一样终止该应用。
+
+<em></em>
+如果应用具有任何前台进程，则系统会如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述将配置变更通知给这些进程，就像对待设备屏幕方向变更一样。
+
+
+
+ </li>
+
+ <li>如果是面向 Android N 的应用，则其所有进程（前台和后台）都会收到有关配置变更的通知，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述。
+
+
+
+ </li>
+</ul>
+
+<p>
+ 大多数应用并不需要进行任何更改即可支持此功能，不过前提是这些应用遵循 Android 最佳实践。具体要检查的事项：
+
+</p>
+
+<ul>
+ <li>在屏幕宽度为 <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code> 的设备上测试您的应用，并确保其充分运行。
+
+ </li>
+
+ <li>当设备配置发生变更时，更新任何与密度相关的缓存信息，例如缓存位图或从网络加载的资源。当应用从暂停状态恢复运行时，检查配置变更。
+
+
+
+ <p class="note">
+ <strong>注：</strong>如果您要缓存与配置相关的数据，则最好也包括相关元数据，例如该数据对应的屏幕尺寸或像素密度。
+
+保存这些元数据便于您在配置变更后决定是否需要刷新缓存数据。
+
+
+ </p>
+ </li>
+
+ <li>避免用像素单位指定尺寸，因为像素不会随屏幕密度缩放。应改为使用<a href="{@docRoot}guide/practices/screens_support.html">与密度无关像素</a> (<code>dp</code>) 单位指定尺寸。
+
+
+ </li>
+</ul>
+
+<h3 id="vision-settings">设置向导中的视觉设置</h3>
+
+<p>
+ Android N 在“Welcome”屏幕中加入了“Vision Settings”，用户可以在新设备上设置以下无障碍功能设置：
+
+ <strong>Magnification gesture</strong>、<strong>Font size</strong>、<strong>Display size</strong> 和 <strong>TalkBack</strong>。
+此项变更增强了与不同屏幕设置相关的错误的可见性。
+要评估此功能的影响，您应在启用这些设置的状态下测试应用。
+
+您可以在 <strong>Settings > Accessibility</strong> 中找到这些设置。
+
+</p>
+
+<h2 id="ndk">NDK 应用链接至平台库</h2>
+
+<p>
+ Android N 做了一些命名空间更改，以阻止加载非公开 API。
+ 如果您使用 NDK，则只能使用 Android 平台提供的公开 API。
+在下一个官方发布的 Android 版本上使用非公开 API 会导致应用崩溃。
+
+</p>
+
+<p>
+ 为提醒您使用了非公开 API，在 Android N 设备上运行的应用会在有应用调用非公开 API 时在日志消息输出中生成一个错误。
+
+ 此错误还会作为消息显示在设备屏幕上，以帮助增强您对此情况的认识。
+您应检查应用代码以删除使用非公开平台 API，并使用预览版设备或模拟器全面测试应用。
+
+
+</p>
+
+<p>
+ 如果您的应用依赖平台库，则请参见 NDK 文档，了解使用公开 API 等效项替换普通私有 API 的典型修复。
+
+ 您还可以链接至平台库，而无需实现此应用，如果应用使用的库是平台的一部分（例如 <code>libpng</code>），但不属于 NDK，则更可如此。
+
+此情况下，请确保您的 APK 包含您打算链接到的所有 .so 文件。
+
+</p>
+
+<p class="caution">
+ <strong>注意：</strong>有些第三方库可能会链接至非公开 API。
+如果您的应用使用这些库，那么当您的应用在下一个官方发布的 Android 版本上运行时可能会出现崩溃现象。
+
+</p>
+
+<p>
+ 应用不应依赖或使用不属于 NDK 的原生库，因为这些库可能会发生更改或从一个 Android 版本迁移至另一版本。
+
+例如，从 OpenSSL 切换至 BoringSSL 即属于此类更改。
+ 此外，不同的设备可能提供不同级别的兼容性，因为不属于 NDK 中的平台库没有兼容性要求。
+
+如果您必须在较旧设备上访问非 NDK 库，则请依据 Android API 级别进行加载。
+
+</p>
+
+<p>
+ 为帮助您诊断此类问题，下面列举了一些在您试图使用 Android N 开发应用时可能遇到的 Java 和 NDK 错误：
+
+</p>
+
+<p>Java 错误示例：</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>NDK 错误示例：</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ 以下是遇到这类错误的应用的一些典型修复：
+</p>
+
+<ul>
+ <li>可以使用标准 JNI 函数来替代使用 libandroid_runtime.so 中的 getJavaVM 和 getJNIEnv：
+
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>可以使用公开 {@code alternative __system_property_get} 来替代使用 {@code libcutils.so} 中的 {@code property_get} 符号。如需这样做，请使用 {@code __system_property_get} 及以下 include 函数：
+
+
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>应使用应用本地版本来替代使用 {@code libcrypto.so} 中的 {@code SSL_ctrl} 符号。例如，您应在 {@code .so} 文件中静态链接 {@code libcyrpto.a}，或者在应用中包含您自己的来自 BoringSSL 或 OpenSSL 的动态 {@code libcrypto.so}。
+
+
+
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N 包含一些针对面向 Android for Work 的应用的变更，包括对证书安装、密码重置、二级用户管理、设备标识符访问权限的变更。如果您是要针对 Android for Work 环境开发应用，则应仔细检查这些变更并相应地修改您的应用。
+
+
+
+
+</p>
+
+<ul>
+ <li>您必须先安装授权证书安装程序，然后 DPC 才能对其进行设置。
+对于面向 N SDK 的个人资料和设备所有者应用，您应在设备策略控制器 (DPC) 调用 <code>DevicePolicyManager.setCertInstallerPackage()</code> 之前安装授权证书安装程序。
+
+
+如果尚未安装此安装程序，则系统会引发 <code>IllegalArgumentException</code>。
+
+
+ </li>
+
+ <li>针对设备管理员的重置密码限制现在也适用于个人资料所有者。
+设备管理员无法再使用 {@code DevicePolicyManager.resetPassword()} 来清除或更改已经设置的密码。
+
+设备管理员仍可以设置密码，但只能在设备没有密码、PIN 或图案时这样做。
+
+ </li>
+
+ <li>即使设置了限制，设备所有者和个人资料所有者仍可以管理帐户。而且，即使具有 <code>DISALLOW_MODIFY_ACCOUNTS</code> 用户限制，设备所有者和个人资料所有者仍可调用 Account Management API。
+
+
+ </li>
+
+ <li>设备所有者可以更轻松地管理二级用户。当设备在设备所有者模式下运行时，系统将自动设置 <code>DISALLOW_ADD_USER</code> 限制。
+
+这样可以防止用户创建非托管二级用户。
+此外，<code>CreateUser()</code> 和 <code>createAndInitializeUser()</code> 方法已弃用，取而代之的是 <code>DevicePolicyManager.createAndManageUser()</code> 方法。
+
+
+ </li>
+
+ <li>设备所有者可以访问设备标识符。设备所有者可以使用
+ <code>DevicePolicyManagewr.getWifiMacAddress()</code> 访问设备的 Wi-Fi MAC 地址。
+如果设备上从未启用 Wi-Fi，则此方法将返回一个 {@code null} 值。
+
+ </li>
+
+ <li>工作模式设置控制工作应用访问。当工作模式关闭时，系统启动器通过使工作应用显示为灰色来指示它们不可用。
+启用工作模式会再次恢复正常行为。
+
+</ul>
+
+<p>
+ 如需了解有关 Android N 中针对 Android for Work 所做变更的详细信息，请参阅
+ <a href="{@docRoot}preview/features/afw.html">Android for Work 更新</a>。
+</p>
+
+<h2 id="annotations">注解保留</h2>
+
+<p>
+Android N 在注解可见性被忽略时修复错误。这种问题将启用本不应被允许的运行时访问注解。
+
+这些注解包括：
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}:仅应编译时可见。</li>
+ <li>{@code VISIBILITY_SYSTEM}:运行时应可见，但仅限基本系统。
+</li>
+</ul>
+
+<p>
+如果您的应用依赖这种行为，请在注解中添加一项运行时必须可用的保留政策。
+您可通过使用 {@code @Retention(RetentionPolicy.RUNTIME)} 来如此做。
+</p>
+
+<h2 id="other">其他重要说明</h2>
+
+<ul>
+<li>如果一个应用在 Android N 上运行，但却是针对更低 API 级别开发的，那么在用户更改显示尺寸时，系统将终止此应用进程。
+应用必须能够正常处理此情景。
+否则，当用户从最近使用记录中恢复运行应用时，应用将会出现崩溃现象。
+
+
+<p>
+您应测试应用以确保不会发生此行为。要进行此测试，您可以通过 DDMS 手动终止应用，以造成相同的崩溃现象。
+
+
+
+</p>
+
+<p>
+在密度发生更改时，系统不会自动终止面向 N 及更高版本的应用；不过，这些应用仍可能对配置变更做出不良响应。
+
+</p>
+</li>
+
+<li>
+Android N 上的应用应能够正常处理配置变更，并且在后续启动时不会出现崩溃现象。您可以通过更改字体大小 (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>) 并随后从最近使用记录中恢复运行应用，来验证应用行为。
+
+
+
+</li>
+
+<li>
+由于之前的 Android 版本中的一项错误，系统未能将对主线程上的一个 TCP 套接字的写入操作举报为严格模式违反。
+Android N 修复了此错误。呈现出这种行为的应用引发 {@code android.os.NetworkOnMainThreadException}。一般情况下，我们不建议在主线程上执行网络操作，因为这些操作通常都有可能导致 ANR 和卡顿的高尾延迟。
+
+
+
+</li>
+
+<li>
+{@code Debug.startMethodTracing()} 方法族现在默认在您的共享的存储空间上的软件包特定目录中存储输出，而非 SD 卡顶级。
+
+
+这意味着应用不再需要请求 {@code WRITE_EXTERNAL_STORAGE} 使用这些 API 的权限。
+</li>
+
+<li>
+许多平台 API 现在开始检查在 {@link android.os.Binder} 事务间发送的大负载，系统现在会将 {@code TransactionTooLargeExceptions} 再次作为 {@code RuntimeExceptions} 引发，而不再只是默默记录或抑制它们。
+
+
+一个常见例子是在 {@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()} 上存储过多数据，导致 {@code ActivityThread.StopInfo} 在您的应用面向 Android N 时引发 {@code RuntimeException}。
+
+
+
+
+</li>
+
+<li>
+如果应用向 {@link android.view.View} 发布 {@link java.lang.Runnable} 任务，并且 {@link android.view.View} 未附加到窗口，系统会用 {@link android.view.View} 为 {@link java.lang.Runnable} 任务排队；在 {@link android.view.View} 附加到窗口之前，{@link java.lang.Runnable} 任务不会执行。
+
+
+
+
+
+此行为会修复以下错误：
+<ul>
+ <li>如果一项应用是从并非预期窗口 UI 线程的其他线程发布到 {@link android.view.View}，则{@link java.lang.Runnable} 可能会因此运行错误的线程。
+
+ </li>
+ <li>如果 {@link java.lang.Runnable} 任务是从并非环路线程的其他线程发布，则应用可能会曝光 {@link java.lang.Runnable} 任务。
+</li>
+</ul>
+</li>
+
+<li>
+如果 Android N 上一项有 {@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES} 权限的应用尝试删除一个软件包，但另一项应用已经安装了这个软件包，则系统可能要求用户确认。
+
+
+在这种情况下，应用在调用 {@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()} 时的返回状态应为 {@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}。
+
+
+
+</li>
+
+</ul>
+
diff --git a/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..600e33a
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=示例
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ 以下是 Android N 的代码示例。要在 Android Studio 中下载示例，请选择 <b>File > Import Samples</b> 菜单项。
+
+
+</p>
+
+<p class="note">
+ <strong>注：</strong>这些可下载的项目设计用于与 Gradle 和 Android Studio 结合使用。
+
+</p>
+
+
+<h3 id="mw">多窗口 Playground</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ 此示例演示如何在您的应用中充分利用多窗口用户界面。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+在 GitHub 中获取</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">活动通知</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 这是一个已存在的示例，其显示一个使用 NotificationCompat 发送通知的简单服务。该服务将来自用户的每个未读会话以不同的通知形式发送。
+
+
+</p>
+<p>
+ 此示例已更新，以充分利用 Android N 中提供的新的通知功能。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">在 GitHub 中获取</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">消息传递服务</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ 这是一个已存在的示例，其演示如何使用 NotificationManager 指示应用当前显示的通知数量。
+
+
+</p>
+<p>
+ 此示例已更新，以充分利用 Android N 中提供的新的通知功能。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">在 GitHub 中获取</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">直接启动</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 此示例显示如何在设备加密的存储（启动设备后始终可用）中存储和访问数据。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">在 GitHub 中获取</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">作用域目录访问</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 此示例演示如何从特定目录读取和写入数据，同时需要较少的权限。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">在 GitHub 中获取</a>
+
+</p>
diff --git a/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-testing.jd b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..d1e1187
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=测试指南
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>本文内容</h2>
+ <ol>
+ <li><a href="#runtime-permissions">测试权限</a></li>
+ <li><a href="#doze-standby">测试低电耗模式和应用待机模式</a></li>
+ <li><a href="#ids">自动备份和设备标识符</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ 利用 Android N，您有机会确保应用可使用下一平台版本。
+如 <a href="{@docRoot}preview/api-overview.html">API 概览</a>和<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>中所述，该 Preview 包括大量 API 和可能影响应用的行为变更。
+
+使用 Preview 测试应用时，您应重点关注一些特定的系统变更，确保用户拥有愉悦的体验。
+
+
+</p>
+
+<p>
+ 本指南介绍可使用您的应用测试 Preview 的哪些功能以及如何测试。您应确定优先测试以下特定 Preview 功能，因为它们可能会对应用行为产生较大影响。
+
+
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">权限</a>
+ </li>
+ <li><a href="#doze-standby">低电耗模式和应用待机模式</a>
+ </li>
+ <li><a href="#ids">自动备份和设备标识符</a></li>
+</ul>
+
+<p>
+ 如需了解有关如何使用 Preview 系统映像设置设备或虚拟设备以进行测试的详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html">设置 Android N SDK</a>。
+
+
+</p>
+
+
+<h2 id="runtime-permissions">测试权限</h2>
+
+<p>
+ 新<a href="{@docRoot}preview/features/runtime-permissions.html">权限</a>模型改变了用户向您的应用分配权限的方式。
+您的应用必须在运行时要求用户提供各项权限，而不是在安装过程中要求授予所有权限。
+
+对于用户而言，此行为有助于他们更精细地控制每个应用的 Activity，并更深入地了解应用为何请求提供特定权限的上下文信息。
+用户可以随时向应用授予某项权限或撤销其某项权限。
+预览版的这种功能最有可能会对应用行为产生影响，而且可能会阻止某些应用功能运行或只能在降级状态中运行。
+
+
+</p>
+
+<p class="caution">
+ 这一变更会影响在新平台上运行的所有应用，即便这些应用并非面向新平台版本开发亦是如此。
+该平台为旧版应用提供有限的兼容性行为，但您现在应当开始计划将应用迁移到新权限模型，以便在官方平台启动时发布更新的应用版本。
+
+
+</p>
+
+
+<h3 id="permission-test-tips">测试提示</h3>
+
+<p>
+ 使用以下测试提示有助于您计划并通过新权限行为执行应用测试。
+
+</p>
+
+<ul>
+ <li>识别应用的当前权限和相关的代码路径</li>
+ <li>跨受权限保护的服务和数据测试用户流程</li>
+ <li>使用授予/撤销权限的各种组合进行测试</li>
+ <li>使用 {@code adb} 工具从命令行管理权限：
+ <ul>
+ <li>按组列出权限和状态：
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>使用以下语法授予或撤销一项或多项权限：<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>针对使用权限的服务对应用进行分析</li>
+</ul>
+
+<h3 id="permission-test-strategy">测试策略</h3>
+
+<p>
+ 权限更改会影响应用的结构和设计，以及您为用户提供的用户体验和流程。
+您应评估应用的当前权限使用情况并开始计划要提供的新流程。
+平台的正式版本提供兼容性行为，但您应计划更新应用，而不是依赖于这些行为。
+
+
+</p>
+
+<p>
+ 确定应用实际需要和使用的权限，然后找出各种使用受权限保护的服务的代码路径。
+您可通过结合使用新平台测试和代码分析完成此操作。
+在测试中，您应通过将应用的 {@code targetSdkVersion} 更改为预览版，重点关注选择运行时权限。
+如需了解详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html#">设置 Android N SDK</a>。
+
+
+</p>
+
+<p>
+ 使用已撤销和已添加权限的各种组合进行测试，突出显示依赖于权限的用户流程。
+如果依赖关系不明显或不符合逻辑，则您应考虑重构或划分该流程，以消除依赖关系或阐明需要权限的原因。
+
+
+</p>
+
+<p>
+ 如需了解有关运行时权限行为、测试和最佳做法的详细信息，请参阅<a href="{@docRoot}preview/features/runtime-permissions.html">权限</a>开发者预览版页面。
+
+
+</p>
+
+
+<h2 id="doze-standby">测试低电耗模式和应用待机模式</h2>
+
+<p>
+ 当设备处于空闲状态或应用未聚焦时，低电耗模式和应用待机模式的节能功能将限制应用可执行的后台处理工作量。
+系统可对应用实施的限制包括：限制或禁止访问网络、暂停后台任务、暂停通知、忽略唤醒请求和闹铃。
+
+要确保应用在完成这些节能优化后正常运行，您应通过模拟这些低功耗状态对应用进行测试。
+
+
+</p>
+
+<h4 id="doze">在低电耗模式下测试您的应用</h4>
+
+<p>要在低电耗模式下测试您的应用，请执行以下操作：</p>
+
+<ol>
+<li>使用 Android N 系统映像配置硬件设备或虚拟设备</li>
+<li>将设备连接到开发计算机并安装应用</li>
+<li>运行应用并使其保持活动状态</li>
+<li>通过运行以下命令，模拟进入低电耗模式的设备：
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>观察重新激活设备时的应用行为。确保应用在设备退出低电耗模式时正常恢复
+</li>
+</ol>
+
+
+<h4 id="standby">在应用待机模式下测试您的应用</h4>
+
+<p>要在应用待机模式下测试您的应用，请执行以下操作：</p>
+
+<ol>
+ <li>使用 Android N 系统映像配置硬件设备或虚拟设备</li>
+ <li>将设备连接到开发计算机并安装应用</li>
+ <li>运行应用并使其保持活动状态</li>
+ <li>通过运行以下命令，模拟进入待机模式的应用：
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>使用以下命令模拟如何唤醒应用：
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>观察唤醒后的应用行为。确保应用从待机模式中正常恢复。
+特别地，您应检查应用的通知和后台作业是否按预期继续运行
+</li>
+</ol>
+
+<h2 id="ids">自动备份应用和设备特定的标识符</h2>
+
+<p>如果应用坚持在内部存储中使用任何设备特定的标识符，如 Google 云消息传递注册 ID，请确保遵循最佳做法将存储位置从自动备份中排除，如<a href="{@docRoot}preview/backup/index.html">自动备份应用</a>中所述。
+
+
+
+ </p>
diff --git a/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..8810d39
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1039 @@
+page.title=Android N for Developers
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>重要的开发者功能</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">多窗口支持</a></li>
+ <li><a href="#notification_enhancements">通知</a></li>
+ <li><a href="#jit_aot">JIT/AOT 编译</a></li>
+ <li><a href="#quick_path_to_app_install">快速的应用安装路径</a></li>
+ <li><a href="#doze_on_the_go">随时随地低电耗模式</a></li>
+ <li><a href="#background_optimizations">后台优化</a></li>
+ <li><a href="#data_saver">Data Saver</a></li>
+ <li><a href="#vulkan">Vulkan API</a></li>
+ <li><a href="#tile_api">Quick Settings Tile API</a></li>
+ <li><a href="#number-blocking">号码屏蔽</a></li>
+ <li><a href="#call_screening">来电过滤</a></li>
+ <li><a href="#multi-locale_languages">区域设置和语言</a></li>
+ <li><a href="#emoji">新增的表情符号</a></li>
+ <li><a href="#icu4">Android 中的 ICU4J API</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Android TV 录制</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">无障碍功能</a></li>
+ <li><a href="#direct_boot">直接启动</a></li>
+ <li><a href="#key_attestation">密钥认证</a></li>
+ <li><a href="#network_security_config">网络安全性配置</a></li>
+ <li><a href="#default_trusted_ca">默认受信任的 CA</a></li>
+ <li><a href="#apk_signature_v2">APK Signature Scheme v2</a></li>
+ <li><a href="#scoped_directory_access">作用域目录访问</a></li>
+ <li><a href="#keyboard_shortcuts_helper">键盘快捷键辅助工具</a></li>
+ <li><a href="#sustained_performance_api">持续性能 API</a></li>
+ <li><a href="#vr">VR 支持</a></li>
+ <li><a href="#print_svc">打印服务增强</a></li>
+ <li><a href="#virtual_files">虚拟文件</a></li>
+ <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N 仍处于活动的开发状态，但现在您可以将其作为 N Developer Preview 的一部分进行试用。
+以下部分重点介绍面向开发者的一些新功能。
+ </p>
+
+<p>
+ 请务必查阅<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>以了解平台变更可能影响您的应用的领域，看看开发者指南，了解有关关键功能的更多信息，并下载 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>以获取新 API 的详细信息。
+
+
+
+</p>
+
+<h2 id="multi-window_support">多窗口支持</h2>
+
+
+<p>在 Android N 中，我们为该平台引入了一个新的而且非常需要的多任务处理功能 — 多窗口支持。
+ </p>
+
+ <p>现在，用户可以一次在屏幕上打开两个应用。 </p>
+ <ul>
+ <li>在运行 Android N 的手机和平板电脑上，用户可以并排运行两个应用，或者处于分屏模式时一个应用位于另一个应用之上。
+
+用户可以通过拖动两个应用之间的分隔线来调整应用。
+ </li>
+
+<li>在 Android TV 设备上，应用可以将自身置于<a href="{@docRoot}preview/features/picture-in-picture.html">画中画模式</a>，从而让它们可以在用户浏览或与其他应用交互时继续显示内容。
+
+</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>图 1. </strong>在分屏模式下运行的应用。
+</p>
+
+ </div>
+
+<p>多窗口支持为您提供新的吸引用户方式，特别是在平板电脑和其他更大屏幕的设备上。
+您甚至可以在您的应用中启用拖放，从而使用户可以方便地将内容拖放到您的应用或从其中拖出内容—这是一个非常好的增强用户体验的方式。
+
+ </p>
+
+<p>向您的应用添加多窗口支持并配置多窗口显示的处理方式非常简单。
+例如，您可以指定您的 Activity 允许的最小尺寸，从而防止用户将 Activity 调整到该尺寸以下。
+
+您还可以为应用禁用多窗口显示，这可确保系统将仅以全屏模式显示应用。
+</p>
+
+<p>
+ 如需了解详细信息，请参阅<a href="{@docRoot}preview/features/multi-window.html">多窗口支持</a>开发者文档。
+
+</p>
+
+<h2 id="notification_enhancements">通知增强功能</h2>
+
+<p>在 Android N 中，我们重新设计了通知，使其更易于使用并且速度更快。
+部分变更包括：</p>
+
+<ul>
+ <li>
+ <strong>模板更新</strong>：我们正在更新通知模板，新强调了英雄形象和化身。
+开发者将能够充分利用新模板，只需进行少量的代码调整。
+
+ </li>
+
+ <li>
+ <strong>消息样式自定义</strong>：您可以自定义更多与您的使用 <code>MessageStyle</code> 类的通知相关的用户界面标签。
+
+您可以配置消息、会话标题和内容视图。
+
+ </li>
+
+ <li>
+ <strong>捆绑通知</strong>：系统可以将消息组合在一起（例如，按消息主题）并显示组。
+用户可以适当地进行 Dismiss 或 Archive 等操作。
+如果您已实现 Android Wear 的通知，那么您已经很熟悉此模型。
+
+
+ </li>
+
+ <li>
+ <strong>直接回复</strong>：对于实时通信应用，Android 系统支持内联回复，以便用户可以直接在通知界面中快速回复短信。
+
+
+ </li>
+
+ <li>
+ <strong>自定义视图</strong>：两个新的 API 让您在通知中使用自定义视图时可以充分利用系统装饰元素，如通知标题和操作。
+
+
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>图 2. </strong>绑定的通知和直接回复。
+</p>
+
+<p>如需了解如何实现新功能的信息，请参阅<a href="{@docRoot}preview/features/notification-updates.html">通知</a>指南。
+
+</p>
+
+
+
+<h2 id="jit_aot">个人资料指导的 JIT/AOT 编译</h2>
+
+<p>在 Android N 中，我们添加了 Just in Time (JIT) 编译器，对 ART 进行代码分析，让它可以在应用运行时持续提升 Android 应用的性能。
+
+JIT 编译器对 Android 运行组件当前的 Ahead of Time (AOT) 编译器进行了补充，有助于提升运行时性能，节省存储空间，加快应用更新和系统更新速度。
+
+</p>
+
+<p>个人资料指导的编译让 Android 运行组件能够根据应用的实际使用以及设备上的情况管理每个应用的 AOT/JIT 编译。
+例如，Android 运行组件维护每个应用的热方法的个人资料，并且可以预编译和缓存这些方法以实现最佳性能。
+
+对于应用的其他部分，在实际使用之前不会进行编译。
+</p>
+
+<p>除提升应用的关键部分的性能外，个人资料指导的编译还有助于减少整个 RAM 占用，包括关联的二进制文件。
+
+此功能对于低内存设备非常尤其重要。</p>
+
+<p>Android 运行组件在管理个人资料指导的编译时，可最大程度降低对设备电池的影响。
+仅当设备处于空闲状态和充电时才进行编译，从而可以通过提前执行该工作节约时间和省电。
+</p>
+
+<h2 id="quick_path_to_app_install">快速的应用安装路径</h2>
+
+<p>Android 运行组件的 JIT 编译器最实际的好处之一是应用安装和系统更新的速度。
+即使在 Android 6.0 中需要几分钟进行优化和安装的大型应用，现在只需几秒钟就可以完成安装。
+
+系统更新也变得更快，因为省去了优化步骤。 </p>
+
+<h2 id="doze_on_the_go">随时随地低电耗模式...</h2>
+
+<p>Android 6.0 推出了低电耗模式，即设备处于空闲状态时，通过推迟应用的 CPU 和网络活动以实现省电目的的系统模式，例如，设备放在桌上或抽屉里时。
+
+ </p>
+
+<p>现在，在 Android N 中，低电耗模式又前进了一步，随时随地可以省电。只要屏幕关闭了一段时间，且设备未插入电源，低电耗模式就会对应用使用熟悉的 CPU 和网络限制。这意味着用户即使将设备放入口袋里也可以省电。
+
+
+
+</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>图 3. </strong>低电耗模式现在应用限制以延长电池寿命，即使设备未处于静止状态。
+
+</p>
+
+
+<p>屏幕关闭片刻后，设备在使用电池时，低电耗模式将限制网络访问，同时延迟作业和同步。
+在短暂的维护时间范围后，其允许应用访问网络，并执行延迟的作业/同步。
+
+打开屏幕或将设备插入电源会使设备退出低电耗模式。
+</p>
+
+<p>当设备再次处于静止状态时，屏幕关闭且使用电池一段时间，低电耗模式针对 {@link
+android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} 警报和 GPS/Wi-Fi 扫描应用完整 CPU 和网络限制。
+
+</p>
+
+<p>无论设备是否处于运动状态，将应用调整到低电耗模式的最佳做法均相同，因此，如果您已更新应用以妥善处理低电耗模式，则一切就绪。
+
+如果不是，请立即开始<a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">将应用调整到低电耗模式</a>。
+</p>
+
+<h2 id="background_optimizations">Project Svelte：后台优化</h2>
+
+<p>Project Svelte 在持续改善，以最大程度减少生态系统中一系列 Android 设备中系统和应用使用的 RAM。
+在 Android N 中，Project Svelte 注重优化在后台中运行应用的方式。
+ </p>
+
+<p>后台处理是大多数应用的一个重要部分。处理得当，可让您实现非常棒的用户体验 — 即时、快速和情境感知。如果处理不得当，后台处理会毫无必要地消耗 RAM（和电池），同时影响其他应用的系统性能。
+
+
+ </p>
+
+<p>自 Android 5.0 发布以来，{@link android.app.job.JobScheduler} 已成为执行后台工作的首选方式，其工作方式有利于用户。
+
+应用可以在安排作业的同时允许系统基于内存、电源和连接情况进行优化。
+JobScheduler 可实现控制和简洁性，我们想要所有应用都使用它。
+ </p>
+
+<p>
+ 另一个非常好的选择是 <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+ <code>GCMNetworkManager</code></a>（Google Play 服务的一部分），其在旧版 Android 中提供类似的作业安排和兼容性。
+
+
+</p>
+
+<p>我们在继续扩展 <code>JobScheduler</code> 和
+<code>GCMNetworkManager</code>，以符合多个用例 — 例如，在 Android N 中，现在，您可以基于内容提供程序中的更改安排后台工作。
+
+同时，我们开始弃用一些较旧的模式，这些模式会降低系统性能，特别是低内存设备的系统性能。
+
+</p>
+
+<p>在 Android N 中，我们删除了三个常用隐式广播 —
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}、{@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 和 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} — 因为这些广播可能会一次唤醒多个应用的后台进程，同时会耗尽内存和电池。
+如果您的应用收到这些广播，请充分利用 N Developer Preview 以迁移到 <code>JobScheduler</code> 和相关的 API。
+
+ </p>
+
+<p>
+ 如需了解详情，请查看<a href="{@docRoot}preview/features/background-optimization.html">后台优化</a>文档。
+
+</p>
+
+
+<h2 id="data_saver">Data Saver</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>图 4. </strong> 设置中的 Data Saver
+</p>
+ </div>
+
+<p>在移动设备的整个生命周期，蜂窝数据计划的成本通常会超出设备本身的成本。
+对于许多用户而言，蜂窝数据是他们想要节省的昂贵资源。
+ </p>
+
+<p>Android N 推出了 Data Saver 模式，这是一项新的系统服务，有助于减少应用使用的蜂窝数据，无论是在漫游，账单周期即将结束，还是使用少量的预付费数据包。
+
+Data Saver 让用户可以控制应用使用蜂窝数据的方式，同时让开发者打开 Data Saver 时可以提供更多有效的服务。
+
+ </p>
+
+<p>用户在 <strong>Settings</strong> 中启用 Data Saver 且设备位于按流量计费的网络上时，系统屏蔽后台流量消耗，同时指示应用在前台尽可能使用较少的流量 — 例如，通过限制用于流媒体服务的比特率、降低图片质量、延迟最佳的预缓冲等方法来实现。
+
+
+
+用户可以将特定应用加入白名单以允许后台按流量的流量消耗，即使在打开 Data Saver 时也是如此。
+</p>
+
+<p>Android N 扩展了 {@link android.net.ConnectivityManager}，以便为应用<a href="{@docRoot}preview/features/data-saver.html#status">检索用户的 Data Saver 首选项</a>并<a href="{@docRoot}preview/features/data-saver.html#monitor-changes">监控首选项变更</a>提供一种方式。
+
+
+所有应用均应检查用户是否已启用 Data Saver 并努力限制前台和后台流量消耗。
+</p>
+
+
+<h2 id="vulkan">Vulkan API</h2>
+
+<p>
+ Android N 将一项新的 3D 渲染 API <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a> 集成到平台中。就像 <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™ ES</a> 一样，Vulkan 是 3D 图形和渲染的一项开放标准，由 Khronos Group 维护。
+
+
+
+</p>
+
+<p>
+ Vulkan 是完全从零开始设计，以最小化驱动器中的 CPU 开销，并能让您的应用更直接地控制 GPU 操作。
+Vulkan 还允许多个线程同时执行工作，如命令缓冲区构建，以获得更好的并行化。
+
+
+</p>
+
+<p>
+ Vulkan 开发工具和库都已卷入 Android NDK。它们包括：
+
+</p>
+
+<ul>
+ <li>头
+ </li>
+
+ <li>验证层（调试库）
+ </li>
+
+ <li>SPIR-V 着色程序编译器
+ </li>
+
+ <li>SPIR-V 运行时着色器编译库
+ </li>
+</ul>
+
+<p>
+ Vulkan 仅适用于已启用 Vulkan 硬件的设备上的应用，如 Nexus 5X、Nexus 6P 和 Nexus Player。
+我们正在与合作伙伴密切合作，以尽快使 Vulkan 能面向更多的设备。
+
+</p>
+
+<p>
+ 如需要了解更多信息，请参阅 <a href="{@docRoot}ndk/guides/graphics/index.html">API 文档</a>。
+</p>
+
+<h2 id="tile_api">Quick Settings Tile API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>图 5.</strong> 通知栏中的快速设置图块。
+</p>
+
+
+ </div><p>“快速设置”通常用于直接从通知栏显示关键设置和操作，非常简单。
+在 Android N 中，我们已扩展“快速设置”的范围，使其更加有用更方便。
+ </p>
+
+<p>我们为额外的“快速设置”图块添加了更多空间，用户可以通过向左或向右滑动跨分页的显示区域访问它们。
+我们还让用户可以控制显示哪些“快速设置”图块以及显示的位置 — 用户可以通过拖放图块来添加或移动图块。
+
+ </p>
+
+<p>对于开发者，Android N 还添加了一个新的 API，从而让您可以定义自己的“快速设置”图块，使用户可以轻松访问您应用中的关键控件和操作。
+</p>
+
+<p>
+ 对于急需或频繁使用的控件和操作，保留“快速设置”图块，且不应将其用作启动应用的快捷方式。
+
+
+</p>
+
+<p>
+ 定义图块后，您可以将它们显示给用户，用户可通过拖放将图块添加到“快速设置”。
+
+</p>
+
+<p>
+ 如需创建应用图块的更多信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>中的文件 <code>android.service.quicksettings.Tile</code>。
+
+</p>
+
+
+
+<h2 id="number-blocking">号码屏蔽</h2>
+
+<p>Android N 现在支持在平台中进行号码屏蔽，提供框架 API，让服务提供商可以维护屏蔽的号码列表。
+默认短信应用、默认手机应用和提供商应用可以对屏蔽的号码列表进行读取和写入操作。
+
+其他应用则无法访问此列表。</p>
+
+<p>通过使号码屏蔽成为平台的标准功能，Android 为应用提供一致的方式来支持广泛的设备上的号码屏蔽。
+
+应用可以利用的其他优势包括：</p>
+
+<ul>
+ <li> 还会屏蔽已屏蔽的来电号码发出的短信
+ <li> 通过 Backup & Restore（备份和还原）功能可以跨重置和设备保留屏蔽的号码
+
+ <li> 多个应用可以使用相同的屏蔽号码列表
+</ul>
+
+<p>此外，通过 Android 的运营商应用集成表示运营商可以读取设备上屏蔽的号码列表，并为用户执行服务端屏蔽，以阻止不需要的来电和短信通过任何介质（如 VOIP 端点或转接电话）到达用户。
+
+
+</p>
+
+<p>
+ 如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>中的 <code>android.provider.BlockedNumberContract</code>。
+
+
+</p>
+
+<h2 id="call_screening">来电过滤</h2>
+
+<p>
+ Android N 允许默认的手机应用过滤来电。手机应用执行此操作的方式是实现新的 <code>CallScreeningService</code>，该方法允许手机应用基于来电的 {@link android.telecom.Call.Details Call.Details} 执行大量操作，例如：
+
+
+
+</p>
+
+<ul>
+ <li> 拒绝来电
+ <li> 不允许来电到达通话记录
+ <li> 不向用户显示来电通知
+</ul>
+
+<p>
+ 如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>中的 <code>android.telecom.CallScreeningService</code>。
+
+
+</p>
+
+
+<h2 id="multi-locale_languages">多区域设置支持、多语言</h2>
+
+
+<p>Android N 现在允许用户在设置中选择<strong>多个区域设置</strong>，以更好地支持双语用例。
+应用可以使用新的 API 获取用户选择的区域设置，然后为多区域设置用户提供更成熟的用户体验 — 如以多个语言显示搜索结果，并且不会以用户了解的语言翻译网页。
+
+
+
+</p>
+
+<p>除多区域设置支持外，Android N 还扩展了用户可用的语言范围。
+它针对常用语言提供超过 25 种的变体，如英语、西班牙语、法语和阿拉伯语。
+它还针对 100 多种新语言添加了部分支持。
+</p>
+
+<p>应用可以通过调用 <code>LocaleList.GetDefault()</code> 获取用户设置的区域设置列表。
+为支持扩展的区域设置数量，Android N 正在改变其解析资源的方式。
+请务必使用新的资源解析逻辑测试和验证您的应用是否能如期运行。
+</p>
+
+<p>如需有关新资源解析行为和应遵循的最佳做法的更多信息，请参阅<a href="{@docRoot}preview/features/multilingual-support.html">多语言支持</a>。
+</p>
+
+
+<h2 id="emoji">新增的表情符号</h2>
+
+<p>
+ Android N 引入更多表情符号和表情符号相关功能，包括肤色表情符号和支持变量选择符。
+
+如果您的应用支持表情符号，请遵循以下准则，以便能充分利用这些表情符号相关功能优势。
+
+</p>
+
+<ul>
+ <li>
+ <strong>在插入之前，检查设备是否包含表情符号。</strong>
+ 若要检查系统字体中有哪些表情符号，使用 {@link android.graphics.Paint#hasGlyph(String)} 方法。
+
+ </li>
+ <li>
+ <strong>检查表情符号是否支持变量选择符。</strong>
+ 变量选择符使您能够呈现一些彩色或黑白的表情符号。
+
+ 在移动设备上，应用应呈现彩色的表情符号，而不是黑白的。但是，如果您的应用显示嵌入在文本中的表情符号，那应使用黑白变量。
+
+ 若要确定表情符号是否有变量，使用变量选择符。
+ 如需有关支持变量的字符的完整清单，请参阅<a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">变量的 Unicode 文档</a>中的 <em>表情符号变量序列</em>部分。
+
+
+
+ </li>
+ <li>
+ <strong>检查表情符号是否支持肤色。</strong>Android N 允许用户按照他们的喜好修改表情符号呈现的肤色。
+键盘应用应为有多个肤色的表情符号提供可视化的指示，并应允许用户选择他们喜欢的肤色。
+
+若要确定哪些系统表情符号有肤色修改器，使用 {@link android.graphics.Paint#hasGlyph(String)} 方法。
+
+您可以通过读取 <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">Unicode 文档</a>来确定哪些表情符号使用肤色。
+
+
+ </li>
+</ul>
+
+
+<h2 id="icu4">Android 中的 ICU4J API</h2>
+
+<p>
+ Android N 目前在 Android 框架（位于 <code>android.icu</code> 软件包下）中提供 <a href="http://site.icu-project.org/">ICU4J</a> API 的子集。
+迁移很简单，主要是需要从 <code>com.java.icu</code> 命名空间更改为 <code>android.icu</code>。
+
+如果您已在您的应用中使用 ICU4J 捆绑包，切换到 Android 框架中提供的 <code>android.icu</code> API 可以大量节省 APK 大小。
+
+
+</p>
+
+<p>
+ 如果要了解有关 Android ICU4J API 的更多信息，请参阅 <a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J 支持</a>。
+</p>
+
+
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>Android N 添加了框架接口和对 OpenGL ES 3.2 的平台支持，包括：</p>
+
+<ul>
+ <li> 来自 <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
+Android 扩展包</a></a> (AEP) 的所有扩展（<code>EXT_texture_sRGB_decode</code> 除外）。
+ <li> 针对 HDR 的浮点帧缓冲和延迟着色。
+ <li> BaseVertex 绘图调用可实现更好的批处理和流媒体服务。
+ <li> 强大的缓冲区访问控制可减少 WebGL 开销。
+</ul>
+
+<p>Android N 上适用于 OpenGL ES 3.2 的框架 API 与 <code>GLES32</code> 类一起提供。
+使用 OpenGL ES 3.2 时，请务必通过 <code><uses-feature></code> 标记和 <code>android:glEsVersion</code> 属性在您的清单中声明要求。
+
+ </p>
+
+<p>如需了解有关使用 OpenGL ES 的信息，包括如何在运行时检查设备支持的 OpenGL ES 版本，请参阅 <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API 指南</a>。
+</p>
+
+
+<h2 id="android_tv_recording">Android TV 录制</h2>
+
+<p>Android N 通过新的录制 API 添加了从 Android TV 输入服务录制和播放内容的功能。
+构建在现有时移 API 之上，TV 输入服务可以控制能够录制的渠道数据、保存录制的会话的方式，同时可通过录制的内容管理用户交互。
+
+ </p>
+
+<p>如需了解详细信息，请参阅 <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV 录制 API</a>。</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work 针对运行 Android N 的设备添加了许多新功能和 API。部分重要内容如下— 有关变更的完整列表，请参阅 <a href="{@docRoot}preview/features/afw.html">Android for Work 更新</a>。
+
+</p>
+
+<h3 id="work_profile_security_challenge">工作资料安全性挑战 </h3>
+
+<p>
+ 面向 N SDK 的个人资料所有者可以为在工作资料中运行的应用指定单独的安全性挑战。
+
+当用户尝试打开任何工作应用时将显示工作挑战。
+成功完成安全性挑战可解锁工作资料并将其解密（如果需要）。
+对于个人资料所有者，<code>ACTION_SET_NEW_PASSWORD</code> 提示用户设置工作挑战，<code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> 提示用户设置设备锁。
+
+
+
+</p>
+
+<p>
+ 个人资料所有者可以使用 <code>setPasswordQuality()</code>、<code>setPasswordMinimumLength()</code> 和相关方法针对工作挑战设置不同的密码策略（例如，PIN 必须多长，或是否可以使用指纹解锁个人资料）。
+
+
+个人资料所有者还可以使用新的 <code>getParentProfileInstance()</code> 方法返回的 <code>DevicePolicyManager</code> 实例设置设备锁定。
+
+
+ 此外，个人资料所有者可以使用新的 <code>setOrganizationColor()</code> 和 <code>setOrganizationName()</code> 方法针对工作挑战自定义凭据屏幕。
+
+
+</p>
+<h3 id="turn_off_work">关闭工作 </h3>
+
+<p>在有工作资料的设备上，用户可以切换工作模式。工作模式关闭时，管理的用户临时关闭，其禁用托管工作资料应用、后台同步和通知。
+
+这包括个人资料所有者应用。
+关闭工作模式时，系统显示永久状态图标，以提醒用户他们无法启动工作应用。
+启动器指示该工作应用和小组件无法访问。
+ </p>
+
+<h3 id="always_on_vpn">Always on VPN </h3>
+
+<p>设备所有者和个人资料所有者可以确保工作应用始终通过指定的 VPN 连接。
+系统在设备启动后自动启动该 VPN。
+</p>
+
+<p>
+ 新的 <code>DevicePolicyManager</code> 方法为 <code>setAlwaysOnVpnPackage()</code> 和 <code>getAlwaysOnVpnPackage()</code>。
+
+
+</p>
+
+<p>由于 VPN 服务无需应用交互即可由系统直接绑定，因此，VPN 客户端必须针对 Always on VPN 处理新的入口点。
+和以前一样，由与操作匹配的 Intent 过滤器将服务指示给系统。<code>android.net.VpnService</code>。
+
+ </p>
+
+<p>
+ 用户还可以使用 <strong>Settings>More>Vpn</strong> 在主要用户中手动设置实现 <code>VPNService</code> 方法的 Always on VPN 客户端。
+
+
+</p>
+
+<h3 id="custom_provisioning">自定义配置</h3>
+
+<p>
+ 应用可以用企业颜色和徽标来自定义个人资料所有者和设备所有者配置流程。<code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> 自定义流程颜色。<code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code> 用企业徽标自定义流程。
+
+
+
+
+</p>
+
+<h2 id="accessibility_enhancements">无障碍增强功能</h2>
+
+<p>Android N 现在针对新的设备设置直接在欢迎屏幕上提供“Vision Settings”。
+这使用户可以更容易发现和配置他们设备上的无障碍功能，包括放大手势、字体大小、显示屏尺寸和 TalkBack。
+
+ </p>
+
+<p>随着这些无障碍功能更为突出，在启用这些功能后，您的用户更可能试用您的应用。
+请务必提前启用这些设置测试您的应用。
+您可以通过 Settings > Accessibility 启用它们。
+</p>
+
+<p>还是在 Android N 中，无障碍服务现在可以帮助具有动作障碍的用户触摸屏幕。
+全新的 API 允许使用人脸追踪、眼球追踪、点扫描等功能构建服务，以满足这些用户的需求。
+
+</p>
+
+<p>如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中的 <code>android.accessibilityservice.GestureDescription
+</code>。</p>
+
+
+<h2 id="direct_boot">直接启动</h2>
+
+<p>直接启动可以缩短设备启动时间，让注册的应用具有有限的功能，即使在意外重启后。例如，如果当用户睡觉时加密的设备重启，那么注册的警报、消息和来电现在可以和往常一样继续通知用户。
+
+
+
+这也意味着重启后无障碍服务会立即可用。
+</p>
+
+<p>在 Android N 中，直接启动充分利用基于文件的加密，以针对系统和应用数据启用细化的加密策略。为系统和应用数据。系统针对选定的系统数据和显式注册的应用数据使用设备加密的存储。
+
+
+默认情况下，凭据加密的存储可用于所有其他系统数据、用户数据、应用及应用数据。
+ </p>
+
+<p>启动时，系统在受限的模式中启动，仅访问设备加密的数据，不会对应用或数据进行常规访问。如果您有想要在此模式下运行的组件，您可以通过在清单文件中设置标记注册它们。
+
+
+重启后，系统通过广播 <code>LOCKED_BOOT_COMPLETED</code> Intent 激活注册的组件。
+
+系统确保注册的设备加密的应用数据在解锁前可用。
+所有其他数据在用户确认锁定屏幕凭据进行解密前均不可用。
+ </p>
+
+如需了解详细信息，请参阅<a href="{@docRoot}preview/features/direct-boot.html">直接启动</a>。</p>
+</p>
+
+
+<h2 id="key_attestation">密钥认证</h2>
+
+<p>使用硬件支持的密钥库，可更安全地在 Android 设备上创建、存储和使用加密密钥。
+它们可保护密钥免受 Linux 内核、潜在的 Android 漏洞的攻击，也可防止从已取得根权限的设备提取密钥。
+
+</p>
+
+<p>为了让硬件支持的密钥库使用起来更简单和更安全，Android N 引入了密钥认证。
+应用和关闭的设备可使用密钥认证以坚决地确定 RSA 或 EC 密钥对是否受硬件支持、密钥对的属性如何，以及其使用和有效性有何限制。
+
+
+ </p>
+
+<p>应用和关闭的设备服务可以通过 X.509 认证证书（必须由有效的认证密钥签署）请求有关密钥对的信息。
+
+认证密钥是一个 ECDSA 签署密钥，其在出厂时被注入设备的硬件支持的密钥库。因此，有效的认证密钥签署的认证证书可确认硬件支持的密钥库是否存在，以及该密钥库中密钥对的详细信息。
+
+
+
+</p>
+
+<p>为确保设备使用安全的官方 Android 出厂映像，密钥认证要求设备 <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a> 向<a class="external-link" href="https://source.android.com/security/trusty/index.html">可信执行环境 (TEE)</a> 提供以下信息：
+
+
+</p>
+
+<ul>
+<li>设备上安装的操作系统版本和补丁级别</li>
+<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">验证的启动</a>公钥和锁定状态。</li>
+ </ul>
+
+<p>如需了解有关硬件支持的密钥库功能的详细信息，请参阅<a href="https://source.android.com/security/keystore/" class="external-link">硬件支持的密钥库</a>指南。
+</p>
+
+<p>除密钥认证外，Android N 还推出了指纹绑定密钥，在指纹注册时不会撤销。
+</p>
+
+<h2 id="network_security_config">网络安全性配置</h2>
+
+<p>在 Android N 中，通过使用说明性“网络安全性配置”（而不是使用传统的易出错的编程 API（例如，X509TrustManager）），应用可以安全地自定义其安全（HTTPS、TLS）连接的行为，无需任何代码修改。
+
+
+<em></em></p>
+
+ <p>支持的功能：</p>
+<ul>
+<li><b>自定义信任锚。</b>让应用可以针对安全连接自定义哪些证书颁发机构 (CA) 值得信赖。
+例如，信任特定的自签署证书或限制应用信任的公共 CA 集。
+
+</li>
+<li><b>仅调试重写。</b>让应用开发者可以安全调试其应用的安全连接，而不会增加安装基础的风险。
+
+
+</li>
+<li><b>明文流量选择退出。</b>让应用可以防止自身意外使用明文流量。
+</li>
+<li><b>证书固定。</b>这是一项高级功能，让应用可以针对安全连接限制哪些服务器密钥受信任。
+</li>
+</ul>
+
+<p>如需了解详细信息，请参阅<a href="{@docRoot}preview/features/security-config.html">网络安全性配置</a>。
+</p>
+
+<h2 id="default_trusted_ca">默认受信任的证书颁发机构</h2>
+
+<p>默认情况下，面向 Android N 的应用仅信任系统提供的证书，且不再信任用户添加的证书颁发机构 (CA)。
+如果面向 Android N 的应用希望信任用户添加的 CA，则应使用<a href="{@docRoot}preview/features/security-config.html">网络安全性配置</a>以指定信任用户 CA 的方式。
+
+
+</p>
+
+<h2 id="apk_signature_v2">APK signature scheme v2</h2>
+
+<p>
+ Android N 引入一项新的应用签名方案 APK Signature Scheme v2，它能提供更快的应用安装时间和更多针对未授权 APK 文件更改的保护。
+
+在默认情况下，Android Studio 2.2 和 Android Gradle 2.2 插件会使用 APK Signature Scheme v2 和传统签名方案来签署您的应用。
+
+
+</p>
+
+<p>
+ 虽然我们建议您对您的应用采用 APK Signature Scheme v2，但这项新方案并非强制性的。
+如果您的应用在使用 APK Signature Scheme v2 时不能正确构建，您可以停用这项新方案。
+禁用过程会导致 Android Studio 2.2 和 Android Gradle 2.2 插件仅使用传统签名方案来签署您的应用。
+
+若要仅用传统方案签署，打开多层 <code>build.gradle</code> 文件，然后将行 <code>v2SigningEnabled false</code> 添加到您的版本签名配置中：
+
+
+
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>注意：</strong>如果您使用 APK Signature Scheme v2 签署您的应用，并对应用进行了进一步更改，则应用的签名将无效。
+
+出于这个原因，请在使用 APK Signature Scheme v2 之前、而非之后使用 <code>zipalign</code> 等工具。
+
+</p>
+
+<p>
+ 如需更多信息，请阅读介绍如何在 Android Studio 中<a href="{@docRoot}studio/publish/app-signing.html#release-mode">签署一项应用</a>以及如何使用 Android Gradle 插件来为签署应用<a href="{@docRoot}studio/build/build-variants.html#signing">配置构建文件</a>。
+
+
+
+</p>
+
+<h2 id="scoped_directory_access">作用域目录访问</h2>
+
+<p>在 Android N 中，应用可以使用新的 API 请求访问特定的<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">外部存储</a>目录，包括可移动媒体上的目录，如 SD 卡。
+
+新 API 大大简化了应用访问标准外部存储目录的方式，如 <code>Pictures</code> 目录。
+应用（如照片应用）可以使用这些 API（而不是使用 <code>READ_EXTERNAL_STORAGE</code>），其授予所有存储目录的访问权限或存储访问框架，从而让用户可以导航到目录。
+
+
+
+</p>
+
+<p>此外，新的 API 简化了用户向应用授予外部存储访问权限的步骤。
+当您使用新的 API 时，系统使用一个简单的权限 UI，其清楚地详细介绍应用正在请求访问的目录。
+
+</p>
+
+<p>如需了解详细信息，请参阅<a href="{@docRoot}preview/features/scoped-folder-access.html">作用域目录访问</a>开发者文档。
+
+</p>
+
+<h2 id="keyboard_shortcuts_helper">键盘快捷键辅助工具</h2>
+
+<p>
+在 Android N 中，用户可以按“Alt + /”触发“键盘快捷键”屏幕，它会显示的系统和对焦的应用中可用的所有快捷键。
+
+<em></em>这些是从应用菜单（如可用）中自动检索到的，但开发者可以提供自己的屏幕微调快捷键。
+
+您可以通过重写新 <code>Activity.onProvideKeyboardShortcuts()</code> 的方法来进行这项操作，如可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中所述。
+
+
+</p>
+
+<p>
+若要在您的应用程序的任何地方触发键盘快捷键辅助工具，为相关活动调用 {@code Activity.requestKeyboardShortcutsHelper()}。
+
+</p>
+
+<h2 id="sustained_performance_api">持续性能 API</h2>
+
+<p>
+长期运行的应用的性能可能会显著波动，因为系统会阻止系统芯片在设备组件达到温度限制时启动。
+
+这种波动是建立高性能长期运行应用的应用开发者的移动目标。
+
+</p>
+
+<p>
+为解决这些限制，Android N 包括了“持续性能模式”支持，帮助原始设备制造商 (OEM) 提供关于长期运行应用的设备性能能力的提示。
+
+<em></em>应用开发者可以使用这些提示来根据可预测的一致设备性能水平调整长期应用。
+
+
+</p>
+
+<p>
+应用开发者只能在 Nexus 6P 设备的 N Developer Preview 上尝试这项新的 API。
+若要使用此功能，为您希望以持续性能模式运行的窗口设置持续性能窗口标记。
+
+使用 {@code Window.setSustainedPerformanceMode()} 方法设置此举报。
+当窗口不再对焦时，系统会自动停用此模式。
+
+</p>
+
+<h2 id="vr">VR 支持</h2>
+
+<p>
+Android N 添加了新的 VR 模式的平台支持和优化，以使开发者能为用户打造高质量移动 VR 体验。
+新版针对开发者提供了大量性能增强特性，包括单一缓冲区渲染以及允许 VR 应用访问某个专属的 CPU 核心。在您的应用中，您可以享受到专为 VR 设计的平滑头部跟踪和立体声通知功能。
+
+
+最重要的是，Android N 的图形延时非常低。
+如需有关构建面向的 Android N 的 VR 应用的完整信息，请参阅 <a href="https://developers.google.com/vr/android/">面向 Android 的 Google VR SDK</a>。
+
+</p>
+
+
+<h2 id="print_svc">打印服务增强</h2>
+
+<p>
+ 在 Android N 中，打印服务开发者现在可以公开关于个别打印机和打印作业的其他信息。
+
+</p>
+
+<p>
+ 在列出各打印机时，打印服务现在可以通过两种方式来设置按打印机的图标：
+
+</p>
+
+<ul>
+ <li>您可以通过调用 <code>PrinterInfo.Builder.setResourceIconId()</code> 设置源于资源 ID 的图标
+
+ </li>
+
+ <li>您可以通过调用 <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>，并针对使用 <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code> 请求图标的情况设置回调来显示源自网络的图标
+
+
+
+ </li>
+</ul>
+
+<p>
+ 此外，您还可以通过调用 <code>PrinterInfo.Builder.setInfoIntent()</code> 提供按打印机活动，以显示其他信息。
+
+</p>
+
+<p>
+ 您可以通过分别调用 <code>android.printservice.PrintJob.setProgress()</code> 和 <code>android.printservice.PrintJob.setStatus()</code> 在打印任务通知中指示打印任务的进度和状态。
+
+
+
+</p>
+
+<p>
+ 如需有关这些方法的详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>。
+</p>
+
+<h2 id="framemetrics_api">FrameMetricsListener API</h2>
+
+<p>
+FrameMetricsListener API 允许应用监测它的 UI 渲染性能。
+API 通过公开流式传输 Pub/Sub API 来提供此能力，以传递应用当前窗口的帧计时信息。
+返回的数据相当于 <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code> 显示的数据，但不限定于在过去的 120 帧内。
+
+</p>
+
+<p>
+您可以使用 FrameMetricsListener 来衡量生产中的交互级 UI 性能，无需 USB 连接。
+API 允许在比 {@code adb shell dumpsys gfxinfo} 更高的粒度上收集数据。
+
+因为系统可以从应用中的特定交互中收集数据，因此更高的粒度变得可行；系统不需要采集关于完整应用性能的全局概要或清除任何全局状态。
+
+
+您可以使用这种能力来针对应用的真实使用案例收集性能数据和捕捉 UI 性能回归。
+
+
+</p>
+
+<p>
+若要监测一个窗口，实现 <code>FrameMetricsListener.onMetricsAvailable()</code> 回叫方法，并在窗口上注册。
+如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中的 {@code FrameMetricsListener} 类文档。
+
+
+</p>
+
+<p>
+API 提供了一个包含计时数据的 {@code FrameMetrics} 对象，其渲染子系统会在一帧长度内报告各种里程碑。支持的指标有：{@code UNKNOWN_DELAY_DURATION}、{@code INPUT_HANDLING_DURATION}、{@code ANIMATION_DURATION}、{@code LAYOUT_MEASURE_DURATION}、{@code DRAW_DURATION}、{@code SYNC_DURATION}、{@code COMMAND_ISSUE_DURATION}、{@code SWAP_BUFFERS_DURATION}、{@code TOTAL_DURATION} 和 {@code FIRST_DRAW_FRAME}。
+
+
+
+
+
+
+</p>
+
+
+<h2 id="virtual_files">虚拟文件</h2>
+
+<p>
+ 在较早的 Android 版本中，您的应用可以使用存储访问框架来允许用户从他们的云存储帐户中选择文件，如 Google 云端硬盘。
+
+但是，不能表示没有直接字节码表示的文件；每个文件都必须提供一个输入流。
+
+
+</p>
+
+<p>
+ Android N 在存储访问框架中增加了“虚拟文件”的概念。
+<em></em>虚拟文件功能可以让您的 {@link android.provider.DocumentsProvider} 返回可与 {@link android.content.Intent#ACTION_VIEW}Intent 使用的文件 URI，即使它们没有直接字节码表示。
+
+
+Android N 还允许您为用户文件（虚拟或其他类）提供备用格式。
+
+</p>
+
+<p>
+ 为获得您的应用中的虚拟文件的 URI，首先您应创建一个 {@link android.content.Intent} 以打开文件选择器 UI。
+由于应用不能使用 {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()} 方法来直接打开一个虚拟文件，因此如果您包括了 {@link android.content.Intent#CATEGORY_OPENABLE} 类别，您的应用不会收到任何虚拟文件。
+
+
+
+
+</p>
+
+<p>
+ 在用户选择之后，系统调用 {@link android.app.Activity#onActivityResult onActivityResult()} 方法。
+
+ 您的应用可以检索虚拟文件的URI，并得到一个输入流，这表现在以下片段中的代码。
+
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ 如需有关访问用户文件的更多信息，请参阅 <a href="{@docRoot}guide/topics/providers/document-provider.html">存储访问框架指南</a>。
+
+
+</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/index.jd b/docs/html-intl/intl/zh-cn/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/zh-cn/preview/index.jd
rename to docs/html-intl/intl/zh-cn/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/zh-cn/design/patterns/notifications.jd b/docs/html-intl/intl/zh-cn/design/patterns/notifications.jd
deleted file mode 100644
index 57e02e4..0000000
--- a/docs/html-intl/intl/zh-cn/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=通知
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>开发者文档</h3>
- <p>通知用户</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Android 4.4 及更低版本中的通知</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>视频</h3>
- <p>DevBytes：Android L 开发者预览当中的通知</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>通知系统可让用户随时了解应用中的相关和即时事件，例如来自好友的新聊天信息或日历事件。可将通知视作新闻频道，在重要的事件发生时提醒用户注意，或者当作日志，在用户未注意时记录事件—可在用户的所有 Android 设备上按需同步。
-
-
-
-
-
-</p>
-
-<h4 id="New"><strong>Android 5.0 新增内容</strong></h4>
-
-<p>在 Android 5.0 中，通知在结构、外观和功能方面获得了重要的更新：
-</p>
-
-<ul>
- <li>通知在外观上发生了更改，与新的材料设计主题保持一致。
-</li>
- <li> 通知现在可以在设备锁定屏幕上使用，而敏感信息仍然可以隐藏于背后。
-
-</li>
- <li>设备在使用时收到的高优先级通知现在采用名为浮动通知的新格式。
-</li>
- <li>云同步通知：在一台 Android 设备上清除通知，则在其他设备上也会将其清除。
-
-</li>
-</ul>
-
-<p class="note"><strong>注：</strong>该版本 Android 的通知设计与之前的版本大不相同。
-
-有关之前版本通知设计的信息，请参阅<a href="./notifications_k.html"> Android 4.4 及更低版本中的通知</a>。
-</p>
-
-<h2 id="Anatomy">通知详解</h2>
-
-<p>本部分介绍通知的基本组成部分，及其在不同类型设备上显示的方式。
-</p>
-
-<h3 id="BaseLayout">基本布局</h3>
-
-<p>所有通知至少要包括一个基本布局，包括：</p>
-
-<ul>
- <li> 通知的<strong>图标</strong>。图标以符号形式表示来源应用。如果应用生成多个类型的通知，它也可用于指明通知类型。
-
-
-</li>
- <li> 通知<strong>标题</strong>以及其他
-<strong>文本</strong>。</li>
- <li> <strong>时间戳</strong>。</li>
-</ul>
-
-<p>利用 {@link android.app.Notification.Builder Notification.Builder}为之前版本平台创建的通知，其外观和行为方式与在 Android
-5.0 中完全相同，唯一的变动在于系统为您处理通知的方式存在细微的样式变动。
-
-如需了解之前 Android 版本通知设计的详细信息，请参阅<a href="./notifications_k.html"> Android 4.4 及更低版本中的通知</a>。
-
-</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- 手持设备通知（左）和穿戴设备（右）上同一通知的基本布局，带有用户照片和通知图标
-
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">展开布局</h3>
-
-
-<p>您可以选择让应用的通知提供多少信息详情。
-它们可显示消息的前几行，也可以显示更大的预览图像。
-额外的信息可以为用户提供更多上下文，并且，在某些情况下，可能允许用户完整阅读消息。
-
-
-用户可进行两指缩放或执行单指滑移，在紧凑和展开布局之间切换。
-
-
- 对于单一事件通知，Android 提供了三种展开布局模板（文本、收件箱和图像），供您在应用中使用。
-
-下图展示单一事件通知在手持设备（左）和穿戴式设备（右）上的外观。
-
-</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">操作</h3>
-
-<p>Android 支持在通知底部显示可选的操作。通过操作，用户可在通知栏中处理最常见的任务，而无需打开来源应用。这样可加快交互的速度，而通过结合使用滑动清除通知的功能，有助于用户专注于对自身重要的通知。
-
-
-
-
-
-</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">请慎重考虑要在通知中包含多少操作。
-您加入的操作越多，用户就越无所适从。
-请通过只包含最重要且有意义的操作，尽量减少通知中的操作数量。
-
-
-</p>
-
-<p>适合在通知中使用的操作具有如下特点：</p>
-
-<ul>
- <li> 对正在显示的内容类型必要、常用且常见
-
- <li> 让用户可以迅速完成任务
-</ul>
-
-<p>避免以下类型的操作：</p>
-
-<ul>
- <li> 含义模糊
- <li> 跟通知的默认操作一样（例如“阅读”或“打开”）
-
-</ul>
-
-
-
-<p>您最多可以指定三个操作，每个操作由操作图标和名称组成。
-
- 通过为简单的基本布局添加操作，可以展开该通知，即使该通知没有展开布局，此方法仍然有效。
-
-由于操作仅对展开的通知显示（否则会隐藏），因此要确保用户从通知调用的任何操作都可在相关联的应用中使用。
-
-
-
-
-</p>
-
-<h2 style="clear:left">浮动通知</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- 出现在沉浸式应用顶部的浮动通知（手机来电，高优先级）示例
-
-
- </p>
-</div>
-
-<p>收到高优先级通知时（见右侧），它会向用户短时间显示一个包含可选操作的展开布局。
-
-</p>
-<p> 之后，通知会缩回通知栏。
-如果通知的<a href="#correctly_set_and_manage_notification_priority">优先级</a>标志为高、最大或全屏，则会得到浮动通知。
-</p>
-
-<p><b>浮动通知的范例</b></p>
-
-<ul>
- <li> 使用设备时来电</li>
- <li> 使用设备时闹铃</li>
- <li> 新的短信</li>
- <li> 电池电量过低</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">指导原则</h2>
-
-
-<h3 id="MakeItPersonal">个人化</h3>
-
-<p>对于他人发送的项目通知（例如消息或状态更新），请使用
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()} 包含此人的头像。
-另外将有关此人的信息附加到通知的元数据（参阅 {@link android.app.Notification#EXTRA_PEOPLE}）。
-</p>
-
-<p>您通知的主图标仍然会显示，因此，该用户可将其与状态栏中显示的图标相关联。
-
-</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- 显示触发通知的用户以及该用户所发送信息的通知。
-</p>
-
-
-<h3 id="navigate_to_the_right_place">导航至正确位置</h3>
-
-<p>在用户触摸通知的正文时（在操作按钮的外面），打开应用并定位至正确的位置，以便用户可查看通知中引用的数据并据此操作。
-
-
-在大多数情况下，该位置是某个数据项目（例如消息）的详情视图，但如果是存档通知，那么也可能是摘要视图。
-
-如果您的应用将用户带到应用顶层以下的任何位置，可将导航插入应用的返回栈，这样用户就可以通过按下系统返回按钮返回至顶层。
-
-如需了解详细信息，请参阅<a href="{@docRoot}design/patterns/navigation.html#into-your-app">导航</a>设计模式中的“通过主屏幕小工具和通知进入您的应用”<em></em>。
-
-</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">正确设置和管理通知优先级。
-
-</h3>
-
-<p>Android 支持通知的优先级标志。该标志可以影响您的通知相对于其他通知出现的位置，并且可以帮助确保用户始终能在第一时间看到对他们最重要的通知。
-
-
-在发布通知时，您可以选择下列优先级之一：
-
-</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>优先级</strong></p>
-</td>
- <td class="tab0">
-<p><strong>用法</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>用于重要和紧急的通知，告知用户属于时间关键型状况，或者必须予以解决方可继续执行某个特定任务。
-
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>主要用于重要通信，例如包含用户特别感兴趣的内容的消息或聊天事件。高优先级通知会触发浮动通知显示。
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>用于不属于此处所述其他任何优先级的所有通知。</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>用于您希望告知用户但不是很紧急的通知。
-低优先级通知最好显示在列表的底部，这里正适合放置公共事项或无收件人姓名的社交更新之类的通知：
-
-用户要求接收相关通知，但是这些通知的优先级永远不会高于紧急或直接通信。
-
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>用于上下文或背景信息，例如天气信息或上下文位置信息。最低优先级通知不会出现在状态栏中。
-
-用户可在展开的通知栏上找到它们。
-</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>如何选择合适的优先级</strong>
-
-</h4>
-
-<p><code>DEFAULT</code>、<code>HIGH</code> 和 <code>MAX</code> 是中断优先级别，在活动过程中有中断用户的风险。
-
-为了避免打扰应用的用户，中断优先级仅保留用于以下通知
-：</p>
-
-<ul>
- <li> 涉及另一个用户</li>
- <li> 时间敏感</li>
- <li> 可能会立即改变用户在现实世界中的行为</li>
-</ul>
-
-<p>设置为 <code>LOW</code> 和 <code>MIN</code> 的通知可能仍然对用户很重要：
-很多通知（如果不是绝大多数）不需要用户立即注意，也不需要振动，但仍然包含用户选择查看通知时将会觉得重要的信息。
-
-
-<code>LOW</code> 和 <code>MIN</code>优先级通知的条件包括：
-</p>
-
-<ul>
- <li> 不涉及其他用户</li>
- <li> 不属于时间敏感型</li>
- <li> 包含用户可能感兴趣但可选择在空闲时浏览的内容
-</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">设置通知类别
-</h3>
-
-<p>如果通知属于以下预定义类别（参阅下文）之一，则为其分配相应的类别。
-
-诸如通知栏（或其他任何通知侦听器）这样的系统 UI 项目，可使用该信息来进行评级和筛选决策。
-
-</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>来电（语音或视频）或相似的同步通信请求
-</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>传入的直接消息（短信、即时消息等）</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>异步群发消息（电子邮件）</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>日历事件</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>促销或广告</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>闹铃或定时器</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>长时间运行的后台操作的进度</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>社交网络或共享更新</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>后台操作或身份验证状态中的错误</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>媒体传输播放控制</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>系统或设备状态更新。保留给系统使用。</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>正在运行的后台服务的指示</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>对于某个事件的特定、及时建议。例如，新闻应用可能会建议用户接下来可能想要阅读的新话题。
-
-</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>有关设备或上下文状态的持续信息</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">通知摘要</h3>
-
-<p>如果特定类型的通知已经在您的应用尝试发送同类型的新通知时挂起，可将它们合并到单个应用摘要通知中，而不要新建对象。
-
-</p>
-
-<p>摘要通知会生成摘要说明，让用户了解特定类型的通知有多少处于挂起状态。
-
-</p>
-
-<div class="col-6">
-
-<p><strong>禁忌用法</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>建议用法</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">您可通过使用展开的摘要布局提供有关组成摘要的各个通知的更多详情。
-
-此方法可让用户更好地了解哪些通知处于挂起状态，如果他们有足够的兴趣，还可在相关联的应用中阅读详情。
-
-
-
-</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- 展开和收起的摘要通知（使用 <code>InboxStyle</code>）
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">将通知设置为可选
-</h3>
-
-<p>用户应始终能控制通知。允许用户通过将某个通知设置项目添加至您的应用设置，禁用应用的通知或更改其提醒属性，例如警报声和是否使用振动。
-
-
-
-</p>
-
-<h3 id="use_distinct_icons">使用不同的图标</h3>
-<p>通过扫一眼通知区域，用户可以了解哪些类型的通知当前处于挂起状态。
-
-</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>建议用法</strong></p>
- <p>查看 Android 应用已经提供的通知图标并为您的应用创建外观明显不同的通知图标。
-
-</p>
-
- <p><strong>建议用法</strong></p>
- <p>对小图标使用正确的<a href="/design/style/iconography.html#notification">通知图标样式</a>，对操作图标使用相应的材料灯<a href="/design/style/iconography.html#action-bar">操作栏图标</a>。
-
-
-
-</p>
-<p ><strong>建议用法</strong></p>
-<p >图标外观要简洁清晰，避免使用过于精细、难以辨认的图标。
-</p>
-
- <div><p><strong>禁忌用法</strong></p>
- <p>对小图标和操作图标设置任何附加的阿尔法通道属性（变暗或变淡）；这些图标会有抗锯齿边缘，但是由于 Android 使用这些图标作为蒙板（即仅使用阿尔法通道），因此通常应以完全不透明的方式绘制图像。
-
-
-
-
-</p>
-
-</div>
-<p style="clear:both"><strong>禁忌用法</strong></p>
-
-<p>利用色彩将您的应用与其他应用区分开来。通知图标应该是纯白透明背景图像。
-</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">对通知 LED 施加相应的脉冲
-</h3>
-
-<p>许多 Android 设备都配有通知 LED，用于让用户在屏幕关闭时了解事件。
-
-优先级为 <code>MAX</code>、
-<code>HIGH</code> 或 <code>DEFAULT</code> 的通知应让 LED 发光，而优先级较低的通知（<code>LOW</code> 和 <code>MIN</code>）则不应让 LED 发光。
-
-</p>
-
-<p>用户对通知的控制应延伸至 LED。当您使用 DEFAULT_LIGHTS 时，LED 将发出白光。
-
-您的通知不应使用不同的颜色，除非用户明确对其进行了自定义。
-
-</p>
-
-<h2 id="building_notifications_that_users_care_about">构建用户关注的通知
-</h2>
-
-<p>要创建用户喜爱的应用，精心设计通知很重要。通知是应用的代言人，还可增强应用的个性化特征。
-
-
-无用或者不重要的通知会给用户带来烦恼，或者由于过分分散用户的注意力而使其感到愤怒，因此请谨慎使用通知。
-
-
-</p>
-
-<h3 id="when_to_display_a_notification">何时显示通知</h3>
-
-<p>要创建人们乐于使用的应用，就需要认识到用户的注意力和关注点是一种必须予以保护的资源，这一点很重要。
-
-尽管 Android 的通知系统在设计上希望最小化通知对用户注意力的影响，但是仍然要重视通知会中断用户任务流程这一事实。在您计划通知时，要问问自己，它们是否足够重要，是否适合让用户中断手上的任务。
-
-
-
-
-
-
-如果您不确定，可允许用户使用应用的通知设置来选择是否接收通知，或者将通知优先级标志调整为 <code>LOW</code> 或 <code>MIN</code>，从而避免在用户做其他事情时分散他们的注意力。
-
-
-
-</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- 时间敏感通知的示例
- </p>
-
-<p>尽管行为良好的应用通常只在用户对其操作后才会发出通知，但在极少数情况下，应用通过无提示的通知形式打断用户也是值得的。
-</p>
-
-<p>将通知主要用于<strong>时间敏感的事件</strong>，尤其是这些同步事件<strong>涉及其他用户时</strong>。
-例如，传入的聊天属于实时同步通信形式：
-
-另一个用户在主动等待您的回应。
-日历事件是使用通知并引起用户注意的另一个好例子，因为事件已经迫近，并且日历事件通常涉及其他人员。
-
-
-</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">何时不显示通知
-</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>在其他很多情况下都不适合显示通知：</p>
-
-<ul>
- <li> 不要将并非特定于用户的信息或并非确实时间敏感的信息告知用户。
-
-例如，流经社交网络的异步和未经订阅的更新，通常不适合引发实时中断。
-
-
-对于确实关注它们的用户，可让他们选择接收通知。
-</li>
- <li> 如果相关的新信息当前显示在屏幕上，则不要创建通知。
-不过可以使用应用本身的 UI 在上下文中将新信息直接告知用户。
-
-
- 例如，聊天应用不应在用户主动和另一名用户聊天时创建系统通知。
-</li>
- <li> 对于技术要求不高的操作（例如保存或同步信息或更新应用），如果应用或系统无需用户参与就可解决问题，请不要中断用户。
-
-</li>
- <li> 如果可以让应用自行恢复错误，而不必让用户采取任何操作，则不要中断用户来告知他们发生此错误。
-
-</li>
- <li> 请不要创建没有实际通知内容和仅仅是为您的应用做宣传的通知。通知应当提供有用、及时、最新的信息，而不应仅用于推广应用。
-
-
-
-</li>
- <li> 请不要为了向用户宣传您的品牌而创建过多的通知。
-
- 此类通知会让用户不满，从而很可能离您而去。提供少量更新信息并让用户保持与您的应用交互的最佳方式是开发一个小工具，让用户可以选择是否将其放在主屏幕上。
-
-
-
-
-</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">与通知交互
-</h2>
-
-<p>通知由状态栏中的图标指示，并且可以通过打开抽屉式通知栏进行访问。
-
-</p>
-
-<p>触摸通知会打开相关联的应用并进入与通知匹配的详细内容。在通知上向左或向右滑动会将其从抽屉式通知栏中删除。
-
-</p>
-
-<h3 id="ongoing_notifications">持续性通知</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- 因播放音乐而持续显示的通知
- </p>
-</div>
-<p>持续性通知可让用户持续了解后台运行的进度。例如，音乐播放器在通知系统中通告当前播放的曲目，并继续进行播放，直至用户停止播放。
-
-
-
-持续性通知也可为持续时间较长的任务（例如下载文件或视频编码之类的任务）向用户显示反馈。
-
-用户无法手动从抽屉式通知栏中删除持续性通知。
-</p>
-
-<h3 id="ongoing_notifications">媒体播放</h3>
-<p>在 Android 5.0 中，锁定屏幕不会为弃用的
-{@link android.media.RemoteControlClient} 类显示传输控件。但是它<em>确实</em>会显示通知，因此每个应用的播放通知现在是用户在锁屏状态控制播放的主要方式。
-
-此行为可让应用更好地控制显示哪些按钮，这样，无论是否锁屏，都可以为用户提供一致的体验。
-
-
-</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">对话框和 Toast
-</h3>
-
-<p>如果您的应用当前未显示在屏幕上，则不应创建对话框或 Toast。
-对话框或 Toast 应仅限用于即时响应用户在应用内部采取的操作。有关使用对话框和 Toast 的进一步指导，请参阅<a href="/design/patterns/confirming-acknowledging.html">确认和确知</a>。
-
-
-
-</p>
-
-<h3>排名和排序</h3>
-
-<p>通知属于新闻，因此基本以时间倒序显示，并且会特别考虑应用规定的通知<a href="#correctly_set_and_manage_notification_priority">优先级</a>。
-
-
-</p>
-
-<p>通知是锁定屏幕的关键部分，并且在设备显示屏每次亮起时突出显示。
-
-锁定屏幕上的空间有限，因此确定哪些通知最为紧急或最密切相关非常重要。
-
-由于这个原因，Android 在处理通知时使用了更为精密的排序算法，考虑到以下因素：
-
-</p>
-
-<ul>
- <li> 时间戳以及应用规定的优先级。</li>
- <li> 通知是否最近以声音或振动形式告知过用户。
-（也就是说，如果手机刚发出了铃声，并且用户希望知道“刚才发生了什么？”，那么锁定屏幕应让用户一眼看到相应的通知。）
-
-
-</li>
- <li> 与使用 {@link android.app.Notification#EXTRA_PEOPLE} 的通知相关的任何人，尤其是加星标的联系人。
-</li>
-</ul>
-
-<p>为了充分利用此排序功能，请专注于您希望建立的用户体验，而不是拘泥于列表上的某个特定项。
-
-</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Gmail 通知使用的是默认优先级，因此它们的顺序通常低于来自即时通讯应用（例如环聊）的消息，但是在有新邮件送达时会临时占位。
-
-
-
-
- </p>
-
-
-<h3>在锁定屏幕上</h3>
-
-<p>由于通知在锁定屏幕上可见，所以用户隐私是特别重要的考虑事项。
-
-通知通常包含敏感信息，并且不一定需要让所有拿起设备并打开显示屏的人看到。
-
-</p>
-
-<ul>
- <li> 对于配置了安全锁定屏幕（PIN 码、图案或密码）的设备，界面分为公用和私人部分。
-公用界面可显示在安全锁定屏幕上，因此任何人都可看见。
-私人界面是锁定屏幕背后的内容，只有在用户登录设备后才会显示。
-</li>
-</ul>
-
-<h3>用户对显示在安全锁定屏幕上的信息的控制</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- 位于锁定屏幕上的通知，具有用户解锁设备后可显示的内容。
- </p>
-</div>
-
-<p>在设置安全锁定屏幕时，用户可以选择从安全锁定屏幕隐藏敏感的详细信息。
-在这种情况下，系统 UI 会考虑通知的<em>可见性级别</em>，从而确定哪些内容可以安全地显示出来。
-
-</p>
-<p> 要控制可见性级别，可调用 <code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>，然后指定以下值之一：
-
-</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>。显示通知的完整内容。
-
- 在未指定可见性的情况下，此设置是系统的默认设置。</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>。在锁定屏幕上，会显示通知的基本信息，包括其图标以及发布此通知的应用名称。
-
-剩下的通知详细信息不会显示。需要注意的一些有用建议如下：
-
- <ul>
- <li> 如果您希望为通知提供不同的公用版本，供系统显示在安全锁定屏幕上，可在 <code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code> 字段中提供替换通知对象。
-
-
-
- <li> 该设置可让您的应用有机会创建有用内容的删减版本，但是不会显示个人信息。
-可参考短信应用的示例，这种应用的通知包括短信的文本以及发信者的姓名和联系人图标。该通知应为 <code>VISIBILITY_PRIVATE</code>，但是 <code>publicVersion</code> 仍然可以包含“有 3 条新消息”这样的有用信息，而不会提供其他识别性详细信息。
-
-
-
-
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>。仅显示最为精简的信息，甚至不包括通知图标。
-</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Android Wear 上的通知
-</h2>
-
-<p>通知及其<em>操作</em>默认会和穿戴设备桥接。开发者可以控制哪些通知会从手机桥接至手表，反之亦然。
-
-
-开发者也可以控制哪些操作会进行桥接。如果您的应用包含无法通过单次点击完成的操作，则可以将这些操作隐藏在您的 Android Wear 设备通知中，或者考虑将它们连接至 Android Wear 设备应用，从而可让用户在其手表上完成操作。
-
-
-
-
-
-</p>
-
-<h4>桥接通知和操作</h4>
-
-<p>连接的设备，例如手机，可将通知桥接至 Android Wear 设备，从而将通知显示在此处。
-与此相似，您也可以桥接操作，从而让用户可在 Android Wear 设备上直接操作通知。
-</p>
-
-<p><strong>桥接</strong></p>
-
-<ul>
- <li> 新的即时通讯</li>
- <li> 单次点击操作，例如 +1、赞、收藏</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>不要桥接</strong></p>
-
-<ul>
- <li> 新收到的播客通知</li>
- <li> 映射至手表上无法使用的功能的操作</li>
-</ul>
-
-
-
-<p><h4>为 Android Wear 设备定义的独特操作</h4></p>
-
-<p>有些操作只能在 Android Wear 上执行。包括以下情况：</p>
-
-<ul>
- <li> 例如“马上回来”这样的预设回复快速列表</li>
- <li> 在手机上打开</li>
- <li> 调出语音输入屏幕的“评论”或“回复”操作</li>
- <li> 启动 Android Wear 专用应用的操作</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/zh-cn/design/style/writing.jd b/docs/html-intl/intl/zh-cn/design/style/writing.jd
index 7944c24..c0c3e54 100644
--- a/docs/html-intl/intl/zh-cn/design/style/writing.jd
+++ b/docs/html-intl/intl/zh-cn/design/style/writing.jd
@@ -174,7 +174,7 @@
<li>使用缩写词。</li>
<li>使用“您”或“你”直接与读者对话。</li>
<li>语气应轻松自然，但要避免使用俚语。</li>
-
+
</ul>
<p><em>避免使用令人困惑或令人厌烦的表达</em></p>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/about.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/about.jd
index bfdb210..382c4c7 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/about.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/about.jd
@@ -6,7 +6,7 @@
@jd:body
- <div id="qv-wrapper">
+ <div id="qv-wrapper">
<div id="qv">
<h2>关于 Google Play</h2>
<ol style="list-style-type:none;">
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/developer-console.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/developer-console.jd
index 7d0bd55..d925566 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/developer-console.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/developer-console.jd
@@ -4,8 +4,8 @@
Xnonavpage=true
@jd:body
-
- <div id="qv-wrapper">
+
+ <div id="qv-wrapper">
<div id="qv">
<h2>发布功能</h2>
<ol>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/families/faq.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/families/faq.jd
index ea8bb61..7b0cf1d 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/families/faq.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>本文内容</h2>
@@ -141,7 +141,7 @@
假设您的应用符合该计划的所有要求，我们预计发布时间不会超过正常时间；但是，如果在“为家庭设计”审查时被拒绝，则应用的发布可能会延迟。
-
+
</dd>
<dt>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/families/start.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/families/start.jd
index aab4b5a..e81bac5 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/families/start.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/families/start.jd
@@ -78,7 +78,7 @@
<p class="note">
<strong>注意</strong>：在“为家庭设计”计划中发布的应用也可供
- Google Play 上的所有用户使用。
+ Google Play 上的所有用户使用。
</p>
<p>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/guide.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/guide.jd
index b70bcb5..7b280cf 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/guide.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/guide.jd
@@ -18,7 +18,7 @@
<ul>
<li>
<strong>在 Google Play 上发布</strong> —使用 Google Play
- 的开发者控制台，将您的应用分发给全球超过 10 亿
+ 的开发者控制台，将您的应用分发给全球超过 10 亿
Android 用户。
</li>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/auto.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/auto.jd
index a590446..9f61a35 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/auto.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/auto.jd
@@ -162,7 +162,7 @@
<tr>
<td rowspan="3" id="layout">
- 布局
+ 布局
</td>
<td id="AU-SC">
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/core.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/core.jd
index 0dae9e1..793d110 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/core.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/core.jd
@@ -12,7 +12,7 @@
<li><a href="#listing">Google Play</a></li>
</ol>
-
+
<h2>测试</h2>
<ol>
<li><a href="#test-environment">设置测试环境</a></li>
@@ -24,7 +24,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">平板电脑应用的质量</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">优化您的应用</a></li>
</ol>
-
+
</div>
</div>
@@ -84,7 +84,7 @@
<th style="width:54px;">
ID
</th>
-
+
<th>
说明
@@ -746,7 +746,7 @@
<li>应用商品详情包括高品质的置顶大图。
</li>
- <li>置顶大图不能包含设备图片、屏幕截图，也不能包含缩小后以及在应用适配的最小尺寸屏幕上显示时难以辨认的小文字。
+ <li>置顶大图不能包含设备图片、屏幕截图，也不能包含缩小后以及在应用适配的最小尺寸屏幕上显示时难以辨认的小文字。
</li>
@@ -1049,7 +1049,7 @@
<p style="margin-bottom:.25em;">
要强制启动硬件加速（在设备支持的情况下），请将
- <code>hardware-accelerated="true"</code>添加到应用清单文件中的<code><application></code>并重新编译。
+ <code>hardware-accelerated="true"</code>添加到应用清单文件中的<code><application></code>并重新编译。
</p>
</td>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tablets.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tablets.jd
index 1d9d620..3df311a 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tablets.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tablets.jd
@@ -48,7 +48,7 @@
</p>
<p>
- 本文档中提供了相关资源的链接，这些资源可帮助您了解文中给出的各条建议。
+ 本文档中提供了相关资源的链接，这些资源可帮助您了解文中给出的各条建议。
</p>
@@ -56,7 +56,7 @@
<p>为了打造上佳的平板电脑应用体验，首先要根据应用适配的所有设备和机型，确保您的应用满足相应的<em>应用核心质量标准</em>。
-有关完整信息，请参阅<a href="{@docRoot}distribute/essentials/quality/core.html">应用核心质量准则</a>。
+有关完整信息，请参阅<a href="{@docRoot}distribute/essentials/quality/core.html">应用核心质量准则</a>。
</p>
<p>
@@ -116,7 +116,7 @@
<ul>
- <li>根据需要，针对 <code>large</code> 和
+ <li>根据需要，针对 <code>large</code> 和
<code>xlarge</code> 屏幕提供自定义布局。您还可以提供可根据屏幕的<a href="{@docRoot}guide/practices/screens_support.html#NewQualifiers">最短尺寸</a>或<a href="{@docRoot}guide/practices/screens_support.html#NewQualifiers">最小可用宽度和高度</a>加载的布局。
@@ -207,8 +207,8 @@
android.app.Fragment} 子类实现各个内容面板。这样一来，您可以在共用内容的不同机型和不同屏幕间最大程度地重复使用代码。
</li>
-<li>确定要在哪些屏幕尺寸上使用多窗格界面，然后在相应的屏幕尺寸单元（例如
-<code>large</code>/<code>xlarge</code>）中提供不同的布局，或最小屏幕宽度（例如
+<li>确定要在哪些屏幕尺寸上使用多窗格界面，然后在相应的屏幕尺寸单元（例如
+<code>large</code>/<code>xlarge</code>）中提供不同的布局，或最小屏幕宽度（例如
<code>sw600dp</code>/<code>sw720</code>）。
</li>
</ul>
@@ -309,7 +309,7 @@
data-cardSizes="9x3"
data-maxResults="6"></div>
-<div class="headerLine"><h2 id="adjust-font-sizes">5.
+<div class="headerLine"><h2 id="adjust-font-sizes">5.
调整字体大小和触控目标</h2></div>
<p>要确保您的应用在平板电脑上易于使用，请花些时间针对您要适配的各种屏幕配置调整平板电脑界面中的字体大小和触控目标。
@@ -345,7 +345,7 @@
<div class="headerLine"><h2 id="adjust-widgets">6. 调整主屏幕小部件的尺寸</h2></div>
-<p>如果您的应用中包含主屏幕小部件，需要注意以下几点，以确保用户在平板电脑屏幕上获得良好体验：
+<p>如果您的应用中包含主屏幕小部件，需要注意以下几点，以确保用户在平板电脑屏幕上获得良好体验：
</p>
<ul>
@@ -411,7 +411,7 @@
为确保分发到尽可能多的平板电脑，务必让应用适配各种支持平板电脑的 Android 版本。
对平板电脑的支持是从 <a href="{@docRoot}about/versions/android-3.0.html">Android 3.0</a>（API 级别 11）开始的。
- 对平板电脑、手机及其他设备的统一界面框架支持是从 <a href="{@docRoot}about/versions/android-4.0.html">Android
+ 对平板电脑、手机及其他设备的统一界面框架支持是从 <a href="{@docRoot}about/versions/android-4.0.html">Android
4.0</a> 开始的
</p>
@@ -494,8 +494,8 @@
<li>与此类似，还请检查清单文件，找出
<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#permissions">表明硬件功能要求</a>不适用于平板电脑的 <a href="{@docRoot}guide/topics/manifest/permission-element.html"><code><permission></code></a> 元素。
-如果您找到这样的权限，请务必为功能明确声明对应的
-<code><uses-feature></code> 元素并加入
+如果您找到这样的权限，请务必为功能明确声明对应的
+<code><uses-feature></code> 元素并加入
<code>android:required=”false”</code> 属性。
</li>
</ul>
@@ -529,21 +529,21 @@
</p>
<ul>
- <li>如果声明
+ <li>如果声明
<a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><code><supports-screens></code></a>
元素，就不要指定 <code>android:largeScreens="false"</code>
或 <code>android:xlargeScreens="false"</code>。</li>
- <li>如果应用适配的 <code>minSdkVersion</code> 值小于 13，必须使用
+ <li>如果应用适配的 <code>minSdkVersion</code> 值小于 13，必须使用
<code>android:largeScreens="true"</code> 和 <code>android:xlargeScreens="true"</code>
声明 <a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><code><supports-screens></code></a>
元素。</li>
</ul>
-<p>如果应用在清单文件中声明了
+<p>如果应用在清单文件中声明了
<a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html"><code><compatible-screens></code></a>
元素，该元素应包含相关属性，
以列举应用支持的<em>平板电脑屏幕的所有尺寸和密度组合</em>。
-请注意，如果可能，您应避免在应用中使用
+请注意，如果可能，您应避免在应用中使用
<a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html"><code><compatible-screens></code></a>
元素。</p>
@@ -586,7 +586,7 @@
<li>添加在 7 英寸和 10 英寸平板电脑上截取的屏幕截图。
</li>
- <li>如果可能，添加横屏和竖屏截取的屏幕截图。
+ <li>如果可能，添加横屏和竖屏截取的屏幕截图。
</li>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tv.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tv.jd
index 6a60945..99a12d5 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tv.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/tv.jd
@@ -133,7 +133,7 @@
<tr>
<td rowspan="5" id="layout">
- 布局
+ 布局
</td>
<td id="TV-LO">
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/wear.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/wear.jd
index 99483ec..eb9166d 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/wear.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/quality/wear.jd
@@ -91,7 +91,7 @@
<td>
<p style="margin-bottom:.5em;">
手持类应用包括具有可穿戴设备特有功能的通知或直接在穿戴设备上运行的可穿戴类应用。
-
+
（<a href="{@docRoot}training/building-wearables.html">了解方法</a>）
</p>
</td>
@@ -441,7 +441,7 @@
<p style="margin-top:30px;">
- <strong>如果我的应用不符合穿戴设备的要求，是否仍会在 Google Play
+ <strong>如果我的应用不符合穿戴设备的要求，是否仍会在 Google Play
上向手机和平板电脑显示我的新应用或更新版本并且仍可在可穿戴设备上安装？</strong>
</p>
<p>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/tv.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/tv.jd
index e557024..a1b2f4c 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/tv.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/tv.jd
@@ -88,7 +88,7 @@
<p>
在考虑您的电视应用时，请查看<a href="{@docRoot}training/tv/start/index.html">开发者文档</a>和可用性准则，并且尽可能支持这些准则。
-确保为用户设计一种出色 Leanback 观看体验，并使用 SDK 中随附的
+确保为用户设计一种出色 Leanback 观看体验，并使用 SDK 中随附的
Leanback 库来打造这种体验。您想针对电视用例优化应用的其他部分，最好在开发过程的早期确定这些部分。
@@ -261,7 +261,7 @@
当您进行必要的调整后，就可以将应用的新版本上传到开发者控制台。
-
+
</p>
<p>
@@ -282,7 +282,7 @@
<li>
<em>已批准</em> — 您的应用已被审查并获得批准。该应用将直接提供给 Android TV 用户。
-
+
</li>
<li>
diff --git a/docs/html-intl/intl/zh-cn/distribute/googleplay/wear.jd b/docs/html-intl/intl/zh-cn/distribute/googleplay/wear.jd
index 182abdf..480ce5d 100644
--- a/docs/html-intl/intl/zh-cn/distribute/googleplay/wear.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/googleplay/wear.jd
@@ -60,7 +60,7 @@
<p>
为了做好准备，以便在 Android Wear 上成功推出应用，首先要查阅在穿戴设备上提供出色应用体验的准则。
-请参考 <a href="{@docRoot}design/wear/index.html">Android
+请参考 <a href="{@docRoot}design/wear/index.html">Android
Wear 设计准则</a>，了解有关针对穿戴设备扩展应用的建议，以及有关设计和可用性的详情。
</p>
@@ -120,7 +120,7 @@
<p>
您的穿戴设备应用应表现出色，在 Android Wear 上看起来引人入胜，并且提供尽可能最佳的用户体验。
Google Play 将展示精选的优质穿戴设备应用，以便用户轻松发现。
-以下说明了您如何加入平台，提交用户喜爱的
+以下说明了您如何加入平台，提交用户喜爱的
Android Wear 应用：
</p>
diff --git a/docs/html-intl/intl/zh-cn/distribute/resources.jd b/docs/html-intl/intl/zh-cn/distribute/resources.jd
index 71bd466..4c5644c 100644
--- a/docs/html-intl/intl/zh-cn/distribute/resources.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/resources.jd
@@ -8,7 +8,7 @@
@jd:body
<div class="jd-descr" itemprop="articleBody">
- <div class="resource-widget resource-carousel-layout col-16"
+ <div class="resource-widget resource-carousel-layout col-16"
style="height:420px;margin-top:0px;padding-top:0"
data-query="collection:overview/carousel/zhcn"
data-sortOdrder="-timestamp"
diff --git a/docs/html-intl/intl/zh-cn/distribute/tools/launch-checklist.jd b/docs/html-intl/intl/zh-cn/distribute/tools/launch-checklist.jd
index 19a25c5..900dc0d 100644
--- a/docs/html-intl/intl/zh-cn/distribute/tools/launch-checklist.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/tools/launch-checklist.jd
@@ -79,8 +79,8 @@
</p>
<p>
- 当您基本熟悉发布流程后，请继续阅读以了解在
-Google Play 上发布应用时应考虑哪些问题。
+ 当您基本熟悉发布流程后，请继续阅读以了解在
+Google Play 上发布应用时应考虑哪些问题。
</p>
@@ -334,7 +334,7 @@
</div>
<p>
- 发布应用之前，请务必确保您的应用可在目标 Android 平台版本和设备屏幕尺寸上正常运行。
+ 发布应用之前，请务必确保您的应用可在目标 Android 平台版本和设备屏幕尺寸上正常运行。
</p>
@@ -400,7 +400,7 @@
<li>
<p>
将应用发布为免费应用后，您无法再将其改成付费应用。
-不过，您仍能通过 Google Play
+不过，您仍能通过 Google Play
的<a href="{@docRoot}google/play/billing/index.html">应用内结算</a>服务销售<a href="{@docRoot}google/play/billing/billing_overview.html#products">应用内商品</a>
和<a href="{@docRoot}google/play/billing/billing_subscriptions.html">订阅</a>。
</p>
@@ -449,9 +449,9 @@
<p>
如果您希望找到更多方法通过应用获利并建立与用户的互动，则应考虑使用“应用内结算”或“即时购买”。
这些服务深受用户和开发者的欢迎。
-要使用“应用内结算”或“即时购买”，您需要对应用的二进制文件进行更改，因此，您需要先完成更改并测试实现方法，然后才能创建发布版 APK。
+要使用“应用内结算”或“即时购买”，您需要对应用的二进制文件进行更改，因此，您需要先完成更改并测试实现方法，然后才能创建发布版 APK。
-
+
</p>
<h3 class="rel-resources clearfloat">相关资源</h3>
@@ -955,7 +955,7 @@
<ul>
<li>
<p>
- 经常查看您应用的商品详情页上的评分和评论。
+ 经常查看您应用的商品详情页上的评分和评论。
注意反复出现的主题，这可能表示存在错误或其他问题。
</p>
</li>
@@ -991,7 +991,7 @@
<li>
<p>
- 确认并修正您应用中出现的问题。保持公开透明并主动在商品详情页上列出已知问题是有益之举。
+ 确认并修正您应用中出现的问题。保持公开透明并主动在商品详情页上列出已知问题是有益之举。
</p>
</li>
diff --git a/docs/html-intl/intl/zh-cn/distribute/tools/localization-checklist.jd b/docs/html-intl/intl/zh-cn/distribute/tools/localization-checklist.jd
index 522b7f5..e37f043 100644
--- a/docs/html-intl/intl/zh-cn/distribute/tools/localization-checklist.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/tools/localization-checklist.jd
@@ -62,7 +62,7 @@
用户可以控制其 Android 设备上使用的语言和语言区域，反过来这些因素也会影响应用的显示方式。
-
+
</p>
<p>
@@ -820,7 +820,7 @@
</h4>
<p>
- 如果您正在准备国际化营销，请务必加入<a href="{@docRoot}distribute/tools/promote/badges.html">本地化的 Google Play
+ 如果您正在准备国际化营销，请务必加入<a href="{@docRoot}distribute/tools/promote/badges.html">本地化的 Google Play
徽章</a>，让用户知道您是在 Google Play 上发布应用的。您可以使用徽章生成器快速构建本地化的徽章，然后用到您的网站或营销材料中。
您还可以获得高分辨率的资源。
diff --git a/docs/html-intl/intl/zh-cn/distribute/tools/promote/linking.jd b/docs/html-intl/intl/zh-cn/distribute/tools/promote/linking.jd
index c7cf7cf..e9b13c0 100644
--- a/docs/html-intl/intl/zh-cn/distribute/tools/promote/linking.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/tools/promote/linking.jd
@@ -13,7 +13,7 @@
</div>
</div>
- <p>Google Play 提供多种链接格式，可让你按自己需要的方式将用户从 Android 应用、网页、广告、评论、文章、社交媒体帖子等链接到你的商品。</p>
+ <p>Google Play 提供多种链接格式，可让你按自己需要的方式将用户从 Android 应用、网页、广告、评论、文章、社交媒体帖子等链接到你的商品。</p>
<p>这些链接格式可让你：</p>
<ul>
diff --git a/docs/html-intl/intl/zh-cn/google/play/billing/api.jd b/docs/html-intl/intl/zh-cn/google/play/billing/api.jd
index fbdbac6..ba1d637 100644
--- a/docs/html-intl/intl/zh-cn/google/play/billing/api.jd
+++ b/docs/html-intl/intl/zh-cn/google/play/billing/api.jd
@@ -32,7 +32,7 @@
<h2>另请参见</h2>
<ol>
<li><a href="{@docRoot}training/in-app-billing/index.html">销售应用内商品</a></li>
- </ol>
+ </ol>
</div>
</div>
@@ -68,7 +68,7 @@
<ol type="a">
<li>Google Play 返回的 <code>Bundle</code> 中包含 <code>PendingIntent</code>，您的应用可用它来启动购买结帐界面。</li>
<li>您的应用通过调用 <code>startIntentSenderForResult</code> 方法来启动 PendingIntent。</li>
- <li>当结帐流程结束后（即用户成功购买商品或取消购买），Google Play 会向您的 <code>onActivityResult</code> 方法发送响应 <code>Intent</code>。<code>onActivityResult</code> 的结果代码中有一个代码将用于表明用户是完成了购买还是取消了购买。响应 <code>Intent</code> 中会包含所购商品的相关信息，其中包括 Google Play 为了唯一标识此次购买交易而生成的 <code>purchaseToken</code> 字符串。<code>Intent</code> 中还包含使用您的私人开发者密钥签署的购买签名。</li>
+ <li>当结帐流程结束后（即用户成功购买商品或取消购买），Google Play 会向您的 <code>onActivityResult</code> 方法发送响应 <code>Intent</code>。<code>onActivityResult</code> 的结果代码中有一个代码将用于表明用户是完成了购买还是取消了购买。响应 <code>Intent</code> 中会包含所购商品的相关信息，其中包括 Google Play 为了唯一标识此次购买交易而生成的 <code>purchaseToken</code> 字符串。<code>Intent</code> 中还包含使用您的私人开发者密钥签署的购买签名。</li>
</ol>
</li>
</ol>
diff --git a/docs/html-intl/intl/zh-cn/google/play/billing/billing_admin.jd b/docs/html-intl/intl/zh-cn/google/play/billing/billing_admin.jd
index 989c0e7..50e2fe3 100644
--- a/docs/html-intl/intl/zh-cn/google/play/billing/billing_admin.jd
+++ b/docs/html-intl/intl/zh-cn/google/play/billing/billing_admin.jd
@@ -15,7 +15,7 @@
<li><a href="#billing-support">获取相关支持</a></li>
</ol>
-
+
<h2>另请参见</h2>
<ol>
<li><a href="{@docRoot}google/play/billing/billing_overview.html">应用内结算概述</a></li>
diff --git a/docs/html-intl/intl/zh-cn/google/play/filters.jd b/docs/html-intl/intl/zh-cn/google/play/filters.jd
index 9d68faf..87df676 100644
--- a/docs/html-intl/intl/zh-cn/google/play/filters.jd
+++ b/docs/html-intl/intl/zh-cn/google/play/filters.jd
@@ -166,7 +166,7 @@
</p>
<p><strong>示例 2<br />
</strong>清单文件声明 <code><uses-sdk android:minSdkVersion="3"
- android:targetSdkVersion="4"></code> 并且不包括
+ android:targetSdkVersion="4"></code> 并且不包括
<code><supports-screens></code> 元素。
<strong>结果</strong>：Google Play 将向所有设备的用户显示该应用，除非还有其他筛选器。
</p>
@@ -400,10 +400,10 @@
这样，您可以只包括每种设备配置所需的纹理，从而减小
APK 文件的大小。
-根据每个设备是否支持您的纹理压缩格式，Google Play
+根据每个设备是否支持您的纹理压缩格式，Google Play
将向其提供您已声明支持该设备的 APK。</p>
-<p>目前，只有在每个 APK 根据以下配置提供不同筛选时，Google Play
+<p>目前，只有在每个 APK 根据以下配置提供不同筛选时，Google Play
才允许您为同一应用发布多个 APK：</p>
<ul>
<li>OpenGL 纹理压缩格式
diff --git a/docs/html-intl/intl/zh-cn/guide/components/activities.jd b/docs/html-intl/intl/zh-cn/guide/components/activities.jd
index efc1fb1..0e7c4fd 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/activities.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/activities.jd
@@ -1,5 +1,5 @@
page.title=Activity
-page.tags=Activity, Intent
+page.tags=Activity, Intent
@jd:body
<div id="qv-wrapper">
@@ -215,7 +215,7 @@
<h2 id="StartingAnActivity">启动 Activity</h2>
<p>您可以通过调用 {@link android.app.Activity#startActivity
- startActivity()}，并将其传递给描述您想启动的 Activity 的 {@link android.content.Intent}
+ startActivity()}，并将其传递给描述您想启动的 Activity 的 {@link android.content.Intent}
来启动另一个 Activity。Intent 对象会指定您想启动的具体 Activity 或描述您想执行的操作类型（系统会为您选择合适的 Activity，甚至是来自其他应用的 Activity）。
@@ -608,7 +608,7 @@
<p>系统会先调用
{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}，然后再使 Activity 变得易于销毁。系统会向该方法传递一个
-{@link android.os.Bundle}，您可以在其中使用
+{@link android.os.Bundle}，您可以在其中使用
{@link
android.os.Bundle#putString putString()} 和 {@link
android.os.Bundle#putInt putInt()} 等方法以名称-值对形式保存有关 Activity 状态的信息。然后，如果系统终止您的应用进程，并且用户返回您的 Activity，则系统会重建该 Activity，并将
diff --git a/docs/html-intl/intl/zh-cn/guide/components/bound-services.jd b/docs/html-intl/intl/zh-cn/guide/components/bound-services.jd
index ed6aaf6..fda6ba7 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/bound-services.jd
@@ -636,7 +636,7 @@
android.content.Context#stopService stopService()}
为止，无论其是否绑定到任何客户端。</p>
-<p>此外，如果您的服务已启动并接受绑定，则当系统调用您的 {@link android.app.Service#onUnbind onUnbind()} 方法时，如果您想在客户端下一次绑定到服务时接收
+<p>此外，如果您的服务已启动并接受绑定，则当系统调用您的 {@link android.app.Service#onUnbind onUnbind()} 方法时，如果您想在客户端下一次绑定到服务时接收
{@link android.app.Service#onRebind
onRebind()} 调用（而不是接收 {@link
android.app.Service#onBind onBind()} 调用），则可选择返回
diff --git a/docs/html-intl/intl/zh-cn/guide/components/fragments.jd b/docs/html-intl/intl/zh-cn/guide/components/fragments.jd
index a4c2cbb..12a26e2 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/fragments.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>另请参阅</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">利用片段构建动态 UI</a></li>
@@ -362,7 +362,7 @@
<p>如需查看将没有 UI 的片段用作后台工作线程的示例 Activity，请参阅 {@code
FragmentRetainInstance.java} 示例，该示例包括在 SDK 示例（通过
-Android SDK 管理器提供）中，以
+Android SDK 管理器提供）中，以
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code> 形式位于您的系统中。</p>
@@ -378,7 +378,7 @@
<li>通过 {@link
android.app.FragmentManager#findFragmentById findFragmentById()}（对于在 Activity 布局中提供 UI
的片段）或 {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()}（对于提供或不提供 UI 的片段）获取 Activity 中存在的片段</li>
+findFragmentByTag()}（对于提供或不提供 UI 的片段）获取 Activity 中存在的片段</li>
<li>通过 {@link
android.app.FragmentManager#popBackStack()}（模拟用户发出的 <em>Back</em> 命令）将片段从返回栈中弹出</li>
<li>通过 {@link
@@ -785,7 +785,7 @@
<p>第二个片段 {@code DetailsFragment} 显示从
{@code TitlesFragment} 的列表中选择的项目的戏剧摘要：</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>从 {@code TitlesFragment} 类中重新调用，如果用户点击某个列表项，且当前布局“根本不”<em></em>包括 {@code R.id.details}
@@ -798,7 +798,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>请注意，如果配置为横向，则此 Activity 会自行完成，以便主 Activity 可以接管并沿 {@code TitlesFragment}
显示
{@code DetailsFragment}。如果用户在纵向显示时启动
diff --git a/docs/html-intl/intl/zh-cn/guide/components/fundamentals.jd b/docs/html-intl/intl/zh-cn/guide/components/fundamentals.jd
index 4ff22b6..faaa0a3 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/fundamentals.jd
@@ -379,7 +379,7 @@
等外部服务会读取它们，以便当用户在其设备中搜索应用时为用户提供过滤功能。</p>
<p>例如，如果您的应用需要相机，并使用 Android 2.1（<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API</a> 7 级）中引入的
-API，您应该像下面这样在清单文件中以要求形式声明这些信息：</p>
+API，您应该像下面这样在清单文件中以要求形式声明这些信息：</p>
<pre>
<manifest ... >
@@ -390,7 +390,7 @@
</manifest>
</pre>
-<p>现在，<em>没有</em>相机且
+<p>现在，<em>没有</em>相机且
Android 版本<em>低于</em> 2.1 的设备将无法从 Google Play 安装您的应用。</p>
<p>不过，您也可以声明您的应用使用相机，但并不<em>要求</em>必须使用。
diff --git a/docs/html-intl/intl/zh-cn/guide/components/index.jd b/docs/html-intl/intl/zh-cn/guide/components/index.jd
index 53e8184..73c1bdf 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/index.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/index.jd
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>博客文章</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>使用 DialogFragments</h4>
<p>在这篇帖子中，我将介绍如何使用带有 v4 支持库（旨在支持 Honeycomb 之前的设备实现向后兼容）的 DialogFragments 显示一个简单的编辑对话框，并使用一个接口向调用 Activity 返回一个结果。</p>
@@ -21,7 +21,7 @@
<h4>通用片段</h4>
<p>今天，我们已发布一个展示相同 Fragments API 的静态库（以及新的 LoaderManager 和其他几个类）。因此，与 Android 1.6 或更高版本兼容的应用可以使用 Fragment 创建与平板电脑兼容的用户界面。 </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>多线程处理，性能卓越</h4>
<p>创建快速响应的应用的有效方法是：确保最大程度地减少主 UI
@@ -32,7 +32,7 @@
<div class="col-6">
<h3>培训</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>管理 Activity 生命周期</h4>
<p>本课程介绍每个 Activity 实例将收到的重要生命周期回调方法，阐述可以如何利用这些方法使 Activity 达到用户预期，且避免它们在 Activity 不需要使用时消耗系统资源。
diff --git a/docs/html-intl/intl/zh-cn/guide/components/loaders.jd b/docs/html-intl/intl/zh-cn/guide/components/loaders.jd
index d8427b0..d768188 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/loaders.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>关键类</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>相关示例</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
@@ -51,7 +51,7 @@
因此，它们无需重新查询其数据。
</li>
</ul>
-
+
<h2 id="summary">Loader API 摘要</h2>
<p>在应用中使用加载器时，可能会涉及到多个类和接口。
@@ -129,7 +129,7 @@
或 {@link android.content.AsyncTaskLoader} 子类，从其他源中加载数据。</li>
<li>一个
{@link android.app.LoaderManager.LoaderCallbacks}
-实现。您可以使用它来创建新加载器，并管理对现有加载器的引用。</li>
+实现。您可以使用它来创建新加载器，并管理对现有加载器的引用。</li>
<li>一种显示加载器数据的方法，如 {@link
android.widget.SimpleCursorAdapter}。</li>
<li>使用
@@ -140,11 +140,11 @@
<p>{@link android.app.LoaderManager} 可在 {@link android.app.Activity} 或
{@link android.app.Fragment} 内管理一个或多个 {@link
android.content.Loader} 实例。每个 Activity 或片段只有一个 {@link
-android.app.LoaderManager}。</p>
+android.app.LoaderManager}。</p>
<p>通常，您会使用 Activity 的 {@link
android.app.Activity#onCreate onCreate()} 方法或片段的
-{@link android.app.Fragment#onActivityCreated onActivityCreated()}
+{@link android.app.Fragment#onActivityCreated onActivityCreated()}
方法初始化 {@link android.content.Loader}。您执行操作如下：
</p>
@@ -157,13 +157,13 @@
<ul>
<li>用于标识加载器的唯一 ID。在此示例中，ID 为 0。</li>
<li>在构建时提供给加载器的可选参数（在此示例中为 <code>null</code>
-）。</li>
+）。</li>
<li>{@link android.app.LoaderManager.LoaderCallbacks} 实现，
{@link android.app.LoaderManager} 将调用此实现来报告加载器事件。在此示例中，本地类实现
{@link
android.app.LoaderManager.LoaderCallbacks}
-接口，因此它会将引用 {@code this} 传递给自己。</li>
+接口，因此它会将引用 {@code this} 传递给自己。</li>
</ul>
<p>{@link android.app.LoaderManager#initLoader initLoader()}
调用确保加载器已初始化且处于Activity状态。这可能会出现两种结果：</p>
@@ -362,11 +362,11 @@
<h2 id="example">示例</h2>
-<p>以下是一个
+<p>以下是一个
{@link
android.app.Fragment} 完整实现示例。它展示了一个 {@link android.widget.ListView}，其中包含针对联系人内容提供程序的查询结果。它使用 {@link
android.content.CursorLoader} 管理提供程序的查询。</p>
-
+
<p>应用如需访问用户联系人（正如此示例中所示），其清单文件必须包括权限
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS}。
</p>
diff --git a/docs/html-intl/intl/zh-cn/guide/components/processes-and-threads.jd b/docs/html-intl/intl/zh-cn/guide/components/processes-and-threads.jd
index c88ecf4..3f7c3cf 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/processes-and-threads.jd
@@ -47,7 +47,7 @@
<activity>}</a>、<a href="{@docRoot}guide/topics/manifest/service-element.html">{@code
<service>}</a>、<a href="{@docRoot}guide/topics/manifest/receiver-element.html">{@code
<receiver>}</a> 和 <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code
-<provider>}</a>—均支持
+<provider>}</a>—均支持
{@code android:process} 属性，此属性可以指定该组件应在哪个进程运行。您可以设置此属性，使每个组件均在各自的进程中运行，或者使一些组件共享一个进程，而其他组件则不共享。
此外，您还可以设置 {@code android:process}，使不同应用的组件在相同的进程中运行，但前提是这些应用共享相同的 Linux 用户 ID 并使用相同的证书进行签署。
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
diff --git a/docs/html-intl/intl/zh-cn/guide/components/recents.jd b/docs/html-intl/intl/zh-cn/guide/components/recents.jd
index 2bf1a5b..bc218f4 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/recents.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/recents.jd
@@ -118,7 +118,7 @@
如果未找到任务或者 Intent 包含
{@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK}
标志，则会以该 Activity 作为其根创建新任务。如果找到的话，则会将该任务转到前台并将新
- Intent
+ Intent
传递给
{@link android.app.Activity#onNewIntent onNewIntent()}。新 Activity 将获得 Intent 并在概览屏幕中创建新文档，如下例所示：</p>
@@ -176,7 +176,7 @@
<dd>该 Activity 不会为文档创建新任务。设置此值会替代
{@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}
和 {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK} 标志的行为（如果在
- Intent
+ Intent
中设置了其中一个标志），并且概览屏幕将为应用显示单个任务，该任务将从用户上次调用的任意 Activity 开始继续执行。</dd>
</dl>
diff --git a/docs/html-intl/intl/zh-cn/guide/components/services.jd b/docs/html-intl/intl/zh-cn/guide/components/services.jd
index 9a00e70..c7c848b 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/services.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/services.jd
@@ -244,7 +244,7 @@
{@link android.app.Service#onStartCommand
onStartCommand()} 方法接收此 {@link android.content.Intent}。</p>
-<p>例如，假设某 Activity 需要将一些数据保存到在线数据库中。该 Activity 可以启动一个协同服务，并通过向
+<p>例如，假设某 Activity 需要将一些数据保存到在线数据库中。该 Activity 可以启动一个协同服务，并通过向
{@link
android.content.Context#startService startService()} 传递一个 Intent，为该服务提供要保存的数据。服务通过
{@link
diff --git a/docs/html-intl/intl/zh-cn/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/zh-cn/guide/components/tasks-and-back-stack.jd
index 07fdf6e..88aa78eb 100644
--- a/docs/html-intl/intl/zh-cn/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/zh-cn/guide/components/tasks-and-back-stack.jd
@@ -45,7 +45,7 @@
<p>一个 Activity 甚至可以启动设备上其他应用中存在的 Activity。例如，如果应用想要发送电子邮件，则可将 Intent 定义为执行“发送”操作并加入一些数据，如电子邮件地址和电子邮件。
然后，系统将打开其他应用中声明自己处理此类
- Intent 的 Activity。在这种情况下， Intent
+ Intent 的 Activity。在这种情况下， Intent
是要发送电子邮件，因此将启动电子邮件应用的“撰写”Activity（如果多个 Activity 支持相同
Intent，则系统会让用户选择要使用的 Activity）。发送电子邮件时，Activity 将恢复，看起来好像电子邮件 Activity 是您的应用的一部分。
即使这两个 Activity 可能来自不同的应用，但是
@@ -246,7 +246,7 @@
<li>{@link android.content.Intent#FLAG_ACTIVITY_SINGLE_TOP}</li>
</ul>
-<p>在下文中，您将了解如何使用这些清单文件属性和 Intent
+<p>在下文中，您将了解如何使用这些清单文件属性和 Intent
标志定义 Activity 与任务的关联方式，以及 Activity 在返回栈中的行为方式。</p>
<p>此外，我们还单独介绍了有关如何在概览屏幕中显示和管理任务与 Activity 的注意事项。
@@ -282,7 +282,7 @@
B 的请求（如其清单文件中所定义）。</p>
<p class="note"><strong>注：</strong>某些适用于清单文件的启动
-模式不可用作 Intent 标志，同样，某些可用作 Intent
+模式不可用作 Intent 标志，同样，某些可用作 Intent
标志的启动模式无法在清单文件中定义。</p>
@@ -370,7 +370,7 @@
属性和可接受的值。</p>
<p class="note"><strong>注：</strong>使用 <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a>
-属性为 Activity 指定的行为可由 Intent
+属性为 Activity 指定的行为可由 Intent
附带的 Activity 启动标志替代，下文将对此进行讨论。</p>
@@ -378,7 +378,7 @@
<h4 id="#IntentFlagsForTasks">使用 Intent 标志</h4>
<p>启动 Activity 时，您可以通过在传递给 {@link
-android.app.Activity#startActivity startActivity()} 的 Intent
+android.app.Activity#startActivity startActivity()} 的 Intent
中加入相应的标志，修改 Activity 与其任务的默认关联方式。可用于修改默认行为的标志包括：
</p>
@@ -404,7 +404,7 @@
属性没有值。</p>
<p>{@code FLAG_ACTIVITY_CLEAR_TOP} 通常与
{@code FLAG_ACTIVITY_NEW_TASK}
-结合使用。一起使用时，通过这些标志，可以找到其他任务中的现有 Activity，并将其放入可从中响应 Intent
+结合使用。一起使用时，通过这些标志，可以找到其他任务中的现有 Activity，并将其放入可从中响应 Intent
的位置。 </p>
<p class="note"><strong>注：</strong>如果指定 Activity 的启动模式为
{@code "standard"}，则该 Activity 也会从堆栈中删除，并在其位置启动一个新实例，以便处理传入的 Intent。
diff --git a/docs/html-intl/intl/zh-cn/preview/j8-jack.jd b/docs/html-intl/intl/zh-cn/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/zh-cn/preview/j8-jack.jd
rename to docs/html-intl/intl/zh-cn/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/zh-cn/guide/topics/manifest/manifest-intro.jd
index c7ade4f..65b3b23 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/manifest/manifest-intro.jd
@@ -34,14 +34,14 @@
<li>描述应用的各个组件，即：构成应用的 Activity、服务、广播接收器和内容提供程序。
为实现每个组件的类命名并发布其功能（例如，它们可以处理的
-{@link android.content.Intent
+{@link android.content.Intent
Intent} 消息）。根据这些声明，Android
系统可以了解这组件具体是什么，以及在什么条件下可以启动它们</li>
-<li>确定将托管应用组件的进程</li>
+<li>确定将托管应用组件的进程</li>
<li>声明应用必须具备哪些权限才能访问
-API 中受保护的部分并与其他应用交互</li>
+API 中受保护的部分并与其他应用交互</li>
<li>还声明其他应用与该应用组件交互所需具备的权限
</li>
@@ -66,7 +66,7 @@
要查看有关任何元素的详细信息，请点击该图中或其后按字母顺序排列的元素列表中相应的元素名称，或者点击任何其他地方提到的相应元素名称。
-
+
</p>
<pre>
@@ -128,7 +128,7 @@
<p>
可出现在清单文件中的所有元素按字母顺序罗列如下。
这些是仅有的合法元素；您无法添加自己的元素或属性。
-
+
</p>
<p style="margin-left: 2em">
@@ -158,7 +158,7 @@
</p>
-
+
<h2 id="filec">文件约定</h2>
@@ -218,7 +218,7 @@
(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>)、广播接收器
(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>)
以及内容提供程序
-(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>)。
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>)。
<p>
如果按照您针对组件类（{@link android.app.Activity}、{@link android.app.Service}、{@link android.content.BroadcastReceiver}
@@ -244,7 +244,7 @@
元素的
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
属性中所指定）。
-以下赋值与上述方法相同：
+以下赋值与上述方法相同：
</p>
<pre><manifest package="com.example.project" . . . >
@@ -339,7 +339,7 @@
<p>
显式命名目标组件的
Intent 将激活该组件；过滤器不起作用。但是，不按名称指定目标的
- Intent
+ Intent
只有在能够通过组件的一个过滤器时才可激活该组件。
</p>
@@ -399,7 +399,7 @@
<p>
<i>权限</i> 是一种限制，用于限制对部分代码或设备上数据的访问。
施加限制是为了保护可能被误用以致破坏或损害用户体验的关键数据和代码。
-
+
</p>
<p>
@@ -427,7 +427,7 @@
如果授予权限，则应用能够使用受保护的功能。
否则，其访问这些功能的尝试将会失败，并且不会向用户发送任何通知。
-
+
</p>
<p>
@@ -464,7 +464,7 @@
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
元素来请求。要让应用的其他组件也能够启动受保护的 Activity，就必须请求其使用权限，即便保护是由应用本身施加的亦如此。
-
+
</p>
<p>
@@ -474,7 +474,7 @@
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
元素再次声明。
但是，仍有必要通过
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> 请求使用它。
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> 请求使用它。
</p>
<p>
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/zh-cn/guide/topics/providers/calendar-provider.jd
index 5968284..b34cd8b 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">使用 Intent 对象查看日历数据</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">同步适配器</a></li>
</ol>
@@ -113,14 +113,14 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
+
<td>此表储存日历特定信息。
此表中的每一行都包含一个日历的详细信息，例如名称、颜色、同步信息等。
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>此表储存事件特定信息。
此表中的每一行都包含一个事件的信息—例如事件名称、地点、开始时间、结束时间等。
@@ -132,7 +132,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>此表储存每个事件实例的开始时间和结束时间。
此表中的每一行都表示一个事件实例。
对于一次性事件，实例与事件为 1:1
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>此表储存事件参加者（来宾）信息。
每一行都表示事件的一位来宾。
它指定来宾的类型以及事件的来宾出席响应。
@@ -149,7 +149,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>此表储存提醒/通知数据。
每一行都表示事件的一个提醒。一个事件可以有多个提醒。
每个事件的最大提醒数量在
@@ -159,7 +159,7 @@
中指定，后者由拥有给定日历的同步适配器设置。提醒以事件发生前的分钟数形式指定，其具有一个可决定用户提醒方式的方法。
</td>
</tr>
-
+
</table>
<p>Calendar Provider API 以灵活、强大为设计宗旨。提供良好的最终用户体验以及保护日历及其数据的完整性也同样重要。
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>表示是否选择显示该日历的布尔值。值为 0 表示不应显示与该日历关联的事件。
值为 1
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>一个布尔值，表示是否应同步日历并将其事件存储在设备上。
值为 0
表示不同步该日历，也不将其事件存储在设备上。值为 1
@@ -268,13 +268,13 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>为何必须加入
ACCOUNT_TYPE？</h3> <p>如果您查询 {@link
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
的特殊帐户类型，用于未关联设备帐户的日历。{@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
-帐户不会进行同步。</p> </div> </div>
+帐户不会进行同步。</p> </div> </div>
<p> 在示例的下一部分，您需要构建查询。选定范围指定查询的条件。
@@ -308,38 +308,38 @@
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>以下后续部分使用游标单步调试结果集。它使用在示例开头设置的常量来返回每个字段的值。
</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">修改日历</h3>
<p>如需执行日历更新，您可以通过
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td><a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a>
格式的事件持续时间。例如，值为
<code>"PT1H"</code> 表示事件应持续一小时，值为
@@ -444,39 +444,39 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>值为 1
表示此事件占用一整天（按照本地时区的定义）。值为 0
表示它是常规事件，可在一天内的任何时间开始和结束。</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>事件的重复发生规则格式。例如，<code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>。
您可以在<a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">此处</a>找到更多示例。
</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
<td>事件的重复发生日期。
-{@link android.provider.CalendarContract.EventsColumns#RDATE}
-与 {@link android.provider.CalendarContract.EventsColumns#RRULE}
+{@link android.provider.CalendarContract.EventsColumns#RDATE}
+与 {@link android.provider.CalendarContract.EventsColumns#RRULE}
通常联合用于定义一组聚合重复实例。
如需查看更详细的介绍，请参阅 <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">RFC5545 规范</a>。</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
+
<td>将此事件视为忙碌时间还是可调度的空闲时间。
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -514,11 +514,11 @@
{@link
android.content.Intent#ACTION_INSERT INSERT} Intent 对象插入事件，则此规则不适用—在该情形下，系统会提供默认时区。
</li>
-
+
<li>对于非重复事件，您必须加入 {@link
android.provider.CalendarContract.EventsColumns#DTEND}。 </li>
-
-
+
+
<li>对于重复事件，您必须加入 {@link
android.provider.CalendarContract.EventsColumns#DURATION} 以及 {@link
android.provider.CalendarContract.EventsColumns#RRULE} 或 {@link
@@ -528,7 +528,7 @@
android.provider.CalendarContract.EventsColumns#RRULE} 与 {@link android.provider.CalendarContract.EventsColumns#DTSTART} 和 {@link android.provider.CalendarContract.EventsColumns#DTEND}
联用，日历应用会自动将其转换为持续时间。
</li>
-
+
</ul>
<p>以下是一个插入事件的示例。为了简便起见，此操作是在 UI
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -625,19 +625,19 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">参加者表</h2>
<p>{@link android.provider.CalendarContract.Attendees}
-表的每一行都表示事件的一位参加者或来宾。调用
-{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
+表的每一行都表示事件的一位参加者或来宾。调用
+{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
会返回一个参加者列表，其中包含具有给定 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
的事件的参加者。
-此 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+此 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
必须匹配特定事件的 {@link
-android.provider.BaseColumns#_ID}。</p>
+android.provider.BaseColumns#_ID}。</p>
<p>下表列出了可写入的字段。
插入新参加者时，您必须加入除 <code>ATTENDEE_NAME</code> 之外的所有字段。
@@ -718,7 +718,7 @@
<h2 id="reminders">提醒表</h2>
<p>{@link android.provider.CalendarContract.Reminders}
-表的每一行都表示事件的一个提醒。调用
+表的每一行都表示事件的一个提醒。调用
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
会返回一个提醒列表，其中包含具有给定 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} 的事件的提醒。
</p>
@@ -727,7 +727,7 @@
<p>下表列出了提醒的可写入字段。插入新提醒时，必须加入所有字段。
请注意，同步适配器指定它们在
{@link
-android.provider.CalendarContract.Calendars} 表中支持的提醒类型。详情请参阅
+android.provider.CalendarContract.Calendars} 表中支持的提醒类型。详情请参阅
{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
。</p>
@@ -780,9 +780,9 @@
</p>
<p>下表列出了一些您可以执行实例查询的字段。请注意，
-时区由
-{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
-和
+时区由
+{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
+和
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES} 定义。</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>与日历时区相应的实例儒略历结束日。
-
-
+
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>从日历时区午夜开始计算的实例结束时间（分钟）。
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>与日历时区相应的实例儒略历开始日。
+ <td>与日历时区相应的实例儒略历开始日。
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>从日历时区午夜开始计算的实例开始时间（分钟）。
-
+
</td>
-
+
</tr>
</table>
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -922,9 +922,9 @@
<td><br>
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
- 您还可以通过
+ 您还可以通过
{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI} 引用 URI。
-如需查看使用该 Intent 对象的示例，请参阅<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">使用 Intent 对象查看日历数据</a>。
+如需查看使用该 Intent 对象的示例，请参阅<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">使用 Intent 对象查看日历数据</a>。
</td>
<td>打开日历后定位到 <code><ms_since_epoch></code> 指定的时间。</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- 您还可以通过
+
+ 您还可以通过
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 引用 URI。
如需查看使用该 Intent 对象的示例，请参阅<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">使用 Intent 对象查看日历数据</a>。
-
+
</td>
<td>查看 <code><event_id></code> 指定的事件。</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- 您还可以通过
+
+ 您还可以通过
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 引用 URI。
如需查看使用该 Intent 对象的示例，请参阅<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">使用 Intent 对象编辑事件</a>。
-
-
+
+
</td>
<td>编辑 <code><event_id></code> 指定的事件。</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
- 您还可以通过
+
+ 您还可以通过
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 引用 URI。
如需查看使用该 Intent 对象的示例，请参阅<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">使用 Intent 对象插入事件</a>。
-
+
</td>
<td>创建事件。</td>
@@ -996,7 +996,7 @@
<td>事件的名称。</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>事件开始时间，以从公元纪年开始计算的毫秒数表示。</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>事件结束时间，以从公元纪年开始计算的毫秒数表示。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
+
<td>一个布尔值，表示事件属于全天事件。值可以是
<code>true</code> 或 <code>false</code>。</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>事件的地点。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>事件描述。</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>事件是私人性质还是公共性质。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>将此事件视为忙碌时间还是可调度的空闲时间。</td>
-
-</table>
+
+</table>
<p>下文描述如何使用这些 Intent 对象。</p>
@@ -1059,23 +1059,23 @@
{@link
android.Manifest.permission#WRITE_CALENDAR} 权限。</p>
-
+
<p>当用户运行使用此方法的应用时，应用会将其转到日历来完成事件添加操作。
{@link
android.content.Intent#ACTION_INSERT INSERT} Intent 利用 extra
字段为表单预填充日历中事件的详细信息。用户随后可取消事件、根据需要编辑表单或将事件保存到日历中。
</p>
-
+
<p>以下是一个代码段，用于安排一个在 2012 年 1 月 19 日上午
7:30 开始、8:30 结束的事件。请注意该代码段中的以下内容：</p>
<ul>
- <li>它将 {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
+ <li>它将 {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
指定为 URI。</li>
-
+
<li>它使用 {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} 和 {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} extra
字段为表单预填充事件的时间。这些时间的值必须以从公元纪年开始计算的协调世界时毫秒数表示。
</li>
-
+
<li>它使用 {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
extra 字段提供以逗号分隔的受邀者电子邮件地址列表。</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,18 +1158,18 @@
<ul>
<li>同步适配器需要通过将 {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} 设置为 <code>true</code> 来表明它是同步适配器。</li>
-
-
+
+
<li>同步适配器需要提供 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} 和 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} 作为 URI 中的查询参数。 </li>
-
+
<li>与应用或小工具相比，同步适配器拥有写入权限的列更多。
例如，应用只能修改日历的少数几种特性，
例如其名称、显示名称、能见度设置以及是否同步日历。
相比之下，同步适配器不仅可以访问这些列，还能访问许多其他列，
例如日历颜色、时区、访问级别、地点等等。不过，同步适配器受限于它指定的
-<code>ACCOUNT_NAME</code> 和
+<code>ACCOUNT_NAME</code> 和
<code>ACCOUNT_TYPE</code>。</li> </ul>
<p>您可以利用以下 helper 方法返回供与同步适配器一起使用的 URI：</p>
@@ -1180,5 +1180,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>如需查看同步适配器的实现示例（并非仅限与日历有关的实现），请参阅
+<p>如需查看同步适配器的实现示例（并非仅限与日历有关的实现），请参阅
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>。
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-basics.jd
index 4c91d3a..b1a1c5a 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-basics.jd
@@ -251,7 +251,7 @@
</pre>
<p>
表 2 显示了
- {@link android.content.ContentResolver#query
+ {@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} 的参数如何匹配 SQL SELECT 语句：
</p>
<p class="table-caption">
@@ -717,7 +717,7 @@
<uses-permission android:name="android.permission.READ_USER_DICTIONARY">
</pre>
<p>
-
+
<a href="{@docRoot}guide/topics/security/security.html">安全与权限</a>指南中详细介绍了权限对提供程序访问的影响。
</p>
@@ -944,7 +944,7 @@
</p>
<p>
要在“批量模式”下访问提供程序，
-您可以创建 {@link android.content.ContentProviderOperation} 对象数组，然后使用 {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}
+您可以创建 {@link android.content.ContentProviderOperation} 对象数组，然后使用 {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}
将其分派给内容提供程序。
您需将内容提供程序的<em>授权</em>传递给此方法，而不是特定内容 URI。这样可使数组中的每个 {@link android.content.ContentProviderOperation} 对象都能适用于其他表。
@@ -1191,6 +1191,6 @@
</p>
<p>
-
+
<a href="#ContentURIs">内容 URI</a> 部分介绍了单个行的内容 URI。
</p>
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-creating.jd
index 6da5743..329754e 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/providers/content-provider-creating.jd
@@ -277,7 +277,7 @@
</p>
<p>
-
+
<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">内容提供程序基础知识</a>主题中描述了内容 URI 的基础知识。
</p>
@@ -569,7 +569,7 @@
</ul>
<h3 id="Query">实现 query() 方法</h3>
<p>
-
+
{@link android.content.ContentProvider#query(Uri, String[], String, String[], String)
ContentProvider.query()} 方法必须返回 {@link android.database.Cursor} 对象。如果失败，则会引发 {@link java.lang.Exception}。
如果您使用 SQLite 数据库作为数据存储，则只需返回由 {@link android.database.sqlite.SQLiteDatabase} 类的其中一个
@@ -831,7 +831,7 @@
</pre>
<h3 id="FileMIMETypes">文件的 MIME 类型</h3>
<p>
- 如果您的提供程序提供文件，请实现
+ 如果您的提供程序提供文件，请实现
{@link android.content.ContentProvider#getStreamTypes(Uri, String) getStreamTypes()}。
该方法会为您的提供程序可以为给定内容 URI 返回的文件返回一个 MIME 类型 {@link java.lang.String} 数组。您应该通过 MIME 类型过滤器参数过滤您提供的 MIME 类型，以便只返回客户端想处理的那些 MIME 类型。
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/zh-cn/guide/topics/providers/document-provider.jd
index fd36e29..db5b1a4 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/providers/document-provider.jd
@@ -177,7 +177,7 @@
中，提供程序和客户端并不直接交互。客户端请求与文件交互（即读取、编辑、创建或删除文件）的权限；
</li>
-<li>交互在应用（在本示例中为照片应用）触发 Intent
+<li>交互在应用（在本示例中为照片应用）触发 Intent
{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 或 {@link android.content.Intent#ACTION_CREATE_DOCUMENT} 后开始。Intent 可能包括进一步细化条件的过滤器—例如，“为我提供所有 MIME
类型为‘图像’的可打开文件”；
</li>
@@ -460,7 +460,7 @@
<p>您可以使用 SAF
就地编辑文本文档。以下代码段会触发
-{@link android.content.Intent#ACTION_OPEN_DOCUMENT} Intent
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} Intent
并使用类别 {@link android.content.Intent#CATEGORY_OPENABLE}
以仅显示可以打开的文档。它会进一步过滤以仅显示文本文件：</p>
@@ -589,7 +589,7 @@
</ul></li>
<li>一个包括
-{@code android.content.action.DOCUMENTS_PROVIDER} 操作的 Intent
+{@code android.content.action.DOCUMENTS_PROVIDER} 操作的 Intent
过滤器，以便在系统搜索提供程序时让您的提供程序出现在选取器中。</li>
</ul>
@@ -623,7 +623,7 @@
Android 4.4 及更高版本的设备。如果您想让应用支持 {@link android.content.Intent#ACTION_GET_CONTENT}
以适应运行 Android 4.3
及更低版本的设备，则应在您的清单文件中为运行 Android 4.4
-或更高版本的设备禁用 {@link android.content.Intent#ACTION_GET_CONTENT} Intent
+或更高版本的设备禁用 {@link android.content.Intent#ACTION_GET_CONTENT} Intent
过滤器。应将文档提供程序和
{@link android.content.Intent#ACTION_GET_CONTENT}
视为具有互斥性。如果您同时支持这两者，您的应用将在系统选取器
@@ -631,7 +631,7 @@
中出现两次，提供两种不同的方式来访问您存储的数据。这会给用户造成困惑。</p>
<p>建议按照以下步骤为运行 Android 4.4 版或更高版本的设备禁用
-{@link android.content.Intent#ACTION_GET_CONTENT} Intent
+{@link android.content.Intent#ACTION_GET_CONTENT} Intent
过滤器：</p>
<ol>
@@ -643,7 +643,7 @@
<li>添加一个<a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">Activity别名</a>，为
4.4 版（API 19
-级）或更高版本禁用 {@link android.content.Intent#ACTION_GET_CONTENT} Intent
+级）或更高版本禁用 {@link android.content.Intent#ACTION_GET_CONTENT} Intent
过滤器。例如：
<pre>
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/zh-cn/guide/topics/resources/providing-resources.jd
index ea46d86..1516814 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/resources/providing-resources.jd
@@ -398,7 +398,7 @@
<li>600，适用于 600x1024 mdpi 之类的屏幕（7 英寸平板电脑）。</li>
<li>720，适用于 720x1280 mdpi 之类的屏幕（10 英寸平板电脑）。</li>
</ul>
- <p>应用为多个资源目录提供不同的
+ <p>应用为多个资源目录提供不同的
smallestWidth 限定符值时，系统会使用最接近（但未超出）设备
smallestWidth 的值。 </p>
<p><em>此项为 API 级别 13 中新增配置。</em></p>
@@ -428,7 +428,7 @@
<p>应用为多个资源目录提供不同的此配置值时，系统会使用最接近（但未超出）设备当前屏幕宽度的值。
此处的值考虑到了屏幕装饰元素，因此如果设备显示屏的左边缘或右边缘上有一些永久性 UI
-元素，考虑到这些 UI
+元素，考虑到这些 UI
元素，它会使用小于实际屏幕尺寸的宽度值，这样会减少应用的可用空间。
</p>
@@ -456,7 +456,7 @@
<p>应用为多个资源目录提供不同的此配置值时，系统会使用最接近（但未超出）设备当前屏幕高度的值。
此处的值考虑到了屏幕装饰元素，因此如果设备显示屏的上边缘或下边缘有一些永久性 UI
-元素，考虑到这些 UI
+元素，考虑到这些 UI
元素，同时为减少应用的可用空间，它会使用小于实际屏幕尺寸的高度值。
非固定的屏幕装饰元素（例如，全屏时可隐藏的手机状态栏）并不<em></em>在考虑范围内，标题栏或操作栏等窗口装饰也不在考虑范围内，因此应用必须准备好处理稍小于其所指定值的空间。
@@ -510,7 +510,7 @@
</p>
<p><em>此项为 API 级别 4 中新增配置。</em></p>
-
+
<p>如需了解详细信息，请参阅<a href="{@docRoot}guide/practices/screens_support.html">支持多个屏幕</a>。
</p>
<p>另请参阅 {@link android.content.res.Configuration#screenLayout} 配置字段，该字段表示屏幕是小尺寸、标准尺寸还是大尺寸。
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/controls.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/controls.jd
index 0f1a543..3d78bdc 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">单选按钮</a></td>
<td>与复选框类似，不同的是只能选择组中的一个选项。</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/dialogs.jd
index 84922b4..595407d 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>另请参阅</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">对话框设计指南</a></li>
@@ -248,7 +248,7 @@
<dt>中性</dt>
<dd>您应该在用户可能不想继续执行操作，但也不一定想要取消操作时使用此按钮。
它出现在肯定按钮和否定按钮之间。
-例如，实际操作可能是“稍后提醒我”。</dd>
+例如，实际操作可能是“稍后提醒我”。</dd>
</dl>
<p>对于每种按钮类型，您只能为 {@link
@@ -317,10 +317,10 @@
<h4 id="Checkboxes">添加永久性多选列表或单选列表</h4>
-<p>要想添加多选项（复选框）或单选项（单选按钮）列表，请分别使用
+<p>要想添加多选项（复选框）或单选项（单选按钮）列表，请分别使用
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} 或
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} 或
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()}
方法。</p>
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -373,7 +373,7 @@
<p>尽管传统列表和具有单选按钮的列表都能提供“单选”操作，但如果您想持久保存用户的选择，则应使用
{@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()}。也就是说，如果稍后再次打开对话框时系统应指示用户的当前选择，那么您就需要创建一个具有单选按钮的列表。
</p>
@@ -442,7 +442,7 @@
{@code "sans-serif"}，以便两个文本字段都使用匹配的字体样式。</p>
<p>要扩展 {@link android.support.v4.app.DialogFragment}
-中的布局，请通过 {@link android.app.Activity#getLayoutInflater()}
+中的布局，请通过 {@link android.app.Activity#getLayoutInflater()}
获取一个 {@link android.view.LayoutInflater} 并调用
{@link android.view.LayoutInflater#inflate inflate()}，其中第一个参数是布局资源
ID，第二个参数是布局的父视图。然后，您可以调用
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/menus.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/menus.jd
index b77f3bf..bafbc65 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/menus.jd
@@ -83,9 +83,9 @@
</p>
<p>请参阅<a href="#options-menu">创建选项菜单</a>部分。</p>
</dd>
-
+
<dt><strong>上下文菜单和上下文操作模式</strong></dt>
-
+
<dd>上下文菜单是用户长按某一元素时出现的<a href="#FloatingContextMenu">浮动菜单</a>。
它提供的操作将影响所选内容或上下文框架。
@@ -94,7 +94,7 @@
</p>
<p>请参阅<a href="#context-menu">创建上下文菜单</a>部分。</p>
</dd>
-
+
<dt><strong>弹出菜单</strong></dt>
<dd>弹出菜单将以垂直列表形式显示一系列项目，这些项目将锚定到调用该菜单的视图中。
它特别适用于提供与特定内容相关的大量操作，或者为命令的另一部分提供选项。
@@ -135,7 +135,7 @@
<dt><code><item></code></dt>
<dd>创建 {@link android.view.MenuItem}，此元素表示菜单中的一项，可能包含嵌套的 <code><menu></code>
元素，以便创建子菜单。</dd>
-
+
<dt><code><group></code></dt>
<dd>{@code <item>} 元素的不可见容器（可选）。它支持您对菜单项进行分类，使其共享活动状态和可见性等属性。
如需了解详细信息，请参阅<a href="#groups">创建菜单组</a>部分。
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..5ec27d7
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/multi-window.jd
@@ -0,0 +1,589 @@
+page.title=多窗口支持
+page.metaDescription=Android N 全新支持同时显示多个应用窗口。
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>本文内容</h2>
+ <ol>
+ <li><a href="#overview">概览</a></li>
+ <li><a href="#lifecycle">多窗口生命周期</a></li>
+ <li><a href="#configuring">针对多窗口模式配置应用
+</a></li>
+ <li><a href="#running">在多窗口模式中运行应用</a></li>
+ <li><a href="#testing">测试应用的多窗口支持</a></li>
+ </ol>
+ <h2>另请参阅</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">多窗口 Playground 示例应用
+</a></li>
+ <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">在 Android N 为多窗口做准备的五条建议</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N 添加了对同时显示多个应用窗口的支持。
+在手持设备上，两个应用可以在“分屏”模式中左右并排或上下并排显示。
+<em></em>在电视设备上，应用可以使用“画中画”模式，在用户与另一个应用交互的同时继续播放视频。
+
+<em></em>
+</p>
+
+<p>
+ 如果您使用 N Preview SDK 构建应用，则可以配置应用处理多窗口显示的方法。
+例如，您可以指定 Activity 的最小允许尺寸。
+您还可以禁用应用的多窗口显示，确保系统仅以全屏模式显示应用。
+
+
+</p>
+
+<h2 id="overview">概览</h2>
+
+<p>
+ Android N 允许多个应用同时共享屏幕。例如，用户可以分屏显示应用，在左边查看网页，同时在右边写邮件。
+
+用户体验取决于设备：
+
+</p>
+
+<ul>
+ <li>运行 Android N 的手持设备具有分屏模式。
+在此模式中，系统以左右并排或上下并排的方式分屏显示两个应用。
+用户可以拖动两个应用之间的分界线，放大其中一个应用，同时缩小另一个。
+
+ </li>
+
+ <li>在运行 Android N 的 Nexus Player 上，应用能以<a href="picture-in-picture.html">画中画模式</a>显示，即在用户浏览网页或与其他应用交互的同时继续显示内容。
+
+
+
+ </li>
+
+ <li>较大设备的制造商可选择启用自由形状模式，在该模式中，用户可以自由调整各 Activity 的尺寸。
+若制造商启用此功能，设备将同时具有自由形状模式和分屏模式。
+
+
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>图 1.</strong> 两个应用在分屏模式中左右并排显示。
+</p>
+
+<p>
+ 用户可以通过以下方式切换到多窗口模式：
+</p>
+
+<ul>
+ <li>若用户打开 <a href="{@docRoot}guide/components/recents.html">Overview 屏幕</a>并长按 Activity 标题，则可以拖动该 Activity 至屏幕突出显示的区域，使 Activity 进入多窗口模式。
+
+
+
+ </li>
+
+ <li>若用户长按 Overview 按钮，设备上的当前 Activity 将进入多窗口模式，同时将打开 Overview 屏幕，用户可在该屏幕中选择要共享屏幕的另一个 Activity。
+
+
+ </li>
+</ul>
+
+<p>
+ 用户可以在两个 Activity 共享屏幕的同时在这两个 Activity 之间<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>数据
+
+（在此之前，用户只能在一个 Activity 内部拖放数据）。
+
+</p>
+
+<h2 id="lifecycle">多窗口生命周期</h2>
+
+<p>
+ 多窗口模式不会更改 <a href="{@docRoot}training/basics/activity-lifecycle/index.html">Activity 生命周期</a>。
+
+</p>
+
+<p>
+ 在多窗口模式中，在指定时间只有最近与用户交互过的 Activity 为活动状态。
+该 Activity 将被视为顶级 Activity。<em></em>
+ 所有其他 Activity 虽然可见，但均处于暂停状态。
+ 但是，这些已暂停但可见的 Activity 在系统中享有比不可见 Activity 更高的优先级。
+如果用户与其中一个暂停的 Activity 交互，该 Activity 将恢复，而之前的顶级 Activity 将暂停。
+
+
+</p>
+
+<p class="note">
+ <strong>注：</strong>在多窗口模式中，用户仍可以看到处于暂停状态的应用。
+应用在暂停状态下可能仍需要继续其操作。
+例如，处于暂停模式但可见的视频播放应用应继续显示视频。
+因此，我们建议播放视频的 Activity 不要暂停其 {@link android.app.Activity#onPause onPause()} 处理程序中的视频。
+
+<em></em>
+ 应暂停 {@link android.app.Activity#onStop
+ onStop()} 中的视频，并恢复 {@link android.app.Activity#onStart
+ onStart()} 中的视频播放。
+</p>
+
+<p>
+ 如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述，用户使用多窗口模式显示应用时，系统将通知 Activity 发生配置变更。
+
+这也会发生在当用户调整应用大小，或将应用恢复到全屏模式时。
+
+ 该变更与系统通知应用设备从纵向模式切换到横向模式时的 Activity 生命周期影响基本相同，但设备不仅仅是交换尺寸，而是会变更尺寸。
+
+
+如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述，您的 Activity 可以自行处理配置变更，或允许系统销毁 Activity，并以新的尺寸重新创建该 Activity。
+
+
+
+</p>
+
+<p>
+ 如果用户调整窗口大小，并在任意维度放大窗口尺寸，系统将调整 Activity 以匹配用户操作，同时根据需要发布<a href="{@docRoot}guide/topics/resources/runtime-changes.html">运行时变更</a>。
+
+如果应用在新公开区域的绘制滞后，系统将使用 {@link
+ android.R.attr#windowBackground windowBackground} 属性或默认 <code>windowBackgroundFallback</code> 样式属性指定的颜色暂时填充该区域。
+
+
+</p>
+
+<h2 id="configuring">针对多窗口模式配置应用</h2>
+
+<p>
+ 如果您的应用面向 Android N，您可以对应用的 Activity 是否支持多窗口显示以及显示方式进行配置。
+您可以在清单文件中设置属性，以控制大小和布局。
+
+ 根 Activity 的属性设置适用于其任务栈中的所有 Activity。
+例如，如果根 Activity 已 <code>android:resizeableActivity</code> 设定为 true，则任务栈中的所有 Activity 都将可以调整大小。
+
+
+</p>
+
+<p class="note">
+ <strong>注：</strong>如果您使用低于 Android N 版本的 SDK 构建多向应用，则用户在多窗口模式中使用应用时，系统将强制调整应用大小。
+
+系统将显示对话框，提醒用户应用可能会发生异常。
+系统不会调整定向应用的大小；如果用户尝试在多窗口模式下打开定向应用，应用将全屏显示。
+
+
+<em></em>
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ 在清单的 <code><activity></code> 或
+ <code><application></code> 节点中设置该属性，启用或禁用多窗口显示：
+
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ 如果该属性设置为 true，Activity 将能以分屏和自由形状模式启动。
+如果此属性设置为 false，Activity 将不支持多窗口模式。
+如果该值为 false，且用户尝试在多窗口模式下启动 Activity，该 Activity 将全屏显示。
+
+
+</p>
+
+<p>
+ 如果您的应用面向 Android N，但未对该属性指定值，则该属性的值默认设为 true。
+
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ 在清单文件的 <code><activity></code> 节点中设置该属性，指明 Activity 是否支持画中画显示。
+如果 <code>android:resizeableActivity</code> 为 false，将忽略该属性。
+
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">布局属性</h3>
+
+<p>
+ 对于 Android N，<code><layout></code> 清单元素支持以下几种属性，这些属性影响 Activity 在多窗口模式中的行为：
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ 以自由形状模式启动时 Activity 的默认宽度。
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ 以自由形状模式启动时 Activity 的默认高度。
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ 以自由形状模式启动时 Activity 的初始位置。请参阅 {@link android.view.Gravity} 参考资料，了解合适的值设置。
+
+ </dd>
+
+ <dt>
+ <code>android:minimalHeight</code>、<code>android:minimalWidth</code>
+ </dt>
+
+ <dd>
+ 分屏和自由形状模式中 Activity 的最小高度和最小宽度。
+如果用户在分屏模式中移动分界线，使 Activity 尺寸低于指定的最小值，系统会将 Activity 裁剪为用户请求的尺寸。
+
+
+ </dd>
+</dl>
+
+<p>
+ 例如，以下节点显示了如何指定 Activity 在自由形状模式中显示时 Activity 的默认大小、位置和最小尺寸：
+
+
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalHeight="450dp"
+ android:minimalWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">在多窗口模式中运行应用</h2>
+
+<p>
+ Android N 添加了新功能，以支持可在多窗口模式中运行的应用。
+
+</p>
+
+<h3 id="disabled-features">多窗口模式中被禁用的功能</h3>
+
+<p>
+ 在设备处于多窗口模式中时，某些功能会被禁用或忽略，因为这些功能对与其他 Activity 或应用共享设备屏幕的 Activity 而言没有意义。
+
+此类功能包括：
+
+<ul>
+ <li>某些<a href="{@docRoot}training/system-ui/index.html">系统 UI</a> 自定义选项将被禁用；例如，在非全屏模式中，应用无法隐藏状态栏。
+
+
+ </li>
+
+ <li>系统将忽略对 <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code> 属性所作的更改。
+ </li>
+</ul>
+
+<h3 id="change-notification">多窗口变更通知和查询</h3>
+
+<p>
+ {@link android.app.Activity} 类中添加了以下新方法，以支持多窗口显示。
+有关各方法的详细信息，请参阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a>。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.isInMultiWindowMode()</code>
+ </dt>
+
+ <dd>
+ 调用该方法以确认 Activity 是否处于多窗口模式。
+ </dd>
+
+ <dt>
+ <code>Activity.isInPictureInPictureMode()</code>
+ </dt>
+
+ <dd>
+ 调用该方法以确认 Activity 是否处于画中画模式。
+
+ <p class="note">
+ <strong>注：</strong>画中画模式是多窗口模式的特例。
+如果 <code>myActivity.isInPictureInPictureMode()</code> 返回 true，则 <code>myActivity.isInMultiWindowMode()</code> 也返回 true。
+
+
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowModeChanged()</code>
+ </dt>
+
+ <dd>
+ Activity 进入或退出多窗口模式时系统将调用此方法。
+在 Activity 进入多窗口模式时，系统向该方法传递 true 值，在退出多窗口模式时，则传递 false 值。
+
+
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureModeChanged()</code>
+ </dt>
+
+ <dd>
+ Activity 进入或退出画中画模式时系统将调用此方法。
+在 Activity 进入画中画模式时，系统向该方法传递 true 值，在退出画中画模式时，则传递 false 值。
+
+
+ </dd>
+</dl>
+
+<p>
+ 每个方法还有 {@link android.app.Fragment} 版本，例如 <code>Fragment.isInMultiWindowMode()</code>。
+
+</p>
+
+<h3 id="entering-pip">进入画中画模式</h3>
+
+<p>
+ 如需在画中画模式中启动 Activity，请调用新方法 <code>Activity.enterPictureInPictureMode()</code>。
+如果设备不支持画中画模式，则此方法无效。
+如需了解详细信息，请参阅<a href="picture-in-picture.html">画中画</a>文档。
+
+</p>
+
+<h3 id="launch">在多窗口模式中启动新 Activity</h3>
+
+<p>
+ 在启动新 Activity 时，用户可以提示系统如果可能，应将新 Activity 显示在当前 Activity 旁边。
+要执行此操作，可使用标志 <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>。
+
+传递此标志将请求以下行为：
+
+</p>
+
+<ul>
+ <li>如果设备处于分屏模式，系统会尝试在启动系统的 Activity 旁创建新 Activity，这样两个 Activity 将共享屏幕。
+
+系统并不一定能实现此操作，但如果可以，系统将使两个 Activity 处于相邻的位置。
+
+ </li>
+
+ <li>如果设备不处于分屏模式，则该标志无效。
+ </li>
+</ul>
+
+<p>
+ 如果设备处于自由形状模式，则在启动新 Activity 时，用户可通过调用 <code>ActivityOptions.setLaunchBounds()</code> 指定新 Activity 的尺寸和屏幕位置。
+
+如果设备不处于多窗口模式，则该方法无效。
+
+</p>
+
+<p class="note">
+ <strong>注：</strong>如果您在任务栈中启动 Activity，该 Activity 将替换屏幕上的 Activity，并继承其所有的多窗口属性。
+
+如果要在多窗口模式中以单独的窗口启动新 Activity，则必须在新的任务栈中启动此 Activity。
+
+</p>
+
+<h3 id="dnd">支持拖放</h3>
+
+<p>
+ 用户可以在两个 Activity 共享屏幕的同时在这两个 Activity 之间<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>数据
+
+（在此之前，用户只能在一个 Activity 内部拖放数据）。
+因此，如果您的应用目前不支持拖放功能，您可以在其中添加此功能。
+
+</p>
+
+<p>
+ N Preview SDK 扩展了 <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a> 软件包，以支持跨应用拖放。
+有关以下类和方法的详细信息，请参阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a>。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ 令牌对象，负责指定对接收拖放数据的应用授予的权限。
+
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ {@link android.view.View#startDrag View.startDrag()} 的新别名。要启用跨 Activity 拖放，请传递新标志 <code>View.DRAG_FLAG_GLOBAL</code>。
+
+如需对接收拖放数据的 Activity 授予 URI 权限，可根据情况传递新标志 <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> 或 <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>。
+
+
+
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ 取消当前正在进行的拖动操作。只能由发起拖动操作的应用调用。
+
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ 替换当前正在进行的拖动操作的拖动阴影。只能由发起拖动操作的应用调用。
+
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ 请求使用 {@link android.view.DragEvent} 中包含的 {@link
+ android.content.ClipData} 传递的内容 URI 的权限。
+ </dd>
+</dl>
+
+<h2 id="testing">测试应用的多窗口支持</h2>
+
+<p>
+ 无论您是否针对 Android N 更新应用，都应验证应用在多窗口模式下的行为，以防用户尝试在运行 Android N 的设备上以多窗口模式启动应用。
+
+
+</p>
+
+<h3 id="configuring">配置测试设备</h3>
+
+<p>
+ 如果在设备上安装 Android N，则将自动支持分屏模式。
+
+</p>
+
+<h3 id="test-non-n">如果应用并非使用 N Preview SDK 构建</h3>
+
+<p>
+ 如果您的应用不是使用 N Preview SDK 构建的，则用户尝试在多窗口模式中使用应用时，系统将强制调整应用大小，除非应用进行了定向声明。
+
+
+</p>
+
+<p>
+ 如果您的应用没有进行定向声明，则应在运行 Android N 的设备上启动应用，并尝试将应用切换到分屏模式。
+
+验证并确保在强制调整应用大小时用户体验可接受。
+
+</p>
+
+<p>
+ 如果应用进行了定向声明，则应尝试将应用切换到多窗口模式。
+验证并确保执行此操作后，应用仍保持全屏模式。
+
+</p>
+
+<h3 id="test-mw">如果支持多窗口模式</h3>
+
+<p>
+ 如果您的应用是使用 N Preview SDK 构建的，且未禁用多窗口支持，则分别在分屏和自由形状模式下验证以下行为。
+
+
+</p>
+
+<ul>
+ <li>在全屏模式下启动应用，然后通过长按 Overview 按钮切换到多窗口模式。
+验证并确保应用正常切换。
+ </li>
+
+ <li>直接在多窗口模式中启动应用，验证并确保应用正常启动。
+您可以按一下 Overview 按钮，再长按应用的标题栏，并将其拖动到屏幕上任一突出显示的区域，从而在多窗口模式中启动应用。
+
+
+ </li>
+
+ <li>拖动分界线，在分屏模式中调整应用的大小。
+ 验证并确保应用正常调整大小且未崩溃，并且必要的 UI 元素仍可见。
+
+ </li>
+
+ <li>如果您指定了应用的最小尺寸，请尝试将应用尺寸调整到低于最小值。
+验证并确保无法将应用尺寸调整到低于指定最小值。
+
+ </li>
+
+ <li>完成所有测试后，验证并确保应用性能可以接受。例如，验证并确保调整应用大小后更新 UI 没有长时间的滞后。
+
+
+ </li>
+</ul>
+
+<h4 id="test-checklist">测试检查单</h4>
+
+<p>
+ 要在多窗口模式中验证应用性能，请执行以下操作。
+除非另有说明，否则请分别在分屏和多窗口模式中执行以下操作。
+
+</p>
+
+<ul>
+ <li>进入和退出多窗口模式。
+ </li>
+
+ <li>从您的应用切换到另一个应用，验证并确保应用在非活动但可见的状态下正常运行。
+例如，如果您的应用在播放视频，则验证并确保在用户与另一个应用交互时视频仍在继续播放。
+
+
+ </li>
+
+ <li>在分屏模式中，尝试移动分界线，放大或缩小应用。
+分别在左右和上下并排显示模式中尝试这些操作。
+验证并确保应用不会崩溃，主要功能可见，且调整操作不需要过长时间。
+
+
+ </li>
+
+ <li>快速连续执行几次调整操作。验证并确保应用不会崩溃或出现内存泄漏。
+有关检查应用内存使用率的信息，请参阅<a href="{@docRoot}tools/debugging/debugging-memory.html">查看内存使用率</a>。
+
+
+ </li>
+
+ <li>在多个不同窗口配置中正常使用应用，验证并确保应用正常运行。
+验证并确保文本可读，且 UI 元素大小正常，不影响交互。
+
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">如果已禁用多窗口支持</h3>
+
+<p>
+ 如果您通过设置 <code>android:resizableActivity="false"</code> 禁用了多窗口支持，则应在运行 Android N 的设备上启动应用，并尝试将应用切换到自由形状和分屏模式。
+
+
+验证并确保执行此操作后，应用仍保持全屏模式。
+
+</p>
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/notifiers/notifications.jd
index c0bd74c..8908318 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/notifiers/notifications.jd
@@ -321,7 +321,7 @@
</p>
<p class="note">
- <strong>注：</strong>此
+ <strong>注：</strong>此
Gmail 功能需要“收件箱”扩展布局，该布局是自 Android 4.1 版本起可用的扩展通知功能的一部分。
</p>
<p>
@@ -409,7 +409,7 @@
您要启动的
{@link android.app.Activity} 是应用的正常工作流的一部分。在这种情况下，请设置 {@link android.app.PendingIntent}
以启动全新任务并为
-{@link android.app.PendingIntent}提供返回栈，这将重现应用的正常“返回”行为。 <i> </i>
+{@link android.app.PendingIntent}提供返回栈，这将重现应用的正常“返回”行为。 <i> </i>
<p>
Gmail 应用中的通知演示了这一点。点击一封电子邮件消息的通知时，您将看到消息具体内容。
触摸<b>返回</b>将使您从
@@ -533,7 +533,7 @@
TaskStackBuilder.editIntentAt()} 向堆栈中的 {@link android.content.Intent}
对象添加参数。有时，需要确保目标 {@link android.app.Activity} 在用户使用“返回”导航回它时会显示有意义的数据。
- <i> </i>
+ <i> </i>
</li>
<li>
通过调用
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/overview.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/overview.jd
index 5097c76..78f4734 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>有关创建 UI 布局的完整指南，请参阅 <a href="declaring-layout.html">XML
布局</a>。
-
+
<h2 id="UIComponents">用户界面组件</h2>
<p>您无需使用 {@link android.view.View} 和 {@link
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/settings.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/settings.jd
index f9be97b..71b185d 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/settings.jd
@@ -226,7 +226,7 @@
<dt>{@code android:key}</dt>
<dd>对于要保留数据值的首选项，必须拥有此属性。它指定系统在将此设置的值保存在
{@link
-android.content.SharedPreferences} 中时所用的唯一键（字符串）。
+android.content.SharedPreferences} 中时所用的唯一键（字符串）。
<p>不需要此属性的仅有情形是：首选项是
{@link android.preference.PreferenceCategory} 或{@link android.preference.PreferenceScreen}，或者首选项指定要调用的
{@link android.content.Intent}（使用 <a href="#Intents">{@code <intent>}</a> 元素）或要显示的 {@link android.app.Fragment}（使用 <a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -672,15 +672,15 @@
</p>
<p>例如，下面就是一个用于 Android 3.0
-及更高版本系统的首选项标头 XML 文件 ({@code res/xml/preference_headers.xml})：</p>
+及更高版本系统的首选项标头 XML 文件 ({@code res/xml/preference_headers.xml})：</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -692,18 +692,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -920,7 +920,7 @@
</activity>
</pre>
-<p>此 Intent
+<p>此 Intent
过滤器指示系统此 Activity 控制应用的数据使用情况。因此，当用户从系统的“设置”应用检查应用所使用的数据量时，可以使用“查看应用设置”按钮启动
{@link android.preference.PreferenceActivity}，这样，用户就能够优化应用使用的数据量。
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/zh-cn/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/ui-events.jd
index f9e97630..faa294d 100644
--- a/docs/html-intl/intl/zh-cn/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/ui-events.jd
@@ -181,14 +181,14 @@
</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code>：此方法允许 {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code>：此方法允许 {@link
android.app.Activity} 在分派给窗口之前截获所有触摸事件。</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code>：此方法允许 {@link
android.view.ViewGroup} 监视分派给子视图的事件。</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code>：
-对父视图调用此方法表明不应使用 <code>{@link
+对父视图调用此方法表明不应使用 <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code> 截获触摸事件。</li>
</ul>
@@ -199,7 +199,7 @@
但是，如果设备具有触摸功能且用户开始通过触摸界面与之交互，则不再需要突出显示项目或聚焦到特定视图对象上。
因此，有一种交互模式称为“触摸模式”。
-
+
</p>
<p>
对于支持触摸功能的设备，当用户触摸屏幕时，设备会立即进入触摸模式。
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/zh-cn/preview/_book.yaml b/docs/html-intl/intl/zh-cn/preview/_book.yaml
deleted file mode 100644
index 81956ed..0000000
--- a/docs/html-intl/intl/zh-cn/preview/_book.yaml
+++ /dev/null
@@ -1,342 +0,0 @@
-toc:
-- title: 计划概览
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ikhtisar Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: 支持与版本说明
- path: /preview/support.html
-
-- title: 设置 Preview
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Preview
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: 在设备上测试
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Pruebe en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: 行为变更
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: 后台优化
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: 语言和区域设置
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 概览
- section:
- - title: 多窗口支持
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: 通知
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: Data Saver
- path: /preview/features/data-saver.html
- - title: TV 录制
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: 网络安全配置
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: ICU4J 支持
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: API de ICU4J del framework de Android
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android フレームワーク API
- - name: zh-tw-lang
- value: ICU4J Android フレームワーク API
- - title: Java 8 语言功能
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 の機能
- - name: zh-tw-lang
- value: Java 8 の機能
- - title: Android for Work Updates
- path: /preview/features/afw.html
- - title: 作用域目录访问
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: 示例
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: 许可协议
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html-intl/intl/zh-cn/preview/api-overview.jd b/docs/html-intl/intl/zh-cn/preview/api-overview.jd
deleted file mode 100644
index 495692a..0000000
--- a/docs/html-intl/intl/zh-cn/preview/api-overview.jd
+++ /dev/null
@@ -1,1039 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>重要的开发者功能</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">多窗口支持</a></li>
- <li><a href="#notification_enhancements">通知</a></li>
- <li><a href="#jit_aot">JIT/AOT 编译</a></li>
- <li><a href="#quick_path_to_app_install">快速的应用安装路径</a></li>
- <li><a href="#doze_on_the_go">随时随地低电耗模式</a></li>
- <li><a href="#background_optimizations">后台优化</a></li>
- <li><a href="#data_saver">Data Saver</a></li>
- <li><a href="#vulkan">Vulkan API</a></li>
- <li><a href="#tile_api">Quick Settings Tile API</a></li>
- <li><a href="#number-blocking">号码屏蔽</a></li>
- <li><a href="#call_screening">来电过滤</a></li>
- <li><a href="#multi-locale_languages">区域设置和语言</a></li>
- <li><a href="#emoji">新增的表情符号</a></li>
- <li><a href="#icu4">Android 中的 ICU4J API</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Android TV 录制</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">无障碍功能</a></li>
- <li><a href="#direct_boot">直接启动</a></li>
- <li><a href="#key_attestation">密钥认证</a></li>
- <li><a href="#network_security_config">网络安全性配置</a></li>
- <li><a href="#default_trusted_ca">默认受信任的 CA</a></li>
- <li><a href="#apk_signature_v2">APK Signature Scheme v2</a></li>
- <li><a href="#scoped_directory_access">作用域目录访问</a></li>
- <li><a href="#keyboard_shortcuts_helper">键盘快捷键辅助工具</a></li>
- <li><a href="#sustained_performance_api">持续性能 API</a></li>
- <li><a href="#vr">VR 支持</a></li>
- <li><a href="#print_svc">打印服务增强</a></li>
- <li><a href="#virtual_files">虚拟文件</a></li>
- <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N 仍处于活动的开发状态，但现在您可以将其作为 N Developer Preview 的一部分进行试用。
-以下部分重点介绍面向开发者的一些新功能。
- </p>
-
-<p>
- 请务必查阅<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>以了解平台变更可能影响您的应用的领域，看看开发者指南，了解有关关键功能的更多信息，并下载 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>以获取新 API 的详细信息。
-
-
-
-</p>
-
-<h2 id="multi-window_support">多窗口支持</h2>
-
-
-<p>在 Android N 中，我们为该平台引入了一个新的而且非常需要的多任务处理功能 — 多窗口支持。
- </p>
-
- <p>现在，用户可以一次在屏幕上打开两个应用。 </p>
- <ul>
- <li>在运行 Android N 的手机和平板电脑上，用户可以并排运行两个应用，或者处于分屏模式时一个应用位于另一个应用之上。
-
-用户可以通过拖动两个应用之间的分隔线来调整应用。
- </li>
-
-<li>在 Android TV 设备上，应用可以将自身置于<a href="{@docRoot}preview/features/picture-in-picture.html">画中画模式</a>，从而让它们可以在用户浏览或与其他应用交互时继续显示内容。
-
-</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>图 1. </strong>在分屏模式下运行的应用。
-</p>
-
- </div>
-
-<p>多窗口支持为您提供新的吸引用户方式，特别是在平板电脑和其他更大屏幕的设备上。
-您甚至可以在您的应用中启用拖放，从而使用户可以方便地将内容拖放到您的应用或从其中拖出内容—这是一个非常好的增强用户体验的方式。
-
- </p>
-
-<p>向您的应用添加多窗口支持并配置多窗口显示的处理方式非常简单。
-例如，您可以指定您的 Activity 允许的最小尺寸，从而防止用户将 Activity 调整到该尺寸以下。
-
-您还可以为应用禁用多窗口显示，这可确保系统将仅以全屏模式显示应用。
-</p>
-
-<p>
- 如需了解详细信息，请参阅<a href="{@docRoot}preview/features/multi-window.html">多窗口支持</a>开发者文档。
-
-</p>
-
-<h2 id="notification_enhancements">通知增强功能</h2>
-
-<p>在 Android N 中，我们重新设计了通知，使其更易于使用并且速度更快。
-部分变更包括：</p>
-
-<ul>
- <li>
- <strong>模板更新</strong>：我们正在更新通知模板，新强调了英雄形象和化身。
-开发者将能够充分利用新模板，只需进行少量的代码调整。
-
- </li>
-
- <li>
- <strong>消息样式自定义</strong>：您可以自定义更多与您的使用 <code>MessageStyle</code> 类的通知相关的用户界面标签。
-
-您可以配置消息、会话标题和内容视图。
-
- </li>
-
- <li>
- <strong>捆绑通知</strong>：系统可以将消息组合在一起（例如，按消息主题）并显示组。
-用户可以适当地进行 Dismiss 或 Archive 等操作。
-如果您已实现 Android Wear 的通知，那么您已经很熟悉此模型。
-
-
- </li>
-
- <li>
- <strong>直接回复</strong>：对于实时通信应用，Android 系统支持内联回复，以便用户可以直接在通知界面中快速回复短信。
-
-
- </li>
-
- <li>
- <strong>自定义视图</strong>：两个新的 API 让您在通知中使用自定义视图时可以充分利用系统装饰元素，如通知标题和操作。
-
-
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>图 2. </strong>绑定的通知和直接回复。
-</p>
-
-<p>如需了解如何实现新功能的信息，请参阅<a href="{@docRoot}preview/features/notification-updates.html">通知</a>指南。
-
-</p>
-
-
-
-<h2 id="jit_aot">个人资料指导的 JIT/AOT 编译</h2>
-
-<p>在 Android N 中，我们添加了 Just in Time (JIT) 编译器，对 ART 进行代码分析，让它可以在应用运行时持续提升 Android 应用的性能。
-
-JIT 编译器对 Android 运行组件当前的 Ahead of Time (AOT) 编译器进行了补充，有助于提升运行时性能，节省存储空间，加快应用更新和系统更新速度。
-
-</p>
-
-<p>个人资料指导的编译让 Android 运行组件能够根据应用的实际使用以及设备上的情况管理每个应用的 AOT/JIT 编译。
-例如，Android 运行组件维护每个应用的热方法的个人资料，并且可以预编译和缓存这些方法以实现最佳性能。
-
-对于应用的其他部分，在实际使用之前不会进行编译。
-</p>
-
-<p>除提升应用的关键部分的性能外，个人资料指导的编译还有助于减少整个 RAM 占用，包括关联的二进制文件。
-
-此功能对于低内存设备非常尤其重要。</p>
-
-<p>Android 运行组件在管理个人资料指导的编译时，可最大程度降低对设备电池的影响。
-仅当设备处于空闲状态和充电时才进行编译，从而可以通过提前执行该工作节约时间和省电。
-</p>
-
-<h2 id="quick_path_to_app_install">快速的应用安装路径</h2>
-
-<p>Android 运行组件的 JIT 编译器最实际的好处之一是应用安装和系统更新的速度。
-即使在 Android 6.0 中需要几分钟进行优化和安装的大型应用，现在只需几秒钟就可以完成安装。
-
-系统更新也变得更快，因为省去了优化步骤。 </p>
-
-<h2 id="doze_on_the_go">随时随地低电耗模式...</h2>
-
-<p>Android 6.0 推出了低电耗模式，即设备处于空闲状态时，通过推迟应用的 CPU 和网络活动以实现省电目的的系统模式，例如，设备放在桌上或抽屉里时。
-
- </p>
-
-<p>现在，在 Android N 中，低电耗模式又前进了一步，随时随地可以省电。只要屏幕关闭了一段时间，且设备未插入电源，低电耗模式就会对应用使用熟悉的 CPU 和网络限制。这意味着用户即使将设备放入口袋里也可以省电。
-
-
-
-</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>图 3. </strong>低电耗模式现在应用限制以延长电池寿命，即使设备未处于静止状态。
-
-</p>
-
-
-<p>屏幕关闭片刻后，设备在使用电池时，低电耗模式将限制网络访问，同时延迟作业和同步。
-在短暂的维护时间范围后，其允许应用访问网络，并执行延迟的作业/同步。
-
-打开屏幕或将设备插入电源会使设备退出低电耗模式。
-</p>
-
-<p>当设备再次处于静止状态时，屏幕关闭且使用电池一段时间，低电耗模式针对 {@link
-android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} 警报和 GPS/Wi-Fi 扫描应用完整 CPU 和网络限制。
-
-</p>
-
-<p>无论设备是否处于运动状态，将应用调整到低电耗模式的最佳做法均相同，因此，如果您已更新应用以妥善处理低电耗模式，则一切就绪。
-
-如果不是，请立即开始<a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">将应用调整到低电耗模式</a>。
-</p>
-
-<h2 id="background_optimizations">Project Svelte：后台优化</h2>
-
-<p>Project Svelte 在持续改善，以最大程度减少生态系统中一系列 Android 设备中系统和应用使用的 RAM。
-在 Android N 中，Project Svelte 注重优化在后台中运行应用的方式。
- </p>
-
-<p>后台处理是大多数应用的一个重要部分。处理得当，可让您实现非常棒的用户体验 — 即时、快速和情境感知。如果处理不得当，后台处理会毫无必要地消耗 RAM（和电池），同时影响其他应用的系统性能。
-
-
- </p>
-
-<p>自 Android 5.0 发布以来，{@link android.app.job.JobScheduler} 已成为执行后台工作的首选方式，其工作方式有利于用户。
-
-应用可以在安排作业的同时允许系统基于内存、电源和连接情况进行优化。
-JobScheduler 可实现控制和简洁性，我们想要所有应用都使用它。
- </p>
-
-<p>
- 另一个非常好的选择是 <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GCMNetworkManager</code></a>（Google Play 服务的一部分），其在旧版 Android 中提供类似的作业安排和兼容性。
-
-
-</p>
-
-<p>我们在继续扩展 <code>JobScheduler</code> 和
-<code>GCMNetworkManager</code>，以符合多个用例 — 例如，在 Android N 中，现在，您可以基于内容提供程序中的更改安排后台工作。
-
-同时，我们开始弃用一些较旧的模式，这些模式会降低系统性能，特别是低内存设备的系统性能。
-
-</p>
-
-<p>在 Android N 中，我们删除了三个常用隐式广播 —
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}、{@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 和 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} — 因为这些广播可能会一次唤醒多个应用的后台进程，同时会耗尽内存和电池。
-如果您的应用收到这些广播，请充分利用 N Developer Preview 以迁移到 <code>JobScheduler</code> 和相关的 API。
-
- </p>
-
-<p>
- 如需了解详情，请查看<a href="{@docRoot}preview/features/background-optimization.html">后台优化</a>文档。
-
-</p>
-
-
-<h2 id="data_saver">Data Saver</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>图 4. </strong> 设置中的 Data Saver
-</p>
- </div>
-
-<p>在移动设备的整个生命周期，蜂窝数据计划的成本通常会超出设备本身的成本。
-对于许多用户而言，蜂窝数据是他们想要节省的昂贵资源。
- </p>
-
-<p>Android N 推出了 Data Saver 模式，这是一项新的系统服务，有助于减少应用使用的蜂窝数据，无论是在漫游，账单周期即将结束，还是使用少量的预付费数据包。
-
-Data Saver 让用户可以控制应用使用蜂窝数据的方式，同时让开发者打开 Data Saver 时可以提供更多有效的服务。
-
- </p>
-
-<p>用户在 <strong>Settings</strong> 中启用 Data Saver 且设备位于按流量计费的网络上时，系统屏蔽后台流量消耗，同时指示应用在前台尽可能使用较少的流量 — 例如，通过限制用于流媒体服务的比特率、降低图片质量、延迟最佳的预缓冲等方法来实现。
-
-
-
-用户可以将特定应用加入白名单以允许后台按流量的流量消耗，即使在打开 Data Saver 时也是如此。
-</p>
-
-<p>Android N 扩展了 {@link android.net.ConnectivityManager}，以便为应用<a href="{@docRoot}preview/features/data-saver.html#status">检索用户的 Data Saver 首选项</a>并<a href="{@docRoot}preview/features/data-saver.html#monitor-changes">监控首选项变更</a>提供一种方式。
-
-
-所有应用均应检查用户是否已启用 Data Saver 并努力限制前台和后台流量消耗。
-</p>
-
-
-<h2 id="vulkan">Vulkan API</h2>
-
-<p>
- Android N 将一项新的 3D 渲染 API <a href="http://www.khronos.org/vulkan" class="external-link">Vulkan™</a> 集成到平台中。就像 <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™ ES</a> 一样，Vulkan 是 3D 图形和渲染的一项开放标准，由 Khronos Group 维护。
-
-
-
-</p>
-
-<p>
- Vulkan 是完全从零开始设计，以最小化驱动器中的 CPU 开销，并能让您的应用更直接地控制 GPU 操作。
-Vulkan 还允许多个线程同时执行工作，如命令缓冲区构建，以获得更好的并行化。
-
-
-</p>
-
-<p>
- Vulkan 开发工具和库都已卷入 Android NDK。它们包括：
-
-</p>
-
-<ul>
- <li>头
- </li>
-
- <li>验证层（调试库）
- </li>
-
- <li>SPIR-V 着色程序编译器
- </li>
-
- <li>SPIR-V 运行时着色器编译库
- </li>
-</ul>
-
-<p>
- Vulkan 仅适用于已启用 Vulkan 硬件的设备上的应用，如 Nexus 5X、Nexus 6P 和 Nexus Player。
-我们正在与合作伙伴密切合作，以尽快使 Vulkan 能面向更多的设备。
-
-</p>
-
-<p>
- 如需要了解更多信息，请参阅 <a href="{@docRoot}ndk/guides/graphics/index.html">API 文档</a>。
-</p>
-
-<h2 id="tile_api">Quick Settings Tile API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>图 5.</strong> 通知栏中的快速设置图块。
-</p>
-
-
- </div><p>“快速设置”通常用于直接从通知栏显示关键设置和操作，非常简单。
-在 Android N 中，我们已扩展“快速设置”的范围，使其更加有用更方便。
- </p>
-
-<p>我们为额外的“快速设置”图块添加了更多空间，用户可以通过向左或向右滑动跨分页的显示区域访问它们。
-我们还让用户可以控制显示哪些“快速设置”图块以及显示的位置 — 用户可以通过拖放图块来添加或移动图块。
-
- </p>
-
-<p>对于开发者，Android N 还添加了一个新的 API，从而让您可以定义自己的“快速设置”图块，使用户可以轻松访问您应用中的关键控件和操作。
-</p>
-
-<p>
- 对于急需或频繁使用的控件和操作，保留“快速设置”图块，且不应将其用作启动应用的快捷方式。
-
-
-</p>
-
-<p>
- 定义图块后，您可以将它们显示给用户，用户可通过拖放将图块添加到“快速设置”。
-
-</p>
-
-<p>
- 如需创建应用图块的更多信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>中的文件 <code>android.service.quicksettings.Tile</code>。
-
-</p>
-
-
-
-<h2 id="number-blocking">号码屏蔽</h2>
-
-<p>Android N 现在支持在平台中进行号码屏蔽，提供框架 API，让服务提供商可以维护屏蔽的号码列表。
-默认短信应用、默认手机应用和提供商应用可以对屏蔽的号码列表进行读取和写入操作。
-
-其他应用则无法访问此列表。</p>
-
-<p>通过使号码屏蔽成为平台的标准功能，Android 为应用提供一致的方式来支持广泛的设备上的号码屏蔽。
-
-应用可以利用的其他优势包括：</p>
-
-<ul>
- <li> 还会屏蔽已屏蔽的来电号码发出的短信
- <li> 通过 Backup & Restore（备份和还原）功能可以跨重置和设备保留屏蔽的号码
-
- <li> 多个应用可以使用相同的屏蔽号码列表
-</ul>
-
-<p>此外，通过 Android 的运营商应用集成表示运营商可以读取设备上屏蔽的号码列表，并为用户执行服务端屏蔽，以阻止不需要的来电和短信通过任何介质（如 VOIP 端点或转接电话）到达用户。
-
-
-</p>
-
-<p>
- 如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>中的 <code>android.provider.BlockedNumberContract</code>。
-
-
-</p>
-
-<h2 id="call_screening">来电过滤</h2>
-
-<p>
- Android N 允许默认的手机应用过滤来电。手机应用执行此操作的方式是实现新的 <code>CallScreeningService</code>，该方法允许手机应用基于来电的 {@link android.telecom.Call.Details Call.Details} 执行大量操作，例如：
-
-
-
-</p>
-
-<ul>
- <li> 拒绝来电
- <li> 不允许来电到达通话记录
- <li> 不向用户显示来电通知
-</ul>
-
-<p>
- 如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>中的 <code>android.telecom.CallScreeningService</code>。
-
-
-</p>
-
-
-<h2 id="multi-locale_languages">多区域设置支持、多语言</h2>
-
-
-<p>Android N 现在允许用户在设置中选择<strong>多个区域设置</strong>，以更好地支持双语用例。
-应用可以使用新的 API 获取用户选择的区域设置，然后为多区域设置用户提供更成熟的用户体验 — 如以多个语言显示搜索结果，并且不会以用户了解的语言翻译网页。
-
-
-
-</p>
-
-<p>除多区域设置支持外，Android N 还扩展了用户可用的语言范围。
-它针对常用语言提供超过 25 种的变体，如英语、西班牙语、法语和阿拉伯语。
-它还针对 100 多种新语言添加了部分支持。
-</p>
-
-<p>应用可以通过调用 <code>LocaleList.GetDefault()</code> 获取用户设置的区域设置列表。
-为支持扩展的区域设置数量，Android N 正在改变其解析资源的方式。
-请务必使用新的资源解析逻辑测试和验证您的应用是否能如期运行。
-</p>
-
-<p>如需有关新资源解析行为和应遵循的最佳做法的更多信息，请参阅<a href="{@docRoot}preview/features/multilingual-support.html">多语言支持</a>。
-</p>
-
-
-<h2 id="emoji">新增的表情符号</h2>
-
-<p>
- Android N 引入更多表情符号和表情符号相关功能，包括肤色表情符号和支持变量选择符。
-
-如果您的应用支持表情符号，请遵循以下准则，以便能充分利用这些表情符号相关功能优势。
-
-</p>
-
-<ul>
- <li>
- <strong>在插入之前，检查设备是否包含表情符号。</strong>
- 若要检查系统字体中有哪些表情符号，使用 {@link android.graphics.Paint#hasGlyph(String)} 方法。
-
- </li>
- <li>
- <strong>检查表情符号是否支持变量选择符。</strong>
- 变量选择符使您能够呈现一些彩色或黑白的表情符号。
-
- 在移动设备上，应用应呈现彩色的表情符号，而不是黑白的。但是，如果您的应用显示嵌入在文本中的表情符号，那应使用黑白变量。
-
- 若要确定表情符号是否有变量，使用变量选择符。
- 如需有关支持变量的字符的完整清单，请参阅<a class="external-link" href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">变量的 Unicode 文档</a>中的 <em>表情符号变量序列</em>部分。
-
-
-
- </li>
- <li>
- <strong>检查表情符号是否支持肤色。</strong>Android N 允许用户按照他们的喜好修改表情符号呈现的肤色。
-键盘应用应为有多个肤色的表情符号提供可视化的指示，并应允许用户选择他们喜欢的肤色。
-
-若要确定哪些系统表情符号有肤色修改器，使用 {@link android.graphics.Paint#hasGlyph(String)} 方法。
-
-您可以通过读取 <a class="external-link" href="http://unicode.org/emoji/charts/full-emoji-list.html">Unicode 文档</a>来确定哪些表情符号使用肤色。
-
-
- </li>
-</ul>
-
-
-<h2 id="icu4">Android 中的 ICU4J API</h2>
-
-<p>
- Android N 目前在 Android 框架（位于 <code>android.icu</code> 软件包下）中提供 <a href="http://site.icu-project.org/">ICU4J</a> API 的子集。
-迁移很简单，主要是需要从 <code>com.java.icu</code> 命名空间更改为 <code>android.icu</code>。
-
-如果您已在您的应用中使用 ICU4J 捆绑包，切换到 Android 框架中提供的 <code>android.icu</code> API 可以大量节省 APK 大小。
-
-
-</p>
-
-<p>
- 如果要了解有关 Android ICU4J API 的更多信息，请参阅 <a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J 支持</a>。
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>Android N 添加了框架接口和对 OpenGL ES 3.2 的平台支持，包括：</p>
-
-<ul>
- <li> 来自 <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
-Android 扩展包</a></a> (AEP) 的所有扩展（<code>EXT_texture_sRGB_decode</code> 除外）。
- <li> 针对 HDR 的浮点帧缓冲和延迟着色。
- <li> BaseVertex 绘图调用可实现更好的批处理和流媒体服务。
- <li> 强大的缓冲区访问控制可减少 WebGL 开销。
-</ul>
-
-<p>Android N 上适用于 OpenGL ES 3.2 的框架 API 与 <code>GLES32</code> 类一起提供。
-使用 OpenGL ES 3.2 时，请务必通过 <code><uses-feature></code> 标记和 <code>android:glEsVersion</code> 属性在您的清单中声明要求。
-
- </p>
-
-<p>如需了解有关使用 OpenGL ES 的信息，包括如何在运行时检查设备支持的 OpenGL ES 版本，请参阅 <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API 指南</a>。
-</p>
-
-
-<h2 id="android_tv_recording">Android TV 录制</h2>
-
-<p>Android N 通过新的录制 API 添加了从 Android TV 输入服务录制和播放内容的功能。
-构建在现有时移 API 之上，TV 输入服务可以控制能够录制的渠道数据、保存录制的会话的方式，同时可通过录制的内容管理用户交互。
-
- </p>
-
-<p>如需了解详细信息，请参阅 <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV 录制 API</a>。</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work 针对运行 Android N 的设备添加了许多新功能和 API。部分重要内容如下— 有关变更的完整列表，请参阅 <a href="{@docRoot}preview/features/afw.html">Android for Work 更新</a>。
-
-</p>
-
-<h3 id="work_profile_security_challenge">工作资料安全性挑战 </h3>
-
-<p>
- 面向 N SDK 的个人资料所有者可以为在工作资料中运行的应用指定单独的安全性挑战。
-
-当用户尝试打开任何工作应用时将显示工作挑战。
-成功完成安全性挑战可解锁工作资料并将其解密（如果需要）。
-对于个人资料所有者，<code>ACTION_SET_NEW_PASSWORD</code> 提示用户设置工作挑战，<code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> 提示用户设置设备锁。
-
-
-
-</p>
-
-<p>
- 个人资料所有者可以使用 <code>setPasswordQuality()</code>、<code>setPasswordMinimumLength()</code> 和相关方法针对工作挑战设置不同的密码策略（例如，PIN 必须多长，或是否可以使用指纹解锁个人资料）。
-
-
-个人资料所有者还可以使用新的 <code>getParentProfileInstance()</code> 方法返回的 <code>DevicePolicyManager</code> 实例设置设备锁定。
-
-
- 此外，个人资料所有者可以使用新的 <code>setOrganizationColor()</code> 和 <code>setOrganizationName()</code> 方法针对工作挑战自定义凭据屏幕。
-
-
-</p>
-<h3 id="turn_off_work">关闭工作 </h3>
-
-<p>在有工作资料的设备上，用户可以切换工作模式。工作模式关闭时，管理的用户临时关闭，其禁用托管工作资料应用、后台同步和通知。
-
-这包括个人资料所有者应用。
-关闭工作模式时，系统显示永久状态图标，以提醒用户他们无法启动工作应用。
-启动器指示该工作应用和小组件无法访问。
- </p>
-
-<h3 id="always_on_vpn">Always on VPN </h3>
-
-<p>设备所有者和个人资料所有者可以确保工作应用始终通过指定的 VPN 连接。
-系统在设备启动后自动启动该 VPN。
-</p>
-
-<p>
- 新的 <code>DevicePolicyManager</code> 方法为 <code>setAlwaysOnVpnPackage()</code> 和 <code>getAlwaysOnVpnPackage()</code>。
-
-
-</p>
-
-<p>由于 VPN 服务无需应用交互即可由系统直接绑定，因此，VPN 客户端必须针对 Always on VPN 处理新的入口点。
-和以前一样，由与操作匹配的 Intent 过滤器将服务指示给系统。<code>android.net.VpnService</code>。
-
- </p>
-
-<p>
- 用户还可以使用 <strong>Settings>More>Vpn</strong> 在主要用户中手动设置实现 <code>VPNService</code> 方法的 Always on VPN 客户端。
-
-
-</p>
-
-<h3 id="custom_provisioning">自定义配置</h3>
-
-<p>
- 应用可以用企业颜色和徽标来自定义个人资料所有者和设备所有者配置流程。<code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> 自定义流程颜色。<code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code> 用企业徽标自定义流程。
-
-
-
-
-</p>
-
-<h2 id="accessibility_enhancements">无障碍增强功能</h2>
-
-<p>Android N 现在针对新的设备设置直接在欢迎屏幕上提供“Vision Settings”。
-这使用户可以更容易发现和配置他们设备上的无障碍功能，包括放大手势、字体大小、显示屏尺寸和 TalkBack。
-
- </p>
-
-<p>随着这些无障碍功能更为突出，在启用这些功能后，您的用户更可能试用您的应用。
-请务必提前启用这些设置测试您的应用。
-您可以通过 Settings > Accessibility 启用它们。
-</p>
-
-<p>还是在 Android N 中，无障碍服务现在可以帮助具有动作障碍的用户触摸屏幕。
-全新的 API 允许使用人脸追踪、眼球追踪、点扫描等功能构建服务，以满足这些用户的需求。
-
-</p>
-
-<p>如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中的 <code>android.accessibilityservice.GestureDescription
-</code>。</p>
-
-
-<h2 id="direct_boot">直接启动</h2>
-
-<p>直接启动可以缩短设备启动时间，让注册的应用具有有限的功能，即使在意外重启后。例如，如果当用户睡觉时加密的设备重启，那么注册的警报、消息和来电现在可以和往常一样继续通知用户。
-
-
-
-这也意味着重启后无障碍服务会立即可用。
-</p>
-
-<p>在 Android N 中，直接启动充分利用基于文件的加密，以针对系统和应用数据启用细化的加密策略。为系统和应用数据。系统针对选定的系统数据和显式注册的应用数据使用设备加密的存储。
-
-
-默认情况下，凭据加密的存储可用于所有其他系统数据、用户数据、应用及应用数据。
- </p>
-
-<p>启动时，系统在受限的模式中启动，仅访问设备加密的数据，不会对应用或数据进行常规访问。如果您有想要在此模式下运行的组件，您可以通过在清单文件中设置标记注册它们。
-
-
-重启后，系统通过广播 <code>LOCKED_BOOT_COMPLETED</code> Intent 激活注册的组件。
-
-系统确保注册的设备加密的应用数据在解锁前可用。
-所有其他数据在用户确认锁定屏幕凭据进行解密前均不可用。
- </p>
-
-如需了解详细信息，请参阅<a href="{@docRoot}preview/features/direct-boot.html">直接启动</a>。</p>
-</p>
-
-
-<h2 id="key_attestation">密钥认证</h2>
-
-<p>使用硬件支持的密钥库，可更安全地在 Android 设备上创建、存储和使用加密密钥。
-它们可保护密钥免受 Linux 内核、潜在的 Android 漏洞的攻击，也可防止从已取得根权限的设备提取密钥。
-
-</p>
-
-<p>为了让硬件支持的密钥库使用起来更简单和更安全，Android N 引入了密钥认证。
-应用和关闭的设备可使用密钥认证以坚决地确定 RSA 或 EC 密钥对是否受硬件支持、密钥对的属性如何，以及其使用和有效性有何限制。
-
-
- </p>
-
-<p>应用和关闭的设备服务可以通过 X.509 认证证书（必须由有效的认证密钥签署）请求有关密钥对的信息。
-
-认证密钥是一个 ECDSA 签署密钥，其在出厂时被注入设备的硬件支持的密钥库。因此，有效的认证密钥签署的认证证书可确认硬件支持的密钥库是否存在，以及该密钥库中密钥对的详细信息。
-
-
-
-</p>
-
-<p>为确保设备使用安全的官方 Android 出厂映像，密钥认证要求设备 <a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">bootloader</a> 向<a class="external-link" href="https://source.android.com/security/trusty/index.html">可信执行环境 (TEE)</a> 提供以下信息：
-
-
-</p>
-
-<ul>
-<li>设备上安装的操作系统版本和补丁级别</li>
-<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">验证的启动</a>公钥和锁定状态。</li>
- </ul>
-
-<p>如需了解有关硬件支持的密钥库功能的详细信息，请参阅<a href="https://source.android.com/security/keystore/" class="external-link">硬件支持的密钥库</a>指南。
-</p>
-
-<p>除密钥认证外，Android N 还推出了指纹绑定密钥，在指纹注册时不会撤销。
-</p>
-
-<h2 id="network_security_config">网络安全性配置</h2>
-
-<p>在 Android N 中，通过使用说明性“网络安全性配置”（而不是使用传统的易出错的编程 API（例如，X509TrustManager）），应用可以安全地自定义其安全（HTTPS、TLS）连接的行为，无需任何代码修改。
-
-
-<em></em></p>
-
- <p>支持的功能：</p>
-<ul>
-<li><b>自定义信任锚。</b>让应用可以针对安全连接自定义哪些证书颁发机构 (CA) 值得信赖。
-例如，信任特定的自签署证书或限制应用信任的公共 CA 集。
-
-</li>
-<li><b>仅调试重写。</b>让应用开发者可以安全调试其应用的安全连接，而不会增加安装基础的风险。
-
-
-</li>
-<li><b>明文流量选择退出。</b>让应用可以防止自身意外使用明文流量。
-</li>
-<li><b>证书固定。</b>这是一项高级功能，让应用可以针对安全连接限制哪些服务器密钥受信任。
-</li>
-</ul>
-
-<p>如需了解详细信息，请参阅<a href="{@docRoot}preview/features/security-config.html">网络安全性配置</a>。
-</p>
-
-<h2 id="default_trusted_ca">默认受信任的证书颁发机构</h2>
-
-<p>默认情况下，面向 Android N 的应用仅信任系统提供的证书，且不再信任用户添加的证书颁发机构 (CA)。
-如果面向 Android N 的应用希望信任用户添加的 CA，则应使用<a href="{@docRoot}preview/features/security-config.html">网络安全性配置</a>以指定信任用户 CA 的方式。
-
-
-</p>
-
-<h2 id="apk_signature_v2">APK signature scheme v2</h2>
-
-<p>
- Android N 引入一项新的应用签名方案 APK Signature Scheme v2，它能提供更快的应用安装时间和更多针对未授权 APK 文件更改的保护。
-
-在默认情况下，Android Studio 2.2 和 Android Gradle 2.2 插件会使用 APK Signature Scheme v2 和传统签名方案来签署您的应用。
-
-
-</p>
-
-<p>
- 虽然我们建议您对您的应用采用 APK Signature Scheme v2，但这项新方案并非强制性的。
-如果您的应用在使用 APK Signature Scheme v2 时不能正确构建，您可以停用这项新方案。
-禁用过程会导致 Android Studio 2.2 和 Android Gradle 2.2 插件仅使用传统签名方案来签署您的应用。
-
-若要仅用传统方案签署，打开多层 <code>build.gradle</code> 文件，然后将行 <code>v2SigningEnabled false</code> 添加到您的版本签名配置中：
-
-
-
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>注意：</strong>如果您使用 APK Signature Scheme v2 签署您的应用，并对应用进行了进一步更改，则应用的签名将无效。
-
-出于这个原因，请在使用 APK Signature Scheme v2 之前、而非之后使用 <code>zipalign</code> 等工具。
-
-</p>
-
-<p>
- 如需更多信息，请阅读介绍如何在 Android Studio 中<a href="{@docRoot}studio/publish/app-signing.html#release-mode">签署一项应用</a>以及如何使用 Android Gradle 插件来为签署应用<a href="{@docRoot}studio/build/build-variants.html#signing">配置构建文件</a>。
-
-
-
-</p>
-
-<h2 id="scoped_directory_access">作用域目录访问</h2>
-
-<p>在 Android N 中，应用可以使用新的 API 请求访问特定的<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">外部存储</a>目录，包括可移动媒体上的目录，如 SD 卡。
-
-新 API 大大简化了应用访问标准外部存储目录的方式，如 <code>Pictures</code> 目录。
-应用（如照片应用）可以使用这些 API（而不是使用 <code>READ_EXTERNAL_STORAGE</code>），其授予所有存储目录的访问权限或存储访问框架，从而让用户可以导航到目录。
-
-
-
-</p>
-
-<p>此外，新的 API 简化了用户向应用授予外部存储访问权限的步骤。
-当您使用新的 API 时，系统使用一个简单的权限 UI，其清楚地详细介绍应用正在请求访问的目录。
-
-</p>
-
-<p>如需了解详细信息，请参阅<a href="{@docRoot}preview/features/scoped-folder-access.html">作用域目录访问</a>开发者文档。
-
-</p>
-
-<h2 id="keyboard_shortcuts_helper">键盘快捷键辅助工具</h2>
-
-<p>
-在 Android N 中，用户可以按“Alt + /”触发“键盘快捷键”屏幕，它会显示的系统和对焦的应用中可用的所有快捷键。
-
-<em></em>这些是从应用菜单（如可用）中自动检索到的，但开发者可以提供自己的屏幕微调快捷键。
-
-您可以通过重写新 <code>Activity.onProvideKeyboardShortcuts()</code> 的方法来进行这项操作，如可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中所述。
-
-
-</p>
-
-<p>
-若要在您的应用程序的任何地方触发键盘快捷键辅助工具，为相关活动调用 {@code Activity.requestKeyboardShortcutsHelper()}。
-
-</p>
-
-<h2 id="sustained_performance_api">持续性能 API</h2>
-
-<p>
-长期运行的应用的性能可能会显著波动，因为系统会阻止系统芯片在设备组件达到温度限制时启动。
-
-这种波动是建立高性能长期运行应用的应用开发者的移动目标。
-
-</p>
-
-<p>
-为解决这些限制，Android N 包括了“持续性能模式”支持，帮助原始设备制造商 (OEM) 提供关于长期运行应用的设备性能能力的提示。
-
-<em></em>应用开发者可以使用这些提示来根据可预测的一致设备性能水平调整长期应用。
-
-
-</p>
-
-<p>
-应用开发者只能在 Nexus 6P 设备的 N Developer Preview 上尝试这项新的 API。
-若要使用此功能，为您希望以持续性能模式运行的窗口设置持续性能窗口标记。
-
-使用 {@code Window.setSustainedPerformanceMode()} 方法设置此举报。
-当窗口不再对焦时，系统会自动停用此模式。
-
-</p>
-
-<h2 id="vr">VR 支持</h2>
-
-<p>
-Android N 添加了新的 VR 模式的平台支持和优化，以使开发者能为用户打造高质量移动 VR 体验。
-新版针对开发者提供了大量性能增强特性，包括单一缓冲区渲染以及允许 VR 应用访问某个专属的 CPU 核心。在您的应用中，您可以享受到专为 VR 设计的平滑头部跟踪和立体声通知功能。
-
-
-最重要的是，Android N 的图形延时非常低。
-如需有关构建面向的 Android N 的 VR 应用的完整信息，请参阅 <a href="https://developers.google.com/vr/android/">面向 Android 的 Google VR SDK</a>。
-
-</p>
-
-
-<h2 id="print_svc">打印服务增强</h2>
-
-<p>
- 在 Android N 中，打印服务开发者现在可以公开关于个别打印机和打印作业的其他信息。
-
-</p>
-
-<p>
- 在列出各打印机时，打印服务现在可以通过两种方式来设置按打印机的图标：
-
-</p>
-
-<ul>
- <li>您可以通过调用 <code>PrinterInfo.Builder.setResourceIconId()</code> 设置源于资源 ID 的图标
-
- </li>
-
- <li>您可以通过调用 <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>，并针对使用 <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code> 请求图标的情况设置回调来显示源自网络的图标
-
-
-
- </li>
-</ul>
-
-<p>
- 此外，您还可以通过调用 <code>PrinterInfo.Builder.setInfoIntent()</code> 提供按打印机活动，以显示其他信息。
-
-</p>
-
-<p>
- 您可以通过分别调用 <code>android.printservice.PrintJob.setProgress()</code> 和 <code>android.printservice.PrintJob.setStatus()</code> 在打印任务通知中指示打印任务的进度和状态。
-
-
-
-</p>
-
-<p>
- 如需有关这些方法的详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a>。
-</p>
-
-<h2 id="framemetrics_api">FrameMetricsListener API</h2>
-
-<p>
-FrameMetricsListener API 允许应用监测它的 UI 渲染性能。
-API 通过公开流式传输 Pub/Sub API 来提供此能力，以传递应用当前窗口的帧计时信息。
-返回的数据相当于 <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code> 显示的数据，但不限定于在过去的 120 帧内。
-
-</p>
-
-<p>
-您可以使用 FrameMetricsListener 来衡量生产中的交互级 UI 性能，无需 USB 连接。
-API 允许在比 {@code adb shell dumpsys gfxinfo} 更高的粒度上收集数据。
-
-因为系统可以从应用中的特定交互中收集数据，因此更高的粒度变得可行；系统不需要采集关于完整应用性能的全局概要或清除任何全局状态。
-
-
-您可以使用这种能力来针对应用的真实使用案例收集性能数据和捕捉 UI 性能回归。
-
-
-</p>
-
-<p>
-若要监测一个窗口，实现 <code>FrameMetricsListener.onMetricsAvailable()</code> 回叫方法，并在窗口上注册。
-如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中的 {@code FrameMetricsListener} 类文档。
-
-
-</p>
-
-<p>
-API 提供了一个包含计时数据的 {@code FrameMetrics} 对象，其渲染子系统会在一帧长度内报告各种里程碑。支持的指标有：{@code UNKNOWN_DELAY_DURATION}、{@code INPUT_HANDLING_DURATION}、{@code ANIMATION_DURATION}、{@code LAYOUT_MEASURE_DURATION}、{@code DRAW_DURATION}、{@code SYNC_DURATION}、{@code COMMAND_ISSUE_DURATION}、{@code SWAP_BUFFERS_DURATION}、{@code TOTAL_DURATION} 和 {@code FIRST_DRAW_FRAME}。
-
-
-
-
-
-
-</p>
-
-
-<h2 id="virtual_files">虚拟文件</h2>
-
-<p>
- 在较早的 Android 版本中，您的应用可以使用存储访问框架来允许用户从他们的云存储帐户中选择文件，如 Google 云端硬盘。
-
-但是，不能表示没有直接字节码表示的文件；每个文件都必须提供一个输入流。
-
-
-</p>
-
-<p>
- Android N 在存储访问框架中增加了“虚拟文件”的概念。
-<em></em>虚拟文件功能可以让您的 {@link android.provider.DocumentsProvider} 返回可与 {@link android.content.Intent#ACTION_VIEW}Intent 使用的文件 URI，即使它们没有直接字节码表示。
-
-
-Android N 还允许您为用户文件（虚拟或其他类）提供备用格式。
-
-</p>
-
-<p>
- 为获得您的应用中的虚拟文件的 URI，首先您应创建一个 {@link android.content.Intent} 以打开文件选择器 UI。
-由于应用不能使用 {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()} 方法来直接打开一个虚拟文件，因此如果您包括了 {@link android.content.Intent#CATEGORY_OPENABLE} 类别，您的应用不会收到任何虚拟文件。
-
-
-
-
-</p>
-
-<p>
- 在用户选择之后，系统调用 {@link android.app.Activity#onActivityResult onActivityResult()} 方法。
-
- 您的应用可以检索虚拟文件的URI，并得到一个输入流，这表现在以下片段中的代码。
-
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- 如需有关访问用户文件的更多信息，请参阅 <a href="{@docRoot}guide/topics/providers/document-provider.html">存储访问框架指南</a>。
-
-
-</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/behavior-changes.jd b/docs/html-intl/intl/zh-cn/preview/behavior-changes.jd
deleted file mode 100644
index 4e3a6b5..0000000
--- a/docs/html-intl/intl/zh-cn/preview/behavior-changes.jd
+++ /dev/null
@@ -1,610 +0,0 @@
-page.title=行为变更
-page.keywords=Preview、SDK、兼容性
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>本文内容</h2>
-
-<ol>
- <li><a href="#perf">性能提升</a>
- <ol>
- <li><a href="#doze">低电耗模式</a></li>
- <li><a href="#bg-opt">后台优化</a></li>
- </ol>
- </li>
- <li><a href="#perm">权限更改</a>
- </li>
- <li><a href="#sharing-files">应用间共享文件</a></li>
- <li><a href="#accessibility">无障碍改进</a>
- <ol>
- <li><a href="#screen-zoom">屏幕缩放</a></li>
- <li><a href="#vision-settings">设置向导中的视觉设置</a></li>
- </ol>
- </li>
- <li><a href="#ndk">NDK 应用链接至平台库</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">注解保留</a></li>
- <li><a href="#other">其他重要说明</a></li>
-</ol>
-
-<h2>另请参阅</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">Android N API 概览</a>
-</li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Android N 除了提供诸多新特性和功能外，还对系统和 API 行为做出了各种变更。
-本文重点介绍您应该了解并在开发应用时加以考虑的一些重要变更。
-
-
-</p>
-
-<p>
- 如果您之前发布过 Android 应用，请注意您的应用可能受到这些平台变更的影响。
-
-</p>
-
-
-<h2 id="perf">电池和内存</h2>
-
-<p>
-Android N 包括旨在延长设备电池寿命和减少 RAM 使用的系统行为变更。
-这些变更可能会影响您的应用访问系统资源，以及您的系统通过特定隐式 Intent 与其他应用互动的方式。
-
-
-</p>
-
-<h3 id="doze">低电耗模式</h3>
-
-<p>
- Android 6.0（API 级别 23）引入了低电耗模式，当用户设备未插接电源、处于静止状态且屏幕关闭时，该模式会推迟 CPU 和网络活动，从而延长电池寿命。而 Android N 则通过在设备未插接电源且屏幕关闭状态下、但不一定要处于静止状态（例如用户外出时把手持式设备装在口袋里）时应用部分 CPU 和网络限制，进一步增强了低电耗模式。
-
-
-
-
-
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>图 1.</strong> 低电耗模式如何应用第一级系统活动限制以延长电池寿命的图示。
-
-</p>
-
-<p>
- 当设备处于充电状态且屏幕已关闭一定时间后，设备会进入低电耗模式并应用第一部分限制：
-关闭应用网络访问、推迟作业和同步。
-如果进入低电耗模式后设备处于静止状态达到一定时间，系统则会对 {@link android.os.PowerManager.WakeLock}、{@link android.app.AlarmManager} 闹铃、GPS 和 Wi-Fi 扫描应用余下的低电耗模式限制。
-
-
-无论是应用部分还是全部低电耗模式限制，系统都会唤醒设备以提供简短的维护时间窗口，在此窗口期间，应用程序可以访问网络并执行任何被推迟的作业/同步。
-
-
-
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>图 2.</strong> 低电耗模式如何在设备处于静止状态达到一定时间后应用第二级系统活动限制的图示。
-
-</p>
-
-<p>
- 请注意，激活屏幕或插接设备电源时，系统将退出低电耗模式并取消这些处理限制。
-此项新增的行为不会影响有关使您的应用适应 Android 6.0（API 级别 23）中所推出的旧版本低电耗模式的建议和最佳实践，如<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">低电耗模式和应用待机模式优化</a>中所讨论。
-
-
-
-您仍应遵循这些建议（例如使用 Google Cloud Messaging (GCM) 发送和接收消息）并开始安排更新计划以适应新增的低电耗模式行为。
-
-
-
-</p>
-
-
-<h3 id="bg-opt">Project Svelte：后台优化</h3>
-
-<p>
- Android N 删除了三项隐式广播，以帮助优化内存使用和电量消耗。
-此项变更很有必要，因为隐式广播会在后台频繁启动已注册侦听这些广播的应用。
-
-删除这些广播可以显著提升设备性能和用户体验。
-
-</p>
-
-<p>
- 移动设备会经历频繁的连接变更，例如在 Wi-Fi 和移动数据之间切换时。
-目前，可以通过在应用清单中注册一个接收器来侦听隐式 {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION} 广播，让应用能够监控这些变更。
-
-
-由于很多应用会注册接收此广播，因此单次网络切换即会导致所有应用被唤醒并同时处理此广播。
-
-
-</p>
-
-<p>
- 同理，应用可以注册接收来自其他应用（例如相机）的隐式 {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 和 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} 广播。
-当用户使用相机应用拍摄照片时，这些应用即会被唤醒以处理广播。
-
-</p>
-
-<p>
- 为缓解这些问题，Android N 应用了以下优化措施：
-
-</p>
-
-<ul>
- <li>面向 Android N 开发的应用不会收到 {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} 广播，即使它们已有清单条目来请求接受这些事件的通知。
-在前台运行的应用如果使用{@link android.content.BroadcastReceiver} 请求接收通知，则仍可以在主线程中侦听 {@code CONNECTIVITY_CHANGE}。
-
-
- </li>
-
- <li>应用无法发送或接收 {@link
-android.hardware.Camera#ACTION_NEW_PICTURE} 或 {@link
-android.hardware.Camera#ACTION_NEW_VIDEO} 广播。此项优化会影响所有应用，而不仅仅是面向 Android N 的应用。
-
- </li>
-</ul>
-
-<p>如果您的应用使用任何 Intent，您仍需要尽快移除它们的依赖关系，以正确适配 Android N 设备。
-
- Android 框架提供多个解决方案来缓解对这些隐式广播的需求。
-例如，{@link
- android.app.job.JobScheduler} API 提供了一个稳健可靠的机制来安排满足指定条件（例如连入无限流量网络）时所执行的网络操作。
-
-您甚至可以使用 {@link
- android.app.job.JobScheduler} 来适应内容提供程序变化。
-</p>
-
-<p>
- 如需了解有关 Android N 中后台优化以及如何改写应用的详细信息，请参阅<a href="{@docRoot}preview/features/background-optimization.html">后台优化</a>。
-
-
-</p>
-
-<h2 id="perm">权限更改</h2>
-
-<p>
- Android N 做了一些权限更改，这些更改可能会影响您的应用。
-</p>
-
-<h3 id="permfilesys">系统权限更改</h3>
-
-<p>
- 为了提高私有文件的安全性，面向 Android N 或更高版本的应用私有目录被限制访问 (<code>0700</code>)。
-
- 此设置可防止私有文件的元数据泄漏，如它们的大小或存在。
-此权限更改有多重副作用：
-</p>
-
-<ul>
- <li>
- 私有文件的文件权限不应再由所有者放宽，为使用 {@link android.content.Context#MODE_WORLD_READABLE} 和/或 {@link android.content.Context#MODE_WORLD_WRITEABLE} 而进行的此类尝试将触发 {@link java.lang.SecurityException}。
-
-
-
-
- <p class="note">
- <strong>注：</strong>迄今为止，这种限制尚不能完全执行。
- 应用仍可能使用原生 API 或 {@link java.io.File File} API 来修改它们的私有目录权限。
-但是，我们强烈反对放宽私有目录的权限。
-
- </p>
- </li>
- <li>
- 传递软件包网域外的 <code>file://</code> URI 可能给接收器留下无法访问的路径。
-因此，尝试传递 <code>file://</code> URI 会触发 <code>FileUriExposedException</code>。
-
-分享私有文件内容的推荐方法是使用 {@link
- android.support.v4.content.FileProvider}。
-
- </li>
- <li>
- {@link android.app.DownloadManager} 不再按文件名分享私人存储的文件。
-旧版应用在访问 {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME} 时可能出现无法访问的路径。
-面向 Android N 或更高版本的应用在尝试访问 {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} 时会触发 {@link java.lang.SecurityException}。
-
-
-
- 通过使用 {@link
- android.app.DownloadManager.Request#setDestinationInExternalFilesDir
- DownloadManager.Request.setDestinationInExternalFilesDir()} 或 {@link
- android.app.DownloadManager.Request#setDestinationInExternalPublicDir
- DownloadManager.Request.setDestinationInExternalPublicDir()} 将下载位置设置为公共位置的旧版应用仍可以访问 {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME} 中的路径，但是我们强烈反对使用这种方法。
-
-
-
-
-
-访问由 {@link android.app.DownloadManager} 公开的文件的首选方式是使用 {@link android.content.ContentResolver#openFileDescriptor
- ContentResolver.openFileDescriptor()}。
-
-
- </li>
-</ul>
-
-<h2 id="sharing-files">应用间共享文件</h2>
-
-<p>
-对于面向 Android N 的应用，Android 框架执行的 {@link android.os.StrictMode} API 政策禁止向您的应用外公开 {@code file://} URI。
-
-如果一项包含文件 URI 的 Intent 离开您的应用，应用失败，并出现 {@code FileUriExposedException} 异常。
-
-</p>
-
-<p>
-若要在应用间共享文件，您应发送一项 {@code content://} URI，并授予 URI 临时访问权限。
-进行此授权的最简单方式是使用 {@link android.support.v4.content.FileProvider} 类。
-如需有关权限和共享文件的更多信息，请参阅<a href="{@docRoot}training/secure-file-sharing/index.html">共享文件</a>。
-
-
-</p>
-
-<h2 id="accessibility">无障碍改进</h2>
-
-<p>
- 为提高平台对于视力不佳或视力受损用户的可用性，Android N 做出了一些更改。这些更改一般并不要求更改您的应用代码，不过您应仔细检查并使用您的应用测试这些功能，以评估它们对用户体验的潜在影响。
-
-
-
-
-</p>
-
-
-<h3 id="screen-zoom">屏幕缩放</h3>
-
-<p>
- Android N 支持用户设置<strong>显示尺寸</strong>，以放大或缩小屏幕上的所有元素，从而提升设备对视力不佳用户的可访问性。用户无法将屏幕缩放至低于最小屏幕宽度<a href="http://developer.android.com/guide/topics/resources/providing-resources.html">
- sw320dp</a>，该宽度是 Nexus 4 的宽度，也是常规中等大小手机的宽度。
-
-
-
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>图 3.</strong> 右侧屏幕显示的是一台运行 Android N 系统映像的设备增大显示尺寸后的效果。
-
-</p>
-
-
-<p>
- 当设备密度发生更改时，系统会以如下方式通知正在运行的应用：
-
-</p>
-
-<ul>
- <li>如果是面向 API 级别 23 或更低版本系统的应用，系统会自动终止其所有后台进程。
-这意味着如果用户切换离开此类应用，转而打开“Settings”屏幕并更改 <strong>Display size</strong> 设置，则系统会像处理内存不足的情况一样终止该应用。
-
-<em></em>
-如果应用具有任何前台进程，则系统会如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述将配置变更通知给这些进程，就像对待设备屏幕方向变更一样。
-
-
-
- </li>
-
- <li>如果是面向 Android N 的应用，则其所有进程（前台和后台）都会收到有关配置变更的通知，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述。
-
-
-
- </li>
-</ul>
-
-<p>
- 大多数应用并不需要进行任何更改即可支持此功能，不过前提是这些应用遵循 Android 最佳实践。具体要检查的事项：
-
-</p>
-
-<ul>
- <li>在屏幕宽度为 <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code> 的设备上测试您的应用，并确保其充分运行。
-
- </li>
-
- <li>当设备配置发生变更时，更新任何与密度相关的缓存信息，例如缓存位图或从网络加载的资源。当应用从暂停状态恢复运行时，检查配置变更。
-
-
-
- <p class="note">
- <strong>注：</strong>如果您要缓存与配置相关的数据，则最好也包括相关元数据，例如该数据对应的屏幕尺寸或像素密度。
-
-保存这些元数据便于您在配置变更后决定是否需要刷新缓存数据。
-
-
- </p>
- </li>
-
- <li>避免用像素单位指定尺寸，因为像素不会随屏幕密度缩放。应改为使用<a href="{@docRoot}guide/practices/screens_support.html">与密度无关像素</a> (<code>dp</code>) 单位指定尺寸。
-
-
- </li>
-</ul>
-
-<h3 id="vision-settings">设置向导中的视觉设置</h3>
-
-<p>
- Android N 在“Welcome”屏幕中加入了“Vision Settings”，用户可以在新设备上设置以下无障碍功能设置：
-
- <strong>Magnification gesture</strong>、<strong>Font size</strong>、<strong>Display size</strong> 和 <strong>TalkBack</strong>。
-此项变更增强了与不同屏幕设置相关的错误的可见性。
-要评估此功能的影响，您应在启用这些设置的状态下测试应用。
-
-您可以在 <strong>Settings > Accessibility</strong> 中找到这些设置。
-
-</p>
-
-<h2 id="ndk">NDK 应用链接至平台库</h2>
-
-<p>
- Android N 做了一些命名空间更改，以阻止加载非公开 API。
- 如果您使用 NDK，则只能使用 Android 平台提供的公开 API。
-在下一个官方发布的 Android 版本上使用非公开 API 会导致应用崩溃。
-
-</p>
-
-<p>
- 为提醒您使用了非公开 API，在 Android N 设备上运行的应用会在有应用调用非公开 API 时在日志消息输出中生成一个错误。
-
- 此错误还会作为消息显示在设备屏幕上，以帮助增强您对此情况的认识。
-您应检查应用代码以删除使用非公开平台 API，并使用预览版设备或模拟器全面测试应用。
-
-
-</p>
-
-<p>
- 如果您的应用依赖平台库，则请参见 NDK 文档，了解使用公开 API 等效项替换普通私有 API 的典型修复。
-
- 您还可以链接至平台库，而无需实现此应用，如果应用使用的库是平台的一部分（例如 <code>libpng</code>），但不属于 NDK，则更可如此。
-
-此情况下，请确保您的 APK 包含您打算链接到的所有 .so 文件。
-
-</p>
-
-<p class="caution">
- <strong>注意：</strong>有些第三方库可能会链接至非公开 API。
-如果您的应用使用这些库，那么当您的应用在下一个官方发布的 Android 版本上运行时可能会出现崩溃现象。
-
-</p>
-
-<p>
- 应用不应依赖或使用不属于 NDK 的原生库，因为这些库可能会发生更改或从一个 Android 版本迁移至另一版本。
-
-例如，从 OpenSSL 切换至 BoringSSL 即属于此类更改。
- 此外，不同的设备可能提供不同级别的兼容性，因为不属于 NDK 中的平台库没有兼容性要求。
-
-如果您必须在较旧设备上访问非 NDK 库，则请依据 Android API 级别进行加载。
-
-</p>
-
-<p>
- 为帮助您诊断此类问题，下面列举了一些在您试图使用 Android N 开发应用时可能遇到的 Java 和 NDK 错误：
-
-</p>
-
-<p>Java 错误示例：</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>NDK 错误示例：</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- 以下是遇到这类错误的应用的一些典型修复：
-</p>
-
-<ul>
- <li>可以使用标准 JNI 函数来替代使用 libandroid_runtime.so 中的 getJavaVM 和 getJNIEnv：
-
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>可以使用公开 {@code alternative __system_property_get} 来替代使用 {@code libcutils.so} 中的 {@code property_get} 符号。如需这样做，请使用 {@code __system_property_get} 及以下 include 函数：
-
-
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>应使用应用本地版本来替代使用 {@code libcrypto.so} 中的 {@code SSL_ctrl} 符号。例如，您应在 {@code .so} 文件中静态链接 {@code libcyrpto.a}，或者在应用中包含您自己的来自 BoringSSL 或 OpenSSL 的动态 {@code libcrypto.so}。
-
-
-
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N 包含一些针对面向 Android for Work 的应用的变更，包括对证书安装、密码重置、二级用户管理、设备标识符访问权限的变更。如果您是要针对 Android for Work 环境开发应用，则应仔细检查这些变更并相应地修改您的应用。
-
-
-
-
-</p>
-
-<ul>
- <li>您必须先安装授权证书安装程序，然后 DPC 才能对其进行设置。
-对于面向 N SDK 的个人资料和设备所有者应用，您应在设备策略控制器 (DPC) 调用 <code>DevicePolicyManager.setCertInstallerPackage()</code> 之前安装授权证书安装程序。
-
-
-如果尚未安装此安装程序，则系统会引发 <code>IllegalArgumentException</code>。
-
-
- </li>
-
- <li>针对设备管理员的重置密码限制现在也适用于个人资料所有者。
-设备管理员无法再使用 {@code DevicePolicyManager.resetPassword()} 来清除或更改已经设置的密码。
-
-设备管理员仍可以设置密码，但只能在设备没有密码、PIN 或图案时这样做。
-
- </li>
-
- <li>即使设置了限制，设备所有者和个人资料所有者仍可以管理帐户。而且，即使具有 <code>DISALLOW_MODIFY_ACCOUNTS</code> 用户限制，设备所有者和个人资料所有者仍可调用 Account Management API。
-
-
- </li>
-
- <li>设备所有者可以更轻松地管理二级用户。当设备在设备所有者模式下运行时，系统将自动设置 <code>DISALLOW_ADD_USER</code> 限制。
-
-这样可以防止用户创建非托管二级用户。
-此外，<code>CreateUser()</code> 和 <code>createAndInitializeUser()</code> 方法已弃用，取而代之的是 <code>DevicePolicyManager.createAndManageUser()</code> 方法。
-
-
- </li>
-
- <li>设备所有者可以访问设备标识符。设备所有者可以使用
- <code>DevicePolicyManagewr.getWifiMacAddress()</code> 访问设备的 Wi-Fi MAC 地址。
-如果设备上从未启用 Wi-Fi，则此方法将返回一个 {@code null} 值。
-
- </li>
-
- <li>工作模式设置控制工作应用访问。当工作模式关闭时，系统启动器通过使工作应用显示为灰色来指示它们不可用。
-启用工作模式会再次恢复正常行为。
-
-</ul>
-
-<p>
- 如需了解有关 Android N 中针对 Android for Work 所做变更的详细信息，请参阅
- <a href="{@docRoot}preview/features/afw.html">Android for Work 更新</a>。
-</p>
-
-<h2 id="annotations">注解保留</h2>
-
-<p>
-Android N 在注解可见性被忽略时修复错误。这种问题将启用本不应被允许的运行时访问注解。
-
-这些注解包括：
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}:仅应编译时可见。</li>
- <li>{@code VISIBILITY_SYSTEM}:运行时应可见，但仅限基本系统。
-</li>
-</ul>
-
-<p>
-如果您的应用依赖这种行为，请在注解中添加一项运行时必须可用的保留政策。
-您可通过使用 {@code @Retention(RetentionPolicy.RUNTIME)} 来如此做。
-</p>
-
-<h2 id="other">其他重要说明</h2>
-
-<ul>
-<li>如果一个应用在 Android N 上运行，但却是针对更低 API 级别开发的，那么在用户更改显示尺寸时，系统将终止此应用进程。
-应用必须能够正常处理此情景。
-否则，当用户从最近使用记录中恢复运行应用时，应用将会出现崩溃现象。
-
-
-<p>
-您应测试应用以确保不会发生此行为。要进行此测试，您可以通过 DDMS 手动终止应用，以造成相同的崩溃现象。
-
-
-
-</p>
-
-<p>
-在密度发生更改时，系统不会自动终止面向 N 及更高版本的应用；不过，这些应用仍可能对配置变更做出不良响应。
-
-</p>
-</li>
-
-<li>
-Android N 上的应用应能够正常处理配置变更，并且在后续启动时不会出现崩溃现象。您可以通过更改字体大小 (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>) 并随后从最近使用记录中恢复运行应用，来验证应用行为。
-
-
-
-</li>
-
-<li>
-由于之前的 Android 版本中的一项错误，系统未能将对主线程上的一个 TCP 套接字的写入操作举报为严格模式违反。
-Android N 修复了此错误。呈现出这种行为的应用引发 {@code android.os.NetworkOnMainThreadException}。一般情况下，我们不建议在主线程上执行网络操作，因为这些操作通常都有可能导致 ANR 和卡顿的高尾延迟。
-
-
-
-</li>
-
-<li>
-{@code Debug.startMethodTracing()} 方法族现在默认在您的共享的存储空间上的软件包特定目录中存储输出，而非 SD 卡顶级。
-
-
-这意味着应用不再需要请求 {@code WRITE_EXTERNAL_STORAGE} 使用这些 API 的权限。
-</li>
-
-<li>
-许多平台 API 现在开始检查在 {@link android.os.Binder} 事务间发送的大负载，系统现在会将 {@code TransactionTooLargeExceptions} 再次作为 {@code RuntimeExceptions} 引发，而不再只是默默记录或抑制它们。
-
-
-一个常见例子是在 {@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()} 上存储过多数据，导致 {@code ActivityThread.StopInfo} 在您的应用面向 Android N 时引发 {@code RuntimeException}。
-
-
-
-
-</li>
-
-<li>
-如果应用向 {@link android.view.View} 发布 {@link java.lang.Runnable} 任务，并且 {@link android.view.View} 未附加到窗口，系统会用 {@link android.view.View} 为 {@link java.lang.Runnable} 任务排队；在 {@link android.view.View} 附加到窗口之前，{@link java.lang.Runnable} 任务不会执行。
-
-
-
-
-
-此行为会修复以下错误：
-<ul>
- <li>如果一项应用是从并非预期窗口 UI 线程的其他线程发布到 {@link android.view.View}，则{@link java.lang.Runnable} 可能会因此运行错误的线程。
-
- </li>
- <li>如果 {@link java.lang.Runnable} 任务是从并非环路线程的其他线程发布，则应用可能会曝光 {@link java.lang.Runnable} 任务。
-</li>
-</ul>
-</li>
-
-<li>
-如果 Android N 上一项有 {@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES} 权限的应用尝试删除一个软件包，但另一项应用已经安装了这个软件包，则系统可能要求用户确认。
-
-
-在这种情况下，应用在调用 {@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()} 时的返回状态应为 {@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}。
-
-
-
-</li>
-
-</ul>
-
diff --git a/docs/html-intl/intl/zh-cn/preview/download-ota.jd b/docs/html-intl/intl/zh-cn/preview/download-ota.jd
deleted file mode 100644
index ab1408f..0000000
--- a/docs/html-intl/intl/zh-cn/preview/download-ota.jd
+++ /dev/null
@@ -1,324 +0,0 @@
-page.title=应用设备 OTA 映像
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">在下载和安装 Android Preview SDK 的组件之前，您必须同意下列条款和条件。
-
-</p>
-
- <h2 class="norule">条款和条件</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-本协议是 Android SDK Preview 许可协议（以下称为“许可协议”）。
-
-1. 简介
-
-1.1 Android SDK Preview（在本许可协议中简称为“Preview”，具体包括 Android 系统文件、封装 API 以及 Preview 库文件（若可用））依据本许可协议的条款授权您使用。本许可协议在您与 Google 之间就您对“Preview”的使用构成具有法律约束力的合约。
-
-1.2 “Android”是指以 Android 开源项目（项目网址为 http://source.android.com/，其内容会不时更新）名义提供、面向设备的 Android 软件栈。
-
-1.3 “Android 兼容”是指 (i) 符合与 Android 兼容性定义文档（可在 Android 兼容性网站 http://source.android.com/compatibility 上找到，并可能会不时更新）标准的任何 Android 实现；并 (ii) 成功通过 Android 兼容性测试套件 (CTS) 的测试。
-
-1.4“Google”是指 Google Inc.，是一家特拉华州公司，主要营业地位于：1600 Amphitheatre Parkway, Mountain View, CA 94043, United States。
-
-2. 接受许可协议
-
-2.1 要使用“Preview”，您必须先同意本许可协议。如果您不接受本许可协议，则不得使用“Preview”。
-
-2.2 点击接受并/或使用“Preview”，即表示您特此同意本许可协议的条款。
-
-2.3 如果依照美国或其他国家/地区（包括您居住或您使用“Preview”所在的国家/地区）的法律，您被禁止获取“Preview”，则您不得使用“Preview”，也不得接受本许可协议。
-
-2.4 如果您将在贵公司或组织内部使用“Preview”，则您同意代表您的雇主或其他实体接受本许可协议的约束，并且您表示并保证您拥有完全的合法授权令您的雇主或上述实体受本许可协议的约束。如果您不具备必要的授权，则不得代表您的雇主或其他实体接受本许可协议或使用“Preview”。
-
-3. Google “Preview”许可
-
-3.1 Google 依据本许可协议的条款授予您有限的、全球性、免版税、不可转让、非独占性且不可次级许可的“Preview”使用许可，其用途仅限针对 Android 的兼容实现来开发应用。
-
-3.2 您不得使用此“Preview”来开发适用于其他平台（包括 Android 的非兼容实现）的应用或开发其他 SDK。您当然可以随意开发适用于其他平台（包括 Android 的非兼容实现）的应用，前提是不使用此“Preview”来进行此类开发。
-
-3.3 您同意 Google 或第三方拥有“Preview”中存在或与其有关联的全部合法权利、所有权和利益，包括“Preview”中存在的任何知识产权。“知识产权”是指根据专利法、版权法、商业机密法、商标法享有的任何及全部权利，以及其他任何及全部专有权利。Google 保留所有未明确授予您的权利。
-
-3.4 您不得将“Preview”用于本许可协议未明确允许的任何用途。除适用第三方许可所要求的范围外，您不得：(a) 对“Preview”或“Preview”的任何部分进行复制（备份用途除外）、修改、改编、再分发、反编译、逆向工程、反汇编或创建其衍生品；或 (b) 将“Preview”的任何部分加载到移动手持终端或除个人计算机之外的任何其他硬件设备上，将“Preview”的任何部分与其他软件合并，或者发行任何融入“Preview”某一部分的软件或设备。
-
-3.5 对于依据开源软件许可授权的“Preview”组件，其使用、复制和分发仅受该开源软件许可条款的制约，不受本许可协议的约束。您同意在依照被授予的所有权利作为被许可方期间，在遵守此类开源软件许可协议方面始终保持良好的信誉，并避免进行任何可能导致终止、暂停或违反此类权利的行动。
-
-3.6 您同意 Google 所提供“Preview”的形式和性质可随时发生变更，而无需事先通知您，并且未来的“Preview”版本可能会与在之前的“Preview”版本上开发的应用不兼容。您同意 Google 可单方面决定在未事先通知您的情况下全面停止（永久性或暂时性）向您或用户提供“Preview”（或“Preview”内的任何功能）。
-
-3.7 本许可协议内没有任何条款授予您使用 Google 的任何商品名、商标、服务标志、徽标、域名或其他独特品牌特征的权利。
-
-3.8 您同意您不会移除、遮盖或篡改“Preview”上可能贴有或“Preview”内可能包含的任何专有权利声明（包括版权声明和商标声明）。
-
-4. 您对“Preview”的使用
-
-4.1 Google 同意本许可协议中的任何条款均未授予 Google 从您（或您的许可方）处获取您依照本许可协议使用“Preview”开发的任何软件应用中存在或与其相关的权利、所有权或利益，包括这些应用中存在的任何知识产权。
-
-4.2 您同意只出于 (a) 本许可协议和 (b) 相关管辖区域内任何适用法律、法规或公认惯例或准则（包括有关向美国或其他相关国家/地区出口数据或软件或从美国或其他相关国家/地区进口数据或软件的任何法律）所允许的目的而使用“Preview”和编写应用。
-
-4.3 您同意，如果您使用“Preview”开发应用，您将会保护用户的隐私权和合法权利。如果用户向您提供用户名、密码或其他登录信息或个人信息，您必须确保用户知晓这些信息将供您的应用使用，并且您必须为这些用户提供足以满足法律要求的隐私声明和保护。如果您的应用存储由用户提供的个人信息或敏感信息，其存储方式必须安全。如果用户向您提供 Google 帐户信息，您的应用只能在用户允许时出于用户所许可的有限目的使用该信息访问用户的 Google 帐户。
-
-4.4 您同意您不会利用“Preview”从事任何干扰、中断、损坏或以未经授权方式访问 Google 或任何第三方的服务器、网络或其他财产或服务的 Activity（包括应用的开发或分发）。
-
-4.5 您同意您对通过 Android 和/或 Android 应用创建、传输或显示的任何数据、内容或资源以及您的行为所导致的后果（包括 Google 可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
-
-4.6 您同意您为违反本许可协议、任何适用的第三方合约或服务条款或任何适用法律或法规下的义务以及任何上述违规行为所导致的后果（包括 Google 或任何第三方可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
-
-4.7 “Preview”正在开发中，您的测试和反馈是开发过程的重要环节。使用“Preview”，即表示您承认某些功能仍在开发实现之中，您不应期望“Preview”具备稳定版本的全部功能。您同意不使用此“Preview”公开发布或发运任何应用，因为此“Preview”在 Android SDK 正式发行之后将不再受支持。
-
-5. 您的开发者凭据
-
-5.1 您同意，对于 Google 可能向您发放或可能由您自行选择的任何开发者凭据，您有责任保持其机密性，并且您对以您的开发者凭据名义开发的所有应用负全责。
-
-6. 隐私权和信息
-
-6.1 为持续创新和改进“Preview”，Google 可能会从软件收集某些使用统计数据，包括但不限于唯一标识符、关联的 IP 地址、软件的版本号以及有关软件使用了“Preview”中哪些工具和/或服务及其使用方式的信息。在收集任何上述信息之前，“Preview”都会通知您并征求您的同意。如果您拒绝同意，我们将不会收集这些信息。
-
-6.2 我们会对收集的数据进行汇总调查，以便改进“Preview”，并会按照 Google 的隐私政策（网址为 http://www.google.com/policies/privacy/）维护数据。
-
-7. 第三方应用
-
-7.1 如果您使用“Preview”运行由第三方开发或访问由第三方提供的数据、内容或资源的应用，您同意 Google 对这些应用、数据、内容或资源不承担任何责任。您理解，您通过上述第三方应用可能访问到的所有数据、内容或资源由其提供者负全责，Google 对您因使用或访问其中任何第三方应用、数据、内容或资源而遭受的任何损失或损害不承担任何责任。
-
-7.2 您应知晓，通过此类第三方应用提供给您的数据、内容和资源可能受提供商（或代表他们的其他人员或公司）拥有的知识产权的保护。除非相关所有者明确给予许可，否则您不得修改、出租、租赁、借出、出售、分发这些数据、内容或资源（的全部或部分），或以其为基础创建衍生品。
-
-7.3 您承认您对上述第三方应用、数据、内容或资源的使用可能受到您与相关第三方之间单独订立的条款的制约。
-
-8. 使用 Google API
-
-8.1 Google API
-
-8.1.1 如果您使用任何 API 从 Google 检索数据，即表示您承认这些数据可能受到 Google 或这些数据提供方（或代表他们的其他人员或公司）拥有的知识产权的保护。您对任何上述 API 的使用可能受到附加服务条款的制约。除非相关服务条款允许，否则您不得修改、出租、租赁、借出、出售、分发这些数据（全部或部分），或以其为基础创建衍生品。
-
-8.1.2 如果您使用任何 API 从 Google 检索用户数据，即表示您承认并同意您只有在征得用户明确同意时才会检索数据，并且只能在用户允许时出于用户许可的有限目的检索数据。
-
-9. 终止许可协议
-
-9.1 本许可协议将持续有效，直至您或 Google 按以下规定终止本协议。
-
-9.2 如果您想终止本许可协议，可通过停止使用“Preview”以及任何相关开发者凭据予以终止。
-
-9.3 Google 有权在向您作出通知后，有理由或无理由地随时终止与您订立的这份许可协议。
-
-9.4 本许可协议将在下列情况下自动终止，而无需另行通知或采取其他行动，以先符合条件者为准：
-(A) Google 在您居住或使用服务所在国家/地区停止向用户提供“Preview”或“Preview”的某些部分；
-(B) Google 发行 Android SDK 的最终版本。
-
-9.5 在本许可协议终止时，本许可协议中向您授予的许可将终止，您应立即完全停止使用“Preview”，并且第 10、11、12 和 14 节的条款将无限期继续存在。
-
-10.免责声明
-
-10.1 您明确理解并同意，您使用“Preview”的风险将由您自行承担，并且“Preview”是按“原样”和“现状”提供，Google 不提供任何类型的担保。
-
-10.2 您对“Preview”的使用以及通过使用“Preview”下载或以其他方式获得的任何材料由您自行决定，风险自负，并且对于因此类使用而对您的计算机系统或其他设备造成的任何损害或数据损失由您单方面负责。在不对上文所述予以限制的条件下，您了解“Preview”并非稳定版本，可能存在将导致重大损害的错误、缺陷和安全漏洞，包括无法挽回地完全无法使用您的计算机系统或其他设备。
-
-10.3 Google 进一步明确拒绝任何类型的所有担保和条件，无论明示或暗示，包括但不限于有关适销性、特定用途适用性以及非侵权的暗示担保和条件。
-
-11. 有限责任
-
-11.1 您明确理解并同意，对于您可能遭遇的任何直接、间接、附带、特殊、继发或惩罚性损害（包括任何数据损失），Google 及其子公司和附属公司以及其许可方在任何责任理论下对您概不承担任何责任，无论 Google 或其代表是否已被告知或是否本应知晓发生任何上述损失的可能性。
-
-12. 赔偿
-
-12.1 您同意，在法律所允许的最大限度内，为 Google、其附属公司及其各自的董事、高管、员工和代理商提供辩护，使其免于因下列情况引起或产生的任何及所有索赔、诉讼、起诉或诉讼程序以及任何及所有损失、债务、损害、成本和费用（包括合理的律师费用）而承担责任或遭受损害：(a) 您对“Preview”的使用；(b) 您在“Preview”上开发的任何应用侵犯任何人的任何知识产权或诽谤任何人或侵犯其公开权或隐私权；以及 (c) 您的任何行为有悖于本许可协议
-
-13. 许可协议的更改
-
-13.1 Google 可能会在分发新版本“Preview”时对许可协议做出更改。做出这些更改后，Google 将在提供“Preview”的网站上公布新版本的许可协议。
-
-14. 一般法律条款
-
-14.1 本许可协议构成您与 Google 之间的完整法律协议，管辖您对“Preview”（不包括 Google 可能依据另外的书面协议向您提供的任何服务）的使用，并完全取代您之前与 Google 之间签订的、与“Preview”有关的任何协议。
-
-14.2 您同意，如果 Google 未行使或未强制执行本许可协议包含的任何法定权利或救济（或 Google 在任何适用法律下享有的相关利益），不得视为 Google 正式放弃这些权利，Google 仍可获得这些权利或救济。
-
-14.3 如果任何拥有管辖权的法院将本许可协议的任何条款裁定为无效，则该条款将从本许可协议中删除，而不会影响本许可协议的其余部分。本许可协议的其余条款将继续有效且可强制执行。
-
-14.4 您承认并同意，Google 集团旗下的每一家公司都将成为本许可协议的第三方受益人，并且此类其他公司将有权直接强制执行和依赖本许可协议中任何授予其利益（或支持其权利）的条款。除此之外，任何其他人员或公司均不得成为本许可协议的第三方受益人。
-
-14.5 出口限制。“Preview”受美国出口法律和法规的制约。您必须遵守适用于“Preview”的所有国内和国际出口法律和法规。这些法律包括目的地、最终用户和最终用途方面的限制。
-
-14.6 未经 Google 事先书面批准，您不得擅自转让或转移本许可协议，未经此类批准而试图进行的任何转让均为无效。未经 Google 事先书面批准，您不得委托您依据本许可协议所应承担的责任或义务。
-
-14.7 本许可协议以及您与 Google 依据本许可协议而建立的关系受加利福尼亚州法律管辖，而无论其是否与其他法律条款冲突。您与 Google 同意服从位于加利福尼亚州圣克拉拉县内法院的专属司法管辖权，以解决本许可协议引起的任何法律事务。尽管有上述规定，您同意仍允许 Google 在任何管辖区域申请禁令救济（或同等类型的紧急法律救济）。
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">我已阅读并同意上述条款和条件</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- 本页提供了无线 (OTA) 设备映像的下载链接，并描述了如何手动向设备应用一项 OTA 更新。
-此过程可用于恢复通过 Android Beta 计划接收 OTA 更新并且在安装更新后不能启动的设备。
-
-
-</p>
-
-<h2 id="install-ota">安装 OTA 映像</h2>
-
-<p></p>
-
-<p>将 OTA 软件包安装到设备：</p>
-
-<ol>
- <li>从下表中下载 OTA 设备映像。</li>
- <li>将设备重新启动为恢复模式。如需有关将 Nexus 设备设为此模式的更多信息，请参阅<a href="https://support.google.com/nexus/answer/4596836">将您的 Nexus 设备恢复为出厂设置</a>。
-
-
-
- </li>
- <li>在设备上，选择 <strong>ADB sideload</strong>。</li>
- <li>将设备连接到加载了 Android 开发环境并安装了Android 调试桥 (ADB) 工具的计算机。
-</li>
- <li>运行以下命令：
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">设备 OTA 映像</h2>
-
-<table>
- <tr>
- <th scope="col">设备</th>
- <th scope="col">下载/校验和</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-ota-npd35k-b8cfbd80.zip</a><br>
- MD5:15fe2eba9b01737374196bdf0a792fe9<br>
- SHA-1:5014b2bba77f9e1a680ac3f90729621c85a14283
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-ota-npd35k-078e6fa5.zip</a><br>
- MD5: e8b12f7721c53af9a450f7058928a5fc<br>
- SHA-1: b7a9b756f84a1d2e482ff9c16749d65f6e51425a
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-ota-npd35k-88457699.zip</a><br>
- MD5:3fac09fef759dde26e57cb80b20b6477<br>
- SHA-1:27d6caa786577d8a38b2da5bf94b33b4524a1a1c
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-ota-npd35k-51dbae76.zip</a><br>
- MD5:58312c4a5971818ef5c77a3f446003da<br>
- SHA-1: aad9005be33d3e2bab480509a6ab74c3c3b9d921
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-ota-npd35k-834f047f.zip</a><br>
- MD5:92b7d1fa252f7394e70f957c72d4aac8<br>
- SHA-1: b6c057c84d90893630e303cbb60530e20ddb8361
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-ota-npd35k-6ac91298.zip</a><br>
- MD5:1461622ad53ea842b2722fa7b49b8172<br>
- SHA-1:409c061668ab270774877d7f3eae44fa48d2b931
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-ota-npd35k-a0b2347f.zip</a><br>
- MD5: c60117f3640cc6db12386fd632289c7d<br>
- SHA-1:87349c767c69efb4172c90ce1d88cf578c3d28b3
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-ota-npd35k-09897a1d.zip</a><br>
- MD5: a55cf94f7cce0393ec6c0b35041766b7<br>
- SHA-1:6f33742290eb46f2561891f38ca2e754b4e50c6a
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/zh-cn/preview/download.jd b/docs/html-intl/intl/zh-cn/preview/download.jd
deleted file mode 100644
index 0aa115f..0000000
--- a/docs/html-intl/intl/zh-cn/preview/download.jd
+++ /dev/null
@@ -1,543 +0,0 @@
-page.title=在设备上测试
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">在下载和安装 Android Preview SDK 的组件之前，您必须同意下列条款和条件。
-
-</p>
-
- <h2 class="norule">条款和条件</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-本协议是 Android SDK Preview 许可协议（以下称为“许可协议”）。
-
-1. 简介
-
-1.1 Android SDK Preview（在本许可协议中简称为“Preview”，具体包括 Android 系统文件、封装 API 以及 Preview 库文件（若可用））依据本许可协议的条款授权您使用。本许可协议在您与 Google 之间就您对“Preview”的使用构成具有法律约束力的合约。
-
-1.2 “Android”是指以 Android 开源项目（项目网址为 http://source.android.com/，其内容会不时更新）名义提供、面向设备的 Android 软件栈。
-
-1.3 “Android 兼容”是指 (i) 符合与 Android 兼容性定义文档（可在 Android 兼容性网站 http://source.android.com/compatibility 上找到，并可能会不时更新）标准的任何 Android 实现；并 (ii) 成功通过 Android 兼容性测试套件 (CTS) 的测试。
-
-1.4“Google”是指 Google Inc.，是一家特拉华州公司，主要营业地位于：1600 Amphitheatre Parkway, Mountain View, CA 94043, United States。
-
-2. 接受许可协议
-
-2.1 要使用“Preview”，您必须先同意本许可协议。如果您不接受本许可协议，则不得使用“Preview”。
-
-2.2 点击接受并/或使用“Preview”，即表示您特此同意本许可协议的条款。
-
-2.3 如果依照美国或其他国家/地区（包括您居住或您使用“Preview”所在的国家/地区）的法律，您被禁止获取“Preview”，则您不得使用“Preview”，也不得接受本许可协议。
-
-2.4 如果您将在贵公司或组织内部使用“Preview”，则您同意代表您的雇主或其他实体接受本许可协议的约束，并且您表示并保证您拥有完全的合法授权令您的雇主或上述实体受本许可协议的约束。如果您不具备必要的授权，则不得代表您的雇主或其他实体接受本许可协议或使用“Preview”。
-
-3. Google “Preview”许可
-
-3.1 Google 依据本许可协议的条款授予您有限的、全球性、免版税、不可转让、非独占性且不可次级许可的“Preview”使用许可，其用途仅限针对 Android 的兼容实现来开发应用。
-
-3.2 您不得使用此“Preview”来开发适用于其他平台（包括 Android 的非兼容实现）的应用或开发其他 SDK。您当然可以随意开发适用于其他平台（包括 Android 的非兼容实现）的应用，前提是不使用此“Preview”来进行此类开发。
-
-3.3 您同意 Google 或第三方拥有“Preview”中存在或与其有关联的全部合法权利、所有权和利益，包括“Preview”中存在的任何知识产权。“知识产权”是指根据专利法、版权法、商业机密法、商标法享有的任何及全部权利，以及其他任何及全部专有权利。Google 保留所有未明确授予您的权利。
-
-3.4 您不得将“Preview”用于本许可协议未明确允许的任何用途。除适用第三方许可所要求的范围外，您不得：(a) 对“Preview”或“Preview”的任何部分进行复制（备份用途除外）、修改、改编、再分发、反编译、逆向工程、反汇编或创建其衍生品；或 (b) 将“Preview”的任何部分加载到移动手持终端或除个人计算机之外的任何其他硬件设备上，将“Preview”的任何部分与其他软件合并，或者发行任何融入“Preview”某一部分的软件或设备。
-
-3.5 对于依据开源软件许可授权的“Preview”组件，其使用、复制和分发仅受该开源软件许可条款的制约，不受本许可协议的约束。您同意在依照被授予的所有权利作为被许可方期间，在遵守此类开源软件许可协议方面始终保持良好的信誉，并避免进行任何可能导致终止、暂停或违反此类权利的行动。
-
-3.6 您同意 Google 所提供“Preview”的形式和性质可随时发生变更，而无需事先通知您，并且未来的“Preview”版本可能会与在之前的“Preview”版本上开发的应用不兼容。您同意 Google 可单方面决定在未事先通知您的情况下全面停止（永久性或暂时性）向您或用户提供“Preview”（或“Preview”内的任何功能）。
-
-3.7 本许可协议内没有任何条款授予您使用 Google 的任何商品名、商标、服务标志、徽标、域名或其他独特品牌特征的权利。
-
-3.8 您同意您不会移除、遮盖或篡改“Preview”上可能贴有或“Preview”内可能包含的任何专有权利声明（包括版权声明和商标声明）。
-
-4. 您对“Preview”的使用
-
-4.1 Google 同意本许可协议中的任何条款均未授予 Google 从您（或您的许可方）处获取您依照本许可协议使用“Preview”开发的任何软件应用中存在或与其相关的权利、所有权或利益，包括这些应用中存在的任何知识产权。
-
-4.2 您同意只出于 (a) 本许可协议和 (b) 相关管辖区域内任何适用法律、法规或公认惯例或准则（包括有关向美国或其他相关国家/地区出口数据或软件或从美国或其他相关国家/地区进口数据或软件的任何法律）所允许的目的而使用“Preview”和编写应用。
-
-4.3 您同意，如果您使用“Preview”开发应用，您将会保护用户的隐私权和合法权利。如果用户向您提供用户名、密码或其他登录信息或个人信息，您必须确保用户知晓这些信息将供您的应用使用，并且您必须为这些用户提供足以满足法律要求的隐私声明和保护。如果您的应用存储由用户提供的个人信息或敏感信息，其存储方式必须安全。如果用户向您提供 Google 帐户信息，您的应用只能在用户允许时出于用户所许可的有限目的使用该信息访问用户的 Google 帐户。
-
-4.4 您同意您不会利用“Preview”从事任何干扰、中断、损坏或以未经授权方式访问 Google 或任何第三方的服务器、网络或其他财产或服务的 Activity（包括应用的开发或分发）。
-
-4.5 您同意您对通过 Android 和/或 Android 应用创建、传输或显示的任何数据、内容或资源以及您的行为所导致的后果（包括 Google 可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
-
-4.6 您同意您为违反本许可协议、任何适用的第三方合约或服务条款或任何适用法律或法规下的义务以及任何上述违规行为所导致的后果（包括 Google 或任何第三方可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
-
-4.7 “Preview”正在开发中，您的测试和反馈是开发过程的重要环节。使用“Preview”，即表示您承认某些功能仍在开发实现之中，您不应期望“Preview”具备稳定版本的全部功能。您同意不使用此“Preview”公开发布或发运任何应用，因为此“Preview”在 Android SDK 正式发行之后将不再受支持。
-
-5. 您的开发者凭据
-
-5.1 您同意，对于 Google 可能向您发放或可能由您自行选择的任何开发者凭据，您有责任保持其机密性，并且您对以您的开发者凭据名义开发的所有应用负全责。
-
-6. 隐私权和信息
-
-6.1 为持续创新和改进“Preview”，Google 可能会从软件收集某些使用统计数据，包括但不限于唯一标识符、关联的 IP 地址、软件的版本号以及有关软件使用了“Preview”中哪些工具和/或服务及其使用方式的信息。在收集任何上述信息之前，“Preview”都会通知您并征求您的同意。如果您拒绝同意，我们将不会收集这些信息。
-
-6.2 我们会对收集的数据进行汇总调查，以便改进“Preview”，并会按照 Google 的隐私政策（网址为 http://www.google.com/policies/privacy/）维护数据。
-
-7. 第三方应用
-
-7.1 如果您使用“Preview”运行由第三方开发或访问由第三方提供的数据、内容或资源的应用，您同意 Google 对这些应用、数据、内容或资源不承担任何责任。您理解，您通过上述第三方应用可能访问到的所有数据、内容或资源由其提供者负全责，Google 对您因使用或访问其中任何第三方应用、数据、内容或资源而遭受的任何损失或损害不承担任何责任。
-
-7.2 您应知晓，通过此类第三方应用提供给您的数据、内容和资源可能受提供商（或代表他们的其他人员或公司）拥有的知识产权的保护。除非相关所有者明确给予许可，否则您不得修改、出租、租赁、借出、出售、分发这些数据、内容或资源（的全部或部分），或以其为基础创建衍生品。
-
-7.3 您承认您对上述第三方应用、数据、内容或资源的使用可能受到您与相关第三方之间单独订立的条款的制约。
-
-8. 使用 Google API
-
-8.1 Google API
-
-8.1.1 如果您使用任何 API 从 Google 检索数据，即表示您承认这些数据可能受到 Google 或这些数据提供方（或代表他们的其他人员或公司）拥有的知识产权的保护。您对任何上述 API 的使用可能受到附加服务条款的制约。除非相关服务条款允许，否则您不得修改、出租、租赁、借出、出售、分发这些数据（全部或部分），或以其为基础创建衍生品。
-
-8.1.2 如果您使用任何 API 从 Google 检索用户数据，即表示您承认并同意您只有在征得用户明确同意时才会检索数据，并且只能在用户允许时出于用户许可的有限目的检索数据。
-
-9. 终止许可协议
-
-9.1 本许可协议将持续有效，直至您或 Google 按以下规定终止本协议。
-
-9.2 如果您想终止本许可协议，可通过停止使用“Preview”以及任何相关开发者凭据予以终止。
-
-9.3 Google 有权在向您作出通知后，有理由或无理由地随时终止与您订立的这份许可协议。
-
-9.4 本许可协议将在下列情况下自动终止，而无需另行通知或采取其他行动，以先符合条件者为准：
-(A) Google 在您居住或使用服务所在国家/地区停止向用户提供“Preview”或“Preview”的某些部分；
-(B) Google 发行 Android SDK 的最终版本。
-
-9.5 在本许可协议终止时，本许可协议中向您授予的许可将终止，您应立即完全停止使用“Preview”，并且第 10、11、12 和 14 节的条款将无限期继续存在。
-
-10.免责声明
-
-10.1 您明确理解并同意，您使用“Preview”的风险将由您自行承担，并且“Preview”是按“原样”和“现状”提供，Google 不提供任何类型的担保。
-
-10.2 您对“Preview”的使用以及通过使用“Preview”下载或以其他方式获得的任何材料由您自行决定，风险自负，并且对于因此类使用而对您的计算机系统或其他设备造成的任何损害或数据损失由您单方面负责。在不对上文所述予以限制的条件下，您了解“Preview”并非稳定版本，可能存在将导致重大损害的错误、缺陷和安全漏洞，包括无法挽回地完全无法使用您的计算机系统或其他设备。
-
-10.3 Google 进一步明确拒绝任何类型的所有担保和条件，无论明示或暗示，包括但不限于有关适销性、特定用途适用性以及非侵权的暗示担保和条件。
-
-11. 有限责任
-
-11.1 您明确理解并同意，对于您可能遭遇的任何直接、间接、附带、特殊、继发或惩罚性损害（包括任何数据损失），Google 及其子公司和附属公司以及其许可方在任何责任理论下对您概不承担任何责任，无论 Google 或其代表是否已被告知或是否本应知晓发生任何上述损失的可能性。
-
-12. 赔偿
-
-12.1 您同意，在法律所允许的最大限度内，为 Google、其附属公司及其各自的董事、高管、员工和代理商提供辩护，使其免于因下列情况引起或产生的任何及所有索赔、诉讼、起诉或诉讼程序以及任何及所有损失、债务、损害、成本和费用（包括合理的律师费用）而承担责任或遭受损害：(a) 您对“Preview”的使用；(b) 您在“Preview”上开发的任何应用侵犯任何人的任何知识产权或诽谤任何人或侵犯其公开权或隐私权；以及 (c) 您的任何行为有悖于本许可协议
-
-13. 许可协议的更改
-
-13.1 Google 可能会在分发新版本“Preview”时对许可协议做出更改。做出这些更改后，Google 将在提供“Preview”的网站上公布新版本的许可协议。
-
-14. 一般法律条款
-
-14.1 本许可协议构成您与 Google 之间的完整法律协议，管辖您对“Preview”（不包括 Google 可能依据另外的书面协议向您提供的任何服务）的使用，并完全取代您之前与 Google 之间签订的、与“Preview”有关的任何协议。
-
-14.2 您同意，如果 Google 未行使或未强制执行本许可协议包含的任何法定权利或救济（或 Google 在任何适用法律下享有的相关利益），不得视为 Google 正式放弃这些权利，Google 仍可获得这些权利或救济。
-
-14.3 如果任何拥有管辖权的法院将本许可协议的任何条款裁定为无效，则该条款将从本许可协议中删除，而不会影响本许可协议的其余部分。本许可协议的其余条款将继续有效且可强制执行。
-
-14.4 您承认并同意，Google 集团旗下的每一家公司都将成为本许可协议的第三方受益人，并且此类其他公司将有权直接强制执行和依赖本许可协议中任何授予其利益（或支持其权利）的条款。除此之外，任何其他人员或公司均不得成为本许可协议的第三方受益人。
-
-14.5 出口限制。“Preview”受美国出口法律和法规的制约。您必须遵守适用于“Preview”的所有国内和国际出口法律和法规。这些法律包括目的地、最终用户和最终用途方面的限制。
-
-14.6 未经 Google 事先书面批准，您不得擅自转让或转移本许可协议，未经此类批准而试图进行的任何转让均为无效。未经 Google 事先书面批准，您不得委托您依据本许可协议所应承担的责任或义务。
-
-14.7 本许可协议以及您与 Google 依据本许可协议而建立的关系受加利福尼亚州法律管辖，而无论其是否与其他法律条款冲突。您与 Google 同意服从位于加利福尼亚州圣克拉拉县内法院的专属司法管辖权，以解决本许可协议引起的任何法律事务。尽管有上述规定，您同意仍允许 Google 在任何管辖区域申请禁令救济（或同等类型的紧急法律救济）。
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">我已阅读并同意上述条款和条件</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>本文内容</h2>
- <ol>
- <li><a href="#device-preview">设置硬件设备</a>
- <ol>
- <li><a href="#ota">获取无线更新</a></li>
- <li><a href="#flash">手动刷写设备</a></li>
- <li><a href="#revertDevice">卸载</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">设置模拟器</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- 要在新平台上运行和测试您的应用，您需要设置 Android N
-运行组件环境。您可以通过以下任一方式完成此设置：
-</p>
-
-<ul>
- <li>在受支持的硬件设备上安装 Android N，或者</li>
- <li>设置运行 Android N 的 Android 模拟器</li>
-</ul>
-
-<p>
- 如果您需要一个环境用于完成应用在新平台上的基本兼容性测试，则只需现有 APK 和一台硬件设备或模拟器。执行基本测试不一定需要更新整个部署环境。
-
-
-
-</p>
-
-<p>
- 如果您想针对 Android N 或为了使用新的 Android N API 而修改您的应用，则需要一个已更新为支持 Android N 的部署环境并对其进行设置。<a href="{@docRoot}preview/setup-sdk.html">设置以开发 Android N 应用</a>介绍了详细信息。
-
-
-
-</p>
-
-
-<h2 id="device-preview">设置硬件设备</h2>
-
-<p>
- N Developer Preview 提供适用于各种硬件设备（手机、平板、电视等）的系统更新，您可以使用这些设备测试自己的应用。
-
-</p>
-
-<p>
- 如果您可以访问受支持的设备，则可通过以下方式之一将其更新到 Developer Preview 里程碑构建版本：
-
-</p>
-
-<ul>
- <li><strong>通过Android Beta 计划</strong>注册设备以获取自动<a href="https://g.co/androidbeta"> OTA 系统更新</a>。
-注册后，您的设备即会收到 N Developer Preview 中所有里程碑构建版本的定期 OTA 更新。
-建议采用此方法，因为它允许您通过各种版本的 N Developer Preview 从您当前的环境实现无缝转换。
-
-</li>
- <li><strong>下载 Developer Preview 系统映像并刷写设备</strong>。系统不会为手动刷写的设备自动提供 OTA 更新，不过您可以将这些设备注册参加 Android Beta 计划以获取 OTA 更新。
-
- </li>
-</ul>
-
-<h3 id="ota">注册设备以获取自动 OTA 更新</h3>
-
-<p>
- 如果您可以访问受支持的设备（参见“下载”表格中的列表），则可以通过将该设备注册参加 <a href="https://g.co/androidbeta">Android Beta 计划</a>，获取 Android Preview 的无线更新。系统将自动下载这些更新并如正式系统更新一样更新您的设备。
-
-
-
-
-</p>
-
-<p>
- 您可以随时取消注册设备。取消注册后，设备将收到其可用的最新生产版本的 Android 系统（例如 Android 6.0 Marshmallow）的 OTA 更新。
-
-该更新要求完全重置设备，因此设备上的用户数据将被删除。
-在取消注册设备之前，务必先<strong>备份重要数据</strong>。
-
-</p>
-
-<p>
- 如需了解详细信息并注册您的设备，请参阅
-<a href="https://g.co/androidbeta">Android Beta 计划</a>网站。
-</p>
-
-<p class="note"><strong>注：</strong>
- 取消注册要求完全重置设备。务必先备份重要数据。
-
-</p>
-
-<h3 id="flash">手动刷写设备</h3>
-
-<p>
- 您可以随时下载最新的 Developer Preview 系统映像并将其手动刷入设备。
-请参阅下表下载适合您的测试设备的系统映像。
-如果您需要精确控制测试环境，或者需要经常重新安装系统，比如为了进行自动测试而重新安装，则手动刷写设备比较有用。
-
-
-</p>
-
-<!-- You can flash by ota or system image --><p>
- 在设备上安装系统映像会<strong>删除设备中的所有数据</strong>，因此务必先备份数据。
-
-</p>
-
-<p>
- 备份设备数据并下载下面与设备匹配的系统映像后，请按照 <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
-中的说明将映像刷入设备中。
-
-</p>
-
-<p>
- 手动刷入的系统映像<strong>不会自动接收更高 Developer Preview 里程碑构建版本的 OTA 更新</strong>。请确保您的环境处于最新状态，并在每次有新的 Developer Preview 里程碑构建版本发布时刷入新的系统映像。
-
-
-
-</p>
-
-<p>
- 如果在手动刷写设备后您确定需要获取 OTA 更新，则只需将设备注册参加
-<a href="https://g.co/androidbeta">Android Beta 计划</a>即可。您可以随时注册设备以通过无线下载方式接收下一次的 Preview 更新。
-
-
-</p>
-
-<table>
- <tr>
- <th scope="col">设备</th>
- <th scope="col">下载/校验和</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npd35k-factory-5ba40535.tgz</a><br>
- MD5: b6c5d79a21815ee21db41822dcf61e9f<br>
- SHA-1:5ba4053577007d15c96472206e3a79bc80ab194c
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npd35k-factory-a33bf20c.tgz</a><br>
- MD5: e1cf9c57cfb11bebe7f1f5bfbf05d7ab<br>
- SHA-1: a33bf20c719206bcf08d1edd8da6c0ff9d50f69c
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npd35k-factory-81c341d5.tgz</a><br>
- MD5: e93de7949433339856124c3729c15ebb<br>
- SHA-1:81c341d57ef2cd139569b055d5d59e9e592a7abd
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npd35k-factory-2b50e19d.tgz</a><br>
- MD5:565be87ebb2d5937e2abe1a42645864b<br>
- SHA-1:2b50e19dae2667b27f911e3c61ed64860caf43e1
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npd35k-factory-2e89ebe6.tgz</a><br>
- MD5: a8464e15c6683fe2afa378a63e205fda<br>
- SHA-1:2e89ebe67a46b2f3beb050746c13341cd11fa678
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npd35k-factory-1de74874.tgz</a><br>
- MD5: c0dbb7db671f61b2785da5001cedefcb<br>
- SHA-1:1de74874f8d83e14d642f13b5a2130fc2aa55873
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npd35k-factory-b4eed85d.tgz</a><br>
- MD5: bdcb6f770e753668b5fadff2a6678e0d<br>
- SHA-1: b4eed85de0d42c200348a8629084f78e24f72ac2
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npd35k-factory-5ab1212b.tgz</a><br>
- MD5:7d34a9774fdd6e025d485ce6cfc23c4c<br>
- SHA-1:5ab1212bc9417269d391aacf1e672fff24b4ecc5
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> （D6603 和 D6653）</td>
- <td>下载：<a class="external-link" href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- 如需了解详细信息，请参阅<a class="external-link" href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">为 Xperia Z3 尝试 Android N Developer Preview</a>。
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">从设备卸载 Preview</h3>
-
-<p>
- 如果您想从设备卸载 Preview，可以通过以下方式之一来完成：
- </p>
- <ul>
- <li><strong>获取出厂规格系统映像</strong>，然后手动将其刷入设备中。
-
- <ul>
- <li>对于 <strong>Nexus 设备和 Pixel C 设备</strong>，请参阅<a href="http://developers.google.com/android/nexus/images">适用于 Nexus 设备的出厂映像</a>页面进行下载。
-
- </li>
- <li>对于<strong>其他设备</strong>，请直接联系设备制造商，或者，如果设备是 Android Beta 计划支持的设备，则您可以将设备注册参加该计划，然后取消注册（见下文）。
-
-
-</li>
- </ul>
- </li>
- <li><strong>从 Android Beta 计划取消注册设备</strong>。如果设备已注册参加 <a href="https://g.co/androidbeta">Android Beta
- 计划</a>，则只需从计划中取消注册该设备即可，与是何种设备无关。
-
- <p>
- 取消注册后，设备将收到其可用的最新生产版本的 Android 系统（例如 Android 6.0 Marshmallow）的 OTA 更新。
-
- 该更新要求完全重置设备，因此设备上的用户数据将被删除。
-在取消注册设备之前，务必先<strong>备份重要数据</strong>。
-
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>注：</strong>
- 如果要在计划结束之前卸载 Developer Preview 系统映像，则需要完全重置设备并删除设备上的所有用户数据。
-
-
-</p>
-
-
-<h2 id="setupAVD">设置模拟器</h2>
-
-<p>要使用 Android 模拟器运行 Android N Preview，需要下载
-Android N Preview SDK，并为模拟器创建一个虚拟设备。
-</p>
-
-<p>首先，按照如下操作下载 Android N Preview SDK（如果您在<a href="{@docRoot}preview/setup-sdk.html">设置以开发 Android N 应用</a>过程中即已获得此 SDK，则可跳过这部分）：
-
-
-
-<ol>
- <li>在 Android Studio 中，打开“Settings”对话框
-（Windows/Linux：<strong>File > Settings</strong>；或 Mac：<strong>Android Studio > Preferences</strong>）。
-在左侧面板中，选择 <strong>Appearance & Behavior > System Settings > Android SDK</strong>。
-
-
-
- <li>点击 <strong>SDK Platforms</strong> 选项卡，然后选中 <strong>Android N Preview</strong> 复选框。
-</li>
-
- <li>点击 <strong>SDK Tools</strong> 选项卡，然后选中
- <strong>Android SDK Build Tools</strong>、<strong>Android SDK
- Platform-Tools</strong> 和 <strong>Android SDK Tools</strong> 复选框。
-
- </li>
-
- <li>点击 <strong>OK</strong> 并接受要安装的任何软件包的许可协议。
-
- </li>
-</ol>
-
-<p>现在，您应该有 <strong>Android SDK Built-Tools 24.0 0 rc1</strong>、<strong>Platform-Tools 24.0.0 rc1</strong> 和 <strong>SDK Tools
-25.0.9</strong>。如果您尚未将 SDK Tools 更新至 25.0.9，则将无法运行 Android N 的 x86_64 系统映像。
-
-</p>
-
-
-<p>现在，使用 Android N 系统映像创建虚拟设备：</p>
-
-<ol>
- <li>通过选择 <strong>Tools > Android >
- AVD Manager</strong> 打开 AVD Manager。</li>
- <li>点击 <strong>Create Virtual Device</strong>。</li>
- <li>选择设备，例如 Nexus 5X、Nexus 6P、Nexus 9 或 Android TV，然后点击 <strong>Next</strong>。
-</li>
- <li>选择 <strong>N</strong> 系统映像（带
-<strong>x86</strong> ABI），然后点击 <strong>Next</strong>。（适用于 Android N Preview 的 Android 模拟器当前仅支持 x86 系统映像。）
-
-
- <li>完成余下 AVD 配置并点击
- <strong>Finish</strong>。</li>
-</ol>
-
-<p>现在，您可以使用 Android N Preview AVD 启动 Android 模拟器。</p>
-
-<p>
-要获得 Android 模拟器最佳运行体验，请确保您使用的是 Android Studio 2.1 或更高版本，该版本支持 <a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0</a>，与
-Android Studio 1.5 中的模拟器相比，其运行速度快得多。
-
-</p>
-
-<p>如需了解有关创建虚拟设备的详细信息，请参阅<a href="{@docRoot}tools/devices/index.html">管理虚拟设备</a>。
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/zh-cn/preview/features/afw.jd b/docs/html-intl/intl/zh-cn/preview/features/afw.jd
deleted file mode 100644
index 04e6802..0000000
--- a/docs/html-intl/intl/zh-cn/preview/features/afw.jd
+++ /dev/null
@@ -1,556 +0,0 @@
-page.title=Android for Work 更新
-page.metaDescription=Android N 中的新 Android for Work API 和功能
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-
-
-
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>本文内容</h2>
- <ol>
- <li><a href="#qr">QR 码配置</a>
-</li>
-
- <li><a href="#sec-challenge">工作资料安全性挑战</a>
-</li>
-
- <li><a href="#suspend">停用应用访问</a>
-</li>
-
- <li><a href="#toggle-work">切换工作模式</a>
-</li>
-
- <li><a href="#always-on-vpn">Always-On VPN</a>
-</li>
-
- <li><a href="#contacts">联系人与工作资料集成</a>
-</li>
-
- <li><a href="#remote-reboot">远程重新启动</a>
-</li>
-
- <li><a href="#disable-roaming">停用数据网络漫游</a>
-</li>
-
- <li><a href="#process-logging">企业进程记录</a>
-</li>
-
- <li><a href="#bug-reports">远程错误报告</a>
-</li>
-
- <li><a href="#remove-cert">移除客户端证书</a>
-</li>
-
- <li><a href="#grant-cert-on-install">允许访问安装设备上的客户端证书</a>
-</li>
-
- <li><a href="#ui-policy">系统 UI 策略透明度</a>
-</li>
-
- <li><a href="#restrictions-mgmt">应用限制管理增强</a>
-</li>
-
- <li><a href="#location-off">位置关闭开关</a>
-</li>
-
- <li><a href="#custom-provisioning">自定义配置</a>
-</li>
-
- <li><a href="#multi-wifi-ca">多 Wi-Fi CA 证书</a>
-</li>
-
- <li><a href="#custom-lock">自定义锁屏消息</a>
-</li>
-
- <li><a href="#work-connectionservice">工作资料 ConnectionService</a>
-</li>
-
- <li><a href="#lock-wp">锁定壁纸</a>
-</li>
-
- <li><a href="#lock-user-icon">锁定壁纸</a>
-</li>
-
- <li><a href="#health-monitoring">设备运行状况监测</a>
-</li>
-
- </ol>
-
- <h2>另请参阅</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a>
-</li>
- </ul>
- </div>
-</div>
-
-<p>本文介绍了 Android N 中提供的新 Android for Work 功能。
-</p>
-
-<h2 id="qr">QR 码配置</h2>
-
-<p>
- Android for Work 现在支持使用 QR 码来配置企业负责的设备。
-安装向导现在允许您通过扫描 QR 码来配置设备。
-
-</p>
-
-<h2 id="sec-challenge">工作资料安全性挑战</h2>
-
-<p>
- 个人资料所有者可以要求用户为在工作资料中运行的应用指定安全性挑战。
-系统会在用户尝试打开任何工作应用时显示安全性挑战。
-如果用户成功完成安全性挑战，系统可解锁工作资料并将其解密（如果需要）。
-
-
-</p>
-
-<p>
- 如果个人资料所有者发送一项 {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD} Intent，系统会提示用户设置一项安全性挑战。
-个人资料所有者也可以发送一项 <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> Intent 来提示用户设置设备锁定。
-
-
-</p>
-
-<p>
- 个人资料所有者可以选择为工作挑战设置不同于其他设备密码策略的密码策略。
-例如，设备挑战响应的最小长度可以与其它密码要求的长度不同。
-
-个人资料所有者使用常见的 {@link android.app.admin.DevicePolicyManager} 方法来设置挑战策略，如 {@link
- android.app.admin.DevicePolicyManager#setPasswordQuality
- setPasswordQuality()} 和 {@link
- android.app.admin.DevicePolicyManager#setPasswordMinimumLength
- setPasswordMinimumLength()}。
-
-个人资料所有者还能通过使用由新的 <code>DevicePolicyManager.getParentProfileInstance()</code> 方法返回的 {@link android.app.admin.DevicePolicyManager} 实例来设置设备锁定，
-
-
-此外，个人资料所有者可以使用 {@link android.app.admin.DevicePolicyManager} 类的新 <code>setOrganizationColor()</code> 和 <code>setOrganizationName()</code> 方法来自定义工作挑战的凭据屏幕。
-
-
-
-</p>
-
-<p>
- 有关新方法和常量的详细信息，请参阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a> 中的 <code>DevicePolicyManager</code> 参考页面。
-
-</p>
-
-<h2 id="suspend">停用应用访问</h2>
-
-<p>
- 设备所有者和个人资料所有者可以通过调用新 <code>DevicePolicyManager.setPackagesSuspended()</code> 方法来临时暂停软件包访问。
-
-所有者可以用同样的方法来重新启用这些软件包。
-</p>
-
-<p>
- 在软件包被暂停期间，它不能启动 Activity ，到软件包的通知会被阻止，而<a href="{@docRoot}guide/components/recents.html">概览屏幕</a>中的应用条目会被隐藏。
-
- 暂停的软件包不会显示在<a href="{@docRoot}guide/components/recents.html">概览屏幕</a>中，并且它们不能显示对话（包括提醒和 Snackbar），
-也不能播放音频或振动设备。
-
-</p>
-
-<p>
- 启动器应对暂停的应用应用一个独特的 UI，以指示应用目前不可用；例如它们可以将应用图标显示为灰色。
-
-启动器可以通过调用新 <code>DevicePolicyManager.getPackageSuspended()</code> 方法来确定应用是否被暂停。
-
-</p>
-
-<h2 id="toggle-work">切换工作模式</h2>
-
-<p>
- 在双个人资料设备上，用户可以打开或关闭工作模式。在工作模式关闭时，托管个人资料会被暂时关闭。
-工作资料应用、后台同步和通知都会被停用，包括个人资料所有者应用。
-
-在工作资料被停用时，系统会显示一个持久的状态图标，以提醒用户他们将无法启动工作应用。
-
-系统启动器会指示工作应用和小工具都将无法访问。
-
-</p>
-
-<h2 id="always-on-vpn">Always-On VPN</h2>
-
-<p>
- 设备所有者和个人资料所有者可以要求工作应用始终通过指定的 VPN 连接到网络。
-如果所有者设置了此要求，设备会在启动时自动开始 VPN。
-
-</p>
-
-<p>
- 所有者可以通过调用新 <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code> 方法来要求使用 VPN。
-通过调用新 <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code> 方法来确定所有者是否设置了 VPN 要求。
-
-
-</p>
-
-<p>
- 由于 VPN 服务无需应用交互即可由系统直接绑定，因此，VPN 客户端必须针对 Always on VPN 处理新的入口点。
-像以前一样，您可以通过使用与操作 {@link android.net.VpnService android.net.VpnService} 匹配的 Intent 过滤器查找活动的服务。
-
-
-</p>
-
-<p>
- 用户可以使用 <strong>Settings > More > VPN</strong> 屏幕来手动设置实现 {@link
- android.net.VpnService} 的 Always on VPN 客户端。
-
-</p>
-
-<h2 id="contacts">联系人与工作资料集成</h2>
-
-<p>
- 个人资料所有者可以允许主用户对工作联系人进行本地搜索和目录查找。
-例如，用户可以从他们的个人拨号器或联系人应用访问个人和工作目录联系人（如果他们的个人资料管理员允许）。
-
-
-</p>
-
-<p>
- 利用联系人提供程序的开发者可以使用企业联系人 API 从主用户访问工作资料目录条目（如果策略允许）：
-
-
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- 个人资料所有者可以使用以下新方法来控制主用户的工作联系人可见性：
-
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">远程重新启动</h2>
-
-<p>
- 设备所有者可以远程重新启动设备。有些情况下，部署在公共场所的封装内设备会阻止访问电源按钮。
-如果设备需要重新启动，管理员可以使用新 <code>DevicePolicyManager.reboot()</code> 方法来进行此操作。
-
-
-</p>
-
-<h2 id="disable-roaming">停用数据网络漫游</h2>
-
-<p>
- 设备所有者可以使用新的 {@link
- android.os.UserManager} 用户限制 <code>DISALLOW_DATA_ROAMING</code> 来停用数据网络漫游。
-</p>
-
-<h2 id="process-logging">企业进程记录</h2>
-
-<p>
- 设备所有者可以通过远程跟踪设备活动来识别可疑活动 ，包括应用启动、ADB Activity 和屏幕解锁。
-进程记录不要求用户同意。
-若要检索记录，设备所有者可以使用 <code>DevicePolicyManager.setSecurityLoggingEnabled()</code> 来启用设备记录。
-
-</p>
-
-<p>
- API 更改包括：
-</p>
-
-<ul>
-
- <li>
- 新类 <code>android.app.admin.SecurityLog</code> 和它的方法
-
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">远程错误报告</h2>
-
-<p>
- 设备所有者可以远程触发和检索包含设备状态转储文件的错误报告，这允许对已知事故或受损害的设备进行取证调查。
-
-鉴于错误报告的详细性质，需要经过用户同意。
-
-</p>
-
-<p>
- Android N 包括以下 API 添加来支持此功能。如需详细信息，请参阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a>。
-
-
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">移除客户端证书</h2>
-
-<p>
- 个人资料所有者和设备所有者现在可以通过调用新方法 <code>DevicePolicyManager.removeKeyPair()</code> 来移除通过 {@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()} 安装的客户端证书。
-
-
-</p>
-
-<h2 id="grant-cert-on-install">允许访问安装设备上的客户端证书
-</h2>
-
-<p>
- 如果个人资料所有者或设备所有者授予第三方应用管理证书的权限，应用便可授予自身访问其所安装证书的权限，无需所有者进行任何干预。
-
-
-</p>
-
-<p>
- 用于管理证书的现有 API 经过扩展，现包括：
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">系统 UI 策略透明度</h2>
-
-<p>
- 影响用户体验或限制用户设置的策略是向用户完全公开的，个人资料所有者和设备所有者可以将策略归于他们公司的 IT 部门。
-
-除了“Settings”中一贯的“Action not allowed”消息之外，IT 管理员可以通过以下新 {@link android.app.admin.DevicePolicyManager} 方法在设备设置中设置组织特定的支持消息：
-
-
-
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="restrictions-mgmt">应用限制管理增强</h2>
-
-<p>
- 设备或个人资料所有者可以通过新 <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code> 方法启用另一项应用，以管理应用限制。
-
-
-提名的应用可以通过调用 <code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code> 来检查是否已被授予此权限。
-
-
-</p>
-
-<p>
- 提名管理应用限制的应用可以为该用户或个人资料内的任何软件包调用 {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
- setApplicationRestrictions()} 和 {@link
- android.app.admin.DevicePolicyManager#getApplicationRestrictions
- getApplicationRestrictions()}。
-</p>
-
-<h2 id="location-off">位置关闭开关</h2>
-
-<p>
- 用户可以停用工作应用的位置权限，同时仍可继续在个人应用中访问位置信息。
-Location Settings 中的一个单独的位置访问开关允许用户拒绝对工作资料内运行的应用的位置更新或最后位置查询。
-
-
-</p>
-
-<p>
- 顶层位置关闭开关停用对主个人资料和托管个人资料的位置访问权限。
-
-</p>
-
-<h2 id="custom-provisioning">自定义配置</h2>
-
-<p>
- 应用可以用企业颜色和徽标来自定义个人资料所有者和设备所有者配置流程。
-
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- 自定义流程颜色。
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- 用企业徽标来自定义流程。
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">多 Wi-Fi CA 证书</h2>
-
-<p>
- 个人资料所有者和设备所有者可以为一项指定的 Wi-Fi 配置设置多个 CA 证书。
-如果企业 Wi-Fi 网络针对有相同 SSID 的独立接入点设置了独立 CA，IT 管理员可以使用新 <code>setCaCertificates()</code> 方法将所有相关 CA 包括在 Wi-Fi 配置中。
-
-
-
-</p>
-
-<p>
- 添加的 API 有：
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">自定义锁屏消息</h2>
-
-<p>
- 设备所有者可以提供将显示在锁屏上的所有者信息。
- 该信息的优先级高于用户锁屏消息（如果已设置）。
-新 {@link android.app.admin.DevicePolicyManager} 方法有：
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">工作资料 ConnectionService</h2>
-
-<p>
- 个人资料所有者可以为调用后端（调用帐户）指定一项使用工作特定 {@link android.telecom.ConnectionService} 的工作拨号器应用。
-
-工作拨号器会保持仅限工作的调用记录，并仅依赖于工作联系人。
-无论拨号应用是什么，用户都将获得一致的调用内 UI 体验。
-传入到工作调用帐户的工作调用会与传入到个人调用帐户的个人调用相区别。
-
-
-</p>
-
-<p>
- 拨号器应检查新标记 <code>android.telecom.Call.PROPERTY_WORK_CALL</code>，以确定一项调用是否是工作调用。
-
-如果一项调用是工作调用，拨号器应通过添加工作徽章等方式做如此指示。
-
-</p>
-
-<h2 id="lock-wp">锁定壁纸</h2>
-
-<p>
- 新的用户限制 (<code>DISALLOW_SET_WALLPAPER</code>) 可以阻止用户更改他们的壁纸。
-设备所有者或个人资料所有者仍可以改变壁纸，但只能更改他们控制的用户或个人资料的壁纸。
-
-例如，个人资料所有者不能更改父用户的壁纸，但主个人资料的个人资料所有者或设备所有者却可以。
-
-想要更改壁纸的个人资料所有者或设备所有者应检查他们管理的用户或个人资料是否有壁纸 ({@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}) 以及他们是否被允许更改这个壁纸（通过新方法 <code>WallpaperManager.isWallpaperSettingAllowed()</code>）。
-
-
-
-</p>
-
-<h2 id="lock-user-icon">锁定用户图标</h2>
-
-<p>
- 新的用户限制 (<code>DISALLOW_SET_USER_ICON</code>) 阻止用户更改其用户图标。
-用户的设备所有者或个人资料所有者仍可以更改图标。
-但是个人资料所有者只能更改其控制的个人资料的用户图标。
-
-</p>
-
-<h2 id="health-monitoring">设备运行状况监测</h2>
-
-<p>
- 设备所有者或个人资料所有者可以使用新的 <code>HardwarePropertiesManager</code> 界面来检索有关设备运行状况的信息，如 CPU 或 GPU 温度和 CPU 使用率。
-
-新的监测界面特别适合监测在远程位置运行的无人值守设备。
-
-
-</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/features/background-optimization.jd b/docs/html-intl/intl/zh-cn/preview/features/background-optimization.jd
index 5392329..4ce58aa 100644
--- a/docs/html-intl/intl/zh-cn/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/zh-cn/preview/features/background-optimization.jd
@@ -61,7 +61,7 @@
<ul>
<li>面向 Preview 的应用不会收到 {@link
android.net.ConnectivityManager#CONNECTIVITY_ACTION} 广播，即使它们在清单中注册接收这些广播。
-运行的应用如果使用 {@link android.content.Context#registerReceiver Context.registerReceiver()} 注册
+运行的应用如果使用 {@link android.content.Context#registerReceiver Context.registerReceiver()} 注册
{@link android.content.BroadcastReceiver}，则仍可在主线程上侦听 {@code CONNECTIVITY_CHANGE}。
diff --git a/docs/html-intl/intl/zh-cn/preview/features/data-saver.jd b/docs/html-intl/intl/zh-cn/preview/features/data-saver.jd
deleted file mode 100644
index 203e8b1..0000000
--- a/docs/html-intl/intl/zh-cn/preview/features/data-saver.jd
+++ /dev/null
@@ -1,234 +0,0 @@
-page.title=Data Saver
-metaDescription=用户启用的流量消耗优化。
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- 本文内容
- </h2>
-
- <ol>
- <li>
- <a href="#status">检查 Data Saver 首选项</a>
- <ol>
- <li>
- <a href="#request-whitelist">请求白名单权限</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">监控 Data Saver 首选项变更</a>
-
- </li>
-
- <li>
- <a href="#testing">使用 Android 调试桥命令测试</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- 在智能手机的整个生命周期，蜂窝数据计划的成本通常会超出设备本身的成本。
-在 N Developer Preview 中，用户可以在整个设备上启用 Data Saver，以减少流量消耗，无论是在漫游，账单周期即将结束，还是使用少量的预付费数据包。
-
-
-</p>
-
-<p>
- 当用户在 <strong>Settings</strong> 中启用 Data Saver 且设备位于按流量计费的网络上时，系统屏蔽后台流量消耗，同时指示应用在前台尽可能使用较少的数据。
-
-用户可以将特定应用加入白名单以允许后台按流量计费的流量消耗，即使在打开 Data Saver 时也是如此。
-
-
-</p>
-
-<p>
- N Developer Preview 扩展{@link android.net.ConnectivityManager} API，为应用提供<a href="#status">检索用户的 Data Saver 首选项</a>和<a href="#monitor-changes">监控首选项变更的方式</a>。
-
-
-这被认为是应用检查用户是否启用了 Data Saver 并努力限制前台和后台流量消耗的有效方法。
-
-
-</p>
-
-<h2 id="status">
- 检查 Data Saver 首选项
-</h2>
-
-<p>
- 在 N Developer Preview 中，应用可以使用 {@link
- android.net.ConnectivityManager} API 来确定正在应用的是哪些流量消耗限制。
-{@code getRestrictBackgroundStatus()}方法返回下列值之一：
-
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- Data Saver 已禁用。
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- 用户已为此应用禁用 Data Saver。应用应努力限制前台流量消耗，并妥善处理后台流量消耗限制。
-
-
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- 用户已启用 Data Saver，但应用在白名单中。应用应努力限制前台和后台流量消耗。
-
- </dd>
-</dl>
-
-<p>
- 这被认为是在设备连接到按流量计费的网络时限制流量消耗的有效方法，即使 Data Saver 被禁用或应用在白名单中。
-
-以下示例代码使用 {@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} 和 {@code
- ConnectivityManager.getRestrictBackgroundStatus()} 来确定应用应使用多少数据：
-
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- 请求白名单权限
-</h3>
-
-<p>
- 如果您的应用需要使用后台数据，它可以通过发送一项包含您的应用软件包名称的 URI 的 <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code> Intent 来请求白名单权限：例如 <code>package:MY_APP_ID</code>。
-
-
-
-
-</p>
-
-<p>
- 发送 Intent 和 URI 将启动 <strong>Settings</strong> 应用，还会显示您的应用的流量消耗设置。
-用户随后可以决定是否启用应用的后台数据。
-在您发送此 Intent 之前，先询问用户是否希望启用 <strong>Settings</strong> 应用，以启用后台流量消耗，这是一种有效的做法。
-
-
-
-</p>
-
-<h2 id="monitor-changes">
- 监控 Data Saver 首选项变更
-</h2>
-
-<p>
- 应用可以通过创建一条 {@link
-android.content.BroadcastReceiver} 以侦听 {@code
- ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} 以及使用 {@link android.content.Context#registerReceiver
- Context.registerReceiver()}动态注册接收器来监控 Data Saver 首选项变更。
-当应用接收到这条广播时，应通过调用 {@code
- ConnectivityManager.getRestrictBackgroundStatus()} 来<a href="#status">检查新的 Data Saver 首选项是否会影响其权限</a>。
-
-
-</p>
-
-<p class="note">
- <strong>注：</strong>系统只会向使用 {@link
- android.content.Context#registerReceiver Context.registerReceiver()} 进行动态注册的应用发送此广播。
-在其清单中注册接收此广播的应用将不会收到它们。
-
-
-</p>
-
-<h2 id="testing">
- 使用 Android 调试桥命令测试
-</h2>
-
-<a href="{@docRoot}tools/help/adb.html">Android 调试桥 (ADB)</a> 提供了多条命令，可用于检查和配置网络权限：
-
-
-
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- 生成包括当前全局后台网络限制设置、目前在白名单中的软件包 UID 以及其他已知软件包的权限的报告。
-
-
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- 显示网络政策管理器 (netpolicy) 命令的完整清单。
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- 当分别传递 <code>true</code> 或 <code>false</code> 时，启用或禁用 Data Saver 模式。
-
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- 将指定软件包 UID 加入白名单，以允许后台按流量计费的流量消耗
-。
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- 从白名单中移除指定软件包 UID，以阻止当 Data Saver 启用时后台按流量计费的流量消耗。
-
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-cn/preview/features/multi-window.jd b/docs/html-intl/intl/zh-cn/preview/features/multi-window.jd
deleted file mode 100644
index cfcdf6d..0000000
--- a/docs/html-intl/intl/zh-cn/preview/features/multi-window.jd
+++ /dev/null
@@ -1,589 +0,0 @@
-page.title=多窗口支持
-page.metaDescription=Android N 全新支持同时显示多个应用窗口。
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>本文内容</h2>
- <ol>
- <li><a href="#overview">概览</a></li>
- <li><a href="#lifecycle">多窗口生命周期</a></li>
- <li><a href="#configuring">针对多窗口模式配置应用
-</a></li>
- <li><a href="#running">在多窗口模式中运行应用</a></li>
- <li><a href="#testing">测试应用的多窗口支持</a></li>
- </ol>
- <h2>另请参阅</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">多窗口 Playground 示例应用
-</a></li>
- <li><a class="external-link" href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64">在 Android N 为多窗口做准备的五条建议</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N 添加了对同时显示多个应用窗口的支持。
-在手持设备上，两个应用可以在“分屏”模式中左右并排或上下并排显示。
-<em></em>在电视设备上，应用可以使用“画中画”模式，在用户与另一个应用交互的同时继续播放视频。
-
-<em></em>
-</p>
-
-<p>
- 如果您使用 N Preview SDK 构建应用，则可以配置应用处理多窗口显示的方法。
-例如，您可以指定 Activity 的最小允许尺寸。
-您还可以禁用应用的多窗口显示，确保系统仅以全屏模式显示应用。
-
-
-</p>
-
-<h2 id="overview">概览</h2>
-
-<p>
- Android N 允许多个应用同时共享屏幕。例如，用户可以分屏显示应用，在左边查看网页，同时在右边写邮件。
-
-用户体验取决于设备：
-
-</p>
-
-<ul>
- <li>运行 Android N 的手持设备具有分屏模式。
-在此模式中，系统以左右并排或上下并排的方式分屏显示两个应用。
-用户可以拖动两个应用之间的分界线，放大其中一个应用，同时缩小另一个。
-
- </li>
-
- <li>在运行 Android N 的 Nexus Player 上，应用能以<a href="picture-in-picture.html">画中画模式</a>显示，即在用户浏览网页或与其他应用交互的同时继续显示内容。
-
-
-
- </li>
-
- <li>较大设备的制造商可选择启用自由形状模式，在该模式中，用户可以自由调整各 Activity 的尺寸。
-若制造商启用此功能，设备将同时具有自由形状模式和分屏模式。
-
-
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>图 1.</strong> 两个应用在分屏模式中左右并排显示。
-</p>
-
-<p>
- 用户可以通过以下方式切换到多窗口模式：
-</p>
-
-<ul>
- <li>若用户打开 <a href="{@docRoot}guide/components/recents.html">Overview 屏幕</a>并长按 Activity 标题，则可以拖动该 Activity 至屏幕突出显示的区域，使 Activity 进入多窗口模式。
-
-
-
- </li>
-
- <li>若用户长按 Overview 按钮，设备上的当前 Activity 将进入多窗口模式，同时将打开 Overview 屏幕，用户可在该屏幕中选择要共享屏幕的另一个 Activity。
-
-
- </li>
-</ul>
-
-<p>
- 用户可以在两个 Activity 共享屏幕的同时在这两个 Activity 之间<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>数据
-
-（在此之前，用户只能在一个 Activity 内部拖放数据）。
-
-</p>
-
-<h2 id="lifecycle">多窗口生命周期</h2>
-
-<p>
- 多窗口模式不会更改 <a href="{@docRoot}training/basics/activity-lifecycle/index.html">Activity 生命周期</a>。
-
-</p>
-
-<p>
- 在多窗口模式中，在指定时间只有最近与用户交互过的 Activity 为活动状态。
-该 Activity 将被视为顶级 Activity。<em></em>
- 所有其他 Activity 虽然可见，但均处于暂停状态。
- 但是，这些已暂停但可见的 Activity 在系统中享有比不可见 Activity 更高的优先级。
-如果用户与其中一个暂停的 Activity 交互，该 Activity 将恢复，而之前的顶级 Activity 将暂停。
-
-
-</p>
-
-<p class="note">
- <strong>注：</strong>在多窗口模式中，用户仍可以看到处于暂停状态的应用。
-应用在暂停状态下可能仍需要继续其操作。
-例如，处于暂停模式但可见的视频播放应用应继续显示视频。
-因此，我们建议播放视频的 Activity 不要暂停其 {@link android.app.Activity#onPause onPause()} 处理程序中的视频。
-
-<em></em>
- 应暂停 {@link android.app.Activity#onStop
- onStop()} 中的视频，并恢复 {@link android.app.Activity#onStart
- onStart()} 中的视频播放。
-</p>
-
-<p>
- 如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述，用户使用多窗口模式显示应用时，系统将通知 Activity 发生配置变更。
-
-这也会发生在当用户调整应用大小，或将应用恢复到全屏模式时。
-
- 该变更与系统通知应用设备从纵向模式切换到横向模式时的 Activity 生命周期影响基本相同，但设备不仅仅是交换尺寸，而是会变更尺寸。
-
-
-如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">处理运行时变更</a>中所述，您的 Activity 可以自行处理配置变更，或允许系统销毁 Activity，并以新的尺寸重新创建该 Activity。
-
-
-
-</p>
-
-<p>
- 如果用户调整窗口大小，并在任意维度放大窗口尺寸，系统将调整 Activity 以匹配用户操作，同时根据需要发布<a href="{@docRoot}guide/topics/resources/runtime-changes.html">运行时变更</a>。
-
-如果应用在新公开区域的绘制滞后，系统将使用 {@link
- android.R.attr#windowBackground windowBackground} 属性或默认 <code>windowBackgroundFallback</code> 样式属性指定的颜色暂时填充该区域。
-
-
-</p>
-
-<h2 id="configuring">针对多窗口模式配置应用</h2>
-
-<p>
- 如果您的应用面向 Android N，您可以对应用的 Activity 是否支持多窗口显示以及显示方式进行配置。
-您可以在清单文件中设置属性，以控制大小和布局。
-
- 根 Activity 的属性设置适用于其任务栈中的所有 Activity。
-例如，如果根 Activity 已 <code>android:resizeableActivity</code> 设定为 true，则任务栈中的所有 Activity 都将可以调整大小。
-
-
-</p>
-
-<p class="note">
- <strong>注：</strong>如果您使用低于 Android N 版本的 SDK 构建多向应用，则用户在多窗口模式中使用应用时，系统将强制调整应用大小。
-
-系统将显示对话框，提醒用户应用可能会发生异常。
-系统不会调整定向应用的大小；如果用户尝试在多窗口模式下打开定向应用，应用将全屏显示。
-
-
-<em></em>
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- 在清单的 <code><activity></code> 或
- <code><application></code> 节点中设置该属性，启用或禁用多窗口显示：
-
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- 如果该属性设置为 true，Activity 将能以分屏和自由形状模式启动。
-如果此属性设置为 false，Activity 将不支持多窗口模式。
-如果该值为 false，且用户尝试在多窗口模式下启动 Activity，该 Activity 将全屏显示。
-
-
-</p>
-
-<p>
- 如果您的应用面向 Android N，但未对该属性指定值，则该属性的值默认设为 true。
-
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- 在清单文件的 <code><activity></code> 节点中设置该属性，指明 Activity 是否支持画中画显示。
-如果 <code>android:resizeableActivity</code> 为 false，将忽略该属性。
-
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">布局属性</h3>
-
-<p>
- 对于 Android N，<code><layout></code> 清单元素支持以下几种属性，这些属性影响 Activity 在多窗口模式中的行为：
-
-
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- 以自由形状模式启动时 Activity 的默认宽度。
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- 以自由形状模式启动时 Activity 的默认高度。
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- 以自由形状模式启动时 Activity 的初始位置。请参阅 {@link android.view.Gravity} 参考资料，了解合适的值设置。
-
- </dd>
-
- <dt>
- <code>android:minimalHeight</code>、<code>android:minimalWidth</code>
- </dt>
-
- <dd>
- 分屏和自由形状模式中 Activity 的最小高度和最小宽度。
-如果用户在分屏模式中移动分界线，使 Activity 尺寸低于指定的最小值，系统会将 Activity 裁剪为用户请求的尺寸。
-
-
- </dd>
-</dl>
-
-<p>
- 例如，以下节点显示了如何指定 Activity 在自由形状模式中显示时 Activity 的默认大小、位置和最小尺寸：
-
-
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalHeight="450dp"
- android:minimalWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">在多窗口模式中运行应用</h2>
-
-<p>
- Android N 添加了新功能，以支持可在多窗口模式中运行的应用。
-
-</p>
-
-<h3 id="disabled-features">多窗口模式中被禁用的功能</h3>
-
-<p>
- 在设备处于多窗口模式中时，某些功能会被禁用或忽略，因为这些功能对与其他 Activity 或应用共享设备屏幕的 Activity 而言没有意义。
-
-此类功能包括：
-
-<ul>
- <li>某些<a href="{@docRoot}training/system-ui/index.html">系统 UI</a> 自定义选项将被禁用；例如，在非全屏模式中，应用无法隐藏状态栏。
-
-
- </li>
-
- <li>系统将忽略对 <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code> 属性所作的更改。
- </li>
-</ul>
-
-<h3 id="change-notification">多窗口变更通知和查询</h3>
-
-<p>
- {@link android.app.Activity} 类中添加了以下新方法，以支持多窗口显示。
-有关各方法的详细信息，请参阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a>。
-
-
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- 调用该方法以确认 Activity 是否处于多窗口模式。
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- 调用该方法以确认 Activity 是否处于画中画模式。
-
- <p class="note">
- <strong>注：</strong>画中画模式是多窗口模式的特例。
-如果 <code>myActivity.isInPictureInPictureMode()</code> 返回 true，则 <code>myActivity.isInMultiWindowMode()</code> 也返回 true。
-
-
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- Activity 进入或退出多窗口模式时系统将调用此方法。
-在 Activity 进入多窗口模式时，系统向该方法传递 true 值，在退出多窗口模式时，则传递 false 值。
-
-
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- Activity 进入或退出画中画模式时系统将调用此方法。
-在 Activity 进入画中画模式时，系统向该方法传递 true 值，在退出画中画模式时，则传递 false 值。
-
-
- </dd>
-</dl>
-
-<p>
- 每个方法还有 {@link android.app.Fragment} 版本，例如 <code>Fragment.isInMultiWindowMode()</code>。
-
-</p>
-
-<h3 id="entering-pip">进入画中画模式</h3>
-
-<p>
- 如需在画中画模式中启动 Activity，请调用新方法 <code>Activity.enterPictureInPictureMode()</code>。
-如果设备不支持画中画模式，则此方法无效。
-如需了解详细信息，请参阅<a href="picture-in-picture.html">画中画</a>文档。
-
-</p>
-
-<h3 id="launch">在多窗口模式中启动新 Activity</h3>
-
-<p>
- 在启动新 Activity 时，用户可以提示系统如果可能，应将新 Activity 显示在当前 Activity 旁边。
-要执行此操作，可使用标志 <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>。
-
-传递此标志将请求以下行为：
-
-</p>
-
-<ul>
- <li>如果设备处于分屏模式，系统会尝试在启动系统的 Activity 旁创建新 Activity，这样两个 Activity 将共享屏幕。
-
-系统并不一定能实现此操作，但如果可以，系统将使两个 Activity 处于相邻的位置。
-
- </li>
-
- <li>如果设备不处于分屏模式，则该标志无效。
- </li>
-</ul>
-
-<p>
- 如果设备处于自由形状模式，则在启动新 Activity 时，用户可通过调用 <code>ActivityOptions.setLaunchBounds()</code> 指定新 Activity 的尺寸和屏幕位置。
-
-如果设备不处于多窗口模式，则该方法无效。
-
-</p>
-
-<p class="note">
- <strong>注：</strong>如果您在任务栈中启动 Activity，该 Activity 将替换屏幕上的 Activity，并继承其所有的多窗口属性。
-
-如果要在多窗口模式中以单独的窗口启动新 Activity，则必须在新的任务栈中启动此 Activity。
-
-</p>
-
-<h3 id="dnd">支持拖放</h3>
-
-<p>
- 用户可以在两个 Activity 共享屏幕的同时在这两个 Activity 之间<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>数据
-
-（在此之前，用户只能在一个 Activity 内部拖放数据）。
-因此，如果您的应用目前不支持拖放功能，您可以在其中添加此功能。
-
-</p>
-
-<p>
- N Preview SDK 扩展了 <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a> 软件包，以支持跨应用拖放。
-有关以下类和方法的详细信息，请参阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 参考</a>。
-
-
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- 令牌对象，负责指定对接收拖放数据的应用授予的权限。
-
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- {@link android.view.View#startDrag View.startDrag()} 的新别名。要启用跨 Activity 拖放，请传递新标志 <code>View.DRAG_FLAG_GLOBAL</code>。
-
-如需对接收拖放数据的 Activity 授予 URI 权限，可根据情况传递新标志 <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> 或 <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>。
-
-
-
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- 取消当前正在进行的拖动操作。只能由发起拖动操作的应用调用。
-
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- 替换当前正在进行的拖动操作的拖动阴影。只能由发起拖动操作的应用调用。
-
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- 请求使用 {@link android.view.DragEvent} 中包含的 {@link
- android.content.ClipData} 传递的内容 URI 的权限。
- </dd>
-</dl>
-
-<h2 id="testing">测试应用的多窗口支持</h2>
-
-<p>
- 无论您是否针对 Android N 更新应用，都应验证应用在多窗口模式下的行为，以防用户尝试在运行 Android N 的设备上以多窗口模式启动应用。
-
-
-</p>
-
-<h3 id="configuring">配置测试设备</h3>
-
-<p>
- 如果在设备上安装 Android N，则将自动支持分屏模式。
-
-</p>
-
-<h3 id="test-non-n">如果应用并非使用 N Preview SDK 构建</h3>
-
-<p>
- 如果您的应用不是使用 N Preview SDK 构建的，则用户尝试在多窗口模式中使用应用时，系统将强制调整应用大小，除非应用进行了定向声明。
-
-
-</p>
-
-<p>
- 如果您的应用没有进行定向声明，则应在运行 Android N 的设备上启动应用，并尝试将应用切换到分屏模式。
-
-验证并确保在强制调整应用大小时用户体验可接受。
-
-</p>
-
-<p>
- 如果应用进行了定向声明，则应尝试将应用切换到多窗口模式。
-验证并确保执行此操作后，应用仍保持全屏模式。
-
-</p>
-
-<h3 id="test-mw">如果支持多窗口模式</h3>
-
-<p>
- 如果您的应用是使用 N Preview SDK 构建的，且未禁用多窗口支持，则分别在分屏和自由形状模式下验证以下行为。
-
-
-</p>
-
-<ul>
- <li>在全屏模式下启动应用，然后通过长按 Overview 按钮切换到多窗口模式。
-验证并确保应用正常切换。
- </li>
-
- <li>直接在多窗口模式中启动应用，验证并确保应用正常启动。
-您可以按一下 Overview 按钮，再长按应用的标题栏，并将其拖动到屏幕上任一突出显示的区域，从而在多窗口模式中启动应用。
-
-
- </li>
-
- <li>拖动分界线，在分屏模式中调整应用的大小。
- 验证并确保应用正常调整大小且未崩溃，并且必要的 UI 元素仍可见。
-
- </li>
-
- <li>如果您指定了应用的最小尺寸，请尝试将应用尺寸调整到低于最小值。
-验证并确保无法将应用尺寸调整到低于指定最小值。
-
- </li>
-
- <li>完成所有测试后，验证并确保应用性能可以接受。例如，验证并确保调整应用大小后更新 UI 没有长时间的滞后。
-
-
- </li>
-</ul>
-
-<h4 id="test-checklist">测试检查单</h4>
-
-<p>
- 要在多窗口模式中验证应用性能，请执行以下操作。
-除非另有说明，否则请分别在分屏和多窗口模式中执行以下操作。
-
-</p>
-
-<ul>
- <li>进入和退出多窗口模式。
- </li>
-
- <li>从您的应用切换到另一个应用，验证并确保应用在非活动但可见的状态下正常运行。
-例如，如果您的应用在播放视频，则验证并确保在用户与另一个应用交互时视频仍在继续播放。
-
-
- </li>
-
- <li>在分屏模式中，尝试移动分界线，放大或缩小应用。
-分别在左右和上下并排显示模式中尝试这些操作。
-验证并确保应用不会崩溃，主要功能可见，且调整操作不需要过长时间。
-
-
- </li>
-
- <li>快速连续执行几次调整操作。验证并确保应用不会崩溃或出现内存泄漏。
-有关检查应用内存使用率的信息，请参阅<a href="{@docRoot}tools/debugging/debugging-memory.html">查看内存使用率</a>。
-
-
- </li>
-
- <li>在多个不同窗口配置中正常使用应用，验证并确保应用正常运行。
-验证并确保文本可读，且 UI 元素大小正常，不影响交互。
-
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">如果已禁用多窗口支持</h3>
-
-<p>
- 如果您通过设置 <code>android:resizableActivity="false"</code> 禁用了多窗口支持，则应在运行 Android N 的设备上启动应用，并尝试将应用切换到自由形状和分屏模式。
-
-
-验证并确保执行此操作后，应用仍保持全屏模式。
-
-</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/features/picture-in-picture.jd b/docs/html-intl/intl/zh-cn/preview/features/picture-in-picture.jd
deleted file mode 100644
index 27606a9..0000000
--- a/docs/html-intl/intl/zh-cn/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,213 +0,0 @@
-page.title=画中画
-page.keywords=Preview、SDK、画中画
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>本文内容</h2>
-<ol>
- <li><a href="#declaring">声明您的 Activity 支持画中画
-</a></li>
- <li><a href="#pip_button">将您的 Activity 切换到画中画模式</a>
-</li>
- <li><a href="#handling_ui">处理画中画模式中的 UI</a>
-</li>
- <li><a href="#continuing_playback">在画中画模式中继续视频播放
-</a></li>
- <li><a href="#single_playback">使用画中画的单次播放 Activity
-</a></li>
- <li><a href="#best">最佳做法</a></li>
-</ol>
-
-<h2>另请参阅</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">多窗口支持
-</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>在 Android N 中，Android TV 用户现在可以一边在应用中导航一边在屏幕角落的固定窗口中观看视频。
-
-画中画 (PIP) 模式允许应用在固定窗口中运行视频 Activity，同时在后台继续运行另一个 Activity。
-
-PIP 窗口让用户可以在使用应用的时候进行多任务处理，从而提高效率。
-</p>
-
-<p>您的应用可以决定何时触发 PIP 模式。以下是一些关于何时进入 PIP 模式的示例：
-</p>
-
-<ul>
-<li>当用户从视频返回浏览其他内容时，应用将自动进入 PIP 模式。
-</li>
-<li>当用户快看完一集视频时，应用将视频切换到 PIP 模式。
-主屏幕显示有关该系列视频下一集的宣传或摘要信息。
-</li>
-<li>应用将允许用户在观看视频的同时添加其他内容到队列。
-视频继续在 PIP 模式中播放，同时主屏幕显示内容选择 Activity。
-</li>
-</ul>
-
-<p>PIP 窗口为 240x135 dp，在屏幕角落的最顶层显示，由系统在四个角落中选择一个角落。
-用户可以调出 PIP 菜单，将 PIP 窗口切换为全屏，或通过按下遥控器上的<b>主页</b>按钮关闭 PIP 窗口。
-
-如果主屏幕开始播放另一个视频，PIP 窗口将自动关闭。
-
-用户还可以通过“最近使用记录”关闭 PIP 窗口。</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>图 1.</strong> 用户在主屏幕上浏览内容时屏幕角落窗口播放画中画视频。
-
-</p>
-
-<p>PIP 利用 Android N 中提供的多窗口 API 显示固定视频层叠窗口。
-如需将 PIP 添加到应用，您需要注册支持 PIP 的 Activity，然后根据需要将 Activity 切换到 PIP 模式，并确保隐藏所有 UI 元素，且 Activity 处于 PIP 模式时视频继续播放。
-
-
-</p>
-
-<h2 id="declaring">声明您的 Activity 支持画中画</h2>
-
-<p>默认情况下，系统并不自动为应用提供 PIP 支持。如果想要应用支持 PIP，请将
-<code>android:supportsPictureInPicture</code> 和
-<code>android:resizeableActivity</code> 设置为 <code>true</code>，在清单中注册视频 Activity。
-
-此外，应明确指定 Activity 处理布局配置变更，这样，在 PIP 模式过渡期间发生布局变更时，Activity 不会重新启动。
-
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>在注册 Activity 时，请记住，在 PIP 模式中，您的 Activity 在电视屏幕上的小层叠窗口中显示。
-视频播放 Activity 结合以尽量小的 UI 可以实现最佳用户体验。
-在切换到 PIP 模式后，UI 元素较小的 Activity 带来的用户体验可能较差，因为用户在 PIP 窗口中看不到 UI 元素的详细信息。
-
-
-</p>
-
-<h2 id="pip_button">将您的 Activity 切换到画中画模式</h2>
-
-在需要将 Activity 切换到 PIP 模式时，请调用
-<code>Activity.enterPictureInPictureMode()</code>。在下面的示例中，当用户选择媒体控制栏上的专用 PIP 按钮时，系统切换到 PIP 模式：
-
-</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>在媒体控制栏上添加 PIP 按钮可以方便用户在控制视频播放的同时切换到 PIP 模式。
-</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>图 1.</strong> 媒体控制栏上的画中画按钮。
-</p>
-
-<p>Android N 中包含一个新的
-<code>PlaybackControlsRow.PictureInPictureAction</code> 类，它可以定义控制栏 PIP 操作并使用 PIP 图标。
-</p>
-
-<h2 id="handling_ui">处理画中画模式中的 UI</h2>
-
-<p>在 Activity 进入 PIP 模式时，Activity 应仅显示视频播放。
-在 Activity 进入 PIP 模式前删除 UI 元素，当 Activity 再次全屏显示时恢复这些元素。重写 <code>Activity.onPictureInPictureModeChanged()</code> 或
-<code>Fragment.onPictureInPictureModeChanged()</code>，并根据需要启用或禁用 UI 元素，例如：
-
-
-</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">在画中画模式中继续视频播放
-</h2>
-
-<p>在 Activity 切换到 PIP 模式时，系统会认为 Activity 处于暂停状态，并调用 Activity 的 <code>onPause()</code> 方法。
-如果 Activity 因为 PIP 模式暂停，视频播放不应暂停，而是应继续播放。
-
-在 Activity 的
-<code>onPause()</code> 方法中检查 PIP，并对播放做相应处理，例如：
-</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>当 Activity 退出 PIP 模式并回到全屏模式时，系统会恢复 Activity 并调用 <code>onResume()</code> 方法。
-</p>
-
-<h2 id="single_playback">使用画中画的单次播放 Activity
-</h2>
-
-<p>在您的应用中，用户可以在浏览主屏幕中的内容时选择一个新的视频，视频播放 Activity 处于 PIP 模式。
-在现有播放 Activity 中全屏模式下播放新视频，而不是启用可能使用户感到困惑的新 Activity。
-
-</p>
-
-<p>若要确保视频播放请求使用的是单个 Activity 并根据需要进入或退出 PIP 模式，在您的清单中将 Activity 的 <code>android:launchMode</code> 设置为 <code>singleTask</code>：
-
-
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>在您的 Activity 中，替换 {@link android.app.Activity#onNewIntent
-Activity.onNewIntent()}，处理新视频，如果需要，停止任何现有视频播放。
-</p>
-
-<h2 id="best">最佳做法</h2>
-
-<p>PIP 用于全屏播放视频的 Activity。在 Activity 切换到 PIP 模式时，应避免显示除视频外的其他内容。根据<a href="#handling_ui">处理画中画模式中的 UI</a> 中所述，在 Activity 进入 PIP 模式时进行跟踪，并隐藏 UI 元素。
-
-
-</p>
-
-<p>由于 PIP 窗口悬浮在屏幕的角落，因此应避免在主窗口被 PIP 窗口遮挡的任何区域显示重要信息。
-
-</p>
-
-<p>当 Activity 处于 PIP 模式时，其默认不获取输入焦点。要在 PIP 模式中接收输入事件，请使用
-<code>MediaSession.setMediaButtonReceiver()</code>。
-</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/zh-cn/preview/features/scoped-folder-access.jd
deleted file mode 100644
index 4ff5f36..0000000
--- a/docs/html-intl/intl/zh-cn/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,152 +0,0 @@
-page.title=作用域目录访问
-page.keywords=Preview、SDK、作用域目录访问
-page.tags=Android N
-
-@jd:body
-
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>本文内容</h2>
- <ol>
- <li><a href="#accessing">访问外部存储目录</a></li>
- <li><a href="#removable">访问可移动介质上的目录</a></li>
- <li><a href="#best">最佳做法</a></li>
- </ol>
-</div>
-</div>
-
-<p>应用（如照片应用）通常只需要访问外部存储中的特定目录，例如 <code>Pictures</code> 目录。
-现有的外部存储访问方法未经专门设计，无法轻松地为这些类型的应用提供目标目录访问。
-
-例如：</p>
-
-<ul>
-<li>在您的清单中请求 {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-或 {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} 将允许访问外部存储上的所有公共目录，这可能导致访问的内容超出应用需要的内容。
-
-</li>
-<li>使用<a href="{@docRoot}guide/topics/providers/document-provider.html">存储访问框架</a>通常会让您的用户通过一个系统 UI 选取目录，如果应用始终访问同一个外部目录，则该操作没有任何必要。
-
-
-
-</li>
-</ul>
-
-<p>Android N 提供简化的全新 API 以访问通用外部存储目录。
- </p>
-
-<h2 id="accessing">访问外部存储目录</h2>
-
-<p>使用 <code>StorageManager</code> 类获取适当的
-<code>StorageVolume</code> 实例。然后，通过调用该实例的
-<code>StorageVolume.createAccessIntent()</code> 方法创建一个 Intent。使用此 Intent 访问外部存储目录。
-若要获取所有可用卷的列表，包括可移动介质卷，请使用
-<code>StorageManager.getVolumesList()</code>。
-</p>
-
-<p>如果您有关于特定文件的信息，使用 <code>StorageManager.getStorageVolume(File)</code> 来获得包含该文件的 <code>StorageVolume</code>。
-
-调用在 <code>StorageVolume</code> 上的 <code>createAccessIntent()</code> 以访问文件的外部存储目录。
-
-</p>
-
-<p>
-在二级卷（例如外部 SD 卡）上，当调用 <code>StorageVolume.createAccessIntent()</code> 以请求访问整个卷，而不是特定目录时，传入“null”。如果您向主要卷传入“null”，或者如果您传入无效的目录名，<code>StorageVolume.createAccessIntent()</code> 将返回“null”。
-
-
-
-
-</p>
-
-<p>以下代码段展示如何在主要共享存储中打开<code>Pictures</code> 目录：
-</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>系统尝试授予对外部目录的访问权限，并使用一个简化的 UI 向用户确认访问权限（如果需要）：
-</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>图 1.</strong> 一个请求访问 Pictures 目录的应用。
-</p>
-
-<p>如果用户授予访问权限，则系统会调用
-<code>onActivityResult()</code> 重写方法，且结果代码为
-<code>Activity.RESULT_OK</code>，Intent 数据包含 URI。使用提供的 URI 访问目录信息，与使用<a href="{@docRoot}guide/topics/providers/document-provider.html">存储访问框架</a>返回的 URI 类似。
-
-
-
-</p>
-
-<p>如果用户不授予访问权限，则系统会调用
-<code>onActivityResult()</code> 重写方法，且结果代码为
-<code>Activity.RESULT_CANCELED</code>，Intent 数据为 null。</p>
-
-<p class="note"><b>注</b>：获得特定外部目录的访问权限也会获得该目录中子目录的访问权限。
-</p>
-
-<h2 id="removable">访问可移动介质上的目录</h2>
-
-<p>若要使用作用域目录访问来访问可移动介质上的目录，首先要添加一个用于侦听
-{@link android.os.Environment#MEDIA_MOUNTED} 通知的 {@link android.content.BroadcastReceiver}，例如：
-</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>当用户装载可移动介质时，如 SD 卡，系统将发送一则
-{@link android.os.Environment#MEDIA_MOUNTED} 通知。此通知在 Intent 数据中提供一个 <code>StorageVolume</code> 对象，您可用它访问可移动介质上的目录。
-
-以下示例访问可移动介质上的 <code>Pictures</code> 目录：
-</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">最佳做法</h2>
-
-<p>请尽可能保留外部目录访问 URI，这样即不必重复要求用户授予访问权限。
-在用户授予访问权限后，使用目录访问 URI 调用
-<code>getContentResolver().takePersistableUriPermssion()</code>。
-系统将保留此 URI，后续的访问请求将返回 <code>RESULT_OK</code>，且不会向用户显示确认 UI。
-
-</p>
-
-<p>如果用户拒绝授予外部目录访问权限，请勿立即再次请求访问权限。
-一再不停地请求访问权限会导致非常差的用户体验。
-如果用户拒绝了一项请求，而应用再次请求访问，UI 会显示一个 <b>Don't ask again</b> 复选框：
-</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png" srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>图 1.</strong> 应用第二次请求访问可移动介质。
-</p>
-
-<p>如果用户选择 <b>Don't ask again</b> 并拒绝请求，您的应用向指定目录提出的所有未来请求都将被自动拒绝，并且将不会有请求 UI 呈现给用户。
-
-</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/features/security-config.jd b/docs/html-intl/intl/zh-cn/preview/features/security-config.jd
deleted file mode 100644
index ca20c44..0000000
--- a/docs/html-intl/intl/zh-cn/preview/features/security-config.jd
+++ /dev/null
@@ -1,747 +0,0 @@
-page.title=网络安全配置
-page.keywords=Android N、安全、网络
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>本文内容</h2>
-<ol>
- <li><a href="#manifest">添加安全配置文件</a></li>
- <li><a href="#CustomTrust">自定义信任的 CA</a>
- <ol>
- <li><a href="#ConfigCustom">配置信任的自定义 CA</a></li>
- <li><a href="#LimitingCas">限制信任的 CA 集</a></li>
- <li><a href="#TrustingAdditionalCas">信任附加 CA</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">仅调试 CA</a></li>
- <li><a href="#UsesCleartextTraffic">选择退出 Cleartext Traffic</a></li>
- <li><a href="#CertificatePinning">固定证书</a></li>
- <li><a href="#ConfigInheritance">配置继承行为</a></li>
- <li><a href="#FileFormat">配置文件格式</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N 包含一个网络安全配置特性，让应用可以在一个安全的声明性配置文件中自定义其网络安全设置，而无需修改应用代码。
-
-可以针对特定域和特定应用配置这些设置。
-该特性的主要功能如下所示：
-
-</p>
-
-<ul>
- <li>
- <b>自定义信任锚：</b>针对应用的安全连接自定义哪些证书颁发机构 (CA) 值得信赖。
-例如，信任特定的自签署证书或限制应用信任的公共 CA 集。
-
-
- </li>
-
- <li>
- <b>仅调试重写：</b>在应用中以安全方式调试安全连接，而不会增加安装基数的风险。
-
- </li>
-
- <li>
- <b>Cleartext traffic 选择退出：</b>防止应用意外使用 cleartext traffic。
-
- </li>
-
- <li>
- <b>证书固定：</b>将应用的安全连接限制为特定的证书。
-
- </li>
-</ul>
-
-
-<h2 id="manifest">添加安全配置文件</h2>
-
-<p>
- 网络安全配置特性使用一个 XML 文件，您可以在该文件中指定应用的设置。
-您必须在应用的清单中包含一个条目来指向该文件。
-以下代码摘自一份清单，演示了如何创建此条目：
-
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application ... >
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">自定义信任的 CA</h2>
-
-<p>
- 应用可能需要信任自定义的 CA 集，而不是平台默认值。
-出现此情况的最常见原因包括：
-</p>
-
-<ul>
- <li>连接到具有自定义证书颁发机构（自签署、由公司内部 CA 签发等）的主机。
-
- </li>
-
- <li>将 CA 集仅限于您信任的 CA，而不是每个预装 CA。
-
- </li>
-
- <li>信任系统中未包含的附加 CA。
- </li>
-</ul>
-
-<p>
- 默认情况下，来自所有应用的安全（例如 TLS、HTTPS）连接均信任预装的系统 CA，而面向 API 级别 23 (Android M) 及更低级别的应用默认情况下还会信任用户添加的 CA 存储。
-
-应用可以使用 {@code base-config}（针对应用范围的定制）或 {@code domain-config}（针对每个域的定制）自定义自己的连接。
-
-
-
-</p>
-
-
-<h3 id="ConfigCustom">配置自定义 CA</h3>
-
-<p>
- 假设您要连接到使用自签署 SSL 证书的主机，或者连接到其 SSL 证书是由您信任的非公共 CA（如公司内部 CA）签发的主机。
-
-
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- 以 PEM 或 DER 格式将自签署或非公共 CA 证书添加到
-{@code res/raw/my_ca}。
-</p>
-
-
-<h3 id="LimitingCas">限制信任的 CA 集</h3>
-
-<p>
- 如果应用不想信任系统信任的所有 CA，则可以自行指定，缩减要信任的 CA 集。
-这样可防止应用信任任何其他 CA 签发的欺诈性证书。
-
-</p>
-
-<p>
- 限制信任的 CA 集的配置与针对特定域<a href="#TrustingACustomCa">信任自定义 CA</a> 相似，不同的是，前者要在资源中提供多个 CA。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- 以 PEM 或 DER 格式将信任的 CA 添加到 {@code res/raw/trusted_roots}。
- 请注意，如果使用 PEM 格式，文件必须仅包含 PEM 数据，且没有额外的文本。
-<em></em>您还可以提供多个
-<a href="#certificates"><code><certificates></code></a>
-元素，而不是只能提供一个元素。
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- 信任附加 CA
-</h3>
-
-<p>
- 应用可能需要信任系统不信任的附加 CA，出现此情况的原因可能是系统还未包含此 CA，或 CA 不符合添加到 Android 系统中的要求。
-
-应用可以通过为一个配置指定多个证书源来实现此目的。
-
-
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">配置用于调试的 CA</h2>
-
-<p>
- 调试通过 HTTPS 连接的应用时，您可能需要连接到没有用于生产服务器的 SSL 证书的本地开发服务器。
-
-为了支持此操作，而又不对应用的代码进行任何修改，您可以通过使用 {@code debug-overrides} 指定仅在<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
-为 {@code true} 时才信任的仅调试 CA。<i></i>
-
-通常，IDE 和构建工具会自动为非发布版本设置此标志。
-
-</p>
-
-<p>
- 这比一般的条件代码更安全，因为出于安全考虑，应用存储不接受被标记为可调试的应用。
-
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">选择退出 Cleartext Traffic</h2>
-
-<p>
- 旨在连接到仅使用安全连接的目标的应用可以选择不再对这些目标提供 cleartext（使用解密的 HTTP 协议而非 HTTPS）支持。
-
-此选项有助于防止应用因外部源（如后端服务器）提供的 URL 发生变化而意外回归。
-
-
- 请参阅 {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
-NetworkSecurityPolicy.isCleartextTrafficPermitted()} 了解更多详情。
-</p>
-
-<p>
- 例如，应用可能需要确保所有与 {@code
-secure.example.com} 的连接始终是通过 HTTPS 完成，以防止来自恶意网络的敏感流量。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">固定证书</h2>
-
-<p>
- 一般情况下，应用信任所有预装 CA。如果有预装 CA 要签发欺诈性证书，则应用将面临被中间人攻击 (MiTM) 的风险。
-
-有些应用通过限制信任的 CA 集或通过证书固定来选择限制其接受的证书集。
-
-</p>
-
-<p>
- 通过按公钥的哈希值（X.509 证书的 SubjectPublicKeyInfo）提供证书集完成证书固定。
-然后，证书链仅在至少包含一个已固定的公钥时才有效。
-
-
-</p>
-
-<p>
- 请注意，使用证书固定时，您应始终包含一个备份密钥，这样，当您需要强制切换到新密钥时，或更改 CA 时（固定到某个 CA 证书或该 CA 的中间证书时），您应用的连接性不会受到影响。
-
-
-否则，您必须推送应用的更新以恢复连接性。
-
-</p>
-
-<p>
- 此外，可以设置固定到期时间，在该时间之后不执行证书固定。
-这有助于防止尚未更新的应用出现连接问题。
-不过，设置固定到期时间可能会绕过证书固定。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">配置继承行为</h2>
-
-<p>
- 继承未在特定配置中设置的值。此行为允许进行更复杂的配置，同时保证配置文件可读。
-
-</p>
-
-<p>
- 如果未在特定条目中设置值，则使用来自下一个更通用的条目中的值。
-未在 {@code domain-config} 中设置的值从父级 {@code domain-config}（如果已嵌套）或从 {@code
-base-config}（如果未嵌套）中获取。
-未在 {@code base-config} 中设置的值使用平台默认值。
-
-</p>
-
-<p>
- 例如，考虑所有与 {@code
-example.com} 的子域的连接必须使用自定义 CA 集。此外，允许使用这些域的 cleartext traffic，连接到 {@code
- secure.example.com} 时除外。<em></em>
-通过在 {@code example.com} 的配置中嵌套 {@code
-secure.example.com} 的配置，不需要重复 {@code trust-anchors}。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">配置文件格式</h2>
-
-<p>
- 网络安全配置特性使用 XML 文件格式。
- 文件的整体结构如以下代码示例所示：
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- 以下部分介绍语法和文件格式的其他详细信息。
-
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 可包含：
- </dt>
-
- <dd>
- 0 或 1 个 <code><a href="#base-config"><base-config></a></code><br>
- 任意数量的 <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 或 1 个 <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 语法：
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- 可包含：
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 说明：
- </dt>
-
- <dd>
- 目标不在 <a href="#domain-config"><code>domain-config</code></a> 涵盖范围内的所有连接所使用的默认配置。
-
-
-<p>
- 未设置的任何值均使用平台默认值。面向上述 API 级别 24 及更高级别的应用的默认配置：
-
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-面向 API 级别 23 及更低级别的应用的默认配置：
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>语法：</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>可包含：</dt>
-
-<dd>
-1 个或多个 <code><a href="#domain"><domain></a></code>
-<br/>0 或 1 个 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 或 1 个 <code><a href="#pin-set"><pin-set></code></a>
-<br/>任意数量的已嵌套 <code><domain-config></code></dd>
-
-<dt>说明</dt>
-<dd>用于按照 {@code domain} 元素的定义连接到特定目标的配置。
-
-<p>请注意，如果有多个 {@code domain-config} 元素涵盖某个目标，则使用匹配域规则最具体（最长）的配置。
-</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- 语法：
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- 属性：
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- 如果为 {@code "true"}，则此域规则与域及所有子域（包括子域的子域）匹配，否则，该规则仅适用于精确匹配项。
-
-
- </dd>
- </dl>
- </dd>
-
- <dt>
- 说明：
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- 语法：
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- 可包含：
- </dt>
-
- <dd>
- 0 或 1 个 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 说明：
- </dt>
-
- <dd>
- 当 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
-为 {@code "true"} 时将应用的重写，IDE 和构建工具生成的非发布版本通常属于此情况。
-将在 {@code
-debug-overrides} 中指定的信任锚添加到所有其他配置，并且当服务器的证书链使用其中一个仅调试信任锚时不执行证书固定。
-
-如果 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
-为 {@code "false"}，则完全忽略此部分。
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- 语法：
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- 可包含：
- </dt>
-
- <dd>
- 任意数量的 <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- 说明：
- </dt>
-
- <dd>
- 用于安全连接的信任锚集
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>语法：</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>说明：</dt>
-<dd>用于 {@code trust-anchors} 元素的 X.509 证书集。</dd>
-
-<dt>属性：</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-CA 证书的来源，可以是
-<ul>
- <li>指向包含 X.509 证书的文件的原始资源 id。
- 证书必须以 DER 或 PEM 格式编码。如果为 PEM 证书，则文件不得包含额外的非 PEM 数据，如注释。
-
-<em></em>
- </li>
-
- <li>用于预装系统 CA 证书的 {@code "system"}
- </li>
-
- <li>用于用户添加的 CA 证书的 {@code "user"}
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- 指定来自此源的 CA 是否绕过证书固定。如果为 {@code
-"true"}，则为穿过此源的其中一个 CA 的链颁发证书，并且不执行证书固定。
-这对于调试 CA 或支持用户对应用的安全流量进行中间人攻击 (MiTM) 非常有用。
-
- </p>
-
- <p>
- 默认值为 {@code "false"}，除非在 {@code debug-overrides}
-元素中另外指定（在这种情况下，默认值为 {@code "true"}）。
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- 语法：
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- 可包含：
- </dt>
-
- <dd>
- 任意数量的 <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- 说明：
- </dt>
-
- <dd>
- 公钥固定 (PKP) 集。对于要信任的安全连接，信任链中必须有一个公钥位于 PKP 集中。
-有关固定形式，请参阅
-<code><a href="#pin"><pin></a></code>。
- </dd>
-
- <dt>
- 属性：
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- 采用 {@code yyyy-MM-dd} 格式的日期，在该日期及之后固定过期，因而禁用固定。
-如果未设置该属性，则固定不会过期。
-
- <p>
- 设置到期时间有助于防止未更新到其 PKP 集（例如，由于用户禁用应用更新）的应用出现连接问题。
-
-
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- 语法：
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- 属性：
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- 用于生成 PKP 的摘要算法。目前仅支持
-{@code "SHA-256"}。
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/zh-cn/preview/guide.jd b/docs/html-intl/intl/zh-cn/preview/guide.jd
deleted file mode 100644
index 9f7737f..0000000
--- a/docs/html-intl/intl/zh-cn/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=测试指南
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>本文内容</h2>
- <ol>
- <li><a href="#runtime-permissions">测试权限</a></li>
- <li><a href="#doze-standby">测试低电耗模式和应用待机模式</a></li>
- <li><a href="#ids">自动备份和设备标识符</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- 利用 Android N，您有机会确保应用可使用下一平台版本。
-如 <a href="{@docRoot}preview/api-overview.html">API 概览</a>和<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>中所述，该 Preview 包括大量 API 和可能影响应用的行为变更。
-
-使用 Preview 测试应用时，您应重点关注一些特定的系统变更，确保用户拥有愉悦的体验。
-
-
-</p>
-
-<p>
- 本指南介绍可使用您的应用测试 Preview 的哪些功能以及如何测试。您应确定优先测试以下特定 Preview 功能，因为它们可能会对应用行为产生较大影响。
-
-
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">权限</a>
- </li>
- <li><a href="#doze-standby">低电耗模式和应用待机模式</a>
- </li>
- <li><a href="#ids">自动备份和设备标识符</a></li>
-</ul>
-
-<p>
- 如需了解有关如何使用 Preview 系统映像设置设备或虚拟设备以进行测试的详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html">设置 Android N SDK</a>。
-
-
-</p>
-
-
-<h2 id="runtime-permissions">测试权限</h2>
-
-<p>
- 新<a href="{@docRoot}preview/features/runtime-permissions.html">权限</a>模型改变了用户向您的应用分配权限的方式。
-您的应用必须在运行时要求用户提供各项权限，而不是在安装过程中要求授予所有权限。
-
-对于用户而言，此行为有助于他们更精细地控制每个应用的 Activity，并更深入地了解应用为何请求提供特定权限的上下文信息。
-用户可以随时向应用授予某项权限或撤销其某项权限。
-预览版的这种功能最有可能会对应用行为产生影响，而且可能会阻止某些应用功能运行或只能在降级状态中运行。
-
-
-</p>
-
-<p class="caution">
- 这一变更会影响在新平台上运行的所有应用，即便这些应用并非面向新平台版本开发亦是如此。
-该平台为旧版应用提供有限的兼容性行为，但您现在应当开始计划将应用迁移到新权限模型，以便在官方平台启动时发布更新的应用版本。
-
-
-</p>
-
-
-<h3 id="permission-test-tips">测试提示</h3>
-
-<p>
- 使用以下测试提示有助于您计划并通过新权限行为执行应用测试。
-
-</p>
-
-<ul>
- <li>识别应用的当前权限和相关的代码路径</li>
- <li>跨受权限保护的服务和数据测试用户流程</li>
- <li>使用授予/撤销权限的各种组合进行测试</li>
- <li>使用 {@code adb} 工具从命令行管理权限：
- <ul>
- <li>按组列出权限和状态：
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>使用以下语法授予或撤销一项或多项权限：<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>针对使用权限的服务对应用进行分析</li>
-</ul>
-
-<h3 id="permission-test-strategy">测试策略</h3>
-
-<p>
- 权限更改会影响应用的结构和设计，以及您为用户提供的用户体验和流程。
-您应评估应用的当前权限使用情况并开始计划要提供的新流程。
-平台的正式版本提供兼容性行为，但您应计划更新应用，而不是依赖于这些行为。
-
-
-</p>
-
-<p>
- 确定应用实际需要和使用的权限，然后找出各种使用受权限保护的服务的代码路径。
-您可通过结合使用新平台测试和代码分析完成此操作。
-在测试中，您应通过将应用的 {@code targetSdkVersion} 更改为预览版，重点关注选择运行时权限。
-如需了解详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html#">设置 Android N SDK</a>。
-
-
-</p>
-
-<p>
- 使用已撤销和已添加权限的各种组合进行测试，突出显示依赖于权限的用户流程。
-如果依赖关系不明显或不符合逻辑，则您应考虑重构或划分该流程，以消除依赖关系或阐明需要权限的原因。
-
-
-</p>
-
-<p>
- 如需了解有关运行时权限行为、测试和最佳做法的详细信息，请参阅<a href="{@docRoot}preview/features/runtime-permissions.html">权限</a>开发者预览版页面。
-
-
-</p>
-
-
-<h2 id="doze-standby">测试低电耗模式和应用待机模式</h2>
-
-<p>
- 当设备处于空闲状态或应用未聚焦时，低电耗模式和应用待机模式的节能功能将限制应用可执行的后台处理工作量。
-系统可对应用实施的限制包括：限制或禁止访问网络、暂停后台任务、暂停通知、忽略唤醒请求和闹铃。
-
-要确保应用在完成这些节能优化后正常运行，您应通过模拟这些低功耗状态对应用进行测试。
-
-
-</p>
-
-<h4 id="doze">在低电耗模式下测试您的应用</h4>
-
-<p>要在低电耗模式下测试您的应用，请执行以下操作：</p>
-
-<ol>
-<li>使用 Android N 系统映像配置硬件设备或虚拟设备</li>
-<li>将设备连接到开发计算机并安装应用</li>
-<li>运行应用并使其保持活动状态</li>
-<li>通过运行以下命令，模拟进入低电耗模式的设备：
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>观察重新激活设备时的应用行为。确保应用在设备退出低电耗模式时正常恢复
-</li>
-</ol>
-
-
-<h4 id="standby">在应用待机模式下测试您的应用</h4>
-
-<p>要在应用待机模式下测试您的应用，请执行以下操作：</p>
-
-<ol>
- <li>使用 Android N 系统映像配置硬件设备或虚拟设备</li>
- <li>将设备连接到开发计算机并安装应用</li>
- <li>运行应用并使其保持活动状态</li>
- <li>通过运行以下命令，模拟进入待机模式的应用：
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>使用以下命令模拟如何唤醒应用：
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>观察唤醒后的应用行为。确保应用从待机模式中正常恢复。
-特别地，您应检查应用的通知和后台作业是否按预期继续运行
-</li>
-</ol>
-
-<h2 id="ids">自动备份应用和设备特定的标识符</h2>
-
-<p>如果应用坚持在内部存储中使用任何设备特定的标识符，如 Google 云消息传递注册 ID，请确保遵循最佳做法将存储位置从自动备份中排除，如<a href="{@docRoot}preview/backup/index.html">自动备份应用</a>中所述。
-
-
-
- </p>
diff --git a/docs/html-intl/intl/zh-cn/preview/license.jd b/docs/html-intl/intl/zh-cn/preview/license.jd
deleted file mode 100644
index 66f3ed3..0000000
--- a/docs/html-intl/intl/zh-cn/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=许可协议
-
-@jd:body
-
-<p>
-在开始使用 Android SDK Preview 之前，您必须同意下列条款和条件。正如下文所述，请注意：这是 Android SDK 的预览版，可能随时更改，恕不另行通知，您使用此版本的风险由您自行承担。
-Android SDK Preview 并非稳定版本，可能包含会对您的计算机系统、设备和数据造成损害的错误和缺陷。
-</p>
-
-<p>
-本协议是 Android SDK Preview 许可协议（以下称为“许可协议”）。
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. 简介
-
-1.1 Android SDK Preview（在本许可协议中简称为“Preview”，具体包括 Android 系统文件、封装 API 以及Preview 库文件（若可用））依据本许可协议的条款授权您使用。本许可协议在您与 Google 之间就您对“Preview”的使用构成具有法律约束力的合约。
-
-1.2 “Android”是指以 Android 开源项目（项目网址为 http://source.android.com/，其内容会不时更新）名义提供、面向设备的 Android 软件栈。
-
-1.3 “Android 兼容”是指 (i) 符合与 Android 兼容性定义文档（可在 Android 兼容性网站 http://source.android.com/compatibility 上找到，并可能会不时更新）标准的任何 Android 实现；并 (ii) 成功通过 Android 兼容性测试套件 (CTS) 的测试。
-
-1.4“Google”是指 Google Inc.，是一家特拉华州公司，主要营业地位于：1600 Amphitheatre Parkway, Mountain View, CA 94043, United States。
-
-2. 接受许可协议
-
-2.1 要使用“Preview”，您必须先同意本许可协议。如果您不接受本许可协议，则不得使用“Preview”。
-
-2.2 点击接受并/或使用“Preview”，即表示您特此同意本许可协议的条款。
-
-2.3 如果依照美国或其他国家/地区（包括您居住或您使用“Preview”所在的国家/地区）的法律，您被禁止获取“Preview”，则您不得使用“Preview”，也不得接受本许可协议。
-
-2.4 如果您将在贵公司或组织内部使用“Preview”，则您同意代表您的雇主或其他实体接受本许可协议的约束，并且您表示并保证您拥有完全的合法授权令您的雇主或上述实体受本许可协议的约束。如果您不具备必要的授权，则不得代表您的雇主或其他实体接受本许可协议或使用“Preview”。
-
-3. Google “Preview”许可
-
-3.1 Google 依据本许可协议的条款授予您有限的、全球性、免版税、不可转让、非独占性且不可次级许可的“Preview”使用许可，其用途仅限针对 Android 的兼容实现来开发应用。
-
-3.2 您不得使用此“Preview”来开发适用于其他平台（包括 Android 的非兼容实现）的应用或开发其他 SDK。您当然可以随意开发适用于其他平台（包括 Android 的非兼容实现）的应用，前提是不使用此“Preview”来进行此类开发。
-
-3.3 您同意 Google 或第三方拥有“Preview”中存在或与其有关联的全部合法权利、所有权和利益，包括“Preview”中存在的任何知识产权。“知识产权”是指根据专利法、版权法、商业机密法、商标法享有的任何及全部权利，以及其他任何及全部专有权利。Google 保留所有未明确授予您的权利。
-
-3.4 您不得将“Preview”用于本许可协议未明确允许的任何用途。除适用第三方许可所要求的范围外，您不得：(a) 对“Preview”或“Preview”的任何部分进行复制（备份用途除外）、修改、改编、再分发、反编译、逆向工程、反汇编或创建其衍生品；或 (b) 将“Preview”的任何部分加载到移动手持终端或除个人计算机之外的任何其他硬件设备上，将“Preview”的任何部分与其他软件合并，或者发行任何融入“Preview”某一部分的软件或设备。
-
-3.5 对于依据开源软件许可授权的“Preview”组件，其使用、复制和分发仅受该开源软件许可条款的制约，不受本许可协议的约束。您同意在依照被授予的所有权利作为被许可方期间，在遵守此类开源软件许可协议方面始终保持良好的信誉，并避免进行任何可能导致终止、暂停或违反此类权利的行动。
-
-3.6 您同意 Google 所提供“Preview”的形式和性质可随时发生变更，而无需事先通知您，并且未来的“Preview”版本可能会与在之前的“Preview”版本上开发的应用不兼容。您同意 Google 可单方面决定在未事先通知您的情况下全面停止（永久性或暂时性）向您或用户提供“Preview”（或“Preview”内的任何功能）。
-
-3.7 本许可协议内没有任何条款授予您使用 Google 的任何商品名、商标、服务标志、徽标、域名或其他独特品牌特征的权利。
-
-3.8 您同意您不会移除、遮盖或篡改“Preview”上可能贴有或“Preview”内可能包含的任何专有权利声明（包括版权声明和商标声明）。
-
-4. 您对“Preview”的使用
-
-4.1 Google 同意本许可协议中的任何条款均未授予 Google 从您（或您的许可方）处获取您依照本许可协议使用“Preview”开发的任何软件应用中存在或与其相关的权利、所有权或利益，包括这些应用中存在的任何知识产权。
-
-4.2 您同意只出于 (a) 本许可协议和 (b) 相关管辖区域内任何适用法律、法规或公认惯例或准则（包括有关向美国或其他相关国家/地区出口数据或软件或从美国或其他相关国家/地区进口数据或软件的任何法律）所允许的目的而使用“Preview”和编写应用。
-
-4.3 您同意，如果您使用“Preview”开发应用，您将会保护用户的隐私权和合法权利。如果用户向您提供用户名、密码或其他登录信息或个人信息，您必须确保用户知晓这些信息将供您的应用使用，并且您必须为这些用户提供足以满足法律要求的隐私声明和保护。如果您的应用存储由用户提供的个人信息或敏感信息，其存储方式必须安全。如果用户向您提供 Google 帐户信息，您的应用只能在用户允许时出于用户所许可的有限目的使用该信息访问用户的 Google 帐户。
-
-4.4 您同意您不会利用“Preview”从事任何干扰、中断、损坏或以未经授权方式访问 Google 或任何第三方的服务器、网络或其他财产或服务的 Activity（包括应用的开发或分发）。
-
-4.5 您同意您对通过 Android 和/或 Android 应用创建、传输或显示的任何数据、内容或资源以及您的行为所导致的后果（包括 Google 可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
-
-4.6 您同意您为违反本许可协议、任何适用的第三方合约或服务条款或任何适用法律或法规下的义务以及任何上述违规行为所导致的后果（包括 Google 或任何第三方可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
-
-4.7 “Preview”正在开发中，您的测试和反馈是开发过程的重要环节。使用“Preview”，即表示您承认某些功能仍在开发实现之中，您不应期望“Preview”具备稳定版本的全部功能。您同意不使用此“Preview”公开发布或发运任何应用，因为此“Preview”在 Android SDK 正式发行之后将不再受支持。
-
-5. 您的开发者凭据
-
-5.1 您同意，对于 Google 可能向您发放或可能由您自行选择的任何开发者凭据，您有责任保持其机密性，并且您对以您的开发者凭据名义开发的所有应用负全责。
-
-6. 隐私权和信息
-
-6.1 为持续创新和改进“Preview”，Google 可能会从软件收集某些使用统计数据，包括但不限于唯一标识符、关联的 IP 地址、软件的版本号以及有关软件使用了“Preview”中哪些工具和/或服务及其使用方式的信息。在收集任何上述信息之前，“Preview”都会通知您并征求您的同意。如果您拒绝同意，我们将不会收集这些信息。
-
-6.2 我们会对收集的数据进行汇总调查，以便改进“Preview”，并会按照 Google 的隐私政策（网址为 http://www.google.com/policies/privacy/）维护数据。
-
-7. 第三方应用
-
-7.1 如果您使用“Preview”运行由第三方开发或访问由第三方提供的数据、内容或资源的应用，您同意 Google 对这些应用、数据、内容或资源不承担任何责任。您理解，您通过上述第三方应用可能访问到的所有数据、内容或资源由其提供者负全责，Google 对您因使用或访问其中任何第三方应用、数据、内容或资源而遭受的任何损失或损害不承担任何责任。
-
-7.2 您应知晓，通过此类第三方应用提供给您的数据、内容和资源可能受提供商（或代表他们的其他人员或公司）拥有的知识产权的保护。除非相关所有者明确给予许可，否则您不得修改、出租、租赁、借出、出售、分发这些数据、内容或资源（的全部或部分），或以其为基础创建衍生品。
-
-7.3 您承认您对上述第三方应用、数据、内容或资源的使用可能受到您与相关第三方之间单独订立的条款的制约。
-
-8. 使用 Google API
-
-8.1 Google API
-
-8.1.1 如果您使用任何 API 从 Google 检索数据，即表示您承认这些数据可能受到 Google 或这些数据提供方（或代表他们的其他人员或公司）拥有的知识产权的保护。您对任何上述 API 的使用可能受到附加服务条款的制约。除非相关服务条款允许，否则您不得修改、出租、租赁、借出、出售、分发这些数据（全部或部分），或以其为基础创建衍生品。
-
-8.1.2 如果您使用任何 API 从 Google 检索用户数据，即表示您承认并同意您只有在征得用户明确同意时才会检索数据，并且只能在用户允许时出于用户许可的有限目的检索数据。
-
-9. 终止许可协议
-
-9.1 本许可协议将持续有效，直至您或 Google 按以下规定终止本协议。
-
-9.2 如果您想终止本许可协议，可通过停止使用“Preview”以及任何相关开发者凭据予以终止。
-
-9.3 Google 有权在向您作出通知后，有理由或无理由地随时终止与您订立的这份许可协议。
-
-9.4 本许可协议将在下列情况下自动终止，而无需另行通知或采取其他行动，以先符合条件者为准：
-(A) Google 在您居住或使用服务所在国家/地区停止向用户提供“Preview”或“Preview”的某些部分；
-(B) Google 发行 Android SDK 的最终版本。
-
-9.5 在本许可协议终止时，本许可协议中向您授予的许可将终止，您应立即完全停止使用“Preview”，并且第 10、11、12 和 14 节的条款将无限期继续存在。
-
-10.免责声明
-
-10.1 您明确理解并同意，您使用“Preview”的风险将由您自行承担，并且“Preview”是按“原样”和“现状”提供，Google 不提供任何类型的担保。
-
-10.2 您对“Preview”的使用以及通过使用“Preview”下载或以其他方式获得的任何材料由您自行决定，风险自负，并且对于因此类使用而对您的计算机系统或其他设备造成的任何损害或数据损失由您单方面负责。在不对上文所述予以限制的条件下，您了解“Preview”并非稳定版本，可能存在将导致重大损害的错误、缺陷和安全漏洞，包括无法挽回地完全无法使用您的计算机系统或其他设备。
-
-10.3 Google 进一步明确拒绝任何类型的所有担保和条件，无论明示或暗示，包括但不限于有关适销性、特定用途适用性以及非侵权的暗示担保和条件。
-
-11. 有限责任
-
-11.1 您明确理解并同意，对于您可能遭遇的任何直接、间接、附带、特殊、继发或惩罚性损害（包括任何数据损失），Google 及其子公司和附属公司以及其许可方在任何责任理论下对您概不承担任何责任，无论 Google 或其代表是否已被告知或是否本应知晓发生任何上述损失的可能性。
-
-12. 赔偿
-
-12.1 您同意，在法律所允许的最大限度内，为 Google、其附属公司及其各自的董事、高管、员工和代理商提供辩护，使其免于因下列情况引起或产生的任何及所有索赔、诉讼、起诉或诉讼程序以及任何及所有损失、债务、损害、成本和费用（包括合理的律师费用）而承担责任或遭受损害：(a) 您对“Preview”的使用；(b) 您在“Preview”上开发的任何应用侵犯任何人的任何知识产权或诽谤任何人或侵犯其公开权或隐私权；以及 (c) 您的任何行为有悖于本许可协议
-
-13. 许可协议的更改
-
-13.1 Google 可能会在分发新版本“Preview”时对许可协议做出更改。做出这些更改后，Google 将在提供“Preview”的网站上公布新版本的许可协议。
-
-14. 一般法律条款
-
-14.1 本许可协议构成您与 Google 之间的完整法律协议，管辖您对“Preview”（不包括 Google 可能依据另外的书面协议向您提供的任何服务）的使用，并完全取代您之前与 Google 之间签订的、与“Preview”有关的任何协议。
-
-14.2 您同意，如果 Google 未行使或未强制执行本许可协议包含的任何法定权利或救济（或 Google 在任何适用法律下享有的相关利益），不得视为 Google 正式放弃这些权利，Google 仍可获得这些权利或救济。
-
-14.3 如果任何拥有管辖权的法院将本许可协议的任何条款裁定为无效，则该条款将从本许可协议中删除，而不会影响本许可协议的其余部分。本许可协议的其余条款将继续有效且可强制执行。
-
-14.4 您承认并同意，Google 集团旗下的每一家公司都将成为本许可协议的第三方受益人，并且此类其他公司将有权直接强制执行和依赖本许可协议中任何授予其利益（或支持其权利）的条款。除此之外，任何其他人员或公司均不得成为本许可协议的第三方受益人。
-
-14.5 出口限制。“Preview”受美国出口法律和法规的制约。您必须遵守适用于“Preview”的所有国内和国际出口法律和法规。这些法律包括目的地、最终用户和最终用途方面的限制。
-
-14.6 未经 Google 事先书面批准，您不得擅自转让或转移本许可协议，未经此类批准而试图进行的任何转让均为无效。未经 Google 事先书面批准，您不得委托您依据本许可协议所应承担的责任或义务。
-
-14.7 本许可协议以及您与 Google 依据本许可协议而建立的关系受加利福尼亚州法律管辖，而无论其是否与其他法律条款冲突。您与 Google 同意服从位于加利福尼亚州圣克拉拉县内法院的专属司法管辖权，以解决本许可协议引起的任何法律事务。尽管有上述规定，您同意仍允许 Google 在任何管辖区域申请禁令救济（或同等类型的紧急法律救济）。
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-cn/preview/overview.jd b/docs/html-intl/intl/zh-cn/preview/overview.jd
deleted file mode 100644
index 06a905f..0000000
--- a/docs/html-intl/intl/zh-cn/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=计划概览
-page.metaDescription=让您的应用做好迎接 Android 的下一版本的准备。
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- 欢迎使用 <strong>Android N Developer Preview</strong>，此程序将为您提供针对 Android 的下一版本测试和优化应用所需的所有功能。它是免费的，您只需下载 N Developer Preview 工具即可立即使用。
-
-
-
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- 硬件和模拟器映像
- </h5>
-
- <p>
- 在各种设备或模拟器上运行并测试应用。
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 最新的平台代码
- </h5>
-
- <p>
- 我们将在 Preview 期间每月提供更新，以便您针对最新的平台变更测试您的应用。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 优先处理开发者问题
- </h5>
-
- <p>
- 在最初的几周里，我们将优先处理开发者报告的问题，所以请尽快测试并提供反馈。
-
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- 新行为和新功能
- </h5>
-
- <p>
- 请尽早开始支持新平台行为并使用新功能进行开发。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 通过 OTA 推送更新
- </h5>
-
- <p>
- 通过 Android Beta 计划，所有支持的设备都可以实现无缝 OTA 更新。无需刷机。
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 反馈和支持
- </h5>
-
- <p>
- 使用 <a href="{@docRoot}preview/bug">Issue Tracker</a> 向我们报告问题并提供反馈。
-与
-<a href="{@docRoot}preview/dev-community">N 开发者社区</a>中的其他开发者建立联系。
-
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">时间表和更新</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- N Developer Preview 从 2016 年 3 月 9 日开始使用，到向 AOSP 和 OEM 公开发布最终 Android N 时停止使用，预计将于 2016 年第三季度发布最终版本。
-
-</p>
-
-<p>
- 在关键的开发阶段的里程碑，我们将为您的测试设备和测试环境提供更新。
-一般每月（间隔 4 到 6 周）会提供一次更新。
-里程碑列表如下。
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong>（初始版本，alpha）</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong>（增量更新，alpha）</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong>（增量更新，beta）</li>
- <li><strong>Preview 4</strong>（最终 API 和官方 SDK，在 Play 中发布）</li>
- <li><strong>Preview 5</strong>（接近最终版本系统映像，用于最终测试）</li>
- <li>向 AOSP 和生态系统发布<strong>最终版本</strong></li>
-</ul>
-
-<p>
- 每次的更新包括 SDK 工具、Preview 系统映像、模拟器、参考文档和 API 差异。
-
-</p>
-
-<p>
- <strong>前三个 Preview 里程碑</strong>提供<strong>早期测试和开发环境</strong>，帮助您发现当前应用中的兼容性问题，并针对新平台计划必要的迁移或功能工作。
-
-
-这是向我们提供功能和 API 以及文件兼容性问题反馈的优先期 — 请使用 <a href="{@docRoot}preview/bug">Issue Tracker</a> 进行反馈。
-
-
-在更新期间，API 可能会有变更。
-</p>
-
-<p>
- 在<strong>Preview 4 和 5</strong> 中，您将可以访问<strong>最终版的 N API 和 SDK</strong> 进行开发，以及用于测试系统行为和功能的接近最终版的系统映像。
-
-此时 Android N 会提供标准的 API 级别。
-您可以对旧版应用进行最终的兼容性测试，并优化使用 N API 或功能的新代码。
-
-</p>
-
-<p>
- 此外，从 Preview 4 开始，您将可以面向运行正式 API 级别的 Android N 的<strong>设备发布应用</strong>，例如选择加入 Android Beta 计划的消费者设备。您可以先在 Google Play 的 alpha 和 beta 渠道发布应用，通过 Android Beta 消费者对应用进行测试，然后在商店大范围推广。
-
-
-
-
-
-</p>
-
-<p>
- 如果您在 Android N 中进行测试和开发，我们郑重建议您随着 Preview 更新的发布，<strong>将开发环境保持为相应的最新版本</strong>。
-
-为了方便更新，您可以在 Android Beta 计划中注册您的测试设备，这样就可以在每个里程碑实现<strong>空中下载 (OTA) 更新</strong>。
-
-此外，您还将获得可手动下载并刷入的系统映像。
-
-</p>
-
-<p>
- 当有 Preview 更新可用时，我们将通过 <a href="http://android-developers.blogspot.com/">Android 开发者博客</a>、此网站以及 <a href="{@docRoot}preview/dev-community">Android N 开发者社区</a>通知您。
-
-
-</p>
-
-
-<h2 id="preview_tools">N Developer Preview 包含的内容</h2>
-
-<p>
- N Developer Preview 包括您在各种使用不同屏幕尺寸、网络技术、CPU/GPU 芯片组和硬件架构的设备中测试现有应用所需的所有功能。
-
-
-</p>
-
-<h3 id="sdk_tools">SDK 工具</h3>
-
-<p>您可通过 <a href="{@docRoot}studio/intro/update.html">Android Studio</a> 中的 SDK 管理器下载这些组件：</p>
-
-<ul>
- <li> N Developer Preview <strong>SDK 和工具</strong>
- <li> N Developer Preview <strong>模拟器系统映像</strong>（32 位和 64 位）
- <li> 适用于 Android TV 的 N Developer Preview<strong>模拟器系统映像</strong>（32 位）
- <li> N Developer Preview 支持库（用于新应用模板）
-</ul>
-
-<p>
- 我们将根据需要在每个里程碑为这些开发工具提供更新。
-</p>
-
-<h3 id="hardware_system_images">硬件系统映像</h3>
-
-<p>
- N Developer Preview 包含 Nexus 以及可用于在物理设备上进行测试和开发的其他硬件系统映像。如需了解硬件映像的完整列表，请参阅<a href="{@docRoot}preview/download.html">设备映像</a>页面。
-
-
-</p>
-
-<p>
- 我们将在每个里程碑为这些设备提供更新的系统映像。您可以手动下载更新的系统映像，并刷入测试设备（如需要，可多次刷入）。
-
-这尤其适合需要多次重刷设备的自动化测试环境。
-
-
-</p>
-
-<p class="note"><strong>注</strong>：
- <strong>手动刷入设备将不会像在去年的 Preview 中一样获得 OTA 更新。</strong>
-今年，您可以通过在 Android Beta 计划中注册设备获得 OTA — 有关详情请参阅下文。
-
-</p>
-
-<h3 id="android_beta">通过 Android Beta 计划获得 OTA 更新</h3>
-
-<p>
- Android N 的一项新功能是空中下载 (OTA) 更新计划，该功能可以将 Android N 最新的Preview 更新直接发送到注册该计划的设备。该计划是免费服务，只要您拥有支持的设备并将其注册到 Google 帐户，就可以使用该服务。
-
-
-
-</p>
-
-<p>
- 如需注册该计划，请访问 <a href="https://g.co/androidbeta">Android Beta 计划</a>网站。您将可以看到您的帐户中所有可以注册 Android Beta 的设备。
-
-
-
-</p>
-
-<ol>
- <li> 选择用于接收 Android N 更新的设备
- <li> 点击 Enroll，查看并同意服务条款，然后点击 OK。
-</ol>
-
-<p>
- 注册完成后，您的设备将很快收到更新。多数情况下，切换到 Android N 不需要重置所有数据，但建议您在注册设备前对重要数据进行备份，以免丢失。
-
-
-
-</p>
-
-<p>
- 在设备收到更新后，建议您尽快下载并安装更新，以便在系统 UI、行为、API 和功能中及时同步最新的变更。
-
-
-</p>
-
-<p>
- 在 Developer Preview 结束运行时，您的注册设备将收到官方 Android N 版本的更新。
-
-</p>
-
-<p>
- 您可以在 Android Beta 网站上随时注销注册 Android Beta 计划的设备。在注销前，请务必备份设备上的数据。
-
-
-</p>
-
- <p class="note"><strong>注</strong>：
- 注销后，<strong>您的设备将恢复到最新版本 Android 6.0 Marshmallow 的出厂设置</strong>（不一定是您注册设备前安装的版本）。
-
-
-为确保全新安装，您设备中的数据将被擦除，包括联系人、消息和照片等。
-
-
-</p>
-
-<h3 id="documentation_and_sample_code">文档和示例代码</h3>
-
-<p>
- Developer Preview 网站上提供的以下文档资源有助于您了解 Android N：
-
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Android N 开发设置</a>，提供入门指南的分步说明。
-
-</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">行为变更</a>，带您了解主要测试领域。
-</li>
- <li> 新 API 文档，包括 <a href="{@docRoot}preview/api-overview.html">API 概览</a>、可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考资料</a>以及有关主要功能（例如多窗口支持、受限通知、多区域设置支持等）的详细开发者指南。
-
-
-
- <li> <a href="{@docRoot}preview/samples.html">示例代码</a>，演示如何支持权限和其他新功能。
-
- <li> N Developer Preview 当前版本的<a href="{@docRoot}preview/support.html#release-notes">版本说明</a>，包括变更说明和差异报告。
-
-
-</ul>
-
-<h4 id="reference">可下载的 API 参考资料</h4>
-
-<p>
- 在 Preview 更新初期，您可以下载最新的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Android N 平台 API 参考资料</a>，作为单独的 Zip 存档。下载的参考资料还包含差异报告，可帮助您识别相对 API 23 和上一次更新 API 的变更。
-
-
-
-
-</p>
-
-<p>
- 在确定最终版本 Android N API 并指定正式 API 级别后，我们将在网站 <a href="https://developer.android.com">https://developer.android.com</a> 上提供 API 参考资料。
-
-</p>
-
-<h3 id="support_resources">
- 支持资源
-</h3>
-
-<p>
- 在 N Developer Preview 中测试和开发时，请使用以下渠道报告问题和提供反馈。
-
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue Tracker</a>是您的<strong>主要反馈渠道。</strong>
-您可通过 Issue Tracker 报告错误、性能问题和一般反馈。
-您还可检查 <a href="{@docRoot}preview/bugs">已知问题</a>并找出解决方法步骤。
-
-我们将对您的问题进行分类并发送到 Android 工程团队以供审查，且会为您提供进度更新通知。
- </li>
- <li> <a href="{@docRoot}preview/dev-community">Android N 开发者社区</a>是一个 Google+ 社区。在此社区中，您可<strong>与其他使用 Android N 的开发者建立联系</strong>。您可以分享观察结果或想法，或找到 Android N 问题的解决方法。我们将管理社区，并根据需要提供解答和指导。
-
-
-
-</li>
-</ul>
-
-<h3 id="targeting">锁定目标、Preview API 和发布</h3>
-
-<p>
- N Developer Preview 提供的系统和 Android 库仅面向开发，<strong>不具备标准的 API 级别</strong>。如果您想通过拒绝兼容性行为测试您的应用（强烈推荐此做法），则可将应用的 <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code> 设置为 <code>“N”</code>，从而锁定 Android N 的预览版本。
-
-
-
-
-
-</p>
-
-<p>
- Android N Developer Preview 提供<strong>预览版 API</strong> 功能
-— 在最终的 SDK 发布之前，这些 API 都不是正式的 API。目前，最终的 SDK 计划于 2016 年第三季度发布。
-这意味着一段时期内，特别是该计划的最初几周内，
-<strong>API 可能会出现细微变化</strong>。
-我们会通过 Android N Developer Preview 的每次更新，为您提供一份变更摘要。
-
-</p>
-
-<p class="note">
- <strong>注</strong>：虽然 Preview API 可能会更改，但基本系统行为仍保持稳定，可以立即用于测试。
-
-
-</p>
-
-<p>
- Google Play <strong>禁止发布面向 N Developer Preview 的应用</strong>。
-当 Android N 最终版本 SDK 可用时，您可以锁定官方 Android N API 级别，并通过 alpha 和 beta 发布渠道将应用发布至 Google Play。
-
-与此同时，如果您需要将针对 Android N 的应用分发给测试者，则可通过电子邮件或从您的网站直接下载实现这一点。
-
-
-</p>
-
-<p>
- 在向 AOSP 和 OEM 全面发布 Android N 后（计划在 2016 年第三季度发布），您将可以在 Google Play 的公开发布渠道发布面向 Android N 的应用。
-
-
-</p>
-
-
-<h2 id="how_to_get_started">入门指南</h2>
-
-<p>
- 在使用 Android N 测试应用前，请执行以下操作：
-</p>
-
-<ol>
- <li> 查看 <a href="{@docRoot}preview/api-overview.html">API 概览</a>和<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>，大致了解新功能及其如何影响您的应用。
-
-尤其是，您需要了解新的<a href="{@docRoot}preview/features/notification-updates.html">通知</a>功能和<a href="{@docRoot}preview/features/multi-window.html">多窗口支持</a>。
-
-</li>
- <li> 根据<a href="{@docRoot}preview/setup-sdk.html">设置 Preview SDK</a> 和配置测试设备的说明设置您的环境。
-</li>
- <li> 根据<a href="https://developers.google.com/android/nexus/images">刷入说明</a>，对设备刷入最新的 Android N 系统映像。
- </li>
- <li> 查阅 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考资料</a>和 <a href="{@docRoot}preview/samples.html">Android N 示例</a>，更深入地了解新 API 功能以及如何在应用中使用这些功能。
-
-
- <li> 加入 <a href="{@docRoot}preview/dev-community">Android N 开发者社区</a>，获取最新资讯，并与使用新平台的其他开发者建立联系。
-
-</li>
-</ol>
-
-<p>
- 感谢您加入 Android N Developer Preview 计划！
-</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/preview_toc.cs b/docs/html-intl/intl/zh-cn/preview/preview_toc.cs
deleted file mode 100644
index 9e852c5..0000000
--- a/docs/html-intl/intl/zh-cn/preview/preview_toc.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html" es-lang="Información general del programa" in-lang="Ikhtisar Program" ja-lang="プログラム概要" ko-lang="프로그램 개요" pt-br-lang="Visão geral do programa" ru-lang="Обзор программы" vi-lang="Tổng quan về Chương trình" zh-cn-lang="计划概览" zh-tw-lang="程式總覽">计划概览</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">支持与版本说明</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html" es-lang="Configurar el SDK de la versión preliminar" in-lang="Menyiapkan Preview" ja-lang="Preview SDK のセットアップ" ko-lang="미리 보기 SDK 설정하기" pt-br-lang="Configuração do Preview SDK" ru-lang="Настройка пакета SDK Preview" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="设置预览版 SDK" zh-tw-lang="設定預覽版 SDK">设置 Preview</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html" es-lang="Pruebe en un dispositivo" in-lang="Menguji pada Perangkat" ja-lang="デバイス上でテストする" ko-lang="기기에서 테스트" pt-br-lang="Testar em um dispositivo" ru-lang="Тестирование на устройстве" vi-lang="Kiểm thử trên Thiết bị" zh-cn-lang="在设备上测试" zh-tw-lang="在裝置上測試">在设备上测试</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html" es-lang="Cambios en los comportamientos" in-lang="Perubahan Perilaku" ja-lang="動作の変更点" ko-lang="동작 변경" pt-br-lang="Mudanças de comportamento" ru-lang="Изменения в работе" vi-lang="Các thay đổi Hành vi" zh-cn-lang="行为变更" zh-tw-lang="行為變更">行为变更</a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html" es-lang="Optimizaciones en segundo plano" in-lang="Optimisasi Latar Belakang" ja-lang="バックグラウンド処理の最適化" ko-lang="백그라운드 최적화" pt-br-lang="Otimizações em segundo plano" ru-lang="Оптимизация фоновых процессов" vi-lang="Tối ưu hóa Chạy ngầm" zh-cn-lang="后台优化" zh-tw-lang="背景最佳化">后台优化</a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html" es-lang="Idioma y configuración regional" in-lang="Bahasa dan Lokal" ja-lang="言語とロケール" ko-lang="언어 및 로케일" pt-br-lang="Idioma e localidade" ru-lang="Язык и языковой стандарт" vi-lang="Ngôn ngữ và Bản địa" zh-cn-lang="语言和区域设置" zh-tw-lang="語言和地區設定">语言和区域设置</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html" es-lang="Información general de la API" in-lang="Android N untuk Pengembang" ja-lang="API の概要" ko-lang="API 개요" pt-br-lang="Visão geral da API" ru-lang="Обзор API-интерфейсов" vi-lang="Android N cho Nhà phát triển" zh-cn-lang="API 概览" zh-tw-lang="API 總覽">Android N for Developers </a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html" es-lang="Compatibilidad con ventanas múltiples" in-lang="Dukungan Multi-Jendela" ja-lang="マルチ ウィンドウのサポート" ko-lang="다중 창 지원" pt-br-lang="Suporte a várias janelas" ru-lang="Поддержка многооконного режима" vi-lang="Hỗ trợ đa cửa sổ" zh-cn-lang="多窗口支持" zh-tw-lang="多視窗支援">多窗口支持</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html" es-lang="Notificaciones" in-lang="Pemberitahuan" ja-lang="通知" ko-lang="알림" pt-br-lang="Notificações" ru-lang="Уведомления" vi-lang="Thông báo" zh-cn-lang="通知" zh-tw-lang="通知">通知</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html">Data Saver</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html" es-lang="Grabación de TV" in-lang="Perekaman TV" ja-lang="TV の録画" ko-lang="TV 녹화" pt-br-lang="Gravação para TV" ru-lang="Запись ТВ" vi-lang="Ghi lại TV" zh-cn-lang="TV 录制" zh-tw-lang="電視錄製">TV 录制</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html" es-lang="Configuración de seguridad de la red" in-lang="Network Security Configuration" ja-lang="ネットワーク セキュリティ構成" ko-lang="네트워크 보안 구성" pt-br-lang="Configurações de segurança de rede" ru-lang="Конфигурация сетевой безопасности" vi-lang="Cấu hình Bảo mật mạng" zh-cn-lang="网络安全配置" zh-tw-lang="網路安全性設定">网络安全配置</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html" es-lang="API de ICU4J del framework de Android" in-lang="ICU4J Android Framework API" ja-lang="ICU4J Android フレームワーク API" ko-lang="ICU4J Android 프레임워크 API" pt-br-lang="APIs de estrutura do Android para ICU4J" ru-lang="API-интерфейсы ICU4J в платформе Android" vi-lang="API Khuôn khổ Android ICU4J" zh-cn-lang="ICU4J Android 框架 API" zh-tw-lang="ICU4J Android 架構 API">ICU4J 支持</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html" es-lang="Funciones del lenguaje Java 8" in-lang="Fitur Bahasa Java 8" ja-lang="Java 8 の機能" ko-lang="Java 8 언어 기능" pt-br-lang="Recursos de linguagem do Java 8" ru-lang="Возможности языка Java 8" vi-lang="Tính năng của Ngôn ngữ Java 8" zh-cn-lang="Java 8 语言功能" zh-tw-lang="Java 8 語言功能">Java 8 语言功能</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html">Android for Work 更新</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html" es-lang="Acceso a directorios determinados" in-lang="Scoped Directory Access" ja-lang="特定のディレクトリへのアクセス" ko-lang="범위가 지정된 디렉터리 액세스" pt-br-lang="Acesso a diretórios com escopo" ru-lang="Доступ к выделенным каталогам" vi-lang="Truy cập Thư mục theo Phạm vi" zh-cn-lang="作用域目录访问" zh-tw-lang="限定範圍目錄存取">作用域目录访问</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html" es-lang="Ejemplos" in-lang="Contoh" ja-lang="サンプル" ko-lang="샘플" pt-br-lang="Exemplos" ru-lang="Примеры" zh-cn-lang="示例" zh-tw-lang="範例">示例</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html" es-lang="Contrato de licencia" ja-lang="使用許諾契約" ko-lang="라이선스 계약" pt-br-lang="Contrato de licença" ru-lang="Лицензионное соглашение" zh-cn-lang="许可协议" zh-tw-lang="授權協議">许可协议</a></div>
- </li>
-
-</ul>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-cn/preview/samples.jd b/docs/html-intl/intl/zh-cn/preview/samples.jd
deleted file mode 100644
index dd68566..0000000
--- a/docs/html-intl/intl/zh-cn/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=示例
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- 以下是 Android N 的代码示例。要在 Android Studio 中下载示例，请选择 <b>File > Import Samples</b> 菜单项。
-
-
-</p>
-
-<p class="note">
- <strong>注：</strong>这些可下载的项目设计用于与 Gradle 和 Android Studio 结合使用。
-
-</p>
-
-
-<h3 id="mw">多窗口 Playground</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- 此示例演示如何在您的应用中充分利用多窗口用户界面。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
-在 GitHub 中获取</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">活动通知</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 这是一个已存在的示例，其显示一个使用 NotificationCompat 发送通知的简单服务。该服务将来自用户的每个未读会话以不同的通知形式发送。
-
-
-</p>
-<p>
- 此示例已更新，以充分利用 Android N 中提供的新的通知功能。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">在 GitHub 中获取</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">消息传递服务</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- 这是一个已存在的示例，其演示如何使用 NotificationManager 指示应用当前显示的通知数量。
-
-
-</p>
-<p>
- 此示例已更新，以充分利用 Android N 中提供的新的通知功能。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">在 GitHub 中获取</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">直接启动</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 此示例显示如何在设备加密的存储（启动设备后始终可用）中存储和访问数据。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">在 GitHub 中获取</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">作用域目录访问</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 此示例演示如何从特定目录读取和写入数据，同时需要较少的权限。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">在 GitHub 中获取</a>
-
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-cn/preview/setup-sdk.jd b/docs/html-intl/intl/zh-cn/preview/setup-sdk.jd
deleted file mode 100644
index 872ad7c..0000000
--- a/docs/html-intl/intl/zh-cn/preview/setup-sdk.jd
+++ /dev/null
@@ -1,187 +0,0 @@
-page.title=设置 Preview
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">获取 Android Studio 2.1</a></li>
- <li><a href="#get-sdk">获取 Android N SDK</a>
- <ol>
- <li><a href="#docs-dl">参考文档</a>
- </ol>
- </li>
- <li><a href="#java8">获取 Java 8 JDK</a></li>
- <li><a href="#create-update">更新或创建一个项目</a></li>
- <li><a href="#next">后续步骤</a></li>
-</ol>
- </div>
-</div>
-
-<p>若要开发适用于 Android N Preview 的应用，您需要对您的开发者环境进行一些更新，如本页所述。
-</p>
-
-<p>若只是在 Android N 系统映像上测试应用的兼容性，请按照<a href="{@docRoot}preview/download.html">在 Android N 设备上进行测试</a>指南进行操作。
-</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">获取 Android Studio 2.1</h2>
-
-<p>Android N 平台为 <a href="{@docRoot}preview/j8-jack.html">Java 8 语言功能</a>添加支持，该功能需要一个名为 Jack 的新编译。
-当前仅在 Android Studio 2.1 中支持最新的 Jack 版本。因此，如果您想要使用 Java 8 语言功能，则必须使用 Android Studio 2.1 构建应用。
-
-
-或者，您不需要使用 Jack 编译器，但仍需要更新至 JDK 8 以便使用 Android N 平台进行编译，如下所述。
-
-</p>
-
-<p>如果您已经安装了 Android Studio，请通过点击 <strong>Help > Check for Update</strong>（在 Mac 上，点击 <strong>Android Studio > Check for Updates</strong>）来确保您安装的是 Android Studio 2.1 或更高版本。
-
-</p>
-
-<p>如果您尚未安装，请在此处<a href="{@docRoot}studio/">下载 Android Studio 2.1</a>。
-</p>
-
-
-<h2 id="get-sdk">获取 N Preview SDK</h2>
-
-<p>开始使用 Android N API 进行开发时，您需要按如下所示在 Android Studio 中安装 Android N Preview SDK：
-</p>
-
-<ol>
- <li>点击 <strong>Tools >Android >
-SDK Manager</strong> 来打开 SDK 管理器。</li>
-
- <li>在 <strong>SDK Platforms</strong> 选项卡中选中 <strong>Android N Preview</strong> 复选框。
-</li>
-
- <li>点击 <strong>SDK Tools</strong> 选项卡，然后选中
- <strong>Android SDK Build Tools</strong>、<strong>Android SDK
- Platform-Tools</strong> 和 <strong>Android SDK Tools</strong> 复选框。
-
- </li>
-
- <li>点击 <strong>OK</strong>，然后接受需要安装的所有软件包的许可协议。
-
- </li>
-</ol>
-
-<h3 id="docs-dl">获取 N Preview 参考文档</h3>
-
-<p>
- 有关 Android N API 的详细信息可在 N Preview 参考文档中获取，您可以从下表下载该文档。此软件包包含一个离线的删节版 Android 开发者网站，并包含更新的 API 参考（适用于 Android N API），以及一个 API 差异报告。
-
-
-
-
-</p>
-
-<table>
- <tr>
- <th scope="col">文档</th>
- <th scope="col">校验和</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip">n-preview-3-docs.zip</a></td>
- <td width="100%">
- MD5:19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
- SHA-1:9224bd4445cd7f653c4c294d362ccb195a2101e7
- </td>
- </tr>
-<table>
-
-
-
-<h2 id="java8">获取 Java 8 JDK</h2>
-
-<p>若要使用 Android N 平台编译您的应用，并在 Android Studio 2.1 中使用一些工具，您需要安装 Java 8 Developer Kit (JDK 8)。
-因此，如果您还没有最新版本，请立即下载 JDK 8 。
-</p>
-
-<p>然后，按如下所示在 Android Studio 中设置 JDK 版本：</p>
-
-<ol>
- <li>在 Android Studio 中打开 Android 项目，然后通过选择 <strong>File > Project Structure</strong> 打开“Project Structure”对话框。（或者，您可以通过选择 <strong>File > Other Settings > Default Project Structure</strong> 设置所有项目的默认值。）
-
-
-
-
- </li>
- <li>在对话框的左侧面板中，点击 <strong>SDK Location</strong>。
- </li>
- <li>在 <strong>JDK Location</strong> 字段中，输入 Java 8 JDK 的位置（点击右侧的按钮可浏览您的文件），然后点击 <strong>OK</strong>。
-
-
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">更新或创建一个项目</h2>
-
-<p>
- 若要使用 Android N API，则必须正确配置您的项目。
-</p>
-
-<p>如果您计划使用 Java 8 语言功能，您还应阅读 <a href="{@docRoot}preview/j8-jack.html">Java 8 语言功能</a>，以更详细的了解支持的 Java 8 功能，以及如何使用 Jack 编译器配置项目。
-
-
-</p>
-
-
-<h3 id="update">更新现有项目</h3>
-
-<p>打开模块的 <code>build.gradle</code> 文件，并按如下所示更新值：
-
-
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc3'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">创建新项目</h3>
-
-
-<p>若要使用 Android N Preview SDK 创建新的开发项目：</p>
-
-<ol>
- <li>点击 <strong>File > New Project</strong>。按照步骤进行操作，直到您到达“Target Android Devices”页面。
-
- </li>
- <li>在此页面上，选择 <strong>Phone and Tablet</strong> 选项。</li>
- <li>在 <strong>Phone and Tablet</strong> 选项下，从 <strong>Minimum SDK</strong> 选项列表中，选择 <strong>N: Android API 23, N Preview (Preview)</strong>。
-
-</li>
-</ol>
-
-
-<h2 id="next">后续步骤</h2>
-
-<ul>
- <li>按照<a href="{@docRoot}preview/download.html">在 Android N 设备上进行测试</a>指南进行操作。</li>
- <li>通过<a href="{@docRoot}preview/behavior-changes.html">行为变更</a>以及 <a href="{@docRoot}preview/api-overview.html">Android N API 和功能</a>了解更多有关 Android N 平台的信息。
-
-
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/zh-cn/preview/support.jd b/docs/html-intl/intl/zh-cn/preview/support.jd
deleted file mode 100644
index 9efb5b2..0000000
--- a/docs/html-intl/intl/zh-cn/preview/support.jd
+++ /dev/null
@@ -1,1188 +0,0 @@
-page.title=支持和版本说明
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>本文内容</h2>
-
-<ul>
- <li><a href="#dp3">Developer Preview 3</a>
- <ul>
- <li><a href="#general">一般公告</a></li>
- <li><a href="#new">DP3 的新功能</a></li>
- <li><a href="#ki">已知问题</a></li>
- </ul>
- </li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- 当您使用 Android N Developer Preview 进行开发和测试时，您可借助两个主要支持渠道：
-请在 <a href="https://developer.android.com/preview/bug">https://developer.android.com/preview/bug</a> 提交有关设备、系统和 Google App 错误的错误。
-对于其他应用问题，请直接联系开发者。
-
-</p>
-
-<p>若要与其他参与 Android N 的开发者讨论问题或想法，请加入 <a href="{@docRoot}preview/dev-community">Developer Preview Google+ 社区</a>。
-</p>
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>日期：2016 年 5 月<br>
- 构建：NPD35K<br>
- 模拟器支持：x86 & ARM（32/64 位）<br>
- Google Play 服务：8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">一般公告</h3>
-
-<p>
- Developer Preview 版本适用于<strong>应用开发者和其他早期试用者</strong>，可用于日常使用、开发或兼容性测试。
-
-请注意关于版本的一般注意事项：
-
-</p>
-
-<ul>
- <li>这个版本可能会在支持设备上出现不同的<strong>稳定性问题</strong>。
-用户可能会遇到系统不稳定，如内核错误和崩溃。
-
- </li>
-
- <li>有些应用<strong>可能无法在新的平台版本上如预期运行。</strong>
-这其中包括 Google 应用和其他应用。
- </li>
-
- <li>Developer Preview 3 已在以下设备上经过<strong>兼容性测试套件 (CTS) 批准</strong>：
-Nexus 5X、Nexus 6、Nexus 6P 和 Pixel C。依赖 CTS 批准构建的应用应能在这些设备上正常运行(例如 Android Pay)。
-
-
- </li>
-
- <li>Developer Preview 3 <strong>适用于所有支持设备：</strong>
-Nexus 5X、Nexus 6、Nexus 6P、Nexus 9、Nexus Player、Pixel C、General Mobile 4G (Android One) 以及 Sony Xperia Z3 (D6603 和
- D6653 型号)。
-
-
- </li>
-</ul>
-
-
-<h3 id="new">DP3 的新功能</h3>
-
-<h4 id="">面向 Android 的 VR 模式</h4>
-
-<p>
- Android N 为新的 VR 模式增加了平台支持和优化，以使开发者能为用户打造高质量移动 VR 体验。
-增加了一些性能增强特性，包括允许 VR 应用访问某个专属的 CPU 核心。
-
-在您的应用中，您可以充分利用到专为 VR 设计的智能头部跟踪和立体声通知功能。
-最重要的是，Android N 的图形延时非常低。
-
-</p>
-
-<p>
- 如需更多信息，请参阅<a href="https://developers.google.com/vr/android/">面向 Android 的Google VR SDK</a>。
-</p>
-
-<h4 id="">持续性能模式</h4>
-
-<p>
- 为解决这些限制，Android N 包括了<a href="{@docRoot}preview/api-overview.html#sustained_performance_api">持续性能模式</a> 支持，帮助原始设备制造商 (OEM) 提供关于长期运行应用的设备性能能力的提示。
-
-应用开发者随后可以使用这些提示来根据可预测的一致设备性能水平调整长期应用。
-
-应用开发者只能在 Nexus 6P 设备的 Developer Preview 上尝试这项新的 API。
-
-</p>
-
-<h4>多进程 WebView</h4>
-
-<p>
- 从 Android N 中的版本 51 开始，WebView 将开发者选项“多进程 WebView”被启用时，在一个单独的沙盒进程中运行网页内容。
-
-WebView 团队正在寻求关于 N 中的兼容性和运行时性能的反馈，并随后将在未来 Android 版本中启用多进程 WebView。
-
-在这个版本中，可预期启动时间回归、总内存使用和软件渲染性能。
-
-</p>
-
-<p>
- 如果您在多进程模式中遇到意外问题，请告诉我们。
-请通过<a href="https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">提交错误</a>来联系 WebView 团队。
-
-</p>
-
-<h4 id="">键盘快捷键辅助工具</h4>
-
-<p>
- 在 Android N 中，用户可以按 <code>Meta+/</code> 触发<strong>键盘快捷键</strong>屏幕，它会显示系统和对焦的应用中可用的所有快捷键。
-
-开发者可以添加自己的快捷键，或者从他们的应用触发快捷键屏幕。
-请参阅<a href="{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">键盘快捷键辅助工具</a>以了解详细信息。
-
-</p>
-
-<h4 id="">FrameMetrics API</h4>
-
-<p>
- DP3 引入了一项新的 <a href="{@docRoot}preview/api-overview.html#framemetrics_api">FrameMetrics API</a>，它通过公开流式传输 Pub/Sub API 来传递应用的当前窗口帧计时信息，允许应用监测其 UI 渲染性能。<code>FrameMetricsListener</code> 可用于从更高的粒度衡量生产中的交互级 UI 性能，无需 USB 连接。
-
-
-
-
-
-</p>
-
-<h4 id="api-changes">功能和 API 更改</h4>
-
-<dl>
- <dt>
- 启动器快捷键和启动器快捷键 API
- </dt>
-
- <dd>
- 我们已经决定将这项功能推迟到未来的 Android 版本中。我们计划从下一个 Developer Preview 开始，从公开 Android N API 中移除启动器快捷键 API（ShortcutManager 等）。
-
-
- </dd>
-
- <dt>
- WebView Javascript 在页面加载之前运行
- </dt>
-
- <dd>
- 从面向 Android N 的应用开始，JavaScript 上下文会在加载新页面时重置。
-目前，新 {@link android.webkit.WebView} 实例中加载的第一个页面会继承上下文。
-
- 想要在 {@link
- android.webkit.WebView} 中注入 Javascript 的开发者应在页面开始加载后执行脚本。
-
- </dd>
-
- <dt>
- 不安全起点上的 WebView 地理定位
- </dt>
-
- <dd>
- 从面向 Android N 的应用开始，地理定位 API 将仅在安全的起点（通过 HTTPS）上被允许。
-此政策的目的是在用户使用不安全连接时保护他们的私人信息。
-
- </dd>
-
- <dt>
- Data Saver
- </dt>
-
- <dd>
- 从 Developer Preview 3 开始，应用可以使用 Intent 来显示系统对话框，使用户能直接向 Data Saver 豁免白名单中添加应用。
-
-请参阅 <a href="{@docRoot}preview/api-overview.html#data_saver">Data Saver 文档</a>以了解详细信息。
-
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#number-blocking">号码屏蔽</a>
- </dt>
-
- <dd>
- 如果未经授权的用户试图屏蔽或取消屏蔽一个号码，操作会即时失败，并返回 {@link java.lang.SecurityException}。
-（之前，操作曾引发 {@link java.lang.UnsupportedOperationException} ）
-
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">快速设置图块 API</a>
-
- </dt>
-
- <dd>
- 系统现在使用 Activity 的元数据来决定图块模式。
- （之前平铺模式是由 <code>TileService.onTileAdded()</code> 的返回值决定。）
-如需了解详细信息，请参阅可下载的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 参考</a> 中的
-<code>TileService.META_DATA_ACTIVE_TILE</code>。
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">修复开发者报告的问题</h4>
-
-<p>
- 开发者报告的许多问题都已得到修复，包括：
-</p>
-
-<ul>
- <li>在 1 首歌后蓝牙音频播放中断（错误 <a href="https://code.google.com/p/android/issues/detail?id=206889">206889</a>）
- </li>
-
- <li>Pixel C 不断崩溃（错误 <a href="https://code.google.com/p/android/issues/detail?id=206962">206962</a>）
- </li>
-
- <li>时钟和 Toast 通知问题（错误 <a href="https://code.google.com/p/android/issues/detail?id=203094">203094</a>）
- </li>
-
- <li>当通过 USB C 电缆连接到 MacBook Pro 时，Pixel C 重新启动（错误 <a href="https://code.google.com/p/android/issues/detail?id=205432">205432</a>）
-
- </li>
-
- <li>日历偏移一天（错误 <a href="https://code.google.com/p/android/issues/detail?id=203002">203002</a>）
- </li>
-
- <li>TelephonyManager.getAllCellInfo 返回无效数据（错误 <a href="https://code.google.com/p/android/issues/detail?id=203022">203022</a>）
- </li>
-
- <li>Nexus 6p，蓝牙一直断开（错误 <a href="https://code.google.com/p/android/issues/detail?id=208062">208062</a>）
- </li>
-</ul>
-
-<p>如需已修复问题的完整清单，请参阅 <a href="https://goo.gl/6uCKtf">Issue Tracker</a>。
-</p>
-
-<h3 id="ki">已知问题</h3>
-
-<h4>无障碍功能</h4>
-
-<ul>
- <li>将间距被设置为近最大水平时，无法侦听 TTS 输出。
- </li>
-
- <li>当用户添加工作资料时可能会使无障碍功能和设置中断。
-无障碍状态会在用户下一次触及相关设置时恢复。
-
- </li>
-</ul>
-
-<h4>相机</h4>
-
-<ul>
- <li>相机应用表现出了不稳定性；它可能会在各种情况下崩溃，例如当在多窗口模式下启动时。
-
- </li>
-
- <li>在全景模式下连按快门可能导致相机应用崩溃。
-
- </li>
-</ul>
-
-<h4>音频</h4>
-<ul>
- <li>平台音频播放器问题阻止某些应用程序的正常运行。
-例如，Skype 和其他应用程序受到此问题的影响。
- </li>
-</ul>
-
-<h4>连接</h4>
-
-
-<ul>
- <li>当蓝牙低功耗 (BLE) 外围角色设备公布一项服务和一项 BLE 中心角色设备相连时，外围角色设备很快会断开连接。
-
-
- </li>
-
- <li>当屏幕关闭时 Wi-Fi 连接可能丢失。
- </li>
-
- <li>RFCOMM 连接不稳定，可能导致数据损坏和悬挂的连接。
-
- </li>
-
- <li>活动网络状态（{@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} 和 {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}）可能会在一些受限制的后台情况下返回错误的值。
-
- </li>
-</ul>
-
-
-<h4>
- 启动器
-</h4>
-
-<ul>
- <li>默认启动器的所有应用托盘都可能在循环关闭/开启屏幕后无响应。
-返回到主屏幕并重新启动所有应用程序托盘可以解决这个问题。
-
- </li>
-</ul>
-
-<h4>
- 键盘
-</h4>
-
-<ul>
- <li>在将一个运行 Android 6.0 或更早版本的设备更新到 N Developer Preview 时，Google 键盘不会保留首选项数据，如最近的表情符号和声音设置。
-
-
- </li>
-
- <li>Google Indic 托管键盘可能不稳定。
- </li>
-
- <li>当在密码字段中输入文本时，用户可以选择俄罗斯语作为输入语言，但键盘仍将为英语。
-这可以防止用户输入俄罗斯语的密码。
-
- </li>
-</ul>
-
-<h4>
- 区域设置和语言
-</h4>
-
-<ul>
- <li>当使用从右到左 (RTL) 的语言区域时，系统可能会在重新启动设备后意外切换到从左到右 (LTR) 表示。
-
- </li>
-</ul>
-
-<h4>媒体</h4>
-
-<ul>
- <li>Nexus 9 和 Nexus Player 上的媒体播放可能会不稳定，包括播放高清视频出现问题。
-
- </li>
-</ul>
-
-<h4>
- 多窗口模式
-</h4>
-
-<ul>
- <li>当在多窗口模式下改变屏幕方向时，设备可能会冻结。
- </li>
-
- <li>目前有几个应用程序出现了多窗口模式问题：
- <ul>
- <li>当把“Settings > Display > Screen brightness”对接到多窗口时，系统 UI 可能崩溃。
-
- </li>
-
- <li>在多窗口模式下启动时，相机应用可能会崩溃。
- </li>
-
- <li>在多窗口模式下启动时，YouTube 可能会崩溃。若要修复此问题，您可以在“Storage > Apps > YouTube”中清除 YouTube 应用数据。
-
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Google Play 服务
-</h4>
-
-<ul>
- <li>当用户选择一个使用 ASCII 范围外的字母和数字的系统语言区域时，通过 Google Play 服务使用 Google Cast 的应用可能会不稳定。
-
-
- </li>
-</ul>
-
-<h4>
- Android for Work 和 Google Apps 设备规范
-</h4>
-
-<ul>
- <li>当用户在“设备规范状态”屏幕固定的情况下解锁设备时，设备规范应用可能会崩溃。
-
- </li>
-
- <li>在启用了基于文件的加密的情况下，在设置了工作资料并随后关闭工作后，用户必须解锁主个人资料屏幕锁定，以便能再次访问工作应用。
-
-
- </li>
-
- <li>在移除安全模式锁定并在多窗口下打开工作应用/个人应用时，设备重新启动。
-
- </li>
-
- <li>设置 DISALLOW_VPN_CONFIG 会导致设备规范客户端设置的 Always-on-VPN 显示同意对话框。
-
- </li>
-
- <li>在 VPN 以 Always-on-VPN 模式连接之前，流量不会锁定。
- </li>
-</ul>
-
-<h4>
- 外部存储
-</h4>
-
-<ul>
- <li>当用户将应用从内部存储移动到可采用的外部存储（可能包括 SD 卡和通过 USB 连接的设备）时，应用可能会变得不稳定。
-
-
- </li>
-</ul>
-
-<h4>
- Google Play 中的屏幕缩放和多 APK
-</h4>
-
-<ul>
- <li>在运行 Android N 的设备上，Google Play 服务 9.0.83 错误地报告当前屏幕密度，而不是报告稳定屏幕密度。
-当屏幕缩放在这些设备上启用时，可能会导致 Google Play 选择一个为更小的屏幕设计的多 APK 应用版本。
-
-此问题已在下一版 Google Play 服务中得到修复，并将包含在以后的 Developer Preview 版本中。
-
-
- </li>
-
- <li>在运行 Android N 的设备上，Google Play 服务 9.0.83 版目前会报告 Vulkan 支持，但不会报告 Vulkan 版本。
-这可能会导致 Google Play 在有较高版本支持的设备上选择为较低的 Vulkan 支持而设计的多 APK 应用版本。
-
-目前，Google Play Store 不接受使用 Vulkan 版本定位的应用上传。
-这一支持将被添加到未来的 Google Play Store 中，并会在下一版 Google Play 服务（将包括在稍后的 Developer Preview 版本中）中得到修复，任何使用 Google Play 服务 9.0.83 版本的设备都将继续获得面向基本 Vulkan 支持的应用版本。
-
-
-
-
- </li>
-</ul>
-
-<h4 id="">通知</h4>
-
-<ul>
- <li>MessagingStyle 不显示发件人为“null”（自己）的通知。
- </li>
-</ul>
-
-<h4 id="">开发者工具</h4>
-
-<ul>
- <li>
- <code>adb</code> 有时可能在使用 JDWP 调试时断开连接。
- </li>
-</ul>
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-
-
-
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>日期：2016 年 4 月<br>
- 构建：NPC91K、NPC91O<br>
- 模拟器支持：x86 & ARM（32/64 位）<br>
- Google Play 服务：8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">DP2 的新功能</h3>
-
-<ul>
- <li>Vulkan（新的 3D 渲染 API）的平台支持，提供明晰、低开销的 GPU（图形处理单元）控制功能，同时大大提升绘图调用密集型应用的性能。
-
-有关详情，请参阅
-<a href="{@docRoot}ndk/guides/graphics/index.html"> 文档</a>。
- </li>
-
- <li>新人物表情符号，带肤色支持和新的 Unicode 9 字形。
- 在键盘在调色板中建立对它们的支持之前，肤色和新的表情符号将不会显示。
-开发者不需要进行任何操作便能使用这些新的表情符号，除非应用使用的是非系统字体。
-IME 开发者需要整合对新表情符号的支持。
-
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">启动器快捷键 API</a>：
-应用可以使用 <code>ShortcutManager</code> 来向启动器发送应用内起点的快捷键。
-
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">多窗口</a>：
- 您现在可以为 Activity 单独指定最小高度和最小宽度。
-此外，一些 API 名称已略有改变。
- </li>
-</ul>
-
-<h4 id="dp2-fixes">修复开发者报告的问题</h4>
-
-<p>
- 开发者报告的许多问题都已得到修复，包括：
-</p>
-
-<ul>
- <li>无法连接到隐藏的 SSID 或非广播 Wi-Fi。（错误 <a href="https://code.google.com/p/android/issues/detail?id=203116">203116</a>）
- </li>
-
- <li>麦克风在整个活动期间保持静音状态。（错误 <a href="https://code.google.com/p/android/issues/detail?id=205922">205922</a>）
- </li>
-
- <li>更改多窗口焦点会暂停 YouTube。（错误 <a href="https://code.google.com/p/android/issues/detail?id=203424">203424</a>）
- </li>
-
- <li>直接回复可能关闭打开的活动。（错误 <a href="https://code.google.com/p/android/issues/detail?id=204411">204411</a>）
- </li>
-
- <li>各种稳定性修复。
- </li>
-</ul>
-
-<h3 id="dp2-general">一般公告</h3>
-
-<p>
- Developer Preview 版本仅针对<strong>应用开发者</strong>，仅适用于兼容性测试和早期开发。
-
- 请注意关于版本的一般注意事项：
-</p>
-
-<ul>
-
- <li>开发工具组件和支持库已更新为 DP2 版本。
-确保为在开发 DP2 之前更新您的预览开发环境。
-如需有关设置您的开发环境的说明，请参阅 <a href="{@docRoot}preview/setup-sdk.html">设置 Preview</a>
-
-
- </li>
-
- <li>此版本在所有设备上都出现了不同的稳定性和性能问题，<strong>不适合在手机或平板电脑上的日常使用</strong>，特别是对于非开发人员。
-
-
- </li>
-
- <li>在此版本中，电池寿命和性能尚未优化：
-
-
- <ul>
- <li>系统和应用<strong>性能已知会周期性地减缓/卡顿</strong>，设备可能偶尔无响应。
-这些问题可能随着长时间使用而变得更迫切。
-
- </li>
-
- <li>电池寿命可能在此版本的屏幕开启和屏幕关闭用例里出现倒退。
-
- </li>
- </ul>
- </li>
-
- <li>有些<strong>应用可能无法在 Developer Preview 2 上正常</strong>运行。这其中包括 Google 应用和其他应用。
-
- </li>
-
- <li>这个早期版本未经<strong>兼容性测试套件 (CTS) 批准</strong>。
-依赖 CTS 批准架构的应用无法运行（例如 Android Pay）。
-
- </li>
-
- <li>此预览版支持以下设备：Nexus 5X、Nexus 6、 Nexus 6P、Nexus 9、and Pixel C 以及 General Mobile 4G (Android One)。
-
-即将推出 Nexus Player 支持。
- </li>
-
-
- <li><a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> 已被更新，以处理 DP1 和 DP2 之间的 API 变更。
-
- </li>
-</ul>
-
-<h3 id="dp2-ki">已知问题</h3>
-
-<h4>性能和电池</h4>
-
-<ul>
- <li>系统和应用<strong>性能已知会周期性地减缓/卡顿</strong>，设备可能偶尔无响应。
-这些问题可能随着长时间使用而变得更迫切。
-
- </li>
-</ul>
-
-<h4>Google 帐户</h4>
-
-<ul>
- <li>在有些情况下，<code>AccountManagerService</code> 问题可能会阻止登录 Google 帐户。
-
- </li>
-</ul>
-
-<h4>系统更新</h4>
-
-<ul>
- <li>设备可能会在更新到 DP2 后立即重新启动。
- </li>
-</ul>
-
-<h4>无障碍功能</h4>
-
-<ul>
- <li>当间距被设置为近最大水平时，文本语音转换 (TTS) 输出侦听出现问题。
-
- </li>
-</ul>
-
-<h4>蓝牙</h4>
-
-<ul>
- <li>蓝牙低功耗 (LE) GATT 特征使用错误的写入类型，并且将不会被发送到远程设备。
-因此，举例来说，有些健身设备将无法运行。
-
- </li>
-</ul>
-
-<h4>设置向导</h4>
-
-<ul>
- <li>安装向导中的在新设备（或刚刚重置的设备）上从“Your Google Account”恢复数据的选项不可用。
-您必须在安装向导中选择“another Android device”来从现有设备恢复数据，或者将其设置为新设备。
-
-
- </li>
-</ul>
-
-<h4>原始设备制造商 (OEM) 解锁</h4>
-
-<ul>
- <li>在有些设备上，当运行 DP2 时，“Developer Options”中的 <strong>Enable OEM unlock</strong> 会变成灰色。
-<br>
- <strong>解决方法：</strong>访问 <a href="https://www.google.com/android/beta" class="external-link">www.google.com/android/beta</a> 来选择加入 Android Beta 计划（如果您尚未选择加入）。
-
-然后，选择退出并接受降级 OTA。
-选择退出会导致设备降级到 Android 6.0。现在，您应该可以在“Developer Options”中选择 <strong>Enable OEM unlock</strong>。
-
-当您降级设备时，个人数据将被删除；但是不管怎样，解锁引导装载程序仍会删除这些数据。
-
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>工作安全性挑战
- <ul>
- <li>在迁移到 N 后，或在用户创建工作资料之后，工作资料无法在密钥库中创建秘钥，直到用户更改了模式、PIN 码或密码，或设置了一项工作挑战为止。
-
-
- </li>
-
- <li>在直接启动模式下，对设备应用密码限制会导致工作资料被解锁，即使设备是锁定的。
-
- 这会使工作资料变得可以访问，即使它应受到设备锁屏的保护。
-
- </li>
- </ul>
- </li>
-
- <li>Always on VPN
- <ul>
- <li>如果 Always On VPN 模式已打开，但 VPN 却不可用，这表示应用是通过普通网络链接。
-如果应用没有可用的 VPN 连接，这表示应用处于脱机状态。
-
- </li>
-
- <li>在 Always On 模式下，当设备以直接启动模式重新启动后，VPN 连接未建立，即使是在用户解锁安全锁屏之后。
-
-
- </li>
- </ul>
- </li>
-
- <li>暂停软件包
- <ul>
- <li>设备管理员可以暂停关键系统软件包，这可能会导致意外的行为，如拨打电话，即使此时显示了“Telephone disabled”对话框。
-
-
- </li>
- </ul>
- </li>
-
- <li>其他
- <ul>
- <li>如果当用户插入物理媒体（如 SD 卡）时 {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} 被设置为 true，设置应用会在启动时崩溃。
-
- </li>
-
- <li>工作资料中的第一次检查需要几分钟时间完成。
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>将连结数和非零之间的差值作为第一个连结数会导致 {@code vkCreateGraphicsPipeline()} 失败。
-</li>
- <li>Vulkan 在预期纹理坐标上表现出错误的采样行为。</li>
- <li>在 multithreadCmdBuffer 示例中，{@code vkCmdClearColorImage()} 会在运行 N-DP2 驱动程序时崩溃。
-</li>
- <li>{@code vkGetPhysicalDeviceFormatProperties()} 的返回值并未给 {@code VkFormatProperties::linearTilingFeatures} 设置一个值，这会导致取 0 值作为结果。
-
-</li>
- <li>Vulkan 浮点帧缓冲附件未能正确处理。</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>SPIR-V 着色器可能触发驱动程序断言。</li>
- <li>一些管线配置可能导致 {@code vkCreateGraphicsPipeline()} 崩溃。
-</li>
- </ul>
-</ul>
-
-<h4>设备特定问题</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- 当设备从插槽 1 切换到插槽2 SIM 时，数据连接失败。
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- 无法切换语音搜索“Always On”选项。
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- 除 HDR+ 照片之外的纵向相机照片被损坏。
-
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- Nexus Player 上的 Netflix 高清内容播放可能失败。
- </dd>
-
- <dd>
- 任何依赖于动态视频分辨率变化的应用都可能会在 Nexus Player 上失败。
-
- </dd>
-
- <dd>
- 任何使用 VP9 视频编解码器的应用都可能会在 Nexus Player 上失败。
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>日期：2016 年 3 月<br>
- 构建：NPC56P、NPC56R 已更新：NPC56W、NPC56X<br>
- 模拟器支持：x86 & ARM（32/64 位）<br>
- Google Play 服务：8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">一般公告</h3>
-
-<p>
- Developer Preview 版本仅针对应用开发者，仅适用于兼容性测试和早期开发。
-请注意关于版本的一般注意事项：
-
-</p>
-<ul>
- <li>此版本在所有设备上都出现了不同的稳定性和性能问题，<em>不适合在手机或平板电脑上的日常使用</em>，特别是对于非开发人员。
-
-
- </li>
-
- <li>系统和应用<strong>性能已知会周期性地减缓/卡顿</strong>，设备可能偶尔无响应。
-这些问题可能随着长时间使用而变得更迫切。
-
- </li>
-
- <li>电池寿命可能在此版本的屏幕开启和屏幕关闭用例里出现倒退。
-
- </li>
-
- <li>有些应用可能无法在 Developer Preview 1 上正常运行。这其中包括 Google 应用和其他应用。
-
- </li>
-
- <li>这个早期版本未经兼容性测试套件 (CTS) 批准。依赖 CTS 批准架构的应用将无法运行（例如 Android Pay）。
-
- </li>
-
- <li>此预览版支持以下设备：Nexus 5X、Nexus 6、 Nexus 6P、Nexus 9、Nexus Player、and Pixel C 以及 General Mobile 4G (Android One)。
-
-
- </li>
-</ul>
-
-<h3 id="dp1-platform">平台问题</h3>
-
-<h4>性能和电池</h4>
-
-<ul>
- <li>系统和应用性能已知会<strong>周期性地减缓/卡顿</strong>，设备可能偶尔无响应。
-这些问题可能随着长时间使用而变得更迫切。
-
- </li>
-
- <li>电池寿命可能在此版本的屏幕开启和屏幕关闭用例里出现倒退。
-
- </li>
-</ul>
-<h4 id="dialer">拨号器</h4>
-
-<ul>
- <li>拨号器应用不支持直接启动。这将稍后在 N Developer Preview 中解决。
-
- </li>
-
- <li>语音邮件播放无效。
- </li>
-</ul>
-
-<h4>麦克风</h4>
-
-<ul>
- <li>系统可能在多个应用中和重新启动时错误地保留麦克风静音状态。如果您在一项应用中将麦克风静音，并且此状态保留，打开有任何麦克风静音控件的应用，取消静音麦克风。</li>
-</ul>
-
-<h4 id="ui">系统 UI</h4>
-
-<ul>
- <li>系统 UI 中的一些新增或修改字符串未被翻译成所有语言。
-
- </li>
-
- <li>概览 UI 仍在开发中，并且随时可能更改。例如，我们打算移除当用户切换应用时显示的计时器。
-
-
- </li>
-
- <li>设置控件和切换可能很慢，或出现无响应。
- </li>
-
- <li>通知的视觉设计可能随时更改。
- </li>
-
- <li>在 Gmail 应用中，包括在捆绑通知中的电子邮件直接存档无法正常运行。
-
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>工作安全性挑战
- <ul>
- <li>在迁移到 N 后，或在用户创建工作资料之后，工作资料无法在密钥库中创建秘钥，直到用户更改了模式、PIN 码或密码，或设置了一项工作挑战为止。
-
-
- </li>
-
- <li>在直接启动模式下，对设备应用密码限制会导致工作资料被解锁，即使设备是锁定的。
-
- 这会使工作资料变得可以访问，即使它应受到设备锁屏的保护。
-
- </li>
-
- <li>当用户输入了错误的密码和 PIN 码后，系统不会显示任何信息性消息；相反，它仅清除了输入字段。
-
-此问题不影响模式或指纹输入。
- </li>
-
- <li>在平板电脑上，后台显示的工作挑战小得不成比例。
-
- </li>
-
- <li>与 N Developer Preview 绑定的 <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">Google Apps 设备规范</a>版本尚不支持工作资料安全性挑战功能。
-
-
- 开发者应使用 <a href="https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> 来测试此功能。
-
- </li>
- </ul>
- </li>
-
- <li>Always on VPN
- <ul>
- <li>如果 Always On VPN 模式开启，但 VPN 却不可用，这表示应用未被指定为通过普通网络连接的 Always On 政策例外。
-
-除非应用被指定为 Always On 政策例外，否则当没有可用的 VPN 连接时，应用会处于脱机状态。
-
- <ul>
- <li>在 Always On 模式下，当设备以直接启动模式重新启动后，VPN 连接未建立，即使是在用户解锁安全锁屏之后。
-
-
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>改进的联系人
- <ul>
- <li>蓝牙 PBAP/MAP 不显示工作联系人的来电显示。
-下一个 Preview 版本将解决此问题。
- </li>
- </ul>
- </li>
-
- <li>工作模式
- <ul>
- <li>Google 即时桌面不显示工作模式是否开启。
-Google 即时桌面也不显示应用暂停状态。
- </li>
-
- <li>在用户关闭和开启工作模式后，系统不再显示工作资料应用小工具，如日历。
-
- </li>
- </ul>
- </li>
-
- <li>暂停软件包
- </li>
-
- <li>设备管理员可以暂停关键系统软件包，这可能会导致意外的行为，如拨打电话，即使此时显示了“Telephone disabled”对话框。
-
-
- </li>
-
- <li>其他
- <ul>
- <li>如果当用户插入物理媒体（如 SD 卡）时 {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} 被设置为 true，设置应用会在启动时崩溃。
-
- </li>
-
- <li>当用户卸载然后重新安装一项应用后，{@code DPM.setPackagesSuspended} 状态不会持续。
-在卸载/重新安装后，应用应保持暂停，或者暂停的应用应无法卸载。
-
-
- </li>
-
- <li>工作资料中的第一次检查需要几分钟时间完成。
-这可能导致设备需要超过正常的时间才能在 Play EMM API 中可见。
-
- </li>
-
- <li>工作资料应用的通知不对安装在个人资料中的通知侦听器可见。
-其结果是，系统不能按预期显示通知。
-
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >键盘</h4>
-
-<ul>
- <li>键盘和 Android 设备之间的蓝牙配对可能不稳定。
- </li>
-</ul>
-
-<h4 >视频</h4>
-
-<ul>
-<li>视频播放可能滞后并显示中断。</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>Wi-Fi 发生了一些重构，可能改变 API 极端状况下的行为。
-具体来说，尝试连接特定网络，或尝试断开网络连接的应用应重新测试。
-
- </li>
-
- <li>旧版 DHCP 客户端已经从平台中移除。平台支持的唯一 DHCP 客户端是在 M 中引入的 DHCP 客户端。
-
- </li>
-</ul>
-
-<h4>直接启动</h4>
-
-<ul>
- <li>NFC 在第一次解锁前将无法运行。
- <ul>
- <li>当启用了蓝牙的电话重新启动时，蓝牙不会自动开启。
-您必须手动重新启用蓝牙。
- </li>
-
- <li>在某些情况下，默认铃声不在有来电和短信响起。
-此行为将在下一个 N Preview 版本中修复，但括一项例外（和解决方法）。
-
- </li>
-
- <li>在未刚刚清除数据的设备（自设置为直接启动模式以来至少已启动一次的设备），默认的通知铃声不响。
-
-用户可以通过从设置中手动选择铃声来解决此问题。
-
- </li>
-
- <li>在运行 N Developer Preview 版本的设备上，直接启动会默认启用。
-若要启用用于测试和开发的直接启动，前往“Developer Options”，然后点击“Convert to File Encryption”。
-
- 在这个开发者预览版本中，这要求恢复出厂设置为重新分配，并将您的设备格式重定为基于文件的加密。
-
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>Android TV 画中画</h4>
-
-<ul>
- <li>Recents UI 中的 PIP 集成并不全面，并且随时可能更改。
-
- <ul>
- <li>PIP 窗口的动画不顺畅。Preview 未来版本将改善这一点。
-
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">Preview 未来版本将改善 PIP 的视觉设计和布局调整。
-
- </li>
-</ul>
-
-<h4>错误报告</h4>
-
-<ul>
- <li>错误报告并不总是能成功完成（作为一种解决方法，有时它们仍然可以通过内部存储空间内的文档提供程序访问。
-
-
- </li>
-</ul>
-
-<h4>分屏多窗口</h4>
-
-<ul>
- <li>当进入分屏模式时，应用可能会发生崩溃和意外的 UI 行为。
-有些应用必须由应用开发者修复。
-
- </li>
-
- <li>如果一个应用面向的是 N 之前的 Android 平台版本，应用可能无法运行，分屏 Toast 通知可能会多次显示。
-
- </li>
-
- <li>在使用有固定屏幕方向的应用的同事长按 Overview 按钮可能导致意外应用行为。
-
- </li>
-
- <li>在调整大小时应用可能会闪烁。
- </li>
-
- <li>动画尚未最后确定。
- </li>
-</ul>
-
-<h4>输入方法</h4>
-
-<ul>
- <li>当<b>使用系统语言</b>时 Google 键盘意外变回通用 Google 键盘，但 Google 键盘不支持系统语言首选项中选定的任何语言。
-
-它应恢复为 American English。
-
- <p>
- 您可以通过添加至少一种 Google 键盘支持的语言来解决此问题。
-
- </p>
- </li>
-</ul>
-
-<h4>无障碍功能</h4>
-
-<ul>
- <li>话语提示显示的功能问题包括可能导致系统崩溃或缺少话语提示语音反馈的通知、快速设置图块和多窗口显示。
-
-下一个 Preview 版本将解决这些问题。
-
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">特定于设备的说明和问题</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>在这一版的 Preview 中，Nexus Player 预计会出现视频播放、应用兼容性和稳定性问题。
-
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>多窗口调整大小可能会导致崩溃。</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Nexus 9 设备可能无法在通过 Android Beta 计划获得空中下载 (OTA) 更新后启动。
-要恢复此问题，您可以尝试手动安装 OTA 映像。
-如需了解详细信息，请参阅<a href="{@docRoot}preview/download-ota.html">应用设备 OTA 映像 </a>。
-
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/zh-cn/preview/features/direct-boot.jd b/docs/html-intl/intl/zh-cn/training/articles/direct-boot.jd
similarity index 100%
rename from docs/html-intl/intl/zh-cn/preview/features/direct-boot.jd
rename to docs/html-intl/intl/zh-cn/training/articles/direct-boot.jd
diff --git a/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..6473fc8
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd
@@ -0,0 +1,152 @@
+page.title=作用域目录访问
+page.keywords=Preview、SDK、作用域目录访问
+page.tags=Android N
+
+@jd:body
+
+
+
+
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>本文内容</h2>
+ <ol>
+ <li><a href="#accessing">访问外部存储目录</a></li>
+ <li><a href="#removable">访问可移动介质上的目录</a></li>
+ <li><a href="#best">最佳做法</a></li>
+ </ol>
+</div>
+</div>
+
+<p>应用（如照片应用）通常只需要访问外部存储中的特定目录，例如 <code>Pictures</code> 目录。
+现有的外部存储访问方法未经专门设计，无法轻松地为这些类型的应用提供目标目录访问。
+
+例如：</p>
+
+<ul>
+<li>在您的清单中请求 {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+或 {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} 将允许访问外部存储上的所有公共目录，这可能导致访问的内容超出应用需要的内容。
+
+</li>
+<li>使用<a href="{@docRoot}guide/topics/providers/document-provider.html">存储访问框架</a>通常会让您的用户通过一个系统 UI 选取目录，如果应用始终访问同一个外部目录，则该操作没有任何必要。
+
+
+
+</li>
+</ul>
+
+<p>Android N 提供简化的全新 API 以访问通用外部存储目录。
+ </p>
+
+<h2 id="accessing">访问外部存储目录</h2>
+
+<p>使用 <code>StorageManager</code> 类获取适当的
+<code>StorageVolume</code> 实例。然后，通过调用该实例的
+<code>StorageVolume.createAccessIntent()</code> 方法创建一个 Intent。使用此 Intent 访问外部存储目录。
+若要获取所有可用卷的列表，包括可移动介质卷，请使用
+<code>StorageManager.getVolumesList()</code>。
+</p>
+
+<p>如果您有关于特定文件的信息，使用 <code>StorageManager.getStorageVolume(File)</code> 来获得包含该文件的 <code>StorageVolume</code>。
+
+调用在 <code>StorageVolume</code> 上的 <code>createAccessIntent()</code> 以访问文件的外部存储目录。
+
+</p>
+
+<p>
+在二级卷（例如外部 SD 卡）上，当调用 <code>StorageVolume.createAccessIntent()</code> 以请求访问整个卷，而不是特定目录时，传入“null”。如果您向主要卷传入“null”，或者如果您传入无效的目录名，<code>StorageVolume.createAccessIntent()</code> 将返回“null”。
+
+
+
+
+</p>
+
+<p>以下代码段展示如何在主要共享存储中打开<code>Pictures</code> 目录：
+</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>系统尝试授予对外部目录的访问权限，并使用一个简化的 UI 向用户确认访问权限（如果需要）：
+</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>图 1.</strong> 一个请求访问 Pictures 目录的应用。
+</p>
+
+<p>如果用户授予访问权限，则系统会调用
+<code>onActivityResult()</code> 重写方法，且结果代码为
+<code>Activity.RESULT_OK</code>，Intent 数据包含 URI。使用提供的 URI 访问目录信息，与使用<a href="{@docRoot}guide/topics/providers/document-provider.html">存储访问框架</a>返回的 URI 类似。
+
+
+
+</p>
+
+<p>如果用户不授予访问权限，则系统会调用
+<code>onActivityResult()</code> 重写方法，且结果代码为
+<code>Activity.RESULT_CANCELED</code>，Intent 数据为 null。</p>
+
+<p class="note"><b>注</b>：获得特定外部目录的访问权限也会获得该目录中子目录的访问权限。
+</p>
+
+<h2 id="removable">访问可移动介质上的目录</h2>
+
+<p>若要使用作用域目录访问来访问可移动介质上的目录，首先要添加一个用于侦听
+{@link android.os.Environment#MEDIA_MOUNTED} 通知的 {@link android.content.BroadcastReceiver}，例如：
+</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>当用户装载可移动介质时，如 SD 卡，系统将发送一则
+{@link android.os.Environment#MEDIA_MOUNTED} 通知。此通知在 Intent 数据中提供一个 <code>StorageVolume</code> 对象，您可用它访问可移动介质上的目录。
+
+以下示例访问可移动介质上的 <code>Pictures</code> 目录：
+</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">最佳做法</h2>
+
+<p>请尽可能保留外部目录访问 URI，这样即不必重复要求用户授予访问权限。
+在用户授予访问权限后，使用目录访问 URI 调用
+<code>getContentResolver().takePersistableUriPermssion()</code>。
+系统将保留此 URI，后续的访问请求将返回 <code>RESULT_OK</code>，且不会向用户显示确认 UI。
+
+</p>
+
+<p>如果用户拒绝授予外部目录访问权限，请勿立即再次请求访问权限。
+一再不停地请求访问权限会导致非常差的用户体验。
+如果用户拒绝了一项请求，而应用再次请求访问，UI 会显示一个 <b>Don't ask again</b> 复选框：
+</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>图 1.</strong> 应用第二次请求访问可移动介质。
+</p>
+
+<p>如果用户选择 <b>Don't ask again</b> 并拒绝请求，您的应用向指定目录提出的所有未来请求都将被自动拒绝，并且将不会有请求 UI 呈现给用户。
+
+</p>
diff --git a/docs/html-intl/intl/zh-cn/training/articles/security-config.jd b/docs/html-intl/intl/zh-cn/training/articles/security-config.jd
new file mode 100644
index 0000000..19e29b3
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/training/articles/security-config.jd
@@ -0,0 +1,747 @@
+page.title=网络安全配置
+page.keywords=Android N、安全、网络
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>本文内容</h2>
+<ol>
+ <li><a href="#manifest">添加安全配置文件</a></li>
+ <li><a href="#CustomTrust">自定义信任的 CA</a>
+ <ol>
+ <li><a href="#ConfigCustom">配置信任的自定义 CA</a></li>
+ <li><a href="#LimitingCas">限制信任的 CA 集</a></li>
+ <li><a href="#TrustingAdditionalCas">信任附加 CA</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">仅调试 CA</a></li>
+ <li><a href="#UsesCleartextTraffic">选择退出 Cleartext Traffic</a></li>
+ <li><a href="#CertificatePinning">固定证书</a></li>
+ <li><a href="#ConfigInheritance">配置继承行为</a></li>
+ <li><a href="#FileFormat">配置文件格式</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N 包含一个网络安全配置特性，让应用可以在一个安全的声明性配置文件中自定义其网络安全设置，而无需修改应用代码。
+
+可以针对特定域和特定应用配置这些设置。
+该特性的主要功能如下所示：
+
+</p>
+
+<ul>
+ <li>
+ <b>自定义信任锚：</b>针对应用的安全连接自定义哪些证书颁发机构 (CA) 值得信赖。
+例如，信任特定的自签署证书或限制应用信任的公共 CA 集。
+
+
+ </li>
+
+ <li>
+ <b>仅调试重写：</b>在应用中以安全方式调试安全连接，而不会增加安装基数的风险。
+
+ </li>
+
+ <li>
+ <b>Cleartext traffic 选择退出：</b>防止应用意外使用 cleartext traffic。
+
+ </li>
+
+ <li>
+ <b>证书固定：</b>将应用的安全连接限制为特定的证书。
+
+ </li>
+</ul>
+
+
+<h2 id="manifest">添加安全配置文件</h2>
+
+<p>
+ 网络安全配置特性使用一个 XML 文件，您可以在该文件中指定应用的设置。
+您必须在应用的清单中包含一个条目来指向该文件。
+以下代码摘自一份清单，演示了如何创建此条目：
+
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application ... >
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">自定义信任的 CA</h2>
+
+<p>
+ 应用可能需要信任自定义的 CA 集，而不是平台默认值。
+出现此情况的最常见原因包括：
+</p>
+
+<ul>
+ <li>连接到具有自定义证书颁发机构（自签署、由公司内部 CA 签发等）的主机。
+
+ </li>
+
+ <li>将 CA 集仅限于您信任的 CA，而不是每个预装 CA。
+
+ </li>
+
+ <li>信任系统中未包含的附加 CA。
+ </li>
+</ul>
+
+<p>
+ 默认情况下，来自所有应用的安全（例如 TLS、HTTPS）连接均信任预装的系统 CA，而面向 API 级别 23 (Android M) 及更低级别的应用默认情况下还会信任用户添加的 CA 存储。
+
+应用可以使用 {@code base-config}（针对应用范围的定制）或 {@code domain-config}（针对每个域的定制）自定义自己的连接。
+
+
+
+</p>
+
+
+<h3 id="ConfigCustom">配置自定义 CA</h3>
+
+<p>
+ 假设您要连接到使用自签署 SSL 证书的主机，或者连接到其 SSL 证书是由您信任的非公共 CA（如公司内部 CA）签发的主机。
+
+
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ 以 PEM 或 DER 格式将自签署或非公共 CA 证书添加到
+{@code res/raw/my_ca}。
+</p>
+
+
+<h3 id="LimitingCas">限制信任的 CA 集</h3>
+
+<p>
+ 如果应用不想信任系统信任的所有 CA，则可以自行指定，缩减要信任的 CA 集。
+这样可防止应用信任任何其他 CA 签发的欺诈性证书。
+
+</p>
+
+<p>
+ 限制信任的 CA 集的配置与针对特定域<a href="#TrustingACustomCa">信任自定义 CA</a> 相似，不同的是，前者要在资源中提供多个 CA。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ 以 PEM 或 DER 格式将信任的 CA 添加到 {@code res/raw/trusted_roots}。
+ 请注意，如果使用 PEM 格式，文件必须仅包含 PEM 数据，且没有额外的文本。
+<em></em>您还可以提供多个
+<a href="#certificates"><code><certificates></code></a>
+元素，而不是只能提供一个元素。
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ 信任附加 CA
+</h3>
+
+<p>
+ 应用可能需要信任系统不信任的附加 CA，出现此情况的原因可能是系统还未包含此 CA，或 CA 不符合添加到 Android 系统中的要求。
+
+应用可以通过为一个配置指定多个证书源来实现此目的。
+
+
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">配置用于调试的 CA</h2>
+
+<p>
+ 调试通过 HTTPS 连接的应用时，您可能需要连接到没有用于生产服务器的 SSL 证书的本地开发服务器。
+
+为了支持此操作，而又不对应用的代码进行任何修改，您可以通过使用 {@code debug-overrides} 指定仅在<a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+为 {@code true} 时才信任的仅调试 CA。<i></i>
+
+通常，IDE 和构建工具会自动为非发布版本设置此标志。
+
+</p>
+
+<p>
+ 这比一般的条件代码更安全，因为出于安全考虑，应用存储不接受被标记为可调试的应用。
+
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">选择退出 Cleartext Traffic</h2>
+
+<p>
+ 旨在连接到仅使用安全连接的目标的应用可以选择不再对这些目标提供 cleartext（使用解密的 HTTP 协议而非 HTTPS）支持。
+
+此选项有助于防止应用因外部源（如后端服务器）提供的 URL 发生变化而意外回归。
+
+
+ 请参阅 {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+NetworkSecurityPolicy.isCleartextTrafficPermitted()} 了解更多详情。
+</p>
+
+<p>
+ 例如，应用可能需要确保所有与 {@code
+secure.example.com} 的连接始终是通过 HTTPS 完成，以防止来自恶意网络的敏感流量。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">固定证书</h2>
+
+<p>
+ 一般情况下，应用信任所有预装 CA。如果有预装 CA 要签发欺诈性证书，则应用将面临被中间人攻击 (MiTM) 的风险。
+
+有些应用通过限制信任的 CA 集或通过证书固定来选择限制其接受的证书集。
+
+</p>
+
+<p>
+ 通过按公钥的哈希值（X.509 证书的 SubjectPublicKeyInfo）提供证书集完成证书固定。
+然后，证书链仅在至少包含一个已固定的公钥时才有效。
+
+
+</p>
+
+<p>
+ 请注意，使用证书固定时，您应始终包含一个备份密钥，这样，当您需要强制切换到新密钥时，或更改 CA 时（固定到某个 CA 证书或该 CA 的中间证书时），您应用的连接性不会受到影响。
+
+
+否则，您必须推送应用的更新以恢复连接性。
+
+</p>
+
+<p>
+ 此外，可以设置固定到期时间，在该时间之后不执行证书固定。
+这有助于防止尚未更新的应用出现连接问题。
+不过，设置固定到期时间可能会绕过证书固定。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">配置继承行为</h2>
+
+<p>
+ 继承未在特定配置中设置的值。此行为允许进行更复杂的配置，同时保证配置文件可读。
+
+</p>
+
+<p>
+ 如果未在特定条目中设置值，则使用来自下一个更通用的条目中的值。
+未在 {@code domain-config} 中设置的值从父级 {@code domain-config}（如果已嵌套）或从 {@code
+base-config}（如果未嵌套）中获取。
+未在 {@code base-config} 中设置的值使用平台默认值。
+
+</p>
+
+<p>
+ 例如，考虑所有与 {@code
+example.com} 的子域的连接必须使用自定义 CA 集。此外，允许使用这些域的 cleartext traffic，连接到 {@code
+ secure.example.com} 时除外。<em></em>
+通过在 {@code example.com} 的配置中嵌套 {@code
+secure.example.com} 的配置，不需要重复 {@code trust-anchors}。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">配置文件格式</h2>
+
+<p>
+ 网络安全配置特性使用 XML 文件格式。
+ 文件的整体结构如以下代码示例所示：
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ 以下部分介绍语法和文件格式的其他详细信息。
+
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 可包含：
+ </dt>
+
+ <dd>
+ 0 或 1 个 <code><a href="#base-config"><base-config></a></code><br>
+ 任意数量的 <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 或 1 个 <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 语法：
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ 可包含：
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 说明：
+ </dt>
+
+ <dd>
+ 目标不在 <a href="#domain-config"><code>domain-config</code></a> 涵盖范围内的所有连接所使用的默认配置。
+
+
+<p>
+ 未设置的任何值均使用平台默认值。面向上述 API 级别 24 及更高级别的应用的默认配置：
+
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+面向 API 级别 23 及更低级别的应用的默认配置：
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>语法：</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>可包含：</dt>
+
+<dd>
+1 个或多个 <code><a href="#domain"><domain></a></code>
+<br/>0 或 1 个 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 或 1 个 <code><a href="#pin-set"><pin-set></code></a>
+<br/>任意数量的已嵌套 <code><domain-config></code></dd>
+
+<dt>说明</dt>
+<dd>用于按照 {@code domain} 元素的定义连接到特定目标的配置。
+
+<p>请注意，如果有多个 {@code domain-config} 元素涵盖某个目标，则使用匹配域规则最具体（最长）的配置。
+</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ 语法：
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ 属性：
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ 如果为 {@code "true"}，则此域规则与域及所有子域（包括子域的子域）匹配，否则，该规则仅适用于精确匹配项。
+
+
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ 说明：
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ 语法：
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ 可包含：
+ </dt>
+
+ <dd>
+ 0 或 1 个 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 说明：
+ </dt>
+
+ <dd>
+ 当 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+为 {@code "true"} 时将应用的重写，IDE 和构建工具生成的非发布版本通常属于此情况。
+将在 {@code
+debug-overrides} 中指定的信任锚添加到所有其他配置，并且当服务器的证书链使用其中一个仅调试信任锚时不执行证书固定。
+
+如果 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+为 {@code "false"}，则完全忽略此部分。
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ 语法：
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ 可包含：
+ </dt>
+
+ <dd>
+ 任意数量的 <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ 说明：
+ </dt>
+
+ <dd>
+ 用于安全连接的信任锚集
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>语法：</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>说明：</dt>
+<dd>用于 {@code trust-anchors} 元素的 X.509 证书集。</dd>
+
+<dt>属性：</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+CA 证书的来源，可以是
+<ul>
+ <li>指向包含 X.509 证书的文件的原始资源 id。
+ 证书必须以 DER 或 PEM 格式编码。如果为 PEM 证书，则文件不得包含额外的非 PEM 数据，如注释。
+
+<em></em>
+ </li>
+
+ <li>用于预装系统 CA 证书的 {@code "system"}
+ </li>
+
+ <li>用于用户添加的 CA 证书的 {@code "user"}
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ 指定来自此源的 CA 是否绕过证书固定。如果为 {@code
+"true"}，则为穿过此源的其中一个 CA 的链颁发证书，并且不执行证书固定。
+这对于调试 CA 或支持用户对应用的安全流量进行中间人攻击 (MiTM) 非常有用。
+
+ </p>
+
+ <p>
+ 默认值为 {@code "false"}，除非在 {@code debug-overrides}
+元素中另外指定（在这种情况下，默认值为 {@code "true"}）。
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ 语法：
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ 可包含：
+ </dt>
+
+ <dd>
+ 任意数量的 <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ 说明：
+ </dt>
+
+ <dd>
+ 公钥固定 (PKP) 集。对于要信任的安全连接，信任链中必须有一个公钥位于 PKP 集中。
+有关固定形式，请参阅
+<code><a href="#pin"><pin></a></code>。
+ </dd>
+
+ <dt>
+ 属性：
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ 采用 {@code yyyy-MM-dd} 格式的日期，在该日期及之后固定过期，因而禁用固定。
+如果未设置该属性，则固定不会过期。
+
+ <p>
+ 设置到期时间有助于防止未更新到其 PKP 集（例如，由于用户禁用应用更新）的应用出现连接问题。
+
+
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ 语法：
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ 属性：
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ 用于生成 PKP 的摘要算法。目前仅支持
+{@code "SHA-256"}。
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/index.jd b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/index.jd
index dad2208..e401aae 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/index.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/index.jd
@@ -55,7 +55,7 @@
</p>
<h2>课程</h2>
-
+
<dl>
<dt><b><a href="starting.html">开始Activity</a></b></dt>
<dd>学习有关Activity生命周期、用户如何启动您的应用以及如何执行基本Activity创建操作的基础知识。
@@ -68,5 +68,5 @@
<dt><b><a href="recreating.html">重新创建Activity</a></b></dt>
<dd>学习您的Activity被销毁时的情况以及您如何能够根据需要重新构建Activity。
</dd>
-</dl>
+</dl>
diff --git a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/pausing.jd b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/pausing.jd
index ef5b0d5..c73a9e8 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本课程将向您展示如何</h2>
<ol>
<li><a href="#Pause">暂停Activity</a></li>
<li><a href="#Resume">继续Activity</a></li>
</ol>
-
+
<h2>您还应阅读</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Activity</a>
@@ -59,7 +59,7 @@
<h2 id="Pause">暂停Activity</h2>
-
+
<p>当系统为您的Activity调用 {@link android.app.Activity#onPause()} 时，它从技术角度看意味着您的Activity仍然处于部分可见状态，但往往说明用户即将离开Activity并且它很快就要进入“停止”状态。
您通常应使用
diff --git a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/recreating.jd b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/recreating.jd
index a7971d8..76afe17 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本课程将向您展示如何</h2>
<ol>
<li><a href="#SaveState">保存Activity状态</a></li>
<li><a href="#RestoreState">恢复Activity状态</a></li>
</ol>
-
+
<h2>您还应阅读</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">支持不同屏幕</a>
@@ -105,7 +105,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -138,7 +138,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -157,12 +157,12 @@
系统只在存在要恢复的已保存状态时调用 {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}
，因此您无需检查 {@link android.os.Bundle} 是否为 null：</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/starting.jd b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/starting.jd
index cebd748..04f380d 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本课程将向您展示如何</h2>
<ol>
<li><a href="#lifecycle-states">了解生命周期回调</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">创建一个新实例</a></li>
<li><a href="#Destroy">销毁Activity</a></li>
</ol>
-
+
<h2>您还应阅读</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Activity</a></li>
@@ -83,7 +83,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -128,7 +128,7 @@
</dl>
<p>其他状态（“创建”和“开始”）是瞬态，系统会通过调用下一个生命周期回调方法从这些状态快速移到下一个状态。
-也就是说，在系统调用
+也就是说，在系统调用
{@link android.app.Activity#onCreate onCreate()} 之后，它会快速调用 {@link
android.app.Activity#onStart()}，紧接着快速调用 {@link
android.app.Activity#onResume()}。</p>
@@ -138,7 +138,7 @@
-<h2 id="launching-activity">指定您的应用的启动器Activity</h2>
+<h2 id="launching-activity">指定您的应用的启动器Activity</h2>
<p>当用户从主屏幕选择您的应用图标时，系统会为您已声明为“启动器”（ 或“主要”）Activity的应用中的 {@link android.app.Activity} 调用 {@link
android.app.Activity#onCreate onCreate()} 方法。
@@ -151,7 +151,7 @@
<p>您的应用的主Activity必须使用 <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a>（包括 {@link
android.content.Intent#ACTION_MAIN MAIN} 操作和
-{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} 类别）在宣示说明中声明。例如：</p>
+{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} 类别）在宣示说明中声明。例如：</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -200,10 +200,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -214,7 +214,7 @@
}
</pre>
-<p class="caution"><strong>注意：</strong>使用 {@link android.os.Build.VERSION#SDK_INT}
+<p class="caution"><strong>注意：</strong>使用 {@link android.os.Build.VERSION#SDK_INT}
可防止旧版系统以这种方式仅在 Android 2.0 （API 级别5）和更高级别执行新 API 工作。
较旧版本会遇到运行时异常。</p>
@@ -268,7 +268,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/stopping.jd b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/stopping.jd
index 630817c..dd6d4a6 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本课程将向您展示如何</h2>
<ol>
<li><a href="#Stop">停止Activity</a></li>
<li><a href="#Start">开始/重新开始Activity</a></li>
</ol>
-
+
<h2>您还应阅读</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Activity</a>
@@ -152,13 +152,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -169,8 +169,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html-intl/intl/zh-cn/training/basics/data-storage/databases.jd b/docs/html-intl/intl/zh-cn/training/basics/data-storage/databases.jd
index a6c9193..78fa2f3 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/data-storage/databases.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/data-storage/databases.jd
@@ -201,7 +201,7 @@
</pre>
<p>{@link android.database.sqlite.SQLiteDatabase#insert insert()}
-的第一个参数即为表格名称。第二个参数指定在
+的第一个参数即为表格名称。第二个参数指定在
{@link android.content.ContentValues} 为空的情况下框架可在其中插入 NULL 的列的名称（如果您将其设置为 {@code "null"}，
那么框架将不会在没有值时插入行。）
</p>
diff --git a/docs/html-intl/intl/zh-cn/training/basics/data-storage/files.jd b/docs/html-intl/intl/zh-cn/training/basics/data-storage/files.jd
index 1442275..4ec1d68 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/data-storage/files.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/data-storage/files.jd
@@ -183,7 +183,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -250,7 +250,7 @@
-
+
<p>例如，您的应用下载的其他资源或临时介质文件。</p>
</dd>
</dl>
@@ -265,7 +265,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -287,7 +287,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -311,7 +311,7 @@
<p>无论您对于共享的文件使用 {@link
android.os.Environment#getExternalStoragePublicDirectory
-getExternalStoragePublicDirectory()} 还是对您的应用专用文件使用
+getExternalStoragePublicDirectory()} 还是对您的应用专用文件使用
{@link android.content.Context#getExternalFilesDir
getExternalFilesDir()} ，您使用诸如
{@link android.os.Environment#DIRECTORY_PICTURES} 的 API 常数提供的目录名称非常重要。
@@ -332,7 +332,7 @@
此信息也可用来避免填充存储卷以致超出特定阈值。
</p>
-<p>但是，系统并不保证您可以写入与 {@link java.io.File#getFreeSpace}
+<p>但是，系统并不保证您可以写入与 {@link java.io.File#getFreeSpace}
指示的一样多的字节。如果返回的数字比您要保存的数据大小大出几 MB，或如果文件系统所占空间不到 90%，则可安全继续操作。否则，您可能不应写入存储。
@@ -366,7 +366,7 @@
<div class="note">
<p><strong>注意：</strong>当用户卸载您的应用时，Android 系统会删除以下各项：
-</p>
+</p>
<ul>
<li>您保存在内部存储中的所有文件</li>
<li>您使用 {@link
diff --git a/docs/html-intl/intl/zh-cn/training/basics/fragments/fragment-ui.jd b/docs/html-intl/intl/zh-cn/training/basics/fragments/fragment-ui.jd
index 51a4e27..1ef1662 100644
--- a/docs/html-intl/intl/zh-cn/training/basics/fragments/fragment-ui.jd
+++ b/docs/html-intl/intl/zh-cn/training/basics/fragments/fragment-ui.jd
@@ -4,7 +4,7 @@
@jd:body
<div id="tb-wrapper">
- <div id="tb">
+ <div id="tb">
<h2>本课程所教授的内容：</h2>
<ol>
<li><a href="#AddAtRuntime">在运行时向 Activity 添加 Fragment</a></li>
@@ -39,7 +39,7 @@
- <h2 id="AddAtRuntime">在运行时向 Activity 添加 Fragment</h2>
+ <h2 id="AddAtRuntime">在运行时向 Activity 添加 Fragment</h2>
<p>你可以在 Activity 运行时向其添加 Fragment，而不用像<a href="creating.html">上一课</a>中介绍的那样，使用 <code><fragment></code> 元素在布局文件中为 Activity 定义 Fragment。如果你打算在 Activity 运行周期内更改 Fragment，就必须这样做。</p>
@@ -88,11 +88,11 @@
return;
}
- // 创建一个要放入 Activity 布局中的新 Fragment
+ // 创建一个要放入 Activity 布局中的新 Fragment
HeadlinesFragment firstFragment = new HeadlinesFragment();
// 如果此 Activity 是通过 Intent 发出的特殊指令来启动的，
- // 请将该 Intent 的 extras 以参数形式传递给该 Fragment
+ // 请将该 Intent 的 extras 以参数形式传递给该 Fragment
firstFragment.setArguments(getIntent().getExtras());
// 将该 Fragment 添加到“fragment_container”FrameLayout 中
diff --git a/docs/html-intl/intl/zh-cn/training/basics/network-ops/data-saver.jd b/docs/html-intl/intl/zh-cn/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..4e3ede1
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,234 @@
+page.title=Data Saver
+metaDescription=用户启用的流量消耗优化。
+page.keywords="android N", "data usage", "metered network"
+page.image=images/cards/card-nyc_2x.jpg
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ 本文内容
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#status">检查 Data Saver 首选项</a>
+ <ol>
+ <li>
+ <a href="#request-whitelist">请求白名单权限</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#monitor-changes">监控 Data Saver 首选项变更</a>
+
+ </li>
+
+ <li>
+ <a href="#testing">使用 Android 调试桥命令测试</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ 在智能手机的整个生命周期，蜂窝数据计划的成本通常会超出设备本身的成本。
+在 N Developer Preview 中，用户可以在整个设备上启用 Data Saver，以减少流量消耗，无论是在漫游，账单周期即将结束，还是使用少量的预付费数据包。
+
+
+</p>
+
+<p>
+ 当用户在 <strong>Settings</strong> 中启用 Data Saver 且设备位于按流量计费的网络上时，系统屏蔽后台流量消耗，同时指示应用在前台尽可能使用较少的数据。
+
+用户可以将特定应用加入白名单以允许后台按流量计费的流量消耗，即使在打开 Data Saver 时也是如此。
+
+
+</p>
+
+<p>
+ N Developer Preview 扩展{@link android.net.ConnectivityManager} API，为应用提供<a href="#status">检索用户的 Data Saver 首选项</a>和<a href="#monitor-changes">监控首选项变更的方式</a>。
+
+
+这被认为是应用检查用户是否启用了 Data Saver 并努力限制前台和后台流量消耗的有效方法。
+
+
+</p>
+
+<h2 id="status">
+ 检查 Data Saver 首选项
+</h2>
+
+<p>
+ 在 N Developer Preview 中，应用可以使用 {@link
+ android.net.ConnectivityManager} API 来确定正在应用的是哪些流量消耗限制。
+{@code getRestrictBackgroundStatus()}方法返回下列值之一：
+
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ Data Saver 已禁用。
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ 用户已为此应用禁用 Data Saver。应用应努力限制前台流量消耗，并妥善处理后台流量消耗限制。
+
+
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ 用户已启用 Data Saver，但应用在白名单中。应用应努力限制前台和后台流量消耗。
+
+ </dd>
+</dl>
+
+<p>
+ 这被认为是在设备连接到按流量计费的网络时限制流量消耗的有效方法，即使 Data Saver 被禁用或应用在白名单中。
+
+以下示例代码使用 {@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} 和 {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} 来确定应用应使用多少数据：
+
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ 请求白名单权限
+</h3>
+
+<p>
+ 如果您的应用需要使用后台数据，它可以通过发送一项包含您的应用软件包名称的 URI 的 <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code> Intent 来请求白名单权限：例如 <code>package:MY_APP_ID</code>。
+
+
+
+
+</p>
+
+<p>
+ 发送 Intent 和 URI 将启动 <strong>Settings</strong> 应用，还会显示您的应用的流量消耗设置。
+用户随后可以决定是否启用应用的后台数据。
+在您发送此 Intent 之前，先询问用户是否希望启用 <strong>Settings</strong> 应用，以启用后台流量消耗，这是一种有效的做法。
+
+
+
+</p>
+
+<h2 id="monitor-changes">
+ 监控 Data Saver 首选项变更
+</h2>
+
+<p>
+ 应用可以通过创建一条 {@link
+android.content.BroadcastReceiver} 以侦听 {@code
+ ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} 以及使用 {@link android.content.Context#registerReceiver
+ Context.registerReceiver()}动态注册接收器来监控 Data Saver 首选项变更。
+当应用接收到这条广播时，应通过调用 {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} 来<a href="#status">检查新的 Data Saver 首选项是否会影响其权限</a>。
+
+
+</p>
+
+<p class="note">
+ <strong>注：</strong>系统只会向使用 {@link
+ android.content.Context#registerReceiver Context.registerReceiver()} 进行动态注册的应用发送此广播。
+在其清单中注册接收此广播的应用将不会收到它们。
+
+
+</p>
+
+<h2 id="testing">
+ 使用 Android 调试桥命令测试
+</h2>
+
+<a href="{@docRoot}tools/help/adb.html">Android 调试桥 (ADB)</a> 提供了多条命令，可用于检查和配置网络权限：
+
+
+
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ 生成包括当前全局后台网络限制设置、目前在白名单中的软件包 UID 以及其他已知软件包的权限的报告。
+
+
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ 显示网络政策管理器 (netpolicy) 命令的完整清单。
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ 当分别传递 <code>true</code> 或 <code>false</code> 时，启用或禁用 Data Saver 模式。
+
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ 将指定软件包 UID 加入白名单，以允许后台按流量计费的流量消耗
+。
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ 从白名单中移除指定软件包 UID，以阻止当 Data Saver 启用时后台按流量计费的流量消耗。
+
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd
index 0e1ccb7..42b3c89 100644
--- a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd
+++ b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/battery-monitoring.jd
@@ -7,8 +7,8 @@
next.link=docking-monitoring.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>本教程将指导您</h2>
@@ -24,9 +24,9 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">intent 和 intent 过滤器</a>
</ul>
-</div>
</div>
-
+</div>
+
<p>如果您要更改后台更新频率，从而减少更新对电池使用时间的影响，最好先查看当前的电池电量和充电状态。</p>
<p>对应用进行更新会影响电池使用时间，具体取决于设备的电池电量和充电状态。如果用户正在通过交流电源为设备充电，更新应用的影响就可以忽略不计。因此，在大多数情况下，只要设备连接了充电器，您就可以最大程度地提高刷新频率。相反，如果设备在消耗电池电量，那么降低更新频率就可以延长电池使用时间。</p>
@@ -34,8 +34,8 @@
<p>同样，您也可以查看电池电量，如果电量即将耗尽，您就可以降低更新频率，甚至停止更新。</p>
-<h2 id="DetermineChargeState">确定当前的充电状态</h2>
-
+<h2 id="DetermineChargeState">确定当前的充电状态</h2>
+
<p>请先确定当前的充电状态。{@link android.os.BatteryManager} 会通过一个包含充电状态的持续 {@link android.content.Intent} 广播所有的电池详情和充电详情。</p>
<p>由于这是个持续 intent，因此您无需通过将传入 {@code null} 的 {@code registerReceiver} 作为接收器直接调用（如下一代码段所示）来注册 {@link android.content.BroadcastReceiver}，系统会返回当前电池状态 intent。您可以在此处传入实际的 {@link android.content.BroadcastReceiver} 对象，不过我们会在下文中介绍如何处理更新，因此您不一定要执行此操作。</p>
@@ -58,7 +58,7 @@
<p>通常，如果设备连接了交流充电器，您就应最大程度地提高后台更新频率；如果设备通过 USB 充电，请降低更新频率；如果电池在耗电，请进一步降低更新频率。</p>
-<h2 id="MonitorChargeState">监控充电状态的变化</h2>
+<h2 id="MonitorChargeState">监控充电状态的变化</h2>
<p>充电状态的改变就像设备连接电源那样容易，因此监控充电状态的变化并相应地调整刷新频率就很重要了。</p>
@@ -75,11 +75,11 @@
<pre>public class PowerConnectionReceiver extends BroadcastReceiver {
@Override
- public void onReceive(Context context, Intent intent) {
+ public void onReceive(Context context, Intent intent) {
int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
status == BatteryManager.BATTERY_STATUS_FULL;
-
+
int chargePlug = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
boolean usbCharge = chargePlug == BATTERY_PLUGGED_USB;
boolean acCharge = chargePlug == BATTERY_PLUGGED_AC;
@@ -87,7 +87,7 @@
}</pre>
-<h2 id="CurrentLevel">确定当前的电池电量</h2>
+<h2 id="CurrentLevel">确定当前的电池电量</h2>
<p>在某些情况下，确定当前的电池电量会对您有所帮助。如果电池电量低于一定水平，您可以降低后台更新频率。</p>
@@ -99,7 +99,7 @@
float batteryPct = level / (float)scale;</pre>
-<h2 id="MonitorLevel">监控电池电量的显著变化</h2>
+<h2 id="MonitorLevel">监控电池电量的显著变化</h2>
<p>您无法轻松地对电池状态进行持续监控，不过也无需这么做。</p>
diff --git a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd
index 8313e08..b5f48a9 100644
--- a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/connectivity-monitoring.jd
@@ -11,7 +11,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>本教程将指导您</h2>
@@ -27,7 +27,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">intent 和 intent 过滤器</a>
</ul>
-</div>
+</div>
</div>
<p>重复提醒和后台服务最常见的用途之一，就是为来自互联网资源的应用数据、缓存数据安排定期更新或执行长时间运行的下载任务。但是，如果您没有连接互联网，或因连接过慢而无法完成下载，那就根本没必要唤醒设备并安排更新了。</p>
@@ -35,18 +35,18 @@
<p>您可以使用 {@link android.net.ConnectivityManager} 查看是否确实已连接互联网，如果已连接，您还可以了解当前的连接类型。</p>
-<h2 id="DetermineConnection">确定是否已连接互联网</h2>
-
+<h2 id="DetermineConnection">确定是否已连接互联网</h2>
+
<p>如果设备未连接互联网，就没有必要根据互联网资源安排更新了。以下代码段说明如何使用 {@link android.net.ConnectivityManager} 查询有效网络并确定该网络是否已连接互联网。</p>
<pre>ConnectivityManager cm =
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
-<h2 id="DetermineType">确定互联网连接的类型</h2>
+<h2 id="DetermineType">确定互联网连接的类型</h2>
<p>您也可以确定当前可用的互联网连接的类型。</p>
@@ -59,7 +59,7 @@
<p>停用更新后，请务必侦听连接情况的变化，以便在建立互联网连接后恢复更新。</p>
-<h2 id="MonitorChanges">监控连接情况的变化</h2>
+<h2 id="MonitorChanges">监控连接情况的变化</h2>
<p>只要连接的具体情况发生变化，{@link android.net.ConnectivityManager} 就会广播 {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION} ({@code "android.net.conn.CONNECTIVITY_CHANGE"}) 操作。您可以在清单中注册广播接收器，以便侦听这些变化并相应地恢复（或暂停）后台更新。</p>
diff --git a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd
index 53b951d..c5ed38e 100644
--- a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd
+++ b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/docking-monitoring.jd
@@ -10,7 +10,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>本教程将指导您</h2>
@@ -26,7 +26,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">intent 和 intent 过滤器</a>
</ul>
-</div>
+</div>
</div>
<p>Android 设备支持几种不同类型的基座。这些类型包括车载或家用基座以及数字和模拟基座。许多基座可用于为插入的设备充电，因此基座状态通常与充电状态紧密相关。</p>
@@ -36,8 +36,8 @@
<p>系统是以持续 {@link android.content.Intent} 的形式广播基座状态的，这样您就可以查询设备是否插入了基座，如果已插入，您还可以查询基座类型。</p>
-<h2 id="CurrentDockState">确定当前的基座状态</h2>
-
+<h2 id="CurrentDockState">确定当前的基座状态</h2>
+
<p>基座状态详情是以附加信息的形式包含在 {@link android.content.Intent#ACTION_DOCK_EVENT} 操作的持续广播中的。由于这属于持续广播，因此您无需注册 {@link android.content.BroadcastReceiver}。您可以将传入 {@code null} 的 {@link android.content.Context#registerReceiver registerReceiver()} 作为广播接收器直接调用，具体如下一代码段所示。</p>
<pre>IntentFilter ifilter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
@@ -49,9 +49,9 @@
boolean isDocked = dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED;</pre>
-<h2 id="DockType">确定当前的基座类型</h2>
+<h2 id="DockType">确定当前的基座类型</h2>
-<p>用户可以将设备插入以下四种类型的基座：
+<p>用户可以将设备插入以下四种类型的基座：
<ul><li>车载基座</li>
<li>桌面基座</li>
<li>低端（模拟）桌面基座</li>
@@ -60,12 +60,12 @@
<p>请注意，后两种类型仅适用于 API 级别为 11 及以上的 Android，因此如果您只关注基座类型，而不在意基座究竟是数字的还是模拟的，那么比较合适的做法就是查看全部三种类型：</p>
<pre>boolean isCar = dockState == EXTRA_DOCK_STATE_CAR;
-boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
+boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK ||
dockState == EXTRA_DOCK_STATE_LE_DESK ||
dockState == EXTRA_DOCK_STATE_HE_DESK;</pre>
-<h2 id="MonitorDockState">监控基座状态或类型的变化</h2>
+<h2 id="MonitorDockState">监控基座状态或类型的变化</h2>
<p>无论设备是否插入了基座，系统都会广播 {@link android.content.Intent#ACTION_DOCK_EVENT} 操作。要监控设备基座状态的变化，您只需在应用清单中注册广播接收器即可，具体如以下代码段所示：</p>
diff --git a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/index.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/index.jd
index 308ad7b..2efed8b 100644
--- a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/index.jd
+++ b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
-<h2>依存关系和前提条件</h2>
+<h2>依存关系和前提条件</h2>
<ul>
<li>Android 2.0（API 级别 5）或更高版本</li>
<li><a href="{@docRoot}guide/components/intents-filters.html">intent 和 intent 过滤器</a>的使用经验</li>
@@ -21,19 +21,19 @@
<li><a href="{@docRoot}guide/components/services.html">服务</a>
</ul>
-</div>
+</div>
</div>
<p>为了打造一个优秀的应用，您应设法降低应用对电池使用时间的影响。阅读完本教程后，您就可以让自己构建的应用根据其所在设备的状态来监控和调整自身的功能和行为。</p>
<p>要确保在不影响用户体验的情况下最大程度地降低应用对电池使用时间的影响，您可以采取一些措施，例如在网络连接断开时停用后台服务更新，或在电池电量较低时降低此类更新的频率。</p>
-<h2>教程</h2>
-
+<h2>教程</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
+will want to jump to a lesson or not.-->
+
<dl>
<dt><b><a href="battery-monitoring.html">监控电池电量和充电状态</a></b></dt>
<dd>了解如何通过确定和监控当前的电池电量和充电状态的变化来相应地调整应用的更新频率。</dd>
@@ -46,4 +46,4 @@
<dt><b><a href="manifest-receivers.html">根据需要操作广播接收器</a></b></dt>
<dd>您可以在运行时切换自己在清单中声明的广播接收器，以便根据当前设备状态停用不需要的接收器。了解如何在设备未处于特定状态的情况下切换和层叠状态变化接收器和延迟操作，以便提高效率。</dd>
-</dl>
\ No newline at end of file
+</dl>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd
index 07c014f..ed1b6ce 100644
--- a/docs/html-intl/intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html-intl/intl/zh-cn/training/monitoring-device-state/manifest-receivers.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>本教程将指导您</h2>
@@ -23,7 +23,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">intent 和 intent 过滤器</a>
</ul>
-</div>
+</div>
</div>
<p>监控设备状态变化的最简单方法就是，为您监控的每种状态创建 {@link android.content.BroadcastReceiver} 并在应用清单中逐一进行注册。然后，您只需根据当前设备状态在每个接收器中重新安排重复提醒即可。</p>
@@ -31,10 +31,10 @@
<p>此方法的负面影响在于，只要系统触发了这些接收器中的任何一个，相关应用就会唤醒设备，其频率可能会远远超过所需的水平。</p>
<p>更好的方法是在运行时停用或启用广播接收器。这样的话，您就可以将自己在清单中声明的接收器用作被动提醒，只有在需要时才会由系统事件触发。</p>
-
-<h2 id="ToggleReceivers">切换和层叠状态变化接收器以提高效率 </h2>
-
+
+<h2 id="ToggleReceivers">切换和层叠状态变化接收器以提高效率 </h2>
+
<p>您可以使用 {@link android.content.pm.PackageManager} 切换清单中定义的任意组件的启用状态（包括您要启用或停用的任意广播接收器），具体如以下片段所示：</p>
<pre>ComponentName receiver = new ComponentName(context, myReceiver.class);
diff --git a/docs/html-intl/intl/zh-cn/training/multiscreen/adaptui.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/adaptui.jd
index 89908fe..f9e3225 100644
--- a/docs/html-intl/intl/zh-cn/training/multiscreen/adaptui.jd
+++ b/docs/html-intl/intl/zh-cn/training/multiscreen/adaptui.jd
@@ -10,9 +10,9 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
-
+<div id="tb-wrapper">
+<div id="tb">
+
<h2>本教程将指导您</h2>
<ol>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">支持平板电脑和手持设备</a></li>
</ul>
-
+
<h2>试试看</h2>
-
+
<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">下载示例应用</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>根据您的应用当前显示的布局，用户界面流程可能会有所不同。例如，如果您的应用处于双面板模式下，点击左侧面板上的项即可直接在右侧面板上显示相关内容；如果该应用处于单面板模式下，相关内容就应以其他活动的形式在同一面板上显示。</p>
@@ -56,7 +56,7 @@
setContentView(R.layout.main_layout);
View articleView = findViewById(R.id.article);
- mIsDualPane = articleView != null &&
+ mIsDualPane = articleView != null &&
articleView.getVisibility() == View.VISIBLE;
}
}
@@ -116,7 +116,7 @@
else {
/* use list navigation (spinner) */
actionBar.setNavigationMode(android.app.ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter adap = new ArrayAdapter<String>(this,
+ SpinnerAdapter adap = new ArrayAdapter<String>(this,
R.layout.headline_item, CATEGORIES);
actionBar.setListNavigationCallbacks(adap, handler);
}
@@ -168,7 +168,7 @@
public class HeadlinesFragment extends ListFragment {
...
@Override
- public void onItemClick(AdapterView<?> parent,
+ public void onItemClick(AdapterView<?> parent,
View view, int position, long id) {
if (null != mHeadlineSelectedListener) {
mHeadlineSelectedListener.onHeadlineSelected(position);
diff --git a/docs/html-intl/intl/zh-cn/training/multiscreen/index.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/index.jd
index 02c687a..5ac0d8c 100644
--- a/docs/html-intl/intl/zh-cn/training/multiscreen/index.jd
+++ b/docs/html-intl/intl/zh-cn/training/multiscreen/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
-<div id="tb">
-
-<h2>依存关系和前提条件</h2>
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>依存关系和前提条件</h2>
<ul>
<li>Android 1.6 或更高版本（示例应用则需要 2.1 或更高版本）</li>
@@ -27,17 +27,17 @@
<ul>
<li><a href="{@docRoot}guide/practices/screens_support.html">支持多种屏幕</a></li>
</ul>
-
-<h2>试试看</h2>
-
-<div class="download-box">
+
+<h2>试试看</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">下载示例应用</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
-
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
+
<p>Android 支持数百种屏幕尺寸不同的设备，包括小型手机和大型电视机。因此，请务必将您的应用设计为与所有的屏幕尺寸兼容，以便让尽可能多的用户使用该应用。</p>
<p>不过，与各种类型的设备兼容还远远不够。由于各种屏幕尺寸对用户互动产生的利弊有所不同，因此要真正满足用户需求并广获好评，您的应用不仅需要支持多种屏幕，还应针对各类屏幕配置的用户体验进行优化。<em></em><em></em></p>
@@ -48,17 +48,17 @@
<p class="note"><strong>请注意</strong>：本教程和相关的示例使用了<a
href="{@docRoot}tools/support-library/index.html">支持库</a>，以便在 3.0 版以下的 Android 上使用 <PH>{@link android.app.Fragment}</PH> API。因此，您需要下载该库并将其添加到您的应用，才能使用本教程中涉及的所有 API。</p>
-
-<h2>教程</h2>
-
-<dl>
- <dt><b><a href="screensizes.html">支持各种屏幕尺寸</a></b></dt>
- <dd>本教程将向您介绍如何设计可适应多种屏幕尺寸的布局（使用灵活的视图尺寸、 <PH>{@link android.widget.RelativeLayout}</PH>、屏幕尺寸和屏幕方向限定符、别名过滤器以及自动拉伸位图）。</dd>
-
- <dt><b><a href="screendensities.html">支持各种屏幕密度</a></b></dt>
- <dd>本教程将向您介绍如何支持具有不同像素密度的屏幕（使用非密度制约像素并提供各种密度的相应位图）。</dd>
-
- <dt><b><a href="adaptui.html">实施自适应用户界面流程</a></b></dt>
- <dd>本教程将向您介绍如何以可适应多种屏幕尺寸/屏幕密度组合的方式实施用户界面流程（运行时对当前布局的检测，根据当前布局做出响应，处理屏幕配置变化）。</dd>
-</dl>
+
+<h2>教程</h2>
+
+<dl>
+ <dt><b><a href="screensizes.html">支持各种屏幕尺寸</a></b></dt>
+ <dd>本教程将向您介绍如何设计可适应多种屏幕尺寸的布局（使用灵活的视图尺寸、 <PH>{@link android.widget.RelativeLayout}</PH>、屏幕尺寸和屏幕方向限定符、别名过滤器以及自动拉伸位图）。</dd>
+
+ <dt><b><a href="screendensities.html">支持各种屏幕密度</a></b></dt>
+ <dd>本教程将向您介绍如何支持具有不同像素密度的屏幕（使用非密度制约像素并提供各种密度的相应位图）。</dd>
+
+ <dt><b><a href="adaptui.html">实施自适应用户界面流程</a></b></dt>
+ <dd>本教程将向您介绍如何以可适应多种屏幕尺寸/屏幕密度组合的方式实施用户界面流程（运行时对当前布局的检测，根据当前布局做出响应，处理屏幕配置变化）。</dd>
+</dl>
diff --git a/docs/html-intl/intl/zh-cn/training/multiscreen/screendensities.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/screendensities.jd
index cdb9b7f..342ee95 100644
--- a/docs/html-intl/intl/zh-cn/training/multiscreen/screendensities.jd
+++ b/docs/html-intl/intl/zh-cn/training/multiscreen/screendensities.jd
@@ -12,8 +12,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>本教程将指导您</h2>
<ol>
@@ -29,15 +29,15 @@
</ul>
<h2>试试看</h2>
-
-<div class="download-box">
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">下载示例应用</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>本教程将向您介绍如何通过提供不同资源和使用独立于分辨率的测量单位来支持不同屏幕密度。</p>
@@ -48,8 +48,8 @@
<p>例如，请使用 <code>dp</code>（而非 <code>px</code>）指定两个视图间的间距：</p>
<pre>
-<Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+<Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/clickme"
android:layout_marginTop="20dp" />
</pre>
@@ -57,8 +57,8 @@
<p>请务必使用 <code>sp</code> 指定文字大小：</p>
<pre>
-<TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
+<TextView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:textSize="20sp" />
</pre>
diff --git a/docs/html-intl/intl/zh-cn/training/multiscreen/screensizes.jd b/docs/html-intl/intl/zh-cn/training/multiscreen/screensizes.jd
index 904d097..2d47d1d 100644
--- a/docs/html-intl/intl/zh-cn/training/multiscreen/screensizes.jd
+++ b/docs/html-intl/intl/zh-cn/training/multiscreen/screensizes.jd
@@ -10,8 +10,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>本教程将指导您</h2>
<ol>
@@ -30,26 +30,26 @@
<li><a href="{@docRoot}guide/practices/screens_support.html">支持多种屏幕</a></li>
</ul>
-<h2>试试看</h2>
-
-<div class="download-box">
+<h2>试试看</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">下载示例应用</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
<p>此教程将向您介绍如何通过以下方法支持各种尺寸的屏幕：</p>
-<ul>
- <li>确保系统可以适当地调整您布局的尺寸以便适应屏幕</li>
- <li>根据屏幕配置提供合适的用户界面布局</li>
+<ul>
+ <li>确保系统可以适当地调整您布局的尺寸以便适应屏幕</li>
+ <li>根据屏幕配置提供合适的用户界面布局</li>
<li>确保正确的布局应用到了正确的屏幕上</li>
- <li>提供可正确缩放的位图</li>
-</ul>
+ <li>提供可正确缩放的位图</li>
+</ul>
-<h2 id="TaskUseWrapMatchPar">使用“wrap_content”和“match_parent”</h2>
+<h2 id="TaskUseWrapMatchPar">使用“wrap_content”和“match_parent”</h2>
<p>要确保布局的灵活性并适应各种尺寸的屏幕，您应使用 <code>"wrap_content"</code> 和 <code>"match_parent"</code> 控制某些视图组件的宽度和高度。如果您使用 <code>"wrap_content"</code>，系统就会将视图的宽度或高度设置成所需的最小尺寸以适应视图中的内容，而 <code>"match_parent"</code>（在低于 API 级别 8 的级别中称为 <code>"fill_parent"</code>）则会展开组件以匹配其父视图的尺寸。</p>
@@ -65,7 +65,7 @@
<p class="img-caption"><strong>图 1</strong>。纵向模式（左）和横向模式（右）下的新闻阅读器示例应用。</p>
-<h2 id="TaskUseRelativeLayout">使用相对布局</h2>
+<h2 id="TaskUseRelativeLayout">使用相对布局</h2>
<p>您可以使用 <PH>{@link android.widget.LinearLayout}</PH> 的嵌套实例并结合 <code>"wrap_content"</code> 和 <code>"match_parent"</code> 尺寸，以便构建相当复杂的布局。不过，您无法通过 <PH>{@link android.widget.LinearLayout}</PH> 精确控制子视图的特殊关系；系统会将 <PH>{@link android.widget.LinearLayout}</PH> 中的视图直接并排列出。如果您需要将子视图排列出各种效果而不是一条直线，通常更合适的解决方法是使用 <PH>{@link android.widget.RelativeLayout}</PH>，这样您就可以根据各组件之间的特殊关系指定布局了。例如，您可以将某个子视图对齐到屏幕左侧，同时将另一个视图对齐到屏幕右侧。</p>
@@ -115,8 +115,8 @@
<p>请注意，虽然组件的尺寸有所变化，但它们的空间关系仍会保留，具体由 <PH>{@link android.widget.RelativeLayout.LayoutParams}</PH> 指定。</p>
-
-<h2 id="TaskUseSizeQuali">使用尺寸限定符</h2>
+
+<h2 id="TaskUseSizeQuali">使用尺寸限定符</h2>
<p>上文所述的灵活布局或相对布局可以为您带来的优势就只有这么多了。虽然这些布局可以拉伸组件内外的空间以适应各种屏幕，但它们不一定能为每种屏幕都提供最佳的用户体验。因此，您的应用不仅应实施灵活布局，还应针对各种屏幕配置提供一些备用布局。要做到这一点，您可以使用<a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">配置限定符</a>，这样就可以在运行时根据当前的设备配置自动选择合适的资源了（例如根据各种屏幕尺寸选择不同的布局）。</p>
@@ -158,7 +158,7 @@
<p>但 Android 版本低于 3.2 的设备不支持此技术，原因是这些设备无法将 <code>sw600dp</code> 识别为尺寸限定符，因此您仍需使用 <code>large</code> 限定符。这样一来，就会有一个名称为 <code>res/layout-large/main.xml</code> 的文件（与 <code>res/layout-sw600dp/main.xml</code> 一样）。您将在下一教程中了解到避免此类布局文件出现重复的技术。</p>
-<h2 id="TaskUseAliasFilters">使用布局别名</h2>
+<h2 id="TaskUseAliasFilters">使用布局别名</h2>
<p>最小宽度限定符仅适用于 Android 3.2 及更高版本。因此，您仍需使用与较低版本兼容的概括尺寸范围（小、正常、大和特大）。例如，如果您要将用户界面设计成在手机上显示单面板，但在 7 英寸平板电脑、电视和其他较大的设备上显示多面板，请提供以下文件：</p>
@@ -198,11 +198,11 @@
</li>
</ul></p>
-<p>后两个文件的内容相同，但它们并未实际定义布局。它们只是将 <PH>{@code main}</PH> 设置成了 <PH>{@code main_twopanes}</PH> 的别名。由于这些文件包含 <code>large</code> 和 <code>sw600dp</code> 选择器，因此无论 Android 版本如何，系统都会将这些文件应用到平板电脑和电视上（版本低于 3.2 的平板电脑和电视会匹配
+<p>后两个文件的内容相同，但它们并未实际定义布局。它们只是将 <PH>{@code main}</PH> 设置成了 <PH>{@code main_twopanes}</PH> 的别名。由于这些文件包含 <code>large</code> 和 <code>sw600dp</code> 选择器，因此无论 Android 版本如何，系统都会将这些文件应用到平板电脑和电视上（版本低于 3.2 的平板电脑和电视会匹配
<PH>{@code large}</PH>，版本低于 3.2 的平板电脑和电视则会匹配 <code>sw600dp</code>）。</p>
-<h2 id="TaskUseOriQuali">使用屏幕方向限定符</h2>
+<h2 id="TaskUseOriQuali">使用屏幕方向限定符</h2>
<p>某些布局会同时支持横向模式和纵向模式，但您可以通过调整优化其中大部分布局的效果。在新闻阅读器示例应用中，每种屏幕尺寸和屏幕方向下的布局行为方式如下所示：</p>
diff --git a/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..782b5b8
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,213 @@
+page.title=画中画
+page.keywords=Preview、SDK、画中画
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>本文内容</h2>
+<ol>
+ <li><a href="#declaring">声明您的 Activity 支持画中画
+</a></li>
+ <li><a href="#pip_button">将您的 Activity 切换到画中画模式</a>
+</li>
+ <li><a href="#handling_ui">处理画中画模式中的 UI</a>
+</li>
+ <li><a href="#continuing_playback">在画中画模式中继续视频播放
+</a></li>
+ <li><a href="#single_playback">使用画中画的单次播放 Activity
+</a></li>
+ <li><a href="#best">最佳做法</a></li>
+</ol>
+
+<h2>另请参阅</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">多窗口支持
+</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>在 Android N 中，Android TV 用户现在可以一边在应用中导航一边在屏幕角落的固定窗口中观看视频。
+
+画中画 (PIP) 模式允许应用在固定窗口中运行视频 Activity，同时在后台继续运行另一个 Activity。
+
+PIP 窗口让用户可以在使用应用的时候进行多任务处理，从而提高效率。
+</p>
+
+<p>您的应用可以决定何时触发 PIP 模式。以下是一些关于何时进入 PIP 模式的示例：
+</p>
+
+<ul>
+<li>当用户从视频返回浏览其他内容时，应用将自动进入 PIP 模式。
+</li>
+<li>当用户快看完一集视频时，应用将视频切换到 PIP 模式。
+主屏幕显示有关该系列视频下一集的宣传或摘要信息。
+</li>
+<li>应用将允许用户在观看视频的同时添加其他内容到队列。
+视频继续在 PIP 模式中播放，同时主屏幕显示内容选择 Activity。
+</li>
+</ul>
+
+<p>PIP 窗口为 240x135 dp，在屏幕角落的最顶层显示，由系统在四个角落中选择一个角落。
+用户可以调出 PIP 菜单，将 PIP 窗口切换为全屏，或通过按下遥控器上的<b>主页</b>按钮关闭 PIP 窗口。
+
+如果主屏幕开始播放另一个视频，PIP 窗口将自动关闭。
+
+用户还可以通过“最近使用记录”关闭 PIP 窗口。</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>图 1.</strong> 用户在主屏幕上浏览内容时屏幕角落窗口播放画中画视频。
+
+</p>
+
+<p>PIP 利用 Android N 中提供的多窗口 API 显示固定视频层叠窗口。
+如需将 PIP 添加到应用，您需要注册支持 PIP 的 Activity，然后根据需要将 Activity 切换到 PIP 模式，并确保隐藏所有 UI 元素，且 Activity 处于 PIP 模式时视频继续播放。
+
+
+</p>
+
+<h2 id="declaring">声明您的 Activity 支持画中画</h2>
+
+<p>默认情况下，系统并不自动为应用提供 PIP 支持。如果想要应用支持 PIP，请将
+<code>android:supportsPictureInPicture</code> 和
+<code>android:resizeableActivity</code> 设置为 <code>true</code>，在清单中注册视频 Activity。
+
+此外，应明确指定 Activity 处理布局配置变更，这样，在 PIP 模式过渡期间发生布局变更时，Activity 不会重新启动。
+
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>在注册 Activity 时，请记住，在 PIP 模式中，您的 Activity 在电视屏幕上的小层叠窗口中显示。
+视频播放 Activity 结合以尽量小的 UI 可以实现最佳用户体验。
+在切换到 PIP 模式后，UI 元素较小的 Activity 带来的用户体验可能较差，因为用户在 PIP 窗口中看不到 UI 元素的详细信息。
+
+
+</p>
+
+<h2 id="pip_button">将您的 Activity 切换到画中画模式</h2>
+
+在需要将 Activity 切换到 PIP 模式时，请调用
+<code>Activity.enterPictureInPictureMode()</code>。在下面的示例中，当用户选择媒体控制栏上的专用 PIP 按钮时，系统切换到 PIP 模式：
+
+</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>在媒体控制栏上添加 PIP 按钮可以方便用户在控制视频播放的同时切换到 PIP 模式。
+</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>图 1.</strong> 媒体控制栏上的画中画按钮。
+</p>
+
+<p>Android N 中包含一个新的
+<code>PlaybackControlsRow.PictureInPictureAction</code> 类，它可以定义控制栏 PIP 操作并使用 PIP 图标。
+</p>
+
+<h2 id="handling_ui">处理画中画模式中的 UI</h2>
+
+<p>在 Activity 进入 PIP 模式时，Activity 应仅显示视频播放。
+在 Activity 进入 PIP 模式前删除 UI 元素，当 Activity 再次全屏显示时恢复这些元素。重写 <code>Activity.onPictureInPictureModeChanged()</code> 或
+<code>Fragment.onPictureInPictureModeChanged()</code>，并根据需要启用或禁用 UI 元素，例如：
+
+
+</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">在画中画模式中继续视频播放
+</h2>
+
+<p>在 Activity 切换到 PIP 模式时，系统会认为 Activity 处于暂停状态，并调用 Activity 的 <code>onPause()</code> 方法。
+如果 Activity 因为 PIP 模式暂停，视频播放不应暂停，而是应继续播放。
+
+在 Activity 的
+<code>onPause()</code> 方法中检查 PIP，并对播放做相应处理，例如：
+</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>当 Activity 退出 PIP 模式并回到全屏模式时，系统会恢复 Activity 并调用 <code>onResume()</code> 方法。
+</p>
+
+<h2 id="single_playback">使用画中画的单次播放 Activity
+</h2>
+
+<p>在您的应用中，用户可以在浏览主屏幕中的内容时选择一个新的视频，视频播放 Activity 处于 PIP 模式。
+在现有播放 Activity 中全屏模式下播放新视频，而不是启用可能使用户感到困惑的新 Activity。
+
+</p>
+
+<p>若要确保视频播放请求使用的是单个 Activity 并根据需要进入或退出 PIP 模式，在您的清单中将 Activity 的 <code>android:launchMode</code> 设置为 <code>singleTask</code>：
+
+
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>在您的 Activity 中，替换 {@link android.app.Activity#onNewIntent
+Activity.onNewIntent()}，处理新视频，如果需要，停止任何现有视频播放。
+</p>
+
+<h2 id="best">最佳做法</h2>
+
+<p>PIP 用于全屏播放视频的 Activity。在 Activity 切换到 PIP 模式时，应避免显示除视频外的其他内容。根据<a href="#handling_ui">处理画中画模式中的 UI</a> 中所述，在 Activity 进入 PIP 模式时进行跟踪，并隐藏 UI 元素。
+
+
+</p>
+
+<p>由于 PIP 窗口悬浮在屏幕的角落，因此应避免在主窗口被 PIP 窗口遮挡的任何区域显示重要信息。
+
+</p>
+
+<p>当 Activity 处于 PIP 模式时，其默认不获取输入焦点。要在 PIP 模式中接收输入事件，请使用
+<code>MediaSession.setMediaButtonReceiver()</code>。
+</p>
diff --git a/docs/html-intl/intl/zh-cn/preview/features/tv-recording-api.jd b/docs/html-intl/intl/zh-cn/training/tv/tif/content-recording.jd
similarity index 100%
rename from docs/html-intl/intl/zh-cn/preview/features/tv-recording-api.jd
rename to docs/html-intl/intl/zh-cn/training/tv/tif/content-recording.jd
diff --git a/docs/html-intl/intl/zh-tw/about/versions/android-5.0.jd b/docs/html-intl/intl/zh-tw/about/versions/android-5.0.jd
index 6b3637b..8952a35 100644
--- a/docs/html-intl/intl/zh-tw/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/zh-tw/about/versions/android-5.0.jd
@@ -428,7 +428,7 @@
<p>當系統偵測到適用網路時，就會自動連線並叫用 {@link android.net.ConnectivityManager.NetworkCallback#onAvailable(android.net.Network) onAvailable()} 回呼。您可以使用回呼的 {@link android.net.Network} 物件，以取得網路的額外資訊，或是將流量導向所選的網路。</p>
<h3 id="BluetoothBroadcasting">藍牙低功耗技術</h3>
-<p>Android 4.3 平台首度導入了<a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">藍牙低功耗技術</a> (<em>Bluetooth LE</em>) 支援功能，讓裝置以主機角色建立連線。在 Android 5.0 中，Android 裝置則可以扮演 Bluetooth LE「周邊裝置」<em></em>的角色。應用程式可以透過這項功能，輕鬆讓附近的裝置偵測到。舉例來說，您可以打造應用程式，讓裝置化身為計步器或健康監測器，並將資料傳送給另一台 Bluetooth LE 裝置。</p>
+<p>Android 4.3 平台首度導入了<a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">藍牙低功耗技術</a> (<em>Bluetooth LE</em>) 支援功能，讓裝置以主機角色建立連線。在 Android 5.0 中，Android 裝置則可以扮演 Bluetooth LE「周邊裝置」<em></em>的角色。應用程式可以透過這項功能，輕鬆讓附近的裝置偵測到。舉例來說，您可以打造應用程式，讓裝置化身為計步器或健康監測器，並將資料傳送給另一台 Bluetooth LE 裝置。</p>
<p>全新的 {@link android.bluetooth.le} API 可讓您的應用程式播送廣告、掃描回應，以及與附近的 Bluetooth LE 裝置建立連線。如要使用全新的廣告和掃描功能，請在您的資訊清單中新增 {@link android.Manifest.permission#BLUETOOTH_ADMIN BLUETOOTH_ADMIN} 權限。當使用者從 Play 商店更新或下載您的應用程式時，會看到以下的權限要求提示：「藍牙連線資訊：允許應用程式控制藍牙功能，包括對附近的藍牙裝置播送資訊，或是從附近的藍牙裝置取得資訊。」</p>
<p>如要開始 Bluetooth LE 廣告功能，以便其他裝置發掘您的應用程式，請呼叫 {@link android.bluetooth.le.BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback) startAdvertising()} 並傳遞 {@link android.bluetooth.le.AdvertiseCallback} 類別實作。回呼物件會收到廣告作業成功或失敗的報告。</p>
diff --git a/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0-changes.jd b/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..71569a3
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,480 @@
+page.title=行為變更
+page.keywords=preview,sdk,compatibility
+meta.tags="preview", "compatibility"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>此文件內容</h2>
+
+<ol>
+ <li><a href="#perf">效能改良</a>
+ <ol>
+ <li><a href="#doze">休眠</a></li>
+ <li><a href="#bg-opt">背景最佳化</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">權限變更</a></li>
+ <li><a href="#accessibility">協助工具改良</a>
+ <ol>
+ <li><a href="#screen-zoom">螢幕縮放</a></li>
+ <li><a href="#vision-settings">設定精靈中的視覺設定</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">NDK 應用程式連結到平台程式庫</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+</ol>
+
+<h2>另請參閱</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">Android N API 總覽</a>
+</li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ 除了新特性和功能之外，Android N 還包括各種不同的系統與 API 行為變更。此文件將強調說明一些您應該知道且在您的應用程式中加以考量的重要變更。
+
+
+
+</p>
+
+<p>
+ 如果您先前曾發佈過適用於 Android 的應用程式，請注意，您的應用程式可能會受到平台中的這類變更所影響。
+
+</p>
+
+
+<h2 id="perf">效能改良</h2>
+
+<p>
+ Android N 包含的系統行為變更旨在提升裝置的電池使用時間、改進 RAM 使用狀況與應用程式效能。這些變更會影響應用程式的系統資源可用性與系統通知。您應該檢閱這些變更並評估應用程式需要如何據以調整。
+
+
+
+
+</p>
+
+<h3 id="doze">休眠</h3>
+
+<p>
+ 於 Android 6.0 (API 層級 23) 引進的休眠會在使用者將裝置的電源拔除、保持靜止狀態並關閉螢幕時，延遲 CPU 與網路活動，以延長電池使用時間。Android N 會在裝置電源被到拔除並關閉螢幕，但不一定靜置不動時 (例如使用者把手持裝置放在口袋中行進時)，套用 CPU 與網路限制子集，進一步增強休眠的功能。
+
+
+
+
+
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png" alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>圖 1.</strong> 休眠如何套用第一層級的系統活動限制以延長電池使用時間的示意圖。
+
+</p>
+
+<p>
+ 當裝置以電池電力運作且螢幕已關閉一段時間時，裝置會進入休眠並套用第一組限制子集：關閉應用程式網路存取並延遲工作和同步。如果裝置進入休眠後靜置不動一段時間，系統會對 {@link android.os.PowerManager.WakeLock}、
+ {@link android.app.AlarmManager} 鬧鐘、GPS 與 Wi-Fi 掃描套用其餘的休眠限制。不論是已套用某些或全部的休眠限制，系統都會喚醒裝置簡短地進行維護，應用程式能夠在該維護時段內存取網路，並能執行任何延遲的工作/同步。
+
+
+
+
+
+
+
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png" alt="" id="figure2" />
+<p class="img-caption">
+ <strong>圖 2.</strong> 休眠如何在裝置靜置不動一段時間之後套用第二層級的系統活動限制的示意圖。
+
+</p>
+
+<p>
+ 請注意，開啟螢幕或將裝置插電，就會結束休眠並移除這些處理限制。這項額外行為不會影響配合 Android 6.0 (API 層級 23) 引進的舊版休眠改寫應用程式的建議與最佳做法，如<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">最佳化休眠與應用程式待命</a>中所述。像是使用 Google 雲端通訊 (GCM) 來傳送和接收訊息，以及開始規劃可適應額外休眠行為的更新等，還是應該遵循那些建議。
+
+
+
+
+
+
+
+
+</p>
+
+
+<h3 id="bg-opt">專案 Svelte：背景最佳化</h3>
+
+<p>
+ Android N 將三種隱含式廣播移除，有助於最佳化記憶體用量與電源耗用量。因為隱含式廣播常常會將註冊為在背景接聽此類廣播的應用程式啟動，所以此一變更有其必要。移除這些廣播對裝置效能與使用者體驗大有益處。
+
+
+
+
+</p>
+
+<p>
+ 行動裝置的連線能力經常變更，例如在 Wi-Fi 與行動數據之間切換。目前，應用程式可以透過在宣示說明中註冊隱含式 {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcast in their
+ 廣播的接收器以監視連線能力變更。由於許多應用程式都註冊要接收此廣播，單一網路切換就可以喚醒所有應用程式，並立刻處理廣播。
+
+
+
+
+</p>
+
+<p>
+ 同樣地，應用程式可以註冊要接收來自其他應用程式 (例如，相機) 的隱含式 {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 與 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} 廣播。當使用者使用相機應用程式拍攝相片時，會喚醒這些應用程式來處理廣播。
+
+
+</p>
+
+<p>
+ 為減少這些問題，Android N 採用的最佳化方式如下：
+
+</p>
+
+<ul>
+ <li>目標為 Android N 的應用程式不會收到 {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} 廣播，即使其宣示說明項目要求這些事件的通知。在前景執行的應用程式如果使用 {@code CONNECTIVITY_CHANGE} 來要求通知，仍可以在主要執行緒上接聽 {@link
+ android.content.BroadcastReceiver}。
+
+
+
+ </li>
+
+ <li>應用程式無法傳送或接收 {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 或 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} 廣播。這種最佳化方式會影響所有應用程式，而不只是目標為 Android N 的應用程式。
+
+ </li>
+</ul>
+
+<p>
+ 未來發行的 Android 可能會將其他隱含式廣播與未繫結的背景服務視為過時。因此，為隱含式廣播在宣示說明中宣告的接收器相依性以及背景服務的相依性，都應該避免或加以移除。
+
+
+
+</p>
+
+<p>
+ Android 架構提供數種解決方案，減少這些隱含式廣播或背景服務的需求。例如，{@link
+ android.app.job.JobScheduler} API 提供的健全機制可在符合指定條件 (例如，連線到非計量付費網路) 的情況下，排程網路操作。您甚至可以使用 {@link
+ android.app.job.JobScheduler}，對內容提供者的變更採取因應動作。
+
+
+
+</p>
+
+<p>
+ 如需此行為變更和如何改寫應用程式的詳細資訊，請參閱<a href="{@docRoot}preview/features/background-optimization.html">背景最佳化</a>。
+
+
+</p>
+
+
+<h2 id="perm">權限變更</h2>
+
+<p>
+ Android N 包括會影響您應用程式的權限變更，包括使用者帳戶權限和寫入外部儲存空間的新權限。以下是預覽版中已變更的權限摘要：
+
+
+
+</p>
+
+<ul>
+ <li>{@code GET_ACCOUNTS} (已過時)
+ <p>
+ GET_ACCOUNTS 權限現已過時。系統會忽略目標為 Android N 之應用程式所用的這個權限。
+
+ </p>
+ </li>
+
+</ul>
+
+
+
+<h2 id="accessibility">協助工具改良</h2>
+
+<p>
+ Android N 包括的變更旨在為視力不佳或視力受損的使用者改進平台可用性。這些變更一般應不需要變更您應用程式的程式碼，然而您應該檢閱這些功能並使用您的應用程式測試它們，以評估對使用者體驗的潛在影響。
+
+
+
+
+</p>
+
+
+<h3 id="screen-zoom">螢幕縮放</h3>
+
+<p>
+ Android N 可讓使用者設定<strong>顯示器大小</strong>以放大或縮小螢幕上的所有元素，進而改善視力不佳使用者的裝置協助工具。使用者無法將螢幕縮放到超過常見中型手機的最小螢幕寬度 <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">sw320dp</a> (Nexus 4 的寬度)。
+
+
+
+
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>圖 3.</strong> 右邊的螢幕顯示將執行 Android N 系統映像的裝置顯示大小增加的效果。
+
+</p>
+
+
+<p>
+ 當裝置密度變更時，系統會以下列方式通知執行中的應用程式：
+
+</p>
+
+<ul>
+ <li>如果應用程式的目標為 API 層級 23 或較低版本，系統會自動終止其所有背景處理程序。這表示如果使用者切換離開應用程式，以開啟 <em>[設定]</em> 畫面並變更 <strong>[顯示器大小]</strong> 設定，系統會在記憶體極低的情況下，以相同方式終止應用程式。如果應用程式有任何前景處理程序，系統會通知那些處理程序有設定變更，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>所述，有如裝置的螢幕方向有所變更。
+
+
+
+
+
+
+
+ </li>
+
+ <li>如果應用程式的目標為 Android N，其所有處理程序 (前景與背景) 都會收到設定變更的通知，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>所述。
+
+
+
+ </li>
+</ul>
+
+<p>
+ 大部分應用程式只要遵循 Android 最佳做法，不需要進行任何變更就能支援此功能。需檢查的特定項目如下：
+
+</p>
+
+<ul>
+ <li>在螢幕寬度為 <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code> 的裝置上測試您的應用程式，確定它能適當執行。
+
+ </li>
+
+ <li>裝置設定變更時，就會更新任何與密度相關的快取資訊，例如快取的點陣圖或從網路載入的資源。當應用程式從暫停狀態繼續時，會檢查設定更新。
+
+
+
+ <p class="note">
+ <strong>注意：</strong>如果您快取與設定相關的資料，最好包括相關中繼資料，例如該資料的適當螢幕大小或像素密度。儲存此中繼資料可讓您決定在設定變更之後，是否需要重新整理快取的資料。
+
+
+
+
+ </p>
+ </li>
+
+ <li>避免以不會隨螢幕密度調整的像素單位指定尺寸，請改為以<a href="{@docRoot}guide/practices/screens_support.html">密度獨立像素</a> (<code>dp</code>) 單位指定尺寸。
+
+
+ </li>
+</ul>
+
+<h3 id="vision-settings">設定精靈中的視覺設定</h3>
+
+<p>
+ Android N 包括在歡迎畫面的視覺化設定可讓使用者在新裝置上設定下列協助工具設定：<strong>放大手勢</strong>、<strong>字型大小</strong>、<strong>顯示器大小</strong>與 <strong>TalkBack</strong>。此變更增加和不同螢幕設定相關的錯誤能見度。您應該啟用這些設定來測試您的應用程式，以評估此功能的影響。您可以在 [設定] > [協助工具]<strong></strong> 下找到設定。
+
+
+
+
+
+
+
+</p>
+
+<h2 id="ndk">NDK 應用程式連結到平台程式庫</h2>
+
+<p>
+ Android N 包括的命名空間變更可避免載入非公開 API。如果您使用 NDK，應該只能使用來自 Android 平台的公開 API。在下一版正式發行的 Android 使用非公開 API，會造成您的應用程式當機。
+
+
+
+</p>
+
+<p>
+ 為了在發現使用非公開 API 時向您提出警示，當應用程式呼叫非公開 API 時，在 Android N 裝置上執行的應用程式會在 logcat 輸出產生一個錯誤，並以訊息同時顯示在裝置螢幕上，協助您更能察覺這種情況。您應該檢閱應用程式的程式碼，以移除使用的非公開平台 API，並使用預覽版裝置或模擬器全面測試您的應用程式。
+
+
+
+
+
+</p>
+
+<p>
+ 如果您的應用程式依存於平台程式庫，請參閱 NDK 文件來取得以公開 API 同等項目取代常見私人 API 的一般修正。您可能也連結到平台程式庫，而不自知，特別是在應用程式使用的程式庫屬於該平台 (例如 <code>libpng</code>) 但不屬於 NDK 的時候。如為上述情況，請務必在您的 APK 包含您打算連結的所有 .so 檔案。
+
+
+
+
+
+</p>
+
+<p class="caution">
+ <strong>注意：</strong>有些第三方程式庫會連結到非公開 API。如果您的應用程式使用此類程式庫，在下一版正式發行的 Android 上執行時就會當機。
+
+
+</p>
+
+<p>
+ 應用程式不應依存於或使用 NDK 所未包括的原生程式庫，原因是在不同的 Android 發行版本之間會有變更或會被移除。從 OpenSSL 切換到 BoringSSL 便是此類變更的一例。此外，因為 NDK 所未包括的平台程式庫沒有相容性需求，而使不同裝置提供不同的相容性層級。如果您必須在舊型裝置上存取非 NDK 程式庫，請讓載入取決於 Android API 層級。
+
+
+
+
+
+
+</p>
+
+<p>
+ 為協助您診斷這些類型的問題，以下是您在建置要用於 Android N 的應用程式時，會遇到的一些 Java 與 NDK 錯誤範例：
+
+</p>
+
+<p>Java 錯誤範例：</p>
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
+ is not accessible for the namespace "classloader-namespace"
+</pre>
+
+<p>NDK 錯誤範例：</p>
+<pre class="no-pretty-print">
+dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
+</pre>
+
+
+<p>
+ 以下是發生這些類型之錯誤的應用程式可用的一些一般修正：
+</p>
+
+<ul>
+ <li>改用標準 JNI 函式，以取代使用來自 libandroid_runtime.so 的 getJavaVM 與 getJNIEnv。
+
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>改用公開替代項 {@code __system_property_get}，以取代使用來自 {@code libcutils.so} 的 {@code property_get} 符號。如果要這樣做，請使用 {@code __system_property_get} 配合以下 include：
+
+
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ </li>
+
+ <li>應該改用應用程式本機版，以取代使用來自 {@code libcrypto.so} 的 {@code SSL_ctrl} 符號。例如，您在 {@code .so} 檔案中靜態地連結 {@code libcyrpto.a}，或在您的應用程式中從 BoringSSL 或 OpenSSL 動態地包括自己的 {@code libcrypto.so}。
+
+
+
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android N 包含對目標為 Android for Work 的應用程式所做的變更，包括對憑證安裝、密碼重設、次要使用者管理與裝置識別碼存取的變更。如果您要建置要用於 Android for Work 環境的應用程式，應該檢閱這些變更並據以修改應用程式。
+
+
+
+
+</p>
+
+<ul>
+ <li>您必須先安裝委派的憑證安裝程式後，DPC 才能加以設定。對於目標為 N SDK 的設定檔與裝置擁有者應用程式，您應該在裝置政策控制器 (DPC) 呼叫 <code>DevicePolicyManager.setCertInstallerPackage()</code> 之前，先安裝委派的憑證安裝程式。如果該安裝程式尚未安裝，系統會擲回 <code>IllegalArgumentException</code>。
+
+
+
+
+
+
+ </li>
+
+ <li>裝置系統管理員的重設密碼限制現在適用於設定檔擁有者。裝置系統管理員無法再使用 <code>DevicePolicyManager.resetPassword()</code> 來清除密碼或變更已設定的密碼。裝置系統管理員仍能設定密碼，但只限裝置還沒有密碼、PIN 或模式的情況下。
+
+
+
+
+ </li>
+
+ <li>即使已經設定限制，裝置擁有者與設定檔擁有者還是可以管理帳戶。裝置擁有者與設定檔擁有者在已採用 <code>DISALLOW_MODIFY_ACCOUNTS</code> 使用者限制的情況下，仍能呼叫帳戶管理 API。
+
+
+ </li>
+
+ <li>裝置擁有者能輕鬆管理次要使用者。當裝置以裝置擁有者模式執行時，會自動設定 <code>DISALLOW_ADD_USER</code> 限制。這樣可防止使用者建立不受管理的次要使用者。此外，<code>CreateUser()</code> 與 <code>createAndInitial()</code> 方法已經過時，改用 <code>DevicePolicyManager.createAndManageUser()</code> 取代。
+
+
+
+
+
+ </li>
+
+ <li>裝置擁有者可以存取裝置識別碼。裝置擁有者可以使用 <code>DevicePolicyManagewr.getWifiMacAddress()</code> 存取裝置的 Wi-Fi MAC 位址。如果未曾在該裝置上啟用 Wi-Fi，此方法會傳回 {@code null} 的值。
+
+
+
+ </li>
+</ul>
+
+<p>
+ 如需 Android N 中有關 Android for Work 變更的詳細資訊，請參閱 <a href="{@docRoot}preview/features/afw.html">Android for Work 更新</a>。
+
+</p>
+
+<h2 id="other">其他重點</h2>
+
+<ul>
+<li>在 Android N 上執行的應用程式如以較低的 API 層級為目標，當使用者變更顯示器大小，就會終止該應用程式的處理程序。應用程式必須要能適當處理這種情況。否則，當使用者要從最近使用記錄還原時就會當機。
+
+
+
+
+<p>
+您必須測試應用程式，確保不會發生這種行為。測試方法是透過 DDMS 手動終止應用程式，以造成相同的當機情況。
+
+
+
+</p>
+
+<p>
+目標為 N 與更新版本的應用程式不會在密度變更時自動終止；然而，它們仍會勉強地回應設定變更。
+
+</p>
+</li>
+
+<li>
+Android N 上的應用程式應該要適當處理設定變更，同時不應該在後續啟動時當機。您可以變更字型大小 ([設定]<strong></strong> > [顯示]<strong></strong> > [字型大小]<strong></strong>)，然後從最近使用紀錄還原應用程式，以驗證應用程式行為。
+
+
+
+
+</li>
+</ul>
+
diff --git a/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0-samples.jd b/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..0cb83b6
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=範例
+page.tags="preview", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ 下列程式碼範例是針對 Android N 提供。如果要在 Android Studio 中下載, 範例，請選取 [File] > [Import Samples]<b></b> 選單選項。
+
+
+</p>
+
+<p class="note">
+ <strong>注意：</strong>這些可下載的專案是專為與 Gradle 和 Android Studio 一起使用而設計。
+
+</p>
+
+
+<h3 id="mw">多視窗 Playground</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
+<p>
+ 此範例示範如何在您的應用程式中發揮多視窗使用者介面的功能。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">在 GitHub 上取得</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">使用中通知</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 這是現有的範例，它會顯示使用 NotificationCompat 傳送通知的簡單服務。來自使用者的每個未閱讀交談都會以個別通知方式傳送。
+
+
+</p>
+<p>
+ 已更新此範例以利用 Android N 中的新通知功能。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">在 GitHub 上取得</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">簡訊服務</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ 這是現有的範例，它示範如何使用 NotificationManager 告知使用者應用程式目前顯示的通知數目。
+
+
+</p>
+<p>
+ 已更新此範例以利用 Android N 中的新通知功能。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">在 GitHub 上取得</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">直接開機</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 此範例示範如何在裝置加密的儲存空間 (裝置開機後即一律可用) 中儲存及存取資料。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">在 GitHub 上取得</a>
+
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">限定範圍目錄存取</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ 此範例示範如何讀取及寫入特定目錄的資料，同時要求較少的權限。
+
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">在 GitHub 上取得</a>
+
+</p>
diff --git a/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0.jd b/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..2e73e4b
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,676 @@
+page.title=適用於開發人員的 Android N
+meta.tags="preview", "androidn"
+page.tags="preview", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>主要開發人員功能</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">多視窗支援</a></li>
+ <li><a href="#notification_enhancements">通知</a></li>
+ <li><a href="#jit_aot">JIT/AOT 編譯</a></li>
+ <li><a href="#quick_path_to_app_install">應用程式安裝的快速路徑</a></li>
+ <li><a href="#doze_on_the_go">移動時休眠</a></li>
+ <li><a href="#background_optimizations">背景最佳化</a></li>
+ <li><a href="#data_saver">Data Saver</a></li>
+ <li><a href="#tile_api">快速設定磚 API</a></li>
+ <li><a href="#number-blocking">拒接號碼</a></li>
+ <li><a href="#call_screening">來電過濾</a></li>
+ <li><a href="#multi-locale_languages">地區設定與語言</a></li>
+ <li><a href="#icu4">Android 中的 ICU4J API</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Android TV 錄製</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">協助工具</a></li>
+ <li><a href="#direct_boot">直接開機</a></li>
+ <li><a href="#key_attestation">金鑰證明</a></li>
+ <li><a href="#network_security_config">網路安全性設定</a></li>
+ <li><a href="#default_trusted_ca">預設信任的 CA</a></li>
+ <li><a href="apk_signature_v2">APK 簽章配置第 2 版</a></li>
+ <li><a href="#scoped_directory_access">限定範圍目錄存取</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>Android N 仍在開發中，但是您現在可以透過「N Developer Preview」來試用。下面各節重點說明適用於開發人員的一些新功能。
+
+ </p>
+
+<p>
+ 請務必查看<a href="{@docRoot}preview/behavior-changes.html">行為變更</a>以瞭解哪些平台變更部分會影響您的應用程式、閱讀開發人員指南以瞭解主要功能，以及下載 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>以深入瞭解新 API 的詳細資訊。
+
+
+
+</p>
+
+<h2 id="multi-window_support">多視窗支援</h2>
+
+
+<p>在 Android N 中，我們將許多人要求的新多工功能引進到平台 — 多視窗支援。
+ </p>
+
+ <p>使用者現在可以一次在螢幕上開啟兩個應用程式。 </p>
+ <ul>
+ <li>在執行 Android N 的手機與平板電腦上，使用者可以在分割畫面模式中並排或上下排列兩個應用程式。只要拖曳兩個應用程式之間的分隔線，即可調整其大小。
+
+
+ </li>
+
+<li>在 Android TV 裝置上，應用程式可以將本身放入<a href="{@docRoot}preview/features/picture-in-picture.html">子母畫面模式</a>，讓它們持續顯示內容，同時使用者可以瀏覽其他應用程式或與其互動。請參閱下面內容，以瞭解更多資訊。
+
+ </li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
+<p class="img-caption">
+ <strong>圖 1.</strong> 在分割畫面模式中執行的應用程式。
+</p>
+ </div>
+
+<p>特別是平板電腦與其他螢幕較大的裝置，多視窗支援為您提供吸引使用者的新方式。您甚至可以在應用程式中啟用拖放功能，讓使用者便利地從應用程式拖放內容 — 這是增強您的使用者體驗的絕佳方式。
+
+
+ </p>
+
+<p>將多視窗支援新增到您的應用程式並設定它處理多視窗顯示的方式是很直接的作法。例如，您可以指定活動的最小可允許尺寸，避免使用者將活動的尺寸調整到低於該尺寸。您也可以停用應用程式的多視窗顯示，以確保系統只以全螢幕模式顯示您的應用程式。
+
+
+
+</p>
+
+<p>
+ 如需詳細資訊，請參閱<a href="{@docRoot}preview/features/multi-window.html">多視窗支援</a>開發人員文件。
+
+</p>
+
+<h2 id="notification_enhancements">通知增強功能</h2>
+
+<p>我們已重新設計 Android N 中的通知，讓它們更易於使用、速度更快。一些變更包括：
+</p>
+
+<ul>
+ <li>
+ <strong>範本更新</strong>：我們已更新通知範本，在主圖影像和虛擬人偶放入的新強調。開發人員只需對程式碼進行最少的調整，即可發揮新範本的所有功能。
+
+
+ </li>
+
+ <li>
+ <strong>整合式通知</strong>：系統可以將訊息群組到一起 (例如依訊息主題) 並顯示群組。使用者可以直接在群組上執行動作，如「關閉」或「封存」。如果您已實作 Android Wear 的通知，則已經熟悉此模式。
+
+
+
+
+ </li>
+
+ <li>
+ <strong>直接回覆</strong>：對於即時通訊應用程式，Android 系統支援內嵌回覆，這樣使用者就能直接在通知介面內快速回應簡訊或文字訊息。
+
+
+ </li>
+
+ <li>
+ <strong>自訂檢視</strong>：兩個新的 API 讓您在通知中使用自訂檢視時可利用系統的裝飾，例如通知標題與動作。
+
+
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>圖 2.</strong> 整合式通知與直接回覆。
+</p>
+
+<p>如果要瞭解如何實作新的功能，請參閱<a href="{@docRoot}preview/features/notification-updates.html">通知</a>指南。
+
+</p>
+
+
+
+<h2 id="jit_aot">設定檔指引 JIT/AOT 編譯</h2>
+
+<p>在 Android N 中，我們新增了 Just in Time (JIT) 編譯器搭配程式碼分析工具到 ART，讓 Android 應用程式在執行時能夠持續改善其效能。JIT 編譯器補充了 ART 目前的 Ahead of Time (AOT) 編譯器，協助改善執行階段效能、節省儲存空間以及加速應用程式更新和系統更新。
+
+
+
+</p>
+
+<p>設定檔指引編譯讓 ART 根據每個應用程式的實際用情形與裝置上的情況來管理其 AOT/JIT 編譯。例如，ART 會維護每個應用程式常用方法的設定檔，而且可以預先編譯和快取那些方法以獲得最佳效能。它不會編譯應用程式的其他部分，直到實際要使用這些部分時才會編譯。
+
+
+
+</p>
+
+<p>除了改善應用程式關鍵部分的效能以外，設定檔指引編譯還有助於降低應用程式的整體 RAM 使用量，包括關聯的二進位檔案。此功能對於低記憶體裝置特別重要。
+
+</p>
+
+<p>ART 透過對裝置電池產生最小影響的方式來管理設定檔指引編譯。它只會在裝置閒置和充電時預先編譯，這種預先工作的方式可以節省時間和電池電力。
+
+</p>
+
+<h2 id="quick_path_to_app_install">應用程式安裝的快速路徑</h2>
+
+<p>ART JIT 編譯器的最實質好處之一是加速應用程式安裝和系統更新。即使是在 Android 6.0 上需要數分鐘來最佳化和安裝的大型應用程式，現在只需幾秒鐘就可以安裝。系統更新也會變得更快，因為不再需要最佳化步驟。
+
+
+ </p>
+
+<h2 id="doze_on_the_go">移動時休眠...</h2>
+
+<p>Android 6.0 引進休眠功能，這是可節省電池電力的系統模式，它會在裝置閒置時 (例如放在桌子上或抽屜中) 延後應用程式的 CPU 與網路活動。
+
+ </p>
+
+<p>現在 Android N 中的休眠功能更進一步進展，可在移動時節省電池電力。只要螢幕關閉一段時間且裝置拔除電源的情況下，休眠功能就會將熟悉的 CPU 與網路限制的子集套用到應用程式。這表示即使使用者將裝置放在口袋內時也可以節省電池電力。
+
+
+
+</p>
+
+
+<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
+<p class="img-caption">
+ <strong>圖 3.</strong> 休眠功能現在可套用限制，即使裝置沒有固定在一處時，也能改善電池使用時間。
+
+</p>
+
+
+<p>當裝置使用電池時，在螢幕關閉短時間後，休眠功能會限制網路存取並延遲工作與同步處理。在短暫的維護時段中，應用程式可存取網路並執行延遲的工作/同步處理。裝置螢幕開啟或插上電源可讓裝置離開休眠狀態。
+
+
+
+</p>
+
+<p>當裝置再次固定不動，且螢幕關閉並使用電池一段時間後，休眠功能會在
+{@link
+android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} 鬧鐘和 GPS/Wi-Fi 掃描上套用完整的 CPU 與網路限制。
+</p>
+
+<p>讓應用程式適應休眠功能的最佳做法，無論裝置在移動中或固定不動都是一樣的，所以如果您已經更新應用程式使其能夠處理休眠，就完全沒問題。如果沒有，現在就<a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">讓您的應用程式適應休眠功能</a>。
+
+
+</p>
+
+<h2 id="background_optimizations">專案 Svelte：背景最佳化</h2>
+
+<p>專案 Svelte 一直努力在生態系統中讓各種 Android 裝置上系統與應用程式使用最少的 RAM。在 Android N 中，「專案 Svelte」專注於最佳化應用程式在背景執行的方式。
+
+ </p>
+
+<p>背景處理是大多數應用程式的必要部分。如果正確地處理，它可讓您擁有令人驚歎的使用者體驗 — 立即、快速、內容感知。如果沒有適當處理，背景處理就會不必要地耗用 RAM (與電池電力)，而且影響其他應用程式的系統效能。
+
+
+ </p>
+
+<p>自 Android 5.0 開始，{@link android.app.job.JobScheduler} 就以適合使用者的偏好方式來執行背景工作。應用程式可以排程工作，同時讓系統根據記憶體、電源和連線狀況進行最佳化。JobScheduler 提供控制權和簡潔性，我們希望所有應用程式都使用它。
+
+
+
+ </p>
+
+<p>
+ 另一個好用的選項是 <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager"><code>GCMNetworkManager</code></a>，它屬於 Google Play 服務的一部分，提供類似的工作排程功能，可與舊版 Android 相容。
+
+
+
+</p>
+
+<p>我們會繼續擴充 <code>JobScheduler</code> 和 <code>GCMNetworkManager</code> 以滿足您的更多使用案例 — 例如，在 Android N 中，現在您可以根據內容提供者中的變更來排程背景工作。同時，我們也開始取代一些會降低系統效能 (特別是低記憶體裝置) 的較舊模式。
+
+
+
+
+</p>
+
+<p>在 Android N 中，我們移除了三個常用的隱含廣播 — {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}、{@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} 和 {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} — 因為它們會一次喚醒多個應用程式的背景處理程序，而耗盡記憶體與電池電力。如果您的應用程式收到這些廣播，請改為使用「N Developer Preview」遷移到 <code>JobScheduler</code> 與相關的 API。
+
+
+
+ </p>
+
+<p>
+ 看看<a href="{@docRoot}preview/features/background-optimization.html">背景最佳化</a>文件，以瞭解詳細資訊。
+
+</p>
+
+
+<h2 id="data_saver">Data Saver</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>圖 4.</strong> [設定] 中的 Data Saver。
+</p>
+ </div>
+
+<p>在行動裝置的使用壽命期間，行動數據方案的費用通常會超過裝置本身的費用。對於許多使用者而言，行動數據是他們想要節省的昂貴資源。
+
+ </p>
+
+<p>Android N 引進 Data Saver 模式，這是一個新的系統服務，有助於降低應用程式的行動數據用量，無論是漫遊、接近帳單週期結束時或小量預付數據包。Data Saver 讓使用者控制應用程式如何使用行動數據，也讓開發人員在 Data Saver 開啟時提供更有效率的服務。
+
+
+
+ </p>
+
+<p>當使用在 [設定]<strong></strong> 中啟用 Data Saver 且裝置使用計量付費網路時，系統會封鎖背景數據使用量，並指示前景的應用程式盡量使用較少的數據 — 例如，限制串流的位元率、降低影像品質、延遲開放式預先快取等等。使用者可以將特定應用程式新增到允許清單，以便即使在 Data Saver 為開啟狀態時，這些應用程式仍可在背景使用計量付費的數據使用量。
+
+
+
+
+</p>
+
+<p>Android N 擴充 {@link android.net.ConnectivityManager} 為應用程式提供<a href="{@docRoot}preview/features/data-saver.html#status">擷取使用者的 Data Saver 喜好設定</a>與<a href="{@docRoot}preview/features/data-saver.html#monitor-changes">監視喜好設定變更</a>的方法。所有應用程式應該檢視使用者是否已啟用 Data Saver 並努力限制前景與背景的數據使用量。
+
+
+
+</p>
+
+
+<h2 id="tile_api">快速設定磚 API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>圖 5.</strong> 通知欄中的快速設定磚。
+</p>
+
+
+ </div><p>快速設定是直接從通知欄顯示關鍵設定與動作的常用簡單方式。在 Android N 中，我們擴充了快速設定的範圍，讓它變得更實用、更便利。
+
+ </p>
+
+<p>我們也為額外的快速設定磚增加了更多空間，使用者可以透過向左或向右撥動存取分頁顯示區域。我們也讓使用者能夠控制要顯示的快速設定磚與顯示位置 — 使用者只需拖放磚，即可新增或移除它們。
+
+
+ </p>
+
+<p>對於開發人員，Android N 也加入了新的 API，讓您定義自己的快速設定磚，以便使用者輕鬆存取您應用程式中的關鍵控制項與動作。
+</p>
+
+<p>
+ 快速設定磚是專為急需或常用的控制項或動作而保留的，它不應該做為啟動應用程式的捷徑。
+
+
+</p>
+
+<p>
+ 定義磚之後，您即可將它們顯示給使用者，使用者只需拖放這些磚，即可將它們新增到快速設定中。
+
+</p>
+
+<p>
+ 如需建立應用程式磚的相關資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.service.quicksettings.Tile</code>。
+
+</p>
+
+
+
+<h2 id="number-blocking">拒接號碼</h2>
+
+<p>Android N 現在在平台中支援拒接號碼，並提供一個架構 API，讓服務提供者維護一份拒接號碼清單。預設的簡訊應用程式、預設的電話應用程式與提供者應用程式可以讀取及寫入拒接號碼清單。其他應用程式無法存取該清單。
+
+
+</p>
+
+<p>透過讓拒絕號碼成為平台上的標準功能，Android 為應用程式提供一個一致的方式，讓它們在各種裝置上都能支援拒接號碼。應用程式可以利用的其他好處包括：
+
+</p>
+
+<ul>
+ <li> 如果為某個號碼設定來電拒接，也會拒收該號碼的簡訊
+ <li> 透過備份與還原功能，即使經過重設或使用不同的裝置，也可持續保存
+
+ <li> 多個應用程式可使用同一份拒接號碼清單
+</ul>
+
+<p>此外，透過 Android 整合行動通訊業者應用程式，表示行動通訊業者可以讀取裝置上的拒接號碼清單並為使用者執行服務端的拒接號碼，因此停止拒接號碼的來電和簡訊透過任何媒體 (例如 VOIP 端點或來電轉接) 連絡到使用者。
+
+
+</p>
+
+<p>
+ 如需詳細資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.provider.BlockedNumberContract</code>。
+
+
+</p>
+
+<h2 id="call_screening">來電過濾</h2>
+
+<p>
+ Android N 能讓預設電話應用程式過濾來電。電話應用程式執行的方法是實作新的<code>CallScreeningService</code>，它可以讓電話應用程式根據來電的 {@link android.telecom.Call.Details Call.Details} 來執行數個動作，例如：
+
+
+
+</p>
+
+<ul>
+ <li> 拒接來電
+ <li> 不允許將來電記錄到通話紀錄
+ <li> 不對使用者顯示來電通知
+</ul>
+
+<p>
+ 如需詳細資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.telecom.CallScreeningService</code>。
+
+
+</p>
+
+
+<h2 id="multi-locale_languages">多地區設定支援，更多語言</h2>
+
+
+<p>Android N 現在可讓使用者在 [設定] 中選取<strong>多個地區設定</strong>，以便以更好的方式支援雙語言使用案例。應用程式可以使用新的 API 取得使用者選取的地區設定，然後為多地區設定使用者提供更精細的使用者體驗 — 例如以多語言顯示搜尋結果，以及不為使用者已經熟知語言的網頁提供翻譯。
+
+
+
+
+</p>
+
+<p>除了多地區設定支援，Android N 也擴充了供使用者選用的語言選項。它為每種常用語言 (例如英文、西班牙文、法文與阿拉伯文) 提供 25 種變體。它也增加了對 100 種以上新語言的支援。
+
+
+</p>
+
+<p>應用程式呼叫 <code>LocaleList.GetDefault()</code> 即可取得使用者設定的地區設定清單。為了支援擴充的地區設定數目，Android N 變更了它解析資源的方式。請務必測試並確認您的應用程式使用新的資源解析邏輯時可正常運作。
+
+</p>
+
+<p>如果要深入瞭解新的資源解析行為與應該遵循的最佳做法，請參閱<a href="{@docRoot}preview/features/multilingual-support.html">多語言支援</a>。
+</p>
+
+<h2 id="icu4">Android 中的 ICU4J API</h2>
+
+<p>
+ Android N 現在在 <code>android.icu</code> 套件下的 Android 架構中提供一個 <a href="http://site.icu-project.org/">ICU4J</a> API 子集。遷移很容易，大部分要承擔只是從 <code>com.java.icu</code> 命名空間變更為 <code>android.icu</code> 即可。如果您已經在應用程式中使用 ICU4J 套件組合，只要切換到 Android 架構中提供的 <code>android.icu</code> API，即可顯著縮減 APK 的大小。
+
+
+
+
+
+</p>
+
+<p>
+ 如果要深入瞭解 Android ICU4J API，請參閱 <a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J 支援</a>。
+</p>
+
+
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>Android N 針對 OpenGL ES 3.2 新增架構介面與平台支援，包括：</p>
+
+<ul>
+ <li> <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Android 延伸套件</a></a> (AEP) 中的所有延伸套件，但 <code>EXT_texture_sRGB_decode</code> 除外。
+ <li> HDR 的浮點畫面緩衝區與延遲著色。
+ <li> BaseVertex 繪圖呼叫 (可啟用更好的批次處理與串流)。
+ <li> 穩定的緩衝區存取控制 (可降低 WebGL 額外負荷)。
+</ul>
+
+<p>Android N 上 OpenGL ES 3.2 的架構 API 提供 <code>GLES32</code> 類別。使用 OpenGL ES 3.2 時，請務必在宣示說明檔案中使用 <code><uses-feature></code> 標籤與 <code>android:glEsVersion</code> 屬性宣告需求。
+
+
+ </p>
+
+<p>如需使用 OpenGL ES (包括如何在執行階段檢查裝置支援的 OpenGL ES 版本) 的詳細資訊，請參閱 <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API 指南</a>。
+</p>
+
+
+<h2 id="android_tv_recording">Android TV 錄製</h2>
+
+<p>Android N 透過新的錄製 API，新增了錄製和播放 Android TV 輸入服務內容的功能。以現有的時間位移 API 為建置基礎，TV 輸入服務可以控制要錄製哪個頻道的資料、如何儲存已錄製的時段，以及管理使用者與錄製內容的互動。
+
+
+ </p>
+
+<p>如需詳細資訊，請參閱 <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV 錄製 API</a>。</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work 為執行 Android N 的裝置增加了許多新的功能與 API。一些亮點如下所示 — 如需與 Android N 相關之 Android for Work 更新的完整清單，請參閱「Android for Work 變更」。
+
+</p>
+
+<h3 id="work_profile_security_challenge">工作設定檔安全性查問 </h3>
+
+<p>
+ 設定檔擁有者可以為以工作設定檔執行之應用程式指定個別的安全性查問。當使用者嘗試開啟任何工作應用程式時會顯示工作查問。成功完成安全性查問可將工作設定檔解鎖並在必要時將它解密。對於設定檔擁有者而言，<code>ACTION_SET_NEW_PASSWORD</code> 會提示使用者設定工作查問，而且 <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> 會提示使用者設定裝置鎖定。
+
+
+
+
+
+
+</p>
+
+<p>
+ 設定檔擁有者可以使用 <code>setPasswordQuality()</code>、<code>setPasswordMinimumLength()</code> 與相關方法，為工作查問設定各自的密碼原則 (例如，需要 PIN 的時間長度，或是否使用指紋來將設定檔解鎖)。設定檔使用者也可以使用新的 <code>getParentProfileInstance()</code> 方法傳回的 <code>DevicePolicyManager</code> 執行個體來設定裝置鎖定。此外，設定檔擁有者還可以使用新的 <code>setOrganizationColor()</code> 與 <code>setOrganizationName()</code> 方法，為工作查問自訂認證畫面。
+
+
+
+
+
+
+
+
+</p>
+<h3 id="turn_off_work">關閉工作 </h3>
+
+<p>在具有工作設定檔的裝置上，使用者可以切換工作模式。當工作模式關閉時，受管理的使用者會暫時關機，因此而停用工作設定檔應用程式、背景同步與通知。這也包括設定檔擁有者應用程式。當工作模式關閉時，系統會顯示持續的狀態圖示，提醒使用者他們無法啟動工作應用程式。啟動器會指出工作應用程式和小工具無法存取。
+
+
+
+
+ </p>
+
+<h3 id="always_on_vpn">一律開啟的 VPN </h3>
+
+<p>裝置擁有者和設定檔擁有者可確保工作應用程式一律透過指定的 VPN 連線。系統會自動在裝置開機時啟動該 VPN。
+
+</p>
+
+<p>
+ 新的 <code>DevicePolicyManager</code> 方法是 <code>setAlwaysOnVpnPackage()</code> 與 <code>getAlwaysOnVpnPackage()</code>。
+
+
+</p>
+
+<p>因為系統無需透過應用程式互動即可直接連結 VPN 服務，所以 VPN 用戶端需要為「一律開啟的 VPN」處理新的進入點。正如以往，透過符合動作 <code>android.net.VpnService</code> 的意圖篩選器向系統指明服務。
+
+
+ </p>
+
+<p>
+ 使用者也可以使用 [設定] > [更多] > [VPN]<strong></strong> 手動設定「一律開啟的 VPN」用戶端，這些用戶端在主要使用者中實作 <code>VPNService</code> 方法。
+
+
+</p>
+
+<h2 id="accessibility_enhancements">協助工具增強功能</h2>
+
+<p>Android N 現在為新的裝置設定在歡迎畫面上直接提供「視覺設定」。這讓使用者更易於在自己的裝置上探索及設定協助工具功能，包括放大手勢、字型大小、顯示大小和 TalkBack。
+
+
+ </p>
+
+<p>將這些協助工具功能放置在更為顯眼的地方，您的使用者較可能在啟用它們的情況下試用您的應用程式。請務必儘早在啟用這些設定的情況下測試您的應用程式。您可以從 [設定] > [協助工具] 啟用它們。
+
+
+</p>
+
+<p>此外，在 Android N 中，協助工具服務現在也可以協助行動不便的使用者觸控螢幕。新的 API 允許使用臉部追蹤、眼睛追蹤、點掃描等功能來建置服務，以滿足這些使用者的需要。
+
+
+</p>
+
+<p>如需詳細資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.accessibilityservice.GestureDescription</code>。
+ </p>
+
+
+<h2 id="direct_boot">直接開機</h2>
+
+<p>直接開機可加速裝置啟動時間，並讓已註冊的應用程式只能使用有限的功能 (即使在未預期的重新開機之後)。例如，如果一個加密裝置在使用者睡覺時重新開機，已註冊的鬧鐘、訊息與來電現在可以持續如常通知使用者。這也表示協助工具服務在重新啟動之後可立即使用。
+
+
+
+
+</p>
+
+<p>直接開機利用 Android N 中以檔案為基礎的加密，能夠為系統與應用程式資料使用更精細的加密原則。系統為特定系統資料與明確註冊的應用程式資料使用裝置加密存放區。在預設情況下，所有其他系統資料、使用者資料、應用程式與應用程式資料都會使用認證加密存放區。
+
+
+
+ </p>
+
+<p>開機時，系統會以限制模式啟動，它只能存取裝置加密的資料，而無法對應用程式或資料進行一般存取。如果您有想要在這個模式下執行的元件，可以在宣示說明中設定旗標來註冊這些元件。重新啟動之後，系統會透過廣播 <code>LOCKED_BOOT_COMPLETED</code> 意圖來啟用已註冊的元件。系統會確保已註冊的裝置加密應用程式資料可供使用之後才會解除鎖定。所有其他資料都無法使用，直到使用者確認他們的鎖定畫面認證之後，才會將這些資料解密。
+
+
+
+
+
+
+ </p>
+
+如需詳細資訊，請參閱<a href="{@docRoot}preview/features/direct-boot.html">直接開機</a>。</p>
+</p>
+
+
+<h2 id="key_attestation">金鑰證明</h2>
+
+<p>硬體支援的金鑰存放區為 Android 裝置上密碼編譯金鑰的建立、儲存及使用提供更安全的方法。它們可保護金鑰不受 Linux 核心、可能的 Android 弱點和從已解鎖裝置擷取的傷害。
+
+
+</p>
+
+<p>為了讓使用硬體支援的金鑰存放區更易於使用且更安全，Android N 引進金鑰證明。應用程式與裝置外部服務可以使用金鑰證明，毫不懷疑地判斷 RSA 或 EC 金鑰組是否有硬體支援、金鑰組的屬性是哪些以及它的用法和有效性上套用哪些限制條件。
+
+
+
+ </p>
+
+<p>應用程式與裝置外部服務可以透過 X.509 證明憑證 (必須以有效的證明金鑰簽署) 來要求有關金鑰組的資訊。證明金鑰是 ECDSA 簽署金鑰，它在裝置出廠時就已內嵌到其中的硬體支援金鑰存放區。因此，以有效證明金鑰簽署的證明憑證可確認裝置上有硬體支援的金鑰存放區，以及該金鑰儲存區中包含之金鑰組的詳細資訊。
+
+
+
+
+
+</p>
+
+<p>為了確保裝置使用安全的官方 Android 出廠映像，金鑰證明要求裝置的<a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">開機載入器</a>對<a class="external-link" href="https://source.android.com/security/trusty/index.html">信任執行環境 (TEE)</a> 提供下列資訊：
+
+
+</p>
+
+<ul>
+<li>裝置上安裝的作業系統版本與修補程式層級</li>
+<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> 公開金鑰與鎖定狀態</li>
+ </ul>
+
+<p>如需硬體支援的金鑰存放區功能的詳細資訊，請參閱<a href="https://source.android.com/security/keystore/" class="external-link">硬體支援的金鑰存放區</a>指南。
+</p>
+
+<p>除了金鑰證明之外，Android N 還引進連結指紋的金鑰，在註冊指紋時並不會撤銷。
+</p>
+
+<h2 id="network_security_config">網路安全性設定</h2>
+
+<p>在 Android N 中，應用程式可以安全地自訂其安全 (HTTPS、TLS) 連線的行為，無需修改任何程式碼，方法是使用宣告式的<em>網路安全性設定</em>，而不是使用容易出錯的傳統程式設計 API (例如 X509TrustManager)。
+
+
+</p>
+
+ <p>支援的功能：</p>
+<ul>
+<li><b>自訂信任錨點。</b>讓應用程式為它的安全連線自訂要信任哪個憑證授權單位 (CA)。例如，信任特定的自我簽署憑證或一組限制的公用 CA。
+
+
+</li>
+<li><b>僅偵錯覆寫。</b>讓應用程式開發人員安全地為應用程式的安全連線進行偵錯，而不會造成已安裝應用程式之使用者的風險。
+
+
+</li>
+<li><b>退出明碼流量。</b>讓應用程式保護自身，不被意外使用明碼流量所危害。
+</li>
+<li><b>憑證關聯。</b>這個進階功能可讓應用程式為安全連線限制要信任的伺服器金鑰。
+</li>
+</ul>
+
+<p>如需詳細資訊，請參閱<a href="{@docRoot}preview/features/security-config.html">網路安全性設定</a>。
+</p>
+
+<h2 id="default_trusted_ca">預設的信任憑證授權單位</h2>
+
+<p>根據預設，以 Android N 為目標的應用程式只信任系統提供的憑證，而不再信任使用者新增的憑證授權單位 (CA)。以 Android N 為目標且想要信任使用者新增之 CA 的應用程式，應該使用<a href="{@docRoot}preview/features/security-config.html">網路安全性設定</a>來指定信任使用者 CA 的方法。
+
+
+
+</p>
+
+<h2 id="apk_signature_v2">APK 簽章配置第 2 版</h2>
+
+<p>PackageManager 類別現在支援使用 APK 簽章配置第 2 版來驗證應用程式。APK 簽章配置第 2 版是全檔案簽章配置，可透過偵測對 APK 檔案所做的任何未授權變更，大幅改善驗證速度並增強完整性保證。
+
+
+</p>
+
+<p>為了維持回溯相容性，APK 必須先以第 1 版簽章配置 (JAR 簽章配置) 簽署，然後再用第 2 版簽章配置簽署。有了第 2 版簽章配置，如果以第 2 版配置簽署之後，以其他憑證簽署 APK，驗證會失敗。
+
+
+ </p>
+
+<p>「N Developer Preview」稍後將提供對 APK 簽章配置第 2 版的支援。
+</p>
+
+<h2 id="scoped_directory_access">限定範圍目錄存取</h2>
+
+<p>在 Android N 中，應用程式可以使用新的 API 來要求存取特定<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">外部儲存空間</a>目錄，包括抽取式媒體 (例如 SD 卡) 上的目錄。新的 API 大幅簡化應用程式存取標準外部儲存空間目錄 (例如 <code>Pictures</code> 目錄) 的方法。相片應用程式之類的應用程式可以使用這些 API 而非使用 <code>READ_EXTERNAL_STORAGE</code>，這樣能夠授予對所有儲存空間目錄的存取權，或是使用「儲存空間存取架構」，讓使用者可以瀏覽到目錄。
+
+
+
+
+
+
+</p>
+
+<p>此外，新的 API 也簡化了使用者授予外部儲存空間存取權給您的應用程式時所需採取的步驟。當您使用新的 API 時，系統會使用簡單的權限 UI，清楚地詳細說明應用程式要求存取的目錄。
+
+
+</p>
+
+<p>如需詳細資訊，請參閱<a href="{@docRoot}preview/features/scoped-folder-access.html">限定範圍目錄存取</a>開發人員文件。
+
+</p>
+
+
+
+
+
+
diff --git a/docs/html-intl/intl/zh-tw/preview/index.jd b/docs/html-intl/intl/zh-tw/about/versions/nougat/index.jd
similarity index 100%
rename from docs/html-intl/intl/zh-tw/preview/index.jd
rename to docs/html-intl/intl/zh-tw/about/versions/nougat/index.jd
diff --git a/docs/html-intl/intl/zh-tw/design/patterns/notifications.jd b/docs/html-intl/intl/zh-tw/design/patterns/notifications.jd
deleted file mode 100644
index 3e3f59c..0000000
--- a/docs/html-intl/intl/zh-tw/design/patterns/notifications.jd
+++ /dev/null
@@ -1,872 +0,0 @@
-page.title=通知
-page.tags="notifications","design","L"
-@jd:body
-
- <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>開發人員文件</h3>
- <p>通知使用者</p>
- </div>
-</a>
-
-<a class="notice-designers" href="notifications_k.html">
- <div>
- <h3>Android 4.4 及較早版本中的通知</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>影片</h3>
- <p>DevBytes：Android L 開發者預覽版中的通知</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>通知系統可以隨時知會使用者有關應用程式中的相關事件與及時事件，例如來自朋友的新聊天訊息。您可以將通知視為一種事件發生時警示使用者的新聞管道，或是在使用者沒注意時，記錄事件的日誌 — 並會視情況跨所有 Android 裝置且同步處理。
-
-
-
-
-
-</p>
-
-<h4 id="New"><strong>Android 5.0 新功能</strong></h4>
-
-<p>在 Android 5.0 中，通知會透過結構化、視覺化和功能化的效果接收重要更新：
-</p>
-
-<ul>
- <li>通知已經有視覺方面的變更，與新的材料設計風格一致。
-</li>
- <li> 現在可在裝置的鎖定螢幕上提供通知，而敏感內容仍可隱藏於其背後。
-
-</li>
- <li>當裝置於使用中收到高優先順序的通知時，會使用稱為預告 (heads-up) 通知的新格式。
-</li>
- <li>雲端同步化通知：關閉您其中一部 Android 裝置的通知，隨之也會在其他裝置上關閉此通知。
-
-</li>
-</ul>
-
-<p class="note"><strong>注意：</strong>此版本 Android 中的通知設計和先前版本大相徑庭。
-
-如需有關先前版本通知的設計資訊，請參閱
-<a href="./notifications_k.html">Android 4.4 及較早版本中的通知</a>。</p>
-
-<h2 id="Anatomy">通知的詳細分析</h2>
-
-<p>本節會重溫通知的基礎功能，以及其如何可在不同類型裝置上出現。
-</p>
-
-<h3 id="BaseLayout">基礎版面配置</h3>
-
-<p>至少，所有通知都必須包含一個基礎版面配置，它包含：</p>
-
-<ul>
- <li> 通知的<strong>圖示</strong>。該圖示代表原始應用程式。如果應用程式會產生一種以上的通知類型，則圖示也有可能表示通知類型。
-
-
-</li>
- <li> 一個通知<strong>標題</strong>和額外<strong>文字</strong>。
-</li>
- <li> 一個<strong>時間戳記</strong>。</li>
-</ul>
-
-<p>針對先前平台版本，使用 {@link android.app.Notification.Builder Notification.Builder}
-所建立的通知其外觀與運作方式和在 Android 5.0
-中的一樣，只是在系統為您處理的方式上有一點樣式上的變更。
-如需更多有關 Android 先前版本通知的詳細資訊，請參閱
-<a href="./notifications_k.html">Android 4.4 及較早版本中的通知</a>。
-</p></p>
-
-
- <img style="margin:20px 0 0 0" src="{@docRoot}images/android-5.0/notifications/basic_combo.png" alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- 手持裝置通知的基礎版面配置 (左)，以及穿戴裝置上的相同通知 (右)，都帶有使用者相片及一個通知圖示
-
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">擴充的版面配置</h3>
-
-
-<p>您可以選擇到底要讓您應用程式的通知提供多詳細的資料。
-通知可以顯示訊息的前幾行，也可以顯示較大的影像預覽。
-此額外資訊可提供使用者更多內容，而且 — 在某些情況下 — 可讓使用者讀取完整訊息。
-
-
-使用者可以捏合縮放或執行單手指滑動，在精簡的版面配置與擴充的版面配置間切換。
-
-
- 對於單一事件通知，Android 提供三個擴充版面配置範本
-(文字、收件匣和影像)，讓您可以在應用程式中使用。
-以下的影像顯示單一事件通知在手持裝置 (左) 和穿戴裝置 (右) 上的外觀。
-
-</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">動作</h3>
-
-<p>Android 支援可以在通知底端顯示的選用動作。透過動作，使用者可針對特定通知，從通知欄 (notification shade) 內處理最常見的工作，而無需開啟原始啟動的應用程式。這可加速互動，而且在配合滑動關閉
-(swipe-to-dismiss)
-時，有助使用者專注於高重要性的通知。
-
-
-
-</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png" alt="" width="700px" />
-
-
-
-<p style="clear:both">明智地決定要在通知中要納入多少個動作。
-您納入的動作愈多，就會發現創造出愈複雜的通知。
-請納入最緊迫重要且有意義的動作，限制自己儘可能使用最少數目的動作。
-
-
-</p>
-
-<p>適合用於通知上的動作包含：</p>
-
-<ul>
- <li> 必須是必要、頻繁且典型的想要顯示內容類型
-
- <li> 可讓使用者快速完成工作
-</ul>
-
-<p>避免下列狀況：</p>
-
-<ul>
- <li> 模稜兩可
- <li> 和通知的預設動作相同 (如「讀取」或「開啟」)
-
-</ul>
-
-
-
-<p>您最多可以指定三個動作，每個動作都由一個動作圖示與名稱組成。
-
- 為簡單的基礎版面配置新增動作，可讓通知變得更具擴充性
---
-即使通知並未具備擴充的版面配置。由於動作只針對擴充的通知顯示，其他時候則隱藏，請確認使用者可從通知內呼叫的任何動作，也可以從關聯的應用程式中使用。
-
-
-
-
-</p>
-
-<h2 style="clear:left">預告通知</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png" alt="" width="311px" />
- <p class="img-caption">
- 預告通知 (來電、高優先順序)
-出現在沉浸式應用程式之上的範例
-
- </p>
-</div>
-
-<p>當高優先順序的通知到達 (如右) 時，會對使用者呈現很短的時間，且會顯示可能執行動作的擴充版面配置。
-
-</p>
-<p> 在這段時間之後，通知會退回至通知欄。
-如果通知的<a href="#correctly_set_and_manage_notification_priority">優先順序</a>被標記為「高」、「最大」或「全螢幕」，就會取得預告通知。
-</p>
-
-<p><b>預告通知的好範例</b></p>
-
-<ul>
- <li> 使用裝置時有來電</li>
- <li> 使用裝置時啟動鬧鐘功能</li>
- <li> 新簡訊</li>
- <li> 電池電力不足</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">指導方針</h2>
-
-
-<h3 id="MakeItPersonal">提供個人設定</h3>
-
-<p>針對由另一人傳送項目的通知
-(如郵件或狀態更新)，使用
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()} 納入對方提供的影像。也將對方的資訊附加至通知的中繼資料中
-(請參閱 {@link android.app.Notification#EXTRA_PEOPLE})。</p>
-
-<p>您通知的主要圖示仍會顯示，這樣使用者就可以將主要圖示與狀態列中的可見圖示關聯起來。
-
-</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png" alt="" width="311px" />
-<p style="margin-top:10px" class="img-caption">
- 通知會顯示觸發通知的人及其傳送的內容。
-</p>
-
-
-<h3 id="navigate_to_the_right_place">導覽至正確的地方</h3>
-
-<p>當輕觸通知的本文時
-(在動作按鈕之外)，請將您的應用程式開啟至使用者可以檢視的地方，並根據通知中引用資料進行動作。
-
-在多數情況下，這將是單一資料項目 (如訊息) 的詳細資料檢視，但如果通知被堆疊時，也可能會是概述檢視。
-
-如果您的應用程式會將使用者帶到應用程式頂層之下的任何地方，則請將導覽過程插入應用程式的返回堆疊中，這可以讓使用者能夠按下系統的返回按鈕，返回至頂層。
-
-如需詳細資訊，請見<a href="{@docRoot}design/patterns/navigation.html#into-your-app">導覽</a>設計模式中的「透過主螢幕視窗小工具和通知，導覽至您的應用程式」<em></em>。
-
-</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">正確設定和管理通知優先順序
-
-</h3>
-
-<p>Android 支援對通知設定優先順序的旗標。此旗標可與其他通知旗標比較，影響通知顯示的位置，這有助於確保使用者一律會先看到最重要的通知。
-
-
-在發佈通知時，您可以從以下優先順序等級選擇：
-
-</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>優先順序</strong></p>
-</td>
- <td class="tab0">
-<p><strong>使用</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>用於關鍵且緊急的通知，警示使用者注意此通知具時效性或必須在繼續特定工作前先解決的情況。
-
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>主要用於重要通訊，例如內容為使用者特別感興趣的郵件或聊天事件。高優先順序通知會觸發預告通知的顯示。
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>用於不屬於此處所述任何其他優先事項類型的所有通知。</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>用於您希望使用者能夠被告知，但不那麼緊急的通知。
-低優先順序通知往往出現在清單的底端，因此適合於公共或間接的社交更新：
-
-使用者已要求針對這類事件通知，但這些通知一律不會優先於緊急或直接通訊。
-
-
-</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>用於內容關聯或背景資訊，例如天氣資訊或內容關聯位置的資訊。最低優先順序通知不會出現在狀態列。
-
-使用者會在展開通知欄時找到這些通知。
-</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>如何選擇合適的優先順序</strong>
-
-</h4>
-
-<p><code>DEFAULT</code>、<code>HIGH</code> 和 <code>MAX</code> 為可中斷的優先順序等級，且有打斷使用者正進行動作的風險。
-
-如要避免惹惱您應用程式的使用者，請將可中斷的優先順序保留給下列通知：
-</p>
-
-<ul>
- <li> 涉及另一人</li>
- <li> 具時效性</li>
- <li> 可能會立即變更使用者在現實世界中的行為</li>
-</ul>
-
-<p>對使用者而言，設定為 <code>LOW</code> 和 <code>MIN</code> 的通知仍可能很有價值：
-很多通知 -- 就算不是大多數 -- 並不需要使用者立即注意，或透過振動使用者的手腕加以提醒；但在使用者選擇查看通知時，這些通知仍會包含使用者覺得有價值的資訊。
-
-
-<code>LOW</code> 和 <code>MIN</code>
- 優先順序通知的準則包含：</p>
-
-<ul>
- <li> 不會牽涉到別人</li>
- <li> 不具時效性</li>
- <li> 包含使用者可能感興趣，但可能在空閒時才會瀏覽的內容
-</li>
-</ul>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png" alt="" width="700" />
-
-
-<h3 style="clear:both" id="set_a_notification_category">設定通知類別
-</h3>
-
-<p>如果您的通知屬於某個預先定義的類別
-(詳見下列說明)，則請據以指派。
-通知欄 (或任何其他通知接聽器) 等系統 UI
-可能會使用此資訊，決定排名和篩選結果。
-</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>來電 (語音或視訊) 或類似的同步化通訊要求
-</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>傳入的直接訊息 (簡訊、即時訊息等)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>非同步大量郵件 (電子郵件)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>「行事曆」事件</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>宣傳或廣告</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>鬧鐘或計時器</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>長時間執行的背景操作其進度</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>社交網路或共用更新</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>背景操作或驗證狀態中的錯誤</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>播放的媒體傳輸控制</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>系統或裝置狀態更新。保留供系統使用。</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>執行背景服務的表示</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>針對單一件事的特定、及時建議。例如，新聞應用程式可能會想推薦其認為使用者下一步想要閱讀的新聞報導。
-
-</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>有關裝置或內容關聯狀態的進行中資訊</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">概述您的通知</h3>
-
-<p>當您的應用程式嘗試傳送的通知，但已有類型相同的通知仍在等待中，則請針對應用程式將這些相同類型的通知合併為單一概述通知，而不要建立新物件。
-
-</p>
-
-<p>概述通知會建立概述描述，並讓使用者瞭解特定種類的通知有多少數目正在等待處理。
-
-</p>
-
-<div class="col-6">
-
-<p><strong>不要這樣做</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png" alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>請這樣做</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png" alt="" width="311px" />
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">您可以使用擴充摘要版面配置，針對組成概述的個別通知，提供更多詳細資料。
-
-這種方法可讓使用者更能感覺出哪些通知正處於等待處理，以及是否夠有趣，以便在關聯應用程式中詳細閱讀。
-
-
-
-</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png" style="margin-bottom:20px" alt="" width="311px" />
- <p class="img-caption">
- 概述實際上是通知的展開和收縮 (使用 <code>InboxStyle</code>)
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">讓通知成為可選用的
-</h3>
-
-<p>使用者應該總是能夠控制通知。讓使用者可以停用您應用程式的通知，或變更其警示屬性，如鬧鐘聲音或是否要使用振動，方法則是為您的應用程式設定新增通知設定項目。
-
-
-
-</p>
-
-<h3 id="use_distinct_icons">使用易於分辨的的圖示</h3>
-<p>使用者應該能瞄一下通知區域，即可以分辨哪些種類的通知目前正在等待處理。
-
-</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png" alt="" width="420" />
-</div>
-
- <div><p><strong>請這樣做</strong></p>
- <p>查看 Android 應用程式圖示，
-Android 應用程式已為您的應用程式提供外觀易於分辨的通知圖示。
-</p>
-
- <p><strong>請這樣做</strong></p>
- <p>針對小圖示使用<a href="/design/style/iconography.html#notification">通知圖示樣式</a>，針對您的動作列圖示使用 Material Light <a href="/design/style/iconography.html#action-bar">動作列圖示樣式</a>。
-
-
-
-</p>
-<p ><strong>請這樣做</strong></p>
-<p >讓圖示保持看起來簡單的狀態，避免因過多的詳細資料造成使用者難以看清楚。
-</p>
-
- <div><p><strong>不要這樣做</strong></p>
- <p>將任何額外的
-Alpha
-(變暗或淡出)
-置入您的小圖示和動作圖示之中；它們的邊緣可能會有反鋸齒狀，但因為 Android 使用這些圖示做為遮罩
-(也就是說，只使用 Alpha 通道)，所以影像通常會以完全透明度來繪製。
-</p>
-
-</div>
-<p style="clear:both"><strong>不要這樣做</strong></p>
-
-<p>使用顏色以區分您與其他人的應用程式。通知圖示應該只是個白色圖示透明背景的背景影像。
-</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">可以調整通知 LED 適當開啟
-</h3>
-
-<p>許多 Android 裝置具備通知 LED，可用於當螢幕關閉時通知使用者有新事件。
-
-優先順序等級為<code>MAX</code>、<code>HIGH</code> 和 <code>DEFAULT</code> 的通知，
-應該要讓 LED 亮起，而只有低優先順序 (<code>LOW</code> 和 <code>MIN</code>) 的通知則不需要。
-
-</p>
-
-<p>使用者對通知的控制應該延伸到 LED 上。當您使用 DEFAULT_LIGHTS，LED 會亮白色。
-
-除非使用者已明確自訂通知，否則您的通知不應該使用其他顏色。
-
-</p>
-
-<h2 id="building_notifications_that_users_care_about">建立使用者喜歡的通知
-</h2>
-
-<p>若要建立使用者喜歡的應用程式，精心設計您的通知非常重要。通知代表您應用程式的聲音，並有助於您應用程式的個性。
-
-
-非必要或非重要的通知會讓使用者不高興，這會讓他們覺得應用程式想要吸引注目不擇手段，所以請明智地使用通知。
-
-
-</p>
-
-<h3 id="when_to_display_a_notification">顯示通知的時機</h3>
-
-<p>若要建立人們喜歡使用的應用程式，重要的是要體認到使用者的注意與專注是必須加以保護的資源。
-
-雖然 Android 的通知系統已重新設計，儘量降低通知對使用者注意力的影響。但仍然必須警覺，通知會中斷使用者的工作流程。在規劃您的通知時，請先自問：通知是否足夠重要到可以合理地中斷使用者。
-
-
-
-
-
-
-如果您不確定，則讓使用者可以使用您應用程式的通知設定，或調整通知優先順序旗標為 <code>LOW</code> 或 <code>MIN</code>，避免使用者在從事其他工作時因此分心。
-
-
-
-</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png" alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- 具時效性的通知範例
- </p>
-
-<p>妥善規劃的應用程式只會在必要時才出現，但有幾個情況的確有益於應用程式透過無提示通知中斷使用者的行為。
-</p>
-
-<p>通知主要還是使用於<strong>具時效性時間的事件</strong>，特別是當這些同步事件<strong>涉及其他人</strong>的時候。
-比如說，傳入的聊天是通訊的即時、同步形式：
-
-另一個使用者正主動等待您的回應。
-「行事曆」事件是何時使用通知吸引使用者注意的另一個好例子，因為事件即將發生，而「行事曆」事件通常牽涉到其他人。
-
-
-</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">不顯示通知的時機
-</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png" alt="" width="311px" />
-</div>
-
-<p>在許多其他情況下，通知並不適當：</p>
-
-<ul>
- <li> 當通知並非直接針對使用者，或者資訊並非真正具時效性時，請避免通知使用者。
-
-例如，來自社交網路的非同步與間接更新，通常不是即時中斷的好時機。
-
-
-對於重視這些狀況的使用者，可以讓他們自行選擇加入通知。
-</li>
- <li> 如果相關的新資訊目前正在螢幕上，則不要建立另一個通知。
-反之，直接在前後關係中使用應用程式本身的 UI 通知使用者有新資訊。
-
-
- 例如，當使用者正與另一位使用者聊天時，聊天應用程式不應建立系統通知。
-</li>
- <li> 如果應用程式或系統可以不干擾使用者而解決問題，就不要因為如儲存或同步化資訊，或更新應用程式等低層級的技術操作而中斷使用者活動。
-
-</li>
- <li> 如果可能的話，就讓應用程式能自行從錯誤恢復，在不需要使用者進行任何動作時，就不要告知他們錯誤而中斷使用者的活動。
-
-</li>
- <li> 不要建立無實質內容的通知，也不要建立內容僅是在廣告您應用程式的通知。
-
-通知應該要能夠提供實用、及時的新資訊，而非只是為了啟動一個應用程式。
-
-</li>
- <li> 請不要為了讓您的品牌出現在使用者面前，而建立多餘的通知。
-
- 這類通知會讓您的使用者感到失望並不願意使用您的應用程式。能夠提供少量的更新資訊並可以吸引使用者注意您應用程式的最佳方式，是開發一個小工具，讓使用者可以選擇放置在主畫面上。
-
-
-
-
-</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">與通知互動
-</h2>
-
-<p>通知可由狀態列上的圖示表示，並可以透過開啟通知匣來存取。
-
-</p>
-
-<p>輕觸通知會開啟相關應用程式，顯示符合通知的詳細資料內容。對通知往左右滑動，可以將通知從通知匣中移除。
-
-</p>
-
-<h3 id="ongoing_notifications">進行中通知</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png" alt="" width="311px" />
- <p class="img-caption">
- 因為音樂播放的緣故所以有進行中通知
- </p>
-</div>
-<p>進行中通知可讓使用者得知在背景中正在進行程序的資訊。例如，音樂播放程式會在通知系統中宣告正在播放的曲目，除非使用者停止曲目，否則就會繼續宣告。
-
-
-
-進行中通知也可以針對如下載檔案或編碼影片等耗時較長的工作，向使用者顯示目前進度。
-
-使用者無法手動將進行中通知從通知匣移除。
-</p>
-
-<h3 id="ongoing_notifications">媒體播放</h3>
-<p>在 Android 5.0 中，鎖定螢幕不會針對已過時的
-{@link android.media.RemoteControlClient} 類別，顯示傳輸控制項。但鎖定螢幕「的確」<em></em>會顯示通知，所以每個應用程式的播放通知，現在都已經是使用者從鎖定狀態控制播放的主要方法。
-
-這個行為可讓應用程式進一步控制以何種方式顯示哪些按鈕，同時無論螢幕是否鎖定，都能為使用者提供一致性的體驗。
-
-
-</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">對話和快顯通知
-</h3>
-
-<p>您的應用程式目前若不在畫面上，就不應建立對話或快顯通知。
-對話或快顯通知只在使用者於您應用程式內採取動作時產生立即回應時才顯示。至於使用對話與快顯通知的進一步指引，請參閱<a href="/design/patterns/confirming-acknowledging.html">確認和確認完成</a>。
-
-
-
-</p>
-
-<h3>排名和排序</h3>
-
-<p>通知就是新聞，所以基本上是以逆時間順序顯示，同時會針對應用程式指定的通知<a href="#correctly_set_and_manage_notification_priority">優先順序</a>，給與特殊考慮。
-
-
-</p>
-
-<p>通知是鎖定螢幕的重要部分，並會在裝置重新顯示螢幕時明確作用。
-
-鎖定螢幕上的空間有限，所以更重要的是辨別出最緊急或相關的通知。
-
-基於這個理由，Android 針對通知提供了更複雜的排序演算法，並同時考慮：
-
-</p>
-
-<ul>
- <li> 時間戳記和應用程式指定的優先順序。</li>
- <li> 通知最近是否以聲音或振動干擾使用者。
-(也就是說，如果電話剛發出一個聲響，而使用者想要知道「剛剛發生什麼事？」，鎖定螢幕應該以瞄一下就能取得通知的方式來回應使用者。
-)
-
-</li>
- <li> 任何使用 {@link android.app.Notification#EXTRA_PEOPLE} 附加至該通知的人員，尤其是他們是否為標記星號的連絡人。
-</li>
-</ul>
-
-<p>要善用這種排序，請著重於您想要建立的使用者體驗，而非著眼於清單上的任何特定排名位置。
-
-</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png" alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Gmail 通知使用預設的優先順序，所以通常排序低於像 Hangouts 等即時訊息應用程式，但當有新郵件進來時，會暫時立即提升。
-
-
-
-
- </p>
-
-
-<h3>在鎖定螢幕上</h3>
-
-<p>由於通知可見於鎖定螢幕上，因此使用者隱私是特別重要的考量。
-
-通知通常包含敏感資訊，而且不一定要顯示給拿起裝置並打開顯示的任何人。
-
-</p>
-
-<ul>
- <li> 針對具有安全鎖定螢幕 (PIN、圖案或密碼) 的裝置，介面有公用和私密兩部分。
-公用介面可以顯示在安全鎖定螢幕上，因此任何人都可看見。
-私密介面是鎖定螢幕背後的世界，只在使用者登入裝置時才會顯示。
-</li>
-</ul>
-
-<h3>使用者控制安全鎖定螢幕上顯示的資訊</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px" />
- <p class="img-caption">
- 鎖定螢幕上的通知，以及使用者解鎖裝置後顯示的內容。
- </p>
-</div>
-
-<p>當設定安全鎖定螢幕時，使用者可以選擇隱藏來自安全鎖定螢幕的機密詳細資料。
-在這種情況下，系統 UI 會考慮通知的「可見度」<em></em>等級，判斷可以顯示何種內容。
-
-</p>
-<p> 如要控制可見度等級，可以呼叫
-<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>，並指定下列值之一：
-</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>。
-顯示通知的完整內容。
- 如果未指定可見度，則這會是系統預設值。</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>。
-在鎖定螢幕上，顯示這個通知存在的基本資訊，
-包括通知圖示和發佈通知的應用程式。通知詳細資料的其他部分則不會顯示。
-但請記住的下列幾點：
- <ul>
- <li> 如果您想要提供您通知的不同公用版本，
-以便顯示在安全鎖定螢幕上，
-請在 <code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code>
-欄位中提供一個取代的「通知」物件。
- <li> 此設定可以讓您的應用程式有機會建立內容的改編版本，非常實用但卻不會透露個人資訊。
-考慮簡訊應用程式的例子，
-其通知包含簡訊的文字和傳送者的姓名與連絡人圖示。
-此通知應該是 <code>VISIBILITY_PRIVATE</code>，但 <code>publicVersion</code> 仍包含像「3 個新訊息」等實用資訊，
-但卻又不提供任何其他可用來識別的詳細資料。
-
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</a></code>。僅顯示最起碼的資訊，
-甚至連通知圖示都排除。</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Android Wear 上的通知
-</h2>
-
-<p>預設情況下，通知和其<em>動作</em>會橋接至穿戴裝置。
-開發人員可以控制哪些通知可從電話橋接至手錶上，
-反之亦然。
-開發人員還可以控制哪些動作可以橋接。如果您的
-應用程式包含
-無法以單一點選完成的動作，
-請在您的穿戴通知上隱藏這些動作
-，或考慮將其連結至穿戴應用程式，
-讓使用者可以在手錶上完成動作。
-</p>
-
-<h4>橋接通知和動作</h4>
-
-<p>例如電話等已連線的裝置，
-可以橋接通知至穿戴裝置，讓通知可以在該處顯示。同樣的，也可以橋接動作，
-這樣使用者就可以直接從穿戴裝置對通知執行動作。</p>
-
-<p><strong>橋接</strong></p>
-
-<ul>
- <li> 新的即時訊息</li>
- <li> 例如 +1 等單點選動作，像 Heart</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px" height="156px" alt="" />
-
-<p><strong>請勿橋接</strong></p>
-
-<ul>
- <li> 新到播客的通知</li>
- <li> 對應至手錶上不可能執行的動作</li>
-</ul>
-
-
-
-<p><h4>要在穿戴裝置上定義的獨特動作</h4></p>
-
-<p>有些動作只能在穿戴裝置上執行。這些動作包含：</p>
-
-<ul>
- <li> 罐頭回應的快速清單，例如「會馬上回來」</li>
- <li> 在手機上開啟</li>
- <li> 帶出語音輸入畫面的「註解」或「回覆」動作</li>
- <li> 啟動穿戴裝置特定的應用程式動作</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px" height="156px" alt="" />
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/about.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/about.jd
index f63501f..5e0eec3 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/about.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/about.jd
@@ -6,7 +6,7 @@
@jd:body
-<div id="qv-wrapper">
+<div id="qv-wrapper">
<div id="qv">
<h2>關於 Google Play</h2>
<ol style="list-style-type:none;">
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/auto.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/auto.jd
index 8fe944d..88236c1 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/auto.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/auto.jd
@@ -160,4 +160,4 @@
data-query="collection:autolanding"
data-cardSizes="9x6, 6x3x2"
data-maxResults="6">
- </div>
+ </div>
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/developer-console.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/developer-console.jd
index a0093bb..b14095b 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/developer-console.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/developer-console.jd
@@ -5,7 +5,7 @@
@jd:body
-<div id="qv-wrapper">
+<div id="qv-wrapper">
<div id="qv">
<h2>發行功能</h2>
<ol>
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/families/about.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/families/about.jd
index b362ae9..38c2ac1 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/families/about.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/families/about.jd
@@ -36,4 +36,4 @@
<div class="paging-links" style="padding-top:.75em;">
<a href="{@docRoot}distribute/googleplay/families/start.html" class="next-class-link">後續內容：選擇</a>
-</div>
+</div>
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/families/faq.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/families/faq.jd
index 6964789..057e583 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/families/faq.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>本文件內容</h2>
@@ -106,7 +106,7 @@
</dt>
<dd>
- 在您選擇加入 Designed for Families 後，Google Play 會檢閱您的應用程式，以確認其是否適合家庭使用。若您的應用程式符合所有計劃需求，預計發行時間不會長於一般發行時間；但是，若在 Designed for Families 檢閱期間拒絕應用程式，則該應用程式的發行可能會出現延遲。
+ 在您選擇加入 Designed for Families 後，Google Play 會檢閱您的應用程式，以確認其是否適合家庭使用。若您的應用程式符合所有計劃需求，預計發行時間不會長於一般發行時間；但是，若在 Designed for Families 檢閱期間拒絕應用程式，則該應用程式的發行可能會出現延遲。
</dd>
<dt>
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/families/start.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/families/start.jd
index bf7a725..ca44a28 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/families/start.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/families/start.jd
@@ -51,7 +51,7 @@
</p>
<p class="note">
- <strong>注意：</strong>Designed for Families 計劃中已發行的應用程式也可供 Google Play 上的所有使用者使用。
+ <strong>注意：</strong>Designed for Families 計劃中已發行的應用程式也可供 Google Play 上的所有使用者使用。
</p>
<p>
@@ -67,4 +67,4 @@
<div class="paging-links" style="padding-top:.75em;">
<a href="{@docRoot}distribute/googleplay/families/faq.html" class="next-class-link">後續內容：常見問題</a>
-</div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/guide.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/guide.jd
index 0165279..e70eaa3 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/guide.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/guide.jd
@@ -54,4 +54,4 @@
data-query="collection:play_dev_guide"
data-cardSizes="9x6"
data-maxResults="1">
- </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/auto.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/auto.jd
index bf7b702..d724869 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/auto.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/auto.jd
@@ -431,4 +431,4 @@
<p class="caution">
<strong>重要說明：</strong>由於存在這一限制，因此您不應將生產 APK 用於 Auto 支援原型設計。
-</p>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/core.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/core.jd
index feabc20..3435ec2 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/core.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/core.jd
@@ -13,7 +13,7 @@
<li><a href="#listing">Google Play</a></li>
</ol>
-
+
<h2>測試</h2>
<ol>
<li><a href="#test-environment">設定測試環境</a></li>
@@ -25,7 +25,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">平板電腦應用程式品質</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">最佳化您的應用程式</a></li>
</ol>
-
+
</div>
</div>
@@ -70,7 +70,7 @@
<th style="width:54px;">
ID
</th>
-
+
<th>
描述
@@ -1011,4 +1011,4 @@
<p>
請確保使用{@link android.os.StrictMode.ThreadPolicy.Builder#penaltyFlashScreen() penaltyFlashScreen()}針對 <code>ThreadPolicy</code> 啟用政策違犯的<strong>視覺通知</strong>。
-</p>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/tablets.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/tablets.jd
index 3c16f9d..d584e53 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/tablets.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/tablets.jd
@@ -46,7 +46,7 @@
<div class="headerLine"><h2 id="core-app-quality">1.測試基本平板電腦應用程式品質</h2></div>
-<p>提供平板電腦應用程式絕佳體驗的第一步，是確保其符合應用程式所針對所有裝置及尺寸規格的<em>核心應用程式品質準則</em>。如需完備資訊，請參閱<a href="{@docRoot}distribute/essentials/quality/core.html">核心應用程式品質指導方針</a>。
+<p>提供平板電腦應用程式絕佳體驗的第一步，是確保其符合應用程式所針對所有裝置及尺寸規格的<em>核心應用程式品質準則</em>。如需完備資訊，請參閱<a href="{@docRoot}distribute/essentials/quality/core.html">核心應用程式品質指導方針</a>。
</p>
<p>
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/wear.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/wear.jd
index 47a2d91..6dc85e8 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/wear.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/quality/wear.jd
@@ -395,4 +395,4 @@
</p>
<p>
是。上述需求僅判斷在 Google Play 上是否將您的應用程式視為 Android Wear 應用程式，以及該應用程式是否可供 Android Wear 使用者更輕鬆地探尋。若未接受您的應用程式為 Wear 應用程式，仍會向其他裝置類型 (例如手機或平板電腦) 提供該應用程式，並且仍會安裝在穿戴式裝置上。
-</p>
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/start.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/start.jd
index 3364e49..8bff67d 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/start.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/start.jd
@@ -134,4 +134,4 @@
data-query="collection:distribute/googleplay/gettingstarted"
data-sortOrder="-timestamp"
data-cardSizes="9x3"
- data-maxResults="6"></div>
\ No newline at end of file
+ data-maxResults="6"></div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/tv.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/tv.jd
index c4f7a7c..aa2096a 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/tv.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/tv.jd
@@ -173,7 +173,7 @@
<h3 id="track_review">5.追蹤您的檢閱與核准</h3>
<p>
- 若您的應用程式符合 Android 電視的技術與品質準則 (如上所述)，則會向 Android 電視的使用者提供您的應用程式。若您的應用程式不符合該準則，您將收到<strong>傳送至您開發人員帳戶地址的通知電子郵件</strong>，內含需要修正的領域的摘要。若您已進行所需調整，可以將新版本的應用程式上傳至 Developer Console。
+ 若您的應用程式符合 Android 電視的技術與品質準則 (如上所述)，則會向 Android 電視的使用者提供您的應用程式。若您的應用程式不符合該準則，您將收到<strong>傳送至您開發人員帳戶地址的通知電子郵件</strong>，內含需要修正的領域的摘要。若您已進行所需調整，可以將新版本的應用程式上傳至 Developer Console。
</p>
<p>
@@ -190,7 +190,7 @@
</li>
<li>
- <em>已核准</em> - 已檢閱並核准您的應用程式。會直接向 Android 電視使用者提供該應用程式。
+ <em>已核准</em> - 已檢閱並核准您的應用程式。會直接向 Android 電視使用者提供該應用程式。
</li>
<li>
@@ -207,4 +207,4 @@
data-query="collection:tvlanding"
data-cardSizes="9x6, 6x3x2"
data-maxResults="6">
- </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/googleplay/wear.jd b/docs/html-intl/intl/zh-tw/distribute/googleplay/wear.jd
index 19a48f5..f4aca5c 100644
--- a/docs/html-intl/intl/zh-tw/distribute/googleplay/wear.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/googleplay/wear.jd
@@ -196,4 +196,4 @@
data-query="collection:wearlanding"
data-cardSizes="6x2"
data-maxResults="3">
- </div>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/tools/launch-checklist.jd b/docs/html-intl/intl/zh-tw/distribute/tools/launch-checklist.jd
index 6e97417..167c4f1 100644
--- a/docs/html-intl/intl/zh-tw/distribute/tools/launch-checklist.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/tools/launch-checklist.jd
@@ -789,4 +789,4 @@
data-query="collection:distribute/toolsreference/launchchecklist/afterlaunch"
data-sortOrder="-timestamp"
data-cardSizes="9x3,9x3,9x3,9x3,9x3,9x3"
- data-maxResults="6"></div>
\ No newline at end of file
+ data-maxResults="6"></div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/distribute/tools/localization-checklist.jd b/docs/html-intl/intl/zh-tw/distribute/tools/localization-checklist.jd
index 1b95d0b..c34fcee 100644
--- a/docs/html-intl/intl/zh-tw/distribute/tools/localization-checklist.jd
+++ b/docs/html-intl/intl/zh-tw/distribute/tools/localization-checklist.jd
@@ -713,4 +713,4 @@
data-query="collection:distribute/toolsreference/localizationchecklist/supportlaunch"
data-sortOrder="-timestamp"
data-cardSizes="9x3,9x3,6x3,9x3,9x3,9x3"
- data-maxResults="6"></div>
\ No newline at end of file
+ data-maxResults="6"></div>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/google/play/filters.jd b/docs/html-intl/intl/zh-tw/google/play/filters.jd
index e96b9dd..eec87ac 100644
--- a/docs/html-intl/intl/zh-tw/google/play/filters.jd
+++ b/docs/html-intl/intl/zh-tw/google/play/filters.jd
@@ -263,4 +263,4 @@
<p class="caution"><strong>注意：</strong>針對同一應用程式發行多個 APK 是進階功能，<strong>多數應用程式應僅發行為諸多裝置組態提供支援的單一 APK</strong>。發行多個 APK 需要您遵循篩選器中的特定規則，並格外注意每個 APK 的版本代碼，以確保每個組態使用正確的更新路徑。</p>
-<p>若您需要有關如何在 Google Play 上發行多個 APK 的詳細資訊，請參閱<a href="{@docRoot}google/play/publishing/multiple-apks.html">多 APK 支援</a>。</p>
\ No newline at end of file
+<p>若您需要有關如何在 Google Play 上發行多個 APK 的詳細資訊，請參閱<a href="{@docRoot}google/play/publishing/multiple-apks.html">多 APK 支援</a>。</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/guide/components/bound-services.jd b/docs/html-intl/intl/zh-tw/guide/components/bound-services.jd
index da47634..e26e993 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/bound-services.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/bound-services.jd
@@ -303,7 +303,7 @@
}
</pre>
-<p>上述範例顯示：用戶端如何使用
+<p>上述範例顯示：用戶端如何使用
{@link android.content.ServiceConnection} 的實作和 {@link
android.content.ServiceConnection#onServiceConnected onServiceConnected()} 回呼，繫結至服務。下一節提供關於繫結至服務處理程序的詳細資訊。
</p>
@@ -334,7 +334,7 @@
</div>
</div>
-<p>如果服務要和遠端處理程序溝通，則可以使用
+<p>如果服務要和遠端處理程序溝通，則可以使用
{@link android.os.Messenger} 為您的服務提供介面。此技術讓您不需要使用 AIDL，就可以執行處理程序間通訊 (IPC)。
</p>
@@ -636,7 +636,7 @@
</p>
-<p>此外，如果您的服務已啟動並且接受繫結，當系統呼叫您的 {@link android.app.Service#onUnbind onUnbind()} 方法時，可以選擇傳回
+<p>此外，如果您的服務已啟動並且接受繫結，當系統呼叫您的 {@link android.app.Service#onUnbind onUnbind()} 方法時，可以選擇傳回
{@code true} (如果您希望用戶端下次繫結至服務時，可以接收 {@link android.app.Service#onRebind
onRebind()} 呼叫，而不是接收 {@link
android.app.Service#onBind onBind()} 的呼叫)。{@link android.app.Service#onRebind
diff --git a/docs/html-intl/intl/zh-tw/guide/components/fragments.jd b/docs/html-intl/intl/zh-tw/guide/components/fragments.jd
index e54769b..dfef8f1 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/fragments.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>另請參閱</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">使用片段建置動態 UI</a></li>
@@ -46,7 +46,7 @@
</div>
</div>
-<p>{@link android.app.Fragment} 代表一種行為或
+<p>{@link android.app.Fragment} 代表一種行為或
{@link android.app.Activity} 中的一部分使用者介面。您可以合併單一 Activity 中的多個片段，藉此建置
多窗格 UI 以及在多個 Activity 中重複使用片段。您可以將片段想成是 Activity 的模組化區段，片段擁有自己的生命週期、接收自己的輸入事件，而且您可以在 Activity 執行時新增或移除片段 (有點像是您可以在不同 Activity 中重複使用的「子 Activity」)。
@@ -204,11 +204,11 @@
{@link android.widget.ListView}，因此您不必加以實作。</p>
<p>如要從 {@link
-android.app.Fragment#onCreateView onCreateView()} 傳回版面配置，您可以從 XML 中定義的<a href="{@docRoot}guide/topics/resources/layout-resource.html">l版面配置資源</a>擴大它。為協助您完成這項作業，{@link android.app.Fragment#onCreateView onCreateView()} 提供了
+android.app.Fragment#onCreateView onCreateView()} 傳回版面配置，您可以從 XML 中定義的<a href="{@docRoot}guide/topics/resources/layout-resource.html">l版面配置資源</a>擴大它。為協助您完成這項作業，{@link android.app.Fragment#onCreateView onCreateView()} 提供了
{@link android.view.LayoutInflater} 物件。
</p>
-<p>例如，以下是 {@link android.app.Fragment} 的子類別，可從
+<p>例如，以下是 {@link android.app.Fragment} 的子類別，可從
{@code example_fragment.xml} 檔案載入版面配置：</p>
<pre>
@@ -378,7 +378,7 @@
<li>使用 {@link
android.app.FragmentManager#findFragmentById findFragmentById()} (針對在 Activity 版面配置中提供 UI 的片段) 或 {@link android.app.FragmentManager#findFragmentByTag
findFragmentByTag()} (針對未提供 UI 的片段) 取得 Activity 中的現有片段。
-</li>
+</li>
<li>使用 {@link
android.app.FragmentManager#popBackStack()} (模擬使用者的「返回」<em></em>命令) 將片段從返回堆疊中推出。</li>
<li>使用 {@link
@@ -563,7 +563,7 @@
</pre>
<p>如果 Activity 並未實作介面，那麼片段會擲回
-{@link java.lang.ClassCastException}。成功擲回時，{@code mListener} 成員會保留 Activity 所實作
+{@link java.lang.ClassCastException}。成功擲回時，{@code mListener} 成員會保留 Activity 所實作
{@code OnArticleSelectedListener} 的參照資料，以便片段 A 呼叫 {@code OnArticleSelectedListener} 介面定義的方法與 Activity 分享事件。
例如，假設片段 A 是
@@ -739,7 +739,7 @@
這個 Activity 範例同時示範了如何根據螢幕設定提供不同的片段設定。
</p>
-<p class="note"><strong>注意：</strong>如需這個 Activity 的完整原始碼，請查閱
+<p class="note"><strong>注意：</strong>如需這個 Activity 的完整原始碼，請查閱
<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.html">{@code
FragmentLayout.java}</a>。</p>
@@ -785,7 +785,7 @@
<p>第二個片段 {@code DetailsFragment} 則會針對
{@code TitlesFragment} 中，使用者所選清單項目的劇本摘要：</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>針對 {@code TitlesFragment} 類別發出的回呼，如果使用者點擊清單項目，而且目前的版面配置「並未」<em></em>包含 {@code R.id.details} 檢視 ({@code DetailsFragment} 所屬的檢視)，則應用程式會執行 {@code DetailsActivity} Activity 來顯示項目內容。
@@ -798,7 +798,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>請注意，這個 Activity 會在螢幕採用橫向版面配置的情況下自行結束，因此主要 Activity 會接續顯示 {@code TitlesFragment} 旁的 {@code DetailsFragment}。如果使用者在採用直向版面配置的裝置上執行 {@code DetailsActivity}，然後將該裝置旋轉成橫向 (這會重新執行目前的 Activity)，就可能會發生這種情況。
diff --git a/docs/html-intl/intl/zh-tw/guide/components/fundamentals.jd b/docs/html-intl/intl/zh-tw/guide/components/fundamentals.jd
index d3b3c28..9e4079e 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/fundamentals.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/fundamentals.jd
@@ -309,7 +309,7 @@
</ul>
<p>系統看不到您納入來源但未在宣示說明中宣告的 Activity、服務和內容供應程式，因此系統無法執行這些項目。
-不過，您可在宣示說明宣告廣播接收器，或是透過程式碼以動態方式建立廣播接收器 (將廣播接收器建立為
+不過，您可在宣示說明宣告廣播接收器，或是透過程式碼以動態方式建立廣播接收器 (將廣播接收器建立為
{@link android.content.BroadcastReceiver} 物件)，然後呼叫 {@link android.content.Context#registerReceiver registerReceiver()}
向系統註冊廣播接收器。
@@ -379,7 +379,7 @@
</p>
<p>例如，假設您的應用程式需要相機且採用 Android 2.1 (<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API 級別</a> 7) 導入的 API，建議您用下列方式在宣示說明檔案中宣告這些需求：
-</p>
+</p>
<pre>
<manifest ... >
diff --git a/docs/html-intl/intl/zh-tw/guide/components/index.jd b/docs/html-intl/intl/zh-tw/guide/components/index.jd
index f34c712..a59bcd4 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/index.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/index.jd
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>部落格文章</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>使用 DialogFragments</h4>
<p>本文示範如何搭配 v4 支援程式庫 (可針對 Honeycomb 以下版本裝置提供向下相容性支援) 使用 DialogFragments 來顯示簡易的編輯對話方塊，以及透過介面將結果回傳給呼叫「Activity」。</p>
@@ -21,7 +21,7 @@
<h4>適用於各種裝置的片段</h4>
<p>我們於今日推出的靜態程式庫可列出相同的 Fragments API (以及新的 LoaderManager 和些許其他類別)，讓與 Android 1.6 以下版本相容的應用程式能夠使用片段來建立相容於平板電腦的使用者介面。 </p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>運用多個執行緒來提升效能</h4>
<p>建立回應式應用程式的建議做法是，最小化您的主要 UI 執行緒所執行的工作數。
@@ -32,7 +32,7 @@
<div class="col-6">
<h3>培訓</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>管理 Activity 生命週期</h4>
<p>本課程說明每個「Activity」執行個體都會接收的生命週期重要回呼方法，並且說明如何使用這些方法，讓 Activity 的運作能符合使用者的預期，以及讓 Activity 在不需要系統資源時不耗用這類資源。
diff --git a/docs/html-intl/intl/zh-tw/guide/components/loaders.jd b/docs/html-intl/intl/zh-tw/guide/components/loaders.jd
index 89bfc80..112993a 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/loaders.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>重要類別</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>相關範例</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">LoaderCursor
@@ -51,7 +51,7 @@
因此不需要重新查詢資料。
</li>
</ul>
-
+
<h2 id="summary">載入器 API 摘要</h2>
<p>有多個類別和介面可能與在應用程式中使用載入器有關。
@@ -129,7 +129,7 @@
</li>
<li>{@link android.app.LoaderManager.LoaderCallbacks} 的實作。
您可以在這裡建立新的載入器和管理對現有載入器的參照。
-</li>
+</li>
<li>顯示載入器資料的一種方式，例如 {@link
android.widget.SimpleCursorAdapter}。</li>
<li>使用 {@link android.content.CursorLoader} 時的資料來源，例如 {@link android.content.ContentProvider}。
@@ -140,7 +140,7 @@
<p>{@link android.app.LoaderManager} 可在 {@link android.app.Activity} 或 {@link android.app.Fragment} 內管理一或多個 {@link
android.content.Loader} 執行個體。
每個 Activity 或片段只能有一個 {@link
-android.app.LoaderManager}。</p>
+android.app.LoaderManager}。</p>
<p>您通常會在 Activity 的 {@link
android.app.Activity#onCreate onCreate()} 方法內或在片段的 {@link android.app.Fragment#onActivityCreated onActivityCreated()} 方法內，初始化 {@link android.content.Loader}，
@@ -157,13 +157,13 @@
<ul>
<li>可識別載入器的不重複 ID。在本範例中，此 ID 為 0。</li>
<li>可在建構時提供給載入器的選用引數 (在本範例中為<code>null</code>)。
-</li>
+</li>
<li>{@link android.app.LoaderManager.LoaderCallbacks} 實作，
{@link android.app.LoaderManager} 會呼叫此實作來回報載入器事件。在本範例中，本機類別會實作 {@link
android.app.LoaderManager.LoaderCallbacks} 執行個體，以將參照傳送給它自己 ({@code this})。
-</li>
+</li>
</ul>
<p>{@link android.app.LoaderManager#initLoader initLoader()} 呼叫可確保載入器已初始化且處於有效狀態。
可能會有兩種結果：</p>
@@ -343,7 +343,7 @@
<p>這個方法是在正要重設先前建立的載入器時呼叫，以便使其資料無法使用。
此回呼方法可讓您知道即將要發佈資料，而能先行將其參照移除。
</p>
-<p>此實作會以 <code>null</code> 的值呼叫
+<p>此實作會以 <code>null</code> 的值呼叫
{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}：
</p>
@@ -366,7 +366,7 @@
android.app.Fragment} 的完整實作，
其顯示的 {@link android.widget.ListView} 包含聯絡人內容供應程式的查詢結果。它使用 {@link
android.content.CursorLoader} 管理對供應程式的查詢。</p>
-
+
<p>如本範例所示，針對要存取使用者聯絡人的應用程式，它的宣示說明必須包含 {@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS} 權限。
</p>
diff --git a/docs/html-intl/intl/zh-tw/guide/components/processes-and-threads.jd b/docs/html-intl/intl/zh-tw/guide/components/processes-and-threads.jd
index 74dbb8e..56027ce 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/processes-and-threads.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/processes-and-threads.jd
@@ -49,7 +49,7 @@
<receiver>}</a> 和 <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code
<provider>}</a> — 的宣示說明項目都支援 {@code android:process} 屬性，這項屬性能指定元件應在哪個處理程序執行。
您可以設定此屬性讓每個元件都以自己的處理程序執行，或只讓當中的部分元件共用同一處理程序。
-您也可以設定
+您也可以設定
{@code android:process}，讓不同應用程式的元件以相同的處理程序執行，只要這些應用程式分享相同的 Linux 使用者 ID 並以相同的憑證簽署。
</p>
@@ -142,7 +142,7 @@
</li>
<li><b>背景處理程序</b>
- <p>這種處理程序會保留使用者目前看不見的 Activity (已呼叫 Activity 的
+ <p>這種處理程序會保留使用者目前看不見的 Activity (已呼叫 Activity 的
{@link android.app.Activity#onStop onStop()} 方法)。這些處理程序會間接影響使用者體驗，且系統能隨時將其終止，藉此回收記憶體以供前景、可見或服務處理程序使用。
@@ -319,7 +319,7 @@
protected Bitmap doInBackground(String... urls) {
return loadImageFromNetwork(urls[0]);
}
-
+
/** The system calls this to perform work in the UI thread and delivers
* the result from doInBackground() */
protected void onPostExecute(Bitmap result) {
diff --git a/docs/html-intl/intl/zh-tw/guide/components/recents.jd b/docs/html-intl/intl/zh-tw/guide/components/recents.jd
index d56c12c..5ac0e26 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/recents.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/recents.jd
@@ -181,7 +181,7 @@
</dl>
<p class="note"><strong>注意：</strong>如果值不是 {@code none} 與 {@code never}，則 Activity 必須使用 {@code launchMode="standard"} 定義。
-如果沒有指定此屬性，則會使用
+如果沒有指定此屬性，則會使用
{@code documentLaunchMode="none"}。</p>
<h2 id="removing">移除工作</h2>
diff --git a/docs/html-intl/intl/zh-tw/guide/components/tasks-and-back-stack.jd b/docs/html-intl/intl/zh-tw/guide/components/tasks-and-back-stack.jd
index e23301d..e3ce58f 100644
--- a/docs/html-intl/intl/zh-tw/guide/components/tasks-and-back-stack.jd
+++ b/docs/html-intl/intl/zh-tw/guide/components/tasks-and-back-stack.jd
@@ -440,13 +440,13 @@
<p>在兩種情況下會用到親和性：</p>
<ul>
- <li>當啟動 Activity 的意圖包含
+ <li>當啟動 Activity 的意圖包含
{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK} 旗標。
<p>根據預設，新的 Activity 會啟動至 Activity (名為 {@link android.app.Activity#startActivity startActivity()}) 的工作中。
系統會將它推入至與呼叫端相同的返回堆疊。
-不過，如果傳送至
+不過，如果傳送至
{@link android.app.Activity#startActivity startActivity()} 的意圖包含 {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK} 旗標，則系統會找尋不同的工作來放置新的 Activity。
這通常是新工作。
@@ -455,7 +455,7 @@
<p>如果此旗標導致 Activity 開始新的工作，而使用者按 [首頁] 按鈕離開它，必須要有方法可以讓使用者回來瀏覽這個工作。<em></em>
-有些實體 (例如，通知管理員) 總是從外部工作開始 Activity，從來不使用自己的工作，因此他們都會將 {@code FLAG_ACTIVITY_NEW_TASK} 放入傳送到
+有些實體 (例如，通知管理員) 總是從外部工作開始 Activity，從來不使用自己的工作，因此他們都會將 {@code FLAG_ACTIVITY_NEW_TASK} 放入傳送到
{@link android.app.Activity#startActivity startActivity()} 的意圖。
如果您的 Activity 可以由外部實體呼叫且可能使用此旗標，記得要提供使用者獨立的方法回到啟動的工作，例如，透過啟動組件圖示 (工作的根 Activity 有一個 {@link android.content.Intent#CATEGORY_LAUNCHER} 意圖篩選器；請參閱下方的<a href="#Starting">開始工作</a>)。
@@ -505,7 +505,7 @@
href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code></dt>
<dd>如果這項屬性在工作的根 Activity 中設為 {@code "true"}，則剛描述的預設行為不會發生。
即使過了很長的一段時間，工作仍然會在堆疊保留所有的 Activity。
-換句話說，它與
+換句話說，它與
<a href="{@docRoot}guide/topics/manifest/activity-element.html#always">
{@code alwaysRetainTaskState}</a> 相反。即便使用者只離開工作一小段時間，使用者還是會回到工作的起始狀態。
</dd>
@@ -526,8 +526,8 @@
<h3 id="Starting">開始工作</h3>
-<p>您可以給予 Activity 一個意圖篩選器，將
-{@code "android.intent.action.MAIN"} 設定為指定的動作，
+<p>您可以給予 Activity 一個意圖篩選器，將
+{@code "android.intent.action.MAIN"} 設定為指定的動作，
{@code "android.intent.category.LAUNCHER"} 設定為指定的類別，以便將該 Activity 設定為工作的進入點。
例如：</p>
@@ -547,7 +547,7 @@
</p>
<p>第二項功能很重要：使用者必須能夠在離開工作後，使用此 Activity 啟動組件回到此工作。
-由於這個原因，兩個將 Activity 標示為一律啟動工作的<a href="#LaunchModes">啟動模式</a> {@code "singleTask"} 和
+由於這個原因，兩個將 Activity 標示為一律啟動工作的<a href="#LaunchModes">啟動模式</a> {@code "singleTask"} 和
{@code "singleInstance"}，應只能在 Activity 有 {@link android.content.Intent#ACTION_MAIN} 和 {@link android.content.Intent#CATEGORY_LAUNCHER} 篩選器時才能使用。
diff --git a/docs/html-intl/intl/zh-tw/preview/j8-jack.jd b/docs/html-intl/intl/zh-tw/guide/platform/j8-jack.jd
similarity index 100%
rename from docs/html-intl/intl/zh-tw/preview/j8-jack.jd
rename to docs/html-intl/intl/zh-tw/guide/platform/j8-jack.jd
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/manifest/manifest-intro.jd b/docs/html-intl/intl/zh-tw/guide/topics/manifest/manifest-intro.jd
index 5e42e37..77a2b80 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/manifest/manifest-intro.jd
@@ -33,15 +33,15 @@
<li>描述應用程式的元件 — 組成應用程式的 Activity、服務、廣播接收器和內容供應程式。
-為實作每個元件的類別命名以及發佈類別的功能 (例如，類別可處理的 {@link android.content.Intent
+為實作每個元件的類別命名以及發佈類別的功能 (例如，類別可處理的 {@link android.content.Intent
Intent} 訊息)。
這些宣告可讓 Android 系統瞭解元件為何以及可在哪些情況下啟動。
</li>
-<li>決定代管應用程式元件的程序。</li>
+<li>決定代管應用程式元件的程序。</li>
<li>宣告應用程式必須擁有哪些權限，才能存取 API 受保護的部分以及與其他應用程式互動。
-</li>
+</li>
<li>宣示說明亦可宣告其他項目必須擁有哪些權限，才能與應用程式的元件互動。
</li>
@@ -66,7 +66,7 @@
如要查看任一元素的詳細資訊，只要按一下圖表中的元素名稱、圖表後方按字母順序列出的元素清單，或在他處提及的任何元素名稱。
-
+
</p>
<pre>
@@ -128,7 +128,7 @@
<p>
下方按字母順序列出可出現在宣示說明檔案中的所有元素。
只有這些才是符合資格的元素，您無法新增自己的元素或屬性。
-
+
</p>
<p style="margin-left: 2em">
@@ -158,7 +158,7 @@
</p>
-
+
<h2 id="filec">檔案轉換</h2>
@@ -185,7 +185,7 @@
<p>
系統通常不會將位於相同層級的元素排序。例如，
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>、
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> 和
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> 和
<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> 元素能以任何順序排列組合。
(
<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> 元素是這項規則的例外狀況：
@@ -218,7 +218,7 @@
-
+
<p>
如果您一如往常定義元件類別 ({@link android.app.Activity}、{@link android.app.Service}、
@@ -244,7 +244,7 @@
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code> 屬性指定)。
-下列的指派結果會和上述相同：
+下列的指派結果會和上述相同：
</p>
<pre><manifest package="com.example.project" . . . >
@@ -375,7 +375,7 @@
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> 元素預設值。
-如果
+如果
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> 元素設有一個標籤，但 Activity 與其意圖篩選器並未設定該標籤，系統會將應用程式標籤視為 Activity 和意圖篩選器的標籤。
@@ -399,7 +399,7 @@
<p>
單一 <i>權限</i> 是指一項限制，可限制某部分程式碼或裝置上資料的存取權。
系統會強制實施這項限制，以保護會遭到誤用而扭曲或損害使用者體驗的重要資料與程式碼。
-
+
</p>
<p>
@@ -427,12 +427,12 @@
如果授予權限，該應用程式就能夠使用受保護的功能。
如果不授予權限，存取相關功能的嘗試就會失敗，但使用者不會收到任何通知。
-
+
</p>
<p>
應用程式也能利用權限來保護自己的元件 (Activity、服務、廣播接收器和內容供應程式)。
-它能使用 Android 定義的任何權限 (列於
+它能使用 Android 定義的任何權限 (列於
{@link android.Manifest.permission android.Manifest.permission}) 或其他應用程式宣告的任何權限。
此外，應用程式也能自行定義權限。新的權限是以
@@ -458,13 +458,13 @@
<p>
請注意，在本範例中，不只以
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> 元素宣告 {@code DEBIT_ACCT} 權限，還使用
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> 元素宣告 {@code DEBIT_ACCT} 權限，還使用
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> 元素來要求使用此權限。
即使保護是由應用程式本身強制施行，還是必須要求使用該權限，應用程式的其他元件才能啟動受保護的 Activity。
-
+
</p>
<p>
@@ -474,7 +474,7 @@
不過，還是必須利用
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> 來要求使用。
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> 來要求使用。
</p>
<p>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/providers/calendar-provider.jd b/docs/html-intl/intl/zh-tw/guide/topics/providers/calendar-provider.jd
index 42434e4..682e82d 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/providers/calendar-provider.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">使用意圖檢視日曆資料</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">同步配接器</a></li>
</ol>
@@ -86,7 +86,7 @@
</p>
-<p>每個內容供應程式都會公開一個公用 URI (包裝為
+<p>每個內容供應程式都會公開一個公用 URI (包裝為
{@link android.net.Uri} 物件)，可唯一識別其資料集。
控制多個資料集 (多個表格) 的內容供應程式會為每個資料集公開個別的 URI。
供應程式所有 URI 的開頭字串為「content://」。
@@ -113,14 +113,14 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
+
<td>此表格內含日曆特定的資訊。
此表格中的每一列包含單一日曆的詳細資訊，例如名稱、色彩、同步資訊等等。
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>此表格內含活動特定的資訊。
此表格中的每一列包含單一活動的資訊 — 例如，活動標題、位置、開始時間、結束時間等等。
@@ -132,7 +132,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>此表格內含活動每次發生的開始和結束時間。
此表格的每一列代表單一活動發生。
單次活動執行個體和活動的對應為 1:1。
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>此表格內含活動參與者 (邀請對象) 的資訊。
每一列代表一個活動的單一邀請對象。
其中會指出邀請對象類型，以及邀請對象是否出席該活動的回應。
@@ -149,17 +149,17 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>此表格內含警示/通知資訊。
每一列代表一個活動的單一警示。一個活動可以設定多個提醒。
-每個活動的最大數量提醒指定於
+每個活動的最大數量提醒指定於
{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS}，此項是由擁有指定日曆的同步配接器所設定。
提醒是以分鐘數指定活動發生前的時間，而且有一個方法用於決定通知使用者的方式。
</td>
</tr>
-
+
</table>
<p>「日曆供應程式」API 的設計具備彈性且功能強大。提供良好的使用者體驗，以及保護日曆及其資料的完整性，兩者一樣重要。
@@ -178,7 +178,7 @@
<li><strong>同步配接器。</strong>同步配接器會將使用者裝置的日曆資料與另一台伺服器或資料來源進行同步。
-在
+在
{@link android.provider.CalendarContract.Calendars} 和
{@link android.provider.CalendarContract.Events} 表格中，會保留某些欄讓同步配接器使用。供應程式和應用程式不應加以修改。
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>指出是否選擇要顯示日曆的布林值。值 0 表示與此日曆關聯的活動不應顯示。
值 1 表示與此日曆關聯的活動應顯示。
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>指出日曆是否應同步，並且讓日曆的活動儲存在裝置上的布林值。
值 0 表示不同步此日曆，並且不要在裝置上儲存其活動。
值 1 表示同步此日曆的活動，並且在裝置上儲存其活動。
@@ -268,18 +268,18 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>為什麼一定要包含 ACCOUNT_TYPE？
</h3> <p>如果您要針對 {@link
android.provider.CalendarContract.Calendars#ACCOUNT_NAME
-Calendars.ACCOUNT_NAME} 進行查詢，也必須在選項中包含
+Calendars.ACCOUNT_NAME} 進行查詢，也必須在選項中包含
{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}。
這是因為只有同時提供指定帳戶的 <code>ACCOUNT_NAME</code> 和
<code>ACCOUNT_TYPE</code> 情況下，此帳戶才會視為唯一的。
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}。{@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} 帳戶不會進行同步。
-</p> </div> </div>
+</p> </div> </div>
<p> 在範例的下一個部分，您將建構查詢。選項會指定查詢的條件。
@@ -308,49 +308,49 @@
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>下一節會使用游標逐步檢視結果集。它會使用範例一開始設定好的常數，傳回每個欄位的值。
</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">修改日曆</h3>
<p>如要執行日曆的更新，您可以提供日曆的 {@link
-android.provider.BaseColumns#_ID}，可以是 URI 的附加 ID
+android.provider.BaseColumns#_ID}，可以是 URI 的附加 ID
({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}) 或以第一個選擇項目方式提供。
-選項的開頭應該是 <code>"_id=?"</code>，而且第一個
+選項的開頭應該是 <code>"_id=?"</code>，而且第一個
<code>selectionArg</code> 應該是日曆的 {@link
android.provider.BaseColumns#_ID}。
-您也可以透過將 ID 編碼在 URI 中，以執行更新。此範例會使用
+您也可以透過將 ID 編碼在 URI 中，以執行更新。此範例會使用
({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}) 方式變更日曆的顯示名稱：
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>活動的持續期間，以 <a href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a> 格式表示。例如，值 <code>"PT1H"</code> 表示活動持續一小時，而值 <code>"P2W"</code> 指出持續 2 週。
@@ -444,24 +444,24 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>值 1 表示此活動需要整天，如同當地時區所定義。
值 0 表示定期活動，會在一天中的任何時間開始和結束。
</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>活動的週期規則。例如，<code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>。
您可以在<a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">這裡</a>查看更多範例。
</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
<td>活動重複發生的日期。您通常會將 {@link android.provider.CalendarContract.EventsColumns#RDATE} 和 {@link android.provider.CalendarContract.EventsColumns#RRULE} 一起使用，以定義週期性活動的彙總集合。
@@ -470,13 +470,13 @@
如需更多討論，請參閱 <a href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">RFC5545 規格</a>。</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
+
<td>活動要視為忙碌或有空 (可以安排其他活動) 的時間。
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -494,7 +494,7 @@
<h3 id="add-event">新增活動</h3>
-<p>您的應用程式插入新活動時，我們建議您使用
+<p>您的應用程式插入新活動時，我們建議您使用
{@link android.content.Intent#ACTION_INSERT INSERT} 意圖 (如同<a href="#intent-insert">使用意圖插入活動</a>所述)。不過，如果需要，您也可以直接插入活動。
本節將描述如何執行此動作。
</p>
@@ -514,11 +514,11 @@
android.content.Intent#ACTION_INSERT INSERT} 意圖 (如同<a href="#intent-insert">使用意圖插入活動</a> — 所描述的案例) 插入活動，則不適用此規則，將會提供預設時區。
</li>
-
+
<li>對於非週期性活動，您必須包括 {@link
android.provider.CalendarContract.EventsColumns#DTEND}。 </li>
-
-
+
+
<li>對於週期性活動，您必須包括 {@link
android.provider.CalendarContract.EventsColumns#DURATION}，以及 {@link
android.provider.CalendarContract.EventsColumns#RRULE} 或 {@link
@@ -528,7 +528,7 @@
</li>
-
+
</ul>
<p>以下是插入活動的範例。為了簡化，會在 UI 執行緒中執行此示範。
@@ -539,8 +539,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -561,7 +561,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -581,11 +581,11 @@
android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}) 或以第一個選擇項目方式提供。
-選項的開頭應該是 <code>"_id=?"</code>，而且第一個
+選項的開頭應該是 <code>"_id=?"</code>，而且第一個
<code>selectionArg</code> 應該是活動的 <code>_ID</code>。
您也可以使用不含 ID 的選項進行更新。以下是更新活動的範例。
-它使用
+它使用
{@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()} 方式變更活動的標題：
</p>
@@ -598,7 +598,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -625,19 +625,19 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">參與者表格</h2>
<p>{@link android.provider.CalendarContract.Attendees} 表格的每一列都代表活動的單一參與者或邀請對象。
-呼叫
+呼叫
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} 會傳回指定 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} 活動的參與者清單。
此 {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} 必須符合特定活動的 {@link
android.provider.BaseColumns#_ID}。
-</p>
+</p>
<p>下表列出可寫入的欄位。
插入新的參與者時，您必須包括 <code>ATTENDEE_NAME</code> 以外的所有項目。
@@ -718,8 +718,8 @@
<h2 id="reminders">提醒表格</h2>
<p>{@link android.provider.CalendarContract.Reminders} 表格的每一列都代表活動的單一提醒。
-呼叫
-{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} 會傳回指定
+呼叫
+{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} 會傳回指定
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID} 活動的提醒清單。
</p>
@@ -727,7 +727,7 @@
<p>下表列出提醒可寫入的欄位。插入新的提醒時，必須包括所有項目。
請注意，同步配接器會在 {@link
android.provider.CalendarContract.Calendars} 表格中指出同步配接器支援的提醒類型。
-如需詳細資料，請參閱
+如需詳細資料，請參閱
{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}。
</p>
@@ -779,8 +779,8 @@
執行個體表格無法寫入，僅供查詢活動的發生。
</p>
-<p>下表列出您可以針對執行個體查詢的欄位。請注意，時區是由
-{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE} 和
+<p>下表列出您可以針對執行個體查詢的欄位。請注意，時區是由
+{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE} 和
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES} 所定義。
</p>
@@ -801,18 +801,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>執行個體的凱撒曆結束日，與「日曆」的時區相關。
-
-
+
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>執行個體的結束分鐘，從「日曆」時區的午夜開始計算。
</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -820,16 +820,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>執行個體的凱撒曆開始日，與「日曆」的時區相關。
+ <td>執行個體的凱撒曆開始日，與「日曆」的時區相關。
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>執行個體的開始分鐘，從午夜開始計算，與「日曆」的時區相關。
-
+
</td>
-
+
</tr>
</table>
@@ -853,7 +853,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -868,7 +868,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -883,28 +883,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -922,9 +922,9 @@
<td><br>
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
- 您也可以使用
+ 您也可以使用
{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI} 參照 URI。如需使用此意圖的範例，請參閱<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">使用意圖檢視日曆資料</a>。
-
+
</td>
<td>開啟日曆到 <code><ms_since_epoch></code> 指定的時間。</td>
@@ -935,11 +935,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- 您也可以使用
+
+ 您也可以使用
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 參照 URI。如需使用此意圖的範例，請參閱<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">使用意圖檢視日曆資料</a>。
-
+
</td>
<td>檢視 <code><event_id></code> 指定的活動。</td>
@@ -952,12 +952,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- 您也可以使用
+
+ 您也可以使用
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 參照 URI。如需使用此意圖的範例，請參閱<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">使用意圖編輯活動</a>。
-
-
+
+
</td>
<td>編輯 <code><event_id></code> 指定的活動。</td>
@@ -972,11 +972,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
- 您也可以使用
+
+ 您也可以使用
{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 參照 URI。如需使用此意圖的範例，請參閱<a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">使用意圖插入活動</a>。
-
+
</td>
<td>建立活動。</td>
@@ -996,7 +996,7 @@
<td>活動的名稱。</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>活動開始時間，以紀元元年 1 月 1 日零時起算經過的毫秒數為單位。</td>
@@ -1004,25 +1004,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>活動結束時間，以紀元元年 1 月 1 日零時起算經過的毫秒數為單位。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
- <td>指出活動為整天的布林值。值可以是
+
+ <td>指出活動為整天的布林值。值可以是
<code>true</code> 或 <code>false</code>。</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>活動的地點。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>活動描述。</td>
</tr>
<tr>
@@ -1039,16 +1039,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>活動為私人或公開性質。</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>活動要視為忙碌或有空 (可以安排其他活動) 的時間。</td>
-
-</table>
+
+</table>
<p>以下各節說明如何使用這些意圖。</p>
@@ -1059,14 +1059,14 @@
</p>
-
+
<p>使用者執行採用此方式的應用程式時，此應用程式會將使用者
傳送到「日曆」以完成新增活動的操作。{@link
android.content.Intent#ACTION_INSERT INSERT} 意圖會使用額外的欄位將「日曆」中活動的詳細資訊，預先填入表單。
然後，使用者可以取消活動、視需要編輯表單或將活動儲存到其日曆。
</p>
-
+
<p>以下的程式碼片段會在 2012 年 1 月 19 日安排活動，此活動的期間是從上午 7:30 到上午 8:30。
@@ -1075,7 +1075,7 @@
<ul>
<li>它指定 {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} 作為 URI。
</li>
-
+
<li>它使用 {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} 和 {@link
@@ -1083,10 +1083,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} 額外欄位，將活動的時間預先填入表單。
這些時間值必須以自紀元元年 1 月 1 日零時起算經過的 UTC 毫秒數為單位。
</li>
-
+
<li>它使用 {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL} 額外欄位提供逗號分隔的受邀者清單 (以電子郵件地址指定)。
</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1158,16 +1158,16 @@
<ul>
<li>同步配接器需要透過將 {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} 設定為 <code>true</code>，以指出這是同步配接器。</li>
-
-
+
+
<li>同步配接器需要在 URI 中提供 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} 和 {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} 作為查詢參數。 </li>
-
+
<li>同步配接器與應用程式或小工具相比，有更多欄的寫入權限。
例如，應用程式只能修改日曆的一些特性，例如名稱、顯示名稱、能見度設定，以及日曆是否同步。
-相較之下，同步配接器不只能存取這些欄，還可以存取很多其他欄，例如日曆色彩、時區、存取級別、位置等等。然而，同步配接器受限於所指定的 <code>ACCOUNT_NAME</code> 和
+相較之下，同步配接器不只能存取這些欄，還可以存取很多其他欄，例如日曆色彩、時區、存取級別、位置等等。然而，同步配接器受限於所指定的 <code>ACCOUNT_NAME</code> 和
<code>ACCOUNT_TYPE</code>。
</li> </ul>
@@ -1180,5 +1180,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>如需實作同步配接器的範例 (並非與「日曆」特別相關)，請參閱
+<p>如需實作同步配接器的範例 (並非與「日曆」特別相關)，請參閱
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>。
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/providers/contacts-provider.jd b/docs/html-intl/intl/zh-tw/guide/topics/providers/contacts-provider.jd
index b5f8880..2bcc3e6 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/providers/contacts-provider.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/providers/contacts-provider.jd
@@ -614,7 +614,7 @@
<p>
如要擷取內含使用者的設定檔的聯絡人列，請呼叫 {@link android.content.ContentResolver#query(Uri,String[], String, String[], String)
ContentResolver.query()}。
-將內容 URI 設為
+將內容 URI 設為
{@link android.provider.ContactsContract.Profile#CONTENT_URI}，並且不要提供任何選取條件。
您也可以使用此內容 URI 做為擷取原始聯絡人或設定檔資料的基礎 URI。
例如，以下程式碼片段會擷取設定檔資料：
@@ -932,7 +932,7 @@
您應該儘可能透過建立
{@link android.content.ContentProviderOperation} 物件的{@link java.util.ArrayList}，然後呼叫
{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()}，以「批次模式」在聯絡人供應程式中進行資料的插入、更新以及刪除。
-因為聯絡人供應程式會在單一交易中執行
+因為聯絡人供應程式會在單一交易中執行
{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()} 的所有操作，所以您所做的修改不會讓聯絡人存放庫處於不一致的狀態。
@@ -1004,7 +1004,7 @@
<code>previousResult</code>
</dt>
<dd>
-
+
{@link android.content.ContentResolver#applyBatch(String, ArrayList) applyBatch()} 中的
{@link android.content.ContentProviderResult} 物件以 0 開始的陣列索引值。套用批次操作時，每次操作結果都會儲存在結果的中繼陣列。
@@ -1758,7 +1758,7 @@
<dd>
{@link android.accounts.AccountManager} 會啟動此服以開始驗證程序。
服務的 {@link android.app.Service#onCreate()} 方法會具現化為驗證器物件。
-系統需驗證應用程式同步配接器的使用者帳戶時，會呼叫服務的
+系統需驗證應用程式同步配接器的使用者帳戶時，會呼叫服務的
{@link android.app.Service#onBind(Intent) onBind()} 方法以取得驗證器的
{@link android.os.IBinder}。
這樣可以讓系統以跨處理程序的方式呼叫驗證器的方法。
@@ -2115,7 +2115,7 @@
</ul>
<code><em>activityclass</em></code> 值是 Activity 的完整類別名稱，以此 Activity 接收意圖。
<code><em>invite_action_label</em></code> 值是顯示在裝置聯絡人應用程式內 [新增連線]<strong></strong> 選單中的文字字串。
-
+
</li>
</ol>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-basics.jd b/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-basics.jd
index 7831478..a00caed 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-basics.jd
@@ -237,7 +237,7 @@
{@link android.content.ContentResolver#query query()} 方法會呼叫使用者字典供應程式所定義的
{@link android.content.ContentProvider#query ContentProvider.query()} 方法。
-以下是
+以下是
{@link android.content.ContentResolver#query ContentResolver.query()} 呼叫的程式碼：
<p>
<pre>
@@ -250,7 +250,7 @@
mSortOrder); // The sort order for the returned rows
</pre>
<p>
- 表 2 列出
+ 表 2 列出
{@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} 的引數及相對應的 SQL SELECT 陳述式：
</p>
@@ -284,7 +284,7 @@
<tr>
<td align="center"><code>selectionArgs</code></td>
<td align="center">
- (沒有任何相對應的關鍵字/參數。選取引數會取代選取子句中的
+ (沒有任何相對應的關鍵字/參數。選取引數會取代選取子句中的
<code>?</code> 預留位置。)
</td>
</tr>
@@ -581,7 +581,7 @@
</p>
<p>
- 如果沒有任何資料欄符合選取條件，則供應程式會傳回 {@link android.database.Cursor#getCount Cursor.getCount()} 為 0 的
+ 如果沒有任何資料欄符合選取條件，則供應程式會傳回 {@link android.database.Cursor#getCount Cursor.getCount()} 為 0 的
{@link android.database.Cursor} 物件 (即沒有任何內容的游標)。
</p>
@@ -595,7 +595,7 @@
</p>
<p>
- 以下程式碼片段是上一個程式碼片段的延伸。它會建立內含查詢所擷取 {@link android.database.Cursor} 的
+ 以下程式碼片段是上一個程式碼片段的延伸。它會建立內含查詢所擷取 {@link android.database.Cursor} 的
{@link android.widget.SimpleCursorAdapter} 物件，並將該物件設定為 {@link android.widget.ListView} 的配接器：
@@ -674,7 +674,7 @@
<p>
{@link android.database.Cursor} 實作方法包含數個用於從物件擷取不同資料類型的「get」方法。
例如，上方程式碼片段使用了 {@link android.database.Cursor#getString getString()}。
-此外，這種實作方法還包括
+此外，這種實作方法還包括
{@link android.database.Cursor#getType getType()} 方法，可傳回指定資料欄資料類型的值。
</p>
@@ -709,7 +709,7 @@
</p>
<p>
- 以下的
+ 以下的
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
元素會要求使用者字典供應程式的讀取存取權：
</p>
@@ -733,7 +733,7 @@
</p>
<h3 id="Inserting">插入資料</h3>
<p>
- 如要在供應程式中插入資料，請呼叫
+ 如要在供應程式中插入資料，請呼叫
{@link android.content.ContentResolver#insert ContentResolver.insert()} 方法。
這個方法會在供應程式中插入新的資料列，並傳回該列的內容 URI。
以下程式碼片段示範如何在使用者字典供應程式中插入新的字詞：
@@ -785,14 +785,14 @@
</p>
<p>
- 如要從傳回的 {@link android.net.Uri} 取得 <code>_ID</code> 的值，請呼叫
+ 如要從傳回的 {@link android.net.Uri} 取得 <code>_ID</code> 的值，請呼叫
{@link android.content.ContentUris#parseId ContentUris.parseId()}。
</p>
<h3 id="Updating">更新資料</h3>
<p>
如要更新資料列，請使用內含經過更新的值 (與您在插入資料時所使用的值相同) 以及選取條件 (與您在建立查詢時所使用的選取條件相同) 的 {@link android.content.ContentValues} 物件。
- 您所使用的用戶端方法為
+ 您所使用的用戶端方法為
{@link android.content.ContentResolver#update ContentResolver.update()}。您只需針對要更新的資料欄，將相關值加到 {@link android.content.ContentValues} 物件即可。
如果您想清除資料欄的內容，請將值設定為 <code>null</code>。
@@ -901,7 +901,7 @@
例如，聯絡人供應程式中的 {@link android.provider.ContactsContract.Data} 表格會使用 MIME 類型為每個資料列中儲存的聯絡人資料加上標籤。
-如要取得與內容 URI 相對應的 MIME 類型，請呼叫
+如要取得與內容 URI 相對應的 MIME 類型，請呼叫
{@link android.content.ContentResolver#getType ContentResolver.getType()}。
</p>
<p>
@@ -1009,13 +1009,13 @@
</p>
<p>
- 供應程式會使用
+ 供應程式會使用
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
- 元素的
+ 元素的
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">android:grantUriPermission</a></code>
- 屬性以及
+ 屬性以及
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
- 元素的
+ 元素的
<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
子元素在本身的宣示說明中為內容 URI 定義 URI 權限。如要進一步瞭解 URI 權限的運作機制，請參閱<a href="{@docRoot}guide/topics/security/security.html">安全性和權限</a>指南的「URI 權限」。
@@ -1032,8 +1032,8 @@
<ol>
<li>
您的應用程式使用 {@link android.app.Activity#startActivityForResult
-startActivityForResult()} 方法，傳送了內含
-{@link android.content.Intent#ACTION_PICK} 動作的意圖以及「聯絡人」MIME 類型
+startActivityForResult()} 方法，傳送了內含
+{@link android.content.Intent#ACTION_PICK} 動作的意圖以及「聯絡人」MIME 類型
{@link android.provider.ContactsContract.RawContacts#CONTENT_ITEM_TYPE}。
</li>
@@ -1043,9 +1043,9 @@
</li>
<li>
在選取 Activity 中，使用者選取了要更新的聯絡人。
-一旦使用者進行這項動作，選取 Activity 便會呼叫
+一旦使用者進行這項動作，選取 Activity 便會呼叫
{@link android.app.Activity#setResult setResult(resultcode, intent)} 來設定要傳回您應用程式的意圖。
-該意圖包含使用者所選聯絡人的內容 URI，以及「額外」的旗標
+該意圖包含使用者所選聯絡人的內容 URI，以及「額外」的旗標
{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}。
這些旗標可將 URI 權限授予您的應用程式，以便其讀取內容 URI 指向的聯絡人資料。選取 Activity 隨後會呼叫 {@link android.app.Activity#finish()} 來傳回您應用程式的控制權。
@@ -1053,7 +1053,7 @@
</li>
<li>
- 您的 Activity 返回前景，而系統呼叫您 Activity 的
+ 您的 Activity 返回前景，而系統呼叫您 Activity 的
{@link android.app.Activity#onActivityResult onActivityResult()} 方法。
這個方法可接收聯絡人應用程式中的選取 Activity 所建立的結果意圖。
@@ -1071,7 +1071,7 @@
</p>
<p>
- 例如，日曆應用程式接受可讓您啟用應用程式插入 UI 的
+ 例如，日曆應用程式接受可讓您啟用應用程式插入 UI 的
{@link android.content.Intent#ACTION_INSERT} 意圖。您可以在該意圖中傳入「額外」的資料，供應用程式用於預先填入使用者介面。由於週期性活動的語法較為複雜，因此建議您利用 {@link android.content.Intent#ACTION_INSERT} 啟用日曆應用程式，然後讓使用者透過該應用程式將活動插入日曆供應程式。
@@ -1089,7 +1089,7 @@
</p>
<p>
例如，使用者字典供應程式有一個內含內容 URI 和欄名稱常數的 {@link android.provider.UserDictionary} 合約類別。
-「字詞」表格的內容 URI 是在
+「字詞」表格的內容 URI 是在
{@link android.provider.UserDictionary.Words#CONTENT_URI UserDictionary.Words.CONTENT_URI} 常數中定義。
此外，{@link android.provider.UserDictionary.Words} 類別也包含欄名稱常數，可用於本指南中的程式碼片段範例。
@@ -1106,7 +1106,7 @@
</pre>
<p>
聯絡人供應程式的另一個合約類別為 {@link android.provider.ContactsContract}。
- 此類別的參考文件附有程式碼片段範例。其中一個
+ 此類別的參考文件附有程式碼片段範例。其中一個
{@link android.provider.ContactsContract.Intents.Insert} 子類別為內含意圖常數和意圖資料的合約類別。
</p>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-creating.jd b/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-creating.jd
index 3d46ee4..9f1ca31 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/providers/content-provider-creating.jd
@@ -239,7 +239,7 @@
表格資料一律需包含「主索引鍵」欄，方便供應程式保存每個資料列的數值。
您可以使用這些值將資料列連結至其他表格中的相關資料列 (也就是將這些值當作「外部索引鍵」使用)。
事實上，您也可以使用此資料欄的任何名稱進行連結，但使用 {@link android.provider.BaseColumns#_ID BaseColumns._ID} 是最佳做法，這是因為將供應程式的查詢結果連結至
-{@link android.widget.ListView} 時需要將某個擷取出的資料列命名為
+{@link android.widget.ListView} 時需要將某個擷取出的資料列命名為
<code>_ID</code>。
@@ -288,14 +288,14 @@
此外，也請針對 Android 套件名稱採取此建議做法；您可以將供應程式授權定義為內含供應程式的套件名稱的副檔名。
例如，假設您 Android 套件的名稱為
- <code>com.example.<appname></code>，則請將供應程式的授權定義為
+ <code>com.example.<appname></code>，則請將供應程式的授權定義為
<code>com.example.<appname>.provider</code>。
</p>
<h3>設計路徑結構</h3>
<p>
開發人員通常只要附加指向個別表格的路徑，即可從授權建立內容 URI。
-例如，假設您有「table1」<em></em>和「table2」<em></em>這兩個表格，則您可以結合上述範例中的授權來產生內容 URI
-<code>com.example.<appname>.provider/table1</code> 和
+例如，假設您有「table1」<em></em>和「table2」<em></em>這兩個表格，則您可以結合上述範例中的授權來產生內容 URI
+<code>com.example.<appname>.provider/table1</code> 和
<code>com.example.<appname>.provider/table2</code>。
路徑並不侷限於單一區隔，而您也不必為每個路徑層級產生表格。
@@ -350,11 +350,11 @@
<code>content://com.example.app.provider/table1</code>：名稱為 <code>table1</code> 的表格。
</li>
<li>
- <code>content://com.example.app.provider/table2/dataset1</code>：名稱為
+ <code>content://com.example.app.provider/table2/dataset1</code>：名稱為
<code>dataset1</code> 的表格。
</li>
<li>
- <code>content://com.example.app.provider/table2/dataset2</code>：名稱為
+ <code>content://com.example.app.provider/table2/dataset2</code>：名稱為
<code>dataset2</code> 的表格。
</li>
<li>
@@ -380,7 +380,7 @@
<code>content://com.example.app.provider/table2/*</code>：
</dt>
<dd>
- 與 <code>dataset1</code> 和 <code>dataset2</code> 表格的內容 URI 相符，但與 <code>table1</code> 或
+ 與 <code>dataset1</code> 和 <code>dataset2</code> 表格的內容 URI 相符，但與 <code>table1</code> 或
<code>table3</code> 的內容 URI 不符。
</dd>
@@ -393,8 +393,8 @@
</dl>
<p>
以下程式碼片段說明各種方法在 {@link android.content.UriMatcher} 中的運作方式。
- 這個程式碼會以不同方式處理整個表格的 URI 以及單一資料列的 URI；針對表格使用內容 URI 模式
-<code>content://<authority>/<path></code>，針對單一資料列則使用
+ 這個程式碼會以不同方式處理整個表格的 URI 以及單一資料列的 URI；針對表格使用內容 URI 模式
+<code>content://<authority>/<path></code>，針對單一資料列則使用
<code>content://<authority>/<path>/<id></code>。
</p>
@@ -469,8 +469,8 @@
</pre>
<p>
另一個 {@link android.content.ContentUris} 類別可提供使用內容 URI 的 <code>id</code> 部分的簡便方法。
-{@link android.net.Uri} 和
-{@link android.net.Uri.Builder} 類別則可提供剖析現有
+{@link android.net.Uri} 和
+{@link android.net.Uri.Builder} 類別則可提供剖析現有
{@link android.net.Uri} 物件及建置新物件的簡便方法。
</p>
@@ -485,7 +485,7 @@
<h3 id="RequiredAccess">必要方法</h3>
<p>
抽象類別 {@link android.content.ContentProvider} 會定義 6 種方法，而您必須將這些方法實作成您所擁有子類別的一部分。
-嘗試存取您內容供應程式的用戶端應用程式會呼叫以下所有方法
+嘗試存取您內容供應程式的用戶端應用程式會呼叫以下所有方法
({@link android.content.ContentProvider#onCreate() onCreate()} 除外)：
</p>
@@ -539,7 +539,7 @@
</dd>
</dl>
<p>
- 請注意，上述方法採用的簽名與同名的
+ 請注意，上述方法採用的簽名與同名的
{@link android.content.ContentResolver} 方法相同。
</p>
<p>
@@ -641,7 +641,7 @@
</p>
<p>
- 例如，如果您採用 SQLite 資料庫，您可以透過
+ 例如，如果您採用 SQLite 資料庫，您可以透過
{@link android.content.ContentProvider#onCreate() ContentProvider.onCreate()} 建立新的 {@link android.database.sqlite.SQLiteOpenHelper} 物件，然後在初次開啟資料庫時建立 SQL 表格。
為了加快這個程序，當您初次呼叫 {@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase
@@ -651,10 +651,10 @@
</p>
<p>
- 以下兩個程式碼片段展示了
+ 以下兩個程式碼片段展示了
{@link android.content.ContentProvider#onCreate() ContentProvider.onCreate()} 與 {@link android.database.sqlite.SQLiteOpenHelper#onCreate(SQLiteDatabase)
SQLiteOpenHelper.onCreate()} 之間的互動過程。
-而第一個程式碼片段是用於實作
+而第一個程式碼片段是用於實作
{@link android.content.ContentProvider#onCreate() ContentProvider.onCreate()}：
</p>
<pre class="prettyprint">
@@ -808,7 +808,7 @@
<code><name></code> 必須是全域唯一值，而 <code><type></code> 必須為相對應 URI 模式的專屬值。
建議您使用貴公司的名稱或您應用程式的部分 Android 套件名稱做為 <code><name></code>。
-針對
+針對
<code><type></code>，則建議您使用可識別與 URI 相關的表格的字串。
</p>
@@ -816,8 +816,8 @@
</li>
</ul>
<p>
- 例如，假設供應程式的授權為
-<code>com.example.app.provider</code>，而該授權可提供
+ 例如，假設供應程式的授權為
+<code>com.example.app.provider</code>，而該授權可提供
<code>table1</code> 這個表格，則 <code>table1</code> 中多個資料列的 MIME 類型會如下所示：
</p>
<pre>
@@ -940,7 +940,7 @@
為了將權限設為僅適用於您的供應程式，請針對
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#nm">
android:name</a></code> 屬性使用 Java 式範圍。
-例如，請將讀取權限命名為
+例如，請將讀取權限命名為
<code>com.example.app.provider.permission.READ_PROVIDER</code>。
</p>
@@ -955,7 +955,7 @@
</dt>
<dd>
這項權限是由 <code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
- <provider></a></code> 元素的
+ <provider></a></code> 元素的
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">
android:permission</a></code> 屬性所指定，可控制整個供應程式的讀取及寫入存取權。
@@ -967,10 +967,10 @@
整個供應程式的讀取權限及寫入權限。您可以使用 <code><a href="{@docRoot}guide/topics/manifest/provider-element.html">
<provider></a></code> 元素的
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#rprmsn">
- android:readPermission</a></code> 和
+ android:readPermission</a></code> 和
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#wprmsn">
android:writePermission</a></code> 屬性指定這兩項權限。
-這些權限的優先等級比
+這些權限的優先等級比
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">
android:permission</a></code> 所需的權限來得高。
</dd>
@@ -1037,9 +1037,9 @@
</p>
<p>
- 如要將臨時存取權委派給某款應用程式，您就必須在意圖中加入
-{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION} 或
-{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION} 旗標，或是同時加入以上兩者。請使用
+ 如要將臨時存取權委派給某款應用程式，您就必須在意圖中加入
+{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION} 或
+{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION} 旗標，或是同時加入以上兩者。請使用
{@link android.content.Intent#setFlags(int) setFlags()} 方法設定這些旗標。
</p>
<p>
@@ -1187,7 +1187,7 @@
<h2 id="Intents">意圖和資料存取權</h2>
<p>
應用程式可透過 {@link android.content.Intent} 以間接方式存取內容供應程式。
- 利用這種存取方式的應用程式不會呼叫 {@link android.content.ContentResolver} 或
+ 利用這種存取方式的應用程式不會呼叫 {@link android.content.ContentResolver} 或
{@link android.content.ContentProvider} 的任何方法，而是會傳送可啟動 Activity (此 Activity 通常屬於供應程式本身的應用程式) 的意圖。
目標 Activity 會負責擷取資料並在本身的 UI 中顯示該資料。視意圖中的動作而定，目標 Activity 也可能會提示使用者修改供應程式的資料。
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/providers/document-provider.jd b/docs/html-intl/intl/zh-tw/guide/topics/providers/document-provider.jd
index 1dc7c46..a6af758 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/providers/document-provider.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/providers/document-provider.jd
@@ -213,7 +213,7 @@
</p>
-<p>針對搭載 Android 4.4 以上版本的裝置，您的應用程式還可以呼叫
+<p>針對搭載 Android 4.4 以上版本的裝置，您的應用程式還可以呼叫
{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 意圖，以顯示系統所控管的挑選器 UI，方便使用者瀏覽其他應用程式提供的所有檔案。
透過這個單一 UI，使用者可以從任何受支援的應用程式挑選檔案。
@@ -560,7 +560,7 @@
<li>供應程式的名稱 (也就是供應程式的類別名稱)，包括套件名稱。範例：<code>com.example.android.storageprovider.MyCloudProvider</code>。
</li>
-<li>授權的名稱 (也就是套件的名稱；在此範例中為
+<li>授權的名稱 (也就是套件的名稱；在此範例中為
<code>com.example.android.storageprovider</code>) 以及內容供應程式的類型
(<code>documents</code>)。範例：{@code com.example.android.storageprovider.documents}。</li>
@@ -588,7 +588,7 @@
<pre><bool name="atLeastKitKat">true</bool></pre></li>
</ul></li>
-<li>內含
+<li>內含
{@code android.content.action.DOCUMENTS_PROVIDER} 動作的意圖篩選器，讓您的供應程式能夠在系統搜尋供應程式時顯示在挑選器中。
</li>
@@ -618,7 +618,7 @@
<h4 id="43">支援搭載 Android 4.3 以下版本的裝置</h4>
-<p>只有搭載 Android 4.4 以上版本的裝置可使用
+<p>只有搭載 Android 4.4 以上版本的裝置可使用
{@link android.content.Intent#ACTION_OPEN_DOCUMENT} 意圖。如果您想讓應用程式支援 {@link android.content.Intent#ACTION_GET_CONTENT} 以便與搭載 Android 4.3 以下版本的裝置相容，請針對搭載 Android 4.4 以上版本的裝置停用宣示說明中的 {@link android.content.Intent#ACTION_GET_CONTENT} 意圖篩選器。
@@ -833,7 +833,7 @@
<h4 id="openDocument">實作 openDocument</h4>
<p>您必須實作 {@link android.provider.DocumentsProvider#openDocument
-openDocument()} 來傳回代表特定檔案的
+openDocument()} 來傳回代表特定檔案的
{@link android.os.ParcelFileDescriptor}。其他應用程式可利用傳回的 {@link android.os.ParcelFileDescriptor} 傳輸資料。
使用者選取檔案而且用戶端應用程式呼叫
{@link android.content.ContentResolver#openFileDescriptor openFileDescriptor()} 要求存取該檔案後，系統就會呼叫這個方法。範例：
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/resources/accessing-resources.jd b/docs/html-intl/intl/zh-tw/guide/topics/resources/accessing-resources.jd
index 3a5a961..d1ac69c 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/resources/accessing-resources.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/resources/accessing-resources.jd
@@ -101,12 +101,12 @@
<div class="sidebox">
<h2>存取原始檔案</h2>
-<p>雖然不常見，但您有時需要存取原始檔案和目錄。如果有此需求，則不能將檔案儲存在 {@code res/}，因為要從
-{@code res/} 讀取資源的唯一方式是透過資源 ID。不過，您可以將資源儲存在
+<p>雖然不常見，但您有時需要存取原始檔案和目錄。如果有此需求，則不能將檔案儲存在 {@code res/}，因為要從
+{@code res/} 讀取資源的唯一方式是透過資源 ID。不過，您可以將資源儲存在
{@code assets/} 目錄。
</p>
<p>儲存在 {@code assets/} 目錄中的檔案「不會」<em></em>指定資源 ID，因此您無法透過 {@code R} 類別或從 XML 資源參照這些檔案。
-您可以改為查詢 {@code assets/} 目錄中的檔案，就像一般檔案系統一樣，並使用
+您可以改為查詢 {@code assets/} 目錄中的檔案，就像一般檔案系統一樣，並使用
{@link android.content.res.AssetManager} 讀取原始資料。
</p>
<p>不過，如果您只是要讀取原始資料 (例如影片或音訊檔案)，可以將檔案儲存在 {@code res/raw/} 目錄，然後使用 {@link
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/resources/providing-resources.jd b/docs/html-intl/intl/zh-tw/guide/topics/resources/providing-resources.jd
index 0938dc0..01e0d9c 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/resources/providing-resources.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/resources/providing-resources.jd
@@ -510,7 +510,7 @@
</p>
<p>已新增至 API 級別 4。<em></em></p>
-
+
<p>請參閱<a href="{@docRoot}guide/practices/screens_support.html">支援多個螢幕</a>以取得詳細資訊。
</p>
<p>另請查看 {@link android.content.res.Configuration#screenLayout} 設定欄位，該欄位會指出螢幕為小螢幕、一般螢幕或大螢幕。
@@ -824,7 +824,7 @@
名稱中的任何大寫只是為了方便閱讀。</li>
<li>每個限定詞類型只支援一個值。例如，如果您想在西班牙文和法文使用相同的可繪項目檔案，則不能將目錄命名為 <em></em>
<code>drawable-rES-rFR/</code>。
-您必須有兩個資源目錄，例如
+您必須有兩個資源目錄，例如
<code>drawable-rES/</code> 和 <code>drawable-rFR/</code>，這兩個目錄要包含適當的檔案。
但是，您不需要實際將相同的檔案複製到這兩位置。您可以為資源建立別名。
請參閱下方的
@@ -877,7 +877,7 @@
android:src="@drawable/icon_ca" />
</pre>
-<p>如果您將此檔案儲存成 {@code icon.xml} (在替代資源目錄中，像是
+<p>如果您將此檔案儲存成 {@code icon.xml} (在替代資源目錄中，像是
{@code res/drawable-en-rCA/})，系統會將它編譯成可當作 {@code R.drawable.icon} 參照的資源，但它實際上是 {@code
R.drawable.icon_ca} 資源 (儲存在 {@code res/drawable/}) 的別名。
</p>
@@ -1025,7 +1025,7 @@
drawable-port-notouch-12key/
</pre>
<p class="note"><strong>例外狀況：</strong>螢幕像素密度是唯一沒有因為衝突而被排除的限定詞。
-即使裝置的螢幕密度是 hdpi 但仍然沒有排除
+即使裝置的螢幕密度是 hdpi 但仍然沒有排除
<code>drawable-port-ldpi/</code>，因為此刻每個螢幕密度都視為相符。
如需詳細資訊，請參閱<a href="{@docRoot}guide/practices/screens_support.html">支援多個螢幕</a>文件。
</p></li>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/resources/runtime-changes.jd b/docs/html-intl/intl/zh-tw/guide/topics/resources/runtime-changes.jd
index 7a8b3ae..8178444 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/resources/runtime-changes.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/resources/runtime-changes.jd
@@ -22,7 +22,7 @@
</div>
<p>有些裝置設定可以在執行階段期間進行變更 (例如，螢幕方向、鍵盤可用性和語言)。
-進行這類變更時，Android 會重新啟動執行中的
+進行這類變更時，Android 會重新啟動執行中的
{@link android.app.Activity} (呼叫 {@link android.app.Activity#onDestroy()}，後面加上 {@link
android.app.Activity#onCreate(Bundle) onCreate()})。
重新啟動行為的設計是以符合新裝置設定的替代資源自動重新載入您的應用程式，以協助您的應用程式適應新的設定。
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/controls.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/controls.jd
index 0f27ae4..1ab66c3 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/controls.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/controls.jd
@@ -69,7 +69,7 @@
<tr>
<td><a href="controls/radiobutton.html">圓形按鈕</a></td>
<td>功用與核取方塊類似，但會限制使用者只能從一組選項中選取一個選項。</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/declaring-layout.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/declaring-layout.jd
index 7275571..580ee23 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/declaring-layout.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/declaring-layout.jd
@@ -272,7 +272,7 @@
可定義檢視在螢幕中的實際大小 (描繪期間以及版面配置之後)。
這些值可能 (但未必) 會與寬度和高度測量值不同。
-您可以呼叫
+您可以呼叫
{@link android.view.View#getWidth()} 和 {@link android.view.View#getHeight()} 來取得尺寸描繪值。
</p>
@@ -421,7 +421,7 @@
<li>含有陣列中所有字串的 {@link android.widget.TextView} 的版面配置</li>
<li>字串陣列</li>
</ul>
-<p>接著，針對您的 {@link android.widget.ListView} 呼叫
+<p>接著，針對您的 {@link android.widget.ListView} 呼叫
{@link android.widget.ListView#setAdapter setAdapter()}：</p>
<pre>
ListView listView = (ListView) findViewById(R.id.listview);
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/dialogs.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/dialogs.jd
index b0ae12e..6e6db35 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/dialogs.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>另請參閱</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">對話方塊設計指南</a></li>
@@ -248,7 +248,7 @@
<dt>中立</dt>
<dd>如果使用者不想繼續進行特定動作，但並非要取消動作，請使用這種按鈕。
這種按鈕會顯示在正面和負面按鈕之間。
-範例：[稍後提醒我] 按鈕。</dd>
+範例：[稍後提醒我] 按鈕。</dd>
</dl>
<p>您可以將以上其中一種按鈕加入 {@link
@@ -320,7 +320,7 @@
<p>如要加入多重選項 (核取方塊) 或單一選項 (圓形按鈕)，請使用
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} 或
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} 方法。
</p>
@@ -346,7 +346,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -372,7 +372,7 @@
</pre>
<p>雖然傳統清單和包含圓形按鈕的清單都可提供「單選」動作，但如果您想保留使用者的選擇，請使用 {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()}。也就是說，如果您想讓對話方塊再次開啟時顯示使用者目前所選的選項，請建立包含圓形按鈕的清單。
@@ -470,7 +470,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -479,7 +479,7 @@
<p><strong>提示：</strong>如果您想自訂對話方塊，請改為將 {@link android.app.Activity} 顯示為對話方塊，而不是使用 {@link android.app.Dialog} API。
方法很簡單，只要建立 Activity 然後在 <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code
-<activity>}</a> 宣示說明元素中將其主題設為
+<activity>}</a> 宣示說明元素中將其主題設為
{@link android.R.style#Theme_Holo_Dialog Theme.Holo.Dialog} 即可：
</p>
@@ -505,7 +505,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -513,10 +513,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -543,7 +543,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -656,7 +656,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -678,7 +678,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/menus.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/menus.jd
index be1fa7f..6f7405b 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/menus.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/menus.jd
@@ -83,9 +83,9 @@
</p>
<p>請參閱<a href="#options-menu">建立選項選單</a>。</p>
</dd>
-
+
<dt><strong>內容選單和內容關聯動作模式</strong></dt>
-
+
<dd>內容選單是會在使用者長按某元素時顯示的<a href="#FloatingContextMenu">浮動選單</a>。
它提供的動作會影響所選取內容或內容畫面。
@@ -94,7 +94,7 @@
</p>
<p>請參閱<a href="#context-menu">建立內容關聯選單</a>。</p>
</dd>
-
+
<dt><strong>彈出式選單</strong></dt>
<dd>彈出式選單顯示的項目清單會以垂直清單的方式，錨定在呼叫該選單的檢視。
它很適合用來提供與特定內容有關的動作溢出，或針對第二部分的命令提供選項。
@@ -135,7 +135,7 @@
<dt><code><item></code></dt>
<dd>建立代表選單中單一項目的 {@link android.view.MenuItem}。此元素可以包含巢狀
<code><menu></code> 元素以建立子選單。</dd>
-
+
<dt><code><group></code></dt>
<dd>可供 {@code <item>} 元素選用的不可見容器。它可讓您將選單項目分類，以便分享屬性，例如有效狀態與可見度。
如需詳細資訊，請參閱<a href="#groups">建立選單群組</a>。
@@ -742,8 +742,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -900,7 +900,7 @@
<p>已選取可勾選項目時，系統會呼叫所選取個別項目的回呼方法 (例如 {@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()})。
您必須在這裡設定核取方塊的狀態，原因是核取方塊或選項按鈕並不會自動變更其狀態。
-您可以利用
+您可以利用
{@link android.view.MenuItem#isChecked()} 來查詢項目的目前狀態 (使用者選取它之前的狀態)，然後利用
{@link android.view.MenuItem#setChecked(boolean) setChecked()} 來設定勾選狀態。例如：</p>
@@ -1010,7 +1010,7 @@
<p>您也能向其他應用程式提供 Activity 的服務，這樣即可在其他應用程式的選單中包含您的應用程式 (與上述的角色顛倒)。
</p>
-<p>如要包含在其他應用程式選單中，您必須照常定義意圖篩選器，但務必為意圖篩選器類別納入
+<p>如要包含在其他應用程式選單中，您必須照常定義意圖篩選器，但務必為意圖篩選器類別納入
{@link android.content.Intent#CATEGORY_ALTERNATIVE} 和/或 {@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE} 值。
例如：</p>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/multi-window.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..86d22fb
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/multi-window.jd
@@ -0,0 +1,582 @@
+page.title=多視窗支援
+page.metaDescription=Android N 新推出支援一次顯示多個應用程式。
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>此文件內容</h2>
+ <ol>
+ <li><a href="#overview">總覽</a></li>
+ <li><a href="#lifecycle">多視窗生命週期</a></li>
+ <li><a href="#configuring">針對多視窗模式設定應用程式
+</a></li>
+ <li><a href="#running">在多視窗模式中執行應用程式</a></li>
+ <li><a href="#testing">測試應用程式的多視窗支援</a></li>
+ </ol>
+ <h2>另請參閱</h2>
+ <ol>
+ <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">多視窗 Playground 範例應用程式
+</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android N 新增一次顯示多個應用程式的支援。
+在手持式裝置上，兩個應用程式可以在「分割畫面」模式中並排或上下排列。
+<em></em>在電視裝置上，應用程式能使用「子母畫面」模式，在使用者與另一個應用程式互動時持續播放影片。
+<em></em>
+
+</p>
+
+<p>
+ 如使用 N Preview SDK 建置應用程式，您可以設定應用程式處理多視窗顯示的方式。
+例如，您可以指定活動的最小可允許尺寸。
+您也可以停用應用程式的多視窗顯示，確保系統只會以全螢幕模式顯示您的應用程式。
+
+
+</p>
+
+<h2 id="overview">總覽</h2>
+
+<p>
+ Android N 允許多個應用程式同時分享螢幕。例如，使用者可以分割畫面，在左邊檢視網頁，同時在右邊撰寫電子郵件。
+
+使用者體驗依裝置而異：
+
+</p>
+
+<ul>
+ <li>執行 Android N 的手持式裝置可提供分割畫面模式。
+處於此模式時，系統會以並排或上下排列的方式顯示兩個應用程式，將螢幕填滿。
+使用者可以拖曳將畫面一分為二的分隔線，加大一邊的應用程式，就會縮小另一邊。
+
+ </li>
+
+ <li>在執行 Android N 的 Nexus Player 上，當使用者瀏覽其他應用程式或與其互動時，應用程式會將本身放入<a href="picture-in-picture.html">子母畫面模式</a>以持續顯示內容。
+
+
+
+ </li>
+
+ <li>較大型裝置的製造商可選擇啟用自由形式模式，讓使用者自由調整每個活動的大小。
+若製造商啟用此功能，裝置除了分割畫面模式外，還會提供自由形式模式。
+
+
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<p class="img-caption">
+ <strong>圖 1.</strong> 在分割畫面模式中並排執行的兩個應用程式。
+</p>
+
+<p>
+ 使用者可以透過下列方式來切換多視窗模式：
+</p>
+
+<ul>
+ <li>如果使用者開啟<a href="{@docRoot}guide/components/recents.html">總覽畫面</a>並長按活動標題，就可以將該標題拖曳到畫面醒目提示的部分，將活動放入多視窗模式。
+
+
+
+ </li>
+
+ <li>如果使用者長按「總覽」按鈕，裝置會將目前的活動放入多視窗模式，並開啟總覽畫面，讓使用者選擇要分享螢幕的另一個活動。
+
+
+ </li>
+</ul>
+
+<p>
+ 使用者可以在活動分享螢幕時，將一個活動中的資料<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>到另一個活動。
+
+(之前，使用者只能在單一活動內拖放資料)。
+
+</p>
+
+<h2 id="lifecycle">多視窗生命週期</h2>
+
+<p>
+ 多視窗模式不會變更<a href="{@docRoot}training/basics/activity-lifecycle/index.html">活動生命週期</a>。
+
+</p>
+
+<p>
+ 在多視窗模式中，特定時間只有最近與使用者互動的活動才會處於使用中。
+這會視為「最上層」活動。<em></em>
+ 即使能看到所有其他活動，但也處於暫停狀態。
+ 然而，相較於看不到的活動，系統會給予這類暫停但可看見的活動較高的優先順序。
+若使用者改與其中一個暫停的活動互動，該活動就會恢復，使先前的最上層活動變成暫停。
+
+
+</p>
+
+<p class="note">
+ <strong>注意：</strong>在多視窗模式中，使用者仍能見到處於暫停狀態的應用程式。
+即使處於暫停，應用程式仍需要進行其活動。
+例如，處於暫停模式但仍可以看見的影片播放應用程式，應會持續顯示其影片。
+因此，建議您在播放影片的活動 {@link android.app.Activity#onPause onPause()} 處理常式中，「不要」暫停影片。
+<em></em>
+
+ 應該改為在 {@link android.app.Activity#onStop
+ onStop()}, and resume playback in {@link android.app.Activity#onStart
+ onStart()} 中暫停影片。
+</p>
+
+<p>
+ 當使用者將應用程式放入多視窗模式時，系統會通知活動發生設定變更，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>所指定。
+
+基本上，此變更的活動生命週期和系統通知應用程式，裝置從垂直模式切換為水平模式時的生命週期相當，差別在於裝置尺寸會改變，而不只是切換。
+
+
+如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>中所述，您的活動能自行處理設定變更，或會允許系統終結活動並以新的尺寸重新建立。
+
+
+
+</p>
+
+<p>
+ 如果使用者調整視窗大小並加大長或寬的尺寸，系統會根據使用者動作來調整活動大小，並視需要發出<a href="{@docRoot}guide/topics/resources/runtime-changes.html">執行階段變更</a>。
+
+若應用程式在新公開的區域中繪製發生延遲，系統會暫時使用 {@link
+ android.R.attr#windowBackground windowBackground} 所指定的色彩或預設的
+ <code>windowBackgroundFallback</code> 樣式屬性，填滿那些區域。
+
+</p>
+
+<h2 id="configuring">針對多視窗模式設定應用程式</h2>
+
+<p>
+ 您的應用程式若以 Android N 為目標，您可以設定應用程式的活動是否支援多視窗顯示以及支援的方式。
+您可以在宣示說明中設定屬性，同時控制大小與版面配置。
+
+ 根活動的屬性設定會套用到它工作堆疊內的所有活動。
+
+</p>
+
+<p class="note">
+ <strong>注意：</strong>如果您使用 Android N 以下的 SDK 版本建置多螢幕方向應用程式，而且使用者會在多視窗模式中使用該應用程式，系統會強制調整應用程式大小。
+
+系統會顯示對話方塊向使用者警告應用程式行為異常。
+系統「不會」調整螢幕方向固定的應用程式大小，如使用者嘗試在多視窗模式下開啟螢幕方向固定的應用程式，應用程式會佔滿整個螢幕。
+<em></em>
+
+
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+<p>
+ 在宣示說明的 <code><activity></code> 或
+ <code><application></code> 節點中，設定此屬性以啟用或停用多視窗顯示：
+
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ 如將此屬性設定為 true，就能以分割畫面和自由形式模式來啟動活動。
+如將屬性設定為 false，活動會不支援多視窗模式。
+如果此值為 false，而使用者嘗試以多視窗模式啟動活動，該活動會佔滿整個螢幕。
+
+
+</p>
+
+<p>
+ 您的應用程式如以 Android N 為目標，但您並未指定此屬性的值，屬性的預設值為 true。
+
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ 在宣示說明的 <code><activity></code> 節點中，設定此屬性以指出活動是否支援子母畫面顯示：
+如果 <code>android:resizeableActivity</code> 為 false，則會忽略此屬性。
+
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">版面配置屬性</h3>
+
+<p>
+ 使用 Android N，<code><layout></code> 宣示說明元素支援的數個屬性會影響多視窗模式中的活動行為。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ 以自由形式模式啟動活動時的預設寬度。
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ 以自由形式模式啟動活動時的預設高度。
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ 以自由形式模式啟動活動時的初始放置位置。請參閱
+ {@link android.view.Gravity} 參考資料以查看適當的值。
+ </dd>
+
+ <dt>
+ <code>android:minimalSize</code>
+ </dt>
+
+ <dd>
+ 在分割畫面與自由形式模式中，活動的最小高度與最小寬度。
+如果使用者在分割畫面模式中移動分隔，而使活動小於指定的最小值，系統會將活動裁剪為使用者要求的大小。
+
+
+ </dd>
+</dl>
+
+<p>
+ 例如，在自由形式模式中顯示活動時，下列程式碼顯示如何指定活動的預設大小與位置以及它的最小大小：
+
+
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minimalSize="450dp" />
+</activity>
+</pre>
+
+<h2 id="running">在多視窗模式中執行應用程式</h2>
+
+<p>
+ Android N 提供的新功能支援在多視窗模式中執行應用程式。
+
+</p>
+
+<h3 id="disabled-features">可在多視窗模式中停用的功能</h3>
+
+<p>
+ 當裝置處於多視窗模式時，有些功能無法用於會與其他活動或應用程式分享裝置螢幕的活動，因此會加以停用或忽略。
+
+這類功能包括：
+
+<ul>
+ <li>有些<a href="{@docRoot}training/system-ui/index.html">系統 UI</a>
+ 自訂選項會停用。例如，不以全螢幕模式執行就無法隱藏狀態列的應用程式。
+
+ </li>
+
+ <li>系統會忽略對 <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code> 屬性的變更。
+ </li>
+</ul>
+
+<h3 id="change-notification">多視窗變更通知與查詢</h3>
+
+<p>
+ 已將下列可支援多視窗顯示的新方法新增至 {@link android.app.Activity}
+ 類別。如需每個方法的詳細資訊，請參閱
+ <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 參考資料</a>。
+</p>
+
+<dl>
+ <dt>
+ <code>Activity.inMultiWindow()</code>
+ </dt>
+
+ <dd>
+ 呼叫即可知道活動是否處於多視窗模式。
+ </dd>
+
+ <dt>
+ <code>Activity.inPictureInPicture()</code>
+ </dt>
+
+ <dd>
+ 呼叫即可知道活動是否處於子母畫面模式。
+
+ <p class="note">
+ <strong>注意：</strong>子母畫面模式為多視窗模式的特殊情況。
+如果 <code>myActivity.inPictureInPicture()</code>
+ 傳回 true，那麼 <code>myActivity.inMultiWindow()</code> 也會傳回 true。
+
+ </p>
+ </dd>
+
+ <dt>
+ <code>Activity.onMultiWindowChanged()</code>
+ </dt>
+
+ <dd>
+ 每當活動進入或離開多視窗模式，系統就會呼叫這個方法。
+如果活動正在進入多視窗模式，系統會將 true 的值傳遞給方法，若活動正要離開多視窗模式，則會傳遞 false。
+
+
+ </dd>
+
+ <dt>
+ <code>Activity.onPictureInPictureChanged()</code>
+ </dt>
+
+ <dd>
+ 每當活動進入或離開子母畫面模式，系統就會呼叫這個方法。
+如果活動正在進入子母畫面模式，系統會將 true 的值傳遞給方法，若活動正要離開子母畫面模式，則會傳遞 false。
+
+
+ </dd>
+</dl>
+
+<p>
+ 上述的每一個方法也都有 {@link android.app.Fragment} 版本，例如
+ <code>Fragment.inMultiWindow()</code>。
+</p>
+
+<h3 id="entering-pip">進入子母畫面模式</h3>
+
+<p>
+ 呼叫新方法
+ <code>Activity.enterPictureInPicture()</code>，即可將活動放入子母畫面模式。如果裝置不支援子母畫面模式，這個方法就沒有作用。
+如需詳細資訊，請參閱<a href="picture-in-picture.html">子母畫面</a>文件。
+
+</p>
+
+<h3 id="launch">在多視窗模式中啟動新活動</h3>
+
+<p>
+ 當您啟動新活動，可以提示系統應儘可能在目前活動的旁邊顯示新的活動。
+如要這樣做，請使用旗標
+ <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>。
+傳遞此旗標會要求下列行為：
+
+</p>
+
+<ul>
+ <li>如果裝置處於分割畫面模式中，系統會嘗試在啟動新活動的活動旁邊建立該活動，讓兩個活動分享螢幕。
+
+系統不保證一定能這樣做，但會儘可能讓活動相鄰。
+
+ </li>
+
+ <li>如果裝置未處於分割畫面模式，這個旗標就沒有作用。
+ </li>
+</ul>
+
+<p>
+ 如果裝置處於自由形式模式，而您正在啟動新的活動，您可以呼叫
+ <code>ActivityOptions.setLaunchBounds()</code>，指定新活動的尺寸與畫面位置。
+如果裝置未處於多視窗模式，這個方法就沒有作用。
+
+</p>
+
+<p class="note">
+ <strong>注意：</strong>如果您在工作堆疊內啟動活動，該活動就會取代畫面上的活動，繼承它的所有多視窗屬性。
+
+如果您想要在多視窗模式中，以個別的視窗啟動活動，您必須在新的工作堆疊中啟動該活動。
+
+</p>
+
+<h3 id="dnd">支援拖放功能</h3>
+
+<p>
+ 使用者可以在兩個活動分享螢幕時，將一個活動中的資料<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>到另一個活動。
+
+(之前，使用者只能在單一活動內拖放資料)。
+因此，若您的應用程式目前不支援拖曳功能，建議您將該功能新增至應用程式。
+
+</p>
+
+<p>
+ N Preview SDK 擴充 <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
+ 套件，支援跨應用程式的拖放功能。如需下列類別與方法的詳細資訊，請參閱 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 參考資料</a>。
+
+
+</p>
+
+<dl>
+ <dt>
+ <code>android.view.DropPermissions</code>
+ </dt>
+
+ <dd>
+ 語彙基元物件負責指定權限，授予給放下接收者應用程式。
+
+ </dd>
+
+ <dt>
+ <code>View.startDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ {@link android.view.View#startDrag View.startDrag()} 的新別名。傳遞新旗標
+ <code>View.DRAG_FLAG_GLOBAL</code>，就可以啟用跨活動的拖放功能。
+如果您需要將 URI 權限授予接收者活動，請視需要傳遞新旗標
+ <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> 或
+ <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>。
+
+ </dd>
+
+ <dt>
+ <code>View.cancelDragAndDrop()</code>
+ </dt>
+
+ <dd>
+ 取消目前進行中的拖曳操作。只能由產生拖曳操作的應用程式呼叫。
+
+ </dd>
+
+ <dt>
+ <code>View.updateDragShadow()</code>
+ </dt>
+
+ <dd>
+ 取代目前所進行拖曳操作的拖曳陰影。只能由產生拖曳操作的應用程式呼叫。
+
+ </dd>
+
+ <dt>
+ <code>Activity.requestDropPermissions()</code>
+ </dt>
+
+ <dd>
+ 針對利用 {@link android.view.DragEvent} 中包含的 {@link
+ android.content.ClipData} 傳遞的內容 URI，要求權限。
+ </dd>
+</dl>
+
+<h2 id="testing">測試應用程式的多視窗支援</h2>
+
+<p>
+ 不論您是否針對 Android N 更新您的應用程式，都應該確認應用程式在多視窗模式中的行為為何，以免使用者試圖在執行 Android N 的裝置上以多視窗模式啟動應用程式。
+
+
+</p>
+
+<h3 id="configuring">設定測試裝置</h3>
+
+<p>
+ 如果您在裝置上安裝 Android N，即自動支援分割畫面模式。
+
+</p>
+
+<h3 id="test-non-n">應用程式若非以 N Preview SDK 建置</h3>
+
+<p>
+ 若您並非以 N Preview SDK 建置應用程式，而且使用者會試圖在多視窗模式中使用該應用程式，除非應用程式宣告螢幕方向固定，否則系統會強制調整應用程式大小。
+
+
+</p>
+
+<p>
+ 若您的應用程式並未宣告螢幕方向固定，您應該在執行 Android N 的裝置上啟動應用程式，並嘗試將應用程式放入分割畫面模式。
+
+確認強制調整應用程式大小時的使用者體驗可以接受。
+
+</p>
+
+<p>
+ 若您的應用程式宣告螢幕方向固定，您應該嘗試將應用程式放入多視窗模式。
+確認您這樣做時，應用程式依然會處於全螢幕模式。
+
+</p>
+
+<h3 id="test-mw">若您支援多視窗模式</h3>
+
+<p>
+ 如果您以 N Preview SDK 建置應用程式且未停用多視窗支援，請在分割畫面與自由形式模式下，確認下列行為：
+
+
+</p>
+
+<ul>
+ <li>以全螢幕模式啟動應用程式，然後長按 [總覽] 按鈕以切換到多視窗模式。
+確認應用程式可以正確切換。
+ </li>
+
+ <li>以多視窗模式直接啟動應用程式，並確認應用程式可以正確啟動。
+您可以按下 [總覽] 按鈕，然後長按應用程式的標題欄，再拖曳到螢幕上其中一個醒目提示的區域，即可以多視窗模式啟動應用程式。
+
+
+ </li>
+
+ <li>在分割畫面模式中拖曳分隔線調整應用程式的大小。
+ 確認可以調整應用程式大小而不會當機，同時可以看見必要的 UI 元素。
+
+ </li>
+
+ <li>如果您已指定應用程式的最小尺寸，請嘗試將應用程式的大小調整到低於指定的尺寸。
+確認您無法將應用程式的大小調整到小於指定的最小值。
+
+ </li>
+
+ <li>經由所有測試確認應用程式的效能可以接受。例如，確認在調整應用程式大小之後，不會遲遲不更新 UI。
+
+
+ </li>
+</ul>
+
+<h4 id="test-checklist">測試檢查清單</h4>
+
+<p>
+ 若要確認應用程式在多視窗模式中的效能，請嘗試下列操作。
+除非另外註明，否則您應該在分割畫面與多視窗模式中嘗試這些操作。
+
+</p>
+
+<ul>
+ <li>進入和離開多視窗模式。
+ </li>
+
+ <li>從您的應用程式切換到另一個應用程式，並確認當應用程式不在使用中但可看見時，能正常運作。
+例如，如果是播放影片的應用程式，請確認當使用者與另一個應用程式互動時，影片會持續播放。
+
+
+ </li>
+
+ <li>在分割畫面模式中，嘗試移動分隔列以加大和縮小應用程式。
+在並排與上下排列設定都要嘗試這些操作。
+確認應用程式不會當機，可以看見基本功能，而且不會花太長的時間完成調整大小操作。
+
+
+ </li>
+
+ <li>快速連續執行數次調整大小操作。確認應用程式不會因此當機或流失記憶體。
+如需檢查應用程式記憶體使用量的詳細資訊，請參閱<a href="{@docRoot}tools/debugging/debugging-memory.html">調查 RAM 使用狀況</a>。
+
+
+ </li>
+
+ <li>以數個不同的視窗設定正常使用您的應用程式，並確認應用程式都能正常運作。
+確認文字可以閱讀，而且 UI 元素不會太小而無法與之互動。
+
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">若已停用多視窗支援</h3>
+
+<p>
+ 若您已設定
+ <code>android:resizableActivity="false"</code> 來停用多視窗支援，您應該在執行 Android N 的裝置上啟動應用程式，並嘗試將應用程式放入自由形式與分割畫面模式。
+
+確認您這樣做時，應用程式依然會處於全螢幕模式。
+
+</p>
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/notifiers/notifications.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/notifiers/notifications.jd
index b853744..d7bf469 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/notifiers/notifications.jd
@@ -81,7 +81,7 @@
<strong>圖 2.</strong>通知匣中的通知。
</p>
-<p class="note"><strong>注意：</strong>除非另外註明，否則本指南參照<a href="{@docRoot}tools/support-library/index.html">支援程式庫</a> 4 版中的
+<p class="note"><strong>注意：</strong>除非另外註明，否則本指南參照<a href="{@docRoot}tools/support-library/index.html">支援程式庫</a> 4 版中的
{@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder} 類別。類別 {@link android.app.Notification.Builder Notification.Builder} 是在 Android 3.0 (API 級別 11) 新增。
@@ -97,10 +97,10 @@
<h2 id="CreateNotification">建立通知</h2>
-<p>您會為
+<p>您會為
{@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder} 物件中的通知指定 UI 資訊與動作。
-如要建立通知本身，您可以呼叫
-{@link android.support.v4.app.NotificationCompat.Builder#build NotificationCompat.Builder.build()}，其傳回的
+如要建立通知本身，您可以呼叫
+{@link android.support.v4.app.NotificationCompat.Builder#build NotificationCompat.Builder.build()}，其傳回的
{@link android.app.Notification} 物件會包含您的規格。如要發出通知，您可以呼叫 {@link android.app.NotificationManager#notify NotificationManager.notify()} 將 {@link android.app.Notification} 物件傳送至系統。
</p>
@@ -149,7 +149,7 @@
在 {@link android.app.Notification} 內，動作本身是由
{@link android.app.PendingIntent} 完成定義，其中包含的
{@link android.content.Intent} 會啟動您應用程式中的
-{@link android.app.Activity}。如要將
+{@link android.app.Activity}。如要將
{@link android.app.PendingIntent} 與手勢關聯，可呼叫
{@link android.support.v4.app.NotificationCompat.Builder} 的適當方法。例如，如果當使用者按一下通知匣中的通知文字時，您希望啟動
{@link android.app.Activity}，可呼叫
@@ -394,7 +394,7 @@
<h2 id="NotificationResponse">啟動 Activity 時保留導覽</h2>
<p>
當您從通知啟動 {@link android.app.Activity} 時，您必須保留使用者預期的導覽體驗。
-按一下 <i>[返回]</i> 應可將使用者從應用程式的一般工作流程帶回主螢幕，而按一下
+按一下 <i>[返回]</i> 應可將使用者從應用程式的一般工作流程帶回主螢幕，而按一下
<i>[近期記錄]</i> 應會將
{@link android.app.Activity} 顯示為個別的工作。如要保留導覽體驗，請以全新的工作啟動
{@link android.app.Activity}。您該如何設定
@@ -466,7 +466,7 @@
</p>
</li>
<li>
- 此外您還需要新增 Android 4.1 以上版本的支援。為此，請將
+ 此外您還需要新增 Android 4.1 以上版本的支援。為此，請將
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#parent">android:parentActivityName</a></code> 屬性新增到您要啟動 {@link android.app.Activity} 的
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> 元素。
@@ -722,7 +722,7 @@
<p>
當操作完成時，您可以繼續顯示進度列或將其移除。不論是任何一種情況，都務必更新通知文字來指出操作已完成。
- 如要移除進度列，請呼叫
+ 如要移除進度列，請呼叫
{@link android.support.v4.app.NotificationCompat.Builder#setProgress
setProgress(0, 0, false)}。例如：
</p>
@@ -933,7 +933,7 @@
</p>
<p>
- 如要定義自訂通知版面配置，請從具現化可擴大 XML 配置檔案的
+ 如要定義自訂通知版面配置，請從具現化可擴大 XML 配置檔案的
{@link android.widget.RemoteViews} 物件著手。接著，改為呼叫 {@link android.support.v4.app.NotificationCompat.Builder#setContent setContent()}，而不是呼叫像是 {@link android.support.v4.app.NotificationCompat.Builder#setContentTitle setContentTitle()} 的方法。
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/overview.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/overview.jd
index 44d05a8..0ac4002 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/overview.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>如需建立 UI 版面配置的完整指南，請參閱 <a href="declaring-layout.html">XML 版面配置</a>。
-
+
<h2 id="UIComponents">使用者介面元件</h2>
<p>您不必使用 {@link android.view.View} 與 {@link
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/settings.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/settings.jd
index 91ac929..7a7ff9b 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/settings.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/settings.jd
@@ -226,7 +226,7 @@
<dt>{@code android:key}</dt>
<dd>需要這個屬性才能保留資料值的偏好設定。它會指定當系統將此設定值儲存於 {@link
android.content.SharedPreferences} 時要使用的唯一索引鍵 (字串)。
-
+
<p>只有在下列情況下不需要此屬性：<em></em>偏好設定為 {@link android.preference.PreferenceCategory} 或 {@link android.preference.PreferenceScreen}，或者偏好設定指定 {@link android.content.Intent} 進行呼叫 (搭配 <a href="#Intents">{@code <intent>}</a> 元素) 或 {@link android.app.Fragment} 進行顯示 (搭配 <a href="{@docRoot}reference/android/preference/Preference.html#attr_android:fragment">{@code
android:fragment}</a> 屬性)。
@@ -285,7 +285,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -293,12 +293,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -588,11 +588,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -672,15 +672,15 @@
</p>
<p>例如，下列為使用 Android 3.0及更新版本的偏好設定標頭 XML 檔案 ({@code res/xml/preference_headers.xml})：
-</p>
+</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -692,18 +692,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -975,11 +975,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1194,7 +1194,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html-intl/intl/zh-tw/guide/topics/ui/ui-events.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/ui-events.jd
index 68714e8..8e009e0 100644
--- a/docs/html-intl/intl/zh-tw/guide/topics/ui/ui-events.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/ui-events.jd
@@ -187,7 +187,7 @@
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - 這讓 {@link
android.view.ViewGroup} 在發送至子檢視時能監控事件。</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
- ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - 呼叫這個父檢視以指出不應該使用 <code>{@link
+ ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - 呼叫這個父檢視以指出不應該使用 <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code> 攔截輕觸事件。
</li>
</ul>
@@ -199,11 +199,11 @@
不過，如果裝置具有輕觸功能，而且使用者透過輕觸方式開始與介面互動，就不需要再將項目反白顯示，或是對特定檢視提供焦點。
因此，這就是名稱為「輕觸模式」的互動模式。
-
+
</p>
<p>
如果是具備輕觸功能的裝置，使用者輕觸螢幕之後，裝置就會進入輕觸模式。
-從這點以此類推，只有
+從這點以此類推，只有
{@link android.view.View#isFocusableInTouchMode} 為 true 的檢視才可設定焦點，例如文字編輯小工具。
其他可輕觸的檢視，例如按鈕，在輕觸時不會成為焦點；按下時，只會觸發 on-click 接聽器。
@@ -214,7 +214,7 @@
</p>
<p>
-整個系統 (所有視窗和 Activity) 都會保留輕觸模式的狀態。如要查詢目前的狀態，您可以呼叫
+整個系統 (所有視窗和 Activity) 都會保留輕觸模式的狀態。如要查詢目前的狀態，您可以呼叫
{@link android.view.View#isInTouchMode} 以查看裝置目前是否處於輕觸模式。
</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html-intl/intl/zh-tw/preview/api-overview.jd b/docs/html-intl/intl/zh-tw/preview/api-overview.jd
deleted file mode 100644
index aeace5b..0000000
--- a/docs/html-intl/intl/zh-tw/preview/api-overview.jd
+++ /dev/null
@@ -1,676 +0,0 @@
-page.title=適用於開發人員的 Android N
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>主要開發人員功能</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">多視窗支援</a></li>
- <li><a href="#notification_enhancements">通知</a></li>
- <li><a href="#jit_aot">JIT/AOT 編譯</a></li>
- <li><a href="#quick_path_to_app_install">應用程式安裝的快速路徑</a></li>
- <li><a href="#doze_on_the_go">移動時休眠</a></li>
- <li><a href="#background_optimizations">背景最佳化</a></li>
- <li><a href="#data_saver">Data Saver</a></li>
- <li><a href="#tile_api">快速設定磚 API</a></li>
- <li><a href="#number-blocking">拒接號碼</a></li>
- <li><a href="#call_screening">來電過濾</a></li>
- <li><a href="#multi-locale_languages">地區設定與語言</a></li>
- <li><a href="#icu4">Android 中的 ICU4J API</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Android TV 錄製</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">協助工具</a></li>
- <li><a href="#direct_boot">直接開機</a></li>
- <li><a href="#key_attestation">金鑰證明</a></li>
- <li><a href="#network_security_config">網路安全性設定</a></li>
- <li><a href="#default_trusted_ca">預設信任的 CA</a></li>
- <li><a href="apk_signature_v2">APK 簽章配置第 2 版</a></li>
- <li><a href="#scoped_directory_access">限定範圍目錄存取</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N 仍在開發中，但是您現在可以透過「N Developer Preview」來試用。下面各節重點說明適用於開發人員的一些新功能。
-
- </p>
-
-<p>
- 請務必查看<a href="{@docRoot}preview/behavior-changes.html">行為變更</a>以瞭解哪些平台變更部分會影響您的應用程式、閱讀開發人員指南以瞭解主要功能，以及下載 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>以深入瞭解新 API 的詳細資訊。
-
-
-
-</p>
-
-<h2 id="multi-window_support">多視窗支援</h2>
-
-
-<p>在 Android N 中，我們將許多人要求的新多工功能引進到平台 — 多視窗支援。
- </p>
-
- <p>使用者現在可以一次在螢幕上開啟兩個應用程式。 </p>
- <ul>
- <li>在執行 Android N 的手機與平板電腦上，使用者可以在分割畫面模式中並排或上下排列兩個應用程式。只要拖曳兩個應用程式之間的分隔線，即可調整其大小。
-
-
- </li>
-
-<li>在 Android TV 裝置上，應用程式可以將本身放入<a href="{@docRoot}preview/features/picture-in-picture.html">子母畫面模式</a>，讓它們持續顯示內容，同時使用者可以瀏覽其他應用程式或與其互動。請參閱下面內容，以瞭解更多資訊。
-
- </li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;" id="img-split-screen" />
-<p class="img-caption">
- <strong>圖 1.</strong> 在分割畫面模式中執行的應用程式。
-</p>
- </div>
-
-<p>特別是平板電腦與其他螢幕較大的裝置，多視窗支援為您提供吸引使用者的新方式。您甚至可以在應用程式中啟用拖放功能，讓使用者便利地從應用程式拖放內容 — 這是增強您的使用者體驗的絕佳方式。
-
-
- </p>
-
-<p>將多視窗支援新增到您的應用程式並設定它處理多視窗顯示的方式是很直接的作法。例如，您可以指定活動的最小可允許尺寸，避免使用者將活動的尺寸調整到低於該尺寸。您也可以停用應用程式的多視窗顯示，以確保系統只以全螢幕模式顯示您的應用程式。
-
-
-
-</p>
-
-<p>
- 如需詳細資訊，請參閱<a href="{@docRoot}preview/features/multi-window.html">多視窗支援</a>開發人員文件。
-
-</p>
-
-<h2 id="notification_enhancements">通知增強功能</h2>
-
-<p>我們已重新設計 Android N 中的通知，讓它們更易於使用、速度更快。一些變更包括：
-</p>
-
-<ul>
- <li>
- <strong>範本更新</strong>：我們已更新通知範本，在主圖影像和虛擬人偶放入的新強調。開發人員只需對程式碼進行最少的調整，即可發揮新範本的所有功能。
-
-
- </li>
-
- <li>
- <strong>整合式通知</strong>：系統可以將訊息群組到一起 (例如依訊息主題) 並顯示群組。使用者可以直接在群組上執行動作，如「關閉」或「封存」。如果您已實作 Android Wear 的通知，則已經熟悉此模式。
-
-
-
-
- </li>
-
- <li>
- <strong>直接回覆</strong>：對於即時通訊應用程式，Android 系統支援內嵌回覆，這樣使用者就能直接在通知介面內快速回應簡訊或文字訊息。
-
-
- </li>
-
- <li>
- <strong>自訂檢視</strong>：兩個新的 API 讓您在通知中使用自訂檢視時可利用系統的裝飾，例如通知標題與動作。
-
-
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt="" style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>圖 2.</strong> 整合式通知與直接回覆。
-</p>
-
-<p>如果要瞭解如何實作新的功能，請參閱<a href="{@docRoot}preview/features/notification-updates.html">通知</a>指南。
-
-</p>
-
-
-
-<h2 id="jit_aot">設定檔指引 JIT/AOT 編譯</h2>
-
-<p>在 Android N 中，我們新增了 Just in Time (JIT) 編譯器搭配程式碼分析工具到 ART，讓 Android 應用程式在執行時能夠持續改善其效能。JIT 編譯器補充了 ART 目前的 Ahead of Time (AOT) 編譯器，協助改善執行階段效能、節省儲存空間以及加速應用程式更新和系統更新。
-
-
-
-</p>
-
-<p>設定檔指引編譯讓 ART 根據每個應用程式的實際用情形與裝置上的情況來管理其 AOT/JIT 編譯。例如，ART 會維護每個應用程式常用方法的設定檔，而且可以預先編譯和快取那些方法以獲得最佳效能。它不會編譯應用程式的其他部分，直到實際要使用這些部分時才會編譯。
-
-
-
-</p>
-
-<p>除了改善應用程式關鍵部分的效能以外，設定檔指引編譯還有助於降低應用程式的整體 RAM 使用量，包括關聯的二進位檔案。此功能對於低記憶體裝置特別重要。
-
-</p>
-
-<p>ART 透過對裝置電池產生最小影響的方式來管理設定檔指引編譯。它只會在裝置閒置和充電時預先編譯，這種預先工作的方式可以節省時間和電池電力。
-
-</p>
-
-<h2 id="quick_path_to_app_install">應用程式安裝的快速路徑</h2>
-
-<p>ART JIT 編譯器的最實質好處之一是加速應用程式安裝和系統更新。即使是在 Android 6.0 上需要數分鐘來最佳化和安裝的大型應用程式，現在只需幾秒鐘就可以安裝。系統更新也會變得更快，因為不再需要最佳化步驟。
-
-
- </p>
-
-<h2 id="doze_on_the_go">移動時休眠...</h2>
-
-<p>Android 6.0 引進休眠功能，這是可節省電池電力的系統模式，它會在裝置閒置時 (例如放在桌子上或抽屜中) 延後應用程式的 CPU 與網路活動。
-
- </p>
-
-<p>現在 Android N 中的休眠功能更進一步進展，可在移動時節省電池電力。只要螢幕關閉一段時間且裝置拔除電源的情況下，休眠功能就會將熟悉的 CPU 與網路限制的子集套用到應用程式。這表示即使使用者將裝置放在口袋內時也可以節省電池電力。
-
-
-
-</p>
-
-
-<img src="/preview/images/doze-diagram-1.png" alt="" id="figure1" />
-<p class="img-caption">
- <strong>圖 3.</strong> 休眠功能現在可套用限制，即使裝置沒有固定在一處時，也能改善電池使用時間。
-
-</p>
-
-
-<p>當裝置使用電池時，在螢幕關閉短時間後，休眠功能會限制網路存取並延遲工作與同步處理。在短暫的維護時段中，應用程式可存取網路並執行延遲的工作/同步處理。裝置螢幕開啟或插上電源可讓裝置離開休眠狀態。
-
-
-
-</p>
-
-<p>當裝置再次固定不動，且螢幕關閉並使用電池一段時間後，休眠功能會在
-{@link
-android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} 鬧鐘和 GPS/Wi-Fi 掃描上套用完整的 CPU 與網路限制。
-</p>
-
-<p>讓應用程式適應休眠功能的最佳做法，無論裝置在移動中或固定不動都是一樣的，所以如果您已經更新應用程式使其能夠處理休眠，就完全沒問題。如果沒有，現在就<a href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">讓您的應用程式適應休眠功能</a>。
-
-
-</p>
-
-<h2 id="background_optimizations">專案 Svelte：背景最佳化</h2>
-
-<p>專案 Svelte 一直努力在生態系統中讓各種 Android 裝置上系統與應用程式使用最少的 RAM。在 Android N 中，「專案 Svelte」專注於最佳化應用程式在背景執行的方式。
-
- </p>
-
-<p>背景處理是大多數應用程式的必要部分。如果正確地處理，它可讓您擁有令人驚歎的使用者體驗 — 立即、快速、內容感知。如果沒有適當處理，背景處理就會不必要地耗用 RAM (與電池電力)，而且影響其他應用程式的系統效能。
-
-
- </p>
-
-<p>自 Android 5.0 開始，{@link android.app.job.JobScheduler} 就以適合使用者的偏好方式來執行背景工作。應用程式可以排程工作，同時讓系統根據記憶體、電源和連線狀況進行最佳化。JobScheduler 提供控制權和簡潔性，我們希望所有應用程式都使用它。
-
-
-
- </p>
-
-<p>
- 另一個好用的選項是 <a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager"><code>GCMNetworkManager</code></a>，它屬於 Google Play 服務的一部分，提供類似的工作排程功能，可與舊版 Android 相容。
-
-
-
-</p>
-
-<p>我們會繼續擴充 <code>JobScheduler</code> 和 <code>GCMNetworkManager</code> 以滿足您的更多使用案例 — 例如，在 Android N 中，現在您可以根據內容提供者中的變更來排程背景工作。同時，我們也開始取代一些會降低系統效能 (特別是低記憶體裝置) 的較舊模式。
-
-
-
-
-</p>
-
-<p>在 Android N 中，我們移除了三個常用的隱含廣播 — {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}、{@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 和 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} — 因為它們會一次喚醒多個應用程式的背景處理程序，而耗盡記憶體與電池電力。如果您的應用程式收到這些廣播，請改為使用「N Developer Preview」遷移到 <code>JobScheduler</code> 與相關的 API。
-
-
-
- </p>
-
-<p>
- 看看<a href="{@docRoot}preview/features/background-optimization.html">背景最佳化</a>文件，以瞭解詳細資訊。
-
-</p>
-
-
-<h2 id="data_saver">Data Saver</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>圖 4.</strong> [設定] 中的 Data Saver。
-</p>
- </div>
-
-<p>在行動裝置的使用壽命期間，行動數據方案的費用通常會超過裝置本身的費用。對於許多使用者而言，行動數據是他們想要節省的昂貴資源。
-
- </p>
-
-<p>Android N 引進 Data Saver 模式，這是一個新的系統服務，有助於降低應用程式的行動數據用量，無論是漫遊、接近帳單週期結束時或小量預付數據包。Data Saver 讓使用者控制應用程式如何使用行動數據，也讓開發人員在 Data Saver 開啟時提供更有效率的服務。
-
-
-
- </p>
-
-<p>當使用在 [設定]<strong></strong> 中啟用 Data Saver 且裝置使用計量付費網路時，系統會封鎖背景數據使用量，並指示前景的應用程式盡量使用較少的數據 — 例如，限制串流的位元率、降低影像品質、延遲開放式預先快取等等。使用者可以將特定應用程式新增到允許清單，以便即使在 Data Saver 為開啟狀態時，這些應用程式仍可在背景使用計量付費的數據使用量。
-
-
-
-
-</p>
-
-<p>Android N 擴充 {@link android.net.ConnectivityManager} 為應用程式提供<a href="{@docRoot}preview/features/data-saver.html#status">擷取使用者的 Data Saver 喜好設定</a>與<a href="{@docRoot}preview/features/data-saver.html#monitor-changes">監視喜好設定變更</a>的方法。所有應用程式應該檢視使用者是否已啟用 Data Saver 並努力限制前景與背景的數據使用量。
-
-
-
-</p>
-
-
-<h2 id="tile_api">快速設定磚 API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>圖 5.</strong> 通知欄中的快速設定磚。
-</p>
-
-
- </div><p>快速設定是直接從通知欄顯示關鍵設定與動作的常用簡單方式。在 Android N 中，我們擴充了快速設定的範圍，讓它變得更實用、更便利。
-
- </p>
-
-<p>我們也為額外的快速設定磚增加了更多空間，使用者可以透過向左或向右撥動存取分頁顯示區域。我們也讓使用者能夠控制要顯示的快速設定磚與顯示位置 — 使用者只需拖放磚，即可新增或移除它們。
-
-
- </p>
-
-<p>對於開發人員，Android N 也加入了新的 API，讓您定義自己的快速設定磚，以便使用者輕鬆存取您應用程式中的關鍵控制項與動作。
-</p>
-
-<p>
- 快速設定磚是專為急需或常用的控制項或動作而保留的，它不應該做為啟動應用程式的捷徑。
-
-
-</p>
-
-<p>
- 定義磚之後，您即可將它們顯示給使用者，使用者只需拖放這些磚，即可將它們新增到快速設定中。
-
-</p>
-
-<p>
- 如需建立應用程式磚的相關資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.service.quicksettings.Tile</code>。
-
-</p>
-
-
-
-<h2 id="number-blocking">拒接號碼</h2>
-
-<p>Android N 現在在平台中支援拒接號碼，並提供一個架構 API，讓服務提供者維護一份拒接號碼清單。預設的簡訊應用程式、預設的電話應用程式與提供者應用程式可以讀取及寫入拒接號碼清單。其他應用程式無法存取該清單。
-
-
-</p>
-
-<p>透過讓拒絕號碼成為平台上的標準功能，Android 為應用程式提供一個一致的方式，讓它們在各種裝置上都能支援拒接號碼。應用程式可以利用的其他好處包括：
-
-</p>
-
-<ul>
- <li> 如果為某個號碼設定來電拒接，也會拒收該號碼的簡訊
- <li> 透過備份與還原功能，即使經過重設或使用不同的裝置，也可持續保存
-
- <li> 多個應用程式可使用同一份拒接號碼清單
-</ul>
-
-<p>此外，透過 Android 整合行動通訊業者應用程式，表示行動通訊業者可以讀取裝置上的拒接號碼清單並為使用者執行服務端的拒接號碼，因此停止拒接號碼的來電和簡訊透過任何媒體 (例如 VOIP 端點或來電轉接) 連絡到使用者。
-
-
-</p>
-
-<p>
- 如需詳細資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.provider.BlockedNumberContract</code>。
-
-
-</p>
-
-<h2 id="call_screening">來電過濾</h2>
-
-<p>
- Android N 能讓預設電話應用程式過濾來電。電話應用程式執行的方法是實作新的<code>CallScreeningService</code>，它可以讓電話應用程式根據來電的 {@link android.telecom.Call.Details Call.Details} 來執行數個動作，例如：
-
-
-
-</p>
-
-<ul>
- <li> 拒接來電
- <li> 不允許將來電記錄到通話紀錄
- <li> 不對使用者顯示來電通知
-</ul>
-
-<p>
- 如需詳細資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.telecom.CallScreeningService</code>。
-
-
-</p>
-
-
-<h2 id="multi-locale_languages">多地區設定支援，更多語言</h2>
-
-
-<p>Android N 現在可讓使用者在 [設定] 中選取<strong>多個地區設定</strong>，以便以更好的方式支援雙語言使用案例。應用程式可以使用新的 API 取得使用者選取的地區設定，然後為多地區設定使用者提供更精細的使用者體驗 — 例如以多語言顯示搜尋結果，以及不為使用者已經熟知語言的網頁提供翻譯。
-
-
-
-
-</p>
-
-<p>除了多地區設定支援，Android N 也擴充了供使用者選用的語言選項。它為每種常用語言 (例如英文、西班牙文、法文與阿拉伯文) 提供 25 種變體。它也增加了對 100 種以上新語言的支援。
-
-
-</p>
-
-<p>應用程式呼叫 <code>LocaleList.GetDefault()</code> 即可取得使用者設定的地區設定清單。為了支援擴充的地區設定數目，Android N 變更了它解析資源的方式。請務必測試並確認您的應用程式使用新的資源解析邏輯時可正常運作。
-
-</p>
-
-<p>如果要深入瞭解新的資源解析行為與應該遵循的最佳做法，請參閱<a href="{@docRoot}preview/features/multilingual-support.html">多語言支援</a>。
-</p>
-
-<h2 id="icu4">Android 中的 ICU4J API</h2>
-
-<p>
- Android N 現在在 <code>android.icu</code> 套件下的 Android 架構中提供一個 <a href="http://site.icu-project.org/">ICU4J</a> API 子集。遷移很容易，大部分要承擔只是從 <code>com.java.icu</code> 命名空間變更為 <code>android.icu</code> 即可。如果您已經在應用程式中使用 ICU4J 套件組合，只要切換到 Android 架構中提供的 <code>android.icu</code> API，即可顯著縮減 APK 的大小。
-
-
-
-
-
-</p>
-
-<p>
- 如果要深入瞭解 Android ICU4J API，請參閱 <a href="{@docRoot}preview/features/icu4j-framework.html">ICU4J 支援</a>。
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>Android N 針對 OpenGL ES 3.2 新增架構介面與平台支援，包括：</p>
-
-<ul>
- <li> <a class="external-link" href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">Android 延伸套件</a></a> (AEP) 中的所有延伸套件，但 <code>EXT_texture_sRGB_decode</code> 除外。
- <li> HDR 的浮點畫面緩衝區與延遲著色。
- <li> BaseVertex 繪圖呼叫 (可啟用更好的批次處理與串流)。
- <li> 穩定的緩衝區存取控制 (可降低 WebGL 額外負荷)。
-</ul>
-
-<p>Android N 上 OpenGL ES 3.2 的架構 API 提供 <code>GLES32</code> 類別。使用 OpenGL ES 3.2 時，請務必在宣示說明檔案中使用 <code><uses-feature></code> 標籤與 <code>android:glEsVersion</code> 屬性宣告需求。
-
-
- </p>
-
-<p>如需使用 OpenGL ES (包括如何在執行階段檢查裝置支援的 OpenGL ES 版本) 的詳細資訊，請參閱 <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API 指南</a>。
-</p>
-
-
-<h2 id="android_tv_recording">Android TV 錄製</h2>
-
-<p>Android N 透過新的錄製 API，新增了錄製和播放 Android TV 輸入服務內容的功能。以現有的時間位移 API 為建置基礎，TV 輸入服務可以控制要錄製哪個頻道的資料、如何儲存已錄製的時段，以及管理使用者與錄製內容的互動。
-
-
- </p>
-
-<p>如需詳細資訊，請參閱 <a href="{@docRoot}preview/features/tv-recording-api.html">Android TV 錄製 API</a>。</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work 為執行 Android N 的裝置增加了許多新的功能與 API。一些亮點如下所示 — 如需與 Android N 相關之 Android for Work 更新的完整清單，請參閱「Android for Work 變更」。
-
-</p>
-
-<h3 id="work_profile_security_challenge">工作設定檔安全性查問 </h3>
-
-<p>
- 設定檔擁有者可以為以工作設定檔執行之應用程式指定個別的安全性查問。當使用者嘗試開啟任何工作應用程式時會顯示工作查問。成功完成安全性查問可將工作設定檔解鎖並在必要時將它解密。對於設定檔擁有者而言，<code>ACTION_SET_NEW_PASSWORD</code> 會提示使用者設定工作查問，而且 <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> 會提示使用者設定裝置鎖定。
-
-
-
-
-
-
-</p>
-
-<p>
- 設定檔擁有者可以使用 <code>setPasswordQuality()</code>、<code>setPasswordMinimumLength()</code> 與相關方法，為工作查問設定各自的密碼原則 (例如，需要 PIN 的時間長度，或是否使用指紋來將設定檔解鎖)。設定檔使用者也可以使用新的 <code>getParentProfileInstance()</code> 方法傳回的 <code>DevicePolicyManager</code> 執行個體來設定裝置鎖定。此外，設定檔擁有者還可以使用新的 <code>setOrganizationColor()</code> 與 <code>setOrganizationName()</code> 方法，為工作查問自訂認證畫面。
-
-
-
-
-
-
-
-
-</p>
-<h3 id="turn_off_work">關閉工作 </h3>
-
-<p>在具有工作設定檔的裝置上，使用者可以切換工作模式。當工作模式關閉時，受管理的使用者會暫時關機，因此而停用工作設定檔應用程式、背景同步與通知。這也包括設定檔擁有者應用程式。當工作模式關閉時，系統會顯示持續的狀態圖示，提醒使用者他們無法啟動工作應用程式。啟動器會指出工作應用程式和小工具無法存取。
-
-
-
-
- </p>
-
-<h3 id="always_on_vpn">一律開啟的 VPN </h3>
-
-<p>裝置擁有者和設定檔擁有者可確保工作應用程式一律透過指定的 VPN 連線。系統會自動在裝置開機時啟動該 VPN。
-
-</p>
-
-<p>
- 新的 <code>DevicePolicyManager</code> 方法是 <code>setAlwaysOnVpnPackage()</code> 與 <code>getAlwaysOnVpnPackage()</code>。
-
-
-</p>
-
-<p>因為系統無需透過應用程式互動即可直接連結 VPN 服務，所以 VPN 用戶端需要為「一律開啟的 VPN」處理新的進入點。正如以往，透過符合動作 <code>android.net.VpnService</code> 的意圖篩選器向系統指明服務。
-
-
- </p>
-
-<p>
- 使用者也可以使用 [設定] > [更多] > [VPN]<strong></strong> 手動設定「一律開啟的 VPN」用戶端，這些用戶端在主要使用者中實作 <code>VPNService</code> 方法。
-
-
-</p>
-
-<h2 id="accessibility_enhancements">協助工具增強功能</h2>
-
-<p>Android N 現在為新的裝置設定在歡迎畫面上直接提供「視覺設定」。這讓使用者更易於在自己的裝置上探索及設定協助工具功能，包括放大手勢、字型大小、顯示大小和 TalkBack。
-
-
- </p>
-
-<p>將這些協助工具功能放置在更為顯眼的地方，您的使用者較可能在啟用它們的情況下試用您的應用程式。請務必儘早在啟用這些設定的情況下測試您的應用程式。您可以從 [設定] > [協助工具] 啟用它們。
-
-
-</p>
-
-<p>此外，在 Android N 中，協助工具服務現在也可以協助行動不便的使用者觸控螢幕。新的 API 允許使用臉部追蹤、眼睛追蹤、點掃描等功能來建置服務，以滿足這些使用者的需要。
-
-
-</p>
-
-<p>如需詳細資訊，請參閱可下載之 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>中的 <code>android.accessibilityservice.GestureDescription</code>。
- </p>
-
-
-<h2 id="direct_boot">直接開機</h2>
-
-<p>直接開機可加速裝置啟動時間，並讓已註冊的應用程式只能使用有限的功能 (即使在未預期的重新開機之後)。例如，如果一個加密裝置在使用者睡覺時重新開機，已註冊的鬧鐘、訊息與來電現在可以持續如常通知使用者。這也表示協助工具服務在重新啟動之後可立即使用。
-
-
-
-
-</p>
-
-<p>直接開機利用 Android N 中以檔案為基礎的加密，能夠為系統與應用程式資料使用更精細的加密原則。系統為特定系統資料與明確註冊的應用程式資料使用裝置加密存放區。在預設情況下，所有其他系統資料、使用者資料、應用程式與應用程式資料都會使用認證加密存放區。
-
-
-
- </p>
-
-<p>開機時，系統會以限制模式啟動，它只能存取裝置加密的資料，而無法對應用程式或資料進行一般存取。如果您有想要在這個模式下執行的元件，可以在宣示說明中設定旗標來註冊這些元件。重新啟動之後，系統會透過廣播 <code>LOCKED_BOOT_COMPLETED</code> 意圖來啟用已註冊的元件。系統會確保已註冊的裝置加密應用程式資料可供使用之後才會解除鎖定。所有其他資料都無法使用，直到使用者確認他們的鎖定畫面認證之後，才會將這些資料解密。
-
-
-
-
-
-
- </p>
-
-如需詳細資訊，請參閱<a href="{@docRoot}preview/features/direct-boot.html">直接開機</a>。</p>
-</p>
-
-
-<h2 id="key_attestation">金鑰證明</h2>
-
-<p>硬體支援的金鑰存放區為 Android 裝置上密碼編譯金鑰的建立、儲存及使用提供更安全的方法。它們可保護金鑰不受 Linux 核心、可能的 Android 弱點和從已解鎖裝置擷取的傷害。
-
-
-</p>
-
-<p>為了讓使用硬體支援的金鑰存放區更易於使用且更安全，Android N 引進金鑰證明。應用程式與裝置外部服務可以使用金鑰證明，毫不懷疑地判斷 RSA 或 EC 金鑰組是否有硬體支援、金鑰組的屬性是哪些以及它的用法和有效性上套用哪些限制條件。
-
-
-
- </p>
-
-<p>應用程式與裝置外部服務可以透過 X.509 證明憑證 (必須以有效的證明金鑰簽署) 來要求有關金鑰組的資訊。證明金鑰是 ECDSA 簽署金鑰，它在裝置出廠時就已內嵌到其中的硬體支援金鑰存放區。因此，以有效證明金鑰簽署的證明憑證可確認裝置上有硬體支援的金鑰存放區，以及該金鑰儲存區中包含之金鑰組的詳細資訊。
-
-
-
-
-
-</p>
-
-<p>為了確保裝置使用安全的官方 Android 出廠映像，金鑰證明要求裝置的<a class="external-link" href="https://source.android.com/security/verifiedboot/verified-boot.html#bootloader_requirements">開機載入器</a>對<a class="external-link" href="https://source.android.com/security/trusty/index.html">信任執行環境 (TEE)</a> 提供下列資訊：
-
-
-</p>
-
-<ul>
-<li>裝置上安裝的作業系統版本與修補程式層級</li>
-<li><a href="https://source.android.com/security/verifiedboot/index.html" class="external-link">Verified Boot</a> 公開金鑰與鎖定狀態</li>
- </ul>
-
-<p>如需硬體支援的金鑰存放區功能的詳細資訊，請參閱<a href="https://source.android.com/security/keystore/" class="external-link">硬體支援的金鑰存放區</a>指南。
-</p>
-
-<p>除了金鑰證明之外，Android N 還引進連結指紋的金鑰，在註冊指紋時並不會撤銷。
-</p>
-
-<h2 id="network_security_config">網路安全性設定</h2>
-
-<p>在 Android N 中，應用程式可以安全地自訂其安全 (HTTPS、TLS) 連線的行為，無需修改任何程式碼，方法是使用宣告式的<em>網路安全性設定</em>，而不是使用容易出錯的傳統程式設計 API (例如 X509TrustManager)。
-
-
-</p>
-
- <p>支援的功能：</p>
-<ul>
-<li><b>自訂信任錨點。</b>讓應用程式為它的安全連線自訂要信任哪個憑證授權單位 (CA)。例如，信任特定的自我簽署憑證或一組限制的公用 CA。
-
-
-</li>
-<li><b>僅偵錯覆寫。</b>讓應用程式開發人員安全地為應用程式的安全連線進行偵錯，而不會造成已安裝應用程式之使用者的風險。
-
-
-</li>
-<li><b>退出明碼流量。</b>讓應用程式保護自身，不被意外使用明碼流量所危害。
-</li>
-<li><b>憑證關聯。</b>這個進階功能可讓應用程式為安全連線限制要信任的伺服器金鑰。
-</li>
-</ul>
-
-<p>如需詳細資訊，請參閱<a href="{@docRoot}preview/features/security-config.html">網路安全性設定</a>。
-</p>
-
-<h2 id="default_trusted_ca">預設的信任憑證授權單位</h2>
-
-<p>根據預設，以 Android N 為目標的應用程式只信任系統提供的憑證，而不再信任使用者新增的憑證授權單位 (CA)。以 Android N 為目標且想要信任使用者新增之 CA 的應用程式，應該使用<a href="{@docRoot}preview/features/security-config.html">網路安全性設定</a>來指定信任使用者 CA 的方法。
-
-
-
-</p>
-
-<h2 id="apk_signature_v2">APK 簽章配置第 2 版</h2>
-
-<p>PackageManager 類別現在支援使用 APK 簽章配置第 2 版來驗證應用程式。APK 簽章配置第 2 版是全檔案簽章配置，可透過偵測對 APK 檔案所做的任何未授權變更，大幅改善驗證速度並增強完整性保證。
-
-
-</p>
-
-<p>為了維持回溯相容性，APK 必須先以第 1 版簽章配置 (JAR 簽章配置) 簽署，然後再用第 2 版簽章配置簽署。有了第 2 版簽章配置，如果以第 2 版配置簽署之後，以其他憑證簽署 APK，驗證會失敗。
-
-
- </p>
-
-<p>「N Developer Preview」稍後將提供對 APK 簽章配置第 2 版的支援。
-</p>
-
-<h2 id="scoped_directory_access">限定範圍目錄存取</h2>
-
-<p>在 Android N 中，應用程式可以使用新的 API 來要求存取特定<a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">外部儲存空間</a>目錄，包括抽取式媒體 (例如 SD 卡) 上的目錄。新的 API 大幅簡化應用程式存取標準外部儲存空間目錄 (例如 <code>Pictures</code> 目錄) 的方法。相片應用程式之類的應用程式可以使用這些 API 而非使用 <code>READ_EXTERNAL_STORAGE</code>，這樣能夠授予對所有儲存空間目錄的存取權，或是使用「儲存空間存取架構」，讓使用者可以瀏覽到目錄。
-
-
-
-
-
-
-</p>
-
-<p>此外，新的 API 也簡化了使用者授予外部儲存空間存取權給您的應用程式時所需採取的步驟。當您使用新的 API 時，系統會使用簡單的權限 UI，清楚地詳細說明應用程式要求存取的目錄。
-
-
-</p>
-
-<p>如需詳細資訊，請參閱<a href="{@docRoot}preview/features/scoped-folder-access.html">限定範圍目錄存取</a>開發人員文件。
-
-</p>
-
-
-
-
-
-
diff --git a/docs/html-intl/intl/zh-tw/preview/behavior-changes.jd b/docs/html-intl/intl/zh-tw/preview/behavior-changes.jd
deleted file mode 100644
index fb1c1db..0000000
--- a/docs/html-intl/intl/zh-tw/preview/behavior-changes.jd
+++ /dev/null
@@ -1,480 +0,0 @@
-page.title=行為變更
-page.keywords=preview,sdk,compatibility
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>此文件內容</h2>
-
-<ol>
- <li><a href="#perf">效能改良</a>
- <ol>
- <li><a href="#doze">休眠</a></li>
- <li><a href="#bg-opt">背景最佳化</a></li>
- </ol>
- </li>
- <li><a href="#perm">權限變更</a></li>
- <li><a href="#accessibility">協助工具改良</a>
- <ol>
- <li><a href="#screen-zoom">螢幕縮放</a></li>
- <li><a href="#vision-settings">設定精靈中的視覺設定</a></li>
- </ol>
- </li>
- <li><a href="#ndk">NDK 應用程式連結到平台程式庫</a></li>
- <li><a href="#afw">Android for Work</a></li>
-</ol>
-
-<h2>另請參閱</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">Android N API 總覽</a>
-</li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- 除了新特性和功能之外，Android N 還包括各種不同的系統與 API 行為變更。此文件將強調說明一些您應該知道且在您的應用程式中加以考量的重要變更。
-
-
-
-</p>
-
-<p>
- 如果您先前曾發佈過適用於 Android 的應用程式，請注意，您的應用程式可能會受到平台中的這類變更所影響。
-
-</p>
-
-
-<h2 id="perf">效能改良</h2>
-
-<p>
- Android N 包含的系統行為變更旨在提升裝置的電池使用時間、改進 RAM 使用狀況與應用程式效能。這些變更會影響應用程式的系統資源可用性與系統通知。您應該檢閱這些變更並評估應用程式需要如何據以調整。
-
-
-
-
-</p>
-
-<h3 id="doze">休眠</h3>
-
-<p>
- 於 Android 6.0 (API 層級 23) 引進的休眠會在使用者將裝置的電源拔除、保持靜止狀態並關閉螢幕時，延遲 CPU 與網路活動，以延長電池使用時間。Android N 會在裝置電源被到拔除並關閉螢幕，但不一定靜置不動時 (例如使用者把手持裝置放在口袋中行進時)，套用 CPU 與網路限制子集，進一步增強休眠的功能。
-
-
-
-
-
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png" alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>圖 1.</strong> 休眠如何套用第一層級的系統活動限制以延長電池使用時間的示意圖。
-
-</p>
-
-<p>
- 當裝置以電池電力運作且螢幕已關閉一段時間時，裝置會進入休眠並套用第一組限制子集：關閉應用程式網路存取並延遲工作和同步。如果裝置進入休眠後靜置不動一段時間，系統會對 {@link android.os.PowerManager.WakeLock}、
- {@link android.app.AlarmManager} 鬧鐘、GPS 與 Wi-Fi 掃描套用其餘的休眠限制。不論是已套用某些或全部的休眠限制，系統都會喚醒裝置簡短地進行維護，應用程式能夠在該維護時段內存取網路，並能執行任何延遲的工作/同步。
-
-
-
-
-
-
-
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png" alt="" id="figure2" />
-<p class="img-caption">
- <strong>圖 2.</strong> 休眠如何在裝置靜置不動一段時間之後套用第二層級的系統活動限制的示意圖。
-
-</p>
-
-<p>
- 請注意，開啟螢幕或將裝置插電，就會結束休眠並移除這些處理限制。這項額外行為不會影響配合 Android 6.0 (API 層級 23) 引進的舊版休眠改寫應用程式的建議與最佳做法，如<a href="{@docRoot}training/monitoring-device-state/doze-standby.html">最佳化休眠與應用程式待命</a>中所述。像是使用 Google 雲端通訊 (GCM) 來傳送和接收訊息，以及開始規劃可適應額外休眠行為的更新等，還是應該遵循那些建議。
-
-
-
-
-
-
-
-
-</p>
-
-
-<h3 id="bg-opt">專案 Svelte：背景最佳化</h3>
-
-<p>
- Android N 將三種隱含式廣播移除，有助於最佳化記憶體用量與電源耗用量。因為隱含式廣播常常會將註冊為在背景接聽此類廣播的應用程式啟動，所以此一變更有其必要。移除這些廣播對裝置效能與使用者體驗大有益處。
-
-
-
-
-</p>
-
-<p>
- 行動裝置的連線能力經常變更，例如在 Wi-Fi 與行動數據之間切換。目前，應用程式可以透過在宣示說明中註冊隱含式 {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcast in their
- 廣播的接收器以監視連線能力變更。由於許多應用程式都註冊要接收此廣播，單一網路切換就可以喚醒所有應用程式，並立刻處理廣播。
-
-
-
-
-</p>
-
-<p>
- 同樣地，應用程式可以註冊要接收來自其他應用程式 (例如，相機) 的隱含式 {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 與 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} 廣播。當使用者使用相機應用程式拍攝相片時，會喚醒這些應用程式來處理廣播。
-
-
-</p>
-
-<p>
- 為減少這些問題，Android N 採用的最佳化方式如下：
-
-</p>
-
-<ul>
- <li>目標為 Android N 的應用程式不會收到 {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} 廣播，即使其宣示說明項目要求這些事件的通知。在前景執行的應用程式如果使用 {@code CONNECTIVITY_CHANGE} 來要求通知，仍可以在主要執行緒上接聽 {@link
- android.content.BroadcastReceiver}。
-
-
-
- </li>
-
- <li>應用程式無法傳送或接收 {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} 或 {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} 廣播。這種最佳化方式會影響所有應用程式，而不只是目標為 Android N 的應用程式。
-
- </li>
-</ul>
-
-<p>
- 未來發行的 Android 可能會將其他隱含式廣播與未繫結的背景服務視為過時。因此，為隱含式廣播在宣示說明中宣告的接收器相依性以及背景服務的相依性，都應該避免或加以移除。
-
-
-
-</p>
-
-<p>
- Android 架構提供數種解決方案，減少這些隱含式廣播或背景服務的需求。例如，{@link
- android.app.job.JobScheduler} API 提供的健全機制可在符合指定條件 (例如，連線到非計量付費網路) 的情況下，排程網路操作。您甚至可以使用 {@link
- android.app.job.JobScheduler}，對內容提供者的變更採取因應動作。
-
-
-
-</p>
-
-<p>
- 如需此行為變更和如何改寫應用程式的詳細資訊，請參閱<a href="{@docRoot}preview/features/background-optimization.html">背景最佳化</a>。
-
-
-</p>
-
-
-<h2 id="perm">權限變更</h2>
-
-<p>
- Android N 包括會影響您應用程式的權限變更，包括使用者帳戶權限和寫入外部儲存空間的新權限。以下是預覽版中已變更的權限摘要：
-
-
-
-</p>
-
-<ul>
- <li>{@code GET_ACCOUNTS} (已過時)
- <p>
- GET_ACCOUNTS 權限現已過時。系統會忽略目標為 Android N 之應用程式所用的這個權限。
-
- </p>
- </li>
-
-</ul>
-
-
-
-<h2 id="accessibility">協助工具改良</h2>
-
-<p>
- Android N 包括的變更旨在為視力不佳或視力受損的使用者改進平台可用性。這些變更一般應不需要變更您應用程式的程式碼，然而您應該檢閱這些功能並使用您的應用程式測試它們，以評估對使用者體驗的潛在影響。
-
-
-
-
-</p>
-
-
-<h3 id="screen-zoom">螢幕縮放</h3>
-
-<p>
- Android N 可讓使用者設定<strong>顯示器大小</strong>以放大或縮小螢幕上的所有元素，進而改善視力不佳使用者的裝置協助工具。使用者無法將螢幕縮放到超過常見中型手機的最小螢幕寬度 <a href="http://developer.android.com/guide/topics/resources/providing-resources.html">sw320dp</a> (Nexus 4 的寬度)。
-
-
-
-
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>圖 3.</strong> 右邊的螢幕顯示將執行 Android N 系統映像的裝置顯示大小增加的效果。
-
-</p>
-
-
-<p>
- 當裝置密度變更時，系統會以下列方式通知執行中的應用程式：
-
-</p>
-
-<ul>
- <li>如果應用程式的目標為 API 層級 23 或較低版本，系統會自動終止其所有背景處理程序。這表示如果使用者切換離開應用程式，以開啟 <em>[設定]</em> 畫面並變更 <strong>[顯示器大小]</strong> 設定，系統會在記憶體極低的情況下，以相同方式終止應用程式。如果應用程式有任何前景處理程序，系統會通知那些處理程序有設定變更，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>所述，有如裝置的螢幕方向有所變更。
-
-
-
-
-
-
-
- </li>
-
- <li>如果應用程式的目標為 Android N，其所有處理程序 (前景與背景) 都會收到設定變更的通知，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>所述。
-
-
-
- </li>
-</ul>
-
-<p>
- 大部分應用程式只要遵循 Android 最佳做法，不需要進行任何變更就能支援此功能。需檢查的特定項目如下：
-
-</p>
-
-<ul>
- <li>在螢幕寬度為 <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code> 的裝置上測試您的應用程式，確定它能適當執行。
-
- </li>
-
- <li>裝置設定變更時，就會更新任何與密度相關的快取資訊，例如快取的點陣圖或從網路載入的資源。當應用程式從暫停狀態繼續時，會檢查設定更新。
-
-
-
- <p class="note">
- <strong>注意：</strong>如果您快取與設定相關的資料，最好包括相關中繼資料，例如該資料的適當螢幕大小或像素密度。儲存此中繼資料可讓您決定在設定變更之後，是否需要重新整理快取的資料。
-
-
-
-
- </p>
- </li>
-
- <li>避免以不會隨螢幕密度調整的像素單位指定尺寸，請改為以<a href="{@docRoot}guide/practices/screens_support.html">密度獨立像素</a> (<code>dp</code>) 單位指定尺寸。
-
-
- </li>
-</ul>
-
-<h3 id="vision-settings">設定精靈中的視覺設定</h3>
-
-<p>
- Android N 包括在歡迎畫面的視覺化設定可讓使用者在新裝置上設定下列協助工具設定：<strong>放大手勢</strong>、<strong>字型大小</strong>、<strong>顯示器大小</strong>與 <strong>TalkBack</strong>。此變更增加和不同螢幕設定相關的錯誤能見度。您應該啟用這些設定來測試您的應用程式，以評估此功能的影響。您可以在 [設定] > [協助工具]<strong></strong> 下找到設定。
-
-
-
-
-
-
-
-</p>
-
-<h2 id="ndk">NDK 應用程式連結到平台程式庫</h2>
-
-<p>
- Android N 包括的命名空間變更可避免載入非公開 API。如果您使用 NDK，應該只能使用來自 Android 平台的公開 API。在下一版正式發行的 Android 使用非公開 API，會造成您的應用程式當機。
-
-
-
-</p>
-
-<p>
- 為了在發現使用非公開 API 時向您提出警示，當應用程式呼叫非公開 API 時，在 Android N 裝置上執行的應用程式會在 logcat 輸出產生一個錯誤，並以訊息同時顯示在裝置螢幕上，協助您更能察覺這種情況。您應該檢閱應用程式的程式碼，以移除使用的非公開平台 API，並使用預覽版裝置或模擬器全面測試您的應用程式。
-
-
-
-
-
-</p>
-
-<p>
- 如果您的應用程式依存於平台程式庫，請參閱 NDK 文件來取得以公開 API 同等項目取代常見私人 API 的一般修正。您可能也連結到平台程式庫，而不自知，特別是在應用程式使用的程式庫屬於該平台 (例如 <code>libpng</code>) 但不屬於 NDK 的時候。如為上述情況，請務必在您的 APK 包含您打算連結的所有 .so 檔案。
-
-
-
-
-
-</p>
-
-<p class="caution">
- <strong>注意：</strong>有些第三方程式庫會連結到非公開 API。如果您的應用程式使用此類程式庫，在下一版正式發行的 Android 上執行時就會當機。
-
-
-</p>
-
-<p>
- 應用程式不應依存於或使用 NDK 所未包括的原生程式庫，原因是在不同的 Android 發行版本之間會有變更或會被移除。從 OpenSSL 切換到 BoringSSL 便是此類變更的一例。此外，因為 NDK 所未包括的平台程式庫沒有相容性需求，而使不同裝置提供不同的相容性層級。如果您必須在舊型裝置上存取非 NDK 程式庫，請讓載入取決於 Android API 層級。
-
-
-
-
-
-
-</p>
-
-<p>
- 為協助您診斷這些類型的問題，以下是您在建置要用於 Android N 的應用程式時，會遇到的一些 Java 與 NDK 錯誤範例：
-
-</p>
-
-<p>Java 錯誤範例：</p>
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "/system/lib/libcutils.so"
- is not accessible for the namespace "classloader-namespace"
-</pre>
-
-<p>NDK 錯誤範例：</p>
-<pre class="no-pretty-print">
-dlopen failed: cannot locate symbol "__system_property_get" referenced by ...
-</pre>
-
-
-<p>
- 以下是發生這些類型之錯誤的應用程式可用的一些一般修正：
-</p>
-
-<ul>
- <li>改用標準 JNI 函式，以取代使用來自 libandroid_runtime.so 的 getJavaVM 與 getJNIEnv。
-
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>改用公開替代項 {@code __system_property_get}，以取代使用來自 {@code libcutils.so} 的 {@code property_get} 符號。如果要這樣做，請使用 {@code __system_property_get} 配合以下 include：
-
-
-<pre>
-#include <sys/system_properties.h>
-</pre>
- </li>
-
- <li>應該改用應用程式本機版，以取代使用來自 {@code libcrypto.so} 的 {@code SSL_ctrl} 符號。例如，您在 {@code .so} 檔案中靜態地連結 {@code libcyrpto.a}，或在您的應用程式中從 BoringSSL 或 OpenSSL 動態地包括自己的 {@code libcrypto.so}。
-
-
-
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N 包含對目標為 Android for Work 的應用程式所做的變更，包括對憑證安裝、密碼重設、次要使用者管理與裝置識別碼存取的變更。如果您要建置要用於 Android for Work 環境的應用程式，應該檢閱這些變更並據以修改應用程式。
-
-
-
-
-</p>
-
-<ul>
- <li>您必須先安裝委派的憑證安裝程式後，DPC 才能加以設定。對於目標為 N SDK 的設定檔與裝置擁有者應用程式，您應該在裝置政策控制器 (DPC) 呼叫 <code>DevicePolicyManager.setCertInstallerPackage()</code> 之前，先安裝委派的憑證安裝程式。如果該安裝程式尚未安裝，系統會擲回 <code>IllegalArgumentException</code>。
-
-
-
-
-
-
- </li>
-
- <li>裝置系統管理員的重設密碼限制現在適用於設定檔擁有者。裝置系統管理員無法再使用 <code>DevicePolicyManager.resetPassword()</code> 來清除密碼或變更已設定的密碼。裝置系統管理員仍能設定密碼，但只限裝置還沒有密碼、PIN 或模式的情況下。
-
-
-
-
- </li>
-
- <li>即使已經設定限制，裝置擁有者與設定檔擁有者還是可以管理帳戶。裝置擁有者與設定檔擁有者在已採用 <code>DISALLOW_MODIFY_ACCOUNTS</code> 使用者限制的情況下，仍能呼叫帳戶管理 API。
-
-
- </li>
-
- <li>裝置擁有者能輕鬆管理次要使用者。當裝置以裝置擁有者模式執行時，會自動設定 <code>DISALLOW_ADD_USER</code> 限制。這樣可防止使用者建立不受管理的次要使用者。此外，<code>CreateUser()</code> 與 <code>createAndInitial()</code> 方法已經過時，改用 <code>DevicePolicyManager.createAndManageUser()</code> 取代。
-
-
-
-
-
- </li>
-
- <li>裝置擁有者可以存取裝置識別碼。裝置擁有者可以使用 <code>DevicePolicyManagewr.getWifiMacAddress()</code> 存取裝置的 Wi-Fi MAC 位址。如果未曾在該裝置上啟用 Wi-Fi，此方法會傳回 {@code null} 的值。
-
-
-
- </li>
-</ul>
-
-<p>
- 如需 Android N 中有關 Android for Work 變更的詳細資訊，請參閱 <a href="{@docRoot}preview/features/afw.html">Android for Work 更新</a>。
-
-</p>
-
-<h2 id="other">其他重點</h2>
-
-<ul>
-<li>在 Android N 上執行的應用程式如以較低的 API 層級為目標，當使用者變更顯示器大小，就會終止該應用程式的處理程序。應用程式必須要能適當處理這種情況。否則，當使用者要從最近使用記錄還原時就會當機。
-
-
-
-
-<p>
-您必須測試應用程式，確保不會發生這種行為。測試方法是透過 DDMS 手動終止應用程式，以造成相同的當機情況。
-
-
-
-</p>
-
-<p>
-目標為 N 與更新版本的應用程式不會在密度變更時自動終止；然而，它們仍會勉強地回應設定變更。
-
-</p>
-</li>
-
-<li>
-Android N 上的應用程式應該要適當處理設定變更，同時不應該在後續啟動時當機。您可以變更字型大小 ([設定]<strong></strong> > [顯示]<strong></strong> > [字型大小]<strong></strong>)，然後從最近使用紀錄還原應用程式，以驗證應用程式行為。
-
-
-
-
-</li>
-</ul>
-
diff --git a/docs/html-intl/intl/zh-tw/preview/download.jd b/docs/html-intl/intl/zh-tw/preview/download.jd
deleted file mode 100644
index a98000a..0000000
--- a/docs/html-intl/intl/zh-tw/preview/download.jd
+++ /dev/null
@@ -1,541 +0,0 @@
-page.title=在裝置上測試
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">在下載並安裝 Android Preview SDK 的元件之前 ，您必須同意遵守下列條款和條件。
-
-</p>
-
- <h2 class="norule">條款和條件</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-這是「Android SDK Preview 授權協議」(以下稱「授權協議」)。
-
-1. 簡介
-
-1.1「Android SDK Preview」(在「授權協議」中稱為「Preview」，包括 (如果有可用的) Android 系統檔案、經過封裝的 API 和 Preview 程式庫檔案) 是在「授權協議」之條款的約束下授權給您使用。「授權協議」就您對「Preview」的使用，構成您與 Google 間具法律約束力之合約。
-
-1.2「Android」係指「Android 軟體開放原始碼專案」(http://source.android.com/) 所提供的 Android 裝置軟體堆疊 (不定期更新)。
-
-1.3「與 Android 相容」表示符合下列條件的任何 Android 實作：(i) 符合「Android 相容性定義」文件，此文件位於 Android 相容性網站 (http://source.android.com/compatibility) 且不定期更新；以及 (ii) 順利通過「Android 相容性測試套件」(CTS) 的測試。
-
-1.4 "Google" 係指 Google Inc.，是一家在美國德拉瓦州註冊的公司，總公司位於 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States。
-
-2. 接受「授權協議」
-
-2.1 必須先同意遵守「授權協議」，才能使用此「Preview」。如果不接受「授權協議」，您就無法使用此「Preview」。
-
-2.2 按一下 [接受] 且/或使用「Preview」，即表示您同意「授權協議」的條款。
-
-2.3 如果您是美國或其他國家/地區 (包括您所居住或使用此「Preview」的國家/地區) 的法律所禁止接收此「Preview」的人員，就不得使用此「Preview」及接受「授權協議」。
-
-2.4 如果您將在公司或組織內部使用「Preview」，您就要代表雇主或其他實體同意受「授權協議」約束，且您代表並保證具備完整法定權限來約束您的雇主或這類實體遵守「授權協議」。如果您不具備必要的權限，就不得代表您的雇主或其他實體接受「授權協議」或使用此「Preview」。
-
-3. 來自 Google 的 Preview 授權
-
-3.1 在此「授權合約」之條款的約束下，Google 授予您此「Preview」的使用授權，此授權為有限、全球通用、買斷式、不可轉讓且不可轉授權，此「Preview」僅供您用來開發在 Android 相容實作上執行的應用程式。
-
-3.2 您不得使用此「Preview」來開發適用於其他平台 (包括與 Android 不相容的實作) 的應用程式或開發另一個 SDK。您當然可以使用它來開發適用於其他平台 (包括與 Android 不相容的實作) 的應用程式，惟不得將此「Preview」用於該用途。
-
-3.3 您同意 Google 或第三方對此「Preview」擁有一切法定權利及權益，包括存在於此「Preview」中的任何「智慧財產權」。「智慧財產權」係指專利法、著作權法、商業秘密法、商標法及任何和所有其他專利權下的任何及一切權利。Google 保留一切未明確授予您的權利。
-
-3.4 您不得將此「Preview」用於「授權協議」未明文許可的任何用途。除非適用的第三方授權所需，否則您不得：(a) 對此「Preview」或其任何部分進行複製 (備份用途除外)、修改、改編、轉散佈、反向組譯、還原工程、解編或製作衍生成品；或是 (b) 將此「Preview」的任何部分載入至行動電話或個人電腦以外的任何其他硬體裝置、將此「Preview」的任何部分與其他軟體結合，或散佈包含此「Preview」之任一部分的任何軟體或裝置。
-
-3.5 對開放原始碼軟體授權下所授權之「Preview」的使用、複製及散佈，完全受該開放原始碼軟體授權的條款規範，而不受「授權合約」規範。您同意遵守從這類開放原始碼軟體授權獲得的所有權利，並且避免採取任何可能終止、中止或侵害這類權利的行為。
-
-3.6 您同意 Google 可在不事先通知您的情況下變更其所提供之「Preview」的形式和本質，且此「Preview」的未來版本可與在此「Preview」的先前版本上開發的應用程式不相容。您同意 Google 通常可全權斟酌永久或暫時停止提供此「Preview」(或此「Preview」的任何功能) 給您或使用者，毋須事先通知。
-
-3.7「授權協議」中的所有條款皆未授予您任何使用 Google 之商業名稱、商標、服務標章、標誌、網域名稱或其他明確品牌特徵的權利。
-
-3.8 您同意不會移除、遮蔽或更改可能附加至或內含在此「Preview」中的任何專利權通知 (包括著作權和商標通知)。
-
-4. 您對「Preview」的使用
-
-4.1 Google 同意在「授權協議」下，任何條款皆未從您 (或您的授權人) 賦予 Google 對您使用此「Preview」開發之任何軟體應用程式的任何權利及權益，包括存在於這些應用程式中的任何智慧財產權。
-
-4.2 您同意只就 (a)「授權協議」和 (b) 相關管轄權中任何適用法律、規定或是普遍獲得接受之慣例或指導方針 (包括任何有關將資料或軟體輸出或輸入美國或其他相關國家/地區的法律) 所允許的用途使用此「Preview」及撰寫應用程式。
-
-4.3 您同意如果使用此「Preview」開發應用程式，您將保護使用者的隱私權和法定權利。如果使用者提供您使用者名稱、密碼或是其他登入資訊或個人資訊，您必須告知使用者這類資訊將提供給您的應用程式使用，並且必須為這些使用者提供法定充分的隱私權通知和保護。如果您的應用程式會儲存使用者所提供的個人或敏感資訊，它必須確保這些資訊安全無虞。如果使用者提供 Google 帳戶資訊給您，則只有在每個使用者已授權您存取其 Google 帳戶並僅限用於使用者所授權之用途的情況下，您的應用程式才能使用該資訊來存取使用者的 Google 帳戶。
-
-4.4 您同意不會使用此「Preview」從事任何不當活動，例如開發或散佈會以未經授權的方式干擾、妨礙、損害或存取 Google 或任何第三方之伺服器、網路或是其他財產或服務的應用程式。
-
-4.5 您同意對您透過 Android 裝置和 (或) Android 應用程式建立、傳輸或顯示的任何資料、內容或資源，以及上述行為造成的後果 (包括 Google 可能蒙受的任何損失或損害) 負起全責 (而 Google 對您或任何第三方就上述一切不需負任何責任)。
-
-4.6 您同意對違反在此「授權協議」、任何適用之第三方合約或《服務條款》或是任何適用之法律或規定下所必須遵守的義務，以及違反相關義務造成的後果 (包括 Google 或任何第三方可能蒙受的任何損失或損害) 負起全責 (而 Google 對您或任何第三方就上述一切不需負任何責任)。
-
-4.7「Preview」目前正在開發中，因此您的測試與意見反應對開發程序非常重要。使用「Preview」，您即認同某些功能仍處於開發階段，因此您不應期待「Preview」擁有穩定版本的完整功能。在官方 Android SDK 發行之後，此「Preview」不再受到支援時，您同意不使用此「Preview」公開散佈或隨附任何應用程式。
-
-5. 您的開發人員認證
-
-5.1 您同意負責保密 Google 可能核發給您或您自己選擇的任何開發人員認證，並且對在您開發人員認證名義下開發的所有應用程式負起全責。
-
-6. 隱私權和資訊
-
-6.1 為了持續更新及改進此「Preview」，Google 可能會從軟體收集某些使用狀況統計數據，包括但不限於軟體的唯一識別碼、相關 IP 位址、版本號碼，以及有關使用此「Preview」中的哪些工具和 (或) 服務及其使用方式的相關資訊。在收集這類資訊之前，此「Preview」會先通知您並徵求您的同意。如果您不同意，Google 將不會收集這類資訊。
-
-6.2 Google 會彙總並檢查收集到的資料，據以改善此「Preview」，並且會依據《Google 隱私權政策》(http://www.google.com/policies/privacy/) 加以妥善保存。
-
-7. 第三方應用程式
-
-7.1 如果您使用此「Preview」來執行第三方開發的應用程式，或是執行會存取第三方所提供之資料、內容或資源的應用程式，您同意 Google 不需對這類應用程式、資料、內容或資源負任何責任。您了解您透過第三方應用程式存取的所有資料、內容或資源是由其提供者負起全責，而 Google 對您因使用或存取任何這些第三方應用程式、資料、內容或資源所造成的損失或損害不需負任何責任。7.2 您了解第三方應用程式提供給您的資料、內容或資源可能受到提供者 (或代表他們的其他人員或公司) 所擁有的智慧財產權保護。
-
-您不得根據這類資料、內容或資源 (不論是整個或部分) 修改、出租、出借、販售、散佈或製作衍生成品，除非相關擁有者明確授權您從事上述活動。7.3 您了解使用第三方應用程式、資料、內容或資源可能受到您與相關第三方之間的個別條款約束。
-
-
-
-8. 使用 Google API
-
-8.1 Google API
-
-8.1.1 如果您使用任何 API 從 Google 擷取資料，您瞭解這些資料可能受到 Google 或資料提供者 (或代表他們的其他人員或公司) 所擁有的智慧財產權保護。您對任何這類 API 的使用可能受到其他《服務條款》約束。除非相關《服務條款》明文允許，否則您不得根據這類資料 (不論是整個或部分) 修改、出租、出借、販售、散佈或製作衍生成品。8.1.2 使用任何 API 從 Google 擷取使用者的資料時，您了解並同意只有在該使用者明確同意且授權您擷取其資料，而且僅限用於使用者所授權之用途的情況下，您才能擷取資料。
-
-
-
-終止「授權協議」
-
-9.1 除非您或 Google 終止「授權協議」(請見下方說明)，否則「授權協議」將持續具有效力。
-
-9.2 如果想終止「授權協議」，只要停止使用此「Preview」及任何相關的開發人員憑證即可。
-
-9.3 Google 可隨時通知您終止「授權協議」，無論有無原因。
-
-9.4「授權協議」在先發生下列任一情況時，將自動終止而不另行通知或採取其他行動：
-(A) Google 決定不再提供此「Preview」或此「Preview」的特定部分給您所居住或使用此服務之國家/地區的使用者；或
-(B) Google 發行最終版本的 Android SDK。
-
-9.5 當「授權條款」終止時，您在「授權協議」所獲得的授權也將會一併終止，您將立即停止「Preview」的所有使用，而第 10、11、12 和 14 項的條款將無限期持續適用。
-
-10. 免責聲明
-
-10.1 您明確了解並同意完全自負使用此「Preview」的風險，並且此「Preview」是依「現況」和「可提供性」提供，Google 不負任何擔保責任。
-
-10.2 您對使用此「Preview」及透過此「Preview」以下載或其他方式取得的任何內容，需自行斟酌和自負風險，而且您對因這類使用而對您的電腦系統或其他裝置所造成的任何損害或資料遺失，需負起全責。不限於前述，您瞭解此「Preview」不是穩定的版本，可能會包含許多錯誤、瑕疵和安全性弱點而對您的電腦系統或其他裝置造成嚴重的損害，包括完全、不可回復的損失。
-
-10.3 Google 進一步明確聲明不提供任何形式的瑕疵擔保和條件 (不論明示或默示)，包括但不限於適售性、適合特定用途及未侵權的默示擔保和條件。
-
-11. 責任限制
-
-11.1 您明確瞭解並同意在任何歸責理論下，就可能由您引起的任何直接、間接、附隨性、特殊性、衍生性或懲罰性損害賠償 (包括任何資料遺失)，不論 Google 或其代表是否已獲告知或應已瞭解發生任何這類損失的可能性，Google、其子公司和關係企業及其授權人不必對您負起任何責任。
-
-12. 賠償
-
-12.1 在法律允許的最大範圍內，您同意為 Google、其子公司及其個別董監事、主管、員工和代理人，就任何和一切索賠、法律行動、訴訟或訴訟程序，以及因下列原因而引起的任何和一切損失、責任、損害賠償、費用及開支 (包括合理的律師費)，提供辯護、賠償損失並確保其免於承擔賠償責任：(a) 您使用此「Preview」；(b) 您使用此「Preview」開發的應用程式侵害任何人的任何智慧財產權，或是詆毀任何人或違反其公開權或隱私權；以及 (c) 您未遵守「授權協議」。
-
-13. 對「授權協議」做出的變更
-
-13.1 Google 可在散佈此「Preview」的新版本時修改「授權協議」。做出這類變更後，Google 會在提供此「Preview」的網站上提供「授權協議」的新版本。
-
-14. 一般法律條款
-
-14.1「授權協議」構成您與 Google 之間的法律協議，用於管制您對此「Preview」(不包括 Google 依據個別書面協議提供給您的任何服務) 的使用，並完全取代先前您與 Google 之間就此「Preview」簽署的相關協議。
-
-14.2 您同意如果 Google 未行使或執行「授權協議」所含的任何法律權利或救濟 (或在任何適用法律下對 Google 有利的權益)，並不代表 Google 正式放棄權利，Google 日後仍可行使這些權利或救濟。
-
-14.3 如果經任何法院 (就此事宜依管轄權決定) 裁決「授權協議」中有任何條款無效，則該條款將自「授權協議」中移除，「授權協議」的其餘部分則不受影響。「授權協議」的其餘條款將持續具有效力且可執行。
-
-14.4 您瞭解並同意 Google 旗下子公司體系的每位成員都是「授權協議」的第三方受益人，而且這類其他公司有權直接執行和依據「授權協議」中對其授予權益 (或對其有利之權利) 的任何條款。除此之外的任何其他人員或公司皆非「授權協議」的第三方受益人。
-
-14.5 出口限制。此「Preview」受美國出口法規約束。您必須遵守適用於此「Preview」的所有國內和國際出口法規。這些法律包括對目的地、使用者及最終用途的限制。
-
-14.6 未事先取得 Google 事先書面核准的情況下，您不得轉讓或轉移「授權協議」，未經這類核准的任何轉讓將會失效。您不得在未事先取得 Google 書面核准的情況下，委派其「授權協議」涵蓋的責任或義務。
-
-14.7「授權協議」以及您與 Google 就「授權協議」構成的關係皆受加州法律管轄，毋須理會其法律牴觸條款。您和 Google 同意服從位於加州聖塔克拉拉 (Santa Clara, California) 郡內法院的專屬管轄權，以解決由「授權協議」產生的任何法律事務。儘管如此，您同意 Google 仍可在任何管轄權中申請禁制令救濟 (或同等類型的緊急法定救濟)。
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">我已閱讀並同意上述條款和條件</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>此文件內容</h2>
- <ol>
- <li><a href="#device-preview">設定硬體裝置</a>
- <ol>
- <li><a href="#ota">取得隔空傳輸更新</a></li>
- <li><a href="#flash">手動刷新裝置</a></li>
- <li><a href="#revertDevice">解除安裝</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">設定模擬器</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- 如果要在新的平台上執行並測試您的應用程式，您需要設定 Android N 執行階段環境。您可以透過下列其中一種方式進行：
-
-</p>
-
-<ul>
- <li>在支援的硬體裝置上安裝 Android N，或</li>
- <li>設定執行 Android N 的 Android 模擬器</li>
-</ul>
-
-<p>
- 如果您想要有一個在新平台上為應用程式進行基本相容性測試的環境，您只需要最新的 APK 與一個硬體裝置或模擬器。執行基本測試並不需要更新整個開發環境。
-
-
-
-</p>
-
-<p>
- 如果您想要針對 Android N 修改應用程式或使用新的 Android N API，則需要設定已更新可支援 Android N 的開發環境。<a href="{@docRoot}preview/setup-sdk.html">設定以針對 Android N 開發</a>中提供詳細資訊。
-
-
-
-</p>
-
-
-<h2 id="device-preview">設定硬體裝置</h2>
-
-<p>
- 「N Developer Preview」為多種硬體裝置提供系統更新，您可以使用這些裝置 (從手機到平板電腦與電視) 來測試您的應用程式。
-
-</p>
-
-<p>
- 如果您使用支援的裝置，可以透過下列其中一個方式，將它更新到「Developer Preview」里程碑版本：
-
-</p>
-
-<ul>
- <li>透過 <a href="https://g.co/androidbeta">Android Beta 計劃</a><strong>在自動 OTA 系統更新中註冊裝置</strong>。註冊之後，您的裝置將會定期透過隔空傳輸 (OTA) 更新方式收到「N Developer Preview」中的所有里程碑版本。建議您使用這個方法，因為它讓您透過「N Developer Preview」的多個版本，順暢地從目前的環境轉移。
-
-
-
-</li>
- <li><strong>下載「Developer Preview」系統映像並更新裝置</strong>。當您手動更新時，不會自動為裝置提供 OTA 更新，但是您可以在「Android Beta 計劃」中註冊這些裝置來取得 OTA 更新。
-
- </li>
-</ul>
-
-<h3 id="ota">在自動 OTA 更新中註冊裝置</h3>
-
-<p>
- 如果您使用支援的裝置 (請參閱「下載」表中的清單)，可在 <a href="https://g.co/androidbeta">Android Beta 計劃</a>中註冊該裝置，然後接收 Android 預覽版的隔空傳輸更新。這些更新會自動下載並更新您的裝置，就像官方系統更新一樣。
-
-
-
-
-</p>
-
-<p>
- 您可以隨時取消註冊裝置。裝置會透過 OTA 更新方式接收提供給該裝置的最新 Android 生產版本 (例如 Android 6.0 Marshmallow)。更新要求重設整個裝置，所以裝置上的使用者資料會被移除。取消註冊裝置前，請務必<strong>備份重要資料</strong>。
-
-
-
-
-</p>
-
-<p>
- 如需註冊裝置的詳細資訊，請參閱 <a href="https://g.co/androidbeta">Android Beta 計劃</a>網站。
-
-</p>
-
-<p class="note"><strong>注意：</strong>取消註冊要求重設整個裝置。請先備份重要資料。
-
-
-</p>
-
-<h3 id="flash">手動更新裝置</h3>
-
-<p>
- 您可以隨時下載最新的「Developer Preview」系統映像並手動刷新到您的裝置。請參閱下表，下載適用於您測試裝置的系統映像。如果您需要確切控制測試環境或需要經常重新安裝 (例如自動化測試)，則手動更新裝置是實用的做法。
-
-
-
-
-</p>
-
-<!-- You can flash by ota or system image --><p>
- 在裝置上安裝系統映像會<strong>移除裝置中的所有資料</strong>，因此您應該先備份您的資料。
-
-</p>
-
-<p>
- 備份裝置資料並下載下面符合您裝置的系統映像之後，請依照 <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a> 的指示，將映像刷新到您的裝置。
-
-
-</p>
-
-<p>
- 手動刷新系統映像<strong>不會自動透過 OTA 更新方式收到</strong>較新的「Developer Preview」里程碑版本。請務必讓環境保持在最新狀態，使用每個「Developer Preview」里程碑的新系統映像進行刷新。
-
-
-
-</p>
-
-<p>
- 如果您決定手動更新裝置後要接收 OTA 更新，您唯一要做的事是在 <a href="https://g.co/androidbeta">Android Beta 計劃</a>中註冊裝置。您可以隨時註冊裝置，以隔空傳輸方式接收下一個「Preview」更新。
-
-
-
-</p>
-
-<table>
- <tr>
- <th scope="col">裝置</th>
- <th scope="col">下載 / 總和檢查碼</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)">bullhead-npc56p-preview-6c877a3d.tgz</a><br>
- MD5：b5cf874021023b398f5b983b24913f5d<br>
- SHA-1：6c877a3d9fae7ec8a1678448e325b77b7a7b143a
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)">shamu-npc56p-preview-54b13c67.tgz</a><br>
- MD5：af183638cf34e0eb944a1957d7696f60<br>
- SHA-1：54b13c6703d369cc79a8fd8728fe4103c6343973
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)">angler-npc56p-preview-85ffc1b1.tgz</a><br>
- MD5：bc4934ea7bd325753eee1606d3725a24<br>
- SHA-1：85ffc1b1be402b1b96f9ba10929e86bba6c6c588
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)">volantis-npc56p-preview-0e8ec8ef.tgz</a><br>
- MD5：c901334c6158351e945f188167ae56f4<br>
- SHA-1：0e8ec8ef98c7a8d4f58d15f90afc5176303efca4
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)">volantisg-npc56p-preview-1bafdbfb.tgz</a><br>
- MD5：7bb95bebc478d7257cccb4652899d1b4<br>
- SHA-1：1bafdbfb502e979a9fe4c257a379c4c7af8a3ae6
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)">fugu-npc56r-preview-7027d5b6.tgz</a><br>
- MD5：f5d3d8f75836ccfe4c70e8162e498be4<br>
- SHA-1：7027d5b662bceda4c80a91a0a14ef0e5a7ba795b
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)">ryu-npc56p-preview-335a86a4.tgz</a><br>
- MD5：4e21fb183bbbf467bee91598d587fd2e<br>
- SHA-1：335a86a435ee51f18464de343ad2e071c38f0e92
- </td>
- </tr>
- <tr id="seed">
- <td>一般行動裝置 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)">seed_l8150-npc56p-preview-82472ebc.tgz</a><br>
- MD5：983e083bc7cd0c4a2d39d6ebaa20202a<br>
- SHA-1：82472ebc9a6054a103f53cb400a1351913c95127
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">從裝置解除安裝 Preview</h3>
-
-<p>
- 如果您想要從裝置解除安裝預覽版，可以透過下列其中一方式執行：
- </p>
- <ul>
- <li><strong>取得出廠規格系統映像</strong>，然後手動刷新到裝置。
-
- <ul>
- <li>對於 <strong>Nexus 裝置與 Pixel C 裝置</strong>，請查看 <a href="http://developers.google.com/android/nexus/images">Nexus 裝置原廠映像檔</a>頁面進行下載。
-
- </li>
- <li>對於<strong>其他裝置</strong>，請直接聯絡裝置製造商。或者，如果是「Android Beta 計劃」中支援的裝置，則可以在這個計劃中註冊裝置，然後再取消註冊 (請參閱下面的資訊)。
-
-
-</li>
- </ul>
- </li>
- <li><strong>從「Android Beta 計劃」取消註冊裝置</strong>。如果在 <a href="https://g.co/androidbeta">Android Beta 計劃</a>中註冊裝置，則無論是什麼裝置，只需從這個計劃取消註冊即可。
-
-
- <p>
- 裝置會透過 OTA 更新方式接收提供給該裝置的最新 Android 生產版本 (例如 Android 6.0 Marshmallow)。更新要求重設整個裝置，所以裝置上的使用者資料會被移除。取消註冊裝置前，請務必<strong>備份重要資料</strong>。
-
-
-
-
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>注意：</strong>在計劃結束前解除安裝「Developer Preview」系統映像需要重設整個裝置，而且會移除裝置上的所有使用者資料。
-
-
-
-</p>
-
-
-<h2 id="setupAVD">設定模擬器</h2>
-
-<p>如果要使用 Android 模擬器來執行 Android N Preview，您需要下載 Android N Preview SDK 並為模擬器建立一個虛擬裝置。
-
-</p>
-
-<p>首先，遵循下列方式下載 Android N Preview SDK (如果您在<a href="{@docRoot}preview/setup-sdk.html">設定以針對 Android N 開發</a>時已經取得該 SDK，則可以略過這個部分)：
-
-
-
-<ol>
- <li>在 Android Studio 中，開啟 [Settings] 對話方塊 (在Windows/Linux 上是 [File] > [Settings]<strong></strong>，在 Mac 上是 [Android Studio] > [Preferences]<strong></strong>)。在左面板中，選取 [Appearance & Behavior] > [System Settings] > [Android SDK]<strong></strong>。
-
-
-
-
-
- <li>按一下 [SDK Platforms] 分頁，然後選取 [Android N Preview] 核取方塊。<strong></strong><strong></strong>
-</li>
-
- <li>按一下 [SDK Tools]<strong></strong> 分頁，然後選取 [Android SDK Build Tools]<strong></strong>、[Android SDK Platform-Tools]<strong></strong> 與 [Android SDK Tools]<strong></strong> 核取方塊。
-
-
-
- </li>
-
- <li>按一下 [OK]<strong></strong>，接受要安裝之任何套件的授權合約。
-
- </li>
-</ol>
-
-<p>您現在應該有 <strong>Android SDK Built-Tools 24.0 0 rc1</strong>、<strong>Platform-Tools 24.0.0 rc1</strong> 與 <strong>SDK Tools 25.0.9</strong>。如果您沒有將 SDK Tools 更新為 25.0.9，就無法執行 Android N 的 x86_64 系統映像。
-
-
-</p>
-
-
-<p>現在使用 Android N 系統映像建立一個虛擬裝置：</p>
-
-<ol>
- <li>選取 [Tools] > [Android] > [AVD Manager]<strong></strong> 以開啟 AVD Manager。
-</li>
- <li>按一下 [Create Virtual Device]<strong></strong>。</li>
- <li>選取裝置 (例如 Nexus 5X、Nexus 6P、Nexus 9 或 Android TV)，然後按一下 [Next]<strong></strong>。
-</li>
- <li>選取 [N]<strong></strong> 系統映像 (含 <strong>x86</strong> ABI)，然後按一下 [Next]<strong></strong> (Android N Preview 的 Android 模擬器目前只支援 x86 系統映像)。
-
-
-
- <li>完成其餘的 AVD 設定，然後按一下 [Finish]<strong></strong>。
-</li>
-</ol>
-
-<p>您現在可以使用 Android N Preview AVD 啟動 Android 模擬器。</p>
-
-<p>
-為了在 Android 模擬器中獲得最佳體驗，請安裝 Android Studio 2.1 Preview，它支援 <a href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0 Beta</a>，效能比 Android Studio 1.5 中的模擬器快。
-
-
-</p>
-
-<p class="note"><strong>注意：</strong>如果您目前使用 Android Studio 2.0 Beta，它已知會出現阻止您使用 N Preview 系統映像建立 AVD 的問題，所以您目前需要使用 Android Studio 2.1 預覽版來建立 AVD。
-
-
-
-</p>
-
-<p>如需建立虛擬裝置的詳細資訊，請參閱<a href="{@docRoot}tools/devices/index.html">管理虛擬裝置</a>。
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/background-optimization.jd b/docs/html-intl/intl/zh-tw/preview/features/background-optimization.jd
index d088381..123498b 100644
--- a/docs/html-intl/intl/zh-tw/preview/features/background-optimization.jd
+++ b/docs/html-intl/intl/zh-tw/preview/features/background-optimization.jd
@@ -88,7 +88,7 @@
</p>
<p>
- 在此文件中，我們將學習如何使用替代方法 (例如
+ 在此文件中，我們將學習如何使用替代方法 (例如
{@link android.app.job.JobScheduler}) 改寫您的應用程式以配合這些新的限制。
</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/direct-boot.jd b/docs/html-intl/intl/zh-tw/preview/features/direct-boot.jd
deleted file mode 100644
index a42ec11..0000000
--- a/docs/html-intl/intl/zh-tw/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,181 +0,0 @@
-page.title=直接開機
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>此文件內容</h2>
- <ol>
- <li><a href="#run">要求直接開機期間的執行權限</a></li>
- <li><a href="#access">存取裝置加密的儲存空間</a></li>
- <li><a href="#notification">接收使用者解鎖的通知</a></li>
- <li><a href="#migrating">遷移現有資料</a></li>
- <li><a href="#testing">測試您的加密感知應用程式</a></li>
- </ol>
-</div>
-</div>
-
-<p>Android N 會在一個安全的 <i>直接開機</i> 模式下執行，這是裝置已經開啟電源但使用者尚未解鎖裝置的期間。
-
-為了支援這種方式，系統為資料提供兩個儲存位置：</p>
-
-<ul>
-<li><i>認證加密的儲存空間</i>：這是預設的儲存位置，只有在使用者解鎖裝置之後才能使用。
-</li>
-<li><i>裝置加密的儲存空間</i>：這是「直接開機」模式期間與使用者解鎖裝置之後都可以使用的儲存位置。
-</li>
-</ul>
-
-<p>根據預設，應用程式不會在「直接開機」模式下執行。如果您的應用程式需要在「直接開機」模式期間執行動作，您可以註冊應該在此模式下執行的應用程式元件。
-
-需要在「直接開機」模式下執行的一些常見應用程式使用案例包括：
-</p>
-
-<ul>
-<li>已排程通知的應用程式，例如鬧鐘應用程式。
-</li>
-<li>提供重要使用者通知的應用程式，例如簡訊應用程式。</li>
-<li>提供協助工具服務的應用程式，例如 Talkback。</li>
-</ul>
-
-<p>如果您的應用程式需要在「直接開機」模式期間存取資料，請使用裝置加密的儲存空間。
-裝置加密的儲存空間包含以金鑰加密的資料，這個金錀只有在裝置執行成功的驗證開機之後才能使用。
-
-</p>
-
-<p>對於應該使用與使用者認證關聯之金鑰 (例如 PIN 或密碼) 加密的資料，請使用認證加密的儲存空間。認證加密的儲存空間只有在使用者成功解鎖裝置之後到使用者再次重新啟動裝置之間的時間可以使用。
-
-
-如果使用者在解鎖裝置之後啟用鎖定螢幕，並不會鎖定認證加密的儲存空間。
-
-</p>
-
-<h2 id="run">要求直接開機期間的執行權限</h2>
-
-<p>應用程式必須先向系統註冊其元件，這些元件才能在「直接開機」模式期間執行或存取裝置加密的儲存空間。
-
-向系統註冊的應用程式會將元件標記為
-<i>加密感知</i>。如果要將元件標記為加密感知，請將宣示說明中的
-<code>android:encryptionAware</code> 屬性設定為 true。<p>
-
-<p>當裝置重新啟動時，加密感知元件可以註冊為從系統接收
-<code>LOCKED_BOOT_COMPLETED</code> 廣播訊息。
-這個時候可以使用裝置加密的儲存空間，而且您的元件可以執行在「直接開機」模式期間需要執行的工作，例如觸發排程的鬧鐘。
-
-</p>
-
-<p>下列程式碼片段是一個範例，示範如何在應用程式宣示說明中將
-{@link android.content.BroadcastReceiver} 註冊為加密感知以及如何為
-<code>LOCKED_BOOT_COMPLETED</code> 新增意圖篩選器：</p>
-
-<pre>
-<receiever
- android:encryptionAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>一旦使用者將裝置解鎖，所有元件都可存取裝置加密的儲存空間與認證加密的儲存空間。
-</p>
-
-<h2 id="access">存取裝置加密的儲存空間</h2>
-
-<p>如果要存取裝置加密的儲存空間，請透過呼叫
-<code>Context.createDeviceEncryptedStorageContext()</code> 以建立第二個
-{@link android.content.Context} 實例。使用此內容建立的所有儲存 API 呼叫都可以存取裝置加密的儲存空間。
-下列範例會存取裝置加密的儲存空間並開啟現有的應用程式資料檔案：
-
-</p>
-
-<pre>
-Context directBootContext = Context.createDeviceEncryptedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>只針對必須在「直接開機」模式期間存取的資訊使用裝置加密的儲存空間。不要將裝置加密的儲存空間做為一般用途的加密存放區。對於私密使用者資訊或「直接開機」模式期間不需要的加密資料，請使用認證加密的儲存空間。
-
-
-
-</p>
-
-<h2 id="notification">接收使用者解鎖的通知</h2>
-
-<p>裝置重新啟動之後，一旦使用者將裝置解鎖，您的應用程式就可以切換為存取認證加密的儲存空間，並使用倚賴使用者認證的一般系統服務。
-
-</p>
-
-<p>如果要接收裝置重新開機後使用者解鎖裝置的通知，請從執行中元件註冊 {@link android.content.BroadcastReceiver} 以接聽 <code>ACTION_USER_UNLOCKED</code> 訊息。
-
-或者，您可以接收現有的 {@link android.content.Intent#ACTION_BOOT_COMPLETED
-ACTION_BOOT_COMPLETED} 訊息，它現在可以指出裝置已開機且使用者已解鎖裝置。
-
-</p>
-
-<p>您可以透過呼叫
-<code>UserManager.isUserUnlocked()</code>，以直接查詢使用者是否已將裝置解鎖。</p>
-
-<h2 id="migrating">遷移現有資料</h2>
-
-<p>如果使用者更新其裝置來使用「直接開機」模式，您可能有現有的資料必須遷移到裝置加密的儲存空間。
-使用
-<code>Context.migrateSharedPreferencesFrom()</code> 與
-<code>Context.migrateDatabaseFrom()</code>，在認證加密的儲存空間與裝置加密的儲存空間之間遷移偏好設定與資料庫資料。
-</p>
-
-<p>決定要將哪些資料從認證加密的儲存空間遷移到裝置加密的儲存空間時，請使用最佳判斷。
-您不應該將私密使用者資訊 (例如密碼或授權權杖) 遷移到裝置加密的儲存空間。
-
-在某些情況下，您需要在這兩種加密的存放區中管理不同的資料集。
-</p>
-
-<h2 id="testing">測試您的加密感知應用程式</h2>
-
-<p>使用新的「直接開機」模式測試您的加密感知應用程式。您可以透過兩種方式啟用「直接開機」。
-</p>
-
-<p class="caution"><strong>注意：</strong>啟用「直接開機」會清除裝置上的所有使用者資料。
-</p>
-
-<p>在已安裝 Android N 的支援裝置上，執行下列其中一個動作來啟用「直接開機」：
-</p>
-
-<ul>
-<li>在裝置上，請移至 [設定] > [關於手機]<b></b>，然後點選 [Android 版本]<b></b> 7 次以啟用 [開發人員選項]<b></b> (如果尚未啟用)。
-
-當開發人員選項畫面可用時，請移至 [設定] > [開發人員選項]<b></b>，然後選取 [轉換到檔案加密]<b></b>。
-
-</li>
-<li>使用下列 adb shell 命令來啟用「直接開機」模式：
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>另外也提供模擬的「直接開機」模式，如果您需要在測試裝置上切換模式時即可利用。
-模擬模式應該只在開發期間使用，而且它可能造成資料遺失。
-如果要啟用模擬的「直接開機」模式，請在裝置上設定鎖定模式；設定鎖定模式時如果系統提示您設定安全啟動畫面，請選擇 [No thanks]，然後使用下列 adb shell 命令：
-
-
-</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>如果要關閉模擬的「直接開機」模式，請使用下列命令：</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>使用這些命令會使得裝置重新開機。</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/multi-window.jd b/docs/html-intl/intl/zh-tw/preview/features/multi-window.jd
deleted file mode 100644
index 788951c..0000000
--- a/docs/html-intl/intl/zh-tw/preview/features/multi-window.jd
+++ /dev/null
@@ -1,582 +0,0 @@
-page.title=多視窗支援
-page.metaDescription=Android N 新推出支援一次顯示多個應用程式。
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>此文件內容</h2>
- <ol>
- <li><a href="#overview">總覽</a></li>
- <li><a href="#lifecycle">多視窗生命週期</a></li>
- <li><a href="#configuring">針對多視窗模式設定應用程式
-</a></li>
- <li><a href="#running">在多視窗模式中執行應用程式</a></li>
- <li><a href="#testing">測試應用程式的多視窗支援</a></li>
- </ol>
- <h2>另請參閱</h2>
- <ol>
- <li><a class="external-link" href="https://github.com/googlesamples/android-MultiWindowPlayground">多視窗 Playground 範例應用程式
-</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N 新增一次顯示多個應用程式的支援。
-在手持式裝置上，兩個應用程式可以在「分割畫面」模式中並排或上下排列。
-<em></em>在電視裝置上，應用程式能使用「子母畫面」模式，在使用者與另一個應用程式互動時持續播放影片。
-<em></em>
-
-</p>
-
-<p>
- 如使用 N Preview SDK 建置應用程式，您可以設定應用程式處理多視窗顯示的方式。
-例如，您可以指定活動的最小可允許尺寸。
-您也可以停用應用程式的多視窗顯示，確保系統只會以全螢幕模式顯示您的應用程式。
-
-
-</p>
-
-<h2 id="overview">總覽</h2>
-
-<p>
- Android N 允許多個應用程式同時分享螢幕。例如，使用者可以分割畫面，在左邊檢視網頁，同時在右邊撰寫電子郵件。
-
-使用者體驗依裝置而異：
-
-</p>
-
-<ul>
- <li>執行 Android N 的手持式裝置可提供分割畫面模式。
-處於此模式時，系統會以並排或上下排列的方式顯示兩個應用程式，將螢幕填滿。
-使用者可以拖曳將畫面一分為二的分隔線，加大一邊的應用程式，就會縮小另一邊。
-
- </li>
-
- <li>在執行 Android N 的 Nexus Player 上，當使用者瀏覽其他應用程式或與其互動時，應用程式會將本身放入<a href="picture-in-picture.html">子母畫面模式</a>以持續顯示內容。
-
-
-
- </li>
-
- <li>較大型裝置的製造商可選擇啟用自由形式模式，讓使用者自由調整每個活動的大小。
-若製造商啟用此功能，裝置除了分割畫面模式外，還會提供自由形式模式。
-
-
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
-<p class="img-caption">
- <strong>圖 1.</strong> 在分割畫面模式中並排執行的兩個應用程式。
-</p>
-
-<p>
- 使用者可以透過下列方式來切換多視窗模式：
-</p>
-
-<ul>
- <li>如果使用者開啟<a href="{@docRoot}guide/components/recents.html">總覽畫面</a>並長按活動標題，就可以將該標題拖曳到畫面醒目提示的部分，將活動放入多視窗模式。
-
-
-
- </li>
-
- <li>如果使用者長按「總覽」按鈕，裝置會將目前的活動放入多視窗模式，並開啟總覽畫面，讓使用者選擇要分享螢幕的另一個活動。
-
-
- </li>
-</ul>
-
-<p>
- 使用者可以在活動分享螢幕時，將一個活動中的資料<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>到另一個活動。
-
-(之前，使用者只能在單一活動內拖放資料)。
-
-</p>
-
-<h2 id="lifecycle">多視窗生命週期</h2>
-
-<p>
- 多視窗模式不會變更<a href="{@docRoot}training/basics/activity-lifecycle/index.html">活動生命週期</a>。
-
-</p>
-
-<p>
- 在多視窗模式中，特定時間只有最近與使用者互動的活動才會處於使用中。
-這會視為「最上層」活動。<em></em>
- 即使能看到所有其他活動，但也處於暫停狀態。
- 然而，相較於看不到的活動，系統會給予這類暫停但可看見的活動較高的優先順序。
-若使用者改與其中一個暫停的活動互動，該活動就會恢復，使先前的最上層活動變成暫停。
-
-
-</p>
-
-<p class="note">
- <strong>注意：</strong>在多視窗模式中，使用者仍能見到處於暫停狀態的應用程式。
-即使處於暫停，應用程式仍需要進行其活動。
-例如，處於暫停模式但仍可以看見的影片播放應用程式，應會持續顯示其影片。
-因此，建議您在播放影片的活動 {@link android.app.Activity#onPause onPause()} 處理常式中，「不要」暫停影片。
-<em></em>
-
- 應該改為在 {@link android.app.Activity#onStop
- onStop()}, and resume playback in {@link android.app.Activity#onStart
- onStart()} 中暫停影片。
-</p>
-
-<p>
- 當使用者將應用程式放入多視窗模式時，系統會通知活動發生設定變更，如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>所指定。
-
-基本上，此變更的活動生命週期和系統通知應用程式，裝置從垂直模式切換為水平模式時的生命週期相當，差別在於裝置尺寸會改變，而不只是切換。
-
-
-如<a href="{@docRoot}guide/topics/resources/runtime-changes.html">處理執行階段變更</a>中所述，您的活動能自行處理設定變更，或會允許系統終結活動並以新的尺寸重新建立。
-
-
-
-</p>
-
-<p>
- 如果使用者調整視窗大小並加大長或寬的尺寸，系統會根據使用者動作來調整活動大小，並視需要發出<a href="{@docRoot}guide/topics/resources/runtime-changes.html">執行階段變更</a>。
-
-若應用程式在新公開的區域中繪製發生延遲，系統會暫時使用 {@link
- android.R.attr#windowBackground windowBackground} 所指定的色彩或預設的
- <code>windowBackgroundFallback</code> 樣式屬性，填滿那些區域。
-
-</p>
-
-<h2 id="configuring">針對多視窗模式設定應用程式</h2>
-
-<p>
- 您的應用程式若以 Android N 為目標，您可以設定應用程式的活動是否支援多視窗顯示以及支援的方式。
-您可以在宣示說明中設定屬性，同時控制大小與版面配置。
-
- 根活動的屬性設定會套用到它工作堆疊內的所有活動。
-
-</p>
-
-<p class="note">
- <strong>注意：</strong>如果您使用 Android N 以下的 SDK 版本建置多螢幕方向應用程式，而且使用者會在多視窗模式中使用該應用程式，系統會強制調整應用程式大小。
-
-系統會顯示對話方塊向使用者警告應用程式行為異常。
-系統「不會」調整螢幕方向固定的應用程式大小，如使用者嘗試在多視窗模式下開啟螢幕方向固定的應用程式，應用程式會佔滿整個螢幕。
-<em></em>
-
-
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- 在宣示說明的 <code><activity></code> 或
- <code><application></code> 節點中，設定此屬性以啟用或停用多視窗顯示：
-
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- 如將此屬性設定為 true，就能以分割畫面和自由形式模式來啟動活動。
-如將屬性設定為 false，活動會不支援多視窗模式。
-如果此值為 false，而使用者嘗試以多視窗模式啟動活動，該活動會佔滿整個螢幕。
-
-
-</p>
-
-<p>
- 您的應用程式如以 Android N 為目標，但您並未指定此屬性的值，屬性的預設值為 true。
-
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- 在宣示說明的 <code><activity></code> 節點中，設定此屬性以指出活動是否支援子母畫面顯示：
-如果 <code>android:resizeableActivity</code> 為 false，則會忽略此屬性。
-
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">版面配置屬性</h3>
-
-<p>
- 使用 Android N，<code><layout></code> 宣示說明元素支援的數個屬性會影響多視窗模式中的活動行為。
-
-
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- 以自由形式模式啟動活動時的預設寬度。
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- 以自由形式模式啟動活動時的預設高度。
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- 以自由形式模式啟動活動時的初始放置位置。請參閱
- {@link android.view.Gravity} 參考資料以查看適當的值。
- </dd>
-
- <dt>
- <code>android:minimalSize</code>
- </dt>
-
- <dd>
- 在分割畫面與自由形式模式中，活動的最小高度與最小寬度。
-如果使用者在分割畫面模式中移動分隔，而使活動小於指定的最小值，系統會將活動裁剪為使用者要求的大小。
-
-
- </dd>
-</dl>
-
-<p>
- 例如，在自由形式模式中顯示活動時，下列程式碼顯示如何指定活動的預設大小與位置以及它的最小大小：
-
-
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minimalSize="450dp" />
-</activity>
-</pre>
-
-<h2 id="running">在多視窗模式中執行應用程式</h2>
-
-<p>
- Android N 提供的新功能支援在多視窗模式中執行應用程式。
-
-</p>
-
-<h3 id="disabled-features">可在多視窗模式中停用的功能</h3>
-
-<p>
- 當裝置處於多視窗模式時，有些功能無法用於會與其他活動或應用程式分享裝置螢幕的活動，因此會加以停用或忽略。
-
-這類功能包括：
-
-<ul>
- <li>有些<a href="{@docRoot}training/system-ui/index.html">系統 UI</a>
- 自訂選項會停用。例如，不以全螢幕模式執行就無法隱藏狀態列的應用程式。
-
- </li>
-
- <li>系統會忽略對 <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code> 屬性的變更。
- </li>
-</ul>
-
-<h3 id="change-notification">多視窗變更通知與查詢</h3>
-
-<p>
- 已將下列可支援多視窗顯示的新方法新增至 {@link android.app.Activity}
- 類別。如需每個方法的詳細資訊，請參閱
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 參考資料</a>。
-</p>
-
-<dl>
- <dt>
- <code>Activity.inMultiWindow()</code>
- </dt>
-
- <dd>
- 呼叫即可知道活動是否處於多視窗模式。
- </dd>
-
- <dt>
- <code>Activity.inPictureInPicture()</code>
- </dt>
-
- <dd>
- 呼叫即可知道活動是否處於子母畫面模式。
-
- <p class="note">
- <strong>注意：</strong>子母畫面模式為多視窗模式的特殊情況。
-如果 <code>myActivity.inPictureInPicture()</code>
- 傳回 true，那麼 <code>myActivity.inMultiWindow()</code> 也會傳回 true。
-
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowChanged()</code>
- </dt>
-
- <dd>
- 每當活動進入或離開多視窗模式，系統就會呼叫這個方法。
-如果活動正在進入多視窗模式，系統會將 true 的值傳遞給方法，若活動正要離開多視窗模式，則會傳遞 false。
-
-
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureChanged()</code>
- </dt>
-
- <dd>
- 每當活動進入或離開子母畫面模式，系統就會呼叫這個方法。
-如果活動正在進入子母畫面模式，系統會將 true 的值傳遞給方法，若活動正要離開子母畫面模式，則會傳遞 false。
-
-
- </dd>
-</dl>
-
-<p>
- 上述的每一個方法也都有 {@link android.app.Fragment} 版本，例如
- <code>Fragment.inMultiWindow()</code>。
-</p>
-
-<h3 id="entering-pip">進入子母畫面模式</h3>
-
-<p>
- 呼叫新方法
- <code>Activity.enterPictureInPicture()</code>，即可將活動放入子母畫面模式。如果裝置不支援子母畫面模式，這個方法就沒有作用。
-如需詳細資訊，請參閱<a href="picture-in-picture.html">子母畫面</a>文件。
-
-</p>
-
-<h3 id="launch">在多視窗模式中啟動新活動</h3>
-
-<p>
- 當您啟動新活動，可以提示系統應儘可能在目前活動的旁邊顯示新的活動。
-如要這樣做，請使用旗標
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>。
-傳遞此旗標會要求下列行為：
-
-</p>
-
-<ul>
- <li>如果裝置處於分割畫面模式中，系統會嘗試在啟動新活動的活動旁邊建立該活動，讓兩個活動分享螢幕。
-
-系統不保證一定能這樣做，但會儘可能讓活動相鄰。
-
- </li>
-
- <li>如果裝置未處於分割畫面模式，這個旗標就沒有作用。
- </li>
-</ul>
-
-<p>
- 如果裝置處於自由形式模式，而您正在啟動新的活動，您可以呼叫
- <code>ActivityOptions.setLaunchBounds()</code>，指定新活動的尺寸與畫面位置。
-如果裝置未處於多視窗模式，這個方法就沒有作用。
-
-</p>
-
-<p class="note">
- <strong>注意：</strong>如果您在工作堆疊內啟動活動，該活動就會取代畫面上的活動，繼承它的所有多視窗屬性。
-
-如果您想要在多視窗模式中，以個別的視窗啟動活動，您必須在新的工作堆疊中啟動該活動。
-
-</p>
-
-<h3 id="dnd">支援拖放功能</h3>
-
-<p>
- 使用者可以在兩個活動分享螢幕時，將一個活動中的資料<a href="{@docRoot}guide/topics/ui/drag-drop.html">拖放</a>到另一個活動。
-
-(之前，使用者只能在單一活動內拖放資料)。
-因此，若您的應用程式目前不支援拖曳功能，建議您將該功能新增至應用程式。
-
-</p>
-
-<p>
- N Preview SDK 擴充 <a href="{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- 套件，支援跨應用程式的拖放功能。如需下列類別與方法的詳細資訊，請參閱 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK 參考資料</a>。
-
-
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- 語彙基元物件負責指定權限，授予給放下接收者應用程式。
-
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- {@link android.view.View#startDrag View.startDrag()} 的新別名。傳遞新旗標
- <code>View.DRAG_FLAG_GLOBAL</code>，就可以啟用跨活動的拖放功能。
-如果您需要將 URI 權限授予接收者活動，請視需要傳遞新旗標
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> 或
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>。
-
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- 取消目前進行中的拖曳操作。只能由產生拖曳操作的應用程式呼叫。
-
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- 取代目前所進行拖曳操作的拖曳陰影。只能由產生拖曳操作的應用程式呼叫。
-
- </dd>
-
- <dt>
- <code>Activity.requestDropPermissions()</code>
- </dt>
-
- <dd>
- 針對利用 {@link android.view.DragEvent} 中包含的 {@link
- android.content.ClipData} 傳遞的內容 URI，要求權限。
- </dd>
-</dl>
-
-<h2 id="testing">測試應用程式的多視窗支援</h2>
-
-<p>
- 不論您是否針對 Android N 更新您的應用程式，都應該確認應用程式在多視窗模式中的行為為何，以免使用者試圖在執行 Android N 的裝置上以多視窗模式啟動應用程式。
-
-
-</p>
-
-<h3 id="configuring">設定測試裝置</h3>
-
-<p>
- 如果您在裝置上安裝 Android N，即自動支援分割畫面模式。
-
-</p>
-
-<h3 id="test-non-n">應用程式若非以 N Preview SDK 建置</h3>
-
-<p>
- 若您並非以 N Preview SDK 建置應用程式，而且使用者會試圖在多視窗模式中使用該應用程式，除非應用程式宣告螢幕方向固定，否則系統會強制調整應用程式大小。
-
-
-</p>
-
-<p>
- 若您的應用程式並未宣告螢幕方向固定，您應該在執行 Android N 的裝置上啟動應用程式，並嘗試將應用程式放入分割畫面模式。
-
-確認強制調整應用程式大小時的使用者體驗可以接受。
-
-</p>
-
-<p>
- 若您的應用程式宣告螢幕方向固定，您應該嘗試將應用程式放入多視窗模式。
-確認您這樣做時，應用程式依然會處於全螢幕模式。
-
-</p>
-
-<h3 id="test-mw">若您支援多視窗模式</h3>
-
-<p>
- 如果您以 N Preview SDK 建置應用程式且未停用多視窗支援，請在分割畫面與自由形式模式下，確認下列行為：
-
-
-</p>
-
-<ul>
- <li>以全螢幕模式啟動應用程式，然後長按 [總覽] 按鈕以切換到多視窗模式。
-確認應用程式可以正確切換。
- </li>
-
- <li>以多視窗模式直接啟動應用程式，並確認應用程式可以正確啟動。
-您可以按下 [總覽] 按鈕，然後長按應用程式的標題欄，再拖曳到螢幕上其中一個醒目提示的區域，即可以多視窗模式啟動應用程式。
-
-
- </li>
-
- <li>在分割畫面模式中拖曳分隔線調整應用程式的大小。
- 確認可以調整應用程式大小而不會當機，同時可以看見必要的 UI 元素。
-
- </li>
-
- <li>如果您已指定應用程式的最小尺寸，請嘗試將應用程式的大小調整到低於指定的尺寸。
-確認您無法將應用程式的大小調整到小於指定的最小值。
-
- </li>
-
- <li>經由所有測試確認應用程式的效能可以接受。例如，確認在調整應用程式大小之後，不會遲遲不更新 UI。
-
-
- </li>
-</ul>
-
-<h4 id="test-checklist">測試檢查清單</h4>
-
-<p>
- 若要確認應用程式在多視窗模式中的效能，請嘗試下列操作。
-除非另外註明，否則您應該在分割畫面與多視窗模式中嘗試這些操作。
-
-</p>
-
-<ul>
- <li>進入和離開多視窗模式。
- </li>
-
- <li>從您的應用程式切換到另一個應用程式，並確認當應用程式不在使用中但可看見時，能正常運作。
-例如，如果是播放影片的應用程式，請確認當使用者與另一個應用程式互動時，影片會持續播放。
-
-
- </li>
-
- <li>在分割畫面模式中，嘗試移動分隔列以加大和縮小應用程式。
-在並排與上下排列設定都要嘗試這些操作。
-確認應用程式不會當機，可以看見基本功能，而且不會花太長的時間完成調整大小操作。
-
-
- </li>
-
- <li>快速連續執行數次調整大小操作。確認應用程式不會因此當機或流失記憶體。
-如需檢查應用程式記憶體使用量的詳細資訊，請參閱<a href="{@docRoot}tools/debugging/debugging-memory.html">調查 RAM 使用狀況</a>。
-
-
- </li>
-
- <li>以數個不同的視窗設定正常使用您的應用程式，並確認應用程式都能正常運作。
-確認文字可以閱讀，而且 UI 元素不會太小而無法與之互動。
-
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">若已停用多視窗支援</h3>
-
-<p>
- 若您已設定
- <code>android:resizableActivity="false"</code> 來停用多視窗支援，您應該在執行 Android N 的裝置上啟動應用程式，並嘗試將應用程式放入自由形式與分割畫面模式。
-
-確認您這樣做時，應用程式依然會處於全螢幕模式。
-
-</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/picture-in-picture.jd b/docs/html-intl/intl/zh-tw/preview/features/picture-in-picture.jd
deleted file mode 100644
index b0ee8b8..0000000
--- a/docs/html-intl/intl/zh-tw/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=子母畫面
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>此文件內容</h2>
-<ol>
- <li><a href="#declaring">宣告您的活動支援子母畫面</a>
-</li>
- <li><a href="#pip_button">將您的活動切換到子母畫面</a>
-</li>
- <li><a href="#handling_ui">處理子母畫面模式中的 UI</a>
-</li>
- <li><a href="#continuing_playback">在子母畫面模式中繼續播放影片</a>
-</li>
- <li><a href="#best">最佳做法</a></li>
-</ol>
-
-<h2>另請參閱</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">多視窗支援</a>
-</li>
-</ol>
-
-</div>
-</div>
-
-<p>在 Android N 中，Android TV 使用者現在可以在應用程式內瀏覽時，同時觀賞螢幕角色中釘選視窗中的影片。
-
-子母畫面 (PIP) 模式讓應用程式在釘選視窗中執行影片活動，同時讓另一個活動在背景持續進行。
-
-PIP 視窗讓使用者在使用您的應用程式時同時多工處理，協助提高使用者的生產力。
-</p>
-
-<p>您的應用程式可決定何時觸發 PIP 模式。以下是一些何時進入 PIP 模式的範例：
-</p>
-
-<ul>
-<li>當使用者從影片返回瀏覽其他內容，您的應用程式可以將影片移入 PIP 模式。
-</li>
-<li>當使用者觀看到影片內容的結尾時，您的應用程式可將影片切換到 PIP 模式。
-主畫面顯示系列中下一集的預告或摘要資訊時。
-</li>
-<li>您的應用程式可以為使用者提供一個觀賞影片時佇列其他內容的方式。
-當主畫面顯示內容選擇活動時，影片繼續在 PIP 模式中播放。
-</li>
-</ul>
-
-<p>PIP 視窗為 240x135 dp，在系統所選的螢幕上四個角落之一的最上層顯示。
-使用者只要按住遙控器上的 <b>Home</b> 按鈕，即可帶出 PIP 選單，讓他們將 PIP 視窗切換成全螢幕或關閉 PIP 視窗。
-
-如果另一個影片開始在主畫面上播放，會自動關閉 PIP 視窗。
-
-使用者也可以透過 Recents 關閉 PIP 視窗。</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>圖 1.</strong> 當使用者瀏覽主畫面上的內容時，可看到螢幕角落的子母畫面中的影片。
-
-</p>
-
-<p>PIP 利用 Android N 中提供的多視窗 API 來提供釘選影片疊加層視窗。
-若要將 PIP 新增到您的應用程式，您需要註冊支援 PIP 的活動，在需要時將活動切換到 PIP 模式，以及確定活動在 PIP 模式時會隱藏 UI 元素且影片繼續播放。
-
-
-</p>
-
-<h2 id="declaring">宣告您的活動支援子母畫面</h2>
-
-<p>根據預設，系統不會自動為應用程式支援 PIP。如果您想要應用程式 PIP，請將
-<code>android:supportsPictureInPicture</code> 和
-<code>android:resizeableActivity</code> 設定成 <code>true</code>，在宣示說明中註冊影片活動。
-
-另外也請指定您的活動處理版面配置設定變更，如此一來，在 PIP 模式轉換期間版面配置變更時，才不會重新啟動您的活動。
-
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>註冊您的活動時，請記住在 PIP 模式中，您的活動會顯示在電視螢幕上小的疊加層視窗中。
-顯示最少 UI 的影片播放活動可提供最佳的使用者體驗。
-包含小型 UI 元素的活動在切換到 PIP 模式時無法提供出色的使用者體驗，因為使用者在 PIP 視窗中看不到 UI 元素的詳細資訊。
-
-
-</p>
-
-<h2 id="pip_button">將您的活動切換到子母畫面</h2>
-
-您需要將活動切換到 PIP 模式時，請呼叫
-<code>Activity.enterPictureInPicture()</code>。下列範例會在使用者選取媒體控制列上的專用 PIP 按鈕時切換到 PIP 模式：
-
-</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPicture();
- return;
- }
- ...
-</pre>
-
-<p>將 PIP 按鈕新增到媒體控制列，可讓您的使用者在控制影片播放時輕鬆地切換到 PIP 模式。
-</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>圖 1.</strong> 媒體控制列上的子母畫面按鈕。
-</p>
-
-<p>Android N 包含新的
-<code>PlaybackControlsRow.PictureInPictureAction</code> 類別，它可定義控制列 PIP 動作和使用 PIP 圖示。
-</p>
-
-<h2 id="handling_ui">處理子母畫面模式中的 UI</h2>
-
-<p>當您的活動進入 PIP 模式時，您的活動應該只播放影片。
-在您的活動進入 PIP 時移除 UI 元素，並在您的活動重新進入全螢幕時還原這些元素。覆寫 <code>Activity.onPictureInPictureChanged()</code> 或
-<code>Fragment.onPictureInPictureChanged()</code> 並依需要啟用或停用 UI 元素，例如：
-
-
-</p>
-
-<pre>
-@Override
-public void onPictureInPictureChanged(boolean inPictureInPicture) {
- if (inPictureInPicture) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">在子母畫面模式中繼續播放影片
-</h2>
-
-<p>當您的活動切換到 PIP 時，系統會將活動視為暫停狀態並呼叫您活動的 <code>onPause()</code> 方法。
-影片播放不應該暫停，而且活動因為 PIP 模式而暫停時，影片應該繼續播放。
-
-查看您活動的
-<code>onPause()</code> 方法中的 PIP 並適當地處理播放，例如：
-</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called due to PIP, do not pause playback
- if (inPictureInPicture()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>當您的活動從 PIP 模式切換回全螢幕模式時，系統會繼續您的活動並呼叫您的 <code>onResume()</code>方法。
-</p>
-
-<h2 id="best">最佳做法</h2>
-
-<p>PIP 主要針對播放全螢幕影片的活動。將您的活動切換到 PIP 模式時，避免顯示影片內容以外的任何項目。追蹤當您的活動進入 PIP 模式時隱藏 UI 元素，如<a href="#handling_ui">處理子母畫面模式中的 UI</a> 中所述。
-
-
-</p>
-
-<p>因為 PIP 視窗會在螢幕角落上以浮動視窗顯示，所以您應該避免在主畫面上 PIP 視窗可能遮蓋的任何地方顯示重要資訊。
-
-</p>
-
-<p>當活動處於 PIP 模式時，預設它不會取得輸入焦點。若要在處於 PIP 模式時接收輸入事件，請使用
-<code>MediaSession.setMediaButtonReceiver()</code>。
-</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/scoped-folder-access.jd b/docs/html-intl/intl/zh-tw/preview/features/scoped-folder-access.jd
deleted file mode 100644
index 0a530d2..0000000
--- a/docs/html-intl/intl/zh-tw/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,124 +0,0 @@
-page.title=限定範圍目錄存取
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>此文件內容</h2>
- <ol>
- <li><a href="#accessing">存取外部儲存空間目錄</a></li>
- <li><a href="#removable">存取抽取式媒體上的目錄</a></li>
- <li><a href="#best">最佳做法</a></li>
- </ol>
-</div>
-</div>
-
-<p>應用程式 (例如，相片應用程式) 通常只需要存取外部儲存空間中的特定目錄，例如 <code>Pictures</code> 目錄。
-目前用來存取外部儲存空間的方式並非設計來輕鬆地為這些類型的應用程式提供已設定目標的目錄存取。
-
-例如：</p>
-
-<ul>
-<li>在您的宣示說明中要求 {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} 或 {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} 可允許存取外部儲存空間ac上的所有公用目錄，但這可能超過您應用程式所需的存取權。
-
-
-</li>
-<li>使用<a href="{@docRoot}guide/topics/providers/document-provider.html">儲存空間存取架構</a>通常會使得您的使用者透過系統 UI 挑選目錄，這在您的應用程式一律存取相同外部目錄的情況下是不必要的。
-
-
-
-</li>
-</ul>
-
-<p>Android N 提供新的簡化 API，可用來存取常用外部儲存空間目錄。
- </p>
-
-<h2 id="accessing">存取外部儲存空間目錄</h2>
-
-<p>使用 <code>StorageManager</code> 類別來取得適當的 <code>StorageVolume</code> 實例。
-接著，透過呼叫該實例的 <code>StorageVolume.createAccessIntent()</code> 方法以建立意圖。使用此意圖來存取外部儲存空間目錄。
-
-若要取得所有可用的磁碟區 (包括抽取式媒體磁碟區) 清單，請使用 <code>StorageManager.getVolumesList()</code>。
-
-</p>
-
-<p>下列程式碼片段是一個範例，它說明如何開啟主要共用儲存空間中的 <code>Pictures</code> 目錄：
-</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>系統會嘗試授予對外部目錄的存取權，並在需要時使用簡化的 UI 向使用者確認存取權：
-</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png" srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>圖 1.</strong> 應用程式要求對 [圖片] 目錄的存取權。
-</p>
-
-<p>若使用者授予存取權，系統會呼叫您的 <code>onActivityResult()</code> 覆寫並傳回 <code>Activity.RESULT_OK</code> 的結果代碼，以及包含 URI 的意圖資料。
-
-使用提供的 URI 來存取目錄資訊，這類似於使用<a href="{@docRoot}guide/topics/providers/document-provider.html">儲存空間存取架構</a>所傳回的 URI。
-
-
-
-</p>
-
-<p>若使用者未授予存取權，系統會呼叫您的 <code>onActivityResult()</code> 覆寫並傳回 <code>Activity.RESULT_CANCELED</code> 的結果代碼，以及 Null 意圖資料。
-
-</p>
-
-<p class="note"><b>注意</b>：取得對特定外部目錄的存取權也會取得對該目錄之子目錄的存取權。
-</p>
-
-<h2 id="removable">存取抽取式媒體上的目錄</h2>
-
-<p>若要使用「限定範圍目錄存取」來存取抽取式媒體上的目錄，請先新增會接聽 {@link android.os.Environment#MEDIA_MOUNTED} 通知的 {@link android.content.BroadcastReceiver}，例如：
-
-</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>當使用者掛接抽取式媒體 (例如 SD 卡) 時，系統會傳送 {@link android.os.Environment#MEDIA_MOUNTED} 通知。
-此通知會在意圖資料中提供 <code>StorageVolume</code> 物件，讓您用來存取抽取式媒體上的目錄。
-
-下列範例會存取抽取式媒體上的 <code>Pictures</code> 目錄：
-</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">最佳做法</h2>
-
-<p>如果可能，請將外部目錄存取 URI 設定為持續性，這樣您就不需要重複地要求使用者授予存取權。
-一旦使用者授予存取權，請使用目錄存取 URI 呼叫 <code>getContentResolver().takePersistableUriPermssion()</code>。
-
-系統會將該 URI 設定為持續性，而且後續存取要求將會傳回 <code>RESULT_OK</code>，而且不會為使用者顯示確認 UI。
-
-</p>
-
-<p>若使用者拒絕對外部目錄的存取權，請勿立刻又要求存取權。
-重複堅持取得存取權會導致極差的使用者體驗。
-</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/security-config.jd b/docs/html-intl/intl/zh-tw/preview/features/security-config.jd
deleted file mode 100644
index 4fe8d0d..0000000
--- a/docs/html-intl/intl/zh-tw/preview/features/security-config.jd
+++ /dev/null
@@ -1,745 +0,0 @@
-page.title=網路安全性設定
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>此文件內容</h2>
-<ol>
- <li><a href="#manifest">新增安全性設定檔</a></li>
- <li><a href="#CustomTrust">自訂信任的 CA</a>
- <ol>
- <li><a href="#ConfigCustom">設定信任的自訂 CA</a></li>
- <li><a href="#LimitingCas">限制信任的 CA 組</a></li>
- <li><a href="#TrustingAdditionalCas">信任其他 CA</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">僅偵錯 CA</a></li>
- <li><a href="#UsesCleartextTraffic">退出明碼流量</a></li>
- <li><a href="#CertificatePinning">關聯憑證</a></li>
- <li><a href="#ConfigInheritance">設定繼承行為</a></li>
- <li><a href="#FileFormat">設定檔案格式</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N 包括網路安全性設定功能，讓應用程式在安全的宣告式設定檔中即可自訂網路安全性設定，而不必修改應用程式的程式碼。
-
-這些設定可以針對特定網域以及針對特定應用程式來設定。
-此功能的主要能力如下：
-
-</p>
-
-<ul>
- <li>
- <b>自訂信任錨點：</b>為應用程式的安全連線自訂信任的憑證授權單位 (CA)。
-例如，信任特定的自我簽署憑證，或限制應用程式信任的一組公用 CA。
-
-
- </li>
-
- <li>
- <b>僅偵錯覆寫：</b>在應用程式中安全地為安全連線進行偵錯，而不會增加已安裝應用程式者的風險。
-
- </li>
-
- <li>
- <b>退出明碼流量：</b>保護應用程式不受意外使用明碼流量危害。
-
- </li>
-
- <li>
- <b>憑證關聯：</b>限制應用程式的安全連線只用特定憑證。
-
- </li>
-</ul>
-
-
-<h2 id="manifest">新增安全性設定檔</h2>
-
-<p>
- 網路安全性設定功能會使用 XML 檔案，而您為應用程式指定的設定就在此。
-您必須在應用程式的宣示說明包括一個指向這個檔案的項目。
-以下節錄自宣示說明的程式碼，示範如何建立此項目：
-
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-...
-<app ...>
- <meta-data android:name="android.security.net.config"
- android:resource="@xml/network_security_config" />
- ...
-</app>
-</pre>
-
-<h2 id="CustomTrust">自訂信任的 CA</h2>
-
-<p>
- 應用程式會想要信任自訂的一組 CA，而不是平台預設的 CA。
-最常見的原因如下：
-</p>
-
-<ul>
- <li>使用 (由內部公司 CA 等所自我簽署、發行的) 自訂憑證授權單位連線至主機。
-
- </li>
-
- <li>限制 CA 只用您信任的那組 CA，而不是所有人預先安裝的 CA。
-
- </li>
-
- <li>信任系統中所未包括的其他 CA。
- </li>
-</ul>
-
-<p>
- 根據預設，來自所有應用程式的安全連線全都信任預先安裝的系統 CA，而目標為 API 層級 23 (Android M) 和以下版本的應用程式預設也會信任使用者新增的 CA 存放區。
-
-應用程式可以使用 {@code base-config} (針對整個應用程式自訂) 或 {@code domain-config} (針對每個網域自訂)，自訂自己的連線。
-
-
-
-</p>
-
-
-<h3 id="ConfigCustom">設定自訂 CA</h3>
-
-<p>
- 假設您想要連線的主機使用自我簽署的 SSL 憑證，或要連線的主機使用 SSL 憑證是由您信任的非公用 CA 所發行，例如您公司的內部 CA。
-
-
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- 將 PEM 或 DER 格式的自我簽署或非公用 CA 憑證新增至
- {@code res/raw/my_ca}。
-</p>
-
-
-<h3 id="LimitingCas">限制信任的 CA 組</h3>
-
-<p>
- 應用程式若不想要信任系統所信任的所有 CA，可以自行指定一組範圍較小的信任 CA。
-如此可以保護應用程式，不受任何其他 CA 所發行的詐騙憑證危害。
-
-</p>
-
-<p>
- 限制信任的 CA 組，其設定類似於<a href="#TrustingACustomCa">信任自訂 CA</a> (針對特定網域)，只不過多個 CA 都是資源所提供。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- 將 PEM 或 DER 格式的信任 CA 新增至 {@code res/raw/trusted_roots}。
- 請注意，如果使用 PEM 格式，該檔案「只」能包含 PEM 資料，不能有額外的文字。<em></em>
-您還可以提供多個
- <a href="#certificates"><code><certificates></code></a>
-元素，而不只一個。
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- 信任其他 CA
-</h3>
-
-<p>
- 應用程式會想要信任不受系統信任的其他 CA，這是因為系統尚未包括該 CA，或 CA 不符合納入 Android 系統的需求。
-
-應用程式可以為設定指定多個憑證來源，來完成此動作。
-
-
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">設定 CA 進行偵錯</h2>
-
-<p>
- 對透過 HTTPS 連線的應用程式進行偵錯時，您想要連線的本機開發伺服器並沒有生產伺服器的 SSL 憑證。
-
-若以不修改應用程式的程式碼為前提，為了支援此動作，您可以使用 {@code debug-overrides} 來指定僅偵錯 CA，「只」有在 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- 為 {@code true} 時才予以信任。<i></i>
-
-一般來說，IDE 和建置工具會為非發行版本自動設定此旗標。
-
-</p>
-
-<p>
- 因為應用程式商店採取的安全措施是，不接受標示為可偵錯的應用程式，所以這種方式會比條件式程式碼安全。
-
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="UsesCleartextTraffic">退出明碼流量</h2>
-
-<p>
- 打算只使用安全連線連線至目的地的應用程式，可以針對那些目的地退出支援明碼 (使用未加密的 HTTP 通訊協定，而非 HTTPS)。
-
-此選項有助於避免應用程式由於外部來源 (例如，後端伺服器) 提供的 URL 中發生變更，而造成意外回復。
-
-
- 如需更多詳細資料，請參閱 {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()}。
-</p>
-
-<p>
- 例如，應用程式想要確保 的所有連線一律要透過 HTTPS 完成，以保護敏感流量不受惡意網路危害。
-
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config usesCleartextTraffic="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">關聯憑證</h2>
-
-<p>
- 應用程式一般會信任所有預先安裝的 CA。若這類的任何 CA 意在發行詐騙憑證，應用程式會有遭受 MiTM 攻擊的風險。
-
-有些應用程式選擇透過限制所信任的 CA 組或關聯憑證，來限制可接受的憑證組。
-
-</p>
-
-<p>
- 憑證關聯的方法是，透過公用金鑰的雜湊 (X.509 憑證的 SubjectPublicKeyInfo) 來提供一組憑證。
-只有當憑證鏈至少包含一個關聯的公用金鑰時，才是有效的憑證鏈。
-
-
-</p>
-
-<p>
- 請注意，使用憑證關聯時，您務必要包括備份金鑰，這樣萬一強制您切換到新的金鑰或變更 CA (關聯到 CA 憑證或該 CA 的中繼者) 時，您的應用程式連線才不會受到影響。
-
-
-否則，您必須推出應用程式更新，才能還原連線。
-
-</p>
-
-<p>
- 此外，可為關聯設定到期時間，只要該關聯經過多久都未執行，即為到期。
-這有助於避免未經更新的應用程式發生連線問題。
-然而，針對關聯設定到期時間，會造成略過關聯。
-
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">設定繼承行為</h2>
-
-<p>
- 繼承的值都未設定在特定設定中。此行為允許有更複雜的設定，同時保持設定檔讓人看得懂。
-
-</p>
-
-<p>
- 如果值未設定在特定項目中時，就會使用下一個更一般項目的值。
-如為巢狀結構，就會從上層 {@code domain-config} 取得未在 {@code domain-config} 中設定的值，或非巢狀時，則會從 {@code
- base-config} 取得值。
-未在 {@code base-config} 中設定的值會使用平台的預設值。
-
-</p>
-
-<p>
- 例如，假設所有連至 {@code
- example.com} 子網域的連線都必須使用一組自訂 CA。此外，允許明碼流量送往這些網域，但連線到 {@code
- secure.example.com} 時「除外」。
-<em></em>在 {@code example.com} 的設定內以巢狀方式排列 {@code
- secure.example.com} 的設定，就不需要重複
- {@code trust-anchors}。
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>：
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">設定檔案格式</h2>
-
-<p>
- 網路安全性設定功能會使用 XML 檔案格式。
- 下列程式碼範例顯示檔案的整體結構：
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- 下列各區段描述檔案格式的語法與其他詳細資料。
-
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 可以包含：
- </dt>
-
- <dd>
- 0 或 1 個 <code><a href="#base-config"><base-config></a></code><br>
- 任何數目的 <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 或 1 個 <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- 語法：
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- 可以包含：
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 描述：
- </dt>
-
- <dd>
- 連線到 <a href="#domain-config"><code>domain-config</code></a> 所未涵蓋的目的地時使用的預設設定。
-
-
-<p>
- 任何未設定的值都會使用平台預設值。目標為 API 層級 24 和更新版本的應用程式預設設定：
-
-</p>
-
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-目標為 API 層級 23 和以下版本的應用程式預設設定：
-<pre>
-<base-config usesCleartextTraffic="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>語法：</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>可以包含：</dt>
-
-<dd>
-1 或更多個 <code><a href="#domain"><domain></a></code>
-<br/>0 或 1 個 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 或 1 個 <code><a href="#pin-set"><pin-set></code></a>
-<br/>任何數目的巢狀 <code><domain-config></code></dd>
-
-<dt>描述</dt>
-<dd>依照 {@code domain} 元素所定義，連線至特定目的地時使用的設定。
-
-<p>請注意，如有多個 {@code domain-config} 元素涵蓋同一個目的地，則會使用含有最明確 (最長) 比對網域規則的設定。
-</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- 語法：
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- 屬性：
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- 如為 {@code "true"}，表示此網域規則會比對網域和所有子網域，包括子網域的子網域在內，反之此規則只會套用到完全相符者。
-
-
- </dd>
- </dl>
- </dd>
-
- <dt>
- 描述：
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- 語法：
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- 可以包含：
- </dt>
-
- <dd>
- 0 或 1 個 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- 描述：
- </dt>
-
- <dd>
- 當 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- 為 {@code "true"} (一般是在非發行版本由 IDE 與建置工具產生的情況下) 時所要套用的覆寫。
-{@code
- debug-overrides} 中指定的信任錨點會新增至所有其他連線，而當伺服器的憑證鏈使用其中一個僅偵錯信任錨點時，即不會執行憑證關聯。
-
-如果 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- 為 {@code "false"}，就會完全略過這個區段。
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- 語法：
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- 可以包含：
- </dt>
-
- <dd>
- 任何數目的 <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- 描述：
- </dt>
-
- <dd>
- 可供安全連線使用的信任錨點組。
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>語法：</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>描述：</dt>
-<dd>可供 {@code trust-anchors} 元素使用的 X.509 憑證組。</dd>
-
-<dt>屬性：</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-CA 憑證的來源，可以是其中一個原始資源識別碼，其指向含有 X.509 憑證的檔案。
-<ul>
- <li>
- 憑證必須以 DER 或 PEM 格式編碼。如為 PEM 憑證，檔案中「不可」包含非 PEM 的額外資料，例如註解。
-<em></em>
-
- </li>
-
- <li>{@code "system"} 代表預先安裝的系統 CA 憑證
- </li>
-
- <li>{@code "user"} 代表使用者新增的 CA 憑證
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- 指定來自此來源的 CA 是否要略過憑證關聯。如為 {@code
- "true"}，憑證鏈的鏈結若經過此來源的其中一個 CA，就不會執行關聯。
-這對偵錯 CA 會很實用，或支援讓使用者 MiTM 應用程式的安全流量。
-
- </p>
-
- <p>
- 預設為 {@code "false"}，除非您在 {@code debug-overrides}
- 元素中指定，而那種情況的預設為 {@code "true"}。
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- 語法：
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- 可以包含：
- </dt>
-
- <dd>
- 任何數目的 <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- 描述：
- </dt>
-
- <dd>
- 一組公用金鑰關聯。信任鏈中的其中一個公用金鑰必須要在這組關聯中，才是可信任的安全連線。
-如需關聯的格式，請參閱
- <code><a href="#pin"><pin></a></code>。
- </dd>
-
- <dt>
- 屬性：
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- 到期之後就會停用關聯的日期，格式為 {@code yyyy-MM-dd}。
-如果未設定屬性，關聯就不會到期。
-
- <p>
- 到期有助於避免因使用者停用應用程式更新，而無法取得關聯組更新的應用程式發生連線問題。
-
-
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- 語法：
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- 屬性：
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- 用來產生關聯的摘要演算法。目前僅支援
- {@code "SHA-256"}。
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html-intl/intl/zh-tw/preview/overview.jd b/docs/html-intl/intl/zh-tw/preview/overview.jd
deleted file mode 100644
index 590afe5..0000000
--- a/docs/html-intl/intl/zh-tw/preview/overview.jd
+++ /dev/null
@@ -1,440 +0,0 @@
-page.title=計劃總覽
-page.metaDescription=讓您的應用程式為下一版 Android 做好準備。
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-<!--
-<div class="cols" style=
-"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview 3 is now available
- </h3>
- <p>Includes final SDK and near-final system images</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-notes">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#preview3-get">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- 歡迎使用「Android N Developer Preview」<strong></strong>，本計劃提供為新版 Android 測試和最佳化您應用程式所需的一切。它是免費的，而且您可以下載「N Developer Preview」工具來立刻開始。
-
-
-
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- 硬體與模擬器映像
- </h5>
-
- <p>
- 在各種裝置上或在模擬器上執行並測試您的應用程式。
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 最新的平台程式碼
- </h5>
-
- <p>
- 我們將在 Preview 期間提供每月更新，讓您能夠針對最新的平台變更進行測試。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 開發人員問題的優先順序
- </h5>
-
- <p>
- 在前幾個星期內，我們將讓開發人員優先回報問題，因此請儘快測試並提供意見回饋。
-
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- 新行為與功能
- </h5>
-
- <p>
- 儘早開始開發以支援新的平台行為，並使用新功能來開發。
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 更新是透過隔空傳輸 (OTA) 方式傳遞
- </h5>
-
- <p>
- 透過「Android Beta 計劃」，可以在任何支援的裝置上透過無接縫的隔空傳輸方式取得更新。不需要刷機。
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- 意見回饋與支援
- </h5>
-
- <p>
- 使用我們的<a href="{@docRoot}preview/bug">問題追蹤器</a>回報問題並提供意見回饋。與 <a href="{@docRoot}preview/dev-community">N 開發人員社群</a>中的開發人員互動。
-
-
-
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">時間軸與更新</h2>
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- 「N Developer Preview」計畫日期從 2016 年 3 月 9 日到最終 Android N 公開發行版釋出給 AOSP 與 OEM 為止 (預計是 2016 年第 3 季)。
-
-</p>
-
-<p>
- 在關鍵開發里程碑，我們將為您的開發與測試環境傳遞更新。一般而言，您可以預期每個月 (4 到 6 週的間隔) 都能收到更新。里程碑列出如下。
-
-
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html">預覽版 1</a></strong> (初始版本，Alpha)</li>
- <li><strong>預覽版 2</strong> (遞增更新，Beta)</li>
- <li><strong>預覽版 3</strong> (遞增更新，Beta)</li>
- <li><strong>預覽版 4</strong> (最終 API 與正式 SDK，Play 發佈)</li>
- <li><strong>預覽版 5</strong> (用於最終測試的近最終系統映像)</li>
- <li><strong>最終版本</strong> (推出給 AOSP 與生態系統)</li>
-</ul>
-
-<p>
- 每個更新都包括 SDK 工具、預覽版系統映像、模擬器、參考文件與 API 差異。
-
-</p>
-
-<p>
- <strong>前三個預覽版里程碑</strong>提供<strong>早期測試與開發環境</strong>，可協助您發現目前應用程式中的相容性問題，並針對在新平台運作的目標規劃遷移或功能工作。您可以在這個優先順序期間將您對功能與 API 和檔案相容性問題的意見回饋提供給我們 — 對於上述所有問題，請使用<a href="{@docRoot}preview/bug">問題追蹤器</a>。您可以預期這些更新之間會有一些 API 變更。
-
-
-
-
-
-
-</p>
-
-<p>
- 在<strong>預覽版 4 與 5</strong>，您將能存取<strong>最終 N API 與 SDK</strong> 以進行開發，並存取接近最終系統映像來測試系統行為與功能。Android N 在此時將提供標準 API 層級。您可以開始為您的舊版應用程式執行最終相容性測試，並調整使用 N API 或功能的任何新程式碼。
-
-
-
-
-</p>
-
-<p>
- 此外，從預覽版 4 開始，您可以<strong>發佈應用程式到執行 Android N 的裝置 (在正式 API 層級)</strong>，例如已選擇加入 Android Beta 計劃的使用者裝置。您可以先發佈到 Google Play 的 Alpha 與 Beta 管道，以便在廣泛於商店中散佈之前，先透過 Android Beta 使用者測試您的應用程式。
-
-
-
-
-
-</p>
-
-<p>
- 當您在 Android N 上測試及開發時，強烈建議您在預覽版更新發行時立即更新，<strong>讓您的開發環境保持在最新狀態</strong>。為簡化此程序，您可以在 Android Beta 計劃中註冊您的測試裝置，並在每個里程碑取得<strong>隔空傳輸 (OTA) 更新</strong>。或者，我們也會提供已更新的預覽版映像讓您下載並手動刷新。
-
-
-
-
-
-</p>
-
-<p>
- 我們將透過 <a href="http://android-developers.blogspot.com/">Android 開發人員部落格</a>，還有此網站與 <a href="{@docRoot}preview/dev-community">Android N 開發人員社群</a>來通知您有可用的預覽版更新。
-
-
-</p>
-
-
-<h2 id="preview_tools">N Developer Preview 中有什麼？</h2>
-
-<p>
- 「N Developer Preview」包括您針對各種不同螢幕大小、網路技術、 CPU/GPU 晶片組與硬體架構，測試現有應用程式所需的一切。
-
-
-</p>
-
-<h3 id="sdk_tools">SDK 工具</h3>
-
-<p>您可以透過 <a href="{@docRoot}sdk/installing/adding-packages.html">Android Studio</a> 中的 SDK Manager 下載這些元件：</p>
-
-<ul>
- <li> N Developer Preview <strong>SDK 工具</strong>
- <li> N Developer Preview <strong>模擬器系統映像</strong> (32 位元與 64 位元)
- <li> N Developer Preview <strong>模擬器系統映像 (適用於 Android TV)</strong> (32 位元)
- <li> N Developer Preview 支援程式庫 (適用於新的應用程式範本)
-</ul>
-
-<p>
- 我們將視需要在每個里程碑提供這些開發工具的更新。
-</p>
-
-<h3 id="hardware_system_images">硬體系統映像</h3>
-
-<p>
- 「N Developer Preview」包括 Nexus 以及在實體裝置上測試及開發時可以使用的其他硬體系統映像。如需硬體映像的完整清單，請參閱<a href="{@docRoot}preview/download.html">裝置映像</a>頁面。
-
-
-</p>
-
-<p>
- 我們將在每個里程碑傳遞已更新的系統映像。您可以下載已更新的系統映像並手動將它刷到您的測試裝置，而且刷機頻率無限制。當您需要在自動化測試環境多次刷新您裝置時，這特別實用。
-
-
-
-
-</p>
-
-<p class="note"><strong>注意</strong>：<strong>手動刷新的裝置將無法像去年的預覽版一樣取得 OTA 更新</strong>。今年，您可以透過在「Android Beta 計劃」註冊裝置以取得 OTA — 請參閱下一節的詳細資料。
-
-
-
-</p>
-
-<h3 id="android_beta">透過 Android Beta 計劃取得 OTA 更新</h3>
-
-<p>
- Android N 中的其中一個新功能是隔空傳輸 (OTA) 更新計劃，它可以自動將最新的 Android N 預覽版更新直接傳遞給已註冊此計劃的裝置。加入此計劃完全免費，而且此計劃開放給所有擁有支援裝置並已註冊 Google 帳戶的人。
-
-
-
-</p>
-
-<p>
- 如果要註冊此計劃，請瀏覽 <a href="https://g.co/androidbeta">Android Beta 計劃</a>網站。您將會看到已在您的帳戶註冊且符合加入 Android Beta 計劃的所有裝置。
-
-
-
-</p>
-
-<ol>
- <li> 選擇要接收 Android N 更新的裝置
- <li> 按一下 [Enroll]，閱讀並同意服務條款，然後按一下 [OK]。
-</ol>
-
-<p>
- 一旦註冊，您的裝置很快就會收到更新。在大部分情況下，您不需要執行完整重設以將您的資料移到 Android N，但建議您先備份重要資料，再註冊裝置。
-
-
-
-</p>
-
-<p>
- 當更新傳遞到您的裝置之後，建議您儘快下載並安裝。您將能掌握系統 UI、行為、API 與功能的最新變更。
-
-
-</p>
-
-<p>
- 在「Developer Preview」結束時，您已註冊的裝置將會收到正式 Android N 版本的更新。
-
-</p>
-
-<p>
- 您可以隨時取消註冊 Android Beta 計劃。在取消註冊之前，請務必備份裝置上的資料。
-
-
-</p>
-
- <p class="note"><strong>注意</strong>：當您取消註冊時，<strong>系統會將您的裝置還原為出廠預設值</strong>並更新到最新版本的 Android 6.0 Marshmallow (不一定是註冊裝置之前安裝的版本)。為確保乾淨的安裝，系統會將您的資料從裝置清除，包括聯絡人、訊息與相片等。
-
-
-
-
-
-
-</p>
-
-<h3 id="documentation_and_sample_code">文件與範例程式碼</h3>
-
-<p>
- 「Developer Preview」網站上提供這些文件資源，協助您了解 Android N：
-
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">設定以針對 Android N 開發</a>提供逐步指示協助您開始。
-
-</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">行為變更</a>指出要測試的關鍵區域。
-</li>
- <li> 新 API 的文件，包括 <a href="{@docRoot}preview/api-overview.html">API 總覽</a>、可下載的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>與詳細關鍵功能 (例如多視窗支援、整合式通知、多地區設定支援等) 的開發人員指南。
-
-
-
- <li> 示範如何支援權限與其他新功能的<a href="{@docRoot}preview/samples.html">範例程式碼</a>。
-
- <li> 適用於目前 N Developer Preview 的<a href="{@docRoot}preview/support.html#release-notes">版本資訊</a>，包括變更資訊與差異報告。
-
-
-</ul>
-
-<h4 id="reference">可下載的 API 參考資料</h4>
-
-<p>
- 在早期預覽版更新期間，您能以獨立 zip 壓縮檔的形式下載最新的 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">Android N 平台 API 參考資料</a>。下載的參考資料也包括差異報告，可協助您瞭解自 API 23 與前次更新之後的 API 變更。
-
-
-
-
-</p>
-
-<p>
- 當 Android N API 邁入最終階段且我們為它指派正式 API 層級時，我們將在 <a href="https://developer.android.com">https://developer.android.com</a> 為您提供線上 API 參考資料。
-
-</p>
-
-<h3 id="support_resources">
- 支援資源
-</h3>
-
-<p>
- 在「N Developer Preview」上測試及開發時，請使用這些管道來回報問題及提供意見回饋：
-
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview 問題追蹤器</a>是您的<strong>主要意見回饋管道</strong>。您可以透過此問題追蹤器來回報錯誤、效能問題與一般意見回饋。您也可以檢查<a href="{@docRoot}preview/bug">已知問題</a>並尋找變通方式步驟。當您的問題經過分類並傳送給 Android 工程團隊檢閱時，我們會通知您。
-
-
-
-
- </li>
- <li> <a href="{@docRoot}preview/dev-community">Android N 開發人員社群</a>是您能<strong>與其他 Android N 開發人員聯絡</strong>的 Google+ 社群。您可以分享有關 Android N 的觀察或想法，或尋找解答。我們會主持社群並視需要提供解答與指導方針。
-
-
-
-</li>
-</ul>
-
-<h3 id="targeting">目標設定、預覽版 API 及發佈</h3>
-
-<p>
- 「N Developer Preview」提供僅供開發的系統與<strong>沒有標準 API 層級</strong>的 Android 程式庫。如果要選擇退出相容性行為以測試您的應用程式 (強烈建議)，您可以透過將您應用程式的 <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code> 設定為 <code>“N”</code>，以便以 Android N 預覽版。做為目標。
-
-
-
-
-
-</p>
-
-<p>
- 「Android N Developer Preview」提供<strong>預覽版 API</strong> — 在最終版 SDK (目前規劃在 2016 年第 3 季) 發行之前的都不是正式 API。這表示您可以預期這段時間會有<strong>小幅度的 API 變更</strong>，特別是在計劃開始的前幾週。隨著每次更新「Android N Developer Preview」，我們將提供變更摘要。
-
-
-
-
-
-</p>
-
-<p class="note">
- <strong>注意</strong>：雖然預覽版 API 可能會變更，基本系統行為均已穩定且能夠立即測試。
-
-
-</p>
-
-<p>
- Google Play <strong>會防止發佈目標為 N Developer Preview 的應用程式</strong>。當 Android N 最終 SDK 可用時，您將能以正式 Android N API 層級做為目標，並透過 Alpha 與 Beta 發行管道將您的應用程式發佈到 Google Play。同時，如果要將目標為 Android N 的應用程式散佈給測試人員，您可以透過電子郵件或您網站的直接下載連結來完成。
-
-
-
-
-
-</p>
-
-<p>
- 在完全將 Android N 釋出給 AOSP 與 OEM 時 (預計是 2016 年第 3 季)，您可以將以 Android N 為目標的發佈發佈給 Google Play 中的公開發行管道。
-
-
-</p>
-
-
-<h2 id="how_to_get_started">如何開始</h2>
-
-<p>
- 開始使用 Android N 測試您的應用程式：
-</p>
-
-<ol>
- <li> 檢閱 <a href="{@docRoot}preview/api-overview.html">API 總覽</a>與<a href="{@docRoot}preview/behavior-changes.html">行為變更</a>以瞭解新功能，以及它會如何影響您的應用程式。特別是瞭解新的<a href="{@docRoot}preview/features/notification-updates.html">通知</a>功能與<a href="{@docRoot}preview/features/multi-window.html">多視窗支援</a>。
-
-
-
-</li>
- <li> 依照<a href="{@docRoot}preview/setup-sdk.html">設定 Preview SDK</a> 的指示來設定您的環境，並設定測試裝置。
-</li>
- <li> 依照<a href="https://developers.google.com/android/nexus/images">刷新指示</a>，將您的裝置刷新為最新的 Android N 系統映像。
- </li>
- <li> 檢閱 <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API 參考資料</a>與 <a href="{@docRoot}preview/samples.html">Android N 範例</a>，以深入瞭解新的 API 功能以及如何在您的應用程式中運用。
-
-
- <li> 加入 <a href="{@docRoot}preview/dev-community">Android N 開發人員社群</a>以取得最新消息，並與使用新平台的開發人員聯絡
-
-</li>
-</ol>
-
-<p>
- 感謝您參與「Android N Developer Preview」計劃！
-</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/samples.jd b/docs/html-intl/intl/zh-tw/preview/samples.jd
deleted file mode 100644
index 265c0ff..0000000
--- a/docs/html-intl/intl/zh-tw/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=範例
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- 下列程式碼範例是針對 Android N 提供。如果要在 Android Studio 中下載, 範例，請選取 [File] > [Import Samples]<b></b> 選單選項。
-
-
-</p>
-
-<p class="note">
- <strong>注意：</strong>這些可下載的專案是專為與 Gradle 和 Android Studio 一起使用而設計。
-
-</p>
-
-
-<h3 id="mw">多視窗 Playground</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156" />
-<p>
- 此範例示範如何在您的應用程式中發揮多視窗使用者介面的功能。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">在 GitHub 上取得</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">使用中通知</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 這是現有的範例，它會顯示使用 NotificationCompat 傳送通知的簡單服務。來自使用者的每個未閱讀交談都會以個別通知方式傳送。
-
-
-</p>
-<p>
- 已更新此範例以利用 Android N 中的新通知功能。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">在 GitHub 上取得</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">簡訊服務</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- 這是現有的範例，它示範如何使用 NotificationManager 告知使用者應用程式目前顯示的通知數目。
-
-
-</p>
-<p>
- 已更新此範例以利用 Android N 中的新通知功能。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">在 GitHub 上取得</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">直接開機</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 此範例示範如何在裝置加密的儲存空間 (裝置開機後即一律可用) 中儲存及存取資料。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">在 GitHub 上取得</a>
-
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">限定範圍目錄存取</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- 此範例示範如何讀取及寫入特定目錄的資料，同時要求較少的權限。
-
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">在 GitHub 上取得</a>
-
-</p>
\ No newline at end of file
diff --git a/docs/html-intl/intl/zh-tw/preview/setup-sdk.jd b/docs/html-intl/intl/zh-tw/preview/setup-sdk.jd
deleted file mode 100644
index b486ed4..0000000
--- a/docs/html-intl/intl/zh-tw/preview/setup-sdk.jd
+++ /dev/null
@@ -1,223 +0,0 @@
-page.title=設定 Preview
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">取得 Android Studio 2.1</a></li>
- <li><a href="#get-sdk">取得 Android N SDK</a>
- <ol>
- <li><a href="#docs-dl">參考文件</a>
- </ol>
- </li>
- <li><a href="#java8">取得 Java 8 JDK 與 JRE</a></li>
- <li><a href="#create-update">更新或建立專案</a></li>
- <li><a href="#next">後續步驟</a></li>
-</ol>
- </div>
-</div>
-
-<p>如果要開發適用於「Android N Preview」的應用程式，您必須為您的開發人員環境進行一些更新，如此頁面上所述。
-</p>
-
-<p>如果只要在 Android N 系統映像上測試您應用程式的相容性，請依照<a href="{@docRoot}preview/download.html">在 Android N 裝置上測試</a>中的指南執行。
-</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">取得 Android Studio 2.1 (預覽版)</h2>
-
-<p>Android N 平台新增對 <a href="{@docRoot}preview/j8-jack.html">Java 8 語言功能</a>的支援，它需要名為 Jack 的新編譯器。目前，只有 Android Studio 2.1 中才支援最新的 Jack 版本。因此，如果要使用 Java 8 語言功能，您必須使用 Android Studio 2.1 來建置您的應用程式。否則，您不需要使用 Jack 編譯器，但您仍需要更新到 JDK 8 以針對 Android N 編譯，如下所述。
-
-
-
-
-
-
-</p>
-
-<p>Android Studio 2.1 目前在早期測試發行管道中是以預覽版形式提供。如果您已經有 Android Studio 但不想要更新到早期測試管道，您可以下載 Android Studio 2.1 並另行安裝，並使用它來針對 Android N 進行開發，這樣並不會影響您的主要 Android Studio 環境。
-
-
-
-
-</p>
-
-<p>如果要下載 Android Studio 2.1 並另行安裝，請依照這些步驟執行 (或者，如果要以現有安裝之更新的形式接收 Android Studio 2.1，請跳到步驟 4)：
-
-</p>
-
-<ol>
- <li>編輯現有 Android Studio 安裝的名稱，並附加版本號碼。這樣，當您安裝新版本時，它將不會覆寫現有的版本。
-
-</li>
- <li>從<a href="http://tools.android.com/download/studio/canary/latest">早期測試管道下載頁面</a>針對您的作業系統下載適當的 ZIP 檔案。
-
- </li>
- <li>將套件解壓縮，並將 Android Studio 2.1 內容移動到系統上應用程式的適當位置，然後將它啟動。
-</li>
- <li>開啟 [Settings] 對話方塊 (在 Windows/Linux 上是 [File] > [Settings]<strong></strong>，在 Mac 上是 [Android Studio] > [Preferences]<strong></strong>)。在左面板中，選取 [Appearance & Behavior] > [System Settings] > [Updates]<strong></strong>。
-
-
-
-
- </li>
- <li>在 [Updates] 面板上，選取 [Automatically check updates for]<strong></strong> 核取方塊，然後從下拉式清單選取 [Canary Channel]<strong></strong>。
-
-
- </li>
-</ol>
-
-<p>針對下一個步驟，將此設定視窗維持開啟。</p>
-
-
-<h2 id="get-sdk">取得 N Preview SDK</h2>
-
-<p>如果要開始使用 Android N API 來開發，您必須在 Android Studio 中安裝 Android N Preview SDK，如下所示：
-</p>
-
-<ol>
- <li>在仍於 [Updates] 面板 (上面的步驟 4) 中檢視時，選取 [Automatically check updates for Android SDK]<strong></strong> 核取方塊，然後從下拉式清單中選取 [Preview Channel]<strong></strong>。
-
-
-
- </li>
- <li>按一下 [Check Now]<strong></strong>。</li>
-
- <li>在左面板中，選取 [Appearance & Behavior] > [System Settings] > [Android SDK]<strong></strong>。
-
-
- <li>按一下 [SDK Platforms]<strong></strong> 分頁，然後選取 [Android N Preview]<strong></strong> 核取方塊。
-</li>
-
- <li>按一下 [SDK Tools]<strong></strong> 分頁，然後選取 [Android SDK Build Tools]<strong></strong>、[Android SDK Platform-Tools]<strong></strong> 與 [Android SDK Tools]<strong></strong> 核取方塊。
-
-
-
- </li>
-
- <li>按一下 [OK]<strong></strong>，然後接受要安裝之任何套件的授權合約。
-
- </li>
-</ol>
-
-<h3 id="docs-dl">取得 N Preview 參考文件</h3>
-
-<p>
- 您可以在 N Preview 參考文件 (可從下表下載) 中找到有關 Android N API 的詳細資訊。此套件包含 Android 開發人員網站的已刪節離線版本，而且包括適用於 Android N API 的已更新 API 參考資料與 API 差異報告。
-
-
-
-
-</p>
-
-<table>
- <tr>
- <th scope="col">文件</th>
- <th scope="col">總和檢查碼</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-1-docs.zip">n-preview-1-docs.zip</a></td>
- <td width="100%">
- MD5：4ab33ccbe698f46f125cc5b807cf9c2f<br>
- SHA-1：6a3880b3ccd19614daae5a4d0698ea6ae11c20a5
- </td>
- </tr>
-</table>
-
-
-
-<h2 id="java8">取得 Java 8 JDK 與 JRE</h2>
-
-<p>如果要針對 Android N 平台編譯您的應用程式，您必須使用 Java 8 開發人員套件 (JDK 8)，而且如果要使用某些工具來搭配 Android Studio 2.1，您必須安裝 Java 8 執行階段環境 (JRE 8)。因此，如果您沒有最新版本的 JDK 8 與 JRE 8，請立即下載。
-
-
-
-</p>
-
-<p>接著，在 Android Studio 中設定 JDK 版本，如下所示：</p>
-
-<ol>
- <li>在 Android Studio 中開啟 Android 專案，然後選取 [File] > [Project Structure] 以開啟 [Project Structure] 對話方塊 <strong></strong>(或者，您可以選取 [File] > [Other Settings] > [Default Project Structure]<strong></strong>，以針對所有專案設定預設值)。
-
-
-
-
- </li>
- <li>在對話方塊的左面板中，按一下 [SDK Location]<strong></strong>。
- </li>
- <li>在 [JDK Location]<strong></strong> 欄位中，輸入 Java 8 JDK 的位置 (按一下右邊的按鈕以瀏覽您的檔案)，然後按一下 [OK]<strong></strong>8 。
-
-
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700" alt="" />
-
-
-<h2 id="create-update">更新或建立專案</h2>
-
-<p>
- 如果要使用 Android N API，您必須適當地設定您的專案。
-</p>
-
-<p>如果計畫使用 Java 8 語言功能，您也應該閱讀 <a href="{@docRoot}preview/j8-jack.html">Java 8 語言功能</a>，以取得支援之 Java 8 功能以及如何搭配 Jack 編譯器設定您專案的詳細資訊。
-
-
-</p>
-
-
-<h3 id="update">更新現有的專案</h3>
-
-<p>開啟模組的 <code>build.gradle</code> 檔案並更新值，如下所示：
-
-
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>'android-N'</strong>
- buildToolsVersion <strong>'24.0.0-rc1'</strong>
- ...
-
- defaultConfig {
- minSdkVersion <strong>'N'</strong>
- targetSdkVersion <strong>'N'</strong>
- ...
- }
- ...
-}</pre>
-
-
-<h3 id="create">建立新專案</h3>
-
-
-<p>使用 Android N Preview SDK 建立新的開發專案：</p>
-
-<ol>
- <li>按一下 [File] > [New Project]<strong></strong>，並依照步驟執行，直到到達 [Target Android Devices] 頁面。
-
- </li>
- <li>在此頁面上，選取 [Phone and Tablet]<strong></strong> 選項。</li>
- <li>在 [Phone and Tablet]<strong></strong> 選項下，在 [Minimum SDK]<strong></strong> 選項清單中，選取 [N: Android API 23, N Preview (Preview)]<strong></strong>。
-
-</li>
-</ol>
-
-
-<h2 id="next">後續步驟</h2>
-
-<ul>
- <li>依照<a href="{@docRoot}preview/download.html">在 Android N 裝置上測試</a>中的指南執行。</li>
- <li>深入了解 Android N 平台的<a href="{@docRoot}preview/behavior-changes.html">行為變更</a>與 <a href="{@docRoot}preview/api-overview.html">Android N API 與功能</a>。
-
-
-</li>
-</ul>
diff --git a/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd b/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd
new file mode 100644
index 0000000..7e4ea73
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd
@@ -0,0 +1,181 @@
+page.title=直接開機
+page.keywords=preview,sdk,direct boot
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>此文件內容</h2>
+ <ol>
+ <li><a href="#run">要求直接開機期間的執行權限</a></li>
+ <li><a href="#access">存取裝置加密的儲存空間</a></li>
+ <li><a href="#notification">接收使用者解鎖的通知</a></li>
+ <li><a href="#migrating">遷移現有資料</a></li>
+ <li><a href="#testing">測試您的加密感知應用程式</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Android N 會在一個安全的 <i>直接開機</i> 模式下執行，這是裝置已經開啟電源但使用者尚未解鎖裝置的期間。
+
+為了支援這種方式，系統為資料提供兩個儲存位置：</p>
+
+<ul>
+<li><i>認證加密的儲存空間</i>：這是預設的儲存位置，只有在使用者解鎖裝置之後才能使用。
+</li>
+<li><i>裝置加密的儲存空間</i>：這是「直接開機」模式期間與使用者解鎖裝置之後都可以使用的儲存位置。
+</li>
+</ul>
+
+<p>根據預設，應用程式不會在「直接開機」模式下執行。如果您的應用程式需要在「直接開機」模式期間執行動作，您可以註冊應該在此模式下執行的應用程式元件。
+
+需要在「直接開機」模式下執行的一些常見應用程式使用案例包括：
+</p>
+
+<ul>
+<li>已排程通知的應用程式，例如鬧鐘應用程式。
+</li>
+<li>提供重要使用者通知的應用程式，例如簡訊應用程式。</li>
+<li>提供協助工具服務的應用程式，例如 Talkback。</li>
+</ul>
+
+<p>如果您的應用程式需要在「直接開機」模式期間存取資料，請使用裝置加密的儲存空間。
+裝置加密的儲存空間包含以金鑰加密的資料，這個金錀只有在裝置執行成功的驗證開機之後才能使用。
+
+</p>
+
+<p>對於應該使用與使用者認證關聯之金鑰 (例如 PIN 或密碼) 加密的資料，請使用認證加密的儲存空間。認證加密的儲存空間只有在使用者成功解鎖裝置之後到使用者再次重新啟動裝置之間的時間可以使用。
+
+
+如果使用者在解鎖裝置之後啟用鎖定螢幕，並不會鎖定認證加密的儲存空間。
+
+</p>
+
+<h2 id="run">要求直接開機期間的執行權限</h2>
+
+<p>應用程式必須先向系統註冊其元件，這些元件才能在「直接開機」模式期間執行或存取裝置加密的儲存空間。
+
+向系統註冊的應用程式會將元件標記為
+<i>加密感知</i>。如果要將元件標記為加密感知，請將宣示說明中的
+<code>android:encryptionAware</code> 屬性設定為 true。<p>
+
+<p>當裝置重新啟動時，加密感知元件可以註冊為從系統接收
+<code>LOCKED_BOOT_COMPLETED</code> 廣播訊息。
+這個時候可以使用裝置加密的儲存空間，而且您的元件可以執行在「直接開機」模式期間需要執行的工作，例如觸發排程的鬧鐘。
+
+</p>
+
+<p>下列程式碼片段是一個範例，示範如何在應用程式宣示說明中將
+{@link android.content.BroadcastReceiver} 註冊為加密感知以及如何為
+<code>LOCKED_BOOT_COMPLETED</code> 新增意圖篩選器：</p>
+
+<pre>
+<receiever
+ android:encryptionAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>一旦使用者將裝置解鎖，所有元件都可存取裝置加密的儲存空間與認證加密的儲存空間。
+</p>
+
+<h2 id="access">存取裝置加密的儲存空間</h2>
+
+<p>如果要存取裝置加密的儲存空間，請透過呼叫
+<code>Context.createDeviceEncryptedStorageContext()</code> 以建立第二個
+{@link android.content.Context} 實例。使用此內容建立的所有儲存 API 呼叫都可以存取裝置加密的儲存空間。
+下列範例會存取裝置加密的儲存空間並開啟現有的應用程式資料檔案：
+
+</p>
+
+<pre>
+Context directBootContext = Context.createDeviceEncryptedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>只針對必須在「直接開機」模式期間存取的資訊使用裝置加密的儲存空間。不要將裝置加密的儲存空間做為一般用途的加密存放區。對於私密使用者資訊或「直接開機」模式期間不需要的加密資料，請使用認證加密的儲存空間。
+
+
+
+</p>
+
+<h2 id="notification">接收使用者解鎖的通知</h2>
+
+<p>裝置重新啟動之後，一旦使用者將裝置解鎖，您的應用程式就可以切換為存取認證加密的儲存空間，並使用倚賴使用者認證的一般系統服務。
+
+</p>
+
+<p>如果要接收裝置重新開機後使用者解鎖裝置的通知，請從執行中元件註冊 {@link android.content.BroadcastReceiver} 以接聽 <code>ACTION_USER_UNLOCKED</code> 訊息。
+
+或者，您可以接收現有的 {@link android.content.Intent#ACTION_BOOT_COMPLETED
+ACTION_BOOT_COMPLETED} 訊息，它現在可以指出裝置已開機且使用者已解鎖裝置。
+
+</p>
+
+<p>您可以透過呼叫
+<code>UserManager.isUserUnlocked()</code>，以直接查詢使用者是否已將裝置解鎖。</p>
+
+<h2 id="migrating">遷移現有資料</h2>
+
+<p>如果使用者更新其裝置來使用「直接開機」模式，您可能有現有的資料必須遷移到裝置加密的儲存空間。
+使用
+<code>Context.migrateSharedPreferencesFrom()</code> 與
+<code>Context.migrateDatabaseFrom()</code>，在認證加密的儲存空間與裝置加密的儲存空間之間遷移偏好設定與資料庫資料。
+</p>
+
+<p>決定要將哪些資料從認證加密的儲存空間遷移到裝置加密的儲存空間時，請使用最佳判斷。
+您不應該將私密使用者資訊 (例如密碼或授權權杖) 遷移到裝置加密的儲存空間。
+
+在某些情況下，您需要在這兩種加密的存放區中管理不同的資料集。
+</p>
+
+<h2 id="testing">測試您的加密感知應用程式</h2>
+
+<p>使用新的「直接開機」模式測試您的加密感知應用程式。您可以透過兩種方式啟用「直接開機」。
+</p>
+
+<p class="caution"><strong>注意：</strong>啟用「直接開機」會清除裝置上的所有使用者資料。
+</p>
+
+<p>在已安裝 Android N 的支援裝置上，執行下列其中一個動作來啟用「直接開機」：
+</p>
+
+<ul>
+<li>在裝置上，請移至 [設定] > [關於手機]<b></b>，然後點選 [Android 版本]<b></b> 7 次以啟用 [開發人員選項]<b></b> (如果尚未啟用)。
+
+當開發人員選項畫面可用時，請移至 [設定] > [開發人員選項]<b></b>，然後選取 [轉換到檔案加密]<b></b>。
+
+</li>
+<li>使用下列 adb shell 命令來啟用「直接開機」模式：
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>另外也提供模擬的「直接開機」模式，如果您需要在測試裝置上切換模式時即可利用。
+模擬模式應該只在開發期間使用，而且它可能造成資料遺失。
+如果要啟用模擬的「直接開機」模式，請在裝置上設定鎖定模式；設定鎖定模式時如果系統提示您設定安全啟動畫面，請選擇 [No thanks]，然後使用下列 adb shell 命令：
+
+
+</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>如果要關閉模擬的「直接開機」模式，請使用下列命令：</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>使用這些命令會使得裝置重新開機。</p>
diff --git a/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..0aa0034
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd
@@ -0,0 +1,124 @@
+page.title=限定範圍目錄存取
+page.keywords=preview,sdk,scoped directory access
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>此文件內容</h2>
+ <ol>
+ <li><a href="#accessing">存取外部儲存空間目錄</a></li>
+ <li><a href="#removable">存取抽取式媒體上的目錄</a></li>
+ <li><a href="#best">最佳做法</a></li>
+ </ol>
+</div>
+</div>
+
+<p>應用程式 (例如，相片應用程式) 通常只需要存取外部儲存空間中的特定目錄，例如 <code>Pictures</code> 目錄。
+目前用來存取外部儲存空間的方式並非設計來輕鬆地為這些類型的應用程式提供已設定目標的目錄存取。
+
+例如：</p>
+
+<ul>
+<li>在您的宣示說明中要求 {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} 或 {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} 可允許存取外部儲存空間ac上的所有公用目錄，但這可能超過您應用程式所需的存取權。
+
+
+</li>
+<li>使用<a href="{@docRoot}guide/topics/providers/document-provider.html">儲存空間存取架構</a>通常會使得您的使用者透過系統 UI 挑選目錄，這在您的應用程式一律存取相同外部目錄的情況下是不必要的。
+
+
+
+</li>
+</ul>
+
+<p>Android N 提供新的簡化 API，可用來存取常用外部儲存空間目錄。
+ </p>
+
+<h2 id="accessing">存取外部儲存空間目錄</h2>
+
+<p>使用 <code>StorageManager</code> 類別來取得適當的 <code>StorageVolume</code> 實例。
+接著，透過呼叫該實例的 <code>StorageVolume.createAccessIntent()</code> 方法以建立意圖。使用此意圖來存取外部儲存空間目錄。
+
+若要取得所有可用的磁碟區 (包括抽取式媒體磁碟區) 清單，請使用 <code>StorageManager.getVolumesList()</code>。
+
+</p>
+
+<p>下列程式碼片段是一個範例，它說明如何開啟主要共用儲存空間中的 <code>Pictures</code> 目錄：
+</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>系統會嘗試授予對外部目錄的存取權，並在需要時使用簡化的 UI 向使用者確認存取權：
+</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png" srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>圖 1.</strong> 應用程式要求對 [圖片] 目錄的存取權。
+</p>
+
+<p>若使用者授予存取權，系統會呼叫您的 <code>onActivityResult()</code> 覆寫並傳回 <code>Activity.RESULT_OK</code> 的結果代碼，以及包含 URI 的意圖資料。
+
+使用提供的 URI 來存取目錄資訊，這類似於使用<a href="{@docRoot}guide/topics/providers/document-provider.html">儲存空間存取架構</a>所傳回的 URI。
+
+
+
+</p>
+
+<p>若使用者未授予存取權，系統會呼叫您的 <code>onActivityResult()</code> 覆寫並傳回 <code>Activity.RESULT_CANCELED</code> 的結果代碼，以及 Null 意圖資料。
+
+</p>
+
+<p class="note"><b>注意</b>：取得對特定外部目錄的存取權也會取得對該目錄之子目錄的存取權。
+</p>
+
+<h2 id="removable">存取抽取式媒體上的目錄</h2>
+
+<p>若要使用「限定範圍目錄存取」來存取抽取式媒體上的目錄，請先新增會接聽 {@link android.os.Environment#MEDIA_MOUNTED} 通知的 {@link android.content.BroadcastReceiver}，例如：
+
+</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>當使用者掛接抽取式媒體 (例如 SD 卡) 時，系統會傳送 {@link android.os.Environment#MEDIA_MOUNTED} 通知。
+此通知會在意圖資料中提供 <code>StorageVolume</code> 物件，讓您用來存取抽取式媒體上的目錄。
+
+下列範例會存取抽取式媒體上的 <code>Pictures</code> 目錄：
+</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">最佳做法</h2>
+
+<p>如果可能，請將外部目錄存取 URI 設定為持續性，這樣您就不需要重複地要求使用者授予存取權。
+一旦使用者授予存取權，請使用目錄存取 URI 呼叫 <code>getContentResolver().takePersistableUriPermssion()</code>。
+
+系統會將該 URI 設定為持續性，而且後續存取要求將會傳回 <code>RESULT_OK</code>，而且不會為使用者顯示確認 UI。
+
+</p>
+
+<p>若使用者拒絕對外部目錄的存取權，請勿立刻又要求存取權。
+重複堅持取得存取權會導致極差的使用者體驗。
+</p>
diff --git a/docs/html-intl/intl/zh-tw/training/articles/security-config.jd b/docs/html-intl/intl/zh-tw/training/articles/security-config.jd
new file mode 100644
index 0000000..9b42b58
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/training/articles/security-config.jd
@@ -0,0 +1,745 @@
+page.title=網路安全性設定
+page.keywords=androidn,security,network
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>此文件內容</h2>
+<ol>
+ <li><a href="#manifest">新增安全性設定檔</a></li>
+ <li><a href="#CustomTrust">自訂信任的 CA</a>
+ <ol>
+ <li><a href="#ConfigCustom">設定信任的自訂 CA</a></li>
+ <li><a href="#LimitingCas">限制信任的 CA 組</a></li>
+ <li><a href="#TrustingAdditionalCas">信任其他 CA</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">僅偵錯 CA</a></li>
+ <li><a href="#UsesCleartextTraffic">退出明碼流量</a></li>
+ <li><a href="#CertificatePinning">關聯憑證</a></li>
+ <li><a href="#ConfigInheritance">設定繼承行為</a></li>
+ <li><a href="#FileFormat">設定檔案格式</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ Android N 包括網路安全性設定功能，讓應用程式在安全的宣告式設定檔中即可自訂網路安全性設定，而不必修改應用程式的程式碼。
+
+這些設定可以針對特定網域以及針對特定應用程式來設定。
+此功能的主要能力如下：
+
+</p>
+
+<ul>
+ <li>
+ <b>自訂信任錨點：</b>為應用程式的安全連線自訂信任的憑證授權單位 (CA)。
+例如，信任特定的自我簽署憑證，或限制應用程式信任的一組公用 CA。
+
+
+ </li>
+
+ <li>
+ <b>僅偵錯覆寫：</b>在應用程式中安全地為安全連線進行偵錯，而不會增加已安裝應用程式者的風險。
+
+ </li>
+
+ <li>
+ <b>退出明碼流量：</b>保護應用程式不受意外使用明碼流量危害。
+
+ </li>
+
+ <li>
+ <b>憑證關聯：</b>限制應用程式的安全連線只用特定憑證。
+
+ </li>
+</ul>
+
+
+<h2 id="manifest">新增安全性設定檔</h2>
+
+<p>
+ 網路安全性設定功能會使用 XML 檔案，而您為應用程式指定的設定就在此。
+您必須在應用程式的宣示說明包括一個指向這個檔案的項目。
+以下節錄自宣示說明的程式碼，示範如何建立此項目：
+
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+...
+<app ...>
+ <meta-data android:name="android.security.net.config"
+ android:resource="@xml/network_security_config" />
+ ...
+</app>
+</pre>
+
+<h2 id="CustomTrust">自訂信任的 CA</h2>
+
+<p>
+ 應用程式會想要信任自訂的一組 CA，而不是平台預設的 CA。
+最常見的原因如下：
+</p>
+
+<ul>
+ <li>使用 (由內部公司 CA 等所自我簽署、發行的) 自訂憑證授權單位連線至主機。
+
+ </li>
+
+ <li>限制 CA 只用您信任的那組 CA，而不是所有人預先安裝的 CA。
+
+ </li>
+
+ <li>信任系統中所未包括的其他 CA。
+ </li>
+</ul>
+
+<p>
+ 根據預設，來自所有應用程式的安全連線全都信任預先安裝的系統 CA，而目標為 API 層級 23 (Android M) 和以下版本的應用程式預設也會信任使用者新增的 CA 存放區。
+
+應用程式可以使用 {@code base-config} (針對整個應用程式自訂) 或 {@code domain-config} (針對每個網域自訂)，自訂自己的連線。
+
+
+
+</p>
+
+
+<h3 id="ConfigCustom">設定自訂 CA</h3>
+
+<p>
+ 假設您想要連線的主機使用自我簽署的 SSL 憑證，或要連線的主機使用 SSL 憑證是由您信任的非公用 CA 所發行，例如您公司的內部 CA。
+
+
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ 將 PEM 或 DER 格式的自我簽署或非公用 CA 憑證新增至
+ {@code res/raw/my_ca}。
+</p>
+
+
+<h3 id="LimitingCas">限制信任的 CA 組</h3>
+
+<p>
+ 應用程式若不想要信任系統所信任的所有 CA，可以自行指定一組範圍較小的信任 CA。
+如此可以保護應用程式，不受任何其他 CA 所發行的詐騙憑證危害。
+
+</p>
+
+<p>
+ 限制信任的 CA 組，其設定類似於<a href="#TrustingACustomCa">信任自訂 CA</a> (針對特定網域)，只不過多個 CA 都是資源所提供。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ 將 PEM 或 DER 格式的信任 CA 新增至 {@code res/raw/trusted_roots}。
+ 請注意，如果使用 PEM 格式，該檔案「只」能包含 PEM 資料，不能有額外的文字。<em></em>
+您還可以提供多個
+ <a href="#certificates"><code><certificates></code></a>
+元素，而不只一個。
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ 信任其他 CA
+</h3>
+
+<p>
+ 應用程式會想要信任不受系統信任的其他 CA，這是因為系統尚未包括該 CA，或 CA 不符合納入 Android 系統的需求。
+
+應用程式可以為設定指定多個憑證來源，來完成此動作。
+
+
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">設定 CA 進行偵錯</h2>
+
+<p>
+ 對透過 HTTPS 連線的應用程式進行偵錯時，您想要連線的本機開發伺服器並沒有生產伺服器的 SSL 憑證。
+
+若以不修改應用程式的程式碼為前提，為了支援此動作，您可以使用 {@code debug-overrides} 來指定僅偵錯 CA，「只」有在 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ 為 {@code true} 時才予以信任。<i></i>
+
+一般來說，IDE 和建置工具會為非發行版本自動設定此旗標。
+
+</p>
+
+<p>
+ 因為應用程式商店採取的安全措施是，不接受標示為可偵錯的應用程式，所以這種方式會比條件式程式碼安全。
+
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="UsesCleartextTraffic">退出明碼流量</h2>
+
+<p>
+ 打算只使用安全連線連線至目的地的應用程式，可以針對那些目的地退出支援明碼 (使用未加密的 HTTP 通訊協定，而非 HTTPS)。
+
+此選項有助於避免應用程式由於外部來源 (例如，後端伺服器) 提供的 URL 中發生變更，而造成意外回復。
+
+
+ 如需更多詳細資料，請參閱 {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()}。
+</p>
+
+<p>
+ 例如，應用程式想要確保 的所有連線一律要透過 HTTPS 完成，以保護敏感流量不受惡意網路危害。
+
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config usesCleartextTraffic="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">關聯憑證</h2>
+
+<p>
+ 應用程式一般會信任所有預先安裝的 CA。若這類的任何 CA 意在發行詐騙憑證，應用程式會有遭受 MiTM 攻擊的風險。
+
+有些應用程式選擇透過限制所信任的 CA 組或關聯憑證，來限制可接受的憑證組。
+
+</p>
+
+<p>
+ 憑證關聯的方法是，透過公用金鑰的雜湊 (X.509 憑證的 SubjectPublicKeyInfo) 來提供一組憑證。
+只有當憑證鏈至少包含一個關聯的公用金鑰時，才是有效的憑證鏈。
+
+
+</p>
+
+<p>
+ 請注意，使用憑證關聯時，您務必要包括備份金鑰，這樣萬一強制您切換到新的金鑰或變更 CA (關聯到 CA 憑證或該 CA 的中繼者) 時，您的應用程式連線才不會受到影響。
+
+
+否則，您必須推出應用程式更新，才能還原連線。
+
+</p>
+
+<p>
+ 此外，可為關聯設定到期時間，只要該關聯經過多久都未執行，即為到期。
+這有助於避免未經更新的應用程式發生連線問題。
+然而，針對關聯設定到期時間，會造成略過關聯。
+
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">設定繼承行為</h2>
+
+<p>
+ 繼承的值都未設定在特定設定中。此行為允許有更複雜的設定，同時保持設定檔讓人看得懂。
+
+</p>
+
+<p>
+ 如果值未設定在特定項目中時，就會使用下一個更一般項目的值。
+如為巢狀結構，就會從上層 {@code domain-config} 取得未在 {@code domain-config} 中設定的值，或非巢狀時，則會從 {@code
+ base-config} 取得值。
+未在 {@code base-config} 中設定的值會使用平台的預設值。
+
+</p>
+
+<p>
+ 例如，假設所有連至 {@code
+ example.com} 子網域的連線都必須使用一組自訂 CA。此外，允許明碼流量送往這些網域，但連線到 {@code
+ secure.example.com} 時「除外」。
+<em></em>在 {@code example.com} 的設定內以巢狀方式排列 {@code
+ secure.example.com} 的設定，就不需要重複
+ {@code trust-anchors}。
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>：
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">設定檔案格式</h2>
+
+<p>
+ 網路安全性設定功能會使用 XML 檔案格式。
+ 下列程式碼範例顯示檔案的整體結構：
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ 下列各區段描述檔案格式的語法與其他詳細資料。
+
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 可以包含：
+ </dt>
+
+ <dd>
+ 0 或 1 個 <code><a href="#base-config"><base-config></a></code><br>
+ 任何數目的 <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 或 1 個 <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ 語法：
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ 可以包含：
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 描述：
+ </dt>
+
+ <dd>
+ 連線到 <a href="#domain-config"><code>domain-config</code></a> 所未涵蓋的目的地時使用的預設設定。
+
+
+<p>
+ 任何未設定的值都會使用平台預設值。目標為 API 層級 24 和更新版本的應用程式預設設定：
+
+</p>
+
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+目標為 API 層級 23 和以下版本的應用程式預設設定：
+<pre>
+<base-config usesCleartextTraffic="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>語法：</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>可以包含：</dt>
+
+<dd>
+1 或更多個 <code><a href="#domain"><domain></a></code>
+<br/>0 或 1 個 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 或 1 個 <code><a href="#pin-set"><pin-set></code></a>
+<br/>任何數目的巢狀 <code><domain-config></code></dd>
+
+<dt>描述</dt>
+<dd>依照 {@code domain} 元素所定義，連線至特定目的地時使用的設定。
+
+<p>請注意，如有多個 {@code domain-config} 元素涵蓋同一個目的地，則會使用含有最明確 (最長) 比對網域規則的設定。
+</p></dd>
+</dl>
+
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ 語法：
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ 屬性：
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ 如為 {@code "true"}，表示此網域規則會比對網域和所有子網域，包括子網域的子網域在內，反之此規則只會套用到完全相符者。
+
+
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ 描述：
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ 語法：
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ 可以包含：
+ </dt>
+
+ <dd>
+ 0 或 1 個 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ 描述：
+ </dt>
+
+ <dd>
+ 當 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ 為 {@code "true"} (一般是在非發行版本由 IDE 與建置工具產生的情況下) 時所要套用的覆寫。
+{@code
+ debug-overrides} 中指定的信任錨點會新增至所有其他連線，而當伺服器的憑證鏈使用其中一個僅偵錯信任錨點時，即不會執行憑證關聯。
+
+如果 <a href="{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ 為 {@code "false"}，就會完全略過這個區段。
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ 語法：
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ 可以包含：
+ </dt>
+
+ <dd>
+ 任何數目的 <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ 描述：
+ </dt>
+
+ <dd>
+ 可供安全連線使用的信任錨點組。
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>語法：</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>描述：</dt>
+<dd>可供 {@code trust-anchors} 元素使用的 X.509 憑證組。</dd>
+
+<dt>屬性：</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+CA 憑證的來源，可以是其中一個原始資源識別碼，其指向含有 X.509 憑證的檔案。
+<ul>
+ <li>
+ 憑證必須以 DER 或 PEM 格式編碼。如為 PEM 憑證，檔案中「不可」包含非 PEM 的額外資料，例如註解。
+<em></em>
+
+ </li>
+
+ <li>{@code "system"} 代表預先安裝的系統 CA 憑證
+ </li>
+
+ <li>{@code "user"} 代表使用者新增的 CA 憑證
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ 指定來自此來源的 CA 是否要略過憑證關聯。如為 {@code
+ "true"}，憑證鏈的鏈結若經過此來源的其中一個 CA，就不會執行關聯。
+這對偵錯 CA 會很實用，或支援讓使用者 MiTM 應用程式的安全流量。
+
+ </p>
+
+ <p>
+ 預設為 {@code "false"}，除非您在 {@code debug-overrides}
+ 元素中指定，而那種情況的預設為 {@code "true"}。
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ 語法：
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ 可以包含：
+ </dt>
+
+ <dd>
+ 任何數目的 <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ 描述：
+ </dt>
+
+ <dd>
+ 一組公用金鑰關聯。信任鏈中的其中一個公用金鑰必須要在這組關聯中，才是可信任的安全連線。
+如需關聯的格式，請參閱
+ <code><a href="#pin"><pin></a></code>。
+ </dd>
+
+ <dt>
+ 屬性：
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ 到期之後就會停用關聯的日期，格式為 {@code yyyy-MM-dd}。
+如果未設定屬性，關聯就不會到期。
+
+ <p>
+ 到期有助於避免因使用者停用應用程式更新，而無法取得關聯組更新的應用程式發生連線問題。
+
+
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ 語法：
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ 屬性：
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ 用來產生關聯的摘要演算法。目前僅支援
+ {@code "SHA-256"}。
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/index.jd b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/index.jd
index 4225184..acee1d4 100644
--- a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/index.jd
+++ b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/index.jd
@@ -55,7 +55,7 @@
</p>
<h2>課程</h2>
-
+
<dl>
<dt><b><a href="starting.html">啟動應用行為顯示</a></b></dt>
<dd>了解應用行為顯示生命週期的有關基本概念、使用者啟動應用程式的方式，以及建立基本應用行為顯示的執行方式。
@@ -68,5 +68,5 @@
<dt><b><a href="recreating.html">重新建立應用行為顯示</a></b></dt>
<dd>了解在應用行為顯示遭終結時的狀況，以及如何在需要時重新建置應用行為顯示狀態。
</dd>
-</dl>
+</dl>
diff --git a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/pausing.jd b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/pausing.jd
index 8c0843d..f47768a 100644
--- a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本課程示範</h2>
<ol>
<li><a href="#Pause">暫停您的應用行為顯示</a></li>
<li><a href="#Resume">繼續您的應用行為顯示</a></li>
</ol>
-
+
<h2>您也應該閱讀</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">應用行為顯示</a>
@@ -59,7 +59,7 @@
<h2 id="Pause">暫停您的應用行為顯示</h2>
-
+
<p>若系統為您的應用行為顯示呼叫 {@link android.app.Activity#onPause()}，嚴格來說意味著您的應用行為顯示仍是部分可見，但多數情況下表示使用者離開應用行為顯示，該應用行為顯示很快將進入「已停止」狀態。
通常，您應使用 {@link android.app.Activity#onPause()} 回呼執行以下操作：
diff --git a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/recreating.jd b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/recreating.jd
index 4b0efda..ad23786 100644
--- a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本課程示範</h2>
<ol>
<li><a href="#SaveState">儲存您的應用行為顯示狀態</a></li>
<li><a href="#RestoreState">還原您的應用行為顯示狀態</a></li>
</ol>
-
+
<h2>您也應該閱讀</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">支援不同的螢幕</a>
@@ -105,7 +105,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -138,7 +138,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -157,12 +157,12 @@
只有存在要還原的已儲存狀態時，系統才會呼叫 {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}，因此您無需檢查 {@link android.os.Bundle} 是否為 null：
</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/starting.jd b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/starting.jd
index fae2fa3..b03f22b 100644
--- a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本課程示範</h2>
<ol>
<li><a href="#lifecycle-states">了解生命週期回呼</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">建立新執行個體</a></li>
<li><a href="#Destroy">終結應用行為顯示</a></li>
</ol>
-
+
<h2>您也應該閱讀</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">應用行為顯示</a></li>
@@ -83,7 +83,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -138,7 +138,7 @@
-<h2 id="launching-activity">指定您應用程式的啟動器應用行為顯示</h2>
+<h2 id="launching-activity">指定您應用程式的啟動器應用行為顯示</h2>
<p>若使用者從主螢幕中選取您的應用程式圖示，系統會針對應用程式中您已宣告作為「啟動器」(或「主程式」) 應用行為顯示的 {@link android.app.Activity}，呼叫 {@link
android.app.Activity#onCreate onCreate()} 方法。
@@ -151,7 +151,7 @@
<p>必須在宣示說明中使用 <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a> (包括 {@link
android.content.Intent#ACTION_MAIN MAIN} 行為與 {@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} 類別) 宣告您應用程式的主要應用行為顯示。
-例如：</p>
+例如：</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -200,10 +200,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -268,7 +268,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/stopping.jd b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/stopping.jd
index a2da5ca..9d9ea5d 100644
--- a/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html-intl/intl/zh-tw/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>本課程示範</h2>
<ol>
<li><a href="#Stop">停止您的應用行為顯示</a></li>
<li><a href="#Start">啟動/重新啟動您的應用行為顯示</a></li>
</ol>
-
+
<h2>您也應該閱讀</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">應用行為顯示</a>
@@ -152,13 +152,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -169,8 +169,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html-intl/intl/zh-tw/training/basics/data-storage/files.jd b/docs/html-intl/intl/zh-tw/training/basics/data-storage/files.jd
index 8b8d0a7..cda5864 100644
--- a/docs/html-intl/intl/zh-tw/training/basics/data-storage/files.jd
+++ b/docs/html-intl/intl/zh-tw/training/basics/data-storage/files.jd
@@ -40,7 +40,7 @@
該物件的用途很廣，例如非常適用於影像檔案或透過網路交換的項目。
</p>
-<p>本課程將顯示如何在您的應用程式中執行與檔案相關的基本任務。本課程假設您已熟悉 Linux 檔案系統的基本概念，以及
+<p>本課程將顯示如何在您的應用程式中執行與檔案相關的基本任務。本課程假設您已熟悉 Linux 檔案系統的基本概念，以及
{@link java.io} 中的標準檔案輸入/輸出 API。
</p>
@@ -183,7 +183,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -250,12 +250,12 @@
-
+
<p>例如，您的應用程式下載的附加資源，或暫存媒體檔案都是私用檔案。</p>
</dd>
</dl>
-<p>若您希望將公用檔案儲存在外部儲存空間，請使用
+<p>若您希望將公用檔案儲存在外部儲存空間，請使用
{@link android.os.Environment#getExternalStoragePublicDirectory
getExternalStoragePublicDirectory()} 方法取得代表外部儲存空間內相應目錄的 {@link java.io.File}。
該方法採用對要儲存的檔案類型進行指定 (以便能合理區分這些檔案與其他公用檔案) 的引數，諸如 {@link android.os.Environment#DIRECTORY_MUSIC} 或 {@link
@@ -265,7 +265,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -287,7 +287,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -366,7 +366,7 @@
<div class="note">
<p><strong>注意：</strong>使用者解除安裝您的應用程式時，Android 系統會刪除以下檔案：
-</p>
+</p>
<ul>
<li>您在內部儲存空間儲存的所有檔案</li>
<li>您使用 {@link
diff --git a/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..b051985
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,186 @@
+page.title=子母畫面
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>此文件內容</h2>
+<ol>
+ <li><a href="#declaring">宣告您的活動支援子母畫面</a>
+</li>
+ <li><a href="#pip_button">將您的活動切換到子母畫面</a>
+</li>
+ <li><a href="#handling_ui">處理子母畫面模式中的 UI</a>
+</li>
+ <li><a href="#continuing_playback">在子母畫面模式中繼續播放影片</a>
+</li>
+ <li><a href="#best">最佳做法</a></li>
+</ol>
+
+<h2>另請參閱</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">多視窗支援</a>
+</li>
+</ol>
+
+</div>
+</div>
+
+<p>在 Android N 中，Android TV 使用者現在可以在應用程式內瀏覽時，同時觀賞螢幕角色中釘選視窗中的影片。
+
+子母畫面 (PIP) 模式讓應用程式在釘選視窗中執行影片活動，同時讓另一個活動在背景持續進行。
+
+PIP 視窗讓使用者在使用您的應用程式時同時多工處理，協助提高使用者的生產力。
+</p>
+
+<p>您的應用程式可決定何時觸發 PIP 模式。以下是一些何時進入 PIP 模式的範例：
+</p>
+
+<ul>
+<li>當使用者從影片返回瀏覽其他內容，您的應用程式可以將影片移入 PIP 模式。
+</li>
+<li>當使用者觀看到影片內容的結尾時，您的應用程式可將影片切換到 PIP 模式。
+主畫面顯示系列中下一集的預告或摘要資訊時。
+</li>
+<li>您的應用程式可以為使用者提供一個觀賞影片時佇列其他內容的方式。
+當主畫面顯示內容選擇活動時，影片繼續在 PIP 模式中播放。
+</li>
+</ul>
+
+<p>PIP 視窗為 240x135 dp，在系統所選的螢幕上四個角落之一的最上層顯示。
+使用者只要按住遙控器上的 <b>Home</b> 按鈕，即可帶出 PIP 選單，讓他們將 PIP 視窗切換成全螢幕或關閉 PIP 視窗。
+
+如果另一個影片開始在主畫面上播放，會自動關閉 PIP 視窗。
+
+使用者也可以透過 Recents 關閉 PIP 視窗。</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>圖 1.</strong> 當使用者瀏覽主畫面上的內容時，可看到螢幕角落的子母畫面中的影片。
+
+</p>
+
+<p>PIP 利用 Android N 中提供的多視窗 API 來提供釘選影片疊加層視窗。
+若要將 PIP 新增到您的應用程式，您需要註冊支援 PIP 的活動，在需要時將活動切換到 PIP 模式，以及確定活動在 PIP 模式時會隱藏 UI 元素且影片繼續播放。
+
+
+</p>
+
+<h2 id="declaring">宣告您的活動支援子母畫面</h2>
+
+<p>根據預設，系統不會自動為應用程式支援 PIP。如果您想要應用程式 PIP，請將
+<code>android:supportsPictureInPicture</code> 和
+<code>android:resizeableActivity</code> 設定成 <code>true</code>，在宣示說明中註冊影片活動。
+
+另外也請指定您的活動處理版面配置設定變更，如此一來，在 PIP 模式轉換期間版面配置變更時，才不會重新啟動您的活動。
+
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>註冊您的活動時，請記住在 PIP 模式中，您的活動會顯示在電視螢幕上小的疊加層視窗中。
+顯示最少 UI 的影片播放活動可提供最佳的使用者體驗。
+包含小型 UI 元素的活動在切換到 PIP 模式時無法提供出色的使用者體驗，因為使用者在 PIP 視窗中看不到 UI 元素的詳細資訊。
+
+
+</p>
+
+<h2 id="pip_button">將您的活動切換到子母畫面</h2>
+
+您需要將活動切換到 PIP 模式時，請呼叫
+<code>Activity.enterPictureInPicture()</code>。下列範例會在使用者選取媒體控制列上的專用 PIP 按鈕時切換到 PIP 模式：
+
+</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPicture();
+ return;
+ }
+ ...
+</pre>
+
+<p>將 PIP 按鈕新增到媒體控制列，可讓您的使用者在控制影片播放時輕鬆地切換到 PIP 模式。
+</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>圖 1.</strong> 媒體控制列上的子母畫面按鈕。
+</p>
+
+<p>Android N 包含新的
+<code>PlaybackControlsRow.PictureInPictureAction</code> 類別，它可定義控制列 PIP 動作和使用 PIP 圖示。
+</p>
+
+<h2 id="handling_ui">處理子母畫面模式中的 UI</h2>
+
+<p>當您的活動進入 PIP 模式時，您的活動應該只播放影片。
+在您的活動進入 PIP 時移除 UI 元素，並在您的活動重新進入全螢幕時還原這些元素。覆寫 <code>Activity.onPictureInPictureChanged()</code> 或
+<code>Fragment.onPictureInPictureChanged()</code> 並依需要啟用或停用 UI 元素，例如：
+
+
+</p>
+
+<pre>
+@Override
+public void onPictureInPictureChanged(boolean inPictureInPicture) {
+ if (inPictureInPicture) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">在子母畫面模式中繼續播放影片
+</h2>
+
+<p>當您的活動切換到 PIP 時，系統會將活動視為暫停狀態並呼叫您活動的 <code>onPause()</code> 方法。
+影片播放不應該暫停，而且活動因為 PIP 模式而暫停時，影片應該繼續播放。
+
+查看您活動的
+<code>onPause()</code> 方法中的 PIP 並適當地處理播放，例如：
+</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called due to PIP, do not pause playback
+ if (inPictureInPicture()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>當您的活動從 PIP 模式切換回全螢幕模式時，系統會繼續您的活動並呼叫您的 <code>onResume()</code>方法。
+</p>
+
+<h2 id="best">最佳做法</h2>
+
+<p>PIP 主要針對播放全螢幕影片的活動。將您的活動切換到 PIP 模式時，避免顯示影片內容以外的任何項目。追蹤當您的活動進入 PIP 模式時隱藏 UI 元素，如<a href="#handling_ui">處理子母畫面模式中的 UI</a> 中所述。
+
+
+</p>
+
+<p>因為 PIP 視窗會在螢幕角落上以浮動視窗顯示，所以您應該避免在主畫面上 PIP 視窗可能遮蓋的任何地方顯示重要資訊。
+
+</p>
+
+<p>當活動處於 PIP 模式時，預設它不會取得輸入焦點。若要在處於 PIP 模式時接收輸入事件，請使用
+<code>MediaSession.setMediaButtonReceiver()</code>。
+</p>
diff --git a/docs/html-intl/intl/zh-tw/preview/features/tv-recording-api.jd b/docs/html-intl/intl/zh-tw/training/tv/tif/content-recording.jd
similarity index 100%
rename from docs/html-intl/intl/zh-tw/preview/features/tv-recording-api.jd
rename to docs/html-intl/intl/zh-tw/training/tv/tif/content-recording.jd
diff --git a/docs/html/_project.yaml b/docs/html/_project.yaml
new file mode 100644
index 0000000..a67469b
--- /dev/null
+++ b/docs/html/_project.yaml
@@ -0,0 +1,5 @@
+name: "Home"
+home_url: /
+description: "Android Developers website."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 6e1cc23..3dcc736 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -23,6 +23,8 @@
to: /studio/debug/index.html
- from: /sdk/compatibility-library.html
to: /topic/libraries/support-library/index.html
+- from: /billions
+ to: /topic/billions/index.html
- from: /tools/extras/support-library.html
to: /topic/libraries/support-library/index.html
- from: /training/basics/fragments/support-lib.html
@@ -149,9 +151,11 @@
to: /google/play/licensing/index.html
- from: /google/play/billing/billing_about.html
to: /google/play/billing/index.html
-- from: /guide/developing/tools/
+- from: /guide/developing/tools/proguard.html
+ to: /studio/build/shrink-code.html
+- from: /guide/developing/tools/...
to: /studio/command-line/
-- from: /guide/developing/
+- from: /guide/developing/...
to: /studio/
- from: /tools/aidl.html
to: /guide/components/aidl.html
@@ -319,6 +323,8 @@
to: https://www.google.com/design/spec/layout/principles.html
- from: /design/patterns/navigation-drawer.html
to: https://www.google.com/design/spec/patterns/navigation-drawer.html
+- from: /design/patterns/notifications.html
+ to: https://material.google.com/patterns/notifications.html
- from: /design/patterns/selection.html
to: https://www.google.com/design/spec/patterns/selection.html
- from: /design/patterns/settings.html
@@ -359,6 +365,8 @@
to: /about/dashboards/index.html
- from: /resources/community-groups.html
to: /support.html
+- from: /community/index.html
+ to: /support.html
- from: /guide/tutorials/
to: /resources/tutorials/
- from: /resources/tutorials/views/hello-linearlayout.html
@@ -417,6 +425,8 @@
to: /training/implementing-navigation/lateral.html
- from: /training/cloudsync/aesync.html
to: /google/gcm/index.html
+- from: /training/cloudsync/index.html
+ to: /training/backup/index.html
- from: /training/basics/location/
to: /training/location/
- from: /training/monetization/index.html
@@ -801,8 +811,22 @@
to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
- from: /shareables/...
to: https://commondatastorage.googleapis.com/androiddevelopers/shareables/...
-- from: /downloads/...
- to: https://commondatastorage.googleapis.com/androiddevelopers/...
+- from: /downloads/
+ to: https://commondatastorage.googleapis.com/androiddevelopers/
+- from: /training/performance/battery/network/action-any-traffic.html
+ to: /topic/performance/power/network/action-any-traffic.html
+- from: /training/performance/battery/network/action-app-traffic.html
+ to: /topic/performance/power/network/action-app-traffic.html
+- from: /training/performance/battery/network/action-server-traffic.html
+ to: /topic/performance/power/network/action-server-traffic.html
+- from: /training/performance/battery/network/action-user-traffic.html
+ to: /topic/performance/power/network/action-user-traffic.html
+- from: /training/performance/battery/network/analyze-data.html
+ to: /topic/performance/power/network/analyze-data.html
+- from: /training/performance/battery/network/gather-data.html
+ to: /topic/performance/power/network/gather-data.html
+- from: /training/performance/battery/network/index.html
+ to: /topic/performance/power/network/index.html
# Redirects for the new [dac]/topic/libraries/ area
@@ -1128,47 +1152,47 @@
# Android Studio help button redirects
- from: /r/studio-ui/vector-asset-studio.html
- to: /studio/write/vector-asset-studio.html
+ to: /studio/write/vector-asset-studio.html?utm_medium=android-studio
- from: /r/studio-ui/image-asset-studio.html
- to: /studio/write/image-asset-studio.html
+ to: /studio/write/image-asset-studio.html?utm_medium=android-studio
- from: /r/studio-ui/project-structure.html
- to: /studio/projects/index.html
+ to: /studio/projects/index.html?utm_medium=android-studio
- from: /r/studio-ui/android-monitor.html
- to: /studio/profile/android-monitor.html
+ to: /studio/profile/android-monitor.html?utm_medium=android-studio
- from: /r/studio-ui/am-logcat.html
- to: /studio/debug/am-logcat.html
+ to: /studio/debug/am-logcat.html?utm_medium=android-studio
- from: /r/studio-ui/am-memory.html
- to: /studio/profile/am-memory.html
+ to: /studio/profile/am-memory.html?utm_medium=android-studio
- from: /r/studio-ui/am-cpu.html
- to: /studio/profile/am-cpu.html
+ to: /studio/profile/am-cpu.html?utm_medium=android-studio
- from: /r/studio-ui/am-gpu.html
- to: /studio/profile/am-gpu.html
+ to: /studio/profile/am-gpu.html?utm_medium=android-studio
- from: /r/studio-ui/am-network.html
- to: /studio/profile/am-network.html
+ to: /studio/profile/am-network.html?utm_medium=android-studio
- from: /r/studio-ui/am-hprof.html
- to: /studio/profile/am-hprof.html
+ to: /studio/profile/am-hprof.html?utm_medium=android-studio
- from: /r/studio-ui/am-allocation.html
- to: /studio/profile/am-allocation.html
+ to: /studio/profile/am-allocation.html?utm_medium=android-studio
- from: /r/studio-ui/am-methodtrace.html
- to: /studio/profile/am-methodtrace.html
+ to: /studio/profile/am-methodtrace.html?utm_medium=android-studio
- from: /r/studio-ui/am-sysinfo.html
- to: /studio/profile/am-sysinfo.html
+ to: /studio/profile/am-sysinfo.html?utm_medium=android-studio
- from: /r/studio-ui/am-screenshot.html
- to: /studio/debug/am-screenshot.html
+ to: /studio/debug/am-screenshot.html?utm_medium=android-studio
- from: /r/studio-ui/am-video.html
- to: /studio/debug/am-video.html
+ to: /studio/debug/am-video.html?utm_medium=android-studio
- from: /r/studio-ui/avd-manager.html
- to: /studio/run/managing-avds.html
+ to: /studio/run/managing-avds.html?utm_medium=android-studio
- from: /r/studio-ui/rundebugconfig.html
- to: /studio/run/index.html
+ to: /studio/run/rundebugconfig.html?utm_medium=android-studio
- from: /r/studio-ui/devicechooser.html
- to: /studio/run/emulator.html
+ to: /studio/run/emulator.html?utm_medium=android-studio
- from: /r/studio-ui/virtualdeviceconfig.html
- to: /studio/run/managing-avds.html
+ to: /studio/run/managing-avds.html?utm_medium=android-studio
- from: /r/studio-ui/emulator.html
- to: /studio/run/emulator.html
+ to: /studio/run/emulator.html?utm_medium=android-studio
- from: /r/studio-ui/instant-run.html
- to: /studio/run/index.html#instant-run
+ to: /studio/run/index.html?utm_medium=android-studio#instant-run
- from: /r/studio-ui/test-recorder.html
to: http://tools.android.com/tech-docs/test-recorder
- from: /r/studio-ui/export-licenses.html
@@ -1176,4 +1200,53 @@
- from: /r/studio-ui/experimental-to-stable-gradle.html
to: http://tools.android.com/tech-docs/new-build-system/gradle-experimental/experimental-to-stable-gradle
- from: /r/studio-ui/sdk-manager.html
- to: https://developer.android.com/studio/intro/update.html#sdk-manager
\ No newline at end of file
+ to: /studio/intro/update.html?utm_medium=android-studio#sdk-manager
+- from: /r/studio-ui/newjclass.html
+ to: /studio/write/index.html?utm_medium=android-studio
+- from: /r/studio-ui/menu-help.html
+ to: /studio/intro/index.html?utm_medium=android-studio
+- from: /r/studio-ui/menu-start.html
+ to: /training/index.html?utm_medium=android-studio
+
+# Redirects from (removed) N Preview documentation
+- from: /preview/features/afw.html
+ to: https://developers.google.com/android/work/overview
+- from: /preview/features/multi-window.html
+ to: /guide/topics/ui/multi-window.html
+- from: /preview/features/icu4j-framework.html
+ to: /guide/topics/resources/icu4j-framework.html
+- from: /preview/features/key-attestation.html
+ to: /training/articles/security-key-attestation.html
+- from: /preview/features/security-config.html
+ to: /training/articles/security-config.html
+- from: /preview/features/picture-in-picture.html
+ to: /training/tv/playback/picture-in-picture.html
+- from: /preview/features/tv-recording-api.html
+ to: /training/tv/tif/content-recording.html
+- from: /preview/features/direct-boot.html
+ to: /training/articles/direct-boot.html
+- from: /preview/features/scoped-folder-access.html
+ to: /training/articles/scoped-directory-access.html
+- from: /preview/features/notification-updates.html
+ to: /guide/topics/ui/notifiers/notifications.html
+- from: /preview/features/multilingual-support.html
+ to: /guide/topics/resources/multilingual-support.html
+- from: /preview/j8-jack.html
+ to: /guide/platform/j8-jack.html
+- from: /about/versions/marshmallow/samples.html
+ to: /about/versions/marshmallow/android-6.0-samples.html
+- from: /preview/behavior-changes.html
+ to: /about/versions/nougat/android-7.0-changes.html
+- from: /preview/samples.html
+ to: /about/versions/nougat/android-7.0-samples.html
+- from: /preview/guide.html
+ to: /about/versions/nougat/android-7.0-testing.html
+- from: /preview/api-overview.html
+ to: /about/versions/nougat/android-7.0.html
+- from: /preview/index.html
+ to: /about/versions/nougat/index.html
+- from: /preview/features/background-optimization.html
+ to: /topic/performance/background-optimization.html
+- from: /preview/features/data-saver.html
+ to: /training/basics/network-ops/data-saver.html
+
diff --git a/docs/html/about/_book.yaml b/docs/html/about/_book.yaml
index fdbe53f..958435d 100644
--- a/docs/html/about/_book.yaml
+++ b/docs/html/about/_book.yaml
@@ -1,4 +1,16 @@
toc:
+- title: Nougat
+ path: /about/versions/nougat/index.html
+ section:
+ - title: Android 7.0 APIs
+ path: /about/versions/nougat/android-7.0.html
+ - title: Android 7.0 Changes
+ path: /about/versions/nougat/android-7.0-changes.html
+ - title: Android 7.0 Samples
+ path: /about/versions/nougat/android-7.0-samples.html
+ - title: Android 7.0 Testing
+ path: /about/versions/nougat/android-7.0-testing.html
+
- title: Marshmallow
path: /about/versions/marshmallow/index.html
section:
@@ -7,7 +19,9 @@
- title: Android 6.0 Changes
path: /about/versions/marshmallow/android-6.0-changes.html
- title: Android 6.0 Samples
- path: /about/versions/marshmallow/samples.html
+ path: /about/versions/marshmallow/android-6.0-samples.html
+ - title: Android 6.0 Testing
+ path: /about/versions/marshmallow/android-6.0-testing.html
- title: Lollipop
path: /about/versions/lollipop.html
diff --git a/docs/html/about/_project.yaml b/docs/html/about/_project.yaml
new file mode 100644
index 0000000..160cf55
--- /dev/null
+++ b/docs/html/about/_project.yaml
@@ -0,0 +1,5 @@
+name: "Android"
+home_url: /about/
+description: "Android, the world's most popular mobile platform"
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/about/android.jd b/docs/html/about/android.jd
index e3b6958..6e57390 100644
--- a/docs/html/about/android.jd
+++ b/docs/html/about/android.jd
@@ -26,11 +26,11 @@
<blockquote>Every day more than a million new Android devices are activated worldwide.</blockquote>
<p>Android’s openness has made it a favorite for consumers and developers alike,
-driving strong growth in app consumption. Android users download
+driving strong growth in app consumption. Android users download
billions of apps and games from Google Play each month. </p>
<p>With its partners, Android is continuously pushing the boundaries of hardware and software
-forward to bring new capabilities to users and developers. For developers,
+forward to bring new capabilities to users and developers. For developers,
Android innovation lets you build powerful, differentiated applications
that use the latest mobile technologies.</p>
@@ -59,7 +59,7 @@
advantage of the hardware capabilities available on each device. It
automatically adapts your UI to look its best on each device, while giving you
as much control as you want over your UI on different device
-types. </p>
+types. </p>
<p>For example, you can create a single app binary that's optimized for
both phone and tablet form factors. You declare your UI in lightweight sets of XML
@@ -70,7 +70,7 @@
and so on.</p>
-<p>To help you develop efficiently, the <a href="{@docRoot}tools/index.html">Android
+<p>To help you develop efficiently, the <a href="{@docRoot}tools/index.html">Android
Developer Tools</a>
offer a full Java IDE with advanced features for developing, debugging, and
packaging Android apps. Using the IDE, you can develop on any available Android
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd
index 911e256..f5d23e8 100644
--- a/docs/html/about/dashboards/index.jd
+++ b/docs/html/about/dashboards/index.jd
@@ -59,7 +59,7 @@
</div>
-<p style="clear:both"><em>Data collected during a 7-day period ending on June 6, 2016.
+<p style="clear:both"><em>Data collected during a 7-day period ending on August 1, 2016.
<br/>Any versions with less than 0.1% distribution are not shown.</em>
</p>
@@ -81,7 +81,7 @@
</div>
-<p style="clear:both"><em>Data collected during a 7-day period ending on June 6, 2016.
+<p style="clear:both"><em>Data collected during a 7-day period ending on August 1, 2016.
<br/>Any screen configurations with less than 0.1% distribution are not shown.</em></p>
@@ -101,7 +101,7 @@
<img alt="" style="float:right"
-src="//chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A48.6%2C41.8%2C9.6&chco=c4df9b%2C6fad0c&cht=p&chs=400x250">
+src="//chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A46.0%2C42.6%2C11.4&chco=c4df9b%2C6fad0c&cht=p&chs=400x250">
<p>To declare which version of OpenGL ES your application requires, you should use the {@code
android:glEsVersion} attribute of the <a
@@ -119,21 +119,21 @@
</tr>
<tr>
<td>2.0</td>
-<td>48.6%</td>
+<td>46.0%</td>
</tr>
<tr>
<td>3.0</td>
-<td>41.8%</td>
+<td>42.6%</td>
</tr>
<tr>
<td>3.1</td>
-<td>9.6%</td>
+<td>11.4%</td>
</tr>
</table>
-<p style="clear:both"><em>Data collected during a 7-day period ending on June 6, 2016</em></p>
+<p style="clear:both"><em>Data collected during a 7-day period ending on August 1, 2016</em></p>
@@ -147,28 +147,28 @@
"Large": {
"hdpi": "0.5",
"ldpi": "0.2",
- "mdpi": "4.5",
- "tvdpi": "2.2",
+ "mdpi": "4.3",
+ "tvdpi": "2.1",
"xhdpi": "0.5"
},
"Normal": {
- "hdpi": "41.1",
- "mdpi": "4.2",
+ "hdpi": "40.0",
+ "mdpi": "3.8",
"tvdpi": "0.1",
- "xhdpi": "25.6",
- "xxhdpi": "15.0"
+ "xhdpi": "27.3",
+ "xxhdpi": "15.5"
},
"Small": {
- "ldpi": "2.0"
+ "ldpi": "1.8"
},
"Xlarge": {
"hdpi": "0.3",
- "mdpi": "3.1",
+ "mdpi": "2.9",
"xhdpi": "0.7"
}
},
- "densitychart": "//chart.googleapis.com/chart?chs=400x250&cht=p&chco=c4df9b%2C6fad0c&chf=bg%2Cs%2C00000000&chd=t%3A2.2%2C11.8%2C2.3%2C41.9%2C26.8%2C15.0&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi",
- "layoutchart": "//chart.googleapis.com/chart?chs=400x250&cht=p&chco=c4df9b%2C6fad0c&chf=bg%2Cs%2C00000000&chd=t%3A4.1%2C7.9%2C86.0%2C2.0&chl=Xlarge%7CLarge%7CNormal%7CSmall"
+ "densitychart": "//chart.googleapis.com/chart?chd=t%3A2.0%2C11.0%2C2.2%2C40.8%2C28.5%2C15.5&chf=bg%2Cs%2C00000000&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&cht=p&chs=400x250&chco=c4df9b%2C6fad0c",
+ "layoutchart": "//chart.googleapis.com/chart?chd=t%3A3.9%2C7.6%2C86.7%2C1.8&chf=bg%2Cs%2C00000000&chl=Xlarge%7CLarge%7CNormal%7CSmall&cht=p&chs=400x250&chco=c4df9b%2C6fad0c"
}
];
@@ -176,7 +176,7 @@
var VERSION_DATA =
[
{
- "chart": "//chart.googleapis.com/chart?chs=500x250&cht=p&chco=c4df9b%2C6fad0c&chf=bg%2Cs%2C00000000&chd=t%3A0.1%2C2.0%2C1.9%2C18.9%2C31.6%2C35.4%2C10.1&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat%7CLollipop%7CMarshmallow",
+ "chart": "//chart.googleapis.com/chart?chd=t%3A0.1%2C1.7%2C1.6%2C16.7%2C29.2%2C35.5%2C15.2&chf=bg%2Cs%2C00000000&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat%7CLollipop%7CMarshmallow&cht=p&chs=500x250&chco=c4df9b%2C6fad0c",
"data": [
{
"api": 8,
@@ -186,47 +186,47 @@
{
"api": 10,
"name": "Gingerbread",
- "perc": "2.0"
+ "perc": "1.7"
},
{
"api": 15,
"name": "Ice Cream Sandwich",
- "perc": "1.9"
+ "perc": "1.6"
},
{
"api": 16,
"name": "Jelly Bean",
- "perc": "6.8"
+ "perc": "6.0"
},
{
"api": 17,
"name": "Jelly Bean",
- "perc": "9.4"
+ "perc": "8.3"
},
{
"api": 18,
"name": "Jelly Bean",
- "perc": "2.7"
+ "perc": "2.4"
},
{
"api": 19,
"name": "KitKat",
- "perc": "31.6"
+ "perc": "29.2"
},
{
"api": 21,
"name": "Lollipop",
- "perc": "15.4"
+ "perc": "14.1"
},
{
"api": 22,
"name": "Lollipop",
- "perc": "20.0"
+ "perc": "21.4"
},
{
"api": 23,
"name": "Marshmallow",
- "perc": "10.1"
+ "perc": "15.2"
}
]
}
@@ -381,7 +381,7 @@
$divtable.append($table);
$divchart.append($chart);
$div.append($divtable).append($divchart);
- $("#version-chart").append($div);
+ $("#version-chart").replaceWith($div);
});
@@ -449,7 +449,7 @@
// stack up and insert the elements
$div.append($table).append($sizechart).append($densitychart);
- $("#screens-chart").append($div);
+ $("#screens-chart").replaceWith($div);
});
// TODO (akassay): Remove this.
diff --git a/docs/html/about/index.jd b/docs/html/about/index.jd
index 22f504e..274a511 100644
--- a/docs/html/about/index.jd
+++ b/docs/html/about/index.jd
@@ -34,11 +34,11 @@
<blockquote>Every day more than 1 million new Android devices are activated worldwide.</blockquote>
<p>Android’s openness has made it a favorite for consumers and developers alike,
-driving strong growth in app consumption. Android users download more than
+driving strong growth in app consumption. Android users download more than
1.5 billion apps and games from Google Play each month. </p>
<p>With its partners, Android is continuously pushing the boundaries of hardware and software
-forward to bring new capabilities to users and developers. For developers,
+forward to bring new capabilities to users and developers. For developers,
Android innovation lets you build powerful, differentiated applications
that use the latest mobile technologies.</p>
@@ -68,7 +68,7 @@
advantage of the hardware capabilities available on each device. It
automatically adapts your UI to look its best on each device, while giving you
as much control as you want over your UI on different device
-types. </p>
+types. </p>
<p>For example, you can create a single app binary that's optimized for
both phone and tablet form factors. You declare your UI in lightweight sets of XML
@@ -79,7 +79,7 @@
and so on.</p>
-<p>To help you develop efficiently, the <a href="{@docRoot}tools/index.html">Android
+<p>To help you develop efficiently, the <a href="{@docRoot}tools/index.html">Android
Developer Tools</a>
offer a full Java IDE with advanced features for developing, debugging, and
packaging Android apps. Using the IDE, you can develop on any available Android
diff --git a/docs/html/about/versions/android-1.1.jd b/docs/html/about/versions/android-1.1.jd
index b2a1615..e7d059e 100644
--- a/docs/html/about/versions/android-1.1.jd
+++ b/docs/html/about/versions/android-1.1.jd
@@ -9,7 +9,7 @@
<em>API Level:</em> <strong>2</strong></p>
-<p>This document provides version notes for the Android 1.1 system image included in the SDK.
+<p>This document provides version notes for the Android 1.1 system image included in the SDK.
<ul>
<li><a href="#overview">Overview</a>
@@ -29,7 +29,7 @@
Android-powered handsets starting in February 2009. </p>
<p>The Android 1.1 system image delivers an updated version of the framework
-API. As with the Android 1.0 API, the Android 1.1 API
+API. As with the Android 1.0 API, the Android 1.1 API
is assigned an integer identifier — <strong>2</strong> — that is
stored in the system itself. This identifier, called the "API Level", allows the
system to correctly determine whether an application is compatible with
@@ -37,8 +37,8 @@
<p>Applications indicate the lowest system API Level that they are compatible with by adding
a value to the <code>android:minSdkVersion</code> attribute.
-The value of the attribute is an integer corresponding to an API Level
-identifier. Prior to installing an application, the system checks the value of
+The value of the attribute is an integer corresponding to an API Level
+identifier. Prior to installing an application, the system checks the value of
<code>android:minSdkVersion</code> and allows the install only
if the referenced integer is less than or equal to the API Level integer stored
in the system itself. </p>
@@ -139,7 +139,7 @@
<li>German (de) </li>
</ul>
-<p>Localized UI strings match the locales that are displayable in
+<p>Localized UI strings match the locales that are displayable in
the emulator, accessible through the device Settings application.</p>
<h2 id="resolved-issues">Resolved Issues</h2>
diff --git a/docs/html/about/versions/android-1.5-highlights.jd b/docs/html/about/versions/android-1.5-highlights.jd
index dd4d218..e0bae48 100644
--- a/docs/html/about/versions/android-1.5-highlights.jd
+++ b/docs/html/about/versions/android-1.5-highlights.jd
@@ -7,7 +7,7 @@
</p>
-<p>The Android 1.5 platform introduces many new features for users and developers.
+<p>The Android 1.5 platform introduces many new features for users and developers.
The list below provides an overview of the changes. </p>
<ul>
@@ -65,7 +65,7 @@
<ul>
<li>Widgets
<ul>
- <li>Bundled home screen widgets include: analog clock, calendar,
+ <li>Bundled home screen widgets include: analog clock, calendar,
music player, picture frame, and search</li>
</ul></li>
<li>Live folders</li>
@@ -121,7 +121,7 @@
<li>Google applications (not available in the Android 1.5 System Image that is
included in the Android SDK)
<ul>
- <li>View Google Talk friends' status in Contacts, SMS, MMS, GMail, and
+ <li>View Google Talk friends' status in Contacts, SMS, MMS, GMail, and
Email applications</li>
<li>Batch actions such as archive, delete, and label on Gmail messages</li>
<li>Upload videos to Youtube</li>
@@ -165,7 +165,7 @@
</ul>
</li>
-<li>Input Method framework
+<li>Input Method framework
<ul>
<li>{@link android.inputmethodservice.InputMethodService Input Method
Service} framework</li>
diff --git a/docs/html/about/versions/android-1.5.jd b/docs/html/about/versions/android-1.5.jd
index 775561b..45a27ee 100644
--- a/docs/html/about/versions/android-1.5.jd
+++ b/docs/html/about/versions/android-1.5.jd
@@ -55,7 +55,7 @@
<h2 id="features">Platform Highlights</h2>
<p>For a list of new user features and platform highlights, see the <a
-href="http://developer.android.com/about/versions/android-{@sdkPlatformVersion}-highlights.html">Android
+href="http://developer.android.com/about/versions/android-{@sdkPlatformVersion}-highlights.html">Android
{@sdkPlatformVersion} Platform Highlights</a> document.</p>
<h2 id="relnotes">Revisions</h2>
@@ -119,10 +119,10 @@
<dt>Tools:</dt>
<dd>
-<ul>
+<ul>
<li>Adds support for library projects in the Ant build system.</li>
<li>Fixes test project build in the Ant build system.</li>
-</ul>
+</ul>
</dd>
</dl>
@@ -256,8 +256,8 @@
<h3 id="api-diff">API differences report</h3>
-<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
-the previous version, see the <a href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API
+<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
+the previous version, see the <a href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API
Differences Report</a>.</p>
@@ -300,8 +300,8 @@
<p>The system image included in the downloadable platform provides a variety of
built-in locales. In some cases, region-specific strings are available for the
locales. In other cases, a default version of the language is used. The
-languages that are available in the Android {@sdkPlatformVersion} system
-image are listed below (with <em>language</em>_<em>country/region</em>
+languages that are available in the Android {@sdkPlatformVersion} system
+image are listed below (with <em>language</em>_<em>country/region</em>
locale descriptor).</p>
<table style="border:0;padding-bottom:0;margin-bottom:0;">
@@ -341,7 +341,7 @@
</tr>
</table>
-<p>Localized UI strings match the locales that are accessible
+<p>Localized UI strings match the locales that are accessible
through Settings.</p>
<h2 id="skins">Emulator Skins</h2>
diff --git a/docs/html/about/versions/android-1.6-highlights.jd b/docs/html/about/versions/android-1.6-highlights.jd
index 88c0f55..9179579 100644
--- a/docs/html/about/versions/android-1.6-highlights.jd
+++ b/docs/html/about/versions/android-1.6-highlights.jd
@@ -28,13 +28,13 @@
<object width="278" height="180">
<param name="movie" value="http://www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&"></param>
<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
-<embed src="//www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&" type="application/x-shockwave-flash"
+<embed src="//www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&" type="application/x-shockwave-flash"
allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>
</object>
</div>
-<p>The Android 1.6 platform introduces new features for users and developers.
+<p>The Android 1.6 platform introduces new features for users and developers.
This page provides an overview of some new features and technologies.</p>
<ul>
@@ -44,7 +44,7 @@
</ul>
-
+
<h2 id="UserFeatures" style="clear:right">New User Features</h2>
<!-- screenshots float right -->
@@ -53,7 +53,7 @@
<img src="{@docRoot}sdk/images/search.png" class="screenshot" alt="" /><br/>
Quick Search Box
</div>
-
+
<div class="screenshot">
<img src="{@docRoot}sdk/images/camera.png" class="screenshot" alt="" /><br/>
New Camera/Camcorder UI
@@ -67,32 +67,32 @@
<h3 id="QuickSearchBox">Quick Search Box for Android</h3>
-<p>Android 1.6 includes a redesigned search framework that provides a quick,
-effective, and consistent way for users to search across multiple sources—such as
-browser bookmarks & history, contacts, and the web—directly from
+<p>Android 1.6 includes a redesigned search framework that provides a quick,
+effective, and consistent way for users to search across multiple sources—such as
+browser bookmarks & history, contacts, and the web—directly from
the home screen.</p>
-<p>The system constantly learns which search results are more relevant based on what is
-clicked. So popular contacts or apps that have previously been picked will bubble up to
+<p>The system constantly learns which search results are more relevant based on what is
+clicked. So popular contacts or apps that have previously been picked will bubble up to
the top when a user types the first few letters of a relevant query.</p>
-<p>The search framework also provides developers a way to easily expose relevant
+<p>The search framework also provides developers a way to easily expose relevant
content from their applications in Quick Search Box.</p>
<h3 id="Camera">Camera, Camcorder, and Gallery</h3>
-<p>An updated user interface provides an integrated camera, camcorder, and gallery experience.
-Users can quickly toggle between still and video capture modes. Additionally, the gallery
+<p>An updated user interface provides an integrated camera, camcorder, and gallery experience.
+Users can quickly toggle between still and video capture modes. Additionally, the gallery
enables users to select multiple photos for deletion.</p>
<p>Android 1.6 also provides a much faster camera experience.
-Compared to the previous release, launching the camera is now 39% faster,
+Compared to the previous release, launching the camera is now 39% faster,
and there is a 28% improvement in the time from completing one shot to the next.</p>
<h3 id="VPN">VPN, 802.1x</h3>
-<p>A new Virtual Private Network (VPN) control panel in Settings allows users
+<p>A new Virtual Private Network (VPN) control panel in Settings allows users
to configure and connect to the following types of VPNs:</p>
<ul>
@@ -105,8 +105,8 @@
<h3 id="Battery">Battery usage indicator</h3>
-<p>A new battery usage screen lets users see which apps and services are consuming
-battery power. If the user determines that a particular service or application is
+<p>A new battery usage screen lets users see which apps and services are consuming
+battery power. If the user determines that a particular service or application is
using too much power, they can take action to save the battery by
adjusting settings, stopping the application, or uninstalling the application.</p>
@@ -132,11 +132,11 @@
<ul>
<li>At the homescreen, users can choose among <em>Apps</em>, <em>Games</em>, and <em>Downloads</em>.</li>
<li>Inside a category, users can explore titles that are <em>Top paid</em>, <em>Top free</em>, and <em>Just in</em>.</li>
- <li>For each title, users can now see screenshots submitted by developers in addition to
+ <li>For each title, users can now see screenshots submitted by developers in addition to
reviews from other users.</li>
</ul>
-
-
+
+
<h2 id="PlatformTechnologies" style="clear:right">New Platform Technologies</h2>
@@ -145,44 +145,44 @@
<p>The Android search framework has been redesigned and expanded to provide
third-party applications the opportunity to surface
-content from their applications in Quick Search Box, the global search tool.
-To do this, developers will need to make their app "searchable" and provide
+content from their applications in Quick Search Box, the global search tool.
+To do this, developers will need to make their app "searchable" and provide
suggestions in response to user queries.
-To enable application search suggestions, users simply select each application from which
+To enable application search suggestions, users simply select each application from which
they'd like to receive suggestions, under Searchable items in the Search settings.</p>
<h3 id="TTS">Text-to-speech engine</h3>
-<p>Android 1.6 features a multi-lingual speech synthesis engine called Pico.
-It allows any Android application to "speak" a string of text with an accent that matches the language.
-The engine supports the following languages: English (American and British accents), French,
-Italian, German and Spanish. If you're using a T-Mobile G1 or Dream device, you'll need to download the
-SpeechSynthesis Data Installer from Google Play, which includes the "voices" needed by the
+<p>Android 1.6 features a multi-lingual speech synthesis engine called Pico.
+It allows any Android application to "speak" a string of text with an accent that matches the language.
+The engine supports the following languages: English (American and British accents), French,
+Italian, German and Spanish. If you're using a T-Mobile G1 or Dream device, you'll need to download the
+SpeechSynthesis Data Installer from Google Play, which includes the "voices" needed by the
text-to-speech engine.</p>
<h3 id="Gestures">Gestures</h3>
-<p>A new gestures framework provides application developers with a framework for creating, storing,
+<p>A new gestures framework provides application developers with a framework for creating, storing,
loading, and recognizing gestures and associating them with specific actions.</p>
-<p>Developers can use the new GestureBuilder tool included in the Android 1.6 SDK to generate libraries
+<p>Developers can use the new GestureBuilder tool included in the Android 1.6 SDK to generate libraries
of gestures to include with their application.</p>
<h3 id="A11y">Accessibility</h3>
-<p>Android 1.6 provides a new accessibility framework.
-With this framework, developers can create accessibility plugins that respond to user input,
-such as making a sound when a new window is shown, vibrating when navigating to the top of
+<p>Android 1.6 provides a new accessibility framework.
+With this framework, developers can create accessibility plugins that respond to user input,
+such as making a sound when a new window is shown, vibrating when navigating to the top of
a list, and providing spoken feedback.</p>
<h3 id="Screens">Expanded support for screen densities and resolutions</h3>
-<p>Android 1.6 adds screen support that enables applications to be rendered properly on different
-display resolutions and densities. Developers can also specify the types of screens supported by their
+<p>Android 1.6 adds screen support that enables applications to be rendered properly on different
+display resolutions and densities. Developers can also specify the types of screens supported by their
application.</p>
@@ -208,7 +208,7 @@
<h3 id="DeveloperAPIs">New Framework APIs</h3>
-<p>For a detailed overview of new APIs, see the
-<a href="{@docRoot}about/versions/android-1.6.html#api-changes">Version Notes</a>.
-For a complete report of all API changes, see the
+<p>For a detailed overview of new APIs, see the
+<a href="{@docRoot}about/versions/android-1.6.html#api-changes">Version Notes</a>.
+For a complete report of all API changes, see the
<a href="{@docRoot}sdk/api_diff/4/changes.html">API Differences Report</a>.
diff --git a/docs/html/about/versions/android-1.6.jd b/docs/html/about/versions/android-1.6.jd
index ffca6b6..970c343 100755
--- a/docs/html/about/versions/android-1.6.jd
+++ b/docs/html/about/versions/android-1.6.jd
@@ -289,7 +289,7 @@
<ul>
<li>New <a href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code
- <supports-screens>}</a> element lets you specify the device screen sizes that your
+ <supports-screens>}</a> element lets you specify the device screen sizes that your
application is designed and tested to support, where "size" is a combination
of resolution and density. If your application is run on a device whose screen
size is not specified in the <code><supports-screen></code> element, the system
@@ -324,7 +324,7 @@
</p>
</li>
- <li>New <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
+ <li>New <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
element lets an application specify hardware (or other)
features that it requires to function normally. When an application
specifies such features, the system allows the application to be installed only
@@ -338,7 +338,7 @@
</ul>
</li>
<li>New attributes for the
- <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element:
+ <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element:
<ul>
<li><code>targetSdkVersion</code>: Indicates the API Level that the application is targeting.
It is able to run on older versions (down to minSdkVersion), but was explicitly tested to
diff --git a/docs/html/about/versions/android-2.0-highlights.jd b/docs/html/about/versions/android-2.0-highlights.jd
index c16088a..3f7e1c8 100644
--- a/docs/html/about/versions/android-2.0-highlights.jd
+++ b/docs/html/about/versions/android-2.0-highlights.jd
@@ -33,7 +33,7 @@
<object width="278 height="180">
<param name="movie" value="http://www.youtube.com/v/opZ69P-0Jbc&hl=en&fs=1&"></param>
<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
-<embed src="//www.youtube.com/v/opZ69P-0Jbc&hl=en&fs=1&" type="application/x-shockwave-flash"
+<embed src="//www.youtube.com/v/opZ69P-0Jbc&hl=en&fs=1&" type="application/x-shockwave-flash"
allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>
</object>
</div>
@@ -49,7 +49,7 @@
</ul>
-
+
<h2 id="UserFeatures" style="clear:right">New User Features</h2>
<!-- screenshots float right -->
@@ -99,10 +99,10 @@
<!--
<ul>
- <li>Sync support for contacts from multiple data sources including Exchange.
- Handset manufacturers can choose whether or not to include Exchange support
+ <li>Sync support for contacts from multiple data sources including Exchange.
+ Handset manufacturers can choose whether or not to include Exchange support
in their devices.</li>
- <li>New way to hover on a person to see more info and select communication
+ <li>New way to hover on a person to see more info and select communication
mode (for example, phone, SMS, email).</li>
</ul>
-->
@@ -150,7 +150,7 @@
<h3 id="Browser">Browser</h3>
<ul>
- <li>Refreshed UI with actionable browser URL bar enables users to directly
+ <li>Refreshed UI with actionable browser URL bar enables users to directly
tap the address bar for instant searches and navigation.</li>
<li>Bookmarks with web page thumbnails.</li>
<li>Support for double-tap zoom.</li>
@@ -192,10 +192,10 @@
<h3 id="DeveloperAPIs">New Framework APIs</h3>
<p>Android 2.0 includes several new developer APIs.
-For an overview of new APIs, see the
+For an overview of new APIs, see the
<a href="{@docRoot}about/versions/android-2.0.html#api">Android 2.0 version notes</a>.</p>
-<p>For a complete report of all API changes, see the
+<p>For a complete report of all API changes, see the
<a href="{@docRoot}sdk/api_diff/5/changes.html">API Differences Report</a>.</p>
diff --git a/docs/html/about/versions/android-2.0.1.jd b/docs/html/about/versions/android-2.0.1.jd
index 48f7ae8..b0f4db6 100644
--- a/docs/html/about/versions/android-2.0.1.jd
+++ b/docs/html/about/versions/android-2.0.1.jd
@@ -162,8 +162,8 @@
<p>The system image included in the downloadable platform provides a variety of
built-in locales. In some cases, region-specific strings are available for the
locales. In other cases, a default version of the language is used. The
-languages that are available in the Android {@sdkPlatformVersion} system
-image are listed below (with <em>language</em>_<em>country/region</em> locale
+languages that are available in the Android {@sdkPlatformVersion} system
+image are listed below (with <em>language</em>_<em>country/region</em> locale
descriptor).</p>
<table style="border:0;padding-bottom:0;margin-bottom:0;">
@@ -203,7 +203,7 @@
</tr>
</table>
-<p>Localized UI strings match the locales that are accessible
+<p>Localized UI strings match the locales that are accessible
through Settings.</p>
<h2 id="skins">Emulator Skins</h2>
@@ -263,8 +263,8 @@
system to correctly determine whether an application is compatible with
the system, prior to installing the application. </p>
-<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application, you need to
-set the proper value, "{@sdkPlatformApiLevel}", in the attributes of the <code><uses-sdk></code>
+<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application, you need to
+set the proper value, "{@sdkPlatformApiLevel}", in the attributes of the <code><uses-sdk></code>
element in your application's manifest. </p>
<p>For more information about how to use API Level, see the <a
@@ -345,10 +345,10 @@
<h3 id="api-diff">API differences report</h3>
-<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
+<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
API Level 5, see the <a
href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API
-Differences Report</a>. There are very few API changes in API Level 6,
+Differences Report</a>. There are very few API changes in API Level 6,
so you might also be interested in reviewing the <a
href="{@docRoot}sdk/api_diff/5/changes.html">API
differences between 4 and 5</a>.</p>
diff --git a/docs/html/about/versions/android-2.0.jd b/docs/html/about/versions/android-2.0.jd
index 329af3c..0323686 100644
--- a/docs/html/about/versions/android-2.0.jd
+++ b/docs/html/about/versions/android-2.0.jd
@@ -50,7 +50,7 @@
<h2 id="features">Platform Highlights</h2>
<p>For a list of new user features and platform highlights, see the <a
-href="http://developer.android.com/about/versions/android-{@sdkPlatformVersion}-highlights.html">Android
+href="http://developer.android.com/about/versions/android-{@sdkPlatformVersion}-highlights.html">Android
{@sdkPlatformVersion} Platform Highlights</a> document.</p>
<h2 id="relnotes">Revisions</h2>
@@ -151,8 +151,8 @@
<p>The system image included in the downloadable platform provides a variety of
built-in locales. In some cases, region-specific strings are available for the
locales. In other cases, a default version of the language is used. The
-languages that are available in the Android {@sdkPlatformVersion} system
-image are listed below (with <em>language</em>_<em>country/region</em> locale
+languages that are available in the Android {@sdkPlatformVersion} system
+image are listed below (with <em>language</em>_<em>country/region</em> locale
descriptor).</p>
<table style="border:0;padding-bottom:0;margin-bottom:0;">
@@ -192,7 +192,7 @@
</tr>
</table>
-<p>Localized UI strings match the locales that are accessible
+<p>Localized UI strings match the locales that are accessible
through Settings.</p>
<h2 id="skins">Emulator Skins</h2>
@@ -242,14 +242,14 @@
<h3 id="api-level">API level</h3>
<p>The Android {@sdkPlatformVersion} platform delivers an updated version of the framework
-API. As with previous versions, the Android {@sdkPlatformVersion} API
+API. As with previous versions, the Android {@sdkPlatformVersion} API
is assigned an integer identifier — <strong>{@sdkPlatformApiLevel}</strong> — that is
stored in the system itself. This identifier, called the "API Level", allows the
system to correctly determine whether an application is compatible with
the system, prior to installing the application. </p>
-<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application, you need to
-set the proper value, "{@sdkPlatformApiLevel}", in the attributes of the <code><uses-sdk></code>
+<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application, you need to
+set the proper value, "{@sdkPlatformApiLevel}", in the attributes of the <code><uses-sdk></code>
element in your application's manifest. </p>
<p>For more information about how to use API Level, see the <a
@@ -319,8 +319,8 @@
<p>Android 2.0 is designed to run on devices that use virtual keys for HOME,
MENU, BACK, and SEARCH, rather than physical keys. To support the best user
experience on those devices, the Android platform now executes these buttons at
-key-up, for a key-down/key-up pair, rather than key-down. This helps prevent
-accidental button events and lets the user press the button area and then drag
+key-up, for a key-down/key-up pair, rather than key-down. This helps prevent
+accidental button events and lets the user press the button area and then drag
out of it without generating an event. </p>
<p>This change in behavior should only affect your application if it is
@@ -332,7 +332,7 @@
however, if your application is doing so and it invokes some action on
key-down, rather than key-up, you should modify your code. </p>
-<p>If your application will use APIs introduced in Android 2.0 (API Level 5),
+<p>If your application will use APIs introduced in Android 2.0 (API Level 5),
you can take advantage of new APIs for managing key-event pairs:</p>
<ul>
@@ -363,16 +363,16 @@
</ul>
<p>If you want to update a legacy application so that its handling of the BACK
-key works properly for both Android 2.0 and older platform versions, you
+key works properly for both Android 2.0 and older platform versions, you
can use an approach similar to that shown above. Your code can catch the
-target button event on key-down, set a flag to track the key event, and
-then also catch the event on key-up, executing the desired action if the tracking
-flag is set. You'll also want to watch for focus changes and clear the tracking
+target button event on key-down, set a flag to track the key event, and
+then also catch the event on key-up, executing the desired action if the tracking
+flag is set. You'll also want to watch for focus changes and clear the tracking
flag when gaining/losing focus.</p>
<h3 id="api-diff">API differences report</h3>
-<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
+<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
the previous version, see the <a
href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API Differences Report</a>.</p>
diff --git a/docs/html/about/versions/android-2.1.jd b/docs/html/about/versions/android-2.1.jd
index ce6f1b2..5f8f624 100644
--- a/docs/html/about/versions/android-2.1.jd
+++ b/docs/html/about/versions/android-2.1.jd
@@ -113,10 +113,10 @@
<dt>Tools:</dt>
<dd>
-<ul>
+<ul>
<li>Adds support for library projects in the Ant build system.</li>
<li>Adds improved layout rendering in ADT’s visual layout editor.</li>
-</ul>
+</ul>
</dd>
</dl>
diff --git a/docs/html/about/versions/android-2.3.3.jd b/docs/html/about/versions/android-2.3.3.jd
index eec0735..91f1d28 100644
--- a/docs/html/about/versions/android-2.3.3.jd
+++ b/docs/html/about/versions/android-2.3.3.jd
@@ -81,7 +81,7 @@
<code>android.nfc.action.NDEF_DISCOVERED</code> and
<code>android.nfc.action.TECH_DISCOVERED</code>.</p>
-<p>The NFC API is available in the {@link android.nfc} and
+<p>The NFC API is available in the {@link android.nfc} and
{@link android.nfc.tech} packages. The key classes are: </p>
<ul>
@@ -89,7 +89,7 @@
<li>{@link android.nfc.NdefMessage}, which represents an NDEF data message,
the standard format in which "records" carrying data are transmitted between
devices and tags. An NDEF message certain many NDEF records of different types.
-Applications can receive these messages from
+Applications can receive these messages from
{@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED NDEF_DISCOVERED},
{@link android.nfc.NfcAdapter#ACTION_TECH_DISCOVERED TECH_DISCOVERED}, or
{@link android.nfc.NfcAdapter#ACTION_TAG_DISCOVERED TAG_DISCOVERED} Intents.</li>
@@ -124,15 +124,15 @@
<code><uses-feature android:name="android.hardware.nfc"
android:required="true"></code> to the application's manifest.</p>
-<p class="note">For more information, read the
+<p class="note">For more information, read the
<a href="{@docRoot}guide/topics/connectivity/nfc/index.html">NFC</a> developer guide.</p>
<h3 id="bluetooth">Bluetooth</h3>
<p>Android 2.3.3 adds platform and API support for Bluetooth nonsecure socket
connections. This lets applications communicate with simple devices that may not
-offer a UI for authentication. See
-{@link android.bluetooth.BluetoothDevice#createInsecureRfcommSocketToServiceRecord(java.util.UUID)} and
+offer a UI for authentication. See
+{@link android.bluetooth.BluetoothDevice#createInsecureRfcommSocketToServiceRecord(java.util.UUID)} and
{@link android.bluetooth.BluetoothAdapter#listenUsingInsecureRfcommWithServiceRecord(java.lang.String, java.util.UUID)}
for more information. </p>
@@ -183,7 +183,7 @@
<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application,
you need compile the application against the Android library that is provided in
-the Android {@sdkPlatformVersion} SDK platform. Depending on your needs, you might
+the Android {@sdkPlatformVersion} SDK platform. Depending on your needs, you might
also need to add an <code>android:minSdkVersion="{@sdkPlatformApiLevel}"</code>
attribute to the <code><uses-sdk></code> element in the application's
manifest. If your application is designed to run only on Android 2.3 and higher,
diff --git a/docs/html/about/versions/android-2.3.4.jd b/docs/html/about/versions/android-2.3.4.jd
index 963df9a..8705d1d 100644
--- a/docs/html/about/versions/android-2.3.4.jd
+++ b/docs/html/about/versions/android-2.3.4.jd
@@ -31,7 +31,7 @@
<p>Android 2.3.4 ({@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1})
is a maintenance release that adds several bug fixes and patches
-to the Android 2.3 platform, without any API changes from Android 2.3.3. Additionally,
+to the Android 2.3 platform, without any API changes from Android 2.3.3. Additionally,
Android 2.3.4 brings support for the Open Accessory API to mobile devices,
through the optional <a href="#usb">Open Accessory Library</a>. </p>
diff --git a/docs/html/about/versions/android-2.3.jd b/docs/html/about/versions/android-2.3.jd
index 34fdb52..bc54903 100644
--- a/docs/html/about/versions/android-2.3.jd
+++ b/docs/html/about/versions/android-2.3.jd
@@ -240,7 +240,7 @@
<li>Applications can obtain an instance of the {@link android.app.DownloadManager}
class by calling {@link
android.content.Context#getSystemService(String)} and passing
-{@link android.content.Context#DOWNLOAD_SERVICE}. Applications that request
+{@link android.content.Context#DOWNLOAD_SERVICE}. Applications that request
downloads through this API should register a broadcast receiver for {@link
android.app.DownloadManager#ACTION_NOTIFICATION_CLICKED}, to appropriately
handle when the user clicks on a running download in a notification or from the
@@ -690,7 +690,7 @@
<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application,
you need compile the application against the Android library that is provided in
-the Android {@sdkPlatformVersion} SDK platform. Depending on your needs, you might
+the Android {@sdkPlatformVersion} SDK platform. Depending on your needs, you might
also need to add an <code>android:minSdkVersion="{@sdkPlatformApiLevel}"</code>
attribute to the <code><uses-sdk></code> element in the application's
manifest. If your application is designed to run only on Android 2.3 and higher,
diff --git a/docs/html/about/versions/android-3.0-highlights.jd b/docs/html/about/versions/android-3.0-highlights.jd
index 21dbda6..e9d2b39 100644
--- a/docs/html/about/versions/android-3.0-highlights.jd
+++ b/docs/html/about/versions/android-3.0-highlights.jd
@@ -40,7 +40,7 @@
<p>Welcome to Android 3.0!</p>
-<p>The Android 3.0 platform introduces many new and exciting features for users and developers.
+<p>The Android 3.0 platform introduces many new and exciting features for users and developers.
This document provides a glimpse of some of the new features and technologies, as delivered in
Android 3.0. For a more detailed look at new developer APIs, see the <a
href="{@docRoot}about/versions/android-3.0.html">Android 3.0 Platform</a> document.</p>
@@ -61,7 +61,7 @@
<p>Android 3.0 is a new version of the Android platform that is specifically optimized for devices with larger screen sizes, particularly tablets. It introduces a brand new, truly virtual and “holographic” UI design, as well as an elegant, content-focused interaction model.</p>
-<p>Android 3.0 builds on the things people love most about Android — refined multitasking, rich notifications, Home screen customization, widgets, and more — and transforms them with a vibrant, 3D experience and deeper interactivity, making them familiar but even better than before.</p>
+<p>Android 3.0 builds on the things people love most about Android — refined multitasking, rich notifications, Home screen customization, widgets, and more — and transforms them with a vibrant, 3D experience and deeper interactivity, making them familiar but even better than before.</p>
<p>The new UI brings fresh paradigms for interaction, navigation, and customization and makes them available to all applications — even those built for earlier versions of the platform. Applications written for Android 3.0 are able to use an extended set of UI objects, powerful graphics, and media capabilities to engage users in new ways.</p>
diff --git a/docs/html/about/versions/android-3.0.jd b/docs/html/about/versions/android-3.0.jd
index 5184743..3175d3c 100644
--- a/docs/html/about/versions/android-3.0.jd
+++ b/docs/html/about/versions/android-3.0.jd
@@ -392,7 +392,7 @@
<h3>Extended UI framework</h3>
<ul>
-
+
<li><b>Multiple-choice selection for ListView and GridView</b>
<p>New {@link android.widget.AbsListView#CHOICE_MODE_MULTIPLE_MODAL} mode for {@link
@@ -419,9 +419,9 @@
class in the API Demos sample application.</p>
</li>
-
+
<li><b>New APIs to transform views</b>
-
+
<p>New APIs allow you to easily apply 2D and 3D transformations to views in your activity
layout. New transformations are made possible with a set of object properties that define the view's
layout position, orientation, transparency and more.</p>
@@ -452,7 +452,7 @@
</pre>
</li>
-
+
<li><b>New holographic themes</b>
<p>The standard system widgets and overall look have been redesigned and incorporate a new
@@ -475,55 +475,55 @@
version</a>.</p>
</li>
-
-
+
+
<li><b>New widgets</b>
<ul>
<li>{@link android.widget.AdapterViewAnimator}
<p>Base class for an {@link android.widget.AdapterView} that performs animations when switching
between its views.</p></li>
-
+
<li>{@link android.widget.AdapterViewFlipper}
<p>Simple {@link android.widget.ViewAnimator} that animates between two or more views that have
been added to it. Only one child is shown at a time. If requested, it can automatically flip
between
each child at a regular interval.</p></li>
-
+
<li>{@link android.widget.CalendarView}
<p>Allows users to select dates from a calendar by touching the date and can scroll or fling the
calendar to a desired date. You can configure the range of dates available in the widget.</p></li>
-
+
<li>{@link android.widget.ListPopupWindow}
<p>Anchors itself to a host view and displays a list of choices, such as for a list of
suggestions when typing into an {@link android.widget.EditText} view.</p></li>
-
+
<li>{@link android.widget.NumberPicker}
<p>Enables the user to select a number from a predefined range. The widget presents an input
field and up and down buttons for selecting a number. Touching the input field allows the user to
scroll through values or touch again to directly edit the current value. It also allows you to map
positions to strings, so that the corresponding string is displayed instead of the index
position.</p></li>
-
+
<li>{@link android.widget.PopupMenu}
<p>Displays a {@link android.view.Menu} in a modal popup window that's anchored to a view. The
popup appears below the anchor view if there is room, or above it if there is not. If the IME (soft
keyboard) is visible, the popup does not overlap the IME it until the user touches the
menu.</p></li>
-
+
<li>{@link android.widget.SearchView}
<p>Provides a search box that you can configure to deliver search queries to a specified
activity and display search suggestions (in the same manner as the traditional search dialog). This
widget is particularly useful for offering a search widget in the Action Bar. For more information,
see <a href="{@docRoot}guide/topics/search/search-dialog.html">Creating a Search Interface.</p></li>
-
+
<li>{@link android.widget.StackView}
<p>A view that displays its children in a 3D stack and allows users to swipe through
views like a rolodex.</p></li>
-
+
</ul>
</li>
-
+
</ul>
@@ -545,7 +545,7 @@
<li><b>View support for hardware and software layers</b>
-
+
<p>By default, a {@link android.view.View} has no layer specified. You can specify that the
view be backed by either a hardware or software layer, specified by values {@link
android.view.View#LAYER_TYPE_HARDWARE} and {@link android.view.View#LAYER_TYPE_SOFTWARE}, using
@@ -563,7 +563,7 @@
<p>For more information, see the {@link android.view.View#LAYER_TYPE_HARDWARE} and {@link
android.view.View#LAYER_TYPE_SOFTWARE} documentation.</p>
</li>
-
+
<li><b>Renderscript 3D graphics engine</b>
@@ -591,7 +591,7 @@
should be captured.</p></li>
<li><b>Texture support for image streams</b>
-
+
<p>New {@link android.graphics.SurfaceTexture} allows you to capture an image stream as an OpenGL ES
texture. By calling {@link android.hardware.Camera#setPreviewTexture setPreviewTexture()} for your
{@link android.hardware.Camera} instance, you can specify the {@link
@@ -599,7 +599,7 @@
camera.</p></li>
<li><b>HTTP Live streaming</b>
-
+
<p>Applications can now pass an M3U playlist URL to the media framework to begin an HTTP Live
streaming session. The media framework supports most of the HTTP Live streaming specification,
including adaptive bit rate. See the <a
@@ -607,7 +607,7 @@
more information.</p></li>
<li><b>EXIF data</b>
-
+
<p>The {@link android.media.ExifInterface} includes new fields for photo aperture, ISO, and exposure
time.</p></li>
@@ -810,7 +810,7 @@
events by calling {@code window.addEventListener} with event type {@code "deviceorientation"}
and register for motion events by registering the {@code "devicemotion"} event type.</p>
</li>
-
+
<li><b>CSS 3D Transforms</b>
<p>As defined by the <a href="http://www.w3.org/TR/css3-3d-transforms/">CSS 3D Transform
Module</a> specification, the Browser allows elements rendered by CSS to be transformed in three
@@ -967,7 +967,7 @@
<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application,
you need compile the application against the Android library that is provided in
-the Android {@sdkPlatformVersion} SDK platform. Depending on your needs, you might
+the Android {@sdkPlatformVersion} SDK platform. Depending on your needs, you might
also need to add an <code>android:minSdkVersion="{@sdkPlatformApiLevel}"</code>
attribute to the <code><uses-sdk></code> element in the application's
manifest. If your application is designed to run only on Android 2.3 and higher,
diff --git a/docs/html/about/versions/android-3.1-highlights.jd b/docs/html/about/versions/android-3.1-highlights.jd
index 5283c2a..2a70698 100644
--- a/docs/html/about/versions/android-3.1-highlights.jd
+++ b/docs/html/about/versions/android-3.1-highlights.jd
@@ -93,7 +93,7 @@
<p>The platform also adds new support for USB accessories — external
hardware devices designed to attach to Android-powered devices as USB hosts. When an
accessory is attached, the framework will look for a corresponding application
-and offer to launch it for the user. The accessory can also present a URL
+and offer to launch it for the user. The accessory can also present a URL
to the user, for downloading an appropriate application if one is not already
installed. Users can interact with the application to control powered accessories such
as robotics controllers; docking stations; diagnostic and musical equipment;
@@ -215,7 +215,7 @@
<div style="padding-top:0em;">
<div style="margin-right:1em;float:left;margin-left:0em;"><img src="{@docRoot}sdk/images/3.1/resizeable.png" alt="" width="170" target="_android" style="margin-bottom:0;" />
-<div style="padding-left:1.4em;padding-bottom:1em;width:180px;font-size:.9em"><strong>Figure
+<div style="padding-left:1.4em;padding-bottom:1em;width:180px;font-size:.9em"><strong>Figure
4.</strong> Home screen widgets can now be resized.</div></div>
<p><strong>Calendar</strong></p>
diff --git a/docs/html/about/versions/android-3.1.jd b/docs/html/about/versions/android-3.1.jd
index cdcf51e..e1486be 100644
--- a/docs/html/about/versions/android-3.1.jd
+++ b/docs/html/about/versions/android-3.1.jd
@@ -240,7 +240,7 @@
android.view.MotionEvent#AXIS_HAT_Y}, {@link
android.view.MotionEvent#AXIS_RTRIGGER}, {@link
android.view.MotionEvent#AXIS_ORIENTATION}, {@link
-android.view.MotionEvent#AXIS_THROTTLE}, and many others.
+android.view.MotionEvent#AXIS_THROTTLE}, and many others.
Existing {@link android.view.MotionEvent} axes are represented by {@link
android.view.MotionEvent#AXIS_X}, {@link android.view.MotionEvent#AXIS_Y},
{@link android.view.MotionEvent#AXIS_PRESSURE}, {@link
@@ -299,7 +299,7 @@
<p>Finally, since the motion events from joysticks, gamepads, mice, and
trackballs are not touch events, the platform adds a new callback method for
passing them to a {@link android.view.View} as "generic" motion events.
-Specifically, it reports the non-touch motion events to
+Specifically, it reports the non-touch motion events to
{@link android.view.View}s through a call to {@link
android.view.View#onGenericMotionEvent(android.view.MotionEvent)
onGenericMotionEvent()}, rather than to {@link
@@ -318,7 +318,7 @@
<p class="note">To look at a sample application that uses joystick motion
events, see <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/GameControllerInput.html">GameControllerInput</a>
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/GameControllerInput.html">GameControllerInput</a>
and <a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/GameView.html">GameView</a>.</p>
diff --git a/docs/html/about/versions/android-3.2.jd b/docs/html/about/versions/android-3.2.jd
index 887755c..c6df7f5 100644
--- a/docs/html/about/versions/android-3.2.jd
+++ b/docs/html/about/versions/android-3.2.jd
@@ -132,7 +132,7 @@
<ul>
<li>New resource qualifiers for targeting layouts and other resources to a
-minimum smallestWidth, width, or height, and</li>
+minimum smallestWidth, width, or height, and</li>
<li>New manifest attributes, for specifying the app's maximum
screen compatibility range</li>
</ul>
@@ -201,7 +201,7 @@
screen's smallestWidth is constant, regardless of orientation. Examples:
<code>sw320dp</code>, <code>sw720dp</code>, <code>sw720dp</code>.</li>
-<li><code>wNNNdp</code> and <code>hNNNdp</code> — Specifies the minimum
+<li><code>wNNNdp</code> and <code>hNNNdp</code> — Specifies the minimum
width or height on which the resource should be used, measured in "dp" units. As
mentioned above, a screen's width and height are relative to the orientation of
the screen and change whenever the orientation changes. Examples:
@@ -214,7 +214,7 @@
multiple resource configurations are qualified for a given screen, the system
selects the configuration that is the closest match. For precise control over
which resources are loaded on a given screen, you can tag resources with one
-qualifier or combine several new or existing qualifiers.
+qualifier or combine several new or existing qualifiers.
<p>Based on the typical dimensions listed earlier, here are some examples of how
you could use the new qualifiers:</p>
diff --git a/docs/html/about/versions/android-4.0.3.jd b/docs/html/about/versions/android-4.0.3.jd
index 3be684d..c4b503c 100644
--- a/docs/html/about/versions/android-4.0.3.jd
+++ b/docs/html/about/versions/android-4.0.3.jd
@@ -102,16 +102,16 @@
<li>Adds the class {@link android.provider.CalendarContract.Colors} to represent
a color table in the <a href="{@docRoot}guide/topics/providers/calendar-provider.html">Calendar
Provider</a>. The class provides fields for accessing
-colors available for a given account. Colors are referenced by
+colors available for a given account. Colors are referenced by
{@link android.provider.CalendarContract.ColorsColumns#COLOR_KEY COLOR_KEY}
which must be unique for a given account name/type. These values can only be
updated by the sync adapter.</li>
<li>Adds {@link android.provider.CalendarContract.CalendarColumns#ALLOWED_AVAILABILITY ALLOWED_AVAILABILITY}
-and
+and
{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_ATTENDEE_TYPES ALLOWED_ATTENDEE_TYPES}
for exchange/sync support.</li>
<li>Adds {@link android.provider.CalendarContract.AttendeesColumns#TYPE_RESOURCE}
-(such as conference rooms) for attendees and
+(such as conference rooms) for attendees and
{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY_TENTATIVE},
as well as {@link android.provider.CalendarContract.EventsColumns#EVENT_COLOR_KEY}
for events.</li>
@@ -123,7 +123,7 @@
own padding. Instead, the system now automatically adds padding for each widget,
based the characteristics of the current screen. This leads to a more uniform,
consistent presentation of widgets in a grid. To assist applications that host
-home screen widgets, the platform provides a new method
+home screen widgets, the platform provides a new method
{@link android.appwidget.AppWidgetHostView#getDefaultPaddingForWidget(android.content.Context, android.content.ComponentName, android.graphics.Rect)
getDefaultPaddingForWidget()}. Applications can call this method to get the
system-defined padding and account for it when computing the number of cells to
@@ -136,7 +136,7 @@
android.view.textservice.SpellCheckerSession#cancel() cancel()} method cancels
any pending and running spell-checker tasks in a session.</li>
-<li>For spell-checker services, a new suggestions flag,
+<li>For spell-checker services, a new suggestions flag,
{@link android.view.textservice.SuggestionsInfo#RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS},
lets the services distinguish higher-confidence suggestions from
lower-confidence ones. For example, a spell-checker could set the flag if an
@@ -206,8 +206,8 @@
allow apps to get and set the maximum scroll offset for an
{@link android.view.accessibility.AccessibilityRecord} object.</li>
-<li>When touch-exploration mode is enabled, a new secure setting
-{@link android.provider.Settings.Secure#ACCESSIBILITY_SPEAK_PASSWORD}
+<li>When touch-exploration mode is enabled, a new secure setting
+{@link android.provider.Settings.Secure#ACCESSIBILITY_SPEAK_PASSWORD}
indicates whether the user requests the IME to speak text entered in password fields, even when
a headset is not in use. By default, no password text is spoken unless a headset
is in use.</li>
@@ -217,7 +217,7 @@
<ul>
<li>Adds the new method {@link
-android.speech.tts.TextToSpeech.Engine#getFeatures(java.util.Locale)
+android.speech.tts.TextToSpeech#getFeatures(java.util.Locale)
getFeatures()}for querying and enabling network TTS support.
<li>Adds a new listener class, {@link
android.speech.tts.UtteranceProgressListener}, that engines can register to
diff --git a/docs/html/about/versions/android-4.0.jd b/docs/html/about/versions/android-4.0.jd
index 4318582..bf68584 100644
--- a/docs/html/about/versions/android-4.0.jd
+++ b/docs/html/about/versions/android-4.0.jd
@@ -99,7 +99,7 @@
<h4>User Profile</h4>
<p>Android now includes a personal profile that represents the device owner, as defined by the
-{@link android.provider.ContactsContract.Profile} table. Social apps that maintain a user identity
+{@link android.provider.ContactsContract.Profile} table. Social apps that maintain a user identity
can contribute to the user's profile data by creating a new {@link
android.provider.ContactsContract.RawContacts} entry within the {@link
android.provider.ContactsContract.Profile}. That is, raw contacts that represent the device user do
@@ -210,7 +210,7 @@
them when their related events are deleted.</li>
</ul>
-<p>To access a user’s calendar data with the Calendar Provider, your application must request
+<p>To access a user’s calendar data with the Calendar Provider, your application must request
the {@link android.Manifest.permission#READ_CALENDAR} permission (for read access) and
{@link android.Manifest.permission#WRITE_CALENDAR} (for write access).</p>
@@ -631,8 +631,8 @@
<p>A new package, {@link android.net.wifi.p2p}, contains all the APIs for performing peer-to-peer
connections with Wi-Fi. The primary class you need to work with is {@link
android.net.wifi.p2p.WifiP2pManager}, which you can acquire by calling {@link
-android.app.Activity#getSystemService getSystemService(WIFI_P2P_SERVICE)}. The {@link
-android.net.wifi.p2p.WifiP2pManager} includes APIs that allow you to:</p>
+android.app.Activity#getSystemService(java.lang.String) getSystemService(WIFI_P2P_SERVICE)}.
+The {@link android.net.wifi.p2p.WifiP2pManager} includes APIs that allow you to:</p>
<ul>
<li>Initialize your application for P2P connections by calling {@link
android.net.wifi.p2p.WifiP2pManager#initialize initialize()}</li>
@@ -798,7 +798,7 @@
android.R.attr#contentDescription android:contentDescription} text is missing or
insufficient. To add more text description to the
{@link android.view.accessibility.AccessibilityEvent}, call {@link
-android.view.accessibility.AccessibilityEvent#getText()}.{@link java.util.List#add add()}.</p>
+android.view.accessibility.AccessibilityRecord#getText()}.{@link java.util.List#add add()}.</p>
</li>
<li>At this point, the {@link android.view.View} passes the event up the view hierarchy by calling
{@link android.view.ViewGroup#requestSendAccessibilityEvent requestSendAccessibilityEvent()} on the
@@ -850,7 +850,7 @@
event).</li>
<li>From either {@link android.view.accessibility.AccessibilityEvent} or an individual {@link
-android.view.accessibility.AccessibilityRecord}, you can call {@link
+android.view.accessibility.AccessibilityRecord}, you can call {@link
android.view.accessibility.AccessibilityRecord#getSource() getSource()} to retrieve a {@link
android.view.accessibility.AccessibilityNodeInfo} object.
<p>An {@link android.view.accessibility.AccessibilityNodeInfo} represents a single node
diff --git a/docs/html/about/versions/android-4.1.jd b/docs/html/about/versions/android-4.1.jd
index 4131c36..4d7cb85 100644
--- a/docs/html/about/versions/android-4.1.jd
+++ b/docs/html/about/versions/android-4.1.jd
@@ -103,8 +103,8 @@
<div class="sidebox-wrapper">
-<div class="sidebox">
-
+<div class="sidebox">
+
<h3 id="ApiLevel">Declare your app API Level</h3>
<p>To better optimize your app for devices running Android {@sdkPlatformVersion},
@@ -117,7 +117,7 @@
can use APIs in Android {@sdkPlatformVersion} while also supporting older versions by adding
conditions to your code that check for the system API level before executing
APIs not supported by your <a
-href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a>.
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a>.
To learn more about
maintaining backward-compatibility, read <a
href="{@docRoot}training/backward-compatible-ui/index.html">Creating Backward-Compatible
@@ -148,15 +148,15 @@
<h3 id="Isolated">Isolated services</h3>
-<p>By specifying <a href="{@docRoot}guide/topics/manifest/service-element.html#isolated">{@code android:isolatedProcess="true"}</a> in the
+<p>By specifying <a href="{@docRoot}guide/topics/manifest/service-element.html#isolated">{@code android:isolatedProcess="true"}</a> in the
<a href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>}</a> tag, your {@link android.app.Service} will run under
its own isolated user ID process that has no permissions of its own.</p>
<h3 id="Memory">Memory management</h3>
-<p>New {@link android.content.ComponentCallbacks2} constants such as {@link
-android.content.ComponentCallbacks2#TRIM_MEMORY_RUNNING_LOW} and {@link
+<p>New {@link android.content.ComponentCallbacks2} constants such as {@link
+android.content.ComponentCallbacks2#TRIM_MEMORY_RUNNING_LOW} and {@link
android.content.ComponentCallbacks2#TRIM_MEMORY_RUNNING_CRITICAL} provide foreground
processes more information about
memory state before the system calls {@link android.app.Activity#onLowMemory()}.</p>
@@ -178,7 +178,7 @@
<h3 id="LiveWallpapers">Live Wallpapers</h3>
<p>New intent protocol to directly launch the live wallpaper preview activity so you can help
- users easily select your live wallpaper without forcing them to leave
+ users easily select your live wallpaper without forcing them to leave
your app and navigate through the Home wallpaper picker.</p>
<p>To launch the live wallpaper picker, call {@link android.content.Context#startActivity
@@ -207,7 +207,7 @@
<p>This is particularly powerful for scenarios in which the user enters one of your app's activities
through a "deep dive" intent such as from a notification or an intent from
-different app (as described in the design guide for <a
+different app (as described in the design guide for <a
href="{@docRoot}design/patterns/navigation.html#between-apps">Navigating Between Apps</a>). When
the user enters your activity this way, your app may not naturally have a back stack of
activities that can be resumed as the user navigates up. However, when you supply the <a
@@ -216,12 +216,12 @@
whether or not your app already contains a back stack of parent activities and, if not, constructs
a synthetic back stack that contains all parent activities.</p>
-<p class="note"><strong>Note:</strong> When the user enters a deep activity in your app and
- it creates a new task for your app, the system actually inserts the stack of parent activities
+<p class="note"><strong>Note:</strong> When the user enters a deep activity in your app and
+ it creates a new task for your app, the system actually inserts the stack of parent activities
into the task. As such, pressing the Back button also navigates back through the stack of parent
activities.</p>
-<p>When the system creates a synthetic back stack for your app, it builds a basic {@link
+<p>When the system creates a synthetic back stack for your app, it builds a basic {@link
android.content.Intent} to create a new instance of each parent activity. So there's no
saved state for the parent activities the way you'd expect had the user naturally navigated
through
@@ -251,9 +251,9 @@
the length of the array with {@link android.app.TaskStackBuilder#getIntentCount()} and pass that
value to {@link android.app.TaskStackBuilder#editIntentAt editIntentAt()}.</p>
-<p>If your app structure is more complex, there are several other APIs
+<p>If your app structure is more complex, there are several other APIs
available that allow you to handle the behavior of Up navigation and
- fully customize the synthetic back stack. Some of the APIs that give you additional
+ fully customize the synthetic back stack. Some of the APIs that give you additional
control include:</p>
<dl>
<dt>{@link android.app.Activity#onNavigateUp}</dt>
@@ -342,7 +342,7 @@
<!--
<h3 id="Routing">Media routing</h3>
-<p>The new {@link android.media.MediaRouter} class allows you to route media channels and
+<p>The new {@link android.media.MediaRouter} class allows you to route media channels and
streams from the current device to external speakers and other devices. You
can acquire an instance of {@link android.media.MediaRouter} by calling {@link
android.content.Context#getSystemService getSystemService(}{@link
@@ -354,7 +354,7 @@
<p>New method {@link android.media.AudioRecord#startRecording startRecording()} allows
you to begin audio recording based on a cue defined by a {@link android.media.MediaSyncEvent}.
-The {@link android.media.MediaSyncEvent} specifies an audio session
+The {@link android.media.MediaSyncEvent} specifies an audio session
(such as one defined by {@link android.media.MediaPlayer}), which when complete, triggers
the audio recorder to begin recording. For example, you can use this functionality to
play an audio tone that indicates the beginning of a recording session and recording
@@ -423,7 +423,7 @@
for changes to the auto focus movement. You can register your interface with {@link
android.hardware.Camera#setAutoFocusMoveCallback setAutoFocusMoveCallback()}. Then when the camera
is in a continuous autofocus mode ({@link
-android.hardware.Camera.Parameters#FOCUS_MODE_CONTINUOUS_VIDEO} or
+android.hardware.Camera.Parameters#FOCUS_MODE_CONTINUOUS_VIDEO} or
{@link android.hardware.Camera.Parameters#FOCUS_MODE_CONTINUOUS_PICTURE}), you'll receive a call
to {@link android.hardware.Camera.AutoFocusMoveCallback#onAutoFocusMoving onAutoFocusMoving()},
which tells you whether auto focus has started moving or has stopped moving.</p>
@@ -434,7 +434,7 @@
standard sounds made by the camera or other media actions. You should use these APIs to play
the appropriate sound when building a custom still or video camera.</p>
-<p>To play a sound, simply instantiate a {@link android.media.MediaActionSound} object, call
+<p>To play a sound, simply instantiate a {@link android.media.MediaActionSound} object, call
{@link android.media.MediaActionSound#load load()} to pre-load the desired sound, then at the
appropriate time, call {@link android.media.MediaActionSound#play play()}.</p>
@@ -483,7 +483,7 @@
<p>To register your service, you must first create an {@link android.net.nsd.NsdServiceInfo}
object and define the various properties of your service with methods such as
- {@link android.net.nsd.NsdServiceInfo#setServiceName setServiceName()},
+ {@link android.net.nsd.NsdServiceInfo#setServiceName setServiceName()},
{@link android.net.nsd.NsdServiceInfo#setServiceType setServiceType()}, and
{@link android.net.nsd.NsdServiceInfo#setPort setPort()}.
</p>
@@ -498,7 +498,7 @@
<p>When your {@link
android.net.nsd.NsdManager.DiscoveryListener} receives callbacks about services
-found, you need to resolve the service by calling
+found, you need to resolve the service by calling
{@link android.net.nsd.NsdManager#resolveService resolveService()}, passing it an
implementation of {@link android.net.nsd.NsdManager.ResolveListener} that receives
an {@link android.net.nsd.NsdServiceInfo} object that contains information about the
@@ -515,13 +515,13 @@
network).</p>
<p>To broadcast your app as a service over Wi-Fi so that other devices can discover
- your app and connect to it, call {@link
+ your app and connect to it, call {@link
android.net.wifi.p2p.WifiP2pManager#addLocalService addLocalService()} with a
{@link android.net.wifi.p2p.nsd.WifiP2pServiceInfo} object that describes your app services.</p>
<p>To initiate discover of nearby devices over Wi-Fi, you need to first decide whether you'll
communicate using Bonjour or Upnp. To use Bonjour, first set up some callback listeners with
- {@link android.net.wifi.p2p.WifiP2pManager#setDnsSdResponseListeners setDnsSdResponseListeners()}, which takes both a {@link android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener} and {@link android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener}. To use Upnp, call
+ {@link android.net.wifi.p2p.WifiP2pManager#setDnsSdResponseListeners setDnsSdResponseListeners()}, which takes both a {@link android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener} and {@link android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener}. To use Upnp, call
{@link android.net.wifi.p2p.WifiP2pManager#setUpnpServiceResponseListener setUpnpServiceResponseListener()}, which takes a {@link android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener}.</p>
<p>Before you can start discovering services on local devices, you also need to call {@link android.net.wifi.p2p.WifiP2pManager#addServiceRequest addServiceRequest()}. When the {@link android.net.wifi.p2p.WifiP2pManager.ActionListener} you pass to this method receives a
@@ -644,7 +644,7 @@
<h3 id="ActivityOptions">Activity launch animations</h3>
<p>You can now launch an {@link android.app.Activity} using zoom animations or
-your own custom animations. To specify the animation you want, use the {@link
+your own custom animations. To specify the animation you want, use the {@link
android.app.ActivityOptions} APIs to build a {@link android.os.Bundle} that you can
then pass to any of the
methods that start an activity, such as {@link
@@ -659,8 +659,8 @@
Android 4.1 uses this when opening an app.</dd>
<dt>{@link android.app.ActivityOptions#makeThumbnailScaleUpAnimation
makeThumbnailScaleUpAnimation()}</dt>
- <dd>Creates an animation that scales up the activity window starting from a specified
- position and a provided thumbnail image. For example, the Recent Apps window in
+ <dd>Creates an animation that scales up the activity window starting from a specified
+ position and a provided thumbnail image. For example, the Recent Apps window in
Android 4.1 uses this when returning to an app.</dd>
<dt>{@link android.app.ActivityOptions#makeCustomAnimation
makeCustomAnimation()}</dt>
@@ -672,7 +672,7 @@
<h3 id="TimeAnimator">Time animator</h3>
-<p>The new {@link android.animation.TimeAnimator} provides a simple callback
+<p>The new {@link android.animation.TimeAnimator} provides a simple callback
mechanism with the {@link android.animation.TimeAnimator.TimeListener} that notifies
you upon every frame of the animation. There is no duration, interpolation, or object value-setting with this Animator. The listener's callback receives information for each frame including
total elapsed time and the elapsed time since the previous animation frame.</p>
@@ -692,7 +692,7 @@
<p>The new method {@link android.app.Notification.Builder#setStyle setStyle()} allows you to specify
one of three new styles for your notification that each offer a larger content region. To
-specify the style for your large content region, pass {@link
+specify the style for your large content region, pass {@link
android.app.Notification.Builder#setStyle setStyle()} one of the following objects:</p>
<dl>
<dt>{@link android.app.Notification.BigPictureStyle}</dt>
@@ -720,7 +720,7 @@
order of your notification in the list by setting
the priority with {@link android.app.Notification.Builder#setPriority setPriority()}. You
can pass this one of five different priority levels defined by {@code PRIORITY_*} constants
-in the {@link android.app.Notification} class. The default is {@link
+in the {@link android.app.Notification} class. The default is {@link
android.app.Notification#PRIORITY_DEFAULT}, and there's two levels higher and two levels lower.</p>
<p>High priority notifications are things that users generally want to respond to quickly,
@@ -738,17 +738,17 @@
<dl>
<dt>{@link android.view.View#SYSTEM_UI_FLAG_FULLSCREEN}</dt>
- <dd>Hides non-critical system UI (such as the status bar).
+ <dd>Hides non-critical system UI (such as the status bar).
If your activity uses the action bar in overlay mode (by
enabling <a href="{@docRoot}reference/android/R.attr.html#windowActionBarOverlay">{@code
android:windowActionBarOverlay}</a>), then this flag also hides the action bar and does
so with a coordinated animation when both hiding and showing the two.</dd>
-
+
<dt>{@link android.view.View#SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}</dt>
<dd>Sets your activity layout to use the same screen area that's available when you've
enabled {@link android.view.View#SYSTEM_UI_FLAG_FULLSCREEN} even if the system UI elements
are still visible. Although parts of your layout will be overlayed by the
- system UI, this is useful if your app often hides and shows the system UI with
+ system UI, this is useful if your app often hides and shows the system UI with
{@link android.view.View#SYSTEM_UI_FLAG_FULLSCREEN}, because it avoids your layout from
adjusting to the new layout bounds each time the system UI hides or appears.</dd>
@@ -779,7 +779,7 @@
<h3 id="RemoteViews">Remote views</h3>
-<p>{@link android.widget.GridLayout} and {@link android.view.ViewStub}
+<p>{@link android.widget.GridLayout} and {@link android.view.ViewStub}
are now remotable views so you can use them in layouts for your
app widgets and notification custom layouts.</p>
@@ -787,7 +787,7 @@
<h3 id="Fonts">Font families</h3>
-<p>Android 4.1 adds several more variants of the Roboto font style for a total of 10 variants,
+<p>Android 4.1 adds several more variants of the Roboto font style for a total of 10 variants,
and they're all usable by apps. Your apps now have access to the full set of both light and
condensed variants.</p>
@@ -820,14 +820,14 @@
{@code "bold"} and {@code "italic"}. You can apply both like so: {@code
android:textStyle="bold|italic"}.</p>
-<p>You can also use {@link android.graphics.Typeface#create Typeface.create()}.
+<p>You can also use {@link android.graphics.Typeface#create Typeface.create()}.
For example, {@code Typeface.create("sans-serif-light", Typeface.NORMAL)}.</p>
-
+
<h2 id="Input">Input Framework</h2>
@@ -864,7 +864,7 @@
<dl>
<dt>{@link android.Manifest.permission#READ_EXTERNAL_STORAGE}</dt>
- <dd>Provides protected read access to external storage. In Android 4.1 by
+ <dd>Provides protected read access to external storage. In Android 4.1 by
default all applications still have read
access. This will be changed in a future release to require that applications explicitly request
read access using this permission. If your application already requests write access, it will
@@ -898,9 +898,9 @@
</manifest>
</pre>
-<p>This feature defines "television" to be a typical living room television experience:
- displayed on a big screen, where the user is sitting far away and the dominant form of
- input is be something like a d-pad, and generally not through touch or a
+<p>This feature defines "television" to be a typical living room television experience:
+ displayed on a big screen, where the user is sitting far away and the dominant form of
+ input is be something like a d-pad, and generally not through touch or a
mouse/pointer-device.</p>
diff --git a/docs/html/about/versions/android-4.2.jd b/docs/html/about/versions/android-4.2.jd
index c26d4a2..ac84d0f 100755
--- a/docs/html/about/versions/android-4.2.jd
+++ b/docs/html/about/versions/android-4.2.jd
@@ -6,7 +6,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#Behaviors">Important Behavior Changes</a></li>
@@ -46,8 +46,8 @@
<div class="sidebox-wrapper">
-<div class="sidebox">
-
+<div class="sidebox">
+
<h3 id="ApiLevel">Declare your app API Level</h3>
<p>To better optimize your app for devices running Android {@sdkPlatformVersion},
@@ -60,7 +60,7 @@
can use APIs in Android {@sdkPlatformVersion} while also supporting older versions by adding
conditions to your code that check for the system API level before executing
APIs not supported by your <a
-href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a>.
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a>.
To learn more about
maintaining backward-compatibility, read <a
href="{@docRoot}training/backward-compatible-ui/index.html">Creating Backward-Compatible
@@ -94,7 +94,7 @@
android:minSdkVersion}</a> to 17 or higher. Otherwise, the default value is still {@code “true"}
even when running on Android 4.2 and higher.</p>
</li>
-
+
<li>Compared to previous versions of Android, <b>user location</b> results may be less accurate
if your app requests the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} permission but
does not request the {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission.
@@ -102,7 +102,7 @@
coarse location (and not fine location), the system will not provide a user location estimate
that’s more accurate than a city block.</p>
</li>
-
+
<li>Some <b>device settings</b> defined by {@link android.provider.Settings.System} are now
read-only. If your app attempts to write changes to settings defined in {@link
android.provider.Settings.System} that have moved to {@link android.provider.Settings.Global},
@@ -213,9 +213,9 @@
<p>Android now allows your app to display unique content on additional screens that are connected
to the user’s device over either a wired connection or Wi-Fi.
To create unique content for a secondary display, extend the {@link android.app.Presentation}
-class and implement the {@link android.app.Presentation#onCreate onCreate()} callback. Within
-{@link android.app.Presentation#onCreate onCreate()}, specify your UI for the secondary display
-by calling {@link android.app.Presentation#setContentView setContentView()}.
+class and implement the {@link android.app.Dialog#onCreate onCreate()} callback. Within
+{@link android.app.Dialog#onCreate onCreate()}, specify your UI for the secondary display
+by calling {@link android.app.Dialog#setContentView setContentView()}.
As an extension of the {@link android.app.Dialog} class, the {@link
android.app.Presentation} class provides the region in which your app can display a unique UI on the
secondary display.</p>
@@ -241,13 +241,13 @@
<p>To detect at runtime when a new display has been connected, create an instance of {@link
android.media.MediaRouter.SimpleCallback} in which you implement the {@link
-android.media.MediaRouter.SimpleCallback#onRoutePresentationDisplayChanged
+android.media.MediaRouter.Callback#onRoutePresentationDisplayChanged
onRoutePresentationDisplayChanged()} callback method, which the system will call when a new
presentation display is connected. Then register the {@link
android.media.MediaRouter.SimpleCallback} by passing it to {@link
android.media.MediaRouter#addCallback MediaRouter.addCallback()} along with the {@link
android.media.MediaRouter#ROUTE_TYPE_LIVE_VIDEO} route type. When you receive a call to
-{@link android.media.MediaRouter.SimpleCallback#onRoutePresentationDisplayChanged
+{@link android.media.MediaRouter.Callback#onRoutePresentationDisplayChanged
onRoutePresentationDisplayChanged()}, simply call {@link
android.media.MediaRouter#getSelectedRoute MediaRouter.getSelectedRoute()} as mentioned above.</p>
@@ -262,7 +262,7 @@
likely a different screen density. Because the screen characteristics may different, you should
provide resources that are optimized specifically for such larger displays. If you need
to request additional resources from your {@link
-android.app.Presentation}, call {@link android.app.Presentation#getContext()}{@link
+android.app.Presentation}, call {@link android.app.Dialog#getContext()}{@link
android.content.Context#getResources .getResources()} to get the {@link
android.content.res.Resources} object corresponding to the display. This provides
the appropriate resources from your app that are best suited for the
@@ -410,7 +410,7 @@
<ol>
<li>Convert left- and right-oriented layout properties to start- and end-oriented layout
-properties.
+properties.
<p>For example, use {@link android.R.attr#layout_marginStart android:layout_marginStart}
in place of {@code android:layout_marginLeft} and {@link android.R.attr#layout_marginEnd
android:layout_marginEnd} in place of {@code android:layout_marginRight}.
@@ -510,7 +510,7 @@
<p>To use a script intrinsic, call the static <code>create()</code> method of each instrinsic
to create an instance of the script. You then call the available <code>set()</code>
methods of each script intrinsic to set any necessary inputs and options.
- Finally, call the {@link android.renderscript.ScriptC#forEach forEach()}</code>
+ Finally, call the {@link android.renderscript.Script#forEach forEach()}</code>
method to execute the script.</p>
</dd>
@@ -526,7 +526,7 @@
scripts by calling {@link android.renderscript.ScriptGroup.Builder#addConnection addConnection()}.
When you are done adding the connections, call {@link android.renderscript.ScriptGroup.Builder#create create()}
to create the script group. Before executing the script group, specify the input
-{@link android.renderscript.Allocation} and initial script to run with the
+{@link android.renderscript.Allocation} and initial script to run with the
{@link android.renderscript.ScriptGroup#setInput} method and provide the output
{@link android.renderscript.Allocation} where the result will be written to and final script to
run with {@link android.renderscript.ScriptGroup#setOutput setOutput()}. Finally, call
diff --git a/docs/html/about/versions/android-4.3.jd b/docs/html/about/versions/android-4.3.jd
index 547b2f8..34a701b 100644
--- a/docs/html/about/versions/android-4.3.jd
+++ b/docs/html/about/versions/android-4.3.jd
@@ -907,7 +907,7 @@
<p>To track changes to inserts and updates, you can now include the {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP} parameter with your selection to query only the contacts that have changed since the last time you queried the provider.</p>
-<p>To track which contacts have been deleted, the new table {@link android.provider.ContactsContract.DeletedContacts} provides a log of contacts that have been deleted (but each contact deleted is held in this table for a limited time). Similar to {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP}, you can use the new selection parameter, {@link android.provider.ContactsContract.DeletedContacts#CONTACT_DELETED_TIMESTAMP} to check which contacts have been deleted since the last time you queried the provider. The table also contains the constant {@link android.provider.ContactsContract.DeletedContacts#DAYS_KEPT_MILLISECONDS} containing the number of days (in milliseconds) that the log will be kept.</p>
+<p>To track which contacts have been deleted, the new table {@link android.provider.ContactsContract.DeletedContacts} provides a log of contacts that have been deleted (but each contact deleted is held in this table for a limited time). Similar to {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP}, you can use the new selection parameter, {@link android.provider.ContactsContract.DeletedContactsColumns#CONTACT_DELETED_TIMESTAMP} to check which contacts have been deleted since the last time you queried the provider. The table also contains the constant {@link android.provider.ContactsContract.DeletedContacts#DAYS_KEPT_MILLISECONDS} containing the number of days (in milliseconds) that the log will be kept.</p>
<p>Additionally, the Contacts Provider now broadcasts the {@link
android.provider.ContactsContract.Intents#CONTACTS_DATABASE_CREATED} action when the user
diff --git a/docs/html/about/versions/android-4.4.jd b/docs/html/about/versions/android-4.4.jd
index b898fe3..cbc8e6e 100644
--- a/docs/html/about/versions/android-4.4.jd
+++ b/docs/html/about/versions/android-4.4.jd
@@ -318,7 +318,7 @@
<h3 id="Ratings">Ratings from remote controllers</h3>
-<p>Android 4.4 builds upon the existing capabilities for remote control clients (apps that receive media control events with the {@link android.media.RemoteControlClient}) by adding the ability for users to rate the current track from the remote controller.</p>
+<p>Android 4.4 builds upon the existing capabilities for remote control clients (apps that receive media control events with the {@link android.media.RemoteControlClient}) by adding the ability for users to rate the current track from the remote controller.</p>
<p>The new {@link android.media.Rating} class encapsulates information about a user rating. A rating is defined by its rating style (either {@link android.media.Rating#RATING_HEART}, {@link android.media.Rating#RATING_THUMB_UP_DOWN}, {@link android.media.Rating#RATING_3_STARS}, {@link android.media.Rating#RATING_4_STARS}, {@link android.media.Rating#RATING_5_STARS} or {@link android.media.Rating#RATING_PERCENTAGE}) and the rating value that's appropriate for that style.</p>
diff --git a/docs/html/about/versions/android-5.0-changes.jd b/docs/html/about/versions/android-5.0-changes.jd
index 25d253f..0e9dac5 100644
--- a/docs/html/about/versions/android-5.0-changes.jd
+++ b/docs/html/about/versions/android-5.0-changes.jd
@@ -105,7 +105,9 @@
<p>Make sure your notifications take these Android 5.0 changes into account.
To learn more about designing your notifications for Android 5.0 and higher,
- see the <a href="{@docRoot}design/patterns/notifications.html">notifications design guide</a>.
+ see the <a
+ href="https://material.google.com/patterns/notifications.html">notifications
+ design guide</a>.
</p>
<h3 id="NotificationsMaterialDesignStyle">Material design style</h3>
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 25f88e3..82cac2b 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -21,13 +21,13 @@
link = $("#title-tabs a[href$="+sectionId+"]");
link.parent().addClass("selected");
link.parent().siblings().removeClass("selected");
-
+
sectionDiv = $(".version-section"+link.attr("href"));
if (sectionDiv.length) {
$(".version-section").hide();
sectionDiv.show();
}
-
+
$('html, body').animate({
scrollTop: $(hashy).offset().top
}, 100);
@@ -672,7 +672,7 @@
<div style="float:left;margin:16px 24px 12px 0px;">
<a href="" target="_android">
<img src="{@docRoot}images/jb-nexus10-1.png" alt="10-inch tablet running Android 4.2" width="380" height="281" /></a>
-</div>
+</div>
<h2 id="42-ui" style="margin-top:2em;">Refined, refreshed UI</h2>
@@ -902,7 +902,7 @@
appropriate.</p>
<p>For precise control over your app UI, Android 4.2 includes new APIs that let
-you manage layout direction, text direction, text alignment, gravity, and
+you manage layout direction, text direction, text alignment, gravity, and
locale direction in View components. You can even create custom versions of
layout, drawables, and other resources for display when a right-to-left script
is in use.</p>
@@ -1005,7 +1005,7 @@
<p>Filterscript is ideal for hardware-accelerating simple image-processing and
computation operations such as those that might be written for OpenGL ES
fragment shaders. Because it places a relaxed set of constraints on hardware,
-your operations are optimized and accelerated on more types of device chipsets.
+your operations are optimized and accelerated on more types of device chipsets.
Any app targeting API level 17 or higher can make use of Filterscript.</p>
<h3 id="42-rs-intrinsics">Script intrinsics</h3>
@@ -1028,7 +1028,7 @@
<div style="float:right;padding-top:1em;width:400px;margin-left:2em;">
<img src="{@docRoot}images/jb-rs-chart-versions.png" alt="Renderscipt optimizations chart" width="360" height="252"
style="border:1px solid #ddd;border-radius: 6px;" />
-<p style="image-caption">Renderscript image-processing
+<p style="image-caption">Renderscript image-processing
benchmarks run on different Android platform versions (Android 4.0, 4.1, and 4.2)
in CPU only on a Galaxy Nexus device.</p>
<img src="{@docRoot}images/jb-rs-chart-gpu.png" style="border:1px solid #ddd;border-radius: 6px; alt="" width="360" height="252" />
@@ -1143,7 +1143,7 @@
certificates. This protects against possible compromise of Certificate
Authorities.</li>
<li><strong>Improved display of Android permissions</strong> — Permissions
-have been organized into groups that are more easily understood by users.
+have been organized into groups that are more easily understood by users.
During review of the permissions, the user can click on the permission to see
more detailed information about the permission.</li>
<li><strong>installd hardening</strong> — The installd daemon does not run
@@ -1196,7 +1196,7 @@
Android 4.2 introduces support for controllers based on the NCI standard from
the NFC-Forum. NCI provides a standard communication protocol between an NFC
Controller (NFCC) and a device Host, and the new NFC stack developed in
-collaboration between Google and Broadcom supports it.
+collaboration between Google and Broadcom supports it.
<h3 id="42-dalvik">Dalvik runtime optimizations</h3>
@@ -1248,7 +1248,7 @@
</div>
<p>Welcome to Android 4.1 the first version of Jelly Bean!</p>
-<p>Android 4.1 is the fastest and smoothest version of Android yet. We’ve made
+<p>Android 4.1 is the fastest and smoothest version of Android yet. We’ve made
improvements throughout the platform and added great new features
for users and developers. This document provides a glimpse of what's new for developers.
@@ -1552,7 +1552,7 @@
<h3 id="gps">Google Play services</h3>
-<p>Google Play services helps developers to <strong>integrate Google services</strong> such as authentication and Google+ into their apps delivered through Google Play.</p>
+<p>Google Play services helps developers to <strong>integrate Google services</strong> such as authentication and Google+ into their apps delivered through Google Play.</p>
<p>Google Play services is automatically provisioned to end user devices by Google Play, so all you need is a <strong>thin client library</strong> in your apps.</p>
diff --git a/docs/html/about/versions/kitkat.jd b/docs/html/about/versions/kitkat.jd
index 2987bd4..b73e70d 100644
--- a/docs/html/about/versions/kitkat.jd
+++ b/docs/html/about/versions/kitkat.jd
@@ -13,13 +13,13 @@
link = $("#title-tabs a[href$="+sectionId+"]");
link.parent().addClass("selected");
link.parent().siblings().removeClass("selected");
-
+
sectionDiv = $(".version-section"+link.attr("href"));
if (sectionDiv.length) {
$(".version-section").hide();
sectionDiv.show();
}
-
+
$('html, body').animate({
scrollTop: $(hashy).offset().top
}, 100);
diff --git a/docs/html/about/versions/marshmallow/android-6.0-changes.jd b/docs/html/about/versions/marshmallow/android-6.0-changes.jd
index b44142e..65c976b 100644
--- a/docs/html/about/versions/marshmallow/android-6.0-changes.jd
+++ b/docs/html/about/versions/marshmallow/android-6.0-changes.jd
@@ -280,7 +280,7 @@
If your app uses the
{@link java.lang.reflect.Constructor#newInstance(java.lang.Object...) newInstance()} method and you
want to override access checks, call the
-{@link java.lang.reflect.Constructor#setAccessible(boolean) setAccessible()} method with the input
+{@link java.lang.reflect.AccessibleObject#setAccessible(boolean) setAccessible()} method with the input
parameter set to {@code true}. If your app uses the
<a href="{@docRoot}tools/support-library/features.html#v7-appcompat">v7 appcompat library</a> or the
<a href="{@docRoot}tools/support-library/features.html#v7-recyclerview">v7 recyclerview library</a>,
diff --git a/docs/html/about/versions/marshmallow/samples.jd b/docs/html/about/versions/marshmallow/android-6.0-samples.jd
similarity index 100%
rename from docs/html/about/versions/marshmallow/samples.jd
rename to docs/html/about/versions/marshmallow/android-6.0-samples.jd
diff --git a/docs/html/about/versions/marshmallow/android-6.0-testing.jd b/docs/html/about/versions/marshmallow/android-6.0-testing.jd
new file mode 100644
index 0000000..f9d9265
--- /dev/null
+++ b/docs/html/about/versions/marshmallow/android-6.0-testing.jd
@@ -0,0 +1,183 @@
+page.title=Android 6.0 Testing Guide
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Testing Permissions</a></li>
+ <li><a href="#doze-standby">Testing Doze and App Standby</a></li>
+ <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android 6.0 gives you an opportunity to ensure your apps work with the next
+ version of the platform. This preview includes a number of APIs and behavior changes that can
+ impact your app, as described in the <a href="{@docRoot}preview/api-overview.html">API
+ Overview</a> and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>. In testing
+ your app with the preview, there are some specific system changes that you should focus on to
+ ensure that users have a good experience.
+</p>
+
+<p>
+ This guide describes the what and how to test preview features with your app. You should
+ prioritize testing of these specific preview features, due to their high potential impact on your
+ app's behavior:
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Permissions</a>
+ </li>
+ <li><a href="#doze-standby">Doze and App Standby</a>
+ </li>
+ <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
+</ul>
+
+<h2 id="runtime-permissions">Testing Permissions</h2>
+
+<p>
+ The new <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> model
+ changes the way that permissions are allocated to your app by the user. Instead of granting all
+ permissions during the install procedure, your app must ask the user for individual permissions
+ at runtime. For users this behavior provides more granular control over each app’s activities, as
+ well as better context for understanding why the app is requesting a specific permission. Users
+ can grant or revoke the permissions granted to an app individually at any time. This feature of
+ the preview is most likely to have an impact on your app's behavior and may prevent some of your
+ app features from working, or they may work in a degraded state.
+</p>
+
+<p class="caution">
+ This change affects all apps running on the new platform, even those not targeting the new
+ platform version. The platform provides a limited compatibility behavior for legacy apps, but you
+ should begin planning your app’s migration to the new permissions model now, with a goal of
+ publishing an updated version of your app at the official platform launch.
+</p>
+
+
+<h3 id="permission-test-tips">Test tips</h3>
+
+<p>
+ Use the following test tips to help you plan and execute testing of your app with the new
+ permissions behavior.
+</p>
+
+<ul>
+ <li>Identify your app’s current permissions and the related code paths.</li>
+ <li>Test user flows across permission-protected services and data.</li>
+ <li>Test with various combinations of granted/revoked permission.</li>
+ <li>Use the {@code adb} tool to manage permssions from the command line:
+ <ul>
+ <li>List permissions and status by group:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Grant or revoke one or more permissions using the following syntax:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analyze your app for services that use permissions.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Test strategy</h3>
+
+<p>
+ The permissions change affects the structure and design of your app, as well as
+ the user experience and flows you provide to users. You should assess your app’s current
+ permissions use and start planning for the new flows you want to offer. The official release of
+ the platform provides compatibility behavior, but you should plan on updating your app and not
+ rely on these behaviors.
+</p>
+
+<p>
+ Identify the permissions that your app actually needs and uses, and then find the various code
+ paths that use the permission-protected services. You can do this through a combination of
+ testing on the new platform and code analysis. In testing, you should focus on opting in to
+ runtime permissions by changing the app’s {@code targetSdkVersion} to the preview version. For
+ more information, see <a href="{@docRoot}preview/setup-sdk.html#">Set up
+the Android N SDK</a>.
+</p>
+
+<p>
+ Test with various combinations of permissions revoked and added, to highlight the user flows that
+ depend on permissions. Where a dependency is not obvious or logical you should consider
+ refactoring or compartmentalizing that flow to eliminate the dependency or make it clear why the
+ permission is needed.
+</p>
+
+<p>
+ For more information on the behavior of runtime permissions, testing, and best practices, see the
+ <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> developer
+ preview page.
+</p>
+
+
+<h2 id="doze-standby">Testing Doze and App Standby</h2>
+
+<p>
+ The power saving features of Doze and App Standby limit the amount of background processing that
+ your app can perform when a device is in an idle state or while your app is not in focus. The
+ restrictions the system may impose on apps include limited or no network access,
+ suspended background tasks, suspended Notifications, ignored wake requests, and alarms. To ensure
+ that your app behaves properly with these power saving optimizations, you should test your app by
+ simulating these low power states.
+</p>
+
+<h4 id="doze">Testing your app with Doze</h4>
+
+<p>To test Doze with your app:</p>
+
+<ol>
+<li>Configure a hardware device or virtual device with an Android N system image.</li>
+<li>Connect the device to your development machine and install your app.</li>
+<li>Run your app and leave it active.</li>
+<li>Simulate the device going into Doze mode by running the following commands:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Observe the behavior of your app when the device is re-activated. Make sure it
+ recovers gracefully when the device exits Doze.</li>
+</ol>
+
+
+<h4 id="standby">Testing apps with App Standby</h4>
+
+<p>To test the App Standby mode with your app:</p>
+
+<ol>
+ <li>Configure a hardware device or virtual device with an Android N system image.</li>
+ <li>Connect the device to your development machine and install your app.</li>
+ <li>Run your app and leave it active.</li>
+ <li>Simulate the app going into standby mode by running the following commands:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simulate waking your app using the following command:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Observe the behavior of your app when it is woken. Make sure it recovers gracefully
+ from standby mode. In particular, you should check if your app's Notifications and background
+ jobs continue to function as expected.</li>
+</ol>
+
+<h2 id="ids">Auto Backup for Apps and Device-Specific Identifiers</h2>
+
+<p>If your app is persisting any device-specific identifiers, such as Google
+Cloud Messaging registration ID, in internal storage,
+make sure to follow best practices to exclude the storage
+location from auto-backup, as described in <a href="{@docRoot}preview/backup/index.html">Auto
+Backup for Apps</a>. </p>
diff --git a/docs/html/about/versions/marshmallow/android-6.0.jd b/docs/html/about/versions/marshmallow/android-6.0.jd
index 240b080..247c6d1c 100644
--- a/docs/html/about/versions/marshmallow/android-6.0.jd
+++ b/docs/html/about/versions/marshmallow/android-6.0.jd
@@ -129,8 +129,8 @@
<pre class="no-prettyprint">
adb -e emu finger touch <finger_id>
</pre>
-<p>On Windows, you may have to run {@code telnet 127.0.0.1 <emulator-id>} followed by
- {@code finger touch <finger_id>}.
+<p>On Windows, you may have to run {@code telnet 127.0.0.1 <emulator-id>} followed by
+ {@code finger touch <finger_id>}.
</p>
</li>
</ol>
@@ -204,7 +204,7 @@
<p>For each activity that you want to expose to
{@link android.service.chooser.ChooserTargetService}, add a
-{@code <meta-data>} element with the name
+{@code <meta-data>} element with the name
{@code "android.service.chooser.chooser_target_service"} in your app manifest.
</p>
diff --git a/docs/html/about/versions/nougat/android-7.0-changes.jd b/docs/html/about/versions/nougat/android-7.0-changes.jd
new file mode 100644
index 0000000..4f9054c
--- /dev/null
+++ b/docs/html/about/versions/nougat/android-7.0-changes.jd
@@ -0,0 +1,904 @@
+page.title=Android 7.0 Changes
+page.keywords=preview,sdk,compatibility
+meta.tags="Android 7.0", "Nougat", "android n", "compatibility"
+page.tags="Android 7.0", "Nougat", "android n", "developer preview"
+page.image=images/cards/card-n-changes_2x.png
+@jd:body
+
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+
+<ol>
+ <li><a href="#perf">Performance Improvements</a>
+ <ol>
+ <li><a href="#doze">Doze</a></li>
+ <li><a href="#bg-opt">Background Optimizations</a></li>
+ </ol>
+ </li>
+ <li><a href="#perm">Permissions Changes</a>
+ </li>
+ <li><a href="#sharing-files">Sharing Files Between Apps</a></li>
+ <li><a href="#accessibility">Accessibility Improvements</a>
+ <ol>
+ <li><a href="#screen-zoom">Screen Zoom</a></li>
+ <li><a href="#vision-settings">Vision Settings in Setup Wizard</a></li>
+ </ol>
+ </li>
+ <li><a href="#ndk">NDK Apps Linking to Platform Libraries</a></li>
+ <li><a href="#afw">Android for Work</a></li>
+ <li><a href="#annotations">Annotations Retention</a></li>
+ <li><a href="#other">Other Important Points</a></li>
+</ol>
+
+<h2>API Differences</h2>
+<ol>
+ <li><a href="{@docRoot}sdk/api_diff/n-preview-4-incr/changes.html">
+ Preview 3 to API 24</a></li>
+ <li><a href="{@docRoot}sdk/api_diff/24/changes.html">
+ API 23 to API 24</a></li>
+</ol>
+
+<h2>See Also</h2>
+<ol>
+ <li><a href="{@docRoot}preview/api-overview.html">
+ Android 7.0 APIs</a></li>
+</ol>
+
+</div>
+</div>
+
+
+<p>
+ Along with new features and capabilities, Android 7.0
+ includes a variety of system and API behavior changes. This document
+ highlights some of the key changes that you should understand and account for
+ in your apps.
+</p>
+
+<p>
+ If you have previously published an app for Android, be aware that your app
+ might be affected by these changes in the platform.
+</p>
+
+
+<h2 id="perf">Battery and Memory</h2>
+
+<p>
+Android 7.0 includes system behavior changes aimed at improving the battery life
+of devices and reducing RAM usage. These changes can affect your app’s access to
+system resources, along with the way your app interacts with other apps via
+certain implicit intents.
+</p>
+
+<h3 id="doze">Doze</h3>
+
+<p>
+ Introduced in Android 6.0 (API level 23), Doze improves battery life by
+ deferring CPU and network activities when a user leaves a device unplugged,
+ stationary, and with the screen turned off. Android 7.0 brings further
+ enhancements to Doze by applying a subset of CPU and network restrictions
+ while the device is unplugged with the screen turned off, but not necessarily
+ stationary, for example, when a handset is traveling in a user’s pocket.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-1.png"
+ alt="" height="251px" id="figure1" />
+<p class="img-caption">
+ <strong>Figure 1.</strong> Illustration of how Doze applies a first level of
+ system activity restrictions to improve battery life.
+</p>
+
+<p>
+ When a device is on battery power, and the screen has been off for a certain
+ time, the device enters Doze and applies the first subset of restrictions: It
+ shuts off app network access, and defers jobs and syncs. If the device is
+ stationary for a certain time after entering Doze, the system applies the
+ rest of the Doze restrictions to {@link android.os.PowerManager.WakeLock},
+ {@link android.app.AlarmManager} alarms, GPS, and Wi-Fi scans. Regardless of
+ whether some or all Doze restrictions are being applied, the system wakes the
+ device for brief maintenance windows, during which applications are allowed
+ network access and can execute any deferred jobs/syncs.
+</p>
+
+
+<img src="{@docRoot}images/android-7.0/doze-diagram-2.png"
+ alt="" id="figure2" />
+<p class="img-caption">
+ <strong>Figure 2.</strong> Illustration of how Doze applies a second level of
+ system activity restrictions after the device is stationary for a certain time.
+</p>
+
+<p>
+ Note that activating the screen on or plugging in the device exits Doze and
+ removes these processing restrictions. The additional behavior does not
+ affect recommendations and best practices in adapting your app to the prior
+ version of Doze introduced in Android 6.0 (API level 23), as discussed in
+ <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
+ Optimizing for Doze and App Standby</a>. You should still
+ follow those recommendations, such as using Google Cloud Messaging (GCM) to
+ send and receive messages, and start planning updates to accomodate the
+ additional Doze behavior.
+</p>
+
+
+<h3 id="bg-opt">Project Svelte: Background Optimizations</h3>
+
+<p>
+ Android 7.0 removes three implicit broadcasts in order to help optimize both
+ memory use and power consumption. This change is necessary because implicit
+ broadcasts frequently start apps that have registered to listen for them in
+ the background. Removing these broadcasts can substantially benefit device
+ performance and user experience.
+</p>
+
+<p>
+ Mobile devices experience frequent connectivity changes, such as when moving
+ between Wi-Fi and mobile data. Currently, apps can monitor for changes in
+ connectivity by registering a receiver for the implicit {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcast in their
+ manifest. Since many apps register to receive this broadcast, a single
+ network switch can cause them all to wake up and process the broadcast at
+ once.
+</p>
+
+<p>
+ Similarly, in previous versions of Android, apps could register to receive implicit {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} and {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts from other apps, such as
+ Camera. When a user takes a picture with the Camera app, these apps wake up
+ to process the broadcast.
+</p>
+
+<p>
+ To alleviate these issues, Android 7.0 applies the following
+ optimizations:
+</p>
+
+<ul>
+ <li>Apps targeting Android 7.0 do not receive {@link
+ android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcasts, even if they
+ have manifest entries to request notification of these events. Apps that are
+ running can still listen for {@code CONNECTIVITY_CHANGE} on their main thread
+ if they request notification with a {@link android.content.BroadcastReceiver}.
+ </li>
+
+ <li>Apps cannot send or receive {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE} or {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts. This optimization
+ affects all apps, not only those targeting Android 7.0.
+ </li>
+</ul>
+
+<p>If your app uses any of these intents, you should remove dependencies
+ on them as soon as possible so that you can target Android 7.0 devices properly.
+ The Android framework provides several solutions to mitigate the need for
+ these implicit broadcasts. For example, the {@link
+ android.app.job.JobScheduler} API provides a robust mechanism to schedule
+ network operations when specified conditions, such as connection to an
+ unmetered network, are met. You can even use {@link
+ android.app.job.JobScheduler} to react to changes to content providers.
+</p>
+
+<p>
+ For more information about background optimizations in N and how to adapt your app,
+ see <a href=
+ "{@docRoot}preview/features/background-optimization.html">Background
+ Optimizations</a>.
+</p>
+
+<h2 id="perm">Permissions Changes</h2>
+
+<p>
+ Android 7.0 includes changes to permissions that may affect your app.
+</p>
+
+<h3 id="permfilesys">File system permission changes</h3>
+
+<p>
+ In order to improve the security of private files, the private directory of
+ apps targeting Android 7.0 or higher has restricted access (<code>0700</code>).
+ This setting prevents leakage of metadata of private files, such as their size
+ or existence. This permission change has multiple side effects:
+</p>
+
+<ul>
+ <li>
+ Private files’ file permissions should no longer be relaxed by the owner,
+ and an attempt to do so using
+ {@link android.content.Context#MODE_WORLD_READABLE} and/or
+ {@link android.content.Context#MODE_WORLD_WRITEABLE}, will trigger a
+ {@link java.lang.SecurityException}.
+ <p class="note">
+ <strong>Note:</strong> As of yet, this restriction is not fully enforced.
+ Apps may still modify permissions to their private directory using
+ native APIs or the {@link java.io.File File} API. However, we strongly
+ discourage relaxing the permissions to the private directory.
+ </p>
+ </li>
+ <li>
+ Passing <code>file://</code> URIs outside the package domain may leave the
+ receiver with an unaccessible path. Therefore, attempts to pass a
+ <code>file://</code> URI trigger a
+ <code>FileUriExposedException</code>. The recommended way to share the
+ content of a private file is using the {@link
+ android.support.v4.content.FileProvider}.
+ </li>
+ <li>
+ The {@link android.app.DownloadManager} can no longer share privately
+ stored files by filename. Legacy applications may end up with an
+ unaccessible path when accessing {@link
+ android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Apps targeting
+ Android 7.0 or higher trigger a {@link java.lang.SecurityException} when
+ attempting to access
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
+ Legacy applications that set the download location to a public location by
+ using
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalFilesDir
+ DownloadManager.Request.setDestinationInExternalFilesDir()} or
+ {@link
+ android.app.DownloadManager.Request#setDestinationInExternalPublicDir
+ DownloadManager.Request.setDestinationInExternalPublicDir()}
+ can still access the path in
+ {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}, however, this
+ method is strongly discouraged. The preferred way of accessing a file
+ exposed by the {@link android.app.DownloadManager} is using
+ {@link android.content.ContentResolver#openFileDescriptor
+ ContentResolver.openFileDescriptor()}.
+ </li>
+</ul>
+
+<h2 id="sharing-files">Sharing Files Between Apps</h2>
+
+<p>
+For apps targeting Android 7.0, the Android framework enforces
+the {@link android.os.StrictMode} API policy that prohibits exposing {@code file://} URIs
+outside your app. If an intent containing a file URI leaves your app, the app fails
+with a {@code FileUriExposedException} exception.
+</p>
+
+<p>
+To share files between applications, you should send a {@code content://} URI
+and grant a temporary access permission on the URI. The easiest way to grant this permission is by
+using the {@link android.support.v4.content.FileProvider} class. For more information
+on permissions and sharing files,
+see <a href="{@docRoot}training/secure-file-sharing/index.html">Sharing Files</a>.
+</p>
+
+<h2 id="accessibility">Accessibility Improvements</h2>
+
+<p>
+ Android 7.0 includes changes intended to improve the usability of the
+ platform for users with low or impaired vision. These changes should
+ generally not require code changes in your app, however you should review
+ these feature and test them with your app to assess potential impacts to user
+ experience.
+</p>
+
+
+<h3 id="screen-zoom">Screen Zoom</h3>
+
+<p>
+ Android 7.0 enables users to set <strong>Display size</strong>which magnifies
+ or shrinks all elements on the screen, thereby improving device accessibility
+ for users with low vision. Users cannot zoom the screen past a minimum screen
+ width of <a href=
+ "http://developer.android.com/guide/topics/resources/providing-resources.html">
+ sw320dp</a>, which is the width of a Nexus 4, a common medium-sized phone.
+</p>
+
+<div class="cols">
+
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
+</div>
+<div class="col-6">
+ <img src="{@docRoot}images/android-7.0/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
+</div>
+
+</div> <!-- end cols -->
+<p class="img-caption">
+ <strong>Figure 3.</strong> The screen on the right shows the effect of
+ increasing the Display size of a device running an Android 7.0 system image.
+</p>
+
+
+<p>
+ When the device density changes, the system notifies running apps in the
+ following ways:
+</p>
+
+<ul>
+ <li>If an app targets API level 23 or lower, the system automatically kills
+ all its background processes. This means that if a user switches away from
+ such an app to open the <em>Settings</em> screen and changes the
+ <strong>Display size</strong> setting, the system kills the app in the same
+ manner that it would in a low-memory situation. If the app has any foreground
+ processes, the system notifies those processes of the configuration change as
+ described in <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling
+ Runtime Changes</a>, just as if the device's orientation had changed.
+ </li>
+
+ <li>If an app targets Android 7.0, all of its processes
+ (foreground and background) are notified of the configuration change as
+ described in <a href=
+ "{@docRoot}guide/topics/resources/runtime-changes.html">Handling
+ Runtime Changes</a>.
+ </li>
+</ul>
+
+<p>
+ Most apps do not need to make any changes to support this feature, provided
+ the apps follow Android best practices. Specific things to check for:
+</p>
+
+<ul>
+ <li>Test your app on a device with screen width <code><a href=
+ "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
+ and be sure it performs adequately.
+ </li>
+
+ <li>When the device configuration changes, update any density-dependent
+ cached information, such as cached bitmaps or resources loaded from the
+ network. Check for configuration changes when the app resumes from the paused
+ state.
+ <p class="note">
+ <strong>Note:</strong> If you cache configuration-dependent data, it's a
+ good idea to include relevant metadata such as the appropriate screen
+ size or pixel density for that data. Saving this metadata allows you to
+ decide whether you need to refresh the cached data after a configuration
+ change.
+ </p>
+ </li>
+
+ <li>Avoid specifying dimensions with px units, since they do not scale with
+ screen density. Instead, specify dimensions with <a href=
+ "{@docRoot}guide/practices/screens_support.html">density-independent
+ pixel</a> (<code>dp</code>) units.
+ </li>
+</ul>
+
+<h3 id="vision-settings">Vision Settings in Setup Wizard</h3>
+
+<p>
+ Android 7.0 includes Vision Settings on the Welcome screen, where users can
+ set up the following accessibility settings on a new device:
+ <strong>Magnification gesture</strong>, <strong>Font size</strong>,
+ <strong>Display size</strong> and <strong>TalkBack</strong>. This change
+ increases the visibility of bugs related to different screen settings. To
+ assess the impact of this feature, you should test your apps with these
+ settings enabled. You can find the settings under <strong>Settings >
+ Accessibility</strong>.
+</p>
+
+<h2 id="ndk">NDK Apps Linking to Platform Libraries</h2>
+
+<p>
+ Starting in Android 7.0, the system prevents apps from dynamically linking
+ against non-NDK libraries, which may cause your app to crash. This change in
+ behavior aims to create a consistent app experience across platform updates
+ and different devices. Even though your code might not be linking against
+ private libraries, it's possible that a third-party static library in your
+ app could be doing so. Therefore, all developers should check to make sure
+ that their apps do not crash on devices running Android 7.0. If your app uses
+ native code, you should only be using <a href=
+ "{@docRoot}ndk/guides/stable_apis.html">public NDK APIs</a>.
+</p>
+
+<p>
+ There are three ways your app might be trying to access private platform
+ APIs:
+</p>
+
+<ul>
+ <li>Your app directly accesses private platform libraries. You should update
+ your app to include its own copy of those libraries or use the <a href=
+ "{@docRoot}ndk/guides/stable_apis.html">public NDK APIs</a>.
+ </li>
+
+ <li>Your app uses a third-party library that accesses private platform
+ libraries. Even if you are certain your app doesn't access private libraries
+ directly, you should still test your app for this scenario.
+ </li>
+
+ <li>Your app references a library that is not included in its APK. For
+ example, this could happen if you tried to use your own copy of OpenSSL but
+ forgot to bundle it with your app's APK. The app may run normally on versions
+ of Android platform that includes <code>libcrypto.so</code>. However, the app
+ could crash on later versions of Android that do not include this library
+ (such as, Android 6.0 and later). To fix this, ensure that you bundle all
+ your non-NDK libraries with your APK.
+ </li>
+</ul>
+
+<p>
+ Apps should not use native libraries that are not included in the NDK because
+ they may change or be removed between different versions of Android. The
+ switch from OpenSSL to BoringSSL is an example of such a change. Also,
+ because there are no compatibility requirements for platform libraries not
+ included in the NDK, different devices may offer different levels of
+ compatibility.
+</p>
+
+<p>
+ In order to reduce the impact that this restriction may have on currently
+ released apps, a set of libraries that see significant use—such as
+ <code>libandroid_runtime.so</code>, <code>libcutils.so</code>,
+ <code>libcrypto.so</code>, and <code>libssl.so</code>—are temporarily
+ accessible on N for apps targeting API level 23 or lower. If your app loads
+ one of these libraries, logcat generates a warning and a toast appears on the
+ target device to notify you. If you see these warnings, you should update
+ your app to either include its own copy of those libraries or only use the
+ public NDK APIs. Future releases of the Android platform may restrict the use
+ of private libraries altogether and cause your app to crash.
+</p>
+
+<p>
+ All apps generate a runtime error when they call an API that is neither
+ public nor temporarily accessible. The result is that
+ <code>System.loadLibrary</code> and <code>dlopen(3)</code> both return
+ <code>NULL</code>, and may cause your app to crash. You should review your
+ app code to remove use of private platform APIs and thoroughly test your apps
+ using a preview device or emulator. If you are unsure whether your app uses
+ private libraries, you can <a href="#ndk-errors">check logcat</a> to identify
+ the runtime error.
+</p>
+
+<p>
+ The following table describes the behavior you should expect to see from an
+ app depending on its use of private native libraries and its target API
+ level (<code>android:targetSdkVersion</code>).
+</p>
+
+<table id="ndk-table">
+ <col width="15%">
+ <col width="15%">
+ <col width="15%">
+ <col width="20%">
+ <col width="20%">
+ <col width="20%">
+ <tr>
+ <th scope="col">
+ Libraries
+ </th>
+ <th scope="col">
+ Target API level
+ </th>
+ <th scope="col">
+ Runtime access via dynamic linker
+ </th>
+ <th scope="col">
+ N Developer Preview behavior
+ </th>
+ <th scope="col">
+ Final N Release behavior
+ </th>
+ <th scope="col">
+ Future Android platform behavior
+ </th>
+ </tr>
+
+<tr>
+ <td>
+ NDK Public
+ </td>
+
+ <td>
+ Any
+ </td>
+
+ <td style="background-color:#DCEDC8">
+ Accessible
+ </td>
+
+ <td style="background-color:#DCEDC8">
+ Works as expected
+ </td>
+
+ <td style="background-color:#DCEDC8">
+ Works as expected
+ </td>
+
+ <td style="background-color:#DCEDC8">
+ Works as expected
+ </td>
+</tr>
+
+<tr>
+ <td>
+ Private (temporarily accessible private libraries)
+ </td>
+
+ <td>
+ 23 or lower
+ </td>
+
+ <td style="background-color:#FFF9C4">
+ Temporarily accessible
+ </td>
+
+ <td style="background-color:#FFF9C4">
+ Works as expected, but you receive a logcat warning and a message on the
+ target device.
+ </td>
+
+ <td style="background-color:#FFF9C4">
+ Works as expected, but you receive a logcat warning.
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+</tr>
+
+<tr>
+ <td>
+ Private (temporarily accessible private libraries)
+ </td>
+
+ <td>
+ 24 or higher
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Restricted
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+</tr>
+
+<tr>
+ <td>
+ Private (other)
+ </td>
+
+ <td>
+ Any
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Restricted
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+
+ <td style="background-color:#ffcdd2">
+ Runtime error
+ </td>
+</tr>
+</table>
+
+<h3 id="ndk-errors">
+ Check if your app uses private libraries
+</h3>
+
+<p>
+ To help you identify issues loading private libraries, logcat may generate a
+ warning or runtime error. For example, if your app targets API level 23 or
+ lower, and tries to access a private library on a device running Android 7.0,
+ you may see a warning similar to the following:
+</p>
+
+<pre class="no-pretty-print">
+03-21 17:07:51.502 31234 31234 W linker : library "libandroid_runtime.so"
+("/system/lib/libandroid_runtime.so") needed or dlopened by
+"/data/app/com.popular-app.android-2/lib/arm/libapplib.so" is not accessible
+for the namespace "classloader-namespace" - the access is temporarily granted
+as a workaround for http://b/26394120
+</pre>
+
+<p>
+ These logcat warnings tell you which which library is trying to access a
+ private platform API, but will not cause your app to crash. If the app
+ targets API level 24 or higher, however, logcat generates the following
+ runtime error and your app may crash:
+</p>
+
+<pre class="no-pretty-print">
+java.lang.UnsatisfiedLinkError: dlopen failed: library "libcutils.so"
+("/system/lib/libcutils.so") needed or dlopened by
+"/system/lib/libnativeloader.so" is not accessible for the namespace
+"classloader-namespace"
+ at java.lang.Runtime.loadLibrary0(Runtime.java:977)
+ at java.lang.System.loadLibrary(System.java:1602)
+</pre>
+
+<p>
+ You may also see these logcat outputs if your app uses third-party libraries
+ that dynamically link to private platform APIs. The readelf tool in the
+ Android 7.0DK allows you to generate a list of all dynamically linked shared
+ libraries of a given <code>.so</code> file by running the following command:
+</p>
+
+<pre class="no-pretty-print">
+aarch64-linux-android-readelf -dW libMyLibrary.so
+</pre>
+
+<h3 id="ndk-update">
+ Update your app
+</h3>
+
+<p>
+ Here are some steps you can take to fix these types of errors and make
+ sure your app doesn't crash on future platform updates:
+</p>
+
+<ul>
+ <li>
+ If your app uses private platform libraries, you should update it to include
+ its own copy of those libraries or use the <a href=
+ "{@docRoot}ndk/guides/stable_apis.html">public NDK APIs</a>.
+ </li>
+
+ <li>
+ If your app uses a third-party library that accesses private symbols, contact
+ the library author to update the library.
+ </li>
+
+ <li>
+ Make sure you package all your non-NDK libraries with your APK.
+ </li>
+
+ <li>Use standard JNI functions instead of <code>getJavaVM</code> and
+ <code>getJNIEnv</code> from <code>libandroid_runtime.so</code>:
+
+<pre class="no-pretty-print">
+AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
+AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
+JavaVM::AttachCurrentThread from <jni.h>.
+</pre>
+ </li>
+
+ <li>Use {@code __system_property_get} instead of the private {@code property_get}
+ symbol from {@code libcutils.so}. To do this, use {@code __system_property_get}
+ with the following include:
+
+<pre>
+#include <sys/system_properties.h>
+</pre>
+ <p class="note">
+ <strong>Note:</strong> The availability and contents of system properties is
+ not tested through CTS. A better fix would be to avoid using these
+ properties altogether.
+ </p>
+ </li>
+
+ <li>Use a local version of the {@code SSL_ctrl} symbol from {@code
+ libcrypto.so}. For example, you should statically link {@code libcyrpto.a} in
+ your {@code .so} file, or include a dynamically linked version of {@code
+ libcrypto.so} from BoringSSL/OpenSSL and package it in your APK.
+ </li>
+</ul>
+
+<h2 id="afw">Android for Work</h2>
+<p>
+ Android 7.0 contains changes for apps that target Android for Work, including
+ changes to certificate installation, password resetting, secondary user
+ management, and access to device identifiers. If you are building apps for
+ Android for Work environments, you should review these changes and modify
+ your app accordingly.
+</p>
+
+<ul>
+ <li>You must install a delegated certificate installer before the DPC can set
+ it. For both profile and device-owner apps targeting the N SDK, you should
+ install the delegated certificate installer before the device policy
+ controller (DPC) calls
+ <code>DevicePolicyManager.setCertInstallerPackage()</code>. If the installer
+ is not already installed, the system throws an
+ <code>IllegalArgumentException</code>.
+ </li>
+
+ <li>Reset password restrictions for device admins now apply to profile
+ owners. Device admins can no longer use
+ {@code DevicePolicyManager.resetPassword()} to clear passwords or change
+ ones that are already set. Device admins can still set a password, but only
+ when the device has no password, PIN, or pattern.
+ </li>
+
+ <li>Device and profile owners can manage accounts even if restrictions are
+ set. Device owners and profile owners can call the Account Management APIs
+ even if <code>DISALLOW_MODIFY_ACCOUNTS</code> user restrictions are in place.
+ </li>
+
+ <li>Device owners can manage secondary users more easily. When a device is
+ running in device owner mode, the <code>DISALLOW_ADD_USER</code> restriction
+ is automatically set. This prevents users from creating unmanaged secondary
+ users. In addition, the <code>CreateUser()</code> and
+ <code>createAndInitializeUser()</code> methods are deprecated; the new
+ <code>DevicePolicyManager.createAndManageUser()</code> method replaces them.
+ </li>
+
+ <li>Device owners can access device identifiers. A Device owner can access the
+ Wi-Fi MAC address of a device, using
+ <code>DevicePolicyManagewr.getWifiMacAddress()</code>. If Wi-Fi has never
+ been enabled on the device, this method returns a value of {@code null}.
+ </li>
+
+ <li>The Work Mode setting controls access to work apps. When work mode is off the
+ system launcher indicates work apps are unavailable by greying them out. Enabling
+ work mode again restores normal behavior.</li>
+
+ <li>When installing a PKCS #12 file containing a client certificate chain and
+ the corresponding private key from Settings UI, the CA certificate in the
+ chain is no longer installed to the trusted credentials storage. This does
+ not affect the result of {@link android.security.KeyChain#getCertificateChain
+ KeyChain.getCertificateChain()} when apps attempt to retrieve the client
+ certificate chain later. If required, the CA certificate should be installed
+ to the trusted credentials storage via Settings UI separately, with a
+ DER-encoded format under a .crt or .cer file extension.
+ </li>
+
+ <li>Starting in Android 7.0, fingerprint enrollment and storage are managed per user.
+ If a profile owner’s Device Policy Client (DPC) targets pre-N on an N device,
+ the user is still able to set fingerprint on the device, but work
+ applications cannot access device fingerprint. When the DPC targets N and
+ above, the user can set fingerprint specifically for work profile by going to
+ <strong>Settings > Security > Work profile security</strong>.
+ </li>
+
+ <li>A new encryption status <code>ENCRYPTION_STATUS_ACTIVE_PER_USER</code> is
+ returned by <code>DevicePolicyManager.getStorageEncryptionStatus()</code>, to
+ indicate that encryption is active and the encryption key is tied to the
+ user. The new status is only returned if DPC targets API Level 24 and above.
+ For apps targeting earlier API levels, <code>ENCRYPTION_STATUS_ACTIVE</code>
+ is returned, even if the encryption key is specific to the user or profile.
+ </li>
+
+ <li>In Android 7.0, several methods that would ordinarily affect the entire
+ device behave differently if the device has a work profile installed with a
+ separate work challenge. Rather than affecting the entire device, these
+ methods apply only to the work profile. (The complete list of such methods is
+ in the {@link android.app.admin.DevicePolicyManager#getParentProfileInstance
+ DevicePolicyManager.getParentProfileInstance()} documentation.) For example,
+ {@link android.app.admin.DevicePolicyManager#lockNow
+ DevicePolicyManager.lockNow()} locks just the work profile, instead of
+ locking the entire device. For each of these methods, you can get the old
+ behavior by calling the method on the parent instance of the
+ {@link android.app.admin.DevicePolicyManager}; you can get this parent by
+ calling {@link android.app.admin.DevicePolicyManager#getParentProfileInstance
+ DevicePolicyManager.getParentProfileInstance()}. So for example, if you call
+ the parent instance's {@link android.app.admin.DevicePolicyManager#lockNow}
+ method, the entire device is locked.
+ </li>
+
+</ul>
+
+<p>
+ For more information about changes to Android for Work in Android 7.0, see
+ <a href="{@docRoot}preview/features/afw.html">Android for Work Updates</a>.
+</p>
+
+<h2 id="annotations">Annotations Retention</h2>
+
+<p>
+Android 7.0 fixes a bug where the visibility of annotations was being ignored.
+This issue enabled the runtime to access annotations that it should not have been
+able to. These annotations included:
+</p>
+
+<ul>
+ <li>{@code VISIBILITY_BUILD}: Intended to be visible only at build time.</li>
+ <li>{@code VISIBILITY_SYSTEM}: Intended to be visible at runtime, but only to the
+ underlying system.</li>
+</ul>
+
+<p>
+If your app has relied on this behavior, please add a retention policy to annotations that must
+be available at runtime. You do so by using {@code @Retention(RetentionPolicy.RUNTIME)}.
+</p>
+
+<h2 id="other">Other Important Points</h2>
+
+<ul>
+<li>When an app is running on Android 7.0, but targets a lower API level,
+and the user changes display size, the app process is killed. The app
+must be able to gracefully handle this scenario. Otherwise, it crashes
+when the user restores it from Recents.
+
+<p>
+You should test your app to ensure
+that this behavior does not occur.
+You can do so by causing an identical crash
+when killing the app manually via DDMS.
+</p>
+
+<p>
+Apps targeting N and above are not automatically killed on density changes;
+however, they may still respond poorly to configuration changes.
+</p>
+</li>
+
+<li>
+Apps on Android 7.0 should be able to gracefully handle configuration changes,
+and should not crash on subsequent starts. You can verify app behavior
+by changing font size (<strong>Setting</strong> >
+<strong>Display</strong> > <strong>Font size</strong>), and then restoring
+the app from Recents.
+</li>
+
+<li>
+Due to a bug in previous versions of Android, the system did not flag writing
+to a TCP socket on the main thread as a strict-mode violation. Android 7.0 fixes this bug.
+Apps that exhibit this behavior now throw an {@code android.os.NetworkOnMainThreadException}.
+Generally, performing network operations on the main thread is a bad idea because these operations
+usually have a high tail latency that causes ANRs and jank.
+</li>
+
+<li>
+The {@code Debug.startMethodTracing()} family of methods now defaults to
+storing output in your package-specific directory on shared storage,
+instead of at the top level
+of the SD card. This means apps no longer need to request the {@code WRITE_EXTERNAL_STORAGE} permission to use these APIs.
+</li>
+
+<li>
+Many platform APIs have now started checking for large payloads being sent
+across {@link android.os.Binder} transactions, and the
+system now rethrows {@code TransactionTooLargeExceptions}
+as {@code RuntimeExceptions}, instead of silently logging or suppressing them. One
+common example is storing too much data in
+{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
+which causes {@code ActivityThread.StopInfo} to throw a
+{@code RuntimeException} when your app targets Android 7.0.
+</li>
+
+<li>
+If an app posts {@link java.lang.Runnable} tasks to a {@link android.view.View}, and
+the {@link android.view.View}
+is not attached to a window, the system
+queues the {@link java.lang.Runnable} task with the {@link android.view.View};
+the {@link java.lang.Runnable} task does not execute until the
+{@link android.view.View} is attached
+to a window. This behavior fixes the following bugs:
+<ul>
+ <li>If an app posted to a {@link android.view.View} from a thread other than the intended
+ window’s UI thread, the {@link java.lang.Runnable} may run on the wrong thread as a result.
+ </li>
+ <li>If the {@link java.lang.Runnable} task was posted from a thread other than
+ a looper thread, the app could expose the {@link java.lang.Runnable} task.</li>
+</ul>
+</li>
+
+<li>
+If an app on Android 7.0 with
+{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
+permission tries to delete a package, but a different app had installed that package,
+the system requires user confirmation. In this scenario, apps should expect
+{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
+as the return status when they invoke
+{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
+</li>
+
+ <li>The JCA provider called <em>Crypto</em> is deprecated, because its only
+ algorithm, SHA1PRNG, is cryptographically weak. Apps can no longer use
+ SHA1PRNG to (insecurely) derive keys, because this provider is no longer
+ available. For more information, see the blog
+ post <a href=
+ "http://android-developers.blogspot.com/2016/06/security-crypto-provider-deprecated-in.html"
+ class="external-link">Security "Crypto" provider deprecated in Android
+ N</a>.
+ </li>
+
+</ul>
+
diff --git a/docs/html/about/versions/nougat/android-7.0-samples.jd b/docs/html/about/versions/nougat/android-7.0-samples.jd
new file mode 100644
index 0000000..98f7090
--- /dev/null
+++ b/docs/html/about/versions/nougat/android-7.0-samples.jd
@@ -0,0 +1,85 @@
+page.title=Android 7.0 Samples
+page.tags="Android 7.0", "nougat", "samples", "android"
+page.image=images/cards/card-n-samples_2x.png
+@jd:body
+
+<p>
+ The following code samples are provided for Android 7.0. To
+ download the samples in Android Studio, select the <b>File > Import
+ Samples</b> menu option.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> These downloadable projects are designed
+ for use with Gradle and Android Studio.
+</p>
+
+
+<h3 id="mw">Multi-Window Playground</h3>
+<img src="{@docRoot}images/android-7.0/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156"/>
+<p>
+ This sample demonstrates how to take advantage of multiple window
+ user interfaces with your app.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
+ Get it on GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="an">Active Notifications</h3>
+<img src="{@docRoot}images/android-7.0/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ This is a pre-existing sample which shows a simple service that sends
+ notifications using NotificationCompat. Each unread conversation from a user
+ is sent as a distinct notification.
+</p>
+<p>
+ This sample has been updated to take advantage of new notification features
+ available in Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ActiveNotifications">
+ Get it on GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="ms">Messaging Service</h3>
+<img src="{@docRoot}images/android-7.0/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
+<p>
+ This is a pre-existing sample which demonstrates how to use
+ NotificationManager to tell how many notifications an application is currently
+ showing.
+</p>
+<p>
+ This sample has been updated to take advantage of new notification features
+ available in Android N.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-MessagingService">
+ Get it on GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="fbe">Direct Boot</h3>
+<img src="{@docRoot}images/android-7.0/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ This sample demonstrates how to store and access data in a device encrypted
+ storage which is always available while the device is booted.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-DirectBoot">
+ Get it on GitHub</a>
+</p>
+
+<div style="clear: both;"></div>
+<h3 id="sda">Scoped Directory Access</h3>
+<img src="{@docRoot}images/android-7.0/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
+<p>
+ This sample demonstrates how to read and write data from specific
+ directories, while requiring fewer permissions.
+</p>
+<p>
+ <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
+ Get it on GitHub</a>
+</p>
diff --git a/docs/html/about/versions/nougat/android-7.0-testing.jd b/docs/html/about/versions/nougat/android-7.0-testing.jd
new file mode 100644
index 0000000..f30382e
--- /dev/null
+++ b/docs/html/about/versions/nougat/android-7.0-testing.jd
@@ -0,0 +1,190 @@
+page.title=Android 7.0 Testing Guide
+page.image=images/cards/card-n-guide_2x.png
+meta.tags="preview", "testing"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#runtime-permissions">Testing Permissions</a></li>
+ <li><a href="#doze-standby">Testing Doze and App Standby</a></li>
+ <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android 7.0 gives you an opportunity to ensure your apps work with the next
+ version of the platform. This preview includes a number of APIs and behavior changes that can
+ impact your app, as described in the <a href="{@docRoot}preview/api-overview.html">API
+ Overview</a> and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>. In testing
+ your app with the preview, there are some specific system changes that you should focus on to
+ ensure that users have a good experience.
+</p>
+
+<p>
+ This guide describes the what and how to test preview features with your app. You should
+ prioritize testing of these specific preview features, due to their high potential impact on your
+ app's behavior:
+</p>
+
+<ul>
+ <li><a href="#runtime-permissions">Permissions</a>
+ </li>
+ <li><a href="#doze-standby">Doze and App Standby</a>
+ </li>
+ <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
+</ul>
+
+<p>
+ For more information about how to set up devices or virtual devices with a preview system image
+ for testing, see <a href="{@docRoot}preview/setup-sdk.html">Set up
+the Android N SDK</a>.
+</p>
+
+
+<h2 id="runtime-permissions">Testing Permissions</h2>
+
+<p>
+ The new <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> model
+ changes the way that permissions are allocated to your app by the user. Instead of granting all
+ permissions during the install procedure, your app must ask the user for individual permissions
+ at runtime. For users this behavior provides more granular control over each app’s activities, as
+ well as better context for understanding why the app is requesting a specific permission. Users
+ can grant or revoke the permissions granted to an app individually at any time. This feature of
+ the preview is most likely to have an impact on your app's behavior and may prevent some of your
+ app features from working, or they may work in a degraded state.
+</p>
+
+<p class="caution">
+ This change affects all apps running on the new platform, even those not targeting the new
+ platform version. The platform provides a limited compatibility behavior for legacy apps, but you
+ should begin planning your app’s migration to the new permissions model now, with a goal of
+ publishing an updated version of your app at the official platform launch.
+</p>
+
+
+<h3 id="permission-test-tips">Test tips</h3>
+
+<p>
+ Use the following test tips to help you plan and execute testing of your app with the new
+ permissions behavior.
+</p>
+
+<ul>
+ <li>Identify your app’s current permissions and the related code paths.</li>
+ <li>Test user flows across permission-protected services and data.</li>
+ <li>Test with various combinations of granted/revoked permission.</li>
+ <li>Use the {@code adb} tool to manage permssions from the command line:
+ <ul>
+ <li>List permissions and status by group:
+ <pre>adb shell pm list permissions -d -g</pre>
+ </li>
+ <li>Grant or revoke one or more permissions using the following syntax:<br>
+ <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Analyze your app for services that use permissions.</li>
+</ul>
+
+<h3 id="permission-test-strategy">Test strategy</h3>
+
+<p>
+ The permissions change affects the structure and design of your app, as well as
+ the user experience and flows you provide to users. You should assess your app’s current
+ permissions use and start planning for the new flows you want to offer. The official release of
+ the platform provides compatibility behavior, but you should plan on updating your app and not
+ rely on these behaviors.
+</p>
+
+<p>
+ Identify the permissions that your app actually needs and uses, and then find the various code
+ paths that use the permission-protected services. You can do this through a combination of
+ testing on the new platform and code analysis. In testing, you should focus on opting in to
+ runtime permissions by changing the app’s {@code targetSdkVersion} to the preview version. For
+ more information, see <a href="{@docRoot}preview/setup-sdk.html#">Set up
+the Android N SDK</a>.
+</p>
+
+<p>
+ Test with various combinations of permissions revoked and added, to highlight the user flows that
+ depend on permissions. Where a dependency is not obvious or logical you should consider
+ refactoring or compartmentalizing that flow to eliminate the dependency or make it clear why the
+ permission is needed.
+</p>
+
+<p>
+ For more information on the behavior of runtime permissions, testing, and best practices, see the
+ <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> developer
+ preview page.
+</p>
+
+
+<h2 id="doze-standby">Testing Doze and App Standby</h2>
+
+<p>
+ The power saving features of Doze and App Standby limit the amount of background processing that
+ your app can perform when a device is in an idle state or while your app is not in focus. The
+ restrictions the system may impose on apps include limited or no network access,
+ suspended background tasks, suspended Notifications, ignored wake requests, and alarms. To ensure
+ that your app behaves properly with these power saving optimizations, you should test your app by
+ simulating these low power states.
+</p>
+
+<h4 id="doze">Testing your app with Doze</h4>
+
+<p>To test Doze with your app:</p>
+
+<ol>
+<li>Configure a hardware device or virtual device with an Android N system image.</li>
+<li>Connect the device to your development machine and install your app.</li>
+<li>Run your app and leave it active.</li>
+<li>Simulate the device going into Doze mode by running the following commands:
+
+<pre>
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+
+ </li>
+ <li>Observe the behavior of your app when the device is re-activated. Make sure it
+ recovers gracefully when the device exits Doze.</li>
+</ol>
+
+
+<h4 id="standby">Testing apps with App Standby</h4>
+
+<p>To test the App Standby mode with your app:</p>
+
+<ol>
+ <li>Configure a hardware device or virtual device with an Android N system image.</li>
+ <li>Connect the device to your development machine and install your app.</li>
+ <li>Run your app and leave it active.</li>
+ <li>Simulate the app going into standby mode by running the following commands:
+
+<pre>
+$ adb shell am broadcast -a android.os.action.DISCHARGING
+$ adb shell am set-idle <packageName> true
+</pre>
+
+ </li>
+ <li>Simulate waking your app using the following command:
+ <pre>$ adb shell am set-idle <packageName> false</pre>
+ </li>
+ <li>Observe the behavior of your app when it is woken. Make sure it recovers gracefully
+ from standby mode. In particular, you should check if your app's Notifications and background
+ jobs continue to function as expected.</li>
+</ol>
+
+<h2 id="ids">Auto Backup for Apps and Device-Specific Identifiers</h2>
+
+<p>If your app is persisting any device-specific identifiers, such as Google
+Cloud Messaging registration ID, in internal storage,
+make sure to follow best practices to exclude the storage
+location from auto-backup, as described in <a href="{@docRoot}preview/backup/index.html">Auto
+Backup for Apps</a>. </p>
diff --git a/docs/html/about/versions/nougat/android-7.0.jd b/docs/html/about/versions/nougat/android-7.0.jd
new file mode 100644
index 0000000..87c8d93
--- /dev/null
+++ b/docs/html/about/versions/nougat/android-7.0.jd
@@ -0,0 +1,1209 @@
+page.title=Android 7.0 APIs
+meta.tags="Android 7.0", "android n", "Nougat"
+page.tags="Android 7.0", "Nougat", "android n", "developer preview"
+page.image=images/cards/card-n-apis_2x.png
+@jd:body
+
+
+
+
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>Key Developer Features</h2>
+ <ol>
+ <ul style="list-style-type:none;">
+ <li><a href="#multi-window_support">Multi-window Support</a></li>
+ <li><a href="#notification_enhancements">Notifications</a></li>
+ <li><a href="#jit_aot">JIT/AOT Compilation</a></li>
+ <li><a href="#quick_path_to_app_install">Quick Path to App Install</a></li>
+ <li><a href="#doze_on_the_go">Doze on the Go</a></li>
+ <li><a href="#background_optimizations">Background Optimizations</a></li>
+ <li><a href="#surfaceview">SurfaceView</a></li>
+ <li><a href="#data_saver">Data Saver</a></li>
+ <li><a href="#vulkan">Vulkan API</a></li>
+ <li><a href="#tile_api">Quick Settings Tile API</a></li>
+ <li><a href="#number-blocking">Number Blocking</a></li>
+ <li><a href="#call_screening">Call Screening</a></li>
+ <li><a href="#multi-locale_languages">Locales and Languages</a></li>
+ <li><a href="#emoji">New Emojis</a></li>
+ <li><a href="#icu4">ICU4J APIs in Android</a></li>
+ <li><a href="#webview">WebView</a></li>
+ <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
+ <li><a href="#android_tv_recording">Android TV Recording</a></li>
+ <li><a href="#android_for_work">Android for Work</a></li>
+ <li><a href="#accessibility_enhancements">Accessibility</a></li>
+ <li><a href="#direct_boot">Direct Boot</a></li>
+ <li><a href="#key_attestation">Key Attestation</a></li>
+ <li><a href="#network_security_config">Network Security Config</a></li>
+ <li><a href="#default_trusted_ca">Default Trusted CA</a></li>
+ <li><a href="#apk_signature_v2">APK Signature Scheme v2</a></li>
+ <li><a href="#scoped_directory_access">Scoped Directory Access</a></li>
+ <li><a href="#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a></li>
+ <li><a href="#custom_pointer_api">Custom Pointer API</a></li>
+ <li><a href="#sustained_performance_api">Sustained Performance API</a></li>
+ <li><a href="#vr">VR Support</a></li>
+ <li><a href="#print_svc">Print Service Enhancements</a></li>
+ <li><a href="#virtual_files">Virtual Files</a></li>
+ <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
+ </ol>
+</div>
+</div>
+
+
+
+<p>
+Android 7.0
+(<a href="{@docRoot}reference/android/os/Build.VERSION_CODES.html#N">N</a>)
+offers new features for users and app developers. This document provides
+an introduction to the most notable APIs. Make sure, also,
+to check out the <href="{@docRoot}about/versions/nougat/behavior.changes.html">
+Behavior Changes</a> to learn about areas where platform changes
+may affect your apps. In addition, the various developer guides
+can provide more information about key features.
+</p>
+
+<h2 id="multi-window_support">Multi-window Support</h2>
+
+
+<p>In Android 7.0, we're introducing a new and much-requested
+multitasking feature into the platform — multi-window support. </p>
+
+ <p>Users can now pop open two apps on the screen at once. </p>
+ <ul>
+ <li>On phones and tablets
+running Android 7.0, users can run two apps side-by-side or
+one-above-the-other in splitscreen mode. Users can resize the apps by dragging
+the divider between them. </li>
+
+<li>On Android TV devices, apps can put themselves in <a
+href="{@docRoot}preview/features/picture-in-picture.html">picture-in-picture
+mode</a>, allowing them to continue showing content while the user browses or
+interacts with other apps.</li>
+ </ul>
+
+<div class="col-4of10">
+<img src="{@docRoot}images/android-7.0/mw-portrait.png" alt="" style="height:460px;padding-left:1em;"
+ id="img-split-screen" />
+<p class="img-caption">
+ <strong>Figure 1.</strong> Apps running in split-screen mode.
+</p>
+
+ </div>
+
+<p>Especially on tablets and other larger-screen devices, multi-window support
+gives you new ways to engage users. You can even enable drag-and-drop in
+your app to let users conveniently drag content to or from your app — a great
+way to enhance your user experience. </p>
+
+<p>It's straightforward to add multi-window support to your app and configure how it
+handles multi-window display. For example, you can specify your activity's
+minimum allowable dimensions, preventing users from resizing the activity below
+that size. You can also disable multi-window display for your app, which
+ ensures that the system will only show your app in full-screen mode.</p>
+
+<p>
+ For more information, see the <a href=
+ "{@docRoot}preview/features/multi-window.html">Multi-Window Support</a>
+ developer documentation.
+</p>
+
+<h2 id="notification_enhancements">Notification Enhancements</h2>
+
+<p>In Android 7.0 we've redesigned notifications to make them easier and
+faster to use. Some of the changes include:</p>
+
+<ul>
+ <li>
+ <strong>Template updates</strong>: We're updating notification templates to
+ put a new emphasis on hero image and avatar. Developers will be able to
+ take advantage of the new templates with minimal adjustments in their code.
+ </li>
+
+ <li>
+ <strong>Messaging style customization</strong>: You can customize more of
+ the user interface labels associated with your notifications using the
+ <code>MessagingStyle</code> class. You can configure the message,
+ conversation title, and content view.
+ </li>
+
+ <li>
+ <strong>Bundled notifications</strong>: The system can group messages
+ together, for example by message topic, and display the group. A user can
+ take actions, such as Dismiss or Archive, on them in place. If you’ve
+ implemented notifications for Android Wear, you’ll already be familiar with
+ this model.
+ </li>
+
+ <li>
+ <strong>Direct reply</strong>: For real-time communication apps, the
+ Android system supports inline replies so that users can quickly respond to
+ an SMS or text message directly within the notification interface.
+ </li>
+
+ <li>
+ <strong>Custom views</strong>: Two new APIs enable you to leverage system
+ decorations, such as notification headers and actions, when using custom
+ views in notifications.
+ </li>
+</ul>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-1.png" alt=""
+ style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-3.png" alt=""
+ style="padding:.5em;max-width:226px">
+</div>
+
+<div class="col-4of12">
+ <img src="{@docRoot}images/android-7.0/notifications-2.png" alt=""
+ style="padding:.5em;max-width:226px">
+</div>
+
+
+<p class="img-caption">
+ <strong>Figure 2.</strong> Bundled notifications and direct reply.
+</p>
+
+<p>To learn how to implement the new features, see the
+ <a href="{@docRoot}preview/features/notification-updates.html">Notifications</a>
+ guide.</p>
+
+
+
+<h2 id="jit_aot">Profile-guided JIT/AOT Compilation</h2>
+
+<p>In Android 7.0, we've added a Just in Time (JIT) compiler with code
+profiling to ART, which lets it constantly improve the performance of
+Android apps as they run. The JIT compiler complements ART's current
+Ahead of Time (AOT) compiler and helps improve runtime performance, save
+storage space, and speed up app updates and system updates.</p>
+
+<p>Profile-guided compilation lets ART manage the AOT/JIT compilation for
+each app according to its actual usage, as well as conditions on the device.
+For example, ART maintains a profile of each app's hot methods and can
+precompile and cache those methods for best performance. It leaves other parts
+of the app uncompiled until they are actually used.</p>
+
+<p>Besides improving performance for key parts of the app, profile-guided
+compilation helps reduce an app's overall RAM footprint, including associated
+binaries. This feature is especially important on low-memory devices.</p>
+
+<p>ART manages profile-guided compilation in a way that minimizes impact on the
+device battery. It does precompilation only when then the device is idle and
+charging, saving time and battery by doing that work in advance.</p>
+
+<h2 id="quick_path_to_app_install">Quick Path to App Install</h2>
+
+<p>One of the most tangible benefits of ART's JIT compiler is the speed of app
+installs and system updates. Even large apps that required several minutes to
+optimize and install in Android 6.0 can now install in just a matter of
+seconds. System updates are also faster, since there's no more optimizing step. </p>
+
+<h2 id="doze_on_the_go">Doze on the Go...</h2>
+
+<p>Android 6.0 introduced Doze, a system mode that saves battery by deferring
+apps' CPU and network activities when the device is idle, such as when it's
+sitting on a table or in a drawer. </p>
+
+<p>Now in Android 7.0, Doze takes a step further and saves battery while on the go.
+Any time the screen is off for a period of time and the device is unplugged,
+Doze applies a subset of the familiar CPU and network restrictions to apps.
+This means users can save battery even when carrying their devices in their
+pockets.</p>
+
+
+<img src="/images/android-7.0/doze-diagram-1.png"
+ alt="" id="figure1" />
+<p class="img-caption">
+ <strong>Figure 3.</strong> Doze now applies
+ restrictions to improve battery life even when the device is not stationary.
+</p>
+
+
+<p>A short time after the screen turns off while the device is on battery, Doze
+restricts network access and defers jobs and syncs. During brief maintenance
+windows, applications are allowed network access and any of their deferred
+jobs/syncs are executed. Turning the screen on or plugging in the device brings
+the device out of Doze.</p>
+
+<p>When the device is stationary again, with screen off and on battery for a
+period of time, Doze applies the full CPU and network restrictions on {@link
+android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} alarms, and
+GPS/Wi-Fi scans.</p>
+
+<p>The best practices for adapting your app to Doze are the same whether the
+device is moving or not, so if you already updated your app to gracefully
+handle Doze, you're all set. If not, start <a
+href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">adapting
+your app to Doze</a> now.</p>
+
+<h2 id="background_optimizations">Project Svelte: Background Optimizations</h2>
+
+<p>Project Svelte is an ongoing effort to minimize RAM use by system and apps
+across the range of Android devices in the ecosystem. In Android 7.0, Project
+Svelte is focused on optimizing the way apps run in the background. </p>
+
+<p>Background processing is an essential part of most apps. When handled right, it
+can make your user experience amazing — immediate, fast, and context-aware.
+When not handled right, background processing can needlessly consume RAM (and
+battery) and affect system performance for other apps. </p>
+
+<p>Since Android 5.0, {@link android.app.job.JobScheduler} has been the
+preferred way of performing background work in a way that's good
+for users. Apps can schedule jobs while letting the system optimize based on
+memory, power, and connectivity conditions. JobScheduler offers control and
+simplicity, and we want all apps to use it. </p>
+
+<p>
+ Another good option is <a href=
+ "https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
+ <code>GCMNetworkManager</code></a>, part of Google Play Services, which
+ offers similar job scheduling with compatibility across legacy versions of
+ Android.
+</p>
+
+<p>We're continuing to extend <code>JobScheduler</code> and
+<code>GCMNetworkManager</code> to meet more of
+your use cases — for example, in Android 7.0 you can now schedule background
+work based on changes in Content Providers. At the same time we're starting to
+deprecate some of the older patterns that can reduce system performance,
+especially on low-memory devices.</p>
+
+<p>In Android 7.0 we're removing three commonly-used implicit broadcasts —
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+ android.hardware.Camera#ACTION_NEW_PICTURE}, and {@link
+ android.hardware.Camera#ACTION_NEW_VIDEO} — since those can wake the
+background processes of multiple apps at once and strain memory and battery. If
+your app is receiving these, take advantage of the Android 7.0 to
+ migrate to <code>JobScheduler</code> and related APIs instead. </p>
+
+<p>
+ Take a look at the <a href=
+ "{@docRoot}preview/features/background-optimization.html">Background
+ Optimizations</a> documentation for details.
+</p>
+
+<h2 id="surfaceview">SurfaceView</h2>
+<p>
+Android 7.0 brings synchronous movement to the {@link android.view.SurfaceView}
+class, which provides better battery performance
+than {@link android.view.TextureView} in certain cases: When rendering video or
+3D content, apps with scrolling and animated video position use less power with
+{@link android.view.SurfaceView} than with {@link android.view.TextureView}.
+</p>
+
+The {@link android.view.SurfaceView} class enables more battery-efficient compositing on
+screen, because it is composited in dedicated hardware, separately from app
+window content. As a result, it makes fewer intermediate
+copies than {@link android.view.TextureView}.
+</p>
+
+<p>
+A {@link android.view.SurfaceView} object's content position is now updated synchronously
+with the containing app content. One result of this change is that simple
+translations or scales of a video playing in a {@link android.view.SurfaceView}
+no longer produce black bars alongside the view as it moves.
+</p>
+
+<p>
+Starting with Android 7.0, we strongly recommend that you save power by using
+{@link android.view.SurfaceView} instead of {@link android.view.TextureView}.
+</p>
+
+<h2 id="data_saver">Data Saver</h2>
+
+<div class="col-5of12" style="margin-right:1.5em;">
+<img src="{@docRoot}images/android-7.0/datasaver.png" style="border:2px solid #ddd">
+
+<p class="img-caption" style="padding-right:2em;">
+ <strong>Figure 4.</strong> Data Saver in Settings.
+</p>
+ </div>
+
+<p>Over the life of a mobile device, the cost of a cellular data plan typically
+exceeds the cost of the device itself. For many users, cellular data is an
+expensive resource that they want to conserve. </p>
+
+<p>Android 7.0 introduces Data Saver mode, a new system service that helps reduce
+cellular data use by apps, whether roaming, near the end of the billing cycle,
+or on a small prepaid data pack. Data Saver gives users control over how apps
+use cellular data and lets developers provide more efficient service when Data
+Saver is on. </p>
+
+<p>When a user enables Data Saver in <strong>Settings</strong> and the device is
+on a metered network, the system blocks background data usage and signals apps
+to use less data in the foreground wherever possible — such as by limiting
+bit rate for streaming, reducing image quality, deferring optimistic precaching,
+and so on. Users can whitelist specific apps to allow background metered data
+usage even when Data Saver is turned on.</p>
+
+<p>Android 7.0 extends the {@link android.net.ConnectivityManager} to provide apps a
+way to <a href="{@docRoot}preview/features/data-saver.html#status">retrieve the
+user's Data Saver preferences</a> and <a
+href="{@docRoot}preview/features/data-saver.html#monitor-changes">monitor
+preference changes</a>. All apps should check whether the user has enabled Data
+Saver and make an effort to limit foreground and background data usage.</p>
+
+
+<h2 id="vulkan">Vulkan API</h2>
+
+<p>
+ Android 7.0 integrates <a href="http://www.khronos.org/vulkan" class=
+ "external-link">Vulkan™</a>, a new 3D rendering API, into the platform. Like
+ <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
+ ES</a>, Vulkan is an open standard for 3D graphics and rendering maintained
+ by the Khronos Group.
+</p>
+
+<p>
+ Vulkan is designed from the ground up to minimize CPU overhead in the driver,
+ and allow your application to control GPU operation more directly. Vulkan
+ also enables better parallelization by allowing multiple threads to perform
+ work such as command buffer construction at once.
+</p>
+
+<p>
+ Vulkan development tools and libraries are rolled into the Android 7.0DK. They
+ include:
+</p>
+
+<ul>
+ <li>Headers
+ </li>
+
+ <li>Validation layers (debug libraries)
+ </li>
+
+ <li>SPIR-V shader compiler
+ </li>
+
+ <li>SPIR-V runtime shader compilation library
+ </li>
+</ul>
+
+<p>
+ Vulkan is only available to apps on devices with Vulkan-capable hardware,
+ such as Nexus 5X, Nexus 6P, and Nexus Player. We're working closely with our
+ partners to bring Vulkan to more devices as soon as possible.
+</p>
+
+<p>
+ For more information, see the the <a href=
+ "{@docRoot}ndk/guides/graphics/index.html">API documentation</a>.
+</p>
+
+<h2 id="tile_api">Quick Settings Tile API</h2>
+
+
+<div style="float:right;max-width:320px">
+<img src="{@docRoot}images/android-7.0/quicksettings.png" style="padding-left:1.5em;">
+
+<p class="img-caption" style="padding-left:2em;">
+ <strong>Figure 5.</strong> Quick Settings tiles in the notification shade.
+</p>
+
+
+ </div><p>Quick Settings is a popular and simple way to expose key settings and actions,
+directly from the notification shade. In Android 7.0, we've expanded the scope of
+Quick Settings to make it even more useful and convenient. </p>
+
+<p>We've added more room for additional Quick Settings tiles, which users can
+access across a paginated display area by swiping left or right. We've also
+given users control over what Quick Settings tiles appear and where they are
+displayed — users can add or move tiles just by dragging and dropping them. </p>
+
+<p>For developers, Android 7.0 also adds a new API that lets you define your own
+ Quick Settings tiles to give users easy access to key controls and actions in your app.</p>
+
+<p>
+ Quick Settings tiles are reserved for controls or actions that are either
+ urgently required or frequently used, and should not be used as shortcuts to
+ launching an app.
+</p>
+
+<p>
+ Once you’ve defined your tiles, you can surface them to users, who can add
+ them to Quick Settings just by drag and drop.
+</p>
+
+<p>
+ For information about creating an app tile, see the documentation for
+ <code>android.service.quicksettings.Tile</code> in the downloadable <a href=
+ "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
+</p>
+
+
+
+<h2 id="number-blocking">Number Blocking</h2>
+
+<p>Android 7.0 now supports number blocking in the platform and provides a
+framework API to let service providers maintain a blocked-number list. The
+default SMS app, the default phone app, and carrier apps can read from and
+write to the blocked-number list. The list is not accessible to other apps.</p>
+
+<p>By making number blocking a standard feature of the platform, Android provides
+a consistent way for apps to support number blocking across a wide range of
+devices. Among the other benefits that apps can take advantage of are:</p>
+
+<ul>
+ <li> Numbers blocked on calls are also blocked on texts
+ <li> Blocked numbers can persist across resets and devices through the Backup &
+Restore feature
+ <li> Multiple apps can use the same blocked numbers list
+</ul>
+
+<p>Additionally, carrier app integration through Android means that carriers can
+read the blocked numbers list on the device and perform service-side blocking
+for the user in order to stop unwanted calls and texts from reaching the user
+through any medium, such as a VOIP endpoint or forwarding phones.</p>
+
+<p>
+ For more information, see <code>android.provider.BlockedNumberContract</code>
+ in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
+ Reference</a>.
+</p>
+
+<h2 id="call_screening">Call Screening</h2>
+
+<p>
+ Android 7.0 allows the default phone app to screen incoming calls. The phone
+ app does this by implementing the new <code>CallScreeningService</code>,
+ which allows the phone app to perform a number of actions based on an
+ incoming call's {@link android.telecom.Call.Details Call.Details}, such as:
+</p>
+
+<ul>
+ <li> Reject the incoming call
+ <li> Do not allow the call to the call log
+ <li> Do not show the user a notification for the call
+</ul>
+
+<p>
+ For more information, see <code>android.telecom.CallScreeningService</code>
+ in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
+ Reference</a>.
+</p>
+
+
+<h2 id="multi-locale_languages">Multi-locale Support, More Languages</h2>
+
+
+<p>Android 7.0 now lets users select <strong>multiple locales</strong> in Settings,
+to better support bilingual use-cases. Apps can use
+a new API to get the user's selected locales and then offer more sophisticated
+user experiences for multi-locale users — such as showing search results in
+multiple languages and not offering to translate webpages in a language the
+user already knows.</p>
+
+<p>Along with multi-locale support, Android 7.0 also expands the range of languages
+available to users. It offers more than 25 variants each for commonly used
+languages such as English, Spanish, French, and Arabic. It also adds partial
+support for more than 100 new languages.</p>
+
+<p>Apps can get the list of locales set by the user by calling
+<code>LocaleList.GetDefault()</code>. To support the expanded number of locales, Android 7.0 is
+changing the way that it resolves resources. Make sure that you test and verify that your apps
+working as expected with the new resource resolution logic.</p>
+
+<p>To learn about the new resource-resolution behavior and the best practices you
+should follow, see <a href="{@docRoot}preview/features/multilingual-support.html"
+>Multilingual Support</a>.</p>
+
+
+<h2 id="emoji">New Emojis</h2>
+
+<p>
+ Android 7.0 introduces additional emojis and emoji-related features including
+ skin tone emojis and support for variation
+ selectors. If your app supports emojis,
+ follow the guidelines below to take advantage of these emoji-related features.
+</p>
+
+<ul>
+ <li>
+ <strong>Check that a device contains an emoji before inserting it.</strong>
+ To check which emojis are present in the
+ system font, use the {@link android.graphics.Paint#hasGlyph(String)} method.
+ </li>
+ <li>
+ <strong>Check that an emoji supports variation selectors.</strong>
+ Variation selectors allow you to
+ present certain emojis in color or in black-and-white.
+ On mobile devices, apps should represent emojis in color rather than black-and-white. However,
+ if your app displays emojis inline with text, then it should use the black-and-white variation.
+ To determine whether an emoji has a variation, use the variation selector.
+ For a complete list of characters with variations, review the
+ <em>emoji variation sequences</em> section of the
+ <a class="external-link"
+ href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
+ Unicode documentation on variations</a>.
+ </li>
+ <li>
+ <strong>Check that an emoji supports skin tone.</strong> Android 7.0 allows users to modify the
+ rendered skin tone of emojis to their preference. Keyboard apps should provide visual
+ indications for emojis that have multiple skin tones and should allow users to
+ select the skin tone that they prefer. To determine which system emojis have
+ skin tone modifiers, use the {@link android.graphics.Paint#hasGlyph(String)}
+ method. You can determine which emojis use skin tones by reading the
+ <a class="external-link"
+ href="http://unicode.org/emoji/charts/full-emoji-list.html">
+ Unicode documentation</a>.
+ </li>
+</ul>
+
+
+<h2 id="icu4">ICU4J APIs in Android</h2>
+
+<p>
+ Android 7.0 now offers a subset of <a href=
+ "http://site.icu-project.org/">ICU4J</a> APIs in the Android framework under
+ the <code>android.icu</code> package. Migration is easy, and mostly entails
+ simply changing from the <code>com.java.icu</code> namespace to
+ <code>android.icu</code>. If you are already using an ICU4J bundle in your
+ apps, switching to the <code>android.icu</code> APIs provided in the Android
+ framework can produce substantial savings in APK size.
+</p>
+
+<p>
+ To learn more about the Android ICU4J APIs, see <a href=
+ "{@docRoot}preview/features/icu4j-framework.html">ICU4J Support</a>.
+</p>
+
+<h2 id="webview">WebView</h2>
+
+<h3>Chrome + WebView, Together</h3>
+
+<p>
+ Starting with Chrome version 51 on Android 7.0 and above, the Chrome APK on your device
+ is used to provide and render Android System WebViews. This approach improves memory
+ usage on the device itself and also reduces the bandwidth required to keep
+ WebView up to date (as the standalone WebView APK will no longer be updated
+ as long as Chrome remains enabled).
+</p>
+
+<p>
+ You can choose your WebView provider by enabling Developer Options and
+ selecting <strong>WebView implementation</strong>. You can use any compatible
+ Chrome version (Dev, Beta or Stable) that is installed on your device or the
+ standalone Webview APK to act as the WebView implementation.
+</p>
+
+<h3>Multiprocess</h3>
+
+<p>
+ Starting with Chrome version 51 in Android 7.0, WebView will run web content in a
+ separate sandboxed process when the developer option "Multiprocess WebView"
+ is enabled.
+</p>
+
+<p>
+ We're looking for feedback on compatibility and runtime performance in N
+ before enabling multiprocess WebView in a future version of Android. In this
+ version, regressions in startup time, total memory usage and software
+ rendering performance are expected.
+</p>
+
+<p>
+ If you find unexpected issues in multiprocess mode we’d like to hear about
+ them. Please get in touch with the WebView team on the <a href=
+ "https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs"
+ >Chromium bug tracker</a>.
+</p>
+
+<h3>Javascript run before page load</h3>
+<p>
+ Starting with apps targeting Android 7.0, the Javascript context will be reset
+ when a new page is loaded. Currently, the context is carried over for the
+ first page loaded in a new WebView instance.
+</p>
+
+<p>
+ Developers looking to inject Javascript into the WebView should execute the
+ script after the page has started to load.
+</p>
+
+<h3>Geolocation on insecure origins</h3>
+
+<p>
+ Starting with apps targeting Android 7.0, the geolocation API will only be
+ allowed on secure origins (over HTTPS.) This policy is designed to protect
+ users’ private information when they’re using an insecure connection.
+</p>
+
+<h3>Testing with WebView Beta</h3>
+
+<p>
+ WebView is updated regularly, so we recommend that you test compatibility
+ with your app frequently using WebView’s beta channel. To get started testing
+ pre-release versions of WebView on Android 7.0, download and install either
+ Chrome Dev or Chrome Beta, and select it as the WebView implementation under
+ developer options as described above. Please report issues via the <a href=
+ "https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">Chromium
+ bug tracker</a> so that we can fix them before a new version of WebView is
+ released.
+</p>
+
+<p>
+ If you have any other questions or issues, feel free to reach out to the
+ WebView team via our <a href=
+ "https://plus.google.com/communities/105434725573080290360">G+ community</a>.
+</p>
+
+<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
+
+<p>Android 7.0 adds framework interfaces and platform support for OpenGL ES 3.2, including:</p>
+
+<ul>
+ <li> All extensions from the <a class="external-link"
+href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
+Android Extension Pack</a></a> (AEP) except for <code>EXT_texture_sRGB_decode</code>.
+ <li> Floating-point framebuffers for HDR and deferred shading.
+ <li> BaseVertex draw calls to enable better batching and streaming.
+ <li> Robust buffer access control to reduce WebGL overhead.
+</ul>
+
+<p>The framework API for OpenGL ES 3.2 on Android 7.0 is provided with the
+<code>GLES32</code> class. When using OpenGL ES 3.2, be sure to declare the
+requirement in your manifest file, using the <code><uses-feature></code> tag and
+the <code>android:glEsVersion</code> attribute. </p>
+
+<p>For information about using OpenGL ES, including how to check a device's
+supported OpenGL ES version at runtime, see the <a
+href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API guide</a>.</p>
+
+
+<h2 id="android_tv_recording">Android TV Recording</h2>
+
+<p>Android 7.0 adds the ability to record and playback content from Android TV input
+services via new recording APIs. Building on top of existing time-shifting
+APIs, TV input services can control what channel data can be recorded, how
+recorded sessions are saved, and manage user interaction with recorded content. </p>
+
+<p>For more information, see <a
+href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording APIs</a>.</p>
+
+
+<h2 id="android_for_work">Android for Work</h2>
+
+<p>Android for Work adds many new features and APIs for devices running Android 7.0.
+Some highlights are below — for a complete list of changes, see
+<a href="{@docRoot}preview/features/afw.html">Android for Work Updates</a>.</p>
+
+<h3 id="work_profile_security_challenge">Work profile security challenge </h3>
+
+<p>
+ Profile owners targeting the N SDK
+ can specify a separate security challenge for apps running in
+ the work profile. The work challenge is shown when a user attempts to open
+ any work apps. Successful completion of the security challenge unlocks the
+ work profile and decrypts it if necessary. For profile owners,
+ <code>ACTION_SET_NEW_PASSWORD</code> prompts the user to set a work
+ challenge, and <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> prompts
+ the user to set a device lock.
+</p>
+
+<p>
+ Profile owners can set distinct passcode policies for the work challenge
+ (such as how long the PIN needs to be, or whether a fingerprint can be used
+ to unlock the profile) using the <code>setPasswordQuality()</code>,
+ <code>setPasswordMinimumLength()</code> and related methods. The profile
+ owner can also set the device lock using the <code>DevicePolicyManager</code>
+ instance returned by the new <code>getParentProfileInstance()</code> method.
+ Additionally, profile owners can customize the credentials screen for the
+ work challenge using the new <code>setOrganizationColor()</code> and
+ <code>setOrganizationName()</code> methods.
+</p>
+<h3 id="turn_off_work">Turn off work </h3>
+
+<p>On a device with a work profile, users can toggle work mode. When work mode is
+off the managed user is temporarily shut down, which disables work profile
+apps, background sync, and notifications. This includes the profile owner
+application. When work mode is off, the system displays a persistent status
+icon to remind the user that they can't launch work apps. The launcher
+indicates that work apps and widgets are not accessible. </p>
+
+<h3 id="always_on_vpn">Always on VPN </h3>
+
+<p>Device owners and profile owners can ensure that work apps always connect
+through a specified VPN. The system automatically starts that VPN after the
+device boots.</p>
+
+<p>
+ New <code>DevicePolicyManager</code> methods are
+ <code>setAlwaysOnVpnPackage()</code> and
+ <code>getAlwaysOnVpnPackage()</code>.
+</p>
+
+<p>Because VPN services can be bound directly by the system without app
+interaction, VPN clients need to handle new entry points for Always on VPN. As
+before, services are indicated to the system by an intent filter matching
+action <code>android.net.VpnService</code>. </p>
+
+<p>
+ Users can also manually set Always on VPN clients that implement
+ <code>VPNService</code> methods using
+ <strong>Settings>More>Vpn</strong>. The option to enable Always on VPN
+ from Settings is available only if VPN client targets API level 24.
+</p>
+
+<h3 id="custom_provisioning">Customized provisioning</h3>
+
+<p>
+ An application can customize the profile owner and device owner provisioning
+ flows with corporate colors and logos.
+ <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> customizes
+ flow color. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
+ customizes the flow with a corporate logo.
+</p>
+
+<h2 id="accessibility_enhancements">Accessibility Enhancements</h2>
+
+<p>Android 7.0 now offers Vision Settings directly on the Welcome screen for new
+device setup. This makes it much easier for users to discover and configure
+accessibility features on their devices, including magnification gesture, font
+size, display size, and TalkBack. </p>
+
+<p>With these accessibility features getting more prominent placement, your users
+are more likely to try your app with them enabled. Make sure you test your apps
+early with these settings enabled. You can enable them from Settings >
+Accessibility.</p>
+
+<p>Also in Android 7.0, accessibility services can now help users with motor
+impairments to touch the screen. The new API allows building services with
+features such as face-tracking, eye-tracking, point scanning, and so on, to
+meet the needs of those users.</p>
+
+<p>For more information, see <code>android.accessibilityservice.GestureDescription</code>
+ in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.</p>
+
+
+<h2 id="direct_boot">Direct Boot</h2>
+
+<p>Direct boot improves device startup times and lets registered
+apps have limited functionality even after an unexpected reboot.
+For example, if an encrypted device reboots while the user is sleeping,
+registered alarms, messages and incoming calls can now continue to notify
+the user as normal. This also means accessibility services can also be
+ available immediately after a restart.</p>
+
+<p>Direct boot takes advantage of file based encryption in Android 7.0
+to enable fine grained encryption policies for both system and app data.
+The system uses a device-encrypted store for select system data and explicitly
+registered app data. By default a credential-encrypted store is used for all
+ other system data, user data, apps, and app data. </p>
+
+<p>At boot, the system starts in a restricted mode with access to
+device-encrypted data only, and without general access to apps or data.
+If you have components that you want to run in this mode, you can register
+them by setting a flag in the manifest. After restart, the system activates
+registered components by broadcasting the <code>LOCKED_BOOT_COMPLETED</code>
+intent. The system ensures registered device-encrypted app data is available
+before unlock. All other data is unavailable until the User confirms their lock
+ screen credentials to decrypt it. </p>
+
+For more information, see <a href="{@docRoot}preview/features/direct-boot.html">Direct Boot</a>.</p>
+</p>
+
+<h2 id="key_attestation">Key Attestation</h2>
+
+<p>
+ Android 7.0 introduces <em>key attestation</em>, a new security tool that helps
+ you make sure that the key pairs stored within a device's <a class=
+ "external-link" href=
+ "https://source.android.com/security/keystore/"><em>hardware-backed
+ keystore</em></a> properly protect the sensitive information that your app
+ uses. By using this tool, you gain additional confidence that your app
+ interacts with keys that reside in secure hardware, even if the device
+ running your app is rooted. If you use keys from the hardware-backed keystore
+ in your apps, you should use this tool, particularly if you use the keys to
+ verify sensitive information within your app.
+</p>
+
+<p>
+ Key attestation allows you to verify that an RSA or EC key pair has been
+ created and stored in a device’s hardware-backed keystore within the device’s
+ trusted execution environment (TEE). The tool also allows you to use an
+ off-device service, such as your app's back-end server, to determine and
+ strongly verify the uses and validity of the key pair. These features provide
+ an additional level of security that protects the key pair, even if someone
+ roots the device or compromises the security of the Android platform running
+ on the device.
+</p>
+
+<p class="note">
+ <strong>Note: </strong>Only a small number of devices running Android 7.0
+ support hardware-level key attestation; all other devices running Android 7.0
+ use software-level key attestation instead. Before you verify the properties
+ of a device's hardware-backed keys in a production-level environment, you
+ should make sure that the device supports hardware-level key attestation. To
+ do so, you should check that the attestation certificate chain contains a root
+ certificate that is signed by the Google attestation root key and that the
+ <code>attestationSecurityLevel</code> element within the <a
+ href="{@docRoot}preview/features/key-attestation.html#certificate_schema_keydescription">key
+ description</a> data structure is set to the TrustedEnvironment security
+ level.
+</p>
+
+<p>
+ For more information, see the
+ <a href="{@docRoot}preview/features/key-attestation.html">Key Attestation</a>
+ developer documentation.
+</p>
+
+<h2 id="network_security_config">Network Security Config</h2>
+
+<p>In Android 7.0, apps can customize the behavior of their secure (HTTPS, TLS)
+connections safely, without any code modification, by using the declarative
+<em>Network Security Config</em> instead of using the conventional
+error-prone programmatic APIs (e.g. X509TrustManager).</p>
+
+ <p>Supported features:</p>
+<ul>
+<li><b>Custom trust anchors.</b> Lets an application customize which
+Certificate Authorities (CA) are trusted for its secure connections. For
+example, trusting particular self-signed certificates or a restricted set of public CAs.
+</li>
+<li><b>Debug-only overrides.</b> Lets an application developer safely debug
+secure connections of their application without added risk to the installed
+base.
+</li>
+<li><b>Cleartext traffic opt-out.</b> Lets an application protect itself from
+accidental usage of cleartext traffic.</li>
+<li><b>Certificate pinning.</b> An advanced feature that lets an application
+ limit which server keys are trusted for secure connections.</li>
+</ul>
+
+<p>For more information, see <a
+href="{@docRoot}preview/features/security-config.html">Network Security
+Config</a>.</p>
+
+<h2 id="default_trusted_ca">Default Trusted Certificate Authority</h2>
+
+<p>By default, apps that target Android 7.0 only trust system-provided certificates
+and no longer trust user-added Certificate Authorities (CA). Apps targeting Android
+N that wish to trust user-added CAs should use the
+<a href="{@docRoot}preview/features/security-config.html">Network Security Config</a> to
+specify how user CAs should be trusted.</p>
+
+<h2 id="apk_signature_v2">APK Signature Scheme v2</h2>
+
+<p>
+ Android 7.0 introduces APK Signature Scheme v2, a new app-signing scheme that
+ offers faster app install times and more protection against unauthorized
+ alterations to APK files. By default, Android Studio 2.2 and the Android
+ Plugin for Gradle 2.2 sign your app using both APK Signature Scheme v2 and
+ the traditional signing scheme, which uses JAR signing.
+</p>
+
+<p>
+ Although we recommend applying APK Signature Scheme v2 to your app, this new
+ scheme is not mandatory. If your app doesn't build properly when using APK
+ Signature Scheme v2, you can disable the new scheme. The disabling process
+ causes Android Studio 2.2 and the Android Plugin for Gradle 2.2 to sign your
+ app using only the traditional signing scheme. To sign with only the
+ traditional scheme, open the module-level <code>build.gradle</code> file, then
+ add the line <code>v2SigningEnabled false</code> to your release signing
+ configuration:
+</p>
+
+<pre>
+ android {
+ ...
+ defaultConfig { ... }
+ signingConfigs {
+ release {
+ storeFile file("myreleasekey.keystore")
+ storePassword "password"
+ keyAlias "MyReleaseKey"
+ keyPassword "password"
+ <strong>v2SigningEnabled false</strong>
+ }
+ }
+ }
+</pre>
+
+<p class="caution"><strong>Caution: </strong> If you sign your app using APK
+ Signature Scheme v2 and make further changes to the app, the app's signature
+ is invalidated. For this reason, use tools such as <code>zipalign</code>
+ before signing your app using APK Signature Scheme v2, not after.
+</p>
+
+<p>
+ For more information, read the Android Studio documents that describe how to
+ <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
+ sign an app</a> in Android Studio and how to <a href=
+ "{@docRoot}studio/build/build-variants.html#signing"> configure
+ the build file for signing apps</a> using the Android Plugin for Gradle.
+</p>
+
+<h2 id="scoped_directory_access">Scoped Directory Access</h2>
+
+<p>In Android 7.0, apps can use new APIs to request access to specific <a
+href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">external
+storage</a> directories, including directories on removable media such as SD
+cards. The new APIs greatly simplify how your application accesses standard
+external storage directories, such as the <code>Pictures</code> directory. Apps
+like photo apps can use these APIs instead of using
+<code>READ_EXTERNAL_STORAGE</code>, which grants access to all storage
+directories, or the Storage Access Framework, which makes the user navigate to
+the directory.</p>
+
+<p>Additionally, the new APIs simplify the steps a user takes to grant external
+storage access to your app. When you use the new APIs, the system uses a simple
+permissions UI that clearly details what directory the application is
+requesting access to.</p>
+
+<p>For more information, see the
+<a href="{@docRoot}preview/features/scoped-folder-access.html">Scoped
+Directory Access</a> developer documentation.</p>
+
+<h2 id="keyboard_shortcuts_helper">Keyboard Shortcuts Helper</h2>
+
+<p>
+ In Android 7.0, the user can press <strong>Meta + /</strong> to trigger a
+ <em>Keyboard Shortcuts</em> screen that displays all shortcuts available both
+ from the system and from the app in focus. The system retrieves these
+ shortcuts automatically from the app’s menu if the shortcuts exist. You can
+ also provide your own fine-tuned shortcuts lists for the screen. You can do
+ this by overriding the new <code>Activity.onProvideKeyboardShortcuts()</code>
+ method, described in the downloadable <a href=
+ "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> The <strong>Meta</strong> key is not present on all
+ keyboards: on a Macintosh keyboard, it is the <strong>Command</strong> key,
+ on the Windows keyboard, it is the <strong>Windows</strong> key, and on the
+ Pixel C and the Chrome OS keyboards, it is the <strong>Search</strong> key.
+</p>
+
+<p>
+ To trigger Keyboard Shortcuts Helper from anywhere in your app, call
+ {@code Activity.requestKeyboardShortcutsHelper()} for the relevant activity.
+</p>
+
+<h2 id="custom_pointer_api">
+ Custom Pointer API
+</h2>
+
+<p>
+ Android 7.0 introduces the Custom Pointer API, which lets you customize the
+ appearance, visibility, and behavior of the pointer. This capability is
+ especially useful when a user is using a mouse or touchpad to interact with
+ UI objects. The default pointer uses a standard icon. This API also includes
+ advanced functionality such as changing the pointer icon's appearance based
+ on specific mouse or touchpad movements.
+</p>
+
+<p>
+ To set a pointer icon, override the <code>onResolvePointerIcon()</code>
+ method of the <code>View</code> class. This method uses a
+ <code>PointerIcon</code> object to draw the icon that corresponds to a
+ specific motion event.
+</p>
+
+<h2 id="sustained_performance_api">Sustained Performance API</h2>
+
+<p>
+Performance can fluctuate dramatically for long-running apps, because the
+system throttles system-on-chip engines as device components reach their
+temperature limits. This fluctuation presents a moving target for app
+developers creating high-performance, long-running apps.
+</p>
+
+<p>
+To address these limitations, Android 7.0 includes support for
+<em>sustained performance mode</em>, enabling OEMs to provide hints about
+device-performance capabilities for long-running apps. App developers
+can use these hints to tune apps for a predictable,
+consistent level of device performance over long periods of time.
+</p>
+
+<p>
+App developers can try out this new API in Android 7.0 on
+Nexus 6P devices only. To use this feature,
+set the sustained performance window flag for the window
+you want to run in sustained performance mode. Set this flag using the
+{@code Window.setSustainedPerformanceMode()} method. The system automatically
+disables this mode when the window is no longer in focus.
+</p>
+
+<h2 id="vr">VR Support</h2>
+
+<p>
+Android 7.0 adds platform support and optimizations for a new VR Mode to let developers
+build high-quality mobile VR experiences for users. There are a number of performance
+enhancements, including access to an exclusive CPU core for VR apps.
+Within your apps, you can take advantage of intelligent head-tracking,
+and stereo notifications that work for VR. Most importantly, Android 7.0 provides for
+very low latency graphics. For complete information about building VR apps for Android 7.0,
+see the <a href="https://developers.google.com/vr/android/">Google VR SDK for Android</a>.
+</p>
+
+
+<h2 id="print_svc">Print Service Enhancements</h2>
+
+<p>
+ In Android 7.0, print service developers can now surface additional information
+ about individual printers and print jobs.
+</p>
+
+<p>
+ When listing individual printers, a print service can now set per-printer
+ icons in two ways:
+</p>
+
+<ul>
+ <li>You can set an icon from a resource ID by calling
+ <code>PrinterInfo.Builder.setResourceIconId()</code>
+ </li>
+
+ <li>You can show an icon from the network by calling
+ <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>, and setting a
+ callback for when the icon is requested using
+ <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>
+ </li>
+</ul>
+
+<p>
+ In addition, you can provide a per-printer activity to display additional
+ information by calling <code>PrinterInfo.Builder.setInfoIntent()</code>.
+</p>
+
+<p>
+ You can indicate the progress and status of print jobs in the print job
+ notification by calling
+ <code>android.printservice.PrintJob.setProgress()</code> and
+ <code>android.printservice.PrintJob.setStatus()</code>, respectively.
+</p>
+
+<p>
+ For more information about these methods, see the downloadable <a href=
+ "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
+</p>
+
+<h2 id="framemetrics_api">FrameMetricsListener API</h2>
+
+<p>
+The FrameMetricsListener API allows an app to monitor its UI rendering
+performance. The API provides this capability by exposing a streaming Pub/Sub API to transfer frame
+timing info for the app's current window. The data returned is
+equivalent to that which <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code> displays, but is not limited to the past 120 frames.
+</p>
+
+<p>
+You can use FrameMetricsListener to measure interaction-level UI
+performance in production, without a USB connection. This API
+allows collection of data at a much higher granularity than does
+{@code adb shell dumpsys gfxinfo}. This higher granularity is possible because
+the system can collect data for particular interactions in the app; the system
+need not capture a global summary of the entire app’s
+performance, or clear any global state. You can use this
+capability to gather performance data and catch regressions in UI performance
+for real use cases within an app.
+</p>
+
+<p>
+To monitor a window, implement the <code>FrameMetricsListener.onMetricsAvailable()</code>
+callback method and register it on that window. For more information, refer to
+the {@code FrameMetricsListener} class documentation in
+the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
+</p>
+
+<p>
+The API provides a {@code FrameMetrics} object, which contains timing data that
+the rendering subsystem reports for various milestones in a frame lifecycle.
+The supported metrics are: {@code UNKNOWN_DELAY_DURATION},
+{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
+{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
+{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
+{@code TOTAL_DURATION}, and {@code FIRST_DRAW_FRAME}.
+</p>
+
+
+<h2 id="virtual_files">Virtual Files</h2>
+
+<p>
+ In previous versions of Android, your app could use the Storage Access
+ Framework to allow users to select files from their cloud storage accounts,
+ such as Google Drive. However, there was no way to represent files that did
+ not have a direct bytecode representation; every file was required to provide
+ an input stream.
+</p>
+
+<p>
+ Android 7.0 adds the concept of <em>virtual files</em> to the Storage Access
+ Framework. The virtual files feature allows your
+ {@link android.provider.DocumentsProvider} to return document URIs that can be
+ used with an {@link android.content.Intent#ACTION_VIEW} intent even if they
+ don't have a direct bytecode representation. Android 7.0 also allows you to
+ provide alternate formats for user files, virtual or otherwise.
+</p>
+
+<p>
+ To get a URI for a virtual document in your app, first you create an
+ {@link android.content.Intent} to open the file picker UI. Since an app
+ cannot directly open a virtual file by using the
+ {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()}
+ method, your app does not receive any virtual files if you include the
+ {@link android.content.Intent#CATEGORY_OPENABLE} category.
+</p>
+
+<p>
+ After the user has made a selection, the system calls the
+ {@link android.app.Activity#onActivityResult onActivityResult()} method.
+ Your app can retrieve the URI of the virtual file and get an input stream, as
+ demonstrated in the code snippet below.
+</p>
+
+<pre>
+ // Other Activity code ...
+
+ final static private int REQUEST_CODE = 64;
+
+ // We listen to the OnActivityResult event to respond to the user's selection.
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ try {
+ if (requestCode == REQUEST_CODE &&
+ resultCode == Activity.RESULT_OK) {
+
+ Uri uri = null;
+
+ if (resultData != null) {
+ uri = resultData.getData();
+
+ ContentResolver resolver = getContentResolver();
+
+ // Before attempting to coerce a file into a MIME type,
+ // check to see what alternative MIME types are available to
+ // coerce this file into.
+ String[] streamTypes =
+ resolver.getStreamTypes(uri, "*/*");
+
+ AssetFileDescriptor descriptor =
+ resolver.openTypedAssetFileDescriptor(
+ uri,
+ streamTypes[0],
+ null);
+
+ // Retrieve a stream to the virtual file.
+ InputStream inputStream = descriptor.createInputStream();
+ }
+ }
+ } catch (Exception ex) {
+ Log.e("EXCEPTION", "ERROR: ", ex);
+ }
+ }
+</pre>
+
+<p>
+ For more information about accessing user files, see the
+ <a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+ Access Frameworks guide</a>.
+</p>
diff --git a/docs/html/about/versions/nougat/index.jd b/docs/html/about/versions/nougat/index.jd
new file mode 100644
index 0000000..aaf7e92
--- /dev/null
+++ b/docs/html/about/versions/nougat/index.jd
@@ -0,0 +1,150 @@
+page.title=Android N Developer Preview
+page.tags="preview","developer"
+meta.tags="preview", "android"
+fullpage=true
+forcelocalnav=true
+header.hide=1
+footer.hide=1
+@jd:body
+
+<script>
+ $(document).ready(function() {
+ if (useUpdatedTemplates) {
+ $("#useUpdatedTemplates").css("display","block");
+ } else {
+ $("#useOldTemplates").css("display","block");
+ }
+ })
+</script>
+
+<section class="dac-expand dac-hero dac-light" style="background-color:#B2DFDB">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
+ <div class="cols dac-hero-content" style="padding-bottom:1em;">
+
+ <div class="col-7of16 col-push-9of16" style="padding-left:2em">
+ <h1 class="dac-hero-title">Android 7.0 Nougat</h1>
+ <p class="dac-hero-description">
+ <strong>Android 7.0 Nougat brings a new crop of sweet features to your Android device.</strong>
+ <strong>Test your apps</strong> on Nexus and other devices. Support new system
+ behaviors to <strong>save power and memory</strong>.
+ Extend your apps with <strong>multi-window UI</strong>,
+ <strong>direct reply notifications</strong> and more.
+ </p>
+
+ <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Get started
+ </a><!--<br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Update to Android N (final SDK)
+ </a><br>-->
+ </div>
+ <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:1.5em;padding-right:1.5em;">
+ <img class="dac-hero-image" src="{@docRoot}images/home/n-preview-hero.png"
+ srcset="{@docRoot}images/home/n-preview-hero.png 1x,
+ {@docRoot}images/home/n-preview-hero_2x.png 2x">
+ </div>
+ </div>
+ <div class="dac-section dac-small">
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:nougat/landing/resources"
+ data-cardSizes="6x2"
+ data-maxResults="3"></div>
+ </div>
+ </div>
+</section>
+
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
+ <div class="wrap dac-offset-parent">
+ <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">
+ <i class="dac-sprite dac-arrow-down-gray"></i>
+ </a>
+ <ul class="dac-actions">
+ <li class="dac-action">
+ <a class="dac-action-link" href="https://developer.android.com/preview/bug">
+ <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+ Report an issue
+ </a>
+ </li>
+ <li class="dac-action">
+ <a class="dac-action-link" href="{@docRoot}preview/support.html">
+ <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+ See release notes
+ </a>
+ </li>
+ <li class="dac-action">
+ <a class="dac-action-link" href="{@docRoot}preview/dev-community">
+ <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+ Join dev community
+ </a>
+ </li>
+ </ul>
+ </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none;color:black" class="actions-bar dac-expand dac-invert">
+ <div class="wrap dac-offset-parent">
+
+ <div class="actions">
+ <div><a href="https://developer.android.com/preview/bug">
+ <span class="dac-sprite dac-auto-chevron-large"></span>
+ Report an issue
+ </a></div>
+ <div><a href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron-large"></span>
+ See release notes
+ </a></div>
+ <div><a href="{@docRoot}preview/dev-community">
+ <span class="dac-sprite dac-auto-chevron-large"></span>
+ Join dev community
+ </a></div>
+ </div><!-- end .actions -->
+ </div><!-- end .wrap -->
+</div>
+
+<section class="dac-section dac-light dac-small" id="latest"><div class="wrap">
+ <h2 class="norule">Latest</h2>
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="type:blog+tag:androidn+tag:featured, type:youtube+tag:androidn+tag:featured"
+ data-sortOrder="-timestamp"
+ data-cardSizes="6x6"
+ data-items-per-page="6"
+ data-maxResults="15"
+ data-initial-results="3"></div>
+</div></section>
+
+
+<section class="dac-section dac-gray" id="videos"><div class="wrap">
+ <h1 class="dac-section-title">Videos</h1>
+ <div class="dac-section-subtitle">
+ New Android capabilities and the right way to use them in your apps.
+ </div>
+
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:preview/landing/videos/first,type:youtube+tag:androidn"
+ data-sortOrder="-timestamp"
+ data-cardSizes="6x6"
+ data-items-per-page="6"
+ data-maxResults="15"
+ data-initial-results="3">
+ </div>
+</div></section>
+
+
+<section class="dac-section dac-light" id="resources"><div class="wrap">
+ <h1 class="dac-section-title">Resources</h1>
+ <div class="dac-section-subtitle">
+ Essential information to help you get your apps ready for Android N.
+ </div>
+
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:preview/landing/more"
+ data-cardSizes="6x6"
+ data-items-per-page="6"
+ data-maxResults="15"
+ data-initial-results="6"></div>
+
+ </div>
+</section>
+
diff --git a/docs/html/auto/images/logos/auto/borgward.png b/docs/html/auto/images/logos/auto/borgward.png
new file mode 100644
index 0000000..90298d4
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/borgward.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/lada.png b/docs/html/auto/images/logos/auto/lada.png
new file mode 100644
index 0000000..d172460
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/lada.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/lincoln.png b/docs/html/auto/images/logos/auto/lincoln.png
new file mode 100644
index 0000000..0ade9fe
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/lincoln.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/mbenz.png b/docs/html/auto/images/logos/auto/mbenz.png
new file mode 100644
index 0000000..84deacd
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/mbenz.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/opel.png b/docs/html/auto/images/logos/auto/opel.png
index 7e25ed5..fcb7040 100644
--- a/docs/html/auto/images/logos/auto/opel.png
+++ b/docs/html/auto/images/logos/auto/opel.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/renault.png b/docs/html/auto/images/logos/auto/renault.png
index d252aa3..2970430 100644
--- a/docs/html/auto/images/logos/auto/renault.png
+++ b/docs/html/auto/images/logos/auto/renault.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/rsm.png b/docs/html/auto/images/logos/auto/rsm.png
new file mode 100644
index 0000000..fa0e56a
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/rsm.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/tata.png b/docs/html/auto/images/logos/auto/tata.png
new file mode 100644
index 0000000..dfc4a5f
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/tata.png
Binary files differ
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index 843aabf..167ed7b 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -372,6 +372,12 @@
</a>
</div>
<div class="col-5">
+ <a href="http://www.borgward.com/en/">
+ <img src="{@docRoot}auto/images/logos/auto/borgward.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+ <div class="col-5">
<a href="http://www.buick.com/">
<img src="{@docRoot}auto/images/logos/auto/buick.png"
width="120" height="120" class="img-logo" />
@@ -383,15 +389,15 @@
width="120" height="120" class="img-logo" />
</a>
</div>
+ </div>
+
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.chevrolet.com/">
<img src="{@docRoot}auto/images/logos/auto/chevrolet.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
-
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.chrysler.com/">
<img src="{@docRoot}auto/images/logos/auto/chrysler.png"
@@ -410,15 +416,15 @@
width="120" height="120" class="img-logo" />
</a>
</div>
+ </div>
+
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.driveds.com/">
<img src="{@docRoot}auto/images/logos/auto/citroen_ds.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
-
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.fiat.com/">
<img src="{@docRoot}auto/images/logos/auto/fiat.png"
@@ -437,23 +443,20 @@
width="120" height="120" class="img-logo" />
</a>
</div>
-
- <div class="col-5">
- <a href="http://www.gmc.com/">
+ </div>
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href="http://www.gmc.com/">
<img src="{@docRoot}auto/images/logos/auto/gmc.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- </div>
- <div class="cols cols-leftp">
+ </a>
+ </div>
<div class="col-5">
<a href="http://www.holden.com/">
<img src="{@docRoot}auto/images/logos/auto/holden.png"
width="120" height="120" class="img-logo" />
</a>
</div>
-
-
<div class="col-5">
<a href="http://www.honda.com/">
<img src="{@docRoot}auto/images/logos/auto/honda.png"
@@ -466,165 +469,197 @@
width="120" height="120" class="img-logo" />
</a>
</div>
- <div class="col-5">
- <a href="http://www.infiniti.com/">
+ </div>
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href="http://www.infiniti.com/">
<img src="{@docRoot}auto/images/logos/auto/infinity.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- </div>
- <div class="cols cols-leftp">
- <div class="col-5">
- <a href="http://www.jaguar.com/index.html">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.jaguar.com/index.html">
<img src="{@docRoot}auto/images/logos/auto/jaguar.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.jeep.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.jeep.com/">
<img src="{@docRoot}auto/images/logos/auto/jeep.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
+ </a>
+ </div>
- <div class="col-5">
- <a href="http://www.kia.com/worldwide/">
+ <div class="col-5">
+ <a href="http://www.kia.com/worldwide/">
<img src="{@docRoot}auto/images/logos/auto/kia.png"
width="120" height="120" class="img-logo" />
- </a>
+ </a>
+ </div>
</div>
- <div class="col-5">
- <a href=" http://www.lamborghini.com/">
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href=" http://www.lada.ru/en/">
+ <img src="{@docRoot}auto/images/logos/auto/lada.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+ <div class="col-5">
+ <a href=" http://www.lamborghini.com/">
<img src="{@docRoot}auto/images/logos/auto/lambo.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- </div>
- <div class="cols cols-leftp">
- <div class="col-5">
- <a href=" http://www.landrover.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href=" http://www.landrover.com/">
<img src="{@docRoot}auto/images/logos/auto/landrover.png"
width="120" height="120" class="img-logo" />
- </a>
+ </a>
+ </div>
+ <div class="col-5">
+ <a href=" http://www.lincoln.com/">
+ <img src="{@docRoot}auto/images/logos/auto/lincoln.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
</div>
-
- <div class="col-5">
- <a href="http://www.mahindra.com/">
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href="http://www.mahindra.com/">
<img src="{@docRoot}auto/images/logos/auto/mahindra.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.maserati.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.maserati.com/">
<img src="{@docRoot}auto/images/logos/auto/maserati.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.mazda.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.mazda.com/">
<img src="{@docRoot}auto/images/logos/auto/mazda.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- </div>
+ </a>
+ </div>
- <div class="cols cols-leftp">
<div class="col-5">
- <a href="http://www.mitsubishi-motors.com/">
+ <a href="http://www.mercedes-benz.com/">
+ <img src="{@docRoot}auto/images/logos/auto/mbenz.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+ </div>
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href="http://www.mitsubishi-motors.com/">
<img src="{@docRoot}auto/images/logos/auto/mitsubishi.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
-
- <div class="col-5">
- <a href="http://www.nissan-global.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.nissan-global.com/">
<img src="{@docRoot}auto/images/logos/auto/nissan.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.opel.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.opel.com/">
<img src="{@docRoot}auto/images/logos/auto/opel.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.peugeot.com/">
+ </a>
+ </div>
+
+ <div class="col-5">
+ <a href="http://www.peugeot.com/">
<img src="{@docRoot}auto/images/logos/auto/peugeot.png"
width="120" height="120" class="img-logo" />
- </a>
+ </a>
+ </div>
</div>
- </div>
+
<div class="cols cols-leftp">
- <div class="col-5">
- <a href="http://www.ramtrucks.com/">
+ <div class="col-5">
+ <a href="http://www.ramtrucks.com/">
<img src="{@docRoot}auto/images/logos/auto/ram.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
-
- <div class="col-5">
- <a href="http://www.renault.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.renault.com/">
<img src="{@docRoot}auto/images/logos/auto/renault.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.seat.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.renaultsamsungm.com/ ">
+ <img src="{@docRoot}auto/images/logos/auto/rsm.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+
+ <div class="col-5">
+ <a href="http://www.seat.com/">
<img src="{@docRoot}auto/images/logos/auto/seat.png"
width="120" height="120" class="img-logo" />
- </a>
+ </a>
+ </div>
</div>
- <div class="col-5">
- <a href="http://www.skoda-auto.com/">
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href="http://www.skoda-auto.com/">
<img src="{@docRoot}auto/images/logos/auto/skoda.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- </div>
- <div class="cols cols-leftp">
- <div class="col-5">
- <a href="http://www.smotor.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.smotor.com/">
<img src="{@docRoot}auto/images/logos/auto/ssangyong.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
-
- <div class="col-5">
- <a href="http://www.subaru-global.com/">
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.subaru-global.com/">
<img src="{@docRoot}auto/images/logos/auto/subaru.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
+ </a>
+ </div>
-
- <div class="col-5">
- <a href="http://www.globalsuzuki.com/automobile/">
+ <div class="col-5">
+ <a href="http://www.globalsuzuki.com/automobile/">
<img src="{@docRoot}auto/images/logos/auto/suzuki.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
- <div class="col-5">
- <a href="http://www.vauxhall.co.uk/">
- <img src="{@docRoot}auto/images/logos/auto/vauxhall.png"
- width="120" height="120" class="img-logo" />
- </a>
- </div>
- </div>
- <div class="cols cols-leftp">
- <div class="col-5">
- <a href="http://www.volkswagen.com/">
- <img src="{@docRoot}auto/images/logos/auto/volkswagen.png"
- width="120" height="120" class="img-logo" />
- </a>
+ </a>
+ </div>
</div>
- <div class="col-5">
- <a href="http://www.volvocars.com/intl">
+ <div class="cols cols-leftp">
+ <div class="col-5">
+ <a href="http://www.tatamotors.com/">
+ <img src="{@docRoot}auto/images/logos/auto/tata.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.vauxhall.co.uk/">
+ <img src="{@docRoot}auto/images/logos/auto/vauxhall.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+ <div class="col-5">
+ <a href="http://www.volkswagen.com/">
+ <img src="{@docRoot}auto/images/logos/auto/volkswagen.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+
+
+ <div class="col-5">
+ <a href="http://www.volvocars.com/intl">
<img src="{@docRoot}auto/images/logos/auto/volvo.png"
width="120" height="120" class="img-logo" />
- </a>
- </div>
+ </a>
+ </div>
</div>
</div>
</div>
diff --git a/docs/html/community/index.html b/docs/html/community/index.html
deleted file mode 100644
index e3834ba..0000000
--- a/docs/html/community/index.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="width=device-width" />
-
-<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />
-<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
-<title>Android Developers Community</title>
-
-<!-- STYLESHEETS -->
-<link rel="stylesheet"
-href="//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">
-<link href="/assets/css/default.css" rel="stylesheet" type="text/css">
-
-<!-- JAVASCRIPT -->
-<script src="//www.google.com/jsapi" type="text/javascript"></script>
-<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script>
-<script type="text/javascript">
- var toRoot = "/";
- var devsite = false;
-</script>
-
-<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-5831155-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-</script>
-
-<style>
-#header {
- padding: 2.2em 0 0.2em 0;
-}
-#header-wrap h1 {
- margin:0;
- padding:0;
- line-height:16px;
-}
-#body-content {
- margin-top:20px;
-}
-#nav-x.wrap {
- overflow:auto;
-}
-h2 {
- border-bottom:1px solid #CCC;
-}
-</style>
-</head>
-
-
-
-
-
-
-<body>
-
-
-<!-- Header -->
-<div id="header">
- <div class="wrap" id="header-wrap">
- <div class="col-3 logo">
- <a href="/index.html">
- <img src="http://developer.android.com/assets/images/dac_logo.png" width="123" height="25" alt="Android Developers" />
- </a>
- </div>
- <div class="col-8">
- <h1>Community Outreach</h1>
- </div>
-
- <div class="menu-container">
- <div class="moremenu">
- <div id="more-btn"></div>
- </div>
- <div class="morehover" id="moremenu">
- <div class="top"></div>
- <div class="mid">
- <div class="header">Links</div>
- <ul style="margin-bottom:0">
- <li><a href="https://www.youtube.com/user/androiddevelopers">Android Developers Live</a></li>
- <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li>
- <li><a href="http://developer.android.com/training/">Android Developer Training</a></li>
- <li><a href="http://developer.android.com/samples/">Samples</a></li>
- </ul>
- <br class="clear-fix">
- </div>
- <div class="bottom"></div>
- </div><!-- end morehover -->
- </div><!-- end menu-container -->
- </div><!-- end header-wrap -->
-</div>
-<!-- /Header -->
-
-<div id="nav-x" class="wrap">
- <ul class="nav-x col-9 develop">
- <li><a href="#News">News</a></li>
- <li><a href="#Community">Community</a></li>
- <li><a href="#Content">Content</a></li>
- <li><a href="#Social">Social</a></li>
- </ul>
-</div>
-
-
-<!-- MAIN CONTENT -->
-
-
-<div class="wrap" id="body-content">
-
-<img src="/images/community/aco1small.png" alt="" style="float:right;margin:20px 0 0 40px">
-
-<p style="clear:left">
- Android is working with communities to
-<ul>
-<li>Create a cooperative relationship between highly impactful communities and high performing developers</li>
-<li>Strengthen relationships between Android and coding communities so that developers have a motivation to interact with those communities</li>
-<li>Reward communities for attracting developers by providing them with resources and direct access to the Android team</li></ul>
-<p>Our IMPACT is measured by <strong>good apps</strong> and a <strong>thriving community</strong></p>
-
-<h2 id="News" style="clear:left">News</h2>
-<p>Our current theme is on the <b><em>Android 4.4 KitKat and Updated Developer Tools</em></b> release, with new ways to create beautiful apps, printing and storage frameworks, low-power sensors, new media capabilities and RenderScript in the NDK.</p>
-
-<div class="col-8" style="margin-left:0">
-<img src="/images/community/kk-hero2.jpg" alt="" height="277">
-</div>
-
-<div class="col-8" style="margin-right:0">
-<h3 style="margin-top:0"><a href="http://developer.android.com/about/versions/kitkat.html">Android 4.4 Platform Highlights</a></h3>
-<p>Android KitKat brings all of Android's most innovative, most beautiful, and most useful features to more devices everywhere.</p>
-
-<h3><a href="http://developer.android.com/about/versions/android-4.4.html">Android 4.4 APIs</a></h3>
-<p>Android 4.4 (KITKAT) is a new release for the Android platform that offers new features for users and app developers. This document provides an introduction to the most notable new APIs.</p>
-
-<h3><a href="https://play.google.com/store/devices/details?id=nexus_5_white_32gb">New Nexus 5</a></h3>
-<p>Nexus 5 helps you capture the everyday and the epic in fresh new ways. It's the slimmest and fastest Nexus phone ever made, powered by Android 4.4, KitKat.</p>
-</div>
-<p></p>
-
-<h2 id="Community" style="clear:left">Community Spotlight</h2>
-
-<div class="col-8" style="margin-left:0">
-<h3>Android Community Groups</h3>
-<h4>July 2013</h4>
-<p><a href="mailto:gtugam@gmail.com">GDG Armenia</a> held <a href="http://eca.hackathon.am/">ecaHack Yerevan</a>, an Android hackathon featuring "Angry Designers vs Android Developers", where the designers had a look into developers apps and gave them some advices regarding to design. The hackathon was sponsored by Alcatel One Touch and each member of the winner team got one Alcatel One Touch Idol. Check out the <a href="https://plus.google.com/u/0/events/gallery/cgj9d39gphiephlq0e2899dv6j4?cfem=1">photos.</a></p>
-<h4>September 2013</h4>
-<p><a href="mailto:soham.mondal@gmail.com">GDG Blrdroid</a> held a <a href="http://www.meetup.com/blrdroid/events/140665852/">meetup</a> on performance optimisation.</p>
-<p><a href="mailto:baileye@gmail.com">GDG Dublin</a> held their meetup with a talk on AdMob for Android and iOS, entitled “Admob for Android and iOS developers”. </p>
-<p>GDG Mbale’s <a href="mailto:nsubugahassan@gmail.com">Hassan Nsubuga</a> has been managing a university <a href="https://plus.google.com/103735976334615631393/posts/gQMWCGUhMBn">course session</a> since September. They are now through with the basics and have a firm foundation, so this month they will be doing a lot of advanced stuff including exploring the latest API enhancements with KitKat. </p>
-<p><a href="mailto:wojtek.kalicinski@gmail.com">GDG Warsaw</a> held an Android Barcamp focused on App Quality. The discussion was moderated by GDG organisers, but the talks were given by the community members, including some top Android companies and developers in Poland.</p>
-<h4>October 2013</h4>
-<p><a href="mailto:benjamin.r.m.weiss@gmail.com">GDG Berlin Android</a> held their <a href="https://berlin.ticketbud.com/devfest-berlin-2013">DevFest</a>.</p>
-<p><a href="mailto:soham.mondal@gmail.com">GDG Blrdroid</a> held their <a href="http://www.meetup.com/blrdroid/events/144457162/">meetup</a> in collaboration with GDG Bangalore, where they talked about a wider range of things from incorporating user feedback to effectively using the cell radio. David McLaughlin from the Developer Relations team also visited during the meetup and delivered the keynote. They also hit a milestone with its 4th anniversary on the 9th of October and crossed 4300 members in the past few days so its been a memorable couple of months for them.</p>
-<p><a href="mailto:hir3npatel@gmail.com">GDG Cape Town</a> held an <a href="https://plus.google.com/108309780217630451504/posts/9BTCEqnBHoQ">Android Workshop</a> where they gave away lots of branded KitKats.</p>
-<p><a href="mailto:baileye@gmail.com">GDG Dublin</a> held its DevFest, which featured a codeLab on Android titled “Codelab: Intro to Android Development.”</p>
-<p><a href="mailto:hugo@dutchaug.org">GDG Dutch Android User Group</a> held their <a href="http://www.devfest.nl/program">DevFest</a>. They had a bunch of Android sessions, mostly by local speakers. In addition to the Android sessions, they also ran a workshop on writing custom views.</p>
-<p><a href="mailto:hugo@dutchaug.org">Hugo Visser</a> from the Dutch Android User Group spoke at <a href="https://bitbucket.org/qbusict/cupboard">DroidCon UK barcamp</a>, where he delivered a talk on Cupboard, a simple and lightweight persistence framework, specifically for Android.</p>
-<p><a href="mailto:prajyotmainkar@gmail.com">GDG GAUG</a> held the <a href="https://plus.google.com/110448195989468248957/posts/8doJuCpySWS">Google Devfest 2013</a>, where they had two tracks and more than 200 delegates attending. They also had a <a href="https://plus.google.com/110448195989468248957/posts/6rxLzj2Rpde">Hackathon</a> and they hit the <a href="https://plus.google.com/110448195989468248957">1000 member</a> mark this month, which makes them the second largest android community in India after GDG Blrdroid. </p>
-<p><a href="mailto:cyrilleguipie@gmail.com">GDG Miage</a> held their DevFest where they gave a talk about Intents and Services. The also held a startup Weekend Bootcamp where they talked about Activites and Layouts. They will also hold an Android Workshop in December.</p>
-<p><a href="mailto:gabriel.kb@gmail.com">GDG Uruguay</a> had their <a href="http://gdg.uy/devfest2013">DevFest</a>, where they held an Android workshop for beginners as an Android vs iOS comparison, a session on best practices using YouTube APIs in Android, and What's new in Google for developers (with a special section about Android). You can see pictures on <a href="https://plus.google.com/114520966453242230657/posts/dqZAuMqc12Z">the G+ page</a>. </p>
-
-<h4>November 2013</h4>
-<p><a href="mailto:yorogoule@gmail.com">Abidjandroid/GDG Côte d'Ivoire</a> held an Android Launch Party featuring the KitKat release.</p>
-<p>The <a href="mailto:hugo@dutchaug.org">Dutch Android User Group</a> had a very interactive presentation on Android Code Puzzlers and Tips & tricks, where they rewarded participation by giving out books, tshirts, jelly beans and kitkats. The presentation was at the <a href="http://www.nljug.org/jfall">Dutch JFall conference</a>, organized by the NLJUG. It's a large yearly Java conference and the DAUG had the only Android session there.</p>
-<p>The <a href="mailto:benjamin.r.m.weiss@gmail.com">GDG Berlin Android</a> meetup this month featured the KitKat release.</p>
-<p><a href="mailto:soham.mondal@gmail.com">The GDG Blrdroid</a> <a href="http://www.meetup.com/blrdroid/events/148210762/%20">meetup</a> was another focused on KitKat.</p>
-<p>At the <a href="mailto:amahdy7@gmail.com">GDG Cairo</a> <a href="https://plus.google.com/events/co59j0870in5a4kh8n5navifnm8">DevFest</a> there was a "What's new in Android SDK" session on day 1, and an Android workshop on day 2. Kitkat also provided interest in the sessions and the snacks bar. The KitKat <a href="http://buff.ly/HNE7yq">presentation</a>, the track organization, and everything related to it were all organized by women.</p>
-<p><a href="mailto:hir3npatel@gmail.com">GDG Cape Town</a> held an Android Workshop.</p>
-<p><a href="mailto:alessandro.gbridge@gmail.com">GDG Udine</a> organized a talk after the release of KitKat for a school in Pordenone.</p>
-<p><a href="mailto:hugo@dutchaug.org">Hugo Visser</a> from Droidcon Netherlands organized an Android hackathon themed "Location, Location, Location". </p>
-<p><a href="mailto:eyal.lezmy@gmail.com">Paris Android User Group</a> welcomed <a href="https://plus.google.com/+RomainGuy">Romain Guy</a> and <a href="https://plus.google.com/+ChetHaase">Chet Haase</a> to their meetup this month. They’ll be meeting up with other GDG leads and UG managers meet at <a href="https://plus.google.com/events/cupo201fjreo9g9t2e596gv8nd4">Devoxx</a> next Thursday.</p>
-<p><a href="mailto:wojtek.kalicinski@gmail.com">GDG Warsaw</a> had over 250 attendees at their DevFest, which featured session tracks on Android and Web and a whole day of Code Labs in Android, AngularJS and Arduino.</p>
-<h4>December 2013</h4>
-<p><a href="mailto:prajyotmainkar@gmail.com">GDG GAUG</a> are planning a codelab and hackathon.</p>
-<p><a href="mailto:psvensson@gmail.com">Peter Svensson</a> spoke at <a href="http://swdc.se/droidcon/events/stockholm-2013/">DroidCon Stockholm</a></p>
-The unstoppable <a href="mailto:bonbhel@gmail.com">Max Bonbhel</a> from the African GDG Android is hosting AAC 2014 and Android GDG Barcamp events in December. Also, in order to encourage African Java developers to move to the Android platform, he created the <a href="https://docs.google.com/spreadsheet/ccc?key=0AtFPan-z2ps-dHBtX1luY2pRQjdtRjliUGcxMVBNeVE&usp=sharing#gid=0">Africa Android Training (AAT) program</a>. The training material targets developers with different levels of experience in Java development. More than 60 developers have been taking part in the weekly sessions. The next 10 sessions will start Saturday, November 9, 2013. 260 GDG and Java User Group members have already registered from 12 Countries.
-<p> </p>
-</div>
-
-<div class="col-8" style="margin-right:0">
-<h3>Android Community Experts</h3>
-
-<h4>October 2013</h4>
-<p><a href="mailto:eyal.lezmy@gmail.com">Eyal Lezmy</a> presented two sessions. “<a href="http://bit.ly/andbigfail">Play Store bashing, learn from the biggest fails</a>” looked at several applications, mainly developed by huge companies, and analyzed why they failed to satisfy the users or the Android guidelines. “<a href="http://bit.ly/lifeofapp">Android, the life of your app</a>” tells a story, living the life of a user, identify the frustrations he can encounter and present ways to avoid it, as a developer.</p>
-<p><a href="mailto:mariux01@gmail.com">Mario Viviani</a> presented and recorded the next <a href="http://www.youtube.com/watch?v=jaT0bYhhaGY">Android App Clinic - Italia</a>. This episode was regarding the Cards UI and SMS app support in Android 4.4. They experimented with a short form of the video (10 minutes instead of 20) and in less than day it got almost 400+ views -- which is great considering it's in Italian! The previous episode reached 1300 views all-time and was the most successful video of GDL Italia in Q2.</p>
-<p><a href="mailto:m.kaeppler@gmail.com">Matthias Käppler</a> contributed the <a href="https://github.com/Netflix/RxJava/tree/master/rxjava-contrib/rxjava-android">first Android specific component</a> to the RxJava project, and spoke about <a href="http://uk.droidcon.com/2013/sessions/conquering-concurrency-bringing-the-reactive-extensions-to-the-android-platform/">RxJava and reactive programming on Android</a> at DroidCon UK. He has also open sourced <a href="https://github.com/mttkay/memento">Memento</a>, an Android annotation processor to replace the deprecated onRetainNonConfigurationInstance.</p>
-<p><a href="mailto:wojtek.kalicinski@gmail.com">Wojtek Kaliciński</a>’s talk, "Android - is it time for a break yet?" highlights not only what's new in Android 4.4 KitKat, but also how to take your app to the next level by making sure you provide the best app experience possible to all 4.0+ users.</p>
-<a href="https://plus.sandbox.google.com/110448195989468248957/posts"><img src="/images/community/hackathon-gdgaug.jpg" alt="" align="right"></a>
-
-</div>
-
-<h2 id="Content" style="clear:left">New Content</h2>
-<div class="col-8" style="margin-left:0">
-<p><h4>Android 4.4 What's New</h4>
-KitKat has been optimized to run on a much broader range of devices, with special focus on the millions of entry-level devices that have as little as 512MB RAM. To help, we've created new APIs, better tools, and better documentation to let you create apps that perform well on all devices.<br>
-Check out this video summary of some of the most significant developer features in the latest Android release, including new ways to make your apps beautiful, NFC Host Card Emulation, a printing framework, the storage access framework, low-power step detector and step counter sensors, and more!<br>
-<h5><a href="http://www.youtube.com/watch?v=sONcojECWXs&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></h5>
-<i>Be sure to get the <a href="http://developer.android.com/about/versions/android-4.4.html">full Android 4.4 API Overview</a>, and take a look at our <a href="https://www.youtube.com/playlist?list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">related DevBytes videos</a></i></p>
-
-<p><h4>WebView in Android 4.4</h4>
-Android 4.4 (API level 19) introduces a new version of WebView that is based on Chromium. This change upgrades WebView performance and standards support for HTML5, CSS3, and JavaScript to match the latest web browsers. Any apps using WebView will inherit these upgrades when running on Android 4.4 and higher.
-<h5><a href="http://developer.android.com/guide/webapps/migrating.html">API Guide</a></h5>
-</p>
-
-<p><h4>Android 4.4 Immersive Mode</h4>
-With Android 4.4 KitKat, your apps can now truly go full-screen with a new Immersive Mode. Immersive Mode lets your apps hide the system's status and navigation bars while capturing all touch events—ideal for rich interactive content such as books and games. This video demonstrates how to use the new API, in addition to recapping earlier full-screen APIs on Android.
-<h5><a href="http://www.youtube.com/watch?v=cBi8fjv90E4&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></h5>
-<h5><a href="http://developer.android.com/samples/ImmersiveMode/index.html">Sample</a></h5>
-</p>
-
-<p>
-<h4>Android 4.4 Storage Access Framework - Provider</h4>
-Get up to speed on the new document storage API in Android 4.4 KitKat. This video gets you up and running with your own DocumentProvider by stepping you through the making of a simple cloud storage app.
-<h5><a href="http://www.youtube.com/watch?v=zxHVeXbK1P4&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></h5>
-<h5><a href="http://developer.android.com/guide/topics/providers/document-provider.html">Training</a></h5>
-<h5><a href="http://developer.android.com/samples/StorageProvider/index.html">Sample</a>, <a href="https://play.google.com/store/apps/details?id=com.box.android">Box Application</a></h5>
-</blockquote>
-
-</p>
-
-
-<p><h4>Android 4.4 Storage Access Framework - Client</h4>
-Get up to speed on the new storage access framework in Android 4.4 KitKat. This video teaches you how to quickly create, edit, save and delete documents provided by other apps as a client of the storage access framework.
-<h5><a href="http://www.youtube.com/watch?v=UFj9AEz0DHQ&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></h5>
-<h5><a href="http://developer.android.com/samples/StorageClient/index.html">Sample</a></h5>
-</p>
-
-<p><h4>Android 4.4 Closed Captioning</h4>
-Displaying closed captions in your app's videos can be quick and simple in Android 4.4 KitKat,. Learn how to attach timed text tracks to VideoView and allow users to customize how captions are displayed.
-<h5><a href="http://www.youtube.com/watch?v=hCRGc2PcmB8&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a>
-</p>
-</h5>
-</div>
-
-<div class="col-8" style="margin-right:0">
-
-<p>
-<h4>Android 4.4 Transitions</h4>
-In this episode, we introduce the new Transitions API in Android 4.4 Kitkat. This API provides a simple way for developers to provide animated segues to different scenes of their application, helping users to understand the application flow with very little code. The general approach is to tell the system that you'd like to run a transition animation, then make the necessary changes to your UI. The system figures out the differences and animates the changes.
-<h5><a href="http://www.youtube.com/watch?v=S3H7nJ4QaD8&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K&index=3">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></p>
-</h5>
-<p><h4>Android 4.4: SMS APIs</h4>
-Android 4.4 KitKat introduces the new SMS APIs as well as the new concept of a default SMS app. This video discusses these new APIs and how your app should use them to send and receive SMS and MMS messages.<br>
-<h5><a href="http://www.youtube.com/watch?v=mdq0R2WQssQ&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></h5>
-<i>See also -<br>
-<a href="http://goo.gl/sw5NdH">Android Developer Blog post on Android 4.4 KitKat SMS APIs</a><br>
-<a href="http://goo.gl/7vTx3s">Android Protip on using booleans in your AndroidManifest.xml</a></i></p>
-
-
-<p><h4>Android 4.4 Printing API</h4>
-In this video, we introduce the new Printing API in Android 4.4 KitKat. This API provides a simple way for developers to print to cloud-connected printers using Google Cloud Print. It's really easy to print bitmaps, and HTML (that you generate on the device, or just web content).<br>
-<h5><a href="http://www.youtube.com/watch?v=Iub67ic87KI&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a></h5>
-<h5><a href="http://developer.android.com/training/printing/index.html">Training</a></h5>
-<i>Some pro-tips:</i>
-<ul>
- <li>For Webview/HTML printing, printing from javascript is not supported yet (window.print() for example). Also we are planning to address the limitations around WebView/HTML printing in future releases (eg: headers/footers, and specifying print ranges).</li>
-<li>We encourage developers to open Android Open Source bugs for features that they feel important as a feedback.</li>
-</ul>
-
-<p><h4>App Indexing</h4>
-In this episode we discuss the new App Indexing feature that we recently announced for Google Search for Android.<br>
-Currently, when you do a google search on the web, you get results that are links to websites. With App Indexing, you will be able to point Google Search users on Android directly to content within your app!
-If you’re an Android app developer who has a web presence and you want more control over how your content is accessed from search, via your website or Android app, App Indexing is a great feature for you to explore.
-Also, enabling your website and app for indexing is a way to increase engagement with your app by making the content more discoverable, and more accessible to users directly from the search results page.
-For information on App Indexing, please visit <a href="http://g.co/appindexing">http://g.co/appindexing</a>
-<h5><a href="http://www.youtube.com/watch?v=Xh_W82JgOms&list=PLWz5rJ2EKKc-2quE-o0enpILZF3nBZg_K">Video</a></h5>
-<h5><a href="https://drive.google.com/a/google.com/folderview?id=0BwhAiXVwzMoFc28wWEpyeE9qYTQ&usp=sharing">Presentation</a>
-</p>
-</h5>
-</div>
-
-<h2 id="Social" style="clear:left">Social</h2>
-<div class="col-8" style="margin-left:0">
-
-<h3 >G+</h3>
-
-<ul>
-<li><a href="https://plus.google.com/u/1/108967384991768947849/posts/1iVvwyfTM8y">What's New in Android 4.4</a>
- <ul>
- <li><a href="http://www.youtube.com/watch?v=HrFRY32i_sE">What's New in Android 4.4 [JAPANESE!]</a></li>
- <li><a href="https://www.youtube.com/watch?v=U9jAcwaETD4">What's New in Android 4.4 [KOREAN!]</a></li>
- <li><a href="https://plus.google.com/u/1/108967384991768947849/posts/WfqdvDG2Cyr">Quer saber das novidades do Android 4.4? [PORTUGUESE!]</a></li>
- </ul>
-</li>
-<li><a href="https://plus.google.com/u/1/+AndroidDevelopers/posts/femjRbay18f">Android 4.4 and Updated Developer Tools
-</a></li>
-<li><a href="https://plus.google.com/u/1/108967384991768947849/posts/P2q82aYN7do">Google Play Services 4.0
-</a></li>
-</ul>
-</div>
-
-<div class="col-8" style="margin-right:0">
-<h3>Blog</h3>
-
-<ul>
- <li><a href="http://android-developers.blogspot.hk/2013/10/android-44-kitkat-and-updated-developer.html">Android 4.4 KitKat and Updated Developer Tools</a></li>
- <li><a href="http://android-developers.blogspot.hk/2013/10/google-play-services-40.html">Google Play Services 4.0</a></li>
- <li><a href="http://android-developers.blogspot.hk/2013/10/making-your-app-content-more-accessible.html">Making your App Content more Accessible from Googl...</a></li>
- <li><a href="http://android-developers.blogspot.hk/2013/10/getting-your-sms-apps-ready-for-kitkat.html">Getting Your SMS Apps Ready for KitKat</a></li>
-</ul>
-</div>
-
-</div><!-- /MAIN CONTENT 'wrap' -->
-</body>
-</html>
-
-
-
diff --git a/docs/html/design/_book.yaml b/docs/html/design/_book.yaml
index df5406f..18b4719 100644
--- a/docs/html/design/_book.yaml
+++ b/docs/html/design/_book.yaml
@@ -90,23 +90,6 @@
value: 使用返回和向上导航
- name: zh-tw-lang
value: 使用 [返回] 及 [上一層] 導覽
- - title: Notifications
- path: /design/patterns/notifications.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- title: Widgets
path: /design/patterns/widgets.html
- title: Swipe Views
diff --git a/docs/html/design/_project.yaml b/docs/html/design/_project.yaml
new file mode 100644
index 0000000..72df4a8
--- /dev/null
+++ b/docs/html/design/_project.yaml
@@ -0,0 +1,5 @@
+name: "Design"
+home_url: /design/
+description: "Create beautiful experiences in your apps."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/design/design_toc.cs b/docs/html/design/design_toc.cs
index a837a04..c1f3c3b 100644
--- a/docs/html/design/design_toc.cs
+++ b/docs/html/design/design_toc.cs
@@ -70,15 +70,6 @@
zh-tw-lang="使用 [返回] 及 [上一層] 導覽">
Navigation</a></li>
- <li><a href="<?cs var:toroot ?>design/patterns/notifications.html"
- es-lang="Notificaciones"
- ja-lang="通知"
- ko-lang="알림"
- pt-br-lang="Notificações"
- ru-lang="Уведомления"
- zh-cn-lang="通知"
- zh-tw-lang="通知">
- Notifications</a></li>
<li><a href="<?cs var:toroot ?>design/patterns/widgets.html">Widgets</a></li>
<li><a href="<?cs var:toroot ?>design/patterns/swipe-views.html">Swipe Views</a></li>
<li><a href="<?cs var:toroot ?>design/patterns/fullscreen.html">Full Screen</a></li>
diff --git a/docs/html/design/handhelds/index.jd b/docs/html/design/handhelds/index.jd
index 4a4526c..cf224ae 100755
--- a/docs/html/design/handhelds/index.jd
+++ b/docs/html/design/handhelds/index.jd
@@ -92,7 +92,8 @@
<p>Notifications are brief messages that users can access at any time from the status bar. They
provide updates, reminders, or information that's important, but not critical enough to warrant
interrupting the user. Open the notifications drawer by swiping down on the status bar. Touching a
-notification opens the associated app. <a href="{@docRoot}design/patterns/notifications.html">More on Notifications</a></p>
+notification opens the associated app. <a
+href="https://material.google.com/patterns/notifications.html">More on Notifications</a></p>
<div class="cols">
<div class="col-4">
diff --git a/docs/html/design/index.jd b/docs/html/design/index.jd
index b4e909f..1a0c125 100644
--- a/docs/html/design/index.jd
+++ b/docs/html/design/index.jd
@@ -18,7 +18,7 @@
<h1 class="dac-hero-title">Up and running with material design</h1>
<p class="dac-hero-description">
Android uses a new design metaphor inspired by paper and ink that provides a reassuring
- sense of tactility. Visit the <a href="https://www.google.com/design/spec/material-design/introduction.html">material design</a> site for more resources.
+ sense of tactility. Visit the <a href="https://www.google.com/design/spec/material-design/introduction.html">material design</a> site for more resources.
</p>
<a class="dac-hero-cta" href="https://www.google.com/design/spec/material-design/introduction.html">
<span class="dac-sprite dac-auto-chevron"></span>
diff --git a/docs/html/design/patterns/help.jd b/docs/html/design/patterns/help.jd
index 6ef155a..b5ee05e 100644
--- a/docs/html/design/patterns/help.jd
+++ b/docs/html/design/patterns/help.jd
@@ -76,7 +76,7 @@
</div>
<div class="col-5">
<img src="{@docRoot}design/media/help_evenbetter.png">
- </div>
+ </div>
</div>
<div class="cols">
diff --git a/docs/html/design/patterns/new.jd b/docs/html/design/patterns/new.jd
index df4c2ed..4bd3aa3 100755
--- a/docs/html/design/patterns/new.jd
+++ b/docs/html/design/patterns/new.jd
@@ -18,7 +18,7 @@
<h3>Notifications</h3>
-<p><a href="{@docRoot}design/patterns/notifications.html">Notifications</a> receive important
+<p><a href="https://material.google.com/patterns/notifications.html">Notifications</a> receive important
updates in Android 5.0, with material design visual changes, notification availability in the
lockscreen, priority notifications, and cloud-synced notifications.</p>
@@ -124,7 +124,7 @@
<p>The base notification layout has not changed, so app notifications designed for versions
earlier than Jelly Bean still look and work the same. Check the updated <a
- href="{@docRoot}design/patterns/notifications.html">Notifications</a> page for
+ href="https://material.google.com/patterns/notifications.html">Notifications</a> page for
more details.</p>
</div>
<div class="col-6">
diff --git a/docs/html/design/patterns/notifications.jd b/docs/html/design/patterns/notifications.jd
deleted file mode 100644
index 844c3b6..0000000
--- a/docs/html/design/patterns/notifications.jd
+++ /dev/null
@@ -1,895 +0,0 @@
-page.title=Notifications
-page.tags="notifications","design"
-@jd:body
-
- <a class="notice-developers right" href="{@docRoot}training/notify-user/index.html">
- <div>
- <h3>Developer Docs</h3>
- <p>Notifying the User</p>
- </div>
-</a>
-
-<a class="notice-designers right" href="notifications_k.html">
- <div>
- <h3>Notifications in Android 4.4 and Lower</h3>
- </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video right" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
-<div>
- <h3>Video</h3>
- <p>DevBytes: Notifications in the Android L Developer Preview</p>
-</div>
-</a>
-
-<style>
- .col-5, .col-6, .col-7 {
- margin-left:0px;
- }
-</style>
-
-<p>The notification system allows users to keep informed about relevant and
-timely
-events in your app, such as new chat messages from a friend or a calendar event.
-Think of notifications as a news channel that alerts the user to important
-events as
-they happen or a log that chronicles events while the user is not paying
-attention—and one that is synced as appropriate across all their Android devices.</p>
-
-<h4 id="New"><strong>New in Android 5.0</strong></h4>
-
-<p>In Android 5.0, notifications receive important updates: structurally,
-visually, and functionally:</p>
-
-<ul>
- <li>Notifications have undergone visual changes consistent with the new
-material design theme.</li>
- <li> Notifications are now available on the device lock screen, while
-sensitive content can still
- be hidden behind it.</li>
- <li>High-priority notifications received while the device is in use now use a new format called
- heads-up notifications.</li>
- <li>Cloud-synced notifications: Dismissing a notification on one of your
-Android devices dismisses it
- on the others, as well.</li>
-</ul>
-
-<p class="note"><strong>Note:</strong> Notification design in this version of
-Android is a significant
-departure from that of previous versions. For information about notification design in previous
-versions, see <a href="./notifications_k.html">Notifications in Android 4.4 and lower</a>.</p>
-
-<h2 id="Anatomy">Anatomy of a Notification</h2>
-
-<p>This section goes over basic parts of a notification and how they can
-appear on different types of devices.</p>
-
-<h3 id="BaseLayout">Base layout</h3>
-
-<p>At a minimum, all notifications consist of a base layout, including:</p>
-
-<ul>
- <li> The notification's <strong>icon</strong>. The icon symbolizes the
-originating app. It may also
- potentially indicate notification type if the app generates more than one
-type.</li>
- <li> A notification <strong>title</strong> and additional
-<strong>text</strong>.</li>
- <li> A <strong>timestamp</strong>.</li>
-</ul>
-
-<p>Notifications created with {@link android.app.Notification.Builder Notification.Builder}
-for previous platform versions look and work the same in Android
-5.0, with only minor stylistic changes that the system handles
-for you. For more information about notifications on previous versions of
-Android, see
-<a href="./notifications_k.html">Notifications in Android 4.4 and lower</a>.</p></p>
-
-
- <img style="margin:20px 0 0 0"
-src="{@docRoot}images/android-5.0/notifications/basic_combo.png"
- alt="" width="700px" />
-
-
-<div style="clear:both;margin-top:20px">
- <p class="img-caption">
- Base layout of a handheld notification (left) and the same notification on Wear (right),
- with a user photo and a notification icon
- </p>
- </div>
-
-<h3 id="ExpandedLayouts">Expanded layouts</h3>
-
-
-<p>You can choose how much detail your app's notifications should
-provide. They can show the first
-few lines of a message or show a larger image preview. The additional
-information provides the user with more
-context, and—in some cases—may allow the user to read a message in its
-entirety. The user can
-pinch-zoom or perform a single-finger glide to toggle between compact
-and expanded layouts.
- For single-event notifications, Android provides three expanded layout
-templates (text, inbox, and
- image) for you to use in your application. The following images show you how
-single-event notifications look on
- handhelds (left) and wearables (right).</p>
-
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/expandedtext_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/stack_combo.png"
- alt="" width="700px" height;="284px" />
-<img style="margin-top:30px"
-src="{@docRoot}images/android-5.0/notifications/ExpandedImage.png"
- alt="" width="311px" height;="450px" />
-
-<h3 id="actions" style="clear:both; margin-top:40px">Actions</h3>
-
-<p>Android supports optional actions that are displayed at the bottom
-of the notification.
-With actions, users can handle the most common tasks for a particular
-notification from within the notification shade without having to open the
-originating application.
-This speeds up interaction and, in conjunction with swipe-to-dismiss, helps users focus on
-notifications that matter to them.</p>
-
-
- <img src="{@docRoot}images/android-5.0/notifications/action_combo.png"
- alt="" width="700px" />
-
-
-
-<p style="clear:both">Be judicious with how many actions you include with a
-notification. The more
-actions you include, the more cognitive complexity you create. Limit yourself
-to the smallest number
-of actions possible by only including the most imminently important and
-meaningful actions.</p>
-
-<p>Good candidates for actions on notifications are actions that:</p>
-
-<ul>
- <li> Are essential, frequent, and typical for the content type you're
-displaying
- <li> Allow the user to accomplish tasks quickly
-</ul>
-
-<p>Avoid actions that are:</p>
-
-<ul>
- <li> Ambiguous
- <li> The same as the default action of the notification (such as "Read" or
-"Open")
-</ul>
-
-
-
-<p>You can specify a maximum of three actions, each consisting of an action
-icon and name.
- Adding actions to a simple base layout makes the notification expandable,
-even if the
- notification doesn't have an expanded layout. Since actions are only shown for
-expanded
- notifications and are otherwise hidden, make sure that any action a
-user can invoke from
- a notification is available from within the associated application, as
-well.</p>
-
-<h2 style="clear:left">Heads-up Notification</h2>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/hun-example.png"
- alt="" width="311px" />
- <p class="img-caption">
- Example of a heads-up notification (incoming phone call, high priority)
-appearing on top of an
- immersive app
- </p>
-</div>
-
-<p>When a high-priority notification arrives (see right), it is presented
-to users for a
-short period of time with an expanded layout exposing possible actions.</p>
-<p> After this period of time, the notification retreats to the notification
-shade. If a notification's <a href="#correctly_set_and_manage_notification_priority">priority</a> is
-flagged as High, Max, or full-screen, it gets a heads-up notification.</p>
-
-<p><b>Good examples of heads-up notifications</b></p>
-
-<ul>
- <li> Incoming phone call when using a device</li>
- <li> Alarm when using a device</li>
- <li> New SMS message</li>
- <li> Low battery</li>
-</ul>
-
-<h2 style="clear:both" id="guidelines">Guidelines</h2>
-
-
-<h3 id="MakeItPersonal">Make it personal</h3>
-
-<p>For notifications of items sent by another person (such as a message or
-status update), include that person's image using
-{@link android.app.Notification.Builder#setLargeIcon setLargeIcon()}. Also attach information about
-the person to the notification's metadata (see {@link android.app.Notification#EXTRA_PEOPLE}).</p>
-
-<p>Your notification's main icon is still shown, so the user can associate
-it with the icon
-visible in the status bar.</p>
-
-
-<img src="{@docRoot}images/android-5.0/notifications/Triggered.png"
- alt="" width="311px"/>
-<p style="margin-top:10px" class="img-caption">
- Notification that shows the person who triggered it and the content they sent.
-</p>
-
-
-<h3 id="navigate_to_the_right_place">Navigate to the right place</h3>
-
-<p>When the user touches the body of a notification (outside of the action
-buttons), open your app
-to the place where the user can view and act upon the data referenced in the
-notification. In most cases, this will be the detailed view of a single data item such as a message,
-but it might also be a
-summary view if the notification is stacked. If your app takes the
-user anywhere below your app's top level, insert navigation into your app's back stack so that the
-user can press the system back button to return to the top level. For more information, see
-<em>Navigation into Your App via Home Screen Widgets and Notifications</em> in the <a
-href="{@docRoot}design/patterns/navigation.html#into-your-app">Navigation</a>
-design pattern.</p>
-
-<h3 id="correctly_set_and_manage_notification_priority">Correctly set and
-manage notification
-priority</h3>
-
-<p>Android supports a priority flag for notifications. This flag allows you to
-influence where your notification appears, relative to other notifications, and
-helps ensure
-that users always see their most important notifications first. You can choose
-from the
-following priority levels when posting a notification:</p>
-<table>
- <tr>
- <td class="tab0">
-<p><strong>Priority</strong></p>
-</td>
- <td class="tab0">
-<p><strong>Use</strong></p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MAX</code></p>
-</td>
- <td class="tab1">
-<p>Use for critical and urgent notifications that alert the user to a condition
-that is
-time-critical or needs to be resolved before they can continue with a
-particular task.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>HIGH</code></p>
-</td>
- <td class="tab1">
-<p>Use primarily for important communication, such as message or chat
-events with content that is particularly interesting for the user.
-High-priority notifications trigger the heads-up notification display.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>DEFAULT</code></p>
-</td>
- <td class="tab1">
-<p>Use for all notifications that don't fall into any of the other priorities described here.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>LOW</code></p>
-</td>
- <td class="tab1">
-<p>Use for notifications that you want the user to be informed about, but
-that are less urgent. Low-priority notifications tend to show up at the bottom of the list,
-which makes them a good
-choice for things like public or undirected social updates: The user has asked to
-be notified about
-them, but these notifications should never take precedence over urgent or direct
-communication.</p>
-</td>
- </tr>
- <tr>
- <td class="tab1">
-<p><code>MIN</code></p>
-</td>
- <td class="tab1">
-<p>Use for contextual or background information such as weather information or contextual
-location information.
-Minimum-priority notifications do not appear in the status bar. The user
-discovers them on expanding the notification shade.</p>
-</td>
- </tr>
-</table>
-
-
-<h4 id="how_to_choose_an_appropriate_priority"><strong>How to choose an
-appropriate
-priority</strong></h4>
-
-<p><code>DEFAULT</code>, <code>HIGH</code>, and <code>MAX</code> are interruptive priority levels, and risk
-interrupting the user
-in mid-activity. To avoid annoying your app's users, reserve interruptive priority levels for
-notifications that:</p>
-
-<ul>
- <li> Involve another person</li>
- <li> Are time-sensitive</li>
- <li> Might immediately change the user's behavior in the real world</li>
-</ul>
-
-<p>Notifications set to <code>LOW</code> and <code>MIN</code> can still be
-valuable for the user: Many, if not most, notifications just don't need to command the user's
-immediate attention, or vibrate the user's wrist, yet contain information that the user will find
-valuable when they choose to
-look for notifications. Criteria for <code>LOW</code> and <code>MIN</code>
-priority notifications include:</p>
-
-<ul>
- <li> Don't involve other people</li>
- <li> Aren't time sensitive</li>
- <li> Contain content the user might be interested in but could choose to
-browse at their leisure</li>
-</ul>
-
-
- <img
-src="{@docRoot}images/android-5.0/notifications/notifications_pattern_priority.png"
- alt="" width="700"/>
-
-
-<h3 style="clear:both" id="set_a_notification_category">Set a notification
-category</h3>
-
-<p>If your notification falls into one of the predefined categories (see
-below), assign it
-accordingly. Aspects of the system UI such as the notification shade (or any
-other notification
-listener) may use this information to make ranking and filtering decisions.</p>
-<table>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_CALL">CATEGORY_CALL</a></code></p>
-</td>
- <td>
-<p>Incoming call (voice or video) or similar synchronous communication
-request</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_MESSAGE">CATEGORY_MESSAGE</a></code></p>
-</td>
- <td>
-<p>Incoming direct message (SMS, instant message, etc.)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EMAIL">CATEGORY_EMAIL</a></code></p>
-</td>
- <td>
-<p>Asynchronous bulk message (email)</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_EVENT">CATEGORY_EVENT</a></code></p>
-</td>
- <td>
-<p>Calendar event</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROMO">CATEGORY_PROMO</a></code></p>
-</td>
- <td>
-<p>Promotion or advertisement</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ALARM">CATEGORY_ALARM</a></code></p>
-</td>
- <td>
-<p>Alarm or timer</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_PROGRESS">CATEGORY_PROGRESS</a></code></p>
-</td>
- <td>
-<p>Progress of a long-running background operation</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SOCIAL">CATEGORY_SOCIAL</a></code></p>
-</td>
- <td>
-<p>Social network or sharing update</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_ERROR">CATEGORY_ERROR</a></code></p>
-</td>
- <td>
-<p>Error in background operation or authentication status</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_TRANSPORT">CATEGORY_TRANSPORT</a></code></p>
-</td>
- <td>
-<p>Media transport control for playback</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SYSTEM">CATEGORY_SYSTEM</a></code></p>
-</td>
- <td>
-<p>System or device status update. Reserved for system use.</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_SERVICE">CATEGORY_SERVICE</a></code></p>
-</td>
- <td>
-<p>Indication of running background service</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_RECOMMENDATION">CATEGORY_RECOMMENDATION</a></code></p>
-</td>
- <td>
-<p>A specific, timely recommendation for a single thing. For example, a news
-app might want to
-recommend a news story it believes the user will want to read next.</p>
-</td>
- </tr>
- <tr>
- <td>
-<p><code><a
-href="/reference/android/app/Notification.html#CATEGORY_STATUS">CATEGORY_STATUS</a></code></p>
-</td>
- <td>
-<p>Ongoing information about device or contextual status</p>
-</td>
- </tr>
-</table>
-
-<h3 id="summarize_your_notifications">Summarize your notifications</h3>
-
-<p>If a notification of a certain type is already pending when your app tries to send a new
-notification of the same type, combine them into a single summary notification for the app. Do not
-create a new object.</p>
-
-<p>A summary notification builds a summary description and allows the user to
-understand how many
-notifications of a particular kind are pending.</p>
-
-<div class="col-6">
-
-<p><strong>Don't</strong></p>
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Dont.png"
- alt="" width="311px" />
-</div>
-
-<div>
-<p><strong>Do</strong></p>
-
- <img src="{@docRoot}images/android-5.0/notifications/Summarise_Do.png"
- alt="" width="311px"/>
-</div>
-
-<p style="clear:left; padding-top:30px; padding-bottom:20px">You can provide
-more detail about the individual notifications that make up a
- summary by using the expanded digest layout. This approach allows users to gain a
-better sense of which
- notifications are pending and if they are interesting enough to read in
-detail within the
- associated app.</p>
-<div class="col-6">
- <img src="{@docRoot}images/android-5.0/notifications/Stack.png"
-style="margin-bottom:20px"
- alt="" width="311px" />
- <p class="img-caption">
- Expanded and contracted notification that is a summary (using <code>InboxStyle</code>)
- </p>
-</div>
-
-<h3 style="clear:both" id="make_notifications_optional">Make notifications
-optional</h3>
-
-<p>Users should always be in control of notifications. Allow the user to
-disable your app's
-notifications or change their alert properties, such as alert sound and whether
-to use vibration,
-by adding a notification settings item to your application settings.</p>
-
-<h3 id="use_distinct_icons">Use distinct icons</h3>
-<p>By glancing at the notification area, the user should be able to discern
-what kinds of
-notifications are currently pending.</p>
-
-<div class="figure">
- <img src="{@docRoot}images/android-5.0/notifications/ProductIcons.png"
- alt="" width="420" />
-</div>
-
- <div><p><strong>Do</strong></p>
- <p>Look at the notification icons Android apps already provide and create
-notification icons for
- your app that are sufficiently distinct in appearance.</p>
-
- <p><strong>Do</strong></p>
- <p>Use the proper <a
-href="/design/style/iconography.html#notification">notification icon style</a>
- for small icons, and the Material Light
- <a href="/design/style/iconography.html#action-bar">action bar icon
-style</a> for your action
- icons.</p>
-<p ><strong>Do</strong></p>
-<p >Keep your icons visually simple, avoiding excessive detail that is hard to
-discern.</p>
-
- <div><p><strong>Don't</strong></p>
- <p>Place any additional alpha (dimming or fading) into your
-small icons and action
- icons; they can have anti-aliased edges, but because Android uses these
-icons as masks (that is, only
- the alpha channel is used), the image should generally be drawn at full
-opacity.</p>
-
-</div>
-<p style="clear:both"><strong>Don't</strong></p>
-
-<p>Use color to distinguish your app from others. Notification icons should
-only be a white-on-transparent background image.</p>
-
-
-<h3 id="pulse_the_notification_led_appropriately">Pulse the notification LED
-appropriately</h3>
-
-<p>Many Android devices contain a notification LED, which is used to keep the
-user informed about
-events while the screen is off. Notifications with a priority level of <code>MAX</code>,
-<code>HIGH</code>, or <code>DEFAULT</code> should
-cause the LED to glow, while those with lower priority (<code>LOW</code> and
-<code>MIN</code>) should not.</p>
-
-<p>The user's control over notifications should extend to the LED. When you use
-DEFAULT_LIGHTS, the
-LED will glow white. Your notifications shouldn't use a different
-color unless the
-user has explicitly customized it.</p>
-
-<h2 id="building_notifications_that_users_care_about">Building Notifications
-That Users Care About</h2>
-
-<p>To create an app that users love, it is important to design your
-notifications carefully.
-Notifications embody your app's voice, and contribute to your app's
-personality. Unwanted or
-unimportant notifications can annoy the user or make them resent how much
-attention the app wants
-from them, so use notifications judiciously.</p>
-
-<h3 id="when_to_display_a_notification">When to display a notification</h3>
-
-<p>To create an application that people enjoy using, it's important to
-recognize that the user's
-attention and focus is a resource that must be protected. While Android's
-notification system has
-been designed to minimize the impact of notifications on the user's attention,
-it is
-still important to be aware of the fact that notifications are interrupting the
-user's task flow.
-As you plan your notifications, ask yourself if they are important enough to
-warrant an interruption. If you are unsure, allow the user to opt into a
-notification using your apps notification settings, or adjust
-the notifications priority flag to <code>LOW</code> or <code>MIN</code> to
-avoid distracting the user while they are doing
-something else.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/TimeSensitive.png"
- alt="" width="311px" />
- <p style="margin-top:10px" class="img-caption">
- Examples of time-sensitive notification
- </p>
-
-<p>While well-behaved apps generally only speak when spoken to, a few cases
-do merit an app's interrupting the user with an unprompted notification.</p>
-
-<p>Use notifications primarily for <strong>time-sensitive events</strong>, especially
- if these synchronous events <strong>involve other people</strong>. For
-instance, an incoming chat
- is a real-time and synchronous form of communication: Another user
-actively waiting on your response. Calendar events are another good example of when to use a
-notification and grab the
- user's attention, because the event is imminent, and calendar events often
-involve other people.</p>
-
-<h3 style="clear:both" id="when_not_to_display_a_notification">When not to
-display a notification</h3>
-
-<div class="figure" style="margin-top:60px">
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample1.png"
- alt="" width="311px" />
-</div>
-
-<p>In many other cases, notifications aren't appropriate:</p>
-
-<ul>
- <li> Avoid notifying the user of information that is not directed
-specifically at them, or
- information that is not truly time-sensitive. For instance, the asynchronous
-and undirected updates
- flowing through a social network generally do not warrant a real-time
-interruption. For the users
- who do care about them, allow them to opt-in.</li>
- <li> Don't create a notification if the relevant new information is currently
-on screen. Instead,
- use the UI of the application itself to notify the user of new information
-directly in context.
- For instance, a chat application should not create system notifications while
-the user is actively chatting with another user.</li>
- <li> Don't interrupt the user for low-level technical operations, like saving
-or syncing information, or updating an application if the app or system can resolve the issue
-without involving the user.</li>
- <li> Don't interrupt the user to inform them of an error if it is possible
-for the application to recover from the error on its own without the user
-taking any action.</li>
- <li> Don't create notifications that have no true notification content and
-merely advertise your
- app. A notification should provide useful, timely, new information and should
-not be used
- merely to launch an app.</li>
- <li> Don't create superfluous notifications just to get your brand in front
-of users.
- Such notifications frustrate and likely alienate your audience. The
-best way to provide
- small amounts of updated information and keep them engaged
-with your
- app is to develop a widget that they can choose to place on their
-home screen.</li>
-</ul>
-
-<h2 style="clear:left" id="interacting_with_notifications">Interacting with
-Notifications</h2>
-
-<p>Notifications are indicated by icons in the status bar, and can be accessed
-by opening the
-notification drawer.</p>
-
-<p>Touching a notification opens the associated app to detailed content
-that matches the notification.
-Swiping left or right on a notification removes it from the drawer.</p>
-
-<h3 id="ongoing_notifications">Ongoing notifications</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/MusicPlayback.png"
- alt="" width="311px" />
- <p class="img-caption">
- Ongoing notification due to music playback
- </p>
-</div>
-<p>Ongoing notifications keep users informed about an ongoing process in the
-background.
-For example, music players announce the currently playing track in the
-notification system and
-continue to do so until the user stops the playback. Ongoing notifications can also
-show the user
-feedback for longer tasks like downloading a file, or encoding a video. A user cannot manually
-remove an ongoing notification from the notification drawer.</p>
-
-<h3 id="ongoing_notifications">Media playback</h3>
-<p>In Android 5.0, the lock screen doesn't show transport controls for the deprecated
-{@link android.media.RemoteControlClient} class. But it <em>does</em> show notifications, so each
-app's playback notification is now the primary
-way for users to control playback from a locked state. This behavior gives apps more
-control over which
-buttons to show, and in what way, while providing a consistent experience for
-the user whether or not the screen is locked.</p>
-
-<h3 style="clear:both"
-id="dialogs_and_toasts_are_for_feedback_not_notification">Dialogs
-and toasts</h3>
-
-<p>Your app should not create a dialog or toast if it is not currently on
-screen. A dialog or toast
- should only be displayed as an immediate response to the user taking an action
-inside of your app.
-For further guidance on the use of dialogs and toasts, refer to
-<a href="/design/patterns/confirming-acknowledging.html">Confirming & Acknowledging</a>.</p>
-
-<h3>Ranking and ordering</h3>
-
-<p>Notifications are news, and so are essentially shown in
-reverse-chronological order, with
-special consideration given to the app's stated notification
-<a href="#correctly_set_and_manage_notification_priority">priority</a>.</p>
-
-<p>Notifications are a key part of the lock screen, and are featured prominently
-every
-time the device display comes on. Space on the lock screen is tight, so it
-is more important
-than ever to identify the most urgent or relevant notifications. For this
-reason, Android has a
-more sophisticated sorting algorithm for notifications, taking into account:</p>
-
-<ul>
- <li> The timestamp and application's stated priority.</li>
- <li> Whether the notification has recently disturbed the user with sound or
-vibration. (That is,
- if the phone just made a noise, and the user wants to know "What just
-happened?", the lock screen
- should answer that at a glance.)</li>
- <li> Any people attached to the notification using {@link android.app.Notification#EXTRA_PEOPLE},
- and, in particular, whether they are starred contacts.</li>
-</ul>
-
-<p>To best take advantage of this sorting, focus on the user
-experience you want
-to create, rather than aiming for any particular spot on the list.</p>
-
- <img src="{@docRoot}images/android-5.0/notifications/AntiSample3.png"
- alt="" width="700px" />
-
- <p class="img-caption" style="margin-top:10px">Gmail notifications are
-default priority, so they
- normally sort below messages from an instant messaging app like Hangouts, but
-get a
- temporary bump when new messages come in.
- </p>
-
-
-<h3>On the lock screen</h3>
-
-<p>Because notifications are visible on the lock screen, user privacy is an
-especially
-important consideration. Notifications often contain sensitive information, and
-should not necessarily be visible
-to anyone who picks up the device and turns on the display.</p>
-
-<ul>
- <li> For devices that have a secure lock screen (PIN, pattern, or password), the interface has
- public and private parts. The public interface can be displayed on a secure lock screen and
- therefore seen by anyone. The private interface is the world behind that lock screen, and
- is only revealed once the user has signed into the device.</li>
-</ul>
-
-<h3>User control over information displayed on the secure lock screen</h3>
-<div class="figure" style="width:311px">
- <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png"
- srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px"/>
- <p class="img-caption">
- Notifications on the lock screen, with contents revealed after the user unlocks the device.
- </p>
-</div>
-
-<p>When setting up a secure lock screen, the user can choose to conceal
-sensitive details from the secure lock screen. In this case the System UI
-considers the notification's <em>visibility level</em> to figure out what can
-safely be shown.</p>
-<p> To control the visibility level, call
-<code><a
-href="/reference/android/app/Notification.Builder.html#setVisibility(int)">Notification.Builder.setVisibility()</a></code>,
-and specify one of these values:</p>
-
-<ul>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PUBLIC">VISIBILITY_PUBLIC</a></code>.
-Shows the notification's full content.
- This is the system default if visibility is left unspecified.</li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_PRIVATE">VISIBILITY_PRIVATE</a></code>.
-On the lock screen, shows basic information about the existence of this notification, including its
-icon and the name of the app that posted it. The rest of the notification's details are not displayed.
-A couple of good points to keep in mind are as follows:
- <ul>
- <li> If you want to provide a different public version of your notification
-for the system to display on a secure lock screen, supply a replacement
-Notification object in the <code><a
-href="/reference/android/app/Notification.html#publicVersion">Notification.publicVersion</a></code>
-field.
- <li> This setting gives your app an opportunity to create a redacted version of the
-content that is still useful but does not reveal personal information. Consider the example of an
-SMS app whose notifications include the text of the SMS and the sender's name and contact icon.
-This notification should be <code>VISIBILITY_PRIVATE</code>, but <code>publicVersion</code> could still
-contain useful information like "3 new messages" without any other identifying
-details.
- </ul>
- </li>
- <li><code><a
-href="/reference/android/app/Notification.html#VISIBILITY_SECRET">Notification.VISIBILITY_SECRET</A></code>. Shows only the most minimal information, excluding
-even the notification's icon.</li>
-</ul>
-<h2 style="clear:both" id="notifications_on_android_wear">Notifications on
-Android Wear</h2>
-
-<p>Notifications and their <em>actions</em> are bridged over to Wear devices by default.
-Developers can control which notifications bridge from the
-phone to the watch,
-and vice-versa. Developers can also control which actions bridge, as well. If
-your app includes
-actions that can't be accomplished with a single tap, either hide these actions
-on your Wear
-notification or consider hooking them up to a Wear app, thus allowing the user to
-finish the action on
-their watch.</p>
-
-<h4>Bridging notifications and actions</h4>
-
-<p>A connected device, such as a phone, can bridge notifications to a Wear device, so that the
-notifications are displayed there. Similarly, it can bridge actions, so that the user can act
-on the notifications right from the Wear device.</p>
-
-<p><strong>Bridge</strong></p>
-
-<ul>
- <li> New instant messages</li>
- <li> Single-tap actions such as +1, Like, Heart</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/WearBasic.png" width="156px"
-height="156px"
- alt="" />
-
-<p><strong>Don't bridge</strong></p>
-
-<ul>
- <li> Notifications of newly arrived podcasts</li>
- <li> Actions that map to features that aren't possible on the watch</li>
-</ul>
-
-
-
-<p><h4>Unique actions to define for Wear</h4></p>
-
-<p>There are some actions that you can perform only on Wear. These include the following:</p>
-
-<ul>
- <li> Quick lists of canned responses such as "Be right back"</li>
- <li> Open on the phone</li>
- <li> A "Comment" or "Reply" action that brings up the speech input screen</li>
- <li> Actions that launch Wear-specific apps</li>
-</ul>
-
-<img src="{@docRoot}images/android-5.0/notifications/ReplyAction.png" width="156px"
-height="156px"
- alt="" />
diff --git a/docs/html/design/wear/style.jd b/docs/html/design/wear/style.jd
index 75bd65f..804223f 100644
--- a/docs/html/design/wear/style.jd
+++ b/docs/html/design/wear/style.jd
@@ -67,7 +67,7 @@
<h2 id="KeepMinimum" style="clear:both">Keep Notifications to a Minimum</h2>
-<p>Don’t abuse the user’s attention. Active notifications (that is, those that cause the device to vibrate) should only be used in cases that are both timely and involve a contact, for example receiving a message from a friend. Non-urgent notifications should be silently added to the Context Stream. See also the general <a href="{@docRoot}design/patterns/notifications.html">Android Notifications Guidelines</a>.</p>
+<p>Don’t abuse the user’s attention. Active notifications (that is, those that cause the device to vibrate) should only be used in cases that are both timely and involve a contact, for example receiving a message from a friend. Non-urgent notifications should be silently added to the Context Stream. See also the general <a href="https://material.google.com/patterns/notifications.html">Android Notifications Guidelines</a>.</p>
diff --git a/docs/html/develop/_project.yaml b/docs/html/develop/_project.yaml
new file mode 100644
index 0000000..40a66b3
--- /dev/null
+++ b/docs/html/develop/_project.yaml
@@ -0,0 +1,5 @@
+name: "Develop"
+home_url: /develop/
+description: "Android Studio provides the fastest tools for building apps on every type of Android device."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/distribute/_project.yaml b/docs/html/distribute/_project.yaml
new file mode 100644
index 0000000..5777333
--- /dev/null
+++ b/docs/html/distribute/_project.yaml
@@ -0,0 +1,5 @@
+name: "Distribute"
+home_url: /distribute/
+description: "The most visited store in the world for Android apps. Cloud-connected and always synced, it's never been easier for users to find and download your apps."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/distribute/analyze/_project.yaml b/docs/html/distribute/analyze/_project.yaml
new file mode 100644
index 0000000..5c77074
--- /dev/null
+++ b/docs/html/distribute/analyze/_project.yaml
@@ -0,0 +1,6 @@
+name: "Analyze"
+home_url: /distribute/analyze/
+description: "Understanding what your users do inside your app is the key to engaging and monetizing them."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/analyze/build-better-apps.jd b/docs/html/distribute/analyze/build-better-apps.jd
index 823562a..d0db392 100644
--- a/docs/html/distribute/analyze/build-better-apps.jd
+++ b/docs/html/distribute/analyze/build-better-apps.jd
@@ -108,7 +108,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/analyzebuild"
data-sortorder="-timestamp"
data-cardsizes="6x3"
diff --git a/docs/html/distribute/analyze/google-services.jd b/docs/html/distribute/analyze/google-services.jd
index 0d82c8a..44eed8e 100644
--- a/docs/html/distribute/analyze/google-services.jd
+++ b/docs/html/distribute/analyze/google-services.jd
@@ -109,7 +109,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/analyzeact"
data-sortorder="-timestamp"
data-cardsizes="6x3"
diff --git a/docs/html/distribute/analyze/improve-roi.jd b/docs/html/distribute/analyze/improve-roi.jd
index 6c05962..95c4db5 100644
--- a/docs/html/distribute/analyze/improve-roi.jd
+++ b/docs/html/distribute/analyze/improve-roi.jd
@@ -155,7 +155,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/analyzeimprove"
data-sortorder="-timestamp"
data-cardsizes="6x3"
diff --git a/docs/html/distribute/analyze/measure.jd b/docs/html/distribute/analyze/measure.jd
index 5b29e95..4cb9bde 100644
--- a/docs/html/distribute/analyze/measure.jd
+++ b/docs/html/distribute/analyze/measure.jd
@@ -82,7 +82,7 @@
<li>Analyze how far shoppers get in the shopping funnel and where they drop
off</li>
<li>Understand which products are viewed most, which are frequently abandoned
-in cart, and which ones convert well</li>
+in cart, and which ones convert well</li>
<li>Upload rich product metadata to slice and dice your data</li>
<li>Create rich user segments to delve deeper into your users’ shopping
behavior and the products they interact with</li>
diff --git a/docs/html/distribute/analyze/start.jd b/docs/html/distribute/analyze/start.jd
index 0221f72..0a90b4f 100644
--- a/docs/html/distribute/analyze/start.jd
+++ b/docs/html/distribute/analyze/start.jd
@@ -36,7 +36,7 @@
<li><a href="https://accounts.google.com/SignUp?continue=https%3A%2F%2Fwww.google.com%2Fanalytics%2Fmobile%2F&hl=en">Create
your Google Analytics account</a>.</li>
<li>Write down your tracking ID. </li>
-<li>Initialize Google Analytics in your app to start measuring activity immediately.</li>
+<li>Initialize Google Analytics in your app to start measuring activity immediately.</li>
</ul>
<p>
@@ -97,7 +97,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/analyzestart"
data-sortorder="-timestamp"
data-cardsizes="6x3"
diff --git a/docs/html/distribute/analyze/understand-user-value.jd b/docs/html/distribute/analyze/understand-user-value.jd
index 99fd11a..6bc192d 100644
--- a/docs/html/distribute/analyze/understand-user-value.jd
+++ b/docs/html/distribute/analyze/understand-user-value.jd
@@ -45,7 +45,7 @@
</p>
-<h2 id="audiencereporting">Know your users with Audience Reporting and Demographic
+<h2 id="audiencereporting">Know your users with Audience Reporting and Demographic
and Interest reports</h2>
<p>
@@ -230,7 +230,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/analyzeunderstand"
data-sortorder="-timestamp"
data-cardsizes="6x3"
diff --git a/docs/html/distribute/engage/_book.yaml b/docs/html/distribute/engage/_book.yaml
index 87e819a..c371268 100644
--- a/docs/html/distribute/engage/_book.yaml
+++ b/docs/html/distribute/engage/_book.yaml
@@ -31,3 +31,6 @@
- title: Get Feedback with Beta Tests
path: /distribute/engage/beta.html
+
+- title: Interact with Nearby Users
+ path: /distribute/engage/nearby.html
diff --git a/docs/html/distribute/engage/_project.yaml b/docs/html/distribute/engage/_project.yaml
new file mode 100644
index 0000000..fd8fa44
--- /dev/null
+++ b/docs/html/distribute/engage/_project.yaml
@@ -0,0 +1,6 @@
+name: "Engage & Retain"
+home_url: /distribute/engage/
+description: "Engaging and retaining active users are the keys to success. Here are some resources to help you build an active user base."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/engage/ads.jd b/docs/html/distribute/engage/ads.jd
index 10dbea6..8cfbdf2 100644
--- a/docs/html/distribute/engage/ads.jd
+++ b/docs/html/distribute/engage/ads.jd
@@ -54,7 +54,7 @@
<h2 id="related_resources">Related resources</h2>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/engage/reengage"
data-sortorder="-timestamp"
data-cardsizes="9x3"
diff --git a/docs/html/distribute/engage/analytics.jd b/docs/html/distribute/engage/analytics.jd
index 5f7cade..0343def 100644
--- a/docs/html/distribute/engage/analytics.jd
+++ b/docs/html/distribute/engage/analytics.jd
@@ -42,7 +42,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/engage/analytics"
data-sortorder="-timestamp"
data-cardsizes="9x3"
diff --git a/docs/html/distribute/engage/deep-linking.jd b/docs/html/distribute/engage/deep-linking.jd
index 713bfbb..510fa5c 100644
--- a/docs/html/distribute/engage/deep-linking.jd
+++ b/docs/html/distribute/engage/deep-linking.jd
@@ -8,7 +8,7 @@
Users who have your app installed might overlook it as a way to get the answers
they need. With App Indexing, deep links to your Android app appear in Google Search
results so users can get to your native mobile experience quickly, landing exactly
- on the right content within the app.
+ on the right content within the app.
</p>
<p>
diff --git a/docs/html/distribute/engage/easy-signin.jd b/docs/html/distribute/engage/easy-signin.jd
index 924c5b4..5c04064 100644
--- a/docs/html/distribute/engage/easy-signin.jd
+++ b/docs/html/distribute/engage/easy-signin.jd
@@ -1,70 +1,66 @@
-page.title=Add Quick and Secure Google Sign-in
+page.title=Add Quick and Secure Google Sign-In
page.metaDescription=Increase conversion rates while helping users minimize typing by letting users sign in with Google+.
page.tags="google", "identity", "signin"
page.image=images/cards/google-sign-in_2x.png
@jd:body
-<p>Get people into your apps quickly and securely, using a registration system they
-already use and trust – their Google account. With minimal effort, you can increase
-registration and sign-in conversion by adding trusted registration system that's
-familiar to users, consistent across devices, and quick and easy to use.</p>
-
-<p>Get started <a href="https://developers.google.com/identity/sign-in/">integrating
-Google sign-in into your apps and games</a>.</p>
-
-<div class="wrap">
- <div class="cols" style="margin-top:2em;">
- <div class="col-3of12">
- <h3>Quick and secure app access</h3>
- <p>A secure authentication system that makes sign-in easy for your users by
- letting them use their Google account, which they already use with Gmail,
- Play, Google+, and other Google services.</p>
- </div>
- <div class="col-8of12 col-push-1of12">
- <img src="{@docRoot}images/distribute/signin-secure.png" style="padding-top:1em;">
- </div>
- </div>
-
- <div class="cols" style="margin-top:2em;">
- <div class="col-3of12">
- <h3>Seamless experience across screens</h3>
- <p>Keep your users engaged, no matter what device they pick up or sit down at.
- Offer a seamless app experience across devices and into your website, securely
- from a one-time consent. </p>
- </div>
- <div class="col-8of12 col-push-1of12">
- <img src="{@docRoot}images/distribute/signin-seamless.png" style="padding-top:1em;">
- </div>
- </div>
-
- <div class="cols" style="margin-top:2em;">
- <div class="col-3of12">
- <h3>Help your users take action with Google</h3>
- <p>Securely connect users with Google services and let them pay with Google
- Wallet, share with Google contacts, save files to Drive, add events to
- Calendar, and more.</p>
- </div>
- <div class="col-8of12 col-push-1of12">
- <img src="{@docRoot}images/distribute/signin-apps.png" style="padding-top:1em;">
- </div>
- </div>
+<div class="figure">
+ <img src="{@docRoot}images/distribute/google-sign-in-banner.png" style="width:512px;">
</div>
+<p>
+ Get customers into your apps quickly and securely using a registration system that they
+ already use and trust – their Google account. With minimal effort, you can increase
+ registration and sign-in conversion by adding a trusted registration system that's familiar
+ to users, consistent across devices, and quick and easy to use.
+</p>
+<h2 id="tips">Benefits</h2>
-<h2>Tips</h2>
+<p>These are some of the ways Sign-In can improve your app:</p>
<ul>
-<li>Add <strong>over-the-air installs</strong> to your website. After signing in with Google
- on the web, users will have the option to send your Android app to their device instantly,
- without them ever leaving your website.</li>
- <li>With Google sign-in, you can take advantage of other <strong>Google+ platform
- features</strong> like adding a +1 button so users can make recommendations and the ability
- to share rich content to the Google+ stream.</li>
+ <li>
+ <strong>Quick and secure app access</strong>: Google Sign-In is a secure authentication
+ system that makes sign-in easy for your users by letting them use their Google account,
+ which they already use with Gmail, Google Play, Google+, and other Google services.
+ </li>
+
+ <li>
+ <strong>Seamless experience across screens</strong>: Keep your users engaged, no matter
+ what device they choose. Offer a secure and seamless app experience across devices and
+ into your website, from a one-time consent.
+ </li>
+
+ <li>
+ <strong>Convenient access to Google services</strong>: Securely connect users with
+ Google services and let them pay with Google Wallet, share with Google Contacts, save files
+ to Google Drive, and add events to Google Calendar.
+ </li>
</ul>
+<p>Get started integrating<a href="https://developers.google.com/identity/sign-in/">
+Google Sign-In</a> into your apps and games.</p>
-<h2 style="clear:both" id="related-resources">Related Resources</h2>
+<h2 id="tips">Tips</h2>
+
+<p>Here are some suggestions for enhancing the Sign-In user experience:</p>
+
+<ul>
+ <li>
+ Add <strong>over-the-air installs</strong> to your website. After signing in with Google
+ on the web, users have the option to send your Android app to their device instantly,
+ without ever leaving your website.
+ </li>
+
+ <li>
+ With Google Sign-In, you can take advantage of other <strong>Google+ platform
+ features</strong>, like adding a +1 button so users can make recommendations and have
+ the ability to share rich content to their Google+ streams.
+ </li>
+</ul>
+
+<h2 style="clear:both" id="related-resources">Related resources</h2>
<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/engage/gplus"
@@ -72,5 +68,3 @@
data-cardsizes="9x3"
data-maxresults="4">
</div>
-
-
diff --git a/docs/html/distribute/engage/engage_toc.cs b/docs/html/distribute/engage/engage_toc.cs
index 4f3e0af..cc6e2844 100644
--- a/docs/html/distribute/engage/engage_toc.cs
+++ b/docs/html/distribute/engage/engage_toc.cs
@@ -66,6 +66,12 @@
<span class="en">Get Feedback with Beta Tests</span></a>
</div>
</li>
+ <li class="nav-section">
+ <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs
+ var:toroot?>distribute/engage/nearby.html">
+ <span class="en">Interact with Nearby Users</span></a>
+ </div>
+ </li>
</ul>
<script type="text/javascript">
diff --git a/docs/html/distribute/engage/gcm.jd b/docs/html/distribute/engage/gcm.jd
index 55bd40a..9fa9d5f 100644
--- a/docs/html/distribute/engage/gcm.jd
+++ b/docs/html/distribute/engage/gcm.jd
@@ -43,7 +43,7 @@
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/engage/gcm"
data-sortorder="-timestamp"
data-cardsizes="9x3"
diff --git a/docs/html/distribute/engage/intents.jd b/docs/html/distribute/engage/intents.jd
index 07791e8..33ed125 100644
--- a/docs/html/distribute/engage/intents.jd
+++ b/docs/html/distribute/engage/intents.jd
@@ -1,5 +1,5 @@
page.title=Increase Usage with Android Intents
-page.metaDescription=Use Android Intents to make your app available to users as they perform tasks in other apps.
+page.metaDescription=Use Android Intents to make your app available to users as they perform tasks in other apps.
page.tags="engagement, intents"
@jd:body
diff --git a/docs/html/distribute/engage/nearby.jd b/docs/html/distribute/engage/nearby.jd
new file mode 100644
index 0000000..b1571f6
--- /dev/null
+++ b/docs/html/distribute/engage/nearby.jd
@@ -0,0 +1,93 @@
+page.title=Interact with Nearby Users
+page.metaDescription=Use the Nearby feature to interact with nearby people, devices, and beacons.
+page.image=images/distribute/nearby_connections.png
+page.tags="users, nearby, engage"
+@jd:body
+
+<p>Create experiences that seem magical for users who are in close proximity by using the unique
+close-range and cross-platform capabilities of Nearby. Set up multiplayer games, ad-hoc groups,
+sharing, or collaborative sessions so that your users can work or play together more easily when
+they're close.</p>
+
+<p>Learn more about <a href="https://developers.google.com/nearby/">how to add nearby interactions
+to your app or game</a>.</p>
+
+<div class="wrap">
+ <div class="cols" style="margin-top:1em;">
+ <div class="col-4of12">
+ <h3>
+ Messaging
+ </h3>
+ <img src="{@docRoot}images/distribute/nearby_messaging.png">
+ <p class="figure-caption">
+ Find nearby devices and share messages to enable rich interactions and collaboration
+ among users.
+ </p>
+ </div>
+
+ <div class="col-4of12">
+ <h3>
+ Connections
+ </h3>
+ <img src="{@docRoot}images/distribute/nearby_connections.png">
+ <p class="figure-caption">
+ Discover other local devices and create connections that enable real-time, cross-device
+ experiences.
+ </p>
+ </div>
+
+ <div class="col-4of12">
+ <h3>
+ Beacons
+ </h3>
+ <img src="{@docRoot}images/distribute/nearby_beacons.png">
+ <p class="figure-caption">
+ Receive messages from beacons using
+ <a href="https://developers.google.com/beacons/eddystone">Eddystone</a> and add context to
+ location-based apps and games.
+ </p>
+ </div>
+ </div>
+</div>
+
+<p class="note"><strong>Note:</strong> Nearby uses Bluetooth 2.0, Bluetooth 4.0, Wi-Fi, and an
+ultrasonic modem to function over distances of up to 100 feet.</p>
+
+<h2 id="best-practices">Best practices</h2>
+
+<p>The following list contains some helpful tips and best practices that will help you set up
+and use Nearby effectively:
+
+<ul>
+ <li>Use Nearby features sparingly and only when they're needed because they can consume battery
+ life quickly (up to 3.5 times faster than normal).
+ </li>
+
+ <li>Invoke Nearby explicitly with a button, switch, or special screen, and provide a visual
+ indication when the features are actively sending or receiving content.
+ </li>
+
+ <li>Ensure that users are aware of the data that is made visible by Nearby before
+ they start using the features.
+ </li>
+
+ <li>Stop any publish or subscribe operations when the user exits the app or stops the
+ activity that requires Nearby.
+ </li>
+
+ <li>Use the <em>earshot</em> option, which uses only the ultrasonic modem to send and receive
+ messages, to limit the range of Nearby messages to about five feet when privacy is important.
+ </li>
+
+ <li>Accelerate the exchange of messages (when appropriate) by making one device the publisher
+ only, and all other devices subscribers.
+ </li>
+</ul>
+
+<h2 id="related-resources">Related resources</h2>
+
+<div class="resource-widget resource-flow-layout col-13"
+ data-query="collection:distribute/users/nearby"
+ data-sortOrder="-timestamp"
+ data-cardSizes="9x3"
+ data-maxResults="6"></div>
diff --git a/docs/html/distribute/engage/notifications.jd b/docs/html/distribute/engage/notifications.jd
index 1aa0637..a37d703 100644
--- a/docs/html/distribute/engage/notifications.jd
+++ b/docs/html/distribute/engage/notifications.jd
@@ -10,7 +10,7 @@
</div>
<p>
- The <a href="/design/patterns/notifications.html">notification system</a>
+ The <a href="https://material.google.com/patterns/notifications.html">notification system</a>
allows your app to keep the user informed about events, such as new messages,
upcoming calendar appointments, shared photos, and much more. They are a
fundamental feature of Android that consumers check frequently to receive
@@ -51,7 +51,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/getusers/notifications"
data-sortorder="-timestamp"
data-cardsizes="9x3"
diff --git a/docs/html/distribute/engage/video.jd b/docs/html/distribute/engage/video.jd
index c5a4997..cf06ce0 100644
--- a/docs/html/distribute/engage/video.jd
+++ b/docs/html/distribute/engage/video.jd
@@ -1,5 +1,5 @@
page.title=Delight Users with Videos
-page.metaDescription=Videos are one of the most effective ways to get users excited about your apps.
+page.metaDescription=Videos are one of the most effective ways to get users excited about your apps.
page.tags="engagement"
page.image=/images/gp-engage-smule.jpg
diff --git a/docs/html/distribute/engage/widgets.jd b/docs/html/distribute/engage/widgets.jd
index 6adb55c..a6623ba 100644
--- a/docs/html/distribute/engage/widgets.jd
+++ b/docs/html/distribute/engage/widgets.jd
@@ -37,7 +37,7 @@
</h2>
</div>
-<div class="resource-widget resource-flow-layout col-13"
+<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/engage/widgets"
data-sortorder="-timestamp"
data-cardsizes="9x3"
diff --git a/docs/html/distribute/essentials/_project.yaml b/docs/html/distribute/essentials/_project.yaml
new file mode 100644
index 0000000..cafde8d
--- /dev/null
+++ b/docs/html/distribute/essentials/_project.yaml
@@ -0,0 +1,6 @@
+name: "Essentials"
+home_url: /distribute/essentials/
+description: "A focus on quality should be part of your entire app delivery process: from initial concept through app and UI design, coding and testing and onto a process of monitoring feedback and making improvement after launch."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/essentials/optimizing-your-app.jd b/docs/html/distribute/essentials/optimizing-your-app.jd
index 696ef53..d09a1a8 100644
--- a/docs/html/distribute/essentials/optimizing-your-app.jd
+++ b/docs/html/distribute/essentials/optimizing-your-app.jd
@@ -4,7 +4,7 @@
@jd:body
-<div id="qv-wrapper">
+<div id="qv-wrapper">
<div id="qv">
<h2>Strategies</h2>
<ol>
@@ -475,7 +475,7 @@
A great way to deliver a delightful user experience is to integrate tightly
with the operating system. Features like <a href=
"{@docRoot}guide/topics/appwidgets/index.html">Home screen widgets</a>,
- <a href="{@docRoot}design/patterns/notifications.html">rich
+ <a href="https://material.google.com/patterns/notifications.html">rich
notifications</a>, <a href="{@docRoot}guide/topics/search/index.html">global
search integration</a>, and <a href=
"{@docRoot}reference/android/widget/QuickContactBadge.html">Quick
diff --git a/docs/html/distribute/essentials/quality/billions.jd b/docs/html/distribute/essentials/quality/billions.jd
index 7042143..2e14b37 100644
--- a/docs/html/distribute/essentials/quality/billions.jd
+++ b/docs/html/distribute/essentials/quality/billions.jd
@@ -1,5 +1,5 @@
page.title=Building for Billions
-page.metaDescription=Best practices on how to optimize Android apps for low- and no-bandwidth and low-cost devices.
+page.metaDescription=Best practices on how to optimize Android apps for low- and no-bandwidth and low-cost devices.
page.image=/distribute/images/billions-guidelines.png
@jd:body
@@ -18,7 +18,7 @@
<li><a href="#compatibility">Backward compatibility</a></li>
<li><a href="#memory">Efficient memory usage</a></li>
</ol>
-
+
<h2><a href="#cost">Data Cost</a></h2>
<ol>
<li><a href="#appsize">Reduce app size</a></li>
@@ -42,14 +42,14 @@
<!-- intro -->
<p>Internet use—and smartphone penetration—is growing fastest in markets with
- low, intermittent, or expensive connectivity. Successful apps in these
- markets need to perform across a variety of speeds and devices, as well as
+ low, intermittent, or expensive connectivity. Successful apps in these
+ markets need to perform across a variety of speeds and devices, as well as
conserve and share information about battery and data consumption.</p>
<p>To help you address these important considerations, we’ve compiled the
- following checklist. These do not follow a particular order, and as
- always it's a good idea to research particularities of any market or country
- you're targeting.
+ following checklist. These do not follow a particular order, and as
+ always it's a good idea to research particularities of any market or country
+ you're targeting.
</p>
<!-- connectivity -->
@@ -67,40 +67,40 @@
<h4 id="images-format">Serve WebP images</h4>
<ul>
<li>Serve <a
- href="https://developers.google.com/speed/webp/">WebP</a> files over the
- network. WebP reduces image load times, saves network bandwidth, and often
- results in smaller file sizes than its PNG and JPG counterparts, with at
- least the same image quality. Even at lossy settings, WebP can produce a
- nearly identical image. Android has had lossy <a
- href="{@docRoot}guide/appendix/media-formats.html">WebP support</a> since
- Android 4.0 (API level 14: Ice Cream Sandwich) and support for lossless /
+ href="https://developers.google.com/speed/webp/">WebP</a> files over the
+ network. WebP reduces image load times, saves network bandwidth, and often
+ results in smaller file sizes than its PNG and JPG counterparts, with at
+ least the same image quality. Even at lossy settings, WebP can produce a
+ nearly identical image. Android has had lossy <a
+ href="{@docRoot}guide/appendix/media-formats.html">WebP support</a> since
+ Android 4.0 (API level 14: Ice Cream Sandwich) and support for lossless /
transparent WebP since Android 4.2 (API level 17: Jelly Bean).</li>
</ul>
<h4 id="images-sizing">Dynamic image sizing</h4>
<ul>
<li>Have your apps request images at the targeted rendering size, and have
- your server provide those images to fit; the target rendering size will
- vary based on device specifications. Doing this minimizes the network
- overhead and reduces the amount of memory needed to hold each image,
+ your server provide those images to fit; the target rendering size will
+ vary based on device specifications. Doing this minimizes the network
+ overhead and reduces the amount of memory needed to hold each image,
resulting in improved performance and user satisfaction.</li>
<li>Your user experience degrades when users are waiting for images to
- download. Using appropriate image sizes helps to address these issues.
- Consider making image size requests based on network type or network
+ download. Using appropriate image sizes helps to address these issues.
+ Consider making image size requests based on network type or network
quality; this size could be smaller than the target rendering size.</li>
<li>Dynamic placeholders like <a
href="{@docRoot}reference/android/support/v7/graphics/Palette.html">
- pre-computed palette values</a> or low-resolution thumbnails can improve
+ pre-computed palette values</a> or low-resolution thumbnails can improve
the user experience while the image is being fetched.</li>
</ul>
<h4 id="images-libraries">Use image loading libraries</h4>
<ul>
<li>Your app should not have to fetch any image more than once. Image
- loading libraries such as <a class="external-link"
- href="https://github.com/bumptech/glide">Glide</a> and <a
- class="external-link" href="http://square.github.io/picasso/">Picasso</a>
- fetch the image, cache it, and provide hooks into your Views to show
- placeholder images until the actual images are ready. Because images are
- cached, these libraries return the local copy the next time they are
+ loading libraries such as <a class="external-link"
+ href="https://github.com/bumptech/glide">Glide</a> and <a
+ class="external-link" href="http://square.github.io/picasso/">Picasso</a>
+ fetch the image, cache it, and provide hooks into your Views to show
+ placeholder images until the actual images are ready. Because images are
+ cached, these libraries return the local copy the next time they are
requested.</li>
<li>Image-loading libraries manage their cache, holding onto the most recent
images so that your app storage doesn’t grow indefinitely.</li>
@@ -110,59 +110,59 @@
<h4 id="network-offline">Make your app usable offline</h4>
<ul>
<li>In places like subways, planes, elevators, and parking garages, it is
- common for devices to lose network connectivity. Creating a useful offline
- state results in users being able to interact with the app at all times, by
- presenting cached information. Ensure that your app is usable offline or
- when network connectivity is poor by storing data locally, caching data,
+ common for devices to lose network connectivity. Creating a useful offline
+ state results in users being able to interact with the app at all times, by
+ presenting cached information. Ensure that your app is usable offline or
+ when network connectivity is poor by storing data locally, caching data,
and queuing outbound requests for when connectivity is restored.</li>
<li>Where possible, apps should not notify users that connectivity has
- been lost. It is only when the user performs an operation where connectivity
+ been lost. It is only when the user performs an operation where connectivity
is essential that the user needs to be notified.</li>
<li>When a device lacks connectivity, your app should batch up network
- requests—on behalf of the user—that can be executed when
- connectivity is restored. An example of this is an email client that allows
- users to compose, send, read, move, and delete existing mails even when the
- device is offline. These operations can be cached and executed when
- connectivity is restored. In doing so, the app is able to provide a similar
+ requests—on behalf of the user—that can be executed when
+ connectivity is restored. An example of this is an email client that allows
+ users to compose, send, read, move, and delete existing mails even when the
+ device is offline. These operations can be cached and executed when
+ connectivity is restored. In doing so, the app is able to provide a similar
user experience whether the device is online or offline.</li>
</ul>
<h4 id="network-arch">Use GcmNetworkManager and/or Content Providers</h4>
<ul>
<li>Ensure that your app stores all data on disk via a database or similar
- structure so that it performs optimally regardless of network conditions
- (for example, via SQLite + ContentProvider). The <a
+ structure so that it performs optimally regardless of network conditions
+ (for example, via SQLite + ContentProvider). The <a
href="https://developers.google.com/cloud-messaging/network-manager">
- GCM Network Manager</a>
+ GCM Network Manager</a>
(<a href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GcmNetworkManager</code></a>) can result in a robust mechanism to
- sync data with servers while <a
- href="{@docRoot}guide/topics/providers/content-providers.html">content
- providers</a> ({@link android.content.ContentProvider}) cache that data,
+ <code>GcmNetworkManager</code></a>) can result in a robust mechanism to
+ sync data with servers while <a
+ href="{@docRoot}guide/topics/providers/content-providers.html">content
+ providers</a> ({@link android.content.ContentProvider}) cache that data,
combining to provide an architecture that enables a useful offline state.</li>
<li>Apps should cache content that is fetched from the network. Before making
- subsequent requests, apps should display locally cached data. This ensures
- that the app is functional regardless of whether the device is offline or
+ subsequent requests, apps should display locally cached data. This ensures
+ that the app is functional regardless of whether the device is offline or
on a slow/unreliable network.</li>
</ul>
<h4 id="network-duplicate">Deduplicate network requests</h4>
<ul>
<li>An offline-first architecture initially tries to fetch data from local
- storage and, failing that, requests the data from the network. After being
- retrieved from the network, the data is cached locally for future
- retrieval. This helps to ensure that network requests for the same piece of
- data only occur once—the rest of the requests are satisfied locally. To
- achieve this, use a local database for long-lived data (usually
- {@link android.database.sqlite} or
+ storage and, failing that, requests the data from the network. After being
+ retrieved from the network, the data is cached locally for future
+ retrieval. This helps to ensure that network requests for the same piece of
+ data only occur once—the rest of the requests are satisfied locally. To
+ achieve this, use a local database for long-lived data (usually
+ {@link android.database.sqlite} or
{@link android.content.SharedPreferences}).</li>
<li>An offline-first architecture always looks for data locally first, then
- makes the request over the network. The response is cached and then returned
- locally. Such an architecture simplifies an app’s flow between offline and
- online states as one side fetches from the network to the cache, while the
+ makes the request over the network. The response is cached and then returned
+ locally. Such an architecture simplifies an app’s flow between offline and
+ online states as one side fetches from the network to the cache, while the
other retrieves data from the cache to present to the user.</li>
<li>For transitory data, use a bounded disk cache such as a <a class="external-link"
href="https://github.com/JakeWharton/DiskLruCache"><code>DiskLruCache</code>
- </a>. Data that doesn’t typically change should only be requested once over
- the network and cached for future use. Examples of such data are images and
+ </a>. Data that doesn’t typically change should only be requested once over
+ the network and cached for future use. Examples of such data are images and
non-temporal documents like news articles or social posts.</li>
</ul>
@@ -170,29 +170,29 @@
<h4 id="transfer-prioritize">Prioritize bandwidth</h4>
<ul>
<li>Writers of apps should not assume that any network that the device is
- connected to is long-lasting or reliable. For this reason, apps should
- prioritize network requests to display the most useful information to the
+ connected to is long-lasting or reliable. For this reason, apps should
+ prioritize network requests to display the most useful information to the
user as soon as possible.</li>
<li>Presenting users with visible and relevant information immediately is a
- better user experience than making them wait for information that might not
- be necessary. This reduces the time that the user has to wait and
+ better user experience than making them wait for information that might not
+ be necessary. This reduces the time that the user has to wait and
increases the usefulness of the app on slow networks.</li>
<li>To achieve this, sequence your network requests such that text is
- fetched before rich media. Text requests tend to be smaller, compress
- better, and hence transfer faster, meaning that your app can display useful
- content quickly. For more information on managing network requests, visit
- the Android training on <a
- href="{@docRoot}training/basics/network-ops/managing.html">Managing Network
+ fetched before rich media. Text requests tend to be smaller, compress
+ better, and hence transfer faster, meaning that your app can display useful
+ content quickly. For more information on managing network requests, visit
+ the Android training on <a
+ href="{@docRoot}training/basics/network-ops/managing.html">Managing Network
Usage</a>.</li>
</ul>
<h4 id="network-bandwidth">Use less bandwidth on slower connections</h4>
<ul>
<li>The ability for your app to transfer data in a timely fashion is
- dependent on the network connection. Detecting the quality of the network
- and adjusting the way your app uses it can help provide an excellent user
+ dependent on the network connection. Detecting the quality of the network
+ and adjusting the way your app uses it can help provide an excellent user
experience.</li>
<li>You can use the following methods to detect the underlying network
- quality. Using the data from these methods, your app should tailor its use
+ quality. Using the data from these methods, your app should tailor its use
of the network to continue to provide a timely response to user actions:
<ul>
<li>{@link android.net.ConnectivityManager}>
@@ -206,27 +206,27 @@
</ul>
</li>
<li>On slower connections, consider downloading only lower-resolution media
- or perhaps none at all. This ensures that your users are still able to use
- the app on slow connections. Where you don’t have an image or the image is
- still loading, you should always show a placeholder. You can create a
- dynamic placeholder by using the <a
+ or perhaps none at all. This ensures that your users are still able to use
+ the app on slow connections. Where you don’t have an image or the image is
+ still loading, you should always show a placeholder. You can create a
+ dynamic placeholder by using the <a
href="{@docRoot}tools/support-library/features.html#v7-palette">
- Palette library</a> to generate placeholder colors that match the target
+ Palette library</a> to generate placeholder colors that match the target
image.</li>
<li>Prioritize network requests such that text is fetched before rich media.
- Text requests tend to be smaller, compress better, and hence transfer
- faster, meaning that your app can display useful content quickly. For more
- information on adjusting bandwidth based on network connection, see the
- Android training on <a
- href="{@docRoot}training/basics/network-ops/managing.html">Managing Network
+ Text requests tend to be smaller, compress better, and hence transfer
+ faster, meaning that your app can display useful content quickly. For more
+ information on adjusting bandwidth based on network connection, see the
+ Android training on <a
+ href="{@docRoot}training/basics/network-ops/managing.html">Managing Network
Usage</a>.</li>
</ul>
<h4 id="network-behavior">Detect network changes, then change app behavior</h4>
<ul>
<li>Network quality is not static; it changes based on location, network
- traffic, and local population density. Apps should detect changes in
- network and adjust bandwidth accordingly. By doing so, your app can tailor
- the user experience to the network quality. Detect network state using
+ traffic, and local population density. Apps should detect changes in
+ network and adjust bandwidth accordingly. By doing so, your app can tailor
+ the user experience to the network quality. Detect network state using
these methods:
<ul>
<li>{@link android.net.ConnectivityManager}>
@@ -238,26 +238,26 @@
</ul>
</li>
<li>As the network quality degrades, scale down the number and size of
- requests. As the connection quality improves, you can scale up your
+ requests. As the connection quality improves, you can scale up your
requests to optimal levels.</li>
<li>On higher quality, unmetered networks, consider <a
href="{@docRoot}training/efficient-downloads/efficient-network-access.html#PrefetchData">
- prefetching data</a> to make it available ahead of time. From a user
- experience standpoint, this might mean that news reader apps only fetch
- three articles at a time on 2G but fetch twenty articles at a time on
- Wi-Fi. For more information on adjusting app behavior based on network changes,
- visit the Android training on <a
+ prefetching data</a> to make it available ahead of time. From a user
+ experience standpoint, this might mean that news reader apps only fetch
+ three articles at a time on 2G but fetch twenty articles at a time on
+ Wi-Fi. For more information on adjusting app behavior based on network changes,
+ visit the Android training on <a
href="{@docRoot}training/monitoring-device-state/connectivity-monitoring.html">
Monitoring the Connectivity Status</a>.</li>
<li>The broadcast <a
href="{@docRoot}reference/android/net/ConnectivityManager.html#CONNECTIVITY_ACTION">
- <code>CONNECTIVITY_CHANGE</code></a> is sent when a change in network
- connectivity occurs. When your app is in the foreground, you can call <a
+ <code>CONNECTIVITY_CHANGE</code></a> is sent when a change in network
+ connectivity occurs. When your app is in the foreground, you can call <a
href="{@docRoot}reference/android/content/Context.html#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter)">
- <code>registerReceiver</code></a> to receive this broadcast. After receiving
- the broadcast, you should reevaluate the current network state and adjust
- your UI and network usage appropriately. You should not declare this receiver
- in your manifest, as it will no longer function beginning with Android N.
+ <code>registerReceiver</code></a> to receive this broadcast. After receiving
+ the broadcast, you should reevaluate the current network state and adjust
+ your UI and network usage appropriately. You should not declare this receiver
+ in your manifest, as it will no longer function beginning with Android N.
For more details see <a href="{@docRoot}preview/behavior-changes.html">
Android N behavior changes</a>.</li>
</ul>
@@ -274,55 +274,55 @@
<h2 id="capability">Device Capability</h2>
</div>
<p>Reaching new users means supporting an increasing variety of Android
- platform versions and device specifications. Optimize for common RAM and
+ platform versions and device specifications. Optimize for common RAM and
screen sizes and resolutions to improve the user experience. </p>
<h3 id="screens">Support varying screen sizes</h3>
<h4 id="screens-dp">Use density-independent pixels (dp)</h4>
<ul>
<li>Defining layout dimensions with pixels is a problem because different
- screens have different pixel densities, so the same number of pixels may
- correspond to different physical sizes on different devices. The
- density-independent pixel (dp) corresponds to the physical size of a pixel
+ screens have different pixel densities, so the same number of pixels may
+ correspond to different physical sizes on different devices. The
+ density-independent pixel (dp) corresponds to the physical size of a pixel
at 160 dots per inch (mdpi density).</li>
<li>Defining layouts with dp ensures that the physical size of your user
- interface is consistent regardless of device. Visit the Android
- guide on <a
+ interface is consistent regardless of device. Visit the Android
+ guide on <a
href="https://developer.android.com/guide/practices/screens_support.html">
- Supporting Multiple Screens</a> for best practices using
+ Supporting Multiple Screens</a> for best practices using
density-independent pixels.</li>
</ul>
<h4 id="screens-density">Test graphics on ldpi/mdpi screen densities</h4>
<ul>
<li>Ensure that your app layouts work well on low- and medium-density
- (ldpi/mdpi) screens because these are <a
+ (ldpi/mdpi) screens because these are <a
href="https://developer.android.com/about/dashboards/index.html#Screens">
- common densities</a>, especially in lower-cost devices. Testing on
- lower-density screens helps to validate that your layouts are legible on
+ common densities</a>, especially in lower-cost devices. Testing on
+ lower-density screens helps to validate that your layouts are legible on
lower-density screens.</li>
<li>Lower-density screens can result in unclear text where the finer details
- aren't visible. The Material Design guidelines describe <a
+ aren't visible. The Material Design guidelines describe <a
class="external-link" href="https://www.google.com/design/spec/layout/metrics-keylines.html">
- metrics and keylines</a> to ensure that your layouts can scale across
+ metrics and keylines</a> to ensure that your layouts can scale across
screen densities.</li>
<li>Devices with lower-density screens tend to have lower hardware
- specifications. To ensure that your app performs well on these devices,
- consider reducing or eliminating heavy loads, such as animations and
- transitions. For more information on supporting different densities, see
- the Android training on <a
+ specifications. To ensure that your app performs well on these devices,
+ consider reducing or eliminating heavy loads, such as animations and
+ transitions. For more information on supporting different densities, see
+ the Android training on <a
href="https://developer.android.com/training/multiscreen/screendensities.html">
Supporting Different Densities</a>.</li>
</ul>
<h4 id="screens-sizes">Test layouts on small/medium screen sizes</h4>
<ul>
<li>Validate that your layouts scale down by testing on smaller screens. As
- screen sizes shrink, be very selective about visible UI elements, because
+ screen sizes shrink, be very selective about visible UI elements, because
there is limited space for them.</li>
<li>Devices with smaller screens tend to have lower hardware specifications.
- To ensure that your app performs well on these devices, try reducing or
- eliminating heavy loads, such as animations or transitions. For more
- information on supporting different screen sizes, see the Android
- training on <a
+ To ensure that your app performs well on these devices, try reducing or
+ eliminating heavy loads, such as animations or transitions. For more
+ information on supporting different screen sizes, see the Android
+ training on <a
href="https://developer.android.com/training/multiscreen/screendensities.html">
Supporting Different Screen Sizes</a>.</li>
</ul>
@@ -332,57 +332,57 @@
appropriately</h4>
<ul>
<li>Apps should build and target a recent version of Android to ensure most
- current behavior across a broad range of devices; this still provides
- backward compatibility to older versions. Here are the best practices for
+ current behavior across a broad range of devices; this still provides
+ backward compatibility to older versions. Here are the best practices for
targeting API levels appropriately:
<ul>
<li><a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">
- {@code targetSdkVersion}</a> should be the latest version of Android.
- Targeting the most recent version ensures that your app inherits newer
- runtime behaviors when running newer versions of Android. Be sure to
- test your app on newer Android versions when updating the
+ {@code targetSdkVersion}</a> should be the latest version of Android.
+ Targeting the most recent version ensures that your app inherits newer
+ runtime behaviors when running newer versions of Android. Be sure to
+ test your app on newer Android versions when updating the
targetSdkVersion as it can affect app behavior.</li>
<li><a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">
- {@code minSdkVersion}</a> sets the minimum supported Android version.
- Use Android 4.0 (API level 14: Ice Cream Sandwich) or Android 4.1 (API
- level 16: Jelly Bean)—these versions give maximum coverage for modern
- devices. Setting {@code minSdkVersion} also results in the Android build
- tools reporting incorrect use of new APIs that might not be available in
- older versions of the platform. By doing so, developers are protected
+ {@code minSdkVersion}</a> sets the minimum supported Android version.
+ Use Android 4.0 (API level 14: Ice Cream Sandwich) or Android 4.1 (API
+ level 16: Jelly Bean)—these versions give maximum coverage for modern
+ devices. Setting {@code minSdkVersion} also results in the Android build
+ tools reporting incorrect use of new APIs that might not be available in
+ older versions of the platform. By doing so, developers are protected
from inadvertently breaking backward compatibility.</li>
</ul>
</li>
<li>Consult the <a
href="https://developer.android.com/about/dashboards/index.html#Platform">
- Android dashboards</a>, the <a class="external-link"
- href="https://play.google.com/apps/publish/">Google Play Developer
- Console</a> for your app, and industry research in your target markets to
+ Android dashboards</a>, the <a class="external-link"
+ href="https://play.google.com/apps/publish/">Google Play Developer
+ Console</a> for your app, and industry research in your target markets to
gauge which versions of Android to target, based on your target users.</li>
</ul>
<h4 id="compatibility-libraries">Use the Android Support libraries</h4>
<ul>
<li>Ensure your app provides a consistent experience across OS versions by
using the Google-provided support libraries such as AppCompat and the Design
- Support Library. The Android Support Library package is a set of code
- libraries that provides backward-compatible versions of Android framework
+ Support Library. The Android Support Library package is a set of code
+ libraries that provides backward-compatible versions of Android framework
APIs as well as features that are only available through the library APIs.
</li>
<li>Some of the the highlights include:
<ul>
<li>v4 & v7 support library: Many framework APIs for older versions of
- Android such as {@link android.support.v4.view.ViewPager},
- {@link android.app.ActionBar},
- {@link android.support.v7.widget.RecyclerView}, and
+ Android such as {@link android.support.v4.view.ViewPager},
+ {@link android.app.ActionBar},
+ {@link android.support.v7.widget.RecyclerView}, and
{@link android.support.v7.graphics.Palette}.</li>
<li><a href="{@docRoot}tools/support-library/features.html#design">Design
- Support</a> library: APIs to support adding Material Design components
+ Support</a> library: APIs to support adding Material Design components
and patterns to your apps.</li>
<li><a href="{@docRoot}tools/support-library/features.html#multidex">
- Multidex Support</a> library: provides support for large apps that have
- more than 65K methods. This can happen if your app is using many
- libraries.</li>
+ Multidex Support</a> library: provides support for large apps that have
+ more than 65K methods. This can happen if your app is using many
+ libraries.</li>
</ul>
</li>
<li>For more information on the available support libraries, see the <a
@@ -392,14 +392,14 @@
<h4 id="compatibility-playservices">Use Google Play services</h4>
<ul>
<li>Google Play services brings the best of Google APIs independent of
- Android platform version. Consider using features from Google Play services
+ Android platform version. Consider using features from Google Play services
to offer the most streamlined Google experience on Android devices.</li>
- <li>Google Play services also include useful APIs such as <a
+ <li>Google Play services also include useful APIs such as <a
href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GcmNetworkManager</code></a>, which provides much of Android 5.0’s
+ <code>GcmNetworkManager</code></a>, which provides much of Android 5.0’s
{@link android.app.job.JobScheduler} API for older versions of Android. </li>
<li>Updates to Google Play services are distributed automatically by the
- Google Play Store, and new versions of the client library are delivered
+ Google Play Store, and new versions of the client library are delivered
through the Android SDK Manager. </li>
</ul>
<h3 id="memory">Efficient memory usage</h3>
@@ -408,44 +408,44 @@
<li>Adjusting your memory footprint dynamically helps to ensure compatibility
across devices with different RAM configurations.</li>
<li>Methods such as {@link android.app.ActivityManager#isLowRamDevice} and
- {@link android.app.ActivityManager#getMemoryClass()} help determine memory
- constraints at runtime. Based on this information, you can scale down your
- memory usage. As an example, you can use lower resolution images on low memory
+ {@link android.app.ActivityManager#getMemoryClass()} help determine memory
+ constraints at runtime. Based on this information, you can scale down your
+ memory usage. As an example, you can use lower resolution images on low memory
devices.</li>
<li>For more information on managing your app’s memory, see the Android
- training on <a href="{@docRoot}training/articles/memory.html">Managing
+ training on <a href="{@docRoot}training/articles/memory.html">Managing
Your App's Memory</a>.</li>
</ul>
<h4 id="memory-longprocesses">Avoid long-running processes</h4>
<ul>
<li>Long-running processes stay resident in memory and can result in slowing
- down the device. In most situations, your app should wake up for a given
- event, process data, and shut down. You should use <a
- href="https://developers.google.com/cloud-messaging">Google Cloud Messaging
- (GCM)</a> and/or <a
+ down the device. In most situations, your app should wake up for a given
+ event, process data, and shut down. You should use <a
+ href="https://developers.google.com/cloud-messaging">Google Cloud Messaging
+ (GCM)</a> and/or <a
href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GcmNetworkManager</code></a> to avoid long running background
+ <code>GcmNetworkManager</code></a> to avoid long running background
services and reduce memory pressure on the user’s device.</li>
</ul>
<h4 id="memory-benchmark">Benchmark memory usage</h4>
<ul>
<li>Android Studio provides memory benchmarking and profiling tools, enabling
you to measure memory usage at run time. Benchmarking your app’s memory
- footprint enables you to monitor memory usage over multiple versions of
- the app. This can help catch unintentional memory footprint growth. These
+ footprint enables you to monitor memory usage over multiple versions of
+ the app. This can help catch unintentional memory footprint growth. These
tools can be used in the following ways:
<ul>
<li>Use the <a
- href="{@docRoot}tools/performance/memory-monitor/index.html">Memory
- Monitor</a> tool to find out whether undesirable garbage collection (GC)
- event patterns might be causing performance problems.</li>
+ href="{@docRoot}tools/performance/memory-monitor/index.html">Memory
+ Monitor</a> tool to find out whether undesirable garbage collection (GC)
+ event patterns might be causing performance problems.</li>
<li>Run <a
href="{@docRoot}tools/performance/heap-viewer/index.html">Heap Viewer</a>
- to identify object types that get or stay allocated unexpectedly or
+ to identify object types that get or stay allocated unexpectedly or
unnecessarily.</li>
<li>Use <a
href="{@docRoot}tools/performance/allocation-tracker/index.html">
- Allocation Tracker</a> to identify where in your code the problem might
+ Allocation Tracker</a> to identify where in your code the problem might
be.</li>
</ul>
</li>
@@ -466,35 +466,35 @@
<h2 id="cost">Data Cost</h2>
</div>
<p>Data plans in some countries can cost upwards of 10% of monthly income.
- Conserve data and give control to optimize user experience. Reduce data
+ Conserve data and give control to optimize user experience. Reduce data
consumption and give users control over your app’s use of data.</p>
<h3 id="appsize">Reduce app size</h3>
<h4 id="appsize-graphics">Reduce APK graphical asset size</h4>
<ul>
<li>Graphical assets are often the largest contributor to the size of the
- APK. Optimizing these can result in smaller downloads and thus faster
+ APK. Optimizing these can result in smaller downloads and thus faster
installation times for users.</li>
<li>For graphical assets like icons, use Scalable Vector Graphics (SVG)
- format. SVG images are relatively tiny in size and can be rendered at
- runtime to any resolution. The <a
- href="{@docRoot}tools/support-library/index.html">Android Support</a>
- library provides a backward-compatible implementation for vector resources as
- far back as Android 2.1 (API level 7). Get started with vectors with <a
- class="external-link"
+ format. SVG images are relatively tiny in size and can be rendered at
+ runtime to any resolution. The <a
+ href="{@docRoot}tools/support-library/index.html">Android Support</a>
+ library provides a backward-compatible implementation for vector resources as
+ far back as Android 2.1 (API level 7). Get started with vectors with <a
+ class="external-link"
href="https://medium.com/@chrisbanes/appcompat-v23-2-age-of-the-vectors-91cbafa87c88">
this Medium post</a>. </li>
<li>For non-vector images, like photos, use <a
- href="https://developers.google.com/speed/webp/">WebP</a>. WebP reduces
- image load times, saves network bandwidth, and is proven to result in
- smaller file sizes than its PNG and JPG counterparts, with at least the
- same image quality. Even at lossy settings, WebP can produce a nearly
- identical image. Android has had lossy WebP support since Android 4.0 (API
+ href="https://developers.google.com/speed/webp/">WebP</a>. WebP reduces
+ image load times, saves network bandwidth, and is proven to result in
+ smaller file sizes than its PNG and JPG counterparts, with at least the
+ same image quality. Even at lossy settings, WebP can produce a nearly
+ identical image. Android has had lossy WebP support since Android 4.0 (API
level 14: Ice Cream Sandwich) and support for lossless / transparent WebP since Android 4.2 (API level 17: Jelly Bean).</li>
<li>If you have many large images across multiple densities, consider
- using <a href="{@docRoot}google/play/publishing/multiple-apks.html">Multiple
- APK support</a> to split your APK by density. This results in builds
- targeted for specific densities, meaning users with low-density devices
+ using <a href="{@docRoot}google/play/publishing/multiple-apks.html">Multiple
+ APK support</a> to split your APK by density. This results in builds
+ targeted for specific densities, meaning users with low-density devices
won’t have to incur the penalty of unused high-density assets.</li>
<li>A detailed guide on reducing your APK size can be found in <a
class="external-link" href="https://medium.com/@wkalicinski/smallerapk-part-4-multi-apk-through-abi-and-density-splits-477083989006">
@@ -503,84 +503,84 @@
<h4 id="appsize-code">Reduce code size</h4>
<ul>
<li>Be careful about using external libraries because not all libraries are
- meant to be used in mobile apps. Ensure that the libraries your app is
+ meant to be used in mobile apps. Ensure that the libraries your app is
using are optimized for mobile use.</li>
<li>Every library in your Android project is adding potentially unused code
- to your APK. There are also some libraries that aren’t designed with mobile
- development in mind. These libraries can end up contributing to significant
+ to your APK. There are also some libraries that aren’t designed with mobile
+ development in mind. These libraries can end up contributing to significant
APK bloat.</li>
<li>Consider optimizing your compiled code using a tool such as <a
- href="{@docRoot}tools/help/proguard.html">ProGuard</a>. ProGuard identifies
- code that isn’t being used and removes it from your APK. Also <a
- class="external-link"
+ href="{@docRoot}tools/help/proguard.html">ProGuard</a>. ProGuard identifies
+ code that isn’t being used and removes it from your APK. Also <a
+ class="external-link"
href="http://tools.android.com/tech-docs/new-build-system/resource-shrinking">
- enable resource shrinking</a> at build time by setting
- <code>minifyEnabled=true</code>, <code>shrinkResources=true</code> in
- <code>build.gradle</code>—this automatically removes unused resources from
+ enable resource shrinking</a> at build time by setting
+ <code>minifyEnabled=true</code>, <code>shrinkResources=true</code> in
+ <code>build.gradle</code>—this automatically removes unused resources from
your APK.</li>
<li>When using Google Play services, you should <a
href="{@docRoot}google/play-services/setup.html#add_google_play_services_to_your_project">
selectively include</a> only the necessary APIs into your APK.</li>
<li>For more information on reducing code size in your APK, see the Android
- training on how to <a
- href="{@docRoot}training/articles/memory.html#DependencyInjection">Avoid
+ training on how to <a
+ href="{@docRoot}training/articles/memory.html#DependencyInjection">Avoid
dependency injection frameworks</a>.</li>
</ul>
<h4 id="appsize-external">Allow app to be moved to external (SD) storage</h4>
<ul>
<li>Low-cost devices often come with little on-device storage. Users can
- extend this with SD cards; however, apps need to explicitly declare that
+ extend this with SD cards; however, apps need to explicitly declare that
they support being installed to external storage before users can move them.
</li>
<li>Allow your app to be installed to external storage using the <a
href="{@docRoot}guide/topics/manifest/manifest-element.html#install"><code>
- android:installLocation</code></a> flag in your AndroidManifest. For more
- information on enabling your app to be moved to external storage, see the
- Android guide on <a
- href="{@docRoot}guide/topics/data/install-location.html">App Install
+ android:installLocation</code></a> flag in your AndroidManifest. For more
+ information on enabling your app to be moved to external storage, see the
+ Android guide on <a
+ href="{@docRoot}guide/topics/data/install-location.html">App Install
Location</a>.</li>
</ul>
<h4 id="appsize-postinstall">Reduce post-install app disk usage</h4>
<ul>
<li>Keeping your app’s disk usage low means that users are less likely to
- uninstall your app when the device is low on free space. When using caches,
- it’s important to apply bounds around your caches—this prevents your app’s
- disk usage from growing indefinitely. Be sure you put your cached data in
- {@link android.content.Context#getCacheDir()}—the system can delete files
- placed here as needed, so they won’t show up as storage committed to the
+ uninstall your app when the device is low on free space. When using caches,
+ it’s important to apply bounds around your caches—this prevents your app’s
+ disk usage from growing indefinitely. Be sure you put your cached data in
+ {@link android.content.Context#getCacheDir()}—the system can delete files
+ placed here as needed, so they won’t show up as storage committed to the
app.</li>
</ul>
<h3 id="configurablenetwork">Offer configurable network usage</h3>
-<h4 id="configurablenetwork-onboarding">Provide onboarding experiences for
+<h4 id="configurablenetwork-onboarding">Provide onboarding experiences for
subjective user choices</h4>
<ul>
<li>Apps that allow users to reduce data usage are well received, even if
- they demand heavy data requirements. If your app uses a considerable amount
- of bandwidth (for example, video streaming apps), you can provide an
- onboarding experience for users to configure network usage. For example,
- you could allow the user to force lower-bitrate video streams on cellular
+ they demand heavy data requirements. If your app uses a considerable amount
+ of bandwidth (for example, video streaming apps), you can provide an
+ onboarding experience for users to configure network usage. For example,
+ you could allow the user to force lower-bitrate video streams on cellular
networks. </li>
<li>Additional settings for users to control data syncing, prefetching, and
- network usage behavior (for example, prefetch all starred news categories on
+ network usage behavior (for example, prefetch all starred news categories on
Wi-Fi only), also help users tailor your app’s behavior to their needs.</li>
<li>For more information on managing network usage, see the Android training
- on <a href="{@docRoot}training/basics/network-ops/managing.html">Managing
+ on <a href="{@docRoot}training/basics/network-ops/managing.html">Managing
Network Usage</a>.</li>
</ul>
-<h4 id="configurablenetwork-preferences">Provide a network preferences
+<h4 id="configurablenetwork-preferences">Provide a network preferences
screen</h4>
<ul>
<li>You can navigate to the app’s network settings from outside the app by
- means of a network preferences screen. You can invoke this screen from
+ means of a network preferences screen. You can invoke this screen from
either the system settings screen or the system data usage screen.</li>
<li>To provide a network preferences screen that users can access from within
- your app as well as from the system settings, in your app include an
- activity that supports the
+ your app as well as from the system settings, in your app include an
+ activity that supports the
{@link android.content.Intent#ACTION_MANAGE_NETWORK_USAGE} action.</li>
<li>For further information on adding a network preferences screen, see the
- Android training on <a
+ Android training on <a
href="{@docRoot}training/basics/network-ops/managing.html#prefs">
Implementing a Preferences Activity</a>.</li>
</ul>
@@ -599,57 +599,57 @@
<div class="headerLine">
<h2 id="consumption">Battery Consumption</h2>
</div>
-<p>Access to reliable power supplies varies, and outages can disrupt planned
-charges. Defend your users' batteries against unnecessary drain by benchmarking
-your battery use, avoiding wakelocks, scheduling tasks, and monitoring sensor
+<p>Access to reliable power supplies varies, and outages can disrupt planned
+charges. Defend your users' batteries against unnecessary drain by benchmarking
+your battery use, avoiding wakelocks, scheduling tasks, and monitoring sensor
requests.</p>
<h3 id="consumption-reduce">Reduce battery consumption</h3>
<ul>
<li>Your app should do minimal activity when in the background and when the
device is running on battery power.</li>
<li><a href="{@docRoot}reference/android/os/PowerManager.WakeLock.html">Wake
- locks</a> are mechanisms to keep devices on so that they can perform
- background activities. Avoid using wake locks because they prevent the
+ locks</a> are mechanisms to keep devices on so that they can perform
+ background activities. Avoid using wake locks because they prevent the
device from going into low-power states.</li>
<li>To reduce the number of device wake-ups, batch network activity. For more
- information on batching, see the Android training on <a
+ information on batching, see the Android training on <a
href="{@docRoot}training/efficient-downloads/efficient-network-access.html">
Optimizing Downloads for Efficient Network Access</a>.</li>
- <li><a
+ <li><a
href="https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GcmNetworkManager</code></a> schedules tasks and lets Google Play
- services batch operations across the system. This greatly
- simplifies the implementation of common patterns, such as waiting for
- network connectivity, device charging state, retries, and backoff. Use
- <code>GcmNetworkManager</code> to perform non-essential background activity
+ <code>GcmNetworkManager</code></a> schedules tasks and lets Google Play
+ services batch operations across the system. This greatly
+ simplifies the implementation of common patterns, such as waiting for
+ network connectivity, device charging state, retries, and backoff. Use
+ <code>GcmNetworkManager</code> to perform non-essential background activity
when the device is charging and is connected to an unmetered network.</li>
<li>Sensors, like GPS, can also have a significant drain on the battery. The
- recommended way to request location is to use the FusedLocationProvider API.
- The <a
- href="https://developers.google.com/android/reference/com/google/android/gms/location/FusedLocationProviderApi">FusedLocationProvider</a> API manages the
- underlying location technology and provides a simple API so that you can
- specify requirements—like high accuracy or low power—at a high
- level. It also optimizes the device's use of battery power by caching
- locations and batching requests across apps. For more information on the
- ideal ways to request location, see the <a
- href="{@docRoot}training/location/retrieve-current.html">Getting the Last
+ recommended way to request location is to use the FusedLocationProvider API.
+ The <a
+ href="https://developers.google.com/android/reference/com/google/android/gms/location/FusedLocationProviderApi">FusedLocationProvider</a> API manages the
+ underlying location technology and provides a simple API so that you can
+ specify requirements—like high accuracy or low power—at a high
+ level. It also optimizes the device's use of battery power by caching
+ locations and batching requests across apps. For more information on the
+ ideal ways to request location, see the <a
+ href="{@docRoot}training/location/retrieve-current.html">Getting the Last
Known Location</a> training guide.
</li>
</ul>
<h3 id="consumption-benchmark">Benchmark battery usage</h3>
<ul>
<li>Benchmarking your app’s usage in a controlled environment helps you
- understand the battery-heavy tasks in your app. It is a good practice to
- benchmark your app’s battery usage to gauge efficiency and track changes
+ understand the battery-heavy tasks in your app. It is a good practice to
+ benchmark your app’s battery usage to gauge efficiency and track changes
over time.
</li>
<li><a
href="{@docRoot}tools/performance/batterystats-battery-historian/index.html">
- Batterystats</a> collects battery data about your apps, and <a
+ Batterystats</a> collects battery data about your apps, and <a
href="{@docRoot}tools/performance/batterystats-battery-historian/index.html">
- Battery Historian</a> converts that data into an HTML visualization. For
- more information on reducing battery usage, see the Android training on <a
- href="{@docRoot}training/monitoring-device-state/index.html">Optimizing
+ Battery Historian</a> converts that data into an HTML visualization. For
+ more information on reducing battery usage, see the Android training on <a
+ href="{@docRoot}training/monitoring-device-state/index.html">Optimizing
Battery Life</a>.</li>
</ul>
@@ -665,55 +665,55 @@
<h2 id="contentsection">Content</h2>
</div>
<p>Make sure that your app works well on a variety of screens: offering good,
- crisp graphics and appropriate layouts on low resolution and physically small
- screens. Ensure that your app is designed to be easily localized by
- accommodating the variations between languages: allow for spacing, density,
- order, emphasis, and wording variations. Also make sure that date, time, and
- the like are internationalized and displayed according to the phone’s
+ crisp graphics and appropriate layouts on low resolution and physically small
+ screens. Ensure that your app is designed to be easily localized by
+ accommodating the variations between languages: allow for spacing, density,
+ order, emphasis, and wording variations. Also make sure that date, time, and
+ the like are internationalized and displayed according to the phone’s
settings.</p>
<h3 id="content-responsive">Fast and responsive UI</h3>
<h4 id="content-feedback">Touch feedback on all touchable items</h4>
<ul>
<li>Touch feedback adds a tactile feeling to the user interface. You should
- ensure your app provides touch feedback on all touchable elements to reduce
+ ensure your app provides touch feedback on all touchable elements to reduce
the perceived app latency as much as possible.
</li>
<li><a
href="https://www.google.com/design/spec/animation/responsive-interaction.html">
- Responsive interaction</a> encourages deeper exploration of an app by
- creating timely, logical, and delightful screen reactions to user input.
- Responsive interaction elevates an app from an information-delivery service
- to an experience that communicates using multiple visual and tactile
+ Responsive interaction</a> encourages deeper exploration of an app by
+ creating timely, logical, and delightful screen reactions to user input.
+ Responsive interaction elevates an app from an information-delivery service
+ to an experience that communicates using multiple visual and tactile
responses.</li>
<li>For more information, see the Android training on <a
- href="{@docRoot}training/material/animations.html#Touch">Customizing Touch
+ href="{@docRoot}training/material/animations.html#Touch">Customizing Touch
Feedback</a>.</li>
</ul>
<h4 id="content-interactive">UI should always be interactive</h4>
<ul>
<li>Apps that are unresponsive when performing background activity feel slow
- and reduce user satisfaction. Ensure your app always has a responsive UI
- regardless of any background activity. Achieve this by performing network
- operations or any heavy-duty operations in a background thread—keep the UI
+ and reduce user satisfaction. Ensure your app always has a responsive UI
+ regardless of any background activity. Achieve this by performing network
+ operations or any heavy-duty operations in a background thread—keep the UI
thread as idle as you can.</li>
<li>Material Design apps use minimal visual changes when your app is loading
- content by representing each operation with a single activity indicator.
- Avoid blocking dialogs with <a
+ content by representing each operation with a single activity indicator.
+ Avoid blocking dialogs with <a
href="https://www.google.com/design/spec/components/progress-activity.html">
loading indicators</a>.</li>
<li><a
- href="http://www.google.com/design/spec/patterns/empty-states.html">Empty
- states</a> occur when the regular content of a view can’t be shown. It might
- be a list that has no items or a search that returns no results. Avoid
- completely empty states. The most basic empty state displays a
- non-interactive image and a text tagline. Where you don’t have an image, or
- the image is still loading, you should always show either a static
- placeholder, or create a dynamic placeholder by using the <a
- href="{@docRoot}tools/support-library/features.html#v7-palette">Palette
+ href="http://www.google.com/design/spec/patterns/empty-states.html">Empty
+ states</a> occur when the regular content of a view can’t be shown. It might
+ be a list that has no items or a search that returns no results. Avoid
+ completely empty states. The most basic empty state displays a
+ non-interactive image and a text tagline. Where you don’t have an image, or
+ the image is still loading, you should always show either a static
+ placeholder, or create a dynamic placeholder by using the <a
+ href="{@docRoot}tools/support-library/features.html#v7-palette">Palette
library</a> to generate placeholder colors that match the target image.</li>
<li>For more information, see the Android training on <a
- href="{@docRoot}training/articles/perf-anr.html">Keeping Your App
+ href="{@docRoot}training/articles/perf-anr.html">Keeping Your App
Responsive</a>.</li>
</ul>
<h4 id="content-60fps">Target 60 frames per second on low-cost devices</h4>
@@ -721,34 +721,34 @@
<li>Ensure that your app always runs fast and smoothly, even on low-cost
devices.</li>
<li>Overdraw can significantly slow down your app—it occurs when the pixels
- are being drawn more than once per pass. An example of this is when you have
- an image with a button placed on top of it. While some overdraw is
- unavoidable, it should be minimized to ensure a smooth frame rate. Perform
- <a href="{@docRoot}tools/performance/debug-gpu-overdraw/index.html">Debug
+ are being drawn more than once per pass. An example of this is when you have
+ an image with a button placed on top of it. While some overdraw is
+ unavoidable, it should be minimized to ensure a smooth frame rate. Perform
+ <a href="{@docRoot}tools/performance/debug-gpu-overdraw/index.html">Debug
GPU overdraw</a> on your app to ensure it is minimized.</li>
<li>Android devices refresh the screen at 60 frames per second (fps), meaning
- your app has to update the screen within roughly 16 milliseconds. <a
- href="{@docRoot}tools/performance/profile-gpu-rendering/index.html">Profile
- your app</a> using on-device tools to see if and when your app is not
+ your app has to update the screen within roughly 16 milliseconds. <a
+ href="{@docRoot}tools/performance/profile-gpu-rendering/index.html">Profile
+ your app</a> using on-device tools to see if and when your app is not
meeting this 16-ms average.</li>
<li>Reduce or remove animations on low-cost devices to lessen the burden on
- the device’s CPU and GPU. For more information, see the Android training on
- <a href="{@docRoot}training/improving-layouts/index.html">Improving Layout
+ the device’s CPU and GPU. For more information, see the Android training on
+ <a href="{@docRoot}training/improving-layouts/index.html">Improving Layout
Performance</a>. </li>
</ul>
-<h4 id="content-firstload">If anticipated start speed is low, use launch screen
+<h4 id="content-firstload">If anticipated start speed is low, use launch screen
on first load</h4>
<ul>
<li>The launch screen is a user’s first experience of your application.
- Launching your app while displaying a blank canvas increases its perceived
- loading time, so consider using a placeholder UI or a branded launch screen
+ Launching your app while displaying a blank canvas increases its perceived
+ loading time, so consider using a placeholder UI or a branded launch screen
to reduce the perceived loading time.</li>
<li>A<a href="https://www.google.com/design/spec/patterns/launch-screens.html#launch-screens-types-of-launch-screens">
- placeholder UI</a> is the most seamless launch transition, appropriate for
+ placeholder UI</a> is the most seamless launch transition, appropriate for
both app launches and in-app activity transitions.</li>
<li><a
href="https://www.google.com/design/spec/patterns/launch-screens.html#launch-screens-placeholder-ui">
- Branded launch screens</a> provide momentary brand exposure, freeing the UI
+ Branded launch screens</a> provide momentary brand exposure, freeing the UI
to focus on content.</li>
<li>For more information on implementing splash screens, see the <a
href="https://www.google.com/design/spec/patterns/launch-screens.html">
@@ -758,24 +758,24 @@
<ul>
<li><a
href="https://www.google.com/design/spec/material-design/introduction.html">
- Material Design</a> is a visual language that synthesizes the classic
- principles of good design with the innovation and possibility of technology
- and science. Material Design aims to develop a single underlying system that
- allows for a unified experience across platforms and device sizes. Consider
- using key Material Design components so that users intuitively know how to
+ Material Design</a> is a visual language that synthesizes the classic
+ principles of good design with the innovation and possibility of technology
+ and science. Material Design aims to develop a single underlying system that
+ allows for a unified experience across platforms and device sizes. Consider
+ using key Material Design components so that users intuitively know how to
use your app.</li>
<li>Ready-to-use Material Design components are available via the <a
- href="{@docRoot}tools/support-library/features.html#design">Design Support
- library</a>. These components are supported in Android 2.1 (API level 7) and
+ href="{@docRoot}tools/support-library/features.html#design">Design Support
+ library</a>. These components are supported in Android 2.1 (API level 7) and
above.</li>
</ul>
<h3 id="localization">Localization</h3>
<ul>
<li>Your users could be from any part of the world and their first language
- may not be yours. If you don’t present your app in a language that your
- users can read, it is a missed opportunity. You should therefore
+ may not be yours. If you don’t present your app in a language that your
+ users can read, it is a missed opportunity. You should therefore
localize your app for key regional languages.</li>
- <li>To learn more, visit the Android training on <a
+ <li>To learn more, visit the Android training on <a
href="{@docRoot}training/basics/supporting-devices/languages.html">
Supporting Different Languages</a>.</li>
</ul>
diff --git a/docs/html/distribute/essentials/quality/core.jd b/docs/html/distribute/essentials/quality/core.jd
index 0ff44eb..3499f23 100644
--- a/docs/html/distribute/essentials/quality/core.jd
+++ b/docs/html/distribute/essentials/quality/core.jd
@@ -12,7 +12,7 @@
<li><a href="#listing">Google Play</a></li>
</ol>
-
+
<h2>Testing</h2>
<ol>
<li><a href="#test-environment">Setting Up a Test Environment</a></li>
@@ -24,7 +24,7 @@
<li><a href="{@docRoot}distribute/essentials/quality/tablets.html">Tablet App Quality</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">Optimize Your App</a></li>
</ol>
-
+
</div>
</div>
@@ -85,7 +85,7 @@
<th style="width:54px;">
ID
</th>
-
+
<th>
Description
@@ -186,7 +186,7 @@
<td>
<p style="margin-bottom:.5em;">
Notifications follow Android Design <a href=
- "{@docRoot}design/patterns/notifications.html">guidelines</a>. In
+ "https://material.google.com/patterns/notifications.html">guidelines</a>. In
particular:
</p>
diff --git a/docs/html/distribute/essentials/quality/tablets.jd b/docs/html/distribute/essentials/quality/tablets.jd
index 2b2a5ae..3ff35f7 100644
--- a/docs/html/distribute/essentials/quality/tablets.jd
+++ b/docs/html/distribute/essentials/quality/tablets.jd
@@ -57,7 +57,7 @@
<p>The first step in delivering a great tablet app experience is making sure
that it meets the <em>core app quality criteria</em> for all of the devices
and form factors that the app is targeting. For complete information, see the <a
-href="{@docRoot}distribute/essentials/quality/core.html">Core App Quality Guidelines</a>.
+href="{@docRoot}distribute/essentials/quality/core.html">Core App Quality Guidelines</a>.
</p>
<p>
@@ -73,7 +73,7 @@
</ul>
<p>If your app is already uploaded to the Google Play Developer Console, you
- can see how it is doing against these checks
+ can see how it is doing against these checks
by visiting the <a href="#google-play-optimization-tips">Optimization
Tips page</a>.</p>
@@ -505,7 +505,7 @@
<pre><uses-feature android:name="android.hardware.telephony" android:required="false" /></pre></li>
-<li>Similarly, check the manifest for <a href="{@docRoot}guide/topics/manifest/permission-element.html"><code><permission></code></a> elements that
+<li>Similarly, check the manifest for <a href="{@docRoot}guide/topics/manifest/permission-element.html"><code><permission></code></a> elements that
<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#permissions">imply hardware
feature requirements</a> that not be appropriate for tablets. If you find such
permissions, make sure to explicitly declare a corresponding
diff --git a/docs/html/distribute/essentials/quality/wear.jd b/docs/html/distribute/essentials/quality/wear.jd
index fc1c73f..34c6cc5 100644
--- a/docs/html/distribute/essentials/quality/wear.jd
+++ b/docs/html/distribute/essentials/quality/wear.jd
@@ -18,7 +18,7 @@
Core App Quality</a></li>
<li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html">
Optimize Your App</a></li>
- <li><a href="{@docRoot}design/patterns/notifications.html">
+ <li><a href="https://material.google.com/patterns/notifications.html">
Notifications</a></li>
</ol>
</div>
diff --git a/docs/html/distribute/googleplay/_project.yaml b/docs/html/distribute/googleplay/_project.yaml
new file mode 100644
index 0000000..2dfded3
--- /dev/null
+++ b/docs/html/distribute/googleplay/_project.yaml
@@ -0,0 +1,6 @@
+name: "Google Play"
+home_url: /distribute/googleplay/
+description: "The premier store for distributing Android apps and games, with global reach and tools to help you gain traction in the marketplace."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/googleplay/cast.jd b/docs/html/distribute/googleplay/cast.jd
index 937ab58..3112f81 100644
--- a/docs/html/distribute/googleplay/cast.jd
+++ b/docs/html/distribute/googleplay/cast.jd
@@ -26,7 +26,7 @@
<p>
<a href="https://developers.google.com/cast/">Find out how to get your app Google
- Cast-ready</a>.
+ Cast-ready</a>.
</p>
<h2 id="tips">Tips</h2>
diff --git a/docs/html/distribute/googleplay/developer-console.jd b/docs/html/distribute/googleplay/developer-console.jd
index c826e82..5a6c96fc 100644
--- a/docs/html/distribute/googleplay/developer-console.jd
+++ b/docs/html/distribute/googleplay/developer-console.jd
@@ -10,30 +10,30 @@
<div id="qv">
<h2>Features</h2>
<ol>
- <li><a href="#latest">Latest blog posts</a></li>
- <li><a href="#publish">Publish with confidence</a></li>
- <li><a href="#aquire-users">Acquire users</a></li>
- <li><a href="#insights">Actionable insights</a></li>
- <li><a href="#manage">Manage your app</a></li>
+ <li><a href="#latest">Latest Blog Posts</a></li>
+ <li><a href="#publish">Publish with Confidence</a></li>
+ <li><a href="#aquire-users">Acquire Users</a></li>
+ <li><a href="#insights">Learn about Users and App Performance</a></li>
+ <li><a href="#manage">Manage Your App</a></li>
</ol>
</div>
</div>
<p>
- The <a href="https://play.google.com/apps/publish/">Google Play Developer
- Console</a> is your home for publishing operations and tools.
+ The <a class="external-link" href="https://play.google.com/apps/publish/">Google Play Developer
+ Console</a> is your home for publishing and managing your apps.
</p>
<img src="{@docRoot}images/distribute/googleplay/gp-devconsole-home.png" style="width:480px;">
<p>
- Upload apps, build your product pages, configure prices and distribution, and
- publish. You can manage all phases of publishing on Google Play through the
- Developer Console, from any web browser.
+ You can manage all phases of publishing on Google Play through the Developer
+ Console. Using any web browser, you can upload apps, build product pages, set
+ prices, configure distribution, and publish apps.
</p>
<p>
- Once you've <a href=
+ After you've <a href=
"{@docRoot}distribute/googleplay/start.html">registered</a> and received
verification by email, you can sign in to your Google Play Developer Console.
</p>
@@ -44,7 +44,7 @@
<div class="dynamic-grid">
<div class="headerLine">
-<h2 id="latest">Latest blog posts</h2>
+<h2 id="latest">Latest Blog Posts</h2>
</div>
<div class="resource-widget resource-flow-layout col-13"
@@ -54,31 +54,10 @@
data-maxResults="3"></div>
</div>
-<h2 id="publish">Publish with confidence</h2>
-
+<h2 id="publish">Publish with Confidence</h2>
+<p>The Developer Console provides rich testing features and staged rollouts that help you to
+ provide apps that satisfy your users.</p>
<div class="wrap">
- <h3 id="alpha-beta">Alpha and beta tests</h3>
-
- <div class="cols" style="margin-top:2em;">
- <div class="col-3of12">
- <p>
- Distribute your pre-release app to users as an open beta with a
- one-click, opt-in URL or as a closed beta using an email list, Google
- Group, or Google+ community. Users can then provide feedback, while not
- affecting your app’s public reviews and rating. This valuable feedback
- will help you test features and improve the quality of your app.
- <a href="{@docRoot}distribute/engage/beta.html">Learn more</a>.
- </p>
- </div>
-
- <div class="col-8of12 col-push-1of12">
- <img src=
- "{@docRoot}images/distribute/googleplay/dev-console_running-a-beta-test.png"
- srcset=
- "{@docRoot}images/distribute/googleplay/dev-console_running-a-beta-test.png 1x, {@docRoot}images/distribute/googleplay/dev-console_running-a-beta-test_2x.png 2x"
- width="500">
- </div>
- </div>
<h3 id="cloud-test">Cloud Test Lab</h3>
@@ -87,8 +66,8 @@
<p>
Get free automated testing of your app on physical devices covering
nearly every brand, model, and version of the devices your users might
- be using. The lab will help you quickly find compatibility issues you
- may miss using only your available test devices. Sign-up in the
+ have. The lab helps you quickly find compatibility issues that you
+ might miss using only your available test devices. Sign up in the
Developer Console to become an early tester before this feature becomes
more widely available. <a href=
"https://developers.google.com/cloud-test-lab/" class=
@@ -100,57 +79,85 @@
<img src=
"{@docRoot}images/distribute/googleplay/dev-console_cloud-test-lab.png"
srcset=
- "{@docRoot}images/distribute/googleplay/dev-console_cloud-test-lab.png 1x, {@docRoot}images/distribute/googleplay/dev-console_cloud-test-lab_2x.png 2x"
+ "{@docRoot}images/distribute/googleplay/dev-console_cloud-test-lab.png 1x,
+ {@docRoot}images/distribute/googleplay/dev-console_cloud-test-lab_2x.png 2x"
width="500">
</div>
</div>
</div>
+ <h3 id="alpha-beta">Alpha and beta tests</h3>
+
+ <div class="cols" style="margin-top:2em;">
+ <div class="col-3of12">
+ <p>
+ Collect user feedback on early versions of your app with alpha and beta testing.
+ Distribute your pre-release app to users as an open beta with a
+ one-click, opt-in URL or as a closed beta using an email list, Google
+ Group, or Google+ community. Users can provide feedback, while not
+ affecting your app’s public reviews and rating. This valuable feedback
+ helps you test features and improve the quality of your app.
+ <a href="{@docRoot}distribute/engage/beta.html">Learn more</a>.
+ </p>
+ </div>
+
+ <div class="col-8of12 col-push-1of12">
+ <img src=
+ "{@docRoot}images/distribute/googleplay/dev-console_running-a-beta-test.png"
+ srcset=
+ "{@docRoot}images/distribute/googleplay/dev-console_running-a-beta-test.png 1x,
+ {@docRoot}images/distribute/googleplay/dev-console_running-a-beta-test_2x.png 2x"
+ width="500">
+ </div>
+ </div>
+
<h3 id="staged-rollouts">Staged rollouts</h3>
<p>
- Release app updates progressively to an increasing portion of your users and
- monitor for missed issues. Then take the opportunity to fix problems before
- all your users are affected. <a href=
+Discover and fix problems with a limited user base before making a wider release.
+With staged rollouts, you can release app updates progressively to an increasing portion of
+ your users.
+You can fix problems before your app reaches the broader user community. <a href=
"https://support.google.com/googleplay/android-developer/answer/3131213"
- class="external-link">Learn more.</a>
+ class="external-link">Learn more</a>.
</p>
-<p class="aside">
- <strong>Tip:</strong> If you find an issue during a rollout stage you can
- halt the rollout to further minimize the effect, and then resume rollout once
- a fix has been made.
+<p class="note">
+ <strong>Tip:</strong> If you find an issue during a rollout stage, you can
+ halt the rollout, make the fix, and then resume.
</p>
-<h2 id="aquire-users">Aquire users</h2>
-
- <h3 id="adwords">AdWords Universal App Campaigns</h3>
+<h2 id="aquire-users">Acquire Users</h2>
+<p>Using the Developer Console, you can configure targeted ads to present your app to more users.
+ You can test variations of your Play Store listings and track user responses.</p>
+ <h3 id="adwords">Promote your app with AdWords</h3>
<p>
- Easily and conveniently buy AdWords app install ads, across Search
+ Easily and conveniently buy AdWords app install ads. AdWords Universal App Campaigns
+ appear across Search
(including Play Search), YouTube, AdMob, and the Google Display Network.
- Simply set a budget and cost per acquisition and Google takes care of the
+ Set a budget and cost per acquisition, and Google takes care of the
rest. <a href="{@docRoot}distribute/users/promote-with-ads.html">Learn
more</a>.
</p>
<div class="wrap">
- <h3 id="listing-experiments">Store Listing Experiments</h3>
+ <h3 id="listing-experiments">Increase installs with improved store listings</h3>
<div class="cols" style="margin-top:2em;">
<div class="col-3of12">
- <p>
- Test variations of the images and text used to promote and describe
- your app on your Play store listing. Then when enough data has been
- collected, choose to make the winning combination visible on Google
+ <p>With store listing experiments,
+ you can test variations of your app's Play Store listing.
+ You can try different combinations of images and text used to promote and describe
+ your app on its Play Store listing. Collect data, choose the best combination, and make
+ it visible on Google
Play. <a href="{@docRoot}distribute/users/experiments.html">Learn
more</a>.
</p>
- <p class="aside">
- <strong>Tip:</strong> You can even try out different orders for your
- screenshots and other images to discover which grabs users’ attention
- the best.
+ <p class="note">
+ <strong>Tip:</strong> You can reorder your screenshots and other images in different ways
+ to determine the arrangement that best attracts users.
</p>
</div>
@@ -158,20 +165,21 @@
<img src=
"{@docRoot}images/distribute/googleplay/dev-console_store-listing-experiment.png"
srcset=
- "{@docRoot}images/distribute/googleplay/dev-console_store-listing-experiment.png 1x, {@docRoot}images/distribute/googleplay/dev-console_store-listing-experiment_2x.png 2x"
+ "{@docRoot}images/distribute/googleplay/dev-console_store-listing-experiment.png 1x,
+ {@docRoot}images/distribute/googleplay/dev-console_store-listing-experiment_2x.png 2x"
width="500">
</div>
</div>
- <h3 id="user-perf-report">User Acquisition performance report</h3>
+ <h3 id="user-perf-report">User acquisition performance report</h3>
<div class="cols" style="margin-top:2em;">
<div class="col-3of12">
<p>
- Discover where visitors to your Play Store listing come from, how many
- go on to install your app, and how many buy your in-app products in the
- User Acquisition performance report; compare cohorts, examine
- acquisition channels, and see details of users and buyers. <a href=
+ Discover information about visitors to your Play Store listing, such as where they come
+ from, how many go on to install your app, and how many buy your in-app products. You
+ can also compare cohorts, examine acquisition channels, and see details of users and
+ buyers. <a href=
"{@docRoot}distribute/users/user-acquisition.html">Learn more</a>.
</p>
</div>
@@ -180,14 +188,16 @@
<img src=
"{@docRoot}images/distribute/googleplay/dev-console_conversion-funnel.png"
srcset=
- "{@docRoot}images/distribute/googleplay/dev-console_conversion-funnel.png 1x, {@docRoot}images/distribute/googleplay/dev-console_conversion-funnel_2x.png 2x"
+ "{@docRoot}images/distribute/googleplay/dev-console_conversion-funnel.png 1x,
+ {@docRoot}images/distribute/googleplay/dev-console_conversion-funnel_2x.png 2x"
width="500">
</div>
</div>
</div>
-<h2 id="insights">Actionable insights</h2>
-
+<h2 id="insights">Learn about App Users and Performance</h2>
+<p>Using the Developer console, you can gain valuable insights about app performance.
+ You can better understand user behavior and find out ways to optimize your app. </p>
<div class="wrap">
<h3 id="player-analytics">Player Analytics</h3>
@@ -195,8 +205,10 @@
<div class="cols" style="margin-top:2em;">
<div class="col-3of12">
<p>
- With Google Play game services integration, discover more about the
- behaviour of your game players; how they play and how they buy. Also get
+ Google Play game services offers a comprehensive dashboard of player and engagement
+ statistics.
+ With Player Analytics, discover more about the
+ behavior of your game users, including how they play and how they buy. Also get
help setting and monitoring revenue budgets. <a href=
"{@docRoot}distribute/engage/game-services.html">Learn more</a>.
</p>
@@ -206,7 +218,8 @@
<img src=
"{@docRoot}images/distribute/googleplay/dev-console_player-analytics.png"
srcset=
- "{@docRoot}images/distribute/googleplay/dev-console_player-analytics.png 1x, {@docRoot}images/distribute/googleplay/dev-console_player-analytics_2x.png 2x"
+ "{@docRoot}images/distribute/googleplay/dev-console_player-analytics.png 1x,
+ {@docRoot}images/distribute/googleplay/dev-console_player-analytics_2x.png 2x"
width="500">
</div>
</div>
@@ -216,74 +229,77 @@
<div class="cols" style="margin-top:2em;">
<div class="col-3of12">
<p>
- Get a wide range of reports on the performance of your app and behaviour
- of users; such as installs, revenue, crashes, and more. Turn on email
- alerts to be notified of any sudden changes to important stats. <a href=
- "https://support.google.com/googleplay/android-developer/topic/3450942?ref_topic=3450986"
- class="external-link">Learn more.</a>
+ Get a wide range of reports on the performance of your app and behavior
+ of users such as installs, revenue, and crashes. Turn on email
+ alerts to receive notifications of any sudden changes to important stats. <a href=
+ "https://support.google.com/googleplay/android-developer/topic/3450942?ref_topic=3450986"
+ class="external-link">Learn more</a>.
</p>
</div>
<div class="col-8of12 col-push-1of12">
<img src=
"{@docRoot}images/distribute/googleplay/dev-console_statistics.png" srcset=
- "{@docRoot}images/distribute/googleplay/dev-console_statistics.png 1x, {@docRoot}images/distribute/googleplay/dev-console_statistics_2x.png 2x"
+ "{@docRoot}images/distribute/googleplay/dev-console_statistics.png 1x,
+ {@docRoot}images/distribute/googleplay/dev-console_statistics_2x.png 2x"
width="500">
</div>
</div>
</div>
-<h3 id="optimization"> Optimization tips</h3>
+<h3 id="optimization">Optimization tips</h3>
<p>
- Get tips, based on automatic app scanning, on ways in which you can improve
- your app, everything from updating old APIs to suggestions for languages you
- should consider localizing to.
+ Automatic app scanning provides tips on ways to improve your apps—everything
+ from updating old APIs to suggested languages for localization.
</p>
-<h2 id="manage">Manage your app</h2>
+<h2 id="manage">Manage Your App</h2>
<h3 id="manage-apks">Manage your APKs</h3>
<p>
Upload and manage your Android application packages (APK) to the Developer
- Console as drafts or to your Alpha, Beta, or Production channels. <a href=
+ Console as drafts or to your Alpha, Beta, or Production channels. <a href=
"https://support.google.com/googleplay/android-developer/answer/113469?ref_topic=3450986"
- class="external-link">Learn more.</a>
+ class="external-link">Learn more</a>.
</p>
-<p class="aside">
- <strong>Tip:</strong> Ensure users get the best possible experience for the
+<p class="note">
+ <strong>Tip:</strong> Ensure that users get the best possible experience for the
smallest app downloads by creating multiple APKs with just the right content
- for device screen size, hardware features and more.
+ for hardware features such as screen size. For more information about using multiple APKs,
+ see <a href="https://developer.android.com/training/multiple-apks/index.html">
+ Maintaining Multiple APKs.</a>
</p>
<h3 id="iap">In-app products and subscriptions</h3>
<p>
- Manage your in-app products and price them for local markets accordingly.
- Offer weekly, monthly, annual, or seasonal subscriptions and take advantage
- of features such as grace periods and trials. <a href=
+ Manage your in-app products and price them for local markets.
+ Offer weekly, monthly, annual, or seasonal subscriptions. Attract new users
+ with features such as grace periods and trials. <a href=
"https://support.google.com/googleplay/android-developer/topic/3452896?ref_topic=3452890"
- class="external-link">Learn more.</a>
+ class="external-link">Learn more</a>.
</p>
<h3 id="pricing">Pricing and distribution</h3>
<p>
- Control the price of your app for each country you choose to distribute to.
- Make your app available to new audiences — opt-in to Android Auto, Android
+ Control the price of your app for each country that you distribute to.
+ Make your app available to new audiences—opt-in to Android Auto, Android
TV, and Android Wear, as well as Designed for Families, Google Play for Work,
and Google Play for Education. <a href=
"https://support.google.com/googleplay/android-developer/answer/113469#pricing"
class="external-link">Learn more</a>.
</p>
-<p class="external-link">
- <strong>Tip:</strong> You can set prices in other countries automatically
- based on current exchange rates using the <strong>auto-convert prices
- now</strong> feature.
+<p class="note">
+ <strong>Note:</strong> When you distribute your app to countries that use other currencies,
+ the Google Play Developer Console autofills country-specific prices based on current exchange
+ rates and locally-relevant pricing patterns. You can update the exchange rates manually by
+ selecting <strong>Refresh exchange rates</strong>.
</p>
<p style="clear:both">
diff --git a/docs/html/distribute/googleplay/families/faq.jd b/docs/html/distribute/googleplay/families/faq.jd
index 363dc91..663850f 100644
--- a/docs/html/distribute/googleplay/families/faq.jd
+++ b/docs/html/distribute/googleplay/families/faq.jd
@@ -10,7 +10,7 @@
font-weight:bold;
}
</style>
-
+
<div id="qv-wrapper">
<ol id="qv">
<h2>In this document</h2>
@@ -84,7 +84,7 @@
<dd>
No, you do not need to translate your privacy policy. However, if you
distribute your apps in a few select countries, it is advised that you do
- translate your privacy policy.
+ translate your privacy policy.
</dd>
<dt>
@@ -173,7 +173,7 @@
confirm that it is appropriate for families. Assuming your app complies with all program
requirements, we expect that publishing time should not take any longer
than normal; however, there may be a delay in publishing the app if it is
- rejected during the Designed for Families review.
+ rejected during the Designed for Families review.
</dd>
<dt>
@@ -301,7 +301,7 @@
<dd>
House ads are allowed, but they must comply with <a
- href="https://support.google.com/googleplay/android-developer/answer/6184502#ads">ads policies</a>.
+ href="https://support.google.com/googleplay/android-developer/answer/6184502#ads">ads policies</a>.
</dd>
<dt>
diff --git a/docs/html/distribute/googleplay/families/start.jd b/docs/html/distribute/googleplay/families/start.jd
index 0e773bd..f174dae 100644
--- a/docs/html/distribute/googleplay/families/start.jd
+++ b/docs/html/distribute/googleplay/families/start.jd
@@ -86,7 +86,7 @@
<p class="note">
<strong>Note</strong>: Published apps in the Designed for Families program
- are also available to all users on Google Play.
+ are also available to all users on Google Play.
</p>
<p>
diff --git a/docs/html/distribute/googleplay/tv.jd b/docs/html/distribute/googleplay/tv.jd
index a35edbc..981ba51 100644
--- a/docs/html/distribute/googleplay/tv.jd
+++ b/docs/html/distribute/googleplay/tv.jd
@@ -275,7 +275,7 @@
the criteria, you’ll receive a <strong>notification email sent to your developer account
address</strong>, with a summary of the areas that you need to address. When you’ve made
the necessary adjustments, you can upload a new version of your app to the Developer
- Console.
+ Console.
</p>
<p>
@@ -296,7 +296,7 @@
<li>
<em>Approved</em> — Your app was reviewed and approved. The app will be
- made available directly to Android TV users.
+ made available directly to Android TV users.
</li>
<li>
diff --git a/docs/html/distribute/monetize/_book.yaml b/docs/html/distribute/monetize/_book.yaml
index 2ebc695..974e9ed 100644
--- a/docs/html/distribute/monetize/_book.yaml
+++ b/docs/html/distribute/monetize/_book.yaml
@@ -16,3 +16,6 @@
- title: Purchasing
path: /distribute/monetize/payments.html
+
+- title: Drive Conversions
+ path: /distribute/monetize/conversions.html
diff --git a/docs/html/distribute/monetize/_project.yaml b/docs/html/distribute/monetize/_project.yaml
new file mode 100644
index 0000000..1936be2
--- /dev/null
+++ b/docs/html/distribute/monetize/_project.yaml
@@ -0,0 +1,6 @@
+name: "Earn"
+home_url: /distribute/monetize/
+description: "There are many ways to make money with your apps on Google Play, and we offer a variety of tools to make it easy."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/monetize/conversions.jd b/docs/html/distribute/monetize/conversions.jd
new file mode 100644
index 0000000..20b2333
--- /dev/null
+++ b/docs/html/distribute/monetize/conversions.jd
@@ -0,0 +1,100 @@
+page.title=Drive Conversions
+page.image=images/cards/card-drive-conversions_16-9_2x.png
+page.metaDescription=Discover where your users are coming from, drive engagement, and surface your in-app products to maximize your conversions.
+page.tags="conversions"
+
+@jd:body
+
+<div class="figure">
+ <img src="{@docRoot}images/cards/card-drive-conversions_16-9_2x.png">
+</div>
+
+<p>
+ Users who've made in-app purchases or converted in other ways are more likely
+ to do so again.
+ You can now easily discover where those users are coming from, drive engagement,
+ and surface your in-app products to maximize your conversions.
+</p>
+
+<div class="headerLine">
+ <h2 id="dicover">
+ Discover your most valuable channels
+ </h2>
+
+</div>
+
+<p>
+ From the <strong>User Acquisition</strong> page in the Google Play Developer Console, explore
+ how users convert into spenders across your acquisition channels and find the best prospects
+ for app install campaigns.
+</p>
+
+<p>For more information, view the guide on how to <a class="external-link"
+ href="https://support.google.com/googleplay/android-developer/answer/6263332">
+ measure your app's user acquisition</a> in the Google Play Developer Console Help Center.</p>
+
+</p>
+
+<div class="headerLine">
+ <h2 id="adwords">
+ Re-engage users with AdWords ads
+ </h2>
+
+</div>
+
+<p>
+ Bring users back to your app by creating an AdWords re-engagement campaign.
+ Use display and search ads that appear only to users who have installed your app.
+ Use deep links to bring them to where they'll find the content or actions they're
+ searching for.
+</p>
+
+<p>For more information, view the guide on <a class="external-link"
+ href="https://support.google.com/adwords/topic/3119078?hl=en">campaign settings</a> in the
+ AdWords Help Center.</p>
+
+<div class="headerLine">
+ <h2 id="gift-cards">
+ Drive spending with AdMob in-app purchase ads
+ </h2>
+</div>
+
+<p>Use your Google Analytics data to create Remarketing Audience lists for the high-value
+ users most likely to purchase products within your app. Then create an AdMob campaign that
+ targets these users to increase their awareness of your products.</p>
+
+<p>For more information, view the guide on how to <a class="external-link"
+ href="https://www.google.com/admob/promote.html">drive more in-app purchases and installs</a>
+ in the AdMob platform.</p>
+
+<div class="headerLine">
+ <h2 id="tips">
+ Tips
+ </h2>
+</div>
+<ul>
+<li>Add <a class="external-link"
+ href="https://developers.google.com/app-indexing/webmasters/app">deep links</a>
+ to your app so ads bring users directly to
+ conversion activities.</li>
+<li>Track what users do in your app by installing the
+ AdWords <a class="external-link"
+ href="https://developers.google.com/app-conversion-tracking">
+ Conversion Tracking SDK</a>.</li>
+<li>Link your Google Analytics and AdMob accounts to share audience lists.</li>
+<li>Make conversion ads compelling, such as promoting a booking search or
+ in-app product special offer.</li>
+<li>Use the AdMob Conversion Optimizer with existing campaigns. Predictions
+ are more accurate when there is more data to work with.</li>
+<li>Re-engage with your app's users across the Display Network with remarketing
+ lists in AdMob and with search keywords in AdWords.</li>
+</ul>
+
+
+<div class="headerLine"><h2 id="related-resources">Related resources</h2></div>
+
+<div class="resource-widget resource-flow-layout col-13"
+ data-query="collection:distribute/monetize/conversions"
+ data-sortOrder="-timestamp"
+ data-cardSizes="9x3"
+ data-maxResults="8"></div>
diff --git a/docs/html/distribute/monetize/monetize_toc.cs b/docs/html/distribute/monetize/monetize_toc.cs
index a3aa50f..b586633 100644
--- a/docs/html/distribute/monetize/monetize_toc.cs
+++ b/docs/html/distribute/monetize/monetize_toc.cs
@@ -34,6 +34,12 @@
</a>
</div>
</li>
+ <li class="nav-section">
+ <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/monetize/conversions.html">
+ <span class="en">Drive Conversions</span>
+ </a>
+ </div>
+ </li>
</ul>
@@ -44,4 +50,3 @@
changeNavLang(getLangPref());
//-->
</script>
-
diff --git a/docs/html/distribute/monetize/payments.jd b/docs/html/distribute/monetize/payments.jd
index 7d972bb..004e47e 100644
--- a/docs/html/distribute/monetize/payments.jd
+++ b/docs/html/distribute/monetize/payments.jd
@@ -15,36 +15,43 @@
instantly with a streamlined, consistent purchasing process and convenient
payment methods.
</p>
-
+<p><strong>Key facts</strong></p>
+<ul>
+<li>Direct carrier billing in over 35 countries.</li>
+<li>Google Play gift cards in over 25 countries.</li>
+<li>PayPal in over 20 countries.</li>
+<li>Developers can sell their apps from over 75 countries.</li>
+<li>Users can buy apps in over 135 countries.</li>
+</ul>
<div class="headerLine">
<h2 id="dcb">
- Direct Carrier Billing
+ Direct carrier billing
</h2>
</div>
<p>
- Users pay by charging their monthly carrier bills . The benefit of Direct
- Carrier Billing is that it opens up markets where credit cards are less
- common, as purchases are charged to your customers’ monthly mobile phone
+ Users pay by charging their monthly carrier bills. The benefit of direct
+ carrier billing is that it opens up markets where credit cards are less
+ common, as purchases are charged to your customers' monthly mobile phone
bills. This option is available to users in key markets
around the world. Many more will get the option in the months ahead.
</p>
<div class="headerLine">
<h2 id="credit">
- Credit Cards
+ Credit cards
</h2>
</div>
<p>
- Users can pay using any credit card that they’ve registered in Google Play.
- Credit Cards added to Google Play are stored in the user’s Google wallet and
- available for in-app purchases and instant buys too. To make it easy for
- users to get started, registration is offered as a part of the initial device
- setup process.
+ Users can pay using any credit card that they've registered in Google Play.
+ The credit cards that a user adds to Google Play are stored in the user's Google wallet.
+ They are available for in-app purchases and instant buys. It's easy for
+ users to get started, as the initial device setup process allows users to register a credit
+ card that they can use in Google Play.
</p>
<div class="headerLine">
@@ -62,16 +69,40 @@
<p>
Gift cards enable users to add value to their Google Play balance by entering
a unique code printed on a card purchased online or from major retailers.
- More information gift cards can be found <a href=
+ More information on gift cards can be found <a href=
"http://play.google.com/intl/en-US_us/about/giftcards/" target=
"_android">here</a>.
</p>
<p style="clear:both">
</p>
+
+<div class="headerLine">
+ <h2 id="paypal">
+ PayPal
+ </h2>
+
+
+</div>
+
+<div class="figure">
+ <img src="{@docRoot}images/paypal-logo.png">
+</div>
+
+<p>
+ Users with PayPal accounts can buy apps and digital content on Google Play using any
+ of their available payment methods. They sign into their PayPal account and
+ complete the purchase. The popularity of PayPal for payments on the web gives
+ you more customers.
+</p>
+
+<p style="clear:both">
+</p>
+
+
<div class="headerLine">
<h2 id="balance">
- Google Play Balance
+ Google Play balance
</h2>
@@ -95,14 +126,13 @@
The payment methods available to users may vary based on location, carrier
network, and other factors.
</p>
-
+
<p style="clear:both">
</p>
-<div class="headerLine"><h2 id="related-resources">Related Resources</h2></div>
+<div class="headerLine"><h2 id="related-resources">Related resources</h2></div>
<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/monetize/paymentmethods"
data-sortOrder="-timestamp"
data-cardSizes="9x3"
data-maxResults="8"></div>
-
diff --git a/docs/html/distribute/stories/_project.yaml b/docs/html/distribute/stories/_project.yaml
new file mode 100644
index 0000000..1c242bb
--- /dev/null
+++ b/docs/html/distribute/stories/_project.yaml
@@ -0,0 +1,6 @@
+name: "Stories"
+home_url: /distribute/stories/
+description: "Android developers, their apps, and their successes with Android and Google Play."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/stories/apps.jd b/docs/html/distribute/stories/apps.jd
index 9a642dc..76e9f5a 100644
--- a/docs/html/distribute/stories/apps.jd
+++ b/docs/html/distribute/stories/apps.jd
@@ -1,5 +1,4 @@
page.title=Developer Stories: Apps
-meta.tags="apps, developer story"
page.timestamp=1381449601
page.image=images/cards/distribute/stories/intuit-mint.png
page.metaDescription=How app developers are making use of localization, tablet features.
@@ -30,5 +29,5 @@
data-sortOrder="-timestamp"
data-cardSizes="6x6"
data-items-per-page="15"
- data-initial-results="3"></div>
+ data-initial-results="6"></div>
</div></section>
\ No newline at end of file
diff --git a/docs/html/distribute/stories/apps/aftenposten.jd b/docs/html/distribute/stories/apps/aftenposten.jd
new file mode 100644
index 0000000..149e6bb
--- /dev/null
+++ b/docs/html/distribute/stories/apps/aftenposten.jd
@@ -0,0 +1,80 @@
+page.title=Aftenposten Improves Retention by Allowing Readers to Customize Notifications
+page.metaDescription=Aftenposten upgraded their app and improved user retention.
+page.tags="developerstory", "apps", "googleplay"
+page.image=images/cards/distribute/stories/aftenposten.png
+page.timestamp=1468270114
+
+@jd:body
+
+<div class="figure" style="width:113px">
+ <img src="{@docRoot}images/distribute/stories/aftenposten-icon.png" height=
+ "106">
+</div>
+
+<h3>
+ Background
+</h3>
+
+<p>
+ Aftenposten is one of the largest newspapers in Norway. Their <a class=
+ "external-link" href=
+ "https://play.google.com/store/apps/details?id=no.cita&e=-EnableAppDetailsPageRedesign">
+ news app</a> was released on Android in 2013.
+</p>
+
+<p>
+ Aftenposten found that sending too many notifications, with no user control
+ over the default <em>on</em> setting or differentiation between general and
+ breaking news, caused many people to uninstall their app. They changed the
+ user controls for notifications and used the native Android share button in
+ the app, <strong>which reduced user uninstalls</strong>.
+</p>
+
+<h3>
+ What they did
+</h3>
+
+<p>
+ Aftenposten created a new onboarding flow that explained what notifications
+ were available, allowing readers to manage their preferences and customize up
+ to three topics. They also changed their custom share icon for the native
+ Android app.
+</p>
+
+<h3>
+ Results
+</h3>
+
+<p>
+ The results showed that with the new notifications management onboarding
+ screen, <strong>uninstalls decreased by 9.2% over 60 days</strong>. And with
+ the option to customize notifications, 51% of readers decided to keep two out
+ of three topics turned on. This led to a <strong>28% decrease over 60 days in
+ the number of users muting notifications completely</strong>. It also
+ provided insight into users’ content preferences, with <em>Sport</em> being
+ the least-favored notification.
+</p>
+
+<p>
+ Aftenposten also increased share interactions by 17% just by replacing their
+ custom share icon with the native Android share icon.
+</p>
+
+<p>
+ Aftenposten commented that: <em>Many of our users who see the onboarding
+ screen interact with it by turning off at least one notification topic. This
+ means that users are accepting push from one or more topics, instead of
+ turning it off completely. Moreover, readers are sharing more articles since
+ we added the standard share Android icon.</em>
+</p>
+
+<h3>
+ Get started
+</h3>
+
+<p>
+ Find out more about best practices for <a href=
+ "https://material.google.com/patterns/notifications.html">Notifications</a> and <a href=
+ "{@docRoot}training/building-content-sharing.html">Building Apps with Content
+ Sharing</a>.
+</p>
diff --git a/docs/html/distribute/stories/apps/el-mundo.jd b/docs/html/distribute/stories/apps/el-mundo.jd
new file mode 100644
index 0000000..2ee813d
--- /dev/null
+++ b/docs/html/distribute/stories/apps/el-mundo.jd
@@ -0,0 +1,73 @@
+page.title=El Mundo Improves User Ratings and Engagement with Material Design
+page.metaDescription=El Mundo uses Material Design principles to enhance their app's user experience.
+page.tags="developerstory", "apps", "googleplay"
+page.image=images/cards/distribute/stories/el-mundo.png
+page.timestamp=1468270112
+
+@jd:body
+
+<div class="figure" style="width:113px">
+ <img src="{@docRoot}images/distribute/stories/el-mundo-icon.png" height=
+ "113">
+</div>
+
+<h3>
+ Background
+</h3>
+
+<p>
+ <a class="external-link" href=
+ "https://play.google.com/store/apps/details?id=com.gi.elmundo.main">El
+ Mundo</a>, one of Spain’s largest newspapers, integrated material design
+ principles into their app, which helped increase their Google Play Store
+ rating and improve user engagement.
+</p>
+
+<h3>
+ What they did
+</h3>
+
+<p>
+ El Mundo decided to completely redesign their app to provide a higher quality
+ user experience, making it easier for their readers to engage with news
+ content. By implementing material design guidelines, they created a
+ consistent look and feel throughout their app.
+</p>
+
+<p>
+ After analyzing user comments, El Mundo discovered that readers considered
+ their app to be complicated and out-of-date. Therefore, they decided to
+ simplify the app’s functionality by removing features that were redundant.
+ They also removed sections of their app that were less relevant to their
+ readers, such as weather updates and movie trailers. Finally, they applied a
+ brand new internal development framework that they now use consistently
+ across all of their apps.
+</p>
+
+<h3>
+ Results
+</h3>
+
+<p>
+ Following the re-launch of their material design app, El Mundo saw a
+ <strong>45% increase in the weekly install rate</strong>. Readers now spend
+ more time in the app, with the average time spent in-app increasing from one
+ to three minutes.
+</p>
+
+<p>
+ Additionally, this redesign resulted in more readers providing positive
+ feedback around the new experience, increasing the app rating in the Google
+ Play store by 25.8%, from 3.1 to 3.9.
+</p>
+
+<h3>
+ Get started
+</h3>
+
+<p>
+ Learn how to integrate <a class="external-link" href=
+ "https://material.google.com">Material Design</a> guidelines and follow
+ <a class="external-link" href="https://design.google.com">design
+ principles</a> for your app.
+</p>
diff --git a/docs/html/distribute/stories/apps/segundamano.jd b/docs/html/distribute/stories/apps/segundamano.jd
new file mode 100644
index 0000000..4cbf817
--- /dev/null
+++ b/docs/html/distribute/stories/apps/segundamano.jd
@@ -0,0 +1,63 @@
+page.title=Segundamano Develops Android-First as Its Fastest Channel for Growth
+page.metaDescription=Segundamano developed Android app to increase potential for growth.
+page.tags="developerstory", "apps", "googleplay"
+page.image=images/cards/distribute/stories/segundamano.png
+page.timestamp=1468270110
+
+@jd:body
+
+<div class="figure" style="width:113px">
+ <img src="{@docRoot}images/distribute/stories/segundamano-icon.png" height=
+ "113">
+</div>
+
+<h3>
+ Background
+</h3>
+
+<p>
+ <a class="external-link" href=
+ "https://play.google.com/store/apps/details?id=mx.segundamano.android">Segundamano</a>
+ is a leading shopping application in Mexico for second-hand products. They
+ started by placing classified ads in newspapers, progressed to desktop, and
+ over the past year have seen significant growth in mobile, which now accounts
+ for 70% of their business. They have also seen <strong>270% year-over-year
+ growth on the Android platform alone</strong>.
+</p>
+
+<h3>
+ What they did
+</h3>
+
+<p>
+ Segundamano shifted focus to mobile with their Android app because of the
+ high potential for growth. From July 2015 to January 2016, they saw an
+ increase of 55% in the number of classified ads on Android, higher than any
+ other platform. To leverage this momentum, Segundamano implemented two new
+ features on Android: premium offers and push notifications. Segundamano also
+ decided to implement material design in order to improve the in-app
+ experience and streamline the sales process for users.
+</p>
+
+<h3>
+ Results
+</h3>
+
+<p>
+ Following Segundamano’s enhancements to the user experience, they've seen an
+ increase in their star rating, a 4.7% lift in monthly active users, and a 7%
+ increase in sales of premium listings. Additionally, year-to-date, their
+ <strong>installs are over seven times higher on Android than on other
+ platforms</strong>.
+</p>
+
+<h3>
+ Get started
+</h3>
+
+<p>
+ Learn more about simplifying your in-app experience with <a href=
+ "{@docRoot}guide/topics/ui/notifiers/notifications.html">Notifications</a>
+ and the <a href="{@docRoot}design/material/index.html">material design
+ guidelines</a>.
+</p>
\ No newline at end of file
diff --git a/docs/html/distribute/stories/apps/tapps.jd b/docs/html/distribute/stories/apps/tapps.jd
new file mode 100644
index 0000000..1292139
--- /dev/null
+++ b/docs/html/distribute/stories/apps/tapps.jd
@@ -0,0 +1,366 @@
+page.title=Tapps Games Increases Installs by More Than 20% with Store Listing Experiments
+page.metaDescription=Tapps Games increased their use of store listing experiments in the Developer Console, with impressive results.
+page.tags="developerstory", "apps", "googleplay"
+page.image=images/cards/distribute/stories/tapps.png
+page.timestamp=1468270108
+
+@jd:body
+
+<style type="text/css">
+ span.positive{
+ color:green;
+ font-size: 125%;
+ font-weight:bold;">
+ }
+ span.negative{
+ color:red;
+ font-size: 125%;
+ font-weight:bold;">
+ }
+</style>
+
+<div class="figure" style="width:215px">
+ <img src="{@docRoot}images/distribute/stories/tapps-logo.png" height="65">
+</div>
+
+<h3>
+ Background
+</h3>
+
+<p>
+ <a class="external-link" href=
+ "https://play.google.com/store/apps/dev?id=6615809648420562690">Tapps</a> is
+ a mobile game publisher in São Paulo, Brazil. With a mission of <em>creating
+ fun for everyone</em>, Tapps has a portfolio of over 200 titles on the Google
+ Play Store, with roughly 70% of their installs coming from Android. Store
+ listing experiments have provided invaluable metrics to help their growing
+ team understand what makes the most effective product listings.
+</p>
+
+<h3>
+ What they did
+</h3>
+
+<p>
+ Tapps has increased their use of store listing experiments in the Developer
+ Console. They recently expanded their marketing team to allocate greater time
+ and designated resources to the Developer Console tools. <strong>"We can’t
+ stress enough how much value the store listing experiments have brought us
+ over the past months. Right now, our marketing team has a substantial time
+ allocated to these tests every week,"</strong> said Felipe Watanabe, head of
+ marketing at Tapps. With icons and screenshots, Tapps tested variations in
+ color, character positioning, and the overall amount of graphic detail. In
+ the description tests, they found that shorter messages with clear calls to
+ action and appropriate language localizations were most successful.
+</p>
+
+<h3>
+ Results
+</h3>
+
+<p>
+ By frequently conducting store listing experiments, Tapps gained valuable
+ insights that they have applied across their greater portfolio of games.
+ Results showed that shortening messaging, using contrasting colors,
+ reordering screenshots, and simplifying graphics often led to variant results
+ representing an average increase in performance between 5% and 50%. After
+ making changes based on the test results, Tapps saw <strong>install rates
+ increase beyond 20-30%</strong>.
+</p>
+
+<h4>
+ Screen tests
+</h4>
+
+<p>
+ The following table compares the install rates for three apps based on
+ changes to each app's screenshot.
+</p>
+
+<p class="table-caption">
+ <strong>Table 1</strong>. Screen test results
+</p>
+
+<table>
+ <tr>
+ <th>
+ Original
+ </th>
+ <th>
+ Variant
+ </th>
+ <th>
+ Variant results
+ </th>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-screen-orig-3.png"
+ width="240">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-screen-var-3.png"
+ width="240">
+ </td>
+ <td>
+ <span class="positive">+25%</span>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-screen-orig-1.png"
+ width="240">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-screen-var-1.png"
+ width="240">
+ </td>
+ <td>
+ <span class="positive">+17.1%</span>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-screen-orig-2.png"
+ width="240">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-screen-var-2.png"
+ width="240">
+ </td>
+ <td>
+ <span class="positive">+7.4%</span>
+ </td>
+ </tr>
+
+</table>
+
+<h4>
+ Icon tests
+</h4>
+
+<p>
+ The following tables compare install rates for three apps based on changes
+ to each app's icon.
+</p>
+
+<p class="table-caption">
+ <strong>Table 2</strong>. Icon 1 test results
+</p>
+
+<table>
+ <tr>
+ <th>
+ Original
+ </th>
+ <th>
+ Variant 1
+ </th>
+ <th>
+ Variant 2
+ </th>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-orig-1.png">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-var-1.png">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-var-1-2.png">
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ ---
+ </td>
+ <td>
+ <span class="negative">-29.6%</span>
+ </td>
+ <td>
+ <span class="positive">+20.8%</span>
+ </td>
+ </tr>
+</table>
+
+<p class="table-caption">
+ <strong>Table 3</strong>. Icon 2 test results
+</p>
+
+<table>
+ <tr>
+ <th>
+ Original
+ </th>
+ <th>
+ Variant 1
+ </th>
+ <th>
+ Variant 2
+ </th>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-orig-2.png">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-var-2.png">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-var-2-2.png">
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ ---
+ </td>
+ <td>
+ <span class="positive">+5.1%</span>
+ </td>
+ <td>
+ <span class="positive">+19.7%</span>
+ </td>
+ </tr>
+</table>
+
+<p class="table-caption">
+ <strong>Table 4</strong>. Icon 3 test results
+</p>
+
+<table>
+ <tr>
+ <th>
+ Original
+ </th>
+ <th>
+ Variant 1
+ </th>
+ <th>
+ Variant 2
+ </th>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-orig-3.png">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-var-3.png">
+ </td>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-icon-var-3-2.png">
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ ---
+ </td>
+ <td>
+ <span class="negative">-17.7%</span>
+ </td>
+ <td>
+ <span class="positive">+50.7%</span>
+ </td>
+ </tr>
+</table>
+
+<h4>
+ Description tests
+</h4>
+
+<p>
+ The following table compares install rates for three apps based on changes to
+ each app's description text.
+</p>
+
+<p class="table-caption">
+ <strong>Table 5</strong>. Description test results
+</p>
+
+<table>
+ <tr>
+ <th>
+ Game
+ </th>
+ <th>
+ Original
+ </th>
+ <th>
+ Variant
+ </th>
+ <th>
+ Variant results
+ </th>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-logic-pic.png">
+ <strong>Logic Pic</strong>
+ </td>
+ <td>
+ <em>"Use logic to solve fun puzzles and discover hidden pictures! Logic
+ Pic is free!"</em>
+ </td>
+ <td>
+ <strong><em>"Discover all the hidden pictures in this challenging classic
+ japanese puzzle!"</em></strong>
+ </td>
+ <td>
+ <span class="positive">+10.7%</span>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-candy-hills.png"
+ width="96"> <strong>Candy Hills</strong>
+ </td>
+ <td>
+ <em>"What will your candy park look like? Build it now in Candy
+ Hills!"</em>
+ </td>
+ <td>
+ <strong><em>"Build your own sweet candy park in Candy
+ Hills!"</em></strong>
+ </td>
+ <td>
+ <span class="positive">+8.2%</span>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="{@docRoot}images/distribute/stories/tapps-villains-corp.png"
+ width="96"> <strong>Villains Corp.</strong>
+ </td>
+ <td>
+ <em>"Be a real villain and CONQUER THE WORLD!"</em>
+ </td>
+ <td>
+ <strong><em>"Mwahahaha! Be a real villain and CONQUER THE
+ WORLD!"</em></strong>
+ </td>
+ <td>
+ <span class="positive">+6.8%</span>
+ </td>
+ </tr>
+</table>
+
+<h3>
+ Get started
+</h3>
+
+<p>
+ Find out more about <a href=
+ "{@docRoot}distribute/users/experiments.html">store listing experiments</a>.
+</p>
diff --git a/docs/html/distribute/stories/apps/upbeat-games.jd b/docs/html/distribute/stories/apps/upbeat-games.jd
new file mode 100644
index 0000000..02222d3
--- /dev/null
+++ b/docs/html/distribute/stories/apps/upbeat-games.jd
@@ -0,0 +1,69 @@
+page.title=Witch Puzzle Achieves 98% of International Installs on Android
+page.metaDescription=Witch Puzzle localized their app into 12 languages.
+page.tags="developerstory", "apps", "googleplay"
+page.image=images/cards/distribute/stories/witch-puzzle.png
+page.timestamp=1468270106
+
+@jd:body
+
+
+<div class="figure">
+ <img src="{@docRoot}images/distribute/stories/witch-puzzle-icon.png"
+ width="113">
+</div>
+
+<h3>
+ Background
+</h3>
+
+<p>
+ Located in São Paulo, Brazil, <a class="external-link" href=
+ "https://play.google.com/store/apps/dev?id=8995071809141037139">Upbeat
+ Games</a> is an indie game developer with a mission to build fun and easy
+ games that anyone can play. As a small team, the Upbeat crew reacted quickly
+ to their game’s growing installs in Asian countries, and is now seeing strong
+ international growth with their game <a class="external-link" href=
+ "https://play.google.com/store/apps/details?id=com.upbeatgames.witchpuzzle">Witch
+ Puzzle</a>.
+</p>
+
+<h3>
+ What they did
+</h3>
+
+<p>
+ After noticing that Witch Puzzle was gaining traction throughout Asia, Upbeat
+ localized their game into 12 languages, prioritizing countries with an
+ existing user base and high gross national income (GNI). This led to a direct
+ increase in installs.
+</p>
+
+<div class="figure">
+ <img src="{@docRoot}images/distribute/stories/japanese-witch-puzzle.png"
+ width="214">
+ <p class="img-caption">
+ Japanese version of Witch Puzzle
+ </p>
+</div>
+
+<h3>
+ Results
+</h3>
+
+<p>
+ “In the last three months, 98% of our international installs for Witch Puzzle
+ came from Android,” said Vinicius Sormani Heimbeck, Upbeat’s founder. Upbeat
+ applied these learnings across their portfolio of games. Now, <strong>75% of
+ their portfolio’s revenue is driven by Android</strong>.
+</p>
+
+<h3>
+ Get started
+</h3>
+
+<p>
+ Use the <a href=
+ "{@docRoot}distribute/tools/localization-checklist.html">Localization
+ Checklist</a> to learn more about tailoring your app for different markets to
+ drive installs and revenue, and to create a better overall user experience.
+</p>
diff --git a/docs/html/distribute/stories/games.jd b/docs/html/distribute/stories/games.jd
index fe059eb..daaac0d 100644
--- a/docs/html/distribute/stories/games.jd
+++ b/docs/html/distribute/stories/games.jd
@@ -1,5 +1,4 @@
page.title=Developer Stories: Games
-meta.tags="google play, games, global, developer story"
page.timestamp=1381449601
page.image=/images/distribute/glu-ew-gpgames.jpg
page.metaDescription=How game studios are using Google Play game services to deliver new gaming experiences for their users.
diff --git a/docs/html/distribute/tools/_project.yaml b/docs/html/distribute/tools/_project.yaml
new file mode 100644
index 0000000..a034ede
--- /dev/null
+++ b/docs/html/distribute/tools/_project.yaml
@@ -0,0 +1,6 @@
+name: "Tools & Reference"
+home_url: /distribute/tools/
+description: "Here you'll find resources to help you publish your apps and games, acquire users, and monetize your investment."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/tools/promote/device-art.jd b/docs/html/distribute/tools/promote/device-art.jd
index 9b4dd14..7fef02f 100644
--- a/docs/html/distribute/tools/promote/device-art.jd
+++ b/docs/html/distribute/tools/promote/device-art.jd
@@ -221,7 +221,7 @@
landOffset: [489,327],
portRes: ['shadow', 'back', 'fore'],
portOffset: [327,489],
- portSize: [1440, 2560],
+ portSize: [1440, 2560],
archived: true
},
{
diff --git a/docs/html/distribute/tools/promote/linking.jd b/docs/html/distribute/tools/promote/linking.jd
index 025480b..13b1574 100644
--- a/docs/html/distribute/tools/promote/linking.jd
+++ b/docs/html/distribute/tools/promote/linking.jd
@@ -18,7 +18,7 @@
<p>Google Play provides several link formats that let you bring users to your
products in the way you want, from Android apps, web pages, ads, reviews,
-articles, social media posts, and more.</p>
+articles, social media posts, and more.</p>
<p>The link formats let you:</p>
<ul>
diff --git a/docs/html/distribute/users/_project.yaml b/docs/html/distribute/users/_project.yaml
new file mode 100644
index 0000000..cd7083e
--- /dev/null
+++ b/docs/html/distribute/users/_project.yaml
@@ -0,0 +1,6 @@
+name: "Get Users"
+home_url: /distribute/users/
+description: "There are some common themes from successful Google Play developers. These best practices are critical to your app or game's success."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /distribute/_project.yaml
diff --git a/docs/html/distribute/users/promote-with-ads.jd b/docs/html/distribute/users/promote-with-ads.jd
index 2db4ca3..d99f449 100644
--- a/docs/html/distribute/users/promote-with-ads.jd
+++ b/docs/html/distribute/users/promote-with-ads.jd
@@ -6,20 +6,27 @@
<p>Users have a huge amount of choice when it comes to which apps they install and
use, so it’s important to actively find new ways to promote your app and drive
-ongoing engagement. AdWords is a powerful and effective way to do both.</p>
+ongoing engagement. AdWords campaigns, which you create in the
+<a href="http://play.google.com/apps/publish">Google Play Developer Console</a>,
+are a powerful and effective way to do both.</p>
-<h2 id=drive_installs>Drive installs</h2>
+<h2 id="drive_installs">Drive installs with universal app campaigns</h2>
-<p><a href="http://adwords.google.com">AdWords</a> promotes your app to interested
-users where they spend time on phones and
-tablets – with app install ads on Google Search, YouTube, Gmail, and within
-apps and across the web on the Google Display Network. AdWords is a powerful
-way to scale app promotion across Google networks and find customers that are
-most likely to install your app. </p>
+<p><a href="http://adwords.google.com">AdWords</a> is a powerful way to scale
+app promotion across Google networks and find customers who are most likely to
+install your app. AdWords promotes your app to interested users where they spend
+time on phones and tablets – with app install ads on Google Play, Google Search,
+YouTube, Gmail, and within apps and across the web.</p>
-<p><a href="https://support.google.com/adwords/answer/6032059">Get started with AdWords
-app install ads</a>.</p>
+<p>By creating a <em>universal app camapign</em>, you can reach all of these
+networks. This type of campaign allocates ads, bids, and budgets automatically,
+making it easier to improve install volume for your app.</p>
+
+<p>To learn more about creating universal ad campaigns, read the article about
+<a class="external-link" href="https://support.google.com/googleplay/android-developer/answer/6262700">creating
+an AdWords campaign for your app</a> in the Google Play Developer Console Help
+Center.</p>
<div class="wrap">
<div class="cols" style="margin-top:1em;">
@@ -27,18 +34,16 @@
<h3>
From Google Play
</h3>
- <img src="/images/distribute/promote_ads_play.png">
+ <img src="{@docRoot}images/distribute/promote_ads_play.png">
<p class="figure-caption">
- Promote your app on Google Play when users are searching and browsing
- for apps.
+ Reach users as they search for apps and games on Google Play.
</p>
</div>
-
<div class="col-4of12">
<h3>
- From search
+ From Google Search
</h3>
- <img src="/images/distribute/promote_ads_search.png">
+ <img src="{@docRoot}images/distribute/promote_ads_search.png">
<p class="figure-caption">
Connect with users as they search for content and services provided by
your app.
@@ -49,47 +54,32 @@
<h3>
From YouTube
</h3>
- <img src="/images/distribute/promote_ads_youtube.png">
+ <img src="{@docRoot}images/distribute/promote_ads_youtube.png">
<p class="figure-caption">
Promote your app when users are watching related videos.
</p>
</div>
- </div>
-</div>
-<div class="wrap">
- <div class="cols" style="margin-top:1em;">
<div class="col-4of12">
<h3>
From apps
</h3>
- <img src="/images/distribute/promote_ads_apps.png">
+ <img src="{@docRoot}images/distribute/promote_ads_apps.png">
<p class="figure-caption">
Reach users while they’re engaged with apps and games across the AdMob
network.
</p>
</div>
-
<div class="col-4of12">
<h3>
From the web
</h3>
- <img src="/images/distribute/promote_ads_web.png">
+ <img src="{@docRoot}images/distribute/promote_ads_web.png">
<p class="figure-caption">
Reach users while they’re engaged with websites across the Google
Display Network.
</p>
</div>
-
- <div class="col-4of12">
- <h3>
- From Gmail
- </h3>
- <img src="/images/distribute/promote_ads_gmail.png">
- <p class="figure-caption">
- Promote your app while users communicate and get things done in Gmail.
- </p>
- </div>
</div>
</div>
@@ -130,77 +120,7 @@
</li>
</ul>
-<h2 id="engage_with_users">
- Engage with users
-</h2>
-
-<p>
- Getting a user to install an app is one thing, but you'll also want them to
- open it regularly. AdWords offers app re-engagement tools to help your app
- stay in mind with users who’ve already installed it on their phone. AdWords
- can remind them of key features and encourage them to try your app again, or
- help them complete an activity they didn't know your app could handle.
-</p>
-
-<div class="wrap">
- <div class="cols" style="margin-top:1em;">
- <div class="col-4of12">
- <h3>
- From search
- </h3>
- <img src="/images/distribute/promote_ads.png">
- <p class="figure-caption">
- Add deep links to your app, then bring users straight to relevant app
- content when they’re searching.
- </p>
- </div>
-
- <div class="col-4of12">
- <h3>
- From apps
- </h3>
- <img src="/images/distribute/promote_ads_inapp.png">
- <p class="figure-caption">
- Use remarketing and deep links to bring users to just the right place
- in your app to re-engage and convert, from other apps and games they
- love.
- </p>
- </div>
- </div>
-</div>
-
-<h3>
- Tips
-</h3>
-
-<ul>
- <li>Track what users do in your app after they’ve clicked an ad, by
- installing the AdWords <a href=
- "https://developers.google.com/app-conversion-tracking/">conversion tracking
- SDK</a>.
- </li>
-
- <li>Advertise a compelling reason for users to re-engage with your app (such
- as a reminder or a special offer).
- </li>
-
- <li>
- <a href="https://developers.google.com/app-indexing/webmasters/app">Add
- deep links</a> to your app that’ll take users directly to the parts of your
- app that will be most relevant and interesting to them, where they can
- easily take action.
- </li>
-
- <li>Re-engage your app users across the display network with remarketing
- lists and search with keywords.
- </li>
-
- <li>Use remarketing lists to target high value users so that you can drive
- more conversions in your app.
- </li>
-</ul>
-
-<h2 id="related-resources">Related Resources</h2>
+<h2 id="related-resources">Related resources</h2>
<div class="resource-widget resource-flow-layout col-13"
data-query="collection:distribute/users/promotewithads"
diff --git a/docs/html/google/_project.yaml b/docs/html/google/_project.yaml
new file mode 100644
index 0000000..051e6bc
--- /dev/null
+++ b/docs/html/google/_project.yaml
@@ -0,0 +1,5 @@
+name: "Google Services"
+home_url: /google/
+description: "Take advantage of the latest Google technologies through a single set of APIs, delivered across Android devices worldwide as part of Google Play services."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/google/backup/signup.jd b/docs/html/google/backup/signup.jd
index 598003d..86518b6 100644
--- a/docs/html/google/backup/signup.jd
+++ b/docs/html/google/backup/signup.jd
@@ -105,7 +105,7 @@
8.4 You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright, trade mark notices) which may be affixed to or contained within the Service.
<h3>9. License from Google</h3>
-9.1 Subject to terms and conditions of these Terms, Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the Service as provided to you by Google. This license is for the sole purpose of enabling you to use and enjoy the benefit of the Service as provided by Google, in the manner permitted by the Terms.
+9.1 Subject to terms and conditions of these Terms, Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the Service as provided to you by Google. This license is for the sole purpose of enabling you to use and enjoy the benefit of the Service as provided by Google, in the manner permitted by the Terms.
9.2 You may not (and you may not permit anyone else to) copy, modify, create a derivative work of, reverse engineer, decompile or otherwise attempt to extract the source code from the Service or any part thereof, unless this is expressly permitted or required by law, or unless you have been specifically told that you may do so by Google, in writing.
@@ -208,7 +208,7 @@
<input id="pname" type="text" name="pname" size="47" value="" onkeyup="onFormInput()"
onfocus="boxFocusChanged(this,true)" onblur="boxFocusChanged(this,false)"/>
</p>
-<p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="registerButton"
+<p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="registerButton"
onclick="onRegister(); return false;" >Register with Android Backup Service</a></p>
</div>
@@ -234,7 +234,7 @@
);
}
}
-
+
function boxFocusChanged(obj, focused) {
if (focused) {
if(obj.value == DEFAULT_TEXT){
@@ -248,14 +248,14 @@
}
}
}
-
-
+
+
function onFormInput() {
/* verify that the TOS is agreed and a bit version is chosen */
var packagename = $("#pname").val();
if ($("input#agree").is(":checked")
&& packagename.length
- && packagename != DEFAULT_TEXT) {
+ && packagename != DEFAULT_TEXT) {
/* reveal the button */
$("a#registerButton").removeClass('disabled');
} else {
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 027ba23..9b7ff0b 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -53,7 +53,7 @@
<section class="dac-section dac-invert dac-darken-bg" style="background-image: url(/images/distribute/google-play-bg.jpg)"><div class="wrap">
<h1 class="dac-section-title">Google Play developer tools</h1>
<div class="dac-section-subtitle">
- Scale your publishing, manage your catalog, build revenue using Google Play developer tools.
+ Scale your publishing, manage your catalog, build revenue using Google Play developer tools.
</div>
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:google/landing/googleplay"
diff --git a/docs/html/google/play/billing/api.jd b/docs/html/google/play/billing/api.jd
index 6816ff1..62f3367 100644
--- a/docs/html/google/play/billing/api.jd
+++ b/docs/html/google/play/billing/api.jd
@@ -34,7 +34,7 @@
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}training/in-app-billing/index.html">Selling In-app Products</a></li>
- </ol>
+ </ol>
</div>
</div>
diff --git a/docs/html/google/play/billing/billing_admin.jd b/docs/html/google/play/billing/billing_admin.jd
index 05f3ad5..292cfcc 100644
--- a/docs/html/google/play/billing/billing_admin.jd
+++ b/docs/html/google/play/billing/billing_admin.jd
@@ -748,10 +748,9 @@
intent.</p>
<p class="note">
- <strong>Note:</strong> When a user completes a test purchase, the
- <code>orderId</code> field remains blank. To track test transactions, use
- the <code>purchaseToken</code> field instead. For more information about
- working with test purchases, see <a
+ <strong>Note:</strong> Test purchases don't have an <code>orderId</code>
+ field. To track test transactions, you use the <code>purchaseToken</code>
+ field instead. For more information about working with test purchases, see <a
href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
Billing</a>.
</p>
@@ -766,14 +765,14 @@
<p>For transactions dated 5 December 2012 or later, Google payments assigns a
Merchant Order Number (rather than a Google Order Number) and reports the Merchant
-Order Number as the value of <code>orderID</code>. Here's an
+Order Number as the value of <code>orderId</code>. Here's an
example:</p>
<pre>"orderId" : "GPA.1234-5678-9012-34567"</pre>
<p>For transactions dated previous to 5 December 2012, Google checkout assigned
a Google Order Number and reported that number as the value of
-<code>orderID</code>. Here's an example of an <code>orderID</code> holding a
+<code>orderId</code>. Here's an example of an <code>orderId</code> holding a
Google Order Number:</p>
<pre>"orderId" : "556515565155651"</pre>
diff --git a/docs/html/google/play/billing/billing_integrate.jd b/docs/html/google/play/billing/billing_integrate.jd
index e666bc6..5d6b3a8 100755
--- a/docs/html/google/play/billing/billing_integrate.jd
+++ b/docs/html/google/play/billing/billing_integrate.jd
@@ -90,7 +90,7 @@
<li>Select <strong>Google Play Billing Library</strong>.</li>
<li>Click <strong>Install packages</strong> to complete the download.</li>
</ol>
-<p>The {@code IInAppBillingService.aidl} file will be installed to {@code <sdk>/extras/google/play_billing/}.</p>
+<p>The {@code IInAppBillingService.aidl} file will be installed to {@code <sdk>/extras/google/play_billing/}.</p>
<p>To add the AIDL to your project:</p>
@@ -116,7 +116,7 @@
<strong>OK</strong>.</li>
<li>Using your operating system file explorer, navigate to
- {@code <sdk>/extras/google/play_billing/}, copy the
+ {@code <sdk>/extras/google/play_billing/}, copy the
{@code IInAppBillingService.aidl} file, and paste it into the
{@code com.android.vending.billing} package in your project.
</li>
diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd
index a05cc8d..7d932b7 100644
--- a/docs/html/google/play/billing/billing_overview.jd
+++ b/docs/html/google/play/billing/billing_overview.jd
@@ -7,19 +7,20 @@
<div id="qv">
<h2>Quickview</h2>
<ul>
- <li>Use In-app Billing to sell digital goods, including one-time items and
+ <li>Use In-app Billing to sell digital products, including one-time products and
recurring subscriptions.</li>
- <li>Supported for any app published on Google Play. You only need a Google
+ <li>In-app Billing is supported for any app published on Google Play. You need only a
+ Google
Play Developer Console account and a Google payments merchant account.</li>
- <li>Checkout processing is automatically handled by Google Play, with the
-same look-and-feel as for app purchases.</li>
+ <li>Google Play automatically handles checkout processing with the
+same look and feel as app purchases.</li>
</ul>
<h2>In this document</h2>
<ol>
<li><a href="#api">In-app Billing API</a></li>
<li><a href="#products">In-app Products</a>
<ol>
- <li><a href="#prodtypes">Product Types</a>
+ <li><a href="#prodtypes">Product types</a>
</ol>
</li>
<li><a href="#console">Google Play Developer Console</a></li>
@@ -27,30 +28,33 @@
<li><a href="#samples">Sample App</a></li>
<li><a href="#migration">Migration Considerations</a></li>
</ol>
- <h2>Related Samples</h2>
+ <h2>Related samples</h2>
<ol>
<li><a href="{@docRoot}training/in-app-billing/preparing-iab-app.html#GetSample">Sample
Application (V3)</a></li>
</ol>
- <h2>Related Videos</h2>
+ <h2>Related videos</h2>
<ol>
- <li><a href="https://www.youtube.com/watch?v=UvCl5Xx7Z5o">Implementing
+ <li><a class="external-link" href="https://www.youtube.com/watch?v=UvCl5Xx7Z5o">
+ Implementing
Freemium</a></li>
</ol>
</div>
</div>
-<p>This documentation describes the fundamental In-app Billing components and
+<p>This document describes the fundamental In-app Billing components and
features that you need to understand in order to add In-app
Billing features into your application.</p>
-<p class="note"><b>Note</b>: Ensure that you comply with applicable laws in the countries where you
-distribute apps. For example, in EU countries, laws based on the
-<a href="http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2005:149:0022:0039:EN:PDF">
-Unfair Commercial Practices Directive</a> prohibit direct exhortations to children to buy advertised
-products or to persuade their parents or other adults to buy advertised products for them.
-See the
-<a href="http://ec.europa.eu/consumers/enforcement/docs/common_position_on_online_games_en.pdf">
+<p class="note"><b>Note</b>: Ensure that you comply with applicable laws in the countries where
+ you distribute apps. For example, in EU countries, laws based on the
+<a class="external-link"
+ href="http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2005:149:0022:0039:EN:PDF">
+Unfair Commercial Practices Directive</a> prohibit direct exhortations to children to buy
+ advertised products or to persuade their parents or other adults to buy advertised products
+ for them. See the
+<a class="external-link"
+ href="http://ec.europa.eu/consumers/enforcement/docs/common_position_on_online_games_en.pdf">
position of the EU consumer protection authorities</a> for more information on this and other
topics.
</p>
@@ -61,75 +65,82 @@
app then conveys billing requests and responses between your
application and the Google Play server. In practice, your application never
directly communicates with the Google Play server. Instead, your application
-sends billing requests to the Google Play application over interprocess
+sends billing requests to the Google Play app over interprocess
communication (IPC) and receives responses from the Google Play app.
Your application does not manage any network connections between itself and
the Google Play server.</p>
-<p>In-app Billing can be implemented only in applications that you publish
+<p>You can implement In-app Billing only in applications that you publish
through Google Play. To complete in-app purchase requests, the Google Play app
must be able to access the Google Play server over the network.</p>
-<p>In-app billing Version 3 is the latest version, and maintains very broad
+<p>In-app Billing Version 3 is the latest version, and it maintains very broad
compatibility across the range of Android devices. In-app Billing Version 3 is
-supported on devices running Android 2.2 or higher that have the latest version
-of the Google Play store installed (<a
+supported on devices running Android 2.2 (API level 8) or higher that have the latest version
+of the Google Play app installed (<a
href="{@docRoot}about/dashboards/index.html">a vast majority</a> of active
devices).</p>
<h4>Version 3 features</h4>
+<p>In-app Billing Version 3 provides the following features:</p>
<ul>
-<li>Requests are sent through a streamlined API that allows you to easily request
-product details from Google Play, order in-app products, and quickly restore
-items based on users' product ownership</li>
-<li>Order information is synchronously propagated to the device on purchase
-completion</li>
-<li>All purchases are “managed” (that is, Google Play keeps track of the user's
-ownership of in-app products). The user cannot own multiple copies of an in-app
-item; only one copy can be owned at any point in time</li>
-<li>Purchased items can be consumed. When consumed, the item reverts to the
-"unowned" state and can be purchased again from Google Play</li>
-<li>Provides support for <a
- href="{@docRoot}google/play/billing/billing_subscriptions.html">subscriptions</a></li>
+<li>Your app sends requests through a streamlined API that allows users to easily request
+product details from Google Play and order in-app products. The API quickly restores
+products based on the user's ownership.</li>
+<li>The API synchronously propagates order information to the device on purchase
+completion.</li>
+<li>All purchases are <em>managed</em> (that is, Google Play keeps track of the user's
+ownership of in-app products). The user can't own multiple copies of an in-app
+product; only one copy can be owned at any point in time.</li>
+<li>Purchased products can be consumed. When consumed, the product reverts to the
+<em>unowned</em> state and can be purchased again from Google Play.</li>
+<li>The API provides support for <a
+ href="{@docRoot}google/play/billing/billing_subscriptions.html">subscriptions</a>.</li>
</ul>
<p>For details about other versions of In-app Billing, see the
<a href="{@docRoot}google/play/billing/versions.html">Version Notes</a>.</p>
<h2 id="products">In-app Products</h2>
-<p>In-app products are the digital goods that you offer for sale from inside your
-application to users. Examples of digital goods includes in-game currency,
+<p>In-app products are the digital products that you offer for sale to users from inside your
+application. Examples of digital products include in-game currency,
application feature upgrades that enhance the user experience, and new content
for your application.</p>
<p>You can use In-app Billing to sell only digital content.
-You cannot use In-app Billing to sell physical goods, personal services, or
-anything that requires physical delivery. Unlike with priced applications, once
-the user has purchased an in-app product there is no refund window.</p>
+You can't use In-app Billing to sell physical products, personal services, or
+anything that requires physical delivery. Unlike with priced applications, there is no refund
+ window after
+the user has purchased an in-app product.</p>
<p>Google Play does not provide any form of content delivery. You are
responsible for delivering the digital content that you sell in your
-applications. In-app products are always explicitly associated with one and
-only one app. That is, one application cannot purchase an in-app product
-published for another app, even if they are from the same developer.</p>
+applications. In-app products are always explicitly associated with
+ only one app. That is, one application can't purchase an in-app product
+that is published for another app, even if they are from the same developer.</p>
<h3 id="prodtypes">Product types</h3>
<p>In-app Billing supports different product types to give you flexibility in
how you monetize your application. In all cases, you define your products using
the Google Play Developer Console.</p>
-<p>You can specify these types of products for your In-app Billing application
-— <em>managed in-app products</em> and <em>subscriptions</em>. Google Play
-handles and tracks ownership for in-app products and subscriptions on your
-application on a per user account basis.
-<a href="{@docRoot}google/play/billing/api.html#producttypes">Learn more about
-the product types supported by In-app Billing Version 3</a>.</p>
+<p>You can specify two product types for your In-app Billing application:
+ <em>managed in-app products</em> and <em>subscriptions</em>. Google Play
+handles and tracks ownership for in-app products and subscriptions for your
+application on a per-user basis.
+<a href="{@docRoot}google/play/billing/api.html#producttypes">Learn more</a> about
+the product types supported by In-app Billing Version 3.</p>
<h2 id="console">Google Play Developer Console</h2>
<p>The Developer Console is where you can publish your
In-app Billing application and manage the various in-app products that are
available for purchase from your application.</p>
<p>You can create a product list of
-digital goods that are associated with your application, including items for
-one-time purchase and recurring subscriptions. For each item, you can define
-information such as the item’s unique product ID (also called its SKU), product
-type, pricing, description, and how Google Play should handle and track
-purchases for that product.</p>
+digital products that are associated with your application, including products for
+one-time purchase and recurring subscriptions. You can define
+information for each product such as the following:</p>
+<ul>
+<li>Unique product ID (also called its SKU).</li>
+<li>Product type.</li>
+<li>Pricing.</li>
+<li>Description.</li>
+<li>Google Play handling and tracking of purchases for that product.</li></p>
+</ul>
<p>If you sell several of your apps or in-app products at the same price, you
can add <em>pricing templates</em> to manage these price points from a
centralized location. When using pricing templates, you can include local taxes
@@ -146,7 +157,7 @@
In-app Billing</a>.</p>
<h2 id="checkout">Google Play Purchase Flow</h2>
-<p>Google Play uses the same checkout backend service as is used for application
+<p>Google Play uses the same backend checkout service that is used for application
purchases, so your users experience a consistent and familiar purchase flow.</p>
<p class="note"><strong>Important:</strong> You must have a Google payments
merchant account to use the In-app Billing service on Google Play.</p>
@@ -157,8 +168,8 @@
<p>When the checkout process is complete,
Google Play sends your application the purchase details, such as the order
number, the order date and time, and the price paid. At no point does your
-application have to handle any financial transactions; that role is provided by
-Google Play.</p>
+application have to handle any financial transactions; that role belongs to
+ Google Play.</p>
<h2 id="samples">Sample Application</h2>
<p>To help you integrate In-app Billing into your application, the Android SDK
@@ -166,16 +177,16 @@
from inside an app.</p>
<p>The <a href="{@docRoot}training/in-app-billing/preparing-iab-app.html#GetSample">
-TrivialDrive sample for the Version 3 API</a> sample shows how to use the In-app
+TrivialDrive for the Version 3 API</a> sample shows how to use the In-app
Billing Version 3 API
to implement in-app product and subscription purchases for a driving game. The
-application demonstrates how to send In-app Billing requests, and handle
+application demonstrates how to send In-app Billing requests and handle
synchronous responses from Google Play. The application also shows how to record
-item consumption with the API. The Version 3 sample includes convenience classes
+product consumption with the API. The Version 3 sample includes convenience classes
for processing In-app Billing operations as well as perform automatic signature
verification.</p>
-<p class="caution"><strong>Recommendation</strong>: Make sure to obfuscate the
+<p class="caution"><strong>Recommendation</strong>: Be sure to obfuscate the
code in your application before you publish it. For more information, see
<a href="{@docRoot}google/play/billing/billing_best_practices.html">Security
and Design</a>.</p>
@@ -183,16 +194,17 @@
<h2 id="migration">Migration Considerations</h2>
<p>The In-app Billing Version 2 API was discontinued in January 2015.
If you have an existing In-app Billing implementation that uses API Version 2 or
-earlier, you must migrate to <a href="{@docRoot}google/play/billing/api.html">In-app Billing Version
-3</a>.</p>
+earlier, you must migrate to <a href="{@docRoot}google/play/billing/api.html">
+In-app Billing Version 3</a>.</p>
-<p>If you have published apps selling in-app products, note that:</p>
+<p>After migration, managed and unmanaged products are handled as follows:</p>
<ul>
-<li>Managed items and subscriptions that you have previously defined in the Developer Console will
-work with Version 3 as before.</li>
-<li>Unmanaged items that you have defined for existing applications will be
-treated as managed products if you make a purchase request for these items using
-the Version 3 API. You do not need to create a new product entry in Developer
-Console for these items, and you can use the same product IDs to purchase these
-items.
+<li>Managed products and subscriptions that you have previously defined in the
+ Developer Console
+ work with Version 3 just as before.</li>
+<li>Unmanaged products that you have defined for existing applications are
+ treated as managed products if you make a purchase request for these products using
+the Version 3 API. You don't need to create a new product entry in the Developer
+Console for these products, and you can use the same product IDs to manage these
+products.
</ul>
diff --git a/docs/html/google/play/billing/billing_promotions.jd b/docs/html/google/play/billing/billing_promotions.jd
index ccf50fc..4fe1abf 100644
--- a/docs/html/google/play/billing/billing_promotions.jd
+++ b/docs/html/google/play/billing/billing_promotions.jd
@@ -1,7 +1,7 @@
page.title=In-app Promotions
parent.title=In-app Billing
parent.link=index.html
-page.metaDescription=Support promo codes in your app, which let you give content or features away to a limited number of users free of charge.
+page.metaDescription=Support promo codes in your app, which lets you give content or features away to a limited number of users free of charge.
page.image=/images/play_dev.jpg
page.tags="promotions, billing, promo codes"
meta.tags="monetization, inappbilling, promotions"
@@ -13,7 +13,7 @@
<h2>In this document</h2>
<ol>
<li><a href="#workflow">Creating and Redeeming Promo Codes</a></li>
- <li><a href="#supporting">Supporting Promo Codes In Your App</a></li>
+ <li><a href="#supporting">Supporting Promo Codes in Your App</a></li>
<li><a href="#testing">Testing In-app Promotions</a></li>
</ol>
<h2>See also</h2>
@@ -27,26 +27,26 @@
<p>
Promo codes let you give content or features away to a limited number of
- users free of charge. Once you create a promo code, you can distribute it
+ users free of charge. After you create a promo code, you can distribute it
subject to the
<!--TODO: Link to TOS when/if they're available as a web page --> terms of
- service. The user enters the promo code in your app or in the Play Store app,
- and gets the item at no cost. You can use promo codes in many ways to
- creatively engage with users. For example:
+ service. The user enters the promo code in your app or in the Google Play Store app
+ and receives the item at no cost. You can use promo codes in many ways to
+ creatively engage with users, such as the following:
</p>
<ul>
<li>A game could have a special item, such as a character or decoration,
that's only available to players who attend an event. The developer could
distribute cards with promo codes at the event, and users would enter their
- promo code to unlock the item.
+ promo codes to unlock the item.
</li>
- <li>An app developer might distribute promo codes at local businesses, to
+ <li>An app developer might distribute promo codes at local businesses to
encourage potential users to try the app.
</li>
- <li>An app developer might give out "friends and family" codes to its employees to
+ <li>An app developer might give <em>friends and family codes</em> to its employees to
share with their friends.
</li>
</ul>
@@ -54,11 +54,11 @@
<p>
Every promo code is associated with a particular <em>product ID</em> (also
known as a <em>SKU</em>). You can create promo codes for your existing in-app
- products. You can also keep a SKU off the Play Store, so the only way to get
+ products. You can also keep an SKU off the Play Store, so that the only way to get
that item is by entering that SKU's promo code. When a user enters the promo
- code in the Play Store or in their app, the user gets the item, just as if
+ code in the Play Store or in an app, the user gets the item, just as if
they paid full price for it. If your app already uses <a href=
- "{@docRoot}google/play/billing/api.html">In-app Billing version 3</a> to
+ "{@docRoot}google/play/billing/api.html">In-app Billing Version 3</a> to
support in-app purchases, it's easy to add support for promo codes.
</p>
@@ -67,12 +67,12 @@
<p>
You create promo codes through the <a href=
"https://play.google.com/apps/publish/" class="external-link">Google Play
- Developer Console</a>. Each promo code is associated with a single product item
+ Developer Console</a>. Each promo code is associated with a single product
registered in the developer console.
</p>
<p>
- When a user gets a promo code, they redeem it in one of two ways:
+ A user can redeem a promo code in one of these two ways:
</p>
<ul>
@@ -85,33 +85,20 @@
<li>The user can redeem the code in the Google Play Store app. Once the user
enters the code, the Play Store prompts the user to open the app (if they have
- the latest version installed) or to download or update it. (We do not
- currently support redeeming promo codes from the Google Play web store.)
+ the latest version installed) or to download or update it. Google doesn't
+ currently support redeeming promo codes from the Google Play web store.
</li>
</ul>
-<p>
- If the promo code is for a <a href=
- "{@docRoot}google/play/billing/api.html#consumetypes">consumable product</a>,
- the user can apply an additional code for the same product <em>after</em> the first
- product is consumed. For example, a game might offer promo codes for a bundle
- of extra lives. Betty has two different promo codes for that bundle. She
- redeems a single promo code, then launches the game. When the game launches,
- the her character receives the lives, consuming the item. She can now redeem
- the second promo code for another bundle of lives. (She cannot redeem the
- second promo code until after she consumes the item she purchased with the
- first promo code.)
-</p>
-
-<h2 id="supporting">Supporting Promo Codes In Your App</h2>
+<h2 id="supporting">Supporting Promo Codes in Your App</h2>
<p>
- To support promotion codes, your app should call the <a href=
+ To support promotion codes, your app must call the <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
method whenever the app starts or resumes. This method returns a bundle of all
current, unconsumed purchases, including purchases the user made by redeeming
- a promo code. This simplest approach is to call <a href=
+ a promo code. The simplest approach is to call <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
in your activity's {@link android.app.Activity#onResume onResume()} method,
@@ -119,21 +106,21 @@
activity is unpaused. Calling <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
- on startup and resume guarantees that your app will find out about all
+ on startup and resume guarantees that your app finds out about all
purchases and redemptions the user may have made while the app wasn't
running. Furthermore, if a user makes a purchase while the app is running and
- your app misses it for any reason, your app will still find out about the
+ your app misses it for any reason, your app still finds out about the
purchase the next time the activity resumes and calls <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>.
</p>
<p>
- In addition, your app should allow users to redeem promo codes inside the app
+ Your app should allow users to redeem promo codes inside the app
itself. If your app supports the in-app purchase workflow (described in
<a href=
"{@docRoot}google/play/billing/billing_integrate.html#billing-requests">Making
- In-app Billing Requests</a>), your app automatically supports in-app
+ In-app Billing requests</a>), your app automatically supports in-app
redemption of promo codes. When you launch the in-app purchase UI,
the user has the option to pay for the purchase with
a promo code. Your activity's {@link android.app.Activity#onActivityResult
@@ -141,9 +128,9 @@
purchase was completed. However, your app should still call <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
- on startup and resume, just in case the purchase and consumption workflow
- didn't complete. For example, if the user successfully redeems a promo code,
- and then your app crashes before the item is consumed, your app still gets
+ on startup and resume, in case the purchase and consumption workflow
+ didn't complete. For example, if the user successfully redeems a promo code
+ and then your app crashes before the item is consumed, your app still receives
information about the purchase when the app calls <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a> on its next startup.
@@ -160,8 +147,8 @@
<p>
To listen for the <code>PURCHASES_UPDATED</code> intent, dynamically create a
{@link android.content.BroadcastReceiver} object and register it to listen
- for <code>"com.android.vending.billing.PURCHASES_UPDATED"</code>. Register
- the receiver by putting code like this in your activity's {@link
+ for <code>com.android.vending.billing.PURCHASES_UPDATED</code>. Register
+ the receiver by inserting code similar to the following in your activity's {@link
android.app.Activity#onResume onResume()} method:
</p>
@@ -172,36 +159,34 @@
<p>
When the user makes a purchase, the system invokes your broadcast receiver's
{@link android.content.BroadcastReceiver#onReceive onReceive()} method. That
- method should call <a href=
+ method must call <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
to see what purchases the user has made.
</p>
-<p>
- Your activity's {@link android.app.Activity#onPause onPause()} method should
- unregister the broadcast receiver, to reduce system overhead when your app
- isn't running:
+<p>To reduce system overhead when your app
+ isn't running, your activity's {@link android.app.Activity#onPause onPause()} method must
+ unregister the broadcast receiver:
</p>
<pre>unRegisterReceiver(myPromoReceiver);</pre>
<p class="note">
- <strong>Note:</strong> You should not register this broadcast receiver in the
+ <strong>Note:</strong> Don't register this broadcast receiver in the
app manifest. Declaring the receiver in the manifest can cause the system to
launch the app to handle the intent if the user makes a purchase while the app
- isn't running. This behavior is not necessary, and may be annoying to the
- user. Instead, your app should call <a href=
- "{@docRoot}google/play/billing/billing_reference.html#getPurchases"
- ><code>getPurchases()</code></a>
- when the user launches it, to find out about any purchases the user made
- while the app wasn't running.
+ isn't running. This behavior is not necessary and may be annoying to the
+ user.
+ To find out about any purchases the user made while the app wasn't running,
+ call <a href="{@docRoot}google/play/billing/billing_reference.html#getPurchases"
+ ><code>getPurchases()</code></a> when the user launches the app.
</p>
<h2 id="testing">Testing In-app Promotions</h2>
<p>
- If your app supports in-app promotions, you should test the following use
+ If your app supports in-app promotions, test the following use
cases.
</p>
@@ -211,18 +196,18 @@
If the user redeems a promo code within the app's purchase flow, as described
in <a href=
"{@docRoot}google/play/billing/billing_integrate.html#billing-requests">Making
- In-app Billing Requests</a>, the system invokes your activity's {@link
+ In-app Billing requests</a>, the system invokes your activity's {@link
android.app.Activity#onActivityResult onActivityResult()} method to handle
the purchase. Verify that {@link android.app.Activity#onActivityResult
- onActivityResult()} handles the purchase properly, whether the user uses cash
+ onActivityResult()} handles the purchase properly, whether the user pays with money
or a promo code.
</p>
-<h3 id="test-playstore">User redeems promo code in the Play Store</h3>
+<h3 id="test-playstore">User redeems promo code in the Google Play Store</h3>
<p>
If the user redeems a promo code in the Play Store, there are several
- possible workflows. You should verify each one of these.
+ possible workflows. Verify each one of these workflows.
</p>
<h4 id="test-app-uninstalled">App is not installed</h4>
@@ -231,16 +216,16 @@
If the user redeems a promo code for an app that is not installed on the
device, the Play Store prompts the user to install the app. (If the app is
installed but not up-to-date, the Play Store prompts the user to update the
- app.) You should test the following sequence on a device that does not
+ app.) Test the following sequence on a device that doesn't
have your app installed.
</p>
<ol>
- <li>User redeems a promo code for the app in the Play Store. The Play Store
+ <li>The user redeems a promo code for the app in the Play Store. The Play Store
prompts the user to install your app.
</li>
- <li>User installs and launches your app. Verify that on startup, the app
+ <li>The user installs and launches your app. Verify that on startup, the app
calls <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
@@ -252,16 +237,16 @@
<p>
If the user redeems a promo code for an app that is installed on the device,
- the Play Store prompts the user to switch to the app. You should test the
+ the Play Store prompts the user to switch to the app. Test the
following sequence on a device that has your app installed but not running:
</p>
<ol>
- <li>User redeems a promo code for the app in the Play Store. The Play Store
+ <li>The user redeems a promo code for the app in the Play Store. The Play Store
prompts the user to switch to your app.
</li>
- <li>User launches your app. Verify that on startup, the app calls <a href=
+ <li>The user launches your app. Verify that on startup the app calls <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
><code>getPurchases()</code></a>
and correctly detects the purchase the user made with the promo code.
@@ -274,15 +259,15 @@
<p>
If the user redeems a promo code for an app that is currently running on the
device, the Play Store notifies the app via a <code>PURCHASES_UPDATED</code>
- intent. You should test the following sequence:
+ intent. Test the following sequence:
</p>
<ol>
- <li>User launches the app. Verify that the app has properly registered itself to
+ <li>The user launches the app. Verify that the app has properly registered itself to
receive the <code>PURCHASES_UPDATED</code> intent.
</li>
- <li>User launches the Play Store app and redeems a promo code for the app. The Play
+ <li>The user launches the Play Store app and redeems a promo code for the app. The Play
Store fires a <code>PURCHASES_UPDATED</code> intent. Verify that your app's
{@link android.content.BroadcastReceiver#onReceive
BroadcastReceiver.onReceive()} callback fires to handle the intent.
@@ -291,11 +276,11 @@
<li>Your {@link android.content.BroadcastReceiver#onReceive onReceive()}
method should respond to the intent by calling <a href=
"{@docRoot}google/play/billing/billing_reference.html#getPurchases"
- ><code>getPurchases()</code></a>. Verify that it calls this method, and that
+ ><code>getPurchases()</code></a>. Verify that your app calls this method and that
it correctly detects the purchase the user made with the promo code.
</li>
- <li>User switches back to your app. Verify that the user has the purchased
+ <li>The user switches back to your app. Verify that the user has the purchased
item.
</li>
</ol>
diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd
index 755f3ff..44b7ad3 100644
--- a/docs/html/google/play/billing/billing_testing.jd
+++ b/docs/html/google/play/billing/billing_testing.jd
@@ -81,8 +81,8 @@
<p>
Once authorized for testing access, those users can make purchases without
- being charged. The <code>orderId</code> field for test purchases remains
- blank, ensuring that there are no actual charges to user accounts.
+ being charged. Test purchases don't have an <code>orderId</code> field, which
+ ensures that there are no actual charges to user accounts.
</p>
<p class="note">
@@ -127,11 +127,11 @@
purchase dialog.</p>
<p class="note">
- <strong>Note:</strong> For test purchases, leave the {@code orderId} field
- blank. You can use the {@code purchaseToken} field to identify test purchases.
+ <strong>Note:</strong> Test purchases don't have an <code>orderId</code>
+ field. To track test purchases, you use the <code>purchaseToken</code> field
+ instead.
</p>
-
<h4 id="tp-account">Test purchases and developer account</h4>
<p>Authorized license test accounts are associated with your developer account
in Google Play, rather than with a specific APK or package name. Identifying an
diff --git a/docs/html/google/play/expansion-files.jd b/docs/html/google/play/expansion-files.jd
index 3c01684..cb8f277 100755
--- a/docs/html/google/play/expansion-files.jd
+++ b/docs/html/google/play/expansion-files.jd
@@ -131,7 +131,7 @@
<dt>{@code main} or {@code patch}</dt>
<dd>Specifies whether the file is the main or patch expansion file. There can be
only one main file and one patch file for each APK.</dd>
- <dt>{@code <expansion-version>}</dt>
+ <dt>{@code <expansion-version>}</dt>
<dd>This is an integer that matches the version code of the APK with which the expansion is
<em>first</em> associated (it matches the application's <a
href="{@docRoot}guide/topics/manifest/manifest-element.html#vcode">{@code android:versionCode}</a>
@@ -139,7 +139,7 @@
<p>"First" is emphasized because although the Developer Console allows you to
re-use an uploaded expansion file with a new APK, the expansion file's name does not change—it
retains the version applied to it when you first uploaded the file.</p></dd>
- <dt>{@code <package-name>}</dt>
+ <dt>{@code <package-name>}</dt>
<dd>Your application's Java-style package name.</dd>
</dl>
@@ -162,9 +162,9 @@
</pre>
<ul>
- <li>{@code <shared-storage>} is the path to the shared storage space, available from
+ <li>{@code <shared-storage>} is the path to the shared storage space, available from
{@link android.os.Environment#getExternalStorageDirectory()}.</li>
- <li>{@code <package-name>} is your application's Java-style package name, available
+ <li>{@code <package-name>} is your application's Java-style package name, available
from {@link android.content.Context#getPackageName()}.</li>
</ul>
@@ -470,7 +470,7 @@
<strong>Finish</strong>.</li>
<li>Select <strong>File > Project Structure</strong>.</li>
<li>Select the <em>Properties</em> tab and in <em>Library
-Repository</em>, enter the library from the {@code <sdk>/extras/google/} directory
+Repository</em>, enter the library from the {@code <sdk>/extras/google/} directory
({@code play_licensing/} for the License Verification Library or {@code
play_apk_expansion/downloader_library/} for the Downloader Library).</li>
<li>Select <strong>OK</strong> to create the new module.</li>
@@ -716,7 +716,7 @@
</li>
<li>Start the download by calling the static method {@code
DownloaderClientMarshaller.startDownloadServiceIfRequired(Context c, PendingIntent
-notificationClient, Class<?> serviceClass)}.
+notificationClient, Class<?> serviceClass)}.
<p>The method takes the following parameters:</p>
<ul>
<li><code>context</code>: Your application's {@link android.content.Context}.</li>
@@ -780,7 +780,7 @@
</li>
<li>When the {@code startDownloadServiceIfRequired()} method returns anything <em>other
than</em> {@code NO_DOWNLOAD_REQUIRED}, create an instance of {@code IStub} by
-calling {@code DownloaderClientMarshaller.CreateStub(IDownloaderClient client, Class<?>
+calling {@code DownloaderClientMarshaller.CreateStub(IDownloaderClient client, Class<?>
downloaderService)}. The {@code IStub} provides a binding between your activity to the downloader
service such that your activity receives callbacks about the download progress.
<p>In order to instantiate your {@code IStub} by calling {@code CreateStub()}, you must pass it
@@ -956,7 +956,7 @@
depends on the type of file you've used. As discussed in the <a href="#Overview">overview</a>, your
expansion files can be any kind of file you
want, but are renamed using a particular <a href="#Filename">file name format</a> and are saved to
-{@code <shared-storage>/Android/obb/<package-name>/}.</p>
+{@code <shared-storage>/Android/obb/<package-name>/}.</p>
<p>Regardless of how you read your files, you should always first check that the external
storage is available for reading. There's a chance that the user has the storage mounted to a
@@ -1059,7 +1059,7 @@
<p>The Google Market Apk Expansion package includes a library called the APK
Expansion Zip Library (located in {@code
-<sdk>/extras/google/google_market_apk_expansion/zip_file/}). This is an optional library that
+<sdk>/extras/google/google_market_apk_expansion/zip_file/}). This is an optional library that
helps you read your expansion
files when they're saved as ZIP files. Using this library allows you to easily read resources from
your ZIP expansion files as a virtual file system.</p>
diff --git a/docs/html/google/play/licensing/adding-licensing.jd b/docs/html/google/play/licensing/adding-licensing.jd
index 3bf4c1a..bfd4f91 100644
--- a/docs/html/google/play/licensing/adding-licensing.jd
+++ b/docs/html/google/play/licensing/adding-licensing.jd
@@ -7,7 +7,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#manifest-permission">Adding the Licensing Permission</a></li>
@@ -42,7 +42,7 @@
<li><a href="#app-publishing">Publishing a Licensed Application</a></li>
<li><a href="#support">Where to Get Support</a></li>
</ol>
-
+
</div>
</div>
@@ -572,7 +572,7 @@
</li>
<li>In case of a recoverable local or server error, such as when the network is
not available to send the request, {@code LicenseChecker} passes a {@code RETRY} response to
-your {@code Policy} object's <code>processServerResponse()</code> method.
+your {@code Policy} object's <code>processServerResponse()</code> method.
<p>Also, both the {@code allow()} and {@code dontAllow()} callback methods receive a
<code>reason</code> argument. The {@code allow()} method's reason is usually {@code
Policy.LICENSED} or {@code Policy.RETRY} and the {@code dontAllow()} reason is usually {@code
@@ -672,7 +672,7 @@
return;
}
displayResult(getString(R.string.dont_allow));
-
+
if (reason == Policy.RETRY) {
// If the reason received from the policy is RETRY, it was probably
// due to a loss of connection with the service, so we should give the
@@ -854,9 +854,9 @@
<h3 id="account-key">Embed your public key for licensing</h3>
<p>For each application, the Google Play service automatically
-generates a 2048-bit RSA public/private key pair that is used for
-licensing and in-app billing. The key pair is uniquely associated with the
-application. Although associated with the application, the key pair is
+generates a 2048-bit RSA public/private key pair that is used for
+licensing and in-app billing. The key pair is uniquely associated with the
+application. Although associated with the application, the key pair is
<em>not</em> the same as the key that you use to sign your applications (or derived from it).</p>
<p>The Google Play Developer Console exposes the public key for licensing to any
@@ -876,11 +876,11 @@
href="http://play.google.com/apps/publish">Developer Console</a> and sign in.
Make sure that you sign in to the account from which the application you are
licensing is published (or will be published). </li>
-<li>In the application details page, locate the <strong>Services & APIs</strong>
+<li>In the application details page, locate the <strong>Services & APIs</strong>
link and click it. </li>
-<li>In the <strong>Services & APIs</strong> page, locate the
-<strong>Licensing & In-App Billing</strong> section. Your public key for
-licensing is given in the
+<li>In the <strong>Services & APIs</strong> page, locate the
+<strong>Licensing & In-App Billing</strong> section. Your public key for
+licensing is given in the
<strong>Your License Key For This Application</strong> field. </li>
</ol>
diff --git a/docs/html/google/play/licensing/licensing-reference.jd b/docs/html/google/play/licensing/licensing-reference.jd
index d4ca79a..2b16299 100644
--- a/docs/html/google/play/licensing/licensing-reference.jd
+++ b/docs/html/google/play/licensing/licensing-reference.jd
@@ -7,7 +7,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#lvl-summary">LVL Classes and Interfaces</a></li>
@@ -418,7 +418,7 @@
maintained in the <code>processServerResponse()</code> method, not shown. </p>
-<pre>
+<pre>
public boolean allowAccess() {
long ts = System.currentTimeMillis();
if (mLastResponse == LicenseResponse.LICENSED) {
diff --git a/docs/html/google/play/licensing/overview.jd b/docs/html/google/play/licensing/overview.jd
index ecb384d..8d7977e 100755
--- a/docs/html/google/play/licensing/overview.jd
+++ b/docs/html/google/play/licensing/overview.jd
@@ -6,14 +6,14 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>Quickview</h2>
<ul>
<li>Licensing allows you to verify your app was purchased from Google Play</li>
<li>Your app maintains control of how it enforces its licensing status</li>
<li>The service is free for all developers who publish on Google Play</li>
</ul>
-
+
<h2>In this document</h2>
<ol>
<li><a href="#Secure">License Responses are Secure</a></li>
@@ -21,7 +21,7 @@
<li><a href="#Reqs">Requirements and Limitations</a></li>
<li><a href="#CopyProtection">Replacement for Copy Protection</a></li>
</ol>
-
+
</div>
</div>
@@ -107,10 +107,10 @@
server and you.</p>
<p>The licensing service generates a single licensing key pair for each
-application and exposes the public key in your application's
-<strong>Services & APIs</strong> page in the Developer Console. You must copy
-the public key from the Developer Console and embed it in your application
-source code. The server retains the private key internally and uses it to sign
+application and exposes the public key in your application's
+<strong>Services & APIs</strong> page in the Developer Console. You must copy
+the public key from the Developer Console and embed it in your application
+source code. The server retains the private key internally and uses it to sign
license responses for the applications you publish with that account.</p>
<p>When your application receives a signed response, it uses the embedded public
@@ -209,7 +209,7 @@
secure.</li>
<li>Adding licensing to an application does not affect the way the application
functions when run on a device that does not offer Google Play.</li>
-<li>You can implement licensing controls for a free app, but only if you're using the service to
+<li>You can implement licensing controls for a free app, but only if you're using the service to
provide <a
href="{@docRoot}google/play/expansion-files.html">APK expansion files</a>.</li>
</ul>
diff --git a/docs/html/google/play/licensing/setting-up.jd b/docs/html/google/play/licensing/setting-up.jd
index 352b79b..11ca4d7 100755
--- a/docs/html/google/play/licensing/setting-up.jd
+++ b/docs/html/google/play/licensing/setting-up.jd
@@ -181,12 +181,12 @@
<ol>
<li>Launch the Android SDK Manager, available under the Android Studio Tools menu
(<strong>Tools > Android > SDK Manager</strong>) or by executing
-{@code <sdk>/tools/android sdk}.</li>
+{@code <sdk>/tools/android sdk}.</li>
<li>Select and download <strong>Google APIs</strong> for the Android version you'd like to target
(must be Android 2.2 or higher).</li>
<li>When the download is complete, open the AVD Manager, available under the Android Studio
Tools menu (<strong>Tools > Android > AVD Manager</strong>) or by executing
-{@code <sdk>/tools/android avd}.</li>
+{@code <sdk>/tools/android avd}.</li>
<li>In the <em>Android Virtual Device Manager</em> window, select
<strong>+ Create Virtual Device</strong> to set the configuration details for the new AVD. </li>
<li>In the <em>Virtual Device Configuration</em> window, select device hardware, then
@@ -317,7 +317,7 @@
<strong>File > New > Import Module</strong>.</li>
<li>In the <em>New Module</em> window, in <em>Source directory</em>, enter the LVL's
<code>library</code> directory (the directory containing the library's AndroidManifest.xml file)
-as the project root ({@code <sdk>/extras/google/play_licensing/library/AndroidManifest.xml}),
+as the project root ({@code <sdk>/extras/google/play_licensing/library/AndroidManifest.xml}),
then select <strong>Next</strong>.</li>
<li>Select <strong>Finish</strong> to import the library module.</li>
</ol>
diff --git a/docs/html/google/play/publishing/multiple-apks.jd b/docs/html/google/play/publishing/multiple-apks.jd
index fd4481d..a878fb3 100644
--- a/docs/html/google/play/publishing/multiple-apks.jd
+++ b/docs/html/google/play/publishing/multiple-apks.jd
@@ -250,11 +250,11 @@
</li>
<li><strong>Device feature sets</strong>
- <p>This is based on your manifest file's <a
+ <p>This is based on your manifest file's <a
href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
element(s).</p>
<p>For example, you can provide one APK for devices that support multitouch and another
-APK for devices that do not support multitouch. See
+APK for devices that do not support multitouch. See
<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#features-reference">Features
Reference</a> for a list of features supported by the platform.</p>
<br/>
diff --git a/docs/html/guide/_book.yaml b/docs/html/guide/_book.yaml
index 6d6686b..20ee483 100644
--- a/docs/html/guide/_book.yaml
+++ b/docs/html/guide/_book.yaml
@@ -9,6 +9,33 @@
- title: System Permissions
path: /guide/topics/security/permissions.html
+- title: Platform Architecture
+ path: /guide/platform/index.html
+ section:
+ - title: Use Java 8 Language Features
+ path: /guide/platform/j8-jack.html
+ path_attributes:
+ - name: es-lang
+ value: Funciones del lenguaje Java 8
+ - name: in-lang
+ value: Fitur Bahasa Java 8
+ - name: ja-lang
+ value: Java 8 の機能
+ - name: ko-lang
+ value: Java 8 언어 기능
+ - name: pt-br-lang
+ value: Recursos de linguagem do Java 8
+ - name: ru-lang
+ value: Возможности языка Java 8
+ - name: vi-lang
+ value: Tính năng của Ngôn ngữ Java 8
+ - name: zh-cn-lang
+ value: Java 8 语言功能
+ - name: zh-tw-lang
+ value: Java 8 語言功能
+ - title: Verifying App Behavior on the Android Runtime (ART)
+ path: /guide/practices/verifying-apps-art.html
+
- title: App Components
path: /guide/components/index.html
section:
@@ -69,6 +96,11 @@
path: /guide/topics/resources/runtime-changes.html
- title: Localization
path: /guide/topics/resources/localization.html
+ section:
+ - title: ICU4J Android Framework APIs
+ path: /guide/topics/resources/icu4j-framework.html
+ - title: Language and Locale
+ path: /guide/topics/resources/multilingual-support.html
- title: Resource Types
path: /guide/topics/resources/available-resources.html
section:
@@ -203,6 +235,8 @@
path: /guide/topics/search/adding-custom-suggestions.html
- title: Searchable Configuration
path: /guide/topics/search/searchable-config.html
+ - title: Multi-Window Support
+ path: /guide/topics/ui/multi-window.html
- title: Drag and Drop
path: /guide/topics/ui/drag-drop.html
- title: Accessibility
@@ -417,5 +451,3 @@
path: /guide/practices/screen-compat-mode.html
- title: Supporting Tablets and Handsets
path: /guide/practices/tablets-and-handsets.html
- - title: Verifying App Behavior on ART
- path: /guide/practices/verifying-apps-art.html
diff --git a/docs/html/guide/_project.yaml b/docs/html/guide/_project.yaml
new file mode 100644
index 0000000..d1f8e5e
--- /dev/null
+++ b/docs/html/guide/_project.yaml
@@ -0,0 +1,6 @@
+name: "API Guides"
+home_url: /guide/
+description: "Android provides a rich application framework that allows you to build innovative apps and games for mobile devices in a Java language environment."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/guide/appendix/app-intents.jd b/docs/html/guide/appendix/app-intents.jd
index 8898927..5fb004f 100644
--- a/docs/html/guide/appendix/app-intents.jd
+++ b/docs/html/guide/appendix/app-intents.jd
@@ -89,13 +89,13 @@
<tr><td>pitch</td><td>Panorama center-of-view in degrees from
-90 (look straight up) to 90 (look straight down.)</td></tr>
<tr><td>zoom</td><td>Panorama zoom. 1.0 = normal zoom, 2.0 = zoomed in 2x, 3.0 = zoomed in 4x, and so on.<br />
- A zoom of 1.0 is 90 degree horizontal FOV for a nominal
- landscape mode 4 x 3 aspect ratio display.
- Android phones in portrait mode will adjust the zoom so that
- the vertical FOV is approximately the same as the landscape vertical
- FOV. This means that the horizontal FOV of an Android phone in portrait
- mode is much narrower than in landscape mode. This is done to minimize
- the fisheye lens effect that would be present if a 90 degree horizontal
+ A zoom of 1.0 is 90 degree horizontal FOV for a nominal
+ landscape mode 4 x 3 aspect ratio display.
+ Android phones in portrait mode will adjust the zoom so that
+ the vertical FOV is approximately the same as the landscape vertical
+ FOV. This means that the horizontal FOV of an Android phone in portrait
+ mode is much narrower than in landscape mode. This is done to minimize
+ the fisheye lens effect that would be present if a 90 degree horizontal
FOV was used in portrait mode.</td></tr>
<tr><td>mapZoom</td><td>The map zoom of the map location associated with this panorama. This value is passed on to the
Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> parameter in
diff --git a/docs/html/guide/appendix/g-app-intents.jd b/docs/html/guide/appendix/g-app-intents.jd
index 9ec72db..21c927b 100644
--- a/docs/html/guide/appendix/g-app-intents.jd
+++ b/docs/html/guide/appendix/g-app-intents.jd
@@ -83,7 +83,7 @@
</td>
</tr>
<tr>
- <td>Google Streetview</td>
+ <td>Google Streetview</td>
<td>google.streetview:cbll=<em>lat</em>,<em>lng</em>&cbp=1,<em>yaw</em>,,<em>pitch</em>,<em>zoom</em>&mz=<em>mapZoom</em>
</td>
<td>VIEW</td>
diff --git a/docs/html/guide/appendix/glossary.jd b/docs/html/guide/appendix/glossary.jd
index a200a6c..75a533a 100755
--- a/docs/html/guide/appendix/glossary.jd
+++ b/docs/html/guide/appendix/glossary.jd
@@ -15,7 +15,7 @@
</dd>
<dt id="dex">.dex file </dt>
- <dd>Compiled Android application code file.
+ <dd>Compiled Android application code file.
<p>Android programs are compiled into .dex (Dalvik Executable) files, which
are in turn zipped into a single .apk file on the device. .dex files can
be created by automatically translating compiled applications written in
@@ -26,7 +26,7 @@
a string value assigned to an Intent. Action strings can be defined by Android
or by a third-party developer. For example, android.intent.action.VIEW
for a Web URL, or com.example.rumbler.SHAKE_PHONE for a custom application
- to vibrate the phone.
+ to vibrate the phone.
<p>Related: <a href="#intent">Intent</a>.</p>
</dd>
@@ -41,8 +41,8 @@
<dt id="adb">adb</dt>
<dd>Android Debug Bridge, a command-line debugging application included with the
SDK. It provides tools to browse the device, copy tools on the device, and
- forward ports for debugging. If you are developing in Android Studio,
- adb is integrated into your development environment. See
+ forward ports for debugging. If you are developing in Android Studio,
+ adb is integrated into your development environment. See
<a href="{@docRoot}tools/help/adb.html">Android Debug Bridge</a>
for more information. </dd>
@@ -90,7 +90,7 @@
<dt id="ddms">DDMS</dt>
<dd>Dalvik Debug Monitor Service, a GUI debugging application included
with the SDK. It provides screen capture, log dump, and process
- examination capabilities. If you are developing in Android Studio,
+ examination capabilities. If you are developing in Android Studio,
DDMS is integrated into your development environment. See <a
href="{@docRoot}tools/debugging/ddms.html">Using DDMS</a> to learn more about the program.</dd>
@@ -100,7 +100,7 @@
is not intended to persist in the history stack, contain complex layout,
or perform complex actions. Android provides a default simple dialog for
you with optional buttons, though you can define your own dialog layout.
- The base class for dialogs is {@link android.app.Dialog Dialog}.
+ The base class for dialogs is {@link android.app.Dialog Dialog}.
<p>Related: <a href="#activity">Activity</a>.</p></dd>
<dt id="drawable">Drawable</dt>
@@ -113,7 +113,7 @@
— xml or bitmap files that describe the image. Drawable resources
are compiled into subclasses of {@link android.graphics.drawable}. For
more information about drawables and other resources, see <a
- href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a>.
+ href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a>.
<p>Related: <a href="#resources">Resources</a>, <a href="#canvas">Canvas
</a></p></dd>
@@ -133,7 +133,7 @@
based on the criteria supplied in the Intent and the Intent Filters
defined by other applications. For more information, see <a
href="{@docRoot}guide/components/intents-filters.html">Intents and
- Intent Filters</a>.
+ Intent Filters</a>.
<p>Related: <a href="#intentfilter">Intent Filter</a>, <a
href="#broadcastreceiver">Broadcast Receiver</a>.</p></dd>
@@ -147,7 +147,7 @@
application/activity that best matches the Intent and criteria. For more
information, see <a
href="{@docRoot}guide/components/intents-filters.html">Intents and
- Intent Filters</a>.
+ Intent Filters</a>.
<p>Related: <a href="#intent">Intent</a>, <a
href="#broadcastreceiver">Broadcast Receiver</a>.</p></dd>
@@ -155,12 +155,12 @@
<dd>An application class that listens for Intents that are broadcast,
rather than being sent to a single target application/activity. The system
delivers a broadcast Intent to all interested broadcast receivers, which
- handle the Intent sequentially.
- <p>Related: <a href="#intent">Intent</a>, <a href="#intentfilter">Intent
+ handle the Intent sequentially.
+ <p>Related: <a href="#intent">Intent</a>, <a href="#intentfilter">Intent
Filter</a>.</p> </dd>
-
+
<dt id="layoutresource">Layout Resource</dt>
- <dd>An XML file that describes the layout of an Activity screen.
+ <dd>An XML file that describes the layout of an Activity screen.
<p>Related: <a href="#resources">Resources</a></p></dd>
<dt id="manifest">Manifest File</dt>
@@ -175,15 +175,15 @@
<dd>A resizeable bitmap resource that can be used for backgrounds or other
images on the device. See <a
href="{@docRoot}guide/topics/resources/available-resources.html#ninepatch">
- Nine-Patch Stretchable Image</a> for more information.
+ Nine-Patch Stretchable Image</a> for more information.
<p>Related: <a href="#resources">Resources</a>.</p></dd>
<dt id="opengles">OpenGL ES</dt>
<dd> Android provides OpenGL ES libraries that you can use for fast,
complex 3D images. It is harder to use than a Canvas object, but
- better for 3D objects. The {@link android.opengl} and
- {@link javax.microedition.khronos.opengles} packages expose
- OpenGL ES functionality.
+ better for 3D objects. The {@link android.opengl} and
+ {@link javax.microedition.khronos.opengles} packages expose
+ OpenGL ES functionality.
<p>Related: <a href="#canvas">Canvas</a>, <a href="#surface">Surface</a></p></dd>
<dt id="resources">Resources</dt>
@@ -205,15 +205,15 @@
<dt id="service">Service</dt>
<dd>An object of class {@link android.app.Service} that runs in the
background (without any UI presence) to perform various persistent
- actions, such as playing music or monitoring network activity.
+ actions, such as playing music or monitoring network activity.
<p>Related: <a href="#activity">Activity</a></p></dd>
<dt id="surface">Surface</dt>
<dd>An object of type {@link android.view.Surface} representing a block of
memory that gets composited to the screen. A Surface holds a Canvas object
for drawing, and provides various helper methods to draw layers and resize
- the surface. You should not use this class directly; use
- {@link android.view.SurfaceView} instead.
+ the surface. You should not use this class directly; use
+ {@link android.view.SurfaceView} instead.
<p>Related: <a href="#canvas">Canvas</a></p></dd>
<dt id="surfaceview">SurfaceView</dt>
@@ -249,7 +249,7 @@
windows, and so on). It receives calls from its parent object (see
viewgroup, below)to draw itself, and informs its parent object about where
and how big it would like to be (which may or may not be respected by the
- parent). For more information, see {@link android.view.View}.
+ parent). For more information, see {@link android.view.View}.
<p>Related: <a href="#viewgroup">Viewgroup</a>, <a href="#widget">Widget
</a></p></dd>
@@ -259,18 +259,18 @@
they can be, as well as for calling each to draw itself when appropriate.
Some viewgroups are invisible and are for layout only, while others have
an intrinsic UI (for instance, a scrolling list box). Viewgroups are all
- in the {@link android.widget widget} package, but extend
- {@link android.view.ViewGroup ViewGroup}.
+ in the {@link android.widget widget} package, but extend
+ {@link android.view.ViewGroup ViewGroup}.
<p>Related: <a href="#view">View</a></p></dd>
<dt id="widget">Widget</dt>
<dd>One of a set of fully implemented View subclasses that render form
elements and other UI components, such as a text box or popup menu.
Because a widget is fully implemented, it handles measuring and drawing
- itself and responding to screen events. Widgets are all in the
+ itself and responding to screen events. Widgets are all in the
{@link android.widget} package. </dd>
- <!--
+ <!--
<dt id="panel">Panel</dt>
<dd> A panel is a concept not backed by a specific class. It is a View of
some sort that is tied in closely to a parent window, but can handle
diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd
index 070154d..9443924 100644
--- a/docs/html/guide/components/activities.jd
+++ b/docs/html/guide/components/activities.jd
@@ -622,10 +622,10 @@
<p>The system calls {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}
before making the activity vulnerable to destruction. The system passes this method
-a {@link android.os.Bundle} in which you can save
+a {@link android.os.Bundle} in which you can save
state information about the activity as name-value pairs, using methods such as {@link
-android.os.Bundle#putString putString()} and {@link
-android.os.Bundle#putInt putInt()}. Then, if the system kills your application
+android.os.BaseBundle#putString putString()} and {@link
+android.os.BaseBundle#putInt putInt()}. Then, if the system kills your application
process and the user navigates back to your activity, the system recreates the activity and passes
the {@link android.os.Bundle} to both {@link android.app.Activity#onCreate onCreate()} and {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}. Using either of these
diff --git a/docs/html/guide/components/fragments.jd b/docs/html/guide/components/fragments.jd
index f9c2a26..951d042 100644
--- a/docs/html/guide/components/fragments.jd
+++ b/docs/html/guide/components/fragments.jd
@@ -36,7 +36,7 @@
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
-
+
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Building a Dynamic UI with Fragments</a></li>
@@ -306,7 +306,7 @@
<ul>
<li>Supply the {@code android:id} attribute with a unique ID.</li>
<li>Supply the {@code android:tag} attribute with a unique string.</li>
- <li>If you provide neither of the previous two, the system uses the ID of the container
+ <li>If you provide neither of the previous two, the system uses the ID of the container
view.</li>
</ul>
</div>
@@ -365,7 +365,7 @@
<p>For an example activity that uses a fragment as a background worker, without a UI, see the {@code
FragmentRetainInstance.java} sample, which is included in the SDK samples (available through the
-Android SDK Manager) and located on your system as
+Android SDK Manager) and located on your system as
<code><sdk_root>/APIDemos/app/src/main/java/com/example/android/apis/app/FragmentRetainInstance.java</code>.</p>
@@ -381,7 +381,7 @@
<li>Get fragments that exist in the activity, with {@link
android.app.FragmentManager#findFragmentById findFragmentById()} (for fragments that provide a UI in
the activity layout) or {@link android.app.FragmentManager#findFragmentByTag
-findFragmentByTag()} (for fragments that do or don't provide a UI).</li>
+findFragmentByTag()} (for fragments that do or don't provide a UI).</li>
<li>Pop fragments off the back stack, with {@link
android.app.FragmentManager#popBackStack()} (simulating a <em>Back</em> command by the user).</li>
<li>Register a listener for changes to the back stack, with {@link
@@ -568,7 +568,7 @@
<p>If the activity has not implemented the interface, then the fragment throws a
{@link java.lang.ClassCastException}.
-On success, the {@code mListener} member holds a reference to activity's implementation of
+On success, the {@code mListener} member holds a reference to activity's implementation of
{@code OnArticleSelectedListener}, so that fragment A can share events with the activity by calling
methods defined by the {@code OnArticleSelectedListener} interface. For example, if fragment A is an
extension of {@link android.app.ListFragment}, each time
@@ -798,7 +798,7 @@
<p>The second fragment, {@code DetailsFragment} shows the play summary for the item selected from
the list from {@code TitlesFragment}:</p>
-
+
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java details}
<p>Recall from the {@code TitlesFragment} class, that, if the user clicks a list item and the
@@ -811,7 +811,7 @@
{@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
details_activity}
-
+
<p>Notice that this activity finishes itself if the configuration is landscape, so that the main
activity can take over and display the {@code DetailsFragment} alongside the {@code TitlesFragment}.
This can happen if the user begins the {@code DetailsActivity} while in portrait orientation, but
diff --git a/docs/html/guide/components/index.jd b/docs/html/guide/components/index.jd
index 811d015..d596b3b 100644
--- a/docs/html/guide/components/index.jd
+++ b/docs/html/guide/components/index.jd
@@ -1,7 +1,7 @@
page.title=App Components
page.landing=true
-page.landing.intro=Android's application framework lets you create rich and innovative apps using a set of reusable components. This section explains how you can build the components that define the building blocks of your app and how to connect them together using intents.
-page.metaDescription=Android's application framework lets you create rich and innovative apps using a set of reusable components. This section explains how you can build the components that define the building blocks of your app and how to connect them together using intents.
+page.landing.intro=Android's application framework lets you create rich and innovative apps using a set of reusable components. This section explains how you can build the components that define the building blocks of your app and how to connect them together using intents.
+page.metaDescription=Android's application framework lets you create rich and innovative apps using a set of reusable components. This section explains how you can build the components that define the building blocks of your app and how to connect them together using intents.
page.landing.image=images/develop/app_components.png
page.image=images/develop/app_components.png
@@ -11,7 +11,7 @@
<div class="col-6">
<h3>Blog Articles</h3>
-
+
<a href="http://android-developers.blogspot.com/2012/05/using-dialogfragments.html">
<h4>Using DialogFragments</h4>
<p>In this post, I’ll show how to use DialogFragments with the v4 support library (for backward compatibility on pre-Honeycomb devices) to show a simple edit dialog and return a result to the calling Activity using an interface.</p>
@@ -21,7 +21,7 @@
<h4>Fragments For All</h4>
<p>Today we’ve released a static library that exposes the same Fragments API (as well as the new LoaderManager and a few other classes) so that applications compatible with Android 1.6 or later can use fragments to create tablet-compatible user interfaces. </p>
</a>
-
+
<a
href="http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html">
<h4>Multithreading for Performance</h4>
@@ -33,7 +33,7 @@
<div class="col-6">
<h3>Training</h3>
-
+
<a href="http://developer.android.com/training/basics/activity-lifecycle/index.html">
<h4>Managing the Activity Lifecycle</h4>
<p>This class explains important lifecycle callback methods that each Activity
diff --git a/docs/html/guide/components/loaders.jd b/docs/html/guide/components/loaders.jd
index ddd513b..7c4baa8 100644
--- a/docs/html/guide/components/loaders.jd
+++ b/docs/html/guide/components/loaders.jd
@@ -21,14 +21,14 @@
</ol>
</li>
</ol>
-
+
<h2>Key classes</h2>
<ol>
<li>{@link android.app.LoaderManager}</li>
<li>{@link android.content.Loader}</li>
- </ol>
-
+ </ol>
+
<h2>Related samples</h2>
<ol>
<li> <a
@@ -53,7 +53,7 @@
recreated after a configuration change. Thus, they don't need to re-query their
data.</li>
</ul>
-
+
<h2 id="summary">Loader API Summary</h2>
<p>There are multiple classes and interfaces that may be involved in using
@@ -131,10 +131,10 @@
load data from some other source.</li>
<li>An implementation for {@link android.app.LoaderManager.LoaderCallbacks}.
This is where you create new loaders and manage your references to existing
-loaders.</li>
+loaders.</li>
<li>A way of displaying the loader's data, such as a {@link
android.widget.SimpleCursorAdapter}.</li>
- <li>A data source, such as a {@link android.content.ContentProvider}, when using a
+ <li>A data source, such as a {@link android.content.ContentProvider}, when using a
{@link android.content.CursorLoader}.</li>
</ul>
<h3 id="starting">Starting a Loader</h3>
@@ -142,7 +142,7 @@
<p>The {@link android.app.LoaderManager} manages one or more {@link
android.content.Loader} instances within an {@link android.app.Activity} or
{@link android.app.Fragment}. There is only one {@link
-android.app.LoaderManager} per activity or fragment.</p>
+android.app.LoaderManager} per activity or fragment.</p>
<p>You typically
initialize a {@link android.content.Loader} within the activity's {@link
@@ -159,13 +159,13 @@
<ul>
<li>A unique ID that identifies the loader. In this example, the ID is 0.</li>
<li>Optional arguments to supply to the loader at
-construction (<code>null</code> in this example).</li>
+construction (<code>null</code> in this example).</li>
<li>A {@link android.app.LoaderManager.LoaderCallbacks} implementation, which
the {@link android.app.LoaderManager} calls to report loader events. In this
example, the local class implements the {@link
android.app.LoaderManager.LoaderCallbacks} interface, so it passes a reference
-to itself, {@code this}.</li>
+to itself, {@code this}.</li>
</ul>
<p>The {@link android.app.LoaderManager#initLoader initLoader()} call ensures that a loader
is initialized and active. It has two possible outcomes:</p>
@@ -196,7 +196,7 @@
starts and stops loading when necessary, and maintains the state of the loader
and its associated content. As this implies, you rarely interact with loaders
directly (though for an example of using loader methods to fine-tune a loader's
-behavior, see the <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> sample).
+behavior, see the <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> sample).
You most commonly use the {@link
android.app.LoaderManager.LoaderCallbacks} methods to intervene in the loading
process when particular events occur. For more discussion of this topic, see <a
@@ -249,7 +249,7 @@
— Called when a previously created loader has finished its load.
</li></ul>
<ul>
- <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
+ <li>{@link android.app.LoaderManager.LoaderCallbacks#onLoaderReset onLoaderReset()}
— Called when a previously created loader is being reset, thus making its
data unavailable.
</li>
@@ -344,11 +344,11 @@
<h4 id="onLoaderReset">onLoaderReset</h4>
-<p>This method is called when a previously created loader is being reset, thus
+<p>This method is called when a previously created loader is being reset, thus
making its data unavailable. This callback lets you find out when the data is
about to be released so you can remove your reference to it. </p>
-<p>This implementation calls
-{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
+<p>This implementation calls
+{@link android.widget.SimpleCursorAdapter#swapCursor swapCursor()}
with a value of <code>null</code>:</p>
<pre>
@@ -370,7 +370,7 @@
android.app.Fragment} that displays a {@link android.widget.ListView} containing
the results of a query against the contacts content provider. It uses a {@link
android.content.CursorLoader} to manage the query on the provider.</p>
-
+
<p>For an application to access a user's contacts, as shown in this example, its
manifest must include the permission
{@link android.Manifest.permission#READ_CONTACTS READ_CONTACTS}.</p>
diff --git a/docs/html/guide/components/processes-and-threads.jd b/docs/html/guide/components/processes-and-threads.jd
index 7bb3c65..2507998 100644
--- a/docs/html/guide/components/processes-and-threads.jd
+++ b/docs/html/guide/components/processes-and-threads.jd
@@ -121,7 +121,7 @@
<ul>
<li>It hosts an {@link android.app.Activity} that is not in the foreground, but is still
-visible to the user (its {@link android.app.Activity#onPause onPause()} method has been called).
+visible to the user (its {@link android.app.Activity#onPause onPause()} method has been called).
This might occur, for example, if the foreground activity started a dialog, which allows the
previous activity to be seen behind it.</li>
diff --git a/docs/html/guide/platform/images/android-stack_2x.png b/docs/html/guide/platform/images/android-stack_2x.png
new file mode 100644
index 0000000..33bb144
--- /dev/null
+++ b/docs/html/guide/platform/images/android-stack_2x.png
Binary files differ
diff --git a/docs/html/guide/platform/index.jd b/docs/html/guide/platform/index.jd
new file mode 100644
index 0000000..9aed461
--- /dev/null
+++ b/docs/html/guide/platform/index.jd
@@ -0,0 +1,217 @@
+page.title=Platform Architecture
+page.keywords=platform,architecture,framework
+@jd:body
+
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>
+ In this document
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#linux-kernel">The Linux Kernel</a>
+ </li>
+
+ <li>
+ <a href="#hal">Hardware Abstraction Layer (HAL)</a>
+ </li>
+
+ <li>
+ <a href="#art">Android Runtime</a>
+ </li>
+
+ <li>
+ <a href="#native-libs">Native C/C++ Libraries</a>
+ </li>
+
+ <li>
+ <a href="#api-framework">Java API Framework</a>
+ </li>
+
+ <li>
+ <a href="#system-apps">System Apps</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android is an open source, Linux-based software stack created for a wide
+ array of devices and form factors. The following diagram shows the major
+ components of the Android platform.
+</p>
+
+<img src="/guide/platform/images/android-stack_2x.png" alt="" width=
+"519">
+<p class="img-caption">
+ <strong>Figure 1.</strong> The Android software stack.
+</p>
+
+<h2 id="linux-kernel">
+The Linux Kernel
+</h2>
+
+<p>
+ The foundation of the Android platform is the Linux kernel. For example,
+ <a href="#art">the Android Runtime (ART)</a> relies on the Linux kernel for
+ underlying functionalities such as threading and low-level memory management.
+</p>
+
+<p>
+ Using a Linux kernel allows Android to take advantage of <a href=
+ "https://source.android.com/security/overview/kernel-security.html">key
+ security features</a> and allows device manufacturers to develop hardware
+ drivers for a well-known kernel.
+</p>
+
+<h2 id="hal">
+Hardware Abstraction Layer (HAL)
+</h2>
+
+<p>
+ The <a href=
+ "https://source.android.com/devices/index.html#Hardware%20Abstraction%20Layer">
+ hardware abstraction layer (HAL)</a> provides standard interfaces that expose
+ device hardware capabilities to the higher-level <a href=
+ "#api-framework">Java API framework</a>. The HAL consists of multiple library
+ modules, each of which implements an interface for a specific type of hardware
+ component, such as the <a href=
+ "https://source.android.com/devices/camera/index.html">camera</a> or <a href=
+ "https://source.android.com/devices/bluetooth.html">bluetooth</a> module.
+ When a framework API makes a call to access device hardware, the Android
+ system loads the library module for that hardware component.
+</p>
+
+<h2 id="art">
+Android Runtime
+</h2>
+
+<p>
+ For devices running Android version 5.0 (API level 21) or higher, each app
+ runs in its own process and with its own instance of the <a href=
+ "http://source.android.com/devices/tech/dalvik/index.html">Android Runtime
+ (ART)</a>. ART is written to run multiple virtual machines on low-memory
+ devices by executing DEX files, a bytecode format designed specially for
+ Android that's optimized for minimal memory footprint. Build toolchains, such
+ as <a href="https://source.android.com/source/jack.html">Jack</a>, compile
+ Java sources into DEX bytecode, which can run on the Android platform.
+</p>
+
+<p>
+ Some of the major features of ART include the following:
+</p>
+
+<ul>
+ <li>Ahead-of-time (AOT) and just-in-time (JIT) compilation
+ </li>
+
+ <li>Optimized garbage collection (GC)
+ </li>
+
+ <li>Better debugging support, including a dedicated sampling profiler,
+ detailed diagnostic exceptions and crash reporting, and the ability to set
+ watchpoints to monitor specific fields
+ </li>
+</ul>
+
+<p>
+ Prior to Android version 5.0 (API level 21), Dalvik was the Android runtime.
+ If your app runs well on ART, then it should work on Dalvik as well, but
+ <a href="/guide/platform/verifying-apps-art.html">the reverse may not be
+ true</a>.
+</p>
+
+<p>
+ Android also includes a set of core runtime libraries that provide most of
+ the functionality of the Java programming language, including some <a href=
+ "/guide/platform/j8-jack.html">Java 8 language features</a>, that the Java
+ API framework uses.
+</p>
+
+<h2 id="native-libs">
+ Native C/C++ Libraries
+</h2>
+
+<p>
+ Many core Android system components and services, such as ART and HAL, are
+ built from native code that require native libraries written in C and C++.
+ The Android platform provides Java framework APIs to expose the functionality
+ of some of these native libraries to apps. For example, you can access
+ <a href="/guide/topics/graphics/opengl.html">OpenGL ES</a> through the
+ Android framework’s <a href=
+ "/reference/android/opengl/package-summary.html">Java OpenGL API</a> to add
+ support for drawing and manipulating 2D and 3D graphics in your app.
+</p>
+
+<p>
+ If you are developing an app that requires C or C++ code, you can use the
+ <a href="/ndk/index.html">Android NDK</a> to access some of these <a href=
+ "/ndk/guides/stable_apis.html">native platform libraries</a> directly from
+ your native code.
+</p>
+
+<h2 id="api-framework">
+Java API Framework
+</h2>
+
+<p>
+ The entire feature-set of the Android OS is available to you through APIs
+ written in the Java language. These APIs form the building blocks you need to
+ create Android apps by simplifying the reuse of core, modular system
+ components and services, which include the following:
+</p>
+
+<ul>
+ <li>A rich and extensible <a href="/guide/topics/ui/overview.html">View
+ System</a> you can use to build an app’s UI, including lists, grids, text
+ boxes, buttons, and even an embeddable web browser
+ </li>
+
+ <li>A <a href="/guide/topics/resources/overview.html">Resource Manager</a>,
+ providing access to non-code resources such as localized strings, graphics,
+ and layout files
+ </li>
+
+ <li>A <a href="/guide/topics/ui/notifiers/notifications.html">Notification
+ Manager</a> that enables all apps to display custom alerts in the status bar
+ </li>
+
+ <li>An <a href="/guide/components/activities.html">Activity Manager</a> that
+ manages the lifecycle of apps and provides a common <a href=
+ "/guide/components/tasks-and-back-stack.html">navigation back stack</a>
+ </li>
+
+ <li>
+ <a href="/guide/topics/providers/content-providers.html">Content
+ Providers</a> that enable apps to access data from other apps, such as
+ the Contacts app, or to share their own data
+ </li>
+</ul>
+
+<p>
+ Developers have full access to the same <a href=
+ "/reference/packages.html">framework APIs</a> that Android system apps use.
+</p>
+
+<h2 id="system-apps">
+System Apps
+</h2>
+
+<p>
+ Android comes with a set of core apps for email, SMS messaging, calendars,
+ internet browsing, contacts, and more. Apps included with the platform have
+ no special status among the apps the user chooses to install. So a
+ third-party app can become the user's default web browser, SMS messenger, or
+ even the default keyboard (some exceptions apply, such as the system's
+ Settings app).
+</p>
+
+<p>
+ The system apps function both as apps for users and to provide key
+ capabilities that developers can access from their own app. For example, if
+ your app would like to deliver an SMS message, you don't need to build that
+ functionality yourself—you can instead invoke whichever SMS app is already
+ installed to deliver a message to the recipient you specify.
+</p>
\ No newline at end of file
diff --git a/docs/html/guide/platform/j8-jack.jd b/docs/html/guide/platform/j8-jack.jd
new file mode 100644
index 0000000..9b19426
--- /dev/null
+++ b/docs/html/guide/platform/j8-jack.jd
@@ -0,0 +1,242 @@
+page.title=Use Java 8 Language Features
+page.keywords="android N", "Java 8", "Jack"
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2 id="Contents">
+ In this document:
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#supported-features">Supported Java 8 Language Features and
+ APIs</a>
+ </li>
+
+ <li>
+ <a href="#configuration">Enable Java 8 Features and the Jack
+ Toolchain</a>
+ <ul>
+ <li>
+ <a href="#configure-gradle">Configure Gradle</a>
+ </li>
+
+ <li>
+ <a href="#known-issues">Known issues</a>
+ </li>
+ </ul>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android supports all Java 7 language features and a subset of Java 8 language
+ features that vary by platform version. This page describes the new language
+ features you can use, how to properly configure your project to use them, and
+ any known issues you may encounter.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> When developing apps for Android, using Java 8
+ language features is optional. You can keep your project's source and target
+ compatibility values set to Java 7, but you still need to compile using JDK
+ 8.
+</p>
+
+<p>
+ Support for Java 8 language features requires a new compiler called <a href=
+ "https://source.android.com/source/jack.html">Jack</a>. Jack is supported
+ only on Android Studio 2.1 and higher. So if you want to use Java 8 language
+ features, you need to use Android Studio 2.1 to build your app.
+</p>
+
+<p>
+ If you already have Android Studio installed, make sure you update to the
+ latest version by clicking <strong>Help > Check for Update</strong> (on
+ Mac, <strong>Android Studio > Check for Updates</strong>). If you don't
+ already have the IDE installed on your workstation, <a href=
+ "{@docRoot}studio/">download Android Studio here</a>.
+</p>
+
+<h2 id="supported-features">
+ Supported Java 8 Language Features and APIs
+</h2>
+
+<p>
+ Android does not support all Java 8 language features. However, the
+ following features are available when developing apps targeting
+ Android 7.0 (API level 24):
+</p>
+
+<ul>
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">Default
+ and static interface methods</a>
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html">
+ Lambda expressions</a> (also available on API level 23 and lower)
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/tutorial/java/annotations/repeating.html">Repeatable
+ annotations</a>
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/tutorial/java/javaOO/methodreferences.html">
+ Method References</a> (also available on API level 23 and lower)
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/tutorial/java/annotations/type_annotations.html">
+ Type Annotations</a> (also available on API level 23 and lower)
+ </li>
+</ul>
+
+<p class="note">
+ <strong>Note:</strong> Type annotation information is only available at
+ compile time, and not during runtime.
+</p>
+
+<p>
+ To test lambda expressions, method references, and type annotations on
+ earlier versions of Android, go to your {@code build.gradle} file, and set
+ {@code compileSdkVersion} and {@code targetSdkVersion} to 23 or lower. You
+ will still need to <a href="#configuration">enable the Jack toolchain</a> to
+ use these Java 8 features.
+</p>
+
+<p>
+ Additionally, the following Java 8 language APIs are also available:
+</p>
+
+<ul>
+ <li>Reflection and language-related APIs:
+ <ul>
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/8/docs/api/java/lang/FunctionalInterface.html">
+ {@code java.lang.FunctionalInterface}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Repeatable.html">
+ {@code java.lang.annotation.Repeatable}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#isDefault--">
+ {@code java.lang.reflect.Method.isDefault()}</a>
+ </li>
+
+ <li>and Reflection APIs associated with repeatable annotations, such as
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType-java.lang.Class-">
+ {@code AnnotatedElement.getAnnotationsByType(Class)}</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>Utility APIs:
+ <ul>
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">
+ {@code java.util.function}</a>
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html">
+ {@code java.util.stream}</a>
+ </li>
+ </ul>
+ </li>
+</ul>
+
+<h2 id="configuration">
+ Enable Java 8 Features and the Jack Toolchain
+</h2>
+
+<p>
+ In order to use the new Java 8 language features, you need to also use the
+ <a href="https://source.android.com/source/jack.html">Jack toolchain</a>.
+ This new Android toolchain compiles Java language sources into
+ Android-readable DEX bytecode, has its own {@code .jack} library format, and
+ provides most toolchain features as part of a single tool: repackaging,
+ shrinking, obfuscation and multidex.
+</p>
+
+<p>Here is a comparison of the two toolchains used to build Android DEX files:</p>
+<ul>
+ <li>Legacy javac toolchain:<br>
+ <b>javac</b> ({@code .java} → {@code .class}) → <b>dx</b> ({@code
+ .class} → {@code .dex})
+ </li>
+
+ <li>New Jack toolchain:<br>
+ <b>Jack</b> ({@code .java} → {@code .jack} → {@code .dex})
+ </li>
+</ul>
+
+<h3 id="configure-gradle">
+ Configure Gradle
+</h3>
+
+<p>
+ To enable Java 8 language features and Jack for your project, enter the
+ following in your module-level {@code build.gradle} file:
+</p>
+
+<pre>
+android {
+ ...
+ defaultConfig {
+ ...
+ jackOptions {
+ enabled true
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+</pre>
+
+<h3 id="known-issues">
+ Known issues
+</h3>
+
+<p>
+ <a href="{@docRoot}tools/building/building-studio.html#instant-run">Instant
+ Run</a> does not currently work with Jack and will be disabled while using
+ the new toolchain.
+</p>
+
+<p>Because Jack does not generate intermediate class files when compiling an
+app, tools that depend on these files do not currently work with Jack. Some
+examples of these tools are:</p>
+
+<ul>
+ <li>Lint detectors that operate on class files
+ </li>
+
+ <li>Tools and libraries that require the app’s class files (such as
+ instrumentation tests with JaCoCo)
+ </li>
+</ul>
+
+<p>If you find other issues while using Jack, <a href=
+"http://tools.android.com/filing-bugs">please file a bug</a>.</p>
\ No newline at end of file
diff --git a/docs/html/guide/practices/compatibility.jd b/docs/html/guide/practices/compatibility.jd
index 83e841c..fb3db84 100644
--- a/docs/html/guide/practices/compatibility.jd
+++ b/docs/html/guide/practices/compatibility.jd
@@ -114,7 +114,7 @@
<p>If necessary, you can prevent users from installing your app when their devices don't provide a
given feature by declaring it with a <a href=
-"{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
+"{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
element in your app's <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest
file</a>.</p>
@@ -164,7 +164,7 @@
on this feature and make your app available to devices without Bluetooth by setting the <a href=
"{@docRoot}guide/topics/manifest/uses-feature-element.html#required">{@code required}</a> attribute
to {@code "false"} in the <a href=
-"{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a> tag.
+"{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a> tag.
For more information about implicitly required device features, read <a href=
"{@docRoot}guide/topics/manifest/uses-feature-element.html#permissions">Permissions that Imply
Feature Requirements</a>.</p>
@@ -180,7 +180,7 @@
<p>The API level allows you to declare the minimum version with which your app is
compatible, using the <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code
-<uses-sdk>}</a> manifest tag and its
+<uses-sdk>}</a> manifest tag and its
<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a>
attribute.</p>
diff --git a/docs/html/guide/practices/index.jd b/docs/html/guide/practices/index.jd
index b61272b..f34a6ba 100644
--- a/docs/html/guide/practices/index.jd
+++ b/docs/html/guide/practices/index.jd
@@ -1,7 +1,7 @@
page.title=Best Practices
excludeFromSuggestions=true
page.landing=true
-page.landing.intro=Design and build apps the right way. Learn how to create apps that look great and perform well on as many devices as possible, from phones to tablets and more.
+page.landing.intro=Design and build apps the right way. Learn how to create apps that look great and perform well on as many devices as possible, from phones to tablets and more.
page.landing.image=
@jd:body
@@ -10,20 +10,20 @@
<div class="col-12">
<h3>Blog Articles</h3>
-
+
<a href="http://android-developers.blogspot.com/2010/10/improving-app-quality.html">
<h4>Improving App Quality</h4>
<p>One way of improving your app’s visibility in the ecosystem is by deploying well-targeted
mobile advertising campaigns and cross-app promotions. However, there’s another time-tested method
of fueling the impression-install-ranking cycle: improve the product!</p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2012/01/say-goodbye-to-menu-button.html">
<h4>Say Goodbye to the Menu Button</h4>
<p>As Ice Cream Sandwich rolls out to more devices, it's important that you begin to migrate
your designs to the action bar in order to promote a consistent Android user experience.</p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2011/07/new-tools-for-managing-screen-sizes.html">
<h4>New Tools For Managing Screen Sizes</h4>
<p>Android 3.2 includes new tools for supporting devices with a wide range of screen sizes.
@@ -31,14 +31,14 @@
tablet. This release also offers several new APIs to simplify developers’ work in adjusting to
different screen sizes.</p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2011/03/identifying-app-installations.html">
<h4>Identifying App Installations</h4>
<p>It is very common, and perfectly reasonable, for a developer to want to track individual
installations of their apps. It sounds plausible just to call TelephonyManager.getDeviceId() and use
that value to identify the installation. There are problems with this</p>
</a>
-
+
<a
href="http://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html">
<h4>Making Android Games that Play Nice</h4>
@@ -46,7 +46,7 @@
often multi-core, multi-purpose system like Android is trickier. Even the best developers frequently
make mistakes in the way they interact with the Android system and with other applications</p>
</a>
-
+
</div>
diff --git a/docs/html/guide/practices/optimizing-for-3.0.jd b/docs/html/guide/practices/optimizing-for-3.0.jd
index 8d07eb9..db45e19 100644
--- a/docs/html/guide/practices/optimizing-for-3.0.jd
+++ b/docs/html/guide/practices/optimizing-for-3.0.jd
@@ -4,7 +4,7 @@
<div id="deprecatedSticker">
- <a href="#"
+ <a href="#"
onclick="$('#naMessage').show();$('#deprecatedSticker').hide();return false">
<strong>This doc is deprecated</strong></a>
</div>
@@ -181,7 +181,7 @@
<li>Perform your usual tests to be sure everything works and looks as expected.</li>
</ol>
</li>
-
+
<li><b>Apply the new "holographic" theme to your application</b>
<ol>
<li>Open your manifest file and update the <a
@@ -191,7 +191,7 @@
android:targetSdkVersion}</a> to {@code "11"}. For example:
<pre>
<manifest ... >
- <uses-sdk android:minSdkVersion="4"
+ <uses-sdk android:minSdkVersion="4"
android:targetSdkVersion="11" />
<application ... >
...
@@ -446,7 +446,7 @@
GridView.</li>
<li><a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html">
-Content Loaders</a>: An example using new Loader APIs to asynchronously load data.</li>
+Content Loaders</a>: An example using new Loader APIs to asynchronously load data.</li>
<li><a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/animation/index.html">
Property Animation</a>: Several samples using the new animation APIs to animate object
@@ -624,7 +624,7 @@
application can function in landscape. Even if you want to avoid rotating the screen while your
application is running, you should not assume that portrait is the device's default orientation. You
should either ensure that your layout is usable in both portrait and landscape orientations or
-provide an <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources"
+provide an <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources"
>alternative layout resource</a> for landscape orientation.</p>
<p>If you believe your application or game provides its best experience when the screen is tall,
diff --git a/docs/html/guide/practices/screen-compat-mode.jd b/docs/html/guide/practices/screen-compat-mode.jd
index 34580ba..18a089e 100644
--- a/docs/html/guide/practices/screen-compat-mode.jd
+++ b/docs/html/guide/practices/screen-compat-mode.jd
@@ -75,7 +75,7 @@
href="{@docRoot}guide/topics/manifest/supports-screens-element.html#resizeable">{@code
android:resizeable}</a> to {@code "true"}.</p>
</dd>
-
+
<dt>Version 2 (Android 3.2 and greater)</dt>
<dd>The system draws the application's layout the same as
it would on a normal size handset (approximately emulating a 320dp x 480dp screen), then scales it
@@ -151,9 +151,9 @@
system will always resize your layout to fit the screen. This works regardless of what values
you've set in the <a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a>
-attributes.</p>
+attributes.</p>
</li>
-
+
<li><strong>Easy but has other effects:</strong>
<p>In your manifest's <a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a>
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index 2223dbf..ea9f988 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -139,7 +139,7 @@
<p>The density-independent pixel is equivalent to one physical pixel on a 160 dpi screen, which is
the baseline density assumed by the system for a "medium" density screen. At runtime, the system
transparently handles any scaling of the dp units, as necessary, based on the actual density of the
-screen in use. The conversion of dp units to screen pixels is simple:
+screen in use. The conversion of dp units to screen pixels is simple:
<nobr><code>px = dp * (dpi / 160)</code></nobr>.
For example, on a 240 dpi screen, 1 dp equals 1.5 physical pixels. You should always use dp units
when defining your application's UI, to ensure proper display of your UI on screens with different
@@ -214,7 +214,7 @@
</ul>
<p class="note"><strong>Note:</strong> These minimum screen sizes were not as well defined prior to
-Android 3.0, so you may encounter some devices that are mis-classified between normal and large.
+Android 3.0, so you may encounter some devices that are mis-classified between normal and large.
These are also based on the physical resolution of the screen, so may vary across devices—for
example a 1024x720 tablet with a system bar actually has a bit less space available to the
application due to it being used by the system bar.</p>
@@ -904,7 +904,7 @@
manifest element:</p>
<dl>
-
+
<dt><a
href="{@docRoot}guide/topics/manifest/supports-screens-element.html#requiresSmallest">
{@code android:requiresSmallestWidthDp}</a></dt>
diff --git a/docs/html/guide/practices/tablets-and-handsets.jd b/docs/html/guide/practices/tablets-and-handsets.jd
index 85327b6..a1bafd3 100644
--- a/docs/html/guide/practices/tablets-and-handsets.jd
+++ b/docs/html/guide/practices/tablets-and-handsets.jd
@@ -89,7 +89,7 @@
</li>
- <li><strong>Use the action bar</strong>, but follow best practices and ensure your design
+ <li><strong>Use the action bar</strong>, but follow best practices and ensure your design
is flexible enough for the system to adjust the action bar layout based on the screen size.
<p>The {@link android.app.ActionBar} is a UI component for activities that replaces the traditional
diff --git a/docs/html/guide/practices/ui_guidelines/activity_task_design.jd b/docs/html/guide/practices/ui_guidelines/activity_task_design.jd
index f6669e4..b66fdd4 100644
--- a/docs/html/guide/practices/ui_guidelines/activity_task_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/activity_task_design.jd
@@ -8,7 +8,7 @@
<div id="deprecatedSticker">
- <a href="#"
+ <a href="#"
onclick="$('#naMessage').show();$('#deprecatedSticker').hide();return false">
<strong>This doc is deprecated</strong></a>
</div>
@@ -105,7 +105,7 @@
<p>
It illustrates activities and tasks with examples, and describes some
of their underlying principles and mechanisms, such as navigation,
- multitasking, activity re-use, intents, and the activity stack.
+ multitasking, activity re-use, intents, and the activity stack.
The document also highlights design decisions that are available to you
and what control they give you over the UI of your application.
</p>
@@ -146,7 +146,7 @@
<p>
An Android <em>application</em> typically consists of one or more
- related, loosely bound activities <!--(and possibly
+ related, loosely bound activities <!--(and possibly
<a href=#services_broadcast_receivers title="other components">other
components</a>)--> for the user to interact with, typically bundled up
in a single file (with an .apk suffix). Android ships with a rich set
@@ -186,10 +186,10 @@
seamless, activity after activity, <a href="#tasks">task</a> after
task.
</p>
-
+
<p>
An activity handles a particular type of content (data) and accepts a
- set of related user actions. Each activity has a
+ set of related user actions. Each activity has a
<a href="{@docRoot}guide/components/activities.html#Lifecycle">lifecycle</a> that is
independent of the other
activities in its application or task — each activity is
@@ -283,7 +283,7 @@
to the activity stack, so that pressing <em>Back</em> displays the previous
activity on the stack. However, the user cannot use the <em>Back</em> button to go
back further than the last visit to Home. The adding of an activity to
- the current stack happens whether or not that activity begins a new
+ the current stack happens whether or not that activity begins a new
<a href=#tasks title=task>task</a> (as long as that task was started
without going Home), so going back can let the user go back to
activities in previous tasks. The user can get to tasks earlier than
@@ -297,7 +297,7 @@
designing the navigation, if you have screen A and you want the user
to be able go to a subsequent screen B and then use the <em>Back</em> button to go
back to screen A, then the screen A needs to be implemented as an
- activity. The one exception to this rule is if your application
+ activity. The one exception to this rule is if your application
<a href="#taking_over_back_key">takes control of the <em>Back</em> button</a> and manages the
navigation
itself.
@@ -340,7 +340,7 @@
Send a text message with an attachment
</li>
<li>
- View a YouTube video and share it by email with someone else
+ View a YouTube video and share it by email with someone else
</li>
</ul>
@@ -666,7 +666,7 @@
mailto:info@example.com link, they are actually initiating an Intent
object, or just an <em>intent</em>, which then gets resolved to a
particular component (we consider only activity components here).
- So, the result of a user touching a mailto: link is an Intent object
+ So, the result of a user touching a mailto: link is an Intent object
that the system tries to match to an activity. If that Intent object was
written explicitly naming an activity (an <em>explicit intent</em>),
then the system immediately launches that activity in response to the user
@@ -925,7 +925,7 @@
For instance, you could disable the user control that initiates
the Intent object, or display a message to the user that lets them go
to a location, such as Google Play, to download its application.
- In this way, your code can start the activity (using either startActivity()
+ In this way, your code can start the activity (using either startActivity()
or startActivityForResult()) only if the intent has tested to resolve
to an activity that is actually present.
</p>
@@ -947,7 +947,7 @@
launcher</em> (typically implemented as a sliding drawer on the
Home screen), or from a shortcut icon on the Home screen, or
from the task switcher. (The mechanism for this is for the
- activity to have an
+ activity to have an
<a href={@docRoot}guide/components/intents-filters.html>intent filter</a> with action
MAIN and
category LAUNCHER.)
@@ -1103,7 +1103,7 @@
activity to be run.
</p>
-
+
<h3 id="notifications_get_back_tip">Notifications and App Widgets should provide consistent back behavior</h3>
<p>
Notifications and app widgets are two common ways that a user can launch
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design.jd b/docs/html/guide/practices/ui_guidelines/icon_design.jd
index 0726660..6b546c9 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design.jd
@@ -58,7 +58,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
@@ -72,13 +72,13 @@
<p>This document provides information to help you create icons for various parts
of your application’s user interface that match the general styles used by the
-Android 2.x framework. Following these guidelines will help you to create a
+Android 2.x framework. Following these guidelines will help you to create a
polished and unified experience for the user.</p>
<p>The following documents discuss detailed guidelines for the common types of
icons used throughout Android applications:</p>
-<dl>
+<dl>
<dt><strong><a href="icon_design_launcher.html">Launcher Icons</a></strong></dt>
<dd>A Launcher icon is a graphic that represents your application on the
device's Home screen and in the Launcher window.</dd>
@@ -103,7 +103,7 @@
graphically represent list items. An example is the Settings application.</dd>
</dl>
-<p>To get started creating your icons more quickly, you can download
+<p>To get started creating your icons more quickly, you can download
the Android Icon Templates Pack.</p>
@@ -142,7 +142,7 @@
<p>Android is designed to run on a variety of devices that offer a range of
screen sizes and resolutions. When you design the icons for your application,
it's important keep in mind that your application may be installed on any of
-those devices. As described in the <a
+those devices. As described in the <a
href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple
Screens</a> document, the Android platform makes it straightforward for you to
provide icons in such a way that they will be displayed properly on any device,
@@ -158,7 +158,7 @@
href="{@docRoot}guide/practices/screens_support.html#qualifiers">Resource
directory qualifiers for screen size and density</a>. </p>
-<p>For tips on how to create and manage icon sets for multiple densities, see
+<p>For tips on how to create and manage icon sets for multiple densities, see
<a href="#design-tips">Tips for Designers</a>.</p>
@@ -290,7 +290,7 @@
cleaner to tweak the icons when you scale the artboard down to the target
sizes for final asset creation.</p>
-
+
<h3>When scaling, redraw bitmap layers as needed</h3>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd b/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd
index 831de45..37657f4 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd
@@ -31,7 +31,7 @@
</div>
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd b/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd
index c958ed9..a7ee73f 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd
@@ -29,7 +29,7 @@
</div>
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd b/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd
index f47e186..3bb1a62 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd
@@ -28,7 +28,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_launcher_archive.jd b/docs/html/guide/practices/ui_guidelines/icon_design_launcher_archive.jd
index 2df3a22..483e076 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_launcher_archive.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_launcher_archive.jd
@@ -95,7 +95,7 @@
share with others on the device. Figure 1, at right, provides examples. </p>
<div class="figure">
- <img src="{@docRoot}images/icon_design/IconGraphic_Icons_i.png"
+ <img src="{@docRoot}images/icon_design/IconGraphic_Icons_i.png"
width="340">
<p class="img-caption">
<strong>Figure 1.</strong> Example launcher icons for Android 2.0 and
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_list.jd b/docs/html/guide/practices/ui_guidelines/icon_design_list.jd
index 29e1a93..fa350bc 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_list.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_list.jd
@@ -30,7 +30,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd b/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd
index a5b3597..25b23d0 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd
@@ -34,7 +34,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
@@ -267,7 +267,7 @@
appropriate. For example, in Figure 3 the logical place for rounded corners is
the roof and not the rest of the building.</span></li>
-<li>All dimensions specified on this page are based on a 48x48 pixel artboard
+<li>All dimensions specified on this page are based on a 48x48 pixel artboard
size with a 6 pixel safeframe.</li>
<li>The menu icon effect (the outer glow) described in <a
@@ -277,7 +277,7 @@
<li><strong>Final art must be exported as a transparent PNG file.</strong></li>
-<li>Templates for creating menu icons in Adobe Photoshop are available in the
+<li>Templates for creating menu icons in Adobe Photoshop are available in the
Icon Templates Pack.</li>
</ul>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd b/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd
index 4993adb..27df450 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd
@@ -42,7 +42,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd b/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd
index cbe6706..308e6d0 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd
@@ -34,7 +34,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
@@ -291,10 +291,10 @@
the Android platform.</p>
<p class="warning"><strong>Warning:</strong>
-Because these resources can change between platform versions, you
+Because these resources can change between platform versions, you
should not reference the system's copy of the resources. If you want to
use any icons or other internal drawable resources, you should store a
-local copy of those icons or drawables in your application resources,
+local copy of those icons or drawables in your application resources,
then reference the local copy from your application code. In that way, you can
maintain control over the appearance of your icons, even if the system's
copy changes. Note that the grid below is not intended to be complete.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/index.jd b/docs/html/guide/practices/ui_guidelines/index.jd
index 91a0725..713109c 100644
--- a/docs/html/guide/practices/ui_guidelines/index.jd
+++ b/docs/html/guide/practices/ui_guidelines/index.jd
@@ -7,7 +7,7 @@
<div class="note design" style="background:none;overflow:auto;padding:10px 5px">
<a href="{@docRoot}design/index.html"><img src="{@docRoot}images/home/android-design.png" alt=""
style="float:left;margin:0 1em 0 0;"/></a>
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>The Android UX team has put together a set of guidelines for the interaction and
visual design of Android applications. The new collection provides an overview of
Android styles, design patterns, building blocks for exceptional Android designs, and more.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/menu_design.jd b/docs/html/guide/practices/ui_guidelines/menu_design.jd
index bf87bdd..9497525 100644
--- a/docs/html/guide/practices/ui_guidelines/menu_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/menu_design.jd
@@ -8,7 +8,7 @@
<div id="deprecatedSticker">
- <a href="#"
+ <a href="#"
onclick="$('#naMessage').show();$('#deprecatedSticker').hide();return false">
<strong>This doc is deprecated</strong></a>
</div>
@@ -16,7 +16,7 @@
<div id="naMessage" style="display:block">
<div><p><strong>This document has been deprecated.</strong></p>
- <p>For design guidelines about adding user actions and other options, read the design guidelines
+ <p>For design guidelines about adding user actions and other options, read the design guidelines
for <a href="{@docRoot}design/patterns/actionbar.html">Action Bar</a> or the developer guide about
<a href="{@docRoot}guide/topics/ui/menus.html">Menus</a>.</p>
@@ -25,7 +25,7 @@
onclick="$('#naMessage').hide();$('#deprecatedSticker').show()" />
</div>
</div>
-
+
@@ -37,7 +37,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>Quickview</h2>
<ul>
@@ -85,15 +85,15 @@
</ol>
</div>
-</div>
+</div>
<p>
A menu holds a set of commands (user actions) that are normally hidden, and
are accessible by a button, key, or gesture. Menu commands provide a means
- for performing operations and for navigating to other parts of your
+ for performing operations and for navigating to other parts of your
application or other applications. Menus are useful for freeing screen space,
as an alternative to placing functionality and navigation, in buttons or other
- user controls in the content area of your application.
+ user controls in the content area of your application.
</p>
<p>
@@ -102,7 +102,7 @@
the functionality and navigation for your application. Briefly:
<ul>
<li>The <em>Options menu</em> contains primary functionality that applies
- globally to the current activity or starts a related activity.
+ globally to the current activity or starts a related activity.
It is typically invoked by a user pressing a hard button, often labeled <em>Menu</em>.</li>
<li>The <em>Context menu</em> contains secondary functionality for the currently
selected item. It is typically invoked by a user's touch & hold
@@ -113,11 +113,11 @@
<p>
All but the simplest applications have menus. The system automatically
- lays the menus out and provides standard ways for users to access them.
+ lays the menus out and provides standard ways for users to access them.
In this sense, they are familiar and dependable ways for users to access
functionality across all applications. All menus are panels that "float"
on top of the activity screen and are smaller than full screen, so that the
- application is still visible around its edges. This is a visual reminder
+ application is still visible around its edges. This is a visual reminder
that a menu is an intermediary operation that disappears once it's used.
</p>
@@ -127,8 +127,8 @@
<h2 id="tour_of_the_menus">Tour of the Menus</h2>
-<p class="note"><strong>Note:</strong> Your menus and screens might not look
-like those shown in this document; they may vary from one version of Android
+<p class="note"><strong>Note:</strong> Your menus and screens might not look
+like those shown in this document; they may vary from one version of Android
or device to another.
</p>
@@ -137,13 +137,13 @@
<p>
The Options menu contains commands that apply globally across the current
activity, or can start another activity. They do not apply to a selected
- item in the content (a <a href="#context_menu">Context menu</a> does that).
+ item in the content (a <a href="#context_menu">Context menu</a> does that).
</p>
<p>
- On most devices, a user presses the <em>Menu</em> button to access the Options menu,
- as shown in the screenshot below. To close the menu, the user presses
- <em>Menu</em> again, or presses the <em>Back</em> button.
+ On most devices, a user presses the <em>Menu</em> button to access the Options menu,
+ as shown in the screenshot below. To close the menu, the user presses
+ <em>Menu</em> again, or presses the <em>Back</em> button.
In fact, to cancel out of any menu, press the <em>Back</em> button. (Pressing the <em>Menu</em>
button or touching outside the menu also works.) Note that how to invoke this
menu may be different on different devices.
@@ -153,15 +153,15 @@
Each
<a href="{@docRoot}guide/practices/ui_guidelines/activity_task_design.html#activities">activity</a>
activity has its own set of operations and therefore its own Options menu.
- An application with multiple activities would have a different Options menu
- for each activity.
+ An application with multiple activities would have a different Options menu
+ for each activity.
</p>
<p>
For example, in the message list view of an email program, the Options menu
- might let you search the messages, compose a new message, refresh the list,
- or change the email settings. The compose view of an email program would
- have a different Options menu, such as adding a CC field, attaching a file,
+ might let you search the messages, compose a new message, refresh the list,
+ or change the email settings. The compose view of an email program would
+ have a different Options menu, such as adding a CC field, attaching a file,
or discarding the message.
</p>
@@ -179,7 +179,7 @@
<li>
<b>Options expanded menu</b> - If the activity has more menu items than will
fit on the icon menu, then the last icon is labeled "More" — selecting it
- displays a list that can contain any number of menu items and will scroll
+ displays a list that can contain any number of menu items and will scroll
as necessary.
</li>
</ul>
@@ -202,18 +202,18 @@
<p>
A user can touch & hold on content on the screen to
- access a Context menu (if one exists), as shown in the screenshot below.
+ access a Context menu (if one exists), as shown in the screenshot below.
A Context menu is a list of menu items (commands) that can operate
on the selected content. The command can either be part of the current
- activity, or the system can pass the selected content along to
- an operation in another activity (by way of an
+ activity, or the system can pass the selected content along to
+ an operation in another activity (by way of an
<a href="{@docRoot}guide/practices/ui_guidelines/activity_task_design.html#intents">intent</a>).
</p>
<p>
For example, in an email message list, a user can touch & hold on
an email message to open a Context menu containing commands to read,
- archive, or delete the message.
+ archive, or delete the message.
</p>
<p id="location">
@@ -231,7 +231,7 @@
In the above example, if the user performs touch & hold on the contact
"Obi Wan Kenobi", a Context menu opens. The commands provided in
this Context menu are the complete set of actions that can be performed
- on this contact.
+ on this contact.
</p>
<p>
@@ -246,7 +246,7 @@
<p>
Also note, as shown in the following screenshot, the Context menu and the
next screen both hold the same complete set of commands that can be performed
- on this contact. The Context menu displays the commands in a list,
+ on this contact. The Context menu displays the commands in a list,
while the "View contact" activity splits them into various items in the
Options menu, icon buttons and list items.
</p>
@@ -268,10 +268,10 @@
<h4>Text Commands in Context Menu</h4>
<p>
- Text links and text fields in the content both have system-provided operations
+ Text links and text fields in the content both have system-provided operations
that are common across all applications: operations such as "Select all", "Select text",
- "Copy all", and "Add to dictionary". If the text field is editable, it also
- has other operations, such as "Cut all" and "Input Method", and if text
+ "Copy all", and "Add to dictionary". If the text field is editable, it also
+ has other operations, such as "Cut all" and "Input Method", and if text
is also on the clipboard, it has "Paste". The system automatically inserts
the appropriate menu items into the Context menu of text links and text
fields, as shown in the following screenshot.
@@ -342,7 +342,7 @@
An example of a selection-specific Context menu is when a user performs a
touch & hold on a person's name in a list view of a contacts application.
The Context menu would typically contain commands "View contact", "Call contact",
- and "Edit contact".
+ and "Edit contact".
</p>
<h3 id="most_frequently_used">Place the most frequently used operations first</h3>
@@ -365,7 +365,7 @@
<h3 id="dont_put_commands">Don't put commands <em>only</em> in a Context menu</h3>
<p>
- If a user can fully access your application without using Context menus,
+ If a user can fully access your application without using Context menus,
then it's designed properly! In general, if part of your application is inaccessible
without using Context menus, then you need to duplicate those commands elsewhere.
</p>
@@ -373,8 +373,8 @@
<p>
Before opening a Context menu, it has no visual representation that identifies
its presence (whereas the Options menu has the <em>Menu</em> button), and so is not
- particularly discoverable.
- Therefore, in general, a Context menu should <em>duplicate</em> commands
+ particularly discoverable.
+ Therefore, in general, a Context menu should <em>duplicate</em> commands
found in the corresponding activity screen. For example, while it's useful to
let the user call a phone number from a Context menu invoked by touch
& hold on a name in a list of contacts, that operation should <em>also</em>
@@ -388,7 +388,7 @@
As described under <a href="#context_menu_shortcut">shortcut</a>,
touching on an item in the content should activate the same command as touching
the first item in the Context menu. Both cases should be the most intuitive
- operation for that item.
+ operation for that item.
</p>
<h3 id="selecting_content_item">Selecting an item in the content should perform the most intuitive operation</h3>
@@ -427,13 +427,13 @@
<h3 id="context_menu_should_identify">A Context menu should identify the selected item</h3>
<p>
- When a user does touch & hold on an item, the Context menu should
- contain the name of the selected item. Therefore,
+ When a user does touch & hold on an item, the Context menu should
+ contain the name of the selected item. Therefore,
when creating a Context menu, be sure to include a title and the name of the
- selected item so that it's clear to the user what the context is.
+ selected item so that it's clear to the user what the context is.
For example, if a user selects a contact "Joan of Arc", put that name in the
title of the Context menu (using
- {@link android.view.ContextMenu#setHeaderTitle(java.lang.CharSequence) setHeaderTitle}).
+ {@link android.view.ContextMenu#setHeaderTitle(java.lang.CharSequence) setHeaderTitle}).
Likewise, a command to edit the contact should be called "Edit contact",
not just "Edit".
</p>
@@ -442,7 +442,7 @@
<h3 id="most_important_commands">Put only the most important commands fixed on the screen</h3>
<p>
- By putting commands in menus, you free up the screen to hold more content.
+ By putting commands in menus, you free up the screen to hold more content.
On the other hand, fixing commands in the content area of an activity
makes them more prominent and easy to use.
</p>
@@ -456,7 +456,7 @@
To give a command the highest prominence, ensuring the command is obvious and won't be overlooked.<br>
Example: A "Buy" button in a store application.
</li>
- <li>
+ <li>
When quick access to the command is important and going to the menu would be
tedious or slow.<br>
Example: Next/Previous buttons or Zoom In/Out buttons in an image viewing application.
@@ -494,7 +494,7 @@
When a dialog is displayed, pressing the <em>Menu</em> button should do nothing. This also holds
true
for activities that look like dialogs. A dialog box is recognizable by being
- smaller than full-screen, having zero to three buttons, is non-scrollable, and
+ smaller than full-screen, having zero to three buttons, is non-scrollable, and
possibly a list of selectable items that can include checkboxes or radio buttons.
<!--For examples of dialogs, see Text Guidelines.-->
</p>
@@ -520,12 +520,12 @@
<p>
Sometimes a menu item's action cannot be performed — for example,
- the "Forward" button in a browser cannot work until after the "Back"
+ the "Forward" button in a browser cannot work until after the "Back"
button has been pressed. We recommend:
</p>
<ul>
- <li>
+ <li>
<b>In Options menu</b> - disable the menu item, which dims the text and icon,
turning it gray. This applies to menu items in both the icon menu and the
"More" menu. It would be disorienting for the icon menu to change from 6
diff --git a/docs/html/guide/practices/ui_guidelines/widget_design.jd b/docs/html/guide/practices/ui_guidelines/widget_design.jd
index cf2cd64..95c594d 100644
--- a/docs/html/guide/practices/ui_guidelines/widget_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/widget_design.jd
@@ -46,7 +46,7 @@
<div class="note design">
-<p><strong>New Guides for App Designers!</strong></p>
+<p><strong>New Guides for App Designers!</strong></p>
<p>Check out the new documents for designers at <strong><a
href="{@docRoot}design/index.html">Android Design</a></strong>.</p>
</div>
diff --git a/docs/html/guide/practices/verifying-apps-art.jd b/docs/html/guide/practices/verifying-apps-art.jd
index 217c65c..2da7c0e 100644
--- a/docs/html/guide/practices/verifying-apps-art.jd
+++ b/docs/html/guide/practices/verifying-apps-art.jd
@@ -2,60 +2,82 @@
@jd:body
<div id="qv-wrapper">
-<div id="qv">
-<h2>Quickview</h2>
- <ul>
- <li>The new Android runtime (ART) is available on some of the newest Android
- devices, though all of them currently have Dalvik as the default
- runtime.</li>
- <li>App developers should make sure their apps are compatible with ART,
- especially if you use JNI to run native code or if you use certain tools
- that produce non-standard code (such as some obfuscators).</li>
- </ul>
+ <div id="qv">
+ <h2 id="Contents">
+ In this document
+ </h2>
- <h2 id="Contents">In this document</h2>
- <ol>
- <li><a href="#GC_Migration">Addressing Garbage Collection (GC) Issues</a></li>
- <li><a href="#JNI_Issues">Preventing JNI Issues</a>
- <ol>
- <li><a href="#JNI_and_GC">Checking JNI code for garbage-collection
- issues</a></li>
- <li><a href="#Error_Handling">Error handling</a></li>
- <li><a href="#Object_Model_Changes">Object model changes</a></li>
- </ol>
- </li>
- <li><a href="#Stack_Size">Preventing Stack Size Issues</a></li>
- <li><a href="#AOT_Fails">Fixing AOT Compilation Issues</a></li>
- <li><a href="#Reporting_Problems">Reporting Problems</a></li>
- </ol>
- <h2>See also</h2>
- <ol>
- <li><a href="http://source.android.com/devices/tech/dalvik/art.html">Introducing ART</a></li>
- <li><a
-href="http://android-developers.blogspot.com/2011/07/debugging-android-jni-with-checkjni.html">Debugging
-Android JNI with CheckJNI</a></li>
- </ol>
-</div>
+ <ol>
+ <li>
+ <a href="#GC_Migration">Addressing Garbage Collection (GC) Issues</a>
+ </li>
+
+ <li>
+ <a href="#JNI_Issues">Preventing JNI Issues</a>
+ <ol>
+ <li>
+ <a href="#JNI_and_GC">Checking JNI code for garbage-collection
+ issues</a>
+ </li>
+
+ <li>
+ <a href="#Error_Handling">Error handling</a>
+ </li>
+
+ <li>
+ <a href="#Object_Model_Changes">Object model changes</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#Stack_Size">Preventing Stack Size Issues</a>
+ </li>
+
+ <li>
+ <a href="#AOT_Fails">Fixing AOT Compilation Issues</a>
+ </li>
+
+ <li>
+ <a href="#Reporting_Problems">Reporting Problems</a>
+ </li>
+ </ol>
+
+ <h2>
+ See also
+ </h2>
+
+ <ol>
+ <li>
+ <a href=
+ "http://source.android.com/devices/tech/dalvik/art.html">Introducing
+ ART</a>
+ </li>
+
+ <li>
+ <a href=
+ "http://android-developers.blogspot.com/2011/07/debugging-android-jni-with-checkjni.html">
+ Debugging Android JNI with CheckJNI</a>
+ </li>
+ </ol>
+ </div>
</div>
-<p>With Android 4.4, we are beginning to roll out a new Android runtime,
-<strong>ART</strong>. This runtime offers a number of new features that improve
-performance and smoothness of the Android platform and apps. (You can find more
-information about ART's new features in <a
-href="http://source.android.com/devices/tech/dalvik/art.html">Introducing
-ART</a>.)</p>
+<p>
+ The Android runtime (ART) is the default runtime for devices running Android
+ 5.0 (API level 21) and higher. This runtime offers a number of features
+ that improve performance and smoothness of the Android platform and apps.
+ You can find more information about ART's new features in <a href=
+ "http://source.android.com/devices/tech/dalvik/art.html">Introducing
+ ART</a>.
+</p>
-<p>Currently, ART is available on a number of Android 4.4 devices, such as the
-Nexus 4, Nexus 5, Nexus 7, and Google Play edition devices.
-At this time, all devices still use Dalvik as the default runtime. We encourage
-you to test your apps for ART compatibility and to take advantage of ART's new
-features. However, for the time being, you should also take care to maintain
-compatibility with Dalvik.</p>
-
-<p>This document lets you know about things to watch for when migrating an
-existing app to be compatible with ART. Most apps should just work when
-running with ART. However, some techniques that work on Dalvik do not work on
-ART. This document discusses some of these issues.</p>
+<p>
+ However, some techniques that work on Dalvik do not work on ART. This
+ document lets you know about things to watch for when migrating an existing
+ app to be compatible with ART. Most apps should just work when running with
+ ART.
+</p>
<h2 id="GC_Migration">Addressing Garbage Collection (GC) Issues</h2>
@@ -147,7 +169,7 @@
<h3 id="Error_Handling">Error handling</h3>
-<p>ART's JNI throws errors in a number of cases where Dalvik didn’t. (Once
+<p>ART's JNI throws errors in a number of cases where Dalvik doesn’t. (Once
again, you can catch many such cases by testing with CheckJNI.)</p>
<p>For example, if <code>RegisterNatives</code> is called with a method that
diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd
index e2fef04..2a8583a 100644
--- a/docs/html/guide/topics/admin/device-admin.jd
+++ b/docs/html/guide/topics/admin/device-admin.jd
@@ -135,60 +135,60 @@
combination of letters and numbers. They may include symbolic characters.
</td>
</tr>
-
+
<tr>
<td>Complex password required</td>
<td>Requires that passwords must contain at least a letter, a numerical digit, and a special symbol. Introduced in Android 3.0.
</td>
</tr>
-
-<tr>
+
+<tr>
<td>Minimum letters required in password</td> <td>The minimum number of
-letters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
+letters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
</tr>
-
-
- <tr>
- <td>Minimum lowercase letters required in password</td>
- <td>The minimum number of lowercase
-letters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
+
+
+ <tr>
+ <td>Minimum lowercase letters required in password</td>
+ <td>The minimum number of lowercase
+letters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
</tr>
-
- <tr>
- <td>Minimum non-letter characters required in password</td>
+
+ <tr>
+ <td>Minimum non-letter characters required in password</td>
<td>The minimum number of
-non-letter characters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
-</tr>
-
-<tr>
- <td>Minimum numerical digits required in password</td>
- <td>The minimum number of numerical digits required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
+non-letter characters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
</tr>
-<tr>
- <td>Minimum symbols required in password</td>
- <td>The minimum number of symbols required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
+<tr>
+ <td>Minimum numerical digits required in password</td>
+ <td>The minimum number of numerical digits required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
</tr>
-<tr>
- <td>Minimum uppercase letters required in password</td>
- <td>The minimum number of uppercase letters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
+<tr>
+ <td>Minimum symbols required in password</td>
+ <td>The minimum number of symbols required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
</tr>
-<tr>
- <td>Password expiration timeout</td>
- <td>When the password will expire, expressed as a delta in milliseconds from when a device admin sets the expiration timeout. Introduced in Android 3.0.</td>
+<tr>
+ <td>Minimum uppercase letters required in password</td>
+ <td>The minimum number of uppercase letters required in the password for all admins or a particular one. Introduced in Android 3.0.</td>
</tr>
-<tr>
- <td>Password history restriction</td>
+<tr>
+ <td>Password expiration timeout</td>
+ <td>When the password will expire, expressed as a delta in milliseconds from when a device admin sets the expiration timeout. Introduced in Android 3.0.</td>
+</tr>
+
+<tr>
+ <td>Password history restriction</td>
<td>This policy prevents users from reusing the last <em>n</em> unique passwords.
This policy is typically used in conjunction with
{@link android.app.admin.DevicePolicyManager#setPasswordExpirationTimeout(android.content.ComponentName,long) setPasswordExpirationTimeout()}, which forces
users to update their passwords after a specified amount of time has elapsed.
-Introduced in Android 3.0.</td>
+Introduced in Android 3.0.</td>
</tr>
-
+
<tr>
<td>Maximum failed password attempts </td>
<td>Specifies how many times a user can enter the wrong password before the
@@ -203,18 +203,18 @@
need to enter their PIN or passwords again before they can use their devices and
access data. The value can be between 1 and 60 minutes.</td> </tr>
-<tr>
-<td>Require storage encryption</td>
-<td>Specifies that the storage area should be encrypted, if the device supports it.
+<tr>
+<td>Require storage encryption</td>
+<td>Specifies that the storage area should be encrypted, if the device supports it.
Introduced in Android 3.0.</td> </tr>
<tr>
<td>Disable camera</td>
-
+
<td>Specifies that the camera should be disabled. Note that this doesn't have
to be a permanent disabling. The camera can be enabled/disabled dynamically
based on context, time, and so on. Introduced in Android 4.0.</td>
-
+
</tr>
@@ -234,7 +234,7 @@
<p>The examples used in this document are based on the Device Administration API
sample, which is included in the SDK samples (available through the
-Android SDK Manager) and located on your system as
+Android SDK Manager) and located on your system as
<code><sdk_root>/ApiDemos/app/src/main/java/com/example/android/apis/app/DeviceAdminSample.java</code>.</p>
<p>The sample application offers a demo of device admin features. It presents users
@@ -250,8 +250,8 @@
<li>Set how many failed password attempts can occur before the device is wiped
(that is, restored to factory settings).</li>
<li>Set how long from now the password will expire.</li>
-<li>Set the password history length (<em>length</em> refers to number of old passwords stored in the history).
-This prevents users from reusing
+<li>Set the password history length (<em>length</em> refers to number of old passwords stored in the history).
+This prevents users from reusing
one of the last <em>n</em> passwords they previously used.</li>
<li>Specify that the storage area should be encrypted, if the device supports it.</li>
<li>Set the maximum amount of inactive time that can elapse before the device
@@ -259,7 +259,7 @@
<li>Make the device lock immediately.</li>
<li>Wipe the device's data (that is, restore factory settings).</li>
<li>Disable the camera.</li>
-
+
</ul>
@@ -454,8 +454,8 @@
<img src="{@docRoot}images/admin/device-admin-activate-prompt.png"/>
<p class="img-caption"><strong>Figure 2.</strong> Sample Application: Activating the Application</p>
-<p>Below is the code that gets executed when the user clicks the <strong>Enable Admin</strong> checkbox. This has the effect of triggering the
-{@link android.preference.Preference.OnPreferenceChangeListener#onPreferenceChange(android.preference.Preference, java.lang.Object) onPreferenceChange()}
+<p>Below is the code that gets executed when the user clicks the <strong>Enable Admin</strong> checkbox. This has the effect of triggering the
+{@link android.preference.Preference.OnPreferenceChangeListener#onPreferenceChange(android.preference.Preference, java.lang.Object) onPreferenceChange()}
callback. This callback is invoked when the value of this {@link android.preference.Preference} has been changed by the user and is about to be set and/or persisted. If the user is enabling the application, the display
changes to prompt the user to activate the device admin application, as shown in figure
2. Otherwise, the device admin application is disabled. </p>
@@ -556,7 +556,7 @@
<dt>{@link
android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_COMPLEX}</dt><dd>The user
must have entered a password containing at least a letter, a numerical digit and
-a special symbol.</dd>
+a special symbol.</dd>
<dt>{@link
android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_SOMETHING}</dt><dd>The
policy requires some kind
@@ -581,7 +581,7 @@
contents:</p>
<ul>
-<li>{@link android.app.admin.DevicePolicyManager#setPasswordMinimumLetters(android.content.ComponentName,int) setPasswordMinimumLetters()}</li>
+<li>{@link android.app.admin.DevicePolicyManager#setPasswordMinimumLetters(android.content.ComponentName,int) setPasswordMinimumLetters()}</li>
<li>{@link android.app.admin.DevicePolicyManager#setPasswordMinimumLowerCase(android.content.ComponentName,int) setPasswordMinimumLowerCase()}</li>
@@ -622,8 +622,8 @@
mDPM.setMaximumFailedPasswordsForWipe(mDeviceAdminSample, maxFailedPw);</pre>
<h5 id="expiration">Set password expiration timeout</h5>
-<p>Beginning with Android 3.0, you can use the
-{@link android.app.admin.DevicePolicyManager#setPasswordExpirationTimeout(android.content.ComponentName,long) setPasswordExpirationTimeout()}
+<p>Beginning with Android 3.0, you can use the
+{@link android.app.admin.DevicePolicyManager#setPasswordExpirationTimeout(android.content.ComponentName,long) setPasswordExpirationTimeout()}
method to set when a password will expire, expressed as a delta in milliseconds from when a device admin sets the expiration timeout. For example:</p>
<pre>DevicePolicyManager mDPM;
@@ -632,18 +632,18 @@
...
mDPM.setPasswordExpirationTimeout(mDeviceAdminSample, pwExpiration);
</pre>
-
+
<h5 id="history">Restrict password based on history</h5>
-<p>Beginning with Android 3.0, you can use the
-{@link android.app.admin.DevicePolicyManager#setPasswordHistoryLength(android.content.ComponentName,int) setPasswordHistoryLength()}
+<p>Beginning with Android 3.0, you can use the
+{@link android.app.admin.DevicePolicyManager#setPasswordHistoryLength(android.content.ComponentName,int) setPasswordHistoryLength()}
method to limit users'
ability to reuse old passwords. This method takes a <em>length</em>
parameter, which specifies how many old
passwords are stored. When this policy is active, users cannot enter a new
password that matches the last <em>n</em> passwords. This prevents
users from using the same password over and over. This policy is typically used
-in conjunction with
+in conjunction with
{@link android.app.admin.DevicePolicyManager#setPasswordExpirationTimeout(android.content.ComponentName,long) setPasswordExpirationTimeout()},
which forces users
to update their passwords after a specified amount of time has elapsed. </p>
@@ -705,7 +705,7 @@
<h4 id="storage">Storage encryption</h4>
<p>Beginning with Android 3.0, you can use the
-{@link android.app.admin.DevicePolicyManager#setStorageEncryption(android.content.ComponentName,boolean) setStorageEncryption()}
+{@link android.app.admin.DevicePolicyManager#setStorageEncryption(android.content.ComponentName,boolean) setStorageEncryption()}
method to set a policy requiring encryption of the storage area, where supported.</p>
<p>For example:</p>
diff --git a/docs/html/guide/topics/appwidgets/host.jd b/docs/html/guide/topics/appwidgets/host.jd
index 169e388..7b00019 100644
--- a/docs/html/guide/topics/appwidgets/host.jd
+++ b/docs/html/guide/topics/appwidgets/host.jd
@@ -4,7 +4,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#host-binding">Binding App Widgets</a>
@@ -32,58 +32,58 @@
access to content. If you're building a Home replacement or a similar app,
you can also allow the user to embed app widgets by implementing an
{@link android.appwidget.AppWidgetHost}.
-This is not something that most apps will ever need to do, but if you are
-creating your own host, it's important to understand the contractual obligations
+This is not something that most apps will ever need to do, but if you are
+creating your own host, it's important to understand the contractual obligations
a host implicitly agrees to.</p>
-<p>This document focuses on the responsibilities involved in implementing a custom
-{@link android.appwidget.AppWidgetHost}. For an example of how to implement an
+<p>This document focuses on the responsibilities involved in implementing a custom
+{@link android.appwidget.AppWidgetHost}. For an example of how to implement an
{@link android.appwidget.AppWidgetHost}, see the source code for the
-Android Home screen
+Android Home screen
<a href="https://android.googlesource.com/platform/packages/apps/Launcher2/+/master/src/com/android/launcher2/Launcher.java">
-Launcher</a>.
+Launcher</a>.
-<p>Here is an overview of key classes and concepts involved in implementing a custom
+<p>Here is an overview of key classes and concepts involved in implementing a custom
{@link android.appwidget.AppWidgetHost}:</p>
<ul>
- <li><strong>App Widget Host</strong>—
- The {@link android.appwidget.AppWidgetHost} provides the interaction
-with the AppWidget service for apps, like the home screen, that want to embed
-app widgets in their UI. An {@link android.appwidget.AppWidgetHost} must have
-an ID that is unique within the host's own package. This ID remains persistent
+ <li><strong>App Widget Host</strong>—
+ The {@link android.appwidget.AppWidgetHost} provides the interaction
+with the AppWidget service for apps, like the home screen, that want to embed
+app widgets in their UI. An {@link android.appwidget.AppWidgetHost} must have
+an ID that is unique within the host's own package. This ID remains persistent
across all uses of the host. The ID is typically a hard-coded value that you assign
in your application.</li>
-
+
<li><strong>App Widget ID</strong>—
- Each app widget instance is assigned a unique ID at the time of binding
-(see {@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed bindAppWidgetIdIfAllowed()},
-discussed in more detail in <a href="#binding">Binding app widgets</a>).
-The unique ID is obtained by the host using {@link android.appwidget.AppWidgetHost#allocateAppWidgetId() allocateAppWidgetId()}. This ID is persistent across the lifetime of the widget,
-that is, until it is deleted from the host. Any host-specific state (such as the
-size and location of the widget) should be persisted by the hosting package and
+ Each app widget instance is assigned a unique ID at the time of binding
+(see {@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed bindAppWidgetIdIfAllowed()},
+discussed in more detail in <a href="#binding">Binding app widgets</a>).
+The unique ID is obtained by the host using {@link android.appwidget.AppWidgetHost#allocateAppWidgetId() allocateAppWidgetId()}. This ID is persistent across the lifetime of the widget,
+that is, until it is deleted from the host. Any host-specific state (such as the
+size and location of the widget) should be persisted by the hosting package and
associated with the app widget ID.
</li>
-
- <li><strong>App Widget Host View</strong>—
- {@link android.appwidget.AppWidgetHostView} can be thought of as a frame
-that the widget is wrapped in whenever it needs to be displayed. An app widget
-is assigned to an {@link android.appwidget.AppWidgetHostView} every time the
+
+ <li><strong>App Widget Host View</strong>—
+ {@link android.appwidget.AppWidgetHostView} can be thought of as a frame
+that the widget is wrapped in whenever it needs to be displayed. An app widget
+is assigned to an {@link android.appwidget.AppWidgetHostView} every time the
widget is inflated by the host. </li>
<li><strong>Options Bundle</strong>—
-The {@link android.appwidget.AppWidgetHost} uses the options bundle to communicate
-information to the {@link android.appwidget.AppWidgetProvider} about how the
-widget is being displayed (for example, size range, and whether the widget is on
-a lockscreen or the home screen). This information allows the
-{@link android.appwidget.AppWidgetProvider} to tailor the widget's contents
+The {@link android.appwidget.AppWidgetHost} uses the options bundle to communicate
+information to the {@link android.appwidget.AppWidgetProvider} about how the
+widget is being displayed (for example, size range, and whether the widget is on
+a lockscreen or the home screen). This information allows the
+{@link android.appwidget.AppWidgetProvider} to tailor the widget's contents
and appearance based on how and where it is displayed.
-You use
+You use
{@link android.appwidget.AppWidgetHostView#updateAppWidgetOptions(android.os.Bundle) updateAppWidgetOptions()}
-and
+and
{@link android.appwidget.AppWidgetHostView#updateAppWidgetSize updateAppWidgetSize()}
-to modify an app widget's
-bundle. Both of these methods trigger a callback to the
+to modify an app widget's
+bundle. Both of these methods trigger a callback to the
{@link android.appwidget.AppWidgetProvider}.</p></li>
</ul>
@@ -98,15 +98,15 @@
<h3 id="binding-pre">Binding app widgets on Android 4.0 and lower</h3>
-<p>On devices running Android version 4.0 and lower, users add app widgets
-via a system activity that allows users to select a widget. This implicitly
-does a permission check—that is, by adding the app widget, the user is
-implicitly granting permission to your app to add app widgets to the host.
-Here is an example that illustrates
-this approach, taken from the original
-<a href="https://android.googlesource.com/platform/packages/apps/Launcher/+/master/src/com/android/launcher/Launcher.java">Launcher</a>. In this snippet, an event handler invokes
-{@link android.app.Activity#startActivityForResult(android.content.Intent,int) startActivityForResult()}
-with the request code {@code REQUEST_PICK_APPWIDGET} in response to a
+<p>On devices running Android version 4.0 and lower, users add app widgets
+via a system activity that allows users to select a widget. This implicitly
+does a permission check—that is, by adding the app widget, the user is
+implicitly granting permission to your app to add app widgets to the host.
+Here is an example that illustrates
+this approach, taken from the original
+<a href="https://android.googlesource.com/platform/packages/apps/Launcher/+/master/src/com/android/launcher/Launcher.java">Launcher</a>. In this snippet, an event handler invokes
+{@link android.app.Activity#startActivityForResult(android.content.Intent,int) startActivityForResult()}
+with the request code {@code REQUEST_PICK_APPWIDGET} in response to a
user action:</p>
<pre>
@@ -118,9 +118,9 @@
...
case AddAdapter.ITEM_APPWIDGET: {
...
- int appWidgetId =
+ int appWidgetId =
Launcher.this.mAppWidgetHost.allocateAppWidgetId();
- Intent pickIntent =
+ Intent pickIntent =
new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK);
pickIntent.putExtra
(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
@@ -135,7 +135,7 @@
app widget to your activity. In the following example, the activity responds
by calling {@code addAppWidget()} to add the app widget:</p>
-<pre>public final class Launcher extends Activity
+<pre>public final class Launcher extends Activity
implements View.OnClickListener, OnLongClickListener {
...
@Override
@@ -152,7 +152,7 @@
completeAddAppWidget(data, mAddItemCellInfo, !mDesktopLocked);
break;
}
- }
+ }
...
}
}</pre>
@@ -164,7 +164,7 @@
int appWidgetId = data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
String customWidget = data.getStringExtra(EXTRA_CUSTOM_WIDGET);
- AppWidgetProviderInfo appWidget =
+ AppWidgetProviderInfo appWidget =
mAppWidgetManager.getAppWidgetInfo(appWidgetId);
if (appWidget.configure != null) {
@@ -183,7 +183,7 @@
App Widget Configuration Activity</a>.</p>
<p>Once the app widget is ready, the next step is to do the
-actual work of adding it to the workspace. The
+actual work of adding it to the workspace. The
<a href="https://android.googlesource.com/platform/packages/apps/Launcher/+/master/src/com/android/launcher/Launcher.java">original Launcher</a> uses a method called {@code completeAddAppWidget()}
to do this.</p>
@@ -201,12 +201,12 @@
<p>But this is just the first step. At runtime the user must
explicitly grant permission to your app to allow it to add app widgets
to the host. To test whether your app has permission to add the widget,
-you use the
-{@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed bindAppWidgetIdIfAllowed()}
-method.
+you use the
+{@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed bindAppWidgetIdIfAllowed()}
+method.
If {@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed bindAppWidgetIdIfAllowed()}
returns {@code false}, your app must display a dialog prompting the
-user to grant permission
+user to grant permission
("allow" or "always allow," to cover all future app widget additions).
This snippet gives an example of how to display the dialog:</p>
@@ -218,9 +218,9 @@
startActivityForResult(intent, REQUEST_BIND_APPWIDGET);
</pre>
-<p>The host also has to check whether the user added
+<p>The host also has to check whether the user added
an app widget that needs configuration. For more discussion of this topic,
-see
+see
<a href="{@docRoot}guide/topics/appwidgets/index.html#Configuring">Creating
an App Widget Configuration Activity</a>.</p>
@@ -229,23 +229,23 @@
<div class="sidebox-wrapper">
<div class="sidebox">
<h2>What Version are You Targeting?</h2>
- <p>The approach you use in implementing your host should depend on what Android version
-you're targeting. Many of the features described in this section were introduced
+ <p>The approach you use in implementing your host should depend on what Android version
+you're targeting. Many of the features described in this section were introduced
in 3.0 or later. For example:</p>
<ul>
<li>Android 3.0 (API Level 11) introduces auto-advance behavior for widgets.</li>
<li>Android 3.1 (API Level 12) introduces the ability to resize widgets.</li>
<li>Android 4.0 (API Level 15) introduces a change in padding policy that
-puts the responsibility on the
+puts the responsibility on the
host to manage padding.</li>
<li>Android 4.1 (API Level 16) adds an API that allows the widget provider
to get more detailed information about the environment in which its
widget instances are being hosted.</li>
-<li>Android 4.2 (API Level 17) introduces the options bundle and the
-{@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed(int,android.content.ComponentName,android.os.Bundle) bindAppWidgetIdIfAllowed()}
+<li>Android 4.2 (API Level 17) introduces the options bundle and the
+{@link android.appwidget.AppWidgetManager#bindAppWidgetIdIfAllowed(int,android.content.ComponentName,android.os.Bundle) bindAppWidgetIdIfAllowed()}
method. It also introduces lockscreen widgets.</li>
</ul>
-<p>If you are targeting earlier devices, refer to the original
+<p>If you are targeting earlier devices, refer to the original
<a href="https://android.googlesource.com/platform/packages/apps/Launcher/+/master/src/com/android/launcher/Launcher.java">Launcher</a> as an example.
</div>
</div>
@@ -273,7 +273,7 @@
they can be properly displayed.</li>
<li>Every app widget specifies a minimum width and height in dps, as defined in the {@link android.appwidget.AppWidgetProviderInfo} metadata
-(using {@link android.appwidget.AppWidgetProviderInfo#minWidth android:minWidth} and
+(using {@link android.appwidget.AppWidgetProviderInfo#minWidth android:minWidth} and
{@link android.appwidget.AppWidgetProviderInfo#minHeight android:minHeight}).
Make sure that the widget is laid out with at least this many dps.
For example, many hosts align icons and widgets in a grid. In this scenario,
@@ -379,7 +379,7 @@
for your app—for example, if your host is a home screen, ensure
that the
{@link android.appwidget.AppWidgetProviderInfo#widgetCategory android:widgetCategory}
-attribute in the
+attribute in the
{@link android.appwidget.AppWidgetProviderInfo} metadata includes
the flag {@link android.appwidget.AppWidgetProviderInfo#WIDGET_CATEGORY_HOME_SCREEN}.
Similarly, for the lockscreen, ensure that field includes the flag {@link android.appwidget.AppWidgetProviderInfo#WIDGET_CATEGORY_KEYGUARD}. For more
diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd
index c9575e0..7d555ed 100644
--- a/docs/html/guide/topics/appwidgets/index.jd
+++ b/docs/html/guide/topics/appwidgets/index.jd
@@ -4,7 +4,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#Basics">The Basics</a></li>
@@ -21,7 +21,7 @@
Activity</a>
<ol>
<li><a href="#UpdatingFromTheConfiguration">Updating the App Widget
-from
+from
the Configuration Activity</a></li>
</ol>
</li>
@@ -33,7 +33,7 @@
collections
</a></li>
<li><a href="#fresh">Keeping Collection Data Fresh</a></li>
- </ol>
+ </ol>
</li>
</ol>
@@ -50,10 +50,10 @@
<p>App Widgets are miniature application views that can be embedded in other
applications
(such as the Home screen) and receive periodic updates. These views are
-referred
+referred
to as Widgets in the user interface,
and you can publish one with an App Widget provider. An application component
-that is
+that is
able to hold other App Widgets is called an App Widget host. The screenshot
below shows
the Music App Widget.</p>
@@ -85,14 +85,14 @@
<dd>Defines the basic methods that allow you to programmatically interface
with the App Widget,
based on broadcast events. Through it, you will receive broadcasts when the
-App Widget is updated,
+App Widget is updated,
enabled, disabled and deleted.</dd>
<dt>View layout</dt>
<dd>Defines the initial layout for the App Widget, defined in XML.</dd>
</dl>
<p>Additionally, you can implement an App Widget configuration Activity. This is
-an optional
+an optional
{@link android.app.Activity} that launches when the user adds your App Widget
and allows him or her
to modify App Widget settings at create-time.</p>
@@ -117,7 +117,7 @@
</pre>
<p>The <code><receiver></code> element requires the
-<code>android:name</code>
+<code>android:name</code>
attribute, which specifies the {@link android.appwidget.AppWidgetProvider} used
by the App Widget.</p>
@@ -133,7 +133,7 @@
necessary.</p>
<p>The <code><meta-data></code> element specifies the
-{@link android.appwidget.AppWidgetProviderInfo} resource and requires the
+{@link android.appwidget.AppWidgetProviderInfo} resource and requires the
following attributes:</p>
<ul>
<li><code>android:name</code> - Specifies the metadata name. Use
@@ -141,21 +141,21 @@
to identify the data as the {@link android.appwidget.AppWidgetProviderInfo}
descriptor.</li>
<li><code>android:resource</code> - Specifies the {@link
-android.appwidget.AppWidgetProviderInfo}
+android.appwidget.AppWidgetProviderInfo}
resource location.</li>
</ul>
<h2 id="MetaData">Adding the AppWidgetProviderInfo Metadata</h2>
-<p>The {@link android.appwidget.AppWidgetProviderInfo} defines the essential
+<p>The {@link android.appwidget.AppWidgetProviderInfo} defines the essential
qualities of an App Widget, such as its minimum layout dimensions, its initial
layout resource,
how often to update the App Widget, and (optionally) a configuration Activity to
launch at create-time.
Define the AppWidgetProviderInfo object in an XML resource using a single
<code><appwidget-provider></code> element and save it in the project's
-<code>res/xml/</code>
+<code>res/xml/</code>
folder.</p>
<p>For example:</p>
@@ -167,7 +167,7 @@
android:updatePeriodMillis="86400000"
android:previewImage="@drawable/preview"
android:initialLayout="@layout/example_appwidget"
- android:configure="com.example.android.ExampleAppWidgetConfigure"
+ android:configure="com.example.android.ExampleAppWidgetConfigure"
android:resizeMode="horizontal|vertical"
android:widgetCategory="home_screen">
</appwidget-provider>
@@ -206,33 +206,33 @@
<li>The <code>updatePeriodMillis</code> attribute defines how often the App
Widget framework should request an update from the {@link
-android.appwidget.AppWidgetProvider} by calling the
-{@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context,android.appwidget.AppWidgetManager,int[]) onUpdate()}
+android.appwidget.AppWidgetProvider} by calling the
+{@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context,android.appwidget.AppWidgetManager,int[]) onUpdate()}
callback method. The actual update
is not guaranteed to occur exactly on time with this value and we suggest
updating as infrequently as possible—perhaps no more than once an hour to
conserve the battery. You might also allow the user to adjust the frequency in a
configuration—some people might want a stock ticker to update every 15
-minutes, or maybe only four times a day.
+minutes, or maybe only four times a day.
<p class="note"><strong>Note:</strong> If the device is asleep when it
-is time for an update
+is time for an update
(as defined by <code>updatePeriodMillis</code>), then the device will
-wake up in order
+wake up in order
to perform the update. If you don't update more than once per hour, this
-probably won't
+probably won't
cause significant problems for the battery life. If, however, you need
-to update more
+to update more
frequently and/or you do not need to update while the device is asleep,
-then you can instead
+then you can instead
perform updates based on an alarm that will not wake the device. To do
-so, set an alarm with
+so, set an alarm with
an Intent that your AppWidgetProvider receives, using the {@link
-android.app.AlarmManager}.
+android.app.AlarmManager}.
Set the alarm type to either {@link
-android.app.AlarmManager#ELAPSED_REALTIME} or
+android.app.AlarmManager#ELAPSED_REALTIME} or
{@link android.app.AlarmManager#RTC}, which will only
deliver the alarm when the device is awake. Then set
-<code>updatePeriodMillis</code> to
+<code>updatePeriodMillis</code> to
zero (<code>"0"</code>).</p>
</li>
<li>The <code>initialLayout</code> attribute points to the layout resource
@@ -244,7 +244,7 @@
Widget properties. This is optional
(read <a href="#Configuring">Creating an App Widget Configuration
Activity</a> below).</li>
-
+
<li>The <code>previewImage</code> attribute specifies a preview of what the
app widget will look like after it's configured, which the user sees when
selecting the app widget. If not supplied, the user instead sees your
@@ -255,7 +255,7 @@
Image</a>. Introduced in Android 3.0.</li>
<li>The <code>autoAdvanceViewId</code> attribute specifies the view ID of the
-app widget subview that should be auto-advanced by the widget's host. Introduced in Android 3.0.</li>
+app widget subview that should be auto-advanced by the widget's host. Introduced in Android 3.0.</li>
<li>The <code>resizeMode</code> attribute specifies the rules by which a widget
can be resized. You use this attribute to make homescreen widgets
@@ -264,7 +264,7 @@
handles to change the size on the layout grid. Values for the
<code>resizeMode</code> attribute include "horizontal", "vertical", and "none".
To declare a widget as resizeable horizontally and vertically, supply the value
-"horizontal|vertical". Introduced in Android 3.1.</li>
+"horizontal|vertical". Introduced in Android 3.1.</li>
<li>The <code>minResizeHeight</code> attribute specifies the minimum height (in dps) to which
the widget can be resized. This field has no effect if it is greater than {@code minHeight} or if
@@ -296,7 +296,7 @@
below, but before you begin designing your App Widget, please read and
understand the
<a href="{@docRoot}guide/practices/ui_guidelines/widget_design.html">App Widget
-Design
+Design
Guidelines</a>.</p>
<p>Creating the App Widget layout is simple if you're
@@ -306,7 +306,7 @@
android.widget.RemoteViews},
which do not support every kind of layout or view widget.</p>
-<p>A RemoteViews object (and, consequently, an App Widget) can support the
+<p>A RemoteViews object (and, consequently, an App Widget) can support the
following layout classes:</p>
<ul class="nolist">
@@ -334,7 +334,7 @@
<p>Descendants of these classes are not supported.</p>
-<p>RemoteViews also supports {@link android.view.ViewStub}, which is an invisible, zero-sized View you can use
+<p>RemoteViews also supports {@link android.view.ViewStub}, which is an invisible, zero-sized View you can use
to lazily inflate layout resources at runtime.</p>
@@ -386,7 +386,7 @@
<div class="sidebox-wrapper">
<div class="sidebox">
<p>You must declare your AppWidgetProvider class implementation as a
-broadcast receiver
+broadcast receiver
using the <code><receiver></code> element in the AndroidManifest (see
<a href="#Manifest">Declaring an App Widget in the Manifest</a> above).</p>
</div>
@@ -403,11 +403,11 @@
<dl>
<dt>
- {@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context,android.appwidget.AppWidgetManager,int[]) onUpdate()}
+ {@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context,android.appwidget.AppWidgetManager,int[]) onUpdate()}
</dt>
<dd>This is called to update the App Widget at intervals defined by the
<code>updatePeriodMillis</code>
- attribute in the AppWidgetProviderInfo (see <a href="#MetaData">Adding the
+ attribute in the AppWidgetProviderInfo (see <a href="#MetaData">Adding the
AppWidgetProviderInfo Metadata</a> above). This method is also called
when the user adds the App Widget, so it should perform the essential setup,
such as define event handlers for Views and start a temporary
@@ -415,25 +415,25 @@
configuration
Activity, <strong>this method is not called</strong> when the user adds the
App Widget,
- but is called for the subsequent updates. It is the responsibility of the
+ but is called for the subsequent updates. It is the responsibility of the
configuration Activity to perform the first update when configuration is
done.
(See <a href="#Configuring">Creating an App Widget Configuration
-Activity</a> below.)</dd>
+Activity</a> below.)</dd>
<dt>
- {@link android.appwidget.AppWidgetProvider#onAppWidgetOptionsChanged onAppWidgetOptionsChanged()}
+ {@link android.appwidget.AppWidgetProvider#onAppWidgetOptionsChanged onAppWidgetOptionsChanged()}
</dt>
<dd>
This is called when the widget is first placed and any time the widget is resized. You can use this callback to show or hide content based on the widget's size ranges. You get the size ranges by calling {@link android.appwidget.AppWidgetManager#getAppWidgetOptions getAppWidgetOptions()}, which returns a {@link android.os.Bundle} that includes the following:<br /><br />
<ul>
- <li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MIN_WIDTH}—Contains
+ <li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MIN_WIDTH}—Contains
the lower bound on the current width, in dp units, of a widget instance.</li>
- <li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MIN_HEIGHT}—Contains
+ <li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MIN_HEIGHT}—Contains
the lower bound on the current height, in dp units, of a widget instance.</li>
<li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MAX_WIDTH}—Contains
the upper bound on the current width, in dp units, of a widget instance.</li>
- <li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MAX_HEIGHT}—Contains
+ <li>{@link android.appwidget.AppWidgetManager#OPTION_APPWIDGET_MAX_HEIGHT}—Contains
the upper bound on the current width, in dp units, of a widget instance.</li>
</ul>
@@ -444,34 +444,34 @@
host.</dd>
<dt>{@link android.appwidget.AppWidgetProvider#onEnabled(Context)}</dt>
<dd>This is called when an instance the App Widget is created for the first
-time. For example, if the user
+time. For example, if the user
adds two instances of your App Widget, this is only called the first time.
If you need to open a new database or perform other setup that only needs to
-occur once
- for all App Widget instances, then this is a good place to do it.</dd>
+occur once
+ for all App Widget instances, then this is a good place to do it.</dd>
<dt>{@link android.appwidget.AppWidgetProvider#onDisabled(Context)}</dt>
<dd>This is called when the last instance of your App Widget is deleted from
-the App Widget host.
- This is where you should clean up any work done in
- {@link android.appwidget.AppWidgetProvider#onEnabled(Context)},
- such as delete a temporary database.</dd>
+the App Widget host.
+ This is where you should clean up any work done in
+ {@link android.appwidget.AppWidgetProvider#onEnabled(Context)},
+ such as delete a temporary database.</dd>
<dt>{@link android.appwidget.AppWidgetProvider#onReceive(Context,Intent)}</dt>
<dd>This is called for every broadcast and before each of the above callback
methods.
You normally don't need to implement this method because the default
-AppWidgetProvider
- implementation filters all App Widget broadcasts and calls the above
- methods as appropriate.</dd>
+AppWidgetProvider
+ implementation filters all App Widget broadcasts and calls the above
+ methods as appropriate.</dd>
</dl>
-<p>The most important AppWidgetProvider callback is
-{@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]) onUpdate()}
+<p>The most important AppWidgetProvider callback is
+{@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]) onUpdate()}
because it is called when
each App Widget is added to a host (unless you use a configuration Activity). If
your App Widget accepts any user interaction events, then you need to register
the event handlers in this callback. If your App Widget doesn't create temporary
-files or databases, or perform other work that requires clean-up, then
-{@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]) onUpdate()}
+files or databases, or perform other work that requires clean-up, then
+{@link android.appwidget.AppWidgetProvider#onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]) onUpdate()}
may be the only callback
method you need to define. For example, if you want an App Widget with a button
that launches an Activity when clicked, you could use the following
@@ -503,9 +503,9 @@
}
</pre>
-<p>This AppWidgetProvider defines only the
+<p>This AppWidgetProvider defines only the
{@link
-android.appwidget.AppWidgetProvider#onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]) onUpdate()}
+android.appwidget.AppWidgetProvider#onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]) onUpdate()}
method for the purpose of
defining a {@link android.app.PendingIntent} that launches an {@link
android.app.Activity} and attaching it to the App Widget's button with {@link
@@ -528,8 +528,8 @@
android.content.BroadcastReceiver} for information about the broadcast
lifecycle). If your App Widget setup process can take several seconds (perhaps
while performing web requests) and you require that your process continues,
-consider starting a {@link android.app.Service} in the
-{@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[]) onUpdate()}
+consider starting a {@link android.app.Service} in the
+{@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[]) onUpdate()}
method. From within the Service, you can perform your own updates
to the App Widget without worrying about the AppWidgetProvider closing down due
to an <a href="{@docRoot}guide/practices/responsiveness.html">Application
@@ -537,7 +537,7 @@
href="http://code.google.com/p/wiktionary-android/source/browse/trunk/Wiktionary/src/com/example/android/wiktionary/WordWidget.java">Wiktionary sample's AppWidgetProvider</a> for an example of an App Widget running a {@link
android.app.Service}.</p>
-<p>Also see the <a
+<p>Also see the <a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetProvider.html">ExampleAppWidgetProvider.java</a>
sample class.</p>
@@ -546,9 +546,9 @@
<p>{@link android.appwidget.AppWidgetProvider} is just a convenience class. If
you would like
-to receive the App Widget broadcasts directly, you can implement your own
-{@link android.content.BroadcastReceiver} or override the
-{@link android.appwidget.AppWidgetProvider#onReceive(Context,Intent)} callback.
+to receive the App Widget broadcasts directly, you can implement your own
+{@link android.content.BroadcastReceiver} or override the
+{@link android.appwidget.AppWidgetProvider#onReceive(Context,Intent)} callback.
The Intents you need to care about are as follows:</p>
<ul>
<li>{@link android.appwidget.AppWidgetManager#ACTION_APPWIDGET_UPDATE}</li>
@@ -565,11 +565,11 @@
<p>If you would like the user to configure settings when he or she adds a new
App Widget,
you can create an App Widget configuration Activity. This {@link
-android.app.Activity}
+android.app.Activity}
will be automatically launched by the App Widget host and allows the user to
configure
available settings for the App Widget at create-time, such as the App Widget
-color, size,
+color, size,
update period or other functionality settings.</p>
<p>The configuration Activity should be declared as a normal Activity in the
@@ -588,8 +588,8 @@
</pre>
<p>Also, the Activity must be declared in the AppWidgetProviderInfo XML file,
-with the
-<code>android:configure</code> attribute (see <a href="#MetaData">Adding
+with the
+<code>android:configure</code> attribute (see <a href="#MetaData">Adding
the AppWidgetProviderInfo Metadata</a> above). For example, the configuration
Activity
can be declared like this:</p>
@@ -597,13 +597,13 @@
<pre>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
...
- android:configure="com.example.android.ExampleAppWidgetConfigure"
+ android:configure="com.example.android.ExampleAppWidgetConfigure"
... >
</appwidget-provider>
</pre>
<p>Notice that the Activity is declared with a fully-qualified namespace,
-because
+because
it will be referenced from outside your package scope.</p>
<p>That's all you need to get started with a configuration Activity. Now all you
@@ -612,21 +612,21 @@
implement the Activity:</p>
<ul>
<li>The App Widget host calls the configuration Activity and the configuration
-Activity should always
+Activity should always
return a result. The result should include the App Widget ID
passed by the Intent that launched the Activity (saved in the Intent extras
as
{@link android.appwidget.AppWidgetManager#EXTRA_APPWIDGET_ID}).</li>
- <li>The
- {@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[]) onUpdate()}
+ <li>The
+ {@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[]) onUpdate()}
method <strong>will not be called</strong> when the App Widget
is created
(the system will not send the ACTION_APPWIDGET_UPDATE broadcast when a
configuration Activity
is launched). It is the responsibility of the configuration Activity to
-request an update from the
- AppWidgetManager when the App Widget is first created. However,
-{@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[]) onUpdate()}
+request an update from the
+ AppWidgetManager when the App Widget is first created. However,
+{@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[]) onUpdate()}
will be called for subsequent updates—it is only skipped
the first time.</li>
</ul>
@@ -641,8 +641,8 @@
<p>When an App Widget uses a configuration Activity, it is the responsibility of
the Activity
-to update the App Widget when configuration is complete.
-You can do so by requesting an update directly from the
+to update the App Widget when configuration is complete.
+You can do so by requesting an update directly from the
{@link android.appwidget.AppWidgetManager}.</p>
<p>Here's a summary of the procedure to properly update the App Widget and close
@@ -655,7 +655,7 @@
Bundle extras = intent.getExtras();
if (extras != null) {
mAppWidgetId = extras.getInt(
- AppWidgetManager.EXTRA_APPWIDGET_ID,
+ AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID);
}
</pre>
@@ -696,7 +696,7 @@
cancelled and the
App Widget will not be added.</p>
-<p>See the <a
+<p>See the <a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.html">ExampleAppWidgetConfigure.java</a>
sample class in ApiDemos for an example.</p>
@@ -708,7 +708,7 @@
android.appwidget.AppWidgetProviderInfo#previewImage} field, which specifies a
preview of what the app widget looks like. This preview is shown to the user from the
widget picker. If this field is not supplied, the app widget's icon is used for
-the preview.</p>
+the preview.</p>
<p>This is how you specify this setting in XML:</p>
@@ -742,12 +742,12 @@
<dt>{@link android.widget.GridView}</dt>
<dd>A view that shows items in
two-dimensional scrolling grid. For an example, see the Bookmarks app
-widget.</dd>
+widget.</dd>
<dt>{@link android.widget.StackView}</dt>
<dd>A
stacked card view (kind of like a rolodex), where the user can flick the front
card up/down to see the previous/next card, respectively. Examples include
-the YouTube and Books app widgets. </dd>
+the YouTube and Books app widgets. </dd>
<dt>{@link android.widget.AdapterViewFlipper}</dt>
<dd>An adapter-backed simple
{@link
@@ -764,7 +764,7 @@
context of an app widget, the {@link android.widget.Adapter} is replaced by a
{@link android.widget.RemoteViewsService.RemoteViewsFactory RemoteViewsFactory},
which is simply a thin wrapper around the {@link android.widget.Adapter}
-interface.
+interface.
When
requested for a specific item in the collection, the {@link
android.widget.RemoteViewsService.RemoteViewsFactory RemoteViewsFactory} creates
@@ -782,7 +782,7 @@
android.widget.ListView}, {@link android.widget.GridView}, and so on) and the
underlying data for that view. From the <a
href="{@docRoot}resources/samples/StackWidget/index.html">StackView Widget
-sample</a>, here is an example of the boilerplate code you use to implement
+sample</a>, here is an example of the boilerplate code you use to implement
this service and interface:
</p>
@@ -813,13 +813,13 @@
<p>This sample consists of a stack of 10 views, which display the values
<code>"0!"</code> through <code>"9!"</code> The sample
-app widget has these primary behaviors:</p>
+app widget has these primary behaviors:</p>
<ul>
<li>The user can vertically fling the top view in the
app widget to display the next or previous view. This is a built-in StackView
-behavior.</li>
+behavior.</li>
<li>Without any user interaction, the app widget automatically advances
through
@@ -828,17 +828,17 @@
<code>res/xml/stackwidgetinfo.xml</code> file. This setting applies to the view
ID,
which in this case is the view ID of the stack view.</li>
-
+
<li>If the user touches the top view, the app widget displays the {@link
android.widget.Toast} message "Touched view <em>n</em>," where
<em>n</em> is the index (position) of the touched view. For more discussion of
-how this is implemented, see
+how this is implemented, see
<a href="#behavior">Adding behavior to individual items</a>.</li>
</ul>
<h3 id="implementing_collections">Implementing app widgets with collections</h3>
-<p>To implement an app widget with collections, you follow the same basic steps
+<p>To implement an app widget with collections, you follow the same basic steps
you would use to implement any app widget. The following sections describe the
additional steps you need to perform to implement an app widget with
collections.</p>
@@ -940,7 +940,7 @@
int[] appWidgetIds) {
// update each of the app widgets with the remote adapter
for (int i = 0; i < appWidgetIds.length; ++i) {
-
+
// Set up the intent that starts the StackViewService, which will
// provide the views for this collection.
Intent intent = new Intent(context, StackWidgetService.class);
@@ -949,13 +949,13 @@
intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
// Instantiate the RemoteViews object for the app widget layout.
RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
- // Set up the RemoteViews object to use a RemoteViews adapter.
+ // Set up the RemoteViews object to use a RemoteViews adapter.
// This adapter connects
// to a RemoteViewsService through the specified intent.
// This is how you populate the data.
rv.setRemoteAdapter(appWidgetIds[i], R.id.stack_view, intent);
-
- // The empty view is displayed when the collection has no items.
+
+ // The empty view is displayed when the collection has no items.
// It should be in the same layout used to instantiate the RemoteViews
// object above.
rv.setEmptyView(R.id.stack_view, R.id.empty_view);
@@ -963,12 +963,12 @@
//
// Do additional processing specific to this app widget...
//
-
- appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
+
+ appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
}
super.onUpdate(context, appWidgetManager, appWidgetIds);
}</pre>
-
+
<h4>RemoteViewsService class</h4>
<div class="sidebox-wrapper">
@@ -984,7 +984,7 @@
<p>As described above, your {@link android.widget.RemoteViewsService} subclass
provides the {@link android.widget.RemoteViewsService.RemoteViewsFactory
-RemoteViewsFactory} used to populate the remote collection view.</p>
+RemoteViewsFactory} used to populate the remote collection view.</p>
<p>Specifically, you need to
perform these steps:</p>
@@ -993,7 +993,7 @@
<li>Subclass {@link android.widget.RemoteViewsService}. {@link
android.widget.RemoteViewsService} is the service through which
a remote adapter can request {@link android.widget.RemoteViews}. </li>
-
+
<li>In your {@link android.widget.RemoteViewsService} subclass, include a
class that implements the {@link
android.widget.RemoteViewsService.RemoteViewsFactory RemoteViewsFactory}
@@ -1027,12 +1027,12 @@
<p>The two most important methods you need to implement for your
{@link android.widget.RemoteViewsService.RemoteViewsFactory RemoteViewsFactory}
-subclass are
+subclass are
{@link android.widget.RemoteViewsService.RemoteViewsFactory#onCreate()
onCreate()} and
{@link android.widget.RemoteViewsService.RemoteViewsFactory#getViewAt(int)
getViewAt()}
-.</p>
+.</p>
<p>The system calls {@link
android.widget.RemoteViewsService.RemoteViewsFactory#onCreate() onCreate()} when
@@ -1047,7 +1047,7 @@
<p>Here is an excerpt from the <a
href="{@docRoot}resources/samples/StackWidget/index.html">StackView Widget</a>
-sample's
+sample's
{@link android.widget.RemoteViewsService.RemoteViewsFactory
RemoteViewsFactory} implementation that shows portions of the {@link
android.widget.RemoteViewsService.RemoteViewsFactory#onCreate() onCreate()}
@@ -1081,7 +1081,7 @@
RemoteViewsFactory} method {@link
android.widget.RemoteViewsService.RemoteViewsFactory#getViewAt(int) getViewAt()}
returns a {@link android.widget.RemoteViews} object corresponding to the data at
-the specified <code>position</code> in the data set. Here is an excerpt from
+the specified <code>position</code> in the data set. Here is an excerpt from
the <a
href="http://developer.android.com/resources/samples/StackWidget/index.html">
StackView Widget</a> sample's {@link
@@ -1089,8 +1089,8 @@
implementation:</p>
<pre>public RemoteViews getViewAt(int position) {
-
- // Construct a remote views item based on the app widget item XML file,
+
+ // Construct a remote views item based on the app widget item XML file,
// and set the text based on the position.
RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.widget_item);
rv.setTextViewText(R.id.widget_item, mWidgetItems.get(position).text);
@@ -1104,7 +1104,7 @@
<p>The above sections show you how to bind your data to your app widget
collection. But what if you want to add dynamic behavior to the individual items
-in your collection view?</p>
+in your collection view?</p>
<p> As described in <a href="#AppWidgetProvider">Using the AppWidgetProvider
Class</a>, you normally use {@link
@@ -1122,7 +1122,7 @@
setOnClickFillInIntent()}. This entails setting up up a pending intent template
for your collection view, and then setting a fill-in intent on each item in the
collection via your {@link android.widget.RemoteViewsService.RemoteViewsFactory
-RemoteViewsFactory}.</p>
+RemoteViewsFactory}.</p>
<p>This section uses the <a
href="{@docRoot}resources/samples/StackWidget/index.html">StackView Widget
sample</a> to describe how to add behavior to individual items. In the <a
@@ -1138,7 +1138,7 @@
a custom action called <code>TOAST_ACTION</code>.</li>
<li>When the user touches a view, the intent is fired and it broadcasts
<code>TOAST_ACTION</code>.</li>
-
+
<li>This broadcast is intercepted by the <code>StackWidgetProvider</code>'s
{@link android.appwidget.AppWidgetProvider#onReceive(android.content.Context,
android.content.Intent) onReceive()} method, and the app widget displays the
@@ -1154,7 +1154,7 @@
sample</a> uses a broadcast, but typically an app widget would simply launch an
activity in a scenario like this one.</p>
-<h5>Setting up the pending intent template</h5>
+<h5>Setting up the pending intent template</h5>
<p>The <code>StackWidgetProvider</code> ({@link
android.appwidget.AppWidgetProvider} subclass) sets up a pending intent.
@@ -1162,7 +1162,7 @@
Instead, the collection as a whole sets up a pending intent template, and the
individual items set a fill-in intent to create unique behavior on an
item-by-item
-basis.</p>
+basis.</p>
<p>This class also receives the broadcast that is sent when the user touches a
view. It processes this event in its {@link
@@ -1179,7 +1179,7 @@
...
// Called when the BroadcastReceiver receives an Intent broadcast.
- // Checks to see whether the intent's action is TOAST_ACTION. If it is, the app widget
+ // Checks to see whether the intent's action is TOAST_ACTION. If it is, the app widget
// displays a Toast message for the current item.
@Override
public void onReceive(Context context, Intent intent) {
@@ -1192,12 +1192,12 @@
}
super.onReceive(context, intent);
}
-
+
@Override
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
// update each of the app widgets with the remote adapter
for (int i = 0; i < appWidgetIds.length; ++i) {
-
+
// Sets up the intent that points to the StackViewService that will
// provide the views for this collection.
Intent intent = new Intent(context, StackWidgetService.class);
@@ -1207,7 +1207,7 @@
intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
rv.setRemoteAdapter(appWidgetIds[i], R.id.stack_view, intent);
-
+
// The empty view is displayed when the collection has no items. It should be a sibling
// of the collection view.
rv.setEmptyView(R.id.stack_view, R.id.empty_view);
@@ -1227,13 +1227,13 @@
PendingIntent toastPendingIntent = PendingIntent.getBroadcast(context, 0, toastIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
rv.setPendingIntentTemplate(R.id.stack_view, toastPendingIntent);
-
+
appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
}
super.onUpdate(context, appWidgetManager, appWidgetIds);
}
}</pre>
-
+
<h5><strong>Setting the fill-in Intent</strong></h5>
<p>Your {@link android.widget.RemoteViewsService.RemoteViewsFactory
@@ -1274,17 +1274,17 @@
...
}
...
-
- // Given the position (index) of a WidgetItem in the array, use the item's text value in
+
+ // Given the position (index) of a WidgetItem in the array, use the item's text value in
// combination with the app widget item XML file to construct a RemoteViews object.
public RemoteViews getViewAt(int position) {
// position will always range from 0 to getCount() - 1.
-
+
// Construct a RemoteViews item based on the app widget item XML file, and set the
// text based on the position.
RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.widget_item);
rv.setTextViewText(R.id.widget_item, mWidgetItems.get(position).text);
-
+
// Next, set a fill-intent, which will be used to fill in the pending intent template
// that is set on the collection view in StackWidgetProvider.
Bundle extras = new Bundle();
@@ -1294,9 +1294,9 @@
// Make it possible to distinguish the individual on-click
// action of a given item
rv.setOnClickFillInIntent(R.id.widget_item, fillInIntent);
-
+
...
-
+
// Return the RemoteViews object.
return rv;
}
diff --git a/docs/html/guide/topics/connectivity/bluetooth-le.jd b/docs/html/guide/topics/connectivity/bluetooth-le.jd
index 3d60686..ba742ee 100644
--- a/docs/html/guide/topics/connectivity/bluetooth-le.jd
+++ b/docs/html/guide/topics/connectivity/bluetooth-le.jd
@@ -171,7 +171,7 @@
</pre>
<p>However, if you want to make your app available to devices that don't support BLE,
-you should still include this element in your app's manifest, but set {@code required="false"}.
+you should still include this element in your app's manifest, but set {@code required="false"}.
Then at run-time you can determine BLE availability by using
{@link android.content.pm.PackageManager#hasSystemFeature PackageManager.hasSystemFeature()}:
diff --git a/docs/html/guide/topics/connectivity/bluetooth.jd b/docs/html/guide/topics/connectivity/bluetooth.jd
index 96008c5..42229fd 100644
--- a/docs/html/guide/topics/connectivity/bluetooth.jd
+++ b/docs/html/guide/topics/connectivity/bluetooth.jd
@@ -4,55 +4,55 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
- <ol>
+ <ol>
<li><a href="#TheBasics">The Basics</a></li>
<li><a href="#Permissions">Bluetooth Permissions</a></li>
- <li><a href="#SettingUp">Setting Up Bluetooth</a></li>
- <li><a href="#FindingDevices">Finding Devices</a>
- <ol>
- <li><a href="#QueryingPairedDevices">Querying paired devices</a></li>
- <li><a href="#DiscoveringDevices">Discovering devices</a></li>
- </ol></li>
- <li><a href="#ConnectingDevices">Connecting Devices</a>
- <ol>
- <li><a href="#ConnectingAsAServer">Connecting as a server</a></li>
- <li><a href="#ConnectingAsAClient">Connecting as a client</a></li>
- </ol></li>
+ <li><a href="#SettingUp">Setting Up Bluetooth</a></li>
+ <li><a href="#FindingDevices">Finding Devices</a>
+ <ol>
+ <li><a href="#QueryingPairedDevices">Querying paired devices</a></li>
+ <li><a href="#DiscoveringDevices">Discovering devices</a></li>
+ </ol></li>
+ <li><a href="#ConnectingDevices">Connecting Devices</a>
+ <ol>
+ <li><a href="#ConnectingAsAServer">Connecting as a server</a></li>
+ <li><a href="#ConnectingAsAClient">Connecting as a client</a></li>
+ </ol></li>
<li><a href="#ManagingAConnection">Managing a Connection</a></li>
- <li><a href="#Profiles">Working with Profiles</a>
+ <li><a href="#Profiles">Working with Profiles</a>
<ol>
<li><a href="#AT-Commands">Vendor-specific AT commands</a>
<li><a href="#HDP">Health Device Profile</a>
</ol></li>
- </ol>
-
- <h2>Key classes</h2>
- <ol>
- <li>{@link android.bluetooth.BluetoothAdapter}</li>
- <li>{@link android.bluetooth.BluetoothDevice}</li>
- <li>{@link android.bluetooth.BluetoothSocket}</li>
- <li>{@link android.bluetooth.BluetoothServerSocket}</li>
- </ol>
-
- <h2>Related samples</h2>
- <ol>
- <li><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></li>
+ </ol>
+
+ <h2>Key classes</h2>
+ <ol>
+ <li>{@link android.bluetooth.BluetoothAdapter}</li>
+ <li>{@link android.bluetooth.BluetoothDevice}</li>
+ <li>{@link android.bluetooth.BluetoothSocket}</li>
+ <li>{@link android.bluetooth.BluetoothServerSocket}</li>
+ </ol>
+
+ <h2>Related samples</h2>
+ <ol>
+ <li><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></li>
<li><a href="{@docRoot}resources/samples/BluetoothHDP/index.html">Bluetooth HDP (Health Device Profile)</a></li>
- </ol>
-
-</div>
-</div>
-
-
+ </ol>
+
+</div>
+</div>
+
+
<p>The Android platform includes support for the Bluetooth network stack,
which allows a device to wirelessly exchange data with other Bluetooth devices.
The application framework provides access to the Bluetooth functionality through
the Android Bluetooth APIs. These APIs let applications wirelessly
connect to other Bluetooth devices, enabling point-to-point and multipoint
-wireless features.</p>
-
+wireless features.</p>
+
<p>Using the Bluetooth APIs, an Android application can perform the
following:</p>
<ul>
@@ -75,14 +75,14 @@
<p>This document describes how to use the Android Bluetooth APIs to accomplish
the four major tasks necessary to communicate using Bluetooth: setting up
Bluetooth, finding devices that are either paired or available in the local
-area, connecting devices, and transferring data between devices.</p>
-
+area, connecting devices, and transferring data between devices.</p>
+
<p>All of the Bluetooth APIs are available in the {@link android.bluetooth}
package. Here's a summary of the classes and interfaces you will need to create Bluetooth
-connections:</p>
-
-<dl>
-<dt>{@link android.bluetooth.BluetoothAdapter}</dt>
+connections:</p>
+
+<dl>
+<dt>{@link android.bluetooth.BluetoothAdapter}</dt>
<dd>Represents the local Bluetooth adapter (Bluetooth radio). The
{@link android.bluetooth.BluetoothAdapter} is the entry-point for all Bluetooth
interaction. Using this,
@@ -90,49 +90,49 @@
devices, instantiate a {@link android.bluetooth.BluetoothDevice} using a known
MAC address, and create a {@link android.bluetooth.BluetoothServerSocket} to
listen for communications
-from other devices.</dd>
-
-<dt>{@link android.bluetooth.BluetoothDevice}</dt>
+from other devices.</dd>
+
+<dt>{@link android.bluetooth.BluetoothDevice}</dt>
<dd>Represents a remote Bluetooth device. Use this to request a connection
with a remote device through a {@link android.bluetooth.BluetoothSocket} or
query information about the
-device such as its name, address, class, and bonding state.</dd>
-
-<dt>{@link android.bluetooth.BluetoothSocket}</dt>
+device such as its name, address, class, and bonding state.</dd>
+
+<dt>{@link android.bluetooth.BluetoothSocket}</dt>
<dd>Represents the interface for a Bluetooth socket (similar to a TCP
{@link java.net.Socket}). This is the connection point that allows
an application to exchange data with another Bluetooth device via InputStream
-and OutputStream.</dd>
-
-<dt>{@link android.bluetooth.BluetoothServerSocket}</dt>
+and OutputStream.</dd>
+
+<dt>{@link android.bluetooth.BluetoothServerSocket}</dt>
<dd>Represents an open server socket that listens for incoming requests
(similar to a TCP {@link java.net.ServerSocket}). In order to connect two
Android devices, one device must open a server socket with this class. When a
remote Bluetooth device makes a connection request to the this device, the
{@link android.bluetooth.BluetoothServerSocket} will return a connected {@link
android.bluetooth.BluetoothSocket} when the
-connection is accepted.</dd>
-
-<dt>{@link android.bluetooth.BluetoothClass}</dt>
+connection is accepted.</dd>
+
+<dt>{@link android.bluetooth.BluetoothClass}</dt>
<dd>Describes the general characteristics and capabilities of a Bluetooth
device. This is a read-only set of properties that define the device's major and
minor device classes and its services. However, this does not reliably describe
all Bluetooth profiles and services supported by the device, but is useful as a
-hint to the device type.</dd>
-
+hint to the device type.</dd>
+
<dt>{@link android.bluetooth.BluetoothProfile}</dt> <dd>An interface that
represents a Bluetooth profile. A <em>Bluetooth profile</em> is a wireless
interface specification for Bluetooth-based communication between devices. An
example is the Hands-Free profile. For more discussion of profiles, see <a
-href="#Profiles">Working with Profiles</a></dd>
+href="#Profiles">Working with Profiles</a></dd>
<dt>{@link android.bluetooth.BluetoothHeadset}</dt> <dd>Provides support for
Bluetooth headsets to be used with mobile phones. This includes both Bluetooth
-Headset and Hands-Free (v1.5) profiles.</dd>
+Headset and Hands-Free (v1.5) profiles.</dd>
<dt>{@link android.bluetooth.BluetoothA2dp}</dt> <dd> Defines how high quality
audio can be streamed from one device to another over a Bluetooth connection.
-"A2DP" stands for Advanced Audio Distribution Profile.</dd>
+"A2DP" stands for Advanced Audio Distribution Profile.</dd>
<dt>{@link android.bluetooth.BluetoothHealth}</dt>
<dd> Represents a Health Device Profile proxy that controls the Bluetooth service.</dd>
@@ -146,23 +146,23 @@
<dt>{@link android.bluetooth.BluetoothHealthAppConfiguration}</dt>
-<dd>Represents an application configuration that the Bluetooth Health third-party
+<dd>Represents an application configuration that the Bluetooth Health third-party
application registers to communicate with a remote Bluetooth health
-device.</dd>
+device.</dd>
<dt>{@link android.bluetooth.BluetoothProfile.ServiceListener}</dt>
<dd>An interface that notifies {@link android.bluetooth.BluetoothProfile} IPC
clients when they have been connected to or disconnected from the service (that
is, the internal service that runs a particular profile). </dd>
-
-</dl>
-
-
-
-
-<h2 id="Permissions">Bluetooth Permissions</h2>
-
+
+</dl>
+
+
+
+
+<h2 id="Permissions">Bluetooth Permissions</h2>
+
<p>In order to use Bluetooth features in your application, you must declare
the Bluetooth permission {@link android.Manifest.permission#BLUETOOTH}.
You need this permission to perform any Bluetooth communication,
@@ -175,40 +175,40 @@
permission should not be used, unless the application is a "power manager" that
will modify Bluetooth settings upon user request. <strong>Note:</strong> If you
use {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission, then you must
-also have the {@link android.Manifest.permission#BLUETOOTH} permission.</p>
-
+also have the {@link android.Manifest.permission#BLUETOOTH} permission.</p>
+
<p>Declare the Bluetooth permission(s) in your application manifest file. For
-example:</p>
-
-<pre>
+example:</p>
+
+<pre>
<manifest ... >
<uses-permission android:name="android.permission.BLUETOOTH" />
...
</manifest>
-</pre>
-
+</pre>
+
<p>See the <a
-href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a>
-reference for more information about declaring application permissions.</p>
-
-
-<h2 id="SettingUp">Setting Up Bluetooth</h2>
-
-<div class="figure" style="width:200px">
-<img src="{@docRoot}images/bt_enable_request.png" />
+href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a>
+reference for more information about declaring application permissions.</p>
+
+
+<h2 id="SettingUp">Setting Up Bluetooth</h2>
+
+<div class="figure" style="width:200px">
+<img src="{@docRoot}images/bt_enable_request.png" />
<strong>Figure 1:</strong> The enabling Bluetooth dialog.
-</div>
-
+</div>
+
<p>Before your application can communicate over Bluetooth, you need to verify
-that Bluetooth is supported on the device, and if so, ensure that it is enabled.</p>
-
+that Bluetooth is supported on the device, and if so, ensure that it is enabled.</p>
+
<p>If Bluetooth is not supported, then you should gracefully disable any
Bluetooth features. If Bluetooth is supported, but disabled, then you can request that the
user enable Bluetooth without leaving your application. This setup is
-accomplished in two steps, using the {@link android.bluetooth.BluetoothAdapter}.</p>
-
-
-<ol>
+accomplished in two steps, using the {@link android.bluetooth.BluetoothAdapter}.</p>
+
+
+<ol>
<li>Get the {@link android.bluetooth.BluetoothAdapter}
<p>The {@link android.bluetooth.BluetoothAdapter} is required for any and all Bluetooth
activity. To get the {@link android.bluetooth.BluetoothAdapter}, call the static {@link
@@ -217,15 +217,15 @@
Bluetooth adapter (the Bluetooth radio). There's one Bluetooth adapter for the
entire system, and your application can interact with it using this object. If
{@link android.bluetooth.BluetoothAdapter#getDefaultAdapter()} returns null,
-then the device does not support Bluetooth and your story ends here. For example:</p>
-<pre>
+then the device does not support Bluetooth and your story ends here. For example:</p>
+<pre>
BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (mBluetoothAdapter == null) {
// Device does not support Bluetooth
}
-</pre>
-</li>
-
+</pre>
+</li>
+
<li>Enable Bluetooth
<p>Next, you need to ensure that Bluetooth is enabled. Call {@link
android.bluetooth.BluetoothAdapter#isEnabled()} to check whether Bluetooth is
@@ -234,17 +234,17 @@
android.app.Activity#startActivityForResult(Intent,int) startActivityForResult()}
with the {@link android.bluetooth.BluetoothAdapter#ACTION_REQUEST_ENABLE} action Intent.
This will issue a request to enable Bluetooth through the system settings (without
-stopping your application). For example:</p>
-<pre>
+stopping your application). For example:</p>
+<pre>
if (!mBluetoothAdapter.isEnabled()) {
Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
}
-</pre>
-
+</pre>
+
<p>A dialog will appear requesting user permission to enable Bluetooth, as shown
in Figure 1. If the user responds "Yes," the system will begin to enable Bluetooth
-and focus will return to your application once the process completes (or fails).</p>
+and focus will return to your application once the process completes (or fails).</p>
<p>The {@code REQUEST_ENABLE_BT} constant passed to {@link
android.app.Activity#startActivityForResult(Intent,int) startActivityForResult()} is a locally
@@ -259,9 +259,9 @@
callback. If Bluetooth was not enabled
due to an error (or the user responded "No") then the result code is {@link
android.app.Activity#RESULT_CANCELED}.</p>
-</li>
-</ol>
-
+</li>
+</ol>
+
<p>Optionally, your application can also listen for the
{@link android.bluetooth.BluetoothAdapter#ACTION_STATE_CHANGED} broadcast Intent, which
the system will broadcast whenever the Bluetooth state has changed. This broadcast contains
@@ -273,21 +273,21 @@
android.bluetooth.BluetoothAdapter#STATE_TURNING_OFF}, and {@link
android.bluetooth.BluetoothAdapter#STATE_OFF}. Listening for this
broadcast can be useful to detect changes made to the Bluetooth state while your
-app is running.</p>
-
+app is running.</p>
+
<p class="note"><strong>Tip:</strong> Enabling discoverability will automatically
enable Bluetooth. If you plan to consistently enable device discoverability before
performing Bluetooth activity, you can skip
step 2 above. Read about <a href="#EnablingDiscoverability">enabling discoverability</a>,
-below.</p>
-
-
-<h2 id="FindingDevices">Finding Devices</h2>
-
+below.</p>
+
+
+<h2 id="FindingDevices">Finding Devices</h2>
+
<p>Using the {@link android.bluetooth.BluetoothAdapter}, you can find remote Bluetooth
devices either through device discovery or by querying the list of paired (bonded)
-devices.</p>
-
+devices.</p>
+
<p>Device discovery is a scanning procedure that searches the local area for
Bluetooth enabled devices and then requesting some information about each one
(this is sometimes referred to as "discovering," "inquiring" or "scanning").
@@ -296,15 +296,15 @@
discoverable, it will respond to the discovery request by sharing some
information, such as the device name, class, and its unique MAC address. Using
this information, the device performing discovery can then choose to initiate a
-connection to the discovered device.</p>
-
+connection to the discovered device.</p>
+
<p>Once a connection is made with a remote device for the first time, a pairing
request is automatically presented to the user. When a device is
paired, the basic information about that device (such as the device name, class,
and MAC address) is saved and can be read using the Bluetooth APIs. Using the
known MAC address for a remote device, a connection can be initiated with it at
-any time without performing discovery (assuming the device is within range).</p>
-
+any time without performing discovery (assuming the device is within range).</p>
+
<p>Remember there is a difference between being paired and being connected. To
be paired means that two devices are aware of each other's existence, have a
shared link-key that can be used for authentication, and are capable of
@@ -312,28 +312,28 @@
the devices currently share an RFCOMM channel and are able to transmit data with
each other. The current Android Bluetooth API's require devices to be paired
before an RFCOMM connection can be established. (Pairing is automatically performed
-when you initiate an encrypted connection with the Bluetooth APIs.)</p>
-
+when you initiate an encrypted connection with the Bluetooth APIs.)</p>
+
<p>The following sections describe how to find devices that have been paired, or
-discover new devices using device discovery.</p>
-
+discover new devices using device discovery.</p>
+
<p class="note"><strong>Note:</strong> Android-powered devices are not
discoverable by default. A user can make
the device discoverable for a limited time through the system settings, or an
application can request that the user enable discoverability without leaving the
-application. How to <a href="#EnablingDiscoverability">enable discoverability</a>
-is discussed below.</p>
-
-
-<h3 id="QueryingPairedDevices">Querying paired devices</h3>
-
+application. How to <a href="#EnablingDiscoverability">enable discoverability</a>
+is discussed below.</p>
+
+
+<h3 id="QueryingPairedDevices">Querying paired devices</h3>
+
<p>Before performing device discovery, its worth querying the set
of paired devices to see if the desired device is already known. To do so,
call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This
will return a Set of {@link android.bluetooth.BluetoothDevice}s representing
paired devices. For example, you can query all paired devices and then
-show the name of each device to the user, using an ArrayAdapter:</p>
-<pre>
+show the name of each device to the user, using an ArrayAdapter:</p>
+<pre>
Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
// If there are paired devices
if (pairedDevices.size() > 0) {
@@ -343,24 +343,24 @@
mArrayAdapter.add(device.getName() + "\n" + device.getAddress());
}
}
-</pre>
-
+</pre>
+
<p>All that's needed from the {@link android.bluetooth.BluetoothDevice} object
in order to initiate a connection is the MAC address. In this example, it's saved
as a part of an ArrayAdapter that's shown to the user. The MAC address can later
be extracted in order to initiate the connection. You can learn more about creating
-a connection in the section about <a href="#ConnectingDevices">Connecting Devices</a>.</p>
-
-
-<h3 id="DiscoveringDevices">Discovering devices</h3>
-
+a connection in the section about <a href="#ConnectingDevices">Connecting Devices</a>.</p>
+
+
+<h3 id="DiscoveringDevices">Discovering devices</h3>
+
<p>To start discovering devices, simply call {@link
android.bluetooth.BluetoothAdapter#startDiscovery()}. The
process is asynchronous and the method will immediately return with a boolean
indicating whether discovery has successfully started. The discovery process
usually involves an inquiry scan of about 12 seconds, followed by a page scan of
-each found device to retrieve its Bluetooth name.</p>
-
+each found device to retrieve its Bluetooth name.</p>
+
<p>Your application must register a BroadcastReceiver for the
{@link android.bluetooth.BluetoothDevice#ACTION_FOUND} Intent in
order to receive information about each
@@ -371,8 +371,8 @@
{@link android.bluetooth.BluetoothDevice#EXTRA_CLASS}, containing a
{@link android.bluetooth.BluetoothDevice} and a {@link
android.bluetooth.BluetoothClass}, respectively. For example, here's how you can
-register to handle the broadcast when devices are discovered:</p>
-<pre>
+register to handle the broadcast when devices are discovered:</p>
+<pre>
// Create a BroadcastReceiver for ACTION_FOUND
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
@@ -389,15 +389,15 @@
// Register the BroadcastReceiver
IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
registerReceiver(mReceiver, filter); // Don't forget to unregister during onDestroy
-</pre>
-
+</pre>
+
<p>All that's needed from the {@link android.bluetooth.BluetoothDevice} object
in order to initiate a
connection is the MAC address. In this example, it's saved as a part of an
ArrayAdapter that's shown to the user. The MAC address can later be extracted in
order to initiate the connection. You can learn more about creating a connection
-in the section about <a href="#ConnectingDevices">Connecting Devices</a>.</p>
-
+in the section about <a href="#ConnectingDevices">Connecting Devices</a>.</p>
+
<p class="caution"><strong>Caution:</strong> Performing device discovery is
a heavy procedure for the Bluetooth
adapter and will consume a lot of its resources. Once you have found a device to
@@ -406,10 +406,10 @@
attempting a connection. Also, if you
already hold a connection with a device, then performing discovery can
significantly reduce the bandwidth available for the connection, so you should
-not perform discovery while connected.</p>
-
-<h4 id="EnablingDiscoverability">Enabling discoverability</h4>
-
+not perform discovery while connected.</p>
+
+<h4 id="EnablingDiscoverability">Enabling discoverability</h4>
+
<p>If you would like to make the local device discoverable to other devices,
call {@link android.app.Activity#startActivityForResult(Intent,int)} with the
{@link android.bluetooth.BluetoothAdapter#ACTION_REQUEST_DISCOVERABLE} action
@@ -420,30 +420,30 @@
extra. The maximum duration an app can set is 3600 seconds, and a value of 0
means the device is always discoverable. Any value below 0 or above 3600 is
automatically set to 120 secs). For example, this snippet sets the duration to
-300:</p>
+300:</p>
<pre>Intent discoverableIntent = new
Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 300);
startActivity(discoverableIntent);
-</pre>
-
-<div class="figure" style="width:200px">
-<img src="{@docRoot}images/bt_enable_discoverable.png" />
+</pre>
+
+<div class="figure" style="width:200px">
+<img src="{@docRoot}images/bt_enable_discoverable.png" />
<strong>Figure 2:</strong> The enabling discoverability dialog.
-</div>
-
+</div>
+
<p>A dialog will be displayed, requesting user permission to make the device
discoverable, as shown in Figure 2. If the user responds "Yes," then the device
will become discoverable for the specified amount of time. Your activity will
then receive a call to the {@link android.app.Activity#onActivityResult(int,int,Intent)
onActivityResult())} callback, with the result code equal to the duration that the device
is discoverable. If the user responded "No" or if an error occurred, the result code will
-be {@link android.app.Activity#RESULT_CANCELED}.</p>
-
+be {@link android.app.Activity#RESULT_CANCELED}.</p>
+
<p class="note"><strong>Note:</strong> If Bluetooth has not been enabled on the device,
-then enabling device discoverability will automatically enable Bluetooth.</p>
-
+then enabling device discoverability will automatically enable Bluetooth.</p>
+
<p>The device will silently remain in discoverable mode for the allotted time.
If you would like to be notified when the discoverable mode has changed, you can
register a BroadcastReceiver for the {@link
@@ -457,18 +457,18 @@
android.bluetooth.BluetoothAdapter#SCAN_MODE_NONE},
which indicate that the device is either in discoverable mode, not in
discoverable mode but still able to receive connections, or not in discoverable
-mode and unable to receive connections, respectively.</p>
-
+mode and unable to receive connections, respectively.</p>
+
<p>You do not need to enable device discoverability if you will be initiating
the connection to a remote device. Enabling discoverability is only necessary when
you want your application to host a server socket that will accept incoming
connections, because the remote devices must be able to discover the device
-before it can initiate the connection.</p>
-
-
-
-<h2 id="ConnectingDevices">Connecting Devices</h2>
-
+before it can initiate the connection.</p>
+
+
+
+<h2 id="ConnectingDevices">Connecting Devices</h2>
+
<p>In order to create a connection between your application on two devices, you
must implement both the server-side and client-side mechanisms, because one
device must open a server socket and the other one must initiate the connection
@@ -478,36 +478,36 @@
point, each device can obtain input and output streams and data transfer can
begin, which is discussed in the section about <a
href="#ManagingAConnection">Managing a Connection</a>. This section describes how
-to initiate the connection between two devices.</p>
-
+to initiate the connection between two devices.</p>
+
<p>The server device and the client device each obtain the required {@link
android.bluetooth.BluetoothSocket} in different ways. The server will receive it
when an incoming connection is accepted. The client will receive it when it
-opens an RFCOMM channel to the server.</p>
-
-<div class="figure" style="width:200px">
-<img src="{@docRoot}images/bt_pairing_request.png" />
+opens an RFCOMM channel to the server.</p>
+
+<div class="figure" style="width:200px">
+<img src="{@docRoot}images/bt_pairing_request.png" />
<strong>Figure 3:</strong> The Bluetooth pairing dialog.
-</div>
-
+</div>
+
<p>One implementation technique is to automatically prepare each device as a
server, so that each one has a server socket open and listening for connections.
Then either device can initiate a connection with the other and become the
client. Alternatively, one device can explicitly "host" the connection and open
a server socket on demand and the other device can simply initiate the
-connection.</p>
-
+connection.</p>
+
<p class="note"><strong>Note:</strong> If the two devices have not been previously paired,
then the Android framework will automatically show a pairing request notification or
dialog to the user during the connection procedure, as shown in Figure 3. So
when attempting to connect devices,
your application does not need to be concerned about whether or not the devices are
paired. Your RFCOMM connection attempt will block until the user has successfully paired,
-or will fail if the user rejects pairing, or if pairing fails or times out. </p>
-
-
-<h3 id="ConnectingAsAServer">Connecting as a server</h3>
-
+or will fail if the user rejects pairing, or if pairing fails or times out. </p>
+
+
+<h3 id="ConnectingAsAServer">Connecting as a server</h3>
+
<p>When you want to connect two devices, one must act as a server by holding an
open {@link android.bluetooth.BluetoothServerSocket}. The purpose of the server
socket is to listen for incoming connection requests and when one is accepted,
@@ -515,26 +515,26 @@
android.bluetooth.BluetoothSocket} is acquired from the {@link
android.bluetooth.BluetoothServerSocket},
the {@link android.bluetooth.BluetoothServerSocket} can (and should) be
-discarded, unless you want to accept more connections.</p>
-
-<div class="sidebox-wrapper">
-<div class="sidebox">
-<h2>About UUID</h2>
-
+discarded, unless you want to accept more connections.</p>
+
+<div class="sidebox-wrapper">
+<div class="sidebox">
+<h2>About UUID</h2>
+
<p>A Universally Unique Identifier (UUID) is a standardized 128-bit format for a string
ID used to uniquely identify information. The point of a UUID is that it's big
enough that you can select any random and it won't clash. In this case, it's
used to uniquely identify your application's Bluetooth service. To get a UUID to
use with your application, you can use one of the many random UUID generators on
the web, then initialize a {@link java.util.UUID} with {@link
-java.util.UUID#fromString(String)}.</p>
-</div>
-</div>
-
+java.util.UUID#fromString(String)}.</p>
+</div>
+</div>
+
<p>Here's the basic procedure to set up a server socket and accept a
-connection:</p>
-
-<ol>
+connection:</p>
+
+<ol>
<li>Get a {@link android.bluetooth.BluetoothServerSocket} by calling the
{@link
android.bluetooth.BluetoothAdapter#listenUsingRfcommWithServiceRecord(String,
@@ -546,9 +546,9 @@
agreement with the client device. That is, when the client attempts to connect
with this device, it will carry a UUID that uniquely identifies the service with
which it wants to connect. These UUIDs must match in order for the connection to
-be accepted (in the next step).</p>
-</li>
-
+be accepted (in the next step).</p>
+</li>
+
<li>Start listening for connection requests by calling
{@link android.bluetooth.BluetoothServerSocket#accept()}.
<p>This is a blocking call. It will return when either a connection has been
@@ -556,9 +556,9 @@
remote device has sent a connection request with a UUID matching the one
registered with this listening server socket. When successful, {@link
android.bluetooth.BluetoothServerSocket#accept()} will
-return a connected {@link android.bluetooth.BluetoothSocket}.</p>
-</li>
-
+return a connected {@link android.bluetooth.BluetoothSocket}.</p>
+</li>
+
<li>Unless you want to accept additional connections, call
{@link android.bluetooth.BluetoothServerSocket#close()}.
<p>This releases the server socket and all its resources, but does <em>not</em> close the
@@ -567,10 +567,10 @@
connected client per channel at a time, so in most cases it makes sense to call {@link
android.bluetooth.BluetoothServerSocket#close()} on the {@link
android.bluetooth.BluetoothServerSocket} immediately after accepting a connected
-socket.</p>
-</li>
-</ol>
-
+socket.</p>
+</li>
+</ol>
+
<p>The {@link android.bluetooth.BluetoothServerSocket#accept()} call should not
be executed in the main activity UI thread because it is a blocking call and
will prevent any other interaction with the application. It usually makes
@@ -583,16 +583,16 @@
android.bluetooth.BluetoothSocket}) from another thread and the blocked call will
immediately return. Note that all methods on a {@link
android.bluetooth.BluetoothServerSocket} or {@link android.bluetooth.BluetoothSocket}
-are thread-safe.</p>
-
-<h4>Example</h4>
-
+are thread-safe.</p>
+
+<h4>Example</h4>
+
<p>Here's a simplified thread for the server component that accepts incoming
-connections:</p>
-<pre>
+connections:</p>
+<pre>
private class AcceptThread extends Thread {
private final BluetoothServerSocket mmServerSocket;
-
+
public AcceptThread() {
// Use a temporary object that is later assigned to mmServerSocket,
// because mmServerSocket is final
@@ -603,7 +603,7 @@
} catch (IOException e) { }
mmServerSocket = tmp;
}
-
+
public void run() {
BluetoothSocket socket = null;
// Keep listening until exception occurs or a socket is returned
@@ -622,7 +622,7 @@
}
}
}
-
+
/** Will cancel the listening socket, and cause the thread to finish */
public void cancel() {
try {
@@ -630,37 +630,37 @@
} catch (IOException e) { }
}
}
-</pre>
-
+</pre>
+
<p>In this example, only one incoming connection is desired, so as soon as a
connection is accepted and the {@link android.bluetooth.BluetoothSocket} is
acquired, the application
sends the acquired {@link android.bluetooth.BluetoothSocket} to a separate
thread, closes the
-{@link android.bluetooth.BluetoothServerSocket} and breaks the loop.</p>
-
+{@link android.bluetooth.BluetoothServerSocket} and breaks the loop.</p>
+
<p>Note that when {@link android.bluetooth.BluetoothServerSocket#accept()}
returns the {@link android.bluetooth.BluetoothSocket}, the socket is already
connected, so you should <em>not</em> call {@link
android.bluetooth.BluetoothSocket#connect()} (as you do from the
-client-side).</p>
-
+client-side).</p>
+
<p><code>manageConnectedSocket()</code> is a fictional method in the application
that will
initiate the thread for transferring data, which is discussed in the section
-about <a href="#ManagingAConnection">Managing a Connection</a>.</p>
-
+about <a href="#ManagingAConnection">Managing a Connection</a>.</p>
+
<p>You should usually close your {@link android.bluetooth.BluetoothServerSocket}
as soon as you are done listening for incoming connections. In this example, {@link
android.bluetooth.BluetoothServerSocket#close()} is called as soon
as the {@link android.bluetooth.BluetoothSocket} is acquired. You may also want
to provide a public method in your thread that can close the private {@link
android.bluetooth.BluetoothSocket} in the event that you need to stop listening on the
-server socket.</p>
-
-
-<h3 id="ConnectingAsAClient">Connecting as a client</h3>
-
+server socket.</p>
+
+
+<h3 id="ConnectingAsAClient">Connecting as a client</h3>
+
<p>In order to initiate a connection with a remote device (a device holding an
open
server socket), you must first obtain a {@link
@@ -669,11 +669,11 @@
section about <a
href="#FindingDevices">Finding Devices</a>.) You must then use the
{@link android.bluetooth.BluetoothDevice} to acquire a {@link
-android.bluetooth.BluetoothSocket} and initiate the connection.</p>
-
-<p>Here's the basic procedure:</p>
-
-<ol>
+android.bluetooth.BluetoothSocket} and initiate the connection.</p>
+
+<p>Here's the basic procedure:</p>
+
+<ol>
<li>Using the {@link android.bluetooth.BluetoothDevice}, get a {@link
android.bluetooth.BluetoothSocket} by calling {@link
android.bluetooth.BluetoothDevice#createRfcommSocketToServiceRecord(UUID)}.
@@ -684,9 +684,9 @@
android.bluetooth.BluetoothAdapter#listenUsingRfcommWithServiceRecord(String,
UUID)}). Using the same UUID is simply a matter of hard-coding the UUID string
into your application and then referencing it from both the server and client
-code.</p>
-</li>
-
+code.</p>
+</li>
+
<li>Initiate the connection by calling {@link
android.bluetooth.BluetoothSocket#connect()}.
<p>Upon this call, the system will perform an SDP lookup on the remote device in
@@ -697,34 +697,34 @@
blocking call. If, for
any reason, the connection fails or the {@link
android.bluetooth.BluetoothSocket#connect()} method times out (after about
-12 seconds), then it will throw an exception.</p>
+12 seconds), then it will throw an exception.</p>
<p>Because {@link
android.bluetooth.BluetoothSocket#connect()} is a blocking call, this connection
procedure should always be performed in a thread separate from the main activity
-thread.</p>
+thread.</p>
<p class="note">Note: You should always ensure that the device is not performing
device discovery when you call {@link
android.bluetooth.BluetoothSocket#connect()}. If discovery is in progress, then
the
-connection attempt will be significantly slowed and is more likely to fail.</p>
-</li>
-</ol>
-
-<h4>Example</h4>
-
+connection attempt will be significantly slowed and is more likely to fail.</p>
+</li>
+</ol>
+
+<h4>Example</h4>
+
<p>Here is a basic example of a thread that initiates a Bluetooth
-connection:</p>
-<pre>
+connection:</p>
+<pre>
private class ConnectThread extends Thread {
private final BluetoothSocket mmSocket;
private final BluetoothDevice mmDevice;
-
+
public ConnectThread(BluetoothDevice device) {
// Use a temporary object that is later assigned to mmSocket,
// because mmSocket is final
BluetoothSocket tmp = null;
mmDevice = device;
-
+
// Get a BluetoothSocket to connect with the given BluetoothDevice
try {
// MY_UUID is the app's UUID string, also used by the server code
@@ -732,11 +732,11 @@
} catch (IOException e) { }
mmSocket = tmp;
}
-
+
public void run() {
// Cancel discovery because it will slow down the connection
mBluetoothAdapter.cancelDiscovery();
-
+
try {
// Connect the device through the socket. This will block
// until it succeeds or throws an exception
@@ -748,11 +748,11 @@
} catch (IOException closeException) { }
return;
}
-
+
// Do work to manage the connection (in a separate thread)
manageConnectedSocket(mmSocket);
}
-
+
/** Will cancel an in-progress connection, and close the socket */
public void cancel() {
try {
@@ -760,42 +760,42 @@
} catch (IOException e) { }
}
}
-</pre>
-
+</pre>
+
<p>Notice that {@link android.bluetooth.BluetoothAdapter#cancelDiscovery()} is called
before the connection is made. You should always do this before connecting and it is safe
to call without actually checking whether it is running or not (but if you do want to
-check, call {@link android.bluetooth.BluetoothAdapter#isDiscovering()}).</p>
-
+check, call {@link android.bluetooth.BluetoothAdapter#isDiscovering()}).</p>
+
<p><code>manageConnectedSocket()</code> is a fictional method in the application
that will initiate the thread for transferring data, which is discussed in the section
-about <a href="#ManagingAConnection">Managing a Connection</a>.</p>
-
+about <a href="#ManagingAConnection">Managing a Connection</a>.</p>
+
<p>When you're done with your {@link android.bluetooth.BluetoothSocket}, always
call {@link android.bluetooth.BluetoothSocket#close()} to clean up.
Doing so will immediately close the connected socket and clean up all internal
-resources.</p>
-
-
-<h2 id="ManagingAConnection">Managing a Connection</h2>
-
+resources.</p>
+
+
+<h2 id="ManagingAConnection">Managing a Connection</h2>
+
<p>When you have successfully connected two (or more) devices, each one will
have a connected {@link android.bluetooth.BluetoothSocket}. This is where the fun
begins because you can share data between devices. Using the {@link
android.bluetooth.BluetoothSocket}, the general procedure to transfer arbitrary data is
-simple:</p>
-<ol>
+simple:</p>
+<ol>
<li>Get the {@link java.io.InputStream} and {@link java.io.OutputStream} that
handle transmissions through the socket, via {@link
android.bluetooth.BluetoothSocket#getInputStream()} and
-{@link android.bluetooth.BluetoothSocket#getOutputStream}, respectively.</li>
-
+{@link android.bluetooth.BluetoothSocket#getOutputStream}, respectively.</li>
+
<li>Read and write data to the streams with {@link
-java.io.InputStream#read(byte[])} and {@link java.io.OutputStream#write(byte[])}.</li>
-</ol>
-
-<p>That's it.</p>
-
+java.io.InputStream#read(byte[])} and {@link java.io.OutputStream#write(byte[])}.</li>
+</ol>
+
+<p>That's it.</p>
+
<p>There are, of course, implementation details to consider. First and foremost,
you should use a dedicated thread for all stream reading and writing. This is
important because both {@link java.io.InputStream#read(byte[])} and {@link
@@ -806,37 +806,37 @@
java.io.InputStream#read(byte[])} quickly enough and the intermediate buffers are full.
So, your main loop in the thread should be dedicated to reading from the {@link
java.io.InputStream}. A separate public method in the thread can be used to initiate
-writes to the {@link java.io.OutputStream}.</p>
-
-<h4>Example</h4>
-
-<p>Here's an example of how this might look:</p>
-<pre>
+writes to the {@link java.io.OutputStream}.</p>
+
+<h4>Example</h4>
+
+<p>Here's an example of how this might look:</p>
+<pre>
private class ConnectedThread extends Thread {
private final BluetoothSocket mmSocket;
private final InputStream mmInStream;
private final OutputStream mmOutStream;
-
+
public ConnectedThread(BluetoothSocket socket) {
mmSocket = socket;
InputStream tmpIn = null;
OutputStream tmpOut = null;
-
+
// Get the input and output streams, using temp objects because
// member streams are final
try {
tmpIn = socket.getInputStream();
tmpOut = socket.getOutputStream();
} catch (IOException e) { }
-
+
mmInStream = tmpIn;
mmOutStream = tmpOut;
}
-
+
public void run() {
byte[] buffer = new byte[1024]; // buffer store for the stream
int bytes; // bytes returned from read()
-
+
// Keep listening to the InputStream until an exception occurs
while (true) {
try {
@@ -850,14 +850,14 @@
}
}
}
-
+
/* Call this from the main activity to send data to the remote device */
public void write(byte[] bytes) {
try {
mmOutStream.write(bytes);
} catch (IOException e) { }
}
-
+
/* Call this from the main activity to shutdown the connection */
public void cancel() {
try {
@@ -865,44 +865,44 @@
} catch (IOException e) { }
}
}
-</pre>
-
+</pre>
+
<p>The constructor acquires the necessary streams and once executed, the thread
will wait for data to come through the InputStream. When {@link
java.io.InputStream#read(byte[])} returns with
bytes from the stream, the data is sent to the main activity using a member
Handler from the parent class. Then it goes back and waits for more bytes from
-the stream.</p>
-
+the stream.</p>
+
<p>Sending outgoing data is as simple as calling the thread's
<code>write()</code> method from the main activity and passing in the bytes to
be sent. This method then simply calls {@link
-java.io.OutputStream#write(byte[])} to send the data to the remote device.</p>
-
+java.io.OutputStream#write(byte[])} to send the data to the remote device.</p>
+
<p>The thread's <code>cancel()</code> method is important so that the connection
can be
terminated at any time by closing the {@link android.bluetooth.BluetoothSocket}.
This should always be called when you're done using the Bluetooth
-connection.</p>
-
-<div class="special">
-<p>For a demonstration of using the Bluetooth APIs, see the <a
-href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat sample app</a>.</p>
-</div>
+connection.</p>
-<h2 id="Profiles">Working with Profiles</h2>
+<div class="special">
+<p>For a demonstration of using the Bluetooth APIs, see the <a
+href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat sample app</a>.</p>
+</div>
+
+<h2 id="Profiles">Working with Profiles</h2>
<p>Starting in Android 3.0, the Bluetooth API includes support for working with
Bluetooth profiles. A <em>Bluetooth profile</em> is a wireless interface
specification for Bluetooth-based communication between devices. An example
is the Hands-Free profile. For a mobile phone to connect to a wireless headset,
-both devices must support the Hands-Free profile. </p>
+both devices must support the Hands-Free profile. </p>
<p>You can implement the interface {@link android.bluetooth.BluetoothProfile} to write
your own classes to support a particular Bluetooth profile. The Android
Bluetooth API provides implementations for the following Bluetooth
-profiles:</p>
-<ul>
+profiles:</p>
+<ul>
<li><strong>Headset</strong>. The Headset profile provides support for
Bluetooth headsets to be used with mobile phones. Android provides the {@link
@@ -917,7 +917,7 @@
profile defines how high quality audio can be streamed from one device to
another over a Bluetooth connection. Android provides the {@link
android.bluetooth.BluetoothA2dp} class, which is a proxy for controlling
-the Bluetooth A2DP Service via IPC.</li>
+the Bluetooth A2DP Service via IPC.</li>
<li><strong>Health Device</strong>. Android 4.0 (API level 14) introduces
support for the Bluetooth Health Device Profile (HDP). This lets you create
@@ -928,50 +928,50 @@
href="http://www.bluetooth.org">www.bluetooth.org</a>. Note that these values
are also referenced in the ISO/IEEE 11073-20601 [7] specification as
MDC_DEV_SPEC_PROFILE_* in the Nomenclature Codes Annex. For more discussion of
-HDP, see <a href="#HDP">Health Device Profile</a>.</li>
+HDP, see <a href="#HDP">Health Device Profile</a>.</li>
-</ul>
+</ul>
-<p>Here are the basic steps for working with a profile:</p>
-<ol>
+<p>Here are the basic steps for working with a profile:</p>
+<ol>
<li>Get the default adapter, as described in
<a href="{@docRoot}guide/topics/connectivity/bluetooth.html#SettingUp">Setting Up
- Bluetooth</a>.</li>
+ Bluetooth</a>.</li>
<li>Use {@link
android.bluetooth.BluetoothAdapter#getProfileProxy(android.content.Context,
android.bluetooth.BluetoothProfile.ServiceListener, int) getProfileProxy()} to
establish a connection to the profile proxy object associated with the profile.
In the example below, the profile proxy object is an instance of {@link
-android.bluetooth.BluetoothHeadset}. </li>
+android.bluetooth.BluetoothHeadset}. </li>
<li>Set up a {@link android.bluetooth.BluetoothProfile.ServiceListener}. This
listener notifies {@link android.bluetooth.BluetoothProfile} IPC clients when
-they have been connected to or disconnected from the service.</li>
+they have been connected to or disconnected from the service.</li>
<li>In {@link
android.bluetooth.BluetoothProfile.ServiceListener#onServiceConnected(int,
android.bluetooth.BluetoothProfile) onServiceConnected()}, get a handle
-to the profile proxy object.</li>
+to the profile proxy object.</li>
<li>Once you have the profile proxy object, you can use it to monitor the
state of the connection and perform other operations that are relevant to that
-profile.</li>
-</ol>
+profile.</li>
+</ol>
<p> For example, this code snippet shows how to connect to a {@link
android.bluetooth.BluetoothHeadset} proxy object so that you can control the
-Headset profile:</p>
+Headset profile:</p>
<pre>BluetoothHeadset mBluetoothHeadset;
-
+
// Get the default adapter
BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
+
// Establish connection to the proxy.
mBluetoothAdapter.getProfileProxy(context, mProfileListener, BluetoothProfile.HEADSET);
-
+
private BluetoothProfile.ServiceListener mProfileListener = new BluetoothProfile.ServiceListener() {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
if (profile == BluetoothProfile.HEADSET) {
@@ -984,16 +984,16 @@
}
}
};
-
+
// ... call functions on mBluetoothHeadset
-
+
// Close proxy connection after use.
mBluetoothAdapter.closeProfileProxy(mBluetoothHeadset);
-</pre>
+</pre>
-<h3 id="AT-Commands">Vendor-specific AT commands</h3>
+<h3 id="AT-Commands">Vendor-specific AT commands</h3>
<p>Starting in Android 3.0, applications can register to receive system
broadcasts of pre-defined vendor-specific AT commands sent by headsets (such as
@@ -1056,11 +1056,11 @@
object. <p>Similar to regular headset and A2DP profile devices, you must call
{@link android.bluetooth.BluetoothAdapter#getProfileProxy getProfileProxy()}
with a {@link android.bluetooth.BluetoothProfile.ServiceListener} and the {@link
-android.bluetooth.BluetoothProfile.ServiceListener#HEALTH} profile type to
+android.bluetooth.BluetoothProfile#HEALTH} profile type to
establish a connection with the profile proxy object.</p> </li>
<li>Create a {@link android.bluetooth.BluetoothHealthCallback} and register an
-application configuration
+application configuration
({@link android.bluetooth.BluetoothHealthAppConfiguration})
that acts as a health
sink.</li>
diff --git a/docs/html/guide/topics/connectivity/nfc/index.jd b/docs/html/guide/topics/connectivity/nfc/index.jd
index f12facf..bc4f075 100644
--- a/docs/html/guide/topics/connectivity/nfc/index.jd
+++ b/docs/html/guide/topics/connectivity/nfc/index.jd
@@ -17,12 +17,12 @@
<p>Android-powered devices with NFC simultaneously support three main modes of operation:</p>
<ol>
-<li><strong>Reader/writer mode</strong>, allowing the NFC device to read and/or write
+<li><strong>Reader/writer mode</strong>, allowing the NFC device to read and/or write
passive NFC tags and stickers.</li>
-<li><strong>P2P mode</strong>, allowing the NFC device to exchange data with other NFC
+<li><strong>P2P mode</strong>, allowing the NFC device to exchange data with other NFC
peers; this operation mode is used by Android Beam.</li>
-<li><strong>Card emulation mode</strong>, allowing the NFC device itself to act as an NFC
-card. The emulated NFC card can then be accessed by an external NFC reader,
+<li><strong>Card emulation mode</strong>, allowing the NFC device itself to act as an NFC
+card. The emulated NFC card can then be accessed by an external NFC reader,
such as an NFC point-of-sale terminal.</li>
</ol>
diff --git a/docs/html/guide/topics/connectivity/sip.jd b/docs/html/guide/topics/connectivity/sip.jd
index d754894..d8d6d27 100755
--- a/docs/html/guide/topics/connectivity/sip.jd
+++ b/docs/html/guide/topics/connectivity/sip.jd
@@ -12,10 +12,10 @@
<li><a href="#manager">Creating a SIP Manager</a></li>
<li><a href="#profiles">Registering with a SIP Server</a></li>
<li><a href="#audio">Making an Audio Call</a></li>
- <li><a href="#receiving">Receiving Calls</a></li>
+ <li><a href="#receiving">Receiving Calls</a></li>
<li><a href="#testing">Testing SIP Applications</a></li>
</ol>
-
+
<h2>Key classes</h2>
<ol>
<li>{@link android.net.sip.SipManager}</li>
@@ -23,7 +23,7 @@
<li>{@link android.net.sip.SipAudioCall}</li>
</ol>
-
+
<h2>Related samples</h2>
<ol>
<li> <a href="{@docRoot}resources/samples/SipDemo/index.html"> SipDemo</a></li>
@@ -46,9 +46,9 @@
<h2 id="requirements">Requirements and Limitations</h2>
<p>Here are the requirements for developing a SIP application:</p>
<ul>
-
+
<li>You must have a mobile device that is running Android 2.3 or higher. </li>
-
+
<li>SIP runs over a wireless data connection, so your device must have a data
connection (with a mobile data service or Wi-Fi)</span>. This means that you
can't test on AVD—you can only test on a physical device. For details, see
@@ -139,7 +139,7 @@
manifest:</p>
<ul>
- <li><code><uses-sdk android:minSdkVersion="9" /></code>. This
+ <li><code><uses-sdk android:minSdkVersion="9" /></code>. This
indicates that your application requires Android 2.3 or higher. For more
information, see <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API
Levels</a> and the documentation for the <a
@@ -162,7 +162,7 @@
see the documentation for the <a
href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-
feature></a> element.</li>
-
+
</ul>
<p>If your application is designed to receive calls, you must also define a receiver ({@link android.content.BroadcastReceiver} subclass) in the application's manifest: </p>
@@ -261,7 +261,7 @@
public void onRegistrationDone(String localProfileUri, long expiryTime) {
updateStatus("Ready");
}
-
+
public void onRegistrationFailed(String localProfileUri, int errorCode,
String errorMessage) {
updateStatus("Registration failed. Please check settings.");
@@ -291,8 +291,8 @@
<li>A {@link android.net.sip.SipProfile} that is making the call (the
"local profile"), and a valid SIP address to receive the call (the
-"peer profile").
-
+"peer profile").
+
<li>A {@link android.net.sip.SipManager} object. </li>
</ul>
@@ -304,7 +304,7 @@
<pre>
SipAudioCall.Listener listener = new SipAudioCall.Listener() {
-
+
@Override
public void onCallEstablished(SipAudioCall call) {
call.startAudio();
@@ -312,7 +312,7 @@
call.toggleMute();
...
}
-
+
@Override
public void onCallEnded(SipAudioCall call) {
// Do something.
@@ -326,12 +326,12 @@
<ul>
<li>A local SIP profile (the caller).</li>
<li>A peer SIP profile (the user being called).</li>
-
+
<li>A {@link android.net.sip.SipAudioCall.Listener} to listen to the call
events from {@link android.net.sip.SipAudioCall}. This can be <code>null</code>,
but as shown above, the listener is used to set things up once the call is
established.</li>
-
+
<li>The timeout value, in seconds.</li>
</ul>
<p>For example:</p>
@@ -349,15 +349,15 @@
<code><receiver></code>. In <strong>SipDemo</strong>, this is
<code><receiver android:name=".IncomingCallReceiver"
android:label="Call Receiver"/></code>.</li>
-
+
<li>Implement the receiver, which is a subclass of {@link
android.content.BroadcastReceiver}. In <strong>SipDemo</strong>, this is
<code>IncomingCallReceiver</code>.</li>
-
+
<li>Initialize the local profile ({@link android.net.sip.SipProfile}) with a
pending intent that fires your receiver when someone calls the local profile.
</li>
-
+
<li>Set up an intent filter that filters by the action that represents an
incoming call. In <strong>SipDemo</strong>, this action is
<code>android.SipDemo.INCOMING_CALL</code>. </li>
@@ -427,16 +427,16 @@
android.net.sip.SipProfile} object gets created with a pending intent based on
the action string <code>android.SipDemo.INCOMING_CALL</code>. The
<code>PendingIntent</code> object will perform a broadcast when the {@link
-android.net.sip.SipProfile} receives a call:</p>
+android.net.sip.SipProfile} receives a call:</p>
<pre>
public SipManager mSipManager = null;
public SipProfile mSipProfile = null;
...
-Intent intent = new Intent();
-intent.setAction("android.SipDemo.INCOMING_CALL");
-PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, Intent.FILL_IN_DATA);
+Intent intent = new Intent();
+intent.setAction("android.SipDemo.INCOMING_CALL");
+PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, Intent.FILL_IN_DATA);
mSipManager.open(mSipProfile, pendingIntent, null);</pre>
<p>The broadcast will be intercepted by the intent filter, which will then fire
@@ -485,8 +485,8 @@
href="{@docRoot}tools/device.html">Developing on a Device</a>.</li>
<li>If you are using Android Studio, you can view the application log output by
-opening the Event Log console (<strong>View > Tool Windows > Event Log</strong>).
-<li>Ensure your application is configured to launch Logcat automatically when it runs:
+opening the Event Log console (<strong>View > Tool Windows > Event Log</strong>).
+<li>Ensure your application is configured to launch Logcat automatically when it runs:
<ol TYPE=a>
<li>Select <strong>Run > Edit Configurations</strong>.
<li>Select the <strong>Miscellaneous</strong> tab in the <strong>Run/Debug Configurations</strong> window.
diff --git a/docs/html/guide/topics/connectivity/usb/accessory.jd b/docs/html/guide/topics/connectivity/usb/accessory.jd
index a217767..3942b3a 100644
--- a/docs/html/guide/topics/connectivity/usb/accessory.jd
+++ b/docs/html/guide/topics/connectivity/usb/accessory.jd
@@ -169,7 +169,7 @@
include a <code><uses-feature></code> element that declares that your application uses
the <code>android.hardware.usb.accessory</code> feature.</li>
- <li>If you are using the
+ <li>If you are using the
<a href="http://code.google.com/android/add-ons/google-apis/index.html">add-on library</a>,
add the <code><uses-library></code> element specifying
<code>com.android.future.usb.accessory</code> for the library.</li>
@@ -347,7 +347,7 @@
private static final String ACTION_USB_PERMISSION =
"com.android.example.USB_PERMISSION";
private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
-
+
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (ACTION_USB_PERMISSION.equals(action)) {
@@ -444,7 +444,7 @@
<pre>
BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
+ String action = intent.getAction();
if (UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
UsbAccessory accessory = (UsbAccessory)intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
diff --git a/docs/html/guide/topics/connectivity/usb/host.jd b/docs/html/guide/topics/connectivity/usb/host.jd
index d2194e6..856027d 100644
--- a/docs/html/guide/topics/connectivity/usb/host.jd
+++ b/docs/html/guide/topics/connectivity/usb/host.jd
@@ -263,7 +263,7 @@
obtain a device from the map.</p>
<pre>
UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE);
-...
+...
HashMap<String, UsbDevice> deviceList = manager.getDeviceList();
UsbDevice device = deviceList.get("deviceName");
</pre>
@@ -317,7 +317,7 @@
if(device != null){
//call method to set up device communication
}
- }
+ }
else {
Log.d(TAG, "permission denied for device " + device);
}
@@ -396,7 +396,7 @@
UsbInterface intf = device.getInterface(0);
UsbEndpoint endpoint = intf.getEndpoint(0);
-UsbDeviceConnection connection = mUsbManager.openDevice(device);
+UsbDeviceConnection connection = mUsbManager.openDevice(device);
connection.claimInterface(intf, forceClaim);
connection.bulkTransfer(endpoint, bytes, bytes.length, TIMEOUT); //do in another thread
</pre>
@@ -422,7 +422,7 @@
<pre>
BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
+ String action = intent.getAction();
if (UsbManager.ACTION_USB_DEVICE_DETACHED.equals(action)) {
UsbDevice device = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd
index d7e1269..2bcdf54 100644
--- a/docs/html/guide/topics/connectivity/wifip2p.jd
+++ b/docs/html/guide/topics/connectivity/wifip2p.jd
@@ -66,7 +66,7 @@
methods. A {@link android.net.wifi.p2p.WifiP2pManager#WIFI_P2P_PEERS_CHANGED_ACTION} intent is
also broadcast if the {@link android.net.wifi.p2p.WifiP2pManager#discoverPeers discoverPeers()}
method discovers that the peers list has changed.</p>
-
+
<h2 id="api">API Overview</h2>
<p>The {@link android.net.wifi.p2p.WifiP2pManager} class provides methods to allow you to interact with
@@ -117,7 +117,7 @@
</tr>
<tr>
- <td>{@link android.net.wifi.p2p.WifiP2pManager.PeerListListener#discoverPeers discoverPeers()}</td>
+ <td>{@link android.net.wifi.p2p.WifiP2pManager#discoverPeers discoverPeers()}</td>
<td>Initiates peer discovery </td>
</tr>
@@ -135,7 +135,7 @@
are described in the following table:</p>
<p class="table-caption"><strong>Table 2.</strong> Wi-Fi P2P Listeners</p>
-
+
<table>
<tr>
<th>Listener interface</th>
@@ -147,7 +147,7 @@
android.net.wifi.p2p.WifiP2pManager#cancelConnect cancelConnect()}, {@link
android.net.wifi.p2p.WifiP2pManager#createGroup createGroup()}, {@link
android.net.wifi.p2p.WifiP2pManager#removeGroup removeGroup()}, and {@link
- android.net.wifi.p2p.WifiP2pManager.PeerListListener#discoverPeers discoverPeers()}</td>
+ android.net.wifi.p2p.WifiP2pManager#discoverPeers discoverPeers()}</td>
</tr>
<tr>
@@ -190,8 +190,8 @@
<tr>
<td>{@link android.net.wifi.p2p.WifiP2pManager#WIFI_P2P_PEERS_CHANGED_ACTION}</td>
<td>Broadcast when you call {@link
- android.net.wifi.p2p.WifiP2pManager.PeerListListener#discoverPeers discoverPeers()}. You
- usually want to call {@link android.net.wifi.p2p.WifiP2pManager.PeerListListener#requestPeers
+ android.net.wifi.p2p.WifiP2pManager#discoverPeers discoverPeers()}. You
+ usually want to call {@link android.net.wifi.p2p.WifiP2pManager#requestPeers
requestPeers()} to get an updated list of peers if you handle this intent in your
application.</td>
</tr>
@@ -395,7 +395,7 @@
available peers that are in range. The call to this function is asynchronous and a success or
failure is communicated to your application with {@link
android.net.wifi.p2p.WifiP2pManager.ActionListener#onSuccess onSuccess()} and {@link
- android.net.wifi.p2p.WifiP2pManager.ActionListener#onFailure onFailure()} if you created a
+ android.net.wifi.p2p.WifiP2pManager.ActionListener#onFailure onFailure()} if you created a
{@link android.net.wifi.p2p.WifiP2pManager.ActionListener}. The
{@link android.net.wifi.p2p.WifiP2pManager.ActionListener#onSuccess onSuccess()} method only notifies you
that the discovery process succeeded and does not provide any information about the actual peers
diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd
index a745d00..770340b 100644
--- a/docs/html/guide/topics/data/data-storage.jd
+++ b/docs/html/guide/topics/data/data-storage.jd
@@ -252,6 +252,17 @@
save to the external storage. All applications can read and write files placed on the external
storage and the user can remove them.</p>
+<h3 id="ScopedDirAccess">Using Scoped Directory Access</h3>
+
+On Android 7.0 or later, if you need access to a specific directory on
+external storage, use scoped directory access. Scoped directory access
+simplifies how your application accesses standard external storage directories,
+such as the <code>Pictures</code> directory, and provides a simple
+permissions UI that clearly details what directory the application is
+requesting access to. For more details on scoped directory access, see
+<a href="{@docRoot}training/articles/scoped-directory-access.html">Using
+Scoped Directory Access</a>.
+
<h3 id="ExternalPermissions">Getting access to external storage</h3>
<p>In order to read or write files on the external storage, your app must acquire the
diff --git a/docs/html/guide/topics/data/index.jd b/docs/html/guide/topics/data/index.jd
index 1e082b3..3872825 100644
--- a/docs/html/guide/topics/data/index.jd
+++ b/docs/html/guide/topics/data/index.jd
@@ -1,6 +1,6 @@
page.title=Data Storage
page.landing=true
-page.landing.intro=Store application data in databases, files, or preferences, in internal or removeable storage. You can also add a data backup service to let users store and recover application and system data.
+page.landing.intro=Store application data in databases, files, or preferences, in internal or removeable storage. You can also add a data backup service to let users store and recover application and system data.
page.landing.image=
@jd:body
@@ -10,14 +10,16 @@
<div class="col-12">
<h3>Training</h3>
-
- <a href="http://developer.android.com/training/cloudsync/index.html">
- <h4>Syncing to the Cloud</h4>
- <p>This class covers different strategies for cloud enabled applications. It covers syncing
-data with the cloud using your own back-end web application, and backing up data using the cloud so
-that users can restore their data when installing your application on a new device.</p>
+
+ <a href="{@docRoot}training/backup/index.html">
+ <h4>Backing up App Data to the Cloud</h4>
+ <p>
+ This class covers techniques for backing up data to the cloud so that
+ users can restore their data when recovering from a data loss (such as a
+ factory reset) or installing your application on a new device.
+ </p>
</a>
-
+
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd
index 17f6309..a87e404 100644
--- a/docs/html/guide/topics/graphics/index.jd
+++ b/docs/html/guide/topics/graphics/index.jd
@@ -17,7 +17,7 @@
by the UI toolkit are carried out using the GPU. You’ll be happy to hear that Android 4.0, Ice Cream
Sandwich, brings an improved version of the hardware-accelerated 2D rendering pipeline.</p>
</a>
-
+
<a
href="http://android-developers.blogspot.com/2011/05/introducing-viewpropertyanimator.html">
<h4>Introducing ViewPropertyAnimator</h4>
@@ -25,7 +25,7 @@
including the new properties added to the View class in 3.0. In the 3.1 release, we added a small
utility class that makes animating these properties even easier.</p>
</a>
-
+
<a
href="http://android-developers.blogspot.com/2011/03/android-30-hardware-acceleration.html">
<h4>Android 3.0 Hardware Acceleration</h4>
@@ -43,7 +43,7 @@
that keeps your user interface (UI) components responsive and avoids exceeding your application
memory limit.</p>
</a>
-
+
</div>
</div>
\ No newline at end of file
diff --git a/docs/html/guide/topics/graphics/overview.jd b/docs/html/guide/topics/graphics/overview.jd
index 66a675d..98d80a0 100644
--- a/docs/html/guide/topics/graphics/overview.jd
+++ b/docs/html/guide/topics/graphics/overview.jd
@@ -6,7 +6,7 @@
and help you decide with approach is best for your needs.</p>
<h3 id="animation">Animation</h3>
-
+
<p>The Android framework provides two animation systems: property animation
and view animation. Both animation systems are viable options,
but the property animation system, in general, is the preferred method to use, because it
diff --git a/docs/html/guide/topics/graphics/prop-animation.jd b/docs/html/guide/topics/graphics/prop-animation.jd
index aed533d..2be2b09 100755
--- a/docs/html/guide/topics/graphics/prop-animation.jd
+++ b/docs/html/guide/topics/graphics/prop-animation.jd
@@ -165,9 +165,9 @@
"{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/animation/index.html">API
Demos</a> sample project provides many examples on how to use the property
animation system.</p>
-
+
<h2 id="property-vs-view">How Property Animation Differs from View Animation</h2>
-
+
<p>The view animation system provides the capability to only animate {@link android.view.View}
objects, so if you wanted to animate non-{@link android.view.View} objects, you have to implement
your own code to do so. The view animation system is also constrained in the fact that it only
@@ -594,7 +594,7 @@
for just the {@link android.animation.Animator.AnimatorListener#onAnimationEnd onAnimationEnd()}
callback:</p>
<pre>
-ValueAnimatorAnimator fadeAnim = ObjectAnimator.ofFloat(newBall, "alpha", 1f, 0f);
+ValueAnimator fadeAnim = ObjectAnimator.ofFloat(newBall, "alpha", 1f, 0f);
fadeAnim.setDuration(250);
fadeAnim.addListener(new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator animation) {
diff --git a/docs/html/guide/topics/location/strategies.jd b/docs/html/guide/topics/location/strategies.jd
index 32be463..2dfed2c 100755
--- a/docs/html/guide/topics/location/strategies.jd
+++ b/docs/html/guide/topics/location/strategies.jd
@@ -411,12 +411,12 @@
<h3 id="MockAVD">Using Android Studio</h3>
<p>Select <b>Tools</b> > <b>Android</b> > <b>AVD Manager</b>. In the Android Virtual
-Device Manager window, choose your AVD and launch it in the emulator by selecting the green
+Device Manager window, choose your AVD and launch it in the emulator by selecting the green
play arrow in the Actions column.</p>
<p>Then, select <b>Tools</b> > <b>Android</b> > <b>Android Device Monitor</b>.
-Select the Emulator Control tab in the Android Device Monitor window, and enter GPS coordinates
-under Location Controls as individual lat/long coordinates, with a GPX file for route playback,
+Select the Emulator Control tab in the Android Device Monitor window, and enter GPS coordinates
+under Location Controls as individual lat/long coordinates, with a GPX file for route playback,
or a KML file for multiple place marks.
</p>
diff --git a/docs/html/guide/topics/manifest/action-element.jd b/docs/html/guide/topics/manifest/action-element.jd
index fc6ce44..f3b340e 100644
--- a/docs/html/guide/topics/manifest/action-element.jd
+++ b/docs/html/guide/topics/manifest/action-element.jd
@@ -13,10 +13,10 @@
<p>
<dt>description:</dt>
<dd itemprop="description">Adds an action to an intent filter.
-An <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element must contain
+An <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element must contain
one or more {@code <action>} elements. If it doesn't contain any, no
-Intent objects will get through the filter. See
-<a href="{@docRoot}guide/components/intents-filters.html">Intents and
+Intent objects will get through the filter. See
+<a href="{@docRoot}guide/components/intents-filters.html">Intents and
Intent Filters</a> for details on intent filters and the role of action
specifications within a filter.
</dd>
@@ -25,16 +25,16 @@
<dd><dl class="attr">
<dt><a name="nm"></a>{@code android:name}</dt>
<dd>The name of the action. Some standard actions are defined in the
-{@link android.content.Intent#ACTION_CHOOSER Intent} class as
+{@link android.content.Intent#ACTION_CHOOSER Intent} class as
<code>ACTION_<i>string</i></code> constants. To assign one of these actions to
-this attribute, prepend "{@code android.intent.action.}" to the
+this attribute, prepend "{@code android.intent.action.}" to the
<code><i>string</i></code> that follows {@code ACTION_}.
For example, for {@code ACTION_MAIN}, use "{@code android.intent.action.MAIN}"
and for {@code ACTION_WEB_SEARCH}, use "{@code android.intent.action.WEB_SEARCH}".
<p>
For actions you define, it's best to use the package name as a prefix to
-ensure uniqueness. For example, a {@code TRANSMOGRIFY} action might be specified
+ensure uniqueness. For example, a {@code TRANSMOGRIFY} action might be specified
as follows:
</p>
diff --git a/docs/html/guide/topics/manifest/activity-alias-element.jd b/docs/html/guide/topics/manifest/activity-alias-element.jd
index 1427b55..adb9937 100644
--- a/docs/html/guide/topics/manifest/activity-alias-element.jd
+++ b/docs/html/guide/topics/manifest/activity-alias-element.jd
@@ -29,62 +29,62 @@
<p>
The alias presents the target activity as a independent entity.
-It can have its own set of intent filters, and they, rather than the
-intent filters on the target activity itself, determine which intents
+It can have its own set of intent filters, and they, rather than the
+intent filters on the target activity itself, determine which intents
can activate the target through the alias and how the system
-treats the alias. For example, the intent filters on the alias may
-specify the "<code>{@link android.content.Intent#ACTION_MAIN
-android.intent.action.MAIN}</code>"
-and "<code>{@link android.content.Intent#CATEGORY_LAUNCHER
-android.intent.category.LAUNCHER}</code>" flags, causing it to be
-represented in the application launcher, even though none of the
+treats the alias. For example, the intent filters on the alias may
+specify the "<code>{@link android.content.Intent#ACTION_MAIN
+android.intent.action.MAIN}</code>"
+and "<code>{@link android.content.Intent#CATEGORY_LAUNCHER
+android.intent.category.LAUNCHER}</code>" flags, causing it to be
+represented in the application launcher, even though none of the
filters on the target activity itself set these flags.
</p>
<p>
With the exception of {@code targetActivity}, {@code <activity-alias>}
-attributes are a subset of <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> attributes.
+attributes are a subset of <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> attributes.
For attributes in the subset, none of the values set for the target carry over
-to the alias. However, for attributes not in the subset, the values set for
+to the alias. However, for attributes not in the subset, the values set for
the target activity also apply to the alias.
</p></dd>
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="enabled"></a>{@code android:enabled}</dt>
-<dd>Whether or not the target activity can be instantiated by the system through
-this alias — "{@code true}" if it can be, and "{@code false}" if not.
+<dd>Whether or not the target activity can be instantiated by the system through
+this alias — "{@code true}" if it can be, and "{@code false}" if not.
The default value is "{@code true}".
<p>
-The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
-application components, including activity aliases. The
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
+application components, including activity aliases. The
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> and {@code <activity-alias>}
-attributes must both be "{@code true}" for the system to be able to instantiate
-the target activity through the alias. If either is "{@code false}", the alias
+attributes must both be "{@code true}" for the system to be able to instantiate
+the target activity through the alias. If either is "{@code false}", the alias
does not work.
</p></dd>
<dt><a name="exported"></a>{@code android:exported}</dt>
-<dd>Whether or not components of other applications can launch the target activity
-through this alias — "{@code true}" if they can, and "{@code false}" if not.
-If "{@code false}", the target activity can be launched through the alias only by
-components of the same application as the alias or applications with the same user ID.
+<dd>Whether or not components of other applications can launch the target activity
+through this alias — "{@code true}" if they can, and "{@code false}" if not.
+If "{@code false}", the target activity can be launched through the alias only by
+components of the same application as the alias or applications with the same user ID.
<p>
-The default value depends on whether the alias contains intent filters. The
+The default value depends on whether the alias contains intent filters. The
absence of any filters means that the activity can be invoked through the alias
-only by specifying the exact name of the alias. This implies that the alias
-is intended only for application-internal use (since others would not know its name)
+only by specifying the exact name of the alias. This implies that the alias
+is intended only for application-internal use (since others would not know its name)
— so the default value is "{@code false}".
-On the other hand, the presence of at least one filter implies that the alias
+On the other hand, the presence of at least one filter implies that the alias
is intended for external use — so the default value is "{@code true}".
</p></dd>
<dt><a name="icon"></a>{@code android:icon}</dt>
-<dd>An icon for the target activity when presented to users through the alias.
-See the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element's
+<dd>An icon for the target activity when presented to users through the alias.
+See the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#icon">icon</a></code> attribute for more information.
<dt><a name="label"></a>{@code android:label}</dt>
@@ -95,31 +95,31 @@
<dt><a name="nm">{@code android:name}</dt>
<dd>A unique name for the alias. The name should resemble a fully
-qualified class name. But, unlike the name of the target activity,
-the alias name is arbitrary; it does not refer to an actual class.
+qualified class name. But, unlike the name of the target activity,
+the alias name is arbitrary; it does not refer to an actual class.
</p></dd>
<dt><a name="prmsn"></a>{@code android:permission}</dt>
-<dd>The name of a permission that clients must have to launch the target activity
-or get it to do something via the alias. If a caller of
+<dd>The name of a permission that clients must have to launch the target activity
+or get it to do something via the alias. If a caller of
<code>{@link android.content.Context#startActivity startActivity()}</code> or
<code>{@link android.app.Activity#startActivityForResult startActivityForResult()}</code>
has not been granted the specified permission, the target activity will not be
-activated.
+activated.
<p>This attribute supplants any permission set for the target activity itself. If
it is not set, a permission is not needed to activate the target through the alias.
</p>
<p>
-For more information on permissions, see the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a>
+For more information on permissions, see the
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a>
section in the introduction.
</p></dd>
<dt><a name="trgt"></a>{@code android:targetActivity}</dt>
<dd>The name of the activity that can be activated through the alias.
-This name must match the {@code name} attribute of an
+This name must match the {@code name} attribute of an
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element that precedes
the alias in the manifest.
</p></dd>
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd
index f30263e..6deb14b 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -25,7 +25,7 @@
android:<a href="#hwaccel">hardwareAccelerated</a>=["true" | "false"]
android:<a href="#icon">icon</a>="<i>drawable resource</i>"
android:<a href="#label">label</a>="<i>string resource</i>"
- android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" |
+ android:<a href="#lmode">launchMode</a>=["standard" | "singleTop" |
"singleTask" | "singleInstance"]
android:<a href="#maxRecents">maxRecents</a>="<i>integer</i>"
android:<a href="#multi">multiprocess</a>=["true" | "false"]
@@ -35,6 +35,7 @@
android:<a href="#prmsn">permission</a>="<i>string</i>"
android:<a href="#proc">process</a>="<i>string</i>"
android:<a href="#relinquish">relinquishTaskIdentity</a>=["true" | "false"]
+ android:<a href="#resizeableActivity">resizeableActivity</a>=["true" | "false"]
android:<a href="#screen">screenOrientation</a>=["unspecified" | "behind" |
"landscape" | "portrait" |
"reverseLandscape" | "reversePortrait" |
@@ -43,6 +44,7 @@
"sensor" | "fullSensor" | "nosensor" |
"user" | "fullUser" | "locked"]
android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
+ android:<a href="#supportsPIP">supportsPictureInPicture</a>=["true" | "false"]
android:<a href="#aff">taskAffinity</a>="<i>string</i>"
android:<a href="#theme">theme</a>="<i>resource or theme</i>"
android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"]
@@ -794,9 +796,39 @@
and icons in the <a href="{@docRoot}guide/components/recents.html">overview screen</a>.</p>
</dd>
+<dt id="resizeableActivity"><code>resizeableActivity</code></dt>
+
+<dd>
+<p>
+ Specifies whether the app supports <a href=
+ "{@docRoot}guide/topics/ui/multi-window.html">multi-window display</a>. You
+ can set this attribute in either the <code><activity></code> or
+ <a href="application-element.html"><code><application></code></a>
+ element.
+</p>
+
+<p>
+ If you set this attribute to true, the user can launch the activity in
+ split-screen and freeform modes. If you set the attribute to false, the
+ activity does not support multi-window mode. If this value is false, and the
+ user attempts to launch the activity in multi-window mode, the activity takes
+ over the full screen.
+</p>
+
+<p>
+ If your app targets API level 24 or higher, but you do not specify a value
+ for this attribute, the attribute's value defaults to true.
+</p>
+
+<p>
+ This attribute was added in API level 24.
+</p>
+</dd>
<dt><a name="screen"></a>{@code android:screenOrientation}</dt>
-<dd>The orientation of the activity's display on the device.
+<dd>The orientation of the activity's display on the device. The system ignores
+ this attribute if the activity is running in <a
+ href="{@docRoot}guide/topics/ui/multi-window.html">multi-window mode</a>.
<p>The value can be any one of the following strings:</p>
@@ -921,6 +953,19 @@
crashes for some reason.
</p></dd>
+<dt id="supportsPIP"><code>supportsPictureInPicture</code></dt>
+
+<dd>
+<p>
+ Specifies whether the activity supports <a href=
+ "{@docRoot}training/tv/playback/picture-in-picture.jd">Picture-in-Picture</a>
+ display. The system ignores this attribute if <a href=
+ "#resizeableActivity"><code>android:resizeableActivity</code></a> is false.
+</p>
+
+<p>This attribute was added in API level 24.</p>
+</dd>
+
<dt><a name="aff"></a>{@code android:taskAffinity}</dt>
<dd>The task that the activity has an affinity for. Activities with
the same affinity conceptually belong to the same task (to the same
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd
index 56d61f3..f8e251e 100644
--- a/docs/html/guide/topics/manifest/application-element.jd
+++ b/docs/html/guide/topics/manifest/application-element.jd
@@ -26,6 +26,7 @@
android:<a href="#proc">process</a>="<i>string</i>"
android:<a href="#restoreany">restoreAnyVersion</a>=["true" | "false"]
android:<a href="#requiredAccountType">requiredAccountType</a>="<i>string</i>"
+ android:<a href="#resizeableActivity">resizeableActivity</a>=["true" | "false"]
android:<a href="#restrictedAccountType">restrictedAccountType</a>="<i>string</i>"
android:<a href="#supportsrtl">supportsRtl</a>=["true" | "false"]
android:<a href="#aff">taskAffinity</a>="<i>string</i>"
@@ -358,6 +359,34 @@
</dd>
+<dt id="resizeableActivity"><code>resizeableActivity</code></dt>
+
+<dd>
+<p>
+ Specifies whether the app supports <a href=
+ "{@docRoot}guide/topics/ui/multi-window.html">multi-window display</a>. You
+ can set this attribute in either the <a href="activity-element">
+ <code><activity></code></a> or <code><application></code> element.
+</p>
+
+<p>
+ If you set this attribute to true, the user can launch the activity in
+ split-screen and freeform modes. If you set the attribute to false, the
+ activity does not support multi-window mode. If this value is false, and the
+ user attempts to launch the activity in multi-window mode, the activity takes
+ over the full screen.
+</p>
+
+<p>
+ If your app targets API level 24 or higher, but you do not specify a value
+ for this attribute, the attribute's value defaults to true.
+</p>
+
+<p>
+ This attribute was added in API level 24.
+</p>
+</dd>
+
<dt><a name="restrictedAccountType"></a>{@code android:restrictedAccountType}</dt>
<dd>Specifies the account type required by this application and indicates that restricted profiles
are allowed to access such accounts that belong to the owner user. If your app requires an
diff --git a/docs/html/guide/topics/manifest/category-element.jd b/docs/html/guide/topics/manifest/category-element.jd
index 0034119..d0f0edf 100644
--- a/docs/html/guide/topics/manifest/category-element.jd
+++ b/docs/html/guide/topics/manifest/category-element.jd
@@ -12,19 +12,19 @@
<dt>description:</dt>
<dd itemprop="description">Adds a category name to an intent filter. See
-<a href="{@docRoot}guide/components/intents-filters.html">Intents and
+<a href="{@docRoot}guide/components/intents-filters.html">Intents and
Intent Filters</a> for details on intent filters and the role of category
specifications within a filter.</dd>
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name of the category. Standard categories are defined in the
+<dd>The name of the category. Standard categories are defined in the
{@link android.content.Intent} class as <code>CATEGORY_<i>name</i></code>
-constants. The name assigned here can be derived from those constants
-by prefixing "{@code android.intent.category.}" to the
+constants. The name assigned here can be derived from those constants
+by prefixing "{@code android.intent.category.}" to the
<code><i>name</i></code> that follows {@code CATEGORY_}. For example,
-the string value for {@code CATEGORY_LAUNCHER} is
+the string value for {@code CATEGORY_LAUNCHER} is
"{@code android.intent.category.LAUNCHER}".
<p class="note"><strong>Note:</strong> In order to receive implicit intents, you must include the
@@ -39,7 +39,7 @@
Custom categories should use the package name as a prefix, to ensure
that they are unique.
</p></dd>
-</dl></dd>
+</dl></dd>
<!-- ##api level indication## -->
<dt>introduced in:</dt>
diff --git a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
index b2d9bb7..a464e55 100644
--- a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
+++ b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
@@ -14,24 +14,24 @@
<dt>description:</dt>
<dd itemprop="description">Specifies which data subsets of the parent content provider permission
-can be granted for. Data subsets are indicated by the path part of a
+can be granted for. Data subsets are indicated by the path part of a
{@code content:} URI. (The authority part of the URI identifies the
-content provider.)
-Granting permission is a way of enabling clients of the provider that don't
-normally have permission to access its data to overcome that restriction on
+content provider.)
+Granting permission is a way of enabling clients of the provider that don't
+normally have permission to access its data to overcome that restriction on
a one-time basis.
-<p>
-If a content provider's <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmns">grantUriPermissions</a></code>
-attribute is "{@code true}", permission can be granted for any the data under
-the provider's purview. However, if that attribute is "{@code false}", permission
-can be granted only to data subsets that are specified by this element.
+<p>
+If a content provider's <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmns">grantUriPermissions</a></code>
+attribute is "{@code true}", permission can be granted for any the data under
+the provider's purview. However, if that attribute is "{@code false}", permission
+can be granted only to data subsets that are specified by this element.
A provider can contain any number of {@code <grant-uri-permission>} elements.
Each one can specify only one path (only one of the three possible attributes).
</p>
<p>
-For information on how permission is granted, see the
+For information on how permission is granted, see the
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">grantUriPermissions</a></code> attribute.
</p></dd>
@@ -41,34 +41,34 @@
<dt><a name="path"></a>{@code android:path}
<br/>{@code android:pathPrefix}
<br/>{@code android:pathPattern}</dt>
-<dd>A path identifying the data subset or subsets that permission can be
-granted for. The {@code path} attribute specifies a complete path;
-permission can be granted only to the particular data subset identified
-by that path.
-The {@code pathPrefix} attribute specifies the initial part of a path;
-permission can be granted to all data subsets with paths that share that
-initial part.
-The {@code pathPattern} attribute specifies a complete path, but one
+<dd>A path identifying the data subset or subsets that permission can be
+granted for. The {@code path} attribute specifies a complete path;
+permission can be granted only to the particular data subset identified
+by that path.
+The {@code pathPrefix} attribute specifies the initial part of a path;
+permission can be granted to all data subsets with paths that share that
+initial part.
+The {@code pathPattern} attribute specifies a complete path, but one
that can contain the following wildcards:
<ul>
<li>An asterisk ('{@code *}') matches a sequence of 0 to many occurrences of
the immediately preceding character.</li>
-<li><p>A period followed by an asterisk ("{@code .*}") matches any sequence of
+<li><p>A period followed by an asterisk ("{@code .*}") matches any sequence of
0 to many characters.</p></li>
</ul>
<p>
-Because '{@code \}' is used as an escape character when the string is read
-from XML (before it is parsed as a pattern), you will need to double-escape:
-For example, a literal '{@code *}' would be written as "{@code \\*}" and a
-literal '{@code \}' would be written as "{@code \\\\}". This is basically
+Because '{@code \}' is used as an escape character when the string is read
+from XML (before it is parsed as a pattern), you will need to double-escape:
+For example, a literal '{@code *}' would be written as "{@code \\*}" and a
+literal '{@code \}' would be written as "{@code \\\\}". This is basically
the same as what you would need to write if constructing the string in Java code.
</p>
<p>
-For more information on these types of patterns, see the descriptions of
+For more information on these types of patterns, see the descriptions of
{@link android.os.PatternMatcher#PATTERN_LITERAL},
{@link android.os.PatternMatcher#PATTERN_PREFIX}, and
{@link android.os.PatternMatcher#PATTERN_SIMPLE_GLOB} in the
@@ -81,10 +81,10 @@
<dd>API Level 1</dd>
<dt>see also:</dt>
-<dd>the
+<dd>the
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmns">grantUriPermissions</a></code>
-attribute of the
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
+attribute of the
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
element</dd>
diff --git a/docs/html/guide/topics/manifest/instrumentation-element.jd b/docs/html/guide/topics/manifest/instrumentation-element.jd
index 74be559..a476be3 100644
--- a/docs/html/guide/topics/manifest/instrumentation-element.jd
+++ b/docs/html/guide/topics/manifest/instrumentation-element.jd
@@ -23,15 +23,15 @@
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="ftest"></a>{@code android:functionalTest}</dt>
-<dd>Whether or not the Instrumentation class should run as a functional test
+<dd>Whether or not the Instrumentation class should run as a functional test
— "{@code true}" if it should, and "{@code false}" if not. The
default value is "{@code false}".</dd>
<dt><a name="hprof"></a>{@code android:handleProfiling}</dt>
-<dd>Whether or not the Instrumentation object will turn profiling on and
-off — "{@code true}" if it determines when profiling starts and
-stops, and "{@code false}" if profiling continues the entire time it is
-running. A value of "{@code true}" enables the object to target profiling
+<dd>Whether or not the Instrumentation object will turn profiling on and
+off — "{@code true}" if it determines when profiling starts and
+stops, and "{@code false}" if profiling continues the entire time it is
+running. A value of "{@code true}" enables the object to target profiling
at a specific set of operations. The default value is "{@code false}".</dd>
<dt><a name="icon"></a>{@code android:icon}</dt>
@@ -43,11 +43,11 @@
be set as a raw string or a reference to a string resource.</dd>
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name of the {@link android.app.Instrumentation} subclass.
-This should be a fully qualified class name (such as,
-"{@code com.example.project.StringInstrumentation}"). However, as a shorthand,
-if the first character of the name is a period, it is appended to the package
-name specified in the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
+<dd>The name of the {@link android.app.Instrumentation} subclass.
+This should be a fully qualified class name (such as,
+"{@code com.example.project.StringInstrumentation}"). However, as a shorthand,
+if the first character of the name is a period, it is appended to the package
+name specified in the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
<p>
There is no default. The name must be specified.
diff --git a/docs/html/guide/topics/manifest/intent-filter-element.jd b/docs/html/guide/topics/manifest/intent-filter-element.jd
index 14b4e03..13956c9 100644
--- a/docs/html/guide/topics/manifest/intent-filter-element.jd
+++ b/docs/html/guide/topics/manifest/intent-filter-element.jd
@@ -27,23 +27,23 @@
<dt>description:</dt>
<dd itemprop="description">Specifies the types of intents that an activity, service, or broadcast
receiver can respond to. An intent filter declares the capabilities of its
-parent component — what an activity or service can do and what types
-of broadcasts a receiver can handle. It opens the component to receiving
-intents of the advertised type, while filtering out those that are not
+parent component — what an activity or service can do and what types
+of broadcasts a receiver can handle. It opens the component to receiving
+intents of the advertised type, while filtering out those that are not
meaningful for the component.
<p>
-Most of the contents of the filter are described by its
-<code><a href="{@docRoot}guide/topics/manifest/action-element.html"><action></a></code>,
+Most of the contents of the filter are described by its
+<code><a href="{@docRoot}guide/topics/manifest/action-element.html"><action></a></code>,
<code><a href="{@docRoot}guide/topics/manifest/category-element.html"><category></a></code>, and
<code><a href="{@docRoot}guide/topics/manifest/data-element.html"><data></a></code> subelements.
</p>
<p>
-For a more detailed discussion of filters, see the separate
-<a href="{@docRoot}guide/components/intents-filters.html">Intents
-and Intent Filters</a> document, as well as the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#ifs">Intents Filters</a>
+For a more detailed discussion of filters, see the separate
+<a href="{@docRoot}guide/components/intents-filters.html">Intents
+and Intent Filters</a> document, as well as the
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#ifs">Intents Filters</a>
section in the introduction.
</p></dd>
@@ -51,19 +51,19 @@
<dd><dl class="attr">
<dt><a name="icon"></a>{@code android:icon}</dt>
<dd>An icon that represents the parent activity, service, or broadcast
-receiver when that component is presented to the user as having the
+receiver when that component is presented to the user as having the
capability described by the filter.
<p>
-This attribute must be set as a reference to a drawable resource
-containing the image definition. The default value is the icon set
-by the parent component's {@code icon} attribute. If the parent
+This attribute must be set as a reference to a drawable resource
+containing the image definition. The default value is the icon set
+by the parent component's {@code icon} attribute. If the parent
does not specify an icon, the default is the icon set by the
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element.
</p>
<p>
-For more on intent filter icons, see
+For more on intent filter icons, see
<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#iconlabel">Icons and Labels</a>
in the introduction.
</p></dd>
@@ -75,44 +75,44 @@
<p>
The label should be set as a reference to a string resource, so that
-it can be localized like other strings in the user interface.
-However, as a convenience while you're developing the application,
+it can be localized like other strings in the user interface.
+However, as a convenience while you're developing the application,
it can also be set as a raw string.
</p>
<p>
-The default value is the label set by the parent component. If the
+The default value is the label set by the parent component. If the
parent does not specify a label, the default is the label set by the
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label"> label</a></code> attribute.
</p>
<p>
-For more on intent filter labels, see
+For more on intent filter labels, see
<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#iconlabel">Icons and Labels</a>
in the introduction.
</p></dd>
<dt><a name="priority"></a>{@code android:priority}</dt>
<dd>The priority that should be given to the parent component with regard
-to handling intents of the type described by the filter. This attribute has
+to handling intents of the type described by the filter. This attribute has
meaning for both activities and broadcast receivers:
<ul>
-<li>It provides information about how able an activity is to respond to
+<li>It provides information about how able an activity is to respond to
an intent that matches the filter, relative to other activities that could
-also respond to the intent. When an intent could be handled by multiple
+also respond to the intent. When an intent could be handled by multiple
activities with different priorities, Android will consider only those with
higher priority values as potential targets for the intent.</li>
<li><p>It controls the order in which broadcast receivers are executed to
-receive broadcast messages. Those with higher priority
-values are called before those with lower values. (The order applies only
+receive broadcast messages. Those with higher priority
+values are called before those with lower values. (The order applies only
to synchronous messages; it's ignored for asynchronous messages.)</p></li>
</ul>
<p>
-Use this attribute only if you really need to impose a specific order in
+Use this attribute only if you really need to impose a specific order in
which the broadcasts are received, or want to force Android to prefer
one activity over others.
</p>
diff --git a/docs/html/guide/topics/manifest/meta-data-element.jd b/docs/html/guide/topics/manifest/meta-data-element.jd
index d3b41c3..945b116 100644
--- a/docs/html/guide/topics/manifest/meta-data-element.jd
+++ b/docs/html/guide/topics/manifest/meta-data-element.jd
@@ -19,18 +19,18 @@
<dt>description:</dt>
<dd itemprop="description">A name-value pair for an item of additional, arbitrary data that can
-be supplied to the parent component. A component element can contain any
+be supplied to the parent component. A component element can contain any
number of {@code <meta-data>} subelements. The values from all of
-them are collected in a single {@link android.os.Bundle} object and made
-available to the component as the
-{@link android.content.pm.PackageItemInfo#metaData
+them are collected in a single {@link android.os.Bundle} object and made
+available to the component as the
+{@link android.content.pm.PackageItemInfo#metaData
PackageItemInfo.metaData} field.
<p>
-Ordinary values are specified through the <code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#value">value</a></code>
-attribute. However, to assign a resource ID as the value, use the
-<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#resource">resource</a></code> attribute instead. For example,
-the following code assigns whatever value is stored in the {@code @string/kangaroo}
+Ordinary values are specified through the <code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#value">value</a></code>
+attribute. However, to assign a resource ID as the value, use the
+<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#resource">resource</a></code> attribute instead. For example,
+the following code assigns whatever value is stored in the {@code @string/kangaroo}
resource to the "{@code zoo}" name:
</p>
@@ -44,23 +44,23 @@
<pre><meta-data android:name="zoo" android:resource="@string/kangaroo" /></pre>
<p>
-It is highly recommended that you avoid supplying related data as
+It is highly recommended that you avoid supplying related data as
multiple separate {@code <meta-data>} entries. Instead, if you
-have complex data to associate with a component, store it as a resource and
+have complex data to associate with a component, store it as a resource and
use the {@code resource} attribute to inform the component of its ID.
</p></dd>
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>A unique name for the item. To ensure that the name is unique, use a
-Java-style naming convention — for example,
+<dd>A unique name for the item. To ensure that the name is unique, use a
+Java-style naming convention — for example,
"{@code com.example.project.activity.fred}".</dd>
<dt><a name="rsrc"></a>{@code android:resource}</dt>
-<dd>A reference to a resource. The ID of the resource is the value assigned
-to the item. The ID can be retrieved from the meta-data Bundle by the
-{@link android.os.Bundle#getInt Bundle.getInt()} method.</dd>
+<dd>A reference to a resource. The ID of the resource is the value assigned
+to the item. The ID can be retrieved from the meta-data Bundle by the
+{@link android.os.BaseBundle#getInt Bundle.getInt()} method.</dd>
<dt><a name="val"></a>{@code android:value}</dt>
<dd>The value assigned to the item. The data types that can be assigned as values and the Bundle methods that components use to retrieve those values are listed in the following table:
@@ -70,19 +70,19 @@
<th>Type</th>
<th>Bundle method</th>
</tr><tr>
- <td>String value, using double backslashes ({@code \\}) to escape characters
+ <td>String value, using double backslashes ({@code \\}) to escape characters
— such as "{@code \\n}" and "{@code \\uxxxxx}" for a Unicode character.</td>
- <td>{@link android.os.Bundle#getString(String) getString()}</td>
+ <td>{@link android.os.BaseBundle#getString(String) getString()}</td>
</tr><tr>
<td>Integer value, such as "{@code 100}"</td>
- <td>{@link android.os.Bundle#getInt(String) getInt()}</td>
+ <td>{@link android.os.BaseBundle#getInt(String) getInt()}</td>
</tr><tr>
<td>Boolean value, either "{@code true}" or "{@code false}"</td>
- <td>{@link android.os.Bundle#getBoolean(String) getBoolean()}</td>
+ <td>{@link android.os.BaseBundle#getBoolean(String) getBoolean()}</td>
</tr><tr>
- <td>Color value, in the form "{@code #rgb}", "{@code #argb}",
+ <td>Color value, in the form "{@code #rgb}", "{@code #argb}",
"{@code #rrggbb}", or "{@code #aarrggbb}"</td>
- <td>{@link android.os.Bundle#getInt(String) getInt()}</td>
+ <td>{@link android.os.BaseBundle#getInt(String) getInt()}</td>
</tr><tr>
<td>Float value, such as "{@code 1.23}"</td>
<td>{@link android.os.Bundle#getFloat(String) getFloat()}</td>
diff --git a/docs/html/guide/topics/manifest/path-permission-element.jd b/docs/html/guide/topics/manifest/path-permission-element.jd
index cdaf82b..4774707 100644
--- a/docs/html/guide/topics/manifest/path-permission-element.jd
+++ b/docs/html/guide/topics/manifest/path-permission-element.jd
@@ -33,9 +33,9 @@
<dd><dl class="attr">
<dt><a name="path"></a>{@code android:path}</dt>
-<dd>A complete URI path for a subset of content provider data.
-Permission can be granted only to the particular data identified by this path.
-When used to provide search suggestion content, it must be appended
+<dd>A complete URI path for a subset of content provider data.
+Permission can be granted only to the particular data identified by this path.
+When used to provide search suggestion content, it must be appended
with "/search_suggest_query".
</dd>
@@ -47,24 +47,24 @@
<dt><a name="pathPattern"></a>{@code android:pathPattern}</dt>
<dd>A complete URI path for a subset of content provider data,
but one that can use the following wildcards:
-
-<ul>
+
+<ul>
<li>An asterisk ('<code class="Code prettyprint">*</code>'). This matches a sequence of 0 to many occurrences of
-the immediately preceding character.</li>
-
-<li>A period followed by an asterisk ("<code class="Code prettyprint">.*</code>"). This matches any sequence of
-0 or more characters.</li>
-</ul>
-
-<p>
-Because '<code class="Code prettyprint">\</code>' is used as an escape character when the string is read
+the immediately preceding character.</li>
+
+<li>A period followed by an asterisk ("<code class="Code prettyprint">.*</code>"). This matches any sequence of
+0 or more characters.</li>
+</ul>
+
+<p>
+Because '<code class="Code prettyprint">\</code>' is used as an escape character when the string is read
from XML (before it is parsed as a pattern), you will need to double-escape.
-For example, a literal '<code class="Code prettyprint">*</code>' would be written as "<code class="Code prettyprint">\\*</code>" and a
-literal '<code class="Code prettyprint">\</code>' would be written as "<code class="Code prettyprint">\\</code>". This is basically
+For example, a literal '<code class="Code prettyprint">*</code>' would be written as "<code class="Code prettyprint">\\*</code>" and a
+literal '<code class="Code prettyprint">\</code>' would be written as "<code class="Code prettyprint">\\</code>". This is basically
the same as what you would need to write if constructing the string in Java code.
-</p>
-<p>
-For more information on these types of patterns, see the descriptions of
+</p>
+<p>
+For more information on these types of patterns, see the descriptions of
<a href="/reference/android/os/PatternMatcher.html#PATTERN_LITERAL">PATTERN_LITERAL</a>,
<a href="/reference/android/os/PatternMatcher.html#PATTERN_PREFIX">PATTERN_PREFIX</a>, and
<a href="/reference/android/os/PatternMatcher.html#PATTERN_SIMPLE_GLOB">PATTERN_SIMPLE_GLOB</a> in the
@@ -74,20 +74,20 @@
<dt><a name="permission"></a>{@code android:permission}</dt>
<dd>The name of a permission that clients must have in order to read or write the
-content provider's data. This attribute is a convenient way of setting a
-single permission for both reading and writing. However, the
-<code>readPermission</code> and
+content provider's data. This attribute is a convenient way of setting a
+single permission for both reading and writing. However, the
+<code>readPermission</code> and
<code>writePermission</code> attributes take precedence
over this one.
-</dd>
+</dd>
<dt><a name="readPermission"></a>{@code android:readPermission}</dt>
<dd>A permission that clients must have in order to query the content provider.
-</dd>
+</dd>
<dt><a name="writePermission"></a>{@code android:writePermission}</dt>
<dd>A permission that clients must have in order to make changes to the data controlled by the content provider.
-</dd>
+</dd>
diff --git a/docs/html/guide/topics/manifest/permission-group-element.jd b/docs/html/guide/topics/manifest/permission-group-element.jd
index 3221d4b..85452b5 100644
--- a/docs/html/guide/topics/manifest/permission-group-element.jd
+++ b/docs/html/guide/topics/manifest/permission-group-element.jd
@@ -20,17 +20,17 @@
presented together in the user interface.
<p>
-Note that this element does not declare a permission itself, only a category in
-which permissions can be placed. See the
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> element for element for information
+Note that this element does not declare a permission itself, only a category in
+which permissions can be placed. See the
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> element for element for information
on declaring permissions and assigning them to groups.
</p></dd>
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="desc"></a>{@code android:description}</dt>
-<dd>User-readable text that describes the group. The text should be
-longer and more explanatory than the label. This attribute must be
+<dd>User-readable text that describes the group. The text should be
+longer and more explanatory than the label. This attribute must be
set as a reference to a string resource. Unlike the {@code label}
attribute, it cannot be a raw string.</dd>
@@ -39,10 +39,10 @@
as a reference to a drawable resource containing the image definition.</dd>
<dt><a name="label"></a>{@code android:label}</dt>
-<dd>A user-readable name for the group. As a convenience, the label can
-be directly set as a raw string while you're developing the application.
-However, when the application is ready to be published, it should be set
-as a reference to a string resource, so that it can be localized like other
+<dd>A user-readable name for the group. As a convenience, the label can
+be directly set as a raw string while you're developing the application.
+However, when the application is ready to be published, it should be set
+as a reference to a string resource, so that it can be localized like other
strings in the user interface.</dd>
<dt><a name="nm"></a>{@code android:name}</dt>
diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd
index 21d7352..cbfd72c 100644
--- a/docs/html/guide/topics/manifest/permission-tree-element.jd
+++ b/docs/html/guide/topics/manifest/permission-tree-element.jd
@@ -14,7 +14,7 @@
<dt>description:</dt>
<dd itemprop="description">Declares the base name for a tree of permissions. The application takes
-ownership of all names within the tree. It can dynamically add new permissions
+ownership of all names within the tree. It can dynamically add new permissions
to the tree by calling <code>{@link android.content.pm.PackageManager#addPermission PackageManager.addPermission()}</code>. Names within the tree are separated by
periods ('{@code .}'). For example, if the base name is
{@code com.example.project.taxes}, permissions like the following might be
@@ -25,30 +25,30 @@
<br/>{@code com.example.project.taxes.deductions.EXAGGERATE}</p>
<p>
-Note that this element does not declare a permission itself, only a
-namespace in which further permissions can be placed. See the
-<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+Note that this element does not declare a permission itself, only a
+namespace in which further permissions can be placed. See the
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
element for information on declaring permissions.
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="icon"></a>{@code android:icon}</dt>
-<dd>An icon representing all the permissions in the tree. This attribute
-must be set as a reference to a drawable resource containing the image
+<dd>An icon representing all the permissions in the tree. This attribute
+must be set as a reference to a drawable resource containing the image
definition.</dd>
<dt><a name="label"></a>{@code android:label}</dt>
-<dd>A user-readable name for the group. As a convenience, the label can
-be directly set as a raw string for quick and dirty programming. However,
-when the application is ready to be published, it should be set as a
-reference to a string resource, so that it can be localized like other
+<dd>A user-readable name for the group. As a convenience, the label can
+be directly set as a raw string for quick and dirty programming. However,
+when the application is ready to be published, it should be set as a
+reference to a string resource, so that it can be localized like other
strings in the user interface.</dd>
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name that's at the base of the permission tree. It serves as
-a prefix to all permission names in the tree. Java-style scoping should
-be used to ensure that the name is unique. The name must have more than
-two period-separated segments in its path — for example,
+<dd>The name that's at the base of the permission tree. It serves as
+a prefix to all permission names in the tree. Java-style scoping should
+be used to ensure that the name is unique. The name must have more than
+two period-separated segments in its path — for example,
{@code com.example.base} is OK, but {@code com.example} is not.</dd>
</dl></dd>
diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd
index 4b5c0c3..1947849 100644
--- a/docs/html/guide/topics/manifest/provider-element.jd
+++ b/docs/html/guide/topics/manifest/provider-element.jd
@@ -37,41 +37,41 @@
<dt>description:</dt>
<dd itemprop="description">
- Declares a content provider component. A content provider is a subclass of
- {@link android.content.ContentProvider} that supplies structured access to data managed by the
- application. All content providers in your application must be defined in a
+ Declares a content provider component. A content provider is a subclass of
+ {@link android.content.ContentProvider} that supplies structured access to data managed by the
+ application. All content providers in your application must be defined in a
{@code <provider>} element in the manifest file; otherwise, the system is unaware of them
and doesn't run them.
<p>
You only declare content providers that are part of your application. Content providers in
other applications that you use in your application should not be declared.
- </p>
+ </p>
<p>
The Android system stores references to content providers according to an <b>authority</b>
- string, part of the provider's <b>content URI</b>. For example, suppose you want to
+ string, part of the provider's <b>content URI</b>. For example, suppose you want to
access a content provider that stores information about health care professionals. To do
- this, you call the method
+ this, you call the method
{@link android.content.ContentResolver#query ContentResolver.query()}, which among other
arguments takes a URI that identifies the provider:
- </p>
+ </p>
<pre>
content://com.example.project.healthcareprovider/nurses/rn
</pre>
<p>
The <code>content:</code> <b>scheme</b> identifies the URI as a content URI pointing to
- an Android content provider. The authority
+ an Android content provider. The authority
<code>com.example.project.healthcareprovider</code> identifies the provider itself; the
- Android system looks up the authority in its list of known providers and their authorities.
- The substring <code>nurses/rn</code> is a <b>path</b>, which the content provider can use
+ Android system looks up the authority in its list of known providers and their authorities.
+ The substring <code>nurses/rn</code> is a <b>path</b>, which the content provider can use
to identify subsets of the provider data.
</p>
<p>
- Notice that when you define your provider in the <code><provider></code> element, you
+ Notice that when you define your provider in the <code><provider></code> element, you
don't include the scheme or the path in the <code>android:name</code> argument, only the
- authority.
+ authority.
</p>
<p>
- For information on using and developing content providers, see the API Guide,
+ For information on using and developing content providers, see the API Guide,
<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.
</p>
</dd>
@@ -82,8 +82,8 @@
<dt><a name="auth"></a>{@code android:authorities}</dt>
<dd>
A list of one or more URI authorities that identify data offered by the content provider.
- Multiple authorities are listed by separating their names with a semicolon.
- To avoid conflicts, authority names should use a Java-style naming convention
+ Multiple authorities are listed by separating their names with a semicolon.
+ To avoid conflicts, authority names should use a Java-style naming convention
(such as {@code com.example.provider.cartoonprovider}). Typically, it's the name
of the {@link android.content.ContentProvider} subclass that implements the provider
<p>
@@ -92,92 +92,92 @@
</dd>
<dt><a name="enabled"></a>{@code android:enabled}</dt>
- <dd>Whether or not the content provider can be instantiated by the system —
- "{@code true}" if it can be, and "{@code false}" if not. The default value
+ <dd>Whether or not the content provider can be instantiated by the system —
+ "{@code true}" if it can be, and "{@code false}" if not. The default value
is "{@code true}".
<p>
-The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
-application components, including content providers. The
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
+application components, including content providers. The
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> and {@code <provider>}
attributes must both be "{@code true}" (as they both
-are by default) for the content provider to be enabled. If either is
+are by default) for the content provider to be enabled. If either is
"{@code false}", the provider is disabled; it cannot be instantiated.
</p></dd>
<dt><a name="exported"></a>{@code android:exported}</dt>
<dd>
Whether the content provider is available for other applications to use:
- <ul>
+ <ul>
<li>
<code>true</code>: The provider is available to other applications. Any application can
use the provider's content URI to access it, subject to the permissions specified for
the provider.
</li>
<li>
- <code>false</code>: The provider is not available to other applications. Set
+ <code>false</code>: The provider is not available to other applications. Set
<code>android:exported="false"</code> to limit access to the provider to your
applications. Only applications that have the same user ID (UID) as the provider will
have access to it.
</li>
</ul>
<p>
- The default value is <code>"true"</code> for applications that set either
+ The default value is <code>"true"</code> for applications that set either
<code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">android:minSdkVersion</a></code>
- or
-<code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">android:targetSdkVersion</a></code> to
+ or
+<code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">android:targetSdkVersion</a></code> to
<code>"16"</code> or lower. For applications that
- set either of these attributes to <code>"17"</code> or higher, the default is
+ set either of these attributes to <code>"17"</code> or higher, the default is
<code>"false"</code>.
</p>
<p>
You can set <code>android:exported="false"</code> and still limit access to your
- provider by setting permissions with the
+ provider by setting permissions with the
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code>
attribute.
</p>
-</dd>
+</dd>
<dt><a name="gprmsn"></a>{@code android:grantUriPermissions}</dt>
-<dd>Whether or not those who ordinarily would not have permission to
+<dd>Whether or not those who ordinarily would not have permission to
access the content provider's data can be granted permission to do so,
temporarily overcoming the restriction imposed by the
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#rprmsn">readPermission</a></code>,
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#wprmsn">writePermission</a></code>, and
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code> attributes
-—
-"{@code true}" if permission can be granted, and "{@code false}" if not.
-If "{@code true}", permission can be granted to any of the content
-provider's data. If "{@code false}", permission can be granted only
-to the data subsets listed in
-<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code> subelements,
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#wprmsn">writePermission</a></code>, and
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code> attributes
+—
+"{@code true}" if permission can be granted, and "{@code false}" if not.
+If "{@code true}", permission can be granted to any of the content
+provider's data. If "{@code false}", permission can be granted only
+to the data subsets listed in
+<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code> subelements,
if any. The default value is "{@code false}".
<p>
-Granting permission is a way of giving an application component one-time
-access to data protected by a permission. For example, when an e-mail
-message contains an attachment, the mail application may call upon the
-appropriate viewer to open it, even though the viewer doesn't have general
-permission to look at all the content provider's data.
+Granting permission is a way of giving an application component one-time
+access to data protected by a permission. For example, when an e-mail
+message contains an attachment, the mail application may call upon the
+appropriate viewer to open it, even though the viewer doesn't have general
+permission to look at all the content provider's data.
</p>
-<p>
-In such cases, permission is granted by
-<code>{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}</code>
-and <code>{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION}</code>
-flags in the Intent object that activates the component. For example, the
-mail application might put {@code FLAG_GRANT_READ_URI_PERMISSION} in the
-Intent passed to {@code Context.startActivity()}. The permission is specific
-to the URI in the Intent.
+<p>
+In such cases, permission is granted by
+<code>{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}</code>
+and <code>{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION}</code>
+flags in the Intent object that activates the component. For example, the
+mail application might put {@code FLAG_GRANT_READ_URI_PERMISSION} in the
+Intent passed to {@code Context.startActivity()}. The permission is specific
+to the URI in the Intent.
</p>
<p>
If you enable this feature, either by setting this attribute to "{@code true}"
-or by defining <code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
-subelements, you must call
-<code>{@link android.content.Context#revokeUriPermission
-Context.revokeUriPermission()}</code> when a covered URI is deleted from
+or by defining <code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
+subelements, you must call
+<code>{@link android.content.Context#revokeUriPermission
+Context.revokeUriPermission()}</code> when a covered URI is deleted from
the provider.
</p>
@@ -187,52 +187,52 @@
</p></dd>
<dt><a name="icon"></a>{@code android:icon}</dt>
-<dd>An icon representing the content provider.
-This attribute must be set as a reference to a drawable resource containing
-the image definition. If it is not set, the icon specified for the application
-as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+<dd>An icon representing the content provider.
+This attribute must be set as a reference to a drawable resource containing
+the image definition. If it is not set, the icon specified for the application
+as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).</dd>
<dt><a name="init"></a>{@code android:initOrder}</dt>
-<dd>The order in which the content provider should be instantiated,
-relative to other content providers hosted by the same process.
-When there are dependencies among content providers, setting this
-attribute for each of them ensures that they are created in the order
-required by those dependencies. The value is a simple integer,
+<dd>The order in which the content provider should be instantiated,
+relative to other content providers hosted by the same process.
+When there are dependencies among content providers, setting this
+attribute for each of them ensures that they are created in the order
+required by those dependencies. The value is a simple integer,
with higher numbers being initialized first.</dd>
<dt><a name="label"></a>{@code android:label}</dt>
-<dd>A user-readable label for the content provided.
-If this attribute is not set, the label set for the application as a whole is
-used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<dd>A user-readable label for the content provided.
+If this attribute is not set, the label set for the application as a whole is
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
<p>
The label should be set as a reference to a string resource, so that
-it can be localized like other strings in the user interface.
-However, as a convenience while you're developing the application,
+it can be localized like other strings in the user interface.
+However, as a convenience while you're developing the application,
it can also be set as a raw string.
</p></dd>
<dt><a name="multi"></a>{@code android:multiprocess}</dt>
-<dd>Whether or not an instance of the content provider can be created in
+<dd>Whether or not an instance of the content provider can be created in
every client process — "{@code true}" if instances can run in multiple
processes, and "{@code false}" if not. The default value is "{@code false}".
<p>
-Normally, a content provider is instantiated in the process of the
-application that defined it. However, if this flag is set to "{@code true}",
-the system can create an instance in every process where there's a client
-that wants to interact with it, thus avoiding the overhead of interprocess
+Normally, a content provider is instantiated in the process of the
+application that defined it. However, if this flag is set to "{@code true}",
+the system can create an instance in every process where there's a client
+that wants to interact with it, thus avoiding the overhead of interprocess
communication.
</p></dd>
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name of the class that implements the content provider, a subclass of
-{@link android.content.ContentProvider}. This should be a fully qualified
-class name (such as, "{@code com.example.project.TransportationProvider}").
-However, as a shorthand, if the first character of the name is a period,
-it is appended to the package name specified in the
+<dd>The name of the class that implements the content provider, a subclass of
+{@link android.content.ContentProvider}. This should be a fully qualified
+class name (such as, "{@code com.example.project.TransportationProvider}").
+However, as a shorthand, if the first character of the name is a period,
+it is appended to the package name specified in the
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
<p>
@@ -242,58 +242,58 @@
<dt><a name="prmsn"></a>{@code android:permission}</dt>
<dd>The name of a permission that clients must have to read or write the
-content provider's data. This attribute is a convenient way of setting a
-single permission for both reading and writing. However, the
-<code><a href="#rprmsn">readPermission</a></code> and
+content provider's data. This attribute is a convenient way of setting a
+single permission for both reading and writing. However, the
+<code><a href="#rprmsn">readPermission</a></code> and
<code><a href="#wprmsn">writePermission</a></code> attributes take precedence
-over this one. If the <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#rprmsn">readPermission</a></code>
+over this one. If the <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#rprmsn">readPermission</a></code>
attribute is also set, it controls access for querying the content provider.
And if the <code><a href="#wprmsn">writePermission</a></code> attribute is set,
it controls access for modifying the provider's data.
<p>
-For more information on permissions, see the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a>
-section in the introduction and a separate document,
+For more information on permissions, see the
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a>
+section in the introduction and a separate document,
<a href="{@docRoot}guide/topics/security/security.html">Security and
Permissions</a>.
</p></dd>
<dt><a name="proc"></a>{@code android:process}</dt>
-<dd>The name of the process in which the content provider should run. Normally,
-all components of an application run in the default process created for the
-application. It has the same name as the application package. The
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code>
-attribute can set a different
+<dd>The name of the process in which the content provider should run. Normally,
+all components of an application run in the default process created for the
+application. It has the same name as the application package. The
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code>
+attribute can set a different
default for all components. But each component can override the default
-with its own {@code process} attribute, allowing you to spread your
+with its own {@code process} attribute, allowing you to spread your
application across multiple processes.
<p>
-If the name assigned to this attribute begins with a colon (':'), a new
-process, private to the application, is created when it's needed and
+If the name assigned to this attribute begins with a colon (':'), a new
+process, private to the application, is created when it's needed and
the activity runs in that process.
-If the process name begins with a lowercase character, the activity will run
+If the process name begins with a lowercase character, the activity will run
in a global process of that name, provided that it has permission to do so.
-This allows components in different applications to share a process, reducing
+This allows components in different applications to share a process, reducing
resource usage.
</p></dd>
<dt><a name="rprmsn"></a>{@code android:readPermission}</dt>
-<dd>A permission that clients must have to query the content provider.
-See also the <code><a href="#prmsn">permission</a></code> and
+<dd>A permission that clients must have to query the content provider.
+See also the <code><a href="#prmsn">permission</a></code> and
<code><a href="#wprmsn">writePermission</a></code> attributes.</dd>
<dt><a name="sync"></a>{@code android:syncable}</dt>
-<dd>Whether or not the data under the content provider's control
-is to be synchronized with data on a server — "{@code true}"
+<dd>Whether or not the data under the content provider's control
+is to be synchronized with data on a server — "{@code true}"
if it is to be synchronized, and "{@code false}" if not.</dd>
<dt><a name="wprmsn"></a>{@code android:writePermission}</dt>
-<dd>A permission that clients must have to make changes to the data
-controlled by the content provider.
-See also the <code><a href="#prmsn">permission</a></code> and
+<dd>A permission that clients must have to make changes to the data
+controlled by the content provider.
+See also the <code><a href="#prmsn">permission</a></code> and
<code><a href="#rprmsn">readPermission</a></code> attributes.</dd>
</dl></dd>
diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd
index 081a191..800ee8a 100644
--- a/docs/html/guide/topics/manifest/receiver-element.jd
+++ b/docs/html/guide/topics/manifest/receiver-element.jd
@@ -24,14 +24,14 @@
<dt>description:</dt>
<dd itemprop="description">Declares a broadcast receiver (a {@link android.content.BroadcastReceiver}
-subclass) as one of the application's components. Broadcast receivers enable
-applications to receive intents that are broadcast by the system or by other
+subclass) as one of the application's components. Broadcast receivers enable
+applications to receive intents that are broadcast by the system or by other
applications, even when other components of the application are not running.
<p>
There are two ways to make a broadcast receiver known to the system: One is
declare it in the manifest file with this element. The other is to create
-the receiver dynamically in code and register it with the <code>{@link
+the receiver dynamically in code and register it with the <code>{@link
android.content.Context#registerReceiver Context.registerReceiver()}</code>
method. See the {@link android.content.BroadcastReceiver} class description
for more on dynamically created receivers.
@@ -40,14 +40,14 @@
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="enabled"></a>{@code android:enabled}</dt>
-<dd>Whether or not the broadcast receiver can be instantiated by the system —
-"{@code true}" if it can be, and "{@code false}" if not. The default value
+<dd>Whether or not the broadcast receiver can be instantiated by the system —
+"{@code true}" if it can be, and "{@code false}" if not. The default value
is "{@code true}".
<p>
-The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
-application components, including broadcast receivers. The
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
+application components, including broadcast receivers. The
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> and
{@code <receiver>} attributes must both be "{@code true}" for
the broadcast receiver to be enabled. If either is "{@code false}", it is
@@ -55,72 +55,72 @@
</p></dd>
<dt><a name="exported"></a>{@code android:exported}</dt>
-<dd>Whether or not the broadcast receiver can receive messages from sources
-outside its application — "{@code true}" if it can, and "{@code false}"
-if not. If "{@code false}", the only messages the broadcast receiver can
-receive are those sent by components of the same application or applications
-with the same user ID.
+<dd>Whether or not the broadcast receiver can receive messages from sources
+outside its application — "{@code true}" if it can, and "{@code false}"
+if not. If "{@code false}", the only messages the broadcast receiver can
+receive are those sent by components of the same application or applications
+with the same user ID.
<p>
-The default value depends on whether the broadcast receiver contains intent filters.
+The default value depends on whether the broadcast receiver contains intent filters.
The absence of any filters means that it can be invoked only by Intent objects that
-specify its exact class name. This implies that the receiver is intended only for
-application-internal use (since others would not normally know the class name).
+specify its exact class name. This implies that the receiver is intended only for
+application-internal use (since others would not normally know the class name).
So in this case, the default value is "{@code false}".
-On the other hand, the presence of at least one filter implies that the broadcast
-receiver is intended to receive intents broadcast by the system or other applications,
+On the other hand, the presence of at least one filter implies that the broadcast
+receiver is intended to receive intents broadcast by the system or other applications,
so the default value is "{@code true}".
</p>
<p>
-This attribute is not the only way to limit a broadcast receiver's external exposure.
-You can also use a permission to limit the external entities that can send it messages
+This attribute is not the only way to limit a broadcast receiver's external exposure.
+You can also use a permission to limit the external entities that can send it messages
(see the <code><a href="{@docRoot}guide/topics/manifest/receiver-element.html#prmsn">permission</a></code> attribute).
</p></dd>
<dt><a name="icon"></a>{@code android:icon}</dt>
-<dd>An icon representing the broadcast receiver. This attribute must be set
-as a reference to a drawable resource containing the image definition.
-If it is not set, the icon specified for the application as a whole is used
-instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+<dd>An icon representing the broadcast receiver. This attribute must be set
+as a reference to a drawable resource containing the image definition.
+If it is not set, the icon specified for the application as a whole is used
+instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).
<p>
-The broadcast receiver's icon — whether set here or by the
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
-default icon for all the receiver's intent filters (see the
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute).
+The broadcast receiver's icon — whether set here or by the
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
+default icon for all the receiver's intent filters (see the
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute).
</p></dd>
<dt><a name="label"></a>{@code android:label}</dt>
-<dd>A user-readable label for the broadcast receiver. If this attribute is not
-set, the label set for the application as a whole is
-used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<dd>A user-readable label for the broadcast receiver. If this attribute is not
+set, the label set for the application as a whole is
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
<p>
-The broadcast receiver's label — whether set here or by the
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
-default label for all the receiver's intent filters (see the
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute).
+The broadcast receiver's label — whether set here or by the
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
+default label for all the receiver's intent filters (see the
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute).
</p>
<p>
The label should be set as a reference to a string resource, so that
-it can be localized like other strings in the user interface.
-However, as a convenience while you're developing the application,
+it can be localized like other strings in the user interface.
+However, as a convenience while you're developing the application,
it can also be set as a raw string.
</p></dd>
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name of the class that implements the broadcast receiver, a subclass of
-{@link android.content.BroadcastReceiver}. This should be a fully qualified
-class name (such as, "{@code com.example.project.ReportReceiver}"). However,
-as a shorthand, if the first character of the name is a period (for example,
-"{@code . ReportReceiver}"), it is appended to the package name specified in
-the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
+<dd>The name of the class that implements the broadcast receiver, a subclass of
+{@link android.content.BroadcastReceiver}. This should be a fully qualified
+class name (such as, "{@code com.example.project.ReportReceiver}"). However,
+as a shorthand, if the first character of the name is a period (for example,
+"{@code . ReportReceiver}"), it is appended to the package name specified in
+the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
<p>Once you publish your application, you <a
href="http://android-developers.blogspot.com/2011/06/things-that-cannot-change.html">should not
@@ -132,38 +132,38 @@
</p></dd>
<dt><a name="prmsn"></a>{@code android:permission}</dt>
-<dd>The name of a permission that broadcasters must have to send a
+<dd>The name of a permission that broadcasters must have to send a
message to the broadcast receiver.
-If this attribute is not set, the permission set by the
+If this attribute is not set, the permission set by the
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> attribute applies
-to the broadcast receiver. If neither attribute is set, the receiver
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> attribute applies
+to the broadcast receiver. If neither attribute is set, the receiver
is not protected by a permission.
<p>
-For more information on permissions, see the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a>
-section in the introduction and a separate document,
+For more information on permissions, see the
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a>
+section in the introduction and a separate document,
<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a>.
</p></dd>
<dt><a name="proc"></a>{@code android:process}</dt>
-<dd>The name of the process in which the broadcast receiver should run.
-Normally, all components of an application run in the default process created
-for the application. It has the same name as the application package. The
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> attribute can set a different
+<dd>The name of the process in which the broadcast receiver should run.
+Normally, all components of an application run in the default process created
+for the application. It has the same name as the application package. The
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> attribute can set a different
default for all components. But each component can override the default
-with its own {@code process} attribute, allowing you to spread your
+with its own {@code process} attribute, allowing you to spread your
application across multiple processes.
<p>
-If the name assigned to this attribute begins with a colon (':'), a new
-process, private to the application, is created when it's needed and
+If the name assigned to this attribute begins with a colon (':'), a new
+process, private to the application, is created when it's needed and
the broadcast receiver runs in that process.
-If the process name begins with a lowercase character, the receiver will run
+If the process name begins with a lowercase character, the receiver will run
in a global process of that name, provided that it has permission to do so.
-This allows components in different applications to share a process, reducing
+This allows components in different applications to share a process, reducing
resource usage.
</p></dd>
</dl></dd>
diff --git a/docs/html/guide/topics/manifest/service-element.jd b/docs/html/guide/topics/manifest/service-element.jd
index fca85f5..9197a7f 100644
--- a/docs/html/guide/topics/manifest/service-element.jd
+++ b/docs/html/guide/topics/manifest/service-element.jd
@@ -25,108 +25,108 @@
<dt>description:</dt>
<dd itemprop="description">Declares a service (a {@link android.app.Service} subclass) as one
-of the application's components. Unlike activities, services lack a
-visual user interface. They're used to implement long-running background
-operations or a rich communications API that can be called by other
+of the application's components. Unlike activities, services lack a
+visual user interface. They're used to implement long-running background
+operations or a rich communications API that can be called by other
applications.
<p>
All services must be represented by {@code <service>} elements in
-the manifest file. Any that are not declared there will not be seen
+the manifest file. Any that are not declared there will not be seen
by the system and will never be run.
</p></dd>
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="enabled"></a>{@code android:enabled}</dt>
-<dd>Whether or not the service can be instantiated by the system —
-"{@code true}" if it can be, and "{@code false}" if not. The default value
+<dd>Whether or not the service can be instantiated by the system —
+"{@code true}" if it can be, and "{@code false}" if not. The default value
is "{@code true}".
<p>
-The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
-application components, including services. The
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element has its own
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all
+application components, including services. The
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> and {@code <service>}
attributes must both be "{@code true}" (as they both
-are by default) for the service to be enabled. If either is
+are by default) for the service to be enabled. If either is
"{@code false}", the service is disabled; it cannot be instantiated.
</p></dd>
<dt><a name="exported"></a>{@code android:exported}</dt>
-<dd>Whether or not components of other applications can invoke
-the service or interact with it — "{@code true}" if they can, and
-"{@code false}" if not. When the value is "{@code false}", only
-components of the same application or applications
+<dd>Whether or not components of other applications can invoke
+the service or interact with it — "{@code true}" if they can, and
+"{@code false}" if not. When the value is "{@code false}", only
+components of the same application or applications
with the same user ID can start the service or bind to it.
<p>
-The default value depends on whether the service contains intent filters. The
-absence of any filters means that it can be invoked only by specifying
-its exact class name. This implies that the service is intended only for
-application-internal use (since others would not know the class name). So in
+The default value depends on whether the service contains intent filters. The
+absence of any filters means that it can be invoked only by specifying
+its exact class name. This implies that the service is intended only for
+application-internal use (since others would not know the class name). So in
this case, the default value is "{@code false}".
-On the other hand, the presence of at least one filter implies that the service
+On the other hand, the presence of at least one filter implies that the service
is intended for external use, so the default value is "{@code true}".
</p>
<p>
This attribute is not the only way to limit the exposure of a service to other
-applications. You can also use a permission to limit the external entities that
-can interact with the service (see the <code><a href="{@docRoot}guide/topics/manifest/service-element.html#prmsn">permission</a></code>
+applications. You can also use a permission to limit the external entities that
+can interact with the service (see the <code><a href="{@docRoot}guide/topics/manifest/service-element.html#prmsn">permission</a></code>
attribute).
</p></dd>
<dt><a name="icon"></a>{@code android:icon}</dt>
-<dd>An icon representing the service. This attribute must be set as a
-reference to a drawable resource containing the image definition.
-If it is not set, the icon specified for the application
-as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+<dd>An icon representing the service. This attribute must be set as a
+reference to a drawable resource containing the image definition.
+If it is not set, the icon specified for the application
+as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).
</p>
<p>
-The service's icon — whether set here or by the
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
-default icon for all the service's intent filters (see the
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
+The service's icon — whether set here or by the
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
+default icon for all the service's intent filters (see the
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute).
-</p></dd>
+</p></dd>
<dt><a name="isolated"></a>{@code android:isolatedProcess}</dt>
<dd>If set to true, this service will run under a special process that is isolated from the
rest of the system and has no permissions of its own.
- The only communication with it is through the Service API
+ The only communication with it is through the Service API
(binding and starting).</dd>
<dt><a name="label"></a>{@code android:label}</dt>
-<dd>A name for the service that can be displayed to users.
-If this attribute is not set, the label set for the application as a whole is
-used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<dd>A name for the service that can be displayed to users.
+If this attribute is not set, the label set for the application as a whole is
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
<p>
-The service's label — whether set here or by the
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
-default label for all the service's intent filters (see the
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute).
+The service's label — whether set here or by the
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element — is also the
+default label for all the service's intent filters (see the
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute).
</p>
<p>
The label should be set as a reference to a string resource, so that
-it can be localized like other strings in the user interface.
-However, as a convenience while you're developing the application,
+it can be localized like other strings in the user interface.
+However, as a convenience while you're developing the application,
it can also be set as a raw string.
</p></dd>
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name of the {@link android.app.Service} subclass that implements
-the service. This should be a fully qualified class name (such as,
-"{@code com.example.project.RoomService}"). However, as a shorthand, if
+<dd>The name of the {@link android.app.Service} subclass that implements
+the service. This should be a fully qualified class name (such as,
+"{@code com.example.project.RoomService}"). However, as a shorthand, if
the first character of the name is a period (for example, "{@code .RoomService}"),
-it is appended to the package name specified in the
-<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
+it is appended to the package name specified in the
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element.
<p>Once you publish your application, you <a
href="http://android-developers.blogspot.com/2011/06/things-that-cannot-change.html">should not
@@ -138,8 +138,8 @@
</p></dd>
<dt><a name="prmsn"></a>{@code android:permission}</dt>
-<dd>The name of a permission that an entity must have in order to
-launch the service or bind to it. If a caller of
+<dd>The name of a permission that an entity must have in order to
+launch the service or bind to it. If a caller of
<code>{@link android.content.Context#startService startService()}</code>,
<code>{@link android.content.Context#bindService bindService()}</code>, or
<code>{@link android.content.Context#stopService stopService()}</code>,
@@ -147,38 +147,38 @@
Intent object will not be delivered to the service.
<p>
-If this attribute is not set, the permission set by the
+If this attribute is not set, the permission set by the
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code>
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code>
attribute applies to the service. If neither attribute is set, the service is
not protected by a permission.
</p>
<p>
-For more information on permissions, see the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a>
-section in the introduction and a separate document,
+For more information on permissions, see the
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a>
+section in the introduction and a separate document,
<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a>.
</p></dd>
<dt><a name="proc"></a>{@code android:process}</dt>
-<dd>The name of the process where the service is to run. Normally,
-all components of an application run in the default process created for the
-application. It has the same name as the application package. The
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code>
-attribute can set a different
+<dd>The name of the process where the service is to run. Normally,
+all components of an application run in the default process created for the
+application. It has the same name as the application package. The
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code>
+attribute can set a different
default for all components. But component can override the default
-with its own {@code process} attribute, allowing you to spread your
+with its own {@code process} attribute, allowing you to spread your
application across multiple processes.
<p>
-If the name assigned to this attribute begins with a colon (':'), a new
-process, private to the application, is created when it's needed and
+If the name assigned to this attribute begins with a colon (':'), a new
+process, private to the application, is created when it's needed and
the service runs in that process.
-If the process name begins with a lowercase character, the service will run
+If the process name begins with a lowercase character, the service will run
in a global process of that name, provided that it has permission to do so.
-This allows components in different applications to share a process, reducing
+This allows components in different applications to share a process, reducing
resource usage.
</p></dd>
</dl></dd>
diff --git a/docs/html/guide/topics/manifest/supports-gl-texture-element.jd b/docs/html/guide/topics/manifest/supports-gl-texture-element.jd
index ab751c2..a72fc81 100644
--- a/docs/html/guide/topics/manifest/supports-gl-texture-element.jd
+++ b/docs/html/guide/topics/manifest/supports-gl-texture-element.jd
@@ -3,16 +3,16 @@
parent.link=manifest-intro.html
@jd:body
- <div class="sidebox-wrapper">
+ <div class="sidebox-wrapper">
<div class="sidebox">
- <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;">
- <p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
+ <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;">
+ <p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
<p style="padding-top:1em;">Google Play filters applications according
to the texture compression formats that they support, to ensure that
they can be installed only on devices that can handle their textures
properly. You can use texture compression filtering
as a way of targeting specific device types, based on GPU platform.</p>
-
+
<p style="margin-top:1em;">For important information about how
Google Play uses <code><supports-gl-texture></code> elements as
the basis for filtering, please read <a href="#market-texture-filtering">Google
diff --git a/docs/html/guide/topics/manifest/supports-screens-element.jd b/docs/html/guide/topics/manifest/supports-screens-element.jd
index a4546fa..ce2bb8d 100644
--- a/docs/html/guide/topics/manifest/supports-screens-element.jd
+++ b/docs/html/guide/topics/manifest/supports-screens-element.jd
@@ -74,7 +74,7 @@
transition from Android 1.5 to 1.6, when support for multiple screens was first introduced. You
should not use it.</p>
</dd>
-
+
<dt><a name="small"></a>{@code android:smallScreens}</dt>
<dd>Indicates whether the application supports smaller screen form-factors.
A small screen is defined as one with a smaller aspect ratio than
@@ -84,14 +84,14 @@
the platform can do to make such an application work on a smaller screen. This is {@code "true"} by
default.
</dd>
-
+
<dt><a name="normal"></a>{@code android:normalScreens}</dt>
<dd>Indicates whether an application supports the "normal" screen
form-factors. Traditionally this is an HVGA medium density
screen, but WQVGA low density and WVGA high density are also
considered to be normal. This attribute is "true" by default.
</dd>
-
+
<dt><a name="large"></a>{@code android:largeScreens}</dt>
<dd>Indicates whether the application supports larger screen form-factors.
A large screen is defined as a screen that is significantly larger
@@ -116,7 +116,7 @@
compatibility mode</a>.</p>
<p>This attribute was introduced in API level 9.</p>
</dd>
-
+
<dt><a name="any"></a>{@code android:anyDensity}</dt>
<dd>Indicates whether the application includes resources to accommodate any screen
density.
@@ -127,14 +127,14 @@
href="{@docRoot}guide/practices/screens_support.html#DensityConsiderations">Supporting Multiple
Screens</a> document for more information).</p>
</dd>
-
+
<dt id="requiresSmallest">{@code android:requiresSmallestWidthDp}</dt>
<dd>Specifies the minimum smallestWidth required. The smallestWidth is the shortest dimension of
the screen space (in {@code dp} units) that must be available to your application UI—that is,
the shortest of the available screen's two dimensions. So, in order for a device to be considered
compatible with your application, the device's smallestWidth must be equal to or greater than this
value. (Usually, the value you supply for this is the "smallest width" that your layout supports,
-regardless of the screen's current orientation.)
+regardless of the screen's current orientation.)
<p>For example, a typical handset screen has a smallestWidth of 320dp, a 7" tablet has a
smallestWidth of 600dp, and a 10" tablet has a smallestWidth of 720dp. These values are generally
@@ -209,7 +209,7 @@
android:largestWidthLimitDp} is larger than 320.</p>
<p>This attribute was introduced in API level 13.</p>
</dd>
-
+
</dl></dd>
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 5d163c0..10841d6 100755
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -33,7 +33,7 @@
<p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
<p style="padding-top:1em;">Google Play uses the <code><uses-feature></code>
elements declared in your app manifest to filter your app from devices
- that do not meet it's hardware and software feature requirements. </p>
+ that do not meet its hardware and software feature requirements. </p>
<p style="margin-top:1em;">By specifying the features that your application requires,
you enable Google Play to present your application only to users whose
@@ -150,23 +150,21 @@
<dd>
Boolean value that indicates whether the application requires the feature
specified in <code>android:name</code>.
- </dd>
-</dl>
-<ul>
-<li>When you declare <code>android:required="true"</code> for a feature,
-you are specifying that the application <em>cannot function, or is not
-designed to function</em>, when the specified feature is not present on the
-device. </li>
+ <ul>
+ <li>When you declare <code>android:required="true"</code> for a feature,
+ you are specifying that the application <em>cannot function, or is not
+ designed to function</em>, when the specified feature is not present on the
+ device. </li>
-<li>When you declare <code>android:required="false"</code> for a feature, it
-means that the application <em>prefers to use the feature</em> if present on
-the device, but that it <em>is designed to function without the specified
-feature</em>, if necessary. </li>
+ <li>When you declare <code>android:required="false"</code> for a feature, it
+ means that the application <em>prefers to use the feature</em> if present on
+ the device, but that it <em>is designed to function without the specified
+ feature</em>, if necessary. </li>
-</ul>
+ </ul>
-<p>The default value for <code>android:required</code> if not declared is
-<code>"true"</code>.</p>
+ <p>The default value for <code>android:required</code> if not declared is
+ <code>"true"</code>.</p>
</dd>
<dt><a name="glEsVersion"></a><code>android:glEsVersion</code></dt>
@@ -1151,12 +1149,12 @@
<p>
As a best practice, you should still declare your requirement for this
- orientation using a {@code <uses-feature>} element. If you declare
+ orientation using a {@code <uses-feature>} element. If you declare
an orientation for your activity using <a href=
"{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code
android:screenOrientation}</a>, but don't actually require it, you can
disable the requirement by declaring the orientation with a {@code
- <uses-feature>} element and include {@code
+ <uses-feature>} element and include {@code
android:required="false"}.
</p>
diff --git a/docs/html/guide/topics/manifest/uses-library-element.jd b/docs/html/guide/topics/manifest/uses-library-element.jd
index aa7ca82..f8d8e62 100644
--- a/docs/html/guide/topics/manifest/uses-library-element.jd
+++ b/docs/html/guide/topics/manifest/uses-library-element.jd
@@ -3,10 +3,10 @@
parent.link=manifest-intro.html
@jd:body
-<div class="sidebox-wrapper">
+<div class="sidebox-wrapper">
<div class="sidebox">
- <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;">
- <p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
+ <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;">
+ <p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
<p style="padding-top:1em;">Google Play uses the <uses-library> elements declared
in your app manifest to filter your app from devices that do not meet it's library
requirements. For more information about filtering, see the topic
diff --git a/docs/html/guide/topics/manifest/uses-permission-element.jd b/docs/html/guide/topics/manifest/uses-permission-element.jd
index 32fe21e..03a0dc1 100644
--- a/docs/html/guide/topics/manifest/uses-permission-element.jd
+++ b/docs/html/guide/topics/manifest/uses-permission-element.jd
@@ -5,10 +5,10 @@
<dl class="xml">
-<div class="sidebox-wrapper">
+<div class="sidebox-wrapper">
<div class="sidebox">
-<img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;">
-<p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
+<img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;">
+<p style="color:#669999;padding-top:1em;">Google Play Filtering</p>
<p style="clear:left;">In some cases, the permissions that you request
through <code><uses-permission></code> can affect how
@@ -43,24 +43,24 @@
<dt>description:</dt>
<dd itemprop="description">Requests a permission that the application must be granted in
-order for it to operate correctly. Permissions are granted by the user when the
+order for it to operate correctly. Permissions are granted by the user when the
application is installed (on devices running Android 5.1 and lower) or while the app is running (on devices running Android 6.0 and higher).
<p>
-For more information on permissions, see the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a></code>
+For more information on permissions, see the
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a></code>
section in the introduction and the separate
<a href="{@docRoot}guide/topics/security/permissions.html">System
Permissions</a> API guide.
-A list of permissions defined by the base platform can be found at
+A list of permissions defined by the base platform can be found at
{@link android.Manifest.permission android.Manifest.permission}.
<dt>attributes:</dt>
<dd><dl class="attr">
<dt><a name="nm"></a>{@code android:name}</dt>
-<dd>The name of the permission. It can be a permission defined by the
-application with the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-element, a permission defined by another application, or one of the
+<dd>The name of the permission. It can be a permission defined by the
+application with the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
+element, a permission defined by another application, or one of the
standard system permissions (such as
{@link android.Manifest.permission#CAMERA "android.permission.CAMERA"}
or {@link android.Manifest.permission#READ_CONTACTS
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index 94577ed..b8126c0 100755
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -223,9 +223,14 @@
are running each version, see the <a href="{@docRoot}about/dashboards/index.html">Platform
Versions dashboards page</a>.</p>
-<table>
+<table id="api-level-table">
<tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>
+ <tr><td><a href="{@docRoot}about/versions/nougat/android-7.0.html">Android 7.0</a></td>
+ <td><a href="{@docRoot}sdk/api_diff/24/changes.html" title="Diff Report">24</a></td>
+ <td>{@link android.os.Build.VERSION_CODES#N}</td>
+ <td><a href="{@docRoot}about/versions/nougat/index.html">Platform Highlights</a></td></tr>
+
<tr><td><a href="{@docRoot}about/versions/marshmallow/android-6.0.html">Android 6.0</a></td>
<td><a href="{@docRoot}sdk/api_diff/23/changes.html" title="Diff Report">23</a></td>
<td>{@link android.os.Build.VERSION_CODES#M}</td>
diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd
index 8b79b23..c806c88 100644
--- a/docs/html/guide/topics/media/camera.jd
+++ b/docs/html/guide/topics/media/camera.jd
@@ -1243,7 +1243,7 @@
camera application that checks to see if device hardware supports those features and fails
gracefully if a feature is not available.</p>
-<p>You can check the availabilty of camera features by getting an instance of a camera’s parameters
+<p>You can check the availabilty of camera features by getting an instance of a camera's parameters
object, and checking the relevant methods. The following code sample shows you how to obtain a
{@link android.hardware.Camera.Parameters} object and check if the camera supports the autofocus
feature:</p>
@@ -1290,7 +1290,7 @@
<p>This technique works for nearly all camera features, and most parameters can be changed at any
time after you have obtained an instance of the {@link android.hardware.Camera} object. Changes to
-parameters are typically visible to the user immediately in the application’s camera preview.
+parameters are typically visible to the user immediately in the application's camera preview.
On the software side, parameter changes may take several frames to actually take effect as the
camera hardware processes the new instructions and then sends updated image data.</p>
@@ -1341,7 +1341,7 @@
</pre>
<p>The {@link android.hardware.Camera.Area} object contains two data parameters: A {@link
-android.graphics.Rect} object for specifying an area within the camera’s field of view and a weight
+android.graphics.Rect} object for specifying an area within the camera's field of view and a weight
value, which tells the camera what level of importance this area should be given in light metering
or focus calculations.</p>
@@ -1405,7 +1405,7 @@
}
</pre>
-<p>After creating this class, you then set it into your application’s
+<p>After creating this class, you then set it into your application's
{@link android.hardware.Camera} object, as shown in the example code below:</p>
<pre>
@@ -1480,7 +1480,7 @@
<p class="note"><strong>Note:</strong> Remember to call this method <em>after</em> calling
{@link android.hardware.Camera#startPreview startPreview()}. Do not attempt to start face detection
-in the {@link android.app.Activity#onCreate onCreate()} method of your camera app’s main activity,
+in the {@link android.app.Activity#onCreate onCreate()} method of your camera app's main activity,
as the preview is not available by this point in your application's the execution.</p>
diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd
index a750c9a..c66ab30 100644
--- a/docs/html/guide/topics/media/index.jd
+++ b/docs/html/guide/topics/media/index.jd
@@ -1,6 +1,6 @@
page.title=Media and Camera
page.landing=true
-page.landing.intro=Add video, audio, and photo capabilities to your app with Android's robust APIs for playing and recording media.
+page.landing.intro=Add video, audio, and photo capabilities to your app with Android's robust APIs for playing and recording media.
page.landing.image=
@jd:body
diff --git a/docs/html/guide/topics/media/jet/jetcreator_manual.jd b/docs/html/guide/topics/media/jet/jetcreator_manual.jd
index 214c79e..c2df25b 100644
--- a/docs/html/guide/topics/media/jet/jetcreator_manual.jd
+++ b/docs/html/guide/topics/media/jet/jetcreator_manual.jd
@@ -21,7 +21,7 @@
<p>JET works in conjunction with SONiVOX's
Embedded Audio Synthesizer (EAS) which is the MIDI
playback device for Android. Both the
-JET and EAS engines are integrated into the Android embedded platform through the
+JET and EAS engines are integrated into the Android embedded platform through the
{@link android.media.JetPlayer} class, as well
as inherent in the JET Creator application. As such, the JET content author can
be sure that the playback will sound exactly the same in both the JET Creator
@@ -387,34 +387,34 @@
you first launch JET Creator you are presented with an open dialog like the
following.</p>
-
+
<p><img border=0 width=450 height=285
src="{@docRoot}images/jet/jc_open_dlg.png"
</p>
-
-
+
+
<p> <b>Open</b> will open an existing .jtc (JET Creator file) file. Use the browser
button to browse to the directory where you have saved your .jtc file.</p>
-
+
<p> <b>New</b> will create a new .jtc file.</p>
-
+
<p> <b>Import</b> will import a JET Archive (.zip) file.</p>
-
+
<p> <b>Cancel</b> will cancel the dialog and exit the application.</p>
-
-
+
+
<h1>5 Main Window </h1>
@@ -457,16 +457,16 @@
<p>The buttons along the left side of main
window do the following:</p>
-<p>Add:
+<p>Add:
Displays the segment or event window for adding a new segment or event</p>
-<p>Revise:
+<p>Revise:
Displays the segment or event window for updating an existing segment or event</p>
-<p>Delete:
+<p>Delete:
Deletes the selected segment or event (will ask for confirmation)</p>
-<p>Move:
+<p>Move:
Displays the move window which allows you to move selected segments or events
in time</p>
@@ -476,11 +476,11 @@
<p>Dequeue All: Dequeues
(deselects) all segments</p>
-<p>Play:
+<p>Play:
Starts playback of all queued segments. This button changes to Stop if any
segments are playing</p>
-<p>Audition:
+<p>Audition:
Displays the Audition window (see below)</p>
diff --git a/docs/html/guide/topics/media/jetplayer.jd b/docs/html/guide/topics/media/jetplayer.jd
index f3d55f9..0f32121 100644
--- a/docs/html/guide/topics/media/jetplayer.jd
+++ b/docs/html/guide/topics/media/jetplayer.jd
@@ -1,5 +1,5 @@
page.title=JetPlayer
-parent.title=Multimedia and Camera
+parent.title=Multimedia and Camera
parent.link=index.html
@jd:body
diff --git a/docs/html/guide/topics/processes/process-lifecycle.jd b/docs/html/guide/topics/processes/process-lifecycle.jd
index 0380f94..47ca1ec 100644
--- a/docs/html/guide/topics/processes/process-lifecycle.jd
+++ b/docs/html/guide/topics/processes/process-lifecycle.jd
@@ -48,7 +48,7 @@
at the top of the screen that the user is interacting with (its
{@link android.app.Activity#onResume} method has been called).</li>
<li> It has a {@link android.content.BroadcastReceiver} that is currently running
- (its {@link android.content.BroadcastReceiver#onReceive
+ (its {@link android.content.BroadcastReceiver#onReceive
BroadcastReceiver.onReceive()} method is executing).</li>
<li>It has a {@link android.app.Service} that is currently executing code
in one of its callbacks ({@link android.app.Service#onCreate Service.onCreate()},
diff --git a/docs/html/guide/topics/providers/calendar-provider.jd b/docs/html/guide/topics/providers/calendar-provider.jd
index 3cd4511..01a1bfc 100644
--- a/docs/html/guide/topics/providers/calendar-provider.jd
+++ b/docs/html/guide/topics/providers/calendar-provider.jd
@@ -42,7 +42,7 @@
<li><a href="#intent-view">Using intents to view calendar data</a></li>
</ol>
</li>
-
+
<li><a href="#sync-adapter">Sync Adapters</a></li>
</ol>
@@ -63,8 +63,8 @@
<p>The Calender Provider API can be used by applications and sync adapters. The
rules vary depending on what type of program is making the calls. This document
-focuses primarily on using the Calendar Provider API as an application. For
-a discussion of how sync adapters are different, see
+focuses primarily on using the Calendar Provider API as an application. For
+a discussion of how sync adapters are different, see
<a href="#sync-adapter">Sync Adapters</a>.</p>
@@ -79,17 +79,17 @@
<h2 id="overview">Basics</h2>
-<p><a href="{@docRoot}guide/topics/providers/content-providers.html">Content providers</a> store data and make it accessible to
+<p><a href="{@docRoot}guide/topics/providers/content-providers.html">Content providers</a> store data and make it accessible to
applications. The content providers offered by the Android platform (including the Calendar Provider) typically expose data as a set of tables based on a
relational database model, where each row is a record and each column is data of
a particular type and meaning. Through the Calendar Provider API, applications
and sync adapters can get read/write access to the database tables that hold a
user's calendar data.</p>
-<p>Every content provider exposes a public URI (wrapped as a
-{@link android.net.Uri}
+<p>Every content provider exposes a public URI (wrapped as a
+{@link android.net.Uri}
object) that uniquely identifies its data set. A content provider that controls
- multiple data sets (multiple tables) exposes a separate URI for each one. All
+ multiple data sets (multiple tables) exposes a separate URI for each one. All
URIs for providers begin with the string "content://". This
identifies the data as being controlled by a content provider. The Calendar
Provider defines constants for the URIs for each of its classes (tables). These
@@ -113,26 +113,26 @@
</tr>
<tr>
<td><p>{@link android.provider.CalendarContract.Calendars}</p></td>
-
- <td>This table holds
+
+ <td>This table holds
the calendar-specific information. Each row in this table contains the details for
a single calendar, such as the name, color, sync information, and so on.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Events}</td>
-
+
<td>This table holds the
event-specific information. Each row in this table has the information for a single
event—for example, event title, location, start time, end
time, and so on. The event can occur one-time or can recur multiple times. Attendees,
-reminders, and extended properties are stored in separate tables.
-They each have an {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+reminders, and extended properties are stored in separate tables.
+They each have an {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
that references the {@link android.provider.BaseColumns#_ID} in the Events table.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances}</td>
-
+
<td>This table holds the
start and end time for each occurrence of an event. Each row in this table
represents a single event occurrence. For one-time events there is a 1:1 mapping
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Attendees}</td>
-
+
<td>This table holds the
event attendee (guest) information. Each row represents a single guest of an
event. It specifies the type of guest and the guest's attendance response
@@ -149,17 +149,17 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Reminders}</td>
-
+
<td>This table holds the
alert/notification data. Each row represents a single alert for an event. An
event can have multiple reminders. The maximum number of reminders per event is
-specified in
-{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS},
+specified in
+{@link android.provider.CalendarContract.CalendarColumns#MAX_REMINDERS},
which is set by the sync adapter that
owns the given calendar. Reminders are specified in minutes before the event
and have a method that determines how the user will be alerted.</td>
</tr>
-
+
</table>
<p>The Calendar Provider API is designed to be flexible and powerful. At the
@@ -178,9 +178,9 @@
<li><strong>Sync adapters.</strong> A sync adapter synchronizes the calendar data
-on a user's device with another server or data source. In the
+on a user's device with another server or data source. In the
{@link android.provider.CalendarContract.Calendars} and
-{@link android.provider.CalendarContract.Events} tables,
+{@link android.provider.CalendarContract.Events} tables,
there are columns that are reserved for the sync adapters to use.
The provider and applications should not modify them. In fact, they are not
visible unless they are accessed as a sync adapter. For more information about
@@ -209,9 +209,9 @@
<h2 id="calendar">Calendars Table</h2>
-<p>The {@link android.provider.CalendarContract.Calendars} table contains details
+<p>The {@link android.provider.CalendarContract.Calendars} table contains details
for individual calendars. The following
-Calendars columns are writable by both an application and a <a href="#sync-adapter">sync adapter</a>.
+Calendars columns are writable by both an application and a <a href="#sync-adapter">sync adapter</a>.
For a full list of supported fields, see the
{@link android.provider.CalendarContract.Calendars} reference.</p>
<table>
@@ -229,7 +229,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Calendars#VISIBLE}</td>
-
+
<td>A boolean indicating whether the calendar is selected to be displayed. A
value of 0 indicates that events associated with this calendar should not be
shown. A value of 1 indicates that events associated with this calendar should
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.CalendarColumns#SYNC_EVENTS}</td>
-
+
<td>A boolean indicating whether the calendar should be synced and have its
events stored on the device. A value of 0 says do not sync this calendar or
store its events on the device. A value of 1 says sync events for this calendar
@@ -253,8 +253,8 @@
<p>Here is an example that shows how to get the calendars that are owned by a particular
user. For simplicity's sake, in this example the query operation is shown in the
user interface thread ("main thread"). In practice, this should be done in an asynchronous
-thread instead of on the main thread. For more discussion, see
-<a href="{@docRoot}guide/components/loaders.html">Loaders</a>. If you are not just
+thread instead of on the main thread. For more discussion, see
+<a href="{@docRoot}guide/components/loaders.html">Loaders</a>. If you are not just
reading data but modifying it, see {@link android.content.AsyncQueryHandler}.
</p>
@@ -268,19 +268,19 @@
Calendars.CALENDAR_DISPLAY_NAME, // 2
Calendars.OWNER_ACCOUNT // 3
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_ACCOUNT_NAME_INDEX = 1;
private static final int PROJECTION_DISPLAY_NAME_INDEX = 2;
private static final int PROJECTION_OWNER_ACCOUNT_INDEX = 3;</pre>
-
+
<div class="sidebox-wrapper"> <div class="sidebox"> <h3>Why must you include
ACCOUNT_TYPE?</h3> <p>If you query on a {@link
-android.provider.CalendarContract.Calendars#ACCOUNT_NAME
-Calendars.ACCOUNT_NAME}, you must also include
-{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
+android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME
+Calendars.ACCOUNT_NAME}, you must also include
+{@link android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
in the selection. That is because a given account is
only considered unique given both its <code>ACCOUNT_NAME</code> and its
<code>ACCOUNT_TYPE</code>. The <code>ACCOUNT_TYPE</code> is the string corresponding to the
@@ -289,7 +289,7 @@
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} for calendars not
associated with a device account. {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} accounts do not get
-synced.</p> </div> </div>
+synced.</p> </div> </div>
<p> In the next part of the example, you construct your query. The selection
@@ -301,59 +301,59 @@
has viewed, not just calendars the user owns, omit the <code>OWNER_ACCOUNT</code>.
The query returns a {@link android.database.Cursor}
object that you can use to traverse the result set returned by the database
-query. For more discussion of using queries in content providers,
+query. For more discussion of using queries in content providers,
see <a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.</p>
<pre>// Run query
Cursor cur = null;
ContentResolver cr = getContentResolver();
-Uri uri = Calendars.CONTENT_URI;
-String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+Uri uri = Calendars.CONTENT_URI;
+String selection = "((" + Calendars.ACCOUNT_NAME + " = ?) AND ("
+ Calendars.ACCOUNT_TYPE + " = ?) AND ("
+ Calendars.OWNER_ACCOUNT + " = ?))";
String[] selectionArgs = new String[] {"sampleuser@gmail.com", "com.google",
- "sampleuser@gmail.com"};
-// Submit the query and get a Cursor object back.
+ "sampleuser@gmail.com"};
+// Submit the query and get a Cursor object back.
cur = cr.query(uri, EVENT_PROJECTION, selection, selectionArgs, null);</pre>
<p>This next section uses the cursor to step through the result set. It uses the
constants that were set up at the beginning of the example to return the values
for each field.</p>
-
+
<pre>// Use the cursor to step through the returned records
while (cur.moveToNext()) {
long calID = 0;
String displayName = null;
String accountName = null;
String ownerName = null;
-
+
// Get the field values
calID = cur.getLong(PROJECTION_ID_INDEX);
displayName = cur.getString(PROJECTION_DISPLAY_NAME_INDEX);
accountName = cur.getString(PROJECTION_ACCOUNT_NAME_INDEX);
ownerName = cur.getString(PROJECTION_OWNER_ACCOUNT_INDEX);
-
+
// Do something with the values...
...
}
</pre>
-
+
<h3 id="modify-calendar">Modifying a calendar</h3>
<p>To perform an update of an calendar, you can provide the {@link
android.provider.BaseColumns#_ID} of the calendar either as an appended ID to
-the Uri
+the Uri
-({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
or as the first selection item. The selection
should start with <code>"_id=?"</code>, and the first
<code>selectionArg</code> should be the {@link
-android.provider.BaseColumns#_ID} of the calendar.
+android.provider.BaseColumns#_ID} of the calendar.
You can also do updates by encoding the ID in the URI. This example changes a
-calendar's display name using the
-({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+calendar's display name using the
+({@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
approach:</p>
<pre>private static final String DEBUG_TAG = "MyActivity";
@@ -375,7 +375,7 @@
the calendar insertion as a sync adapter, using an {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} of {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}.
-{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
+{@link android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL}
is a special account type for calendars that are not
associated with a device account. Calendars of this type are not synced to a server. For a
discussion of sync adapters, see <a href="#sync-adapter">Sync Adapters</a>.</p>
@@ -434,7 +434,7 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DURATION}</td>
-
+
<td>The duration of the event in <a
href="http://tools.ietf.org/html/rfc5545#section-3.8.2.5">RFC5545</a> format.
For example, a value of <code>"PT1H"</code> states that the event
@@ -445,41 +445,41 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#ALL_DAY}</td>
-
+
<td>A value of 1 indicates this event occupies the entire day, as defined by
the local time zone. A value of 0 indicates it is a regular event that may start
and end at any time during a day.</td>
-
+
</tr>
-
-
+
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RRULE}</td>
-
+
<td>The recurrence rule for the event format. For
example, <code>"FREQ=WEEKLY;COUNT=10;WKST=SU"</code>. You can find
more examples <a
href="http://tools.ietf.org/html/rfc5545#section-3.8.5.3">here</a>.</td>
-
+
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#RDATE}</td>
- <td>The recurrence dates for the event.
- You typically use {@link android.provider.CalendarContract.EventsColumns#RDATE}
- in conjunction with {@link android.provider.CalendarContract.EventsColumns#RRULE}
+ <td>The recurrence dates for the event.
+ You typically use {@link android.provider.CalendarContract.EventsColumns#RDATE}
+ in conjunction with {@link android.provider.CalendarContract.EventsColumns#RRULE}
to define an aggregate set of
repeating occurrences. For more discussion, see the <a
href="http://tools.ietf.org/html/rfc5545#section-3.8.5.2">RFC5545 spec</a>.</td>
</tr>
-
+
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY}</td>
-
- <td>If this event counts as busy time or is free time that can be
+
+ <td>If this event counts as busy time or is free time that can be
scheduled over. </td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#GUESTS_CAN_MODIFY}</td>
@@ -519,11 +519,11 @@
android.content.Intent#ACTION_INSERT INSERT} Intent, described in <a
href="#intent-insert">Using an intent to insert an event</a>—in that
scenario, a default time zone is supplied.</li>
-
+
<li>For non-recurring events, you must include {@link
android.provider.CalendarContract.EventsColumns#DTEND}. </li>
-
-
+
+
<li>For recurring events, you must include a {@link
android.provider.CalendarContract.EventsColumns#DURATION} in addition to {@link
android.provider.CalendarContract.EventsColumns#RRULE} or {@link
@@ -532,9 +532,9 @@
android.content.Intent#ACTION_INSERT INSERT} Intent, described in <a
href="#intent-insert">Using an intent to insert an event</a>—in that
scenario, you can use an {@link
-android.provider.CalendarContract.EventsColumns#RRULE} in conjunction with {@link android.provider.CalendarContract.EventsColumns#DTSTART} and {@link android.provider.CalendarContract.EventsColumns#DTEND}, and the Calendar application
+android.provider.CalendarContract.EventsColumns#RRULE} in conjunction with {@link android.provider.CalendarContract.EventsColumns#DTSTART} and {@link android.provider.CalendarContract.EventsColumns#DTEND}, and the Calendar application
converts it to a duration automatically.</li>
-
+
</ul>
<p>Here is an example of inserting an event. This is being performed in the UI
@@ -545,8 +545,8 @@
<pre>
long calID = 3;
-long startMillis = 0;
-long endMillis = 0;
+long startMillis = 0;
+long endMillis = 0;
Calendar beginTime = Calendar.getInstance();
beginTime.set(2012, 9, 14, 7, 30);
startMillis = beginTime.getTimeInMillis();
@@ -567,7 +567,7 @@
// get the event ID that is the last element in the Uri
long eventID = Long.parseLong(uri.getLastPathSegment());
-//
+//
// ... do something with event ID
//
//</pre>
@@ -584,14 +584,14 @@
that you use an {@link android.content.Intent#ACTION_EDIT EDIT} Intent, as
described in <a href="#intent-edit">Using an intent to edit an event</a>.
However, if you need to, you can edit events directly. To perform an update of
-an Event, you can provide the <code>_ID</code> of the
+an Event, you can provide the <code>_ID</code> of the
event either as an appended ID to the Uri ({@link
-android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
-or as the first selection item.
+android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()})
+or as the first selection item.
The selection should start with <code>"_id=?"</code>, and the first
<code>selectionArg</code> should be the <code>_ID</code> of the event. You can
also do updates using a selection with no ID. Here is an example of updating an
-event. It changes the title of the event using the
+event. It changes the title of the event using the
{@link android.content.ContentUris#withAppendedId(android.net.Uri,long) withAppendedId()}
approach:</p>
@@ -604,7 +604,7 @@
ContentValues values = new ContentValues();
Uri updateUri = null;
// The new title for the event
-values.put(Events.TITLE, "Kickboxing");
+values.put(Events.TITLE, "Kickboxing");
updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().update(updateUri, values, null, null);
Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre>
@@ -631,22 +631,22 @@
Uri deleteUri = null;
deleteUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID);
int rows = getContentResolver().delete(deleteUri, null, null);
-Log.i(DEBUG_TAG, "Rows deleted: " + rows);
+Log.i(DEBUG_TAG, "Rows deleted: " + rows);
</pre>
<h2 id="attendees">Attendees Table</h2>
<p>Each row of the {@link android.provider.CalendarContract.Attendees} table
-represents a single attendee or guest of an event. Calling
-{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
+represents a single attendee or guest of an event. Calling
+{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()}
returns a list of attendees for the
-event with the given {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}.
-This {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+event with the given {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}.
+This {@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
must match the {@link
-android.provider.BaseColumns#_ID} of a particular event.</p>
+android.provider.BaseColumns#_ID} of a particular event.</p>
<p>The following table lists the
-writable fields. When inserting a new attendee, you must include all of them
+writable fields. When inserting a new attendee, you must include all of them
except <code>ATTENDEE_NAME</code>.
</p>
@@ -704,7 +704,7 @@
<h3 id="add-attendees">Adding Attendees</h3>
<p>Here is an example that adds a single attendee to an event. Note that the
-{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
+{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}
is required:</p>
<pre>
@@ -724,17 +724,17 @@
<h2 id="reminders">Reminders Table</h2>
<p>Each row of the {@link android.provider.CalendarContract.Reminders} table
-represents a single reminder for an event. Calling
+represents a single reminder for an event. Calling
{@link android.provider.CalendarContract.Reminders#query(android.content.ContentResolver, long, java.lang.String[]) query()} returns a list of reminders for the
-event with the given
+event with the given
{@link android.provider.CalendarContract.AttendeesColumns#EVENT_ID}.</p>
<p>The following table lists the writable fields for reminders. All of them must
be included when inserting a new reminder. Note that sync adapters specify the
types of reminders they support in the {@link
-android.provider.CalendarContract.Calendars} table. See
-{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
+android.provider.CalendarContract.Calendars} table. See
+{@link android.provider.CalendarContract.CalendarColumns#ALLOWED_REMINDERS}
for details.</p>
@@ -779,16 +779,16 @@
<h2 id="instances">Instances Table</h2>
-<p>The
+<p>The
{@link android.provider.CalendarContract.Instances} table holds the
start and end time for occurrences of an event. Each row in this table
represents a single event occurrence. The instances table is not writable and only
provides a way to query event occurrences. </p>
-<p>The following table lists some of the fields you can query on for an instance. Note
-that time zone is defined by
-{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
-and
+<p>The following table lists some of the fields you can query on for an instance. Note
+that time zone is defined by
+{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_TYPE}
+and
{@link android.provider.CalendarContract.CalendarCache#KEY_TIMEZONE_INSTANCES}.</p>
@@ -807,18 +807,18 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_DAY}</td>
-
+
<td>The Julian end day of the instance, relative to the Calendar's time
-zone.
-
+zone.
+
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td>
-
+
<td>The end minute of the instance measured from midnight in the
Calendar's time zone.</td>
-
+
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#EVENT_ID}</td>
@@ -826,16 +826,16 @@
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_DAY}</td>
- <td>The Julian start day of the instance, relative to the Calendar's time zone.
+ <td>The Julian start day of the instance, relative to the Calendar's time zone.
</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.Instances#START_MINUTE}</td>
-
+
<td>The start minute of the instance measured from midnight, relative to the
-Calendar's time zone.
+Calendar's time zone.
</td>
-
+
</tr>
</table>
@@ -846,7 +846,7 @@
in the URI. In this example, {@link android.provider.CalendarContract.Instances}
gets access to the {@link
android.provider.CalendarContract.EventsColumns#TITLE} field through its
-implementation of the {@link android.provider.CalendarContract.EventsColumns} interface.
+implementation of the {@link android.provider.CalendarContract.EventsColumns} interface.
In other words, {@link
android.provider.CalendarContract.EventsColumns#TITLE} is returned through a
database view, not through querying the raw {@link
@@ -859,7 +859,7 @@
Instances.BEGIN, // 1
Instances.TITLE // 2
};
-
+
// The indices for the projection array above.
private static final int PROJECTION_ID_INDEX = 0;
private static final int PROJECTION_BEGIN_INDEX = 1;
@@ -874,7 +874,7 @@
Calendar endTime = Calendar.getInstance();
endTime.set(2011, 10, 24, 8, 0);
long endMillis = endTime.getTimeInMillis();
-
+
Cursor cur = null;
ContentResolver cr = getContentResolver();
@@ -889,28 +889,28 @@
ContentUris.appendId(builder, endMillis);
// Submit the query
-cur = cr.query(builder.build(),
- INSTANCE_PROJECTION,
- selection,
- selectionArgs,
+cur = cr.query(builder.build(),
+ INSTANCE_PROJECTION,
+ selection,
+ selectionArgs,
null);
-
+
while (cur.moveToNext()) {
String title = null;
long eventID = 0;
- long beginVal = 0;
-
+ long beginVal = 0;
+
// Get the field values
eventID = cur.getLong(PROJECTION_ID_INDEX);
beginVal = cur.getLong(PROJECTION_BEGIN_INDEX);
title = cur.getString(PROJECTION_TITLE_INDEX);
-
- // Do something with the values.
- Log.i(DEBUG_TAG, "Event: " + title);
+
+ // Do something with the values.
+ Log.i(DEBUG_TAG, "Event: " + title);
Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(beginVal);
+ calendar.setTimeInMillis(beginVal);
DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
- Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
+ Log.i(DEBUG_TAG, "Date: " + formatter.format(calendar.getTime()));
}
}</pre>
@@ -928,9 +928,9 @@
<td><br>
{@link android.content.Intent#ACTION_VIEW VIEW} <br></td>
<td><p><code>content://com.android.calendar/time/<ms_since_epoch></code></p>
- You can also refer to the URI with
-{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
-For an example of using this intent, see <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Using intents to view calendar data</a>.
+ You can also refer to the URI with
+{@link android.provider.CalendarContract#CONTENT_URI CalendarContract.CONTENT_URI}.
+For an example of using this intent, see <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Using intents to view calendar data</a>.
</td>
<td>Open calendar to the time specified by <code><ms_since_epoch></code>.</td>
@@ -941,11 +941,11 @@
</td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- You can also refer to the URI with
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ You can also refer to the URI with
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
For an example of using this intent, see <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-view">Using intents to view calendar data</a>.
-
+
</td>
<td>View the event specified by <code><event_id></code>.</td>
@@ -958,12 +958,12 @@
<tr>
<td>{@link android.content.Intent#ACTION_EDIT EDIT} </td>
<td><p><code>content://com.android.calendar/events/<event_id></code></p>
-
- You can also refer to the URI with
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ You can also refer to the URI with
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
For an example of using this intent, see <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-edit">Using an intent to edit an event</a>.
-
-
+
+
</td>
<td>Edit the event specified by <code><event_id></code>.</td>
@@ -978,11 +978,11 @@
<br>
{@link android.content.Intent#ACTION_INSERT INSERT} </td>
<td><p><code>content://com.android.calendar/events</code></p>
-
- You can also refer to the URI with
-{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
+
+ You can also refer to the URI with
+{@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}.
For an example of using this intent, see <a href="{@docRoot}guide/topics/providers/calendar-provider.html#intent-insert">Using an intent to insert an event</a>.
-
+
</td>
<td>Create an event.</td>
@@ -1002,7 +1002,7 @@
<td>Name for the event.</td>
</tr>
<tr>
-
+
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME}</td>
<td>Event begin time in milliseconds from the epoch.</td>
@@ -1010,25 +1010,25 @@
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_END_TIME
CalendarContract.EXTRA_EVENT_END_TIME}</td>
-
+
<td>Event end time in milliseconds from the epoch.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract#EXTRA_EVENT_ALL_DAY
CalendarContract.EXTRA_EVENT_ALL_DAY}</td>
-
+
<td>A boolean that indicates that an event is all day. Value can be
<code>true</code> or <code>false</code>.</td> </tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#EVENT_LOCATION
Events.EVENT_LOCATION}</td>
-
+
<td>Location of the event.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#DESCRIPTION
Events.DESCRIPTION}</td>
-
+
<td>Event description.</td>
</tr>
<tr>
@@ -1045,16 +1045,16 @@
<td>
{@link android.provider.CalendarContract.EventsColumns#ACCESS_LEVEL
Events.ACCESS_LEVEL}</td>
-
+
<td>Whether the event is private or public.</td>
</tr>
<tr>
<td>{@link android.provider.CalendarContract.EventsColumns#AVAILABILITY
Events.AVAILABILITY}</td>
-
+
<td>If this event counts as busy time or is free time that can be scheduled over.</td>
-
-</table>
+
+</table>
<p>The following sections describe how to use these intents.</p>
@@ -1066,23 +1066,23 @@
android.Manifest.permission#WRITE_CALENDAR} permission included in its <a
href="#manifest">manifest file</a>.</p>
-
+
<p>When users run an application that uses this approach, the application sends
them to the Calendar to finish adding the event. The {@link
android.content.Intent#ACTION_INSERT INSERT} Intent uses extra fields to
pre-populate a form with the details of the event in the Calendar. Users can
then cancel the event, edit the form as needed, or save the event to their
calendars.</p>
-
+
<p>Here is a code snippet that schedules an event on January 19, 2012, that runs
from 7:30 a.m. to 8:30 a.m. Note the following about this code snippet:</p>
<ul>
- <li>It specifies {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
+ <li>It specifies {@link android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI}
as the Uri.</li>
-
+
<li>It uses the {@link
android.provider.CalendarContract#EXTRA_EVENT_BEGIN_TIME
CalendarContract.EXTRA_EVENT_BEGIN_TIME} and {@link
@@ -1090,10 +1090,10 @@
CalendarContract.EXTRA_EVENT_END_TIME} extra fields to pre-populate the form
with the time of the event. The values for these times must be in UTC milliseconds
from the epoch.</li>
-
+
<li>It uses the {@link android.content.Intent#EXTRA_EMAIL Intent.EXTRA_EMAIL}
extra field to provide a comma-separated list of invitees, specified by email address.</li>
-
+
</ul>
<pre>
Calendar beginTime = Calendar.getInstance();
@@ -1166,18 +1166,18 @@
<ul>
<li>A sync adapter needs to specify that it's a sync adapter by setting {@link android.provider.CalendarContract#CALLER_IS_SYNCADAPTER} to <code>true</code>.</li>
-
-
+
+
<li>A sync adapter needs to provide an {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME} and an {@link
android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE} as query parameters in the URI. </li>
-
+
<li>A sync adapter has write access to more columns than an application or widget.
- For example, an application can only modify a few characteristics of a calendar,
+ For example, an application can only modify a few characteristics of a calendar,
such as its name, display name, visibility setting, and whether the calendar is
synced. By comparison, a sync adapter can access not only those columns, but many others,
such as calendar color, time zone, access level, location, and so on.
-However, a sync adapter is restricted to the <code>ACCOUNT_NAME</code> and
+However, a sync adapter is restricted to the <code>ACCOUNT_NAME</code> and
<code>ACCOUNT_TYPE</code> it specified.</li> </ul>
<p>Here is a helper method you can use to return a URI for use with a sync adapter:</p>
@@ -1188,5 +1188,5 @@
.appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
}
</pre>
-<p>For a sample implementation of a sync adapter (not specifically related to Calendar), see
+<p>For a sample implementation of a sync adapter (not specifically related to Calendar), see
<a href="{@docRoot}resources/samples/SampleSyncAdapter/index.html">SampleSyncAdapter</a>.
diff --git a/docs/html/guide/topics/providers/contacts-provider.jd b/docs/html/guide/topics/providers/contacts-provider.jd
index 2b14558..ac855aa 100644
--- a/docs/html/guide/topics/providers/contacts-provider.jd
+++ b/docs/html/guide/topics/providers/contacts-provider.jd
@@ -329,13 +329,13 @@
</p>
<dl>
<dt>
- {@link android.provider.ContactsContract.Data#RAW_CONTACT_ID}
+ {@link android.provider.ContactsContract.DataColumns#RAW_CONTACT_ID}
</dt>
<dd>
The value of the <code>_ID</code> column of the raw contact for this data.
</dd>
<dt>
- {@link android.provider.ContactsContract.Data#MIMETYPE}
+ {@link android.provider.ContactsContract.DataColumns#MIMETYPE}
</dt>
<dd>
The type of data stored in this row, expressed as a custom MIME type. The Contacts Provider
@@ -2351,7 +2351,7 @@
{@link android.provider.ContactsContract.Data} table, selecting on the raw contact's
{@link android.provider.BaseColumns#_ID}, the
{@link android.provider.ContactsContract.CommonDataKinds.Photo#CONTENT_ITEM_TYPE
- Photo.CONTENT_ITEM_TYPE}, and the {@link android.provider.ContactsContract.Data#IS_PRIMARY}
+ Photo.CONTENT_ITEM_TYPE}, and the {@link android.provider.ContactsContract.DataColumns#IS_PRIMARY}
column to find the raw contact's primary photo row.
</p>
<p>
diff --git a/docs/html/guide/topics/providers/content-provider-basics.jd b/docs/html/guide/topics/providers/content-provider-basics.jd
index b7ae3d2..37df4e9 100644
--- a/docs/html/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html/guide/topics/providers/content-provider-basics.jd
@@ -238,7 +238,7 @@
For example, to get a list of the words and their locales from the User Dictionary Provider,
you call {@link android.content.ContentResolver#query ContentResolver.query()}.
The {@link android.content.ContentResolver#query query()} method calls the
- {@link android.content.ContentProvider#query ContentProvider.query()} method defined by the
+ {@link android.content.ContentProvider#query ContentProvider.query()} method defined by the
User Dictionary Provider. The following lines of code show a
{@link android.content.ContentResolver#query ContentResolver.query()} call:
<p>
@@ -253,7 +253,7 @@
</pre>
<p>
Table 2 shows how the arguments to
- {@link android.content.ContentResolver#query
+ {@link android.content.ContentResolver#query
query(Uri,projection,selection,selectionArgs,sortOrder)} match an SQL SELECT statement:
</p>
<p class="table-caption">
@@ -361,8 +361,8 @@
</p>
<p class="note">
For the sake of clarity, the code snippets in this section call
- {@link android.content.ContentResolver#query ContentResolver.query()} on the "UI thread"". In
- actual code, however, you should do queries asynchronously on a separate thread. One way to do
+ {@link android.content.ContentResolver#query ContentResolver.query()} on the "UI thread"". In
+ actual code, however, you should do queries asynchronously on a separate thread. One way to do
this is to use the {@link android.content.CursorLoader} class, which is described
in more detail in the <a href="{@docRoot}guide/components/loaders.html">
Loaders</a> guide. Also, the lines of code are snippets only; they don't show a complete
@@ -430,7 +430,7 @@
<p>
The next snippet shows how to use
{@link android.content.ContentResolver#query ContentResolver.query()}, using the User Dictionary
- Provider as an example. A provider client query is similar to an SQL query, and it contains a
+ Provider as an example. A provider client query is similar to an SQL query, and it contains a
set of columns to return, a set of selection criteria, and a sort order.
</p>
<p>
@@ -440,8 +440,8 @@
<p>
The expression that specifies the rows to retrieve is split into a selection clause and
selection arguments. The selection clause is a combination of logical and Boolean expressions,
- column names, and values (the variable <code>mSelectionClause</code>). If you specify the
- replaceable parameter <code>?</code> instead of a value, the query method retrieves the value
+ column names, and values (the variable <code>mSelectionClause</code>). If you specify the
+ replaceable parameter <code>?</code> instead of a value, the query method retrieves the value
from the selection arguments array (the variable <code>mSelectionArgs</code>).
</p>
<p>
@@ -567,14 +567,14 @@
<!-- Displaying the results -->
<h3 id="DisplayResults">Displaying query results</h3>
<p>
- The {@link android.content.ContentResolver#query ContentResolver.query()} client method always
- returns a {@link android.database.Cursor} containing the columns specified by the query's
- projection for the rows that match the query's selection criteria. A
- {@link android.database.Cursor} object provides random read access to the rows and columns it
- contains. Using {@link android.database.Cursor} methods, you can iterate over the rows in the
+ The {@link android.content.ContentResolver#query ContentResolver.query()} client method always
+ returns a {@link android.database.Cursor} containing the columns specified by the query's
+ projection for the rows that match the query's selection criteria. A
+ {@link android.database.Cursor} object provides random read access to the rows and columns it
+ contains. Using {@link android.database.Cursor} methods, you can iterate over the rows in the
results, determine the data type of each column, get the data out of a column, and examine other
- properties of the results. Some {@link android.database.Cursor} implementations automatically
- update the object when the provider's data changes, or trigger methods in an observer object
+ properties of the results. Some {@link android.database.Cursor} implementations automatically
+ update the object when the provider's data changes, or trigger methods in an observer object
when the {@link android.database.Cursor} changes, or both.
</p>
<p class="note">
@@ -705,14 +705,14 @@
<p>
To get the permissions needed to access a provider, an application requests them with a
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
- element in its manifest file. When the Android Package Manager installs the application, a user
- must approve all of the permissions the application requests. If the user approves all of them,
+ element in its manifest file. When the Android Package Manager installs the application, a user
+ must approve all of the permissions the application requests. If the user approves all of them,
Package Manager continues the installation; if the user doesn't approve them, Package Manager
aborts the installation.
</p>
<p>
The following
-<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
element requests read access to the User Dictionary Provider:
</p>
<pre>
@@ -795,8 +795,8 @@
To update a row, you use a {@link android.content.ContentValues} object with the updated
values just as you do with an insertion, and selection criteria just as you do with a query.
The client method you use is
- {@link android.content.ContentResolver#update ContentResolver.update()}. You only need to add
- values to the {@link android.content.ContentValues} object for columns you're updating. If you
+ {@link android.content.ContentResolver#update ContentResolver.update()}. You only need to add
+ values to the {@link android.content.ContentValues} object for columns you're updating. If you
want to clear the contents of a column, set the value to <code>null</code>.
</p>
<p>
@@ -830,7 +830,7 @@
</pre>
<p>
You should also sanitize user input when you call
- {@link android.content.ContentResolver#update ContentResolver.update()}. To learn more about
+ {@link android.content.ContentResolver#update ContentResolver.update()}. To learn more about
this, read the section <a href="#Injection">Protecting against malicious input</a>.
</p>
<h3 id="Deleting">Deleting data</h3>
@@ -860,7 +860,7 @@
</pre>
<p>
You should also sanitize user input when you call
- {@link android.content.ContentResolver#delete ContentResolver.delete()}. To learn more about
+ {@link android.content.ContentResolver#delete ContentResolver.delete()}. To learn more about
this, read the section <a href="#Injection">Protecting against malicious input</a>.
</p>
<!-- Provider Data Types -->
@@ -948,9 +948,9 @@
To access a provider in "batch mode",
you create an array of {@link android.content.ContentProviderOperation} objects and then
dispatch them to a content provider with
- {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. You pass the
- content provider's <em>authority</em> to this method, rather than a particular content URI.
- This allows each {@link android.content.ContentProviderOperation} object in the array to work
+ {@link android.content.ContentResolver#applyBatch ContentResolver.applyBatch()}. You pass the
+ content provider's <em>authority</em> to this method, rather than a particular content URI.
+ This allows each {@link android.content.ContentProviderOperation} object in the array to work
against a different table. A call to {@link android.content.ContentResolver#applyBatch
ContentResolver.applyBatch()} returns an array of results.
</p>
@@ -1013,7 +1013,7 @@
<p>
A provider defines URI permissions for content URIs in its manifest, using the
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">android:grantUriPermission</a></code>
- attribute of the
+ attribute of the
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
element, as well as the
<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
diff --git a/docs/html/guide/topics/providers/content-provider-creating.jd b/docs/html/guide/topics/providers/content-provider-creating.jd
index baa92e1..ec6909c 100755
--- a/docs/html/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html/guide/topics/providers/content-provider-creating.jd
@@ -422,7 +422,7 @@
* in the path
*/
sUriMatcher.addURI("com.example.app.provider", "table3", 1);
-
+
/*
* Sets the code for a single row to 2. In this case, the "#" wildcard is
* used. "content://com.example.app.provider/table3/3" matches, but
@@ -881,7 +881,7 @@
A contract class also helps developers because it usually has mnemonic names for its constants,
so developers are less likely to use incorrect values for column names or URIs. Since it's a
class, it can contain Javadoc documentation. Integrated development environments such as
- Android Studio can auto-complete constant names from the contract class and display Javadoc for
+ Android Studio can auto-complete constant names from the contract class and display Javadoc for
the constants.
</p>
<p>
diff --git a/docs/html/guide/topics/renderscript/advanced.jd b/docs/html/guide/topics/renderscript/advanced.jd
index 6a72b97..5cc0556 100644
--- a/docs/html/guide/topics/renderscript/advanced.jd
+++ b/docs/html/guide/topics/renderscript/advanced.jd
@@ -63,7 +63,7 @@
<code>llvm</code> compiler that runs as part of an Android build. When your application
runs on a device, the bytecode is then compiled (just-in-time) to machine code by another
<code>llvm</code> compiler that resides on the device. The machine code is optimized for the
- device and also cached, so subsequent uses of the RenderScript enabled application does not
+ device and also cached, so subsequent uses of the RenderScript enabled application do not
recompile the bytecode.</p>
<p>Some key features of the RenderScript runtime libraries include:</p>
@@ -128,7 +128,7 @@
<h3 id="func">Functions</h3>
<p>Functions are reflected into the script class itself, located in
<code>project_root/gen/package/name/ScriptC_renderscript_filename</code>. For
-example, if you declare the following function in your RenderScript code:</p>
+example, if you define the following function in your RenderScript code:</p>
<pre>
void touch(float x, float y, float pressure, int id) {
@@ -142,7 +142,7 @@
}
</pre>
-<p>then the following code is generated:</p>
+<p>then the following Java code is generated:</p>
<pre>
public void invoke_touch(float x, float y, float pressure, int id) {
@@ -155,7 +155,7 @@
}
</pre>
<p>
-Functions cannot have a return value, because the RenderScript system is designed to be
+Functions cannot have return values, because the RenderScript system is designed to be
asynchronous. When your Android framework code calls into RenderScript, the call is queued and is
executed when possible. This restriction allows the RenderScript system to function without constant
interruption and increases efficiency. If functions were allowed to have return values, the call
@@ -171,11 +171,11 @@
<p>Variables of supported types are reflected into the script class itself, located in
<code>project_root/gen/package/name/ScriptC_renderscript_filename</code>. A set of accessor
-methods are generated for each variable. For example, if you declare the following variable in
+methods is generated for each variable. For example, if you define the following variable in
your RenderScript code:</p>
<pre>uint32_t unsignedInteger = 1;</pre>
- <p>then the following code is generated:</p>
+ <p>then the following Java code is generated:</p>
<pre>
private long mExportVar_unsignedInteger;
@@ -194,7 +194,7 @@
<p>Structs are reflected into their own classes, located in
<code><project_root>/gen/com/example/renderscript/ScriptField_struct_name</code>. This
class represents an array of the <code>struct</code> and allows you to allocate memory for a
- specified number of <code>struct</code>s. For example, if you declare the following struct:</p>
+ specified number of <code>struct</code>s. For example, if you define the following struct:</p>
<pre>
typedef struct Point {
float2 position;
@@ -373,7 +373,7 @@
the array. The RenderScript runtime automatically has access to the newly written memory.
<li>Accessor methods to get and set the values of each field in a struct. Each of these
- accessor methods have an <code>index</code> parameter to specify the <code>struct</code> in
+ accessor methods has an <code>index</code> parameter to specify the <code>struct</code> in
the array that you want to read or write to. Each setter method also has a
<code>copyNow</code> parameter that specifies whether or not to immediately sync this memory
to the RenderScript runtime. To sync any memory that has not been synced, call
@@ -395,10 +395,10 @@
</ul>
<h3 id="pointer">Pointers</h3>
- <p>Pointers are reflected into the script class itself, located in
+ <p>Global pointers are reflected into the script class itself, located in
<code>project_root/gen/package/name/ScriptC_renderscript_filename</code>. You
can declare pointers to a <code>struct</code> or any of the supported RenderScript types, but a
-<code>struct</code> cannot contain pointers or nested arrays. For example, if you declare the
+<code>struct</code> cannot contain pointers or nested arrays. For example, if you define the
following pointers to a <code>struct</code> and <code>int32_t</code></p>
<pre>
@@ -410,7 +410,7 @@
Point_t *touchPoints;
int32_t *intPointer;
</pre>
- <p>then the following code is generated in:</p>
+ <p>then the following Java code is generated:</p>
<pre>
private ScriptField_Point mExportVar_touchPoints;
@@ -437,7 +437,7 @@
</pre>
<p>A <code>get</code> method and a special method named <code>bind_<em>pointer_name</em></code>
-(instead of a <code>set()</code> method) is generated. This method allows you to bind the memory
+(instead of a <code>set()</code> method) are generated. The <code>bind_<em>pointer_name</em></code> method allows you to bind the memory
that is allocated in the Android VM to the RenderScript runtime (you cannot allocate
memory in your <code>.rs</code> file). For more information, see <a href="#memory">Working
with Allocated Memory</a>.
@@ -521,7 +521,7 @@
describes.</p>
<p>A type consists of five dimensions: X, Y, Z, LOD (level of detail), and Faces (of a cube
- map). You can assign the X,Y,Z dimensions to any positive integer value within the
+ map). You can set the X,Y,Z dimensions to any positive integer value within the
constraints of available memory. A single dimension allocation has an X dimension of
greater than zero while the Y and Z dimensions are zero to indicate not present. For
example, an allocation of x=10, y=1 is considered two dimensional and x=10, y=0 is
diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd
index fc795ff..fe68654 100755
--- a/docs/html/guide/topics/renderscript/compute.jd
+++ b/docs/html/guide/topics/renderscript/compute.jd
@@ -167,7 +167,7 @@
</ul>
<p>We strongly recommend using the Support Library APIs for accessing RenderScript because they
- provide a wider range of device compatibility. Developers targeting specific versions of
+ provide a wider range of device compatibility. Developers targeting specific versions of
Android can use {@link android.renderscript} if necessary.</p>
@@ -294,7 +294,7 @@
</ul></li>
<li><strong>Populate Allocations with data.</strong> Except for Allocations created with {@link
-android.renderscript#createFromBitmap}, an Allocation will be populated with empty data when it is
+android.renderscript.Allocation#createFromBitmap}, an Allocation will be populated with empty data when it is
first created. To populate an Allocation, use one of the <code>copy</code> methods in {@link
android.renderscript.Allocation}.</li>
diff --git a/docs/html/guide/topics/resources/accessing-resources.jd b/docs/html/guide/topics/resources/accessing-resources.jd
index b971238..953b274 100644
--- a/docs/html/guide/topics/resources/accessing-resources.jd
+++ b/docs/html/guide/topics/resources/accessing-resources.jd
@@ -264,8 +264,8 @@
android:text="@string/hello" />
</pre>
-<p class="note"><strong>Note:</strong> You should use string resources at
-all times, so that your application can be localized for other languages.
+<p class="note"><strong>Note:</strong> You should use string resources at
+all times, so that your application can be localized for other languages.
For information about creating alternative
resources (such as localized strings), see <a
href="providing-resources.html#AlternativeResources">Providing Alternative
diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd
index e5cac88..05582f0 100644
--- a/docs/html/guide/topics/resources/animation-resource.jd
+++ b/docs/html/guide/topics/resources/animation-resource.jd
@@ -12,7 +12,7 @@
<ol>
<li><a href="#Tween">Tween animation</a></li>
<li><a href="#Frame">Frame animation</a></li>
- </ol>
+ </ol>
</li>
</ol>
<h2>See also</h2>
@@ -94,7 +94,7 @@
</set>
</pre>
-<p>The file must have a single root element: either
+<p>The file must have a single root element: either
<code><set></code>, <code><objectAnimator></code>, or <code><valueAnimator></code>. You can
group animation elements together inside the <code><set></code> element, including other
<code><set></code> elements.
@@ -109,7 +109,7 @@
<code><valueAnimator></code>, or other <code><set></code> elements). Represents
an {@link android.animation.AnimatorSet}.
<p>You can specify nested <code><set></code> tags to further
- group animations together. Each <code><set></code> can define its own
+ group animations together. Each <code><set></code> can define its own
<code>ordering</code> attribute.</p>
<p class="caps">attributes:</p>
@@ -119,11 +119,11 @@
</dt>
<dd>
<em>Keyword</em>. Specifies the play ordering of animations in this set.
- <table>
- <tr><th>Value</th><th>Description</th></tr>
- <tr><td><code>sequentially</code></td><td>Play animations in this set sequentially</td></tr>
- <tr><td><code>together</code> (default)</td><td>Play animations in this set at the same time.</td></tr>
- </table>
+ <table>
+ <tr><th>Value</th><th>Description</th></tr>
+ <tr><td><code>sequentially</code></td><td>Play animations in this set sequentially</td></tr>
+ <tr><td><code>together</code> (default)</td><td>Play animations in this set at the same time.</td></tr>
+ </table>
</dd>
</dl>
</dd>
@@ -131,11 +131,11 @@
<dt id="obj-animator-element"><code><objectAnimator></code></dt>
<dd>Animates a specific property of an object over a specific amount of time. Represents
an {@link android.animation.ObjectAnimator}.</p>
-
+
<p class="caps">attributes:</p>
<dl class="atn-list">
<dt>
- <code>android:propertyName</code>
+ <code>android:propertyName</code>
</dt>
<dd>
<em>String</em>. <strong>Required</strong>. The object's property to animate, referenced by its name. For example you can specify
@@ -206,11 +206,11 @@
<dd>
<em>Keyword</em>. Do not specify this attribute if the value is a color. The animation framework automatically handles color
values
- <table>
- <tr><th>Value</th><th>Description</th></tr>
- <tr><td><code>intType</code></td><td>Specifies that the animated values are integers</td></tr>
- <tr><td><code>floatType</code> (default)</td><td>Specifies that the animated values are floats</td></tr>
- </table>
+ <table>
+ <tr><th>Value</th><th>Description</th></tr>
+ <tr><td><code>intType</code></td><td>Specifies that the animated values are integers</td></tr>
+ <tr><td><code>floatType</code> (default)</td><td>Specifies that the animated values are floats</td></tr>
+ </table>
</dd>
</dl>
@@ -279,11 +279,11 @@
<dd>
<em>Keyword</em>. Do not specify this attribute if the value is a color. The animation framework automatically handles color
values.
- <table>
- <tr><th>Value</th><th>Description</th></tr>
- <tr><td><code>intType</code></td><td>Specifies that the animated values are integers</td></tr>
- <tr><td><code>floatType</code> (default)</td><td>Specifies that the animated values are floats</td></tr>
- </table>
+ <table>
+ <tr><th>Value</th><th>Description</th></tr>
+ <tr><td><code>intType</code></td><td>Specifies that the animated values are integers</td></tr>
+ <tr><td><code>floatType</code> (default)</td><td>Specifies that the animated values are floats</td></tr>
+ </table>
</dd>
</dl>
@@ -320,7 +320,7 @@
before starting the animation set. Calling {@link android.animation.AnimatorSet#setTarget
setTarget()} sets a single target object for all children of the {@link
android.animation.AnimatorSet} as a convenience. The following code shows how to do this:</p>
-
+
<pre>
AnimatorSet set = (AnimatorSet) AnimatorInflater.loadAnimator(myContext,
R.anim.property_animator);
diff --git a/docs/html/guide/topics/resources/complex-xml-resources.jd b/docs/html/guide/topics/resources/complex-xml-resources.jd
index 66dcb58..ebf7bc3 100644
--- a/docs/html/guide/topics/resources/complex-xml-resources.jd
+++ b/docs/html/guide/topics/resources/complex-xml-resources.jd
@@ -93,8 +93,7 @@
</vector>
<strong><aapt:attr /></strong>
- <target
- android:name="rotationGroup" />
+ <target android:name="rotationGroup">
<strong><aapt:attr name="android:animation" ></strong>
<objectAnimator
android:duration="6000"
@@ -102,6 +101,7 @@
android:valueFrom="0"
android:valueTo="360" />
<strong><aapt:attr></strong>
+ </target>
</animated-vector>
</pre>
</dd>
diff --git a/docs/html/guide/topics/resources/icu4j-framework.jd b/docs/html/guide/topics/resources/icu4j-framework.jd
new file mode 100644
index 0000000..e7cbe72
--- /dev/null
+++ b/docs/html/guide/topics/resources/icu4j-framework.jd
@@ -0,0 +1,165 @@
+page.title=ICU4J Android Framework APIs
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+<h2>In this document:</h2>
+<ol>
+ <li><a href="#relation">Relationship to ICU4J</a></li>
+ <li><a href="#migration">Migrating to android.icu APIs from ICU4J </a></li>
+ <li><a href="#licence">Licensing</a></li>
+</ol>
+
+<h2>See Also</h2>
+<ol>
+ <li>
+ <a class="external-link" href=
+ "http://userguide.icu-project.org">Documentation for ICU4J</a>
+ </li>
+
+ <li>
+ <a class="external-link" href=
+ "http://site.icu-project.org/#TOC-What-is-ICU-">Latest standards supported
+ by ICU4J</a>
+ </li>
+</ol>
+</div>
+</div>
+
+<p>
+ ICU4J is an open-source, widely used set of Java libraries providing Unicode
+ and globalization support for software applications. Starting in Android 7.0
+ (API level 24), Android
+ exposes a subset of the ICU4J APIs for app developers
+ to use under the {@code android.icu} package. These APIs use
+ localization data present on the device. As a result, you can reduce your APK
+ footprint by not compiling the ICU4J libraries into your APK; instead, you can
+ simply call out to them in the framework. (In this case, you may want to provide
+ <a href="{@docRoot}google/play/publishing/multiple-apks.html">multiple versions
+ of your APK</a>, so users running versions of Android lower than
+ Android 7.0 (API level 24)
+ can download a version of the app that contains the ICU4J libraries.)
+</p>
+
+<p>
+ This document begins by providing some basic information on the minimum
+ Android API levels required to support these libraries. It then explains what
+ you need to know about the Android-specific implementation of ICU4J. Finally,
+ it tells you how to use the ICU4J APIs in the Android framework.
+</p>
+
+<h2 id="relation">Relationship to ICU4J</h2>
+
+<p>
+ Android exposes a subset of the ICU4J APIs via the
+ <code>android.icu</code> package, rather than <code>com.ibm.icu</code>. The
+ Android framework may choose not to
+ expose ICU4J APIs for various reasons; for example, Android does not expose
+ some deprecated APIs or those that the ICU team have not yet declared as
+ stable. As the ICU team deprecates APIs in the future, Android will also mark
+ them as deprecated but will continue to include them.
+</p>
+
+<p class="table-caption"><strong>Table 1.</strong> ICU and CLDR versions used
+ in Android].</p>
+<table>
+<tr>
+<th>Android API level</th>
+<th>ICU version</th>
+<th>CLDR version</th>
+</tr>
+<tr>
+<td>Android 7.0 (API level 24)</td>
+<td>56</td>
+<td>28</td>
+</tr>
+</table>
+
+<p>Here are a few important things to note:</p>
+
+<ul>
+<li>The ICU4J Android framework APIs do not include all the ICU4J APIs.</li>
+<li>NDK developers should know that Android ICU4C is not supported.</li>
+<li>The APIs in the Android framework do not replace Android’s support for
+<a href="{@docRoot}guide/topics/resources/localization.html">localizing with
+resources</a>.</li>
+</ul>
+
+<h2 id="migration">Migrating to the android.icu package from com.ibm.icu</h2>
+
+<p>
+ If you are already using the ICU4J APIs in your app, and the
+ <code>android.icu</code> APIs meet your requirements, then migrating to
+ the framework APIs requires you to change your Java imports
+ from <code>com.ibm.icu</code> to <code>android.icu</code>. You may then
+ remove your own copy of ICU4J files from the APK.
+</p>
+
+<p class="note">
+ <b>Note</b>: The ICU4J framework APIs use the {@code android.icu}
+ namespace instead of {@code com.ibm.icu}. This is to avoid namespace
+ conflicts in APKs that contain their own {@code com.ibm.icu} libraries.
+</p>
+
+<h3 id="migrate-from-android">
+ Migrating to android.icu APIs from other Android SDK APIs
+</h3>
+
+<p>
+ Some classes in the <code>java</code> and<code>android</code> packages have
+ equivalents to those found in ICU4J. However, ICU4J often provides broader
+ support for standards and languages.
+</p>
+<p>Here are some examples to get you started:</p>
+<table>
+<tr>
+<th>Class</th>
+<th>Alternatives</th>
+</tr>
+<tr>
+<td><code>java.lang.Character</code> </td>
+<td><code>android.icu.lang.UCharacter</code> </td>
+</tr>
+<tr>
+<td><code>java.text.BreakIterator</code> </td>
+<td><code>android.icu.text.BreakIterator</code> </td>
+</tr>
+<tr>
+<td><code>java.text.DecimalFormat</code> </td>
+<td><code>android.icu.text.DecimalFormat</code> </td>
+</tr>
+<tr>
+<td><code>java.util.Calendar</code></td>
+<td>
+<code>android.icu.util.Calendar</code></td>
+</tr>
+<tr>
+<td><code>android.text.BidiFormatter</code>
+ </td>
+<td><code>android.icu.text.Bidi</code>
+ </td>
+</tr>
+<tr>
+<td><code>android.text.format.DateFormat</code>
+ </td>
+<td><code>android.icu.text.DateFormat</code>
+ </td>
+</tr>
+<tr>
+<td><code>android.text.format.DateUtils</code> </td>
+<td><code>android.icu.text.DateFormat</code>
+<code>android.icu.text.RelativeDateTimeFormatter</code>
+</td>
+</tr>
+</table>
+
+<h2 id="licence">Licensing</h2>
+
+<p>
+ ICU4J is released under the ICU license. For details, see the <a class=
+ "external-link" href=
+ "http://userguide.icu-project.org/icufaq#TOC-How-is-the-ICU-licensed-">ICU
+ User Guide.</a>
+</p>
diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 8c5708a..ab381c3 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -33,16 +33,17 @@
<dt>syntax:</dt>
<dd>
<pre class="stx">
-<?xml version="1.0" encoding="utf-8"?>
-<<a href="#viewgroup-element"><em>ViewGroup</em></a> xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<<a href="#viewgroup-element"><em>ViewGroup</em></a>
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@[+][<em>package</em>:]id/<em>resource_name</em>"
- android:layout_height=["<em>dimension</em>" | "fill_parent" | "wrap_content"]
- android:layout_width=["<em>dimension</em>" | "fill_parent" | "wrap_content"]
+ android:layout_height=["<em>dimension</em>" | "match_parent" | "wrap_content"]
+ android:layout_width=["<em>dimension</em>" | "match_parent" | "wrap_content"]
[<em>ViewGroup-specific attributes</em>] >
<<a href="#view-element"><em>View</em></a>
android:id="@[+][<em>package</em>:]id/<em>resource_name</em>"
- android:layout_height=["<em>dimension</em>" | "fill_parent" | "wrap_content"]
- android:layout_width=["<em>dimension</em>" | "fill_parent" | "wrap_content"]
+ android:layout_height=["<em>dimension</em>" | "match_parent" | "wrap_content"]
+ android:layout_width=["<em>dimension</em>" | "match_parent" | "wrap_content"]
[<em>View-specific attributes</em>] >
<<a href="#requestfocus-element">requestFocus</a>/>
</<em>View</em>>
@@ -82,15 +83,17 @@
</dd>
<dt><code>android:layout_height</code></dt>
<dd><em>Dimension or keyword</em>. <strong>Required</strong>. The height for the group, as a
-dimension value (or <a
-href="more-resources.html#Dimension">dimension resource</a>) or a keyword ({@code "fill_parent"}
-or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> below.
+dimension value (or
+<a href="more-resources.html#Dimension">dimension resource</a>) or a keyword
+({@code "match_parent"} or {@code "wrap_content"}). See the <a href=
+"#layoutvalues">valid values</a> below.
</dd>
<dt><code>android:layout_width</code></dt>
<dd><em>Dimension or keyword</em>. <strong>Required</strong>. The width for the group, as a
-dimension value (or <a
-href="more-resources.html#Dimension">dimension resource</a>) or a keyword ({@code "fill_parent"}
-or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> below.
+dimension value (or
+<a href="more-resources.html#Dimension">dimension resource</a>) or a keyword
+({@code "match_parent"} or {@code "wrap_content"}). See the <a href=
+"#layoutvalues">valid values</a> below.
</dd>
</dl>
<p>More attributes are supported by the {@link android.view.ViewGroup}
@@ -114,15 +117,17 @@
</dd>
<dt><code>android:layout_height</code></dt>
<dd><em>Dimension or keyword</em>. <strong>Required</strong>. The height for the element, as
-a dimension value (or <a
-href="more-resources.html#Dimension">dimension resource</a>) or a keyword ({@code "fill_parent"}
-or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> below.
+a dimension value (or
+<a href="more-resources.html#Dimension">dimension resource</a>) or a keyword
+({@code "match_parent"} or {@code "wrap_content"}). See the <a href=
+"#layoutvalues">valid values</a> below.
</dd>
<dt><code>android:layout_width</code></dt>
<dd><em>Dimension or keyword</em>. <strong>Required</strong>. The width for the element, as
-a dimension value (or <a
-href="more-resources.html#Dimension">dimension resource</a>) or a keyword ({@code "fill_parent"}
-or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> below.
+a dimension value (or
+<a href="more-resources.html#Dimension">dimension resource</a>) or a keyword
+({@code "match_parent"} or {@code "wrap_content"}). See the <a href=
+"#layoutvalues">valid values</a> below.
</dd>
</dl>
<p>More attributes are supported by the {@link android.view.View}
@@ -221,9 +226,6 @@
deprecate <code>fill_parent</code>.</td>
</tr>
<tr>
- <td><code>fill_parent</code></td>
- <td>Sets the dimension to match that of the parent element.</td>
- </tr><tr>
<td><code>wrap_content</code></td>
<td>Sets the dimension only to the size required to fit the content of this element.</td>
</tr>
@@ -245,8 +247,8 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
@@ -279,4 +281,4 @@
</ul>
</dd>
-</dl>
+</dl>
\ No newline at end of file
diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd
index 1afbf70..8488cde 100644
--- a/docs/html/guide/topics/resources/more-resources.jd
+++ b/docs/html/guide/topics/resources/more-resources.jd
@@ -760,7 +760,7 @@
</dd>
</dl>
-</dd>
+</dd>
<dt>example:</dt>
<dd>
@@ -781,7 +781,7 @@
</dd>
</dl>
-</dd>
+</dd>
<dt>see also:</dt>
diff --git a/docs/html/guide/topics/resources/multilingual-support.jd b/docs/html/guide/topics/resources/multilingual-support.jd
new file mode 100644
index 0000000..8d8484b
--- /dev/null
+++ b/docs/html/guide/topics/resources/multilingual-support.jd
@@ -0,0 +1,230 @@
+page.title=Language and Locale
+page.tags=androidn
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+<h2>In this document:</h2>
+<ol>
+ <li><a href="#preN">Challenges in Resolving Language Resources</a></li>
+ <li><a href="#postN">Improvements to Resource-Resolution Strategy</a></li>
+ <li><a href="#design">Designing your App to Support Additional
+ Locales</a></li>
+
+</ol>
+
+</div>
+</div>
+
+<p>Starting in Android 7.0 (API level 24),
+Android provides enhanced support for multilingual users,
+allowing them to select multiple locales in settings. Android
+provides this capability by greatly expanding the number of locales supported
+and changing the way the system resolves resources.</p>
+
+<p>This document starts by explaining the resource resolution strategy in
+versions of Android lower than 7.0 (API level 24). Next, it describes
+the improved resource-resolution strategy in Android 7.0.
+Last, it explains how to take advantage of
+the expanded number of locales to support more multilingual users.</p>
+
+<h2 id="preN">Challenges in Resolving Language Resources</h2>
+
+<p>Prior to Android 7.0, Android could not always successfully
+ match app and system locales.</p>
+
+ <p>For example, assume that you have the following situation:</p>
+ <ul>
+ <li>Your app's default language is {@code en_US} (US English), and it also has
+ Spanish strings localized in {@code es_ES}
+ resource files.</li>
+ <li> A device is set to {@code es_MX} </li>
+
+<p>When your Java code refers to strings, the system would load
+strings from the default ({@code en_US}) resource file, even if the app has
+Spanish resources localized under {@code es_ES}. This is because when the system
+ cannot find an exact match, it continues to look for resources by stripping the
+ country code off the locale. Finally, if no match is found, the system falls
+ back to the default, which is {@code en_US}. </p>
+
+
+<p>The system would also default to {@code en_US} if the user chose a language that
+the app didn't support at all, like French. For example:</p>
+
+<p class="table-caption" id="t-resource-res">
+<strong>Table 1.</strong> Resource resolution without an exact locale match.
+</p>
+<table>
+<tbody>
+<tr>
+<th>User Settings</th>
+<th>App Resources</th>
+<th>Resource Resolution</th>
+</tr>
+<tr>
+<td>fr_CH</td>
+<td>
+default (en)<br>
+de_DE<br>
+es_ES<br>
+fr_FR<br>
+it_IT<br>
+</td>
+ <td>
+Try fr_CH => Fail<br>
+Try fr => Fail<br>
+Use default (en)
+</td>
+ </tr>
+ </tbody>
+</table>
+
+
+<p>In this example, the system displays English strings without
+knowing whether the user can understand English. This behavior is pretty common
+today.</p>
+
+<h2 id="postN">Improvements to Resource-Resolution Strategy</h2>
+<p>Android 7.0 (API level 24) brings more robust resource resolution, and
+ finds better fallbacks automatically. However, to speed up resolution and
+ improve
+ maintainability, you should store resources in the most common parent dialect.
+ For example, if you were storing Spanish resources in the {@code es-US}
+ directory
+ before, move them into the {@code es-419} directory, which contains Latin
+ American Spanish.
+ Similarly, if you have resource strings in a folder named {@code en-GB}, rename
+ the folder to {@code en-001} (international English), because the most common
+ parent for <code>en-GB</code> strings is {@code en-001}.
+ The following examples explain why these practices improve performance and
+reliability of resource resolution.</p>
+
+<h3>Resource resolution examples</h3>
+
+<p>With versions of Android greater than 7.0, the case described in
+ <strong>Table 1</strong> is resolved differently:</p>
+
+<p class="table-caption" id="t-improved-res">
+<strong>Table 2.</strong> An improved resolution strategy for when there is no
+exact locale match.</p>
+<table>
+<tr>
+<th>User Settings</th>
+<th>App Resources</th>
+<th>Resource Resolution</th>
+</tr>
+<tr>
+<td><ol>
+<li> fr_CH</li>
+</ol>
+</td>
+<td>
+default (en)<br>
+de_DE<br>
+es_ES<br>
+fr_FR<br>
+it_IT<br>
+</td>
+<td>
+Try fr_CH => Fail<br>
+Try fr => Fail<br>
+Try children of fr => fr_FR<br>
+Use fr_FR
+</td>
+</tr>
+
+</table>
+
+
+<p>Now the user gets French resources instead of English. This example also shows
+ why you should store French strings in {@code fr} rather than {@code fr_FR}
+ for Android 7.0 or higher. Here the course of action is
+ to match the closest parent dialect,
+ making resolution faster and more predictable.</p>
+
+<p>In addition to this improved resolution logic, Android now offers more
+ user languages to choose from. Let’s try the above example again with Italian
+ specified as an additional user language, but without app support for French. </p>
+
+<p class="table-caption" id="t-2d-choice">
+<strong>Table 3.</strong> Resource resolution when the app only matches the
+user's second-preferred locale setting.</p>
+<table>
+<tr>
+<th>User Settings</th>
+<th>App Resources</th>
+<th>Resource Resolution</th>
+
+</tr>
+<tr>
+<td><ol>
+<li> fr_CH</li>
+<li> it_CH</li>
+</ol>
+</td>
+<td>
+default (en)<br>
+de_DE<br>
+es_ES<br>
+it_IT<br>
+</td>
+<td>
+Try fr_CH => Fail<br>
+Try fr => Fail<br>
+Try children of fr => Fail<br>
+Try it_CH => Fail<br>
+Try it => Fail<br>
+Try children of it => it_IT<br>
+Use it_IT
+</td>
+
+</tr>
+
+</table>
+<p>
+ The user still gets a language they understand, even though the app doesn’t
+ support French.
+</p>
+
+
+<h2 id="design">Designing your App to Support Additional Locales</h2>
+<h3>LocaleList API</h3>
+
+<p>
+ Starting with Android 7.0 (API level 24), Android exposes the
+ {@code LocaleList.getDefault()} API
+ that lets apps directly query the list of languages a user has specified. This API
+ allows you to create more sophisticated
+ app behavior and better-optimized display of content. For example, Search
+ can show results in multiple languages based on user’s settings. Browser apps
+ can avoid offering to translate pages in a language the user already knows,
+ and keyboard apps can auto-enable all appropriate layouts.
+</p>
+
+<h3>Formatters</h3>
+
+<p>
+ Up through Android 6.0 (API level 23), Android supported only one or
+ two locales
+ for many common languages
+ (en, es, ar, fr, ru). Because there were only a few variants of each language,
+ apps could get away with storing some numbers and dates as hard coded strings
+ in resource files. However, with Android's broadened set of supported
+ locales, there can be
+ significant differences in formats for dates, times, currencies, and similar
+ information even within a single locale. Hard-coding your formats can produce
+ a confusing experience for end users.
+ Therefore, when developing for Android 7.0 or higher versions,
+ make sure to use formatters instead of hard coding numbers and date strings.</p>
+
+<p>
+ For example, Android 7.0 and higher includes support for
+ 27 Arabic locales. These locales can share most resources,
+ but some prefer ASCII digits, while others prefer native digits. For example,
+ when you want to create a sentence with a digit variable, such as
+ "Choose a 4 digit pin", use formatters as shown below:
+</p>
+
+<pre> format(locale, "Choose a %d-digit PIN", 4)</pre>
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index c919ed5..80a989a 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -523,7 +523,7 @@
application will crash at runtime (for example, if all layout resources are tagged with the {@code
xlarge} qualifier, but the device is a normal-size screen).</p>
<p><em>Added in API level 4.</em></p>
-
+
<p>See <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple
Screens</a> for more information.</p>
<p>Also see the {@link android.content.res.Configuration#screenLayout} configuration field,
@@ -608,7 +608,7 @@
</ul>
<p><em>Added in API level 8, television added in API 13, watch added in API 20.</em></p>
<p>For information about how your app can respond when the device is inserted into or
- removed from a dock, read <a
+ removed from a dock, read <a
href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">Determining
and Monitoring the Docking State and Type</a>.</p>
<p>This can change during the life of your application if the user places the device in a
@@ -659,8 +659,8 @@
Level 8</em></li>
<li>{@code xxhdpi}: Extra-extra-high-density screens; approximately 480dpi. <em>Added in API
Level 16</em></li>
- <li>{@code xxxhdpi}: Extra-extra-extra-high-density uses (launcher icon only, see the
- <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">note</a>
+ <li>{@code xxxhdpi}: Extra-extra-extra-high-density uses (launcher icon only, see the
+ <a href="{@docRoot}guide/practices/screens_support.html#xxxhdpi-note">note</a>
in <em>Supporting Multiple Screens</em>); approximately 640dpi. <em>Added in API
Level 18</em></li>
<li>{@code nodpi}: This can be used for bitmap resources that you do not want to be scaled
diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd
index 8781d20..3444e16 100644
--- a/docs/html/guide/topics/resources/runtime-changes.jd
+++ b/docs/html/guide/topics/resources/runtime-changes.jd
@@ -17,6 +17,8 @@
<li><a href="accessing-resources.html">Accessing Resources</a></li>
<li><a href="http://android-developers.blogspot.com/2009/02/faster-screen-orientation-change.html">Faster
Screen Orientation Change</a></li>
+ <li><a href="{@docRoot}guide/topics/ui/multi-window.html#lifecycle">
+ Multi-Window Lifecycle</a></li>
</ol>
</div>
</div>
@@ -84,12 +86,12 @@
<p>To retain stateful objects in a fragment during a runtime configuration change:</p>
<ol>
- <li>Extend the {@link android.app.Fragment} class and declare references to your stateful
+ <li>Extend the {@link android.app.Fragment} class and declare references to your stateful
objects.</li>
<li>Call {@link android.app.Fragment#setRetainInstance(boolean)} when the fragment is created.
</li>
<li>Add the fragment to your activity.</li>
- <li>Use {@link android.app.FragmentManager} to retrieve the fragment when the activity is
+ <li>Use {@link android.app.FragmentManager} to retrieve the fragment when the activity is
restarted.</li>
</ol>
@@ -127,8 +129,8 @@
means that your application maintains a hold on them and they cannot be garbage-collected, so
lots of memory can be lost.)</p>
-<p>Then use {@link android.app.FragmentManager} to add the fragment to the activity.
-You can obtain the data object from the fragment when the activity starts again during runtime
+<p>Then use {@link android.app.FragmentManager} to add the fragment to the activity.
+You can obtain the data object from the fragment when the activity starts again during runtime
configuration changes. For example, define your activity as follows:</p>
<pre>
@@ -170,7 +172,7 @@
<p>In this example, {@link android.app.Activity#onCreate(Bundle) onCreate()} adds a fragment
or restores a reference to it. {@link android.app.Activity#onCreate(Bundle) onCreate()} also
stores the stateful object inside the fragment instance.
-{@link android.app.Activity#onDestroy() onDestroy()} updates the stateful object inside the
+{@link android.app.Activity#onDestroy() onDestroy()} updates the stateful object inside the
retained fragment instance.</p>
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index 4d6b400..8278ab1 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -699,7 +699,7 @@
inflater.inflate(R.menu.options_menu, menu);
// Get the SearchView and set the searchable configuration
- SearchManager searchManager = (SearchManager) {@link android.app.Activity#getSystemService getSystemService}(Context.SEARCH_SERVICE);
+ SearchManager searchManager = (SearchManager) {@link android.app.Activity#getSystemService(java.lang.String) getSystemService()}(Context.SEARCH_SERVICE);
SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
// Assumes current activity is the searchable activity
searchView.setSearchableInfo(searchManager.getSearchableInfo({@link android.app.Activity#getComponentName()}));
diff --git a/docs/html/guide/topics/security/permissions.jd b/docs/html/guide/topics/security/permissions.jd
index e7bf760..39a1f81 100644
--- a/docs/html/guide/topics/security/permissions.jd
+++ b/docs/html/guide/topics/security/permissions.jd
@@ -675,7 +675,7 @@
<a name="manifest"></a>
<h3>Enforcing Permissions in AndroidManifest.xml</h3>
-<p>TYou can apply high-level permissions restricting access to entire components
+<p>You can apply high-level permissions restricting access to entire components
of the system or application through your
<code>AndroidManifest.xml</code>. To do this, include an {@link
android.R.attr#permission android:permission} attribute on the desired
diff --git a/docs/html/guide/topics/sensors/index.jd b/docs/html/guide/topics/sensors/index.jd
index 09d27e7..36d3adc 100644
--- a/docs/html/guide/topics/sensors/index.jd
+++ b/docs/html/guide/topics/sensors/index.jd
@@ -1,7 +1,7 @@
page.title=Location and Sensors APIs
page.landing=true
page.tags=location,sensors
-page.landing.intro=Use sensors on the device to add rich location and motion capabilities to your app, from GPS or network location to accelerometer, gyroscope, temperature, barometer, and more.
+page.landing.intro=Use sensors on the device to add rich location and motion capabilities to your app, from GPS or network location to accelerometer, gyroscope, temperature, barometer, and more.
page.landing.image=
@jd:body
@@ -10,7 +10,7 @@
<div class="col-6">
<h3>Blog Articles</h3>
-
+
<a href="http://android-developers.blogspot.com/2010/09/one-screen-turn-deserves-another.html">
<h4>One Screen Turn Deserves Another</h4>
<p>However, there’s a new wrinkle: recently, a few devices have shipped (see here and here)
@@ -18,7 +18,7 @@
the default position, the screens are wider than they are tall. This introduces a few fairly subtle
issues that we’ve noticed causing problems in some apps.</p>
</a>
-
+
<a href="http://android-developers.blogspot.com/2011/06/deep-dive-into-location.html">
<h4>A Deep Dive Into Location</h4>
<p>I’ve written an open-source reference app that incorporates all of the tips, tricks, and
@@ -29,7 +29,7 @@
<div class="col-6">
<h3>Training</h3>
-
+
<a href="http://developer.android.com/training/location/index.html">
<h4>Making Your App Location Aware</h4>
<p>This class teaches you how to incorporate location based services in your Android
diff --git a/docs/html/guide/topics/sensors/sensors_position.jd b/docs/html/guide/topics/sensors/sensors_position.jd
index d0ddead..5ec16c7 100644
--- a/docs/html/guide/topics/sensors/sensors_position.jd
+++ b/docs/html/guide/topics/sensors/sensors_position.jd
@@ -8,7 +8,7 @@
<ol>
<li><a href="#sensors-pos-gamerot">Using the Game Rotation Vector Sensor</a></li>
<li><a href="#sensors-pos-geomrot">Using the Geomagnetic Rotation Vector Sensor</a></li>
- <li><a href="#sensors-pos-orient">Using the Orientation Sensor</a></li>
+ <li><a href="#sensors-pos-orient">Computing the Device's Orientation</a></li>
<li><a href="#sensors-pos-mag">Using the Geomagnetic Field Sensor</a></li>
<li><a href="#sensors-pos-prox">Using the Proximity Sensor</a></li>
</ol>
@@ -42,38 +42,49 @@
</div>
</div>
-<p>The Android platform provides two sensors that let you determine the position of a device: the
-geomagnetic field sensor and the orientation sensor. The Android platform also
-provides a sensor that lets you determine how close the face of a device is to an object (known as
-the proximity sensor). The geomagnetic field sensor and the proximity sensor are hardware-based.
-Most
-handset and tablet manufacturers include a geomagnetic field sensor. Likewise, handset manufacturers
-usually include a proximity sensor to determine when a handset is being held close to a user's face
-(for example, during a phone call). The orientation sensor is software-based and derives its data
-from the accelerometer and the geomagnetic field sensor.</p>
+<p>
+ The Android platform provides two sensors that let you determine the position
+ of a device: the geomagnetic field sensor and the accelerometer. The Android
+ platform also provides a sensor that lets you determine how close the face of
+ a device is to an object (known as the <em>proximity sensor</em>). The
+ geomagnetic field sensor and the proximity sensor are hardware-based. Most
+ handset and tablet manufacturers include a geomagnetic field sensor. Likewise,
+ handset manufacturers usually include a proximity sensor to determine when a
+ handset is being held close to a user's face (for example, during a phone
+ call). For determining a device's orientation, you can use the readings from
+ the device's accelerometer and the geomagnetic field sensor.
+</p>
-<p class="note"><strong>Note:</strong> The orientation sensor was deprecated in Android 2.2 (API
-Level 8).</p>
+<p class="note">
+ <strong>Note:</strong> The orientation sensor was deprecated in Android 2.2
+ (API level 8), and the orientation sensor type was deprecated in Android 4.4W
+ (API level 20).
+</p>
-<p>Position sensors are useful for determining a device's physical position in the
-world's frame of reference. For example, you can use the geomagnetic field sensor in
-combination with the accelerometer to determine a device's position relative to
-the magnetic North Pole. You can also use the orientation sensor (or similar sensor-based
-orientation methods) to determine a device's position in your application's frame of reference.
-Position sensors are not typically used to monitor device movement or motion, such as shake, tilt,
-or thrust (for more information, see <a
-href="{@docRoot}guide/topics/sensors/sensors_motion.html">Motion Sensors</a>).</p>
+<p>
+ Position sensors are useful for determining a device's physical position in
+ the world's frame of reference. For example, you can use the geomagnetic field
+ sensor in combination with the accelerometer to determine a device's position
+ relative to the magnetic north pole. You can also use these sensors to
+ determine a device's orientation in your application's frame of reference.
+ Position sensors are not typically used to monitor device movement or motion,
+ such as shake, tilt, or thrust (for more information, see <a
+ href="{@docRoot}guide/topics/sensors/sensors_motion.html">Motion Sensors</a>).
+</p>
-<p>The geomagnetic field sensor and orientation sensor return multi-dimensional arrays of sensor
-values
-for each {@link android.hardware.SensorEvent}. For example, the orientation sensor provides
-geomagnetic
-field strength values for each of the three coordinate axes during a single sensor event. Likewise,
-the orientation sensor provides azimuth (yaw), pitch, and roll values during a single sensor event.
-For more information about the coordinate systems that are used by sensors, see <a
-href="{@docRoot}guide/topics/sensors/sensors_overview.html#sensors-coords">Sensor Coordinate
-Systems</a>. The proximity sensor provides a single value for each sensor event. Table 1 summarizes
-the position sensors that are supported on the Android platform.</p>
+<p>
+ The geomagnetic field sensor and accelerometer return multi-dimensional arrays
+ of sensor values for each {@link android.hardware.SensorEvent}. For example,
+ the geomagnetic field sensor provides geomagnetic field strength values for
+ each of the three coordinate axes during a single sensor event. Likewise, the
+ accelerometer sensor measures the acceleration applied to the device during a
+ sensor event. For more information about the coordinate systems that are used
+ by sensors, see <a
+ href="{@docRoot}guide/topics/sensors/sensors_overview.html#sensors-coords">
+ Sensor Coordinate Systems</a>. The proximity sensor provides a single value
+ for each sensor event. Table 1 summarizes the position sensors that are
+ supported on the Android platform.
+</p>
<p class="table-caption" id="table1">
<strong>Table 1.</strong> Position sensors that are supported on the Android platform.</p>
@@ -174,14 +185,17 @@
</tr>
</table>
-<p class="note"><sup><strong>1</strong></sup> This sensor was deprecated in Android 2.2 (API Level
- 8). The sensor framework provides alternate methods for acquiring device orientation, which are
-discussed in <a href="#sensors-pos-orient">Using the Orientation Sensor</a>.</p>
+<p class="note">
+ <sup><strong>1</strong></sup>This sensor was deprecated in Android 2.2 (API
+ level 8), and this sensor type was deprecated in Android 4.4W (API level 20).
+ The sensor framework provides alternate methods for acquiring device
+ orientation, which are discussed in <a href="#sensors-pos-orient">Computing
+ the Device's Orientation</a>.
+</p>
<p class="note"><sup><strong>2</strong></sup> Some proximity sensors provide only binary values
representing near and far.</p>
-
<h2 id="sensors-pos-gamerot">Using the Game Rotation Vector Sensor</h2>
<p>The game rotation vector sensor is identical to the
@@ -228,71 +242,106 @@
</pre>
-<h2 id="sensors-pos-orient">Using the Orientation Sensor</h2>
+<h2 id="sensors-pos-orient">Computing the Device's Orientation</h2>
-<p>The orientation sensor lets you monitor the position of a device relative to the earth's frame of
-reference (specifically, magnetic north). The following code shows you how to get an instance of the
-default orientation sensor:</p>
-
+<p>By computing a device's orientation, you can monitor the position of the
+ device relative to the earth's frame of reference (specifically, the magnetic
+ north pole). The following code shows you how to compute a device's
+ orientation:
+</p>
<pre>
private SensorManager mSensorManager;
-private Sensor mSensor;
...
-mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
-mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
+// Rotation matrix based on current readings from accelerometer and magnetometer.
+final float[] rotationMatrix = new float[9];
+mSensorManager.getRotationMatrix(rotationMatrix, null,
+ accelerometerReading, magnetometerReading);
+
+// Express the updated rotation matrix as three orientation angles.
+final float[] orientationAngles = new float[3];
+mSensorManager.getOrientation(rotationMatrix, orientationAngles);
</pre>
-
-<p>The orientation sensor derives its data by using a device's geomagnetic field sensor in
-combination with a device's accelerometer. Using these two hardware sensors, an orientation sensor
-provides data for the following three dimensions:</p>
-
+<p>The system computes the orientation angles by using a device's geomagnetic
+ field sensor in combination with the device's accelerometer. Using these two
+ hardware sensors, the system provides data for the following three
+ orientation angles:
+</p>
<ul>
- <li>Azimuth (degrees of rotation around the z axis). This is the angle between magnetic north
-and the device's y axis. For example, if the device's y axis is aligned with magnetic north
-this value is 0, and if the device's y axis is pointing south this value is 180. Likewise, when
-the y axis is pointing east this value is 90 and when it is pointing west this value is 270.</li>
- <li>Pitch (degrees of rotation around the x axis). This value is positive when the positive z axis
-rotates toward the positive y axis, and it is negative when the positive z axis
-rotates toward the negative y axis. The range of values is 180 degrees to -180
-degrees.</li>
- <li>Roll (degrees of rotation around the y axis). This value is positive when the positive z axis
-rotates toward the positive x axis, and it is negative when the positive z axis
-rotates toward the negative x axis. The range of values is 90 degrees to -90
-degrees.</li>
+ <li>
+ <strong>Azimuth (degrees of rotation about the -z axis).</strong> This is
+ the angle between the device's current compass direction and magnetic north.
+ If the top edge of the device faces magnetic north, the azimuth is 0
+ degrees; if the top edge faces south, the azimuth is 180 degrees. Similarly,
+ if the top edge faces east, the azimuth is 90 degrees, and if the top edge
+ faces west, the azimuth is 270 degrees.
+ </li>
+ <li>
+ <strong>Pitch (degrees of rotation about the x axis).</strong> This is the
+ angle between a plane parallel to the device's screen and a plane parallel
+ to the ground. If you hold the device parallel to the ground with the bottom
+ edge closest to you and tilt the top edge of the device toward the ground,
+ the pitch angle becomes positive. Tilting in the opposite direction—
+ moving the top edge of the device away from the ground—causes
+ the pitch angle to become negative. The range of values is -180 degrees to
+ 180 degrees.
+ </li>
+ <li>
+ <strong>Roll (degrees of rotation about the y axis).</strong> This is the
+ angle between a plane perpendicular to the device's screen and a plane
+ perpendicular to the ground. If you hold the device parallel to the ground
+ with the bottom edge closest to you and tilt the left edge of the device
+ toward the ground, the roll angle becomes positive. Tilting in the opposite
+ direction—moving the right edge of the device toward the ground—
+ causes the roll angle to become negative. The range of values is -90 degrees
+ to 90 degrees.
+ </li>
</ul>
-<p>This definition is different from yaw, pitch, and roll used in aviation, where the X axis is
-along the long side of the plane (tail to nose). Also, for historical reasons the roll angle is
-positive in the clockwise direction (mathematically speaking, it should be positive in the
-counter-clockwise direction).</p>
+<p class="note">
+ <strong>Note:</strong>The sensor's roll definition has changed to reflect the
+ vast majority of implementations in the geosensor ecosystem.
+</p>
-<p>The orientation sensor derives its data by processing the raw sensor data from the accelerometer
-and the geomagnetic field sensor. Because of the heavy processing that is involved, the accuracy and
-precision of the orientation sensor is diminished (specifically, this sensor is only reliable when
-the roll component is 0). As a result, the orientation sensor was deprecated in Android 2.2 (API
-level 8). Instead of using raw data from the orientation sensor, we recommend that you use the
-{@link android.hardware.SensorManager#getRotationMatrix getRotationMatrix()} method in conjunction
-with the {@link android.hardware#getOrientation getOrientation()} method to compute orientation
-values. You can also use the {@link android.hardware.SensorManager#remapCoordinateSystem
-remapCoordinateSystem()} method to translate the orientation values to your application's frame of
-reference.</p>
+<p>
+ Note that these angles work off of a different coordinate system than the
+ one used in aviation (for yaw, pitch, and roll). In the aviation system, the
+ x axis is along the long side of the plane, from tail to nose.
+</p>
-<p>The following code sample shows how to acquire orientation data directly from the orientation
-sensor. We recommend that you do this only if a device has negligible roll.</p>
+<p>
+ The orientation sensor derives its data by processing the raw sensor data
+ from the accelerometer and the geomagnetic field sensor. Because of the heavy
+ processing that is involved, the accuracy and precision of the orientation
+ sensor is diminished. Specifically, this sensor is reliable only when the roll
+ angle is 0. As a result, the orientation sensor was deprecated in Android
+ 2.2 (API level 8), and the orientation sensor type was deprecated in Android
+ 4.4W (API level 20).
+ Instead of using raw data from the orientation sensor, we recommend that you
+ use the {@link android.hardware.SensorManager#getRotationMatrix getRotationMatrix()}
+ method in conjunction with the
+ {@link android.hardware.SensorManager#getOrientation getOrientation()} method
+ to compute orientation values, as shown in the following code sample. As part
+ of this process, you can use the
+ {@link android.hardware.SensorManager#remapCoordinateSystem remapCoordinateSystem()}
+ method to translate the orientation values to your application's frame of
+ reference.
+</p>
<pre>
public class SensorActivity extends Activity implements SensorEventListener {
private SensorManager mSensorManager;
- private Sensor mOrientation;
+ private final float[] mAccelerometerReading = new float[3];
+ private final float[] mMagnetometerReading = new float[3];
+
+ private final float[] mRotationMatrix = new float[9];
+ private final float[] mOrientationAngles = new float[3];
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
- mOrientation = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
}
@Override
@@ -304,31 +353,63 @@
@Override
protected void onResume() {
super.onResume();
- mSensorManager.registerListener(this, mOrientation, SensorManager.SENSOR_DELAY_NORMAL);
+
+ // Get updates from the accelerometer and magnetometer at a constant rate.
+ // To make batch operations more efficient and reduce power consumption,
+ // provide support for delaying updates to the application.
+ //
+ // In this example, the sensor reporting delay is small enough such that
+ // the application receives an update before the system checks the sensor
+ // readings again.
+ mSensorManager.registerListener(this, Sensor.TYPE_ACCELEROMETER,
+ SensorManager.SENSOR_DELAY_NORMAL, SensorManager.SENSOR_DELAY_UI);
+ mSensorManager.registerListener(this, Sensor.TYPE_MAGNETIC_FIELD,
+ SensorManager.SENSOR_DELAY_NORMAL, SensorManager.SENSOR_DELAY_UI);
}
@Override
protected void onPause() {
super.onPause();
+
+ // Don't receive any more updates from either sensor.
mSensorManager.unregisterListener(this);
}
+ // Get readings from accelerometer and magnetometer. To simplify calculations,
+ // consider storing these readings as unit vectors.
@Override
public void onSensorChanged(SensorEvent event) {
- float azimuth_angle = event.values[0];
- float pitch_angle = event.values[1];
- float roll_angle = event.values[2];
- // Do something with these orientation angles.
+ if (event.sensor == Sensor.TYPE_ACCELEROMETER) {
+ System.arraycopy(event.values, 0, mAccelerometerReading,
+ 0, mAccelerometerReading.length);
+ }
+ else if (event.sensor == Sensor.TYPE_MAGNETIC_FIELD) {
+ System.arraycopy(event.values, 0, mMagnetometerReading,
+ 0, mMagnetometerReading.length);
+ }
+ }
+
+ // Compute the three orientation angles based on the most recent readings from
+ // the device's accelerometer and magnetometer.
+ public void updateOrientationAngles() {
+ // Update rotation matrix, which is needed to update orientation angles.
+ mSensorManager.getRotationMatrix(mRotationMatrix, null,
+ mAccelerometerReading, mMagnetometerReading);
+
+ // "mRotationMatrix" now has up-to-date information.
+
+ mSensorManager.getOrientation(mRotationMatrix, mOrientationAngles);
+
+ // "mOrientationAngles" now has up-to-date information.
}
}
</pre>
-<p>You do not usually need to perform any data processing or filtering of the raw data that you
-obtain from an orientation sensor, other than translating the sensor's coordinate system to your
-application's frame of reference. The <a
-href="{@docRoot}resources/samples/AccelerometerPlay/index.html">Accelerometer Play</a> sample shows
-you how to translate acceleration sensor data into another frame of reference; the technique is
-similar to the one you might use with the orientation sensor.</p>
+<p>
+ You don't usually need to perform any data processing or filtering of the
+ device's raw orientation angles other than translating the sensor's
+ coordinate system to your application's frame of reference.
+</p>
<h2 id="sensors-pos-mag">Using the Geomagnetic Field Sensor</h2>
diff --git a/docs/html/guide/topics/text/index.jd b/docs/html/guide/topics/text/index.jd
index 3865f25..2bf4696 100644
--- a/docs/html/guide/topics/text/index.jd
+++ b/docs/html/guide/topics/text/index.jd
@@ -9,7 +9,7 @@
<div class="col-12">
<h3>Blog Articles</h3>
-
+
<a href="http://android-developers.blogspot.com/2011/12/add-voice-typing-to-your-ime.html">
<h4>Add Voice Typing To Your IME</h4>
<p>A new feature available in Android 4.0 is voice typing: the difference for users is that
diff --git a/docs/html/guide/topics/text/spell-checker-framework.jd b/docs/html/guide/topics/text/spell-checker-framework.jd
index a5d9932..7c059ce 100644
--- a/docs/html/guide/topics/text/spell-checker-framework.jd
+++ b/docs/html/guide/topics/text/spell-checker-framework.jd
@@ -6,7 +6,7 @@
<h2>In This Document</h2>
<ol>
<li>
- <a href="#SpellCheckLifeCycle">Spell Check Lifecycle</a>
+ <a href="#SpellCheckLifeCycle">Spell Check Lifecycle</a>
</li>
<li>
<a href="#SpellCheckImplementation">Implementing a Spell Checker Service</a>
@@ -30,12 +30,12 @@
</div>
<p>
- The Android platform offers a spelling checker framework that lets you implement
- and access spell checking in your application. The framework is one of the
+ The Android platform offers a spelling checker framework that lets you implement
+ and access spell checking in your application. The framework is one of the
Text Service APIs offered by the Android platform.
</p>
<p>
- To use the framework in your app, you create a special type of Android service that
+ To use the framework in your app, you create a special type of Android service that
generates a spelling checker <strong>session</strong> object. Based on text you provide,
the session object returns spelling suggestions generated by the spelling checker.
</p>
diff --git a/docs/html/guide/topics/ui/accessibility/apps.jd b/docs/html/guide/topics/ui/accessibility/apps.jd
index 90781f7..c415762 100644
--- a/docs/html/guide/topics/ui/accessibility/apps.jd
+++ b/docs/html/guide/topics/ui/accessibility/apps.jd
@@ -160,7 +160,7 @@
{@code android:focusable}</a> attribute is set to {@code true}. This setting allows users to focus
on the element using the directional controls and then interact with it. The user interface controls
provided by the Android framework are focusable by default and visually indicate focus by changing
-the control’s appearance.</p>
+the control's appearance.</p>
<p>Android provides several APIs that let you control whether a user interface control is focusable
and even request that a control be given focus:</p>
@@ -298,7 +298,7 @@
dispatchPopulateAccessibilityEvent()} method for each child of this view. In order to support
accessibility services on revisions of Android <em>prior</em> to 4.0 (API Level 14) you
<em>must</em> override this method and populate {@link
-android.view.accessibility.AccessibilityEvent#getText} with descriptive text for your custom
+android.view.accessibility.AccessibilityRecord#getText} with descriptive text for your custom
view, which is spoken by accessibility services, such as TalkBack.</dd>
<dt>{@link android.view.View#onPopulateAccessibilityEvent onPopulateAccessibilityEvent()}</dt>
@@ -436,7 +436,7 @@
<h3 id="populate-events">Populating accessibility events</h3>
<p>Each {@link android.view.accessibility.AccessibilityEvent} has a set of required properties that
-describe the current state of the view. These properties include things such as the view’s class
+describe the current state of the view. These properties include things such as the view's class
name, content description and checked state. The specific properties required for each event type
are described in the {@link android.view.accessibility.AccessibilityEvent} reference documentation.
The {@link android.view.View} implementation provides default values for these properties. Many of
@@ -454,10 +454,10 @@
<pre>
@Override
-public void dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
- super.dispatchPopulateAccessibilityEvent(event);
+public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
// Call the super implementation to populate its text to the event, which
// calls onPopulateAccessibilityEvent() on API Level 14 and up.
+ boolean completed = super.dispatchPopulateAccessibilityEvent(event);
// In case this is running on a API revision earlier that 14, check
// the text content of the event and add an appropriate text
@@ -465,7 +465,9 @@
CharSequence text = getText();
if (!TextUtils.isEmpty(text)) {
event.getText().add(text);
+ return true;
}
+ return completed;
}
</pre>
diff --git a/docs/html/guide/topics/ui/accessibility/services.jd b/docs/html/guide/topics/ui/accessibility/services.jd
index f91a979..d08022e 100644
--- a/docs/html/guide/topics/ui/accessibility/services.jd
+++ b/docs/html/guide/topics/ui/accessibility/services.jd
@@ -124,7 +124,7 @@
</service>
</pre>
-<p>This meta-data element refers to an XML file that you create in your application’s resource
+<p>This meta-data element refers to an XML file that you create in your application's resource
directory ({@code <project_dir>/res/xml/accessibility_service_config.xml}). The following code
shows example contents for the service configuration file:</p>
@@ -205,7 +205,7 @@
while it is running ({@link android.accessibilityservice.AccessibilityService#onAccessibilityEvent
onAccessibilityEvent()},
{@link android.accessibilityservice.AccessibilityService#onInterrupt onInterrupt()}) to when it is
-shut down ({@link android.accessibilityservice.AccessibilityService#onUnbind onUnbind()}).</p>
+shut down ({@link android.app.Service#onUnbind onUnbind()}).</p>
<ul>
<li>{@link android.accessibilityservice.AccessibilityService#onServiceConnected
@@ -231,7 +231,7 @@
providing, usually in response to a user action such as moving focus to a different control. This
method may be called many times over the lifecycle of your service.</li>
- <li>{@link android.accessibilityservice.AccessibilityService#onUnbind onUnbind()} - (optional)
+ <li>{@link android.app.Service#onUnbind onUnbind()} - (optional)
This method is called when the system is about to shutdown the accessibility service. Use this
method to do any one-time shutdown procedures, including de-allocating user feedback system
services, such as the audio manager or device vibrator.</li>
@@ -267,7 +267,7 @@
accessibility services to provide more useful feedback to users.</p>
<p>An accessibility service gets information about an user interface event through an {@link
-android.view.accessibility.AccessibilityEvent} passed by the system to the service’s
+android.view.accessibility.AccessibilityEvent} passed by the system to the service's
{@link android.accessibilityservice.AccessibilityService#onAccessibilityEvent
onAccessibilityEvent()} callback method. This object provides details about the event, including the
type of object being acted upon, its descriptive text and other details. Starting in Android 4.0
@@ -283,7 +283,7 @@
to the {@link android.view.accessibility.AccessibilityEvent} passed to you by the system. This level
of detail provides more context for the event that triggered your accessibility service.</li>
- <li>{@link android.view.accessibility.AccessibilityEvent#getSource
+ <li>{@link android.view.accessibility.AccessibilityRecord#getSource
AccessibilityEvent.getSource()} - This method returns an {@link
android.view.accessibility.AccessibilityNodeInfo} object. This object allows you to request view
layout hierarchy (parents and children) of the component that originated the accessibility event.
@@ -296,10 +296,10 @@
level of access through the accessibility <a href="#service-config">service configuration XML</a>
file, by including the {@code canRetrieveWindowContent} attribute and setting it to {@code true}. If
you do not include this setting in your service configuration xml file, calls to {@link
-android.view.accessibility.AccessibilityEvent#getSource getSource()} fail.</p>
+android.view.accessibility.AccessibilityRecord#getSource getSource()} fail.</p>
<p class="note"><strong>Note:</strong> In Android 4.1 (API Level 16) and higher, the
-{@link android.view.accessibility.AccessibilityEvent#getSource getSource()} method,
+{@link android.view.accessibility.AccessibilityRecord#getSource getSource()} method,
as well as {@link android.view.accessibility.AccessibilityNodeInfo#getChild
AccessibilityNodeInfo.getChild()} and
{@link android.view.accessibility.AccessibilityNodeInfo#getParent getParent()}, return only
@@ -335,7 +335,7 @@
of a user. This feature, added in Android 4.1 (API Level 16), and requires that your
accessibility service request activation of the Explore by Touch feature. Your service can
request this activation by setting the
- {@link android.accessibilityservice.AccessibilityServiceInfo#flags flags} member of the service’s
+ {@link android.accessibilityservice.AccessibilityServiceInfo#flags flags} member of the service's
{@link android.accessibilityservice.AccessibilityServiceInfo} instance to
{@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_REQUEST_TOUCH_EXPLORATION_MODE},
as shown in the following example.
@@ -372,7 +372,7 @@
<a href="#service-config">service configuration file</a>. When events are received by your
service, it can then retrieve the
{@link android.view.accessibility.AccessibilityNodeInfo} object from the event using
- {@link android.view.accessibility.AccessibilityEvent#getSource getSource()}.
+ {@link android.view.accessibility.AccessibilityRecord#getSource getSource()}.
With the {@link android.view.accessibility.AccessibilityNodeInfo} object, your service can then
explore the view hierarchy to determine what action to take and then act for the user using
{@link android.view.accessibility.AccessibilityNodeInfo#performAction performAction()}.</p>
diff --git a/docs/html/guide/topics/ui/binding.jd b/docs/html/guide/topics/ui/binding.jd
index a4fd25c..48a1d40 100644
--- a/docs/html/guide/topics/ui/binding.jd
+++ b/docs/html/guide/topics/ui/binding.jd
@@ -16,7 +16,7 @@
<pre>
-// Get a Spinner and bind it to an ArrayAdapter that
+// Get a Spinner and bind it to an ArrayAdapter that
// references a String array.
Spinner s1 = (Spinner) findViewById(R.id.spinner1);
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
@@ -31,7 +31,7 @@
Spinner s2 = (Spinner) findViewById(R.id.spinner2);
Cursor cur = managedQuery(People.CONTENT_URI, PROJECTION, null, null);
-
+
SimpleCursorAdapter adapter2 = new SimpleCursorAdapter(this,
android.R.layout.simple_spinner_item, // Use a template
// that displays a
@@ -41,7 +41,7 @@
// people database to...
new int[] {android.R.id.text1}); // The "text1" view defined in
// the XML template
-
+
adapter2.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
s2.setAdapter(adapter2);
</pre>
@@ -70,7 +70,7 @@
// Now hook into our object and set its onItemClickListener member
// to our class handler object.
mHistoryView = (ListView)findViewById(R.id.history);
-mHistoryView.setOnItemClickListener(mMessageClickedHandler);
+mHistoryView.setOnItemClickListener(mMessageClickedHandler);
</pre>
<div class="special">
diff --git a/docs/html/guide/topics/ui/controls.jd b/docs/html/guide/topics/ui/controls.jd
index a58d9f9..bb8c1a7 100644
--- a/docs/html/guide/topics/ui/controls.jd
+++ b/docs/html/guide/topics/ui/controls.jd
@@ -71,7 +71,7 @@
<tr>
<td><a href="controls/radiobutton.html">Radio button</a></td>
<td>Similar to checkboxes, except that only one option can be selected in the group.</td>
- <td>{@link android.widget.RadioGroup RadioGroup}
+ <td>{@link android.widget.RadioGroup RadioGroup}
<br>{@link android.widget.RadioButton RadioButton} </td>
</tr>
<tr>
diff --git a/docs/html/guide/topics/ui/controls/button.jd b/docs/html/guide/topics/ui/controls/button.jd
index 295044f..a529d53 100644
--- a/docs/html/guide/topics/ui/controls/button.jd
+++ b/docs/html/guide/topics/ui/controls/button.jd
@@ -214,7 +214,7 @@
<li>The second <code><item></code> defines the bitmap to use when the button is
focused (when the button is highlighted using the trackball or directional
pad).</li>
- <li>The third <code><item></code> defines the bitmap to use when the button is in the
+ <li>The third <code><item></code> defines the bitmap to use when the button is in the
default state (it's neither pressed nor focused).</li>
</ul>
<p class="note"><strong>Note:</strong> The order of the <code><item></code> elements is
diff --git a/docs/html/guide/topics/ui/controls/checkbox.jd b/docs/html/guide/topics/ui/controls/checkbox.jd
index 2a64e38..f5feeb1 100644
--- a/docs/html/guide/topics/ui/controls/checkbox.jd
+++ b/docs/html/guide/topics/ui/controls/checkbox.jd
@@ -65,7 +65,7 @@
public void onCheckboxClicked(View view) {
// Is the view now checked?
boolean checked = ((CheckBox) view).isChecked();
-
+
// Check which checkbox was clicked
switch(view.getId()) {
case R.id.checkbox_meat:
diff --git a/docs/html/guide/topics/ui/controls/pickers.jd b/docs/html/guide/topics/ui/controls/pickers.jd
index c0667ad..9788f08 100644
--- a/docs/html/guide/topics/ui/controls/pickers.jd
+++ b/docs/html/guide/topics/ui/controls/pickers.jd
@@ -123,15 +123,15 @@
<p>For example, here's a button that, when clicked, calls a method to show the dialog:</p>
<pre>
-<Button
- android:layout_width="wrap_content"
+<Button
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/pick_time"
+ android:text="@string/pick_time"
android:onClick="showTimePickerDialog" />
</pre>
<p>When the user clicks this button, the system calls the following method:</p>
-
+
<pre>
public void showTimePickerDialog(View v) {
DialogFragment newFragment = new TimePickerFragment();
@@ -224,15 +224,15 @@
<p>For example, here's a button that, when clicked, calls a method to show the dialog:</p>
<pre>
-<Button
- android:layout_width="wrap_content"
+<Button
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/pick_date"
+ android:text="@string/pick_date"
android:onClick="showDatePickerDialog" />
</pre>
<p>When the user clicks this button, the system calls the following method:</p>
-
+
<pre>
public void showDatePickerDialog(View v) {
DialogFragment newFragment = new DatePickerFragment();
diff --git a/docs/html/guide/topics/ui/controls/radiobutton.jd b/docs/html/guide/topics/ui/controls/radiobutton.jd
index b2556e19..e1441d3 100644
--- a/docs/html/guide/topics/ui/controls/radiobutton.jd
+++ b/docs/html/guide/topics/ui/controls/radiobutton.jd
@@ -72,7 +72,7 @@
public void onRadioButtonClicked(View view) {
// Is the button now checked?
boolean checked = ((RadioButton) view).isChecked();
-
+
// Check which radio button was clicked
switch(view.getId()) {
case R.id.radio_pirates:
diff --git a/docs/html/guide/topics/ui/controls/spinner.jd b/docs/html/guide/topics/ui/controls/spinner.jd
index 3b8aaad..00b0432 100644
--- a/docs/html/guide/topics/ui/controls/spinner.jd
+++ b/docs/html/guide/topics/ui/controls/spinner.jd
@@ -4,7 +4,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#Populate">Populate the Spinner with User Choices</a></li>
@@ -113,8 +113,8 @@
<pre>
public class SpinnerActivity extends Activity implements OnItemSelectedListener {
...
-
- public void onItemSelected(AdapterView<?> parent, View view,
+
+ public void onItemSelected(AdapterView<?> parent, View view,
int pos, long id) {
// An item was selected. You can retrieve the selected item using
// parent.getItemAtPosition(pos)
diff --git a/docs/html/guide/topics/ui/controls/text.jd b/docs/html/guide/topics/ui/controls/text.jd
index f4d72b2a..f5c2a42 100644
--- a/docs/html/guide/topics/ui/controls/text.jd
+++ b/docs/html/guide/topics/ui/controls/text.jd
@@ -4,7 +4,7 @@
<div id="qv-wrapper">
<div id="qv">
-
+
<h2>In this document</h2>
<ol>
<li><a href="#Keyboard">Specifying the Keyboard Type</a>
@@ -279,7 +279,7 @@
layout with only the text field:
<pre>
<?xml version="1.0" encoding="utf-8"?>
-<AutoCompleteTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<AutoCompleteTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/autocomplete_country"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
@@ -313,8 +313,8 @@
AutoCompleteTextView textView = (AutoCompleteTextView) findViewById(R.id.autocomplete_country);
// Get the string array
String[] countries = getResources().getStringArray(R.array.countries_array);
-// Create the adapter and set it to the AutoCompleteTextView
-ArrayAdapter<String> adapter =
+// Create the adapter and set it to the AutoCompleteTextView
+ArrayAdapter<String> adapter =
new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, countries);
textView.setAdapter(adapter);
</pre>
diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd
index b7249c5..bd3de1c 100755
--- a/docs/html/guide/topics/ui/custom-components.jd
+++ b/docs/html/guide/topics/ui/custom-components.jd
@@ -14,37 +14,37 @@
</div>
</div>
-<p>Android offers a sophisticated and powerful componentized model for building your UI,
-based on the fundamental layout classes: {@link android.view.View} and
-{@link android.view.ViewGroup}. To start with, the platform includes a variety of prebuilt
-View and ViewGroup subclasses — called widgets and layouts, respectively —
+<p>Android offers a sophisticated and powerful componentized model for building your UI,
+based on the fundamental layout classes: {@link android.view.View} and
+{@link android.view.ViewGroup}. To start with, the platform includes a variety of prebuilt
+View and ViewGroup subclasses — called widgets and layouts, respectively —
that you can use to construct your UI.</p>
-<p>A partial list of available widgets includes {@link android.widget.Button Button},
-{@link android.widget.TextView TextView},
-{@link android.widget.EditText EditText},
+<p>A partial list of available widgets includes {@link android.widget.Button Button},
+{@link android.widget.TextView TextView},
+{@link android.widget.EditText EditText},
{@link android.widget.ListView ListView},
-{@link android.widget.CheckBox CheckBox},
-{@link android.widget.RadioButton RadioButton},
-{@link android.widget.Gallery Gallery},
-{@link android.widget.Spinner Spinner}, and the more special-purpose
-{@link android.widget.AutoCompleteTextView AutoCompleteTextView},
+{@link android.widget.CheckBox CheckBox},
+{@link android.widget.RadioButton RadioButton},
+{@link android.widget.Gallery Gallery},
+{@link android.widget.Spinner Spinner}, and the more special-purpose
+{@link android.widget.AutoCompleteTextView AutoCompleteTextView},
{@link android.widget.ImageSwitcher ImageSwitcher}, and
{@link android.widget.TextSwitcher TextSwitcher}. </p>
-<p>Among the layouts available are {@link android.widget.LinearLayout LinearLayout},
-{@link android.widget.FrameLayout FrameLayout}, {@link android.widget.RelativeLayout RelativeLayout},
+<p>Among the layouts available are {@link android.widget.LinearLayout LinearLayout},
+{@link android.widget.FrameLayout FrameLayout}, {@link android.widget.RelativeLayout RelativeLayout},
and others. For more examples, see <a href="layout-objects.html">Common Layout Objects</a>.</p>
-<p>If none of the prebuilt widgets or layouts meets your needs, you can create your own View subclass.
-If you only need to make small adjustments to an existing widget or layout, you can simply subclass
+<p>If none of the prebuilt widgets or layouts meets your needs, you can create your own View subclass.
+If you only need to make small adjustments to an existing widget or layout, you can simply subclass
the widget or layout and override its methods.
</p>
-<p>Creating your own View subclasses gives you precise control over the appearance and function
-of a screen element. To give an idea of the control you get with custom views, here are some
+<p>Creating your own View subclasses gives you precise control over the appearance and function
+of a screen element. To give an idea of the control you get with custom views, here are some
examples of what you could do with them:</p>
-
+
<ul>
<li>
You could create a completely custom-rendered View type, for example a "volume
@@ -60,7 +60,7 @@
</li>
<li>
You could override the way that an EditText component is rendered on the screen
- (the <a href="{@docRoot}resources/samples/NotePad/index.html">Notepad Tutorial</a> uses this to good effect,
+ (the <a href="{@docRoot}resources/samples/NotePad/index.html">Notepad Tutorial</a> uses this to good effect,
to create a lined-notepad page).
</li>
<li>
@@ -69,7 +69,7 @@
</li>
</ul>
<p>
-The sections below explain how to create custom Views and use them in your application.
+The sections below explain how to create custom Views and use them in your application.
For detailed reference information, see the {@link android.view.View} class. </p>
@@ -77,26 +77,26 @@
<p>Here is a high level overview of what you need to know to get started in creating your own
View components:</p>
-
+
<ol>
<li>
- Extend an existing {@link android.view.View View} class or subclass
+ Extend an existing {@link android.view.View View} class or subclass
with your own class.
</li>
<li>
- Override some of the methods from the superclass. The superclass methods
+ Override some of the methods from the superclass. The superclass methods
to override start with '<code>on</code>', for
- example, {@link android.view.View#onDraw onDraw()},
- {@link android.view.View#onMeasure onMeasure()}, and
+ example, {@link android.view.View#onDraw onDraw()},
+ {@link android.view.View#onMeasure onMeasure()}, and
{@link android.view.View#onKeyDown onKeyDown()}.
- This is similar to the <code>on...</code> events in {@link android.app.Activity Activity}
+ This is similar to the <code>on...</code> events in {@link android.app.Activity Activity}
or {@link android.app.ListActivity ListActivity}
that you override for lifecycle and other functionality hooks.
<li>
- Use your new extension class. Once completed, your new extension class
+ Use your new extension class. Once completed, your new extension class
can be used in place of the view upon which it was based.
</li>
-</ol>
+</ol>
<p class="note"><strong>Tip:</strong>
Extension classes can be defined as inner classes inside the activities
that use them. This is useful because it controls access to them but
@@ -119,7 +119,7 @@
screen, and the available processing power (remember that ultimately your
application might have to run on something with significantly less power
than your desktop workstation).</p>
-<p>To create a fully customized component:</p>
+<p>To create a fully customized component:</p>
<ol>
<li>
The most generic view you can extend is, unsurprisingly, {@link
@@ -170,11 +170,11 @@
(which are passed in to the <code>onMeasure()</code> method) and by the
requirement to call the <code>setMeasuredDimension()</code> method with the
measured width and height once they have been calculated. If you fail to
-call this method from an overridden <code>onMeasure()</code> method, the
+call this method from an overridden <code>onMeasure()</code> method, the
result will be an exception at measurement time.</p>
-<p>At a high level, implementing <code>onMeasure()</code> looks something
+<p>At a high level, implementing <code>onMeasure()</code> looks something
like this:</p>
-
+
<ol>
<li>
The overridden <code>onMeasure()</code> method is called with width and
@@ -193,7 +193,7 @@
measurement width and height which will be required to render the
component. It should try to stay within the specifications passed in,
although it can choose to exceed them (in this case, the parent can
- choose what to do, including clipping, scrolling, throwing an exception,
+ choose what to do, including clipping, scrolling, throwing an exception,
or asking the <code>onMeasure()</code> to try again, perhaps with
different measurement specifications).
</li>
@@ -212,7 +212,7 @@
<thead>
<tr><th>Category</th> <th>Methods</th> <th>Description</th></tr>
</thead>
-
+
<tbody>
<tr>
<td rowspan="2">Creation</td>
@@ -228,7 +228,7 @@
<td>Called after a view and all of its children has been inflated
from XML.</td>
</tr>
-
+
<tr>
<td rowspan="3">Layout</td>
<td><code>{@link android.view.View#onMeasure}</code></td>
@@ -247,14 +247,14 @@
<td>Called when the size of this view has changed.
</td>
</tr>
-
+
<tr>
<td>Drawing</td>
<td><code>{@link android.view.View#onDraw}</code></td>
<td>Called when the view should render its content.
</td>
</tr>
-
+
<tr>
<td rowspan="4">Event processing</td>
<td><code>{@link android.view.View#onKeyDown}</code></td>
@@ -265,58 +265,58 @@
<td><code>{@link android.view.View#onKeyUp}</code></td>
<td>Called when a key up event occurs.
</td>
- </tr>
+ </tr>
<tr>
<td><code>{@link android.view.View#onTrackballEvent}</code></td>
<td>Called when a trackball motion event occurs.
</td>
- </tr>
+ </tr>
<tr>
<td><code>{@link android.view.View#onTouchEvent}</code></td>
<td>Called when a touch screen motion event occurs.
</td>
- </tr>
-
+ </tr>
+
<tr>
<td rowspan="2">Focus</td>
<td><code>{@link android.view.View#onFocusChanged}</code></td>
<td>Called when the view gains or loses focus.
</td>
</tr>
-
+
<tr>
<td><code>{@link android.view.View#onWindowFocusChanged}</code></td>
<td>Called when the window containing the view gains or loses focus.
</td>
</tr>
-
+
<tr>
<td rowspan="3">Attaching</td>
<td><code>{@link android.view.View#onAttachedToWindow()}</code></td>
<td>Called when the view is attached to a window.
</td>
</tr>
-
+
<tr>
<td><code>{@link android.view.View#onDetachedFromWindow}</code></td>
<td>Called when the view is detached from its window.
</td>
- </tr>
-
+ </tr>
+
<tr>
<td><code>{@link android.view.View#onWindowVisibilityChanged}</code></td>
<td>Called when the visibility of the window containing the view
has changed.
</td>
- </tr>
+ </tr>
</tbody>
-
+
</table>
<h3 id="customexample">A Custom View Example</h3>
-<p>The CustomView sample in the
+<p>The CustomView sample in the
<a href="{@docRoot}resources/samples/ApiDemos/index.html">API Demos</a> provides an example
of a customized View. The custom View is defined in the
<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/LabelView.html">LabelView</a>
@@ -359,9 +359,9 @@
something from the list, it populates the EditText field, but the user can
also type something directly into the EditText if they prefer.</p>
<p>In Android, there are actually two other Views readily available to do
-this: {@link android.widget.Spinner Spinner} and
-{@link android.widget.AutoCompleteTextView AutoCompleteTextView}, but
-regardless, the concept of a Combo Box makes an easy-to-understand
+this: {@link android.widget.Spinner Spinner} and
+{@link android.widget.AutoCompleteTextView AutoCompleteTextView}, but
+regardless, the concept of a Combo Box makes an easy-to-understand
example.</p>
<p>To create a compound component:</p>
<ol>
@@ -397,7 +397,7 @@
<li>
In the case of extending a Layout, you don't need to override the
<code>onDraw()</code> and <code>onMeasure()</code> methods since the
- layout will have default behavior that will likely work just fine. However,
+ layout will have default behavior that will likely work just fine. However,
you can still override them if you need to.
</li>
<li>
@@ -409,7 +409,7 @@
<p>
To summarize, the use of a Layout as the basis for a Custom Control has a
number of advantages, including:</p>
-
+
<ul>
<li>
You can specify the layout using the declarative XML files just like
@@ -433,7 +433,7 @@
SpeechView which extends LinearLayout to make a component for displaying
Speech quotes. The corresponding classes in the sample code are
<code>List4.java</code> and <code>List6.java</code>.</p>
-
+
<h2 id="modifying">Modifying an Existing View Type</h2>
@@ -450,7 +450,7 @@
them is extending an EditText View to make a lined notepad. This is not a
perfect example, and the APIs for doing this might change from this early
preview, but it does demonstrate the principles.</p>
-<p>If you haven't done so already, import the
+<p>If you haven't done so already, import the
NotePad sample into Android Studio (or
just look at the source using the link provided). In particular look at the definition of
<code>MyEditText</code> in the <a
@@ -462,7 +462,7 @@
<strong>The Definition</strong>
<p>The class is defined with the following line:<br/>
<code>public static class MyEditText extends EditText</code></p>
-
+
<ul>
<li>
It is defined as an inner class within the <code>NoteEditor</code>
@@ -488,7 +488,7 @@
</li>
<li>
<strong>Class Initialization</strong>
- <p>As always, the super is called first. Furthermore,
+ <p>As always, the super is called first. Furthermore,
this is not a default constructor, but a parameterized one. The
EditText is created with these parameters when it is inflated from an
XML layout file, thus, our constructor needs to both take them and pass them
@@ -496,7 +496,7 @@
</li>
<li>
<strong>Overridden Methods</strong>
- <p>In this example, there is only one method to be overridden:
+ <p>In this example, there is only one method to be overridden:
<code>onDraw()</code> — but there could easily be others needed when you
create your own custom components.</p>
<p>For the NotePad sample, overriding the <code>onDraw()</code> method allows
@@ -513,7 +513,7 @@
<code>res/layout</code> folder.</p>
<pre>
<view
- class="com.android.notepad.NoteEditor$MyEditText"
+ class="com.android.notepad.NoteEditor$MyEditText"
id="@+id/note"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -522,7 +522,7 @@
android:scrollbars="vertical"
android:fadingEdge="vertical" />
</pre>
-
+
<ul>
<li>
The custom component is created as a generic view in the XML, and
@@ -531,7 +531,7 @@
<code>NoteEditor$MyEditText</code> notation which is a standard way to
refer to inner classes in the Java programming language.
<p>If your custom View component is not defined as an inner class, then you can,
- alternatively, declare the View component
+ alternatively, declare the View component
with the XML element name, and exclude the <code>class</code> attribute. For example:</p>
<pre>
<com.android.notepad.MyEditText
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
index bf0db57..ecdcfdc 100755
--- a/docs/html/guide/topics/ui/declaring-layout.jd
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -423,7 +423,7 @@
<li>The string array</li>
</ul>
<p>Then simply call
-{@link android.widget.ListView#setAdapter setAdapter()} on your {@link android.widget.ListView}:</p>
+{@link android.widget.AdapterView#setAdapter setAdapter()} on your {@link android.widget.ListView}:</p>
<pre>
ListView listView = (ListView) findViewById(R.id.listview);
listView.setAdapter(adapter);
diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd
index e4469ea..52cd1a0 100644
--- a/docs/html/guide/topics/ui/dialogs.jd
+++ b/docs/html/guide/topics/ui/dialogs.jd
@@ -32,7 +32,7 @@
<li>{@link android.app.DialogFragment}</li>
<li>{@link android.app.AlertDialog}</li>
</ol>
-
+
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}design/building-blocks/dialogs.html">Dialogs design guide</a></li>
@@ -238,8 +238,8 @@
</pre>
<p>The <code>set...Button()</code> methods require a title for the button (supplied
-by a <a href="{@docRoot}guide/topics/resources/string-resource.html">string resource</a>) and a
-{@link android.content.DialogInterface.OnClickListener} that defines the action to take
+by a <a href="{@docRoot}guide/topics/resources/string-resource.html">string resource</a>) and a
+{@link android.content.DialogInterface.OnClickListener} that defines the action to take
when the user presses the button.</p>
<p>There are three different action buttons you can add:</p>
@@ -251,7 +251,7 @@
<dt>Neutral</dt>
<dd>You should use this when the user may not want to proceed with the action,
but doesn't necessarily want to cancel. It appears between the positive and negative
- buttons. For example, the action might be "Remind me later."</dd>
+ buttons. For example, the action might be "Remind me later."</dd>
</dl>
<p>You can add only one of each button type to an {@link
@@ -274,7 +274,7 @@
<li>A persistent multiple-choice list (checkboxes)</li>
</ul>
-<p>To create a single-choice list like the one in figure 3,
+<p>To create a single-choice list like the one in figure 3,
use the {@link android.app.AlertDialog.Builder#setItems setItems()} method:</p>
<pre style="clear:right">
@@ -294,7 +294,7 @@
<p>Because the list appears in the dialog's content area,
the dialog cannot show both a message and a list and you should set a title for the
-dialog with {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
+dialog with {@link android.app.AlertDialog.Builder#setTitle setTitle()}.
To specify the items for the list, call {@link
android.app.AlertDialog.Builder#setItems setItems()}, passing an array.
Alternatively, you can specify a list using {@link
@@ -320,11 +320,11 @@
<h4 id="Checkboxes">Adding a persistent multiple-choice or single-choice list</h4>
-<p>To add a list of multiple-choice items (checkboxes) or
+<p>To add a list of multiple-choice items (checkboxes) or
single-choice items (radio buttons), use the
{@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String,
-DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} or
-{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} or
+{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} methods, respectively.</p>
<p>For example, here's how you can create a multiple-choice list like the
@@ -349,7 +349,7 @@
// If the user checked the item, add it to the selected items
mSelectedItems.add(which);
} else if (mSelectedItems.contains(which)) {
- // Else, if the item is already in the array, remove it
+ // Else, if the item is already in the array, remove it
mSelectedItems.remove(Integer.valueOf(which));
}
}
@@ -376,7 +376,7 @@
<p>Although both a traditional list and a list with radio buttons
provide a "single choice" action, you should use {@link
-android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
+android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener)
setSingleChoiceItems()} if you want to persist the user's choice.
That is, if opening the dialog again later should indicate what the user's current choice is,
then you create a list with radio buttons.</p>
@@ -445,7 +445,7 @@
a matching font style.</p>
<p>To inflate the layout in your {@link android.support.v4.app.DialogFragment},
-get a {@link android.view.LayoutInflater} with
+get a {@link android.view.LayoutInflater} with
{@link android.app.Activity#getLayoutInflater()} and call
{@link android.view.LayoutInflater#inflate inflate()}, where the first parameter
is the layout resource ID and the second parameter is a parent view for the layout.
@@ -473,7 +473,7 @@
public void onClick(DialogInterface dialog, int id) {
LoginDialogFragment.this.getDialog().cancel();
}
- });
+ });
return builder.create();
}
</pre>
@@ -508,7 +508,7 @@
<pre>
public class NoticeDialogFragment extends DialogFragment {
-
+
/* The activity that creates an instance of this dialog fragment must
* implement this interface in order to receive event callbacks.
* Each method passes the DialogFragment in case the host needs to query it. */
@@ -516,10 +516,10 @@
public void onDialogPositiveClick(DialogFragment dialog);
public void onDialogNegativeClick(DialogFragment dialog);
}
-
+
// Use this instance of the interface to deliver action events
NoticeDialogListener mListener;
-
+
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Activity activity) {
@@ -546,7 +546,7 @@
public class MainActivity extends FragmentActivity
implements NoticeDialogFragment.NoticeDialogListener{
...
-
+
public void showNoticeDialog() {
// Create an instance of the dialog fragment and show it
DialogFragment dialog = new NoticeDialogFragment();
@@ -643,7 +643,7 @@
or other {@link android.app.Dialog} objects to build the dialog in this case. If
you want the {@link android.support.v4.app.DialogFragment} to be
embeddable, you must define the dialog's UI in a layout, then load the layout in the
-{@link android.support.v4.app.DialogFragment#onCreateView
+{@link android.support.v4.app.Fragment#onCreateView
onCreateView()} callback.</p>
<p>Here's an example {@link android.support.v4.app.DialogFragment} that can appear as either a
@@ -659,7 +659,7 @@
// Inflate the layout to use as dialog or embedded fragment
return inflater.inflate(R.layout.purchase_items, container, false);
}
-
+
/** The system calls this only when creating the layout in a dialog. */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -681,7 +681,7 @@
public void showDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
CustomDialogFragment newFragment = new CustomDialogFragment();
-
+
if (mIsLargeLayout) {
// The device is using a large layout, so show the fragment as a dialog
newFragment.show(fragmentManager, "dialog");
@@ -781,7 +781,7 @@
android.support.v4.app.DialogFragment}.</p>
<p>You can also <em>cancel</em> a dialog. This is a special event that indicates the user
-explicitly left the dialog without completing the task. This occurs if the user presses the
+explicitly left the dialog without completing the task. This occurs if the user presses the
<em>Back</em> button, touches the screen outside the dialog area,
or if you explicitly call {@link android.app.Dialog#cancel()} on the {@link
android.app.Dialog} (such as in response to a "Cancel" button in the dialog).</p>
diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd
index 4eb54f2..8871c87 100644
--- a/docs/html/guide/topics/ui/drag-drop.jd
+++ b/docs/html/guide/topics/ui/drag-drop.jd
@@ -978,7 +978,7 @@
Log.e("DragDrop Example","Unknown action type received by OnDragListener.");
break;
}
-
+
return false;
}
};
diff --git a/docs/html/guide/topics/ui/how-android-draws.jd b/docs/html/guide/topics/ui/how-android-draws.jd
index 168f77b..7956369 100644
--- a/docs/html/guide/topics/ui/how-android-draws.jd
+++ b/docs/html/guide/topics/ui/how-android-draws.jd
@@ -4,18 +4,18 @@
@jd:body
-<p>When an {@link android.app.Activity} receives focus, it will be requested to
+<p>When an {@link android.app.Activity} receives focus, it will be requested to
draw its layout.
-The Android framework will handle the procedure for drawing, but the
+The Android framework will handle the procedure for drawing, but the
{@link android.app.Activity} must provide
the root node of its layout hierarchy.</p>
-<p>Drawing begins with the root node of the layout. It is requested to measure and
-draw the layout tree. Drawing is handled by walking the tree and rendering each
-{@link android.view.View} that intersects the invalid region. In turn, each
+<p>Drawing begins with the root node of the layout. It is requested to measure and
+draw the layout tree. Drawing is handled by walking the tree and rendering each
+{@link android.view.View} that intersects the invalid region. In turn, each
{@link android.view.ViewGroup} is responsible for requesting
-each of its children to be drawn
-(with the {@link android.view.View#draw(Canvas) draw()} method)
+each of its children to be drawn
+(with the {@link android.view.View#draw(Canvas) draw()} method)
and each {@link android.view.View} is responsible for drawing itself.
Because the tree is traversed in-order,
this means that parents will be drawn before (i.e., behind) their children, with
@@ -24,55 +24,55 @@
<div class="sidebox-wrapper">
<div class="sidebox">
- <p>The framework will not draw {@link android.view.View} objects that are not
-in the invalid region, and also
+ <p>The framework will not draw {@link android.view.View} objects that are not
+in the invalid region, and also
will take care of drawing the {@link android.view.View} background for you.</p>
- <p>You can force a {@link android.view.View} to draw, by calling
+ <p>You can force a {@link android.view.View} to draw, by calling
{@link android.view.View#invalidate()}.
</p>
</div>
</div>
<p>
- Drawing the layout is a two pass process: a measure pass and a layout pass.
-The measuring pass is implemented in {@link android.view.View#measure(int, int)}
-and is a top-down traversal of the {@link android.view.View} tree. Each {@link android.view.View}
+ Drawing the layout is a two pass process: a measure pass and a layout pass.
+The measuring pass is implemented in {@link android.view.View#measure(int, int)}
+and is a top-down traversal of the {@link android.view.View} tree. Each {@link android.view.View}
pushes dimension specifications down the tree
- during the recursion. At the end of the measure pass, every
+ during the recursion. At the end of the measure pass, every
{@link android.view.View} has stored
its measurements. The second pass happens in
{@link android.view.View#layout(int,int,int,int)} and is also top-down. During
this pass each parent is responsible for positioning all of its children
using the sizes computed in the measure pass.
</p>
-
+
<p>
- When a {@link android.view.View} object's
-{@link android.view.View#measure(int, int) measure()} method
+ When a {@link android.view.View} object's
+{@link android.view.View#measure(int, int) measure()} method
returns, its {@link android.view.View#getMeasuredWidth()} and
- {@link android.view.View#getMeasuredHeight()} values must be set, along
- with those for all of that {@link android.view.View} object's descendants.
-A {@link android.view.View} object's measured width and
-measured height values must respect the constraints imposed by the
+ {@link android.view.View#getMeasuredHeight()} values must be set, along
+ with those for all of that {@link android.view.View} object's descendants.
+A {@link android.view.View} object's measured width and
+measured height values must respect the constraints imposed by the
{@link android.view.View} object's parents. This guarantees
that at the end of the measure pass, all parents accept all of their
- children's measurements. A parent {@link android.view.View} may call
+ children's measurements. A parent {@link android.view.View} may call
{@link android.view.View#measure(int, int) measure()} more than once on
its children. For example, the parent may measure each child once with
unspecified dimensions to find out how big they want to be, then call
- {@link android.view.View#measure(int, int) measure()} on them again with
+ {@link android.view.View#measure(int, int) measure()} on them again with
actual numbers if the sum of all the children's
- unconstrained sizes is too big or too small (that is, if the children
+ unconstrained sizes is too big or too small (that is, if the children
don't agree among themselves
- as to how much space they each get, the parent will intervene and set
+ as to how much space they each get, the parent will intervene and set
the rules on the second pass).
</p>
-
+
<div class="sidebox-wrapper">
<div class="sidebox"><p>
- To initiate a layout, call {@link android.view.View#requestLayout}.
+ To initiate a layout, call {@link android.view.View#requestLayout}.
This method is typically
- called by a {@link android.view.View} on itself
+ called by a {@link android.view.View} on itself
when it believes that is can no longer fit within
its current bounds.</p>
</div>
@@ -80,54 +80,54 @@
<p>
The measure pass uses two classes to communicate dimensions. The
- {@link android.view.ViewGroup.LayoutParams} class is used by
+ {@link android.view.ViewGroup.LayoutParams} class is used by
{@link android.view.View} objects to tell their parents how they
- want to be measured and positioned. The base
+ want to be measured and positioned. The base
{@link android.view.ViewGroup.LayoutParams} class just
- describes how big the {@link android.view.View} wants to be for both
+ describes how big the {@link android.view.View} wants to be for both
width and height. For each
dimension, it can specify one of:</p>
<ul>
<li> an exact number
- <li>{@link android.view.ViewGroup.LayoutParams#MATCH_PARENT MATCH_PARENT},
+ <li>{@link android.view.ViewGroup.LayoutParams#MATCH_PARENT MATCH_PARENT},
which means the {@link android.view.View} wants to be as big as its parent
(minus padding)</li>
- <li>{@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT WRAP_CONTENT},
+ <li>{@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT WRAP_CONTENT},
which means that the {@link android.view.View} wants to be just big enough to
enclose its content (plus padding).</li>
</ul>
- <p>There are subclasses of {@link android.view.ViewGroup.LayoutParams} for
+ <p>There are subclasses of {@link android.view.ViewGroup.LayoutParams} for
different subclasses of {@link android.view.ViewGroup}.
- For example, {@link android.widget.RelativeLayout} has its own subclass of
+ For example, {@link android.widget.RelativeLayout} has its own subclass of
{@link android.view.ViewGroup.LayoutParams}, which includes
- the ability to center child {@link android.view.View} objects
+ the ability to center child {@link android.view.View} objects
horizontally and vertically.
</p>
-
+
<p>
- {@link android.view.View.MeasureSpec MeasureSpec} objects are used to push
+ {@link android.view.View.MeasureSpec MeasureSpec} objects are used to push
requirements down the tree from parent to
- child. A {@link android.view.View.MeasureSpec MeasureSpec} can be in one of
+ child. A {@link android.view.View.MeasureSpec MeasureSpec} can be in one of
three modes:</p>
<ul>
- <li>{@link android.view.View.MeasureSpec#UNSPECIFIED UNSPECIFIED}: This is
+ <li>{@link android.view.View.MeasureSpec#UNSPECIFIED UNSPECIFIED}: This is
used by a parent to determine the desired dimension
- of a child {@link android.view.View}. For example, a
-{@link android.widget.LinearLayout} may call
+ of a child {@link android.view.View}. For example, a
+{@link android.widget.LinearLayout} may call
{@link android.view.View#measure(int, int) measure()} on its child
- with the height set to {@link android.view.View.MeasureSpec#UNSPECIFIED UNSPECIFIED}
-and a width of {@link android.view.View.MeasureSpec#EXACTLY EXACTLY} 240 to
-find out how tall the child {@link android.view.View} wants to be given a
+ with the height set to {@link android.view.View.MeasureSpec#UNSPECIFIED UNSPECIFIED}
+and a width of {@link android.view.View.MeasureSpec#EXACTLY EXACTLY} 240 to
+find out how tall the child {@link android.view.View} wants to be given a
width of 240 pixels.</li>
- <li>{@link android.view.View.MeasureSpec#EXACTLY EXACTLY}: This is used
+ <li>{@link android.view.View.MeasureSpec#EXACTLY EXACTLY}: This is used
by the parent to impose an exact size on the
child. The child must use this size, and guarantee that all of its
descendants will fit within this size.</li>
- <li>{@link android.view.View.MeasureSpec#AT_MOST AT MOST}: This is used by
+ <li>{@link android.view.View.MeasureSpec#AT_MOST AT MOST}: This is used by
the parent to impose a maximum size on the
child. The child must guarantee that it and all of its descendants will fit
within this size.</li>
</ul>
-
+
diff --git a/docs/html/guide/topics/ui/index.jd b/docs/html/guide/topics/ui/index.jd
index 0725eb7..7dbc015 100644
--- a/docs/html/guide/topics/ui/index.jd
+++ b/docs/html/guide/topics/ui/index.jd
@@ -1,6 +1,6 @@
page.title=User Interface
page.landing=true
-page.landing.intro=Your app's user interface is everything that the user can see and interact with. Android provides a variety of pre-built UI components such as structured layout objects and UI controls that allow you to build the graphical user interface for your app. Android also provides other UI modules for special interfaces such as dialogs, notifications, and menus.
+page.landing.intro=Your app's user interface is everything that the user can see and interact with. Android provides a variety of pre-built UI components such as structured layout objects and UI controls that allow you to build the graphical user interface for your app. Android also provides other UI modules for special interfaces such as dialogs, notifications, and menus.
page.landing.image=images/ui/ui_index.png
page.landing.next=overview.html
@@ -13,7 +13,7 @@
<a href="http://android-developers.blogspot.com/2012/01/say-goodbye-to-menu-button.html">
<h4>Say Goodbye to the Menu Button</h4>
- <p>As Ice Cream Sandwich rolls out to more devices, it’s important that you begin to migrate
+ <p>As Ice Cream Sandwich rolls out to more devices, it's important that you begin to migrate
your designs to the action bar in order to promote a consistent Android user experience.</p> </a>
<a href="http://android-developers.blogspot.com/2011/11/new-layout-widgets-space-and-gridlayout.html">
@@ -29,7 +29,7 @@
<a href="http://android-developers.blogspot.com/2011/08/horizontal-view-swiping-with-viewpager.html">
<h4>Horizontal View Swiping with ViewPager</h4>
<p>Whether you have just started out in Android app development or are a veteran of the craft,
-it probably won’t be too long before you’ll need to implement horizontally scrolling sets of views.
+it probably won't be too long before you'll need to implement horizontally scrolling sets of views.
</p> </a>
</div>
diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd
index 3474f48..31f9b9c 100644
--- a/docs/html/guide/topics/ui/layout/grid.jd
+++ b/docs/html/guide/topics/ui/layout/grid.jd
@@ -32,7 +32,7 @@
Each row has zero or more cells, each of which is defined by any kind of other View. So, the cells of a row may be
composed of a variety of View objects, like ImageView or TextView objects.
A cell may also be a ViewGroup object (for example, you can nest another TableLayout as a cell).</p>
-<p>The following sample layout has two rows and two cells in each. The accompanying screenshot shows the
+<p>The following sample layout has two rows and two cells in each. The accompanying screenshot shows the
result, with cell borders displayed as dotted lines (added for visual effect). </p>
<table class="columns">
@@ -71,7 +71,7 @@
<p>Columns can be hidden, marked to stretch and fill the available screen space,
or can be marked as shrinkable to force the column to shrink until the table
- fits the screen. See the {@link android.widget.TableLayout TableLayout reference}
+ fits the screen. See the {@link android.widget.TableLayout TableLayout reference}
documentation for more details. </p>
diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd
index 13467ae..4ed6ff5 100644
--- a/docs/html/guide/topics/ui/layout/gridview.jd
+++ b/docs/html/guide/topics/ui/layout/gridview.jd
@@ -81,7 +81,7 @@
<p>After the {@code main.xml} layout is set for the content view, the
{@link android.widget.GridView} is captured from the layout with {@link
android.app.Activity#findViewById(int)}. The {@link
-android.widget.GridView#setAdapter(T) setAdapter()} method then sets a custom adapter ({@code
+android.widget.AdapterView#setAdapter(T) setAdapter()} method then sets a custom adapter ({@code
ImageAdapter}) as the source for all items to be displayed in the grid. The {@code ImageAdapter} is
created in the next step.</p>
<p>To do something when an item in the grid is clicked, the {@link
@@ -170,7 +170,7 @@
image is resized and cropped to fit in these dimensions, as appropriate.</li>
<li>{@link android.widget.ImageView#setScaleType(ImageView.ScaleType)} declares that images should
be cropped toward the center (if necessary).</li>
- <li>{@link android.widget.ImageView#setPadding(int,int,int,int)} defines the padding for all
+ <li>{@link android.view.View#setPadding(int,int,int,int)} defines the padding for all
sides. (Note that, if the images have different aspect-ratios, then less
padding will cause more cropping of the image if it does not match
the dimensions given to the ImageView.)</li>
diff --git a/docs/html/guide/topics/ui/layout/linear.jd b/docs/html/guide/topics/ui/layout/linear.jd
index 7441782..4224d17 100644
--- a/docs/html/guide/topics/ui/layout/linear.jd
+++ b/docs/html/guide/topics/ui/layout/linear.jd
@@ -59,7 +59,7 @@
>{@code android:layout_weight}</a> attribute.
This attribute assigns an "importance" value to a view in
terms of how much space it should occupy on the screen. A larger weight value allows it to expand
-to fill any remaining space in the parent view.
+to fill any remaining space in the parent view.
Child views can specify a weight value, and then any remaining space in the view group is
assigned to children in the proportion of their declared weight. Default
weight is zero.</p>
diff --git a/docs/html/guide/topics/ui/layout/listview.jd b/docs/html/guide/topics/ui/layout/listview.jd
index 3c6e32c..e6e5578 100644
--- a/docs/html/guide/topics/ui/layout/listview.jd
+++ b/docs/html/guide/topics/ui/layout/listview.jd
@@ -80,7 +80,7 @@
ContactsContract.Data.DISPLAY_NAME};
// This is the select criteria
- static final String SELECTION = "((" +
+ static final String SELECTION = "((" +
ContactsContract.Data.DISPLAY_NAME + " NOTNULL) AND (" +
ContactsContract.Data.DISPLAY_NAME + " != '' ))";
@@ -105,7 +105,7 @@
// Create an empty adapter we will use to display the loaded data.
// We pass null for the cursor, then update it in onLoadFinished()
- mAdapter = new SimpleCursorAdapter(this,
+ mAdapter = new SimpleCursorAdapter(this,
android.R.layout.simple_list_item_1, null,
fromColumns, toViews, 0);
setListAdapter(mAdapter);
@@ -138,7 +138,7 @@
mAdapter.swapCursor(null);
}
- @Override
+ @Override
public void onListItemClick(ListView l, View v, int position, long id) {
// Do something when a list item is clicked
}
diff --git a/docs/html/guide/topics/ui/layout/relative.jd b/docs/html/guide/topics/ui/layout/relative.jd
index ca5cb48..92735ae 100644
--- a/docs/html/guide/topics/ui/layout/relative.jd
+++ b/docs/html/guide/topics/ui/layout/relative.jd
@@ -38,7 +38,7 @@
views are drawn at the top-left of the layout, so you must define the position of each view
using the various layout properties available from {@link
android.widget.RelativeLayout.LayoutParams}.</p>
-
+
<p>Some of the many layout properties available to views in a {@link android.widget.RelativeLayout}
include:</p>
<dl>
diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd
index ad2aa9b..38f6e21 100644
--- a/docs/html/guide/topics/ui/menus.jd
+++ b/docs/html/guide/topics/ui/menus.jd
@@ -77,9 +77,9 @@
"Search," "Compose email," and "Settings."
<p>See the section about <a href="#options-menu">Creating an Options Menu</a>.</p>
</dd>
-
+
<dt><strong>Context menu and contextual action mode</strong></dt>
-
+
<dd>A context menu is a <a href="#FloatingContextMenu">floating menu</a> that appears when the
user performs a long-click on an element. It provides actions that affect the selected content or
context frame.
@@ -88,7 +88,7 @@
to select multiple items.</p>
<p>See the section about <a href="#context-menu">Creating Contextual Menus</a>.</p>
</dd>
-
+
<dt><strong>Popup menu</strong></dt>
<dd>A popup menu displays a list of items in a vertical list that's anchored to the view that
invoked the menu. It's good for providing an overflow of actions that relate to specific content or
@@ -130,9 +130,9 @@
<dt><code><item></code></dt>
<dd>Creates a {@link android.view.MenuItem}, which represents a single item in a menu. This
element may contain a nested <code><menu></code> element in order to create a submenu.</dd>
-
+
<dt><code><group></code></dt>
- <dd>An optional, invisible container for {@code <item>} elements. It allows you to
+ <dd>An optional, invisible container for {@code <item>} elements. It allows you to
categorize menu items so they share properties such as active state and visibility. For more
information, see the section about <a href="#groups">Creating Menu Groups</a>.</dd>
</dl>
@@ -172,8 +172,8 @@
For information about all the supported attributes, see the <a
href="{@docRoot}guide/topics/resources/menu-resource.html">Menu Resource</a> document.</p>
-<p>You can add a submenu to an item in any menu (except a submenu) by adding a {@code <menu>}
-element as the child of an {@code <item>}. Submenus are useful when your application has a lot
+<p>You can add a submenu to an item in any menu (except a submenu) by adding a {@code <menu>}
+element as the child of an {@code <item>}. Submenus are useful when your application has a lot
of functions that can be organized into topics, like items in a PC application's menu bar (File,
Edit, View, etc.). For example:</p>
@@ -224,13 +224,13 @@
<em>More</em>.</li>
<li>If you've developed your application for <strong>Android 3.0 (API level 11) and
-higher</strong>, items from the options menu are available in the
+higher</strong>, items from the options menu are available in the
app bar. By default, the system
places all items in the action overflow, which the user can reveal with the action overflow icon on
the right side of the app bar (or by pressing the device <em>Menu</em> button, if available). To
enable
quick access to important actions, you can promote a few items to appear in the app bar by adding
-{@code android:showAsAction="ifRoom"} to the corresponding {@code <item>} elements (see figure
+{@code android:showAsAction="ifRoom"} to the corresponding {@code <item>} elements (see figure
2). <p>For more information about action items and other app bar behaviors, see the <a
href="{@docRoot}training/appbar/index.html">Adding the App Bar</a> training class. </p>
</li>
@@ -246,7 +246,7 @@
declare items for the options menu, they are combined in the UI. The activity's items appear
first, followed by those of each fragment in the order in which each fragment is added to the
activity. If necessary, you can re-order the menu items with the {@code android:orderInCategory}
-attribute in each {@code <item>} you need to move.</p>
+attribute in each {@code <item>} you need to move.</p>
<p>To specify the options menu for an activity, override {@link
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} (fragments provide their
@@ -343,7 +343,7 @@
android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()} only to create the initial
menu state and not to make changes during the activity lifecycle.</p>
-<p>If you want to modify the options menu based on
+<p>If you want to modify the options menu based on
events that occur during the activity lifecycle, you can do so in
the {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()} method. This
method passes you the {@link android.view.Menu} object as it currently exists so you can modify it,
@@ -360,7 +360,7 @@
call {@link android.app.Activity#invalidateOptionsMenu invalidateOptionsMenu()} to request that the
system call {@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}.</p>
-<p class="note"><strong>Note:</strong>
+<p class="note"><strong>Note:</strong>
You should never change items in the options menu based on the {@link android.view.View} currently
in focus. When in touch mode (when the user is not using a trackball or d-pad), views
cannot take focus, so you should never use focus as the basis for modifying
@@ -682,7 +682,7 @@
</pre>
<p>That's it. Now when the user selects an item with a long-click, the system calls the {@link
-android.widget.AbsListView.MultiChoiceModeListener#onCreateActionMode onCreateActionMode()}
+android.view.ActionMode.Callback#onCreateActionMode onCreateActionMode()}
method and displays the contextual action bar with the specified actions. While the contextual
action bar is visible, users can select additional items.</p>
@@ -738,8 +738,8 @@
<pre>
<ImageButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_overflow_holo_dark"
android:contentDescription="@string/descr_overflow_button"
android:onClick="showPopup" />
@@ -814,7 +814,7 @@
android.view.Menu#setGroupCheckable(int,boolean,boolean) setGroupCheckable()}</li>
</ul>
-<p>You can create a group by nesting {@code <item>} elements inside a {@code <group>}
+<p>You can create a group by nesting {@code <item>} elements inside a {@code <group>}
element in your menu resource or by specifying a group ID with the {@link
android.view.Menu#add(int,int,int,int) add()} method.</p>
@@ -863,8 +863,8 @@
each time the state changes.</p>
<p>You can define the checkable behavior for individual menu items using the {@code
-android:checkable} attribute in the {@code <item>} element, or for an entire group with
-the {@code android:checkableBehavior} attribute in the {@code <group>} element. For
+android:checkable} attribute in the {@code <item>} element, or for an entire group with
+the {@code android:checkableBehavior} attribute in the {@code <group>} element. For
example, all items in this menu group are checkable with a radio button:</p>
<pre>
@@ -890,7 +890,7 @@
</dl>
<p>You can apply a default checked state to an item using the {@code android:checked} attribute in
-the {@code <item>} element and change it in code with the {@link
+the {@code <item>} element and change it in code with the {@link
android.view.MenuItem#setChecked(boolean) setChecked()} method.</p>
<p>When a checkable item is selected, the system calls your respective item-selected callback method
@@ -1023,6 +1023,6 @@
<p>Read more about writing intent filters in the
<a href="/guide/components/intents-filters.html">Intents and Intent Filters</a> document.</p>
-<p>For a sample application using this technique, see the
+<p>For a sample application using this technique, see the
<a href="{@docRoot}resources/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">Note
Pad</a> sample code.</p>
diff --git a/docs/html/guide/topics/ui/multi-window.jd b/docs/html/guide/topics/ui/multi-window.jd
new file mode 100644
index 0000000..704391f
--- /dev/null
+++ b/docs/html/guide/topics/ui/multi-window.jd
@@ -0,0 +1,606 @@
+page.title=Multi-Window Support
+page.metaDescription=New support in Android N for showing more than one app at a time.
+page.keywords="multi-window", "android N", "split screen", "free-form"
+
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#overview">Overview</a></li>
+ <li><a href="#lifecycle">Multi-Window Lifecycle</a></li>
+ <li><a href="#configuring">Configuring Your App for Multi-Window
+ Mode</a></li>
+ <li><a href="#running">Running Your App in Multi-Window Mode</a></li>
+ <li><a href="#testing">Testing Your App's Multi-Window Support</a></li>
+ </ol>
+ <h2>See Also</h2>
+ <ol>
+ <li><a href="{@docRoot}training/tv/playback/picture-in-picture.html">Adding
+ Picture-in-Picture</a></li>
+ <li><a class="external-link"
+ href="https://github.com/googlesamples/android-MultiWindowPlayground">Multi-Window
+ Playground sample app</a></li>
+ <li><a class="external-link"
+ href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64"
+ >Five Tips for Preparing for Multi-Window in Android N</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Android 7.0 adds support for displaying more than one app at the
+ same time. On handheld devices, two apps can run side-by-side or
+ one-above-the-other in <em>split-screen</em> mode. On TV devices, apps can
+ use <em>picture-in-picture</em> mode to continue video playback while users
+ are interacting with another app.
+</p>
+
+<p>
+ If your app targets Android 7.0 (API level 24) or higher, you can configure how your app
+ handles multi-window display. For example, you can specify your activity's
+ minimum allowable dimensions. You can also disable multi-window display for
+ your app, ensuring that the system only shows your app in full-screen
+ mode.
+</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>
+ Android 7.0 allows several apps to share the screen at once. For
+ example, a user could split the screen, viewing a web page on the left side
+ while composing an email on the right side. The user experience depends on
+ the device:
+</p>
+
+<ul>
+ <li>Handheld devices running Android 7.0 offer split-screen
+ mode. In this mode, the system fills the screen with two apps, showing them
+ either side-by-side or one-above-the-other. The user can drag the dividing
+ line separating the two to make one app larger and the other smaller.
+ </li>
+
+ <li>On TV devices, apps can put themselves
+ in <a href="picture-in-picture.html">picture-in-picture mode</a>, allowing
+ them to continue showing content while the user browses or interacts with
+ other apps.
+ </li>
+
+ <li>Manufacturers of larger devices can choose to enable freeform
+ mode, in which the user can freely resize each activity. If the
+ manufacturer enables this feature, the device offers freeform mode in addition
+ to split-screen mode.
+ </li>
+</ul>
+
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650"
+ srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+ {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x,"
+ id="img-split-screen" />
+<p class="img-caption">
+ <strong>Figure 1.</strong> Two apps running side-by-side in split-screen mode.
+</p>
+
+<p>
+ The user can switch into multi-window mode in the following ways:
+</p>
+
+<ul>
+ <li>If the user opens the <a href="{@docRoot}guide/components/recents.html">Overview
+ screen</a> and performs a long press on an
+ activity title, they can drag that activity to a highlighted portion of the
+ screen to put the activity in multi-window mode.
+ </li>
+
+ <li>If the user performs a long press on the Overview button, the device puts
+ the current activity in multi-window mode, and opens the Overview screen to
+ let the user choose another activity to share the screen.
+ </li>
+</ul>
+
+<p>
+ Users can <a href="{@docRoot}guide/topics/ui/drag-drop.html">drag and
+ drop</a> data from one activity to another while the activities are sharing
+ the screen.
+
+<h2 id="lifecycle">Multi-Window Lifecycle</h2>
+
+<p>
+ Multi-window mode does not change the <a href=
+ "{@docRoot}training/basics/activity-lifecycle/index.html">activity
+ lifecycle</a>.
+</p>
+
+<p>
+ In multi-window mode, only the activity the user has most recently interacted
+ with is active at a given time. This activity is considered <em>topmost</em>.
+ All other activities are in the paused state, even if they are visible.
+ However, the system gives these paused-but-visible activities higher priority
+ than activities that are not visible. If the user interacts with one of the
+ paused activities, that activity is resumed, and the previously topmost
+ activity is paused.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> In multi-window mode, an app can be in the paused
+ state and still be visible to the user. An app might need to continue its
+ activities even while paused. For example, a video-playing app that is in
+ paused mode but is visible should continue showing its video. For this
+ reason, we recommend that activities that play video <em>not</em> pause the
+ video in their {@link android.app.Activity#onPause onPause()} handlers.
+ Instead, they should pause video in {@link android.app.Activity#onStop
+ onStop()}, and resume playback in {@link android.app.Activity#onStart
+ onStart()}.
+</p>
+
+<p>
+ When the user puts an app into multi-window mode, the system notifies the
+ activity of a configuration change, as specified in <a href=
+ "{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime
+ Changes</a>. This also happens when the user resizes the app, or puts the app
+ back into full-screen mode.
+ Essentially, this change has the same activity-lifecycle
+ implications as when the system notifies the app that the device has switched
+ from portrait to landscape mode, except that the device dimensions are
+ changed instead of just being swapped. As discussed in <a href=
+ "{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime
+ Changes</a>, your activity can handle the configuration change itself, or it
+ can allow the system to destroy the activity and recreate it with the new
+ dimensions.
+</p>
+
+<p>
+ If the user is resizing a window and makes it larger in either dimension, the
+ system resizes the activity to match the user action and issues <a href=
+ "{@docRoot}guide/topics/resources/runtime-changes.html">runtime changes</a>
+ as needed. If the app lags behind in drawing in newly-exposed areas, the
+ system temporarily fills those areas with the color specified by the {@link
+ android.R.attr#windowBackground windowBackground} attribute or by the default
+ <code>windowBackgroundFallback</code> style attribute.
+</p>
+
+<h2 id="configuring">Configuring Your App for Multi-Window Mode</h2>
+
+<p>
+ If your app targets API level 24 or higher, you can configure how and
+ whether your app's activities support multi-window display. You can set
+ attributes in your manifest to control both size and layout.
+ A root activity's attribute settings apply to all activities
+ within its task stack. For example, if the root activity has
+ <code>android:resizeableActivity</code> set to true, then all activities
+ in the task stack are resizeable.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> If you build a multi-orientation app that targets API
+ level 23 or lower, and the user uses the app in
+ multi-window mode, the system forcibly resizes the app. The system presents a
+ dialog box warning the user that the app may behave unexpectedly. The system
+ does <em>not</em> resize fixed-orientation apps; if
+ the user attempts to open a fixed-orientation app under multi-window mode,
+ the app takes over the whole screen.
+</p>
+
+<h4 id="resizeableActivity">android:resizeableActivity</h4>
+
+<p>
+ Set this attribute in your manifest's <a href=
+ "{@docRoot}guide/topics/manifest/activity-element"><code><activity></code></a>
+ or <a href=
+ "{@docRoot}guide/topics/manifest/application-element"><code><application></code></a>
+ element to enable or disable multi-window display:
+</p>
+
+<pre>
+android:resizeableActivity=["true" | "false"]
+</pre>
+
+<p>
+ If this attribute is set to true, the activity can be launched in
+ split-screen and freeform modes. If the attribute is set to false, the
+ activity does not support multi-window mode. If this value is false, and the
+ user attempts to launch the activity in multi-window mode, the activity takes
+ over the full screen.
+</p>
+
+<p>
+ If your app targets API level 24, but you do not specify a value
+ for this attribute, the attribute's value defaults to true.
+</p>
+
+<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
+
+<p>
+ Set this attribute in your manifest's <a href=
+ "{@docRoot}guide/topics/manifest/activity-element"><code><activity></code></a>
+ node to indicate whether the activity supports <a href=
+ "{@docRoot}training/tv/playback/picture-in-picture.jd">Picture-in-Picture</a>
+ display. This attribute is ignored if <code>android:resizeableActivity</code>
+ is false.
+</p>
+
+<pre>
+android:supportsPictureInPicture=["true" | "false"]
+</pre>
+
+<h3 id="layout">Layout attributes</h3>
+
+<p>
+ With Android 7.0, the <code><layout></code> manifest element
+ supports several attributes that affect how an activity behaves in
+ multi-window mode:
+</p>
+
+<dl>
+ <dt>
+ <code>android:defaultWidth</code>
+ </dt>
+
+ <dd>
+ Default width of the activity when launched in freeform mode.
+ </dd>
+
+ <dt>
+ <code>android:defaultHeight</code>
+ </dt>
+
+ <dd>
+ Default height of the activity when launched in freeform mode.
+ </dd>
+
+ <dt>
+ <code>android:gravity</code>
+ </dt>
+
+ <dd>
+ Initial placement of the activity when launched in freeform mode. See the
+ {@link android.view.Gravity} reference for suitable values.
+ </dd>
+
+ <dt>
+ <code>android:minHeight</code>, <code>android:minWidth</code>
+ </dt>
+
+ <dd>
+ Minimum height and minimum width for the activity in both split-screen
+ and freeform modes. If the user moves the divider in split-screen mode
+ to make an activity smaller than the specified minimum, the system crops
+ the activity to the size the user requests.
+ </dd>
+</dl>
+
+<p>
+ For example, the following code shows how to specify an activity's default
+ size and location, and its minimum size, when the activity is displayed in
+ freeform mode:
+</p>
+
+<pre>
+<activity android:name=".MyActivity">
+ <layout android:defaultHeight="500dp"
+ android:defaultWidth="600dp"
+ android:gravity="top|end"
+ android:minHeight="450dp"
+ android:minWidth="300dp" />
+</activity>
+</pre>
+
+<h2 id="running">Running Your App in Multi-Window Mode</h2>
+
+<p>
+ Beginning with Android 7.0, the system offers functionality to support apps
+ that can run in multi-window mode.
+</p>
+
+<h3 id="disabled-features">Disabled features in multi-window mode</h3>
+
+<p>
+ Certain features are disabled or ignored when a device is in multi-window
+ mode, because they don’t make sense for an activity which may be sharing the
+ device screen with other activities or apps. Such features include:
+
+<ul>
+ <li>Some <a href="{@docRoot}training/system-ui/index.html">System UI</a>
+ customization options are disabled; for example, apps cannot hide the status
+ bar if they are not running in full-screen mode.
+ </li>
+
+ <li>The system ignores changes to the <code><a href=
+ "{@docRoot}guide/topics/manifest/activity-element.html#screen"
+ >android:screenOrientation</a></code> attribute.
+ </li>
+</ul>
+
+<h3 id="change-notification">Multi-window change notification and querying</h3>
+
+<p>
+ {@link android.app.Activity} offers the following methods to support
+ multi-window display.
+</p>
+
+<dl>
+ <dt>
+ {@link android.app.Activity#isInMultiWindowMode isInMultiWindowMode()}
+ </dt>
+
+ <dd>
+ Call to find out if the activity is in multi-window mode.
+ </dd>
+
+ <dt>
+ {@link android.app.Activity#isInPictureInPictureMode
+ isInPictureInPictureMode()}
+ </dt>
+
+ <dd>
+ Call to find out if the activity is in <a href=
+ "{@docRoot}training/tv/playback/picture-in-picture.jd">picture-in-picture</a>
+ mode.
+ <p class="note">
+ <strong>Note:</strong> Picture-in-picture mode is a special case of
+ multi-window mode. If <code>myActivity.isInPictureInPictureMode()</code>
+ returns true, then <code>myActivity.isInMultiWindowMode()</code> also
+ returns true.
+ </p>
+ </dd>
+
+ <dt>
+ {@link android.app.Activity#onMultiWindowModeChanged
+ onMultiWindowModeChanged()}
+ </dt>
+
+ <dd>
+ The system calls this method whenever the activity goes into or out of
+ multi-window mode. The system passes the method a value of true if the
+ activity is entering multi-window mode, and false if the activity is
+ leaving multi-window mode.
+ </dd>
+
+ <dt>
+ {@link android.app.Activity#onPictureInPictureModeChanged
+ onPictureInPictureModeChanged()}
+ </dt>
+
+ <dd>
+ The system calls this method whenever the activity goes into or out of
+ picture-in-picture mode. The system passes the method a value of true if
+ the activity is entering picture-in-picture mode, and false if the activity
+ is leaving picture-in-picture mode.
+ </dd>
+</dl>
+
+<p>
+ The {@link android.app.Fragment} class exposes versions of many of these
+ methods, for example {@link android.app.Fragment#onMultiWindowModeChanged
+ Fragment.onMultiWindowModeChanged()}.
+</p>
+
+<h3 id="entering-pip">Entering picture-in-picture mode</h3>
+
+<p>
+ To put an activity in picture-in-picture mode, call {@link
+ android.app.Activity#enterPictureInPictureMode
+ Activity.enterPictureInPictureMode()}. This method has no effect if the
+ device does not support picture-in-picture mode. For more information, see
+ the <a href=
+ "{@docRoot}training/tv/playback/picture-in-picture.jd">Picture-in-Picture</a>
+ documentation.
+</p>
+
+<h3 id="launch">Launch New Activities in Multi-Window Mode</h3>
+
+<p>
+ When you launch a new activity, you can hint to the system that the new
+ activity should be displayed adjacent to the current one, if possible. To do
+ this, use the intent flag
+ {@link android.content.Intent#FLAG_ACTIVITY_LAUNCH_ADJACENT}. Passing
+ this flag requests the following behavior:
+</p>
+
+<ul>
+ <li>If the device is in split-screen mode, the system attempts to create the
+ new activity next to the activity that launched it, so the two activities
+ share the screen. The system is not guaranteed to be able to do this, but it
+ makes the activities adjacent if possible.
+ </li>
+
+ <li>If the device is not in split-screen mode, this flag has no effect.
+ </li>
+</ul>
+
+<p>
+ If a device is in freeform mode and you are launching a new activity, you can
+ specify the new activity's dimensions and screen location by calling
+ {@link android.app.ActivityOptions#setLaunchBounds
+ ActivityOptions.setLaunchBounds()}. This method has no effect if
+ the device is not in multi-window mode.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> If you launch an activity within a task stack, the
+ activity replaces the activity on the screen, inheriting all of its
+ multi-window properties. If you want to launch the new activity as a separate
+ window in multi-window mode, you must launch it in a new task stack.
+</p>
+
+<h3 id="dnd">Supporting drag and drop</h3>
+
+<p>
+ Users can <a href="{@docRoot}guide/topics/ui/drag-drop.html">drag and
+ drop</a> data from one activity to another while the two activities are
+ sharing the screen. (Prior to Android 7.0, users could only drag and drop data
+ within a single activity.) For this reason, you may want to add drag and drop
+ functionality to your app if your app does not currently support it.
+</p>
+
+
+<dl>
+ <dt>
+ {@link android.view.DragAndDropPermissions}
+ </dt>
+
+ <dd>
+ Token object responsible for specifying the permissions granted to the app
+ that receives a drop.
+ </dd>
+
+ <dt>
+ {@link android.view.View#startDragAndDrop View.startDragAndDrop()}
+ </dt>
+
+ <dd>
+ Alias for {@link android.view.View#startDrag View.startDrag()}. To enable
+ cross-activity drag and drop, pass the flag {@link
+ android.view.View#DRAG_FLAG_GLOBAL}. If you need to give URI permissions to
+ the recipient activity, pass the flags {@link
+ android.view.View#DRAG_FLAG_GLOBAL_URI_READ} or {@link
+ android.view.View#DRAG_FLAG_GLOBAL_URI_WRITE}, as appropriate.
+ </dd>
+
+ <dt>
+ {@link android.view.View#cancelDragAndDrop View.cancelDragAndDrop()}
+ </dt>
+
+ <dd>
+ Cancels a drag operation currently in progress. Can only be called by the
+ app that originated the drag operation.
+ </dd>
+
+ <dt>
+ {@link android.view.View#updateDragShadow View.updateDragShadow()}
+ </dt>
+
+ <dd>
+ Replaces the drag shadow for a drag operation currently in progress. Can
+ only be called by the app that originated the drag operation.
+ </dd>
+
+ <dt>
+ {@link android.app.Activity#requestDragAndDropPermissions
+ Activity.requestDragAndDropPermissions()}
+ </dt>
+
+ <dd>
+ Requests the permissions for the content URIs passed with the {@link
+ android.content.ClipData} contained in a {@link android.view.DragEvent}.
+ </dd>
+</dl>
+
+<h2 id="testing">Testing Your App's Multi-Window Support</h2>
+
+<p>
+ Whether or not your app targets API level 24 or higher, you should
+ verify how it behaves in multi-window mode in case a user tries to launch it
+ in multi-window mode on a device running Android 7.0 or higher.
+</p>
+
+<h3 id="configuring">Configuring a Test Device</h3>
+
+<p>
+ If a device runs Android 7.0 or higher, it automatically supports split-screen
+ mode.
+</p>
+
+<h3 id="test-non-n">If your app targets API level 23 or lower</h3>
+
+<p>
+ If your app targets API level 23 or lower and the user attempts to use
+ the app in multi-window mode, the system forcibly resizes the app unless the
+ app declares a fixed orientation.
+</p>
+
+<p>
+ If your app does not declare a fixed orientation, you should launch your app
+ on a device running Android 7.0 or higher and attempt to put the app in
+ split-screen mode. Verify that the user experience is
+ acceptable when the app is forcibly resized.
+</p>
+
+<p>
+ If the app declares a fixed orientation, you should attempt to put the app in
+ multi-window mode. Verify that when you do so, the app remains
+ in full-screen mode.
+</p>
+
+<h3 id="test-mw">If you support multi-window mode</h3>
+
+<p>
+ If your app targets API level 24 or higher and does not disable
+ multi-window support, verify the following behavior under both split-screen
+ and freeform modes.
+</p>
+
+<ul>
+ <li>Launch the app in full-screen mode, then switch to multi-window mode by
+ long-pressing the Overview button. Verify that the app switches properly.
+ </li>
+
+ <li>Launch the app directly in multi-window mode, and verify that the app
+ launches properly. You can launch an app in multi-window mode by pressing the
+ Overview button, then long-pressing the title bar of your app and dragging it
+ to one of the highlighted areas on the screen.
+ </li>
+
+ <li>Resize your app in split-screen mode by dragging the divider line.
+ Verify that the app resizes without crashing, and that necessary UI elements
+ are visible.
+ </li>
+
+ <li>If you have specified minimum dimensions for your app, attempt to resize
+ the app below those dimensions. Verify that you cannot resize the app to be
+ smaller than the specified minimum.
+ </li>
+
+ <li>Through all tests, verify that your app's performance is acceptable. For
+ example, verify that there is not too long a lag to update the UI after the
+ app is resized.
+ </li>
+</ul>
+
+<h4 id="test-checklist">Testing checklist</h4>
+
+<p>
+ To verify your app's performance in multi-window mode, try the following
+ operations. You should try these operations in both split-screen and
+ multi-window mode, except where otherwise noted.
+</p>
+
+<ul>
+ <li>Enter and leave multi-window mode.
+ </li>
+
+ <li>Switch from your app to another app, and verify that the app behaves
+ properly while it is visible but not active. For example, if your app is
+ playing video, verify that the video continues to play while the user is
+ interacting with another app.
+ </li>
+
+ <li>In split-screen mode, try moving the dividing bar to make your app both
+ larger and smaller. Try these operations in both side-by-side and
+ one-above-the-other configurations. Verify that the app does not crash,
+ essential functionality is visible, and the resize operation doesn't take too
+ long.
+ </li>
+
+ <li>Perform several resize operations in rapid succession. Verify that your
+ app doesn't crash or leak memory. For information about checking your app's
+ memory usage, see <a href="{@docRoot}tools/debugging/debugging-memory.html">
+ Investigating Your RAM Usage</a>.
+ </li>
+
+ <li>Use your app normally in a number of different window configurations, and
+ verify that the app behaves properly. Verify that text is readable, and that
+ UI elements aren't too small to interact with.
+ </li>
+</ul>
+
+<h3 id="test-disabled-mw">If you have disabled multi-window support</h3>
+
+<p>
+ If you disabled multi-window support by setting
+ <code>android:resizableActivity="false"</code>, you should launch your app on
+ a device running Android 7.0 or higher and attempt to put the app in
+ freeform and split-screen modes. Verify that when you do so, the app remains
+ in full-screen mode.
+</p>
diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd
index 6cd63f3..09dd5f4 100644
--- a/docs/html/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html/guide/topics/ui/notifiers/notifications.jd
@@ -21,6 +21,8 @@
<ol>
<li><a href="#Updating">Updating notifications</a></li>
<li><a href="#Removing">Removing notifications</a></li>
+ <li><a href="#direct">Replying to notifications</a></li>
+ <li><a href="#bundle">Bundling notifications</a></li>
</ol>
</li>
<li><a href="#NotificationResponse">Preserving Navigation when Starting an Activity</a>
@@ -37,12 +39,18 @@
</li>
<li><a href="#metadata">Notification Metadata</a></li>
<li><a href="#Heads-up">Heads-up Notifications</a></li>
- <li><a href="#lockscreenNotification">Lock Screen Notifications</a></li>
+ <li><a href="#lockscreenNotification">Lock Screen Notifications</a>
<ol>
<li><a href="#visibility">Setting Visibility</a></li>
<li><a href="#controllingMedia">Controlling Media Playback on the Lock Screen</a></li>
</ol>
- <li><a href="#CustomNotification">Custom Notification Layouts</a></li>
+ </li>
+ <li><a href="#CustomNotification">Customizing Notifications</a>
+ <ol>
+ <li><a href="#custom">Custom Views</a></li>
+ <li><a href="#style">Messaging Style</a></li>
+ </ol>
+ </li>
</ol>
<h2>Key classes</h2>
@@ -60,7 +68,7 @@
<h2>See also</h2>
<ol>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Android Design: Notifications</a>
+ <a href="https://material.google.com/patterns/notifications.html">Material Design: Notifications</a>
</li>
</ol>
</div>
@@ -97,7 +105,7 @@
The material design changes introduced in Android 5.0 (API level 21) are of particular
importance, and you should review the <a href="{@docRoot}training/material/index.html">Material
Design</a> training for more information. To learn how to design notifications and their interactions,
-read the <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> design guide.</p>
+read the <a href="https://material.google.com/patterns/notifications.html">Notifications</a> design guide.</p>
<h2 id="CreateNotification">Creating a Notification</h2>
@@ -184,7 +192,7 @@
</p>
<p> For information about setting an appropriate priority level, see "Correctly
set and manage notification priority" in the <a
- href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design
+ href="https://material.google.com/patterns/notifications.html">Notifications</a> Design
guide.
</p>
<!-- ------------------------------------------------------------------------------------------ -->
@@ -323,7 +331,7 @@
For example, Gmail notifies the user that new emails have arrived by increasing its count of
unread messages and by adding a summary of each email to the notification. This is called
"stacking" the notification; it's described in more detail in the
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design guide.
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design guide.
</p>
<p class="note">
<strong>Note:</strong> This Gmail feature requires the "inbox" expanded layout, which is part
@@ -394,6 +402,305 @@
all of the notifications you previously issued.
</li>
</ul>
+
+<!--------------------------------------------------------------- -->
+<h2 id="direct">Replying to notifications</h2>
+
+<p>
+ Starting in Android 7.0 (API level 24),
+ users can respond directly to text messages or update task lists
+ from within the notification
+ dialog. On a handheld, the inline reply action appears as an additional
+ button
+ displayed in the notification. When a user replies via keyboard, the system
+ attaches the text response to the intent
+ you had specified for the notification action and sends the intent to your
+ handheld app.
+</p>
+
+<img id="fig-reply-button" src="{@docRoot}images/android-7.0/inline-reply.png"
+ srcset="{@docRoot}images/android-7.0/inline-reply.png 1x,
+ {@docRoot}images/android-7.0/inline-reply_2x.png 2x"
+ width="400">
+<p class="img-caption">
+ <strong>Figure 1.</strong> The <strong>Reply</strong> action button.
+</p>
+
+<h3>Adding inline reply actions</h3>
+
+<p>To create a notification action that supports direct reply:
+</p>
+
+<ol>
+<li>Create an instance of {@link android.support.v4.app.RemoteInput.Builder}
+ that you can add to your notification
+action. This class's constructor accepts a string that the system uses as the key
+ for the text input. Later, your handheld app uses that key to retrieve the text
+ of the input.
+
+<pre>
+// Key for the string that's delivered in the action's intent.
+private static final String KEY_TEXT_REPLY = "key_text_reply";
+String replyLabel = getResources().getString(R.string.reply_label);
+RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
+ .setLabel(replyLabel)
+ .build();
+</pre>
+</li>
+<li>Attach the {@link android.support.v4.app.RemoteInput}
+ object to an action using <code>addRemoteInput()</code>.
+
+<pre>
+// Create the reply action and add the remote input.
+Notification.Action action =
+ new Notification.Action.Builder(R.drawable.ic_reply_icon,
+ getString(R.string.label), replyPendingIntent)
+ .addRemoteInput(remoteInput)
+ .build();
+</pre>
+</li>
+
+<li>Apply the action to a notification and issue the notification.
+
+<pre>
+// Build the notification and add the action.
+Notification newMessageNotification =
+ new Notification.Builder(mContext)
+ .setSmallIcon(R.drawable.ic_message)
+ .setContentTitle(getString(R.string.title))
+ .setContentText(getString(R.string.content))
+ .addAction(action))
+ .build();
+
+// Issue the notification.
+NotificationManager notificationManager =
+ NotificationManager.from(mContext);
+notificationManager.notify(notificationId, newMessageNotification);
+
+</pre>
+</li>
+
+</ol>
+
+
+<p> The system prompts the user to input a response when they trigger the
+notification action. </p>
+
+<img id="fig-user-input" src="{@docRoot}images/android-7.0/inline-type-reply.png"
+ srcset="{@docRoot}images/android-7.0/inline-type-reply.png 1x,
+ {@docRoot}images/android-7.0/inline-type-reply_2x.png 2x"
+ width="300">
+<p class="img-caption">
+ <strong>Figure 2.</strong> The user inputs text from the notification shade.
+</p>
+
+<h3>
+ Retrieving user input from the inline reply
+</h3>
+
+<p>
+ To receive user input from the notification interface to the activity you
+ declared in the reply action's intent:
+</p>
+
+<ol>
+ <li>Call {@link android.support.v4.app.RemoteInput#getResultsFromIntent
+ getResultsFromIntent()} by passing the notification action’s intent as the
+ input parameter. This method returns a {@link android.os.Bundle} that
+ contains the text response.
+
+ <pre>
+Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+</pre>
+ </li>
+
+ <li>Query the bundle using the result key (provided to the {@link
+ android.support.v4.app.RemoteInput.Builder} constructor). You can complete
+ this process and retrieve the input text by creating a method, as in the
+ following code snippet:
+
+ <pre>
+// Obtain the intent that started this activity by calling
+// Activity.getIntent() and pass it into this method to
+// get the associated string.
+
+private CharSequence getMessageText(Intent intent) {
+ Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+ if (remoteInput != null) {
+ return remoteInput.getCharSequence(KEY_TEXT_REPLY);
+ }
+ return null;
+ }
+</pre>
+ </li>
+
+ <li>Build and issue another notification, using the same notification ID that
+ you provided for the previous notification. The progress indicator
+ disappears from the notification interface to inform users of a successful
+ reply. When working with this new notification, use the context that gets
+ passed to the receiver's {@code onReceive()} method.
+
+ <pre>
+// Build a new notification, which informs the user that the system
+// handled their interaction with the previous notification.
+Notification repliedNotification =
+ new Notification.Builder(context)
+ .setSmallIcon(R.drawable.ic_message)
+ .setContentText(getString(R.string.replied))
+ .build();
+
+// Issue the new notification.
+NotificationManager notificationManager =
+ NotificationManager.from(context);
+notificationManager.notify(notificationId, repliedNotification);
+</pre>
+ </li>
+</ol>
+
+<p>
+ For interactive apps, such as chats, you can include additional
+ context when handling retrieved text. For example, these apps could show
+ multiple lines of chat history. When the user responds via {@link
+ android.support.v4.app.RemoteInput}, you can update the reply history
+ using the {@code setRemoteInputHistory()} method.
+</p>
+
+<p>
+ The notification must be either updated or cancelled after the app has
+ received remote input. When the user replies to a remote update
+ using Direct Reply,
+ do not cancel the notification. Instead, update the notification
+ to display the user's reply.
+ For notifications using {@code MessagingStyle}, you should add
+ the reply as the latest message. When using other templates, you can
+ append the user's reply to the remote-input history.
+</p>
+
+<!-------------------------------------------------------------------------- -->
+
+<h2 id="bundle">Bundling notifications</h2>
+
+<p>
+ Starting in Android 7.0 (API level 24),
+ Android provides developers with a new way to represent
+ a queue of notifications: <i>bundled notifications</i>. This is similar to the
+ <a href="{@docRoot}training/wearables/notifications/stacks.html">Notification
+ Stacks</a> feature in Android Wear. For example, if your app
+ creates notifications
+ for received messages, when more than one message is received, bundle the
+ notifications together as a single group. You can
+ use the {@link android.support.v4.app.NotificationCompat.Builder#setGroup
+ Builder.setGroup()} method to bundle similar notifications.</p>
+
+<p>
+ A notification group imposes a hierarchy on the notifications comprising it.
+ At the top of that hierarchy is a parent notification that displays summary
+ information for the group. The user can progressively
+ expand the notification group, and the system shows more information as the
+ user drills deeper. When the user expands the bundle, the system reveals more
+ information for all its child notifications; when the user
+ expands one of those notifications, the system reveals its entire content.
+</p>
+
+<img id="fig-bundles" src="{@docRoot}images/android-7.0/bundles.png"
+ srcset="{@docRoot}images/android-7.0/bundles.png 1x,
+ {@docRoot}images/android-7.0/bundles_2x.png 2x"
+ width="300">
+<p class="img-caption">
+ <strong>Figure 3.</strong> The user can progressively expand the notification
+ group.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> If the same app sends four or more notifications
+ and does not specify a grouping, the
+ system automatically groups them together.
+</p>
+
+<p>To learn how to add notifications to a group, see
+<a href="{@docRoot}training/wearables/notifications/stacks.html#AddGroup">Add
+Each Notification to a Group</a>.</p>
+
+
+<h3 id="best-practices">Best practices for bundled notifications</h3>
+<p>This section provides guidelines about when to use notification groups instead
+of the {@link android.app.Notification.InboxStyle InboxStyle}
+notifications available in Android 6.0 and previous versions.</p>
+
+<h3>When to use bundled notifications</h3>
+
+<p>You should use notification groups only if all of the following conditions are
+true for your use case:</p>
+
+<ul>
+ <li>The child notifications are complete notifications and can be displayed
+ individually without the need for a group summary.</li>
+ <li>There is a benefit to surfacing the child notifications individually. For
+ example:
+ </li>
+ <ul>
+ <li>They are actionable, with actions specific to each child.</li>
+ <li>There is more information to the child that the user wants to read.</li>
+ </ul>
+</ul>
+
+<p>Examples of good use cases for notification groups include: a messaging app
+displaying a list of incoming messages, or an email app displaying a list of
+received emails.</p>
+
+<p>
+Examples of cases where a single notification is preferable
+ include individual messages from a single person, or a list representation of
+ single-line text items. You can use
+({@link android.app.Notification.InboxStyle InboxStyle} or
+{@link android.app.Notification.BigTextStyle BigTextStyle}) to accomplish
+this.
+</p>
+
+<h3 id ="post">Displaying bundled notifications</h3>
+
+<p>
+ The app should always post a group summary, even if the group contains just a
+ single child. The system will suppress the summary and directly display the
+ child notification if it only contains a single notification. This ensures
+ that the system can provide a consistent experience when the user swipes away
+ children of a group.
+</p>
+
+<h3>Peeking notifications</h3>
+
+<p>While the system usually displays child notifications as a group, you can set
+ them to temporarily appear as
+ <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html#Heads-up">
+ heads-up notifications</a>. This feature is especially useful because it allows
+ immediate access to the most recent child and the actions associated with it.
+</p>
+
+
+<h3>Backwards compatibility</h3>
+
+<p>
+ Both notification groups and remote input have been a part of the {@link
+ android.app.Notification} API since Android 5.0 (API level 21) to support
+ Android Wear devices. If you've already built notifications with these APIs,
+ the only action you must take is to verify that the app behavior corresponds
+ to the guidelines described above, and to consider implementing {@code
+ setRemoteInputHistory()}.
+</p>
+
+<p>
+ In order to support backward compatibility, the same APIs are available with
+ the support library's {@link android.support.v4.app.NotificationCompat}
+ class, allowing you to build notifications that works on versions of Android
+ less than 5.0 (API level 21).
+ On handhelds and tablets, users only see the summary notification,
+ so an app should still have an inbox style or an equivalent notification
+ representative for the whole information content of the group. As Android
+ Wear devices allow users to see all child notifications even on older
+ platform levels, you should build child notifications regardless of API
+ level.
+</p>
+
<!-- ------------------------------------------------------------------------------------------ -->
<!-- ------------------------------------------------------------------------------------------ -->
<h2 id="NotificationResponse">Preserving Navigation when Starting an Activity</h2>
@@ -886,35 +1193,38 @@
<h3 id="controllingMedia">Controlling Media Playback on the Lock Screen</h3>
-<p>In Android 5.0 (API level 21) the lock screen no longer displays media controls
-based on the {@link android.media.RemoteControlClient}, which is now deprecated. Instead, use the
-{@link android.app.Notification.MediaStyle} template with the
-{@link android.app.Notification.Builder#addAction(android.app.Notification.Action) addAction()}
-method, which converts actions into clickable icons.</p>
+<p>
+ In Android 5.0 (API level 21) the lock screen no longer displays media
+ controls based on the {@link android.media.RemoteControlClient}, which is
+ now deprecated. Instead, use the {@link
+ android.support.v7.app.NotificationCompat.MediaStyle} template with the
+ {@link
+ android.support.v4.app.NotificationCompat.Builder#addAction(android.support.v4.app.NotificationCompat.Action)
+ addAction()} method, which converts actions into clickable icons.
+</p>
-<p class="note"><strong>Note:</strong> The template and the
-{@link android.app.Notification.Builder#addAction(android.app.Notification.Action) addAction()}
-method are not included in the support library, so these features run in Android 5.0 and higher
-only.</p>
-
-<p>To display media playback controls on the lock screen in Android 5.0, set the visibility
-to {@link android.support.v4.app.NotificationCompat#VISIBILITY_PUBLIC}, as described above. Then add
-the actions and set the {@link android.app.Notification.MediaStyle} template, as described in the
-following sample code:</p>
+<p>
+ To display media playback controls on the lock screen in Android 5.0, set
+ the visibility to {@link
+ android.support.v4.app.NotificationCompat#VISIBILITY_PUBLIC}, as described
+ above. Then add the actions and set the {@link
+ android.support.v7.app.NotificationCompat.MediaStyle} template, as described
+ in the following sample code:
+</p>
<pre>
-Notification notification = new Notification.Builder(context)
+Notification notification = new NotificationCompat.Builder(context)
// Show controls on lock screen even when user hides sensitive content.
- .setVisibility(Notification.VISIBILITY_PUBLIC)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setSmallIcon(R.drawable.ic_stat_player)
// Add media control buttons that invoke intents in your media service
.addAction(R.drawable.ic_prev, "Previous", prevPendingIntent) // #0
.addAction(R.drawable.ic_pause, "Pause", pausePendingIntent) // #1
.addAction(R.drawable.ic_next, "Next", nextPendingIntent) // #2
// Apply the media style template
- .setStyle(new Notification.MediaStyle()
- .setShowActionsInCompactView(1 /* #1: pause button */)
- .setMediaSession(mMediaSession.getSessionToken())
+ .setStyle(new NotificationCompat.MediaStyle()
+ .setShowActionsInCompactView(1 /* #1: pause button */)
+ .setMediaSession(mMediaSession.getSessionToken()))
.setContentTitle("Wonderful music")
.setContentText("My Awesome Band")
.setLargeIcon(albumArtBitmap)
@@ -984,3 +1294,69 @@
standard notification layout text. If you use the same style in applications that target Android
2.3 or higher, you'll ensure that your text is visible against the display background.
</p>
+
+<!-- ------------------------------------------------------------------------ -->
+<h3 id="custom"> Custom Views</h3>
+<p>
+ Starting from Android 7.0 (API level 24),
+ you can customize notification views and
+ still obtain system decorations like notification headers, actions, and
+ expandable layouts.
+</p>
+
+<p>To enable this capability, Android provides the following APIs to style your
+ custom view:</p>
+
+<dl>
+<dt>
+{@code DecoratedCustomViewStyle()}</dt>
+<dd> Styles notifications other than media
+notifications.</dd>
+<dt>
+{@code DecoratedMediaCustomViewStyle()}</dt>
+<dd> Styles media notifications.</dd>
+</dl>
+
+<p>To use this API, call the {@code setStyle()} method, passing to it
+the desired custom view style.</p>
+
+<p>This snippet shows how to construct a custom notification object with the
+{@code DecoratedCustomViewStyle()} method.</p>
+
+<pre>
+Notification notification = new Notification.Builder()
+ .setSmallIcon(R.drawable.ic_stat_player)
+ .setLargeIcon(albumArtBitmap))
+ .setCustomContentView(contentView);
+ .setStyle(new Notification.DecoratedCustomViewStyle())
+ .build();
+
+</pre>
+
+<!-- ----------------------------------------------------------------------- -->
+
+<h3 id="style">Messaging Style</h3>
+<p>
+ Starting in Android 7.0 (API level 24),
+ Android provides an API for customizing the style of a notification.
+ Using the <code>MessagingStyle</code> class, you can change several of the
+ labels displayed on the notification, including the conversation title,
+ additional messages, and the content view for the notification.
+</p>
+
+<p>
+ The following code snippet demonstrates how to customize a notification's
+ style using the <code>MessagingStyle</code> class.
+</p>
+
+<pre>
+ Notification notification = new Notification.Builder()
+ .setStyle(new Notification.MessagingStyle("Me")
+ .setConversationTitle("Team lunch")
+ .addMessage("Hi", timestamp1, null) // Pass in null for user.
+ .addMessage("What's up?", timestamp2, "Coworker")
+ .addMessage("Not much", timestamp3, null)
+ .addMessage("How about lunch?", timestamp4, "Coworker"))
+ .build();
+</pre>
+
diff --git a/docs/html/guide/topics/ui/notifiers/toasts.jd b/docs/html/guide/topics/ui/notifiers/toasts.jd
index e5d4a0a..d962727 100644
--- a/docs/html/guide/topics/ui/notifiers/toasts.jd
+++ b/docs/html/guide/topics/ui/notifiers/toasts.jd
@@ -2,14 +2,14 @@
@jd:body
<div id="qv-wrapper">
- <div id="qv">
+ <div id="qv">
<h2>In this document</h2>
<ol>
<li><a href="#Basics">The Basics</a></li>
<li><a href="#Positioning">Positioning your Toast</a></li>
<li><a href="#CustomToastView">Creating a Custom Toast View</a></li>
</ol>
-
+
<h2>Key classes</h2>
<ol>
<li>{@link android.widget.Toast}</li>
@@ -19,14 +19,14 @@
<p>A toast provides simple feedback about an operation in a small popup.
It only fills the amount of space required for the message and the current
-activity remains visible and interactive.
-For example, navigating away from an email before you send it triggers a
-"Draft saved" toast to let you know that you can continue editing later.
+activity remains visible and interactive.
+For example, navigating away from an email before you send it triggers a
+"Draft saved" toast to let you know that you can continue editing later.
Toasts automatically disappear after a timeout.</p>
<img src="{@docRoot}images/toast.png" alt="" />
-<p>If user response to a status message is required, consider instead using a
+<p>If user response to a status message is required, consider instead using a
<a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">Notification</a>.</p>
@@ -49,8 +49,8 @@
</pre>
<p>This example demonstrates everything you need for most toast notifications.
-You should rarely need anything else. You may, however, want to position the
-toast differently or even use your own layout instead of a simple text message.
+You should rarely need anything else. You may, however, want to position the
+toast differently or even use your own layout instead of a simple text message.
The following sections describe how you can do these things.</p>
<p>You can also chain your methods and avoid holding on to the Toast object, like this:</p>
@@ -61,7 +61,7 @@
<p>A standard toast notification appears near the bottom of the screen, centered horizontally.
You can change this position with the {@link android.widget.Toast#setGravity(int,int,int)}
-method. This accepts three parameters: a {@link android.view.Gravity} constant,
+method. This accepts three parameters: a {@link android.view.Gravity} constant,
an x-position offset, and a y-position offset.</p>
<p>For example, if you decide that the toast should appear in the top-left corner, you can set the
@@ -70,7 +70,7 @@
toast.setGravity(Gravity.TOP|Gravity.LEFT, 0, 0);
</pre>
-<p>If you want to nudge the position to the right, increase the value of the second parameter.
+<p>If you want to nudge the position to the right, increase the value of the second parameter.
To nudge it down, increase the value of the last parameter.
@@ -103,7 +103,7 @@
android:textColor="#FFF"
/>
</LinearLayout>
-</pre>
+</pre>
<p>Notice that the ID of the LinearLayout element is "toast_layout_root". You must use this
ID to inflate the layout from the XML, as shown here:</p>
@@ -123,21 +123,21 @@
toast.show();
</pre>
-<p>First, retrieve the {@link android.view.LayoutInflater} with
-{@link android.app.Activity#getLayoutInflater()}
+<p>First, retrieve the {@link android.view.LayoutInflater} with
+{@link android.app.Activity#getLayoutInflater()}
(or {@link android.content.Context#getSystemService(String) getSystemService()}),
-and then inflate the layout from XML using
+and then inflate the layout from XML using
{@link android.view.LayoutInflater#inflate(int, ViewGroup)}. The first parameter
is the layout resource ID and the second is the root View. You can use
-this inflated layout to find more View objects in the layout, so now capture and
+this inflated layout to find more View objects in the layout, so now capture and
define the content for the ImageView and TextView elements. Finally, create
a new Toast with {@link android.widget.Toast#Toast(Context)} and set some properties
of the toast, such as the gravity and duration. Then call
{@link android.widget.Toast#setView(View)} and pass it the inflated layout.
-You can now display the toast with your custom layout by calling
+You can now display the toast with your custom layout by calling
{@link android.widget.Toast#show()}.</p>
-<p class="note"><strong>Note:</strong> Do not use the public constructor for a Toast
+<p class="note"><strong>Note:</strong> Do not use the public constructor for a Toast
unless you are going to define the layout with {@link android.widget.Toast#setView(View)}.
If you do not have a custom layout to use, you must use
{@link android.widget.Toast#makeText(Context,int,int)} to create the Toast.</p>
diff --git a/docs/html/guide/topics/ui/overview.jd b/docs/html/guide/topics/ui/overview.jd
index 85c5756..f323d6c 100644
--- a/docs/html/guide/topics/ui/overview.jd
+++ b/docs/html/guide/topics/ui/overview.jd
@@ -39,7 +39,7 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
@@ -60,7 +60,7 @@
<p>For a complete guide to creating a UI layout, see <a href="declaring-layout.html">XML
Layouts</a>.
-
+
<h2 id="UIComponents">User Interface Components</h2>
<p>You don't have to build all of your UI using {@link android.view.View} and {@link
diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd
index 243c1c3..619fd26 100644
--- a/docs/html/guide/topics/ui/settings.jd
+++ b/docs/html/guide/topics/ui/settings.jd
@@ -84,7 +84,7 @@
<img src="{@docRoot}images/ui/settings/settings.png" alt="" width="435" />
<p class="img-caption"><strong>Figure 1.</strong> Screenshots from the Android Messaging app's
-settings. Selecting an item defined by a {@link android.preference.Preference}
+settings. Selecting an item defined by a {@link android.preference.Preference}
opens an interface to change the setting.</p>
@@ -230,7 +230,7 @@
<dt>{@code android:key}</dt>
<dd>This attribute is required for preferences that persist a data value. It specifies the unique
key (a string) the system uses when saving this setting's value in the {@link
-android.content.SharedPreferences}.
+android.content.SharedPreferences}.
<p>The only instances in which this attribute is <em>not required</em> is when the preference is a
{@link android.preference.PreferenceCategory} or {@link android.preference.PreferenceScreen}, or the
preference specifies an {@link android.content.Intent} to invoke (with an <a
@@ -291,7 +291,7 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
+ <PreferenceCategory
android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
@@ -299,12 +299,12 @@
android:summary="@string/pref_summary_auto_delete"
android:title="@string/pref_title_auto_delete"
android:defaultValue="false"... />
- <Preference
+ <Preference
android:key="pref_key_sms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
android:title="@string/pref_title_sms_delete"... />
- <Preference
+ <Preference
android:key="pref_key_mms_delete_limit"
android:dependency="pref_key_auto_delete"
android:summary="@string/pref_summary_delete_limit"
@@ -594,11 +594,11 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsActivity$SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
@@ -678,15 +678,15 @@
load.</p>
<p>For example, here's an XML file for preference headers that is used on Android 3.0
-and higher ({@code res/xml/preference_headers.xml}):</p>
+and higher ({@code res/xml/preference_headers.xml}):</p>
<pre>
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentOne"
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" />
- <header
+ <header
android:fragment="com.example.prefs.SettingsFragmentTwo"
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" />
@@ -698,18 +698,18 @@
<pre>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
+ <Preference
android:title="@string/prefs_category_one"
android:summary="@string/prefs_summ_category_one" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_ONE" />
</Preference>
- <Preference
+ <Preference
android:title="@string/prefs_category_two"
android:summary="@string/prefs_summ_category_two" >
- <intent
+ <intent
android:targetPackage="com.example.prefs"
android:targetClass="com.example.prefs.SettingsActivity"
android:action="com.example.prefs.PREFS_TWO" />
@@ -943,8 +943,8 @@
<p>The Android framework includes a variety of {@link android.preference.Preference} subclasses that
allow you to build a UI for several different types of settings.
-However, you might discover a setting you need for which there’s no built-in solution, such as a
-number picker or date picker. In such a case, you’ll need to create a custom preference by extending
+However, you might discover a setting you need for which there's no built-in solution, such as a
+number picker or date picker. In such a case, you'll need to create a custom preference by extending
the {@link android.preference.Preference} class or one of the other subclasses.</p>
<p>When you extend the {@link android.preference.Preference} class, there are a few important
@@ -982,11 +982,11 @@
public class NumberPickerPreference extends DialogPreference {
public NumberPickerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
setDialogLayoutResource(R.layout.numberpicker_dialog);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
-
+
setDialogIcon(null);
}
...
@@ -1201,7 +1201,7 @@
// Cast state to custom BaseSavedState and pass to superclass
SavedState myState = (SavedState) state;
super.onRestoreInstanceState(myState.getSuperState());
-
+
// Set this Preference's widget to reflect the restored state
mNumberPicker.setValue(myState.value);
}
diff --git a/docs/html/guide/topics/ui/themes.jd b/docs/html/guide/topics/ui/themes.jd
index f932dbd..436b789 100644
--- a/docs/html/guide/topics/ui/themes.jd
+++ b/docs/html/guide/topics/ui/themes.jd
@@ -177,7 +177,7 @@
<p>The best place to find properties that apply to a specific {@link android.view.View} is the
corresponding class reference, which lists all of the supported XML attributes. For example, all of the
attributes listed in the table of
-<a href="{@docRoot}reference/android/widget/TextView.html#lattrs">TextView XML
+<a href="{@docRoot}reference/android/widget/TextView.html#lattrs">TextView XML
attributes</a> can be used in a style definition for a {@link android.widget.TextView} element (or one of
its subclasses). One of the attributes listed in the reference is <a
href="{@docRoot}reference/android/widget/TextView.html#attr_android:inputType">{@code
@@ -279,14 +279,14 @@
<h3 id="ApplyATheme">Apply a theme to an Activity or application</h3>
<p>To set a theme for all the activities of your application, open the {@code AndroidManifest.xml} file and
-edit the <code><application></code> tag to include the <code>android:theme</code> attribute with the
+edit the <code><application></code> tag to include the <code>android:theme</code> attribute with the
style name. For example:</p>
<pre>
<application android:theme="@style/CustomTheme">
</pre>
-<p>If you want a theme applied to just one Activity in your application, then add the
+<p>If you want a theme applied to just one Activity in your application, then add the
<code>android:theme</code> attribute to the <code><activity></code> tag instead.</p>
<p>Just as Android provides other built-in resources, there are many pre-defined themes that you can use, to avoid
@@ -374,9 +374,9 @@
for you to change your theme programatically (perhaps based on a user preference), you can.</p>
<p>To set the theme in your program code, use the {@link android.content.ContextWrapper#setTheme(int)}
-method and pass it the theme resource ID. Note that, when doing so, you must be sure to set the theme <em>before</em>
-instantiating any Views in the context, for example, before calling
-<code>setContentView(View)</code> or <code>inflate(int, ViewGroup)</code>. This ensures that
+method and pass it the theme resource ID. Note that, when doing so, you must be sure to set the theme <em>before</em>
+instantiating any Views in the context, for example, before calling
+<code>setContentView(View)</code> or <code>inflate(int, ViewGroup)</code>. This ensures that
the system applies the same theme for all of your UI screens. Here's an example:</p>
<pre>
@@ -391,7 +391,7 @@
<p>If you are considering loading a theme programmatically for the main
screen of your application, note that the theme would not be applied
in any animations the system would use to start the activity, which
-would take place before your application opens. In most cases, if
+would take place before your application opens. In most cases, if
you want to apply a theme to your main screen, doing so in XML
is a better approach. </p>
diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd
index 6d41b15..7dd24a4 100644
--- a/docs/html/guide/topics/ui/ui-events.jd
+++ b/docs/html/guide/topics/ui/ui-events.jd
@@ -20,8 +20,8 @@
When considering events within your user interface, the approach is to capture the events from
the specific View object that the user interacts with. The View class provides the means to do so.</p>
-<p>Within the various View classes that you'll use to compose your layout, you may notice several public callback
-methods that look useful for UI events. These methods are called by the Android framework when the
+<p>Within the various View classes that you'll use to compose your layout, you may notice several public callback
+methods that look useful for UI events. These methods are called by the Android framework when the
respective action occurs on that object. For instance, when a View (such as a Button) is touched,
the <code>onTouchEvent()</code> method is called on that object. However, in order to intercept this, you must extend
the class and override the method. However, extending every View object
@@ -30,7 +30,7 @@
called <a href="#EventListeners">event listeners</a>, are your ticket to capturing the user interaction with your UI.</p>
<p>While you will more commonly use the event listeners to listen for user interaction, there may
-come a time when you do want to extend a View class, in order to build a custom component.
+come a time when you do want to extend a View class, in order to build a custom component.
Perhaps you want to extend the {@link android.widget.Button}
class to make something more fancy. In this case, you'll be able to define the default event behaviors for your
class using the class <a href="#EventHandlers">event handlers</a>.</p>
@@ -38,7 +38,7 @@
<h2 id="EventListeners">Event Listeners</h2>
-<p>An event listener is an interface in the {@link android.view.View} class that contains a single
+<p>An event listener is an interface in the {@link android.view.View} class that contains a single
callback method. These methods will be called by the Android framework when the View to which the listener has
been registered is triggered by user interaction with the item in the UI.</p>
@@ -46,27 +46,27 @@
<dl>
<dt><code>onClick()</code></dt>
- <dd>From {@link android.view.View.OnClickListener}.
- This is called when the user either touches the item
+ <dd>From {@link android.view.View.OnClickListener}.
+ This is called when the user either touches the item
(when in touch mode), or focuses upon the item with the navigation-keys or trackball and
presses the suitable "enter" key or presses down on the trackball.</dd>
<dt><code>onLongClick()</code></dt>
- <dd>From {@link android.view.View.OnLongClickListener}.
- This is called when the user either touches and holds the item (when in touch mode), or
+ <dd>From {@link android.view.View.OnLongClickListener}.
+ This is called when the user either touches and holds the item (when in touch mode), or
focuses upon the item with the navigation-keys or trackball and
presses and holds the suitable "enter" key or presses and holds down on the trackball (for one second).</dd>
<dt><code>onFocusChange()</code></dt>
- <dd>From {@link android.view.View.OnFocusChangeListener}.
+ <dd>From {@link android.view.View.OnFocusChangeListener}.
This is called when the user navigates onto or away from the item, using the navigation-keys or trackball.</dd>
<dt><code>onKey()</code></dt>
- <dd>From {@link android.view.View.OnKeyListener}.
+ <dd>From {@link android.view.View.OnKeyListener}.
This is called when the user is focused on the item and presses or releases a hardware key on the device.</dd>
<dt><code>onTouch()</code></dt>
- <dd>From {@link android.view.View.OnTouchListener}.
+ <dd>From {@link android.view.View.OnTouchListener}.
This is called when the user performs an action qualified as a touch event, including a press, a release,
or any movement gesture on the screen (within the bounds of the item).</dd>
<dt><code>onCreateContextMenu()</code></dt>
- <dd>From {@link android.view.View.OnCreateContextMenuListener}.
+ <dd>From {@link android.view.View.OnCreateContextMenuListener}.
This is called when a Context Menu is being built (as the result of a sustained "long click"). See the discussion
on context menus in the <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Menus</a>
developer guide.</dd>
@@ -75,8 +75,8 @@
<p>These methods are the sole inhabitants of their respective interface. To define one of these methods
and handle your events, implement the nested interface in your Activity or define it as an anonymous class.
Then, pass an instance of your implementation
-to the respective <code>View.set...Listener()</code> method. (E.g., call
-<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
+to the respective <code>View.set...Listener()</code> method. (E.g., call
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>
and pass it your implementation of the {@link android.view.View.OnClickListener OnClickListener}.)</p>
<p>The example below shows how to register an on-click listener for a Button. </p>
@@ -121,17 +121,17 @@
no return value, but some other event listener methods must return a boolean. The reason
depends on the event. For the few that do, here's why:</p>
<ul>
- <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
- This returns a boolean to indicate whether you have consumed the event and it should not be carried further.
- That is, return <em>true</em> to indicate that you have handled the event and it should stop here;
+ <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> -
+ This returns a boolean to indicate whether you have consumed the event and it should not be carried further.
+ That is, return <em>true</em> to indicate that you have handled the event and it should stop here;
return <em>false</em> if you have not handled it and/or the event should continue to any other
on-click listeners.</li>
- <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
+ <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> -
This returns a boolean to indicate whether you have consumed the event and it should not be carried further.
- That is, return <em>true</em> to indicate that you have handled the event and it should stop here;
+ That is, return <em>true</em> to indicate that you have handled the event and it should stop here;
return <em>false</em> if you have not handled it and/or the event should continue to any other
on-key listeners.</li>
- <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
+ <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> -
This returns a boolean to indicate whether your listener consumes this event. The important thing is that
this event can have multiple actions that follow each other. So, if you return <em>false</em> when the
down action event is received, you indicate that you have not consumed the event and are also
@@ -142,7 +142,7 @@
<p>Remember that hardware key events are always delivered to the View currently in focus. They are dispatched starting from the top
of the View hierarchy, and then down, until they reach the appropriate destination. If your View (or a child of your View)
currently has focus, then you can see the event travel through the <code>{@link android.view.View#dispatchKeyEvent(KeyEvent)
-dispatchKeyEvent()}</code> method. As an alternative to capturing key events through your View, you can also receive
+dispatchKeyEvent()}</code> method. As an alternative to capturing key events through your View, you can also receive
all of the events inside your Activity with <code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code>
and <code>{@link android.app.Activity#onKeyUp(int,KeyEvent) onKeyUp()}</code>.</p>
@@ -176,19 +176,19 @@
<li><code>{@link android.view.View#onTouchEvent}</code> - Called when a touch screen motion event occurs.</li>
<li><code>{@link android.view.View#onFocusChanged}</code> - Called when the view gains or loses focus.</li>
</ul>
-<p>There are some other methods that you should be aware of, which are not part of the View class,
-but can directly impact the way you're able to handle events. So, when managing more complex events inside
+<p>There are some other methods that you should be aware of, which are not part of the View class,
+but can directly impact the way you're able to handle events. So, when managing more complex events inside
a layout, consider these other methods:</p>
<ul>
<li><code>{@link android.app.Activity#dispatchTouchEvent(MotionEvent)
- Activity.dispatchTouchEvent(MotionEvent)}</code> - This allows your {@link
+ Activity.dispatchTouchEvent(MotionEvent)}</code> - This allows your {@link
android.app.Activity} to intercept all touch events before they are dispatched to the window.</li>
<li><code>{@link android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - This allows a {@link
android.view.ViewGroup} to watch events as they are dispatched to child Views.</li>
<li><code>{@link android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - Call this
- upon a parent View to indicate that it should not intercept touch events with <code>{@link
+ upon a parent View to indicate that it should not intercept touch events with <code>{@link
android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>.</li>
</ul>
@@ -199,7 +199,7 @@
what will accept input. If the device has touch capabilities, however, and the user
begins interacting with the interface by touching it, then it is no longer necessary to
highlight items, or give focus to a particular View. Thus, there is a mode
-for interaction named "touch mode."
+for interaction named "touch mode."
</p>
<p>
For a touch-capable device, once the user touches the screen, the device
@@ -214,7 +214,7 @@
with the user interface without touching the screen.
</p>
<p>
-The touch mode state is maintained throughout the entire system (all windows and activities).
+The touch mode state is maintained throughout the entire system (all windows and activities).
To query the current state, you can call
{@link android.view.View#isInTouchMode} to see whether the device is currently in touch mode.
</p>
@@ -254,10 +254,10 @@
<p>Ordinarily, in this vertical layout, navigating up from the first Button would not go
anywhere, nor would navigating down from the second Button. Now that the top Button has
-defined the bottom one as the <var>nextFocusUp</var> (and vice versa), the navigation focus will
+defined the bottom one as the <var>nextFocusUp</var> (and vice versa), the navigation focus will
cycle from top-to-bottom and bottom-to-top.</p>
-<p>If you'd like to declare a View as focusable in your UI (when it is traditionally not),
+<p>If you'd like to declare a View as focusable in your UI (when it is traditionally not),
add the <code>android:focusable</code> XML attribute to the View, in your layout declaration.
Set the value <var>true</var>. You can also declare a View
as focusable while in Touch Mode with <code>android:focusableInTouchMode</code>.</p>
@@ -282,7 +282,7 @@
the framework will take care of measuring, laying out, and drawing the tree
as appropriate.</li>
</ol>
-
+
<p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
the UI thread when calling any method on any View.
If you are doing work on other threads and want to update the state of a View
diff --git a/docs/html/guide/webapps/debugging.jd b/docs/html/guide/webapps/debugging.jd
index a74797d..9e8e113 100755
--- a/docs/html/guide/webapps/debugging.jd
+++ b/docs/html/guide/webapps/debugging.jd
@@ -92,7 +92,7 @@
<h2 id="WebView">Using Console APIs in WebView</h2>
<p>All the console APIs shown above are also
-supported when debugging in {@link android.webkit.WebView}.
+supported when debugging in {@link android.webkit.WebView}.
If you're targeting Android 2.1 (API level 7) and higher, you must
provide a {@link android.webkit.WebChromeClient}
that implements the {@link android.webkit.WebChromeClient#onConsoleMessage(String,int,String)
diff --git a/docs/html/guide/webapps/targeting.jd b/docs/html/guide/webapps/targeting.jd
index 4a2ea17..10259b1 100644
--- a/docs/html/guide/webapps/targeting.jd
+++ b/docs/html/guide/webapps/targeting.jd
@@ -108,7 +108,7 @@
<p>When optimizing your site for mobile devices, you should usually set the width to
-{@code "device-width"} so the size fits exactly on all devices, then use CSS media queries to
+{@code "device-width"} so the size fits exactly on all devices, then use CSS media queries to
flexibly adapt layouts to suit different screen sizes.
<p class="note"><strong>Note:</strong> You should disable user scaling only when you're certain
diff --git a/docs/html/preview/images/bundles.png b/docs/html/images/android-7.0/bundles.png
similarity index 100%
rename from docs/html/preview/images/bundles.png
rename to docs/html/images/android-7.0/bundles.png
Binary files differ
diff --git a/docs/html/preview/images/bundles_2x.png b/docs/html/images/android-7.0/bundles_2x.png
similarity index 100%
rename from docs/html/preview/images/bundles_2x.png
rename to docs/html/images/android-7.0/bundles_2x.png
Binary files differ
diff --git a/docs/html/preview/images/datasaver.png b/docs/html/images/android-7.0/datasaver.png
similarity index 100%
rename from docs/html/preview/images/datasaver.png
rename to docs/html/images/android-7.0/datasaver.png
Binary files differ
diff --git a/docs/html/preview/images/doze-diagram-1.png b/docs/html/images/android-7.0/doze-diagram-1.png
similarity index 100%
rename from docs/html/preview/images/doze-diagram-1.png
rename to docs/html/images/android-7.0/doze-diagram-1.png
Binary files differ
diff --git a/docs/html/preview/images/doze-diagram-2.png b/docs/html/images/android-7.0/doze-diagram-2.png
similarity index 100%
rename from docs/html/preview/images/doze-diagram-2.png
rename to docs/html/images/android-7.0/doze-diagram-2.png
Binary files differ
diff --git a/docs/html/preview/images/inline-reply.png b/docs/html/images/android-7.0/inline-reply.png
similarity index 100%
rename from docs/html/preview/images/inline-reply.png
rename to docs/html/images/android-7.0/inline-reply.png
Binary files differ
diff --git a/docs/html/preview/images/inline-reply_2x.png b/docs/html/images/android-7.0/inline-reply_2x.png
similarity index 100%
rename from docs/html/preview/images/inline-reply_2x.png
rename to docs/html/images/android-7.0/inline-reply_2x.png
Binary files differ
diff --git a/docs/html/preview/images/inline-type-reply.png b/docs/html/images/android-7.0/inline-type-reply.png
similarity index 100%
rename from docs/html/preview/images/inline-type-reply.png
rename to docs/html/images/android-7.0/inline-type-reply.png
Binary files differ
diff --git a/docs/html/preview/images/inline-type-reply_2x.png b/docs/html/images/android-7.0/inline-type-reply_2x.png
similarity index 100%
rename from docs/html/preview/images/inline-type-reply_2x.png
rename to docs/html/images/android-7.0/inline-type-reply_2x.png
Binary files differ
diff --git a/docs/html/preview/images/m-preview-timeline-crop.png b/docs/html/images/android-7.0/m-preview-timeline-crop.png
similarity index 100%
rename from docs/html/preview/images/m-preview-timeline-crop.png
rename to docs/html/images/android-7.0/m-preview-timeline-crop.png
Binary files differ
diff --git a/docs/html/preview/images/m-preview-timeline.png b/docs/html/images/android-7.0/m-preview-timeline.png
similarity index 100%
rename from docs/html/preview/images/m-preview-timeline.png
rename to docs/html/images/android-7.0/m-preview-timeline.png
Binary files differ
diff --git a/docs/html/preview/images/mw-portrait.png b/docs/html/images/android-7.0/mw-portrait.png
similarity index 100%
rename from docs/html/preview/images/mw-portrait.png
rename to docs/html/images/android-7.0/mw-portrait.png
Binary files differ
diff --git a/docs/html/preview/images/mw-splitscreen.png b/docs/html/images/android-7.0/mw-splitscreen.png
similarity index 100%
rename from docs/html/preview/images/mw-splitscreen.png
rename to docs/html/images/android-7.0/mw-splitscreen.png
Binary files differ
diff --git a/docs/html/preview/images/mw-splitscreen_2x.png b/docs/html/images/android-7.0/mw-splitscreen_2x.png
similarity index 100%
rename from docs/html/preview/images/mw-splitscreen_2x.png
rename to docs/html/images/android-7.0/mw-splitscreen_2x.png
Binary files differ
diff --git a/docs/html/preview/images/n-preview-setup.png b/docs/html/images/android-7.0/n-preview-setup.png
similarity index 100%
rename from docs/html/preview/images/n-preview-setup.png
rename to docs/html/images/android-7.0/n-preview-setup.png
Binary files differ
diff --git a/docs/html/preview/images/notifications-1.png b/docs/html/images/android-7.0/notifications-1.png
similarity index 100%
rename from docs/html/preview/images/notifications-1.png
rename to docs/html/images/android-7.0/notifications-1.png
Binary files differ
diff --git a/docs/html/preview/images/notifications-2.png b/docs/html/images/android-7.0/notifications-2.png
similarity index 100%
rename from docs/html/preview/images/notifications-2.png
rename to docs/html/images/android-7.0/notifications-2.png
Binary files differ
diff --git a/docs/html/preview/images/notifications-3.png b/docs/html/images/android-7.0/notifications-3.png
similarity index 100%
rename from docs/html/preview/images/notifications-3.png
rename to docs/html/images/android-7.0/notifications-3.png
Binary files differ
diff --git a/docs/html/preview/images/notifications-card.png b/docs/html/images/android-7.0/notifications-card.png
similarity index 100%
rename from docs/html/preview/images/notifications-card.png
rename to docs/html/images/android-7.0/notifications-card.png
Binary files differ
diff --git a/docs/html/preview/images/pip-active.png b/docs/html/images/android-7.0/pip-active.png
similarity index 100%
rename from docs/html/preview/images/pip-active.png
rename to docs/html/images/android-7.0/pip-active.png
Binary files differ
diff --git a/docs/html/preview/images/pip-button.png b/docs/html/images/android-7.0/pip-button.png
similarity index 100%
rename from docs/html/preview/images/pip-button.png
rename to docs/html/images/android-7.0/pip-button.png
Binary files differ
diff --git a/docs/html/preview/images/quicksettings.png b/docs/html/images/android-7.0/quicksettings.png
similarity index 100%
rename from docs/html/preview/images/quicksettings.png
rename to docs/html/images/android-7.0/quicksettings.png
Binary files differ
diff --git a/docs/html/preview/images/sample-activenotifications.png b/docs/html/images/android-7.0/sample-activenotifications.png
similarity index 100%
rename from docs/html/preview/images/sample-activenotifications.png
rename to docs/html/images/android-7.0/sample-activenotifications.png
Binary files differ
diff --git a/docs/html/preview/images/sample-directboot.png b/docs/html/images/android-7.0/sample-directboot.png
similarity index 100%
rename from docs/html/preview/images/sample-directboot.png
rename to docs/html/images/android-7.0/sample-directboot.png
Binary files differ
diff --git a/docs/html/preview/images/sample-messagingservice.png b/docs/html/images/android-7.0/sample-messagingservice.png
similarity index 100%
rename from docs/html/preview/images/sample-messagingservice.png
rename to docs/html/images/android-7.0/sample-messagingservice.png
Binary files differ
diff --git a/docs/html/preview/images/sample-multiwindow.png b/docs/html/images/android-7.0/sample-multiwindow.png
similarity index 100%
rename from docs/html/preview/images/sample-multiwindow.png
rename to docs/html/images/android-7.0/sample-multiwindow.png
Binary files differ
diff --git a/docs/html/preview/images/sample-scopeddirectoryaccess.png b/docs/html/images/android-7.0/sample-scopeddirectoryaccess.png
similarity index 100%
rename from docs/html/preview/images/sample-scopeddirectoryaccess.png
rename to docs/html/images/android-7.0/sample-scopeddirectoryaccess.png
Binary files differ
diff --git a/docs/html/images/android-7.0/scoped-directory-access-dont-ask.png b/docs/html/images/android-7.0/scoped-directory-access-dont-ask.png
new file mode 100644
index 0000000..6682948
--- /dev/null
+++ b/docs/html/images/android-7.0/scoped-directory-access-dont-ask.png
Binary files differ
diff --git a/docs/html/images/android-7.0/scoped-directory-access-dont-ask_2x.png b/docs/html/images/android-7.0/scoped-directory-access-dont-ask_2x.png
new file mode 100644
index 0000000..be717f9
--- /dev/null
+++ b/docs/html/images/android-7.0/scoped-directory-access-dont-ask_2x.png
Binary files differ
diff --git a/docs/html/images/android-7.0/scoped-directory-access-framed.png b/docs/html/images/android-7.0/scoped-directory-access-framed.png
new file mode 100644
index 0000000..e4d619a
--- /dev/null
+++ b/docs/html/images/android-7.0/scoped-directory-access-framed.png
Binary files differ
diff --git a/docs/html/images/android-7.0/scoped-directory-access-framed_2x.png b/docs/html/images/android-7.0/scoped-directory-access-framed_2x.png
new file mode 100644
index 0000000..fe17bce
--- /dev/null
+++ b/docs/html/images/android-7.0/scoped-directory-access-framed_2x.png
Binary files differ
diff --git a/docs/html/preview/images/scoped-folder-access-dont-ask.png b/docs/html/images/android-7.0/scoped-folder-access-dont-ask.png
similarity index 100%
rename from docs/html/preview/images/scoped-folder-access-dont-ask.png
rename to docs/html/images/android-7.0/scoped-folder-access-dont-ask.png
Binary files differ
diff --git a/docs/html/preview/images/scoped-folder-access-dont-ask_2x.png b/docs/html/images/android-7.0/scoped-folder-access-dont-ask_2x.png
similarity index 100%
rename from docs/html/preview/images/scoped-folder-access-dont-ask_2x.png
rename to docs/html/images/android-7.0/scoped-folder-access-dont-ask_2x.png
Binary files differ
diff --git a/docs/html/preview/images/scoped-folder-access-framed.png b/docs/html/images/android-7.0/scoped-folder-access-framed.png
similarity index 100%
rename from docs/html/preview/images/scoped-folder-access-framed.png
rename to docs/html/images/android-7.0/scoped-folder-access-framed.png
Binary files differ
diff --git a/docs/html/preview/images/scoped-folder-access-framed_2x.png b/docs/html/images/android-7.0/scoped-folder-access-framed_2x.png
similarity index 100%
rename from docs/html/preview/images/scoped-folder-access-framed_2x.png
rename to docs/html/images/android-7.0/scoped-folder-access-framed_2x.png
Binary files differ
diff --git a/docs/html/preview/images/screen-zoom-1.png b/docs/html/images/android-7.0/screen-zoom-1.png
similarity index 100%
rename from docs/html/preview/images/screen-zoom-1.png
rename to docs/html/images/android-7.0/screen-zoom-1.png
Binary files differ
diff --git a/docs/html/preview/images/screen-zoom-2.png b/docs/html/images/android-7.0/screen-zoom-2.png
similarity index 100%
rename from docs/html/preview/images/screen-zoom-2.png
rename to docs/html/images/android-7.0/screen-zoom-2.png
Binary files differ
diff --git a/docs/html/preview/images/studio-jdk-location.jpg b/docs/html/images/android-7.0/studio-jdk-location.jpg
similarity index 100%
rename from docs/html/preview/images/studio-jdk-location.jpg
rename to docs/html/images/android-7.0/studio-jdk-location.jpg
Binary files differ
diff --git a/docs/html/images/cards/card-drive-conversions_16-9_2x.png b/docs/html/images/cards/card-drive-conversions_16-9_2x.png
new file mode 100644
index 0000000..3448012
--- /dev/null
+++ b/docs/html/images/cards/card-drive-conversions_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-notifications_2x.png b/docs/html/images/cards/card-notifications_2x.png
new file mode 100644
index 0000000..e56c1df
--- /dev/null
+++ b/docs/html/images/cards/card-notifications_2x.png
Binary files differ
diff --git a/docs/html/images/cards/distribute/stories/aftenposten.png b/docs/html/images/cards/distribute/stories/aftenposten.png
new file mode 100644
index 0000000..60cb851
--- /dev/null
+++ b/docs/html/images/cards/distribute/stories/aftenposten.png
Binary files differ
diff --git a/docs/html/images/cards/distribute/stories/el-mundo.png b/docs/html/images/cards/distribute/stories/el-mundo.png
new file mode 100644
index 0000000..23db783
--- /dev/null
+++ b/docs/html/images/cards/distribute/stories/el-mundo.png
Binary files differ
diff --git a/docs/html/images/cards/distribute/stories/segundamano.png b/docs/html/images/cards/distribute/stories/segundamano.png
new file mode 100644
index 0000000..60e873c
--- /dev/null
+++ b/docs/html/images/cards/distribute/stories/segundamano.png
Binary files differ
diff --git a/docs/html/images/cards/distribute/stories/tapps.png b/docs/html/images/cards/distribute/stories/tapps.png
new file mode 100644
index 0000000..e01e3ad
--- /dev/null
+++ b/docs/html/images/cards/distribute/stories/tapps.png
Binary files differ
diff --git a/docs/html/images/cards/distribute/stories/witch-puzzle.png b/docs/html/images/cards/distribute/stories/witch-puzzle.png
new file mode 100644
index 0000000..c336f1b
--- /dev/null
+++ b/docs/html/images/cards/distribute/stories/witch-puzzle.png
Binary files differ
diff --git a/docs/html/images/distribute/google-sign-in-banner.png b/docs/html/images/distribute/google-sign-in-banner.png
new file mode 100644
index 0000000..ba04686
--- /dev/null
+++ b/docs/html/images/distribute/google-sign-in-banner.png
Binary files differ
diff --git a/docs/html/images/distribute/nearby_beacons.png b/docs/html/images/distribute/nearby_beacons.png
new file mode 100644
index 0000000..aba2f39
--- /dev/null
+++ b/docs/html/images/distribute/nearby_beacons.png
Binary files differ
diff --git a/docs/html/images/distribute/nearby_connections.png b/docs/html/images/distribute/nearby_connections.png
new file mode 100644
index 0000000..52e6daa
--- /dev/null
+++ b/docs/html/images/distribute/nearby_connections.png
Binary files differ
diff --git a/docs/html/images/distribute/nearby_messaging.png b/docs/html/images/distribute/nearby_messaging.png
new file mode 100644
index 0000000..6ae2d00
--- /dev/null
+++ b/docs/html/images/distribute/nearby_messaging.png
Binary files differ
diff --git a/docs/html/images/distribute/promote_ads_apps.png b/docs/html/images/distribute/promote_ads_apps.png
index 2f57865..1c25be3 100644
--- a/docs/html/images/distribute/promote_ads_apps.png
+++ b/docs/html/images/distribute/promote_ads_apps.png
Binary files differ
diff --git a/docs/html/images/distribute/promote_ads_gmail.png b/docs/html/images/distribute/promote_ads_gmail.png
index 1d21b4a..c1013fc 100644
--- a/docs/html/images/distribute/promote_ads_gmail.png
+++ b/docs/html/images/distribute/promote_ads_gmail.png
Binary files differ
diff --git a/docs/html/images/distribute/promote_ads_play.png b/docs/html/images/distribute/promote_ads_play.png
index 1cf51b2..ae0f84b 100644
--- a/docs/html/images/distribute/promote_ads_play.png
+++ b/docs/html/images/distribute/promote_ads_play.png
Binary files differ
diff --git a/docs/html/images/distribute/promote_ads_search.png b/docs/html/images/distribute/promote_ads_search.png
index 27c0b38..adcede1 100644
--- a/docs/html/images/distribute/promote_ads_search.png
+++ b/docs/html/images/distribute/promote_ads_search.png
Binary files differ
diff --git a/docs/html/images/distribute/promote_ads_web.png b/docs/html/images/distribute/promote_ads_web.png
index 588a3d4..8fefed1 100644
--- a/docs/html/images/distribute/promote_ads_web.png
+++ b/docs/html/images/distribute/promote_ads_web.png
Binary files differ
diff --git a/docs/html/images/distribute/promote_ads_youtube.png b/docs/html/images/distribute/promote_ads_youtube.png
index e88a796..ad44e51 100644
--- a/docs/html/images/distribute/promote_ads_youtube.png
+++ b/docs/html/images/distribute/promote_ads_youtube.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/aftenposten-icon.png b/docs/html/images/distribute/stories/aftenposten-icon.png
new file mode 100644
index 0000000..60cb851
--- /dev/null
+++ b/docs/html/images/distribute/stories/aftenposten-icon.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/el-mundo-icon.png b/docs/html/images/distribute/stories/el-mundo-icon.png
new file mode 100644
index 0000000..23db783
--- /dev/null
+++ b/docs/html/images/distribute/stories/el-mundo-icon.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/japanese-witch-puzzle.png b/docs/html/images/distribute/stories/japanese-witch-puzzle.png
new file mode 100644
index 0000000..6a7ef13
--- /dev/null
+++ b/docs/html/images/distribute/stories/japanese-witch-puzzle.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/segundamano-icon.png b/docs/html/images/distribute/stories/segundamano-icon.png
new file mode 100644
index 0000000..60e873c
--- /dev/null
+++ b/docs/html/images/distribute/stories/segundamano-icon.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-candy-hills.png b/docs/html/images/distribute/stories/tapps-candy-hills.png
new file mode 100644
index 0000000..14dcb94
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-candy-hills.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-orig-1.png b/docs/html/images/distribute/stories/tapps-icon-orig-1.png
new file mode 100644
index 0000000..44af423
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-orig-1.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-orig-2.png b/docs/html/images/distribute/stories/tapps-icon-orig-2.png
new file mode 100644
index 0000000..1b36255
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-orig-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-orig-3.png b/docs/html/images/distribute/stories/tapps-icon-orig-3.png
new file mode 100644
index 0000000..2f393f8
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-orig-3.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-var-1-2.png b/docs/html/images/distribute/stories/tapps-icon-var-1-2.png
new file mode 100644
index 0000000..fecab6e
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-var-1-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-var-1.png b/docs/html/images/distribute/stories/tapps-icon-var-1.png
new file mode 100644
index 0000000..77bd02a
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-var-1.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-var-2-2.png b/docs/html/images/distribute/stories/tapps-icon-var-2-2.png
new file mode 100644
index 0000000..84166c4
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-var-2-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-var-2.png b/docs/html/images/distribute/stories/tapps-icon-var-2.png
new file mode 100644
index 0000000..939c2fd
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-var-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-var-3-2.png b/docs/html/images/distribute/stories/tapps-icon-var-3-2.png
new file mode 100644
index 0000000..4aa782d
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-var-3-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-icon-var-3.png b/docs/html/images/distribute/stories/tapps-icon-var-3.png
new file mode 100644
index 0000000..1e44fdf
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-icon-var-3.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-logic-pic.png b/docs/html/images/distribute/stories/tapps-logic-pic.png
new file mode 100644
index 0000000..5029f79
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-logic-pic.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-logo.png b/docs/html/images/distribute/stories/tapps-logo.png
new file mode 100644
index 0000000..e01e3ad
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-logo.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-screen-orig-1.png b/docs/html/images/distribute/stories/tapps-screen-orig-1.png
new file mode 100644
index 0000000..d54e75c
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-screen-orig-1.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-screen-orig-2.png b/docs/html/images/distribute/stories/tapps-screen-orig-2.png
new file mode 100644
index 0000000..a2d18e3
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-screen-orig-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-screen-orig-3.png b/docs/html/images/distribute/stories/tapps-screen-orig-3.png
new file mode 100644
index 0000000..e01fe20
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-screen-orig-3.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-screen-var-1.png b/docs/html/images/distribute/stories/tapps-screen-var-1.png
new file mode 100644
index 0000000..b930350
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-screen-var-1.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-screen-var-2.png b/docs/html/images/distribute/stories/tapps-screen-var-2.png
new file mode 100644
index 0000000..9ccb8a6
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-screen-var-2.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-screen-var-3.png b/docs/html/images/distribute/stories/tapps-screen-var-3.png
new file mode 100644
index 0000000..8eb58e1
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-screen-var-3.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/tapps-villains-corp.png b/docs/html/images/distribute/stories/tapps-villains-corp.png
new file mode 100644
index 0000000..6e037da
--- /dev/null
+++ b/docs/html/images/distribute/stories/tapps-villains-corp.png
Binary files differ
diff --git a/docs/html/images/distribute/stories/witch-puzzle-icon.png b/docs/html/images/distribute/stories/witch-puzzle-icon.png
new file mode 100644
index 0000000..c336f1b
--- /dev/null
+++ b/docs/html/images/distribute/stories/witch-puzzle-icon.png
Binary files differ
diff --git a/docs/html/images/paypal-logo.png b/docs/html/images/paypal-logo.png
new file mode 100644
index 0000000..3e08b95
--- /dev/null
+++ b/docs/html/images/paypal-logo.png
Binary files differ
diff --git a/docs/html/images/tools/sdk-manager-support-libs.png b/docs/html/images/tools/sdk-manager-support-libs.png
index 3796800..cb4cea5 100644
--- a/docs/html/images/tools/sdk-manager-support-libs.png
+++ b/docs/html/images/tools/sdk-manager-support-libs.png
Binary files differ
diff --git a/docs/html/images/training/performance/animation-frames.png b/docs/html/images/training/performance/animation-frames.png
new file mode 100644
index 0000000..846c9fe4
--- /dev/null
+++ b/docs/html/images/training/performance/animation-frames.png
Binary files differ
diff --git a/docs/html/images/training/performance/animation-frames_2x.png b/docs/html/images/training/performance/animation-frames_2x.png
new file mode 100644
index 0000000..0aba2a5
--- /dev/null
+++ b/docs/html/images/training/performance/animation-frames_2x.png
Binary files differ
diff --git a/docs/html/images/training/performance/apk-structure.png b/docs/html/images/training/performance/apk-structure.png
new file mode 100644
index 0000000..75a180c
--- /dev/null
+++ b/docs/html/images/training/performance/apk-structure.png
Binary files differ
diff --git a/docs/html/images/training/tv/tif/app-link-2x.png b/docs/html/images/training/tv/tif/app-link-2x.png
new file mode 100644
index 0000000..d9d0582
--- /dev/null
+++ b/docs/html/images/training/tv/tif/app-link-2x.png
Binary files differ
diff --git a/docs/html/images/training/tv/tif/app-link-diagram.png b/docs/html/images/training/tv/tif/app-link-diagram.png
new file mode 100644
index 0000000..92328ad
--- /dev/null
+++ b/docs/html/images/training/tv/tif/app-link-diagram.png
Binary files differ
diff --git a/docs/html/images/training/tv/tif/app-link.png b/docs/html/images/training/tv/tif/app-link.png
new file mode 100644
index 0000000..7573a18
--- /dev/null
+++ b/docs/html/images/training/tv/tif/app-link.png
Binary files differ
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index aa0620a..3ceddf2 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -419,7 +419,8 @@
"distribute/engage/easy-signin.html",
"distribute/analyze/build-better-apps.html",
"distribute/engage/gcm.html",
- "distribute/engage/beta.html"
+ "distribute/engage/beta.html",
+ "distribute/engage/nearby.html"
]
},
"distribute/monetize": {
@@ -430,6 +431,7 @@
"distribute/monetize/ads.html",
"distribute/monetize/ecommerce.html",
"distribute/monetize/payments.html",
+ "distribute/monetize/conversions.html",
"distribute/analyze/understand-user-value.html",
]
},
@@ -761,6 +763,14 @@
"https://support.google.com/adwords/answer/6167162"
]
},
+ "distribute/users/nearby": {
+ "title": "",
+ "resources": [
+ "https://developers.google.com/nearby/",
+ "https://www.youtube.com/watch?v=hultDpBS22s",
+ "https://developers.google.com/beacons"
+ ]
+ },
"distribute/users/buildbuzz": {
"title": "",
"resources": [
@@ -847,8 +857,7 @@
"design/index.html",
"design/patterns/navigation.html",
"design/patterns/actionbar.html",
- "design/style/iconography.html",
- "design/patterns/notifications.html"
+ "design/style/iconography.html"
]
},
"distribute/essentials/corequalityguidelines/functionality": {
@@ -1066,7 +1075,6 @@
"distribute/getusers/notifications": {
"title": "",
"resources": [
- "design/patterns/notifications.html",
"distribute/engage/gcm.html",
"https://play.google.com/about/developer-content-policy.html"
]
@@ -1171,8 +1179,7 @@
"resources": [
"distribute/essentials/optimizing-your-app.html",
"distribute/tools/launch-checklist.html",
- "distribute/googleplay/developer-console.html",
- "design/patterns/notifications.html"
+ "distribute/googleplay/developer-console.html"
]
},
"distribute/engage/video/more": {
@@ -1556,6 +1563,15 @@
"https://support.google.com/googleplay/answer/2651410"
]
},
+ "distribute/monetize/conversions": {
+ "title": "",
+ "resources": [
+ "https://support.google.com/adwords/answer/2471188",
+ "https://developers.google.com/app-conversion-tracking/",
+ "https://support.google.com/analytics/answer/2611404",
+ "https://support.google.com/adwords/answer/1704341"
+ ]
+ },
"autolanding": {
"title": "",
"resources": [
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index e5347d9..44ccafa 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -1942,7 +1942,7 @@
"url": "https://support.google.com/googleplay/answer/2651410",
"timestamp": null,
"image": "images/play_dev.jpg",
- "title": "Google Play Accepted Payment Methods",
+ "title": "Google Play accepted payment methods",
"summary": "Support details on the payment methods supported in Google Play.",
"keywords": ["gift card"],
"type": "distribute",
@@ -1951,6 +1951,59 @@
{
"lang": "en",
"group": "",
+ "tags": [],
+ "url": "https://support.google.com/adwords/answer/2471188",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "AdWords Conversion Optimizer",
+ "summary": "Learn how Conversion Optimizer works to find the users who are most likely to convert and to serve them your conversion ads.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://developers.google.com/app-conversion-tracking/",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Track conversions with the AdWords SDK or server API",
+ "summary": "Use the lightweight AdWords app SDK or server-to-server API to track remarketing conversions.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://support.google.com/analytics/answer/2611404",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Create Remarketing Audiences in Google Analytics",
+ "summary": "Learn how to use preconfigured audiences created by the Analytics team or create your own to use in your conversion campaigns.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://support.google.com/adwords/answer/1704341",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Link your Google Analytics and AdWords accounts",
+ "summary": "Gain greater insight into how AdWords is driving app engagement and conversions, and use this insight to improve your ads and app.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+
+ {
+ "lang": "en",
+ "group": "",
"tags": ["plus", "social"],
"url": "https://plus.google.com/+AndroidDevelopers/",
"timestamp": null,
@@ -2719,7 +2772,6 @@
"type": "material design",
"titleFriendly": ""
},
-
{
"lang": "en",
"group": "",
@@ -2737,6 +2789,45 @@
"lang": "en",
"group": "",
"tags": [],
+ "url": "https://developers.google.com/nearby/",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Create features based on proximity",
+ "summary": "Build simple interactions between nearby devices and people.",
+ "keywords": ["nearby", "engage"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://www.youtube.com/watch?v=hultDpBS22s",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Use Nearby Messages to collaborate",
+ "summary": "Nearby Messages is perfect for setting up ad-hoc groups, collaborative sessions, or sharing resources with people in a co-located space.",
+ "keywords": ["nearby", "engage"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://developers.google.com/beacons",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Mark up the world using beacons",
+ "summary": "Give your users better location and proximity experiences by providing a strong context signal for their devices in the form of Bluetooth low energy (BLE) beacons with Eddystone.",
+ "keywords": ["nearby", "engage"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
"url": "https://support.google.com/adwords/answer/6167164",
"timestamp": null,
"image": "distribute/images/advertising.jpg",
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
index 5e271b9..c79ad88 100644
--- a/docs/html/jd_extras_en.js
+++ b/docs/html/jd_extras_en.js
@@ -1943,13 +1943,65 @@
"url": "https://support.google.com/googleplay/answer/2651410",
"timestamp": null,
"image": "images/cards/google-play_2x.png",
- "title": "Google Play Accepted Payment Methods",
+ "title": "Google Play accepted payment methods",
"summary": "Support details on the payment methods supported in Google Play.",
"keywords": ["gift card"],
"type": "distribute",
"category": "google play"
},
{
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://support.google.com/adwords/answer/2471188",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "AdWords Conversion Optimizer",
+ "summary": "Learn how Conversion Optimizer works to find the users who are most likely to convert and to serve them your conversion ads.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://developers.google.com/app-conversion-tracking/",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Track conversions with the AdWords SDK or server API",
+ "summary": "Use the lightweight AdWords app SDK or server-to-server API to track remarketing conversions.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://support.google.com/analytics/answer/2611404",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Create Remarketing Audiences in Google Analytics",
+ "summary": "Learn how to use preconfigured audiences created by the Analytics team or create your own to use in your conversion campaigns.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://support.google.com/adwords/answer/1704341",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Link your Google Analytics and AdWords accounts",
+ "summary": "Gain greater insight into how AdWords is driving app engagement and conversions, and use this insight to improve your ads and app.",
+ "keywords": [],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
"lang": "en",
"group": "",
"tags": ["plus", "social"],
@@ -2603,6 +2655,19 @@
"lang": "en",
"group": "",
"tags": [],
+ "url": "https://material.google.com/patterns/notifications.html",
+ "timestamp": "1469639720",
+ "image": "images/cards/card-notifications_2x.png",
+ "title": "Notifications",
+ "summary": "Notifications inform your app’s users about relevant and timely events in your app.",
+ "keywords": ["notifications", "design"],
+ "type": "design",
+ "category": "material design"
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
"url": "https://www.google.com/design/spec/usability/",
"timestamp": null,
"image": "images/cards/material-usability_2x.png",
@@ -2681,7 +2746,6 @@
"type": "design",
"category": "material design"
},
-
{
"lang": "en",
"group": "",
@@ -2699,6 +2763,45 @@
"lang": "en",
"group": "",
"tags": [],
+ "url": "https://developers.google.com/nearby/",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Create features based on proximity",
+ "summary": "Build simple interactions between nearby devices and people.",
+ "keywords": ["nearby", "engage"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://www.youtube.com/watch?v=hultDpBS22s",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Use Nearby Messages to collaborate",
+ "summary": "Nearby Messages is perfect for setting up ad-hoc groups, collaborative sessions, or sharing resources with people in a co-located space.",
+ "keywords": ["nearby", "engage"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "https://developers.google.com/beacons",
+ "timestamp": null,
+ "image": "images/play_dev.jpg",
+ "title": "Mark up the world using beacons",
+ "summary": "Give your users better location and proximity experiences by providing a strong context signal for their devices in the form of Bluetooth low energy (BLE) beacons with Eddystone.",
+ "keywords": ["nearby", "engage"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
"url": "https://support.google.com/adwords/answer/6167164",
"timestamp": null,
"image": "distribute/images/advertising.jpg",
@@ -2796,6 +2899,19 @@
"lang": "en",
"group": "",
"tags": [],
+ "url": "https://www.udacity.com/courses/ud876-3",
+ "timestamp": null,
+ "image": "distribute/images/advertising.jpg",
+ "title": "Learn how to show ads in your Android app",
+ "summary": "Take this online course to learn how to use AdMob to display ads in your Android app.",
+ "keywords": ["marketing", "analytics"],
+ "type": "distribute",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
"url": "https://developers.google.com/mobile-ads-sdk/download",
"timestamp": null,
"image": "distribute/images/advertising.jpg",
@@ -2878,7 +2994,7 @@
"url": "https://developers.google.com/identity/sign-in/android/people",
"timestamp": 1383243492000,
"image": "images/cards/google-sign-in_2x.png",
- "title": "Get user profile details",
+ "title": "Get User Profile Details",
"summary": "After users sign-in with Google, you can access their age range, language, and public profile information.",
"keywords": ["signin", "identity", "google"],
"type": "distribute",
@@ -3613,6 +3729,59 @@
"lang":"en",
"type":"Video"
},
+
+ {
+ "title":"Android Performance Testing Codelab",
+ "titleFriendly":"",
+ "summary":"This codelab shows how to create a stable and reusable testing harness to run performance tests on a very simple existing app.",
+ "url":"https://codelabs.developers.google.com/codelabs/android-perf-testing/index.html",
+ "group":"",
+ "keywords": ["testing"],
+ "tags": [
+ ],
+ "image":"images/testing/testing-icon.png",
+ "type":"google"
+ },
+
+ {
+ "title":"Introduction to Doze",
+ "category":"android developers",
+ "summary":"A new way for the device to preserve battery by entering into an idle state.",
+ "url":"https://www.youtube.com/watch?v=N72ksDKrX6c",
+ "group":"",
+ "keywords": ["android, performance","battery"],
+ "tags": ["video, performance"],
+ "image":"https://i1.ytimg.com/vi/N72ksDKrX6c/maxresdefault.jpg",
+ "lang":"en",
+ "type":"develop"
+ },
+
+ {
+ "title":"Performance Profiling Tools",
+ "category":"training",
+ "summary":"Take a look under the hood to identify performance bottlenecks.",
+ "url":"https://developer.android.com/tools/performance/index.html",
+ "group":"",
+ "keywords": ["android, performance","profiling"],
+ "tags": ["android, performance"],
+ "image": null,
+ "lang":"en",
+ "type":"develop"
+ },
+
+ {
+ "title":"Managing Your App's Memory",
+ "category":"training",
+ "summary":"Learn how you can proactively reduce memory usage while developing for Android.",
+ "url":"https://developer.android.com/training/articles/memory.html",
+ "group":"",
+ "keywords": ["android, performance","profiling"],
+ "tags": ["android, performance"],
+ "image": null,
+ "lang":"en",
+ "type":"develop"
+ },
+
{
"url":"https://www.youtube.com/watch?v=QDM52bblwlg",
"image": "images/distribute/hero-family-discovery.jpg",
@@ -4107,7 +4276,8 @@
"distribute/engage/easy-signin.html",
"distribute/analyze/build-better-apps.html",
"distribute/engage/gcm.html",
- "distribute/engage/beta.html"
+ "distribute/engage/beta.html",
+ "distribute/engage/nearby.html"
]
},
"distribute/monetize": {
@@ -4118,6 +4288,7 @@
"distribute/monetize/ads.html",
"distribute/monetize/ecommerce.html",
"distribute/monetize/payments.html",
+ "distribute/monetize/conversions.html",
"distribute/analyze/understand-user-value.html",
]
},
@@ -4427,6 +4598,14 @@
"https://support.google.com/adwords/answer/6167162"
]
},
+ "distribute/users/nearby": {
+ "title": "",
+ "resources": [
+ "https://developers.google.com/nearby/",
+ "https://www.youtube.com/watch?v=hultDpBS22s",
+ "https://developers.google.com/beacons"
+ ]
+ },
"distribute/users/buildbuzz": {
"title": "",
"resources": [
@@ -4505,7 +4684,7 @@
"design/patterns/navigation.html",
"design/patterns/actionbar.html",
"design/style/iconography.html",
- "design/patterns/notifications.html"
+ "https://material.google.com/patterns/notifications.html"
]
},
"distribute/essentials/corequalityguidelines/functionality": {
@@ -4702,7 +4881,7 @@
"distribute/getusers/notifications": {
"title": "",
"resources": [
- "design/patterns/notifications.html",
+ "https://material.google.com/patterns/notifications.html",
"distribute/engage/gcm.html",
"https://play.google.com/about/developer-content-policy.html"
]
@@ -4818,7 +4997,7 @@
"distribute/essentials/optimizing-your-app.html",
"distribute/tools/launch-checklist.html",
"distribute/googleplay/developer-console.html",
- "design/patterns/notifications.html"
+ "https://material.google.com/patterns/notifications.html"
]
},
"distribute/engage/video/more": {
@@ -5064,6 +5243,15 @@
"https://support.google.com/googleplay/answer/2651410"
]
},
+ "distribute/monetize/conversions": {
+ "title": "",
+ "resources": [
+ "https://support.google.com/adwords/answer/2471188",
+ "https://developers.google.com/app-conversion-tracking/",
+ "https://support.google.com/analytics/answer/2611404",
+ "https://support.google.com/adwords/answer/1704341"
+ ]
+ },
"topic/libraries": {
"title": "",
"resources": [
@@ -5368,21 +5556,37 @@
"https://medium.com/google-developers/writing-more-code-by-writing-less-code-with-android-studio-live-templates-244f648d17c7#.hczcm02du",
]
},
- "preview/landing/resources": {
+ "nougat/landing/resources": {
"title": "",
"resources": [
- "preview/overview.html",
- "preview/api-overview.html",
- "preview/behavior-changes.html",
- "preview/setup-sdk.html",
- "preview/samples.html",
- "preview/support.html"
+ "about/versions/nougat/api-overview.html",
+ "about/versions/nougat/behavior-changes.html",
+ "about/versions/nougat/samples.html",
]
},
+
+ "preview/landing/videos/first": {
+ "title": "",
+ "resources": [
+ "https://www.youtube.com/watch?v=CsulIu3UaUM"
+ ]
+ },
+
+ "develop/performance/landing": {
+ "title": "",
+ "resources": [
+ "https://android-developers.blogspot.com/2010/07/multithreading-for-performance.html",
+ "https://www.udacity.com/course/ud825",
+ "https://www.youtube.com/watch?v=N72ksDKrX6c",
+ "tools/performance/index.html",
+ "https://codelabs.developers.google.com/codelabs/android-perf-testing/index.html",
+ "training/articles/memory.html",
+ ]
+ },
+
"preview/landing/more": {
"title": "",
"resources": [
- "https://www.youtube.com/watch?v=CsulIu3UaUM",
"preview/features/multi-window.html",
"preview/features/notification-updates.html",
"preview/features/background-optimization.html",
diff --git a/docs/html/license.jd b/docs/html/license.jd
index 4f4036b..e843c6b 100644
--- a/docs/html/license.jd
+++ b/docs/html/license.jd
@@ -9,7 +9,7 @@
<p>For the purposes of licensing, the content of this web site is divided
into two categories:</p>
<ul>
- <li>Documentation content, including both static documentation and content extracted from source
+ <li>Documentation content, including both static documentation and content extracted from source
code modules, as well as sample code, and </li>
<li>All other site content</li>
</ul>
@@ -66,7 +66,7 @@
license, note that proprietary trademarks and brand features are not
included in that license.</li>
-<li>Google's trademarks and other brand features (including the
+<li>Google's trademarks and other brand features (including the
<img src="images/android-logo.png" alt="Android"
style="margin:0;padding:0 2px;vertical-align:baseline" /> stylized typeface logo) are not included
in the license.
@@ -74,7 +74,7 @@
href="{@docRoot}distribute/tools/promote/brand.html">Brand Guidelines</a> for
information about this usage. </li>
-<li>In some cases, a page may include content, such as an image, that is not
+<li>In some cases, a page may include content, such as an image, that is not
covered by the license. In that case, we will label the content that is not licensed. </li>
<li>In addition, content linked from a page on this site is not covered
@@ -92,22 +92,22 @@
versions of content that appears on a page made available under the
terms of the Creative Commons Attribution license. On this site, the
requirement for attribution applies only to the non-documentation
-content, as described earlier in this document. The complete
-requirements for attribution can be found in section 4b of the
+content, as described earlier in this document. The complete
+requirements for attribution can be found in section 4b of the
<a href="http://creativecommons.org/licenses/by/2.5/legalcode">
Creative Commons legal code</a>.
</p>
<p>
In practice we ask that you provide attribution to the Android Open
- Source project to the best of the ability of the medium in which you
- are producing the work. There are several typical ways in which this
+ Source project to the best of the ability of the medium in which you
+ are producing the work. There are several typical ways in which this
might apply:
</p>
<h3>Exact Reproductions</h3>
<p>
If your online work <em>exactly reproduces</em> text or images from this
site, in whole or in part, please include a paragraph at the bottom
- of your page that reads:
+ of your page that reads:
</p>
<p style="margin-left:20px;font-style:italic">
Portions of this page are reproduced from work created and <a
diff --git a/docs/html/ndk/downloads/_book.yaml b/docs/html/ndk/downloads/_book.yaml
deleted file mode 100644
index a5e92ce..0000000
--- a/docs/html/ndk/downloads/_book.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-toc:
-- title: Downloads
- path: /ndk/downloads/index.html
-
-- title: Revision History
- path: /ndk/downloads/revision_history.html
diff --git a/docs/html/ndk/downloads/downloads_toc.cs b/docs/html/ndk/downloads/downloads_toc.cs
deleted file mode 100644
index dbe8aec..0000000
--- a/docs/html/ndk/downloads/downloads_toc.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-<?cs # Table of contents for Dev Guide.
-
- For each document available in translation, add an localized title to this TOC.
- Do not add localized title for docs not available in translation.
- Below are template spans for adding localized doc titles. Please ensure that
- localized titles are added in the language order specified below.
-?>
-
-<ul id="nav">
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/downloads/index.html"><span class="en">
- Downloads</span></a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/downloads/revision_history.html">
- <span class="en">Revision History</span></a></div>
- </li>
-</ul>
-
-
-<script type="text/javascript">
-<!--
- buildToggleLists();
- changeNavLang(getLangPref());
-//-->
-</script>
-
diff --git a/docs/html/ndk/downloads/index.jd b/docs/html/ndk/downloads/index.jd
deleted file mode 100644
index 954b049..0000000
--- a/docs/html/ndk/downloads/index.jd
+++ /dev/null
@@ -1,530 +0,0 @@
-ndk=true
-page.template=sdk
-page.title=NDK Downloads
-
-@jd:body
-
-
-<!-- start studio download modal -->
-<div data-modal="ndk_tos" class="dac-modal" id="ndk_tos">
- <div class="dac-modal-container">
- <div class="dac-modal-window">
- <header class="dac-modal-header">
- <div class="dac-modal-header-actions">
- <button class="dac-modal-header-close" data-modal-toggle></button>
- </div>
- <section class="dac-swap-section dac-active dac-down">
- <h2 class="norule dac-modal-header-title" id="tos-header">Download the Android NDK</h2>
- </section>
- </header>
- <section class="dac-swap-section dac-active dac-left">
- <section class="dac-modal-content">
- <fieldset class="dac-form-fieldset">
- <div class="cols">
- <div class="col-2of2 tos-leftCol">
- <p class="sdk-terms-intro">Before installing the Android
- NDK,
- you must agree to the following terms
- and conditions.</p>
- </div>
-<div class="sdk-terms" style="width:auto" onfocus="this.blur()">
-<h2 class="norule">Terms and Conditions</h2>
-This is the Android Software Development Kit License Agreement
-
-<h3>1. Introduction</h3>
-1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and
-specifically including the Android system files, packaged APIs, and Google APIs add-ons) is
-licensed to you subject to the terms of the License Agreement. The License Agreement forms a
-legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 "Android" means the Android software stack for devices, as made available under the Android
-Open Source Project, which is located at the following URL: http://source.android.com/, as updated
-from time to time.
-
-1.3 A "compatible implementation" means any Android device that (i) complies with the Android
-Compatibility Definition document, which can be found at the Android compatibility website
-(http://source.android.com/compatibility) and which may be updated from time to time; and (ii)
-successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600
-Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-
-<h3>2. Accepting this License Agreement</h3>
-2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK
-if you do not accept the License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred
-from receiving the SDK under the laws of the United States or other countries, including the
-country in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other
-entity, you represent and warrant that you have full legal authority to bind your employer or such
-entity to the License Agreement. If you do not have the requisite authority, you may not accept the
-License Agreement or use the SDK on behalf of your employer or other entity.
-
-
-<h3>3. SDK License from Google</h3>
-3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide,
-royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to
-develop applications for compatible implementations of Android.
-
-3.2 You may not use this SDK to develop applications for other platforms (including non-compatible
-implementations of Android) or to develop another SDK. You are of course free to develop
-applications for other platforms, including non-compatible implementations of Android, provided
-that this SDK is not used for that purpose.
-
-3.3 You agree that Google or third parties own all legal right, title and interest in and to the
-SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property
-Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law,
-and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement.
-Except to the extent required by applicable third party licenses, you may not: (a) copy (except for
-backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create
-derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile
-handset or any other hardware device except a personal computer, combine any part of the SDK with
-other software, or distribute any software or device incorporating a part of the SDK.
-
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source
-software license are governed solely by the terms of that open source software license and not the
-License Agreement.
-
-3.6 You agree that the form and nature of the SDK that Google provides may change without prior
-notice to you and that future versions of the SDK may be incompatible with applications developed
-on previous versions of the SDK. You agree that Google may stop (permanently or temporarily)
-providing the SDK (or any features within the SDK) to you or to users generally at Google's sole
-discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names,
-trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including
-copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-
-<h3>4. Use of the SDK by You</h3>
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under
-the License Agreement in or to any software applications that you develop using the SDK, including
-any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the
-License Agreement and (b) any applicable law, regulation or generally accepted practices or
-guidelines in the relevant jurisdictions (including any laws regarding the export of data or
-software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will
-protect the privacy and legal rights of those users. If the users provide you with user names,
-passwords, or other login information or personal information, you must make the users aware that
-the information will be available to your application, and you must provide legally adequate
-privacy notice and protection for those users. If your application stores personal or sensitive
-information provided by users, it must do so securely. If the user provides your application with
-Google Account information, your application may only use that information to access the user's
-Google Account when, and for the limited purposes for which, the user has given you permission to
-do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or
-distribution of an application, that interferes with, disrupts, damages, or accesses in an
-unauthorized manner the servers, networks, or other properties or services of any third party
-including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or
-to any third party for) any data, content, or resources that you create, transmit or display
-through Android and/or applications for Android, and for the consequences of your actions
-(including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or
-to any third party for) any breach of your obligations under the License Agreement, any applicable
-third party contract or Terms of Service, or any applicable law or regulation, and for the
-consequences (including any loss or damage which Google or any third party may suffer) of any such
-breach.
-
-
-<h3>5. Your Developer Credentials</h3>
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer
-credentials that may be issued to you by Google or which you may choose yourself and that you will
-be solely responsible for all applications that are developed under your developer credentials.
-
-
-<h3>6. Privacy and Information</h3>
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage
-statistics from the software including but not limited to a unique identifier, associated IP
-address, version number of the software, and information on which tools and/or services in the SDK
-are being used and how they are being used. Before any of this information is collected, the SDK
-will notify you and seek your consent. If you withhold consent, the information will not be
-collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in
-accordance with Google's Privacy Policy.
-
-
-<h3>7. Third Party Applications</h3>
-7.1 If you use the SDK to run applications developed by a third party or that access data, content
-or resources provided by a third party, you agree that Google is not responsible for those
-applications, data, content, or resources. You understand that all data, content or resources which
-you may access through such third party applications are the sole responsibility of the person from
-which they originated and that Google is not liable for any loss or damage that you may experience
-as a result of the use or access of any of those third party applications, data, content, or
-resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third
-party application may be protected by intellectual property rights which are owned by the providers
-(or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell,
-distribute or create derivative works based on these data, content, or resources (either in whole
-or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may
-be subject to separate terms between you and the relevant third party. In that case, the License
-Agreement does not affect your legal relationship with these third parties.
-
-
-<h3>8. Using Android APIs</h3>
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be
-protected by intellectual property rights which are owned by Google or those parties that provide
-the data (or by other persons or companies on their behalf). Your use of any such API may be
-subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or
-create derivative works based on this data (either in whole or in part) unless allowed by the
-relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you
-shall retrieve data only with the user's explicit consent and only when, and for the limited
-purposes for which, the user has given you permission to do so.
-
-
-<h3>9. Terminating this License Agreement</h3>
-9.1 The License Agreement will continue to apply until terminated by either you or Google as set
-out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK
-and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement with you if:
-(A) you have breached any provision of the License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated
-its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country
-in which you are resident or from which you use the service, or the provision of the SDK or certain
-SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When the License Agreement comes to an end, all of the legal rights, obligations and
-liabilities that you and Google have benefited from, been subject to (or which have accrued over
-time whilst the License Agreement has been in force) or which are expressed to continue
-indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall
-continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-<h3>10. DISCLAIMER OF WARRANTIES</h3>
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE
-SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE
-SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR
-COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-<h3>11. LIMITATION OF LIABILITY</h3>
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS
-LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY
-LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN
-AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-
-<h3>12. Indemnification</h3>
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless
-Google, its affiliates and their respective directors, officers, employees and agents from and
-against any and all claims, actions, suits or proceedings, as well as any and all losses,
-liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or
-accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes
-any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of
-any person or defames any person or violates their rights of publicity or privacy, and (c) any
-non-compliance by you with the License Agreement.
-
-
-<h3>13. Changes to the License Agreement</h3>
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK.
-When these changes are made, Google will make a new version of the License Agreement available on
-the website where the SDK is made available.
-
-
-<h3>14. General Legal Terms</h3>
-14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs
-your use of the SDK (excluding any services which Google may provide to you under a separate
-written agreement), and completely replaces any prior agreements between you and Google in relation
-to the SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is
-contained in the License Agreement (or which Google has the benefit of under any applicable law),
-this will not be taken to be a formal waiver of Google's rights and that those rights or remedies
-will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any
-provision of the License Agreement is invalid, then that provision will be removed from the License
-Agreement without affecting the rest of the License Agreement. The remaining provisions of the
-License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the
-parent shall be third party beneficiaries to the License Agreement and that such other companies
-shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that
-confers a benefit on (or rights in favor of) them. Other than this, no other person or company
-shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST
-COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE
-LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in the License Agreement may not be assigned or transferred by either you
-or Google without the prior written approval of the other party. Neither you nor Google shall be
-permitted to delegate their responsibilities or obligations under the License Agreement without the
-prior written approval of the other party.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be
-governed by the laws of the State of California without regard to its conflict of laws provisions.
-You and Google agree to submit to the exclusive jurisdiction of the courts located within the
-county of Santa Clara, California to resolve any legal matter arising from the License Agreement.
-Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies
-(or an equivalent type of urgent legal relief) in any jurisdiction.
-
-<em>November 20, 2015</em>
-</div>
-
-
-
-<div id="sdk-terms-form">
-<p>
-<input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
-<label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
-</p>
-<p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
-</div>
-
- </div>
- </div>
- </fieldset>
- </section>
- </form>
- </section>
- </div>
- </div>
-</div>
-<!-- end ndk_tos modal -->
-
-
- <p>Select, from the table above, the NDK package for your development platform. For information
- about the changes in the newest version of the NDK, see <a href="#rel">Release Notes</a>. For
- information about earlier revisions, see <a href="{@docRoot}ndk/downloads/revision_history.html">
- NDK Revision History.</a></p>
-
-
-<script>
-$('#Downloads').after($('#download-table'));
-</script>
-
-<h2 id="rel">Release Notes</h2>
-
-<p>
- Android NDK, Revision 12 <em>(June 2016)</em>
-</p>
-
-<dl>
-<dt>
- Announcements
-</dt>
-
-<ul>
- <li>The <code>ndk-build</code> command will default to using
- Clang in an upcoming release. GCC will be removed in a later release.
- </li>
- <li>The <code>make-standalone-toolchain.sh</code> script will be removed
- in an upcoming release. If you use this script, please plan to migrate to the
- <code>make_standalone_toolchain.py</code> as soon as possible.
- </li>
-</ul>
-
-<dt>
- NDK
-</dt>
-
-<ul>
- <li>Removed support for the armeabi-v7a-hard ABI. See the explanation in the
- <a href=
- "https://android.googlesource.com/platform/ndk/+/ndk-r12-release/docs/HardFloatAbi.md">
- documentation</a>.
- </li>
-
- <li>Removed all sysroots for platform levels prior to Android 2.3 (API level 10).
- We dropped support for them in NDK r11, but neglected to actually remove them.
- </li>
-
- <li>Updated exception handling when using c++_shared on ARM32 so that it
- mostly works (see <a href="#known-issues">Known Issues</a>). The unwinder
- is now linked into each linked object rather than into libc++ itself.
- </li>
-
- <li>Pruned the default compiler flags (<a href=
- "https://github.com/android-ndk/ndk/issues/27">NDK Issue 27</a>). You can see
- details of this update in <a href=
- "https://android-review.googlesource.com/#/c/207721/5">Change 207721</a>.
- </li>
-
- <li>Added a Python implementation of standalone toolchains in <code>
- build/tools/make_standalone_toolchain.py</code>. On Windows, you no longer
- need Cygwin to use this feature. Note that the bash flavor will be removed
- in an upcoming release, so please test the new one now.
- </li>
-
- <li>Configured Clang debug builds to have the <code>-fno-limit-debug-info</code>
- option is enabled by default. This change enables better debugging with LLDB.
- </li>
-
- <li>Enabled the <code>--build-id</code> as a default option. This option
- causes an identifier to be shown in native crash reports so you can easily
- identify which version of your code was running.
- </li>
-
- <li>Fixed issue with <code>NDK_USE_CYGPATH</code> so that it no longer causes
- problems with libgcc
- (<a href="http://b.android.com/195486">Issue 195486</a>).
- </li>
-
- <li>Enabled the following options as default:
- <code>-Wl,--warn-shared-textrel</code> and <code>-Wl,--fatal-warnings</code>.
- If you have shared text relocations, your app does not load on Android 6.0
- (API level 23) and higher. Note that this configuration has never been
- allowed for 64-bit apps.
- </li>
-
- <li>Fixed a few issues so that precompiled headers work better
- (<a href="https://github.com/android-ndk/ndk/issues/14">NDK Issue 14</a>,
- <a href="https://github.com/android-ndk/ndk/issues/16">NDK Issue 16</a>).
- </li>
-
- <li>Removed unreachable ARM (non-thumb) STL libraries.
- </li>
-
- <li>Added Vulkan support to android-24.
- </li>
-
- <li>Added Choreographer API to android-24.
- </li>
-
- <li>Added libcamera2 APIs for devices that support the
- <code>INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED</code> feature level or higher.
- For more information, see the
- <a href="{@docRoot}reference/android/hardware/camera2/CameraCharacteristics.html#INFO_SUPPORTED_HARDWARE_LEVEL">
- <code>CameraCharacteristics</code></a> reference.
- </li>
-
-</ul>
-
-<dt>
- Clang
-</dt>
-
-<ul>
- <li>Clang has been updated to 3.8svn (r256229, build 2812033). Note that
- Clang packaged in the Windows 64-bit NDK is actually 32-bit.
- </li>
-
- <li>Fixed <code>__thread</code> so that it works for real this time.
- </li>
-</ul>
-
-<dt>
- GCC
-</dt>
-
-<ul>
- <li>Synchronized the compiler with the ChromeOS GCC @ google/gcc-4_9 r227810.
- </li>
-
- <li>Backported coverage sanitizer patch from ToT (r231296).
- </li>
-
- <li>Fixed <code>libatomic</code> to not use ifuncs (<a href=
- "https://github.com/android-ndk/ndk/issues/31">NDK Issue 31</a>).
- </li>
-</ul>
-
-<dt>
- Binutils
-</dt>
-
-<ul>
- <li>Silenced the "Erratum 843419 found and fixed" info messages.
- </li>
-
- <li>Introduced option <code>--long-plt</code> to fix an internal linker error
- when linking huge arm32 binaries.
- </li>
-
- <li>Fixed wrong run time stubs for <code>AArch64</code>. This problem was
- causing jump addresses to be calculated incorrectly for very large
- dynamic shared objects (DSOs).
- </li>
-
- <li>Introduced default option <code>--no-apply-dynamic</code> to work around
- a dynamic linker bug for earlier Android releases.
- </li>
-
- <li>Fixed a known issue with NDK r11 where <code>dynamic_cast</code> was not
- working with Clang, x86, stlport_static and optimization.
- </li>
-</ul>
-
-<dt>
- GDB
-</dt>
-
-<ul>
- <li>Updated to GDB version 7.11. For more information about this release, see
- <a href="https://www.gnu.org/software/gdb/news/">GDB News</a>.
- </li>
-
- <li>Fixed a number of bugs in the <code>ndk-gdb.py</code> script.
- </li>
-</ul>
-
-<dt id="known-issues">
- Known Issues
-</dt>
-
-<ul>
- <li>The x86 <a href="http://source.android.com/devices/tech/debug/asan.html">Address
- Sanitizer</a> (ASAN) currently does not work. For more information, see
- <a href="https://android-review.googlesource.com/#/c/186276/">Issue 186276</a>.
- </li>
-
- <li>Exception unwinding with <code>c++_shared</code> does not work for ARM on
- Android 2.3 (API level 9) or Android 4.0 (API level 14).
- </li>
-
- <li>Bionic headers and libraries for Android 6.0 (API level 23) and higher
- are not yet exposed despite the presence of android-24. Those platforms still
- have the Android 5.0 (API level 21) headers and libraries, which is consistent
- with NDK r11.
- </li>
-
- <li>The RenderScript tools are not present, which is consistent with
- NDK r11.
- (<a href="https://github.com/android-ndk/ndk/issues/7">NDK Issue 7</a>)
- </li>
-
- <li>In <code>NdkCameraMetadataTags.h</code> header file, the camera metadata
- tag enum value <code>ACAMERA_STATISTICS_LENS_SHADING_CORRECTION_MAP</code>
- was listed by accident and will be removed in next release. Use
- the <code>ACAMERA_STATISTICS_LENS_SHADING_MAP</code> value instead.
- </li>
-
-</ul>
-
-</dl>
diff --git a/docs/html/ndk/downloads/revision_history.jd b/docs/html/ndk/downloads/revision_history.jd
deleted file mode 100644
index 211b64e..0000000
--- a/docs/html/ndk/downloads/revision_history.jd
+++ /dev/null
@@ -1,3766 +0,0 @@
-page.title=NDK Revision History
-@jd:body
-
-<p>This page provides information on previous releases of the NDK, enumerating the changes that
-took place in each new version.</p>
-
-
-<div class="toggle-content closed">
-<a name="11b"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 11c</a> <em>(March 2016)</em>
- </p>
- <div class="toggle-content-toggleme">
-
-<dl>
- <dd>
- <ul>
- <li>Changes
- <ul>
- <li>Applied additional fixes to the {@code ndk-gdb.py} script.
- </li>
- <li>Added an optional package name argument to the {@code ndk-gdb}
- command {@code --attach} option.
- (<a href="https://github.com/android-ndk/ndk/issues/13">Issue 13</a>)
- </li>
- <li>Fixed invalid toolchain paths for 32-bit Windows platform.
- (<a href="https://github.com/android-ndk/ndk/issues/45">Issue 45</a>)
- </li>
- <li>Fixed the relative path for the {@code ndk-which} command.
- (<a href="https://github.com/android-ndk/ndk/issues/29">Issue 29</a>)
- </li>
- <li>Fixed use of cygpath for the libgcc compiler.
- (Android <a href="http://b.android.com/195486">Issue 195486</a>)
- </li>
- </ul>
- </li>
- </ul>
- </dd>
-</dl>
-
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="11b"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 11b</a> <em>(March 2016)</em>
- </p>
- <div class="toggle-content-toggleme">
-
- <dl>
- <dt>NDK</dt>
- <dd>
- <ul>
- <li>Important announcements
- <ul>
- <li>We’ve moved our bug tracker to <a href="https://github.com/android-ndk/ndk/issues">
- GitHub.</a></li>
- </ul>
- </li>
-
- <li>Changes
- <ul>
- <li>{@code ndk-gdb.py} is fixed. It had
- <a href="https://github.com/android-ndk/ndk/issues/3">regressed entirely</a>
- in r11.</li>
- <li>{@code ndk-gdb} for Mac <a href="https://github.com/android-ndk/ndk/issues/2">
- is fixed</a>.</li>
- <li>Added more top-level shortcuts for command line tools:
- <ul>
- <li>{@code ndk-depends}.</li>
- <li>{@code ndk-gdb}.</li>
- <li>{@code ndk-stack}.</li>
- <li>{@code ndk-which}. This command had been entirely absent from previous
- releases.</li>
- </ul>
- </li>
- <li>Fixed standalone toolchains for libc++, which had been missing
- {@code __cxxabi_config.h}.</li>
- <li>Fixed help documentation for {@code --toolchain} in
- {@code make-standalone-toolchain.sh}.</li>
- </li>
- </ul>
- </dd>
-
- <dt>Clang</dt>
- <dd>
- <ul>
- <li>Errata</li>
- <ul>
- <li>Contrary to what we reported in the r11 Release Notes, {@code __thread}
- does not work. This is because the version of Clang we ship is missing a bug fix for
- emulated TLS support.</li>
- </ul>
- </ul>
- </dd>
- </dl>
-
-
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="11"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 11</a> <em>(March 2016)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Clang</dt>
- <dd>
- <ul>
- <li>Important announcements
- <ul>
- <li>We strongly recommend switching to Clang.
- <ul>
- <li>If you experience problems with Clang, file bugs
- <a href="https://github.com/android-ndk/ndk/issues">here</a> for issues
- specific to Clang in the NDK. For more general Clang issues,
- file bugs by following the instructions on
- <a href="http://llvm.org/docs/HowToSubmitABug.html">this page</a>.</li>
- </ul>
- </li>
- <li>Clang has been updated to 3.8svn (r243773, build 2481030).
- <ul>
- <li>This version is a nearly pure upstream Clang.</li>
- <li>The Windows 64-bit downloadable NDK package contains a 32-bit
- version of Clang.</li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>Additions
- <ul>
- <li>Clang now provides support for emulated TLS.
- <ul>
- <li>The compiler now supports {@code __thread} by emulating
- ELF TLS with pthread thread-specific data.</li>
- <li>C++11 {@code thread_local} works in some cases, but not
- for data with non-trivial destructors, because those cases
- require support from libc. This limitation does not
- apply when running on Android 6.0 (API level 23) or newer.</li>
- <li>Emulated TLS does not yet work with Aarch64 when
- TLS variables are accessed from a shared library.</li>
- </ul>
- </li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>GCC</dt>
- <dd>
- <ul>
- <li>Important announcements</li>
- <ul>
- <li>GCC in the NDK is now deprecated in favor of Clang.
- <ul>
- <li>The NDK will neither be upgrading to 5.x, nor accept
- non-critical backports.</li>
- <li>Maintenance for miscompiles and internal compiler errors
- in 4.9 will be handled on a case by case basis.</li>
- </ul>
- </li>
- </ul>
- <li>Removals
- <ul>
- <li>Removed GCC 4.8. All targets now use GCC 4.9.</li>
- </ul>
- </li>
- <li>Other changes
- <ul>
- <li>Synchronized google/gcc-4_9 to r224707. Previously, it had been
- synchronized with r214835.</li>
- </ul>
- </li>
- </ul>
- </dd>
- </dl>
- <dl>
- <dt>NDK</dt>
- <dd>
- <ul>
- <li>Important announcements
- <ul>
- <li>The samples are no longer included in the NDK package.
- They are instead available on
- <a href="https://github.com/googlesamples/android-ndk">GitHub.</a>
- </li>
- <li>The documentation is no longer included in the NDK package.
- Instead, it is on the <a href="{@docRoot}ndk/index.html">Android
- developer website.</a></li>
- </ul>
- </li>
-
- <li>Additions
- <ul>
- <li>Added a native tracing API to {@code android-23}.</li>
- <li>Added a native multinetwork API to {@code android-23}.</li>
- <li>Enabled libc, m, and dl to provide versioned symbols, starting
- from API level 21.</li>
- <li>Added Vulkan headers and library to API level N.</li>
- </ul>
- </li>
-
- <li>Removals
- <ul>
- <li>Removed support for {@code _WCHAR_IS_8BIT}.</li>
- <li>Removed sed.</li>
- <li>Removed mclinker.</li>
- <li>Removed Perl.</li>
- <li>Removed from all versions of NDK libc, m, and dl all symbols which
- the platform versions of those libs do not support.</li>
- <li>Partially removed support for mips64r2. The rest will be removed
- in the future.</li>
- </ul>
- </li>
-
- <li>Other changes
- <ul>
- <li>Changed ARM standalone toolchains to default to arm7.
- <ul>
- <li>You can restore the old behavior by passing specifying the
- {@code -target} option as {@code armv5te-linux-androideabi}.
- </li>
- </ul>
- </li>
- <li>Changed the build system to use {@code -isystem} for platform
- includes.
- <ul>
- <li>Warnings that bionic causes no longer break app builds.</li>
- </ul>
- </li>
- <li>Fixed a segfault that occurred when a binary threw exceptions
- via gabi++. (Issue <a href="http://b.android.com/179410">179410</a>)
- </li>
- <li>Changed libc++’s inline namespace to {@code std::__ndk1}
- to prevent ODR issues with platform libc++.</li>
-
- <li>All libc++ libraries are now built with libc++abi.
- <li>Bumped default {@code APP_PLATFORM} to Gingerbread.
- <ul>
- <li>Expect support for Froyo and older to be dropped in a
- future release.</ul>
- </ul>
- <li>Updated gabi++ {@code _Unwind_Exception} struct for 64 bits.
- <li>Added the following capabilities to cpufeatures:
- <ul>
- <li>Detect SSE4.1 and SSE4.2.</li>
- <li>Detect cpu features on x86_64.</li>
- </ul>
- </li>
- <li>Updated libc++abi to upstream
- <a href="http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20150302/124603.html">
- r231075</a>.
- <li>Updated {@code byteswap.h}, {@code endian.h}, {@code sys/procfs.h},
- {@code sys/ucontext.h}, {@code sys/user.h}, and {@code uchar.h} from
- ToT Bionic.
- <li>Synchronized {@code sys/cdefs.h} across all API levels.
-
- <li>Fixed {@code fegetenv and fesetenv} for arm.
- <li>Fix end pointer size/alignment of {@code crtend_*} for mips64
- and x86_64.
- </ul>
- </li>
- </ul>
- </ul>
- </dd>
- <dl>
- <dl>
- <dt>Binutils</dt>
- <dd>
- <ul>
- <li>Additions
- <ul>
- <li>Added a new option: {@code --pic-veneer}.</li>
- </ul>
- </li>
-
- <li>Removals
- <ul>
- <li>The 32-bit Windows package no longer contains ld.gold.
- You can instead get ld.gold from the 64-bit Windows package.</li>
- </ul>
- </li>
-
- <li>Changes
- <ul>
- <li>Unified binutils source between Android and ChromiumOS.
- For more information on this change, see the comments
- <a href="https://android-review.googlesource.com/#/c/182865/">
- here.</a></li>
- <li>Improved reliability of Gold for aarch64. Use
- {@code -fuse-ld=gold} at link time to use gold instead of bfd.
- The default will likely switch in the next release.</li>
- <li>Improved linking time for huge binaries for Gold ARM back end
- (up to 50% linking time reduction for debuggable Chrome Browser).
- </li>
- </ul>
- </li>
- </ul>
- </dd>
- <dl>
- <dl>
- <dt>GDB</dt>
- <dd>
- <ul>
-
- <li>Removals
- <ul>
- <li>Removed ndk-gdb in favor of ndk-gdb.py.</li>
- </ul>
- </li>
-
- <li>Changes
- <ul>
- <li>Updated gdb to version 7.10.</li>
- <li>Improved performance.</li>
- <li>Improved error messages.</li>
- <li>Fixed relative project paths.</li>
- <li>Stopped Ctrl-C from killing the backgrounded gdbserver.</li>
- <li>Improved Windows support.</li>
- </ul>
- </li>
- </ul>
- </dd>
-
- <dl>
- <dl>
- <dt>YASM</dt>
- <dd>
- <ul>
-
- <li>Changes
- <ul>
- <li>Updated YASM to version 1.3.0.</li>
- </ul>
- </li>
- </ul>
- </dd>
-
- <dl>
- <dl>
- <dt>Known issues</dt>
- <dd>
- <ul>
- <li>x86 ASAN does not currently work. For more information, see the
- discussion <a href="https://android-review.googlesource.com/#/c/186276/">
- here.</a></li>
- <li>The combination of Clang, x86, stlport_static, and optimization
- levels higher than {@code -O0} causes test failures with
- {@code dynamic_cast}. For more information, see the comments
- <a href="https://android-review.googlesource.com/#/c/185920">here</a>.
- </li>
- <li>Exception handling often fails with c++_shared on ARM32. The root
- cause is incompatibility between the LLVM unwinder that libc++abi uses
- for ARM32 and libgcc. This behavior is not a regression from r10e.</li>
- </ul>
- </dd>
- </dl>
-
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="10e"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 10e</a> <em>(May 2015)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Integrated the workaround for Cortex-A53 Erratum 843419 into the
- {@code aarch64-linux-android-4.9} linker. For more information on this workaround, see
- <a href="https://sourceware.org/ml/binutils/2015-03/msg00446.html">Workaround for cortex-a53
- erratum 843419.</a></li>
-
- <li>Added Clang 3.6; {@code NDK_TOOLCHAIN_VERSION=clang} now picks that version
- of Clang by default.</li>
-
- <li>Removed Clang 3.4.</li>
-
- <li>Removed GCC 4.6.</li>
-
- <li>Implemented multithreading support in {@code ld.gold} for all architectures. It can
- now link with or without support for multithreading; the default is to do it without.
- <ul>
- <li>To compile with multithreading, use the {@code --threads} option.</li>
- <li>To compile without multithreading, use the {@code --no-threads} option.</li>
- </ul>
- </li>
-
- <li>Upgraded GDB/gdbserver to 7.7 for all architectures.</li>
-
- <li>Removed the NDK package for 32-bit Darwin.</li>
- </ul>
- </dd>
- <dl>
-
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed a crash that occurred when there were OpenMP loops outside of the main thread.</li>
-
- <li>Fixed a GCC 4.9 internal compiler error (<i>ICE</i>) that occured when the user declared
- {@code #pragma GCC optimize ("O0")}, but had a different level of optimization specified
- on the command line. The {@code pragma} takes precedence.</li>
-
- <li>Fixed an error that used to produce a crash with the following error message:
-<pre>
-in add_stores, at var-tracking.c:6000
-</pre>
- </li>
-
- <li>Implemented a workaround for a Clang 3.5 issue in which LLVM auto-vectorization
- generates {@code llvm.cttz.v2i64()}, an instruction with no counterpart in the ARM
- instruction set.</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Made the following header and library fixes:</li>
- <ul>
- <li>Fixed {@code PROPERTY_*} in {@code media/NdkMediaDrm.h}.</li>
- <li>Fixed {@code sys/ucontext.h} for {@code mips64}.</li>
- <li>Dropped the Clang version check for {@code __builtin_isnan} and
- {@code __builtin_isinf}.</li>
- <li>Added {@code android-21/arch-mips/usr/include/asm/reg.h}
- and {@code android-21/arch-mips64/usr/include/asm/reg.h}.</li>
- </ul>
- </li>
-
- <li>Fixed a spurious array-bounds warning that GCC 4.9 produced for x86, and reenabled the
- array bounds warning that GCC 4.9 had produced for ARM. The warning for ARM had
- previously been unconditionally disabled.</li>
-
- <li>Fixed Clang 3.5 for {@code mips} and {@code mips64} to create a writable
- {@code .gcc_except_table} section, thus matching GCC behavior. This change allows you
- to avoid the following linker warning:
-
-<pre>
-.../ld: warning: creating a DT_TEXTREL in a shared object
-</pre>
- </li>
-
- <li>Backported a fix for {@code compiler-rt} issues that were causing crashes when Clang
- compiled for {@code mips64}. For more information, see LLVM Issue
- <a href="http://llvm.org/bugs/show_bug.cgi?id=20098">20098</a>.</li>
-
- <li>Fixed Clang 3.5 crashes that occurred on non-ASCII comments. (Issue
- <a href="https://code.google.com/p/android/issues/detail?id=81440">81440</a>)</li>
-
- <li>Fixed {@code stlport collate::compare} to return {@code -1} and {@code 1}. Previously,
- it had returned arbitrary signed numbers.</li>
-
- <li>Fixed {@code ndk-gdb} for 64-bit ABIs. (Issue
- <a href="https://code.google.com/p/android/issues/detail?id=118300">118300</a>)</li>
-
- <li>Fixed the crash that the HelloComputeNDK sample for RenderScript was producing on
- Android 4.4 (Android API level 19). For more information, see
- <a href="http://stackoverflow.com/questions/28057049/targeting-pre-lollipop-devices-using-renderscript-from-ndk-c">this page</a>.</li>
-
- <li>Fixed {@code libc++ __wrap_iter} for GCC. For more information, see LLVM Issue
- <a href="http://llvm.org/bugs/show_bug.cgi?id=22355">22355</a>.</li>
-
- <li>Fixed {@code .asm} support for ABI {@code x86_64}.</li>
-
- <li>Implemented a workaround for the GCC 4.8 {@code stlport} issue. (Issue
- <a href="https://android-review.googlesource.com/#/c/127773">127773</a>)</li>
-
- <li>Removed the trailing directory separator {@code \\} from the project path in Windows.
- (Issue <a href="https://code.google.com/p/android/issues/detail?id=160584">160584</a>)
- </li>
-
- <li>Fixed a {@code no rule to make target} error that occurred when compiling a single
- {@code .c} file by executing the {@code ndk-build.cmd} command from {@code gradle}. (Issue
- <a href="https://code.google.com/p/android/issues/detail?id=66937">66937</a>)</li>
-
- <li>Added the {@code libatomic.a} and {@code libgomp.a} libraries that had been missing from
- the following host toolchains:
- <ul>
- <li>{@code aarch64-linux-android-4.9}</li>
- <li>{@code mips64el-linux-android-4.9}</li>
- <li>{@code mipsel-linux-android-4.9}</li>
- <li>{@code x86_64-4.9}</li>
- </ul>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Added {@code ld.gold} for {@code aarch64}. The default linker remains {@code ld.bfd}.
- To explicitly enable {@code ld.gold}, add {@code -fuse-ld=gold} to the
- {@code LOCAL_LDFLAGS} or {@code APP_LDFLAGS} variable.</li>
-
- <li>Built the MIPS and MIPS64 toolchains with {@code binutils-2.25}, which provides improved
- R6 support.</li>
-
- <li>Made {@code -fstandalone-debug} (full debug info) a default option for Clang.</li>
-
- <li>Replaced {@code -fstack-protector} with {@code -fstack-protector-strong} for
- the ARM, AArch64, X86, and X86_64 toolchains for GCC 4.9, Clang 3.5, and
- Clang 3.6.</li>
-
- <li>Added the {@code --package} command-line switch to {@code ndk-gdb} to allow the build
- system to override the package name. (Issue
- <a href="https://code.google.com/p/android/issues/detail?id=56189">56189</a>)</li>
-
- <li> Deprecated {@code -mno-ldc1-stc1} for MIPS. This option may not work with the new
- {@code -fpxx} and {@code -mno-odd-spreg} options, or with the FPXX ABI.</li>
-
- <li>Added MIPS MSA and R6 detection to {@code cpu-features}.</li>
-
- </ul>
- </dd>
- </dl>
-
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="10d"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 10d</a> <em>(December 2014)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Made GCC 4.8 the default for all 32-bit ABIs. Deprecated GCC 4.6, and
- will remove it next release. To restore previous behavior, either add
- <code>NDK_TOOLCHAIN_VERSION=4.6</code> to ndk-build, or
- add <code>--toolchain=arm-linux-androideabi-4.6</code> when executing
- <code>make-standalone-toolchain.sh</code> on the command line. GCC 4.9 remains the
- default for 64-bit ABIs.</li>
-
- <li>Stopped all x86[_64] toolchains from adding <code>-mstackrealign</code> by default. The
- NDK toolchain assumes a 16-byte stack alignment. The tools and options used by default
- enforce this rule. A user writing assembly code must make sure to preserve stack
- alignment, and ensure that other compilers also comply with this rule.
- (GCC bug <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=38496">38496</a>)</li>
-
- <li>Added Address Sanitizer functionality to Clang 3.5 support to the ARM and x86 ABIs.
- For more information on this change, see the
- <a href="https://code.google.com/p/address-sanitizer/wiki/Android">Address
- Sanitizer</a> project.</li>
-
- <li>Introduced the requirement, starting from API level 21, to use <code>-fPIE -pie
- </code> when building. In API levels 16 and higher, ndk-build uses <code>PIE</code>
- when building. This change has a number of implications, which are discussed in
- <a href="https://code.google.com/p/android-developer-preview/issues/detail?id=888">
- Developer Preview Issue 888</a>.
- These implications do not apply to shared libraries.</li>
- </ul>
- </dd>
- <dl>
-
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Made more fixes related to
- <a href="https://gcc.gnu.org/ml/gcc-patches/2014-10/msg00906.html">
- A53 Errata #835769</a> in the aarch64-linux-android-4.9 linker. As part of this, GCC
- passes a new option, <code>--fix-cortex-a53-835769</code>, when
- <code>-mfix-cortex-a53-835769</code> (enabled by default) is specified.
- For more information, see this
- <a href="https://sourceware.org/ml/binutils/2014-10/msg00198.html">binutils message</a>
- and this
- <a href="https://sourceware.org/ml/binutils/2014-11/msg00287.html">binutils message</a>.
- </li>
-
- <li>Documented a fix to a libc++ <code>sscanf/vsscanf</code> hang that occurred in API level
- 21. The fix itself had been implemented in r10c.
- (Issue <a href="http://b.android.com/77988">77988</a>)</li>
-
- <li>Fixed an AutoFDO (<code>-fauto-profile</code>) crash that occurred with GCC 4.9 when
- <code>-Os</code> was specified. (Issue <a href="http://b.android.com/77571">77571</a>)</li>
- </ul>
- </dd>
-
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Made the following header and library fixes:</li>
- <ul>
- <li>Added <code>posix_memalign</code> to API level 16. Also, added a prototype in
- <code>stdlib.h</code> to API levels 16 to 19.
- (Issue <a href="http://b.android.com/77861">77861</a>)</li>
- <li>Fixed <code>stdatomic.h</code> so that it includes <code><atomic></code> only for
- C++11.</li>
- <li>Modified the following headers for standalone use: <code>sys/user.h</code>, and
- <code>gl2ext.h</code>, <code>dlext.h</code>, <code>fts.h</code>, <code>sgidefs.h</code>
- for API level 21.</li>
- <li>Modified <code>sys/user.h</code> to rename <code>mxcsr_mask</code> as <code>mxcr_mask</code>,
- and to change the data type for <code>u_ar0</code></li> from <code>unsigned long</code>
- to </code>struct user_regs_struct*</code>.
- <li>Changed <code>sysconf()</code> return value type from <code>int</code> to
- <code>long</code>.</li>
- </ul>
-
- <li>Fixed ndk-build's handling of <code>thumb</code> for <code>LOCAL_ARM_MODE</code>: In
- r10d, ndk-build adds <code>LOCAL_LDFLAGS+=-mthumb</code> by default, unless one of the
- following conditions applies:</li>
- <ul>
- <li>You have set <code>LOCAL_ARM_MODE</code> equal to <code>arm</code>.</li>
- <li>You are doing a debug build (with settings such as <code>APP_OPTIM=debug</code> and
- <code>AndroidManifest.xml</code> containing <code>android:debuggable="true"</code>),
- where ARM mode is the default in order to retain compatibility with earlier toolchains.
- (Issue <a href="http://b.android.com/74040">74040</a>)</li>
- </ul>
-
- <li>Fixed <code>LOCAL_SRC_FILES</code> in ndk-build to use Windows absolute paths.
- (Issue <a href="http://b.android.com/74333">74333</a>)</li>
-
- <li>Removed bash-specific code from ndk-gdb. (Issue <a href="http://b.android.com/73338">73338</a>)</li>
-
- <li>Removed bash-specific code from <code>make-standalone-toolchain.sh</code>.
- (Issue <a href="http://b.android.com/74145">74145)</a></li>
-
- <li>Revised documentation concerning a fix for <code>System.loadLibrary()</code> transitive
- dependencies. (Issue <a href="http://b.android.com/41790">41790</a>)</li>
-
- <li>Fixed a problem that was preventing 64-bit packages from extracting on Ubuntu 14.04 and
- OS X 10.10 (Yosemite). (Issue <a href="http://b.android.com/78148">78148</a>)</li>
-
- <li>Fixed an issue with <code>LOCAL_PCH</code> to improve Clang support. (Issue
- <a href="http://b.android.com/77575">77575</a>)</li>
-
- <li>Clarified "requires executable stack" warning from ld.gold. (Issue
- <a href="http://b.android.com/79115">79115</a>)</li>
- </ul>
- </dd>
-
- </dl>
- </div>
-</div>
-
-
-
-
-
-
-
-<div class="toggle-content closed">
-<a name="10c"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 10c</a> <em>(October 2014)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Made the following changes to download structure:</li>
- <ul>
- <li>Each package now contains both the 32- and the 64-bit headers, libraries, and tools for
- its respective platform.</li>
- <li>STL libraries with debugging info no longer need be downloaded separately.</li>
- </ul>
- <li>Changed everything previously called <code>Android-L</code> to the official release
- designation: <code>android-21</code>.</li>
- <li>Updated GCC 4.9 by rebasing to the <code>google</code> branch
- of the GCC repository. Major differences from the upstream version of GCC 4.9 include:</li>
-
- <ul>
- <li>The <code>-O2</code> option now turns on vectorization, without loop peeling but with more
- aggressive unrolling.</li>
- <li>Enhancements to FDO and <a href="https://gcc.gnu.org/wiki/LightweightIpo#LIPO_-_Profile_Feedback_Based_Lightweight_IPO">
- LIPO</a></li>
- <p>For more detailed information, see <em>Important bug fixes</em> below.</p>
- </ul>
-
- <li>Added Clang 3.5 support to all hosts: <code>NDK_TOOLCHAIN_VERSION=clang</code>
- now picks Clang 3.5. Note that:</li>
- <ul>
-
- <li>ARM and x86 default to using the integrated assembler. If this causes issues, use
- <code>-fno-integrated-as</code> as a workaround.</code>
- <li>Clang 3.5 issues more warnings for unused flags, such as the <code>-finline-functions</code>
- option that GCC supports.</li>
- <p>When migrating from projects using GCC, you can use
- <code>-Wno-invalid-command-line-argument</code> and <code>-Wno-unused-command-line-argument</code>
- to ignore the unused flags until you're able decide on what to do with them longer-term.</p>
-
- </ul>
- <li>Made it possible to enter ART debugging mode, when debugging on an Android 5.0 device using
- ART as its virtual machine, by specifying the <code>art-on</code> option. For more information,
- see <code>prebuilt/common/gdb/common.setup</code> in the directory containing the NDK.</li>
- <li>Removed support for Clang 3.3.</li>
- <li>Deprecated GCC 4.6, and may remove it from future releases.</li>
- <li>Updated mclinker to 2.8 with Identical Code Folding ("ICF") support. Specify ICF using the
- <code>--icf</code> option.</li>
- <li>Broadened <code>arm_neon.h</code> support in x86 and x86_64, attaining coverage of ~93% of
- NEON intrinsics. For more information about NEON support:
- <ul>
- <li>Navigate to the NDK Programmer's Guide (<code>docs/Programmers_Guide/html/</code>), and see
- Architectures and CPUs > Neon.</li>
- <li>Examine the updated <code>hello-neon</code> sample in <code>samples/</code>.
- <li>See Intel's guide to <a href="https://software.intel.com/en-us/blogs/2012/12/12/from-arm-neon-to-intel-mmxsse-automatic-porting-solution-tips-and-tricks"> porting from ARM NEON to Intel SSE.</a></li>
- </ul>
- <li>Documented support for <code>_FORTIFY_SOURCE</code> in <code>headers/libs/android-21</code>,
- which appeared in r10 (when <code>android-21</code> was still called <code>Android-L</code>),
- but had no documentation.</li>
- </ul>
- </dd>
- <dl>
-
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed an internal compiler error with GCC4.9/aarch64 that was causing the following
- error message (Issue <a href="http://b.android.com/77564">77564</a>):</li>
-<pre>
-internal compiler error: in simplify_const_unary_operation, at simplify-rtx.c:1539
-</pre>
- <li>Fixed incorrect code generation from GCC4.9/arm. (Issue
- <a href="http://b.android.com/77567">77567<a>)</li>
- <li>Fixed an internal compiler error with GCC4.9/mips involving inline-assembly. (Issue
- <a href="http://b.android.com/77568">77568</a>)</li>
- <li>Fixed incorrect code that GCC4.9/arm was generating for <code>x = (cond) ? y : x</code>.
- (Issue <a href="http://b.android.com/77569">77569</a>)</li>
- <li>Fixed GCC4.9/aarch64 and Clang3.5/aarch64 to work around the
- <a href="http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20141006/116322.html">
- Cortex-A53 erratum (835769)</a> by default. Disable the workaround by specifying
- <code>-mno-fix-cortex-a53-835769</code>.</li>
- </ul>
- </dd>
-
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Made the following header and library fixes to <code>android-21</code>:
- <ul>
-
- <li>Added more TV keycodes: <code>android/keycodes.h</code></li>
- <li>Added more constants and six new sensor functions to <code>android/sensor.h</code>:
- <code>ASensorManager_getDefaultSensorEx</code>, <code>ASensor_getFifoMaxEventCount</code>,
- <code>ASensor_getFifoReservedEventCount</code>, <code>ASensor_getStringType</code>,
- <code>ASensor_getReportingMode</code>, and <code>ASensor_isWakeUpSensor</code>.</li>
- <li>Fixed <code>stdatomic.h</code> to improve compatibility with GCC 4.6, and provide support
- for the <code><atomic></code> header.</li>
- <li>Added <code>sys/ucontext.h</code> and <code>sys/user.h</code> to all API levels. The
- <code>signal.h</code> header now includes <code><sys/ucontext.h></code>. You may
- remove any existing definition of <code>struct ucontext</code>.</li>
- <li>Added <code>posix_memalign</code> to API levels 17, 18, and 19.</li>
- <li>Added the following functions to all architectures:
- <code>android_set_abort_message</code>, <code>posix_fadvise</code>,
- <code>posix_fadvise64</code>, <code>pthread_gettid_np</code>.</li>
- <li>Added the required permissions to the <code>native-media/AndroidManifest.xml</code>
- sample.
- (Issue <a href="https://android-review.googlesource.com/#/c/106640/">106640</a>)</li>
- <li>Added <code>clock_nanosleep</code> and <code>clock_settime</code> to API level 21. (Issue
- <a href="http://b.android.com/77372">77372</a>)
- <li>Removed the following symbols from all architectures:
- <code>get_malloc_leak_info</code>, <code>free_malloc_leak_info</code>,
- <code>__srget</code>, <code>__swbuf</code>, <code>__srefill</code>, <code>__swsetup</code>,
- <code>__sdidinit</code>, <code>__sflags</code>, <code>__sfp</code>,
- <code>__sinit</code>, <code>__smakebuf</code>, <code>__sflush</code>, <code>__sread</code>,
- <code>__swrite</code>, <code>__sseek</code>, <code>__sclose</code>,
- <code>_fwalk</code>, <code>__sglue</code>, <code>__get_thread</code>, <code>__wait4</code>,
- <code>__futex_wake</code>, <code>__open</code>, <code>__get_tls</code>,
- <code>__getdents64</code>, and <code>dlmalloc</code>.</li>
- <li>Removed the following functions from the 64-bit architectures: <code>basename_r</code>,
- <code>dirname_r</code>, <code>__isthreaded</code>, <code>_flush_cache</code> (mips64).</li>
- <li>Removed the following function from the 32-bit architectures:
- <code>__signalfd4</code>.</li>
- <li>Changed the type of the third argument from <code>size_t</code> to <code>int</code> in
- the following functions: <code>strtoll_l</code>, <code>strtoull_l</code>,
- <code>wcstoll_l</code>, and <code>wcstoull_l</code>.</li>
- <li>Restored the following functions to the 64-bit architecture: <code>arc4random</code>,
- <code>arc4random_buf</code>, and <code>arc4random_uniform</code>.</li>
- <li>Moved <code>cxa_*</code> and the <code>new</code> and <code>delete</code> operators back
- to <code>libstdc++.so</code>. This change restores r9d behavior; previous versions of r10
- contained dummy files.</li>
-
- </ul>
- <li>Restored MXU support in GCC 4.8 and 4.9 for mips. This support had been absent from
- r10 and r10b because those versions of GCC had been compiled with binutils-2.24, which did
- not support MXU. It now does.</li>
- <li>Fixed <code>--toolchain=</code> in <code>make-standalone-toolchain.sh</code> so that it
- now properly supports use of a suffix specifying a version of Clang.</li>
- <li>Fixed the libc++/armeabi <code>strtod()</code> functions.</li>
- <li>Made fixes to NDK documentation in <code>docs/</code>.</li>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Enhanced <code>cpu-features</code> to detect ARMv8 support for the following
- instruction sets: AES, CRC32, SHA2, SHA1, and 64-bit PMULL/PMULL2. (Issue
- <a href="https://android-review.googlesource.com/#/c/106360/">106360</a>)</li>
-
- <li>Modified ndk-build to use <code>*-gcc-ar</code>, which is available in GCC 4.8, GCC 4.9, and
- Clang. Clang specifies it, instead of <code>*-ar</code>. This setting brings improved LTO
- support.</li>
-
- <li>Removed the <code>include-fixed/linux/a.out.h</code> and
- <code>include-fixed/linux/compiler.h</code> headers from the GCC compiler.
- (Issue <a href ="http://b.android.com/73728">73728</a>)</li>
-
- <li>Fixed an issue related to <code>-flto</code> with GCC 4.8 on Mac OS X. The error message
- read:</li>
-
- <pre>
-.../ld: error: .../libexec/gcc/arm-linux-androideabi/4.9/liblto_plugin.so
-Symbol not found: _environ
-</pre>
-
- <li>Fixed a typo in <code>build-binary.mk.</code> (Issue
- <a href="http://b.android.com/76992">76992</a>)</li>
- </ul>
- </dd>
-
- <dt>Important known issues:</dt>
- <dd>
- <ul>
- <li>Specifying -Os (<code>-fauto-profile</code>) in GCC4.9 may cause crashing.
- (Issue <a href="http://b.android.com/77571">77571</a>)</li>
- </ul>
- </dd>
-
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="10b"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 10b</a> <em>(September 2014)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
-
- <dt>Important notes:</dt>
- <dd>
- <ul>
- <li>Because of the 512MB size restriction on downloadable packages, the following 32-bit items are not in the 32-bit NDK download packages. Instead, they reside in the 64-bit ones:</li>
- <ul>
- <li>Android-L headers</li>
- <li>GCC 4.9</li>
- </ul>
- <li>Currently, the only Renderscript support provided by the NDK is for 32-bit Renderscript with Android 4.4 (API level 19). You cannot build HelloComputeNDK (the only Renderscript sample) with any other combination of Renderscript (32- or 64-bit) and Android version.</li>
- <li>To compile native-codec, you must use a 64-bit NDK package, which is where all the Android-L headers are located. </li>
- </ul>
- </dd>
-
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed gdb 7.6 in GCC 4.8/4.9. (Issues <a href="http://b.android.com/74112">74112</a> and <a href="http://b.android.com/74371">74371</a>.)</li>
- <li>Fixed GCC 4.8/4.9 for x86, so that they no longer enable <code>-msse4.2</code> and <code>-mpopcnt</code> by default. (Issue <a href="http://b.android.com/73843">73843</a>.)</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Removed <code>stdio.h</code> from the <code>include-fixed/</code> directories of all versions of GCC. (Issue <a href="http://b.android.com/73728">73728</a>.)</li>
- <li>Removed duplicate header files from the Windows packages in the <code>platforms/android-L/arch-*/usr/include/linux/netfilter*/</code> directories. (Issue <a href="https://code.google.com/p/android/issues/detail?id=73704">73704</a>.)</li>
- <li>Fixed a problem that prevented Clang from building HelloComputeNDK.</li>
- <li>Fixed atexit. (Issue <a href="http://b.android.com/66595">66595</a>.)</li>
- <li>Made various fixes to the docs in <code>docs/</code> and <code>sources/third_party/googletest/README.NDK</code>. (Issue <a href="http://b.android.com/74069">74069</a>.)</li>
- <li>Made the following fixes to the Android-L headers:</li>
- <ol>
- <li>Added the following functions to <code>ctype.h</code> and <code>wchar.h</code>: <code>dn_expand()</code>, <code>grantpt()</code>, <code> inet_nsap_addr()</code>, <code>inet_nsap_ntoa()</code>, <code>insque()</code>, <code>nsdispatch()</code>, <code>posix_openpt()</code>, <code>__pthread_cleanup_pop()</code>, <code>__pthread_cleanup_push()</code>, <code>remque()</code>, <code>setfsgid()</code>, <code>setfsuid()</code>, <code>splice()</code>, <code>tee()</code>, <code>twalk()</code> (Issue <a href = "http://b.android.com/73719">73719</a>), and 42 <code>*_l()</code> functions.</li>
-
- <li>Renamed <code>cmsg_nxthdr</code> to <code>__cmsg_nxthdr</code>.</li>
-
- <li>Removed <code>__libc_malloc_dispatch</code>.</li>
-
- <li>Changed the <code>ptrace()</code> prototype to <code>long ptrace(int, ...);</code>.</li>
-
- <li>Removed <code>sha1.h</code>.</li>
-
- <li>Extended <code>android_dlextinfo</code> in <code>android/dlext.h</code>.</li>
-
- <li>Annotated <code>__NDK_FPABI__</code> for functions receiving or returning float- or double-type values in <code>stdlib.h</code>, <code>time.h</code>, <code>wchar.h</code>, and <code>complex.h</code>.</li>
- </ol>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Updated <code>mipsel-linux-android-4.9</code> and <code>mips64el-linux-android-4.9</code>, implementing a new multilib directory layout, and providing support for gdb-7.7</li>
- <li>Enhanced <code>cpu-features</code> to detect more arm64 features. (Change list <a href="https://android-review.googlesource.com/#/c/100339">100339</a>.)</li>
- </dd>
- </ul>
-
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="10"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 10</a> <em>(July 2014)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Added 3 new ABIs, all 64-bit: arm64-v8a, x86_64, mips64.</li> Note that:
- <ul>
- <li>GCC 4.9 is the default compiler for 64-bit ABIs. Clang is currently version 3.4.
-<code>NDK_TOOLCHAIN_VERSION=clang</code>
- may not work for arm64-v8a and mips64.</li>
- <li>Android-L is the first level with 64-bit support. Note that this API
-level is a temporary one, and only for L-preview. An actual API level number will replace it at
-L-release.</li>
- <li>This release includes now includes <code>all32</code> and <code>all64</code>
-settings for <code>APP_ABI</code>.
- <ul>
- <li><code>APP_ABI=all32</code> is equivalent to
-<code>APP_ABI=armeabi,armeabi-v7a,x86,mips</code>.</li>
- <li><code>APP_ABI=all64</code> is equivalent to
-<code>APP_ABI=arm64-v8a,x86_64,mips64</code>.</li>
- <li><code>APP_ABI=all</code> selects all ABIs.</li>
- </ul>
- <li>The new GNU libstdc++ in Android-L contains all <code><tr1/cmath></code>
-Before defining your own math function, check <code>_GLIBCXX_USE_C99_MATH_TR1</code> to see a
-function with that name already exists, in order to avoid "multiple definition" errors from the
-linker.</li>
- <li>The cpu-features library has been updated for the ARMv8 kernel. The existing
-cpu-features library may fail to detect the presence of NEON on the ARMv8 platform. Recompile your
-code with the new version.</li>
- </ul>
- <li>Added a new <code>platforms/android-L/</code> API directory. It includes:</li>
- <ul>
- <li>Updated Bionic headers, which had not changed from Android API levels 3
-(Cupcake) to 19 (KitKat). This new version, for level L, is to be synchronized with AOSP.</li>
- <li>New media APIs and a native-codec sample.</li>
- <li>An updated <code>Android.h</code> header for SLES/OpenSLES, enabling support for
-single-precision, floating-point audio format in AudioPlayer.</li>
- <li>GLES 3.1 and AEP extensions to <code>libGLESv3.so.</code></li>
- <li>GLES2 and GLES3 headers updated to the latest official Khronos versions.</li>
- </ul>
- <li>Added GCC 4.9 compilers to the 32-/64-bit ABIs. GCC 4.9 is the default (only) compiler
-for 64-bit ABIs, as previously mentioned. For 32-bit ABIs, you must explcitly enable GCC 4.9, as
-GCC 4.6 is still the default.</li>
- <ul>
- <li>For ndk-build, enable 32-bit, GCC 4.9 building either by adding
-<code>NDK_TOOLCHAIN_VERSION=4.9</code> to <code>Application.mk</code>, or exporting it as an
-environment variable from the command line.</li>
- <li>For a standalone toolchain, use the <code>--toolchain=</code> option in the
-<code>make-standalone-toolchain.sh</code> script. For example: <code>--toolchain=arm-linux-androideabi-4.9.</code></li>
- </ul>
- <li>Upgraded GDB to version 7.6 in GCC 4.8/4.9 and x86*. Since GDB is still at version GDB-7.3.x in
-GCC 4.6 (the default for ARM and MIPS), you must set
-<code>NDK_TOOLCHAIN_VERSION=4.8</code> or <code>4.9</code> to enable ndk-gdb to select GDB 7.6.</li>
- <li>Added the <code>-mssse3</code> build option to provide SSSE3 support, and made it the default for ABI x86
-(upgrading from SSE3). The image released by Google does not contain SSSE3 instructions.</li>
- <li>Updated GCC 4.8 to 4.8.3.</li>
- <li>Improved ARM libc++ EH support by switching from gabi++ to libc++abi. For details, see the "C++ Support" section of the documentation.
- Note that:</li>
- <ul>
- <li>All tests except for locale now pass for Clang 3.4 and GCC 4.8. For more
-information, see the "C++ Support" section of the documentation.</li>
- <li>The libc++ libraries for X86 and MIPS libc++ still use gabi++.</li>
- <li>GCC 4.7 and later can now use <atomic>.</li>
- <li>You must add <code>-fno-strict-aliasing</code> if you use <code> <list></code>, because <code>__list_imp::_end</code>_ breaks
- TBAA rules. (Issue <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61571">61571</a>.)</li>
- <li>As of GCC 4.6, LIBCXX_FORCE_REBUILD:=true no longer rebuilds libc++. Rebuilding it
-requires the use of a different compiler. Note that Clang 3.3 is untested.</li>
- </ul>
- <li>mclinker is now version 2.7, and has aarch64 Linux support.</li>
- <li>Added precompiled header support for headers specified by <code>LOCAL_PCH</code>. (Issue <a href="http://b.android.com/25412">25412</a>).</li>
- </dd>
- <dl>
-
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed libc++ so that it now compiles <code>std::feof</code>, etc. (Issue <a
-href="http://b.android.com/66668">66668</a>).</li>
- <li>Fixed a Clang 3.3/3.4 atomic library call that caused crashes in some of the libc++
-tests for ABI armeabi.</li>
- <li>Fixed Clang 3.4 crashes that were occurring on reading precompiled headers. (Issue <a
-href="http://b.android.com/66657">66657</a>).</li>
- <li>Fixed the Clang 3.3/3.4 <code>-O3</code> assert on:</li>
- <code>llvm-3.2/llvm/include/llvm/MDBuilder.h:64: llvm::MDNode*
-llvm::MDBuilder::createBranchWeights(llvm::ArrayRef<unsigned int>): Assertion Weights.size() >= 2
-&& "Need at least two branch weights!"</code> (Issue <a href="http://b.android.com/57381">57381</a>).
- <li>Fixed the following Clang 3.3/3.4 crash:</li>
- <code>Assertion failed: (!Fn && "cast failed but able to resolve overload expression!!"), function CheckCXXCStyleCast, file
-Volumes/data/ndk-toolchain/src/llvm-3.3/llvm/tools/clang/lib/Sema/SemaCast.cpp, line 2018</code>.
-(Issue <a href="http://b.android.com/66950">66950</a>).
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed headers:</li>
- <ul>
- <li>Fixed 32-bit <code>ssize_t</code> to be <code>int</code> instead of <code>long
-int</code>.</li>
- <li>Fixed <code>WCHAR_MIN</code> and <code>WCHAR_MAX</code> so that they they take
-appropriate signs according to the architecture they're running on:</li>
- <ul>
- <li>X86/MIPS: signed.
- <li>ARM: unsigned.
- <li>To force X86/MIPS to default to unsigned, use
-<code>-D__WCHAR_UNSIGNED__</code>.</li>
- <li>To force <code>wchar_t</code> to be 16 bits, use <code>-fshort-wchar</code>.</li>
- </ul>
- <li>Removed non-existent symbols from 32-bit <code>libc.so</code>, and added <code>pread64</code>,
-<code>pwrite64</code>, <code>ftruncate64</code> for
-Android API level 12 and higher. (Issue <a href="http://b.android.com/69319">69319</a>). For more
-information, see the commit message accompanying AOSP change list
- <a href="https://android-review.googlesource.com/#/c/94137">94137</a>.</li>
- </ul>
- <li>Fixed GCC warning about redefinition of <code>putchar</code>. Warning message reads:</li>
- <code>include/stdio.h:236:5: warning: conflicts with previous declaration here
-[-Wattributes] int putchar(int);</code> (Change list <a
-href="https://android-review.googlesource.com/#/c/91185">91185</a>).
- <li>Fixed <code>make-standalone-toolchain.sh --stl=libc++</code> so that it:</li>
- <ul>
- <li>Copies <code>cxxabi.h</code>. (Issue <a
-href="http://b.android.com/68001">68001</a>).</li>
- <li>Runs in directories other than the NDK install directory. (Issues <a
-href="http://b.android.com/67690">67690</a> and <a href="http://b.android.com/68647">68647</a>).</li>
- </ul>
- <li>Fixed GCC/Windows to quote arguments only when necessary for spawning processes in
-external programs. This change decreases the likelihood of exceeding the 32K length limit.</li>
- <li>Fixed an issue that made it impossible to adjust the <code>APP_PLATFORM</code>
-environment variable.</li>
- <li>Fixed the implementation of <code>IsSystemLibrary()</code> in crazy_linker so that it
-uses <code>strrchr()</code>
- instead of <code>strchr()</code> to find the library path's true basename.</li>
- <li>Fixed native-audio's inability to build in debug mode.</li>
- <li>Fixed gdb's inability to print extreme floating-point numbers. (Issue <a
-href="http://b.android.com/69203">69203</a>).</li>
- <li>Fixed Clang 3.4 inability to compile with <code>-Wl,-shared</code> (as opposed to
-<code>-shared</code>, which
- had no compilation issues). The problem was that Clang added <code>-pie</code> for Android
-targets if neither <code>-shared</code> nor <code>-static</code> existed. This behavior, which was
-incorrect, caused the linker to complain that <code>-shared</code> and <code>-pie</code> could not
-co-exist.</li>
-
- </ul>
- </dd>
-
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Added <code>arm_neon.h</code> to the x86 toolchain so that it now emulates ~47% of
-Neon. There is currently no support for 64-bit types. For more information, see the section on ARM
-Neon intrinsics support in the x86 documentation.</li>
- <li>Ported ARM/GOT_PREL optimization (present in GCC 4.6 built from the GCC google branch) to
-ARM GCC 4.8/4.9. This optimization sometimes reduces instruction count when accessing global
-variables. As an example, see the build.sh script in
-<code>$NDK/tests/build/b14811006-GOT_PREL-optimization/</code>.</li>
- <li>Added ARM version for STL gabi++, stlport, and libc++. They now have both it and Thumb
-mode.</li>
- <li>It is now possible to call the make-standalone-toolchain.sh script with
-<code>--toolchain=x86_64-linux-android-4.9</code>, which is equivalent to
-<code>--toolchain=x86_64-4.9</code>.</li>
- </dd>
- </ul>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
-<a name="9d"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 9d</a> <em>(March 2014)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Added support for the Clang 3.4 compiler. The
-<code>NDK_TOOLCHAIN_VERSION=clang</code> option now picks Clang 3.4. GCC 4.6 is
-still the default compiler.</li>
- <li>Added <code>APP_ABI=armeabi-v7a-hard</code>, with
-additional multilib option <code>-mfloat-abi=hard</code>. These options are for
-use with ARM GCC 4.6/4.8 and Clang 3.3/3.4 (which use 4.8's assembler, linker,
-and libs). When using these options, note the following changes:</li>
- <ul>
- <li> When executing the <code>ndk-build</code> script, add the
-following options for armeabi-v7a target:
-<pre>TARGET_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
-TARGET_LDFLAGS += -Wl,--no-warn-mismatch -lm_hard</pre>
-The built library is copied to <code>libs/armeabi-v7a</code>. For make to
-behave as expected, you cannot specify both <code>armeabi-v7a</code> and
-<code>armeabi-v7a-hard</code> as make targets (i.e., on the APP_ABI= line).
-Doing so causes one of them to be ignored. Note that <code>APP_ABI=all</code>
-is still equivalent to
-<code>armeabi armeabi-v7a x86 mips</code>.</li>
- <li>The <code>make-standalone-toolchain.sh</code> script copies
-additional libaries under <code>/hard</code> directories.
- Add the above <code>CFLAGS</code> and <code>LFLAGS</code> to your
-makefile to enable GCC or Clang to link with
- libraries in <code>/hard</code>.</li>
- </ul>
- <li>Added the yasm assembler, as well as <code>LOCAL_ASMFLAGS</code>
-and <code>EXPORT_ASMFLAGS</code> flags for x86
-targets. The <code>ndk-build</code> script uses
-<code>prebuilts/*/bin/yasm*</code> to build <code>LOCAL_SRC_FILES</code> that
-have the <code>.asm</code> extension.</li>
- <li>Updated MClinker to 2.6.0, which adds <code>-gc-sections</code>
-support.</li>
- <li>Added experimental libc++ support (upstream r201101). Use this new
-feature by following these steps:
- <ul>
- <li>Add <code>APP_STL := c++_static</code> or <code>APP_STL :=
-c++_shared</code> in <code>Application.mk</code>.
- You may rebuild from source via <code>LIBCXX_FORCE_REBUILD :=
-true</code></li>
- <li>Execute <code>make-standalone-toolchain.sh --stl=libc++</code>
-to create a standalone toolchain with libc++ headers/lib.</li>
- </ul>
- For more information, see
-<code>CPLUSPLUS-SUPPORT.html</code>.
-(Issue <a href="http://b.android.com/36496">36496</a>)</li>
- </ul>
- </dd>
- <dl>
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed an uncaught throw from an unexpected
-exception handler for GCC 4.6/4.8 ARM EABI. (GCC Issue <a
-href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59392">59392</a>)</li>
- <li>Fixed GCC 4.8 so that it now correctly resolves partial
-specialization of a template with
- a dependent, non-type template argument. (GCC Issue <a
-href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59052">59052</a>)</li>
- <li>Added more modules to prebuilt python (Issue <a
-href="http://b.android.com/59902">59902</a>):
- <ul>
- <li>Mac OS X: <code>zlib</code>, <code>bz2</code>,
-<code>_curses</code>, <code>_curses_panel</code>, <code>_hashlib</code>,
-<code>_ssl</code></li>
- <li>Linux: <code>zlib</code>, <code>nis</code>,
-<code>crypt</code>, <code>_curses</code>, and <code>_curses_panel</code></li>
- </ul>
- <li>Fixed the x86 and MIPS gdbserver
-<code>event_getmsg_helper</code>.</li>
- <li>Fixed numerous issues in the RenderScript NDK toolchain, including
-issues with compatibility across older devices and C++ reflection.</li>
-<br>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Header fixes:
- <ul>
- <li>Fixed a missing <code>#include <sys/types.h></code> in
-<code>android/asset_manager.h</code> for Android API level 13 and higher.
- (Issue <a href="http://b.android.com/64988">64988</a>)</li>
- <li>Fixed a missing <code>#include <stdint.h></code> in
-<code>android/rect_manager.h</code> for Android API level 14 and higher.</li>
- <li>Added <code>JNICALL</code> to <code>JNI_OnLoad</code> and
-<code>JNI_OnUnload</code> in <code>jni.h</code>. Note that <code>JNICALL</code>
- is defined as <code>__NDK_FPABI__</code> For more information, see
-<code>sys/cdefs.h</code>.</li>
- <li>Updated the following headers so that they can be included
-without the need to
-manually include their dependencies (Issue <a
-href="http://b.android.com/64679">64679</a>):</li>
-<pre>
-android/tts.h
-EGL/eglext.h
-fts.h
-GLES/glext.h
-GLES2/gl2ext.h
-OMXAL/OpenMAXSL_Android.h
-SLES/OpenSLES_Android.h
-sys/prctl.h
-sys/utime.h
-</pre>
- <li>Added <code>sys/cachectl.h</code> for all architectures. MIPS
-developers can now include this header instead of writing <code>#ifdef
-__mips__</code>.</li>
- <li></code>Fixed <code>platforms/android-18/include/android/input.h
-</code> by adding <code>__NDK_FPABI__</code> to functions taking or returning
-float or double values.</li>
- <li>Fixed MIPS <code>struct stat</code>, which was incorrectly set
-to its 64-bit counterpart for Android API level 12 and later. This wrong
-setting was a
-regression introduced in release r9c.</li>
- <li>Defined <code>__PTHREAD_MUTEX_INIT_VALUE</code>,
-<code>__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE</code>,
- and <code>__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE</code> for Android API
-level 9 and lower.</li>
- <li>Added <code>scalbln</code>, <code>scalblnf</code>, and
-<code>scalblnl</code> to x86 <code>libm.so</code> for APIs 18 and later.</li>
- <li>Fixed a typo in
-<code>sources/android/support/include/iconv.h</code>.
- (Issue <a href="http://b.android.com/63806">63806</a>)</li>
-
- </ul>
- </li>
- <li>Fixed gabi++ <code>std::unexpected()</code> to call
-<code>std::terminate()</code> so that
- a user-defined <code>std::terminate()</code> handler has a chance to run.
-</li>
- <li>Fixed gabi++ to catch <code>std::nullptr</code>.</li>
- <li>Fixed samples Teapot and MoreTeapots:
- <ul>
- <li>Solved a problem with Tegra 2 and 3 chips by changing specular
-variables to use medium precision. Values for specular power can now be less
-than 1.0. </li>
- <li>Changed the samples so that pressing the volume button restores
-immersive mode and invalidates
-<code>SYSTEM_UI_FLAG_IMMERSIVE_STICKY</code>. Screen rotation does not
-trigger <code>onSystemUiVisibilityChange</code>, and so does not restore
-immersive mode.</li>
- </ul>
- </li>
- <li>Fixed the <code>ndk-build</code> script to add
-<code>-rpath-link=$SYSROOT/usr/lib</code> and
-<code>-rpath-link=$TARGET_OUT</code> in order to use <code>ld.bfd</code> to
-link executables. (Issue <a href="http://b.android.com/64266">64266</a>)</li>
- <li>Removed <code>-Bsymbolic</code> from all STL builds.</li>
- <li>Fixed <code>ndk-gdb-py.cmd</code> by setting <code>SHELL</code> as
-an environment variable
-instead of passing it to
- <code>python.exe</code>, which ignores the setting.
- (Issue <a href="http://b.android.com/63054">63054</a>)</li>
- <li>Fixed the <code>make-standalone-toolchain.sh</code> script so that
-the <code>--stl=stlport</code> option copies the gabi++ headers instead of
-symlinking them; the <code>cmd.exe</code> and MinGW shells do not understand
-symlinks created by cygwin.</li>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Applied execution permissions to all <code>*cmd</code> scripts
-previously intended for use only in the <code>cmd.exe</code> shell, in case
-developers prefer to use <code>ndk-build.cmd</code> in cygwin instead of the
-recommended <code>ndk-build</code> script.</li>
- <li>Improved the speed of the <code>make-standalone-toolchain.sh</code>
-script by moving instead of copying if the specified destination directory does
-not exist.</li>
- </dd>
- </ul>
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="9c"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 9c</a> <em>(December 2013)</em>
- </p>
- <div class="toggle-content-toggleme">
-<p>This is a bug-fix-only release.</p>
- <dl>
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed a problem with GCC 4.8 ARM, in which the stack pointer is
-restored too early. This problem prevented the frame pointer from reliably
-accessing a variable in the stack frame. (GCC Issue <a
-href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854">58854</a>)</li>
-<li>Fixed a problem with GCC 4.8 libstdc++, in which a bug in
-std::nth_element was causing generation of code that produced a random
-segfault. (Issue <a
-href="https://code.google.com/p/android/issues/detail?id=62910">62910</a>)</li>
- <li>Fixed GCC 4.8 ICE in cc1/cc1plus with
-<code>-fuse-ld=mcld</code>, so that the following error no longer occurs:
-<pre>cc1: internal compiler error: in common_handle_option, at
-opts.c:1774</pre></li>
- <li>Fixed <code>-mhard-float</code> support for
-<code>__builtin</code> math functions. For ongoing information on fixes for
-<code>-mhard-float</code> with STL, please follow Issue <a
-href="http://b.android.com/61784">61784</a>.</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Header fixes:
- <ul>
- <li>Changed prototype of <code>poll</code> to <code>poll(struct
-pollfd *, nfds_t, int);</code> in <code>poll.h</code>.</li>
- <li>Added <code>utimensat</code> to <code>libc.so</code> for Android
-API levels 12 and 19. These libraries are now included for all Android API
-levels 12 through 19.</li>
-<li>Introduced <code>futimens</code> into <code>libc.so</code>, for Android API
-level 19.</li>
-<li>Added missing <code>clock_settime()</code> and
-<code>clock_nanosleep()</code> to <code>time.h</code> for Android API level 8
-and higher.</li>
-<li>Added <code>CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE,
-CLOCK_MONOTONIC_COARSE, CLOCK_BOOTTIME, CLOCK_REALTIME_ALARM,</code> and
-<code>CLOCK_BOOTTIME_ALARM</code> in <code>time.h.</code></li>
-<li>Removed obsolete <code>CLOCK_REALTIME_HR</code> and
-<code>CLOCK_MONOTONIC_HR.</code></li>
- </ul>
- </li>
- <li>In samples Teapot, MoreTeapots, and
-<code>source/android/ndk_helper</code>:
- <ul>
-<li>Changed them so that they now use a hard-float abi for armeabi-v7a.</li>
-<li>Updated them to use immersive mode on Android API level 19 and
-higher.</li>
-<li>Fixed a problem with <code>Check_ReleaseStringUTFChars</code> in
-<code>/system/lib/libdvm.so</code> that was causing crashes on x86 devices.</li>
- </ul>
- </li>
-<li>Fixed <code>ndk-build</code> fails that happen in cygwin when the NDK
-package is
-referenced via symlink.</li>
-<li>Fixed <code>ndk-build.cmd</code> fails that happen in windows
-<code>cmd.exe</code> when
-<code>LOCAL_SRC_FILES</code> contains absolute paths. (Issue <a
-href="https://android-review.googlesource.com/#/c/69992">69992</a>)</li>
-<li>Fixed the <code>ndk-stack</code> script to proceed even when it can't parse
-a frame due to inability to find a routine, filename, or line number. In any of
-these cases, it prints <code>??</code>.</li>
-<li>Fixed the <code>ndk-stack</code> stack for windows-x64_64 targets so that
-it no longer erroneously matches a frame line with a line in the
-<code>stack:</code> section that doesn't contain <code>pc</code>,
-<code>eip</code>, or <code>ip</code>. For example:
-<pre>I/DEBUG ( 1151): #00 5f09db68 401f01c4
-/system/lib/libc.so</pre></li>
-<li>Fixed gabi++ so that it:
- <ul>
- <li>Does not use malloc() to allocate C++ thread-local
- objects.</li>
- <li>Avoids deadlocks in gabi++ in cases where libc.debug.malloc is
-non-zero in userdebug/eng Android platform builds.</li>
- </ul>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Added <code>LOCAL_EXPORT_LDFLAGS</code>.</li>
-<li>Introduced the <code>NDK_PROJECT_PATH=null</code> setting for use in an
-integrated build system where options are explicitly passed to
-<code>ndk-build</code>. With this setting, <code>ndk-build</code> makes no
-attempt to look for <code>NDK_PROJECT_PATH.</code> This setting also prevents
-variables from deriving default settings from NDK_PROJECT_PATH. As a result,
-the following variables must now be explicitly specified (with their default
-values if such exist): <code>NDK_OUT, NDK_LIBS_OUT, APP_BUILD_SCRIPT,
-NDK_DEBUG</code> (optional, default to 0), and other <code>APP_*</code>'s
-contained in <code>Application.mk</code>.</li>
-<li><code>APP_ABI</code> can now be enumerated in a comma-delimited list. For
-example:
-<pre>APP_ABI := "armeabi,armeabi-v7a"</pre></li>
-<li>Provided the ability to rebuild all of STL with debugging info in an
-optional, separate package called
-<code>android-ndk-r9c-cxx-stl-libs-with-debugging-info.zip</code>, using the
-<code>-g</code> option. This option
-helps the <code>ndk-stack</code> script provide better a stack dump across STL.
-This change should not affect the code/size of the final, stripped file.</li>
-<li>Enhanced <code>hello-jni</code> samples to report <code>APP_ABI</code> at
-compilation.</li>
-<li>Used the <code>ar</code> tool in Deterministic mode (option
-<code>-D</code>) to build static libraries. (Issue <a
-href="http://b.android.com/60705">60705</a>)</li>
- </ul>
- </dd>
-
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
-<a name="9b"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 9b</a> <em>(October 2013)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Updated {@code include/android/*h} and {@code math.h} for all Android API levels up to
- 18, including the addition of levels 13, 15, 16 and 17.
- For information on added APIs, see commit messages for Changes
- <a href="https://android-review.googlesource.com/68012">68012</a> and
- <a href="https://android-review.googlesource.com/68014">68014</a>.
- (Issues <a href="http://b.android.com/47150">47150</a>,
- <a href="http://b.android.com/58528">58528</a>, and
- <a href="http://b.android.com/38423">38423</a>)</li>
- <li>Added support for Android API level 19, including Renderscript binding.</li>
- <li>Added support for <code>-mhard-float</code> in the existing armeabi-v7a ABI. For more
- information and current restrictions on Clang, see
- {@code tests/device/hard-float/jni/Android.mk}.</li>
- <li>Migrated from GNU Compiler Collection (GCC) 4.8 to 4.8.2, and added diagnostic color
- support. To enable diagnostic colors, set <code>-fdiagnostics-color=auto</code>,
- <code>-fdiagnostics-color=always,</code> or export {@code GCC_COLORS} as shown below:
-<pre>
-GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-</pre>
- For more information, see
- <a href="http://gcc.gnu.org/onlinedocs/gcc/Language-Independent-Options.html">GCC
- Language Independent Options</a>.
- </li>
- <li>Added two new samples to demonstrate OpenGL ES 3.0 features: Teapot and MoreTeapots.
- These samples run on devices with Android 4.1 (API level 16) and higher.</li>
- <li>Deprecated GCC 4.7 and Clang 3.2 support, which will be removed in the next
- release.</li>
- </ul>
- </dd>
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed problem with ARM GCC 4.6 {@code thumb2} failing to generate 16-bit relative jump
- tables. (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48328">GCC Issue</a>)</li>
- <li>Fixed GCC 4.8 internal compiler error (ICE) on
- {@code g++.dg/cpp0x/lambda/lambda-defarg3.C}.
- (<a href="https://android-review.googlesource.com/62770">Change 62770</a>,
- <a href="http://gcc.gnu.org/ml/gcc/2013-07/msg00424.html">GCC Issue</a>)</li>
- <li>Fixed a problem with Windows 32-bit {@code *-gdb.exe} executables failing to launch.
- (<a href="http://b.android.com/58975">Issue 58975</a>)</li>
- <li>Fixed GCC 4.8 ICE when building bullet library. The error message is as follows:
- <pre>internal compiler error: verify_flow_info failed</pre>
- (<a href="http://b.android.com/58916">Issue 58916</a>,
- <a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58165">GCC Issue</a>)</li>
- <li>Modified GDB/ARM build to skip {@code ARM.exidx} data for unwinding in prologue code and
- added a command ({@code set arm exidx-unwinding}) to control exidx-based stack unwinding.
- (<a href="http://b.android.com/55826">Issue 55826</a>)</li>
- <li>Fixed Clang 3.3 MIPS compiler problem where HI and LO registers are incorrectly
- reused.</li>
- <li>Fixed issue with MIPS 4.7 ICE in {@code dbx_reg_number}. The error message is as
-follows:
-<pre>
-external/icu4c/i18n/decimfmt.cpp:1322:1:
-internal compiler error: in dbx_reg_number, at dwarf2out.c:10185
-</pre>
- (<a href="http://gcc.gnu.org/ml/gcc-patches/2012-12/msg00830.html">GCC Patch</a>)
-
- </li>
-
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Header fixes
- <ul>
- <li>Fixed the ARM {@code WCHAR_MIN} and {@code WCHAR_MAX} to be unsigned according to
- spec (the X86/MIPS versions are signed). Define {@code _WCHAR_IS_ALWAYS_SIGNED} to
- restore old behavior. (<a href="http://b.android.com/57749">Issue 57749</a>)</li>
- <li>Fixed {@code include/netinet/tcp.h} to contain {@code TCP_INFO} state enum.
- (<a href="http://b.android.com/38881">Issue 38881</a>)</li>
- <li>Fixed the {@code cdefs_elh.h} macro {@code _C_LABEL_STRING} to stop generating
- warnings in the GCC 4.8 toolchain when using c++11 mode.
- (<a href="http://b.android.com/58135">Issue 58135</a>,
- <a href="http://b.android.com/58652">Issue 58652</a>)</li>
- <li>Removed non-existent functions {@code imaxabs} and {@code imaxdiv} from header
- {@code inttypes.h}.</li>
- <li>Fixed issue with {@code pthread_exit()} return values and {@code pthread_self()}.
- (<a href="http://b.android.com/60686">Issue 60686</a>)</li>
- <li>Added missing {@code mkdtemp()} function, which already exists in {@code bionic}
- header {@code stdlib.h}.</li>
- </ul>
- </li>
- <li>Fixed problem building {@code samples/gles3jni} with Clang on Android API level 11.</li>
- <li>Fixed MCLinker to allow multiple occurrences of the following options:
- {@code -gc-sections} and {@code --eh-frame-hdr}.</li>
- <li>Fixed MCLinker to accept the {@code --no-warn-mismatch} option.</li>
- <li>Modified {@code cpu-features} option to not assume all VFPv4 devices support IDIV.
- Now this option only adds IDIV to white-listed devices, including Nexus 4.
- (<a href="http://b.android.com/57637">Issue 57637</a>)</li>
- <li>Fixed problem with {@code android_native_app_glue.c} erroneously logging errors on event
- predispatch operations.</li>
- <li>Fixed all operations on {@code gabi++} terminate and unexpected_handler to be
- thread-safe.</li>
- <li>Fixed several issues with Clang <code>-integrated-as</code> option so it can pass
- tests for {@code ssax-instructions} and {@code fenv}.</li>
- <li>Fixed GCC 4.6/4.7/4.8 compiler to pass the linker option {@code --eh-frame-hdr} even
- for static executables. For more information, see the
- <a href="http://gcc.gnu.org/ml/gcc-patches/2012-09/msg00969.html">GCC patch</a>.</li>
- <li>Fixed extra apostrophe in <code>CPU-ARCH-ABIS.html</code>. For more information, see
- <code>NDK-DEPENDS.html</code>. (<a href="http://b.android.com/60142">Issue 60142</a>)</li>
- <li>Fixed extra quotes in ndk-build output on Windows.
- (<a href="http://b.android.com/60649">Issue 60649</a>)</li>
- <li>Fixed Clang 3.3 to compile ARM's built-in, atomic operations such as
- {@code __atomic_fetch_add}, {@code __atomic_fetch_sub}, and {@code __atomic_fetch_or}.
- </li>
- <li>Fixed Clang 3.3 ICE with customized {@code vfprintf}.
- (<a href="http://llvm.org/bugs/show_bug.cgi?id=16344">Clang issue</a>)
- </li>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Enabled OpenMP for all GCC builds. To use this feature, add the following flags to your
- build settings:
-<pre>
-LOCAL_CFLAGS += -fopenmp
-LOCAL_LDFLAGS += -fopenmp
-</pre>
- For code examples, see {@code tests/device/test-openmp}</li>
- <li>Reduced the size of {@code ld.mcld} significantly (1.5MB vs. {@code ld.bfd} 3.5MB and
- {@code ld.gold} 7.5MB), resulting in a speed improvement of approximately 20%.</li>
- <li>Added <code>LOCAL_CONLYFLAGS</code> and <code>APP_CONLYFLAGS</code> to specify
- options applicable to C only but not C++. The existing <code>LOCAL_CFLAGS</code>
- and <code>APP_CFLAGS</code> are also used for C++ compilation (to save trouble of
- specifying most options twice), so options such as <code>-std=gnu99</code> may fail in
- g++ builds with a warning and clang++ builds with an error.</li>
- <li>Added {@code gabi++} array helper functions.</li>
- <li>Modified GCC builds so that all {@code libgcc.a} files are built with
- <code>-funwind-tables</code> to allow the stack to be unwound past previously blocked
- points, such as <code>__aeabi_idiv0</code>.</li>
- <li>Added Ingenic MXU support in MIPS GCC4.6/4.7/4.8 with new <code>-mmxu</code>
-option.</li>
- <li>Extended MIPS GCC4.6/4.7/4.8 <code>-mldc1-sdc1</code> to control ldxc1/sdxc1 too</li>
- <li>Added crazy linker. For more information, see
- {@code sources/android/crazy_linker/README.TXT}.</li>
- <li>Fixed {@code bitmap-plasma} to draw to full screen rather than a 200x200 pixel
-area.</li>
- <li>Reduced linux and darwin toolchain sizes by 25% by creating symlinks to identical files.
- </li>
- </ul>
- </dd>
-
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
-<a name="9"></a>
- <p>
- <a href="#" onclick="return toggleContent(this)"> <img
- src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
- >Android NDK, Revision 9</a> <em>(July 2013)</em>
- </p>
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Added support for Android 4.3 (API level 18). For more information, see
- {@code STABLE-APIS.html} and new code examples in {@code samples/gles3jni/README}.
- <li>Added headers and libraries for OpenGL ES 3.0, which is supported by Android 4.3
- (API level 18) and higher.</li>
- <li>Added GNU Compiler Collection (GCC) 4.8 compiler to the NDK. Since GCC 4.6 is still
- the default, you must explicitly enable this option:
- <ul>
- <li>For {@code ndk-build} builds, export {@code NDK_TOOLCHAIN_VERSION=4.8} or
- add it in {@code Application.mk}.</li>
- <li>For standalone builds, use the {@code --toolchain=} option in
- {@code make-standalone-toolchain.sh}, for example:<br>
- {@code --toolchain=arm-linux-androideabi-4.8}</li>
- </ul>
- <p class="note"><strong>Note:</strong>
- The {@code -Wunused-local-typedefs} option is enabled by {@code -Wall}. Be
- sure to add {@code __attribute__((unused))} if you use compile-time asserts like
- {@code sources/cxx-stl/stlport/stlport/stl/config/features.h}, line #311. For more
- information, see
- <a href="https://android-review.googlesource.com/#/c/55460">Change 55460</a></p>
- <p class="note"><strong>Note:</strong>
- In the GCC 4.7 release and later, ARM compilers generate unaligned access code by
- default for ARMv6 and higher build targets. You may need to add the
- {@code -mno-unaligned-access} build option when building for kernels that do not support
- this feature.</p>
- </li>
- <li>Added Clang 3.3 support. The {@code NDK_TOOLCHAIN_VERSION=clang} build option
- now picks Clang 3.3 by default.
- <p class="note"><strong>Note:</strong>
- Both GCC 4.4.3 and Clang 3.1 are deprecated, and will be removed from the next NDK
- release.</p></li>
- <li>Updated GNU Project Debugger (GDB) to support python 2.7.5.</li>
- <li>Added MCLinker to support Windows hosts. Since {@code ld.gold}
- is the default where available, you must add {@code -fuse-ld=mcld} in
- {@code LOCAL_LDFLAGS} or {@code APP_LDFLAGS} to enable MCLinker.</li>
- <li>Added {@code ndk-depends} tool which prints ELF library dependencies.
- For more information, see {@code NDK-DEPENDS.html}.
- (<a href="http://b.android.com/53486">Issue 53486</a>)</li>
- </ul>
- </dd>
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed potential event handling issue in {@code android_native_app_glue}.
- (<a href="http://b.android.com/41755">Issue 41755</a>)</li>
- <li>Fixed ARM/GCC-4.7 build to generate sufficient alignment for NEON load and store
- instructions VST and VLD.
- (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57271">GCC Issue 57271</a>)</li>
- <li>Fixed a GCC 4.4.3/4.6/4.7 internal compiler error (ICE) for a constant negative index
- value on a string literal.
- (<a href="http://b.android.com/54623">Issue 54623</a>)</li>
- <li>Fixed GCC 4.7 segmentation fault for constant initialization with an object address.
- (<a href="http://b.android.com/56508">Issue 56508</a>)</li>
- <li>Fixed GCC 4.6 ARM segmentation fault for <code>-O</code> values when using Boost
- 1.52.0. (<a href="http://b.android.com/42891">Issue 42891</a>)
- <li>Fixed {@code libc.so} and {@code libc.a} to support the {@code wait4()} function.
- (<a href="http://b.android.com/19854">Issue 19854</a>)</li>
- <li>Updated the x86 libc.so and libc.a files to include the {@code clone()}
- function.</li>
- <li>Fixed {@code LOCAL_SHORT_COMMANDS} bug where the {@code linker.list} file is
- empty or not used.</li>
- <li>Fixed GCC MIPS build on Mac OS to use CFI directives, without which
- {@code ld.mcld --eh-frame-hdr} fails frequently.</li>
- <li>Fixed Clang 3.2 X86/MIPS internal compiler error in {@code llvm/lib/VMCore/Value.cpp}.
- (<a href="https://android-review.googlesource.com/#/c/59021">Change 59021</a>)</li>
- <li>Fixed GCC 4.7 64-bit Windows assembler crash. (Error: {@code out of memory allocating
- 4294967280 bytes}).</li>
- <li>Updated {@code ndk-gdb} script so that the {@code --start} or {@code --launch} actions
- now wait for the GNU Debug Server, so that it can more reliably hit breakpoints set
- early in the execution path (such as breakpoints in JNI code).
- (<a href="http://b.android.com/41278">Issue 41278</a>)
- <p class="note"><strong>Note:</strong>
- This feature requires jdb and produces warning about pending breakpoints.
- Specify the {@code --nowait} option to restore previous behavior.
- </p>
- </li>
- <li>Fixed GDB crash when library list is empty.</li>
- <li>Fixed GDB crash when using a {@code stepi} command past a {@code bx pc} or
- {@code blx pc} Thumb instruction.
- (<a href="http://b.android.com/56962">Issue 56962</a>,
- <a href="http://b.android.com/36149">Issue 36149</a>)</li>
- <li>Fixed MIPS {@code gdbserver} to look for {@code DT_MIPS_RLD_MAP} instead of
- {@code DT_DEBUG}. (<a href="http://b.android.com/56586">Issue 56586</a>)</li>
- <li>Fixed a circular dependency in the ndk-build script, for example: If A->B and
- B->B, then B was dropped from build.
- (<a href="http://b.android.com/56690">Issue 56690</a>)</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed the {@code ndk-build} script to enable you to specify a version of Clang as a
- command line option (e.g., {@code NDK_TOOLCHAIN_VERSION=clang3.2}). Previously, only
- specifying the version as an environment variable worked.</li>
- <li>Fixed gabi++ size of {@code _Unwind_Exception} to be 24 for MIPS build targets when
- using the Clang compiler.
- (<a href="https://android-review.googlesource.com/#/c/54141">Change 54141</a>)</li>
- <li>Fixed the {@code ndk-build} script to ensure that built libraries are actually
- removed from projects that include prebuilt static libraries when using the
- {@code ndk-build clean} command.
- (<a href="https://android-review.googlesource.com/#/c/54461">Change 54461</a>,
- <a href="https://android-review.googlesource.com/#/c/54480">Change 54480</a>)</li>
- <li>Modified the {@code NDK_ANALYZE=1} option to be less verbose.</li>
- <li>Fixed {@code gnu-libstdc++/Android.mk} to include a {@code backward/} path for builds
- that use backward compability.
- (<a href="http://b.android.com/53404">Issue 53404</a>)</li>
- <li>Fixed a problem where {@code stlport new} sometimes returned random values.</li>
- <li>Fixed {@code ndk-gdb} to match the order of {@code CPU_ABIS}, not {@code APP_ABIS}.
- (<a href="http://b.android.com/54033">Issue 54033</a>)</li>
- <li>Fixed a problem where the NDK 64-bit build on MacOSX choses the wrong path for
- compiler.
- (<a href="http://b.android.com/53769">Issue 53769</a>)</li>
- <li>Fixed build scripts to detect 64-bit Windows Vista.
- (<a href="http://b.android.com/54485">Issue 54485</a>)</li>
- <li>Fixed x86 {@code ntonl/swap32} error: {@code invalid 'asm': operand number
- out of range}.
- (<a href="http://b.android.com/54465">Issue 54465</a>,
- <a href="https://android-review.googlesource.com/#/c/57242">Change 57242</a>)</li>
- <li>Fixed {@code ld.gold} to merge string literals.</li>
- <li>Fixed {@code ld.gold} to handle large symbol alignment.</li>
- <li>Updated {@code ld.gold} to enable the {@code --sort-section=name} option.</li>
- <li>Fixed GCC 4.4.3/4.6/4.7 to suppress the {@code -export-dynamic} option for
- statically linked programs. GCC no longer adds an {@code .interp} section for statically
- linked programs.</li>
- <li>Fixed GCC 4.4.3 {@code stlport} compilation error about inconsistent {@code typedef}
- of {@code _Unwind_Control_Block}.
- (<a href="http://b.android.com/54426">Issue 54426</a>)</li>
- <li>Fixed {@code awk} scripts to handle {@code AndroidManifest.xml} files created on
- Windows which may contain trailing {@code \r} characters and cause build errors.
- (<a href="http://b.android.com/42548">Issue 42548</a>)</li>
- <li>Fixed {@code make-standalone-toolchain.sh} to probe the {@code prebuilts/}
- directory to detect if the host is 32 bit or 64 bit.</li>
- <li>Fixed the Clang 3.2 {@code -integrated-as} option.</li>
- <li>Fixed the Clang 3.2 ARM EHABI compact model {@code pr1} and {@code pr2} handler data.
- </li>
- <li>Added Clang {@code -mllvm -arm-enable-ehabi} option to fix the following Clang error:
- <pre>clang: for the -arm-enable-ehabi option: may only occur zero or one times!</pre>
- </li>
- <li>Fixed build failure when there is no {@code uses-sdk} element in application
- manifest. (<a href="http://b.android.com/57015">Issue 57015</a>)</li>
- </ul>
-
- </dd>
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Header Fixes
- <ul>
- <li>Modified headers to make {@code __set_errno} an inlined function, since
- {@code __set_errno} in {@code errno.h} is deprecated, and {@code libc.so} no longer
- exports it.</li>
- <li>Modified {@code elf.h} to include {@code stdint.h}.
- (<a href="http://b.android.com/55443">Issue 55443</a>)</li>
- <li>Fixed {@code sys/un.h} to be included independently of other headers.
- (<a href="http://b.android.com/53646">Issue 53646</a>)</li>
- <li>Fixed all of the {@code MotionEvent_getHistorical} API family to take the
- {@code const AInputEvent* motion_event}.
- (<a href="http://b.android.com/55873">Issue 55873</a>)</li>
- <li>Fixed {@code malloc_usable_size} to take {@code const void*}.
- (<a href="http://b.android.com/55725">Issue 55725</a>)</li>
- <li>Fixed stdint.h to be more compatible with C99.
- (<a href="https://android-review.googlesource.com/#/c/46821">Change 46821</a>)</li>
- <li>Modified {@code wchar.h} to not redefine {@code WCHAR_MAX} and
- {@code WCHAR_MIN}</li>
- <li>Fixed {@code <inttypes.h>} declaration for pointer-related {@code PRI} and
- {@code SCN} macros. (<a href="http://b.android.com/57218">Issue 57218</a>)</li>
- <li>Changed the {@code sys/cdefs.h} header so that {@code __WCHAR_TYPE__} is 32-bit
- for API levels less than 9, which means that {@code wchat_t} is 32-bit for all
- API levels. To restore the previous behavior, define the {@code _WCHAR_IS_8BIT}
- boolean variable. (<a href="http://b.android.com/57267">Issue 57267</a>)</li>
- </ul>
- </li>
- <li>Added more formatting in NDK {@code docs/} and miscellaneous documentation fixes.
- </li>
- <li>Added support for a thin archive technique when building static libraries.
- (<a href="http://b.android.com/40303">Issue 40303</a>)</li>
- <li>Updated script {@code make-standalone-toolchain.sh} to support the {@code stlport}
- library in addition to {@code gnustl}, when you specify the option
- {@code --stl=stlport}. For more information, see {@code STANDALONE-TOOLCHAIN.html}.</li>
- <li>Updated the {@code make-standalone-toolchain.sh} script so that the
- {@code --llvm-version=} option creates the {@code $TOOLCHAIN_PREFIX-clang} and
- {@code $TOOLCHAIN_PREFIX-clang++} scripts in addition to {@code clang} and
- {@code clang++}, to avoid using the host's clang and clang++ definitions by accident.
- </li>
- <li>Added two flags to re-enable two optimizations in upstream Clang but disabled in
- NDK for better compatibility with code compiled by GCC:
- <ul>
- <li>Added a {@code -fcxx-missing-return-semantics} flag to re-enable <em>missing
-return
- semantics</em> in Clang 3.2+. Normally, all paths should terminate with a return
- statement for a value-returning function. If this is not the case, clang inserts
- an undefined instruction (or trap in debug mode) at the path without a return
- statement. If you are sure your code is correct, use this flag to allow the
- optimizer to take advantage of the undefined behavior. If you are not sure, do not
- use this flag. The caller may still receive a random incorrect value, but the
- optimizer will not exploit it and make your code harder to debug.</li>
- <li>Added a {@code -fglobal-ctor-const-promotion} flag to re-enable
- promoting global variables with static constructor to be constants. With this flag,
- the global variable optimization pass of LLVM tries to evaluate the global
- variables with static constructors and promote them to global constants. Although
- this optimization is correct, it may cause some incompatability with code compiled
- by GCC. For example, code may do {@code const_cast} to cast the constant to mutable
- and modify it. In GCC, the variable is in read-write and the code is run by
- accident. In Clang, the const variable is in read-only memory and may cause your
- application to crash.</li>
- </ul>
- </li>
- <li>Added {@code -mldc1-sdc1} to the MIPS GCC and Clang compilers. By default, compilers
- align 8-byte objects properly and emit the {@code ldc1} and {@code sdc1} instructions
- to move them around. If your app uses a custom allocator that does not always align
- with a new object's 8-byte boundary in the same way as the default allocator, your app
- may crash due to {@code ldc1} and {@code sdc1} operations on unaligned memory. In this
- case, use the {@code -mno-ldc1-sdc1} flag to workaround the problem.</li>
- <li>Downgraded the event severity from warning to info if {@code APP_PLATFORM_LEVEL} is
- larger than {@code APP_MIN_PLATFORM_LEVEL}. The {@code APP_PLATFORM_LEVEL} may be lower
- than {@code APP_PLATFORM} in {@code jni/Application.mk} because the NDK does not have
- headers for all levels. In this case, the actual level is shifted downwards. The
- {@code APP_MIN_PLATFORM_LEVEL} is specified by the {@code android:minSdkVersion} in
- your application's manifest.
- (<a href="http://b.android.com/39752">Issue 39752</a>)</li>
- <li>Added the {@code android_getCpuIdArm()} and {@code android_setCpuArm()} methods to
- {@code cpu-features.c}. This addition enables easier retrieval of the ARM CPUID
- information. (<a href="http://b.android.com/53689">Issue 53689</a>)</li>
- <li>Modified {@code ndk-build} to use GCC 4.7's {@code as/ld} for Clang compiling.
- <p class="note"><strong>Note:</strong>
- In GCC 4.7, {@code monotonic_clock} and {@code is_monotonic} have been renamed to
- {@code steady_clock} and {@code is_steady}, respectively.</p></li>
- <li>Added the following new warnings to the {@code ndk-build} script:
- <ul>
- <li>Added warnings if {@code LOCAL_LDLIBS/LDFLAGS} are used in static library
- modules.</li>
- <li>Added a warning if a configuration has no module to build.</li>
- <li>Added a warning for non-system libraries being used in
- {@code LOCAL_LDLIBS/LDFLAGS} of a shared library or executable modules.</li>
- </ul>
- </li>
- <li>Updated build scripts, so that if {@code APP_MODULES} is not defined and only static
- libraries are listed in {@code Android.mk}, the script force-builds all of them.
- (<a href="http://b.android.com/53502">Issue 53502</a>)</li>
- <li>Updated {@code ndk-build} to support absolute paths in {@code LOCAL_SRC_FILES}.</li>
- <li>Removed the {@code *-gdbtui} executables, which are duplicates of the {@code *-gdb}
- executables with the {@code -tui} option enabled.</li>
- <li>Updated the build scripts to warn you when the Edison Design Group (EDG) compiler
- front-end turns {@code _STLP_HAS_INCLUDE_NEXT} back on.
- (<a href="http://b.android.com/53646">Issue 53646</a>)</li>
- <li>Added the environment variable {@code NDK_LIBS_OUT} to allow overriding of the
- path for {@code libraries/gdbserver} from the default {@code $PROJECT/libs}.
- For more information, see {@code OVERVIEW.html}.</li>
- <li>Changed ndk-build script defaults to compile code with format string protection
- {@code -Wformat -Werror=format-security}. You may set
- {@code LOCAL_DISABLE_FORMAT_STRING_CHECKS=true} to disable it.
- For more information, see {@code ANDROID-MK.html}</li>
- <li>Added STL pretty-print support in {@code ndk-gdb-py}. For more information, see
- {@code NDK-GDB.html}.</li>
- <li>Added tests based on the googletest frameworks.</li>
- <li>Added a notification to the toolchain build script that warns you if the current shell
- is not {@code bash}.</li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
-<a name="lower"></a>
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 8e</a> <em>(March 2013)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Added 64-bit host toolchain set (package name suffix {@code *-x86_64.*}). For more
- information, see {@code CHANGES.HTML} and {@code NDK-BUILD.html}.</li>
- <li>Added Clang 3.2 compiler. GCC 4.6 is still the default. For information on using the
- Clang compiler, see {@code CHANGES.HTML}.</li>
- <li>Added static code analyzer for Linux/MacOSX hosts. For information on using the
- analyzer, see {@code CHANGES.HTML}.</li>
- <li>Added MCLinker for Linux/MacOSX hosts as an experimental feature. The {@code ld.gold}
- linker is the default where available, so you must explicitly enable it. For more
- information, see {@code CHANGES.HTML}.</li>
- <li>Updated ndk-build to use topological sort for module dependencies, which means the
- build automatically sorts out the order of libraries specified in
- {@code LOCAL_STATIC_LIBRARIES}, {@code LOCAL_WHOLE_STATIC_LIBRARIES} and
- {@code LOCAL_SHARED_LIBRARIES}. For more information, see {@code CHANGES.HTML}.
- (<a href="http://b.android.com/39378">Issue 39378</a>)</li>
- </ul>
- </dd>
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed build script to build all toolchains in {@code -O2}. Toolchains in previous
- releases were incorrectly built without optimization.</li>
- <li>Fixed build script which unconditionally builds Clang/llvm for MacOSX in 64-bit.</li>
- <li>Fixed GCC 4.6/4.7 internal compiler error:
- {@code gen_thumb_movhi_clobber at config/arm/arm.md:5832}.
- (<a href="http://b.android.com/52732">Issue 52732</a>)</li>
- <li>Fixed build problem where GCC/ARM 4.6/4.7 fails to link code using 64-bit atomic
- built-in functions.
- (<a href="http://b.android.com/41297">Issue 41297</a>)</li>
- <li>Fixed GCC 4.7 linker DIV usage mismatch errors.
- (<a href="http://sourceware.org/ml/binutils/2012-12/msg00202.html">Sourceware Issue</a>)
- <li>Fixed GCC 4.7 internal compiler error {@code build_data_member_initialization, at
- cp/semantics.c:5790}.</li>
- <li>Fixed GCC 4.7 internal compiler error {@code redirect_eh_edge_1, at tree-eh.c:2214}.
- (<a href="http://b.android.com/52909">Issue 52909</a>)</li>
- <li>Fixed a GCC 4.7 segfault.
- (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55245">GCC Issue</a>)</li>
- <li>Fixed {@code <chrono>} clock resolution and enabled {@code steady_clock}.
- (<a href="http://b.android.com/39680">Issue 39680</a>)</li>
- <li>Fixed toolchain to enable {@code _GLIBCXX_HAS_GTHREADS} for GCC 4.7 libstdc++.
- (<a href="http://b.android.com/41770">Issue 41770</a>,
- <a href="http://b.android.com/41859">Issue 41859</a>)</li>
- <li>Fixed problem with the X86 MXX/SSE code failing to link due to missing
- {@code posix_memalign}.
- (<a href="https://android-review.googlesource.com/#/c/51872">Change 51872</a>)</li>
- <li>Fixed GCC4.7/X86 segmentation fault in {@code i386.c}, function
- {@code distance_non_agu_define_in_bb()}.
- (<a href="https://android-review.googlesource.com/#/c/50383">Change 50383</a>)</li>
- <li>Fixed GCC4.7/X86 to restore earlier {@code cmov} behavior.
- (<a href="http://gcc.gnu.org/viewcvs?view=revision&revision=193554">GCC Issue</a>)</li>
- <li>Fixed handling NULL return value of {@code setlocale()} in libstdc++/GCC4.7.
- (<a href="http://b.android.com/46718">Issue 46718</a>)
- <li>Fixed {@code ld.gold} runtime undefined reference to {@code __exidx_start} and
- {@code __exidx_start_end}.
- (<a href="https://android-review.googlesource.com/#/c/52134">Change 52134</a>)</li>
- <li>Fixed Clang 3.1 internal compiler error when using Eigen library.
- (<a href="http://b.android.com/41246">Issue 41246</a>)</li>
- <li>Fixed Clang 3.1 internal compiler error including {@code <chrono>} in C++11
-mode.
- (<a href="http://b.android.com/39600">Issue 39600</a>)</li>
- <li>Fixed Clang 3.1 internal compiler error when generating object code for a method
- call to a uniform initialized {@code rvalue}.
- (<a href="http://b.android.com/41387">Issue 41387</a>)</li>
- <li>Fixed Clang 3.1/X86 stack realignment.
- (<a href="https://android-review.googlesource.com/#/c/52154">Change 52154</a>)</li>
- <li>Fixed problem with GNU Debugger (GDB) SIGILL when debugging on Android 4.1.2.
- (<a href="http://b.android.com/40941">Issue 40941</a>)</li>
- <li>Fixed problem where GDB cannot set {@code source:line} breakpoints when symbols
-contain
- long, indirect file paths.
- (<a href="http://b.android.com/42448">Issue 42448</a>)</li>
- <li>Fixed GDB {@code read_program_header} for MIPS PIE executables.
- (<a href="https://android-review.googlesource.com/#/c/49592">Change 49592</a>)</li>
- <li>Fixed {@code STLport} segmentation fault in {@code uncaught_exception()}.
- (<a href="https://android-review.googlesource.com/#/c/50236">Change 50236</a>)</li>
- <li>Fixed {@code STLport} bus error in exception handling due to unaligned access of
- {@code DW_EH_PE_udata2}, {@code DW_EH_PE_udata4}, and {@code DW_EH_PE_udata8}.</li>
- <li>Fixed Gabi++ infinite recursion problem with {@code nothrow new[]} operator.
- (<a href="http://b.android.com/52833">Issue 52833</a>)</li>
- <li>Fixed Gabi++ wrong offset to exception handler pointer.
- (<a href="https://android-review.googlesource.com/#/c/53446">Change 53446</a>)</li>
- <li>Removed Gabi++ redundant free on exception object
- (<a href="https://android-review.googlesource.com/#/c/53447">Change 53447</a>)</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed NDK headers:
- <ul>
- <li>Removed redundant definitions of {@code size_t}, {@code ssize_t}, and
- {@code ptrdiff_t}.</li>
- <li>Fixed MIPS and ARM {@code fenv.h} header.</li>
- <li>Fixed {@code stddef.h} to not redefine {@code offsetof} since it already exists
- in the toolchain.</li>
- <li>Fixed {@code elf.h} to contain {@code Elf32_auxv_t} and {@code Elf64_auxv_t}.
- (<a href="http://b.android.com/38441">Issue 38441</a>)
- </li>
- <li>Fixed the {@code #ifdef} C++ definitions in the
- {@code OpenSLES_AndroidConfiguration.h} header file.
- (<a href="http://b.android.com/53163">Issue 53163</a>)
- </li>
- </ul>
- </li>
- <li>Fixed {@code STLport} to abort after out of memory error instead of silently exiting.
- </li>
- <li>Fixed system and Gabi++ headers to be able to compile with API level 8 and lower.</li>
- <li>Fixed {@code cpufeatures} to not parse {@code /proc/self/auxv}.
- (<a href="http://b.android.com/43055">Issue 43055</a>)</li>
- <li>Fixed {@code ld.gold} to not depend on host libstdc++ and on Windows platforms,
- to not depend on the {@code libgcc_sjlj_1.dll} library.</li>
- <li>Fixed Clang 3.1 which emits inconsistent register list in {@code .vsave} and fails
- assembler.
- (<a href="https://android-review.googlesource.com/#/c/49930">Change 49930</a>)</li>
- <li>Fixed Clang 3.1 to be able to compile libgabi++ and pass the {@code test-stlport}
- tests for MIPS build targets.
- (<a href="https://android-review.googlesource.com/#/c/51961">Change 51961</a>)</li>
- <li>Fixed Clang 3.1 to only enable exception by default for C++, not for C.</li>
- <li>Fixed several issues in Clang 3.1 to pass most GNU exception tests.</li>
- <li>Fixed scripts {@code clang} and {@code clang++} in standalone NDK compiler to detect
- {@code -cc1} and to not specify {@code -target} when found.</li>
- <li>Fixed {@code ndk-build} to observe {@code NDK_APP_OUT} set in {@code Application.mk}.
- </li>
- <li>Fixed X86 {@code libc.so} and {@code lib.a} which were missing the {@code sigsetjmp}
- and {@code siglongjmp} functions already declared in {@code setjmp.h}.
- (<a href="http://b.android.com/19851">Issue 19851</a>)</li>
- <li>Patched GCC 4.4.3/4.6/4.7 libstdc++ to work with Clang in C++ 11.
- (<a href="http://clang.llvm.org/cxx_status.html">Clang Issue</a>)</li>
- <li>Fixed cygwin path in argument passed to {@code HOST_AWK}.</li>
- <li>Fixed {@code ndk-build} script warning in windows when running from project's JNI
- directory.
- (<a href="http://b.android.com/40192">Issue 40192</a>)</li>
- <li>Fixed problem where the {@code ndk-build} script does not build if makefile has
- trailing whitespace in the {@code LOCAL_PATH} definition.
- (<a href="http://b.android.com/42841">Issue 42841</a>)</li>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Enabled threading support in GCC/MIPS toolchain.</li>
- <li>Updated GCC exception handling helpers {@code __cxa_begin_cleanup} and
- {@code __cxa_type_match} to have <em>default</em> visibility from the previous
- <em>hidden</em> visibility in GNU libstdc++. For more information, see
- {@code CHANGES.HTML}.</li>
- <li>Updated build scripts so that Gabi++ and STLport static libraries are now built with
- hidden visibility except for exception handling helpers.</li>
- <li>Updated build so that {@code STLport} is built for ARM in Thumb mode.</li>
- <li>Added support for {@code std::set_new_handler} in Gabi++.
- (<a href="http://b.android.com/52805">Issue 52805</a>)</li>
- <li>Enabled {@code FUTEX} system call in GNU libstdc++.</li>
- <li>Updated {@code ndk-build} so that it no longer copies prebuilt static library to
- a project's {@code obj/local/<abi>/} directory.
- (<a href="http://b.android.com/40302">Issue 40302</a>)</li>
- <li>Removed {@code __ARM_ARCH_5*__} from ARM {@code toolchains/*/setup.mk} script.
- (<a href="http://b.android.com/21132">Issue 21132</a>)</li>
- <li>Built additional GNU libstdc++ libraries in thumb for ARM.</li>
- <li>Enabled MIPS floating-point {@code madd/msub/nmadd/nmsub/recip/rsqrt}
- instructions with 32-bit FPU.</li>
- <li>Enabled graphite loop optimizer in GCC 4.6 and 4.7 to allow more optimizations:
- {@code -fgraphite}, {@code -fgraphite-identity}, {@code -floop-block}, {@code
--floop-flatten},
- {@code -floop-interchange}, {@code -floop-strip-mine}, {@code -floop-parallelize-all},
- and {@code -ftree-loop-linear}.
- (<a href="http://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html">info</a>)</li>
- <li>Enabled {@code polly} for Clang 3.1 on Linux and Max OS X 32-bit hosts which analyzes
- and optimizes memory access. (<a href="http://polly.llvm.org">info</a>)</li>
- <li>Enabled {@code -flto} in GCC 4.7, 4.6, Clang 3.2 and Clang 3.1 on linux (Clang LTO
- via LLVMgold.so). MIPS compiler targets are not supported because {@code ld.gold}
- is not available.</li>
- <li>Enabled {@code --plugin} and {@code --plugin-opt} for {@code ld.gold} in GCC 4.6/4.7.
- </li>
- <li>Enabled {@code --text-reorder} for {@code ld.gold} in GCC 4.7.</li>
- <li>Configured GNU libstdc++ with {@code _GLIBCXX_USE_C99_MATH} which undefines the
- {@code isinf} script in the bionic header. For more information, see
- {@code CHANGES.html}.</li>
- <li>Added {@code APP_LDFLAGS} to the build scripts. For more information, see
- {@code ANDROID-MK.html}.</li>
- <li>Updated build scripts to allow {@code NDK_LOG=0} to disable the {@code NDK_LOG}.</li>
- <li>Updated build scripts to allow {@code NDK_HOST_32BIT=0} to disable the host developer
- environment 32-bit toolchain.</li>
- <li>Changed the default GCC/X86 flags {@code -march=} and {@code -mtune=} from
- {@code pentiumpro} and {@code generic} to {@code i686} and {@code atom}.</li>
- <li>Enhanced toolchain build scripts:
- <ul>
- <li>Fixed a race condition in {@code build-gcc.sh} for the {@code mingw} build type
- which was preventing a significant amount of parallel build processing.</li>
- <li>Updated {@code build-gabi++.sh} and {@code build-stlport.sh} so they can now run
- from the NDK package.
- (<a href="http://b.android.com/52835">Issue 52835</a>)
- </li>
- <li>Fixed {@code run-tests.sh} in the {@code MSys} utilities collection.</li>
- <li>Improved 64-bit host toolchain and Canadian Cross build support.</li>
- <li>Updated {@code build-mingw64-toolchain.sh} script to more recent version.</li>
- <li>Added option to build {@code libgnustl_static.a} and {@code stlport_static.a}
- without hidden visibility.</li>
- </ul>
- </li>
- </ul>
-
- </dd>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 8d</a> <em>(December 2012)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
- <dd>
- <ul>
- <li>Added the GNU Compiler Collection (GCC) 4.7 compiler to the NDK. The GCC 4.6 compiler
- is still the default, so you must to explicitly enable the new version as follows:
- <ul>
- <li>For {@code ndk-build}, export the {@code NDK_TOOLCHAIN_VERSION=4.7} variable
- <em>or</em> add it to {@code Application.mk}.</li>
- <li>For standalone builds, add the {@code --toolchain=} option to
- {@code make-standalone-toolchain.sh}, for example:
- <pre>--toolchain=arm-linux-androideabi-4.7</pre></li>
- </ul>
- <p class="note">
- <strong>Note:</strong> This feature is experimental. Please try it and
- <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p>
- </li>
- <li>Added {@code stlport} exception support via gabi++. Note that the new gabi++
- depends on {@code dlopen} and related code, meaning that:
- <ul>
- <li>You can no longer build a <em>static</em> executable using the {@code -static}
- option or include {@code libstlport_static.a} using
- {@code APP_STL := stlport_static}. (You can still use the {@code -static} option
- with a standalone toolchain.) Compiling a <em>dynamic</em> executable using
- {@code include $(BUILD_EXECUTABLE)} continues to work because the compiler
- automatically adds the {@code -ldl} option.</li>
- <li>If your project links using {@code -nostdlib} and {-Wl,--no-undefined}, you
- must manually include the {@code -ldl} option.</li>
- </ul>
- For more information, see {@code CPLUSPLUS-SUPPORT.html}.
-
- <p class="note">
- <strong>Note:</strong> This feature is experimental and works better with the GCC
- 4.6/4.7 compilers than with GCC 4.4.3 or Clang 3.1. Please try it and
- <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p>
- </li>
- <li>Added a {@code -mstack-protector-guard=} option for x86 to choose between a
- <em>global</em> default path which is compatible with older Android C library (bionic)
- and a new <em>tls</em> path (%gs:20) for {@code -fstack-protector},
- {@code -fstack-protector-all} and {@code -fstack-protector-strong} using the GCC 4.6
- and higher compilers.
-
- <p class="note">
- <strong>Note:</strong> The {@code -mstack-protector-guard} setting itself does not
- enable any {@code -fstack-protector*} options.</p>
- </li>
- <li>Added {@code android_setCpu()} function to
- {@code sources/android/cpufeatures/cpu-features.c} for use when auto-detection via
- {@code /proc} is not possible in Android 4.1 and higher.
- (<a href="http://code.google.com/p/chromium/issues/detail?id=164154">Chromium Issue
- 164154</a>)</li>
- </ul>
- </dd>
-
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed unnecessary rebuild of object files when using the {@code ndk-build} script.
- (<a href="http://b.android.com/39810">Issue 39810</a>)</li>
- <li>Fixed a linker failure with the NDK 8c release for Mac OS X 10.6.x that produced the
- following error:
- <pre>
-dyld: lazy symbol binding failed: Symbol not found: _memmem
-Referenced from: ...../arm-linux-androideabi/bin/ld
-Expected in: /usr/lib/libSystem.B.dylib</pre>
- This problem was caused by building on Mac OS X 10.7, which produced binaries that were
- not compatible with Mac OS 10.6.x and the NDK.
- </li>
- <li>Removed the {@code -x c++} options from the Clang++ standalone build script.
- (<a href="http://b.android.com/39089">Issue 39089</a>)</li>
- <li>Fixed issues using the {@code NDK_TOOLCHAIN_VERSION=clang3.1} option in Cygwin.
- (<a href="http://b.android.com/39585">Issue 39585</a>)</li>
- <li>Fixed the {@code make-standalone-toolchain.sh} script to allow generation of a
- standalone toolchain using the Cygwin or MinGW environments. The resulting toolchain
- can be used in Cygwin, MingGW or CMD.exe environments.
- (<a href="http://b.android.com/39915">Issue 39915</a>,
- <a href="http://b.android.com/39585">Issue 39585</a>)</li>
- <li>Added missing {@code SL_IID_ANDROIDBUFFERQUEUESOURCE} option in android-14 builds for
- ARM and X86.
- (<a href="http://b.android.com/40625">Issue 40625</a>)</li>
- <li>Fixed x86 CPU detection for the {@code ANDROID_CPU_X86_FEATURE_MOVBE} feature.
- (<a href="http://b.android.com/39317">Issue 39317</a>)</li>
- <li>Fixed an issue preventing the Standard Template Library (STL) from using C++
- sources that do not have a {@code .cpp} file extension.</li>
- <li>Fixed GCC 4.6 ARM internal compiler error <em>at reload1.c:1061</em>.
- (<a href="http://b.android.com/20862">Issue 20862</a>)</li>
- <li>Fixed GCC 4.4.3 ARM internal compiler error <em>at emit-rtl.c:1954</em>.
- (<a href="http://b.android.com/22336">Issue 22336</a>)</li>
- <li>Fixed GCC 4.4.3 ARM internal compiler error <em>at postreload.c:396</em>.
- (<a href="http://b.android.com/22345">Issue 22345</a>)</li>
- <li>Fixed problem with GCC 4.6/4.7 skipping lambda functions.
- (<a href="http://b.android.com/35933">Issue 35933</a>)</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
- <dd>
- <ul>
- <li>NDK header file fixes:
- <ul>
- <li>Fixed {@code __WINT_TYPE__} and {@code wint_t} to be the same type.</li>
- <li>Corrected typo in {@code android/bitmap.h}.
- (<a href="http://b.android.com/15134">Issue 15134</a>)
- </li>
- <li>Corrected typo in {@code errno.h}.</li>
- <li>Added check for the presence of {@code __STDC_VERSION__} in {@code sys/cdefs.h}.
- (<a href="http://b.android.com/14627">Issue 14627</a>)
- </li>
- <li>Reorganized headers in {@code byteswap.h} and {@code dirent.h}.</li>
- <li>Fixed {@code limits.h} to include {@code page.h} which provides {@code PAGE_SIZE}
- settings.
- (<a href="http://b.android.com/39983">Issue 39983</a>)
- </li>
- <li>Fixed return type of {@code glGetAttribLocation()} and
- {@code glGetUniformLocation()} from {@code int} to {@code GLint}.</li>
- <li>Fixed {@code __BYTE_ORDER} constant for x86 builds.
- (<a href="http://b.android.com/39824">Issue 39824</a>)
- </li>
- </ul>
- </li>
- <li>Fixed {@code ndk-build} script to not overwrite {@code -Os} with {@code -O2} for ARM
- builds.</li>
- <li>Fixed build scripts to allow overwriting of {@code HOST_AWK}, {@code HOST_SED}, and
- {@code HOST_MAKE} settings.</li>
- <li>Fixed issue for {@code ld.gold} on {@code fsck_msdos} builds linking objects built by
- the Intel C/C++ compiler (ICC).</li>
- <li>Fixed ARM EHABI support in Clang to conform to specifications.</li>
- <li>Fixed GNU Debugger (GDB) to shorten the time spent on walking the target's link map
- during {@code solib} events.
- (<a href="http://b.android.com/38402">Issue 38402</a>)</li>
- <li>Fixed missing {@code libgcc.a} file when linking shared libraries.</li>
- </ul>
- </dd>
-
- <dt>Other changes:</dt>
- <dd>
- <ul>
- <li>Backported 64-bit built-in atomic functions for ARM to GCC 4.6.</li>
- <li>Added documentation for audio output latency, along with other documentation and
- fixes.</li>
- <li>Fixed debug builds with Clang so that non-void functions now raise a {@code SIGILL}
- signal for paths without a return statement.</li>
- <li>Updated {@code make-standalone-toolchain.sh} to accept the suffix {@code -clang3.1}
- which is equivalent to adding {@code --llvm-version=3.1} to the GCC 4.6 toolchain.</li>
- <li>Updated GCC and Clang bug report URL to:
- <a
-href="http://source.android.com/source/report-bugs.html">http://source.android.com/source/report-bug
-s.html</a></li>
- <li>Added ARM ELF support to {@code llvm-objdump}.</li>
- <li>Suppressed <em>treating c input as c++</em> warning for Clang builds.</li>
- <li>Updated build so that only the 32-bit version of {@code libiberty.a} is built and
- placed in {@code lib32/}.</li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 8c</a> <em>(November 2012)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <dl>
- <dt>Important changes:</dt>
-
- <dd>
- <ul>
- <li>Added the Clang 3.1 compiler to the NDK. The GNU Compiler Collection (GCC) 4.6 is
- still the default, so you must explicitly enable the Clang compiler option as follows:
- <ul>
- <li>For {@code ndk-build}, export {@code NDK_TOOLCHAIN_VERSION=clang3.1} <em>or</em>
- add this environment variable setting to {@code Application.mk}.</li>
- <li>For standalone builds, add {@code --llvm-version=3.1} to
- {@code make-standalone-toolchain.sh} and replace {@code CC} and {@code CXX} in your
- makefile with {@code <tool-path>/bin/clang} and
- {@code <tool-path>/bin/clang++}. See {@code STANDALONE-TOOLCHAIN.html} for
- details.</li>
- </ul>
- <p class="note"><strong>Note:</strong> This feature is experimental. Please try it and
- <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p></li>
- <li>Added Gold linker {@code ld.gold} for the Windows toolchain. Gold linker is also the
- default for ARM and X86 on all hosts. You may override it to use the {@code ld.bfd}
- linker by adding {@code LOCAL_LDFLAGS += -fuse-ld=bfd} to {@code Android.mk}, or by
-passing
- {@code -fuse-ld=bfd} to the g++/clang++ command line that does the linking.</li>
- <li>Added checks for spaces in the NDK path to the {@code ndk-build[.cmd]} and
- {@code ndk-gdb} scripts, to prevent build errors that are difficult to diagnose.</li>
- <li>Made the following changes to API level handling:
- <ul>
- <li>Modified build logic so that projects that specify {@code android-10} through
- {@code android-13} in {@code APP_PLATFORM}, {@code project.properties} or
- {@code default.properties} link against {@code android-9} instead of
- {@code android-14}.
- <li>Updated build so that executables using android-16 (Jelly Bean) or higher are
- compiled with the {@code -fPIE} option for position-independent executables (PIE).
- A new {@code APP_PIE} option allows you to control this behavior. See {@code
- APPLICATION-MK.html} for details.
- <p class="note">
- <strong>Note:</strong> All API levels above 14 still link against {@code
- platforms/android-14} and no new {@code platforms/android-N} have been added.
- </p></li>
- <li>Modified {@code ndk-build} to provide warnings if the adjusted API level is larger
- than {@code android:minSdkVersion} in the project's {@code AndroidManifest.xml}.</li>
- </ul>
- </li>
- <li>Updated the {@code cpu-features} helper library to include more ARM-specific features.
- See {@code sources/android/cpufeatures/cpu-features.h} for details.</li>
- <li>Modified the long double on the X86 platform to be 8 bytes. This data type is now the
- same size as a double, but is still treated as a distinct type.</li>
- <li>Updated build for {@code APP_ABI=armeabi-v7a}:
- <ul>
- <li>Modified this build type to pass the {@code -march=armv7-a} parameter
- to the linker. This change ensures that v7-specific libraries and {@code crt*.o} are
- linked correctly.</li>
- <li>Added {@code -mfpu=vfpv3-d16} to {@code ndk-build} instead of the
- {@code -mfpu=vfp} option used in previous releases.</li>
- </ul>
- </li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Important bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed an issue where running {@code make-standalone-toolchain.sh} with root privileges
- resulted in the stand alone tool chain being inaccessible to some users.
- (<a href="http://b.android.com/35279">Issue 35279</a>)
- <ul>
- <li>All files and executables in the NDK release package are set to have read and
- execute permissions for all.</li>
- <li>The ownership/group of {@code libstdc++.a} is now preserved when copied.</li>
- </ul>
- </li>
- <li>Removed redundant {@code \r} from Windows prebuilt {@code echo.exe}. The redundant
- {@code \r} caused {@code gdb.setup} to fail in the GNU Debugger (GDB) because it
- incorrectly became part of the path.
- (<a href="http://b.android.com/36054">Issue 36054</a>)</li>
- <li>Fixed Windows parallel builds that sometimes failed due to timing issues in the
- {@code host-mkdir} implementation.
- (<a href="http://b.android.com/25875">Issue 25875</a>)</li>
- <li>Fixed GCC 4.4.3 GNU {@code libstdc++} to <em>not</em> merge {@code typeinfo} names by
- default. For more details, see
- {@code toolchain repo gcc/gcc-4.4.3/libstdc++-v3/libsupc++/typeinfo}.
- (<a href="http://b.android.com/22165">Issue 22165</a>)</li>
- <li>Fixed problem on {@code null} context in GCC 4.6
- {@code cp/mangle.c::write_unscoped_name}, where GCC may crash when the context is
- {@code null} and dereferenced in {@code TREE_CODE}.</li>
- <li>Fixed GCC 4.4.3 crashes on ARM NEON-specific type definitions for floats.
- (<a href="http://b.android.com/34613">Issue 34613</a>)</li>
- <li>Fixed the {@code STLport} internal {@code _IteWrapper::operator*()} implementation
- where a stale stack location holding the dereferenced value was returned and caused
- runtime crashes.
- (<a href="http://b.android.com/38630">Issue 38630</a>)</li>
-
- <li>ARM-specific fixes:
- <ul>
- <li>Fixed ARM GCC 4.4.3/4.6 {@code g++} to not warn that the <em>mangling of
- <va_list> was changed in GCC 4.4</em>. The workaround using the
- {@code -Wno-psabi} switch to avoid this warning is no longer required.</li>
- <li>Fixed an issue when a project with {@code .arm} or {@code .neon} suffixes in
- {@code LOCAL_SRC_FILES} also used {@code APP_STL}. With {@code APP_STL}, the
- {@code ndk-build} script searches for C++ files in {@code LOCAL_SRC_FILES} before
- adding STL {@code header/lib} paths to compilation. Modified {@code ndk-build} to
- filter out {@code .arm} and {@code .neon} suffixes before the search, otherwise items
- in {@code LOCAL_SRC_FILES} like {@code myfile.cpp.arm.neon} won't be compiled as C++
- code.</li>
- <li>Fixed {@code binutils-2.21/ld.bfd} to be capable of linking object from older
- binutils without {@code tag_FP_arch}, which was producing <em>assertion fail</em>
- error messages in GNU Binutils.
- (<a href="http://b.android.com/35209">Issue 35209</a>)
- </li>
- <li>Removed <em>Unknown EABI object attribute 44</em> warning when
- {@code binutils-2.19/ld} links prebuilt object by newer {@code binutils-2.21}</li>
- <li>Fixed an issue in GNU {@code stdc++} compilation with both {@code -mthumb} and
- {@code -march=armv7-a}, by modifying {@code make-standalone-toolchain.sh} to populate
- {@code headers/libs} in sub-directory {@code armv7-a/thumb}.
- (<a href="http://b.android.com/35616">Issue 35616</a>)
- </li>
- <li>Fixed <em>unresolvable R_ARM_THM_CALL relocation</em> error.
- (<a href="http://b.android.com/35342">Issue 35342</a>)
- </li>
- <li>Fixed internal compiler error at {@code reload1.c:3633}, caused by the ARM
- back-end expecting the wrong operand type when sign-extend from {@code char}.
- (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50099">GCC Issue 50099</a>)</li>
- <li>Fixed internal compiler error with negative shift amount.
- (<a href="http://gcc.gnu.org/ml/gcc-patches/2011-10/msg00594.html">GCC Issue</a>)</li>
- </ul>
- </li>
-
- <li>Fixed {@code -fstack-protector} for X86, which is also the default for the
- {@code ndk-build} x86 ABI target.</li>
-
- <li>MIPS-specific fixes:
- <ul>
- <li>Fixed {@code STLport} endian-ness by setting {@code _STLP_LITTLE_ENDIAN} to 1 when
- compiling MIPS {@code libstlport_*}.</li>
- <li>Fixed GCC {@code __builtin_unreachable} issue when compiling LLVM.
- (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54369">GCC Issue 54369</a>)</li>
- <li>Backported fix for {@code cc1} compile process consuming 100% CPU.
- (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50380">GCC Issue 50380</a>)</li>
- </ul>
- </li>
-
- <li>GNU Debugger-specific fixes:
- <ul>
- <li>Disabled Python support in gdb-7.x at build, otherwise the gdb-7.x configure
- function may pick up whatever Python version is available on the host and build
- {@code gdb} with a hard-wired dependency on a specific version of Python.
- (<a href="http://b.android.com/36120">Issue 36120</a>)
- </li>
- <li>Fixed {@code ndk-gdb} when {@code APP_ABI} contains {@code all} and matchs none
- of the known architectures.
- (<a href="http://b.android.com/35392">Issue 35392</a>)
- </li>
- <li>Fixed Windows pathname support, by keeping the {@code :} character if it looks
- like it could be part of a Windows path starting with a drive letter.
- (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=12843">GDB Issue 12843</a>)
- </li>
- <li>Fixed adding of hardware breakpoint support for ARM in {@code gdbserver}.
- (<a href="http://sourceware.org/ml/gdb-patches/2011-09/msg00200.html">GDB Issue</a>)
- </li>
- <li>Added fix to only read the current {@code solibs} when the linker is consistent.
- This change speeds up {@code solib} event handling.
- (<a href="http://b.android.com/37677">Issue 37677</a>)
- </li>
- <li>Added fix to make repeated attempts to find {@code solib} breakpoints. GDB now
- retries {@code enable_break()} during every call to {@code svr4_current_sos()} until
- it succeeds.
- (<a href="https://android-review.googlesource.com/#/c/43563">Change 43563</a>)</li>
- <li>Fixed an issue where {@code gdb} would not stop on breakpoints placed in
- {@code dlopen-ed} libraries.
- (<a href="http://b.android.com/34856">Issue 34856</a>)
- </li>
- <li>Fixed {@code SIGILL} in dynamic linker when calling {@code dlopen()}, on system
- where {@code /system/bin/linker} is stripped of symbols and
- {@code rtld_db_dlactivity()} is implemented as {@code Thumb}, due to not preserving
- {@code LSB} of {@code sym_addr}.
- (<a href="http://b.android.com/37147">Issue 37147</a>)
- </li>
- </ul>
- </li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Other bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed NDK headers:
- <ul>
- <li>Fixed {@code arch-mips/include/asm/*} code that was incorrectly removed from
- original kernel. (<a href="https://android-review.googlesource.com/#/c/43335">Change
- 43335</a>)</li>
- <li>Replaced struct member data {@code __unused} with {@code __linux_unused} in
- {@code linux/sysctl.h} and {@code linux/icmp.h} to avoid conflict with
- {@code #define __unused} in {@code sys/cdefs.h}.</li>
- <li>Fixed {@code fenv.h} for enclosed C functions with {@code __BEGIN_DECLS} and
- {@code __END_DECLS}.</li>
- <li>Removed unimplemented functions in {@code malloc.h}.</li>
- <li>Fixed {@code stdint.h} defintion of {@code uint64_t} for ANSI compilers.
- (<a href="http://b.android.com/1952">Issue 1952</a>)</li>
- <li>Fixed preprocessor macros in {@code <arch>/include/machine/*}.</li>
- <li>Replaced {@code link.h} for MIPS with new version supporting all platforms.</li>
- <li>Removed {@code linux-unistd.h}</li>
- <li>Move GLibc-specific macros {@code LONG_LONG_MIN}, {@code LONG_LONG_MAX} and
- {@code ULONG_LONG_MAX} from {@code <pthread.h>} to {@code
-<limits.h>}.</li>
- </ul>
- </li>
- <li>Fixed a buffer overflow in {@code ndk-stack-parser}.</li>
- <li>Fixed {@code _STLP_USE_EXCEPTIONS}, when not defined, to omit all declarations
- and uses of {@code __Named_exception}. Compiling and use of {@code __Named_exception}
- settings only occurs when {@code STLport} is allowed to use exceptions.</li>
- <li>Fixed building of Linux-only NDK packages without also building Windows code. Use the
- following settings to perform this type of build:
- <pre>./build/tools/make-release.sh --force --systems=linux-x86</pre></li>
- <li>Fixed {@code libc.so} so it does not export {@code atexit()} and {@code __do_handler}.
- These symbols are exported for ARM builds by the system version of the C library to
- support legacy native libraries. NDK-generated should never reference them directly.
- Instead, each shared library or executable should embed its own version of these symbols,
- provided by {@code crtbegin_*.o}.
- <p>If your project is linked with the {@code -nostdlib -Wl,--no-undefined} options, you
- must provide your own {@code __dso_handle} because {@code crtbegin_so.o} is not linked in
- this case. The content of {@code __dso_handle} does not matter, as shown in the following
- example code:</p>
-<pre>
-extern "C" {
- extern void *__dso_handle __attribute__((__visibility__ ("hidden")));
- void *__dso_handle;
-}
-</pre>
- </li>
- <li>Fixed symbol decoder for ARM used in {@code objdump} for {@code plt} entries to
- generate a more readable form {@code function@plt}.</li>
- <li>Removed the following symbols, introduced in GCC 4.6 {@code libgcc.a}, from
- the X86 platform {@code libc.so} library: {@code __aeabi_idiv0}, {@code __aeabi_ldiv0},
- {@code __aeabi_unwind_cpp_pr1}, and {@code __aeabi_unwind_cpp_pr2}.</li>
- <li>Removed unused {@code .ctors}, {@code .dtors}, and {@code .eh_frame} in MIPS
- {@code crt*_so.S}.</li>
- <li>Updated {@code ndk-gdb} so that it only takes the last line of output for
- {@code ndk-build} {@code DUMP_XXXX}. This change ensures that if {@code Application.mk} or
- {@code Android.mk} print something with {@code $(info ...)} syntax, it does not get
- injected into the result of {@code DUMP_XXXX}.
- (<a href="https://groups.google.com/d/msg/android-ndk/-/ew0lTWGr1UEJ">More info</a>)</li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Other changes:</dt>
-
- <dd>
- <ul>
- <li>Removed {@code arch-x86} and {@code arch-mips} headers from
- {@code platforms/android-[3,4,5,8]}. Those headers were incomplete, since both X86 and
- MIPS ABIs are only supported at API 9 or higher.</li>
- <li>Simplified c++ include path in standalone packages, as shown below.
- (<a href="http://b.android.com/35279">Issue 35279</a>)
-<pre>
-<path>/arm-linux-androideabi/include/c++/4.6.x-google
- to:
-<path>/include/c++/4.6/
-</pre></li>
- <li>Fixed {@code ndk-build} to recognize more C++ file extensions by default:
- {@code .cc .cp .cxx .cpp .CPP .c++ .C}. You may still use {@code LOCAL_CPP_EXTENSION} to
- overwrite these extension settings.</li>
- <li>Fixed an issue in {@code samples/san-angeles} that caused a black screen or freeze
- frame on re-launch.</li>
- <li>Replaced deprecated APIs in NDK samples.
- (<a href="http://b.android.com/20017">Issue 20017</a>)
- <ul>
- <li>{@code hello-gl2} from android-5 to android-7</li>
- <li>{@code native-activity} from android-9 to android-10</li>
- <li>{@code native-audio} from android-9 to android-10</li>
- <li>{@code native-plasma} from android-9 to android-10</li>
- </ul>
- </li>
- <li>Added new branding for Android executables with a simpler scheme in section
- {@code .note.android.ident} (defined in {@code crtbegin_static/dynamic.o}) so that
- debugging tools can act accordingly. The structure member and values are defined as
- follows:
-<pre>
-static const struct {
- int32_t namesz; /* = 8, sizeof ("Android") */
- int32_t descsz; /* = 1 * sizeof(int32_t) */
- int32_t type; /* = 1, ABI_NOTETYPE */
- char name[sizeof "Android"]; /* = "Android" */
- int32_t android_api; /* = 3, 4, 5, 8, 9, 14 */
-}
-</pre>
- <p>The previous branding options in section {@code .note.ABI-tag} are deprecated.</p>
- </li>
- <li>Added a new script {@code run-tests-all.sh} which calls {@code run-tests.sh} and
- {@code standalone/run.sh} with various conditions. The script {@code run-tests.sh} runs
- without the {@code --abi} option, and is enhanced to compile most of the tests for all
- supported ABIs and run on all attached devices</li>
- </ul>
- </dd>
- </dl>
-
- </div>
-</div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 8b</a> <em>(July 2012)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>The main features of this release are a new GNU Compiler Collection (GCC) 4.6 toolchain and
-GNU Debugger (GDB) 7.3.x which adds debugging support for the Android 4.1 (API Level 16) system
-image.</p>
-
- <dl>
- <dt>Important bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed {@code LOCAL_SHORT_COMMANDS} issues on Mac OS, Windows Cygwin environments for
-static libraries. List file generation is faster, and it is not regenerated to avoid repeated
-project rebuilds.</li>
- <li>Fixed several issues in {@code ndk-gdb}:
- <ul>
- <li>Updated tool to pass flags {@code -e}, {@code -d} and {@code -s} to adb more
-consistently.</li>
- <li>Updated tool to accept device serial names containing spaces.</li>
- <li>Updated tool to retrieve {@code /system/bin/link} information, so {@code gdb} on
-the host can set a breakpoint in {@code __dl_rtld_db_dlactivity} and be aware of linker activity
-(e.g., rescan {@code solib} symbols when {@code dlopen()} is called).</li>
- </ul>
- </li>
- <li>Fixed {@code ndk-build clean} on Windows, which was failing to remove
-{@code ./libs/*/lib*.so}.</li>
- <li>Fixed {@code ndk-build.cmd} to return a non-zero {@code ERRORLEVEL} when {@code make}
-fails.</li>
- <li>Fixed {@code libc.so} to stop incorrectly exporting the {@code __exidx_start} and
-{@code __exidx_end} symbols.</li>
- <li>Fixed {@code SEGV} when unwinding the stack past {@code __libc_init} for ARM and
-MIPS.</li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Important changes:</dt>
-
- <dd>
- <ul>
- <li>Added GCC 4.6 toolchain ({@code binutils} 2.21 with {@code gold} and GDB 7.3.x) to
-co-exist with the original GCC 4.4.3 toolchain ({@code binutils} 2.19 and GDB 6.6).
- <ul>
- <li>GCC 4.6 is now the default toolchain. You may set {@code
-NDK_TOOLCHAIN_VERSION=4.4.3} in {@code Application.mk} to select the original one.</li>
- <li>Support for the {@code gold} linker is only available for ARM and x86
-architectures on Linux and Mac OS hosts. This support is disabled by default. Add {@code
-LOCAL_LDLIBS += -fuse-ld=gold} in {@code Android.mk} to enable it.</li>
- <li>Programs compiled with {@code -fPIE} require the new {@code GDB} for debugging,
-including binaries in Android 4.1 (API Level 16) system images.</li>
- <li>The {@code binutils} 2.21 {@code ld} tool contains back-ported fixes from
-version 2.22:
- <ul>
- <li>Fixed {@code ld --gc-sections}, which incorrectly retains zombie references to
-external libraries. (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=13177">more
-info</a>).</li>
- <li>Fixed ARM {@code strip} command to preserve the original {@code p_align} and
-{@code p_flags} in {@code GNU_RELRO} section if they are valid. Without this fix, programs
-built with {@code -fPIE} could not be debugged. (<a
-href="http://sourceware.org/cgi-bin/cvsweb.cgi/src/bfd/elf.c.diff?cvsroot=src&r1=1.552&r2=1.553">mor
-e info</a>)</li>
- </ul>
- </li>
- <li>Disabled {@code sincos()} optimization for compatibility with older
- platforms.</li>
- </ul>
- </li>
-
- <li>Updated build options to enable the Never eXecute (NX) bit and {@code relro}/{@code
-bind_now} protections by default:
- <ul>
- <li>Added {@code --noexecstack} to assembler and {@code -z noexecstack} to linker
-that provides NX protection against buffer overflow attacks by enabling NX bit on stack and
-heap.</li>
- <li>Added {@code -z relro} and {@code -z now} to linker for hardening of internal
-data sections after linking to guard against security vulnerabilities caused by memory corruption.
-(more info: <a href="http://www.akkadia.org/drepper/nonselsec.pdf">1</a>,
-<a href="http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html">2</a>)</li>
-
- <li>These features can be disabled using the following options:
- <ol>
- <li>Disable NX protection by setting the {@code --execstack} option for the
-assembler and {@code -z execstack} for the linker.</li>
- <li>Disable hardening of internal data by setting the {@code -z norelro} and
-{@code -z lazy} options for the linker.</li>
- <li>Disable these protections in the NDK {@code jni/Android.mk} by setting the
-following options:
-<pre>
-LOCAL_DISABLE_NO_EXECUTE=true # disable "--noexecstack" and "-z noexecstack"
-DISABLE_RELRO=true # disable "-z relro" and "-z now"
-</pre>
- </li>
- </ol>
- <p>See {@code docs/ANDROID-MK.html} for more details.</p>
- </li>
- </ul>
- </li>
-
- <li>Added branding for Android executables with the {@code .note.ABI-tag} section (in
-{@code crtbegin_static/dynamic.o}) so that debugging tools can act accordingly. The structure
-member and values are defined as follows:
-<pre>
-static const struct {
- int32_t namesz; /* = 4, sizeof ("GNU") */
- int32_t descsz; /* = 6 * sizeof(int32_t) */
- int32_t type; /* = 1 */
- char name[sizeof "GNU"]; /* = "GNU" */
- int32_t os; /* = 0 */
- int32_t major; /* = 2 */
- int32_t minor; /* = 6 */
- int32_t teeny; /* = 15 */
- int32_t os_variant; /* = 1 */
- int32_t android_api; /* = 3, 4, 5, 8, 9, 14 */
-}</pre>
- </li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Other bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed {@code mips-linux-gnu} relocation truncated to fit {@code R_MIPS_TLS_LDM} issue.
- (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=12637">more info</a>)</li>
- <li>Fixed {@code ld} tool segfaults when using {@code --gc-sections}.
- (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=12845">more info</a>)
- </li>
- <li>Fixed MIPS {@code GOT_PAGE} counting issue.
- (<a href="http://sourceware.org/ml/binutils/2011-05/msg00198.html">more info</a>)</li>
- <li>Fixed follow warning symbol link for {@code mips_elf_count_got_symbols}.</li>
- <li>Fixed follow warning symbol link for {@code mips_elf_allocate_lazy_stub}.</li>
- <li>Moved MIPS {@code .dynamic} to the data segment, so that it is writable.</li>
- <li>Replaced hard-coded values for symbols with correct segment sizes for MIPS.</li>
- <li>Removed the {@code -mno-shared} option from the defaults in the MIPS toolchain.
-The default for Android toolchain is {@code -fPIC} (or {@code -fpic} if supported). If you do not
-explicitly specify {@code -mshared}, {@code -fpic}, {@code -fPIC}, {@code -fpie}, or {@code -fPIE},
-the MIPS compiler adds {@code -mno-shared} that turns off PIC. Fixed compiler not to add
-{@code -mno-shared} in this case.</li>
- <li>Fixed wrong package names in samples {@code hello-jni} and {@code two-libs} so that
-the {@code tests} project underneath it can compile.</li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Other Changes:</dt>
-
- <dd>
- <ul>
- <li>Changed locations of binaries:
- <ul>
- <li>Moved {@code gdbserver} from
-{@code toolchain/<arch-os-ver>/prebuilt/gdbserver} to
-{@code prebuilt/android-<arch>/gdbserver/gdbserver}.</li>
- <li>Renamed x86 toolchain prefix from {@code i686-android-linux-} to
-{@code i686-linux-android-}.</li>
- <li>Moved {@code sources/cxx-stl/gnu-libstdc++/include} and {@code lib} to
-{@code sources/cxx-stl/gnu-libstdc++/4.6} when compiled with GCC 4.6, or
-{@code sources/cxx-stl/gnu-libstdc++/4.4.3} when compiled with GCC 4.4.3.</li>
- <li>Moved {@code libbfd.a} and {@code libintl.a} from {@code lib/} to {@code
-lib32/}.</li>
- </ul>
- </li>
-
- <li>Added and improved various scripts in the rebuild and test NDK toolchain:
- <ul>
- <li>Added {@code build-mingw64-toolchain.sh} to generate a new Linux-hosted toolchain
-that generates Win32 and Win64 executables.</li>
- <li>Improved speed of {@code download-toolchain-sources.sh} by using the {@code
-clone} command and only using {@code checkout} for the directories that are needed to build the NDK
-toolchain binaries.</li>
- <li>Added {@code build-host-gcc.sh} and {@code build-host-gdb.sh} scripts.</li>
- <li>Added {@code tests/check-release.sh} to check the content of a given NDK
-installation directory, or an existing NDK package.</li>
- <li>Rewrote the {@code tests/standalone/run.sh} standalone tests .</li>
- </ul>
- </li>
- <li>Removed {@code if_dl.h} header from all platforms and architectures. The {@code
-AF_LINK} and {@code sockaddr_dl} elements it describes are specific to BSD (i.e., they don't exist
-in Linux).</li>
- </ul>
- </dd>
- </dl>
-
- </div>
-</div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 8</a> <em>(May 2012)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK includes support for MIPS ABI and a few additional fixes.</p>
-
- <dl>
- <dt>New features:</dt>
-
- <dd>
- <ul>
- <li>Added support for the MIPS ABI, which allows you to generate machine code that runs on
- compatible MIPS-based Android devices. Major features for MIPS include MIPS-specific
- toolchains, system headers, libraries and debugging support. For more details regarding
- MIPS support, see {@code docs/CPU-MIPS.html} in the NDK package.
-
- <p>By default, code is generated for ARM-based devices. You can add {@code mips} to
- your {@code APP_ABI} definition in your {@code Application.mk} file to build
- for MIPS platforms. For example, the following line instructs {@code ndk-build}
- to build your code for three distinct ABIs:</p>
-
- <pre>APP_ABI := armeabi armeabi-v7a <strong>mips</strong></pre>
-
- <p>Unless you rely on architecture-specific assembly sources, such as ARM assembly
- code, you should not need to touch your {@code Android.mk} files to build MIPS
- machine code.</p>
- </li>
-
- <li>You can build a standalone MIPS toolchain using the {@code --arch=mips}
- option when calling <code>make-standalone-toolchain.sh</code>. See
- {@code docs/STANDALONE-TOOLCHAIN.html} for more details.
- </li>
- </ul>
-
- <p class="note"><strong>Note:</strong> To ensure that your applications are available
-to users only if their devices are capable of running them, Google Play filters applications based
-on the instruction set information included in your application ? no action is needed on your part
-to enable the filtering. Additionally, the Android system itself also checks your application at
-install time and allows the installation to continue only if the application provides a library that
-is compiled for the device's CPU architecture.</p>
- </dd>
-
- <dt>Important bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed a typo in GAbi++ implementation where the result of {@code
- dynamic_cast<D>(b)} of base class object {@code b} to derived class {@code D} is
- incorrectly adjusted in the opposite direction from the base class.
- (<a href="http://b.android.com/28721">Issue 28721</a>)
- </li>
- <li>Fixed an issue in which {@code make-standalone-toolchain.sh} fails to copy
- {@code libsupc++.*}.</li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed {@code ndk-build.cmd} to ensure that {@code ndk-build.cmd} works correctly even
- if the user has redefined the {@code SHELL} environment variable, which may be changed
- when installing a variety of development tools in Windows environments.
- </li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 7c</a> <em>(April 2012)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK includes an important fix for Tegra2-based devices, and a few
-additional fixes and improvements:</p>
-
- <dl>
- <dt>Important bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed GNU STL armeabi-v7a binaries to not crash on non-NEON
- devices. The files provided with NDK r7b were not configured properly,
- resulting in crashes on Tegra2-based devices and others when trying to use
- certain floating-point functions (e.g., {@code cosf}, {@code sinf}, {@code expf}).</li>
- </ul>
- </dd>
-
- <dt>Important changes:</dt>
-
- <dd>
- <ul>
- <li>Added support for custom output directories through the {@code NDK_OUT}
- environment variable. When defined, this variable is used to store all
- intermediate generated files, instead of {@code $PROJECT_PATH/obj}. The variable is
- also recognized by {@code ndk-gdb}. </li>
- <li>Added support for building modules with hundreds or even thousands of source
- files by defining {@code LOCAL_SHORT_COMMANDS} to {@code true} in your {@code Android.mk}.
- <p>This change forces the NDK build system to put most linker or archiver options
- into list files, as a work-around for command-line length limitations.
- See {@code docs/ANDROID-MK.html} for details.</p>
- </li>
- </ul>
- </dd>
-
- <dt>Other bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Fixed {@code android_getCpuCount()} implementation in the {@code cpufeatures}
-helper library. On certain devices, where cores are enabled dynamically by the system, the previous
-implementation would report the total number of <em>active</em> cores the first time the function
-was called, rather than the total number of <em>physically available</em> cores.</li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 7b</a> <em>(February 2012)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK includes fixes for native Windows builds, Cygwin and many other
- improvements:</p>
-
- <dl>
- <dt>Important bug fixes:</dt>
-
- <dd>
- <ul>
- <li>Updated {@code sys/atomics.h} to avoid correctness issues
- on some multi-core ARM-based devices. Rebuild your unmodified sources with this
- version of the NDK and this problem should be completely eliminated.
- For more details, read {@code docs/ANDROID-ATOMICS.html}.</li>
- <li>Reverted to {@code binutils} 2.19 to fix debugging issues that
- appeared in NDK r7 (which switched to {@code binutils} 2.20.1).</li>
- <li>Fixed {@code ndk-build} on 32-bit Linux. A packaging error put a 64-bit version
- of the {@code awk} executable under {@code prebuilt/linux-x86/bin} in NDK r7.</li>
- <li>Fixed native Windows build ({@code ndk-build.cmd}). Other build modes were not
- affected. The fixes include:
- <ul>
- <li>Removed an infinite loop / stack overflow bug that happened when trying
- to call {@code ndk-build.cmd} from a directory that was <em>not</em> the top of
- your project path (e.g., in any sub-directory of it).</li>
- <li>Fixed a problem where the auto-generated dependency files were ignored. This
- meant that updating a header didn't trigger recompilation of sources that included
- it.</li>
- <li>Fixed a problem where special characters in files or paths, other than spaces and
- quotes, were not correctly handled.</li>
- </ul>
- </li>
- <li>Fixed the standalone toolchain to generate proper binaries when using
- {@code -lstdc++} (i.e., linking against the GNU {@code libstdc++} C++ runtime). You
- should use {@code -lgnustl_shared} if you want to link against the shared library
- version or {@code -lstdc++} for the static version.
-
- <p>See {@code docs/STANDALONE-TOOLCHAIN.html} for more details about this fix.</p>
- </li>
- <li>Fixed {@code gnustl_shared} on Cygwin. The linker complained that it couldn't find
- {@code libsupc++.a} even though the file was at the right location.</li>
- <li>Fixed Cygwin C++ link when not using any specific C++ runtime through
- {@code APP_STL}.</li>
- </ul>
- </dd>
- </dl>
-
- <dl>
- <dt>Other changes:</dt>
-
- <dd>
- <ul>
- <li>When your application uses the GNU {@code libstdc++} runtime, the compiler will
- no longer forcibly enable exceptions and RTTI. This change results in smaller code.
- <p>If you need these features, you must do one of the following:</p>
- <ul>
- <li>Enable exceptions and/or RTTI explicitly in your modules or
- {@code Application.mk}. (recommended)</li>
- <li>Define {@code APP_GNUSTL_FORCE_CPP_FEATURES} to {@code 'exceptions'},
- {@code 'rtti'} or both in your {@code Application.mk}. See
- {@code docs/APPLICATION-MK.html} for more details.</li>
- </ul>
- </li>
- <li>{@code ndk-gdb} now works properly when your application has private services
- running in independent processes. It debugs the main application process, instead of the
- first process listed by {@code ps}, which is usually a service process.</li>
- <li>Fixed a rare bug where NDK r7 would fail to honor the {@code LOCAL_ARM_MODE} value
- and always compile certain source files (but not all) to 32-bit instructions.</li>
- <li>{@code STLport}: Refresh the sources to match the Android platform version. This
- update fixes a few minor bugs:
- <ul>
- <li>Fixed instantiation of an incomplete type</li>
- <li>Fixed minor "==" versus "=" typo</li>
- <li>Used {@code memmove} instead of {@code memcpy} in {@code string::assign}</li>
- <li>Added better handling of {@code IsNANorINF}, {@code IsINF}, {@code IsNegNAN},
- etc.</li>
- </ul>
- <p>For complete details, see the commit log.</p>
- </li>
- <li>{@code STLport}: Removed 5 unnecessary static initializers from the library.</li>
- <li>The GNU libstdc++ libraries for armeabi-v7a were mistakenly compiled for
- armeabi instead. This change had no impact on correctness, but using the right
- ABI should provide slightly better performance.</li>
- <li>The {@code cpu-features} helper library was updated to report three optional
- x86 CPU features ({@code SSSE3}, {@code MOVBE} and {@code POPCNT}). See
- {@code docs/CPU-FEATURES.html} for more details.</li>
- <li>{@code docs/NDK-BUILD.html} was updated to mention {@code NDK_APPLICATION_MK} instead
- of {@code NDK_APP_APPLICATION_MK} to select a custom {@code Application.mk} file.</li>
- <li>Cygwin: {@code ndk-build} no longer creates an empty "NUL" file in the current
- directory when invoked.</li>
- <li>Cygwin: Added better automatic dependency detection. In the previous version, it
- didn't work properly in the following cases:
- <ul>
- <li>When the Cygwin drive prefix was not {@code /cygdrive}.</li>
- <li>When using drive-less mounts, for example, when Cygwin would translate
- {@code /home} to {@code \\server\subdir} instead of {@code C:\Some\Dir}.</li>
- </ul>
- </li>
- <li>Cygwin: {@code ndk-build} does not try to use the native Windows tools under
- {@code $NDK/prebuilt/windows/bin} with certain versions of Cygwin and/or GNU Make.</li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 7</a> <em>(November 2011)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK includes new features to support the Android 4.0 platform as well
- as many other additions and improvements:</p>
-
- <dl>
- <dt>New features</dt>
-
- <dd>
- <ul>
- <li>Added official NDK APIs for Android 4.0 (API level 14), which adds the following
- native features to the platform:
-
- <ul>
- <li>Added native multimedia API based on the Khronos Group OpenMAX AL? 1.0.1
- standard. The new <code><OMXAL/OpenMAXAL.h></code> and
- <code><OMXAL/OpenMAXAL_Android.h></code> headers allow applications targeting
- API level 14 to perform multimedia output directly from native code by using a new
- Android-specific buffer queue interface. For more details, see
- <code>docs/openmaxal/index.html</code> and <a href=
- "http://www.khronos.org/openmax/">http://www.khronos.org/openmax/</a>.</li>
-
- <li>Updated the native audio API based on the Khronos Group OpenSL ES 1.0.1?
- standard. With API Level 14, you can now decode compressed audio (e.g. MP3, AAC,
- Vorbis) to PCM. For more details, see <code>docs/opensles/index.html</code> and
- <a href=
- "http://www.khronos.org/opensles">http://www.khronos.org/opensles/</a>.</li>
- </ul>
- </li>
-
- <li>Added CCache support. To speed up large rebuilds, define the
- <code>NDK_CCACHE</code> environment variable to <code>ccache</code> (or the path to
- your <code>ccache</code> binary). When declared, the NDK build system automatically
- uses CCache when compiling any source file. For example:
- <pre>
-export NDK_CCACHE=ccache
-</pre>
- <p class="note"><strong>Note:</strong> CCache is not included in the NDK release
- so you must have it installed prior to using it. For more information about CCache, see
- <a href="http://ccache.samba.org">http://ccache.samba.org</a>.</p>
- </li>
-
- <li>Added support for setting <code>APP_ABI</code> to <code>all</code> to indicate that
- you want to build your NDK modules for all the ABIs supported by your given NDK
- release. This means that either one of the following two lines in your
- <code>Application.mk</code> are equivalent with this release:
- <pre>
-APP_ABI := all
-APP_ABI := armeabi armeabi-v7a x86
-</pre>
-
- <p>This also works if you define <code>APP_ABI</code> when calling
- <code>ndk-build</code> from the command-line, which is a quick way to check that your
- project builds for all supported ABIs without changing the project's
- <code>Application.mk file</code>. For example:</p>
- <pre>
-ndk-build APP_ABI=all
-</pre>
- </li>
-
- <li>Added a <code>LOCAL_CPP_FEATURES</code> variable in <code>Android.mk</code> that
- allows you to declare which C++ features (RTTI or Exceptions) your module uses. This
- ensures that the final linking works correctly if you have prebuilt modules that depend
- on these features. See <code>docs/ANDROID-MK.html</code> and
- <code>docs/CPLUSPLUS-SUPPORT.html</code> for more details.</li>
-
- <li>Shortened paths to source and object files that are used in build commands. When
- invoking <code>$NDK/ndk-build</code> from your project path, the paths to the source,
- object, and binary files that are passed to the build commands are significantly
- shorter now, because they are passed relative to the current directory. This is useful
- when building projects with a lot of source files, to avoid limits on the maximum
- command line length supported by your host operating system. The behavior is unchanged
- if you invoke <code>ndk-build</code> from a sub-directory of your project tree, or if
- you define <code>NDK_PROJECT_PATH</code> to point to a specific directory.</li>
- </ul>
- </dd>
-
- <dt>Experimental features</dt>
-
- <dd>
- You can now build your NDK source files on Windows <em>without</em> Cygwin by calling the
- <code>ndk-build.cmd</code> script from the command line from your project path. The
- script takes exactly the same arguments as the original <code>ndk-build</code> script.
- The Windows NDK package comes with its own prebuilt binaries for GNU Make, Awk and other
- tools required by the build. You should not need to install anything else to get a
- working build system.
-
- <p class="caution"><strong>Important:</strong> <code>ndk-gdb</code> does not work on
- Windows, so you still need Cygwin to debug.</p>
-
- <p>This feature is still experimental, so feel free to try it and report issues on the
- <a href="http://b.android.com">public bug database</a> or <a href=
- "http://groups.google.com/group/android-ndk">public forum</a>. All samples and unit tests
- shipped with the NDK succesfully compile with this feature.</p>
- </dd>
-
- <dt>Important bug fixes</dt>
-
- <dd>
- <ul>
- <li>Imported shared libraries are now installed by default to the target installation
- location (<code>libs/<abi></code>) if <code>APP_MODULES</code> is not defined in
- your <code>Application.mk</code>. For example, if a top-level module <code>foo</code>
- imports a module <code>bar</code>, then both <code>libfoo.so</code> and
- <code>libbar.so</code> are copied to the install location. Previously, only
- <code>libfoo.so</code> was copied, unless you listed <code>bar</code> in your
- <code>APP_MODULES</code> too. If you define <code>APP_MODULES</code> explicitly, the
- behavior is unchanged.</li>
-
- <li><code>ndk-gdb</code> now works correctly for activities with multiple categories in
- their MAIN intent filters.</li>
-
- <li>Static library imports are now properly transitive. For example, if a top-level
- module <code>foo</code> imports static library <code>bar</code> that imports static
- library <code>zoo</code>, the <code>libfoo.so</code> will now be linked against both
- <code>libbar.a</code> and <code>libzoo.a</code>.</li>
- </ul>
- </dd>
-
- <dt>Other changes</dt>
-
- <dd>
- <ul>
- <li><code>docs/NATIVE-ACTIVITY.HTML</code>: Fixed typo. The minimum API level should be
- 9, not 8 for native activities.</li>
-
- <li><code>docs/STABLE-APIS.html</code>: Added missing documentation listing EGL as a
- supported stable API, starting from API level 9.</li>
-
- <li><code>download-toolchain-sources.sh</code>: Updated to download the toolchain
- sources from <a href="http://android.googlesource.com">android.googlesource.com</a>,
- which is the new location for the AOSP servers.</li>
-
- <li>Added a new C++ support runtime named <code>gabi++</code>. More details about it
- are available in the updated <code>docs/CPLUSPLUS-SUPPORT.html</code>.</li>
-
- <li>Added a new C++ support runtime named <code>gnustl_shared</code> that corresponds
- to the shared library version of GNU libstdc++ v3 (GPLv3 license). See more info at
- <code>docs/CPLUSPLUS-SUPPORT.html</code></li>
-
- <li>Added support for RTTI in the STLport C++ runtimes (no support for
- exceptions).</li>
-
- <li>Added support for multiple file extensions in <code>LOCAL_CPP_EXTENSION</code>. For
- example, to compile both <code>foo.cpp</code> and <code>bar.cxx</code> as C++ sources,
- declare the following:
- <pre>
-LOCAL_CPP_EXTENSION := .cpp .cxx
-</pre>
- </li>
-
- <li>Removed many unwanted exported symbols from the link-time shared system libraries
- provided by the NDK. This ensures that code generated with the standalone toolchain
- doesn't risk to accidentally depend on a non-stable ABI symbol (e.g. any libgcc.a
- symbol that changes each time the toolchain used to build the platform is changed)</li>
-
- <li>Refreshed the EGL and OpenGLES Khronos headers to support more extensions. Note
- that this does <em>not</em> change the NDK ABIs for the corresponding libraries,
- because each extension must be probed at runtime by the client application.
-
- <p>The extensions that are available depend on your actual device and GPU drivers,
- not the platform version the device runs on. The header changes simply add new
- constants and types to make it easier to use the extensions when they have been
- probed with <code>eglGetProcAddress()</code> or <code>glGetProcAddress()</code>. The
- following list describes the newly supported extensions:</p>
-
- <dl>
- <dt>GLES 1.x</dt>
-
- <dd>
- <ul>
- <li><code>GL_OES_vertex_array_object</code></li>
-
- <li><code>GL_OES_EGL_image_external</code></li>
-
- <li><code>GL_APPLE_texture_2D_limited_npot</code></li>
-
- <li><code>GL_EXT_blend_minmax</code></li>
-
- <li><code>GL_EXT_discard_framebuffer</code></li>
-
- <li><code>GL_EXT_multi_draw_arrays</code></li>
-
- <li><code>GL_EXT_read_format_bgra</code></li>
-
- <li><code>GL_EXT_texture_filter_anisotropic</code></li>
-
- <li><code>GL_EXT_texture_format_BGRA8888</code></li>
-
- <li><code>GL_EXT_texture_lod_bias</code></li>
-
- <li><code>GL_IMG_read_format</code></li>
-
- <li><code>GL_IMG_texture_compression_pvrtc</code></li>
-
- <li><code>GL_IMG_texture_env_enhanced_fixed_function</code></li>
-
- <li><code>GL_IMG_user_clip_plane</code></li>
-
- <li><code>GL_IMG_multisampled_render_to_texture</code></li>
-
- <li><code>GL_NV_fence</code></li>
-
- <li><code>GL_QCOM_driver_control</code></li>
-
- <li><code>GL_QCOM_extended_get</code></li>
-
- <li><code>GL_QCOM_extended_get2</code></li>
-
- <li><code>GL_QCOM_perfmon_global_mode</code></li>
-
- <li><code>GL_QCOM_writeonly_rendering</code></li>
-
- <li><code>GL_QCOM_tiled_rendering</code></li>
- </ul>
- </dd>
-
- <dt>GLES 2.0</dt>
-
- <dd>
- <ul>
- <li><code>GL_OES_element_index_uint</code></li>
-
- <li><code>GL_OES_get_program_binary</code></li>
-
- <li><code>GL_OES_mapbuffer</code></li>
-
- <li><code>GL_OES_packed_depth_stencil</code></li>
-
- <li><code>GL_OES_texture_3D</code></li>
-
- <li><code>GL_OES_texture_float</code></li>
-
- <li><code>GL_OES_texture_float_linear</code></li>
-
- <li><code>GL_OES_texture_half_float_linear</code></li>
-
- <li><code>GL_OES_texture_npot</code></li>
-
- <li><code>GL_OES_vertex_array_object</code></li>
-
- <li><code>GL_OES_EGL_image_external</code></li>
-
- <li><code>GL_AMD_program_binary_Z400</code></li>
-
- <li><code>GL_EXT_blend_minmax</code></li>
-
- <li><code>GL_EXT_discard_framebuffer</code></li>
-
- <li><code>GL_EXT_multi_draw_arrays</code></li>
-
- <li><code>GL_EXT_read_format_bgra</code></li>
-
- <li><code>GL_EXT_texture_format_BGRA8888</code></li>
-
- <li><code>GL_EXT_texture_compression_dxt1</code></li>
-
- <li><code>GL_IMG_program_binary</code></li>
-
- <li><code>GL_IMG_read_format</code></li>
-
- <li><code>GL_IMG_shader_binary</code></li>
-
- <li><code>GL_IMG_texture_compression_pvrtc</code></li>
-
- <li><code>GL_IMG_multisampled_render_to_texture</code></li>
-
- <li><code>GL_NV_coverage_sample</code></li>
-
- <li><code>GL_NV_depth_nonlinear</code></li>
-
- <li><code>GL_QCOM_extended_get</code></li>
-
- <li><code>GL_QCOM_extended_get2</code></li>
-
- <li><code>GL_QCOM_writeonly_rendering</code></li>
-
- <li><code>GL_QCOM_tiled_rendering</code></li>
- </ul>
- </dd>
-
- <dt>EGL</dt>
-
- <dd>
- <ul>
- <li><code>EGL_ANDROID_recordable</code></li>
-
- <li><code>EGL_NV_system_time</code></li>
- </ul>
- </dd>
- </dl>
- </li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 6b</a> <em>(August 2011)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK does not include any new features compared to r6. The r6b release
- addresses the following issues in the r6 release:</p>
- <dl>
- <dt>Important bug fixes</dt>
- <dd>
- <ul>
- <li>Fixed the build when <code>APP_ABI="armeabi x86"</code> is used for
- multi-architecture builds.</li>
- <li>Fixed the location of prebuilt STLport binaries in the NDK release package.
- A bug in the packaging script placed them in the wrong location.</li>
- <li>Fixed <code>atexit()</code> usage in shared libraries with the x86standalone
- toolchain.</li>
- <li>Fixed <code>make-standalone-toolchain.sh --arch=x86</code>. It used to fail
- to copy the proper GNU libstdc++ binaries to the right location.</li>
- <li>Fixed the standalone toolchain linker warnings about missing the definition and
- size for the <code>__dso_handle</code> symbol (ARM only).</li>
- <li>Fixed the inclusion order of <code>$(SYSROOT)/usr/include</code> for x86 builds.
- See the <a href="http://b.android.com/18540">bug</a> for
- more information.</li>
- <li>Fixed the definitions of <code>ptrdiff_t</code> and <code>size_t</code> in
- x86-specific systems when they are used with the x86 standalone toolchain.</li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 6</a> <em>(July 2011)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK includes support for the x86 ABI and other minor changes.
- For detailed information describing the changes in this release, read the
- <code>CHANGES.HTML</code> document included in the NDK package.
- </p>
- <dl>
- <dt>General notes:</dt>
- <dd>
- <ul>
- <li>Adds support for the x86 ABI, which allows you to generate machine code
- that runs on compatible x86-based Android devices. Major features for x86
- include x86-specific toolchains, system headers, libraries and
- debugging support. For all of the details regarding x86 support,
- see <code>docs/CPU-X86.html</code> in the NDK package.
-
- <p>By default, code is generated for ARM-based devices, but you can add x86 to your
- <code>APP_ABI</code> definition in your <code>Application.mk</code> file to build
- for x86 platforms. For example, the following line instructs <code>ndk-build</code>
- to build your code for three distinct ABIs:</p>
-
- <pre>APP_ABI := armeabi armeabi-v7a x86</pre>
-
- <p>Unless you rely on ARM-based assembly sources, you shouldn't need to touch
- your <code>Android.mk</code> files to build x86 machine code.</p>
-
- </li>
-
- <li>You can build a standalone x86 toolchain using the
-<code>--toolchain=x86-4.4.3</code>
- option when calling <code>make-standalone-toolchain.sh</code>. See
- <code>docs/STANDALONE-TOOLCHAIN.html</code> for more details.
- </li>
- <li>The new <code>ndk-stack</code> tool lets you translate stack traces in
- <code>logcat</code> that are generated by native code. The tool translates
- instruction addresses into a readable format that contains things such
- as the function, source file, and line number corresponding to each stack frame.
- For more information and a usage example, see <code>docs/NDK-STACK.html</code>.
- </li>
- </ul>
- </dd>
- <dt>Other changes:</dt>
- <dd><code>arm-eabi-4.4.0</code>, which had been deprecated since NDK r5, has been
- removed from the NDK distribution.</dd>
-
- </dl>
- </div>
- </div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 5c</a> <em>(June 2011)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK does not include any new features compared to r5b. The r5c release
- addresses the following problems in the r5b release:</p>
- <dl>
- <dt>Important bug fixes:</dt>
- <dd>
- <ul>
- <li><code>ndk-build</code>: Fixed a rare bug that appeared when trying to perform parallel
- builds of debuggable projects.</li>
-
- <li>Fixed a typo that prevented <code>LOCAL_WHOLE_STATIC_LIBRARIES</code> to work
- correctly with the new toolchain and added documentation for this in
- <code>docs/ANDROID-MK.html</code>.</li>
-
- <li>Fixed a bug where code linked against <code>gnustl_static</code> crashed when run on
- platform releases older than API level 8 (Android 2.2).</li>
-
- <li><code>ndk-gdb</code>: Fixed a bug that caused a segmentation fault when debugging
-Android 3.0
- or newer devices.</li>
-
- <li><code><android/input.h></code>: Two functions that were introduced in API level
- 9 (Android 2.3) were incorrect and are fixed. While this breaks the source API, the
- binary interface to the system is unchanged. The incorrect functions were missing a
- <code>history_index</code> parameter, and the correct definitions are shown below:
-<pre>
-float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event,
- size_t pointer_index,
- size_t history_index);
-
-float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event,
- size_t pointer_index,
- size_t history_index);
-</pre>
- </li>
-
- <li>Updated the C library ARM binary for API level 9 (Android 2.3) to correctly expose at
- link time new functions that were added in that API level (for example,
- <code>pthread_rwlock_init</code>).</li>
-
- </ul>
- </dd>
-
- <dt>Minor improvements and fixes:</dt>
- <dd>
- <ul>
- <li>Object files are now always linked in the order they appear in
- <code>LOCAL_SRC_FILES</code>. This was not the case previously because the files were
- grouped by source extensions instead.</li>
-
- <li>When <code>import-module</code> fails, it now prints the list of directories that
- were searched. This is useful to check that the <code>NDK_MODULE_PATH</code> definition
- used by the build system is correct.</li>
-
- <li>When <code>import-module</code> succeeds, it now prints the directory where the
- module was found to the log (visible with <code>NDK_LOG=1</code>).</li>
-
- <li>Increased the build speed of debuggable applications when there is a very large number
- of include directories in the project.</li>
-
- <li><code>ndk-gdb</code>: Better detection of <code>adb shell</code> failures and improved
- error messages.</li>
-
- <li><code><pthread.h></code>: Fixed the definition of
- <code>PTHREAD_RWLOCK_INITIALIZER</code> for API level 9 (Android 2.3) and higher.</li>
-
- <li>Fixed an issue where a module could import itself, resulting in an infinite loop in
- GNU Make.</li>
-
- <li>Fixed a bug that caused the build to fail if <code>LOCAL_ARM_NEON</code> was set to
- true (typo in <code>build/core/build-binary.mk</code>).</li>
-
- <li>Fixed a bug that prevented the compilation of <code>.s</code> assembly files
- (<code>.S</code> files were okay).</li>
- </ul>
- </dd>
- </dl>
- </div>
-</div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 5b</a> <em>(January 2011)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK does not include any new features compared to r5. The r5b release
-addresses the
- following problems in the r5 release:
- </p>
- <ul>
- <li>The r5 binaries required glibc 2.11, but the r5b binaries are generated with a special
- toolchain that targets glibc 2.7 or higher instead. The Linux toolchain binaries now run on
-Ubuntu 8.04 or higher. </li>
- <li>Fixes a compiler bug in the arm-linux-androideabi-4.4.3 toolchain.
- The previous binary generated invalid thumb instruction sequences when
- dealing with signed chars.</li>
- <li>Adds missing documentation for the
- "gnustl_static" value for APP_STL, that allows you to link against
- a static library version of GNU libstdc++. </li> the
- <li>Fixed the following <code>ndk-build</code> issues:
- <ul>
- <li>A bug that created inconsistent dependency files when a
- compilation error occured on Windows. This prevented a proper build after
- the error was fixed in the source code.</li>
- <li>A Cygwin-specific bug where using very short paths for
- the Android NDK installation or the project path led to the
- generation of invalid dependency files. This made incremental builds
- impossible.</li>
- <li>A typo that prevented the cpufeatures library from working correctly
- with the new NDK toolchain.</li>
- <li>Builds in Cygwin are faster by avoiding calls to <code>cygpath -m</code>
- from GNU Make for every source or object file, which caused problems
- with very large source trees. In case this doesn't work properly, define
-<code>NDK_USE_CYGPATH=1</code> in your
- environment to use <code>cygpath -m</code> again.</li>
- <li>The Cygwin installation now notifies the user of invalid installation paths that
-contain spaces. Previously, an invalid path
- would output an error that complained about an incorrect version of GNU Make, even if the
-right one was installed.
- </ul>
- </li>
- <li>Fixed a typo that prevented the <code>NDK_MODULE_PATH</code> environment variable from
-working properly when
- it contained multiple directories separated with a colon. </li>
- <li>The <code>prebuilt-common.sh</code> script contains fixes to check the compiler for 64-bit
- generated machine code, instead of relying on the host tag, which
- allows the 32-bit toolchain to rebuild properly on Snow Leopard. The toolchain rebuild scripts
-now also support
- using a 32-bit host toolchain.</li>
- <li>A missing declaration for <code>INET_ADDRSTRLEN</code> was added to
-<code><netinet/in.h></code>.</li>
- <li>Missing declarations for <code>IN6_IS_ADDR_MC_NODELOCAL</code> and
-<code>IN6_IS_ADDR_MC_GLOBAL</code> were added to <code><netinet/in6.h></code>.</li>
- <li>'asm' was replaced with '__asm__' in <code><asm/byteorder.h></code> to allow
-compilation with <code>-std=c99</code>.</li>
- </ul>
- </div>
- </div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 5</a> <em>(December 2010)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>This release of the NDK includes many new APIs, most of which are introduced to
- support the development of games and similar applications that make extensive use
- of native code. Using the APIs, developers have direct native access to events, audio,
- graphics and window management, assets, and storage. Developers can also implement the
- Android application lifecycle in native code with help from the new
- {@link android.app.NativeActivity} class. For detailed information describing the changes
-in this
- release, read the <code>CHANGES.HTML</code> document included in the downloaded NDK
-package.
- </p>
- <dl>
- <dt>General notes:</dt>
- <dd>
- <ul>
- <li>Adds support for native activities, which allows you to implement the
- Android application lifecycle in native code.</li>
-
- <li>Adds native support for the following:
-
- <ul>
-
- <li>Input subsystem (such as the keyboard and touch screen)</li>
-
- <li>Access to sensor data (accelerometer, compass, gyroscope, etc).</li>
-
- <li>Event loop APIs to wait for things such as input and sensor events.</li>
-
- <li>Window and surface subsystem</li>
-
- <li>Audio APIs based on the OpenSL ES standard that support playback and recording
- as well as control over platform audio effects</li>
-
- <li>Access to assets packaged in an <code>.apk</code> file.</li>
-
- </ul>
- </li>
-
- <li>Includes a new toolchain (based on GCC 4.4.3), which generates better code, and can
-also now
- be used as a standalone cross-compiler, for people who want to build their stuff with
- <code>./configure && make</code>. See
- docs/STANDALONE-TOOLCHAIN.html for the details. The binaries for GCC 4.4.0 are still
-provided,
- but the 4.2.1 binaries were removed.</li>
-
- <li>Adds support for prebuilt static and shared libraries (docs/PREBUILTS.html) and
-module
- exports and imports to make sharing and reuse of third-party modules much easier
- (docs/IMPORT-MODULE.html explains why).</li>
-
- <li>Provides a default C++ STL implementation (based on STLport) as a helper module. It
-can be used either
- as a static or shared library (details and usage examples are in
-sources/android/stlport/README). Prebuilt
- binaries for STLport (static or shared) and GNU libstdc++ (static only) are also
-provided if you choose to
- compile against those libraries instead of the default C++ STL implementation.
- C++ Exceptions and RTTI are not supported in the default STL implementation. For more
-information, see
- docs/CPLUSPLUS-SUPPORT.HTML.</li>
-
- <li>Includes improvements to the <code>cpufeatures</code> helper library that improves
-reporting
- of the CPU type (some devices previously reported ARMv7 CPU when the device really was
-an ARMv6). We
- recommend developers that use this library to rebuild their applications then
- upload to Google Play to benefit from the improvements.</li>
-
- <li>Adds an EGL library that lets you create and manage OpenGL ES textures and
- services.</li>
-
- <li>Adds new sample applications, <code>native-plasma</code> and
-<code>native-activity</code>,
- to demonstrate how to write a native activity.</li>
-
- <li>Includes many bugfixes and other small improvements; see docs/CHANGES.html for a
-more
- detailed list of changes.</li>
- </ul>
- </dd>
- </dl>
- </div>
- </div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 4b</a> <em>(June 2010)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <dl>
- <dt>NDK r4b notes:</dt>
-
- <dd>
- <p>Includes fixes for several issues in the NDK build and debugging scripts — if
- you are using NDK r4, we recommend downloading the NDK r4b build. For detailed
- information describing the changes in this release, read the CHANGES.TXT document
- included in the downloaded NDK package.</p>
- </dd>
- </dl>
-
- <dl>
- <dt>General notes:</dt>
-
- <dd>
- <ul>
- <li>Provides a simplified build system through the new <code>ndk-build</code> build
- command.</li>
-
- <li>Adds support for easy native debugging of generated machine code on production
- devices through the new <code>ndk-gdb</code> command.</li>
-
- <li>Adds a new Android-specific ABI for ARM-based CPU architectures,
- <code>armeabi-v7a</code>. The new ABI extends the existing <code>armeabi</code> ABI to
- include these CPU instruction set extensions:
-
- <ul>
- <li>Thumb-2 instructions</li>
-
- <li>VFP hardware FPU instructions (VFPv3-D16)</li>
-
- <li>Optional support for ARM Advanced SIMD (NEON) GCC intrinsics and VFPv3-D32.
- Supported by devices such as Verizon Droid by Motorola, Google Nexus One, and
- others.</li>
- </ul>
- </li>
-
- <li>Adds a new <code>cpufeatures</code> static library (with sources) that lets your
- app detect the host device's CPU features at runtime. Specifically, applications can
- check for ARMv7-A support, as well as VFPv3-D32 and NEON support, then provide separate
- code paths as needed.</li>
-
- <li>Adds a sample application, <code>hello-neon</code>, that illustrates how to use the
- <code>cpufeatures</code> library to check CPU features and then provide an optimized
- code path using NEON instrinsics, if supported by the CPU.</li>
-
- <li>Lets you generate machine code for either or both of the instruction sets supported
- by the NDK. For example, you can build for both ARMv5 and ARMv7-A architectures at the
- same time and have everything stored to your application's final
- <code>.apk</code>.</li>
-
- <li>To ensure that your applications are available to users only if their devices are
- capable of running them, Google Play now filters applications based on the
- instruction set information included in your application — no action is needed on
- your part to enable the filtering. Additionally, the Android system itself also checks
- your application at install time and allows the installation to continue only if the
- application provides a library that is compiled for the device's CPU architecture.</li>
-
- <li>Adds support for Android 2.2, including a new stable API for accessing the pixel
- buffers of {@link android.graphics.Bitmap} objects from native code.</li>
- </ul>
- </dd>
- </dl>
- </div>
- </div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 3</a> <em>(March 2010)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <dl>
- <dt>General notes:</dt>
-
- <dd>
- <ul>
- <li>Adds OpenGL ES 2.0 native library support.</li>
-
- <li>Adds a sample application,<code>hello-gl2</code>, that illustrates the use of
- OpenGL ES 2.0 vertex and fragment shaders.</li>
-
- <li>The toolchain binaries have been refreshed for this release with GCC 4.4.0, which
- should generate slightly more compact and efficient machine code than the previous one
- (4.2.1). The NDK also still provides the 4.2.1 binaries, which you can optionally use
- to build your machine code.</li>
- </ul>
- </dd>
- </dl>
- </div>
- </div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 2</a> <em>(September 2009)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>Originally released as "Android 1.6 NDK, Release 1".</p>
-
- <dl>
- <dt>General notes:</dt>
-
- <dd>
- <ul>
- <li>Adds OpenGL ES 1.1 native library support.</li>
-
- <li>Adds a sample application, <code>san-angeles</code>, that renders 3D graphics
- through the native OpenGL ES APIs, while managing activity lifecycle with a {@link
- android.opengl.GLSurfaceView} object.</li>
- </ul>
- </dd>
- </dl>
- </div>
- </div>
-
-<div class="toggle-content closed">
- <p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
- alt="">Android NDK, Revision 1</a> <em>(June 2009)</em>
- </p>
-
- <div class="toggle-content-toggleme">
- <p>Originally released as "Android 1.5 NDK, Release 1".</p>
-
- <dl>
- <dt>General notes:</dt>
-
- <dd>
- <ul>
- <li>Includes compiler support (GCC) for ARMv5TE instructions, including Thumb-1
- instructions.</li>
-
- <li>Includes system headers for stable native APIs, documentation, and sample
- applications.</li>
- </ul>
- </dd>
- </dl>
- </div>
- </div>
-
-
-
-
-
-<!-- ####################### END OF RELEASE NOTES ####################### -->
diff --git a/docs/html/ndk/guides/_book.yaml b/docs/html/ndk/guides/_book.yaml
deleted file mode 100644
index c015d7a..0000000
--- a/docs/html/ndk/guides/_book.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-toc:
-- title: Getting Started
- path: /ndk/guides/index.html
- section:
- - title: Setup
- path: /ndk/guides/setup.html
- - title: Concepts
- path: /ndk/guides/concepts.html
-
-- title: Building
- path: /ndk/guides/build.html
- section:
- - title: Android.mk
- path: /ndk/guides/android_mk.html
- - title: Application.mk
- path: /ndk/guides/application_mk.html
- - title: ndk-build
- path: /ndk/guides/ndk-build.html
- - title: Standalone Toolchain
- path: /ndk/guides/standalone_toolchain.html
-
-- title: Architectures and CPUs
- path: /ndk/guides/arch.html
- section:
- - title: ABI Management
- path: /ndk/guides/abis.html
- - title: NEON
- path: /ndk/guides/cpu-arm-neon.html
- - title: x86
- path: /ndk/guides/x86.html
- - title: x86-64
- path: /ndk/guides/x86-64.html
- - title: MIPS
- path: /ndk/guides/mips.html
- - title: The cpufeatures Library
- path: /ndk/guides/cpu-features.html
-
-- title: Debugging
- path: /ndk/guides/debug.html
- section:
- - title: ndk-gdb
- path: /ndk/guides/ndk-gdb.html
- - title: ndk-stack
- path: /ndk/guides/ndk-stack.html
-
-- title: Libraries
- path: /ndk/guides/libs.html
- section:
- - title: Prebuilt Libraries
- path: /ndk/guides/prebuilts.html
- - title: C++ Support
- path: /ndk/guides/cpp-support.html
- - title: Stable APIs
- path: /ndk/guides/stable_apis.html
-
-- title: Audio
- path: /ndk/guides/audio/index.html
- section:
- - title: Basics
- path: /ndk/guides/audio/basics.html
- - title: OpenSL ES for Android
- path: /ndk/guides/audio/opensl-for-android.html
- - title: Audio Input Latency
- path: /ndk/guides/audio/input-latency.html
- - title: Audio Output Latency
- path: /ndk/guides/audio/output-latency.html
- - title: Floating-Point Audio
- path: /ndk/guides/audio/floating-point.html
- - title: Sample Rates
- path: /ndk/guides/audio/sample-rates.html
- - title: OpenSL ES Programming Notes
- path: /ndk/guides/audio/opensl-prog-notes.html
-
-- title: Vulkan
- path: /ndk/guides/graphics/index.html
- section:
- - title: Getting Started
- path: /ndk/guides/graphics/getting-started.html
- - title: Design Guidelines
- path: /ndk/guides/graphics/design-notes.html
- - title: Shader Compilers
- path: /ndk/guides/graphics/shader-compilers.html
- - title: Validation Layers
- path: /ndk/guides/graphics/validation-layer.html
diff --git a/docs/html/ndk/guides/abis.jd b/docs/html/ndk/guides/abis.jd
deleted file mode 100644
index 306cfdb..0000000
--- a/docs/html/ndk/guides/abis.jd
+++ /dev/null
@@ -1,469 +0,0 @@
-page.title=ABI Management
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#sa">Supported ABIs</a></li>
- <li><a href="#gc">Generating Code for a Specific ABI</a></li>
- <li><a href="#am">ABI Management on the Android Platform</a></li>
- </ol>
- </div>
- </div>
-
-<p>Different Android handsets use different CPUs, which in turn support different instruction sets.
-Each combination of CPU and instruction sets has its own Application Binary Interface, or
-<i>ABI</i>. The ABI defines, with great precision, how an application's machine code is supposed to
-interact with the system at runtime. You must specify an ABI for each CPU architecture you want
-your app to work with.</p>
-
-<p>A typical ABI includes the following information:</p>
-
-<ul>
-<li>The CPU instruction set(s) that the machine code should use.</li>
-<li>The endianness of memory stores and loads at runtime.</li>
-<li>The format of executable binaries, such as programs and shared libraries, and
-the types of content they support.</li>
-<li>Various conventions for passing data between your code and the system.
-These conventions include alignment constraints, as well as how the system uses the stack and
-registers when it calls functions.</li>
-<li>The list of function symbols available to your machine code at runtime,
-generally from very specific sets of libraries.</li>
-</ul>
-
-<p>This page enumerates the ABIs that the NDK supports, and provides information about how each ABI
-works.</p>
-
-<h2 id="sa">Supported ABIs</h2>
-
-<p>Each ABI supports one or more instruction sets. Table 1 provides an at-a-glance overview of
-the instruction sets each ABI supports.</p>
-
-<p class="table-caption" id="abi-table">
- <strong>Table 1.</strong> ABIs and supported instruction sets.</p>
-
-<table>
-<tr>
-<th>ABI</th>
-<th>Supported Instruction Set(s)</th>
-<th>Notes</th>
-</tr>
-
-<tr>
-<td><a href="#armeabi">{@code armeabi}</a> </td>
-<td><li>ARMV5TE and later</li>
-<li>Thumb-1</li></td>
-<td>No hard float.</td>
-</tr>
-
-<tr>
-<td><a href="#v7a">{@code armeabi-v7a}</a></td>
-<td>
-<li>armeabi</li>
-<li>Thumb-2</li>
-<li>VFPv3-D16</li>
-<li>Other, optional</li></td>
-<td>Incompatible with ARMv5, v6 devices.</td>
-</tr>
-
-<tr>
-<td><a href="#arm64-v8a">{@code arm64-v8a}</a></td>
-<td><li>AArch-64</li></td>
-</tr>
-
-<tr>
-<td>
-<a href="#x86">{@code x86}</a></td>
-<td><li>x86 (IA-32)</li>
-<li>MMX</li>
-<li>SSE/2/3</li>
-<li>SSSE3</li></td>
-<td>No support for MOVBE or SSE4.</td>
-</tr>
-
-<tr>
-<td><a href="#86-64">{@code x86_64}</a> </td>
-<td>
-<li>x86-64</li>
-<li>MMX</li>
-<li>SSE/2/3</li>
-<li>SSSE3</li>
-<li>SSE4.1, 4.2</li>
-<li>POPCNT</li></td>
-</tr>
-
-<tr>
-<td><a href="#mips">{@code mips}</a></td>
-<td><li>MIPS32r1 and later</li></td>
-<td>Uses hard-float, and assumes a CPU:FPU clock ratio of 2:1 for maximum
-compatibility. Provides neither micromips nor MIPS16.</td>
-</tr>
-
-<tr>
-<td><a href="#mips64">{@code mips64}</a></td>
-<td><li>MIPS64r6</li></td><td>
-</td>
-</tr>
-</table>
-
-<p>More detailed information about each ABI appears below.</p>
-
-<h3 id="armeabi">armeabi</h3>
-<p>This ABI is for ARM-based CPUs that support at least
-the ARMv5TE instruction set. Please refer to the following documentation for
-more details:</p>
-
-<ul>
-<li><a href="https://www.scss.tcd.ie/~waldroj/3d1/arm_arm.pdf">ARM Architecture
-Reference Manual</a></li>
-<li><a
-href="http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042e/IHI0042E_aapcs.pdf">
-Procedure Call Standard for the ARM Architecture</a></li>
-<li><a
-href="http://infocenter.arm.com/help/topic/com.arm.doc.dui0101a/DUI0101A_Elf.pdf">
-ARM ELF File Format</a></li>
-<li><a
-href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.subset.swdev.abi/index.html">Application Binary Interface (ABI) for the ARM Architecture</a></li>
-<li><a
-href="http://infocenter.arm.com/help/topic/com.arm.doc.ihi0037c/IHI0037C_bpabi.pdf">
-Base Platform ABI for the ARM Architecture</a></li>
-<li><a
-href="http://infocenter.arm.com/help/topic/com.arm.doc.ihi0039c/IHI0039C_clibabi.pdf">
-C Library ABI for the ARM Architecture</a></li>
-<li><a
-href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ihi0041d/index.html">
-C++ ABI for the ARM Architecture</a></li>
-<li><a
-href="http://infocenter.arm.com/help/topic/com.arm.doc.ihi0043d/IHI0043D_rtabi.pdf">
-Run-time ABI for the ARM Architecture</a></li>
-<li><a href="http://www.sco.com/developers/gabi/2001-04-24/contents.html">ELF
-System V Application Binary Interface</a></li>
-<li><a href="http://mentorembedded.github.com/cxx-abi/abi.html">Generic/Itanium C++
-ABI</a></li>
-</ul>
-
-<p>The AAPCS standard defines EABI as a family of similar
-but distinct ABIs. Also, Android follows the little-endian
-<a href="http://sourcery.mentor.com/sgpp/lite/arm/portal/kbattach142/arm_gnu_linux_ abi.pdf">
-ARM GNU/Linux ABI</a>.</p>
-
-<p>This ABI does not support hardware-assisted floating point
-computations. Instead, all floating-point operations use software helper
-functions from the compiler's {@code libgcc.a} static library.</p>
-
-<p>The armeabi ABI supports ARM’s
-<a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0210c/CACBCAAE.html">
-Thumb (a.k.a. Thumb-1) instruction set</a>. The NDK generates Thumb
-code by default unless you specify different behavior using the
-<code>LOCAL_ARM_MODE</code> variable in your
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>
-file.</p>
-
-<h3 id="v7a">armeabi-v7a</h3>
-<p>This ABI extends armeabi to include several
-<a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0406c/index.html">
-CPU instruction set extensions</a>. The instruction extensions that this Android-specific
-ABI supports are:</p>
-
-<ul>
-<li>The Thumb-2 instruction set extension, which provides performance comparable to 32-bit ARM
-instructions with similar compactness to Thumb-1.</li>
-<li>The VFP hardware-FPU instructions. More specifically, VFPv3-D16, which
-includes 16 dedicated 64-bit floating point registers, in addition to another
-16 32-bit registers from the ARM core.</li>
-</ul>
-
-<p>Other extensions that the v7-a ARM spec describes, including
-<a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0388f/Beijfcja.html">
-Advanced SIMD</a> (a.k.a. NEON), VFPv3-D32, and ThumbEE, are optional
-to this ABI. Since their presence is not guaranteed, the system should check at runtime
-whether the extensions are available. If they are not, you must use alternative code paths. This
-check is similar to the one that the system typically performs to check or use
-<a href="http://en.wikipedia.org/wiki/MMX_%28instruction_set%29">MMX</a>,
-<a href="http://en.wikipedia.org/wiki/SSE2">SSE2</a>, and other specialized
-instruction sets on x86 CPUs.</p>
-
-<p>For information about how to perform these runtime checks, refer to
-<a href="{@docRoot}ndk/guides/cpu-features.html">The {@code cpufeatures} Library</a>.
-Also, for information about the NDK's support for building
-machine code for NEON, see
-<a href="{@docRoot}ndk/guides/cpu-arm-neon.html">NEON Support</a>.</p>
-
-<p>The {@code armeabi-v7a} ABI uses the {@code -mfloat-abi=softfp} switch to
-enforce the rule that the compiler must pass all double values in core register pairs during
-function calls, instead of dedicated floating-point ones. The system can perform all internal
-computations using the FP registers. Doing so speeds up the computations greatly.</p>
-
-<h3 id="arm64-v8a">arm64-v8a</h3>
-<p>This ABI is for ARMv8-based CPUs that support AArch64. It also includes the NEON and
-VFPv4 instruction sets.</p>
-
-<p>For more information, see the
-<a href="http://www.arm.com/files/downloads/ARMv8_Architecture.pdf">ARMv8
-Technology Preview</a>, and contact ARM for further details.</p>
-
-<h3 id="x86">x86</h3>
-<p>This ABI is for CPUs supporting the instruction set commonly
-referred to as "x86" or "IA-32". Characteristics of this ABI include:</p>
-
-<ul>
-<li>Instructions normally generated by GCC with compiler flags such as the following:
-
-<pre class="no-pretty-print">
--march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32
-</pre>
-
-<p>These flags target the the Pentium Pro instruction set, along with the
-the <a href="http://en.wikipedia.org/wiki/MMX_%28instruction_set%29">MMX</a>,
-<a href="http://en.wikipedia.org/wiki/Streaming_SIMD_Extensions">SSE</a>,
-<a href="http://en.wikipedia.org/wiki/SSE2">SSE2</a>,
-<a href="http://en.wikipedia.org/wiki/SSE3">SSE3</a>, and
-<a href="http://en.wikipedia.org/wiki/SSSE3">SSSE3</a> instruction set extensions.
-The generated code is an optimization balanced across the top Intel 32-bit
-CPUs.</p>
-<p> For more information on compiler flags, particularly related to performance optimization,
-refer to <a href="http://software.intel.com/blogs/2012/09/26/gcc-x86-performance-hints">GCC
-x86 performance hints</a>.</p>
-</li>
-<li>Use of the standard Linux x86 32-bit calling convention, as opposed to the one for SVR. For
-more information, see section 6, "Register Usage", of
-<a href="http://www.agner.org/optimize/calling_conventions.pdf">Calling conventions for different
-C++ compilers and operating systems</a>.</li>
-</ul>
-
-<p>The ABI does not include any other optional IA-32 instruction set
-extensions, such as:</p>
-<ul>
-<li>MOVBE</li>
-<li>Any variant of SSE4.</li>
-</ul>
-<p>You can still use these extensions, as long as you use runtime feature-probing to
-enable them, and provide fallbacks for devices that do not support them.</p>
-<p>The NDK toolchain assumes 16-byte stack alignment before a function call. The default tools and
-options enforce this rule. If you are writing assembly code, you must make sure to maintain stack
-alignment, and ensure that other compilers also obey this rule.</p>
-
-<p>Refer to the following documents for more details:</p>
-<ul>
-<li>
-<a href="https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/i386-and-x86-64-Options.html">
-GCC online documentation: Intel 386 and AMD x86-64 Options</a></li>
-<li><a href="http://www.agner.org/optimize/calling_conventions.pdf">Calling
-conventions for different C++ compilers and operating systems</a></li>
-<li><a
-href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf"
->Intel IA-32 Intel Architecture Software Developer's Manual, Volume 2:
-Instruction Set Reference</a></li>
-<li><a
-href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-system-programming-manual-325384.pdf">Intel
-IA-32 Intel Architecture Software Developer's Manual, Volume 3: System
-Programming Guide</a></li>
-<li><a href="http://www.sco.com/developers/devspecs/abi386-4.pdf">System V Application Binary
-Interface: Intel386 Processor Architecture Supplement</a></li>
-</ul>
-
-<h3 id="86-64">x86_64</h3>
-<p>This ABI is for CPUs supporting the instruction set commonly referred to as
-"x86-64." It supports instructions that GCC typically generates with the following
-compiler flags:</p>
-<pre class="no-pretty-print">
--march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel
-</pre>
-
-<p>These flags target the x86-64 instruction set, according to the GCC
-documentation. along with the
-<a href="http://en.wikipedia.org/wiki/MMX_%28instruction_set%29">MMX</a>,
-<a href="http://en.wikipedia.org/wiki/Streaming_SIMD_Extensions">SSE</a>,
-<a href="http://en.wikipedia.org/wiki/SSE2">SSE2</a>,
-<a href="http://en.wikipedia.org/wiki/SSE3">SSE3</a>,
-<a href="http://en.wikipedia.org/wiki/SSSE3">SSSE3</a>,
-<a href="http://en.wikipedia.org/wiki/SSE4#SSE4.1">SSE4.1</a>,
-<a href="http://en.wikipedia.org/wiki/SSE4#SSE4.2">SSE4.2</a>, and
-<a href="https://software.intel.com/en-us/node/512035">POPCNT</a>
-instruction-set extensions. The generated code is an optimization balanced
-across the top Intel 64-bit CPUs.</p>
-
-<p> For more information on compiler flags, particularly related to performance optimization,
-refer to <a href="http://software.intel.com/blogs/2012/09/26/gcc-x86-performance-hints">GCC
-x86 Performance</a>.</p>
-
-<p>This ABI does not include any other optional x86-64 instruction set
-extensions, such as:</p>
-
-<ul>
-<li>MOVBE</li>
-<li>SHA</li>
-<li>AVX</li>
-<li>AVX2</li>
-</ul>
-
-<p>You can still use these extensions, as long as you use runtime feature probing to
-enable them, and provide fallbacks for devices that do not support them.</p>
-<p>Refer to the following documents for more details:</p>
-
-<ul>
-<li><a href="http://www.agner.org/optimize/calling_conventions.pdf">Calling conventions for
-different C++ compilers and operating systems</a></li>
-<li>
-<a href="http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html?iid=tech_vt_tech+64-32_manuals">
-Intel64 and IA-32 Architectures Software Developer's Manual, Volume 2: Instruction Set
-Reference</a></li>
-<li>
-<a href="http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html?iid=tech_vt_tech+64-32_manuals">
-Intel64 and IA-32 Intel Architecture Software Developer's Manual Volume 3: System Programming</a>
-</li>
-</ul>
-
-<h3 id="mips">mips</h3>
-<p>This ABI is for MIPS-based CPUs that support at least the MIPS32r1 instruction set. It includes
-the following features:</p>
-
-<ul>
-<li>MIPS32 revision 1 ISA</li>
-<li>Little-endian</li>
-<li>O32</li>
-<li>Hard-float</li>
-<li>No DSP application-specific extensions</li>
-</ul>
-
-<p>For more information, please refer to the following documentation:</p>
-
-<ul>
-<li>Architecture for Programmers ("MIPSARCH")</li>
-<li><a href="https://refspecs.linuxbase.org/elf/gabi4+/contents.html">ELF
-System V Application Binary Interface</a></li>
-<li><a href="http://sourcery.mentor.com/public/cxx-abi/abi.html">Itanium/Generic C++
-ABI</a></li>
-</ul>
-
-<p>For more specific details, see
-<a href="http://www.imgtec.com/mips/architectures/mips32/">MIPS32 Architecture</a>.
-Answers to common questions are in the
-<a href="https://sourcery.mentor.com/sgpp/lite/mips/portal/target_arch?@action=faq&target_arch=MIPS">MIPS FAQ</a>.
-</p>
-</li>
-</ul>
-
-<h3 id="mips64">mips64</h3>
-<p>This ABI is for MIPS64 R6. For more information, see
-<a href="http://www.imgtec.com/mips/architectures/mips64/">MIPS64 Architecture</a>.</p>
-
-<h2 id="gc">Generating Code for a Specific ABI</h2>
-<p>By default, the NDK generates machine code for the armeabi ABI. You can
-generate ARMv7-a-compatible machine code, instead, by adding the following line
-to your <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file.</p>
-<pre class="no-pretty-print">
-APP_ABI := armeabi-v7a
-</pre>
-
-<p>To build machine code for two or more distinct ABIs, using spaces as delimiters. For
-example:</p>
-
-<pre class="no-pretty-print">
-APP_ABI := armeabi armeabi-v7a
-</pre>
-
-<p>This setting tells the NDK to build two versions of your machine code: one
-for each ABI listed on this line. For more information on the values you can specify for the
-{@code APP_ABI} variable, see <a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>.
-</p>
-
-<p>When you build multiple machine-code versions, the build system copies the libraries to your
-application project path, and ultimately packages them into your APK, so creating
-a <a href="http://en.wikipedia.org/wiki/Fat_binary"><i>fat binary</i></a>. A fat binary
-is larger than one containing only the machine code for a single system; the tradeoff is
-gaining wider compatibility, but at the expense of a larger APK.</p>
-
-<p>At installation time, the package manager unpacks only the most appropriate
-machine code for the target device. For details, see <a href="#aen">Automatic
-extraction of native code at install time</a>.</p>
-
-
-<h2 id="am">ABI Management on the Android Platform</h2>
-<p>This section provides details about how the Android platform manages native
-code in APKs.</p>
-
-<h3>Native code in app packages</h3>
-<p>Both the Play Store and Package Manager expect to find NDK-generated
-libraries on filepaths inside the APK matching the following pattern:</p>
-
-<pre class="no-pretty-print">
-/lib/<abi>/lib<name>.so
-</pre>
-
-<p>Here, {@code <abi>} is one of the ABI names listed under <a href="#sa">Supported ABIs</a>,
-and {@code <name>} is the name of the library as you defined it for the {@code LOCAL_MODULE}
-variable in the <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file. Since
-APK files are just zip files, it is trivial to open them and confirm that the shared native
-libraries are where they belong.</p>
-
-<p>If the system does not find the native shared libraries where it expects them, it cannot use
-them. In such a case, the app itself has to copy the libraries over, and then
-perform <code>dlopen()</code>.</p>
-
-<p>In a fat binary, each library resides under a directory whose name matches a corresponding ABI.
-For example, a fat binary may contain:</p>
-
-<pre class="no-pretty-print">
-/lib/armeabi/libfoo.so
-/lib/armeabi-v7a/libfoo.so
-/lib/arm64-v8a/libfoo.so
-/lib/x86/libfoo.so
-/lib/x86_64/libfoo.so
-/lib/mips/libfoo.so
-/lib/mips64/libfoo.so
-</pre>
-
-<p class="note"><strong>Note:</strong> ARMv7-based Android devices running 4.0.3 or earlier
-install native libraries from the {@code armeabi} directory instead of the {@code armeabi-v7a}
-directory if both directories exist. This is because {@code /lib/armeabi/} comes after
-{@code /lib/armeabi-v7a/} in the APK. This issue is fixed from 4.0.4.</p>
-
-<h3>Android Platform ABI support</h3>
-<p>The Android system knows at runtime which ABI(s) it supports, because build-specific system
-properties indicate:</p>
-
-<ul>
-<li>The primary ABI for the device, corresponding to the machine code used in
-the system image itself.</li>
-<li>An optional, secondary ABI, corresponding to another ABI that the system image also supports.
-</li>
-</ul>
-
-<p>This mechanism ensures that the system extracts the best machine code from
-the package at installation time.</p>
-
-<p>For best performance, you should compile directly for the primary ABI. For example, a
-typical ARMv5TE-based device would only define the primary ABI: {@code armeabi}. By contrast, a
-typical, ARMv7-based device would define the primary ABI as {@code armeabi-v7a} and the secondary
-one as {@code armeabi}, since it can run application native binaries generated for each of them.</p>
-
-<p>Many x86-based devices can also run {@code armeabi-v7a} and {@code armeabi} NDK binaries. For
-such devices, the primary ABI would be {@code x86}, and the second one, {@code armeabi-v7a}.</p>
-
-<p>A typical MIPS-based device only defines a primary abi: {@code mips}.</p>
-
-<h3 id="aen">Automatic extraction of native code at install time</h3>
-
-<p>When installing an application, the package manager service scans the APK, and looks for any
-shared libraries of the form:</p>
-
-<pre class="no-pretty-print">
-lib/<primary-abi>/lib<name>.so
-</pre>
-
-<p>If none is found, and you have defined a secondary ABI, the service scans for shared libraries of
-the form:</p>
-
-<pre class="no-pretty-print">
-lib/<secondary-abi>/lib<name>.so
-</pre>
-
-<p>When it finds the libraries that it's looking for, the package manager
-copies them to <code>/lib/lib<name>.so</code>, under the application's
-{@code data} directory ({@code data/data/<package_name>/lib/}).</p>
-
-<p>If there is no shared-object file at all, the application builds and installs, but crashes at
-runtime.</p>
diff --git a/docs/html/ndk/guides/android_mk.jd b/docs/html/ndk/guides/android_mk.jd
deleted file mode 100644
index 1416d13..0000000
--- a/docs/html/ndk/guides/android_mk.jd
+++ /dev/null
@@ -1,875 +0,0 @@
-page.title=Android.mk
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#over">Overview</a></li>
- <li><a href="#basics">Basics</a></li>
- <li><a href="#var">Variables and Macros</a></li>
- <li><a href="#mdv">Module-Description Variables</a></li>
- </ol>
- </div>
- </div>
-
-
-<p>This page describes the syntax of the {@code Android.mk} build file,
-which glues your C and C++ source files to the Android NDK.</p>
-
-<h2 id="over">Overview</h2>
-<p>The {@code Android.mk} file resides in a subdirectory of your project's {@code jni/} directory,
-and describes your sources and shared libraries to the build system. It is really a tiny GNU
-makefile fragment that the build system parses once or more. The {@code Android.mk} file is useful
-for defining project-wide settings that <a href="{@docRoot}ndk/guides/application_mk.html">{@code
-Application.mk}</a>, the build system, and your
-environment variables leave undefined. It can also override project-wide settings for specific
-<i>modules</i>.</p>
-
-<p>The syntax of the {@code Android.mk} allows you to group your sources into
-<em>modules</em>. A module is either a static library, a shared library, or a standalone
-executable. You can define one or more modules in each {@code Android.mk} file, and
-you can use the same source file in multiple modules. The build system only places shared libraries
-into your application package. In addition, static libraries can generate shared libraries.</p>
-
-<p>In addition to packaging libraries, the build system handles a variety of other details for you.
-For example, you don't need to list header files or explicit dependencies between generated files in
-your {@code Android.mk} file. The NDK build system computes these relationships automatically for
-you. As a result, you should be able to benefit from new toolchain/platform support in future NDK
-releases without having to touch your {@code Android.mk} file.</p>
-
-<p>The syntax of this file is very close to that used in the {@code Android.mk} files distributed with
-the full <a href="https://source.android.com">Android Open Source Project</a>. While the
-build system implementation that uses them is different, their similarity is an
-intentional design decision aimed at making it easier for application
-developers to reuse source code for external libraries.</p>
-
-<h2 id="basics">Basics</h2>
-<p>Before exploring the syntax in detail, it is useful to start by understanding the basics
-of what a {@code Android.mk} file contains. This section uses the {@code Android.mk} file in the
-Hello-JNI sample toward that end, explaining the role that each line in the file plays.</p>
-
-
-<p>An {@code Android.mk} file must begin by defining the {@code LOCAL_PATH} variable:
-
-<pre class="no-pretty-print">
-LOCAL_PATH := $(call my-dir)
-</pre>
-
-<p>This variable indicates the location of the source files in the development tree. Here, the macro
-function {@code my-dir}, provided by the build system, returns the path of the current directory
-(the directory containing the {@code Android.mk} file itself).</p>
-
-<p>The next line declares the {@code CLEAR_VARS} variable, whose value the build system provides.
-
-<pre class="no-pretty-print">
-include $(CLEAR_VARS)
-</pre>
-
-<p>The {@code CLEAR_VARS} variable points to a special GNU Makefile that clears many
-{@code LOCAL_XXX} variables for you, such as {@code LOCAL_MODULE}, {@code LOCAL_SRC_FILES}, and
-{@code LOCAL_STATIC_LIBRARIES}. Note that it does not clear {@code LOCAL_PATH}. This variable must
-retain its value because the system parses all build control files in a single GNU Make execution
-context where all variables are global. You must (re-)declare this variable before describing each
-module.</p>
-
-<p>Next, the {@code LOCAL_MODULE} variable stores the name of the module that you wish to build.
-Use this variable once per module in your application.</p>
-
-<pre class="no-pretty-print">
-LOCAL_MODULE := hello-jni
-</pre>
-
-<p>Each module name must be unique and not contain any spaces. The build system, when it
-generates the final shared-library file, automatically adds the proper prefix and suffix to
-the name that you assign to {@code LOCAL_MODULE}. For example, the example that appears above
-results in generation of a library called {@code libhello-jni.so}.</p>
-
-<p class="note"><strong>Note:</strong> If your module's name already starts with {@code lib}, the
-build system does not prepend an additional {@code lib} prefix; it takes the module name as-is, and
-adds the {@code .so} extension. So a source file originally called, for example, {@code libfoo.c}
-still produces a shared-object file called {@code libfoo.so}. This behavior is to support libraries
-that the Android platform sources generate from {@code Android.mk} files; the names of all such
-libraries start with {@code lib}.</p>
-
-<p>The next line enumerates the source files, with spaces delimiting multiple files:</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES := hello-jni.c
-</pre>
-
-<p>The {@code LOCAL_SRC_FILES} variable must contain a list of C and/or C++ source files to build
-into a module.</p>
-
-<p>The last line helps the system tie everything together:</p>
-
-<pre class="no-pretty-print">
-include $(BUILD_SHARED_LIBRARY)
-</pre>
-
-<p>The {@code BUILD_SHARED_LIBRARY} variable points to a GNU Makefile script that collects all the
-information you defined in {@code LOCAL_XXX} variables since the most recent {@code include}. This
-script determines what to build, and how to do it.</p>
-
-<p>There are more complex examples in the samples directories, with commented
-{@code Android.mk} files that you can look at. In addition,
-<a href="{@docRoot}ndk/samples/sample_na.html">Sample: native-activity</a> provides
-a detailed explanation of that sample's {@code Android.mk} file. Finally, <a href="#var">
-Variables and Macros</a> provides further information on the variables from this section.
-
-
-<h2 id="var">Variables and Macros</h2>
-<p>The build system provides many possible variables for use in the the {@code Android.mk} file.
-Many of these variables come with preassigned values. Others, you assign.</p>
-
-<p>In addition to these variables, you can also define your own arbitrary ones. If you do so, keep
-in mind that the NDK build system reserves the following variable names:</p>
-<ul>
-<li>Names that begin with {@code LOCAL_}, such as {@code LOCAL_MODULE}.</li>
-<li>Names that begin with {@code PRIVATE_}, {@code NDK_}, or {@code APP}. The build system uses
-these internally.</li>
-<li>Lower-case names, such as {@code my-dir}. The build system uses these internally, as well.</li>
-</ul>
-<p>If you need to define your own convenience variables in an {@code Android.mk} file, we
-recommend prepending {@code MY_} to their names.
-
-
-<h3 id="npv">NDK-defined variables</h3>
-<p>This section discusses the GNU Make variables that the build system defines before parsing your
-{@code Android.mk} file. Under certain circumstances, the NDK might parse your {@code Android.mk}
-file several times, using a different definition for some of these variables each time.</p>
-
-<h4>CLEAR_VARS</h4>
-<p>This variable points to a build script that undefines nearly all {@code LOCAL_XXX} variables
-listed in the "Developer-defined variables" section below. Use this variable to include
-this script before describing a new module. The syntax for using it is:</p>
-
-<pre class="no-pretty-print">
-include $(CLEAR_VARS)
-</pre>
-
-<h4>BUILD_SHARED_LIBRARY</h4>
-<p>This variable points to a build script that collects all the information about the module
-you provided in your {@code LOCAL_XXX} variables, and determines how to build a target shared
-library from the sources you listed. Note that using this script requires that you have already
-assigned values to {@code LOCAL_MODULE} and {@code LOCAL_SRC_FILES}, at a minimum (for more
-information about these variables, see <a href = "#mdv">Module-Description Variables</a>).</p>
-
-<p>The syntax for using this variable is:</p>
-
-<pre class="no-pretty-print">
-include $(BUILD_SHARED_LIBRARY)
-</pre>
-
-<p>A shared-library variable causes the build system to generate a library file with a {@code .so}
-extension.</p>
-
-<h4>BUILD_STATIC_LIBRARY</h4>
-<p>A variant of {@code BUILD_SHARED_LIBRARY} that is used to build a static library. The build
-system does not copy static libraries into your project/packages, but it can use them to build
-shared libraries (see {@code LOCAL_STATIC_LIBRARIES} and {@code LOCAL_WHOLE_STATIC_LIBRARIES},
-below). The syntax for using this variable is:</p>
-
-<pre class="no-pretty-print">
-include $(BUILD_STATIC_LIBRARY)
-</pre>
-
-<p>A static-library variable causes the build system to generate a library with a {@code .a}
-extension.</p>
-
-<h4>PREBUILT_SHARED_LIBRARY</h4>
-<p>Points to a build script used to specify a prebuilt shared library. Unlike in the case of
-{@code BUILD_SHARED_LIBRARY} and {@code BUILD_STATIC_LIBRARY}, here the value of
-{@code LOCAL_SRC_FILES} cannot be a source file. Instead, it must be a single path to a prebuilt
-shared library, such as {@code foo/libfoo.so}. The syntax for using this variable is:</p>
-
-<pre class="no-pretty-print">
-include $(PREBUILT_SHARED_LIBRARY)
-</pre>
-
-<p>You can also reference a prebuilt library in another module by using the
-{@code LOCAL_PREBUILTS} variable. For more information about using prebuilts, see
-<a href="{@docRoot}ndk/guides/prebuilts.html">Using Prebuilt Libraries</a>.</p>
-
-
-<h4>PREBUILT_STATIC_LIBRARY</h4>
-<p>The same as {@code PREBUILT_SHARED_LIBRARY}, but for a prebuilt static library. For more
-information about using prebuilts, see <a href="{@docRoot}ndk/guides/prebuilts.html">Using Prebuilt
-Libraries</a>.</p>
-
-<h4>TARGET_ARCH</h4>
-<p>The name of the target CPU architecture as the Android Open Source Project specifies it.
-For any ARM-compatible build, use {@code arm}, independent of the CPU architecture revision or
-ABI (see TARGET_ARCH_ABI, below).</p>
-
-<p>The value of this variable is taken from the APP_ABI variable that you define in the
-{@code Android.mk} file, which the system reads ahead of parsing the {@code Android.mk} file.</p>
-
-<h4>TARGET_PLATFORM</h4>
-<p>The Android API level number for the build system to target.
-For example, the Android 5.1 system images correspond to Android API level 22: {@code android-22}.
-For a complete list of platform names and corresponding Android system
-images, see <a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Native APIs</a>.
-The following example shows the syntax for using this variable:</p>
-
-<pre class="no-pretty-print">
-TARGET_PLATFORM := android-22
-</pre>
-
-<h4 id="taa">TARGET_ARCH_ABI</h4>
-<p>This variable stores the name of the CPU and architecture to target when the build system
-parses this {@code Android.mk} file. You can specify one or more of the following values, using
-a space as a delimiter between multiple targets. Table 1 shows the ABI setting to use for each
-supported CPU and architecture.
-
-<p class="table-caption" id="table1">
- <strong>Table 1.</strong> ABI settings for different CPUs and architectures.</p>
-<table>
- <tr>
- <th scope="col">CPU and architecture</th>
- <th scope="col">Setting</th>
- </tr>
- <tr>
- <td>ARMv5TE</td>
- <td>{@code armeabi}</td>
- </tr>
- <tr>
- <td>ARMv7</td>
- <td>{@code armeabi-v7a}</td>
- </tr>
- <tr>
- <td>ARMv8 AArch64</td>
- <td>{@code arm64-v8a}</td>
- </tr>
- <tr>
- <td>i686</td>
- <td>{@code x86}</td>
- </tr>
- <tr>
- <td>x86-64</td>
- <td>{@code x86_64}</td>
- </tr>
- <tr>
- <td>mips32 (r1)</td>
- <td>{@code mips}</td>
- </tr>
- <tr>
- <td>mips64 (r6)</td>
- <td>{@code mips64}</td>
- </tr>
- <tr>
- <td>All</td>
- <td>{@code all}</td>
- </tr>
-</table>
-
-<p>The following example shows how to set ARMv8 AArch64 as the target CPU-and-ABI combination:</p>
-
-<pre class="no-pretty-print">
-TARGET_ARCH_ABI := arm64-v8a
-</pre>
-
-<p class="note"><strong>Note: </strong> Up to Android NDK 1.6_r1, this variable is defined as
-{@code arm}.</p>
-
-<p>For more details about architecture ABIs and associated compatibility
-issues, refer to
-<a href="{@docRoot}ndk/guides/abis.html">ABI Management</a>.</p>
-
-<p>New target ABIs in the future will have different values.</p>
-
-<h4>TARGET_ABI</h4>
-<p>A concatenation of target Android API level and ABI, it is especially useful when you want to test against
-a specific target system image for a real device. For example, to specify a 64-bit ARM device
-running on Android API level 22:</p>
-
-<pre class="no-pretty-print">
-TARGET_ABI := android-22-arm64-v8a
-</pre>
-
-<p class="note"><strong>Note:</strong> Up to Android NDK 1.6_r1, the default value was
-{@code android-3-arm}.</p>
-
-<h2 id="mdv">Module-Description Variables</h2>
-<p>The variables in this section describe your module to the build system. Each module description
-should follow this basic flow:
-<ul>
-<ol type = "1">
-<li>Initialize or undefine the variables associated with the module, using the {@code CLEAR_VARS}
- variable.</li>
-<li>Assign values to the variables used to describe the module.
-<li>Set the NDK build system to use the appropriate build script for the module, using the
- {@code BUILD_XXX} variable.</li>
-</ol>
-</ul>
-
-<h4>LOCAL_PATH</h4>
-<p>This variable is used to give the path of the current file. You must define
-it at the start of your {@code Android.mk} file. The following example shows how to do so:</p>
-
-<pre class="no-pretty-print">
-LOCAL_PATH := $(call my-dir)
-</pre>
-
-<p>The script to which {@code CLEAR_VARS} points does not clear this variable. Therefore, you only need
-to define it a single time, even if your {@code Android.mk} file describes multiple modules.</p>
-
-<h4>LOCAL_MODULE</h4>
-<p>This variable stores the name of your module. It must be unique among all module names,
-and must not contain any spaces. You must define it before including any scripts (other than
-the one for {@code CLEAR_VARS}). You need not add either the {@code lib} prefix
-or the {@code .so} or {@code .a} file extension; the build system makes these modifications
-automatically. Throughout your {@code Android.mk} and
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> files, refer to
-your module by its unmodified name. For example, the following line results in the generation of a
-shared library module called {@code libfoo.so}:</p>
-
-<pre class="no-pretty-print">
-LOCAL_MODULE := "foo"
-</pre>
-
-<p>If you want the generated module to have a name other than {@code lib} + the value of
-{@code LOCAL_MODULE}, you can use the {@code LOCAL_MODULE_FILENAME} variable to give the
-generated module a name of your own choosing, instead.</p>
-
-<h4>LOCAL_MODULE_FILENAME</h4>
-<p>This optional variable allows you to override the names that the build system
-uses by default for files that it generates. For example, if the name of your {@code LOCAL_MODULE}
-is {@code foo}, you can force the system to call the file it generates {@code libnewfoo}. The
-following example shows how to accomplish this:</p>
-
-<pre class="no-pretty-print">
-LOCAL_MODULE := foo
-LOCAL_MODULE_FILENAME := libnewfoo
-</pre>
-
-<p>For a shared library module, this example would generate a file called {@code libnewfoo.so}.</p>
-
-<p class="note"><strong>Note:</strong> You cannot override filepath or file extension.</p>
-
-<h4>LOCAL_SRC_FILES</h4>
-<p>This variable contains the list of source files that the build system uses to generate the
-module. Only list the files that the build system actually passes to the compiler, since the build
-system automatically computes any associated depencies.</p>
-<p>Note that you can use both relative (to {@code LOCAL_PATH}) and absolute file paths.
-
-<p>We recommend avoiding absolute file paths; relative paths make your {@code Android.mk} file more
-portable.</p>
-
-<p class="note"><strong>Note: </strong> Always use Unix-style forward slashes (/) in build files.
-The build system does not handle Windows-style backslashes (\) properly.</p>
-
-<h4>LOCAL_CPP_EXTENSION</h4>
-<p>You can use this optional variable to indicate a file extension other than {@code .cpp} for your
-C++ source files. For example, the following line changes the extension to {@code .cxx}.
-(The setting must include the dot.)
-
-<pre class="no-pretty-print">
-LOCAL_CPP_EXTENSION := .cxx
-</pre>
-
-<p>From NDK r7, you can use this variable to specify multiple extensions. For instance:</p>
-
-<pre class="no-pretty-print">
-LOCAL_CPP_EXTENSION := .cxx .cpp .cc
-</pre>
-
-<h4>LOCAL_CPP_FEATURES</h4>
-
-<p>You can use this optional variable to indicate that your code relies on specific C++ features.
-It enables the right compiler and linker flags during the build process. For prebuilt binaries,
-this variable also declares which features the binary depends on, thus helping ensure the final
-linking works correctly. We recommend that you use this variable instead of enabling
-{@code -frtti} and {@code -fexceptions} directly in your {@code LOCAL_CPPFLAGS} definition.</p>
-
-<p>Using this variable allows the build system to use the appropriate flags for each module. Using
-{@code LOCAL_CPPFLAGS} causes the compiler to use all specified flags for all modules, regardless
-of actual need.</p>
-
-For example, to indicate that your code uses RTTI (RunTime Type Information), write: </p>
-
-<pre class="no-pretty-print">
-LOCAL_CPP_FEATURES := rtti
-</pre>
-
-<p>To indicate that your code uses C++ exceptions, write:</p>
-
-<pre class="no-pretty-print">
-LOCAL_CPP_FEATURES := exceptions
-</pre>
-
-<p>You can also specify multiple values for this variable. For example:</p>
-
-<pre class="no-pretty-print">
-LOCAL_CPP_FEATURES := rtti features
-</pre>
-
-The order in which you describe the values does not matter.
-
-
-<h4>LOCAL_C_INCLUDES</h4>
-<p>You can use this optional variable to specify a list of paths, relative to the
-NDK {@code root} directory, to add to the include search path when compiling all sources
-(C, C++ and Assembly). For example: </p>
-
-<pre class="no-pretty-print">
-LOCAL_C_INCLUDES := sources/foo
-</pre>
-
-<p>Or even: </p>
-
-<pre class="no-pretty-print">
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/<subdirectory>/foo
-</pre>
-
-<p>Define this variable before setting any corresponding inclusion flags via {@code LOCAL_CFLAGS}
-or {@code LOCAL_CPPFLAGS}.</p>
-
-<p>The build system also uses {@code LOCAL_C_INCLUDES} paths automatically when launching native
-debugging with ndk-gdb.</p>
-
-
-<h4>LOCAL_CFLAGS</h4>
-
-<p>This optional variable sets compiler flags for the build system to pass when building C
-<em>and</em> C++ source files. The ability to do so can be useful for specifying additional macro
-definitions or compile options.</p>
-
-<p>Try not to change the optimization/debugging level in your {@code Android.mk} file.
-The build system can handle this setting automatically for you, using the relevant information
-in the <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. Doing it
-this way allows the build system to generate useful data files used during debugging.</p>
-
-<p class="note"><strong>Note: </strong>In android-ndk-1.5_r1, the corresponding flags only applied
-to C source files, not C++ ones. They now match the full Android build system behavior.
-(You can now use {@code LOCAL_CPPFLAGS} to specify flags for C++ sources only.)</p>
-
-<p>It is possible to specify additional include paths by writing:
-
-<pre class="no-pretty-print">
-LOCAL_CFLAGS += -I<path>,
-</pre>
-
-It is better, however, to use {@code LOCAL_C_INCLUDES} for this purpose, since
-doing so also makes it possible to use the paths available for native debugging with ndk-gdb.</p>
-
-
-<h4>LOCAL_CPPFLAGS</h4>
-<p>An optional set of compiler flags that will be passed when building C++
-source files <em>only</em>. They will appear after the LOCAL_CFLAGS on the
-compiler's command-line.</p>
-
-
-<p class="note"><strong>Note: </strong>In android-ndk-1.5_r1, the corresponding flags applied to
-both C and C++ sources. This has been corrected to match the full Android build system.
-To specify flags for both C and C++ sources, use {@code LOCAL_CFLAGS}.</p>
-
-
-<h4>LOCAL_STATIC_LIBRARIES</h4>
-
-<p>This variable stores the list of static libraries modules on which the current module depends.</p>
-
-<p>If the current module is a shared library or an executable, this variable will force
-these libraries to be linked into the resulting binary.</p>
-
-<p>If the current module is a static library, this variable simply indicates that other
-modules depending on the current one will also depend on the listed
-libraries.</p>
-
-<h4>LOCAL_SHARED_LIBRARIES</h4>
-
-<p>This variable is the list of shared libraries <em>modules</em> on which this module depends at
-runtime. This information is necessary at link time, and to embed the corresponding information
-in the generated file.</p>
-
-<h4>LOCAL_WHOLE_STATIC_LIBRARIES</h4>
-<p>This variable is a variant of {@code LOCAL_STATIC_LIBRARIES}, and expresses that the linker
-should treat the associated library modules as <em>whole archives</em>. For more information
-on whole archives, see the GNU linker's
-<a href="http://ftp.gnu.org/old-gnu/Manuals/ld-2.9.1/html_node/ld_3.html">documentation</a> for the
-{@code --whole-archive} flag.</p>
-
-<p>This variable is useful when there are circular dependencies among
-several static libraries. When you use this variable to build a shared library, it will force
-the build system to add all object files from your static libraries to the final binary. The same
-is not true, however, when generating executables.</p>
-
-
-<h4>LOCAL_LDLIBS</h4>
-
-<p>This variable contains the list of additional linker flags for use in building your shared
-library or executable. It enables you to use the {@code -l} prefix to pass the name of specific
-system libraries. For example, the following example tells the linker to generate a module that
-links to {@code /system/lib/libz.so} at load time: </p>
-
-<pre class="no-pretty-print">
-LOCAL_LDLIBS := -lz
-</pre>
-
-<p>For the list of exposed system libraries against which you can link in this NDK release, see
-<a href="stable_apis.html">Android NDK Native APIs</a>.</p>
-
-<p class="note"><strong>Note: </strong> If you define this variable for a static library,
-the build system ignores it, and {@code ndk-build} prints a warning.</p>
-
-<h4>LOCAL_LDFLAGS</h4>
-
-<p>The list of other linker flags for the build system to use when building your shared library
-or executable. For example, the following example uses the {@code ld.bfd} linker on ARM/X86 GCC
-4.6+, on which {@code ld.gold} is the default </p>
-
-<pre class="no-pretty-print">
-LOCAL_LDFLAGS += -fuse-ld=bfd
-</pre>
-
-<p class="note"><strong>Note: </strong>If you define this variable for a static library, the build
-system ignores it, and ndk-build prints a warning.</p>
-
-<h4>LOCAL_ALLOW_UNDEFINED_SYMBOLS</h4>
-
-<p>By default, when the build system encounters an undefined reference encountered while trying to
-build a shared, it will throw an <em>undefined symbol</em> error. This error can help you catch
-catch bugs in your source code.</p>
-
-<p>To disable this check, set this variable to {@code true}. Note that this setting may cause the
-shared library to load at runtime.</p>
-
-<p class="note"><strong>Note: </strong> If you define this variable for a static library,
-the build system ignores it, and ndk-build prints a warning.</p>
-
-<h4>LOCAL_ARM_MODE</h4
->
-<p>By default, the build system generates ARM target binaries in <em>thumb</em> mode, where each
-instruction is 16 bits wide and linked with the STL libraries in the {@code thumb/} directory.
-Defining this variable as {@code arm} forces the build system to generate the module's object
-files in 32-bit {@code arm} mode. The following example shows how to do this:</p>
-
-<pre class="no-pretty-print">
-LOCAL_ARM_MODE := arm
-</pre>
-
-<p>You can also instruct the build system to only build specific sources in {@code arm} mode by
-appending {@code .arm} suffix to the the source filenames. For example, the following example
-tells the build system to always compile {@code bar.c} in ARM mode, but to build
-{@code foo.c} according to the value of {@code LOCAL_ARM_MODE}.</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES := foo.c bar.c.arm
-</pre>
-
-<p></p>
-
-<p class="note"><strong>Note: </strong> You can also force the build system to generate ARM binaries
-by setting {@code APP_OPTIM} in your
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file to {@code debug}.
-Specifying {@code debug} forces an ARM build because the toolchain debugger does not handle Thumb
-code properly.</p>
-
-
-<h4>LOCAL_ARM_NEON</h4>
-<p>This variable only matters when you are targeting the {@code armeabi-v7a} ABI. It allows the
-use of ARM Advanced SIMD (NEON) GCC intrinsics in your C and C++ sources, as well as NEON
-instructions in Assembly files.</p>
-
-<p>Note that not all ARMv7-based CPUs support the NEON instruction set extensions. For this reason,
-you must perform runtime detection to be able to safely use this code at runtime. For more
-information, see <a href="{@docRoot}ndk/guides/cpu-arm-neon.html">NEON Support</a> and <a
-href="{@docRoot}ndk/guides/cpu-features.html">The {@code cpufeatures} Library</a>.</p>
-
-<p>Alternatively, you can use the {@code .neon} suffix to specify that the build system only
-compile specific source files with NEON support. In the following example, the build system compiles
-{@code foo.c} with thumb and neon support, {@code bar.c} with thumb support, and
-{@code zoo.c} with support for ARM and NEON:</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES = foo.c.neon bar.c zoo.c.arm.neon
-</pre>
-
-
-<p>If you use both suffixes, {@code .arm} must precede {@code .neon}.</p>
-
-<h4>LOCAL_DISABLE_NO_EXECUTE</h4>
-
-<p>Android NDK r4 added support for the "NX bit" security feature. It is
-enabled by default, but you can disable it by setting this variable to {@code true}. We do not
-recommend doing so without a compelling reason.</p>
-
-<p>This feature does not modify the ABI, and is only enabled on kernels
-targeting ARMv6+ CPU devices. Machine code with this feature enabled
-will run unmodified on devices running earlier CPU architectures.</p>
-<p>For more information, see <a href="http://en.wikipedia.org/wiki/NX_bit">Wikipedia: NX bit</a>
-and <a href="http://www.gentoo.org/proj/en/hardened/gnu-stack.xml">The GNU stack kickstart</a>.
-
-<h4>LOCAL_DISABLE_RELRO</h4>
-
-<p>By default, the NDK compiles code with read-only relocations and GOT
-protection. This variable instructs the runtime linker to mark certain regions of memory
-as read-only after relocation, making certain security exploits (such as GOT overwrites)
-more difficult. Note that these protections are only effective on Android API level 16 and higher.
-On lower API levels, the code will still run, but without memory protections.</p>
-
-<p>This variable is turned on by default, but you can disable it by setting its value to
-{@code true}. We do not recommend doing so without a compelling reason.</p>
-
-<p>For more information, see
-<a href="http://isisblogs.poly.edu/2011/06/01/relro-relocation-read-only/">RELRO:
-RELocation Read-Only</a> and <a href="http://www.akkadia.org/drepper/nonselsec.pdf">Security
-enhancements in RedHat Enterprise Linux (section 6)</a>.</p>
-
-<h4>LOCAL_DISABLE_FORMAT_STRING_CHECKS</h4>
-
-<p>By default, the build system compiles code with format string protection. Doing so forces a
-compiler error if a non-constant format string is used in a {@code printf}-style function.</p>
-<p>This protection is on by default, but you can disable it by setting the value of
-this variable to {@code true}. We do not recommend doing so without a compelling reason.</p>
-
-
-<h4>LOCAL_EXPORT_CFLAGS</h4>
-
-<p>This variable records a set of C/C++ compiler flags to add to the {@code LOCAL_CFLAGS} definition
-of any other module that uses this one via the {@code LOCAL_STATIC_LIBRARIES} or
-{@code LOCAL_SHARED_LIBRARIES} variables.</p>
-
-<p>For example, consider the following pair of modules: {@code foo} and {@code bar}, which depends
-on {@code foo}:</p>
-
-<pre class="no-pretty-print">
-include $(CLEAR_VARS)
-LOCAL_MODULE := foo
-LOCAL_SRC_FILES := foo/foo.c
-LOCAL_EXPORT_CFLAGS := -DFOO=1
-include $(BUILD_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := bar
-LOCAL_SRC_FILES := bar.c
-LOCAL_CFLAGS := -DBAR=2
-LOCAL_STATIC_LIBRARIES := foo
-include $(BUILD_SHARED_LIBRARY)
-</pre>
-
-<p>Here, the build system passes the flags {@code -DFOO=1} and {@code -DBAR=2} to the compiler when
-building {@code bar.c}. It also prepends exported flags to your your module's {@code LOCAL_CFLAGS}
-so you can easily override them.</p>
-
-In addition, the relationship among modules is transitive: If {@code zoo} depends on
-{@code bar}, which in turn depends on {@code foo}, then {@code zoo} also inherits all flags
-exported from {@code foo}.</p>
-
-<p>Finally, the build system does not use exported flags when building locally (i.e., building the
-module whose flags it is exporting). Thus, in the example above, it does not pass {@code -DFOO=1}
-to the compiler when building {@code foo/foo.c}. To build locally, use {@code LOCAL_CFLAGS}
-instead.</p>
-
-<h4>LOCAL_EXPORT_CPPFLAGS</h4>
-<p>This variable is the same as {@code LOCAL_EXPORT_CFLAGS}, but for C++ flags only.</p>
-
-<h4>LOCAL_EXPORT_C_INCLUDES</h4>
-<p>This variable is the same as {@code LOCAL_EXPORT_CFLAGS}, but for C include paths. It is useful
-in cases where, for example, {@code bar.c} needs to include headers from module {@code foo}.</p>
-
-<h4>LOCAL_EXPORT_LDFLAGS</h4>
-<p>This variable is the same as {@code LOCAL_EXPORT_CFLAGS}, but for linker flags.</p>
-
-<h4>LOCAL_EXPORT_LDLIBS</h4>
-<p>This variable is the same as {@code LOCAL_EXPORT_CFLAGS}, telling the build system to pass names
-of specific system libraries to the compiler. Prepend {@code -l} to the name of each library you
-specify.</p>
-
-<p>Note that the build system appends imported linker flags to the value of your module's
-{@code LOCAL_LDLIBS} variable. It does this due to the way Unix linkers work.</p>
-
-<p>This variable is typically useful when module {@code foo} is a static library
-and has code that depends on a system library. You can then use {@code LOCAL_EXPORT_LDLIBS} to
-to export the dependency. For example: </p>
-
-<pre class="no-pretty-print">
-include $(CLEAR_VARS)
-LOCAL_MODULE := foo
-LOCAL_SRC_FILES := foo/foo.c
-LOCAL_EXPORT_LDLIBS := -llog
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := bar
-LOCAL_SRC_FILES := bar.c
-LOCAL_STATIC_LIBRARIES := foo
-include $(BUILD_SHARED_LIBRARY)
-</pre>
-
-<p>In this example, the build system puts {@code -llog} at the end of the linker command when it
-builds {@code libbar.so}. Doing so tells the linker that, because {@code libbar.so} depends
-on {@code foo}, it also depends on the system logging library.</p>
-
-<h4>LOCAL_SHORT_COMMANDS</h4>
-<p>Set this variable to {@code true} when your module has a very high
-number of sources and/or dependent static or shared libraries. Doing so forces the
-build system to use {@code @} syntax for archives containing intermediate object files
-or linking libraries.</p>
-
-<p>This feature can be useful on Windows, where the command line accepts a maximum of only
-of 8191 characters, which can be too small for complex projects. It also impacts the compilation of
-individual source files, placing nearly all compiler flags inside list files, too.</p>
-
-<p>Note that any value other than {@code true} will revert to the
-default behaviour. You can also define {@code APP_SHORT_COMMANDS} in your
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file to force this
-behavior for all modules in your project.</p>
-
-<p>We do not recommend enabling this feature by default, since it makes the build slower.</p>
-
-
-<h4>LOCAL_THIN_ARCHIVE</h4>
-
-<p>Set this variable to {@code true} when building static libraries.
-Doing so will generate a <strong>thin archive</strong>, a library file that does not contain
-object files, but instead just file paths to the actual objects that it would normally
-contain.</p>
-<p>This is useful to reduce the size of your build output. The drawback is that
-such libraries <em>cannot</em> be moved to a different location (all paths
-inside them are relative).</p>
-<p>Valid values are {@code true}, {@code false} or empty. A
-default value can be set in your <a href="{@docRoot}ndk/guides/application_mk.html">
-{@code Application.mk}</a> file through the {@code APP_THIN_ARCHIVE}
-
-variable.</p>
-<p class="note"><strong>Note:</strong> This is ignored for non-static library modules, or prebuilt
-static library ones.</p>
-
-<h4>LOCAL_FILTER_ASM</h4>
-<p>Define this variable as a shell command that the build system will use to filter the
-assembly files extracted or generated from the files you specified for {@code LOCAL_SRC_FILES}.</p>
-<p>Defining this variable causes the following things to occur:</p>
-
-<ul>
-<ol type = "1">
-<li>The build system generates a temporary assembly file from any C or C++ source file, instead of compiling them into an object file.</li>
-<li>The build system executes the shell command in {@code LOCAL_FILTER_ASM}
-on any temporary assembly file and on any assembly file
-listed in {@code LOCAL_SRC_FILES}, thus generating another temporary assembly
-file.</li>
-<li>The build system compiles these filtered assembly files into an object file.</li>
-</ol>
-</ul>
-<p>For example:</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES := foo.c bar.S
-LOCAL_FILTER_ASM :=
-
-foo.c --1--> $OBJS_DIR/foo.S.original --2--> $OBJS_DIR/foo.S --3--> $OBJS_DIR/foo.o
-bar.S --2--> $OBJS_DIR/bar.S --3--> $OBJS_DIR/bar.o
-</pre>
-
-<p>"1" corresponds to the compiler, "2" to the filter, and "3" to the assembler. The filter must
-be a standalone shell command that takes the name of the input file as its first argument, and the
-name of the output file as the second one. For example:</p>
-
-<pre class="no-pretty-print">
-myasmfilter $OBJS_DIR/foo.S.original $OBJS_DIR/foo.S
-myasmfilter bar.S $OBJS_DIR/bar.S
-</pre>
-
-<h3 id="npfm">NDK-provided function macros</h2>
-<p>This section explains GNU Make function macros that the NDK provides. Use
-{@code $(call <function>)} to evaluate them; they return textual information.</p>
-
-<h4>my-dir</h4>
-
-<p>This macro returns the path of the last included makefile, which typically is the
-current {@code Android.mk}'s directory. {@code my-dir} is useful for defining
-{@code LOCAL_PATH} at the start of your {@code Android.mk} file. For example:</p>
-
-<pre class="no-pretty-print">
-LOCAL_PATH := $(call my-dir)
-</pre>
-
-<p>Due to the way GNU Make works, what this macro really returns is the
-path of the last makefile that the build system included when parsing the build scripts. For this
-reason, you should not call {@code my-dir} after including another file.</p>
-
-<p>For example, consider the following example: </p>
-
-<pre class="no-pretty-print">
-LOCAL_PATH := $(call my-dir)
-
-# ... declare one module
-
-include $(LOCAL_PATH)/foo/`Android.mk`
-
-LOCAL_PATH := $(call my-dir)
-
-# ... declare another module
-</pre>
-
-<p>The problem here is that the second call to {@code my-dir} defines
-{@code LOCAL_PATH} as {@code $PATH/foo} instead of {@code $PATH}, because that was where its
-most recent include pointed.</p>
-
-<p>You can avoid this problem by putting additional includes after everything
-else in the {@code Android.mk} file. For example:</p>
-
-<pre class="no-pretty-print">
-LOCAL_PATH := $(call my-dir)
-
-# ... declare one module
-
-LOCAL_PATH := $(call my-dir)
-
-# ... declare another module
-
-# extra includes at the end of the Android.mk file
-include $(LOCAL_PATH)/foo/Android.mk
-
-</pre>
-
-<p>If it is not feasible to structure the file in this way, save the value of the first
-{@code my-dir} call into another variable. For example: </p>
-
-<pre class="no-pretty-print">
-MY_LOCAL_PATH := $(call my-dir)
-
-LOCAL_PATH := $(MY_LOCAL_PATH)
-
-# ... declare one module
-
-include $(LOCAL_PATH)/foo/`Android.mk`
-
-LOCAL_PATH := $(MY_LOCAL_PATH)
-
-# ... declare another module
-</pre>
-
-<h4>all-subdir-makefiles</h4>
-
-<p>Returns the list of {@code Android.mk} files located in all subdirectories of
-the current {@code my-dir} path.
-
-<p>You can use this function to provide deep-nested source directory hierarchies to the build
-system. By default, the NDK only looks for files in the directory containing the
-{@code Android.mk} file.</p>
-
-<h4>this-makefile</h4>
-<p>Returns the path of the current makefile (from which the build system called the function).</p>
-
-<h4>parent-makefile</h4>
-<p>Returns the path of the parent makefile in the inclusion tree (the path of the makefile that
-included the current one).</p>
-
-<h4>grand-parent-makefile</h4>
-<p>Returns the path of the grandparent makefile in the inclusion tree (the path of the makefile that
-included the current one).</p>
-
-<h4>import-module</h4>
-<p>A function that allows you to find and include a module's {@code Android.mk} file by the name of
-the module. A typical example is as follows: </p>
-
-<pre class="no-pretty-print">
-$(call import-module,<name>)
-</pre>
-
-<p>In this example, the build system looks for the module tagged {@code <name>} in the list of
-directories referenced that your {@code NDK_MODULE_PATH} environment variable references, and
-includes its {@code Android.mk} file automatically for you.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/application_mk.jd b/docs/html/ndk/guides/application_mk.jd
deleted file mode 100644
index e669f3f..0000000
--- a/docs/html/ndk/guides/application_mk.jd
+++ /dev/null
@@ -1,219 +0,0 @@
-page.title=Application.mk
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#over">Overview</a></li>
- <li><a href="#var">Variables</a></li>
- </ol>
- </div>
- </div>
-
-<p>This document explains the {@code Application.mk} build file, which describes the
-native <em>modules</em> that your app requires. A module can be a static library, a shared library,
-or an executable.</p>
-
-<p>We recommend that you read the <a href="{@docRoot}ndk/guides/concepts.html">Concepts</a> and
-<a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a> pages before this one. Doing so will
-help maximize your understanding of the material on this page. </p>
-
-<h2 id="over">Overview</h2>
-The {@code Application.mk} file is really a tiny GNU Makefile fragment that defines several
-variables for compilation. It usually resides under {@code $PROJECT/jni/}, where {@code $PROJECT}
-points to your application's project directory. Another alternative is to place it under a
-sub-directory of the top-level {@code $NDK/apps/} directory. For example:</p>
-
-<pre>
-$NDK/apps/<myapp>/Application.mk
-</pre>
-
-<p>Here, {@code <myapp>} is a short name used to describe your app to the NDK build system. It
-doesn't actually go into your generated shared libraries or your final packages.</p>
-
-<h2 id="var">Variables</h2>
-<h4>APP_PROJECT_PATH</h4>
-<p>This variable stores the absolute path to your app's project-root directory. The build system
-uses this information to place stripped-down versions of the generated JNI shared libraries
-into a specific location known to the APK-generating tools.</p>
-
-<p>If you place your {@code Application.mk} file under {@code $NDK/apps/<myapp>/}, you must
-define this variable. If you place it under {@code $PROJECT/jni/}, it is optional.
-
-<h4>APP_OPTIM</h4>
-<p>Define this optional variable as either {@code release} or {@code debug}. You use it to
-alter the optimization level when building your application's modules.</p>
-
-<p>Release mode is the default, and generates highly optimized binaries. Debug mode generates
-unoptimized binaries that are much easier to debug.</p>
-
-<p>Note that you can debug either release or debug binaries. Release binaries, however, provide less
-information during debugging. For example, the build system optimizes out some variables,
-preventing you from inspecting them. Also, code re-ordering can make it more difficult to step
-through the code; stack traces may not be reliable.</p>
-
-<p>Declaring {@code android:debuggable} in your application manifest's {@code <application>}
-tag will cause this variable to default to {@code debug} instead of {@code release}. Override this
-default value by setting {@code APP_OPTIM} to {@code release}.</p>
-
-
-<h4>APP_CFLAGS</h4>
-<p>This variable stores a set of C compiler flags that the build system passes to the compiler
-when compiling any C or C++ source code for any of the modules. You can use this variable to change
-the build of a given module according to the application that needs it, instead of having to modify
-the {@code Android.mk} file itself. </p>
-
-
-<p>All paths in these flags should be relative to the top-level NDK directory. For example, if you
-have the following setup:</p>
-
-<pre>
-sources/foo/Android.mk
-sources/bar/Android.mk
-</pre>
-
-<p>To specify in {@code foo/Android.mk} that you want to add the path to the {@code bar} sources
-during compilation, you should use:
-
-<pre>
-APP_CFLAGS += -Isources/bar
-</pre>
-
-<p>Or, alternatively:</p>
-
-<pre>
-APP_CFLAGS += -I$(LOCAL_PATH)/../bar
-</pre>
-
-<p>{@code -I../bar} will not work since it is equivalent to
-{@code -I$NDK_ROOT/../bar}.</p>
-
-<p class="note"><strong>Note: </strong>This variable only works on C, not C++, sources in
-android-ndk-1.5_r1. In all versions after that one, {@code APP_CFLAGS} matches the full Android
-build system.</p>
-
-<h4>APP_CPPFLAGS</h4>
-<p>This variable contains a set of C++ compiler flags that the build system passes to the compiler
-when building only C++ sources.</p>
-
-<p class="note"><strong>Note: </strong> In android-ndk-1.5_r1, this variable works on both C and
-C++ sources. In all subsequent versions of the NDK, {@code APP_CPPFLAGS} now matches the full
-Android build system. For flags that apply to both C and C++ sources, use {@code APP_CFLAGS}.</p>
-
-<h4>APP_LDFLAGS</h4>
-<p>A set of linker flags that the build system passes when linking the application. This variable
-is only relevant when the build system is building shared libraries and executables. When the
-build system builds static libraries, it ignores these flags.</p>
-
-<h4>APP_BUILD_SCRIPT</h4>
-<p>By default, the NDK build system looks under {@code jni/} for a file named
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>.</p>
-
-<p>If you want to override this behavior, you can define {@code APP_BUILD_SCRIPT} to point to an
-alternate build script. The build system always interprets a non-absolute path as relative to the
-NDK's top-level directory.</p>
-
-<h4>APP_ABI</h4>
-<p>By default, the NDK build system generates machine code for the
-<a href="{@docRoot}ndk/guides/abis.html">{@code armeabi}</a> ABI. This machine code
-corresponds to an ARMv5TE-based CPU with software floating point operations. You can use
-{@code APP_ABI} to select a different ABI. Table 1 shows the {@code APP_ABI}
-settings for different instruction sets.</p>
-
-<p class="table-caption" id="table1">
- <strong>Table 1.</strong> {@code APP_ABI} settings for different instruction sets.</p>
-<table>
- <tr>
- <th scope="col">Instruction set</th>
- <th scope="col">Value</th>
- </tr>
- <tr>
- <td>Hardware FPU instructions on ARMv7 based devices</td>
- <td>{@code APP_ABI := armeabi-v7a}</td>
- </tr>
- <tr>
- <td>ARMv8 AArch64</td>
- <td>{@code APP_ABI := arm64-v8a}</td>
- </tr>
- <tr>
- <td>IA-32</td>
- <td>{@code APP_ABI := x86}</td>
- </tr>
- <tr>
- <td>Intel64</td>
- <td>{@code APP_ABI := x86_64}</td>
- </tr>
- <tr>
- <td>MIPS32</td>
- <td>{@code APP_ABI := mips}</td>
- </tr>
- <tr>
- <td>MIPS64 (r6)</td>
- <td>{@code APP_ABI := mips64}</td>
- </tr>
- <tr>
- <td>All supported instruction sets</td>
- <td>{@code APP_ABI := all}</td>
- </tr>
-</table>
-
-<p class="note"><strong>Note:</strong> {@code all} is available starting from NDKr7.</p>
-
-<p>You can also specify multiple values by placing them on the same line, delimited by spaces.
-For example:</p>
-
-<pre>
-APP_ABI := armeabi armeabi-v7a x86 mips
-</pre>
-
-<p>For the list of all supported ABIs and details about their usage and limitations, refer to
-<a href="{@docRoot}ndk/guides/abis.html">ABI Management</a>.</p>
-
-<h4>APP_PLATFORM</h4>
-<p>This variable contains the name of the target Android platform. For example, {@code android-3}
-specifies the Android 1.5 system images. For a complete list of platform names and corresponding
-Android system images, see <a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Native APIs
-</a>.</p>
-
-<h4>APP_STL</h4>
-<p>By default, the NDK build system provides C++ headers for the minimal C++ runtime library
-({@code system/lib/libstdc++.so}) provided by the Android system. In addition, it comes with
-alternative C++ implementations that you can use or link to in your own applications.
-Use {@code APP_STL} to select one of them. For information about the supported runtimes, and the
-features they offer, see <a href="{@docRoot}ndk/guides/cpp-support.html#runtimes">NDK Runtimes and
-Features</a>.
-
-<h4>APP_SHORT_COMMANDS</h4>
-<p>The equivalent of {@code LOCAL_SHORT_COMMANDS} in {@code Application.mk} for your whole project.
-For more information, see the documentation for this variable on
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>.</p>
-
-<h4>NDK_TOOLCHAIN_VERSION</h4>
-<p>Define this variable as either {@code 4.9} or {@code 4.8} to select a version of the GCC
-compiler. Version 4.9 is the default for 64-bit ABIs, and 4.8 is the default for 32-bit ABIs.
-To select a version of Clang, define this variable as {@code clang3.4}, {@code clang3.5}, or
-{@code clang}. Specifying {@code clang} chooses the most recent version of Clang.</p>
-
-<h4>APP_PIE</h4>
-<p>Starting from Android 4.1 (API level 16), Android's dynamic linker supports position-independent
-executables (PIE). From Android 5.0 (API level 21), executables require PIE.
-
-To use PIE to build your executables, set the {@code -fPIE} flag. This flag makes it harder to
-exploit memory corruption bugs by randomizing code location. By default, {@code ndk-build}
-automatically sets this value to {@code true} if your project targets {@code android-16} or higher.
-You may set it manually to either {@code true} or {@code false}.</p>
-
-<p>This flag applies only to executables. It has no effect when building shared or static
-libraries.</p>
-
-<p class="note"><strong>Note: </strong> PIE executables cannot run on Android releases prior to 4.1.
-<p>This restriction only applies to executables. It has no effect when building shared or static
-libraries.</p>
-
-<h4>APP_THIN_ARCHIVE</h4>
-<p>Sets the default value of {@code LOCAL_THIN_ARCHIVE} in the {@code Android.mk} file for all
-static library modules in this project. For more information, see the documentation for
-{@code LOCAL_THIN_ARCHIVE} on <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}.</a>
-</p>
diff --git a/docs/html/ndk/guides/arch.jd b/docs/html/ndk/guides/arch.jd
deleted file mode 100644
index 3dafe8f..0000000
--- a/docs/html/ndk/guides/arch.jd
+++ /dev/null
@@ -1,19 +0,0 @@
-page.title=CPUs and Architectures
-@jd:body
-
-<p>When you're working with native code, hardware matters. The NDK lets you ensure you're compiling
-for the right architectures and CPUs by giving you a variety of ABIs from which
-to choose.</p>
-
-<p>This section begins by explaining how to target specific
-<a href="{@docRoot}ndk/guides/abis.html">architectures and CPUs</a>. It then
-provides information you need to know when targeting the
-<a href="{@docRoot}ndk/guides/abis.html">ARM</a>
-family of CPUs and architectures. Next, it provides information about the other CPUs and
-architectures that it supports: <a href="{@docRoot}ndk/guides/cpu-arm-neon.html">NEON</a>, x86
-(<a href="{@docRoot}ndk/guides/x86.html">32-bit</a> and
-<a href="{@docRoot}ndk/guides/x86-64.html">64-bit</a>), and
-<a href="{@docRoot}ndk/guides/mips.html">MIPS</a>. Finally, it explains how to use the
-<a href="{@docRoot}ndk/guides/cpu-features.html">{@code cpufeatures}</a>
-library, which your app can use to query a given CPU and architecture about the optional
-features they support.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/audio/basics.jd b/docs/html/ndk/guides/audio/basics.jd
deleted file mode 100644
index bdb85fb..0000000
--- a/docs/html/ndk/guides/audio/basics.jd
+++ /dev/null
@@ -1,169 +0,0 @@
-page.title=High-Performance Audio Basics
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#overview">Building Great Audio Apps</a></li>
- <li><a href="#adding">Adding OpenSL ES to Your App</a></li>
- <li><a href="#building">Building and Debugging</a></li>
- <li><a href="#power">Audio Power Consumption</a></li>
- <li><a href="#samples">Samples</a></li>
- </ol>
- </div>
- </div>
-
-<a href="https://www.youtube.com/watch?v=d3kfEeMZ65c" class="notice-developers-video">
-<div>
- <h3>Video</h3>
- <p>Google I/O 2013 - High Performance Audio</p>
-</div>
-</a>
-
-<p>
-The Khronos Group's OpenSL ES™ standard exposes audio features
-similar to those in the {@link android.media.MediaPlayer} and {@link android.media.MediaRecorder}
-APIs in the Android Java framework. OpenSL ES provides a C language interface as well as
-C++ bindings, allowing you to call it from code written in either language.
-</p>
-
-<p>
-This page describes the typical use cases for these high-performance audio APIs, how to add them
-into your app's source code, and how to incorporate them into the build process.
-</p>
-
-<h2 id="overview">Building Great Audio Apps</h2>
-
-<p>
-The OpenSL ES APIs are available to help you develop and improve your app's audio performance.
- Some typical use cases include the following:</p>
-
-<ul>
- <li>Digital Audio Workstations (DAWs).</li>
- <li>Synthesizers.</li>
- <li>Drum machines.</li>
- <li>Music learning apps.</li>
- <li>Karaoke apps.</li>
- <li>DJ mixing.</li>
- <li>Audio effects.</li>
- <li>Video/audio conferencing.</li>
-</ul>
-
-<h2 id="adding">Adding OpenSL ES to your App</h2>
-
-<p>
-You can call OpenSL ES from both C and C++ code. To add the core OpenSL ES
-feature set to your app, include the {@code OpenSLES.h} header file:
-
-</p>
-<pre>
-#include <SLES/OpenSLES.h>
-</pre>
-
-<p>
-To add the OpenSL ES <a href="{@docRoot}ndk/guides/audio/opensl-for-android.html#ae">
-Android extensions</a> as well, include the {@code OpenSLES_Android.h} header file:
-</p>
-<pre>
-#include <SLES/OpenSLES_Android.h>
-</pre>
-
-<p>
-When you include the {@code OpenSLES_Android.h} header file, the following headers are included
-automatically:
-</p>
-<pre>
-#include <SLES/OpenSLES_AndroidConfiguration.h>
-#include <SLES/OpenSLES_AndroidMetadata.h>
-</pre>
-
-<p class="note"><strong>Note: </strong>
-These headers are not required, but are shown as an aid in learning the API.
-</p>
-
-<h2 id="building">Building and Debugging</h2>
-
-<p>
-You can incorporate OpenSL ES into your build by specifying it in the
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file that serves as one of the
-NDK build system's makefiles. Add the following line to
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>:
-</p>
-
-<pre>
-LOCAL_LDLIBS += -lOpenSLES
-</pre>
-
-<p>
-For robust debugging, we recommend that you examine the {@code SLresult} value that most of
-the OpenSL ES APIs return. You can use
-<a class="external-link" href="http://en.wikipedia.org/wiki/Assertion_(computing)">asserts</a>
-or more advanced error-handling logic for debugging; neither offers
-an inherent advantage for working with OpenSL ES, although one or the other might be more suitable
-for a given use case.
-</p>
-
-<p>
-We use asserts in our <a class="external-link" href="https://github.com/googlesamples/android-ndk">
-examples</a>, because they help catch unrealistic conditions that would indicate a coding error. We
-have used explicit error handling for other conditions more likely to occur in production.
-</p>
-
-<p>
-Many API errors result in a log entry, in addition to a non-zero result code. Such log entries
-can provide additional detail that proves especially useful for relatively complex APIs such as
-<a class="external-link" href="https://www.khronos.org/registry/sles/specs/OpenSL_ES_Specification_1.1.pdf">
-{@code Engine::CreateAudioPlayer}</a>.
-</p>
-
-<p>
-You can view the log either from the command line or from Android Studio. To examine the log from
-the command line, type the following:
-</p>
-
-<pre class="no-pretty-print">
-$ adb logcat
-</pre>
-
-<p>
-To examine the log from Android Studio, either click the <strong>Logcat</strong> tab in the
-<a href="{@docRoot}tools/debugging/debugging-studio.html#runDebug">Debug</a>
-window, or click the <strong>Devices | logcat</strong> tab in the
-<a href="{@docRoot}tools/debugging/debugging-studio.html#systemLogView">Android DDMS</a>
-window.
-</p>
-<h2 id="power">Audio Power Consumption</h2>
-<p>Constantly outputting audio incurs significant power consumption. Ensure that you stop the
- output in the
- <a href="{@docRoot}reference/android/app/Activity.html#onPause()">onPause()</a> method.
- Also consider pausing the silent output after some period of user inactivity.
-</p>
-<h2 id="samples">Samples</h2>
-
-<p>
-Supported and tested example code that you can use as a model for your own code resides both locally
-and on
-<a class="external-link" href="https://github.com/googlesamples/android-audio-high-performance/">
-GitHub</a>. The local examples are located in
-{@code platforms/android-9/samples/native-audio/}, under your NDK root installation directory.
-On GitHub, they are available from the
-<a class="external-link" href="https://github.com/googlesamples/android-ndk">{@code android-ndk}</a>
-repository, in the
-<a class="external-link" href="https://github.com/googlesamples/android-ndk/tree/master/audio-echo">
-{@code audio-echo}</a> and
-<a class="external-link" href="https://github.com/googlesamples/android-ndk/tree/master/native-audio">
-{@code native-audio}</a> directories.
-</p>
-<p>The Android NDK implementation of OpenSL ES differs
-from the reference specification for OpenSL ES 1.0.1 in a number of respects.
-These differences are an important reason as to why sample code that
-you copy directly from the OpenSL ES reference specification may not work in your
-Android app.
-</p>
-<p>
-For more information on differences between the reference specification and the
-Android implementation, see
-<a href="{@docRoot}ndk/guides/audio/opensl-for-android.html">
-OpenSL ES for Android</a>.
diff --git a/docs/html/ndk/guides/audio/floating-point.jd b/docs/html/ndk/guides/audio/floating-point.jd
deleted file mode 100644
index 76efce3..0000000
--- a/docs/html/ndk/guides/audio/floating-point.jd
+++ /dev/null
@@ -1,101 +0,0 @@
-page.title=Floating-Point Audio
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#best">Best Practices for Floating-Point Audio</a></li>
- <li><a href="#support">Floating-Point Audio in Android SDK</a></li>
- <li><a href="#more">For More Information</a></li>
- </ol>
- </div>
- </div>
-
-<a href="https://www.youtube.com/watch?v=sIcieUqMml8" class="notice-developers-video">
-<div>
- <h3>Video</h3>
- <p>Will it Float? The Glory and Shame of Floating-Point Audio</p>
-</div>
-</a>
-
-<p>Using floating-point numbers to represent audio data can significantly enhance audio
- quality in high-performance audio applications. Floating point offers the following
- advantages:</p>
-
-<ul>
-<li>Wider dynamic range.</li>
-<li>Consistent accuracy across the dynamic range.</li>
-<li>More headroom to avoid clipping during intermediate calculations and transients.</li>
-</ul>
-
-<p>While floating-point can enhance audio quality, it does present certain disadvantages:</p>
-
-<ul>
-<li>Floating-point numbers use more memory.</li>
-<li>Floating-point operations employ unexpected properties, for example, addition is
- not associative.</li>
-<li>Floating-point calculations can sometimes lose arithmetic precision due to rounding or
- numerically unstable algorithms.</li>
-<li>Using floating-point effectively requires greater understanding to achieve accurate
- and reproducible results.</li>
-</ul>
-
-<p>
- Formerly, floating-point was notorious for being unavailable or slow. This is
- still true for low-end and embedded processors. But processors on modern
- mobile devices now have hardware floating-point with performance that is
- similar (or in some cases even faster) than integer. Modern CPUs also support
- <a href="http://en.wikipedia.org/wiki/SIMD" class="external-link">SIMD</a>
- (Single instruction, multiple data), which can improve performance further.
-</p>
-
-<h2 id="best">Best Practices for Floating-Point Audio</h2>
-<p>The following best practices help you avoid problems with floating-point calculations:</p>
-<ul>
-<li>Use double precision floating-point for infrequent calculations,
-such as computing filter coefficients.</li>
-<li>Pay attention to the order of operations.</li>
-<li>Declare explicit variables for intermediate values.</li>
-<li>Use parentheses liberally.</li>
-<li>If you get a NaN or infinity result, use binary search to discover
-where it was introduced.</li>
-</ul>
-
-<h2 id="support">Floating-Point Audio in Android SDK</h2>
-
-<p>For floating-point audio, the audio format encoding
- <code>AudioFormat.ENCODING_PCM_FLOAT</code> is used similarly to
- <code>ENCODING_PCM_16_BIT</code> or <code>ENCODING_PCM_8_BIT</code> for specifying
- AudioTrack data
-formats. The corresponding overloaded method <code>AudioTrack.write()</code>
- takes in a float array to deliver data.</p>
-
-<pre>
- public int write(float[] audioData,
- int offsetInFloats,
- int sizeInFloats,
- int writeMode)
-</pre>
-
-<h2 id="more">For More Information</h2>
-
-<p>The following Wikipedia pages are helpful in understanding floating-point audio:</p>
-
-<ul>
-<li><a href="http://en.wikipedia.org/wiki/Audio_bit_depth" class="external-link" >Audio bit depth</a></li>
-<li><a href="http://en.wikipedia.org/wiki/Floating_point" class="external-link" >Floating point</a></li>
-<li><a href="http://en.wikipedia.org/wiki/IEEE_floating_point" class="external-link" >IEEE 754 floating-point</a></li>
-<li><a href="http://en.wikipedia.org/wiki/Loss_of_significance" class="external-link" >Loss of significance</a>
- (catastrophic cancellation)</li>
-<li><a href="https://en.wikipedia.org/wiki/Numerical_stability" class="external-link" >Numerical stability</a></li>
-</ul>
-
-<p>The following article provides information on those aspects of floating-point that have a
- direct impact on designers of computer systems:</p>
-<ul>
-<li><a href="http://docs.oracle.com/cd/E19957-01/806-3568/ncg_goldberg.html" class="external-link" >What every
- computer scientist should know about floating-point arithmetic</a>
-by David Goldberg, Xerox PARC (edited reprint).</li>
-</ul>
diff --git a/docs/html/ndk/guides/audio/index.jd b/docs/html/ndk/guides/audio/index.jd
deleted file mode 100644
index 12d9320..0000000
--- a/docs/html/ndk/guides/audio/index.jd
+++ /dev/null
@@ -1,27 +0,0 @@
-page.title=NDK High-Performance Audio
-@jd:body
-
-<p>The NDK package includes an Android-specific implementation of the
-<a class="external-link" href="https://www.khronos.org/opensles/">OpenSL ES™</a> API
-specification from the <a class="external-link" href="https://www.khronos.org">Khronos Group</a>.
-This library allows you to use C or C++ to implement high-performance, low-latency audio, whether
-you are writing a synthesizer, digital audio workstation, karaoke, game,
- or other real-time app.</p>
-
-<p>This section begins by providing some
-<a href="{@docRoot}ndk/guides/audio/basics.html">basic information</a> about the API, including
-typical use cases and how to incorporate it into your app. It then explains what you need to know
-about the <a href="{@docRoot}ndk/guides/audio/opensl-for-android.html">Android-specific
-implementation</a> of OpenSL ES, focusing on the differences between this implementation and the
-reference specification. Next, you'll learn how to minimze
- <a href="{@docRoot}ndk/guides/audio/input-latency.html">input latency</a>
- when using built-in or external microphones
-and some actions that you can take to minimize
- <a href="{@docRoot}ndk/guides/audio/output-latency.html">output latency</a>.
- It describes the reasons that you should use
- <a href="{@docRoot}ndk/guides/audio/floating-point.html">floating-point</a>
- numbers to represent your audio data, and it provides information that will help you choose the
-optimal <a href="{@docRoot}ndk/guides/audio/sample-rates.html">sample rate</a>. This section
- concludes with some supplemental <a href="{@docRoot}ndk/guides/audio/opensl-prog-notes.html">
- programming notes</a> to ensure proper implementation of OpenSL ES.
- </p>
diff --git a/docs/html/ndk/guides/audio/input-latency.jd b/docs/html/ndk/guides/audio/input-latency.jd
deleted file mode 100644
index f1103fc..0000000
--- a/docs/html/ndk/guides/audio/input-latency.jd
+++ /dev/null
@@ -1,95 +0,0 @@
-page.title=Audio Input Latency
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#check-list">Checklist</a></li>
- <li><a href="#ways">Ways to Reduce Audio Input Latency</a></li>
- <li><a href="#avoid">What to Avoid</a></li>
- </ol>
- </div>
- </div>
-
-
-<p>This page provides guidelines to help you reduce audio input latency when recording with a
-built-in microphone or an external headset microphone.</p>
-
-<h2 id="check-list">Checklist</h2>
-
-<p>Here are a few important prerequisites:</p>
-
-<ul>
- <li>You must use the Android-specific implementation of the
- <a class="external-link" href="https://www.khronos.org/opensles/">OpenSL ES™</a> API.
-
- <li>If you haven't already done so, download and install the
- <a href="{@docRoot}tools/sdk/ndk/index.html">Android NDK</a>.</li>
-
- <li>Many of the same requirements for low-latency audio output also apply to low-latency input,
- so read the requirements for low-latency output in
- <a href="{@docRoot}ndk/guides/audio/output-latency.html">Audio Output Latency</a>.</li>
-</ul>
-
-<h2 id="ways">Ways to Reduce Audio Input Latency</h2>
-
-<p>The following are some methods to help ensure low audio input latency:
-
-<ul>
- <li>Suggest to your users, if your app relies on low-latency audio, that they use a headset
-(for example, by displaying a <em>Best with headphones</em> screen on first run). Note
-that just using the headset doesn’t guarantee the lowest possible latency. You may need to
-perform other steps to remove any unwanted signal processing from the audio path, such as by
-using the <a href="http://developer.android.com/reference/android/media/MediaRecorder.AudioSource.html#VOICE_RECOGNITION">
-VOICE_RECOGNITION</a> preset when recording.</li>
-
- <li>It's difficult to test audio input and output latency in isolation. The best solution to
-determine the lowest possible audio input latency is to measure round-trip audio and divide
-by two.</li>
- <li> Be prepared to handle nominal sample rates of 44,100 and 48,000 Hz as reported by
-<a href="{@docRoot}reference/android/media/AudioManager.html#getProperty(java.lang.String)">
-getProperty(String)</a> for
-<a href="{@docRoot}reference/android/media/AudioManager.html#PROPERTY_OUTPUT_SAMPLE_RATE">
-PROPERTY_OUTPUT_SAMPLE_RATE</a>. Other sample rates are possible, but rare.</li>
-
- <li>Be prepared to handle the buffer size reported by
-<a href="{@docRoot}reference/android/media/AudioManager.html#getProperty(java.lang.String)">
-getProperty(String)</a> for
-<a href="{@docRoot}reference/android/media/AudioManager.html#PROPERTY_OUTPUT_FRAMES_PER_BUFFER">
-PROPERTY_OUTPUT_FRAMES_PER_BUFFER</a>. Typical buffer sizes include 96, 128, 160, 192, 240, 256,
-or 512 frames, but other values are possible.</li>
-</ul>
-
-<h2 id="avoid">What to Avoid</h2>
-
-<p>Be sure to take these things into account to help avoid latency issues:</p>
-
-<ul>
- <li>Don’t assume that the speakers and microphones used in mobile devices generally have good
-acoustics. Due to their small size, the acoustics are generally poor so signal processing is
-added to improve the sound quality. This signal processing introduces latency.</li>
-
- <li>Don't assume that your input and output callbacks are synchronized. For simultaneous input
-and output, separate buffer queue completion handlers are used for each side. There is no
-guarantee of the relative order of these callbacks or the synchronization of the audio clocks,
-even when both sides use the same sample rate. Your application should buffer the data with
-proper buffer synchronization.</li>
-
- <li>Don't assume that the actual sample rate exactly matches the nominal sample rate. For
-example, if the nominal sample rate is 48,000 Hz, it is normal for the audio clock to advance
-at a slightly different rate than the operating system {@code CLOCK_MONOTONIC}. This is because
-the audio and system clocks may derive from different crystals.</li>
-
- <li>Don't assume that the actual playback sample rate exactly matches the actual capture sample
-rate, especially if the endpoints are on separate paths. For example, if you are capturing from
-the on-device microphone at 48,000 Hz nominal sample rate, and playing on USB audio
-at 48,000 Hz nominal sample rate, the actual sample rates are likely to be slightly different
-from each other.</li>
-</ul>
-
-<p>A consequence of potentially independent audio clocks is the need for asynchronous sample rate
-conversion. A simple (though not ideal for audio quality) technique for asynchronous sample rate
-conversion is to duplicate or drop samples as needed near a zero-crossing point. More
-sophisticated conversions are possible.</p>
diff --git a/docs/html/ndk/guides/audio/opensl-for-android.jd b/docs/html/ndk/guides/audio/opensl-for-android.jd
deleted file mode 100644
index fa5e260..0000000
--- a/docs/html/ndk/guides/audio/opensl-for-android.jd
+++ /dev/null
@@ -1,1211 +0,0 @@
-page.title=OpenSL ES for Android
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#getstarted">Getting Started</a></li>
- <li><a href="#inherited">Features Inherited from the Reference Specification</a></li>
- <li><a href="#planning">Planning for Future Versions of OpenSL ES</a></li>
- <li><a href="#ae">Android Extensions</a></li>
- <li><a href="#notes">Programming Notes</a></li>
- <li><a href="#platform-issues">Platform Issues</a></li>
- </ol>
- </div>
- </div>
-
-<p>
-This page provides details about how the
-<a href="{@docRoot}tools/sdk/ndk/index.html">NDK</a> implementation of OpenSL
-ES™ differs from the reference specification for OpenSL ES 1.0.1. When using sample code from the
-specification, you may need to modify it to work on Android.
-</p>
-
-<p>
-Unless otherwise noted, all features are available at Android 2.3 (API level 9) and higher.
- Some features are only available for Android 4.0 (API level 14); these are noted.
-</p>
-
-<p class="note"><strong>Note: </strong>
-The Android Compatibility Definition Document (CDD) enumerates the hardware and software
-requirements of a compatible Android device. See
-<a class="external-link" href="https://source.android.com/compatibility/">Android Compatibility</a>
-for more information on the overall compatibility program, and
-<a class="external-link" href="https://static.googleusercontent.com/media/source.android.com/en//compatibility/android-cdd.pdf">
-CDD</a> for the actual CDD document.
-</p>
-
-<p>
-<a class="external-link" href="https://www.khronos.org/opensles/">OpenSL ES</a> provides a C
-language interface that is also accessible using C++. It exposes features similar to the audio
-portions of these Android Java APIs:
-</p>
-
-<ul>
- <li><a href="{@docRoot}reference/android/media/MediaPlayer.html">
- android.media.MediaPlayer</a></li>
- <li><a href="{@docRoot}reference/android/media/MediaRecorder.html">
- android.media.MediaRecorder</a></li>
-</ul>
-
-<p>
-As with all of the Android Native Development Kit (NDK), the primary purpose of OpenSL ES for
-Android is to facilitate the implementation of shared libraries to be called using the Java Native
-Interface (<a class="external-link" href="https://en.wikipedia.org/wiki/Java_Native_Interface">JNI
-</a>). NDK is not intended for writing pure C/C++ applications. However, OpenSL ES is a
-full-featured API, and we expect that you should be able to accomplish most of your audio needs
-using only this API, without up-calls to code running in the Android runtime.
-</p>
-
-<p class="note"><strong>Note: </strong>
-Though based on OpenSL ES, the Android native audio (high-performance audio) API is not a
-conforming implementation of any OpenSL ES 1.0.1 profile (game, music, or phone). This is because
-Android does not implement all of the features required by any one of the profiles. Any known cases
-where Android behaves differently than the specification are described in the <a href="#ae">
-Android extensions</a> section below.
-</p>
-
-<h2 id="getstarted">Getting Started</h2>
-
-<p>
-This section provides the information needed to get started using the OpenSL ES APIs.
-</p>
-
-<h3>Example code</h3>
-
-<p>
-We recommend using supported and tested example code that is usable as a model for your own
-code, which is located in the NDK folder {@code platforms/android-9/samples/native-audio/}, as well
-as in the
-<a class="external-link" href="https://github.com/googlesamples/android-ndk/tree/master/audio-echo">audio-echo</a>
-and
-<a class="external-link" href="https://github.com/googlesamples/android-ndk/tree/master/native-audio">native-audio</a>
-folders of the
-<a class="external-link" href="https://github.com/googlesamples/android-ndk">android-ndk</a> GitHub
-repository.
-</p>
-
-<p class="caution"><strong>Caution: </strong>
-The OpenSL ES 1.0.1 specification contains example code in the appendices (see
-<a class="external-link" href="https://www.khronos.org/registry/sles/">Khronos OpenSL ES Registry</a>
-for more details). However, the examples in <em>Appendix B: Sample Code</em> and
-<em>Appendix C: Use Case Sample Code</em> use features that are not supported by Android. Some
-examples also contain typographical errors, or use APIs that are likely to change. Proceed with
-caution when referring to these; though the code may be helpful in understanding the full OpenSL ES
-standard, it should not be used as-is with Android.
-</p>
-
-<h3>Makefile</h3>
-
-<p>
-Modify your {@code Android.mk} file as follows:
-</p>
-<pre>
-LOCAL_LDLIBS += -lOpenSLES
-</pre>
-
-<h3>Audio content</h3>
-
-<p>
-The following are some of the many ways to package audio content for your application:
-</p>
-
-<ul>
- <li><strong>Resources</strong>: By placing your audio files into the {@code res/raw/} folder,
- they can be accessed easily by the associated APIs for
- <a href="{@docRoot}reference/android/content/res/Resources.html">Resources</a>.
- However, there is no direct native access to resources, so you must write Java
- programming language code to copy them out before use.</li>
- <li><strong>Assets</strong>: By placing your audio files into the {@code assets/} folder, they
- are directly accessible by the Android native asset manager APIs. See the header files {@code
- android/asset_manager.h} and {@code android/asset_manager_jni.h} for more information on these
- APIs. The example code located in the NDK folder {@code platforms/android-9/samples/native-audio/}
- uses these native asset manager APIs in conjunction with the Android file descriptor data
- locator.</li>
- <li><strong>Network</strong>: You can use the URI data locator to play audio content directly
- from the network. However, be sure to read the <a href="#sandp">Security and permissions</a>
- section below.</li>
- <li><strong>Local file system</strong>: The URI data locator supports the {@code file:} scheme
- for local files, provided the files are accessible by the application. Note that the Android
- security framework restricts file access via the Linux user ID and group ID mechanisms.</li>
- <li><strong>Recorded</strong>: Your application can record audio data from the microphone input,
- store this content, and then play it back later. The example code uses this method for the <em>
- Playback</em> clip.</li>
- <li><strong>Compiled and linked inline</strong>: You can link your audio content directly into
- the shared library, and then play it using an audio player with buffer queue data locator. This
- is most suitable for short PCM format clips. The example code uses this technique for the <em>
- Hello</em> and <em>Android</em> clips. The PCM data was converted to hex strings using a
- {@code bin2c} tool (not supplied).</li>
- <li><strong>Real-time synthesis</strong>: Your application can synthesize PCM data on the fly and
- then play it using an audio player with buffer queue data locator. This is a relatively advanced
- technique, and the details of audio synthesis are beyond the scope of this article.</li>
-</ul>
-
-<p class="note"><strong>Note: </strong>
-Finding or creating useful audio content for your application is beyond the scope of this article.
-You can use web search terms such as <em>interactive audio</em>, <em>game audio</em>, <em>sound
-design</em>, and <em>audio programming</em> to locate more information.
-</p>
-<p class="caution"><strong>Caution:</strong> It is your responsibility
-to ensure that you are legally permitted to play or record content. There may be privacy
-considerations for recording content.
-</p>
-
-<h2 id="inherited">Features Inherited from the Reference Specification</h2>
-
-<p>
-The Android NDK implementation of OpenSL ES inherits much of the feature set from
-the reference specification, with certain limitations.
-</p>
-
-<h3>Global entry points</h3>
-
-<p>
-OpenSL ES for Android supports all of the global entry points in the Android specification.
-These entry points include:
-</p>
-
-<ul>
-<li>{@code slCreateEngine}
-</li>
-<li>{@code slQueryNumSupportedEngineInterfaces}</code>
-</li>
-<li>{@code slQuerySupportedEngineInterfaces}</code>
-</li>
-</ul>
-
-<h3>Objects and interfaces</h3>
-
-<p>
-Table 1 shows the objects and interfaces that the Android NDK implementation of
-OpenSL ES supports. If a <em>Yes</em> appears in the cell, then the feature is available in this
-implementation.
-</p>
-
-<p class="table-caption" id="Objects-and-interfaces">
- <strong>Table 1.</strong> Android NDK support for objects and interfaces.</p>
-<table>
- <tr>
- <th scope="col">Feature</th>
- <th scope="col">Audio player</th>
- <th scope="col">Audio recorder</th>
- <th scope="col">Engine</th>
- <th scope="col">Output mix</th>
- </tr>
- <tr>
- <td>Bass boost</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Buffer queue</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Dynamic interface management</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Effect send</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Engine</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Environmental reverb</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Equalizer</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Metadata extraction</td>
- <td>Yes: Decode to PCM</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Mute solo</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Object</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Play</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Playback rate</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Prefetch status</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Preset reverb</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Record</td>
- <td>No</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Seek</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Virtualizer</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Volume</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Buffer queue data locator</td>
- <td>Yes: Source</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>I/O device data locator</td>
- <td>No</td>
- <td>Yes: Source</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Output mix locator</td>
- <td>Yes: Sink</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>URI data locator</td>
- <td>Yes: Source</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- </table>
-
-<p>
-The next section explains the limitations for some of these features.
-</p>
-
-<h3>Limitations</h3>
-
-<p>
-Certain limitations apply to the features in Table 1. These limitations
-represent differences from the reference specification. The rest of this section provides
-information about these differences.</p>
-
-<h4>Dynamic interface management</h4>
-
-<p>
-OpenSL ES for Android does not support {@code RemoveInterface} or
-{@code ResumeInterface}.
-</p>
-
-<h4>Effect combinations: environment reverb and preset reverb</h4>
-
-<p>
-You cannot have both environmental reverb and preset reverb on the same output mix.
-</p>
-<p>
-The platform might ignore effect requests if it estimates that the
-CPU load would be too high.
-</p>
-
-<h4>Effect send</h4>
-
-<p>
-<code>SetSendLevel()</code> supports a single send level per audio player.
-</p>
-
-<h4>Environmental reverb</h4>
-
-<p>
-Environmental reverb does not support the <code>reflectionsDelay</code>,
-<code>reflectionsLevel</code>, or <code>reverbDelay</code> fields of
-the <code>SLEnvironmentalReverbSettings</code> struct.
-</p>
-
-<h4>MIME data format</h4>
-
-<p>
-You can use the MIME data format only with the URI data locator, and only for an audio
-player. You cannot use this data format for an audio recorder.
-</p>
-<p>
-The Android implementation of OpenSL ES requires you to initialize <code>mimeType</code>
-to either <code>NULL</code> or a valid UTF-8 string. You must also initialize
-<code>containerType</code> to a valid value.
-In the absence of other considerations, such as portability to other
-implementations or content format that an app cannot identify by header,
-we recommend that you
-set <code>mimeType</code> to <code>NULL</code> and <code>containerType</code>
-to <code>SL_CONTAINERTYPE_UNSPECIFIED</code>.
-</p>
-<p>
-OpenSL ES for Android supports the following audio formats, so long as the
-Android platform supports them as well:</p>
-
-<ul>
-<li><a class="external-link" href="https://en.wikipedia.org/wiki/WAV">WAV</a> PCM.</li>
-<li>WAV alaw.</li>
-<li>WAV ulaw.</li>
-<li>MP3 Ogg Vorbis.</li>
-<li>AAC LC.</li>
-<li>HE-AACv1 (AAC+).</li>
-<li>HE-AACv2 (enhanced AAC+).</li>
-<li>AMR.</li>
-<li>FLAC.</li>
-</ul>
-
-<p class="note"><strong>Note: </strong>
-For a list of audio formats that Android supports, see
-<a href="{@docRoot}guide/appendix/media-formats.html">Supported Media Formats</a>.
-</p>
-
-<p>
-The following limitations apply to the handling of these and other formats in this
-implementation of OpenSL ES:
-</p>
-
-<ul>
-<li><a class="external-link" href="https://en.wikipedia.org/wiki/Advanced_Audio_Coding">AAC</a>
-formats must reside within an MP4 or ADTS container.</li>
-<li>OpenSL ES for Android does not support
-<a class="external-link" href="https://source.android.com/devices/audio/midi.html">MIDI</a>.</li>
-<li>WMA is not part of <a class="external-link" href="https://source.android.com/">AOSP</a>, and we
-have not verified its compatibility with OpenSL ES for Android.</li>
-<li>The Android NDK implementation of OpenSL ES does not support direct
-playback of DRM or encrypted content. To play back protected audio content, you must
-decrypt it in your application before playing, with your app enforcing any DRM
-restrictions.</li>
-</ul>
-
-<h4>Object-related methods</h4>
-
-<p>
-OpenSL ES for Android does not support the following methods for manipulating objects:
-</p>
-
-<ul>
-<li>{@code Resume()}</li>
-<li>{@code RegisterCallback()}</li>
-<li>{@code AbortAsyncOperation()}</li>
-<li>{@code SetPriority()}</li>
-<li>{@code GetPriority()}</li>
-<li>{@code SetLossOfControlInterfaces()}</li>
-</ul>
-
-<h4>PCM data format</h4>
-
-<p>
-PCM is the only data format you can use with buffer queues. Supported PCM
-playback configurations have the following characteristics:
-</p>
-
-<ul>
-<li>8-bit unsigned or 16-bit signed.</li>
-<li>Mono or stereo.</li>
-<li>Little-endian byte ordering.</li>
-<li>Sample rates of:
- <ul>
- <li>8,000 Hz.</li>
- <li>11,025 Hz.</li>
- <li>12,000 Hz.</li>
- <li>16,000 Hz.</li>
- <li>22,050 Hz.</li>
- <li>24,000 Hz.</li>
- <li>32,000 Hz.</li>
- <li>44,100 Hz.</li>
- <li>48,000 Hz.</li>
- </ul></li>
-</ul>
-
-<p>
-The configurations that OpenSL ES for Android supports for recording are
-device-dependent; usually, 16,000 Hz mono/16-bit signed is available regardless of the device.
-</p>
-<p>
-The value of the <code>samplesPerSec</code> field is in units of milliHz, despite the misleading
-name. To avoid accidentally using the wrong value, we recommend that you initialize this field using
-one of the symbolic constants defined for this purpose, such as {@code SL_SAMPLINGRATE_44_1}.
-</p>
-<p>
-Android 5.0 (API level 21) and above support <a href="#fp">floating-point data</a>.
-</p>
-
-<h4>Playback rate</h4>
-
-<p>
-An OpenSL ES <i>playback rate</i> indicates the speed at which an
-object presents data, expressed in thousandths of normal speed, or <i>per mille</i>. For example,
-a playback rate of 1,000 per mille is 1,000/1,000, or normal speed.
-A <i>rate range</i> is a closed interval that expresses possible rate ranges.
-</p>
-
-<p>
-Support for playback-rate ranges and other capabilities may vary depending
-on the platform version and implementation. Your app can determine these capabilities at runtime by
-using <code>PlaybackRate::GetRateRange()</code> or
-<code>PlaybackRate::GetCapabilitiesOfRate()</code> to query the device.
-</p>
-
-<p>
-A device typically supports the same rate range for a data source in PCM format, and a unity rate
-range of 1000 per mille to 1000 per mille for other formats: that is, the unity rate range is
-effectively a single value.
-</p>
-
-<h4>Record</h4>
-
-<p>
-OpenSL ES for Android does not support the <code>SL_RECORDEVENT_HEADATLIMIT</code>
-or <code>SL_RECORDEVENT_HEADMOVING</code> events.
-</p>
-
-<h4>Seek</h4>
-
-<p>
-The <code>SetLoop()</code> method enables whole-file looping. To enable looping,
-set the <code>startPos</code> parameter to 0, and the value of the <code>endPos</code> parameter
-to <code>SL_TIME_UNKNOWN</code>.
-</p>
-
-<h4>Buffer queue data locator</h4>
-
-<p>
-An audio player or recorder with a data locator for a buffer queue supports PCM data format only.
-</p>
-
-<h4>I/O device data locator</h4>
-
-<p>
-OpenSL ES for Android only supports use of an I/O device data locator when you have
-specified the locator as the data source for <code>Engine::CreateAudioRecorder()</code>.
-Initialize the device data locator using the values contained in the following code snippet.
-</p>
-
-<pre>
-SLDataLocator_IODevice loc_dev =
- {SL_DATALOCATOR_IODEVICE, SL_IODEVICE_AUDIOINPUT,
- SL_DEFAULTDEVICEID_AUDIOINPUT, NULL};
-</pre>
-
-<h4>URI data locator</h4>
-
-<p>
-OpenSL ES for Android can only use the URI data locator with MIME data format,
-and only for an audio player. You cannot use this data format for an audio recorder. It supports
-{@code http:} and {@code file:} schemes. It does not support other schemes, such as {@code https:},
-{@code ftp:}, or
-{@code content:}.
-</p>
-
-<p>
-We have not verified support for {@code rtsp:} with audio on the Android platform.
-</p>
-
-<h4>Data structures</h4>
-
-<p>
-Android supports these OpenSL ES 1.0.1 data structures:
-</p>
-<ul>
- <li>{@code SLDataFormat_MIME}</li>
- <li>{@code SLDataFormat_PCM}</li>
- <li>{@code SLDataLocator_BufferQueue}</li>
- <li>{@code SLDataLocator_IODevice}</li>
- <li>{@code SLDataLocator_OutputMix}</li>
- <li>{@code SLDataLocator_URI}</li>
- <li>{@code SLDataSink}</li>
- <li>{@code SLDataSource}</li>
- <li>{@code SLEngineOption}</li>
- <li>{@code SLEnvironmentalReverbSettings}</li>
- <li>{@code SLInterfaceID}</li>
-</ul>
-
-<h4>Platform configuration</h4>
-
-<p>
-OpenSL ES for Android is designed for multi-threaded applications and is thread-safe. It supports a
-single engine per application, and up to 32 objects per engine. Available device memory and CPU may
-further restrict the usable number of objects.
-</p>
-
-<p>
-These engine options are recognized, but ignored by {@code slCreateEngine}:
-</p>
-
-<ul>
- <li>{@code SL_ENGINEOPTION_THREADSAFE}</li>
- <li>{@code SL_ENGINEOPTION_LOSSOFCONTROL}</li>
-</ul>
-
-<p>
-OpenMAX AL and OpenSL ES may be used together in the same application. In this case, there is
-a single shared engine object internally, and the 32 object limit is shared between OpenMAX AL
-and OpenSL ES. The application should first create both engines, use both engines, and finally
-destroy both engines. The implementation maintains a reference count on the shared engine so that
-it is correctly destroyed during the second destroy operation.
-</p>
-
-<h2 id="planning">Planning for Future Versions of OpenSL ES</h2>
-
-<p>
-The Android high-performance audio APIs are based on
-<a class="external-link" href="https://www.khronos.org/registry/sles/">Khronos Group OpenSL ES
-1.0.1</a>. Khronos has released a revised version 1.1 of the standard. The
-revised version includes new features, clarifications, corrections of typographical errors, and
-some incompatibilities. Most of the expected incompatibilities are relatively minor or are in
-areas of OpenSL ES that are not supported by Android.
-</p>
-
-<p>
-An application
-developed with this version should work on future versions of the Android platform, provided
-that you follow the guidelines that are outlined in the <a href="#binary-compat">Planning for
-binary compatibility</a> section below.
-</p>
-
-<p class="note"><strong>Note: </strong>
-Future source compatibility is not a goal. That is, if you upgrade to a newer version of the NDK,
-you may need to modify your application source code to conform to the new API. We expect that most
-such changes will be minor; see details below.
-</p>
-
-<h3 id="binary-compat">Planning for binary compatibility</h3>
-
-<p>
-We recommend that your application follow these guidelines to improve future binary compatibility:
-</p>
-
-<ul>
- <li>Use only the documented subset of Android-supported features from OpenSL ES 1.0.1.</li>
- <li>Do not depend on a particular result code for an unsuccessful operation; be prepared to deal
- with a different result code.</li>
- <li>Application callback handlers generally run in a restricted context. They should be written
- to perform their work quickly, and then return as soon as possible. Do not run complex operations
- within a callback handler. For example, within a buffer queue completion callback, you can
- enqueue another buffer, but do not create an audio player.</li>
- <li>Callback handlers should be prepared to be called more or less frequently, to receive
- additional event types, and should ignore event types that they do not recognize. Callbacks that
- are configured with an event mask made of enabled event types should be prepared to be called
- with multiple event type bits set simultaneously. Use "&" to test for each event bit rather than
- a switch case.</li>
- <li>Use prefetch status and callbacks as a general indication of progress, but do not depend on
- specific hard-coded fill levels or callback sequences. The meaning of the prefetch status fill
- level, and the behavior for errors that are detected during prefetch, may change.</li>
-</ul>
-
-<p class="note"><strong>Note: </strong>
-See the <a href="#bq-behavior">Buffer queue behavior</a> section below for more details.
-</p>
-
-<h3>Planning for source compatibility</h3>
-
-<p>
-As mentioned, source code incompatibilities are expected in the next version of OpenSL ES from
-Khronos Group. The likely areas of change include:
-</p>
-
-<ul>
- <li>The buffer queue interface is expected to have significant changes, especially in the areas
- of {@code BufferQueue::Enqueue}, the parameter list for {@code slBufferQueueCallback}, and the
- name of field {@code SLBufferQueueState.playIndex}. We recommend that your application code use
- Android simple buffer queues instead. In the example
- code that is supplied with the NDK, we have used Android simple buffer queues for playback for
- this reason. (We also use Android simple buffer queue for recording and decoding to PCM, but that
- is because standard OpenSL ES 1.0.1 does not support record or decode to a buffer queue data
- sink.)</li>
- <li>There will be an addition of {@code const} to the input parameters passed by reference, and
- to {@code SLchar *} struct fields used as input values. This should not require any changes to
- your code.</li>
- <li>There will be a substitution of unsigned types for some parameters that are currently signed.
- You may need to change a parameter type from {@code SLint32} to {@code SLuint32} or similar, or
- add a cast.</li>
- <li>{@code Equalizer::GetPresetName} copies the string to application memory instead of returning
- a pointer to implementation memory. This will be a significant change, so we recommend that you
- either avoid calling this method, or isolate your use of it.</li>
- <li>There will be additional fields in the struct types. For output parameters, these new fields
- can be ignored, but for input parameters the new fields will need to be initialized. Fortunately,
- all of these are expected to be in areas that are not supported by Android.</li>
- <li>Interface <a class="external-link" href="http://en.wikipedia.org/wiki/Globally_unique_identifier">
- GUIDs</a> will change. Refer to interfaces by symbolic name rather than GUID to avoid a
- dependency.</li>
- <li>{@code SLchar} will change from {@code unsigned char} to {@code char}. This primarily affects
- the URI data locator and MIME data format.</li>
- <li>{@code SLDataFormat_MIME.mimeType} will be renamed to {@code pMimeType}, and
- {@code SLDataLocator_URI.URI} will be renamed to {@code pURI}. We recommend that you initialize
- the {@code SLDataFormat_MIME} and {@code SLDataLocator_URI} data structures using a
- brace-enclosed, comma-separated list of values, rather than by field name, to isolate your code
- from this change. This technique is used in the example code.</li>
- <li>{@code SL_DATAFORMAT_PCM} does not permit the application to specify the representation of
- the data as signed integer, unsigned integer, or floating-point. The Android implementation
- assumes that 8-bit data is unsigned integer and 16-bit is signed integer. In addition, the field
- {@code samplesPerSec} is a misnomer, as the actual units are milliHz. These issues are expected
- to be addressed in the next OpenSL ES version, which will introduce a new extended PCM data
- format that permits the application to explicitly specify the representation and corrects the
- field name. As this will be a new data format, and the current PCM data format will still be
- available (though deprecated), it should not require any immediate changes to your code.</li>
-</ul>
-
-<h2 id="ae">Android Extensions</h2>
-
-<p>
-OpenSL ES for Android extends the reference OpenSL ES specification to make it compatible with
-Android, and to take advantage of the power and flexibility of the Android platform.
-</p>
-
-<p>
-The definition of the API for the Android extensions resides in <code>OpenSLES_Android.h</code>
-and the header files that it includes. Consult {@code OpenSLES_Android.h}
-for details about these extensions. This file is located under your installation root, in the
-{@code platforms/android-<version>/<abi>/include/SLES} directory. Unless otherwise
-noted, all interfaces are explicit.
-</p>
-
-<p>
-These extensions limit your application's portability to
-other OpenSL ES implementations, because they are Android-specific. You can mitigate this issue by
-avoiding use of the extensions or by using {@code #ifdef} to exclude them at compile time.
-</p>
-
-<p>
-Table 2 shows the Android-specific interfaces and data locators that Android OpenSL ES supports
-for each object type. The <em>Yes</em> values in the cells indicate the interfaces and data
-locators that are available for each object type.
-</p>
-
-<p class="table-caption" id="Android-extensions">
- <strong>Table 2.</strong> Interfaces and data locators, by object type.</p>
-<table>
- <tr>
- <th scope="col">Feature</th>
- <th scope="col">Audio player</th>
- <th scope="col">Audio recorder</th>
- <th scope="col">Engine</th>
- <th scope="col">Output mix</th>
- </tr>
- <tr>
- <td>Android buffer queue</td>
- <td>Yes: Source (decode)</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android configuration</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android effect</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Android effect capabilities</td>
- <td>No</td>
- <td>No</td>
- <td>Yes</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android effect send</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android simple buffer queue</td>
- <td>Yes: Source (playback) or sink (decode)</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android buffer queue data locator</td>
- <td>Yes: Source (decode)</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android file descriptor data locator</td>
- <td>Yes: Source</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Android simple buffer queue data locator</td>
- <td>Yes: Source (playback) or sink (decode)</td>
- <td>Yes: Sink</td>
- <td>No</td>
- <td>No</td>
- </tr>
-</table>
-
-<h3 id="configuration-interface">Android configuration interface</h3>
-
-<p>
-The Android configuration interface provides a means to set
-platform-specific parameters for objects. This interface is different from other OpenSL ES
-1.0.1 interfaces in that your app can use it before instantiating the corresponding object; thus,
-you can configure the object before instantiating it. The
-{@code OpenSLES_AndroidConfiguration.h} header file</code>, which resides at
-{@code platforms/android-<version>/<abi>/include/SLES},
-documents the following available configuration keys and values:
-</p>
-
-<ul>
-<li>Stream type for audio players (default <code>SL_ANDROID_STREAM_MEDIA</code>).</li>
-<li>Record profile for audio recorders (default <code>SL_ANDROID_RECORDING_PRESET_GENERIC</code>).
-</li>
-</ul>
-
-<p>
-The following code snippet shows an example of how to set the Android audio stream type on an audio
-player:
-</p>
-
-<pre>
-// CreateAudioPlayer and specify SL_IID_ANDROIDCONFIGURATION
-// in the required interface ID array. Do not realize player yet.
-// ...
-SLAndroidConfigurationItf playerConfig;
-result = (*playerObject)->GetInterface(playerObject,
- SL_IID_ANDROIDCONFIGURATION, &playerConfig);
-assert(SL_RESULT_SUCCESS == result);
-SLint32 streamType = SL_ANDROID_STREAM_ALARM;
-result = (*playerConfig)->SetConfiguration(playerConfig,
- SL_ANDROID_KEY_STREAM_TYPE, &streamType, sizeof(SLint32));
-assert(SL_RESULT_SUCCESS == result);
-// ...
-// Now realize the player here.
-</pre>
-
-<p>
-You can use similar code to configure the preset for an audio recorder:
-</p>
-<pre>
-// ... obtain the configuration interface as the first four lines above, then:
-SLuint32 presetValue = SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION;
-result = (*playerConfig)->SetConfiguration(playerConfig,
- RECORDING_PRESET, &presetValue, sizeof(SLuint32));
-</pre>
-
-<h3>Android effects interfaces</h3>
-
-<p>
-Android's effect, effect send, and effect capabilities interfaces provide
-a generic mechanism for an application to query and use device-specific
-audio effects. Device manufacturers should document any available device-specific audio effects
-that they provide.
-</p>
-
-<p>
-Portable applications should use the OpenSL ES 1.0.1 APIs for audio effects instead of the Android
-effect extensions.
-</p>
-
-<h3>Android file descriptor data locator</h3>
-
-<p>
-The Android file descriptor data locator permits you to specify the source for an
-audio player as an open file descriptor with read access. The data format must be MIME.
-</p>
-<p>
-This extension is especially useful in conjunction with the native asset manager, because
-the app reads assets from the APK via a file descriptor.
-</p>
-
-<h3 id="simple">Android simple buffer queue data locator and interface</h3>
-
-<p>
-The Android simple buffer queue data locator and interface are
-identical to those in the OpenSL ES 1.0.1 reference specification, with two exceptions: You
-can also use Android simple buffer queues with both audio players and audio recorders. Also, PCM
-is the only data format you can use with these queues.
-In the reference specification, buffer queues are for audio players only, but they are
-compatible with data formats beyond PCM.
-</p>
-<p>
-For recording, your app should enqueue empty buffers. When a registered callback sends
-notification that the system has finished writing data to the buffer, the app can
-read the buffer.
-</p>
-<p>
-Playback works in the same way. For future source code
-compatibility, however, we suggest that applications use Android simple
-buffer queues instead of OpenSL ES 1.0.1 buffer queues.
-</p>
-
-<h3 id="dynamic-interfaces">Dynamic interfaces at object creation</h3>
-
-<p>
-For convenience, the Android implementation of OpenSL ES 1.0.1
-permits your app to specify dynamic interfaces when it instantiates an object.
-This is an alternative to using <code>DynamicInterfaceManagement::AddInterface()</code>
-to add these interfaces after instantiation.
-</p>
-
-<h3 id="bq-behavior">Buffer queue behavior</h3>
-
-<p>
-The Android implementation does not include the
-reference specification's requirement that the play cursor return to the beginning
-of the currently playing buffer when playback enters the {@code SL_PLAYSTATE_STOPPED}
-state. This implementation can conform to that behavior, or it can leave the location of the play
-cursor unchanged.
-</p>
-
-<p>
-As a result, your app cannot assume that either behavior occurs. Therefore,
-you should explicitly call the <code>BufferQueue::Clear()</code> method after a transition to
-<code>SL_PLAYSTATE_STOPPED</code>. Doing so sets the buffer queue to a known state.
-</p>
-
-<p>
-Similarly, there is no specification governing whether the trigger for a buffer queue callback must
-be a transition to <code>SL_PLAYSTATE_STOPPED</code> or execution of
-<code>BufferQueue::Clear()</code>. Therefore, we recommend that you do not create a dependency on
-one or the other; instead, your app should be able to handle both.
-</p>
-
-<h3>Reporting of extensions</h3>
-<p>
-There are three methods for querying whether the platform supports the Android extensions. These
-methods are:
-</p>
-
-<ul>
-<li><code>Engine::QueryNumSupportedExtensions()</code></li>
-<li><code>Engine::QuerySupportedExtension()</code></li>
-<li><code>Engine::IsExtensionSupported()</code></li>
-</ul>
-
-<p>
-Any of these methods returns <code>ANDROID_SDK_LEVEL_<API-level></code>,
-where {@code API-level} is the platform API level; for example, {@code ANDROID_SDK_LEVEL_23}.
-A platform API level of 9 or higher means that the platform supports the extensions.
-</p>
-
-
-<h3 id="da">Decode audio to PCM</h3>
-
-<p>
-This section describes a deprecated Android-specific extension to OpenSL ES 1.0.1
-for decoding an encoded stream to PCM without immediate playback.
-The table below gives recommendations for use of this extension and alternatives.
-</p>
-
-<table>
-<tr>
- <th>API level</th>
- <th>Alternatives</th>
-</tr>
-<tr>
- <td>13 and below</td>
- <td>An open-source codec with a suitable license</td>
-</tr>
-<tr>
- <td>14 to 15</td>
- <td>An open-source codec with a suitable license</td>
-</tr>
-<tr>
- <td>16 to 20</td>
- <td>
- The {@link android.media.MediaCodec} class or an open-source codec with a suitable license
- </td>
-</tr>
-<tr>
- <td>21 and above</td>
- <td>
- NDK MediaCodec in the {@code <media/NdkMedia*.h>} header files, the
- {@link android.media.MediaCodec} class, or an open-source codec with a suitable license
- </td>
-</tr>
-</table>
-
-<p class="note"><strong>Note: </strong>
-There is currently no documentation for the NDK version of the {@code MediaCodec} API. However,
-you can refer to the
-<a class="external-link" href="https://github.com/googlesamples/android-ndk/tree/master/native-codec">
-native-codec</a> sample code for an example.
-</p>
-
-<p>
-A standard audio player plays back to an audio device, specifying the output mix as the data sink.
-The Android extension differs in that an audio player instead
-acts as a decoder if the app has specified the data source either as a URI or as an Android
-file descriptor data locator described in MIME data format. In such a case, the data sink is
-an Android simple buffer queue data locator with PCM data format.
-</p>
-
-<p>
-This feature is primarily intended for games to pre-load their audio assets when changing to a
-new game level, which is similar to the functionality that the {@link android.media.SoundPool}
-class provides.
-</p>
-
-<p>
-The application should initially enqueue a set of empty buffers in the Android simple
-buffer queue. After that, the app fills the buffers with PCM data. The Android simple
-buffer queue callback fires after each buffer is filled. The callback handler processes
-the PCM data, re-enqueues the now-empty buffer, and then returns. The application is responsible for
-keeping track of decoded buffers; the callback parameter list does not include
-sufficient information to indicate the buffer that contains data or the buffer that should be
-enqueued next.
-</p>
-
-<p>
-The data source implicitly reports the end of stream (EOS) by delivering a
-<code>SL_PLAYEVENT_HEADATEND</code> event at the end of the stream. After the app has decoded
-all of the data it received, it makes no further calls to the Android simple buffer queue callback.
-</p>
-<p>
-The sink's PCM data format typically matches that of the encoded data source
-with respect to sample rate, channel count, and bit depth. However, you can decode to a different
-sample rate, channel count, or bit depth.
-For information about a provision to detect the actual PCM format, see <a href="#meta">
-Determining the format of decoded PCM data via metadata</a>.
-</p>
-<p>
-OpenSL ES for Android's PCM decoding feature supports pause and initial seek; it does not support
-volume control, effects, looping, or playback rate.
-</p>
-<p>
-Depending on the platform implementation, decoding may require resources
-that cannot be left idle. Therefore, we recommend that you make sure to provide
-sufficient numbers of empty PCM buffers; otherwise, the decoder starves. This may happen,
-for example, if your app returns from the Android simple buffer queue callback without
-enqueueing another empty buffer. The result of decoder starvation is
-unspecified, but may include: dropping the decoded
-PCM data, pausing the decoding process, or terminating the decoder outright.
-</p>
-
-<p class="note"><strong>Note: </strong>
-To decode an encoded stream to PCM but not play back immediately, for apps running on
-Android 4.x (API levels 16–20), we recommend using the {@link android.media.MediaCodec} class.
-For new applications running on Android 5.0 (API level 21) or higher, we recommend using the NDK
-equivalent, {@code <NdkMedia*.h>}. These header files reside in
-the {@code media/} directory under your installation root.
-</p>
-
-<h3>Decode streaming ADTS AAC to PCM</h3>
-
-<p>
-An audio player acts as a streaming decoder if the data source is an
-Android buffer queue data locator with MIME data format, and the data
-sink is an Android simple buffer queue data locator with PCM data format.
-Configure the MIME data format as follows:
-</p>
-
-<ul>
-<li>Container: {@code SL_CONTAINERTYPE_RAW}</li>
-<li>MIME type string: {@code SL_ANDROID_MIME_AACADTS}</li>
-</ul>
-
-<p>
-This feature is primarily intended for streaming media applications that
-deal with AAC audio but need to perform custom audio processing
-prior to playback. Most applications that need to decode audio to PCM
-should use the method that <a href="#da">Decode audio to PCM</a> describes,
-as that method is simpler and handles more audio formats. The technique described
-here is a more specialized approach, to be used only if both of these
-conditions apply:
-</p>
-
-<ul>
-<li>The compressed audio source is a stream of AAC frames contained in ADTS headers.
-</li>
-<li>The application manages this stream. The data is <em>not</em> located within
-a network resource whose identifier is a URI or within a local file whose identifier is
-a file descriptor.
-</li>
-</ul>
-
-<p>
-The application should initially enqueue a set of filled buffers in the Android buffer queue.
-Each buffer contains one or more complete ADTS AAC frames.
-The Android buffer queue callback fires after each buffer is emptied.
-The callback handler should refill and re-enqueue the buffer, and then return.
-The application need not keep track of encoded buffers; the callback parameter
-list includes sufficient information to indicate the buffer that should be enqueued next.
-The end of stream is explicitly marked by enqueuing an EOS item.
-After EOS, no more enqueues are permitted.
-</p>
-
-<p>
-We recommend that you make sure to provide full
-ADTS AAC buffers, to avoid starving the decoder. This may happen, for example, if your app
-returns from the Android buffer queue callback without enqueueing another full buffer.
-The result of decoder starvation is unspecified.
-</p>
-
-<p>
-In all respects except for the data source, the streaming decode method is the same as
-the one that <a href="#da">Decode audio to PCM</a> describes.
-</p>
-
-<p>
-Despite the similarity in names, an Android buffer queue is <em>not</em>
-the same as an <a href="#simple">Android simple buffer queue</a>. The streaming decoder
-uses both kinds of buffer queues: an Android buffer queue for the ADTS
-AAC data source, and an Android simple buffer queue for the PCM data
-sink. For more information about the Android simple buffer queue API, see <a href="#simple">Android
-simple buffer queue data locator and interface</a>.
-For more information about the Android buffer queue API, see the {@code index.html} file in
-the {@code docs/Additional_library_docs/openmaxal/} directory under the installation root.
-</p>
-
-<h3 id="meta">Determining the format of decoded PCM data via metadata</h3>
-
-<p>
-The <code>SLMetadataExtractionItf</code> interface is part of the reference specification.
-However, the metadata keys that indicate the actual format of decoded PCM data are specific to
-Android. The <code>OpenSLES_AndroidMetadata.h</code> header file defines these metadata keys.
-This header file resides under your installation root, in the
-{@code platforms/android-<version>/<abi>/include/SLES} directory.
-</p>
-
-<p>
-The metadata key indices are available immediately after
-the <code>Object::Realize()</code> method finishes executing. However, the associated values are not
-available until after the app decodes the first encoded data. A good
-practice is to query for the key indices in the main thread after calling the {@code
-Object::Realize} method, and to read the PCM format metadata values in the Android simple
-buffer queue callback handler when calling it for the first time. Consult the
-<a class="external-link" href="https://github.com/googlesamples/android-ndk">example code in the
-NDK package</a> for examples of working with this interface.
-</p>
-
-<p>
-Metadata key names are stable, but the key indices are not documented,
-and are subject to change. An application should not assume that indices
-are persistent across different execution runs, and should not assume that
-multiple object instances share indices within the same run.
-</p>
-
-<h3 id="fp">Floating-point data</h3>
-
-<p>
-An app running on Android 5.0 (API level 21) and higher can supply data to an AudioPlayer in
-single-precision, floating-point format.
-</p>
-<p>
-In following example code, the {@code Engine::CreateAudioPlayer} method creates an audio player
-that uses floating-point data:
-</p>
-
-<pre>
-#include <SLES/OpenSLES_Android.h>
-...
-SLAndroidDataFormat_PCM_EX pcm;
-pcm.formatType = SL_ANDROID_DATAFORMAT_PCM_EX;
-pcm.numChannels = 2;
-pcm.sampleRate = SL_SAMPLINGRATE_44_1;
-pcm.bitsPerSample = 32;
-pcm.containerSize = 32;
-pcm.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
-pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
-pcm.representation = SL_ANDROID_PCM_REPRESENTATION_FLOAT;
-...
-SLDataSource audiosrc;
-audiosrc.pLocator = ...
-audiosrc.pFormat = &pcm;
-</pre>
-
-<h2 id="notes">Programming Notes</h2>
-<p><a href="{@docRoot}ndk/guides/audio/opensl-prog-notes.html">OpenSL ES Programming Notes</a>
- provides supplemental information to ensure proper implementation of OpenSL ES.</p>
-<p class="note"><strong>Note: </strong>
-For your convenience, we have included a copy of the OpenSL ES 1.0.1 specification with the NDK in
-{@code docs/opensles/OpenSL_ES_Specification_1.0.1.pdf}.
-</p>
-
-<h2 id="platform-issues">Platform Issues</h2>
-
-<p>
-This section describes known issues in the initial platform release that supports these APIs.
-</p>
-
-<h3>Dynamic interface management</h3>
-
-<p>
-{@code DynamicInterfaceManagement::AddInterface} does not work. Instead, specify the interface in
-the array that is passed to Create, as shown in the example code for environmental reverb.
-</p>
-
diff --git a/docs/html/ndk/guides/audio/opensl-prog-notes.jd b/docs/html/ndk/guides/audio/opensl-prog-notes.jd
deleted file mode 100644
index e70aa08..0000000
--- a/docs/html/ndk/guides/audio/opensl-prog-notes.jd
+++ /dev/null
@@ -1,461 +0,0 @@
-page.title=OpenSL ES Programming Notes
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#init">Objects and Interface Initialization</a></li>
- <li><a href="#prefetch">Audio Player Prefetch</a></li>
- <li><a href="#destroy">Destroy</a></li>
- <li><a href="#panning">Stereo Panning</a></li>
- <li><a href="#callbacks">Callbacks and Threads</a></li>
- <li><a href="#perform">Performance</a></li>
- <li><a href="#sandp">Security and Permissions</a></li>
- </ol>
- </div>
-</div>
-
-<p>
-The notes in this section supplement the
-<a class="external-link" href="https://www.khronos.org/registry/sles/">OpenSL ES 1.0.1
-specification</a>.
-</p>
-
-<h2 id="init">Objects and Interface Initialization</h2>
-
-<p>
-Two aspects of the OpenSL ES programming model that may be unfamiliar to new developers are the
-distinction between objects and interfaces, and the initialization sequence.
-</p>
-
-<p>
-Briefly, an OpenSL ES object is similar to the object concept in
- programming languages such as Java
-and C++, except an OpenSL ES object is only visible via its associated interfaces.
- This includes
-the initial interface for all objects, called {@code SLObjectItf}.
- There is no handle for an object
-itself, only a handle to the {@code SLObjectItf} interface of the object.
-</p>
-
-<p>
-An OpenSL ES object is first <em>created</em>, which returns an {@code SLObjectItf}, then
-<em>realized</em>. This is similar to the common programming pattern of first constructing an
-object (which should never fail other than for lack of memory or invalid parameters), and then
-completing initialization (which may fail due to lack of resources). The realize step gives the
-implementation a logical place to allocate additional resources if needed.
-</p>
-
-<p>
-As part of the API to create an object, an application specifies an array of desired interfaces
-that it plans to acquire later. Note that this array does not automatically
- acquire the interfaces;
-it merely indicates a future intention to acquire them. Interfaces are distinguished as
-<em>implicit</em> or <em>explicit</em>. An explicit interface must be listed in the array if it
-will be acquired later. An implicit interface need not be listed in the
- object create array, but
-there is no harm in listing it there. OpenSL ES has one more kind of interface called
-<em>dynamic</em>, which does not need to be specified in the object
- create array and can be added
-later after the object is created. The Android implementation provides
- a convenience feature to
-avoid this complexity, which is described in
- <a href="{@docRoot}ndk/guides/audio/opensl-for-android.html#dynamic-interfaces">Dynamic interfaces at object creation</a>.
-</p>
-
-<p>
-After the object is created and realized, the application should acquire interfaces for each
-feature it needs, using {@code GetInterface} on the initial {@code SLObjectItf}.
-</p>
-
-<p>
-Finally, the object is available for use via its interfaces, though note that
- some objects require
-further setup. In particular, an audio player with URI data source needs a bit
- more preparation in
-order to detect connection errors. See the
- <a href="#prefetch">Audio player prefetch</a> section for details.
-</p>
-
-<p>
-After your application is done with the object, you should explicitly destroy it; see the
-<a href="#destroy">Destroy</a> section below.
-</p>
-
-<h2 id="prefetch">Audio Player Prefetch</h2>
-
-<p>
-For an audio player with URI data source, {@code Object::Realize} allocates
- resources but does not
-connect to the data source (<em>prepare</em>) or begin pre-fetching data. These occur once the
-player state is set to either {@code SL_PLAYSTATE_PAUSED} or {@code SL_PLAYSTATE_PLAYING}.
-</p>
-
-<p>
-Some information may still be unknown until relatively late in this sequence. In
-particular, initially {@code Player::GetDuration} returns {@code SL_TIME_UNKNOWN} and
-{@code MuteSolo::GetChannelCount} either returns successfully with channel count zero or the
-error result {@code SL_RESULT_PRECONDITIONS_VIOLATED}. These APIs return the proper values
-once they are known.
-</p>
-
-<p>
-Other properties that are initially unknown include the sample rate and
- actual media content type
-based on examining the content's header (as opposed to the
- application-specified MIME type and
-container type). These are also determined later during
- prepare/prefetch, but there are no APIs to
-retrieve them.
-</p>
-
-<p>
-The prefetch status interface is useful for detecting when all information
- is available, or your
-application can poll periodically. Note that some information, such as the
- duration of a streaming
-MP3, may <em>never</em> be known.
-</p>
-
-<p>
-The prefetch status interface is also useful for detecting errors. Register a callback
- and enable
-at least the {@code SL_PREFETCHEVENT_FILLLEVELCHANGE} and {@code SL_PREFETCHEVENT_STATUSCHANGE}
-events. If both of these events are delivered simultaneously, and
-{@code PrefetchStatus::GetFillLevel} reports a zero level, and
-{@code PrefetchStatus::GetPrefetchStatus} reports {@code SL_PREFETCHSTATUS_UNDERFLOW},
- then this
-indicates a non-recoverable error in the data source. This includes the inability to
- connect to the
-data source because the local filename does not exist or the network URI is invalid.
-</p>
-
-<p>
-The next version of OpenSL ES is expected to add more explicit support for
- handling errors in the
-data source. However, for future binary compatibility, we intend to continue
- to support the current
-method for reporting a non-recoverable error.
-</p>
-
-<p>
-In summary, a recommended code sequence is:
-</p>
-
-<ol>
- <li>{@code Engine::CreateAudioPlayer}</li>
- <li>{@code Object:Realize}</li>
- <li>{@code Object::GetInterface} for {@code SL_IID_PREFETCHSTATUS}</li>
- <li>{@code PrefetchStatus::SetCallbackEventsMask}</li>
- <li>{@code PrefetchStatus::SetFillUpdatePeriod}</li>
- <li>{@code PrefetchStatus::RegisterCallback}</li>
- <li>{@code Object::GetInterface} for {@code SL_IID_PLAY}</li>
- <li>{@code Play::SetPlayState} to {@code SL_PLAYSTATE_PAUSED}, or
- {@code SL_PLAYSTATE_PLAYING}</li>
-</ol>
-
-<p class="note"><strong>Note: </strong>
-Preparation and prefetching occur here; during this time your callback is called with
-periodic status updates.
-</p>
-
-<h2 id="destroy">Destroy</h2>
-
-<p>
-Be sure to destroy all objects when exiting from your application.
- Objects should be destroyed in
-reverse order of their creation, as it is not safe to destroy an object that has any dependent
-objects. For example, destroy in this order: audio players and recorders, output mix, and then
-finally the engine.
-</p>
-
-<p>
-OpenSL ES does not support automatic garbage collection or
-<a class="external-link" href="http://en.wikipedia.org/wiki/Reference_counting">reference
-counting</a> of interfaces. After you call {@code Object::Destroy}, all extant
- interfaces that are
-derived from the associated object become undefined.
-</p>
-
-<p>
-The Android OpenSL ES implementation does not detect the incorrect use of such interfaces.
-Continuing to use such interfaces after the object is destroyed can cause your application to
-crash or behave in unpredictable ways.
-</p>
-
-<p>
-We recommend that you explicitly set both the primary object interface and all associated
-interfaces to NULL as part of your object destruction sequence, which prevents the accidental
-misuse of a stale interface handle.
-</p>
-
-<h2 id="panning">Stereo Panning</h2>
-
-<p>
-When {@code Volume::EnableStereoPosition} is used to enable stereo panning of a mono source,
- there is a 3-dB reduction in total
-<a class="external-link" href="http://en.wikipedia.org/wiki/Sound_power_level">sound power
-level</a>. This is needed to permit the total sound power level to remain constant as
- the source is
-panned from one channel to the other. Therefore, only enable stereo positioning if you need
-it. See the Wikipedia article on
-<a class="external-link" href="http://en.wikipedia.org/wiki/Panning_(audio)">audio panning</a>
- for more information.
-</p>
-
-<h2 id="callbacks">Callbacks and Threads</h2>
-
-<p>
-Callback handlers are generally called synchronously with respect to the event. That is, at the
-moment and location that the event is detected by the implementation. This point is
-asynchronous with respect to the application, so you should use a non-blocking synchronization
-mechanism to control access to any variables shared between the application and the callback
-handler. In the example code, such as for buffer queues, we have either omitted this
-synchronization or used blocking synchronization in the interest of simplicity. However, proper
-non-blocking synchronization is critical for any production code.
-</p>
-
-<p>
-Callback handlers are called from internal non-application threads that are not attached to the
-Android runtime, so they are ineligible to use JNI. Because these internal threads are
-critical to
-the integrity of the OpenSL ES implementation, a callback handler should also not block
- or perform
-excessive work.
-</p>
-
-<p>
-If your callback handler needs to use JNI or execute work that is not proportional to the
-callback, the handler should instead post an event for another thread to process. Examples of
-acceptable callback workload include rendering and enqueuing the next output buffer
-(for an AudioPlayer), processing the just-filled input buffer and enqueueing the next
- empty buffer
-(for an AudioRecorder), or simple APIs such as most of the <em>Get</em> family. See the
-<a href="#perform">Performance</a> section below regarding the workload.
-</p>
-
-<p>
-Note that the converse is safe: an Android application thread that has entered JNI
- is allowed to
-directly call OpenSL ES APIs, including those that block. However, blocking calls are not
-recommended from the main thread, as they may result in
- <em>Application Not Responding</em> (ANR).
-</p>
-
-<p>
-The determination regarding the thread that calls a callback handler is largely left up to the
-implementation. The reason for this flexibility is to permit future optimizations,
- especially on
-multi-core devices.
-</p>
-
-<p>
-The thread on which the callback handler runs is not guaranteed to have the same
- identity across
-different calls. Therefore, do not rely on the {@code pthread_t returned by pthread_self()}
- or the
-{@code pid_t returned by gettid()} to be consistent across calls. For the same reason,
- do not use
-the thread local storage (TLS) APIs such as {@code pthread_setspecific()} and
-{@code pthread_getspecific()} from a callback.
-</p>
-
-<p>
-The implementation guarantees that concurrent callbacks of the same kind, for the
- same object, does
-not occur. However, concurrent callbacks of different kinds for the same object are possible on
-different threads.
-</p>
-
-<h2 id="perform">Performance</h2>
-
-<p>
-As OpenSL ES is a native C API, non-runtime application threads that call OpenSL ES have no
-runtime-related overhead such as garbage collection pauses. With one exception described below,
-there is no additional performance benefit to the use of OpenSL ES other than this.
- In particular,
-the use of OpenSL ES does not guarantee enhancements such as lower audio latency and higher
-scheduling priority over that which the platform generally provides. On the other hand, as the
-Android platform and specific device implementations continue to evolve, an OpenSL ES application
-can expect to benefit from any future system performance improvements.
-</p>
-
-<p>
-One such evolution is support for reduced
-<a href="{@docRoot}ndk/guides/audio/output-latency.html">audio output latency</a>.
-The underpinnings for reduced
-output latency were first included in Android 4.1 (API level 16), and then
-continued progress occurred in Android 4.2 (API level 17). These improvements are available via
-OpenSL ES for device implementations that
- claim feature {@code android.hardware.audio.low_latency}.
-If the device doesn't claim this feature but supports Android 2.3 (API level 9)
-or later, then you can still use the OpenSL ES APIs but the output latency may be higher.
- The lower
-output latency path is used only if the application requests a buffer size and sample rate
- that are
-compatible with the device's native output configuration. These parameters are
- device-specific and
-should be obtained as described below.
-</p>
-
-<p>
-Beginning with Android 4.2 (API level 17), an application can query for the
-platform native or optimal output sample rate and buffer size for the device's primary output
-stream. When combined with the feature test just mentioned, an app can now configure itself
-appropriately for lower latency output on devices that claim support.
-</p>
-
-<p>
-For Android 4.2 (API level 17) and earlier, a buffer count of two or more is
-required for lower latency. Beginning with Android 4.3 (API level 18), a buffer
-count of one is sufficient for lower latency.
-</p>
-
-<p>
-All OpenSL ES interfaces for output effects preclude the lower latency path.
-</p>
-
-<p>
-The recommended sequence is as follows:
-</p>
-
-<ol>
- <li>Check for API level 9 or higher to confirm the use of OpenSL ES.</li>
- <li>Check for the {@code android.hardware.audio.low_latency} feature using code such as this:
- <pre>import android.content.pm.PackageManager;
-...
-PackageManager pm = getContext().getPackageManager();
-boolean claimsFeature = pm.hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY);
- </pre></li>
- <li>Check for API level 17 or higher to confirm the use of
- {@code android.media.AudioManager.getProperty()}.</li>
- <li>Get the native or optimal output sample rate and buffer size for this device's
- primary output
- stream using code such as this:
- <pre>import android.media.AudioManager;
-...
-AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-String sampleRate = am.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE));
-String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER));
- </pre>
- Note that {@code sampleRate} and {@code framesPerBuffer} are <em>strings</em>. First check for
- null and then convert to int using {@code Integer.parseInt()}.</li>
- <li>Now use OpenSL ES to create an AudioPlayer with PCM buffer queue data locator.</li>
-</ol>
-
-<p class="note"><strong>Note: </strong>
-You can use the
-<a class="external-link"
- href="https://play.google.com/store/apps/details?id=com.levien.audiobuffersize">
- Audio Buffer Size</a>
-test app to determine the native buffer size and sample rate for OpenSL ES audio
-applications on your audio device. You can also visit GitHub to view <a class="external-link"
-href="https://github.com/gkasten/high-performance-audio/tree/master/audio-buffer-size">
-audio-buffer-size</a> samples.
-
-<p>
-The number of lower latency audio players is limited. If your application requires more
-than a few
-audio sources, consider mixing your audio at the application level. Be sure to destroy your audio
-players when your activity is paused, as they are a global resource shared with other apps.
-</p>
-
-<p>
-To avoid audible glitches, the buffer queue callback handler must execute within a small and
-predictable time window. This typically implies no unbounded blocking on mutexes, conditions,
-or I/O operations. Instead consider <em>try locks</em>, locks and waits with timeouts, and
-<a class="external-link"
- href="https://source.android.com/devices/audio/avoiding_pi.html#nonBlockingAlgorithms">
- non-blocking algorithms</a>.
-</p>
-
-<p>
-The computation required to render the next buffer (for AudioPlayer) or consume the previous
-buffer (for AudioRecord) should take approximately the same amount of time for each callback.
-Avoid algorithms that execute in a non-deterministic amount of time or are <em>bursty</em> in
-their computations. A callback computation is bursty if the CPU time spent in any given callback
-is significantly larger than the average. In summary, the ideal is for the CPU execution time of
-the handler to have variance near zero, and for the handler to not block for unbounded times.
-</p>
-
-<p>
-Lower latency audio is possible for these outputs only:
-</p>
-
-<ul>
- <li>On-device speakers.</li>
- <li>Wired headphones.</li>
- <li>Wired headsets.</li>
- <li>Line out.</li>
- <li><a class="external-link" href="https://source.android.com/devices/audio/usb.html">
- USB digital
- audio</a>.</li>
-</ul>
-
-<p>
-On some devices, speaker latency is higher than other paths due to digital signal processing for
-speaker correction and protection.
-</p>
-
-<p>
-As of API level 21,
-<a href="{@docRoot}ndk/guides/audio/input-latency.html">lower latency audio input</a>
- is supported
-on select devices. To take advantage of
-this feature, first confirm that lower latency output is available as described above. The
-capability for lower latency output is a prerequisite for the lower latency input feature. Then,
-create an AudioRecorder with the same sample rate and buffer size as would be used for output.
-OpenSL ES interfaces for input effects preclude the lower latency path. The record preset
-{@code SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION} must be used for lower latency; this preset
-disables device-specific digital signal processing that may add latency to the input path. For
-more information on record presets, see the <a href="#configuration-interface">Android
-configuration interface</a> section above.
-</p>
-
-<p>
-For simultaneous input and output, separate buffer queue completion handlers are used for each
-side. There is no guarantee of the relative order of these callbacks, or the synchronization of
-the audio clocks, even when both sides use the same sample rate. Your application
- should buffer the
-data with proper buffer synchronization.
-</p>
-
-<p>
-One consequence of potentially independent audio clocks is the need for asynchronous sample rate
-conversion. A simple (though not ideal for audio quality) technique for asynchronous sample rate
-conversion is to duplicate or drop samples as needed near a zero-crossing point.
- More sophisticated
-conversions are possible.
-</p>
-
-<h2 id="sandp">Security and Permissions</h2>
-
-<p>
-As far as who can do what, security in Android is done at the process level. Java programming
-language code cannot do anything more than native code, nor can native code do anything more than
-Java programming language code. The only differences between them are the available APIs.
-</p>
-
-<p>
-Applications using OpenSL ES must request the permissions that they would need for similar
-non-native APIs. For example, if your application records audio, then it needs the
-{@code android.permission.RECORD_AUDIO} permission. Applications that use audio effects need
-{@code android.permission.MODIFY_AUDIO_SETTINGS}. Applications that play network URI resources
-need {@code android.permission.NETWORK}. See
-<a href="https://developer.android.com/training/permissions/index.html">Working with System
-Permissions</a> for more information.
-</p>
-
-<p>
-Depending on the platform version and implementation, media content parsers and
- software codecs may
-run within the context of the Android application that calls OpenSL ES (hardware codecs are
-abstracted but are device-dependent). Malformed content designed to exploit parser and codec
-vulnerabilities is a known attack vector. We recommend that you play media only from trustworthy
-sources or that you partition your application such that code that handles media from
-untrustworthy sources runs in a relatively <em>sandboxed</em> environment. For example, you could
-process media from untrustworthy sources in a separate process. Though both processes would still
-run under the same UID, this separation does make an attack more difficult.
-</p>
diff --git a/docs/html/ndk/guides/audio/output-latency.jd b/docs/html/ndk/guides/audio/output-latency.jd
deleted file mode 100644
index 4aa97a6..0000000
--- a/docs/html/ndk/guides/audio/output-latency.jd
+++ /dev/null
@@ -1,310 +0,0 @@
-page.title=Audio Output Latency
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#prereq">Prerequisites</a></li>
- <li><a href="#low-lat-track">Obtain a Low-Latency Track</a></li>
- <li><a href="#buffer-size">Use the Optimal Buffer Size When Enqueuing Audio Data</a></li>
- <li><a href="#warmup-lat">Avoid Warmup Latency</a></li>
- </ol>
- <h2>Also read</h2>
-
- <ol>
- <li><a href="https://source.android.com/devices/audio/latency_app.html" class="external-link">
- Audio Latency for App Developers</a></li>
- <li><a href="https://source.android.com/devices/audio/latency_contrib.html" class="external-link">
- Contributors to Audio Latency</a></li>
- <li><a href="https://source.android.com/devices/audio/latency_measure.html" class="external-link">
- Measuring Audio Latency</a></li>
- <li><a href="https://source.android.com/devices/audio/warmup.html" class="external-link">
- Audio Warmup</a></li>
- <li><a href="https://en.wikipedia.org/wiki/Latency_%28audio%29" class="external-link">
- Latency (audio)</a></li>
- <li><a href="https://en.wikipedia.org/wiki/Round-trip_delay_time" class="external-link">
- Round-trip delay time</a></li>
- </ol>
- </div>
- </div>
-
-<a href="https://www.youtube.com/watch?v=PnDK17zP9BI" class="notice-developers-video">
-<div>
- <h3>Video</h3>
- <p>Audio latency: buffer sizes</p>
-</div>
-</a>
-
-<a href="https://www.youtube.com/watch?v=92fgcUNCHic" class="notice-developers-video">
-<div>
- <h3>Video</h3>
- <p>Building great multi-media experiences on Android</p>
-</div>
-</a>
-
-<p>This page describes how to develop your audio app for low-latency output and how to avoid
-warmup latency.</p>
-
-<h2 id="prereq">Prerequisites</h2>
-
-<p>Low-latency audio is currently only supported when using Android's implementation of the
-OpenSL ES™ API specification, and the Android NDK:
-</p>
-
-<ol>
- <li>Download and install the <a href="{@docRoot}tools/sdk/ndk/index.html">Android NDK</a>.</li>
- <li>Read the <a href="{@docRoot}ndk/guides/audio/opensl-for-android.html">OpenSL ES
- documentation</a>.
-</ol>
-
-<h2 id="low-lat-track">Obtain a Low-Latency Track</h2>
-
-<p>Latency is the time it takes for a signal to travel through a system. These are the common
-types of latency related to audio apps:
-
-<ul>
- <li><strong>Audio output latency</strong> is the time between an audio sample being generated by an
-app and the sample being played through the headphone jack or built-in speaker.</li>
-
- <li><strong>Audio input latency</strong> is the time between an audio signal being received by a
-device’s audio input, such as the microphone, and that same audio data being available to an
-app.</li>
-
- <li><strong>Round-trip latency</strong> is the sum of input latency, app processing time, and
- output latency.</li>
-
- <li><strong>Touch latency</strong> is the time between a user touching the screen and that
-touch event being received by an app.</li>
-</ul>
-
-<p>It is difficult to test audio output latency in isolation since it requires knowing exactly
-when the first sample is sent into the audio path (although this can be done using a
-<a href="https://source.android.com/devices/audio/testing_circuit.html" class="external-link">
-light testing circuit</a> and an oscilloscope). If you know the round-trip audio latency, you can
-use the rough rule of thumb: <strong>audio output latency is half the round-trip audio latency
-over paths without signal processing</strong>.
-</p>
-
-<p>To obtain the lowest latency, you must supply audio data that matches the device's optimal
-sample rate and buffer size. For more information, see
-<a href="https://source.android.com/devices/audio/latency_design.html" class="external-link">
-Design For Reduced Latency</a>.</p>
-
-<h3>Obtain the optimal sample rate</h3>
-
-<p>In Java, you can obtain the optimal sample rate from AudioManager as shown in the following
-code example:</p>
-
-<pre>
-AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-String frameRate = am.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
-int frameRateInt = Integer.parseInt(frameRate);
-if (frameRateInt == 0) frameRateInt = 44100; // Use a default value if property not found
-</pre>
-
-<p class="note">
- <strong>Note:</strong> The sample rate refers to the rate of each stream. If your source audio
- has two channels (stereo), then you will have one stream playing a pair of samples (frame) at
- <a href="{@docRoot}reference/android/media/AudioManager.html#PROPERTY_OUTPUT_SAMPLE_RATE">
- PROPERTY_OUTPUT_SAMPLE_RATE</a>.
-</p>
-
-<h3>Use the optimal sample rate when creating your audio player</h3>
-
-<p>Once you have the optimal sample output rate, you can supply it when creating your player
-using OpenSL ES:</p>
-
-<pre>
-// create buffer queue audio player
-void Java_com_example_audio_generatetone_MainActivity_createBufferQueueAudioPlayer
- (JNIEnv* env, jclass clazz, jint sampleRate, jint framesPerBuffer)
-{
- ...
- // specify the audio source format
- SLDataFormat_PCM format_pcm;
- format_pcm.numChannels = 2;
- format_pcm.samplesPerSec = (SLuint32) sampleRate * 1000;
- ...
-}
-</pre>
-
-<p class="note">
- <strong>Note:</strong> {@code samplesPerSec} refers to the <em>sample rate per channel in
- millihertz</em> (1 Hz = 1000 mHz).
-</p>
-
-<h3>Avoid adding output interfaces that involve signal processing</h3>
-
-<p>Only these interfaces are supported by the fast mixer:</p>
-
-<ul>
- <li>SL_IID_ANDROIDSIMPLEBUFFERQUEUE</li>
- <li>SL_IID_VOLUME</li>
- <li>SL_IID_MUTESOLO</li>
-</ul>
-
-<p>These interfaces are not allowed because they involve signal processing and will cause
-your request for a fast-track to be rejected:</p>
-
-<ul>
- <li>SL_IID_BASSBOOST</li>
- <li>SL_IID_EFFECTSEND</li>
- <li>SL_IID_ENVIRONMENTALREVERB</li>
- <li>SL_IID_EQUALIZER</li>
- <li>SL_IID_PLAYBACKRATE</li>
- <li>SL_IID_PRESETREVERB</li>
- <li>SL_IID_VIRTUALIZER</li>
- <li>SL_IID_ANDROIDEFFECT</li>
- <li>SL_IID_ANDROIDEFFECTSEND</li>
-</ul>
-
-<p>When you create your player, make sure you only add <em>fast</em> interfaces, as shown in
-the following example:</p>
-
-<pre>
-const SLInterfaceID interface_ids[2] = { SL_IID_ANDROIDSIMPLEBUFFERQUEUE, SL_IID_VOLUME };
-</pre>
-
-<h3>Verify you're using a low-latency track</h3>
-
-<p>Complete these steps to verify that you have successfully obtained a low-latency track:</p>
-
-<ol>
- <li>Launch your app and then run the following command:</li>
-
-<pre>
-adb shell ps | grep your_app_name
-</pre>
-
- <li>Make a note of your app's process ID.</li>
-
- <li>Now, play some audio from your app. You have approximately three seconds to run the
-following command from the terminal:</li>
-
-<pre>
-adb shell dumpsys media.audio_flinger
-</pre>
-
- <li>Scan for your process ID. If you see an <em>F</em> in the <em>Name</em> column, it's on a
-low-latency track (the F stands for <em>fast track</em>).</li>
-
-</ol>
-
-<h3>Measure round-trip latency</h3>
-
-<p>You can measure round-trip audio latency by creating an app that generates an audio signal,
-listens for that signal, and measures the time between sending it and receiving it.
-Alternatively, you can install this
-<a href="https://play.google.com/store/apps/details?id=org.drrickorang.loopback" class="external-link">
-latency testing app</a>. This performs a round-trip latency test using the
-<a href="https://source.android.com/devices/audio/latency_measure.html#larsenTest" class="external-link">
-Larsen test</a>. You can also
-<a href="https://github.com/gkasten/drrickorang/tree/master/LoopbackApp" class="external-link">
-view the source code</a> for the latency testing app.</p>
-
-<p>Since the lowest latency is achieved over audio paths with minimal signal processing, you may
-also want to use an
-<a href="https://source.android.com/devices/audio/latency_measure.html#loopback" class="external-link">
-Audio Loopback Dongle</a>, which allows the test to be run over the headset connector.</p>
-
-<p>The lowest possible round-trip audio latency varies greatly depending on device model and
-Android build. You can measure it yourself using the latency testing app and loopback
-dongle. When creating apps for <em>Nexus devices</em>, you can also use the
-<a href="https://source.android.com/devices/audio/latency_measurements.html" class="external-link">
-published measurements</a>.</p>
-
-<p>You can also get a rough idea of audio performance by testing whether the device reports
-support for the
-<a href="http://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_AUDIO_LOW_LATENCY">
-low_latency</a> and
-<a href="http://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_AUDIO_PRO">
-pro</a> hardware features.</p>
-
-<h3>Review the CDD and audio latency</h3>
-
-<p>The Android Compatibility Definition Document (CDD) enumerates the hardware and software
-requirements of a compatible Android device.
-See <a href="https://source.android.com/compatibility/" class="external-link">
-Android Compatibility</a> for more information on the overall compatibility program, and
-<a href="https://static.googleusercontent.com/media/source.android.com/en//compatibility/android-cdd.pdf" class="external-link">
-CDD</a> for the actual CDD document.</p>
-
-<p>In the CDD, round-trip latency is specified as 20 ms or lower (even though musicians
-generally require 10 ms). This is because there are important use cases that are enabled by
-20 ms.</p>
-
-<p>There is currently no API to determine audio latency over any path on an Android device at
-runtime. You can, however, use the following hardware feature flags to find out whether the
-device makes any guarantees for latency:</p>
-
-<ul>
- <li><a href="http://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_AUDIO_LOW_LATENCY">
-android.hardware.audio.low_latency</a> indicates a continuous output latency of 45 ms or
-less.</li>
-
- <li><a href="http://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_AUDIO_PRO">
-android.hardware.audio.pro</a> indicates a continuous round-trip latency of 20 ms or
-less.</li>
-</ul>
-
-<p>The criteria for reporting these flags is defined in the CDD in sections <em>5.6 Audio
-Latency</em> and <em>5.10 Professional Audio</em>.</p>
-
-<p>Here’s how to check for these features in Java:</p>
-
-<pre>
-boolean hasLowLatencyFeature =
- getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY);
-
-boolean hasProFeature =
- getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_PRO);
-</pre>
-
-<p>Regarding the relationship of audio features, the {@code android.hardware.audio.low_latency}
-feature is a prerequisite for {@code android.hardware.audio.pro}. A device can implement
-{@code android.hardware.audio.low_latency} and not {@code android.hardware.audio.pro}, but not
-vice-versa.</p>
-
-<h2 id="buffer-size">Use the Optimal Buffer Size When Enqueuing Audio Data</h2>
-
-<p>You can obtain the optimal buffer size in a similar way to the optimal frame rate, using the
-AudioManager API:</p>
-
-<pre>
-AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
-int framesPerBufferInt = Integer.parseInt(framesPerBuffer);
-if (framesPerBufferInt == 0) framesPerBufferInt = 256; // Use default
-</pre>
-
-<p>The
-<a href="{@docRoot}reference/android/media/AudioManager.html#PROPERTY_OUTPUT_FRAMES_PER_BUFFER">
-PROPERTY_OUTPUT_FRAMES_PER_BUFFER</a> property indicates the number of audio frames
-that the HAL (Hardware Abstraction Layer) buffer can hold. You should construct your audio
-buffers so that they contain an exact multiple of this number. If you use the correct number
-of audio frames, your callbacks occur at regular intervals, which reduces jitter.</p>
-
-<p>It is important to use the API to determine buffer size rather than using a hardcoded value,
- because HAL buffer sizes differ across devices and across Android builds.</p>
-
-<h2 id="warmup-lat">Avoid Warmup Latency</h2>
-
-<p>When you enqueue audio data for the first time, it takes a small, but still significant,
-amount of time for the device audio circuit to warm up. To avoid this warmup latency, you should
-enqueue buffers of audio data containing silence, as shown in the following code example:</p>
-
-<pre>
-#define CHANNELS 1
-static short* silenceBuffer;
-int numSamples = frames * CHANNELS;
-silenceBuffer = malloc(sizeof(*silenceBuffer) * numSamples);
- for (i = 0; i < numSamples; i++) {
- silenceBuffer[i] = 0;
- }
-</pre>
-
-<p>At the point when audio should be produced, you can switch to enqueuing buffers containing
-real audio data.</p>
-
diff --git a/docs/html/ndk/guides/audio/sample-rates.jd b/docs/html/ndk/guides/audio/sample-rates.jd
deleted file mode 100644
index da68597..0000000
--- a/docs/html/ndk/guides/audio/sample-rates.jd
+++ /dev/null
@@ -1,151 +0,0 @@
-page.title=Sample Rates
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#best">Best Practices for Sampling and Resampling</a></li>
- <li><a href="#info">For More Information</a></li>
- </ol>
- </div>
- </div>
-
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=6Dl6BdrA-sQ">
-<div>
- <h3>Video</h3>
- <p>Sample Rates: Why Can't We All Just Agree?</p>
-</div>
-</a>
-
-<p>As of Android 5.0 (Lollipop), the audio resamplers are now entirely based
-on FIR filters derived from a Kaiser windowed-sinc function. The Kaiser windowed-sinc
-offers the following properties:
-<ul>
- <li>It is straightforward to calculate for its design parameters (stopband
- ripple, transition bandwidth, cutoff frequency, filter length).</li>
-<li>It is nearly optimal for reduction of stopband energy compared to overall
-energy.</li>
-</ul>
-See P.P. Vaidyanathan, <a class="external-link"
-href="https://drive.google.com/file/d/0B7tBh7YQV0DGak9peDhwaUhqY2c/view">
-<i>Multirate Systems and Filter Banks</i></a>, p. 50 for discussions of the
-Kaiser Window and its optimality and relationship to Prolate Spheroidal
-Windows.</p>
-
-<p>The design parameters are automatically computed based on internal
-quality determination and the sampling ratios desired. Based on the
-design parameters, the windowed-sinc filter is generated. For music use,
-the resampler for 44.1 to 48 kHz and vice versa is generated at a higher
-quality than for arbitrary frequency conversion.</p>
-
-<p>The audio resamplers provide increased quality, as well as speed
-to achieve that quality. But resamplers can introduce small amounts
-of passband ripple and aliasing harmonic noise, and they can cause some high
-frequency loss in the transition band, so avoid using them unnecessarily.</p>
-
-<h2 id="best">Best Practices for Sampling and Resampling</h2>
-<p>This section describes some best practices to help you avoid problems with sampling rates.</p>
-<h3>Choose the sampling rate to fit the device</h3>
-
-<p>In general, it is best to choose the sampling rate to fit the device,
-typically 44.1 kHz or 48 kHz. Use of a sample rate greater than
-48 kHz will typically result in decreased quality because a resampler must be
-used to play back the file.</p>
-
-<h3>Use simple resampling ratios (fixed versus interpolated polyphases)</h3>
-
-<p>The resampler operates in one of the following modes:</p>
-<ul>
- <li>Fixed polyphase mode. The filter coefficients for each polyphase are precomputed.</li>
- <li>Interpolated polyphase mode. The filter coefficients for each polyphase must
-be interpolated from the nearest two precomputed polyphases.</li>
-</ul>
-<p>The resampler is fastest in fixed polyphase mode, when the ratio of input
-rate over output rate L/M (taking out the greatest common divisor)
-has M less than 256. For example, for 44,100 to 48,000 conversion, L = 147,
-M = 160.</p>
-
-<p>In fixed polyphase mode, the sampling rate is locked for as
-many samples converted and does not change. In interpolated polyphase
-mode, the sampling rate is approximate. The drift is generally on the
-order of one sample over a few hours of playback on a 48-kHz device.
-This is not usually a concern because approximation error is much less than
-frequency error of internal quartz oscillators, thermal drift, or jitter
- (typically tens of ppm).</p>
-
-<p>Choose simple-ratio sampling rates such as 24 kHz (1:2) and 32 kHz (2:3) when playing back
- on a 48-kHz device, even though other sampling
-rates and ratios may be permitted through AudioTrack.</p>
-
-<h3>Use upsampling rather than downsampling when changing sample rates</h3>
-
-<p>Sampling rates can be changed on the fly. The granularity of
-such change is based on the internal buffering (typically a few hundred
-samples), not on a sample-by-sample basis. This can be used for effects.</p>
-
-<p>Do not dynamically change sampling rates when
-downsampling. When changing sample rates after an audio track is
-created, differences of around 5 to 10 percent from the original rate may
-trigger a filter recomputation when downsampling (to properly suppress
-aliasing). This can consume computing resources and may cause an audible click
-if the filter is replaced in real time.</p>
-
-<h3>Limit downsampling to no more than 6:1</h3>
-
-<p>Downsampling is typically triggered by hardware device requirements. When the
- Sample Rate converter is used for downsampling,
-try to limit the downsampling ratio to no more than 6:1 for good aliasing
-suppression (for example, no greater downsample than 48,000 to 8,000). The filter
-lengths adjust to match the downsampling ratio, but you sacrifice more
-transition bandwidth at higher downsampling ratios to avoid excessively
-increasing the filter length. There are no similar aliasing concerns for
-upsampling. Note that some parts of the audio pipeline
-may prevent downsampling greater than 2:1.</p>
-
-<h3 id="latency">If you are concerned about latency, do not resample</h3>
-
-<p>Resampling prevents the track from being placed in the FastMixer
-path, which means that significantly higher latency occurs due to the additional,
- larger buffer in the ordinary Mixer path. Furthermore,
- there is an implicit delay from the filter length of the resampler,
- though this is typically on the order of one millisecond or less,
- which is not as large as the additional buffering for the ordinary Mixer path
- (typically 20 milliseconds).</p>
-
-<h2 id="info">For More Information</h2>
-<p>This section lists some additional resources about sampling and resampling.</p>
-
-<h3>Sample rates</h3>
-
-<p>
-<a href="http://en.wikipedia.org/wiki/Sampling_%28signal_processing%29" class="external-link" >
-Sampling (signal processing)</a> at Wikipedia.</p>
-
-<h3>Resampling</h3>
-
-<p><a href="http://en.wikipedia.org/wiki/Sample_rate_conversion" class="external-link" >
-Sample rate conversion</a> at Wikipedia.</p>
-
-<p><a href="http://source.android.com/devices/audio/src.html" class="external-link" >
-Sample Rate Conversion</a> at source.android.com.</p>
-
-<h3>The high bit-depth and high kHz controversy</h3>
-
-<p><a href="http://people.xiph.org/~xiphmont/demo/neil-young.html" class="external-link" >
-24/192 Music Downloads ... and why they make no sense</a>
-by Christopher "Monty" Montgomery of Xiph.Org.</p>
-
-<p><a href="https://www.youtube.com/watch?v=cIQ9IXSUzuM" class="external-link" >
-D/A and A/D | Digital Show and Tell</a>
-video by Christopher "Monty" Montgomery of Xiph.Org.</p>
-
-<p><a href="http://www.trustmeimascientist.com/2013/02/04/the-science-of-sample-rates-when-higher-is-better-and-when-it-isnt/" class="external-link">
-The Science of Sample Rates (When Higher Is Better - And When It Isn't)</a>.</p>
-
-<p><a href="http://www.image-line.com/support/FLHelp/html/app_audio.htm" class="external-link" >
-Audio Myths & DAW Wars</a></p>
-
-<p><a href="http://forums.stevehoffman.tv/threads/192khz-24bit-vs-96khz-24bit-debate-interesting-revelation.317660/" class="external-link">
-192kHz/24bit vs. 96kHz/24bit "debate"- Interesting revelation</a></p>
diff --git a/docs/html/ndk/guides/build.jd b/docs/html/ndk/guides/build.jd
deleted file mode 100644
index 6286328..0000000
--- a/docs/html/ndk/guides/build.jd
+++ /dev/null
@@ -1,18 +0,0 @@
-page.title=Building Your Project
-@jd:body
-
-<p>One of the NDK's core purposes is allowing you to build C and C++ source code into shared
-libraries that you can use in your app.</p>
-
-<p>This section explains how to build native binaries for use in your Android app. It begins by
-explaining the
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file, which
-defines properties specific to individual <i>modules</i>, or libraries. Then, it explains the
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file, which defines
-properties for all the modules that you use in your
-app. Next, it tells you how to use the <a href="{@docRoot}ndk/guides/ndk-build.html">
-{@code ndk-build}</a> script, which is what the NDK uses to build your sources. Last, it ventures
-into advanced territory, discussing how to incorporate the NDK into your own
-<a href="{@docRoot}ndk/guides/standalone_toolchain.html">toolchain</a>, if you prefer to
-build that way instead of using
-<a href="{@docRoot}ndk/guides/ndk-build.html">{@code ndk-build}</a>.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/concepts.jd b/docs/html/ndk/guides/concepts.jd
deleted file mode 100755
index 7879219..0000000
--- a/docs/html/ndk/guides/concepts.jd
+++ /dev/null
@@ -1,303 +0,0 @@
-page.title=Concepts
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#bb">Before Beginning</a></li>
- <li><a href="#intro">Introduction</a></li>
- <li><a href="#hiw">How It Works</a></li>
- <li><a href="#naa">Native Activities and Applications</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<h2 id="bb">Before Beginning</h2>
-
-<p>This guide assumes that you are already familiar with concepts inherent in native programming and
-in <a href="{@docRoot}developer/index.html">Android development</a>.</p>
-
-</ul>
-<h2 id="intro">Introduction</h2>
-
-<p>This section provides a high-level explanation of how the NDK works. The Android NDK is a set of
-tools allowing you to embed C or C++ (“native code”) into your Android apps. The ability to use
-native code in Android apps can be particularly useful to developers who wish to do one or more of
-the following:</p>
-<ul>
-<li>Port their apps between platforms.</li>
-<li>Reuse existing libraries, or provide their own libraries for reuse.
-</li>
-<li>Increase performance in certain cases, particularly computationally intensive ones like games.
-</li>
-</ul>
-<h2 id="hiw">How it Works</h2>
-
-<p>This section introduces the main components used in building a native application for Android,
-and goes on to describe the process of building and packaging.</p>
-<h3 id="mc">Main components</h3>
-
-<p>You should have an understanding of the following components as you build your app:</p>
-<ul>
-<li>ndk-build: The ndk-build script launches the build scripts at the heart of the NDK. These
-scripts:
-<ul>
-<li>Automatically probe your development system and app project file to determine what to build.</li>
-<li>Generate binaries.</li>
-<li>Copy the binaries to your app's project path.</li>
-</ul>
-<p>For more information, see
-<a href="{@docRoot}ndk/guides/ndk-build.html">ndk-build</a>.</p>
-</li>
-</ul>
-
-<ul>
-<li>Java: From your Java source, the Android build process generates {@code .dex}
-(Dalvik EXecutable) files, which are what the Android OS runs in the Dalvik Virtual Machine
-(“DVM”). Even if your app contains no Java source code at all, the build process still generates a
-{@code .dex} executable file within which the native component runs.
-
-<p>When developing Java components, use the {@code native} keyword to indicate methods implemented
-as native code. For example, the following function declaration tells the compiler that the
-implementation is in a native library:</p>
-
-
-
-<pre>
-public native int add(int x, int y);
-</pre>
-</li>
-</ul>
-
-<ul>
-<li>Native shared libraries: The NDK builds these libraries, or {@code .so} files, from your native
-source code.
-
-<p class="note"><strong>Note:</strong> If two libraries implement respective methods with the same
-signature, a link error occurs. In C, "signature" means method name only. In C++, "signature" means
-not only method name, but also its argument names and types.</p>
-</li>
-</ul>
-
-<ul>
-<li>Native static libraries: The NDK can also build static libraries, or {@code .a} files, which you
-can link against other libraries.</li>
-</ul>
-
-<ul>
-<li>Java Native Interface (JNI): The JNI is the interface via which the Java and C++ components
-talk to one another. This guide assumes knowledge of the JNI; for information about it, consult the
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/jniTOC.html">
-Java Native Interface Specification</a>.</li>
-</ul>
-
-<ul>
-<li>Application Binary Interface (ABI): The ABI defines exactly how your app's machine code is
-expected to interact with the system at runtime. The NDK builds {@code .so} files against these
-definitions. Different ABIs correspond to different architectures: The NDK includes ABI support for
-ARMEABI (default), MIPS, and x86. For more information, see
-<a href="{@docRoot}ndk/guides/abis.html">ABI Management</a>.</li>
-</ul>
-
-<ul>
-<li>Manifest: If you are writing an app with no Java component to it, you must declare the
-{@link android.app.NativeActivity} class in the
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest</a>.
-<a href="#naa">Native Activities and Applications</a> provides more detail on how to do this, under
-“Using the {@code native_activity.h} interface.”
-</li>
-</ul>
-
-<p>The following two items are only required for building using the
-<a href="{@docRoot}ndk/guides/ndk-build.html">{@code ndk-build}</a> script,
-and for debugging using the <a href="{@docRoot}ndk/guides/ndk-gdb.html">
-{@code ndk-gdb}</a> script.
-
-<ul>
-<li><a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>:
-You must create an <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> configuration file inside your {@code jni} folder. The {@code ndk-build}
-script looks at this file, which defines the module and its name, the source files to be compiled,
-build flags and libraries to link.</li>
-</ul>
-
-<ul>
-<li><a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>: This file
-enumerates and describes the modules that your app requires. This information includes:
-
-<ul>
-<li>ABIs used to compile for specific platforms.</li>
-<li>Toolchains.</li>
-<li>Standard libraries to include (static and dynamic STLport or default system).</li>
-</ul>
-</li>
-</ul>
-
-
-<h3 id="fl">Flow</h3>
-
-<p>The general flow for developing a native app for Android is as follows:</p>
-<ol type="1">
-<li>Design your app, deciding which parts to implement in Java, and which parts to implement as
-native code.
-
-<p class="note"><strong>Note:</strong> While it is possible to completely avoid Java, you are likely
-to find the Android Java framework useful for tasks including controlling the display and UI.</p>
-</li>
-<li>Create an Android app Project as you would for any other Android project.</li>
-<li>If you are writing a native-only app, declare the {@link android.app.NativeActivity} class in
-{@code AndroidManifest.xml}. For more information, see the <a href="#naa">Native Activities and
-Applications</a>.
-</li>
-<li>Create an {@code Android.mk} file describing the native library, including name, flags, linked
-libraries, and source files to be compiled in the "JNI" directory.</li>
-<li>Optionally, you can create an {@code Application.mk} file configuring the target ABIs,
-toolchain, release/debug mode, and STL. For any of these that you do not specify, the following
-default values are used, respectively:
-<ul>
-<li>
-ABI: armeabi
- </li>
-<li>
-Toolchain: GCC 4.8
- </li>
-<li>
-Mode: Release
- </li>
-<li>
-STL: system
-</ul>
-</li>
-<li>Place your native source under the project's {@code jni} directory.</li>
-<li>Use ndk-build to compile the native ({@code .so}, {@code .a}) libraries.</li>
-<li>Build the Java component, producing the executable {@code .dex} file.</li>
-<li>Package everything into an APK file, containing {@code .so}, {@code .dex}, and other files
-needed for your app to run.
-</ol>
-
-
-<h2 id="naa">Native Activities and Applications</h2>
-
-<p>The Android SDK provides a helper class, {@link android.app.NativeActivity}, that allows you to
-write a completely native activity. {@link android.app.NativeActivity} handles the communication
-between the Android framework and your native code, so you do not have to subclass it or call its
-methods. All you need to do is declare your application to be native in your
-{@code AndroidManifest.xml} file, and begin creating your native application.</p>
-
-<p>An Android application using {@link android.app.NativeActivity} still runs in its own virtual
-machine, sandboxed from other applications. You can therefore still access Android framework APIs
-through the JNI. In certain cases, however–such as for sensors, input events, and
-assets–the NDK provides native interfaces that you can use instead of having to call
-across the JNI. For more information about such support, see
-<a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Native APIs</a>.</p>
-
-<p>Regardless of whether or not you are developing a native activity, we recommend that you create
-your projects with the traditional Android build tools. Doing so helps ensure building and packaging
-of Android applications with the correct structure.</p>
-
-<p>The Android NDK provides you with two choices to implement your native activity:</p>
-
-<ul>
-<li>The <a href="{@docRoot}ndk/reference/native__activity_8h.html">{@code native_activity.h}</a>
-header defines the native version of the
-{@link android.app.NativeActivity} class. It contains the callback interface and data structures
-that you need to create your native activity. Because the main thread of your application handles
-the callbacks, your callback implementations must not be blocking. If they block, you might receive
-ANR (Application Not Responding) errors because your main thread is unresponsive until the callback
-returns.</li>
-<li>The {@code android_native_app_glue.h} file defines a static helper library built on top of the
-<a href="{@docRoot}ndk/reference/native__activity_8h.html">{@code native_activity.h}</a> interface.
-It spawns another thread, which handles things such as
-callbacks or input events in an event loop. Moving these events to a separate thread prevents any
-callbacks from blocking your main thread.</li>
-</ul>
-
-<p>The {@code <ndk_root>/sources/android/native_app_glue/android_native_app_glue.c} source is
-also available, allowing you to modify the implementation.</p>
-<p>For more information on how to use this static library, examine the native-activity sample
-application and its documentation. Further reading is also available in the comments in the {@code <ndk_root>/sources/android/native_app_glue/android_native_app_glue.h} file.</p>
-
-<h3 id="na">Using the native_activity.h interface</h3>
-
-<p>To implement a native activity with the
-<a href="{@docRoot}ndk/reference/native__activity_8h.html">{@code native_activity.h}</a>
-interface:</p>
-
-<ol type="1">
-<li>Create a {@code jni/} directory in your project's root directory. This directory stores all of
-your native code.</li>
-<li>Declare your native activity in the {@code AndroidManifest.xml} file.</li>
-
-<p>Because your application has no Java code, set {@code android:hasCode} to {@code false}.</p>
-
-<pre>
-<application android:label="@string/app_name" android:hasCode="false">
-</pre>
-
-<p>You must set the {@code android:name} attribute of the activity tag to
-{@link android.app.NativeActivity}.</p>
-
-<pre>
-<activity android:name="android.app.NativeActivity"
- android:label="@string/app_name">
-</pre>
-<p class="note"><strong>Note:</strong> You can subclass {@link android.app.NativeActivity}. If you
-do, use the name of the subclass instead of {@link android.app.NativeActivity}.</p>
-<p>The {@code android:value} attribute of the {@code meta-data} tag specifies the name of the shared
-library containing the entry point to the application (such as C/C++ {@code main}), omitting the
-{@code lib} prefix and {@code .so} suffix from the library name.</p>
-
-<pre>
- <meta-data android:name="android.app.lib_name"
- android:value="native-activity" />
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
- </manifest>
-</pre>
-
-<li>Create a file for your native activity, and implement the function named in the
-<a href="{@docRoot}ndk/reference/group___native_activity.html#ga02791d0d490839055169f39fdc905c5e">
-{@code ANativeActivity_onCreate}</a> variable.
-The app calls this function when the native activity starts. This function, analogous
-to {@code main} in C/C++, receives a pointer to an
-<a href="{@docRoot}ndk/reference/struct_a_native_activity.html">{@code ANativeActivity}</a>
-structure, which contains function pointers to the various callback implementations that you need
-to write.
-Set the applicable callback function pointers in {@code ANativeActivity->callbacks} to the
-implementations of your callbacks.</li>
-
-<li>Set the {@code ANativeActivity->instance} field to the address of any instance of specific
-data that you want to use.</li>
-<li>Implement anything else that you want your activity to do upon starting.</li>
-<li>Implement the rest of the callbacks that you set in {@code ANativeActivity->callbacks}. For
-more information on when the callbacks are called, see
-<a href="{@docRoot}training/basics/activity-lifecycle/index.html">Managing the Activity
-Lifecycle</a>.
-</li>
-<li>Develop the rest of your application.</li>
-<li>Create an {@code Android.mk file} in the {@code jni/} directory of your project to describe your
-native module to the build system. For more information, see
-<a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>.</li>
-<li>Once you have an <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>
-file, compile your native code using the {@code ndk-build} command.</li>
-
-<pre class="no-pretty-print">
-$ cd <path>/<to>/<project>
-$ <ndk>/ndk-build
-</pre>
-
-<li>Build and install your Android project as usual. If your native code is in
-the {@code jni/} directory, the build script automatically packages the {@code .so} file(s) built
-from it into the APK.</li>
-</ol>
-
-</li>
-</ul>
diff --git a/docs/html/ndk/guides/cpp-support.jd b/docs/html/ndk/guides/cpp-support.jd
deleted file mode 100644
index 6e902f5..0000000
--- a/docs/html/ndk/guides/cpp-support.jd
+++ /dev/null
@@ -1,326 +0,0 @@
-page.title=C++ Library Support
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#hr">Helper Runtimes</a></li>
- <li><a href="#rc">Runtime Characteristics</a></li>
- <li><a href="#ic">Important Considerations</a></li>
- <li><a href="#li">Licensing</a></li>
- </ol>
- </div>
- </div>
-
-<p>The Android platform provides a very minimal C++ runtime support library ({@code libstdc++}).
-This minimal support does not include, for example:</p>
-
-<ul>
- <li>Standard C++ Library support (except a few trivial headers).</li>
- <li>C++ exceptions support</li>
- <li>RTTI support</li>
-</ul>
-
-<p>The NDK provides headers for use with this default library. In addition, the NDK provides a
-number of helper runtimes that provide additional features. This page provides information about
-these helper runtimes, their characteristics, and how to use them.
-</p>
-
-<h2 id="hr">Helper Runtimes</h2>
-
-<p>Table 1 provides names, brief explanations, and features of runtimes available inthe NDK.</p>
-
-<p class="table-caption" id="runtimes">
- <strong>Table 1.</strong> NDK Runtimes and Features.</p>
-
-<table>
-<tr>
-<th>Name</th>
-<th>Explanation>
-<th>Features
-</tr>
-
-<tr>
-<td><a href="#system">{@code libstdc++} (default)</a> </td>
-<td>The default minimal system C++ runtime library.</td>
-<td>N/A</td>
-</tr>
-
-<tr>
-<td><a href="#ga">{@code gabi++_static}</a> </td>
-<td>The GAbi++ runtime (static).</td>
-<td>C++ Exceptions and RTTI</td>
-</tr>
-
-<tr>
-<td><a href="#ga">{@code gabi++_shared}</a> </td>
-<td>The GAbi++ runtime (shared).</td>
-<td>C++ Exceptions and RTTI</td>
-</tr>
-
-<tr>
-<td><a href="#stl">{@code stlport_static}</a> </td>
-<td>The STLport runtime (static).</td>
-<td> C++ Exceptions and RTTI; Standard Library</td>
-</tr>
-
-<tr>
-<td><a href="#stl">{@code stlport_shared}</a> </td>
-<td>The STLport runtime (shared).</td>
-<td> C++ Exceptions and RTTI; Standard Library</td>
-</tr>
-
-<tr>
-<td><a href="#gn">{@code gnustl_static}</a> </td>
-<td>The GNU STL (static).</td>
-<td> C++ Exceptions and RTTI; Standard Library</td>
-</tr>
-
-<tr>
-<td><a href="#gn">{@code gnustl_shared}</a> </td>
-<td>The GNU STL (shared).</td>
-<td> C++ Exceptions and RTTI; Standard Library</td>
-</tr>
-
-<tr>
-<td><a href="#cs">{@code c++_static}</a> </td>
-<td>The LLVM libc++ runtime (static).</td>
-<td> C++ Exceptions and RTTI; Standard Library</td>
-</tr>
-
-<tr>
-<td><a href="#cs">{@code c++_shared}</a> </td>
-<td>The LLVM libc++ runtime (shared).</td>
-<td> C++ Exceptions and RTTI; Standard Library</td>
-</tr>
-</table>
-
-<h3>How to set your runtime</h3>
-
-<p>Use the {@code APP_STL} variable in your <a href="{@docRoot}ndk/guides/application_mk.html">
-{@code Application.mk}</a> file to specify the runtime you wish to use. Use the values in
-the "Name" column in Table 1 as your setting. For example:</p>
-
-<pre>
-APP_STL := gnustl_static
-</pre>
-
-<p>You may only select one runtime for your app, and can only do in
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>.</p>
-
-<p>Even if you do not use the NDK build system, you can still use STLport, libc++ or GNU STL.
-For more information on how to use these runtimes with your own toolchain, see <a href="{@docRoot}ndk/guides/standalone_toolchain.html">Standalone Toolchain</a>.</p>
-
-<h2 id="rc">Runtime Characteristics</h2>
-<h3 id="system">libstdc++ (default system runtime)</h3>
-
-<p>This runtime only provides the following headers, with no support beyond them:</p>
-<ul>
- <li>{@code cassert}</li>
- <li>{@code cctype}</li>
- <li>{@code cerrno}</li>
- <li>{@code cfloat}</li>
- <li>{@code climits}</li>
- <li>{@code cmath}</li>
- <li>{@code csetjmp}</li>
- <li>{@code csignal}</li>
- <li>{@code cstddef}</li>
- <li>{@code cstdint}</li>
- <li>{@code cstdio}</li>
- <li>{@code cstdlib}</li>
- <li>{@code cstring}</li>
- <li>{@code ctime}</li>
- <li>{@code cwchar}</li>
- <li>{@code new}</li>
- <li>{@code stl_pair.h}</li>
- <li>{@code typeinfo}</li>
- <li>{@code utility}</li>
-</ul>
-
-<h3 id="ga">GAbi++ runtime</h3>
-<p>This runtime provides the same headers as the default runtime, but adds support for RTTI
-(RunTime Type Information) and exception handling.</p>
-
-
-<h3 id="stl">STLport runtime</h3>
-<p>This runtime is an Android port of STLport
-(<a href="http://www.stlport.org">http://www.stlport.org</a>). It provides a complete set of C++
-standard library headers. It also, by embedding its own instance of GAbi++, provides support for
-RTTI and exception handling.</p>
-
-<p>While shared and static versions of this runtime are avilable, we recommend using the shared
-version. For more information, see <a href="#sr">Static runtimes</a>.</p>
-
-<p>The shared library file is named {@code libstlport_shared.so} instead of {@code libstdc++.so}
-as is common on other platforms.</p>
-
-<p>In addition to the static- and shared-library options, you can also force the NDK to
-build the library from sources by adding the following line to your {@code Application.mk}
-file, or setting it in your environment prior to building: </p>
-
-<pre>
-STLPORT_FORCE_REBUILD := true
-</pre>
-
-
-<h3 id="gn">GNU STL runtime</h3>
-<p>This runtime is the GNU Standard C++ Library, ({@code libstdc++-v3}). Its shared library file is
-named {@code libgnustl_shared.so}.</p>
-
-
-<h3 id="cs">libc++ runtime:</h3>
-<p>This runtime is an Android port of <a href="http://libcxx.llvm.org/">LLVM libc++</a>. Its
-shared library file is named {@code libc++_shared.so}.</p>
-
-<p>By default, this runtime compiles with {@code -std=c++11}. As with GNU {@code libstdc++}, you
-need to explicitly turn on exceptions or RTTI support. For information on how to do this, see
-<a href="#xp">C++ Exceptions</a> and <a href="#rt">RTTI</a>.</p>
-
-<p>The NDK provides prebuilt static and shared libraries for {@code libc++}, but you can force the
-NDK to rebuild {@code libc++} from sources by adding the following line to your
-{@code Application.mk} file, or setting it in your environment prior to building: </p>
-
-<pre>
-LIBCXX_FORCE_REBUILD := true
-</pre>
-
-<h4>Atomic support</h4>
-
-<p>If you include {@code <atomic>}, it's likely that you also need {@code libatomic}.
-If you are using {@code ndk-build}, add the following line:</p>
-
-<pre>
-LOCAL_LDLIBS += -latomic
-</pre>
-
-<p>If you are using your own toolchain, use:</p>
-
-<pre>
--latomic
-</pre>
-
-
-<h4>Compatibility</h4>
-
-<p>The NDK's libc++ is not stable. Not all the tests pass, and the test suite is not comprehensive.
-Some known issues are:</p>
-
-<ul>
- <li>Using {@code c++_shared} on ARM can crash when an exception is thrown.</li>
- <li>Support for {@code wchar_t} and the locale APIs is limited.</li>
-</ul>
-
-<p>You should also make sure to check the "Known Issues" section of the changelog for the NDK
-release you are using.</p>
-
-<p class="note"><strong>Warning: </strong>Attempting to change to an unsupported locale will
-<strong>not</strong> fail. The operation will succeed, but the locale will not change and the
-following message will appear in {@code logcat}.</p>
-
-<pre>
-newlocale() WARNING: Trying to set locale to en_US.UTF-8 other than "", "C" or "POSIX"
-</pre>
-
-
-<h2 id="ic">Important Considerations</h2>
-
-<h3 id="xp">C++ Exceptions</h3>
-<p>In all versions of the NDK later than NDKr5, the NDK toolchain allows you to use C++ runtimes
-that support exception handling. However, to ensure compatibility with earlier releases, it
-compiles all C++ sources with {@code -fno-exceptions} support by default. You can enable C++
-exceptions either for your entire app, or for individual modules.
-
-<p>To enable exception-handling support for your entire app, add the following line to
-your <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file.
-To enable exception-handling support for individual modules', add the following line to
-their respective <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> files.</p>
-
-<pre>
-APP_CPPFLAGS += -fexceptions
-</pre>
-
-<h3 id="rt">RTTI</h3>
-<p>In all versions of the NDK later than NDKr5, the NDK toolchain allows you to use C++ runtimes
-that support RTTI. However, to ensure compatibility with earlier releases, it compiles all C++
-sources with {@code -fno-rtti} by default.
-
-<p>To enable RTTI support for your entire app for your entire application, add the following line to
-your <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file:
-
-<pre>
-APP_CPPFLAGS += -frtti
-</pre>
-
-To enable RTTI support for individual modules, add the following line to
-their respective <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> files:
-
-<pre>
-LOCAL_CPP_FEATURES += rtti
-</pre>
-
-Alternatively, you can use:
-
-<pre>
-LOCAL_CPPFLAGS += -frtti
-</pre>
-
-<h3 id="sr">Static runtimes</h3>
-<p>Linking the static library variant of a C++ runtime to more than one binary may result in
-unexpected behavior. For example, you may experience:</p>
-
-<ul>
-<li>Memory allocated in one library, and freed in the other, causing memory leakage or heap
-corruption.</li>
-<li>Exceptions raised in {@code libfoo.so} going uncaught in {@code libbar.so}, causing your app
-to crash.</li>
-<li>Buffering of {@code std::cout} not working properly</li>
-</ul>
-
-<p>In addition, if you link two shared libraries–or a shared library and an executable–
-against the same static runtime, the final binary image of each shared library includes a copy of
-the runtime's code. Having multiple instances of runtime code is problematic because of duplication
-of certain global variables that the runtime uses or provides internally.</p>
-
-<p>This problem does not apply to a project comprising a single shared library. For example,
-you can link against {@code stlport_static}, and expect your app to behave correctly. If your
-project requires several shared library modules, we recommend that you use the shared library
-variant of your C++ runtime.</p>
-
-<h3>Shared runtimes</h3>
-<p>If your app targets a version of Android earlier than Android 4.3 (Android API level 18),
-and you use the shared library variant of a given C++ runtime, you must load the shared library
-before any other library that depends on it.</p>
-
-<p>For example, an app may have the following modules:</p>
-
-<ul>
-<li>libfoo.so</li>
-<li>libbar.so which is used by libfoo.so</li>
-<li>libstlport_shared.so, used by both libfoo and libbar</li>
-</ul>
-
-<p>You must load the libraries in reverse dependency order: </p>
-<pre>
- static {
- System.loadLibrary("stlport_shared");
- System.loadLibrary("bar");
- System.loadLibrary("foo");
- }
-</pre>
-
-<p class="note"><strong>Note: </strong>Do not use the {@code lib} prefix when calling
-{@code System.loadLibrary()}.</p>
-
-<h2 id="li">Licensing</h2>
-
-<p>STLport is licensed under a BSD-style open-source license. See
-{@code $NDK/sources/cxx-stl/stlport/README} for more details about STLport.</p>
-
-<p>GNU libstdc++ is covered by the GPLv3 license, and <em>not</em> the LGPLv2 or LGPLv3. For
-more information, see <a href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html">
-License</a> on the GCC website.</p>
-
-<p><a href="https://llvm.org/svn/llvm-project/libcxx/trunk/LICENSE.TXT">LLVM {@code libc++}</a>
-is dual-licensed under both the University of Illinois "BSD-Like" license and the MIT license.</p>
diff --git a/docs/html/ndk/guides/cpu-arm-neon.jd b/docs/html/ndk/guides/cpu-arm-neon.jd
deleted file mode 100644
index 1d12937..0000000
--- a/docs/html/ndk/guides/cpu-arm-neon.jd
+++ /dev/null
@@ -1,109 +0,0 @@
-page.title=NEON Support
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#ul">Using {@code LOCAL_ARM_NEON}</a></li>
- <li><a href="#uns">Using the {@code .neon} Suffix</a></li>
- <li><a href="#build">Build Requirements</a></li>
- <li><a href="#rd">Runtime Detection</a></li>
- <li><a href="#sc">Sample Code</a></li>
- </ol>
- </div>
- </div>
-
-<p>The NDK supports the ARM Advanced SIMD, an optional instruction-set extension of the ARMv7 spec.
-NEON provides a set of scalar/vector instructions and registers (shared with the FPU) comparable to
-MMX/SSE/3DNow! in the x86 world. To function, it requires VFPv3-D32 (32 hardware FPU 64-bit
-registers, instead of the minimum of 16).</p>
-
-<p>The NDK supports the compilation of modules or even specific source files with support for NEON.
-As a result, a specific compiler flag enables the use of GCC ARM NEON intrinsics and VFPv3-D32
-at the same time.</p>
-
-<p>Not all ARMv7-based Android devices support NEON, but devices that do may benefit significantly
-from its support for scalar/vector instructions. For x86 devices, the NDK can also translate NEON
-instructions into SSE, although with several restrictions. For more information, see
-<a href="{@docRoot}ndk/guides/x86.html#an">x86 Support for ARM NEON Intrinsics.</a></p>
-
-<h2 id="ul">Using LOCAL_ARM_NEON</h2>
-<p>To have the NDK build all its source files with NEON support, include the following line in
-your module definition:</p>
-
-<pre class="no-pretty-print">
-LOCAL_ARM_NEON := true
-</pre>
-
-<p>It can be especially useful to build all source files with NEON support if you want to build a
-static or shared library that specifically contains NEON code paths.</p>
-
-<h2 id="uns">Using the .neon Suffix</h2>
-<p>When listing source files for your {@code LOCAL_SRC_FILES} variable, you have the option of
-using the {@code .neon} suffix to indicate that you want to build binaries with NEON support.
-For example, the following example builds one file with {@code .neon} support, and another
-without it:</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES := foo.c.neon bar.c
-</pre>
-
-<p>You can combine the {@code .neon} suffix with the {@code .arm} suffix, which specifies the 32-bit
-ARM instruction set for non-NEON instructions. In such a definition, {@code arm} must come before
-{@code neon}. For example: {@code foo.c.arm.neon} works, but {@code foo.c.neon.arm} does not.</p>
-
-<h2 id="build">Build Requirements</h2>
-<p>NEON support only works with the {@code armeabi-v7a} and {@code x86} ABIs. If the NDK build
-scripts encounter other ABIs while attempting to build with NEON support, the NDK build scripts
-exit. x86 provides <a href="x86.html">partial NEON support</a> via translation header. It is
-important to use checks like the following in your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-
-<pre class="no-pretty-print">
-# define a static library containing our NEON code
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi-v7a x86))
-include $(CLEAR_VARS)
-LOCAL_MODULE := mylib-neon
-LOCAL_SRC_FILES := mylib-neon.c
-LOCAL_ARM_NEON := true
-include $(BUILD_STATIC_LIBRARY)
-endif # TARGET_ARCH_ABI == armeabi-v7a || x86
-</pre>
-
-<h2 id="rd">Runtime Detection</h2>
-<p>Your app must perform runtime detection to confirm that NEON-capable machine code can be run on
-the target device. This is because not all ARMv7-based Android devices support NEON. The app can
-perform this check using the
-<a href="{@docRoot}ndk/guides/cpu-features.html">{@code cpufeatures}</a> library that comes with
-this NDK.</p>
-
-<p>You should explicitly check that {@code android_getCpuFamily()} returns {@code
-ANDROID_CPU_FAMILY_ARM}, and that {@code android_getCpuFeatures()} returns a value including the
-{@code ANDROID_CPU_ARM_FEATURE_NEON flag} set. For example: </p>
-
-<pre class="no-pretty-print">
-#include <cpu-features.h>
-...
-...
-if (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM &&
- (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0)
-{
- // use NEON-optimized routines
- ...
-}
-else
-{
- // use non-NEON fallback routines instead
- ...
-}
-
-...
-</pre>
-
-<h2 id="sc">Sample Code</h2>
-<p>The source code for the NDK's hello-neon sample provides an example of how to use the
-{@code cpufeatures} library and NEON intrinsics at the same time. This sample implements a tiny
-benchmark for a FIR filter loop using a C version, and a NEON-optimized one for devices that
-support it.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/cpu-features.jd b/docs/html/ndk/guides/cpu-features.jd
deleted file mode 100644
index 3323efd..0000000
--- a/docs/html/ndk/guides/cpu-features.jd
+++ /dev/null
@@ -1,210 +0,0 @@
-page.title=The cpufeatures Library
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#usage">Usage</a></li>
- <li><a href="#functions">Functions</a></li>
- <li><a href="#ch">Change History</a></li>
- </ol>
- </div>
- </div>
-
-<p>The NDK provides a small library named {@code cpufeatures} that your app can use at runtime to
-detect the target device's CPU family and the optional features it supports. It is designed to work
-as-is on all official Android platform versions.</p>
-
-<h2 id="usage">Usage</h2>
-<p>The {@code cpufeatures} library is available as an import module. To use it, follow the procedure
-below:</p>
-
-<ol>
-<li>List {@code cpufeatures} in your list of static library dependencies. For example:
-
-<pre class="no-pretty-print">
-LOCAL_STATIC_LIBRARIES := cpufeatures
-</pre>
-</li>
-
-<li>In your source code, include the {@code <cpu-features.h>} header file.</li>
-
-<li>At the end of your <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file,
-insert an instruction to import the {@code android/cpufeatures} module. For example:
-
-<pre class="no-pretty-print">
-$(call import-module,android/cpufeatures)
-</pre>
-
-<p>Here is a simple example of an {@code Android.mk} file that imports the {@code cpufeatures}
-library:</p>
-
-<pre class="no-pretty-print">
-<project-path>/jni/Android.mk:
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := <your-module-name>
-LOCAL_SRC_FILES := <your-source-files>
-LOCAL_STATIC_LIBRARIES := cpufeatures
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/cpufeatures)
-</pre>
-</li>
-</ol>
-
-<h2 id="functions">Functions</h2>
-<p>The {@code cpufeatures} library provides two functions. The first function returns the family to
-which the device's CPU belongs. Declare it as follows:</p>
-
-<pre class="no-pretty-print">
-AndroidCpuFamily android_getCpuFamily();
-</pre>
-
-<p>The function returns one of the following enums, representing the CPU family/architecture that
-the device supports.</p>
-<ul>
-<li>{@code ANDROID_CPU_FAMILY_ARM}</li>
-<li>{@code ANDROID_CPU_FAMILY_X86}</li>
-<li>{@code ANDROID_CPU_FAMILY_MIPS}</li>
-<li>{@code ANDROID_CPU_FAMILY_ARM64}</li>
-<li>{@code ANDROID_CPU_FAMILY_X86_64}</li>
-<li>{@code ANDROID_CPU_FAMILY_MIPS64}</li>
-</ul>
-
-<p>For a 32-bit executable on a 64-bit system, this function returns only the 32-bit value.</p>
-
-<p>The second function returns the set of optional features that the device's CPU supports. Declare
-it as follows:
-
-<pre class="no-pretty-print">
-uint64_t android_getCpuFeatures();
-</pre>
-
-<p>The return value takes the form of a set of bit flags, each flag representing one
-CPU-family-specific feature. The rest of this section provides information on features for
-the respective families.</p>
-
-<h4>32-bit ARM CPU family</h4>
-
-<p>The following flags are available for the 32-bit ARM CPU family:</p>
-<dl>
-<dt>{@code ANDROID_CPU_ARM_FEATURE_VFPv2}</dt>
-<dd>Indicates that the device's CPU supports the VFPv2 instruction set. Most ARMv6 CPUs support
-this instruction set.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_ARMv7}</dt>
-<dd>Indicates that the device's CPU supports the ARMv7-A instruction set as supported by the
-<a href="{@docRoot}ndk/guides/abis.html#v7a">armeabi-v7a</a> ABI. This instruction set supports both
-Thumb-2 and VFPv3-D16 instructions. This return value also indicates support for the VFPv3 hardware
-FPU instruction-set extension.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_VFPv3}</dt>
-<dd>Indicates that the device's CPU supports the VFPv3 hardware FPU instruction-set extension.
-<p>This value is equivalent to the {@code VFPv3-D16} instruction set, which provides provides only
-16 hardware double-precision FP registers.</p></dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_VFP_D32}</dt>
-<dd> Indicates that the device's CPU supports 32 hardware double-precision FP registers instead of
-16. Even when there are 32 hardware double-precision FP registers, there are still only 32
-single-precision registers mapped to the same register banks.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_NEON}</dt>
-<dd>Indicates that the device's CPU supports the ARM Advanced SIMD (NEON) vector instruction set
-extension. Note that ARM mandates that such CPUs also implement VFPv3-D32, which provides 32
-hardware FP registers (shared with the NEON unit).</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_VFP_FP16}</dt>
-<dd>Indicates that the device's CPU supports instructions to perform floating-point operations on
-16-bit registers. This feature is part of the VFPv4 specification.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_VFP_FMA}</dt>
-<dd>Indicates that the device's CPU supports the fused multiply-accumulate extension for the VFP
-instruction set. Also part of the VFPv4 specification.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_NEON_FMA}</dt>
-<dd>Indicates that the device's CPU supports the fused multiply-accumulate extension for the NEON
-instruction set. Also part of the VFPv4 specification.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_IDIV_ARM}</dt>
-<dd>Indicates that the device's CPU supports integer division in ARM mode. Only available on later-
-model CPUs, such as Cortex-A15.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_IDIV_THUMB2}</dt>
-<dd>Indicates that the device's CPU supports Integer division in Thumb-2 mode. Only available on
-later-model CPUs, such as Cortex-A15.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_iWMMXt}</dt>
-<dd>Indicates that the device's CPU supports an instruction-set extension that adds MMX registers
-and instructions. This feature is only available on a few XScale- based CPUs.</dd>
-
-<dt>{@code ANDROID_CPU_ARM_FEATURE_LDREX_STREX}</dt>
-<dd>Indicates that the device's CPU supports LDREX and STREX instructions available since ARMv6.
-Together, these instructions provide atomic updates on memory with the help of exclusive
-monitor.</dd>
-</dl>
-
-<h4>64-bit ARM CPU family</h4>
-
-<p>The following flags are available for the 64-bit ARM CPU family:</p>
-<dl>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_FP}</dt>
-<dd>Indicates that the device's CPU has a Floating Point Unit (FPU). All Android ARM64 devices must
-support this feature.</dd>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_ASIMD}</dt>
-<dd>Indicates that the device's CPU has an Advanced SIMD (ASIMD) unit. All Android ARM64 devices
-must support this feature.</dd>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_AES}</dt>
-<dd>Indicates that the device's CPU supports {@code AES} instructions.</dd>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_CRC32}</dt>
-<dd>Indicates that the device's CPU supports {@code CRC32} instructions.</dd>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_SHA1}</dt>
-<dd>Indicates that the device's CPU supports {@code SHA1} instructions.</dd>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_SHA2}</dt>
-<dd>Indicates that the device's CPU supports {@code SHA2} instructions.</dd>
-<dt>{@code ANDROID_CPU_ARM64_FEATURE_PMULL}</dt>
-<dd>Indicates that the device's CPU supports 64-bit {@code PMULL} and {@code PMULL2}
-instructions.</dd>
-</dl>
-
-<h4>32-bit x86 CPU family</h4>
-
-<p>The following flags are available for the 32-bit x86 CPU family.<p>
-<dl>
-<dt>{@code ANDROID_CPU_X86_FEATURE_SSSE3}</dt>
-Indicates that the device's CPU supports the SSSE3 instruction extension set.</dd>
-
-<dt>{@code ANDROID_CPU_X86_FEATURE_POPCNT}</dt>
-<dd>Indicates that the device's CPU supports the {@code POPCNT} instruction.</dd>
-
-<dt>{@code ANDROID_CPU_X86_FEATURE_MOVBE}</dt>
-<dd>Indicates that the device's CPU supports the {@code MOVBE} instruction. This instruction is
-specific to some Intel IA-32 CPUs, such as Atom.</dd>
-<dl>
-
-<p>{@code android_getCpuFeatures()} returns {@code 0} for CPU families for which there are no
-listed extensions.</p>
-
-<p>The following function returns the maximum number of CPU cores on the target device: </p>
-
-<pre class="no-pretty-print">
-int android_getCpuCount(void);
-</pre>
-
-<h4>MIPS CPU family</h4>
-
-<dl>
-<dt>{@code ANDROID_CPU_MIPS_FEATURE_R6}</dt>
-<dd>Indicates that the CPU executes MIPS Release 6 instructions natively, and supports obsoleted R1..R5 instructions only via kernel traps.</dd>
-
-<dt>{@code ANDROID_CPU_MIPS_FEATURE_MSA}</dt>
-<dd>Indicates that the CPU supports MIPS SIMD Architecture instructions.</dd>
-</dl>
-
-<h2 id="ch">Change History</h2>
-<p>For the complete change history of this library, see the comments in
-{@code $NDK/sources/android/cpufeatures/cpu-features.c}, where {@code $NDK} is the root of your
-NDK installation.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/debug.jd b/docs/html/ndk/guides/debug.jd
deleted file mode 100644
index 3c4da3b..0000000
--- a/docs/html/ndk/guides/debug.jd
+++ /dev/null
@@ -1,11 +0,0 @@
-page.title=Debugging Your Project
-@jd:body
-
-<p>After you've built your app, you'll probably need to debug it. This section introduces you to the
-NDK's debugging tools.</p>
-
-<p>It begins by telling you how to use the <a href="{@docRoot}ndk/guides/ndk-gdb.html">
-{@code ndk-gdb}</a> tool to debug your code. It closes with an explanation of the
-<a href="{@docRoot}ndk/guides/ndk-stack.html">{@code ndk-stack}</a> tool, which helps you use the
-<a href="{@docRoot}tools/help/logcat.html">ADB logcat tool</a>
-as you debug.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/graphics/design-notes.jd b/docs/html/ndk/guides/graphics/design-notes.jd
deleted file mode 100644
index 272bd2d..0000000
--- a/docs/html/ndk/guides/graphics/design-notes.jd
+++ /dev/null
@@ -1,121 +0,0 @@
-page.title=Vulkan Design Guidelines
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#apply">Apply Display Rotation During Rendering</a></li>
- <li><a href="#minimize">Minimize Render Passes Per Frame</a></li>
- <li><a href="#choose">Choose Appropriate Memory Types</a></li>
- <li><a href="#group">Group Descriptor Sets by Frequency</a></li>
- </ol>
- </div>
- </div>
-
-<p>
-Vulkan is unlike earlier graphics APIs in that drivers do not perform certain
-optimizations, such as pipeline reuse, for apps. Instead, apps using Vulkan must
-implement such optimizations themselves. If they do not, they may exhibit worse
-performance than apps running OpenGL ES.
-</p>
-
-<p>
-When apps implement these optimizations themselves, they have the potential
-to do so more successfully than the driver can, because they have access to
-more specific information for a given use case. As a result, skillfully
-optimizing an app that uses Vulkan can yield better performance than if the
-app were using OpenGL ES.
-</p>
-
-<p>
-This page introduces several optimizations that your Android app can implement
-to gain performance boosts from Vulkan.
-</p>
-
-<h2 id="apply">Apply Display Rotation During Rendering</h2>
-
-<p>
-When the upward-facing direction of an app doesn’t match the orientation of the device’s
-display, the compositor rotates the application’s swapchain images so that it
-does match. It performs this rotation as it displays the images, which results
-in more power consumption—sometimes significantly more—than if it were not
-rotating them.
-</p>
-
-<p>
-By contrast, rotating swapchain images while generating them results in
-little, if any, additional power consumption. The
-{@code VkSurfaceCapabilitiesKHR::currentTransform} field indicates the rotation
-that the compositor applies to the window. After an app applies that rotation
-during rendering, the app uses the {@code VkSwapchainCreateInfoKHR::preTransform}
-field to report that the rotation is complete.
-</p>
-
-<h2 id="minimize">Minimize Render Passes Per Frame</h2>
-
-<p>
-On most mobile GPU architectures, beginning and ending a render pass is an
-expensive operation. Your app can improve performance by organizing rendering operations into
-as few render passes as possible.
-</p>
-
-<p>
-Different attachment-load and attachment-store ops offer different levels of
-performance. For example, if you do not need to preserve the contents of an attachment, you
-can use the much faster {@code VK_ATTACHMENT_LOAD_OP_CLEAR} or
-{@code VK_ATTACHMENT_LOAD_OP_DONT_CARE} instead of {@code VK_ATTACHMENT_LOAD_OP_LOAD}. Similarly, if
-you don't need to write the attachment's final values to memory for later use, you can use
-{@code VK_ATTACHMENT_STORE_OP_DONT_CARE} to attain much better performance than
-{@code VK_ATTACHMENT_STORE_OP_STORE}.
-</p>
-
-<p>
-Also, in most render passes, your app doesn’t need to load or store the
-depth/stencil attachment. In such cases, you can avoid having to allocate physical memory for
-the attachment by using the {@code VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT}
-flag when creating the attachment image. This bit provides the same benefits as does
-{@code glFramebufferDiscard} in OpenGL ES.
-</p>
-
-<h2 id="choose">Choose Appropriate Memory Types</h2>
-
-<p>
-When allocating device memory, apps must choose a memory type. Memory type
-determines how an app can use the memory, and also describes caching and
-coherence properties of the memory. Different devices have different memory
-types available; different memory types exhibit different performance
-characteristics.
-</p>
-
-<p>
-An app can use a simple algorithm to pick the best memory type for a given
-use. This algorithm picks the first memory type in the
-{@code VkPhysicalDeviceMemoryProperties::memoryTypes} array that meets two criteria:
-The memory type must be allowed for the buffer
-or image, and must have the minimum properties that the app requires.
-</p>
-
-<p>
-Mobile systems generally don’t have separate physical memory heaps for the
-CPU and GPU. On such systems, {@code VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT} is not as
-significant as it is on systems that have discrete GPUs with their own, dedicated
-memory. An app should not assume this property is required.
-</p>
-
-<h2 id="group">Group Descriptor Sets by Frequency</h2>
-
-<p>
-If you have resource bindings that change at different frequencies, use
-multiple descriptor sets per pipeline rather than rebinding all resources for
-each draw. For example, you can have one set of descriptors for per-scene
-bindings, another set for per-material bindings, and a third set for
-per-mesh-instance bindings.
-</p>
-
-<p>
-Use immediate constants for the highest-frequency changes, such as changes
-executed with each draw call.
-</p>
-
diff --git a/docs/html/ndk/guides/graphics/getting-started.jd b/docs/html/ndk/guides/graphics/getting-started.jd
deleted file mode 100644
index 0c2d939..0000000
--- a/docs/html/ndk/guides/graphics/getting-started.jd
+++ /dev/null
@@ -1,201 +0,0 @@
-page.title=Vulkan Setup
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#downloading">Downloading</a></li>
- <li><a href="#testing">Testing Installation</a></li>
- <li><a href="#compiling">Compiling Your Project</a></li>
- <li><a href="#running">Running Your Project</a></li>
- <li><a href="#using">Using the Dynamic Loader</a></li>
- </ol>
-
- </div>
- </div>
-
-<p>
-This document explains how to get started with the Vulkan graphics library by downloading,
-compiling, and running several sample apps.
-</p>
-
-<p>
-Before beginning, make sure you have the right hardware and platform version prepared. You should
-be using one of the following devices, running at least Android N, Developer Preview 2:
-</p>
-
-<ul>
- <li>Nexus 6P.</li>
- <li>Nexus 5X.</li>
- <li>Nexus Player.</li>
-</ul>
-
-<p>
-You can confirm your Android version by going to the <strong>Settings</strong> menu, and
-selecting <strong>About <device></strong> > <strong>Android Version</strong>.
-Once you’ve confirmed that you have the right hardware and platform version set up, you can
-download the necessary software.
-</p>
-
-<h2 id="downloading">Downloading</h2>
-
-<p>
-Before getting started, you must download several tools and other software.
-</p>
-
-<ol style="1">
- <li>If you don’t already have Android Studio,
- <a href="{@docRoot}studio/index.html">download it.</a></li>
-
-<li><a href="https://github.com/android-ndk/ndk/wiki">Download</a> NDK r12-beta.</li>
-
-<li><a href="{@docRoot}preview/setup-sdk.html">Download and install
-the Android N-Preview SDK.</a></li>
-
-<li>(Optional) Build shaderc in NDK r12-beta by navigating to
-{@code <ndk-root>/sources/third_party/shaderc/},
-and running the following command:
-
-<pre class="no-pretty-print">
-../../../ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk \
- APP_STL:=c++_shared APP_ABI=all libshaderc_combined
-</pre>
-
-You can specify {@code APP_STL} as {@code gnustl_static},
-{@code gnustl_shared}, {@code c++_static},
-or {@code c++_shared}.</li>
-
-<li>Open a terminal window, and use git to clone the Android Vulkan samples from the
-repository in which they reside.
-
-<pre class="no-pretty-print">
-$ git clone https://github.com/googlesamples/vulkan-basic-samples.git
-</pre>
-</li>
-
-<li>
-Navigate to the {@code LunarGSamples/} directory, which is in the local repository
-that you checked out in the previous step.
-</li>
-
-<li>Update the gslang source by entering the following command:
-
-<pre class="no-pretty-print">
-$ ./update_external_sources.sh -s -g
-</pre>
-</li>
-
-</ol>
-
-
-<h2 id="testing">Testing Installation</h2>
-
-<p>
-To confirm that Vulkan is set up properly, you can test it with
-the set of Vulkan API samples provided partly for that purpose. Follow these steps to
-build and execute these samples:
-</p>
-
-<ol style="1">
-
-
-<li>(Optional) Build the source by entering the following commands:
-
-<pre class="no-pretty-print">
-$ cd API-samples
-$ cmake -DANDROID=ON -DANDROID_ABI=[armeabi-v7a|arm64-v8a| x86|x86_64|all(default)]
-</pre>
-</li>
-
-<li>
-Import the samples into Android Studio. To do so, choose <strong>File</strong> >
-<strong>Import
-project (Eclipse, ADT, Gradle)</strong> and
-select the {@code LunarGSamples/API-Samples/android} directory.
-
-<p>You may see an error about missing components or missing SDK version.
-Ignore this error message, and follow the installation prompts.</p>
-
-<p>After several minutes, the <em>Project</em> pane should
-resemble the window shown in Figure 1.</p>
-
-<img src="../images/project-pane.png"
-alt="Project pane after importing samples into Android Studio" id="figure1" />
-
-<p class="img-caption">
-<strong>Figure 1.</strong> Project pane displaying samples after they've been imported.
-
-</li>
-</ol>
-
-<h2 id="compiling">Compiling Your Project</h2>
-
-<p>To compile your project, follow these steps:</p>
-
-<ol style="1">
-<li>Select your project in the Android Studio <em>Project</em> panel.</li>
-<li>From the <strong>Build</strong> menu, choose <strong>Make Module <module-name> </strong>; or select <strong> Build APK </strong> to generate APK.</li>
-<li>Resolve any dependency issues, and then compile. As Figure 2 shows, you can select individual projects to compile by choosing them from the configuration pulldown.</li>
-
-<img src="../images/config-pulldown.png"
-alt="Selecting the "drawcube" project from the config pulldown id="figure2" />
-
-<p class="img-caption">
-<strong>Figure 2.</strong> Selecting an individual project to compile.
-
-</ol>
-
-<p class="note"><strong>Note: </strong>
-<a href="https://github.com/googlesamples/android-vulkan-tutorials">Additional
-tutorial samples</a> illustrate the use of shaders compiled with off-line
-compilation integrated into Android Studio. For simplicity, each tutorial
-is self-contained, and builds according to standard Android Studio
-<a href="{@docRoot}tools/studio/index.html">build procedures.</a>
-</p>
-
-<h2 id="running">Running Your Project</h2>
-
-<p>To run your project, choose an APK to run by choosing <strong>Run</strong> > <strong>Run <project-name></strong>.</p>
-
-<p>To debug an APK, choose <strong>Run</strong> >
-<strong>Debug <project-name></strong>. For each project,
-there’s a Java version and a native (C or C++) version. Run the
-native version of the app. For example, for drawcube,
-run drawcube-native.</p>
-
-<p>Most of the samples have simple functionality, and most stop
-automatically after running. The drawcube example is one of
-the more visually interesting examples. When you run it, it
-should display the image in Figure 3</p>.
-
-<img src="../images/drawcube-output.png"
-alt="Successfully running shows a multicolored cube" id="figure3" />
-
-<p class="img-caption">
-<strong>Figure 3.</strong> The successfully compiled program runs and produces a display.
-</p>
-
-<h2 id="using">Using the Dynamic Loader</h2>
-<p>
-The samples use a dynamic loader helper function defined in {@code vulkan_wrapper.h/cpp} to
-retrieve Vulkan API pointers using {@code dlopen()} and {@code dlsym()}. It does this rather
-than statically linking them with {@code vulkan.so}.
-</p>
-
-<p>
-Using this loader allows the code to link against API level 23 and earlier versions of the platform, which don’t include the {@code vulkan.so} shared library, but can run on devices that support Vulkan API.
-</p>
-
-<p>
-The following snippet shows how to use the dynamic loader.
-</p>
-
-<pre>
-#include "vulkan_wrapper.h" // Include Vulkan_wrapper and dynamically load symbols.
-...
-// Before any Vulkan API usage,
-InitVulkan();
-</pre>
diff --git a/docs/html/ndk/guides/graphics/index.jd b/docs/html/ndk/guides/graphics/index.jd
deleted file mode 100644
index cbd4b9c..0000000
--- a/docs/html/ndk/guides/graphics/index.jd
+++ /dev/null
@@ -1,36 +0,0 @@
-page.title=Vulkan Graphics API
-@jd:body
-
-
-<p>The Android platform includes an Android-specific implementation of the
-<a class="external-link" href="https://www.khronos.org/vulkan/">Vulkan</a> API
-specification from the Khronos Group. Vulkan is a
-low-overhead, cross-platform API for high-performance, 3D graphics. It provides tools
-for creating high-quality, real-time graphics in
-applications. Vulkan also provides advantages such as reducing
-CPU overhead and providing support for the
-<a class="external-link" href="https://www.khronos.org/spir">SPIR-V Binary
-Intermediate language</a>.
-</p>
-
-<p>
-This section begins with information on how to
-<a href="{@docRoot}ndk/guides/graphics/getting-started.html">get started</a> using Vulkan in your
-Android app. Next, it provides useful information that you should know about
-<a href="{@docRoot}ndk/guides/graphics/design-notes.html">Vulkan design guidelines</a>
-on the Android platform. From there, it explains how
-to use Vulkan's <a href="{@docRoot}ndk/guides/graphics/shader-compilers.html">shader compilers</a>.
-Last, it teaches you how to use
-<a href="{@docRoot}ndk/guides/graphics/validation-layer.html">validation layers</a>
-to help assure stability in apps using Vulkan.
-</p>
-
-<p>
-For more general information about this cross-platform API specification, see
-Khronos's
-<a class="external-link" href="http://khr.io/vulkanlaunchoverview">
-Vulkan Overview</a>.
-You can also keep up with the latest Vulkan-related developments at the
-Vulkan
-<a class="external-link" href="https://www.khronos.org/#slider_vulkan">news page</a>.
-</p>
diff --git a/docs/html/ndk/guides/graphics/shader-compilers.jd b/docs/html/ndk/guides/graphics/shader-compilers.jd
deleted file mode 100644
index c51c21c..0000000
--- a/docs/html/ndk/guides/graphics/shader-compilers.jd
+++ /dev/null
@@ -1,194 +0,0 @@
-page.title=Vulkan Shader Compilers on Android
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#aot">AOT Compilation</a></li>
- <li><a href="#runtime">Runtime Compilation</a></li>
- <li><a href="#integrating">Integrating Into your Project</a></li>
- </ol>
- </div>
- </div>
-
-<p>
-A Vulkan app must manage shaders differently from the way an OpenGL ES app does so:
-In OpenGL ES, you provide a shader as a set of strings forming the source text of a
-GLSL shader program. By contrast, the Vulkan API requires you to provide a shader in
-the form of an entry point in a <a href=”https://www.khronos.org/spir”>SPIR-V</a> module.
-</p>
-
-<p>
-The NDK includes a runtime library for compiling GLSL into SPIR-V.
-The runtime library is the same as the one in the
-<a href="https://github.com/google/shaderc">Shaderc</a> open source project, and use the same
-<a href="https://github.com/KhronosGroup/glslang">Glslang GLSL</a> reference compiler as a
-back end. By default, the Shaderc version of the
-compiler assumes you are compiling for Vulkan. After checking whether your code is valid for
-Vulkan, the compiler automatically enables the {@code KHR_vulkan_glsl} extension. The Shaderc
-version of the compiler also generates Vulkan-compliant SPIR-V code.
-</p>
-
-<p>
-You can choose to compile SPIR-V modules into your Vulkan app during development, a
-practice called <em>ahead-of-time</em>, or <em>AOT</em>, compiling. Alternatively,
-you can have your app compile them from shipped or procedurally generated shader
-source when needed during runtime. This practice is called <em>runtime compiling</em>.
-</p>
-
-<p>
-The rest of this page provides more detail about each practice, and then explains
-how to integrate shader compilation into your Vulkan app.
-</p>
-
-<h2 id=”aot”>AOT Compilation</h2>
-
-<p>
-For AOT compilation, we recommend the <em>glslc</em> command-line compiler from GLSL to SPIR-V.
-This compiler is available from the <a href="https://github.com/google/shaderc">Shaderc</a>
-project.</a>Many of its command-line options are similar to those of GCC and Clang, allowing
-you to integrate glslc into build systems easily.
-</p>
-
-<p>
-The glslc tool compiles a single-source file to a SPIR-V module with a single shader
-entry point. By default, the output file has the same name as that of the source file,
-but with the {@code .spv} extension appended.
-</p>
-
-<p>
-You use filename extensions to tell the glslc tool which graphics shader stage to compile,
-or whether a compute shader is being compiled. For information on how to use these filename
-extensions, and options you can use with the tool, see
-<a href="https://github.com/google/shaderc/tree/master/glslc#user-content-shader-stage-specification">
-Shader stage specification</a> in the
-<a href="https://github.com/google/shaderc/tree/master/glslc">
-glslc</a> manual.
-</p>
-
-<h2 id="runtime">Runtime Compilation</h2>
-
-<p>
-For JIT compilation of shaders during runtime, the NDK provides the libshaderc library,
-which has both C and C++ APIs.
-</p>
-
-<p>
-C++ applications should use the C++ API. We recommend that apps in other languages
-use the C API, because the C ABI is lower level, and likely to provide better stability.
-</p>
-
-<p>
-The following example shows how to use the C++ API:
-</p>
-
-<pre>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <shaderc/shaderc.hpp>
-
-std::vector<uint32_t> compile_file(const std::string& name,
- shaderc_shader_kind kind,
- const std::string& data) {
- shaderc::Compiler compiler;
- shaderc::CompileOptions options;
-
- // Like -DMY_DEFINE=1
- options.AddMacroDefinition("MY_DEFINE", "1");
-
- shaderc::SpvCompilationResult module = compiler.CompileGlslToSpv(
- data.c_str(), data.size(), kind, name.c_str(), options);
-
- if (module.GetCompilationStatus() !=
- shaderc_compilation_status_success) {
- std::cerr << module.GetErrorMessage();
- }
-
- std::vector<uint32_t> result(module.cbegin(), module.cend());
- return result;
-}
-</pre>
-
-
-
-<h2 id=”integrating”>Integrating into Your Projects</h2>
-
-<p>
-You can integrate the Vulkan shader compiler into your app using either the project's
-{@code Android.mk} file or Gradle.
-</p>
-
-<h3 id=”androidmk”>Android.mk</h3>
-
-<p>
-Perform the following steps to use your project's {@code Android.mk}
-file to integrate the shader compiler.
-</p>
-
-<ol>
-<li>
-Include the following lines in your Android.mk file:
-<pre class="no-pretty-print">
-include $(CLEAR_VARS)
- ...
-LOCAL_STATIC_LIBRARIES := shaderc
- ...
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, third_party/shaderc)
-</pre>
-</li>
-
-<li>
-Set APP_STL to one of {@code c++_static}, {@code c++_shared}, {@code gnustl_static},
-or {@code gnustl_shared}.
-</li>
-</ol>
-
-
-
-<h3 id=”gradle”>Gradle</h3>
-
-<ol>
-<li>
-In a terminal window, navigate to
-{@code <ndk_root>/sources/third_party/shaderc/}.
-</li>
-
-<li>
-Run the following command:
-
-<pre class="no-pretty-print">
-$ ../../../ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk \
-APP_STL:=<stl_version> APP_ABI=all libshaderc_combined
-</pre>
-
-<p>
-This command places two folders in <ndk_root>/sources/third_party/shaderc/. The directory
-structure is as follows:
-</p>
-
-<pre class="no-pretty-print">
-include/
- shaderc/
- shaderc.h
- shaderc.hpp
-libs/
- <stl_version>/
- {all of the abis}
- libshaderc.a
-</pre>
-</li>
-
-<li>
-Add includes and link lines as you normally would for external libraries.
-</li>
-<p>
-The STL that you use to build your program must match the {@code stl} specified in
-{@code stl_version}.
-Only {@code c++_static}, {@code c++_shared}, {@code gnustl_static}, and
-{@code gnustl_shared} are supported.
-</p>
diff --git a/docs/html/ndk/guides/graphics/validation-layer.jd b/docs/html/ndk/guides/graphics/validation-layer.jd
deleted file mode 100644
index 1a7d832..0000000
--- a/docs/html/ndk/guides/graphics/validation-layer.jd
+++ /dev/null
@@ -1,433 +0,0 @@
-page.title=Vulkan Validation Layers on Android
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#ilp">Add Validation Layers to Project</a></li>
- <li><a href="#gls">Getting Layer Source</a></li>
- <li><a href="#verifying">Verifying Layer Build</a></li>
- <li><a href="#enabling">Enabling Layers</a></li>
- <li><a href="#debug">Enabling the Debug Callback</a></li>
- </ol>
- </div>
- </div>
-
-<p>
-Most explicit graphics APIs do not perform error-checking, because doing so can result in a
-performance penalty. Vulkan provides error-checking in a manner that lets you use this feature at
-development time, but exclude it from the release build of your app, thus avoiding the penalty when
-it matters most. You do this by enabling <em>validation layers</em>. Validation layers intercept
-or hook Vulkan entry points for various debug and validation purposes.
-</p>
-
-<p>
-Each validation layer can contain definitions for one or more of these entry points, and
-intercepts the entry points for which it contains definitions. When a validation
-layer does not define an entry point, the system passes the entry point on to the next
-layer. Ultimately, an entry point not defined in any layer reaches the driver, the
-base level, unvalidated.
-</p>
-
-<p>
-The Android SDK, NDK, and Vulkan samples include Vulkan validation layers for
-use during development. You can hook these validation layers into the graphics stack, allowing
-them to report validation issues. This instrumentation allows you to catch and fix misuses
-during development.
-</p>
-
-<p>
-This page explains how to:
-<ul>
- <li>Integrate NDK's Layer Binaries.</li>
- <li>Get source code for validation layers.</li>
- <li>Verifying Layer Build.</li>
- <li>Enabling Layers in Vulkan Application.</li>
-
-</ul>
-</p>
-
-<h2 id="ilp">Add Validation Layers to Project</h2>
-
-<p>
- NDK release 12 and higher includes pre-built validation layer binaries. At
- instance and device creation time, when requested by your application, the
- Vulkan loader finds them in the APK installed location and loads them.
-</p>
-
-<p>
- To use the pre-built validation layer binaries, either modify the gradle build
- configuration of your project or manually add the binaries into the JNI
- libraries directory of your project.
-</p>
-
-
-<h3 id="vl-gradle">Adding validation layers with Gradle</h3>
-
-<p>
- You can add the validation layer your project using either Andorid Studio's
- support for CMake and Ndk-build, or using Studio's experimental plugin for
- Gradle. In general, you should use the CMake and Ndk-build configuration.
-</p>
-
-
-<p>
- To add the libraries using Android Studio's support for CMake/Ndk-build,
- add the following to your project's gradle configuration:
-</p>
-
-<pre class="no-pretty-print">
-sourceSets {
- main {
- jniLibs {
- srcDir "${your-ndk-dir}/sources/third_party/vulkan/src/build-android/jniLibs"
- }
- }
-}</pre>
-
-<p>
- To add the libraries using Android Studio's experimental plugin for Gradle,
- add the following to your project's gradle configuration:
-</p>
-
-<pre class="no-pretty-print">
-sources {
- main {
- jniLibs {
- source.srcDir "${your-ndk-dir}/sources/third_party/vulkan/src/build-android/jniLibs"
- }
- }
-}</pre>
-
-
-<h3 id="vl-jni-lib">Adding validation layers to JNI libraries</h3>
-
-<p>
- If configuring your project's gradle build file is not working, you can
- manually add the validation layer binaries to your project's JNI libraries
- directory by using the following command line options:
-</p>
-
-<pre class="no-pretty-print">
-$ cd ${your-app-project-root}
-$ mkdir -p app/src/main
-$ cp -fr ${your-ndk-dir}/sources/third_party/vulkan/src/build-android/jniLibs app/src/main/
-</pre>
-
-
-<h2 id="gls">Getting Layer Source</h2>
-<p>
-If your app needs the latest validation layer, you can pull the latest source from the Khronos Group
-<a class="external-link" href="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers">
-GitHub repository</a> and follow the build instructions there.
-</p>
-
-<h2 id="verifying">Verifying Layer Build</h2>
-
-<p>
-Regardless of whether you build with NDK's prebuilt layers or you build from the latest source code,
-the build process produces final file structure like the following:
-</p>
-
-<pre class="no-pretty-print">
-src/main/jniLibs/
- arm64-v8a/
- libVkLayer_core_validation.so
- libVkLayer_device_limits.so
- libVkLayer_image.so
- libVkLayer_object_tracker.so
- libVkLayer_parameter_validation.so
- libVkLayer_swapchain.so
- libVkLayer_threading.so
- libVkLayer_unique_objects.so
- armeabi-v7a/
- libVkLayer_core_validation.so
- ...
-</pre>
-
-<p>
-The following example shows how to verify that your APK contains the validation layers
-as expected:
-</p>
-
-<pre class="no-pretty-print">
-$ jar -xvf project.apk
- ...
- inflated: lib/arm64-v8a/libVkLayer_threading.so
- inflated: lib/arm64-v8a/libVkLayer_object_tracker.so
- inflated: lib/arm64-v8a/libVkLayer_swapchain.so
- inflated: lib/arm64-v8a/libVkLayer_unique_objects.so
- inflated: lib/arm64-v8a/libVkLayer_parameter_validation.so
- inflated: lib/arm64-v8a/libVkLayer_image.so
- inflated: lib/arm64-v8a/libVkLayer_core_validation.so
- inflated: lib/arm64-v8a/libVkLayer_device_limits.so
- ...
-</pre>
-
-
-<h2 id="enabling">Enabling Layers</h2>
-
-<p>The Vulkan API allows an app to enable both instance layers and device layers.</p>
-
-<h3>Instance layers</h3>
-
-<p>
-A layer that can intercept Vulkan instance-level entry points is called an instance layer.
-Instance-level entry points are those with {@code VkInstance} or {@code VkPhysicalDevice}
-as the first parameter.
-</p>
-
-<p>
-You can call {@code vkEnumerateInstanceLayerProperties()} to list the available instance layers
-and their properties. The system enables instance layers when {@code vkCreateInstace()} executes.
-</p>
-
-<p>
-The following code snippet shows how an app can use the Vulkan API to programmatically enable and
-query an instance layer:
-</p>
-
-<pre>
-// Get instance layer count using null pointer as last parameter
-uint32_t instance_layer_present_count = 0;
-vkEnumerateInstanceLayerProperties(&instance_layer_present_count, nullptr);
-
-// Enumerate instance layers with valid pointer in last parameter
-VkLayerProperties* layer_props =
- (VkLayerProperties*)malloc(instance_layer_present_count * sizeof(VkLayerProperties));
-vkEnumerateInstanceLayerProperties(&instance_layer_present_count, layer_props));
-
-// Make sure the desired instance validation layers are available
-// NOTE: These are not listed in an arbitrary order. Threading must be
-// first, and unique_objects must be last. This is the order they
-// will be inserted by the loader.
-const char *instance_layers[] = {
- "VK_LAYER_GOOGLE_threading",
- "VK_LAYER_LUNARG_parameter_validation",
- "VK_LAYER_LUNARG_object_tracker",
- "VK_LAYER_LUNARG_core_validation",
- "VK_LAYER_LUNARG_device_limits",
- "VK_LAYER_LUNARG_image",
- "VK_LAYER_LUNARG_swapchain",
- "VK_LAYER_GOOGLE_unique_objects"
-};
-
-uint32_t instance_layer_request_count =
- sizeof(instance_layers) / sizeof(instance_layers[0]);
-for (uint32_t i = 0; i < instance_layer_request_count; i++) {
- bool found = false;
- for (uint32_t j = 0; j < instance_layer_present_count; j++) {
- if (strcmp(instance_layers[i], layer_props[j].layerName) == 0) {
- found = true;
- }
- }
- if (!found) {
- error();
- }
-}
-
-// Pass desired instance layers into vkCreateInstance
-VkInstanceCreateInfo instance_info = {};
-instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
-instance_info.enabledLayerCount = instance_layer_request_count;
-instance_info.ppEnabledLayerNames = instance_layers;
-...
-</pre>
-
-<h3>Device layers</h3>
-
-<p>
-A layer that can intercept device-level entry points is called a device layer. Device-level entry
-points are those whose first parameter is {@code VkDevice}, {@code VkCommandBuffer},
-or {@code VkQueue}. The list of
-device layers to enable is included in the {@code ppEnabledLayerNames} field of the
-{@code VkDeviceCreateInfo}
-struct that the app passes into {@code vkCreateDevice()}.
-</p>
-
-<p>
-You can call {@code vkEnumerateDeviceLayerProperties} to list the available layers
-and their properties. The system enables device layers when it calls {@code vkCreateDevice()}.
-</p>
-
-<p>
-The following code snippet shows how an app can use the Vulkan API to programmatically enable a
-device layer.
-</p>
-
-<pre>
-
-// Get device layer count using null as last parameter
-uint32_t device_layer_present_count = 0;
-vkEnumerateDeviceLayerProperties(&device_layer_present_count, nullptr);
-
-// Enumerate device layers with valid pointer in last parameter
-VkLayerProperties* layer_props =
- (VkLayerProperties *)malloc(device_layer_present_count * sizeof(VkLayerProperties));
-vkEnumerateDeviceLayerProperties(physical_device, device_layer_present_count, layer_props));
-
-// Make sure the desired device validation layers are available
-// Ensure threading is first and unique_objects is last!
-const char *device_layers[] = {
- "VK_LAYER_GOOGLE_threading",
- "VK_LAYER_LUNARG_parameter_validation",
- "VK_LAYER_LUNARG_object_tracker",
- "VK_LAYER_LUNARG_core_validation",
- "VK_LAYER_LUNARG_device_limits",
- "VK_LAYER_LUNARG_image",
- "VK_LAYER_LUNARG_swapchain",
- "VK_LAYER_GOOGLE_unique_objects"
-};
-
-uint32_t device_layer_request_count =
- sizeof(device_layers) / sizeof(device_layers[0]);
-for (uint32_t i = 0; i < device_layer_request_count; i++) {
- bool found = false;
- for (uint32_t j = 0; j < device_layer_present_count; j++) {
- if (strcmp(device_layers[i],
- layer_props[j].layerName) == 0) {
- found = true;
- }
- }
- if (!found) {
- error();
- }
-}
-
-// Pass desired device layers into vkCreateDevice
-VkDeviceCreateInfo device_info = {};
-device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
-device_info.enabledLayerCount = device_layer_request_count;
-device_info.ppEnabledLayerNames = device_layers;
-...
-</pre>
-
-<h2 id="debug">Enabling the Debug Callback</h2>
-
-<p>
-The Debug Report extension {@code VK_EXT_debug_report} allows your application to control
-layer behavior when an event occurs.</p>
-
-<p>
-Before using this extension, you must first make sure that the platform supports it.
-The following example shows how to check for debug extension support and
-register a callback if the extension is supported.
-</p>
-
-<pre>
-// Get the instance extension count
-uint32_t inst_ext_count = 0;
-vkEnumerateInstanceExtensionProperties(nullptr, &inst_ext_count, nullptr);
-
-// Enumerate the instance extensions
-VkExtensionProperties* inst_exts =
- (VkExtensionProperties *)malloc(inst_ext_count * sizeof(VkExtensionProperties));
-vkEnumerateInstanceExtensionProperties(nullptr, &inst_ext_count, inst_exts);
-
-const char * enabled_inst_exts[16] = {};
-uint32_t enabled_inst_ext_count = 0;
-
-// Make sure the debug report extension is available
-for (uint32_t i = 0; i < inst_ext_count; i++) {
- if (strcmp(inst_exts[i].extensionName,
- VK_EXT_DEBUG_REPORT_EXTENSION_NAME) == 0) {
- enabled_inst_exts[enabled_inst_ext_count++] =
- VK_EXT_DEBUG_REPORT_EXTENSION_NAME;
- }
-}
-
-if (enabled_inst_ext_count == 0)
- return;
-
-// Pass the instance extensions into vkCreateInstance
-VkInstanceCreateInfo instance_info = {};
-instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
-instance_info.enabledExtensionCount = enabled_inst_ext_count;
-instance_info.ppEnabledExtensionNames = enabled_inst_exts;
-
-PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
-PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
-
-vkCreateDebugReportCallbackEXT = (PFN_vkCreateDebugReportCallbackEXT)
- vkGetInstanceProcAddr(instance, "vkCreateDebugReportCallbackEXT");
-vkDestroyDebugReportCallbackEXT = (PFN_vkDestroyDebugReportCallbackEXT)
- vkGetInstanceProcAddr(instance, "vkDestroyDebugReportCallbackEXT");
-
-assert(vkCreateDebugReportCallbackEXT);
-assert(vkDestroyDebugReportCallbackEXT);
-
-// Create the debug callback with desired settings
-VkDebugReportCallbackEXT debugReportCallback;
-if (vkCreateDebugReportCallbackEXT) {
- VkDebugReportCallbackCreateInfoEXT debugReportCallbackCreateInfo;
- debugReportCallbackCreateInfo.sType =
- VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
- debugReportCallbackCreateInfo.pNext = NULL;
- debugReportCallbackCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT |
- VK_DEBUG_REPORT_WARNING_BIT_EXT |
- VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT;
- debugReportCallbackCreateInfo.pfnCallback = DebugReportCallback;
- debugReportCallbackCreateInfo.pUserData = NULL;
-
- vkCreateDebugReportCallbackEXT(instance, &debugReportCallbackCreateInfo,
- nullptr, &debugReportCallback);
-}
-
-// Later, when shutting down Vulkan, call the following
-if (vkDestroyDebugReportCallbackEXT) {
- vkDestroyDebugReportCallbackEXT(instance, debugReportCallback, nullptr);
-}
-
-</pre>
-
-<p>
-Once your app has registered and enabled the debug callback, the system routes debugging
-messages to a callback that you register. An example of such a callback appears below:
-</p>
-
-
-<pre>
-#include <android/log.h>
-
-static VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(
- VkDebugReportFlagsEXT msgFlags,
- VkDebugReportObjectTypeEXT objType,
- uint64_t srcObject, size_t location,
- int32_t msgCode, const char * pLayerPrefix,
- const char * pMsg, void * pUserData )
-{
- if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) {
- __android_log_print(ANDROID_LOG_ERROR,
- "AppName",
- "ERROR: [%s] Code %i : %s",
- pLayerPrefix, msgCode, pMsg);
- } else if (msgFlags & VK_DEBUG_REPORT_WARNING_BIT_EXT) {
- __android_log_print(ANDROID_LOG_WARN,
- "AppName",
- "WARNING: [%s] Code %i : %s",
- pLayerPrefix, msgCode, pMsg);
- } else if (msgFlags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT) {
- __android_log_print(ANDROID_LOG_WARN,
- "AppName",
- "PERFORMANCE WARNING: [%s] Code %i : %s",
- pLayerPrefix, msgCode, pMsg);
- } else if (msgFlags & VK_DEBUG_REPORT_INFORMATION_BIT_EXT) {
- __android_log_print(ANDROID_LOG_INFO,
- "AppName", "INFO: [%s] Code %i : %s",
- pLayerPrefix, msgCode, pMsg);
- } else if (msgFlags & VK_DEBUG_REPORT_DEBUG_BIT_EXT) {
- __android_log_print(ANDROID_LOG_VERBOSE,
- "AppName", "DEBUG: [%s] Code %i : %s",
- pLayerPrefix, msgCode, pMsg);
- }
-
- // Returning false tells the layer not to stop when the event occurs, so
- // they see the same behavior with and without validation layers enabled.
- return VK_FALSE;
-}
-</pre>
-
-
-
diff --git a/docs/html/ndk/guides/guides_toc.cs b/docs/html/ndk/guides/guides_toc.cs
deleted file mode 100644
index 09b2a12..0000000
--- a/docs/html/ndk/guides/guides_toc.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-<?cs # Table of contents for Dev Guide.
-
- For each document available in translation, add an localized title to this TOC.
- Do not add localized title for docs not available in translation.
- Below are template spans for adding localized doc titles. Please ensure that
- localized titles are added in the language order specified below.
-?>
-
-<ul id="nav">
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/index.html">
- <span class="en">Getting Started</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/setup.html">Setup</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/concepts.html">Concepts</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/build.html">
- <span class="en">
- Building</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/android_mk.html">Android.mk</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/application_mk.html">Application.mk</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/ndk-build.html">ndk-build</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/standalone_toolchain.html">Standalone Toolchain
- </a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/arch.html">
- <span class="en">Architectures and CPUs</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/abis.html">ABI Management</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/cpu-arm-neon.html">NEON</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/x86.html">x86</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/x86-64.html">x86-64</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/mips.html">MIPS</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/cpu-features.html">The cpufeatures Library</a>
- </li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/debug.html">
- <span class="en">Debugging</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/ndk-gdb.html">ndk-gdb</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/ndk-stack.html">ndk-stack</a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/libs.html">
- <span class="en">Libraries</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/prebuilts.html">Prebuilt Libraries</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/cpp-support.html">C++ Support</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/stable_apis.html">Stable APIs</a></li>
-
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/audio/index.html">
- <span class="en">Audio</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/basics.html">Basics</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/opensl-for-android.html">OpenSL ES for
- Android</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/input-latency.html">Audio Input
- Latency</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/output-latency.html">Audio Output
- Latency</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/floating-point.html">Floating-Point
- Audio</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/sample-rates.html">Sample Rates
- </a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/audio/opensl-prog-notes.html">OpenSL ES Programming Notes
- </a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>ndk/guides/graphics/index.html">
- <span class="en">Vulkan</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/guides/graphics/getting-started.html">
- Getting Started</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/graphics/design-notes.html">
- Design Guidelines</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/graphics/shader-compilers.html">
- Shader Compilers</a></li>
- <li><a href="<?cs var:toroot ?>ndk/guides/graphics/validation-layer.html">
- Validation Layers</a></li>
- </ul>
- </ul>
- </li>
-
-
-</ul>
-
-
-<script type="text/javascript">
-<!--
- buildToggleLists();
- changeNavLang(getLangPref());
-//-->
-</script>
-
diff --git a/docs/html/ndk/guides/images/NDK_build_string.png b/docs/html/ndk/guides/images/NDK_build_string.png
deleted file mode 100644
index 338378b..0000000
--- a/docs/html/ndk/guides/images/NDK_build_string.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/images/NDK_build_string@2x.png b/docs/html/ndk/guides/images/NDK_build_string@2x.png
deleted file mode 100644
index 5ba3ce3..0000000
--- a/docs/html/ndk/guides/images/NDK_build_string@2x.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/images/config-pulldown.png b/docs/html/ndk/guides/images/config-pulldown.png
deleted file mode 100644
index 5af0870..0000000
--- a/docs/html/ndk/guides/images/config-pulldown.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/images/drawcube-output.png b/docs/html/ndk/guides/images/drawcube-output.png
deleted file mode 100644
index 3b7f775..0000000
--- a/docs/html/ndk/guides/images/drawcube-output.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/images/project-pane.png b/docs/html/ndk/guides/images/project-pane.png
deleted file mode 100644
index f6d624b..0000000
--- a/docs/html/ndk/guides/images/project-pane.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/images/verification_screen.png b/docs/html/ndk/guides/images/verification_screen.png
deleted file mode 100644
index 91858ba..0000000
--- a/docs/html/ndk/guides/images/verification_screen.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/images/verification_screen@2x.png b/docs/html/ndk/guides/images/verification_screen@2x.png
deleted file mode 100644
index 0d666c9..0000000
--- a/docs/html/ndk/guides/images/verification_screen@2x.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/guides/index.jd b/docs/html/ndk/guides/index.jd
deleted file mode 100644
index 465ce13..0000000
--- a/docs/html/ndk/guides/index.jd
+++ /dev/null
@@ -1,25 +0,0 @@
-page.title=Getting Started with the NDK
-@jd:body
-
-<p>The Native Development Kit (NDK) is a set of tools that allow you to leverage C and
-C++ code in your Android apps. You can use it either to build from your own source code, or to take
-advantage of existing prebuilt libraries.</p>
-
-<p>The NDK is not appropriate for most novice Android programmers, and has little value for many
-types of Android apps. It is often not worth the additional complexity it inevitably brings to the
-development process. However, it can be useful in cases in which you need to:</p>
-
-<ul>
- <li>Squeeze extra performance out of a device for computationally intensive applications like
- games or physics simulations.</li>
- <li>Reuse your own or other developers' C or C++ libraries.</li>
-</ul>
-
-<p>This guide gives you the information you need to get up and running with the NDK. It starts by
-explaining the <a href="{@docRoot}ndk/guides/concepts.html">concepts</a> underpinning the NDK, and
-how to <a href="{@docRoot}ndk/guides/setup.html">set it up</a>. Next, it continues with information
-about targeting <a href="{@docRoot}ndk/guides/arch.html">different hardware platforms</a> in your
-builds. Then, it explains how to use
-the NDK to <a href="{@docRoot}ndk/guides/build.html">build</a> and
-<a href="{@docRoot}ndk/guides/debug.html">debug</a> your app. Finally, it discusses how to use your
-own and other prebuilt <a href="{@docRoot}ndk/guides/libs.html">libraries</a>.</p>
diff --git a/docs/html/ndk/guides/libs.jd b/docs/html/ndk/guides/libs.jd
deleted file mode 100644
index ea607de..0000000
--- a/docs/html/ndk/guides/libs.jd
+++ /dev/null
@@ -1,13 +0,0 @@
-page.title=Using Existing Libraries
-@jd:body
-
-<p>This section discusses the use of existing libraries–both your own, and those that the NDK
-provides.</p>
-
-<p>It begins by telling you how to use your own <a href="{@docRoot}ndk/guides/prebuilts.html">
-prebuilt libraries</a>. Then, it explains the <a href="{@docRoot}ndk/guides/cpp-support.html">
-C++ helper runtimes</a> available with the NDK, and how to use them. Finally, it provides
-information on <a href="{@docRoot}ndk/guides/stable_apis.html">the other libraries</a> that the NDK provides, such
-as <a href="https://www.khronos.org/opengles/">OpenGL ES</a> and
-<a href="https://www.khronos.org/opensles/">OpenSL ES</a>, and the minimum Android API levels
-required to support those libraries.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/mips.jd b/docs/html/ndk/guides/mips.jd
deleted file mode 100755
index d104ffe..0000000
--- a/docs/html/ndk/guides/mips.jd
+++ /dev/null
@@ -1,43 +0,0 @@
-page.title=MIPS Support
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#over">Overview</a></li>
- <li><a href="#comp">Compatibility</a></li>
- </ol>
- </div>
- </div>
-
-<p>The NDK supports the {@code mips} ABI, which allows native code to run on Android-based devices
-that have CPUs supporting the MIPS32 instruction set.</p>
-
-<h2 id="over">Overview</h2>
-<p>To generate MIPS machine code, include {@code mips} in your
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file's
-{@code APP_ABI} definition. For example: </p>
-
-<pre class="no-pretty-print">
-APP_ABI := mips
-</pre>
-
-<p>For more information about defining the {@code APP_ABI} variable, see
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>.</p>
-
-<p>The build system places generated libraries into {@code $PROJECT/libs/mips/}, where
-{@code $PROJECT} represents your project's root directory, and embeds them in your APK under
-the {@code /lib/mips/} directory.</p>
-
-<p>The Android package manager extracts these libraries when installing your APK on a compatible
-MIPS-based device, placing them under your app's private data directory.</p>
-
-<p>In the Google Play store, the server filters applications so that a consumer sees only the native
-libraries that run on the CPU powering his or her device.</p>
-
-<h2 id="comp">Compatibility</h2>
-<p>MIPS support requires, at minimum, Android 2.3 (Android API level 9). If your project files
-target an older API level, but include MIPS as a targeted platform, the NDK build script
-automatically selects the right set of native platform headers/libraries for you.</p>
diff --git a/docs/html/ndk/guides/ndk-build.jd b/docs/html/ndk/guides/ndk-build.jd
deleted file mode 100755
index e653bf5..0000000
--- a/docs/html/ndk/guides/ndk-build.jd
+++ /dev/null
@@ -1,168 +0,0 @@
-page.title=ndk-build
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#int">Internals</a></li>
- <li><a href="#ifc">Invoking from the Command Line</a></li>
- <li><a href="#6432">64-Bit and 32-Bit Toolchains</a></li>
- <li><a href="#req">Requirements</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<p>The {@code ndk-build} file is a shell script introduced in Android NDK r4. Its purpose
-is to invoke the right NDK build script.
-
-<h2 id="int">Internals</h2>
-
-<p>Running the {@code ndk-build} script is equivalent to running the following command:</p>
-
-<pre class="no-pretty-print">
-$GNUMAKE -f <ndk>/build/core/build-local.mk
-<parameters>
-</pre>
-
-<p><code>$GNUMAKE</code> points to GNU Make 3.81 or later, and
-<code><ndk></code> points to your NDK installation directory. You can use
-this information to invoke ndk-build from other shell scripts, or even your own
-make files.</p>
-
-<h2 id="ifc">Invoking from the Command Line</h2>
-<p>The {@code ndk-build} file lives in the top level the NDK installation directory. To run it
-from the command line, invoke it while in or under your application project directory.
-For example: </p>
-
-<pre class="no-pretty-print">
-cd <project>
-$ <ndk>/ndk-build
-</pre>
-
-<p>In this example, <code><project></code> points to your
-project’s root directory, and <code><ndk></code> is the directory where
-you installed the NDK.</p>
-
-<p><a class="anchor" id="options"></a> </p>
-<h3>Options</h3>
-<p>All parameters to ndk-build are passed directly to the underlying GNU {@code make}
-command that runs the NDK build scripts. Combine <code>ndk-build</code> and
-options in the form <code>ndk-build <option></code>. For example: </p>
-
-<pre class="no-pretty-print">
-$ ndk-build clean
-</pre>
-
-<p>The following options are available:</p>
-<dl>
- <dt>{@code clean}</dt>
- <dd>Remove any previously generated binaries.</dd>
- <dt>{@code V=1}</dt>
- <dd>Launch build, and display build commands.<dd>
- <dt>{@code -B}</dt>
- <dd>Force a complete rebuild.</dd>
- <dt>{@code -B V=1}</dt>
- <dd>Force a complete rebuild, and display build commands.</dd>
- <dt>{@code NDK_LOG=1}</dd>
- <dd>Display internal NDK log messages (used for debugging the NDK itself).</dd>
- <dt>{@code NDK_DEBUG=1}</dt>
- <dd>Force a debuggable build (see <a href="#dvr">Table 1</a>).</dd>
- <dt>{@code NDK_DEBUG=0}</dt>
- <dd>Force a release build (see <a href="#dvr">Table 1</a>).</dd>
- <dt>{@code NDK_HOST_32BIT=1}</dt>
- <dd>Always use the toolchain in 32-bit mode (see <a href="#6432">64-bit and 32-bit
- Toolchains</a>).</dd>
- <dt>{@code NDK_APPLICATION_MK=<file>}</dt>
- <dd>Build, using a specific <code>Application.mk</code> file pointed to by the
- {@code NDK_APPLICATION_MK} variable.</dd>
- <dt>{@code -C <project>}</dt>
- <dd>Build the native code for the project path located at {@code <project>}. Useful if you
- don't want to {@code cd} to it in your terminal.</dd>
-</dl>
-
-<p><a class="anchor" id="dvr"></a> </p>
-<h3>Debuggable versus Release builds</h3>
-<p>Use the <code>NDK_DEBUG</code> option and, in certain cases,
-{@code AndroidManifest.xml} to specify debug or release build,
-optimization-related behavior, and inclusion of symbols. Table 1 shows the
-results of each possible combination of settings.</p>
-<p><em>Table 1.</em> Results of <code>NDK_DEBUG</code> (command line) and
-<code>android:debuggable</code> (manifest) combinations.</p>
-<table>
-<tr>
-<th></th><th>NDK_DEBUG=0 </th><th>NDK_DEBUG=1</th><th>NDK_DEBUG not specified
-</th></tr>
-<tr>
-<td>android:debuggble="true" </td><td>Debug; Symbols; Optimized*1
-</td><td>Debug; Symbols; Not optimized*2 </td><td>(same as NDK_DEBUG=1)
-</td></tr>
-<tr>
-<td>android:debuggable="false"</td><td>Release; Symbols; Optimized
-</td><td>Release; Symbols; Not optimized</td><td>Release; No symbols;
-Optimized*3 </td></tr>
-</table>
-*1: Useful for profiling.<br>
-*2: Default for running <a href="{@docRoot}ndk/guides/ndk-gdb.html">{@code ndk-gdb}</a>.<br>
-*3: Default mode.<br>
-<br>
-<p class="note"><strong>Note:</strong> {@code NDK_DEBUG=0} is the equivalent of
-{@code APP_OPTIM=release}, and complies with the GCC {@code -O2} option. {@code NDK_DEBUG=1} is the
-equivalent of {@code APP_OPTIM=debug} in {@code Application.mk}, and complies with the GCC
-{@code -O0} option. For more information about {@code APP_OPTIM}, see
-<a href="{@docRoot}ndk/guides/application_mk.html">Application.mk</a>.</p>
-<p>The syntax on the command line is, for example: </p>
-
-<pre class="no-pretty-print">
-$ ndk-build NDK_DEBUG=1
-</pre>
-
-<p>If you are using build tools from prior to SDK r8, you must also modify your
-{@code AndroidManifest.xml} file to specify debug mode. The syntax for doing so resembles the
-following:</p>
-
-<pre class="no-pretty-print"><application android:label="@string/app_name"
-android:debuggable="true">
-</pre>
-
-From SDK r8 onward, you do not need to touch {@code AndroidManifest.xml}. Building a debug package
-(e.g. with ant debug or the corresponding option of the ADT plugin) causes the tool automatically to
-pick the native debug files generated with {@code NDK_DEBUG=1}.
-
-
-<h2 id="6432">64-Bit and 32-Bit Toolchains</h2>
-<p>Some toolchains come with both 64-bit and 32-bit versions. For example,
-directories {@code <ndk>/toolchain/<name>/prebuilt/} and
-{@code <ndk>/prebuilt/} may contain both {@code linux-x86} and
-{@code linux-x86_64} folders for Linux tools in 32-bit and 64-bit modes,
-respectively. The ndk-build script automatically chooses a 64-bit version of
-the toolchain if the host OS supports it. You can force the use of a 32-bit
-toolchain by using {@code NDK_HOST_32BIT=1} either in your environment or
-on the ndk-build command line.</p>
-<p>Note that 64-bit tools utilize host resources better (for instance, they are faster, and handle
-larger programs), and they can still generate 32-bit binaries for Android.</p>
-
-<h2 id="req">Requirements</h2>
-<p>You need GNU Make 3.81 or later to use ndk-build or the NDK in general.
-The build scripts will detect a non-compliant Make tool, and generate an error
-message.</p>
-<p>If you have GNU Make 3.81 installed, but the default <code>make</code>
-command doesn’t launch it, define {@code GNUMAKE} in your environment to point to it
-before launching ndk-build. For example: </p>
-
-<pre class="no-pretty-print">
-$ export GNUMAKE=/usr/local/bin/gmake
-$ ndk-build
-</pre>
-
-<p>You can override other host prebuilt tools in {@code $NDK/prebuilt/<OS>/bin/}
-with the following environment variables: </p>
-
-<pre class="no-pretty-print">
-$ export NDK_HOST_AWK=<path-to-awk>
-$ export NDK_HOST_ECHO=<path-to-echo>
-$ export NDK_HOST_CMP=<path-to-cmp>
-</pre>
diff --git a/docs/html/ndk/guides/ndk-gdb.jd b/docs/html/ndk/guides/ndk-gdb.jd
deleted file mode 100755
index 1a990f0..0000000
--- a/docs/html/ndk/guides/ndk-gdb.jd
+++ /dev/null
@@ -1,231 +0,0 @@
-page.title=ndk-gdb
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#req">Requirements</a></li>
- <li><a href="#use">Usage</a></li>
- <li><a href="#thread">Thread Support</a></li>
- </ol>
- </div>
- </div>
-
-<p>The NDK includes a helper shell script named {@code ndk-gdb} to easily launch a native debugging
- session for your NDK-generated machine code.</p>
-
-<h2 id="req">Requirements</h2>
-
-<p>For native debugging to work, you must follow these requirements:</p>
-
-<ul>
-<li>Build your app using the {@code ndk-build} script. The {@code ndk-gdb} script
-does not support using the legacy {@code make APP=<name>} method to build.</p></li>
-<li>Enable app debugging in your {@code AndroidManifest.xml} file by including an
-{@code <application>} element that sets the {@code android:debuggable} attribute to {@code
-true}.</li>
-<li>Build your app to run on Android 2.2 (Android API level 8) or higher.</li>
-<li>Debug on a device or emulator running Android 2.2 or higher.
- For debugging purposes, the target
-API level that you declare in your {@code AndroidManifest.xml} file does not matter.</li>
-<li>Develop your app in a Unix shell. On Windows, use <a href="https://www.cygwin.com/">Cygwin</a>
-or the experimental {@code ndk-gdb-py} <a href="https://www.python.org/">Python</a>
-implementation.</li>
-<li>Use GNU Make 3.81 or higher.</li></ul>
-
-<h2 id="use">Usage</h2>
- To invoke the {@code ndk-gdb} script, change into the application directory or any directory under
- it. For example:</p>
-
-<pre class="no-pretty-print">
-cd $PROJECT
-$NDK/ndk-gdb
-</pre>
-
-<p>Here, {@code $PROJECT} points to your project's root directory, and {@code $NDK} points to your
-NDK installation path.</p>
-
-<p>When you invoke {@code ndk-gdb}, it configures the session to look for your source files
-and symbol/debug versions of your generated native libraries. On successfully attaching to your
-application process, {@code ndk-gdb} outputs a long series of error messages, noting that it cannot
-find various system libraries. This is normal, because your host machine does not contain
-symbol/debug versions of these libraries on your target device. You can safely ignore these
-messages.</p>
-
-<p>Next, {@code ndk-gdb} displays a normal GDB prompt.</p>
-
-<p>You interact with {@code ndk-gdb} in the same way as you would with GNU GDB. For example, you can
-use {@code b <location>} to set breakpoints, and {@code c} (for "continue") to
-resume execution. For a comprehensive list of commands, see the
-<a href="http://www.gnu.org/software/gdb/">GDB manual.</a></p>
-
-<p>Note that when you quit the GDB prompt, the application process that you're debugging stops. This
-behavior is a gdb limitation.</p>
-
-<p>{@code ndk-gdb} handles many error conditions, and displays an informative error message if it
-finds a problem. these checks include making sure that the following conditions are satisfied:</p>
-
-<ul>
-<li>Checks that ADB is in your path.</li>
-<li>Checks that your application is declared debuggable in its manifest.</li>
-<li>Checks that, on the device, the installed application with the same package name is also
-debuggable.</li>
-</ul>
-
-<p>By default, {@code ndk-gdb} searches for an already-running application process, and displays an
-error if it doesn't find one. You can, however, use the {@code --start} or
-{@code --launch=<name>} option to automatically start your activity before the debugging
-session. For more information, see <a href="#opt">Options</a>.</p>
-
-
-<h3 id="opt">Options</h3>
-<p>To see a complete list of options, type {@code ndk-gdb --help} on the command line. Table 1
-shows a number of the more commonly used ones, along with brief descriptions.</p>
-
-<p class="table-caption" id="table1">
- <strong>Table 1.</strong> Common ndk-gdb options and their descriptions.</p>
-
-<table>
-<tr>
-<th>Option</th>
-<th>Description></th>
-<tr>
-
-<tr>
-<td>{@code --verbose}</td>
-<td><p>This option tells the build system to print verbose information about the native-debugging
-session setup. It is necessary only for debugging problems when the debugger can't connect to the
-app, and the error messages that {@code ndk-gdb} displays are not enough.</p></td>
-</tr>
-
-<tr>
-<td>{@code --force}</td>
-<td>By default, {@code ndk-gdb} aborts if it finds that another native debugging session is already
- running on the same device. This option kills the other session, and replaces it with a new one.
- Note that this option does not kill the actual app being debugged, which you must kill
- separately.</td>
-</tr>
-
-<tr>
-<td>{@code --start}</td>
-<td><p>When you start {@code ndk-gdb}, it tries by default to attach to an existing running instance of
-your app on the target device. You can override this default behavior by using {@code --start} to
-explicitly launch the application on the target device before the debugging session.</p></td>
-
-<p>Starting {@code ndk-gdb} with this option specified launches the first launchable activity listed
-in your application manifest. Use {@code --launch=<name>} to start the next launchable
-activity. To dump the list of launchable activities, run {@code --launch-list} from the command
-line.</p>
-</tr>
-
-<tr>
-<td>{@code --launch=<name>}</td>
-<td><p>This option is similar to {@code --start}, except that it allows you to start a specific
- activity from your application. This feature is only useful if your manifest defines multiple
- launchable activities.</p></td>
-</tr>
-
-<tr>
-<td>{@code --launch-list}</td>
-<td><p>This convenience option prints the list of all launchable activity names found in your
- app manifest. {@code --start} uses the first activity name.</p></td>
-</tr>
-
-<tr>
-<td>{@code --project=<path>}</td>
-<td>This option specifies the app project directory. It is useful if you want to launch the
- script without first having to change to the project directory.</p></td>
-</tr>
-
-<tr>
-<td>{@code --port=<port>}</td>
-<td> <p>By default, {@code ndk-gdb} uses local TCP port 5039 to communicate with the app it
- is debugging on the target device. Using a different port allows you to natively debug programs
- running on different devices or emulators connected to the same host machine.</p></td>
-</tr>
-
-<tr>
-<td>{@code --adb=<file>}</td>
-<td><p>This option specifies the <a href="{@docRoot}tools/help/adb.html">adb</a>
-tool executable. It is only necessary if you have not set your path to include that executable.</p>
-</td>
-</tr>
-
-<tr>
-<td>
-<li>{@code -d}</li>
-<li>{@code -e}</li>
-<li>{@code -s <serial>}</li></td>
-<td><p>These flags are similar to the adb commands with the same names. Set these flags if you have
-several devices or emulators connected to your host machine. Their meanings are as follows:</p>
-<dl>
- <dt>{@code -d}</dt>
- <dd>Connect to a single physical device.</dd>
- <dt>{@code -e}</dt>
- <dd>Connect to a single emulator device.</dd>
- <dt>{@code -s <serial>}</dt>
- <dd>Connect to a specific device or emulator. Here, {@code <serial>} is the device's name
- as listed by the {@code adb devices} command.</dd>
-</dl>
-
-<p>Alternatively, you can define the {@code ADB_SERIAL} environment variable to list a specific
-device, without the need for a specific option.</p></td>
-</tr>
-
-<tr>
-<td>
-<li>{@code --exec=<file>}</li>
-<li>{@code -x <file>}</li>
-</td>
-<td><p>This option tells {@code ndk-gdb} to run the GDB initialization commands found in
-{@code <file>} after connecting to the process it is debugging. This is a useful feature if
-you want to do something repeatedly, such as setting up a list of breakpoints, and then resuming
-execution automatically.</p></td>
-</tr>
-
-<tr>
-<td>{@code --nowait}</td>
-<td><p>Disable pausing the Java code until GDB connects. Passing this option may cause the debugger
- to miss early breakpoints.</p>
-</tr>
-
-<tr>
-<td>{@code --tui}
-{@code -t}</td>
-<td><p>Enable Text User Interface if it is available.</p></td>
-</tr>
-
-<tr>
-<td>{@code --gnumake-flag=<flag>}</td>
-<td><p>This option is an extra flag (or flags) to pass to the
-{@code ndk-build} system when
-querying it for project information. You can use multiple instances of this option in the
-same command.</p></td>
-</tr>
-
-<tr>
-<td>{@code --stdcxx-py-pr={auto|none|gnustdcxx[-GCCVER]|stlport}}</td>
-<td><p>Use specified Python pretty-printers for displaying types in the Standard C++ Library.
- {@code auto} mode works by looking at the {@code .so} files for a {@code libstdc++} library,
- and as such only works for a shared library. When linking statically to a {@code libstdc++} library,
- you must specify the required printers. The default is {@code none}.</p></td>
-</tr>
-</table>
-
-<p class="note"><strong>Note: </strong>The final three options in this table are only for the
-Python version of {@code ndk-gdb}.</p></td>
-
-<h2 id="thread">Thread Support</h2>
-<p>If your app runs on a platform older than Android 2.3 (API level 9), {@code ndk-gdb}
-cannot debug native threads properly. The debugger can only debug the main thread, abd completely
-ignores the execution of other threads.</p>
-
-<p>If you place a breakpoint on a function executed on a non-main thread, the program exits, and
-GDB displays the following message:</p>
-
-<pre class="no-pretty-print">
-Program terminated with signal SIGTRAP, Trace/breakpoint trap.
- The program no longer exists.
-</pre>
diff --git a/docs/html/ndk/guides/ndk-stack.jd b/docs/html/ndk/guides/ndk-stack.jd
deleted file mode 100644
index 45d433c..0000000
--- a/docs/html/ndk/guides/ndk-stack.jd
+++ /dev/null
@@ -1,86 +0,0 @@
-page.title=ndk-stack
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#use">Usage</a></li>
- </ol>
- </div>
- </div>
-
-<p>The {@code ndk-stack} tool allows you to filter stack traces as they appear in the
-output of <a href="{@docRoot}tools/help/logcat.html">{@code adb logcat}</a>. It also replaces any
-address inside a shared library with the corresponding
-{@code <source-file>:<line-number>} values from your source code, making issues easier
-to pinpoint.</p>
-
-<p>For example, it translates something like:</p>
-
-<pre>
-I/DEBUG ( 31): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
-I/DEBUG ( 31): Build fingerprint: 'generic/google_sdk/generic/:2.2/FRF91/43546:eng/test-keys'
-I/DEBUG ( 31): pid: 351, tid: 351 %gt;%gt;%gt; /data/local/ndk-tests/crasher <<<
-I/DEBUG ( 31): signal 11 (SIGSEGV), fault addr 0d9f00d8
-I/DEBUG ( 31): r0 0000af88 r1 0000a008 r2 baadf00d r3 0d9f00d8
-I/DEBUG ( 31): r4 00000004 r5 0000a008 r6 0000af88 r7 00013c44
-I/DEBUG ( 31): r8 00000000 r9 00000000 10 00000000 fp 00000000
-I/DEBUG ( 31): ip 0000959c sp be956cc8 lr 00008403 pc 0000841e cpsr 60000030
-I/DEBUG ( 31): #00 pc 0000841e /data/local/ndk-tests/crasher
-I/DEBUG ( 31): #01 pc 000083fe /data/local/ndk-tests/crasher
-I/DEBUG ( 31): #02 pc 000083f6 /data/local/ndk-tests/crasher
-I/DEBUG ( 31): #03 pc 000191ac /system/lib/libc.so
-I/DEBUG ( 31): #04 pc 000083ea /data/local/ndk-tests/crasher
-I/DEBUG ( 31): #05 pc 00008458 /data/local/ndk-tests/crasher
-I/DEBUG ( 31): #06 pc 0000d362 /system/lib/libc.so
-I/DEBUG ( 31):
-</pre>
-
-<p>into the more readable output: </p>
-
-<pre>
-********** Crash dump: **********
-Build fingerprint: 'generic/google_sdk/generic/:2.2/FRF91/43546:eng/test-keys'
-pid: 351, tid: 351 >>> /data/local/ndk-tests/crasher <<<
-signal 11 (SIGSEGV), fault addr 0d9f00d8
-Stack frame #00 pc 0000841e /data/local/ndk-tests/crasher : Routine zoo in /tmp/foo/crasher/jni/zoo.c:13
-Stack frame #01 pc 000083fe /data/local/ndk-tests/crasher : Routine bar in /tmp/foo/crasher/jni/bar.c:5
-Stack frame #02 pc 000083f6 /data/local/ndk-tests/crasher : Routine my_comparison in /tmp/foo/crasher/jni/foo.c:9
-Stack frame #03 pc 000191ac /system/lib/libc.so
-Stack frame #04 pc 000083ea /data/local/ndk-tests/crasher : Routine foo in /tmp/foo/crasher/jni/foo.c:14
-Stack frame #05 pc 00008458 /data/local/ndk-tests/crasher : Routine main in /tmp/foo/crasher/jni/main.c:19
-Stack frame #06 pc 0000d362 /system/lib/libc.so
-</pre>
-
-<h2>Usage</h2>
-<p>To use {@code ndk-stack}, you first need a directory containing symbolic versions of your app's
-shared libraries. If you use the NDK build system ({@code ndk-build}), these shared-library
-files reside under {@code $PROJECT_PATH/obj/local/<abi>}, where {@code <abi>} represents
-your device's ABI. By default, the system uses the {@code armeabi} ABI.</p>
-
-<p>There are two ways to use the tool. You can feed the logcat text as direct input to the program.
-For example:</p>
-
-<pre class="no-pretty-print">
-adb logcat | $NDK/ndk-stack -sym $PROJECT_PATH/obj/local/armeabi
-</pre>
-
-<p>You can also use the {@code -dump} option to specify the logcat as an input file. For example:
-</p>
-
-<pre class="no-pretty-print">
-adb logcat > /tmp/foo.txt
-$NDK/ndk-stack -sym $PROJECT_PATH/obj/local/armeabi -dump foo.txt
-</pre>
-
-<p>When it begins parsing the logcat output, the tool looks for an initial line of asterisks.
-For example:</p>
-
-<pre class="no-pretty-print">
-*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
-</pre>
-
-<p class="note"><strong>Note: </strong>When copy/pasting traces, don't forget this line, or
-{@code ndk-stack} won't work correctly.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/prebuilts.jd b/docs/html/ndk/guides/prebuilts.jd
deleted file mode 100644
index 4cb1819..0000000
--- a/docs/html/ndk/guides/prebuilts.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=Using Prebuilt Libraries
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#dm">Declaring a Prebuilt Library</a></li>
- <li><a href="#rp">Referencing the Prebuilt Library from Other Modules</a></li>
- <li><a href="#dp">Debugging Prebuilt Libraries</a></li>
- <li><a href="#sa">Selecting ABIs for Prebuilt Libraries</a></li>
- </ol>
- </div>
- </div>
-
-<p>The NDK supports the use of prebuilt libraries, both static and shared. There are two principal
-use cases for this functionality:</p>
-
-<ul>
- <li>Distributing your own libraries to third-party NDK developers without distributing your
- sources.</li>
- <li>Using a prebuilt version of your own libraries to speed up your build.</li>
-</ul>
-
-<p>This page explains how to use prebuilt libraries.</p>
-
-<h2 id="dm">Declaring a Prebuilt Library</h2>
-<p>You must declare each prebuilt library you use as a <em>single</em> independent module. To do
- so, perform the following steps:
-
-<ol type="1">
- <li>Give the module a name. This name does not need to be the same as that of the prebuilt
- library, itself.</li>
- <li>In the module's <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>
- file, assign to {@code LOCAL_SRC_FILES} the path to the prebuilt library you are providing.
- Specify the path relative to the value of your {@code LOCAL_PATH} variable.</p>
- <p class="note"><strong>Note: </strong> You must make sure to select the version of your prebuilt
- library appropriate to your target ABI. For more information on ensuring library support for
- ABIs, see <a href="#sa">Selecting ABIs for Prebuilt Libraries.</a></p></li>
- <li>Include {@code PREBUILT_SHARED_LIBRARY} or {@code PREBUILT_STATIC_LIBRARY}, depending on
- whether you are using a shared ({@code .so}) or static ({@code .a}) library.</li>
-</ol>
-
- <p>Here is a trivial example that assumes the prebuilt library {@code libfoo.so} resides in
- the same directory as the <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>
- file that describes it.</p>
-
-<pre>
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := foo-prebuilt
-LOCAL_SRC_FILES := libfoo.so
-include $(PREBUILT_SHARED_LIBRARY)
-</pre>
-
-<p>In this example, the name of the module is the same as that of the prebuilt library.</p>
-
-<p>The build system places a copy of your prebuilt shared library into {@code $PROJECT/obj/local},
-and another copy, stripped of debug information, into {@code $PROJECT/libs/<abi>}. Here,
-{@code $PROJECT} is the root directory of your project.</p>
-
-<h2 id="rp">Referencing the Prebuilt Library from Other Modules</h2>
-<p>To reference a prebuilt library from other modules, specify its name as the value
-of the {@code LOCAL_STATIC_LIBRARIES} or {@code LOCAL_SHARED_LIBRARIES} variable in the
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> files associated with those
-other modules.</p>
-
-<p>For example, the description of a module using {@code libfoo.so} might be as follows:</p>
-
-<pre>
-include $(CLEAR_VARS)
-LOCAL_MODULE := foo-user
-LOCAL_SRC_FILES := foo-user.c
-LOCAL_SHARED_LIBRARIES := foo-prebuilt
-include $(BUILD_SHARED_LIBRARY)
-</pre>
-
-<p>Here, {@code LOCAL_MODULE} is the name of the module referring to the prebuilt; {@code
- LOCAL_SHARED_LIBRARIES} is the name of the prebuilt, itself.</p>
-
-<h2>Exporting Headers for Prebuilt Libraries</h2>
-<p>The code in {@code foo-user.c} depends on specific declarations that normally
-reside in a header file, such as {@code foo.h}, distributed with the prebuilt library.
-For example, {@code foo-user.c} might have a line like the following:</p>
-
-<pre>
-#include <foo.h>
-</pre>
-
-<p>In such a case, you need to provide the header and its include path to the compiler when you
-build the {@code foo-user} module. A simple way to accomplish this task is to use exports in the
-prebuilt module definition. For example, as long as header {@code foo.h} is located under the
-{@code include} directory associated with the prebuilt module, you can declare it as follows:</p>
-
-<pre>
-include $(CLEAR_VARS)
-LOCAL_MODULE := foo-prebuilt
-LOCAL_SRC_FILES := libfoo.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-</pre>
-
-<p>The {@code LOCAL_EXPORT_C_INCLUDES} definition here ensures that the build system
-exports the path to the prebuilt library's {@code include} directory, prepending that path onto the
-value of the {@code LOCAL_C_INCLUDES} for the module dependent on it.</p>
-
-<p>This operation allows the build system to find the necessary headers.</p>
-
-<h2 id="dp">Debugging Prebuilt Libraries</h2>
-<p>We recommend that you provide prebuilt shared libraries containing debug symbols. The NDK build
-system always strips the symbols from the version of the library that it installs into
-{@code $PROJECT/libs/<abi>/}, but you can use the debug version for debugging with
-{@code ndk-gdb}.</p>
-
-<h2 id="sa">Selecting ABIs for Prebuilt Libraries</h2>
-<p>You must make sure to select the right version of your prebuilt shared library for your targeted
-ABI. The <a href="{@docRoot}ndk/guides/android_mk.html#taa">
-{@code TARGET_ARCH_ABI}</a> variable in the <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file can point the build system at the appropriate version of the library.
-</p>
-
-<p>For example, assume that your project contains two versions of library {@code libfoo.so}:</p>
-
-<pre class="no-pretty-print">
-armeabi/libfoo.so
-x86/libfoo.so
-</pre>
-
-<p>The following snippet shows how to use {@code TARGET_ARCH_ABI} so that the build system selects
- the appropriate version of the library:</p>
-
-<pre>
-include $(CLEAR_VARS)
-LOCAL_MODULE := foo-prebuilt
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libfoo.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-</pre>
-
-<p>If you have specified {@code armeabi} as the value of {@code TARGET_ARCH_ABI}, the build system
-uses the version of {@code libfoo.so} located in the {@code armeabi} directory. If you have
-specified {@code x86} as the value {@code TARGET_ARCH_ABI}, the build system uses the version in the
-{@code x86} directory.</p>
diff --git a/docs/html/ndk/guides/sample.jd b/docs/html/ndk/guides/sample.jd
deleted file mode 100644
index 18ca0b8..0000000
--- a/docs/html/ndk/guides/sample.jd
+++ /dev/null
@@ -1,11 +0,0 @@
-page.title=Sample Walkthroughs
-@jd:body
-
-<div class="contents">
-<div class="textblock"><p>This section explains several of the sample apps provided with the NDK. It assumes that you already have a working knowledge of programming in Java and native code, and focuses on issues particular to working with the NDK.</p>
-<p>It discusses the following samples:</p>
-<ul>
-<li><a href="./md_2__samples_sample--hellojni.html">hello-jni</a>: A very basic app that illustrates core workings of the NDK.</li>
-<li><a href="./md_2__samples_sample--nativeactivity.html">native-activity</a>: An app that shows the fundamentals of how to construct a purely native app. It places particular emphasis on the android_native_app_glue library.</li>
-<li><a href="./md_2__samples_samples-teapot.html">Teapot</a>: A simple OpenGL demo, showcasing the <code>ndk_helper</code> class. </li>
-</ul>
\ No newline at end of file
diff --git a/docs/html/ndk/guides/setup.jd b/docs/html/ndk/guides/setup.jd
deleted file mode 100644
index 1459bfe..0000000
--- a/docs/html/ndk/guides/setup.jd
+++ /dev/null
@@ -1,94 +0,0 @@
-page.title=Setup
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#install">Installation</a></li>
- <li><a href="#configure">Configuring Eclipse</a></li>
- <li><a href="#verify">Verification</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-
-<div class="contents">
-<div class="textblock"><p>This document explains how to:</p>
-<ul>
-<li><a href="#install">Get</a> and install the NDK.</li>
-<li><a href="#configure">Configure</a> your system and the Eclipse and the Android Development Tool
-(ADT) for use with it.</li>
-<li><a href="#verify">Verify</a>, using a simple sample, that everything is working as expected.
-</li>
-</ul>
-<p>This document assumes that you are already familiar with Java-based Android development. For more
-information on that topic, see the
-<a href="{@docRoot}">Android developer site</a>.</p>
-
-<h2 id="install">Installation</h2>
-<p>To install and configure the NDK, follow these steps:</p>
-<ol type="1">
-<li>Get and install the <a href="{@docRoot}studio/index.html">Android SDK</a>.</li>
-<li><a href="{@docRoot}ndk/downloads/index.html">Download</a> and
-<a href="{@docRoot}ndk/downloads/index.html#extract">extract</a> the NDK,
-making sure to download the correct version for your development platform. You may place the
-unzipped directory anywhere on your local drive.</li>
-<li>Update your {@code PATH} environment variable with the location of the directory that
-contains the NDK.</li>
-</ol>
-
-
-<h2 id="configure">Configuring Eclipse</h2>
-<p>Eclipse must know where the NDK is in order to use it when building your app. Follow these steps
-to set the location of the NDK.</p>
-<ol type="1">
-<li>Launch Eclipse, which is installed as part of the Android SDK.</li>
-<li>Open <b>Window</b> > <b>Preferences</b>.</li>
-<li>In the pane on the left side of the <i>Preferences</i> window, select <i>Android</i>.
-The <i>Android</i> section expands, revealing a number of subsections.</li>
-<li>Select <b>NDK</b>. In the pane on the right side of the <i>Preferences</i> window, browse to
-the directory that contains the NDK.</li>
-<li>Click <b>OK</b> to return to the <i>Package Explorer</i> display.</li>
-</ol>
-
-<h2 id="verify">Verification</h2>
-<h3>Eclipse</h3>
-<p>To confirm that you have installed the NDK, set it up correctly, and properly configured Eclipse,
-follow these steps:</p>
-<ol type="1">
-<li>Import the hello-jni sample from {@code <ndk>/samples/}, as you would any other Android
-project.</li>
-<li>In the <i>Project Explorer</i> pane, right-click the project name (<i>HelloJni</i>). A
-context menu appears.</li>
-<li>From the context menu, select <b>Android Tools</b> > <b>Add Native Support</b>. The
-<i>Add Android Native Support</i> window appears.</li>
-<li>Accept the default library name (“hello-jni”), and click <b>Finish</b>.</li>
-<li>Build and execute the application.</li>
-</ol>
-<h3>Command line</h3>
-<p>Follow these steps to build from the command line:</p>
-<ol type="1">
-<li>Change to the root directory of your project.</li>
-<li>Execute ndk-build to build the native component of your app. do this by
-typing {@code ndk-build} at the command prompt.</li>
-<li>Build and install your project as you would a regular Android app written in Java. For more
-information, see
-<a href="{@docRoot}tools/building/index.html">Building and Running</a> and
-<a href="{@docRoot}tools/building/building-cmdline.html">Building and Running
-from the Command Line</a>.</li>
-</ol>
-
-<p>If you have successfully installed and configured the NDK, the screen on your target device looks
-as shown in Figure 1.</p>
-
-<img src="./images/verification_screen.png" srcset="./images/verification_screen@2x.png 2x"
-alt="Output: Hello from JNI!" id="figure1" />
-
-<p class="img-caption">
-<strong>Figure 1.</strong> Target-device screen after successful launch.
-</p>
diff --git a/docs/html/ndk/guides/stable_apis.jd b/docs/html/ndk/guides/stable_apis.jd
deleted file mode 100644
index c38e684..0000000
--- a/docs/html/ndk/guides/stable_apis.jd
+++ /dev/null
@@ -1,501 +0,0 @@
-page.title=Android NDK Native APIs
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#purpose">Overview</a></li>
- <li><a href="#mnu">Major Native API Updates</a><li>
- <ol>
- <li><a href="#a3">Android API level 3</a></li>
- <li><a href="#a4">Android API level 4</a></li>
- <li><a href="#a5">Android API level 5</a></li>
- <li><a href="#a8">Android API level 8</a></li>
- <li><a href="#a9">Android API level 9</a></li>
- <li><a href="#a14">Android API level 14</a></li>
- <li><a href="#a18">Android API level 18</a></li>
- </ol>
- </ol>
- </div>
- </div>
-
-<p>The Android NDK provides a set of native headers and shared library files that has gradually
-increased with successive releases of new Android API levels. This page explains these headers and
-files, and maps them to specific
-<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels"> Android API levels</a>.
-</p>
-
-<h2 id="purpose">Overview</h2>
-<p>There are two basic steps to enable your app to use the libraries that the NDK provides:
-</p>
-
-<ol type ="1">
-<li>Include in your code the headers associated with the libraries you wish to use.</li>
-
-<li>Tell the build system that your native module needs to link against the libraries at load time.
-For example, to link against {@code /system/lib/libfoo.so}, add the following line to your
-<a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a> file:</li>
-
-<pre>
-LOCAL_LDLIBS := -lfoo
-</pre>
-
-<p>To list multiple libraries, use a space as a delimiter. For more information about using the
-{@code LOCAL_LDLIBS} variable, see <a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>.
-</p>
-
-</ol>
-
-<p>For all API levels, the build system automatically links the standard C libraries, the
-standard C++ libraries, real-time extensions, and {@code pthread}; you do not need
-to include them when defining your {@code LOCAL_LDLIBS} variable. For more information about
-the C and C++ libraries, see <a href="#a3">Android API level 3</a>.</p>
-
-<p>The NDK often provides new headers and libraries for new Android releases. These files reside
-under {@code $NDK/platforms/android-<level>/<abi>/usr/include}. When the NDK does not
-have a specific new group of headers and libraries for an Android API level, it means that
-an app targeting that level should use the most recently released NDK assets. For example,
-there was no new release of NDK headers or libraries for Android API levels 6 and 7. Therefore,
-when developing an app targeting Android API level 7, you should use the headers and libraries
-located under {@code android-5/}.</p>
-
-<p>Table 1 shows the correspondence between NDK-supported API levels and Android releases.</p>
-
-<p class="table-caption" id="table1">
- <strong>Table 1.</strong> NDK-supported API levels and corresponding Android releases.</p>
-<table>
- <tr>
- <th scope="col">NDK-supported API level</th>
- <th scope="col">Android release</th>
- </tr>
- <tr>
- <td>3</td>
- <td>1.5</td>
- </tr>
- <tr>
- <td>4</td>
- <td>1.6</td>
- </tr>
- <tr>
- <td>5</td>
- <td>2.0</td>
- </tr>
- <tr>
- <td>8</td>
- <td>2.2</td>
- </tr>
- <tr>
- <td>9</td>
- <td>2.3 through 3.0.x</td>
- </tr>
- <tr>
- <td>12</td>
- <td>3.1.x</td>
- </tr>
- <tr>
- <td>13</td>
- <td>3.2</td>
- </tr>
- <tr>
- <td>14</td>
- <td>4.0 through 4.0.2</td>
- </tr>
- <tr>
- <td>15</td>
- <td>4.0.3 and 4.0.4</td>
- </tr>
- <tr>
- <td>16</td>
- <td>4.1 and 4.1.1</td>
- </tr>
- <tr>
- <td>17</td>
- <td>4.2 and 4.2.2</td>
- </tr>
- <tr>
- <td>18</td>
- <td>4.3</td>
- </tr>
- <tr>
- <td>19</td>
- <td>4.4</td>
- </tr>
- <tr>
- <td>21</td>
- <td>4.4W and 5.0</td>
-</table>
-
-<p>Each new release of NDK headers and libraries for a given Android API level is cumulative; you
-are nearly always safe if you use the most recently released headers when building your app. For
-example, you can use the NDK headers for Android API level 21 for an app targeting API level 16. By doing so, however, you increase your APK's footprint.</p>
-
-<p>
-For more information about Android API levels, see
-<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">What is API Level?</a>.
-</p>
-
-<h2 id="mnu">Major Native API Updates</h2>
-
-<h3 id="a3">Android API level 3</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 1.5 system
-images and above.</p>
-
-<h4>C library</h4>
-<p>The C library headers for Android 1.5 are available through their standard names, such as
-{@code stdlib.h} and {@code stdio.h}. If a header is missing at build time, it's because the
-header is not available on the 1.5 system image.</p>
-
-<h4>C++ library</h4>
-<p>An <em>extremely</em> minimal C++ support API is available. For more
-information on C++ library support, see
-<a href="{@docRoot}ndk/guides/cpp-support.html">C++ Library Support</a>.</p>
-
-<h4>Android-specific log support</h4>
-
-<p>{@code <android/log.h>} contains various definitions that an app can use to send log
-messages to the kernel from native code. For more information about these definitions, see the
-comments in {@code $NDK/platforms/android-3/arch-arm/usr/include/android/log.h}, where {@code $NDK}
-is the root of your NDK installation.</p>
-
-<p>You can write your own wrapper macros to access this functionality. If you wish to perform
-logging, your native module should link to {@code /system/lib/liblog.so}. Implement this
-linking by including the following line in your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS := -llog
-</pre>
-
-<h4>ZLib compression library</h4>
-<p>You can use the <a href="http://www.zlib.net/manual.html">Zlib compression library</a>
-by including {@code zlib.h} and {@code zconf.h}. You must also link your native
-module against {@code /system/lib/libz.so} by including the following line in your
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS := -lz
-</pre>
-
-<h4>Dynamic linker library</h4>
-<p>You can access the Android dynamic linker's {@code dlopen()}, {@code dlsym()}, and
-{@code dlclose()} functions by including {@code dlfcn.h}. You must also link against
-{@code /system/lib/libdl.so} by including the following line in your
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS := -ldl
-</pre>
-
-<h3 id="a4">Android API level 4</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 1.6 system
-images and above.</p>
-
-<h4>OpenGL ES 1.x Library</h4>
-<p>The standard OpenGL ES headers {@code gl.h} and {@code glext.h} contain
-the declarations necessary for performing OpenGL ES 1.x rendering calls from native code.</p>
-
-<p>To use these headers, link your native module to {@code /system/lib/libGLESv1_CM.so} by
-including the following line in your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-</p>
-
-<pre>
-LOCAL_LDLIBS := -lGLESv1_CM
-</pre>
-<p>All Android-based devices support OpenGL ES 1.0, because Android provides an Open GL 1.0-capable
-software renderer that can be used on devices without GPUs.</p>
-<p>Only Android devices that have the necessary GPU fully support OpenGL ES 1.1. An app can
-query the OpenGL ES version string and extension string to determine whether the current device
-supports the features it needs. For information on how to perform this query, see the description of
-<a href="http://www.khronos.org/opengles/sdk/1.1/docs/man/glGetString.xml">{@code glGetString()}</a>
-in the OpenGL specification.</p>
-
-<p>Additionally, you must put a
-<a href="http://developer.android.com/guide/topics/manifest/uses-feature-element.html">{@code
-<uses-feature>}</a> tag in your manifest file to indicate the version of
-<a href="http://developer.android.com/guide/topics/graphics/opengl.html#manifest">OpenGL ES</a>
-that your application requires.</p>
-
-<p>The <a href="#egl">EGL APIs</a> are only available starting from API level 9. You can, however,
-use the VM to perform some of the operations that you would get from those APIS. These operations
-include surface creation and flipping. For an example of how to use {@code GLSurfaceView}, see
-<a href="http://android-developers.blogspot.com/2009/04/introducing-glsurfaceview.html">
-Introducing GLSurfaceView</a>.</p>
-
-<p>The san-angeles sample application provides an example of how to perform these operations,
-rendering each frame in native code. This sample is a small Android port of the excellent
-<a href="http://jet.ro/visuals/san-angeles-observation/">San Angeles Observation</a> demo
-program.</p>
-
-<h3 id="a5">Android API level 5</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 2.0 system
-images and above.</p>
-
-<h4>OpenGL ES 2.0 library:</h4>
-<p>The standard OpenGL ES 2.0 headers {@code <GLES2/gl2.h>} and {@code <GLES2/gl2ext.h>}
-contain the declarations needed for performing OpenGL ES 2.0 rendering calls from native code.
-These rendering calls provide the ability to use the GLSL language to define and use vertex and
-fragment shaders.</p>
-
-<p>To use OpenGL ES 2.0, link your native module to {@code /system/lib/libGLESv2.so} by
-including the following line in your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS := -lGLESv2
-</pre>
-
-<p>Not all devices support OpenGL ES 2.0. An app can query the OpenGL
-ES version string and extension string to determine whether the current device
-supports the features it needs. For information on how to perform this query, see the description of
-<a href="https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetString.xml">
-{@code glGetString()}</a> in the OpenGL specification.</p>
-
-<p>Additionally, you must put a
-<a href="http://developer.android.com/guide/topics/manifest/uses-feature-element.html">{@code
-<uses-feature>}</a> tag in your manifest file to indicate which version of OpenGL ES your
-application requires. For more information about the OpenGL ES settings for
-{@code <uses-feature>}, see
-<a href="http://developer.android.com/guide/topics/graphics/opengl.html#manifest">OpenGL ES</a>.</p>
-
-<p>The hello-gl2 sample application provies a basic example of how to use OpenGL ES 2.0 with the
-NDK.</p>
-
-<p>The <a href="#egl">EGL APIs</a> are only available starting from API level 9. You can, however,
-use the VM to perform some of the operations that you would get from those APIs. These operations
-include surface creation and flipping. For an example of how to use {@code GLSurfaceView}, see
-<a href="http://android-developers.blogspot.com/2009/04/introducing-glsurfaceview.html">
-Introducing GLSurfaceView</a>.</p>
-
-<p class="note"><strong>Note:</strong> The Android emulator does not support OpenGL ES 2.0 hardware
-emulation. Running and testing code that uses this API requires a real device with hardware that can
-support OpenGL ES 2.0.</p>
-
-<h3 id="a8">Android API level 8</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 2.2 system
-images and above.</p>
-
-<h4>jnigraphics</h4>
-<p>The {@code jnigraphics} library exposes a C-based interface that allows native code to reliably access
-the pixel buffers of Java bitmap objects. The workflow for using {@code jnigraphics} is as follows:
-</p>
-
-<ol type="1">
-<li>Use {@code AndroidBitmap_getInfo()} to retrieve information from JNI, such as width and height,
-about a given bitmap handle.</li>
-
-<li>Use {@code AndroidBitmap_lockPixels()} to lock the pixel buffer and retrieve a pointer to it.
-Doing so ensures that the pixels do not move until the app calls
-{@code AndroidBitmap_unlockPixels()}.</li>
-
-<li>In native code, modify the pixel buffer as appropriate for its pixel format, width, and other
-characteristics.</li>
-
-<li>Call {@code AndroidBitmap_unlockPixels()} to unlock the buffer.</li>
-</ol>
-
-<p>To use {@code jnigraphics}, include the {@code <bitmap.h>} header in your source code, and
-link against {@code jnigraphics} by including the following line in your
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS += -ljnigraphics
-</pre>
-
-<p>Additional details about this feature are in the comments of the {@code bitmap.h} file.
-
-<h3 id="a9">Android API level 9</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 2.3 system
-images and above.</p>
-
-<h4 id="egl"> EGL</h4>
-<p>EGL provides a native platform interface for allocating and managing OpenGLES surfaces.
-For more information about its features, see <a href="http://www.khronos.org/egl">
-EGL Native Platform Interface</a>.</p>
-
-<p>EGL allows you to perform the following operations from native code:</p>
-
-<ul>
-<li>List supported EGL configurations.</li>
-<li>Allocate and release OpenGLES surfaces.</li>
-<li>Swap or flip surfaces.</li>
-</ul>
-
-<p>The following headers provide EGL functionality:</p>
-<ul>
- <li>{@code EGL/egl.h}: the main EGL API definitions.</li>
- <li>{@code EGL/eglext.h}: EGL extension-related definitions.</li>
-</ul>
-
-<p>To link against the system's EGL library, add the following line to your
-<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS += -lEGL
-</pre>
-
-<h4 id="osl">OpenSL ES</h4>
-<p>Android native audio handling is based on the Khronos Group OpenSL ES 1.0.1 API.</p>
-
-<p>The standard OpenSL ES headers {@code OpenSLES.h} and {@code OpenSLES_Platform.h} contain
-the declarations necessary for performing audio input and output from the native side of Android.
-The NDK distribution of the OpenSL ES also provides Android-specific extensions. For information
-about these extensions, see the comments in {@code OpenSLES_Android.h} and
-{@code OpenSLES_AndroidConfiguration.h}.</p>
-
-
-<p>The system library {@code libOpenSLES.so} implements the public native audio functions. Link
-against it by adding the following line to your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS += -lOpenSLES
-</pre>
-
-<p>For more information about the OpenSL ES API, refer to
-{@code $NDK/docs/Additional_library_docs/opensles/index.html}, where {@code $NDK} is your NDK
-installation root directory.</p>
-
-<h4>Android native application APIs</h4>
-<p>Starting from API level 9, you can write an entire Android app with native code, without using
-any Java.</p>
-
-<p class="note"><strong>Note: </strong>Writing your app in native code is not, in itself, enough
-for your app to run in the VM. Moreover, your app must still access most features of the Android
-platform via JNI.</p>
-
-<p>This release provides the following native headers:</p>
-<ul>
-<li>{@code <native_activity.h>}</li>
-<li>{@code <looper.h>}</li>
-<li>{@code <input.h>}</li>
-<li>{@code <keycodes.h>}</li>
-<li>{@code <sensor.h>}</li>
-<li>{@code <rect.h>}</li>
-<li>{@code <window.h>}</li>
-<li>{@code <native_window.h>}</li>
-<li>{@code <native_window_jni.h>}</li>
-<li>{@code <configuration.h>}</li>
-<li>{@code <asset_manager.h>}</li>
-<li>{@code <storage_manager.h>}</li>
-<li>{@code <obb.h>}</li>
-</ul>
-
-<p>For more information about these headers, see the
-<a href="{@docRoot}ndk/reference/index.html">NDK API Reference documentation</a>, as well as
-the comments in the headers, themselves. Also, for more information about the larger topic of
-writing native apps, see <a href="{@docRoot}ndk/guides/concepts.html#naa">
-Native Activities and Applications</a>.
-
-<p>When you include one or more of these headers, you must also link against the
-{@code libandroid.so} library. To link against {@code libandroid.so}, include the following line in
-your <a href="{@docRoot}ndk/guides/android_mk.html"> {@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS += -landroid
-</pre>
-
-<h3 id="a14">Android API level 14</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 4.0 system
-images and above.</p>
-
-<h4>OpenMAX AL</h4>
-<p>Android native multimedia handling is based on Khronos Group OpenMAX AL 1.0.1 API.</p>
-<p>The standard OpenMAX AL headers {@code <OMXAL/OpenMAXAL.h>} and
-{@code <OMXAL/OpenMAXAL_Platform.h>} contain the declarations necessary for performing
-multimedia output from the native side of Android.</p>
-
-<p>The NDK distribution of OpenMAX AL also provides Android-specific extensions. For information
-about these extensions, see the comments in {@code OpenMAXAL_Android.h}.</p>
-
-<p>The system library {@code libOpenMAXAL.so} implements the public native multimedia functions.
-To link against this library, include the following line in your
-<a href="{@docRoot}ndk/guides/android_mk.html"> {@code Android.mk}</a> file:</p>
-
-<pre class="fragment"> LOCAL_LDLIBS += -lOpenMAXAL
-</pre><p>For more information about this topic, see {@code $NDK/docs/openmaxal/index.html},
-where {@code $NDK} is the root directory of your NDK installation.</p>
-
-<h4>OpenSL ES</h4>
-<p>OpenSL ES support for this Android API level adds PCM support. For more information about
-OpenSL ES support in the NDK, see <a href="#osl">OpenSL ES</a>.</p>
-
-<h3 id="a18">Android API level 18</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 4.3 system
-images and above.</p>
-
-<h4>OpenGL ES 3.0</h4>
-
-<p>The standard OpenGL ES 3.0 headers {@code gl3.h} and {@code gl3ext.h} contain the declarations
-needed for performing OpenGL ES 3.0 rendering calls from native code. These rendering calls provide
-the ability to use the GLSL language to define and use vertex and fragment shaders.
-
-<p>To use OpenGL ES 3.0, link your native module against {@code /system/lib/libGLESv3.so} by
-including the following line in your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS := -lGLESv3
-</pre>
-
-<p>Not all devices support OpenGL ES 3.0. An app can query the OpenGL
-ES version string and extension string to determine whether the current device
-supports the features it needs. For information on how to perform this query, see the description of
-<a href="https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetString.xml">
-{@code glGetString()}</a> in the OpenGL specification.</p>
-
-<p>Additionally, you must put a
-<a href="http://developer.android.com/guide/topics/manifest/uses-feature-element.html">{@code
-<uses-feature>}</a> tag in your manifest file to indicate which version of OpenGL ES your
-application requires. For more information about the OpenGL ES settings for
-{@code <uses-feature>}, see
-<a href="http://developer.android.com/guide/topics/graphics/opengl.html#manifest">OpenGL ES</a>.</p>
-
-<p>The gles3jni sample application provides a basic example of how to use OpenGL ES 3.0 with the
-NDK.</p>
-
-<p class="note"><strong>Note:</strong> The Android emulator does not support OpenGL ES 3.0 hardware
-emulation. Running and testing code that uses this API requires a real device with hardware that can
-support OpenGL ES 3.0.</p>
-
-
-<h3 id="a18">Android API level 21</h3>
-<p>The NDK provides the following APIs for developing native code that runs on Android 4.3 system
-images and above.</p>
-
-<h4>OpenGL ES 3.1</h4>
-
-<p>The standard OpenGL ES 3.1 headers {@code gl31.h} and {@code gl3ext.h} contain the declarations
-needed for performing OpenGL ES 3.1 rendering calls from native code. These rendering calls provide
-the ability to use the GLSL language to define and use vertex and fragment shaders.
-
-<p>To use OpenGL ES 3.1, link your native module against {@code /system/lib/libGLESv3.so} by
-including the following line in your <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> file:</p>
-
-<pre>
-LOCAL_LDLIBS := -lGLESv3
-</pre>
-
-<p>Not all devices support OpenGL ES 3.1. An app can query the OpenGL
-ES version string and extension string to determine whether the current device
-supports the features it needs. For information on how to perform this query, see the description of
-<a href="https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetString.xml">
-{@code glGetString()}</a> in the OpenGL specification.</p>
-
-<p>Additionally, you must put a
-<a href="http://developer.android.com/guide/topics/manifest/uses-feature-element.html">{@code
-<uses-feature>}</a> tag in your manifest file to indicate which version of OpenGL ES your
-application requires. For more information about the OpenGL ES settings for
-{@code <uses-feature>}, see
-<a href="http://developer.android.com/guide/topics/graphics/opengl.html#manifest">OpenGL ES</a>.</p>
-
-<p>The gles3jni sample application provides a basic example of how to use OpenGL ES 3.1 with the
-NDK.</p>
-
-<p class="note"><strong>Note:</strong> The Android emulator does not support OpenGL ES 3.1 hardware
-emulation. Running and testing code that uses this API requires a real device with hardware that can
-support OpenGL ES 3.1.</p>
-
diff --git a/docs/html/ndk/guides/standalone_toolchain.jd b/docs/html/ndk/guides/standalone_toolchain.jd
deleted file mode 100755
index 7a6f906..0000000
--- a/docs/html/ndk/guides/standalone_toolchain.jd
+++ /dev/null
@@ -1,605 +0,0 @@
-page.title=Standalone Toolchain
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#syt">Selecting Your Toolchain</a></li>
- <li><a href="#sys">Selecting Your Sysroot</a></li>
- <li><a href="#itc">Invoking the Compiler</a></li>
- <li><a href="#wwc">Working with Clang</a></li>
- <li><a href="#abi">ABI Compatibility</a></li>
- <li><a href="#war">Warnings and Limitations</a></li>
- </ol>
- </div>
- </div>
-
-<p>You can use the toolchains provided with the Android NDK independently, or as plug-ins
-with an existing IDE. This flexibility
-can be useful if you already have your own build system, and only need the ability to invoke the
-cross-compiler in order to add support to Android for it.</p>
-
-<p>A typical use case is invoking the configure script of an open-source library that expects a
-cross-compiler in the {@code CC} environment variable.</p>
-
-<p class="note"><strong>Note:</strong> This page assumes significant understanding of
-compiling, linking, and low-level architecture. In addition, the techniques it describes are
-unnecessary for most use cases. In most cases, we recommend that you forego using a standalone
-toolchain, and instead stick to the NDK build system.</p>
-
-<h2 id="syt">Selecting Your Toolchain</h2>
-<p>Before anything else, you need to decide which processing architecture your standalone toolchain
-is going to target. Each architecture corresponds to a different toolchain name, as Table 1
-shows.</p>
-
-<p class="table-caption" id="table1">
- <strong>Table 1.</strong> {@code APP_ABI} settings for different instruction sets.</p>
-<table>
- <tr>
- <th scope="col">Architecture</th>
- <th scope="col">Toolchain name</th>
- </tr>
- <tr>
- <td>ARM-based</td>
- <td>{@code arm-linux-androideabi-<gcc-version>}</td>
- </tr>
- <tr>
- <td>x86-based</td>
- <td>{@code x86-<gcc-version>}</td>
- </tr>
- <tr>
- <td>MIPS-based</td>
- <td>{@code mipsel-linux-android-<gcc-version>}</td>
- </tr>
- <tr>
- <td>ARM64-based</td>
- <td>{@code aarch64-linux-android-<gcc-version>}</td>
- </tr>
- <tr>
- <td>X86-64-based</td>
- <td>{@code x86_64-<gcc-version>}</td>
- </tr>
- <tr>
- <td>MIPS64-based</td>
- <td>{@code mips64el-linux-android--<gcc-version>}</td>
- </tr>
-</table>
-
-
-
-<h2 id="sys">Selecting Your Sysroot</h2>
-<p>The next thing you need to do is define your <i>sysroot</i> (A sysroot is a directory containing
-the system headers and libraries for your target). To define the sysroot, you must must know the
-Android API level you want to target for native support; available native APIs vary by Android API
-level.</p>
-
-<p>Native APIs for the respective <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">
-Android API levels</a> reside under {@code $NDK/platforms/}; each API-level
-directory, in turn, contains subdirectories for the various CPUs and architectures. The
-following example shows how to define a <em>sysroot</em> for a build targeting Android 5.0
-(API level 21), for ARM architecture:</p>
-
-<pre class="no-pretty-print">
-SYSROOT=$NDK/platforms/android-21/arch-arm
-</pre>
-
-For more detail about the Android API levels and the respective native APIs they support, see
-<a href={@docRoot}ndk/guides/stable_apis.html>Android NDK Native APIs</a>.
-
-<h2 id="itc">Invoking the Compiler</h2>
-
-<p>There are two ways to invoke the compiler. One method is simple, and leaves most of the lifting
-to the build system. The other is more advanced, but provides more flexibility.</p>
-
-<h3 id="sm">Simple method</h3>
-<p>The simplest way to build is by invoking the appropriate compiler directly from the command
-line, using the {@code --sysroot} option to indicate the location of the system files for the
-platform you're targeting. For example:</p>
-
-<pre class="no-pretty-print">
-export CC="$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/ \
-linux-x86/bin/arm-linux-androideabi-gcc-4.8 --sysroot=$SYSROOT"
-$CC -o foo.o -c foo.c
-</pre>
-
-<p>While this method is simple, it lacks in flexibility: It does not allow you to use any C++ STL
-(STLport, libc++, or the GNU libstdc++) with it. It also does not support exceptions or RTTI.</p>
-
-<p>For Clang, you need to perform an additional two steps:</p>
-<ul>
-<ol type="1">
-<li>Add the appropriate {@code -target} for the target architecture, as Table 2 shows.</li>
-
-<p class="table-caption" id="table2">
- <strong>Table 2.</strong> Architectures and corresponding values for {@code -target}.</p>
- <table>
- <tr>
- <th scope="col">Architecture</th>
- <th scope="col">Value</th>
- </tr>
- <tr>
- <td>armeabi</td>
- <td>{@code -target armv5te-none-linux-androideabi}</td>
- </tr>
- <tr>
- <td>armeabi-v7a</td>
- <td>{@code -target armv7-none-linux-androideabi}</td>
- </tr>
- <tr>
- <td>arm64-v8a</td>
- <td>{@code -target aarch64-none-linux-android}</td>
- </tr>
- <tr>
- <td>x86</td>
- <td>{@code -target i686-none-linux-android}</td>
- </tr>
- <tr>
- <td>x86_64</td>
- <td>{@code -target x86_64-none-linux-android}</td>
- </tr>
- <tr>
- <td>mips</td>
- <td>{@code -target mipsel-none-linux-android}</td>
- </tr>
-</table>
-
-<li>Add assembler and linker support by adding the {@code -gcc-toolchain} option, as in the
-following example:</li>
-<pre class="no-pretty-print">
--gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64
-</pre>
-</ol>
-
-Ultimately, a command to compile using Clang might look like this:
-
-<pre class="no-pretty-print">
-export CC="$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/ \
-linux-x86/bin/arm-linux-androideabi-gcc-4.8 --sysroot=$SYSROOT" -target \
-armv7-none-linux-androideabi \
--gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64"
-$CC -o foo.o -c foo.c
-</pre>
-</ul>
-
-<h3>Advanced method</h3>
-<p>The NDK provides the {@code make-standalone-toolchain.sh} shell script to allow you to perform a
-customized toolchain installation from the command line. This approach affords you more flexibility
-than the procedure described in <a href="#sm">Simple method</a>.</p>
-
-<p>The script is located in the {@code $NDK/build/tools/} directory, where {@code $NDK} is the
-installation root for the NDK. An example of the use of this script appears below:</p>
-
-<pre class="no-pretty-print">
-$NDK/build/tools/make-standalone-toolchain.sh \
---arch=arm --platform=android-21 --install-dir=/tmp/my-android-toolchain
-</pre>
-
-<p>This command creates a directory named {@code /tmp/my-android-toolchain/}, containing a copy of
-the {@code android-21/arch-arm} sysroot, and of the toolchain binaries for a 32-bit ARM
-architecture.</p>
-
-<p>Note that the toolchain binaries do not depend on or contain host-specific paths, in other words,
-you can install them in any location, or even move them if you need to.</p>
-
-<p>By default, the build system uses the 32-bit, ARM-based GCC 4.8 toolchain. You can specify a
-different value, however, by specifying {@code --arch=<toolchain>} as an option.
-Table 3 shows the values to use for other toolchains:
-
-<p class="table-caption" id="table3">
- <strong>Table 3.</strong> Toolchains and corresponding values, using {@code --arch}.</p>
- <table>
- <tr>
- <th scope="col">Toolchain</th>
- <th scope="col">Value</th>
- </tr>
- <tr>
- <td>mips64 compiler</td>
- <td>{@code --arch=mips64}</td>
- </tr>
- <tr>
- <td>mips GCC 4.8 compiler</td>
- <td>{@code --arch=mips}</td>
- </tr>
- <tr>
- <td>x86 GCC 4.8 compiler</td>
- <td>{@code --arch=x86}</td>
- </tr>
- <tr>
- <td>x86_64 GCC 4.8 compiler</td>
- <td>{@code --arch=x86_64}</td>
- </tr>
- <tr>
- <td>mips GCC 4.8 compiler</td>
- <td>{@code --arch=mips}</td>
- </tr>
-</table>
-
-<p>Alternatively, you can use the {@code --toolchain=<toolchain>} option. Table 4 shows the
-values you can specify for {@code <toolchain>}:</p>
-
-<p class="table-caption" id="table4">
- <strong>Table 4.</strong> Toolchains and corresponding values, using {@code --toolchain}.</p>
- <table>
- <tr>
- <th scope="col">Toolchain</th>
- <th scope="col">Value</th>
- </tr>
-
- <tr>
- <td>arm</td>
- <td>
- <li>{@code --toolchain=arm-linux-androideabi-4.8}</li>
- <li>{@code --toolchain=arm-linux-androideabi-4.9}</li>
- <li>{@code --toolchain=arm-linux-android-clang3.5}</li>
- <li>{@code --toolchain=arm-linux-android-clang3.6}</li>
- </td>
- </tr>
- <tr>
- <td>x86</td>
- <td>
- <li>{@code --toolchain=x86-linux-android-4.8}</li>
- <li>{@code --toolchain=x86-linux-android-4.9}</li>
- <li>{@code --toolchain=x86-linux-android-clang3.5}</li>
- <li>{@code --toolchain=x86-linux-android-clang3.6}</li>
- </td>
- </tr>
- <tr>
- <td>mips</td>
- <td>
- <li>{@code --toolchain=mips-linux-android-4.8}</li>
- <li>{@code --toolchain=mips-linux-android-4.9}</li>
- <li>{@code --toolchain=mips-linux-android-clang3.5}</li>
- <li>{@code --toolchain=mips-linux-android-clang3.6}</li>
- </td>
- </tr>
-
- <tr>
- <td>arm64</td>
- <td>
- <li>{@code --toolchain=aarch64-linux-android-4.9}</li>
- <li>{@code --toolchain=aarch64-linux-android-clang3.5}</li>
- <li>{@code --toolchain=aarch64-linux-android-clang3.6}</li>
- </td>
- </tr>
- <tr>
- <td>x86_64</td>
- <td>
- <li>{@code --toolchain=x86_64-linux-android-4.9}</li>
- <li>{@code --toolchain=x86_64-linux-android-clang3.5}</li>
- <li>{@code --toolchain=x86_64-linux-android-clang3.6}</li>
- </td>
- </tr>
- <tr>
- <td>mips64</td>
- <td>
- <li>{@code --toolchain=mips64el-linux-android-4.9}</li>
- <li>{@code --toolchain=mips64el-linux-android-clang3.5}</li>
- <li>{@code --toolchain=mips64el-linux-android-clang3.6}</li>
- </td>
- </tr>
-</table>
-
-<p class="note"><strong>Note: </strong> Table 4 is not an exhaustive list. Other combinations may
-also be valid, but are unverified.</p>
-
-<p>You can also copy Clang/LLVM 3.6, using one of two methods: You can append {@code -clang3.6} to
-the {@code --toolchain} option, so that the {@code --toolchain} option looks like the following
-example:
-
-<pre class="no-pretty-print">
---toolchain=arm-linux-androideabi-clang3.6
-</pre>
-
-<p>You can also add {@code -llvm-version=3.6} as a separate option on the command
-line.</p>
-
-<p class="note"><strong>Note: </strong>Instead of specifying a specific version, you can also
-use {@code <version>}, which defaults
-to the highest available version of Clang.</p>
-
-<p>By default, the build system builds for a 32-bit host toolchain. You can specify a 64-bit
-host toolchain instead. Table 5 shows the value to use with {@code -system} for different
-platforms.</p>
-
-<p class="table-caption" id="table5">
- <strong>Table 5.</strong> Host toolchains and corresponding values, using {@code -system}.</p>
- <table>
- <tr>
- <th scope="col">Host toolchain</th>
- <th scope="col">Value</th>
- </tr>
- <tr>
- <td>64-bit Linux</td>
- <td>{@code -system=linux-x86_64}</td>
- </tr>
- <tr>
- <td>64-bit MacOSX</td>
- <td>{@code -system=darwin-x86_64}</td>
- </tr>
- <tr>
- <td>64-bit Windows</td>
- <td>{@code -system=windows-x86_64}</td>
- </tr>
-</table>
-
-For more information on specifying a 64- or 32-bit instruction host toolchain, see
-<a href="{@docRoot}ndk/guides/ndk-build.html#6432">64-Bit and 32-Bit Toolchains</a>.
-
-<p>You may specify {@code --stl=stlport} to copy {@code libstlport} instead of the default
-{@code libgnustl}. If you do so, and you wish to link against the shared library, you must
-explicitly use {@code -lstlport_shared}. This requirement is similar to having to use
-{@code -lgnustl_shared} for GNU {@code libstdc++}.</p>
-
-<p>Similarly, you can specify {@code --stl=libc++} to copy the LLVM libc++ headers and libraries.
-To link against the shared library, you must explicitly use -lc++_shared.</p>
-
-<p>You can make these settings directly, as in the following example:</p>
-
-<pre class="no-pretty-print">
-export PATH=/tmp/my-android-toolchain/bin:$PATH
-export CC=arm-linux-androideabi-gcc # or export CC=clang
-export CXX=arm-linux-androideabi-g++ # or export CXX=clang++
-</pre>
-
-<p>Note that if you omit the {@code -install-dir} option, the {@code make-standalone-toolchain.sh}
-shell script creates a tarball in {@code tmp/ndk/<toolchain-name>.tar.bz2}. This tarball makes
-it easy to archive, as well as to redistribute the binaries.</p>
-
-<p>This standalone toolchain provides an additional benefit, as well, in that it contains a working
-copy of a C++ STL library, with working exceptions and RTTI support.</p>
-
-<p>For more options and details, use {@code --help}.</p>
-
-<h2 id="wwc">Working with Clang</h2>
-<p>You can install Clang binaries in the standalone installation by using the
-{@code --llvm-version=<version>} option. {@code <version>} is a LLVM/Clang version
-number, such as {@code 3.5} or {@code 3.6}. For example:
-
-<pre class="no-pretty-print">
-build/tools/make-standalone-toolchain.sh \
---install-dir=/tmp/mydir \
---toolchain=arm-linux-androideabi-4.8 \
---llvm-version=3.6
-</pre>
-
-<p>Note that Clang binaries are copied along with the GCC ones, because they rely on the same
-assembler, linker, headers, libraries, and C++ STL implementation.</p>
-
-<p>This operation also installs two scripts, named {@code clang} and {@code clang++}, under
-{@code <install-dir>/bin/@}. These scripts invoke the real {@code clang} binary with default
-target architecture flags. In other words, they should work without any modification, and you should
-be able to use them in your own builds by just setting the {@code CC} and {@code CXX} environment
-variables to point to them.</p>
-
-<h4>Invoking Clang</h4>
-<p>In an ARM standalone installation built with {@code llvm-version=3.6}, invoking
-<a href="http://clang.llvm.org/">Clang</a> on a Unix system takes the form of a single line. For
-instance:</p>
-
-<pre class="no-pretty-print">
-`dirname $0`/clang36 -target armv5te-none-linux-androideabi "$@"
-</pre>
-
-<p><code>clang++</code> invokes <code>clang++31</code> in the same way.</p>
-
-<h4>Clang targets with ARM</h4>
-
-<p>When building for ARM, Clang changes the target based on the presence of the
-{@code -march=armv7-a} and/or {@code -mthumb} options:</p>
-
-<p class="table-caption" id="table5">
- <strong>Table 5.</strong> Specifiable {@code -march} values and their resulting targets.</p>
- <table>
- <tr>
- <th scope="col">{@code -march} value</th>
- <th scope="col">Resulting target</th>
- </tr>
- <tr>
- <td>{@code -march=armv7-a}</td>
- <td>{@code armv7-none-linux-androideabi}</td>
- </tr>
- <tr>
- <td>{@code -mthumb}</td>
- <td>{@code thumb-none-linux-androideabi}</td>
- </tr>
- <tr>
- <td>Both {@code -march=armv7-a} and {@code -mthumb}</td>
- <td>{@code thumbv7-none-linux-androideabi}</td>
- </tr>
-</table>
-
-<p>You may also override with your own {@code -target} if you wish.</p>
-
-<p>The {@code -gcc-toolchain} option is unnecessary because, in a standalone package,
-Clang locates {@code as} and {@code ld} in a predefined relative location. <p>
-
-<p>{@code clang} and {@code clang++} should be easy drop-in replacements for {@code gcc} and
-{@code g++} in a makefile. When in doubt, add the following options to verify that they are
-working properly:</p>
-
-<ul>
-<li>{@code -v} to dump commands associated with compiler driver issues</li>
-<li>{@code -###} to dump command line options, including implicitly predefined ones.</li>
-<li>{@code -x c < /dev/null -dM -E} to dump predefined preprocessor definitions</li>
-<li>{@code -save-temps} to compare {@code *.i} or {@code *.ii} preprocessed files.</li>
-</ul>
-
-<p>For more information about Clang, see
-<a href="http://clang.llvm.org/">http://clang.llvm.org/</a>, especially the GCC compatibility
-section.</p>
-
-
-<h2 id="abi">ABI Compatibility</h2>
-<p>The machine code that the ARM toolchain generates should be compatible with the official Android
-{@code armeabi} <a href="{@docRoot}ndk/guides/abis.html">ABI</a> by default.</p>
-
-<p>We recommend use of the {@code -mthumb} compiler flag to force the generation of 16-bit Thumb-1
-instructions (the default being 32-bit ARM instructions).</p>
-
-<p>If you want to target the armeabi-v7a ABI, you must set the following flags: </p>
-
-<pre class="no-pretty-print">
-CFLAGS= -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16
-</pre>
-
-<p>The first flag enables Thumb-2 instructions. The second flag enables hardware-FPU instructions
-while ensuring that the system passes floating-point parameters in core registers, which is critical
-for ABI compatibility.</p>
-
-<p class="note"><strong>Note: </strong>In versions of the NDK prior to r9b, do not use these flags
-separately. You must set all or none of them. Otherwise, unpredictable behavior and crashes may
-result.</p>
-
-<p>To use NEON instructions, you must change the {@code -mfpu} compiler flag:</p>
-
-<pre class="no-pretty-print">
-CFLAGS= -march=armv7-a -mfloat-abi=softfp -mfpu=neon
-</pre>
-
-<p>Note that this setting forces the use of {@code VFPv3-D32}, per the ARM specification.</p>
-
-<p>Also, make sure to provide the following two flags to the linker:</p>
-
-<pre class="no-pretty-print">
-LDFLAGS= -march=armv7-a -Wl,--fix-cortex-a8
-</pre>
-
-<p>The first flag instructs the linker to pick {@code libgcc.a}, {@code libgcov.a}, and
-{@code crt*.o}, which are tailored for armv7-a. The 2nd flag is required as a workaround for a CPU
-bug in some Cortex-A8 implementations.</p>
-
-<p>Since NDK version r9b, all Android native APIs taking or returning double or float values have
-{@code attribute((pcs("aapcs")))} for ARM. This makes it possible to compile user code in
-{@code -mhard-float} (which implies {@code -mfloat-abi=hard}), and still link with the Android
-native APIs that comply with the softfp ABI. For more information on this, see the comments in
-{@code $NDK/tests/device/hard-float/jni/Android.mk}.</p>
-
-<p>If you want to use NEON intrinsics on x86, the build system can translate them to the native x86
-SSE intrinsics using a special C/C++ language header with the same name, {@code arm_neon.h}, as the
-standard ARM NEON intrinsics header.</p>
-
-<p>By default, the x86 ABI supports SIMD up to SSSE3, and the header covers ~93% of (1869 of 2009)
-NEON functions.</p>
-
-<p>You don't have to use any specific compiler flag when targeting the MIPS ABI.</p>
-
-<p>To learn more about ABI support, see <a href="{@docRoot}ndk/guides/x86.html">x86 Support</a>.</p>
-
-<h2 id="war">Warnings and Limitations</h2>
-<h3>Windows support</h3>
-<p>The Windows binaries do not depend on Cygwin. This lack of dependency makes them faster. The
-cost, however, is that they do not understand Cygwin path specifications like
-{@code cygdrive/c/foo/bar}, as opposed to {@code C:/foo/bar}.</p>
-
-<p>The NDK build system ensures that all paths passed to the compiler from Cygwin are automatically
-translated, and manages other complexities, as well. If you have a custom build system,
-you may need to resolve these complexities yourself.</p>
-
-<p>For information on contributing to support for Cygwin/MSys, visit the android-ndk
-<a href="https://groups.google.com/forum/#!forum/android-ndk">forum</a>.</p>
-
-<h3>wchar_t support</h3>
-
-<p>The Android platform did not really support {@code wchar_t} until Android 2.3 (API level 9). This
-fact has several ramifications:</p>
-<ul>
-<li>If you target platform Android 2.3 or higher, the size of {@code wchar_t} is 4 bytes, and most
-{@code wide-char} functions are available in the C library (with the exception of multi-byte
-encoding/decoding functions and {@code wsprintf}/{@code wsscanf}).</li>
-
-<li>If you target any lower API level, the size of {@code wchar_t} is 1 byte, and none of the
-wide-char functions works.</li>
-</ul>
-
-<p>We recommend that you get rid of any dependencies on the {@code wchar_t} type, and switch to
-better representations. The support provided in Android is only there to help you migrate existing
-code.</p>
-
-<h3>Exceptions, RTTI, and STL</h3>
-<p>The toolchain binaries support C++ exceptions and RTTI by default. To disable C++ exceptions
-and RTTI when building sources (to generate lighter-weight machine code, for example), use
-{@code -fno-exceptions} and {@code -fno-rtti}.</p>
-
-<p>To use these features in conjunction with GNU libstdc++, you must explicitly link with libsupc++.
-To do so, use {@code -lsupc++} when linking binaries. For example:</p>
-
-<pre class="no-pretty-print">
-arm-linux-androideabi-g++ .... -lsupc++
-</pre>
-
-<p>You do not need to do this when using the STLport or libc++ library.</p>
-
-<h3>C++ STL support</h3>
-<p>The standalone toolchain includes a copy of a C++ Standard Template Library implementation. This
-implementation is either for GNU libstdc++, STLport, or libc++, depending on what you specify for the
-{@code --stl=<name>} option described previously. To use this implementation of STL, you need
-to link your project with the proper library:</p>
-
-<ul>
-<li>
-Use {@code -lstdc++} to link against the static library version of any implementation. Doing so
-ensures that all required C++ STL code is included into your final binary. This method is ideal if
-you are only generating a single shared library or executable.</p>
-
-<p>This is the method that we recommend.</p>
-</li>
-
-<li>Alternatively, use {@code -lgnustl_shared} to link against the shared library version of GNU
-{@code libstdc++}. If you use this option, you must also make sure to copy
-{@code libgnustl_shared.so} to your device in order for your code to load properly. Table 6 shows
-where this file is for each toolchain type.
-</li>
-
-<p class="note"><strong>Note: </strong>GNU libstdc++ is licensed under the GPLv3 license, with a
-linking exception. If you cannot comply with its requirements, you cannot redistribute the
-shared library in your project.</p>
-
-
-<li>Use {@code -lstlport_shared} to link against the shared library version of STLport. When you do
-so, you need to make sure that you also copy {@code libstlport_shared.so} to your device in order
-for your code to load properly. Table 6 shows where this file is for each toolchain:</li>
-
-<p class="table-caption" id="table6">
- <strong>Table 6.</strong> Specifiable {@code -march} values and their resulting targets.</p>
- <table>
- <tr>
- <th scope="col">Toolchain</th>
- <th scope="col">Location</th>
- </tr>
- <tr>
- <td>arm</td>
- <td>{@code $TOOLCHAIN/arm-linux-androideabi/lib/}</td>
- </tr>
- <tr>
- <td>arm64</td>
- <td>{@code $TOOLCHAIN/aarch64-linux-android/lib/}</td>
- </tr>
- <tr>
- <td>x86</td>
- <td>{@code $TOOLCHAIN/i686-linux-android/lib/}</td>
- </tr>
- <tr>
- <td>x86_64</td>
- <td>{@code $TOOLCHAIN/x86_64-linux-android/lib/}</td>
- </tr>
- <tr>
- <td>mips</td>
- <td>{@code $TOOLCHAIN/mipsel-linux-android/lib/}</td>
- </tr>
- <tr>
- <td>mips64</td>
- <td>{@code $TOOLCHAIN/mips64el-linux-android/lib/}</td>
- </tr>
-</table>
-
-<p class="note"><strong>Note: </strong>If your project contains multiple shared libraries or
-executables, you must link against a shared-library STL implementation. Otherwise, the build
-system does not define certain global uniquely, which can result in unpredictable runtime behavior.
-This behavior may include crashes and failure to properly catch exceptions.</p>
-
-<p>The reason the shared version of the libraries is not simply called {@code libstdc++.so} is that
-this name would conflict at runtime with the system's own minimal C++ runtime. For this reason,
-the build system enforces a new name for the GNU ELF library. The static library does not have
-this problem.</p>
diff --git a/docs/html/ndk/guides/x86-64.jd b/docs/html/ndk/guides/x86-64.jd
deleted file mode 100644
index c2f0d28..0000000
--- a/docs/html/ndk/guides/x86-64.jd
+++ /dev/null
@@ -1,52 +0,0 @@
-page.title=Support for 64-bit x86
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#over">Overview</a></li>
- <li><a href="#st">Standalone Toolchain</a></li>
- <li><a href="#comp">Compatibilty</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<p>The Android NDK supports the {@code x86_64} ABI. This ABI allows native code to run on
-Android-based devices using CPUs that support the 64-bit x86 instruction set.</p>
-
-<h2 id="over">Overview</h2>
-<p>To generate 64-bit machine code for x86, add {@code x86_64} to the {@code APP_ABI} definition in
-your {@code Application.mk} file. For example:
-
-<pre>
-APP_ABI := x86_64
-</pre>
-
-For more information on how to specify values for {@code APP_ABI}, see
-<a href="{@docRoot}ndk/guides/application_mk.html">Application.mk</a>.</p>
-
-<p>The build system places libraries generated for the {@code x86_64} ABI into
-{@code $PROJECT/libs/x86_64/} on your host machine, where {@code $PROJECT} is the root directory
-of your project. It also embeds them in your APK, under {@code /lib/x86_64/}.</p>
-
-<p>The Android package manager extracts these libraries when installing your APK on a compatible
-64-bit, x86-powered device, placing them under your app's private data directory.</p>
-
-<p>In the Google Play store, the server filters applications so that a consumer sees only the native
-libraries that run on the CPU powering his or her device.</p>
-
-<h2 id="st">Standalone Toolchain</h2>
-
-<p>You can use the 64-bit x86 toolchain in standalone mode with the NDK. For more
-information about doing so, see <a href="{@docRoot}ndk/guides/standalone_toolchain.html">
-Standalone Toolchain</a>, under the "Advanced method" section.
-
-<h2 id="comp">Compatibility</h2>
-<p>The NDK provides native versions of Android APIs for 64-bit x86 machine code starting from
-Android 5.0 (Android API level 21). If your project files target an older API level, but include
-{@code x86_64} as a targeted platform, the NDK build script automatically selects the right set of
-native platform headers and libraries for you.</p>
diff --git a/docs/html/ndk/guides/x86.jd b/docs/html/ndk/guides/x86.jd
deleted file mode 100644
index 3a01b05..0000000
--- a/docs/html/ndk/guides/x86.jd
+++ /dev/null
@@ -1,215 +0,0 @@
-page.title=x86 Support
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#over">Overview</a></li>
- <li><a href="#an">ARM NEON Intrinsics Support</a></li>
- <li><a href="#st">Standalone Toolchain</a></li>
- <li><a href="#comp">Compatibility</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<p>The NDK includes support for the {@code x86} ABI, which allows native code to run on
-Android-based devices running on CPUs supporting the IA-32 instruction set.</p>
-
-<h2 id="over">Overview</h2>
-<p>To generate x86 machine code, add {@code x86} to the {@code APP_ABI} definition in your
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. For example:</p>
-
-<pre class="no-pretty-print">
-APP_ABI := armeabi armeabi-v7a x86
-</pre
-
-<p>For more information about defining the {@code APP_ABI} variable, see
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>.</p>
-
-<p>The build system places generated libraries into {@code $PROJECT/libs/x86/}, where
-{@code $PROJECT} represents your project's root directory, and embeds them in your APK under
-{@code /lib/mips/}.</p>
-
-<p>The Android package extracts these libraries when installing your APK on a compatible x86-based
-device, placing them under your app's private data directory.</p>
-
-<p>In the Google Play store, the server filters applications so that a consumer sees only the native
-libraries that run on the CPU powering his or her device.</p>
-
-<h2 id="an">x86 Support for ARM NEON Intrinsics</h2>
-<p>Support for ARM NEON intrinsics is provided in the form of C/C++ language headers with the same
-name as the standard ARM NEON intrinsics header, {@code arm_neon.h}. These headers are available for
-all NDK x86 toolchains. They translate NEON intrinsics to native x86 SSE ones.</p>
-
-<p>Characteristics of this solution include the following:</p>
-<ul>
-<li>Default use of SSE through SSSE3 for porting ARM NEON to Intel SSE, covering ~93%
-(1869 of total 2009) of all NEON functions.</li>
-<li>Redefinition of ARM NEON 128 bit vectors into the equivalent x86 SIMD data.</li>
-<li>Redefinition of some functions from ARM NEON to Intel SSE if a 1:1 correspondence exists.</li>
-<li>Implementation of some ARM NEON functions using Intel SIMD if it will yield a performant result.
-</li>
-<li>Implementation of some of the remaining NEON functions using the serial solution, and issuing
-the corresponding "low performance" compiler warning.</li>
-</ul>
-
-
-<h3>Performance</h3>
-<p>In most cases, you should be able to attain performance similar to what you would get from ARM
-NEON code. Recommendations for best results include:</p>
-
-<ul>
-<li>Use 16-byte data alignment for faster load and store.</li>
-<li>Avoid using constants with NEON functions. Using constants results in a performance penalty due
-to having to load constants. If you must use constants, try to initialize them outside of hotspot
-loops. If possible, replace them with logical and compare operations.</li>
-<li>Try to avoid functions marked as "serially implemented" because they need to store data from
-registers to memory. Instead, process them serially and reload them. You may be able to change the
-data type or algorithm used to vectorize the whole port instead of leaving it as a serial one.</li>
-</ul>
-
-<p>For more information on this topic, see
-<a href="http://software.intel.com/en-us/blogs/2012/12/12/from-arm-neon-to-intel-mmxsse-automatic-porting-solution-tips-and-tricks">
-From ARM NEON to Intel SSE– the automatic porting solution, tips and tricks</a>.</p>
-
-<h3>Known differences from ARM version</h3>
-<p>In the great majority of cases, x86 implementations produce the same results as ARM
-implementations for NEON. x86 implementations pass
-<a href="https://gitorious.org/arm-neon-tests/arm-neon-tests">NEON tests</a> nearly 100% of the
-time. Still, there are several corner cases in which an x86 implementation produces results
-different from its ARM counterpart. Known incompatibilities are as follows:</p>
-
-<ul>
-<li>{@code VRECPS/VRECPSQ}<br/>
- If one of the operands is +/- infinity and the second is +/- 0.0:
- <ul>
- <li>On ARM CPUs, these instructions
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489h/CIHDIACI.html">
- return a result element equal to 2.0</a>.</li>
-
- <li>x86 CPUs return {@code QNaN Indefinite}. For more information about the QNaN floating-point
- indefinite, see "4.2.2 Floating-Point Data Types" and "4.8.3.7 QNaN Floating-Point Indefinite,"
- in the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s Manual</a>.
- </li>
-
- </ul>
-</li>
-<li>{@code VRSQRTS/VRSQRTSQ}<br/>
- If one of the operands is +/- infinity and the second is +/- 0.0:
- <ul>
- <li>On ARM CPUs, these instructions
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489h/CIHDIACI.html">
- return a result element equal to 1.5</a>.</li>
-
- <li>x86 CPUs return {@code QNaN Indefinite}. For more information about the QNaN floating-point
- indefinite, see "4.2.2 Floating-Point Data Types" and "4.8.3.7 QNaN Floating-Point Indefinite,"
- in the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s Manual</a>.
- </li>
- </ul>
-</li>
-
-<li>{@code VMAX/VMAXQ}<br/>
- If one of the operands is NaN, or both operands are +/- 0.0:
- <ul>
- <li>On ARM CPUs, floating-point maximum works as follows:
- <ul>
- <li>max(+0.0, -0.0) = +0.0.</li>
- <li>If any input is a NaN, the corresponding result element is the default NaN.</li>
- </ul>
- To learn more about this condition and result, see the
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489h/CIHDEEBE.html">
- ARM Compiler toolchain Assembler Reference</a>, ignoring the "Superseded" watermark.
- </li>
-
- <li>On x86 CPUs, floating-point maximum works as follows:
- <ul>
- <li>If one of the source operands is NaN, then return the second source operand.</li>
- <li>If both source operands are equal to 0, then return the second source operand.</li>
- </ul>
- For more information about these conditions and results, see Volume 1 Appendix E chapter
- E.4.2.3 and Volume 2, p 3-488, of the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s
- Manual</a>.
- </li>
- </ul>
-</li>
-
-<li>{@code VMIN/VMINQ}<br/>
- If one of the operands is NaN or both are +/- 0.0:
- <ul>
- <li>On ARM CPUs floating-point minimum works as follows:
- <ul>
- <li>min(+0.0, -0.0) = -0.0.</li>
- <li>If any input is a NaN, the corresponding result element is the default NaN.</li>
- </ul>
- To learn more about this condition and result, see the
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489h/CIHDEEBE.html">
- ARM Compiler toolchain Assembler Reference</a>, ignoring the "Superseded" watermark.
- </li>
- <li>On x86 CPUs floating-point minimum works as follows:
- <ul>
- <li>If one of the source operands is NaN, than return the second source operand.</li>
- <li>If both source operands are equal to 0, than return the second source operand.</li>
- </ul>
- For more information about these conditions and results, see Volume 1 Appendix E chapter
- E.4.2.3 and Volume 2, p 3-497, of the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s
- Manual</a>.
- </li>
- </ul>
-</li>
-
-<li>{@code VRECPE/VRECPEQ}<br/>
- These instructions provide different levels of accuracy on ARM and x86 CPUs. For more information
- about these differences, see
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka14282.html">
- How do I use VRECPE/VRECPEQ for reciprocal estimate?</a> on the ARM website, and Volume 2, p.
- 4-281 of the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s Manual</a>.
-</li>
-
-<li>{@code VRSQRTE/VRSQRTEQ}<br/>
- <ul>
- <li>These instructions provide different levels of accuracy on ARM and x86 CPUs. For more
- information about these differences, see the
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0204h/CIHCHECJ.html">
- RealView Compilation Tools Assembler Guide</a>, and Volume 2, p. 4-325 of the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s Manual</a>.
- </li>
-
- <li>If one of the operands is negative or -infinity then
- <ul>
- <li>On ARM CPUs, these instructions by default return a (positive) NaN. For more information
- about this result, see the
- <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489i/CIHIICBB.html">
- ARM Compiler toolchain Assembler Reference</a>.</li>
- <li>On x86 CPUs, these instructions return a (negative) QNaN floating-point Indefinite. For
- more information about this result, see Volume 1, Appendix E, E.4.2.3, of the
- <a href="http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf">Intel® 64 and IA-32 Architectures Software Developer’s
- Manual</a>.</li>
- </ul>
- </li>
- </ul>
-</li>
-</ul>
-
-<h3>Sample code</h3>
-<p>In your project make sure to include the {@code arm_neon.h} header, and define include
-{@code x86} in your definition of {@code APP_ABI}. The build system then ports your code to x86.</p>
-
-<p>For an example of how porting ARM NEON to x86 SSE works, see the hello-neon sample.</p>
-
-<h2 id="st">Standalone Toolchain</h2>
-<p>You can incorporate the {@code x86} ABI into your own toolchain. For more information, see
-<a href="{@docRoot}ndk/guides/standalone_toolchain.html">Standalone Toolchain</a>.</p>
-
-<h2 id="comp">Compatibility</h2>
-<p>x86 support requires, at minimum, Android 2.3 (Android API level 9). If your project files
-target an older API level, but include x86 as a targeted platform, the NDK build script
-automatically selects the right set of native platform headers/libraries for you.</p>
\ No newline at end of file
diff --git a/docs/html/ndk/index.jd b/docs/html/ndk/index.jd
deleted file mode 100644
index fc1c595..0000000
--- a/docs/html/ndk/index.jd
+++ /dev/null
@@ -1,51 +0,0 @@
-page.title=Android NDK
-page.tags="ndk, native, c, c++",
-meta.tags="ndk, native, c++"
-fullpage=true
-section.landing=true
-header.hide=1
-footer.hide=1
-@jd:body
-
-<section class="dac-expand dac-hero dac-dark dac-invert" style="background-repeat:no-repeat;">
- <div class="wrap">
- <div class="cols dac-hero-content" style="margin-top:32px">
- <div class="col-7of16 cdol-push-1of16">
- <h1 class="dac-hero-title">Android NDK</h1>
- <p class="dac-hero-description">
- The Android NDK is a toolset that lets you implement parts of your app using native-code languages such as C and C++. For certain types of apps, this can help you reuse existing code libraries written in those languages.
- </p>
-
- <a class="dac-hero-cta" href="/ndk/guides/index.html">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get Started
- </a><br>
- </div>
- <div class="col-8of16 col-push-1of16" style="margin-top:48px">
-
- <span style="color:#00e5ff;font-family:'Roboto Mono', monospace;font-weight:400">public class <span
- style="color:#eee">MyActivity</span> extends Activity {<br>
- <span style="color:#ccc"> /**<br>
- * Native method implemented in C/C++<br>
- */</span><br>
- public <span style="color:#1DE9B6;font-weight:700">native</span> void <span style="color:#eee">computeFoo()</span>;<br>
- }</span>
- </div>
- </div>
- </div>
-</section>
-
-<div class="wrap dac-offset-parent">
- <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">
- <i class="dac-sprite dac-arrow-down-gray"></i>
- </a>
-</div>
-<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
- <h2 class="norule">Latest</h2>
- <div class="resource-widget resource-flow-layout col-16"
- data-query="type:blog+tag:ndk"
- data-cardSizes="6x6"
- data-maxResults="9"
- data-items-per-page="6"
- data-initial-results="3"></div>
-</div></section>
diff --git a/docs/html/ndk/reference/_book.yaml b/docs/html/ndk/reference/_book.yaml
deleted file mode 100644
index ab8b8f9..0000000
--- a/docs/html/ndk/reference/_book.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-toc:
-- title: Asset Manager
- path: /ndk/reference/group___asset.html
- section:
- - title: asset_manager.h
- path: /ndk/reference/asset__manager_8h.html
- - title: asset_manager_jni.h
- path: /ndk/reference/asset__manager__jni_8h.html
-
-- title: Bitmap
- path: /ndk/reference/group___bitmap.html
- section:
- - title: bitmap.h
- path: /ndk/reference/bitmap_8h.html
-
-- title: Configuration
- path: /ndk/reference/group___configuration.html
- section:
- - title: configuration.h
- path: /ndk/reference/configuration_8h.html
-
-- title: Input
- path: /ndk/reference/group___input.html
- section:
- - title: input.h
- path: /ndk/reference/input_8h.html
- - title: keycodes.h
- path: /ndk/reference/keycodes_8h.html
-
-- title: Looper
- path: /ndk/reference/group___looper.html
- section:
- - title: looper.h
- path: /ndk/reference/looper_8h.html
-
-- title: Native Activity and Window
- path: /ndk/reference/group___native_activity.html
- section:
- - title: native_activity.h
- path: /ndk/reference/native__activity_8h.html
- - title: native_window.h
- path: /ndk/reference/native__window_8h.html
- - title: native_window.h
- path: /ndk/reference/native__window__jni_8h.html
- - title: rect.h
- path: /ndk/reference/rect_8h.html
-
-- title: Sensor
- path: /ndk/reference/group___sensor.html
- section:
- - title: sensor.h
- path: /ndk/reference/sensor_8h.html
-
-- title: Storage Manager
- path: /ndk/reference/group___storage.html
- section:
- - title: storage_manager.h
- path: /ndk/reference/storage__manager_8h.html
- - title: obb.h
- path: /ndk/reference/obb_8h.html
diff --git a/docs/html/ndk/reference/annotated.jd b/docs/html/ndk/reference/annotated.jd
deleted file mode 100644
index 8045f8d..0000000
--- a/docs/html/ndk/reference/annotated.jd
+++ /dev/null
@@ -1,25 +0,0 @@
-page.title=Data Structures
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">Data Structures</div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
-<table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_heart_rate_event.html" target="_self">AHeartRateEvent</a></td><td class="desc"></td></tr>
-<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_meta_data_event.html" target="_self">AMetaDataEvent</a></td><td class="desc"></td></tr>
-<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_native_activity.html" target="_self">ANativeActivity</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_native_activity_callbacks.html" target="_self">ANativeActivityCallbacks</a></td><td class="desc"></td></tr>
-<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_native_window___buffer.html" target="_self">ANativeWindow_Buffer</a></td><td class="desc"></td></tr>
-<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_android_bitmap_info.html" target="_self">AndroidBitmapInfo</a></td><td class="desc"></td></tr>
-<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_rect.html" target="_self">ARect</a></td><td class="desc"></td></tr>
-<tr id="row_7_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_sensor_event.html" target="_self">ASensorEvent</a></td><td class="desc"></td></tr>
-<tr id="row_8_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_sensor_vector.html" target="_self">ASensorVector</a></td><td class="desc"></td></tr>
-<tr id="row_9_"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_a_uncalibrated_event.html" target="_self">AUncalibratedEvent</a></td><td class="desc"></td></tr>
-</table>
-</div><!-- directory -->
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/asset__manager_8h.jd b/docs/html/ndk/reference/asset__manager_8h.jd
deleted file mode 100644
index 88d8dea..0000000
--- a/docs/html/ndk/reference/asset__manager_8h.jd
+++ /dev/null
@@ -1,75 +0,0 @@
-page.title=asset_manager.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">asset_manager.h File Reference<div class="ingroups"><a class="el" href="group___asset.html">Asset</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga90c459935e76acf809b9ec90d1872771"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a></td></tr>
-<tr class="separator:ga90c459935e76acf809b9ec90d1872771"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga001a6b9c36a06ee977b9f51ed7103cdb"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a></td></tr>
-<tr class="separator:ga001a6b9c36a06ee977b9f51ed7103cdb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5630b1f1aa5cd363303018cb2f12f95c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a></td></tr>
-<tr class="separator:ga5630b1f1aa5cd363303018cb2f12f95c"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga06fc87d81c62e9abb8790b6e5713c55b"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba5bf76576f07042f965f230086f7c09f4">AASSET_MODE_UNKNOWN</a> = 0,
-<a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba88e1b2a920963d7596735fe28bf30e2f">AASSET_MODE_RANDOM</a> = 1,
-<a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55bac76f5fdb953097efc04e534474a7ea74">AASSET_MODE_STREAMING</a> = 2,
-<a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba40ec098f4afb7c2869fa449d3059f6bb">AASSET_MODE_BUFFER</a> = 3
- }</td></tr>
-<tr class="separator:ga06fc87d81c62e9abb8790b6e5713c55b"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:gab5b57ff012d6d1024d8bf5d30aedced4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gab5b57ff012d6d1024d8bf5d30aedced4">AAssetManager_openDir</a> (<a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> *mgr, const char *dirName)</td></tr>
-<tr class="separator:gab5b57ff012d6d1024d8bf5d30aedced4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0037ce3c10a591fe632f34c1aa62955c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga0037ce3c10a591fe632f34c1aa62955c">AAssetManager_open</a> (<a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> *mgr, const char *filename, int mode)</td></tr>
-<tr class="separator:ga0037ce3c10a591fe632f34c1aa62955c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4703b9f7baa3daeba248b6547de6b9b0"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga4703b9f7baa3daeba248b6547de6b9b0">AAssetDir_getNextFileName</a> (<a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> *assetDir)</td></tr>
-<tr class="separator:ga4703b9f7baa3daeba248b6547de6b9b0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga45db6d19ad5e1c0f9b2e6b4059da14b3"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga45db6d19ad5e1c0f9b2e6b4059da14b3">AAssetDir_rewind</a> (<a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> *assetDir)</td></tr>
-<tr class="separator:ga45db6d19ad5e1c0f9b2e6b4059da14b3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gace1c4d0da274d643c5b10ca218cc6088"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gace1c4d0da274d643c5b10ca218cc6088">AAssetDir_close</a> (<a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> *assetDir)</td></tr>
-<tr class="separator:gace1c4d0da274d643c5b10ca218cc6088"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaadd86322c1fda5121b6d33745c317fb9"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gaadd86322c1fda5121b6d33745c317fb9">AAsset_read</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, void *buf, size_t count)</td></tr>
-<tr class="separator:gaadd86322c1fda5121b6d33745c317fb9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gacc026a8bedeb1ef80bf12df3b72611a2"><td class="memItemLeft" align="right" valign="top">off_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gacc026a8bedeb1ef80bf12df3b72611a2">AAsset_seek</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off_t offset, int whence)</td></tr>
-<tr class="separator:gacc026a8bedeb1ef80bf12df3b72611a2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga81fbe4368de24a3296ef7a6eba0053c7"><td class="memItemLeft" align="right" valign="top">off64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga81fbe4368de24a3296ef7a6eba0053c7">AAsset_seek64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off64_t offset, int whence)</td></tr>
-<tr class="separator:ga81fbe4368de24a3296ef7a6eba0053c7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1f241e49f691dafcada23bcb76155122"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga1f241e49f691dafcada23bcb76155122">AAsset_close</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga1f241e49f691dafcada23bcb76155122"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga553a14512a98542306238c3ce70d344f"><td class="memItemLeft" align="right" valign="top">const void * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga553a14512a98542306238c3ce70d344f">AAsset_getBuffer</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga553a14512a98542306238c3ce70d344f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaad8ec42e28522ebc72d3a5c357f9a600"><td class="memItemLeft" align="right" valign="top">off_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gaad8ec42e28522ebc72d3a5c357f9a600">AAsset_getLength</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:gaad8ec42e28522ebc72d3a5c357f9a600"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga55c8bc459327d5d23089e6a4b453f3f1"><td class="memItemLeft" align="right" valign="top">off64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga55c8bc459327d5d23089e6a4b453f3f1">AAsset_getLength64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga55c8bc459327d5d23089e6a4b453f3f1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae806f55cbc4a93ca245f2adfd63d3eee"><td class="memItemLeft" align="right" valign="top">off_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gae806f55cbc4a93ca245f2adfd63d3eee">AAsset_getRemainingLength</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:gae806f55cbc4a93ca245f2adfd63d3eee"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga21e7221d88dcc44106843192b66755b5"><td class="memItemLeft" align="right" valign="top">off64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga21e7221d88dcc44106843192b66755b5">AAsset_getRemainingLength64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga21e7221d88dcc44106843192b66755b5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1af4ffd050016e99961e24f550981677"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga1af4ffd050016e99961e24f550981677">AAsset_openFileDescriptor</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off_t *outStart, off_t *outLength)</td></tr>
-<tr class="separator:ga1af4ffd050016e99961e24f550981677"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga123a44a575f85d91a00a8456dab7bd0a"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga123a44a575f85d91a00a8456dab7bd0a">AAsset_openFileDescriptor64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off64_t *outStart, off64_t *outLength)</td></tr>
-<tr class="separator:ga123a44a575f85d91a00a8456dab7bd0a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga20344cb952a77fa1004f592fb1b55124"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga20344cb952a77fa1004f592fb1b55124">AAsset_isAllocated</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga20344cb952a77fa1004f592fb1b55124"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/asset__manager__jni_8h.jd b/docs/html/ndk/reference/asset__manager__jni_8h.jd
deleted file mode 100644
index 8aace05..0000000
--- a/docs/html/ndk/reference/asset__manager__jni_8h.jd
+++ /dev/null
@@ -1,25 +0,0 @@
-page.title=asset_manager_jni.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">asset_manager_jni.h File Reference<div class="ingroups"><a class="el" href="group___asset.html">Asset</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <<a class="el" href="asset__manager_8h.html">android/asset_manager.h</a>></code><br/>
-<code>#include <jni.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:gadfd6537af41577735bcaee52120127f4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gadfd6537af41577735bcaee52120127f4">AAssetManager_fromJava</a> (JNIEnv *env, jobject assetManager)</td></tr>
-<tr class="separator:gadfd6537af41577735bcaee52120127f4"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/bc_s.png b/docs/html/ndk/reference/bc_s.png
deleted file mode 100644
index fd162ea..0000000
--- a/docs/html/ndk/reference/bc_s.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/bdwn.png b/docs/html/ndk/reference/bdwn.png
deleted file mode 100644
index 7c943f0..0000000
--- a/docs/html/ndk/reference/bdwn.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/bitmap_8h.jd b/docs/html/ndk/reference/bitmap_8h.jd
deleted file mode 100644
index 518cab1..0000000
--- a/docs/html/ndk/reference/bitmap_8h.jd
+++ /dev/null
@@ -1,61 +0,0 @@
-page.title=bitmap.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#nested-classes">Data Structures</a> |
-<a href="#define-members">Macros</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">bitmap.h File Reference<div class="ingroups"><a class="el" href="group___bitmap.html">Bitmap</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <stdint.h></code><br/>
-<code>#include <jni.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:gafb665ac9fefad34ac5c035f5d1314080"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#gafb665ac9fefad34ac5c035f5d1314080">ANDROID_BITMAP_RESUT_SUCCESS</a>   <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">ANDROID_BITMAP_RESULT_SUCCESS</a></td></tr>
-<tr class="separator:gafb665ac9fefad34ac5c035f5d1314080"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gadf764cbdea00d65edcd07bb9953ad2b7"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">ANDROID_BITMAP_RESULT_SUCCESS</a> = 0,
-<a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7acf7205d1a348d867c63ac2885ce01374">ANDROID_BITMAP_RESULT_BAD_PARAMETER</a> = -1,
-<a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a6b099b9533c38729a6c305f2fe93f98d">ANDROID_BITMAP_RESULT_JNI_EXCEPTION</a> = -2,
-<a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a512f5b95b6b57e78d65502c06391f990">ANDROID_BITMAP_RESULT_ALLOCATION_FAILED</a> = -3
- }</td></tr>
-<tr class="separator:gadf764cbdea00d65edcd07bb9953ad2b7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaea286a2d4c61ae2abb02b51500499f13"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#gaea286a2d4c61ae2abb02b51500499f13">AndroidBitmapFormat</a> { <br/>
-  <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ac6f0378ea5cfefd9abee2596af5a9021">ANDROID_BITMAP_FORMAT_NONE</a> = 0,
-<a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ab92ae96ceea06aa534583beadba84057">ANDROID_BITMAP_FORMAT_RGBA_8888</a> = 1,
-<a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13a11b32e10d6db28fae70ec3590cb9ee91">ANDROID_BITMAP_FORMAT_RGB_565</a> = 4,
-<a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13adc2ede06eafe20439271cb8137dc7528">ANDROID_BITMAP_FORMAT_RGBA_4444</a> = 7,
-<br/>
-  <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ad29996be25f8f88c96e016a1da5c4bca">ANDROID_BITMAP_FORMAT_A_8</a> = 8
-<br/>
- }</td></tr>
-<tr class="separator:gaea286a2d4c61ae2abb02b51500499f13"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga80292ee39d8a675928e38849742b54bf"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#ga80292ee39d8a675928e38849742b54bf">AndroidBitmap_getInfo</a> (JNIEnv *env, jobject jbitmap, <a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a> *info)</td></tr>
-<tr class="separator:ga80292ee39d8a675928e38849742b54bf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2908d42fa4db286c34b7f8c11f29206f"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#ga2908d42fa4db286c34b7f8c11f29206f">AndroidBitmap_lockPixels</a> (JNIEnv *env, jobject jbitmap, void **addrPtr)</td></tr>
-<tr class="separator:ga2908d42fa4db286c34b7f8c11f29206f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4aca91f37baddd42d0051dca8179d4ed"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#ga4aca91f37baddd42d0051dca8179d4ed">AndroidBitmap_unlockPixels</a> (JNIEnv *env, jobject jbitmap)</td></tr>
-<tr class="separator:ga4aca91f37baddd42d0051dca8179d4ed"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/classes.jd b/docs/html/ndk/reference/classes.jd
deleted file mode 100644
index e0ec721..0000000
--- a/docs/html/ndk/reference/classes.jd
+++ /dev/null
@@ -1,20 +0,0 @@
-page.title=Data Structure Index
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">Data Structure Index</div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="qindex"><a class="qindex" href="#letter_A">A</a></div>
-<table style="margin: 10px; white-space: nowrap;" align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td rowspan="2" valign="bottom"><a name="letter_A"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  A  </div></td></tr></table>
-</td><td valign="top"><a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a>   </td><td valign="top"><a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a>   </td><td valign="top"><a class="el" href="struct_a_sensor_event.html">ASensorEvent</a>   </td><td></td></tr>
-<tr><td valign="top"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a>   </td><td valign="top"><a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a>   </td><td valign="top"><a class="el" href="struct_a_sensor_vector.html">ASensorVector</a>   </td><td></td></tr>
-<tr><td valign="top"><a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a>   </td><td valign="top"><a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a>   </td><td valign="top"><a class="el" href="struct_a_rect.html">ARect</a>   </td><td valign="top"><a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a>   </td><td></td></tr>
-<tr><td></td><td></td><td></td><td></td><td></td></tr>
-</table>
-<div class="qindex"><a class="qindex" href="#letter_A">A</a></div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/closed.png b/docs/html/ndk/reference/closed.png
deleted file mode 100644
index e4e2b25..0000000
--- a/docs/html/ndk/reference/closed.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/configuration_8h.jd b/docs/html/ndk/reference/configuration_8h.jd
deleted file mode 100644
index 3f5f07c..0000000
--- a/docs/html/ndk/reference/configuration_8h.jd
+++ /dev/null
@@ -1,222 +0,0 @@
-page.title=configuration.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">configuration.h File Reference<div class="ingroups"><a class="el" href="group___configuration.html">Configuration</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <<a class="el" href="asset__manager_8h.html">android/asset_manager.h</a>></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga6709434d0f99b8367d0df2dfdfbef45a"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a></td></tr>
-<tr class="separator:ga6709434d0f99b8367d0df2dfdfbef45a"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga99fb83031ce9923c84392b4e92f956b5"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af44cee3290a23999b0358c5638747a5f">ACONFIGURATION_ORIENTATION_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad9bf5c1fb90f9fdb20f984d0574592fe">ACONFIGURATION_ORIENTATION_PORT</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad5746872ff6871379fca93c60bfac8a3">ACONFIGURATION_ORIENTATION_LAND</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab0ca4fce673baf58447bfeb154d9a03f">ACONFIGURATION_ORIENTATION_SQUARE</a> = 0x0003,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa73bcf45261366840fea743372682fa6">ACONFIGURATION_TOUCHSCREEN_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5adfbeb370edd3b4372c9b0f86f152dde0">ACONFIGURATION_TOUCHSCREEN_NOTOUCH</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a8316a15b06353f883f2aef8bd194f79f">ACONFIGURATION_TOUCHSCREEN_STYLUS</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4bf2a8323ec6d072aa48d5fc2cff645e">ACONFIGURATION_TOUCHSCREEN_FINGER</a> = 0x0003,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae628b2bf594733b7c19ae394616cec6c">ACONFIGURATION_DENSITY_DEFAULT</a> = 0,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ddb34b2376422d2323720049eb57f3">ACONFIGURATION_DENSITY_LOW</a> = 120,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2511479d7cd574c4b293d535e4dc337e">ACONFIGURATION_DENSITY_MEDIUM</a> = 160,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10e6c3d636f3f6de75de9208913b0d8f">ACONFIGURATION_DENSITY_TV</a> = 213,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5ef4a97dc058235cdfa9fcfe3300c7eb">ACONFIGURATION_DENSITY_HIGH</a> = 240,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a38a03b3b1c64725679605d8d479c85a0">ACONFIGURATION_DENSITY_XHIGH</a> = 320,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad6353daf63778a6ec6f2bd3815d7e6e4">ACONFIGURATION_DENSITY_XXHIGH</a> = 480,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2bd04af33e868a77bd4d83e7d70368ec">ACONFIGURATION_DENSITY_XXXHIGH</a> = 640,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a966a3855351a97ae865264afd74c1534">ACONFIGURATION_DENSITY_ANY</a> = 0xfffe,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a7c1af92914155c418b99844c6aab33d7">ACONFIGURATION_DENSITY_NONE</a> = 0xffff,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a593f722738682ae4500dab6427670f4a">ACONFIGURATION_KEYBOARD_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a40195a1a2d8e21c74d99606d8a1a9918">ACONFIGURATION_KEYBOARD_NOKEYS</a> = 0x0001,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a263ff8efb4d2c757e557adc0d0cdeedf">ACONFIGURATION_KEYBOARD_QWERTY</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1aaf1a887f146737030cce95c53066ea">ACONFIGURATION_KEYBOARD_12KEY</a> = 0x0003,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90e914b60d28c081b313f4b7b6600f47">ACONFIGURATION_NAVIGATION_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a3d95e899305aeae366fb7f8d8b6c290a">ACONFIGURATION_NAVIGATION_NONAV</a> = 0x0001,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace2e3ed21322100712992ca09f4b75b5">ACONFIGURATION_NAVIGATION_DPAD</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad2807d00cb2f5dcb9f456045dd8443a4">ACONFIGURATION_NAVIGATION_TRACKBALL</a> = 0x0003,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a80b53370f65ad283a4fd025f36422bea">ACONFIGURATION_NAVIGATION_WHEEL</a> = 0x0004,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a34d3a830bc2964000052f8486fd76b0c">ACONFIGURATION_KEYSHIDDEN_ANY</a> = 0x0000,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5abfbfc3a10affed059263555b00429ab2">ACONFIGURATION_KEYSHIDDEN_NO</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5e6a5a3f4175644886bde7d0ed4b1ebf">ACONFIGURATION_KEYSHIDDEN_YES</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1a56b72c730e40f22f3b8727e54c376c">ACONFIGURATION_KEYSHIDDEN_SOFT</a> = 0x0003,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a6db7dd6a67196df88117dcdc904e0cb3">ACONFIGURATION_NAVHIDDEN_ANY</a> = 0x0000,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae6ff9883e3e89f8d9ea5c0ebe077c9c5">ACONFIGURATION_NAVHIDDEN_NO</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a79b3a5fe10e948bb79db47b516d46cf5">ACONFIGURATION_NAVHIDDEN_YES</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a9abcd34a6c549e048fc75a545081584e">ACONFIGURATION_SCREENSIZE_ANY</a> = 0x00,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1163af972206a65a5d18bda12fdc511c">ACONFIGURATION_SCREENSIZE_SMALL</a> = 0x01,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a019727e684f25ba921f3479abd62b9f2">ACONFIGURATION_SCREENSIZE_NORMAL</a> = 0x02,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af871d177fdceedb75612cfc1281d2c12">ACONFIGURATION_SCREENSIZE_LARGE</a> = 0x03,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0ca385ed504fc92f6ff3f0857e916c9c">ACONFIGURATION_SCREENSIZE_XLARGE</a> = 0x04,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a41e55e57da42fd09c378f59c1a63710f">ACONFIGURATION_SCREENLONG_ANY</a> = 0x00,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a428bb8fcd8bc731b67b0773dc62781c5">ACONFIGURATION_SCREENLONG_NO</a> = 0x1,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a91fc014d328507568d225d691b3babfd">ACONFIGURATION_SCREENLONG_YES</a> = 0x2,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10d0916da7fa88c945a9cda259407d4c">ACONFIGURATION_UI_MODE_TYPE_ANY</a> = 0x00,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae7efe2713b6718311da76c828b5b444e">ACONFIGURATION_UI_MODE_TYPE_NORMAL</a> = 0x01,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae10bb854f461f60cf399852f8f327077">ACONFIGURATION_UI_MODE_TYPE_DESK</a> = 0x02,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5d6575185e41d909469a1dcf5f81bf4f">ACONFIGURATION_UI_MODE_TYPE_CAR</a> = 0x03,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4738dded616f028fbbedcbad764e7969">ACONFIGURATION_UI_MODE_TYPE_TELEVISION</a> = 0x04,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad99004a7a1b2a97d29b639664947f8e3">ACONFIGURATION_UI_MODE_TYPE_APPLIANCE</a> = 0x05,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ac8c3e2207f2356bc6a1dffc6a615d131">ACONFIGURATION_UI_MODE_TYPE_WATCH</a> = 0x06,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a975087bbd4087b57a68ef3cdbfeb77a1">ACONFIGURATION_UI_MODE_NIGHT_ANY</a> = 0x00,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90ebe564e3a3e384d5b013100f81e4b7">ACONFIGURATION_UI_MODE_NIGHT_NO</a> = 0x1,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a437af4527fac5407de256ec1ef055046">ACONFIGURATION_UI_MODE_NIGHT_YES</a> = 0x2,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aad653f0c960112177fdc387a4a0577fa">ACONFIGURATION_SCREEN_WIDTH_DP_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab66ad42d0cf72fd7e8cd99b92b625432">ACONFIGURATION_SCREEN_HEIGHT_DP_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a227120217d8b6a9d5add3ccc4b283702">ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4687ede31c438dd9f2701cab88de1dbe">ACONFIGURATION_LAYOUTDIR_ANY</a> = 0x00,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a05242d8f2d254b43ff9414ff1aa38a83">ACONFIGURATION_LAYOUTDIR_LTR</a> = 0x01,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af98332983b787ab9355b527079636870">ACONFIGURATION_LAYOUTDIR_RTL</a> = 0x02,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4d40f2aef365c78a52f699b89439db28">ACONFIGURATION_MCC</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ade91a319638eede201579d15f86578a5">ACONFIGURATION_MNC</a> = 0x0002,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ecff796bd0690a9a8498c7de03e9b4">ACONFIGURATION_LOCALE</a> = 0x0004,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a255cfb57ac18d460c5614565a84f5561">ACONFIGURATION_TOUCHSCREEN</a> = 0x0008,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0195de2a57f028a8171c42beff0b0e88">ACONFIGURATION_KEYBOARD</a> = 0x0010,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a54e71234e32ed037e2d47472f80eb416">ACONFIGURATION_KEYBOARD_HIDDEN</a> = 0x0020,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65e9d31615d2b4adf3738d9a12a1556b">ACONFIGURATION_NAVIGATION</a> = 0x0040,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a591461d864136d482fe06e01fd945786">ACONFIGURATION_ORIENTATION</a> = 0x0080,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace87b4f25e5fd6fe0f3316d21ecc66a1">ACONFIGURATION_DENSITY</a> = 0x0100,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a76ca1eb0e9346d93da592afbbf9a3b72">ACONFIGURATION_SCREEN_SIZE</a> = 0x0200,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1be62e4fc31cf3d3102c99f7c6b4c71b">ACONFIGURATION_VERSION</a> = 0x0400,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a12d69ffef9135c1c55e1b8b5c2589e7c">ACONFIGURATION_SCREEN_LAYOUT</a> = 0x0800,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a43a324af59372efd08b34431825cf67e">ACONFIGURATION_UI_MODE</a> = 0x1000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5acce415252e0ad95117a05bbe910f06de">ACONFIGURATION_SMALLEST_SCREEN_SIZE</a> = 0x2000,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65834be1230d1694e5ce8a6f407acab2">ACONFIGURATION_LAYOUTDIR</a> = 0x4000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa6cda2f222580dbef27f1277d967d58c">ACONFIGURATION_MNC_ZERO</a> = 0xffff
-<br/>
- }</td></tr>
-<tr class="separator:ga99fb83031ce9923c84392b4e92f956b5"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga9543655922980466eb05c7be94a0a567"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9543655922980466eb05c7be94a0a567">AConfiguration_new</a> ()</td></tr>
-<tr class="separator:ga9543655922980466eb05c7be94a0a567"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga60fe264b97da84d3370eb9e220159e6d"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga60fe264b97da84d3370eb9e220159e6d">AConfiguration_delete</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga60fe264b97da84d3370eb9e220159e6d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga75e061fd0b4f761e08e43af36508c4f3"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga75e061fd0b4f761e08e43af36508c4f3">AConfiguration_fromAssetManager</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *out, <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> *am)</td></tr>
-<tr class="separator:ga75e061fd0b4f761e08e43af36508c4f3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaabff04218a0a76afb8d3ea551b001565"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaabff04218a0a76afb8d3ea551b001565">AConfiguration_copy</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *dest, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *src)</td></tr>
-<tr class="separator:gaabff04218a0a76afb8d3ea551b001565"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1e78004237a931086d2ae4bd8324bd30"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga1e78004237a931086d2ae4bd8324bd30">AConfiguration_getMcc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga1e78004237a931086d2ae4bd8324bd30"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae6198b4eaf3e34168f4b13b8b5975d93"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gae6198b4eaf3e34168f4b13b8b5975d93">AConfiguration_setMcc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t mcc)</td></tr>
-<tr class="separator:gae6198b4eaf3e34168f4b13b8b5975d93"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4783776a4fad4501898472375d781fb9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4783776a4fad4501898472375d781fb9">AConfiguration_getMnc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga4783776a4fad4501898472375d781fb9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf060ef69c3636f62e90ae0b520eecb8"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaaf060ef69c3636f62e90ae0b520eecb8">AConfiguration_setMnc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t mnc)</td></tr>
-<tr class="separator:gaaf060ef69c3636f62e90ae0b520eecb8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7b004c13448704afb0ea2040d69468c1"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7b004c13448704afb0ea2040d69468c1">AConfiguration_getLanguage</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, char *outLanguage)</td></tr>
-<tr class="separator:ga7b004c13448704afb0ea2040d69468c1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1f3c6cf6667655f83777acda7387ddff"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga1f3c6cf6667655f83777acda7387ddff">AConfiguration_setLanguage</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, const char *language)</td></tr>
-<tr class="separator:ga1f3c6cf6667655f83777acda7387ddff"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad2b47f787012a82a67a20e5de5211d46"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gad2b47f787012a82a67a20e5de5211d46">AConfiguration_getCountry</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, char *outCountry)</td></tr>
-<tr class="separator:gad2b47f787012a82a67a20e5de5211d46"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac2f5d414a6466634b1639b5c6f8879ac"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gac2f5d414a6466634b1639b5c6f8879ac">AConfiguration_setCountry</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, const char *country)</td></tr>
-<tr class="separator:gac2f5d414a6466634b1639b5c6f8879ac"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa7d8e3e9871dc925fef3e342a92e4e22"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaa7d8e3e9871dc925fef3e342a92e4e22">AConfiguration_getOrientation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gaa7d8e3e9871dc925fef3e342a92e4e22"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadcaa8540bad4172a74032143bcaade04"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gadcaa8540bad4172a74032143bcaade04">AConfiguration_setOrientation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t orientation)</td></tr>
-<tr class="separator:gadcaa8540bad4172a74032143bcaade04"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad305e6cf86fa915c24212e71bb2bf027"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gad305e6cf86fa915c24212e71bb2bf027">AConfiguration_getTouchscreen</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gad305e6cf86fa915c24212e71bb2bf027"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0d51dbe710c1afe31ece4dd6a8c188ff"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga0d51dbe710c1afe31ece4dd6a8c188ff">AConfiguration_setTouchscreen</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t touchscreen)</td></tr>
-<tr class="separator:ga0d51dbe710c1afe31ece4dd6a8c188ff"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4c994e0555947340582094c3da32a663"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4c994e0555947340582094c3da32a663">AConfiguration_getDensity</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga4c994e0555947340582094c3da32a663"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9217af9858a7166dcb9a877192779eac"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9217af9858a7166dcb9a877192779eac">AConfiguration_setDensity</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t density)</td></tr>
-<tr class="separator:ga9217af9858a7166dcb9a877192779eac"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafd0f76ccd4fe4bda5172b8e0bc6675e4"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafd0f76ccd4fe4bda5172b8e0bc6675e4">AConfiguration_getKeyboard</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gafd0f76ccd4fe4bda5172b8e0bc6675e4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4ab3429c5505c108c09349f1ddef572f"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4ab3429c5505c108c09349f1ddef572f">AConfiguration_setKeyboard</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t keyboard)</td></tr>
-<tr class="separator:ga4ab3429c5505c108c09349f1ddef572f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae3ff1541b63f5b9256f7c0ebae372977"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gae3ff1541b63f5b9256f7c0ebae372977">AConfiguration_getNavigation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gae3ff1541b63f5b9256f7c0ebae372977"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad21dd14fb823a6a80b66132a05ce8913"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gad21dd14fb823a6a80b66132a05ce8913">AConfiguration_setNavigation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t navigation)</td></tr>
-<tr class="separator:gad21dd14fb823a6a80b66132a05ce8913"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7a8317ab975f621f3fe62ed1b44f2605"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7a8317ab975f621f3fe62ed1b44f2605">AConfiguration_getKeysHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga7a8317ab975f621f3fe62ed1b44f2605"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5a80a02aa10cfa17de0795054e927183"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga5a80a02aa10cfa17de0795054e927183">AConfiguration_setKeysHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t keysHidden)</td></tr>
-<tr class="separator:ga5a80a02aa10cfa17de0795054e927183"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafe8d3a9c2f715ea76c8e4a99c2db9eaa"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafe8d3a9c2f715ea76c8e4a99c2db9eaa">AConfiguration_getNavHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gafe8d3a9c2f715ea76c8e4a99c2db9eaa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga67e86e0347596421771af841710308d5"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga67e86e0347596421771af841710308d5">AConfiguration_setNavHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t navHidden)</td></tr>
-<tr class="separator:ga67e86e0347596421771af841710308d5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4aa7062198e5aacd9fabb04d0453dd91"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4aa7062198e5aacd9fabb04d0453dd91">AConfiguration_getSdkVersion</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga4aa7062198e5aacd9fabb04d0453dd91"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga06c66072902ee455011120188ca4810b"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga06c66072902ee455011120188ca4810b">AConfiguration_setSdkVersion</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t sdkVersion)</td></tr>
-<tr class="separator:ga06c66072902ee455011120188ca4810b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9d2c1b8731795d8e74be7e23cbc77552"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9d2c1b8731795d8e74be7e23cbc77552">AConfiguration_getScreenSize</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga9d2c1b8731795d8e74be7e23cbc77552"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7bcf05150933ead34a01061d05ad3245"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7bcf05150933ead34a01061d05ad3245">AConfiguration_setScreenSize</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t screenSize)</td></tr>
-<tr class="separator:ga7bcf05150933ead34a01061d05ad3245"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab7d1f5aa59e8fa4db0a1b91bb322034c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gab7d1f5aa59e8fa4db0a1b91bb322034c">AConfiguration_getScreenLong</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gab7d1f5aa59e8fa4db0a1b91bb322034c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaed853ab7e2bc915591d05997130bc448"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaed853ab7e2bc915591d05997130bc448">AConfiguration_setScreenLong</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t screenLong)</td></tr>
-<tr class="separator:gaed853ab7e2bc915591d05997130bc448"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1d75777892f38208feb3d2a94a977fcf"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga1d75777892f38208feb3d2a94a977fcf">AConfiguration_getUiModeType</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga1d75777892f38208feb3d2a94a977fcf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec61e3cf91cd79e8b76a35bbcb15789d"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaec61e3cf91cd79e8b76a35bbcb15789d">AConfiguration_setUiModeType</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t uiModeType)</td></tr>
-<tr class="separator:gaec61e3cf91cd79e8b76a35bbcb15789d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga447f16a9e4f8400e5e0328900749ff16"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga447f16a9e4f8400e5e0328900749ff16">AConfiguration_getUiModeNight</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga447f16a9e4f8400e5e0328900749ff16"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga08df1e801afbe4a12411e393b8141e42"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga08df1e801afbe4a12411e393b8141e42">AConfiguration_setUiModeNight</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t uiModeNight)</td></tr>
-<tr class="separator:ga08df1e801afbe4a12411e393b8141e42"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga61e5fe9612c170c33e1c7e9fb92f2219"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga61e5fe9612c170c33e1c7e9fb92f2219">AConfiguration_getScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga61e5fe9612c170c33e1c7e9fb92f2219"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafc51d45679095965fe3ba1abd402f120"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafc51d45679095965fe3ba1abd402f120">AConfiguration_setScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:gafc51d45679095965fe3ba1abd402f120"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9905a4765f8d0d921c476ebce01c7648"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9905a4765f8d0d921c476ebce01c7648">AConfiguration_getScreenHeightDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga9905a4765f8d0d921c476ebce01c7648"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6ffac3b41415ec8a3031737ccdcd63b8"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga6ffac3b41415ec8a3031737ccdcd63b8">AConfiguration_setScreenHeightDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:ga6ffac3b41415ec8a3031737ccdcd63b8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7fc015e41fad342edba66a003d9848aa"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7fc015e41fad342edba66a003d9848aa">AConfiguration_getSmallestScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga7fc015e41fad342edba66a003d9848aa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6b004c9585671efc5cebd96c1d43c4f0"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga6b004c9585671efc5cebd96c1d43c4f0">AConfiguration_setSmallestScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:ga6b004c9585671efc5cebd96c1d43c4f0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga13dbf2fc9a382c62b391e7de9cf9b468"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga13dbf2fc9a382c62b391e7de9cf9b468">AConfiguration_getLayoutDirection</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga13dbf2fc9a382c62b391e7de9cf9b468"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf47215cf551594f8c2a0594419b47e1"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaaf47215cf551594f8c2a0594419b47e1">AConfiguration_setLayoutDirection</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:gaaf47215cf551594f8c2a0594419b47e1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabfe69b0dccae425a16fe94d084f20402"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gabfe69b0dccae425a16fe94d084f20402">AConfiguration_diff</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config1, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config2)</td></tr>
-<tr class="separator:gabfe69b0dccae425a16fe94d084f20402"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafb27b901a1d7d44ed866608fb8399a18"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafb27b901a1d7d44ed866608fb8399a18">AConfiguration_match</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *base, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *requested)</td></tr>
-<tr class="separator:gafb27b901a1d7d44ed866608fb8399a18"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafd2bb31057c8d57efcea7603458d2a8d"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafd2bb31057c8d57efcea7603458d2a8d">AConfiguration_isBetterThan</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *base, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *test, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *requested)</td></tr>
-<tr class="separator:gafd2bb31057c8d57efcea7603458d2a8d"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/deprecated.jd b/docs/html/ndk/reference/deprecated.jd
deleted file mode 100644
index 0e69db6..0000000
--- a/docs/html/ndk/reference/deprecated.jd
+++ /dev/null
@@ -1,23 +0,0 @@
-page.title=Deprecated List
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">Deprecated List </div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><dl class="reflist">
-<dt><a class="anchor" id="_deprecated000001"></a>Global <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab0ca4fce673baf58447bfeb154d9a03f">ACONFIGURATION_ORIENTATION_SQUARE</a> </dt>
-<dd>Not currently supported or used. </dd>
-<dt><a class="anchor" id="_deprecated000002"></a>Global <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a8316a15b06353f883f2aef8bd194f79f">ACONFIGURATION_TOUCHSCREEN_STYLUS</a> </dt>
-<dd>Not currently supported or used. </dd>
-<dt><a class="anchor" id="_deprecated000004"></a>Global <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa0377f46a626d411ace179c1c27d0a3f7">AWINDOW_FLAG_BLUR_BEHIND</a> </dt>
-<dd>Blurring is no longer supported. </dd>
-<dt><a class="anchor" id="_deprecated000006"></a>Global <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae73488b436aaea163ba2f7051bf93d9d">AWINDOW_FLAG_DITHER</a> </dt>
-<dd>This flag is no longer used. </dd>
-<dt><a class="anchor" id="_deprecated000005"></a>Global <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5574a513645e6e7cb4d6a9f4a043d773">AWINDOW_FLAG_TOUCHABLE_WHEN_WAKING</a> </dt>
-<dd>This flag has no effect. </dd>
-</dl>
-</div></div><!-- contents -->
diff --git a/docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd b/docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
deleted file mode 100644
index 025427a..0000000
--- a/docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
+++ /dev/null
@@ -1,49 +0,0 @@
-page.title=android Directory Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">android Directory Reference</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:asset__manager_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="asset__manager_8h.html">asset_manager.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:asset__manager__jni_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="asset__manager__jni_8h.html">asset_manager_jni.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:bitmap_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="bitmap_8h.html">bitmap.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:configuration_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="configuration_8h.html">configuration.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:input_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="input_8h.html">input.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:keycodes_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="keycodes_8h.html">keycodes.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:looper_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="looper_8h.html">looper.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:native__activity_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="native__activity_8h.html">native_activity.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:native__window_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="native__window_8h.html">native_window.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:native__window__jni_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="native__window__jni_8h.html">native_window_jni.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:obb_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="obb_8h.html">obb.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:rect_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="rect_8h.html">rect.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:sensor_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="sensor_8h.html">sensor.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:storage__manager_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="storage__manager_8h.html">storage_manager.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:window_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="window_8h.html">window.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd b/docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
deleted file mode 100644
index e42811e..0000000
--- a/docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
+++ /dev/null
@@ -1,21 +0,0 @@
-page.title=include Directory Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">include Directory Reference</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
-Directories</h2></td></tr>
-<tr class="memitem:dir_035c76f7235f5f563d38e3ab90cb9716"><td class="memItemLeft" align="right" valign="top">directory  </td><td class="memItemRight" valign="bottom"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/doxygen-dac.css b/docs/html/ndk/reference/doxygen-dac.css
deleted file mode 100644
index 96b6d84..0000000
--- a/docs/html/ndk/reference/doxygen-dac.css
+++ /dev/null
@@ -1,53 +0,0 @@
-#jd-content td {
-}
-
-#jd-content table {
- background-color: transparent;
- width: 100%;
-}
-
-#jd-content tr.heading td {
- background-color: #999;
- padding: 0px 12px;
-}
-
-#jd-content tr.heading h2 {
- font-size: 14px;
- font-weight: bold;
- font-family: Roboto, sans-serif;
- margin: 0px;
- color: #fff;
-}
-
-#jd-content tr.heading hr, #jd-content td.memSeparator, #jd-content div.headertitle {
- display: none;
-}
-
-
-#jd-content table td.memItemLeft {
- text-align: right;
- width: 20%;
-}
-
-#jd-content table td.memItemRight {
-}
-
-#jd-content div.memproto {
- font-size: 1.15em;
- background-color: #e2e2e2;
- padding: 3px;
-}
-
-#jd-content div.memproto table {
- margin: 0px;
- width: auto;
-}
-
-#jd-content table.memname td {
- border: none;
- padding: 2px;
-}
-
-#jd-content div.memdoc {
- margin: 7px 18px;
-}
diff --git a/docs/html/ndk/reference/doxygen.css b/docs/html/ndk/reference/doxygen.css
deleted file mode 100644
index 94f4bf2..0000000
--- a/docs/html/ndk/reference/doxygen.css
+++ /dev/null
@@ -1,1366 +0,0 @@
-/* The standard CSS for doxygen 1.8.6 */
-
-body, table, div, p, dl {
- font: 400 14px/22px Roboto,sans-serif;
-}
-
-/* @group Heading Levels */
-
-h1.groupheader {
- font-size: 150%;
-}
-
-.title {
- font: 400 14px/28px Roboto,sans-serif;
- font-size: 150%;
- font-weight: bold;
- margin: 10px 2px;
-}
-
-h2.groupheader {
- border-bottom: 1px solid #A9A9A9;
- color: #585858;
- font-size: 150%;
- font-weight: normal;
- margin-top: 1.75em;
- padding-top: 8px;
- padding-bottom: 4px;
- width: 100%;
-}
-
-h3.groupheader {
- font-size: 100%;
-}
-
-h1, h2, h3, h4, h5, h6 {
- -webkit-transition: text-shadow 0.5s linear;
- -moz-transition: text-shadow 0.5s linear;
- -ms-transition: text-shadow 0.5s linear;
- -o-transition: text-shadow 0.5s linear;
- transition: text-shadow 0.5s linear;
- margin-right: 15px;
-}
-
-h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
- text-shadow: 0 0 15px cyan;
-}
-
-dt {
- font-weight: bold;
-}
-
-div.multicol {
- -moz-column-gap: 1em;
- -webkit-column-gap: 1em;
- -moz-column-count: 3;
- -webkit-column-count: 3;
-}
-
-p.startli, p.startdd {
- margin-top: 2px;
-}
-
-p.starttd {
- margin-top: 0px;
-}
-
-p.endli {
- margin-bottom: 0px;
-}
-
-p.enddd {
- margin-bottom: 4px;
-}
-
-p.endtd {
- margin-bottom: 2px;
-}
-
-/* @end */
-
-caption {
- font-weight: bold;
-}
-
-span.legend {
- font-size: 70%;
- text-align: center;
-}
-
-h3.version {
- font-size: 90%;
- text-align: center;
-}
-
-div.qindex, div.navtab{
- background-color: #F1F1F1;
- border: 1px solid #BDBDBD;
- text-align: center;
-}
-
-div.qindex, div.navpath {
- width: 100%;
- line-height: 140%;
-}
-
-div.navtab {
- margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
- color: #646464;
- font-weight: normal;
- text-decoration: none;
-}
-
-.contents a:visited {
- color: #747474;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-a.qindex {
- font-weight: bold;
-}
-
-a.qindexHL {
- font-weight: bold;
- background-color: #B8B8B8;
- color: #ffffff;
- border: 1px double #A8A8A8;
-}
-
-.contents a.qindexHL:visited {
- color: #ffffff;
-}
-
-a.el {
- font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code, a.code:visited, a.line, a.line:visited {
- color: #4665A2;
-}
-
-a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited {
- color: #4665A2;
-}
-
-/* @end */
-
-dl.el {
- margin-left: -1cm;
-}
-
-pre.fragment {
- border: 1px solid #C4CFE5;
- background-color: #FBFCFD;
- padding: 4px 6px;
- margin: 4px 8px 4px 2px;
- overflow: auto;
- word-wrap: break-word;
- font-size: 9pt;
- line-height: 125%;
- font-family: monospace, fixed;
- font-size: 105%;
-}
-
-div.fragment {
- padding: 4px 6px;
- margin: 4px 8px 4px 2px;
- background-color: #FCFCFC;
- border: 1px solid #D5D5D5;
-}
-
-div.line {
- font-family: monospace, fixed;
- font-size: 13px;
- min-height: 13px;
- line-height: 1.0;
- text-wrap: unrestricted;
- white-space: -moz-pre-wrap; /* Moz */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- white-space: pre-wrap; /* CSS3 */
- word-wrap: break-word; /* IE 5.5+ */
- text-indent: -53px;
- padding-left: 53px;
- padding-bottom: 0px;
- margin: 0px;
- -webkit-transition-property: background-color, box-shadow;
- -webkit-transition-duration: 0.5s;
- -moz-transition-property: background-color, box-shadow;
- -moz-transition-duration: 0.5s;
- -ms-transition-property: background-color, box-shadow;
- -ms-transition-duration: 0.5s;
- -o-transition-property: background-color, box-shadow;
- -o-transition-duration: 0.5s;
- transition-property: background-color, box-shadow;
- transition-duration: 0.5s;
-}
-
-div.line.glow {
- background-color: cyan;
- box-shadow: 0 0 10px cyan;
-}
-
-
-span.lineno {
- padding-right: 4px;
- text-align: right;
- border-right: 2px solid #0F0;
- background-color: #E8E8E8;
- white-space: pre;
-}
-span.lineno a {
- background-color: #D8D8D8;
-}
-
-span.lineno a:hover {
- background-color: #C8C8C8;
-}
-
-div.ah {
- background-color: black;
- font-weight: bold;
- color: #ffffff;
- margin-bottom: 3px;
- margin-top: 3px;
- padding: 0.2em;
- border: solid thin #333;
- border-radius: 0.5em;
- -webkit-border-radius: .5em;
- -moz-border-radius: .5em;
- box-shadow: 2px 2px 3px #999;
- -webkit-box-shadow: 2px 2px 3px #999;
- -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
- background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
-}
-
-div.groupHeader {
- margin-left: 16px;
- margin-top: 12px;
- font-weight: bold;
-}
-
-div.groupText {
- margin-left: 16px;
- font-style: italic;
-}
-
-body {
- background-color: white;
- color: black;
- margin: 0;
-}
-
-div.contents {
- margin-top: 10px;
- margin-left: 12px;
- margin-right: 8px;
-}
-
-td.indexkey {
- background-color: #F1F1F1;
- font-weight: bold;
- border: 1px solid #D5D5D5;
- margin: 2px 0px 2px 0;
- padding: 2px 10px;
- white-space: nowrap;
- vertical-align: top;
-}
-
-td.indexvalue {
- background-color: #F1F1F1;
- border: 1px solid #D5D5D5;
- padding: 2px 10px;
- margin: 2px 0px;
-}
-
-tr.memlist {
- background-color: #F2F2F2;
-}
-
-p.formulaDsp {
- text-align: center;
-}
-
-img.formulaDsp {
-
-}
-
-img.formulaInl {
- vertical-align: middle;
-}
-
-div.center {
- text-align: center;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
-}
-
-div.center img {
- border: 0px;
-}
-
-address.footer {
- text-align: right;
- padding-right: 12px;
-}
-
-img.footer {
- border: 0px;
- vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
- color: #008000
-}
-
-span.keywordtype {
- color: #604020
-}
-
-span.keywordflow {
- color: #e08000
-}
-
-span.comment {
- color: #800000
-}
-
-span.preprocessor {
- color: #806020
-}
-
-span.stringliteral {
- color: #002080
-}
-
-span.charliteral {
- color: #008080
-}
-
-span.vhdldigit {
- color: #ff00ff
-}
-
-span.vhdlchar {
- color: #000000
-}
-
-span.vhdlkeyword {
- color: #700070
-}
-
-span.vhdllogic {
- color: #ff0000
-}
-
-blockquote {
- background-color: #F9F9F9;
- border-left: 2px solid #B8B8B8;
- margin: 0 24px 0 4px;
- padding: 0 12px 0 16px;
-}
-
-/* @end */
-
-/*
-.search {
- color: #003399;
- font-weight: bold;
-}
-
-form.search {
- margin-bottom: 0px;
- margin-top: 0px;
-}
-
-input.search {
- font-size: 75%;
- color: #000080;
- font-weight: normal;
- background-color: #e8eef2;
-}
-*/
-
-td.tiny {
- font-size: 75%;
-}
-
-.dirtab {
- padding: 4px;
- border-collapse: collapse;
- border: 1px solid #BDBDBD;
-}
-
-th.dirtab {
- background: #F1F1F1;
- font-weight: bold;
-}
-
-hr {
- height: 0px;
- border: none;
- border-top: 1px solid #7A7A7A;
-}
-
-hr.footer {
- height: 1px;
-}
-
-/* @group Member Descriptions */
-
-table.memberdecls {
- border-spacing: 0px;
- padding: 0px;
-}
-
-.memberdecls td, .fieldtable tr {
- -webkit-transition-property: background-color, box-shadow;
- -webkit-transition-duration: 0.5s;
- -moz-transition-property: background-color, box-shadow;
- -moz-transition-duration: 0.5s;
- -ms-transition-property: background-color, box-shadow;
- -ms-transition-duration: 0.5s;
- -o-transition-property: background-color, box-shadow;
- -o-transition-duration: 0.5s;
- transition-property: background-color, box-shadow;
- transition-duration: 0.5s;
-}
-
-.memberdecls td.glow, .fieldtable tr.glow {
- background-color: cyan;
- box-shadow: 0 0 15px cyan;
-}
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
- background-color: #FAFAFA;
- border: none;
- margin: 4px;
- padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
- padding: 0px 8px 4px 8px;
- color: #555;
-}
-
-.memSeparator {
- border-bottom: 1px solid #DEE4F0;
- line-height: 1px;
- margin: 0px;
- padding: 0px;
-}
-
-.memItemLeft, .memTemplItemLeft {
- white-space: nowrap;
-}
-
-.memItemRight {
- width: 100%;
-}
-
-.memTemplParams {
- color: #747474;
- white-space: nowrap;
- font-size: 80%;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtemplate {
- font-size: 80%;
- color: #747474;
- font-weight: normal;
- margin-left: 9px;
-}
-
-.memnav {
- background-color: #F1F1F1;
- border: 1px solid #BDBDBD;
- text-align: center;
- margin: 2px;
- margin-right: 15px;
- padding: 2px;
-}
-
-.mempage {
- width: 100%;
-}
-
-.memitem {
- padding: 0;
- margin-bottom: 10px;
- margin-right: 5px;
- -webkit-transition: box-shadow 0.5s linear;
- -moz-transition: box-shadow 0.5s linear;
- -ms-transition: box-shadow 0.5s linear;
- -o-transition: box-shadow 0.5s linear;
- transition: box-shadow 0.5s linear;
- display: table !important;
- width: 100%;
-}
-
-.memitem.glow {
- box-shadow: 0 0 15px cyan;
-}
-
-.memname {
- font-weight: bold;
- margin-left: 6px;
-}
-
-.memname td {
- vertical-align: bottom;
-}
-
-.memproto, dl.reflist dt {
- border-top: 1px solid #C0C0C0;
- border-left: 1px solid #C0C0C0;
- border-right: 1px solid #C0C0C0;
- padding: 6px 0px 6px 0px;
- color: #3D3D3D;
- font-weight: bold;
- text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
- background-image:url('nav_f.png');
- background-repeat:repeat-x;
- background-color: #EAEAEA;
- /* opera specific markup */
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- border-top-right-radius: 4px;
- border-top-left-radius: 4px;
- /* firefox specific markup */
- -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
- -moz-border-radius-topright: 4px;
- -moz-border-radius-topleft: 4px;
- /* webkit specific markup */
- -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- -webkit-border-top-right-radius: 4px;
- -webkit-border-top-left-radius: 4px;
-
-}
-
-.memdoc, dl.reflist dd {
- border-bottom: 1px solid #C0C0C0;
- border-left: 1px solid #C0C0C0;
- border-right: 1px solid #C0C0C0;
- padding: 6px 10px 2px 10px;
- background-color: #FCFCFC;
- border-top-width: 0;
- background-image:url('nav_g.png');
- background-repeat:repeat-x;
- background-color: #FFFFFF;
- /* opera specific markup */
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- /* firefox specific markup */
- -moz-border-radius-bottomleft: 4px;
- -moz-border-radius-bottomright: 4px;
- -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
- /* webkit specific markup */
- -webkit-border-bottom-left-radius: 4px;
- -webkit-border-bottom-right-radius: 4px;
- -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-dl.reflist dt {
- padding: 5px;
-}
-
-dl.reflist dd {
- margin: 0px 0px 10px 0px;
- padding: 5px;
-}
-
-.paramkey {
- text-align: right;
-}
-
-.paramtype {
- white-space: nowrap;
-}
-
-.paramname {
- color: #602020;
- white-space: nowrap;
-}
-.paramname em {
- font-style: normal;
-}
-.paramname code {
- line-height: 14px;
-}
-
-.params, .retval, .exception, .tparams {
- margin-left: 0px;
- padding-left: 0px;
-}
-
-.params .paramname, .retval .paramname {
- font-weight: bold;
- vertical-align: top;
-}
-
-.params .paramtype {
- font-style: italic;
- vertical-align: top;
-}
-
-.params .paramdir {
- font-family: "courier new",courier,monospace;
- vertical-align: top;
-}
-
-table.mlabels {
- border-spacing: 0px;
-}
-
-td.mlabels-left {
- width: 100%;
- padding: 0px;
-}
-
-td.mlabels-right {
- vertical-align: bottom;
- padding: 0px;
- white-space: nowrap;
-}
-
-span.mlabels {
- margin-left: 8px;
-}
-
-span.mlabel {
- background-color: #9A9A9A;
- border-top:1px solid #848484;
- border-left:1px solid #848484;
- border-right:1px solid #D5D5D5;
- border-bottom:1px solid #D5D5D5;
- text-shadow: none;
- color: white;
- margin-right: 4px;
- padding: 2px 3px;
- border-radius: 3px;
- font-size: 7pt;
- white-space: nowrap;
- vertical-align: middle;
-}
-
-
-
-/* @end */
-
-/* these are for tree view when not used as main index */
-
-div.directory {
- margin: 10px 0px;
- border-top: 1px solid #A8B8D9;
- border-bottom: 1px solid #A8B8D9;
- width: 100%;
-}
-
-.directory table {
- border-collapse:collapse;
-}
-
-.directory td {
- margin: 0px;
- padding: 0px;
- vertical-align: top;
-}
-
-.directory td.entry {
- white-space: nowrap;
- padding-right: 6px;
- padding-top: 3px;
-}
-
-.directory td.entry a {
- outline:none;
-}
-
-.directory td.entry a img {
- border: none;
-}
-
-.directory td.desc {
- width: 100%;
- padding-left: 6px;
- padding-right: 6px;
- padding-top: 3px;
- border-left: 1px solid rgba(0,0,0,0.05);
-}
-
-.directory tr.even {
- padding-left: 6px;
- background-color: #F9F9F9;
-}
-
-.directory img {
- vertical-align: -30%;
-}
-
-.directory .levels {
- white-space: nowrap;
- width: 100%;
- text-align: right;
- font-size: 9pt;
-}
-
-.directory .levels span {
- cursor: pointer;
- padding-left: 2px;
- padding-right: 2px;
- color: #646464;
-}
-
-div.dynheader {
- margin-top: 8px;
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-address {
- font-style: normal;
- color: #464646;
-}
-
-table.doxtable {
- border-collapse:collapse;
- margin-top: 4px;
- margin-bottom: 4px;
-}
-
-table.doxtable td, table.doxtable th {
- border: 1px solid #4A4A4A;
- padding: 3px 7px 2px;
-}
-
-table.doxtable th {
- background-color: #5B5B5B;
- color: #FFFFFF;
- font-size: 110%;
- padding-bottom: 4px;
- padding-top: 5px;
-}
-
-table.fieldtable {
- /*width: 100%;*/
- margin-bottom: 10px;
- border: 1px solid #C0C0C0;
- border-spacing: 0px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
- -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
- box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-}
-
-.fieldtable td, .fieldtable th {
- padding: 3px 7px 2px;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
- white-space: nowrap;
- border-right: 1px solid #C0C0C0;
- border-bottom: 1px solid #C0C0C0;
- vertical-align: top;
-}
-
-.fieldtable td.fieldname {
- padding-top: 3px;
-}
-
-.fieldtable td.fielddoc {
- border-bottom: 1px solid #C0C0C0;
- /*width: 100%;*/
-}
-
-.fieldtable td.fielddoc p:first-child {
- margin-top: 0px;
-}
-
-.fieldtable td.fielddoc p:last-child {
- margin-bottom: 2px;
-}
-
-.fieldtable tr:last-child td {
- border-bottom: none;
-}
-
-.fieldtable th {
- background-image:url('nav_f.png');
- background-repeat:repeat-x;
- background-color: #EAEAEA;
- font-size: 90%;
- color: #3D3D3D;
- padding-bottom: 4px;
- padding-top: 5px;
- text-align:left;
- -moz-border-radius-topleft: 4px;
- -moz-border-radius-topright: 4px;
- -webkit-border-top-left-radius: 4px;
- -webkit-border-top-right-radius: 4px;
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
- border-bottom: 1px solid #C0C0C0;
-}
-
-
-.tabsearch {
- top: 0px;
- left: 10px;
- height: 36px;
- background-image: url('tab_b.png');
- z-index: 101;
- overflow: hidden;
- font-size: 13px;
-}
-
-.navpath ul
-{
- font-size: 11px;
- background-image:url('tab_b.png');
- background-repeat:repeat-x;
- background-position: 0 -5px;
- height:30px;
- line-height:30px;
- color:#ABABAB;
- border:solid 1px #D3D3D3;
- overflow:hidden;
- margin:0px;
- padding:0px;
-}
-
-.navpath li
-{
- list-style-type:none;
- float:left;
- padding-left:10px;
- padding-right:15px;
- background-image:url('bc_s.png');
- background-repeat:no-repeat;
- background-position:right;
- color:#595959;
-}
-
-.navpath li.navelem a
-{
- height:32px;
- display:block;
- text-decoration: none;
- outline: none;
- color: #434343;
- font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
- text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
- text-decoration: none;
-}
-
-.navpath li.navelem a:hover
-{
- color:#929292;
-}
-
-.navpath li.footer
-{
- list-style-type:none;
- float:right;
- padding-left:10px;
- padding-right:15px;
- background-image:none;
- background-repeat:no-repeat;
- background-position:right;
- color:#595959;
- font-size: 8pt;
-}
-
-
-div.summary
-{
- float: right;
- font-size: 8pt;
- padding-right: 5px;
- width: 50%;
- text-align: right;
-}
-
-div.summary a
-{
- white-space: nowrap;
-}
-
-div.ingroups
-{
- font-size: 8pt;
- width: 50%;
- text-align: left;
-}
-
-div.ingroups a
-{
- white-space: nowrap;
-}
-
-div.header
-{
- background-image:url('nav_h.png');
- background-repeat:repeat-x;
- background-color: #FAFAFA;
- margin: 0px;
- border-bottom: 1px solid #D5D5D5;
-}
-
-div.headertitle
-{
- padding: 5px 5px 5px 10px;
-}
-
-dl
-{
- padding: 0 0 0 10px;
-}
-
-/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
-dl.section
-{
- margin-left: 0px;
- padding-left: 0px;
-}
-
-dl.note
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #D0C000;
-}
-
-dl.warning, dl.attention
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #00D000;
-}
-
-dl.deprecated
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #505050;
-}
-
-dl.todo
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #00C0E0;
-}
-
-dl.test
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #3030E0;
-}
-
-dl.bug
-{
- margin-left:-7px;
- padding-left: 3px;
- border-left:4px solid;
- border-color: #C08050;
-}
-
-dl.section dd {
- margin-bottom: 6px;
-}
-
-
-#projectlogo
-{
- text-align: center;
- vertical-align: bottom;
- border-collapse: separate;
-}
-
-#projectlogo img
-{
- border: 0px none;
-}
-
-#projectname
-{
- font: 300% Tahoma, Arial,sans-serif;
- margin: 0px;
- padding: 2px 0px;
-}
-
-#projectbrief
-{
- font: 120% Tahoma, Arial,sans-serif;
- margin: 0px;
- padding: 0px;
-}
-
-#projectnumber
-{
- font: 50% Tahoma, Arial,sans-serif;
- margin: 0px;
- padding: 0px;
-}
-
-#titlearea
-{
- padding: 0px;
- margin: 0px;
- width: 100%;
- border-bottom: 1px solid #848484;
-}
-
-.image
-{
- text-align: center;
-}
-
-.dotgraph
-{
- text-align: center;
-}
-
-.mscgraph
-{
- text-align: center;
-}
-
-.diagraph
-{
- text-align: center;
-}
-
-.caption
-{
- font-weight: bold;
-}
-
-div.zoom
-{
- border: 1px solid #AFAFAF;
-}
-
-dl.citelist {
- margin-bottom:50px;
-}
-
-dl.citelist dt {
- color:#545454;
- float:left;
- font-weight:bold;
- margin-right:10px;
- padding:5px;
-}
-
-dl.citelist dd {
- margin:2px 0;
- padding:5px 0;
-}
-
-div.toc {
- padding: 14px 25px;
- background-color: #F7F7F7;
- border: 1px solid #E3E3E3;
- border-radius: 7px 7px 7px 7px;
- float: right;
- height: auto;
- margin: 0 20px 10px 10px;
- width: 200px;
-}
-
-div.toc li {
- background: url("bdwn.png") no-repeat scroll 0 5px transparent;
- font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
- margin-top: 5px;
- padding-left: 10px;
- padding-top: 2px;
-}
-
-div.toc h3 {
- font: bold 12px/1.2 Arial,FreeSans,sans-serif;
- color: #747474;
- border-bottom: 0 none;
- margin: 0;
-}
-
-div.toc ul {
- list-style: none outside none;
- border: medium none;
- padding: 0px;
-}
-
-div.toc li.level1 {
- margin-left: 0px;
-}
-
-div.toc li.level2 {
- margin-left: 15px;
-}
-
-div.toc li.level3 {
- margin-left: 30px;
-}
-
-div.toc li.level4 {
- margin-left: 45px;
-}
-
-.inherit_header {
- font-weight: bold;
- color: gray;
- cursor: pointer;
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-.inherit_header td {
- padding: 6px 0px 2px 5px;
-}
-
-.inherit {
- display: none;
-}
-
-tr.heading h2 {
- margin-top: 12px;
- margin-bottom: 4px;
-}
-
-/* tooltip related style info */
-
-.ttc {
- position: absolute;
- display: none;
-}
-
-#powerTip {
- cursor: default;
- white-space: nowrap;
- background-color: white;
- border: 1px solid gray;
- border-radius: 4px 4px 4px 4px;
- box-shadow: 1px 1px 7px gray;
- display: none;
- font-size: smaller;
- max-width: 80%;
- opacity: 0.9;
- padding: 1ex 1em 1em;
- position: absolute;
- z-index: 2147483647;
-}
-
-#powerTip div.ttdoc {
- color: grey;
- font-style: italic;
-}
-
-#powerTip div.ttname a {
- font-weight: bold;
-}
-
-#powerTip div.ttname {
- font-weight: bold;
-}
-
-#powerTip div.ttdeci {
- color: #006318;
-}
-
-#powerTip div {
- margin: 0px;
- padding: 0px;
- font: 12px/16px Roboto,sans-serif;
-}
-
-#powerTip:before, #powerTip:after {
- content: "";
- position: absolute;
- margin: 0px;
-}
-
-#powerTip.n:after, #powerTip.n:before,
-#powerTip.s:after, #powerTip.s:before,
-#powerTip.w:after, #powerTip.w:before,
-#powerTip.e:after, #powerTip.e:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.nw:after, #powerTip.nw:before,
-#powerTip.sw:after, #powerTip.sw:before {
- border: solid transparent;
- content: " ";
- height: 0;
- width: 0;
- position: absolute;
-}
-
-#powerTip.n:after, #powerTip.s:after,
-#powerTip.w:after, #powerTip.e:after,
-#powerTip.nw:after, #powerTip.ne:after,
-#powerTip.sw:after, #powerTip.se:after {
- border-color: rgba(255, 255, 255, 0);
-}
-
-#powerTip.n:before, #powerTip.s:before,
-#powerTip.w:before, #powerTip.e:before,
-#powerTip.nw:before, #powerTip.ne:before,
-#powerTip.sw:before, #powerTip.se:before {
- border-color: rgba(128, 128, 128, 0);
-}
-
-#powerTip.n:after, #powerTip.n:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.nw:after, #powerTip.nw:before {
- top: 100%;
-}
-
-#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
- border-top-color: #ffffff;
- border-width: 10px;
- margin: 0px -10px;
-}
-#powerTip.n:before {
- border-top-color: #808080;
- border-width: 11px;
- margin: 0px -11px;
-}
-#powerTip.n:after, #powerTip.n:before {
- left: 50%;
-}
-
-#powerTip.nw:after, #powerTip.nw:before {
- right: 14px;
-}
-
-#powerTip.ne:after, #powerTip.ne:before {
- left: 14px;
-}
-
-#powerTip.s:after, #powerTip.s:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.sw:after, #powerTip.sw:before {
- bottom: 100%;
-}
-
-#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
- border-bottom-color: #ffffff;
- border-width: 10px;
- margin: 0px -10px;
-}
-
-#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
- border-bottom-color: #808080;
- border-width: 11px;
- margin: 0px -11px;
-}
-
-#powerTip.s:after, #powerTip.s:before {
- left: 50%;
-}
-
-#powerTip.sw:after, #powerTip.sw:before {
- right: 14px;
-}
-
-#powerTip.se:after, #powerTip.se:before {
- left: 14px;
-}
-
-#powerTip.e:after, #powerTip.e:before {
- left: 100%;
-}
-#powerTip.e:after {
- border-left-color: #ffffff;
- border-width: 10px;
- top: 50%;
- margin-top: -10px;
-}
-#powerTip.e:before {
- border-left-color: #808080;
- border-width: 11px;
- top: 50%;
- margin-top: -11px;
-}
-
-#powerTip.w:after, #powerTip.w:before {
- right: 100%;
-}
-#powerTip.w:after {
- border-right-color: #ffffff;
- border-width: 10px;
- top: 50%;
- margin-top: -10px;
-}
-#powerTip.w:before {
- border-right-color: #808080;
- border-width: 11px;
- top: 50%;
- margin-top: -11px;
-}
-
-@media print
-{
- #top { display: none; }
- #side-nav { display: none; }
- #nav-path { display: none; }
- body { overflow:visible; }
- h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
- .summary { display: none; }
- .memitem { page-break-inside: avoid; }
- #doc-content
- {
- margin-left:0 !important;
- height:auto !important;
- width:auto !important;
- overflow:inherit;
- display:inline;
- }
-}
-
diff --git a/docs/html/ndk/reference/doxygen.png b/docs/html/ndk/reference/doxygen.png
deleted file mode 100644
index da7e8aa..0000000
--- a/docs/html/ndk/reference/doxygen.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/dynsections.js b/docs/html/ndk/reference/dynsections.js
deleted file mode 100644
index ed092c7..0000000
--- a/docs/html/ndk/reference/dynsections.js
+++ /dev/null
@@ -1,97 +0,0 @@
-function toggleVisibility(linkObj)
-{
- var base = $(linkObj).attr('id');
- var summary = $('#'+base+'-summary');
- var content = $('#'+base+'-content');
- var trigger = $('#'+base+'-trigger');
- var src=$(trigger).attr('src');
- if (content.is(':visible')===true) {
- content.hide();
- summary.show();
- $(linkObj).addClass('closed').removeClass('opened');
- $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
- } else {
- content.show();
- summary.hide();
- $(linkObj).removeClass('closed').addClass('opened');
- $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
- }
- return false;
-}
-
-function updateStripes()
-{
- $('table.directory tr').
- removeClass('even').filter(':visible:even').addClass('even');
-}
-function toggleLevel(level)
-{
- $('table.directory tr').each(function(){
- var l = this.id.split('_').length-1;
- var i = $('#img'+this.id.substring(3));
- var a = $('#arr'+this.id.substring(3));
- if (l<level+1) {
- i.attr('src','ftv2folderopen.png');
- a.attr('src','ftv2mnode.png');
- $(this).show();
- } else if (l==level+1) {
- i.attr('src','ftv2folderclosed.png');
- a.attr('src','ftv2pnode.png');
- $(this).show();
- } else {
- $(this).hide();
- }
- });
- updateStripes();
-}
-
-function toggleFolder(id)
-{
- //The clicked row
- var currentRow = $('#row_'+id);
- var currentRowImages = currentRow.find("img");
-
- //All rows after the clicked row
- var rows = currentRow.nextAll("tr");
-
- //Only match elements AFTER this one (can't hide elements before)
- var childRows = rows.filter(function() {
- var re = new RegExp('^row_'+id+'\\d+_$', "i"); //only one sub
- return this.id.match(re);
- });
-
- //First row is visible we are HIDING
- if (childRows.filter(':first').is(':visible')===true) {
- currentRowImages.filter("[id^=arr]").attr('src', 'ftv2pnode.png');
- currentRowImages.filter("[id^=img]").attr('src', 'ftv2folderclosed.png');
- rows.filter("[id^=row_"+id+"]").hide();
- } else { //We are SHOWING
- //All sub images
- var childImages = childRows.find("img");
- var childImg = childImages.filter("[id^=img]");
- var childArr = childImages.filter("[id^=arr]");
-
- currentRow.find("[id^=arr]").attr('src', 'ftv2mnode.png'); //open row
- currentRow.find("[id^=img]").attr('src', 'ftv2folderopen.png'); //open row
- childImg.attr('src','ftv2folderclosed.png'); //children closed
- childArr.attr('src','ftv2pnode.png'); //children closed
- childRows.show(); //show all children
- }
- updateStripes();
-}
-
-
-function toggleInherit(id)
-{
- var rows = $('tr.inherit.'+id);
- var img = $('tr.inherit_header.'+id+' img');
- var src = $(img).attr('src');
- if (rows.filter(':first').is(':visible')===true) {
- rows.css('display','none');
- $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
- } else {
- rows.css('display','table-row'); // using show() causes jump in firefox
- $(img).attr('src',src.substring(0,src.length-10)+'open.png');
- }
-}
-
diff --git a/docs/html/ndk/reference/files.jd b/docs/html/ndk/reference/files.jd
deleted file mode 100644
index 1144d5bb..0000000
--- a/docs/html/ndk/reference/files.jd
+++ /dev/null
@@ -1,30 +0,0 @@
-page.title=File List
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">File List</div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock">Here is a list of all files with brief descriptions:</div><div class="directory">
-<table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="asset__manager_8h.html" target="_self">asset_manager.h</a></td><td class="desc"></td></tr>
-<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="asset__manager__jni_8h.html" target="_self">asset_manager_jni.h</a></td><td class="desc"></td></tr>
-<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="bitmap_8h.html" target="_self">bitmap.h</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="configuration_8h.html" target="_self">configuration.h</a></td><td class="desc"></td></tr>
-<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="input_8h.html" target="_self">input.h</a></td><td class="desc"></td></tr>
-<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="keycodes_8h.html" target="_self">keycodes.h</a></td><td class="desc"></td></tr>
-<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="looper_8h.html" target="_self">looper.h</a></td><td class="desc"></td></tr>
-<tr id="row_7_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="native__activity_8h.html" target="_self">native_activity.h</a></td><td class="desc"></td></tr>
-<tr id="row_8_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="native__window_8h.html" target="_self">native_window.h</a></td><td class="desc"></td></tr>
-<tr id="row_9_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="native__window__jni_8h.html" target="_self">native_window_jni.h</a></td><td class="desc"></td></tr>
-<tr id="row_10_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="obb_8h.html" target="_self">obb.h</a></td><td class="desc"></td></tr>
-<tr id="row_11_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="rect_8h.html" target="_self">rect.h</a></td><td class="desc"></td></tr>
-<tr id="row_12_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="sensor_8h.html" target="_self">sensor.h</a></td><td class="desc"></td></tr>
-<tr id="row_13_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="storage__manager_8h.html" target="_self">storage_manager.h</a></td><td class="desc"></td></tr>
-<tr id="row_14_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="window_8h.html" target="_self">window.h</a></td><td class="desc"></td></tr>
-</table>
-</div><!-- directory -->
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/ftv2blank.png b/docs/html/ndk/reference/ftv2blank.png
deleted file mode 100644
index 63c605b..0000000
--- a/docs/html/ndk/reference/ftv2blank.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2cl.png b/docs/html/ndk/reference/ftv2cl.png
deleted file mode 100644
index d660c7b..0000000
--- a/docs/html/ndk/reference/ftv2cl.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2doc.png b/docs/html/ndk/reference/ftv2doc.png
deleted file mode 100644
index 7f92e54..0000000
--- a/docs/html/ndk/reference/ftv2doc.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2folderclosed.png b/docs/html/ndk/reference/ftv2folderclosed.png
deleted file mode 100644
index 359f207..0000000
--- a/docs/html/ndk/reference/ftv2folderclosed.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2folderopen.png b/docs/html/ndk/reference/ftv2folderopen.png
deleted file mode 100644
index c5103ed..0000000
--- a/docs/html/ndk/reference/ftv2folderopen.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2lastnode.png b/docs/html/ndk/reference/ftv2lastnode.png
deleted file mode 100644
index 63c605b..0000000
--- a/docs/html/ndk/reference/ftv2lastnode.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2link.png b/docs/html/ndk/reference/ftv2link.png
deleted file mode 100644
index 7f92e54..0000000
--- a/docs/html/ndk/reference/ftv2link.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2mlastnode.png b/docs/html/ndk/reference/ftv2mlastnode.png
deleted file mode 100644
index 9d1437d..0000000
--- a/docs/html/ndk/reference/ftv2mlastnode.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2mnode.png b/docs/html/ndk/reference/ftv2mnode.png
deleted file mode 100644
index 9d1437d..0000000
--- a/docs/html/ndk/reference/ftv2mnode.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2mo.png b/docs/html/ndk/reference/ftv2mo.png
deleted file mode 100644
index e2513ee..0000000
--- a/docs/html/ndk/reference/ftv2mo.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2node.png b/docs/html/ndk/reference/ftv2node.png
deleted file mode 100644
index 63c605b..0000000
--- a/docs/html/ndk/reference/ftv2node.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2ns.png b/docs/html/ndk/reference/ftv2ns.png
deleted file mode 100644
index c61a541..0000000
--- a/docs/html/ndk/reference/ftv2ns.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2plastnode.png b/docs/html/ndk/reference/ftv2plastnode.png
deleted file mode 100644
index a2fffb6..0000000
--- a/docs/html/ndk/reference/ftv2plastnode.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2pnode.png b/docs/html/ndk/reference/ftv2pnode.png
deleted file mode 100644
index a2fffb6..0000000
--- a/docs/html/ndk/reference/ftv2pnode.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2splitbar.png b/docs/html/ndk/reference/ftv2splitbar.png
deleted file mode 100644
index 343046b..0000000
--- a/docs/html/ndk/reference/ftv2splitbar.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/ftv2vertline.png b/docs/html/ndk/reference/ftv2vertline.png
deleted file mode 100644
index 63c605b..0000000
--- a/docs/html/ndk/reference/ftv2vertline.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/functions.jd b/docs/html/ndk/reference/functions.jd
deleted file mode 100644
index fade0d5..0000000
--- a/docs/html/ndk/reference/functions.jd
+++ /dev/null
@@ -1,327 +0,0 @@
-page.title=Data Fields
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
-<div class="textblock">Here is a list of all struct and union fields with links to the structures/unions they belong to:</div>
-
-<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
-<li>acceleration
-: <a class="el" href="struct_a_sensor_event.html#aab1f50881089166ff5f3d46f7bfcf09c">ASensorEvent</a>
-</li>
-<li>assetManager
-: <a class="el" href="struct_a_native_activity.html#a0f76f065768b8f896ce47a3089fb438d">ANativeActivity</a>
-</li>
-<li>azimuth
-: <a class="el" href="struct_a_sensor_vector.html#a01b03ebfa7d0a95760e743f611fecbc5">ASensorVector</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_b"></a>- b -</h3><ul>
-<li>bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a52bd7f09c4decadcfbc0347fda4163d6">AUncalibratedEvent</a>
-</li>
-<li>bits
-: <a class="el" href="struct_a_native_window___buffer.html#a089d8e968fac54a9e45f059b8b78cf9b">ANativeWindow_Buffer</a>
-</li>
-<li>bottom
-: <a class="el" href="struct_a_rect.html#a4479860c72ca8e96ac4fb1cc149dd71b">ARect</a>
-</li>
-<li>bpm
-: <a class="el" href="struct_a_heart_rate_event.html#ab0560092cbaa233e74bb0d543a85965d">AHeartRateEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
-<li>callbacks
-: <a class="el" href="struct_a_native_activity.html#af96995a13e77baf0d71c37d20c79ad51">ANativeActivity</a>
-</li>
-<li>clazz
-: <a class="el" href="struct_a_native_activity.html#ab10b01c3c23c4ddb9d2ddadd71b03c94">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
-<li>data
-: <a class="el" href="struct_a_sensor_event.html#a31244897a6c7f657a9aec807dd1e09ae">ASensorEvent</a>
-</li>
-<li>distance
-: <a class="el" href="struct_a_sensor_event.html#a06f14a9abd47b91465f895d5259cdc1b">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
-<li>env
-: <a class="el" href="struct_a_native_activity.html#ae6f0d0cd46e56b7e299b489cb60dd27e">ANativeActivity</a>
-</li>
-<li>externalDataPath
-: <a class="el" href="struct_a_native_activity.html#a2a61553b2f660ea8b57fcc2b495e109f">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_f"></a>- f -</h3><ul>
-<li>flags
-: <a class="el" href="struct_android_bitmap_info.html#a773b39d480759f67926cb18ae2219281">AndroidBitmapInfo</a>
-, <a class="el" href="struct_a_sensor_event.html#a773b39d480759f67926cb18ae2219281">ASensorEvent</a>
-</li>
-<li>format
-: <a class="el" href="struct_a_native_window___buffer.html#a49d503b84d084937e3ceeda9f0b4659e">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a49d503b84d084937e3ceeda9f0b4659e">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
-<li>heart_rate
-: <a class="el" href="struct_a_sensor_event.html#a2325abb12f65d7cbceec766e6db506d8">ASensorEvent</a>
-</li>
-<li>height
-: <a class="el" href="struct_a_native_window___buffer.html#a5d8006e753a3e76ff637a4e092bbed71">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a6ad4f820ce4e75cda0686fcaad5168be">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
-<li>instance
-: <a class="el" href="struct_a_native_activity.html#ae1b90392cd257d16fd66a85bac1b08cd">ANativeActivity</a>
-</li>
-<li>internalDataPath
-: <a class="el" href="struct_a_native_activity.html#aa52947cdd1476b95e858d83c0f5b0220">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
-<li>left
-: <a class="el" href="struct_a_rect.html#a9ee4ce87784b0ebeaadce132ce7d421f">ARect</a>
-</li>
-<li>light
-: <a class="el" href="struct_a_sensor_event.html#aaf8b2537020ae0b7450785724d77a3e0">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
-<li>magnetic
-: <a class="el" href="struct_a_sensor_event.html#a776bc8e3beff52764ef2d6d423563d64">ASensorEvent</a>
-</li>
-<li>meta_data
-: <a class="el" href="struct_a_sensor_event.html#a40a6e69697a42e0f0ad04a09d7f113d3">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
-<li>obbPath
-: <a class="el" href="struct_a_native_activity.html#a0aff284eb9ab311d81f20955258798cf">ANativeActivity</a>
-</li>
-<li>onConfigurationChanged
-: <a class="el" href="struct_a_native_activity_callbacks.html#a2926b45334319089e4e25fbc86d74c3f">ANativeActivityCallbacks</a>
-</li>
-<li>onContentRectChanged
-: <a class="el" href="struct_a_native_activity_callbacks.html#a61d30a43b3c77b6047afe951706f6a1e">ANativeActivityCallbacks</a>
-</li>
-<li>onDestroy
-: <a class="el" href="struct_a_native_activity_callbacks.html#a45598ebed3d15847b4f97acb9e15076e">ANativeActivityCallbacks</a>
-</li>
-<li>onInputQueueCreated
-: <a class="el" href="struct_a_native_activity_callbacks.html#a17b41ec9bb8b0b9e42d1e269a62a4d59">ANativeActivityCallbacks</a>
-</li>
-<li>onInputQueueDestroyed
-: <a class="el" href="struct_a_native_activity_callbacks.html#a82675193f867bc64180016923b0bb129">ANativeActivityCallbacks</a>
-</li>
-<li>onLowMemory
-: <a class="el" href="struct_a_native_activity_callbacks.html#aac61f647cbd971321c692a74a1136f67">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowCreated
-: <a class="el" href="struct_a_native_activity_callbacks.html#ac997f07e53ba58179a2133e86e5cbd31">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowDestroyed
-: <a class="el" href="struct_a_native_activity_callbacks.html#a150442c0611e8ce24a32a7c805e7c9db">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowRedrawNeeded
-: <a class="el" href="struct_a_native_activity_callbacks.html#a3cad4792af363b9a40599d09afeab56c">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowResized
-: <a class="el" href="struct_a_native_activity_callbacks.html#ab7bd120b8816508561126308f699f116">ANativeActivityCallbacks</a>
-</li>
-<li>onPause
-: <a class="el" href="struct_a_native_activity_callbacks.html#aee8a4dcff234b94d0bf0bc85efea42c2">ANativeActivityCallbacks</a>
-</li>
-<li>onResume
-: <a class="el" href="struct_a_native_activity_callbacks.html#ac2c85491a68e6dece3d82782c1254e73">ANativeActivityCallbacks</a>
-</li>
-<li>onSaveInstanceState
-: <a class="el" href="struct_a_native_activity_callbacks.html#a16a270d24a484a376e28bc6c48fc22a1">ANativeActivityCallbacks</a>
-</li>
-<li>onStart
-: <a class="el" href="struct_a_native_activity_callbacks.html#acda344fd29c2018640a85a585317d92c">ANativeActivityCallbacks</a>
-</li>
-<li>onStop
-: <a class="el" href="struct_a_native_activity_callbacks.html#adefa99d16d11d21bb8a83ba426047605">ANativeActivityCallbacks</a>
-</li>
-<li>onWindowFocusChanged
-: <a class="el" href="struct_a_native_activity_callbacks.html#a620ef54556eac0b2b28d7e6d0644ee4a">ANativeActivityCallbacks</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
-<li>pitch
-: <a class="el" href="struct_a_sensor_vector.html#a282e7d4378d4a18a805b8980295ac86c">ASensorVector</a>
-</li>
-<li>pressure
-: <a class="el" href="struct_a_sensor_event.html#ac870e1249bab4a2a68cc4126761d24ef">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_r"></a>- r -</h3><ul>
-<li>relative_humidity
-: <a class="el" href="struct_a_sensor_event.html#ad60830bc80efb7e8a11d6fb25518f55b">ASensorEvent</a>
-</li>
-<li>reserved
-: <a class="el" href="struct_a_native_window___buffer.html#a60cc5aad4013157e2e7434d6de450656">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_a_sensor_vector.html#a72aca6ea6d8153b28ea8f139b932ec3e">ASensorVector</a>
-</li>
-<li>reserved0
-: <a class="el" href="struct_a_sensor_event.html#a3b1869501b35bf41f2ff54de072b6c2c">ASensorEvent</a>
-</li>
-<li>reserved1
-: <a class="el" href="struct_a_sensor_event.html#a3c2ed5a26d302c47f7b3f2dd0bbf7f94">ASensorEvent</a>
-</li>
-<li>right
-: <a class="el" href="struct_a_rect.html#a3d3a4d6bf8bc6c866fa737e11590cc4e">ARect</a>
-</li>
-<li>roll
-: <a class="el" href="struct_a_sensor_vector.html#a26fd84d522945b6038221d9e38c7cc39">ASensorVector</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
-<li>sdkVersion
-: <a class="el" href="struct_a_native_activity.html#a40b4b64be7ecfac23751618313eb610d">ANativeActivity</a>
-</li>
-<li>sensor
-: <a class="el" href="struct_a_meta_data_event.html#a470f19badf179fe205462c060e5175b4">AMetaDataEvent</a>
-, <a class="el" href="struct_a_sensor_event.html#a470f19badf179fe205462c060e5175b4">ASensorEvent</a>
-</li>
-<li>status
-: <a class="el" href="struct_a_heart_rate_event.html#a555c2084e8436de01dc76a23590e8824">AHeartRateEvent</a>
-, <a class="el" href="struct_a_sensor_vector.html#a555c2084e8436de01dc76a23590e8824">ASensorVector</a>
-</li>
-<li>step_counter
-: <a class="el" href="struct_a_sensor_event.html#a2e54280490afc977b11157e387841145">ASensorEvent</a>
-</li>
-<li>stride
-: <a class="el" href="struct_a_native_window___buffer.html#a4438e3445d33be6d33b2c0dbe9c2e0d7">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a981556a4e63b7b6d9f94975c7a8930ab">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
-<li>temperature
-: <a class="el" href="struct_a_sensor_event.html#afc1d28cfbce795d6ea954ebe725241f5">ASensorEvent</a>
-</li>
-<li>timestamp
-: <a class="el" href="struct_a_sensor_event.html#a8a591d341723df9496cda98e225b25b4">ASensorEvent</a>
-</li>
-<li>top
-: <a class="el" href="struct_a_rect.html#ad07137116129d873220209ea65f9d3d4">ARect</a>
-</li>
-<li>type
-: <a class="el" href="struct_a_sensor_event.html#a449e574ed6911881dc55507cb5635c2c">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
-<li>u64
-: <a class="el" href="struct_a_sensor_event.html#a89806d4445310e62ed4b68c9e2698b27">ASensorEvent</a>
-</li>
-<li>uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#a9c22454e765672782b7198d57a92f5fd">AUncalibratedEvent</a>
-</li>
-<li>uncalibrated_gyro
-: <a class="el" href="struct_a_sensor_event.html#a4e35158edcd83e4651d7083ebdb41bae">ASensorEvent</a>
-</li>
-<li>uncalibrated_magnetic
-: <a class="el" href="struct_a_sensor_event.html#a3c746f01a48fbdefaad12c35be0dd715">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
-<li>v
-: <a class="el" href="struct_a_sensor_vector.html#a9a1a1a00f1e45435cc3001b553000a21">ASensorVector</a>
-</li>
-<li>vector
-: <a class="el" href="struct_a_sensor_event.html#aebf12879fa9b61c671584994ddad9610">ASensorEvent</a>
-</li>
-<li>version
-: <a class="el" href="struct_a_sensor_event.html#a67fae7dd1de9edce3656ed214d20377f">ASensorEvent</a>
-</li>
-<li>vm
-: <a class="el" href="struct_a_native_activity.html#a5e163c28566d4563eafeabd7dcab7eeb">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
-<li>what
-: <a class="el" href="struct_a_meta_data_event.html#a397e31e246d23c1be3fa82ca4af8b930">AMetaDataEvent</a>
-</li>
-<li>width
-: <a class="el" href="struct_a_native_window___buffer.html#a395d15e7c2b09961c1bfd1da6179b64c">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a325272ddd9a962f05deb905101d25cbd">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_x"></a>- x -</h3><ul>
-<li>x
-: <a class="el" href="struct_a_sensor_vector.html#ad0da36b2558901e21e7a30f6c227a45e">ASensorVector</a>
-</li>
-<li>x_bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a56c4ea73587a9ea20595cca9bcfe9593">AUncalibratedEvent</a>
-</li>
-<li>x_uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#ac8b7f8daea042eaa2b86f0bf2160c44a">AUncalibratedEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_y"></a>- y -</h3><ul>
-<li>y
-: <a class="el" href="struct_a_sensor_vector.html#aa4f0d3eebc3c443f9be81bf48561a217">ASensorVector</a>
-</li>
-<li>y_bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a130457eaa905b467bc43fedb02cbb16a">AUncalibratedEvent</a>
-</li>
-<li>y_uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#a43437dd77e26c6b89ab1c91aeb63fd64">AUncalibratedEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_z"></a>- z -</h3><ul>
-<li>z
-: <a class="el" href="struct_a_sensor_vector.html#af73583b1e980b0aa03f9884812e9fd4d">ASensorVector</a>
-</li>
-<li>z_bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a6e265324293107afbfa9e587941a4036">AUncalibratedEvent</a>
-</li>
-<li>z_uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#ae677be5f98570cc5a1fd7fddcd8a6841">AUncalibratedEvent</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/functions_vars.jd b/docs/html/ndk/reference/functions_vars.jd
deleted file mode 100644
index 129c7ec..0000000
--- a/docs/html/ndk/reference/functions_vars.jd
+++ /dev/null
@@ -1,327 +0,0 @@
-page.title=Data Fields - Variables
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- 
-
-<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
-<li>acceleration
-: <a class="el" href="struct_a_sensor_event.html#aab1f50881089166ff5f3d46f7bfcf09c">ASensorEvent</a>
-</li>
-<li>assetManager
-: <a class="el" href="struct_a_native_activity.html#a0f76f065768b8f896ce47a3089fb438d">ANativeActivity</a>
-</li>
-<li>azimuth
-: <a class="el" href="struct_a_sensor_vector.html#a01b03ebfa7d0a95760e743f611fecbc5">ASensorVector</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_b"></a>- b -</h3><ul>
-<li>bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a52bd7f09c4decadcfbc0347fda4163d6">AUncalibratedEvent</a>
-</li>
-<li>bits
-: <a class="el" href="struct_a_native_window___buffer.html#a089d8e968fac54a9e45f059b8b78cf9b">ANativeWindow_Buffer</a>
-</li>
-<li>bottom
-: <a class="el" href="struct_a_rect.html#a4479860c72ca8e96ac4fb1cc149dd71b">ARect</a>
-</li>
-<li>bpm
-: <a class="el" href="struct_a_heart_rate_event.html#ab0560092cbaa233e74bb0d543a85965d">AHeartRateEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
-<li>callbacks
-: <a class="el" href="struct_a_native_activity.html#af96995a13e77baf0d71c37d20c79ad51">ANativeActivity</a>
-</li>
-<li>clazz
-: <a class="el" href="struct_a_native_activity.html#ab10b01c3c23c4ddb9d2ddadd71b03c94">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
-<li>data
-: <a class="el" href="struct_a_sensor_event.html#a31244897a6c7f657a9aec807dd1e09ae">ASensorEvent</a>
-</li>
-<li>distance
-: <a class="el" href="struct_a_sensor_event.html#a06f14a9abd47b91465f895d5259cdc1b">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
-<li>env
-: <a class="el" href="struct_a_native_activity.html#ae6f0d0cd46e56b7e299b489cb60dd27e">ANativeActivity</a>
-</li>
-<li>externalDataPath
-: <a class="el" href="struct_a_native_activity.html#a2a61553b2f660ea8b57fcc2b495e109f">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_f"></a>- f -</h3><ul>
-<li>flags
-: <a class="el" href="struct_android_bitmap_info.html#a773b39d480759f67926cb18ae2219281">AndroidBitmapInfo</a>
-, <a class="el" href="struct_a_sensor_event.html#a773b39d480759f67926cb18ae2219281">ASensorEvent</a>
-</li>
-<li>format
-: <a class="el" href="struct_a_native_window___buffer.html#a49d503b84d084937e3ceeda9f0b4659e">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a49d503b84d084937e3ceeda9f0b4659e">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
-<li>heart_rate
-: <a class="el" href="struct_a_sensor_event.html#a2325abb12f65d7cbceec766e6db506d8">ASensorEvent</a>
-</li>
-<li>height
-: <a class="el" href="struct_a_native_window___buffer.html#a5d8006e753a3e76ff637a4e092bbed71">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a6ad4f820ce4e75cda0686fcaad5168be">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
-<li>instance
-: <a class="el" href="struct_a_native_activity.html#ae1b90392cd257d16fd66a85bac1b08cd">ANativeActivity</a>
-</li>
-<li>internalDataPath
-: <a class="el" href="struct_a_native_activity.html#aa52947cdd1476b95e858d83c0f5b0220">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
-<li>left
-: <a class="el" href="struct_a_rect.html#a9ee4ce87784b0ebeaadce132ce7d421f">ARect</a>
-</li>
-<li>light
-: <a class="el" href="struct_a_sensor_event.html#aaf8b2537020ae0b7450785724d77a3e0">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
-<li>magnetic
-: <a class="el" href="struct_a_sensor_event.html#a776bc8e3beff52764ef2d6d423563d64">ASensorEvent</a>
-</li>
-<li>meta_data
-: <a class="el" href="struct_a_sensor_event.html#a40a6e69697a42e0f0ad04a09d7f113d3">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
-<li>obbPath
-: <a class="el" href="struct_a_native_activity.html#a0aff284eb9ab311d81f20955258798cf">ANativeActivity</a>
-</li>
-<li>onConfigurationChanged
-: <a class="el" href="struct_a_native_activity_callbacks.html#a2926b45334319089e4e25fbc86d74c3f">ANativeActivityCallbacks</a>
-</li>
-<li>onContentRectChanged
-: <a class="el" href="struct_a_native_activity_callbacks.html#a61d30a43b3c77b6047afe951706f6a1e">ANativeActivityCallbacks</a>
-</li>
-<li>onDestroy
-: <a class="el" href="struct_a_native_activity_callbacks.html#a45598ebed3d15847b4f97acb9e15076e">ANativeActivityCallbacks</a>
-</li>
-<li>onInputQueueCreated
-: <a class="el" href="struct_a_native_activity_callbacks.html#a17b41ec9bb8b0b9e42d1e269a62a4d59">ANativeActivityCallbacks</a>
-</li>
-<li>onInputQueueDestroyed
-: <a class="el" href="struct_a_native_activity_callbacks.html#a82675193f867bc64180016923b0bb129">ANativeActivityCallbacks</a>
-</li>
-<li>onLowMemory
-: <a class="el" href="struct_a_native_activity_callbacks.html#aac61f647cbd971321c692a74a1136f67">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowCreated
-: <a class="el" href="struct_a_native_activity_callbacks.html#ac997f07e53ba58179a2133e86e5cbd31">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowDestroyed
-: <a class="el" href="struct_a_native_activity_callbacks.html#a150442c0611e8ce24a32a7c805e7c9db">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowRedrawNeeded
-: <a class="el" href="struct_a_native_activity_callbacks.html#a3cad4792af363b9a40599d09afeab56c">ANativeActivityCallbacks</a>
-</li>
-<li>onNativeWindowResized
-: <a class="el" href="struct_a_native_activity_callbacks.html#ab7bd120b8816508561126308f699f116">ANativeActivityCallbacks</a>
-</li>
-<li>onPause
-: <a class="el" href="struct_a_native_activity_callbacks.html#aee8a4dcff234b94d0bf0bc85efea42c2">ANativeActivityCallbacks</a>
-</li>
-<li>onResume
-: <a class="el" href="struct_a_native_activity_callbacks.html#ac2c85491a68e6dece3d82782c1254e73">ANativeActivityCallbacks</a>
-</li>
-<li>onSaveInstanceState
-: <a class="el" href="struct_a_native_activity_callbacks.html#a16a270d24a484a376e28bc6c48fc22a1">ANativeActivityCallbacks</a>
-</li>
-<li>onStart
-: <a class="el" href="struct_a_native_activity_callbacks.html#acda344fd29c2018640a85a585317d92c">ANativeActivityCallbacks</a>
-</li>
-<li>onStop
-: <a class="el" href="struct_a_native_activity_callbacks.html#adefa99d16d11d21bb8a83ba426047605">ANativeActivityCallbacks</a>
-</li>
-<li>onWindowFocusChanged
-: <a class="el" href="struct_a_native_activity_callbacks.html#a620ef54556eac0b2b28d7e6d0644ee4a">ANativeActivityCallbacks</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
-<li>pitch
-: <a class="el" href="struct_a_sensor_vector.html#a282e7d4378d4a18a805b8980295ac86c">ASensorVector</a>
-</li>
-<li>pressure
-: <a class="el" href="struct_a_sensor_event.html#ac870e1249bab4a2a68cc4126761d24ef">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_r"></a>- r -</h3><ul>
-<li>relative_humidity
-: <a class="el" href="struct_a_sensor_event.html#ad60830bc80efb7e8a11d6fb25518f55b">ASensorEvent</a>
-</li>
-<li>reserved
-: <a class="el" href="struct_a_native_window___buffer.html#a60cc5aad4013157e2e7434d6de450656">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_a_sensor_vector.html#a72aca6ea6d8153b28ea8f139b932ec3e">ASensorVector</a>
-</li>
-<li>reserved0
-: <a class="el" href="struct_a_sensor_event.html#a3b1869501b35bf41f2ff54de072b6c2c">ASensorEvent</a>
-</li>
-<li>reserved1
-: <a class="el" href="struct_a_sensor_event.html#a3c2ed5a26d302c47f7b3f2dd0bbf7f94">ASensorEvent</a>
-</li>
-<li>right
-: <a class="el" href="struct_a_rect.html#a3d3a4d6bf8bc6c866fa737e11590cc4e">ARect</a>
-</li>
-<li>roll
-: <a class="el" href="struct_a_sensor_vector.html#a26fd84d522945b6038221d9e38c7cc39">ASensorVector</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
-<li>sdkVersion
-: <a class="el" href="struct_a_native_activity.html#a40b4b64be7ecfac23751618313eb610d">ANativeActivity</a>
-</li>
-<li>sensor
-: <a class="el" href="struct_a_meta_data_event.html#a470f19badf179fe205462c060e5175b4">AMetaDataEvent</a>
-, <a class="el" href="struct_a_sensor_event.html#a470f19badf179fe205462c060e5175b4">ASensorEvent</a>
-</li>
-<li>status
-: <a class="el" href="struct_a_heart_rate_event.html#a555c2084e8436de01dc76a23590e8824">AHeartRateEvent</a>
-, <a class="el" href="struct_a_sensor_vector.html#a555c2084e8436de01dc76a23590e8824">ASensorVector</a>
-</li>
-<li>step_counter
-: <a class="el" href="struct_a_sensor_event.html#a2e54280490afc977b11157e387841145">ASensorEvent</a>
-</li>
-<li>stride
-: <a class="el" href="struct_a_native_window___buffer.html#a4438e3445d33be6d33b2c0dbe9c2e0d7">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a981556a4e63b7b6d9f94975c7a8930ab">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
-<li>temperature
-: <a class="el" href="struct_a_sensor_event.html#afc1d28cfbce795d6ea954ebe725241f5">ASensorEvent</a>
-</li>
-<li>timestamp
-: <a class="el" href="struct_a_sensor_event.html#a8a591d341723df9496cda98e225b25b4">ASensorEvent</a>
-</li>
-<li>top
-: <a class="el" href="struct_a_rect.html#ad07137116129d873220209ea65f9d3d4">ARect</a>
-</li>
-<li>type
-: <a class="el" href="struct_a_sensor_event.html#a449e574ed6911881dc55507cb5635c2c">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
-<li>u64
-: <a class="el" href="struct_a_sensor_event.html#a89806d4445310e62ed4b68c9e2698b27">ASensorEvent</a>
-</li>
-<li>uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#a9c22454e765672782b7198d57a92f5fd">AUncalibratedEvent</a>
-</li>
-<li>uncalibrated_gyro
-: <a class="el" href="struct_a_sensor_event.html#a4e35158edcd83e4651d7083ebdb41bae">ASensorEvent</a>
-</li>
-<li>uncalibrated_magnetic
-: <a class="el" href="struct_a_sensor_event.html#a3c746f01a48fbdefaad12c35be0dd715">ASensorEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
-<li>v
-: <a class="el" href="struct_a_sensor_vector.html#a9a1a1a00f1e45435cc3001b553000a21">ASensorVector</a>
-</li>
-<li>vector
-: <a class="el" href="struct_a_sensor_event.html#aebf12879fa9b61c671584994ddad9610">ASensorEvent</a>
-</li>
-<li>version
-: <a class="el" href="struct_a_sensor_event.html#a67fae7dd1de9edce3656ed214d20377f">ASensorEvent</a>
-</li>
-<li>vm
-: <a class="el" href="struct_a_native_activity.html#a5e163c28566d4563eafeabd7dcab7eeb">ANativeActivity</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
-<li>what
-: <a class="el" href="struct_a_meta_data_event.html#a397e31e246d23c1be3fa82ca4af8b930">AMetaDataEvent</a>
-</li>
-<li>width
-: <a class="el" href="struct_a_native_window___buffer.html#a395d15e7c2b09961c1bfd1da6179b64c">ANativeWindow_Buffer</a>
-, <a class="el" href="struct_android_bitmap_info.html#a325272ddd9a962f05deb905101d25cbd">AndroidBitmapInfo</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_x"></a>- x -</h3><ul>
-<li>x
-: <a class="el" href="struct_a_sensor_vector.html#ad0da36b2558901e21e7a30f6c227a45e">ASensorVector</a>
-</li>
-<li>x_bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a56c4ea73587a9ea20595cca9bcfe9593">AUncalibratedEvent</a>
-</li>
-<li>x_uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#ac8b7f8daea042eaa2b86f0bf2160c44a">AUncalibratedEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_y"></a>- y -</h3><ul>
-<li>y
-: <a class="el" href="struct_a_sensor_vector.html#aa4f0d3eebc3c443f9be81bf48561a217">ASensorVector</a>
-</li>
-<li>y_bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a130457eaa905b467bc43fedb02cbb16a">AUncalibratedEvent</a>
-</li>
-<li>y_uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#a43437dd77e26c6b89ab1c91aeb63fd64">AUncalibratedEvent</a>
-</li>
-</ul>
-
-
-<h3><a class="anchor" id="index_z"></a>- z -</h3><ul>
-<li>z
-: <a class="el" href="struct_a_sensor_vector.html#af73583b1e980b0aa03f9884812e9fd4d">ASensorVector</a>
-</li>
-<li>z_bias
-: <a class="el" href="struct_a_uncalibrated_event.html#a6e265324293107afbfa9e587941a4036">AUncalibratedEvent</a>
-</li>
-<li>z_uncalib
-: <a class="el" href="struct_a_uncalibrated_event.html#ae677be5f98570cc5a1fd7fddcd8a6841">AUncalibratedEvent</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals.jd b/docs/html/ndk/reference/globals.jd
deleted file mode 100644
index cb6dc11..0000000
--- a/docs/html/ndk/reference/globals.jd
+++ /dev/null
@@ -1,2294 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
-<div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
-
-<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
-<li>AAsset
-: <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">asset_manager.h</a>
-</li>
-<li>AAsset_close()
-: <a class="el" href="group___asset.html#ga1f241e49f691dafcada23bcb76155122">asset_manager.h</a>
-</li>
-<li>AAsset_getBuffer()
-: <a class="el" href="group___asset.html#ga553a14512a98542306238c3ce70d344f">asset_manager.h</a>
-</li>
-<li>AAsset_getLength()
-: <a class="el" href="group___asset.html#gaad8ec42e28522ebc72d3a5c357f9a600">asset_manager.h</a>
-</li>
-<li>AAsset_getLength64()
-: <a class="el" href="group___asset.html#ga55c8bc459327d5d23089e6a4b453f3f1">asset_manager.h</a>
-</li>
-<li>AAsset_getRemainingLength()
-: <a class="el" href="group___asset.html#gae806f55cbc4a93ca245f2adfd63d3eee">asset_manager.h</a>
-</li>
-<li>AAsset_getRemainingLength64()
-: <a class="el" href="group___asset.html#ga21e7221d88dcc44106843192b66755b5">asset_manager.h</a>
-</li>
-<li>AAsset_isAllocated()
-: <a class="el" href="group___asset.html#ga20344cb952a77fa1004f592fb1b55124">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_BUFFER
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba40ec098f4afb7c2869fa449d3059f6bb">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_RANDOM
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba88e1b2a920963d7596735fe28bf30e2f">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_STREAMING
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55bac76f5fdb953097efc04e534474a7ea74">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_UNKNOWN
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba5bf76576f07042f965f230086f7c09f4">asset_manager.h</a>
-</li>
-<li>AAsset_openFileDescriptor()
-: <a class="el" href="group___asset.html#ga1af4ffd050016e99961e24f550981677">asset_manager.h</a>
-</li>
-<li>AAsset_openFileDescriptor64()
-: <a class="el" href="group___asset.html#ga123a44a575f85d91a00a8456dab7bd0a">asset_manager.h</a>
-</li>
-<li>AAsset_read()
-: <a class="el" href="group___asset.html#gaadd86322c1fda5121b6d33745c317fb9">asset_manager.h</a>
-</li>
-<li>AAsset_seek()
-: <a class="el" href="group___asset.html#gacc026a8bedeb1ef80bf12df3b72611a2">asset_manager.h</a>
-</li>
-<li>AAsset_seek64()
-: <a class="el" href="group___asset.html#ga81fbe4368de24a3296ef7a6eba0053c7">asset_manager.h</a>
-</li>
-<li>AAssetDir
-: <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">asset_manager.h</a>
-</li>
-<li>AAssetDir_close()
-: <a class="el" href="group___asset.html#gace1c4d0da274d643c5b10ca218cc6088">asset_manager.h</a>
-</li>
-<li>AAssetDir_getNextFileName()
-: <a class="el" href="group___asset.html#ga4703b9f7baa3daeba248b6547de6b9b0">asset_manager.h</a>
-</li>
-<li>AAssetDir_rewind()
-: <a class="el" href="group___asset.html#ga45db6d19ad5e1c0f9b2e6b4059da14b3">asset_manager.h</a>
-</li>
-<li>AAssetManager
-: <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">asset_manager.h</a>
-</li>
-<li>AAssetManager_fromJava()
-: <a class="el" href="group___asset.html#gadfd6537af41577735bcaee52120127f4">asset_manager_jni.h</a>
-</li>
-<li>AAssetManager_open()
-: <a class="el" href="group___asset.html#ga0037ce3c10a591fe632f34c1aa62955c">asset_manager.h</a>
-</li>
-<li>AAssetManager_openDir()
-: <a class="el" href="group___asset.html#gab5b57ff012d6d1024d8bf5d30aedced4">asset_manager.h</a>
-</li>
-<li>AConfiguration
-: <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">configuration.h</a>
-</li>
-<li>AConfiguration_copy()
-: <a class="el" href="group___configuration.html#gaabff04218a0a76afb8d3ea551b001565">configuration.h</a>
-</li>
-<li>AConfiguration_delete()
-: <a class="el" href="group___configuration.html#ga60fe264b97da84d3370eb9e220159e6d">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace87b4f25e5fd6fe0f3316d21ecc66a1">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a966a3855351a97ae865264afd74c1534">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_DEFAULT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae628b2bf594733b7c19ae394616cec6c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_HIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5ef4a97dc058235cdfa9fcfe3300c7eb">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_LOW
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ddb34b2376422d2323720049eb57f3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_MEDIUM
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2511479d7cd574c4b293d535e4dc337e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_NONE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a7c1af92914155c418b99844c6aab33d7">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_TV
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10e6c3d636f3f6de75de9208913b0d8f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_XHIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a38a03b3b1c64725679605d8d479c85a0">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_XXHIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad6353daf63778a6ec6f2bd3815d7e6e4">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_XXXHIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2bd04af33e868a77bd4d83e7d70368ec">configuration.h</a>
-</li>
-<li>AConfiguration_diff()
-: <a class="el" href="group___configuration.html#gabfe69b0dccae425a16fe94d084f20402">configuration.h</a>
-</li>
-<li>AConfiguration_fromAssetManager()
-: <a class="el" href="group___configuration.html#ga75e061fd0b4f761e08e43af36508c4f3">configuration.h</a>
-</li>
-<li>AConfiguration_getCountry()
-: <a class="el" href="group___configuration.html#gad2b47f787012a82a67a20e5de5211d46">configuration.h</a>
-</li>
-<li>AConfiguration_getDensity()
-: <a class="el" href="group___configuration.html#ga4c994e0555947340582094c3da32a663">configuration.h</a>
-</li>
-<li>AConfiguration_getKeyboard()
-: <a class="el" href="group___configuration.html#gafd0f76ccd4fe4bda5172b8e0bc6675e4">configuration.h</a>
-</li>
-<li>AConfiguration_getKeysHidden()
-: <a class="el" href="group___configuration.html#ga7a8317ab975f621f3fe62ed1b44f2605">configuration.h</a>
-</li>
-<li>AConfiguration_getLanguage()
-: <a class="el" href="group___configuration.html#ga7b004c13448704afb0ea2040d69468c1">configuration.h</a>
-</li>
-<li>AConfiguration_getLayoutDirection()
-: <a class="el" href="group___configuration.html#ga13dbf2fc9a382c62b391e7de9cf9b468">configuration.h</a>
-</li>
-<li>AConfiguration_getMcc()
-: <a class="el" href="group___configuration.html#ga1e78004237a931086d2ae4bd8324bd30">configuration.h</a>
-</li>
-<li>AConfiguration_getMnc()
-: <a class="el" href="group___configuration.html#ga4783776a4fad4501898472375d781fb9">configuration.h</a>
-</li>
-<li>AConfiguration_getNavHidden()
-: <a class="el" href="group___configuration.html#gafe8d3a9c2f715ea76c8e4a99c2db9eaa">configuration.h</a>
-</li>
-<li>AConfiguration_getNavigation()
-: <a class="el" href="group___configuration.html#gae3ff1541b63f5b9256f7c0ebae372977">configuration.h</a>
-</li>
-<li>AConfiguration_getOrientation()
-: <a class="el" href="group___configuration.html#gaa7d8e3e9871dc925fef3e342a92e4e22">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenHeightDp()
-: <a class="el" href="group___configuration.html#ga9905a4765f8d0d921c476ebce01c7648">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenLong()
-: <a class="el" href="group___configuration.html#gab7d1f5aa59e8fa4db0a1b91bb322034c">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenSize()
-: <a class="el" href="group___configuration.html#ga9d2c1b8731795d8e74be7e23cbc77552">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenWidthDp()
-: <a class="el" href="group___configuration.html#ga61e5fe9612c170c33e1c7e9fb92f2219">configuration.h</a>
-</li>
-<li>AConfiguration_getSdkVersion()
-: <a class="el" href="group___configuration.html#ga4aa7062198e5aacd9fabb04d0453dd91">configuration.h</a>
-</li>
-<li>AConfiguration_getSmallestScreenWidthDp()
-: <a class="el" href="group___configuration.html#ga7fc015e41fad342edba66a003d9848aa">configuration.h</a>
-</li>
-<li>AConfiguration_getTouchscreen()
-: <a class="el" href="group___configuration.html#gad305e6cf86fa915c24212e71bb2bf027">configuration.h</a>
-</li>
-<li>AConfiguration_getUiModeNight()
-: <a class="el" href="group___configuration.html#ga447f16a9e4f8400e5e0328900749ff16">configuration.h</a>
-</li>
-<li>AConfiguration_getUiModeType()
-: <a class="el" href="group___configuration.html#ga1d75777892f38208feb3d2a94a977fcf">configuration.h</a>
-</li>
-<li>AConfiguration_isBetterThan()
-: <a class="el" href="group___configuration.html#gafd2bb31057c8d57efcea7603458d2a8d">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0195de2a57f028a8171c42beff0b0e88">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_12KEY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1aaf1a887f146737030cce95c53066ea">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a593f722738682ae4500dab6427670f4a">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_HIDDEN
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a54e71234e32ed037e2d47472f80eb416">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_NOKEYS
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a40195a1a2d8e21c74d99606d8a1a9918">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_QWERTY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a263ff8efb4d2c757e557adc0d0cdeedf">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a34d3a830bc2964000052f8486fd76b0c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5abfbfc3a10affed059263555b00429ab2">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_SOFT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1a56b72c730e40f22f3b8727e54c376c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5e6a5a3f4175644886bde7d0ed4b1ebf">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65834be1230d1694e5ce8a6f407acab2">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4687ede31c438dd9f2701cab88de1dbe">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR_LTR
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a05242d8f2d254b43ff9414ff1aa38a83">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR_RTL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af98332983b787ab9355b527079636870">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LOCALE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ecff796bd0690a9a8498c7de03e9b4">configuration.h</a>
-</li>
-<li>AConfiguration_match()
-: <a class="el" href="group___configuration.html#gafb27b901a1d7d44ed866608fb8399a18">configuration.h</a>
-</li>
-<li>ACONFIGURATION_MCC
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4d40f2aef365c78a52f699b89439db28">configuration.h</a>
-</li>
-<li>ACONFIGURATION_MNC
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ade91a319638eede201579d15f86578a5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_MNC_ZERO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa6cda2f222580dbef27f1277d967d58c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVHIDDEN_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a6db7dd6a67196df88117dcdc904e0cb3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVHIDDEN_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae6ff9883e3e89f8d9ea5c0ebe077c9c5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVHIDDEN_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a79b3a5fe10e948bb79db47b516d46cf5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65e9d31615d2b4adf3738d9a12a1556b">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90e914b60d28c081b313f4b7b6600f47">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_DPAD
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace2e3ed21322100712992ca09f4b75b5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_NONAV
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a3d95e899305aeae366fb7f8d8b6c290a">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_TRACKBALL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad2807d00cb2f5dcb9f456045dd8443a4">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_WHEEL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a80b53370f65ad283a4fd025f36422bea">configuration.h</a>
-</li>
-<li>AConfiguration_new()
-: <a class="el" href="group___configuration.html#ga9543655922980466eb05c7be94a0a567">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a591461d864136d482fe06e01fd945786">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af44cee3290a23999b0358c5638747a5f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_LAND
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad5746872ff6871379fca93c60bfac8a3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_PORT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad9bf5c1fb90f9fdb20f984d0574592fe">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_SQUARE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab0ca4fce673baf58447bfeb154d9a03f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_HEIGHT_DP_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab66ad42d0cf72fd7e8cd99b92b625432">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_LAYOUT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a12d69ffef9135c1c55e1b8b5c2589e7c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_SIZE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a76ca1eb0e9346d93da592afbbf9a3b72">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_WIDTH_DP_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aad653f0c960112177fdc387a4a0577fa">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENLONG_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a41e55e57da42fd09c378f59c1a63710f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENLONG_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a428bb8fcd8bc731b67b0773dc62781c5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENLONG_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a91fc014d328507568d225d691b3babfd">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a9abcd34a6c549e048fc75a545081584e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_LARGE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af871d177fdceedb75612cfc1281d2c12">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_NORMAL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a019727e684f25ba921f3479abd62b9f2">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_SMALL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1163af972206a65a5d18bda12fdc511c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_XLARGE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0ca385ed504fc92f6ff3f0857e916c9c">configuration.h</a>
-</li>
-<li>AConfiguration_setCountry()
-: <a class="el" href="group___configuration.html#gac2f5d414a6466634b1639b5c6f8879ac">configuration.h</a>
-</li>
-<li>AConfiguration_setDensity()
-: <a class="el" href="group___configuration.html#ga9217af9858a7166dcb9a877192779eac">configuration.h</a>
-</li>
-<li>AConfiguration_setKeyboard()
-: <a class="el" href="group___configuration.html#ga4ab3429c5505c108c09349f1ddef572f">configuration.h</a>
-</li>
-<li>AConfiguration_setKeysHidden()
-: <a class="el" href="group___configuration.html#ga5a80a02aa10cfa17de0795054e927183">configuration.h</a>
-</li>
-<li>AConfiguration_setLanguage()
-: <a class="el" href="group___configuration.html#ga1f3c6cf6667655f83777acda7387ddff">configuration.h</a>
-</li>
-<li>AConfiguration_setLayoutDirection()
-: <a class="el" href="group___configuration.html#gaaf47215cf551594f8c2a0594419b47e1">configuration.h</a>
-</li>
-<li>AConfiguration_setMcc()
-: <a class="el" href="group___configuration.html#gae6198b4eaf3e34168f4b13b8b5975d93">configuration.h</a>
-</li>
-<li>AConfiguration_setMnc()
-: <a class="el" href="group___configuration.html#gaaf060ef69c3636f62e90ae0b520eecb8">configuration.h</a>
-</li>
-<li>AConfiguration_setNavHidden()
-: <a class="el" href="group___configuration.html#ga67e86e0347596421771af841710308d5">configuration.h</a>
-</li>
-<li>AConfiguration_setNavigation()
-: <a class="el" href="group___configuration.html#gad21dd14fb823a6a80b66132a05ce8913">configuration.h</a>
-</li>
-<li>AConfiguration_setOrientation()
-: <a class="el" href="group___configuration.html#gadcaa8540bad4172a74032143bcaade04">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenHeightDp()
-: <a class="el" href="group___configuration.html#ga6ffac3b41415ec8a3031737ccdcd63b8">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenLong()
-: <a class="el" href="group___configuration.html#gaed853ab7e2bc915591d05997130bc448">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenSize()
-: <a class="el" href="group___configuration.html#ga7bcf05150933ead34a01061d05ad3245">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenWidthDp()
-: <a class="el" href="group___configuration.html#gafc51d45679095965fe3ba1abd402f120">configuration.h</a>
-</li>
-<li>AConfiguration_setSdkVersion()
-: <a class="el" href="group___configuration.html#ga06c66072902ee455011120188ca4810b">configuration.h</a>
-</li>
-<li>AConfiguration_setSmallestScreenWidthDp()
-: <a class="el" href="group___configuration.html#ga6b004c9585671efc5cebd96c1d43c4f0">configuration.h</a>
-</li>
-<li>AConfiguration_setTouchscreen()
-: <a class="el" href="group___configuration.html#ga0d51dbe710c1afe31ece4dd6a8c188ff">configuration.h</a>
-</li>
-<li>AConfiguration_setUiModeNight()
-: <a class="el" href="group___configuration.html#ga08df1e801afbe4a12411e393b8141e42">configuration.h</a>
-</li>
-<li>AConfiguration_setUiModeType()
-: <a class="el" href="group___configuration.html#gaec61e3cf91cd79e8b76a35bbcb15789d">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SMALLEST_SCREEN_SIZE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5acce415252e0ad95117a05bbe910f06de">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a227120217d8b6a9d5add3ccc4b283702">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a255cfb57ac18d460c5614565a84f5561">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa73bcf45261366840fea743372682fa6">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_FINGER
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4bf2a8323ec6d072aa48d5fc2cff645e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_NOTOUCH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5adfbeb370edd3b4372c9b0f86f152dde0">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_STYLUS
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a8316a15b06353f883f2aef8bd194f79f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a43a324af59372efd08b34431825cf67e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_NIGHT_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a975087bbd4087b57a68ef3cdbfeb77a1">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_NIGHT_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90ebe564e3a3e384d5b013100f81e4b7">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_NIGHT_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a437af4527fac5407de256ec1ef055046">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10d0916da7fa88c945a9cda259407d4c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_APPLIANCE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad99004a7a1b2a97d29b639664947f8e3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_CAR
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5d6575185e41d909469a1dcf5f81bf4f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_DESK
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae10bb854f461f60cf399852f8f327077">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_NORMAL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae7efe2713b6718311da76c828b5b444e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_TELEVISION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4738dded616f028fbbedcbad764e7969">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_WATCH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ac8c3e2207f2356bc6a1dffc6a615d131">configuration.h</a>
-</li>
-<li>ACONFIGURATION_VERSION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1be62e4fc31cf3d3102c99f7c6b4c71b">configuration.h</a>
-</li>
-<li>AHeartRateEvent
-: <a class="el" href="group___sensor.html#gae85b6eac76abe74e6e53d78bb3a4858c">sensor.h</a>
-</li>
-<li>AINPUT_EVENT_TYPE_KEY
-: <a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea696f0d7635f7a24c17d3f1e4ccdd44ba">input.h</a>
-</li>
-<li>AINPUT_EVENT_TYPE_MOTION
-: <a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea2182dfda2cceb5425dcc2823b9b6b56a">input.h</a>
-</li>
-<li>AINPUT_KEYBOARD_TYPE_ALPHABETIC
-: <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaba1f5ab6bc79749ba96a5d2a3af0e574">input.h</a>
-</li>
-<li>AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC
-: <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaf0226d750ea830eb557ae68bd4a1c82a">input.h</a>
-</li>
-<li>AINPUT_KEYBOARD_TYPE_NONE
-: <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fcea32cb7ce34cdce7095962f0766cc6c3ac">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_ORIENTATION
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaf9be9c04a41b610d994a3d1d7e90d06d">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_PRESSURE
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa79aca706b12b28d0ab14762902fed31a">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_SIZE
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa46f3a6cf859fb161cd29398d8448c688">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOOL_MAJOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaa860f54aa9e5a269dba6a54bbcf3c27c">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOOL_MINOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa19226f6cf713c1b4d0973a163daf6cf1">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOUCH_MAJOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa7ead43624c96e165fd8a25e77148aa67">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOUCH_MINOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa301181a0f20681135c15010b39bb575d">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_X
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa0e5816bc48cdb33f2b488a109596ffe1">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_Y
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaab48108c9450ea1b7cd021be7d8cbc332">input.h</a>
-</li>
-<li>AINPUT_SOURCE_ANY
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ab04317e7dd273ff5c87038df67d9796e">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_BUTTON
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dacf1bf3d7b3c6e59f907bdffc9b33370e">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_JOYSTICK
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daaaeffb6442807dd96ec62e9d8a696b57">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_MASK
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daae438f475d03ea60fd9fb356abd7fa01">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_NAVIGATION
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da078a18d85d078412721c336a879bcc1a">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_NONE
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dafd6d5e71f09f6452acf017559481444c">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_POINTER
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da7495274e98fb30dee3dfd903b878cf47">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_POSITION
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da682f6982bb55ee809f6acd2deb550167">input.h</a>
-</li>
-<li>AINPUT_SOURCE_DPAD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ad0fbfeff9f8d57104bff14c70ce5e3ef">input.h</a>
-</li>
-<li>AINPUT_SOURCE_GAMEPAD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a6417cb50ecd6ade48c708268434a49d3">input.h</a>
-</li>
-<li>AINPUT_SOURCE_JOYSTICK
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25afb28f10dc074e7f7435f5904c513edb5">input.h</a>
-</li>
-<li>AINPUT_SOURCE_KEYBOARD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a9860918666dd8c0b9d00a8da7af51e6d">input.h</a>
-</li>
-<li>AINPUT_SOURCE_MOUSE
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae71d3dcbd004bccb6e00fde47097cd86">input.h</a>
-</li>
-<li>AINPUT_SOURCE_STYLUS
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a86d4983c71432b27634ba41a64bffdf9">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TOUCH_NAVIGATION
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a3712c4e4fb8ad7f6ae6e40d48e5c6ee7">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TOUCHPAD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e0715d4b544653ab11893434172a2ef">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TOUCHSCREEN
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a55ea411f927aed8964fa72fec0da444f">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TRACKBALL
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e49d9153c86f60f626d7f797f4e78b6">input.h</a>
-</li>
-<li>AINPUT_SOURCE_UNKNOWN
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae9348bc04cdaa88b5b010f77a4945454">input.h</a>
-</li>
-<li>AInputEvent
-: <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">input.h</a>
-</li>
-<li>AInputEvent_getDeviceId()
-: <a class="el" href="group___input.html#ga9dd3fd81e51dbfde19ab861541242aa1">input.h</a>
-</li>
-<li>AInputEvent_getSource()
-: <a class="el" href="group___input.html#gac90d4b497669dbc709ec9650db4e49be">input.h</a>
-</li>
-<li>AInputEvent_getType()
-: <a class="el" href="group___input.html#ga8292ae06aa8120c52d7380d228600b9c">input.h</a>
-</li>
-<li>AInputQueue
-: <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">input.h</a>
-</li>
-<li>AInputQueue_attachLooper()
-: <a class="el" href="group___input.html#ga900711156bfb58d1a4b158da7874930f">input.h</a>
-</li>
-<li>AInputQueue_detachLooper()
-: <a class="el" href="group___input.html#gaeebe9f83392ac79b31ca40a6fd4dbeff">input.h</a>
-</li>
-<li>AInputQueue_finishEvent()
-: <a class="el" href="group___input.html#ga17e87e0f35d47d729eac31a0dfb1ac33">input.h</a>
-</li>
-<li>AInputQueue_getEvent()
-: <a class="el" href="group___input.html#ga88de12e2b39787ba7d3e4ce2ea46a48c">input.h</a>
-</li>
-<li>AInputQueue_hasEvents()
-: <a class="el" href="group___input.html#ga2b72ad6ab5ef656e8c41163aa7871c96">input.h</a>
-</li>
-<li>AInputQueue_preDispatchEvent()
-: <a class="el" href="group___input.html#gadecd32e6c7aefa4a508b355550d3eaa9">input.h</a>
-</li>
-<li>AKEY_EVENT_ACTION_DOWN
-: <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a123c3bd18fd93b53d8aedbe7597f7b49">input.h</a>
-</li>
-<li>AKEY_EVENT_ACTION_MULTIPLE
-: <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a08e2d927e155478ee66ec46ebd845ab0">input.h</a>
-</li>
-<li>AKEY_EVENT_ACTION_UP
-: <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635abf18b7c5384c5de8657a0650f8da57c3">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_CANCELED
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da3198fad5ab75df614bb41f0f602a9e55">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_CANCELED_LONG_PRESS
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2daf09856f03f2fffee9a82cb8e508efb7a">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_EDITOR_ACTION
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dab9dbcf990d1e4405e32f847fdea52013">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_FALLBACK
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da14f574126d2544863fa8042ddd0f48c0">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_FROM_SYSTEM
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dae1e7ec188b2404fadd94cfba89afd5d6">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_KEEP_TOUCH_MODE
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dadc0a063ca412b0ea08474df422bf9b41">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_LONG_PRESS
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da39f9f7bdf2e256db0e2a8a5dfbfb7185">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_SOFT_KEYBOARD
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da7dbb272c7b28be9c084df3446a629f32">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_TRACKING
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da91e70ab527f27a1779f4550d457f1689">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dad4b5eba5b14e4076c69bc7185f2804f8">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_WOKE_HERE
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da6473a1afc0cc39e029c2a217bc57cdba">input.h</a>
-</li>
-<li>AKEY_STATE_DOWN
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a286ec0a7aff5903a982be0cd6785b62c">input.h</a>
-</li>
-<li>AKEY_STATE_UNKNOWN
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a9506627d5377c67dbc7fc58804b2cdfd">input.h</a>
-</li>
-<li>AKEY_STATE_UP
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04afa14022f587487c24d401c87e71c8e28">input.h</a>
-</li>
-<li>AKEY_STATE_VIRTUAL
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04ad09fd9fe458ca6c66ead9b9a75c56192">input.h</a>
-</li>
-<li>AKEYCODE_0
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23f585ea17aeceaad2111c51ab289e79">keycodes.h</a>
-</li>
-<li>AKEYCODE_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabcac88b54f8d764bc4573ecc5b9571b0">keycodes.h</a>
-</li>
-<li>AKEYCODE_11
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa22858c3c30d596ad60f355f75df86e1">keycodes.h</a>
-</li>
-<li>AKEYCODE_12
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa781c31195e55b2dcbdd772560dc61aa5">keycodes.h</a>
-</li>
-<li>AKEYCODE_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2079c6fb75141968b60ed79fe895d6db">keycodes.h</a>
-</li>
-<li>AKEYCODE_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa40ccc018c0637e4d938e66b789054551">keycodes.h</a>
-</li>
-<li>AKEYCODE_3D_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68d314a5ec06701205cd0097c5c7145c">keycodes.h</a>
-</li>
-<li>AKEYCODE_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c2d141c3906bd97cfec91443356f7b">keycodes.h</a>
-</li>
-<li>AKEYCODE_5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca99d2be4a3723ba3406944ad623f6e">keycodes.h</a>
-</li>
-<li>AKEYCODE_6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa72bc6560e24d08ff8f3116dac9179079">keycodes.h</a>
-</li>
-<li>AKEYCODE_7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa27070499acdb6c527a285b3840ec7bff">keycodes.h</a>
-</li>
-<li>AKEYCODE_8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93543b23683b33724ecf77ac5a8c19ab">keycodes.h</a>
-</li>
-<li>AKEYCODE_9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa31cd4d7c4e59cf7b057b6c248cff516d">keycodes.h</a>
-</li>
-<li>AKEYCODE_A
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa424a091c62d40f5d65908c9730ae9014">keycodes.h</a>
-</li>
-<li>AKEYCODE_ALT_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3dec175158abe8679bedd98ed1bc3e1a">keycodes.h</a>
-</li>
-<li>AKEYCODE_ALT_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd9b6b0846c6999f5df47d29e58ac95d">keycodes.h</a>
-</li>
-<li>AKEYCODE_APOSTROPHE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab5518a8502914ea5f87ef5d29b32b1b1">keycodes.h</a>
-</li>
-<li>AKEYCODE_APP_SWITCH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa53a59a262d6d523bdc2bd30a1e427bad">keycodes.h</a>
-</li>
-<li>AKEYCODE_ASSIST
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3f036adb654c7752890a283ecbf838">keycodes.h</a>
-</li>
-<li>AKEYCODE_AT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7284f79a266ede479b79726082642e16">keycodes.h</a>
-</li>
-<li>AKEYCODE_AVR_INPUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa57d42dbd8ea4219f76fb116f234e6504">keycodes.h</a>
-</li>
-<li>AKEYCODE_AVR_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa479d36f9814bd00c8986a252664b938b">keycodes.h</a>
-</li>
-<li>AKEYCODE_B
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa65d3bf8d6a8a6c2f7c1b08394f313758">keycodes.h</a>
-</li>
-<li>AKEYCODE_BACK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeb71c74bf556ba72e9c8f8dcbe5453d0">keycodes.h</a>
-</li>
-<li>AKEYCODE_BACKSLASH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac90eb064382e3c482ae86abb7b3f701">keycodes.h</a>
-</li>
-<li>AKEYCODE_BOOKMARK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa03ce46d177e020690aa9d26a0fa850ae">keycodes.h</a>
-</li>
-<li>AKEYCODE_BREAK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa047501f9cf9bce00e6048d8759ea3a23">keycodes.h</a>
-</li>
-<li>AKEYCODE_BRIGHTNESS_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7cf1bf3528b6d8a0e86998287fe00650">keycodes.h</a>
-</li>
-<li>AKEYCODE_BRIGHTNESS_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0af6ec416c09d160e364466faa955c36">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa28c72c33ab93d83539d0790b7e48336a">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_10
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7e6f8621909f3461032c33f9c8acaa7">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_11
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab413971c698b6e25d3955667c0142ac1">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_12
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafe4ee1e5446dd12bbb579b412048e79e">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_13
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaabde2ed26594b89d5769eef9f0d1fe6f">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_14
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f08dfd2c30ddedf1d2983680e89041b">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_15
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d8d0fb1a610fdb4e53f0fb675b7d7d0">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_16
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa224370cba99bda2db6a1c82fd2f7fa39">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab8089673fea303c7a299eefd2c327cc3">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa706a5ff492c80b4653e6fe0dcd278ca1">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c425a063bf6976e1ff8ae9f3cfcbe6">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47149f963528ec7abe55066abfb7caf5">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55057c8cda53a4c539d02ab1a93ca58b">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac09e0c0cbbf6449bf106e4199600db35">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaee64b3e0f30ed09e3c9f01b6c8877c3f">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac8e54092c8be5dc0e114ec35f40e00dc">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_A
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaef2d2ec912aaa9e7215aeab79f7fb086">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_B
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa721765c8f0bbcdb68af06817dbec8e53">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_C
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad622ad5df40d2fdf806abb2adda73b3d">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_L1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa32e159826404c7d76c2a433c24de82a2">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_L2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa36a38421637cfa5ebfd8a0296650cdf4">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa19839eebec939407d901a33b75cf2594">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_R1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7c614b3966583b0ad027e45f594ede46">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_R2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa46d487e9fe31855b7b46739bad58fe3e">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_SELECT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa598289bc85f647c237729126ea392a43">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_START
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3c818d106f4ec793a43749c4c26a8a4">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_THUMBL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68c5d8dcd8fe708ada8f4a4e17feb638">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_THUMBR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9759d817172d268ced1748909a5f5fbe">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_X
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa21174962f95e32cd0345ce657d03ebc7">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_Y
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6654a8b2c700f7783433c86fcdae7919">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_Z
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06156b68e6de951b44fc662e1b16041f">keycodes.h</a>
-</li>
-<li>AKEYCODE_C
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeed584f454e508ce931bcb33d37adb04">keycodes.h</a>
-</li>
-<li>AKEYCODE_CALCULATOR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa293523c40bb9f1d793cd0b984f636573">keycodes.h</a>
-</li>
-<li>AKEYCODE_CALENDAR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa114be17d1853c77a7406c024d9e4f076">keycodes.h</a>
-</li>
-<li>AKEYCODE_CALL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8b5720ebdd3576c2b536ec9228273d8f">keycodes.h</a>
-</li>
-<li>AKEYCODE_CAMERA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8670880765756933d3d1a10186d39e26">keycodes.h</a>
-</li>
-<li>AKEYCODE_CAPS_LOCK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab9dcb68b35c85d380846c85f323868f1">keycodes.h</a>
-</li>
-<li>AKEYCODE_CAPTIONS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81ba8d5343362b841b8a62b8679ff994">keycodes.h</a>
-</li>
-<li>AKEYCODE_CHANNEL_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa18f1808c6a819e787c9a9941f78b910f">keycodes.h</a>
-</li>
-<li>AKEYCODE_CHANNEL_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa056914fd17ae539dca44f43745d8e05c">keycodes.h</a>
-</li>
-<li>AKEYCODE_CLEAR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95bd8c25adeaa570108c7403f08a2901">keycodes.h</a>
-</li>
-<li>AKEYCODE_COMMA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca0bfbdc67b2c6f76e8fcaaf782c227">keycodes.h</a>
-</li>
-<li>AKEYCODE_CONTACTS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0aa2cfca11b7cabf82341a9dbec83f10">keycodes.h</a>
-</li>
-<li>AKEYCODE_CTRL_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaca9d0df6cc18492209eb287e659aeb1">keycodes.h</a>
-</li>
-<li>AKEYCODE_CTRL_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa99b317cf2f1eb6b06d0226e05223e60c">keycodes.h</a>
-</li>
-<li>AKEYCODE_D
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7e4cb3ef66209a2779be2c8239b57b51">keycodes.h</a>
-</li>
-<li>AKEYCODE_DEL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd013221b457d98975dc47e49817e28a">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_CENTER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e9c93273fd39148f54167133aa5b9ae">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa84b721b13aae56c9f1d3c22b3d81627a">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa668dfb3ed79a37c2c07838c161c1b344">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac6f9d81b6239696a1836695bbfc6a975">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf2fd3133a88f3b6725834032bd74bd9e">keycodes.h</a>
-</li>
-<li>AKEYCODE_DVR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf2f03b925a02ba6de9fd98737546a60">keycodes.h</a>
-</li>
-<li>AKEYCODE_E
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae218af7ceb207227bb10f0525e68a8d0">keycodes.h</a>
-</li>
-<li>AKEYCODE_EISU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaadd69273b99eb0b848d98b2d6b3ad3234">keycodes.h</a>
-</li>
-<li>AKEYCODE_ENDCALL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaff971957ae3a4e272b21987854e18d9b">keycodes.h</a>
-</li>
-<li>AKEYCODE_ENTER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac784a7bbbfbdab05fab6c6a1f29c98ff">keycodes.h</a>
-</li>
-<li>AKEYCODE_ENVELOPE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaade96efe470f428bb5c4eaea6ffc3681c">keycodes.h</a>
-</li>
-<li>AKEYCODE_EQUALS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0a197df7ec719c95ddcd6836e76c8498">keycodes.h</a>
-</li>
-<li>AKEYCODE_ESCAPE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac52177e5508edacb8e9c6d3a25db4fb6">keycodes.h</a>
-</li>
-<li>AKEYCODE_EXPLORER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaded9ec81ae6dab451665317723b94083">keycodes.h</a>
-</li>
-<li>AKEYCODE_F
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa455f71ecfe59af0fbd901ac0d0a8d53a">keycodes.h</a>
-</li>
-<li>AKEYCODE_F1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3b84f2c503a9e839f3d36e10e3307fcf">keycodes.h</a>
-</li>
-<li>AKEYCODE_F10
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa60660b13acab39282d0558cdcc93474">keycodes.h</a>
-</li>
-<li>AKEYCODE_F11
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa64cc7b1d8e53d90ff57c39d0b5a4dd22">keycodes.h</a>
-</li>
-<li>AKEYCODE_F12
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa491000231e0ba221b6916b1d9d2c9fb7">keycodes.h</a>
-</li>
-<li>AKEYCODE_F2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1360f7ec66aa6421e240dae637262e84">keycodes.h</a>
-</li>
-<li>AKEYCODE_F3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a4ce6105e12a3a9071cae2f40515085">keycodes.h</a>
-</li>
-<li>AKEYCODE_F4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa882050e4d0f917470a5b91fbf6ae9ebf">keycodes.h</a>
-</li>
-<li>AKEYCODE_F5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab01807c72b46620bb50fcb6abe24d937">keycodes.h</a>
-</li>
-<li>AKEYCODE_F6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa04a12e81ed80bb42ef5c63cedf0dc60">keycodes.h</a>
-</li>
-<li>AKEYCODE_F7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9583b8e4b0d994b7e3a193b67cf6020c">keycodes.h</a>
-</li>
-<li>AKEYCODE_F8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55ca54d42d8df70de2ce9031db1344c8">keycodes.h</a>
-</li>
-<li>AKEYCODE_F9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0c8225c0ef98da730933ae914077dbc9">keycodes.h</a>
-</li>
-<li>AKEYCODE_FOCUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23be9506f92f6efe14d47306a39a2187">keycodes.h</a>
-</li>
-<li>AKEYCODE_FORWARD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafbf0a16c7746e5dee2fd3adbd50da88a">keycodes.h</a>
-</li>
-<li>AKEYCODE_FORWARD_DEL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9516bc190d37fea27e07ddab0c607b51">keycodes.h</a>
-</li>
-<li>AKEYCODE_FUNCTION
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1764b777aa56605f4029d3c71fe70722">keycodes.h</a>
-</li>
-<li>AKEYCODE_G
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa165067e10464019411f768bba9e533d9">keycodes.h</a>
-</li>
-<li>AKEYCODE_GRAVE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa929561086ae7b519fa962597bc85f171">keycodes.h</a>
-</li>
-<li>AKEYCODE_GUIDE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf33a5fa1f163245360aeed89d64b0233">keycodes.h</a>
-</li>
-<li>AKEYCODE_H
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad89a91a1500cb162f22962781ebfd9dc">keycodes.h</a>
-</li>
-<li>AKEYCODE_HEADSETHOOK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0d3d29515a4815fe8d6d8d3291507a33">keycodes.h</a>
-</li>
-<li>AKEYCODE_HELP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab062b403701292c9e2db96a1f88cc6d9">keycodes.h</a>
-</li>
-<li>AKEYCODE_HENKAN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab0686dd37c57d833d1158b7f1d85ee02">keycodes.h</a>
-</li>
-<li>AKEYCODE_HOME
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa526c2411b7476b7ae579f57a0378b2dd">keycodes.h</a>
-</li>
-<li>AKEYCODE_I
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4d44b5e4a19580540d8d77bf5755d74b">keycodes.h</a>
-</li>
-<li>AKEYCODE_INFO
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e76263257a5dc654a413c9dc2fd649">keycodes.h</a>
-</li>
-<li>AKEYCODE_INSERT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62f663d11e91af750a51ddd060b08644">keycodes.h</a>
-</li>
-<li>AKEYCODE_J
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa70c259612ccec117d70afaef947a6a7a">keycodes.h</a>
-</li>
-<li>AKEYCODE_K
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ce56cf50d3632c275c524bd78d0d932">keycodes.h</a>
-</li>
-<li>AKEYCODE_KANA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62d090ae5c95a04dacdff79817dad531">keycodes.h</a>
-</li>
-<li>AKEYCODE_KATAKANA_HIRAGANA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3be7db22b3c8aa046a46631e44863c28">keycodes.h</a>
-</li>
-<li>AKEYCODE_L
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab61c534fd0f4e56c4ba13861a2f5982b">keycodes.h</a>
-</li>
-<li>AKEYCODE_LANGUAGE_SWITCH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7b8e87b47c17c5f1e97fcb56faaa26ff">keycodes.h</a>
-</li>
-<li>AKEYCODE_LAST_CHANNEL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa187963dd6f74b96f132f23e01dea35e9">keycodes.h</a>
-</li>
-<li>AKEYCODE_LEFT_BRACKET
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabdeda0d373aa37ef2ded5ffdfc008708">keycodes.h</a>
-</li>
-<li>AKEYCODE_M
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa43b19e5e5234ce90c8e7ef67dd0cabd1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MANNER_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa380279768c5c50d92bef2a88394f967f">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_AUDIO_TRACK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3cdb53cdf8c576e272502da06daa52e1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_CLOSE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6788c6e1443140b0ec4d004d8293e998">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_EJECT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa317bffd44306b021c401d3a26b82a7f6">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_FAST_FORWARD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa69e648024402af688d490a2041f15bca">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_NEXT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5a6c3fc963e8163852b9a23e3a198b3">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PAUSE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f4e0178c2028b3042b0a5948e38e4e4">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PLAY
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa615cf6202b0ae0ed550f42f6c64b36a1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PLAY_PAUSE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa42f8fe71e8d45b5a83d83d80c3da40e1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PREVIOUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81432c31b00d47f768c29163eb276acb">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_RECORD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e1eae0b245176aaa024a53411441f9">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_REWIND
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaecd53183b84c23a2ca65670a23674319">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_STOP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac4faa33993d80db1326073ea15a38e7d">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_TOP_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3ddf83cb2f701911b03c3a738e2e73a">keycodes.h</a>
-</li>
-<li>AKEYCODE_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa707b85e89923b0f760be795972a87d76">keycodes.h</a>
-</li>
-<li>AKEYCODE_META_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaadfb2d920bbe422c096120d39811c58">keycodes.h</a>
-</li>
-<li>AKEYCODE_META_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68038455e2b0846db51f9957e0df9cb8">keycodes.h</a>
-</li>
-<li>AKEYCODE_MINUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaca10bd34ad0abecfecace908b8cb92ca">keycodes.h</a>
-</li>
-<li>AKEYCODE_MOVE_END
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5605f49f5271430f5f150efb3cd0398a">keycodes.h</a>
-</li>
-<li>AKEYCODE_MOVE_HOME
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7544f3de2fb5f78bec62af94a32fdc58">keycodes.h</a>
-</li>
-<li>AKEYCODE_MUHENKAN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7321e5c6b3cbab142bd16957653b2ac7">keycodes.h</a>
-</li>
-<li>AKEYCODE_MUSIC
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14508751d70a0404b194d4b6df83ec72">keycodes.h</a>
-</li>
-<li>AKEYCODE_MUTE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f6675d38f50e3556a8531839fd83f02">keycodes.h</a>
-</li>
-<li>AKEYCODE_N
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c0b26804c89560a9e87c45f7f9fed36">keycodes.h</a>
-</li>
-<li>AKEYCODE_NOTIFICATION
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6115506352a5828532fc6a0b91683331">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUM
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe6e880f65bebbdd5246a4164c4ab37a">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUM_LOCK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad5e349eadd3255c6ad4982dc40ed23ef">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_0
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa343df35e6a0ad0599e19b8ef7174909b">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c0ec8e42917fa9ac53977db3e6aeb17">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4dfd17c2209908e1ec890e10a3211f89">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1efe1886a4b472b999215c0e81f7386">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1fdd16681c1441b934f679b94fd0e4f8">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5916003e7c737a8cc06e52d2ee76c3b">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa13b83389e0f5de129227af4b8d3f035d">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaed9468951ef2887c07c8095c2e7d4c93">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5f0a300566235720eb93fee9f2196642">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad0c490e3965df546e2d5a83edf423d95">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_ADD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9d2fefa9a3f6037f48b247e66dd28c35">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_COMMA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa900e3bb0bc4ff70ba786f18ff4db0bd1">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_DIVIDE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac108b744e8f93af69158d146425236c">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_DOT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6aab6b5914e120b43b3a1a8269e9cee1">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_ENTER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa79432be5f7a44e99ddc3721fd9fd212e">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_EQUALS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c1007a59641499ee5e1508e747c5ed">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_LEFT_PAREN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacc903e9eb495cf6cef7c6bc825f82f54">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_MULTIPLY
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47ce00b838e7ee0a34066dc2595ac735">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_RIGHT_PAREN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7662e0f2a099239dc69f6a27c7daabf9">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_SUBTRACT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bee314dbbea0a349eb301d10256bbe">keycodes.h</a>
-</li>
-<li>AKEYCODE_O
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa249667bc4a59d99be1914535877329fb">keycodes.h</a>
-</li>
-<li>AKEYCODE_P
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac68ef56b78bd0c8626cc68bb6cb9156f">keycodes.h</a>
-</li>
-<li>AKEYCODE_PAGE_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0b7fe1c18f53e6328657858a88826393">keycodes.h</a>
-</li>
-<li>AKEYCODE_PAGE_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4fd0d4ea5b6898f4a40011b97a739a04">keycodes.h</a>
-</li>
-<li>AKEYCODE_PAIRING
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0ecddd3dce52cf60c96c5d430b1f553">keycodes.h</a>
-</li>
-<li>AKEYCODE_PERIOD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9dd68c8ecebd4e274e8c357dcdfe8a04">keycodes.h</a>
-</li>
-<li>AKEYCODE_PICTSYMBOLS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacdc7c004da1594fa156de87befef5f41">keycodes.h</a>
-</li>
-<li>AKEYCODE_PLUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7f72d867b311e0845aef732dcc66495">keycodes.h</a>
-</li>
-<li>AKEYCODE_POUND
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf448758c44899e41b67f76dfe3be51e9">keycodes.h</a>
-</li>
-<li>AKEYCODE_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_BLUE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e82219fdb937fee5a22426c607dd4e0">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_GREEN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad50c1e2136e47843a8dabca929f8ead1">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_RED
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2d9e3e82e69955f649b586f4518e074c">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_YELLOW
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafa813640412bd41a181f0ec3a33dddc4">keycodes.h</a>
-</li>
-<li>AKEYCODE_Q
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa932cf6ea8d87e6d6d97af658dd0fa206">keycodes.h</a>
-</li>
-<li>AKEYCODE_R
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaba25ac2c15a8edbbbff16a9fe6e74532">keycodes.h</a>
-</li>
-<li>AKEYCODE_RIGHT_BRACKET
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa084dfa52626040a08d374f8aec066e6a">keycodes.h</a>
-</li>
-<li>AKEYCODE_RO
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae8b0af04dac5ea56fd55e577fd9e6be4">keycodes.h</a>
-</li>
-<li>AKEYCODE_S
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae1ed25c28a8fce578cddb17ca6888ff6">keycodes.h</a>
-</li>
-<li>AKEYCODE_SCROLL_LOCK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa78ff5c8316235635f76e3c3179e9a7fc">keycodes.h</a>
-</li>
-<li>AKEYCODE_SEARCH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac644fd307fd0ef0d3ed3d2e074c1a4b7">keycodes.h</a>
-</li>
-<li>AKEYCODE_SEMICOLON
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac0a2920161f4f2d97b0b060614b23391">keycodes.h</a>
-</li>
-<li>AKEYCODE_SETTINGS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bbd457230c3028df6b91d5bdda9159">keycodes.h</a>
-</li>
-<li>AKEYCODE_SHIFT_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafb9875645596928cec46368e74499dc4">keycodes.h</a>
-</li>
-<li>AKEYCODE_SHIFT_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf9eab1348ae1e8f18ad5bf3c77df4212">keycodes.h</a>
-</li>
-<li>AKEYCODE_SLASH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa54c047be3811d637a33d9b3e39d16e1a">keycodes.h</a>
-</li>
-<li>AKEYCODE_SLEEP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafc077e5a6b447ea060c144f6e65bd207">keycodes.h</a>
-</li>
-<li>AKEYCODE_SOFT_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2dc78d3a93876b77402d2a7f02e4b899">keycodes.h</a>
-</li>
-<li>AKEYCODE_SOFT_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8cadfbfcaaa83fef168de13639adfcae">keycodes.h</a>
-</li>
-<li>AKEYCODE_SPACE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa10389300ac5d70f8d9733564b3cab4e7">keycodes.h</a>
-</li>
-<li>AKEYCODE_STAR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1461fbf54e3dcba96e5d6d0638c18305">keycodes.h</a>
-</li>
-<li>AKEYCODE_STB_INPUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa988b0372359b2bca7390878fdba9e1b5">keycodes.h</a>
-</li>
-<li>AKEYCODE_STB_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab28aea3a51b11c9f227ce8cd5ff55a3d">keycodes.h</a>
-</li>
-<li>AKEYCODE_SWITCH_CHARSET
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad6a1f88b2cc3b6ff8f1724eb01473ec3">keycodes.h</a>
-</li>
-<li>AKEYCODE_SYM
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c1c6752d5db5e02da51d8937e5e3c6f">keycodes.h</a>
-</li>
-<li>AKEYCODE_SYSRQ
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14e22c69bcd47ffb4445ee18a4332d84">keycodes.h</a>
-</li>
-<li>AKEYCODE_T
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2feac8b458ef8eb9c0a0dd73766927c2">keycodes.h</a>
-</li>
-<li>AKEYCODE_TAB
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1b1bfda850b2acd0b60e8456e2bfa958">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0776ffae512b4848e53fce762a3a5017">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_ANTENNA_CABLE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe33a80d6d3bf889af25cbd77fdb89f9">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_AUDIO_DESCRIPTION
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa419f0adac43cad104cd6cf83dc5f13f6">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5fca6a9ec1ce246bf3c53d859ac9f5eb">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaccc5900ca5dd399d5ce11dd8ca324678">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_CONTENTS_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4c18feeafff3c41081073c025ee017b8">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_DATA_SERVICE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa954c2251b2cb53f47637802cb66baf06">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1750b29e396bd1fd237ed4aadacc8f5">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPONENT_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa156e2dba81e7c73624ccf8c2ef8833ae">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPONENT_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8db9b6ee1457267abea03430781bb0ec">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPOSITE_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c3097f14c6582958ba1d14d70115ccd">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPOSITE_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaada13cbb9d619bc610678ad66325647b9">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a50de965f50ab3aa42772aac0808445">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7ec65c008471d771bf879ec012f5c7f">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a0f267a2696d15bf16127121b1f1c7f">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4437c1d8d2d33058cfa71ec7b2771ec5">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_VGA_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa149b2c8a4817075c0a41e0adf11c8e85">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_MEDIA_CONTEXT_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaadde70071f6a432f367079efa6e1a6fe">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_NETWORK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec5e46a5afc57953d1772e086307aa42">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_NUMBER_ENTRY
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa630a08e07a3b4c6bcac9a1a72d176055">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafda3b0ea1b158831fc443bf4911a3930">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_RADIO_SERVICE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93dd3fd752701af5a5491e01cc15db72">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3707d4396417535a611e4548afe33936">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE_BS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8c52e7d06525c0ee5d943d63a0fa8ea5">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE_CS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4eea1809a9ff679ed7773332d728c6b0">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE_SERVICE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17c0e68066b86610ff168c6367af36eb">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TELETEXT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3d7b89756df37f01d6d0f13beff1db">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TERRESTRIAL_ANALOG
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14f2b6fe8550832ef9e3f9aa53164073">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TERRESTRIAL_DIGITAL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacad8c149251a78760a5fe4931b9cdf16">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TIMER_PROGRAMMING
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0293c2a63e4d955080334bef6640840">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_ZOOM_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8e79045045293070c8eb9e408f1335b4">keycodes.h</a>
-</li>
-<li>AKEYCODE_U
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac1a220314f986aae45d7fe3b35501595">keycodes.h</a>
-</li>
-<li>AKEYCODE_UNKNOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa593f8ae18990d627785719284a12a6f">keycodes.h</a>
-</li>
-<li>AKEYCODE_V
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4043bc48fa55cce7825176052d6e199a">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOICE_ASSIST
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95898663b7f74c93d0b860a43528c744">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOLUME_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a882dae17080d3b5f3329e79db60c66">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOLUME_MUTE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa174a5c7c39753235109696e82870c575">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOLUME_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5b81e325d9efd633eef7535a5b538882">keycodes.h</a>
-</li>
-<li>AKEYCODE_W
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0c80e98547c3daa01f3d9e7f4f00425">keycodes.h</a>
-</li>
-<li>AKEYCODE_WAKEUP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa903c5152d26b3011ae521afa06759429">keycodes.h</a>
-</li>
-<li>AKEYCODE_WINDOW
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe7531c40ff4a31614ff6fd61802ebe8">keycodes.h</a>
-</li>
-<li>AKEYCODE_X
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec585cebac89004faffbdc28dc6d81c5">keycodes.h</a>
-</li>
-<li>AKEYCODE_Y
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06fc277ef25acdd89d64c18eed0daa9b">keycodes.h</a>
-</li>
-<li>AKEYCODE_YEN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ee19d21912056b902e283efa2d9d14b">keycodes.h</a>
-</li>
-<li>AKEYCODE_Z
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7439a09f219a0addc13c758ef7508cce">keycodes.h</a>
-</li>
-<li>AKEYCODE_ZENKAKU_HANKAKU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf782be8df9a8ca5dc86c9bfeabac6f22">keycodes.h</a>
-</li>
-<li>AKEYCODE_ZOOM_IN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacfce9bb78ef8106dce4868f81cca4fb4">keycodes.h</a>
-</li>
-<li>AKEYCODE_ZOOM_OUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf035f5234c3df4589f35a50e99e0535">keycodes.h</a>
-</li>
-<li>AKeyEvent_getAction()
-: <a class="el" href="group___input.html#ga36ec0b59f98f86a7ca263ba91279896d">input.h</a>
-</li>
-<li>AKeyEvent_getDownTime()
-: <a class="el" href="group___input.html#gaf475b6f0860bdfca4ceea7bc46eab1a9">input.h</a>
-</li>
-<li>AKeyEvent_getEventTime()
-: <a class="el" href="group___input.html#gae3eac7d68195d1767c947ca267842696">input.h</a>
-</li>
-<li>AKeyEvent_getFlags()
-: <a class="el" href="group___input.html#ga2a18e98efe0c4ccb6f39bb13c555010e">input.h</a>
-</li>
-<li>AKeyEvent_getKeyCode()
-: <a class="el" href="group___input.html#ga6b01ecd60018a5445f4917a861ca9466">input.h</a>
-</li>
-<li>AKeyEvent_getMetaState()
-: <a class="el" href="group___input.html#gabdda62b40b22727af2fb41740bf4787b">input.h</a>
-</li>
-<li>AKeyEvent_getRepeatCount()
-: <a class="el" href="group___input.html#ga5358fe3ebbd4b5b2f88a4ad2eba6f885">input.h</a>
-</li>
-<li>AKeyEvent_getScanCode()
-: <a class="el" href="group___input.html#ga4a0a846b7a195aeb290dfcd2250137d9">input.h</a>
-</li>
-<li>ALooper
-: <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">looper.h</a>
-</li>
-<li>ALooper_acquire()
-: <a class="el" href="group___looper.html#gae1ad7ac48ab01a34bfd25840c92ff07b">looper.h</a>
-</li>
-<li>ALooper_addFd()
-: <a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">looper.h</a>
-</li>
-<li>ALooper_callbackFunc
-: <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_ERROR
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a14016d8f39373b8ce061276a957960f6">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_HANGUP
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a5e7fb5acdecef18b2c293f6309e5d4ab">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_INPUT
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9ae3d18f8dd1faf6f34468df10667949bc">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_INVALID
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9aefe82c6ce8e02d13aceaebdec15c2aff">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_OUTPUT
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a71273fd07e009057e6e3475d10f8286d">looper.h</a>
-</li>
-<li>ALooper_forThread()
-: <a class="el" href="group___looper.html#ga741ccd90a0eb9209c6bddf2326d89e4a">looper.h</a>
-</li>
-<li>ALOOPER_POLL_CALLBACK
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a64fe936780bfd9927affaf8e8cc81cc2">looper.h</a>
-</li>
-<li>ALOOPER_POLL_ERROR
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409af8ebd4022f6f5d5fea864f6999b7e6b4">looper.h</a>
-</li>
-<li>ALOOPER_POLL_TIMEOUT
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a3fe4eec66dff78a9fa8afca02e8b8443">looper.h</a>
-</li>
-<li>ALOOPER_POLL_WAKE
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a55528f1b28df17cc4b6317cc0d0fde47">looper.h</a>
-</li>
-<li>ALooper_pollAll()
-: <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">looper.h</a>
-</li>
-<li>ALooper_pollOnce()
-: <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">looper.h</a>
-</li>
-<li>ALooper_prepare()
-: <a class="el" href="group___looper.html#ga1a070b904dd957cc65af9eb5ef6dfa25">looper.h</a>
-</li>
-<li>ALOOPER_PREPARE_ALLOW_NON_CALLBACKS
-: <a class="el" href="group___looper.html#ggaf9bdc3014f3d54c426b6d2df10de4960a1fff26ab5859b0308b58a3f8d58ef1eb">looper.h</a>
-</li>
-<li>ALooper_release()
-: <a class="el" href="group___looper.html#gab723c3c2ac2c66bc695913a194073727">looper.h</a>
-</li>
-<li>ALooper_removeFd()
-: <a class="el" href="group___looper.html#gaf7d68ed05698b251489b4f6c8e54daad">looper.h</a>
-</li>
-<li>ALooper_wake()
-: <a class="el" href="group___looper.html#gab2585652f8ae2e2444979194ebe32aaf">looper.h</a>
-</li>
-<li>AMETA_ALT_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca256c74b768ecee57e3218e81ae6945df">input.h</a>
-</li>
-<li>AMETA_ALT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caba44b1077427e4da1d202e0c8f772881">input.h</a>
-</li>
-<li>AMETA_ALT_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca985db074c0f44749ca86b5cc0454056a">input.h</a>
-</li>
-<li>AMETA_CAPS_LOCK_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafc467c98d509b0de28b298801a0c3e37">input.h</a>
-</li>
-<li>AMETA_CTRL_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca752c837afd5ff0fcf75ddee7b6808be6">input.h</a>
-</li>
-<li>AMETA_CTRL_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cabe927318a2a11a46be3e9d78dbd81ef5">input.h</a>
-</li>
-<li>AMETA_CTRL_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca0ab007e367ae136b873b3e6636747419">input.h</a>
-</li>
-<li>AMETA_FUNCTION_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca545b31b72b0454c22c170ff534ddfdf1">input.h</a>
-</li>
-<li>AMETA_META_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca6f923de8f2cd72e3ad86149c0747906f">input.h</a>
-</li>
-<li>AMETA_META_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca9c04e7c2ad1f0f41af60402188a29c4a">input.h</a>
-</li>
-<li>AMETA_META_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafdf56d1259ae16c97161c443d7949bdf">input.h</a>
-</li>
-<li>AMETA_NONE
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cae0a3cb26517b3f876beb37594494526d">input.h</a>
-</li>
-<li>AMETA_NUM_LOCK_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca15d234534a6870add5594f02b7333dc6">input.h</a>
-</li>
-<li>AMETA_SCROLL_LOCK_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafe8dacdc6566f655a3eab73ea4a9af5a">input.h</a>
-</li>
-<li>AMETA_SHIFT_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa01fa027cdd8951530437bcbe04c3ed7">input.h</a>
-</li>
-<li>AMETA_SHIFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa3d5f49c3a55b653a94c798a2c93b197">input.h</a>
-</li>
-<li>AMETA_SHIFT_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cac52930581c339216218a6f50c5b57aa1">input.h</a>
-</li>
-<li>AMETA_SYM_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca8af1e90950a728baca807a83e50b22ea">input.h</a>
-</li>
-<li>AMetaDataEvent
-: <a class="el" href="group___sensor.html#ga0378daec23b2d8a70438ef7c3912475f">sensor.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_CANCEL
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a3952b960f5eb8c4f55b42741e286b74e">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_DOWN
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a225e61c48ba334abc1b5811db02edcf1">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_HOVER_ENTER
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a247b2c60ad92f3130ad43c907986ffb3">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_HOVER_EXIT
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600ac00b1eacfbea779863abf3fcf02134aa">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_HOVER_MOVE
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a84bc9fb3c01ff7ca9ee452a510e7de60">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_MASK
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600abf84a22c84d4b7228102b80f3af92a4f">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_MOVE
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a41c56c4e772953fce60c93bc671639a3">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_OUTSIDE
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_DOWN
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a1618c641fd3f49fa7483f298d05b3cd2">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_INDEX_MASK
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a51384339fbb57c0087f7f50c45d9cff3">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT
-: <a class="el" href="group___input.html#gaeb170c0fbeeed1d999160566f09f169e">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_UP
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600af2ef56aa7220eeb2073b9b028737bc1e">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_SCROLL
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a45ba62b1e6fab4e84d5782d7c35ced04">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_UP
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a43798b2b7a6de4616d150b2438b8419e">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_BRAKE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae3a99764f3681dd9e094852bb2489ece">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_DISTANCE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae800909411a1e83173b0eef7aa458d0e">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GAS
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0223f235a6044815918af2abafcbf16">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_1
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadcc18afd3a7069412617df34db5a27bc">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_10
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da29ba08f4ddc658e0127ee5bc08d185f2">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_11
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafc64a4b307f62bb12b645918aa7edb57">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_12
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae5d32b3e9cec4936ae1e074f320c3063">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_13
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f19f5bc52e5eaec5ebd4f07aad12180">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_14
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadb866d826ecf25161d7c7f86166e149b">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_15
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da7e86befc8502b8df687284f3c40b2eca">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_16
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daaaa011ba929b18c6da71153638f92336">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_2
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac4addf06abfa6c76f0578ddde049aad5">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_3
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac7df57ef5082e10be83f66d7477bce9c">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_4
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da321873d126b7d545665096694cb7d9d9">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_5
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da9b47cef7060197e1b0302a8a718c3085">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_6
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daad7e47a1b5fb66864b6d988374f50a84">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_7
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da222c06f51a60e59504b635dbf89a025b">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_8
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab59a8a373a913e40b146ed762976d6fe">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_9
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da721fa0fbca8b22f1ecc8d3870f4e7443">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_HAT_X
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da04245c76cb9b32dcba920661f11ac9da">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_HAT_Y
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da98c323321d908db459e7cf86a7e8a482">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_HSCROLL
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da92955e6b0f3f82af66a505c854e9edff">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_LTRIGGER
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae4c65c3b1bd2946ff9e18c6041cdb591">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_ORIENTATION
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da114f2b3fc233ccf7a4470787c31457d2">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_PRESSURE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da3b4fd0f17cfdeb6a055babecd2b0ded8">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RTRIGGER
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da116e80c6be166290ca481fefa5de38c1">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RUDDER
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da318a0782f895949407fc192fc4280257">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RX
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da689b612864177d6b57d4181442e3e38e">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RY
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa20188da209300e1f80f6f5bd4058e13">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RZ
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da381948b3321afd390ad164345eb9206b">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_SIZE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da4baba3ccaec881089a864ba6deaf8bd6">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_THROTTLE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da6d1f5d64e607104964eb43d8fae07a4f">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TILT
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafca0a235f69c4b38bfc95e7a7b8d9ab1">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOOL_MAJOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa273d64c392f86ae789fd5e24661ba0a">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOOL_MINOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadebd200b37ffaf36b94e7e478c559142">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOUCH_MAJOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da792b9e01044a2e43e7f80e5559db20c2">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOUCH_MINOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa8b24b0f01f24898a36e5751c8eca63c">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_VSCROLL
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dad11be04b4b81715cad905ee9fa348e99">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_WHEEL
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0ae83ebd74e672bb35378b92a440b1d">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_X
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f4b5b009634039a1f361048a5fc6064">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_Y
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da64f7de8558265bd8179d206eb33eff6c">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_Z
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5a689e572da9bc5feafcb6c011368305">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_BACK
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a1841d075a2992ff7fbefa3fd50189b86">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_FORWARD
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a4105edf43f7748c52c859cc5aa7dc438">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_PRIMARY
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ab388f65477b9dd4c51e6367111168d65">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_SECONDARY
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a08118700ecb4e147528a0e725afc9451">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_TERTIARY
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ae6e2af1e7065e035e8a10a595827180f">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_BOTTOM
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388ad8b662839787e1c7dd2616f32c02aaeb">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_LEFT
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388afb70c13f16daade25ba8132a5ea3cf52">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_NONE
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a37dd7496968e6defbecc3c8d6ab2734d">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_RIGHT
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a7d45674e03f1876a43d4810508905078">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_TOP
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a915e1ade9b600d11a3c70a17a88de757">input.h</a>
-</li>
-<li>AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED
-: <a class="el" href="group___input.html#ggab04a0655cd1e3bcac5e8f48c18df1a57a200623e1e4eee7797cad30917d289d7a">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_ERASER
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf9932f65b5b6b5800fb5873a60dbf0cb">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_FINGER
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eafd789262defb8a268fa80d26b0c30bcc">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_MOUSE
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7be0c750d7d6719e7c948914400ae0de">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_STYLUS
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf05dc95a74e560c89cec1f3100185fc7">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_UNKNOWN
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7e1ea0c955ebbac1349866e8995e0208">input.h</a>
-</li>
-<li>AMotionEvent_getAction()
-: <a class="el" href="group___input.html#ga73ea2093cc2343675ac43dd08bef4247">input.h</a>
-</li>
-<li>AMotionEvent_getAxisValue()
-: <a class="el" href="group___input.html#ga9d364cdcebf85237f599b25861f38c21">input.h</a>
-</li>
-<li>AMotionEvent_getButtonState()
-: <a class="el" href="group___input.html#ga1aa7ebb749416491b6f0c55ae87ddf49">input.h</a>
-</li>
-<li>AMotionEvent_getDownTime()
-: <a class="el" href="group___input.html#gad44be7697e68891688cd7bcfaffec209">input.h</a>
-</li>
-<li>AMotionEvent_getEdgeFlags()
-: <a class="el" href="group___input.html#gad7e1f0caa4c27194d4a8756a18432299">input.h</a>
-</li>
-<li>AMotionEvent_getEventTime()
-: <a class="el" href="group___input.html#ga7e13fbf3cff0700b0b620284ebdd3a33">input.h</a>
-</li>
-<li>AMotionEvent_getFlags()
-: <a class="el" href="group___input.html#ga2891d19197c070207098fa48adeb35af">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalAxisValue()
-: <a class="el" href="group___input.html#ga7ca740e1324f3cdb934252dce0c982d0">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalEventTime()
-: <a class="el" href="group___input.html#ga523f1a760754206965b42b08d62f9346">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalOrientation()
-: <a class="el" href="group___input.html#gaab9cb8fa670175ecc73c75eed4e5cd3f">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalPressure()
-: <a class="el" href="group___input.html#gaa8e9352ee5b043b3e1b6e2062d491010">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalRawX()
-: <a class="el" href="group___input.html#ga5d36c2e7420001c86ae2aa1168fe6f83">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalRawY()
-: <a class="el" href="group___input.html#ga6deb0e7690a93aa53e5872c2691b69fe">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalSize()
-: <a class="el" href="group___input.html#ga0a04bb7ec12928db7e62645e7fad3a9e">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalToolMajor()
-: <a class="el" href="group___input.html#ga160a5830e791e8c42ae97f51b92233d2">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalToolMinor()
-: <a class="el" href="group___input.html#gafe01aa7576a6d1bce750fb8482355849">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalTouchMajor()
-: <a class="el" href="group___input.html#gaf437f223668b97f19ebdbad4b9cf4483">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalTouchMinor()
-: <a class="el" href="group___input.html#ga126715d966e989652aa1ae5d38e0e898">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalX()
-: <a class="el" href="group___input.html#ga49a8ca89ff377b5ed2355e8d7220ae07">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalY()
-: <a class="el" href="group___input.html#ga30fc4e5d3ce144955859f8c97b51b73d">input.h</a>
-</li>
-<li>AMotionEvent_getHistorySize()
-: <a class="el" href="group___input.html#ga0aef34c236db6d7a56a50bf590be7bcc">input.h</a>
-</li>
-<li>AMotionEvent_getMetaState()
-: <a class="el" href="group___input.html#ga5644f0d952e3dea57ba9f7ce51dff2bb">input.h</a>
-</li>
-<li>AMotionEvent_getOrientation()
-: <a class="el" href="group___input.html#gad28422998da15b789edcba6b8bc5d615">input.h</a>
-</li>
-<li>AMotionEvent_getPointerCount()
-: <a class="el" href="group___input.html#ga612e68d104adbc6d14d87510e8066bd8">input.h</a>
-</li>
-<li>AMotionEvent_getPointerId()
-: <a class="el" href="group___input.html#ga599e21a79c706807243a8ee31b116138">input.h</a>
-</li>
-<li>AMotionEvent_getPressure()
-: <a class="el" href="group___input.html#ga97fcaa6cd08c9d54b35711e482e06c8d">input.h</a>
-</li>
-<li>AMotionEvent_getRawX()
-: <a class="el" href="group___input.html#gafe45e29ef138cc30592237ce479837f0">input.h</a>
-</li>
-<li>AMotionEvent_getRawY()
-: <a class="el" href="group___input.html#ga5a09c3d742a93270861aa05f24257c23">input.h</a>
-</li>
-<li>AMotionEvent_getSize()
-: <a class="el" href="group___input.html#ga9b1f3c3df46b5269f9e74d2dd70c88a8">input.h</a>
-</li>
-<li>AMotionEvent_getToolMajor()
-: <a class="el" href="group___input.html#gac04099690f278a6a27191c2027b12a77">input.h</a>
-</li>
-<li>AMotionEvent_getToolMinor()
-: <a class="el" href="group___input.html#ga2222d459759ba4a8269647012d2718fb">input.h</a>
-</li>
-<li>AMotionEvent_getToolType()
-: <a class="el" href="group___input.html#ga2babe4e2e79952e004538f8f1878649c">input.h</a>
-</li>
-<li>AMotionEvent_getTouchMajor()
-: <a class="el" href="group___input.html#ga9ac18fe19534e07d80441582f489d471">input.h</a>
-</li>
-<li>AMotionEvent_getTouchMinor()
-: <a class="el" href="group___input.html#ga65f71e257b5fcb29dcbaaf59b3fcb3a7">input.h</a>
-</li>
-<li>AMotionEvent_getX()
-: <a class="el" href="group___input.html#ga22e255a5fa52761cd92ce78af91e9757">input.h</a>
-</li>
-<li>AMotionEvent_getXOffset()
-: <a class="el" href="group___input.html#ga7a94ce622eb78a17737fd8bddbf86e21">input.h</a>
-</li>
-<li>AMotionEvent_getXPrecision()
-: <a class="el" href="group___input.html#ga81a9be07673a01f43fd0241c7b4c254f">input.h</a>
-</li>
-<li>AMotionEvent_getY()
-: <a class="el" href="group___input.html#ga113f58a37e41f2a6c3007d68418edfa6">input.h</a>
-</li>
-<li>AMotionEvent_getYOffset()
-: <a class="el" href="group___input.html#ga7f6bd2c12d912f502c245b6ced6d3704">input.h</a>
-</li>
-<li>AMotionEvent_getYPrecision()
-: <a class="el" href="group___input.html#gae311e6e28bce4be905526f9ea71278ed">input.h</a>
-</li>
-<li>ANativeActivity
-: <a class="el" href="group___native_activity.html#ga8abd07923f37feb1ce724d139cc2609d">native_activity.h</a>
-</li>
-<li>ANativeActivity_createFunc
-: <a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">native_activity.h</a>
-</li>
-<li>ANativeActivity_finish()
-: <a class="el" href="group___native_activity.html#ga4d872ae54a239704c06a0517e23cc0ad">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY
-: <a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a642e76508cc737bbc1df149756c2a807">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS
-: <a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a0f4cbb55fa4c29b963b7b37d13352e6f">native_activity.h</a>
-</li>
-<li>ANativeActivity_hideSoftInput()
-: <a class="el" href="group___native_activity.html#gaf673d6efea7ce517ef46ff2551b25944">native_activity.h</a>
-</li>
-<li>ANativeActivity_onCreate
-: <a class="el" href="group___native_activity.html#ga02791d0d490839055169f39fdc905c5e">native_activity.h</a>
-</li>
-<li>ANativeActivity_setWindowFlags()
-: <a class="el" href="group___native_activity.html#gaa1d091ca4a99b0ce570bab1c8c06f297">native_activity.h</a>
-</li>
-<li>ANativeActivity_setWindowFormat()
-: <a class="el" href="group___native_activity.html#gaec8b12decdf2b9841344e75c4c038c5a">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED
-: <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a324062ac78fab16b40e8de1b1ae173b5">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT
-: <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a9b7250ac0e5a626a81b176462a9df7c9">native_activity.h</a>
-</li>
-<li>ANativeActivity_showSoftInput()
-: <a class="el" href="group___native_activity.html#ga14eaeb6190f266369023b04d8ab9dba7">native_activity.h</a>
-</li>
-<li>ANativeActivityCallbacks
-: <a class="el" href="group___native_activity.html#ga28dca784e5ee939427135c72c0151c38">native_activity.h</a>
-</li>
-<li>ANativeWindow
-: <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">native_window.h</a>
-</li>
-<li>ANativeWindow_acquire()
-: <a class="el" href="group___native_activity.html#ga533876b57909243b238927344a6592db">native_window.h</a>
-</li>
-<li>ANativeWindow_Buffer
-: <a class="el" href="group___native_activity.html#gad0983ca473ce36293baf5e51a14c3357">native_window.h</a>
-</li>
-<li>ANativeWindow_fromSurface()
-: <a class="el" href="group___native_activity.html#ga774d0a87ec496b3940fcddccbc31fd9d">native_window_jni.h</a>
-</li>
-<li>ANativeWindow_getFormat()
-: <a class="el" href="group___native_activity.html#ga9e3a492a8300146b30d864f0ab22bb2e">native_window.h</a>
-</li>
-<li>ANativeWindow_getHeight()
-: <a class="el" href="group___native_activity.html#ga463ba99f6dee3edc1167a54e1ff7de15">native_window.h</a>
-</li>
-<li>ANativeWindow_getWidth()
-: <a class="el" href="group___native_activity.html#ga186f0040c5cb405a63d93889bb9a4ff1">native_window.h</a>
-</li>
-<li>ANativeWindow_lock()
-: <a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">native_window.h</a>
-</li>
-<li>ANativeWindow_release()
-: <a class="el" href="group___native_activity.html#gae944e98865b902bd924663785d7b0258">native_window.h</a>
-</li>
-<li>ANativeWindow_setBuffersGeometry()
-: <a class="el" href="group___native_activity.html#ga7b0652533998d61e1a3b542485889113">native_window.h</a>
-</li>
-<li>ANativeWindow_unlockAndPost()
-: <a class="el" href="group___native_activity.html#ga4dc9b687ead9034fbc11bf2d90f203f9">native_window.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_A_8
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ad29996be25f8f88c96e016a1da5c4bca">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_NONE
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ac6f0378ea5cfefd9abee2596af5a9021">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_RGB_565
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13a11b32e10d6db28fae70ec3590cb9ee91">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_RGBA_4444
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13adc2ede06eafe20439271cb8137dc7528">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_RGBA_8888
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ab92ae96ceea06aa534583beadba84057">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_ALLOCATION_FAILED
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a512f5b95b6b57e78d65502c06391f990">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_BAD_PARAMETER
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7acf7205d1a348d867c63ac2885ce01374">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_JNI_EXCEPTION
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a6b099b9533c38729a6c305f2fe93f98d">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_SUCCESS
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESUT_SUCCESS
-: <a class="el" href="group___bitmap.html#gafb665ac9fefad34ac5c035f5d1314080">bitmap.h</a>
-</li>
-<li>AndroidBitmap_getInfo()
-: <a class="el" href="group___bitmap.html#ga80292ee39d8a675928e38849742b54bf">bitmap.h</a>
-</li>
-<li>AndroidBitmap_lockPixels()
-: <a class="el" href="group___bitmap.html#ga2908d42fa4db286c34b7f8c11f29206f">bitmap.h</a>
-</li>
-<li>AndroidBitmap_unlockPixels()
-: <a class="el" href="group___bitmap.html#ga4aca91f37baddd42d0051dca8179d4ed">bitmap.h</a>
-</li>
-<li>AndroidBitmapFormat
-: <a class="el" href="group___bitmap.html#gaea286a2d4c61ae2abb02b51500499f13">bitmap.h</a>
-</li>
-<li>AOBB_STATE_ERROR_ALREADY_MOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a8b074af151167a965a550b9829fafb37">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_COULD_NOT_MOUNT
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a324da2b8fea5875339d442d1f2d0b45b">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_COULD_NOT_UNMOUNT
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a1f2b51b53fc57b57a9967f6ce0c88dbe">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_INTERNAL
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a50642881107d6673aace1494a5d6fce2">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_NOT_MOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a3ce8539aa8b531c9de1d16041322d7a8">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_PERMISSION_DENIED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2467a4b6a634680e12c288a7790ff66c">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_MOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2a9c420e6008c108a7198fd861c042d5">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_UNMOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a6710bb5b68cfc115eedcde2aafd8a667">storage_manager.h</a>
-</li>
-<li>AObbInfo
-: <a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">obb.h</a>
-</li>
-<li>AObbInfo_delete()
-: <a class="el" href="group___storage.html#gaec5a4428008f545e829486099298031a">obb.h</a>
-</li>
-<li>AObbInfo_getFlags()
-: <a class="el" href="group___storage.html#ga68d916570c756da9fd0d9096358300eb">obb.h</a>
-</li>
-<li>AObbInfo_getPackageName()
-: <a class="el" href="group___storage.html#ga1ec7eee61541fa5a9b578801a35b9cf3">obb.h</a>
-</li>
-<li>AObbInfo_getVersion()
-: <a class="el" href="group___storage.html#gacd8471c6d866cffe4a32f3b5997c782c">obb.h</a>
-</li>
-<li>AOBBINFO_OVERLAY
-: <a class="el" href="group___storage.html#ggae4d5251432e1a9e6803c0240cc492e18a33e2ae83b4c25d33a4335dccf1de1c3a">obb.h</a>
-</li>
-<li>AObbScanner_getObbInfo()
-: <a class="el" href="group___storage.html#ga7beb4f82e3bf9a4b8197917f92ac4d5e">obb.h</a>
-</li>
-<li>ARect
-: <a class="el" href="group___native_activity.html#gaa984a498f0e146ac57c6022a323423cf">rect.h</a>
-</li>
-<li>AREPORTING_MODE_CONTINUOUS
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8a64337fcb7e338d487dc3edc873df1c">sensor.h</a>
-</li>
-<li>AREPORTING_MODE_ON_CHANGE
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8542165ae195bf5784cdd9ba66bd2ab5">sensor.h</a>
-</li>
-<li>AREPORTING_MODE_ONE_SHOT
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa002273a1ab874159a38a7e3f6bb6a7bb">sensor.h</a>
-</li>
-<li>AREPORTING_MODE_SPECIAL_TRIGGER
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181faa2d29656b35889c4c23318982e847ae7">sensor.h</a>
-</li>
-<li>ASensor
-: <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">sensor.h</a>
-</li>
-<li>ASensor_getFifoMaxEventCount()
-: <a class="el" href="group___sensor.html#gae9969580eda319926a677a6937c7afb1">sensor.h</a>
-</li>
-<li>ASensor_getFifoReservedEventCount()
-: <a class="el" href="group___sensor.html#gaec7084c6a9d4d85f87c95a70511c5f53">sensor.h</a>
-</li>
-<li>ASensor_getMinDelay()
-: <a class="el" href="group___sensor.html#gacb6e021757c07344b58742611eaf68e7">sensor.h</a>
-</li>
-<li>ASensor_getName()
-: <a class="el" href="group___sensor.html#ga52f4b22990c70df0784b9ccf23314fae">sensor.h</a>
-</li>
-<li>ASensor_getReportingMode()
-: <a class="el" href="group___sensor.html#ga99e56b84cf421788c27998da8eab7e39">sensor.h</a>
-</li>
-<li>ASensor_getResolution()
-: <a class="el" href="group___sensor.html#ga3da2930dd866cf1f76da6bc39e578a46">sensor.h</a>
-</li>
-<li>ASensor_getStringType()
-: <a class="el" href="group___sensor.html#gabee3eb65390fc75a639c59d653af3591">sensor.h</a>
-</li>
-<li>ASensor_getType()
-: <a class="el" href="group___sensor.html#ga93962747ab3c7d2b609f97af26fc0230">sensor.h</a>
-</li>
-<li>ASensor_getVendor()
-: <a class="el" href="group___sensor.html#gafaf467fc71f7adba537a90f166e3320d">sensor.h</a>
-</li>
-<li>ASensor_isWakeUpSensor()
-: <a class="el" href="group___sensor.html#ga0ff4118e400bedac62be6b79e9e0f924">sensor.h</a>
-</li>
-<li>ASENSOR_MAGNETIC_FIELD_EARTH_MAX
-: <a class="el" href="group___sensor.html#gaf8b57b13c6432bc6136aac0ad3813d63">sensor.h</a>
-</li>
-<li>ASENSOR_MAGNETIC_FIELD_EARTH_MIN
-: <a class="el" href="group___sensor.html#ga4423a712e27b6d5a57d138796892886d">sensor.h</a>
-</li>
-<li>ASENSOR_STANDARD_GRAVITY
-: <a class="el" href="group___sensor.html#ga5129cb9e4091fc3474e246d5f950e52b">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_ACCURACY_HIGH
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a2df5fb4e8b684e6a801a4aff9f50ba13">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_ACCURACY_LOW
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a5f306f3d45a19573539462e4c813edc0">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_ACCURACY_MEDIUM
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ad7e9379a4f36a42f2659cd7aec214f2d">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_NO_CONTACT
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae5d0475bd9491c4232a09afc81fa283d">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_UNRELIABLE
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae8e43df50b7b85ed54f22c40f2cd748e">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_ACCELEROMETER
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167bad72017f34c12971593a8cb14f4f254df">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_GYROSCOPE
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba80e9827f6c3ded009f354dc7078a2c68">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_LIGHT
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba105331b6dea6f08e0d8fe3b736f8c174">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_MAGNETIC_FIELD
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba3b31509a3efebafb413e78f5ec9ae0e8">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_PROXIMITY
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba0c6a2e526ed2e4442b3843976f906932">sensor.h</a>
-</li>
-<li>ASensorEvent
-: <a class="el" href="group___sensor.html#ga6bb167c45f0ef0a94d8f178d227e781f">sensor.h</a>
-</li>
-<li>ASensorEventQueue
-: <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">sensor.h</a>
-</li>
-<li>ASensorEventQueue_disableSensor()
-: <a class="el" href="group___sensor.html#ga03852b813887ec236a34c4aef0df4b68">sensor.h</a>
-</li>
-<li>ASensorEventQueue_enableSensor()
-: <a class="el" href="group___sensor.html#ga48a8379cf9de9b09a71a00f8a3699499">sensor.h</a>
-</li>
-<li>ASensorEventQueue_getEvents()
-: <a class="el" href="group___sensor.html#gab3d4354fd0d3ceb5fa97c129b024a18a">sensor.h</a>
-</li>
-<li>ASensorEventQueue_hasEvents()
-: <a class="el" href="group___sensor.html#ga79c9d6264fe81d4e30800f826db72913">sensor.h</a>
-</li>
-<li>ASensorEventQueue_setEventRate()
-: <a class="el" href="group___sensor.html#gaa6e89b6d69dc3e07f2d7e72e81ec7937">sensor.h</a>
-</li>
-<li>ASensorList
-: <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">sensor.h</a>
-</li>
-<li>ASensorManager
-: <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">sensor.h</a>
-</li>
-<li>ASensorManager_createEventQueue()
-: <a class="el" href="group___sensor.html#gac46f8b28bcc7a846dea9d841cab0a67b">sensor.h</a>
-</li>
-<li>ASensorManager_destroyEventQueue()
-: <a class="el" href="group___sensor.html#gaf35624037785cdea1e7fe9e0a73fc5e1">sensor.h</a>
-</li>
-<li>ASensorManager_getDefaultSensor()
-: <a class="el" href="group___sensor.html#gaf4880d87e01f5e2d4a9b8403e4047445">sensor.h</a>
-</li>
-<li>ASensorManager_getDefaultSensorEx()
-: <a class="el" href="group___sensor.html#ga4313457c0e82f4afa77ef13860629633">sensor.h</a>
-</li>
-<li>ASensorManager_getInstance()
-: <a class="el" href="group___sensor.html#gaa438fdaf34783a89d139f0a56d2692cd">sensor.h</a>
-</li>
-<li>ASensorManager_getSensorList()
-: <a class="el" href="group___sensor.html#ga645be938627498ab2b60d94c562204bd">sensor.h</a>
-</li>
-<li>ASensorRef
-: <a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">sensor.h</a>
-</li>
-<li>ASensorVector
-: <a class="el" href="group___sensor.html#ga207e807f9e18271f6a763e57232b409f">sensor.h</a>
-</li>
-<li>AStorageManager
-: <a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">storage_manager.h</a>
-</li>
-<li>AStorageManager_delete()
-: <a class="el" href="group___storage.html#ga184c06dd9cec0f21db138167d6b331ed">storage_manager.h</a>
-</li>
-<li>AStorageManager_getMountedObbPath()
-: <a class="el" href="group___storage.html#gad5c90305d627e0c768da37cb3e9f08c4">storage_manager.h</a>
-</li>
-<li>AStorageManager_isObbMounted()
-: <a class="el" href="group___storage.html#ga7572f2c650fc16cce1b0ab94e913a1ba">storage_manager.h</a>
-</li>
-<li>AStorageManager_mountObb()
-: <a class="el" href="group___storage.html#ga61bebaf43e57b4b7f57e7a24a62e9e3d">storage_manager.h</a>
-</li>
-<li>AStorageManager_new()
-: <a class="el" href="group___storage.html#ga1c21ed9e0848fcfc03547c95eeb48877">storage_manager.h</a>
-</li>
-<li>AStorageManager_obbCallbackFunc
-: <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">storage_manager.h</a>
-</li>
-<li>AStorageManager_unmountObb()
-: <a class="el" href="group___storage.html#ga4c32c8d2c780016fa36097d833b57809">storage_manager.h</a>
-</li>
-<li>AUncalibratedEvent
-: <a class="el" href="group___sensor.html#ga24acc545b908dd24cadc44c5e0760b3b">sensor.h</a>
-</li>
-<li>AWINDOW_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa67363c129036872bc9dd29557e807508">window.h</a>
-</li>
-<li>AWINDOW_FLAG_ALT_FOCUSABLE_IM
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa961ff4c9c0903cfb8867d961bebe1659">window.h</a>
-</li>
-<li>AWINDOW_FLAG_BLUR_BEHIND
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa0377f46a626d411ace179c1c27d0a3f7">window.h</a>
-</li>
-<li>AWINDOW_FLAG_DIM_BEHIND
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6155e77ae4e12cc56fb3f6f55f56bf6f">window.h</a>
-</li>
-<li>AWINDOW_FLAG_DISMISS_KEYGUARD
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa37c1077a12f1c8c6805b1da6f7bb213a">window.h</a>
-</li>
-<li>AWINDOW_FLAG_DITHER
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae73488b436aaea163ba2f7051bf93d9d">window.h</a>
-</li>
-<li>AWINDOW_FLAG_FORCE_NOT_FULLSCREEN
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa4c21235db629d3937f87ffe98cd6fe5d">window.h</a>
-</li>
-<li>AWINDOW_FLAG_FULLSCREEN
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaca1f1d91313d7c32bb7982d8a5abcd71">window.h</a>
-</li>
-<li>AWINDOW_FLAG_IGNORE_CHEEK_PRESSES
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaa2fe4ee2307bb814a37a043de6d7d326">window.h</a>
-</li>
-<li>AWINDOW_FLAG_KEEP_SCREEN_ON
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8">window.h</a>
-</li>
-<li>AWINDOW_FLAG_LAYOUT_IN_SCREEN
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6978968d7e0dc1a0e12f58ad395a959a">window.h</a>
-</li>
-<li>AWINDOW_FLAG_LAYOUT_INSET_DECOR
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa97b8542941bfe613bcf92357be89b563">window.h</a>
-</li>
-<li>AWINDOW_FLAG_LAYOUT_NO_LIMITS
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffade9722581a203ee0db25d42f4d2bd389">window.h</a>
-</li>
-<li>AWINDOW_FLAG_NOT_FOCUSABLE
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">window.h</a>
-</li>
-<li>AWINDOW_FLAG_NOT_TOUCH_MODAL
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09">window.h</a>
-</li>
-<li>AWINDOW_FLAG_NOT_TOUCHABLE
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae9f1278ffa6fe9c12c2305d4f4de1450">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SCALED
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa80316264eeae9681a56c1a2297bf465a">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SECURE
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa8ff70709a588a05781d7cb178b526cc0">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SHOW_WALLPAPER
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa952ae6ceebe94d3f0d666454548b8824">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SHOW_WHEN_LOCKED
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">window.h</a>
-</li>
-<li>AWINDOW_FLAG_TOUCHABLE_WHEN_WAKING
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5574a513645e6e7cb4d6a9f4a043d773">window.h</a>
-</li>
-<li>AWINDOW_FLAG_TURN_SCREEN_ON
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffac4deee26ac742bbd0bb4c44fda140a01">window.h</a>
-</li>
-<li>AWINDOW_FLAG_WATCH_OUTSIDE_TOUCH
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa35229f75b3309bafdd828cbbf27d05b6">window.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_defs.jd b/docs/html/ndk/reference/globals_defs.jd
deleted file mode 100644
index 8d04efb..0000000
--- a/docs/html/ndk/reference/globals_defs.jd
+++ /dev/null
@@ -1,24 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- <ul>
-<li>AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT
-: <a class="el" href="group___input.html#gaeb170c0fbeeed1d999160566f09f169e">input.h</a>
-</li>
-<li>ANDROID_BITMAP_RESUT_SUCCESS
-: <a class="el" href="group___bitmap.html#gafb665ac9fefad34ac5c035f5d1314080">bitmap.h</a>
-</li>
-<li>ASENSOR_MAGNETIC_FIELD_EARTH_MAX
-: <a class="el" href="group___sensor.html#gaf8b57b13c6432bc6136aac0ad3813d63">sensor.h</a>
-</li>
-<li>ASENSOR_MAGNETIC_FIELD_EARTH_MIN
-: <a class="el" href="group___sensor.html#ga4423a712e27b6d5a57d138796892886d">sensor.h</a>
-</li>
-<li>ASENSOR_STANDARD_GRAVITY
-: <a class="el" href="group___sensor.html#ga5129cb9e4091fc3474e246d5f950e52b">sensor.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_enum.jd b/docs/html/ndk/reference/globals_enum.jd
deleted file mode 100644
index 7fd396e..0000000
--- a/docs/html/ndk/reference/globals_enum.jd
+++ /dev/null
@@ -1,12 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- <ul>
-<li>AndroidBitmapFormat
-: <a class="el" href="group___bitmap.html#gaea286a2d4c61ae2abb02b51500499f13">bitmap.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_eval.jd b/docs/html/ndk/reference/globals_eval.jd
deleted file mode 100644
index e1399c7..0000000
--- a/docs/html/ndk/reference/globals_eval.jd
+++ /dev/null
@@ -1,1652 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- 
-
-<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
-<li>AASSET_MODE_BUFFER
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba40ec098f4afb7c2869fa449d3059f6bb">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_RANDOM
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba88e1b2a920963d7596735fe28bf30e2f">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_STREAMING
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55bac76f5fdb953097efc04e534474a7ea74">asset_manager.h</a>
-</li>
-<li>AASSET_MODE_UNKNOWN
-: <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba5bf76576f07042f965f230086f7c09f4">asset_manager.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace87b4f25e5fd6fe0f3316d21ecc66a1">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a966a3855351a97ae865264afd74c1534">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_DEFAULT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae628b2bf594733b7c19ae394616cec6c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_HIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5ef4a97dc058235cdfa9fcfe3300c7eb">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_LOW
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ddb34b2376422d2323720049eb57f3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_MEDIUM
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2511479d7cd574c4b293d535e4dc337e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_NONE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a7c1af92914155c418b99844c6aab33d7">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_TV
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10e6c3d636f3f6de75de9208913b0d8f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_XHIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a38a03b3b1c64725679605d8d479c85a0">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_XXHIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad6353daf63778a6ec6f2bd3815d7e6e4">configuration.h</a>
-</li>
-<li>ACONFIGURATION_DENSITY_XXXHIGH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2bd04af33e868a77bd4d83e7d70368ec">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0195de2a57f028a8171c42beff0b0e88">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_12KEY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1aaf1a887f146737030cce95c53066ea">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a593f722738682ae4500dab6427670f4a">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_HIDDEN
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a54e71234e32ed037e2d47472f80eb416">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_NOKEYS
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a40195a1a2d8e21c74d99606d8a1a9918">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYBOARD_QWERTY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a263ff8efb4d2c757e557adc0d0cdeedf">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a34d3a830bc2964000052f8486fd76b0c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5abfbfc3a10affed059263555b00429ab2">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_SOFT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1a56b72c730e40f22f3b8727e54c376c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_KEYSHIDDEN_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5e6a5a3f4175644886bde7d0ed4b1ebf">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65834be1230d1694e5ce8a6f407acab2">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4687ede31c438dd9f2701cab88de1dbe">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR_LTR
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a05242d8f2d254b43ff9414ff1aa38a83">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LAYOUTDIR_RTL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af98332983b787ab9355b527079636870">configuration.h</a>
-</li>
-<li>ACONFIGURATION_LOCALE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ecff796bd0690a9a8498c7de03e9b4">configuration.h</a>
-</li>
-<li>ACONFIGURATION_MCC
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4d40f2aef365c78a52f699b89439db28">configuration.h</a>
-</li>
-<li>ACONFIGURATION_MNC
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ade91a319638eede201579d15f86578a5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_MNC_ZERO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa6cda2f222580dbef27f1277d967d58c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVHIDDEN_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a6db7dd6a67196df88117dcdc904e0cb3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVHIDDEN_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae6ff9883e3e89f8d9ea5c0ebe077c9c5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVHIDDEN_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a79b3a5fe10e948bb79db47b516d46cf5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65e9d31615d2b4adf3738d9a12a1556b">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90e914b60d28c081b313f4b7b6600f47">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_DPAD
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace2e3ed21322100712992ca09f4b75b5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_NONAV
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a3d95e899305aeae366fb7f8d8b6c290a">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_TRACKBALL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad2807d00cb2f5dcb9f456045dd8443a4">configuration.h</a>
-</li>
-<li>ACONFIGURATION_NAVIGATION_WHEEL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a80b53370f65ad283a4fd025f36422bea">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a591461d864136d482fe06e01fd945786">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af44cee3290a23999b0358c5638747a5f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_LAND
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad5746872ff6871379fca93c60bfac8a3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_PORT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad9bf5c1fb90f9fdb20f984d0574592fe">configuration.h</a>
-</li>
-<li>ACONFIGURATION_ORIENTATION_SQUARE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab0ca4fce673baf58447bfeb154d9a03f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_HEIGHT_DP_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab66ad42d0cf72fd7e8cd99b92b625432">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_LAYOUT
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a12d69ffef9135c1c55e1b8b5c2589e7c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_SIZE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a76ca1eb0e9346d93da592afbbf9a3b72">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREEN_WIDTH_DP_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aad653f0c960112177fdc387a4a0577fa">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENLONG_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a41e55e57da42fd09c378f59c1a63710f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENLONG_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a428bb8fcd8bc731b67b0773dc62781c5">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENLONG_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a91fc014d328507568d225d691b3babfd">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a9abcd34a6c549e048fc75a545081584e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_LARGE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af871d177fdceedb75612cfc1281d2c12">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_NORMAL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a019727e684f25ba921f3479abd62b9f2">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_SMALL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1163af972206a65a5d18bda12fdc511c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SCREENSIZE_XLARGE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0ca385ed504fc92f6ff3f0857e916c9c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SMALLEST_SCREEN_SIZE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5acce415252e0ad95117a05bbe910f06de">configuration.h</a>
-</li>
-<li>ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a227120217d8b6a9d5add3ccc4b283702">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a255cfb57ac18d460c5614565a84f5561">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa73bcf45261366840fea743372682fa6">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_FINGER
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4bf2a8323ec6d072aa48d5fc2cff645e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_NOTOUCH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5adfbeb370edd3b4372c9b0f86f152dde0">configuration.h</a>
-</li>
-<li>ACONFIGURATION_TOUCHSCREEN_STYLUS
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a8316a15b06353f883f2aef8bd194f79f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a43a324af59372efd08b34431825cf67e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_NIGHT_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a975087bbd4087b57a68ef3cdbfeb77a1">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_NIGHT_NO
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90ebe564e3a3e384d5b013100f81e4b7">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_NIGHT_YES
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a437af4527fac5407de256ec1ef055046">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_ANY
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10d0916da7fa88c945a9cda259407d4c">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_APPLIANCE
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad99004a7a1b2a97d29b639664947f8e3">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_CAR
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5d6575185e41d909469a1dcf5f81bf4f">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_DESK
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae10bb854f461f60cf399852f8f327077">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_NORMAL
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae7efe2713b6718311da76c828b5b444e">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_TELEVISION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4738dded616f028fbbedcbad764e7969">configuration.h</a>
-</li>
-<li>ACONFIGURATION_UI_MODE_TYPE_WATCH
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ac8c3e2207f2356bc6a1dffc6a615d131">configuration.h</a>
-</li>
-<li>ACONFIGURATION_VERSION
-: <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1be62e4fc31cf3d3102c99f7c6b4c71b">configuration.h</a>
-</li>
-<li>AINPUT_EVENT_TYPE_KEY
-: <a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea696f0d7635f7a24c17d3f1e4ccdd44ba">input.h</a>
-</li>
-<li>AINPUT_EVENT_TYPE_MOTION
-: <a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea2182dfda2cceb5425dcc2823b9b6b56a">input.h</a>
-</li>
-<li>AINPUT_KEYBOARD_TYPE_ALPHABETIC
-: <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaba1f5ab6bc79749ba96a5d2a3af0e574">input.h</a>
-</li>
-<li>AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC
-: <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaf0226d750ea830eb557ae68bd4a1c82a">input.h</a>
-</li>
-<li>AINPUT_KEYBOARD_TYPE_NONE
-: <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fcea32cb7ce34cdce7095962f0766cc6c3ac">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_ORIENTATION
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaf9be9c04a41b610d994a3d1d7e90d06d">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_PRESSURE
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa79aca706b12b28d0ab14762902fed31a">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_SIZE
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa46f3a6cf859fb161cd29398d8448c688">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOOL_MAJOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaa860f54aa9e5a269dba6a54bbcf3c27c">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOOL_MINOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa19226f6cf713c1b4d0973a163daf6cf1">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOUCH_MAJOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa7ead43624c96e165fd8a25e77148aa67">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_TOUCH_MINOR
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa301181a0f20681135c15010b39bb575d">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_X
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa0e5816bc48cdb33f2b488a109596ffe1">input.h</a>
-</li>
-<li>AINPUT_MOTION_RANGE_Y
-: <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaab48108c9450ea1b7cd021be7d8cbc332">input.h</a>
-</li>
-<li>AINPUT_SOURCE_ANY
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ab04317e7dd273ff5c87038df67d9796e">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_BUTTON
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dacf1bf3d7b3c6e59f907bdffc9b33370e">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_JOYSTICK
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daaaeffb6442807dd96ec62e9d8a696b57">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_MASK
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daae438f475d03ea60fd9fb356abd7fa01">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_NAVIGATION
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da078a18d85d078412721c336a879bcc1a">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_NONE
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dafd6d5e71f09f6452acf017559481444c">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_POINTER
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da7495274e98fb30dee3dfd903b878cf47">input.h</a>
-</li>
-<li>AINPUT_SOURCE_CLASS_POSITION
-: <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da682f6982bb55ee809f6acd2deb550167">input.h</a>
-</li>
-<li>AINPUT_SOURCE_DPAD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ad0fbfeff9f8d57104bff14c70ce5e3ef">input.h</a>
-</li>
-<li>AINPUT_SOURCE_GAMEPAD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a6417cb50ecd6ade48c708268434a49d3">input.h</a>
-</li>
-<li>AINPUT_SOURCE_JOYSTICK
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25afb28f10dc074e7f7435f5904c513edb5">input.h</a>
-</li>
-<li>AINPUT_SOURCE_KEYBOARD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a9860918666dd8c0b9d00a8da7af51e6d">input.h</a>
-</li>
-<li>AINPUT_SOURCE_MOUSE
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae71d3dcbd004bccb6e00fde47097cd86">input.h</a>
-</li>
-<li>AINPUT_SOURCE_STYLUS
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a86d4983c71432b27634ba41a64bffdf9">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TOUCH_NAVIGATION
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a3712c4e4fb8ad7f6ae6e40d48e5c6ee7">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TOUCHPAD
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e0715d4b544653ab11893434172a2ef">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TOUCHSCREEN
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a55ea411f927aed8964fa72fec0da444f">input.h</a>
-</li>
-<li>AINPUT_SOURCE_TRACKBALL
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e49d9153c86f60f626d7f797f4e78b6">input.h</a>
-</li>
-<li>AINPUT_SOURCE_UNKNOWN
-: <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae9348bc04cdaa88b5b010f77a4945454">input.h</a>
-</li>
-<li>AKEY_EVENT_ACTION_DOWN
-: <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a123c3bd18fd93b53d8aedbe7597f7b49">input.h</a>
-</li>
-<li>AKEY_EVENT_ACTION_MULTIPLE
-: <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a08e2d927e155478ee66ec46ebd845ab0">input.h</a>
-</li>
-<li>AKEY_EVENT_ACTION_UP
-: <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635abf18b7c5384c5de8657a0650f8da57c3">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_CANCELED
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da3198fad5ab75df614bb41f0f602a9e55">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_CANCELED_LONG_PRESS
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2daf09856f03f2fffee9a82cb8e508efb7a">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_EDITOR_ACTION
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dab9dbcf990d1e4405e32f847fdea52013">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_FALLBACK
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da14f574126d2544863fa8042ddd0f48c0">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_FROM_SYSTEM
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dae1e7ec188b2404fadd94cfba89afd5d6">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_KEEP_TOUCH_MODE
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dadc0a063ca412b0ea08474df422bf9b41">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_LONG_PRESS
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da39f9f7bdf2e256db0e2a8a5dfbfb7185">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_SOFT_KEYBOARD
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da7dbb272c7b28be9c084df3446a629f32">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_TRACKING
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da91e70ab527f27a1779f4550d457f1689">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dad4b5eba5b14e4076c69bc7185f2804f8">input.h</a>
-</li>
-<li>AKEY_EVENT_FLAG_WOKE_HERE
-: <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da6473a1afc0cc39e029c2a217bc57cdba">input.h</a>
-</li>
-<li>AKEY_STATE_DOWN
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a286ec0a7aff5903a982be0cd6785b62c">input.h</a>
-</li>
-<li>AKEY_STATE_UNKNOWN
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a9506627d5377c67dbc7fc58804b2cdfd">input.h</a>
-</li>
-<li>AKEY_STATE_UP
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04afa14022f587487c24d401c87e71c8e28">input.h</a>
-</li>
-<li>AKEY_STATE_VIRTUAL
-: <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04ad09fd9fe458ca6c66ead9b9a75c56192">input.h</a>
-</li>
-<li>AKEYCODE_0
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23f585ea17aeceaad2111c51ab289e79">keycodes.h</a>
-</li>
-<li>AKEYCODE_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabcac88b54f8d764bc4573ecc5b9571b0">keycodes.h</a>
-</li>
-<li>AKEYCODE_11
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa22858c3c30d596ad60f355f75df86e1">keycodes.h</a>
-</li>
-<li>AKEYCODE_12
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa781c31195e55b2dcbdd772560dc61aa5">keycodes.h</a>
-</li>
-<li>AKEYCODE_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2079c6fb75141968b60ed79fe895d6db">keycodes.h</a>
-</li>
-<li>AKEYCODE_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa40ccc018c0637e4d938e66b789054551">keycodes.h</a>
-</li>
-<li>AKEYCODE_3D_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68d314a5ec06701205cd0097c5c7145c">keycodes.h</a>
-</li>
-<li>AKEYCODE_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c2d141c3906bd97cfec91443356f7b">keycodes.h</a>
-</li>
-<li>AKEYCODE_5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca99d2be4a3723ba3406944ad623f6e">keycodes.h</a>
-</li>
-<li>AKEYCODE_6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa72bc6560e24d08ff8f3116dac9179079">keycodes.h</a>
-</li>
-<li>AKEYCODE_7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa27070499acdb6c527a285b3840ec7bff">keycodes.h</a>
-</li>
-<li>AKEYCODE_8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93543b23683b33724ecf77ac5a8c19ab">keycodes.h</a>
-</li>
-<li>AKEYCODE_9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa31cd4d7c4e59cf7b057b6c248cff516d">keycodes.h</a>
-</li>
-<li>AKEYCODE_A
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa424a091c62d40f5d65908c9730ae9014">keycodes.h</a>
-</li>
-<li>AKEYCODE_ALT_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3dec175158abe8679bedd98ed1bc3e1a">keycodes.h</a>
-</li>
-<li>AKEYCODE_ALT_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd9b6b0846c6999f5df47d29e58ac95d">keycodes.h</a>
-</li>
-<li>AKEYCODE_APOSTROPHE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab5518a8502914ea5f87ef5d29b32b1b1">keycodes.h</a>
-</li>
-<li>AKEYCODE_APP_SWITCH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa53a59a262d6d523bdc2bd30a1e427bad">keycodes.h</a>
-</li>
-<li>AKEYCODE_ASSIST
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3f036adb654c7752890a283ecbf838">keycodes.h</a>
-</li>
-<li>AKEYCODE_AT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7284f79a266ede479b79726082642e16">keycodes.h</a>
-</li>
-<li>AKEYCODE_AVR_INPUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa57d42dbd8ea4219f76fb116f234e6504">keycodes.h</a>
-</li>
-<li>AKEYCODE_AVR_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa479d36f9814bd00c8986a252664b938b">keycodes.h</a>
-</li>
-<li>AKEYCODE_B
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa65d3bf8d6a8a6c2f7c1b08394f313758">keycodes.h</a>
-</li>
-<li>AKEYCODE_BACK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeb71c74bf556ba72e9c8f8dcbe5453d0">keycodes.h</a>
-</li>
-<li>AKEYCODE_BACKSLASH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac90eb064382e3c482ae86abb7b3f701">keycodes.h</a>
-</li>
-<li>AKEYCODE_BOOKMARK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa03ce46d177e020690aa9d26a0fa850ae">keycodes.h</a>
-</li>
-<li>AKEYCODE_BREAK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa047501f9cf9bce00e6048d8759ea3a23">keycodes.h</a>
-</li>
-<li>AKEYCODE_BRIGHTNESS_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7cf1bf3528b6d8a0e86998287fe00650">keycodes.h</a>
-</li>
-<li>AKEYCODE_BRIGHTNESS_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0af6ec416c09d160e364466faa955c36">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa28c72c33ab93d83539d0790b7e48336a">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_10
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7e6f8621909f3461032c33f9c8acaa7">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_11
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab413971c698b6e25d3955667c0142ac1">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_12
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafe4ee1e5446dd12bbb579b412048e79e">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_13
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaabde2ed26594b89d5769eef9f0d1fe6f">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_14
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f08dfd2c30ddedf1d2983680e89041b">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_15
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d8d0fb1a610fdb4e53f0fb675b7d7d0">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_16
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa224370cba99bda2db6a1c82fd2f7fa39">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab8089673fea303c7a299eefd2c327cc3">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa706a5ff492c80b4653e6fe0dcd278ca1">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c425a063bf6976e1ff8ae9f3cfcbe6">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47149f963528ec7abe55066abfb7caf5">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55057c8cda53a4c539d02ab1a93ca58b">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac09e0c0cbbf6449bf106e4199600db35">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaee64b3e0f30ed09e3c9f01b6c8877c3f">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac8e54092c8be5dc0e114ec35f40e00dc">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_A
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaef2d2ec912aaa9e7215aeab79f7fb086">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_B
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa721765c8f0bbcdb68af06817dbec8e53">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_C
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad622ad5df40d2fdf806abb2adda73b3d">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_L1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa32e159826404c7d76c2a433c24de82a2">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_L2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa36a38421637cfa5ebfd8a0296650cdf4">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa19839eebec939407d901a33b75cf2594">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_R1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7c614b3966583b0ad027e45f594ede46">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_R2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa46d487e9fe31855b7b46739bad58fe3e">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_SELECT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa598289bc85f647c237729126ea392a43">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_START
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3c818d106f4ec793a43749c4c26a8a4">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_THUMBL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68c5d8dcd8fe708ada8f4a4e17feb638">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_THUMBR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9759d817172d268ced1748909a5f5fbe">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_X
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa21174962f95e32cd0345ce657d03ebc7">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_Y
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6654a8b2c700f7783433c86fcdae7919">keycodes.h</a>
-</li>
-<li>AKEYCODE_BUTTON_Z
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06156b68e6de951b44fc662e1b16041f">keycodes.h</a>
-</li>
-<li>AKEYCODE_C
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeed584f454e508ce931bcb33d37adb04">keycodes.h</a>
-</li>
-<li>AKEYCODE_CALCULATOR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa293523c40bb9f1d793cd0b984f636573">keycodes.h</a>
-</li>
-<li>AKEYCODE_CALENDAR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa114be17d1853c77a7406c024d9e4f076">keycodes.h</a>
-</li>
-<li>AKEYCODE_CALL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8b5720ebdd3576c2b536ec9228273d8f">keycodes.h</a>
-</li>
-<li>AKEYCODE_CAMERA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8670880765756933d3d1a10186d39e26">keycodes.h</a>
-</li>
-<li>AKEYCODE_CAPS_LOCK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab9dcb68b35c85d380846c85f323868f1">keycodes.h</a>
-</li>
-<li>AKEYCODE_CAPTIONS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81ba8d5343362b841b8a62b8679ff994">keycodes.h</a>
-</li>
-<li>AKEYCODE_CHANNEL_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa18f1808c6a819e787c9a9941f78b910f">keycodes.h</a>
-</li>
-<li>AKEYCODE_CHANNEL_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa056914fd17ae539dca44f43745d8e05c">keycodes.h</a>
-</li>
-<li>AKEYCODE_CLEAR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95bd8c25adeaa570108c7403f08a2901">keycodes.h</a>
-</li>
-<li>AKEYCODE_COMMA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca0bfbdc67b2c6f76e8fcaaf782c227">keycodes.h</a>
-</li>
-<li>AKEYCODE_CONTACTS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0aa2cfca11b7cabf82341a9dbec83f10">keycodes.h</a>
-</li>
-<li>AKEYCODE_CTRL_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaca9d0df6cc18492209eb287e659aeb1">keycodes.h</a>
-</li>
-<li>AKEYCODE_CTRL_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa99b317cf2f1eb6b06d0226e05223e60c">keycodes.h</a>
-</li>
-<li>AKEYCODE_D
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7e4cb3ef66209a2779be2c8239b57b51">keycodes.h</a>
-</li>
-<li>AKEYCODE_DEL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd013221b457d98975dc47e49817e28a">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_CENTER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e9c93273fd39148f54167133aa5b9ae">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa84b721b13aae56c9f1d3c22b3d81627a">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa668dfb3ed79a37c2c07838c161c1b344">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac6f9d81b6239696a1836695bbfc6a975">keycodes.h</a>
-</li>
-<li>AKEYCODE_DPAD_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf2fd3133a88f3b6725834032bd74bd9e">keycodes.h</a>
-</li>
-<li>AKEYCODE_DVR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf2f03b925a02ba6de9fd98737546a60">keycodes.h</a>
-</li>
-<li>AKEYCODE_E
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae218af7ceb207227bb10f0525e68a8d0">keycodes.h</a>
-</li>
-<li>AKEYCODE_EISU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaadd69273b99eb0b848d98b2d6b3ad3234">keycodes.h</a>
-</li>
-<li>AKEYCODE_ENDCALL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaff971957ae3a4e272b21987854e18d9b">keycodes.h</a>
-</li>
-<li>AKEYCODE_ENTER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac784a7bbbfbdab05fab6c6a1f29c98ff">keycodes.h</a>
-</li>
-<li>AKEYCODE_ENVELOPE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaade96efe470f428bb5c4eaea6ffc3681c">keycodes.h</a>
-</li>
-<li>AKEYCODE_EQUALS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0a197df7ec719c95ddcd6836e76c8498">keycodes.h</a>
-</li>
-<li>AKEYCODE_ESCAPE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac52177e5508edacb8e9c6d3a25db4fb6">keycodes.h</a>
-</li>
-<li>AKEYCODE_EXPLORER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaded9ec81ae6dab451665317723b94083">keycodes.h</a>
-</li>
-<li>AKEYCODE_F
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa455f71ecfe59af0fbd901ac0d0a8d53a">keycodes.h</a>
-</li>
-<li>AKEYCODE_F1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3b84f2c503a9e839f3d36e10e3307fcf">keycodes.h</a>
-</li>
-<li>AKEYCODE_F10
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa60660b13acab39282d0558cdcc93474">keycodes.h</a>
-</li>
-<li>AKEYCODE_F11
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa64cc7b1d8e53d90ff57c39d0b5a4dd22">keycodes.h</a>
-</li>
-<li>AKEYCODE_F12
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa491000231e0ba221b6916b1d9d2c9fb7">keycodes.h</a>
-</li>
-<li>AKEYCODE_F2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1360f7ec66aa6421e240dae637262e84">keycodes.h</a>
-</li>
-<li>AKEYCODE_F3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a4ce6105e12a3a9071cae2f40515085">keycodes.h</a>
-</li>
-<li>AKEYCODE_F4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa882050e4d0f917470a5b91fbf6ae9ebf">keycodes.h</a>
-</li>
-<li>AKEYCODE_F5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab01807c72b46620bb50fcb6abe24d937">keycodes.h</a>
-</li>
-<li>AKEYCODE_F6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa04a12e81ed80bb42ef5c63cedf0dc60">keycodes.h</a>
-</li>
-<li>AKEYCODE_F7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9583b8e4b0d994b7e3a193b67cf6020c">keycodes.h</a>
-</li>
-<li>AKEYCODE_F8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55ca54d42d8df70de2ce9031db1344c8">keycodes.h</a>
-</li>
-<li>AKEYCODE_F9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0c8225c0ef98da730933ae914077dbc9">keycodes.h</a>
-</li>
-<li>AKEYCODE_FOCUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23be9506f92f6efe14d47306a39a2187">keycodes.h</a>
-</li>
-<li>AKEYCODE_FORWARD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafbf0a16c7746e5dee2fd3adbd50da88a">keycodes.h</a>
-</li>
-<li>AKEYCODE_FORWARD_DEL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9516bc190d37fea27e07ddab0c607b51">keycodes.h</a>
-</li>
-<li>AKEYCODE_FUNCTION
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1764b777aa56605f4029d3c71fe70722">keycodes.h</a>
-</li>
-<li>AKEYCODE_G
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa165067e10464019411f768bba9e533d9">keycodes.h</a>
-</li>
-<li>AKEYCODE_GRAVE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa929561086ae7b519fa962597bc85f171">keycodes.h</a>
-</li>
-<li>AKEYCODE_GUIDE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf33a5fa1f163245360aeed89d64b0233">keycodes.h</a>
-</li>
-<li>AKEYCODE_H
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad89a91a1500cb162f22962781ebfd9dc">keycodes.h</a>
-</li>
-<li>AKEYCODE_HEADSETHOOK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0d3d29515a4815fe8d6d8d3291507a33">keycodes.h</a>
-</li>
-<li>AKEYCODE_HELP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab062b403701292c9e2db96a1f88cc6d9">keycodes.h</a>
-</li>
-<li>AKEYCODE_HENKAN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab0686dd37c57d833d1158b7f1d85ee02">keycodes.h</a>
-</li>
-<li>AKEYCODE_HOME
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa526c2411b7476b7ae579f57a0378b2dd">keycodes.h</a>
-</li>
-<li>AKEYCODE_I
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4d44b5e4a19580540d8d77bf5755d74b">keycodes.h</a>
-</li>
-<li>AKEYCODE_INFO
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e76263257a5dc654a413c9dc2fd649">keycodes.h</a>
-</li>
-<li>AKEYCODE_INSERT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62f663d11e91af750a51ddd060b08644">keycodes.h</a>
-</li>
-<li>AKEYCODE_J
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa70c259612ccec117d70afaef947a6a7a">keycodes.h</a>
-</li>
-<li>AKEYCODE_K
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ce56cf50d3632c275c524bd78d0d932">keycodes.h</a>
-</li>
-<li>AKEYCODE_KANA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62d090ae5c95a04dacdff79817dad531">keycodes.h</a>
-</li>
-<li>AKEYCODE_KATAKANA_HIRAGANA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3be7db22b3c8aa046a46631e44863c28">keycodes.h</a>
-</li>
-<li>AKEYCODE_L
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab61c534fd0f4e56c4ba13861a2f5982b">keycodes.h</a>
-</li>
-<li>AKEYCODE_LANGUAGE_SWITCH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7b8e87b47c17c5f1e97fcb56faaa26ff">keycodes.h</a>
-</li>
-<li>AKEYCODE_LAST_CHANNEL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa187963dd6f74b96f132f23e01dea35e9">keycodes.h</a>
-</li>
-<li>AKEYCODE_LEFT_BRACKET
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabdeda0d373aa37ef2ded5ffdfc008708">keycodes.h</a>
-</li>
-<li>AKEYCODE_M
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa43b19e5e5234ce90c8e7ef67dd0cabd1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MANNER_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa380279768c5c50d92bef2a88394f967f">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_AUDIO_TRACK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3cdb53cdf8c576e272502da06daa52e1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_CLOSE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6788c6e1443140b0ec4d004d8293e998">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_EJECT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa317bffd44306b021c401d3a26b82a7f6">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_FAST_FORWARD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa69e648024402af688d490a2041f15bca">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_NEXT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5a6c3fc963e8163852b9a23e3a198b3">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PAUSE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f4e0178c2028b3042b0a5948e38e4e4">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PLAY
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa615cf6202b0ae0ed550f42f6c64b36a1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PLAY_PAUSE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa42f8fe71e8d45b5a83d83d80c3da40e1">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_PREVIOUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81432c31b00d47f768c29163eb276acb">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_RECORD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e1eae0b245176aaa024a53411441f9">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_REWIND
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaecd53183b84c23a2ca65670a23674319">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_STOP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac4faa33993d80db1326073ea15a38e7d">keycodes.h</a>
-</li>
-<li>AKEYCODE_MEDIA_TOP_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3ddf83cb2f701911b03c3a738e2e73a">keycodes.h</a>
-</li>
-<li>AKEYCODE_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa707b85e89923b0f760be795972a87d76">keycodes.h</a>
-</li>
-<li>AKEYCODE_META_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaadfb2d920bbe422c096120d39811c58">keycodes.h</a>
-</li>
-<li>AKEYCODE_META_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68038455e2b0846db51f9957e0df9cb8">keycodes.h</a>
-</li>
-<li>AKEYCODE_MINUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaca10bd34ad0abecfecace908b8cb92ca">keycodes.h</a>
-</li>
-<li>AKEYCODE_MOVE_END
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5605f49f5271430f5f150efb3cd0398a">keycodes.h</a>
-</li>
-<li>AKEYCODE_MOVE_HOME
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7544f3de2fb5f78bec62af94a32fdc58">keycodes.h</a>
-</li>
-<li>AKEYCODE_MUHENKAN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7321e5c6b3cbab142bd16957653b2ac7">keycodes.h</a>
-</li>
-<li>AKEYCODE_MUSIC
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14508751d70a0404b194d4b6df83ec72">keycodes.h</a>
-</li>
-<li>AKEYCODE_MUTE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f6675d38f50e3556a8531839fd83f02">keycodes.h</a>
-</li>
-<li>AKEYCODE_N
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c0b26804c89560a9e87c45f7f9fed36">keycodes.h</a>
-</li>
-<li>AKEYCODE_NOTIFICATION
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6115506352a5828532fc6a0b91683331">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUM
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe6e880f65bebbdd5246a4164c4ab37a">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUM_LOCK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad5e349eadd3255c6ad4982dc40ed23ef">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_0
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa343df35e6a0ad0599e19b8ef7174909b">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c0ec8e42917fa9ac53977db3e6aeb17">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4dfd17c2209908e1ec890e10a3211f89">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1efe1886a4b472b999215c0e81f7386">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1fdd16681c1441b934f679b94fd0e4f8">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_5
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5916003e7c737a8cc06e52d2ee76c3b">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_6
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa13b83389e0f5de129227af4b8d3f035d">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_7
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaed9468951ef2887c07c8095c2e7d4c93">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_8
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5f0a300566235720eb93fee9f2196642">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_9
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad0c490e3965df546e2d5a83edf423d95">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_ADD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9d2fefa9a3f6037f48b247e66dd28c35">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_COMMA
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa900e3bb0bc4ff70ba786f18ff4db0bd1">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_DIVIDE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac108b744e8f93af69158d146425236c">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_DOT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6aab6b5914e120b43b3a1a8269e9cee1">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_ENTER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa79432be5f7a44e99ddc3721fd9fd212e">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_EQUALS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c1007a59641499ee5e1508e747c5ed">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_LEFT_PAREN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacc903e9eb495cf6cef7c6bc825f82f54">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_MULTIPLY
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47ce00b838e7ee0a34066dc2595ac735">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_RIGHT_PAREN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7662e0f2a099239dc69f6a27c7daabf9">keycodes.h</a>
-</li>
-<li>AKEYCODE_NUMPAD_SUBTRACT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bee314dbbea0a349eb301d10256bbe">keycodes.h</a>
-</li>
-<li>AKEYCODE_O
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa249667bc4a59d99be1914535877329fb">keycodes.h</a>
-</li>
-<li>AKEYCODE_P
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac68ef56b78bd0c8626cc68bb6cb9156f">keycodes.h</a>
-</li>
-<li>AKEYCODE_PAGE_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0b7fe1c18f53e6328657858a88826393">keycodes.h</a>
-</li>
-<li>AKEYCODE_PAGE_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4fd0d4ea5b6898f4a40011b97a739a04">keycodes.h</a>
-</li>
-<li>AKEYCODE_PAIRING
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0ecddd3dce52cf60c96c5d430b1f553">keycodes.h</a>
-</li>
-<li>AKEYCODE_PERIOD
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9dd68c8ecebd4e274e8c357dcdfe8a04">keycodes.h</a>
-</li>
-<li>AKEYCODE_PICTSYMBOLS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacdc7c004da1594fa156de87befef5f41">keycodes.h</a>
-</li>
-<li>AKEYCODE_PLUS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7f72d867b311e0845aef732dcc66495">keycodes.h</a>
-</li>
-<li>AKEYCODE_POUND
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf448758c44899e41b67f76dfe3be51e9">keycodes.h</a>
-</li>
-<li>AKEYCODE_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_BLUE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e82219fdb937fee5a22426c607dd4e0">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_GREEN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad50c1e2136e47843a8dabca929f8ead1">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_RED
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2d9e3e82e69955f649b586f4518e074c">keycodes.h</a>
-</li>
-<li>AKEYCODE_PROG_YELLOW
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafa813640412bd41a181f0ec3a33dddc4">keycodes.h</a>
-</li>
-<li>AKEYCODE_Q
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa932cf6ea8d87e6d6d97af658dd0fa206">keycodes.h</a>
-</li>
-<li>AKEYCODE_R
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaba25ac2c15a8edbbbff16a9fe6e74532">keycodes.h</a>
-</li>
-<li>AKEYCODE_RIGHT_BRACKET
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa084dfa52626040a08d374f8aec066e6a">keycodes.h</a>
-</li>
-<li>AKEYCODE_RO
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae8b0af04dac5ea56fd55e577fd9e6be4">keycodes.h</a>
-</li>
-<li>AKEYCODE_S
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae1ed25c28a8fce578cddb17ca6888ff6">keycodes.h</a>
-</li>
-<li>AKEYCODE_SCROLL_LOCK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa78ff5c8316235635f76e3c3179e9a7fc">keycodes.h</a>
-</li>
-<li>AKEYCODE_SEARCH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac644fd307fd0ef0d3ed3d2e074c1a4b7">keycodes.h</a>
-</li>
-<li>AKEYCODE_SEMICOLON
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac0a2920161f4f2d97b0b060614b23391">keycodes.h</a>
-</li>
-<li>AKEYCODE_SETTINGS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bbd457230c3028df6b91d5bdda9159">keycodes.h</a>
-</li>
-<li>AKEYCODE_SHIFT_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafb9875645596928cec46368e74499dc4">keycodes.h</a>
-</li>
-<li>AKEYCODE_SHIFT_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf9eab1348ae1e8f18ad5bf3c77df4212">keycodes.h</a>
-</li>
-<li>AKEYCODE_SLASH
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa54c047be3811d637a33d9b3e39d16e1a">keycodes.h</a>
-</li>
-<li>AKEYCODE_SLEEP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafc077e5a6b447ea060c144f6e65bd207">keycodes.h</a>
-</li>
-<li>AKEYCODE_SOFT_LEFT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2dc78d3a93876b77402d2a7f02e4b899">keycodes.h</a>
-</li>
-<li>AKEYCODE_SOFT_RIGHT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8cadfbfcaaa83fef168de13639adfcae">keycodes.h</a>
-</li>
-<li>AKEYCODE_SPACE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa10389300ac5d70f8d9733564b3cab4e7">keycodes.h</a>
-</li>
-<li>AKEYCODE_STAR
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1461fbf54e3dcba96e5d6d0638c18305">keycodes.h</a>
-</li>
-<li>AKEYCODE_STB_INPUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa988b0372359b2bca7390878fdba9e1b5">keycodes.h</a>
-</li>
-<li>AKEYCODE_STB_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab28aea3a51b11c9f227ce8cd5ff55a3d">keycodes.h</a>
-</li>
-<li>AKEYCODE_SWITCH_CHARSET
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad6a1f88b2cc3b6ff8f1724eb01473ec3">keycodes.h</a>
-</li>
-<li>AKEYCODE_SYM
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c1c6752d5db5e02da51d8937e5e3c6f">keycodes.h</a>
-</li>
-<li>AKEYCODE_SYSRQ
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14e22c69bcd47ffb4445ee18a4332d84">keycodes.h</a>
-</li>
-<li>AKEYCODE_T
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2feac8b458ef8eb9c0a0dd73766927c2">keycodes.h</a>
-</li>
-<li>AKEYCODE_TAB
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1b1bfda850b2acd0b60e8456e2bfa958">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0776ffae512b4848e53fce762a3a5017">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_ANTENNA_CABLE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe33a80d6d3bf889af25cbd77fdb89f9">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_AUDIO_DESCRIPTION
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa419f0adac43cad104cd6cf83dc5f13f6">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5fca6a9ec1ce246bf3c53d859ac9f5eb">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaccc5900ca5dd399d5ce11dd8ca324678">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_CONTENTS_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4c18feeafff3c41081073c025ee017b8">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_DATA_SERVICE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa954c2251b2cb53f47637802cb66baf06">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1750b29e396bd1fd237ed4aadacc8f5">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPONENT_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa156e2dba81e7c73624ccf8c2ef8833ae">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPONENT_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8db9b6ee1457267abea03430781bb0ec">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPOSITE_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c3097f14c6582958ba1d14d70115ccd">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_COMPOSITE_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaada13cbb9d619bc610678ad66325647b9">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a50de965f50ab3aa42772aac0808445">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_2
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7ec65c008471d771bf879ec012f5c7f">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_3
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a0f267a2696d15bf16127121b1f1c7f">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_HDMI_4
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4437c1d8d2d33058cfa71ec7b2771ec5">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_INPUT_VGA_1
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa149b2c8a4817075c0a41e0adf11c8e85">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_MEDIA_CONTEXT_MENU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaadde70071f6a432f367079efa6e1a6fe">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_NETWORK
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec5e46a5afc57953d1772e086307aa42">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_NUMBER_ENTRY
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa630a08e07a3b4c6bcac9a1a72d176055">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_POWER
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafda3b0ea1b158831fc443bf4911a3930">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_RADIO_SERVICE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93dd3fd752701af5a5491e01cc15db72">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3707d4396417535a611e4548afe33936">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE_BS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8c52e7d06525c0ee5d943d63a0fa8ea5">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE_CS
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4eea1809a9ff679ed7773332d728c6b0">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_SATELLITE_SERVICE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17c0e68066b86610ff168c6367af36eb">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TELETEXT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3d7b89756df37f01d6d0f13beff1db">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TERRESTRIAL_ANALOG
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14f2b6fe8550832ef9e3f9aa53164073">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TERRESTRIAL_DIGITAL
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacad8c149251a78760a5fe4931b9cdf16">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_TIMER_PROGRAMMING
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0293c2a63e4d955080334bef6640840">keycodes.h</a>
-</li>
-<li>AKEYCODE_TV_ZOOM_MODE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8e79045045293070c8eb9e408f1335b4">keycodes.h</a>
-</li>
-<li>AKEYCODE_U
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac1a220314f986aae45d7fe3b35501595">keycodes.h</a>
-</li>
-<li>AKEYCODE_UNKNOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa593f8ae18990d627785719284a12a6f">keycodes.h</a>
-</li>
-<li>AKEYCODE_V
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4043bc48fa55cce7825176052d6e199a">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOICE_ASSIST
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95898663b7f74c93d0b860a43528c744">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOLUME_DOWN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a882dae17080d3b5f3329e79db60c66">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOLUME_MUTE
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa174a5c7c39753235109696e82870c575">keycodes.h</a>
-</li>
-<li>AKEYCODE_VOLUME_UP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5b81e325d9efd633eef7535a5b538882">keycodes.h</a>
-</li>
-<li>AKEYCODE_W
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0c80e98547c3daa01f3d9e7f4f00425">keycodes.h</a>
-</li>
-<li>AKEYCODE_WAKEUP
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa903c5152d26b3011ae521afa06759429">keycodes.h</a>
-</li>
-<li>AKEYCODE_WINDOW
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe7531c40ff4a31614ff6fd61802ebe8">keycodes.h</a>
-</li>
-<li>AKEYCODE_X
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec585cebac89004faffbdc28dc6d81c5">keycodes.h</a>
-</li>
-<li>AKEYCODE_Y
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06fc277ef25acdd89d64c18eed0daa9b">keycodes.h</a>
-</li>
-<li>AKEYCODE_YEN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ee19d21912056b902e283efa2d9d14b">keycodes.h</a>
-</li>
-<li>AKEYCODE_Z
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7439a09f219a0addc13c758ef7508cce">keycodes.h</a>
-</li>
-<li>AKEYCODE_ZENKAKU_HANKAKU
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf782be8df9a8ca5dc86c9bfeabac6f22">keycodes.h</a>
-</li>
-<li>AKEYCODE_ZOOM_IN
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacfce9bb78ef8106dce4868f81cca4fb4">keycodes.h</a>
-</li>
-<li>AKEYCODE_ZOOM_OUT
-: <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf035f5234c3df4589f35a50e99e0535">keycodes.h</a>
-</li>
-<li>ALOOPER_EVENT_ERROR
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a14016d8f39373b8ce061276a957960f6">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_HANGUP
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a5e7fb5acdecef18b2c293f6309e5d4ab">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_INPUT
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9ae3d18f8dd1faf6f34468df10667949bc">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_INVALID
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9aefe82c6ce8e02d13aceaebdec15c2aff">looper.h</a>
-</li>
-<li>ALOOPER_EVENT_OUTPUT
-: <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a71273fd07e009057e6e3475d10f8286d">looper.h</a>
-</li>
-<li>ALOOPER_POLL_CALLBACK
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a64fe936780bfd9927affaf8e8cc81cc2">looper.h</a>
-</li>
-<li>ALOOPER_POLL_ERROR
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409af8ebd4022f6f5d5fea864f6999b7e6b4">looper.h</a>
-</li>
-<li>ALOOPER_POLL_TIMEOUT
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a3fe4eec66dff78a9fa8afca02e8b8443">looper.h</a>
-</li>
-<li>ALOOPER_POLL_WAKE
-: <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a55528f1b28df17cc4b6317cc0d0fde47">looper.h</a>
-</li>
-<li>ALOOPER_PREPARE_ALLOW_NON_CALLBACKS
-: <a class="el" href="group___looper.html#ggaf9bdc3014f3d54c426b6d2df10de4960a1fff26ab5859b0308b58a3f8d58ef1eb">looper.h</a>
-</li>
-<li>AMETA_ALT_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca256c74b768ecee57e3218e81ae6945df">input.h</a>
-</li>
-<li>AMETA_ALT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caba44b1077427e4da1d202e0c8f772881">input.h</a>
-</li>
-<li>AMETA_ALT_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca985db074c0f44749ca86b5cc0454056a">input.h</a>
-</li>
-<li>AMETA_CAPS_LOCK_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafc467c98d509b0de28b298801a0c3e37">input.h</a>
-</li>
-<li>AMETA_CTRL_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca752c837afd5ff0fcf75ddee7b6808be6">input.h</a>
-</li>
-<li>AMETA_CTRL_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cabe927318a2a11a46be3e9d78dbd81ef5">input.h</a>
-</li>
-<li>AMETA_CTRL_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca0ab007e367ae136b873b3e6636747419">input.h</a>
-</li>
-<li>AMETA_FUNCTION_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca545b31b72b0454c22c170ff534ddfdf1">input.h</a>
-</li>
-<li>AMETA_META_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca6f923de8f2cd72e3ad86149c0747906f">input.h</a>
-</li>
-<li>AMETA_META_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca9c04e7c2ad1f0f41af60402188a29c4a">input.h</a>
-</li>
-<li>AMETA_META_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafdf56d1259ae16c97161c443d7949bdf">input.h</a>
-</li>
-<li>AMETA_NONE
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cae0a3cb26517b3f876beb37594494526d">input.h</a>
-</li>
-<li>AMETA_NUM_LOCK_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca15d234534a6870add5594f02b7333dc6">input.h</a>
-</li>
-<li>AMETA_SCROLL_LOCK_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafe8dacdc6566f655a3eab73ea4a9af5a">input.h</a>
-</li>
-<li>AMETA_SHIFT_LEFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa01fa027cdd8951530437bcbe04c3ed7">input.h</a>
-</li>
-<li>AMETA_SHIFT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa3d5f49c3a55b653a94c798a2c93b197">input.h</a>
-</li>
-<li>AMETA_SHIFT_RIGHT_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cac52930581c339216218a6f50c5b57aa1">input.h</a>
-</li>
-<li>AMETA_SYM_ON
-: <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca8af1e90950a728baca807a83e50b22ea">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_CANCEL
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a3952b960f5eb8c4f55b42741e286b74e">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_DOWN
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a225e61c48ba334abc1b5811db02edcf1">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_HOVER_ENTER
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a247b2c60ad92f3130ad43c907986ffb3">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_HOVER_EXIT
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600ac00b1eacfbea779863abf3fcf02134aa">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_HOVER_MOVE
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a84bc9fb3c01ff7ca9ee452a510e7de60">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_MASK
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600abf84a22c84d4b7228102b80f3af92a4f">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_MOVE
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a41c56c4e772953fce60c93bc671639a3">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_OUTSIDE
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_DOWN
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a1618c641fd3f49fa7483f298d05b3cd2">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_INDEX_MASK
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a51384339fbb57c0087f7f50c45d9cff3">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_POINTER_UP
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600af2ef56aa7220eeb2073b9b028737bc1e">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_SCROLL
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a45ba62b1e6fab4e84d5782d7c35ced04">input.h</a>
-</li>
-<li>AMOTION_EVENT_ACTION_UP
-: <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a43798b2b7a6de4616d150b2438b8419e">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_BRAKE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae3a99764f3681dd9e094852bb2489ece">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_DISTANCE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae800909411a1e83173b0eef7aa458d0e">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GAS
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0223f235a6044815918af2abafcbf16">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_1
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadcc18afd3a7069412617df34db5a27bc">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_10
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da29ba08f4ddc658e0127ee5bc08d185f2">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_11
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafc64a4b307f62bb12b645918aa7edb57">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_12
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae5d32b3e9cec4936ae1e074f320c3063">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_13
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f19f5bc52e5eaec5ebd4f07aad12180">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_14
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadb866d826ecf25161d7c7f86166e149b">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_15
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da7e86befc8502b8df687284f3c40b2eca">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_16
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daaaa011ba929b18c6da71153638f92336">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_2
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac4addf06abfa6c76f0578ddde049aad5">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_3
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac7df57ef5082e10be83f66d7477bce9c">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_4
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da321873d126b7d545665096694cb7d9d9">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_5
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da9b47cef7060197e1b0302a8a718c3085">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_6
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daad7e47a1b5fb66864b6d988374f50a84">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_7
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da222c06f51a60e59504b635dbf89a025b">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_8
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab59a8a373a913e40b146ed762976d6fe">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_GENERIC_9
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da721fa0fbca8b22f1ecc8d3870f4e7443">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_HAT_X
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da04245c76cb9b32dcba920661f11ac9da">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_HAT_Y
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da98c323321d908db459e7cf86a7e8a482">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_HSCROLL
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da92955e6b0f3f82af66a505c854e9edff">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_LTRIGGER
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae4c65c3b1bd2946ff9e18c6041cdb591">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_ORIENTATION
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da114f2b3fc233ccf7a4470787c31457d2">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_PRESSURE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da3b4fd0f17cfdeb6a055babecd2b0ded8">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RTRIGGER
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da116e80c6be166290ca481fefa5de38c1">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RUDDER
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da318a0782f895949407fc192fc4280257">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RX
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da689b612864177d6b57d4181442e3e38e">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RY
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa20188da209300e1f80f6f5bd4058e13">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_RZ
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da381948b3321afd390ad164345eb9206b">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_SIZE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da4baba3ccaec881089a864ba6deaf8bd6">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_THROTTLE
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da6d1f5d64e607104964eb43d8fae07a4f">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TILT
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafca0a235f69c4b38bfc95e7a7b8d9ab1">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOOL_MAJOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa273d64c392f86ae789fd5e24661ba0a">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOOL_MINOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadebd200b37ffaf36b94e7e478c559142">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOUCH_MAJOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da792b9e01044a2e43e7f80e5559db20c2">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_TOUCH_MINOR
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa8b24b0f01f24898a36e5751c8eca63c">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_VSCROLL
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dad11be04b4b81715cad905ee9fa348e99">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_WHEEL
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0ae83ebd74e672bb35378b92a440b1d">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_X
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f4b5b009634039a1f361048a5fc6064">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_Y
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da64f7de8558265bd8179d206eb33eff6c">input.h</a>
-</li>
-<li>AMOTION_EVENT_AXIS_Z
-: <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5a689e572da9bc5feafcb6c011368305">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_BACK
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a1841d075a2992ff7fbefa3fd50189b86">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_FORWARD
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a4105edf43f7748c52c859cc5aa7dc438">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_PRIMARY
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ab388f65477b9dd4c51e6367111168d65">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_SECONDARY
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a08118700ecb4e147528a0e725afc9451">input.h</a>
-</li>
-<li>AMOTION_EVENT_BUTTON_TERTIARY
-: <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ae6e2af1e7065e035e8a10a595827180f">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_BOTTOM
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388ad8b662839787e1c7dd2616f32c02aaeb">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_LEFT
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388afb70c13f16daade25ba8132a5ea3cf52">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_NONE
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a37dd7496968e6defbecc3c8d6ab2734d">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_RIGHT
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a7d45674e03f1876a43d4810508905078">input.h</a>
-</li>
-<li>AMOTION_EVENT_EDGE_FLAG_TOP
-: <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a915e1ade9b600d11a3c70a17a88de757">input.h</a>
-</li>
-<li>AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED
-: <a class="el" href="group___input.html#ggab04a0655cd1e3bcac5e8f48c18df1a57a200623e1e4eee7797cad30917d289d7a">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_ERASER
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf9932f65b5b6b5800fb5873a60dbf0cb">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_FINGER
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eafd789262defb8a268fa80d26b0c30bcc">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_MOUSE
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7be0c750d7d6719e7c948914400ae0de">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_STYLUS
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf05dc95a74e560c89cec1f3100185fc7">input.h</a>
-</li>
-<li>AMOTION_EVENT_TOOL_TYPE_UNKNOWN
-: <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7e1ea0c955ebbac1349866e8995e0208">input.h</a>
-</li>
-<li>ANATIVEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY
-: <a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a642e76508cc737bbc1df149756c2a807">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS
-: <a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a0f4cbb55fa4c29b963b7b37d13352e6f">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED
-: <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a324062ac78fab16b40e8de1b1ae173b5">native_activity.h</a>
-</li>
-<li>ANATIVEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT
-: <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a9b7250ac0e5a626a81b176462a9df7c9">native_activity.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_A_8
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ad29996be25f8f88c96e016a1da5c4bca">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_NONE
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ac6f0378ea5cfefd9abee2596af5a9021">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_RGB_565
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13a11b32e10d6db28fae70ec3590cb9ee91">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_RGBA_4444
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13adc2ede06eafe20439271cb8137dc7528">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_FORMAT_RGBA_8888
-: <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ab92ae96ceea06aa534583beadba84057">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_ALLOCATION_FAILED
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a512f5b95b6b57e78d65502c06391f990">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_BAD_PARAMETER
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7acf7205d1a348d867c63ac2885ce01374">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_JNI_EXCEPTION
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a6b099b9533c38729a6c305f2fe93f98d">bitmap.h</a>
-</li>
-<li>ANDROID_BITMAP_RESULT_SUCCESS
-: <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">bitmap.h</a>
-</li>
-<li>AOBB_STATE_ERROR_ALREADY_MOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a8b074af151167a965a550b9829fafb37">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_COULD_NOT_MOUNT
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a324da2b8fea5875339d442d1f2d0b45b">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_COULD_NOT_UNMOUNT
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a1f2b51b53fc57b57a9967f6ce0c88dbe">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_INTERNAL
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a50642881107d6673aace1494a5d6fce2">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_NOT_MOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a3ce8539aa8b531c9de1d16041322d7a8">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_ERROR_PERMISSION_DENIED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2467a4b6a634680e12c288a7790ff66c">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_MOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2a9c420e6008c108a7198fd861c042d5">storage_manager.h</a>
-</li>
-<li>AOBB_STATE_UNMOUNTED
-: <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a6710bb5b68cfc115eedcde2aafd8a667">storage_manager.h</a>
-</li>
-<li>AOBBINFO_OVERLAY
-: <a class="el" href="group___storage.html#ggae4d5251432e1a9e6803c0240cc492e18a33e2ae83b4c25d33a4335dccf1de1c3a">obb.h</a>
-</li>
-<li>AREPORTING_MODE_CONTINUOUS
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8a64337fcb7e338d487dc3edc873df1c">sensor.h</a>
-</li>
-<li>AREPORTING_MODE_ON_CHANGE
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8542165ae195bf5784cdd9ba66bd2ab5">sensor.h</a>
-</li>
-<li>AREPORTING_MODE_ONE_SHOT
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa002273a1ab874159a38a7e3f6bb6a7bb">sensor.h</a>
-</li>
-<li>AREPORTING_MODE_SPECIAL_TRIGGER
-: <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181faa2d29656b35889c4c23318982e847ae7">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_ACCURACY_HIGH
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a2df5fb4e8b684e6a801a4aff9f50ba13">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_ACCURACY_LOW
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a5f306f3d45a19573539462e4c813edc0">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_ACCURACY_MEDIUM
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ad7e9379a4f36a42f2659cd7aec214f2d">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_NO_CONTACT
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae5d0475bd9491c4232a09afc81fa283d">sensor.h</a>
-</li>
-<li>ASENSOR_STATUS_UNRELIABLE
-: <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae8e43df50b7b85ed54f22c40f2cd748e">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_ACCELEROMETER
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167bad72017f34c12971593a8cb14f4f254df">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_GYROSCOPE
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba80e9827f6c3ded009f354dc7078a2c68">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_LIGHT
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba105331b6dea6f08e0d8fe3b736f8c174">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_MAGNETIC_FIELD
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba3b31509a3efebafb413e78f5ec9ae0e8">sensor.h</a>
-</li>
-<li>ASENSOR_TYPE_PROXIMITY
-: <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba0c6a2e526ed2e4442b3843976f906932">sensor.h</a>
-</li>
-<li>AWINDOW_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa67363c129036872bc9dd29557e807508">window.h</a>
-</li>
-<li>AWINDOW_FLAG_ALT_FOCUSABLE_IM
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa961ff4c9c0903cfb8867d961bebe1659">window.h</a>
-</li>
-<li>AWINDOW_FLAG_BLUR_BEHIND
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa0377f46a626d411ace179c1c27d0a3f7">window.h</a>
-</li>
-<li>AWINDOW_FLAG_DIM_BEHIND
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6155e77ae4e12cc56fb3f6f55f56bf6f">window.h</a>
-</li>
-<li>AWINDOW_FLAG_DISMISS_KEYGUARD
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa37c1077a12f1c8c6805b1da6f7bb213a">window.h</a>
-</li>
-<li>AWINDOW_FLAG_DITHER
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae73488b436aaea163ba2f7051bf93d9d">window.h</a>
-</li>
-<li>AWINDOW_FLAG_FORCE_NOT_FULLSCREEN
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa4c21235db629d3937f87ffe98cd6fe5d">window.h</a>
-</li>
-<li>AWINDOW_FLAG_FULLSCREEN
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaca1f1d91313d7c32bb7982d8a5abcd71">window.h</a>
-</li>
-<li>AWINDOW_FLAG_IGNORE_CHEEK_PRESSES
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaa2fe4ee2307bb814a37a043de6d7d326">window.h</a>
-</li>
-<li>AWINDOW_FLAG_KEEP_SCREEN_ON
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8">window.h</a>
-</li>
-<li>AWINDOW_FLAG_LAYOUT_IN_SCREEN
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6978968d7e0dc1a0e12f58ad395a959a">window.h</a>
-</li>
-<li>AWINDOW_FLAG_LAYOUT_INSET_DECOR
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa97b8542941bfe613bcf92357be89b563">window.h</a>
-</li>
-<li>AWINDOW_FLAG_LAYOUT_NO_LIMITS
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffade9722581a203ee0db25d42f4d2bd389">window.h</a>
-</li>
-<li>AWINDOW_FLAG_NOT_FOCUSABLE
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">window.h</a>
-</li>
-<li>AWINDOW_FLAG_NOT_TOUCH_MODAL
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09">window.h</a>
-</li>
-<li>AWINDOW_FLAG_NOT_TOUCHABLE
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae9f1278ffa6fe9c12c2305d4f4de1450">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SCALED
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa80316264eeae9681a56c1a2297bf465a">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SECURE
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa8ff70709a588a05781d7cb178b526cc0">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SHOW_WALLPAPER
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa952ae6ceebe94d3f0d666454548b8824">window.h</a>
-</li>
-<li>AWINDOW_FLAG_SHOW_WHEN_LOCKED
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">window.h</a>
-</li>
-<li>AWINDOW_FLAG_TOUCHABLE_WHEN_WAKING
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5574a513645e6e7cb4d6a9f4a043d773">window.h</a>
-</li>
-<li>AWINDOW_FLAG_TURN_SCREEN_ON
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffac4deee26ac742bbd0bb4c44fda140a01">window.h</a>
-</li>
-<li>AWINDOW_FLAG_WATCH_OUTSIDE_TOUCH
-: <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa35229f75b3309bafdd828cbbf27d05b6">window.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_eval_w.jd b/docs/html/ndk/reference/globals_eval_w.jd
deleted file mode 100644
index c996d30..0000000
--- a/docs/html/ndk/reference/globals_eval_w.jd
+++ /dev/null
@@ -1,20 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- 
-
-<h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
-<li>WINDOW_FORMAT_RGB_565
-: <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310ab26fa9c38f169263b611a8b757bb0259">native_window.h</a>
-</li>
-<li>WINDOW_FORMAT_RGBA_8888
-: <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a6a165383340acce0b32c555dd2ac2c01">native_window.h</a>
-</li>
-<li>WINDOW_FORMAT_RGBX_8888
-: <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a5f83a97ccf64fc1554c220476e8aaf30">native_window.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_func.jd b/docs/html/ndk/reference/globals_func.jd
deleted file mode 100644
index ae48353..0000000
--- a/docs/html/ndk/reference/globals_func.jd
+++ /dev/null
@@ -1,551 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- 
-
-<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
-<li>AAsset_close()
-: <a class="el" href="group___asset.html#ga1f241e49f691dafcada23bcb76155122">asset_manager.h</a>
-</li>
-<li>AAsset_getBuffer()
-: <a class="el" href="group___asset.html#ga553a14512a98542306238c3ce70d344f">asset_manager.h</a>
-</li>
-<li>AAsset_getLength()
-: <a class="el" href="group___asset.html#gaad8ec42e28522ebc72d3a5c357f9a600">asset_manager.h</a>
-</li>
-<li>AAsset_getLength64()
-: <a class="el" href="group___asset.html#ga55c8bc459327d5d23089e6a4b453f3f1">asset_manager.h</a>
-</li>
-<li>AAsset_getRemainingLength()
-: <a class="el" href="group___asset.html#gae806f55cbc4a93ca245f2adfd63d3eee">asset_manager.h</a>
-</li>
-<li>AAsset_getRemainingLength64()
-: <a class="el" href="group___asset.html#ga21e7221d88dcc44106843192b66755b5">asset_manager.h</a>
-</li>
-<li>AAsset_isAllocated()
-: <a class="el" href="group___asset.html#ga20344cb952a77fa1004f592fb1b55124">asset_manager.h</a>
-</li>
-<li>AAsset_openFileDescriptor()
-: <a class="el" href="group___asset.html#ga1af4ffd050016e99961e24f550981677">asset_manager.h</a>
-</li>
-<li>AAsset_openFileDescriptor64()
-: <a class="el" href="group___asset.html#ga123a44a575f85d91a00a8456dab7bd0a">asset_manager.h</a>
-</li>
-<li>AAsset_read()
-: <a class="el" href="group___asset.html#gaadd86322c1fda5121b6d33745c317fb9">asset_manager.h</a>
-</li>
-<li>AAsset_seek()
-: <a class="el" href="group___asset.html#gacc026a8bedeb1ef80bf12df3b72611a2">asset_manager.h</a>
-</li>
-<li>AAsset_seek64()
-: <a class="el" href="group___asset.html#ga81fbe4368de24a3296ef7a6eba0053c7">asset_manager.h</a>
-</li>
-<li>AAssetDir_close()
-: <a class="el" href="group___asset.html#gace1c4d0da274d643c5b10ca218cc6088">asset_manager.h</a>
-</li>
-<li>AAssetDir_getNextFileName()
-: <a class="el" href="group___asset.html#ga4703b9f7baa3daeba248b6547de6b9b0">asset_manager.h</a>
-</li>
-<li>AAssetDir_rewind()
-: <a class="el" href="group___asset.html#ga45db6d19ad5e1c0f9b2e6b4059da14b3">asset_manager.h</a>
-</li>
-<li>AAssetManager_fromJava()
-: <a class="el" href="group___asset.html#gadfd6537af41577735bcaee52120127f4">asset_manager_jni.h</a>
-</li>
-<li>AAssetManager_open()
-: <a class="el" href="group___asset.html#ga0037ce3c10a591fe632f34c1aa62955c">asset_manager.h</a>
-</li>
-<li>AAssetManager_openDir()
-: <a class="el" href="group___asset.html#gab5b57ff012d6d1024d8bf5d30aedced4">asset_manager.h</a>
-</li>
-<li>AConfiguration_copy()
-: <a class="el" href="group___configuration.html#gaabff04218a0a76afb8d3ea551b001565">configuration.h</a>
-</li>
-<li>AConfiguration_delete()
-: <a class="el" href="group___configuration.html#ga60fe264b97da84d3370eb9e220159e6d">configuration.h</a>
-</li>
-<li>AConfiguration_diff()
-: <a class="el" href="group___configuration.html#gabfe69b0dccae425a16fe94d084f20402">configuration.h</a>
-</li>
-<li>AConfiguration_fromAssetManager()
-: <a class="el" href="group___configuration.html#ga75e061fd0b4f761e08e43af36508c4f3">configuration.h</a>
-</li>
-<li>AConfiguration_getCountry()
-: <a class="el" href="group___configuration.html#gad2b47f787012a82a67a20e5de5211d46">configuration.h</a>
-</li>
-<li>AConfiguration_getDensity()
-: <a class="el" href="group___configuration.html#ga4c994e0555947340582094c3da32a663">configuration.h</a>
-</li>
-<li>AConfiguration_getKeyboard()
-: <a class="el" href="group___configuration.html#gafd0f76ccd4fe4bda5172b8e0bc6675e4">configuration.h</a>
-</li>
-<li>AConfiguration_getKeysHidden()
-: <a class="el" href="group___configuration.html#ga7a8317ab975f621f3fe62ed1b44f2605">configuration.h</a>
-</li>
-<li>AConfiguration_getLanguage()
-: <a class="el" href="group___configuration.html#ga7b004c13448704afb0ea2040d69468c1">configuration.h</a>
-</li>
-<li>AConfiguration_getLayoutDirection()
-: <a class="el" href="group___configuration.html#ga13dbf2fc9a382c62b391e7de9cf9b468">configuration.h</a>
-</li>
-<li>AConfiguration_getMcc()
-: <a class="el" href="group___configuration.html#ga1e78004237a931086d2ae4bd8324bd30">configuration.h</a>
-</li>
-<li>AConfiguration_getMnc()
-: <a class="el" href="group___configuration.html#ga4783776a4fad4501898472375d781fb9">configuration.h</a>
-</li>
-<li>AConfiguration_getNavHidden()
-: <a class="el" href="group___configuration.html#gafe8d3a9c2f715ea76c8e4a99c2db9eaa">configuration.h</a>
-</li>
-<li>AConfiguration_getNavigation()
-: <a class="el" href="group___configuration.html#gae3ff1541b63f5b9256f7c0ebae372977">configuration.h</a>
-</li>
-<li>AConfiguration_getOrientation()
-: <a class="el" href="group___configuration.html#gaa7d8e3e9871dc925fef3e342a92e4e22">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenHeightDp()
-: <a class="el" href="group___configuration.html#ga9905a4765f8d0d921c476ebce01c7648">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenLong()
-: <a class="el" href="group___configuration.html#gab7d1f5aa59e8fa4db0a1b91bb322034c">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenSize()
-: <a class="el" href="group___configuration.html#ga9d2c1b8731795d8e74be7e23cbc77552">configuration.h</a>
-</li>
-<li>AConfiguration_getScreenWidthDp()
-: <a class="el" href="group___configuration.html#ga61e5fe9612c170c33e1c7e9fb92f2219">configuration.h</a>
-</li>
-<li>AConfiguration_getSdkVersion()
-: <a class="el" href="group___configuration.html#ga4aa7062198e5aacd9fabb04d0453dd91">configuration.h</a>
-</li>
-<li>AConfiguration_getSmallestScreenWidthDp()
-: <a class="el" href="group___configuration.html#ga7fc015e41fad342edba66a003d9848aa">configuration.h</a>
-</li>
-<li>AConfiguration_getTouchscreen()
-: <a class="el" href="group___configuration.html#gad305e6cf86fa915c24212e71bb2bf027">configuration.h</a>
-</li>
-<li>AConfiguration_getUiModeNight()
-: <a class="el" href="group___configuration.html#ga447f16a9e4f8400e5e0328900749ff16">configuration.h</a>
-</li>
-<li>AConfiguration_getUiModeType()
-: <a class="el" href="group___configuration.html#ga1d75777892f38208feb3d2a94a977fcf">configuration.h</a>
-</li>
-<li>AConfiguration_isBetterThan()
-: <a class="el" href="group___configuration.html#gafd2bb31057c8d57efcea7603458d2a8d">configuration.h</a>
-</li>
-<li>AConfiguration_match()
-: <a class="el" href="group___configuration.html#gafb27b901a1d7d44ed866608fb8399a18">configuration.h</a>
-</li>
-<li>AConfiguration_new()
-: <a class="el" href="group___configuration.html#ga9543655922980466eb05c7be94a0a567">configuration.h</a>
-</li>
-<li>AConfiguration_setCountry()
-: <a class="el" href="group___configuration.html#gac2f5d414a6466634b1639b5c6f8879ac">configuration.h</a>
-</li>
-<li>AConfiguration_setDensity()
-: <a class="el" href="group___configuration.html#ga9217af9858a7166dcb9a877192779eac">configuration.h</a>
-</li>
-<li>AConfiguration_setKeyboard()
-: <a class="el" href="group___configuration.html#ga4ab3429c5505c108c09349f1ddef572f">configuration.h</a>
-</li>
-<li>AConfiguration_setKeysHidden()
-: <a class="el" href="group___configuration.html#ga5a80a02aa10cfa17de0795054e927183">configuration.h</a>
-</li>
-<li>AConfiguration_setLanguage()
-: <a class="el" href="group___configuration.html#ga1f3c6cf6667655f83777acda7387ddff">configuration.h</a>
-</li>
-<li>AConfiguration_setLayoutDirection()
-: <a class="el" href="group___configuration.html#gaaf47215cf551594f8c2a0594419b47e1">configuration.h</a>
-</li>
-<li>AConfiguration_setMcc()
-: <a class="el" href="group___configuration.html#gae6198b4eaf3e34168f4b13b8b5975d93">configuration.h</a>
-</li>
-<li>AConfiguration_setMnc()
-: <a class="el" href="group___configuration.html#gaaf060ef69c3636f62e90ae0b520eecb8">configuration.h</a>
-</li>
-<li>AConfiguration_setNavHidden()
-: <a class="el" href="group___configuration.html#ga67e86e0347596421771af841710308d5">configuration.h</a>
-</li>
-<li>AConfiguration_setNavigation()
-: <a class="el" href="group___configuration.html#gad21dd14fb823a6a80b66132a05ce8913">configuration.h</a>
-</li>
-<li>AConfiguration_setOrientation()
-: <a class="el" href="group___configuration.html#gadcaa8540bad4172a74032143bcaade04">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenHeightDp()
-: <a class="el" href="group___configuration.html#ga6ffac3b41415ec8a3031737ccdcd63b8">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenLong()
-: <a class="el" href="group___configuration.html#gaed853ab7e2bc915591d05997130bc448">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenSize()
-: <a class="el" href="group___configuration.html#ga7bcf05150933ead34a01061d05ad3245">configuration.h</a>
-</li>
-<li>AConfiguration_setScreenWidthDp()
-: <a class="el" href="group___configuration.html#gafc51d45679095965fe3ba1abd402f120">configuration.h</a>
-</li>
-<li>AConfiguration_setSdkVersion()
-: <a class="el" href="group___configuration.html#ga06c66072902ee455011120188ca4810b">configuration.h</a>
-</li>
-<li>AConfiguration_setSmallestScreenWidthDp()
-: <a class="el" href="group___configuration.html#ga6b004c9585671efc5cebd96c1d43c4f0">configuration.h</a>
-</li>
-<li>AConfiguration_setTouchscreen()
-: <a class="el" href="group___configuration.html#ga0d51dbe710c1afe31ece4dd6a8c188ff">configuration.h</a>
-</li>
-<li>AConfiguration_setUiModeNight()
-: <a class="el" href="group___configuration.html#ga08df1e801afbe4a12411e393b8141e42">configuration.h</a>
-</li>
-<li>AConfiguration_setUiModeType()
-: <a class="el" href="group___configuration.html#gaec61e3cf91cd79e8b76a35bbcb15789d">configuration.h</a>
-</li>
-<li>AInputEvent_getDeviceId()
-: <a class="el" href="group___input.html#ga9dd3fd81e51dbfde19ab861541242aa1">input.h</a>
-</li>
-<li>AInputEvent_getSource()
-: <a class="el" href="group___input.html#gac90d4b497669dbc709ec9650db4e49be">input.h</a>
-</li>
-<li>AInputEvent_getType()
-: <a class="el" href="group___input.html#ga8292ae06aa8120c52d7380d228600b9c">input.h</a>
-</li>
-<li>AInputQueue_attachLooper()
-: <a class="el" href="group___input.html#ga900711156bfb58d1a4b158da7874930f">input.h</a>
-</li>
-<li>AInputQueue_detachLooper()
-: <a class="el" href="group___input.html#gaeebe9f83392ac79b31ca40a6fd4dbeff">input.h</a>
-</li>
-<li>AInputQueue_finishEvent()
-: <a class="el" href="group___input.html#ga17e87e0f35d47d729eac31a0dfb1ac33">input.h</a>
-</li>
-<li>AInputQueue_getEvent()
-: <a class="el" href="group___input.html#ga88de12e2b39787ba7d3e4ce2ea46a48c">input.h</a>
-</li>
-<li>AInputQueue_hasEvents()
-: <a class="el" href="group___input.html#ga2b72ad6ab5ef656e8c41163aa7871c96">input.h</a>
-</li>
-<li>AInputQueue_preDispatchEvent()
-: <a class="el" href="group___input.html#gadecd32e6c7aefa4a508b355550d3eaa9">input.h</a>
-</li>
-<li>AKeyEvent_getAction()
-: <a class="el" href="group___input.html#ga36ec0b59f98f86a7ca263ba91279896d">input.h</a>
-</li>
-<li>AKeyEvent_getDownTime()
-: <a class="el" href="group___input.html#gaf475b6f0860bdfca4ceea7bc46eab1a9">input.h</a>
-</li>
-<li>AKeyEvent_getEventTime()
-: <a class="el" href="group___input.html#gae3eac7d68195d1767c947ca267842696">input.h</a>
-</li>
-<li>AKeyEvent_getFlags()
-: <a class="el" href="group___input.html#ga2a18e98efe0c4ccb6f39bb13c555010e">input.h</a>
-</li>
-<li>AKeyEvent_getKeyCode()
-: <a class="el" href="group___input.html#ga6b01ecd60018a5445f4917a861ca9466">input.h</a>
-</li>
-<li>AKeyEvent_getMetaState()
-: <a class="el" href="group___input.html#gabdda62b40b22727af2fb41740bf4787b">input.h</a>
-</li>
-<li>AKeyEvent_getRepeatCount()
-: <a class="el" href="group___input.html#ga5358fe3ebbd4b5b2f88a4ad2eba6f885">input.h</a>
-</li>
-<li>AKeyEvent_getScanCode()
-: <a class="el" href="group___input.html#ga4a0a846b7a195aeb290dfcd2250137d9">input.h</a>
-</li>
-<li>ALooper_acquire()
-: <a class="el" href="group___looper.html#gae1ad7ac48ab01a34bfd25840c92ff07b">looper.h</a>
-</li>
-<li>ALooper_addFd()
-: <a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">looper.h</a>
-</li>
-<li>ALooper_forThread()
-: <a class="el" href="group___looper.html#ga741ccd90a0eb9209c6bddf2326d89e4a">looper.h</a>
-</li>
-<li>ALooper_pollAll()
-: <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">looper.h</a>
-</li>
-<li>ALooper_pollOnce()
-: <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">looper.h</a>
-</li>
-<li>ALooper_prepare()
-: <a class="el" href="group___looper.html#ga1a070b904dd957cc65af9eb5ef6dfa25">looper.h</a>
-</li>
-<li>ALooper_release()
-: <a class="el" href="group___looper.html#gab723c3c2ac2c66bc695913a194073727">looper.h</a>
-</li>
-<li>ALooper_removeFd()
-: <a class="el" href="group___looper.html#gaf7d68ed05698b251489b4f6c8e54daad">looper.h</a>
-</li>
-<li>ALooper_wake()
-: <a class="el" href="group___looper.html#gab2585652f8ae2e2444979194ebe32aaf">looper.h</a>
-</li>
-<li>AMotionEvent_getAction()
-: <a class="el" href="group___input.html#ga73ea2093cc2343675ac43dd08bef4247">input.h</a>
-</li>
-<li>AMotionEvent_getAxisValue()
-: <a class="el" href="group___input.html#ga9d364cdcebf85237f599b25861f38c21">input.h</a>
-</li>
-<li>AMotionEvent_getButtonState()
-: <a class="el" href="group___input.html#ga1aa7ebb749416491b6f0c55ae87ddf49">input.h</a>
-</li>
-<li>AMotionEvent_getDownTime()
-: <a class="el" href="group___input.html#gad44be7697e68891688cd7bcfaffec209">input.h</a>
-</li>
-<li>AMotionEvent_getEdgeFlags()
-: <a class="el" href="group___input.html#gad7e1f0caa4c27194d4a8756a18432299">input.h</a>
-</li>
-<li>AMotionEvent_getEventTime()
-: <a class="el" href="group___input.html#ga7e13fbf3cff0700b0b620284ebdd3a33">input.h</a>
-</li>
-<li>AMotionEvent_getFlags()
-: <a class="el" href="group___input.html#ga2891d19197c070207098fa48adeb35af">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalAxisValue()
-: <a class="el" href="group___input.html#ga7ca740e1324f3cdb934252dce0c982d0">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalEventTime()
-: <a class="el" href="group___input.html#ga523f1a760754206965b42b08d62f9346">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalOrientation()
-: <a class="el" href="group___input.html#gaab9cb8fa670175ecc73c75eed4e5cd3f">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalPressure()
-: <a class="el" href="group___input.html#gaa8e9352ee5b043b3e1b6e2062d491010">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalRawX()
-: <a class="el" href="group___input.html#ga5d36c2e7420001c86ae2aa1168fe6f83">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalRawY()
-: <a class="el" href="group___input.html#ga6deb0e7690a93aa53e5872c2691b69fe">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalSize()
-: <a class="el" href="group___input.html#ga0a04bb7ec12928db7e62645e7fad3a9e">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalToolMajor()
-: <a class="el" href="group___input.html#ga160a5830e791e8c42ae97f51b92233d2">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalToolMinor()
-: <a class="el" href="group___input.html#gafe01aa7576a6d1bce750fb8482355849">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalTouchMajor()
-: <a class="el" href="group___input.html#gaf437f223668b97f19ebdbad4b9cf4483">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalTouchMinor()
-: <a class="el" href="group___input.html#ga126715d966e989652aa1ae5d38e0e898">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalX()
-: <a class="el" href="group___input.html#ga49a8ca89ff377b5ed2355e8d7220ae07">input.h</a>
-</li>
-<li>AMotionEvent_getHistoricalY()
-: <a class="el" href="group___input.html#ga30fc4e5d3ce144955859f8c97b51b73d">input.h</a>
-</li>
-<li>AMotionEvent_getHistorySize()
-: <a class="el" href="group___input.html#ga0aef34c236db6d7a56a50bf590be7bcc">input.h</a>
-</li>
-<li>AMotionEvent_getMetaState()
-: <a class="el" href="group___input.html#ga5644f0d952e3dea57ba9f7ce51dff2bb">input.h</a>
-</li>
-<li>AMotionEvent_getOrientation()
-: <a class="el" href="group___input.html#gad28422998da15b789edcba6b8bc5d615">input.h</a>
-</li>
-<li>AMotionEvent_getPointerCount()
-: <a class="el" href="group___input.html#ga612e68d104adbc6d14d87510e8066bd8">input.h</a>
-</li>
-<li>AMotionEvent_getPointerId()
-: <a class="el" href="group___input.html#ga599e21a79c706807243a8ee31b116138">input.h</a>
-</li>
-<li>AMotionEvent_getPressure()
-: <a class="el" href="group___input.html#ga97fcaa6cd08c9d54b35711e482e06c8d">input.h</a>
-</li>
-<li>AMotionEvent_getRawX()
-: <a class="el" href="group___input.html#gafe45e29ef138cc30592237ce479837f0">input.h</a>
-</li>
-<li>AMotionEvent_getRawY()
-: <a class="el" href="group___input.html#ga5a09c3d742a93270861aa05f24257c23">input.h</a>
-</li>
-<li>AMotionEvent_getSize()
-: <a class="el" href="group___input.html#ga9b1f3c3df46b5269f9e74d2dd70c88a8">input.h</a>
-</li>
-<li>AMotionEvent_getToolMajor()
-: <a class="el" href="group___input.html#gac04099690f278a6a27191c2027b12a77">input.h</a>
-</li>
-<li>AMotionEvent_getToolMinor()
-: <a class="el" href="group___input.html#ga2222d459759ba4a8269647012d2718fb">input.h</a>
-</li>
-<li>AMotionEvent_getToolType()
-: <a class="el" href="group___input.html#ga2babe4e2e79952e004538f8f1878649c">input.h</a>
-</li>
-<li>AMotionEvent_getTouchMajor()
-: <a class="el" href="group___input.html#ga9ac18fe19534e07d80441582f489d471">input.h</a>
-</li>
-<li>AMotionEvent_getTouchMinor()
-: <a class="el" href="group___input.html#ga65f71e257b5fcb29dcbaaf59b3fcb3a7">input.h</a>
-</li>
-<li>AMotionEvent_getX()
-: <a class="el" href="group___input.html#ga22e255a5fa52761cd92ce78af91e9757">input.h</a>
-</li>
-<li>AMotionEvent_getXOffset()
-: <a class="el" href="group___input.html#ga7a94ce622eb78a17737fd8bddbf86e21">input.h</a>
-</li>
-<li>AMotionEvent_getXPrecision()
-: <a class="el" href="group___input.html#ga81a9be07673a01f43fd0241c7b4c254f">input.h</a>
-</li>
-<li>AMotionEvent_getY()
-: <a class="el" href="group___input.html#ga113f58a37e41f2a6c3007d68418edfa6">input.h</a>
-</li>
-<li>AMotionEvent_getYOffset()
-: <a class="el" href="group___input.html#ga7f6bd2c12d912f502c245b6ced6d3704">input.h</a>
-</li>
-<li>AMotionEvent_getYPrecision()
-: <a class="el" href="group___input.html#gae311e6e28bce4be905526f9ea71278ed">input.h</a>
-</li>
-<li>ANativeActivity_finish()
-: <a class="el" href="group___native_activity.html#ga4d872ae54a239704c06a0517e23cc0ad">native_activity.h</a>
-</li>
-<li>ANativeActivity_hideSoftInput()
-: <a class="el" href="group___native_activity.html#gaf673d6efea7ce517ef46ff2551b25944">native_activity.h</a>
-</li>
-<li>ANativeActivity_setWindowFlags()
-: <a class="el" href="group___native_activity.html#gaa1d091ca4a99b0ce570bab1c8c06f297">native_activity.h</a>
-</li>
-<li>ANativeActivity_setWindowFormat()
-: <a class="el" href="group___native_activity.html#gaec8b12decdf2b9841344e75c4c038c5a">native_activity.h</a>
-</li>
-<li>ANativeActivity_showSoftInput()
-: <a class="el" href="group___native_activity.html#ga14eaeb6190f266369023b04d8ab9dba7">native_activity.h</a>
-</li>
-<li>ANativeWindow_acquire()
-: <a class="el" href="group___native_activity.html#ga533876b57909243b238927344a6592db">native_window.h</a>
-</li>
-<li>ANativeWindow_fromSurface()
-: <a class="el" href="group___native_activity.html#ga774d0a87ec496b3940fcddccbc31fd9d">native_window_jni.h</a>
-</li>
-<li>ANativeWindow_getFormat()
-: <a class="el" href="group___native_activity.html#ga9e3a492a8300146b30d864f0ab22bb2e">native_window.h</a>
-</li>
-<li>ANativeWindow_getHeight()
-: <a class="el" href="group___native_activity.html#ga463ba99f6dee3edc1167a54e1ff7de15">native_window.h</a>
-</li>
-<li>ANativeWindow_getWidth()
-: <a class="el" href="group___native_activity.html#ga186f0040c5cb405a63d93889bb9a4ff1">native_window.h</a>
-</li>
-<li>ANativeWindow_lock()
-: <a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">native_window.h</a>
-</li>
-<li>ANativeWindow_release()
-: <a class="el" href="group___native_activity.html#gae944e98865b902bd924663785d7b0258">native_window.h</a>
-</li>
-<li>ANativeWindow_setBuffersGeometry()
-: <a class="el" href="group___native_activity.html#ga7b0652533998d61e1a3b542485889113">native_window.h</a>
-</li>
-<li>ANativeWindow_unlockAndPost()
-: <a class="el" href="group___native_activity.html#ga4dc9b687ead9034fbc11bf2d90f203f9">native_window.h</a>
-</li>
-<li>AndroidBitmap_getInfo()
-: <a class="el" href="group___bitmap.html#ga80292ee39d8a675928e38849742b54bf">bitmap.h</a>
-</li>
-<li>AndroidBitmap_lockPixels()
-: <a class="el" href="group___bitmap.html#ga2908d42fa4db286c34b7f8c11f29206f">bitmap.h</a>
-</li>
-<li>AndroidBitmap_unlockPixels()
-: <a class="el" href="group___bitmap.html#ga4aca91f37baddd42d0051dca8179d4ed">bitmap.h</a>
-</li>
-<li>AObbInfo_delete()
-: <a class="el" href="group___storage.html#gaec5a4428008f545e829486099298031a">obb.h</a>
-</li>
-<li>AObbInfo_getFlags()
-: <a class="el" href="group___storage.html#ga68d916570c756da9fd0d9096358300eb">obb.h</a>
-</li>
-<li>AObbInfo_getPackageName()
-: <a class="el" href="group___storage.html#ga1ec7eee61541fa5a9b578801a35b9cf3">obb.h</a>
-</li>
-<li>AObbInfo_getVersion()
-: <a class="el" href="group___storage.html#gacd8471c6d866cffe4a32f3b5997c782c">obb.h</a>
-</li>
-<li>AObbScanner_getObbInfo()
-: <a class="el" href="group___storage.html#ga7beb4f82e3bf9a4b8197917f92ac4d5e">obb.h</a>
-</li>
-<li>ASensor_getFifoMaxEventCount()
-: <a class="el" href="group___sensor.html#gae9969580eda319926a677a6937c7afb1">sensor.h</a>
-</li>
-<li>ASensor_getFifoReservedEventCount()
-: <a class="el" href="group___sensor.html#gaec7084c6a9d4d85f87c95a70511c5f53">sensor.h</a>
-</li>
-<li>ASensor_getMinDelay()
-: <a class="el" href="group___sensor.html#gacb6e021757c07344b58742611eaf68e7">sensor.h</a>
-</li>
-<li>ASensor_getName()
-: <a class="el" href="group___sensor.html#ga52f4b22990c70df0784b9ccf23314fae">sensor.h</a>
-</li>
-<li>ASensor_getReportingMode()
-: <a class="el" href="group___sensor.html#ga99e56b84cf421788c27998da8eab7e39">sensor.h</a>
-</li>
-<li>ASensor_getResolution()
-: <a class="el" href="group___sensor.html#ga3da2930dd866cf1f76da6bc39e578a46">sensor.h</a>
-</li>
-<li>ASensor_getStringType()
-: <a class="el" href="group___sensor.html#gabee3eb65390fc75a639c59d653af3591">sensor.h</a>
-</li>
-<li>ASensor_getType()
-: <a class="el" href="group___sensor.html#ga93962747ab3c7d2b609f97af26fc0230">sensor.h</a>
-</li>
-<li>ASensor_getVendor()
-: <a class="el" href="group___sensor.html#gafaf467fc71f7adba537a90f166e3320d">sensor.h</a>
-</li>
-<li>ASensor_isWakeUpSensor()
-: <a class="el" href="group___sensor.html#ga0ff4118e400bedac62be6b79e9e0f924">sensor.h</a>
-</li>
-<li>ASensorEventQueue_disableSensor()
-: <a class="el" href="group___sensor.html#ga03852b813887ec236a34c4aef0df4b68">sensor.h</a>
-</li>
-<li>ASensorEventQueue_enableSensor()
-: <a class="el" href="group___sensor.html#ga48a8379cf9de9b09a71a00f8a3699499">sensor.h</a>
-</li>
-<li>ASensorEventQueue_getEvents()
-: <a class="el" href="group___sensor.html#gab3d4354fd0d3ceb5fa97c129b024a18a">sensor.h</a>
-</li>
-<li>ASensorEventQueue_hasEvents()
-: <a class="el" href="group___sensor.html#ga79c9d6264fe81d4e30800f826db72913">sensor.h</a>
-</li>
-<li>ASensorEventQueue_setEventRate()
-: <a class="el" href="group___sensor.html#gaa6e89b6d69dc3e07f2d7e72e81ec7937">sensor.h</a>
-</li>
-<li>ASensorManager_createEventQueue()
-: <a class="el" href="group___sensor.html#gac46f8b28bcc7a846dea9d841cab0a67b">sensor.h</a>
-</li>
-<li>ASensorManager_destroyEventQueue()
-: <a class="el" href="group___sensor.html#gaf35624037785cdea1e7fe9e0a73fc5e1">sensor.h</a>
-</li>
-<li>ASensorManager_getDefaultSensor()
-: <a class="el" href="group___sensor.html#gaf4880d87e01f5e2d4a9b8403e4047445">sensor.h</a>
-</li>
-<li>ASensorManager_getDefaultSensorEx()
-: <a class="el" href="group___sensor.html#ga4313457c0e82f4afa77ef13860629633">sensor.h</a>
-</li>
-<li>ASensorManager_getInstance()
-: <a class="el" href="group___sensor.html#gaa438fdaf34783a89d139f0a56d2692cd">sensor.h</a>
-</li>
-<li>ASensorManager_getSensorList()
-: <a class="el" href="group___sensor.html#ga645be938627498ab2b60d94c562204bd">sensor.h</a>
-</li>
-<li>AStorageManager_delete()
-: <a class="el" href="group___storage.html#ga184c06dd9cec0f21db138167d6b331ed">storage_manager.h</a>
-</li>
-<li>AStorageManager_getMountedObbPath()
-: <a class="el" href="group___storage.html#gad5c90305d627e0c768da37cb3e9f08c4">storage_manager.h</a>
-</li>
-<li>AStorageManager_isObbMounted()
-: <a class="el" href="group___storage.html#ga7572f2c650fc16cce1b0ab94e913a1ba">storage_manager.h</a>
-</li>
-<li>AStorageManager_mountObb()
-: <a class="el" href="group___storage.html#ga61bebaf43e57b4b7f57e7a24a62e9e3d">storage_manager.h</a>
-</li>
-<li>AStorageManager_new()
-: <a class="el" href="group___storage.html#ga1c21ed9e0848fcfc03547c95eeb48877">storage_manager.h</a>
-</li>
-<li>AStorageManager_unmountObb()
-: <a class="el" href="group___storage.html#ga4c32c8d2c780016fa36097d833b57809">storage_manager.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_type.jd b/docs/html/ndk/reference/globals_type.jd
deleted file mode 100644
index 99fa859..0000000
--- a/docs/html/ndk/reference/globals_type.jd
+++ /dev/null
@@ -1,90 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- <ul>
-<li>AAsset
-: <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">asset_manager.h</a>
-</li>
-<li>AAssetDir
-: <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">asset_manager.h</a>
-</li>
-<li>AAssetManager
-: <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">asset_manager.h</a>
-</li>
-<li>AConfiguration
-: <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">configuration.h</a>
-</li>
-<li>AHeartRateEvent
-: <a class="el" href="group___sensor.html#gae85b6eac76abe74e6e53d78bb3a4858c">sensor.h</a>
-</li>
-<li>AInputEvent
-: <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">input.h</a>
-</li>
-<li>AInputQueue
-: <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">input.h</a>
-</li>
-<li>ALooper
-: <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">looper.h</a>
-</li>
-<li>ALooper_callbackFunc
-: <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">looper.h</a>
-</li>
-<li>AMetaDataEvent
-: <a class="el" href="group___sensor.html#ga0378daec23b2d8a70438ef7c3912475f">sensor.h</a>
-</li>
-<li>ANativeActivity
-: <a class="el" href="group___native_activity.html#ga8abd07923f37feb1ce724d139cc2609d">native_activity.h</a>
-</li>
-<li>ANativeActivity_createFunc
-: <a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">native_activity.h</a>
-</li>
-<li>ANativeActivityCallbacks
-: <a class="el" href="group___native_activity.html#ga28dca784e5ee939427135c72c0151c38">native_activity.h</a>
-</li>
-<li>ANativeWindow
-: <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">native_window.h</a>
-</li>
-<li>ANativeWindow_Buffer
-: <a class="el" href="group___native_activity.html#gad0983ca473ce36293baf5e51a14c3357">native_window.h</a>
-</li>
-<li>AObbInfo
-: <a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">obb.h</a>
-</li>
-<li>ARect
-: <a class="el" href="group___native_activity.html#gaa984a498f0e146ac57c6022a323423cf">rect.h</a>
-</li>
-<li>ASensor
-: <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">sensor.h</a>
-</li>
-<li>ASensorEvent
-: <a class="el" href="group___sensor.html#ga6bb167c45f0ef0a94d8f178d227e781f">sensor.h</a>
-</li>
-<li>ASensorEventQueue
-: <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">sensor.h</a>
-</li>
-<li>ASensorList
-: <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">sensor.h</a>
-</li>
-<li>ASensorManager
-: <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">sensor.h</a>
-</li>
-<li>ASensorRef
-: <a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">sensor.h</a>
-</li>
-<li>ASensorVector
-: <a class="el" href="group___sensor.html#ga207e807f9e18271f6a763e57232b409f">sensor.h</a>
-</li>
-<li>AStorageManager
-: <a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">storage_manager.h</a>
-</li>
-<li>AStorageManager_obbCallbackFunc
-: <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">storage_manager.h</a>
-</li>
-<li>AUncalibratedEvent
-: <a class="el" href="group___sensor.html#ga24acc545b908dd24cadc44c5e0760b3b">sensor.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_vars.jd b/docs/html/ndk/reference/globals_vars.jd
deleted file mode 100644
index e6bd2a4..0000000
--- a/docs/html/ndk/reference/globals_vars.jd
+++ /dev/null
@@ -1,12 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
- <ul>
-<li>ANativeActivity_onCreate
-: <a class="el" href="group___native_activity.html#ga02791d0d490839055169f39fdc905c5e">native_activity.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/globals_w.jd b/docs/html/ndk/reference/globals_w.jd
deleted file mode 100644
index b72e8c2..0000000
--- a/docs/html/ndk/reference/globals_w.jd
+++ /dev/null
@@ -1,20 +0,0 @@
-page.title=Globals
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="contents">
-<div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
-
-<h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
-<li>WINDOW_FORMAT_RGB_565
-: <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310ab26fa9c38f169263b611a8b757bb0259">native_window.h</a>
-</li>
-<li>WINDOW_FORMAT_RGBA_8888
-: <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a6a165383340acce0b32c555dd2ac2c01">native_window.h</a>
-</li>
-<li>WINDOW_FORMAT_RGBX_8888
-: <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a5f83a97ccf64fc1554c220476e8aaf30">native_window.h</a>
-</li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___asset.jd b/docs/html/ndk/reference/group___asset.jd
deleted file mode 100644
index c2f9067..0000000
--- a/docs/html/ndk/reference/group___asset.jd
+++ /dev/null
@@ -1,591 +0,0 @@
-page.title=Asset
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Asset</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:asset__manager_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="asset__manager_8h.html">asset_manager.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:asset__manager__jni_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="asset__manager__jni_8h.html">asset_manager_jni.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga90c459935e76acf809b9ec90d1872771"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a></td></tr>
-<tr class="separator:ga90c459935e76acf809b9ec90d1872771"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga001a6b9c36a06ee977b9f51ed7103cdb"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a></td></tr>
-<tr class="separator:ga001a6b9c36a06ee977b9f51ed7103cdb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5630b1f1aa5cd363303018cb2f12f95c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a></td></tr>
-<tr class="separator:ga5630b1f1aa5cd363303018cb2f12f95c"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga06fc87d81c62e9abb8790b6e5713c55b"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba5bf76576f07042f965f230086f7c09f4">AASSET_MODE_UNKNOWN</a> = 0,
-<a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba88e1b2a920963d7596735fe28bf30e2f">AASSET_MODE_RANDOM</a> = 1,
-<a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55bac76f5fdb953097efc04e534474a7ea74">AASSET_MODE_STREAMING</a> = 2,
-<a class="el" href="group___asset.html#gga06fc87d81c62e9abb8790b6e5713c55ba40ec098f4afb7c2869fa449d3059f6bb">AASSET_MODE_BUFFER</a> = 3
- }</td></tr>
-<tr class="separator:ga06fc87d81c62e9abb8790b6e5713c55b"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:gab5b57ff012d6d1024d8bf5d30aedced4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gab5b57ff012d6d1024d8bf5d30aedced4">AAssetManager_openDir</a> (<a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> *mgr, const char *dirName)</td></tr>
-<tr class="separator:gab5b57ff012d6d1024d8bf5d30aedced4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0037ce3c10a591fe632f34c1aa62955c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga0037ce3c10a591fe632f34c1aa62955c">AAssetManager_open</a> (<a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> *mgr, const char *filename, int mode)</td></tr>
-<tr class="separator:ga0037ce3c10a591fe632f34c1aa62955c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4703b9f7baa3daeba248b6547de6b9b0"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga4703b9f7baa3daeba248b6547de6b9b0">AAssetDir_getNextFileName</a> (<a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> *assetDir)</td></tr>
-<tr class="separator:ga4703b9f7baa3daeba248b6547de6b9b0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga45db6d19ad5e1c0f9b2e6b4059da14b3"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga45db6d19ad5e1c0f9b2e6b4059da14b3">AAssetDir_rewind</a> (<a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> *assetDir)</td></tr>
-<tr class="separator:ga45db6d19ad5e1c0f9b2e6b4059da14b3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gace1c4d0da274d643c5b10ca218cc6088"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gace1c4d0da274d643c5b10ca218cc6088">AAssetDir_close</a> (<a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> *assetDir)</td></tr>
-<tr class="separator:gace1c4d0da274d643c5b10ca218cc6088"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaadd86322c1fda5121b6d33745c317fb9"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gaadd86322c1fda5121b6d33745c317fb9">AAsset_read</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, void *buf, size_t count)</td></tr>
-<tr class="separator:gaadd86322c1fda5121b6d33745c317fb9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gacc026a8bedeb1ef80bf12df3b72611a2"><td class="memItemLeft" align="right" valign="top">off_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gacc026a8bedeb1ef80bf12df3b72611a2">AAsset_seek</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off_t offset, int whence)</td></tr>
-<tr class="separator:gacc026a8bedeb1ef80bf12df3b72611a2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga81fbe4368de24a3296ef7a6eba0053c7"><td class="memItemLeft" align="right" valign="top">off64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga81fbe4368de24a3296ef7a6eba0053c7">AAsset_seek64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off64_t offset, int whence)</td></tr>
-<tr class="separator:ga81fbe4368de24a3296ef7a6eba0053c7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1f241e49f691dafcada23bcb76155122"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga1f241e49f691dafcada23bcb76155122">AAsset_close</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga1f241e49f691dafcada23bcb76155122"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga553a14512a98542306238c3ce70d344f"><td class="memItemLeft" align="right" valign="top">const void * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga553a14512a98542306238c3ce70d344f">AAsset_getBuffer</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga553a14512a98542306238c3ce70d344f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaad8ec42e28522ebc72d3a5c357f9a600"><td class="memItemLeft" align="right" valign="top">off_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gaad8ec42e28522ebc72d3a5c357f9a600">AAsset_getLength</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:gaad8ec42e28522ebc72d3a5c357f9a600"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga55c8bc459327d5d23089e6a4b453f3f1"><td class="memItemLeft" align="right" valign="top">off64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga55c8bc459327d5d23089e6a4b453f3f1">AAsset_getLength64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga55c8bc459327d5d23089e6a4b453f3f1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae806f55cbc4a93ca245f2adfd63d3eee"><td class="memItemLeft" align="right" valign="top">off_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gae806f55cbc4a93ca245f2adfd63d3eee">AAsset_getRemainingLength</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:gae806f55cbc4a93ca245f2adfd63d3eee"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga21e7221d88dcc44106843192b66755b5"><td class="memItemLeft" align="right" valign="top">off64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga21e7221d88dcc44106843192b66755b5">AAsset_getRemainingLength64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga21e7221d88dcc44106843192b66755b5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1af4ffd050016e99961e24f550981677"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga1af4ffd050016e99961e24f550981677">AAsset_openFileDescriptor</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off_t *outStart, off_t *outLength)</td></tr>
-<tr class="separator:ga1af4ffd050016e99961e24f550981677"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga123a44a575f85d91a00a8456dab7bd0a"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga123a44a575f85d91a00a8456dab7bd0a">AAsset_openFileDescriptor64</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset, off64_t *outStart, off64_t *outLength)</td></tr>
-<tr class="separator:ga123a44a575f85d91a00a8456dab7bd0a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga20344cb952a77fa1004f592fb1b55124"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#ga20344cb952a77fa1004f592fb1b55124">AAsset_isAllocated</a> (<a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> *asset)</td></tr>
-<tr class="separator:ga20344cb952a77fa1004f592fb1b55124"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadfd6537af41577735bcaee52120127f4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___asset.html#gadfd6537af41577735bcaee52120127f4">AAssetManager_fromJava</a> (JNIEnv *env, jobject assetManager)</td></tr>
-<tr class="separator:gadfd6537af41577735bcaee52120127f4"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="ga5630b1f1aa5cd363303018cb2f12f95c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> provides access to a read-only asset.</p>
-<p><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> objects are NOT thread-safe, and should not be shared across threads. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga001a6b9c36a06ee977b9f51ed7103cdb"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> provides access to a chunk of the asset hierarchy as if it were a single directory. The contents are populated by the <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a>.</p>
-<p>The list of files will be sorted in ascending order by ASCII value. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga90c459935e76acf809b9ec90d1872771"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> provides access to an application's raw assets by creating <a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> objects.</p>
-<p>AAssetManager is a wrapper to the low-level native implementation of the java <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a>, a pointer can be obtained using <a class="el" href="group___asset.html#gadfd6537af41577735bcaee52120127f4">AAssetManager_fromJava()</a>.</p>
-<p>The asset hierarchy may be examined like a filesystem, using <a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> objects to peruse a single directory.</p>
-<p>A native <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> pointer may be shared across multiple threads. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="ga06fc87d81c62e9abb8790b6e5713c55b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Available access modes for opening assets with <a class="el" href="group___asset.html#ga0037ce3c10a591fe632f34c1aa62955c">AAssetManager_open</a> </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga06fc87d81c62e9abb8790b6e5713c55ba5bf76576f07042f965f230086f7c09f4"></a>AASSET_MODE_UNKNOWN</em> </td><td class="fielddoc">
-<p>No specific information about how data will be accessed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga06fc87d81c62e9abb8790b6e5713c55ba88e1b2a920963d7596735fe28bf30e2f"></a>AASSET_MODE_RANDOM</em> </td><td class="fielddoc">
-<p>Read chunks, and seek forward and backward. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga06fc87d81c62e9abb8790b6e5713c55bac76f5fdb953097efc04e534474a7ea74"></a>AASSET_MODE_STREAMING</em> </td><td class="fielddoc">
-<p>Read sequentially, with an occasional forward seek. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga06fc87d81c62e9abb8790b6e5713c55ba40ec098f4afb7c2869fa449d3059f6bb"></a>AASSET_MODE_BUFFER</em> </td><td class="fielddoc">
-<p>Caller plans to ask for a read-only buffer with all data. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="ga1f241e49f691dafcada23bcb76155122"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AAsset_close </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Close the asset, freeing all associated resources. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga553a14512a98542306238c3ce70d344f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const void* AAsset_getBuffer </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get a pointer to a buffer holding the entire contents of the assset.</p>
-<p>Returns NULL on failure. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaad8ec42e28522ebc72d3a5c357f9a600"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">off_t AAsset_getLength </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Report the total size of the asset data. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga55c8bc459327d5d23089e6a4b453f3f1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">off64_t AAsset_getLength64 </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Report the total size of the asset data. Reports the size using a 64-bit number insted of 32-bit as AAsset_getLength. </p>
-
-</div>
-</div>
-<a class="anchor" id="gae806f55cbc4a93ca245f2adfd63d3eee"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">off_t AAsset_getRemainingLength </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Report the total amount of asset data that can be read from the current position. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga21e7221d88dcc44106843192b66755b5"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">off64_t AAsset_getRemainingLength64 </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Report the total amount of asset data that can be read from the current position.</p>
-<p>Uses a 64-bit number instead of a 32-bit number as AAsset_getRemainingLength does. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga20344cb952a77fa1004f592fb1b55124"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AAsset_isAllocated </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns whether this asset's internal buffer is allocated in ordinary RAM (i.e. not mmapped). </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1af4ffd050016e99961e24f550981677"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AAsset_openFileDescriptor </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">off_t * </td>
- <td class="paramname"><em>outStart</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">off_t * </td>
- <td class="paramname"><em>outLength</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Open a new file descriptor that can be used to read the asset data. If the start or length cannot be represented by a 32-bit number, it will be truncated. If the file is large, use AAsset_openFileDescriptor64 instead.</p>
-<p>Returns < 0 if direct fd access is not possible (for example, if the asset is compressed). </p>
-
-</div>
-</div>
-<a class="anchor" id="ga123a44a575f85d91a00a8456dab7bd0a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AAsset_openFileDescriptor64 </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">off64_t * </td>
- <td class="paramname"><em>outStart</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">off64_t * </td>
- <td class="paramname"><em>outLength</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Open a new file descriptor that can be used to read the asset data.</p>
-<p>Uses a 64-bit number for the offset and length instead of 32-bit instead of as AAsset_openFileDescriptor does.</p>
-<p>Returns < 0 if direct fd access is not possible (for example, if the asset is compressed). </p>
-
-</div>
-</div>
-<a class="anchor" id="gaadd86322c1fda5121b6d33745c317fb9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AAsset_read </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void * </td>
- <td class="paramname"><em>buf</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>count</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Attempt to read 'count' bytes of data from the current offset.</p>
-<p>Returns the number of bytes read, zero on EOF, or < 0 on error. </p>
-
-</div>
-</div>
-<a class="anchor" id="gacc026a8bedeb1ef80bf12df3b72611a2"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">off_t AAsset_seek </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">off_t </td>
- <td class="paramname"><em>offset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>whence</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Seek to the specified offset within the asset data. 'whence' uses the same constants as lseek()/fseek().</p>
-<p>Returns the new position on success, or (off_t) -1 on error. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga81fbe4368de24a3296ef7a6eba0053c7"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">off64_t AAsset_seek64 </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a> * </td>
- <td class="paramname"><em>asset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">off64_t </td>
- <td class="paramname"><em>offset</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>whence</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Seek to the specified offset within the asset data. 'whence' uses the same constants as lseek()/fseek().</p>
-<p>Uses 64-bit data type for large files as opposed to the 32-bit type used by AAsset_seek.</p>
-<p>Returns the new position on success, or (off64_t) -1 on error. </p>
-
-</div>
-</div>
-<a class="anchor" id="gace1c4d0da274d643c5b10ca218cc6088"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AAssetDir_close </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> * </td>
- <td class="paramname"><em>assetDir</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Close an opened AAssetDir, freeing any related resources. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4703b9f7baa3daeba248b6547de6b9b0"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* AAssetDir_getNextFileName </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> * </td>
- <td class="paramname"><em>assetDir</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Iterate over the files in an asset directory. A NULL string is returned when all the file names have been returned.</p>
-<p>The returned file name is suitable for passing to <a class="el" href="group___asset.html#ga0037ce3c10a591fe632f34c1aa62955c">AAssetManager_open()</a>.</p>
-<p>The string returned here is owned by the AssetDir implementation and is not guaranteed to remain valid if any other calls are made on this AAssetDir instance. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga45db6d19ad5e1c0f9b2e6b4059da14b3"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AAssetDir_rewind </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a> * </td>
- <td class="paramname"><em>assetDir</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Reset the iteration state of <a class="el" href="group___asset.html#ga4703b9f7baa3daeba248b6547de6b9b0">AAssetDir_getNextFileName()</a> to the beginning. </p>
-
-</div>
-</div>
-<a class="anchor" id="gadfd6537af41577735bcaee52120127f4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a>* AAssetManager_fromJava </td>
- <td>(</td>
- <td class="paramtype">JNIEnv * </td>
- <td class="paramname"><em>env</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">jobject </td>
- <td class="paramname"><em>assetManager</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Given a Dalvik AssetManager object, obtain the corresponding native AAssetManager object. Note that the caller is responsible for obtaining and holding a VM reference to the jobject to prevent its being garbage collected while the native object is in use. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga0037ce3c10a591fe632f34c1aa62955c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___asset.html#ga5630b1f1aa5cd363303018cb2f12f95c">AAsset</a>* AAssetManager_open </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> * </td>
- <td class="paramname"><em>mgr</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>filename</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>mode</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Open an asset.</p>
-<p>The object returned here should be freed by calling <a class="el" href="group___asset.html#ga1f241e49f691dafcada23bcb76155122">AAsset_close()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gab5b57ff012d6d1024d8bf5d30aedced4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___asset.html#ga001a6b9c36a06ee977b9f51ed7103cdb">AAssetDir</a>* AAssetManager_openDir </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> * </td>
- <td class="paramname"><em>mgr</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>dirName</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Open the named directory within the asset hierarchy. The directory can then be inspected with the AAssetDir functions. To open the top-level directory, pass in "" as the dirName.</p>
-<p>The object returned here should be freed by calling <a class="el" href="group___asset.html#gace1c4d0da274d643c5b10ca218cc6088">AAssetDir_close()</a>. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___bitmap.jd b/docs/html/ndk/reference/group___bitmap.jd
deleted file mode 100644
index 2f2b199..0000000
--- a/docs/html/ndk/reference/group___bitmap.jd
+++ /dev/null
@@ -1,230 +0,0 @@
-page.title=Bitmap
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#nested-classes">Data Structures</a> |
-<a href="#define-members">Macros</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Bitmap</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:bitmap_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="bitmap_8h.html">bitmap.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:gafb665ac9fefad34ac5c035f5d1314080"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#gafb665ac9fefad34ac5c035f5d1314080">ANDROID_BITMAP_RESUT_SUCCESS</a>   <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">ANDROID_BITMAP_RESULT_SUCCESS</a></td></tr>
-<tr class="separator:gafb665ac9fefad34ac5c035f5d1314080"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gadf764cbdea00d65edcd07bb9953ad2b7"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">ANDROID_BITMAP_RESULT_SUCCESS</a> = 0,
-<a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7acf7205d1a348d867c63ac2885ce01374">ANDROID_BITMAP_RESULT_BAD_PARAMETER</a> = -1,
-<a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a6b099b9533c38729a6c305f2fe93f98d">ANDROID_BITMAP_RESULT_JNI_EXCEPTION</a> = -2,
-<a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a512f5b95b6b57e78d65502c06391f990">ANDROID_BITMAP_RESULT_ALLOCATION_FAILED</a> = -3
- }</td></tr>
-<tr class="separator:gadf764cbdea00d65edcd07bb9953ad2b7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaea286a2d4c61ae2abb02b51500499f13"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#gaea286a2d4c61ae2abb02b51500499f13">AndroidBitmapFormat</a> { <br/>
-  <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ac6f0378ea5cfefd9abee2596af5a9021">ANDROID_BITMAP_FORMAT_NONE</a> = 0,
-<a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ab92ae96ceea06aa534583beadba84057">ANDROID_BITMAP_FORMAT_RGBA_8888</a> = 1,
-<a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13a11b32e10d6db28fae70ec3590cb9ee91">ANDROID_BITMAP_FORMAT_RGB_565</a> = 4,
-<a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13adc2ede06eafe20439271cb8137dc7528">ANDROID_BITMAP_FORMAT_RGBA_4444</a> = 7,
-<br/>
-  <a class="el" href="group___bitmap.html#ggaea286a2d4c61ae2abb02b51500499f13ad29996be25f8f88c96e016a1da5c4bca">ANDROID_BITMAP_FORMAT_A_8</a> = 8
-<br/>
- }</td></tr>
-<tr class="separator:gaea286a2d4c61ae2abb02b51500499f13"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga80292ee39d8a675928e38849742b54bf"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#ga80292ee39d8a675928e38849742b54bf">AndroidBitmap_getInfo</a> (JNIEnv *env, jobject jbitmap, <a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a> *info)</td></tr>
-<tr class="separator:ga80292ee39d8a675928e38849742b54bf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2908d42fa4db286c34b7f8c11f29206f"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#ga2908d42fa4db286c34b7f8c11f29206f">AndroidBitmap_lockPixels</a> (JNIEnv *env, jobject jbitmap, void **addrPtr)</td></tr>
-<tr class="separator:ga2908d42fa4db286c34b7f8c11f29206f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4aca91f37baddd42d0051dca8179d4ed"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___bitmap.html#ga4aca91f37baddd42d0051dca8179d4ed">AndroidBitmap_unlockPixels</a> (JNIEnv *env, jobject jbitmap)</td></tr>
-<tr class="separator:ga4aca91f37baddd42d0051dca8179d4ed"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Macro Definition Documentation</h2>
-<a class="anchor" id="gafb665ac9fefad34ac5c035f5d1314080"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">#define ANDROID_BITMAP_RESUT_SUCCESS   <a class="el" href="group___bitmap.html#ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076">ANDROID_BITMAP_RESULT_SUCCESS</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Backward compatibility: this macro used to be misspelled. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="gadf764cbdea00d65edcd07bb9953ad2b7"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>AndroidBitmap functions result code. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggadf764cbdea00d65edcd07bb9953ad2b7a07f71cf5c5d4950ac9813ae4bbf6d076"></a>ANDROID_BITMAP_RESULT_SUCCESS</em> </td><td class="fielddoc">
-<p>Operation was successful. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadf764cbdea00d65edcd07bb9953ad2b7acf7205d1a348d867c63ac2885ce01374"></a>ANDROID_BITMAP_RESULT_BAD_PARAMETER</em> </td><td class="fielddoc">
-<p>Bad parameter. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadf764cbdea00d65edcd07bb9953ad2b7a6b099b9533c38729a6c305f2fe93f98d"></a>ANDROID_BITMAP_RESULT_JNI_EXCEPTION</em> </td><td class="fielddoc">
-<p>JNI exception occured. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadf764cbdea00d65edcd07bb9953ad2b7a512f5b95b6b57e78d65502c06391f990"></a>ANDROID_BITMAP_RESULT_ALLOCATION_FAILED</em> </td><td class="fielddoc">
-<p>Allocation failed. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaea286a2d4c61ae2abb02b51500499f13"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">enum <a class="el" href="group___bitmap.html#gaea286a2d4c61ae2abb02b51500499f13">AndroidBitmapFormat</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Bitmap pixel format. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaea286a2d4c61ae2abb02b51500499f13ac6f0378ea5cfefd9abee2596af5a9021"></a>ANDROID_BITMAP_FORMAT_NONE</em> </td><td class="fielddoc">
-<p>No format. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaea286a2d4c61ae2abb02b51500499f13ab92ae96ceea06aa534583beadba84057"></a>ANDROID_BITMAP_FORMAT_RGBA_8888</em> </td><td class="fielddoc">
-<p>Red: 8 bits, Green: 8 bits, Blue: 8 bits, Alpha: 8 bits. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaea286a2d4c61ae2abb02b51500499f13a11b32e10d6db28fae70ec3590cb9ee91"></a>ANDROID_BITMAP_FORMAT_RGB_565</em> </td><td class="fielddoc">
-<p>Red: 5 bits, Green: 6 bits, Blue: 5 bits. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaea286a2d4c61ae2abb02b51500499f13adc2ede06eafe20439271cb8137dc7528"></a>ANDROID_BITMAP_FORMAT_RGBA_4444</em> </td><td class="fielddoc">
-<p>Red: 4 bits, Green: 4 bits, Blue: 4 bits, Alpha: 4 bits. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaea286a2d4c61ae2abb02b51500499f13ad29996be25f8f88c96e016a1da5c4bca"></a>ANDROID_BITMAP_FORMAT_A_8</em> </td><td class="fielddoc">
-<p>Deprecated. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="ga80292ee39d8a675928e38849742b54bf"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AndroidBitmap_getInfo </td>
- <td>(</td>
- <td class="paramtype">JNIEnv * </td>
- <td class="paramname"><em>env</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">jobject </td>
- <td class="paramname"><em>jbitmap</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a> * </td>
- <td class="paramname"><em>info</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Given a java bitmap object, fill out the <a class="el" href="struct_android_bitmap_info.html">AndroidBitmapInfo</a> struct for it. If the call fails, the info parameter will be ignored. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2908d42fa4db286c34b7f8c11f29206f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AndroidBitmap_lockPixels </td>
- <td>(</td>
- <td class="paramtype">JNIEnv * </td>
- <td class="paramname"><em>env</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">jobject </td>
- <td class="paramname"><em>jbitmap</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void ** </td>
- <td class="paramname"><em>addrPtr</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Given a java bitmap object, attempt to lock the pixel address. Locking will ensure that the memory for the pixels will not move until the unlockPixels call, and ensure that, if the pixels had been previously purged, they will have been restored.</p>
-<p>If this call succeeds, it must be balanced by a call to AndroidBitmap_unlockPixels, after which time the address of the pixels should no longer be used.</p>
-<p>If this succeeds, *addrPtr will be set to the pixel address. If the call fails, addrPtr will be ignored. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4aca91f37baddd42d0051dca8179d4ed"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AndroidBitmap_unlockPixels </td>
- <td>(</td>
- <td class="paramtype">JNIEnv * </td>
- <td class="paramname"><em>env</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">jobject </td>
- <td class="paramname"><em>jbitmap</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Call this to balance a successful call to AndroidBitmap_lockPixels. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___configuration.jd b/docs/html/ndk/reference/group___configuration.jd
deleted file mode 100644
index 708722e..0000000
--- a/docs/html/ndk/reference/group___configuration.jd
+++ /dev/null
@@ -1,1557 +0,0 @@
-page.title=Configuration
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Configuration</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:configuration_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="configuration_8h.html">configuration.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga6709434d0f99b8367d0df2dfdfbef45a"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a></td></tr>
-<tr class="separator:ga6709434d0f99b8367d0df2dfdfbef45a"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga99fb83031ce9923c84392b4e92f956b5"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af44cee3290a23999b0358c5638747a5f">ACONFIGURATION_ORIENTATION_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad9bf5c1fb90f9fdb20f984d0574592fe">ACONFIGURATION_ORIENTATION_PORT</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad5746872ff6871379fca93c60bfac8a3">ACONFIGURATION_ORIENTATION_LAND</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab0ca4fce673baf58447bfeb154d9a03f">ACONFIGURATION_ORIENTATION_SQUARE</a> = 0x0003,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa73bcf45261366840fea743372682fa6">ACONFIGURATION_TOUCHSCREEN_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5adfbeb370edd3b4372c9b0f86f152dde0">ACONFIGURATION_TOUCHSCREEN_NOTOUCH</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a8316a15b06353f883f2aef8bd194f79f">ACONFIGURATION_TOUCHSCREEN_STYLUS</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4bf2a8323ec6d072aa48d5fc2cff645e">ACONFIGURATION_TOUCHSCREEN_FINGER</a> = 0x0003,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae628b2bf594733b7c19ae394616cec6c">ACONFIGURATION_DENSITY_DEFAULT</a> = 0,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ddb34b2376422d2323720049eb57f3">ACONFIGURATION_DENSITY_LOW</a> = 120,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2511479d7cd574c4b293d535e4dc337e">ACONFIGURATION_DENSITY_MEDIUM</a> = 160,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10e6c3d636f3f6de75de9208913b0d8f">ACONFIGURATION_DENSITY_TV</a> = 213,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5ef4a97dc058235cdfa9fcfe3300c7eb">ACONFIGURATION_DENSITY_HIGH</a> = 240,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a38a03b3b1c64725679605d8d479c85a0">ACONFIGURATION_DENSITY_XHIGH</a> = 320,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad6353daf63778a6ec6f2bd3815d7e6e4">ACONFIGURATION_DENSITY_XXHIGH</a> = 480,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a2bd04af33e868a77bd4d83e7d70368ec">ACONFIGURATION_DENSITY_XXXHIGH</a> = 640,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a966a3855351a97ae865264afd74c1534">ACONFIGURATION_DENSITY_ANY</a> = 0xfffe,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a7c1af92914155c418b99844c6aab33d7">ACONFIGURATION_DENSITY_NONE</a> = 0xffff,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a593f722738682ae4500dab6427670f4a">ACONFIGURATION_KEYBOARD_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a40195a1a2d8e21c74d99606d8a1a9918">ACONFIGURATION_KEYBOARD_NOKEYS</a> = 0x0001,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a263ff8efb4d2c757e557adc0d0cdeedf">ACONFIGURATION_KEYBOARD_QWERTY</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1aaf1a887f146737030cce95c53066ea">ACONFIGURATION_KEYBOARD_12KEY</a> = 0x0003,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90e914b60d28c081b313f4b7b6600f47">ACONFIGURATION_NAVIGATION_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a3d95e899305aeae366fb7f8d8b6c290a">ACONFIGURATION_NAVIGATION_NONAV</a> = 0x0001,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace2e3ed21322100712992ca09f4b75b5">ACONFIGURATION_NAVIGATION_DPAD</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad2807d00cb2f5dcb9f456045dd8443a4">ACONFIGURATION_NAVIGATION_TRACKBALL</a> = 0x0003,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a80b53370f65ad283a4fd025f36422bea">ACONFIGURATION_NAVIGATION_WHEEL</a> = 0x0004,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a34d3a830bc2964000052f8486fd76b0c">ACONFIGURATION_KEYSHIDDEN_ANY</a> = 0x0000,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5abfbfc3a10affed059263555b00429ab2">ACONFIGURATION_KEYSHIDDEN_NO</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5e6a5a3f4175644886bde7d0ed4b1ebf">ACONFIGURATION_KEYSHIDDEN_YES</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1a56b72c730e40f22f3b8727e54c376c">ACONFIGURATION_KEYSHIDDEN_SOFT</a> = 0x0003,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a6db7dd6a67196df88117dcdc904e0cb3">ACONFIGURATION_NAVHIDDEN_ANY</a> = 0x0000,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae6ff9883e3e89f8d9ea5c0ebe077c9c5">ACONFIGURATION_NAVHIDDEN_NO</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a79b3a5fe10e948bb79db47b516d46cf5">ACONFIGURATION_NAVHIDDEN_YES</a> = 0x0002,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a9abcd34a6c549e048fc75a545081584e">ACONFIGURATION_SCREENSIZE_ANY</a> = 0x00,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1163af972206a65a5d18bda12fdc511c">ACONFIGURATION_SCREENSIZE_SMALL</a> = 0x01,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a019727e684f25ba921f3479abd62b9f2">ACONFIGURATION_SCREENSIZE_NORMAL</a> = 0x02,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af871d177fdceedb75612cfc1281d2c12">ACONFIGURATION_SCREENSIZE_LARGE</a> = 0x03,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0ca385ed504fc92f6ff3f0857e916c9c">ACONFIGURATION_SCREENSIZE_XLARGE</a> = 0x04,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a41e55e57da42fd09c378f59c1a63710f">ACONFIGURATION_SCREENLONG_ANY</a> = 0x00,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a428bb8fcd8bc731b67b0773dc62781c5">ACONFIGURATION_SCREENLONG_NO</a> = 0x1,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a91fc014d328507568d225d691b3babfd">ACONFIGURATION_SCREENLONG_YES</a> = 0x2,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a10d0916da7fa88c945a9cda259407d4c">ACONFIGURATION_UI_MODE_TYPE_ANY</a> = 0x00,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae7efe2713b6718311da76c828b5b444e">ACONFIGURATION_UI_MODE_TYPE_NORMAL</a> = 0x01,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ae10bb854f461f60cf399852f8f327077">ACONFIGURATION_UI_MODE_TYPE_DESK</a> = 0x02,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a5d6575185e41d909469a1dcf5f81bf4f">ACONFIGURATION_UI_MODE_TYPE_CAR</a> = 0x03,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4738dded616f028fbbedcbad764e7969">ACONFIGURATION_UI_MODE_TYPE_TELEVISION</a> = 0x04,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ad99004a7a1b2a97d29b639664947f8e3">ACONFIGURATION_UI_MODE_TYPE_APPLIANCE</a> = 0x05,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ac8c3e2207f2356bc6a1dffc6a615d131">ACONFIGURATION_UI_MODE_TYPE_WATCH</a> = 0x06,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a975087bbd4087b57a68ef3cdbfeb77a1">ACONFIGURATION_UI_MODE_NIGHT_ANY</a> = 0x00,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a90ebe564e3a3e384d5b013100f81e4b7">ACONFIGURATION_UI_MODE_NIGHT_NO</a> = 0x1,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a437af4527fac5407de256ec1ef055046">ACONFIGURATION_UI_MODE_NIGHT_YES</a> = 0x2,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aad653f0c960112177fdc387a4a0577fa">ACONFIGURATION_SCREEN_WIDTH_DP_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ab66ad42d0cf72fd7e8cd99b92b625432">ACONFIGURATION_SCREEN_HEIGHT_DP_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a227120217d8b6a9d5add3ccc4b283702">ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY</a> = 0x0000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4687ede31c438dd9f2701cab88de1dbe">ACONFIGURATION_LAYOUTDIR_ANY</a> = 0x00,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a05242d8f2d254b43ff9414ff1aa38a83">ACONFIGURATION_LAYOUTDIR_LTR</a> = 0x01,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5af98332983b787ab9355b527079636870">ACONFIGURATION_LAYOUTDIR_RTL</a> = 0x02,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a4d40f2aef365c78a52f699b89439db28">ACONFIGURATION_MCC</a> = 0x0001,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ade91a319638eede201579d15f86578a5">ACONFIGURATION_MNC</a> = 0x0002,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a01ecff796bd0690a9a8498c7de03e9b4">ACONFIGURATION_LOCALE</a> = 0x0004,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a255cfb57ac18d460c5614565a84f5561">ACONFIGURATION_TOUCHSCREEN</a> = 0x0008,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a0195de2a57f028a8171c42beff0b0e88">ACONFIGURATION_KEYBOARD</a> = 0x0010,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a54e71234e32ed037e2d47472f80eb416">ACONFIGURATION_KEYBOARD_HIDDEN</a> = 0x0020,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65e9d31615d2b4adf3738d9a12a1556b">ACONFIGURATION_NAVIGATION</a> = 0x0040,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a591461d864136d482fe06e01fd945786">ACONFIGURATION_ORIENTATION</a> = 0x0080,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5ace87b4f25e5fd6fe0f3316d21ecc66a1">ACONFIGURATION_DENSITY</a> = 0x0100,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a76ca1eb0e9346d93da592afbbf9a3b72">ACONFIGURATION_SCREEN_SIZE</a> = 0x0200,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a1be62e4fc31cf3d3102c99f7c6b4c71b">ACONFIGURATION_VERSION</a> = 0x0400,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a12d69ffef9135c1c55e1b8b5c2589e7c">ACONFIGURATION_SCREEN_LAYOUT</a> = 0x0800,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a43a324af59372efd08b34431825cf67e">ACONFIGURATION_UI_MODE</a> = 0x1000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5acce415252e0ad95117a05bbe910f06de">ACONFIGURATION_SMALLEST_SCREEN_SIZE</a> = 0x2000,
-<br/>
-  <a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5a65834be1230d1694e5ce8a6f407acab2">ACONFIGURATION_LAYOUTDIR</a> = 0x4000,
-<a class="el" href="group___configuration.html#gga99fb83031ce9923c84392b4e92f956b5aa6cda2f222580dbef27f1277d967d58c">ACONFIGURATION_MNC_ZERO</a> = 0xffff
-<br/>
- }</td></tr>
-<tr class="separator:ga99fb83031ce9923c84392b4e92f956b5"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga9543655922980466eb05c7be94a0a567"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9543655922980466eb05c7be94a0a567">AConfiguration_new</a> ()</td></tr>
-<tr class="separator:ga9543655922980466eb05c7be94a0a567"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga60fe264b97da84d3370eb9e220159e6d"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga60fe264b97da84d3370eb9e220159e6d">AConfiguration_delete</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga60fe264b97da84d3370eb9e220159e6d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga75e061fd0b4f761e08e43af36508c4f3"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga75e061fd0b4f761e08e43af36508c4f3">AConfiguration_fromAssetManager</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *out, <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> *am)</td></tr>
-<tr class="separator:ga75e061fd0b4f761e08e43af36508c4f3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaabff04218a0a76afb8d3ea551b001565"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaabff04218a0a76afb8d3ea551b001565">AConfiguration_copy</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *dest, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *src)</td></tr>
-<tr class="separator:gaabff04218a0a76afb8d3ea551b001565"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1e78004237a931086d2ae4bd8324bd30"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga1e78004237a931086d2ae4bd8324bd30">AConfiguration_getMcc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga1e78004237a931086d2ae4bd8324bd30"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae6198b4eaf3e34168f4b13b8b5975d93"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gae6198b4eaf3e34168f4b13b8b5975d93">AConfiguration_setMcc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t mcc)</td></tr>
-<tr class="separator:gae6198b4eaf3e34168f4b13b8b5975d93"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4783776a4fad4501898472375d781fb9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4783776a4fad4501898472375d781fb9">AConfiguration_getMnc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga4783776a4fad4501898472375d781fb9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf060ef69c3636f62e90ae0b520eecb8"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaaf060ef69c3636f62e90ae0b520eecb8">AConfiguration_setMnc</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t mnc)</td></tr>
-<tr class="separator:gaaf060ef69c3636f62e90ae0b520eecb8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7b004c13448704afb0ea2040d69468c1"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7b004c13448704afb0ea2040d69468c1">AConfiguration_getLanguage</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, char *outLanguage)</td></tr>
-<tr class="separator:ga7b004c13448704afb0ea2040d69468c1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1f3c6cf6667655f83777acda7387ddff"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga1f3c6cf6667655f83777acda7387ddff">AConfiguration_setLanguage</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, const char *language)</td></tr>
-<tr class="separator:ga1f3c6cf6667655f83777acda7387ddff"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad2b47f787012a82a67a20e5de5211d46"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gad2b47f787012a82a67a20e5de5211d46">AConfiguration_getCountry</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, char *outCountry)</td></tr>
-<tr class="separator:gad2b47f787012a82a67a20e5de5211d46"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac2f5d414a6466634b1639b5c6f8879ac"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gac2f5d414a6466634b1639b5c6f8879ac">AConfiguration_setCountry</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, const char *country)</td></tr>
-<tr class="separator:gac2f5d414a6466634b1639b5c6f8879ac"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa7d8e3e9871dc925fef3e342a92e4e22"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaa7d8e3e9871dc925fef3e342a92e4e22">AConfiguration_getOrientation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gaa7d8e3e9871dc925fef3e342a92e4e22"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadcaa8540bad4172a74032143bcaade04"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gadcaa8540bad4172a74032143bcaade04">AConfiguration_setOrientation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t orientation)</td></tr>
-<tr class="separator:gadcaa8540bad4172a74032143bcaade04"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad305e6cf86fa915c24212e71bb2bf027"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gad305e6cf86fa915c24212e71bb2bf027">AConfiguration_getTouchscreen</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gad305e6cf86fa915c24212e71bb2bf027"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0d51dbe710c1afe31ece4dd6a8c188ff"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga0d51dbe710c1afe31ece4dd6a8c188ff">AConfiguration_setTouchscreen</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t touchscreen)</td></tr>
-<tr class="separator:ga0d51dbe710c1afe31ece4dd6a8c188ff"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4c994e0555947340582094c3da32a663"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4c994e0555947340582094c3da32a663">AConfiguration_getDensity</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga4c994e0555947340582094c3da32a663"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9217af9858a7166dcb9a877192779eac"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9217af9858a7166dcb9a877192779eac">AConfiguration_setDensity</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t density)</td></tr>
-<tr class="separator:ga9217af9858a7166dcb9a877192779eac"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafd0f76ccd4fe4bda5172b8e0bc6675e4"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafd0f76ccd4fe4bda5172b8e0bc6675e4">AConfiguration_getKeyboard</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gafd0f76ccd4fe4bda5172b8e0bc6675e4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4ab3429c5505c108c09349f1ddef572f"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4ab3429c5505c108c09349f1ddef572f">AConfiguration_setKeyboard</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t keyboard)</td></tr>
-<tr class="separator:ga4ab3429c5505c108c09349f1ddef572f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae3ff1541b63f5b9256f7c0ebae372977"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gae3ff1541b63f5b9256f7c0ebae372977">AConfiguration_getNavigation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gae3ff1541b63f5b9256f7c0ebae372977"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad21dd14fb823a6a80b66132a05ce8913"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gad21dd14fb823a6a80b66132a05ce8913">AConfiguration_setNavigation</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t navigation)</td></tr>
-<tr class="separator:gad21dd14fb823a6a80b66132a05ce8913"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7a8317ab975f621f3fe62ed1b44f2605"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7a8317ab975f621f3fe62ed1b44f2605">AConfiguration_getKeysHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga7a8317ab975f621f3fe62ed1b44f2605"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5a80a02aa10cfa17de0795054e927183"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga5a80a02aa10cfa17de0795054e927183">AConfiguration_setKeysHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t keysHidden)</td></tr>
-<tr class="separator:ga5a80a02aa10cfa17de0795054e927183"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafe8d3a9c2f715ea76c8e4a99c2db9eaa"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafe8d3a9c2f715ea76c8e4a99c2db9eaa">AConfiguration_getNavHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gafe8d3a9c2f715ea76c8e4a99c2db9eaa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga67e86e0347596421771af841710308d5"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga67e86e0347596421771af841710308d5">AConfiguration_setNavHidden</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t navHidden)</td></tr>
-<tr class="separator:ga67e86e0347596421771af841710308d5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4aa7062198e5aacd9fabb04d0453dd91"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga4aa7062198e5aacd9fabb04d0453dd91">AConfiguration_getSdkVersion</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga4aa7062198e5aacd9fabb04d0453dd91"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga06c66072902ee455011120188ca4810b"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga06c66072902ee455011120188ca4810b">AConfiguration_setSdkVersion</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t sdkVersion)</td></tr>
-<tr class="separator:ga06c66072902ee455011120188ca4810b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9d2c1b8731795d8e74be7e23cbc77552"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9d2c1b8731795d8e74be7e23cbc77552">AConfiguration_getScreenSize</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga9d2c1b8731795d8e74be7e23cbc77552"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7bcf05150933ead34a01061d05ad3245"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7bcf05150933ead34a01061d05ad3245">AConfiguration_setScreenSize</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t screenSize)</td></tr>
-<tr class="separator:ga7bcf05150933ead34a01061d05ad3245"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab7d1f5aa59e8fa4db0a1b91bb322034c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gab7d1f5aa59e8fa4db0a1b91bb322034c">AConfiguration_getScreenLong</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:gab7d1f5aa59e8fa4db0a1b91bb322034c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaed853ab7e2bc915591d05997130bc448"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaed853ab7e2bc915591d05997130bc448">AConfiguration_setScreenLong</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t screenLong)</td></tr>
-<tr class="separator:gaed853ab7e2bc915591d05997130bc448"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1d75777892f38208feb3d2a94a977fcf"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga1d75777892f38208feb3d2a94a977fcf">AConfiguration_getUiModeType</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga1d75777892f38208feb3d2a94a977fcf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec61e3cf91cd79e8b76a35bbcb15789d"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaec61e3cf91cd79e8b76a35bbcb15789d">AConfiguration_setUiModeType</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t uiModeType)</td></tr>
-<tr class="separator:gaec61e3cf91cd79e8b76a35bbcb15789d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga447f16a9e4f8400e5e0328900749ff16"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga447f16a9e4f8400e5e0328900749ff16">AConfiguration_getUiModeNight</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga447f16a9e4f8400e5e0328900749ff16"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga08df1e801afbe4a12411e393b8141e42"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga08df1e801afbe4a12411e393b8141e42">AConfiguration_setUiModeNight</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t uiModeNight)</td></tr>
-<tr class="separator:ga08df1e801afbe4a12411e393b8141e42"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga61e5fe9612c170c33e1c7e9fb92f2219"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga61e5fe9612c170c33e1c7e9fb92f2219">AConfiguration_getScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga61e5fe9612c170c33e1c7e9fb92f2219"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafc51d45679095965fe3ba1abd402f120"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafc51d45679095965fe3ba1abd402f120">AConfiguration_setScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:gafc51d45679095965fe3ba1abd402f120"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9905a4765f8d0d921c476ebce01c7648"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga9905a4765f8d0d921c476ebce01c7648">AConfiguration_getScreenHeightDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga9905a4765f8d0d921c476ebce01c7648"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6ffac3b41415ec8a3031737ccdcd63b8"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga6ffac3b41415ec8a3031737ccdcd63b8">AConfiguration_setScreenHeightDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:ga6ffac3b41415ec8a3031737ccdcd63b8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7fc015e41fad342edba66a003d9848aa"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga7fc015e41fad342edba66a003d9848aa">AConfiguration_getSmallestScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga7fc015e41fad342edba66a003d9848aa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6b004c9585671efc5cebd96c1d43c4f0"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga6b004c9585671efc5cebd96c1d43c4f0">AConfiguration_setSmallestScreenWidthDp</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:ga6b004c9585671efc5cebd96c1d43c4f0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga13dbf2fc9a382c62b391e7de9cf9b468"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#ga13dbf2fc9a382c62b391e7de9cf9b468">AConfiguration_getLayoutDirection</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config)</td></tr>
-<tr class="separator:ga13dbf2fc9a382c62b391e7de9cf9b468"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf47215cf551594f8c2a0594419b47e1"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gaaf47215cf551594f8c2a0594419b47e1">AConfiguration_setLayoutDirection</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config, int32_t value)</td></tr>
-<tr class="separator:gaaf47215cf551594f8c2a0594419b47e1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabfe69b0dccae425a16fe94d084f20402"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gabfe69b0dccae425a16fe94d084f20402">AConfiguration_diff</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config1, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *config2)</td></tr>
-<tr class="separator:gabfe69b0dccae425a16fe94d084f20402"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafb27b901a1d7d44ed866608fb8399a18"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafb27b901a1d7d44ed866608fb8399a18">AConfiguration_match</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *base, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *requested)</td></tr>
-<tr class="separator:gafb27b901a1d7d44ed866608fb8399a18"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafd2bb31057c8d57efcea7603458d2a8d"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___configuration.html#gafd2bb31057c8d57efcea7603458d2a8d">AConfiguration_isBetterThan</a> (<a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *base, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *test, <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> *requested)</td></tr>
-<tr class="separator:gafd2bb31057c8d57efcea7603458d2a8d"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="ga6709434d0f99b8367d0df2dfdfbef45a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> is an opaque type used to get and set various subsystem configurations.</p>
-<p>A <a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> pointer can be obtained using:</p>
-<ul>
-<li><a class="el" href="group___configuration.html#ga9543655922980466eb05c7be94a0a567">AConfiguration_new()</a></li>
-<li><a class="el" href="group___configuration.html#ga75e061fd0b4f761e08e43af36508c4f3">AConfiguration_fromAssetManager()</a> </li>
-</ul>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="ga99fb83031ce9923c84392b4e92f956b5"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Define flags and constants for various subsystem configurations. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5af44cee3290a23999b0358c5638747a5f"></a>ACONFIGURATION_ORIENTATION_ANY</em> </td><td class="fielddoc">
-<p>Orientation: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ad9bf5c1fb90f9fdb20f984d0574592fe"></a>ACONFIGURATION_ORIENTATION_PORT</em> </td><td class="fielddoc">
-<p>Orientation: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#OrientationQualifier">port</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ad5746872ff6871379fca93c60bfac8a3"></a>ACONFIGURATION_ORIENTATION_LAND</em> </td><td class="fielddoc">
-<p>Orientation: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#OrientationQualifier">land</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ab0ca4fce673baf58447bfeb154d9a03f"></a>ACONFIGURATION_ORIENTATION_SQUARE</em> </td><td class="fielddoc">
-<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000001">Deprecated:</a></b></dt><dd>Not currently supported or used. </dd></dl>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5aa73bcf45261366840fea743372682fa6"></a>ACONFIGURATION_TOUCHSCREEN_ANY</em> </td><td class="fielddoc">
-<p>Touchscreen: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5adfbeb370edd3b4372c9b0f86f152dde0"></a>ACONFIGURATION_TOUCHSCREEN_NOTOUCH</em> </td><td class="fielddoc">
-<p>Touchscreen: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#TouchscreenQualifier">notouch</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a8316a15b06353f883f2aef8bd194f79f"></a>ACONFIGURATION_TOUCHSCREEN_STYLUS</em> </td><td class="fielddoc">
-<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>Not currently supported or used. </dd></dl>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a4bf2a8323ec6d072aa48d5fc2cff645e"></a>ACONFIGURATION_TOUCHSCREEN_FINGER</em> </td><td class="fielddoc">
-<p>Touchscreen: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#TouchscreenQualifier">finger</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ae628b2bf594733b7c19ae394616cec6c"></a>ACONFIGURATION_DENSITY_DEFAULT</em> </td><td class="fielddoc">
-<p>Density: default density. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a01ddb34b2376422d2323720049eb57f3"></a>ACONFIGURATION_DENSITY_LOW</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">ldpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a2511479d7cd574c4b293d535e4dc337e"></a>ACONFIGURATION_DENSITY_MEDIUM</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">mdpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a10e6c3d636f3f6de75de9208913b0d8f"></a>ACONFIGURATION_DENSITY_TV</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">tvdpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a5ef4a97dc058235cdfa9fcfe3300c7eb"></a>ACONFIGURATION_DENSITY_HIGH</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">hdpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a38a03b3b1c64725679605d8d479c85a0"></a>ACONFIGURATION_DENSITY_XHIGH</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">xhdpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ad6353daf63778a6ec6f2bd3815d7e6e4"></a>ACONFIGURATION_DENSITY_XXHIGH</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">xxhdpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a2bd04af33e868a77bd4d83e7d70368ec"></a>ACONFIGURATION_DENSITY_XXXHIGH</em> </td><td class="fielddoc">
-<p>Density: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">xxxhdpi</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a966a3855351a97ae865264afd74c1534"></a>ACONFIGURATION_DENSITY_ANY</em> </td><td class="fielddoc">
-<p>Density: any density. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a7c1af92914155c418b99844c6aab33d7"></a>ACONFIGURATION_DENSITY_NONE</em> </td><td class="fielddoc">
-<p>Density: no density specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a593f722738682ae4500dab6427670f4a"></a>ACONFIGURATION_KEYBOARD_ANY</em> </td><td class="fielddoc">
-<p>Keyboard: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a40195a1a2d8e21c74d99606d8a1a9918"></a>ACONFIGURATION_KEYBOARD_NOKEYS</em> </td><td class="fielddoc">
-<p>Keyboard: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ImeQualifier">nokeys</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a263ff8efb4d2c757e557adc0d0cdeedf"></a>ACONFIGURATION_KEYBOARD_QWERTY</em> </td><td class="fielddoc">
-<p>Keyboard: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ImeQualifier">qwerty</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a1aaf1a887f146737030cce95c53066ea"></a>ACONFIGURATION_KEYBOARD_12KEY</em> </td><td class="fielddoc">
-<p>Keyboard: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ImeQualifier">12key</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a90e914b60d28c081b313f4b7b6600f47"></a>ACONFIGURATION_NAVIGATION_ANY</em> </td><td class="fielddoc">
-<p>Navigation: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a3d95e899305aeae366fb7f8d8b6c290a"></a>ACONFIGURATION_NAVIGATION_NONAV</em> </td><td class="fielddoc">
-<p>Navigation: value corresponding to the <a href="@@dacRoot/guide/topics/resources/providing-resources.html#NavigationQualifier">nonav</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ace2e3ed21322100712992ca09f4b75b5"></a>ACONFIGURATION_NAVIGATION_DPAD</em> </td><td class="fielddoc">
-<p>Navigation: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#NavigationQualifier">dpad</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ad2807d00cb2f5dcb9f456045dd8443a4"></a>ACONFIGURATION_NAVIGATION_TRACKBALL</em> </td><td class="fielddoc">
-<p>Navigation: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#NavigationQualifier">trackball</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a80b53370f65ad283a4fd025f36422bea"></a>ACONFIGURATION_NAVIGATION_WHEEL</em> </td><td class="fielddoc">
-<p>Navigation: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#NavigationQualifier">wheel</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a34d3a830bc2964000052f8486fd76b0c"></a>ACONFIGURATION_KEYSHIDDEN_ANY</em> </td><td class="fielddoc">
-<p>Keyboard availability: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5abfbfc3a10affed059263555b00429ab2"></a>ACONFIGURATION_KEYSHIDDEN_NO</em> </td><td class="fielddoc">
-<p>Keyboard availability: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#KeyboardAvailQualifier">keysexposed</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a5e6a5a3f4175644886bde7d0ed4b1ebf"></a>ACONFIGURATION_KEYSHIDDEN_YES</em> </td><td class="fielddoc">
-<p>Keyboard availability: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#KeyboardAvailQualifier">keyshidden</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a1a56b72c730e40f22f3b8727e54c376c"></a>ACONFIGURATION_KEYSHIDDEN_SOFT</em> </td><td class="fielddoc">
-<p>Keyboard availability: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#KeyboardAvailQualifier">keyssoft</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a6db7dd6a67196df88117dcdc904e0cb3"></a>ACONFIGURATION_NAVHIDDEN_ANY</em> </td><td class="fielddoc">
-<p>Navigation availability: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ae6ff9883e3e89f8d9ea5c0ebe077c9c5"></a>ACONFIGURATION_NAVHIDDEN_NO</em> </td><td class="fielddoc">
-<p>Navigation availability: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#NavAvailQualifier">navexposed</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a79b3a5fe10e948bb79db47b516d46cf5"></a>ACONFIGURATION_NAVHIDDEN_YES</em> </td><td class="fielddoc">
-<p>Navigation availability: value corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#NavAvailQualifier">navhidden</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a9abcd34a6c549e048fc75a545081584e"></a>ACONFIGURATION_SCREENSIZE_ANY</em> </td><td class="fielddoc">
-<p>Screen size: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a1163af972206a65a5d18bda12fdc511c"></a>ACONFIGURATION_SCREENSIZE_SMALL</em> </td><td class="fielddoc">
-<p>Screen size: value indicating the screen is at least approximately 320x426 dp units, corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenSizeQualifier">small</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a019727e684f25ba921f3479abd62b9f2"></a>ACONFIGURATION_SCREENSIZE_NORMAL</em> </td><td class="fielddoc">
-<p>Screen size: value indicating the screen is at least approximately 320x470 dp units, corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenSizeQualifier">normal</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5af871d177fdceedb75612cfc1281d2c12"></a>ACONFIGURATION_SCREENSIZE_LARGE</em> </td><td class="fielddoc">
-<p>Screen size: value indicating the screen is at least approximately 480x640 dp units, corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenSizeQualifier">large</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a0ca385ed504fc92f6ff3f0857e916c9c"></a>ACONFIGURATION_SCREENSIZE_XLARGE</em> </td><td class="fielddoc">
-<p>Screen size: value indicating the screen is at least approximately 720x960 dp units, corresponding to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenSizeQualifier">xlarge</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a41e55e57da42fd09c378f59c1a63710f"></a>ACONFIGURATION_SCREENLONG_ANY</em> </td><td class="fielddoc">
-<p>Screen layout: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a428bb8fcd8bc731b67b0773dc62781c5"></a>ACONFIGURATION_SCREENLONG_NO</em> </td><td class="fielddoc">
-<p>Screen layout: value that corresponds to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenAspectQualifier">notlong</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a91fc014d328507568d225d691b3babfd"></a>ACONFIGURATION_SCREENLONG_YES</em> </td><td class="fielddoc">
-<p>Screen layout: value that corresponds to the <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenAspectQualifier">long</a> resource qualifier. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a10d0916da7fa88c945a9cda259407d4c"></a>ACONFIGURATION_UI_MODE_TYPE_ANY</em> </td><td class="fielddoc">
-<p>UI mode: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ae7efe2713b6718311da76c828b5b444e"></a>ACONFIGURATION_UI_MODE_TYPE_NORMAL</em> </td><td class="fielddoc">
-<p>UI mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">no UI mode type</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ae10bb854f461f60cf399852f8f327077"></a>ACONFIGURATION_UI_MODE_TYPE_DESK</em> </td><td class="fielddoc">
-<p>UI mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">desk</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a5d6575185e41d909469a1dcf5f81bf4f"></a>ACONFIGURATION_UI_MODE_TYPE_CAR</em> </td><td class="fielddoc">
-<p>UI mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">car</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a4738dded616f028fbbedcbad764e7969"></a>ACONFIGURATION_UI_MODE_TYPE_TELEVISION</em> </td><td class="fielddoc">
-<p>UI mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">television</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ad99004a7a1b2a97d29b639664947f8e3"></a>ACONFIGURATION_UI_MODE_TYPE_APPLIANCE</em> </td><td class="fielddoc">
-<p>UI mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">appliance</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ac8c3e2207f2356bc6a1dffc6a615d131"></a>ACONFIGURATION_UI_MODE_TYPE_WATCH</em> </td><td class="fielddoc">
-<p>UI mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">watch</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a975087bbd4087b57a68ef3cdbfeb77a1"></a>ACONFIGURATION_UI_MODE_NIGHT_ANY</em> </td><td class="fielddoc">
-<p>UI night mode: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a90ebe564e3a3e384d5b013100f81e4b7"></a>ACONFIGURATION_UI_MODE_NIGHT_NO</em> </td><td class="fielddoc">
-<p>UI night mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#NightQualifier">notnight</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a437af4527fac5407de256ec1ef055046"></a>ACONFIGURATION_UI_MODE_NIGHT_YES</em> </td><td class="fielddoc">
-<p>UI night mode: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#NightQualifier">night</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5aad653f0c960112177fdc387a4a0577fa"></a>ACONFIGURATION_SCREEN_WIDTH_DP_ANY</em> </td><td class="fielddoc">
-<p>Screen width DPI: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ab66ad42d0cf72fd7e8cd99b92b625432"></a>ACONFIGURATION_SCREEN_HEIGHT_DP_ANY</em> </td><td class="fielddoc">
-<p>Screen height DPI: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a227120217d8b6a9d5add3ccc4b283702"></a>ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY</em> </td><td class="fielddoc">
-<p>Smallest screen width DPI: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a4687ede31c438dd9f2701cab88de1dbe"></a>ACONFIGURATION_LAYOUTDIR_ANY</em> </td><td class="fielddoc">
-<p>Layout direction: not specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a05242d8f2d254b43ff9414ff1aa38a83"></a>ACONFIGURATION_LAYOUTDIR_LTR</em> </td><td class="fielddoc">
-<p>Layout direction: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#LayoutDirectionQualifier">ldltr</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5af98332983b787ab9355b527079636870"></a>ACONFIGURATION_LAYOUTDIR_RTL</em> </td><td class="fielddoc">
-<p>Layout direction: value that corresponds to <a href="@dacRoot/guide/topics/resources/providing-resources.html#LayoutDirectionQualifier">ldrtl</a> resource qualifier specified. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a4d40f2aef365c78a52f699b89439db28"></a>ACONFIGURATION_MCC</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#MccQualifier">mcc</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ade91a319638eede201579d15f86578a5"></a>ACONFIGURATION_MNC</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#MccQualifier">mnc</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a01ecff796bd0690a9a8498c7de03e9b4"></a>ACONFIGURATION_LOCALE</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="{@docRoot}guide/topics/resources/providing-resources.html#LocaleQualifier">locale</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a255cfb57ac18d460c5614565a84f5561"></a>ACONFIGURATION_TOUCHSCREEN</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#TouchscreenQualifier">touchscreen</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a0195de2a57f028a8171c42beff0b0e88"></a>ACONFIGURATION_KEYBOARD</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#ImeQualifier">keyboard</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a54e71234e32ed037e2d47472f80eb416"></a>ACONFIGURATION_KEYBOARD_HIDDEN</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#KeyboardAvailQualifier">keyboardHidden</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a65e9d31615d2b4adf3738d9a12a1556b"></a>ACONFIGURATION_NAVIGATION</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#NavigationQualifier">navigation</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a591461d864136d482fe06e01fd945786"></a>ACONFIGURATION_ORIENTATION</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#OrientationQualifier">orientation</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5ace87b4f25e5fd6fe0f3316d21ecc66a1"></a>ACONFIGURATION_DENSITY</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#DensityQualifier">density</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a76ca1eb0e9346d93da592afbbf9a3b72"></a>ACONFIGURATION_SCREEN_SIZE</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#ScreenSizeQualifier">screen size</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a1be62e4fc31cf3d3102c99f7c6b4c71b"></a>ACONFIGURATION_VERSION</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#VersionQualifier">platform version</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a12d69ffef9135c1c55e1b8b5c2589e7c"></a>ACONFIGURATION_SCREEN_LAYOUT</em> </td><td class="fielddoc">
-<p>Bit mask for screen layout configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a43a324af59372efd08b34431825cf67e"></a>ACONFIGURATION_UI_MODE</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#UiModeQualifier">ui mode</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5acce415252e0ad95117a05bbe910f06de"></a>ACONFIGURATION_SMALLEST_SCREEN_SIZE</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#SmallestScreenWidthQualifier">smallest screen width</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5a65834be1230d1694e5ce8a6f407acab2"></a>ACONFIGURATION_LAYOUTDIR</em> </td><td class="fielddoc">
-<p>Bit mask for <a href="@dacRoot/guide/topics/resources/providing-resources.html#LayoutDirectionQualifier">layout direction</a> configuration. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga99fb83031ce9923c84392b4e92f956b5aa6cda2f222580dbef27f1277d967d58c"></a>ACONFIGURATION_MNC_ZERO</em> </td><td class="fielddoc">
-<p>Constant used to to represent MNC (Mobile Network Code) zero. 0 cannot be used, since it is used to represent an undefined MNC. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="gaabff04218a0a76afb8d3ea551b001565"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_copy </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>dest</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>src</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Copy the contents of 'src' to 'dest'. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga60fe264b97da84d3370eb9e220159e6d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_delete </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Free an AConfiguration that was previously created with <a class="el" href="group___configuration.html#ga9543655922980466eb05c7be94a0a567">AConfiguration_new()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gabfe69b0dccae425a16fe94d084f20402"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_diff </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config1</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config2</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Perform a diff between two configurations. Returns a bit mask of ACONFIGURATION_* constants, each bit set meaning that configuration element is different between them. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga75e061fd0b4f761e08e43af36508c4f3"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_fromAssetManager </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>out</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> * </td>
- <td class="paramname"><em>am</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Create and return a new AConfiguration based on the current configuration in use in the given <a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad2b47f787012a82a67a20e5de5211d46"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_getCountry </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">char * </td>
- <td class="paramname"><em>outCountry</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current country code set in the configuration. The output will be filled with an array of two characters. They are not 0-terminated. If a country is not set, they will be 0. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4c994e0555947340582094c3da32a663"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getDensity </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_DENSITY_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafd0f76ccd4fe4bda5172b8e0bc6675e4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getKeyboard </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_KEYBOARD_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7a8317ab975f621f3fe62ed1b44f2605"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getKeysHidden </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_KEYSHIDDEN_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7b004c13448704afb0ea2040d69468c1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_getLanguage </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">char * </td>
- <td class="paramname"><em>outLanguage</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current language code set in the configuration. The output will be filled with an array of two characters. They are not 0-terminated. If a language is not set, they will be 0. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga13dbf2fc9a382c62b391e7de9cf9b468"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getLayoutDirection </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the configuration's layout direction, or ACONFIGURATION_LAYOUTDIR_ANY if not set. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1e78004237a931086d2ae4bd8324bd30"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getMcc </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current MCC set in the configuration. 0 if not set. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4783776a4fad4501898472375d781fb9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getMnc </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current MNC set in the configuration. 0 if not set. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafe8d3a9c2f715ea76c8e4a99c2db9eaa"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getNavHidden </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_NAVHIDDEN_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gae3ff1541b63f5b9256f7c0ebae372977"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getNavigation </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_NAVIGATION_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa7d8e3e9871dc925fef3e342a92e4e22"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getOrientation </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_ORIENTATION_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9905a4765f8d0d921c476ebce01c7648"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getScreenHeightDp </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current configuration screen height in dp units, or ACONFIGURATION_SCREEN_HEIGHT_DP_ANY if not set. </p>
-
-</div>
-</div>
-<a class="anchor" id="gab7d1f5aa59e8fa4db0a1b91bb322034c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getScreenLong </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_SCREENLONG_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9d2c1b8731795d8e74be7e23cbc77552"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getScreenSize </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_SCREENSIZE_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga61e5fe9612c170c33e1c7e9fb92f2219"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getScreenWidthDp </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current configuration screen width in dp units, or ACONFIGURATION_SCREEN_WIDTH_DP_ANY if not set. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4aa7062198e5aacd9fabb04d0453dd91"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getSdkVersion </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current SDK (API) version set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7fc015e41fad342edba66a003d9848aa"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getSmallestScreenWidthDp </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the configuration's smallest screen width in dp units, or ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY if not set. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad305e6cf86fa915c24212e71bb2bf027"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getTouchscreen </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_TOUCHSCREEN_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga447f16a9e4f8400e5e0328900749ff16"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getUiModeNight </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_UI_MODE_NIGHT_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1d75777892f38208feb3d2a94a977fcf"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_getUiModeType </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current ACONFIGURATION_UI_MODE_TYPE_* set in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafd2bb31057c8d57efcea7603458d2a8d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_isBetterThan </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>base</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>test</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>requested</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Determine whether the configuration in 'test' is better than the existing configuration in 'base'. If 'requested' is non-NULL, this decision is based on the overall configuration given there. If it is NULL, this decision is simply based on which configuration is more specific. Returns non-0 if 'test' is better than 'base'.</p>
-<p>This assumes you have already filtered the configurations with <a class="el" href="group___configuration.html#gafb27b901a1d7d44ed866608fb8399a18">AConfiguration_match()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafb27b901a1d7d44ed866608fb8399a18"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AConfiguration_match </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>base</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>requested</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Determine whether 'base' is a valid configuration for use within the environment 'requested'. Returns 0 if there are any values in 'base' that conflict with 'requested'. Returns 1 if it does not conflict. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9543655922980466eb05c7be94a0a567"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a>* AConfiguration_new </td>
- <td>(</td>
- <td class="paramname"></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Create a new AConfiguration, initialized with no values set. </p>
-
-</div>
-</div>
-<a class="anchor" id="gac2f5d414a6466634b1639b5c6f8879ac"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setCountry </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>country</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current country code in the configuration, from the first two characters in the string. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9217af9858a7166dcb9a877192779eac"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setDensity </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>density</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current density in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4ab3429c5505c108c09349f1ddef572f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setKeyboard </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>keyboard</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current keyboard in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga5a80a02aa10cfa17de0795054e927183"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setKeysHidden </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>keysHidden</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current keys hidden in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1f3c6cf6667655f83777acda7387ddff"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setLanguage </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>language</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current language code in the configuration, from the first two characters in the string. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaaf47215cf551594f8c2a0594419b47e1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setLayoutDirection </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>value</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the configuration's layout direction. </p>
-
-</div>
-</div>
-<a class="anchor" id="gae6198b4eaf3e34168f4b13b8b5975d93"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setMcc </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>mcc</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current MCC in the configuration. 0 to clear. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaaf060ef69c3636f62e90ae0b520eecb8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setMnc </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>mnc</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current MNC in the configuration. 0 to clear. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga67e86e0347596421771af841710308d5"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setNavHidden </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>navHidden</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current nav hidden in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad21dd14fb823a6a80b66132a05ce8913"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setNavigation </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>navigation</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current navigation in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gadcaa8540bad4172a74032143bcaade04"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setOrientation </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>orientation</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current orientation in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga6ffac3b41415ec8a3031737ccdcd63b8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setScreenHeightDp </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>value</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the configuration's current screen width in dp units. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaed853ab7e2bc915591d05997130bc448"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setScreenLong </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>screenLong</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current screen long in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7bcf05150933ead34a01061d05ad3245"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setScreenSize </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>screenSize</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current screen size in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafc51d45679095965fe3ba1abd402f120"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setScreenWidthDp </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>value</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the configuration's current screen width in dp units. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga06c66072902ee455011120188ca4810b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setSdkVersion </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>sdkVersion</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current SDK version in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga6b004c9585671efc5cebd96c1d43c4f0"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setSmallestScreenWidthDp </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>value</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the configuration's smallest screen width in dp units. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga0d51dbe710c1afe31ece4dd6a8c188ff"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setTouchscreen </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>touchscreen</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current touchscreen in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga08df1e801afbe4a12411e393b8141e42"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setUiModeNight </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>uiModeNight</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current UI mode night in the configuration. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaec61e3cf91cd79e8b76a35bbcb15789d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AConfiguration_setUiModeType </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___configuration.html#ga6709434d0f99b8367d0df2dfdfbef45a">AConfiguration</a> * </td>
- <td class="paramname"><em>config</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>uiModeType</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Set the current UI mode type in the configuration. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___input.jd b/docs/html/ndk/reference/group___input.jd
deleted file mode 100644
index 55db956..0000000
--- a/docs/html/ndk/reference/group___input.jd
+++ /dev/null
@@ -1,3682 +0,0 @@
-page.title=Input
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#define-members">Macros</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Input</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:input_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="input_8h.html">input.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:keycodes_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="keycodes_8h.html">keycodes.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:gaeb170c0fbeeed1d999160566f09f169e"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaeb170c0fbeeed1d999160566f09f169e">AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT</a>   8</td></tr>
-<tr class="separator:gaeb170c0fbeeed1d999160566f09f169e"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gac35dbbc035371e799d8badabc981e8fa"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a></td></tr>
-<tr class="separator:gac35dbbc035371e799d8badabc981e8fa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga21d8182651f4b61ae558560023e8339c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a></td></tr>
-<tr class="separator:ga21d8182651f4b61ae558560023e8339c"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gabc6126af1d45847bc59afa0aa3216b04"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a9506627d5377c67dbc7fc58804b2cdfd">AKEY_STATE_UNKNOWN</a> = -1,
-<a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04afa14022f587487c24d401c87e71c8e28">AKEY_STATE_UP</a> = 0,
-<a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a286ec0a7aff5903a982be0cd6785b62c">AKEY_STATE_DOWN</a> = 1,
-<a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04ad09fd9fe458ca6c66ead9b9a75c56192">AKEY_STATE_VIRTUAL</a> = 2
- }</td></tr>
-<tr class="separator:gabc6126af1d45847bc59afa0aa3216b04"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadc29c2ff13d900c2f185ee95427fb06c"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cae0a3cb26517b3f876beb37594494526d">AMETA_NONE</a> = 0,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caba44b1077427e4da1d202e0c8f772881">AMETA_ALT_ON</a> = 0x02,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca256c74b768ecee57e3218e81ae6945df">AMETA_ALT_LEFT_ON</a> = 0x10,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca985db074c0f44749ca86b5cc0454056a">AMETA_ALT_RIGHT_ON</a> = 0x20,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa3d5f49c3a55b653a94c798a2c93b197">AMETA_SHIFT_ON</a> = 0x01,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa01fa027cdd8951530437bcbe04c3ed7">AMETA_SHIFT_LEFT_ON</a> = 0x40,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cac52930581c339216218a6f50c5b57aa1">AMETA_SHIFT_RIGHT_ON</a> = 0x80,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca8af1e90950a728baca807a83e50b22ea">AMETA_SYM_ON</a> = 0x04,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca545b31b72b0454c22c170ff534ddfdf1">AMETA_FUNCTION_ON</a> = 0x08,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cabe927318a2a11a46be3e9d78dbd81ef5">AMETA_CTRL_ON</a> = 0x1000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca752c837afd5ff0fcf75ddee7b6808be6">AMETA_CTRL_LEFT_ON</a> = 0x2000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca0ab007e367ae136b873b3e6636747419">AMETA_CTRL_RIGHT_ON</a> = 0x4000,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca9c04e7c2ad1f0f41af60402188a29c4a">AMETA_META_ON</a> = 0x10000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca6f923de8f2cd72e3ad86149c0747906f">AMETA_META_LEFT_ON</a> = 0x20000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafdf56d1259ae16c97161c443d7949bdf">AMETA_META_RIGHT_ON</a> = 0x40000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafc467c98d509b0de28b298801a0c3e37">AMETA_CAPS_LOCK_ON</a> = 0x100000,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca15d234534a6870add5594f02b7333dc6">AMETA_NUM_LOCK_ON</a> = 0x200000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafe8dacdc6566f655a3eab73ea4a9af5a">AMETA_SCROLL_LOCK_ON</a> = 0x400000
-<br/>
- }</td></tr>
-<tr class="separator:gadc29c2ff13d900c2f185ee95427fb06c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga61dadd085c1777f559549e05962b2c9e"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea696f0d7635f7a24c17d3f1e4ccdd44ba">AINPUT_EVENT_TYPE_KEY</a> = 1,
-<a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea2182dfda2cceb5425dcc2823b9b6b56a">AINPUT_EVENT_TYPE_MOTION</a> = 2
- }</td></tr>
-<tr class="separator:ga61dadd085c1777f559549e05962b2c9e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga726ca809ffd3d67ab4b8476646f26635"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a123c3bd18fd93b53d8aedbe7597f7b49">AKEY_EVENT_ACTION_DOWN</a> = 0,
-<a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635abf18b7c5384c5de8657a0650f8da57c3">AKEY_EVENT_ACTION_UP</a> = 1,
-<a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a08e2d927e155478ee66ec46ebd845ab0">AKEY_EVENT_ACTION_MULTIPLE</a> = 2
- }</td></tr>
-<tr class="separator:ga726ca809ffd3d67ab4b8476646f26635"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0411cd49bb5b71852cecd93bcbf0ca2d"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da6473a1afc0cc39e029c2a217bc57cdba">AKEY_EVENT_FLAG_WOKE_HERE</a> = 0x1,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da7dbb272c7b28be9c084df3446a629f32">AKEY_EVENT_FLAG_SOFT_KEYBOARD</a> = 0x2,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dadc0a063ca412b0ea08474df422bf9b41">AKEY_EVENT_FLAG_KEEP_TOUCH_MODE</a> = 0x4,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dae1e7ec188b2404fadd94cfba89afd5d6">AKEY_EVENT_FLAG_FROM_SYSTEM</a> = 0x8,
-<br/>
-  <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dab9dbcf990d1e4405e32f847fdea52013">AKEY_EVENT_FLAG_EDITOR_ACTION</a> = 0x10,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da3198fad5ab75df614bb41f0f602a9e55">AKEY_EVENT_FLAG_CANCELED</a> = 0x20,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dad4b5eba5b14e4076c69bc7185f2804f8">AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY</a> = 0x40,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da39f9f7bdf2e256db0e2a8a5dfbfb7185">AKEY_EVENT_FLAG_LONG_PRESS</a> = 0x80,
-<br/>
-  <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2daf09856f03f2fffee9a82cb8e508efb7a">AKEY_EVENT_FLAG_CANCELED_LONG_PRESS</a> = 0x100,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da91e70ab527f27a1779f4550d457f1689">AKEY_EVENT_FLAG_TRACKING</a> = 0x200,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da14f574126d2544863fa8042ddd0f48c0">AKEY_EVENT_FLAG_FALLBACK</a> = 0x400
-<br/>
- }</td></tr>
-<tr class="separator:ga0411cd49bb5b71852cecd93bcbf0ca2d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabed82baf7f470b522273a3e37c24c600"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600abf84a22c84d4b7228102b80f3af92a4f">AMOTION_EVENT_ACTION_MASK</a> = 0xff,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a51384339fbb57c0087f7f50c45d9cff3">AMOTION_EVENT_ACTION_POINTER_INDEX_MASK</a> = 0xff00,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a225e61c48ba334abc1b5811db02edcf1">AMOTION_EVENT_ACTION_DOWN</a> = 0,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a43798b2b7a6de4616d150b2438b8419e">AMOTION_EVENT_ACTION_UP</a> = 1,
-<br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a41c56c4e772953fce60c93bc671639a3">AMOTION_EVENT_ACTION_MOVE</a> = 2,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a3952b960f5eb8c4f55b42741e286b74e">AMOTION_EVENT_ACTION_CANCEL</a> = 3,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517">AMOTION_EVENT_ACTION_OUTSIDE</a> = 4,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a1618c641fd3f49fa7483f298d05b3cd2">AMOTION_EVENT_ACTION_POINTER_DOWN</a> = 5,
-<br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600af2ef56aa7220eeb2073b9b028737bc1e">AMOTION_EVENT_ACTION_POINTER_UP</a> = 6,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a84bc9fb3c01ff7ca9ee452a510e7de60">AMOTION_EVENT_ACTION_HOVER_MOVE</a> = 7,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a45ba62b1e6fab4e84d5782d7c35ced04">AMOTION_EVENT_ACTION_SCROLL</a> = 8,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a247b2c60ad92f3130ad43c907986ffb3">AMOTION_EVENT_ACTION_HOVER_ENTER</a> = 9,
-<br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600ac00b1eacfbea779863abf3fcf02134aa">AMOTION_EVENT_ACTION_HOVER_EXIT</a> = 10
-<br/>
- }</td></tr>
-<tr class="separator:gabed82baf7f470b522273a3e37c24c600"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab04a0655cd1e3bcac5e8f48c18df1a57"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#ggab04a0655cd1e3bcac5e8f48c18df1a57a200623e1e4eee7797cad30917d289d7a">AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED</a> = 0x1
- }</td></tr>
-<tr class="separator:gab04a0655cd1e3bcac5e8f48c18df1a57"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga385c44f6fb256e5716a2302a5b940388"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a37dd7496968e6defbecc3c8d6ab2734d">AMOTION_EVENT_EDGE_FLAG_NONE</a> = 0,
-<a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a915e1ade9b600d11a3c70a17a88de757">AMOTION_EVENT_EDGE_FLAG_TOP</a> = 0x01,
-<a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388ad8b662839787e1c7dd2616f32c02aaeb">AMOTION_EVENT_EDGE_FLAG_BOTTOM</a> = 0x02,
-<a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388afb70c13f16daade25ba8132a5ea3cf52">AMOTION_EVENT_EDGE_FLAG_LEFT</a> = 0x04,
-<br/>
-  <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a7d45674e03f1876a43d4810508905078">AMOTION_EVENT_EDGE_FLAG_RIGHT</a> = 0x08
-<br/>
- }</td></tr>
-<tr class="separator:ga385c44f6fb256e5716a2302a5b940388"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabc5c98fcc1211af2b80116dd6e0a035d"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f4b5b009634039a1f361048a5fc6064">AMOTION_EVENT_AXIS_X</a> = 0,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da64f7de8558265bd8179d206eb33eff6c">AMOTION_EVENT_AXIS_Y</a> = 1,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da3b4fd0f17cfdeb6a055babecd2b0ded8">AMOTION_EVENT_AXIS_PRESSURE</a> = 2,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da4baba3ccaec881089a864ba6deaf8bd6">AMOTION_EVENT_AXIS_SIZE</a> = 3,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da792b9e01044a2e43e7f80e5559db20c2">AMOTION_EVENT_AXIS_TOUCH_MAJOR</a> = 4,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa8b24b0f01f24898a36e5751c8eca63c">AMOTION_EVENT_AXIS_TOUCH_MINOR</a> = 5,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa273d64c392f86ae789fd5e24661ba0a">AMOTION_EVENT_AXIS_TOOL_MAJOR</a> = 6,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadebd200b37ffaf36b94e7e478c559142">AMOTION_EVENT_AXIS_TOOL_MINOR</a> = 7,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da114f2b3fc233ccf7a4470787c31457d2">AMOTION_EVENT_AXIS_ORIENTATION</a> = 8,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dad11be04b4b81715cad905ee9fa348e99">AMOTION_EVENT_AXIS_VSCROLL</a> = 9,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da92955e6b0f3f82af66a505c854e9edff">AMOTION_EVENT_AXIS_HSCROLL</a> = 10,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5a689e572da9bc5feafcb6c011368305">AMOTION_EVENT_AXIS_Z</a> = 11,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da689b612864177d6b57d4181442e3e38e">AMOTION_EVENT_AXIS_RX</a> = 12,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa20188da209300e1f80f6f5bd4058e13">AMOTION_EVENT_AXIS_RY</a> = 13,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da381948b3321afd390ad164345eb9206b">AMOTION_EVENT_AXIS_RZ</a> = 14,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da04245c76cb9b32dcba920661f11ac9da">AMOTION_EVENT_AXIS_HAT_X</a> = 15,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da98c323321d908db459e7cf86a7e8a482">AMOTION_EVENT_AXIS_HAT_Y</a> = 16,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae4c65c3b1bd2946ff9e18c6041cdb591">AMOTION_EVENT_AXIS_LTRIGGER</a> = 17,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da116e80c6be166290ca481fefa5de38c1">AMOTION_EVENT_AXIS_RTRIGGER</a> = 18,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da6d1f5d64e607104964eb43d8fae07a4f">AMOTION_EVENT_AXIS_THROTTLE</a> = 19,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da318a0782f895949407fc192fc4280257">AMOTION_EVENT_AXIS_RUDDER</a> = 20,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0ae83ebd74e672bb35378b92a440b1d">AMOTION_EVENT_AXIS_WHEEL</a> = 21,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0223f235a6044815918af2abafcbf16">AMOTION_EVENT_AXIS_GAS</a> = 22,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae3a99764f3681dd9e094852bb2489ece">AMOTION_EVENT_AXIS_BRAKE</a> = 23,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae800909411a1e83173b0eef7aa458d0e">AMOTION_EVENT_AXIS_DISTANCE</a> = 24,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafca0a235f69c4b38bfc95e7a7b8d9ab1">AMOTION_EVENT_AXIS_TILT</a> = 25,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadcc18afd3a7069412617df34db5a27bc">AMOTION_EVENT_AXIS_GENERIC_1</a> = 32,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac4addf06abfa6c76f0578ddde049aad5">AMOTION_EVENT_AXIS_GENERIC_2</a> = 33,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac7df57ef5082e10be83f66d7477bce9c">AMOTION_EVENT_AXIS_GENERIC_3</a> = 34,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da321873d126b7d545665096694cb7d9d9">AMOTION_EVENT_AXIS_GENERIC_4</a> = 35,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da9b47cef7060197e1b0302a8a718c3085">AMOTION_EVENT_AXIS_GENERIC_5</a> = 36,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daad7e47a1b5fb66864b6d988374f50a84">AMOTION_EVENT_AXIS_GENERIC_6</a> = 37,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da222c06f51a60e59504b635dbf89a025b">AMOTION_EVENT_AXIS_GENERIC_7</a> = 38,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab59a8a373a913e40b146ed762976d6fe">AMOTION_EVENT_AXIS_GENERIC_8</a> = 39,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da721fa0fbca8b22f1ecc8d3870f4e7443">AMOTION_EVENT_AXIS_GENERIC_9</a> = 40,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da29ba08f4ddc658e0127ee5bc08d185f2">AMOTION_EVENT_AXIS_GENERIC_10</a> = 41,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafc64a4b307f62bb12b645918aa7edb57">AMOTION_EVENT_AXIS_GENERIC_11</a> = 42,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae5d32b3e9cec4936ae1e074f320c3063">AMOTION_EVENT_AXIS_GENERIC_12</a> = 43,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f19f5bc52e5eaec5ebd4f07aad12180">AMOTION_EVENT_AXIS_GENERIC_13</a> = 44,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadb866d826ecf25161d7c7f86166e149b">AMOTION_EVENT_AXIS_GENERIC_14</a> = 45,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da7e86befc8502b8df687284f3c40b2eca">AMOTION_EVENT_AXIS_GENERIC_15</a> = 46,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daaaa011ba929b18c6da71153638f92336">AMOTION_EVENT_AXIS_GENERIC_16</a> = 47
-<br/>
- }</td></tr>
-<tr class="separator:gabc5c98fcc1211af2b80116dd6e0a035d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac36f475ca5b446f4fde4c9b90bec77c8"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ab388f65477b9dd4c51e6367111168d65">AMOTION_EVENT_BUTTON_PRIMARY</a> = 1 << 0,
-<a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a08118700ecb4e147528a0e725afc9451">AMOTION_EVENT_BUTTON_SECONDARY</a> = 1 << 1,
-<a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ae6e2af1e7065e035e8a10a595827180f">AMOTION_EVENT_BUTTON_TERTIARY</a> = 1 << 2,
-<a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a1841d075a2992ff7fbefa3fd50189b86">AMOTION_EVENT_BUTTON_BACK</a> = 1 << 3,
-<br/>
-  <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a4105edf43f7748c52c859cc5aa7dc438">AMOTION_EVENT_BUTTON_FORWARD</a> = 1 << 4
-<br/>
- }</td></tr>
-<tr class="separator:gac36f475ca5b446f4fde4c9b90bec77c8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga05589fbab0657f08285ebdfe93f5ec9e"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7e1ea0c955ebbac1349866e8995e0208">AMOTION_EVENT_TOOL_TYPE_UNKNOWN</a> = 0,
-<a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eafd789262defb8a268fa80d26b0c30bcc">AMOTION_EVENT_TOOL_TYPE_FINGER</a> = 1,
-<a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf05dc95a74e560c89cec1f3100185fc7">AMOTION_EVENT_TOOL_TYPE_STYLUS</a> = 2,
-<a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7be0c750d7d6719e7c948914400ae0de">AMOTION_EVENT_TOOL_TYPE_MOUSE</a> = 3,
-<br/>
-  <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf9932f65b5b6b5800fb5873a60dbf0cb">AMOTION_EVENT_TOOL_TYPE_ERASER</a> = 4
-<br/>
- }</td></tr>
-<tr class="separator:ga05589fbab0657f08285ebdfe93f5ec9e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga16af7b253440dadd46a80a4b9fddba4d"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daae438f475d03ea60fd9fb356abd7fa01">AINPUT_SOURCE_CLASS_MASK</a> = 0x000000ff,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dafd6d5e71f09f6452acf017559481444c">AINPUT_SOURCE_CLASS_NONE</a> = 0x00000000,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dacf1bf3d7b3c6e59f907bdffc9b33370e">AINPUT_SOURCE_CLASS_BUTTON</a> = 0x00000001,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da7495274e98fb30dee3dfd903b878cf47">AINPUT_SOURCE_CLASS_POINTER</a> = 0x00000002,
-<br/>
-  <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da078a18d85d078412721c336a879bcc1a">AINPUT_SOURCE_CLASS_NAVIGATION</a> = 0x00000004,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da682f6982bb55ee809f6acd2deb550167">AINPUT_SOURCE_CLASS_POSITION</a> = 0x00000008,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daaaeffb6442807dd96ec62e9d8a696b57">AINPUT_SOURCE_CLASS_JOYSTICK</a> = 0x00000010
-<br/>
- }</td></tr>
-<tr class="separator:ga16af7b253440dadd46a80a4b9fddba4d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaba01db17f4a2bfbc3db60dc172972a25"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae9348bc04cdaa88b5b010f77a4945454">AINPUT_SOURCE_UNKNOWN</a> = 0x00000000,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a9860918666dd8c0b9d00a8da7af51e6d">AINPUT_SOURCE_KEYBOARD</a> = 0x00000100 | AINPUT_SOURCE_CLASS_BUTTON,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ad0fbfeff9f8d57104bff14c70ce5e3ef">AINPUT_SOURCE_DPAD</a> = 0x00000200 | AINPUT_SOURCE_CLASS_BUTTON,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a6417cb50ecd6ade48c708268434a49d3">AINPUT_SOURCE_GAMEPAD</a> = 0x00000400 | AINPUT_SOURCE_CLASS_BUTTON,
-<br/>
-  <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a55ea411f927aed8964fa72fec0da444f">AINPUT_SOURCE_TOUCHSCREEN</a> = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae71d3dcbd004bccb6e00fde47097cd86">AINPUT_SOURCE_MOUSE</a> = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a86d4983c71432b27634ba41a64bffdf9">AINPUT_SOURCE_STYLUS</a> = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e49d9153c86f60f626d7f797f4e78b6">AINPUT_SOURCE_TRACKBALL</a> = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
-<br/>
-  <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e0715d4b544653ab11893434172a2ef">AINPUT_SOURCE_TOUCHPAD</a> = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a3712c4e4fb8ad7f6ae6e40d48e5c6ee7">AINPUT_SOURCE_TOUCH_NAVIGATION</a> = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25afb28f10dc074e7f7435f5904c513edb5">AINPUT_SOURCE_JOYSTICK</a> = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ab04317e7dd273ff5c87038df67d9796e">AINPUT_SOURCE_ANY</a> = 0xffffff00
-<br/>
- }</td></tr>
-<tr class="separator:gaba01db17f4a2bfbc3db60dc172972a25"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf105ae5beaca1dee30ae54530691fce"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fcea32cb7ce34cdce7095962f0766cc6c3ac">AINPUT_KEYBOARD_TYPE_NONE</a> = 0,
-<a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaf0226d750ea830eb557ae68bd4a1c82a">AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC</a> = 1,
-<a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaba1f5ab6bc79749ba96a5d2a3af0e574">AINPUT_KEYBOARD_TYPE_ALPHABETIC</a> = 2
- }</td></tr>
-<tr class="separator:gaaf105ae5beaca1dee30ae54530691fce"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga80155586fa275b28773c9b203f52caba"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa0e5816bc48cdb33f2b488a109596ffe1">AINPUT_MOTION_RANGE_X</a> = AMOTION_EVENT_AXIS_X,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaab48108c9450ea1b7cd021be7d8cbc332">AINPUT_MOTION_RANGE_Y</a> = AMOTION_EVENT_AXIS_Y,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa79aca706b12b28d0ab14762902fed31a">AINPUT_MOTION_RANGE_PRESSURE</a> = AMOTION_EVENT_AXIS_PRESSURE,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa46f3a6cf859fb161cd29398d8448c688">AINPUT_MOTION_RANGE_SIZE</a> = AMOTION_EVENT_AXIS_SIZE,
-<br/>
-  <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa7ead43624c96e165fd8a25e77148aa67">AINPUT_MOTION_RANGE_TOUCH_MAJOR</a> = AMOTION_EVENT_AXIS_TOUCH_MAJOR,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa301181a0f20681135c15010b39bb575d">AINPUT_MOTION_RANGE_TOUCH_MINOR</a> = AMOTION_EVENT_AXIS_TOUCH_MINOR,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaa860f54aa9e5a269dba6a54bbcf3c27c">AINPUT_MOTION_RANGE_TOOL_MAJOR</a> = AMOTION_EVENT_AXIS_TOOL_MAJOR,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa19226f6cf713c1b4d0973a163daf6cf1">AINPUT_MOTION_RANGE_TOOL_MINOR</a> = AMOTION_EVENT_AXIS_TOOL_MINOR,
-<br/>
-  <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaf9be9c04a41b610d994a3d1d7e90d06d">AINPUT_MOTION_RANGE_ORIENTATION</a> = AMOTION_EVENT_AXIS_ORIENTATION
-<br/>
- }</td></tr>
-<tr class="separator:ga80155586fa275b28773c9b203f52caba"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6b7b47dd702d9e331586d485013fd1ea"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa593f8ae18990d627785719284a12a6f">AKEYCODE_UNKNOWN</a> = 0,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2dc78d3a93876b77402d2a7f02e4b899">AKEYCODE_SOFT_LEFT</a> = 1,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8cadfbfcaaa83fef168de13639adfcae">AKEYCODE_SOFT_RIGHT</a> = 2,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa526c2411b7476b7ae579f57a0378b2dd">AKEYCODE_HOME</a> = 3,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeb71c74bf556ba72e9c8f8dcbe5453d0">AKEYCODE_BACK</a> = 4,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8b5720ebdd3576c2b536ec9228273d8f">AKEYCODE_CALL</a> = 5,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaff971957ae3a4e272b21987854e18d9b">AKEYCODE_ENDCALL</a> = 6,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23f585ea17aeceaad2111c51ab289e79">AKEYCODE_0</a> = 7,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabcac88b54f8d764bc4573ecc5b9571b0">AKEYCODE_1</a> = 8,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2079c6fb75141968b60ed79fe895d6db">AKEYCODE_2</a> = 9,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa40ccc018c0637e4d938e66b789054551">AKEYCODE_3</a> = 10,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c2d141c3906bd97cfec91443356f7b">AKEYCODE_4</a> = 11,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca99d2be4a3723ba3406944ad623f6e">AKEYCODE_5</a> = 12,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa72bc6560e24d08ff8f3116dac9179079">AKEYCODE_6</a> = 13,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa27070499acdb6c527a285b3840ec7bff">AKEYCODE_7</a> = 14,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93543b23683b33724ecf77ac5a8c19ab">AKEYCODE_8</a> = 15,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa31cd4d7c4e59cf7b057b6c248cff516d">AKEYCODE_9</a> = 16,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1461fbf54e3dcba96e5d6d0638c18305">AKEYCODE_STAR</a> = 17,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf448758c44899e41b67f76dfe3be51e9">AKEYCODE_POUND</a> = 18,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf2fd3133a88f3b6725834032bd74bd9e">AKEYCODE_DPAD_UP</a> = 19,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa84b721b13aae56c9f1d3c22b3d81627a">AKEYCODE_DPAD_DOWN</a> = 20,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa668dfb3ed79a37c2c07838c161c1b344">AKEYCODE_DPAD_LEFT</a> = 21,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac6f9d81b6239696a1836695bbfc6a975">AKEYCODE_DPAD_RIGHT</a> = 22,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e9c93273fd39148f54167133aa5b9ae">AKEYCODE_DPAD_CENTER</a> = 23,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5b81e325d9efd633eef7535a5b538882">AKEYCODE_VOLUME_UP</a> = 24,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a882dae17080d3b5f3329e79db60c66">AKEYCODE_VOLUME_DOWN</a> = 25,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6">AKEYCODE_POWER</a> = 26,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8670880765756933d3d1a10186d39e26">AKEYCODE_CAMERA</a> = 27,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95bd8c25adeaa570108c7403f08a2901">AKEYCODE_CLEAR</a> = 28,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa424a091c62d40f5d65908c9730ae9014">AKEYCODE_A</a> = 29,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa65d3bf8d6a8a6c2f7c1b08394f313758">AKEYCODE_B</a> = 30,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeed584f454e508ce931bcb33d37adb04">AKEYCODE_C</a> = 31,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7e4cb3ef66209a2779be2c8239b57b51">AKEYCODE_D</a> = 32,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae218af7ceb207227bb10f0525e68a8d0">AKEYCODE_E</a> = 33,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa455f71ecfe59af0fbd901ac0d0a8d53a">AKEYCODE_F</a> = 34,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa165067e10464019411f768bba9e533d9">AKEYCODE_G</a> = 35,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad89a91a1500cb162f22962781ebfd9dc">AKEYCODE_H</a> = 36,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4d44b5e4a19580540d8d77bf5755d74b">AKEYCODE_I</a> = 37,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa70c259612ccec117d70afaef947a6a7a">AKEYCODE_J</a> = 38,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ce56cf50d3632c275c524bd78d0d932">AKEYCODE_K</a> = 39,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab61c534fd0f4e56c4ba13861a2f5982b">AKEYCODE_L</a> = 40,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa43b19e5e5234ce90c8e7ef67dd0cabd1">AKEYCODE_M</a> = 41,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c0b26804c89560a9e87c45f7f9fed36">AKEYCODE_N</a> = 42,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa249667bc4a59d99be1914535877329fb">AKEYCODE_O</a> = 43,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac68ef56b78bd0c8626cc68bb6cb9156f">AKEYCODE_P</a> = 44,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa932cf6ea8d87e6d6d97af658dd0fa206">AKEYCODE_Q</a> = 45,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaba25ac2c15a8edbbbff16a9fe6e74532">AKEYCODE_R</a> = 46,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae1ed25c28a8fce578cddb17ca6888ff6">AKEYCODE_S</a> = 47,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2feac8b458ef8eb9c0a0dd73766927c2">AKEYCODE_T</a> = 48,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac1a220314f986aae45d7fe3b35501595">AKEYCODE_U</a> = 49,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4043bc48fa55cce7825176052d6e199a">AKEYCODE_V</a> = 50,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0c80e98547c3daa01f3d9e7f4f00425">AKEYCODE_W</a> = 51,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec585cebac89004faffbdc28dc6d81c5">AKEYCODE_X</a> = 52,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06fc277ef25acdd89d64c18eed0daa9b">AKEYCODE_Y</a> = 53,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7439a09f219a0addc13c758ef7508cce">AKEYCODE_Z</a> = 54,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca0bfbdc67b2c6f76e8fcaaf782c227">AKEYCODE_COMMA</a> = 55,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9dd68c8ecebd4e274e8c357dcdfe8a04">AKEYCODE_PERIOD</a> = 56,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3dec175158abe8679bedd98ed1bc3e1a">AKEYCODE_ALT_LEFT</a> = 57,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd9b6b0846c6999f5df47d29e58ac95d">AKEYCODE_ALT_RIGHT</a> = 58,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafb9875645596928cec46368e74499dc4">AKEYCODE_SHIFT_LEFT</a> = 59,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf9eab1348ae1e8f18ad5bf3c77df4212">AKEYCODE_SHIFT_RIGHT</a> = 60,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1b1bfda850b2acd0b60e8456e2bfa958">AKEYCODE_TAB</a> = 61,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa10389300ac5d70f8d9733564b3cab4e7">AKEYCODE_SPACE</a> = 62,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c1c6752d5db5e02da51d8937e5e3c6f">AKEYCODE_SYM</a> = 63,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaded9ec81ae6dab451665317723b94083">AKEYCODE_EXPLORER</a> = 64,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaade96efe470f428bb5c4eaea6ffc3681c">AKEYCODE_ENVELOPE</a> = 65,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac784a7bbbfbdab05fab6c6a1f29c98ff">AKEYCODE_ENTER</a> = 66,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd013221b457d98975dc47e49817e28a">AKEYCODE_DEL</a> = 67,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa929561086ae7b519fa962597bc85f171">AKEYCODE_GRAVE</a> = 68,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaca10bd34ad0abecfecace908b8cb92ca">AKEYCODE_MINUS</a> = 69,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0a197df7ec719c95ddcd6836e76c8498">AKEYCODE_EQUALS</a> = 70,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabdeda0d373aa37ef2ded5ffdfc008708">AKEYCODE_LEFT_BRACKET</a> = 71,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa084dfa52626040a08d374f8aec066e6a">AKEYCODE_RIGHT_BRACKET</a> = 72,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac90eb064382e3c482ae86abb7b3f701">AKEYCODE_BACKSLASH</a> = 73,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac0a2920161f4f2d97b0b060614b23391">AKEYCODE_SEMICOLON</a> = 74,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab5518a8502914ea5f87ef5d29b32b1b1">AKEYCODE_APOSTROPHE</a> = 75,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa54c047be3811d637a33d9b3e39d16e1a">AKEYCODE_SLASH</a> = 76,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7284f79a266ede479b79726082642e16">AKEYCODE_AT</a> = 77,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe6e880f65bebbdd5246a4164c4ab37a">AKEYCODE_NUM</a> = 78,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0d3d29515a4815fe8d6d8d3291507a33">AKEYCODE_HEADSETHOOK</a> = 79,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23be9506f92f6efe14d47306a39a2187">AKEYCODE_FOCUS</a> = 80,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7f72d867b311e0845aef732dcc66495">AKEYCODE_PLUS</a> = 81,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa707b85e89923b0f760be795972a87d76">AKEYCODE_MENU</a> = 82,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6115506352a5828532fc6a0b91683331">AKEYCODE_NOTIFICATION</a> = 83,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac644fd307fd0ef0d3ed3d2e074c1a4b7">AKEYCODE_SEARCH</a> = 84,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa42f8fe71e8d45b5a83d83d80c3da40e1">AKEYCODE_MEDIA_PLAY_PAUSE</a> = 85,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac4faa33993d80db1326073ea15a38e7d">AKEYCODE_MEDIA_STOP</a> = 86,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5a6c3fc963e8163852b9a23e3a198b3">AKEYCODE_MEDIA_NEXT</a> = 87,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81432c31b00d47f768c29163eb276acb">AKEYCODE_MEDIA_PREVIOUS</a> = 88,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaecd53183b84c23a2ca65670a23674319">AKEYCODE_MEDIA_REWIND</a> = 89,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa69e648024402af688d490a2041f15bca">AKEYCODE_MEDIA_FAST_FORWARD</a> = 90,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f6675d38f50e3556a8531839fd83f02">AKEYCODE_MUTE</a> = 91,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4fd0d4ea5b6898f4a40011b97a739a04">AKEYCODE_PAGE_UP</a> = 92,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0b7fe1c18f53e6328657858a88826393">AKEYCODE_PAGE_DOWN</a> = 93,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacdc7c004da1594fa156de87befef5f41">AKEYCODE_PICTSYMBOLS</a> = 94,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad6a1f88b2cc3b6ff8f1724eb01473ec3">AKEYCODE_SWITCH_CHARSET</a> = 95,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaef2d2ec912aaa9e7215aeab79f7fb086">AKEYCODE_BUTTON_A</a> = 96,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa721765c8f0bbcdb68af06817dbec8e53">AKEYCODE_BUTTON_B</a> = 97,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad622ad5df40d2fdf806abb2adda73b3d">AKEYCODE_BUTTON_C</a> = 98,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa21174962f95e32cd0345ce657d03ebc7">AKEYCODE_BUTTON_X</a> = 99,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6654a8b2c700f7783433c86fcdae7919">AKEYCODE_BUTTON_Y</a> = 100,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06156b68e6de951b44fc662e1b16041f">AKEYCODE_BUTTON_Z</a> = 101,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa32e159826404c7d76c2a433c24de82a2">AKEYCODE_BUTTON_L1</a> = 102,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7c614b3966583b0ad027e45f594ede46">AKEYCODE_BUTTON_R1</a> = 103,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa36a38421637cfa5ebfd8a0296650cdf4">AKEYCODE_BUTTON_L2</a> = 104,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa46d487e9fe31855b7b46739bad58fe3e">AKEYCODE_BUTTON_R2</a> = 105,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68c5d8dcd8fe708ada8f4a4e17feb638">AKEYCODE_BUTTON_THUMBL</a> = 106,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9759d817172d268ced1748909a5f5fbe">AKEYCODE_BUTTON_THUMBR</a> = 107,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3c818d106f4ec793a43749c4c26a8a4">AKEYCODE_BUTTON_START</a> = 108,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa598289bc85f647c237729126ea392a43">AKEYCODE_BUTTON_SELECT</a> = 109,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa19839eebec939407d901a33b75cf2594">AKEYCODE_BUTTON_MODE</a> = 110,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac52177e5508edacb8e9c6d3a25db4fb6">AKEYCODE_ESCAPE</a> = 111,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9516bc190d37fea27e07ddab0c607b51">AKEYCODE_FORWARD_DEL</a> = 112,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaca9d0df6cc18492209eb287e659aeb1">AKEYCODE_CTRL_LEFT</a> = 113,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa99b317cf2f1eb6b06d0226e05223e60c">AKEYCODE_CTRL_RIGHT</a> = 114,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab9dcb68b35c85d380846c85f323868f1">AKEYCODE_CAPS_LOCK</a> = 115,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa78ff5c8316235635f76e3c3179e9a7fc">AKEYCODE_SCROLL_LOCK</a> = 116,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaadfb2d920bbe422c096120d39811c58">AKEYCODE_META_LEFT</a> = 117,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68038455e2b0846db51f9957e0df9cb8">AKEYCODE_META_RIGHT</a> = 118,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1764b777aa56605f4029d3c71fe70722">AKEYCODE_FUNCTION</a> = 119,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14e22c69bcd47ffb4445ee18a4332d84">AKEYCODE_SYSRQ</a> = 120,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa047501f9cf9bce00e6048d8759ea3a23">AKEYCODE_BREAK</a> = 121,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7544f3de2fb5f78bec62af94a32fdc58">AKEYCODE_MOVE_HOME</a> = 122,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5605f49f5271430f5f150efb3cd0398a">AKEYCODE_MOVE_END</a> = 123,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62f663d11e91af750a51ddd060b08644">AKEYCODE_INSERT</a> = 124,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafbf0a16c7746e5dee2fd3adbd50da88a">AKEYCODE_FORWARD</a> = 125,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa615cf6202b0ae0ed550f42f6c64b36a1">AKEYCODE_MEDIA_PLAY</a> = 126,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f4e0178c2028b3042b0a5948e38e4e4">AKEYCODE_MEDIA_PAUSE</a> = 127,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6788c6e1443140b0ec4d004d8293e998">AKEYCODE_MEDIA_CLOSE</a> = 128,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa317bffd44306b021c401d3a26b82a7f6">AKEYCODE_MEDIA_EJECT</a> = 129,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e1eae0b245176aaa024a53411441f9">AKEYCODE_MEDIA_RECORD</a> = 130,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3b84f2c503a9e839f3d36e10e3307fcf">AKEYCODE_F1</a> = 131,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1360f7ec66aa6421e240dae637262e84">AKEYCODE_F2</a> = 132,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a4ce6105e12a3a9071cae2f40515085">AKEYCODE_F3</a> = 133,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa882050e4d0f917470a5b91fbf6ae9ebf">AKEYCODE_F4</a> = 134,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab01807c72b46620bb50fcb6abe24d937">AKEYCODE_F5</a> = 135,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa04a12e81ed80bb42ef5c63cedf0dc60">AKEYCODE_F6</a> = 136,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9583b8e4b0d994b7e3a193b67cf6020c">AKEYCODE_F7</a> = 137,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55ca54d42d8df70de2ce9031db1344c8">AKEYCODE_F8</a> = 138,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0c8225c0ef98da730933ae914077dbc9">AKEYCODE_F9</a> = 139,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa60660b13acab39282d0558cdcc93474">AKEYCODE_F10</a> = 140,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa64cc7b1d8e53d90ff57c39d0b5a4dd22">AKEYCODE_F11</a> = 141,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa491000231e0ba221b6916b1d9d2c9fb7">AKEYCODE_F12</a> = 142,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad5e349eadd3255c6ad4982dc40ed23ef">AKEYCODE_NUM_LOCK</a> = 143,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa343df35e6a0ad0599e19b8ef7174909b">AKEYCODE_NUMPAD_0</a> = 144,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c0ec8e42917fa9ac53977db3e6aeb17">AKEYCODE_NUMPAD_1</a> = 145,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4dfd17c2209908e1ec890e10a3211f89">AKEYCODE_NUMPAD_2</a> = 146,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1efe1886a4b472b999215c0e81f7386">AKEYCODE_NUMPAD_3</a> = 147,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1fdd16681c1441b934f679b94fd0e4f8">AKEYCODE_NUMPAD_4</a> = 148,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5916003e7c737a8cc06e52d2ee76c3b">AKEYCODE_NUMPAD_5</a> = 149,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa13b83389e0f5de129227af4b8d3f035d">AKEYCODE_NUMPAD_6</a> = 150,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaed9468951ef2887c07c8095c2e7d4c93">AKEYCODE_NUMPAD_7</a> = 151,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5f0a300566235720eb93fee9f2196642">AKEYCODE_NUMPAD_8</a> = 152,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad0c490e3965df546e2d5a83edf423d95">AKEYCODE_NUMPAD_9</a> = 153,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac108b744e8f93af69158d146425236c">AKEYCODE_NUMPAD_DIVIDE</a> = 154,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47ce00b838e7ee0a34066dc2595ac735">AKEYCODE_NUMPAD_MULTIPLY</a> = 155,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bee314dbbea0a349eb301d10256bbe">AKEYCODE_NUMPAD_SUBTRACT</a> = 156,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9d2fefa9a3f6037f48b247e66dd28c35">AKEYCODE_NUMPAD_ADD</a> = 157,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6aab6b5914e120b43b3a1a8269e9cee1">AKEYCODE_NUMPAD_DOT</a> = 158,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa900e3bb0bc4ff70ba786f18ff4db0bd1">AKEYCODE_NUMPAD_COMMA</a> = 159,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa79432be5f7a44e99ddc3721fd9fd212e">AKEYCODE_NUMPAD_ENTER</a> = 160,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c1007a59641499ee5e1508e747c5ed">AKEYCODE_NUMPAD_EQUALS</a> = 161,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacc903e9eb495cf6cef7c6bc825f82f54">AKEYCODE_NUMPAD_LEFT_PAREN</a> = 162,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7662e0f2a099239dc69f6a27c7daabf9">AKEYCODE_NUMPAD_RIGHT_PAREN</a> = 163,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa174a5c7c39753235109696e82870c575">AKEYCODE_VOLUME_MUTE</a> = 164,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e76263257a5dc654a413c9dc2fd649">AKEYCODE_INFO</a> = 165,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa056914fd17ae539dca44f43745d8e05c">AKEYCODE_CHANNEL_UP</a> = 166,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa18f1808c6a819e787c9a9941f78b910f">AKEYCODE_CHANNEL_DOWN</a> = 167,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacfce9bb78ef8106dce4868f81cca4fb4">AKEYCODE_ZOOM_IN</a> = 168,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf035f5234c3df4589f35a50e99e0535">AKEYCODE_ZOOM_OUT</a> = 169,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0776ffae512b4848e53fce762a3a5017">AKEYCODE_TV</a> = 170,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe7531c40ff4a31614ff6fd61802ebe8">AKEYCODE_WINDOW</a> = 171,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf33a5fa1f163245360aeed89d64b0233">AKEYCODE_GUIDE</a> = 172,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf2f03b925a02ba6de9fd98737546a60">AKEYCODE_DVR</a> = 173,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa03ce46d177e020690aa9d26a0fa850ae">AKEYCODE_BOOKMARK</a> = 174,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81ba8d5343362b841b8a62b8679ff994">AKEYCODE_CAPTIONS</a> = 175,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bbd457230c3028df6b91d5bdda9159">AKEYCODE_SETTINGS</a> = 176,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafda3b0ea1b158831fc443bf4911a3930">AKEYCODE_TV_POWER</a> = 177,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1750b29e396bd1fd237ed4aadacc8f5">AKEYCODE_TV_INPUT</a> = 178,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab28aea3a51b11c9f227ce8cd5ff55a3d">AKEYCODE_STB_POWER</a> = 179,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa988b0372359b2bca7390878fdba9e1b5">AKEYCODE_STB_INPUT</a> = 180,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa479d36f9814bd00c8986a252664b938b">AKEYCODE_AVR_POWER</a> = 181,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa57d42dbd8ea4219f76fb116f234e6504">AKEYCODE_AVR_INPUT</a> = 182,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2d9e3e82e69955f649b586f4518e074c">AKEYCODE_PROG_RED</a> = 183,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad50c1e2136e47843a8dabca929f8ead1">AKEYCODE_PROG_GREEN</a> = 184,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafa813640412bd41a181f0ec3a33dddc4">AKEYCODE_PROG_YELLOW</a> = 185,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e82219fdb937fee5a22426c607dd4e0">AKEYCODE_PROG_BLUE</a> = 186,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa53a59a262d6d523bdc2bd30a1e427bad">AKEYCODE_APP_SWITCH</a> = 187,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa28c72c33ab93d83539d0790b7e48336a">AKEYCODE_BUTTON_1</a> = 188,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab8089673fea303c7a299eefd2c327cc3">AKEYCODE_BUTTON_2</a> = 189,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa706a5ff492c80b4653e6fe0dcd278ca1">AKEYCODE_BUTTON_3</a> = 190,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c425a063bf6976e1ff8ae9f3cfcbe6">AKEYCODE_BUTTON_4</a> = 191,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47149f963528ec7abe55066abfb7caf5">AKEYCODE_BUTTON_5</a> = 192,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55057c8cda53a4c539d02ab1a93ca58b">AKEYCODE_BUTTON_6</a> = 193,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac09e0c0cbbf6449bf106e4199600db35">AKEYCODE_BUTTON_7</a> = 194,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaee64b3e0f30ed09e3c9f01b6c8877c3f">AKEYCODE_BUTTON_8</a> = 195,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac8e54092c8be5dc0e114ec35f40e00dc">AKEYCODE_BUTTON_9</a> = 196,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7e6f8621909f3461032c33f9c8acaa7">AKEYCODE_BUTTON_10</a> = 197,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab413971c698b6e25d3955667c0142ac1">AKEYCODE_BUTTON_11</a> = 198,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafe4ee1e5446dd12bbb579b412048e79e">AKEYCODE_BUTTON_12</a> = 199,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaabde2ed26594b89d5769eef9f0d1fe6f">AKEYCODE_BUTTON_13</a> = 200,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f08dfd2c30ddedf1d2983680e89041b">AKEYCODE_BUTTON_14</a> = 201,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d8d0fb1a610fdb4e53f0fb675b7d7d0">AKEYCODE_BUTTON_15</a> = 202,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa224370cba99bda2db6a1c82fd2f7fa39">AKEYCODE_BUTTON_16</a> = 203,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7b8e87b47c17c5f1e97fcb56faaa26ff">AKEYCODE_LANGUAGE_SWITCH</a> = 204,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa380279768c5c50d92bef2a88394f967f">AKEYCODE_MANNER_MODE</a> = 205,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68d314a5ec06701205cd0097c5c7145c">AKEYCODE_3D_MODE</a> = 206,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0aa2cfca11b7cabf82341a9dbec83f10">AKEYCODE_CONTACTS</a> = 207,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa114be17d1853c77a7406c024d9e4f076">AKEYCODE_CALENDAR</a> = 208,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14508751d70a0404b194d4b6df83ec72">AKEYCODE_MUSIC</a> = 209,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa293523c40bb9f1d793cd0b984f636573">AKEYCODE_CALCULATOR</a> = 210,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf782be8df9a8ca5dc86c9bfeabac6f22">AKEYCODE_ZENKAKU_HANKAKU</a> = 211,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaadd69273b99eb0b848d98b2d6b3ad3234">AKEYCODE_EISU</a> = 212,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7321e5c6b3cbab142bd16957653b2ac7">AKEYCODE_MUHENKAN</a> = 213,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab0686dd37c57d833d1158b7f1d85ee02">AKEYCODE_HENKAN</a> = 214,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3be7db22b3c8aa046a46631e44863c28">AKEYCODE_KATAKANA_HIRAGANA</a> = 215,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ee19d21912056b902e283efa2d9d14b">AKEYCODE_YEN</a> = 216,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae8b0af04dac5ea56fd55e577fd9e6be4">AKEYCODE_RO</a> = 217,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62d090ae5c95a04dacdff79817dad531">AKEYCODE_KANA</a> = 218,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3f036adb654c7752890a283ecbf838">AKEYCODE_ASSIST</a> = 219,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7cf1bf3528b6d8a0e86998287fe00650">AKEYCODE_BRIGHTNESS_DOWN</a> = 220,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0af6ec416c09d160e364466faa955c36">AKEYCODE_BRIGHTNESS_UP</a> = 221,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3cdb53cdf8c576e272502da06daa52e1">AKEYCODE_MEDIA_AUDIO_TRACK</a> = 222,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafc077e5a6b447ea060c144f6e65bd207">AKEYCODE_SLEEP</a> = 223,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa903c5152d26b3011ae521afa06759429">AKEYCODE_WAKEUP</a> = 224,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0ecddd3dce52cf60c96c5d430b1f553">AKEYCODE_PAIRING</a> = 225,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3ddf83cb2f701911b03c3a738e2e73a">AKEYCODE_MEDIA_TOP_MENU</a> = 226,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa22858c3c30d596ad60f355f75df86e1">AKEYCODE_11</a> = 227,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa781c31195e55b2dcbdd772560dc61aa5">AKEYCODE_12</a> = 228,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa187963dd6f74b96f132f23e01dea35e9">AKEYCODE_LAST_CHANNEL</a> = 229,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa954c2251b2cb53f47637802cb66baf06">AKEYCODE_TV_DATA_SERVICE</a> = 230,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95898663b7f74c93d0b860a43528c744">AKEYCODE_VOICE_ASSIST</a> = 231,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93dd3fd752701af5a5491e01cc15db72">AKEYCODE_TV_RADIO_SERVICE</a> = 232,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3d7b89756df37f01d6d0f13beff1db">AKEYCODE_TV_TELETEXT</a> = 233,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa630a08e07a3b4c6bcac9a1a72d176055">AKEYCODE_TV_NUMBER_ENTRY</a> = 234,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14f2b6fe8550832ef9e3f9aa53164073">AKEYCODE_TV_TERRESTRIAL_ANALOG</a> = 235,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacad8c149251a78760a5fe4931b9cdf16">AKEYCODE_TV_TERRESTRIAL_DIGITAL</a> = 236,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3707d4396417535a611e4548afe33936">AKEYCODE_TV_SATELLITE</a> = 237,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8c52e7d06525c0ee5d943d63a0fa8ea5">AKEYCODE_TV_SATELLITE_BS</a> = 238,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4eea1809a9ff679ed7773332d728c6b0">AKEYCODE_TV_SATELLITE_CS</a> = 239,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17c0e68066b86610ff168c6367af36eb">AKEYCODE_TV_SATELLITE_SERVICE</a> = 240,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec5e46a5afc57953d1772e086307aa42">AKEYCODE_TV_NETWORK</a> = 241,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe33a80d6d3bf889af25cbd77fdb89f9">AKEYCODE_TV_ANTENNA_CABLE</a> = 242,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a50de965f50ab3aa42772aac0808445">AKEYCODE_TV_INPUT_HDMI_1</a> = 243,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7ec65c008471d771bf879ec012f5c7f">AKEYCODE_TV_INPUT_HDMI_2</a> = 244,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a0f267a2696d15bf16127121b1f1c7f">AKEYCODE_TV_INPUT_HDMI_3</a> = 245,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4437c1d8d2d33058cfa71ec7b2771ec5">AKEYCODE_TV_INPUT_HDMI_4</a> = 246,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c3097f14c6582958ba1d14d70115ccd">AKEYCODE_TV_INPUT_COMPOSITE_1</a> = 247,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaada13cbb9d619bc610678ad66325647b9">AKEYCODE_TV_INPUT_COMPOSITE_2</a> = 248,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa156e2dba81e7c73624ccf8c2ef8833ae">AKEYCODE_TV_INPUT_COMPONENT_1</a> = 249,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8db9b6ee1457267abea03430781bb0ec">AKEYCODE_TV_INPUT_COMPONENT_2</a> = 250,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa149b2c8a4817075c0a41e0adf11c8e85">AKEYCODE_TV_INPUT_VGA_1</a> = 251,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa419f0adac43cad104cd6cf83dc5f13f6">AKEYCODE_TV_AUDIO_DESCRIPTION</a> = 252,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaccc5900ca5dd399d5ce11dd8ca324678">AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP</a> = 253,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5fca6a9ec1ce246bf3c53d859ac9f5eb">AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN</a> = 254,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8e79045045293070c8eb9e408f1335b4">AKEYCODE_TV_ZOOM_MODE</a> = 255,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4c18feeafff3c41081073c025ee017b8">AKEYCODE_TV_CONTENTS_MENU</a> = 256,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaadde70071f6a432f367079efa6e1a6fe">AKEYCODE_TV_MEDIA_CONTEXT_MENU</a> = 257,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0293c2a63e4d955080334bef6640840">AKEYCODE_TV_TIMER_PROGRAMMING</a> = 258,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab062b403701292c9e2db96a1f88cc6d9">AKEYCODE_HELP</a> = 259
-<br/>
- }</td></tr>
-<tr class="separator:ga6b7b47dd702d9e331586d485013fd1ea"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga8292ae06aa8120c52d7380d228600b9c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga8292ae06aa8120c52d7380d228600b9c">AInputEvent_getType</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:ga8292ae06aa8120c52d7380d228600b9c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9dd3fd81e51dbfde19ab861541242aa1"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9dd3fd81e51dbfde19ab861541242aa1">AInputEvent_getDeviceId</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:ga9dd3fd81e51dbfde19ab861541242aa1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac90d4b497669dbc709ec9650db4e49be"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gac90d4b497669dbc709ec9650db4e49be">AInputEvent_getSource</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:gac90d4b497669dbc709ec9650db4e49be"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga36ec0b59f98f86a7ca263ba91279896d"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga36ec0b59f98f86a7ca263ba91279896d">AKeyEvent_getAction</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga36ec0b59f98f86a7ca263ba91279896d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2a18e98efe0c4ccb6f39bb13c555010e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2a18e98efe0c4ccb6f39bb13c555010e">AKeyEvent_getFlags</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga2a18e98efe0c4ccb6f39bb13c555010e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6b01ecd60018a5445f4917a861ca9466"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga6b01ecd60018a5445f4917a861ca9466">AKeyEvent_getKeyCode</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga6b01ecd60018a5445f4917a861ca9466"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4a0a846b7a195aeb290dfcd2250137d9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga4a0a846b7a195aeb290dfcd2250137d9">AKeyEvent_getScanCode</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga4a0a846b7a195aeb290dfcd2250137d9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabdda62b40b22727af2fb41740bf4787b"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gabdda62b40b22727af2fb41740bf4787b">AKeyEvent_getMetaState</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:gabdda62b40b22727af2fb41740bf4787b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5358fe3ebbd4b5b2f88a4ad2eba6f885"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5358fe3ebbd4b5b2f88a4ad2eba6f885">AKeyEvent_getRepeatCount</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga5358fe3ebbd4b5b2f88a4ad2eba6f885"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf475b6f0860bdfca4ceea7bc46eab1a9"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaf475b6f0860bdfca4ceea7bc46eab1a9">AKeyEvent_getDownTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:gaf475b6f0860bdfca4ceea7bc46eab1a9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae3eac7d68195d1767c947ca267842696"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gae3eac7d68195d1767c947ca267842696">AKeyEvent_getEventTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:gae3eac7d68195d1767c947ca267842696"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga73ea2093cc2343675ac43dd08bef4247"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga73ea2093cc2343675ac43dd08bef4247">AMotionEvent_getAction</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga73ea2093cc2343675ac43dd08bef4247"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2891d19197c070207098fa48adeb35af"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2891d19197c070207098fa48adeb35af">AMotionEvent_getFlags</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga2891d19197c070207098fa48adeb35af"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5644f0d952e3dea57ba9f7ce51dff2bb"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5644f0d952e3dea57ba9f7ce51dff2bb">AMotionEvent_getMetaState</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga5644f0d952e3dea57ba9f7ce51dff2bb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1aa7ebb749416491b6f0c55ae87ddf49"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga1aa7ebb749416491b6f0c55ae87ddf49">AMotionEvent_getButtonState</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga1aa7ebb749416491b6f0c55ae87ddf49"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad7e1f0caa4c27194d4a8756a18432299"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gad7e1f0caa4c27194d4a8756a18432299">AMotionEvent_getEdgeFlags</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:gad7e1f0caa4c27194d4a8756a18432299"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad44be7697e68891688cd7bcfaffec209"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gad44be7697e68891688cd7bcfaffec209">AMotionEvent_getDownTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:gad44be7697e68891688cd7bcfaffec209"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7e13fbf3cff0700b0b620284ebdd3a33"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7e13fbf3cff0700b0b620284ebdd3a33">AMotionEvent_getEventTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga7e13fbf3cff0700b0b620284ebdd3a33"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7a94ce622eb78a17737fd8bddbf86e21"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7a94ce622eb78a17737fd8bddbf86e21">AMotionEvent_getXOffset</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga7a94ce622eb78a17737fd8bddbf86e21"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7f6bd2c12d912f502c245b6ced6d3704"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7f6bd2c12d912f502c245b6ced6d3704">AMotionEvent_getYOffset</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga7f6bd2c12d912f502c245b6ced6d3704"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga81a9be07673a01f43fd0241c7b4c254f"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga81a9be07673a01f43fd0241c7b4c254f">AMotionEvent_getXPrecision</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga81a9be07673a01f43fd0241c7b4c254f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae311e6e28bce4be905526f9ea71278ed"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gae311e6e28bce4be905526f9ea71278ed">AMotionEvent_getYPrecision</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:gae311e6e28bce4be905526f9ea71278ed"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga612e68d104adbc6d14d87510e8066bd8"><td class="memItemLeft" align="right" valign="top">size_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga612e68d104adbc6d14d87510e8066bd8">AMotionEvent_getPointerCount</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga612e68d104adbc6d14d87510e8066bd8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga599e21a79c706807243a8ee31b116138"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga599e21a79c706807243a8ee31b116138">AMotionEvent_getPointerId</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga599e21a79c706807243a8ee31b116138"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2babe4e2e79952e004538f8f1878649c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2babe4e2e79952e004538f8f1878649c">AMotionEvent_getToolType</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga2babe4e2e79952e004538f8f1878649c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafe45e29ef138cc30592237ce479837f0"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gafe45e29ef138cc30592237ce479837f0">AMotionEvent_getRawX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:gafe45e29ef138cc30592237ce479837f0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5a09c3d742a93270861aa05f24257c23"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5a09c3d742a93270861aa05f24257c23">AMotionEvent_getRawY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga5a09c3d742a93270861aa05f24257c23"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga22e255a5fa52761cd92ce78af91e9757"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga22e255a5fa52761cd92ce78af91e9757">AMotionEvent_getX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga22e255a5fa52761cd92ce78af91e9757"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga113f58a37e41f2a6c3007d68418edfa6"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga113f58a37e41f2a6c3007d68418edfa6">AMotionEvent_getY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga113f58a37e41f2a6c3007d68418edfa6"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga97fcaa6cd08c9d54b35711e482e06c8d"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga97fcaa6cd08c9d54b35711e482e06c8d">AMotionEvent_getPressure</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga97fcaa6cd08c9d54b35711e482e06c8d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9b1f3c3df46b5269f9e74d2dd70c88a8"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9b1f3c3df46b5269f9e74d2dd70c88a8">AMotionEvent_getSize</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga9b1f3c3df46b5269f9e74d2dd70c88a8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9ac18fe19534e07d80441582f489d471"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9ac18fe19534e07d80441582f489d471">AMotionEvent_getTouchMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga9ac18fe19534e07d80441582f489d471"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga65f71e257b5fcb29dcbaaf59b3fcb3a7"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga65f71e257b5fcb29dcbaaf59b3fcb3a7">AMotionEvent_getTouchMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga65f71e257b5fcb29dcbaaf59b3fcb3a7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac04099690f278a6a27191c2027b12a77"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gac04099690f278a6a27191c2027b12a77">AMotionEvent_getToolMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:gac04099690f278a6a27191c2027b12a77"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2222d459759ba4a8269647012d2718fb"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2222d459759ba4a8269647012d2718fb">AMotionEvent_getToolMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga2222d459759ba4a8269647012d2718fb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad28422998da15b789edcba6b8bc5d615"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gad28422998da15b789edcba6b8bc5d615">AMotionEvent_getOrientation</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:gad28422998da15b789edcba6b8bc5d615"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9d364cdcebf85237f599b25861f38c21"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9d364cdcebf85237f599b25861f38c21">AMotionEvent_getAxisValue</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, int32_t axis, size_t pointer_index)</td></tr>
-<tr class="separator:ga9d364cdcebf85237f599b25861f38c21"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0aef34c236db6d7a56a50bf590be7bcc"><td class="memItemLeft" align="right" valign="top">size_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga0aef34c236db6d7a56a50bf590be7bcc">AMotionEvent_getHistorySize</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga0aef34c236db6d7a56a50bf590be7bcc"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga523f1a760754206965b42b08d62f9346"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga523f1a760754206965b42b08d62f9346">AMotionEvent_getHistoricalEventTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t history_index)</td></tr>
-<tr class="separator:ga523f1a760754206965b42b08d62f9346"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5d36c2e7420001c86ae2aa1168fe6f83"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5d36c2e7420001c86ae2aa1168fe6f83">AMotionEvent_getHistoricalRawX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga5d36c2e7420001c86ae2aa1168fe6f83"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6deb0e7690a93aa53e5872c2691b69fe"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga6deb0e7690a93aa53e5872c2691b69fe">AMotionEvent_getHistoricalRawY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga6deb0e7690a93aa53e5872c2691b69fe"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga49a8ca89ff377b5ed2355e8d7220ae07"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga49a8ca89ff377b5ed2355e8d7220ae07">AMotionEvent_getHistoricalX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga49a8ca89ff377b5ed2355e8d7220ae07"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga30fc4e5d3ce144955859f8c97b51b73d"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga30fc4e5d3ce144955859f8c97b51b73d">AMotionEvent_getHistoricalY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga30fc4e5d3ce144955859f8c97b51b73d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa8e9352ee5b043b3e1b6e2062d491010"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaa8e9352ee5b043b3e1b6e2062d491010">AMotionEvent_getHistoricalPressure</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gaa8e9352ee5b043b3e1b6e2062d491010"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0a04bb7ec12928db7e62645e7fad3a9e"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga0a04bb7ec12928db7e62645e7fad3a9e">AMotionEvent_getHistoricalSize</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga0a04bb7ec12928db7e62645e7fad3a9e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf437f223668b97f19ebdbad4b9cf4483"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaf437f223668b97f19ebdbad4b9cf4483">AMotionEvent_getHistoricalTouchMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gaf437f223668b97f19ebdbad4b9cf4483"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga126715d966e989652aa1ae5d38e0e898"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga126715d966e989652aa1ae5d38e0e898">AMotionEvent_getHistoricalTouchMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga126715d966e989652aa1ae5d38e0e898"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga160a5830e791e8c42ae97f51b92233d2"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga160a5830e791e8c42ae97f51b92233d2">AMotionEvent_getHistoricalToolMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga160a5830e791e8c42ae97f51b92233d2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafe01aa7576a6d1bce750fb8482355849"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gafe01aa7576a6d1bce750fb8482355849">AMotionEvent_getHistoricalToolMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gafe01aa7576a6d1bce750fb8482355849"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaab9cb8fa670175ecc73c75eed4e5cd3f"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaab9cb8fa670175ecc73c75eed4e5cd3f">AMotionEvent_getHistoricalOrientation</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gaab9cb8fa670175ecc73c75eed4e5cd3f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7ca740e1324f3cdb934252dce0c982d0"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7ca740e1324f3cdb934252dce0c982d0">AMotionEvent_getHistoricalAxisValue</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, int32_t axis, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga7ca740e1324f3cdb934252dce0c982d0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga900711156bfb58d1a4b158da7874930f"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga900711156bfb58d1a4b158da7874930f">AInputQueue_attachLooper</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int ident, <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> callback, void *data)</td></tr>
-<tr class="separator:ga900711156bfb58d1a4b158da7874930f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaeebe9f83392ac79b31ca40a6fd4dbeff"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaeebe9f83392ac79b31ca40a6fd4dbeff">AInputQueue_detachLooper</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td></tr>
-<tr class="separator:gaeebe9f83392ac79b31ca40a6fd4dbeff"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2b72ad6ab5ef656e8c41163aa7871c96"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2b72ad6ab5ef656e8c41163aa7871c96">AInputQueue_hasEvents</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td></tr>
-<tr class="separator:ga2b72ad6ab5ef656e8c41163aa7871c96"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga88de12e2b39787ba7d3e4ce2ea46a48c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga88de12e2b39787ba7d3e4ce2ea46a48c">AInputQueue_getEvent</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> **outEvent)</td></tr>
-<tr class="separator:ga88de12e2b39787ba7d3e4ce2ea46a48c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadecd32e6c7aefa4a508b355550d3eaa9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gadecd32e6c7aefa4a508b355550d3eaa9">AInputQueue_preDispatchEvent</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:gadecd32e6c7aefa4a508b355550d3eaa9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga17e87e0f35d47d729eac31a0dfb1ac33"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga17e87e0f35d47d729eac31a0dfb1ac33">AInputQueue_finishEvent</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event, int handled)</td></tr>
-<tr class="separator:ga17e87e0f35d47d729eac31a0dfb1ac33"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Macro Definition Documentation</h2>
-<a class="anchor" id="gaeb170c0fbeeed1d999160566f09f169e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">#define AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT   8</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Bit shift for the action bits holding the pointer index as defined by AMOTION_EVENT_ACTION_POINTER_INDEX_MASK. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="gac35dbbc035371e799d8badabc981e8fa"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Input events.</p>
-<p>Input events are opaque structures. Use the provided accessors functions to read their properties. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga21d8182651f4b61ae558560023e8339c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Input queue</p>
-<p>An input queue is the facility through which you retrieve input events. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="ga385c44f6fb256e5716a2302a5b940388"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Motion event edge touch flags. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga385c44f6fb256e5716a2302a5b940388a37dd7496968e6defbecc3c8d6ab2734d"></a>AMOTION_EVENT_EDGE_FLAG_NONE</em> </td><td class="fielddoc">
-<p>No edges intersected. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga385c44f6fb256e5716a2302a5b940388a915e1ade9b600d11a3c70a17a88de757"></a>AMOTION_EVENT_EDGE_FLAG_TOP</em> </td><td class="fielddoc">
-<p>Flag indicating the motion event intersected the top edge of the screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga385c44f6fb256e5716a2302a5b940388ad8b662839787e1c7dd2616f32c02aaeb"></a>AMOTION_EVENT_EDGE_FLAG_BOTTOM</em> </td><td class="fielddoc">
-<p>Flag indicating the motion event intersected the bottom edge of the screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga385c44f6fb256e5716a2302a5b940388afb70c13f16daade25ba8132a5ea3cf52"></a>AMOTION_EVENT_EDGE_FLAG_LEFT</em> </td><td class="fielddoc">
-<p>Flag indicating the motion event intersected the left edge of the screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga385c44f6fb256e5716a2302a5b940388a7d45674e03f1876a43d4810508905078"></a>AMOTION_EVENT_EDGE_FLAG_RIGHT</em> </td><td class="fielddoc">
-<p>Flag indicating the motion event intersected the right edge of the screen. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gabc5c98fcc1211af2b80116dd6e0a035d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Constants that identify each individual axis of a motion event. <a class="anchor" id="AMOTION_EVENT_AXIS"></a></p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da5f4b5b009634039a1f361048a5fc6064"></a>AMOTION_EVENT_AXIS_X</em> </td><td class="fielddoc">
-<p>Axis constant: X axis of a motion event.</p>
-<ul>
-<li>For a touch screen, reports the absolute X screen position of the center of the touch contact area. The units are display pixels.</li>
-<li>For a touch pad, reports the absolute X surface position of the center of the touch contact area. The units are device-dependent.</li>
-<li>For a mouse, reports the absolute X screen position of the mouse pointer. The units are display pixels.</li>
-<li>For a trackball, reports the relative horizontal displacement of the trackball. The value is normalized to a range from -1.0 (left) to 1.0 (right).</li>
-<li>For a joystick, reports the absolute X position of the joystick. The value is normalized to a range from -1.0 (left) to 1.0 (right). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da64f7de8558265bd8179d206eb33eff6c"></a>AMOTION_EVENT_AXIS_Y</em> </td><td class="fielddoc">
-<p>Axis constant: Y axis of a motion event.</p>
-<ul>
-<li>For a touch screen, reports the absolute Y screen position of the center of the touch contact area. The units are display pixels.</li>
-<li>For a touch pad, reports the absolute Y surface position of the center of the touch contact area. The units are device-dependent.</li>
-<li>For a mouse, reports the absolute Y screen position of the mouse pointer. The units are display pixels.</li>
-<li>For a trackball, reports the relative vertical displacement of the trackball. The value is normalized to a range from -1.0 (up) to 1.0 (down).</li>
-<li>For a joystick, reports the absolute Y position of the joystick. The value is normalized to a range from -1.0 (up or far) to 1.0 (down or near). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da3b4fd0f17cfdeb6a055babecd2b0ded8"></a>AMOTION_EVENT_AXIS_PRESSURE</em> </td><td class="fielddoc">
-<p>Axis constant: Pressure axis of a motion event.</p>
-<ul>
-<li>For a touch screen or touch pad, reports the approximate pressure applied to the surface by a finger or other tool. The value is normalized to a range from 0 (no pressure at all) to 1 (normal pressure), although values higher than 1 may be generated depending on the calibration of the input device.</li>
-<li>For a trackball, the value is set to 1 if the trackball button is pressed or 0 otherwise.</li>
-<li>For a mouse, the value is set to 1 if the primary mouse button is pressed or 0 otherwise. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da4baba3ccaec881089a864ba6deaf8bd6"></a>AMOTION_EVENT_AXIS_SIZE</em> </td><td class="fielddoc">
-<p>Axis constant: Size axis of a motion event.</p>
-<ul>
-<li>For a touch screen or touch pad, reports the approximate size of the contact area in relation to the maximum detectable size for the device. The value is normalized to a range from 0 (smallest detectable size) to 1 (largest detectable size), although it is not a linear scale. This value is of limited use. To obtain calibrated size information, see <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da792b9e01044a2e43e7f80e5559db20c2">AMOTION_EVENT_AXIS_TOUCH_MAJOR</a> or <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa273d64c392f86ae789fd5e24661ba0a">AMOTION_EVENT_AXIS_TOOL_MAJOR</a>. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da792b9e01044a2e43e7f80e5559db20c2"></a>AMOTION_EVENT_AXIS_TOUCH_MAJOR</em> </td><td class="fielddoc">
-<p>Axis constant: TouchMajor axis of a motion event.</p>
-<ul>
-<li>For a touch screen, reports the length of the major axis of an ellipse that represents the touch area at the point of contact. The units are display pixels.</li>
-<li>For a touch pad, reports the length of the major axis of an ellipse that represents the touch area at the point of contact. The units are device-dependent. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035daa8b24b0f01f24898a36e5751c8eca63c"></a>AMOTION_EVENT_AXIS_TOUCH_MINOR</em> </td><td class="fielddoc">
-<p>Axis constant: TouchMinor axis of a motion event.</p>
-<ul>
-<li>For a touch screen, reports the length of the minor axis of an ellipse that represents the touch area at the point of contact. The units are display pixels.</li>
-<li>For a touch pad, reports the length of the minor axis of an ellipse that represents the touch area at the point of contact. The units are device-dependent.</li>
-</ul>
-<p>When the touch is circular, the major and minor axis lengths will be equal to one another. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035daa273d64c392f86ae789fd5e24661ba0a"></a>AMOTION_EVENT_AXIS_TOOL_MAJOR</em> </td><td class="fielddoc">
-<p>Axis constant: ToolMajor axis of a motion event.</p>
-<ul>
-<li>For a touch screen, reports the length of the major axis of an ellipse that represents the size of the approaching finger or tool used to make contact.</li>
-<li>For a touch pad, reports the length of the major axis of an ellipse that represents the size of the approaching finger or tool used to make contact. The units are device-dependent.</li>
-</ul>
-<p>When the touch is circular, the major and minor axis lengths will be equal to one another.</p>
-<p>The tool size may be larger than the touch size since the tool may not be fully in contact with the touch sensor. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dadebd200b37ffaf36b94e7e478c559142"></a>AMOTION_EVENT_AXIS_TOOL_MINOR</em> </td><td class="fielddoc">
-<p>Axis constant: ToolMinor axis of a motion event.</p>
-<ul>
-<li>For a touch screen, reports the length of the minor axis of an ellipse that represents the size of the approaching finger or tool used to make contact.</li>
-<li>For a touch pad, reports the length of the minor axis of an ellipse that represents the size of the approaching finger or tool used to make contact. The units are device-dependent.</li>
-</ul>
-<p>When the touch is circular, the major and minor axis lengths will be equal to one another.</p>
-<p>The tool size may be larger than the touch size since the tool may not be fully in contact with the touch sensor. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da114f2b3fc233ccf7a4470787c31457d2"></a>AMOTION_EVENT_AXIS_ORIENTATION</em> </td><td class="fielddoc">
-<p>Axis constant: Orientation axis of a motion event.</p>
-<ul>
-<li>For a touch screen or touch pad, reports the orientation of the finger or tool in radians relative to the vertical plane of the device. An angle of 0 radians indicates that the major axis of contact is oriented upwards, is perfectly circular or is of unknown orientation. A positive angle indicates that the major axis of contact is oriented to the right. A negative angle indicates that the major axis of contact is oriented to the left. The full range is from -PI/2 radians (finger pointing fully left) to PI/2 radians (finger pointing fully right).</li>
-<li>For a stylus, the orientation indicates the direction in which the stylus is pointing in relation to the vertical axis of the current orientation of the screen. The range is from -PI radians to PI radians, where 0 is pointing up, -PI/2 radians is pointing left, -PI or PI radians is pointing down, and PI/2 radians is pointing right. See also <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafca0a235f69c4b38bfc95e7a7b8d9ab1">AMOTION_EVENT_AXIS_TILT</a>. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dad11be04b4b81715cad905ee9fa348e99"></a>AMOTION_EVENT_AXIS_VSCROLL</em> </td><td class="fielddoc">
-<p>Axis constant: Vertical Scroll axis of a motion event.</p>
-<ul>
-<li>For a mouse, reports the relative movement of the vertical scroll wheel. The value is normalized to a range from -1.0 (down) to 1.0 (up).</li>
-</ul>
-<p>This axis should be used to scroll views vertically. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da92955e6b0f3f82af66a505c854e9edff"></a>AMOTION_EVENT_AXIS_HSCROLL</em> </td><td class="fielddoc">
-<p>Axis constant: Horizontal Scroll axis of a motion event.</p>
-<ul>
-<li>For a mouse, reports the relative movement of the horizontal scroll wheel. The value is normalized to a range from -1.0 (left) to 1.0 (right).</li>
-</ul>
-<p>This axis should be used to scroll views horizontally. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da5a689e572da9bc5feafcb6c011368305"></a>AMOTION_EVENT_AXIS_Z</em> </td><td class="fielddoc">
-<p>Axis constant: Z axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute Z position of the joystick. The value is normalized to a range from -1.0 (high) to 1.0 (low). <em>On game pads with two analog joysticks, this axis is often reinterpreted to report the absolute X position of the second joystick instead.</em> </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da689b612864177d6b57d4181442e3e38e"></a>AMOTION_EVENT_AXIS_RX</em> </td><td class="fielddoc">
-<p>Axis constant: X Rotation axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute rotation angle about the X axis. The value is normalized to a range from -1.0 (counter-clockwise) to 1.0 (clockwise). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035daa20188da209300e1f80f6f5bd4058e13"></a>AMOTION_EVENT_AXIS_RY</em> </td><td class="fielddoc">
-<p>Axis constant: Y Rotation axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute rotation angle about the Y axis. The value is normalized to a range from -1.0 (counter-clockwise) to 1.0 (clockwise). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da381948b3321afd390ad164345eb9206b"></a>AMOTION_EVENT_AXIS_RZ</em> </td><td class="fielddoc">
-<p>Axis constant: Z Rotation axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute rotation angle about the Z axis. The value is normalized to a range from -1.0 (counter-clockwise) to 1.0 (clockwise). On game pads with two analog joysticks, this axis is often reinterpreted to report the absolute Y position of the second joystick instead. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da04245c76cb9b32dcba920661f11ac9da"></a>AMOTION_EVENT_AXIS_HAT_X</em> </td><td class="fielddoc">
-<p>Axis constant: Hat X axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute X position of the directional hat control. The value is normalized to a range from -1.0 (left) to 1.0 (right). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da98c323321d908db459e7cf86a7e8a482"></a>AMOTION_EVENT_AXIS_HAT_Y</em> </td><td class="fielddoc">
-<p>Axis constant: Hat Y axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute Y position of the directional hat control. The value is normalized to a range from -1.0 (up) to 1.0 (down). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dae4c65c3b1bd2946ff9e18c6041cdb591"></a>AMOTION_EVENT_AXIS_LTRIGGER</em> </td><td class="fielddoc">
-<p>Axis constant: Left Trigger axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the left trigger control. The value is normalized to a range from 0.0 (released) to 1.0 (fully pressed). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da116e80c6be166290ca481fefa5de38c1"></a>AMOTION_EVENT_AXIS_RTRIGGER</em> </td><td class="fielddoc">
-<p>Axis constant: Right Trigger axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the right trigger control. The value is normalized to a range from 0.0 (released) to 1.0 (fully pressed). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da6d1f5d64e607104964eb43d8fae07a4f"></a>AMOTION_EVENT_AXIS_THROTTLE</em> </td><td class="fielddoc">
-<p>Axis constant: Throttle axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the throttle control. The value is normalized to a range from 0.0 (fully open) to 1.0 (fully closed). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da318a0782f895949407fc192fc4280257"></a>AMOTION_EVENT_AXIS_RUDDER</em> </td><td class="fielddoc">
-<p>Axis constant: Rudder axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the rudder control. The value is normalized to a range from -1.0 (turn left) to 1.0 (turn right). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dab0ae83ebd74e672bb35378b92a440b1d"></a>AMOTION_EVENT_AXIS_WHEEL</em> </td><td class="fielddoc">
-<p>Axis constant: Wheel axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the steering wheel control. The value is normalized to a range from -1.0 (turn left) to 1.0 (turn right). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dab0223f235a6044815918af2abafcbf16"></a>AMOTION_EVENT_AXIS_GAS</em> </td><td class="fielddoc">
-<p>Axis constant: Gas axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the gas (accelerator) control. The value is normalized to a range from 0.0 (no acceleration) to 1.0 (maximum acceleration). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dae3a99764f3681dd9e094852bb2489ece"></a>AMOTION_EVENT_AXIS_BRAKE</em> </td><td class="fielddoc">
-<p>Axis constant: Brake axis of a motion event.</p>
-<ul>
-<li>For a joystick, reports the absolute position of the brake control. The value is normalized to a range from 0.0 (no braking) to 1.0 (maximum braking). </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dae800909411a1e83173b0eef7aa458d0e"></a>AMOTION_EVENT_AXIS_DISTANCE</em> </td><td class="fielddoc">
-<p>Axis constant: Distance axis of a motion event.</p>
-<ul>
-<li>For a stylus, reports the distance of the stylus from the screen. A value of 0.0 indicates direct contact and larger values indicate increasing distance from the surface. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dafca0a235f69c4b38bfc95e7a7b8d9ab1"></a>AMOTION_EVENT_AXIS_TILT</em> </td><td class="fielddoc">
-<p>Axis constant: Tilt axis of a motion event.</p>
-<ul>
-<li>For a stylus, reports the tilt angle of the stylus in radians where 0 radians indicates that the stylus is being held perpendicular to the surface, and PI/2 radians indicates that the stylus is being held flat against the surface. </li>
-</ul>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dadcc18afd3a7069412617df34db5a27bc"></a>AMOTION_EVENT_AXIS_GENERIC_1</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 1 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dac4addf06abfa6c76f0578ddde049aad5"></a>AMOTION_EVENT_AXIS_GENERIC_2</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 2 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dac7df57ef5082e10be83f66d7477bce9c"></a>AMOTION_EVENT_AXIS_GENERIC_3</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 3 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da321873d126b7d545665096694cb7d9d9"></a>AMOTION_EVENT_AXIS_GENERIC_4</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 4 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da9b47cef7060197e1b0302a8a718c3085"></a>AMOTION_EVENT_AXIS_GENERIC_5</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 5 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035daad7e47a1b5fb66864b6d988374f50a84"></a>AMOTION_EVENT_AXIS_GENERIC_6</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 6 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da222c06f51a60e59504b635dbf89a025b"></a>AMOTION_EVENT_AXIS_GENERIC_7</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 7 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dab59a8a373a913e40b146ed762976d6fe"></a>AMOTION_EVENT_AXIS_GENERIC_8</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 8 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da721fa0fbca8b22f1ecc8d3870f4e7443"></a>AMOTION_EVENT_AXIS_GENERIC_9</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 9 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da29ba08f4ddc658e0127ee5bc08d185f2"></a>AMOTION_EVENT_AXIS_GENERIC_10</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 10 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dafc64a4b307f62bb12b645918aa7edb57"></a>AMOTION_EVENT_AXIS_GENERIC_11</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 11 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dae5d32b3e9cec4936ae1e074f320c3063"></a>AMOTION_EVENT_AXIS_GENERIC_12</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 12 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da5f19f5bc52e5eaec5ebd4f07aad12180"></a>AMOTION_EVENT_AXIS_GENERIC_13</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 13 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035dadb866d826ecf25161d7c7f86166e149b"></a>AMOTION_EVENT_AXIS_GENERIC_14</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 14 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035da7e86befc8502b8df687284f3c40b2eca"></a>AMOTION_EVENT_AXIS_GENERIC_15</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 15 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc5c98fcc1211af2b80116dd6e0a035daaaa011ba929b18c6da71153638f92336"></a>AMOTION_EVENT_AXIS_GENERIC_16</em> </td><td class="fielddoc">
-<p>Axis constant: Generic 16 axis of a motion event. The interpretation of a generic axis is device-specific. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gac36f475ca5b446f4fde4c9b90bec77c8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Constants that identify buttons that are associated with motion events. Refer to the documentation on the MotionEvent class for descriptions of each button. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggac36f475ca5b446f4fde4c9b90bec77c8ab388f65477b9dd4c51e6367111168d65"></a>AMOTION_EVENT_BUTTON_PRIMARY</em> </td><td class="fielddoc">
-<p>primary </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggac36f475ca5b446f4fde4c9b90bec77c8a08118700ecb4e147528a0e725afc9451"></a>AMOTION_EVENT_BUTTON_SECONDARY</em> </td><td class="fielddoc">
-<p>secondary </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggac36f475ca5b446f4fde4c9b90bec77c8ae6e2af1e7065e035e8a10a595827180f"></a>AMOTION_EVENT_BUTTON_TERTIARY</em> </td><td class="fielddoc">
-<p>tertiary </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggac36f475ca5b446f4fde4c9b90bec77c8a1841d075a2992ff7fbefa3fd50189b86"></a>AMOTION_EVENT_BUTTON_BACK</em> </td><td class="fielddoc">
-<p>back </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggac36f475ca5b446f4fde4c9b90bec77c8a4105edf43f7748c52c859cc5aa7dc438"></a>AMOTION_EVENT_BUTTON_FORWARD</em> </td><td class="fielddoc">
-<p>forward </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga05589fbab0657f08285ebdfe93f5ec9e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Constants that identify tool types. Refer to the documentation on the MotionEvent class for descriptions of each tool type. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga05589fbab0657f08285ebdfe93f5ec9ea7e1ea0c955ebbac1349866e8995e0208"></a>AMOTION_EVENT_TOOL_TYPE_UNKNOWN</em> </td><td class="fielddoc">
-<p>unknown </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga05589fbab0657f08285ebdfe93f5ec9eafd789262defb8a268fa80d26b0c30bcc"></a>AMOTION_EVENT_TOOL_TYPE_FINGER</em> </td><td class="fielddoc">
-<p>finger </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga05589fbab0657f08285ebdfe93f5ec9eaf05dc95a74e560c89cec1f3100185fc7"></a>AMOTION_EVENT_TOOL_TYPE_STYLUS</em> </td><td class="fielddoc">
-<p>stylus </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga05589fbab0657f08285ebdfe93f5ec9ea7be0c750d7d6719e7c948914400ae0de"></a>AMOTION_EVENT_TOOL_TYPE_MOUSE</em> </td><td class="fielddoc">
-<p>mouse </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga05589fbab0657f08285ebdfe93f5ec9eaf9932f65b5b6b5800fb5873a60dbf0cb"></a>AMOTION_EVENT_TOOL_TYPE_ERASER</em> </td><td class="fielddoc">
-<p>eraser </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga16af7b253440dadd46a80a4b9fddba4d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Input source masks.</p>
-<p>Refer to the documentation on android.view.InputDevice for more details about input sources and their correct interpretation. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4daae438f475d03ea60fd9fb356abd7fa01"></a>AINPUT_SOURCE_CLASS_MASK</em> </td><td class="fielddoc">
-<p>mask </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4dafd6d5e71f09f6452acf017559481444c"></a>AINPUT_SOURCE_CLASS_NONE</em> </td><td class="fielddoc">
-<p>none </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4dacf1bf3d7b3c6e59f907bdffc9b33370e"></a>AINPUT_SOURCE_CLASS_BUTTON</em> </td><td class="fielddoc">
-<p>button </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4da7495274e98fb30dee3dfd903b878cf47"></a>AINPUT_SOURCE_CLASS_POINTER</em> </td><td class="fielddoc">
-<p>pointer </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4da078a18d85d078412721c336a879bcc1a"></a>AINPUT_SOURCE_CLASS_NAVIGATION</em> </td><td class="fielddoc">
-<p>navigation </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4da682f6982bb55ee809f6acd2deb550167"></a>AINPUT_SOURCE_CLASS_POSITION</em> </td><td class="fielddoc">
-<p>position </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga16af7b253440dadd46a80a4b9fddba4daaaeffb6442807dd96ec62e9d8a696b57"></a>AINPUT_SOURCE_CLASS_JOYSTICK</em> </td><td class="fielddoc">
-<p>joystick </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaba01db17f4a2bfbc3db60dc172972a25"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Input sources. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25ae9348bc04cdaa88b5b010f77a4945454"></a>AINPUT_SOURCE_UNKNOWN</em> </td><td class="fielddoc">
-<p>unknown </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a9860918666dd8c0b9d00a8da7af51e6d"></a>AINPUT_SOURCE_KEYBOARD</em> </td><td class="fielddoc">
-<p>keyboard </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25ad0fbfeff9f8d57104bff14c70ce5e3ef"></a>AINPUT_SOURCE_DPAD</em> </td><td class="fielddoc">
-<p>dpad </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a6417cb50ecd6ade48c708268434a49d3"></a>AINPUT_SOURCE_GAMEPAD</em> </td><td class="fielddoc">
-<p>gamepad </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a55ea411f927aed8964fa72fec0da444f"></a>AINPUT_SOURCE_TOUCHSCREEN</em> </td><td class="fielddoc">
-<p>touchscreen </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25ae71d3dcbd004bccb6e00fde47097cd86"></a>AINPUT_SOURCE_MOUSE</em> </td><td class="fielddoc">
-<p>mouse </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a86d4983c71432b27634ba41a64bffdf9"></a>AINPUT_SOURCE_STYLUS</em> </td><td class="fielddoc">
-<p>stylus </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a7e49d9153c86f60f626d7f797f4e78b6"></a>AINPUT_SOURCE_TRACKBALL</em> </td><td class="fielddoc">
-<p>trackball </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a7e0715d4b544653ab11893434172a2ef"></a>AINPUT_SOURCE_TOUCHPAD</em> </td><td class="fielddoc">
-<p>touchpad </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25a3712c4e4fb8ad7f6ae6e40d48e5c6ee7"></a>AINPUT_SOURCE_TOUCH_NAVIGATION</em> </td><td class="fielddoc">
-<p>navigation </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25afb28f10dc074e7f7435f5904c513edb5"></a>AINPUT_SOURCE_JOYSTICK</em> </td><td class="fielddoc">
-<p>joystick </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaba01db17f4a2bfbc3db60dc172972a25ab04317e7dd273ff5c87038df67d9796e"></a>AINPUT_SOURCE_ANY</em> </td><td class="fielddoc">
-<p>any </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaaf105ae5beaca1dee30ae54530691fce"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Keyboard types.</p>
-<p>Refer to the documentation on android.view.InputDevice for more details. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaaf105ae5beaca1dee30ae54530691fcea32cb7ce34cdce7095962f0766cc6c3ac"></a>AINPUT_KEYBOARD_TYPE_NONE</em> </td><td class="fielddoc">
-<p>none </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaaf105ae5beaca1dee30ae54530691fceaf0226d750ea830eb557ae68bd4a1c82a"></a>AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC</em> </td><td class="fielddoc">
-<p>non alphabetic </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaaf105ae5beaca1dee30ae54530691fceaba1f5ab6bc79749ba96a5d2a3af0e574"></a>AINPUT_KEYBOARD_TYPE_ALPHABETIC</em> </td><td class="fielddoc">
-<p>alphabetic </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga80155586fa275b28773c9b203f52caba"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Constants used to retrieve information about the range of motion for a particular coordinate of a motion event.</p>
-<p>Refer to the documentation on android.view.InputDevice for more details about input sources and their correct interpretation.</p>
-<dl class="deprecated"><dt><b>Deprecated:</b></dt><dd>These constants are deprecated. Use <a class="el" href="#AMOTION_EVENT_AXIS">AMOTION_EVENT_AXIS_*</a> constants instead. </dd></dl>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaa0e5816bc48cdb33f2b488a109596ffe1"></a>AINPUT_MOTION_RANGE_X</em> </td><td class="fielddoc">
-<p>x </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaab48108c9450ea1b7cd021be7d8cbc332"></a>AINPUT_MOTION_RANGE_Y</em> </td><td class="fielddoc">
-<p>y </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaa79aca706b12b28d0ab14762902fed31a"></a>AINPUT_MOTION_RANGE_PRESSURE</em> </td><td class="fielddoc">
-<p>pressure </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaa46f3a6cf859fb161cd29398d8448c688"></a>AINPUT_MOTION_RANGE_SIZE</em> </td><td class="fielddoc">
-<p>size </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaa7ead43624c96e165fd8a25e77148aa67"></a>AINPUT_MOTION_RANGE_TOUCH_MAJOR</em> </td><td class="fielddoc">
-<p>touch major </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaa301181a0f20681135c15010b39bb575d"></a>AINPUT_MOTION_RANGE_TOUCH_MINOR</em> </td><td class="fielddoc">
-<p>touch minor </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaaa860f54aa9e5a269dba6a54bbcf3c27c"></a>AINPUT_MOTION_RANGE_TOOL_MAJOR</em> </td><td class="fielddoc">
-<p>tool major </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaa19226f6cf713c1b4d0973a163daf6cf1"></a>AINPUT_MOTION_RANGE_TOOL_MINOR</em> </td><td class="fielddoc">
-<p>tool minor </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga80155586fa275b28773c9b203f52cabaaf9be9c04a41b610d994a3d1d7e90d06d"></a>AINPUT_MOTION_RANGE_ORIENTATION</em> </td><td class="fielddoc">
-<p>orientation </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga6b7b47dd702d9e331586d485013fd1ea"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Key codes. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa593f8ae18990d627785719284a12a6f"></a>AKEYCODE_UNKNOWN</em> </td><td class="fielddoc">
-<p>Unknown key code. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa2dc78d3a93876b77402d2a7f02e4b899"></a>AKEYCODE_SOFT_LEFT</em> </td><td class="fielddoc">
-<p>Soft Left key. Usually situated below the display on phones and used as a multi-function feature key for selecting a software defined function shown on the bottom left of the display. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa8cadfbfcaaa83fef168de13639adfcae"></a>AKEYCODE_SOFT_RIGHT</em> </td><td class="fielddoc">
-<p>Soft Right key. Usually situated below the display on phones and used as a multi-function feature key for selecting a software defined function shown on the bottom right of the display. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa526c2411b7476b7ae579f57a0378b2dd"></a>AKEYCODE_HOME</em> </td><td class="fielddoc">
-<p>Home key. This key is handled by the framework and is never delivered to applications. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaeb71c74bf556ba72e9c8f8dcbe5453d0"></a>AKEYCODE_BACK</em> </td><td class="fielddoc">
-<p>Back key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa8b5720ebdd3576c2b536ec9228273d8f"></a>AKEYCODE_CALL</em> </td><td class="fielddoc">
-<p>Call key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaff971957ae3a4e272b21987854e18d9b"></a>AKEYCODE_ENDCALL</em> </td><td class="fielddoc">
-<p>End Call key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa23f585ea17aeceaad2111c51ab289e79"></a>AKEYCODE_0</em> </td><td class="fielddoc">
-<p>'0' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaabcac88b54f8d764bc4573ecc5b9571b0"></a>AKEYCODE_1</em> </td><td class="fielddoc">
-<p>'1' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa2079c6fb75141968b60ed79fe895d6db"></a>AKEYCODE_2</em> </td><td class="fielddoc">
-<p>'2' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa40ccc018c0637e4d938e66b789054551"></a>AKEYCODE_3</em> </td><td class="fielddoc">
-<p>'3' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa73c2d141c3906bd97cfec91443356f7b"></a>AKEYCODE_4</em> </td><td class="fielddoc">
-<p>'4' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0ca99d2be4a3723ba3406944ad623f6e"></a>AKEYCODE_5</em> </td><td class="fielddoc">
-<p>'5' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa72bc6560e24d08ff8f3116dac9179079"></a>AKEYCODE_6</em> </td><td class="fielddoc">
-<p>'6' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa27070499acdb6c527a285b3840ec7bff"></a>AKEYCODE_7</em> </td><td class="fielddoc">
-<p>'7' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa93543b23683b33724ecf77ac5a8c19ab"></a>AKEYCODE_8</em> </td><td class="fielddoc">
-<p>'8' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa31cd4d7c4e59cf7b057b6c248cff516d"></a>AKEYCODE_9</em> </td><td class="fielddoc">
-<p>'9' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1461fbf54e3dcba96e5d6d0638c18305"></a>AKEYCODE_STAR</em> </td><td class="fielddoc">
-<p>'*' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf448758c44899e41b67f76dfe3be51e9"></a>AKEYCODE_POUND</em> </td><td class="fielddoc">
-<p>'#' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf2fd3133a88f3b6725834032bd74bd9e"></a>AKEYCODE_DPAD_UP</em> </td><td class="fielddoc">
-<p>Directional Pad Up key. May also be synthesized from trackball motions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa84b721b13aae56c9f1d3c22b3d81627a"></a>AKEYCODE_DPAD_DOWN</em> </td><td class="fielddoc">
-<p>Directional Pad Down key. May also be synthesized from trackball motions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa668dfb3ed79a37c2c07838c161c1b344"></a>AKEYCODE_DPAD_LEFT</em> </td><td class="fielddoc">
-<p>Directional Pad Left key. May also be synthesized from trackball motions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac6f9d81b6239696a1836695bbfc6a975"></a>AKEYCODE_DPAD_RIGHT</em> </td><td class="fielddoc">
-<p>Directional Pad Right key. May also be synthesized from trackball motions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5e9c93273fd39148f54167133aa5b9ae"></a>AKEYCODE_DPAD_CENTER</em> </td><td class="fielddoc">
-<p>Directional Pad Center key. May also be synthesized from trackball motions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5b81e325d9efd633eef7535a5b538882"></a>AKEYCODE_VOLUME_UP</em> </td><td class="fielddoc">
-<p>Volume Up key. Adjusts the speaker volume up. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6a882dae17080d3b5f3329e79db60c66"></a>AKEYCODE_VOLUME_DOWN</em> </td><td class="fielddoc">
-<p>Volume Down key. Adjusts the speaker volume down. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6"></a>AKEYCODE_POWER</em> </td><td class="fielddoc">
-<p>Power key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa8670880765756933d3d1a10186d39e26"></a>AKEYCODE_CAMERA</em> </td><td class="fielddoc">
-<p>Camera key. Used to launch a camera application or take pictures. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa95bd8c25adeaa570108c7403f08a2901"></a>AKEYCODE_CLEAR</em> </td><td class="fielddoc">
-<p>Clear key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa424a091c62d40f5d65908c9730ae9014"></a>AKEYCODE_A</em> </td><td class="fielddoc">
-<p>'A' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa65d3bf8d6a8a6c2f7c1b08394f313758"></a>AKEYCODE_B</em> </td><td class="fielddoc">
-<p>'B' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaeed584f454e508ce931bcb33d37adb04"></a>AKEYCODE_C</em> </td><td class="fielddoc">
-<p>'C' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7e4cb3ef66209a2779be2c8239b57b51"></a>AKEYCODE_D</em> </td><td class="fielddoc">
-<p>'D' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaae218af7ceb207227bb10f0525e68a8d0"></a>AKEYCODE_E</em> </td><td class="fielddoc">
-<p>'E' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa455f71ecfe59af0fbd901ac0d0a8d53a"></a>AKEYCODE_F</em> </td><td class="fielddoc">
-<p>'F' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa165067e10464019411f768bba9e533d9"></a>AKEYCODE_G</em> </td><td class="fielddoc">
-<p>'G' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaad89a91a1500cb162f22962781ebfd9dc"></a>AKEYCODE_H</em> </td><td class="fielddoc">
-<p>'H' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4d44b5e4a19580540d8d77bf5755d74b"></a>AKEYCODE_I</em> </td><td class="fielddoc">
-<p>'I' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa70c259612ccec117d70afaef947a6a7a"></a>AKEYCODE_J</em> </td><td class="fielddoc">
-<p>'J' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5ce56cf50d3632c275c524bd78d0d932"></a>AKEYCODE_K</em> </td><td class="fielddoc">
-<p>'K' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab61c534fd0f4e56c4ba13861a2f5982b"></a>AKEYCODE_L</em> </td><td class="fielddoc">
-<p>'L' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa43b19e5e5234ce90c8e7ef67dd0cabd1"></a>AKEYCODE_M</em> </td><td class="fielddoc">
-<p>'M' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6c0b26804c89560a9e87c45f7f9fed36"></a>AKEYCODE_N</em> </td><td class="fielddoc">
-<p>'N' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa249667bc4a59d99be1914535877329fb"></a>AKEYCODE_O</em> </td><td class="fielddoc">
-<p>'O' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac68ef56b78bd0c8626cc68bb6cb9156f"></a>AKEYCODE_P</em> </td><td class="fielddoc">
-<p>'P' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa932cf6ea8d87e6d6d97af658dd0fa206"></a>AKEYCODE_Q</em> </td><td class="fielddoc">
-<p>'Q' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaba25ac2c15a8edbbbff16a9fe6e74532"></a>AKEYCODE_R</em> </td><td class="fielddoc">
-<p>'R' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaae1ed25c28a8fce578cddb17ca6888ff6"></a>AKEYCODE_S</em> </td><td class="fielddoc">
-<p>'S' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa2feac8b458ef8eb9c0a0dd73766927c2"></a>AKEYCODE_T</em> </td><td class="fielddoc">
-<p>'T' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac1a220314f986aae45d7fe3b35501595"></a>AKEYCODE_U</em> </td><td class="fielddoc">
-<p>'U' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4043bc48fa55cce7825176052d6e199a"></a>AKEYCODE_V</em> </td><td class="fielddoc">
-<p>'V' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf0c80e98547c3daa01f3d9e7f4f00425"></a>AKEYCODE_W</em> </td><td class="fielddoc">
-<p>'W' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaec585cebac89004faffbdc28dc6d81c5"></a>AKEYCODE_X</em> </td><td class="fielddoc">
-<p>'X' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa06fc277ef25acdd89d64c18eed0daa9b"></a>AKEYCODE_Y</em> </td><td class="fielddoc">
-<p>'Y' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7439a09f219a0addc13c758ef7508cce"></a>AKEYCODE_Z</em> </td><td class="fielddoc">
-<p>'Z' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0ca0bfbdc67b2c6f76e8fcaaf782c227"></a>AKEYCODE_COMMA</em> </td><td class="fielddoc">
-<p>',' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa9dd68c8ecebd4e274e8c357dcdfe8a04"></a>AKEYCODE_PERIOD</em> </td><td class="fielddoc">
-<p>'.' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa3dec175158abe8679bedd98ed1bc3e1a"></a>AKEYCODE_ALT_LEFT</em> </td><td class="fielddoc">
-<p>Left Alt modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacd9b6b0846c6999f5df47d29e58ac95d"></a>AKEYCODE_ALT_RIGHT</em> </td><td class="fielddoc">
-<p>Right Alt modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaafb9875645596928cec46368e74499dc4"></a>AKEYCODE_SHIFT_LEFT</em> </td><td class="fielddoc">
-<p>Left Shift modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf9eab1348ae1e8f18ad5bf3c77df4212"></a>AKEYCODE_SHIFT_RIGHT</em> </td><td class="fielddoc">
-<p>Right Shift modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1b1bfda850b2acd0b60e8456e2bfa958"></a>AKEYCODE_TAB</em> </td><td class="fielddoc">
-<p>Tab key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa10389300ac5d70f8d9733564b3cab4e7"></a>AKEYCODE_SPACE</em> </td><td class="fielddoc">
-<p>Space key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6c1c6752d5db5e02da51d8937e5e3c6f"></a>AKEYCODE_SYM</em> </td><td class="fielddoc">
-<p>Symbol modifier key. Used to enter alternate symbols. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaded9ec81ae6dab451665317723b94083"></a>AKEYCODE_EXPLORER</em> </td><td class="fielddoc">
-<p>Explorer special function key. Used to launch a browser application. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaade96efe470f428bb5c4eaea6ffc3681c"></a>AKEYCODE_ENVELOPE</em> </td><td class="fielddoc">
-<p>Envelope special function key. Used to launch a mail application. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac784a7bbbfbdab05fab6c6a1f29c98ff"></a>AKEYCODE_ENTER</em> </td><td class="fielddoc">
-<p>Enter key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacd013221b457d98975dc47e49817e28a"></a>AKEYCODE_DEL</em> </td><td class="fielddoc">
-<p>Backspace key. Deletes characters before the insertion point, unlike <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9516bc190d37fea27e07ddab0c607b51">AKEYCODE_FORWARD_DEL</a>. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa929561086ae7b519fa962597bc85f171"></a>AKEYCODE_GRAVE</em> </td><td class="fielddoc">
-<p>'`' (backtick) key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaca10bd34ad0abecfecace908b8cb92ca"></a>AKEYCODE_MINUS</em> </td><td class="fielddoc">
-<p>'-'. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0a197df7ec719c95ddcd6836e76c8498"></a>AKEYCODE_EQUALS</em> </td><td class="fielddoc">
-<p>'=' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaabdeda0d373aa37ef2ded5ffdfc008708"></a>AKEYCODE_LEFT_BRACKET</em> </td><td class="fielddoc">
-<p>'[' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa084dfa52626040a08d374f8aec066e6a"></a>AKEYCODE_RIGHT_BRACKET</em> </td><td class="fielddoc">
-<p>']' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaac90eb064382e3c482ae86abb7b3f701"></a>AKEYCODE_BACKSLASH</em> </td><td class="fielddoc">
-<p>'\' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac0a2920161f4f2d97b0b060614b23391"></a>AKEYCODE_SEMICOLON</em> </td><td class="fielddoc">
-<p>';' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab5518a8502914ea5f87ef5d29b32b1b1"></a>AKEYCODE_APOSTROPHE</em> </td><td class="fielddoc">
-<p>''' (apostrophe) key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa54c047be3811d637a33d9b3e39d16e1a"></a>AKEYCODE_SLASH</em> </td><td class="fielddoc">
-<p>'/' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7284f79a266ede479b79726082642e16"></a>AKEYCODE_AT</em> </td><td class="fielddoc">
-<p>'@' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaabe6e880f65bebbdd5246a4164c4ab37a"></a>AKEYCODE_NUM</em> </td><td class="fielddoc">
-<p>Number modifier key. Used to enter numeric symbols. This key is not <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad5e349eadd3255c6ad4982dc40ed23ef">AKEYCODE_NUM_LOCK</a>; it is more like <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3dec175158abe8679bedd98ed1bc3e1a">AKEYCODE_ALT_LEFT</a>. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0d3d29515a4815fe8d6d8d3291507a33"></a>AKEYCODE_HEADSETHOOK</em> </td><td class="fielddoc">
-<p>Headset Hook key. Used to hang up calls and stop media. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa23be9506f92f6efe14d47306a39a2187"></a>AKEYCODE_FOCUS</em> </td><td class="fielddoc">
-<p>Camera Focus key. Used to focus the camera. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab7f72d867b311e0845aef732dcc66495"></a>AKEYCODE_PLUS</em> </td><td class="fielddoc">
-<p>'+' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa707b85e89923b0f760be795972a87d76"></a>AKEYCODE_MENU</em> </td><td class="fielddoc">
-<p>Menu key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6115506352a5828532fc6a0b91683331"></a>AKEYCODE_NOTIFICATION</em> </td><td class="fielddoc">
-<p>Notification key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac644fd307fd0ef0d3ed3d2e074c1a4b7"></a>AKEYCODE_SEARCH</em> </td><td class="fielddoc">
-<p>Search key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa42f8fe71e8d45b5a83d83d80c3da40e1"></a>AKEYCODE_MEDIA_PLAY_PAUSE</em> </td><td class="fielddoc">
-<p>Play/Pause media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac4faa33993d80db1326073ea15a38e7d"></a>AKEYCODE_MEDIA_STOP</em> </td><td class="fielddoc">
-<p>Stop media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf5a6c3fc963e8163852b9a23e3a198b3"></a>AKEYCODE_MEDIA_NEXT</em> </td><td class="fielddoc">
-<p>Play Next media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa81432c31b00d47f768c29163eb276acb"></a>AKEYCODE_MEDIA_PREVIOUS</em> </td><td class="fielddoc">
-<p>Play Previous media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaecd53183b84c23a2ca65670a23674319"></a>AKEYCODE_MEDIA_REWIND</em> </td><td class="fielddoc">
-<p>Rewind media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa69e648024402af688d490a2041f15bca"></a>AKEYCODE_MEDIA_FAST_FORWARD</em> </td><td class="fielddoc">
-<p>Fast Forward media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1f6675d38f50e3556a8531839fd83f02"></a>AKEYCODE_MUTE</em> </td><td class="fielddoc">
-<p>Mute key. Mutes the microphone, unlike <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa174a5c7c39753235109696e82870c575">AKEYCODE_VOLUME_MUTE</a>. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4fd0d4ea5b6898f4a40011b97a739a04"></a>AKEYCODE_PAGE_UP</em> </td><td class="fielddoc">
-<p>Page Up key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0b7fe1c18f53e6328657858a88826393"></a>AKEYCODE_PAGE_DOWN</em> </td><td class="fielddoc">
-<p>Page Down key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacdc7c004da1594fa156de87befef5f41"></a>AKEYCODE_PICTSYMBOLS</em> </td><td class="fielddoc">
-<p>Picture Symbols modifier key. Used to switch symbol sets (Emoji, Kao-moji). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaad6a1f88b2cc3b6ff8f1724eb01473ec3"></a>AKEYCODE_SWITCH_CHARSET</em> </td><td class="fielddoc">
-<p>Switch Charset modifier key. Used to switch character sets (Kanji, Katakana). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaef2d2ec912aaa9e7215aeab79f7fb086"></a>AKEYCODE_BUTTON_A</em> </td><td class="fielddoc">
-<p>A Button key. On a game controller, the A button should be either the button labeled A or the first button on the bottom row of controller buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa721765c8f0bbcdb68af06817dbec8e53"></a>AKEYCODE_BUTTON_B</em> </td><td class="fielddoc">
-<p>B Button key. On a game controller, the B button should be either the button labeled B or the second button on the bottom row of controller buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaad622ad5df40d2fdf806abb2adda73b3d"></a>AKEYCODE_BUTTON_C</em> </td><td class="fielddoc">
-<p>C Button key. On a game controller, the C button should be either the button labeled C or the third button on the bottom row of controller buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa21174962f95e32cd0345ce657d03ebc7"></a>AKEYCODE_BUTTON_X</em> </td><td class="fielddoc">
-<p>X Button key. On a game controller, the X button should be either the button labeled X or the first button on the upper row of controller buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6654a8b2c700f7783433c86fcdae7919"></a>AKEYCODE_BUTTON_Y</em> </td><td class="fielddoc">
-<p>Y Button key. On a game controller, the Y button should be either the button labeled Y or the second button on the upper row of controller buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa06156b68e6de951b44fc662e1b16041f"></a>AKEYCODE_BUTTON_Z</em> </td><td class="fielddoc">
-<p>Z Button key. On a game controller, the Z button should be either the button labeled Z or the third button on the upper row of controller buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa32e159826404c7d76c2a433c24de82a2"></a>AKEYCODE_BUTTON_L1</em> </td><td class="fielddoc">
-<p>L1 Button key. On a game controller, the L1 button should be either the button labeled L1 (or L) or the top left trigger button. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7c614b3966583b0ad027e45f594ede46"></a>AKEYCODE_BUTTON_R1</em> </td><td class="fielddoc">
-<p>R1 Button key. On a game controller, the R1 button should be either the button labeled R1 (or R) or the top right trigger button. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa36a38421637cfa5ebfd8a0296650cdf4"></a>AKEYCODE_BUTTON_L2</em> </td><td class="fielddoc">
-<p>L2 Button key. On a game controller, the L2 button should be either the button labeled L2 or the bottom left trigger button. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa46d487e9fe31855b7b46739bad58fe3e"></a>AKEYCODE_BUTTON_R2</em> </td><td class="fielddoc">
-<p>R2 Button key. On a game controller, the R2 button should be either the button labeled R2 or the bottom right trigger button. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa68c5d8dcd8fe708ada8f4a4e17feb638"></a>AKEYCODE_BUTTON_THUMBL</em> </td><td class="fielddoc">
-<p>Left Thumb Button key. On a game controller, the left thumb button indicates that the left (or only) joystick is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa9759d817172d268ced1748909a5f5fbe"></a>AKEYCODE_BUTTON_THUMBR</em> </td><td class="fielddoc">
-<p>Right Thumb Button key. On a game controller, the right thumb button indicates that the right joystick is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf3c818d106f4ec793a43749c4c26a8a4"></a>AKEYCODE_BUTTON_START</em> </td><td class="fielddoc">
-<p>Start Button key. On a game controller, the button labeled Start. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa598289bc85f647c237729126ea392a43"></a>AKEYCODE_BUTTON_SELECT</em> </td><td class="fielddoc">
-<p>Select Button key. On a game controller, the button labeled Select. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa19839eebec939407d901a33b75cf2594"></a>AKEYCODE_BUTTON_MODE</em> </td><td class="fielddoc">
-<p>Mode Button key. On a game controller, the button labeled Mode. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac52177e5508edacb8e9c6d3a25db4fb6"></a>AKEYCODE_ESCAPE</em> </td><td class="fielddoc">
-<p>Escape key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa9516bc190d37fea27e07ddab0c607b51"></a>AKEYCODE_FORWARD_DEL</em> </td><td class="fielddoc">
-<p>Forward Delete key. Deletes characters ahead of the insertion point, unlike <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd013221b457d98975dc47e49817e28a">AKEYCODE_DEL</a>. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaaca9d0df6cc18492209eb287e659aeb1"></a>AKEYCODE_CTRL_LEFT</em> </td><td class="fielddoc">
-<p>Left Control modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa99b317cf2f1eb6b06d0226e05223e60c"></a>AKEYCODE_CTRL_RIGHT</em> </td><td class="fielddoc">
-<p>Right Control modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab9dcb68b35c85d380846c85f323868f1"></a>AKEYCODE_CAPS_LOCK</em> </td><td class="fielddoc">
-<p>Caps Lock key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa78ff5c8316235635f76e3c3179e9a7fc"></a>AKEYCODE_SCROLL_LOCK</em> </td><td class="fielddoc">
-<p>Scroll Lock key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaaadfb2d920bbe422c096120d39811c58"></a>AKEYCODE_META_LEFT</em> </td><td class="fielddoc">
-<p>Left Meta modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa68038455e2b0846db51f9957e0df9cb8"></a>AKEYCODE_META_RIGHT</em> </td><td class="fielddoc">
-<p>Right Meta modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1764b777aa56605f4029d3c71fe70722"></a>AKEYCODE_FUNCTION</em> </td><td class="fielddoc">
-<p>Function modifier key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa14e22c69bcd47ffb4445ee18a4332d84"></a>AKEYCODE_SYSRQ</em> </td><td class="fielddoc">
-<p>System Request / Print Screen key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa047501f9cf9bce00e6048d8759ea3a23"></a>AKEYCODE_BREAK</em> </td><td class="fielddoc">
-<p>Break / Pause key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7544f3de2fb5f78bec62af94a32fdc58"></a>AKEYCODE_MOVE_HOME</em> </td><td class="fielddoc">
-<p>Home Movement key. Used for scrolling or moving the cursor around to the start of a line or to the top of a list. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5605f49f5271430f5f150efb3cd0398a"></a>AKEYCODE_MOVE_END</em> </td><td class="fielddoc">
-<p>End Movement key. Used for scrolling or moving the cursor around to the end of a line or to the bottom of a list. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa62f663d11e91af750a51ddd060b08644"></a>AKEYCODE_INSERT</em> </td><td class="fielddoc">
-<p>Insert key. Toggles insert / overwrite edit mode. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaafbf0a16c7746e5dee2fd3adbd50da88a"></a>AKEYCODE_FORWARD</em> </td><td class="fielddoc">
-<p>Forward key. Navigates forward in the history stack. Complement of <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeb71c74bf556ba72e9c8f8dcbe5453d0">AKEYCODE_BACK</a>. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa615cf6202b0ae0ed550f42f6c64b36a1"></a>AKEYCODE_MEDIA_PLAY</em> </td><td class="fielddoc">
-<p>Play media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1f4e0178c2028b3042b0a5948e38e4e4"></a>AKEYCODE_MEDIA_PAUSE</em> </td><td class="fielddoc">
-<p>Pause media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6788c6e1443140b0ec4d004d8293e998"></a>AKEYCODE_MEDIA_CLOSE</em> </td><td class="fielddoc">
-<p>Close media key. May be used to close a CD tray, for example. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa317bffd44306b021c401d3a26b82a7f6"></a>AKEYCODE_MEDIA_EJECT</em> </td><td class="fielddoc">
-<p>Eject media key. May be used to eject a CD tray, for example. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa17e1eae0b245176aaa024a53411441f9"></a>AKEYCODE_MEDIA_RECORD</em> </td><td class="fielddoc">
-<p>Record media key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa3b84f2c503a9e839f3d36e10e3307fcf"></a>AKEYCODE_F1</em> </td><td class="fielddoc">
-<p>F1 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1360f7ec66aa6421e240dae637262e84"></a>AKEYCODE_F2</em> </td><td class="fielddoc">
-<p>F2 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6a4ce6105e12a3a9071cae2f40515085"></a>AKEYCODE_F3</em> </td><td class="fielddoc">
-<p>F3 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa882050e4d0f917470a5b91fbf6ae9ebf"></a>AKEYCODE_F4</em> </td><td class="fielddoc">
-<p>F4 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab01807c72b46620bb50fcb6abe24d937"></a>AKEYCODE_F5</em> </td><td class="fielddoc">
-<p>F5 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa04a12e81ed80bb42ef5c63cedf0dc60"></a>AKEYCODE_F6</em> </td><td class="fielddoc">
-<p>F6 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa9583b8e4b0d994b7e3a193b67cf6020c"></a>AKEYCODE_F7</em> </td><td class="fielddoc">
-<p>F7 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa55ca54d42d8df70de2ce9031db1344c8"></a>AKEYCODE_F8</em> </td><td class="fielddoc">
-<p>F8 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0c8225c0ef98da730933ae914077dbc9"></a>AKEYCODE_F9</em> </td><td class="fielddoc">
-<p>F9 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa60660b13acab39282d0558cdcc93474"></a>AKEYCODE_F10</em> </td><td class="fielddoc">
-<p>F10 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa64cc7b1d8e53d90ff57c39d0b5a4dd22"></a>AKEYCODE_F11</em> </td><td class="fielddoc">
-<p>F11 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa491000231e0ba221b6916b1d9d2c9fb7"></a>AKEYCODE_F12</em> </td><td class="fielddoc">
-<p>F12 key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaad5e349eadd3255c6ad4982dc40ed23ef"></a>AKEYCODE_NUM_LOCK</em> </td><td class="fielddoc">
-<p>Num Lock key. This is the Num Lock key; it is different from <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe6e880f65bebbdd5246a4164c4ab37a">AKEYCODE_NUM</a>. This key alters the behavior of other keys on the numeric keypad. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa343df35e6a0ad0599e19b8ef7174909b"></a>AKEYCODE_NUMPAD_0</em> </td><td class="fielddoc">
-<p>Numeric keypad '0' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5c0ec8e42917fa9ac53977db3e6aeb17"></a>AKEYCODE_NUMPAD_1</em> </td><td class="fielddoc">
-<p>Numeric keypad '1' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4dfd17c2209908e1ec890e10a3211f89"></a>AKEYCODE_NUMPAD_2</em> </td><td class="fielddoc">
-<p>Numeric keypad '2' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa1efe1886a4b472b999215c0e81f7386"></a>AKEYCODE_NUMPAD_3</em> </td><td class="fielddoc">
-<p>Numeric keypad '3' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1fdd16681c1441b934f679b94fd0e4f8"></a>AKEYCODE_NUMPAD_4</em> </td><td class="fielddoc">
-<p>Numeric keypad '4' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf5916003e7c737a8cc06e52d2ee76c3b"></a>AKEYCODE_NUMPAD_5</em> </td><td class="fielddoc">
-<p>Numeric keypad '5' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa13b83389e0f5de129227af4b8d3f035d"></a>AKEYCODE_NUMPAD_6</em> </td><td class="fielddoc">
-<p>Numeric keypad '6' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaed9468951ef2887c07c8095c2e7d4c93"></a>AKEYCODE_NUMPAD_7</em> </td><td class="fielddoc">
-<p>Numeric keypad '7' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5f0a300566235720eb93fee9f2196642"></a>AKEYCODE_NUMPAD_8</em> </td><td class="fielddoc">
-<p>Numeric keypad '8' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaad0c490e3965df546e2d5a83edf423d95"></a>AKEYCODE_NUMPAD_9</em> </td><td class="fielddoc">
-<p>Numeric keypad '9' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaac108b744e8f93af69158d146425236c"></a>AKEYCODE_NUMPAD_DIVIDE</em> </td><td class="fielddoc">
-<p>Numeric keypad '/' key (for division). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa47ce00b838e7ee0a34066dc2595ac735"></a>AKEYCODE_NUMPAD_MULTIPLY</em> </td><td class="fielddoc">
-<p>Numeric keypad '*' key (for multiplication). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa2bee314dbbea0a349eb301d10256bbe"></a>AKEYCODE_NUMPAD_SUBTRACT</em> </td><td class="fielddoc">
-<p>Numeric keypad '-' key (for subtraction). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa9d2fefa9a3f6037f48b247e66dd28c35"></a>AKEYCODE_NUMPAD_ADD</em> </td><td class="fielddoc">
-<p>Numeric keypad '+' key (for addition). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6aab6b5914e120b43b3a1a8269e9cee1"></a>AKEYCODE_NUMPAD_DOT</em> </td><td class="fielddoc">
-<p>Numeric keypad '.' key (for decimals or digit grouping). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa900e3bb0bc4ff70ba786f18ff4db0bd1"></a>AKEYCODE_NUMPAD_COMMA</em> </td><td class="fielddoc">
-<p>Numeric keypad ',' key (for decimals or digit grouping). </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa79432be5f7a44e99ddc3721fd9fd212e"></a>AKEYCODE_NUMPAD_ENTER</em> </td><td class="fielddoc">
-<p>Numeric keypad Enter key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa73c1007a59641499ee5e1508e747c5ed"></a>AKEYCODE_NUMPAD_EQUALS</em> </td><td class="fielddoc">
-<p>Numeric keypad '=' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacc903e9eb495cf6cef7c6bc825f82f54"></a>AKEYCODE_NUMPAD_LEFT_PAREN</em> </td><td class="fielddoc">
-<p>Numeric keypad '(' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7662e0f2a099239dc69f6a27c7daabf9"></a>AKEYCODE_NUMPAD_RIGHT_PAREN</em> </td><td class="fielddoc">
-<p>Numeric keypad ')' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa174a5c7c39753235109696e82870c575"></a>AKEYCODE_VOLUME_MUTE</em> </td><td class="fielddoc">
-<p>Volume Mute key. Mutes the speaker, unlike <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f6675d38f50e3556a8531839fd83f02">AKEYCODE_MUTE</a>. This key should normally be implemented as a toggle such that the first press mutes the speaker and the second press restores the original volume. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa17e76263257a5dc654a413c9dc2fd649"></a>AKEYCODE_INFO</em> </td><td class="fielddoc">
-<p>Info key. Common on TV remotes to show additional information related to what is currently being viewed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa056914fd17ae539dca44f43745d8e05c"></a>AKEYCODE_CHANNEL_UP</em> </td><td class="fielddoc">
-<p>Channel up key. On TV remotes, increments the television channel. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa18f1808c6a819e787c9a9941f78b910f"></a>AKEYCODE_CHANNEL_DOWN</em> </td><td class="fielddoc">
-<p>Channel down key. On TV remotes, decrements the television channel. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacfce9bb78ef8106dce4868f81cca4fb4"></a>AKEYCODE_ZOOM_IN</em> </td><td class="fielddoc">
-<p>Zoom in key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacf035f5234c3df4589f35a50e99e0535"></a>AKEYCODE_ZOOM_OUT</em> </td><td class="fielddoc">
-<p>Zoom out key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0776ffae512b4848e53fce762a3a5017"></a>AKEYCODE_TV</em> </td><td class="fielddoc">
-<p>TV key. On TV remotes, switches to viewing live TV. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaabe7531c40ff4a31614ff6fd61802ebe8"></a>AKEYCODE_WINDOW</em> </td><td class="fielddoc">
-<p>Window key. On TV remotes, toggles picture-in-picture mode or other windowing functions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf33a5fa1f163245360aeed89d64b0233"></a>AKEYCODE_GUIDE</em> </td><td class="fielddoc">
-<p>Guide key. On TV remotes, shows a programming guide. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacf2f03b925a02ba6de9fd98737546a60"></a>AKEYCODE_DVR</em> </td><td class="fielddoc">
-<p>DVR key. On some TV remotes, switches to a DVR mode for recorded shows. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa03ce46d177e020690aa9d26a0fa850ae"></a>AKEYCODE_BOOKMARK</em> </td><td class="fielddoc">
-<p>Bookmark key. On some TV remotes, bookmarks content or web pages. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa81ba8d5343362b841b8a62b8679ff994"></a>AKEYCODE_CAPTIONS</em> </td><td class="fielddoc">
-<p>Toggle captions key. Switches the mode for closed-captioning text, for example during television shows. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa2bbd457230c3028df6b91d5bdda9159"></a>AKEYCODE_SETTINGS</em> </td><td class="fielddoc">
-<p>Settings key. Starts the system settings activity. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaafda3b0ea1b158831fc443bf4911a3930"></a>AKEYCODE_TV_POWER</em> </td><td class="fielddoc">
-<p>TV power key. On TV remotes, toggles the power on a television screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa1750b29e396bd1fd237ed4aadacc8f5"></a>AKEYCODE_TV_INPUT</em> </td><td class="fielddoc">
-<p>TV input key. On TV remotes, switches the input on a television screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab28aea3a51b11c9f227ce8cd5ff55a3d"></a>AKEYCODE_STB_POWER</em> </td><td class="fielddoc">
-<p>Set-top-box power key. On TV remotes, toggles the power on an external Set-top-box. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa988b0372359b2bca7390878fdba9e1b5"></a>AKEYCODE_STB_INPUT</em> </td><td class="fielddoc">
-<p>Set-top-box input key. On TV remotes, switches the input mode on an external Set-top-box. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa479d36f9814bd00c8986a252664b938b"></a>AKEYCODE_AVR_POWER</em> </td><td class="fielddoc">
-<p>A/V Receiver power key. On TV remotes, toggles the power on an external A/V Receiver. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa57d42dbd8ea4219f76fb116f234e6504"></a>AKEYCODE_AVR_INPUT</em> </td><td class="fielddoc">
-<p>A/V Receiver input key. On TV remotes, switches the input mode on an external A/V Receiver. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa2d9e3e82e69955f649b586f4518e074c"></a>AKEYCODE_PROG_RED</em> </td><td class="fielddoc">
-<p>Red "programmable" key. On TV remotes, acts as a contextual/programmable key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaad50c1e2136e47843a8dabca929f8ead1"></a>AKEYCODE_PROG_GREEN</em> </td><td class="fielddoc">
-<p>Green "programmable" key. On TV remotes, actsas a contextual/programmable key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaafa813640412bd41a181f0ec3a33dddc4"></a>AKEYCODE_PROG_YELLOW</em> </td><td class="fielddoc">
-<p>Yellow "programmable" key. On TV remotes, acts as a contextual/programmable key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5e82219fdb937fee5a22426c607dd4e0"></a>AKEYCODE_PROG_BLUE</em> </td><td class="fielddoc">
-<p>Blue "programmable" key. On TV remotes, acts as a contextual/programmable key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa53a59a262d6d523bdc2bd30a1e427bad"></a>AKEYCODE_APP_SWITCH</em> </td><td class="fielddoc">
-<p>App switch key. Should bring up the application switcher dialog. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa28c72c33ab93d83539d0790b7e48336a"></a>AKEYCODE_BUTTON_1</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #1. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab8089673fea303c7a299eefd2c327cc3"></a>AKEYCODE_BUTTON_2</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #2. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa706a5ff492c80b4653e6fe0dcd278ca1"></a>AKEYCODE_BUTTON_3</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #3. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa73c425a063bf6976e1ff8ae9f3cfcbe6"></a>AKEYCODE_BUTTON_4</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #4. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa47149f963528ec7abe55066abfb7caf5"></a>AKEYCODE_BUTTON_5</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #5. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa55057c8cda53a4c539d02ab1a93ca58b"></a>AKEYCODE_BUTTON_6</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #6. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac09e0c0cbbf6449bf106e4199600db35"></a>AKEYCODE_BUTTON_7</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #7. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaee64b3e0f30ed09e3c9f01b6c8877c3f"></a>AKEYCODE_BUTTON_8</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #8. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaac8e54092c8be5dc0e114ec35f40e00dc"></a>AKEYCODE_BUTTON_9</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #9. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab7e6f8621909f3461032c33f9c8acaa7"></a>AKEYCODE_BUTTON_10</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #10. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab413971c698b6e25d3955667c0142ac1"></a>AKEYCODE_BUTTON_11</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #11. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaafe4ee1e5446dd12bbb579b412048e79e"></a>AKEYCODE_BUTTON_12</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #12. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaabde2ed26594b89d5769eef9f0d1fe6f"></a>AKEYCODE_BUTTON_13</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #13. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa1f08dfd2c30ddedf1d2983680e89041b"></a>AKEYCODE_BUTTON_14</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #14. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7d8d0fb1a610fdb4e53f0fb675b7d7d0"></a>AKEYCODE_BUTTON_15</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #15. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa224370cba99bda2db6a1c82fd2f7fa39"></a>AKEYCODE_BUTTON_16</em> </td><td class="fielddoc">
-<p>Generic Game Pad Button #16. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7b8e87b47c17c5f1e97fcb56faaa26ff"></a>AKEYCODE_LANGUAGE_SWITCH</em> </td><td class="fielddoc">
-<p>Language Switch key. Toggles the current input language such as switching between English and Japanese on a QWERTY keyboard. On some devices, the same function may be performed by pressing Shift+Spacebar. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa380279768c5c50d92bef2a88394f967f"></a>AKEYCODE_MANNER_MODE</em> </td><td class="fielddoc">
-<p>Manner Mode key. Toggles silent or vibrate mode on and off to make the device behave more politely in certain settings such as on a crowded train. On some devices, the key may only operate when long-pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa68d314a5ec06701205cd0097c5c7145c"></a>AKEYCODE_3D_MODE</em> </td><td class="fielddoc">
-<p>3D Mode key. Toggles the display between 2D and 3D mode. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0aa2cfca11b7cabf82341a9dbec83f10"></a>AKEYCODE_CONTACTS</em> </td><td class="fielddoc">
-<p>Contacts special function key. Used to launch an address book application. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa114be17d1853c77a7406c024d9e4f076"></a>AKEYCODE_CALENDAR</em> </td><td class="fielddoc">
-<p>Calendar special function key. Used to launch a calendar application. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa14508751d70a0404b194d4b6df83ec72"></a>AKEYCODE_MUSIC</em> </td><td class="fielddoc">
-<p>Music special function key. Used to launch a music player application. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa293523c40bb9f1d793cd0b984f636573"></a>AKEYCODE_CALCULATOR</em> </td><td class="fielddoc">
-<p>Calculator special function key. Used to launch a calculator application. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf782be8df9a8ca5dc86c9bfeabac6f22"></a>AKEYCODE_ZENKAKU_HANKAKU</em> </td><td class="fielddoc">
-<p>Japanese full-width / half-width key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaadd69273b99eb0b848d98b2d6b3ad3234"></a>AKEYCODE_EISU</em> </td><td class="fielddoc">
-<p>Japanese alphanumeric key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7321e5c6b3cbab142bd16957653b2ac7"></a>AKEYCODE_MUHENKAN</em> </td><td class="fielddoc">
-<p>Japanese non-conversion key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab0686dd37c57d833d1158b7f1d85ee02"></a>AKEYCODE_HENKAN</em> </td><td class="fielddoc">
-<p>Japanese conversion key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa3be7db22b3c8aa046a46631e44863c28"></a>AKEYCODE_KATAKANA_HIRAGANA</em> </td><td class="fielddoc">
-<p>Japanese katakana / hiragana key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5ee19d21912056b902e283efa2d9d14b"></a>AKEYCODE_YEN</em> </td><td class="fielddoc">
-<p>Japanese Yen key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaae8b0af04dac5ea56fd55e577fd9e6be4"></a>AKEYCODE_RO</em> </td><td class="fielddoc">
-<p>Japanese Ro key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa62d090ae5c95a04dacdff79817dad531"></a>AKEYCODE_KANA</em> </td><td class="fielddoc">
-<p>Japanese kana key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7d3f036adb654c7752890a283ecbf838"></a>AKEYCODE_ASSIST</em> </td><td class="fielddoc">
-<p>Assist key. Launches the global assist activity. Not delivered to applications. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7cf1bf3528b6d8a0e86998287fe00650"></a>AKEYCODE_BRIGHTNESS_DOWN</em> </td><td class="fielddoc">
-<p>Brightness Down key. Adjusts the screen brightness down. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa0af6ec416c09d160e364466faa955c36"></a>AKEYCODE_BRIGHTNESS_UP</em> </td><td class="fielddoc">
-<p>Brightness Up key. Adjusts the screen brightness up. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa3cdb53cdf8c576e272502da06daa52e1"></a>AKEYCODE_MEDIA_AUDIO_TRACK</em> </td><td class="fielddoc">
-<p>Audio Track key. Switches the audio tracks. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaafc077e5a6b447ea060c144f6e65bd207"></a>AKEYCODE_SLEEP</em> </td><td class="fielddoc">
-<p>Sleep key. Puts the device to sleep. Behaves somewhat like <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6">AKEYCODE_POWER</a> but it has no effect if the device is already asleep. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa903c5152d26b3011ae521afa06759429"></a>AKEYCODE_WAKEUP</em> </td><td class="fielddoc">
-<p>Wakeup key. Wakes up the device. Behaves somewhat like <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6">AKEYCODE_POWER</a> but it has no effect if the device is already awake. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf0ecddd3dce52cf60c96c5d430b1f553"></a>AKEYCODE_PAIRING</em> </td><td class="fielddoc">
-<p>Pairing key. Initiates peripheral pairing mode. Useful for pairing remote control devices or game controllers, especially if no other input mode is available. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf3ddf83cb2f701911b03c3a738e2e73a"></a>AKEYCODE_MEDIA_TOP_MENU</em> </td><td class="fielddoc">
-<p>Media Top Menu key. Goes to the top of media menu. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaa22858c3c30d596ad60f355f75df86e1"></a>AKEYCODE_11</em> </td><td class="fielddoc">
-<p>'11' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa781c31195e55b2dcbdd772560dc61aa5"></a>AKEYCODE_12</em> </td><td class="fielddoc">
-<p>'12' key. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa187963dd6f74b96f132f23e01dea35e9"></a>AKEYCODE_LAST_CHANNEL</em> </td><td class="fielddoc">
-<p>Last Channel key. Goes to the last viewed channel. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa954c2251b2cb53f47637802cb66baf06"></a>AKEYCODE_TV_DATA_SERVICE</em> </td><td class="fielddoc">
-<p>TV data service key. Displays data services like weather, sports. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa95898663b7f74c93d0b860a43528c744"></a>AKEYCODE_VOICE_ASSIST</em> </td><td class="fielddoc">
-<p>Voice Assist key. Launches the global voice assist activity. Not delivered to applications. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa93dd3fd752701af5a5491e01cc15db72"></a>AKEYCODE_TV_RADIO_SERVICE</em> </td><td class="fielddoc">
-<p>Radio key. Toggles TV service / Radio service. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa7d3d7b89756df37f01d6d0f13beff1db"></a>AKEYCODE_TV_TELETEXT</em> </td><td class="fielddoc">
-<p>Teletext key. Displays Teletext service. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa630a08e07a3b4c6bcac9a1a72d176055"></a>AKEYCODE_TV_NUMBER_ENTRY</em> </td><td class="fielddoc">
-<p>Number entry key. Initiates to enter multi-digit channel nubmber when each digit key is assigned for selecting separate channel. Corresponds to Number Entry Mode (0x1D) of CEC User Control Code. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa14f2b6fe8550832ef9e3f9aa53164073"></a>AKEYCODE_TV_TERRESTRIAL_ANALOG</em> </td><td class="fielddoc">
-<p>Analog Terrestrial key. Switches to analog terrestrial broadcast service. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaacad8c149251a78760a5fe4931b9cdf16"></a>AKEYCODE_TV_TERRESTRIAL_DIGITAL</em> </td><td class="fielddoc">
-<p>Digital Terrestrial key. Switches to digital terrestrial broadcast service. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa3707d4396417535a611e4548afe33936"></a>AKEYCODE_TV_SATELLITE</em> </td><td class="fielddoc">
-<p>Satellite key. Switches to digital satellite broadcast service. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa8c52e7d06525c0ee5d943d63a0fa8ea5"></a>AKEYCODE_TV_SATELLITE_BS</em> </td><td class="fielddoc">
-<p>BS key. Switches to BS digital satellite broadcasting service available in Japan. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4eea1809a9ff679ed7773332d728c6b0"></a>AKEYCODE_TV_SATELLITE_CS</em> </td><td class="fielddoc">
-<p>CS key. Switches to CS digital satellite broadcasting service available in Japan. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa17c0e68066b86610ff168c6367af36eb"></a>AKEYCODE_TV_SATELLITE_SERVICE</em> </td><td class="fielddoc">
-<p>BS/CS key. Toggles between BS and CS digital satellite services. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaec5e46a5afc57953d1772e086307aa42"></a>AKEYCODE_TV_NETWORK</em> </td><td class="fielddoc">
-<p>Toggle Network key. Toggles selecting broacast services. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaabe33a80d6d3bf889af25cbd77fdb89f9"></a>AKEYCODE_TV_ANTENNA_CABLE</em> </td><td class="fielddoc">
-<p>Antenna/Cable key. Toggles broadcast input source between antenna and cable. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6a50de965f50ab3aa42772aac0808445"></a>AKEYCODE_TV_INPUT_HDMI_1</em> </td><td class="fielddoc">
-<p>HDMI #1 key. Switches to HDMI input #1. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab7ec65c008471d771bf879ec012f5c7f"></a>AKEYCODE_TV_INPUT_HDMI_2</em> </td><td class="fielddoc">
-<p>HDMI #2 key. Switches to HDMI input #2. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa6a0f267a2696d15bf16127121b1f1c7f"></a>AKEYCODE_TV_INPUT_HDMI_3</em> </td><td class="fielddoc">
-<p>HDMI #3 key. Switches to HDMI input #3. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4437c1d8d2d33058cfa71ec7b2771ec5"></a>AKEYCODE_TV_INPUT_HDMI_4</em> </td><td class="fielddoc">
-<p>HDMI #4 key. Switches to HDMI input #4. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5c3097f14c6582958ba1d14d70115ccd"></a>AKEYCODE_TV_INPUT_COMPOSITE_1</em> </td><td class="fielddoc">
-<p>Composite #1 key. Switches to composite video input #1. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaada13cbb9d619bc610678ad66325647b9"></a>AKEYCODE_TV_INPUT_COMPOSITE_2</em> </td><td class="fielddoc">
-<p>Composite #2 key. Switches to composite video input #2. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa156e2dba81e7c73624ccf8c2ef8833ae"></a>AKEYCODE_TV_INPUT_COMPONENT_1</em> </td><td class="fielddoc">
-<p>Component #1 key. Switches to component video input #1. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa8db9b6ee1457267abea03430781bb0ec"></a>AKEYCODE_TV_INPUT_COMPONENT_2</em> </td><td class="fielddoc">
-<p>Component #2 key. Switches to component video input #2. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa149b2c8a4817075c0a41e0adf11c8e85"></a>AKEYCODE_TV_INPUT_VGA_1</em> </td><td class="fielddoc">
-<p>VGA #1 key. Switches to VGA (analog RGB) input #1. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa419f0adac43cad104cd6cf83dc5f13f6"></a>AKEYCODE_TV_AUDIO_DESCRIPTION</em> </td><td class="fielddoc">
-<p>Audio description key. Toggles audio description off / on. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaccc5900ca5dd399d5ce11dd8ca324678"></a>AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP</em> </td><td class="fielddoc">
-<p>Audio description mixing volume up key. Louden audio description volume as compared with normal audio volume. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa5fca6a9ec1ce246bf3c53d859ac9f5eb"></a>AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN</em> </td><td class="fielddoc">
-<p>Audio description mixing volume down key. Lessen audio description volume as compared with normal audio volume. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa8e79045045293070c8eb9e408f1335b4"></a>AKEYCODE_TV_ZOOM_MODE</em> </td><td class="fielddoc">
-<p>Zoom mode key. Changes Zoom mode (Normal, Full, Zoom, Wide-zoom, etc.) </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaa4c18feeafff3c41081073c025ee017b8"></a>AKEYCODE_TV_CONTENTS_MENU</em> </td><td class="fielddoc">
-<p>Contents menu key. Goes to the title list. Corresponds to Contents Menu (0x0B) of CEC User Control Code </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaadde70071f6a432f367079efa6e1a6fe"></a>AKEYCODE_TV_MEDIA_CONTEXT_MENU</em> </td><td class="fielddoc">
-<p>Media context menu key. Goes to the context menu of media contents. Corresponds to Media Context-sensitive Menu (0x11) of CEC User Control Code. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaaf0293c2a63e4d955080334bef6640840"></a>AKEYCODE_TV_TIMER_PROGRAMMING</em> </td><td class="fielddoc">
-<p>Timer programming key. Goes to the timer recording menu. Corresponds to Timer Programming (0x54) of CEC User Control Code. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga6b7b47dd702d9e331586d485013fd1eaab062b403701292c9e2db96a1f88cc6d9"></a>AKEYCODE_HELP</em> </td><td class="fielddoc">
-<p>Help key. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gabc6126af1d45847bc59afa0aa3216b04"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Key states (may be returned by queries about the current state of a particular key code, scan code or switch). </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggabc6126af1d45847bc59afa0aa3216b04a9506627d5377c67dbc7fc58804b2cdfd"></a>AKEY_STATE_UNKNOWN</em> </td><td class="fielddoc">
-<p>The key state is unknown or the requested key itself is not supported. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc6126af1d45847bc59afa0aa3216b04afa14022f587487c24d401c87e71c8e28"></a>AKEY_STATE_UP</em> </td><td class="fielddoc">
-<p>The key is up. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc6126af1d45847bc59afa0aa3216b04a286ec0a7aff5903a982be0cd6785b62c"></a>AKEY_STATE_DOWN</em> </td><td class="fielddoc">
-<p>The key is down. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabc6126af1d45847bc59afa0aa3216b04ad09fd9fe458ca6c66ead9b9a75c56192"></a>AKEY_STATE_VIRTUAL</em> </td><td class="fielddoc">
-<p>The key is down but is a virtual key press that is being emulated by the system. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gadc29c2ff13d900c2f185ee95427fb06c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Meta key / modifer state. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06cae0a3cb26517b3f876beb37594494526d"></a>AMETA_NONE</em> </td><td class="fielddoc">
-<p>No meta keys are pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06caba44b1077427e4da1d202e0c8f772881"></a>AMETA_ALT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether one of the ALT meta keys is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca256c74b768ecee57e3218e81ae6945df"></a>AMETA_ALT_LEFT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the left ALT meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca985db074c0f44749ca86b5cc0454056a"></a>AMETA_ALT_RIGHT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the right ALT meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06caa3d5f49c3a55b653a94c798a2c93b197"></a>AMETA_SHIFT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether one of the SHIFT meta keys is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06caa01fa027cdd8951530437bcbe04c3ed7"></a>AMETA_SHIFT_LEFT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the left SHIFT meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06cac52930581c339216218a6f50c5b57aa1"></a>AMETA_SHIFT_RIGHT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the right SHIFT meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca8af1e90950a728baca807a83e50b22ea"></a>AMETA_SYM_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the SYM meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca545b31b72b0454c22c170ff534ddfdf1"></a>AMETA_FUNCTION_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the FUNCTION meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06cabe927318a2a11a46be3e9d78dbd81ef5"></a>AMETA_CTRL_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether one of the CTRL meta keys is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca752c837afd5ff0fcf75ddee7b6808be6"></a>AMETA_CTRL_LEFT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the left CTRL meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca0ab007e367ae136b873b3e6636747419"></a>AMETA_CTRL_RIGHT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the right CTRL meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca9c04e7c2ad1f0f41af60402188a29c4a"></a>AMETA_META_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether one of the META meta keys is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca6f923de8f2cd72e3ad86149c0747906f"></a>AMETA_META_LEFT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the left META meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06cafdf56d1259ae16c97161c443d7949bdf"></a>AMETA_META_RIGHT_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the right META meta key is pressed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06cafc467c98d509b0de28b298801a0c3e37"></a>AMETA_CAPS_LOCK_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the CAPS LOCK meta key is on. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06ca15d234534a6870add5594f02b7333dc6"></a>AMETA_NUM_LOCK_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the NUM LOCK meta key is on. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadc29c2ff13d900c2f185ee95427fb06cafe8dacdc6566f655a3eab73ea4a9af5a"></a>AMETA_SCROLL_LOCK_ON</em> </td><td class="fielddoc">
-<p>This mask is used to check whether the SCROLL LOCK meta key is on. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga61dadd085c1777f559549e05962b2c9e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Input event types. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga61dadd085c1777f559549e05962b2c9ea696f0d7635f7a24c17d3f1e4ccdd44ba"></a>AINPUT_EVENT_TYPE_KEY</em> </td><td class="fielddoc">
-<p>Indicates that the input event is a key event. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga61dadd085c1777f559549e05962b2c9ea2182dfda2cceb5425dcc2823b9b6b56a"></a>AINPUT_EVENT_TYPE_MOTION</em> </td><td class="fielddoc">
-<p>Indicates that the input event is a motion event. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga726ca809ffd3d67ab4b8476646f26635"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Key event actions. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga726ca809ffd3d67ab4b8476646f26635a123c3bd18fd93b53d8aedbe7597f7b49"></a>AKEY_EVENT_ACTION_DOWN</em> </td><td class="fielddoc">
-<p>The key has been pressed down. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga726ca809ffd3d67ab4b8476646f26635abf18b7c5384c5de8657a0650f8da57c3"></a>AKEY_EVENT_ACTION_UP</em> </td><td class="fielddoc">
-<p>The key has been released. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga726ca809ffd3d67ab4b8476646f26635a08e2d927e155478ee66ec46ebd845ab0"></a>AKEY_EVENT_ACTION_MULTIPLE</em> </td><td class="fielddoc">
-<p>Multiple duplicate key events have occurred in a row, or a complex string is being delivered. The repeat_count property of the key event contains the number of times the given key code should be executed. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga0411cd49bb5b71852cecd93bcbf0ca2d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Key event flags. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2da6473a1afc0cc39e029c2a217bc57cdba"></a>AKEY_EVENT_FLAG_WOKE_HERE</em> </td><td class="fielddoc">
-<p>This mask is set if the device woke because of this key event. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2da7dbb272c7b28be9c084df3446a629f32"></a>AKEY_EVENT_FLAG_SOFT_KEYBOARD</em> </td><td class="fielddoc">
-<p>This mask is set if the key event was generated by a software keyboard. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2dadc0a063ca412b0ea08474df422bf9b41"></a>AKEY_EVENT_FLAG_KEEP_TOUCH_MODE</em> </td><td class="fielddoc">
-<p>This mask is set if we don't want the key event to cause us to leave touch mode. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2dae1e7ec188b2404fadd94cfba89afd5d6"></a>AKEY_EVENT_FLAG_FROM_SYSTEM</em> </td><td class="fielddoc">
-<p>This mask is set if an event was known to come from a trusted part of the system. That is, the event is known to come from the user, and could not have been spoofed by a third party component. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2dab9dbcf990d1e4405e32f847fdea52013"></a>AKEY_EVENT_FLAG_EDITOR_ACTION</em> </td><td class="fielddoc">
-<p>This mask is used for compatibility, to identify enter keys that are coming from an IME whose enter key has been auto-labelled "next" or "done". This allows TextView to dispatch these as normal enter keys for old applications, but still do the appropriate action when receiving them. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2da3198fad5ab75df614bb41f0f602a9e55"></a>AKEY_EVENT_FLAG_CANCELED</em> </td><td class="fielddoc">
-<p>When associated with up key events, this indicates that the key press has been canceled. Typically this is used with virtual touch screen keys, where the user can slide from the virtual key area on to the display: in that case, the application will receive a canceled up event and should not perform the action normally associated with the key. Note that for this to work, the application can not perform an action for a key until it receives an up or the long press timeout has expired. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2dad4b5eba5b14e4076c69bc7185f2804f8"></a>AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY</em> </td><td class="fielddoc">
-<p>This key event was generated by a virtual (on-screen) hard key area. Typically this is an area of the touchscreen, outside of the regular display, dedicated to "hardware" buttons. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2da39f9f7bdf2e256db0e2a8a5dfbfb7185"></a>AKEY_EVENT_FLAG_LONG_PRESS</em> </td><td class="fielddoc">
-<p>This flag is set for the first key repeat that occurs after the long press timeout. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2daf09856f03f2fffee9a82cb8e508efb7a"></a>AKEY_EVENT_FLAG_CANCELED_LONG_PRESS</em> </td><td class="fielddoc">
-<p>Set when a key event has AKEY_EVENT_FLAG_CANCELED set because a long press action was executed while it was down. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2da91e70ab527f27a1779f4550d457f1689"></a>AKEY_EVENT_FLAG_TRACKING</em> </td><td class="fielddoc">
-<p>Set for AKEY_EVENT_ACTION_UP when this event's key code is still being tracked from its initial down. That is, somebody requested that tracking started on the key down and a long press has not caused the tracking to be canceled. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga0411cd49bb5b71852cecd93bcbf0ca2da14f574126d2544863fa8042ddd0f48c0"></a>AKEY_EVENT_FLAG_FALLBACK</em> </td><td class="fielddoc">
-<p>Set when a key event has been synthesized to implement default behavior for an event that the application did not handle. Fallback key events are generated by unhandled trackball motions (to emulate a directional keypad) and by certain unhandled key presses that are declared in the key map (such as special function numeric keypad keys when numlock is off). </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gabed82baf7f470b522273a3e37c24c600"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Motion event actions </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600abf84a22c84d4b7228102b80f3af92a4f"></a>AMOTION_EVENT_ACTION_MASK</em> </td><td class="fielddoc">
-<p>Bit mask of the parts of the action code that are the action itself. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a51384339fbb57c0087f7f50c45d9cff3"></a>AMOTION_EVENT_ACTION_POINTER_INDEX_MASK</em> </td><td class="fielddoc">
-<p>Bits in the action code that represent a pointer index, used with AMOTION_EVENT_ACTION_POINTER_DOWN and AMOTION_EVENT_ACTION_POINTER_UP. Shifting down by AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT provides the actual pointer index where the data for the pointer going up or down can be found. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a225e61c48ba334abc1b5811db02edcf1"></a>AMOTION_EVENT_ACTION_DOWN</em> </td><td class="fielddoc">
-<p>A pressed gesture has started, the motion contains the initial starting location. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a43798b2b7a6de4616d150b2438b8419e"></a>AMOTION_EVENT_ACTION_UP</em> </td><td class="fielddoc">
-<p>A pressed gesture has finished, the motion contains the final release location as well as any intermediate points since the last down or move event. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a41c56c4e772953fce60c93bc671639a3"></a>AMOTION_EVENT_ACTION_MOVE</em> </td><td class="fielddoc">
-<p>A change has happened during a press gesture (between AMOTION_EVENT_ACTION_DOWN and AMOTION_EVENT_ACTION_UP). The motion contains the most recent point, as well as any intermediate points since the last down or move event. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a3952b960f5eb8c4f55b42741e286b74e"></a>AMOTION_EVENT_ACTION_CANCEL</em> </td><td class="fielddoc">
-<p>The current gesture has been aborted. You will not receive any more points in it. You should treat this as an up event, but not perform any action that you normally would. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517"></a>AMOTION_EVENT_ACTION_OUTSIDE</em> </td><td class="fielddoc">
-<p>A movement has happened outside of the normal bounds of the UI element. This does not provide a full gesture, but only the initial location of the movement/touch. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a1618c641fd3f49fa7483f298d05b3cd2"></a>AMOTION_EVENT_ACTION_POINTER_DOWN</em> </td><td class="fielddoc">
-<p>A non-primary pointer has gone down. The bits in AMOTION_EVENT_ACTION_POINTER_INDEX_MASK indicate which pointer changed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600af2ef56aa7220eeb2073b9b028737bc1e"></a>AMOTION_EVENT_ACTION_POINTER_UP</em> </td><td class="fielddoc">
-<p>A non-primary pointer has gone up. The bits in AMOTION_EVENT_ACTION_POINTER_INDEX_MASK indicate which pointer changed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a84bc9fb3c01ff7ca9ee452a510e7de60"></a>AMOTION_EVENT_ACTION_HOVER_MOVE</em> </td><td class="fielddoc">
-<p>A change happened but the pointer is not down (unlike AMOTION_EVENT_ACTION_MOVE). The motion contains the most recent point, as well as any intermediate points since the last hover move event. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a45ba62b1e6fab4e84d5782d7c35ced04"></a>AMOTION_EVENT_ACTION_SCROLL</em> </td><td class="fielddoc">
-<p>The motion event contains relative vertical and/or horizontal scroll offsets. Use getAxisValue to retrieve the information from AMOTION_EVENT_AXIS_VSCROLL and AMOTION_EVENT_AXIS_HSCROLL. The pointer may or may not be down when this event is dispatched. This action is always delivered to the winder under the pointer, which may not be the window currently touched. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600a247b2c60ad92f3130ad43c907986ffb3"></a>AMOTION_EVENT_ACTION_HOVER_ENTER</em> </td><td class="fielddoc">
-<p>The pointer is not down but has entered the boundaries of a window or view. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggabed82baf7f470b522273a3e37c24c600ac00b1eacfbea779863abf3fcf02134aa"></a>AMOTION_EVENT_ACTION_HOVER_EXIT</em> </td><td class="fielddoc">
-<p>The pointer is not down but has exited the boundaries of a window or view. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gab04a0655cd1e3bcac5e8f48c18df1a57"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Motion event flags. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggab04a0655cd1e3bcac5e8f48c18df1a57a200623e1e4eee7797cad30917d289d7a"></a>AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED</em> </td><td class="fielddoc">
-<p>This flag indicates that the window that received this motion event is partly or wholly obscured by another visible window above it. This flag is set to true even if the event did not directly pass through the obscured area. A security sensitive application can check this flag to identify situations in which a malicious application may have covered up part of its content for the purpose of misleading the user or hijacking touches. An appropriate response might be to drop the suspect touches or to take additional precautions to confirm the user's actual intent. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="ga9dd3fd81e51dbfde19ab861541242aa1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AInputEvent_getDeviceId </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the id for the device that an input event came from.</p>
-<p>Input events can be generated by multiple different input devices. Use the input device id to obtain information about the input device that was responsible for generating a particular event.</p>
-<p>An input device id of 0 indicates that the event didn't come from a physical device; other numbers are arbitrary and you shouldn't depend on the values. Use the provided input device query API to obtain information about input devices. </p>
-
-</div>
-</div>
-<a class="anchor" id="gac90d4b497669dbc709ec9650db4e49be"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AInputEvent_getSource </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the input event source. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga8292ae06aa8120c52d7380d228600b9c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AInputEvent_getType </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Input event accessors.</p>
-<p>Note that most functions can only be used on input events that are of a given type. Calling these functions on input events of other types will yield undefined behavior.Get the input event type. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga900711156bfb58d1a4b158da7874930f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AInputQueue_attachLooper </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>ident</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> </td>
- <td class="paramname"><em>callback</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void * </td>
- <td class="paramname"><em>data</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Add this input queue to a looper for processing. See <a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">ALooper_addFd()</a> for information on the ident, callback, and data params. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaeebe9f83392ac79b31ca40a6fd4dbeff"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AInputQueue_detachLooper </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> * </td>
- <td class="paramname"><em>queue</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Remove the input queue from the looper it is currently attached to. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga17e87e0f35d47d729eac31a0dfb1ac33"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AInputQueue_finishEvent </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>handled</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Report that dispatching has finished with the given event. This must be called after receiving an event with AInputQueue_get_event(). </p>
-
-</div>
-</div>
-<a class="anchor" id="ga88de12e2b39787ba7d3e4ce2ea46a48c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AInputQueue_getEvent </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> ** </td>
- <td class="paramname"><em>outEvent</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the next available event from the queue. Returns a negative value if no events are available or an error has occurred. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2b72ad6ab5ef656e8c41163aa7871c96"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AInputQueue_hasEvents </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> * </td>
- <td class="paramname"><em>queue</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns true if there are one or more events available in the input queue. Returns 1 if the queue has events; 0 if it does not have events; and a negative value if there is an error. </p>
-
-</div>
-</div>
-<a class="anchor" id="gadecd32e6c7aefa4a508b355550d3eaa9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AInputQueue_preDispatchEvent </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>event</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Sends the key for standard pre-dispatching – that is, possibly deliver it to the current IME to be consumed before the app. Returns 0 if it was not pre-dispatched, meaning you can process it right now. If non-zero is returned, you must abandon the current event processing and allow the event to appear again in the event queue (if it does not get consumed during pre-dispatching). </p>
-
-</div>
-</div>
-<a class="anchor" id="ga36ec0b59f98f86a7ca263ba91279896d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AKeyEvent_getAction </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the key event action. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf475b6f0860bdfca4ceea7bc46eab1a9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int64_t AKeyEvent_getDownTime </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the time of the most recent key down event, in the java.lang.System.nanoTime() time base. If this is a down event, this will be the same as eventTime. Note that when chording keys, this value is the down time of the most recently pressed key, which may not be the same physical key of this event. </p>
-
-</div>
-</div>
-<a class="anchor" id="gae3eac7d68195d1767c947ca267842696"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int64_t AKeyEvent_getEventTime </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the time this event occurred, in the java.lang.System.nanoTime() time base. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2a18e98efe0c4ccb6f39bb13c555010e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AKeyEvent_getFlags </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the key event flags. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga6b01ecd60018a5445f4917a861ca9466"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AKeyEvent_getKeyCode </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the key code of the key event. This is the physical key that was pressed, not the Unicode character. </p>
-
-</div>
-</div>
-<a class="anchor" id="gabdda62b40b22727af2fb41740bf4787b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AKeyEvent_getMetaState </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the meta key state. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga5358fe3ebbd4b5b2f88a4ad2eba6f885"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AKeyEvent_getRepeatCount </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the repeat count of the event. For both key up an key down events, this is the number of times the key has repeated with the first down starting at 0 and counting up from there. For multiple key events, this is the number of down/up pairs that have occurred. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4a0a846b7a195aeb290dfcd2250137d9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AKeyEvent_getScanCode </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>key_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the hardware key id of this key event. These values are not reliable and vary from device to device. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga73ea2093cc2343675ac43dd08bef4247"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getAction </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the combined motion event action code and pointer index. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9d364cdcebf85237f599b25861f38c21"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getAxisValue </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>axis</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the value of the request axis for the given pointer index. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1aa7ebb749416491b6f0c55ae87ddf49"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getButtonState </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the button state of all buttons that are pressed. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad44be7697e68891688cd7bcfaffec209"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int64_t AMotionEvent_getDownTime </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the time when the user originally pressed down to start a stream of position events, in the java.lang.System.nanoTime() time base. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad7e1f0caa4c27194d4a8756a18432299"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getEdgeFlags </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get a bitfield indicating which edges, if any, were touched by this motion event. For touch events, clients can use this to determine if the user's finger was touching the edge of the display. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7e13fbf3cff0700b0b620284ebdd3a33"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int64_t AMotionEvent_getEventTime </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the time when this specific event was generated, in the java.lang.System.nanoTime() time base. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2891d19197c070207098fa48adeb35af"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getFlags </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the motion event flags. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7ca740e1324f3cdb934252dce0c982d0"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalAxisValue </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>axis</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical value of the request axis for the given pointer index that occurred between this event and the previous motion event. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga523f1a760754206965b42b08d62f9346"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int64_t AMotionEvent_getHistoricalEventTime </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the time that a historical movement occurred between this event and the previous event, in the java.lang.System.nanoTime() time base. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaab9cb8fa670175ecc73c75eed4e5cd3f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalOrientation </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical orientation of the touch area and tool area in radians clockwise from vertical for the given pointer index that occurred between this event and the previous motion event. An angle of 0 degrees indicates that the major axis of contact is oriented upwards, is perfectly circular or is of unknown orientation. A positive angle indicates that the major axis of contact is oriented to the right. A negative angle indicates that the major axis of contact is oriented to the left. The full range is from -PI/2 radians (finger pointing fully left) to PI/2 radians (finger pointing fully right). </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa8e9352ee5b043b3e1b6e2062d491010"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalPressure </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical pressure of this event for the given pointer index that occurred between this event and the previous motion event. The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure), although values higher than 1 may be generated depending on the calibration of the input device. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga5d36c2e7420001c86ae2aa1168fe6f83"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalRawX </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical raw X coordinate of this event for the given pointer index that occurred between this event and the previous motion event. For touch events on the screen, this is the original location of the event on the screen, before it had been adjusted for the containing window and views. Whole numbers are pixels; the value may have a fraction for input devices that are sub-pixel precise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga6deb0e7690a93aa53e5872c2691b69fe"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalRawY </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical raw Y coordinate of this event for the given pointer index that occurred between this event and the previous motion event. For touch events on the screen, this is the original location of the event on the screen, before it had been adjusted for the containing window and views. Whole numbers are pixels; the value may have a fraction for input devices that are sub-pixel precise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga0a04bb7ec12928db7e62645e7fad3a9e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalSize </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current scaled value of the approximate size for the given pointer index that occurred between this event and the previous motion event. This represents some approximation of the area of the screen being pressed; the actual value in pixels corresponding to the touch is normalized with the device specific range of values and scaled to a value between 0 and 1. The value of size can be used to determine fat touch events. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga160a5830e791e8c42ae97f51b92233d2"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalToolMajor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical length of the major axis of an ellipse that describes the size of the approaching tool for the given pointer index that occurred between this event and the previous motion event. The tool area represents the estimated size of the finger or pen that is touching the device independent of its actual touch area at the point of contact. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafe01aa7576a6d1bce750fb8482355849"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalToolMinor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical length of the minor axis of an ellipse that describes the size of the approaching tool for the given pointer index that occurred between this event and the previous motion event. The tool area represents the estimated size of the finger or pen that is touching the device independent of its actual touch area at the point of contact. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf437f223668b97f19ebdbad4b9cf4483"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalTouchMajor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical length of the major axis of an ellipse that describes the touch area at the point of contact for the given pointer index that occurred between this event and the previous motion event. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga126715d966e989652aa1ae5d38e0e898"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalTouchMinor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical length of the minor axis of an ellipse that describes the touch area at the point of contact for the given pointer index that occurred between this event and the previous motion event. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga49a8ca89ff377b5ed2355e8d7220ae07"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalX </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical X coordinate of this event for the given pointer index that occurred between this event and the previous motion event. Whole numbers are pixels; the value may have a fraction for input devices that are sub-pixel precise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga30fc4e5d3ce144955859f8c97b51b73d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getHistoricalY </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>history_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the historical Y coordinate of this event for the given pointer index that occurred between this event and the previous motion event. Whole numbers are pixels; the value may have a fraction for input devices that are sub-pixel precise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga0aef34c236db6d7a56a50bf590be7bcc"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">size_t AMotionEvent_getHistorySize </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the number of historical points in this event. These are movements that have occurred between this event and the previous event. This only applies to AMOTION_EVENT_ACTION_MOVE events – all other actions will have a size of 0. Historical samples are indexed from oldest to newest. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga5644f0d952e3dea57ba9f7ce51dff2bb"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getMetaState </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the state of any meta / modifier keys that were in effect when the event was generated. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad28422998da15b789edcba6b8bc5d615"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getOrientation </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current orientation of the touch area and tool area in radians clockwise from vertical for the given pointer index. An angle of 0 degrees indicates that the major axis of contact is oriented upwards, is perfectly circular or is of unknown orientation. A positive angle indicates that the major axis of contact is oriented to the right. A negative angle indicates that the major axis of contact is oriented to the left. The full range is from -PI/2 radians (finger pointing fully left) to PI/2 radians (finger pointing fully right). </p>
-
-</div>
-</div>
-<a class="anchor" id="ga612e68d104adbc6d14d87510e8066bd8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">size_t AMotionEvent_getPointerCount </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the number of pointers of data contained in this event. Always >= 1. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga599e21a79c706807243a8ee31b116138"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getPointerId </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the pointer identifier associated with a particular pointer data index in this event. The identifier tells you the actual pointer number associated with the data, accounting for individual pointers going up and down since the start of the current gesture. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga97fcaa6cd08c9d54b35711e482e06c8d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getPressure </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current pressure of this event for the given pointer index. The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure), although values higher than 1 may be generated depending on the calibration of the input device. </p>
-
-</div>
-</div>
-<a class="anchor" id="gafe45e29ef138cc30592237ce479837f0"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getRawX </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the original raw X coordinate of this event. For touch events on the screen, this is the original location of the event on the screen, before it had been adjusted for the containing window and views. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga5a09c3d742a93270861aa05f24257c23"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getRawY </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the original raw X coordinate of this event. For touch events on the screen, this is the original location of the event on the screen, before it had been adjusted for the containing window and views. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9b1f3c3df46b5269f9e74d2dd70c88a8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getSize </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current scaled value of the approximate size for the given pointer index. This represents some approximation of the area of the screen being pressed; the actual value in pixels corresponding to the touch is normalized with the device specific range of values and scaled to a value between 0 and 1. The value of size can be used to determine fat touch events. </p>
-
-</div>
-</div>
-<a class="anchor" id="gac04099690f278a6a27191c2027b12a77"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getToolMajor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current length of the major axis of an ellipse that describes the size of the approaching tool for the given pointer index. The tool area represents the estimated size of the finger or pen that is touching the device independent of its actual touch area at the point of contact. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2222d459759ba4a8269647012d2718fb"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getToolMinor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current length of the minor axis of an ellipse that describes the size of the approaching tool for the given pointer index. The tool area represents the estimated size of the finger or pen that is touching the device independent of its actual touch area at the point of contact. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2babe4e2e79952e004538f8f1878649c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AMotionEvent_getToolType </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the tool type of a pointer for the given pointer index. The tool type indicates the type of tool used to make contact such as a finger or stylus, if known. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9ac18fe19534e07d80441582f489d471"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getTouchMajor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current length of the major axis of an ellipse that describes the touch area at the point of contact for the given pointer index. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga65f71e257b5fcb29dcbaaf59b3fcb3a7"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getTouchMinor </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current length of the minor axis of an ellipse that describes the touch area at the point of contact for the given pointer index. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga22e255a5fa52761cd92ce78af91e9757"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getX </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current X coordinate of this event for the given pointer index. Whole numbers are pixels; the value may have a fraction for input devices that are sub-pixel precise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7a94ce622eb78a17737fd8bddbf86e21"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getXOffset </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the X coordinate offset. For touch events on the screen, this is the delta that was added to the raw screen coordinates to adjust for the absolute position of the containing windows and views. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga81a9be07673a01f43fd0241c7b4c254f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getXPrecision </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the precision of the X coordinates being reported. You can multiply this number with an X coordinate sample to find the actual hardware value of the X coordinate. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga113f58a37e41f2a6c3007d68418edfa6"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getY </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>pointer_index</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the current Y coordinate of this event for the given pointer index. Whole numbers are pixels; the value may have a fraction for input devices that are sub-pixel precise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7f6bd2c12d912f502c245b6ced6d3704"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getYOffset </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the Y coordinate offset. For touch events on the screen, this is the delta that was added to the raw screen coordinates to adjust for the absolute position of the containing windows and views. </p>
-
-</div>
-</div>
-<a class="anchor" id="gae311e6e28bce4be905526f9ea71278ed"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float AMotionEvent_getYPrecision </td>
- <td>(</td>
- <td class="paramtype">const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> * </td>
- <td class="paramname"><em>motion_event</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the precision of the Y coordinates being reported. You can multiply this number with a Y coordinate sample to find the actual hardware value of the Y coordinate. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___looper.jd b/docs/html/ndk/reference/group___looper.jd
deleted file mode 100644
index bc845f8..0000000
--- a/docs/html/ndk/reference/group___looper.jd
+++ /dev/null
@@ -1,442 +0,0 @@
-page.title=Looper
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Looper</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:looper_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="looper_8h.html">looper.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gadb10521a80138b777ba1bc2ca74d4af5"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a></td></tr>
-<tr class="separator:gadb10521a80138b777ba1bc2ca74d4af5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga410b184b4e48302c439e36c8ce0a7a89"><td class="memItemLeft" align="right" valign="top">typedef int(* </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> )(int fd, int events, void *data)</td></tr>
-<tr class="separator:ga410b184b4e48302c439e36c8ce0a7a89"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gaf9bdc3014f3d54c426b6d2df10de4960"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___looper.html#ggaf9bdc3014f3d54c426b6d2df10de4960a1fff26ab5859b0308b58a3f8d58ef1eb">ALOOPER_PREPARE_ALLOW_NON_CALLBACKS</a> = 1<<0
- }</td></tr>
-<tr class="separator:gaf9bdc3014f3d54c426b6d2df10de4960"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadb49720dc49f7d4e4cf9adbf2948e409"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a55528f1b28df17cc4b6317cc0d0fde47">ALOOPER_POLL_WAKE</a> = -1,
-<a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a64fe936780bfd9927affaf8e8cc81cc2">ALOOPER_POLL_CALLBACK</a> = -2,
-<a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a3fe4eec66dff78a9fa8afca02e8b8443">ALOOPER_POLL_TIMEOUT</a> = -3,
-<a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409af8ebd4022f6f5d5fea864f6999b7e6b4">ALOOPER_POLL_ERROR</a> = -4
- }</td></tr>
-<tr class="separator:gadb49720dc49f7d4e4cf9adbf2948e409"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaae05225933a42f81e7c4a9fb286596f9"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9ae3d18f8dd1faf6f34468df10667949bc">ALOOPER_EVENT_INPUT</a> = 1 << 0,
-<a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a71273fd07e009057e6e3475d10f8286d">ALOOPER_EVENT_OUTPUT</a> = 1 << 1,
-<a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a14016d8f39373b8ce061276a957960f6">ALOOPER_EVENT_ERROR</a> = 1 << 2,
-<a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a5e7fb5acdecef18b2c293f6309e5d4ab">ALOOPER_EVENT_HANGUP</a> = 1 << 3,
-<br/>
-  <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9aefe82c6ce8e02d13aceaebdec15c2aff">ALOOPER_EVENT_INVALID</a> = 1 << 4
-<br/>
- }</td></tr>
-<tr class="separator:gaae05225933a42f81e7c4a9fb286596f9"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga741ccd90a0eb9209c6bddf2326d89e4a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga741ccd90a0eb9209c6bddf2326d89e4a">ALooper_forThread</a> ()</td></tr>
-<tr class="separator:ga741ccd90a0eb9209c6bddf2326d89e4a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1a070b904dd957cc65af9eb5ef6dfa25"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga1a070b904dd957cc65af9eb5ef6dfa25">ALooper_prepare</a> (int opts)</td></tr>
-<tr class="separator:ga1a070b904dd957cc65af9eb5ef6dfa25"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae1ad7ac48ab01a34bfd25840c92ff07b"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gae1ad7ac48ab01a34bfd25840c92ff07b">ALooper_acquire</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper)</td></tr>
-<tr class="separator:gae1ad7ac48ab01a34bfd25840c92ff07b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab723c3c2ac2c66bc695913a194073727"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gab723c3c2ac2c66bc695913a194073727">ALooper_release</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper)</td></tr>
-<tr class="separator:gab723c3c2ac2c66bc695913a194073727"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2a9044602b76fef7f47c7e11a801561c"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce</a> (int timeoutMillis, int *outFd, int *outEvents, void **outData)</td></tr>
-<tr class="separator:ga2a9044602b76fef7f47c7e11a801561c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa7cd0636edc4ed227aadc585360ebefa"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll</a> (int timeoutMillis, int *outFd, int *outEvents, void **outData)</td></tr>
-<tr class="separator:gaa7cd0636edc4ed227aadc585360ebefa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab2585652f8ae2e2444979194ebe32aaf"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gab2585652f8ae2e2444979194ebe32aaf">ALooper_wake</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper)</td></tr>
-<tr class="separator:gab2585652f8ae2e2444979194ebe32aaf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2668285bfadcf21ef4d371568a30be33"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">ALooper_addFd</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int fd, int ident, int events, <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> callback, void *data)</td></tr>
-<tr class="separator:ga2668285bfadcf21ef4d371568a30be33"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf7d68ed05698b251489b4f6c8e54daad"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gaf7d68ed05698b251489b4f6c8e54daad">ALooper_removeFd</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int fd)</td></tr>
-<tr class="separator:gaf7d68ed05698b251489b4f6c8e54daad"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="gadb10521a80138b777ba1bc2ca74d4af5"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>ALooper</p>
-<p>A looper is the state tracking an event loop for a thread. Loopers do not define event structures or other such things; rather they are a lower-level facility to attach one or more discrete objects listening for an event. An "event" here is simply data available on a file descriptor: each attached object has an associated file descriptor, and waiting for "events" means (internally) polling on all of these file descriptors until one or more of them have data available.</p>
-<p>A thread can have only one ALooper associated with it. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga410b184b4e48302c439e36c8ce0a7a89"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef int(* ALooper_callbackFunc)(int fd, int events, void *data)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>For callback-based event loops, this is the prototype of the function that is called when a file descriptor event occurs. It is given the file descriptor it is associated with, a bitmask of the poll events that were triggered (typically ALOOPER_EVENT_INPUT), and the data pointer that was originally supplied.</p>
-<p>Implementations should return 1 to continue receiving callbacks, or 0 to have this file descriptor and callback unregistered from the looper. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="gaf9bdc3014f3d54c426b6d2df10de4960"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Option for for <a class="el" href="group___looper.html#ga1a070b904dd957cc65af9eb5ef6dfa25">ALooper_prepare()</a>. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaf9bdc3014f3d54c426b6d2df10de4960a1fff26ab5859b0308b58a3f8d58ef1eb"></a>ALOOPER_PREPARE_ALLOW_NON_CALLBACKS</em> </td><td class="fielddoc">
-<p>This looper will accept calls to <a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">ALooper_addFd()</a> that do not have a callback (that is provide NULL for the callback). In this case the caller of <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a> or <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll()</a> MUST check the return from these functions to discover when data is available on such fds and process it. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gadb49720dc49f7d4e4cf9adbf2948e409"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Result from <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a> and <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll()</a>. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggadb49720dc49f7d4e4cf9adbf2948e409a55528f1b28df17cc4b6317cc0d0fde47"></a>ALOOPER_POLL_WAKE</em> </td><td class="fielddoc">
-<p>The poll was awoken using wake() before the timeout expired and no callbacks were executed and no other file descriptors were ready. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadb49720dc49f7d4e4cf9adbf2948e409a64fe936780bfd9927affaf8e8cc81cc2"></a>ALOOPER_POLL_CALLBACK</em> </td><td class="fielddoc">
-<p>Result from <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a> and <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll()</a>: One or more callbacks were executed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadb49720dc49f7d4e4cf9adbf2948e409a3fe4eec66dff78a9fa8afca02e8b8443"></a>ALOOPER_POLL_TIMEOUT</em> </td><td class="fielddoc">
-<p>Result from <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a> and <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll()</a>: The timeout expired. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggadb49720dc49f7d4e4cf9adbf2948e409af8ebd4022f6f5d5fea864f6999b7e6b4"></a>ALOOPER_POLL_ERROR</em> </td><td class="fielddoc">
-<p>Result from <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a> and <a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll()</a>: An error occurred. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaae05225933a42f81e7c4a9fb286596f9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Flags for file descriptor events that a looper can monitor.</p>
-<p>These flag bits can be combined to monitor multiple events at once. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaae05225933a42f81e7c4a9fb286596f9ae3d18f8dd1faf6f34468df10667949bc"></a>ALOOPER_EVENT_INPUT</em> </td><td class="fielddoc">
-<p>The file descriptor is available for read operations. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaae05225933a42f81e7c4a9fb286596f9a71273fd07e009057e6e3475d10f8286d"></a>ALOOPER_EVENT_OUTPUT</em> </td><td class="fielddoc">
-<p>The file descriptor is available for write operations. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaae05225933a42f81e7c4a9fb286596f9a14016d8f39373b8ce061276a957960f6"></a>ALOOPER_EVENT_ERROR</em> </td><td class="fielddoc">
-<p>The file descriptor has encountered an error condition.</p>
-<p>The looper always sends notifications about errors; it is not necessary to specify this event flag in the requested event set. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaae05225933a42f81e7c4a9fb286596f9a5e7fb5acdecef18b2c293f6309e5d4ab"></a>ALOOPER_EVENT_HANGUP</em> </td><td class="fielddoc">
-<p>The file descriptor was hung up. For example, indicates that the remote end of a pipe or socket was closed.</p>
-<p>The looper always sends notifications about hangups; it is not necessary to specify this event flag in the requested event set. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaae05225933a42f81e7c4a9fb286596f9aefe82c6ce8e02d13aceaebdec15c2aff"></a>ALOOPER_EVENT_INVALID</em> </td><td class="fielddoc">
-<p>The file descriptor is invalid. For example, the file descriptor was closed prematurely.</p>
-<p>The looper always sends notifications about invalid file descriptors; it is not necessary to specify this event flag in the requested event set. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="gae1ad7ac48ab01a34bfd25840c92ff07b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ALooper_acquire </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Acquire a reference on the given ALooper object. This prevents the object from being deleted until the reference is removed. This is only needed to safely hand an ALooper from one thread to another. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2668285bfadcf21ef4d371568a30be33"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ALooper_addFd </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>fd</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>ident</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>events</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> </td>
- <td class="paramname"><em>callback</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void * </td>
- <td class="paramname"><em>data</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Adds a new file descriptor to be polled by the looper. If the same file descriptor was previously added, it is replaced.</p>
-<p>"fd" is the file descriptor to be added. "ident" is an identifier for this event, which is returned from <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a>. The identifier must be >= 0, or ALOOPER_POLL_CALLBACK if providing a non-NULL callback. "events" are the poll events to wake up on. Typically this is ALOOPER_EVENT_INPUT. "callback" is the function to call when there is an event on the file descriptor. "data" is a private data pointer to supply to the callback.</p>
-<p>There are two main uses of this function:</p>
-<p>(1) If "callback" is non-NULL, then this function will be called when there is data on the file descriptor. It should execute any events it has pending, appropriately reading from the file descriptor. The 'ident' is ignored in this case.</p>
-<p>(2) If "callback" is NULL, the 'ident' will be returned by ALooper_pollOnce when its file descriptor has data available, requiring the caller to take care of processing it.</p>
-<p>Returns 1 if the file descriptor was added or -1 if an error occurred.</p>
-<p>This method can be called on any thread. This method may block briefly if it needs to wake the poll. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga741ccd90a0eb9209c6bddf2326d89e4a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a>* ALooper_forThread </td>
- <td>(</td>
- <td class="paramname"></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the looper associated with the calling thread, or NULL if there is not one. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa7cd0636edc4ed227aadc585360ebefa"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ALooper_pollAll </td>
- <td>(</td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>timeoutMillis</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int * </td>
- <td class="paramname"><em>outFd</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int * </td>
- <td class="paramname"><em>outEvents</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void ** </td>
- <td class="paramname"><em>outData</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Like <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a>, but performs all pending callbacks until all data has been consumed or a file descriptor is available with no callback. This function will never return ALOOPER_POLL_CALLBACK. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga2a9044602b76fef7f47c7e11a801561c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ALooper_pollOnce </td>
- <td>(</td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>timeoutMillis</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int * </td>
- <td class="paramname"><em>outFd</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int * </td>
- <td class="paramname"><em>outEvents</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void ** </td>
- <td class="paramname"><em>outData</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Waits for events to be available, with optional timeout in milliseconds. Invokes callbacks for all file descriptors on which an event occurred.</p>
-<p>If the timeout is zero, returns immediately without blocking. If the timeout is negative, waits indefinitely until an event appears.</p>
-<p>Returns ALOOPER_POLL_WAKE if the poll was awoken using wake() before the timeout expired and no callbacks were invoked and no other file descriptors were ready.</p>
-<p>Returns ALOOPER_POLL_CALLBACK if one or more callbacks were invoked.</p>
-<p>Returns ALOOPER_POLL_TIMEOUT if there was no data before the given timeout expired.</p>
-<p>Returns ALOOPER_POLL_ERROR if an error occurred.</p>
-<p>Returns a value >= 0 containing an identifier (the same identifier <code>ident</code> passed to <a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">ALooper_addFd()</a>) if its file descriptor has data and it has no callback function (requiring the caller here to handle it). In this (and only this) case outFd, outEvents and outData will contain the poll events and data associated with the fd, otherwise they will be set to NULL.</p>
-<p>This method does not return until it has finished invoking the appropriate callbacks for all file descriptors that were signalled. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1a070b904dd957cc65af9eb5ef6dfa25"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a>* ALooper_prepare </td>
- <td>(</td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>opts</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Prepares a looper associated with the calling thread, and returns it. If the thread already has a looper, it is returned. Otherwise, a new one is created, associated with the thread, and returned.</p>
-<p>The opts may be ALOOPER_PREPARE_ALLOW_NON_CALLBACKS or 0. </p>
-
-</div>
-</div>
-<a class="anchor" id="gab723c3c2ac2c66bc695913a194073727"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ALooper_release </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Remove a reference that was previously acquired with <a class="el" href="group___looper.html#gae1ad7ac48ab01a34bfd25840c92ff07b">ALooper_acquire()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf7d68ed05698b251489b4f6c8e54daad"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ALooper_removeFd </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>fd</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Removes a previously added file descriptor from the looper.</p>
-<p>When this method returns, it is safe to close the file descriptor since the looper will no longer have a reference to it. However, it is possible for the callback to already be running or for it to run one last time if the file descriptor was already signalled. Calling code is responsible for ensuring that this case is safely handled. For example, if the callback takes care of removing itself during its own execution either by returning 0 or by calling this method, then it can be guaranteed to not be invoked again at any later time unless registered anew.</p>
-<p>Returns 1 if the file descriptor was removed, 0 if none was previously registered or -1 if an error occurred.</p>
-<p>This method can be called on any thread. This method may block briefly if it needs to wake the poll. </p>
-
-</div>
-</div>
-<a class="anchor" id="gab2585652f8ae2e2444979194ebe32aaf"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ALooper_wake </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Wakes the poll asynchronously.</p>
-<p>This method can be called on any thread. This method returns immediately. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___native_activity.jd b/docs/html/ndk/reference/group___native_activity.jd
deleted file mode 100644
index d0b2178..0000000
--- a/docs/html/ndk/reference/group___native_activity.jd
+++ /dev/null
@@ -1,731 +0,0 @@
-page.title=Native Activity
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#nested-classes">Data Structures</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> |
-<a href="#var-members">Variables</a> </div>
- <div class="headertitle">
-<div class="title">Native Activity</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:native__activity_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="native__activity_8h.html">native_activity.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:native__window_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="native__window_8h.html">native_window.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:native__window__jni_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="native__window__jni_8h.html">native_window_jni.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:rect_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="rect_8h.html">rect.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:window_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="window_8h.html">window.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_rect.html">ARect</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga8abd07923f37feb1ce724d139cc2609d"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_native_activity.html">ANativeActivity</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga8abd07923f37feb1ce724d139cc2609d">ANativeActivity</a></td></tr>
-<tr class="separator:ga8abd07923f37feb1ce724d139cc2609d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga28dca784e5ee939427135c72c0151c38"><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
-<a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga28dca784e5ee939427135c72c0151c38">ANativeActivityCallbacks</a></td></tr>
-<tr class="separator:ga28dca784e5ee939427135c72c0151c38"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga569a53bcac3fcedb0189b7c412ebcb22"><td class="memItemLeft" align="right" valign="top">typedef void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">ANativeActivity_createFunc</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, void *savedState, size_t savedStateSize)</td></tr>
-<tr class="separator:ga569a53bcac3fcedb0189b7c412ebcb22"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga66956d540c2e3709e12156d195e64726"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a></td></tr>
-<tr class="separator:ga66956d540c2e3709e12156d195e64726"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad0983ca473ce36293baf5e51a14c3357"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gad0983ca473ce36293baf5e51a14c3357">ANativeWindow_Buffer</a></td></tr>
-<tr class="separator:gad0983ca473ce36293baf5e51a14c3357"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa984a498f0e146ac57c6022a323423cf"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_rect.html">ARect</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaa984a498f0e146ac57c6022a323423cf">ARect</a></td></tr>
-<tr class="separator:gaa984a498f0e146ac57c6022a323423cf"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga39fca1837c5ce7715cbf571669660c13"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a9b7250ac0e5a626a81b176462a9df7c9">ANATIVEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT</a> = 0x0001,
-<a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a324062ac78fab16b40e8de1b1ae173b5">ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED</a> = 0x0002
- }</td></tr>
-<tr class="separator:ga39fca1837c5ce7715cbf571669660c13"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf8fd5f0e57d456151c951e0f3715fc4"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a642e76508cc737bbc1df149756c2a807">ANATIVEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY</a> = 0x0001,
-<a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a0f4cbb55fa4c29b963b7b37d13352e6f">ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS</a> = 0x0002
- }</td></tr>
-<tr class="separator:gaaf8fd5f0e57d456151c951e0f3715fc4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga94798fdadfbf49a7c658ace669a1d310"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a6a165383340acce0b32c555dd2ac2c01">WINDOW_FORMAT_RGBA_8888</a> = 1,
-<a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a5f83a97ccf64fc1554c220476e8aaf30">WINDOW_FORMAT_RGBX_8888</a> = 2,
-<a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310ab26fa9c38f169263b611a8b757bb0259">WINDOW_FORMAT_RGB_565</a> = 4
- }</td></tr>
-<tr class="separator:ga94798fdadfbf49a7c658ace669a1d310"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf715e26dfffd1f8de1c18449e2770cff"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa67363c129036872bc9dd29557e807508">AWINDOW_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON</a> = 0x00000001,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6155e77ae4e12cc56fb3f6f55f56bf6f">AWINDOW_FLAG_DIM_BEHIND</a> = 0x00000002,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa0377f46a626d411ace179c1c27d0a3f7">AWINDOW_FLAG_BLUR_BEHIND</a> = 0x00000004,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">AWINDOW_FLAG_NOT_FOCUSABLE</a> = 0x00000008,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae9f1278ffa6fe9c12c2305d4f4de1450">AWINDOW_FLAG_NOT_TOUCHABLE</a> = 0x00000010,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09">AWINDOW_FLAG_NOT_TOUCH_MODAL</a> = 0x00000020,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5574a513645e6e7cb4d6a9f4a043d773">AWINDOW_FLAG_TOUCHABLE_WHEN_WAKING</a> = 0x00000040,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8">AWINDOW_FLAG_KEEP_SCREEN_ON</a> = 0x00000080,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6978968d7e0dc1a0e12f58ad395a959a">AWINDOW_FLAG_LAYOUT_IN_SCREEN</a> = 0x00000100,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffade9722581a203ee0db25d42f4d2bd389">AWINDOW_FLAG_LAYOUT_NO_LIMITS</a> = 0x00000200,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaca1f1d91313d7c32bb7982d8a5abcd71">AWINDOW_FLAG_FULLSCREEN</a> = 0x00000400,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa4c21235db629d3937f87ffe98cd6fe5d">AWINDOW_FLAG_FORCE_NOT_FULLSCREEN</a> = 0x00000800,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae73488b436aaea163ba2f7051bf93d9d">AWINDOW_FLAG_DITHER</a> = 0x00001000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa8ff70709a588a05781d7cb178b526cc0">AWINDOW_FLAG_SECURE</a> = 0x00002000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa80316264eeae9681a56c1a2297bf465a">AWINDOW_FLAG_SCALED</a> = 0x00004000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaa2fe4ee2307bb814a37a043de6d7d326">AWINDOW_FLAG_IGNORE_CHEEK_PRESSES</a> = 0x00008000,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa97b8542941bfe613bcf92357be89b563">AWINDOW_FLAG_LAYOUT_INSET_DECOR</a> = 0x00010000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa961ff4c9c0903cfb8867d961bebe1659">AWINDOW_FLAG_ALT_FOCUSABLE_IM</a> = 0x00020000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa35229f75b3309bafdd828cbbf27d05b6">AWINDOW_FLAG_WATCH_OUTSIDE_TOUCH</a> = 0x00040000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">AWINDOW_FLAG_SHOW_WHEN_LOCKED</a> = 0x00080000,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa952ae6ceebe94d3f0d666454548b8824">AWINDOW_FLAG_SHOW_WALLPAPER</a> = 0x00100000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffac4deee26ac742bbd0bb4c44fda140a01">AWINDOW_FLAG_TURN_SCREEN_ON</a> = 0x00200000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa37c1077a12f1c8c6805b1da6f7bb213a">AWINDOW_FLAG_DISMISS_KEYGUARD</a> = 0x00400000
-<br/>
- }</td></tr>
-<tr class="separator:gaf715e26dfffd1f8de1c18449e2770cff"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga4d872ae54a239704c06a0517e23cc0ad"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga4d872ae54a239704c06a0517e23cc0ad">ANativeActivity_finish</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:ga4d872ae54a239704c06a0517e23cc0ad"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec8b12decdf2b9841344e75c4c038c5a"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaec8b12decdf2b9841344e75c4c038c5a">ANativeActivity_setWindowFormat</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, int32_t format)</td></tr>
-<tr class="separator:gaec8b12decdf2b9841344e75c4c038c5a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa1d091ca4a99b0ce570bab1c8c06f297"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaa1d091ca4a99b0ce570bab1c8c06f297">ANativeActivity_setWindowFlags</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, uint32_t addFlags, uint32_t removeFlags)</td></tr>
-<tr class="separator:gaa1d091ca4a99b0ce570bab1c8c06f297"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga14eaeb6190f266369023b04d8ab9dba7"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga14eaeb6190f266369023b04d8ab9dba7">ANativeActivity_showSoftInput</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, uint32_t flags)</td></tr>
-<tr class="separator:ga14eaeb6190f266369023b04d8ab9dba7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf673d6efea7ce517ef46ff2551b25944"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaf673d6efea7ce517ef46ff2551b25944">ANativeActivity_hideSoftInput</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, uint32_t flags)</td></tr>
-<tr class="separator:gaf673d6efea7ce517ef46ff2551b25944"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga533876b57909243b238927344a6592db"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga533876b57909243b238927344a6592db">ANativeWindow_acquire</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga533876b57909243b238927344a6592db"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae944e98865b902bd924663785d7b0258"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gae944e98865b902bd924663785d7b0258">ANativeWindow_release</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:gae944e98865b902bd924663785d7b0258"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga186f0040c5cb405a63d93889bb9a4ff1"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga186f0040c5cb405a63d93889bb9a4ff1">ANativeWindow_getWidth</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga186f0040c5cb405a63d93889bb9a4ff1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga463ba99f6dee3edc1167a54e1ff7de15"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga463ba99f6dee3edc1167a54e1ff7de15">ANativeWindow_getHeight</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga463ba99f6dee3edc1167a54e1ff7de15"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9e3a492a8300146b30d864f0ab22bb2e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga9e3a492a8300146b30d864f0ab22bb2e">ANativeWindow_getFormat</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga9e3a492a8300146b30d864f0ab22bb2e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7b0652533998d61e1a3b542485889113"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga7b0652533998d61e1a3b542485889113">ANativeWindow_setBuffersGeometry</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window, int32_t width, int32_t height, int32_t format)</td></tr>
-<tr class="separator:ga7b0652533998d61e1a3b542485889113"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0b0e3b7d442dee83e1a1b42e5b0caee6"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">ANativeWindow_lock</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window, <a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a> *outBuffer, <a class="el" href="struct_a_rect.html">ARect</a> *inOutDirtyBounds)</td></tr>
-<tr class="separator:ga0b0e3b7d442dee83e1a1b42e5b0caee6"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4dc9b687ead9034fbc11bf2d90f203f9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga4dc9b687ead9034fbc11bf2d90f203f9">ANativeWindow_unlockAndPost</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga4dc9b687ead9034fbc11bf2d90f203f9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga774d0a87ec496b3940fcddccbc31fd9d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga774d0a87ec496b3940fcddccbc31fd9d">ANativeWindow_fromSurface</a> (JNIEnv *env, jobject surface)</td></tr>
-<tr class="separator:ga774d0a87ec496b3940fcddccbc31fd9d"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
-Variables</h2></td></tr>
-<tr class="memitem:ga02791d0d490839055169f39fdc905c5e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">ANativeActivity_createFunc</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga02791d0d490839055169f39fdc905c5e">ANativeActivity_onCreate</a></td></tr>
-<tr class="separator:ga02791d0d490839055169f39fdc905c5e"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="ga8abd07923f37feb1ce724d139cc2609d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_native_activity.html">ANativeActivity</a> <a class="el" href="struct_a_native_activity.html">ANativeActivity</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>This structure defines the native side of an android.app.NativeActivity. It is created by the framework, and handed to the application's native code as it is being launched. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga569a53bcac3fcedb0189b7c412ebcb22"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef void ANativeActivity_createFunc(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, void *savedState, size_t savedStateSize)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>This is the function that must be in the native code to instantiate the application's native activity. It is called with the activity instance (see above); if the code is being instantiated from a previously saved instance, the savedState will be non-NULL and point to the saved data. You must make any copy of this data you need – it will be released after you return from this function. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga28dca784e5ee939427135c72c0151c38"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a> <a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>These are the callbacks the framework makes into a native application. All of these callbacks happen on the main thread of the application. By default, all callbacks are NULL; set to a pointer to your own function to have it called. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga66956d540c2e3709e12156d195e64726"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> is opaque type that provides access to a native window.</p>
-<p>A pointer can be obtained using <a class="el" href="group___native_activity.html#ga774d0a87ec496b3940fcddccbc31fd9d">ANativeWindow_fromSurface()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad0983ca473ce36293baf5e51a14c3357"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a> <a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> is a struct that represents a windows buffer.</p>
-<p>A pointer can be obtained using <a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">ANativeWindow_lock()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa984a498f0e146ac57c6022a323423cf"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_rect.html">ARect</a> <a class="el" href="struct_a_rect.html">ARect</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="struct_a_rect.html">ARect</a> is a struct that represents a rectangular window area.</p>
-<p>It is used with <a class="el" href="struct_a_native_activity_callbacks.html#a61d30a43b3c77b6047afe951706f6a1e">ANativeActivityCallbacks::onContentRectChanged</a> event callback and <a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">ANativeWindow_lock()</a> function. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="ga39fca1837c5ce7715cbf571669660c13"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Flags for ANativeActivity_showSoftInput; see the Java InputMethodManager API for documentation. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga39fca1837c5ce7715cbf571669660c13a9b7250ac0e5a626a81b176462a9df7c9"></a>ANATIVEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT</em> </td><td class="fielddoc">
-<p>Implicit request to show the input window, not as the result of a direct request by the user. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga39fca1837c5ce7715cbf571669660c13a324062ac78fab16b40e8de1b1ae173b5"></a>ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED</em> </td><td class="fielddoc">
-<p>The user has forced the input method open (such as by long-pressing menu) so it should not be closed until they explicitly do so. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaaf8fd5f0e57d456151c951e0f3715fc4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Flags for ANativeActivity_hideSoftInput; see the Java InputMethodManager API for documentation. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaaf8fd5f0e57d456151c951e0f3715fc4a642e76508cc737bbc1df149756c2a807"></a>ANATIVEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY</em> </td><td class="fielddoc">
-<p>The soft input window should only be hidden if it was not explicitly shown by the user. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaaf8fd5f0e57d456151c951e0f3715fc4a0f4cbb55fa4c29b963b7b37d13352e6f"></a>ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS</em> </td><td class="fielddoc">
-<p>The soft input window should normally be hidden, unless it was originally shown with <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a324062ac78fab16b40e8de1b1ae173b5">ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED</a>. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga94798fdadfbf49a7c658ace669a1d310"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Pixel formats that a window can use. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga94798fdadfbf49a7c658ace669a1d310a6a165383340acce0b32c555dd2ac2c01"></a>WINDOW_FORMAT_RGBA_8888</em> </td><td class="fielddoc">
-<p>Red: 8 bits, Green: 8 bits, Blue: 8 bits, Alpha: 8 bits. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga94798fdadfbf49a7c658ace669a1d310a5f83a97ccf64fc1554c220476e8aaf30"></a>WINDOW_FORMAT_RGBX_8888</em> </td><td class="fielddoc">
-<p>Red: 8 bits, Green: 8 bits, Blue: 8 bits, Unused: 8 bits. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga94798fdadfbf49a7c658ace669a1d310ab26fa9c38f169263b611a8b757bb0259"></a>WINDOW_FORMAT_RGB_565</em> </td><td class="fielddoc">
-<p>Red: 5 bits, Green: 6 bits, Blue: 5 bits. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaf715e26dfffd1f8de1c18449e2770cff"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Window flags, as per the Java API at android.view.WindowManager.LayoutParams. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa67363c129036872bc9dd29557e807508"></a>AWINDOW_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON</em> </td><td class="fielddoc">
-<p>As long as this window is visible to the user, allow the lock screen to activate while the screen is on. This can be used independently, or in combination with <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8">AWINDOW_FLAG_KEEP_SCREEN_ON</a> and/or <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">AWINDOW_FLAG_SHOW_WHEN_LOCKED</a> </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa6155e77ae4e12cc56fb3f6f55f56bf6f"></a>AWINDOW_FLAG_DIM_BEHIND</em> </td><td class="fielddoc">
-<p>Everything behind this window will be dimmed. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa0377f46a626d411ace179c1c27d0a3f7"></a>AWINDOW_FLAG_BLUR_BEHIND</em> </td><td class="fielddoc">
-<p>Blur everything behind this window. </p>
-<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000004">Deprecated:</a></b></dt><dd>Blurring is no longer supported. </dd></dl>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f"></a>AWINDOW_FLAG_NOT_FOCUSABLE</em> </td><td class="fielddoc">
-<p>This window won't ever get key input focus, so the user can not send key or other button events to it. Those will instead go to whatever focusable window is behind it. This flag will also enable <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09">AWINDOW_FLAG_NOT_TOUCH_MODAL</a> whether or not that is explicitly set.</p>
-<p>Setting this flag also implies that the window will not need to interact with a soft input method, so it will be Z-ordered and positioned independently of any active input method (typically this means it gets Z-ordered on top of the input method, so it can use the full screen for its content and cover the input method if needed. You can use <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa961ff4c9c0903cfb8867d961bebe1659">AWINDOW_FLAG_ALT_FOCUSABLE_IM</a> to modify this behavior. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffae9f1278ffa6fe9c12c2305d4f4de1450"></a>AWINDOW_FLAG_NOT_TOUCHABLE</em> </td><td class="fielddoc">
-<p>this window can never receive touch events. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09"></a>AWINDOW_FLAG_NOT_TOUCH_MODAL</em> </td><td class="fielddoc">
-<p>Even when this window is focusable (its <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">AWINDOW_FLAG_NOT_FOCUSABLE</a> is not set), allow any pointer events outside of the window to be sent to the windows behind it. Otherwise it will consume all pointer events itself, regardless of whether they are inside of the window. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa5574a513645e6e7cb4d6a9f4a043d773"></a>AWINDOW_FLAG_TOUCHABLE_WHEN_WAKING</em> </td><td class="fielddoc">
-<p>When set, if the device is asleep when the touch screen is pressed, you will receive this first touch event. Usually the first touch event is consumed by the system since the user can not see what they are pressing on.</p>
-<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000005">Deprecated:</a></b></dt><dd>This flag has no effect. </dd></dl>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8"></a>AWINDOW_FLAG_KEEP_SCREEN_ON</em> </td><td class="fielddoc">
-<p>As long as this window is visible to the user, keep the device's screen turned on and bright. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa6978968d7e0dc1a0e12f58ad395a959a"></a>AWINDOW_FLAG_LAYOUT_IN_SCREEN</em> </td><td class="fielddoc">
-<p>Place the window within the entire screen, ignoring decorations around the border (such as the status bar). The window must correctly position its contents to take the screen decoration into account. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffade9722581a203ee0db25d42f4d2bd389"></a>AWINDOW_FLAG_LAYOUT_NO_LIMITS</em> </td><td class="fielddoc">
-<p>allow window to extend outside of the screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffaca1f1d91313d7c32bb7982d8a5abcd71"></a>AWINDOW_FLAG_FULLSCREEN</em> </td><td class="fielddoc">
-<p>Hide all screen decorations (such as the status bar) while this window is displayed. This allows the window to use the entire display space for itself – the status bar will be hidden when an app window with this flag set is on the top layer. A fullscreen window will ignore a value of <a class="el" href="">AWINDOW_SOFT_INPUT_ADJUST_RESIZE</a>; the window will stay fullscreen and will not resize. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa4c21235db629d3937f87ffe98cd6fe5d"></a>AWINDOW_FLAG_FORCE_NOT_FULLSCREEN</em> </td><td class="fielddoc">
-<p>Override <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaca1f1d91313d7c32bb7982d8a5abcd71">AWINDOW_FLAG_FULLSCREEN</a> and force the screen decorations (such as the status bar) to be shown. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffae73488b436aaea163ba2f7051bf93d9d"></a>AWINDOW_FLAG_DITHER</em> </td><td class="fielddoc">
-<p>Turn on dithering when compositing this window to the screen. </p>
-<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000006">Deprecated:</a></b></dt><dd>This flag is no longer used. </dd></dl>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa8ff70709a588a05781d7cb178b526cc0"></a>AWINDOW_FLAG_SECURE</em> </td><td class="fielddoc">
-<p>Treat the content of the window as secure, preventing it from appearing in screenshots or from being viewed on non-secure displays. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa80316264eeae9681a56c1a2297bf465a"></a>AWINDOW_FLAG_SCALED</em> </td><td class="fielddoc">
-<p>A special mode where the layout parameters are used to perform scaling of the surface when it is composited to the screen. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffaa2fe4ee2307bb814a37a043de6d7d326"></a>AWINDOW_FLAG_IGNORE_CHEEK_PRESSES</em> </td><td class="fielddoc">
-<p>Intended for windows that will often be used when the user is holding the screen against their face, it will aggressively filter the event stream to prevent unintended presses in this situation that may not be desired for a particular window, when such an event stream is detected, the application will receive a <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a3952b960f5eb8c4f55b42741e286b74e">AMOTION_EVENT_ACTION_CANCEL</a> to indicate this so applications can handle this accordingly by taking no action on the event until the finger is released. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa97b8542941bfe613bcf92357be89b563"></a>AWINDOW_FLAG_LAYOUT_INSET_DECOR</em> </td><td class="fielddoc">
-<p>A special option only for use in combination with <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6978968d7e0dc1a0e12f58ad395a959a">AWINDOW_FLAG_LAYOUT_IN_SCREEN</a>. When requesting layout in the screen your window may appear on top of or behind screen decorations such as the status bar. By also including this flag, the window manager will report the inset rectangle needed to ensure your content is not covered by screen decorations. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa961ff4c9c0903cfb8867d961bebe1659"></a>AWINDOW_FLAG_ALT_FOCUSABLE_IM</em> </td><td class="fielddoc">
-<p>Invert the state of <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">AWINDOW_FLAG_NOT_FOCUSABLE</a> with respect to how this window interacts with the current method. That is, if FLAG_NOT_FOCUSABLE is set and this flag is set, then the window will behave as if it needs to interact with the input method and thus be placed behind/away from it; if <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">AWINDOW_FLAG_NOT_FOCUSABLE</a> is not set and this flag is set, then the window will behave as if it doesn't need to interact with the input method and can be placed to use more space and cover the input method. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa35229f75b3309bafdd828cbbf27d05b6"></a>AWINDOW_FLAG_WATCH_OUTSIDE_TOUCH</em> </td><td class="fielddoc">
-<p>If you have set <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09">AWINDOW_FLAG_NOT_TOUCH_MODAL</a>, you can set this flag to receive a single special MotionEvent with the action <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517">AMOTION_EVENT_ACTION_OUTSIDE</a> for touches that occur outside of your window. Note that you will not receive the full down/move/up gesture, only the location of the first down as an <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517">AMOTION_EVENT_ACTION_OUTSIDE</a>. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b"></a>AWINDOW_FLAG_SHOW_WHEN_LOCKED</em> </td><td class="fielddoc">
-<p>Special flag to let windows be shown when the screen is locked. This will let application windows take precedence over key guard or any other lock screens. Can be used with <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8">AWINDOW_FLAG_KEEP_SCREEN_ON</a> to turn screen on and display windows directly before showing the key guard window. Can be used with <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa37c1077a12f1c8c6805b1da6f7bb213a">AWINDOW_FLAG_DISMISS_KEYGUARD</a> to automatically fully dismisss non-secure keyguards. This flag only applies to the top-most full-screen window. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa952ae6ceebe94d3f0d666454548b8824"></a>AWINDOW_FLAG_SHOW_WALLPAPER</em> </td><td class="fielddoc">
-<p>Ask that the system wallpaper be shown behind your window. The window surface must be translucent to be able to actually see the wallpaper behind it; this flag just ensures that the wallpaper surface will be there if this window actually has translucent regions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffac4deee26ac742bbd0bb4c44fda140a01"></a>AWINDOW_FLAG_TURN_SCREEN_ON</em> </td><td class="fielddoc">
-<p>When set as a window is being added or made visible, once the window has been shown then the system will poke the power manager's user activity (as if the user had woken up the device) to turn the screen on. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaf715e26dfffd1f8de1c18449e2770cffa37c1077a12f1c8c6805b1da6f7bb213a"></a>AWINDOW_FLAG_DISMISS_KEYGUARD</em> </td><td class="fielddoc">
-<p>When set the window will cause the keyguard to be dismissed, only if it is not a secure lock keyguard. Because such a keyguard is not needed for security, it will never re-appear if the user navigates to another window (in contrast to <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">AWINDOW_FLAG_SHOW_WHEN_LOCKED</a>, which will only temporarily hide both secure and non-secure keyguards but ensure they reappear when the user moves to another UI that doesn't hide them). If the keyguard is currently active and is secure (requires an unlock pattern) than the user will still need to confirm it before seeing this window, unless <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">AWINDOW_FLAG_SHOW_WHEN_LOCKED</a> has also been set. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="ga4d872ae54a239704c06a0517e23cc0ad"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeActivity_finish </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a> * </td>
- <td class="paramname"><em>activity</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Finish the given activity. Its finish() method will be called, causing it to be stopped and destroyed. Note that this method can be called from <em>any</em> thread; it will send a message to the main thread of the process where the Java finish call will take place. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf673d6efea7ce517ef46ff2551b25944"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeActivity_hideSoftInput </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a> * </td>
- <td class="paramname"><em>activity</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">uint32_t </td>
- <td class="paramname"><em>flags</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Hide the IME while in the given activity. Calls InputMethodManager.hideSoftInput() for the given activity. Note that this method can be called from <em>any</em> thread; it will send a message to the main thread of the process where the Java finish call will take place. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa1d091ca4a99b0ce570bab1c8c06f297"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeActivity_setWindowFlags </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a> * </td>
- <td class="paramname"><em>activity</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">uint32_t </td>
- <td class="paramname"><em>addFlags</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">uint32_t </td>
- <td class="paramname"><em>removeFlags</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Change the window flags of the given activity. Calls getWindow().setFlags() of the given activity. Note that this method can be called from <em>any</em> thread; it will send a message to the main thread of the process where the Java finish call will take place. See <a class="el" href="window_8h.html">window.h</a> for flag constants. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaec8b12decdf2b9841344e75c4c038c5a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeActivity_setWindowFormat </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a> * </td>
- <td class="paramname"><em>activity</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>format</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Change the window format of the given activity. Calls getWindow().setFormat() of the given activity. Note that this method can be called from <em>any</em> thread; it will send a message to the main thread of the process where the Java finish call will take place. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga14eaeb6190f266369023b04d8ab9dba7"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeActivity_showSoftInput </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a> * </td>
- <td class="paramname"><em>activity</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">uint32_t </td>
- <td class="paramname"><em>flags</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Show the IME while in the given activity. Calls InputMethodManager.showSoftInput() for the given activity. Note that this method can be called from <em>any</em> thread; it will send a message to the main thread of the process where the Java finish call will take place. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga533876b57909243b238927344a6592db"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeWindow_acquire </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Acquire a reference on the given ANativeWindow object. This prevents the object from being deleted until the reference is removed. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga774d0a87ec496b3940fcddccbc31fd9d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a>* ANativeWindow_fromSurface </td>
- <td>(</td>
- <td class="paramtype">JNIEnv * </td>
- <td class="paramname"><em>env</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">jobject </td>
- <td class="paramname"><em>surface</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the ANativeWindow associated with a Java Surface object, for interacting with it through native code. This acquires a reference on the ANativeWindow that is returned; be sure to use <a class="el" href="group___native_activity.html#gae944e98865b902bd924663785d7b0258">ANativeWindow_release()</a> when done with it so that it doesn't leak. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga9e3a492a8300146b30d864f0ab22bb2e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t ANativeWindow_getFormat </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current pixel format of the window surface. Returns a negative value on error. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga463ba99f6dee3edc1167a54e1ff7de15"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t ANativeWindow_getHeight </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current height in pixels of the window surface. Returns a negative value on error. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga186f0040c5cb405a63d93889bb9a4ff1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t ANativeWindow_getWidth </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return the current width in pixels of the window surface. Returns a negative value on error. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga0b0e3b7d442dee83e1a1b42e5b0caee6"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t ANativeWindow_lock </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a> * </td>
- <td class="paramname"><em>outBuffer</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="struct_a_rect.html">ARect</a> * </td>
- <td class="paramname"><em>inOutDirtyBounds</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Lock the window's next drawing surface for writing. inOutDirtyBounds is used as an in/out parameter, upon entering the function, it contains the dirty region, that is, the region the caller intends to redraw. When the function returns, inOutDirtyBounds is updated with the actual area the caller needs to redraw – this region is often extended by ANativeWindow_lock. </p>
-
-</div>
-</div>
-<a class="anchor" id="gae944e98865b902bd924663785d7b0258"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void ANativeWindow_release </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Remove a reference that was previously acquired with <a class="el" href="group___native_activity.html#ga533876b57909243b238927344a6592db">ANativeWindow_acquire()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7b0652533998d61e1a3b542485889113"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t ANativeWindow_setBuffersGeometry </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>width</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>height</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>format</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Change the format and size of the window buffers.</p>
-<p>The width and height control the number of pixels in the buffers, not the dimensions of the window on screen. If these are different than the window's physical size, then it buffer will be scaled to match that size when compositing it to the screen.</p>
-<p>For all of these parameters, if 0 is supplied then the window's base value will come back in force.</p>
-<p>width and height must be either both zero or both non-zero. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4dc9b687ead9034fbc11bf2d90f203f9"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t ANativeWindow_unlockAndPost </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td>
- <td class="paramname"><em>window</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Unlock the window's drawing surface after previously locking it, posting the new buffer to the display. </p>
-
-</div>
-</div>
-<h2 class="groupheader">Variable Documentation</h2>
-<a class="anchor" id="ga02791d0d490839055169f39fdc905c5e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">ANativeActivity_createFunc</a> ANativeActivity_onCreate</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The name of the function that NativeInstance looks for when launching its native code. This is the default function that is used, you can specify "android.app.func_name" string meta-data in your manifest to use a different function. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___sensor.jd b/docs/html/ndk/reference/group___sensor.jd
deleted file mode 100644
index 41a0aec..0000000
--- a/docs/html/ndk/reference/group___sensor.jd
+++ /dev/null
@@ -1,925 +0,0 @@
-page.title=Sensor
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#nested-classes">Data Structures</a> |
-<a href="#define-members">Macros</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Sensor</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:sensor_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="sensor_8h.html">sensor.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_vector.html">ASensorVector</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html">ASensorEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:ga5129cb9e4091fc3474e246d5f950e52b"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga5129cb9e4091fc3474e246d5f950e52b">ASENSOR_STANDARD_GRAVITY</a>   (9.80665f)</td></tr>
-<tr class="separator:ga5129cb9e4091fc3474e246d5f950e52b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf8b57b13c6432bc6136aac0ad3813d63"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaf8b57b13c6432bc6136aac0ad3813d63">ASENSOR_MAGNETIC_FIELD_EARTH_MAX</a>   (60.0f)</td></tr>
-<tr class="separator:gaf8b57b13c6432bc6136aac0ad3813d63"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4423a712e27b6d5a57d138796892886d"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga4423a712e27b6d5a57d138796892886d">ASENSOR_MAGNETIC_FIELD_EARTH_MIN</a>   (30.0f)</td></tr>
-<tr class="separator:ga4423a712e27b6d5a57d138796892886d"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga207e807f9e18271f6a763e57232b409f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga207e807f9e18271f6a763e57232b409f">ASensorVector</a></td></tr>
-<tr class="separator:ga207e807f9e18271f6a763e57232b409f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0378daec23b2d8a70438ef7c3912475f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga0378daec23b2d8a70438ef7c3912475f">AMetaDataEvent</a></td></tr>
-<tr class="separator:ga0378daec23b2d8a70438ef7c3912475f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga24acc545b908dd24cadc44c5e0760b3b"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga24acc545b908dd24cadc44c5e0760b3b">AUncalibratedEvent</a></td></tr>
-<tr class="separator:ga24acc545b908dd24cadc44c5e0760b3b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae85b6eac76abe74e6e53d78bb3a4858c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gae85b6eac76abe74e6e53d78bb3a4858c">AHeartRateEvent</a></td></tr>
-<tr class="separator:gae85b6eac76abe74e6e53d78bb3a4858c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6bb167c45f0ef0a94d8f178d227e781f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga6bb167c45f0ef0a94d8f178d227e781f">ASensorEvent</a></td></tr>
-<tr class="separator:ga6bb167c45f0ef0a94d8f178d227e781f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaef620baab9b276ab8f914ae77babc349"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a></td></tr>
-<tr class="separator:gaef620baab9b276ab8f914ae77babc349"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa9448106d6d463f4cc5dded7c914e7ae"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a></td></tr>
-<tr class="separator:gaa9448106d6d463f4cc5dded7c914e7ae"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga93b28b7ce5e9b6d2ebc5b574cd5f4710"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a></td></tr>
-<tr class="separator:ga93b28b7ce5e9b6d2ebc5b574cd5f4710"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafec8dd682458c750a5f0f913a0f162ce"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a></td></tr>
-<tr class="separator:gafec8dd682458c750a5f0f913a0f162ce"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga26ff51817e8b320a631b3bf4ed378d58"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a></td></tr>
-<tr class="separator:ga26ff51817e8b320a631b3bf4ed378d58"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga7ff5f2dff38e7639981794c43dc9167b"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167bad72017f34c12971593a8cb14f4f254df">ASENSOR_TYPE_ACCELEROMETER</a> = 1,
-<a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba3b31509a3efebafb413e78f5ec9ae0e8">ASENSOR_TYPE_MAGNETIC_FIELD</a> = 2,
-<a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba80e9827f6c3ded009f354dc7078a2c68">ASENSOR_TYPE_GYROSCOPE</a> = 4,
-<a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba105331b6dea6f08e0d8fe3b736f8c174">ASENSOR_TYPE_LIGHT</a> = 5,
-<br/>
-  <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba0c6a2e526ed2e4442b3843976f906932">ASENSOR_TYPE_PROXIMITY</a> = 8
-<br/>
- }</td></tr>
-<tr class="separator:ga7ff5f2dff38e7639981794c43dc9167b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaabfcbcb5ac86a1edac4035264bc7d2b8"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae5d0475bd9491c4232a09afc81fa283d">ASENSOR_STATUS_NO_CONTACT</a> = -1,
-<a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae8e43df50b7b85ed54f22c40f2cd748e">ASENSOR_STATUS_UNRELIABLE</a> = 0,
-<a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a5f306f3d45a19573539462e4c813edc0">ASENSOR_STATUS_ACCURACY_LOW</a> = 1,
-<a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ad7e9379a4f36a42f2659cd7aec214f2d">ASENSOR_STATUS_ACCURACY_MEDIUM</a> = 2,
-<br/>
-  <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a2df5fb4e8b684e6a801a4aff9f50ba13">ASENSOR_STATUS_ACCURACY_HIGH</a> = 3
-<br/>
- }</td></tr>
-<tr class="separator:gaabfcbcb5ac86a1edac4035264bc7d2b8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5d76b81b0ad4c19007a781d4edb8181f"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8a64337fcb7e338d487dc3edc873df1c">AREPORTING_MODE_CONTINUOUS</a> = 0,
-<a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8542165ae195bf5784cdd9ba66bd2ab5">AREPORTING_MODE_ON_CHANGE</a> = 1,
-<a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa002273a1ab874159a38a7e3f6bb6a7bb">AREPORTING_MODE_ONE_SHOT</a> = 2,
-<a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181faa2d29656b35889c4c23318982e847ae7">AREPORTING_MODE_SPECIAL_TRIGGER</a> = 3
- }</td></tr>
-<tr class="separator:ga5d76b81b0ad4c19007a781d4edb8181f"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:gaa438fdaf34783a89d139f0a56d2692cd"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaa438fdaf34783a89d139f0a56d2692cd">ASensorManager_getInstance</a> ()</td></tr>
-<tr class="separator:gaa438fdaf34783a89d139f0a56d2692cd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga645be938627498ab2b60d94c562204bd"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga645be938627498ab2b60d94c562204bd">ASensorManager_getSensorList</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a> *list)</td></tr>
-<tr class="separator:ga645be938627498ab2b60d94c562204bd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf4880d87e01f5e2d4a9b8403e4047445"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaf4880d87e01f5e2d4a9b8403e4047445">ASensorManager_getDefaultSensor</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, int type)</td></tr>
-<tr class="separator:gaf4880d87e01f5e2d4a9b8403e4047445"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4313457c0e82f4afa77ef13860629633"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga4313457c0e82f4afa77ef13860629633">ASensorManager_getDefaultSensorEx</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, int type, bool wakeUp)</td></tr>
-<tr class="separator:ga4313457c0e82f4afa77ef13860629633"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac46f8b28bcc7a846dea9d841cab0a67b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gac46f8b28bcc7a846dea9d841cab0a67b">ASensorManager_createEventQueue</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int ident, <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> callback, void *data)</td></tr>
-<tr class="separator:gac46f8b28bcc7a846dea9d841cab0a67b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf35624037785cdea1e7fe9e0a73fc5e1"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaf35624037785cdea1e7fe9e0a73fc5e1">ASensorManager_destroyEventQueue</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue)</td></tr>
-<tr class="separator:gaf35624037785cdea1e7fe9e0a73fc5e1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga48a8379cf9de9b09a71a00f8a3699499"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga48a8379cf9de9b09a71a00f8a3699499">ASensorEventQueue_enableSensor</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga48a8379cf9de9b09a71a00f8a3699499"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga03852b813887ec236a34c4aef0df4b68"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga03852b813887ec236a34c4aef0df4b68">ASensorEventQueue_disableSensor</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga03852b813887ec236a34c4aef0df4b68"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa6e89b6d69dc3e07f2d7e72e81ec7937"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaa6e89b6d69dc3e07f2d7e72e81ec7937">ASensorEventQueue_setEventRate</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor, int32_t usec)</td></tr>
-<tr class="separator:gaa6e89b6d69dc3e07f2d7e72e81ec7937"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga79c9d6264fe81d4e30800f826db72913"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga79c9d6264fe81d4e30800f826db72913">ASensorEventQueue_hasEvents</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue)</td></tr>
-<tr class="separator:ga79c9d6264fe81d4e30800f826db72913"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab3d4354fd0d3ceb5fa97c129b024a18a"><td class="memItemLeft" align="right" valign="top">ssize_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gab3d4354fd0d3ceb5fa97c129b024a18a">ASensorEventQueue_getEvents</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> *events, size_t count)</td></tr>
-<tr class="separator:gab3d4354fd0d3ceb5fa97c129b024a18a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga52f4b22990c70df0784b9ccf23314fae"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga52f4b22990c70df0784b9ccf23314fae">ASensor_getName</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga52f4b22990c70df0784b9ccf23314fae"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafaf467fc71f7adba537a90f166e3320d"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gafaf467fc71f7adba537a90f166e3320d">ASensor_getVendor</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gafaf467fc71f7adba537a90f166e3320d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga93962747ab3c7d2b609f97af26fc0230"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga93962747ab3c7d2b609f97af26fc0230">ASensor_getType</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga93962747ab3c7d2b609f97af26fc0230"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga3da2930dd866cf1f76da6bc39e578a46"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga3da2930dd866cf1f76da6bc39e578a46">ASensor_getResolution</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga3da2930dd866cf1f76da6bc39e578a46"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gacb6e021757c07344b58742611eaf68e7"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gacb6e021757c07344b58742611eaf68e7">ASensor_getMinDelay</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gacb6e021757c07344b58742611eaf68e7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae9969580eda319926a677a6937c7afb1"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gae9969580eda319926a677a6937c7afb1">ASensor_getFifoMaxEventCount</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gae9969580eda319926a677a6937c7afb1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec7084c6a9d4d85f87c95a70511c5f53"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaec7084c6a9d4d85f87c95a70511c5f53">ASensor_getFifoReservedEventCount</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gaec7084c6a9d4d85f87c95a70511c5f53"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabee3eb65390fc75a639c59d653af3591"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gabee3eb65390fc75a639c59d653af3591">ASensor_getStringType</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gabee3eb65390fc75a639c59d653af3591"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga99e56b84cf421788c27998da8eab7e39"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga99e56b84cf421788c27998da8eab7e39">ASensor_getReportingMode</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga99e56b84cf421788c27998da8eab7e39"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0ff4118e400bedac62be6b79e9e0f924"><td class="memItemLeft" align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga0ff4118e400bedac62be6b79e9e0f924">ASensor_isWakeUpSensor</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga0ff4118e400bedac62be6b79e9e0f924"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Macro Definition Documentation</h2>
-<a class="anchor" id="gaf8b57b13c6432bc6136aac0ad3813d63"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">#define ASENSOR_MAGNETIC_FIELD_EARTH_MAX   (60.0f)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Maximum magnetic field on Earth's surface in uT </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4423a712e27b6d5a57d138796892886d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">#define ASENSOR_MAGNETIC_FIELD_EARTH_MIN   (30.0f)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Minimum magnetic field on Earth's surface in uT </p>
-
-</div>
-</div>
-<a class="anchor" id="ga5129cb9e4091fc3474e246d5f950e52b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">#define ASENSOR_STANDARD_GRAVITY   (9.80665f)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Earth's gravity in m/s^2 </p>
-
-</div>
-</div>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="gae85b6eac76abe74e6e53d78bb3a4858c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a> <a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ga0378daec23b2d8a70438ef7c3912475f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a> <a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ga93b28b7ce5e9b6d2ebc5b574cd5f4710"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> is an opaque type that provides information about an hardware sensors.</p>
-<p>A <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> pointer can be obtained using <a class="el" href="group___sensor.html#gaf4880d87e01f5e2d4a9b8403e4047445">ASensorManager_getDefaultSensor()</a>, <a class="el" href="group___sensor.html#ga4313457c0e82f4afa77ef13860629633">ASensorManager_getDefaultSensorEx()</a> or from a <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a>.</p>
-<p>This file provides a set of functions to access properties of a <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a>:</p>
-<ul>
-<li><a class="el" href="group___sensor.html#ga52f4b22990c70df0784b9ccf23314fae">ASensor_getName()</a></li>
-<li><a class="el" href="group___sensor.html#gafaf467fc71f7adba537a90f166e3320d">ASensor_getVendor()</a></li>
-<li><a class="el" href="group___sensor.html#ga93962747ab3c7d2b609f97af26fc0230">ASensor_getType()</a></li>
-<li><a class="el" href="group___sensor.html#ga3da2930dd866cf1f76da6bc39e578a46">ASensor_getResolution()</a></li>
-<li><a class="el" href="group___sensor.html#gacb6e021757c07344b58742611eaf68e7">ASensor_getMinDelay()</a></li>
-<li><a class="el" href="group___sensor.html#gae9969580eda319926a677a6937c7afb1">ASensor_getFifoMaxEventCount()</a></li>
-<li><a class="el" href="group___sensor.html#gaec7084c6a9d4d85f87c95a70511c5f53">ASensor_getFifoReservedEventCount()</a></li>
-<li><a class="el" href="group___sensor.html#gabee3eb65390fc75a639c59d653af3591">ASensor_getStringType()</a></li>
-<li><a class="el" href="group___sensor.html#ga99e56b84cf421788c27998da8eab7e39">ASensor_getReportingMode()</a></li>
-<li><a class="el" href="group___sensor.html#ga0ff4118e400bedac62be6b79e9e0f924">ASensor_isWakeUpSensor()</a> </li>
-</ul>
-
-</div>
-</div>
-<a class="anchor" id="ga6bb167c45f0ef0a94d8f178d227e781f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="gaa9448106d6d463f4cc5dded7c914e7ae"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> is an opaque type that provides access to <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> from hardware sensors.</p>
-<p>A new <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> can be obtained using <a class="el" href="group___sensor.html#gac46f8b28bcc7a846dea9d841cab0a67b">ASensorManager_createEventQueue()</a>.</p>
-<p>This file provides a set of functions to enable and disable sensors, check and get events, and set event rates on a <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a>.</p>
-<ul>
-<li><a class="el" href="group___sensor.html#ga48a8379cf9de9b09a71a00f8a3699499">ASensorEventQueue_enableSensor()</a></li>
-<li><a class="el" href="group___sensor.html#ga03852b813887ec236a34c4aef0df4b68">ASensorEventQueue_disableSensor()</a></li>
-<li><a class="el" href="group___sensor.html#ga79c9d6264fe81d4e30800f826db72913">ASensorEventQueue_hasEvents()</a></li>
-<li><a class="el" href="group___sensor.html#gab3d4354fd0d3ceb5fa97c129b024a18a">ASensorEventQueue_getEvents()</a></li>
-<li><a class="el" href="group___sensor.html#gaa6e89b6d69dc3e07f2d7e72e81ec7937">ASensorEventQueue_setEventRate()</a> </li>
-</ul>
-
-</div>
-</div>
-<a class="anchor" id="ga26ff51817e8b320a631b3bf4ed378d58"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef <a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a> const* <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a> is an array of reference to <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a>.</p>
-<p>A <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a> can be initialized using <a class="el" href="group___sensor.html#ga645be938627498ab2b60d94c562204bd">ASensorManager_getSensorList()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaef620baab9b276ab8f914ae77babc349"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> is an opaque type to manage sensors and events queues.</p>
-<p><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> is a singleton that can be obtained using <a class="el" href="group___sensor.html#gaa438fdaf34783a89d139f0a56d2692cd">ASensorManager_getInstance()</a>.</p>
-<p>This file provides a set of functions that uses <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> to access and list hardware sensors, and create and destroy event queues:</p>
-<ul>
-<li><a class="el" href="group___sensor.html#ga645be938627498ab2b60d94c562204bd">ASensorManager_getSensorList()</a></li>
-<li><a class="el" href="group___sensor.html#gaf4880d87e01f5e2d4a9b8403e4047445">ASensorManager_getDefaultSensor()</a></li>
-<li><a class="el" href="group___sensor.html#ga4313457c0e82f4afa77ef13860629633">ASensorManager_getDefaultSensorEx()</a></li>
-<li><a class="el" href="group___sensor.html#gac46f8b28bcc7a846dea9d841cab0a67b">ASensorManager_createEventQueue()</a></li>
-<li><a class="el" href="group___sensor.html#gaf35624037785cdea1e7fe9e0a73fc5e1">ASensorManager_destroyEventQueue()</a> </li>
-</ul>
-
-</div>
-</div>
-<a class="anchor" id="gafec8dd682458c750a5f0f913a0f162ce"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const* <a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a> is a type for constant pointers to <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a>.</p>
-<p>This is used to define entry in <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a> arrays. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga207e807f9e18271f6a763e57232b409f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a> <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>A sensor event. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga24acc545b908dd24cadc44c5e0760b3b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a> <a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="ga7ff5f2dff38e7639981794c43dc9167b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Structures and functions to receive and process sensor events in native code. Sensor types. (keep in sync with hardware/sensor.h) </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga7ff5f2dff38e7639981794c43dc9167bad72017f34c12971593a8cb14f4f254df"></a>ASENSOR_TYPE_ACCELEROMETER</em> </td><td class="fielddoc">
-<p><a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167bad72017f34c12971593a8cb14f4f254df">ASENSOR_TYPE_ACCELEROMETER</a> reporting-mode: continuous</p>
-<p>All values are in SI units (m/s^2) and measure the acceleration of the device minus the force of gravity. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga7ff5f2dff38e7639981794c43dc9167ba3b31509a3efebafb413e78f5ec9ae0e8"></a>ASENSOR_TYPE_MAGNETIC_FIELD</em> </td><td class="fielddoc">
-<p><a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba3b31509a3efebafb413e78f5ec9ae0e8">ASENSOR_TYPE_MAGNETIC_FIELD</a> reporting-mode: continuous</p>
-<p>All values are in micro-Tesla (uT) and measure the geomagnetic field in the X, Y and Z axis. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga7ff5f2dff38e7639981794c43dc9167ba80e9827f6c3ded009f354dc7078a2c68"></a>ASENSOR_TYPE_GYROSCOPE</em> </td><td class="fielddoc">
-<p><a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba80e9827f6c3ded009f354dc7078a2c68">ASENSOR_TYPE_GYROSCOPE</a> reporting-mode: continuous</p>
-<p>All values are in radians/second and measure the rate of rotation around the X, Y and Z axis. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga7ff5f2dff38e7639981794c43dc9167ba105331b6dea6f08e0d8fe3b736f8c174"></a>ASENSOR_TYPE_LIGHT</em> </td><td class="fielddoc">
-<p><a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba105331b6dea6f08e0d8fe3b736f8c174">ASENSOR_TYPE_LIGHT</a> reporting-mode: on-change</p>
-<p>The light sensor value is returned in SI lux units. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga7ff5f2dff38e7639981794c43dc9167ba0c6a2e526ed2e4442b3843976f906932"></a>ASENSOR_TYPE_PROXIMITY</em> </td><td class="fielddoc">
-<p><a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba0c6a2e526ed2e4442b3843976f906932">ASENSOR_TYPE_PROXIMITY</a> reporting-mode: on-change</p>
-<p>The proximity sensor which turns the screen off and back on during calls is the wake-up proximity sensor. Implement wake-up proximity sensor before implementing a non wake-up proximity sensor. For the wake-up proximity sensor set the flag SENSOR_FLAG_WAKE_UP. The value corresponds to the distance to the nearest object in centimeters. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gaabfcbcb5ac86a1edac4035264bc7d2b8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Sensor accuracy measure. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggaabfcbcb5ac86a1edac4035264bc7d2b8ae5d0475bd9491c4232a09afc81fa283d"></a>ASENSOR_STATUS_NO_CONTACT</em> </td><td class="fielddoc">
-<p>no contact </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaabfcbcb5ac86a1edac4035264bc7d2b8ae8e43df50b7b85ed54f22c40f2cd748e"></a>ASENSOR_STATUS_UNRELIABLE</em> </td><td class="fielddoc">
-<p>unreliable </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaabfcbcb5ac86a1edac4035264bc7d2b8a5f306f3d45a19573539462e4c813edc0"></a>ASENSOR_STATUS_ACCURACY_LOW</em> </td><td class="fielddoc">
-<p>low accuracy </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaabfcbcb5ac86a1edac4035264bc7d2b8ad7e9379a4f36a42f2659cd7aec214f2d"></a>ASENSOR_STATUS_ACCURACY_MEDIUM</em> </td><td class="fielddoc">
-<p>medium accuracy </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggaabfcbcb5ac86a1edac4035264bc7d2b8a2df5fb4e8b684e6a801a4aff9f50ba13"></a>ASENSOR_STATUS_ACCURACY_HIGH</em> </td><td class="fielddoc">
-<p>high accuracy </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="ga5d76b81b0ad4c19007a781d4edb8181f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Sensor Reporting Modes. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="gga5d76b81b0ad4c19007a781d4edb8181fa8a64337fcb7e338d487dc3edc873df1c"></a>AREPORTING_MODE_CONTINUOUS</em> </td><td class="fielddoc">
-<p>continuous reporting </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga5d76b81b0ad4c19007a781d4edb8181fa8542165ae195bf5784cdd9ba66bd2ab5"></a>AREPORTING_MODE_ON_CHANGE</em> </td><td class="fielddoc">
-<p>reporting on change </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga5d76b81b0ad4c19007a781d4edb8181fa002273a1ab874159a38a7e3f6bb6a7bb"></a>AREPORTING_MODE_ONE_SHOT</em> </td><td class="fielddoc">
-<p>on shot reporting </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="gga5d76b81b0ad4c19007a781d4edb8181faa2d29656b35889c4c23318982e847ae7"></a>AREPORTING_MODE_SPECIAL_TRIGGER</em> </td><td class="fielddoc">
-<p>special trigger reporting </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="gae9969580eda319926a677a6937c7afb1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensor_getFifoMaxEventCount </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the maximum size of batches for this sensor. Batches will often be smaller, as the hardware fifo might be used for other sensors. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaec7084c6a9d4d85f87c95a70511c5f53"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensor_getFifoReservedEventCount </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the hardware batch fifo size reserved to this sensor. </p>
-
-</div>
-</div>
-<a class="anchor" id="gacb6e021757c07344b58742611eaf68e7"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensor_getMinDelay </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the minimum delay allowed between events in microseconds. A value of zero means that this sensor doesn't report events at a constant rate, but rather only when a new data is available. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga52f4b22990c70df0784b9ccf23314fae"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* ASensor_getName </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns this sensor's name (non localized) </p>
-
-</div>
-</div>
-<a class="anchor" id="ga99e56b84cf421788c27998da8eab7e39"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensor_getReportingMode </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the reporting mode for this sensor. One of AREPORTING_MODE_* constants. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga3da2930dd866cf1f76da6bc39e578a46"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float ASensor_getResolution </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns this sensors's resolution </p>
-
-</div>
-</div>
-<a class="anchor" id="gabee3eb65390fc75a639c59d653af3591"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* ASensor_getStringType </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns this sensor's string type. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga93962747ab3c7d2b609f97af26fc0230"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensor_getType </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Return this sensor's type </p>
-
-</div>
-</div>
-<a class="anchor" id="gafaf467fc71f7adba537a90f166e3320d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* ASensor_getVendor </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns this sensor's vendor's name (non localized) </p>
-
-</div>
-</div>
-<a class="anchor" id="ga0ff4118e400bedac62be6b79e9e0f924"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">bool ASensor_isWakeUpSensor </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns true if this is a wake up sensor, false otherwise. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga03852b813887ec236a34c4aef0df4b68"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensorEventQueue_disableSensor </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Disable the selected sensor. Returns a negative error code on failure. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga48a8379cf9de9b09a71a00f8a3699499"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensorEventQueue_enableSensor </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Enable the selected sensor. Returns a negative error code on failure. </p>
-
-</div>
-</div>
-<a class="anchor" id="gab3d4354fd0d3ceb5fa97c129b024a18a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">ssize_t ASensorEventQueue_getEvents </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> * </td>
- <td class="paramname"><em>events</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">size_t </td>
- <td class="paramname"><em>count</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the next available events from the queue. Returns a negative value if no events are available or an error has occurred, otherwise the number of events returned.</p>
-<p>Examples: <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> event; ssize_t numEvent = ASensorEventQueue_getEvents(queue, &event, 1);</p>
-<p><a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> eventBuffer[8]; ssize_t numEvent = ASensorEventQueue_getEvents(queue, eventBuffer, 8); </p>
-
-</div>
-</div>
-<a class="anchor" id="ga79c9d6264fe81d4e30800f826db72913"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensorEventQueue_hasEvents </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td>
- <td class="paramname"><em>queue</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns true if there are one or more events available in the sensor queue. Returns 1 if the queue has events; 0 if it does not have events; and a negative value if there is an error. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa6e89b6d69dc3e07f2d7e72e81ec7937"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensorEventQueue_setEventRate </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td>
- <td class="paramname"><em>queue</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td>
- <td class="paramname"><em>sensor</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int32_t </td>
- <td class="paramname"><em>usec</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Sets the delivery rate of events in microseconds for the given sensor. Note that this is a hint only, generally event will arrive at a higher rate. It is an error to set a rate inferior to the value returned by <a class="el" href="group___sensor.html#gacb6e021757c07344b58742611eaf68e7">ASensor_getMinDelay()</a>. Returns a negative error code on failure. </p>
-
-</div>
-</div>
-<a class="anchor" id="gac46f8b28bcc7a846dea9d841cab0a67b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a>* ASensorManager_createEventQueue </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td>
- <td class="paramname"><em>manager</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td>
- <td class="paramname"><em>looper</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>ident</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> </td>
- <td class="paramname"><em>callback</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void * </td>
- <td class="paramname"><em>data</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Creates a new sensor event queue and associate it with a looper.</p>
-<p>"ident" is a identifier for the events that will be returned when calling <a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce()</a>. The identifier must be >= 0, or ALOOPER_POLL_CALLBACK if providing a non-NULL callback. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf35624037785cdea1e7fe9e0a73fc5e1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensorManager_destroyEventQueue </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td>
- <td class="paramname"><em>manager</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td>
- <td class="paramname"><em>queue</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Destroys the event queue and free all resources associated to it. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf4880d87e01f5e2d4a9b8403e4047445"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const* ASensorManager_getDefaultSensor </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td>
- <td class="paramname"><em>manager</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>type</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the default sensor for the given type, or NULL if no sensor of that type exists. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4313457c0e82f4afa77ef13860629633"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const* ASensorManager_getDefaultSensorEx </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td>
- <td class="paramname"><em>manager</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">int </td>
- <td class="paramname"><em>type</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">bool </td>
- <td class="paramname"><em>wakeUp</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the default sensor with the given type and wakeUp properties or NULL if no sensor of this type and wakeUp properties exists. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaa438fdaf34783a89d139f0a56d2692cd"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a>* ASensorManager_getInstance </td>
- <td>(</td>
- <td class="paramname"></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get a reference to the sensor manager. ASensorManager is a singleton.</p>
-<p>Example: </p>
-<pre class="fragment">ASensorManager* sensorManager = ASensorManager_getInstance();</pre>
-</div>
-</div>
-<a class="anchor" id="ga645be938627498ab2b60d94c562204bd"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int ASensorManager_getSensorList </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td>
- <td class="paramname"><em>manager</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a> * </td>
- <td class="paramname"><em>list</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Returns the list of available sensors. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/group___storage.jd b/docs/html/ndk/reference/group___storage.jd
deleted file mode 100644
index e29303a..0000000
--- a/docs/html/ndk/reference/group___storage.jd
+++ /dev/null
@@ -1,450 +0,0 @@
-page.title=Storage
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#files">Files</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">Storage</div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
-Files</h2></td></tr>
-<tr class="memitem:obb_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="obb_8h.html">obb.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:storage__manager_8h"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="storage__manager_8h.html">storage_manager.h</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gaa5037fe4c0d785a50fc62ac2de9844c3"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a></td></tr>
-<tr class="separator:gaa5037fe4c0d785a50fc62ac2de9844c3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga419f40803228bca62e32beb911ab28e2"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a></td></tr>
-<tr class="separator:ga419f40803228bca62e32beb911ab28e2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf077d06586fa4c0212baa2fe458b9617"><td class="memItemLeft" align="right" valign="top">typedef void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> )(const char *filename, const int32_t state, void *data)</td></tr>
-<tr class="separator:gaf077d06586fa4c0212baa2fe458b9617"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gae4d5251432e1a9e6803c0240cc492e18"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___storage.html#ggae4d5251432e1a9e6803c0240cc492e18a33e2ae83b4c25d33a4335dccf1de1c3a">AOBBINFO_OVERLAY</a> = 0x0001
- }</td></tr>
-<tr class="separator:gae4d5251432e1a9e6803c0240cc492e18"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae8a3b6a5d0d3244ed73924ab2421a0d0"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2a9c420e6008c108a7198fd861c042d5">AOBB_STATE_MOUNTED</a> = 1,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a6710bb5b68cfc115eedcde2aafd8a667">AOBB_STATE_UNMOUNTED</a> = 2,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a50642881107d6673aace1494a5d6fce2">AOBB_STATE_ERROR_INTERNAL</a> = 20,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a324da2b8fea5875339d442d1f2d0b45b">AOBB_STATE_ERROR_COULD_NOT_MOUNT</a> = 21,
-<br/>
-  <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a1f2b51b53fc57b57a9967f6ce0c88dbe">AOBB_STATE_ERROR_COULD_NOT_UNMOUNT</a> = 22,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a3ce8539aa8b531c9de1d16041322d7a8">AOBB_STATE_ERROR_NOT_MOUNTED</a> = 23,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a8b074af151167a965a550b9829fafb37">AOBB_STATE_ERROR_ALREADY_MOUNTED</a> = 24,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2467a4b6a634680e12c288a7790ff66c">AOBB_STATE_ERROR_PERMISSION_DENIED</a> = 25
-<br/>
- }</td></tr>
-<tr class="separator:gae8a3b6a5d0d3244ed73924ab2421a0d0"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga7beb4f82e3bf9a4b8197917f92ac4d5e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga7beb4f82e3bf9a4b8197917f92ac4d5e">AObbScanner_getObbInfo</a> (const char *filename)</td></tr>
-<tr class="separator:ga7beb4f82e3bf9a4b8197917f92ac4d5e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec5a4428008f545e829486099298031a"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gaec5a4428008f545e829486099298031a">AObbInfo_delete</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:gaec5a4428008f545e829486099298031a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1ec7eee61541fa5a9b578801a35b9cf3"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga1ec7eee61541fa5a9b578801a35b9cf3">AObbInfo_getPackageName</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:ga1ec7eee61541fa5a9b578801a35b9cf3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gacd8471c6d866cffe4a32f3b5997c782c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gacd8471c6d866cffe4a32f3b5997c782c">AObbInfo_getVersion</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:gacd8471c6d866cffe4a32f3b5997c782c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga68d916570c756da9fd0d9096358300eb"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga68d916570c756da9fd0d9096358300eb">AObbInfo_getFlags</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:ga68d916570c756da9fd0d9096358300eb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1c21ed9e0848fcfc03547c95eeb48877"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga1c21ed9e0848fcfc03547c95eeb48877">AStorageManager_new</a> ()</td></tr>
-<tr class="separator:ga1c21ed9e0848fcfc03547c95eeb48877"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga184c06dd9cec0f21db138167d6b331ed"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga184c06dd9cec0f21db138167d6b331ed">AStorageManager_delete</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr)</td></tr>
-<tr class="separator:ga184c06dd9cec0f21db138167d6b331ed"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga61bebaf43e57b4b7f57e7a24a62e9e3d"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga61bebaf43e57b4b7f57e7a24a62e9e3d">AStorageManager_mountObb</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename, const char *key, <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> cb, void *data)</td></tr>
-<tr class="separator:ga61bebaf43e57b4b7f57e7a24a62e9e3d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4c32c8d2c780016fa36097d833b57809"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga4c32c8d2c780016fa36097d833b57809">AStorageManager_unmountObb</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename, const int force, <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> cb, void *data)</td></tr>
-<tr class="separator:ga4c32c8d2c780016fa36097d833b57809"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7572f2c650fc16cce1b0ab94e913a1ba"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga7572f2c650fc16cce1b0ab94e913a1ba">AStorageManager_isObbMounted</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename)</td></tr>
-<tr class="separator:ga7572f2c650fc16cce1b0ab94e913a1ba"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad5c90305d627e0c768da37cb3e9f08c4"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gad5c90305d627e0c768da37cb3e9f08c4">AStorageManager_getMountedObbPath</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename)</td></tr>
-<tr class="separator:gad5c90305d627e0c768da37cb3e9f08c4"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<h2 class="groupheader">Typedef Documentation</h2>
-<a class="anchor" id="gaa5037fe4c0d785a50fc62ac2de9844c3"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> <a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> is an opaque type representing information for obb storage. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga419f40803228bca62e32beb911ab28e2"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef struct <a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> <a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> manages application OBB storage, a pointer can be obtained with <a class="el" href="group___storage.html#ga1c21ed9e0848fcfc03547c95eeb48877">AStorageManager_new()</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="gaf077d06586fa4c0212baa2fe458b9617"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">typedef void(* AStorageManager_obbCallbackFunc)(const char *filename, const int32_t state, void *data)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Callback function for asynchronous calls made on OBB files.</p>
-<p>"state" is one of the following constants:</p>
-<ul>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2a9c420e6008c108a7198fd861c042d5">AOBB_STATE_MOUNTED</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a6710bb5b68cfc115eedcde2aafd8a667">AOBB_STATE_UNMOUNTED</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a50642881107d6673aace1494a5d6fce2">AOBB_STATE_ERROR_INTERNAL</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a324da2b8fea5875339d442d1f2d0b45b">AOBB_STATE_ERROR_COULD_NOT_MOUNT</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a1f2b51b53fc57b57a9967f6ce0c88dbe">AOBB_STATE_ERROR_COULD_NOT_UNMOUNT</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a3ce8539aa8b531c9de1d16041322d7a8">AOBB_STATE_ERROR_NOT_MOUNTED</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a8b074af151167a965a550b9829fafb37">AOBB_STATE_ERROR_ALREADY_MOUNTED</a></li>
-<li><a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2467a4b6a634680e12c288a7790ff66c">AOBB_STATE_ERROR_PERMISSION_DENIED</a> </li>
-</ul>
-
-</div>
-</div>
-<h2 class="groupheader">Enumeration Type Documentation</h2>
-<a class="anchor" id="gae4d5251432e1a9e6803c0240cc492e18"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Flag for an obb file, returned by <a class="el" href="group___storage.html#ga68d916570c756da9fd0d9096358300eb">AObbInfo_getFlags()</a>. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggae4d5251432e1a9e6803c0240cc492e18a33e2ae83b4c25d33a4335dccf1de1c3a"></a>AOBBINFO_OVERLAY</em> </td><td class="fielddoc">
-<p>overlay </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<a class="anchor" id="gae8a3b6a5d0d3244ed73924ab2421a0d0"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">anonymous enum</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The different states of a OBB storage passed to <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc()</a>. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a2a9c420e6008c108a7198fd861c042d5"></a>AOBB_STATE_MOUNTED</em> </td><td class="fielddoc">
-<p>The OBB container is now mounted and ready for use. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a6710bb5b68cfc115eedcde2aafd8a667"></a>AOBB_STATE_UNMOUNTED</em> </td><td class="fielddoc">
-<p>The OBB container is now unmounted and not usable. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a50642881107d6673aace1494a5d6fce2"></a>AOBB_STATE_ERROR_INTERNAL</em> </td><td class="fielddoc">
-<p>There was an internal system error encountered while trying to mount the OBB. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a324da2b8fea5875339d442d1f2d0b45b"></a>AOBB_STATE_ERROR_COULD_NOT_MOUNT</em> </td><td class="fielddoc">
-<p>The OBB could not be mounted by the system. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a1f2b51b53fc57b57a9967f6ce0c88dbe"></a>AOBB_STATE_ERROR_COULD_NOT_UNMOUNT</em> </td><td class="fielddoc">
-<p>The OBB could not be unmounted. This most likely indicates that a file is in use on the OBB. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a3ce8539aa8b531c9de1d16041322d7a8"></a>AOBB_STATE_ERROR_NOT_MOUNTED</em> </td><td class="fielddoc">
-<p>A call was made to unmount the OBB when it was not mounted. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a8b074af151167a965a550b9829fafb37"></a>AOBB_STATE_ERROR_ALREADY_MOUNTED</em> </td><td class="fielddoc">
-<p>The OBB has already been mounted. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="ggae8a3b6a5d0d3244ed73924ab2421a0d0a2467a4b6a634680e12c288a7790ff66c"></a>AOBB_STATE_ERROR_PERMISSION_DENIED</em> </td><td class="fielddoc">
-<p>The current application does not have permission to use this OBB. This could be because the OBB indicates it's owned by a different package. Can be returned as the status for callbacks made during asynchronous OBB actions. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="gaec5a4428008f545e829486099298031a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AObbInfo_delete </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> * </td>
- <td class="paramname"><em>obbInfo</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Destroy the AObbInfo object. You must call this when finished with the object. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga68d916570c756da9fd0d9096358300eb"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AObbInfo_getFlags </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> * </td>
- <td class="paramname"><em>obbInfo</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the flags of an OBB file. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1ec7eee61541fa5a9b578801a35b9cf3"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* AObbInfo_getPackageName </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> * </td>
- <td class="paramname"><em>obbInfo</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the package name for the OBB. </p>
-
-</div>
-</div>
-<a class="anchor" id="gacd8471c6d866cffe4a32f3b5997c782c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t AObbInfo_getVersion </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> * </td>
- <td class="paramname"><em>obbInfo</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the version of an OBB file. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7beb4f82e3bf9a4b8197917f92ac4d5e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a>* AObbScanner_getObbInfo </td>
- <td>(</td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>filename</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Scan an OBB and get information about it. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga184c06dd9cec0f21db138167d6b331ed"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AStorageManager_delete </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td>
- <td class="paramname"><em>mgr</em></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Release AStorageManager instance. </p>
-
-</div>
-</div>
-<a class="anchor" id="gad5c90305d627e0c768da37cb3e9f08c4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* AStorageManager_getMountedObbPath </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td>
- <td class="paramname"><em>mgr</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>filename</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Get the mounted path for an OBB. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga7572f2c650fc16cce1b0ab94e913a1ba"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int AStorageManager_isObbMounted </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td>
- <td class="paramname"><em>mgr</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>filename</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Check whether an OBB is mounted. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga61bebaf43e57b4b7f57e7a24a62e9e3d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AStorageManager_mountObb </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td>
- <td class="paramname"><em>mgr</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>filename</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>key</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> </td>
- <td class="paramname"><em>cb</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void * </td>
- <td class="paramname"><em>data</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Attempts to mount an OBB file. This is an asynchronous operation. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga1c21ed9e0848fcfc03547c95eeb48877"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a>* AStorageManager_new </td>
- <td>(</td>
- <td class="paramname"></td><td>)</td>
- <td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Obtains a new instance of AStorageManager. </p>
-
-</div>
-</div>
-<a class="anchor" id="ga4c32c8d2c780016fa36097d833b57809"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void AStorageManager_unmountObb </td>
- <td>(</td>
- <td class="paramtype"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td>
- <td class="paramname"><em>mgr</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const char * </td>
- <td class="paramname"><em>filename</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">const int </td>
- <td class="paramname"><em>force</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype"><a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> </td>
- <td class="paramname"><em>cb</em>, </td>
- </tr>
- <tr>
- <td class="paramkey"></td>
- <td></td>
- <td class="paramtype">void * </td>
- <td class="paramname"><em>data</em> </td>
- </tr>
- <tr>
- <td></td>
- <td>)</td>
- <td></td><td></td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Attempts to unmount an OBB file. This is an asynchronous operation. </p>
-
-</div>
-</div>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/index.jd b/docs/html/ndk/reference/index.jd
deleted file mode 100644
index 94bcb7a..0000000
--- a/docs/html/ndk/reference/index.jd
+++ /dev/null
@@ -1,17 +0,0 @@
-page.title=API Reference
-@jd:body
-
-<p>The API reference for the NDK includes documentation for the base set of
-native headers that the NDK provides for Android. These headers, and their associated libraries,
-expose a variety of features otherwise only accessible via the Android framework.
-A few of these features are as follows:</p>
-
-<ul>
- <li>Using hardware sensors.</li>
- <li>Accessing storage.</li>
- <li>Handling user input.</li>
- <li>Setting configuration information, such as screen orientation.</li>
-</ul>
-
-<p>The API reference provides detailed information on these and other functionalities provided
-in the NDK.</p>
diff --git a/docs/html/ndk/reference/input_8h.jd b/docs/html/ndk/reference/input_8h.jd
deleted file mode 100644
index 855a346..0000000
--- a/docs/html/ndk/reference/input_8h.jd
+++ /dev/null
@@ -1,374 +0,0 @@
-page.title=input.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#define-members">Macros</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">input.h File Reference<div class="ingroups"><a class="el" href="group___input.html">Input</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <stdint.h></code><br/>
-<code>#include <sys/types.h></code><br/>
-<code>#include <<a class="el" href="keycodes_8h.html">android/keycodes.h</a>></code><br/>
-<code>#include <<a class="el" href="looper_8h.html">android/looper.h</a>></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:gaeb170c0fbeeed1d999160566f09f169e"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaeb170c0fbeeed1d999160566f09f169e">AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT</a>   8</td></tr>
-<tr class="separator:gaeb170c0fbeeed1d999160566f09f169e"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gac35dbbc035371e799d8badabc981e8fa"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a></td></tr>
-<tr class="separator:gac35dbbc035371e799d8badabc981e8fa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga21d8182651f4b61ae558560023e8339c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a></td></tr>
-<tr class="separator:ga21d8182651f4b61ae558560023e8339c"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gabc6126af1d45847bc59afa0aa3216b04"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a9506627d5377c67dbc7fc58804b2cdfd">AKEY_STATE_UNKNOWN</a> = -1,
-<a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04afa14022f587487c24d401c87e71c8e28">AKEY_STATE_UP</a> = 0,
-<a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04a286ec0a7aff5903a982be0cd6785b62c">AKEY_STATE_DOWN</a> = 1,
-<a class="el" href="group___input.html#ggabc6126af1d45847bc59afa0aa3216b04ad09fd9fe458ca6c66ead9b9a75c56192">AKEY_STATE_VIRTUAL</a> = 2
- }</td></tr>
-<tr class="separator:gabc6126af1d45847bc59afa0aa3216b04"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadc29c2ff13d900c2f185ee95427fb06c"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cae0a3cb26517b3f876beb37594494526d">AMETA_NONE</a> = 0,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caba44b1077427e4da1d202e0c8f772881">AMETA_ALT_ON</a> = 0x02,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca256c74b768ecee57e3218e81ae6945df">AMETA_ALT_LEFT_ON</a> = 0x10,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca985db074c0f44749ca86b5cc0454056a">AMETA_ALT_RIGHT_ON</a> = 0x20,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa3d5f49c3a55b653a94c798a2c93b197">AMETA_SHIFT_ON</a> = 0x01,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06caa01fa027cdd8951530437bcbe04c3ed7">AMETA_SHIFT_LEFT_ON</a> = 0x40,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cac52930581c339216218a6f50c5b57aa1">AMETA_SHIFT_RIGHT_ON</a> = 0x80,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca8af1e90950a728baca807a83e50b22ea">AMETA_SYM_ON</a> = 0x04,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca545b31b72b0454c22c170ff534ddfdf1">AMETA_FUNCTION_ON</a> = 0x08,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cabe927318a2a11a46be3e9d78dbd81ef5">AMETA_CTRL_ON</a> = 0x1000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca752c837afd5ff0fcf75ddee7b6808be6">AMETA_CTRL_LEFT_ON</a> = 0x2000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca0ab007e367ae136b873b3e6636747419">AMETA_CTRL_RIGHT_ON</a> = 0x4000,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca9c04e7c2ad1f0f41af60402188a29c4a">AMETA_META_ON</a> = 0x10000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca6f923de8f2cd72e3ad86149c0747906f">AMETA_META_LEFT_ON</a> = 0x20000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafdf56d1259ae16c97161c443d7949bdf">AMETA_META_RIGHT_ON</a> = 0x40000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafc467c98d509b0de28b298801a0c3e37">AMETA_CAPS_LOCK_ON</a> = 0x100000,
-<br/>
-  <a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06ca15d234534a6870add5594f02b7333dc6">AMETA_NUM_LOCK_ON</a> = 0x200000,
-<a class="el" href="group___input.html#ggadc29c2ff13d900c2f185ee95427fb06cafe8dacdc6566f655a3eab73ea4a9af5a">AMETA_SCROLL_LOCK_ON</a> = 0x400000
-<br/>
- }</td></tr>
-<tr class="separator:gadc29c2ff13d900c2f185ee95427fb06c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga61dadd085c1777f559549e05962b2c9e"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea696f0d7635f7a24c17d3f1e4ccdd44ba">AINPUT_EVENT_TYPE_KEY</a> = 1,
-<a class="el" href="group___input.html#gga61dadd085c1777f559549e05962b2c9ea2182dfda2cceb5425dcc2823b9b6b56a">AINPUT_EVENT_TYPE_MOTION</a> = 2
- }</td></tr>
-<tr class="separator:ga61dadd085c1777f559549e05962b2c9e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga726ca809ffd3d67ab4b8476646f26635"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a123c3bd18fd93b53d8aedbe7597f7b49">AKEY_EVENT_ACTION_DOWN</a> = 0,
-<a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635abf18b7c5384c5de8657a0650f8da57c3">AKEY_EVENT_ACTION_UP</a> = 1,
-<a class="el" href="group___input.html#gga726ca809ffd3d67ab4b8476646f26635a08e2d927e155478ee66ec46ebd845ab0">AKEY_EVENT_ACTION_MULTIPLE</a> = 2
- }</td></tr>
-<tr class="separator:ga726ca809ffd3d67ab4b8476646f26635"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0411cd49bb5b71852cecd93bcbf0ca2d"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da6473a1afc0cc39e029c2a217bc57cdba">AKEY_EVENT_FLAG_WOKE_HERE</a> = 0x1,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da7dbb272c7b28be9c084df3446a629f32">AKEY_EVENT_FLAG_SOFT_KEYBOARD</a> = 0x2,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dadc0a063ca412b0ea08474df422bf9b41">AKEY_EVENT_FLAG_KEEP_TOUCH_MODE</a> = 0x4,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dae1e7ec188b2404fadd94cfba89afd5d6">AKEY_EVENT_FLAG_FROM_SYSTEM</a> = 0x8,
-<br/>
-  <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dab9dbcf990d1e4405e32f847fdea52013">AKEY_EVENT_FLAG_EDITOR_ACTION</a> = 0x10,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da3198fad5ab75df614bb41f0f602a9e55">AKEY_EVENT_FLAG_CANCELED</a> = 0x20,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2dad4b5eba5b14e4076c69bc7185f2804f8">AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY</a> = 0x40,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da39f9f7bdf2e256db0e2a8a5dfbfb7185">AKEY_EVENT_FLAG_LONG_PRESS</a> = 0x80,
-<br/>
-  <a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2daf09856f03f2fffee9a82cb8e508efb7a">AKEY_EVENT_FLAG_CANCELED_LONG_PRESS</a> = 0x100,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da91e70ab527f27a1779f4550d457f1689">AKEY_EVENT_FLAG_TRACKING</a> = 0x200,
-<a class="el" href="group___input.html#gga0411cd49bb5b71852cecd93bcbf0ca2da14f574126d2544863fa8042ddd0f48c0">AKEY_EVENT_FLAG_FALLBACK</a> = 0x400
-<br/>
- }</td></tr>
-<tr class="separator:ga0411cd49bb5b71852cecd93bcbf0ca2d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabed82baf7f470b522273a3e37c24c600"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600abf84a22c84d4b7228102b80f3af92a4f">AMOTION_EVENT_ACTION_MASK</a> = 0xff,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a51384339fbb57c0087f7f50c45d9cff3">AMOTION_EVENT_ACTION_POINTER_INDEX_MASK</a> = 0xff00,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a225e61c48ba334abc1b5811db02edcf1">AMOTION_EVENT_ACTION_DOWN</a> = 0,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a43798b2b7a6de4616d150b2438b8419e">AMOTION_EVENT_ACTION_UP</a> = 1,
-<br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a41c56c4e772953fce60c93bc671639a3">AMOTION_EVENT_ACTION_MOVE</a> = 2,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a3952b960f5eb8c4f55b42741e286b74e">AMOTION_EVENT_ACTION_CANCEL</a> = 3,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a7c3c96b74af4c8304b8137ac6d201517">AMOTION_EVENT_ACTION_OUTSIDE</a> = 4,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a1618c641fd3f49fa7483f298d05b3cd2">AMOTION_EVENT_ACTION_POINTER_DOWN</a> = 5,
-<br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600af2ef56aa7220eeb2073b9b028737bc1e">AMOTION_EVENT_ACTION_POINTER_UP</a> = 6,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a84bc9fb3c01ff7ca9ee452a510e7de60">AMOTION_EVENT_ACTION_HOVER_MOVE</a> = 7,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a45ba62b1e6fab4e84d5782d7c35ced04">AMOTION_EVENT_ACTION_SCROLL</a> = 8,
-<a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600a247b2c60ad92f3130ad43c907986ffb3">AMOTION_EVENT_ACTION_HOVER_ENTER</a> = 9,
-<br/>
-  <a class="el" href="group___input.html#ggabed82baf7f470b522273a3e37c24c600ac00b1eacfbea779863abf3fcf02134aa">AMOTION_EVENT_ACTION_HOVER_EXIT</a> = 10
-<br/>
- }</td></tr>
-<tr class="separator:gabed82baf7f470b522273a3e37c24c600"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab04a0655cd1e3bcac5e8f48c18df1a57"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#ggab04a0655cd1e3bcac5e8f48c18df1a57a200623e1e4eee7797cad30917d289d7a">AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED</a> = 0x1
- }</td></tr>
-<tr class="separator:gab04a0655cd1e3bcac5e8f48c18df1a57"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga385c44f6fb256e5716a2302a5b940388"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a37dd7496968e6defbecc3c8d6ab2734d">AMOTION_EVENT_EDGE_FLAG_NONE</a> = 0,
-<a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a915e1ade9b600d11a3c70a17a88de757">AMOTION_EVENT_EDGE_FLAG_TOP</a> = 0x01,
-<a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388ad8b662839787e1c7dd2616f32c02aaeb">AMOTION_EVENT_EDGE_FLAG_BOTTOM</a> = 0x02,
-<a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388afb70c13f16daade25ba8132a5ea3cf52">AMOTION_EVENT_EDGE_FLAG_LEFT</a> = 0x04,
-<br/>
-  <a class="el" href="group___input.html#gga385c44f6fb256e5716a2302a5b940388a7d45674e03f1876a43d4810508905078">AMOTION_EVENT_EDGE_FLAG_RIGHT</a> = 0x08
-<br/>
- }</td></tr>
-<tr class="separator:ga385c44f6fb256e5716a2302a5b940388"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabc5c98fcc1211af2b80116dd6e0a035d"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f4b5b009634039a1f361048a5fc6064">AMOTION_EVENT_AXIS_X</a> = 0,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da64f7de8558265bd8179d206eb33eff6c">AMOTION_EVENT_AXIS_Y</a> = 1,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da3b4fd0f17cfdeb6a055babecd2b0ded8">AMOTION_EVENT_AXIS_PRESSURE</a> = 2,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da4baba3ccaec881089a864ba6deaf8bd6">AMOTION_EVENT_AXIS_SIZE</a> = 3,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da792b9e01044a2e43e7f80e5559db20c2">AMOTION_EVENT_AXIS_TOUCH_MAJOR</a> = 4,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa8b24b0f01f24898a36e5751c8eca63c">AMOTION_EVENT_AXIS_TOUCH_MINOR</a> = 5,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa273d64c392f86ae789fd5e24661ba0a">AMOTION_EVENT_AXIS_TOOL_MAJOR</a> = 6,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadebd200b37ffaf36b94e7e478c559142">AMOTION_EVENT_AXIS_TOOL_MINOR</a> = 7,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da114f2b3fc233ccf7a4470787c31457d2">AMOTION_EVENT_AXIS_ORIENTATION</a> = 8,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dad11be04b4b81715cad905ee9fa348e99">AMOTION_EVENT_AXIS_VSCROLL</a> = 9,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da92955e6b0f3f82af66a505c854e9edff">AMOTION_EVENT_AXIS_HSCROLL</a> = 10,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5a689e572da9bc5feafcb6c011368305">AMOTION_EVENT_AXIS_Z</a> = 11,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da689b612864177d6b57d4181442e3e38e">AMOTION_EVENT_AXIS_RX</a> = 12,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daa20188da209300e1f80f6f5bd4058e13">AMOTION_EVENT_AXIS_RY</a> = 13,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da381948b3321afd390ad164345eb9206b">AMOTION_EVENT_AXIS_RZ</a> = 14,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da04245c76cb9b32dcba920661f11ac9da">AMOTION_EVENT_AXIS_HAT_X</a> = 15,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da98c323321d908db459e7cf86a7e8a482">AMOTION_EVENT_AXIS_HAT_Y</a> = 16,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae4c65c3b1bd2946ff9e18c6041cdb591">AMOTION_EVENT_AXIS_LTRIGGER</a> = 17,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da116e80c6be166290ca481fefa5de38c1">AMOTION_EVENT_AXIS_RTRIGGER</a> = 18,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da6d1f5d64e607104964eb43d8fae07a4f">AMOTION_EVENT_AXIS_THROTTLE</a> = 19,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da318a0782f895949407fc192fc4280257">AMOTION_EVENT_AXIS_RUDDER</a> = 20,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0ae83ebd74e672bb35378b92a440b1d">AMOTION_EVENT_AXIS_WHEEL</a> = 21,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab0223f235a6044815918af2abafcbf16">AMOTION_EVENT_AXIS_GAS</a> = 22,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae3a99764f3681dd9e094852bb2489ece">AMOTION_EVENT_AXIS_BRAKE</a> = 23,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae800909411a1e83173b0eef7aa458d0e">AMOTION_EVENT_AXIS_DISTANCE</a> = 24,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafca0a235f69c4b38bfc95e7a7b8d9ab1">AMOTION_EVENT_AXIS_TILT</a> = 25,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadcc18afd3a7069412617df34db5a27bc">AMOTION_EVENT_AXIS_GENERIC_1</a> = 32,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac4addf06abfa6c76f0578ddde049aad5">AMOTION_EVENT_AXIS_GENERIC_2</a> = 33,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dac7df57ef5082e10be83f66d7477bce9c">AMOTION_EVENT_AXIS_GENERIC_3</a> = 34,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da321873d126b7d545665096694cb7d9d9">AMOTION_EVENT_AXIS_GENERIC_4</a> = 35,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da9b47cef7060197e1b0302a8a718c3085">AMOTION_EVENT_AXIS_GENERIC_5</a> = 36,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daad7e47a1b5fb66864b6d988374f50a84">AMOTION_EVENT_AXIS_GENERIC_6</a> = 37,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da222c06f51a60e59504b635dbf89a025b">AMOTION_EVENT_AXIS_GENERIC_7</a> = 38,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dab59a8a373a913e40b146ed762976d6fe">AMOTION_EVENT_AXIS_GENERIC_8</a> = 39,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da721fa0fbca8b22f1ecc8d3870f4e7443">AMOTION_EVENT_AXIS_GENERIC_9</a> = 40,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da29ba08f4ddc658e0127ee5bc08d185f2">AMOTION_EVENT_AXIS_GENERIC_10</a> = 41,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dafc64a4b307f62bb12b645918aa7edb57">AMOTION_EVENT_AXIS_GENERIC_11</a> = 42,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dae5d32b3e9cec4936ae1e074f320c3063">AMOTION_EVENT_AXIS_GENERIC_12</a> = 43,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da5f19f5bc52e5eaec5ebd4f07aad12180">AMOTION_EVENT_AXIS_GENERIC_13</a> = 44,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035dadb866d826ecf25161d7c7f86166e149b">AMOTION_EVENT_AXIS_GENERIC_14</a> = 45,
-<br/>
-  <a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035da7e86befc8502b8df687284f3c40b2eca">AMOTION_EVENT_AXIS_GENERIC_15</a> = 46,
-<a class="el" href="group___input.html#ggabc5c98fcc1211af2b80116dd6e0a035daaaa011ba929b18c6da71153638f92336">AMOTION_EVENT_AXIS_GENERIC_16</a> = 47
-<br/>
- }</td></tr>
-<tr class="separator:gabc5c98fcc1211af2b80116dd6e0a035d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac36f475ca5b446f4fde4c9b90bec77c8"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ab388f65477b9dd4c51e6367111168d65">AMOTION_EVENT_BUTTON_PRIMARY</a> = 1 << 0,
-<a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a08118700ecb4e147528a0e725afc9451">AMOTION_EVENT_BUTTON_SECONDARY</a> = 1 << 1,
-<a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8ae6e2af1e7065e035e8a10a595827180f">AMOTION_EVENT_BUTTON_TERTIARY</a> = 1 << 2,
-<a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a1841d075a2992ff7fbefa3fd50189b86">AMOTION_EVENT_BUTTON_BACK</a> = 1 << 3,
-<br/>
-  <a class="el" href="group___input.html#ggac36f475ca5b446f4fde4c9b90bec77c8a4105edf43f7748c52c859cc5aa7dc438">AMOTION_EVENT_BUTTON_FORWARD</a> = 1 << 4
-<br/>
- }</td></tr>
-<tr class="separator:gac36f475ca5b446f4fde4c9b90bec77c8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga05589fbab0657f08285ebdfe93f5ec9e"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7e1ea0c955ebbac1349866e8995e0208">AMOTION_EVENT_TOOL_TYPE_UNKNOWN</a> = 0,
-<a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eafd789262defb8a268fa80d26b0c30bcc">AMOTION_EVENT_TOOL_TYPE_FINGER</a> = 1,
-<a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf05dc95a74e560c89cec1f3100185fc7">AMOTION_EVENT_TOOL_TYPE_STYLUS</a> = 2,
-<a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9ea7be0c750d7d6719e7c948914400ae0de">AMOTION_EVENT_TOOL_TYPE_MOUSE</a> = 3,
-<br/>
-  <a class="el" href="group___input.html#gga05589fbab0657f08285ebdfe93f5ec9eaf9932f65b5b6b5800fb5873a60dbf0cb">AMOTION_EVENT_TOOL_TYPE_ERASER</a> = 4
-<br/>
- }</td></tr>
-<tr class="separator:ga05589fbab0657f08285ebdfe93f5ec9e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga16af7b253440dadd46a80a4b9fddba4d"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daae438f475d03ea60fd9fb356abd7fa01">AINPUT_SOURCE_CLASS_MASK</a> = 0x000000ff,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dafd6d5e71f09f6452acf017559481444c">AINPUT_SOURCE_CLASS_NONE</a> = 0x00000000,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4dacf1bf3d7b3c6e59f907bdffc9b33370e">AINPUT_SOURCE_CLASS_BUTTON</a> = 0x00000001,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da7495274e98fb30dee3dfd903b878cf47">AINPUT_SOURCE_CLASS_POINTER</a> = 0x00000002,
-<br/>
-  <a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da078a18d85d078412721c336a879bcc1a">AINPUT_SOURCE_CLASS_NAVIGATION</a> = 0x00000004,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4da682f6982bb55ee809f6acd2deb550167">AINPUT_SOURCE_CLASS_POSITION</a> = 0x00000008,
-<a class="el" href="group___input.html#gga16af7b253440dadd46a80a4b9fddba4daaaeffb6442807dd96ec62e9d8a696b57">AINPUT_SOURCE_CLASS_JOYSTICK</a> = 0x00000010
-<br/>
- }</td></tr>
-<tr class="separator:ga16af7b253440dadd46a80a4b9fddba4d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaba01db17f4a2bfbc3db60dc172972a25"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae9348bc04cdaa88b5b010f77a4945454">AINPUT_SOURCE_UNKNOWN</a> = 0x00000000,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a9860918666dd8c0b9d00a8da7af51e6d">AINPUT_SOURCE_KEYBOARD</a> = 0x00000100 | AINPUT_SOURCE_CLASS_BUTTON,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ad0fbfeff9f8d57104bff14c70ce5e3ef">AINPUT_SOURCE_DPAD</a> = 0x00000200 | AINPUT_SOURCE_CLASS_BUTTON,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a6417cb50ecd6ade48c708268434a49d3">AINPUT_SOURCE_GAMEPAD</a> = 0x00000400 | AINPUT_SOURCE_CLASS_BUTTON,
-<br/>
-  <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a55ea411f927aed8964fa72fec0da444f">AINPUT_SOURCE_TOUCHSCREEN</a> = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ae71d3dcbd004bccb6e00fde47097cd86">AINPUT_SOURCE_MOUSE</a> = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a86d4983c71432b27634ba41a64bffdf9">AINPUT_SOURCE_STYLUS</a> = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e49d9153c86f60f626d7f797f4e78b6">AINPUT_SOURCE_TRACKBALL</a> = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
-<br/>
-  <a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a7e0715d4b544653ab11893434172a2ef">AINPUT_SOURCE_TOUCHPAD</a> = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25a3712c4e4fb8ad7f6ae6e40d48e5c6ee7">AINPUT_SOURCE_TOUCH_NAVIGATION</a> = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25afb28f10dc074e7f7435f5904c513edb5">AINPUT_SOURCE_JOYSTICK</a> = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
-<a class="el" href="group___input.html#ggaba01db17f4a2bfbc3db60dc172972a25ab04317e7dd273ff5c87038df67d9796e">AINPUT_SOURCE_ANY</a> = 0xffffff00
-<br/>
- }</td></tr>
-<tr class="separator:gaba01db17f4a2bfbc3db60dc172972a25"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf105ae5beaca1dee30ae54530691fce"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fcea32cb7ce34cdce7095962f0766cc6c3ac">AINPUT_KEYBOARD_TYPE_NONE</a> = 0,
-<a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaf0226d750ea830eb557ae68bd4a1c82a">AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC</a> = 1,
-<a class="el" href="group___input.html#ggaaf105ae5beaca1dee30ae54530691fceaba1f5ab6bc79749ba96a5d2a3af0e574">AINPUT_KEYBOARD_TYPE_ALPHABETIC</a> = 2
- }</td></tr>
-<tr class="separator:gaaf105ae5beaca1dee30ae54530691fce"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga80155586fa275b28773c9b203f52caba"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa0e5816bc48cdb33f2b488a109596ffe1">AINPUT_MOTION_RANGE_X</a> = AMOTION_EVENT_AXIS_X,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaab48108c9450ea1b7cd021be7d8cbc332">AINPUT_MOTION_RANGE_Y</a> = AMOTION_EVENT_AXIS_Y,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa79aca706b12b28d0ab14762902fed31a">AINPUT_MOTION_RANGE_PRESSURE</a> = AMOTION_EVENT_AXIS_PRESSURE,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa46f3a6cf859fb161cd29398d8448c688">AINPUT_MOTION_RANGE_SIZE</a> = AMOTION_EVENT_AXIS_SIZE,
-<br/>
-  <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa7ead43624c96e165fd8a25e77148aa67">AINPUT_MOTION_RANGE_TOUCH_MAJOR</a> = AMOTION_EVENT_AXIS_TOUCH_MAJOR,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa301181a0f20681135c15010b39bb575d">AINPUT_MOTION_RANGE_TOUCH_MINOR</a> = AMOTION_EVENT_AXIS_TOUCH_MINOR,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaa860f54aa9e5a269dba6a54bbcf3c27c">AINPUT_MOTION_RANGE_TOOL_MAJOR</a> = AMOTION_EVENT_AXIS_TOOL_MAJOR,
-<a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaa19226f6cf713c1b4d0973a163daf6cf1">AINPUT_MOTION_RANGE_TOOL_MINOR</a> = AMOTION_EVENT_AXIS_TOOL_MINOR,
-<br/>
-  <a class="el" href="group___input.html#gga80155586fa275b28773c9b203f52cabaaf9be9c04a41b610d994a3d1d7e90d06d">AINPUT_MOTION_RANGE_ORIENTATION</a> = AMOTION_EVENT_AXIS_ORIENTATION
-<br/>
- }</td></tr>
-<tr class="separator:ga80155586fa275b28773c9b203f52caba"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga8292ae06aa8120c52d7380d228600b9c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga8292ae06aa8120c52d7380d228600b9c">AInputEvent_getType</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:ga8292ae06aa8120c52d7380d228600b9c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9dd3fd81e51dbfde19ab861541242aa1"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9dd3fd81e51dbfde19ab861541242aa1">AInputEvent_getDeviceId</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:ga9dd3fd81e51dbfde19ab861541242aa1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac90d4b497669dbc709ec9650db4e49be"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gac90d4b497669dbc709ec9650db4e49be">AInputEvent_getSource</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:gac90d4b497669dbc709ec9650db4e49be"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga36ec0b59f98f86a7ca263ba91279896d"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga36ec0b59f98f86a7ca263ba91279896d">AKeyEvent_getAction</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga36ec0b59f98f86a7ca263ba91279896d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2a18e98efe0c4ccb6f39bb13c555010e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2a18e98efe0c4ccb6f39bb13c555010e">AKeyEvent_getFlags</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga2a18e98efe0c4ccb6f39bb13c555010e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6b01ecd60018a5445f4917a861ca9466"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga6b01ecd60018a5445f4917a861ca9466">AKeyEvent_getKeyCode</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga6b01ecd60018a5445f4917a861ca9466"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4a0a846b7a195aeb290dfcd2250137d9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga4a0a846b7a195aeb290dfcd2250137d9">AKeyEvent_getScanCode</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga4a0a846b7a195aeb290dfcd2250137d9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabdda62b40b22727af2fb41740bf4787b"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gabdda62b40b22727af2fb41740bf4787b">AKeyEvent_getMetaState</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:gabdda62b40b22727af2fb41740bf4787b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5358fe3ebbd4b5b2f88a4ad2eba6f885"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5358fe3ebbd4b5b2f88a4ad2eba6f885">AKeyEvent_getRepeatCount</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:ga5358fe3ebbd4b5b2f88a4ad2eba6f885"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf475b6f0860bdfca4ceea7bc46eab1a9"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaf475b6f0860bdfca4ceea7bc46eab1a9">AKeyEvent_getDownTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:gaf475b6f0860bdfca4ceea7bc46eab1a9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae3eac7d68195d1767c947ca267842696"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gae3eac7d68195d1767c947ca267842696">AKeyEvent_getEventTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *key_event)</td></tr>
-<tr class="separator:gae3eac7d68195d1767c947ca267842696"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga73ea2093cc2343675ac43dd08bef4247"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga73ea2093cc2343675ac43dd08bef4247">AMotionEvent_getAction</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga73ea2093cc2343675ac43dd08bef4247"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2891d19197c070207098fa48adeb35af"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2891d19197c070207098fa48adeb35af">AMotionEvent_getFlags</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga2891d19197c070207098fa48adeb35af"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5644f0d952e3dea57ba9f7ce51dff2bb"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5644f0d952e3dea57ba9f7ce51dff2bb">AMotionEvent_getMetaState</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga5644f0d952e3dea57ba9f7ce51dff2bb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1aa7ebb749416491b6f0c55ae87ddf49"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga1aa7ebb749416491b6f0c55ae87ddf49">AMotionEvent_getButtonState</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga1aa7ebb749416491b6f0c55ae87ddf49"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad7e1f0caa4c27194d4a8756a18432299"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gad7e1f0caa4c27194d4a8756a18432299">AMotionEvent_getEdgeFlags</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:gad7e1f0caa4c27194d4a8756a18432299"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad44be7697e68891688cd7bcfaffec209"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gad44be7697e68891688cd7bcfaffec209">AMotionEvent_getDownTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:gad44be7697e68891688cd7bcfaffec209"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7e13fbf3cff0700b0b620284ebdd3a33"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7e13fbf3cff0700b0b620284ebdd3a33">AMotionEvent_getEventTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga7e13fbf3cff0700b0b620284ebdd3a33"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7a94ce622eb78a17737fd8bddbf86e21"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7a94ce622eb78a17737fd8bddbf86e21">AMotionEvent_getXOffset</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga7a94ce622eb78a17737fd8bddbf86e21"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7f6bd2c12d912f502c245b6ced6d3704"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7f6bd2c12d912f502c245b6ced6d3704">AMotionEvent_getYOffset</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga7f6bd2c12d912f502c245b6ced6d3704"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga81a9be07673a01f43fd0241c7b4c254f"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga81a9be07673a01f43fd0241c7b4c254f">AMotionEvent_getXPrecision</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga81a9be07673a01f43fd0241c7b4c254f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae311e6e28bce4be905526f9ea71278ed"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gae311e6e28bce4be905526f9ea71278ed">AMotionEvent_getYPrecision</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:gae311e6e28bce4be905526f9ea71278ed"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga612e68d104adbc6d14d87510e8066bd8"><td class="memItemLeft" align="right" valign="top">size_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga612e68d104adbc6d14d87510e8066bd8">AMotionEvent_getPointerCount</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga612e68d104adbc6d14d87510e8066bd8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga599e21a79c706807243a8ee31b116138"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga599e21a79c706807243a8ee31b116138">AMotionEvent_getPointerId</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga599e21a79c706807243a8ee31b116138"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2babe4e2e79952e004538f8f1878649c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2babe4e2e79952e004538f8f1878649c">AMotionEvent_getToolType</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga2babe4e2e79952e004538f8f1878649c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafe45e29ef138cc30592237ce479837f0"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gafe45e29ef138cc30592237ce479837f0">AMotionEvent_getRawX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:gafe45e29ef138cc30592237ce479837f0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5a09c3d742a93270861aa05f24257c23"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5a09c3d742a93270861aa05f24257c23">AMotionEvent_getRawY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga5a09c3d742a93270861aa05f24257c23"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga22e255a5fa52761cd92ce78af91e9757"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga22e255a5fa52761cd92ce78af91e9757">AMotionEvent_getX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga22e255a5fa52761cd92ce78af91e9757"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga113f58a37e41f2a6c3007d68418edfa6"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga113f58a37e41f2a6c3007d68418edfa6">AMotionEvent_getY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga113f58a37e41f2a6c3007d68418edfa6"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga97fcaa6cd08c9d54b35711e482e06c8d"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga97fcaa6cd08c9d54b35711e482e06c8d">AMotionEvent_getPressure</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga97fcaa6cd08c9d54b35711e482e06c8d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9b1f3c3df46b5269f9e74d2dd70c88a8"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9b1f3c3df46b5269f9e74d2dd70c88a8">AMotionEvent_getSize</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga9b1f3c3df46b5269f9e74d2dd70c88a8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9ac18fe19534e07d80441582f489d471"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9ac18fe19534e07d80441582f489d471">AMotionEvent_getTouchMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga9ac18fe19534e07d80441582f489d471"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga65f71e257b5fcb29dcbaaf59b3fcb3a7"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga65f71e257b5fcb29dcbaaf59b3fcb3a7">AMotionEvent_getTouchMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga65f71e257b5fcb29dcbaaf59b3fcb3a7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac04099690f278a6a27191c2027b12a77"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gac04099690f278a6a27191c2027b12a77">AMotionEvent_getToolMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:gac04099690f278a6a27191c2027b12a77"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2222d459759ba4a8269647012d2718fb"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2222d459759ba4a8269647012d2718fb">AMotionEvent_getToolMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:ga2222d459759ba4a8269647012d2718fb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad28422998da15b789edcba6b8bc5d615"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gad28422998da15b789edcba6b8bc5d615">AMotionEvent_getOrientation</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index)</td></tr>
-<tr class="separator:gad28422998da15b789edcba6b8bc5d615"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9d364cdcebf85237f599b25861f38c21"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga9d364cdcebf85237f599b25861f38c21">AMotionEvent_getAxisValue</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, int32_t axis, size_t pointer_index)</td></tr>
-<tr class="separator:ga9d364cdcebf85237f599b25861f38c21"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0aef34c236db6d7a56a50bf590be7bcc"><td class="memItemLeft" align="right" valign="top">size_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga0aef34c236db6d7a56a50bf590be7bcc">AMotionEvent_getHistorySize</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event)</td></tr>
-<tr class="separator:ga0aef34c236db6d7a56a50bf590be7bcc"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga523f1a760754206965b42b08d62f9346"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga523f1a760754206965b42b08d62f9346">AMotionEvent_getHistoricalEventTime</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t history_index)</td></tr>
-<tr class="separator:ga523f1a760754206965b42b08d62f9346"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5d36c2e7420001c86ae2aa1168fe6f83"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga5d36c2e7420001c86ae2aa1168fe6f83">AMotionEvent_getHistoricalRawX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga5d36c2e7420001c86ae2aa1168fe6f83"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6deb0e7690a93aa53e5872c2691b69fe"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga6deb0e7690a93aa53e5872c2691b69fe">AMotionEvent_getHistoricalRawY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga6deb0e7690a93aa53e5872c2691b69fe"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga49a8ca89ff377b5ed2355e8d7220ae07"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga49a8ca89ff377b5ed2355e8d7220ae07">AMotionEvent_getHistoricalX</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga49a8ca89ff377b5ed2355e8d7220ae07"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga30fc4e5d3ce144955859f8c97b51b73d"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga30fc4e5d3ce144955859f8c97b51b73d">AMotionEvent_getHistoricalY</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga30fc4e5d3ce144955859f8c97b51b73d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa8e9352ee5b043b3e1b6e2062d491010"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaa8e9352ee5b043b3e1b6e2062d491010">AMotionEvent_getHistoricalPressure</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gaa8e9352ee5b043b3e1b6e2062d491010"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0a04bb7ec12928db7e62645e7fad3a9e"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga0a04bb7ec12928db7e62645e7fad3a9e">AMotionEvent_getHistoricalSize</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga0a04bb7ec12928db7e62645e7fad3a9e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf437f223668b97f19ebdbad4b9cf4483"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaf437f223668b97f19ebdbad4b9cf4483">AMotionEvent_getHistoricalTouchMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gaf437f223668b97f19ebdbad4b9cf4483"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga126715d966e989652aa1ae5d38e0e898"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga126715d966e989652aa1ae5d38e0e898">AMotionEvent_getHistoricalTouchMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga126715d966e989652aa1ae5d38e0e898"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga160a5830e791e8c42ae97f51b92233d2"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga160a5830e791e8c42ae97f51b92233d2">AMotionEvent_getHistoricalToolMajor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga160a5830e791e8c42ae97f51b92233d2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafe01aa7576a6d1bce750fb8482355849"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gafe01aa7576a6d1bce750fb8482355849">AMotionEvent_getHistoricalToolMinor</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gafe01aa7576a6d1bce750fb8482355849"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaab9cb8fa670175ecc73c75eed4e5cd3f"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaab9cb8fa670175ecc73c75eed4e5cd3f">AMotionEvent_getHistoricalOrientation</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:gaab9cb8fa670175ecc73c75eed4e5cd3f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7ca740e1324f3cdb934252dce0c982d0"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga7ca740e1324f3cdb934252dce0c982d0">AMotionEvent_getHistoricalAxisValue</a> (const <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *motion_event, int32_t axis, size_t pointer_index, size_t history_index)</td></tr>
-<tr class="separator:ga7ca740e1324f3cdb934252dce0c982d0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga900711156bfb58d1a4b158da7874930f"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga900711156bfb58d1a4b158da7874930f">AInputQueue_attachLooper</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int ident, <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> callback, void *data)</td></tr>
-<tr class="separator:ga900711156bfb58d1a4b158da7874930f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaeebe9f83392ac79b31ca40a6fd4dbeff"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gaeebe9f83392ac79b31ca40a6fd4dbeff">AInputQueue_detachLooper</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td></tr>
-<tr class="separator:gaeebe9f83392ac79b31ca40a6fd4dbeff"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2b72ad6ab5ef656e8c41163aa7871c96"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga2b72ad6ab5ef656e8c41163aa7871c96">AInputQueue_hasEvents</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td></tr>
-<tr class="separator:ga2b72ad6ab5ef656e8c41163aa7871c96"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga88de12e2b39787ba7d3e4ce2ea46a48c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga88de12e2b39787ba7d3e4ce2ea46a48c">AInputQueue_getEvent</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> **outEvent)</td></tr>
-<tr class="separator:ga88de12e2b39787ba7d3e4ce2ea46a48c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadecd32e6c7aefa4a508b355550d3eaa9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#gadecd32e6c7aefa4a508b355550d3eaa9">AInputQueue_preDispatchEvent</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event)</td></tr>
-<tr class="separator:gadecd32e6c7aefa4a508b355550d3eaa9"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga17e87e0f35d47d729eac31a0dfb1ac33"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___input.html#ga17e87e0f35d47d729eac31a0dfb1ac33">AInputQueue_finishEvent</a> (<a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue, <a class="el" href="group___input.html#gac35dbbc035371e799d8badabc981e8fa">AInputEvent</a> *event, int handled)</td></tr>
-<tr class="separator:ga17e87e0f35d47d729eac31a0dfb1ac33"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/keycodes_8h.jd b/docs/html/ndk/reference/keycodes_8h.jd
deleted file mode 100644
index 338a361..0000000
--- a/docs/html/ndk/reference/keycodes_8h.jd
+++ /dev/null
@@ -1,350 +0,0 @@
-page.title=keycodes.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#enum-members">Enumerations</a> </div>
- <div class="headertitle">
-<div class="title">keycodes.h File Reference<div class="ingroups"><a class="el" href="group___input.html">Input</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <sys/types.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga6b7b47dd702d9e331586d485013fd1ea"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa593f8ae18990d627785719284a12a6f">AKEYCODE_UNKNOWN</a> = 0,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2dc78d3a93876b77402d2a7f02e4b899">AKEYCODE_SOFT_LEFT</a> = 1,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8cadfbfcaaa83fef168de13639adfcae">AKEYCODE_SOFT_RIGHT</a> = 2,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa526c2411b7476b7ae579f57a0378b2dd">AKEYCODE_HOME</a> = 3,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeb71c74bf556ba72e9c8f8dcbe5453d0">AKEYCODE_BACK</a> = 4,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8b5720ebdd3576c2b536ec9228273d8f">AKEYCODE_CALL</a> = 5,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaff971957ae3a4e272b21987854e18d9b">AKEYCODE_ENDCALL</a> = 6,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23f585ea17aeceaad2111c51ab289e79">AKEYCODE_0</a> = 7,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabcac88b54f8d764bc4573ecc5b9571b0">AKEYCODE_1</a> = 8,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2079c6fb75141968b60ed79fe895d6db">AKEYCODE_2</a> = 9,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa40ccc018c0637e4d938e66b789054551">AKEYCODE_3</a> = 10,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c2d141c3906bd97cfec91443356f7b">AKEYCODE_4</a> = 11,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca99d2be4a3723ba3406944ad623f6e">AKEYCODE_5</a> = 12,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa72bc6560e24d08ff8f3116dac9179079">AKEYCODE_6</a> = 13,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa27070499acdb6c527a285b3840ec7bff">AKEYCODE_7</a> = 14,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93543b23683b33724ecf77ac5a8c19ab">AKEYCODE_8</a> = 15,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa31cd4d7c4e59cf7b057b6c248cff516d">AKEYCODE_9</a> = 16,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1461fbf54e3dcba96e5d6d0638c18305">AKEYCODE_STAR</a> = 17,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf448758c44899e41b67f76dfe3be51e9">AKEYCODE_POUND</a> = 18,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf2fd3133a88f3b6725834032bd74bd9e">AKEYCODE_DPAD_UP</a> = 19,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa84b721b13aae56c9f1d3c22b3d81627a">AKEYCODE_DPAD_DOWN</a> = 20,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa668dfb3ed79a37c2c07838c161c1b344">AKEYCODE_DPAD_LEFT</a> = 21,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac6f9d81b6239696a1836695bbfc6a975">AKEYCODE_DPAD_RIGHT</a> = 22,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e9c93273fd39148f54167133aa5b9ae">AKEYCODE_DPAD_CENTER</a> = 23,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5b81e325d9efd633eef7535a5b538882">AKEYCODE_VOLUME_UP</a> = 24,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a882dae17080d3b5f3329e79db60c66">AKEYCODE_VOLUME_DOWN</a> = 25,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabecfbcb9b6f5e85fdfdfa98fbc3326e6">AKEYCODE_POWER</a> = 26,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8670880765756933d3d1a10186d39e26">AKEYCODE_CAMERA</a> = 27,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95bd8c25adeaa570108c7403f08a2901">AKEYCODE_CLEAR</a> = 28,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa424a091c62d40f5d65908c9730ae9014">AKEYCODE_A</a> = 29,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa65d3bf8d6a8a6c2f7c1b08394f313758">AKEYCODE_B</a> = 30,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaeed584f454e508ce931bcb33d37adb04">AKEYCODE_C</a> = 31,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7e4cb3ef66209a2779be2c8239b57b51">AKEYCODE_D</a> = 32,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae218af7ceb207227bb10f0525e68a8d0">AKEYCODE_E</a> = 33,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa455f71ecfe59af0fbd901ac0d0a8d53a">AKEYCODE_F</a> = 34,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa165067e10464019411f768bba9e533d9">AKEYCODE_G</a> = 35,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad89a91a1500cb162f22962781ebfd9dc">AKEYCODE_H</a> = 36,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4d44b5e4a19580540d8d77bf5755d74b">AKEYCODE_I</a> = 37,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa70c259612ccec117d70afaef947a6a7a">AKEYCODE_J</a> = 38,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ce56cf50d3632c275c524bd78d0d932">AKEYCODE_K</a> = 39,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab61c534fd0f4e56c4ba13861a2f5982b">AKEYCODE_L</a> = 40,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa43b19e5e5234ce90c8e7ef67dd0cabd1">AKEYCODE_M</a> = 41,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c0b26804c89560a9e87c45f7f9fed36">AKEYCODE_N</a> = 42,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa249667bc4a59d99be1914535877329fb">AKEYCODE_O</a> = 43,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac68ef56b78bd0c8626cc68bb6cb9156f">AKEYCODE_P</a> = 44,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa932cf6ea8d87e6d6d97af658dd0fa206">AKEYCODE_Q</a> = 45,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaba25ac2c15a8edbbbff16a9fe6e74532">AKEYCODE_R</a> = 46,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae1ed25c28a8fce578cddb17ca6888ff6">AKEYCODE_S</a> = 47,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2feac8b458ef8eb9c0a0dd73766927c2">AKEYCODE_T</a> = 48,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac1a220314f986aae45d7fe3b35501595">AKEYCODE_U</a> = 49,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4043bc48fa55cce7825176052d6e199a">AKEYCODE_V</a> = 50,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0c80e98547c3daa01f3d9e7f4f00425">AKEYCODE_W</a> = 51,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec585cebac89004faffbdc28dc6d81c5">AKEYCODE_X</a> = 52,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06fc277ef25acdd89d64c18eed0daa9b">AKEYCODE_Y</a> = 53,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7439a09f219a0addc13c758ef7508cce">AKEYCODE_Z</a> = 54,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0ca0bfbdc67b2c6f76e8fcaaf782c227">AKEYCODE_COMMA</a> = 55,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9dd68c8ecebd4e274e8c357dcdfe8a04">AKEYCODE_PERIOD</a> = 56,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3dec175158abe8679bedd98ed1bc3e1a">AKEYCODE_ALT_LEFT</a> = 57,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd9b6b0846c6999f5df47d29e58ac95d">AKEYCODE_ALT_RIGHT</a> = 58,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafb9875645596928cec46368e74499dc4">AKEYCODE_SHIFT_LEFT</a> = 59,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf9eab1348ae1e8f18ad5bf3c77df4212">AKEYCODE_SHIFT_RIGHT</a> = 60,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1b1bfda850b2acd0b60e8456e2bfa958">AKEYCODE_TAB</a> = 61,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa10389300ac5d70f8d9733564b3cab4e7">AKEYCODE_SPACE</a> = 62,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6c1c6752d5db5e02da51d8937e5e3c6f">AKEYCODE_SYM</a> = 63,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaded9ec81ae6dab451665317723b94083">AKEYCODE_EXPLORER</a> = 64,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaade96efe470f428bb5c4eaea6ffc3681c">AKEYCODE_ENVELOPE</a> = 65,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac784a7bbbfbdab05fab6c6a1f29c98ff">AKEYCODE_ENTER</a> = 66,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacd013221b457d98975dc47e49817e28a">AKEYCODE_DEL</a> = 67,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa929561086ae7b519fa962597bc85f171">AKEYCODE_GRAVE</a> = 68,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaca10bd34ad0abecfecace908b8cb92ca">AKEYCODE_MINUS</a> = 69,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0a197df7ec719c95ddcd6836e76c8498">AKEYCODE_EQUALS</a> = 70,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabdeda0d373aa37ef2ded5ffdfc008708">AKEYCODE_LEFT_BRACKET</a> = 71,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa084dfa52626040a08d374f8aec066e6a">AKEYCODE_RIGHT_BRACKET</a> = 72,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac90eb064382e3c482ae86abb7b3f701">AKEYCODE_BACKSLASH</a> = 73,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac0a2920161f4f2d97b0b060614b23391">AKEYCODE_SEMICOLON</a> = 74,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab5518a8502914ea5f87ef5d29b32b1b1">AKEYCODE_APOSTROPHE</a> = 75,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa54c047be3811d637a33d9b3e39d16e1a">AKEYCODE_SLASH</a> = 76,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7284f79a266ede479b79726082642e16">AKEYCODE_AT</a> = 77,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe6e880f65bebbdd5246a4164c4ab37a">AKEYCODE_NUM</a> = 78,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0d3d29515a4815fe8d6d8d3291507a33">AKEYCODE_HEADSETHOOK</a> = 79,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa23be9506f92f6efe14d47306a39a2187">AKEYCODE_FOCUS</a> = 80,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7f72d867b311e0845aef732dcc66495">AKEYCODE_PLUS</a> = 81,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa707b85e89923b0f760be795972a87d76">AKEYCODE_MENU</a> = 82,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6115506352a5828532fc6a0b91683331">AKEYCODE_NOTIFICATION</a> = 83,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac644fd307fd0ef0d3ed3d2e074c1a4b7">AKEYCODE_SEARCH</a> = 84,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa42f8fe71e8d45b5a83d83d80c3da40e1">AKEYCODE_MEDIA_PLAY_PAUSE</a> = 85,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac4faa33993d80db1326073ea15a38e7d">AKEYCODE_MEDIA_STOP</a> = 86,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5a6c3fc963e8163852b9a23e3a198b3">AKEYCODE_MEDIA_NEXT</a> = 87,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81432c31b00d47f768c29163eb276acb">AKEYCODE_MEDIA_PREVIOUS</a> = 88,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaecd53183b84c23a2ca65670a23674319">AKEYCODE_MEDIA_REWIND</a> = 89,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa69e648024402af688d490a2041f15bca">AKEYCODE_MEDIA_FAST_FORWARD</a> = 90,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f6675d38f50e3556a8531839fd83f02">AKEYCODE_MUTE</a> = 91,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4fd0d4ea5b6898f4a40011b97a739a04">AKEYCODE_PAGE_UP</a> = 92,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0b7fe1c18f53e6328657858a88826393">AKEYCODE_PAGE_DOWN</a> = 93,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacdc7c004da1594fa156de87befef5f41">AKEYCODE_PICTSYMBOLS</a> = 94,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad6a1f88b2cc3b6ff8f1724eb01473ec3">AKEYCODE_SWITCH_CHARSET</a> = 95,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaef2d2ec912aaa9e7215aeab79f7fb086">AKEYCODE_BUTTON_A</a> = 96,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa721765c8f0bbcdb68af06817dbec8e53">AKEYCODE_BUTTON_B</a> = 97,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad622ad5df40d2fdf806abb2adda73b3d">AKEYCODE_BUTTON_C</a> = 98,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa21174962f95e32cd0345ce657d03ebc7">AKEYCODE_BUTTON_X</a> = 99,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6654a8b2c700f7783433c86fcdae7919">AKEYCODE_BUTTON_Y</a> = 100,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa06156b68e6de951b44fc662e1b16041f">AKEYCODE_BUTTON_Z</a> = 101,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa32e159826404c7d76c2a433c24de82a2">AKEYCODE_BUTTON_L1</a> = 102,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7c614b3966583b0ad027e45f594ede46">AKEYCODE_BUTTON_R1</a> = 103,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa36a38421637cfa5ebfd8a0296650cdf4">AKEYCODE_BUTTON_L2</a> = 104,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa46d487e9fe31855b7b46739bad58fe3e">AKEYCODE_BUTTON_R2</a> = 105,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68c5d8dcd8fe708ada8f4a4e17feb638">AKEYCODE_BUTTON_THUMBL</a> = 106,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9759d817172d268ced1748909a5f5fbe">AKEYCODE_BUTTON_THUMBR</a> = 107,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3c818d106f4ec793a43749c4c26a8a4">AKEYCODE_BUTTON_START</a> = 108,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa598289bc85f647c237729126ea392a43">AKEYCODE_BUTTON_SELECT</a> = 109,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa19839eebec939407d901a33b75cf2594">AKEYCODE_BUTTON_MODE</a> = 110,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac52177e5508edacb8e9c6d3a25db4fb6">AKEYCODE_ESCAPE</a> = 111,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9516bc190d37fea27e07ddab0c607b51">AKEYCODE_FORWARD_DEL</a> = 112,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaca9d0df6cc18492209eb287e659aeb1">AKEYCODE_CTRL_LEFT</a> = 113,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa99b317cf2f1eb6b06d0226e05223e60c">AKEYCODE_CTRL_RIGHT</a> = 114,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab9dcb68b35c85d380846c85f323868f1">AKEYCODE_CAPS_LOCK</a> = 115,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa78ff5c8316235635f76e3c3179e9a7fc">AKEYCODE_SCROLL_LOCK</a> = 116,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaaadfb2d920bbe422c096120d39811c58">AKEYCODE_META_LEFT</a> = 117,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68038455e2b0846db51f9957e0df9cb8">AKEYCODE_META_RIGHT</a> = 118,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1764b777aa56605f4029d3c71fe70722">AKEYCODE_FUNCTION</a> = 119,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14e22c69bcd47ffb4445ee18a4332d84">AKEYCODE_SYSRQ</a> = 120,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa047501f9cf9bce00e6048d8759ea3a23">AKEYCODE_BREAK</a> = 121,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7544f3de2fb5f78bec62af94a32fdc58">AKEYCODE_MOVE_HOME</a> = 122,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5605f49f5271430f5f150efb3cd0398a">AKEYCODE_MOVE_END</a> = 123,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62f663d11e91af750a51ddd060b08644">AKEYCODE_INSERT</a> = 124,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafbf0a16c7746e5dee2fd3adbd50da88a">AKEYCODE_FORWARD</a> = 125,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa615cf6202b0ae0ed550f42f6c64b36a1">AKEYCODE_MEDIA_PLAY</a> = 126,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f4e0178c2028b3042b0a5948e38e4e4">AKEYCODE_MEDIA_PAUSE</a> = 127,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6788c6e1443140b0ec4d004d8293e998">AKEYCODE_MEDIA_CLOSE</a> = 128,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa317bffd44306b021c401d3a26b82a7f6">AKEYCODE_MEDIA_EJECT</a> = 129,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e1eae0b245176aaa024a53411441f9">AKEYCODE_MEDIA_RECORD</a> = 130,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3b84f2c503a9e839f3d36e10e3307fcf">AKEYCODE_F1</a> = 131,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1360f7ec66aa6421e240dae637262e84">AKEYCODE_F2</a> = 132,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a4ce6105e12a3a9071cae2f40515085">AKEYCODE_F3</a> = 133,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa882050e4d0f917470a5b91fbf6ae9ebf">AKEYCODE_F4</a> = 134,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab01807c72b46620bb50fcb6abe24d937">AKEYCODE_F5</a> = 135,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa04a12e81ed80bb42ef5c63cedf0dc60">AKEYCODE_F6</a> = 136,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9583b8e4b0d994b7e3a193b67cf6020c">AKEYCODE_F7</a> = 137,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55ca54d42d8df70de2ce9031db1344c8">AKEYCODE_F8</a> = 138,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0c8225c0ef98da730933ae914077dbc9">AKEYCODE_F9</a> = 139,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa60660b13acab39282d0558cdcc93474">AKEYCODE_F10</a> = 140,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa64cc7b1d8e53d90ff57c39d0b5a4dd22">AKEYCODE_F11</a> = 141,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa491000231e0ba221b6916b1d9d2c9fb7">AKEYCODE_F12</a> = 142,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad5e349eadd3255c6ad4982dc40ed23ef">AKEYCODE_NUM_LOCK</a> = 143,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa343df35e6a0ad0599e19b8ef7174909b">AKEYCODE_NUMPAD_0</a> = 144,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c0ec8e42917fa9ac53977db3e6aeb17">AKEYCODE_NUMPAD_1</a> = 145,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4dfd17c2209908e1ec890e10a3211f89">AKEYCODE_NUMPAD_2</a> = 146,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1efe1886a4b472b999215c0e81f7386">AKEYCODE_NUMPAD_3</a> = 147,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1fdd16681c1441b934f679b94fd0e4f8">AKEYCODE_NUMPAD_4</a> = 148,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf5916003e7c737a8cc06e52d2ee76c3b">AKEYCODE_NUMPAD_5</a> = 149,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa13b83389e0f5de129227af4b8d3f035d">AKEYCODE_NUMPAD_6</a> = 150,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaed9468951ef2887c07c8095c2e7d4c93">AKEYCODE_NUMPAD_7</a> = 151,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5f0a300566235720eb93fee9f2196642">AKEYCODE_NUMPAD_8</a> = 152,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad0c490e3965df546e2d5a83edf423d95">AKEYCODE_NUMPAD_9</a> = 153,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaac108b744e8f93af69158d146425236c">AKEYCODE_NUMPAD_DIVIDE</a> = 154,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47ce00b838e7ee0a34066dc2595ac735">AKEYCODE_NUMPAD_MULTIPLY</a> = 155,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bee314dbbea0a349eb301d10256bbe">AKEYCODE_NUMPAD_SUBTRACT</a> = 156,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa9d2fefa9a3f6037f48b247e66dd28c35">AKEYCODE_NUMPAD_ADD</a> = 157,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6aab6b5914e120b43b3a1a8269e9cee1">AKEYCODE_NUMPAD_DOT</a> = 158,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa900e3bb0bc4ff70ba786f18ff4db0bd1">AKEYCODE_NUMPAD_COMMA</a> = 159,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa79432be5f7a44e99ddc3721fd9fd212e">AKEYCODE_NUMPAD_ENTER</a> = 160,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c1007a59641499ee5e1508e747c5ed">AKEYCODE_NUMPAD_EQUALS</a> = 161,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacc903e9eb495cf6cef7c6bc825f82f54">AKEYCODE_NUMPAD_LEFT_PAREN</a> = 162,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7662e0f2a099239dc69f6a27c7daabf9">AKEYCODE_NUMPAD_RIGHT_PAREN</a> = 163,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa174a5c7c39753235109696e82870c575">AKEYCODE_VOLUME_MUTE</a> = 164,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17e76263257a5dc654a413c9dc2fd649">AKEYCODE_INFO</a> = 165,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa056914fd17ae539dca44f43745d8e05c">AKEYCODE_CHANNEL_UP</a> = 166,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa18f1808c6a819e787c9a9941f78b910f">AKEYCODE_CHANNEL_DOWN</a> = 167,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacfce9bb78ef8106dce4868f81cca4fb4">AKEYCODE_ZOOM_IN</a> = 168,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf035f5234c3df4589f35a50e99e0535">AKEYCODE_ZOOM_OUT</a> = 169,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0776ffae512b4848e53fce762a3a5017">AKEYCODE_TV</a> = 170,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe7531c40ff4a31614ff6fd61802ebe8">AKEYCODE_WINDOW</a> = 171,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf33a5fa1f163245360aeed89d64b0233">AKEYCODE_GUIDE</a> = 172,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacf2f03b925a02ba6de9fd98737546a60">AKEYCODE_DVR</a> = 173,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa03ce46d177e020690aa9d26a0fa850ae">AKEYCODE_BOOKMARK</a> = 174,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa81ba8d5343362b841b8a62b8679ff994">AKEYCODE_CAPTIONS</a> = 175,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa2bbd457230c3028df6b91d5bdda9159">AKEYCODE_SETTINGS</a> = 176,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafda3b0ea1b158831fc443bf4911a3930">AKEYCODE_TV_POWER</a> = 177,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa1750b29e396bd1fd237ed4aadacc8f5">AKEYCODE_TV_INPUT</a> = 178,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab28aea3a51b11c9f227ce8cd5ff55a3d">AKEYCODE_STB_POWER</a> = 179,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa988b0372359b2bca7390878fdba9e1b5">AKEYCODE_STB_INPUT</a> = 180,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa479d36f9814bd00c8986a252664b938b">AKEYCODE_AVR_POWER</a> = 181,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa57d42dbd8ea4219f76fb116f234e6504">AKEYCODE_AVR_INPUT</a> = 182,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa2d9e3e82e69955f649b586f4518e074c">AKEYCODE_PROG_RED</a> = 183,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaad50c1e2136e47843a8dabca929f8ead1">AKEYCODE_PROG_GREEN</a> = 184,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafa813640412bd41a181f0ec3a33dddc4">AKEYCODE_PROG_YELLOW</a> = 185,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5e82219fdb937fee5a22426c607dd4e0">AKEYCODE_PROG_BLUE</a> = 186,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa53a59a262d6d523bdc2bd30a1e427bad">AKEYCODE_APP_SWITCH</a> = 187,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa28c72c33ab93d83539d0790b7e48336a">AKEYCODE_BUTTON_1</a> = 188,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab8089673fea303c7a299eefd2c327cc3">AKEYCODE_BUTTON_2</a> = 189,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa706a5ff492c80b4653e6fe0dcd278ca1">AKEYCODE_BUTTON_3</a> = 190,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa73c425a063bf6976e1ff8ae9f3cfcbe6">AKEYCODE_BUTTON_4</a> = 191,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa47149f963528ec7abe55066abfb7caf5">AKEYCODE_BUTTON_5</a> = 192,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa55057c8cda53a4c539d02ab1a93ca58b">AKEYCODE_BUTTON_6</a> = 193,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac09e0c0cbbf6449bf106e4199600db35">AKEYCODE_BUTTON_7</a> = 194,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaee64b3e0f30ed09e3c9f01b6c8877c3f">AKEYCODE_BUTTON_8</a> = 195,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaac8e54092c8be5dc0e114ec35f40e00dc">AKEYCODE_BUTTON_9</a> = 196,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7e6f8621909f3461032c33f9c8acaa7">AKEYCODE_BUTTON_10</a> = 197,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab413971c698b6e25d3955667c0142ac1">AKEYCODE_BUTTON_11</a> = 198,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafe4ee1e5446dd12bbb579b412048e79e">AKEYCODE_BUTTON_12</a> = 199,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaabde2ed26594b89d5769eef9f0d1fe6f">AKEYCODE_BUTTON_13</a> = 200,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa1f08dfd2c30ddedf1d2983680e89041b">AKEYCODE_BUTTON_14</a> = 201,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d8d0fb1a610fdb4e53f0fb675b7d7d0">AKEYCODE_BUTTON_15</a> = 202,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa224370cba99bda2db6a1c82fd2f7fa39">AKEYCODE_BUTTON_16</a> = 203,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7b8e87b47c17c5f1e97fcb56faaa26ff">AKEYCODE_LANGUAGE_SWITCH</a> = 204,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa380279768c5c50d92bef2a88394f967f">AKEYCODE_MANNER_MODE</a> = 205,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa68d314a5ec06701205cd0097c5c7145c">AKEYCODE_3D_MODE</a> = 206,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0aa2cfca11b7cabf82341a9dbec83f10">AKEYCODE_CONTACTS</a> = 207,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa114be17d1853c77a7406c024d9e4f076">AKEYCODE_CALENDAR</a> = 208,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14508751d70a0404b194d4b6df83ec72">AKEYCODE_MUSIC</a> = 209,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa293523c40bb9f1d793cd0b984f636573">AKEYCODE_CALCULATOR</a> = 210,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf782be8df9a8ca5dc86c9bfeabac6f22">AKEYCODE_ZENKAKU_HANKAKU</a> = 211,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaadd69273b99eb0b848d98b2d6b3ad3234">AKEYCODE_EISU</a> = 212,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7321e5c6b3cbab142bd16957653b2ac7">AKEYCODE_MUHENKAN</a> = 213,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab0686dd37c57d833d1158b7f1d85ee02">AKEYCODE_HENKAN</a> = 214,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3be7db22b3c8aa046a46631e44863c28">AKEYCODE_KATAKANA_HIRAGANA</a> = 215,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5ee19d21912056b902e283efa2d9d14b">AKEYCODE_YEN</a> = 216,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaae8b0af04dac5ea56fd55e577fd9e6be4">AKEYCODE_RO</a> = 217,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa62d090ae5c95a04dacdff79817dad531">AKEYCODE_KANA</a> = 218,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3f036adb654c7752890a283ecbf838">AKEYCODE_ASSIST</a> = 219,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7cf1bf3528b6d8a0e86998287fe00650">AKEYCODE_BRIGHTNESS_DOWN</a> = 220,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa0af6ec416c09d160e364466faa955c36">AKEYCODE_BRIGHTNESS_UP</a> = 221,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3cdb53cdf8c576e272502da06daa52e1">AKEYCODE_MEDIA_AUDIO_TRACK</a> = 222,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaafc077e5a6b447ea060c144f6e65bd207">AKEYCODE_SLEEP</a> = 223,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa903c5152d26b3011ae521afa06759429">AKEYCODE_WAKEUP</a> = 224,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0ecddd3dce52cf60c96c5d430b1f553">AKEYCODE_PAIRING</a> = 225,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf3ddf83cb2f701911b03c3a738e2e73a">AKEYCODE_MEDIA_TOP_MENU</a> = 226,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaa22858c3c30d596ad60f355f75df86e1">AKEYCODE_11</a> = 227,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa781c31195e55b2dcbdd772560dc61aa5">AKEYCODE_12</a> = 228,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa187963dd6f74b96f132f23e01dea35e9">AKEYCODE_LAST_CHANNEL</a> = 229,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa954c2251b2cb53f47637802cb66baf06">AKEYCODE_TV_DATA_SERVICE</a> = 230,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa95898663b7f74c93d0b860a43528c744">AKEYCODE_VOICE_ASSIST</a> = 231,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa93dd3fd752701af5a5491e01cc15db72">AKEYCODE_TV_RADIO_SERVICE</a> = 232,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa7d3d7b89756df37f01d6d0f13beff1db">AKEYCODE_TV_TELETEXT</a> = 233,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa630a08e07a3b4c6bcac9a1a72d176055">AKEYCODE_TV_NUMBER_ENTRY</a> = 234,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa14f2b6fe8550832ef9e3f9aa53164073">AKEYCODE_TV_TERRESTRIAL_ANALOG</a> = 235,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaacad8c149251a78760a5fe4931b9cdf16">AKEYCODE_TV_TERRESTRIAL_DIGITAL</a> = 236,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa3707d4396417535a611e4548afe33936">AKEYCODE_TV_SATELLITE</a> = 237,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8c52e7d06525c0ee5d943d63a0fa8ea5">AKEYCODE_TV_SATELLITE_BS</a> = 238,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4eea1809a9ff679ed7773332d728c6b0">AKEYCODE_TV_SATELLITE_CS</a> = 239,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa17c0e68066b86610ff168c6367af36eb">AKEYCODE_TV_SATELLITE_SERVICE</a> = 240,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaec5e46a5afc57953d1772e086307aa42">AKEYCODE_TV_NETWORK</a> = 241,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaabe33a80d6d3bf889af25cbd77fdb89f9">AKEYCODE_TV_ANTENNA_CABLE</a> = 242,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a50de965f50ab3aa42772aac0808445">AKEYCODE_TV_INPUT_HDMI_1</a> = 243,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab7ec65c008471d771bf879ec012f5c7f">AKEYCODE_TV_INPUT_HDMI_2</a> = 244,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa6a0f267a2696d15bf16127121b1f1c7f">AKEYCODE_TV_INPUT_HDMI_3</a> = 245,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4437c1d8d2d33058cfa71ec7b2771ec5">AKEYCODE_TV_INPUT_HDMI_4</a> = 246,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5c3097f14c6582958ba1d14d70115ccd">AKEYCODE_TV_INPUT_COMPOSITE_1</a> = 247,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaada13cbb9d619bc610678ad66325647b9">AKEYCODE_TV_INPUT_COMPOSITE_2</a> = 248,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa156e2dba81e7c73624ccf8c2ef8833ae">AKEYCODE_TV_INPUT_COMPONENT_1</a> = 249,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8db9b6ee1457267abea03430781bb0ec">AKEYCODE_TV_INPUT_COMPONENT_2</a> = 250,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa149b2c8a4817075c0a41e0adf11c8e85">AKEYCODE_TV_INPUT_VGA_1</a> = 251,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa419f0adac43cad104cd6cf83dc5f13f6">AKEYCODE_TV_AUDIO_DESCRIPTION</a> = 252,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaccc5900ca5dd399d5ce11dd8ca324678">AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP</a> = 253,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa5fca6a9ec1ce246bf3c53d859ac9f5eb">AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN</a> = 254,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa8e79045045293070c8eb9e408f1335b4">AKEYCODE_TV_ZOOM_MODE</a> = 255,
-<br/>
-  <a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaa4c18feeafff3c41081073c025ee017b8">AKEYCODE_TV_CONTENTS_MENU</a> = 256,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaadde70071f6a432f367079efa6e1a6fe">AKEYCODE_TV_MEDIA_CONTEXT_MENU</a> = 257,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaaf0293c2a63e4d955080334bef6640840">AKEYCODE_TV_TIMER_PROGRAMMING</a> = 258,
-<a class="el" href="group___input.html#gga6b7b47dd702d9e331586d485013fd1eaab062b403701292c9e2db96a1f88cc6d9">AKEYCODE_HELP</a> = 259
-<br/>
- }</td></tr>
-<tr class="separator:ga6b7b47dd702d9e331586d485013fd1ea"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/looper_8h.jd b/docs/html/ndk/reference/looper_8h.jd
deleted file mode 100644
index 9171631..0000000
--- a/docs/html/ndk/reference/looper_8h.jd
+++ /dev/null
@@ -1,70 +0,0 @@
-page.title=looper.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">looper.h File Reference<div class="ingroups"><a class="el" href="group___looper.html">Looper</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gadb10521a80138b777ba1bc2ca74d4af5"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a></td></tr>
-<tr class="separator:gadb10521a80138b777ba1bc2ca74d4af5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga410b184b4e48302c439e36c8ce0a7a89"><td class="memItemLeft" align="right" valign="top">typedef int(* </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> )(int fd, int events, void *data)</td></tr>
-<tr class="separator:ga410b184b4e48302c439e36c8ce0a7a89"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gaf9bdc3014f3d54c426b6d2df10de4960"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___looper.html#ggaf9bdc3014f3d54c426b6d2df10de4960a1fff26ab5859b0308b58a3f8d58ef1eb">ALOOPER_PREPARE_ALLOW_NON_CALLBACKS</a> = 1<<0
- }</td></tr>
-<tr class="separator:gaf9bdc3014f3d54c426b6d2df10de4960"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gadb49720dc49f7d4e4cf9adbf2948e409"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a55528f1b28df17cc4b6317cc0d0fde47">ALOOPER_POLL_WAKE</a> = -1,
-<a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a64fe936780bfd9927affaf8e8cc81cc2">ALOOPER_POLL_CALLBACK</a> = -2,
-<a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409a3fe4eec66dff78a9fa8afca02e8b8443">ALOOPER_POLL_TIMEOUT</a> = -3,
-<a class="el" href="group___looper.html#ggadb49720dc49f7d4e4cf9adbf2948e409af8ebd4022f6f5d5fea864f6999b7e6b4">ALOOPER_POLL_ERROR</a> = -4
- }</td></tr>
-<tr class="separator:gadb49720dc49f7d4e4cf9adbf2948e409"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaae05225933a42f81e7c4a9fb286596f9"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9ae3d18f8dd1faf6f34468df10667949bc">ALOOPER_EVENT_INPUT</a> = 1 << 0,
-<a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a71273fd07e009057e6e3475d10f8286d">ALOOPER_EVENT_OUTPUT</a> = 1 << 1,
-<a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a14016d8f39373b8ce061276a957960f6">ALOOPER_EVENT_ERROR</a> = 1 << 2,
-<a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9a5e7fb5acdecef18b2c293f6309e5d4ab">ALOOPER_EVENT_HANGUP</a> = 1 << 3,
-<br/>
-  <a class="el" href="group___looper.html#ggaae05225933a42f81e7c4a9fb286596f9aefe82c6ce8e02d13aceaebdec15c2aff">ALOOPER_EVENT_INVALID</a> = 1 << 4
-<br/>
- }</td></tr>
-<tr class="separator:gaae05225933a42f81e7c4a9fb286596f9"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga741ccd90a0eb9209c6bddf2326d89e4a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga741ccd90a0eb9209c6bddf2326d89e4a">ALooper_forThread</a> ()</td></tr>
-<tr class="separator:ga741ccd90a0eb9209c6bddf2326d89e4a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1a070b904dd957cc65af9eb5ef6dfa25"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga1a070b904dd957cc65af9eb5ef6dfa25">ALooper_prepare</a> (int opts)</td></tr>
-<tr class="separator:ga1a070b904dd957cc65af9eb5ef6dfa25"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae1ad7ac48ab01a34bfd25840c92ff07b"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gae1ad7ac48ab01a34bfd25840c92ff07b">ALooper_acquire</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper)</td></tr>
-<tr class="separator:gae1ad7ac48ab01a34bfd25840c92ff07b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab723c3c2ac2c66bc695913a194073727"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gab723c3c2ac2c66bc695913a194073727">ALooper_release</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper)</td></tr>
-<tr class="separator:gab723c3c2ac2c66bc695913a194073727"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2a9044602b76fef7f47c7e11a801561c"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga2a9044602b76fef7f47c7e11a801561c">ALooper_pollOnce</a> (int timeoutMillis, int *outFd, int *outEvents, void **outData)</td></tr>
-<tr class="separator:ga2a9044602b76fef7f47c7e11a801561c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa7cd0636edc4ed227aadc585360ebefa"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gaa7cd0636edc4ed227aadc585360ebefa">ALooper_pollAll</a> (int timeoutMillis, int *outFd, int *outEvents, void **outData)</td></tr>
-<tr class="separator:gaa7cd0636edc4ed227aadc585360ebefa"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab2585652f8ae2e2444979194ebe32aaf"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gab2585652f8ae2e2444979194ebe32aaf">ALooper_wake</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper)</td></tr>
-<tr class="separator:gab2585652f8ae2e2444979194ebe32aaf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga2668285bfadcf21ef4d371568a30be33"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#ga2668285bfadcf21ef4d371568a30be33">ALooper_addFd</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int fd, int ident, int events, <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> callback, void *data)</td></tr>
-<tr class="separator:ga2668285bfadcf21ef4d371568a30be33"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf7d68ed05698b251489b4f6c8e54daad"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___looper.html#gaf7d68ed05698b251489b4f6c8e54daad">ALooper_removeFd</a> (<a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int fd)</td></tr>
-<tr class="separator:gaf7d68ed05698b251489b4f6c8e54daad"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/modules.jd b/docs/html/ndk/reference/modules.jd
deleted file mode 100644
index 2da7307..0000000
--- a/docs/html/ndk/reference/modules.jd
+++ /dev/null
@@ -1,23 +0,0 @@
-page.title=Modules
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">Modules</div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock">Here is a list of all modules:</div><div class="directory">
-<table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___asset.html" target="_self">Asset</a></td><td class="desc"></td></tr>
-<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___bitmap.html" target="_self">Bitmap</a></td><td class="desc"></td></tr>
-<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___configuration.html" target="_self">Configuration</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___input.html" target="_self">Input</a></td><td class="desc"></td></tr>
-<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___looper.html" target="_self">Looper</a></td><td class="desc"></td></tr>
-<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___native_activity.html" target="_self">Native Activity</a></td><td class="desc"></td></tr>
-<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group___storage.html" target="_self">Storage</a></td><td class="desc"></td></tr>
-<tr id="row_7_"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a class="el" href="group___sensor.html" target="_self">Sensor</a></td><td class="desc"></td></tr>
-</table>
-</div><!-- directory -->
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/native__activity_8h.jd b/docs/html/ndk/reference/native__activity_8h.jd
deleted file mode 100644
index 147ffdb..0000000
--- a/docs/html/ndk/reference/native__activity_8h.jd
+++ /dev/null
@@ -1,74 +0,0 @@
-page.title=native_activity.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#nested-classes">Data Structures</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> |
-<a href="#var-members">Variables</a> </div>
- <div class="headertitle">
-<div class="title">native_activity.h File Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <stdint.h></code><br/>
-<code>#include <sys/types.h></code><br/>
-<code>#include <jni.h></code><br/>
-<code>#include <<a class="el" href="asset__manager_8h.html">android/asset_manager.h</a>></code><br/>
-<code>#include <<a class="el" href="input_8h.html">android/input.h</a>></code><br/>
-<code>#include <<a class="el" href="native__window_8h.html">android/native_window.h</a>></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html">ANativeActivity</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga8abd07923f37feb1ce724d139cc2609d"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_native_activity.html">ANativeActivity</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga8abd07923f37feb1ce724d139cc2609d">ANativeActivity</a></td></tr>
-<tr class="separator:ga8abd07923f37feb1ce724d139cc2609d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga28dca784e5ee939427135c72c0151c38"><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
-<a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga28dca784e5ee939427135c72c0151c38">ANativeActivityCallbacks</a></td></tr>
-<tr class="separator:ga28dca784e5ee939427135c72c0151c38"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga569a53bcac3fcedb0189b7c412ebcb22"><td class="memItemLeft" align="right" valign="top">typedef void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">ANativeActivity_createFunc</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, void *savedState, size_t savedStateSize)</td></tr>
-<tr class="separator:ga569a53bcac3fcedb0189b7c412ebcb22"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga39fca1837c5ce7715cbf571669660c13"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a9b7250ac0e5a626a81b176462a9df7c9">ANATIVEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT</a> = 0x0001,
-<a class="el" href="group___native_activity.html#gga39fca1837c5ce7715cbf571669660c13a324062ac78fab16b40e8de1b1ae173b5">ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED</a> = 0x0002
- }</td></tr>
-<tr class="separator:ga39fca1837c5ce7715cbf571669660c13"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaaf8fd5f0e57d456151c951e0f3715fc4"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a642e76508cc737bbc1df149756c2a807">ANATIVEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY</a> = 0x0001,
-<a class="el" href="group___native_activity.html#ggaaf8fd5f0e57d456151c951e0f3715fc4a0f4cbb55fa4c29b963b7b37d13352e6f">ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS</a> = 0x0002
- }</td></tr>
-<tr class="separator:gaaf8fd5f0e57d456151c951e0f3715fc4"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga4d872ae54a239704c06a0517e23cc0ad"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga4d872ae54a239704c06a0517e23cc0ad">ANativeActivity_finish</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:ga4d872ae54a239704c06a0517e23cc0ad"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec8b12decdf2b9841344e75c4c038c5a"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaec8b12decdf2b9841344e75c4c038c5a">ANativeActivity_setWindowFormat</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, int32_t format)</td></tr>
-<tr class="separator:gaec8b12decdf2b9841344e75c4c038c5a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa1d091ca4a99b0ce570bab1c8c06f297"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaa1d091ca4a99b0ce570bab1c8c06f297">ANativeActivity_setWindowFlags</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, uint32_t addFlags, uint32_t removeFlags)</td></tr>
-<tr class="separator:gaa1d091ca4a99b0ce570bab1c8c06f297"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga14eaeb6190f266369023b04d8ab9dba7"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga14eaeb6190f266369023b04d8ab9dba7">ANativeActivity_showSoftInput</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, uint32_t flags)</td></tr>
-<tr class="separator:ga14eaeb6190f266369023b04d8ab9dba7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf673d6efea7ce517ef46ff2551b25944"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaf673d6efea7ce517ef46ff2551b25944">ANativeActivity_hideSoftInput</a> (<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, uint32_t flags)</td></tr>
-<tr class="separator:gaf673d6efea7ce517ef46ff2551b25944"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
-Variables</h2></td></tr>
-<tr class="memitem:ga02791d0d490839055169f39fdc905c5e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___native_activity.html#ga569a53bcac3fcedb0189b7c412ebcb22">ANativeActivity_createFunc</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga02791d0d490839055169f39fdc905c5e">ANativeActivity_onCreate</a></td></tr>
-<tr class="separator:ga02791d0d490839055169f39fdc905c5e"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/native__window_8h.jd b/docs/html/ndk/reference/native__window_8h.jd
deleted file mode 100644
index 75f9469..0000000
--- a/docs/html/ndk/reference/native__window_8h.jd
+++ /dev/null
@@ -1,61 +0,0 @@
-page.title=native_window.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#nested-classes">Data Structures</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">native_window.h File Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <<a class="el" href="rect_8h.html">android/rect.h</a>></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga66956d540c2e3709e12156d195e64726"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a></td></tr>
-<tr class="separator:ga66956d540c2e3709e12156d195e64726"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad0983ca473ce36293baf5e51a14c3357"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gad0983ca473ce36293baf5e51a14c3357">ANativeWindow_Buffer</a></td></tr>
-<tr class="separator:gad0983ca473ce36293baf5e51a14c3357"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga94798fdadfbf49a7c658ace669a1d310"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a6a165383340acce0b32c555dd2ac2c01">WINDOW_FORMAT_RGBA_8888</a> = 1,
-<a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310a5f83a97ccf64fc1554c220476e8aaf30">WINDOW_FORMAT_RGBX_8888</a> = 2,
-<a class="el" href="group___native_activity.html#gga94798fdadfbf49a7c658ace669a1d310ab26fa9c38f169263b611a8b757bb0259">WINDOW_FORMAT_RGB_565</a> = 4
- }</td></tr>
-<tr class="separator:ga94798fdadfbf49a7c658ace669a1d310"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga533876b57909243b238927344a6592db"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga533876b57909243b238927344a6592db">ANativeWindow_acquire</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga533876b57909243b238927344a6592db"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae944e98865b902bd924663785d7b0258"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gae944e98865b902bd924663785d7b0258">ANativeWindow_release</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:gae944e98865b902bd924663785d7b0258"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga186f0040c5cb405a63d93889bb9a4ff1"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga186f0040c5cb405a63d93889bb9a4ff1">ANativeWindow_getWidth</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga186f0040c5cb405a63d93889bb9a4ff1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga463ba99f6dee3edc1167a54e1ff7de15"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga463ba99f6dee3edc1167a54e1ff7de15">ANativeWindow_getHeight</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga463ba99f6dee3edc1167a54e1ff7de15"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga9e3a492a8300146b30d864f0ab22bb2e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga9e3a492a8300146b30d864f0ab22bb2e">ANativeWindow_getFormat</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga9e3a492a8300146b30d864f0ab22bb2e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7b0652533998d61e1a3b542485889113"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga7b0652533998d61e1a3b542485889113">ANativeWindow_setBuffersGeometry</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window, int32_t width, int32_t height, int32_t format)</td></tr>
-<tr class="separator:ga7b0652533998d61e1a3b542485889113"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0b0e3b7d442dee83e1a1b42e5b0caee6"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">ANativeWindow_lock</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window, <a class="el" href="struct_a_native_window___buffer.html">ANativeWindow_Buffer</a> *outBuffer, <a class="el" href="struct_a_rect.html">ARect</a> *inOutDirtyBounds)</td></tr>
-<tr class="separator:ga0b0e3b7d442dee83e1a1b42e5b0caee6"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4dc9b687ead9034fbc11bf2d90f203f9"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga4dc9b687ead9034fbc11bf2d90f203f9">ANativeWindow_unlockAndPost</a> (<a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ga4dc9b687ead9034fbc11bf2d90f203f9"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/native__window__jni_8h.jd b/docs/html/ndk/reference/native__window__jni_8h.jd
deleted file mode 100644
index bffbc03..0000000
--- a/docs/html/ndk/reference/native__window__jni_8h.jd
+++ /dev/null
@@ -1,25 +0,0 @@
-page.title=native_window_jni.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">native_window_jni.h File Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <<a class="el" href="native__window_8h.html">android/native_window.h</a>></code><br/>
-<code>#include <jni.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga774d0a87ec496b3940fcddccbc31fd9d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#ga774d0a87ec496b3940fcddccbc31fd9d">ANativeWindow_fromSurface</a> (JNIEnv *env, jobject surface)</td></tr>
-<tr class="separator:ga774d0a87ec496b3940fcddccbc31fd9d"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/nav_f.png b/docs/html/ndk/reference/nav_f.png
deleted file mode 100644
index 5ceae87..0000000
--- a/docs/html/ndk/reference/nav_f.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/nav_g.png b/docs/html/ndk/reference/nav_g.png
deleted file mode 100644
index 2093a23..0000000
--- a/docs/html/ndk/reference/nav_g.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/nav_h.png b/docs/html/ndk/reference/nav_h.png
deleted file mode 100644
index e619809c..0000000
--- a/docs/html/ndk/reference/nav_h.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/obb_8h.jd b/docs/html/ndk/reference/obb_8h.jd
deleted file mode 100644
index a856d4ee..0000000
--- a/docs/html/ndk/reference/obb_8h.jd
+++ /dev/null
@@ -1,45 +0,0 @@
-page.title=obb.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">obb.h File Reference<div class="ingroups"><a class="el" href="group___storage.html">Storage</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <sys/types.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gaa5037fe4c0d785a50fc62ac2de9844c3"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a></td></tr>
-<tr class="separator:gaa5037fe4c0d785a50fc62ac2de9844c3"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gae4d5251432e1a9e6803c0240cc492e18"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___storage.html#ggae4d5251432e1a9e6803c0240cc492e18a33e2ae83b4c25d33a4335dccf1de1c3a">AOBBINFO_OVERLAY</a> = 0x0001
- }</td></tr>
-<tr class="separator:gae4d5251432e1a9e6803c0240cc492e18"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga7beb4f82e3bf9a4b8197917f92ac4d5e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga7beb4f82e3bf9a4b8197917f92ac4d5e">AObbScanner_getObbInfo</a> (const char *filename)</td></tr>
-<tr class="separator:ga7beb4f82e3bf9a4b8197917f92ac4d5e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec5a4428008f545e829486099298031a"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gaec5a4428008f545e829486099298031a">AObbInfo_delete</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:gaec5a4428008f545e829486099298031a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga1ec7eee61541fa5a9b578801a35b9cf3"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga1ec7eee61541fa5a9b578801a35b9cf3">AObbInfo_getPackageName</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:ga1ec7eee61541fa5a9b578801a35b9cf3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gacd8471c6d866cffe4a32f3b5997c782c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gacd8471c6d866cffe4a32f3b5997c782c">AObbInfo_getVersion</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:gacd8471c6d866cffe4a32f3b5997c782c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga68d916570c756da9fd0d9096358300eb"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga68d916570c756da9fd0d9096358300eb">AObbInfo_getFlags</a> (<a class="el" href="group___storage.html#gaa5037fe4c0d785a50fc62ac2de9844c3">AObbInfo</a> *obbInfo)</td></tr>
-<tr class="separator:ga68d916570c756da9fd0d9096358300eb"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/open.png b/docs/html/ndk/reference/open.png
deleted file mode 100644
index 7e740cc..0000000
--- a/docs/html/ndk/reference/open.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/pages.jd b/docs/html/ndk/reference/pages.jd
deleted file mode 100644
index 2d7ece8..0000000
--- a/docs/html/ndk/reference/pages.jd
+++ /dev/null
@@ -1,16 +0,0 @@
-page.title=Related Pages
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="headertitle">
-<div class="title">Related Pages</div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock">Here is a list of all related documentation pages:</div><div class="directory">
-<table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a class="el" href="deprecated.html" target="_self">Deprecated List</a></td><td class="desc"></td></tr>
-</table>
-</div><!-- directory -->
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/rect_8h.jd b/docs/html/ndk/reference/rect_8h.jd
deleted file mode 100644
index 85787b5..0000000
--- a/docs/html/ndk/reference/rect_8h.jd
+++ /dev/null
@@ -1,30 +0,0 @@
-page.title=rect.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#nested-classes">Data Structures</a> |
-<a href="#typedef-members">Typedefs</a> </div>
- <div class="headertitle">
-<div class="title">rect.h File Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <stdint.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_rect.html">ARect</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:gaa984a498f0e146ac57c6022a323423cf"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_rect.html">ARect</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___native_activity.html#gaa984a498f0e146ac57c6022a323423cf">ARect</a></td></tr>
-<tr class="separator:gaa984a498f0e146ac57c6022a323423cf"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/reference_toc.cs b/docs/html/ndk/reference/reference_toc.cs
deleted file mode 100644
index d4e2d6d..0000000
--- a/docs/html/ndk/reference/reference_toc.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-<?cs # Table of contents for Dev Guide.
-
- For each document available in translation, add an localized title to this TOC.
- Do not add localized title for docs not available in translation.
- Below are template spans for adding localized doc titles. Please ensure that
- localized titles are added in the language order specified below.
-?>
-
-<ul id="nav">
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___asset.html"><span class="en">Asset Manager</span></a></div>
- <ul>
- <li><a href="/ndk/reference/asset__manager_8h.html">asset_manager.h</a></li>
- <li><a href="/ndk/reference/asset__manager__jni_8h.html">asset_manager_jni.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___bitmap.html"><span class="en">
- Bitmap</span></a></div>
- <ul>
- <li><a href="/ndk/reference/bitmap_8h.html">bitmap.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___configuration.html"><span class="en">
- Configuration</span></a></div>
- <ul>
- <li><a href="/ndk/reference/configuration_8h.html">configuration.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___input.html"><span class="en">
- Input</span></a></div>
- <ul>
- <li><a href="/ndk/reference/input_8h.html">input.h</a></li>
- <li><a href="/ndk/reference/keycodes_8h.html">keycodes.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___looper.html"><span class="en">
- Looper</span></a></div>
- <ul>
- <li><a href="/ndk/reference/looper_8h.html">looper.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___native_activity.html"><span class="en">
- Native Activity and Window</span></a></div>
- <ul>
- <li><a href="/ndk/reference/native__activity_8h.html">native_activity.h</a></li>
- <li><a href="/ndk/reference/native__window_8h.html">native_window.h</a></li>
- <li><a href="/ndk/reference/native__window__jni_8h.html">native_window.h</a></li>
- <li><a href="/ndk/reference/rect_8h.html">rect.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___sensor.html"><span class="en">
- Sensor</span></a></div>
- <ul>
- <li><a href="/ndk/reference/sensor_8h.html">sensor.h</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="/ndk/reference/group___storage.html"><span class="en">
- Storage Manager</span></a></div>
- <ul>
- <li><a href="/ndk/reference/storage__manager_8h.html">storage_manager.h</a></li>
- <li><a href="/ndk/reference/obb_8h.html">obb.h</a></li>
- </ul>
- </li>
-</ul>
-
-<script type="text/javascript">
-<!--
- buildToggleLists();
- changeNavLang(getLangPref());
-//-->
-</script>
\ No newline at end of file
diff --git a/docs/html/ndk/reference/sensor_8h.jd b/docs/html/ndk/reference/sensor_8h.jd
deleted file mode 100644
index a537f4f..0000000
--- a/docs/html/ndk/reference/sensor_8h.jd
+++ /dev/null
@@ -1,143 +0,0 @@
-page.title=sensor.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#nested-classes">Data Structures</a> |
-<a href="#define-members">Macros</a> |
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">sensor.h File Reference<div class="ingroups"><a class="el" href="group___sensor.html">Sensor</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <sys/types.h></code><br/>
-<code>#include <<a class="el" href="looper_8h.html">android/looper.h</a>></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
-Data Structures</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_vector.html">ASensorVector</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct  </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html">ASensorEvent</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:ga5129cb9e4091fc3474e246d5f950e52b"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga5129cb9e4091fc3474e246d5f950e52b">ASENSOR_STANDARD_GRAVITY</a>   (9.80665f)</td></tr>
-<tr class="separator:ga5129cb9e4091fc3474e246d5f950e52b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf8b57b13c6432bc6136aac0ad3813d63"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaf8b57b13c6432bc6136aac0ad3813d63">ASENSOR_MAGNETIC_FIELD_EARTH_MAX</a>   (60.0f)</td></tr>
-<tr class="separator:gaf8b57b13c6432bc6136aac0ad3813d63"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4423a712e27b6d5a57d138796892886d"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga4423a712e27b6d5a57d138796892886d">ASENSOR_MAGNETIC_FIELD_EARTH_MIN</a>   (30.0f)</td></tr>
-<tr class="separator:ga4423a712e27b6d5a57d138796892886d"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga207e807f9e18271f6a763e57232b409f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga207e807f9e18271f6a763e57232b409f">ASensorVector</a></td></tr>
-<tr class="separator:ga207e807f9e18271f6a763e57232b409f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0378daec23b2d8a70438ef7c3912475f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga0378daec23b2d8a70438ef7c3912475f">AMetaDataEvent</a></td></tr>
-<tr class="separator:ga0378daec23b2d8a70438ef7c3912475f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga24acc545b908dd24cadc44c5e0760b3b"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga24acc545b908dd24cadc44c5e0760b3b">AUncalibratedEvent</a></td></tr>
-<tr class="separator:ga24acc545b908dd24cadc44c5e0760b3b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae85b6eac76abe74e6e53d78bb3a4858c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gae85b6eac76abe74e6e53d78bb3a4858c">AHeartRateEvent</a></td></tr>
-<tr class="separator:gae85b6eac76abe74e6e53d78bb3a4858c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga6bb167c45f0ef0a94d8f178d227e781f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga6bb167c45f0ef0a94d8f178d227e781f">ASensorEvent</a></td></tr>
-<tr class="separator:ga6bb167c45f0ef0a94d8f178d227e781f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaef620baab9b276ab8f914ae77babc349"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a></td></tr>
-<tr class="separator:gaef620baab9b276ab8f914ae77babc349"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa9448106d6d463f4cc5dded7c914e7ae"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a></td></tr>
-<tr class="separator:gaa9448106d6d463f4cc5dded7c914e7ae"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga93b28b7ce5e9b6d2ebc5b574cd5f4710"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a></td></tr>
-<tr class="separator:ga93b28b7ce5e9b6d2ebc5b574cd5f4710"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafec8dd682458c750a5f0f913a0f162ce"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a></td></tr>
-<tr class="separator:gafec8dd682458c750a5f0f913a0f162ce"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga26ff51817e8b320a631b3bf4ed378d58"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="group___sensor.html#gafec8dd682458c750a5f0f913a0f162ce">ASensorRef</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a></td></tr>
-<tr class="separator:ga26ff51817e8b320a631b3bf4ed378d58"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:ga7ff5f2dff38e7639981794c43dc9167b"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167bad72017f34c12971593a8cb14f4f254df">ASENSOR_TYPE_ACCELEROMETER</a> = 1,
-<a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba3b31509a3efebafb413e78f5ec9ae0e8">ASENSOR_TYPE_MAGNETIC_FIELD</a> = 2,
-<a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba80e9827f6c3ded009f354dc7078a2c68">ASENSOR_TYPE_GYROSCOPE</a> = 4,
-<a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba105331b6dea6f08e0d8fe3b736f8c174">ASENSOR_TYPE_LIGHT</a> = 5,
-<br/>
-  <a class="el" href="group___sensor.html#gga7ff5f2dff38e7639981794c43dc9167ba0c6a2e526ed2e4442b3843976f906932">ASENSOR_TYPE_PROXIMITY</a> = 8
-<br/>
- }</td></tr>
-<tr class="separator:ga7ff5f2dff38e7639981794c43dc9167b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaabfcbcb5ac86a1edac4035264bc7d2b8"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae5d0475bd9491c4232a09afc81fa283d">ASENSOR_STATUS_NO_CONTACT</a> = -1,
-<a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ae8e43df50b7b85ed54f22c40f2cd748e">ASENSOR_STATUS_UNRELIABLE</a> = 0,
-<a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a5f306f3d45a19573539462e4c813edc0">ASENSOR_STATUS_ACCURACY_LOW</a> = 1,
-<a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8ad7e9379a4f36a42f2659cd7aec214f2d">ASENSOR_STATUS_ACCURACY_MEDIUM</a> = 2,
-<br/>
-  <a class="el" href="group___sensor.html#ggaabfcbcb5ac86a1edac4035264bc7d2b8a2df5fb4e8b684e6a801a4aff9f50ba13">ASENSOR_STATUS_ACCURACY_HIGH</a> = 3
-<br/>
- }</td></tr>
-<tr class="separator:gaabfcbcb5ac86a1edac4035264bc7d2b8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga5d76b81b0ad4c19007a781d4edb8181f"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8a64337fcb7e338d487dc3edc873df1c">AREPORTING_MODE_CONTINUOUS</a> = 0,
-<a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa8542165ae195bf5784cdd9ba66bd2ab5">AREPORTING_MODE_ON_CHANGE</a> = 1,
-<a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181fa002273a1ab874159a38a7e3f6bb6a7bb">AREPORTING_MODE_ONE_SHOT</a> = 2,
-<a class="el" href="group___sensor.html#gga5d76b81b0ad4c19007a781d4edb8181faa2d29656b35889c4c23318982e847ae7">AREPORTING_MODE_SPECIAL_TRIGGER</a> = 3
- }</td></tr>
-<tr class="separator:ga5d76b81b0ad4c19007a781d4edb8181f"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:gaa438fdaf34783a89d139f0a56d2692cd"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaa438fdaf34783a89d139f0a56d2692cd">ASensorManager_getInstance</a> ()</td></tr>
-<tr class="separator:gaa438fdaf34783a89d139f0a56d2692cd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga645be938627498ab2b60d94c562204bd"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga645be938627498ab2b60d94c562204bd">ASensorManager_getSensorList</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, <a class="el" href="group___sensor.html#ga26ff51817e8b320a631b3bf4ed378d58">ASensorList</a> *list)</td></tr>
-<tr class="separator:ga645be938627498ab2b60d94c562204bd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf4880d87e01f5e2d4a9b8403e4047445"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaf4880d87e01f5e2d4a9b8403e4047445">ASensorManager_getDefaultSensor</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, int type)</td></tr>
-<tr class="separator:gaf4880d87e01f5e2d4a9b8403e4047445"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4313457c0e82f4afa77ef13860629633"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga4313457c0e82f4afa77ef13860629633">ASensorManager_getDefaultSensorEx</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, int type, bool wakeUp)</td></tr>
-<tr class="separator:ga4313457c0e82f4afa77ef13860629633"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gac46f8b28bcc7a846dea9d841cab0a67b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gac46f8b28bcc7a846dea9d841cab0a67b">ASensorManager_createEventQueue</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, <a class="el" href="group___looper.html#gadb10521a80138b777ba1bc2ca74d4af5">ALooper</a> *looper, int ident, <a class="el" href="group___looper.html#ga410b184b4e48302c439e36c8ce0a7a89">ALooper_callbackFunc</a> callback, void *data)</td></tr>
-<tr class="separator:gac46f8b28bcc7a846dea9d841cab0a67b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf35624037785cdea1e7fe9e0a73fc5e1"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaf35624037785cdea1e7fe9e0a73fc5e1">ASensorManager_destroyEventQueue</a> (<a class="el" href="group___sensor.html#gaef620baab9b276ab8f914ae77babc349">ASensorManager</a> *manager, <a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue)</td></tr>
-<tr class="separator:gaf35624037785cdea1e7fe9e0a73fc5e1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga48a8379cf9de9b09a71a00f8a3699499"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga48a8379cf9de9b09a71a00f8a3699499">ASensorEventQueue_enableSensor</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga48a8379cf9de9b09a71a00f8a3699499"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga03852b813887ec236a34c4aef0df4b68"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga03852b813887ec236a34c4aef0df4b68">ASensorEventQueue_disableSensor</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga03852b813887ec236a34c4aef0df4b68"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaa6e89b6d69dc3e07f2d7e72e81ec7937"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaa6e89b6d69dc3e07f2d7e72e81ec7937">ASensorEventQueue_setEventRate</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor, int32_t usec)</td></tr>
-<tr class="separator:gaa6e89b6d69dc3e07f2d7e72e81ec7937"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga79c9d6264fe81d4e30800f826db72913"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga79c9d6264fe81d4e30800f826db72913">ASensorEventQueue_hasEvents</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue)</td></tr>
-<tr class="separator:ga79c9d6264fe81d4e30800f826db72913"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gab3d4354fd0d3ceb5fa97c129b024a18a"><td class="memItemLeft" align="right" valign="top">ssize_t </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gab3d4354fd0d3ceb5fa97c129b024a18a">ASensorEventQueue_getEvents</a> (<a class="el" href="group___sensor.html#gaa9448106d6d463f4cc5dded7c914e7ae">ASensorEventQueue</a> *queue, <a class="el" href="struct_a_sensor_event.html">ASensorEvent</a> *events, size_t count)</td></tr>
-<tr class="separator:gab3d4354fd0d3ceb5fa97c129b024a18a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga52f4b22990c70df0784b9ccf23314fae"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga52f4b22990c70df0784b9ccf23314fae">ASensor_getName</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga52f4b22990c70df0784b9ccf23314fae"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gafaf467fc71f7adba537a90f166e3320d"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gafaf467fc71f7adba537a90f166e3320d">ASensor_getVendor</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gafaf467fc71f7adba537a90f166e3320d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga93962747ab3c7d2b609f97af26fc0230"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga93962747ab3c7d2b609f97af26fc0230">ASensor_getType</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga93962747ab3c7d2b609f97af26fc0230"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga3da2930dd866cf1f76da6bc39e578a46"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga3da2930dd866cf1f76da6bc39e578a46">ASensor_getResolution</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga3da2930dd866cf1f76da6bc39e578a46"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gacb6e021757c07344b58742611eaf68e7"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gacb6e021757c07344b58742611eaf68e7">ASensor_getMinDelay</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gacb6e021757c07344b58742611eaf68e7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gae9969580eda319926a677a6937c7afb1"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gae9969580eda319926a677a6937c7afb1">ASensor_getFifoMaxEventCount</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gae9969580eda319926a677a6937c7afb1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaec7084c6a9d4d85f87c95a70511c5f53"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gaec7084c6a9d4d85f87c95a70511c5f53">ASensor_getFifoReservedEventCount</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gaec7084c6a9d4d85f87c95a70511c5f53"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gabee3eb65390fc75a639c59d653af3591"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#gabee3eb65390fc75a639c59d653af3591">ASensor_getStringType</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:gabee3eb65390fc75a639c59d653af3591"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga99e56b84cf421788c27998da8eab7e39"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga99e56b84cf421788c27998da8eab7e39">ASensor_getReportingMode</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga99e56b84cf421788c27998da8eab7e39"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga0ff4118e400bedac62be6b79e9e0f924"><td class="memItemLeft" align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="group___sensor.html#ga0ff4118e400bedac62be6b79e9e0f924">ASensor_isWakeUpSensor</a> (<a class="el" href="group___sensor.html#ga93b28b7ce5e9b6d2ebc5b574cd5f4710">ASensor</a> const *sensor)</td></tr>
-<tr class="separator:ga0ff4118e400bedac62be6b79e9e0f924"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/storage__manager_8h.jd b/docs/html/ndk/reference/storage__manager_8h.jd
deleted file mode 100644
index 6048d84..0000000
--- a/docs/html/ndk/reference/storage__manager_8h.jd
+++ /dev/null
@@ -1,59 +0,0 @@
-page.title=storage_manager.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#typedef-members">Typedefs</a> |
-<a href="#enum-members">Enumerations</a> |
-<a href="#func-members">Functions</a> </div>
- <div class="headertitle">
-<div class="title">storage_manager.h File Reference<div class="ingroups"><a class="el" href="group___storage.html">Storage</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><code>#include <stdint.h></code><br/>
-</div><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
-Typedefs</h2></td></tr>
-<tr class="memitem:ga419f40803228bca62e32beb911ab28e2"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a></td></tr>
-<tr class="separator:ga419f40803228bca62e32beb911ab28e2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gaf077d06586fa4c0212baa2fe458b9617"><td class="memItemLeft" align="right" valign="top">typedef void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> )(const char *filename, const int32_t state, void *data)</td></tr>
-<tr class="separator:gaf077d06586fa4c0212baa2fe458b9617"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gae8a3b6a5d0d3244ed73924ab2421a0d0"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2a9c420e6008c108a7198fd861c042d5">AOBB_STATE_MOUNTED</a> = 1,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a6710bb5b68cfc115eedcde2aafd8a667">AOBB_STATE_UNMOUNTED</a> = 2,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a50642881107d6673aace1494a5d6fce2">AOBB_STATE_ERROR_INTERNAL</a> = 20,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a324da2b8fea5875339d442d1f2d0b45b">AOBB_STATE_ERROR_COULD_NOT_MOUNT</a> = 21,
-<br/>
-  <a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a1f2b51b53fc57b57a9967f6ce0c88dbe">AOBB_STATE_ERROR_COULD_NOT_UNMOUNT</a> = 22,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a3ce8539aa8b531c9de1d16041322d7a8">AOBB_STATE_ERROR_NOT_MOUNTED</a> = 23,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a8b074af151167a965a550b9829fafb37">AOBB_STATE_ERROR_ALREADY_MOUNTED</a> = 24,
-<a class="el" href="group___storage.html#ggae8a3b6a5d0d3244ed73924ab2421a0d0a2467a4b6a634680e12c288a7790ff66c">AOBB_STATE_ERROR_PERMISSION_DENIED</a> = 25
-<br/>
- }</td></tr>
-<tr class="separator:gae8a3b6a5d0d3244ed73924ab2421a0d0"><td class="memSeparator" colspan="2"> </td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
-Functions</h2></td></tr>
-<tr class="memitem:ga1c21ed9e0848fcfc03547c95eeb48877"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga1c21ed9e0848fcfc03547c95eeb48877">AStorageManager_new</a> ()</td></tr>
-<tr class="separator:ga1c21ed9e0848fcfc03547c95eeb48877"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga184c06dd9cec0f21db138167d6b331ed"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga184c06dd9cec0f21db138167d6b331ed">AStorageManager_delete</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr)</td></tr>
-<tr class="separator:ga184c06dd9cec0f21db138167d6b331ed"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga61bebaf43e57b4b7f57e7a24a62e9e3d"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga61bebaf43e57b4b7f57e7a24a62e9e3d">AStorageManager_mountObb</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename, const char *key, <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> cb, void *data)</td></tr>
-<tr class="separator:ga61bebaf43e57b4b7f57e7a24a62e9e3d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga4c32c8d2c780016fa36097d833b57809"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga4c32c8d2c780016fa36097d833b57809">AStorageManager_unmountObb</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename, const int force, <a class="el" href="group___storage.html#gaf077d06586fa4c0212baa2fe458b9617">AStorageManager_obbCallbackFunc</a> cb, void *data)</td></tr>
-<tr class="separator:ga4c32c8d2c780016fa36097d833b57809"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ga7572f2c650fc16cce1b0ab94e913a1ba"><td class="memItemLeft" align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#ga7572f2c650fc16cce1b0ab94e913a1ba">AStorageManager_isObbMounted</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename)</td></tr>
-<tr class="separator:ga7572f2c650fc16cce1b0ab94e913a1ba"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:gad5c90305d627e0c768da37cb3e9f08c4"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="group___storage.html#gad5c90305d627e0c768da37cb3e9f08c4">AStorageManager_getMountedObbPath</a> (<a class="el" href="group___storage.html#ga419f40803228bca62e32beb911ab28e2">AStorageManager</a> *mgr, const char *filename)</td></tr>
-<tr class="separator:gad5c90305d627e0c768da37cb3e9f08c4"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_heart_rate_event.jd b/docs/html/ndk/reference/struct_a_heart_rate_event.jd
deleted file mode 100644
index 1cd2a2d..0000000
--- a/docs/html/ndk/reference/struct_a_heart_rate_event.jd
+++ /dev/null
@@ -1,51 +0,0 @@
-page.title=AHeartRateEvent Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">AHeartRateEvent Struct Reference<div class="ingroups"><a class="el" href="group___sensor.html">Sensor</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <sensor.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:ab0560092cbaa233e74bb0d543a85965d"><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_heart_rate_event.html#ab0560092cbaa233e74bb0d543a85965d">bpm</a></td></tr>
-<tr class="separator:ab0560092cbaa233e74bb0d543a85965d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a555c2084e8436de01dc76a23590e8824"><td class="memItemLeft" align="right" valign="top">int8_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_heart_rate_event.html#a555c2084e8436de01dc76a23590e8824">status</a></td></tr>
-<tr class="separator:a555c2084e8436de01dc76a23590e8824"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="ab0560092cbaa233e74bb0d543a85965d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float bpm</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a555c2084e8436de01dc76a23590e8824"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int8_t status</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="sensor_8h.html">sensor.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_meta_data_event.jd b/docs/html/ndk/reference/struct_a_meta_data_event.jd
deleted file mode 100644
index 352b5ba..0000000
--- a/docs/html/ndk/reference/struct_a_meta_data_event.jd
+++ /dev/null
@@ -1,51 +0,0 @@
-page.title=AMetaDataEvent Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">AMetaDataEvent Struct Reference<div class="ingroups"><a class="el" href="group___sensor.html">Sensor</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <sensor.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a397e31e246d23c1be3fa82ca4af8b930"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_meta_data_event.html#a397e31e246d23c1be3fa82ca4af8b930">what</a></td></tr>
-<tr class="separator:a397e31e246d23c1be3fa82ca4af8b930"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a470f19badf179fe205462c060e5175b4"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_meta_data_event.html#a470f19badf179fe205462c060e5175b4">sensor</a></td></tr>
-<tr class="separator:a470f19badf179fe205462c060e5175b4"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a470f19badf179fe205462c060e5175b4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t sensor</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a397e31e246d23c1be3fa82ca4af8b930"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t what</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="sensor_8h.html">sensor.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_native_activity.jd b/docs/html/ndk/reference/struct_a_native_activity.jd
deleted file mode 100644
index 6d8124b..0000000
--- a/docs/html/ndk/reference/struct_a_native_activity.jd
+++ /dev/null
@@ -1,177 +0,0 @@
-page.title=ANativeActivity Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">ANativeActivity Struct Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <native_activity.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:af96995a13e77baf0d71c37d20c79ad51"><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#af96995a13e77baf0d71c37d20c79ad51">callbacks</a></td></tr>
-<tr class="separator:af96995a13e77baf0d71c37d20c79ad51"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a5e163c28566d4563eafeabd7dcab7eeb"><td class="memItemLeft" align="right" valign="top">JavaVM * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#a5e163c28566d4563eafeabd7dcab7eeb">vm</a></td></tr>
-<tr class="separator:a5e163c28566d4563eafeabd7dcab7eeb"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ae6f0d0cd46e56b7e299b489cb60dd27e"><td class="memItemLeft" align="right" valign="top">JNIEnv * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#ae6f0d0cd46e56b7e299b489cb60dd27e">env</a></td></tr>
-<tr class="separator:ae6f0d0cd46e56b7e299b489cb60dd27e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ab10b01c3c23c4ddb9d2ddadd71b03c94"><td class="memItemLeft" align="right" valign="top">jobject </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#ab10b01c3c23c4ddb9d2ddadd71b03c94">clazz</a></td></tr>
-<tr class="separator:ab10b01c3c23c4ddb9d2ddadd71b03c94"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aa52947cdd1476b95e858d83c0f5b0220"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#aa52947cdd1476b95e858d83c0f5b0220">internalDataPath</a></td></tr>
-<tr class="separator:aa52947cdd1476b95e858d83c0f5b0220"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a2a61553b2f660ea8b57fcc2b495e109f"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#a2a61553b2f660ea8b57fcc2b495e109f">externalDataPath</a></td></tr>
-<tr class="separator:a2a61553b2f660ea8b57fcc2b495e109f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a40b4b64be7ecfac23751618313eb610d"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#a40b4b64be7ecfac23751618313eb610d">sdkVersion</a></td></tr>
-<tr class="separator:a40b4b64be7ecfac23751618313eb610d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ae1b90392cd257d16fd66a85bac1b08cd"><td class="memItemLeft" align="right" valign="top">void * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#ae1b90392cd257d16fd66a85bac1b08cd">instance</a></td></tr>
-<tr class="separator:ae1b90392cd257d16fd66a85bac1b08cd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a0f76f065768b8f896ce47a3089fb438d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#a0f76f065768b8f896ce47a3089fb438d">assetManager</a></td></tr>
-<tr class="separator:a0f76f065768b8f896ce47a3089fb438d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a0aff284eb9ab311d81f20955258798cf"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity.html#a0aff284eb9ab311d81f20955258798cf">obbPath</a></td></tr>
-<tr class="separator:a0aff284eb9ab311d81f20955258798cf"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p>This structure defines the native side of an android.app.NativeActivity. It is created by the framework, and handed to the application's native code as it is being launched. </p>
-</div><h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a0f76f065768b8f896ce47a3089fb438d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="group___asset.html#ga90c459935e76acf809b9ec90d1872771">AAssetManager</a>* assetManager</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Pointer to the Asset Manager instance for the application. The application uses this to access binary assets bundled inside its own .apk file. </p>
-
-</div>
-</div>
-<a class="anchor" id="af96995a13e77baf0d71c37d20c79ad51"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">struct <a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a>* callbacks</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Pointer to the callback function table of the native application. You can set the functions here to your own callbacks. The callbacks pointer itself here should not be changed; it is allocated and managed for you by the framework. </p>
-
-</div>
-</div>
-<a class="anchor" id="ab10b01c3c23c4ddb9d2ddadd71b03c94"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">jobject clazz</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The NativeActivity object handle.</p>
-<p>IMPORTANT NOTE: This member is mis-named. It should really be named 'activity' instead of 'clazz', since it's a reference to the NativeActivity instance created by the system for you.</p>
-<p>We unfortunately cannot change this without breaking NDK source-compatibility. </p>
-
-</div>
-</div>
-<a class="anchor" id="ae6f0d0cd46e56b7e299b489cb60dd27e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">JNIEnv* env</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>JNI context for the main thread of the app. Note that this field can ONLY be used from the main thread of the process; that is, the thread that calls into the <a class="el" href="struct_a_native_activity_callbacks.html">ANativeActivityCallbacks</a>. </p>
-
-</div>
-</div>
-<a class="anchor" id="a2a61553b2f660ea8b57fcc2b495e109f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* externalDataPath</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Path to this application's external (removable/mountable) data directory. </p>
-
-</div>
-</div>
-<a class="anchor" id="ae1b90392cd257d16fd66a85bac1b08cd"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void* instance</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>This is the native instance of the application. It is not used by the framework, but can be set by the application to its own instance state. </p>
-
-</div>
-</div>
-<a class="anchor" id="aa52947cdd1476b95e858d83c0f5b0220"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* internalDataPath</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Path to this application's internal data directory. </p>
-
-</div>
-</div>
-<a class="anchor" id="a0aff284eb9ab311d81f20955258798cf"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">const char* obbPath</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Available starting with Honeycomb: path to the directory containing the application's OBB files (if any). If the app doesn't have any OBB files, this directory may not exist. </p>
-
-</div>
-</div>
-<a class="anchor" id="a40b4b64be7ecfac23751618313eb610d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t sdkVersion</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The platform's SDK version code. </p>
-
-</div>
-</div>
-<a class="anchor" id="a5e163c28566d4563eafeabd7dcab7eeb"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">JavaVM* vm</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The global handle on the process's Java VM. </p>
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="native__activity_8h.html">native_activity.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_native_activity_callbacks.jd b/docs/html/ndk/reference/struct_a_native_activity_callbacks.jd
deleted file mode 100644
index 45b8e5e..0000000
--- a/docs/html/ndk/reference/struct_a_native_activity_callbacks.jd
+++ /dev/null
@@ -1,265 +0,0 @@
-page.title=ANativeActivityCallbacks Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">ANativeActivityCallbacks Struct Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <native_activity.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:acda344fd29c2018640a85a585317d92c"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#acda344fd29c2018640a85a585317d92c">onStart</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:acda344fd29c2018640a85a585317d92c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ac2c85491a68e6dece3d82782c1254e73"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#ac2c85491a68e6dece3d82782c1254e73">onResume</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:ac2c85491a68e6dece3d82782c1254e73"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a16a270d24a484a376e28bc6c48fc22a1"><td class="memItemLeft" align="right" valign="top">void *(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a16a270d24a484a376e28bc6c48fc22a1">onSaveInstanceState</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, size_t *outSize)</td></tr>
-<tr class="separator:a16a270d24a484a376e28bc6c48fc22a1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aee8a4dcff234b94d0bf0bc85efea42c2"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#aee8a4dcff234b94d0bf0bc85efea42c2">onPause</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:aee8a4dcff234b94d0bf0bc85efea42c2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:adefa99d16d11d21bb8a83ba426047605"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#adefa99d16d11d21bb8a83ba426047605">onStop</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:adefa99d16d11d21bb8a83ba426047605"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a45598ebed3d15847b4f97acb9e15076e"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a45598ebed3d15847b4f97acb9e15076e">onDestroy</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:a45598ebed3d15847b4f97acb9e15076e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a620ef54556eac0b2b28d7e6d0644ee4a"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a620ef54556eac0b2b28d7e6d0644ee4a">onWindowFocusChanged</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, int hasFocus)</td></tr>
-<tr class="separator:a620ef54556eac0b2b28d7e6d0644ee4a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ac997f07e53ba58179a2133e86e5cbd31"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#ac997f07e53ba58179a2133e86e5cbd31">onNativeWindowCreated</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ac997f07e53ba58179a2133e86e5cbd31"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ab7bd120b8816508561126308f699f116"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#ab7bd120b8816508561126308f699f116">onNativeWindowResized</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:ab7bd120b8816508561126308f699f116"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a3cad4792af363b9a40599d09afeab56c"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a3cad4792af363b9a40599d09afeab56c">onNativeWindowRedrawNeeded</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:a3cad4792af363b9a40599d09afeab56c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a150442c0611e8ce24a32a7c805e7c9db"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a150442c0611e8ce24a32a7c805e7c9db">onNativeWindowDestroyed</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td></tr>
-<tr class="separator:a150442c0611e8ce24a32a7c805e7c9db"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a17b41ec9bb8b0b9e42d1e269a62a4d59"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a17b41ec9bb8b0b9e42d1e269a62a4d59">onInputQueueCreated</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td></tr>
-<tr class="separator:a17b41ec9bb8b0b9e42d1e269a62a4d59"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a82675193f867bc64180016923b0bb129"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a82675193f867bc64180016923b0bb129">onInputQueueDestroyed</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td></tr>
-<tr class="separator:a82675193f867bc64180016923b0bb129"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a61d30a43b3c77b6047afe951706f6a1e"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a61d30a43b3c77b6047afe951706f6a1e">onContentRectChanged</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, const <a class="el" href="struct_a_rect.html">ARect</a> *rect)</td></tr>
-<tr class="separator:a61d30a43b3c77b6047afe951706f6a1e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a2926b45334319089e4e25fbc86d74c3f"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#a2926b45334319089e4e25fbc86d74c3f">onConfigurationChanged</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:a2926b45334319089e4e25fbc86d74c3f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aac61f647cbd971321c692a74a1136f67"><td class="memItemLeft" align="right" valign="top">void(* </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_activity_callbacks.html#aac61f647cbd971321c692a74a1136f67">onLowMemory</a> )(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td></tr>
-<tr class="separator:aac61f647cbd971321c692a74a1136f67"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p>These are the callbacks the framework makes into a native application. All of these callbacks happen on the main thread of the application. By default, all callbacks are NULL; set to a pointer to your own function to have it called. </p>
-</div><h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a2926b45334319089e4e25fbc86d74c3f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onConfigurationChanged)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The current device AConfiguration has changed. The new configuration can be retrieved from assetManager. </p>
-
-</div>
-</div>
-<a class="anchor" id="a61d30a43b3c77b6047afe951706f6a1e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onContentRectChanged)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, const <a class="el" href="struct_a_rect.html">ARect</a> *rect)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The rectangle in the window in which content should be placed has changed. </p>
-
-</div>
-</div>
-<a class="anchor" id="a45598ebed3d15847b4f97acb9e15076e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onDestroy)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>NativeActivity is being destroyed. See Java documentation for Activity.onDestroy() for more information. </p>
-
-</div>
-</div>
-<a class="anchor" id="a17b41ec9bb8b0b9e42d1e269a62a4d59"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onInputQueueCreated)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The input queue for this native activity's window has been created. You can use the given input queue to start retrieving input events. </p>
-
-</div>
-</div>
-<a class="anchor" id="a82675193f867bc64180016923b0bb129"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onInputQueueDestroyed)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___input.html#ga21d8182651f4b61ae558560023e8339c">AInputQueue</a> *queue)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The input queue for this native activity's window is being destroyed. You should no longer try to reference this object upon returning from this function. </p>
-
-</div>
-</div>
-<a class="anchor" id="aac61f647cbd971321c692a74a1136f67"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onLowMemory)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The system is running low on memory. Use this callback to release resources you do not need, to help the system avoid killing more important processes. </p>
-
-</div>
-</div>
-<a class="anchor" id="ac997f07e53ba58179a2133e86e5cbd31"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onNativeWindowCreated)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The drawing window for this native activity has been created. You can use the given native window object to start drawing. </p>
-
-</div>
-</div>
-<a class="anchor" id="a150442c0611e8ce24a32a7c805e7c9db"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onNativeWindowDestroyed)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The drawing window for this native activity is going to be destroyed. You MUST ensure that you do not touch the window object after returning from this function: in the common case of drawing to the window from another thread, that means the implementation of this callback must properly synchronize with the other thread to stop its drawing before returning from here. </p>
-
-</div>
-</div>
-<a class="anchor" id="a3cad4792af363b9a40599d09afeab56c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onNativeWindowRedrawNeeded)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The drawing window for this native activity needs to be redrawn. To avoid transient artifacts during screen changes (such resizing after rotation), applications should not return from this function until they have finished drawing their window in its current state. </p>
-
-</div>
-</div>
-<a class="anchor" id="ab7bd120b8816508561126308f699f116"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onNativeWindowResized)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, <a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> *window)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The drawing window for this native activity has been resized. You should retrieve the new size from the window and ensure that your rendering in it now matches. </p>
-
-</div>
-</div>
-<a class="anchor" id="aee8a4dcff234b94d0bf0bc85efea42c2"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onPause)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>NativeActivity has paused. See Java documentation for Activity.onPause() for more information. </p>
-
-</div>
-</div>
-<a class="anchor" id="ac2c85491a68e6dece3d82782c1254e73"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onResume)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>NativeActivity has resumed. See Java documentation for Activity.onResume() for more information. </p>
-
-</div>
-</div>
-<a class="anchor" id="a16a270d24a484a376e28bc6c48fc22a1"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void*(* onSaveInstanceState)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, size_t *outSize)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Framework is asking NativeActivity to save its current instance state. See Java documentation for Activity.onSaveInstanceState() for more information. The returned pointer needs to be created with malloc(); the framework will call free() on it for you. You also must fill in outSize with the number of bytes in the allocation. Note that the saved state will be persisted, so it can not contain any active entities (pointers to memory, file descriptors, etc). </p>
-
-</div>
-</div>
-<a class="anchor" id="acda344fd29c2018640a85a585317d92c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onStart)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>NativeActivity has started. See Java documentation for Activity.onStart() for more information. </p>
-
-</div>
-</div>
-<a class="anchor" id="adefa99d16d11d21bb8a83ba426047605"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onStop)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>NativeActivity has stopped. See Java documentation for Activity.onStop() for more information. </p>
-
-</div>
-</div>
-<a class="anchor" id="a620ef54556eac0b2b28d7e6d0644ee4a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void(* onWindowFocusChanged)(<a class="el" href="struct_a_native_activity.html">ANativeActivity</a> *activity, int hasFocus)</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Focus has changed in this NativeActivity's window. This is often used, for example, to pause a game when it loses input focus. </p>
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="native__activity_8h.html">native_activity.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_native_window___buffer.jd b/docs/html/ndk/reference/struct_a_native_window___buffer.jd
deleted file mode 100644
index a2008fd..0000000
--- a/docs/html/ndk/reference/struct_a_native_window___buffer.jd
+++ /dev/null
@@ -1,110 +0,0 @@
-page.title=ANativeWindow_Buffer Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">ANativeWindow_Buffer Struct Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <native_window.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a395d15e7c2b09961c1bfd1da6179b64c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html#a395d15e7c2b09961c1bfd1da6179b64c">width</a></td></tr>
-<tr class="separator:a395d15e7c2b09961c1bfd1da6179b64c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a5d8006e753a3e76ff637a4e092bbed71"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html#a5d8006e753a3e76ff637a4e092bbed71">height</a></td></tr>
-<tr class="separator:a5d8006e753a3e76ff637a4e092bbed71"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a4438e3445d33be6d33b2c0dbe9c2e0d7"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html#a4438e3445d33be6d33b2c0dbe9c2e0d7">stride</a></td></tr>
-<tr class="separator:a4438e3445d33be6d33b2c0dbe9c2e0d7"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a49d503b84d084937e3ceeda9f0b4659e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html#a49d503b84d084937e3ceeda9f0b4659e">format</a></td></tr>
-<tr class="separator:a49d503b84d084937e3ceeda9f0b4659e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a089d8e968fac54a9e45f059b8b78cf9b"><td class="memItemLeft" align="right" valign="top">void * </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html#a089d8e968fac54a9e45f059b8b78cf9b">bits</a></td></tr>
-<tr class="separator:a089d8e968fac54a9e45f059b8b78cf9b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a60cc5aad4013157e2e7434d6de450656"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_native_window___buffer.html#a60cc5aad4013157e2e7434d6de450656">reserved</a> [6]</td></tr>
-<tr class="separator:a60cc5aad4013157e2e7434d6de450656"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p><a class="el" href="group___native_activity.html#ga66956d540c2e3709e12156d195e64726">ANativeWindow</a> is a struct that represents a windows buffer.</p>
-<p>A pointer can be obtained using <a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">ANativeWindow_lock()</a>. </p>
-</div><h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a089d8e968fac54a9e45f059b8b78cf9b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">void* bits</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a49d503b84d084937e3ceeda9f0b4659e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t format</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a5d8006e753a3e76ff637a4e092bbed71"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t height</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a60cc5aad4013157e2e7434d6de450656"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint32_t reserved[6]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a4438e3445d33be6d33b2c0dbe9c2e0d7"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t stride</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a395d15e7c2b09961c1bfd1da6179b64c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t width</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="native__window_8h.html">native_window.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_rect.jd b/docs/html/ndk/reference/struct_a_rect.jd
deleted file mode 100644
index 4b9bb67..0000000
--- a/docs/html/ndk/reference/struct_a_rect.jd
+++ /dev/null
@@ -1,86 +0,0 @@
-page.title=ARect Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">ARect Struct Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <rect.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a9ee4ce87784b0ebeaadce132ce7d421f"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_rect.html#a9ee4ce87784b0ebeaadce132ce7d421f">left</a></td></tr>
-<tr class="separator:a9ee4ce87784b0ebeaadce132ce7d421f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ad07137116129d873220209ea65f9d3d4"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_rect.html#ad07137116129d873220209ea65f9d3d4">top</a></td></tr>
-<tr class="separator:ad07137116129d873220209ea65f9d3d4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a3d3a4d6bf8bc6c866fa737e11590cc4e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_rect.html#a3d3a4d6bf8bc6c866fa737e11590cc4e">right</a></td></tr>
-<tr class="separator:a3d3a4d6bf8bc6c866fa737e11590cc4e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a4479860c72ca8e96ac4fb1cc149dd71b"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_rect.html#a4479860c72ca8e96ac4fb1cc149dd71b">bottom</a></td></tr>
-<tr class="separator:a4479860c72ca8e96ac4fb1cc149dd71b"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p><a class="el" href="struct_a_rect.html">ARect</a> is a struct that represents a rectangular window area.</p>
-<p>It is used with <a class="el" href="struct_a_native_activity_callbacks.html#a61d30a43b3c77b6047afe951706f6a1e">ANativeActivityCallbacks::onContentRectChanged</a> event callback and <a class="el" href="group___native_activity.html#ga0b0e3b7d442dee83e1a1b42e5b0caee6">ANativeWindow_lock()</a> function. </p>
-</div><h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a4479860c72ca8e96ac4fb1cc149dd71b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t bottom</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>bottom position </p>
-
-</div>
-</div>
-<a class="anchor" id="a9ee4ce87784b0ebeaadce132ce7d421f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t left</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>left position </p>
-
-</div>
-</div>
-<a class="anchor" id="a3d3a4d6bf8bc6c866fa737e11590cc4e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t right</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>left position </p>
-
-</div>
-</div>
-<a class="anchor" id="ad07137116129d873220209ea65f9d3d4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t top</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>top position </p>
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="rect_8h.html">rect.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_sensor_event.jd b/docs/html/ndk/reference/struct_a_sensor_event.jd
deleted file mode 100644
index 3c6e49d..0000000
--- a/docs/html/ndk/reference/struct_a_sensor_event.jd
+++ /dev/null
@@ -1,364 +0,0 @@
-page.title=ASensorEvent Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">ASensorEvent Struct Reference<div class="ingroups"><a class="el" href="group___sensor.html">Sensor</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <sensor.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a67fae7dd1de9edce3656ed214d20377f"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a67fae7dd1de9edce3656ed214d20377f">version</a></td></tr>
-<tr class="separator:a67fae7dd1de9edce3656ed214d20377f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a470f19badf179fe205462c060e5175b4"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a470f19badf179fe205462c060e5175b4">sensor</a></td></tr>
-<tr class="separator:a470f19badf179fe205462c060e5175b4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a449e574ed6911881dc55507cb5635c2c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a449e574ed6911881dc55507cb5635c2c">type</a></td></tr>
-<tr class="separator:a449e574ed6911881dc55507cb5635c2c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a3b1869501b35bf41f2ff54de072b6c2c"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a3b1869501b35bf41f2ff54de072b6c2c">reserved0</a></td></tr>
-<tr class="separator:a3b1869501b35bf41f2ff54de072b6c2c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a8a591d341723df9496cda98e225b25b4"><td class="memItemLeft" align="right" valign="top">int64_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a8a591d341723df9496cda98e225b25b4">timestamp</a></td></tr>
-<tr class="separator:a8a591d341723df9496cda98e225b25b4"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a5a4f7ed8edd7821e9e0932df3a29792d"><td class="memItemLeft" >union {</td></tr>
-<tr class="memitem:af302fa16ee998a27548f088d0d9bb64f"><td class="memItemLeft" >   union {</td></tr>
-<tr class="memitem:a31244897a6c7f657a9aec807dd1e09ae"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_event.html#a31244897a6c7f657a9aec807dd1e09ae">data</a> [16]</td></tr>
-<tr class="separator:a31244897a6c7f657a9aec807dd1e09ae"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aebf12879fa9b61c671584994ddad9610"><td class="memItemLeft" >      <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a>   <a class="el" href="struct_a_sensor_event.html#aebf12879fa9b61c671584994ddad9610">vector</a></td></tr>
-<tr class="separator:aebf12879fa9b61c671584994ddad9610"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aab1f50881089166ff5f3d46f7bfcf09c"><td class="memItemLeft" >      <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a>   <a class="el" href="struct_a_sensor_event.html#aab1f50881089166ff5f3d46f7bfcf09c">acceleration</a></td></tr>
-<tr class="separator:aab1f50881089166ff5f3d46f7bfcf09c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a776bc8e3beff52764ef2d6d423563d64"><td class="memItemLeft" >      <a class="el" href="struct_a_sensor_vector.html">ASensorVector</a>   <a class="el" href="struct_a_sensor_event.html#a776bc8e3beff52764ef2d6d423563d64">magnetic</a></td></tr>
-<tr class="separator:a776bc8e3beff52764ef2d6d423563d64"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:afc1d28cfbce795d6ea954ebe725241f5"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_event.html#afc1d28cfbce795d6ea954ebe725241f5">temperature</a></td></tr>
-<tr class="separator:afc1d28cfbce795d6ea954ebe725241f5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a06f14a9abd47b91465f895d5259cdc1b"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_event.html#a06f14a9abd47b91465f895d5259cdc1b">distance</a></td></tr>
-<tr class="separator:a06f14a9abd47b91465f895d5259cdc1b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aaf8b2537020ae0b7450785724d77a3e0"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_event.html#aaf8b2537020ae0b7450785724d77a3e0">light</a></td></tr>
-<tr class="separator:aaf8b2537020ae0b7450785724d77a3e0"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ac870e1249bab4a2a68cc4126761d24ef"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_event.html#ac870e1249bab4a2a68cc4126761d24ef">pressure</a></td></tr>
-<tr class="separator:ac870e1249bab4a2a68cc4126761d24ef"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ad60830bc80efb7e8a11d6fb25518f55b"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_event.html#ad60830bc80efb7e8a11d6fb25518f55b">relative_humidity</a></td></tr>
-<tr class="separator:ad60830bc80efb7e8a11d6fb25518f55b"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a4e35158edcd83e4651d7083ebdb41bae"><td class="memItemLeft" >      <a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a>   <a class="el" href="struct_a_sensor_event.html#a4e35158edcd83e4651d7083ebdb41bae">uncalibrated_gyro</a></td></tr>
-<tr class="separator:a4e35158edcd83e4651d7083ebdb41bae"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a3c746f01a48fbdefaad12c35be0dd715"><td class="memItemLeft" >      <a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a>   <a class="el" href="struct_a_sensor_event.html#a3c746f01a48fbdefaad12c35be0dd715">uncalibrated_magnetic</a></td></tr>
-<tr class="separator:a3c746f01a48fbdefaad12c35be0dd715"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a40a6e69697a42e0f0ad04a09d7f113d3"><td class="memItemLeft" >      <a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a>   <a class="el" href="struct_a_sensor_event.html#a40a6e69697a42e0f0ad04a09d7f113d3">meta_data</a></td></tr>
-<tr class="separator:a40a6e69697a42e0f0ad04a09d7f113d3"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a2325abb12f65d7cbceec766e6db506d8"><td class="memItemLeft" >      <a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a>   <a class="el" href="struct_a_sensor_event.html#a2325abb12f65d7cbceec766e6db506d8">heart_rate</a></td></tr>
-<tr class="separator:a2325abb12f65d7cbceec766e6db506d8"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:af302fa16ee998a27548f088d0d9bb64f"><td class="memItemLeft" valign="top">   } </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:af302fa16ee998a27548f088d0d9bb64f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a89806d4445310e62ed4b68c9e2698b27"><td class="memItemLeft" >   union {</td></tr>
-<tr class="memitem:a1bc800e1b28e4acd0ee4e971619a598f"><td class="memItemLeft" >      uint64_t   <a class="el" href="struct_a_sensor_event.html#a1bc800e1b28e4acd0ee4e971619a598f">data</a> [8]</td></tr>
-<tr class="separator:a1bc800e1b28e4acd0ee4e971619a598f"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a2e54280490afc977b11157e387841145"><td class="memItemLeft" >      uint64_t   <a class="el" href="struct_a_sensor_event.html#a2e54280490afc977b11157e387841145">step_counter</a></td></tr>
-<tr class="separator:a2e54280490afc977b11157e387841145"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a89806d4445310e62ed4b68c9e2698b27"><td class="memItemLeft" valign="top">   }   <a class="el" href="struct_a_sensor_event.html#a89806d4445310e62ed4b68c9e2698b27">u64</a></td></tr>
-<tr class="separator:a89806d4445310e62ed4b68c9e2698b27"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a5a4f7ed8edd7821e9e0932df3a29792d"><td class="memItemLeft" valign="top">}; </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:a5a4f7ed8edd7821e9e0932df3a29792d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a773b39d480759f67926cb18ae2219281"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a773b39d480759f67926cb18ae2219281">flags</a></td></tr>
-<tr class="separator:a773b39d480759f67926cb18ae2219281"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a3c2ed5a26d302c47f7b3f2dd0bbf7f94"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_event.html#a3c2ed5a26d302c47f7b3f2dd0bbf7f94">reserved1</a> [3]</td></tr>
-<tr class="separator:a3c2ed5a26d302c47f7b3f2dd0bbf7f94"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a5a4f7ed8edd7821e9e0932df3a29792d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">union { ... } </td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="aab1f50881089166ff5f3d46f7bfcf09c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_sensor_vector.html">ASensorVector</a> acceleration</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a31244897a6c7f657a9aec807dd1e09ae"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float data[16]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a1bc800e1b28e4acd0ee4e971619a598f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint64_t data[8]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a06f14a9abd47b91465f895d5259cdc1b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float distance</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a773b39d480759f67926cb18ae2219281"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint32_t flags</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a2325abb12f65d7cbceec766e6db506d8"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_heart_rate_event.html">AHeartRateEvent</a> heart_rate</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="aaf8b2537020ae0b7450785724d77a3e0"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float light</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a776bc8e3beff52764ef2d6d423563d64"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_sensor_vector.html">ASensorVector</a> magnetic</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a40a6e69697a42e0f0ad04a09d7f113d3"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_meta_data_event.html">AMetaDataEvent</a> meta_data</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ac870e1249bab4a2a68cc4126761d24ef"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float pressure</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ad60830bc80efb7e8a11d6fb25518f55b"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float relative_humidity</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a3b1869501b35bf41f2ff54de072b6c2c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t reserved0</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a3c2ed5a26d302c47f7b3f2dd0bbf7f94"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t reserved1[3]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a470f19badf179fe205462c060e5175b4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t sensor</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a2e54280490afc977b11157e387841145"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint64_t step_counter</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="afc1d28cfbce795d6ea954ebe725241f5"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float temperature</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a8a591d341723df9496cda98e225b25b4"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int64_t timestamp</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a449e574ed6911881dc55507cb5635c2c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t type</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a89806d4445310e62ed4b68c9e2698b27"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">union { ... } u64</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a4e35158edcd83e4651d7083ebdb41bae"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a> uncalibrated_gyro</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a3c746f01a48fbdefaad12c35be0dd715"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_uncalibrated_event.html">AUncalibratedEvent</a> uncalibrated_magnetic</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="aebf12879fa9b61c671584994ddad9610"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname"><a class="el" href="struct_a_sensor_vector.html">ASensorVector</a> vector</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a67fae7dd1de9edce3656ed214d20377f"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t version</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="sensor_8h.html">sensor.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_sensor_vector.jd b/docs/html/ndk/reference/struct_a_sensor_vector.jd
deleted file mode 100644
index 397ad6d..0000000
--- a/docs/html/ndk/reference/struct_a_sensor_vector.jd
+++ /dev/null
@@ -1,172 +0,0 @@
-page.title=ASensorVector Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">ASensorVector Struct Reference<div class="ingroups"><a class="el" href="group___sensor.html">Sensor</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <sensor.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a1c2115c78d0380b0ecfbf9e94adcf821"><td class="memItemLeft" >union {</td></tr>
-<tr class="memitem:a9a1a1a00f1e45435cc3001b553000a21"><td class="memItemLeft" >   float   <a class="el" href="struct_a_sensor_vector.html#a9a1a1a00f1e45435cc3001b553000a21">v</a> [3]</td></tr>
-<tr class="separator:a9a1a1a00f1e45435cc3001b553000a21"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ada5f2f99413a51a46caa8ef7f44c7a88"><td class="memItemLeft" >   struct {</td></tr>
-<tr class="memitem:ad0da36b2558901e21e7a30f6c227a45e"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_vector.html#ad0da36b2558901e21e7a30f6c227a45e">x</a></td></tr>
-<tr class="separator:ad0da36b2558901e21e7a30f6c227a45e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aa4f0d3eebc3c443f9be81bf48561a217"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_vector.html#aa4f0d3eebc3c443f9be81bf48561a217">y</a></td></tr>
-<tr class="separator:aa4f0d3eebc3c443f9be81bf48561a217"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:af73583b1e980b0aa03f9884812e9fd4d"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_vector.html#af73583b1e980b0aa03f9884812e9fd4d">z</a></td></tr>
-<tr class="separator:af73583b1e980b0aa03f9884812e9fd4d"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ada5f2f99413a51a46caa8ef7f44c7a88"><td class="memItemLeft" valign="top">   } </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:ada5f2f99413a51a46caa8ef7f44c7a88"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aa217775a0b49338072ee12500155bdbf"><td class="memItemLeft" >   struct {</td></tr>
-<tr class="memitem:a01b03ebfa7d0a95760e743f611fecbc5"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_vector.html#a01b03ebfa7d0a95760e743f611fecbc5">azimuth</a></td></tr>
-<tr class="separator:a01b03ebfa7d0a95760e743f611fecbc5"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a282e7d4378d4a18a805b8980295ac86c"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_vector.html#a282e7d4378d4a18a805b8980295ac86c">pitch</a></td></tr>
-<tr class="separator:a282e7d4378d4a18a805b8980295ac86c"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a26fd84d522945b6038221d9e38c7cc39"><td class="memItemLeft" >      float   <a class="el" href="struct_a_sensor_vector.html#a26fd84d522945b6038221d9e38c7cc39">roll</a></td></tr>
-<tr class="separator:a26fd84d522945b6038221d9e38c7cc39"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:aa217775a0b49338072ee12500155bdbf"><td class="memItemLeft" valign="top">   } </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:aa217775a0b49338072ee12500155bdbf"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a1c2115c78d0380b0ecfbf9e94adcf821"><td class="memItemLeft" valign="top">}; </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:a1c2115c78d0380b0ecfbf9e94adcf821"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a555c2084e8436de01dc76a23590e8824"><td class="memItemLeft" align="right" valign="top">int8_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_vector.html#a555c2084e8436de01dc76a23590e8824">status</a></td></tr>
-<tr class="separator:a555c2084e8436de01dc76a23590e8824"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a72aca6ea6d8153b28ea8f139b932ec3e"><td class="memItemLeft" align="right" valign="top">uint8_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_a_sensor_vector.html#a72aca6ea6d8153b28ea8f139b932ec3e">reserved</a> [3]</td></tr>
-<tr class="separator:a72aca6ea6d8153b28ea8f139b932ec3e"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p>A sensor event. </p>
-</div><h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a1c2115c78d0380b0ecfbf9e94adcf821"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">union { ... } </td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a01b03ebfa7d0a95760e743f611fecbc5"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float azimuth</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a282e7d4378d4a18a805b8980295ac86c"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float pitch</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a72aca6ea6d8153b28ea8f139b932ec3e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint8_t reserved[3]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a26fd84d522945b6038221d9e38c7cc39"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float roll</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a555c2084e8436de01dc76a23590e8824"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int8_t status</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a9a1a1a00f1e45435cc3001b553000a21"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float v[3]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ad0da36b2558901e21e7a30f6c227a45e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float x</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="aa4f0d3eebc3c443f9be81bf48561a217"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float y</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="af73583b1e980b0aa03f9884812e9fd4d"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float z</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="sensor_8h.html">sensor.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_a_uncalibrated_event.jd b/docs/html/ndk/reference/struct_a_uncalibrated_event.jd
deleted file mode 100644
index 985b0b9..0000000
--- a/docs/html/ndk/reference/struct_a_uncalibrated_event.jd
+++ /dev/null
@@ -1,171 +0,0 @@
-page.title=AUncalibratedEvent Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">AUncalibratedEvent Struct Reference<div class="ingroups"><a class="el" href="group___sensor.html">Sensor</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <sensor.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a7b163a0b99971787ece3a65e6000fdf2"><td class="memItemLeft" >union {</td></tr>
-<tr class="memitem:a9c22454e765672782b7198d57a92f5fd"><td class="memItemLeft" >   float   <a class="el" href="struct_a_uncalibrated_event.html#a9c22454e765672782b7198d57a92f5fd">uncalib</a> [3]</td></tr>
-<tr class="separator:a9c22454e765672782b7198d57a92f5fd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a8b528c70566cf887c975d6c5a9cdcbb1"><td class="memItemLeft" >   struct {</td></tr>
-<tr class="memitem:ac8b7f8daea042eaa2b86f0bf2160c44a"><td class="memItemLeft" >      float   <a class="el" href="struct_a_uncalibrated_event.html#ac8b7f8daea042eaa2b86f0bf2160c44a">x_uncalib</a></td></tr>
-<tr class="separator:ac8b7f8daea042eaa2b86f0bf2160c44a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a43437dd77e26c6b89ab1c91aeb63fd64"><td class="memItemLeft" >      float   <a class="el" href="struct_a_uncalibrated_event.html#a43437dd77e26c6b89ab1c91aeb63fd64">y_uncalib</a></td></tr>
-<tr class="separator:a43437dd77e26c6b89ab1c91aeb63fd64"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ae677be5f98570cc5a1fd7fddcd8a6841"><td class="memItemLeft" >      float   <a class="el" href="struct_a_uncalibrated_event.html#ae677be5f98570cc5a1fd7fddcd8a6841">z_uncalib</a></td></tr>
-<tr class="separator:ae677be5f98570cc5a1fd7fddcd8a6841"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a8b528c70566cf887c975d6c5a9cdcbb1"><td class="memItemLeft" valign="top">   } </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:a8b528c70566cf887c975d6c5a9cdcbb1"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a7b163a0b99971787ece3a65e6000fdf2"><td class="memItemLeft" valign="top">}; </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:a7b163a0b99971787ece3a65e6000fdf2"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ac376d6a49d888be08124578ee9b9fc15"><td class="memItemLeft" >union {</td></tr>
-<tr class="memitem:a52bd7f09c4decadcfbc0347fda4163d6"><td class="memItemLeft" >   float   <a class="el" href="struct_a_uncalibrated_event.html#a52bd7f09c4decadcfbc0347fda4163d6">bias</a> [3]</td></tr>
-<tr class="separator:a52bd7f09c4decadcfbc0347fda4163d6"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a4710797e0d0109a279359bfb8d4e2327"><td class="memItemLeft" >   struct {</td></tr>
-<tr class="memitem:a56c4ea73587a9ea20595cca9bcfe9593"><td class="memItemLeft" >      float   <a class="el" href="struct_a_uncalibrated_event.html#a56c4ea73587a9ea20595cca9bcfe9593">x_bias</a></td></tr>
-<tr class="separator:a56c4ea73587a9ea20595cca9bcfe9593"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a130457eaa905b467bc43fedb02cbb16a"><td class="memItemLeft" >      float   <a class="el" href="struct_a_uncalibrated_event.html#a130457eaa905b467bc43fedb02cbb16a">y_bias</a></td></tr>
-<tr class="separator:a130457eaa905b467bc43fedb02cbb16a"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a6e265324293107afbfa9e587941a4036"><td class="memItemLeft" >      float   <a class="el" href="struct_a_uncalibrated_event.html#a6e265324293107afbfa9e587941a4036">z_bias</a></td></tr>
-<tr class="separator:a6e265324293107afbfa9e587941a4036"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a4710797e0d0109a279359bfb8d4e2327"><td class="memItemLeft" valign="top">   } </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:a4710797e0d0109a279359bfb8d4e2327"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:ac376d6a49d888be08124578ee9b9fc15"><td class="memItemLeft" valign="top">}; </td><td class="memItemRight" valign="bottom"></td></tr>
-<tr class="separator:ac376d6a49d888be08124578ee9b9fc15"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a7b163a0b99971787ece3a65e6000fdf2"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">union { ... } </td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ac376d6a49d888be08124578ee9b9fc15"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">union { ... } </td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a52bd7f09c4decadcfbc0347fda4163d6"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float bias[3]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a9c22454e765672782b7198d57a92f5fd"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float uncalib[3]</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a56c4ea73587a9ea20595cca9bcfe9593"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float x_bias</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ac8b7f8daea042eaa2b86f0bf2160c44a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float x_uncalib</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a130457eaa905b467bc43fedb02cbb16a"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float y_bias</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a43437dd77e26c6b89ab1c91aeb63fd64"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float y_uncalib</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="a6e265324293107afbfa9e587941a4036"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float z_bias</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<a class="anchor" id="ae677be5f98570cc5a1fd7fddcd8a6841"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">float z_uncalib</td>
- </tr>
- </table>
-</div><div class="memdoc">
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="sensor_8h.html">sensor.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/struct_android_bitmap_info.jd b/docs/html/ndk/reference/struct_android_bitmap_info.jd
deleted file mode 100644
index f995b56..0000000
--- a/docs/html/ndk/reference/struct_android_bitmap_info.jd
+++ /dev/null
@@ -1,100 +0,0 @@
-page.title=AndroidBitmapInfo Struct Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#pub-attribs">Data Fields</a> </div>
- <div class="headertitle">
-<div class="title">AndroidBitmapInfo Struct Reference<div class="ingroups"><a class="el" href="group___bitmap.html">Bitmap</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-
-<p><code>#include <bitmap.h></code></p>
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Data Fields</h2></td></tr>
-<tr class="memitem:a325272ddd9a962f05deb905101d25cbd"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html#a325272ddd9a962f05deb905101d25cbd">width</a></td></tr>
-<tr class="separator:a325272ddd9a962f05deb905101d25cbd"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a6ad4f820ce4e75cda0686fcaad5168be"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html#a6ad4f820ce4e75cda0686fcaad5168be">height</a></td></tr>
-<tr class="separator:a6ad4f820ce4e75cda0686fcaad5168be"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a981556a4e63b7b6d9f94975c7a8930ab"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html#a981556a4e63b7b6d9f94975c7a8930ab">stride</a></td></tr>
-<tr class="separator:a981556a4e63b7b6d9f94975c7a8930ab"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a49d503b84d084937e3ceeda9f0b4659e"><td class="memItemLeft" align="right" valign="top">int32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html#a49d503b84d084937e3ceeda9f0b4659e">format</a></td></tr>
-<tr class="separator:a49d503b84d084937e3ceeda9f0b4659e"><td class="memSeparator" colspan="2"> </td></tr>
-<tr class="memitem:a773b39d480759f67926cb18ae2219281"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="struct_android_bitmap_info.html#a773b39d480759f67926cb18ae2219281">flags</a></td></tr>
-<tr class="separator:a773b39d480759f67926cb18ae2219281"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p>Bitmap info, see <a class="el" href="group___bitmap.html#ga80292ee39d8a675928e38849742b54bf">AndroidBitmap_getInfo()</a>. </p>
-</div><h2 class="groupheader">Field Documentation</h2>
-<a class="anchor" id="a773b39d480759f67926cb18ae2219281"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint32_t flags</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>Unused. </p>
-
-</div>
-</div>
-<a class="anchor" id="a49d503b84d084937e3ceeda9f0b4659e"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">int32_t format</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The bitmap pixel format. See <a class="el" href="group___bitmap.html#gaea286a2d4c61ae2abb02b51500499f13">AndroidBitmapFormat</a> </p>
-
-</div>
-</div>
-<a class="anchor" id="a6ad4f820ce4e75cda0686fcaad5168be"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint32_t height</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The bitmap height in pixels. </p>
-
-</div>
-</div>
-<a class="anchor" id="a981556a4e63b7b6d9f94975c7a8930ab"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint32_t stride</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The number of byte per row. </p>
-
-</div>
-</div>
-<a class="anchor" id="a325272ddd9a962f05deb905101d25cbd"></a>
-<div class="memitem">
-<div class="memproto">
- <table class="memname">
- <tr>
- <td class="memname">uint32_t width</td>
- </tr>
- </table>
-</div><div class="memdoc">
-<p>The bitmap width in pixels. </p>
-
-</div>
-</div>
-<hr/>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="bitmap_8h.html">bitmap.h</a></li>
-</ul>
-</div><!-- contents -->
diff --git a/docs/html/ndk/reference/sync_off.png b/docs/html/ndk/reference/sync_off.png
deleted file mode 100644
index b856624..0000000
--- a/docs/html/ndk/reference/sync_off.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/sync_on.png b/docs/html/ndk/reference/sync_on.png
deleted file mode 100644
index e5044af..0000000
--- a/docs/html/ndk/reference/sync_on.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/tab_a.png b/docs/html/ndk/reference/tab_a.png
deleted file mode 100644
index 170a784..0000000
--- a/docs/html/ndk/reference/tab_a.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/tab_b.png b/docs/html/ndk/reference/tab_b.png
deleted file mode 100644
index 7774499..0000000
--- a/docs/html/ndk/reference/tab_b.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/tab_h.png b/docs/html/ndk/reference/tab_h.png
deleted file mode 100644
index e1dddef..0000000
--- a/docs/html/ndk/reference/tab_h.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/tab_s.png b/docs/html/ndk/reference/tab_s.png
deleted file mode 100644
index 3dc07b0..0000000
--- a/docs/html/ndk/reference/tab_s.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/ndk/reference/tabs.css b/docs/html/ndk/reference/tabs.css
deleted file mode 100644
index 71145bb..0000000
--- a/docs/html/ndk/reference/tabs.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.tabs, .tabs2, .tabs3 {
- background-image: url('tab_b.png');
- width: 100%;
- z-index: 101;
- font-size: 13px;
- font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-}
-
-.tabs2 {
- font-size: 10px;
-}
-.tabs3 {
- font-size: 9px;
-}
-
-.tablist {
- margin: 0;
- padding: 0;
- display: table;
-}
-
-.tablist li {
- float: left;
- display: table-cell;
- background-image: url('tab_b.png');
- line-height: 36px;
- list-style: none;
-}
-
-.tablist a {
- display: block;
- padding: 0 20px;
- font-weight: bold;
- background-image:url('tab_s.png');
- background-repeat:no-repeat;
- background-position:right;
- color: #434343;
- text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
- text-decoration: none;
- outline: none;
-}
-
-.tabs3 .tablist a {
- padding: 0 10px;
-}
-
-.tablist a:hover {
- background-image: url('tab_h.png');
- background-repeat:repeat-x;
- color: #fff;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
- text-decoration: none;
-}
-
-.tablist li.current a {
- background-image: url('tab_a.png');
- background-repeat:repeat-x;
- color: #fff;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
-}
diff --git a/docs/html/ndk/reference/window_8h.jd b/docs/html/ndk/reference/window_8h.jd
deleted file mode 100644
index 39e01dc..0000000
--- a/docs/html/ndk/reference/window_8h.jd
+++ /dev/null
@@ -1,53 +0,0 @@
-page.title=window.h File Reference
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body
-<!-- Generated by Doxygen 1.8.6 -->
-<div id="nav-path" class="navpath">
- <ul>
-<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_035c76f7235f5f563d38e3ab90cb9716.html">android</a></li> </ul>
-</div>
-</div><!-- top -->
-<div class="header">
- <div class="summary">
-<a href="#enum-members">Enumerations</a> </div>
- <div class="headertitle">
-<div class="title">window.h File Reference<div class="ingroups"><a class="el" href="group___native_activity.html">Native Activity</a></div></div> </div>
-</div><!--header-->
-<div class="contents">
-<table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
-Enumerations</h2></td></tr>
-<tr class="memitem:gaf715e26dfffd1f8de1c18449e2770cff"><td class="memItemLeft" align="right" valign="top">enum  </td><td class="memItemRight" valign="bottom">{ <br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa67363c129036872bc9dd29557e807508">AWINDOW_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON</a> = 0x00000001,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6155e77ae4e12cc56fb3f6f55f56bf6f">AWINDOW_FLAG_DIM_BEHIND</a> = 0x00000002,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa0377f46a626d411ace179c1c27d0a3f7">AWINDOW_FLAG_BLUR_BEHIND</a> = 0x00000004,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffab5f19f59dd6b2601e4d1a7ff533bc50f">AWINDOW_FLAG_NOT_FOCUSABLE</a> = 0x00000008,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae9f1278ffa6fe9c12c2305d4f4de1450">AWINDOW_FLAG_NOT_TOUCHABLE</a> = 0x00000010,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5ef903c3617dd33e3c22f567abd64b09">AWINDOW_FLAG_NOT_TOUCH_MODAL</a> = 0x00000020,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa5574a513645e6e7cb4d6a9f4a043d773">AWINDOW_FLAG_TOUCHABLE_WHEN_WAKING</a> = 0x00000040,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaf6f66a498bd3bda8d51b6983eb2a99d8">AWINDOW_FLAG_KEEP_SCREEN_ON</a> = 0x00000080,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa6978968d7e0dc1a0e12f58ad395a959a">AWINDOW_FLAG_LAYOUT_IN_SCREEN</a> = 0x00000100,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffade9722581a203ee0db25d42f4d2bd389">AWINDOW_FLAG_LAYOUT_NO_LIMITS</a> = 0x00000200,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaca1f1d91313d7c32bb7982d8a5abcd71">AWINDOW_FLAG_FULLSCREEN</a> = 0x00000400,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa4c21235db629d3937f87ffe98cd6fe5d">AWINDOW_FLAG_FORCE_NOT_FULLSCREEN</a> = 0x00000800,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffae73488b436aaea163ba2f7051bf93d9d">AWINDOW_FLAG_DITHER</a> = 0x00001000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa8ff70709a588a05781d7cb178b526cc0">AWINDOW_FLAG_SECURE</a> = 0x00002000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa80316264eeae9681a56c1a2297bf465a">AWINDOW_FLAG_SCALED</a> = 0x00004000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffaa2fe4ee2307bb814a37a043de6d7d326">AWINDOW_FLAG_IGNORE_CHEEK_PRESSES</a> = 0x00008000,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa97b8542941bfe613bcf92357be89b563">AWINDOW_FLAG_LAYOUT_INSET_DECOR</a> = 0x00010000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa961ff4c9c0903cfb8867d961bebe1659">AWINDOW_FLAG_ALT_FOCUSABLE_IM</a> = 0x00020000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa35229f75b3309bafdd828cbbf27d05b6">AWINDOW_FLAG_WATCH_OUTSIDE_TOUCH</a> = 0x00040000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa549f08950ef1ed3a334338d08ced1c3b">AWINDOW_FLAG_SHOW_WHEN_LOCKED</a> = 0x00080000,
-<br/>
-  <a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa952ae6ceebe94d3f0d666454548b8824">AWINDOW_FLAG_SHOW_WALLPAPER</a> = 0x00100000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffac4deee26ac742bbd0bb4c44fda140a01">AWINDOW_FLAG_TURN_SCREEN_ON</a> = 0x00200000,
-<a class="el" href="group___native_activity.html#ggaf715e26dfffd1f8de1c18449e2770cffa37c1077a12f1c8c6805b1da6f7bb213a">AWINDOW_FLAG_DISMISS_KEYGUARD</a> = 0x00400000
-<br/>
- }</td></tr>
-<tr class="separator:gaf715e26dfffd1f8de1c18449e2770cff"><td class="memSeparator" colspan="2"> </td></tr>
-</table>
-</div><!-- contents -->
diff --git a/docs/html/ndk/samples/_book.yaml b/docs/html/ndk/samples/_book.yaml
deleted file mode 100644
index 3665f5a..0000000
--- a/docs/html/ndk/samples/_book.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-toc:
-- title: Overview
- path: /ndk/samples/index.html
-
-- title: Walkthroughs
- path: /ndk/samples/walkthroughs.html
- section:
- - title: hello-jni
- path: /ndk/samples/sample_hellojni.html
- - title: native-activity
- path: /ndk/samples/sample_na.html
- - title: Teapot
- path: /ndk/samples/sample_teapot.html
diff --git a/docs/html/ndk/samples/index.jd b/docs/html/ndk/samples/index.jd
deleted file mode 100644
index d2e6dc3..0000000
--- a/docs/html/ndk/samples/index.jd
+++ /dev/null
@@ -1,33 +0,0 @@
-page.title=Samples: Overview
-@jd:body
-
-<p>Welcome to the NDK samples area. Here, you can download a variety of sample
-apps to help deepen your understanding the NDK.
-
-
-<p>From this page, you can download samples that provide a look at the NDK in action. A few of the
-topics covered are:</p>
-
-<ul>
- <li>Managing your native app's activity lifecycle.</li>
- <li>Using native OpenGL on an Android device.</li>
- <li>Implementing native audio.</li>
- <li>Exporting modules.</li>
-</ul>
-
-<p class="note"><strong>Note: </strong>These samples are also contained in the NDK installation
-package; if you have already downloaded the NDK, you have them. They reside in
-{@code $NDK/samples/}, where {@code $NDK} is the NDK installation root.</p>
-
- <div id="sdk-terms-form">
- <p><a href="https://github.com/googlesamples/android-ndk/tree/android-mk" class="button">
- Browse NDK samples</a></p>
- </div>
-
-<p>Vulkan samples are located separately from those for the rest of the NDK. To explore them,
-access the link below.</p>
-
- <div id="Vulkan-terms-form">
- <p><a href="https://github.com/LunarG/VulkanSamples" class="button">
- Browse Vulkan samples</a></p>
- </div>
\ No newline at end of file
diff --git a/docs/html/ndk/samples/sample_hellojni.jd b/docs/html/ndk/samples/sample_hellojni.jd
deleted file mode 100644
index fa61b28..0000000
--- a/docs/html/ndk/samples/sample_hellojni.jd
+++ /dev/null
@@ -1,123 +0,0 @@
-page.title=Sample: hello-jni
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#an">Android.mk</a></li>
- <li><a href="#ap">Application.mk</a></li>
- <li><a href="#ji">Java-side Implementation</a></li>
- <li><a href="#ci">C-side Implementation</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<p>This sample guides you through HelloJNI, a minimal
-application built with the NDK. This sample is in the {@code samples/hello-jni/} directory
-under the root directory of your NDK installation.</p>
-
-<h2 id="an">Android.mk</h2>
-
-<p>The following two lines provide the name of the native source file, along
-with the name of the shared library to build. The full name of the built
-library is {@code libhello-jni.so}, once the build system adds the
-{@code lib} prefix and the {@code .so} extension.</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES := hello-jni.c
-LOCAL_MODULE := hello-jni
-</pre>
-
-<p>For more information about what the {@code Android.mk} file does, and how to use it, see
-<a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>.</p>
-
-<h2 id="ap">Application.mk</h2>
-<p>This line tells the build system the CPU and architecture against which to build. In this
-example, the build system builds for all supported architectures.</p>
-
-<pre class="no-pretty-print">
-APP_ABI := all
-</pre>
-
-<p>For more information about the {@code Application.mk} file, and how to use it, see
-<a href="{@docRoot}ndk/guides/application_mk.html">Application.mk</a>.</p>
-
-<h2 id="ji">Java-side Implementation</h2>
-<p>The {@code helloJNI.java} file is located in {@code hellojni/src/com/example/hellojni/}. It calls
-a function to retrieve a string from the native side, then displays it on the screen.</p>
-
-<p>The source code contains three lines of particular interest to the NDK user.
-They are presented here in the order in which they are used, rather than by
-line order.</p>
-
-<p>This function call loads the {@code .so} file upon application startup.</p>
-
-<pre class="no-pretty-print">
-System.loadLibrary("hello-jni");
-</pre>
-
-<p>The {@code native} keyword in this method declaration tells the
-virtual machine that the function is in the shared library (that is, implemented on the native
-side).</p>
-
-<pre class="no-pretty-print">
-public native String stringFromJNI();
-</pre>
-
-<p>The Android framework calls the function loaded and declared in the
-previous steps, displaying the string on the screen.</p>
-
-<pre class="no-pretty-print">
-tv.setText( stringFromJNI() );
-</pre>
-
-<h2 id="ci">C-side Implementation</h2>
-<p>The {@code hello-jni.c} file is located in {@code hello-jni/jni/}. It contains a function that
-returns a string that <a href="#ji">the Java side requested</a>). The function declaration is as
-follows:</p>
-
-<pre>
-jstring
-Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,
- jobject thiz )
-</pre>
-
-<p>This declaration corresponds to the native function declared in the
-Java source code. The return type, {@code jstring}, is a data type defined
-in the
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/jniTOC.html">Java Native
-Interface Specification</a>. It is not actually a string, but a
-pointer to a Java string.</p>
-
-<p>After {@code jstring} comes the function name, which is based on the
-Java function name and and the path to the file containing it. Construct it
-according to the following rules:</p>
-
-<ul>
-<li>Prepend {@code Java_} to it.</li>
-<li>Describe the filepath relative to the top-level source directory.</li>
-<li>Use underscores in place of forward slashes.</li>
-<li>Omit the {@code .java} file extension.</li>
-<li>After the last underscore, append the function name.</li>
-</ul>
-
-<p>Following these rules, this example uses the function name
-{@code Java_com_example_hellojni_HelloJni_stringFromJNI}. This name refers to a Java
-function called {@code stringFromJNI()}, which resides in
-{@code hellojni/src/com/example/hellojni/HelloJni.java}.</p>
-
-<p>{@code JNIEnv*} is the pointer to the VM, and
-{@code jobject} is a pointer to the implicit {@code this} object passed from
-the Java side.</p>
-
-<p>The following line calls the VM API {@code (*env)}, and passes it a return value:
-that is, the string that the function on the Java side had requested.</p>
-
-<pre class="no-pretty-print">
-return (*env)->NewStringUTF(env, "Hello from JNI !
-Compiled with ABI " ABI ".");
-</pre>
diff --git a/docs/html/ndk/samples/sample_na.jd b/docs/html/ndk/samples/sample_na.jd
deleted file mode 100644
index 0966dd8..0000000
--- a/docs/html/ndk/samples/sample_na.jd
+++ /dev/null
@@ -1,259 +0,0 @@
-page.title=Sample: native-activity
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#am">AndroidManifest.xml</a></li>
- <li><a href="#anm">Android.mk</a></li>
- <li><a href="#apm">Application.mk</a></li>
- <li><a href="#mac">main.c</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<p>The native-activity sample resides under the NDK installation root, in
-{@code samples/native-activity}. It is a very simple example of a purely native
-application, with no Java source code. In the absence of any Java source, the
-Java compiler still creates an executable stub for the virtual machine to run.
-The stub serves as a wrapper for the actual, native program, which is located in the {@code .so}
-file.</p>
-
-<p>The app itself simply renders a color onto the entire screen, and
-then changes the color partly in response to movement that it detects.</p>
-
-<h2 id="am">AndroidManifest.xml</h2>
-
-<p>An app with only native code must not specify an Android API level lower than 9, which introduced
-the <a href="{@docRoot}ndk/guides/concepts.html#naa">{@code NativeActivity}</a> framework class.</p>
-
-<pre class="no-pretty-print">
-<uses-sdk android:minSdkVersion="9" />
-</pre>
-
-<p>The following line declares {@code android:hasCode} as {@code false}, as this app has only
-native code–no Java.
-</p>
-
-<pre class="no-pretty-print">
-<application android:label="@string/app_name"
-android:hasCode="false">
-</pre>
-
-<p>The next line declares the {@code NativeActivity} class.</p>
-
-<pre class="no-pretty-print">
-<activity android:name="android.app.NativeActivity"
-</pre>
-
-<p>Finally, the manifest specifies {@code android:value} as the name of the shared library to be
-built, minus the initial {@code lib} and the {@code .so} extension. This value must be the same as
-the name of {@code LOCAL_MODULE} in {@code Android.mk}.</p>
-
-<pre class="no-pretty-print">
-<meta-data android:name="android.app.lib_name"
- android:value="native-activity" />
-</pre>
-
-<h2 id="anm">Android.mk</h2>
-<p>This file begins by providing the name of the shared library to generate.</p>
-
-<pre class="no-pretty-print">
-LOCAL_MODULE := native-activity
-</pre>
-
-<p>Next, it declares the name of the native source-code file.</p>
-
-<pre class="no-pretty-print">
-LOCAL_SRC_FILES := main.c
-</pre>
-
-<p>Next, it lists the external libraries for the build system to use in building the binary. The
-{@code -l} (link-against) option precedes each library name.</p>
-
-<ul>
-<li>{@code log} is a logging library.</li>
-<li>{@code android} encompasses the standard Android support APIs for NDK. For more information about
-the APIs that Android and the NDK support, see <a href="stable_apis.html">Android NDK Native
-APIs</a>.</li>
-<li>{@code EGL} corresponds to the platform-specific portion of the graphics API.</li>
-<li>{@code GLESv1_CM} corresponds to OpenGL ES, the version of OpenGL for Android. This library
-depends on EGL.</li>
-</ul>
-
-<p>For each library:</p>
-
-<ul>
-<li>The actual file name starts with {@code lib}, and ends with the
-{@code .so} extension. For example, the actual file name for the
-{@code log} library is {@code liblog.so}.</li>
-<li>The library resides in the following directory, NDK root:
-{@code <ndk>/platforms/android-<sdk_version>/arch-<abi>/usr/lib/}.</li>
-</ul>
-
-<pre class="no-pretty-print">
-LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
-</pre>
-
-<p>The next line provides the name of the static library, {@code android_native_app_glue}, which the
-application uses to manage {@code NativeActivity} lifecycle events and touch input.</p>
-
-<pre class="no-pretty-print">
-LOCAL_STATIC_LIBRARIES := android_native_app_glue
-</pre>
-
-<p>The final line tells the build system to build this static library.
-The {@code ndk-build} script places the built library
-({@code libandroid_native_app_glue.a}) into the {@code obj} directory
-generated during the build process. For more information about the {@code android_native_app_glue}
-library, see its {@code android_native_app_glue.h} header and corresponding {@code .c}source file.
-</p>
-
-
-<pre class="no-pretty-print">
-$(call import-module,android/native_app_glue)
-</pre>
-
-<p>For more information about the {@code Android.mk} file, see
-<a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>.</p>
-
-
-<h2 id="apm">Application.mk</h2>
-
-<p>This line defines the minimum level of Android API Level support.</p>
-
-<pre class="no-pretty-print">
-APP_PLATFORM := android-10
-</pre>
-
-<p>Because there is no ABI definition, the build system defaults to building only for
-{@code armeabi}.</p>
-
-<h2 id="mac">main.c</h2>
-<p>This file essentially contains the entire progam.</p>
-
-<p>The following includes correspond to the libraries, both shared and static,
-enumerated in {@code Android.mk}.</p>
-
-<pre class="no-pretty-print">
-#include <EGL/egl.h>
-#include <GLES/gl.h>
-
-
-#include <android/sensor.h>
-#include <android/log.h>
-#include <android_native_app_glue>
-</pre>
-
-<p>The {@code android_native_app_glue} library calls the following function,
-passing it a predefined state structure. It also serves as a wrapper that
-simplifies handling of {@code NativeActivity} callbacks.</p>
-
-<pre class="no-pretty-print">
-void android_main(struct android_app* state) {
-</pre>
-
-<p>Next, the program handles events queued by the glue library. The event
-handler follows the state structure.</p>
-
-<pre class="no-pretty-print">
-struct engine engine;
-
-
-
-// Suppress link-time optimization that removes unreferenced code
-// to make sure glue isn't stripped.
-app_dummy();
-
-
-memset(&engine, 0, sizeof(engine));
-state->userData = &engine;
-state->onAppCmd = engine_handle_cmd;
-state->onInputEvent = engine_handle_input;
-engine.app = state;
-</pre>
-
-<p>The application prepares to start monitoring the sensors, using the
-APIs in {@code sensor.h}.</p>
-
-<pre class="no-pretty-print">
- engine.sensorManager = ASensorManager_getInstance();
- engine.accelerometerSensor =
- ASensorManager_getDefaultSensor(engine.sensorManager,
- ASENSOR_TYPE_ACCELEROMETER);
- engine.sensorEventQueue =
- ASensorManager_createEventQueue(engine.sensorManager,
- state->looper, LOOPER_ID_USER, NULL, NULL);
-</pre>
-
-<p>Next, a loop begins, in which the application polls the system for
-messages (sensor events). It sends messages to
-{@code android_native_app_glue}, which checks to see whether they match
-any {@code onAppCmd} events defined in {@code android_main}. When a
-match occurs, the message is sent to the handler for execution.</p>
-
-<pre class="no-pretty-print">
-while (1) {
- // Read all pending events.
- int ident;
- int events;
- struct android_poll_source* source;
-
-
- // If not animating, we will block forever waiting for events.
- // If animating, we loop until all events are read, then continue
- // to draw the next frame of animation.
- while ((ident=ALooper_pollAll(engine.animating ? 0 : -1, NULL,
- &events,
- (void**)&source)) >= 0) {
-
-
- // Process this event.
- if (source != NULL) {
- source->process(state, source);
- }
-
-
- // If a sensor has data, process it now.
- if (ident == LOOPER_ID_USER) {
- if (engine.accelerometerSensor != NULL) {
- ASensorEvent event;
- while (ASensorEventQueue_getEvents(engine.sensorEventQueue,
- &event, 1) > 0) {
- LOGI("accelerometer: x=%f y=%f z=%f",
- event.acceleration.x, event.acceleration.y,
- event.acceleration.z);
- }
- }
- }
-
-
- // Check if we are exiting.
- if (state->destroyRequested != 0) {
- engine_term_display(&engine);
- return;
- }
- }
-</pre>
-
-<p>Once the queue is empty, and the program exits the polling loop, the
-program calls OpenGL to draw the screen.</p>
-<pre class="no-pretty-print">
- if (engine.animating) {
- // Done with events; draw next animation frame.
- engine.state.angle += .01f;
- if (engine.state.angle > 1) {
- engine.state.angle = 0;
- }
-
-
- // Drawing is throttled to the screen update rate, so there
- // is no need to do timing here.
- engine_draw_frame(&engine);
- }
-}
-</pre>
diff --git a/docs/html/ndk/samples/sample_teapot.jd b/docs/html/ndk/samples/sample_teapot.jd
deleted file mode 100644
index 97708a7..0000000
--- a/docs/html/ndk/samples/sample_teapot.jd
+++ /dev/null
@@ -1,360 +0,0 @@
-page.title=Sample: Teapot
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>On this page</h2>
-
- <ol>
- <li><a href="#am">AndroidManifest.xml</a></li>
- <li><a href="#ap">Application.mk</a></li>
- <li><a href="#ji">Java-side Implementation</a></li>
- <li><a href="#ni">Native-side Implementation</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
-
-<p>The Teapot sample is located under in the {@code samples/Teapot/} directory, under the NDK
-installation's root directory. This sample uses the OpenGL library to render the iconic
-<a href="http://math.hws.edu/bridgeman/courses/324/s06/doc/opengl.html#basic">Utah
-teapot</a>. In particular, it showcases the {@code ndk_helper} helper class,
-a collection of native helper functions required for implementing games and
-similar applications as native applications. This class provides:</p>
-
-<ul>
-<li>An abstraction layer, {@code GLContext}, that handles certain NDK-specific behaviors.</li>
-<li>Helper functions that are useful but not present in the NDK, such as tap detection.</li>
-<li>Wrappers for JNI calls for platform features such as texture loading.</li>
-</ul>
-
-<h2 id="am">AndroidManifest.xml</h2>
-<p>The activity declaration here is not {@link android.app.NativeActivity} itself, but
-a subclass of it: {@code TeapotNativeActivity}.</p>
-
-<pre class="no-pretty-print">
- <activity android:name="com.sample.teapot.TeapotNativeActivity"
- android:label="@string/app_name"
- android:configChanges="orientation|keyboardHidden">
-</pre>
-
-<p>Ultimately, the name of the shared-object file that the build system builds is
-{@code libTeapotNativeActivity.so}. The build system adds the {@code lib} prefix and the {@code .so}
-extension; neither is part of the value that the manifest originally assigns to
-{@code android:value}.</p>
-
-<pre class="no-pretty-print">
- <meta-data android:name="android.app.lib_name"
- android:value="TeapotNativeActivity" />
-</pre>
-
-<h2 id="ap">Application.mk</h2>
-<p>An app that uses the {@link android.app.NativeActivity} framework class must not specify an
-Android API level lower than 9, which introduced that class. For more information about the
-{@link android.app.NativeActivity} class, see
-<a href="{@docRoot}ndk/guides/concepts.html#naa">Native Activities and Applications</a>.
-</p>
-
-<pre class="no-pretty-print">
-APP_PLATFORM := android-9
-</pre>
-
-<p>The next line tells the build system to build for all supported architectures.</p>
-<pre class="no-pretty-print">
-APP_ABI := all
-</pre>
-
-<p>Next, the file tells the build system which
-<a href="{@docRoot}ndk/guides/cpp-support.html">C++ runtime support library</a> to use. </p>
-
-<pre class="no-pretty-print">
-APP_STL := stlport_static
-</pre>
-
-<h2 id="ji">Java-side Implementation</h2>
-<p>The {@code TeapotNativeActivity.java} file is located in
-{@code samples/Teapot/src/com/sample/teapot}, under the NDK installation root directory. It handles
-activity lifecycle events, and also enables the app to display text on the screen. The following
-block of code is most important from the perspective of the native-side implementation: The native
-code calls it to display a popup window for displaying text.</p>
-
-<pre class="no-pretty-print">
-
-void setImmersiveSticky() {
- View decorView = getWindow().getDecorView();
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
- | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
- | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-}
-</pre>
-
-<h2 id="ni">Native-side Implementation</h2>
-
-<p>This section explores the part of the Teapot app implemented in C++.</p>
-
-<h3>TeapotRenderer.h</h3>
-
-<p>These function calls perform the actual rendering of the teapot. It uses
-{@code ndk_helper} for matrix calculation and to reposition the camera
-based on where the user taps.</p>
-
-<pre class="no-pretty-print">
-ndk_helper::Mat4 mat_projection_;
-ndk_helper::Mat4 mat_view_;
-ndk_helper::Mat4 mat_model_;
-
-
-ndk_helper::TapCamera* camera_;
-</pre>
-
-<h3>TeapotNativeActivity.cpp</h3>
-
-<p>The following lines include {@code ndk_helper} in the native source file, and define the
-helper-class name.</p>
-
-<pre class="no-pretty-print">
-
-#include "NDKHelper.h"
-
-//-------------------------------------------------------------------------
-//Preprocessor
-//-------------------------------------------------------------------------
-#define HELPER_CLASS_NAME "com/sample/helper/NDKHelper" //Class name of helper
-function
-</pre>
-
-<p>The first use of the {@code ndk_helper} class is to handle the
-EGL-related lifecycle, associating EGL context states (created/lost) with
-Android lifecycle events. The {@code ndk_helper} class enables the application to preserve context
-information so that the system can restore a destroyed activity. This ability is useful, for
-example, when the target machine is rotated (causing an activity to be
-destroyed, then immediately restored in the new orientation), or when the lock
-screen appears.</p>
-
-<pre class="no-pretty-print">
-ndk_helper::GLContext* gl_context_; // handles EGL-related lifecycle.
-</pre>
-
-<p>Next, {@code ndk_helper} provides touch control.</p>
-
-<pre class="no-pretty-print">
-ndk_helper::DoubletapDetector doubletap_detector_;
-ndk_helper::PinchDetector pinch_detector_;
-ndk_helper::DragDetector drag_detector_;
-ndk_helper::PerfMonitor monitor_;
-</pre>
-
-<p>It also provides camera control (openGL view frustum).</p>
-
-<pre class="no-pretty-print">
-ndk_helper::TapCamera tap_camera_;
-</pre>
-
-<p>The app then prepares to use the device's sensors, using the native APIs provided in the NDK.</p>
-
-<pre class="no-pretty-print">
-ASensorManager* sensor_manager_;
-const ASensor* accelerometer_sensor_;
-ASensorEventQueue* sensor_event_queue_;
-</pre>
-
-<p>The app calls the following functions in response to various Android
-lifecycle events and EGL context state changes, using various functionalities
-provided by {@code ndk_helper} via the {@code Engine} class.</p>
-
-<pre class="no-pretty-print">
-
-void LoadResources();
-void UnloadResources();
-void DrawFrame();
-void TermDisplay();
-void TrimMemory();
-bool IsReady();
-</pre>
-
-<p>Then, the following function calls back to the Java side to update the UI display.</p>
-
-<pre class="no-pretty-print">
-void Engine::ShowUI()
-{
- JNIEnv *jni;
- app_->activity->vm->AttachCurrentThread( &jni, NULL );
-
-
- //Default class retrieval
- jclass clazz = jni->GetObjectClass( app_->activity->clazz );
- jmethodID methodID = jni->GetMethodID( clazz, "showUI", "()V" );
- jni->CallVoidMethod( app_->activity->clazz, methodID );
-
-
- app_->activity->vm->DetachCurrentThread();
- return;
-}
-</pre>
-
-<p>Next, this function calls back to the Java side to draw a text box
-superimposed on the screen rendered on the native side, and showing frame
-count.</p>
-
-<pre class="no-pretty-print">
-void Engine::UpdateFPS( float fFPS )
-{
- JNIEnv *jni;
- app_->activity->vm->AttachCurrentThread( &jni, NULL );
-
-
- //Default class retrieval
- jclass clazz = jni->GetObjectClass( app_->activity->clazz );
- jmethodID methodID = jni->GetMethodID( clazz, "updateFPS", "(F)V" );
- jni->CallVoidMethod( app_->activity->clazz, methodID, fFPS );
-
-
- app_->activity->vm->DetachCurrentThread();
- return;
-}
-</pre>
-
-<p>The application gets the system clock and supplies it to the renderer
-for time-based animation based on real-time clock. This information is used, for example, in
-calculating momentum, where speed declines as a function of time.</p>
-
-<pre class="no-pretty-print">
-renderer_.Update( monitor_.GetCurrentTime() );
-</pre>
-
-<p>The application now checks whether the context information that {@code GLcontext} holds is still
-valid. If not, {@code ndk-helper} swaps the buffer, reinstantiating the GL context.</p>
-
-<pre class="no-pretty-print">
-if( EGL_SUCCESS != gl_context_->Swap() ) // swaps
-buffer.
-</pre>
-
-<p>The program passes touch-motion events to the gesture detector defined
-in the {@code ndk_helper} class. The gesture detector tracks multitouch
-gestures, such as pinch-and-drag, and sends a notification when triggered by
-any of these events.</p>
-
-<pre class="no-pretty-print">
- if( AInputEvent_getType( event ) == AINPUT_EVENT_TYPE_MOTION )
- {
- ndk_helper::GESTURE_STATE doubleTapState =
- eng->doubletap_detector_.Detect( event );
- ndk_helper::GESTURE_STATE dragState = eng->drag_detector_.Detect( event );
- ndk_helper::GESTURE_STATE pinchState = eng->pinch_detector_.Detect( event );
-
- //Double tap detector has a priority over other detectors
- if( doubleTapState == ndk_helper::GESTURE_STATE_ACTION )
- {
- //Detect double tap
- eng->tap_camera_.Reset( true );
- }
- else
- {
- //Handle drag state
- if( dragState & ndk_helper::GESTURE_STATE_START )
- {
- //Otherwise, start dragging
- ndk_helper::Vec2 v;
- eng->drag_detector_.GetPointer( v );
- eng->TransformPosition( v );
- eng->tap_camera_.BeginDrag( v );
- }
- // ...else other possible drag states...
-
- //Handle pinch state
- if( pinchState & ndk_helper::GESTURE_STATE_START )
- {
- //Start new pinch
- ndk_helper::Vec2 v1;
- ndk_helper::Vec2 v2;
- eng->pinch_detector_.GetPointers( v1, v2 );
- eng->TransformPosition( v1 );
- eng->TransformPosition( v2 );
- eng->tap_camera_.BeginPinch( v1, v2 );
- }
- // ...else other possible pinch states...
- }
- return 1;
- }
-</pre>
-
-<p>The {@code ndk_helper} class also provides access to a vector-math library
-({@code vecmath.h}), using it here to transform touch coordinates.</p>
-
-<pre class="no-pretty-print">
-void Engine::TransformPosition( ndk_helper::Vec2& vec )
-{
- vec = ndk_helper::Vec2( 2.0f, 2.0f ) * vec
- / ndk_helper::Vec2( gl_context_->GetScreenWidth(),
- gl_context_->GetScreenHeight() ) - ndk_helper::Vec2( 1.f, 1.f );
-}
-</pre>
-</ul>
-
-<p>The {@code HandleCmd()} method handles commands posted from the
-android_native_app_glue library. For more information about what the messages
-mean, refer to the comments in the {@code android_native_app_glue.h} and
-{@code .c} source files.</p>
-
-<pre class="no-pretty-print">
-void Engine::HandleCmd( struct android_app* app,
- int32_t cmd )
-{
- Engine* eng = (Engine*) app->userData;
- switch( cmd )
- {
- case APP_CMD_SAVE_STATE:
- break;
- case APP_CMD_INIT_WINDOW:
- // The window is being shown, get it ready.
- if( app->window != NULL )
- {
- eng->InitDisplay();
- eng->DrawFrame();
- }
- break;
- case APP_CMD_TERM_WINDOW:
- // The window is being hidden or closed, clean it up.
- eng->TermDisplay();
- eng->has_focus_ = false;
- break;
- case APP_CMD_STOP:
- break;
- case APP_CMD_GAINED_FOCUS:
- eng->ResumeSensors();
- //Start animation
- eng->has_focus_ = true;
- break;
- case APP_CMD_LOST_FOCUS:
- eng->SuspendSensors();
- // Also stop animating.
- eng->has_focus_ = false;
- eng->DrawFrame();
- break;
- case APP_CMD_LOW_MEMORY:
- //Free up GL resources
- eng->TrimMemory();
- break;
- }
-}
-</pre>
-
-<p>The {@code ndk_helper} class posts {@code APP_CMD_INIT_WINDOW} when {@code android_app_glue}
-receives an {@code onNativeWindowCreated()} callback from the system.
-Applications can normally perform window initializations, such as EGL
-initialization. They do this outside of the activity lifecycle, since the
-activity is not yet ready.</p>
-
-<pre class="no-pretty-print">
- //Init helper functions
- ndk_helper::JNIHelper::Init( state->activity, HELPER_CLASS_NAME );
-
- state->userData = &g_engine;
- state->onAppCmd = Engine::HandleCmd;
- state->onInputEvent = Engine::HandleInput;
-</pre>
diff --git a/docs/html/ndk/samples/samples_toc.cs b/docs/html/ndk/samples/samples_toc.cs
deleted file mode 100644
index 92266b1..0000000
--- a/docs/html/ndk/samples/samples_toc.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-<?cs # Table of contents for Dev Guide.
-
- For each document available in translation, add an localized title to this TOC.
- Do not add localized title for docs not available in translation.
- Below are template spans for adding localized doc titles. Please ensure that
- localized titles are added in the language order specified below.
-?>
-
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>ndk/samples/index.html">
- <span class="en">Overview</span></a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>ndk/samples/walkthroughs.html">
- <span class="en">Walkthroughs</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>ndk/samples/sample_hellojni.html">hello-jni</a></li>
- <li><a href="<?cs var:toroot ?>ndk/samples/sample_na.html">native-activity</a></li>
- <li><a href="<?cs var:toroot ?>ndk/samples/sample_teapot.html">Teapot</a></li>
- </ul>
- </li>
-</ul>
-
-
-<script type="text/javascript">
-<!--
- buildToggleLists();
- changeNavLang(getLangPref());
-//-->
-</script>
-
diff --git a/docs/html/ndk/samples/walkthroughs.jd b/docs/html/ndk/samples/walkthroughs.jd
deleted file mode 100644
index 88ceb56..0000000
--- a/docs/html/ndk/samples/walkthroughs.jd
+++ /dev/null
@@ -1,13 +0,0 @@
-page.title=Samples: Walkthroughs
-@jd:body
-
-<p>This section provides detailed walkthroughs of several key samples. The samples are as
-follows:</p>
-
-<li><a href="{@docRoot}ndk/samples/sample_hellojni.html">hello-jni</a>: A very basic app that
-illustrates core workings of the NDK.</li>
-<li><a href="{@docRoot}ndk/samples/sample_na.html">native-activity</a>: An app that shows the
-fundamentals of constructing a purely native app. It places particular emphasis on the
-{@code android_native_app_glue library}.</li>
-<li><a href="<a href="{@docRoot}ndk/samples/sample_teapot.html">Teapot</a>: A simple OpenGL demo,
-showcasing the <code>ndk_helper</code> class.</li>
diff --git a/docs/html/preview/_book.yaml b/docs/html/preview/_book.yaml
deleted file mode 100644
index ad67249..0000000
--- a/docs/html/preview/_book.yaml
+++ /dev/null
@@ -1,344 +0,0 @@
-toc:
-- title: Program Overview
- path: /preview/overview.html
- path_attributes:
- - name: es-lang
- value: Información general del programa
- - name: in-lang
- value: Ikhtisar Program
- - name: ja-lang
- value: プログラム概要
- - name: ko-lang
- value: 프로그램 개요
- - name: pt-br-lang
- value: Visão geral do programa
- - name: ru-lang
- value: Обзор программы
- - name: vi-lang
- value: Tổng quan về Chương trình
- - name: zh-cn-lang
- value: 计划概览
- - name: zh-tw-lang
- value: 程式總覽
-
-- title: Support and Release Notes
- path: /preview/support.html
-
-- title: Set Up the Preview
- path: /preview/setup-sdk.html
- path_attributes:
- - name: es-lang
- value: Configurar el SDK de la versión preliminar
- - name: in-lang
- value: Menyiapkan Preview
- - name: ja-lang
- value: Preview SDK のセットアップ
- - name: ko-lang
- value: 미리 보기 SDK 설정하기
- - name: pt-br-lang
- value: Configuração do Preview SDK
- - name: ru-lang
- value: Настройка пакета SDK Preview
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 设置预览版 SDK
- - name: zh-tw-lang
- value: 設定預覽版 SDK
-
-- title: Test on a Device
- path: /preview/download.html
- path_attributes:
- - name: es-lang
- value: Pruebe en un dispositivo
- - name: in-lang
- value: Menguji pada Perangkat
- - name: ja-lang
- value: デバイス上でテストする
- - name: ko-lang
- value: 기기에서 테스트
- - name: pt-br-lang
- value: Testar em um dispositivo
- - name: ru-lang
- value: Тестирование на устройстве
- - name: vi-lang
- value: Kiểm thử trên Thiết bị
- - name: zh-cn-lang
- value: 在设备上测试
- - name: zh-tw-lang
- value: 在裝置上測試
-
-- title: Behavior Changes
- path: /preview/behavior-changes.html
- path_attributes:
- - name: es-lang
- value: Cambios en los comportamientos
- - name: in-lang
- value: Perubahan Perilaku
- - name: ja-lang
- value: 動作の変更点
- - name: ko-lang
- value: 동작 변경
- - name: pt-br-lang
- value: Mudanças de comportamento
- - name: ru-lang
- value: Изменения в работе
- - name: vi-lang
- value: Các thay đổi Hành vi
- - name: zh-cn-lang
- value: 行为变更
- - name: zh-tw-lang
- value: 行為變更
- section:
- - title: Background Optimizations
- path: /preview/features/background-optimization.html
- path_attributes:
- - name: es-lang
- value: Optimizaciones en segundo plano
- - name: in-lang
- value: Optimisasi Latar Belakang
- - name: ja-lang
- value: バックグラウンド処理の最適化
- - name: ko-lang
- value: 백그라운드 최적화
- - name: pt-br-lang
- value: Otimizações em segundo plano
- - name: ru-lang
- value: Оптимизация фоновых процессов
- - name: vi-lang
- value: Tối ưu hóa Chạy ngầm
- - name: zh-cn-lang
- value: 后台优化
- - name: zh-tw-lang
- value: 背景最佳化
- - title: Language and Locale
- path: /preview/features/multilingual-support.html
- path_attributes:
- - name: es-lang
- value: Idioma y configuración regional
- - name: in-lang
- value: Bahasa dan Lokal
- - name: ja-lang
- value: 言語とロケール
- - name: ko-lang
- value: 언어 및 로케일
- - name: pt-br-lang
- value: Idioma e localidade
- - name: ru-lang
- value: Язык и языковой стандарт
- - name: vi-lang
- value: Ngôn ngữ và Bản địa
- - name: zh-cn-lang
- value: 语言和区域设置
- - name: zh-tw-lang
- value: 語言和地區設定
-
-- title: Android N for Developers
- path: /preview/api-overview.html
- path_attributes:
- - name: es-lang
- value: Información general de la API
- - name: in-lang
- value: Android N untuk Pengembang
- - name: ja-lang
- value: API の概要
- - name: ko-lang
- value: API 개요
- - name: pt-br-lang
- value: Visão geral da API
- - name: ru-lang
- value: Обзор API-интерфейсов
- - name: vi-lang
- value: Android N cho Nhà phát triển
- - name: zh-cn-lang
- value: API 概览
- - name: zh-tw-lang
- value: API 總覽
- section:
- - title: Multi-Window Support
- path: /preview/features/multi-window.html
- path_attributes:
- - name: es-lang
- value: Compatibilidad con ventanas múltiples
- - name: in-lang
- value: Dukungan Multi-Jendela
- - name: ja-lang
- value: マルチ ウィンドウのサポート
- - name: ko-lang
- value: 다중 창 지원
- - name: pt-br-lang
- value: Suporte a várias janelas
- - name: ru-lang
- value: Поддержка многооконного режима
- - name: vi-lang
- value: Hỗ trợ đa cửa sổ
- - name: zh-cn-lang
- value: 多窗口支持
- - name: zh-tw-lang
- value: 多視窗支援
- - title: Notifications
- path: /preview/features/notification-updates.html
- path_attributes:
- - name: es-lang
- value: Notificaciones
- - name: in-lang
- value: Pemberitahuan
- - name: ja-lang
- value: 通知
- - name: ko-lang
- value: 알림
- - name: pt-br-lang
- value: Notificações
- - name: ru-lang
- value: Уведомления
- - name: vi-lang
- value: Thông báo
- - name: zh-cn-lang
- value: 通知
- - name: zh-tw-lang
- value: 通知
- - title: Data Saver
- path: /preview/features/data-saver.html
- - title: TV Recording
- path: /preview/features/tv-recording-api.html
- path_attributes:
- - name: es-lang
- value: Grabación de TV
- - name: in-lang
- value: Perekaman TV
- - name: ja-lang
- value: TV の録画
- - name: ko-lang
- value: TV 녹화
- - name: pt-br-lang
- value: Gravação para TV
- - name: ru-lang
- value: Запись ТВ
- - name: vi-lang
- value: Ghi lại TV
- - name: zh-cn-lang
- value: TV 录制
- - name: zh-tw-lang
- value: 電視錄製
- - title: Key Attestation
- path: /preview/features/key-attestation.html
- - title: Network Security Configuration
- path: /preview/features/security-config.html
- path_attributes:
- - name: es-lang
- value: Configuración de seguridad de la red
- - name: ja-lang
- value: ネットワーク セキュリティ構成
- - name: ko-lang
- value: 네트워크 보안 구성
- - name: pt-br-lang
- value: Configurações de segurança de rede
- - name: ru-lang
- value: Конфигурация сетевой безопасности
- - name: vi-lang
- value: Cấu hình Bảo mật mạng
- - name: zh-cn-lang
- value: 网络安全配置
- - name: zh-tw-lang
- value: 網路安全性設定
- - title: ICU4J Support
- path: /preview/features/icu4j-framework.html
- path_attributes:
- - name: es-lang
- value: API de ICU4J del framework de Android
- - name: in-lang
- value: ICU4J Android Framework API
- - name: ja-lang
- value: ICU4J Android フレームワーク API
- - name: ko-lang
- value: ICU4J Android 프레임워크 API
- - name: pt-br-lang
- value: APIs de estrutura do Android para ICU4J
- - name: ru-lang
- value: API-интерфейсы ICU4J в платформе Android
- - name: vi-lang
- value: API Khuôn khổ Android ICU4J
- - name: zh-cn-lang
- value: ICU4J Android 框架 API
- - name: zh-tw-lang
- value: ICU4J Android 架構 API
- - title: Java 8 Language Features
- path: /preview/j8-jack.html
- path_attributes:
- - name: es-lang
- value: Funciones del lenguaje Java 8
- - name: in-lang
- value: Fitur Bahasa Java 8
- - name: ja-lang
- value: Java 8 の機能
- - name: ko-lang
- value: Java 8 언어 기능
- - name: pt-br-lang
- value: Recursos de linguagem do Java 8
- - name: ru-lang
- value: Возможности языка Java 8
- - name: vi-lang
- value: Tính năng của Ngôn ngữ Java 8
- - name: zh-cn-lang
- value: Java 8 语言功能
- - name: zh-tw-lang
- value: Java 8 語言功能
- - title: Android for Work Updates
- path: /preview/features/afw.html
- - title: Scoped Directory Access
- path: /preview/features/scoped-folder-access.html
- path_attributes:
- - name: es-lang
- value: Acceso a directorios determinados
- - name: ja-lang
- value: 特定のディレクトリへのアクセス
- - name: ko-lang
- value: 범위가 지정된 디렉터리 액세스
- - name: pt-br-lang
- value: Acesso a diretórios com escopo
- - name: ru-lang
- value: Доступ к выделенным каталогам
- - name: vi-lang
- value: Truy cập Thư mục theo Phạm vi
- - name: zh-cn-lang
- value: 作用域目录访问
- - name: zh-tw-lang
- value: 限定範圍目錄存取
-
-- title: Samples
- path: /preview/samples.html
- path_attributes:
- - name: es-lang
- value: Ejemplos
- - name: in-lang
- value: Contoh
- - name: ja-lang
- value: サンプル
- - name: ko-lang
- value: 샘플
- - name: pt-br-lang
- value: Exemplos
- - name: ru-lang
- value: Примеры
- - name: zh-cn-lang
- value: 示例
- - name: zh-tw-lang
- value: 範例
-
-- title: License Agreement
- path: /preview/license.html
- path_attributes:
- - name: es-lang
- value: Contrato de licencia
- - name: ja-lang
- value: 使用許諾契約
- - name: ko-lang
- value: 라이선스 계약
- - name: pt-br-lang
- value: Contrato de licença
- - name: ru-lang
- value: Лицензионное соглашение
- - name: zh-cn-lang
- value: 许可协议
- - name: zh-tw-lang
- value: 授權協議
diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
deleted file mode 100644
index 3373fc4..0000000
--- a/docs/html/preview/api-overview.jd
+++ /dev/null
@@ -1,1117 +0,0 @@
-page.title=Android N for Developers
-meta.tags="preview", "androidn"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-apis_2x.png
-@jd:body
-
-
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>Key Developer Features</h2>
- <ol>
- <ul style="list-style-type:none;">
- <li><a href="#multi-window_support">Multi-window Support</a></li>
- <li><a href="#notification_enhancements">Notifications</a></li>
- <li><a href="#jit_aot">JIT/AOT Compilation</a></li>
- <li><a href="#quick_path_to_app_install">Quick Path to App Install</a></li>
- <li><a href="#doze_on_the_go">Doze on the Go</a></li>
- <li><a href="#background_optimizations">Background Optimizations</a></li>
- <li><a href="#surfaceview">SurfaceView</a></li>
- <li><a href="#data_saver">Data Saver</a></li>
- <li><a href="#vulkan">Vulkan API</a></li>
- <li><a href="#tile_api">Quick Settings Tile API</a></li>
- <li><a href="#number-blocking">Number Blocking</a></li>
- <li><a href="#call_screening">Call Screening</a></li>
- <li><a href="#multi-locale_languages">Locales and Languages</a></li>
- <li><a href="#emoji">New Emojis</a></li>
- <li><a href="#icu4">ICU4J APIs in Android</a></li>
- <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
- <li><a href="#android_tv_recording">Android TV Recording</a></li>
- <li><a href="#android_for_work">Android for Work</a></li>
- <li><a href="#accessibility_enhancements">Accessibility</a></li>
- <li><a href="#direct_boot">Direct Boot</a></li>
- <li><a href="#key_attestation">Key Attestation</a></li>
- <li><a href="#network_security_config">Network Security Config</a></li>
- <li><a href="#default_trusted_ca">Default Trusted CA</a></li>
- <li><a href="#apk_signature_v2">APK Signature Scheme v2</a></li>
- <li><a href="#scoped_directory_access">Scoped Directory Access</a></li>
- <li><a href="#keyboard_shortcuts_helper">Keyboard Shortcuts Helper</a></li>
- <li><a href="#custom_pointer_api">Custom Pointer API</a></li>
- <li><a href="#sustained_performance_api">Sustained Performance API</a></li>
- <li><a href="#vr">VR Support</a></li>
- <li><a href="#print_svc">Print Service Enhancements</a></li>
- <li><a href="#virtual_files">Virtual Files</a></li>
- <li><a href="#framemetrics_api">FrameMetricsListener API</a></li>
- </ol>
-</div>
-</div>
-
-
-
-<p>Android N is still in active development, but you can try it
-now as part of the N Developer Preview. The sections below highlight some of
-the new features for developers. </p>
-
-<p>
- Make sure to check out the <a href=
- "{@docRoot}preview/behavior-changes.html">Behavior Changes</a> to learn about
- areas where platform changes may affect your apps, take a look at the
- developer guides to learn more about key features, and download the <a href=
- "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a> for details on
- new APIs.
-</p>
-
-<h2 id="multi-window_support">Multi-window Support</h2>
-
-
-<p>In Android N, we're introducing a new and much-requested multitasking feature
-into the platform — multi-window support. </p>
-
- <p>Users can now pop open two apps on the screen at once. </p>
- <ul>
- <li>On phones and tablets
-running Android N, users can run two apps side-by-side or
-one-above-the-other in splitscreen mode. Users can resize the apps by dragging
-the divider between them. </li>
-
-<li>On Android TV devices, apps can put themselves in <a
-href="{@docRoot}preview/features/picture-in-picture.html">picture-in-picture
-mode</a>, allowing them to continue showing content while the user browses or
-interacts with other apps.</li>
- </ul>
-
-<div class="col-4of10">
-<img src="{@docRoot}preview/images/mw-portrait.png" alt="" style="height:460px;padding-left:1em;"
- id="img-split-screen" />
-<p class="img-caption">
- <strong>Figure 1.</strong> Apps running in split-screen mode.
-</p>
-
- </div>
-
-<p>Especially on tablets and other larger-screen devices, multi-window support
-gives you new ways to engage users. You can even enable drag-and-drop in
-your app to let users conveniently drag content to or from your app — a great
-way to enhance your user experience. </p>
-
-<p>It's straightforward to add multi-window support to your app and configure how it
-handles multi-window display. For example, you can specify your activity's
-minimum allowable dimensions, preventing users from resizing the activity below
-that size. You can also disable multi-window display for your app, which
- ensures that the system will only show your app in full-screen mode.</p>
-
-<p>
- For more information, see the <a href=
- "{@docRoot}preview/features/multi-window.html">Multi-Window Support</a>
- developer documentation.
-</p>
-
-<h2 id="notification_enhancements">Notification Enhancements</h2>
-
-<p>In Android N we've redesigned notifications to make them easier and faster to
-use. Some of the changes include:</p>
-
-<ul>
- <li>
- <strong>Template updates</strong>: We're updating notification templates to
- put a new emphasis on hero image and avatar. Developers will be able to
- take advantage of the new templates with minimal adjustments in their code.
- </li>
-
- <li>
- <strong>Messaging style customization</strong>: You can customize more of
- the user interface labels associated with your notifications using the
- <code>MessagingStyle</code> class. You can configure the message,
- conversation title, and content view.
- </li>
-
- <li>
- <strong>Bundled notifications</strong>: The system can group messages
- together, for example by message topic, and display the group. A user can
- take actions, such as Dismiss or Archive, on them in place. If you’ve
- implemented notifications for Android Wear, you’ll already be familiar with
- this model.
- </li>
-
- <li>
- <strong>Direct reply</strong>: For real-time communication apps, the
- Android system supports inline replies so that users can quickly respond to
- an SMS or text message directly within the notification interface.
- </li>
-
- <li>
- <strong>Custom views</strong>: Two new APIs enable you to leverage system
- decorations, such as notification headers and actions, when using custom
- views in notifications.
- </li>
-</ul>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-1.png" alt=""
- style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-3.png" alt=""
- style="padding:.5em;max-width:226px">
-</div>
-
-<div class="col-4of12">
- <img src="{@docRoot}preview/images/notifications-2.png" alt=""
- style="padding:.5em;max-width:226px">
-</div>
-
-
-<p class="img-caption">
- <strong>Figure 2.</strong> Bundled notifications and direct reply.
-</p>
-
-<p>To learn how to implement the new features, see the
- <a href="{@docRoot}preview/features/notification-updates.html">Notifications</a>
- guide.</p>
-
-
-
-<h2 id="jit_aot">Profile-guided JIT/AOT Compilation</h2>
-
-<p>In Android N, we've added a Just in Time (JIT) compiler with code profiling to
-ART, which lets it constantly improve the performance of Android apps as they
-run. The JIT compiler complements ART's current Ahead of Time (AOT) compiler
-and helps improve runtime performance, save storage space, and speed up app
-updates and system updates.</p>
-
-<p>Profile-guided compilation lets ART manage the AOT/JIT compilation for each app
-according to its actual usage, as well as conditions on the device. For
-example, ART maintains a profile of each app's hot methods and can precompile
-and cache those methods for best performance. It leaves other parts of the app
-uncompiled until they are actually used.</p>
-
-<p>Besides improving performance for key parts of the app, profile-guided
-compilation helps reduce an app's overall RAM footprint, including associated
-binaries. This feature is especially important on low-memory devices.</p>
-
-<p>ART manages profile-guided compilation in a way that minimizes impact on the
-device battery. It does precompilation only when then the device is idle and
-charging, saving time and battery by doing that work in advance.</p>
-
-<h2 id="quick_path_to_app_install">Quick Path to App Install</h2>
-
-<p>One of the most tangible benefits of ART's JIT compiler is the speed of app
-installs and system updates. Even large apps that required several minutes to
-optimize and install in Android 6.0 can now install in just a matter of
-seconds. System updates are also faster, since there's no more optimizing step. </p>
-
-<h2 id="doze_on_the_go">Doze on the Go...</h2>
-
-<p>Android 6.0 introduced Doze, a system mode that saves battery by deferring
-apps' CPU and network activities when the device is idle, such as when it's
-sitting on a table or in a drawer. </p>
-
-<p>Now in Android N, Doze takes a step further and saves battery while on the go.
-Any time the screen is off for a period of time and the device is unplugged,
-Doze applies a subset of the familiar CPU and network restrictions to apps.
-This means users can save battery even when carrying their devices in their
-pockets.</p>
-
-
-<img src="/preview/images/doze-diagram-1.png"
- alt="" id="figure1" />
-<p class="img-caption">
- <strong>Figure 3.</strong> Doze now applies
- restrictions to improve battery life even when the device is not stationary.
-</p>
-
-
-<p>A short time after the screen turns off while the device is on battery, Doze
-restricts network access and defers jobs and syncs. During brief maintenance
-windows, applications are allowed network access and any of their deferred
-jobs/syncs are executed. Turning the screen on or plugging in the device brings
-the device out of Doze.</p>
-
-<p>When the device is stationary again, with screen off and on battery for a
-period of time, Doze applies the full CPU and network restrictions on {@link
-android.os.PowerManager.WakeLock}, {@link android.app.AlarmManager} alarms, and
-GPS/Wi-Fi scans.</p>
-
-<p>The best practices for adapting your app to Doze are the same whether the
-device is moving or not, so if you already updated your app to gracefully
-handle Doze, you're all set. If not, start <a
-href="{@docRoot}training/monitoring-device-state/doze-standby.html#assessing_your_app">adapting
-your app to Doze</a> now.</p>
-
-<h2 id="background_optimizations">Project Svelte: Background Optimizations</h2>
-
-<p>Project Svelte is an ongoing effort to minimize RAM use by system and apps
-across the range of Android devices in the ecosystem. In Android N, Project
-Svelte is focused on optimizing the way apps run in the background. </p>
-
-<p>Background processing is an essential part of most apps. When handled right, it
-can make your user experience amazing — immediate, fast, and context-aware.
-When not handled right, background processing can needlessly consume RAM (and
-battery) and affect system performance for other apps. </p>
-
-<p>Since Android 5.0, {@link android.app.job.JobScheduler} has been the
-preferred way of performing background work in a way that's good
-for users. Apps can schedule jobs while letting the system optimize based on
-memory, power, and connectivity conditions. JobScheduler offers control and
-simplicity, and we want all apps to use it. </p>
-
-<p>
- Another good option is <a href=
- "https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmNetworkManager">
- <code>GCMNetworkManager</code></a>, part of Google Play Services, which
- offers similar job scheduling with compatibility across legacy versions of
- Android.
-</p>
-
-<p>We're continuing to extend <code>JobScheduler</code> and
-<code>GCMNetworkManager</code> to meet more of
-your use cases — for example, in Android N you can now schedule background
-work based on changes in Content Providers. At the same time we're starting to
-deprecate some of the older patterns that can reduce system performance,
-especially on low-memory devices.</p>
-
-<p>In Android N we're removing three commonly-used implicit broadcasts —
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
- android.hardware.Camera#ACTION_NEW_PICTURE}, and {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} — since those can wake the
-background processes of multiple apps at once and strain memory and battery. If
-your app is receiving these, take advantage of the N Developer Preview to
- migrate to <code>JobScheduler</code> and related APIs instead. </p>
-
-<p>
- Take a look at the <a href=
- "{@docRoot}preview/features/background-optimization.html">Background
- Optimizations</a> documentation for details.
-</p>
-
-<h2 id="surfaceview">SurfaceView</h2>
-<p>
-Android N brings synchronous movement to the {@link android.view.SurfaceView}
-class, which provides better battery performance
-than {@link android.view.TextureView} in certain cases: When rendering video or
-3D content, apps with scrolling and animated video position use less power with
-{@link android.view.SurfaceView} than with {@link android.view.TextureView}.
-</p>
-
-The {@link android.view.SurfaceView} class enables more battery-efficient compositing on
-screen, because it is composited in dedicated hardware, separately from app
-window content. As a result, it makes fewer intermediate
-copies than {@link android.view.TextureView}.
-</p>
-
-<p>
-A {@link android.view.SurfaceView} object's content position is now updated synchronously
-with the containing app content. One result of this change is that simple
-translations or scales of a video playing in a {@link android.view.SurfaceView}
-no longer produce black bars alongside the view as it moves.
-</p>
-
-<p>
-Starting with Android N, we strongly recommend that you save power by using
-{@link android.view.SurfaceView} instead of {@link android.view.TextureView}.
-</p>
-
-<h2 id="data_saver">Data Saver</h2>
-
-<div class="col-5of12" style="margin-right:1.5em;">
-<img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
-
-<p class="img-caption" style="padding-right:2em;">
- <strong>Figure 4.</strong> Data Saver in Settings.
-</p>
- </div>
-
-<p>Over the life of a mobile device, the cost of a cellular data plan typically
-exceeds the cost of the device itself. For many users, cellular data is an
-expensive resource that they want to conserve. </p>
-
-<p>Android N introduces Data Saver mode, a new system service that helps reduce
-cellular data use by apps, whether roaming, near the end of the billing cycle,
-or on a small prepaid data pack. Data Saver gives users control over how apps
-use cellular data and lets developers provide more efficient service when Data
-Saver is on. </p>
-
-<p>When a user enables Data Saver in <strong>Settings</strong> and the device is
-on a metered network, the system blocks background data usage and signals apps
-to use less data in the foreground wherever possible — such as by limiting
-bit rate for streaming, reducing image quality, deferring optimistic precaching,
-and so on. Users can whitelist specific apps to allow background metered data
-usage even when Data Saver is turned on.</p>
-
-<p>Android N extends the {@link android.net.ConnectivityManager} to provide apps a
-way to <a href="{@docRoot}preview/features/data-saver.html#status">retrieve the
-user's Data Saver preferences</a> and <a
-href="{@docRoot}preview/features/data-saver.html#monitor-changes">monitor
-preference changes</a>. All apps should check whether the user has enabled Data
-Saver and make an effort to limit foreground and background data usage.</p>
-
-
-<h2 id="vulkan">Vulkan API</h2>
-
-<p>
- Android N integrates <a href="http://www.khronos.org/vulkan" class=
- "external-link">Vulkan™</a>, a new 3D rendering API, into the platform. Like
- <a href="https://www.khronos.org/opengles/" class="external-link">OpenGL™
- ES</a>, Vulkan is an open standard for 3D graphics and rendering maintained
- by the Khronos Group.
-</p>
-
-<p>
- Vulkan is designed from the ground up to minimize CPU overhead in the driver,
- and allow your application to control GPU operation more directly. Vulkan
- also enables better parallelization by allowing multiple threads to perform
- work such as command buffer construction at once.
-</p>
-
-<p>
- Vulkan development tools and libraries are rolled into the Android NDK. They
- include:
-</p>
-
-<ul>
- <li>Headers
- </li>
-
- <li>Validation layers (debug libraries)
- </li>
-
- <li>SPIR-V shader compiler
- </li>
-
- <li>SPIR-V runtime shader compilation library
- </li>
-</ul>
-
-<p>
- Vulkan is only available to apps on devices with Vulkan-capable hardware,
- such as Nexus 5X, Nexus 6P, and Nexus Player. We're working closely with our
- partners to bring Vulkan to more devices as soon as possible.
-</p>
-
-<p>
- For more information, see the the <a href=
- "{@docRoot}ndk/guides/graphics/index.html">API documentation</a>.
-</p>
-
-<h2 id="tile_api">Quick Settings Tile API</h2>
-
-
-<div style="float:right;max-width:320px">
-<img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
-
-<p class="img-caption" style="padding-left:2em;">
- <strong>Figure 5.</strong> Quick Settings tiles in the notification shade.
-</p>
-
-
- </div><p>Quick Settings is a popular and simple way to expose key settings and actions,
-directly from the notification shade. In Android N, we've expanded the scope of
-Quick Settings to make it even more useful and convenient. </p>
-
-<p>We've added more room for additional Quick Settings tiles, which users can
-access across a paginated display area by swiping left or right. We've also
-given users control over what Quick Settings tiles appear and where they are
-displayed — users can add or move tiles just by dragging and dropping them. </p>
-
-<p>For developers, Android N also adds a new API that lets you define your own
- Quick Settings tiles to give users easy access to key controls and actions in your app.</p>
-
-<p>
- Quick Settings tiles are reserved for controls or actions that are either
- urgently required or frequently used, and should not be used as shortcuts to
- launching an app.
-</p>
-
-<p>
- Once you’ve defined your tiles, you can surface them to users, who can add
- them to Quick Settings just by drag and drop.
-</p>
-
-<p>
- For information about creating an app tile, see the documentation for
- <code>android.service.quicksettings.Tile</code> in the downloadable <a href=
- "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
-</p>
-
-
-
-<h2 id="number-blocking">Number Blocking</h2>
-
-<p>Android N now supports number blocking in the platform and provides a
-framework API to let service providers maintain a blocked-number list. The
-default SMS app, the default phone app, and carrier apps can read from and
-write to the blocked-number list. The list is not accessible to other apps.</p>
-
-<p>By making number blocking a standard feature of the platform, Android provides
-a consistent way for apps to support number blocking across a wide range of
-devices. Among the other benefits that apps can take advantage of are:</p>
-
-<ul>
- <li> Numbers blocked on calls are also blocked on texts
- <li> Blocked numbers can persist across resets and devices through the Backup &
-Restore feature
- <li> Multiple apps can use the same blocked numbers list
-</ul>
-
-<p>Additionally, carrier app integration through Android means that carriers can
-read the blocked numbers list on the device and perform service-side blocking
-for the user in order to stop unwanted calls and texts from reaching the user
-through any medium, such as a VOIP endpoint or forwarding phones.</p>
-
-<p>
- For more information, see <code>android.provider.BlockedNumberContract</code>
- in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
- Reference</a>.
-</p>
-
-<h2 id="call_screening">Call Screening</h2>
-
-<p>
- Android N allows the default phone app to screen incoming calls. The phone
- app does this by implementing the new <code>CallScreeningService</code>,
- which allows the phone app to perform a number of actions based on an
- incoming call's {@link android.telecom.Call.Details Call.Details}, such as:
-</p>
-
-<ul>
- <li> Reject the incoming call
- <li> Do not allow the call to the call log
- <li> Do not show the user a notification for the call
-</ul>
-
-<p>
- For more information, see <code>android.telecom.CallScreeningService</code>
- in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
- Reference</a>.
-</p>
-
-
-<h2 id="multi-locale_languages">Multi-locale Support, More Languages</h2>
-
-
-<p>Android N now lets users select <strong>multiple locales</strong> in Settings,
-to better support bilingual use-cases. Apps can use
-a new API to get the user's selected locales and then offer more sophisticated
-user experiences for multi-locale users — such as showing search results in
-multiple languages and not offering to translate webpages in a language the
-user already knows.</p>
-
-<p>Along with multi-locale support, Android N also expands the range of languages
-available to users. It offers more than 25 variants each for commonly used
-languages such as English, Spanish, French, and Arabic. It also adds partial
-support for more than 100 new languages.</p>
-
-<p>Apps can get the list of locales set by the user by calling
-<code>LocaleList.GetDefault()</code>. To support the expanded number of locales, Android N is
-changing the way that it resolves resources. Make sure that you test and verify that your apps
-working as expected with the new resource resolution logic.</p>
-
-<p>To learn about the new resource-resolution behavior and the best practices you
-should follow, see <a href="{@docRoot}preview/features/multilingual-support.html"
->Multilingual Support</a>.</p>
-
-
-<h2 id="emoji">New Emojis</h2>
-
-<p>
- Android N introduces additional emojis and emoji-related features including
- skin tone emojis and support for variation
- selectors. If your app supports emojis,
- follow the guidelines below to take advantage of these emoji-related features.
-</p>
-
-<ul>
- <li>
- <strong>Check that a device contains an emoji before inserting it.</strong>
- To check which emojis are present in the
- system font, use the {@link android.graphics.Paint#hasGlyph(String)} method.
- </li>
- <li>
- <strong>Check that an emoji supports variation selectors.</strong>
- Variation selectors allow you to
- present certain emojis in color or in black-and-white.
- On mobile devices, apps should represent emojis in color rather than black-and-white. However,
- if your app displays emojis inline with text, then it should use the black-and-white variation.
- To determine whether an emoji has a variation, use the variation selector.
- For a complete list of characters with variations, review the
- <em>emoji variation sequences</em> section of the
- <a class="external-link"
- href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
- Unicode documentation on variations</a>.
- </li>
- <li>
- <strong>Check that an emoji supports skin tone.</strong> Android N allows users to modify the
- rendered skin tone of emojis to their preference. Keyboard apps should provide visual
- indications for emojis that have multiple skin tones and should allow users to
- select the skin tone that they prefer. To determine which system emojis have
- skin tone modifiers, use the {@link android.graphics.Paint#hasGlyph(String)}
- method. You can determine which emojis use skin tones by reading the
- <a class="external-link"
- href="http://unicode.org/emoji/charts/full-emoji-list.html">
- Unicode documentation</a>.
- </li>
-</ul>
-
-
-<h2 id="icu4">ICU4J APIs in Android</h2>
-
-<p>
- Android N now offers a subset of <a href=
- "http://site.icu-project.org/">ICU4J</a> APIs in the Android framework under
- the <code>android.icu</code> package. Migration is easy, and mostly entails
- simply changing from the <code>com.java.icu</code> namespace to
- <code>android.icu</code>. If you are already using an ICU4J bundle in your
- apps, switching to the <code>android.icu</code> APIs provided in the Android
- framework can produce substantial savings in APK size.
-</p>
-
-<p>
- To learn more about the Android ICU4J APIs, see <a href=
- "{@docRoot}preview/features/icu4j-framework.html">ICU4J Support</a>.
-</p>
-
-
-
-<h2 id="gles_32">OpenGL™ ES 3.2 API</h2>
-
-<p>Android N adds framework interfaces and platform support for OpenGL ES 3.2, including:</p>
-
-<ul>
- <li> All extensions from the <a class="external-link"
-href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
-Android Extension Pack</a></a> (AEP) except for <code>EXT_texture_sRGB_decode</code>.
- <li> Floating-point framebuffers for HDR and deferred shading.
- <li> BaseVertex draw calls to enable better batching and streaming.
- <li> Robust buffer access control to reduce WebGL overhead.
-</ul>
-
-<p>The framework API for OpenGL ES 3.2 on Android N is provided with the
-<code>GLES32</code> class. When using OpenGL ES 3.2, be sure to declare the
-requirement in your manifest file, using the <code><uses-feature></code> tag and
-the <code>android:glEsVersion</code> attribute. </p>
-
-<p>For information about using OpenGL ES, including how to check a device's
-supported OpenGL ES version at runtime, see the <a
-href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES API guide</a>.</p>
-
-
-<h2 id="android_tv_recording">Android TV Recording</h2>
-
-<p>Android N adds the ability to record and playback content from Android TV input
-services via new recording APIs. Building on top of existing time-shifting
-APIs, TV input services can control what channel data can be recorded, how
-recorded sessions are saved, and manage user interaction with recorded content. </p>
-
-<p>For more information, see <a
-href="{@docRoot}preview/features/tv-recording-api.html">Android TV Recording APIs</a>.</p>
-
-
-<h2 id="android_for_work">Android for Work</h2>
-
-<p>Android for Work adds many new features and APIs for devices running Android N.
-Some highlights are below — for a complete list of changes, see
-<a href="{@docRoot}preview/features/afw.html">Android for Work Updates</a>.</p>
-
-<h3 id="work_profile_security_challenge">Work profile security challenge </h3>
-
-<p>
- Profile owners targeting the N SDK
- can specify a separate security challenge for apps running in
- the work profile. The work challenge is shown when a user attempts to open
- any work apps. Successful completion of the security challenge unlocks the
- work profile and decrypts it if necessary. For profile owners,
- <code>ACTION_SET_NEW_PASSWORD</code> prompts the user to set a work
- challenge, and <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> prompts
- the user to set a device lock.
-</p>
-
-<p>
- Profile owners can set distinct passcode policies for the work challenge
- (such as how long the PIN needs to be, or whether a fingerprint can be used
- to unlock the profile) using the <code>setPasswordQuality()</code>,
- <code>setPasswordMinimumLength()</code> and related methods. The profile
- owner can also set the device lock using the <code>DevicePolicyManager</code>
- instance returned by the new <code>getParentProfileInstance()</code> method.
- Additionally, profile owners can customize the credentials screen for the
- work challenge using the new <code>setOrganizationColor()</code> and
- <code>setOrganizationName()</code> methods.
-</p>
-<h3 id="turn_off_work">Turn off work </h3>
-
-<p>On a device with a work profile, users can toggle work mode. When work mode is
-off the managed user is temporarily shut down, which disables work profile
-apps, background sync, and notifications. This includes the profile owner
-application. When work mode is off, the system displays a persistent status
-icon to remind the user that they can't launch work apps. The launcher
-indicates that work apps and widgets are not accessible. </p>
-
-<h3 id="always_on_vpn">Always on VPN </h3>
-
-<p>Device owners and profile owners can ensure that work apps always connect
-through a specified VPN. The system automatically starts that VPN after the
-device boots.</p>
-
-<p>
- New <code>DevicePolicyManager</code> methods are
- <code>setAlwaysOnVpnPackage()</code> and
- <code>getAlwaysOnVpnPackage()</code>.
-</p>
-
-<p>Because VPN services can be bound directly by the system without app
-interaction, VPN clients need to handle new entry points for Always on VPN. As
-before, services are indicated to the system by an intent filter matching
-action <code>android.net.VpnService</code>. </p>
-
-<p>
- Users can also manually set Always on VPN clients that implement
- <code>VPNService</code> methods in the primary user using
- <strong>Settings>More>Vpn</strong>.
-</p>
-
-<h3 id="custom_provisioning">Customized provisioning</h3>
-
-<p>
- An application can customize the profile owner and device owner provisioning
- flows with corporate colors and logos.
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code> customizes
- flow color. <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- customizes the flow with a corporate logo.
-</p>
-
-<h2 id="accessibility_enhancements">Accessibility Enhancements</h2>
-
-<p>Android N now offers Vision Settings directly on the Welcome screen for new
-device setup. This makes it much easier for users to discover and configure
-accessibility features on their devices, including magnification gesture, font
-size, display size, and TalkBack. </p>
-
-<p>With these accessibility features getting more prominent placement, your users
-are more likely to try your app with them enabled. Make sure you test your apps
-early with these settings enabled. You can enable them from Settings >
-Accessibility.</p>
-
-<p>Also in Android N, accessibility services can now help users with motor
-impairments to touch the screen. The new API allows building services with
-features such as face-tracking, eye-tracking, point scanning, and so on, to
-meet the needs of those users.</p>
-
-<p>For more information, see <code>android.accessibilityservice.GestureDescription</code>
- in the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.</p>
-
-
-<h2 id="direct_boot">Direct Boot</h2>
-
-<p>Direct boot improves device startup times and lets registered
-apps have limited functionality even after an unexpected reboot.
-For example, if an encrypted device reboots while the user is sleeping,
-registered alarms, messages and incoming calls can now continue to notify
-the user as normal. This also means accessibility services can also be
- available immediately after a restart.</p>
-
-<p>Direct boot takes advantage of file based encryption in Android N
-to enable fine grained encryption policies for both system and app data.
-The system uses a device-encrypted store for select system data and explicitly
-registered app data. By default a credential-encrypted store is used for all
- other system data, user data, apps, and app data. </p>
-
-<p>At boot, the system starts in a restricted mode with access to
-device-encrypted data only, and without general access to apps or data.
-If you have components that you want to run in this mode, you can register
-them by setting a flag in the manifest. After restart, the system activates
-registered components by broadcasting the <code>LOCKED_BOOT_COMPLETED</code>
-intent. The system ensures registered device-encrypted app data is available
-before unlock. All other data is unavailable until the User confirms their lock
- screen credentials to decrypt it. </p>
-
-For more information, see <a href="{@docRoot}preview/features/direct-boot.html">Direct Boot</a>.</p>
-</p>
-
-<h2 id="key_attestation">Key Attestation</h2>
-
-<p>
- Android N introduces <em>key attestation</em>, a new security tool that helps
- you make sure that the key pairs stored within a device's <a class=
- "external-link" href=
- "https://source.android.com/security/keystore/"><em>hardware-backed
- keystore</em></a> properly protect the sensitive information that your app
- uses. By using this tool, you gain additional confidence that your app
- interacts with keys that reside in secure hardware, even if the device
- running your app is rooted. If you use keys from the hardware-backed keystore
- in your apps, you should use this tool, particularly if you use the keys to
- verify sensitive information within your app.
-</p>
-
-<p>
- Key attestation allows you to verify that an RSA or EC key pair has been
- created and stored in a device’s hardware-backed keystore within the device’s
- trusted execution environment (TEE). The tool also allows you to use an
- off-device service, such as your app's back-end server, to determine and
- strongly verify the uses and validity of the key pair. These features provide
- an additional level of security that protects the key pair, even if someone
- roots the device or compromises the security of the Android platform running
- on the device.
-</p>
-
-<p>
- For more information, see the
- <a href="{@docRoot}preview/features/key-attestation.html">Key Attestation</a>
- developer documentation.
-</p>
-
-<h2 id="network_security_config">Network Security Config</h2>
-
-<p>In Android N, apps can customize the behavior of their secure (HTTPS, TLS)
-connections safely, without any code modification, by using the declarative
-<em>Network Security Config</em> instead of using the conventional
-error-prone programmatic APIs (e.g. X509TrustManager).</p>
-
- <p>Supported features:</p>
-<ul>
-<li><b>Custom trust anchors.</b> Lets an application customize which
-Certificate Authorities (CA) are trusted for its secure connections. For
-example, trusting particular self-signed certificates or a restricted set of public CAs.
-</li>
-<li><b>Debug-only overrides.</b> Lets an application developer safely debug
-secure connections of their application without added risk to the installed
-base.
-</li>
-<li><b>Cleartext traffic opt-out.</b> Lets an application protect itself from
-accidental usage of cleartext traffic.</li>
-<li><b>Certificate pinning.</b> An advanced feature that lets an application
- limit which server keys are trusted for secure connections.</li>
-</ul>
-
-<p>For more information, see <a
-href="{@docRoot}preview/features/security-config.html">Network Security
-Config</a>.</p>
-
-<h2 id="default_trusted_ca">Default Trusted Certificate Authority</h2>
-
-<p>By default, apps that target Android N only trust system-provided certificates
-and no longer trust user-added Certificate Authorities (CA). Apps targeting Android
-N that wish to trust user-added CAs should use the
-<a href="{@docRoot}preview/features/security-config.html">Network Security Config</a> to
-specify how user CAs should be trusted.</p>
-
-<h2 id="apk_signature_v2">APK Signature Scheme v2</h2>
-
-<p>
- Android N introduces APK Signature Scheme v2, a new app-signing scheme that
- offers faster app install times and more protection against unauthorized
- alterations to APK files. By default, Android Studio 2.2 and the Android
- Plugin for Gradle 2.2 sign your app using both APK Signature Scheme v2 and
- the traditional signing scheme, which uses JAR signing.
-</p>
-
-<p>
- Although we recommend applying APK Signature Scheme v2 to your app, this new
- scheme is not mandatory. If your app doesn't build properly when using APK
- Signature Scheme v2, you can disable the new scheme. The disabling process
- causes Android Studio 2.2 and the Android Plugin for Gradle 2.2 to sign your
- app using only the traditional signing scheme. To sign with only the
- traditional scheme, open the module-level <code>build.gradle</code> file, then
- add the line <code>v2SigningEnabled false</code> to your release signing
- configuration:
-</p>
-
-<pre>
- android {
- ...
- defaultConfig { ... }
- signingConfigs {
- release {
- storeFile file("myreleasekey.keystore")
- storePassword "password"
- keyAlias "MyReleaseKey"
- keyPassword "password"
- <strong>v2SigningEnabled false</strong>
- }
- }
- }
-</pre>
-
-<p class="caution"><strong>Caution: </strong> If you sign your app using APK
- Signature Scheme v2 and make further changes to the app, the app's signature
- is invalidated. For this reason, use tools such as <code>zipalign</code>
- before signing your app using APK Signature Scheme v2, not after.
-</p>
-
-<p>
- For more information, read the Android Studio documents that describe how to
- <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
- sign an app</a> in Android Studio and how to <a href=
- "{@docRoot}studio/build/build-variants.html#signing"> configure
- the build file for signing apps</a> using the Android Plugin for Gradle.
-</p>
-
-<h2 id="scoped_directory_access">Scoped Directory Access</h2>
-
-<p>In Android N, apps can use new APIs to request access to specific <a
-href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">external
-storage</a> directories, including directories on removable media such as SD
-cards. The new APIs greatly simplify how your application accesses standard
-external storage directories, such as the <code>Pictures</code> directory. Apps
-like photo apps can use these APIs instead of using
-<code>READ_EXTERNAL_STORAGE</code>, which grants access to all storage
-directories, or the Storage Access Framework, which makes the user navigate to
-the directory.</p>
-
-<p>Additionally, the new APIs simplify the steps a user takes to grant external
-storage access to your app. When you use the new APIs, the system uses a simple
-permissions UI that clearly details what directory the application is
-requesting access to.</p>
-
-<p>For more information, see the
-<a href="{@docRoot}preview/features/scoped-folder-access.html">Scoped
-Directory Access</a> developer documentation.</p>
-
-<h2 id="keyboard_shortcuts_helper">Keyboard Shortcuts Helper</h2>
-
-<p>
- In Android N, the user can press <strong>Meta + /</strong> to trigger a
- <em>Keyboard Shortcuts</em> screen that displays all shortcuts available both
- from the system and from the app in focus. The system retrieves these
- shortcuts automatically from the app’s menu if the shortcuts exist. You can
- also provide your own fine-tuned shortcuts lists for the screen. You can do
- this by overriding the new <code>Activity.onProvideKeyboardShortcuts()</code>
- method, described in the downloadable <a href=
- "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
-</p>
-
-<p class="note">
- <strong>Note:</strong> The <strong>Meta</strong> key is not present on all
- keyboards: on a Macintosh keyboard, it is the <strong>Command</strong> key,
- on the Windows keyboard, it is the <strong>Windows</strong> key, and on the
- Pixel C and the Chrome OS keyboards, it is the <strong>Search</strong> key.
-</p>
-
-<p>
- To trigger Keyboard Shortcuts Helper from anywhere in your app, call
- {@code Activity.requestKeyboardShortcutsHelper()} for the relevant activity.
-</p>
-
-<h2 id="custom_pointer_api">
- Custom Pointer API
-</h2>
-
-<p>
- Android N introduces the Custom Pointer API, which lets you customize the
- appearance, visibility, and behavior of the pointer. This capability is
- especially useful when a user is using a mouse or touchpad to interact with
- UI objects. The default pointer uses a standard icon. This API also includes
- advanced functionality such as changing the pointer icon's appearance based
- on specific mouse or touchpad movements.
-</p>
-
-<p>
- To set a pointer icon, override the <code>onResolvePointerIcon()</code>
- method of the <code>View</code> class. This method uses a
- <code>PointerIcon</code> object to draw the icon that corresponds to a
- specific motion event.
-</p>
-
-<h2 id="sustained_performance_api">Sustained Performance API</h2>
-
-<p>
-Performance can fluctuate dramatically for long-running apps, because the
-system throttles system-on-chip engines as device components reach their
-temperature limits. This fluctuation presents a moving target for app
-developers creating high-performance, long-running apps.
-</p>
-
-<p>
-To address these limitations, Android N includes support for
-<em>sustained performance mode</em>, enabling OEMs to provide hints about
-device-performance capabilities for long-running apps. App developers
-can use these hints to tune apps for a predictable,
-consistent level of device performance over long periods of time.
-</p>
-
-<p>
-App developers can try out this new API in the N Developer Preview on
-Nexus 6P devices only. To use this feature,
-set the sustained performance window flag for the window
-you want to run in sustained performance mode. Set this flag using the
-{@code Window.setSustainedPerformanceMode()} method. The system automatically
-disables this mode when the window is no longer in focus.
-</p>
-
-<h2 id="vr">VR Support</h2>
-
-<p>
-Android N adds platform support and optimizations for a new VR Mode to let developers
-build high-quality mobile VR experiences for users. There are a number of performance
-enhancements, including access to an exclusive CPU core for VR apps.
-Within your apps, you can take advantage of intelligent head-tracking,
-and stereo notifications that work for VR. Most importantly, Android N provides for
-very low latency graphics. For complete information about building VR apps for Android N,
-see the <a href="https://developers.google.com/vr/android/">Google VR SDK for Android</a>.
-</p>
-
-
-<h2 id="print_svc">Print Service Enhancements</h2>
-
-<p>
- In Android N, print service developers can now surface additional information
- about individual printers and print jobs.
-</p>
-
-<p>
- When listing individual printers, a print service can now set per-printer
- icons in two ways:
-</p>
-
-<ul>
- <li>You can set an icon from a resource ID by calling
- <code>PrinterInfo.Builder.setResourceIconId()</code>
- </li>
-
- <li>You can show an icon from the network by calling
- <code>PrinterInfo.Builder.setHasCustomPrinterIcon()</code>, and setting a
- callback for when the icon is requested using
- <code>android.printservice.PrinterDiscoverySession.onRequestCustomPrinterIcon()</code>
- </li>
-</ul>
-
-<p>
- In addition, you can provide a per-printer activity to display additional
- information by calling <code>PrinterInfo.Builder.setInfoIntent()</code>.
-</p>
-
-<p>
- You can indicate the progress and status of print jobs in the print job
- notification by calling
- <code>android.printservice.PrintJob.setProgress()</code> and
- <code>android.printservice.PrintJob.setStatus()</code>, respectively.
-</p>
-
-<p>
- For more information about these methods, see the downloadable <a href=
- "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
-</p>
-
-<h2 id="framemetrics_api">FrameMetricsListener API</h2>
-
-<p>
-The FrameMetricsListener API allows an app to monitor its UI rendering
-performance. The API provides this capability by exposing a streaming Pub/Sub API to transfer frame
-timing info for the app's current window. The data returned is
-equivalent to that which <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
-dumpsys gfxinfo framestats</code> displays, but is not limited to the past 120 frames.
-</p>
-
-<p>
-You can use FrameMetricsListener to measure interaction-level UI
-performance in production, without a USB connection. This API
-allows collection of data at a much higher granularity than does
-{@code adb shell dumpsys gfxinfo}. This higher granularity is possible because
-the system can collect data for particular interactions in the app; the system
-need not capture a global summary of the entire app’s
-performance, or clear any global state. You can use this
-capability to gather performance data and catch regressions in UI performance
-for real use cases within an app.
-</p>
-
-<p>
-To monitor a window, implement the <code>FrameMetricsListener.onMetricsAvailable()</code>
-callback method and register it on that window. For more information, refer to
-the {@code FrameMetricsListener} class documentation in
-the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
-</p>
-
-<p>
-The API provides a {@code FrameMetrics} object, which contains timing data that
-the rendering subsystem reports for various milestones in a frame lifecycle.
-The supported metrics are: {@code UNKNOWN_DELAY_DURATION},
-{@code INPUT_HANDLING_DURATION}, {@code ANIMATION_DURATION},
-{@code LAYOUT_MEASURE_DURATION}, {@code DRAW_DURATION}, {@code SYNC_DURATION},
-{@code COMMAND_ISSUE_DURATION}, {@code SWAP_BUFFERS_DURATION},
-{@code TOTAL_DURATION}, and {@code FIRST_DRAW_FRAME}.
-</p>
-
-
-<h2 id="virtual_files">Virtual Files</h2>
-
-<p>
- In previous versions of Android, your app could use the Storage Access
- Framework to allow users to select files from their cloud storage accounts,
- such as Google Drive. However, there was no way to represent files that did
- not have a direct bytecode representation; every file was required to provide
- an input stream.
-</p>
-
-<p>
- Android N adds the concept of <em>virtual files</em> to the Storage Access
- Framework. The virtual files feature allows your
- {@link android.provider.DocumentsProvider} to return document URIs that can be
- used with an {@link android.content.Intent#ACTION_VIEW} intent even if they
- don't have a direct bytecode representation. Android N also allows you to
- provide alternate formats for user files, virtual or otherwise.
-</p>
-
-<p>
- To get a URI for a virtual document in your app, first you create an
- {@link android.content.Intent} to open the file picker UI. Since an app
- cannot directly open a virtual file by using the
- {@link android.content.ContentResolver#openInputStream(Uri) openInputStream()}
- method, your app does not receive any virtual files if you include the
- {@link android.content.Intent#CATEGORY_OPENABLE} category.
-</p>
-
-<p>
- After the user has made a selection, the system calls the
- {@link android.app.Activity#onActivityResult onActivityResult()} method.
- Your app can retrieve the URI of the virtual file and get an input stream, as
- demonstrated in the code snippet below.
-</p>
-
-<pre>
- // Other Activity code ...
-
- final static private int REQUEST_CODE = 64;
-
- // We listen to the OnActivityResult event to respond to the user's selection.
- @Override
- public void onActivityResult(int requestCode, int resultCode,
- Intent resultData) {
- try {
- if (requestCode == REQUEST_CODE &&
- resultCode == Activity.RESULT_OK) {
-
- Uri uri = null;
-
- if (resultData != null) {
- uri = resultData.getData();
-
- ContentResolver resolver = getContentResolver();
-
- // Before attempting to coerce a file into a MIME type,
- // check to see what alternative MIME types are available to
- // coerce this file into.
- String[] streamTypes =
- resolver.getStreamTypes(uri, "*/*");
-
- AssetFileDescriptor descriptor =
- resolver.openTypedAssetFileDescriptor(
- uri,
- streamTypes[0],
- null);
-
- // Retrieve a stream to the virtual file.
- InputStream inputStream = descriptor.createInputStream();
- }
- }
- } catch (Exception ex) {
- Log.e("EXCEPTION", "ERROR: ", ex);
- }
- }
-</pre>
-
-<p>
- For more information about accessing user files, see the
- <a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
- Access Frameworks guide</a>.
-</p>
diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
deleted file mode 100644
index 3a37295..0000000
--- a/docs/html/preview/behavior-changes.jd
+++ /dev/null
@@ -1,870 +0,0 @@
-page.title=Behavior Changes
-page.keywords=preview,sdk,compatibility
-meta.tags="preview", "compatibility"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-changes_2x.png
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>In this document</h2>
-
-<ol>
- <li><a href="#perf">Performance Improvements</a>
- <ol>
- <li><a href="#doze">Doze</a></li>
- <li><a href="#bg-opt">Background Optimizations</a></li>
- </ol>
- </li>
- <li><a href="#perm">Permissions Changes</a>
- </li>
- <li><a href="#sharing-files">Sharing Files Between Apps</a></li>
- <li><a href="#accessibility">Accessibility Improvements</a>
- <ol>
- <li><a href="#screen-zoom">Screen Zoom</a></li>
- <li><a href="#vision-settings">Vision Settings in Setup Wizard</a></li>
- </ol>
- </li>
- <li><a href="#ndk">NDK Apps Linking to Platform Libraries</a></li>
- <li><a href="#afw">Android for Work</a></li>
- <li><a href="#annotations">Annotations Retention</a></li>
- <li><a href="#other">Other Important Points</a></li>
-</ol>
-
-<h2>API Differences</h2>
-<ol>
- <li><a href="{@docRoot}sdk/api_diff/n-preview-4-incr/changes.html">
- Preview 3 to API 24</a></li>
- <li><a href="{@docRoot}sdk/api_diff/24/changes.html">
- API 23 to API 24</a></li>
-</ol>
-
-<h2>See Also</h2>
-<ol>
- <li><a href="{@docRoot}preview/api-overview.html">
- Android N for Developers</a></li>
-</ol>
-
-</div>
-</div>
-
-
-<p>
- Along with new features and capabilities, Android N
- includes a variety of system and API behavior changes. This document
- highlights some of the key changes that you should understand and account for
- in your apps.
-</p>
-
-<p>
- If you have previously published an app for Android, be aware that your app
- might be affected by these changes in the platform.
-</p>
-
-
-<h2 id="perf">Battery and Memory</h2>
-
-<p>
-Android N includes system behavior changes aimed at improving the battery life
-of devices and reducing RAM usage. These changes can affect your app’s access to
-system resources, along with the way your app interacts with other apps via
-certain implicit intents.
-</p>
-
-<h3 id="doze">Doze</h3>
-
-<p>
- Introduced in Android 6.0 (API level 23), Doze improves battery life by
- deferring CPU and network activities when a user leaves a device unplugged,
- stationary, and with the screen turned off. Android N brings further
- enhancements to Doze by applying a subset of CPU and network restrictions
- while the device is unplugged with the screen turned off, but not necessarily
- stationary, for example, when a handset is traveling in a user’s pocket.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-1.png"
- alt="" height="251px" id="figure1" />
-<p class="img-caption">
- <strong>Figure 1.</strong> Illustration of how Doze applies a first level of
- system activity restrictions to improve battery life.
-</p>
-
-<p>
- When a device is on battery power, and the screen has been off for a certain
- time, the device enters Doze and applies the first subset of restrictions: It
- shuts off app network access, and defers jobs and syncs. If the device is
- stationary for a certain time after entering Doze, the system applies the
- rest of the Doze restrictions to {@link android.os.PowerManager.WakeLock},
- {@link android.app.AlarmManager} alarms, GPS, and Wi-Fi scans. Regardless of
- whether some or all Doze restrictions are being applied, the system wakes the
- device for brief maintenance windows, during which applications are allowed
- network access and can execute any deferred jobs/syncs.
-</p>
-
-
-<img src="{@docRoot}preview/images/doze-diagram-2.png"
- alt="" id="figure2" />
-<p class="img-caption">
- <strong>Figure 2.</strong> Illustration of how Doze applies a second level of
- system activity restrictions after the device is stationary for a certain time.
-</p>
-
-<p>
- Note that activating the screen on or plugging in the device exits Doze and
- removes these processing restrictions. The additional behavior does not
- affect recommendations and best practices in adapting your app to the prior
- version of Doze introduced in Android 6.0 (API level 23), as discussed in
- <a href="{@docRoot}training/monitoring-device-state/doze-standby.html">
- Optimizing for Doze and App Standby</a>. You should still
- follow those recommendations, such as using Google Cloud Messaging (GCM) to
- send and receive messages, and start planning updates to accomodate the
- additional Doze behavior.
-</p>
-
-
-<h3 id="bg-opt">Project Svelte: Background Optimizations</h3>
-
-<p>
- Android N removes three implicit broadcasts in order to help optimize both
- memory use and power consumption. This change is necessary because implicit
- broadcasts frequently start apps that have registered to listen for them in
- the background. Removing these broadcasts can substantially benefit device
- performance and user experience.
-</p>
-
-<p>
- Mobile devices experience frequent connectivity changes, such as when moving
- between Wi-Fi and mobile data. Currently, apps can monitor for changes in
- connectivity by registering a receiver for the implicit {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcast in their
- manifest. Since many apps register to receive this broadcast, a single
- network switch can cause them all to wake up and process the broadcast at
- once.
-</p>
-
-<p>
- Similarly, in previous versions of Android, apps could register to receive implicit {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} and {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts from other apps, such as
- Camera. When a user takes a picture with the Camera app, these apps wake up
- to process the broadcast.
-</p>
-
-<p>
- To alleviate these issues, Android N applies the following
- optimizations:
-</p>
-
-<ul>
- <li>Apps targeting Android N do not receive {@link
- android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcasts, even if they
- have manifest entries to request notification of these events. Apps that are
- running can still listen for {@code CONNECTIVITY_CHANGE} on their main thread
- if they request notification with a {@link android.content.BroadcastReceiver}.
- </li>
-
- <li>Apps cannot send or receive {@link
- android.hardware.Camera#ACTION_NEW_PICTURE} or {@link
- android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts. This optimization
- affects all apps, not only those targeting Android N.
- </li>
-</ul>
-
-<p>If your app uses any of these intents, you should remove dependencies
- on them as soon as possible so that you can target Android N devices properly.
- The Android framework provides several solutions to mitigate the need for
- these implicit broadcasts. For example, the {@link
- android.app.job.JobScheduler} API provides a robust mechanism to schedule
- network operations when specified conditions, such as connection to an
- unmetered network, are met. You can even use {@link
- android.app.job.JobScheduler} to react to changes to content providers.
-</p>
-
-<p>
- For more information about background optimizations in N and how to adapt your app,
- see <a href=
- "{@docRoot}preview/features/background-optimization.html">Background
- Optimizations</a>.
-</p>
-
-<h2 id="perm">Permissions Changes</h2>
-
-<p>
- Android N includes changes to permissions that may affect your app.
-</p>
-
-<h3 id="permfilesys">File system permission changes</h3>
-
-<p>
- In order to improve the security of private files, the private directory of
- apps targeting Android N or higher has restricted access (<code>0700</code>).
- This setting prevents leakage of metadata of private files, such as their size
- or existence. This permission change has multiple side effects:
-</p>
-
-<ul>
- <li>
- Private files’ file permissions should no longer be relaxed by the owner,
- and an attempt to do so using
- {@link android.content.Context#MODE_WORLD_READABLE} and/or
- {@link android.content.Context#MODE_WORLD_WRITEABLE}, will trigger a
- {@link java.lang.SecurityException}.
- <p class="note">
- <strong>Note:</strong> As of yet, this restriction is not fully enforced.
- Apps may still modify permissions to their private directory using
- native APIs or the {@link java.io.File File} API. However, we strongly
- discourage relaxing the permissions to the private directory.
- </p>
- </li>
- <li>
- Passing <code>file://</code> URIs outside the package domain may leave the
- receiver with an unaccessible path. Therefore, attempts to pass a
- <code>file://</code> URI trigger a
- <code>FileUriExposedException</code>. The recommended way to share the
- content of a private file is using the {@link
- android.support.v4.content.FileProvider}.
- </li>
- <li>
- The {@link android.app.DownloadManager} can no longer share privately
- stored files by filename. Legacy applications may end up with an
- unaccessible path when accessing {@link
- android.app.DownloadManager#COLUMN_LOCAL_FILENAME}. Apps targeting
- Android N or higher trigger a {@link java.lang.SecurityException} when
- attempting to access
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}.
- Legacy applications that set the download location to a public location by
- using
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalFilesDir
- DownloadManager.Request.setDestinationInExternalFilesDir()} or
- {@link
- android.app.DownloadManager.Request#setDestinationInExternalPublicDir
- DownloadManager.Request.setDestinationInExternalPublicDir()}
- can still access the path in
- {@link android.app.DownloadManager#COLUMN_LOCAL_FILENAME}, however, this
- method is strongly discouraged. The preferred way of accessing a file
- exposed by the {@link android.app.DownloadManager} is using
- {@link android.content.ContentResolver#openFileDescriptor
- ContentResolver.openFileDescriptor()}.
- </li>
-</ul>
-
-<h2 id="sharing-files">Sharing Files Between Apps</h2>
-
-<p>
-For apps targeting Android N, the Android framework enforces
-the {@link android.os.StrictMode} API policy that prohibits exposing {@code file://} URIs
-outside your app. If an intent containing a file URI leaves your app, the app fails
-with a {@code FileUriExposedException} exception.
-</p>
-
-<p>
-To share files between applications, you should send a {@code content://} URI
-and grant a temporary access permission on the URI. The easiest way to grant this permission is by
-using the {@link android.support.v4.content.FileProvider} class. For more information
-on permissions and sharing files,
-see <a href="{@docRoot}training/secure-file-sharing/index.html">Sharing Files</a>.
-</p>
-
-<h2 id="accessibility">Accessibility Improvements</h2>
-
-<p>
- Android N includes changes intended to improve the usability of the
- platform for users with low or impaired vision. These changes should
- generally not require code changes in your app, however you should review
- these feature and test them with your app to assess potential impacts to user
- experience.
-</p>
-
-
-<h3 id="screen-zoom">Screen Zoom</h3>
-
-<p>
- Android N enables users to set <strong>Display size</strong>which magnifies
- or shrinks all elements on the screen, thereby improving device accessibility
- for users with low vision. Users cannot zoom the screen past a minimum screen
- width of <a href=
- "http://developer.android.com/guide/topics/resources/providing-resources.html">
- sw320dp</a>, which is the width of a Nexus 4, a common medium-sized phone.
-</p>
-
-<div class="cols">
-
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-1.png" alt="" height="XXX" id="figure1" />
-</div>
-<div class="col-6">
- <img src="{@docRoot}preview/images/screen-zoom-2.png" alt="" height="XXX" id="figure1" />
-</div>
-
-</div> <!-- end cols -->
-<p class="img-caption">
- <strong>Figure 3.</strong> The screen on the right shows the effect of
- increasing the Display size of a device running an Android N system image.
-</p>
-
-
-<p>
- When the device density changes, the system notifies running apps in the
- following ways:
-</p>
-
-<ul>
- <li>If an app targets API level 23 or lower, the system automatically kills
- all its background processes. This means that if a user switches away from
- such an app to open the <em>Settings</em> screen and changes the
- <strong>Display size</strong> setting, the system kills the app in the same
- manner that it would in a low-memory situation. If the app has any foreground
- processes, the system notifies those processes of the configuration change as
- described in <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling
- Runtime Changes</a>, just as if the device's orientation had changed.
- </li>
-
- <li>If an app targets Android N, all of its processes
- (foreground and background) are notified of the configuration change as
- described in <a href=
- "{@docRoot}guide/topics/resources/runtime-changes.html">Handling
- Runtime Changes</a>.
- </li>
-</ul>
-
-<p>
- Most apps do not need to make any changes to support this feature, provided
- the apps follow Android best practices. Specific things to check for:
-</p>
-
-<ul>
- <li>Test your app on a device with screen width <code><a href=
- "{@docRoot}guide/topics/resources/providing-resources.html">sw320dp</a></code>
- and be sure it performs adequately.
- </li>
-
- <li>When the device configuration changes, update any density-dependent
- cached information, such as cached bitmaps or resources loaded from the
- network. Check for configuration changes when the app resumes from the paused
- state.
- <p class="note">
- <strong>Note:</strong> If you cache configuration-dependent data, it's a
- good idea to include relevant metadata such as the appropriate screen
- size or pixel density for that data. Saving this metadata allows you to
- decide whether you need to refresh the cached data after a configuration
- change.
- </p>
- </li>
-
- <li>Avoid specifying dimensions with px units, since they do not scale with
- screen density. Instead, specify dimensions with <a href=
- "{@docRoot}guide/practices/screens_support.html">density-independent
- pixel</a> (<code>dp</code>) units.
- </li>
-</ul>
-
-<h3 id="vision-settings">Vision Settings in Setup Wizard</h3>
-
-<p>
- Android N includes Vision Settings on the Welcome screen, where users can
- set up the following accessibility settings on a new device:
- <strong>Magnification gesture</strong>, <strong>Font size</strong>,
- <strong>Display size</strong> and <strong>TalkBack</strong>. This change
- increases the visibility of bugs related to different screen settings. To
- assess the impact of this feature, you should test your apps with these
- settings enabled. You can find the settings under <strong>Settings >
- Accessibility</strong>.
-</p>
-
-<h2 id="ndk">NDK Apps Linking to Platform Libraries</h2>
-
-<p>
- Starting in Android N, the system prevents apps from dynamically linking
- against non-NDK libraries, which may cause your app to crash. This change in
- behavior aims to create a consistent app experience across platform updates
- and different devices. Even though your code might not be linking against
- private libraries, it's possible that a third-party static library in your
- app could be doing so. Therefore, all developers should check to make sure
- that their apps do not crash on devices running Android N. If your app uses
- native code, you should only be using <a href=
- "{@docRoot}ndk/guides/stable_apis.html">public NDK APIs</a>.
-</p>
-
-<p>
- There are three ways your app might be trying to access private platform
- APIs:
-</p>
-
-<ul>
- <li>Your app directly accesses private platform libraries. You should update
- your app to include its own copy of those libraries or use the <a href=
- "{@docRoot}ndk/guides/stable_apis.html">public NDK APIs</a>.
- </li>
-
- <li>Your app uses a third-party library that accesses private platform
- libraries. Even if you are certain your app doesn't access private libraries
- directly, you should still test your app for this scenario.
- </li>
-
- <li>Your app references a library that is not included in its APK. For
- example, this could happen if you tried to use your own copy of OpenSSL but
- forgot to bundle it with your app's APK. The app may run normally on versions
- of Android platform that includes <code>libcrypto.so</code>. However, the app
- could crash on later versions of Android that do not include this library
- (such as, Android 6.0 and later). To fix this, ensure that you bundle all
- your non-NDK libraries with your APK.
- </li>
-</ul>
-
-<p>
- Apps should not use native libraries that are not included in the NDK because
- they may change or be removed between different versions of Android. The
- switch from OpenSSL to BoringSSL is an example of such a change. Also,
- because there are no compatibility requirements for platform libraries not
- included in the NDK, different devices may offer different levels of
- compatibility.
-</p>
-
-<p>
- In order to reduce the impact that this restriction may have on currently
- released apps, a set of libraries that see significant use—such as
- <code>libandroid_runtime.so</code>, <code>libcutils.so</code>,
- <code>libcrypto.so</code>, and <code>libssl.so</code>—are temporarily
- accessible on N for apps targeting API level 23 or lower. If your app loads
- one of these libraries, logcat generates a warning and a toast appears on the
- target device to notify you. If you see these warnings, you should update
- your app to either include its own copy of those libraries or only use the
- public NDK APIs. Future releases of the Android platform may restrict the use
- of private libraries altogether and cause your app to crash.
-</p>
-
-<p>
- All apps generate a runtime error when they call an API that is neither
- public nor temporarily accessible. The result is that
- <code>System.loadLibrary</code> and <code>dlopen(3)</code> both return
- <code>NULL</code>, and may cause your app to crash. You should review your
- app code to remove use of private platform APIs and thoroughly test your apps
- using a preview device or emulator. If you are unsure whether your app uses
- private libraries, you can <a href="#ndk-errors">check logcat</a> to identify
- the runtime error.
-</p>
-
-<p>
- The following table describes the behavior you should expect to see from an
- app depending on its use of private native libraries and its target API
- level (<code>android:targetSdkVersion</code>).
-</p>
-
-<table id="ndk-table">
- <col width="15%">
- <col width="15%">
- <col width="15%">
- <col width="20%">
- <col width="20%">
- <col width="20%">
- <tr>
- <th scope="col">
- Libraries
- </th>
- <th scope="col">
- Target API level
- </th>
- <th scope="col">
- Runtime access via dynamic linker
- </th>
- <th scope="col">
- N Developer Preview behavior
- </th>
- <th scope="col">
- Final N Release behavior
- </th>
- <th scope="col">
- Future Android platform behavior
- </th>
- </tr>
-
-<tr>
- <td>
- NDK Public
- </td>
-
- <td>
- Any
- </td>
-
- <td style="background-color:#DCEDC8">
- Accessible
- </td>
-
- <td style="background-color:#DCEDC8">
- Works as expected
- </td>
-
- <td style="background-color:#DCEDC8">
- Works as expected
- </td>
-
- <td style="background-color:#DCEDC8">
- Works as expected
- </td>
-</tr>
-
-<tr>
- <td>
- Private (temporarily accessible private libraries)
- </td>
-
- <td>
- 23 or lower
- </td>
-
- <td style="background-color:#FFF9C4">
- Temporarily accessible
- </td>
-
- <td style="background-color:#FFF9C4">
- Works as expected, but you receive a logcat warning and a message on the
- target device.
- </td>
-
- <td style="background-color:#FFF9C4">
- Works as expected, but you receive a logcat warning.
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-</tr>
-
-<tr>
- <td>
- Private (temporarily accessible private libraries)
- </td>
-
- <td>
- 24 or higher
- </td>
-
- <td style="background-color:#ffcdd2">
- Restricted
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-</tr>
-
-<tr>
- <td>
- Private (other)
- </td>
-
- <td>
- Any
- </td>
-
- <td style="background-color:#ffcdd2">
- Restricted
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-
- <td style="background-color:#ffcdd2">
- Runtime error
- </td>
-</tr>
-</table>
-
-<h3 id="ndk-errors">
- Check if your app uses private libraries
-</h3>
-
-<p>
- To help you identify issues loading private libraries, logcat may generate a
- warning or runtime error. For example, if your app targets API level 23 or
- lower, and tries to access a private library on a device running Android N,
- you may see a warning similar to the following:
-</p>
-
-<pre class="no-pretty-print">
-03-21 17:07:51.502 31234 31234 W linker : library "libandroid_runtime.so"
-("/system/lib/libandroid_runtime.so") needed or dlopened by
-"/data/app/com.popular-app.android-2/lib/arm/libapplib.so" is not accessible
-for the namespace "classloader-namespace" - the access is temporarily granted
-as a workaround for http://b/26394120
-</pre>
-
-<p>
- These logcat warnings tell you which which library is trying to access a
- private platform API, but will not cause your app to crash. If the app
- targets API level 24 or higher, however, logcat generates the following
- runtime error and your app may crash:
-</p>
-
-<pre class="no-pretty-print">
-java.lang.UnsatisfiedLinkError: dlopen failed: library "libcutils.so"
-("/system/lib/libcutils.so") needed or dlopened by
-"/system/lib/libnativeloader.so" is not accessible for the namespace
-"classloader-namespace"
- at java.lang.Runtime.loadLibrary0(Runtime.java:977)
- at java.lang.System.loadLibrary(System.java:1602)
-</pre>
-
-<p>
- You may also see these logcat outputs if your app uses third-party libraries
- that dynamically link to private platform APIs. The readelf tool in the
- Android NDK allows you to generate a list of all dynamically linked shared
- libraries of a given <code>.so</code> file by running the following command:
-</p>
-
-<pre class="no-pretty-print">
-aarch64-linux-android-readelf -dW libMyLibrary.so
-</pre>
-
-<h3 id="ndk-update">
- Update your app
-</h3>
-
-<p>
- Here are some steps you can take to fix these types of errors and make
- sure your app doesn't crash on future platform updates:
-</p>
-
-<ul>
- <li>
- If your app uses private platform libraries, you should update it to include
- its own copy of those libraries or use the <a href=
- "{@docRoot}ndk/guides/stable_apis.html">public NDK APIs</a>.
- </li>
-
- <li>
- If your app uses a third-party library that accesses private symbols, contact
- the library author to update the library.
- </li>
-
- <li>
- Make sure you package all your non-NDK libraries with your APK.
- </li>
-
- <li>Use standard JNI functions instead of <code>getJavaVM</code> and
- <code>getJNIEnv</code> from <code>libandroid_runtime.so</code>:
-
-<pre class="no-pretty-print">
-AndroidRuntime::getJavaVM -> GetJavaVM from <jni.h>
-AndroidRuntime::getJNIEnv -> JavaVM::GetEnv or
-JavaVM::AttachCurrentThread from <jni.h>.
-</pre>
- </li>
-
- <li>Use {@code __system_property_get} instead of the private {@code property_get}
- symbol from {@code libcutils.so}. To do this, use {@code __system_property_get}
- with the following include:
-
-<pre>
-#include <sys/system_properties.h>
-</pre>
- <p class="note">
- <strong>Note:</strong> The availability and contents of system properties is
- not tested through CTS. A better fix would be to avoid using these
- properties altogether.
- </p>
- </li>
-
- <li>Use a local version of the {@code SSL_ctrl} symbol from {@code
- libcrypto.so}. For example, you should statically link {@code libcyrpto.a} in
- your {@code .so} file, or include a dynamically linked version of {@code
- libcrypto.so} from BoringSSL/OpenSSL and package it in your APK.
- </li>
-</ul>
-
-<h2 id="afw">Android for Work</h2>
-<p>
- Android N contains changes for apps that target Android for Work, including
- changes to certificate installation, password resetting, secondary user
- management, and access to device identifiers. If you are building apps for
- Android for Work environments, you should review these changes and modify
- your app accordingly.
-</p>
-
-<ul>
- <li>You must install a delegated certificate installer before the DPC can set
- it. For both profile and device-owner apps targeting the N SDK, you should
- install the delegated certificate installer before the device policy
- controller (DPC) calls
- <code>DevicePolicyManager.setCertInstallerPackage()</code>. If the installer
- is not already installed, the system throws an
- <code>IllegalArgumentException</code>.
- </li>
-
- <li>Reset password restrictions for device admins now apply to profile
- owners. Device admins can no longer use
- {@code DevicePolicyManager.resetPassword()} to clear passwords or change
- ones that are already set. Device admins can still set a password, but only
- when the device has no password, PIN, or pattern.
- </li>
-
- <li>Device and profile owners can manage accounts even if restrictions are
- set. Device owners and profile owners can call the Account Management APIs
- even if <code>DISALLOW_MODIFY_ACCOUNTS</code> user restrictions are in place.
- </li>
-
- <li>Device owners can manage secondary users more easily. When a device is
- running in device owner mode, the <code>DISALLOW_ADD_USER</code> restriction
- is automatically set. This prevents users from creating unmanaged secondary
- users. In addition, the <code>CreateUser()</code> and
- <code>createAndInitializeUser()</code> methods are deprecated; the new
- <code>DevicePolicyManager.createAndManageUser()</code> method replaces them.
- </li>
-
- <li>Device owners can access device identifiers. A Device owner can access the
- Wi-Fi MAC address of a device, using
- <code>DevicePolicyManagewr.getWifiMacAddress()</code>. If Wi-Fi has never
- been enabled on the device, this method returns a value of {@code null}.
- </li>
-
- <li>The Work Mode setting controls access to work apps. When work mode is off the
- system launcher indicates work apps are unavailable by greying them out. Enabling
- work mode again restores normal behavior.</li>
-
- <li>When installing a PKCS #12 file containing a client certificate chain and
- the corresponding private key from Settings UI, the CA certificate in the
- chain is no longer installed to the trusted credentials storage. This does
- not affect the result of {@link android.security.KeyChain#getCertificateChain
- KeyChain.getCertificateChain()} when apps attempt to retrieve the client
- certificate chain later. If required, the CA certificate should be installed
- to the trusted credentials storage via Settings UI separately, with a
- DER-encoded format under a .crt or .cer file extension.
- </li>
-</ul>
-
-<p>
- For more information about changes to Android for Work in Android N, see
- <a href="{@docRoot}preview/features/afw.html">Android for Work Updates</a>.
-</p>
-
-<h2 id="annotations">Annotations Retention</h2>
-
-<p>
-Android N fixes a bug where the visibility of annotations was being ignored.
-This issue enabled the runtime to access annotations that it should not have been
-able to. These annotations included:
-</p>
-
-<ul>
- <li>{@code VISIBILITY_BUILD}: Intended to be visible only at build time.</li>
- <li>{@code VISIBILITY_SYSTEM}: Intended to be visible at runtime, but only to the
- underlying system.</li>
-</ul>
-
-<p>
-If your app has relied on this behavior, please add a retention policy to annotations that must
-be available at runtime. You do so by using {@code @Retention(RetentionPolicy.RUNTIME)}.
-</p>
-
-<h2 id="other">Other Important Points</h2>
-
-<ul>
-<li>When an app is running on Android N, but targets a lower API level,
-and the user changes display size, the app process is killed. The app
-must be able to gracefully handle this scenario. Otherwise, it crashes
-when the user restores it from Recents.
-
-<p>
-You should test your app to ensure
-that this behavior does not occur.
-You can do so by causing an identical crash
-when killing the app manually via DDMS.
-</p>
-
-<p>
-Apps targeting N and above are not automatically killed on density changes;
-however, they may still respond poorly to configuration changes.
-</p>
-</li>
-
-<li>
-Apps on Android N should be able to gracefully handle configuration changes,
-and should not crash on subsequent starts. You can verify app behavior
-by changing font size (<strong>Setting</strong> >
-<strong>Display</strong> > <strong>Font size</strong>), and then restoring
-the app from Recents.
-</li>
-
-<li>
-Due to a bug in previous versions of Android, the system did not flag writing
-to a TCP socket on the main thread as a strict-mode violation. Android N fixes this bug.
-Apps that exhibit this behavior now throw an {@code android.os.NetworkOnMainThreadException}.
-Generally, performing network operations on the main thread is a bad idea because these operations
-usually have a high tail latency that causes ANRs and jank.
-</li>
-
-<li>
-The {@code Debug.startMethodTracing()} family of methods now defaults to
-storing output in your package-specific directory on shared storage,
-instead of at the top level
-of the SD card. This means apps no longer need to request the {@code WRITE_EXTERNAL_STORAGE} permission to use these APIs.
-</li>
-
-<li>
-Many platform APIs have now started checking for large payloads being sent
-across {@link android.os.Binder} transactions, and the
-system now rethrows {@code TransactionTooLargeExceptions}
-as {@code RuntimeExceptions}, instead of silently logging or suppressing them. One
-common example is storing too much data in
-{@link android.app.Activity#onSaveInstanceState Activity.onSaveInstanceState()},
-which causes {@code ActivityThread.StopInfo} to throw a
-{@code RuntimeException} when your app targets Android N.
-</li>
-
-<li>
-If an app posts {@link java.lang.Runnable} tasks to a {@link android.view.View}, and
-the {@link android.view.View}
-is not attached to a window, the system
-queues the {@link java.lang.Runnable} task with the {@link android.view.View};
-the {@link java.lang.Runnable} task does not execute until the
-{@link android.view.View} is attached
-to a window. This behavior fixes the following bugs:
-<ul>
- <li>If an app posted to a {@link android.view.View} from a thread other than the intended
- window’s UI thread, the {@link java.lang.Runnable} may run on the wrong thread as a result.
- </li>
- <li>If the {@link java.lang.Runnable} task was posted from a thread other than
- a looper thread, the app could expose the {@link java.lang.Runnable} task.</li>
-</ul>
-</li>
-
-<li>
-If an app on Android N with
-{@link android.Manifest.permission#DELETE_PACKAGES DELETE_PACKAGES}
-permission tries to delete a package, but a different app had installed that package,
-the system requires user confirmation. In this scenario, apps should expect
-{@link android.content.pm.PackageInstaller#STATUS_PENDING_USER_ACTION STATUS_PENDING_USER_ACTION}
-as the return status when they invoke
-{@link android.content.pm.PackageInstaller#uninstall PackageInstaller.uninstall()}.
-</li>
-
- <li>The JCA provider called <em>Crypto</em> is deprecated, because its only
- algorithm, SHA1PRNG, is cryptographically weak. Apps can no longer use
- SHA1PRNG to (insecurely) derive keys, because this provider is no longer
- available. For more information, see the blog
- post <a href=
- "http://android-developers.blogspot.com/2016/06/security-crypto-provider-deprecated-in.html"
- class="external-link">Security "Crypto" provider deprecated in Android
- N</a>.
- </li>
-
-</ul>
-
diff --git a/docs/html/preview/download-ota.jd b/docs/html/preview/download-ota.jd
deleted file mode 100644
index 18f3e8d..0000000
--- a/docs/html/preview/download-ota.jd
+++ /dev/null
@@ -1,332 +0,0 @@
-page.title=Applying a Device OTA Image
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Before downloading and installing components of
- the Android Preview SDK, you must agree to the following terms and
- conditions.</p>
-
- <h2 class="norule">Terms and Conditions</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-This is the Android SDK Preview License Agreement (the “License Agreement”).
-
-1. Introduction
-
-1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
-
-1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 “Android-compatible” means any Android implemation that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting the License Agreement
-
-2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
-
-2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
-
-2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
-
-3. Preview License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the Preview solely to develop applications for compatible implementations of Android.
-
-3.2 You may not use this Preview to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this Preview is not used for that purpose.
-
-3.3 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
-
-3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
-
-3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
-
-4. Use of the Preview by You
-
-4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
-
-7. Third Party Applications
-
-7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating the License Agreement
-
-9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-
-9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
-(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
-(B) Google issues a final release version of the Android SDK.
-
-9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
-
-10. DISCLAIMERS
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
-
-14. General Legal Terms
-
-14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<p>
- This page provides links to over-the-air (OTA) device images and describes
- how to manually apply an OTA update to a device. This procedure may be useful
- in recovering devices that received OTA updates through the Android Beta
- Program and do not start up after the update is installed.
-</p>
-
-<h2 id="install-ota">Installing OTA Images</h2>
-
-<p></p>
-
-<p>To install an OTA package to a device:</p>
-
-<ol>
- <li>Download an OTA device image from the table below.</li>
- <li>Reboot the device into Recovery mode. For more information on putting
- Nexus devices in this mode, see
- <a href="https://support.google.com/nexus/answer/4596836">Reset your Nexus
- device to factory settings</a>.
- </li>
- <li>On the device, select <strong>ADB sideload</strong>.</li>
- <li>Connect the device to a computer with the Android development environment
- loaded and the Android Debug Bridge (adb) tool installed.</li>
- <li>Run the following command:
- <pre>adb sideload <em><ota-package></em></pre>
- </li>
-</ol>
-
-
-
-<h2 id="ota-images">Device OTA Images</h2>
-
-<table>
- <tr>
- <th scope="col">Device</th>
- <th scope="col">Download / Checksums</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >bullhead-ota-npd56n-dd5c12ee.zip</a><br>
- MD5: af9a82e9a78925ca9c1c7f5f6fb851ec<br>
- SHA-1: e4aabd5634b7ebdeffa877cd9e49244c0be326e4
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >shamu-ota-npd56n-2818fd62.zip</a><br>
- MD5: d8df396b187a8667889260e5464bd676<br>
- SHA-1: c03c8ef8be587a574565855d4faa526254794e03
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >angler-ota-npd56n-d2f2611c.zip</a><br>
- MD5: c3c206892d414d4fc7da892ff840eada<br>
- SHA-1: 2bdc79409ace5e163ef014ae51977d0a71b83df5
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >volantis-ota-npd56n-42228a60.zip</a><br>
- MD5: c80cf483d8b3c014fc7b27f80957a158<br>
- SHA-1: f437829320f47ea3aa5f8b70ce2f0bb3d30b3f4f
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >volantisg-ota-npd56n-9b4dbaac.zip</a><br>
- MD5: 9e55ac1650e4f07a662bafa7f082e91c<br>
- SHA-1: b9982be56c2817d122664869a1fbe9b13e9c72f7
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >fugu-ota-npd56n-b305968a.zip</a><br>
- MD5: dfc980acad6772d8473ccaa9cbbb681a<br>
- SHA-1: d7bf8192649dea970afda165d181b4eea07abd7d
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >ryu-ota-npd56n-5bf2fd66.zip</a><br>
- MD5: 1699e4bacfbef16a75ae6cf3f2e3d886<br>
- SHA-1: e20f3a8e43fcdd6acef21da80894afc8f9474e33
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >seed_l8150-ota-npd56n-a322696c.zip</a><br>
- MD5: afc0e363ad2fd7418423e189a339a8e9<br>
- SHA-1: fc4d818878df51894eac29932dd0e9f6511329c6
- </td>
- </tr>
-
-</table>
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/ota/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
deleted file mode 100644
index ad82211..0000000
--- a/docs/html/preview/download.jd
+++ /dev/null
@@ -1,556 +0,0 @@
-page.title=Test on a Device
-meta.tags="preview", "nexus","system image"
-page.tags="preview", "androidn"
-page.image=images/cards/card-n-downloads_2x.png
-
-@jd:body
-
-<div style="position:relative; min-height:600px">
-
- <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
-
- <p class="sdk-terms-intro">Before downloading and installing components of
- the Android Preview SDK, you must agree to the following terms and
- conditions.</p>
-
- <h2 class="norule">Terms and Conditions</h2>
-
- <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
-This is the Android SDK Preview License Agreement (the “License Agreement”).
-
-1. Introduction
-
-1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
-
-1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 “Android-compatible” means any Android implemation that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting the License Agreement
-
-2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
-
-2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
-
-2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
-
-3. Preview License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the Preview solely to develop applications for compatible implementations of Android.
-
-3.2 You may not use this Preview to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this Preview is not used for that purpose.
-
-3.3 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
-
-3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
-
-3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
-
-4. Use of the Preview by You
-
-4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
-
-7. Third Party Applications
-
-7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating the License Agreement
-
-9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-
-9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
-(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
-(B) Google issues a final release version of the Android SDK.
-
-9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
-
-10. DISCLAIMERS
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
-
-14. General Legal Terms
-
-14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
- </div><!-- sdk terms -->
-
-
-
- <div id="sdk-terms-form">
- <p>
- <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
- <label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
- </p>
- <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
- </div>
-
-
- </div><!-- end TOS -->
-
-
- <div id="landing">
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#device-preview">Set up a hardware device</a>
- <ol>
- <li><a href="#ota">Get over-the-air updates</a></li>
- <li><a href="#flash">Manually flash a device</a></li>
- <li><a href="#revertDevice">Uninstalling</a></li>
- </ol>
- </li>
- <li><a href="#setupAVD">Set up an emulator</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- To run and test your app on the new platform you need to set up an Android N
- runtime environment. You can do that in either of these ways:
-</p>
-
-<ul>
- <li>Install Android N on a supported hardware device, or</li>
- <li>Set up an Android emulator running Android N</li>
-</ul>
-
-<p>
- If you want an environment for basic compatibility testing of your app on the
- new platform, all you need is your current APK and a hardware device or
- emulator. You don't necessarily need to update your full development
- environment to do basic testing.
-</p>
-
-<p>
- If you want to modify your app to target Android N or use new Android N APIs,
- you need to set up a development environment that's updated to support
- Android N. <a href="{@docRoot}preview/setup-sdk.html">Set Up to Develop for
- Android N</a> has details.
-</p>
-
-
-<h2 id="device-preview">Set up a hardware device</h2>
-
-<p>
- The N Developer Preview offers system updates for a range of hardware devices
- that you can use for testing your app, from phones to tablets and TV.
-</p>
-
-<p>
- If you have access to a supported device, you can update it to a Developer
- Preview milestone build in one of these ways:
-</p>
-
-<ul>
- <li><strong>Enroll the device in automatic OTA system updates</strong> through the
- <a href="https://g.co/androidbeta">Android Beta Program</a>. Once enrolled, your device will receive regular
- over-the-air (OTA) updates of all milestone builds in the N Developer Preview. This
- approach is recommended because it lets you seamlessly transition from your current
- environment through the various releases of the N Developer Preview.</li>
- <li><strong>Download a Developer Preview system image and flash the device</strong>.
- OTA updates are not provided automatically for devices that you flash manually, but
- you can enroll those devices in Android Beta Program to get OTA updates. </li>
-</ul>
-
-<h3 id="ota">Enroll the device in automatic OTA updates</h3>
-
-<p>
- If you have access to a supported device (see the list in the Downloads
- table), you can receive over-the-air updates to preview versions of Android
- by enrolling that device in the <a href="https://g.co/androidbeta">Android Beta Program</a>. These updates are
- automatically downloaded and will update your device just like official
- system updates.
-</p>
-
-<p>
- You can un-enroll a device at any time. The device will receive an OTA update
- to the most recent production version of Android available for that device
- (for example, Android 6.0 Marshmallow). The update requires a full device
- reset, so user data on the device will be removed. Make sure to <strong>back
- up important data</strong> before un-enrolling a device.
-</p>
-
-<p>
- For more information and to enroll your device, see
- the <a href="https://g.co/androidbeta">Android Beta Program</a> web site.
-</p>
-
-<p class="note"><strong>Note:</strong>
- Un-enrolling requires a full device reset. Back up
- important data first.
-</p>
-
-<h3 id="flash">Flashing a device manually</h3>
-
-<p>
- At any time you can download the latest Developer Preview system image and
- manually flash it to your device. See the table below to download the system
- image for your test device. Manually flashing a device is useful if you need
- precise control over the test environment or need to reinstall frequently,
- such as for automated testing.
-</p>
-
-<!-- You can flash by ota or system image --><p>
- Installing a system image on a device <strong>removes all data from the
- device</strong>, so you should back up your data first.
-</p>
-
-<p>
- After you back up your device data and download the system image below that
- matches your device, follow the instructions at <a href=
- "https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
- to flash the image onto your device.
-</p>
-
-<p>
- Manually flashed system images <strong>do not
- automatically receive OTA updates</strong> to later Developer Preview
- milestone builds. Make sure to keep your environment up-to-date and flash a
- new system image at each Developer Preview milestone.
-</p>
-
-<p>
- If you decide you want to get OTA updates after manually flashing a device,
- all you need to do is enroll the device in the <a href="https://g.co/androidbeta">Android
- Beta Program</a>. You can enroll the device at any time to receive the next Preview
- update over the air.
-</p>
-
-<table>
- <tr>
- <th scope="col">Device</th>
- <th scope="col">Download / Checksums</th>
- </tr>
-
- <tr id="bullhead">
- <td>Nexus 5X <br>"bullhead"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >bullhead-npd56n-factory-996cac57.tgz</a><br>
- MD5: 5aadba91f60de00d58dc6198ef5cc3ba<br>
- SHA-1: 996cac575d83bde573315290da8f52cecc4127d2
- </td>
- </tr>
-
- <tr id="shamu">
- <td>Nexus 6 <br>"shamu"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >shamu-npd56n-factory-7936bf75.tgz</a><br>
- MD5: b7ed0db569f3bc2d6655fe8d8cea0e13<br>
- SHA-1: 7936bf75e6bfb771bd14485211a319b246311b96
- </td>
- </tr>
-
- <tr id="angler">
- <td>Nexus 6P <br>"angler"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >angler-npd56n-factory-1ce5ccad.tgz</a><br>
- MD5: f296eccaed4e2526d6435df8cf0e8df1<br>
- SHA-1: 1ce5ccad8a3eae143e0ecd9c7afbb1be2f1d41cc
- </td>
- </tr>
-
- <tr id="volantis">
- <td>Nexus 9 <br>"volantis"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >volantis-npd56n-factory-8b9f997e.tgz</a><br>
- MD5: 111c2fe5777dd6aae71fb8ef35dda9d3<br>
- SHA-1: 8b9f997ea39fdaf505527536bd346948ae1bae30
- </td>
- </tr>
-
- <tr id="volantisg">
- <td>Nexus 9G <br>"volantisg"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >volantisg-npd56n-factory-ef05106a.tgz</a><br>
- MD5: 3a6f4d47b385966347bd26b7a922cd6e<br>
- SHA-1: ef05106a9e3becea5673ea67d6c0cc21a2ec09d4
- </td>
- </tr>
-
- <tr id="fugu">
- <td>Nexus Player <br>"fugu"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >fugu-npd56n-factory-a51674a1.tgz</a><br>
- MD5: b75dc745a64848ea24124db8fa9252ed<br>
- SHA-1: a51674a1303b17fec0405d513f9c0fe9f225780f
- </td>
- </tr>
-
- <tr id="ryu">
- <td>Pixel C <br>"ryu"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >ryu-npd56n-factory-e36c49b1.tgz</a><br>
- MD5: 0a2d660b09e19614a5b3573487b88066<br>
- SHA-1: e36c49b184843cdfe10278aebc04ce50b6d670b6
- </td>
- </tr>
-
- <tr id="seed">
- <td>General Mobile 4G (Android One) <br>"seed"</td>
- <td><a href="#top" onclick="onDownload(this)"
- >seed_l8150-npd56n-factory-dd5d4fd2.tgz</a><br>
- MD5: 3420581b969af777753141dacc7f73b9<br>
- SHA-1: dd5d4fd203f9c5dad658434c0ff370c411b78835
- </td>
- </tr>
-
- <tr id="xperia">
- <td>Sony Xperia Z3 <br> (D6603 and D6653)</td>
- <td>Download: <a class="external-link"
- href="http://support.sonymobile.com/xperiaz3/tools/xperia-companion/">Xperia Companion</a><br>
- For more information, see <a class="external-link"
- href="https://developer.sony.com/develop/smartphones-and-tablets/android-n-developer-preview/">Try Android N Developer Preview for Xperia Z3</a>.
- </td>
- </tr>
-
-</table>
-
-<h3 id="revertDevice">Uninstalling the Preview from a device</h3>
-
-<p>
- If you want to uninstall the preview from a device, you can do so in one of
- these ways: </p>
- <ul>
- <li><strong>Obtain a factory spec system image</strong> and then manually
- flash it to the device.
- <ul>
- <li>For <strong>Nexus devices and Pixel C devices</strong>, see
- the <a href="http://developers.google.com/android/nexus/images">Factory Images
- for Nexus Devices</a> page for downloads. </li>
- <li>For <strong>other devices</strong>, please contact the device manufacturer
- directly. Alternatively, if the device is supported
- in the Android Beta Program, you can enroll the device in the
- program and then un-enroll it (see below).</li>
- </ul>
- </li>
- <li><strong>Un-enroll the device from Android Beta Program</strong>. If the
- device is enrolled in the <a href="https://g.co/androidbeta">Android Beta
- Program</a>, regardless of device, you can simply un-enroll it from the program.
- <p>
- The device will receive an OTA update to the most recent production version
- of Android available for that device (for example, Android 6.0 Marshmallow).
- The update requires a full device reset, so user data on the device will be
- removed. Make sure to <strong>back up important data</strong> before
- un-enrolling a device.
- </p>
- </li>
-</ul>
-
-<p class="note"><strong>Note:</strong>
- Uninstalling a Developer Preview system image prior to
- the end of the program requires a full device reset and removes all user data
- on the device.
-</p>
-
-
-<h2 id="setupAVD">Set up an emulator</h2>
-
-<p>To use the Android Emulator to run the Android N Preview, you need to
-download the Android N Preview SDK and create a virtual device for the
-emulator.</p>
-
-<p>First, download the Android N Preview SDK as follows (if you
-already got it while <a href="{@docRoot}preview/setup-sdk.html">setting up
-to develop for Android N</a>, you can skip this part):
-
-<ol>
- <li>In Android Studio, open the Settings dialog
- (<strong>File > Settings</strong> on Windows/Linux, or
- <strong>Android Studio > Preferences</strong> on Mac). In the left
- panel, select <strong>Appearance & Behavior >
- System Settings > Android SDK</strong>.
-
- <li>Click the <strong>SDK Platforms</strong> tab, then select the
- <strong>Android N Preview</strong> check box.</li>
-
- <li>Click the <strong>SDK Tools</strong> tab, then select the
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong>, and <strong>Android SDK Tools</strong> check
- boxes.
- </li>
-
- <li>Click <strong>OK</strong> and accept the license
- agreements for any packages to be installed.
- </li>
-</ol>
-
-<p>You should now have <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
-<strong>Platform-Tools 24.0.0 rc1</strong>, and <strong>SDK Tools
-25.0.9</strong>. If you do not update the SDK Tools to 25.0.9, then you won't
-be able to run the x86_64 system images for Android N.</p>
-
-
-<p>Now create a virtual device with the Android N system image:</p>
-
-<ol>
- <li>Open the AVD Manager by selecting <strong>Tools > Android >
- AVD Manager</strong>.</li>
- <li>Click <strong>Create Virtual Device</strong>.</li>
- <li>Select a device such as Nexus 5X, Nexus 6P, Nexus 9, or Android TV,
- then click <strong>Next</strong>.</li>
- <li>Select the <strong>N</strong> system image (with the
- <strong>x86</strong> ABI), then click <strong>Next</strong>.
- (Only x86 system images are currently supported with the Android Emulator
-for the Android N Preview.)
- <li>Complete the rest of the AVD configuration and click
- <strong>Finish</strong>.</li>
-</ol>
-
-<p>You can now launch the Android Emulator with the Android N Preview AVD.</p>
-
-<p>
-For the best experience in the Android Emulator, make sure you're using
-Android Studio 2.1 or higher, which supports <a
-href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0</a>
-with much faster performance compared to the emulator in
-Android Studio 1.5.</p>
-
-<p>For more information about creating virtual devices, see <a href=
- "{@docRoot}tools/devices/index.html">Managing Virtual Devices</a>.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </div><!-- landing -->
-
-</div><!-- relative wrapper -->
-
-
-
-<script>
- var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
- function onDownload(link) {
-
- $("#downloadForRealz").html("Download " + $(link).text());
- $("#downloadForRealz").attr('href', urlRoot + $(link).text());
-
- $("#tos").fadeIn('fast');
- $("#landing").fadeOut('fast');
-
- return true;
- }
-
-
- function onAgreeChecked() {
- /* verify that the TOS is agreed */
- if ($("input#agree").is(":checked")) {
- /* reveal the download button */
- $("a#downloadForRealz").removeClass('disabled');
- } else {
- $("a#downloadForRealz").addClass('disabled');
- }
- }
-
- function onDownloadForRealz(link) {
- if ($("input#agree").is(':checked')) {
- /*
- $("#tos").fadeOut('fast');
- $("#landing").fadeIn('fast');
- */
-
- ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
-
- /*
- location.hash = "";
- */
- return true;
- } else {
- return false;
- }
- }
-
- $(window).hashchange( function(){
- if (location.hash == "") {
- location.reload();
- }
- });
-
-</script>
diff --git a/docs/html/preview/features/afw.jd b/docs/html/preview/features/afw.jd
deleted file mode 100644
index 17cd58e..0000000
--- a/docs/html/preview/features/afw.jd
+++ /dev/null
@@ -1,555 +0,0 @@
-page.title=Android for Work Updates
-page.metaDescription=New Android for Work APIs and features in Android N.
-page.keywords="android for work", "android N", "enterprise", "QR code"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#qr">QR Code Provisioning
- </a></li>
-
- <li><a href="#sec-challenge">Work Profile Security Challenge
- </a></li>
-
- <li><a href="#suspend">Disable Access to Apps
- </a></li>
-
- <li><a href="#toggle-work">Toggle Work Mode
- </a></li>
-
- <li><a href="#always-on-vpn">Always-On VPN
- </a></li>
-
- <li><a href="#contacts">Contacts Integration with Work Profile
- </a></li>
-
- <li><a href="#remote-reboot">Remote Reboot
- </a></li>
-
- <li><a href="#disable-roaming">Disable Data Roaming
- </a></li>
-
- <li><a href="#process-logging">Enterprise Process Logging
- </a></li>
-
- <li><a href="#bug-reports">Remote Bug Reports
- </a></li>
-
- <li><a href="#remove-cert">Remove a Client Certificate
- </a></li>
-
- <li><a href="#grant-cert-on-install">Grant Access to Client Certificate
- on Installation</a></li>
-
- <li><a href="#ui-policy">System UI Policy Transparency
- </a></li>
-
- <li><a href="#managed-configurations">Managed Configurations Enhancements
- </a></li>
-
- <li><a href="#location-off">Location Off Switch
- </a></li>
-
- <li><a href="#custom-provisioning">Customized Provisioning
- </a></li>
-
- <li><a href="#multi-wifi-ca">Multiple Wi-Fi CA Certificates
- </a></li>
-
- <li><a href="#custom-lock">Customized Lockscreen Message
- </a></li>
-
- <li><a href="#work-connectionservice">Work Profile ConnectionService
- </a></li>
-
- <li><a href="#lock-wp">Lock Down Wallpaper
- </a></li>
-
- <li><a href="#lock-user-icon">Lock Down User Icon
- </a></li>
-
- <li><a href="#health-monitoring">Device Health Monitoring
- </a></li>
-
- </ol>
-
- <h2>See Also</h2>
- <ul>
- <li><a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
- Reference</a></li>
- </ul>
- </div>
-</div>
-
-<p>This document describes the new Android for Work features provided in
-Android N.</p>
-
-<h2 id="qr">QR Code Provisioning</h2>
-
-<p>
- Android for Work now supports using QR codes to provision corporate-liable
- devices. The setup wizard now allows you to scan a QR code to provision
- the device.
-</p>
-
-<h2 id="sec-challenge">Work Profile Security Challenge</h2>
-
-<p>
- Profile owners can require users to specify a security challenge for apps
- running in the work profile. The system shows the security challenge when the
- user attempts to open any work apps. If the user successfully completes the
- security challenge, the system unlocks the work profile and decrypts it if
- necessary.
-</p>
-
-<p>
- If a profile owner sends an {@link
- android.app.admin.DevicePolicyManager#ACTION_SET_NEW_PASSWORD} intent, the
- system prompts a user to set up a security challenge. The profile owner can
- also send an <code>ACTION_SET_NEW_PARENT_PROFILE_PASSWORD</code> intent to
- prompt the user to set a device lock.
-</p>
-
-<p>
- Profile owners can choose to set the password policies for the work challenge
- differently from the policies for other device passwords. For example, the
- minimum length for the device challenge response can be different from the
- length required for other passwords. Profile owners set the challenge
- policies using the usual {@link android.app.admin.DevicePolicyManager}
- methods, such as {@link
- android.app.admin.DevicePolicyManager#setPasswordQuality
- setPasswordQuality()} and {@link
- android.app.admin.DevicePolicyManager#setPasswordMinimumLength
- setPasswordMinimumLength()}. The profile owner can also set the device lock,
- by using the {@link android.app.admin.DevicePolicyManager} instance returned
- by the new <code>DevicePolicyManager.getParentProfileInstance()</code>
- method. Additionally, profile owners can customize the credentials screen for
- the work challenge by using the {@link android.app.admin.DevicePolicyManager}
- class's new <code>setOrganizationColor()</code> and
- <code>setOrganizationName()</code> methods.
-</p>
-
-<p>
- For details on the new methods and constants, see the
- <code>DevicePolicyManager</code> reference page in the <a
- href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK Reference</a>.
-</p>
-
-<h2 id="suspend">Disable Access to Apps</h2>
-
-<p>
- Device owners and profile owners can temporarily suspend access to packages
- by calling the new <code>DevicePolicyManager.setPackagesSuspended()</code>
- method. Owners can use the same method to re-enable those packages.
-</p>
-
-<p>
- While a package is suspended, it cannot start activities, notifications to
- the package are suppressed, and the app's entry in the <a
- href="{@docRoot}guide/components/recents.html">overview screen</a> is hidden.
- Suspended packages do not show in the <a href=
- "{@docRoot}guide/components/recents.html">overview screen</a>, and they
- cannot show dialogs (including toasts and snackbars). They also cannot play
- audio or vibrate the device.
-</p>
-
-<p>
- Launchers should apply a distinctive UI to suspended apps to show that the
- apps aren't currently available; for example, they might render the app icon
- in gray. Launchers can find out if an app is suspended by calling the new
- <code>DevicePolicyManager.getPackageSuspended()</code> method.
-</p>
-
-<h2 id="toggle-work">Toggle Work Mode</h2>
-
-<p>
- On dual-profile devices, users can toggle work mode on and off. While work
- mode is turned off, the managed profile is temporarily shut down. Work
- profile apps, background sync, and notifications are all disabled, including
- the profile owner app. While the work profile is disabled, the system
- displays a persistent status icon to remind users that they can't launch work
- apps. The system launcher indicates that work apps and widgets are not
- accessible.
-</p>
-
-<h2 id="always-on-vpn">Always-On VPN</h2>
-
-<p>
- Device owners and profile owners can require that work apps always connect to
- the network through a specified VPN. If owners set this requirement, the
- device automatically starts that VPN at boot time.
-</p>
-
-<p>
- Owners can require use of a VPN by calling the new
- <code>DevicePolicyManager.setAlwaysOnVpnPackage()</code> method. To find out
- if the owner has set a VPN requirement, call the new
- <code>DevicePolicyManager.GetAlwaysOnVpnPackage()</code> method.
-</p>
-
-<p>
- Because the system can directly bind VPN services without app interaction,
- VPN clients need to handle new entry points for always-on VPN. As before, you
- can find active services by using an intent filter that matches the action
- {@link android.net.VpnService android.net.VpnService}.
-</p>
-
-<p>
- Users can manually set an always-on VPN client that implement {@link
- android.net.VpnService} by using the <strong>Settings > More >
- VPN</strong> screen.
-</p>
-
-<h2 id="contacts">Contacts Integration with Work Profile</h2>
-
-<p>
- Profile owners can allow local search and directory lookup of work contacts
- from the primary user. For example, a user can access both personal and work
- directory contacts from their personal dialer or contacts application (if
- permitted by their profile administrator).
-</p>
-
-<p>
- Developers that leverage the Contact Provider can use the Enterprise Contacts
- API to access work profile directory entries from the primary user if allowed
- by policy:
-</p>
-
-<ul>
- <li><code>ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Phone.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Email.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Callable.ENTERPRISE_CONTENT_FILTER_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.ENTERPRISE_CONTENT_URI</code>
- </li>
-
- <li><code>ContactsContract.Directory.isEntepriseDirectoryId()</code>
- </li>
-</ul>
-
-<p>
- Profile owners can control the visibility of work contacts in the primary
- user using the following new methods:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setCrossProfileContactsSearchDisabled()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.getCrossProfileContactsSearchDisabled()</code>
- </li>
-</ul>
-
-<h2 id="remote-reboot">Remote Reboot</h2>
-
-<p>
- Device owners can remotely reboot devices. In some cases, devices deployed in
- public places inside enclosures can prevent access to the power button. If a
- device needs to be rebooted, administrators can do so using the new
- <code>DevicePolicyManager.reboot()</code> method.
-</p>
-
-<h2 id="disable-roaming">Disable Data Roaming</h2>
-
-<p>
- Device owners can disable data roaming using the new {@link
- android.os.UserManager} user restriction <code>DISALLOW_DATA_ROAMING</code>.
-</p>
-
-<h2 id="process-logging">Enterprise Process Logging</h2>
-
-<p>
- Device owners can identify suspicious activity by remotely tracking device
- activity, including app launches, adb activity, and screen unlocks. Process
- logs don’t require user consent. To retrieve logs, device owners enable
- device logging using <code>DevicePolicyManager.setSecurityLoggingEnabled()</code>.
-</p>
-
-<p>
- API changes include:
-</p>
-
-<ul>
-
- <li>
- The new class <code>android.app.admin.SecurityLog</code> and its
- methods
- </li>
-
- <li>
- <code>void DevicePolicyManager.setSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>boolean DevicePolicyManager.isSecurityLoggingEnabled()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrieveSecurityLogs()</code>
- </li>
-
- <li>
- <code>List<SecurityEvent>
- DevicePolicyManager.retrievePreRebootSecurityLogs()</code>
- </li>
-
- <li>
- <code>void DeviceAdminReceiver.onSecurityLogsAvailable()</code>
- </li>
-</ul>
-
-<h2 id="bug-reports">Remote Bug Reports</h2>
-
-<p>
- Device owners can remotely trigger and retrieve a bug report that contains a
- device state dump file, which allows forensic investigation of a known
- incident or compromised device. Due to the detailed nature of the bug report,
- user consent is required.
-</p>
-
-<p>
- Android N includes the following API additions to support this feature. For
- details, see the <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
- Reference</a>.
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.requestBugreport()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportFailed()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportShared()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.onBugreportSharingDeclined()</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING</code>
- </li>
-
- <li>
- <code>DeviceAdminReceiver.BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE</code>
- </li>
-</ul>
-
-<h2 id="remove-cert">Remove a Client Certificate</h2>
-
-<p>
- Profile owners and device owners can now remove client certificates that were
- installed through {@link android.app.admin.DevicePolicyManager#installKeyPair
- installKeyPair()} by calling the new method
- <code>DevicePolicyManager.removeKeyPair()</code>.
-</p>
-
-<h2 id="grant-cert-on-install">Grant Access to Client Certificate on
- Installation</h2>
-
-<p>
- If a profile owner or device owner grants a third-party app the ability to
- manage certificates, the app can grant itself access to certificates it
- installs without any intervention by the owner.
-</p>
-
-<p>
- The existing API for managing certificates is extended to include:
-</p>
-
-<ul>
- <li><code>DevicePolicyManager.installKeyPair()</code>
- </li>
-</ul>
-
-<h2 id="ui-policy">System UI Policy Transparency</h2>
-
-<p>
- Policies that affect the user experience or restrict user Settings are fully
- disclosed to the user, and profile owners and device owners can attribute the
- policy to their company’s IT department. In addition to a consistent “Action
- not allowed” message in Settings, IT administrators can set an
- organization-specific support message in device settings with the following
- new {@link android.app.admin.DevicePolicyManager} methods:
-</p>
-
-<ul>
- <li>
- <code>DevicePolicyManager.setShortSupportMessage()</code>
- </li>
-
- <li>
- <code>DevicePolicyManager.setLongSupportMessage()</code>
- </li>
-</ul>
-
-<h2 id="managed-configurations">Managed Configurations Enhancements</h2>
-
-<p>
- The device or profile owner can enable another application to manage
- configurations via the new
- <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code>
- method. The nominated application can check whether this permission has been
- granted by calling
- <code>DevicePolicyManager.isCallerApplicationRestrictionsManagingPackage()</code>.
-</p>
-
-<p>
- An application nominated to manage configurations can call {@link
- android.app.admin.DevicePolicyManager#setApplicationRestrictions
- setApplicationRestrictions()} and {@link
- android.app.admin.DevicePolicyManager#getApplicationRestrictions
- getApplicationRestrictions()} for any packages within that user or profile.
-</p>
-
-<h2 id="location-off">Location Off Switch</h2>
-
-<p>
- Users can disable location permissions for work apps while continuing to
- access location information in their personal apps. A separate location
- access switch in Location Settings allows users to deny location updates or
- last-location queries for apps running in the work profile.
-</p>
-
-<p>
- The top level location off switch disables location access for both the
- primary profile and the managed profile.
-</p>
-
-<h2 id="custom-provisioning">Customized Provisioning</h2>
-
-<p>
- An application can customize the profile owner and device owner provisioning
- flows with corporate colors and logos.
-</p>
-
-<dl>
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR</code>
- </dt>
-
- <dd>
- Customizes flow color.
- </dd>
-
- <dt>
- <code>DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI</code>
- </dt>
-
- <dd>
- Customizes the flow with a corporate logo.
- </dd>
-</dl>
-
-<h2 id="multi-wifi-ca">Multiple Wi-Fi CA Certificates</h2>
-
-<p>
- Profile owners and device owners can set multiple CA certificates for a given
- Wi-Fi configuration. When corporate Wi-Fi networks have separate CAs for
- separate access points with the same SSID, IT administrators can include all
- relevant CAs in the Wi-Fi configuration using the new method
- <code>setCaCertificates()</code>.
-</p>
-
-<p>
- APIs added are:
-</p>
-
-<ul>
- <li>
- <code>WifiEnterpriseConfig.setCaCertificates()</code>
- </li>
-
- <li>
- <code>WifiEnterpriseConfig.getCaCertificates()</code>
- </li>
-</ul>
-
-<h2 id="custom-lock">Customized Lockscreen Message</h2>
-
-<p>
- Device owners can provide owner information to be shownon the lockscreen.
- This information takes precedence over the user lock screen message (if one is
- set). New {@link android.app.admin.DevicePolicyManager} methods are:
-</p>
-
-<ul>
- <li>
- <code>setDeviceOwnerLockScreenInfo()</code>
- </li>
-
- <li>
- <code>getDeviceOwnerLockScreenInfo()</code>
- </li>
-</ul>
-
-<h2 id="work-connectionservice">Work Profile ConnectionService</h2>
-
-<p>
- Profile owners can specify a work dialer application that uses a
- work-specific {@link android.telecom.ConnectionService} for the calling
- backend (calling accounts). The work dialer maintains a work-only call log
- and relies on work contacts only. Users have a consistent in-call UI
- experience regardless of dialing application. Incoming work calls to the work
- calling accounts are distinguished from personal incoming calls to the
- personal calling accounts.
-</p>
-
-<p>
- The dialer should check for the new flag
- <code>android.telecom.Call.PROPERTY_ENTERPRISE_CALL</code> to determine if a call
- is a work call. If a call is a work call, the dialer should indicate this,
- such as by adding a work badge.
-</p>
-
-<h2 id="lock-wp">Lock Down Wallpaper</h2>
-
-<p>
- A new user restriction (<code>DISALLOW_SET_WALLPAPER</code>) prevents the
- user from changing their wallpaper. The device owner or profile owner can
- still change the wallpaper, but they can only change the wallpaper for the
- user or profile they control. For example, a profile owner can’t change the
- wallpaper of the parent user, but a profile owner in the primary profile or
- device owner can. A profile owner or device owner that wants to change the
- wallpaper should check whether the the user or profile they manage has a
- wallpaper ({@link android.app.WallpaperManager#isWallpaperSupported
- isWallpaperSupported()}) and whether they are allowed to change it (with the
- new method <code>WallpaperManager.isWallpaperSettingAllowed()</code>)
-</p>
-
-<h2 id="lock-user-icon">Lock Down User Icon</h2>
-
-<p>
- A new user restriction (<code>DISALLOW_SET_USER_ICON</code>) prevents the
- user from changing their user icon. The user’s device owner or profile owner
- can still change the icon. However, a profile owner can only change the user
- icon for the profile it controls.
-</p>
-
-<h2 id="health-monitoring">Device Health Monitoring</h2>
-
-<p>
- A device owner or profile owner can use the new
- <code>HardwarePropertiesManager</code> interface to retrieve information
- about device health, such as CPU or GPU temperatures and CPU usage. The new
- monitoring interface is especially useful for monitoring unattended devices
- running in a remote location.
-</p>
diff --git a/docs/html/preview/features/data-saver.jd b/docs/html/preview/features/data-saver.jd
deleted file mode 100644
index abc47ea..0000000
--- a/docs/html/preview/features/data-saver.jd
+++ /dev/null
@@ -1,256 +0,0 @@
-page.title=Data Saver
-metaDescription=User-enabled data usage optimization.
-page.keywords="android N", "data usage", "metered network"
-page.image=images/cards/card-nyc_2x.jpg
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>
- In this document
- </h2>
-
- <ol>
- <li>
- <a href="#status">Checking Data Saver Preferences</a>
- <ol>
- <li>
- <a href="#request-whitelist">Requesting whitelist permissions</a>
- </li>
- </ol>
- </li>
-
- <li>
- <a href="#monitor-changes">Monitoring Changes to Data Saver
- Preferences</a>
- </li>
-
- <li>
- <a href="#testing">Testing with Android Debug Bridge Commands</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>
- Over the life of a smartphone, the cost of a cellular data plan can easily
- exceed the cost of the device itself. In the N Developer Preview, users can
- enable Data Saver on a device-wide basis in order to use less data, whether
- roaming, near the end of the billing cycle, or on a small prepaid data pack.
-</p>
-
-<p>
- When a user enables Data Saver in <strong>Settings</strong> and the device is
- on a metered network, the system blocks background data usage and signals
- apps to use less data in the foreground wherever possible. Users can
- whitelist specific apps to allow background metered data usage even when Data
- Saver is turned on.
-</p>
-
-<p>
- The N Developer Preview extends the {@link android.net.ConnectivityManager}
- API to provide apps with a way to <a href="#status">retrieve the user’s Data
- Saver preferences</a> and <a href="#monitor-changes">monitor preference
- changes</a>. It is considered good practice for apps to check whether the
- user has enabled Data Saver and make an effort to limit foreground and
- background data usage.
-</p>
-
-<h2 id="status">
- Checking Data Saver Preferences
-</h2>
-
-<p>
- In the N Developer Preview, apps can use the {@link
- android.net.ConnectivityManager} API to determine what data usage
- restrictions are being applied. The {@code getRestrictBackgroundStatus()}
- method returns one of the following values:
-</p>
-
-<dl>
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
- </dt>
-
- <dd>
- Data Saver is disabled.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
- </dt>
-
- <dd>
- The user has enabled Data Saver for this app. Apps should make an effort to limit data
- usage in the foreground and gracefully handle restrictions to background
- data usage.
- </dd>
-
- <dt>
- {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
- </dt>
-
- <dd>
- The user has enabled Data Saver but the app is whitelisted. Apps should
- still make an effort to limit foreground and background data usage.
- </dd>
-</dl>
-
-<p>
- It is considered good practice to limit data usage whenever the device is
- connected to a metered network, even if Data Saver is disabled or the app
- is whitelisted. The following sample code uses {@link
- android.net.ConnectivityManager#isActiveNetworkMetered
- ConnectivityManager.isActiveNetworkMetered()} and {@code
- ConnectivityManager.getRestrictBackgroundStatus()} to determine how much data
- the app should use:
-</p>
-
-<pre>
-ConnectivityManager connMgr = (ConnectivityManager)
- getSystemService(Context.CONNECTIVITY_SERVICE);
-// Checks if the device is on a metered network
-if (connMgr.isActiveNetworkMetered()) {
- // Checks user’s Data Saver settings.
- switch (connMgr.getRestrictBackgroundStatus()) {
- case RESTRICT_BACKGROUND_STATUS_ENABLED:
- // Background data usage is blocked for this app. Wherever possible,
- // the app should also use less data in the foreground.
-
- case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
- // The app is whitelisted. Wherever possible,
- // the app should use less data in the foreground and background.
-
- case RESTRICT_BACKGROUND_STATUS_DISABLED:
- // Data Saver is disabled. Since the device is connected to a
- // metered network, the app should use less data wherever possible.
- }
-} else {
- // The device is not on a metered network.
- // Use data as required to perform syncs, downloads, and updates.
-}
-</pre>
-
-<h3 id="request-whitelist">
- Requesting whitelist permissions
-</h3>
-
-<p>
- If your app needs to use data in the background, it can request whitelist
- permissions by sending a
- <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
- intent containing a URI of your app's package name: for example,
- <code>package:MY_APP_ID</code>.
-</p>
-
-<p>
- Sending the intent and URI launches the <strong>Settings</strong> app and
- displays data usage settings for your app. The user can then decide whether
- to enable background data for your app. Before you send this intent, it is
- good practice to first ask the user if they want to launch the
- <strong>Settings</strong> app for the purpose of enabling background data
- usage.
-</p>
-
-<h2 id="monitor-changes">
- Monitoring Changes to Data Saver Preferences
-</h2>
-
-<p>
- Apps can monitor changes to Data Saver preferences by creating a {@link
- android.content.BroadcastReceiver} to listen for {@code
- ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} and dynamically
- registering the receiver with {@link android.content.Context#registerReceiver
- Context.registerReceiver()}. When an app receives this broadcast, it should
- <a href="#status">check if the new Data Saver preferences affect its
- permissions</a> by calling {@code
- ConnectivityManager.getRestrictBackgroundStatus()}.
-</p>
-
-<p class="note">
- <strong>Note:</strong> The system only sends this broadcast to apps that
- dynamically register for them with {@link
- android.content.Context#registerReceiver Context.registerReceiver()}. Apps
- that register to receive this broadcast in their manifest will not receive
- them.
-</p>
-
-<h2 id="testing">
- Testing with Android Debug Bridge Commands
-</h2>
-
-<p>
- The <a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
- provides a few commands that you can use to test your app in Data Saver
- conditions. You can check and configure network
- permissions or set wireless networks as metered to test your app on unmetered
- networks.
-</p>
-<dl>
- <dt>
- <code>$ adb shell dumpsys netpolicy</code>
- </dt>
-
- <dd>
- Generates a report that includes the current global background network
- restriction setting, package UIDs currently on a whitelist, and the network
- permissions of other known packages.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy</code>
- </dt>
-
- <dd>
- Displays a full list of Network Policy Manager (netpolicy) commands.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy set restrict-background
- <boolean></code>
- </dt>
-
- <dd>
- Enables or disables Data Saver mode when passing <code>true</code> or
- <code>false</code>, respectively.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy add restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Adds the specified package UID to the whitelist to allow background metered
- data usage.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
- <UID></code>
- </dt>
-
- <dd>
- Removes the specified package UID from the whitelist to block background
- metered data usage while Data Saver is enabled.
- </dd>
-
- <dt>
- <code>$ adb shell cmd netpolicy list wifi-networks</code>
- </dt>
-
- <dd>
- Lists all wifi networks, displaying whether they're metered.
- </dd>
-
-
- <dt>
- <code>$ adb shell cmd netpolicy set metered-network <WIFI_SSID>
- true</code>
- </dt>
-
- <dd>
- Sets wifi with the specified SSID as metered, allowing you to simulate a
- metered network on an unmetered network.
- </dd>
-</dl>
\ No newline at end of file
diff --git a/docs/html/preview/features/direct-boot.jd b/docs/html/preview/features/direct-boot.jd
deleted file mode 100644
index 8351f4b..0000000
--- a/docs/html/preview/features/direct-boot.jd
+++ /dev/null
@@ -1,188 +0,0 @@
-page.title=Direct Boot
-page.keywords=preview,sdk,direct boot
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#run">Requesting Access to Run During Direct Boot</a></li>
- <li><a href="#access">Accessing Device Encrypted Storage</a></li>
- <li><a href="#notification">Getting Notified of User Unlock</a></li>
- <li><a href="#migrating">Migrating Existing Data</a></li>
- <li><a href="#testing">Testing Your Encryption Aware App</a></li>
- </ol>
-</div>
-</div>
-
-<p>Android N runs in a secure, <i>Direct Boot</i> mode
-when the device has been powered on but the user has not unlocked the
-device. To support this, the system provides two storage locations for data:</p>
-
-<ul>
-<li><i>Credential encrypted storage</i>, which is the default storage location
-and only available after the user has unlocked the device.</li>
-<li><i>Device encrypted storage</i>, which is a storage location available both
-during Direct Boot mode and after the user has unlocked the device.</li>
-</ul>
-
-<p>By default, apps do not run during Direct Boot mode.
-If your app needs to take action during Direct Boot mode, you can register
-app components that should be run during this mode. Some common use cases
-for apps needing to run during Direct Boot mode include:</p>
-
-<ul>
-<li>Apps that have scheduled notifications, such as alarm clock
-apps.</li>
-<li>Apps that provide important user notifications, like SMS apps.</li>
-<li>Apps that provide accessibility services, like Talkback.</li>
-</ul>
-
-<p>If your app needs to access data while running in Direct Boot mode, use
-device encrypted storage. Device encrypted storage contains data
-encrypted with a key that is only available after a device has performed a
-successful verified boot.</p>
-
-<p>For data that should be encrypted with a key associated with user
-credentials, such as a PIN or password, use credential encrypted storage.
-Credential encrypted storage is only available after the user has successfully
-unlocked the device, up until when the user restarts the device again. If the
-user enables the lock screen after unlocking the device, this doesn't lock
-credential encrypted storage.</p>
-
-<h2 id="run">Requesting Access to Run During Direct Boot</h2>
-
-<p>Apps must register their components with the system before they
-can run during Direct Boot mode or access device encrypted
-storage. Apps register with the system by marking components as
-<i>encryption aware</i>. To mark your component as encryption aware, set the
-<code>android:directBootAware</code> attribute to true in your manifest.<p>
-
-<p>Encryption aware components can register to receive a
-<code>LOCKED_BOOT_COMPLETED</code> broadcast message from the
-system when the device has been restarted. At this point device encrypted
-storage is available, and your component can execute tasks that need to be
-run during Direct Boot mode, such as triggering a scheduled alarm.</p>
-
-<p>The following code snippet is an example of how to register a
-{@link android.content.BroadcastReceiver} as encryption aware, and add an
-intent filter for <code>LOCKED_BOOT_COMPLETED</code>, in the app manifest:</p>
-
-<pre>
-<receiver
- android:directBootAware="true" >
- ...
- <intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>Once the user has unlocked the device, all components can access both the
-device encrypted storage as well as credential encrypted storage.</p>
-
-<h2 id="access">Accessing Device Encrypted Storage</h2>
-
-<p>To access device encrypted storage, create a second
-{@link android.content.Context} instance by calling
-<code>Context.createDeviceProtectedStorageContext()</code>. All storage API
-calls made using this context access the device encrypted storage. The
-following example accesses the device encrypted storage and opens an existing
-app data file:</p>
-
-<pre>
-Context directBootContext = appContext.createDeviceProtectedStorageContext();
-// Access appDataFilename that lives in device encrypted storage
-FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
-// Use inStream to read content...
-</pre>
-
-<p>Use device encrypted storage only for
-information that must be accessible during Direct Boot mode.
-Don't use device encrypted storage as a general-purpose encrypted store.
-For private user information, or encrypted data that isn't needed during
-Direct Boot mode, use credential encrypted storage.</p>
-
-<h2 id="notification">Getting Notified of User Unlock</h2>
-
-<p>When the user unlocks the device after restart, your app can switch to
-accessing credential encrypted storage and use regular system services that
-depend on user credentials.</p>
-
-<p>To get notified when the user unlocks the device after a reboot,
-register a {@link android.content.BroadcastReceiver} from a running component
-to listen for unlock notification messages. When the user unlocks the device
-after boot:
-</p>
-<ul>
-<li>If your app has foreground processes that need immediate notification,
-listen for the {@code ACTION_USER_UNLOCKED} message.</li>
-<li>If your app only uses background processes that can act on a delayed
-notification, listen for the
-{@link android.content.Intent#ACTION_BOOT_COMPLETED ACTION_BOOT_COMPLETED}
-message.</li>
-</ul>
-
-<p>If the user has unlocked the device, you can find out by calling
-<code>UserManager.isUserUnlocked()</code>.</p>
-
-<h2 id="migrating">Migrating Existing Data</h2>
-
-<p>If a user updates their device to use Direct Boot mode, you might have
-existing data that needs to get migrated to device encrypted storage. Use
-<code>Context.moveSharedPreferencesFrom()</code> and
-<code>Context.moveDatabaseFrom()</code> to migrate preference and database
-data between credential encrypted storage and device encrypted storage.</p>
-
-<p>Use your best judgment when deciding what data to migrate from credential
-encrypted storage to device encrypted storage. You should not migrate
-private user information, such as passwords or authorization tokens, to
-device encrypted storage. In some scenarios, you might need to manage
-separate sets of data in the two encrypted stores.</p>
-
-<h2 id="testing">Testing Your Encryption Aware App</h2>
-
-<p>Test your encryption aware app using the new Direct Boot mode. There are
-two ways to enable Direct Boot.</p>
-
-<p class="caution"><strong>Caution:</strong> Enabling Direct Boot
-wipes all user data on the device.</p>
-
-<p>On supported devices with Android N installed, enable
-Direct Boot by doing one of the following:</p>
-
-<ul>
-<li>On the device, enable <b>Developer options</b> if you haven't already by
-going to <b>Settings > About phone</b>, and tapping <b>Build number</b>
-seven times. Once the developer options screen is available, go to
-<b>Settings > Developer options</b> and select
-<b>Convert to file encryption</b>.</li>
-<li>Use the following adb shell commands to enable Direct Boot mode:
-<pre class="no-pretty-print">
-$ adb reboot-bootloader
-$ fastboot --wipe-and-use-fbe
-</pre>
-</li>
-</ul>
-
-<p>An emulated Direct Boot mode is also available, in case you need to switch
-modes on your test devices. Emulated mode should only be used during
-development and may cause data loss. To enable emulated Direct Boot mode,
-set a lock pattern on the device, choose "No thanks" if prompted for a
-secure start-up screen when setting a lock pattern, and then use the
-following adb shell command:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe true
-</pre>
-
-<p>To turn off emulated Direct Boot mode, use the following command:</p>
-
-<pre class="no-pretty-print">
-$ adb shell sm set-emulate-fbe false
-</pre>
-
-<p>Using these commands causes the device to reboot.</p>
diff --git a/docs/html/preview/features/icu4j-framework.jd b/docs/html/preview/features/icu4j-framework.jd
deleted file mode 100644
index 839c077..0000000
--- a/docs/html/preview/features/icu4j-framework.jd
+++ /dev/null
@@ -1,163 +0,0 @@
-page.title=ICU4J Android Framework APIs
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-<h2>In this document:</h2>
-<ol>
- <li><a href="#relation">Relationship to ICU4J</a></li>
- <li><a href="#migration">Migrating to android.icu APIs from ICU4J </a></li>
- <li><a href="#licence">Licensing</a></li>
-</ol>
-
-<h2>See Also</h2>
-<ol>
- <li>
- <a class="external-link" href=
- "http://userguide.icu-project.org">Documentation for ICU4J</a>
- </li>
-
- <li>
- <a class="external-link" href=
- "http://site.icu-project.org/#TOC-What-is-ICU-">Latest standards supported
- by ICU4J</a>
- </li>
-</ol>
-</div>
-</div>
-
-<p>
- ICU4J is an open-source, widely used set of Java libraries providing Unicode
- and globalization support for software applications. Android N
- exposes a subset of the ICU4J APIs in the Android framework for app developers
- to use under the {@code android.icu} package. These APIs use
- localization data present on the device. As a result, you can reduce your APK
- footprint by not compiling the ICU4J libraries into your APK; instead, you can
- simply call out to them in the framework. (In this case, you may want to provide
- <a href="{@docRoot}google/play/publishing/multiple-apks.html">multiple versions
- of your APK</a>, so users running versions of Android lower than Android N
- can download a version of the app that contains the ICU4J libraries.)
-</p>
-
-<p>
- This document begins by providing some basic information on the minimum
- Android API levels required to support these libraries. It then explains what
- you need to know about the Android-specific implementation of ICU4J. Finally,
- it tells you how to use the ICU4J APIs in the Android framework.
-</p>
-
-<h2 id="relation">Relationship to ICU4J</h2>
-
-<p>
- Android N exposes a subset of the ICU4J APIs via the
- <code>android.icu</code> package, rather than <code>com.ibm.icu</code>. The
- Android framework may choose not to
- expose ICU4J APIs for various reasons; for example, Android N does not expose
- some deprecated APIs or those that the ICU team have not yet declared as
- stable. As the ICU team deprecates APIs in the future, Android will also mark
- them as deprecated but will continue to include them.
-</p>
-
-<p class="table-caption"><strong>Table 1.</strong> ICU and CLDR versions used
- in Android N.</p>
-<table>
-<tr>
-<th>Android API level</th>
-<th>ICU version</th>
-<th>CLDR version</th>
-</tr>
-<tr>
-<td>Android N</td>
-<td>56</td>
-<td>28</td>
-</tr>
-</table>
-
-<p>Here are a few important things to note:</p>
-
-<ul>
-<li>The ICU4J Android framework APIs do not include all the ICU4J APIs.</li>
-<li>NDK developers should know that Android ICU4C is not supported.</li>
-<li>The APIs in the Android framework do not replace Android’s support for
-<a href="{@docRoot}guide/topics/resources/localization.html">localizing with
-resources</a>.</li>
-</ul>
-
-<h2 id="migration">Migrating to the android.icu package from com.ibm.icu</h2>
-
-<p>
- If you are already using the ICU4J APIs in your app, and the
- <code>android.icu</code> APIs meet your requirements, then migrating to
- the framework APIs requires you to change your Java imports
- from <code>com.ibm.icu</code> to <code>android.icu</code>. You may then
- remove your own copy of ICU4J files from the APK.
-</p>
-
-<p class="note">
- <b>Note</b>: The ICU4J framework APIs use the {@code android.icu}
- namespace instead of {@code com.ibm.icu}. This is to avoid namespace
- conflicts in APKs that contain their own {@code com.ibm.icu} libraries.
-</p>
-
-<h3 id="migrate-from-android">
- Migrating to android.icu APIs from other Android SDK APIs
-</h3>
-
-<p>
- Some classes in the <code>java</code> and<code>android</code> packages have
- equivalents to those found in ICU4J. However, ICU4J often provides broader
- support for standards and languages.
-</p>
-<p>Here are some examples to get you started:</p>
-<table>
-<tr>
-<th>Class</th>
-<th>Alternatives</th>
-</tr>
-<tr>
-<td><code>java.lang.Character</code> </td>
-<td><code>android.icu.lang.UCharacter</code> </td>
-</tr>
-<tr>
-<td><code>java.text.BreakIterator</code> </td>
-<td><code>android.icu.text.BreakIterator</code> </td>
-</tr>
-<tr>
-<td><code>java.text.DecimalFormat</code> </td>
-<td><code>android.icu.text.DecimalFormat</code> </td>
-</tr>
-<tr>
-<td><code>java.util.Calendar</code></td>
-<td>
-<code>android.icu.util.Calendar</code></td>
-</tr>
-<tr>
-<td><code>android.text.BidiFormatter</code>
- </td>
-<td><code>android.icu.text.Bidi</code>
- </td>
-</tr>
-<tr>
-<td><code>android.text.format.DateFormat</code>
- </td>
-<td><code>android.icu.text.DateFormat</code>
- </td>
-</tr>
-<tr>
-<td><code>android.text.format.DateUtils</code> </td>
-<td><code>android.icu.text.DateFormat</code>
-<code>android.icu.text.RelativeDateTimeFormatter</code>
-</td>
-</tr>
-</table>
-
-<h2 id="licence">Licensing</h2>
-
-<p>
- ICU4J is released under the ICU license. For details, see the <a class=
- "external-link" href=
- "http://userguide.icu-project.org/icufaq#TOC-How-is-the-ICU-licensed-">ICU
- User Guide.</a>
-</p>
diff --git a/docs/html/preview/features/key-attestation.jd b/docs/html/preview/features/key-attestation.jd
deleted file mode 100644
index 98b8340..0000000
--- a/docs/html/preview/features/key-attestation.jd
+++ /dev/null
@@ -1,845 +0,0 @@
-page.title=Key Attestation
-page.metaDescription=New support in Android N for verifying security properties of hardware-backed keys.
-page.keywords="android N", "security", "TEE", "hardware-backed", "keystore", "certificate", "key attestation"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#verifying">Retrieving and Verifying a Hardware-backed Key Pair</a></li>
- <li><a href="#certificate_schema">Certificate Extension Data Schema</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Key Attestation gives you more confidence that the keys you use in your app
- are stored in a device's hardware-backed keystore. The following sections
- describe how to verify the properties of hardware-backed keys and how to
- interpret the schema of the attestation certificate's extension data.
-</p>
-
-<h2 id="verifying">
- Retrieving and Verifying a Hardware-backed Key Pair
-</h2>
-
-<p>
- During key attestation, you specify the alias of a key pair. The attestation
- tool, in return, provides a certificate chain, which you can use to verify
- the properties of that key pair.
-</p>
-
-<p>
- The root certificate within this chain is signed using an attestation key,
- which the device manufacturer injects into the device’s hardware-backed
- keystore at the factory.
-</p>
-
-<p class="note">
- <strong>Note:</strong> On devices that ship with Android N and Google Play
- services, the root certificate is issued by Google. You should verify that
- this root certificate appears within Google’s list of root certificates.
-</p>
-
-<p>
- To implement key attestation, complete the following steps:
-</p>
-
-<ol>
- <li>
- Use a {@link java.security.KeyStore KeyStore} object's
- {@link java.security.KeyStore#getCertificateChain getCertificateChain()}
- method to get a reference to the chain of X.509 certificates associated with
- the hardware-backed keystore.
- </li>
-
- <li>
- <p>
- Check each certificate’s validity using a
- {@link java.security.cert.CRL CRL} object's
- {@link java.security.cert.CRL#isRevoked isRevoked()} method.
- </p>
-
- <p class="caution">
- <strong>Caution:</strong> Although you can complete this process within
- your app directly, it’s safer to check the certificates’ revocation lists
- on a separate server that you trust.
- </p>
- </li>
-
- <li>
- <p>
- Create an <code>Attestation</code> object, passing in the first element of
- the certificate chain as an argument:</p>
-
-<pre>
-// "certificates" contains the certificate chain associated with a specific key
-// pair in the device's hardware-backed keystore.
-X509Certificate attestationCert = (X509Certificate) certificates[0];
-Attestation hardwareKeyAttestation = new Attestation(attestationCert);
-</pre>
-
- <p>
- An attestation object extracts the extension data within this certificate
- and stores this information in a more accessible format. For more details
- about the schema of the extension data, see <a href=
- "#certificate_schema">Certificate Extension Data Schema</a>.
- </p>
- </li>
-
- <li>
- <p>
- Use the accessor methods within the <code>Attestation</code> class to
- retrieve the extension data from the certificate. These methods use the
- same names and structure hierarchy as in the certificate extension data
- schema.
- </p>
-
- <p>
- For example, to view the verified boot key for the device’s TEE, use the
- following method sequence:
- </p>
-
-<pre>
-// "hardwareKeyAttestation" contains the first element of the attestation
-// certificate chain.
-AuthorizationList teeAuthList = hardwareKeyAttestation.getTeeEnforced();
-RootOfTrust teeRootOfTrust = teeAuthList.getRootOfTrust();
-byte[] teeVerifiedBootKey = teeRootOfTrust.getVerifiedBootKey();
-</pre>
-
- </li>
-
- <li>
- <p>
- Compare the extension data from the <code>Attestation</code> object with
- the set of values that you expect the hardware-backed key to contain.
- </p>
-
- <p class="caution">
- <strong>Caution:</strong> Although you can complete this process within
- your app directly, it’s safer to check the certificate’s extension data
- on a separate server that you trust.
- </p>
- </li>
-</ol>
-
-<h2 id="certificate_schema">
- Certificate Extension Data Schema
-</h2>
-
-<p>
- Key attestation verifies the extension data that appears in the first
- certificate within the chain in a device’s hardware-backed keystore. The
- certificate stores the information according to the following ASN.1 schema:
-</p>
-
-<pre class="no-pretty-print">
-KeyDescription ::= SEQUENCE {
- attestationVersion INTEGER,
- attestationSecurityLevel SecurityLevel,
- keymasterVersion INTEGER,
- keymasterSecurityLevel SecurityLevel,
- attestationChallenge OCTET_STRING,
- <var>reserved OCTET_STRING</var>,
- softwareEnforced AuthorizationList,
- teeEnforced AuthorizationList,
-}
-
-SecurityLevel ::= ENUMERATED {
- Software (0),
- TrustedEnvironment (1),
-}
-
-AuthorizationList ::= SEQUENCE {
- purpose [1] EXPLICIT SET OF INTEGER OPTIONAL,
- algorithm [2] EXPLICIT INTEGER OPTIONAL,
- keySize [3] EXPLICIT INTEGER OPTIONAL,
- digest [5] EXPLICIT SET OF INTEGER OPTIONAL,
- padding [6] EXPLICIT SET OF INTEGER OPTIONAL,
- ecCurve [10] EXPLICIT INTEGER OPTIONAL,
- rsaPublicExponent [200] EXPLICIT INTEGER OPTIONAL,
- activeDateTime [400] EXPLICIT INTEGER OPTIONAL,
- originationExpireDateTime [401] EXPLICIT INTEGER OPTIONAL,
- usageExpireDateTime [402] EXPLICIT INTEGER OPTIONAL,
- noAuthRequired [503] EXPLICIT NULL OPTIONAL,
- userAuthType [504] EXPLICIT INTEGER OPTIONAL,
- authTimeout [505] EXPLICIT INTEGER OPTIONAL,
- allowWhileOnBody [506] EXPLICIT NULL OPTIONAL,
- allApplications [600] EXPLICIT NULL OPTIONAL,
- applicationId [601] EXPLICIT OCTET_STRING OPTIONAL,
- creationDateTime [701] EXPLICIT INTEGER OPTIONAL,
- origin [702] EXPLICIT INTEGER OPTIONAL,
- rollbackResistant [703] EXPLICIT NULL OPTIONAL,
- rootOfTrust [704] EXPLICIT RootOfTrust OPTIONAL,
- osVersion [705] EXPLICIT INTEGER OPTIONAL,
- osPatchLevel [706] EXPLICIT INTEGER OPTIONAL,
- attestationChallenge [708] EXPLICIT INTEGER OPTIONAL,
- attestationApplicationId [709] EXPLICIT OCTET_STRING OPTIONAL,
-}
-
-RootOfTrust ::= SEQUENCE {
- verifiedBootKey OCTET_STRING,
- deviceLocked BOOLEAN,
- verifiedBootState VerifiedBootState,
-}
-
-VerifiedBootState ::= ENUMERATED {
- Verified (0),
- SelfSigned (1),
- Unverified (2),
- Failed (3),
-}
-</pre>
-
-<p>
- The following list presents a description of each element within the schema:
-</p>
-
-<h3 id="certificate_schema_keydescription">
- KeyDescription
-</h3>
-
-<p>
- This sequence of values presents general information about the key pair being
- verified through key attestation and provides easy access to additional
- details.
-</p>
-
-<dl>
- <dt>
- <code>attestationVersion</code>
- </dt>
-
- <dd>
- The version of the key attestation feature. Should be set to 1.
- </dd>
-
- <dt>
- <code>attestationSecurity</code>
- </dt>
-
- <dd>
- <p>
- The <a href="#certificate_schema_securitylevel">security
- level</a> of the attestation.
- </p>
-
- <p class="note">
- <strong>Note:</strong> Although it is possible to attest keys that are
- stored in the Android system—that is, if the
- <code>attestationSecurity</code> value is set to Software—you
- cannot trust these attestations if the Android system becomes compromised.
- </p>
- </dd>
-
- <dt>
- <code>keymasterVersion</code>
- </dt>
-
- <dd>
- The version of the Keymaster hardware abstraction layer (HAL). Use 0 to
- represent version 0.2 or 0.3, 1 to represent version 1.0, and 2 to represent
- version 2.0.
- </dd>
-
- <dt>
- <code>keymasterSecurity</code>
- </dt>
-
- <dd>
- The <a href="#certificate_schema_securitylevel">security
- level</a> of the Keymaster implementation.
- </dd>
-
- <dt>
- <code>attestationChallenge</code>
- </dt>
-
- <dd>
- The challenge string associated with a key pair that is verified using key
- attestation.
- </dd>
-
- <dt>
- <code><var>reserved</var></code>
- </dt>
-
- <dd>
- Only system apps use this value. In all other apps, this value is empty.
- </dd>
-
- <dt>
- <code>softwareEnforced</code>
- </dt>
-
- <dd>
- Optional. The Keymaster <a href=
- "#certificate_schema_authorizationlist">authorization
- list</a> that is enforced by the Android system, not by the device’s TEE.
- </dd>
-
- <dt>
- <code>teeEnforced</code>
- </dt>
-
- <dd>
- Optional. The Keymaster <a href=
- "#certificate_schema_authorizationlist">authorization
- list</a> that is enforced by the device’s TEE.
- </dd>
-</dl>
-
-<h3 id="certificate_schema_securitylevel">
- SecurityLevel
-</h3>
-
-<p>
- This data structure indicates the extent to which a software feature, such as
- a key pair, is protected based on its location within the device.
-</p>
-
-<p>
- Because the data structure is an enumeration, it takes on exactly one of the
- following values:
-</p>
-
-<dl>
- <dt>
- Software
- </dt>
-
- <dd>
- The logic for creating and managing the feature is implemented in the
- Android system. For the purposes of creating and storing key pairs, this
- location is less secure than the TEE but is more secure than your app's
- process space.
- </dd>
-
- <dt>
- TrustedEnvironment
- </dt>
-
- <dd>
- The logic for creating and managing the feature is implemented in secure
- hardware, such as a TEE. For the purposes of creating and storing key pairs,
- this location is more secure because secure hardware is highly resistant to
- remote compromise.
- </dd>
-</dl>
-
-<h3 id="certificate_schema_authorizationlist">
- AuthorizationList
-</h3>
-
-<p>
- This data structure contains the key pair’s properties themselves, as defined
- in the Keymaster hardware abstraction layer (HAL). You compare these values
- to the device’s current state or to a set of expected values to verify that a
- key pair is still valid for use in your app.
-</p>
-
-<p>
- Each field name corresponds to a similarly-named Keymaster tag. For example,
- the <code>keySize</code> field in an authorization list corresponds to the
- <code>KM_TAG_KEY_SIZE</code> Keymaster tag.
-</p>
-
-<p>
- Each field in the following list is optional:
-</p>
-
-<dl>
- <dt>
- <code>purpose</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_purpose">
- KM_TAG_PURPOSE</a></code> Keymaster tag, which uses a tag ID value of 1.
- </dd>
-
- <dt>
- <code>algorithm</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_algorithm">
- KM_TAG_ALGORITHM</a></code> Keymaster tag, which uses a tag ID value of
- 2.
- </p>
-
- <p>
- When an <code>AuthorizationList</code> object is associated with key
- attestation, this value is always <code>KM_ALGORITHM_RSA</code> or
- <code>KM_ALGORITHM_EC</code>.
- </p>
- </dd>
-
- <dt>
- <code>keySize</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_key_size">
- KM_TAG_KEY_SIZE</a></code> Keymaster tag, which uses a tag ID value of 3.
- </dd>
-
- <dt>
- <code>digest</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_digest">
- KM_TAG_DIGEST</a></code> Keymaster tag, which uses a tag ID value of 5.
- </dd>
-
- <dt>
- <code>padding</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_padding">
- KM_TAG_PADDING</a></code> Keymaster tag, which uses a tag ID value of 6.
- </dd>
-
- <dt>
- <code>ecCurve</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_EC_CURVE</code> Keymaster tag, which uses
- a tag ID value of 10.
- </p>
-
- <p>
- The set of parameters used to generate an elliptic curve (EC) key pair,
- which uses ECDSA for signing and verification, within the Android system
- keystore.
- </p>
- </dd>
-
- <dt>
- <code>rsaPublicExponent</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_rsa_public_exponent">
- KM_TAG_RSA_PUBLIC_EXPONENT</a></code> Keymaster tag, which uses a tag ID
- value of 200.
- </dd>
-
- <dt>
- <code>activeDateTime</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_active_datetime">
- KM_TAG_ACTIVE_DATETIME</a></code> Keymaster tag, which uses a tag ID value
- of 400.
- </dd>
-
- <dt>
- <code>originationExpireDateTime</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_origination_expire_datetime">
- KM_TAG_ORIGINATION_EXPIRE_DATETIME</a></code> Keymaster tag, which uses a
- tag ID value of 401.
- </dd>
-
- <dt>
- <code>usageExpireDateTime</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_usage_expire_datetime">
- KM_TAG_USAGE_EXPIRE_DATETIME</a></code> Keymaster tag, which uses a tag ID
- value of 402.
- </dd>
-
- <dt>
- <code>noAuthRequired</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_no_auth_required">
- KM_TAG_NO_AUTH_REQUIRED</a></code> Keymaster tag, which uses a tag ID
- value of 503.
- </p>
-
- <p>
- When an <code>AuthorizationList</code> object is associated with key
- attestation, this value is always true.
- </p>
- </dd>
-
- <dt>
- <code>userAuthType</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_user_auth_type">
- KM_TAG_USER_AUTH_TYPE</a></code> Keymaster tag, which uses a tag ID value
- of 504.
- </dd>
-
- <dt>
- <code>authTimeout</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_auth_timeout">
- KM_TAG_AUTH_TIMEOUT</a></code> Keymaster tag, which uses a tag ID value of
- 505.
- </dd>
-
- <dt>
- <code>allowWhileOnBody</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_ALLOW_WHILE_ON_BODY</code> Keymaster tag,
- which uses a tag ID value of 506.
- </p>
-
- <p>
- Allows the key to be used after its authentication timeout period if the
- user is still wearing the device on their body. Note that a secure
- on-body sensor determines whether the device is being worn on the user’s
- body.
- </p>
-
- <p>
- When an <code>AuthorizationList</code> object is associated with key
- attestation, this value is always true.
- </p>
- </dd>
-
- <dt>
- <code>allApplications</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_ALL_APPLICATIONS</code> Keymaster tag,
- which uses a tag ID value of 600.
- </p>
-
- <p>
- Indicates whether all apps on a device can access the key pair.
- </p>
-
- <p>
- When an <code>AuthorizationList</code> object is associated with key
- attestation, this value is always true.
- </p>
- </dd>
-
- <dt>
- <code>applicationId</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_application_id">
- KM_TAG_APPLICATION_ID</a></code> Keymaster tag, which uses a tag ID value
- of 601.
- </dd>
-
- <dt>
- <code>creationDateTime</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_creation_datetime">
- KM_TAG_CREATION_DATETIME</a></code> Keymaster tag, which uses a tag ID
- value of 701.
- </dd>
-
- <dt>
- <code>origin</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_origin">
- KM_TAG_ORIGIN</a></code> Keymaster tag, which uses a tag ID value of 702.
- </p>
-
- <p>
- When an <code>AuthorizationList</code> object is associated with key
- attestation, this value is usually set to
- <code>KM_ORIGIN_GENERATED</code>. If the attestation uses Keymaster
- version 0.2 or 0.3, however, the origin may be set to
- <code>KM_ORIGIN_UNKNOWN</code> instead.
- </p>
- </dd>
-
- <dt>
- <code>rollbackResistant</code>
- </dt>
-
- <dd>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_rollback_resistant">
- KM_TAG_ROLLBACK_RESISTANT</a></code> Keymaster tag, which uses a tag ID
- value of 703.
- </dd>
-
- <dt>
- <code>rootOfTrust</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code><a href=
- "https://source.android.com/security/keystore/implementer-ref.html#km_tag_root_of_trust">
- KM_TAG_ROOT_OF_TRUST</a></code> Keymaster tag, which uses a tag ID value
- of 704.
- </p>
-
- <p>
- For more details, see the section describing the <code><a href=
- "#certificate_schema_rootoftrust">RootOfTrust</a></code>
- data structure.
- </p>
- </dd>
-
- <dt>
- <code>osVersion</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_OS_VERSION</code> Keymaster tag, which
- uses a tag ID value of 705.
- </p>
-
- <p>
- The version of the Android operating system associated with the
- Keymaster, specified as a six-digit integer. For example, version 6.0.1
- is represented as 060001.
- </p>
-
- <p>
- Only Keymaster version 1.0 or higher includes this value in the
- authorization list.
- </p>
- </dd>
-
- <dt>
- <code>osPatchLevel</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_PATCHLEVEL</code> Keymaster tag, which
- uses a tag ID value of 706.
- </p>
-
- <p>
- The month and year associated with the security patch that is being used
- within the Keymaster, specified as a six-digit integer. For example, the
- June 2016 patch is represented as 201606.
- </p>
-
- <p>
- Only Keymaster version 1.0 or higher includes this value in the
- authorization list.
- </p>
- </dd>
-
- <dt>
- <code>attestationChallenge</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_ATTESTATION_CHALLENGE</code> Keymaster
- tag, which uses a tag ID value of 708.
- </p>
-
- <p>
- The challenge string associated with the key pair that is defined in the
- Keymaster.
- </p>
- </dd>
-
- <dt>
- <code>attestationApplicationId</code>
- </dt>
-
- <dd>
- <p>
- Corresponds to the <code>KM_TAG_ATTESTATION_APPLICATION_ID</code>
- Keymaster tag, which uses a tag ID value of 709.
- </p>
-
- <p>
- The unique ID of the attestation certificate that signed the key pair
- that is in the Keymaster.
- </p>
- </dd>
-</dl>
-
-<h3 id="certificate_schema_rootoftrust">
- RootOfTrust
-</h3>
-
-<p>
- This collection of values defines key information about the device’s status.
-</p>
-
-<p>
- Each field in the following list is required:
-</p>
-
-<dl>
- <dt>
- <code>verifiedBootKey</code>
- </dt>
-
- <dd>
- <p>
- A secure hash of the key that verifies the system image. It is recommended
- that you use the SHA-256 algorithm for this hash.
- </p>
- </dd>
-
- <dt>
- <code>deviceLocked</code>
- </dt>
-
- <dd>
- True if the device’s bootloader is locked, which enables Verified Boot
- checking and prevents an unsigned device image from being flashed onto the
- device. For more information about this feature, see the <a class=
- "external-link" href=
- "https://source.android.com/security/verifiedboot/verified-boot.html">Verifying
- Boot</a> documentation.
- </dd>
-
- <dt>
- <code>verifiedBootState</code>
- </dt>
-
- <dd>
- The <a href="#certificate_schema_verifiedbootstate">boot
- state</a> of the device, according to the Verified Boot feature.
- </dd>
-
- <dt>
- <code>osVersion</code>
- </dt>
-
- <dd>
- The current version of the Android operating system on the device,
- specified as a six-digit integer. For example, version 6.0.1 is represented
- as 060001.
- </dd>
-
- <dt>
- <code>patchMonthYear</code>
- </dt>
-
- <dd>
- The month and year associated with the security patch that is currently
- installed on the device, specified as a six-digit integer. For example, the
- June 2016 patch is represented as 201606.
- </dd>
-</dl>
-
-<h3 id="certificate_schema_verifiedbootstate">
- VerifiedBootState
-</h3>
-
-<p>
- This data structure provides the device’s current boot state, which
- represents the level of protection provided to the user and to apps after the
- device finishes booting. For more information about this feature, see the
- <a class="external-link" href=
- "https://source.android.com/security/verifiedboot/verified-boot.html#boot_state">
- Boot State</a> section within the Verifying Boot documentation.
-</p>
-
-<p>
- This data structure is an enumeration, so it takes on exactly one of the
- following values:
-</p>
-
-<dl>
- <dt>
- Verified
- </dt>
-
- <dd>
- <p>
- Indicates a full chain of trust, which includes the bootloader, the boot
- partition, and all verified partitions.
- </p>
-
- <p>
- When the device is in this boot state, the <code>verifiedBootKey</code> is
- the hash of the device-embedded certificate, which the device manufacturer
- adds to the device's ROM at the factory.
- </p>
- </dd>
-
- <dt>
- SelfSigned
- </dt>
-
- <dd>
- <p>
- Indicates that the device-embedded certificate has verified the device’s
- boot partition and that the signature is valid.
- </p>
-
- <p>
- When the device is in this boot state, the <code>verifiedBootKey</code> is
- the hash of a user-installed certificate, which signs a boot partition
- that the user adds to the device in place of the original,
- manufacturer-provided boot partition.
- </p>
- </dd>
-
- <dt>
- Unverified
- </dt>
-
- <dd>
- Indicates that the user can modify the device freely. Therefore, the user is
- responsible for verifying the device’s integrity.
- </dd>
-
- <dt>
- Failed
- </dt>
-
- <dd>
- Indicates that the device has failed verification. The attestation
- certificate should never use this value for <code>VerifiedBootState</code>.
- </dd>
-</dl>
diff --git a/docs/html/preview/features/multi-window.jd b/docs/html/preview/features/multi-window.jd
deleted file mode 100644
index ca5bd0d..0000000
--- a/docs/html/preview/features/multi-window.jd
+++ /dev/null
@@ -1,599 +0,0 @@
-page.title=Multi-Window Support
-page.metaDescription=New support in Android N for showing more than one app at a time.
-page.keywords="multi-window", "android N", "split screen", "free-form"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#overview">Overview</a></li>
- <li><a href="#lifecycle">Multi-Window Lifecycle</a></li>
- <li><a href="#configuring">Configuring Your App for Multi-Window
- Mode</a></li>
- <li><a href="#running">Running Your App in Multi-Window Mode</a></li>
- <li><a href="#testing">Testing Your App's Multi-Window Support</a></li>
- </ol>
- <h2>See Also</h2>
- <ol>
- <li><a class="external-link"
- href="https://github.com/googlesamples/android-MultiWindowPlayground">Multi-Window
- Playground sample app</a></li>
- <li><a class="external-link"
- href="https://medium.com/google-developers/5-tips-for-preparing-for-multi-window-in-android-n-7bed803dda64"
- >Five Tips for Preparing for Multi-Window in Android N</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N adds support for displaying more than one app at the
- same time. On handheld devices, two apps can run side-by-side or
- one-above-the-other in <em>split-screen</em> mode. On TV devices, apps can
- use <em>picture-in-picture</em> mode to continue video playback while users
- are interacting with another app.
-</p>
-
-<p>
- If you build your app with the N Preview SDK, you can configure how your app
- handles multi-window display. For example, you can specify your activity's
- minimum allowable dimensions. You can also disable multi-window display for
- your app, ensuring that the system only shows your app in full-screen
- mode.
-</p>
-
-<h2 id="overview">Overview</h2>
-
-<p>
- Android N allows several apps to share the screen at once. For
- example, a user could split the screen, viewing a web page on the left side
- while composing an email on the right side. The user experience depends on
- the device:
-</p>
-
-<ul>
- <li>Handheld devices running Android N offer split-screen
- mode. In this mode, the system fills the screen with two apps, showing them
- either side-by-side or one-above-the-other. The user can drag the dividing
- line separating the two to make one app larger and the other smaller.
- </li>
-
- <li>On Nexus Player running Android N, apps can put themselves
- in <a href="picture-in-picture.html">picture-in-picture mode</a>, allowing
- them to continue showing content while the user browses or interacts with
- other apps.
- </li>
-
- <li>Manufacturers of larger devices can choose to enable freeform
- mode, in which the user can freely resize each activity. If the
- manufacturer enables this feature, the device offers freeform mode in addition
- to split-screen mode.
- </li>
-</ul>
-
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650"
- srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
- {@docRoot}preview/images/mw-splitscreen_2x.png 2x,"
- id="img-split-screen" />
-<p class="img-caption">
- <strong>Figure 1.</strong> Two apps running side-by-side in split-screen mode.
-</p>
-
-<p>
- The user can switch into multi-window mode in the following ways:
-</p>
-
-<ul>
- <li>If the user opens the <a href="{@docRoot}guide/components/recents.html">Overview
- screen</a> and performs a long press on an
- activity title, they can drag that activity to a highlighted portion of the
- screen to put the activity in multi-window mode.
- </li>
-
- <li>If the user performs a long press on the Overview button, the device puts
- the current activity in multi-window mode, and opens the Overview screen to
- let the user choose another activity to share the screen.
- </li>
-</ul>
-
-<p>
- Users can <a href="{@docRoot}guide/topics/ui/drag-drop.html">drag and
- drop</a> data from one activity to another while the activities are sharing
- the screen. (Previously, users could only drag and drop data within a single
- activity.)
-</p>
-
-<h2 id="lifecycle">Multi-Window Lifecycle</h2>
-
-<p>
- Multi-window mode does not change the <a href=
- "{@docRoot}training/basics/activity-lifecycle/index.html">activity
- lifecycle</a>.
-</p>
-
-<p>
- In multi-window mode, only the activity the user has most recently interacted
- with is active at a given time. This activity is considered <em>topmost</em>.
- All other activities are in the paused state, even if they are visible.
- However, the system gives these paused-but-visible activities higher priority
- than activities that are not visible. If the user interacts with one of the
- paused activities, that activity is resumed, and the previously topmost
- activity is paused.
-</p>
-
-<p class="note">
- <strong>Note:</strong> In multi-window mode, an app can be in the paused
- state and still be visible to the user. An app might need to continue its
- activities even while paused. For example, a video-playing app that is in
- paused mode but is visible should continue showing its video. For this
- reason, we recommend that activities that play video <em>not</em> pause the
- video in their {@link android.app.Activity#onPause onPause()} handlers.
- Instead, they should pause video in {@link android.app.Activity#onStop
- onStop()}, and resume playback in {@link android.app.Activity#onStart
- onStart()}.
-</p>
-
-<p>
- When the user puts an app into multi-window mode, the system notifies the
- activity of a configuration change, as specified in <a href=
- "{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime
- Changes</a>. This also happens when the user resizes the app, or puts the app
- back into full-screen mode.
- Essentially, this change has the same activity-lifecycle
- implications as when the system notifies the app that the device has switched
- from portrait to landscape mode, except that the device dimensions are
- changed instead of just being swapped. As discussed in <a href=
- "{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime
- Changes</a>, your activity can handle the configuration change itself, or it
- can allow the system to destroy the activity and recreate it with the new
- dimensions.
-</p>
-
-<p>
- If the user is resizing a window and makes it larger in either dimension, the
- system resizes the activity to match the user action and issues <a href=
- "{@docRoot}guide/topics/resources/runtime-changes.html">runtime changes</a>
- as needed. If the app lags behind in drawing in newly-exposed areas, the
- system temporarily fills those areas with the color specified by the {@link
- android.R.attr#windowBackground windowBackground} attribute or by the default
- <code>windowBackgroundFallback</code> style attribute.
-</p>
-
-<h2 id="configuring">Configuring Your App for Multi-Window Mode</h2>
-
-<p>
- If your app targets Android N, you can configure how and
- whether your app's activities support multi-window display. You can set
- attributes in your manifest to control both size and layout.
- A root activity's attribute settings apply to all activities
- within its task stack. For example, if the root activity has
- <code>android:resizeableActivity</code> set to true, then all activities
- in the task stack are resizeable.
-</p>
-
-<p class="note">
- <strong>Note:</strong> If you build a multi-orientation app with a version of the
- SDK lower than Android N, and the user uses the app in
- multi-window mode, the system forcibly resizes the app. The system presents a
- dialog box warning the user that the app may behave unexpectedly. The system
- does <em>not</em> resize fixed-orientation apps; if
- the user attempts to open a fixed-orientation app under multi-window mode,
- the app takes over the whole screen.
-</p>
-
-<h4 id="resizeableActivity">android:resizeableActivity</h4>
-<p>
- Set this attribute in your manifest's <code><activity></code> or
- <code><application></code> node to enable or disable multi-window
- display:
-</p>
-
-<pre>
-android:resizeableActivity=["true" | "false"]
-</pre>
-
-<p>
- If this attribute is set to true, the activity can be launched in
- split-screen and freeform modes. If the attribute is set to false, the
- activity does not support multi-window mode. If this value is false, and the
- user attempts to launch the activity in multi-window mode, the activity takes
- over the full screen.
-</p>
-
-<p>
- If your app targets Android N, but you do not specify a value
- for this attribute, the attribute's value defaults to true.
-</p>
-
-<h4 id="supportsPictureInPicture">android:supportsPictureInPicture</h4>
-
-<p>
- Set this attribute in your manifest's <code><activity></code> node to
- indicate whether the activity supports picture-in-picture display. This
- attribute is ignored if <code>android:resizeableActivity</code> is false.
-</p>
-
-<pre>
-android:supportsPictureInPicture=["true" | "false"]
-</pre>
-
-<h3 id="layout">Layout attributes</h3>
-
-<p>
- With Android N, the <code><layout></code> manifest element
- supports several attributes that affect how an activity behaves in
- multi-window mode:
-</p>
-
-<dl>
- <dt>
- <code>android:defaultWidth</code>
- </dt>
-
- <dd>
- Default width of the activity when launched in freeform mode.
- </dd>
-
- <dt>
- <code>android:defaultHeight</code>
- </dt>
-
- <dd>
- Default height of the activity when launched in freeform mode.
- </dd>
-
- <dt>
- <code>android:gravity</code>
- </dt>
-
- <dd>
- Initial placement of the activity when launched in freeform mode. See the
- {@link android.view.Gravity} reference for suitable values.
- </dd>
-
- <dt>
- <code>android:minHeight</code>, <code>android:minWidth</code>
- </dt>
-
- <dd>
- Minimum height and minimum width for the activity in both split-screen
- and freeform modes. If the user moves the divider in split-screen mode
- to make an activity smaller than the specified minimum, the system crops
- the activity to the size the user requests.
- </dd>
-</dl>
-
-<p>
- For example, the following code shows how to specify an activity's default
- size and location, and its minimum size, when the activity is displayed in
- freeform mode:
-</p>
-
-<pre>
-<activity android:name=".MyActivity">
- <layout android:defaultHeight="500dp"
- android:defaultWidth="600dp"
- android:gravity="top|end"
- android:minHeight="450dp"
- android:minWidth="300dp" />
-</activity>
-</pre>
-
-<h2 id="running">Running Your App in Multi-Window Mode</h2>
-
-<p>
- Android N offers new functionality to support apps that can run
- in multi-window mode.
-</p>
-
-<h3 id="disabled-features">Disabled features in multi-window mode</h3>
-
-<p>
- Certain features are disabled or ignored when a device is in multi-window
- mode, because they don’t make sense for an activity which may be sharing the
- device screen with other activities or apps. Such features include:
-
-<ul>
- <li>Some <a href="{@docRoot}training/system-ui/index.html">System UI</a>
- customization options are disabled; for example, apps cannot hide the status
- bar if they are not running in full-screen mode.
- </li>
-
- <li>The system ignores changes to the <code><a href=
- "{@docRoot}guide/topics/manifest/activity-element.html#screen"
- >android:screenOrientation</a></code> attribute.
- </li>
-</ul>
-
-<h3 id="change-notification">Multi-window change notification and querying</h3>
-
-<p>
- The following new methods have been added to the {@link android.app.Activity}
- class to support multi-window display. For details on each method, see the
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N Preview SDK
- Reference</a>.
-</p>
-
-<dl>
- <dt>
- <code>Activity.isInMultiWindowMode()</code>
- </dt>
-
- <dd>
- Call to find out if the activity is in multi-window mode.
- </dd>
-
- <dt>
- <code>Activity.isInPictureInPictureMode()</code>
- </dt>
-
- <dd>
- Call to find out if the activity is in picture-in-picture mode.
-
- <p class="note">
- <strong>Note:</strong> Picture-in-picture mode is a special case of
- multi-window mode. If <code>myActivity.isInPictureInPictureMode()</code>
- returns true, then <code>myActivity.isInMultiWindowMode()</code> also
- returns true.
- </p>
- </dd>
-
- <dt>
- <code>Activity.onMultiWindowModeChanged()</code>
- </dt>
-
- <dd>
- The system calls this method whenever the activity goes into or out of
- multi-window mode. The system passes the method a value of true if the
- activity is entering multi-window mode, and false if the activity is
- leaving multi-window mode.
- </dd>
-
- <dt>
- <code>Activity.onPictureInPictureModeChanged()</code>
- </dt>
-
- <dd>
- The system calls this method whenever the activity goes into or out of
- picture-in-picture mode. The system passes the method a value of true if
- the activity is entering picture-in-picture mode, and false if the activity
- is leaving picture-in-picture mode.
- </dd>
-</dl>
-
-<p>
- There are also {@link android.app.Fragment} versions of each of these
- methods, for example <code>Fragment.isInMultiWindowMode()</code>.
-</p>
-
-<h3 id="entering-pip">Entering picture-in-picture mode</h3>
-
-<p>
- To put an activity in picture-in-picture mode, call the new method
- <code>Activity.enterPictureInPictureMode()</code>. This method has no effect if
- the device does not support picture-in-picture mode. For more information,
- see the <a href="picture-in-picture.html">Picture-in-Picture</a> documentation.
-</p>
-
-<h3 id="launch">Launch New Activities in Multi-Window Mode</h3>
-
-<p>
- When you launch a new activity, you can hint to the system that the new
- activity should be displayed adjacent to the current one, if possible. To do
- this, use the flag
- <code>Intent.FLAG_ACTIVITY_LAUNCH_TO_ADJACENT</code>. Passing
- this flag requests the following behavior:
-</p>
-
-<ul>
- <li>If the device is in split-screen mode, the system attempts to create the
- new activity next to the activity that launched it, so the two activities
- share the screen. The system is not guaranteed to be able to do this, but it
- makes the activities adjacent if possible.
- </li>
-
- <li>If the device is not in split-screen mode, this flag has no effect.
- </li>
-</ul>
-
-<p>
- If a device is in freeform mode and you are launching a new activity, you can
- specify the new activity's dimensions and screen location by calling
- <code>ActivityOptions.setLaunchBounds()</code>. This method has no effect if
- the device is not in multi-window mode.
-</p>
-
-<p class="note">
- <strong>Note:</strong> If you launch an activity within a task stack, the
- activity replaces the activity on the screen, inheriting all of its
- multi-window properties. If you want to launch the new activity as a separate
- window in multi-window mode, you must launch it in a new task stack.
-</p>
-
-<h3 id="dnd">Supporting drag and drop</h3>
-
-<p>
- Users can <a href="{@docRoot}guide/topics/ui/drag-drop.html">drag and
- drop</a> data from one activity to another while the two activities are
- sharing the screen. (Previously, users could only drag and drop data within a
- single activity.) For this reason, you may want to add drag and drop
- functionality to your app if your app does not currently support it.
-</p>
-
-<p>
- The N Preview SDK extends the <a href=
- "{@docRoot}reference/android/view/package-summary.html"><code>android.view</code></a>
- package to support cross-app drag and drop. For details on the following
- classes and methods, see the <a href="{@docRoot}preview/setup-sdk.html#docs-dl">N
- Preview SDK Reference</a>.
-</p>
-
-<dl>
- <dt>
- <code>android.view.DropPermissions</code>
- </dt>
-
- <dd>
- Token object responsible for specifying the permissions granted to the app
- that receives a drop.
- </dd>
-
- <dt>
- <code>View.startDragAndDrop()</code>
- </dt>
-
- <dd>
- New alias for {@link android.view.View#startDrag View.startDrag()}. To
- enable cross-activity drag and drop, pass the new flag
- <code>View.DRAG_FLAG_GLOBAL</code>. If you need to give URI permissions to
- the recipient activity, pass the new flags
- <code>View.DRAG_FLAG_GLOBAL_URI_READ</code> or
- <code>View.DRAG_FLAG_GLOBAL_URI_WRITE</code>, as appropriate.
- </dd>
-
- <dt>
- <code>View.cancelDragAndDrop()</code>
- </dt>
-
- <dd>
- Cancels a drag operation currently in progress. Can only be called by the
- app that originated the drag operation.
- </dd>
-
- <dt>
- <code>View.updateDragShadow()</code>
- </dt>
-
- <dd>
- Replaces the drag shadow for a drag operation currently in progress. Can
- only be called by the app that originated the drag operation.
- </dd>
-
- <dt>
- <code>Activity.requestDragAndDropPermissions()</code>
- </dt>
-
- <dd>
- Requests the permissions for the content URIs passed with the {@link
- android.content.ClipData} contained in a {@link android.view.DragEvent}.
- </dd>
-</dl>
-
-<h2 id="testing">Testing Your App's Multi-Window Support</h2>
-
-<p>
- Whether or not you update your app for Android N, you should
- verify how it behaves in multi-window mode in case a user tries to launch it
- in multiwindow mode on a device running Android N.
-</p>
-
-<h3 id="configuring">Configuring a Test Device</h3>
-
-<p>
- If you install Android N on a device, split-screen mode is
- automatically supported.
-</p>
-
-<h3 id="test-non-n">If your app was not built with the N Preview SDK</h3>
-
-<p>
- If you did not build your app with the N Preview SDK and the user attempts to use
- the app in multi-window mode, the system forcibly resizes the app unless the app
- declares a fixed orientation.
-</p>
-
-<p>
- If your app does not declare a fixed orientation, you should launch your app
- on a device running Android N and attempt to put the app in
- split-screen mode. Verify that the user experience is
- acceptable when the app is forcibly resized.
-</p>
-
-<p>
- If the app declares a fixed orientation, you should attempt to put the app in
- multi-window mode. Verify that when you do so, the app remains
- in full-screen mode.
-</p>
-
-<h3 id="test-mw">If you support multi-window mode</h3>
-
-<p>
- If you built your app with the N Preview SDK and have not disabled
- multi-window support, verify the following behavior under both split-screen
- and freeform modes.
-</p>
-
-<ul>
- <li>Launch the app in full-screen mode, then switch to multi-window mode by
- long-pressing the Overview button. Verify that the app switches properly.
- </li>
-
- <li>Launch the app directly in multi-window mode, and verify that the app
- launches properly. You can launch an app in multi-window mode by pressing the
- Overview button, then long-pressing the title bar of your app and dragging it
- to one of the highlighted areas on the screen.
- </li>
-
- <li>Resize your app in split-screen mode by dragging the divider line.
- Verify that the app resizes without crashing, and that necessary UI elements
- are visible.
- </li>
-
- <li>If you have specified minimum dimensions for your app, attempt to resize
- the app below those dimensions. Verify that you cannot resize the app to be
- smaller than the specified minimum.
- </li>
-
- <li>Through all tests, verify that your app's performance is acceptable. For
- example, verify that there is not too long a lag to update the UI after the
- app is resized.
- </li>
-</ul>
-
-<h4 id="test-checklist">Testing checklist</h4>
-
-<p>
- To verify your app's performance in multi-window mode, try the following
- operations. You should try these operations in both split-screen and
- multi-window mode, except where otherwise noted.
-</p>
-
-<ul>
- <li>Enter and leave multi-window mode.
- </li>
-
- <li>Switch from your app to another app, and verify that the app behaves
- properly while it is visible but not active. For example, if your app is
- playing video, verify that the video continues to play while the user is
- interacting with another app.
- </li>
-
- <li>In split-screen mode, try moving the dividing bar to make your app both
- larger and smaller. Try these operations in both side-by-side and
- one-above-the-other configurations. Verify that the app does not crash,
- essential functionality is visible, and the resize operation doesn't take too
- long.
- </li>
-
- <li>Perform several resize operations in rapid succession. Verify that your
- app doesn't crash or leak memory. For information about checking your app's
- memory usage, see <a href="{@docRoot}tools/debugging/debugging-memory.html">
- Investigating Your RAM Usage</a>.
- </li>
-
- <li>Use your app normally in a number of different window configurations, and
- verify that the app behaves properly. Verify that text is readable, and that
- UI elements aren't too small to interact with.
- </li>
-</ul>
-
-<h3 id="test-disabled-mw">If you have disabled multi-window support</h3>
-
-<p>
- If you disabled multi-window support by setting
- <code>android:resizableActivity="false"</code>, you should launch your app on
- a device running Android N and attempt to put the app in
- freeform and split-screen modes. Verify that when you do so, the app remains
- in full-screen mode.
-</p>
diff --git a/docs/html/preview/features/multilingual-support.jd b/docs/html/preview/features/multilingual-support.jd
deleted file mode 100644
index ff21b52..0000000
--- a/docs/html/preview/features/multilingual-support.jd
+++ /dev/null
@@ -1,221 +0,0 @@
-page.title=Language and Locale
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-<h2>In this document:</h2>
-<ol>
- <li><a href="#preN">Challenges in Resolving Language Resources</a></li>
- <li><a href="#postN">Improvements to Resource-Resolution Strategy</a></li>
- <li><a href="#design">Designing your App to Support Additional
- Locales</a></li>
-
-</ol>
-
-</div>
-</div>
-
-<p>Android N provides enhanced support for multilingual users,
-allowing them to select multiple locales in settings. Android N
-provides this capability by greatly expanding the number of locales supported
-and changing the way the system resolves resources. The new method of resolving
-resources is more robust and designed to be compatible with existing APKs, but
-you should take extra care to spot any unexpected behavior. For example, you
-should test to make sure that your app defaults to the expected language. Also,
-if your app supports multiple languages, you should ensure that this support works as
-intended. Finally, you should try to ensure that your app gracefully handles
-languages that you didn't explicitly design it to support.</p>
-
-<p>This document starts by explaining the resource resolution strategy prior to
-Android N. Next, it describes Android N's improved
-resource-resolution strategy. Last, it explains how to take advantage of
-the expanded number of locales to support more multilingual users.</p>
-
-<h2 id="preN">Challenges in Resolving Language Resources</h2>
-
-<p>Prior to Android N, Android could not always successfully
- match app and system locales.</p>
-
- <p>For example, assume that you have the following situation:</p>
- <ul>
- <li>Your app's default language is {@code en_US} (US English), and it also has
- Spanish strings localized in {@code es_ES}
- resource files.</li>
- <li> A device is set to {@code es_MX} </li>
-
-<p>When your Java code refers to strings, the system would load
-strings from the default ({@code en_US}) resource file, even if the app has
-Spanish resources localized under {@code es_ES}. This is because when the system
- cannot find an exact match, it continues to look for resources by stripping the
- country code off the locale. Finally, if no match is found, the system falls
- back to the default, which is {@code en_US}. </p>
-
-
-<p>The system would also default to {@code en_US} if the user chose a language that
-the app didn't support at all, like French. For example:</p>
-
-<p class="table-caption" id="t-resource-res">
-<strong>Table 1.</strong> Resource resolution without an exact locale match.
-</p>
-<table>
-<tbody>
-<tr>
-<th>User Settings</th>
-<th>App Resources</th>
-<th>Resource Resolution</th>
-</tr>
-<tr>
-<td>fr_CH</td>
-<td>
-default (en)<br>
-de_DE<br>
-es_ES<br>
-fr_FR<br>
-it_IT<br>
-</td>
- <td>
-Try fr_CH => Fail<br>
-Try fr => Fail<br>
-Use default (en)
-</td>
- </tr>
- </tbody>
-</table>
-
-
-<p>In this example, the system displays English strings without
-knowing whether the user can understand English. This behavior is pretty common
-today. Android N should substantially reduce the frequency
-of outcomes like this one.</p>
-
-<h2 id="postN">Improvements to Resource-Resolution Strategy</h2>
-<p>Android N brings more robust resource resolution, and
-finds better fallbacks automatically. However, to speed up resolution and improve
- maintainability, you should store resources in the most common parent dialect.
- For example, if you were storing Spanish resources in the {@code es-US} directory
- before, move them into the {@code es-419} directory, which contains Latin American Spanish.
- Similarly, if you have resource strings in a folder named {@code en-GB}, rename
- the folder to {@code en-001} (international English), because the most common
- parent for <code>en-GB</code> strings is {@code en-001}.
- The following examples explain why these practices improve performance and
-reliability of resource resolution.</p>
-
-<h3>Resource resolution examples</h3>
-
-<p>With Android N, the case described in <strong>Table 1</strong> is resolved
-differently:</p>
-
-<p class="table-caption" id="t-improved-res">
-<strong>Table 2.</strong> An improved resolution strategy for when there is no
-exact locale match.</p>
-<table>
-<tr>
-<th>User Settings</th>
-<th>App Resources</th>
-<th>Resource Resolution</th>
-</tr>
-<tr>
-<td><ol>
-<li> fr_CH</li>
-</ol>
-</td>
-<td>
-default (en)<br>
-de_DE<br>
-es_ES<br>
-fr_FR<br>
-it_IT<br>
-</td>
-<td>
-Try fr_CH => Fail<br>
-Try fr => Fail<br>
-Try children of fr => fr_FR<br>
-Use fr_FR
-</td>
-</tr>
-
-</table>
-
-
-<p>Now the user gets French resources instead of English. This example also shows
- why you should store French strings in {@code fr} rather than {@code fr_FR}
- for Android N. Here the course of action is to match the closest parent dialect,
- making resolution faster and more predictable.</p>
-
-<p>In addition to this improved resolution logic, Android now offers more
- user languages to choose from. Let’s try the above example again with Italian
- specified as an additional user language, but without app support for French. </p>
-
-<p class="table-caption" id="t-2d-choice">
-<strong>Table 3.</strong> Resource resolution when the app only matches the
-user's second-preferred locale setting.</p>
-<table>
-<tr>
-<th>User Settings</th>
-<th>App Resources</th>
-<th>Resource Resolution</th>
-
-</tr>
-<tr>
-<td><ol>
-<li> fr_CH</li>
-<li> it_CH</li>
-</ol>
-</td>
-<td>
-default (en)<br>
-de_DE<br>
-es_ES<br>
-it_IT<br>
-</td>
-<td>
-Try fr_CH => Fail<br>
-Try fr => Fail<br>
-Try children of fr => Fail<br>
-Try it_CH => Fail<br>
-Try it => Fail<br>
-Try children of it => it_IT<br>
-Use it_IT
-</td>
-
-</tr>
-
-</table>
-<p>The user still gets a language they understand, even though the app doesn’t
-support French.</p>
-
-
-<h2 id="design">Designing your App to Support Additional Locales</h2>
-<h3>LocaleList API</h3>
-
-<p>Android N adds a new API {@code LocaleList.getDefault()}
-that lets apps directly query the list of languages a user has specified. This API
-allows you to create more sophisticated
- app behavior and better-optimized display of content. For example, Search
- can show results in multiple languages based on user’s settings. Browser apps
- can avoid offering to translate pages in a language the user already knows,
- and keyboard apps can auto-enable all appropriate layouts. </p>
-
-<h3>Formatters</h3>
-
-<p>Up through Android 6.0 (API level 23), Android supported only one or two locales
- for many common languages
-(en, es, ar, fr, ru). Because there were only a few variants of each language,
-apps could get away with storing some numbers and dates as hard coded strings
-in resource files. However, with Android's broadened set of supported locales,
-there can be
-significant differences in formats for dates, times, currencies, and similar
-information even within a single locale. Hard-coding your formats can produce a
-confusing experience for end users. Therefore, when developing for Android N
-make sure to use formatters instead of hard coding numbers and date strings.</p>
-
-<p>A prime example is Arabic, whose support Android N expands from
-one {@code ar_EG} to 27 Arabic locales. These locales can share most resources,
-but some prefer ASCII digits, while others prefer native digits. For example,
-when you want to create a sentence with a digit variable, such as
-"Choose a 4 digit pin", use formatters as shown below:</p>
-
-<pre> format(locale, "Choose a %d-digit PIN", 4)</pre>
diff --git a/docs/html/preview/features/notification-updates.jd b/docs/html/preview/features/notification-updates.jd
deleted file mode 100644
index af449cb..0000000
--- a/docs/html/preview/features/notification-updates.jd
+++ /dev/null
@@ -1,399 +0,0 @@
-page.title=Notifications
-page.tags=notifications
-helpoutsWidget=true
-page.image=/preview/images/notifications-card.png
-
-trainingnavtop=true
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<!-- table of contents -->
-<h2>This document includes</h2>
-<ol>
- <li><a href="#direct">Direct Reply</a></li>
- <li><a href="#bundle">Bundled Notifications</a></li>
- <li><a href="#custom">Custom Views</a></li>
- <li><a href="#style">Messaging Style</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>Android N introduces several new APIs that allow apps to post
-notifications that are highly visible and interactive.</p>
-
-<p>Android N extends the existing {@link android.support.v4.app.RemoteInput}
-notification API to support inline replies on handsets. This feature allows users
- to quickly respond from the notification shade without visiting your app.</p>
-
-<p>
- Android N also allows you to bundle similar notifications to
- appear as a single notification. To make this possible, Android N uses the existing {@link
- android.support.v4.app.NotificationCompat.Builder#setGroup
- NotificationCompat.Builder.setGroup()} method. Users can expand each of the
- notifications, and perform actions such as reply and dismiss on each of the
- notifications, individually from the notification shade.
-</p>
-
-<p>Last, Android N also adds new APIs that allow you to leverage system
-decorations in your app’s customized notification views. These APIs help
-ensure that the notification views share a consistent presentation with
-standard templates.</p>
-
-<p>This document highlights some of the key changes that you should take into
- account when using the new notification features in your apps.</p>
-
-<h2 id="direct">Direct Reply</h2>
-
-<p>With the Direct Reply feature in Android N, users can quickly
-respond to text messages or update task lists directly within the notification
-interface. On a handheld, the inline reply action appears as an additional button
- attached to the notification. When a user replies via keyboard, the system attaches
- the text response to the intent
- you had specified for the notification action and sends the intent to your
- handheld app.
-
-
-<img id="fig-reply-button" src="{@docRoot}preview/images/inline-reply.png"
- srcset="{@docRoot}preview/images/inline-reply.png 1x,
- {@docRoot}preview/images/inline-reply_2x.png 2x"
- width="400">
-<p class="img-caption">
- <strong>Figure 1.</strong> Android N adds the <strong>Reply</strong>
- action button.
-</p>
-
-<h3>Adding inline reply actions</h3>
-
-<p>To create a notification action that supports direct reply:
-</p>
-
-<ol>
-<li>Create an instance of {@link android.support.v4.app.RemoteInput.Builder}
- that you can add to your notification
-action. This class's constructor accepts a string that the system uses as the key
- for the text input. Later, your handheld app uses that key to retrieve the text
- of the input.
-
-<pre>
-// Key for the string that's delivered in the action's intent.
-private static final String KEY_TEXT_REPLY = "key_text_reply";
-String replyLabel = getResources().getString(R.string.reply_label);
-RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
- .setLabel(replyLabel)
- .build();
-</pre>
-</li>
-<li>Attach the {@link android.support.v4.app.RemoteInput}
- object to an action using <code>addRemoteInput()</code>.
-
-<pre>
-// Create the reply action and add the remote input.
-Notification.Action action =
- new Notification.Action.Builder(R.drawable.ic_reply_icon,
- getString(R.string.label), replyPendingIntent)
- .addRemoteInput(remoteInput)
- .build();
-</pre>
-</li>
-
-<li>Apply the action to a notification and issue the notification.
-
-<pre>
-// Build the notification and add the action.
-Notification newMessageNotification =
- new Notification.Builder(mContext)
- .setSmallIcon(R.drawable.ic_message)
- .setContentTitle(getString(R.string.title))
- .setContentText(getString(R.string.content))
- .addAction(action))
- .build();
-
-// Issue the notification.
-NotificationManager notificationManager =
- NotificationManager.from(mContext);
-notificationManager.notify(notificationId, newMessageNotification);
-
-</pre>
-</li>
-
-</ol>
-
-
-<p> The system prompts the user to input a response when they trigger the
-notification action. </p>
-
-<img id="fig-user-input" src="{@docRoot}preview/images/inline-type-reply.png"
- srcset="{@docRoot}preview/images/inline-type-reply.png 1x,
- {@docRoot}preview/images/inline-type-reply_2x.png 2x"
- width="300">
-<p class="img-caption">
- <strong>Figure 2.</strong> The user inputs text from the notification shade.
-</p>
-
-<h3>
- Retrieving user input from the inline reply
-</h3>
-
-<p>
- To receive user input from the notification interface to the activity you
- declared in the reply action's intent:
-</p>
-
-<ol>
- <li>Call {@link android.support.v4.app.RemoteInput#getResultsFromIntent
- getResultsFromIntent()} by passing the notification action’s intent as the
- input parameter. This method returns a {@link android.os.Bundle} that
- contains the text response.
-
- <pre>
-Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
-</pre>
- </li>
-
- <li>Query the bundle using the result key (provided to the {@link
- android.support.v4.app.RemoteInput.Builder} constructor). You can complete
- this process and retrieve the input text by creating a method, as in the
- following code snippet:
-
- <pre>
-// Obtain the intent that started this activity by calling
-// Activity.getIntent() and pass it into this method to
-// get the associated string.
-
-private CharSequence getMessageText(Intent intent) {
- Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
- if (remoteInput != null) {
- return remoteInput.getCharSequence(KEY_TEXT_REPLY);
- }
- return null;
- }
-</pre>
- </li>
-
- <li>Build and issue another notification, using the same notification ID that
- you provided for the previous notification. The progress indicator
- disappears from the notification interface to inform users of a successful
- reply. When working with this new notification, use the context that gets
- passed to the receiver's {@code onReceive()} method.
-
- <pre>
-// Build a new notification, which informs the user that the system
-// handled their interaction with the previous notification.
-Notification repliedNotification =
- new Notification.Builder(context)
- .setSmallIcon(R.drawable.ic_message)
- .setContentText(getString(R.string.replied))
- .build();
-
-// Issue the new notification.
-NotificationManager notificationManager =
- NotificationManager.from(context);
-notificationManager.notify(notificationId, repliedNotification);
-</pre>
- </li>
-</ol>
-
-<p>
- For interactive apps, such as chats, it could be useful to include additional
- context when handling retrieved text. For example, these apps could show
- multiple lines of chat history. When the user responds via {@link
- android.support.v4.app.RemoteInput}, you can update the reply history
- using the {@code setRemoteInputHistory()} method.
-</p>
-
-<p>
- The notification must be either updated or cancelled after the app has
- received remote input. When the user replies to a remote update
- using Direct Reply,
- do not cancel the notification. Instead, update the notification to display the user's reply.
-For notifications using {@code MessagingStyle}, you should add
-the reply as the latest message. When using other templates, you can
-append the user's reply to the remote-input history.
-</p>
-
-<h2 id="bundle">Bundled Notifications</h2>
-
-<p>Android N provides developers with a new way to represent
- a queue of notifications: <i>bundled notifications</i>. This is similar to the
- <a href="{@docRoot}training/wearables/notifications/stacks.html">Notification
- Stacks</a> feature in Android Wear. For example, if your app creates notifications
- for received messages, when more than one message is received, bundle the
- notifications together as a single group. You can
- use the existing {@link android.support.v4.app.NotificationCompat.Builder#setGroup
-Builder.setGroup()} method to bundle similar notifications.</p>
-
-<p>
- A notification group imposes a hierarchy on the notifications comprising it.
- At the top of that hierarchy is a parent notification that displays summary
- information for the group. The user can progressively
- expand the notification group, and the system shows more information as the
- user drills deeper. When the user expands the bundle, the system reveals more
- information for all its child notifications; when the user
- expands one of those notifications, the system reveals its entire content.
-</p>
-
-<img id="fig-bundles" src="{@docRoot}preview/images/bundles.png"
- srcset="{@docRoot}preview/images/bundles.png 1x,
- {@docRoot}preview/images/bundles_2x.png 2x"
- width="300">
-<p class="img-caption">
- <strong>Figure 3.</strong> The user can progressively expand the notification
- group.
-</p>
-
-<p class="note">
- <strong>Note:</strong> If the same app sends four or more notifications
- and does not specify a grouping, the
- system automatically groups them together.
-</p>
-
-<p>To learn how to add notifications to a group, see
-<a href="{@docRoot}training/wearables/notifications/stacks.html#AddGroup">Add
-Each Notification to a Group</a>.</p>
-
-
-<h3 id="best-practices">Best practices for bundled notifications</h3>
-<p>This section provides guidelines about when to use notification groups instead
-of the {@link android.app.Notification.InboxStyle InboxStyle}
-notifications that have been available in earlier versions of the
-Android platform.</p>
-
-<h3>When to use bundled notifications</h3>
-
-<p>You should use notification groups only if all of the following conditions are
-true for your use case:</p>
-
-<ul>
- <li>The child notifications are complete notifications and can be displayed
- individually without the need for a group summary.</li>
- <li>There is a benefit to surfacing the child notifications individually. For
- example:
- </li>
- <ul>
- <li>They are actionable, with actions specific to each child.</li>
- <li>There is more information to the child that the user wants to read.</li>
- </ul>
-</ul>
-
-<p>Examples of good use cases for notification groups include: a messaging app
-displaying a list of incoming messages, or an email app displaying a list of
-received emails.</p>
-
-<p>
-Examples of cases where a single notification is preferable
- include individual messages from a single person, or a list representation of
- single-line text items. You can use
-({@link android.app.Notification.InboxStyle InboxStyle} or
-{@link android.app.Notification.BigTextStyle BigTextStyle}) to accomplish
-this.
-</p>
-
-<h3 id ="post">Displaying bundled notifications</h3>
-
-<p>
- The app should always post a group summary, even if the group contains just a
- single child. The system will suppress the summary and directly display the
- child notification if it only contains a single notification. This ensures
- that the system can provide a consistent experience when the user swipes away
- children of a group.
-</p>
-
-<p class="note">
- <strong>Note:</strong> This version of Android N does not yet
- suppress the summary for notification groups containing a single child. This
- functionality will be added in a later version of Android N.
-</p>
-
-<h3>Peeking notifications</h3>
-
-<p>While the system usually displays child notifications as a group, you can set
- them to temporarily appear as
- <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html#Heads-up">
- heads-up notifications</a>. This feature is especially useful because it allows
- immediate access to the most recent child and the actions associated with it.
-</p>
-
-
-<h3>Backwards compatibility</h3>
-
-<p>
- Both notification groups and remote input have been a part of the {@link
- android.app.Notification} API since Android 5.0 (API level 21) to support
- Android Wear devices. If you've already built notifications with these APIs,
- the only action you must take is to verify that the app behavior corresponds
- to the guidelines described above, and to consider implementing {@code
- setRemoteInputHistory()}.
-</p>
-
-<p>
- In order to support backward compatibility, the same APIs are available with
- the support library's {@link android.support.v4.app.NotificationCompat}
- class, allowing you to build notifications that works on earlier Android
- versions. On handhelds and tablets, users only see the summary notification,
- so an app should still have an inbox style or an equivalent notification
- representative for the whole information content of the group. As Android
- Wear devices allow users to see all child notifications even on older
- platform levels, you should build child notifications regardless of API
- level.
-</p>
-
-<h2 id="custom"> Custom Views</h2>
-<p>Starting from Android N, you can customize notification views and
-still obtain system decorations like notification headers, actions, and
-expandable layouts.</p>
-
-<p>To enable this capability, Android N adds the following APIs to style your
- custom view:</p>
-
-<dl>
-<dt>
-{@code DecoratedCustomViewStyle()}</dt>
-<dd> Styles notifications other than media
-notifications.</dd>
-<dt>
-{@code DecoratedMediaCustomViewStyle()}</dt>
-<dd> Styles media notifications.</dd>
-</dl>
-
-<p>To use this new API, call the {@code setStyle()} method, passing to it
-the desired custom view style.</p>
-
-<p>This snippet shows how to construct a custom notification object with the
-{@code DecoratedCustomViewStyle()} method.</p>
-
-<pre>
-Notification notification = new Notification.Builder()
- .setSmallIcon(R.drawable.ic_stat_player)
- .setLargeIcon(albumArtBitmap))
- .setCustomContentView(contentView);
- .setStyle(new Notification.DecoratedCustomViewStyle())
- .build();
-
-</pre>
-
-<h2 id="style">Messaging Style</h2>
-<p>
- Android N introduces a new API for customizing the style of a notification.
- Using the <code>MessagingStyle</code> class, you can change several of the
- labels displayed on the notification, including the conversation title,
- additional messages, and the content view for the notification.
-</p>
-
-<p>
- The following code snippet demonstrates how to customize a notification's
- style using the <code>MessagingStyle</code> class.
-</p>
-
-<pre>
- Notification notification = new Notification.Builder()
- .setStyle(new Notification.MessagingStyle("Me")
- .setConversationTitle("Team lunch")
- .addMessage("Hi", timestamp1, null) // Pass in null for user.
- .addMessage("What's up?", timestamp2, "Coworker")
- .addMessage("Not much", timestamp3, null)
- .addMessage("How about lunch?", timestamp4, "Coworker"));
-</pre>
diff --git a/docs/html/preview/features/picture-in-picture.jd b/docs/html/preview/features/picture-in-picture.jd
deleted file mode 100644
index c089feb..0000000
--- a/docs/html/preview/features/picture-in-picture.jd
+++ /dev/null
@@ -1,231 +0,0 @@
-page.title=Picture-in-picture
-page.keywords=preview,sdk,PIP,Picture-in-picture
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>In this document</h2>
-<ol>
- <li><a href="#declaring">Declaring Your Activity Supports
-Picture-in-picture</a></li>
- <li><a href="#pip_button">Switching Your Activity to Picture-in-picture</a>
-</li>
- <li><a href="#handling_ui">Handling UI During Picture-in-picture</a>
-</li>
- <li><a href="#continuing_playback">Continuing Video Playback While in
-Picture-in-picture</a></li>
- <li><a href="#single_playback">Using a Single Playback Activity for
-Picture-in-picture</a></li>
- <li><a href="#best">Best Practices</a></li>
-</ol>
-
-<h2>See Also</h2>
-<ol>
- <li><a href="{@docRoot}preview/features/multi-window.html">Multi-Window
-Support</a></li>
-</ol>
-
-</div>
-</div>
-
-<p>In Android N, Android TV users can now watch a video
-in a pinned window in a corner of the screen when navigating within
-apps. Picture-in-picture (PIP) mode lets apps run a video
-activity in the pinned window while another activity continues in the
-background. The PIP window lets users multitask while using your app, which
-helps users be more productive.</p>
-
-<p>Your app can decide when to trigger PIP mode. Here are some examples of
-when to enter PIP mode:</p>
-
-<ul>
-<li>Your app can move a video into PIP mode when the user navigates
-back from the video to browse other content.</li>
-<li>Your app can switch a video into PIP mode while a user watches the end
-of an episode of content. The main screen displays promotional or summary
-information about the next episode in the series.</li>
-<li>Your app can provide a way for users to queue up additional content while
-they watch a video. The video continues playing in PIP mode while the main
-screen displays a content selection activity.</li>
-</ul>
-
-<p>The PIP window is 240x135 dp and is shown at the top-most layer in one of
-the four corners of the screen, chosen by the system. The user can bring up a
-PIP menu that lets them toggle the PIP window to full-screen, or close the PIP
-window, by holding down the <b>Home</b> button on the remote. If another
-video starts playing on the main screen, the PIP window is automatically
-closed. Users can also close the PIP window through Recents.</p>
-
-<img src="{@docRoot}preview/images/pip-active.png" />
-<p class="img-caption"><strong>Figure 1.</strong> A Picture-in-picture
-video visible in a corner of the screen while the user browses content
-on the main screen.</p>
-
-<p>PIP leverages the multi-window APIs available in Android N to
-provide the pinned video overlay window. To add PIP to your app, you need to
-register your activities that support PIP, switch your activity to PIP mode as
-needed, and make sure UI elements are hidden and video playback continues when
-the activity is in PIP mode.</p>
-
-<h2 id="declaring">Declaring Your Activity Supports Picture-in-picture</h2>
-
-<p>By default, the system does not automatically support PIP for apps.
-If you want support PIP in your app, register your video
-activity in your manifest by setting
-<code>android:supportsPictureInPicture</code> and
-<code>android:resizeableActivity</code> to <code>true</code>. Also, specify
-that your activity handles layout configuration changes so that your activity
-doesn't relaunch when layout changes occur during PIP mode transitions.</p>
-
-<pre>
-<activity android:name="VideoActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges=
- "screenSize|smallestScreenSize|screenLayout|orientation"
- ...
-</pre>
-
-<p>When registering your activity, keep in mind that in PIP mode, your
-activity is shown in a small overlay window on a TV screen. Video playback
-activities with minimal UI provide the best user experience. Activities that
-contain small UI elements might not provide a good user experience
-when switched to PIP mode, because users can't see details of the UI elements
-in the PIP window.</p>
-
-<h2 id="pip_button">Switching Your Activity to Picture-in-picture</h2>
-
-When you need to switch your activity into PIP mode, call
-<code>Activity.enterPictureInPictureMode()</code>. The following example
-switches to PIP mode when the user selects a dedicated PIP button on a media
-control bar:</p>
-
-<pre>
-@Override
-public void onActionClicked(Action action) {
- if (action.getId() == R.id.lb_control_picture_in_picture) {
- getActivity().enterPictureInPictureMode();
- return;
- }
- ...
-</pre>
-
-<p>Adding a PIP button to your media control bar lets your user easily switch
-to PIP mode while controlling video playback.</p>
-
-<img src="{@docRoot}preview/images/pip-button.png" />
-<p class="img-caption"><strong>Figure 1.</strong> A Picture-in-picture
-button on a media control bar.</p>
-
-<p>Android N includes a new
-<code>PlaybackControlsRow.PictureInPictureAction</code> class which defines
-control bar PIP actions and uses the PIP icon.</p>
-
-<h2 id="handling_ui">Handling UI During Picture-in-picture</h2>
-
-<p>When your activity enters PIP mode, your activity should only show video
-playback. Remove UI elements before your activity enters PIP,
-and restore these elements when your activity becomes full-screen again.
-Override <code>Activity.onPictureInPictureModeChanged()</code> or
-<code>Fragment.onPictureInPictureModeChanged()</code> and enable or
-disable your UI elements as needed, for example:</p>
-
-<pre>
-@Override
-public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
- if (isInPictureInPictureMode) {
- // Hide the controls in picture-in-picture mode.
- ...
- } else {
- // Restore the playback UI based on the playback status.
- ...
- }
-}
-</pre>
-
-<h2 id="continuing_playback">Continuing Video Playback While in
-Picture-in-picture</h2>
-
-<p>When your activity switches to PIP, the system considers the activity in a
-paused state, and calls your activity's {@link android.app.Activity#onPause
-onPause()} method. Video playback should not be paused and should continue
-playing if the activity is paused due to PIP mode.</p>
-
-<p>In Android N, you should pause and resume video playback when the system
-calls your activity's {@link android.app.Activity#onStop onStop()} and
-{@link android.app.Activity#onStart onStart()}. By doing this, you can avoid
-having to check if your app is in PIP mode in
-{@link android.app.Activity#onPause onPause()} and explicitly
-continuing playback.</p>
-
-<p>If you have to pause playback in your {@link android.app.Activity#onPause
-onPause()} implementation, check for PIP mode by calling {@code
-isInPictureInPictureMode()} and handle playback appropriately, for example:</p>
-
-<pre>
-@Override
-public void onPause() {
- // If called while in PIP mode, do not pause playback
- if (isInPictureInPictureMode()) {
- // Continue playback
- ...
- }
- // If paused but not in PIP, pause playback if necessary
- ...
-}
-</pre>
-
-<p>When your activity switches out of PIP mode back to full-screen mode, the
-system resumes your activity and calls your
-{@link android.app.Activity#onResume onResume()} method.</p>
-
-<h2 id="single_playback">Using a Single Playback Activity for
-Picture-in-picture</h2>
-
-<p>In your app, a user might select a new video when browsing for content on
-the main screen, while a video playback activity is in PIP mode. Play the new
-video in the existing playback activity in full screen mode, instead of
-launching a new activity that might confuse the user.</p>
-
-<p>To ensure a single activity is used for video playback requests and
-switched into or out of PIP mode as needed, set the activity's
-<code>android:launchMode</code> to <code>singleTask</code> in your manifest:
-</p>
-
-<pre>
-<activity android:name="VideoActivity"
- ...
- android:supportsPictureInPicture="true"
- android:launchMode="singleTask"
- ...
-</pre>
-
-<p>In your activity, override {@link android.app.Activity#onNewIntent
-Activity.onNewIntent()} and handle the new video, stopping any existing video
-playback if needed.</p>
-
-<h2 id="best">Best Practices</h2>
-
-<p>PIP is intended for activities that play full-screen video. When switching
-your activity into PIP mode, avoid showing anything except video content.
-Track when your activity enters PIP mode and hide UI elements, as described
-in <a href="#handling_ui">Handling UI During Picture-in-picture</a>.</p>
-
-<p>Since the PIP window is shown as a floating window in the corner of the
-screen, you should avoid showing critical information in the main screen
-in any area that can be obscured by the PIP window.</p>
-
-<p>When an activity is in PIP mode, by default it doesn't get input focus. To
-receive input events while in PIP mode, use
-<code>MediaSession.setMediaButtonReceiver()</code>.</p>
-
-<p>When your app is in PIP mode, video playback in the PIP window can cause
-audio interference with another app, such as a music player app or voice search
-app. To avoid this, request audio focus when you start playing the video,
-and handle audio focus change notifications, as described in
-<a href="{@docRoot}training/managing-audio/audio-focus.html">Managing Audio
-Focus</a>. If you receive notification of audio focus loss when in PIP mode,
-pause or stop video playback.</p>
\ No newline at end of file
diff --git a/docs/html/preview/features/scoped-folder-access.jd b/docs/html/preview/features/scoped-folder-access.jd
deleted file mode 100644
index 06dd665..0000000
--- a/docs/html/preview/features/scoped-folder-access.jd
+++ /dev/null
@@ -1,150 +0,0 @@
-page.title=Scoped Directory Access
-page.keywords=preview,sdk,scoped directory access
-page.tags=androidn
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#accessing">Accessing an External Storage Directory</a></li>
- <li><a href="#removable">Accessing a Directory on Removable Media</a></li>
- <li><a href="#best">Best Practices</a></li>
- </ol>
-</div>
-</div>
-
-<p>Apps such as photo apps usually just need access to specific directories in
-external storage, such as the <code>Pictures</code> directory. Existing
-approaches to accessing external storage aren't designed to easily provide
-targeted directory access for these types of apps. For example:</p>
-
-<ul>
-<li>Requesting {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
-or {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} in your manifest
-allows access to all public directories on external storage, which might be
-more access than what your app needs.</li>
-<li>Using the
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
-Access Framework</a> usually makes your user pick directories
-via a system UI, which is unnecessary if your app always accesses the same
-external directory.</li>
-</ul>
-
-<p>Android N provides a new simplified API to access
-common external storage directories. </p>
-
-<h2 id="accessing">Accessing an External Storage Directory</h2>
-
-<p>Use the <code>StorageManager</code> class to get the appropriate
-<code>StorageVolume</code> instance. Then, create an intent by calling the
-<code>StorageVolume.createAccessIntent()</code> method of that instance.
-Use this intent to access external storage directories. To get a list of
-all available volumes, including removable media volumes, use
-<code>StorageManager.getVolumesList()</code>.</p>
-
-<p>If you have information about a specific file, use
-<code>StorageManager.getStorageVolume(File)</code> to get the
-<code>StorageVolume</code> that contains the file. Call
-<code>createAccessIntent()</code> on this <code>StorageVolume</code> to access
-the external storage directory for the file.</p>
-
-<p>
-On secondary volumes, such as external SD cards, pass in null when calling
-<code>StorageVolume.createAccessIntent()</code> to request access to the entire
-volume, instead of a specific directory.
-<code>StorageVolume.createAccessIntent()</code> returns null if you pass in
-null to the primary volume, or if you pass in an invalid directory name.
-</p>
-
-<p>The following code snippet is an example of how to open the
-<code>Pictures</code> directory in the primary shared storage:</p>
-
-<pre>
-StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
-StorageVolume volume = sm.getPrimaryVolume();
-Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<p>The system attempts to grant access to the external directory, and if
-necessary confirms access with the user using a simplified UI:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-framed.png"
-srcset="{@docRoot}preview/images/scoped-folder-access-framed.png 1x,
-{@docRoot}preview/images/scoped-folder-access-framed_2x.png 2x" />
-<p class="img-caption"><strong>Figure 1.</strong> An application requesting
-access to the Pictures directory.</p>
-
-<p>If the user grants access, the system calls your
-<code>onActivityResult()</code> override with a result code of
-<code>Activity.RESULT_OK</code>, and intent data that contains the URI. Use
-the provided URI to access directory information, similar to using URIs
-returned by the
-<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
-Access Framework</a>.</p>
-
-<p>If the user doesn't grant access, the system calls your
-<code>onActivityResult()</code> override with a result code of
-<code>Activity.RESULT_CANCELED</code>, and null intent data.</p>
-
-<p class="note"><b>Note</b>: Getting access to a specific external directory
-also gains access to subdirectories within that directory.</p>
-
-<h2 id="removable">Accessing a Directory on Removable Media</h2>
-
-<p>To use Scoped Directory Access to access directories on removable media,
-first add a {@link android.content.BroadcastReceiver} that listens for the
-{@link android.os.Environment#MEDIA_MOUNTED} notification, for example:</p>
-
-<pre>
-<receiver
- android:name=".MediaMountedReceiver"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
- <data android:scheme="file" />
- </intent-filter>
-</receiver>
-</pre>
-
-<p>When the user mounts removable media, like an SD card, the system sends a
-{@link android.os.Environment#MEDIA_MOUNTED} notification. This notification
-provides a <code>StorageVolume</code> object in the intent data that you can
-use to access directories on the removable media. The following example
-accesses the <code>Pictures</code> directory on removable media:</p>
-
-<pre>
-// BroadcastReceiver has already cached the MEDIA_MOUNTED
-// notification Intent in mediaMountedIntent
-StorageVolume volume = (StorageVolume)
- mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
-volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
-startActivityForResult(intent, request_code);
-</pre>
-
-<h2 id="best">Best Practices</h2>
-
-<p>Where possible, persist the external directory access URI so you don't have
-to repeatedly ask the user for access. Once the user has granted access, call
-<code>getContentResolver().takePersistableUriPermssion()</code> with the
-directory access URI. The system will persist the URI and subsequent access
-requests will return <code>RESULT_OK</code> and not show confirmation UI to the
-user.</p>
-
-<p>If the user denies access to an external directory, do not immediately
-request access again. Repeatedly insisting on access results in a poor user
-experience. If a request is denied by the user, and the app requests access
-again, the UI displays a <b>Don't ask again</b> checkbox:</p>
-
-<img src="{@docRoot}preview/images/scoped-folder-access-dont-ask.png"
-srcset="{@docRoot}preview/images/scoped-folder-access-dont-ask.png 1x,
-{@docRoot}preview/images/scoped-folder-access-dont-ask_2x.png 2x" />
-<p class="img-caption"><strong>Figure 1.</strong> An application making a
-second request for access to removable media.</p>
-
-<p>If the user selects <b>Don't ask again</b> and denies the request, all
-future requests for the given directory from your app will be automatically
-denied, and no request UI will be presented to the user.</p>
\ No newline at end of file
diff --git a/docs/html/preview/features/security-config.jd b/docs/html/preview/features/security-config.jd
deleted file mode 100644
index 2706ced..0000000
--- a/docs/html/preview/features/security-config.jd
+++ /dev/null
@@ -1,750 +0,0 @@
-page.title=Network Security Configuration
-page.keywords=androidn,security,network
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>In this document</h2>
-<ol>
- <li><a href="#manifest">Adding a Security Configuration File</a></li>
- <li><a href="#CustomTrust">Customizing Trusted CAs</a>
- <ol>
- <li><a href="#ConfigCustom">Configuring a Trusted Custom CA</a></li>
- <li><a href="#LimitingCas">Limiting the Set of Trusted CAs</a></li>
- <li><a href="#TrustingAdditionalCas">Trusting Additional CAs</a></li>
- </ol>
- </li>
- <li><a href="#TrustingDebugCa">Debugging-only CAs</a></li>
- <li><a href="#CleartextTrafficPermitted">Opting Out of Cleartext Traffic</a></li>
- <li><a href="#CertificatePinning">Pinning Certificates</a></li>
- <li><a href="#ConfigInheritance">Configuration Inheritance Behavior</a></li>
- <li><a href="#FileFormat">Configuration File Format</a></li>
-</ol>
-</div>
-</div>
-
-
-<p>
- Android N includes a Network Security Configuration
- feature that lets apps customize their network security settings in a safe,
- declarative configuration file without modifying app code. These settings can
- be configured for specific domains and for a specific app. The key
- capabilities of this feature are as follows:
-</p>
-
-<ul>
- <li>
- <b>Custom trust anchors:</b> Customize which Certificate Authorities (CA)
- are trusted for an app's secure connections. For
- example, trusting particular self-signed certificates or restricting the
- set of public CAs that the app trusts.
- </li>
-
- <li>
- <b>Debug-only overrides:</b> Safely debug secure connections in an app
- without added risk to the installed base.
- </li>
-
- <li>
- <b>Cleartext traffic opt-out:</b> Protect apps from from
- accidental usage of cleartext traffic.
- </li>
-
- <li>
- <b>Certificate pinning:</b> Restrict an app's secure connection to
- particular certificates.
- </li>
-</ul>
-
-
-<h2 id="manifest">Adding a Security Configuration File</h2>
-
-<p>
- The Network Security Configuration feature uses an XML file where you specify
- the settings for your app. You must include an entry in the manifest of your
- app to point to this file. The following code excerpt from a manifest
- demonstrates how to create this entry:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application android:networkSecurityConfig="@xml/network_security_config"
- ... >
- ...
- </application>
-</manifest>
-</pre>
-
-<h2 id="CustomTrust">Customizing Trusted CAs</h2>
-
-<p>
- An app may want to trust a custom set of CAs instead of the platform
- default. The most common reasons of this are:
-</p>
-
-<ul>
- <li>Connecting to a host with a custom certificate authority(self-signed,
- issued by an internal corporate CA, etc).
- </li>
-
- <li>Limiting the set of CAs to only the CAs you trust instead of every
- preinstalled CA.
- </li>
-
- <li>Trusting additional CAs not included in the system.
- </li>
-</ul>
-
-<p>
- By default secure (e.g. TLS, HTTPS) connections from all apps trust
- the pre-installed system CAs, and apps targeting API level 23
- (Android M) and below also trust the user-added CA store by default. An
- app can customize its own connections using {@code base-config} (for
- app-wide customization) or {@code domain-config} (for per-domain
- customization).
-</p>
-
-
-<h3 id="ConfigCustom">Configuring a Custom CA</h3>
-
-<p>
- Assume you want to connect to your host which uses a self-signed SSL
- certificate or to a host whose SSL certificate is issued by a non-public CA
- which you trust, such as your company's internal CA.
-</p>
-
-<p>
- <code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Add the self-signed or non-public CA certificate, in PEM or DER format, to
- {@code res/raw/my_ca}.
-</p>
-
-
-<h3 id="LimitingCas">Limiting the Set of Trusted CAs</h3>
-
-<p>
- An app that does not want to trust all CAs trusted by system can
- instead specify its own reduced set of CAs to trust. This protects the
- app from fradulent certificates issued by any of the other CAs.
-</p>
-
-<p>
- The config to limit the set of trusted CAs is similar to <a href=
- "#TrustingACustomCa">trusting a custom CA</a> for a specific domain except
- that multiple CAs are provided in the resource.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">secure.example.com</domain>
- <domain includeSubdomains="true">cdn.example.com</domain>
- <trust-anchors>
- <certificates src="@raw/trusted_roots"/>
- </trust-anchors>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-<p>
- Add the trusted CAs, in PEM or DER format, to {@code res/raw/trusted_roots}.
- Note that if using PEM format the file must contain <em>only</em> PEM data
- and no extra text. You can also provide multiple
- <a href="#certificates"><code><certificates></code></a>
-elements instead of one.
-</p>
-
-
-<h3 id="TrustingAdditionalCas">
- Trusting Additional CAs
-</h3>
-
-<p>
- An app may want to trust additional CAs not trusted by the system,
- this could be due to the system not yet including the CA or a CA that does
- not meet the requirements for inclusion into the Android system. An
- app can do this by specifying multiple certificate sources for a
- configuration.
-</p>
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="@raw/extracas"/>
- <certificates src="system"/>
- </trust-anchors>
- </base-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="TrustingDebugCa">Configuring CAs for Debugging</h2>
-
-<p>
- When debugging an app that connects over HTTPS you may want to
- connect to a local development server, which does not have the SSL
- certificate for your production server. In order to support this without any
- modification to your app's code you can specify debug-only CAs that
- are <i>only</i> trusted when <a href=
- "{@docRoot}guide/topics/manifest/application-element.html#debug">
-android:debuggable</a>
- is {@code true} by using {@code debug-overrides}. Normally IDEs and build
- tools set this flag automatically for non-release builds.
-</p>
-
-<p>
- This is safer than the usual conditional code because, as a security
- precaution, app stores do not accept apps which are marked
- debuggable.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <debug-overrides>
- <trust-anchors>
- <certificates src="@raw/debug_cas"/>
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CleartextTrafficPermitted">Opting Out of Cleartext Traffic</h2>
-
-<p>
- Applications intending to connect to destinations using only secure
- connections can opt-out of supporting cleartext (using unencrypted HTTP
- protocol instead of HTTPS) to those destinations. This option helps prevent
- accidental regressions in apps due to changes in URLs provided by external
- sources such as backend servers.
- See {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
- NetworkSecurityPolicy.isCleartextTrafficPermitted()} for more details.
-</p>
-
-<p>
- For example, an app may want to ensure that all connections to {@code
- secure.example.com} are always done over HTTPS to protect sensitive traffic
- from hostile networks.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="CertificatePinning">Pinning Certificates</h2>
-
-<p>
- Normally an app trusts all preinstalled CAs. If any of these CAs were
- to issue a fradulent certificate the app would be at risk from a MiTM
- attack. Some apps choose to limit the set of certificates they accept
- by either limiting the set of CAs they trust or by certificate pinning.
-</p>
-
-<p>
- Certificate pinning is done by providing a set of certificates by hash of the
- public key (SubjectPublicKeyInfo of the X.509 certificate). A certificate
- chain is then only valid if the certificate chain contains at least one of
- the pinned public keys.
-</p>
-
-<p>
- Note that when using certificate pinning you should always include a backup
- key so that if you are forced to switch to new keys, or change CAs (when
- pinning to a CA certificate or an intermediate of that CA), your
- app's connectivity is unaffected. Otherwise you must to push out
- an update to the app to restore connectivity.
-</p>
-
-<p>
- Additionally it is possible to set an expiration time for pins after which
- pinning is not performed. This helps prevent connectivity issues in
- apps which have not been updated. However, setting an expiration time
- on pins may enable pinning bypass.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <pin-set expiration="2018-01-01">
- <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
- <!-- backup pin -->
- <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
- </pin-set>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="ConfigInheritance">Configuration Inheritance Behavior</h2>
-
-<p>
- Values not set in a specific config are inherited. This behavior allows more
- complex configurations while keeping the configuration file readable.
-</p>
-
-<p>
- If a value is not set in a specific entry then value from the next more
- general entry is used. Values not set in a {@code domain-config} is
- taken from the parent {@code domain-config}, if nested, or from the {@code
- base-config} if not. Values not set in the {@code base-config} uses the
- platform default values.
-</p>
-
-<p>
- For example consider, where all connections to subdomains of {@code
- example.com} must use a custom set of CAs. Additonally cleartext traffic to
- these domains is permitted <em>except</em> when connecting to {@code
- secure.example.com}. By nesting the configuration for {@code
- secure.example.com} inside the configuration for {@code example.com} the
- {@code trust-anchors} does not need to be duplicated.
-</p>
-
-<p>
-<code>res/xml/network_security_config.xml</code>:
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <domain-config>
- <domain includeSubdomains="true">example.com</domain>
- <trust-anchors>
- <certificates src="@raw/my_ca"/>
- </trust-anchors>
- <domain-config cleartextTrafficPermitted="false">
- <domain includeSubdomains="true">secure.example.com</domain>
- </domain-config>
- </domain-config>
-</network-security-config>
-</pre>
-</p>
-
-
-<h2 id="FileFormat">Configuration File Format</h2>
-
-<p>
- The Network Security Configuration feature uses an XML file format.
- The overall structure of the file is shown in the following code sample:
-</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
- <base-config>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </base-config>
-
- <domain-config>
- <domain>android.com</domain>
- ...
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- <pin-set>
- <pin digest="...">...</pin>
- ...
- </pin-set>
- </domain-config>
- ...
- <debug-overrides>
- <trust-anchors>
- <certificates src="..."/>
- ...
- </trust-anchors>
- </debug-overrides>
-</network-security-config>
-</pre>
-
-<p>
- The following sections describe the syntax and other details of the file
- format.
-</p>
-
-<h3 id="network-security-config">
- <network-security-config>
-</h3>
-
-<dl class="xml">
- <dt>
- can contain:
- </dt>
-
- <dd>
- 0 or 1 of <code><a href="#base-config"><base-config></a></code><br>
- Any number of <code><a href=
- "#domain-config"><domain-config></a></code><br>
- 0 or 1 of <code><a href="#debug-overrides"><debug-overrides></a></code>
- </dd>
-</dl>
-
-<h3 id="base-config">
- <base-config>
-</h3>
-
-<dl class="xml">
- <dt>
- syntax:
- </dt>
-</dl>
-
-<pre class="stx">
-<base-config <a href=
-"#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" | "false"]>
- ...
-</base-config>
-</pre>
-<dl class="xml">
- <dt>
- can contain:
- </dt>
-
- <dd>
- <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- description:
- </dt>
-
- <dd>
- The default configuration used by all connections whose destination is not
- covered by a <a href="#domain-config"><code>domain-config</code></a>.
-
-<p>
- Any values that are not set use the platform default values. The default
- configuration for apps targeting above API level 24 and above:
-</p>
-
-<pre>
-<base-config cleartextTrafficPermitted="true">
- <trust-anchors>
- <certificates src="system" />
- </trust-anchors>
-</base-config>
-</pre>
-The default configuration for apps targeting API level 23 and below is:
-<pre>
-<base-config cleartextTrafficPermitted="true">
- <trust-anchors>
- <certificates src="system" />
- <certificates src="user" />
- </trust-anchors>
-</base-config>
-</pre>
-
- </dd>
-</dl>
-
-<h3 id="domain-config"><domain-config></h3>
-<dl class="xml">
-<dt>syntax:</dt>
-<dd>
-<pre class="stx"><domain-config <a href="#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" | "false"]>
- ...
-</domain-config></pre>
-</dd>
-
-<dt>Can Contain:</dt>
-
-<dd>
-1 or more <code><a href="#domain"><domain></a></code>
-<br/>0 or 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
-<br/>0 or 1 <code><a href="#pin-set"><pin-set></code></a>
-<br/>Any number of nested <code><domain-config></code></dd>
-
-<dt>Description</dt>
-<dd>Configuration used for connections to specific destinations as the defined by {@code domain} elements.
-
-<p>Note that if multiple {@code domain-config} elements cover a destination the config with the most specific (longest)
-matching domain rule is used.</p></dd>
-</dl>
-
-
-<h3 id="domain"><domain></h3>
-
-<dl class="xml">
- <dt>
- syntax:
- </dt>
-
- <dd>
- <pre class="stx">
-<domain includeSubdomains=["true" | "false"]>example.com</domain>
-</pre>
- </dd>
-
- <dt>
- Attributes:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code includeSubdomains}
- </dt>
-
- <dd>
- If {@code "true"} then this domain rule matches the domain and all
- subdomains, including subdomains of subdomains, otherwise the rule only
- applies to exact matches.
- </dd>
- </dl>
- </dd>
-
- <dt>
- Description:
- </dt>
-</dl>
-
-<h3 id="debug-overrides"><debug-overrides></h3>
-
-<dl class="xml">
- <dt>
- syntax:
- </dt>
-
- <dd>
- <pre class="stx">
-<debug-overrides>
- ...
-</debug-overrides>
-</pre>
- </dd>
-
- <dt>
- Can Contain:
- </dt>
-
- <dd>
- 0 or 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
- </dd>
-
- <dt>
- Description:
- </dt>
-
- <dd>
- Overrides to be applied when <a href=
- "{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- is {@code "true"} which is normally the case for non-release builds
- generated by IDEs and build tools. Trust anchors specified in {@code
- debug-overrides} are added to all other configurations and certificate
- pinning is not performed when the server's certificate chain uses one of
- these debug-only trust anchors. If <a href=
- "{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
- is {@code "false"} then this section is completely ignored.
- </dd>
-</dl>
-
-<h3 id="trust-anchors"><trust-anchors></h3>
-<dl class="xml">
- <dt>
- syntax:
- </dt>
-
- <dd>
- <pre class="stx">
-<trust-anchors>
-...
-</trust-anchors>
-</pre>
- </dd>
-
- <dt>
- Can Contain:
- </dt>
-
- <dd>
- Any number of <code><a href="#certificates"><certificates></a></code>
- </dd>
-
- <dt>
- Description:
- </dt>
-
- <dd>
- Set of trust anchors for secure connections.
- </dd>
-</dl>
-
-
-<h3 id="certificates"><certificates></h3>
-<dl class="xml">
-<dt>syntax:</dt>
-<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
- overridePins=["true" | "false"] />
-</pre></dd>
-<dt>description:</dt>
-<dd>Set of X.509 certificates for {@code trust-anchors} elements.</dd>
-
-<dt>attributes:</dt>
-<dd><dl class="attr">
-<dt>{@code src}</dt>
-<dd>
-The source of CA certificates, can be one of
-<ul>
- <li>a raw resource id pointing to a file containing X.509 certificates.
- Certificates must be encoded in DER or PEM format. In the case of PEM
- certificates the file <em>must not</em> contain extra non-PEM data such as
- comments.
- </li>
-
- <li>{@code "system"} for the pre-installed system CA certificates
- </li>
-
- <li>{@code "user"} for user-added CA certificates
- </li>
-</ul>
-</dd>
-
-<dt>{@code overridePins}</dt>
-<dd>
- <p>
- Specifies if the CAs from this source bypass certificate pinning. If {@code
- "true"} then certificate chains which chain through one of the CAs from this
- source then pinning is not be performed. This can be useful for debug CAs
- or to support letting the user MiTM your app's secure traffic.
- </p>
-
- <p>
- Default is {@code "false"} unless specified in a {@code debug-overrides}
- element, in which case the default is {@code "true"}.
- </p>
-</dd>
-</dl>
-</dd>
-
-
-<h3 id="pin-set"><pin-set></h3>
-
-<dl class="xml">
- <dt>
- syntax:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin-set expiration="date">
-...
-</pin-set>
-</pre>
- </dd>
-
- <dt>
- Can Contain:
- </dt>
-
- <dd>
- Any number of <code><a href="#pin"><pin></a></code>
- </dd>
-
- <dt>
- Description:
- </dt>
-
- <dd>
- A set of public key pins. For a secure connection to be trusted, one of the
- public keys in the chain of trust must be in the set of pins. See
- <code><a href="#pin"><pin></a></code> for the format of pins.
- </dd>
-
- <dt>
- Attributes:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code expiration}
- </dt>
-
- <dd>
- The date, in {@code yyyy-MM-dd} format, at and after which the pins
- expire, thus disabling pinning. If the attribute is not set then the
- pins do not expire.
- <p>
- Expiration helps prevent connectivity issues in apps which do
- not get updates to their pin set, for example because the user
- disabled app updates.
- </p>
- </dd>
- </dl>
- </dd>
-</dl>
-
-<h3 id="pin"><pin></h3>
-<dl class="xml">
- <dt>
- syntax:
- </dt>
-
- <dd>
-<pre class="stx">
-<pin digest=["SHA-256"]>base64 encoded digest of X.509
- SubjectPublicKeyInfo (SPKI)</pin>
-</pre>
- </dd>
-
- <dt>
- Attributes:
- </dt>
-
- <dd>
- <dl class="attr">
- <dt>
- {@code digest}
- </dt>
-
- <dd>
- The digest algorithm used to generate the pin. Currently only
- {@code "SHA-256"} is supported.
- </dd>
- </dl>
- </dd>
-</dl>
diff --git a/docs/html/preview/features/tv-recording-api.jd b/docs/html/preview/features/tv-recording-api.jd
deleted file mode 100644
index 6619821..0000000
--- a/docs/html/preview/features/tv-recording-api.jd
+++ /dev/null
@@ -1,142 +0,0 @@
-page.title=TV Recording
-page.keywords=preview,sdk,tv,recording
-page.tags=androidn
-page.image=images/cards/card-nyc_2x.jpg
-
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#supporting">Indicating Support for Recording</a></li>
- <li><a href="#recording">Recording a Session</a></li>
- <li><a href="#errors">Handling Recording Errors</a></li>
- <li><a href="#sessions">Managing Recorded Sessions</a></li>
- <li><a href="#best">Best Practices</a></li>
- </ol>
-</div>
-</div>
-
-<p>TV input services let the user pause and resume channel playback via
-time-shifting APIs. Android N expands on time-shifting
-by letting the user save multiple recorded sessions.</p>
-
-<p>Users can schedule recordings in advance, or start a recording as they watch
-a program. Once the system has saved a recording, the user can browse, manage,
-and play back the recording using the system TV app.</p>
-
-<p>If you want to provide recording functionality for your TV input service,
-you must indicate to the system that your app supports recording, implement
-the ability to record programs, handle and communicate any errors that occur
-during recording, and manage your recorded sessions.</p>
-
-<p class="note"><strong>Note:</strong> The Live Channels app does not yet
-provide a way for users to create or access recordings. Until changes are
-made to the Live Channels app, it may be difficult to fully test the recording
-experience for your TV input service.</p>
-
-<h2 id="supporting">Indicating Support for Recording</h2>
-
-<p>To tell the system that your TV input service supports recording, set
-the <code>android:canRecord</code> attribute in your service metadata XML file
-to <code>true</code>:
-</p>
-
-<pre>
-<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
- <b>android:canRecord="true"</b>
- android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
-</pre>
-
-<p>For more information on the service metadata file, see
-<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">Declare Your TV Input
-Service in the Manifest</a>.
-</p>
-
-<p>Alternatively, you can indicate recording support in your code using
-these steps:</p>
-
-<ol>
-<li>In your <code>TvInputService.onCreate()</code> method, create a new
-<code>TvInputInfo</code> object using the <code>TvInputInfo.Builder</code>
-class.</li>
-<li>When creating the new <code>TvInputInfo</code> object, call
-<code>setCanRecord(true)</code> before calling <code>build()</code> to
-indicate your service supports recording.</li>
-<li>Register your <code>TvInputInfo</code> object with the system by calling
-<code>TvInputManager.updateTvInputInfo()</code>.</li>
-</ol>
-
-<h2 id="recording">Recording a Session</h2>
-
-<p>After your TV input service registers that it supports recording
-functionality, the system calls your
-<code>TvInputService.onCreateRecordingSession()</code> when it needs to access
-your app's recording implementation. Implement your own
-<code>TvInputService.RecordingSession</code> subclass and return it
-when the <code>onCreateRecordingSession()</code> callback
-fires. This subclass is responsible for switching to the correct channel data,
-recording the requested data, and communicating recording status and errors to
-the system.</p>
-
-<p>When the system calls <code>RecordingSession.onTune()</code>, passing in a
-channel URI, tune to the channel that the URI specifies. Notify the system that
-your app has tuned to the desired channel by calling <code>notifyTuned()</code>,
-or, if your app could not tune to the proper channel, call
-<code>notifyError()</code>.</p>
-
-<p>The system next invokes the <code>RecordingSession.onStartRecording()</code>
-callback. Your app must start recording immediately. When the system invokes
-this callback, it may provide a URI that contains information about the program
-that is about to be recorded. When the recording is done, you need to copy this
-data to the <code>RecordedPrograms</code> data table.</p>
-
-<p>Finally, the system calls <code>RecordingSession.onStopRecording()</code>.
-At this point, your app must stop recording immediately. You also need to
-create an entry in the <code>RecordedPrograms</code> table. This entry should
-include the recorded session data URI in the
-<code>RecordedPrograms.COLUMN_RECORDING_DATA_URI</code> column, and any program
-information that the system provided in the initial call to
-<code>onStartRecording()</code>.</p>
-
-<p>For more details on how to access the <code>RecordedPrograms</code> table
-see <a href="#sessions">Managing Recorded Sessions</a>.</p>
-
-<h2 id="errors">Handling Recording Errors</h2>
-
-<p>If an error occurs during recording, rendering the recorded data unusable,
-notify the system by calling <code>RecordingSession.notifyError()</code>.
-Similarly, you can call <code>notifyError()</code> after a recording session is
-created to let the system know that your app can no longer record sessions.</p>
-
-<p>If an error occurs during recording, but you'd like to provide a usable
-partial recording to users for playback, call
-<code>RecordingSession.notifyRecordingStopped()</code> to enable the system to
-use the partial session.</p>
-
-<h2 id="sessions">Managing Recorded Sessions</h2>
-
-<p>The system maintains information for all recorded sessions from all
-recording-capable channel apps in the <code>TvContract.RecordedPrograms</code>
-content provider table. This information is accessible via the
-<code>RecordedPrograms.Uri</code> content URI. Use content provider APIs to
-read, add, and delete entries from this table.</p>
-
-<p>For more information on working with content provider data see
-<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
-Content Provider Basics</a> .</p>
-
-<h2 id="best">Best Practices</h2>
-
-<p>TV devices may have limited storage, so use your best judgment when
-allocating storage to save recorded sessions. Use
-<code>RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)</code> when
-there isn't enough space to save a recorded session.</p>
-
-<p>When the user initiates recording, you should start recording data as soon
-as possible. To facilitate this, complete any up-front time-consuming tasks,
-like accessing and allocating storage space, when the system invokes the
-<code>onCreateRecordingSession()</code> callback. Doing so lets you start
-recording immediately when the <code>onStartRecording()</code> callback
-fires.</p>
diff --git a/docs/html/preview/guide.jd b/docs/html/preview/guide.jd
deleted file mode 100644
index 28c0fe9..0000000
--- a/docs/html/preview/guide.jd
+++ /dev/null
@@ -1,190 +0,0 @@
-page.title=Testing Guide
-page.image=images/cards/card-n-guide_2x.png
-meta.tags="preview", "testing"
-page.tags="preview", "developer preview"
-
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#runtime-permissions">Testing Permissions</a></li>
- <li><a href="#doze-standby">Testing Doze and App Standby</a></li>
- <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
- </ol>
- </div>
-</div>
-
-<p>
- Android N gives you an opportunity to ensure your apps work with the next
- version of the platform. This preview includes a number of APIs and behavior changes that can
- impact your app, as described in the <a href="{@docRoot}preview/api-overview.html">API
- Overview</a> and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>. In testing
- your app with the preview, there are some specific system changes that you should focus on to
- ensure that users have a good experience.
-</p>
-
-<p>
- This guide describes the what and how to test preview features with your app. You should
- prioritize testing of these specific preview features, due to their high potential impact on your
- app's behavior:
-</p>
-
-<ul>
- <li><a href="#runtime-permissions">Permissions</a>
- </li>
- <li><a href="#doze-standby">Doze and App Standby</a>
- </li>
- <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
-</ul>
-
-<p>
- For more information about how to set up devices or virtual devices with a preview system image
- for testing, see <a href="{@docRoot}preview/setup-sdk.html">Set up
-the Android N SDK</a>.
-</p>
-
-
-<h2 id="runtime-permissions">Testing Permissions</h2>
-
-<p>
- The new <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> model
- changes the way that permissions are allocated to your app by the user. Instead of granting all
- permissions during the install procedure, your app must ask the user for individual permissions
- at runtime. For users this behavior provides more granular control over each app’s activities, as
- well as better context for understanding why the app is requesting a specific permission. Users
- can grant or revoke the permissions granted to an app individually at any time. This feature of
- the preview is most likely to have an impact on your app's behavior and may prevent some of your
- app features from working, or they may work in a degraded state.
-</p>
-
-<p class="caution">
- This change affects all apps running on the new platform, even those not targeting the new
- platform version. The platform provides a limited compatibility behavior for legacy apps, but you
- should begin planning your app’s migration to the new permissions model now, with a goal of
- publishing an updated version of your app at the official platform launch.
-</p>
-
-
-<h3 id="permission-test-tips">Test tips</h3>
-
-<p>
- Use the following test tips to help you plan and execute testing of your app with the new
- permissions behavior.
-</p>
-
-<ul>
- <li>Identify your app’s current permissions and the related code paths.</li>
- <li>Test user flows across permission-protected services and data.</li>
- <li>Test with various combinations of granted/revoked permission.</li>
- <li>Use the {@code adb} tool to manage permssions from the command line:
- <ul>
- <li>List permissions and status by group:
- <pre>adb shell pm list permissions -d -g</pre>
- </li>
- <li>Grant or revoke one or more permissions using the following syntax:<br>
- <pre>adb shell pm [grant|revoke] <permission.name> ...</pre>
- </li>
- </ul>
- </li>
- <li>Analyze your app for services that use permissions.</li>
-</ul>
-
-<h3 id="permission-test-strategy">Test strategy</h3>
-
-<p>
- The permissions change affects the structure and design of your app, as well as
- the user experience and flows you provide to users. You should assess your app’s current
- permissions use and start planning for the new flows you want to offer. The official release of
- the platform provides compatibility behavior, but you should plan on updating your app and not
- rely on these behaviors.
-</p>
-
-<p>
- Identify the permissions that your app actually needs and uses, and then find the various code
- paths that use the permission-protected services. You can do this through a combination of
- testing on the new platform and code analysis. In testing, you should focus on opting in to
- runtime permissions by changing the app’s {@code targetSdkVersion} to the preview version. For
- more information, see <a href="{@docRoot}preview/setup-sdk.html#">Set up
-the Android N SDK</a>.
-</p>
-
-<p>
- Test with various combinations of permissions revoked and added, to highlight the user flows that
- depend on permissions. Where a dependency is not obvious or logical you should consider
- refactoring or compartmentalizing that flow to eliminate the dependency or make it clear why the
- permission is needed.
-</p>
-
-<p>
- For more information on the behavior of runtime permissions, testing, and best practices, see the
- <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> developer
- preview page.
-</p>
-
-
-<h2 id="doze-standby">Testing Doze and App Standby</h2>
-
-<p>
- The power saving features of Doze and App Standby limit the amount of background processing that
- your app can perform when a device is in an idle state or while your app is not in focus. The
- restrictions the system may impose on apps include limited or no network access,
- suspended background tasks, suspended Notifications, ignored wake requests, and alarms. To ensure
- that your app behaves properly with these power saving optimizations, you should test your app by
- simulating these low power states.
-</p>
-
-<h4 id="doze">Testing your app with Doze</h4>
-
-<p>To test Doze with your app:</p>
-
-<ol>
-<li>Configure a hardware device or virtual device with an Android N system image.</li>
-<li>Connect the device to your development machine and install your app.</li>
-<li>Run your app and leave it active.</li>
-<li>Simulate the device going into Doze mode by running the following commands:
-
-<pre>
-$ adb shell dumpsys battery unplug
-$ adb shell dumpsys deviceidle step
-$ adb shell dumpsys deviceidle -h
-</pre>
-
- </li>
- <li>Observe the behavior of your app when the device is re-activated. Make sure it
- recovers gracefully when the device exits Doze.</li>
-</ol>
-
-
-<h4 id="standby">Testing apps with App Standby</h4>
-
-<p>To test the App Standby mode with your app:</p>
-
-<ol>
- <li>Configure a hardware device or virtual device with an Android N system image.</li>
- <li>Connect the device to your development machine and install your app.</li>
- <li>Run your app and leave it active.</li>
- <li>Simulate the app going into standby mode by running the following commands:
-
-<pre>
-$ adb shell am broadcast -a android.os.action.DISCHARGING
-$ adb shell am set-idle <packageName> true
-</pre>
-
- </li>
- <li>Simulate waking your app using the following command:
- <pre>$ adb shell am set-idle <packageName> false</pre>
- </li>
- <li>Observe the behavior of your app when it is woken. Make sure it recovers gracefully
- from standby mode. In particular, you should check if your app's Notifications and background
- jobs continue to function as expected.</li>
-</ol>
-
-<h2 id="ids">Auto Backup for Apps and Device-Specific Identifiers</h2>
-
-<p>If your app is persisting any device-specific identifiers, such as Google
-Cloud Messaging registration ID, in internal storage,
-make sure to follow best practices to exclude the storage
-location from auto-backup, as described in <a href="{@docRoot}preview/backup/index.html">Auto
-Backup for Apps</a>. </p>
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
deleted file mode 100644
index 9c92fb2..0000000
--- a/docs/html/preview/index.jd
+++ /dev/null
@@ -1,133 +0,0 @@
-page.title=Android N Developer Preview
-page.tags="preview","developer"
-meta.tags="preview", "android"
-fullpage=true
-forcelocalnav=true
-header.hide=1
-footer.hide=1
-@jd:body
-
-<script>
- $(document).ready(function() {
- if (useUpdatedTemplates) {
- $("#useUpdatedTemplates").css("display","block");
- } else {
- $("#useOldTemplates").css("display","block");
- }
- })
-</script>
-
-<section class="dac-expand dac-hero dac-light" style="background-color:#B2DFDB">
- <div class="wrap" style="max-width:1100px;margin-top:0">
- <div class="cols dac-hero-content" style="padding-bottom:1em;">
-
- <div class="col-7of16 col-push-9of16" style="padding-left:2em">
- <h1 class="dac-hero-title">Android N Developer Preview</h1>
- <p class="dac-hero-description">
- <strong>Android N final SDK is now available!</strong>
- Get ready for Android N!
- <strong>Test your apps</strong> on Nexus and other devices. Support new system
- behaviors to <strong>save power and memory</strong>.
- Extend your apps with <strong>multi-window UI</strong>,
- <strong>direct reply notifications</strong> and more.
- </p>
-
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
- <span class="dac-sprite dac-auto-chevron"></span>
- Get started
- </a><!--<br>
- <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
- <span class="dac-sprite dac-auto-chevron"></span>
- Update to Android N (final SDK)
- </a><br>-->
- </div>
- <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:1.5em;padding-right:1.5em;">
- <img class="dac-hero-image" src="{@docRoot}images/home/n-preview-hero.png"
- srcset="{@docRoot}images/home/n-preview-hero.png 1x,
- {@docRoot}images/home/n-preview-hero_2x.png 2x">
- </div>
- </div>
- <div class="dac-section dac-small">
- <div class="resource-widget resource-flow-layout col-16"
- data-query="collection:preview/landing/resources"
- data-cardSizes="6x2"
- data-maxResults="6"></div>
- </div>
- </div>
-</section>
-
-<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
- <div class="wrap dac-offset-parent">
- <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">
- <i class="dac-sprite dac-arrow-down-gray"></i>
- </a>
- <ul class="dac-actions">
- <li class="dac-action">
- <a class="dac-action-link" href="https://developer.android.com/preview/bug">
- <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
- Report an issue
- </a>
- </li>
- <li class="dac-action">
- <a class="dac-action-link" href="{@docRoot}preview/support.html">
- <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
- See release notes
- </a>
- </li>
- <li class="dac-action">
- <a class="dac-action-link" href="{@docRoot}preview/dev-community">
- <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
- Join dev community
- </a>
- </li>
- </ul>
- </div><!-- end .wrap -->
-</div><!-- end .dac-actions -->
-
-<div id="useOldTemplates" style="display:none;color:black" class="actions-bar dac-expand dac-invert">
- <div class="wrap dac-offset-parent">
-
- <div class="actions">
- <div><a href="https://developer.android.com/preview/bug">
- <span class="dac-sprite dac-auto-chevron-large"></span>
- Report an issue
- </a></div>
- <div><a href="{@docRoot}preview/support.html">
- <span class="dac-sprite dac-auto-chevron-large"></span>
- See release notes
- </a></div>
- <div><a href="{@docRoot}preview/dev-community">
- <span class="dac-sprite dac-auto-chevron-large"></span>
- Join dev community
- </a></div>
- </div><!-- end .actions -->
- </div><!-- end .wrap -->
-</div>
-
-<section class="dac-section dac-light dac-small" id="latest"><div class="wrap">
- <h2 class="norule">Latest</h2>
- <div class="resource-widget resource-flow-layout col-16"
- data-query="type:blog+tag:androidn+tag:featured, type:youtube+tag:androidn+tag:featured"
- data-sortOrder="-timestamp"
- data-cardSizes="6x6"
- data-items-per-page="6"
- data-maxResults="15"
- data-initial-results="3"></div>
-</div></section>
-
-<section class="dac-section dac-gray"><div class="wrap">
- <h1 class="dac-section-title">Resources</h1>
- <div class="dac-section-subtitle">
- Essential information to help you get your apps ready for Android N.
- </div>
-
- <div class="resource-widget resource-flow-layout col-16"
- data-query="collection:preview/landing/more"
- data-cardSizes="6x6"
- data-items-per-page="6"
- data-maxResults="15"
- data-initial-results="6"></div>
-
- </div>
-</section>
-
diff --git a/docs/html/preview/j8-jack.jd b/docs/html/preview/j8-jack.jd
deleted file mode 100644
index 4ea016d..0000000
--- a/docs/html/preview/j8-jack.jd
+++ /dev/null
@@ -1,221 +0,0 @@
-page.title=Java 8 Language Features
-page.keywords="android N", "Java 8", "Jack"
-@jd:body
-
-<div id="qv-wrapper">
- <div id="qv">
- <ol>
- <li>
- <a href="#supported-features">Supported Java 8 Language Features and APIs</a>
- </li>
- <li>
- <a href="#configuration">Enabling Java 8 Features and the Jack Toolchain</a>
- </li>
- </ol>
- </div>
-</div>
-
-<p>Android N introduces support for Java 8 language features
- that you can use when developing apps that target Android N.
- This page describes the new language features supported in the Android N
- Preview, how to properly set up your project to use them, and any known
- issues you may encounter.
-</p>
-
-<p>To start using these features, you need to download and set up Android
-Studio 2.1 and the Android N Preview SDK, which includes the required
-Jack toolchain and updated Android Plugin for Gradle. If you haven't yet
-installed the Android N Preview SDK, see <a href=
-"{@docRoot}preview/setup-sdk.html">Set Up to Develop for Android N</a>.</p>
-
-
-
-<p class="note">
- <strong>Note:</strong> Using the new Java 8 language features is not a
- requirement for developing apps that target the Android N platform. If you
- don't want to write code with Java 8 language features, you can keep your
- project's source and target compatibility values set to Java 7, but you still
- must compile with JDK 8 to build against the Android N platform.
-</p>
-
-<h2 id="supported-features">
- Supported Java 8 Language Features and APIs
-</h2>
-
-<p>
- Android does not currently support all Java 8 language features. However, the
- following features are now available when developing apps targeting the
- Android N Preview:
-</p>
-
-<ul>
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">Default
- and static interface methods</a>
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html">
- Lambda expressions</a> (also available on API level 23 and lower)
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/tutorial/java/annotations/repeating.html">Repeatable
- annotations</a>
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/tutorial/java/javaOO/methodreferences.html">
- Method References</a> (also available on API level 23 and lower)
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/tutorial/java/annotations/type_annotations.html">
- Type Annotations</a> (also available on API level 23 and lower)
- </li>
-</ul>
-
-<p class="note">
- <strong>Note:</strong> Type annotation information is only available at
- compile time, and not during runtime.
-</p>
-
-<p>
- To test lambda expressions, method references, and type annotations on
- earlier versions of Android, go to your {@code build.gradle} file, and set
- {@code compileSdkVersion} and {@code targetSdkVersion} to 23 or lower. You
- will still need to <a href="#configuration">enable the Jack toolchain</a> to
- use these Java 8 features.
-</p>
-
-<p>
- Additionally, the following Java 8 language feature APIs are now available:
-</p>
-
-<ul>
- <li>Reflection and language-related APIs:
- <ul>
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/8/docs/api/java/lang/FunctionalInterface.html">
- {@code java.lang.FunctionalInterface}</a>
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Repeatable.html">
- {@code java.lang.annotation.Repeatable}</a>
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#isDefault--">
- {@code java.lang.reflect.Method.isDefault()}</a>
- </li>
-
- <li>and Reflection APIs associated with repeatable annotations, such as
- <a class="external-link" href=
- "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType-java.lang.Class-">
- {@code AnnotatedElement.getAnnotationsByType(Class)}</a>
- </li>
- </ul>
- </li>
-
- <li>Utility APIs:
- <ul>
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">
- {@code java.util.function}</a>
- </li>
-
- <li>
- <a class="external-link" href=
- "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html">
- {@code java.util.stream}</a>
- </li>
- </ul>
- </li>
-</ul>
-
-<h2 id="configuration">
- Enabling Java 8 Features and the Jack Toolchain
-</h2>
-
-<p>
- In order to use the new Java 8 language features, you need to also use the
- new <a class="external-link" href=
- "https://source.android.com/source/jack.html">Jack toolchain</a>. This new
- Android toolchain compiles Java language source into Android-readable dex
- bytecode, has its own {@code .jack} library format, and provides most toolchain
- features as part of a single tool: repackaging, shrinking, obfuscation and
- multidex.
-</p>
-
-<p>Here is a comparison of the two toolchains used to build Android DEX files:</p>
-<ul>
- <li>Legacy javac toolchain:<br>
- <b>javac</b> ({@code .java} --> {@code .class}) --> <b>dx</b> ({@code
- .class} --> {@code .dex})
- </li>
-
- <li>New Jack toolchain:<br>
- <b>Jack</b> ({@code .java} --> {@code .jack} --> {@code .dex})
- </li>
-</ul>
-
-<h3>
- Configuring Gradle
-</h3>
-
-<p>
- To enable the Java 8 language features and Jack for your project, enter the
- following in your module-level {@code build.gradle} file:
-</p>
-
-<pre>
-android {
- ...
- defaultConfig {
- ...
- jackOptions {
- enabled true
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
-</pre>
-
-<h3 id="known-issues">
- Known Issues
-</h3>
-
-<p>
- <a href="{@docRoot}tools/building/building-studio.html#instant-run">Instant
- Run</a> does not currently work with Jack and will be disabled while using
- the new toolchain.
-</p>
-
-<p>Because Jack does not generate intermediate class files when compiling an
-app, tools that depend on these files do not currently work with Jack. Some
-examples of these tools are:</p>
-
-<ul>
- <li>Lint detectors that operate on class files
- </li>
-
- <li>Tools and libraries that require the app’s class files (such as
- instrumentation tests with JaCoCo)
- </li>
-</ul>
-
-<p>If you find other problems while using Jack, <a href=
-"http://tools.android.com/filing-bugs">please file a bug</a>.</p>
\ No newline at end of file
diff --git a/docs/html/preview/license.jd b/docs/html/preview/license.jd
deleted file mode 100644
index ae02aae..0000000
--- a/docs/html/preview/license.jd
+++ /dev/null
@@ -1,145 +0,0 @@
-page.title=License Agreement
-
-@jd:body
-
-<p>
-To get started with the Android SDK Preview, you must agree to the following terms and conditions.
-As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
-</p>
-
-<p>
-This is the Android SDK Preview License Agreement (the “License Agreement”).
-</p>
-<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px">
-1. Introduction
-
-1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
-
-1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 “Android-compatible” means any Android implemation that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting the License Agreement
-
-2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
-
-2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
-
-2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
-
-3. Preview License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the Preview solely to develop applications for compatible implementations of Android.
-
-3.2 You may not use this Preview to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this Preview is not used for that purpose.
-
-3.3 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
-
-3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
-
-3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
-
-4. Use of the Preview by You
-
-4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
-
-7. Third Party Applications
-
-7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating the License Agreement
-
-9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-
-9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
-(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
-(B) Google issues a final release version of the Android SDK.
-
-9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
-
-10. DISCLAIMERS
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
-
-14. General Legal Terms
-
-14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-
-</div>
\ No newline at end of file
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
deleted file mode 100644
index faf48b8..0000000
--- a/docs/html/preview/overview.jd
+++ /dev/null
@@ -1,448 +0,0 @@
-page.title=Program Overview
-page.metaDescription=Get your apps ready for the next version of Android.
-page.image=images/cards/card-n-overview_2x.png
-meta.tags="preview", "developer", "android"
-page.tags="preview", "developer", "android"
-
-@jd:body
-
-<!--
-<div class="cols" style=
-"background-color:#B2DFDB; padding: 5px 0;margin-bottom:1em; text-align:center;">
-<h3>
- Developer Preview X is now available
- </h3>
- <p>This release includes the ...</p>
- <div style="margin:auto 1em">
- <ul class="dac-section-links">
- <li class="dac-section-link">
- <a href="{@docRoot}preview/support.html#dp4">
- <span class="dac-sprite dac-auto-chevron"></span>
- Read the Notes</a>
- </li>
-
- <li class="dac-section-link">
- <a href="{@docRoot}preview/download.html">
- <span class="dac-sprite dac-auto-chevron"></span>
- Test the Update</a>
- </li>
-
- <li class="dac-section-link">
- <a href="https://code.google.com/p/android-developer-preview/">
- <span class="dac-sprite dac-auto-chevron"></span>
- Report Issues</a>
- </li>
- </ul>
- </div>
-</div>
--->
-
-<p>
- Welcome to the <strong>Android N Developer Preview</strong>, a program that
- gives you everything you need to test and optimize your apps for the next
- version of Android. It's free, and you can get started right away just by
- downloading the N Developer Preview tools.
-</p>
-
-
-
-
-
-
-
-<div style="background-color:#eceff1;padding:1em;">
-<div class="wrap">
- <div class="cols">
- <div class="col-4of12">
- <h5>
- Hardware and emulator images
- </h5>
-
- <p>
- Run and test your apps on a range of devices or on an emulator.
-
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Latest platform code
- </h5>
-
- <p>
- We’ll provide monthly updates during the Preview, so you’ll be testing against the latest platform changes.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Priority for developer issues
- </h5>
-
- <p>
- During the first several weeks we’ll give priority to developer-reported
- issues, so test and give feedback as soon as possible.
- </p>
- </div>
-
- </div>
-
- <div class="cols">
-
-
- <div class="col-4of12">
- <h5>
- New behaviors and capabilities
- </h5>
-
- <p>
- Start work early to support new platform behaviors and develop with new features.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Updates delivered by OTA
- </h5>
-
- <p>
- Seamless over-the-air updates for any supported device through the
- Android Beta Program. No flashing is needed.
- </p>
- </div>
-
- <div class="col-4of12">
- <h5>
- Feedback and support
- </h5>
-
- <p>
- Report issues and give us feedback using our
- <a href="{@docRoot}preview/bug">issue tracker</a>. Connect with other
- developers in the
- <a href="{@docRoot}preview/dev-community">N Developer Community</a>.
- </p>
- </div>
- </div>
-</div>
-</div>
-
-<!--
-<p>New in the Android N Developer Preview: </p>
-
-<ul>
- <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
- <li> More supported devices, including devices from OEM partners</li>
- <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
-</ul>
--->
-
-<h2 id="timeline">Timeline and updates</h2>
-
-<p>
- The N Developer Preview runs from 9 March 2016 until the final Android N
- public release to AOSP and OEMs, planned for Q3 2016.
-</p>
-
-<img src="{@docRoot}images/n-preview-updates_2x.png">
-
-<p>
- At key development milestones, we’ll deliver updates for your development and
- testing environment. In general you can expect an update each month (4 to 6
- week interval). The milestones are listed below.
-</p>
-
-<ul>
- <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (initial release, alpha)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (incremental update, alpha)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp3">Preview 3</a></strong> (incremental update, beta)</li>
- <li><strong><a href="{@docRoot}preview/support.html#dp4">Preview 4</a></strong> (final APIs and official SDK, Play publishing)</li>
- <li><strong>Preview 5</strong> (near-final system images for final testing)</li>
- <li><strong>Final release</strong> to AOSP and ecosystem</li>
-</ul>
-
-<p>
- Each update includes SDK tools, preview system images, emulators, reference
- documentation, and API diffs.
-</p>
-
-<p>
- The <strong>first three preview milestones</strong> provide an <strong>early
- test and development environment</strong> that help you identify
- compatibility issues in your current apps and plan migration or feature work
- needed to target the new platform. This is the priority period in which to
- give us your feedback on features and APIs and file compatibility issues
- — for all of these, please use the <a href="{@docRoot}preview/bug">issue
- tracker</a>. You can expect some API changes across these updates.
-</p>
-
-<p>
- At <strong>previews 4 and 5</strong> you’ll have access to the <strong>final
- N APIs and SDK</strong> to develop with, as well as near-final system images
- to test system behaviors and features. Android N will provide a standard API
- level at this time. You can begin final compatibility testing of your legacy
- apps and refine any new code that is using the N APIs or features.
-</p>
-
-<p>
- Also starting in preview 4, you’ll be able to <strong>publish apps to
- devices</strong> running Android N at the official API level, such as
- consumer devices that have opted into the Android Beta program. You can
- publish into the Google Play alpha and beta channels first, so you can test
- your apps with Android Beta consumers before distributing broadly on the
- store.
-</p>
-
-<p>
- As you test and develop on Android N, we strongly recommend <strong>keeping
- your development environment up-to-date</strong> as preview updates are
- released. To make the process easier, you can enroll your test devices in the
- Android Beta program and get <strong>updates over-the-air (OTA)</strong> at
- each milestone. Alternatively, updated preview images are available that you
- download and flash manually.
-</p>
-
-<p>
- We’ll notify you when preview updates are available via the <a href=
- "http://android-developers.blogspot.com/">Android Developers Blog</a>, as
- well as this site and the <a href="{@docRoot}preview/dev-community">Android
- N Developer Community</a>.
-</p>
-
-
-<h2 id="preview_tools">What's in the N Developer Preview?</h2>
-
-<p>
- The N Developer Preview includes everything you need to test your existing
- apps on a variety of screen sizes, network technologies, CPU/GPU chipsets,
- and hardware architectures.
-</p>
-
-<h3 id="sdk_tools">SDK tools</h3>
-
-<p>You can download these components through the SDK Manager in <a href="{@docRoot}studio/intro/update.html">Android Studio</a>:</p>
-
-<ul>
- <li> N Developer Preview <strong>SDK and tools</strong>
- <li> N Developer Preview <strong>emulator system image</strong> (32-bit & 64-bit)
- <li> N Developer Preview <strong>emulator system Image for Android TV</strong> (32-bit)
- <li> N Developer Preview support libraries (for new app templates)
-</ul>
-
-<p>
- We’ll provide updates to these development tools at each milestone as needed.
-</p>
-
-<h3 id="hardware_system_images">Hardware system images</h3>
-
-<p>
- The N Developer Preview includes Nexus and other hardware system images that you can use when
- testing and developing on physical devices. See the <a href=
- "{@docRoot}preview/download.html">Device Images</a> page for the full list
- of hardware images.
-</p>
-
-<p>
- We’ll deliver updated system images for these devices at each milestone. You
- can download and flash the updated system images to your test devices
- manually, as frequently as you need. This is especially useful for automated
- testing environments where you might need to reflash your device multiple
- times.
-</p>
-
-<p class="note"><strong>Note</strong>:
- <strong>Devices flashed manually will not get OTA updates</strong> like in
- last year’s preview. This year, you can get OTAs by enrolling devices in the
- Android Beta Program — see details in the next section.
-</p>
-
-<h3 id="android_beta">OTA Updates through Android Beta Program</h3>
-
-<p>
- New for Android N is an Over-the-Air (OTA) update program that automatically
- delivers the latest preview updates of Android N directly to devices enrolled
- in the program. The program is free, and it’s open to anyone who has a
- supported device that’s registered to their Google account.
-</p>
-
-<p>
- To enroll in the program visit the <a href="https://g.co/androidbeta">Android
- Beta Program</a> site. You’ll
- see all of the devices registered to your account that are eligible to enroll
- in Android Beta.
-</p>
-
-<ol>
- <li> Choose the devices you want to receive the Android N updates
- <li> Click Enroll, read and agree to the terms of service, and then click OK
-</ol>
-
-<p>
- Once you’ve enrolled, your device will soon receive an update. In most cases,
- you will not need to do a full reset of your data to move to Android N, but
- it’s recommended that you back up any data you don’t want to lose before
- enrolling the device.
-</p>
-
-<p>
- As updates are delivered to your device, we recommend downloading and
- installing them as soon as possible. You’ll want to stay current with the
- latest changes in system UI, behavior, APIs, and features.
-</p>
-
-<p>
- At the conclusion of the Developer Preview, your enrolled devices will
- receive an update to the official Android N release.
-</p>
-
-<p>
- You can un-enroll your devices from the Android Beta program at any time from
- the Android Beta site. Before un-enrolling, make sure to back-up your data on
- the device.
-</p>
-
- <p class="note"><strong>Note</strong>:
- When you un-enroll, <strong>your device will be factory reset</strong>
- to the latest version
- of Android 6.0 Marshmallow (not necessarily the version that you had
- installed prior to enrolling the device). To ensure a clean installation,
- your data will be erased from the device, including contacts, messages,
- photos, and so on.
-</p>
-
-<h3 id="documentation_and_sample_code">Documentation and sample code</h3>
-
-<p>
- These documentation resources are available on the Developer Preview site to
- help you learn about the Android N:
-</p>
-
-<ul>
- <li> <a href="{@docRoot}preview/setup-sdk.html">Set Up to Develop for
-Android N</a> has
- step-by-step instructions for getting started.</li>
- <li> <a href="{@docRoot}preview/behavior-changes.html">Behavior
- Changes</a> points you to key areas to test.</li>
- <li> Documentation of new APIs, including an <a
- href="{@docRoot}preview/api-overview.html">API Overview</a>, downloadable
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API
- Reference</a>, and detailed developer guides on key features such as
- multi-window support, bundled notifications, multi-locale support, and others.
- <li> <a href="{@docRoot}preview/samples.html">Sample code</a> that
- demonstrates how to support permissions and other new features.
- <li> <a href="{@docRoot}preview/support.html#release-notes">Release notes</a>
- for the current version of the N Developer Preview, including change notes and
- diff reports.
-</ul>
-
-<h4 id="reference">Downloadable API Reference</h4>
-
-<p>
- During the early preview updates, you can download the latest
- <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference
- for the Android N platform</a> as a separate zip archive. The reference
- download also includes a diff report that helps you identify API changes from
- API 23 and the previous update.
-</p>
-
-<p>
- When the Android N APIs are final and an official API level is assigned,
- we’ll provide the API reference to you online at <a href=
- "https://developer.android.com">https://developer.android.com</a>.
-</p>
-
-<h3 id="support_resources">
- Support resources
-</h3>
-
-<p>
- As you test and develop on the N Developer Preview, please use these channels
- to report issues and give feedback.
-</p>
-
-<ul>
- <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue
- Tracker</a> is your <strong>primary feedback channel.</strong> You can report bugs, performance
- issues, and general feedback through the issue tracker. You can also check for
-<a href="{@docRoot}preview/bugs">known issues</a> and
- find workaround steps. We’ll keep you updated on your issue as it’s triaged and sent to
- the Android engineering team for review. </li>
- <li> The <a href="{@docRoot}preview/dev-community">Android N Developer Community</a> is
- a Google+ community where you can <strong>connect with other developers</strong>working with
- Android N. You can share observations or ideas or find answers to
- questions about Android N. We’ll moderate the community and provide answers and
- guidance as needed.</li>
-</ul>
-
-<h3 id="targeting">Targeting, preview APIs, and publishing</h3>
-
-<p>
- The N Developer Preview provides a development-only system and Android
- library that <strong>does not have a standard API level</strong>. If you want
- to opt out of compatibility behaviors to test your app (which is strongly
- recommended), you can target the preview version of Android N by setting your
- app's <code><a href=
- "{@docRoot}preview/setup-sdk.html#create-update">targetSdkVersion</a></code>
- to <code>“N”</code>.
-</p>
-
-<p>
- The Android N Developer Preview delivers <strong>preview APIs</strong>
- — the APIs will not be official until the final SDK is released,
- currently planned for the third quarter of 2016. This means that you can
- <strong>expect minor API changes</strong> over time, especially during
- initial weeks of the program. We’ll provide a summary of changes to you with
- each update of the Android N Developer Preview.
-</p>
-
-<p class="note">
- <strong>Note</strong>: Although preview APIs may change, underlying
- system behaviors are stable and ready for testing against
- right away.
-</p>
-
-<p>
- Google Play <strong>prevents publishing of apps targeting the N Developer
- Preview</strong>. When the Android N final SDK is available, you’ll be able
- to target the official Android N API level and publish your app to Google
- Play via the alpha and beta release channels. Meanwhile, if you want to
- distribute an app targeting Android N to testers, you can do so via email or
- by direct download from your site.
-</p>
-
-<p>
- At the full release of Android N to AOSP and OEMs, planned for Q3 2016,
- you’ll be able to publish your apps targeting Android N to the public release
- channel in Google Play.
-</p>
-
-
-<h2 id="how_to_get_started">How to get started</h2>
-
-<p>
- To get started testing your app with Android N:
-</p>
-
-<ol>
- <li> Review the <a href="{@docRoot}preview/api-overview.html">API Overview</a>
- and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a> to
- get an idea of what's new and how it affects your apps. In particular,
- learn about the new <a href="{@docRoot}preview/features/notification-updates.html"
- >notifications</a> features and
- <a href="{@docRoot}preview/features/multi-window.html">multi-window support</a>.</li>
- <li> Set up your environment by following the instructions for <a
- href="{@docRoot}preview/setup-sdk.html">Setting up the Preview SDK</a>
- and configuring test devices.</li>
- <li> Follow the <a href="https://developers.google.com/android/nexus/images">flashing
- instructions</a> to flash the latest Android N system image for your device. </li>
- <li> Review the <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>
- and <a href="{@docRoot}preview/samples.html">Android N samples</a> to gain more
- insight into new API features and how to use them in your app.
- <li> Join the <a href="{@docRoot}preview/dev-community">Android N
- Developer Community</a> to get the latest news and connect with other
- developers working with the new platform.</li>
-</ol>
-
-<p>
- Thank you for your participation in the Android N Developer Preview program!
-</p>
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
deleted file mode 100644
index 34d00a4..0000000
--- a/docs/html/preview/preview_toc.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-<ul id="nav">
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/overview.html"
- es-lang="Información general del programa"
- in-lang="Ikhtisar Program"
- ja-lang="プログラム概要"
- ko-lang="프로그램 개요"
- pt-br-lang="Visão geral do programa"
- ru-lang="Обзор программы"
- vi-lang="Tổng quan về Chương trình"
- zh-cn-lang="计划概览"
- zh-tw-lang="程式總覽">
- Program Overview</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">
- Support and Release Notes</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/setup-sdk.html"
- es-lang="Configurar el SDK de la versión preliminar"
- in-lang="Menyiapkan Preview"
- ja-lang="Preview SDK のセットアップ"
- ko-lang="미리 보기 SDK 설정하기"
- pt-br-lang="Configuração do Preview SDK"
- ru-lang="Настройка пакета SDK Preview"
- vi-lang="Kiểm thử trên Thiết bị"
- zh-cn-lang="设置预览版 SDK"
- zh-tw-lang="設定預覽版 SDK">
- Set Up the Preview</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/download.html"
- es-lang="Pruebe en un dispositivo"
- in-lang="Menguji pada Perangkat"
- ja-lang="デバイス上でテストする"
- ko-lang="기기에서 테스트"
- pt-br-lang="Testar em um dispositivo"
- ru-lang="Тестирование на устройстве"
- vi-lang="Kiểm thử trên Thiết bị"
- zh-cn-lang="在设备上测试"
- zh-tw-lang="在裝置上測試">
- Test on a Device</a></div>
- </li>
-
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/behavior-changes.html"
- es-lang="Cambios en los comportamientos"
- in-lang="Perubahan Perilaku"
- ja-lang="動作の変更点"
- ko-lang="동작 변경"
- pt-br-lang="Mudanças de comportamento"
- ru-lang="Изменения в работе"
- vi-lang="Các thay đổi Hành vi"
- zh-cn-lang="行为变更"
- zh-tw-lang="行為變更">Behavior Changes
- </a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>preview/features/background-optimization.html"
- es-lang="Optimizaciones en segundo plano"
- in-lang="Optimisasi Latar Belakang"
- ja-lang="バックグラウンド処理の最適化"
- ko-lang="백그라운드 최적화"
- pt-br-lang="Otimizações em segundo plano"
- ru-lang="Оптимизация фоновых процессов"
- vi-lang="Tối ưu hóa Chạy ngầm"
- zh-cn-lang="后台优化"
- zh-tw-lang="背景最佳化">Background Optimizations
- </a></li>
- <li><a href="<?cs var:toroot ?>preview/features/multilingual-support.html"
- es-lang="Idioma y configuración regional"
- in-lang="Bahasa dan Lokal"
- ja-lang="言語とロケール"
- ko-lang="언어 및 로케일"
- pt-br-lang="Idioma e localidade"
- ru-lang="Язык и языковой стандарт"
- vi-lang="Ngôn ngữ và Bản địa"
- zh-cn-lang="语言和区域设置"
- zh-tw-lang="語言和地區設定">Language and Locale
- </a></li>
- </ul>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html"
- es-lang="Información general de la API"
- in-lang="Android N untuk Pengembang"
- ja-lang="API の概要"
- ko-lang="API 개요"
- pt-br-lang="Visão geral da API"
- ru-lang="Обзор API-интерфейсов"
- vi-lang="Android N cho Nhà phát triển"
- zh-cn-lang="API 概览"
- zh-tw-lang="API 總覽">Android N for Developers
- </a></div>
- <ul>
-
- <li><a href="<?cs var:toroot ?>preview/features/multi-window.html"
- es-lang="Compatibilidad con ventanas múltiples"
- in-lang="Dukungan Multi-Jendela"
- ja-lang="マルチ ウィンドウのサポート"
- ko-lang="다중 창 지원"
- pt-br-lang="Suporte a várias janelas"
- ru-lang="Поддержка многооконного режима"
- vi-lang="Hỗ trợ đa cửa sổ"
- zh-cn-lang="多窗口支持"
- zh-tw-lang="多視窗支援">
- Multi-Window Support</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/notification-updates.html"
- es-lang="Notificaciones"
- in-lang="Pemberitahuan"
- ja-lang="通知"
- ko-lang="알림"
- pt-br-lang="Notificações"
- ru-lang="Уведомления"
- vi-lang="Thông báo"
- zh-cn-lang="通知"
- zh-tw-lang="通知">
- Notifications</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/data-saver.html">
- Data Saver</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/tv-recording-api.html"
- es-lang="Grabación de TV"
- in-lang="Perekaman TV"
- ja-lang="TV の録画"
- ko-lang="TV 녹화"
- pt-br-lang="Gravação para TV"
- ru-lang="Запись ТВ"
- vi-lang="Ghi lại TV"
- zh-cn-lang="TV 录制"
- zh-tw-lang="電視錄製">
- TV Recording</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/security-config.html"
- es-lang="Configuración de seguridad de la red"
- in-lang="Network Security Configuration"
- ja-lang="ネットワーク セキュリティ構成"
- ko-lang="네트워크 보안 구성"
- pt-br-lang="Configurações de segurança de rede"
- ru-lang="Конфигурация сетевой безопасности"
- vi-lang="Cấu hình Bảo mật mạng"
- zh-cn-lang="网络安全配置"
- zh-tw-lang="網路安全性設定">
- Network Security Configuration</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/icu4j-framework.html"
- es-lang="API de ICU4J del framework de Android"
- in-lang="ICU4J Android Framework API"
- ja-lang="ICU4J Android フレームワーク API"
- ko-lang="ICU4J Android 프레임워크 API"
- pt-br-lang="APIs de estrutura do Android para ICU4J"
- ru-lang="API-интерфейсы ICU4J в платформе Android"
- vi-lang="API Khuôn khổ Android ICU4J"
- zh-cn-lang="ICU4J Android 框架 API"
- zh-tw-lang="ICU4J Android 架構 API">
- ICU4J Support</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/j8-jack.html"
- es-lang="Funciones del lenguaje Java 8"
- in-lang="Fitur Bahasa Java 8"
- ja-lang="Java 8 の機能"
- ko-lang="Java 8 언어 기능"
- pt-br-lang="Recursos de linguagem do Java 8"
- ru-lang="Возможности языка Java 8"
- vi-lang="Tính năng của Ngôn ngữ Java 8"
- zh-cn-lang="Java 8 语言功能"
- zh-tw-lang="Java 8 語言功能">
- Java 8 Language Features</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/afw.html">
- Android for Work Updates</a></li>
-
- <li><a href="<?cs var:toroot ?>preview/features/scoped-folder-access.html"
- es-lang="Acceso a directorios determinados"
- in-lang="Scoped Directory Access"
- ja-lang="特定のディレクトリへのアクセス"
- ko-lang="범위가 지정된 디렉터리 액세스"
- pt-br-lang="Acesso a diretórios com escopo"
- ru-lang="Доступ к выделенным каталогам"
- vi-lang="Truy cập Thư mục theo Phạm vi"
- zh-cn-lang="作用域目录访问"
- zh-tw-lang="限定範圍目錄存取">
- Scoped Directory Access</a></li>
- </ul>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/samples.html"
- es-lang="Ejemplos"
- in-lang="Contoh"
- ja-lang="サンプル"
- ko-lang="샘플"
- pt-br-lang="Exemplos"
- ru-lang="Примеры"
- zh-cn-lang="示例"
- zh-tw-lang="範例">
- Samples</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/license.html"
- es-lang="Contrato de licencia"
- ja-lang="使用許諾契約"
- ko-lang="라이선스 계약"
- pt-br-lang="Contrato de licença"
- ru-lang="Лицензионное соглашение"
- zh-cn-lang="许可协议"
- zh-tw-lang="授權協議">
- License Agreement</a></div>
- </li>
-
-</ul>
diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd
deleted file mode 100644
index 1544d9c..0000000
--- a/docs/html/preview/samples.jd
+++ /dev/null
@@ -1,85 +0,0 @@
-page.title=Samples
-page.tags="preview", "samples", "android"
-page.image=images/cards/card-n-samples_2x.png
-@jd:body
-
-<p>
- The following code samples are provided for Android N. To
- download the samples in Android Studio, select the <b>File > Import
- Samples</b> menu option.
-</p>
-
-<p class="note">
- <strong>Note:</strong> These downloadable projects are designed
- for use with Gradle and Android Studio.
-</p>
-
-
-<h3 id="mw">Multi-Window Playground</h3>
-<img src="{@docRoot}preview/images/sample-multiwindow.png" style="float: left; padding-right: 0.5em" height="250" width="156"/>
-<p>
- This sample demonstrates how to take advantage of multiple window
- user interfaces with your app.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MultiWindowPlayground">
- Get it on GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="an">Active Notifications</h3>
-<img src="{@docRoot}preview/images/sample-activenotifications.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- This is a pre-existing sample which shows a simple service that sends
- notifications using NotificationCompat. Each unread conversation from a user
- is sent as a distinct notification.
-</p>
-<p>
- This sample has been updated to take advantage of new notification features
- available in Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ActiveNotifications">
- Get it on GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="ms">Messaging Service</h3>
-<img src="{@docRoot}preview/images/sample-messagingservice.png" style="float: left; padding-right: 0.5em" height="250" width="150" />
-<p>
- This is a pre-existing sample which demonstrates how to use
- NotificationManager to tell how many notifications an application is currently
- showing.
-</p>
-<p>
- This sample has been updated to take advantage of new notification features
- available in Android N.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-MessagingService">
- Get it on GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="fbe">Direct Boot</h3>
-<img src="{@docRoot}preview/images/sample-directboot.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- This sample demonstrates how to store and access data in a device encrypted
- storage which is always available while the device is booted.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-DirectBoot">
- Get it on GitHub</a>
-</p>
-
-<div style="clear: both;"></div>
-<h3 id="sda">Scoped Directory Access</h3>
-<img src="{@docRoot}preview/images/sample-scopeddirectoryaccess.png" style="float: left; padding-right: 0.5em" height="250" width="141" />
-<p>
- This sample demonstrates how to read and write data from specific
- directories, while requiring fewer permissions.
-</p>
-<p>
- <a href="https://github.com/googlesamples/android-ScopedDirectoryAccess">
- Get it on GitHub</a>
-</p>
\ No newline at end of file
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
deleted file mode 100644
index 3e95f3e..0000000
--- a/docs/html/preview/setup-sdk.jd
+++ /dev/null
@@ -1,197 +0,0 @@
-page.title=Set Up the Preview
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-sdk_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
- <div id="qv">
-<ol>
- <li><a href="#get-as13">Get Android Studio 2.1</a></li>
- <li><a href="#get-sdk">Get the Android N SDK</a>
- <ol>
- <li><a href="#docs-dl">Reference documentation</a>
- </ol>
- </li>
- <li><a href="#java8">Get the Java 8 JDK</a></li>
- <li><a href="#create-update">Update or Create a Project</a></li>
- <li><a href="#next">Next Steps</a></li>
-</ol>
- </div>
-</div>
-
-<p>To develop apps for the Android N Preview, you need to make some updates
-to your developer environment, as described on this page.</p>
-
-<p>To simply test your app's compatibility on the
-Android N system image, follow the guide to <a
-href="{@docRoot}preview/download.html">Test on an Android N Device</a>.</p>
-
-<img src="{@docRoot}preview/images/n-preview-setup.png" width="700" alt="" />
-
-
-<h2 id="get-as13">Get Android Studio 2.1</h2>
-
-<p>The Android N platform adds support for <a
-href="{@docRoot}preview/j8-jack.html">Java 8 language features</a>,
-which require a new compiler called Jack. The latest version of Jack
-is currently supported only in Android Studio 2.1. So if you want to
-use Java 8 language features, you need to use Android Studio 2.1 to
-build your app. Otherwise, you don't need to use the Jack compiler, but you
-still need to update to JDK 8 to compile against the Android N platform,
-as described below.</p>
-
-<p>If you already have Android Studio installed, make sure you have Android
-Studio 2.1 or higher by clicking <strong>Help > Check for Update</strong>
-(on Mac, <strong>Android Studio > Check for Updates</strong>).</p>
-
-<p>If you don't have it, <a href="{@docRoot}studio/">download Android Studio
-2.1 here</a>.</p>
-
-
-<h2 id="get-sdk">Get the N Preview SDK</h2>
-
-<p>To start developing with Android N APIs, you need to install the
-Android N Preview SDK in Android Studio as follows:</p>
-
-<ol>
- <li>Open the SDK Manager by clicking <strong>Tools > Android >
- SDK Manager</strong>.</li>
-
- <li>In the <strong>SDK Platforms</strong> tab, select the
- <strong>Android N Preview</strong> check box.</li>
-
- <li>Click the <strong>SDK Tools</strong> tab, then select the
- <strong>Android SDK Build Tools</strong>, <strong>Android SDK
- Platform-Tools</strong>, and <strong>Android SDK Tools</strong> check
- boxes.
- </li>
-
- <li>Click <strong>OK</strong>, then accept the licensing
- agreements for any packages that need to be installed.
- </li>
-</ol>
-
-<h3 id="docs-dl">Get the N Preview reference documentation</h3>
-
-<p>Beginning with the Preview 4 release, the API reference for the
-N platform (API level 24) is now available online at <a href=
- "{@docRoot}reference/">developer.android.com/reference/</a>.
-</p>
-
-<p>If you'd like an offline copy of the API reference, you can download it
-from the following table. The download also includes an incremental diff report
-for API changes between the Preview 3 and Preview 4 release, which is not
-available online.</p>
-
-<table>
- <tr>
- <th scope="col">Documentation</th>
- <th scope="col">Checksums</th>
- </tr>
- <tr>
- <td style="white-space: nowrap">
- <a href="{@docRoot}shareables/preview/n-preview-4-docs.zip"
- >n-preview-4-docs.zip</a></td>
- <td width="100%">
- MD5: f853e3ba0707083336dfa780b8fed9a7<br>
- SHA-1: 36fcbc497cc2e63b1bc1d629c304b0ba43a88946
- </td>
- </tr>
-</table>
-
-
-
-<h2 id="java8">Get the Java 8 JDK</h2>
-
-<p>To compile your app against the Android N platform and use some tools with
-Android Studio 2.1, you need to install the Java 8 Developer Kit (JDK 8). So, if
-you don't already have the latest version, download JDK 8 now.</p>
-
-<p>Then set the JDK version in Android Studio as follows:</p>
-
-<ol>
- <li>Open an Android project in Android Studio, then open the
- Project Structure dialog by selecting <strong>File >
- Project Structure</strong>. (Alternatively, you can set the default
- for all projects by selecting <strong>File > Other Settings >
- Default Project Structure</strong>.)
- </li>
- <li>In the left panel of the dialog, click <strong>SDK Location</strong>.
- </li>
- <li>In the <strong>JDK Location</strong> field, enter the location of the
- Java 8 JDK (click the button on the right
- to browse your files), then click <strong>OK</strong>.
- </li>
-</ol>
-
-<img src="{@docRoot}preview/images/studio-jdk-location.jpg" width="700"
- alt="" />
-
-
-<h2 id="create-update">Update or Create a Project</h2>
-
-<p>Now that the N platform API level is "24" instead
-of "N", you can configure your projects normally with this API level (and even
-publish your apps compiled with API 24 on Google Play). Just be sure that you've
-updated your project to use <strong>Android SDK Build Tools 24.0.0</strong> and
-<strong>Android SDK Platform-Tools 24.0.0</strong>.</p>
-
-<p>If you plan to use Java 8 language features, you should also read
-<a href="{@docRoot}preview/j8-jack.html">Java 8 Language Features</a>
-for information about the supported Java 8 features and
-how to configure your project with the Jack compiler.</p>
-
-
-<h3 id="update">Update an existing project</h3>
-
-<p>Open the
- <code>build.gradle</code> file for your module and update the values as
- follows:
-</p>
-
-<pre>
-android {
- compileSdkVersion <strong>24</strong>
- buildToolsVersion <strong>'24.0.0'</strong>
- ...
-
- defaultConfig {
- targetSdkVersion <strong>24</strong>
- ...
- }
- ...
-}</pre>
-
-<p>Now that the API level 24 is final, you can compile against it and keep your
-<code>minSdkVersion</code> to whatever version is appropriate for your app.</p>
-
-
-<h3 id="create">Create a new project</h3>
-
-
-<p>To create a new project for development with the Android N Preview SDK:</p>
-
-<ol>
- <li>Click <strong>File > New Project</strong>. and follow the steps until
- you reach the <strong>Target Android Devices</strong> page.
- </li>
- <li>On this page, select the <strong>Phone and Tablet</strong> check box.</li>
- <li>Under <strong>Phone and Tablet</strong> option, in the <strong>Minimum
- SDK</strong> option list, select
- <strong>API 24: Android 6.X (N Preview)</strong>.</li>
-</ol>
-
-
-<h2 id="next">Next Steps</h2>
-
-<ul>
- <li>Follow the guide to <a
-href="{@docRoot}preview/download.html">Test on an Android N Device</a>.</li>
- <li>Learn more about the Android N platform with
-<a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>
-and <a href="{@docRoot}preview/api-overview.html">Android N APIs
-and Features</a>.</li>
-</ul>
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
deleted file mode 100644
index ef8a652..0000000
--- a/docs/html/preview/support.jd
+++ /dev/null
@@ -1,1513 +0,0 @@
-page.title=Support and Release Notes
-meta.keywords="preview", "android"
-page.tags="preview", "developer preview"
-page.image=images/cards/card-n-support_2x.png
-
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>In this document</h2>
-
-<ul>
- <li><a href="#dp4">Developer Preview 4</a>
- <ul>
- <li><a href="#general">General advisories</a></li>
- <li><a href="#new">New in DP4</a></li>
- <li><a href="#ki">Known issues</a></li>
- <li><a href="#upgrade-notes">Notes on publishing apps that target API 24</a></li>
- </ul>
- </li>
- <li><a href="#dp3">Developer Preview 3</a></li>
- <li><a href="#dp2">Developer Preview 2</a></li>
- <li><a href="#dp1">Developer Preview 1</a></li>
-</ul>
-
-<!--
-<h2>See Also</h2>
-<ol>
- <li></li>
-</ol>
--->
-
-</div>
-</div>
-
-<p>
- Two primary support channels are available to you when developing and testing
- with the Android N Developer Preview: Please file bugs at <a href=
- "https://developer.android.com/preview/bug"
- >https://developer.android.com/preview/bug</a> for
- device-specific, system, and Google App bugs. For issues in other apps,
- please contact the developer directly.
-</p>
-
-<p>
- To discuss issues or ideas with other developers working with Android N, join
- the <a href="{@docRoot}preview/dev-community">Developer Preview Google+
- community</a>.
-</p>
-
-<h2 id="dp4">Developer Preview 4</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Date: June 2016<br>
- Build: NPD56N<br>
- Emulator support: x86 & ARM (32/64-bit)<br>
- Google Play services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="general">General advisories</h3>
-
-<p>
- This Developer Preview release is for <strong>app developers and other early
- adopters</strong> and is available for daily use, development, or
- compatibility testing. Please be aware of these general notes about the
- release:
-</p>
-
-<ul>
- <li>This release may have various <strong>stability issues</strong> on
- supported devices.
- </li>
-
- <li>Some apps <strong>may not function as expected</strong> on the new
- platform version. This includes Google’s apps as well as other apps.
- </li>
-
- <li>Developer Preview 4 is <strong>Compatibility Test Suite (CTS)
- approved</strong> on these devices: Nexus 5X, Nexus 6, Nexus 6P, and
- Pixel C. Apps that depend on CTS approved builds should work normally
- on these devices (Android Pay for example).
- </li>
-
- <li>Developer Preview 4 is <strong>available on all supported
- devices:</strong> Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player,
- Pixel C, General Mobile 4G (Android One), as well as Sony Xperia Z3
- (D6603 and D6653 models).
- </li>
-</ul>
-
-
-<h3 id="new">New in DP4</h3>
-
-<h4>Android N final APIs</h4>
-
-<p>
- Developer Preview 4 includes the <strong>final APIs</strong> for the upcoming
- Android N platform. The new API level is 24.
-</p>
-
-<h4>Play publishing</h4>
-
-<p>
- You can now publish apps that use <strong>API level 24</strong> to Google
- Play, in alpha, beta, and production release channels.
-</p>
-
-<h4>Android Studio and tools updates</h4>
-
-<p>
- Along with Developer Preview 4 we’re providing the <strong>final API 24
- SDK</strong> to be used with Android Studio 2.1.2 and higher. In addition,
- we’re releasing updated Developer Preview 4 system images for the emulator to
- help test your apps.
-</p>
-
-<p>
- As new updates roll out for Android Studio, you should see minor improvements in
- the new project wizards and AVD manager as we add enhanced support for API 24.
- These are primarily cosmetic changes and should not stop you from getting
- your app ready for an update in the Play store.
-</p>
-
-<h4 id="api-changes">Feature and API changes</h4>
-
-<ul>
- <li>In previous versions of Android, an app activates with all of its locale
- resources loaded before locale negotiation begins. Starting in Android N DP4,
- the system negotiates resource locales individually for each resource object
- before the app activates.
- </li>
-
- <li>As announced at Developer Preview 3, we’ve deferred the Launcher
- Shortcuts feature to a later release of Android. In Developer Preview 4,
- we’ve removed the Launcher Shortcuts APIs.
- </li>
-
- <li>We’ve changed the BLE Scanning behavior starting in DP4. We’ll prevent
- applications from starting and stopping scans more than 5 times in 30
- seconds. For long running scans, we’ll convert them into opportunistic scans.
- </li>
-
- <li>The <a href=
- "{@docRoot}preview/features/multi-window.html">Multi-Window</a>
- <code>android:minimalHeight</code> and <code>android:minimalWidth</code>
- attributes have been renamed to <code>android:minHeight</code> and
- <code>android:minWidth</code>.
- </li>
-</ul>
-
-<h3 id="ki">Known Issues</h3>
-
-<h4>Stability</h4>
-
-<ul>
- <li>Users may encounter system instability (such as kernel panics and
- crashes).
- </li>
-</ul>
-
-<h4>Launcher</h4>
-
-<ul>
- <li>The default launcher’s <strong>All Apps</strong> tray may become
- unresponsive after cycling the screen off and on. Returning to the
- homescreen and relaunching the <strong>All Apps</strong> tray may resolve
- this issue.
- </li>
-</ul>
-
-<h4>Setup Wizard</h4>
-
-<ul>
- <li>Crash on selecting "Not now" in "Set up email" screen.
- </li>
-</ul>
-
-<h4>Media</h4>
-
-<ul>
- <li>Media playback may be unreliable on Nexus 9 and Nexus Player, including
- issues playing HD video.
- </li>
-
- <li>Occasional freeze when running the YouTube app with other apps in
- multi-window mode on Pixel C devices. In some cases hard reboot is required.
- </li>
-
- <li>Apps may have issues playing some Widevine DRM-protected content on Nexus
- 9 devices.
- </li>
-
- <li>Issues handling VP8 video on Nexus 9 devices.
- </li>
-</ul>
-
-<h4>External storage</h4>
-
-<ul>
- <li>Apps may become unstable when the user moves them from internal storage
- to adoptable external storage (this can include SD card or devices attached
- over USB).
- </li>
-</ul>
-
-<h4>Screen zoom and multiple APKs in Google Play</h4>
-
-<ul>
- <li>On devices running Android N, Google Play services 9.0.83 incorrectly
- reports the current screen density rather than the stable screen density.
- When screen zoom is enabled on these devices, this can cause Google Play to
- select a version of a multi-APK app that’s designed for smaller screens. This
- issue is fixed in the next version of Google Play services and will be
- included in a later Developer Preview release.
- </li>
-</ul>
-
-<h4>Vulkan support and multiple APKs in Google Play</h4>
-
-<ul>
- <li>On devices running Android N, Google Play services 9.0.83 currently
- reports Vulkan support but not Vulkan version. This can cause Google Play to
- select a version of a multi-APK app that’s designed for lower Vulkan support
- on devices with higher version support. Currently, the Google Play Store does
- not accept uploads of apps which use Vulkan version targeting. This support
- will be added to the Google Play Store in the future and fixed in the next
- version of Google Play services (to be included in a later Developer Preview
- release). Any N devices using the version of Google Play services 9.0.83 will
- continue to receive versions of apps targeting basic Vulkan support.
- </li>
-</ul>
-
-<h4>Accessibility</h4>
-<ul>
- <li>Switch access doesn't allow user to navigate web pages in Chrome.
- </li>
-
- <li>Accessibility issues for talkback users with notification dismissal, and
- wifi selection screen.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Currently, CA certificates provisioned through {@link
- android.app.admin.DevicePolicyManager} are not
- available to profiles other than the primary user/profile due to a preload
- issue. For example, this could prevent a user from connecting to a trusted
- server when in a Work profile. This issue will be resolved in the next
- Developer Preview.
- </li>
-
- <li>After reboot with work mode off, solving work challenge does not switch
- on work mode.
- </li>
-
- <li>Users receiving a video call in Hangouts have to unlock work challenge
- first.
- </li>
-
- <li>Accessing Settings > Security > Device Security crash observed when
- separating primary and work challenge.
- </li>
-
- <li>If {@link android.os.UserManager#DISALLOW_CONFIG_VPN} is set before
- calling {@link android.app.admin.DevicePolicyManager#setAlwaysOnVpnPackage
- DevicePolicyManager.setAlwaysOnVpnPackage()}, then setting always on VPN does
- not work. That is, after rebooting the device with the {@link
- android.os.UserManager#DISALLOW_CONFIG_VPN} restriction set, VPN is not
- autostarted.
- </li>
-</ul>
-
-<h4 id="">Android Auto</h4>
-
-<p>
- The version of Google Maps included in Developer Preview 4 (9.30) crashes
- when used with Android Auto. This issue will be fixed in the next update to
- Google Maps (9.31), expected in the coming weeks.
-</p>
-
-
-<!-- TBA, if any
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Device Name</strong>
- </dt>
-
- <dd>
- Issue 1
- </dd>
-
- <dd>
- Issue 2
- </dd>
-</dl>
-
--->
-
-
-<h4 id="dp4-fixes">Fixes for issues reported by developers</h4>
-
-<p>
- A number of issues reported by developers have been fixed, including:
-</p>
-
-<ul>
- <li>The active network state ({@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} and {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}) might return incorrect values during some
- restricted background scenarios
- </li>
-
- <li>Data Saver restricts the foreground MMS mobile network request
- (<a href="https://code.google.com/p/android/issues/detail?id=208478">bug
- 208478</a>)
- </li>
-
- <li>Quick settings tiles and notifications sometimes unresponsive
- </li>
-
- <li>Unable to dismiss Clock notifications
- </li>
-
- <li>Duplication of bluetooth icon and other status icons
- </li>
-
- <li>Additional bluetooth connectivity fixes
- </li>
-
-</ul>
-
-<p>For the full list of fixed issues, see <a href="https://goo.gl/6uCKtf">the
-issue tracker</a>.</p>
-
-<h3 id="upgrade-notes">Notes on publishing apps that target API 24</h3>
-
-<p>
- Before publishing apps that target API 24 in Google Play, keep these points
- in mind:
-</p>
-
-<ul>
- <li>If your app’s current <code>targetSdkVersion</code> is 22 or lower and
- you want to target API 24, you’ll need to support <a href=
- "{@docRoot}about/versions/marshmallow/android-6.0-changes.html">behaviors
- introduced with Android 6.0 (Marshmallow)</a>, such as <a href=
- "{@docRoot}training/permissions/requesting.html">runtime permissions</a>, in
- addition to Android N behaviors.
- </li>
-
- <li>Once you publish an app with <code>targetSdkVersion</code> set to 23 or
- higher, you can't later publish a version of the app with a higher
- <code>versionCode</code> that targets 22 or lower. This restriction applies
- in alpha and beta channels as well as production channel.
- </li>
-</ul>
-
-<!-- DP3 Release Notes Archive -->
-
-<h2 id="dp3">Developer Preview 3</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Date: May 2016<br>
- Build: NPD35K<br>
- Emulator support: x86 & ARM (32/64-bit)<br>
- Google Play services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp3-general">General advisories</h3>
-
-<p>
- This Developer Preview release is for <strong>app developers and other early
- adopters</strong> and is available for daily use, development, or
- compatibility testing. Please be aware of these general notes about the
- release:
-</p>
-
-<ul>
- <li>This release may have various <strong>stability issues</strong> on
- supported devices. Users may encounter system instability, such as kernel
- panics and crashes.
- </li>
-
- <li>Some apps <strong>may not function as expected</strong> on the new
- platform version. This includes Google’s apps as well as other apps.
- </li>
-
- <li>Developer Preview 3 is <strong>Compatibility Test Suite (CTS)
- approved</strong> on these devices: Nexus 5X, Nexus 6, Nexus 6P, and Pixel
- C. Apps that depend on CTS approved builds should
- work normally on these devices (Android Pay for example).
- </li>
-
- <li>Developer Preview 3 is <strong>available on all supported
- devices:</strong> Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player, Pixel
- C, General Mobile 4G (Android One), as well as Sony Xperia Z3 (D6603 and
- D6653 models).
-
- </li>
-</ul>
-
-
-<h3 id="dp3-new">New in DP3</h3>
-
-<h4>VR Mode for Android</h4>
-
-<p>
- Android N adds platform support and optimizations for a new VR Mode to let
- developers build high quality mobile VR experiences for users. There are a
- number of performance enhancements, including access to an exclusive CPU core
- for VR apps. Within your apps, you can take advantage of intelligent
- head-tracking, and stereo notifications that work for VR. Most importantly,
- Android N provides for very low latency graphics.
-</p>
-
-<p>
- For more information, see the <a href=
- "https://developers.google.com/vr/android/">Google VR SDK for Android</a>.
-</p>
-
-<h4>Sustained performance mode</h4>
-
-<p>
- Android N includes optional support for <a href=
- "{@docRoot}preview/api-overview.html#sustained_performance_api">sustained
- performance mode</a>, enabling OEMs to provide hints on device performance
- capabilities for long running applications. App developers can then use these
- hints to tune applications for a predictable, consistent level of device
- performance over long periods of time. App developers can try out this new
- API in the developer preview on Nexus 6P devices only.
-</p>
-
-<h4>Multiprocess WebView</h4>
-
-<p>
- Starting with version 51 in Android N, WebView will run web content in a
- separate sandboxed process when the developer option "Multiprocess WebView"
- is enabled. The WebView team is looking for feedback on compatibility and
- runtime performance in N before enabling multiprocess WebView in a future
- version of Android. In this version, regressions in startup time, total
- memory usage and software rendering performance are expected.
-</p>
-
-<p>
- If you find unexpected issues in multiprocess mode we’d like to hear about
- them. Please get in touch with the WebView team by <a href=
- "https://bugs.chromium.org/p/chromium/issues/entry?template=Webview%20Bugs">
- filing a bug</a>.
-</p>
-
-<h4>Keyboard Shortcuts helper</h4>
-
-<p>
- Android N lets users press <code>Meta+/</code> to trigger a <strong>Keyboard
- Shortcuts</strong> screen that displays all shortcuts available both from the
- system and from the app in focus. Developers can add their own shortcuts or
- trigger the Shortcuts screen from their apps. See <a href=
- "{@docRoot}preview/api-overview.html#keyboard_shortcuts_helper">Keyboard
- Shortcuts helper</a> for details.
-</p>
-
-<h4>FrameMetrics API</h4>
-
-<p>
- DP3 introduces a new <a href=
- "{@docRoot}preview/api-overview.html#framemetrics_api">FrameMetrics API</a>
- that allows an app to monitor its UI rendering performance by exposing a
- streaming pubsub API to transfer frame timing info for the application’s
- current window. <code>FrameMetricsListener</code> can be used to measure
- interaction-level UI performance in production with higher granularity and
- without the need for a USB connection.
-</p>
-
-<h4 id="dp3-api-changes">Feature and API changes</h4>
-
-<dl>
- <dt>
- Launcher Shortcuts and the Launcher Shortcuts API
- </dt>
-
- <dd>
- We’ve decided to defer this feature to a future release of Android. We plan
- to remove the Launcher Shortcuts APIs (ShortcutManager and others) from the
- public Android N API starting in the next developer preview.
- </dd>
-
- <dt>
- WebView Javascript run before page load
- </dt>
-
- <dd>
- Starting with apps targeting Android N, the Javascript context is reset
- when a new page is loaded. Currently, the context is carried over for the
- first page loaded in a new {@link android.webkit.WebView} instance.
- Developers looking to inject Javascript into the {@link
- android.webkit.WebView} should execute the script after the page has
- started to load.
- </dd>
-
- <dt>
- WebView Geolocation on insecure origins
- </dt>
-
- <dd>
- Starting with apps targeting Android N, the geolocation API will only be
- allowed on secure origins (over HTTPS.) This policy is designed to protect
- users' private information when they're using an insecure connection.
- </dd>
-
- <dt>
- Data Saver
- </dt>
-
- <dd>
- Starting in Developer Preview 3, apps can use use an intent to display a
- system dialog that lets the user directly add the app to the Data Saver
- exemption whitelist. See the <a href=
- "{@docRoot}preview/api-overview.html#data_saver">Data Saver
- documentation</a> for details.
- </dd>
-
- <dt>
- <a href=
- "{@docRoot}preview/api-overview.html#number-blocking">Number-blocking</a>
- </dt>
-
- <dd>
- If an unauthorized user attempts to block or unblock a number, the
- operation now fails with {@link java.lang.SecurityException}. (Previously,
- the operation threw {@link java.lang.UnsupportedOperationException}.)
- </dd>
-
- <dt>
- <a href="{@docRoot}preview/api-overview.html#tile_api">Quick Settings Tile
- API</a>
- </dt>
-
- <dd>
- The system now uses the activity's metadata to decide on the tile mode.
- (Previously, tile mode was determined by the return value of
- <code>TileService.onTileAdded()</code>.) For more information, see
- <code>TileService.META_DATA_ACTIVE_TILE</code> in the downloadable <a href=
- "{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
- </dd>
-</dl>
-
-<h4 id="dp3-fixes">Fixes for issues reported by developers</h4>
-
-<p>
- A number of issues reported by developers have been fixed, including:
-</p>
-
-<ul>
- <li>Bluetooth Audio playback interrupted after 1 song (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=206889">206889</a>)
- </li>
-
- <li>Pixel C Consistently Crashes (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=206962">206962</a>)
- </li>
-
- <li>Clock and Toast notification issues (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=203094">203094</a>)
- </li>
-
- <li>Pixel C reboots when connected to MacBook Pro via USB C Cable (bug
- <a href=
- "https://code.google.com/p/android/issues/detail?id=205432">205432</a>)
- </li>
-
- <li>Calandar offset by one day (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=203002">203002</a>)
- </li>
-
- <li>TelephonyManager.getAllCellInfo returning invalid data (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=203022">203022</a>)
- </li>
-
- <li>Nexus 6p, Bluetooth keeps disconnecting (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=208062">208062</a>)
- </li>
-</ul>
-
-<p>For the full list of fixed issues, see <a href="https://goo.gl/6uCKtf">the
-issue tracker</a>.</p>
-
-<h3 id="dp3-ki">Known Issues</h3>
-
-<h4>Accessibility</h4>
-
-<ul>
- <li>Unable to listen to TTS output when pitch is set near maximum level.
- </li>
-
- <li>Accessibility features and settings may be disrupted with the user adds a
- Work profile, including magnification gesture and setting. Accessibility
- state is restored when the user next touches the associated settings.
- </li>
-</ul>
-
-<h4>Camera</h4>
-
-<ul>
- <li>The Camera app has exhibited instability; it may crash in various
- circumstances, such as when launched in multi-window mode.
- </li>
-
- <li>Pressing the shutter continuously in panorama mode may cause the Camera
- app to crash.
- </li>
-</ul>
-
-<h4>Audio</h4>
-<ul>
- <li>A platform audio player issue prevents some apps from functioning
- normally. For example, Skype and other apps are affected by this issue.
- </li>
-</ul>
-
-<h4>Connectivity</h4>
-
-
-<ul>
- <li>When a Bluetooth Low Energy (BLE) peripheral role device advertises a
- service and a BLE central role device connects, the peripheral role device
- disconnects very quickly.
- </li>
-
- <li>Wi-Fi connection may be dropped when the screen is off.
- </li>
-
- <li>RFCOMM connections are unstable and may result in data corruption and
- dangling connections.
- </li>
-
- <li>The active network state ({@link android.net.NetworkInfo#getState
- NetworkInfo.getState()} and {@link android.net.NetworkInfo#getDetailedState
- NetworkInfo.getDetailedState()}) might return incorrect values during some
- restricted background scenarios.
- </li>
-</ul>
-
-
-<h4>
- Launcher
-</h4>
-
-<ul>
- <li>The default launcher’s All Apps tray may become unresponsive after
- cycling screen off / screen on. Returning to the homescreen and relaunching
- the All Apps tray may resolve this issue.
- </li>
-</ul>
-
-<h4>
- Keyboard
-</h4>
-
-<ul>
- <li>When updating a device running Android 6.0 or earlier to the N Developer
- Preview, Google Keyboard does not preserve preferences data such as recent
- emoji and sound settings.
- </li>
-
- <li>Google Indic Managed Keyboard may be unstable.
- </li>
-
- <li>When entering text in a password field, the user can select Russian as
- the input language but the keyboard remains in English. This prevents the
- user from entering Russian-language passwords.
- </li>
-</ul>
-
-<h4>
- Locale and languages
-</h4>
-
-<ul>
- <li>When using a right-to-left (RTL) locale, the system may unexpectedly
- switch to left-to-right (LTR) presentation after restarting the device.
- </li>
-</ul>
-
-<h4>Media</h4>
-
-<ul>
- <li>Media playback be be unreliable on Nexus 9 and Nexus Player, including
- issues playing HD video.
- </li>
-</ul>
-
-<h4>
- Multi-window mode
-</h4>
-
-<ul>
- <li>Device may freeze when changing orientation in multi-window mode.
- </li>
-
- <li>Several apps currently have issues with multi-window mode:
- <ul>
- <li>The system UI may crash when docking Settings > Display >
- Screen brightness to multi-window.
- </li>
-
- <li>The Camera app may crash when launched in multi-window mode.
- </li>
-
- <li>YouTube may crash when launched into multi-window mode. To fix the
- issue, you can clear the YouTube app’s data at Storage > Apps >
- YouTube.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>
- Google Play services
-</h4>
-
-<ul>
- <li>Apps using Google Cast through Google Play services may be unstable when
- the user selects a system locale that uses letters and numbers outside of the
- ASCII range.
- </li>
-</ul>
-
-<h4>
- Android for Work and Google Apps Device Policy
-</h4>
-
-<ul>
- <li>The Device Policy app may crash when the user unlocks the device with the
- "device policy status" screen pinned.
- </li>
-
- <li>After setting up a work profile with file-based encryption enabled and
- then turning off Work, users must unlock primary profile screen lock to once
- again access Work apps.
- </li>
-
- <li>Device reboots when removing the security pattern lock and opening work
- app/personal app in the multi-window.
- </li>
-
- <li>Setting DISALLOW_VPN_CONFIG is causing the consent dialog to appear in
- always-on-vpn set by Device Policy Client.
- </li>
-
- <li>Traffic is not locked down until VPN is connected in always-on-vpn mode.
- </li>
-</ul>
-
-<h4>
- External storage
-</h4>
-
-<ul>
- <li>Apps may become unstable when the user moves them from internal storage
- to adoptable external storage (this can include SD card or devices attached
- over USB).
- </li>
-</ul>
-
-<h4>
- Screen zoom and multiple APKs in Google Play
-</h4>
-
-<ul>
- <li>On devices running Android N, Google Play services 9.0.83 incorrectly reports
- the current screen density rather than the stable screen density. When screen
- zoom is enabled on these devices, this can cause Google Play to select a
- version of a multi-APK app that’s designed for smaller screens. This issue is
- fixed in the next version of Google Play services and will be included in a
- later Developer Preview release.
- </li>
-
- <li>On devices running Android N, Google Play services 9.0.83 currently reports
- Vulkan support but not Vulkan version. This can cause Google Play to select a
- version of a multi-APK app that’s designed for lower Vulkan support on
- devices with higher version support. Currently, the Google Play Store does
- not accept uploads of Apps which use Vulkan version targeting. This support
- will be added to the Google Play Store in the future and fixed in the next
- version of Google Play services (to be included in a later Developer Preview
- release) any N devices using the version of Google Play services 9.0.83 will
- continue to receive versions of Apps targeting basic Vulkan support.
- </li>
-</ul>
-
-<h4>Notifications</h4>
-
-<ul>
- <li>MessagingStyle does not show notifications with "null" (self) sender.
- </li>
-</ul>
-
-<h4>Developer Tools</h4>
-
-<ul>
- <li>
- <code>adb</code> may sometimes disconnect while using JDWP debugging.
- </li>
-</ul>
-
-
-<!-- DP2 Release Notes Archive -->
-
-<h2 id="dp2">Developer Preview 2</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Date: April 2016<br>
- Builds: NPC91K, NPC91O<br>
- Emulator support: x86 & ARM (32/64-bit)<br>
- Google Play services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp2-new">New in DP2</h3>
-
-<ul>
- <li>Platform support for Vulkan, a new 3D rendering API that provides
- explicit, low-overhead GPU (Graphics Processor Unit) control and offers
- improved performance for draw-call heavy applications. For details, see the
- <a href="{@docRoot}ndk/guides/graphics/index.html">documentation</a>.
- </li>
-
- <li>New people emoji with support for skin tones, and new Unicode 9 glyphs.
- Skin tone and new emoji will not show up until keyboards build support for
- them in the palette. Apps should not need to take any action to take
- advantage of these new emoji, unless the apps use a non-system font. IME
- developers need to incorporate support for the new emoji.
- </li>
-
- <li>
- <a href="{@docRoot}preview/api-overview.html#launcher_shortcuts">Launcher
- Shortcuts API</a>: Apps can use <code>ShortcutManager</code> to send
- shortcuts to starting points within themselves to the launcher.
- </li>
-
- <li>
- <a href="{@docRoot}preview/features/multi-window.html">Multi-Window</a>:
- You can now specify a separate minimum height and minimum width for an
- activity. In addition, several API names have been slightly changed.
- </li>
-</ul>
-
-<h4 id="dp2-fixes">Fixes for issues reported by developers</h4>
-
-<p>
- A number of issues reported by developers have been fixed, including:
-</p>
-
-<ul>
- <li>Can’t connect to hidden SSID or non-broadcast Wi-Fi. (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=203116">203116</a>)
- </li>
-
- <li>Microphone mute state persists across activities. (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=205922">205922</a>)
- </li>
-
- <li>Changing multi-window focus pauses YouTube. (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=203424">203424</a>)
- </li>
-
- <li>Direct Reply may close open activity. (bug <a href=
- "https://code.google.com/p/android/issues/detail?id=204411">204411</a>)
- </li>
-
- <li>Various stability fixes.
- </li>
-</ul>
-
-<h3 id="dp2-general">General advisories</h3>
-
-<p>
- This Developer Preview release is for <strong>app developers only</strong>
- and is designed for use in compatibility testing and early development only.
- Please be aware of these general notes about the release:
-</p>
-
-<ul>
-
- <li>The development tool components and support libraries have been updated
- for the DP2 release. Make sure to update your preview development environment
- before developing for DP2. For instructions on setting up your development
- environment, see
- <a href="{@docRoot}preview/setup-sdk.html">Set Up the Preview</a>.
- </li>
-
- <li>This release has various stability and performance issues on all devices
- that make it <strong>not suitable for daily use on phone or tablet</strong>,
- especially for non-developers.
- </li>
-
- <li>Battery life and performance have not yet been optimized with this
- release:
-
- <ul>
- <li>System and app <strong>performance is known to be periodically slow /
- janky</strong>, and devices may become occasionally unresponsive. These
- problems may become more acute with prolonged use.
- </li>
-
- <li>Battery life may be regressed in this release for screen-on and
- screen-off use cases.
- </li>
- </ul>
- </li>
-
- <li>Some <strong>apps may not function normally</strong> on Developer Preview
- 2. This includes Google’s apps as well as other apps.
- </li>
-
- <li>This early build is not <strong>Compatibility Test Suite (CTS)
- approved</strong>. Apps that depend on CTS approved builds won’t work
- (Android Pay for example).
- </li>
-
- <li>This preview release supports the following devices: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, and Pixel C, as well as General Mobile 4G
- (Android One). Support for Nexus Player is coming soon.
- </li>
-
-
- <li><a href=
- "https://github.com/googlesamples/android-testdpc/releases">TestDPC</a> has
- been updated to handle API changes between DP1 and DP2.
- </li>
-</ul>
-
-<h3 id="dp2-ki">Known Issues</h3>
-
-<h4>Performance and battery</h4>
-
-<ul>
- <li>System and app performance is known to be <strong>periodically slow /
- janky</strong>, and device may become occasionally unresponsive. These
- problems may become more acute with prolonged use.
- </li>
-</ul>
-
-<h4>Google accounts</h4>
-
-<ul>
- <li>In some circumstances, there can be issues with
- <code>AccountManagerService</code> that prevent logging in to Google accounts
- </li>
-</ul>
-
-<h4>System update</h4>
-
-<ul>
- <li>Device may restart immediately after updating to DP2.
- </li>
-</ul>
-
-<h4>Accessibility</h4>
-
-<ul>
- <li>Problem with listening to text-to-speech (TTS) output when pitch is set
- near maximum level.
- </li>
-</ul>
-
-<h4>Bluetooth</h4>
-
-<ul>
- <li>Bluetooth Low Energy (LE) GATT characteristics are using the wrong write
- type and will not be sent to a remote device. Thus, for example, some fitness
- devices will not work.
- </li>
-</ul>
-
-<h4>Setup wizard</h4>
-
-<ul>
- <li>The option to restore data on a new device (or newly reset device) from
- "Your Google Account" is not actionable in the setup wizard. You must restore
- data from an existing device by selecting "another Android device" in the
- setup wizard, or else set it up as a new device.
- </li>
-</ul>
-
-<h4>OEM unlock</h4>
-
-<ul>
- <li>On some devices, <strong>Enable OEM unlock</strong> is grayed out in
- "Developer Options" while running DP2.<br>
- <strong>Workaround:</strong> Opt in to
- the Android Beta Program (if you are not already opted in) by visiting
- <a href="https://www.google.com/android/beta" class=
- "external-link">www.google.com/android/beta</a>. Then, opt out and accept the
- downgrade OTA. Opting out causes the device to downgrade to Android 6.0. You
- should now be able to choose <strong>Enable OEM unlock</strong> in
- "Developer Options". Personal data is erased when you downgrade the
- device; however, unlocking the bootloader would have erased this data anyway.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Work Security Challenge
- <ul>
- <li>After migration to N, or after the user creates work profiles, work
- profiles can't create keys in the keystore until the user changes their
- pattern, PIN, or password, or sets up a Work Challenge.
- </li>
-
- <li>In Direct boot mode, applying the passcode restrictions to the device
- causes the work profile to be unlocked, even though the device is locked.
- This makes the work profile accessible even though it should be protected
- by the device lock screen.
- </li>
- </ul>
- </li>
-
- <li>Always On VPN
- <ul>
- <li>If Always On VPN mode is turned on, but VPN is not available, apps
- connect over the ordinary network. Apps should be offline if they have no
- VPN connection available.
- </li>
-
- <li>When Always On mode is on, a VPN connection is not established after
- a device reboots into Direct boot mode, even after the user unlocks the
- secure lock screen.
- </li>
- </ul>
- </li>
-
- <li>Suspend Packages
- <ul>
- <li>Device admins can suspend critical system packages, which may lead to
- unexpected behavior, such as placing calls despite the "Telephone
- disabled" dialog being displayed.
- </li>
- </ul>
- </li>
-
- <li>Other
- <ul>
- <li>The Settings app crashes on launch if {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} is set to true when
- the user inserts physical media such as an SD card.
- </li>
-
- <li>The first check-in in a Work Profile takes several minutes to
- complete.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4 id="vulkan">Vulkan</h4>
-
-<ul>
- <li>Nexus 5X/6P</li>
- <ul>
- <li>Gaps between binding numbers and non-zero
- as the first binding number causes {@code vkCreateGraphicsPipeline()} to fail.</li>
- <li>Vulkan exhibits incorrect sampling behavior on projected texture coordinates.</li>
- <li>in the multithreadCmdBuffer sample, {@code vkCmdClearColorImage()} crashes when
- running with the N-DP2 driver.</li>
- <li>Return values from {@code vkGetPhysicalDeviceFormatProperties()} do not set a value
- for {@code VkFormatProperties::linearTilingFeatures}, which takes a value of 0 as
- a result.</li>
- <li>Vulkan floating point frame buffer attachments are not handled correctly.</li>
- </ul>
- <li>Nexus Player</li>
- <ul>
- <li>SPIR-V shaders may trigger driver asserts.</li>
- <li>Some pipeline configurations may cause {@code vkCreateGraphicsPipeline()}
- to crash.</li>
- </ul>
-</ul>
-
-<h4>Device-specific issues</h4>
-
-<dl>
- <dt>
- <strong>Android One</strong>
- </dt>
-
- <dd>
- Data connection fails when device is switched from slot 1 to slot 2 SIM.
- </dd>
-
- <dt>
- <strong>Pixel C</strong>
- </dt>
-
- <dd>
- Unable to toggle Voice Search "Always On" option.
- </dd>
-
- <dt>
- <strong>Nexus 6</strong>
- </dt>
-
- <dd>
- Camera pictures in portrait orientation are corrupted, except for HDR+
- photos.
- </dd>
-
- <dt>
- <strong>Nexus Player</strong>
- </dt>
-
- <dd>
- Playback of Netflix HD content may fail on Nexus Player.
- </dd>
-
- <dd>
- Any application that relies on dynamic video resolution changes may fail on
- Nexus Player.
- </dd>
-
- <dd>
- Any application that use the VP9 video codec may fail on Nexus Player.
- </dd>
-</dl>
-
-<!-- DP 1 release notes archive -->
-
-<h2 id="dp1">Developer Preview 1</h2>
-
-<div class="wrap">
- <div class="cols">
- <div class="col-6of12">
- <p>
- <em>Date: March 2016<br>
- Builds: NPC56P, NPC56R, updated: NPC56W, NPC56X<br>
- Emulator support: x86 & ARM (32/64-bit)<br>
- Google Play services: 8.4</em>
- </p>
- </div>
- </div>
-</div>
-
-<h3 id="dp1-general">General advisories</h3>
-
-<p>
- This Developer Preview release is for app developers only and is designed for
- use in compatibility testing and early development only. Please be aware of
- these general notes about the release:
-</p>
-<ul>
- <li>This release has various stability and performance issues on all devices
- that make it <em>not suitable for daily use on phone or tablet</em>,
- especially for non-developers.
- </li>
-
- <li>System and app performance is known to be <strong>periodically slow /
- janky</strong>, and device may become occasionally unresponsive. These
- problems may become more acute with prolonged use.
- </li>
-
- <li>Battery life may be regressed in this release for screen-on and
- screen-off use cases.
- </li>
-
- <li>Some apps may not function normally on Developer Preview 1. This includes
- Google’s apps as well as other apps.
- </li>
-
- <li>This early build is not Compatibility Test Suite (CTS) approved. Apps
- that depend on CTS approved builds (Android Pay for example) won’t work.
- </li>
-
- <li>This preview release supports the following devices: Nexus 5X, Nexus 6,
- Nexus 6P, Nexus 9, Nexus Player, and Pixel C, as well as General Mobile 4G
- (Android One).
- </li>
-</ul>
-
-<h3 id="dp1-platform">Platform Issues</h3>
-
-<h4>Performance and battery</h4>
-
-<ul>
- <li>System and app performance is known to be <strong>periodically slow /
- janky</strong>, and device may become occasionally unresponsive. These
- problems may become more acute with prolonged use.
- </li>
-
- <li>Battery life may be regressed in this release for screen-on and
- screen-off use cases.
- </li>
-</ul>
-<h4 id="dialer">Dialer</h4>
-
-<ul>
- <li>Dialer app does not support Direct boot. This will be addressed later in
- N Developer Preview.
- </li>
-
- <li>Voicemail playback does not work.
- </li>
-</ul>
-
-<h4>Microphone</h4>
-
-<ul>
- <li>The system may incorrect persists the microphone mute state across apps and reboots. If you mute the microphone in an app and the state is persisted, open any app that has microphone mute controls and unmute the microphone.</li>
-</ul>
-
-<h4 id="ui">System UI</h4>
-
-<ul>
- <li>Some new or modified strings in the system UI are not translated to all
- languages.
- </li>
-
- <li>Overview UI is still in development, and subject to change. For example,
- we intend to remove the timer that appears when the user switches between
- apps.
- </li>
-
- <li>Settings controls and toggles may be slow or appear to be unresponsive.
- </li>
-
- <li>Visual design of notifications is subject to change.
- </li>
-
- <li>In the Gmail app, direct archiving of emails included in a notification
- bundle does not work properly.
- </li>
-</ul>
-
-<h4>Android for Work</h4>
-
-<ul>
- <li>Work Security Challenge
- <ul>
- <li>After migration to N, or after the user creates work profiles, work
- profiles can't create keys in the keystore until the user changes their
- pattern, PIN, or password, or sets up a Work Challenge.
- </li>
-
- <li>In Direct boot mode, applying the passcode restrictions to the device
- causes the work profile to be unlocked, even though the device is locked.
- This makes the work profile accessible even though it should be protected
- by the device lock screen.
- </li>
-
- <li>When the user enters a wrong password and pin, the system does not
- display any informational message; instead, it only clears the input
- field. This issue does not affect pattern or fingerprint input.
- </li>
-
- <li>On a tablet, the background displayed with the work challenge is
- disproportionately small.
- </li>
-
- <li>The version of <a href=
- "https://play.google.com/store/apps/details?id=com.google.android.apps.enterprise.dmagent">
- Google Apps Device Policy</a> that is bundled with N Developer Preview
- does not yet support the Work Profile Security Challenge feature.
- Developers should instead use <a href=
- "https://github.com/googlesamples/android-testdpc/releases">TestDPC</a>
- to test this feature.
- </li>
- </ul>
- </li>
-
- <li>Always On VPN
- <ul>
- <li>If Always On VPN mode is turned on, but VPN is not available, apps
- not specified as exceptions to the Always On policy connect over the
- ordinary network. Unless specified as exceptions to Always On VPN policy,
- apps should be offline if they have no VPN connection available.
- <ul>
- <li>When Always On mode is on, a VPN connection is not established
- after a device reboots into Direct boot mode, even after the user
- unlocks the secure lock screen.
- </li>
- </ul>
- </li>
- </ul>
- </li>
-
- <li>Improved Contacts
- <ul>
- <li>Bluetooth PBAP/MAP devices do not display Caller ID for work
- contacts. The next release of Preview resolves this issue.
- </li>
- </ul>
- </li>
-
- <li>Work Mode
- <ul>
- <li>The Google Now Launcher does not display whether Work Mode is on or
- off. The Launcher also does not show app suspension state.
- </li>
-
- <li>After the user turns Work Mode off and on, the system no longer shows
- Work profile app widgets, such as Calendar.
- </li>
- </ul>
- </li>
-
- <li>Suspend Packages
- </li>
-
- <li>Device admins can suspend critical system packages, which may lead to
- unexpected behavior, such as placing calls despite the Telephone disabled
- dialog’s being displayed.
- </li>
-
- <li>Other
- <ul>
- <li>The Settings app crashes on launch if {@link
- android.os.UserManager#DISALLOW_MOUNT_PHYSICAL_MEDIA} is set to true when
- the user inserts physical media such as an SD card.
- </li>
-
- <li>The {@code DPM.setPackagesSuspended} state does not persist when the
- user uninstalls and then reinstalls an app. Either the app should remain
- suspended after uninstall/reinstall, or suspended apps should not be
- uninstallable
- </li>
-
- <li>The first check-in in a Work Profile takes several minutes to
- complete. This may cause the device to take longer than normal to be
- visible in the Play EMM API.
- </li>
-
- <li>Notifications from Work Profile apps are not visible to notification
- listeners installed in the personal profile. As a result, the system does
- not display Notifications as expected.
- </li>
-
- </ul>
- </li>
-</ul>
-
-<h4 >Keyboard</h4>
-
-<ul>
- <li>Bluetooth pairing between keyboards and Android devices may be unstable.
- </li>
-</ul>
-
-<h4 >Video</h4>
-
-<ul>
-<li>Video playback may lag and show interruptions.</li>
-</ul>
-
-<h4>Wi-Fi</h4>
-
-<ul>
- <li>Wi-Fi has undergone some refactoring which may change API corner case
- behavior. Specifically, applications which attempt to connect to specific
- networks, or attempt to reconnect to networks should retest.
- </li>
-
- <li>The legacy DHCP client has been removed from the platform. The only DHCP
- client that the platform supports is the DHCP client introduced in M.
- </li>
-</ul>
-
-<h4>Direct boot</h4>
-
-<ul>
- <li>NFC doesn't function until first unlock.
- <ul>
- <li>When a phone with Bluetooth enabled is restarted, Bluetooth does not
- turn on automatically. You must manually re-enable Bluetooth.
- </li>
-
- <li>Under some circumstances, the default ringtone may not sound for
- phone calls and messages. This behavior is fixed in the next N Preview
- release, with one exception (and workaround):
- </li>
-
- <li>On a device that is not freshly wiped--one that has been booted at
- least once since being set to direct boot mode--the default notification
- ringtone does not sound. The user can work around this issue by manually
- selecting a ringtone from Settings.
- </li>
-
- <li>Direct boot is not enabled by default on devices running an N
- Developer Preview build. To enable direct boot for testing and
- development, go to Developer Options and tap Convert to File Encryption.
- In this dev preview, this requires a factory reset to repartition and
- reformat your device for File-based Encryption.
- </li>
- </ul>
- </li>
-</ul>
-
-<h4>Picture-in-picture for Android TV</h4>
-
-<ul>
- <li>The PIP integration in the Recents UI is not finalized, and is subject to
- change.
- <ul>
- <li>The animation of the PIP window is not smooth. Future releases of the
- Preview will improve this.
- </li>
- </ul>
- </li>
-
- <li style="list-style: none">Future releases of the Preview will improve upon
- the visual design and layout alignment of PIP.
- </li>
-</ul>
-
-<h4>Bug reports</h4>
-
-<ul>
- <li>Bug reports do not always complete successfully (as a workaround,
- sometimes they can still be accessed through the bug report document provider
- in internal storage).
- </li>
-</ul>
-
-<h4>Split-screen Multi-window</h4>
-
-<ul>
- <li>Apps may experience crashes and unexpected UI behavior when put into
- split-screen mode. These are app issues that must be fixed by the app
- developer.
- </li>
-
- <li>When an app targets a version of the Android platform earlier than N, the
- App may not work with split-screen toast may appear multiple times.
- </li>
-
- <li>Long-pressing the Overview button while using an app with a fixed
- orientation may produce unexpected app behavior.
- </li>
-
- <li>Apps may flicker while resizing.
- </li>
-
- <li>Animations are not yet final.
- </li>
-</ul>
-
-<h4>Input method</h4>
-
-<ul>
- <li>Google Keyboard unexpectedly falls back to the generic Google keyboard
- when <b>Use system language</b>, but Google Keyboard doesn’t support any of
- the languages selected in the system-language preferences. It should fall
- back to American English.
- <p>
- You can work around this problem by adding at least one language that
- Google Keyboard supports.
- </p>
- </li>
-</ul>
-
-<h4>Accessibility</h4>
-
-<ul>
- <li>TalkBack exhibits issues with features including Notifications, Quick
- Settings Tiles and Multi-window display that may cause system crashing or
- lack of spoken feedback from TalkBack. Future releases of the preview will
- address these issues.
- </li>
-</ul>
-
-<h3 id="dp1-device-sp">Device-Specific Notes and Issues</h3>
-
-<h4>Nexus Player</h4>
-<ul>
- <li>Video playback, app compatibility and stability issues are expected on
- Nexus Player in this release of the Preview.
- </li>
-</ul>
-
-<h4>Pixel C</h4>
-<ul>
-<li>Multi-window resizing may cause crashing.</li>
-</ul>
-
-<h4>Nexus 9</h4>
-<ul>
-<li>Nexus 9 devices may not start after receiving an over-the-air (OTA) update
- via the Android Beta Program. To recover from this issue, you can try
- to manually install the OTA image. For more information, see
- <a href="{@docRoot}preview/download-ota.html">Applying a Device OTA Image</a>.
-</li>
-</ul>
-
diff --git a/docs/html/reference/_project.yaml b/docs/html/reference/_project.yaml
new file mode 100644
index 0000000..e5c26e7
--- /dev/null
+++ b/docs/html/reference/_project.yaml
@@ -0,0 +1,6 @@
+name: "Reference"
+home_url: /reference/
+description: "API Reference packages and classes."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/samples/_project.yaml b/docs/html/samples/_project.yaml
new file mode 100644
index 0000000..ede5958
--- /dev/null
+++ b/docs/html/samples/_project.yaml
@@ -0,0 +1,6 @@
+name: "Samples"
+home_url: /samples/
+description: "Welcome to code samples where you can browse sample code and learn how to build different components for your applications."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd
index 5885086..240a54c 100644
--- a/docs/html/samples/index.jd
+++ b/docs/html/samples/index.jd
@@ -35,7 +35,7 @@
from GitHub as a new project.
</p>
-<p>To view the Android code samples that you can import, see the
+<p>To view the Android code samples that you can import, see the
<a class="external-link" href="https://github.com/googlesamples/">Google Samples page</a> on GitHub.</p>
<h2>Download Samples</h2>
@@ -69,6 +69,6 @@
<p class="note">
<strong>Note:</strong> At this time, the downloadable projects are designed for use with Gradle
- and Android Studio.
+ and Android Studio.
</p>
diff --git a/docs/html/sdk/OLD_RELEASENOTES.jd b/docs/html/sdk/OLD_RELEASENOTES.jd
index b7fd12f..dfbeaeb 100644
--- a/docs/html/sdk/OLD_RELEASENOTES.jd
+++ b/docs/html/sdk/OLD_RELEASENOTES.jd
@@ -14,7 +14,7 @@
<a name="0.9_r1" id="0.9_r1"></a>
<h2>Android 0.9 SDK Beta (r1)</h2>
-<p>This beta SDK release contains a large number of bug fixes and improvements from the early-look SDKs.
+<p>This beta SDK release contains a large number of bug fixes and improvements from the early-look SDKs.
The sections below describe the highlights of the release.
<h3>New Features and Notable Changes</h3>
@@ -109,7 +109,7 @@
</ul>
<p>Known issues/limitations for Graphical Layout Editor include:</p>
-
+
<ul>
<li>Font display is very close but not equals to on-device rendering since the font engine in Java slightly differs from the font engine in Android. This should not have any impact on your layouts.
</li>
@@ -123,7 +123,7 @@
</li>
<li>No support for WebView, MapView and SurfaceView.
</li>
- <li>No UI support for <merge>, <include>, <ViewStub> elements. You can add these elements to your manifest using the xml editor only.
+ <li>No UI support for <merge>, <include>, <ViewStub> elements. You can add these elements to your manifest using the xml editor only.
</li>
<li>If a layout fails to render in a way that prevents the whole editor from opening, you can:
@@ -221,7 +221,7 @@
</li>
<li>The DDMS utility has been refactored into library form. This is not of direct interest to application developers, but may be of interest to vendors interested in integrating the Android SDK into their products. Watch for more information about the ddmlib library soon.
</li>
- <li>For performance and maintainability reasons, some APIs were moved into separate modules that must be explicitly included in the application via a directive in AndroidManifest.xml. Notable APIs that fall into this category are the MapView, and the java.awt.* classes, which each now reside in separate modules that must be imported. Developers who overlook this requirement will see ClassNotFoundExceptions that seem spurious.
+ <li>For performance and maintainability reasons, some APIs were moved into separate modules that must be explicitly included in the application via a directive in AndroidManifest.xml. Notable APIs that fall into this category are the MapView, and the java.awt.* classes, which each now reside in separate modules that must be imported. Developers who overlook this requirement will see ClassNotFoundExceptions that seem spurious.
</li>
<li>Developers who use 'adb push' to install applications must now use 'adb install', since the full package manager is now implemented. 'adb push' will no longer work to install .apk files.
</li>
@@ -386,14 +386,14 @@
<h4>Emulator Console</h4>
<ul>
-<li>Now provides support for emulating inbound SMS messages. The ADT plugin and DDMS provide integrated access to
-this capability. For more information about how to emulate inbound SMS from the console,
+<li>Now provides support for emulating inbound SMS messages. The ADT plugin and DDMS provide integrated access to
+this capability. For more information about how to emulate inbound SMS from the console,
see <a href="{@docRoot}tools/help/emulator.html#sms">SMS Emulation</a>. </li>
</ul>
<h4>Emulator</h4>
-<ul><li>The default emulator skin has been changed to HVGA-P from QVGA-L. For information
-about emulator skins and how to load a specific skin when starting the emulator, see
+<ul><li>The default emulator skin has been changed to HVGA-P from QVGA-L. For information
+about emulator skins and how to load a specific skin when starting the emulator, see
<a href="{@docRoot}tools/help/emulator.html#skins">Using Emulator Skins</a>.</li>
</ul>
diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd
index 8f124a5..d9df406 100644
--- a/docs/html/sdk/RELEASENOTES.jd
+++ b/docs/html/sdk/RELEASENOTES.jd
@@ -64,13 +64,13 @@
<li>Emulator support for multiple screen sizes/densities, including new
skins. </li>
<li>Android SDK and AVD Manager, a graphical UI to let you manage your
-SDK and AVD environments more easily. The tool lets you create and manage
+SDK and AVD environments more easily. The tool lets you create and manage
your <a href="{@docRoot}tools/devices/managing-avds.html">Android Virtual
-Devices</a> and download new SDK packages (such as platform versions and
+Devices</a> and download new SDK packages (such as platform versions and
add-ons) into your environment.</li>
<li>Improved support for test packages in New Project Wizard</li>
- <li>The reference documentation now offers a "Filter by API Level"
-capability that lets you display only the parts of the API that are actually
+ <li>The reference documentation now offers a "Filter by API Level"
+capability that lets you display only the parts of the API that are actually
available to your application, based on the <code>android:minSdkVersion</code>
value the application declares in its manifest. For more information, see
<a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">Android API Levels</a></li>
@@ -114,7 +114,7 @@
<h3>Android SDK and AVD Manager</h3>
-<p>The SDK offers a new tool called Android SDK and AVD Manager that lets you
+<p>The SDK offers a new tool called Android SDK and AVD Manager that lets you
manage your SDK and AVD environments more efficiently. </p>
<p>Using the tool, you can quickly check what Android platforms, add-ons,
@@ -129,15 +129,15 @@
<p>The tool also lets you quickly create new AVDs, manage
their properties, and run a target AVD from a single window. </p>
-<p>If you are developing in Eclipse with ADT, you can access the Android SDK
+<p>If you are developing in Eclipse with ADT, you can access the Android SDK
and AVD Manager from the <strong>Window</strong> menu. </p>
-<p>If you are developing in another IDE, you can access the Android SDK and
+<p>If you are developing in another IDE, you can access the Android SDK and
AVD Manager through the <code>android</code> command-line tool, located in the
<sdk>/tools directory. You can launch the tool with a graphical UI by
using the <code>android</code> command without specifying any options. You can
also simply double-click the android.bat (Windows) or android (OS X/Linux) file.
-You can still use <code>android</code> commands to create and manage AVDs,
+You can still use <code>android</code> commands to create and manage AVDs,
including AVDs with custom hardware configurations.</p>
<h3>Integration with zipalign</h3>
@@ -160,9 +160,9 @@
<li>If you are developing in Eclipse with ADT, support for
<code>zipalign</code> is integrated into the Export Wizard. When you use the
Wizard to export a signed application package, ADT signs and then automatically
-runs <code>zipalign</code> against the exported package. If you use the Wizard
-to export an unsigned application package, then it will not zipalign the
-package because zipalign must be performed only after the APK has been signed.
+runs <code>zipalign</code> against the exported package. If you use the Wizard
+to export an unsigned application package, then it will not zipalign the
+package because zipalign must be performed only after the APK has been signed.
You must manually sign and zipalign the package after export. </li>
<li>If you are developing using Ant and are compiling in release mode, the
build tools will automatically sign and then <code>zipalign</code> the
@@ -182,14 +182,14 @@
<h3>Support for Test Packages in New Project Wizard</h3>
<p>The New Project Wizard available in the ADT 0.9.3 now lets you add a test
-package containing Instrumentation or other classes of tests while you are
+package containing Instrumentation or other classes of tests while you are
creating or importing a new Android application project. </p>
<h3>New USB Driver for Windows</h3>
<p>If you are using Windows and want to develop or test your application on an
Android-powered device (such as the T-Mobile G1), you need an appropriate USB
-driver.
+driver.
<p>The Windows version of the Android 1.6 SDK includes a new, WinUSB-based
driver that you can install. The driver is compatible with both 32- and 64-bit
@@ -241,19 +241,19 @@
<h2 id="1.5_r3">Android 1.5 SDK, Release 3</h2>
<p>Provides an updated Android 1.5 system image that includes permissions
-fixes, as described below, and a new application — an IME for Japanese
-text input. Also provides the same set of developer tools included in the
+fixes, as described below, and a new application — an IME for Japanese
+text input. Also provides the same set of developer tools included in the
previous SDK, but with bug fixes and several new features.</p>
<h3>Permissions Fixes</h3>
-<p>The latest version of the Android platform, deployable to
+<p>The latest version of the Android platform, deployable to
Android-powered devices, includes fixes to the permissions-checking
in certain areas of the framework. Specifically, the Android system
now properly checks and enforces several existing permissions where it
-did not do so in the previous release. Because of these changes in
-enforcement, you are strongly encouraged to test your application
-against the new Android 1.5 system image included in this SDK, to ensure
+did not do so in the previous release. Because of these changes in
+enforcement, you are strongly encouraged to test your application
+against the new Android 1.5 system image included in this SDK, to ensure
that it functions normally. </p>
<p>In particular, if your application uses any of the system areas listed below,
@@ -292,14 +292,14 @@
href="http://code.google.com/android/add-ons/google-apis">http://code.google.com/android/add-ons/google-apis</a> </p></li>
<li>The SDK add-on architecture now lets device manufacturers specify a USB
-Vendor ID in their add-ons.
+Vendor ID in their add-ons.
<li>The <code>android</code> tool provides a new command that scans SDK add-ons
for their USB Vendor IDs and makes them available to adb (OS X and Linux
versions of the SDK only). The command is <code>android update adb</code>. On
Windows versions of the SDK, a custom USB driver is included that supports the
"Google" and "HTC" Vendor IDs, which allow adb to recognize G1 and HTC
-Magic devices. For other devices, contact the device manufacturer
-to obtain a USB driver, especially if you have an SDK add-on that defines
+Magic devices. For other devices, contact the device manufacturer
+to obtain a USB driver, especially if you have an SDK add-on that defines
a new USB Vendor ID.</li>
<li>The telephony, sensor, and geo fix issues in the emulator are now
fixed.</li>
@@ -329,12 +329,12 @@
<ul>
<li>Multiple versions of the Android platform are included (Android 1.1,
Android 1.5). The tools are updated to let you deploy your application
-on any platform in the SDK, which helps you ensure forward-compatibility and,
+on any platform in the SDK, which helps you ensure forward-compatibility and,
if applicable, backward-compatibility.</li>
<li>Introduces <a href="{@docRoot}tools/devices/managing-avds.html">Android
Virtual Devices</a> — (AVD) configurations of options that you
run in the emulator to better model actual devices. Each AVD gets its
-own dedicated storage area, making it much easier to work with multiple emulators
+own dedicated storage area, making it much easier to work with multiple emulators
that are running concurrently.</li>
<li>Support for SDK add-ons, which extend the
Android SDK to give you access to one or more external Android libraries and/or
@@ -383,13 +383,13 @@
includes an external library, a system image, as well as custom emulator skins
and system properties. The add-on differs in that the Android platform it
provides may include customized UI, resources, or behaviors, a different set of
-preinstalled applications, or other similar modifications.
+preinstalled applications, or other similar modifications.
<p>The SDK includes a single SDK add-on — the Google APIs add-on. The
Google APIs add-on gives your application access to the com.google.android.maps
-external library that is included on many (if not most) Android-powered devices.
+external library that is included on many (if not most) Android-powered devices.
The Google APIs add-on also includes a {@link android.location.Geocoder Geocoder}
-backend service implementation. For more information, see the "Maps External
+backend service implementation. For more information, see the "Maps External
Library" section below. </p>
<h3>Android Virtual Devices (AVDs)</h3>
@@ -401,7 +401,7 @@
<li>Targets that represent core Android platform versions. </li>
<li>Targets that are SDK add-ons, which typically provide application access to
one or more external libraries and/or a customized (but compliant) system image
-that can run in the emulator.
+that can run in the emulator.
</ul>
<p>A new tool called "android" lets you discover what targets and AVDs are
@@ -427,7 +427,7 @@
<p>For your convenience, the Google APIs add-on is included in the SDK. </p>
-<p>For information about how to register for a Maps API Key, see
+<p>For information about how to register for a Maps API Key, see
<a href="http://code.google.com/android/add-ons/google-apis/mapkey.html">
Obtaining a Maps API Key</a>.</p>
@@ -566,8 +566,8 @@
for authentication to the server.</p>
<p>Developers should note that the registration service for MapView is now
-active and Google Maps is actively enforcing the Maps API Key requirement.
-For information about how to register for a Maps API Key, see
+active and Google Maps is actively enforcing the Maps API Key requirement.
+For information about how to register for a Maps API Key, see
<a href="http://code.google.com/android/add-ons/google-apis/mapkey.html">
Obtaining a Maps API Key</a>.</p>
@@ -615,21 +615,21 @@
<li>In some cases, you may encounter problems when using the browser on an
emulator started with the command-line option <code>-http-proxy</code>. </li>
<li>On the OSX platform, if you manually remove the ~/.android directory
-using <code>rm -rf ~/.android</code>, then try to run
-the emulator, it crashes. This happens because the emulator fails to create
+using <code>rm -rf ~/.android</code>, then try to run
+the emulator, it crashes. This happens because the emulator fails to create
a new .android directory before attempting to create the child SDK1.0 directory.
To work around this issue, manually create a new .android directory using
-<code>mkdir ~/.android</code>, then run the emulator. The emulator
+<code>mkdir ~/.android</code>, then run the emulator. The emulator
creates the SDK1.0 directory and starts normally. </li>
-<li>We regret to inform developers that Android 1.1 will not include support
+<li>We regret to inform developers that Android 1.1 will not include support
for ARCNet network interfaces.</li>
<li>The final set of Intent patterns honored by Android 1.0 has not yet been
fully documented. Documentation will be provided in future releases.</li>
<li>In ADT Editor, you can add at most ten new resource values at a time,
-in a given res/values/*.xml, using the form in the Android Resources pane.
+in a given res/values/*.xml, using the form in the Android Resources pane.
If you add more than ten, the Android Resources pane will not display the
-attributes fields for the additional resource entries. To work around this
-problem, you can close the file in the editor and open it again, or you
+attributes fields for the additional resource entries. To work around this
+problem, you can close the file in the editor and open it again, or you
can edit the resource entries in the XML text mode. </li>
<li>The emulator's battery-control commands (<code>power <option></code>)
are not working in this release.</li>
@@ -657,7 +657,7 @@
<p><strong>T-Mobile G1 Compatibility</strong></p>
-<p>This version of the SDK has been tested for compatibility with the first
+<p>This version of the SDK has been tested for compatibility with the first
Android-powered mobile device, the T-Mobile
G1. </p>
@@ -679,7 +679,7 @@
Android-powered device (such as the T-Mobile G1), you need an appropriate USB
driver. For your convenience, the Windows version of the Android SDK includes a
USB driver that you can install, to let you develop on the device. The USB
-driver files are located in the <code><SDK>/usb_driver</code> directory.
+driver files are located in the <code><SDK>/usb_driver</code> directory.
</p>
@@ -694,23 +694,23 @@
still access the platform's styleable attributes from your resources or code. To
do so, declare a custom resource element using a
<code><declare-styleable></code> in your project's res/values/R.attrs
-file, then declare the attribute inside. For examples, see
+file, then declare the attribute inside. For examples, see
<sdk>/samples/ApiDemos/res/values/attrs.xml. For more information about
custom resources, see <a
href="{@docRoot}guide/topics/resources/available-resources.html#customresources">Custom
Layout Resources</a>. Note that the android.R.styleable documentation is still
provided in the SDK, but only as a reference of the platform's styleable
attributes for the various elements.</li>
-<li>The VM now properly ensures that private classes are not
+<li>The VM now properly ensures that private classes are not
available to applications through reflection. If you were using reflection
-to access private classes in a previous release, you will now get a run-time
+to access private classes in a previous release, you will now get a run-time
error. </li>
<li>The Settings and Email applications are now included in the SDK and
available in the emulator.</li>
-<li>We regret to inform developers that SDK 1.0_r2 does not support MFM, RLL,
+<li>We regret to inform developers that SDK 1.0_r2 does not support MFM, RLL,
or Winchester hard disk drives.</li>
-<li>In the emulator, the control key for enabling/disabling trackball mode
+<li>In the emulator, the control key for enabling/disabling trackball mode
is changed from Control-T to F6. You can also enter trackball mode temporarily
using the Delete key. While the key is pressed, you can send trackball events.</li>
</ul>
@@ -783,19 +783,19 @@
<li>We regret to inform developers that Android 1.0 will not include support for
dot-matrix printers.</li>
<li>On the OSX platform, if you manually remove the ~/.android directory
-using <code>rm -rf ~/.android</code>, then try to run
-the emulator, it crashes. This happens because the emulator fails to create
+using <code>rm -rf ~/.android</code>, then try to run
+the emulator, it crashes. This happens because the emulator fails to create
a new .android directory before attempting to create the child SDK1.0 directory.
To work around this issue, manually create a new .android directory using
-<code>mkdir ~/.android</code>, then run the emulator. The emulator
+<code>mkdir ~/.android</code>, then run the emulator. The emulator
creates the SDK1.0 directory and starts normally. </li>
<li>The final set of Intent patterns honored by Android 1.0 has not yet been
fully documented. Documentation will be provided in future releases.</li>
<li>In ADT Editor, you can add at most ten new resource values at a time,
-in a given res/values/*.xml, using the form in the Android Resources pane.
+in a given res/values/*.xml, using the form in the Android Resources pane.
If you add more than ten, the Android Resources pane will not display the
-attributes fields for the additional resource entries. To work around this
-problem, you can close the file in the editor and open it again, or you
+attributes fields for the additional resource entries. To work around this
+problem, you can close the file in the editor and open it again, or you
can edit the resource entries in the XML text mode. </li>
<li>The emulator's battery-control commands (<code>power <option></code>)
are not working in this release.</li>
diff --git a/docs/html/sdk/older_releases.jd b/docs/html/sdk/older_releases.jd
index bb64feb..c4ed594 100644
--- a/docs/html/sdk/older_releases.jd
+++ b/docs/html/sdk/older_releases.jd
@@ -74,7 +74,7 @@
<td>238224860 bytes</td>
<td>b4bf0e610ff6db2fb6fb09c49cba1e79</td>
</tr>
-
+
</table>
@@ -119,7 +119,7 @@
<td>178117561 bytes</td>
<td>350d0211678ced38da926b8c9ffa4fac</td>
</tr>
-
+
</table>
@@ -167,7 +167,7 @@
<td>79345522 bytes</td>
<td>ebcb16b0cd4aef198b4dd9a1418efbf1</td>
</tr>
-
+
</table>
@@ -215,7 +215,7 @@
<td>94186463 bytes</td>
<td>a1f3b6d854596f850f5008856d0f380e</td>
</tr>
-
+
</table>
@@ -268,7 +268,7 @@
<td>165035130 bytes</td>
<td>1d3c3d099e95a31c43a7b3e6ae307ed3</td>
</tr>
-
+
</table>
@@ -313,7 +313,7 @@
<td>162938845 bytes</td>
<td>2addfd315da0ad8b5bde6b09d5ff3b06</td>
</tr>
-
+
</table>
@@ -358,7 +358,7 @@
<td>87.8 MB bytes</td>
<td>2660b4029039b7d714e59827e9a9a11d</td>
</tr>
-
+
</table>
diff --git a/docs/html/sdk/sdk_vars.cs b/docs/html/sdk/sdk_vars.cs
index 80da297..af13043 100644
--- a/docs/html/sdk/sdk_vars.cs
+++ b/docs/html/sdk/sdk_vars.cs
@@ -1,22 +1,22 @@
<?cs
-set:ndk.mac64_download='android-ndk-r12-darwin-x86_64.zip' ?><?cs
-set:ndk.mac64_bytes='734014148' ?><?cs
-set:ndk.mac64_checksum='708d4025142924f7097a9f44edf0a35965706737' ?><?cs
+set:ndk.mac64_download='android-ndk-r12b-darwin-x86_64.zip' ?><?cs
+set:ndk.mac64_bytes='734135279' ?><?cs
+set:ndk.mac64_checksum='e257fe12f8947be9f79c10c3fffe87fb9406118a' ?><?cs
-set:ndk.linux64_download='android-ndk-r12-linux-x86_64.zip' ?><?cs
-set:ndk.linux64_bytes='755431993' ?><?cs
-set:ndk.linux64_checksum='b7e02dc733692447366a2002ad17e87714528b39' ?><?cs
+set:ndk.linux64_download='android-ndk-r12b-linux-x86_64.zip' ?><?cs
+set:ndk.linux64_bytes='755551010' ?><?cs
+set:ndk.linux64_checksum='170a119bfa0f0ce5dc932405eaa3a7cc61b27694' ?><?cs
-set:ndk.win64_download='android-ndk-r12-windows-x86.zip' ?><?cs
-set:ndk.win64_bytes='706332762' ?><?cs
-set:ndk.win64_checksum='37fcd7acf6012d0068a57c1524edf24b0fef69c9' ?><?cs
+set:ndk.win32_download='android-ndk-r12b-windows-x86.zip' ?><?cs
+set:ndk.win32_bytes='706453972' ?><?cs
+set:ndk.win32_checksum='8e6eef0091dac2f3c7a1ecbb7070d4fa22212c04' ?><?cs
-set:ndk.win32_download='android-ndk-r12-windows-x86_64.zip' ?><?cs
-set:ndk.win32_bytes='749444245' ?><?cs
-set:ndk.win32_checksum='80d64a77aab52df867ac55cec1e976663dd3326f'
+set:ndk.win64_download='android-ndk-r12b-windows-x86_64.zip' ?><?cs
+set:ndk.win64_bytes='749567353' ?><?cs
+set:ndk.win64_checksum='337746d8579a1c65e8a69bf9cbdc9849bcacf7f5'
?>
<?cs
def:size_in_mb(bytes)
?><?cs set:mb = bytes / 1024 / 1024
?><?cs var:mb ?><?cs
-/def ?>
+/def ?>
\ No newline at end of file
diff --git a/docs/html/topic/instant-apps/_project.yaml b/docs/html/topic/instant-apps/_project.yaml
new file mode 100644
index 0000000..e6b8cd9
--- /dev/null
+++ b/docs/html/topic/instant-apps/_project.yaml
@@ -0,0 +1,6 @@
+name: "Android Instant Apps"
+home_url: /topic/instant-apps/
+description: "An evolution in app sharing and discovery, Android Instant Apps enables Android apps to run instantly, without requiring installation."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/topic/instant-apps/faqs.jd b/docs/html/topic/instant-apps/faqs.jd
index bf37241..f69a4da 100644
--- a/docs/html/topic/instant-apps/faqs.jd
+++ b/docs/html/topic/instant-apps/faqs.jd
@@ -46,10 +46,7 @@
<strong>How do permissions work in Android Instant Apps?</strong>
<br/>
Android Instant Apps uses the runtime permissions model introduced in
- Android 6.0.
- If an app supports the permission model introduced in Android 6.0
- (API level 23), it does not require any additional work to become an Instant
- App that runs on older devices.
+ Android 6.0 (API level 23).
</p>
<p>
diff --git a/docs/html/topic/instant-apps/index.jd b/docs/html/topic/instant-apps/index.jd
index e2da9c5..8980982 100644
--- a/docs/html/topic/instant-apps/index.jd
+++ b/docs/html/topic/instant-apps/index.jd
@@ -81,7 +81,7 @@
Get people to your flagship Android experience from links that would
otherwise open your mobile web page — like
search, social media, messaging, and other deep links — without them
- needing to stop and install your app first.
+ needing to install your app first.
</p>
<div class="cols" style="margin-top:1em;">
diff --git a/docs/html/topic/libraries/_project.yaml b/docs/html/topic/libraries/_project.yaml
new file mode 100644
index 0000000..cdf59e5
--- /dev/null
+++ b/docs/html/topic/libraries/_project.yaml
@@ -0,0 +1,6 @@
+name: "Android Libraries"
+home_url: /topic/libraries/
+description: "This section describes several useful Android libraries that are not included with the Android Framework."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/topic/libraries/data-binding/index.jd b/docs/html/topic/libraries/data-binding/index.jd
index 293de51..454bb59 100644
--- a/docs/html/topic/libraries/data-binding/index.jd
+++ b/docs/html/topic/libraries/data-binding/index.jd
@@ -246,21 +246,21 @@
</pre>
<p>
Expressions within the layout are written in the attribute properties using
- the “<code>&commat;{}</code>” syntax. Here, the TextView’s text is set to
+ the "<code>@{}</code>" syntax. Here, the TextView's text is set to
the firstName property of user:
</p>
<pre>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="&commat;{user.firstName}"/>
+ android:text="@{user.firstName}"/>
</pre>
<h3 id="data_object">
Data Object
</h3>
<p>
- Let’s assume for now that you have a plain-old Java object (POJO) for User:
+ Let's assume for now that you have a plain-old Java object (POJO) for User:
</p>
<pre>
@@ -296,8 +296,8 @@
</pre>
<p>
From the perspective of data binding, these two classes are equivalent. The
- expression <strong><code>&commat;{user.firstName}</code></strong> used
- for the TextView’s <strong><code>android:text</code></strong> attribute will
+ expression <strong><code>@{user.firstName}</code></strong> used
+ for the TextView's <strong><code>android:text</code></strong> attribute will
access the <strong><code>firstName</code></strong> field in the former class
and the <code>getFirstName()</code> method in the latter class.
Alternatively, it will also be resolved to <code>firstName()</code> if that
@@ -310,10 +310,10 @@
<p>
By default, a Binding class will be generated based on the name of the layout
- file, converting it to Pascal case and suffixing “Binding” to it. The above
+ file, converting it to Pascal case and suffixing "Binding" to it. The above
layout file was <code>main_activity.xml</code> so the generate class was
<code>MainActivityBinding</code>. This class holds all the bindings from the
- layout properties (e.g. the <code>user</code> variable) to the layout’s Views
+ layout properties (e.g. the <code>user</code> variable) to the layout's Views
and knows how to assign values for the binding expressions.The easiest means
for creating the bindings is to do it while inflating:
</p>
@@ -328,7 +328,7 @@
}
</pre>
<p>
- You’re done! Run the application and you’ll see Test User in the UI.
+ You're done! Run the application and you'll see Test User in the UI.
Alternatively, you can get the view via:
</p>
@@ -434,15 +434,15 @@
</pre>
Then you can bind the click event to your class as follows:
<pre>
- <?xml version="1.0" encoding="utf-8"?>
- <layout xmlns:android="http://schemas.android.com/apk/res/android">
+ <?xml version="1.0" encoding="utf-8"?>
+ <layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
- <variable name="task" type="com.android.example.Task" />
- <variable name="presenter" type="com.android.example.Presenter" />
+ <variable name="task" type="com.android.example.Task" />
+ <variable name="presenter" type="com.android.example.Presenter" />
</data>
- <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent">
- <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:onClick="@{() -> presenter.onSaveClick(task)}" />
+ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent">
+ <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:onClick="@{() -> presenter.onSaveClick(task)}" />
</LinearLayout>
</layout>
</pre>
@@ -465,7 +465,7 @@
above could be written as:
</p>
<pre>
- android:onClick="@{(view) -> presenter.onSaveClick(task)}"
+ android:onClick="@{(view) -> presenter.onSaveClick(task)}"
</pre>
Or if you wanted to use the parameter in the expression, it could work as follows:
<pre>
@@ -474,7 +474,7 @@
}
</pre>
<pre>
- android:onClick="@{(theView) -> presenter.onSaveClick(theView, task)}"
+ android:onClick="@{(theView) -> presenter.onSaveClick(theView, task)}"
</pre>
You can use a lambda expression with more than one parameter:
<pre>
@@ -483,8 +483,8 @@
}
</pre>
<pre>
- <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:onCheckedChanged="@{(cb, isChecked) -> presenter.completeChanged(task, isChecked)}" />
+ <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:onCheckedChanged="@{(cb, isChecked) -> presenter.completeChanged(task, isChecked)}" />
</pre>
<p>
If the event you are listening to returns a value whose type is not {@code
@@ -498,7 +498,7 @@
}
</pre>
<pre>
- android:onLongClick="@{(theView) -> presenter.onLongClick(theView, task)}"
+ android:onLongClick="@{(theView) -> presenter.onLongClick(theView, task)}"
</pre>
<p>
If the expression cannot be evaluated due to {@code null} objects, Data Binding returns
@@ -510,13 +510,13 @@
{@code void} as a symbol.
</p>
<pre>
- android:onClick="@{(v) -> v.isVisible() ? doSomething() : void}"
+ android:onClick="@{(v) -> v.isVisible() ? doSomething() : void}"
</pre>
<h5>Avoid Complex Listeners</h5>
Listener expressions are very powerful and can make your code very easy to read.
-On the other hand, listeners containing complex expressions make your layouts hard to read and unmaintainable.
-These expressions should be as simple as passing available data from your UI to your callback method. You should implement
+On the other hand, listeners containing complex expressions make your layouts hard to read and unmaintainable.
+These expressions should be as simple as passing available data from your UI to your callback method. You should implement
any business logic inside the callback method that you invoked from the listener expression.
<p>
@@ -580,7 +580,7 @@
</pre>
<p>
When there are class name conflicts, one of the classes may be renamed to an
- “alias:”
+ "alias:"
</p>
<pre>
@@ -601,7 +601,7 @@
<import type="com.example.User"/>
<import type="java.util.List"/>
<variable name="user" type="User"/>
- <variable name="userList" type="List&lt;User>"/>
+ <variable name="userList" type="List<User>"/>
</data>
</pre>
<p class="caution">
@@ -695,7 +695,7 @@
<p>
By default, a Binding class is generated based on the name of the layout
file, starting it with upper-case, removing underscores ( _ ) and
- capitalizing the following letter and then suffixing “Binding”. This class
+ capitalizing the following letter and then suffixing "Binding". This class
will be placed in a databinding package under the module package. For
example, the layout file <code>contact_item.xml</code> will generate
<code>ContactItemBinding</code>. If the module package is
@@ -718,7 +718,7 @@
This generates the binding class as <code>ContactItem</code> in the
databinding package in the module package. If the class should be generated
in a different package within the module package, it may be prefixed with
- “.”:
+ ".":
</p>
<pre>
@@ -741,7 +741,7 @@
</h3>
<p>
- Variables may be passed into an included layout's binding from the
+ Variables may be passed into an included layout's binding from the
containing layout by using the application namespace and the variable name in
an attribute:
</p>
@@ -855,8 +855,8 @@
<pre>
android:text="@{String.valueOf(index + 1)}"
-android:visibility="@{age &lt; 13 ? View.GONE : View.VISIBLE}"
-android:transitionName='@{"image_" + id}'
+android:visibility="@{age < 13 ? View.GONE : View.VISIBLE}"
+android:transitionName='@{"image_" + id}'
</pre>
<h4 id="missing_operations">
Missing Operations
@@ -945,9 +945,9 @@
<import type="android.util.SparseArray"/>
<import type="java.util.Map"/>
<import type="java.util.List"/>
- <variable name="list" type="List&lt;String>"/>
- <variable name="sparse" type="SparseArray&lt;String>"/>
- <variable name="map" type="Map&lt;String, String>"/>
+ <variable name="list" type="List<String>"/>
+ <variable name="sparse" type="SparseArray<String>"/>
+ <variable name="map" type="Map<String, String>"/>
<variable name="index" type="int"/>
<variable name="key" type="String"/>
</data>
@@ -969,17 +969,17 @@
</p>
<pre>
-android:text='@{map["firstName"]}'
+android:text='@{map["firstName"]}'
</pre>
<p>
It is also possible to use double quotes to surround the attribute value.
- When doing so, String literals should either use the &quot; or back quote
+ When doing so, String literals should either use the ' or back quote
(`).
</p>
<pre>
android:text="@{map[`firstName`}"
-android:text="@{map[&quot;firstName&quot;]}"
+android:text="@{map['firstName']}"
</pre>
<h4 id="resources">
Resources
@@ -1216,7 +1216,7 @@
}
</pre>
<p>
- That's it! To access the value, use the set and get accessor methods:
+ That's it! To access the value, use the set and get accessor methods:
</p>
<pre>
@@ -1247,15 +1247,15 @@
<pre>
<data>
<import type="android.databinding.ObservableMap"/>
- <variable name="user" type="ObservableMap&lt;String, Object>"/>
+ <variable name="user" type="ObservableMap<String, Object>"/>
</data>
…
<TextView
- android:text='@{user["lastName"]}'
+ android:text='@{user["lastName"]}'
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
- android:text='@{String.valueOf(1 + (Integer)user["age"])}'
+ android:text='@{String.valueOf(1 + (Integer)user["age"])}'
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</pre>
@@ -1277,15 +1277,15 @@
<data>
<import type="android.databinding.ObservableList"/>
<import type="com.example.my.app.Fields"/>
- <variable name="user" type="ObservableList&lt;Object>"/>
+ <variable name="user" type="ObservableList<Object>"/>
</data>
…
<TextView
- android:text='@{user[Fields.LAST_NAME]}'
+ android:text='@{user[Fields.LAST_NAME]}'
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
- android:text='@{String.valueOf(1 + (Integer)user[Fields.AGE])}'
+ android:text='@{String.valueOf(1 + (Integer)user[Fields.AGE])}'
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</pre>
@@ -1428,7 +1428,7 @@
<p>
When inflating another layout, a binding must be established for the new
- layout. Therefore, the <code>ViewStubProxy</code> must listen to the <code>ViewStub</code>'s
+ layout. Therefore, the <code>ViewStubProxy</code> must listen to the <code>ViewStub</code>'s
{@link android.view.ViewStub.OnInflateListener} and establish the binding at that time. Since
only one can exist, the <code>ViewStubProxy</code> allows the developer to set an
<code>OnInflateListener</code> on it that it will call after establishing the binding.
@@ -1443,9 +1443,9 @@
</h4>
<p>
- At times, the specific binding class won't be known. For example, a
+ At times, the specific binding class won't be known. For example, a
{@link android.support.v7.widget.RecyclerView.Adapter} operating against arbitrary layouts
- won't know the specific binding class. It still must assign the binding value during the
+ won't know the specific binding class. It still must assign the binding value during the
{@link android.support.v7.widget.RecyclerView.Adapter#onBindViewHolder}.
</p>
@@ -1499,13 +1499,13 @@
For an attribute, data binding tries to find the method setAttribute. The
namespace for the attribute does not matter, only the attribute name itself.
<p>
- For example, an expression associated with TextView's attribute
+ For example, an expression associated with TextView's attribute
<strong><code>android:text</code></strong> will look for a setText(String).
If the expression returns an int, data binding will search for a setText(int)
method. Be careful to have the expression return the correct type, casting if
necessary. Note that data binding will work even if no attribute exists with
the given name. You can then easily "create" attributes for any setter by
- using data binding. For example, support DrawerLayout doesn't have any
+ using data binding. For example, support DrawerLayout doesn't have any
attributes, but plenty of setters. You can use the automatic setters to use
one of these.
</p>
@@ -1522,7 +1522,7 @@
</h3>
<p>
- Some attributes have setters that don't match by name. For these
+ Some attributes have setters that don't match by name. For these
methods, an attribute may be associated with the setter through
{@link android.databinding.BindingMethods} annotation. This must be associated with
a class and contains {@link android.databinding.BindingMethod} annotations, one for
@@ -1591,8 +1591,8 @@
}
</pre>
<pre>
-<ImageView app:imageUrl=“@{venue.imageUrl}”
-app:error=“@{@drawable/venueError}”/>
+<ImageView app:imageUrl="@{venue.imageUrl}"
+app:error="@{@drawable/venueError}"/>
</pre>
<p>
@@ -1747,7 +1747,7 @@
<pre>
<TextView
- android:text='@{userMap["lastName"]}'
+ android:text='@{userMap["lastName"]}'
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</pre>
diff --git a/docs/html/topic/libraries/support-library/features.jd b/docs/html/topic/libraries/support-library/features.jd
index 584bef8..0f63bf6 100755
--- a/docs/html/topic/libraries/support-library/features.jd
+++ b/docs/html/topic/libraries/support-library/features.jd
@@ -141,19 +141,13 @@
API reference.
</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v4/} directory. The library does not contain user
-interface resources. To include it in your application project, follow the instructions for
-<a href="{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
-resources</a>.</p>
-
<p class="caution"><strong>Caution:</strong> Using dynamic dependencies, especially for higher version
numbers, can cause unexpected version updates and regression incompatibilities.</p>
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:support-v4:23.3.0
+com.android.support:support-v4:24.1.1
</pre>
@@ -168,15 +162,6 @@
</p>
<p>
- After you download the Android Support Libraries, this library is located in the
- {@code <sdk>/extras/android/support/multidex/} directory. The library does not contain
- user interface resources. To include it in your application project, follow the instructions
- for
- <a href= "{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
- resources</a>.
-</p>
-
-<p>
The Gradle build script dependency identifier for this library is as follows:
</p>
@@ -228,16 +213,10 @@
</li>
</ul>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v7/appcompat/} directory. The library contains user
-interface resources. To include it in your application project, follow the instructions for
-<a href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries with
-resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:appcompat-v7:23.3.0
+com.android.support:appcompat-v7:24.1.1
</pre>
@@ -249,16 +228,10 @@
on any app. These cards are useful for material design
implementations, and are used extensively in layouts for TV apps.</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v7/cardview/} directory. The library contains user interface
-resources. To include it in your application project, follow the instructions
-for <a href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding
-libraries with resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:cardview-v7:23.3.0
+com.android.support:cardview-v7:24.1.1
</pre>
@@ -271,16 +244,10 @@
For detailed information about the v7 gridlayout library APIs, see the
{@link android.support.v7.widget android.support.v7.widget} package in the API reference.</p>
-<p>This library is located in the {@code <sdk>/extras/android/support/v7/gridlayout/}
- directory . The library contains user
- interface resources. To include it in your application project, follow the instructions for
- <a href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries with
- resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:gridlayout-v7:23.3.0
+com.android.support:gridlayout-v7:24.1.1
</pre>
@@ -300,21 +267,10 @@
{@link android.support.v7.media android.support.v7.media} package in the API
reference.</p>
-<p>The v7 mediarouter library is located in the
-<code><sdk>/extras/android/support/v7/mediarouter/</code> directory after
-you download the Android Support Library. It's provided as a library project
-with a dependency on the v7 appcompat library, so you'll need to include both
-libraries in your build path when setting up your project. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>.</p>
-
-<p>The Gradle builder script dependency identifier is as follows:
-<code>com.android.support:support-v7-mediarouter:<revision></code>,
-where "<revision>" is the minimum revision at which the library is available. For example:</p>
+<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:mediarouter-v7:23.3.0
+com.android.support:mediarouter-v7:24.1.1
</pre>
<p class="caution">The v7 mediarouter library APIs introduced in Support Library
@@ -331,16 +287,10 @@
from an album cover, and use those colors to build a color-coordinated song
title card.</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v7/palette/} directory. The library does not contain
-user interface resources. To include it in your application project, follow the instructions for
-<a href="{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
-resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:palette-v7:23.3.0
+com.android.support:palette-v7:24.1.1
</pre>
@@ -353,16 +303,10 @@
widget, a view for efficiently displaying large data sets by providing a
limited window of data items.</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v7/recyclerview/} directory. The library contains
-user interface resources. To include it in your application project, follow the instructions
-for <a href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding
-libraries with resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:recyclerview-v7:23.3.0
+com.android.support:recyclerview-v7:24.1.1
</pre>
@@ -382,25 +326,12 @@
{@link android.support.v7.preference.ListPreference}. </p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v7/preference} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:preference-v7:23.3.0
+com.android.support:preference-v7:24.1.1
</pre>
-
-
-
-
-
-
-
<h2 id="v8">v8 Support Library</h2>
<p>This library is designed to be used with Android 2.2 (API level 8) and higher.
@@ -446,16 +377,10 @@
android.support.v13} package in the API reference.
</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v13/} directory. The library does not contain user
-interface resources. To include it in your application project, follow the instructions for
-<a href="{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
-resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:support-v13:23.3.0
+com.android.support:support-v13:24.1.1
</pre>
@@ -478,16 +403,10 @@
package in the API reference.
</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v14/} directory. The library does not contain user
-interface resources. To include it in your application project, follow the instructions for
-<a href="{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
-resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:preference-v14:23.3.0
+com.android.support:preference-v14:24.1.1
</pre>
@@ -507,16 +426,10 @@
package in the API reference.
</p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v17/} directory. The library does not contain user
-interface resources. To include it in your application project, follow the instructions for
-<a href="{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
-resources</a>.</p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:preference-leanback-v17:23.3.0
+com.android.support:preference-leanback-v17:24.1.1
</pre>
@@ -549,16 +462,10 @@
into a {@link android.support.v17.leanback.app.RowsFragment}.</li>
</ul>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/v17/leanback} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:leanback-v17:23.3.0
+com.android.support:leanback-v17:24.1.1
</pre>
@@ -570,16 +477,10 @@
<p></p>
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/annotations} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:support-annotations:23.3.0
+com.android.support:support-annotations:24.1.1
</pre>
@@ -594,17 +495,10 @@
app developers to build upon, such as navigation drawers, floating action buttons (<i>FAB</i>),
snackbars, and <a href="{@docRoot}design/building-blocks/tabs.html">tabs</a>. </p>
-
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/design} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:design:23.3.0
+com.android.support:design:24.1.1
</pre>
@@ -622,17 +516,10 @@
<a href="{@docRoot}reference/android/support/customtabs/CustomTabsCallback.html">Custom Tabs
Callback</a>. </p>
-
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/customtabs} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:customtabs:23.3.0
+com.android.support:customtabs:24.1.1
</pre>
@@ -653,17 +540,10 @@
<a href="{@docRoot}reference/android/support/percent/PercentRelativeLayout.html">
PercentRelativeLayout</a>. </p>
-
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/percent} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:percent:23.3.0
+com.android.support:percent:24.1.1
</pre>
@@ -683,15 +563,8 @@
<a href="{@docRoot}reference/android/support/app/recommendation/RecommendationExtender.html">
RecommendationExtender</a>. </p>
-
-<p>After you download the Android Support Libraries, this library is located in the
-{@code <sdk>/extras/android/support/recommendation} directory. For more information
-on how to set up your project, follow the instructions in <a
-href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
-with resources</a>. </p>
-
<p>The Gradle build script dependency identifier for this library is as follows:</p>
<pre>
-com.android.support:recommendation:23.3.0
+com.android.support:recommendation:24.1.1
</pre>
diff --git a/docs/html/topic/libraries/support-library/revisions.jd b/docs/html/topic/libraries/support-library/revisions.jd
index 47d2ac1..3b25fb0 100644
--- a/docs/html/topic/libraries/support-library/revisions.jd
+++ b/docs/html/topic/libraries/support-library/revisions.jd
@@ -6,9 +6,154 @@
<p>This page provides details about the Support Library package releases.</p>
<div class="toggle-content opened">
- <p id="rev24-0-0">
+ <p id="rev24-1-1">
<a href="#" onclick="return toggleContent(this)"><img src=
"{@docRoot}assets/images/styles/disclosure_up.png" class=
+ "toggle-content-img" alt="">Android Support Library, revision 24.1.1</a>
+ <em>(July 2016)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <p>Fixed issues:</p>
+
+ <ul>
+ <li>Fixes an issue in the 24.1.0 release which affected resource IDs
+ shared between support libraries. This issue caused apps that depended on
+ support libraries with resources (such as design and appcompat) to
+ encounter issues caused by resource ID mismatches.
+ </li>
+ </ul>
+
+ </div>
+</div>
+
+<!-- end of collapsible section: 24.1.1 -->
+
+<div class="toggle-content closed">
+ <p id="rev24-1-0">
+ <a href="#" onclick="return toggleContent(this)"><img src=
+ "{@docRoot}assets/images/styles/disclosure_down.png" class=
+ "toggle-content-img" alt="">Android Support Library, revision 24.1.0</a>
+ <em>(July 2016)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+ <dl>
+ <dt>
+ Changes for <a href=
+ "{@docRoot}tools/support-library/features.html#v4">v4 Support
+ Library</a>:
+ </dt>
+
+ <dd>
+ <ul>
+ <li>{@link android.support.v4.app.NotificationCompat.Action.WearableExtender}
+ has new <code>getHintDisplayActionInline()</code> and
+ <code>setHintDisplayActionInline()</code> methods for compatibility with
+ <a href="{@docRoot}wear/preview/index.html">Android Wear 2.0 Preview</a>.
+ These methods allow an application to specify that an action should be
+ displayed inline with the notification.
+ </li>
+
+ <li>Calling {@link android.support.v4.app.Fragment#setUserVisibleHint
+ Fragment.setUserVisbileHint()} will no longer cause a fragment to become
+ <strong>started</strong> if the hint has been added to a {@link
+ android.support.v4.app.FragmentTransaction} that is not yet committed. This
+ affects users of {@link android.support.v4.app.FragmentPagerAdapter} that
+ override {@link android.support.v4.app.Fragment#setUserVisibleHint
+ setUserVisbileHint()} and assume a specific lifecycle state of the fragment
+ after calling <code>super.setUserVisibleHint()</code>. For more information,
+ see the reference page for docs for {@link
+ android.support.v4.app.Fragment#setUserVisibleHint
+ Fragment.setUserVisbileHint()}.
+ </li>
+ </ul>
+
+ </dl>
+ <p>Fixed issues:</p>
+
+ <ul>
+ <li>TabLayout.setCustomView(null) results in NullPointerException
+ (<a href="https://code.google.com/p/android/issues/detail?id=214753">AOSP
+ issue</a>)
+ </li>
+
+ <li>TabLayout incorrectly highlights custom tabs (<a href=
+ "https://code.google.com/p/android/issues/detail?id=214316">AOSP issue 214316</a>)
+ </li>
+
+ <li>AppCompatTextHelper uses incorrectly sorted attribute array (<a href=
+ "https://code.google.com/p/android/issues/detail?id=214366">AOSP issue 214366</a>)
+ </li>
+
+ <li>Unable to reference VectorDrawable from drawable container XML when using
+ custom ContextWrapper (<a href=
+ "https://code.google.com/p/android/issues/detail?id=214055">AOSP issue 214055</a>)
+ </li>
+
+ <li>ViewDragHelper.saveLastMotion() throws ArrayIndexOutOfBoundsException
+ (<a href="https://code.google.com/p/android/issues/detail?id=212945">AOSP
+ issue 212945</a>)
+ </li>
+
+ <li>BottomSheetBehavior expands to old content height when using
+ setState(STATE_EXPANDED) (<a href=
+ "https://code.google.com/p/android/issues/detail?id=213660">AOSP issue
+ 213660</a>)
+ </li>
+
+ <li>CollapsingToolbarLayout doesn’t handle pinnable children with top or
+ bottom margins (<a href=
+ "https://code.google.com/p/android/issues/detail?id=213001">AOSP issue
+ 213001</a>)
+ </li>
+
+ <li>Leanback browse title does not support RTL alignment (<a href=
+ "https://code.google.com/p/android/issues/detail?id=213461">AOSP issue
+ 213461</a>)
+ </li>
+
+ <li>PagerTabStrip disappears due to missing inherited annotation (<a href=
+ "https://code.google.com/p/android/issues/detail?id=213359">AOSP issue
+ 213359</a>)
+ </li>
+
+ <li>Data binding throws NullPointerException when using Boolean to set
+ conditional flags (<a href=
+ "https://code.google.com/p/android/issues/detail?id=191841">AOSP issue
+ 191841</a>)
+ </li>
+
+ <li>CoordinatorLayout does not respond to setFitsSystemWindows() (<a href=
+ "https://code.google.com/p/android/issues/detail?id=212720">AOSP issue
+ 212720</a>)
+ </li>
+
+ <li>BottomSheetBehavior crashes when setting initial state (<a href=
+ "https://code.google.com/p/android/issues/detail?id=203114">AOSP issue
+ 203114</a>)
+ </li>
+
+ <li>ViewPager skips pages if the page index is a large value (<a href=
+ "https://code.google.com/p/android/issues/detail?id=211734">AOSP issue
+ 211734</a>)
+ </li>
+
+ <li>BottomSheetBehavior does not work with dynamic layouts (<a href=
+ "https://code.google.com/p/android/issues/detail?id=205226">AOSP issue
+ 205226</a>)
+ </li>
+ </ul>
+ </div>
+</div>
+
+<!-- end of collapsible section: 24.1.0 -->
+
+<div class="toggle-content closed">
+ <p id="rev24-0-0">
+ <a href="#" onclick="return toggleContent(this)"><img src=
+ "{@docRoot}assets/images/styles/disclosure_down.png" class=
"toggle-content-img" alt="">Android Support Library, revision 24.0.0</a>
<em>(June 2016)</em>
</p>
@@ -120,7 +265,7 @@
<div class="toggle-content closed">
<p id="rev23-4-0">
<a href="#" onclick="return toggleContent(this)"><img src=
- "{@docRoot}assets/images/styles/disclosure_up.png" class=
+ "{@docRoot}assets/images/styles/disclosure_down.png" class=
"toggle-content-img" alt="">Android Support Library, revision 23.4.0</a>
<em>(May 2016)</em>
</p>
@@ -815,7 +960,7 @@
<li style="list-style: none; display: inline">
<ul>
<li>Day and night themes can be found here: {@code
- <sdk>/extras/android/support/v7/appcompat/res/values/themes_daynight.xml}
+ <sdk>/extras/android/support/v7/appcompat/res/values/themes_daynight.xml}
</li>
<li>{@code AppCompatDelegate.setDefaultNightMode()}: sets the
@@ -2661,7 +2806,7 @@
<a href="{@docRoot}design/index.html">Android Design</a> guidelines for navigation. These
additions include a way to implement the action bar's <em>Up</em> button across versions.
For an example implementation of this pattern, see the AppNavigation sample in
-({@code <em><sdk></em>/samples/<em><platform></em>/AppNavigation}).</li>
+({@code <em><sdk></em>/samples/<em><platform></em>/AppNavigation}).</li>
<li>Added {@link android.support.v4.app.NotificationCompat.Builder} to provide a
compatibility implementation of Android 3.0's {@link android.app.Notification.Builder} helper class
for creating standardized system notifications.</li>
diff --git a/docs/html/topic/libraries/support-library/setup.jd b/docs/html/topic/libraries/support-library/setup.jd
index 62f7148..0cb9389 100755
--- a/docs/html/topic/libraries/support-library/setup.jd
+++ b/docs/html/topic/libraries/support-library/setup.jd
@@ -10,18 +10,12 @@
<ol>
<li><a href="#download">Downloading the Support Library</a></li>
<li><a href="#choosing">Choosing Support Libraries</a></li>
- <li><a href="#add-library">Adding Support Libraries</a>
- <ol>
- <li><a href="#libs-without-res">Adding libraries without resources</a></li>
- <li><a href="#libs-with-res">Adding libraries with resources</a></li>
- </ol>
- </li>
+ <li><a href="#add-library">Adding Support Libraries</a></li>
<li><a href="#using-apis">Using Support Library APIs</a>
<ol>
<li><a href="#manifest">Manifest Declaration Changes</a></li>
</ol>
</li>
- <li><a href="#samples">Code Samples</a></li>
</ol>
<h2>See also</h2>
@@ -45,8 +39,8 @@
<h2 id="download">Downloading the Support Libraries</h2>
-<p>The Android Support Library package is provided as a supplemental download to the Android SDK
- and is available through the Android
+<p>The Android Support Repository package is provided as a supplemental download
+ to the Android SDK and is available through the Android
<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>. Follow the
instructions below to obtain the Support Library files.
</p>
@@ -57,22 +51,18 @@
<li>Start the Android <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li>
<li>In the SDK Manager window, scroll to the end of the <em>Packages</em> list,
find the <em>Extras</em> folder and, if necessary, expand to show its contents.</li>
- <li>Select the <strong>Android Support Library</strong> item.
- <p class="note">
- <strong>Note:</strong> If you're developing with Android Studio, select and install the
- <strong>Android Support Repository</strong> item instead.
- </p>
- </li>
+ <li>Select the <strong>Android Support Repository</strong> item.</li>
<li>Click the <strong>Install packages...</strong> button.</li>
</ol>
<img src="{@docRoot}images/tools/sdk-manager-support-libs.png" width="525" alt="" />
-<p class="img-caption"><strong>Figure 1.</strong> The Android SDK Manager with the
-Android Support Library selected.</p>
+<p class="img-caption"><strong>Figure 1.</strong> The Android SDK Manager with
+Android Support Repository selected.</p>
<p>After downloading, the tool installs the Support Library files to your existing Android SDK
directory. The library files are located in the following subdirectory of your SDK:
- {@code <sdk>/extras/android/support/} directory.</p>
+ <code><sdk>/extras/android/m2repository/com/android/support/</code>
+ directory.</p>
<h2 id="choosing">Choosing Support Libraries</h2>
@@ -89,20 +79,7 @@
classpath dependencies within your development environment. You must perform this procedure for
each Support Library you want to use.</p>
-<p>Some Support Libraries contain resources beyond compiled code classes, such as images or XML
- files. For example, the <a href="{@docRoot}tools/support-library/features.html#v7-appcompat">v7
- appcompat</a> and <a href="{@docRoot}tools/support-library/features.html#v7-gridlayout">v7
- gridlayout</a> libraries include resources.</p>
-
-<p>If you are not sure if a library contains resources, check the
- <a href="{@docRoot}tools/support-library/features.html">Support Library Features</a> page.
- The following sections describe how to add a Support Library with or without resources to your
- application project. </p>
-
-
-<h3 id="libs-without-res">Adding libraries without resources</h3>
-
-<p>To add a Support Library without resources to your application project:</p>
+<p>To add a Support Library to your application project:</p>
<ol>
<li>Make sure you have downloaded the <strong>Android Support Repository</strong>
@@ -113,37 +90,12 @@
<pre>
dependencies {
...
- <b>compile "com.android.support:support-v4:18.0.+"</b>
+ <b>compile "com.android.support:support-v4:24.1.1"</b>
}
</pre>
</li>
</ol>
-
-<h3 id="libs-with-res">Adding libraries with resources</h3>
-
-<p>To add a Support Library with resources (such as
- <a href="{@docRoot}tools/support-library/features.html#v7-appcompat">v7
- appcompat</a> for action bar) to your application project:</p>
-
- <ol>
- <li>Make sure you have downloaded the <strong>Android Support Repository</strong>
- using the <a href="#download">SDK Manager</a>.</li>
- <li>Open the {@code build.gradle} file for your application.</li>
- <li>Add the support library feature project identifier to the {@code dependencies} section.
- For example, to include the {@code appcompat} project add
- {@code compile "com.android.support:appcompat-v7:18.0.+"} to the dependencies section, as
- shown in the following example:
-<pre>
-dependencies {
- ...
- <b>compile "com.android.support:appcompat-v7:18.0.+"</b>
-}
-</pre>
- </li>
- </ol>
-
-
<h2 id="using-apis">Using Support Library APIs</h2>
<p>Support Library classes that provide support for existing framework APIs typically have the
@@ -224,18 +176,3 @@
<code>"4"</code>). The highest support library level you include in your application determines
the lowest API version in which it can operate.
</p>
-
-
-<h2 id="samples">Code Samples</h2>
-
-<p>Each Support Library includes code samples to help you get started using the support
-APIs. The code is included in the download from the SDK Manager and is placed inside the Android
-SDK installation directory, as listed below:</p>
-
-<ul>
- <li>4v Samples: {@code <sdk>/extras/android/support/samples/Support4Demos/}</li>
- <li>7v Samples: {@code <sdk>/extras/android/support/samples/Support7Demos/}</li>
- <li>13v Samples: {@code <sdk>/extras/android/support/samples/Support13Demos/}</li>
- <li>App Navigation: {@code <sdk>/extras/android/support/samples/SupportAppNavigation/}</li>
-</ul>
-
diff --git a/docs/html/topic/performance/_book.yaml b/docs/html/topic/performance/_book.yaml
new file mode 100644
index 0000000..e053a2c
--- /dev/null
+++ b/docs/html/topic/performance/_book.yaml
@@ -0,0 +1,34 @@
+toc:
+- title: Reducing Network Battery Drain
+ path: /topic/performance/power/network/index.html
+ path_attributes:
+ - name: description
+ value: Access the network while going easy on battery life.
+ section:
+ - title: Collecting Network Traffic Data
+ path: /topic/performance/power/network/gather-data.html
+ - title: Analyzing Network Traffic Data
+ path: /topic/performance/power/network/analyze-data.html
+ - title: Optimizing User-Initiated Network Use
+ path: /topic/performance/power/network/action-user-traffic.html
+ - title: Optimizing Server-Initiated Network Use
+ path: /topic/performance/power/network/action-server-traffic.html
+ - title: Optimizing General Network Use
+ path: /topic/performance/power/network/action-any-traffic.html
+- title: Implementing Doze
+ path: /training/monitoring-device-state/doze-standby.html
+ path_attributes:
+ - name: description
+ value: Help ensure the device isn't depleting the battery when not in use.
+- title: Launch-Time Performance
+ path: /topic/performance/launch-time.html
+- title: Better Performance through Threading
+ path: /topic/performance/threads.html
+- title: Optimizing View Hierarchies
+ path: /topic/performance/optimizing-view-hierarchies.html
+- title: Background Optimization
+ path: /topic/performance/background-optimization.html
+- title: Intelligent Job-Scheduling
+ path: /topic/performance/scheduling.html
+- title: Reducing APK Size
+ path: /topic/performance/reduce-apk-size.html
diff --git a/docs/html/topic/performance/_project.yaml b/docs/html/topic/performance/_project.yaml
new file mode 100644
index 0000000..d4202a9
--- /dev/null
+++ b/docs/html/topic/performance/_project.yaml
@@ -0,0 +1,6 @@
+name: "Performance"
+home_url: /topic/performance/
+description: "Improve your app's performance by learning how to optimize power consumption, launch times, and other important areas of performance."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/preview/features/background-optimization.jd b/docs/html/topic/performance/background-optimization.jd
similarity index 100%
rename from docs/html/preview/features/background-optimization.jd
rename to docs/html/topic/performance/background-optimization.jd
diff --git a/docs/html/topic/performance/images/cold-launch.png b/docs/html/topic/performance/images/cold-launch.png
new file mode 100644
index 0000000..2935ece
--- /dev/null
+++ b/docs/html/topic/performance/images/cold-launch.png
Binary files differ
diff --git a/docs/html/topic/performance/images/displayed-logcat.png b/docs/html/topic/performance/images/displayed-logcat.png
new file mode 100644
index 0000000..7dee884
--- /dev/null
+++ b/docs/html/topic/performance/images/displayed-logcat.png
Binary files differ
diff --git a/docs/html/topic/performance/images/lint-display.png b/docs/html/topic/performance/images/lint-display.png
new file mode 100644
index 0000000..e360938
--- /dev/null
+++ b/docs/html/topic/performance/images/lint-display.png
Binary files differ
diff --git a/docs/html/topic/performance/images/lint-inspect-code.png b/docs/html/topic/performance/images/lint-inspect-code.png
new file mode 100644
index 0000000..41604a1
--- /dev/null
+++ b/docs/html/topic/performance/images/lint-inspect-code.png
Binary files differ
diff --git a/docs/html/topic/performance/index.jd b/docs/html/topic/performance/index.jd
new file mode 100644
index 0000000..e08db15
--- /dev/null
+++ b/docs/html/topic/performance/index.jd
@@ -0,0 +1,39 @@
+page.title=Performance
+page.article=true
+page.metaDescription=Improve your app's performance by learning how to optimize power consumption, launch times, and other important areas of performance.
+
+meta.tags="performance"
+page.tags="performance"
+
+@jd:body
+
+<iframe width="448" height="252" src="//www.youtube.com/embed/qk5F6Bxqhr4?utm_source=dac&utm_medium=video&utm_content=andfuntrain&utm_campaign=udacint?rel=0&hd=1" frameborder="0" allowfullscreen style="float: right; margin: 0 0 20px 20px;"></iframe>
+
+<p>Implementing a cool idea is a great start toward an app that delights users,
+but it's just the beginning. The next step is maximizing your app's performance.
+For example, users want apps that:</p>
+
+<ul>
+ <li>Use power sparingly.</li>
+ <li>Start up quickly.</li>
+ <li>Respond quickly to user interaction.</li>
+</ul>
+
+<p>This section provides you with the know-how you need in order to make
+your apps not only cool, but also performant. Read on to discover how to
+develop apps that are power-thrifty, responsive, efficient, and well-behaved.</p>
+
+
+
+
+<section class="dac-section dac-small" id="latest-games"><div class="wrap">
+ <h2 class="norule" style="margin:0 0">More resources</h2>
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:develop/performance/landing"
+ data-sortOrder="random"
+ data-cardSizes="6x6"
+ data-maxResults="24"
+ data-items-per-page="24"
+ data-initial-results="3"></div>
+ </div>
+</section>
diff --git a/docs/html/topic/performance/launch-time.jd b/docs/html/topic/performance/launch-time.jd
new file mode 100644
index 0000000..84d5fab
--- /dev/null
+++ b/docs/html/topic/performance/launch-time.jd
@@ -0,0 +1,565 @@
+page.title=Launch-Time Performance
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#internals">Launch Internals</a>
+ <ol>
+ <li><a href="#cold">Cold start</a></li>
+ <li><a href="#warm">Warm start</a></li>
+ <li><a href="#lukewarm">Lukewarm start</a></li>
+ </ol>
+</li>
+<li><a href="#profiling">Profiling Launch Performance</a>
+ <ol>
+ <li><a href="#time-initial">Time to initial display</a></li>
+ <li><a href="#time-full">Time to full display</a></li>
+ </ol>
+</li>
+<li><a href="#common">Common Issues</a>
+ <ol>
+ <li><a href="#heavy-app">Heavy app initialization</a></li>
+ <li><a href="#heavy-act">Heavy activity initialization</a></li>
+ <li><a href="#themed">Themed launch screens</a></li>
+ </ol>
+ </li>
+</ol>
+</div>
+</div>
+
+<p>
+Users expect apps to be responsive and fast to load. An app with a slow startup
+time doesn’t meet this expectation, and can be disappointing to users. This
+sort of poor experience may cause a user to rate your app poorly on the Play
+store, or even abandon your app altogether.
+</p>
+
+<p>
+This document provides information to help you optimize your app’s launch time.
+It begins by explaining the internals of the launch process. Next, it discusses
+how to profile startup performance. Last, it describes some common startup-time
+issues, and gives some hints on how to address them.
+</p>
+
+<h2 id="internals">Launch Internals</h2>
+
+<p>
+App launch can take place in one of three states, each affecting how
+long it takes for your app to become visible to the user: cold start,
+warm start, and lukewarm start. In a cold start, your app starts from scratch.
+In the other states, the system needs to bring the app from the background to
+the foreground. We recommend that you always optimize based on an assumption of
+a cold start. Doing so can improve the performance of warm and lukewarm starts,
+as well.
+</p>
+
+<p>
+To optimize your app for fast startup, it’s useful to understand what’s
+happening at the system and app levels, and how they interact, in each of
+these states.
+</p>
+
+<h3 id="cold">Cold start</h3>
+
+<p>
+A cold start refers to an app’s starting from scratch: the system’s process
+has not, until this start, created the app’s process. Cold starts happen in
+cases such as your app’s being launched for the first time since the device
+booted, or since the system killed the app. This type of start presents the
+greatest challenge in terms of minimizing startup time, because the system
+and app have more work to do than in the other launch states.
+</p>
+
+<p>
+At the beginning of a cold start, the system has three tasks. These tasks are:
+</p>
+
+<ol style="1">
+ <li>Loading and launching the app.</li>
+ <li>Displaying a blank starting window for the app immediately after launch.
+ </li>
+ <li>Creating the app
+ <a href="{docRoot}guide/components/processes-and-threads.html#Processes">
+ process.</a></li>
+</ol>
+<br/>
+<p>
+As soon as the system creates the app process, the app process is responsible
+for the next stages. These stages are:
+</p>
+
+<ol style="1">
+ <li>Creating the app object.</li>
+ <li>Launching the main thread.</li>
+ <li>Creating the main activity.</li>
+ <li>Inflating views.</li>
+ <li>Laying out the screen.</li>
+ <li>Performing the initial draw.</li>
+</ol>
+
+<p>
+Once the app process has completed the first draw, the system process swaps
+out the currently displayed background window, replacing it with the main
+activity. At this point, the user can start using the app.
+</p>
+
+<p>
+Figure 1 shows how the system and app processes hand off work between each
+other.
+</p>
+<br/>
+
+ <img src="{@docRoot}topic/performance/images/cold-launch.png">
+ <p class="img-caption">
+ <strong>Figure 1.</strong> A visual representation of the important parts of
+ a cold application launch.
+ </p>
+
+<p>
+Performance issues can arise during creation of the app and
+creation of the activity.
+</p>
+
+<h4 id="app-creation">Application creation</h4>
+
+<p>
+When your application launches, the blank starting window remains on the screen
+until the system finishes drawing the app for the first time. At that point,
+the system process swaps out the starting window for your app, allowing the
+user to start interacting with the app.
+</p>
+
+<p>
+If you’ve overloaded {@link android.app.Application#onCreate() Application.oncreate()}
+in your own app, the app starts by calling this
+method on your app object. Afterwards, the app spawns the main thread, also
+known as the UI thread, and tasks it with creating your main activity.
+</p>
+
+<p>
+From this point, system- and app-level processes proceed in accordance with
+the <a href="{docRoot}guide/topics/processes/process-lifecycle.html">
+app lifecycle stages</a>.
+</p>
+
+<h4 id="act-creation">Activity creation</h4>
+
+<p>
+After the app process creates your activity, the activity performs the
+following operations:
+</p>
+
+<ol style="1">
+ <li>Initializes values.</li>
+ <li>Calls constructors.</li>
+ <li>Calls the callback method, such as
+ {@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()},
+ appropriate to the current lifecycle state of the activity.</li>
+</ol>
+
+<p>
+Typically, the
+{@link android.app.Activity#onCreate(android.os.Bundle) onCreate()}
+method has the greatest impact on load time, because it performs the work with
+the highest overhead: loading and inflating views, and initializing the objects
+needed for the activity to run.
+</p>
+
+<h3 id="warm">Warm start</h3>
+
+<p>
+A warm start of your application is much simpler and lower-overhead than a
+cold start. In a warm start, all the system does is bring your activity to
+the foreground. If all of your application’s activities are still resident in
+memory, then the app can avoid having to repeat object initialization, layout
+inflation, and rendering.
+</p>
+
+<p>
+However, if some memory has been purged in response to memory trimming
+events, such as
+{@link android.content.ComponentCallbacks2#onTrimMemory(int) onTrimMemory()},
+then those objects will need to be recreated in
+response to the warm start event.
+</p>
+
+<p>
+A warm start displays the same on-screen behavior as a cold start scenario:
+The system process displays a blank screen until the app has finished rendering
+the activity.
+</p>
+
+<h3 id="lukewarm">Lukewarm start</h3>
+
+<p>
+A lukewarm start encompasses some subset of the operations that
+take place during a cold start; at the same time, it represents less overhead
+than a warm start. There are many potential states that could be considered
+lukewarm starts. For instance:
+</p>
+
+<ul>
+ <li>The user backs out of your app, but then re-launches it. The process may
+ have continued to run, but the app must recreate the activity from scratch
+ via a call to
+ {@link android.app.Activity#onCreate(android.os.Bundle) onCreate()}.</li>
+
+ <li>The system evicts your app from memory, and then the user re-launches it.
+ The process and the Activity need to be restarted, but the task can
+ benefit somewhat from the saved instance state bundle passed into
+ {@link android.app.Activity#onCreate(android.os.Bundle) onCreate()}.</li>
+</ul>
+
+<h2 id="profiling">Profiling Launch Performance</h2>
+
+<p>
+In order to properly diagnose start time performance, you can track metrics
+that show how long it takes your application to start.
+</p>
+
+<h3 id="time-initial">Time to initial display</h3>
+
+<p>
+From Android 4.4 (API level 19), logcat includes an output line containing
+a value called {@code Displayed}. This value represents
+the amount of time elapsed between launching the process and finishing drawing
+the corresponding activity on the screen. The elapsed time encompasses the
+following sequence of events:
+</p>
+
+<ol style="1">
+ <li>Launch the process.</li>
+ <li>Initialize the objects.</li>
+ <li>Create and initialize the activity.</li>
+ <li>Inflate the layout.</li>
+ <li>Draw your application for the first time.</li>
+</ol>
+
+<p>
+The reported log line looks similar to the following example:
+</p>
+
+<pre class="no-pretty-print">
+ActivityManager: Displayed com.android.myexample/.StartupTiming: +3s534ms
+</pre>
+
+<p>
+If you’re tracking logcat output from the command line, or in a terminal,
+finding the elapsed time is straightforward. To find elapsed time in
+Android Studio, you must disable filters in your logcat view. Disabling the
+filters is necessary because the system server, not the app itself, serves
+this log.
+</p>
+
+<p>
+Once you’ve made the appropriate settings, you can easily search for the
+correct term to see the time. Figure 2 shows how to disable filters, and,
+in the second line of output from the bottom, an example of logcat output of
+the {@code Displayed} time.
+</p>
+<br/>
+
+ <img src="{@docRoot}topic/performance/images/displayed-logcat.png">
+ <p class="img-caption">
+ <strong>Figure 2.</strong> Disabling filters, and
+ finding the {@code Displayed} value in logcat.
+ </p>
+
+<p>
+The {@code Displayed} metric in the logcat output does not necessarily capture
+the amount of time until all resources are loaded and displayed: it leaves out
+resources that are not referenced in the layout file or that the app creates
+as part of object initialization. It excludes these resources because loading
+them is an inline process, and does not block the app’s initial display.
+</p>
+
+<h3 id="time-full">Time to full display</h3>
+
+<p>
+You can use the {@link android.app.Activity#reportFullyDrawn()} method to
+measure the elapsed time
+between application launch and complete display of all resources and view
+hierarchies. This can be valuable in cases where an app performs lazy loading.
+In lazy loading, an app does not block the initial drawing of the window, but
+instead asynchronously loads resources and updates the view hierarchy.
+</p>
+
+<p>
+If, due to lazy loading, an app’s initial display does not include all
+resources, you might consider the completed loading and display of all
+resources and views as a separate metric: For example, your UI might be
+fully loaded, with some text drawn, but not yet display images that the
+app must fetch from the network.
+</p>
+
+<p>
+To address this concern, you can manually call
+{@link android.app.Activity#reportFullyDrawn()}
+to let the system know that your activity is
+finished with its lazy loading. When you use this method, the value
+that logcat displays is the time elapsed
+since the creation of the application object, and the moment
+{@link android.app.Activity#reportFullyDrawn()} is called.
+</p>
+
+<p>
+If you learn that your display times are slower than you’d like, you can
+go on to try to identify the bottlenecks in the startup process.
+</p>
+
+<h4 id="bottlenecks">Identifying bottlenecks</h4>
+
+<p>
+Two good ways to look for bottlenecks are Android Studio’s Method Tracer tool
+and inline tracing. To learn about Method Tracer, see that tool’s
+<a href="{docRoot}studio/profile/am-methodtrace.html">documentation</a>.
+</p>
+
+<p>
+If you do not have access to the Method Tracer tool, or cannot start the tool
+at the correct time to gain log information, you can gain similar insight
+through inline tracing inside of your apps’ and activities’ {@code onCreate()}
+methods. To learn about inline tracing, see the reference documentation for
+the {@link android.os.Trace} functions, and for the
+<a href="{docRoot}studio/profile/systrace-commandline.html">Systrace</a> tool.
+</p>
+
+<h2 id="common">Common Issues</h2>
+
+<p>
+This section discusses several issues that often affect apps’ startup
+performance. These issues chiefly concern initializing app and activity
+objects, as well as the loading of screens.
+</p>
+
+<h3 id="heavy-app">Heavy app initialization</h3>
+
+<p>
+Launch performance can suffer when your code overrides the {@code Application}
+object, and executes heavy work or complex logic when initializing that object.
+Your app may waste time during startup if your Application subclasses perform
+initializations that don’t need to be done yet. Some initializations may be
+completely unnecessary: for example, initializing state information for the
+main activity, when the app has actually started up in response to an intent.
+With an intent, the app uses only a subset of the previously initialized state
+data.
+</p>
+
+<p>
+Other challenges during app initialization include garbage-collection events
+that are impactful or numerous, or disk I/O happening concurrently with
+initialization, further blocking the initialization process. Garbage collection
+is especially a consideration with the Dalvik runtime; the Art runtime performs
+garbage collection concurrently, minimizing that operation's impact.
+</p>
+
+<h4 id="diagnosing-1">Diagnosing the problem</h4>
+
+<p>
+You can use method tracing or inline tracing to try to diagnose the problem.
+</p>
+
+<h5>Method tracing</h5>
+
+<p>
+Running the Method Tracer tool reveals that the
+{@link android.app.Instrumentation#callApplicationOnCreate(android.app.Application) callApplicationOnCreate()}
+method eventually calls your {@code com.example.customApplication.onCreate}
+method. If the tool shows that these
+methods are taking a long time to finish executing, you should explore further
+to see what work is occurring there.
+</p>
+
+<h5>Inline tracing</h5>
+
+<p>
+Use inline tracing to investigate likely culprits including:
+</p>
+
+<ul>
+ <li>Your app’s initial {@link android.app.Application#onCreate()}
+ function.</li>
+ <li>Any global singleton objects your app initializes.</li>
+ <li>Any disk I/O, deserialization, or tight loops that might be occurring
+ during the bottleneck.
+</ul>
+
+
+<h4 id="solutions-1">Solutions to the problem</h4>
+
+<p>
+Whether the problem lies with unnecessary initializations or disk I/O,
+the solution calls for lazy-initializing objects: initializing only those
+objects that are immediately needed. For example, rather than creating global
+static objects, instead, move to a singleton pattern, where the app initalizes
+objects only the first time it accesses them.
+</p>
+
+<h3 id="heavy-act">Heavy activity initialization</h4>
+
+<p>
+Activity creation often entails a lot of high-overhead work. Often, there are
+opportunities to optimize this work to achieve performance improvements. Such
+common issues include:
+</p>
+
+<ul>
+ <li>Inflating large or complex layouts.</li>
+ <li>Blocking screen drawing on disk, or network I/O.</li>
+ <li>Loading and decoding bitmaps.</li>
+ <li>Rasterizing {@link android.graphics.drawable.VectorDrawable VectorDrawable} objects.</li>
+ <li>Initialization of other subsystems of the activity.</li>
+</ul>
+
+<h4 id="diagnosing-2">Diagnosing the problem</h4>
+
+<p>
+In this case, as well, both method tracing and inline tracing can prove useful.
+</p>
+
+<h5>Method tracing</h5>
+
+<p>
+When running the Method Tracer tool, the particular areas to
+focus on your your app’s {@link android.app.Application} subclass constructors and
+{@code com.example.customApplication.onCreate()} methods.
+</p>
+
+<p>
+If the tool shows that these methods are taking a long time to finish
+executing, you should explore further to see what work is occurring there.
+</p>
+
+<h5>Inline tracing</h5>
+
+<p>
+Use inline tracing to investigate likely culprits including:
+</p>
+
+<ul>
+ <li>Your app’s initial {@link android.app.Application#onCreate()}
+ function.</li>
+ <li>Any global singleton objects it initializes.</li>
+ <li>Any disk I/O, deserialization, or tight loops that might be occurring
+ during the bottleneck.</li>
+</ul>
+
+<h4 id="solutions-2">Solutions to the problem</h4>
+
+<p>
+There are many potential bottlenecks, but two common problems and remedies
+are as follows:
+</p>
+
+<ul>
+ <li>The larger your view hierarchy, the more time the app takes to inflate
+ it. Two steps you can take to address this issue are:
+
+ <ul>
+ <li>Flattening your view hierarchy by reducing redundant or nested
+ layouts.</li>
+
+ <li>Not inflating parts of the UI that do not need to be visible during
+ launch. Instead, use use a {@link android.view.ViewStub} object as a
+ placeholder for sub-hierarchies that the app can inflate at a more
+ appropriate time.</li>
+ </ul>
+ </li>
+
+ <li>Having all of your resource initialization on the main
+ thread can also slow down startup. You can address this issue as follows:
+
+ <ul>
+ <li>Move all resource initialization so that the app can perform it
+ lazily on a different thread.</li>
+ <li>Allow the app to load and display your views, and then later
+ update visual properties that are dependent on bitmaps and other
+ resources.</li>
+ </ul>
+ </li>
+
+<h3 id="themed">Themed launch screens</h3>
+
+
+<p>
+You may wish to theme your app’s loading experience, so that the app’s
+launch screen is thematically consistent with the rest of the app, instead of
+with the system theming. Doing so can hide a slow activity launch.
+</p>
+
+<p>
+A common way to implement a themed launch screen is to use the the
+{@link android.R.attr#windowDisablePreview} theme attribute to turn off
+the initial blank screen
+that the system process draws when launching the app. However, this approach
+can result in a longer startup time than apps that don’t suppress the preview
+window. Also, it forces the user to wait with no feedback while the activity
+launches, making them wonder if the app is functioning properly.
+</p>
+
+<h4 id="diagnosing-3">Diagnosing the problem</h4>
+
+<p>
+You can often diagnose this problem by observing a slow response when a user
+launches your app. In such a case, the screen may seem to be frozen, or to
+have stopped responding to input.
+</p>
+
+<h4 id="solutions-3">Solutions to the problem</h4>
+
+<p>
+We recommend that, rather than disabling the preview window, you
+follow the common
+<a href="http://www.google.com/design/spec/patterns/launch-screens.html#">
+Material Design</a> patterns. You can use the activity's
+{@code windowBackground} theme attribute to provide a simple custom drawable
+for the starting activity.
+</p>
+
+<p>
+For example, you might create a new drawable file and reference it from the
+layout XML and app manifest file as follows:
+</p>
+
+<p>Layout XML file:</p>
+
+<pre>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+ <!-- The background color, preferably the same as your normal theme -->
+ <item android:drawable="@android:color/white"/>
+ <!-- Your product logo - 144dp color version of your app icon -->
+ <item>
+ <bitmap
+ android:src="@drawable/product_logo_144dp"
+ android:gravity="center"/>
+ </item>
+</layer-list>
+</pre>
+
+<p>Manifest file:</p>
+
+<pre>
+<activity ...
+android:theme="@style/AppTheme.Launcher" />
+</pre>
+
+<p>
+The easiest way to transition back to your normal theme is to call
+{@link android.view.ContextThemeWrapper#setTheme(int) setTheme(R.style.AppTheme)}
+before calling {@code super.onCreate()} and {@code setContentView()}:
+</p>
+
+<pre class="no-pretty-print">
+public class MyMainActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ // Make sure this is before calling super.onCreate
+ setTheme(R.style.Theme_MyApp);
+ super.onCreate(savedInstanceState);
+ // ...
+ }
+}
+</pre>
diff --git a/docs/html/topic/performance/optimizing-view-hierarchies.jd b/docs/html/topic/performance/optimizing-view-hierarchies.jd
new file mode 100644
index 0000000..27d3d16
--- /dev/null
+++ b/docs/html/topic/performance/optimizing-view-hierarchies.jd
@@ -0,0 +1,388 @@
+page.title=Performance and View Hierarchies
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#lmp">Layout-and-Measure Performance</a>
+ <ol>
+ <li><a href="#managing">Managing complexity: layouts matter</a></li>
+ <li><a href="#double">Double taxation</a></li>
+ </ol>
+</li>
+<li><a href="#dx">Diagnosing View Hierarchy Issues</a>
+ <ol>
+ <li><a href="#systrace">Systrace</a></li>
+ <li><a href="#profile">Profile GPU rendering</a></li>
+ <li><a href="#lint">Lint</a></li>
+ <li><a href="#hv">Hierarchy Viewer</a></li>
+ </ol>
+</li>
+<li><a href="#solving">Solving View Hierarchy Issues</a>
+ <ol>
+ <li><a href="#removing">Removing redundant nested layouts</a></li>
+ <li><a href="#cheaper">Adopting a cheaper layout</a></li>
+ </ol>
+ </li>
+</ol>
+</div>
+</div>
+
+
+<p>
+The way you manage the hierarchy of your {@link android.view.View} objects can
+have a substantial impact on your app’s performance. This page describes how to
+assess whether your view hierarchy is slowing your app down, and offers some
+strategies for addressing issues that may arise.
+</p>
+
+<h2 id="lmp">Layout and Measure Performance</h2>
+<p>
+The rendering pipeline includes a <em>layout-and-measure</em>
+stage, during which the system appropriately positions the relevant items in
+your view hierarchy. The measure part of this stage determines the sizes and
+boundaries of {@link android.view.View} objects. The layout part determines where on the screen to
+position the {@link android.view.View} objects.
+</p>
+
+<p>
+Both of these pipeline stages incur some small cost per view or layout that they
+process. Most of the time, this cost is minimal and doesn’t noticeably affect
+performance. However, it can be greater when an app adds or removes View
+objects, such as when a {@link android.support.v7.widget.RecyclerView}
+object recycles them or reuses them. The
+cost can also be higher if a {@link android.view.View} object needs to consider
+resizing to main its constraints: For example, if your app calls
+{@link android.widget.TextView#setText(char[], int, int) SetText()} on a
+{@link android.view.View} object that wraps text, the
+{@link android.view.View} may need to resize.
+</p>
+
+<p>
+If cases like these take too long, they can prevent a frame from rendering
+within the allowed 16ms, so that frames are dropped, and animation becomes
+janky.
+</p>
+
+<p>
+Because you cannot move these operations to a worker thread—your app must
+process them on the main thread—your best bet is to optimize them so that
+they can take as little time as possible.
+</p>
+
+<h3 id="managing">Managing complexity: layouts matter</h3>
+
+<p>
+Android <a
+href="{@docRoot}guide/topics/ui/declaring-layout.html">Layouts</a>
+allow you to nest UI objects in the view hierarchy. This nesting can also impose
+a layout cost. When your app processes an object for layout, the app performs
+the same process on all children of the layout as well. For a complicated
+layout, sometimes a cost only arises the first time the system computes the
+layout. For instance, when your app recycles a complex list item in a
+{@link android.support.v7.widget.RecyclerView} object, the
+system needs to lay out all of the objects. In another example, trivial changes
+can propagate up the chain toward the parent
+until they reach an object that doesn’t affect the size of the parent.
+</p>
+
+<p>
+The most common case in which layout takes an especially long time is when
+hierarchies of {@link android.view.View} objects are nested within one another. Each nested layout
+object adds cost to the layout stage. The flatter your hierarchy, the less
+time that it takes for the layout stage to complete.
+</p>
+
+<p>
+If you are using the {@link android.widget.RelativeLayout} class, you may be able to achieve the same
+effect, at lower cost, by using nested, unweighted
+{@link android.widget.LinearLayout} views instead. Additionally, if your app
+targets Android N (API level 24), it is likely that
+you can use a special layout editor to create a <a
+href="http://tools.android.com/tech-docs/layout-editor">{@code ConstraintLayout}</a>
+object instead of {@link android.widget.RelativeLayout}. Doing so allows you
+to avoid many of the issues this section
+describes. The <a
+href="http://tools.android.com/tech-docs/layout-editor">{@code ConstraintLayout}</a>
+class offers similar layout control, but
+with much-improved performance. This class uses its own constraint-solving
+system to resolve relationships between views in a very different way from
+standard layouts.
+</p>
+
+<h3 id="double">Double Taxation</h3>
+
+<p>
+Typically, the framework executes the <a
+href="{@docRoot}guide/topics/ui/declaring-layout.html">layout</a>
+or measure stage in a single pass and quite quickly. However, with some more
+complicated layout cases, the framework may have to iterate multiple times on
+the layout or measure stage before ultimately positioning the elements. Having
+to perform more than one layout-and-measure iteration is referred to as
+<em>double taxation.</em>
+</p>
+
+<p>
+For example, when you use the {@link android.widget.RelativeLayout} container, which allows you to
+position {@link android.view.View} objects with respect to the positions of other {@link android.view.View} objects, the
+framework performs the following actions:
+</p>
+
+<ol style="1">
+ <li>Executes a layout-and-measure pass, during which the framework calculates
+each child object’s position and size, based on each child’s request.
+ <li>Uses this data, also taking object weights into account, to figure out the
+proper position of correlated views.
+ <li>Performs a second layout pass to finalize the objects’ positions.
+ <li>Goes on to the next stage of the rendering process.</li></ol>
+
+<p>
+The more levels your view hierarchy has, the greater the potential performance
+penalty.
+</p>
+
+<p>
+Containers other than {@link android.widget.RelativeLayout} may also give rise to double taxation. For
+example:
+</p>
+
+<ul>
+ <li>A {@link android.widget.LinearLayout} view
+could result in a double layout-and-measure pass if you make it horizontal.
+A double layout-and-measure pass may also occur in a vertical orientation if you
+add <a
+href="{@docRoot}reference/android/widget/LinearLayout.html#attr_android:measureWithLargestChild">measureWithLargestChild</a>,
+in which case the framework may need to do a second pass to resolve the proper
+sizes of objects.
+ <li>The {@link android.widget.GridLayout}
+has a similar issue. While this container also allows relative positioning, it
+normally avoids double taxation by pre-processing the positional relationships
+among child views. However, if the layout uses weights or fill with the
+{@link android.view.Gravity} class, the
+benefit of that preprocessing is lost, and the framework may have to perform
+multiple passes if it the container were a {@link android.widget.RelativeLayout}.</li>
+</ul>
+<p>
+Multiple layout-and-measure passes are not, in themselves, a performance burden.
+But they can become so if they’re in the wrong spot. You should be wary of
+situations where one of the following conditions applies to your container:
+</p>
+
+<ul>
+ <li>It is a root element in your view hierarchy.
+ <li>It has a deep view hierarchy beneath it.
+ <li>It is nested.
+ <li>There are many instances of it populating the screen, similar to children
+ in a {@link android.widget.ListView} object.</li>
+</ul>
+
+<h2 id="dx">Diagnosing View Hierarchy Issues</h2>
+
+<p>
+Layout performance is a complex problem with many facets. There are a couple of
+tools that can give you solid indications about where performance bottlenecks
+are occurring. A few other tools provide less definitive information, but can
+also provide helpful hints.
+</p>
+
+<p>
+<h3 id="systrace">Systrace</h3>
+</p>
+
+<p>
+One tool that provides excellent data about performance is <a
+href="{@docRoot}studio/profile/systrace.html">Systrace</a>,
+which is built into Android Studio. The Systrace tool allows you to collect and
+inspect timing information across an entire Android device, allowing you to see
+specifically where performance bottlenecks arise. For more information about
+Systrace, see <a href=”{docRoot}<a href="{@docRoot}studio/profile/systrace.html">
+Analyze UI Performance with Systrace</a>.
+</p>
+
+<h3 id="profile">Profile GPU rendering</h3>
+
+<p>
+The other tool most likely to provide you with concrete information about
+performance bottlenecks is the on-device <a
+href="{@docRoot}studio/profile/dev-options-rendering.html">
+Profile GPU rendering</a> tool, available on devices powered by Android 6.0 (API
+level 23) and later. This tool allows you to see how long the layout-and-measurestage is
+ taking for <a href="https://youtu.be/erGJw8WDV74">each frame
+of rendering</a>. This data can help you diagnose runtime performance issues,
+and help you determine what, if any layout-and-measure issues you need to
+address.
+</p>
+
+<p>
+In its graphical representation of the data it captures, <a
+href="{@docRoot}studio/profile/dev-options-rendering.html">Profile
+GPU rendering</a> uses the color blue to represent layout time. For more
+information about how to use this tool, see <a
+href="{@docRoot}studio/profile/dev-options-rendering.html">Profile
+GPU Rendering Walkthrough.</a>
+</p>
+
+<h3 id="lint">Lint</h3>
+
+<p>
+Android Studio’s <a
+href="{@docRoot}studio/write/lint.html">Lint</a> tool can
+help you gain a sense of inefficiencies in the view hierarchy. To use this tool,
+select <strong>Analyze > Inspect Code</strong>, as shown in Figure 1.
+</p>
+
+ <img src="{@docRoot}topic/performance/images/lint-inspect-code.png">
+ <p class="img-caption">
+ <strong>Figure 1.</strong> Locating <strong>Inspect Code</strong> in the
+Android Studio.
+ </p>
+
+<p>
+Information about various layout items appears under
+<em>Android > Lint > Performance</em>. To see more detail,
+you can click on each item to expand it, and see more
+information in the pane on the right side of the screen.
+Figure 2 shows an example of such a display.
+</p>
+
+ <img src="{@docRoot}topic/performance/images/lint-display.png">
+ <p class="img-caption">
+ <strong>Figure 2.</strong> Viewing information about specific
+issues that the lint tool has identified.
+ </p>
+
+
+<p>
+Clicking on one of these items reveals, in the pane to the right, the problem
+associated with that item.
+</p>
+
+<p>
+To understand more about specific topics and issues in this area, see the <a
+href="{@docRoot}studio/write/lint.html">Lint
+</a>documentation.
+</p>
+
+<h3 id="hv">Hierarchy Viewer</h3>
+
+<p>
+Android Studio’s <a
+href="{@docRoot}studio/profile/hierarchy-viewer.html">Hierarchy
+Viewer</a> tool provides a visual representation of your app’s view hierarchy.
+It is a good way to navigate the hierarchy of your app, providing a clear visual
+representation of a particular view’s parent chain, and allowing you to inspect
+the layouts that your app constructs.
+</p>
+
+<p>
+The views that Hierarchy Viewer presents can also help identify performance
+problems arising from double taxation. It can also provide an easy way for you
+to identify deep chains of nested layouts, or layout areas with a large amount
+of nested children, another potential source of performance costs. In these
+scenarios, the layout-and-measure stages can be particularly costly,
+resulting in performance issues.
+</p>
+
+<p>
+You can also can get a sense of relative time taken by layout-and-measure
+operations by clicking the “profile node” button.
+</p>
+
+<p>
+For more information about Hierarchy Viewer, see <a
+href="{@docRoot}studio/profile/optimize-ui.html#HierarchyViewer">Optimizing
+Your UI</a>.
+</p>
+
+<h2 id="solving">Solving View Hierarchy Issues</h2>
+
+<p>
+The fundamental concept behind solving performance problems that arise from view
+hierarchies is simple in concept, but more difficult in practice. Preventing
+view hierarchies from imposing performance penalties encompasses the dual goals
+of flattening your view hierarchy and reducing double taxation. This section
+discusses some strategies for pursuing these goals.
+</p>
+
+<h3 id="removing">Removing redundant nested layouts</h3>
+
+<p>
+Developers often use more nested layouts than necessary. For example, a
+{@link android.widget.RelativeLayout} container might contain a single child that is also a
+{@link android.widget.RelativeLayout} container. This nesting amounts to redundancy, and adds
+unnecessary cost to the view hierarchy.
+</p>
+
+<p>
+Lint can often flag this problem for you, reducing debugging time.
+</p>
+
+<h3>Adopting Merge/Include </h3>
+<p>
+One frequent cause of redundant nested layouts is the <a
+href="{@docRoot}training/improving-layouts/reusing-layouts.html">
+<include>
+tag</a>. For example, you may define a re-usable layout as follows:
+</p>
+
+<pre class="prettyprint">
+<LinearLayout>
+ <!-- some stuff here -->
+</LinearLayout>
+</pre>
+</pre>
+
+<p>
+And then an include tag to add this item to the parent container:
+</p>
+
+<pre class="prettyprint">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/app_bg"
+ android:gravity="center_horizontal">
+
+ <include layout="@layout/titlebar"/>
+
+ <TextView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/hello"
+ android:padding="10dp" />
+
+ ...
+
+</LinearLayout>
+</pre>
+
+<p>
+The include unnecessarily nests the first layout within the second layout.
+</p>
+
+<p>
+The <a
+href="{@docRoot}training/improving-layouts/reusing-layouts.html#Merge">merge
+</a>tag can help prevent this issue. For information about this tag, see <a
+href="{@docRoot}training/improving-layouts/reusing-layouts.html#Merge">Re-using
+Layouts with <include></a>.
+</p>
+
+<h3 id="cheaper">Adopting a cheaper layout</h3>
+
+<p>
+You may not be able to adjust your existing layout scheme so that it doesn’t
+contain redundant layouts. In certain cases, the only solution may be to flatten
+your hierarchy by switching over to an entirely different layout type.
+</p>
+
+<p>
+For example, you may find that a {@link android.widget.TableLayout}
+provides the same functionality as a more complex layout with many
+positional dependencies. In the N release of Android, the
+<a
+href="http://tools.android.com/tech-docs/layout-editor">{@code ConstraintLayout}</a> class provides similar functionality to
+{@link android.widget.RelativeLayout}, but at a significantly lower cost.
+</p>
diff --git a/docs/html/topic/performance/performance_toc.cs b/docs/html/topic/performance/performance_toc.cs
new file mode 100644
index 0000000..8c39523
--- /dev/null
+++ b/docs/html/topic/performance/performance_toc.cs
@@ -0,0 +1,2289 @@
+<ul id="nav">
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/index.html">
+ Getting Started
+ </a>
+ </div>
+
+ <ul>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/basics/firstapp/index.html"
+ description=
+ "After you've installed the Android SDK, start with this class
+ to learn the basics about Android app development."
+ >It worked!!</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/firstapp/creating-project.html">
+ Creating an Android Project
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/firstapp/running-app.html">
+ Running Your Application
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/firstapp/building-ui.html">
+ Building a Simple User Interface
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/firstapp/starting-activity.html">
+ Starting Another Activity
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/basics/supporting-devices/index.html"
+ description=
+ "How to build your app with alternative resources that provide an
+ optimized user experience on multiple device form factors using a single APK."
+ >Supporting Different Devices</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/supporting-devices/languages.html">
+ Supporting Different Languages
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/supporting-devices/screens.html">
+ Supporting Different Screens
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/supporting-devices/platforms.html">
+ Supporting Different Platform Versions
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/basics/activity-lifecycle/index.html"
+ ja-lang="アクティビティのライフサイクル 管理"
+ ko-lang="액티비티 수명 주기 관리하기"
+ pt-br-lang="Como gerenciar o ciclo de vida da atividade"
+ ru-lang="Управление жизненным циклом операций"
+ zh-cn-lang="管理活动生命周期"
+ zh-tw-lang="管理應用行為顯示生命週期"
+ description=
+ "How Android activities live and die and how to create
+ a seamless user experience by implementing lifecycle callback methods."
+ >Managing the Activity Lifecycle</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/starting.html"
+ ja-lang="アクティビティを開始する"
+ ko-lang="액티비티 시작하기"
+ pt-br-lang="Iniciando uma atividade"
+ ru-lang="Запуск операции"
+ zh-cn-lang="开始活动"
+ zh-tw-lang="啟動應用行為顯示">
+ Starting an Activity
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/pausing.html">
+ Pausing and Resuming an Activity
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/stopping.html"
+ ja-lang="アクティビティの一時停止と再開"
+ ko-lang="액티비티 일시정지 및 재개하기"
+ pt-br-lang="Pausando e reiniciando uma atividade"
+ ru-lang="Приостановка и возобновление операции"
+ zh-cn-lang="暂停和继续活动"
+ zh-tw-lang="暫停並繼續應用行為顯示">
+ Stopping and Restarting an Activity
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/recreating.html"
+ ja-lang="アクティビティを再作成する"
+ ko-lang="액티비티 재생성하기"
+ pt-br-lang="Recriando uma atividade"
+ ru-lang="Воссоздание операции"
+ zh-cn-lang="重新创建活动"
+ zh-tw-lang="重新建立應用行為顯示">
+ Recreating an Activity
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/basics/fragments/index.html"
+ description=
+ "How to build a user interface for your app that is flexible enough
+ to present multiple UI components on large screens and a more constrained set of
+ UI components on smaller screens—essential for building a single APK for both
+ phones and tablets."
+ >Building a Dynamic UI with Fragments</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/fragments/creating.html">
+ Creating a Fragment
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/fragments/fragment-ui.html" zh-cn-lang="构建灵活的界面">
+ Building a Flexible UI
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/fragments/communicating.html">
+ Communicating with Other Fragments
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="<?cs var:toroot?>training/basics/data-storage/index.html"
+ ja-lang="データの保存"
+ ko-lang="데이터 저장하기"
+ pt-br-lang="Salvando dados"
+ ru-lang="Сохранение данных"
+ zh-cn-lang="保存数据"
+ zh-tw-lang="儲存資料"
+ description=
+ "How to save data on the device, whether it's temporary files, downloaded
+ app assets, user media, structured data, or something else."
+ >Saving Data</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/data-storage/shared-preferences.html"
+ ja-lang="キー値セットを保存する"
+ ko-lang="키-값 세트 저장하기"
+ pt-br-lang="Salvando conjuntos de valor-chave"
+ ru-lang="Сохранение наборов "\"ключ-значение\""
+ zh-cn-lang="保存键值集"
+ zh-tw-lang="儲存索引鍵值組">
+ Saving Key-Value Sets
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/data-storage/files.html"
+ ja-lang="ファイルを保存する"
+ ko-lang="파일 저장하기"
+ pt-br-lang="Salvando arquivos"
+ ru-lang="Сохранение файлов"
+ zh-cn-lang="保存文件"
+ zh-tw-lang="儲存檔案">
+ Saving Files
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/data-storage/databases.html"
+ ja-lang="SQL データベースにデータを保存する"
+ ko-lang="SQL 데이터베이스에 데이터 저장하기"
+ pt-br-lang="Salvando dados em bancos de dados do SQL"
+ ru-lang="Сохранение данных в базах данных SQL"
+ zh-cn-lang="在 SQL 数据库中保存数据"
+ zh-tw-lang="在 SQL 資料庫中儲存資料">
+ Saving Data in SQL Databases
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/basics/intents/index.html"
+ ja-lang="他のアプリとの相互操作"
+ ko-lang="액티비티 수명 주기 관리하기"
+ pt-br-lang="Interagindo com outros aplicativos"
+ ru-lang="Взаимодействие с другими приложениями"
+ zh-cn-lang="与其他应用交互"
+ zh-tw-lang="與其他應用程式互動"
+ description=
+ "How to build a user experience that leverages other apps available
+ on the device to perform advanced user tasks, such as capture a photo or view
+ an address on a map."
+ >Interacting with Other Apps</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/intents/sending.html"
+ ja-lang="別のアプリにユーザーを送る"
+ ko-lang="다른 앱으로 사용자 보내기"
+ pt-br-lang="Enviando o usuário para outro aplicativo"
+ ru-lang="Направление пользователя в другое приложение"
+ zh-cn-lang="向另一个应用发送用户"
+ zh-tw-lang="將使用者傳送至其他應用程式">
+ Sending the User to Another App
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/intents/result.html"
+ ja-lang="アクティビティから結果を取得する"
+ ko-lang="액티비티로부터 결과 가져오기"
+ pt-br-lang="Obtendo resultados de uma atividade"
+ ru-lang="Получение результата операции"
+ zh-cn-lang="获取活动的结果"
+ zh-tw-lang="從應用行為顯示取得結果">
+ Getting a Result from the Activity
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/intents/filters.html"
+ ja-lang="他のアプリからのアクティビティの開始を許可する"
+ ko-lang="다른 앱이 자신의 액티비티를 시작하도록 허용하기"
+ pt-br-lang="Permitindo que outros aplicativos iniciem sua atividade"
+ ru-lang="Разрешение другим приложениям на запуск вашей операции"
+ zh-cn-lang="允许其他应用开始您的活动"
+ zh-tw-lang="允許其他應用程式啟動您的應用行為顯示">
+ Allowing Other Apps to Start Your Activity
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/permissions/index.html"
+ description=
+ "How to declare that your app needs access to features and
+ resources outside of its 'sandbox', and how to request those
+ privileges at runtime."
+ >Working with System Permissions</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/permissions/declaring.html">
+ Declaring Permissions
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/permissions/requesting.html">
+ Requesting Permissions at Run Time
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/permissions/best-practices.html">
+ Best Practices for Runtime Permissions
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ </ul>
+ </li><!-- end getting started -->
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-content-sharing.html">
+ <span class="small">Building Apps with</span><br/>Content Sharing
+ </a>
+ </div>
+ <ul>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/sharing/index.html"
+ description=
+ "How to take your app interaction to the next level by sharing
+ information with other apps, receive information back, and provide a simple and
+ scalable way to perform Share actions with user content."
+ >Sharing Simple Data</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/sharing/send.html">
+ Sending Simple Data to Other Apps
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/sharing/receive.html">
+ Receiving Simple Data from Other Apps
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/sharing/shareaction.html">
+ Adding an Easy Share Action
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot?>training/secure-file-sharing/index.html"
+ description=
+ "How to provide secure access to a file associated with your app using a content
+ URI and temporary access permissions."
+ >Sharing Files</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/secure-file-sharing/setup-sharing.html">
+ Setting Up File Sharing
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/secure-file-sharing/share-file.html">
+ Sharing a File
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/secure-file-sharing/request-file.html">
+ Requesting a Shared File
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/secure-file-sharing/retrieve-info.html">
+ Retrieving File Information
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/beam-files/index.html"
+ description=
+ "How to transfer files between devices using the NFC Android Beam feature."
+ >Sharing Files with NFC</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/beam-files/send-files.html"
+ >Sending Files to Another Device</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/beam-files/receive-files.html"
+ >Receiving Files from Another Device</a></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-multimedia.html">
+ <span class="small">Building Apps with</span><br/>Multimedia
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/managing-audio/index.html"
+ description=
+ "How to respond to hardware audio key presses, request audio focus
+ when playing audio, and respond appropriately to changes in audio focus."
+ >Managing Audio Playback</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/managing-audio/volume-playback.html">
+ Controlling Your App's Volume and Playback
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/managing-audio/audio-focus.html">
+ Managing Audio Focus
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/managing-audio/audio-output.html">
+ Dealing with Audio Output Hardware
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/camera/index.html"
+ description=
+ "How to leverage existing camera apps on the user's device to capture
+ photos or control the camera hardware directly and build your own camera app."
+ >Capturing Photos</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/camera/photobasics.html">
+ Taking Photos Simply
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/camera/videobasics.html">
+ Recording Videos Simply
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/camera/cameradirect.html">
+ Controlling the Camera
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/printing/index.html"
+ description=
+ "How to print photos, HTML documents, and custom documents from your app."
+ >Printing Content</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/printing/photos.html">
+ Photos
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/printing/html-docs.html">
+ HTML Documents
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/printing/custom-docs.html">
+ Custom Documents
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ </ul>
+ </li>
+ <!-- End multimedia -->
+
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-graphics.html">
+ <span class="small">Building Apps with</span><br/>Graphics & Animation
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/displaying-bitmaps/index.html"
+ description=
+ "How to load and process bitmaps while keeping your user interface
+ responsive and avoid exceeding memory limits."
+ >Displaying Bitmaps Efficiently</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/load-bitmap.html">
+ Loading Large Bitmaps Efficiently
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/process-bitmap.html">
+ Processing Bitmaps Off the UI Thread
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/cache-bitmap.html">
+ Caching Bitmaps
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/manage-memory.html">
+ Managing Bitmap Memory
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/display-bitmap.html">
+ Displaying Bitmaps in Your UI
+ </a></li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot?>training/graphics/opengl/index.html"
+ description=
+ "How to create OpenGL graphics within the Android app framework
+ and respond to touch input."
+ >Displaying Graphics with OpenGL ES</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/graphics/opengl/environment.html">
+ Building an OpenGL ES Environment
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/graphics/opengl/shapes.html">
+ Defining Shapes
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/graphics/opengl/draw.html">
+ Drawing Shapes
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/graphics/opengl/projection.html">
+ Applying Projection and Camera Views
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/graphics/opengl/motion.html">
+ Adding Motion
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/graphics/opengl/touch.html">
+ Responding to Touch Events
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot?>training/transitions/index.html"
+ description=
+ "How to animate state changes in a view hierarchy using transitions."
+ >Animating Views Using Scenes and Transitions</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/transitions/overview.html">
+ The Transitions Framework
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/transitions/scenes.html">
+ Creating a Scene
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/transitions/transitions.html">
+ Applying a Transition
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/transitions/custom-transitions.html">
+ Creating Custom Transitions
+ </a>
+ </li>
+
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>training/animation/index.html"
+ description=
+ "How to add transitional animations to your user interface.">
+ Adding Animations
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/animation/crossfade.html">
+ Crossfading Two Views
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/animation/screen-slide.html">
+ Using ViewPager for Screen Slide
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/animation/cardflip.html">
+ Displaying Card Flip Animations
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/animation/zoom.html">
+ Zooming a View
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/animation/layout.html">
+ Animating Layout Changes
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <!-- End graphics and animation -->
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-connectivity.html">
+ <span class="small">Building Apps with</span><br/>
+ Connectivity & the Cloud
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/connect-devices-wirelessly/index.html"
+ description=
+ "How to find and connect to local devices using Network Service
+ Discovery and how to create peer-to-peer connections with Wi-Fi."
+ >Connecting Devices Wirelessly</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/connect-devices-wirelessly/nsd.html">
+ Using Network Service Discovery
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/connect-devices-wirelessly/wifi-direct.html">
+ Creating P2P Connections with Wi-Fi
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/connect-devices-wirelessly/nsd-wifi-direct.html">
+ Using Wi-Fi P2P for Service Discovery
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/basics/network-ops/index.html"
+ description=
+ "How to create a network connection, monitor the connection for changes
+ in connectivity, and perform transactions with XML data."
+ >Performing Network Operations</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/basics/network-ops/connecting.html">
+ Connecting to the Network
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/network-ops/managing.html">
+ Managing Network Usage
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/basics/network-ops/xml.html">
+ Parsing XML Data
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/efficient-downloads/index.html"
+ description=
+ "How to minimize your app's impact on the battery when performing downloads
+ and other network transactions."
+ >Transferring Data Without Draining the Battery</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/efficient-downloads/efficient-network-access.html">
+ Optimizing Downloads for Efficient Network Access
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/efficient-downloads/regular_updates.html">
+ Minimizing the Effect of Regular Updates
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/efficient-downloads/redundant_redundant.html">
+ Redundant Downloads are Redundant
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/efficient-downloads/connectivity_patterns.html">
+ Modifying Patterns Based on the Connectivity Type
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/backup/index.html"
+ description=
+ "How to sync and back up app and user data to remote web services in the
+ cloud and how to restore the data back to multiple devices."
+ >Backing up App Data to the Cloud</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/backup/autosyncapi.html">
+ Configuring Auto Backup
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/backup/backupapi.html">
+ Using the Backup API
+ </a>
+ </li>
+ </ul>
+ <li><a href="<?cs var:toroot ?>training/cloudsave/conflict-res.html"
+ description=
+ "How to design a robust conflict resolution strategy for apps that save data to the cloud."
+ >Resolving Cloud Save Conflicts
+ </a>
+ </li>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/sync-adapters/index.html"
+ description="How to transfer data between the cloud and the device using the Android
+ sync adapter framework"
+ >Transferring Data Using Sync Adapters</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/sync-adapters/creating-authenticator.html">
+ Creating a Stub Authenticator
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/sync-adapters/creating-stub-provider.html">
+ Creating a Stub Content Provider
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/sync-adapters/creating-sync-adapter.html">
+ Creating a Sync Adapter
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/sync-adapters/running-sync-adapter.html">
+ Running a Sync Adapter
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/volley/index.html"
+ description="How to perform fast, scalable UI operations over the network using Volley"
+ >Transmitting Network Data Using Volley</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/volley/simple.html">
+ Sending a Simple Request
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/volley/requestqueue.html">
+ Setting Up a RequestQueue
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/volley/request.html">
+ Making a Standard Request
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/volley/request-custom.html">
+ Implementing a Custom Request
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <!-- End connectivity and cloud -->
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-location.html">
+ <span class="small">Building Apps with</span><br/>
+ Location & Maps
+ </a>
+ </div>
+ <ul>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/location/index.html"
+ description="How to add location-aware features to your app by getting the user's current location.">
+ Making Your App Location-Aware
+ </a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/location/retrieve-current.html">
+ Getting the Last Known Location
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/location/change-location-settings.html">
+ Changing Location Settings
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/location/receive-location-updates.html">
+ Receiving Location Updates
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/location/display-address.html">
+ Displaying a Location Address
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/location/geofencing.html">
+ Creating and Monitoring Geofences
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <a href="<?cs var:toroot ?>training/maps/index.html"
+ description="How to add maps and mapping information to your app.">
+ Adding Maps
+ </a>
+ </li>
+ </ul>
+ </li>
+ <!-- End location and maps -->
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-userinfo.html">
+ <span class="small">Building Apps with</span><br/>
+ User Info & Sign-In
+ </a>
+ </div>
+ <ul>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/contacts-provider/index.html"
+ description=
+ "How to use Android's central address book, the Contacts Provider, to
+ display contacts and their details and modify contact information.">
+ Accessing Contacts Data</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/contacts-provider/retrieve-names.html">
+ Retrieving a List of Contacts
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/contacts-provider/retrieve-details.html">
+ Retrieving Details for a Contact
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/contacts-provider/modify-data.html">
+ Modifying Contacts Using Intents
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/contacts-provider/display-contact-badge.html">
+ Displaying the Quick Contact Badge
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <a href="<?cs var:toroot ?>training/sign-in/index.html"
+ description="How to add user sign-in functionality to your app.">
+ Adding Sign-In
+ </a>
+ </li>
+ </ul>
+ </li>
+ <!-- End user info and sign-in -->
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/building-wearables.html">
+ <span class="small">Building Apps for</span><br/>
+ Wearables
+ </a>
+ </div>
+ <ul>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/wearables/notifications/index.html"
+ description="How to build handheld notifications that are synced to
+ and look great on wearables."
+ >Adding Wearable Features to Notifications</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/notifications/creating.html">Creating a Notification</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/notifications/voice-input.html">Receiving Voice Input in a Notification</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/notifications/pages.html">Adding Pages to a Notification</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/notifications/stacks.html">Stacking Notifications</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/wearables/apps/index.html"
+ description="How to build apps that run directly on wearables."
+ >Creating Wearable Apps</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/apps/creating.html">Creating and Running a Wearable App</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/apps/layouts.html">Creating Custom Layouts</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/apps/always-on.html">Keeping Your App Visible</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/apps/voice.html">Adding Voice Capabilities</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/apps/packaging.html">Packaging Wearable Apps</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/apps/bt-debugging.html">Debugging over Bluetooth</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/wearables/ui/index.html"
+ description="How to create custom user interfaces for wearable apps."
+ >Creating Custom UIs</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/ui/layouts.html">Defining Layouts</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/ui/cards.html">Creating Cards</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/ui/lists.html">Creating Lists</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/ui/2d-picker.html">Creating a 2D Picker</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/ui/confirm.html">Showing Confirmations</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/ui/exit.html">Exiting Full-Screen Activities</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/wearables/data-layer/index.html"
+ description="How to sync data between handhelds and wearables."
+ >Sending and Syncing Data</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/data-layer/accessing.html">Accessing the Wearable Data Layer</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/data-layer/data-items.html">Syncing Data Items</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/data-layer/assets.html">Transferring Assets</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/data-layer/messages.html">Sending and Receiving Messages</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/data-layer/events.html">Handling Data Layer Events</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/index.html"
+ description="How to create watch faces for wearables."
+ >Creating Watch Faces</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/designing.html">Designing Watch Faces</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/service.html">Building a Watch Face Service</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/drawing.html">Drawing Watch Faces</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/information.html">Showing Information in Watch Faces</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/interacting.html">Creating Interactive Watch Faces</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/configuration.html">Providing Configuration Activities</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/issues.html">Addressing Common Issues</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/watch-faces/performance.html">Optimizing Performance and Battery Life</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/wear-location-detection.html"
+ description=
+ "How to detect location data on Android Wear devices."
+ >Detecting Location</a>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/wear-permissions.html"
+ description=
+ "How to request permissions on Android Wear devices."
+ >Requesting Permissions</a>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/wearables/wearable-sounds.html"
+ description=
+ "How to use the speaker on Android Wear devices."
+ >Using the Speaker</a>
+ </li>
+
+ </ul>
+ </li>
+ <!-- End Building for wearables -->
+
+
+ <!-- Start: Building for TV -->
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/tv/index.html">
+ <span class="small">Building Apps for</span><br/>
+ TV
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+
+ <a href="<?cs var:toroot ?>training/tv/start/index.html"
+ ja-lang="TV アプリのビルド"
+ description="How to start building TV apps or extend your existing app to run on TV
+ devices.">
+ Building TV Apps</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/start/start.html"
+ ja-lang="TV アプリのビルドを開始する">
+ Getting Started with TV Apps</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/start/hardware.html"
+ ja-lang="TV ハードウェアを処理する">
+ Handling TV Hardware</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/start/layouts.html"
+ ja-lang="TV 向けレイアウトをビルドする">
+ Building TV Layouts</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/start/navigation.html"
+ ja-lang="TV 用のナビゲーションを作成する">
+ Creating TV Navigation</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/tv/playback/index.html"
+ ja-lang="TV 再生アプリのビルド"
+ description="How to build apps that provide media catalogs and play content.">
+ Building TV Playback Apps</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/playback/browse.html"
+ ja-lang="カタログ ブラウザを作成する">
+ Creating a Catalog Browser</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/playback/card.html">
+ Providing a Card View</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/playback/details.html"
+ ja-lang="詳細ビューをビルドする">
+ Building a Details View</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/playback/now-playing.html"
+ ja-lang="再生中カードを表示する">
+ Displaying a Now Playing Card</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/playback/guided-step.html">
+ Adding a Guided Step</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/playback/options.html">
+ Enabling Background Playback</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/tv/discovery/index.html"
+ description="How to help users discover content from your app.">
+ Helping Users Find Content on TV</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/discovery/recommendations.html">
+ Recommending TV Content</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/discovery/searchable.html">
+ Making TV Apps Searchable</a>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/discovery/in-app-search.html">
+ Searching within TV Apps</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/games/index.html"
+ description="How to build games for TV.">
+ Building TV Games</a>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/tv/tif/index.html"
+ description="How to build channels for TV.">
+ Building TV Channels</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/tif/tvinput.html">
+ Developing a TV Input Service</a>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/tif/channel.html">
+ Working with Channel Data</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/tif/ui.html">
+ Managing User Interaction</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/tv/publishing/checklist.html"
+ description="An itemized list of requirements for TV apps.">
+ TV Apps Checklist</a>
+ </li>
+ </ul>
+ </li>
+ <!-- End: Building for TV -->
+
+
+ <!-- Start: Building for Auto -->
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/auto/index.html">
+ <span class="small">Building Apps for</span><br/>
+ Auto
+ </a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/auto/start/index.html"
+ description="How to start building or extending apps that work
+ with Auto devices.">
+ Getting Started with Auto</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/auto/audio/index.html"
+ description="How to extend audio apps to play content on Auto devices.">
+ Playing Audio for Auto</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/auto/messaging/index.html"
+ description="How to extend text messaging apps to work with Auto devices.">
+ Messaging for Auto</a>
+ </li>
+ </ul>
+ </li>
+ <!-- End: Building for Auto -->
+
+
+ <!-- Start: Building for Work -->
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/enterprise/index.html">
+ <span class="small">Building Apps for</span><br/>
+ Work
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/enterprise/app-compatibility.html">
+ Ensuring Compatibility with Managed Profiles
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/enterprise/app-restrictions.html">
+ Implementing App Restrictions
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/enterprise/work-policy-ctrl.html">
+ Building a Device Policy Controller
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/enterprise/cosu.html">
+ Configuring Corporate-Owned, Single-Use Devices
+ </a>
+ </li>
+ </ul>
+ </li>
+ <!-- End: Building for Work -->
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-ux.html">
+ <span class="small">Best Practices for</span><br/>
+ Interaction & Engagement
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/design-navigation/index.html"
+ description=
+ "How to plan your app's screen hierarchy and forms of navigation so users can
+ effectively and intuitively traverse your app content using various navigation
+ patterns."
+ >Designing Effective Navigation</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/design-navigation/screen-planning.html">
+ Planning Screens and Their Relationships
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/design-navigation/multiple-sizes.html">
+ Planning for Multiple Touchscreen Sizes
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/design-navigation/descendant-lateral.html">
+ Providing Descendant and Lateral Navigation
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/design-navigation/ancestral-temporal.html">
+ Providing Ancestral and Temporal Navigation
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/design-navigation/wireframing.html">
+ Putting it All Together: Wireframing the Example App
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/implementing-navigation/index.html"
+ description=
+ "How to implement various navigation patterns such as swipe views,
+ a navigation drawer, and up navigation."
+ >Implementing Effective Navigation</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/implementing-navigation/lateral.html">
+ Creating Swipe Views with Tabs
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/implementing-navigation/nav-drawer.html">
+ Creating a Navigation Drawer
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/implementing-navigation/ancestral.html">
+ Providing Up Navigation
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/implementing-navigation/temporal.html">
+ Providing Proper Back Navigation
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/implementing-navigation/descendant.html">
+ Implementing Descendant Navigation
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/notify-user/index.html"
+ description=
+ "How to display messages called notifications outside of
+ your application's UI."
+ >Notifying the User</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/notify-user/build-notification.html">
+ Building a Notification
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/notify-user/navigation.html">
+ Preserving Navigation when Starting an Activity
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/notify-user/managing.html">
+ Updating Notifications
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/notify-user/expanded.html">
+ Using Big View Styles
+ </a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/notify-user/display-progress.html">
+ Displaying Progress in a Notification
+ </a>
+ </li>
+ </ul>
+ </li>
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/swipe/index.html"
+ description=
+ "How to modify your app's layout to support manual content updates triggered by the
+ swipe-to-refresh gesture."
+ >Supporting Swipe-to-Refresh</a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/swipe/add-swipe-interface.html"
+ >Adding Swipe-to-Refresh To Your App</a></li>
+ <li>
+ <a href="<?cs var:toroot ?>training/swipe/respond-refresh-request.html"
+ >Responding to a Refresh Gesture</a>
+ </li>
+ </ul>
+ </li>
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/search/index.html"
+ description=
+ "How to properly add a search interface to your app and create a searchable database."
+ >Adding Search Functionality</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/search/setup.html">
+ Setting up the Search Interface
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/search/search.html">
+ Storing and Searching for Data
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/search/backward-compat.html">
+ Remaining Backward Compatible
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/app-indexing/index.html"
+ description=
+ "How to enable deep linking and indexing of your application
+content so that users can open this content directly from their mobile search
+results."
+ >Making Your App Content Searchable by Google</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/app-indexing/deep-linking.html">
+ Enabling Deep Links for App Content
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/app-indexing/enabling-app-indexing.html">
+ Specifying App Content for Indexing
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/assistant.html"
+ description=
+ "Support contextually relevant actions through the Assist API."
+ >Optimizing Content for the Assistant</a>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section">
+ <a href="<?cs var:toroot ?>training/app-links/index.html"
+ description=
+ "How to enable the system to handle web requests by taking the user directly
+ to your app instead of your website."
+ >Handling App Links</a>
+ </div>
+ </li>
+ <!-- End Interaction and Engagement -->
+
+</ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-ui.html">
+ <span class="small">Best Practices for</span><br/>
+ User Interface
+ </a>
+ </div>
+ <ul>
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/multiscreen/index.html"
+ zh-cn-lang="针对多种屏幕进行设计"
+ ja-lang="複数画面のデザイン"
+ es-lang="Cómo diseñar aplicaciones para varias pantallas"
+ description=
+ "How to build a user interface that's flexible enough to
+ fit perfectly on any screen and how to create different interaction
+ patterns that are optimized for different screen sizes."
+ >Designing for Multiple Screens</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/multiscreen/screensizes.html"
+ zh-cn-lang="支持各种屏幕尺寸"
+ ko-lang="다양한 화면 크기 지원"
+ ja-lang="さまざまな画面サイズのサポート"
+ es-lang="Cómo admitir varios tamaños de pantalla"
+ >Supporting Different Screen Sizes</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiscreen/screendensities.html"
+ zh-cn-lang="支持各种屏幕密度"
+ ja-lang="さまざまな画面密度のサポート"
+ es-lang="Cómo admitir varias densidades de pantalla"
+ >Supporting Different Screen Densities</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiscreen/adaptui.html"
+ zh-cn-lang="实施自适应用户界面流程"
+ ja-lang="順応性のある UI フローの実装"
+ es-lang="Cómo implementar interfaces de usuario adaptables"
+ >Implementing Adaptive UI Flows</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/appbar/index.html"
+ description=
+ "How to use the support library's toolbar widget to implement an
+ app bar that displays properly on a wide range of devices."
+ >Adding the App Bar</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/appbar/setting-up.html"
+ >Setting Up the App Bar</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/appbar/actions.html"
+ >Adding and Handling Actions</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/appbar/up-action.html"
+ >Adding an Up Action</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/appbar/action-views.html"
+ >Action Views and Action Providers</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/snackbar/index.html"
+ description=
+ "How to use the support library's Snackbar widget to display a
+ brief pop-up message."
+ >Showing Pop-Up Messages</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/snackbar/showing.html"
+ >Building and Displaying a Pop-Up Message</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/snackbar/action.html"
+ >Adding an Action to a Message</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/custom-views/index.html"
+ description=
+ "How to build custom UI widgets that are interactive and smooth."
+ >Creating Custom Views</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/custom-views/create-view.html">
+ Creating a Custom View Class
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/custom-views/custom-drawing.html">
+ Implementing Custom Drawing
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/custom-views/making-interactive.html">
+ Making the View Interactive
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/custom-views/optimizing-view.html">
+ Optimizing the View
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/backward-compatible-ui/index.html"
+ description=
+ "How to use UI components and other APIs from the more recent versions of Android
+ while remaining compatible with older versions of the platform."
+ >Creating Backward-Compatible UIs</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/backward-compatible-ui/abstracting.html">
+ Abstracting the New APIs
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/backward-compatible-ui/new-implementation.html">
+ Proxying to the New APIs
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/backward-compatible-ui/older-implementation.html">
+ Creating an Implementation with Older APIs
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/backward-compatible-ui/using-component.html">
+ Using the Version-Aware Component
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/accessibility/index.html"
+ description=
+ "How to make your app accessible to users with vision
+ impairment or other physical disabilities."
+ >Implementing Accessibility</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/accessibility/accessible-app.html">
+ Developing Accessible Applications
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/accessibility/service.html">
+ Developing Accessibility Services
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/accessibility/testing.html">
+ Accessibility Testing Checklist
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/system-ui/index.html"
+ description=
+ "How to hide and show status and navigation bars across different versions of Android,
+ while managing the display of other screen components."
+ >Managing the System UI</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/system-ui/dim.html">
+ Dimming the System Bars
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/system-ui/status.html">
+ Hiding the Status Bar
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/system-ui/navigation.html">
+ Hiding the Navigation Bar
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/system-ui/immersive.html">
+ Using Immersive Full-Screen Mode
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/system-ui/visibility.html">
+ Responding to UI Visibility Changes
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/material/index.html"
+ description=
+ "How to implement material design on Android."
+ zh-cn-lang="面向开发者的材料设计"
+ zh-tw-lang="開發人員材料設計"
+ ja-lang="マテリアル デザインでのアプリ作成"
+ es-lang="Crear aplicaciones con Material Design"
+ pt-br-lang="Material Design para desenvolvedores"
+ ko-lang="개발자를 위한 머티리얼 디자인"
+ ru-lang="Создание приложений с помощью Material Design"
+ in-lang="Desain Bahan untuk Pengembang"
+ vi-lang="Material Design cho Nhà phát triển"
+ >Creating Apps with Material Design</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/material/get-started.html"
+ zh-cn-lang="入门指南"
+ zh-tw-lang="開始使用"
+ ja-lang="スタート ガイド"
+ es-lang="Comencemos"
+ pt-br-lang="Como iniciar"
+ ko-lang="시작하기"
+ ru-lang="Начало работы"
+ in-lang="Memulai"
+ vi-lang="Bắt đầu"
+ >
+ Getting Started
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/material/theme.html"
+ zh-cn-lang="使用材料主题"
+ zh-tw-lang="使用材料設計風格"
+ ja-lang="マテリアル テーマの使用"
+ es-lang="Usar el tema Material"
+ pt-br-lang="Como usar o tema do Material"
+ ko-lang="머티어리얼 테마 사용"
+ ru-lang="Использование темы Material Design"
+ in-lang="Menggunakan Tema Bahan"
+ vi-lang="Sử dụng Chủ đề Material"
+ >
+ Using the Material Theme
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/material/lists-cards.html"
+ zh-cn-lang="创建列表与卡片"
+ zh-tw-lang="建立清單和卡片"
+ ja-lang="リストとカードの作成"
+ es-lang="Crear listas y tarjetas"
+ pt-br-lang="Como criar listas e cartões"
+ ko-lang="목록 및 카드 생성"
+ ru-lang="Создание списков и подсказок"
+ in-lang="Membuat Daftar dan Kartu"
+ vi-lang="Tạo Danh sách và Thẻ"
+ >
+ Creating Lists and Cards
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/material/shadows-clipping.html"
+ zh-cn-lang="定义阴影与裁剪视图"
+ zh-tw-lang="定義陰影和裁剪檢視"
+ ja-lang="シャドウとクリッピング ビューの定義"
+ es-lang="Definir vistas de recorte y sombras"
+ pt-br-lang="Como definir sombras e recortar visualizações"
+ ko-lang="그림자 정의 및 뷰 클리핑"
+ ru-lang="Определение теней и обрезка представлений"
+ in-lang="Mendefinisikan Bayangan dan Memangkas Tampilan"
+ vi-lang="Định nghĩa Đổ bóng và Dạng xem Cắt hình"
+ >
+ Defining Shadows and Clipping Views
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/material/drawables.html"
+ zh-cn-lang="使用 Drawables"
+ zh-tw-lang="使用可繪項目"
+ ja-lang="ドローアブルの使用"
+ es-lang="Trabajar con interfaces dibujables"
+ pt-br-lang="Como trabalhar com desenháveis"
+ ko-lang="Drawable 사용"
+ ru-lang="Работа с элементами дизайна"
+ in-lang="Bekerja dengan Drawable"
+ vi-lang="Làm việc với Nội dung vẽ được"
+ >
+ Working with Drawables
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/material/animations.html"
+ zh-cn-lang="定义定制动画"
+ zh-tw-lang="定義自訂動畫"
+ ja-lang="カスタム アニメーションの定義"
+ es-lang="Definir animaciones personalizadas"
+ pt-br-lang="Como definir animações personalizadas"
+ ko-lang="사용자지정 애니메이션 정의"
+ ru-lang="Определение настраиваемой анимации"
+ in-lang="Mendefinisikan Animasi Custom"
+ vi-lang="Định nghĩa Hoạt hình Tùy chỉnh"
+ >
+ Defining Custom Animations
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/material/compatibility.html"
+ zh-cn-lang="维护兼容性"
+ zh-tw-lang="維持相容性"
+ ja-lang="互換性の維持"
+ es-lang="Mantener la compatibilidad"
+ pt-br-lang="Como manter a compatibilidade"
+ ko-lang="호환성 유지"
+ ru-lang="Обеспечение совместимости"
+ in-lang="Mempertahankan Kompatibilitas"
+ vi-lang="Duy trì Tính tương thích"
+ >
+ Maintaining Compatibility
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ </ul>
+ </li>
+ <!-- End User Interface -->
+
+
+
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-user-input.html">
+ <span class="small">Best Practices for</span><br/>
+ User Input
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/gestures/index.html"
+ description=
+ "How to write apps that allow users to interact with the touch screen via touch gestures."
+ >Using Touch Gestures</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/gestures/detector.html">
+ Detecting Common Gestures
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/gestures/movement.html">
+ Tracking Movement
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/gestures/scroll.html">
+ Animating a Scroll Gesture
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/gestures/multi.html">
+ Handling Multi-Touch Gestures
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/gestures/scale.html">
+ Dragging and Scaling
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/gestures/viewgroup.html">
+ Managing Touch Events in a ViewGroup
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/keyboard-input/index.html"
+ description=
+ "How to specify the appearance and behaviors of soft input methods (such
+ as on-screen keyboards) and how to optimize the experience with
+ hardware keyboards."
+ >Handling Keyboard Input</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/keyboard-input/style.html">
+ Specifying the Input Method Type
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/keyboard-input/visibility.html">
+ Handling Input Method Visibility
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/keyboard-input/navigation.html">
+ Supporting Keyboard Navigation
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/keyboard-input/commands.html">
+ Handling Keyboard Actions
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/game-controllers/index.html"
+ description=
+ "How to write apps that support game controllers."
+ >Supporting Game Controllers</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/game-controllers/controller-input.html">
+ Handling Controller Actions
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/game-controllers/compatibility.html">
+ Supporting Controllers Across Android Versions
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/game-controllers/multiple-controllers.html">
+ Supporting Multiple Game Controllers
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li> <!-- end of User Input -->
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-background.html">
+ <span class="small">Best Practices for</span><br/>
+ Background Jobs
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/run-background-service/index.html"
+ description=
+ "How to improve UI performance and responsiveness by sending work to a
+ Service running in the background"
+ >Running in a Background Service</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/run-background-service/create-service.html">
+ Creating a Background Service
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/run-background-service/send-request.html">
+ Sending Work Requests to the Background Service
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/run-background-service/report-status.html">
+ Reporting Work Status
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/load-data-background/index.html"
+ description="How to use CursorLoader to query data without
+ affecting UI responsiveness."
+ >Loading Data in the Background</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/load-data-background/setup-loader.html">
+ Running a Query with a CursorLoader</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/load-data-background/handle-results.html">
+ Handling the Results</a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/scheduling/index.html"
+ description="How to use repeating alarms and wake locks
+ to run background jobs."
+ >Managing Device Awake State</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/scheduling/wakelock.html">
+ Keeping the Device Awake</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/scheduling/alarms.html">
+ Scheduling Repeating Alarms</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li> <!-- end of Background Jobs -->
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-performance.html">
+ <span class="small">Best Practices for</span><br/>
+ Performance
+ </a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/memory.html"
+ description=
+ "How to keep your app's memory footprint small in order to improve performance
+ on a variety of mobile devices."
+ >Managing Your App's Memory</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/perf-tips.html"
+ description=
+ "How to optimize your app's performance in various ways to improve its
+ responsiveness and battery efficiency."
+ >Performance Tips</a>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/improving-layouts/index.html"
+ description=
+ "How to identify problems in your app's layout performance and improve the UI
+ responsiveness."
+ >Improving Layout Performance</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/improving-layouts/optimizing-layout.html">
+ Optimizing Layout Hierarchies
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/improving-layouts/reusing-layouts.html">
+ Re-using Layouts with <include/>
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/improving-layouts/loading-ondemand.html">
+ Loading Views On Demand
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/improving-layouts/smooth-scrolling.html">
+ Making ListView Scrolling Smooth
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/monitoring-device-state/index.html"
+ zh-cn-lang="优化电池使用时间"
+ ja-lang="電池消費量の最適化"
+ es-lang="Cómo optimizar la duración de la batería"
+ description=
+ "How to minimize the amount of power your app requires by adapting to current
+ power conditions and performing power-hungry tasks at proper intervals."
+ >Optimizing Battery Life
+ </a>
+ </div>
+ <ul>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/performance/battery/network/index.html">
+ Reducing Network Battery Drain
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/performance/battery/network/gather-data.html">
+ Collecting Network Traffic Data
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/performance/battery/network/analyze-data.html">
+ Analyzing Network Traffic Data
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/performance/battery/network/action-user-traffic.html">
+ Optimizing User-Initiated Network Use
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/performance/battery/network/action-app-traffic.html">
+ Optimizing App-Initiated Network Use
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/performance/battery/network/action-server-traffic.html">
+ Optimizing Server-Initiated Network Use
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/performance/battery/network/action-any-traffic.html">
+ Optimizing General Network Use
+ </a>
+ </li>
+ </ul>
+ </li> <!-- End of Reducing Network Battery Drain -->
+
+ <li><a href="<?cs var:toroot ?>training/monitoring-device-state/doze-standby.html"
+ >Optimizing for Doze and App Standby</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/monitoring-device-state/battery-monitoring.html"
+ zh-cn-lang="监控电池电量和充电状态"
+ ja-lang="電池残量と充電状態の監視"
+ es-lang="Cómo controlar el nivel de batería y el estado de carga"
+ >Monitoring the Battery Level and Charging State</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/monitoring-device-state/docking-monitoring.html"
+ zh-cn-lang="确定和监控基座对接状态和类型"
+ ja-lang="ホルダーの装着状態とタイプの特定と監視"
+ es-lang="Cómo determinar y controlar el tipo de conector y el estado de la conexión"
+ >Determining and Monitoring the Docking State and Type</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/monitoring-device-state/connectivity-monitoring.html"
+ zh-cn-lang="确定和监控网络连接状态"
+ ja-lang="接続状態の特定と監視"
+ es-lang="Cómo determinar y controlar el estado de la conectividad"
+ >Determining and Monitoring the Connectivity Status</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/monitoring-device-state/manifest-receivers.html"
+ zh-cn-lang="根据需要操作广播接收器"
+ ja-lang="オンデマンドでのブロードキャスト レシーバ操作"
+ es-lang="Cómo manipular los receptores de emisión bajo demanda"
+ >Manipulating Broadcast Receivers On Demand</a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/multiple-threads/index.html"
+ description=
+ "How to improve the performance and scalability of long-running operations by
+ dispatching work to multiple threads.">
+ Sending Operations to Multiple Threads</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/multiple-threads/define-runnable.html">
+ Specifying the Code to Run on a Thread
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiple-threads/create-threadpool.html">
+ Creating a Manager for Multiple Threads
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiple-threads/run-code.html">
+ Running Code on a Thread Pool Thread
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiple-threads/communicate-ui.html">
+ Communicating with the UI Thread
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/perf-anr.html"
+ description=
+ "How to keep your app responsive to user interaction so the UI does not lock-up and
+ display an "Application Not Responding" dialog."
+ >Keeping Your App Responsive</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/perf-jni.html"
+ description=
+ "How to efficiently use the Java Native Interface with the Android NDK."
+ >JNI Tips</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/smp.html"
+ description=
+ "Tips for coding Android apps on symmetric multiprocessor systems."
+ >SMP Primer for Android</a>
+ </li>
+ </ul>
+ </li> <!-- end of Performance -->
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-security.html">
+ <span class="small">Best Practices for</span><br/>
+ Security & Privacy
+ </a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/security-tips.html"
+ description=
+ "How to perform various tasks and keep your app's data and your user's data secure."
+ >Security Tips</a>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/security-ssl.html"
+ description=
+ "How to ensure that your app is secure when performing network transactions."
+ >Security with HTTPS and SSL</a>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/security-gms-provider.html"
+ description=
+ "How to use and update Google Play services security provider, to
+ protect against SSL exploits."
+ >Updating Your Security Provider to Protect Against SSL Exploits</a>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/safetynet/index.html"
+ description=
+ "How to use the SafetyNet service to analyze a device where your app is running
+ and get information about its compatibility with your app."
+ >Checking Device Compatibility with SafetyNet</a>
+ </li>
+
+ <li>
+ <a href="<?cs var:toroot ?>training/enterprise/device-management-policy.html"
+ description="How to create an application that enforces security policies on devices."
+ >Enhancing Security with Device Management Policies</a>
+ </li>
+ </ul>
+ </li>
+ <!-- End security and user info -->
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-permissions-ids.html">
+ <span class="small">Best Practices for</span><br/>
+ Permissions & Identifiers
+ </a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/user-data-overview.html"
+ description=
+ "Overview of app permissions on Android and how they affect your users."
+ >Permissions and User Data</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/user-data-permissions.html"
+ description=
+ "How to manage permissions the right way for users."
+ >Best Practices for App Permissions</a>
+ </li>
+ <li>
+ <a href="<?cs var:toroot ?>training/articles/user-data-ids.html"
+ description=
+ "Unique identifiers available and how to choose the right one for your use case."
+ >Best Practices for Unique Identifiers</a>
+ </li>
+ </ul>
+ </li>
+ <!-- End Permissions and identifiers -->
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/testing/index.html">
+ <span class="small">Best Practices for</span><br/>
+ Testing
+ </a>
+ </div>
+ <ul>
+ <li>
+ <a href="<?cs var:toroot ?>training/testing/start/index.html"
+ description="How to get started with testing your Android applications.">
+ Getting Started with Testing
+ </a>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>training/testing/unit-testing/index.html"
+ description="How to build effective unit tests for Android apps.">
+ Building Effective Unit Tests
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/testing/unit-testing/local-unit-tests.html">
+ <span class="en">Building Local Unit Tests</span>
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/testing/unit-testing/instrumented-unit-tests.html">
+ <span class="en">Building Instrumented Unit Tests</span>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>training/testing/ui-testing/index.html"
+ description="How to automate your user interface tests for Android apps.">
+ Automating UI Tests
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/testing/ui-testing/espresso-testing.html">
+ <span class="en">Testing UI for a Single App</span>
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/testing/ui-testing/uiautomator-testing.html">
+ <span class="en">Testing UI for Multiple Apps</span>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>training/testing/integration-testing/index.html"
+ description="How to build effective integration tests for Android apps.">
+ Testing App Component Integrations
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/testing/integration-testing/service-testing.html">
+ <span class="en">Testing Your Service</span></a></li>
+ <li><a href="<?cs var:toroot ?>training/testing/integration-testing/content-provider-testing.html">
+ <span class="en">Testing Your Content Provider</span></a></li>
+ </ul>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/testing/performance.html"
+ description="How to automate UI performance testing.">Testing Display Performance</a>
+ </li>
+ </ul>
+ </li>
+ <!-- End best Testing -->
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/distribute.html">
+ <span class="small">Using Google Play to</span><br/>
+ Distribute & Monetize
+ </a>
+ </div>
+ <ul>
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>training/in-app-billing/index.html"
+ description="How to sell in-app products from your application using In-app Billing.">
+ Selling In-app Products
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/in-app-billing/preparing-iab-app.html">
+ <span class="en">Preparing Your App</span>
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/in-app-billing/list-iab-products.html">
+ <span class="en">Establishing Products for Sale</span>
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/in-app-billing/purchase-iab-products.html">
+ <span class="en">Purchasing Products</span>
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/in-app-billing/test-iab-app.html">
+ <span class="en">Testing Your App</span>
+ </a>
+ </li>
+ </ul>
+ </li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/multiple-apks/index.html"
+ description=
+ "How to publish your app on Google Play with separate APKs that target
+ different devices, while using a single app listing."
+ >Maintaining Multiple APKs</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/multiple-apks/api.html">
+ Creating Multiple APKs for Different API Levels
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiple-apks/screensize.html">
+ Creating Multiple APKs for Different Screen Sizes
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiple-apks/texture.html">
+ Creating Multiple APKs for Different GL Textures
+ </a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/multiple-apks/multiple.html">
+ Creating Multiple APKs with 2+ Dimensions
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <!-- End best Publishing -->
+
+</ul><!-- nav -->
+<script type="text/javascript">
+<!--
+ buildToggleLists();
+ changeNavLang(getLangPref());
+//-->
+</script>
diff --git a/docs/html/training/performance/battery/network/action-any-traffic.jd b/docs/html/topic/performance/power/network/action-any-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-any-traffic.jd
rename to docs/html/topic/performance/power/network/action-any-traffic.jd
diff --git a/docs/html/training/performance/battery/network/action-app-traffic.jd b/docs/html/topic/performance/power/network/action-app-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-app-traffic.jd
rename to docs/html/topic/performance/power/network/action-app-traffic.jd
diff --git a/docs/html/training/performance/battery/network/action-server-traffic.jd b/docs/html/topic/performance/power/network/action-server-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-server-traffic.jd
rename to docs/html/topic/performance/power/network/action-server-traffic.jd
diff --git a/docs/html/training/performance/battery/network/action-user-traffic.jd b/docs/html/topic/performance/power/network/action-user-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-user-traffic.jd
rename to docs/html/topic/performance/power/network/action-user-traffic.jd
diff --git a/docs/html/training/performance/battery/network/analyze-data.jd b/docs/html/topic/performance/power/network/analyze-data.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/analyze-data.jd
rename to docs/html/topic/performance/power/network/analyze-data.jd
diff --git a/docs/html/training/performance/battery/network/gather-data.jd b/docs/html/topic/performance/power/network/gather-data.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/gather-data.jd
rename to docs/html/topic/performance/power/network/gather-data.jd
diff --git a/docs/html/training/performance/battery/network/index.jd b/docs/html/topic/performance/power/network/index.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/index.jd
rename to docs/html/topic/performance/power/network/index.jd
diff --git a/docs/html/topic/performance/reduce-apk-size.jd b/docs/html/topic/performance/reduce-apk-size.jd
new file mode 100644
index 0000000..1e73bf0
--- /dev/null
+++ b/docs/html/topic/performance/reduce-apk-size.jd
@@ -0,0 +1,538 @@
+page.title=Reduce APK Size
+trainingnavtop=true
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>This lesson teaches you to</h2>
+<ol>
+ <li><a href="#apk-structure">Understand the APK Structure</a></li>
+ <li><a href="#reduce-resources">Reduce Resource Count and Size</a></li>
+ <li><a href="#reduce-code">Reduce Native and Java Code</a></li>
+ <li><a href="#multiple-apks">Maintain Multiple Lean APKs</a></li>
+</ol>
+
+<h2>
+ You should also read
+</h2>
+
+<ul>
+ <li>
+ <a href="{@docRoot}studio/build/shrink-code.html">Shrink Your Code and
+ Resources</a>
+ </li>
+</ul>
+
+
+</div>
+</div>
+
+<p>
+ Users often avoid downloading apps that seem too large, particularly in
+ emerging markets where devices connect to often-spotty 2G and
+ 3G networks or work on pay-by-the-byte plans. This article describes how to
+ reduce your app's APK size, which enables more users to download your app.
+</p>
+
+<h2 id="apk-structure">
+ Understand the APK Structure
+</h2>
+
+<p>
+ Before discussing how to reduce the size of your app, it's helpful to
+ understand the structure of an app's APK. An APK file consists of a ZIP
+ archive that contains all the files that comprise your app. These files
+ include Java class files, resource files, and a file containing compiled
+ resources.
+</p>
+
+<p>
+An APK contains the following directories:
+</p>
+
+<ul>
+ <li>{@code META-INF/}: Contains the <code>CERT.SF</code> and
+ <code>CERT.RSA</code> signature files, as well as the {@code MANIFEST.MF}
+ manifest file.
+ </li>
+
+ <li>{@code assets/}: Contains the app's assets, which the app can retrieve
+ using an {@link android.content.res.AssetManager} object.
+ </li>
+
+ <li>
+ {@code res/}: Contains resources that aren't compiled into
+ <code>resources.arsc</code>.
+ </li>
+
+ <li>{@code lib/}: Contains the compiled code that is specific to the software
+ layer of a processor. This directory contains a subdirectory for each
+ platform type, like <code>armeabi</code>, <code>armeabi-v7a</code>,
+ <code>arm64-v8a</code>, <code>x86</code>, <code>x86_64</code>, and
+ <code>mips</code>.
+ </li>
+</ul>
+
+<p>
+An APK also contains the following files. Among them,
+only <code>AndroidManifest.xml</code> is mandatory.
+</p>
+
+<ul>
+ <li>{@code resources.arsc}: Contains compiled resources. This file contains
+ the XML content from all configurations of the <code>res/values/</code>
+ folder. The packaging tool extracts this XML content, compiles it to binary
+ form, and archives the content. This content includes language strings and
+ styles, as well as paths to content that is not included directly in the
+ <code>resources.arsc</code> file, such as layout files and images.
+ </li>
+
+ <li>{@code classes.dex}: Contains the classes compiled in the DEX file format
+ understood by the Dalvik/ART virtual machine.
+ </li>
+
+ <li>{@code AndroidManifest.xml}: Contains the core Android manifest file.
+ This file lists the name, version, access rights, and referenced library
+ files of the app. The file uses Android's binary XML format.
+ </li>
+</ul>
+
+<h2 id="reduce-resources">
+ Reduce Resource Count and Size
+</h2>
+
+<p>
+ The size of your APK has an impact on how fast your app loads, how much
+ memory it uses, and how much power it consumes. One of the simple ways to
+ make your APK smaller is to reduce the number and size of the
+ resources it contains. In particular, you can remove resources
+ that your app no longer uses, and you can use scalable {@link
+ android.graphics.drawable.Drawable} objects in place of image files. This
+ section discusses these methods as well as several other ways that you can
+ reduce the resources in your app to decrease the overall size of your APK.
+</p>
+
+<h3 id="remove-unused">
+ Remove Unused Resources
+</h3>
+
+<p>
+ The <a href="{@docRoot}studio/write/lint.html">{@code lint}</a> tool, a
+ static code analyzer included in Android Studio, detects resources in your
+ <code>res/</code> folder that your code doesn't reference. When the
+ <code>lint</code> tool discovers a potentially unused resource in your
+ project, it prints a message like the following example.
+</p>
+
+<pre class="no-pretty-print">
+res/layout/preferences.xml: Warning: The resource R.layout.preferences appears
+ to be unused [UnusedResources]
+</pre>
+<p class="note">
+ <strong>Note:</strong> The <code>lint</code> tool doesn't scan the {@code
+ assets/} folder, assets that are referenced via reflection, or library files
+ that you've linked to your app. Also, it doesn't remove resources; it only
+ alerts you to their presence.
+</p>
+
+<p>
+ Libraries that you add to your code may include unused resources. Gradle can
+ automatically remove resources on your behalf if you enable <a href=
+ "{@docRoot}studio/build/shrink-code.html">{@code shrinkResources}</a> in
+ your app's <code>build.gradle</code> file.
+</p>
+
+<pre class="prettyprint">
+android {
+ // Other settings
+
+ buildTypes {
+ release {
+ minifyEnabled true
+ shrinkResources true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+</pre>
+<p>
+ To use {@code shrinkResources}, you must enable code shrinking. During the
+ build process, first <a href=
+ "{@docRoot}studio/build/shrink-code.html">ProGuard</a> removes unused code
+ but leaves unused resources. Then Gradle removes the unused resources.
+</p>
+
+<p>
+ For more information about ProGuard and other ways
+ Android Studio helps you reduce APK size, see <a href=
+ "{@docRoot}studio/build/shrink-code.html">Shrink Your Code and Resources</a>.
+</p>
+
+<p>
+ In Android Gradle Plugin 0.7 and higher, you can declare the configurations
+ that your app supports. Gradle passes this information to the build system
+ using the {@code resConfig} and {@code resConfigs} flavors and the
+ <code>defaultConfig</code> option. The build system then prevents resources
+ from other, unsupported configurations from appearing in the APK, reducing
+ the APK's size. For more information about this feature, see <a href=
+ "{@docRoot}studio/build/shrink-code.html#unused-alt-resources">Remove unused
+ alternative resources</a>.
+</p>
+
+<h3 id="minimize">
+ Minimize Resource Use from Libraries
+</h3>
+
+<p>
+ When developing an Android app, you usually use external libraries to improve
+ your app's usability and versatility. For example, you might reference the
+ <a href="{@docRoot}topic/libraries/support-library/index.html">Android
+ Support Library</a> to improve the user experience on older devices, or you
+ could use <a class="external-link" href=
+ "https://developers.google.com/android/guides/overview">Google Play
+ Services</a> to retrieve automatic translations for text within your app.
+</p>
+
+<p>
+ If a library was designed for a server or desktop, it can include many
+ objects and methods that your app doesn’t need. To include only the parts of
+ the library that your app needs, you can edit the library's files if the
+ license allows you to modify the library. You can also use an alternative,
+ mobile-friendly library to add specific functionality to your app.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> <a href=
+ "{@docRoot}studio/build/shrink-code.html">ProGuard</a> can clean up some
+ unnecessary code imported with a library, but it can't remove a library's
+ large internal dependencies.
+</p>
+
+<h3 id="support-densities">
+ Support Only Specific Densities
+</h3>
+
+<p>
+ Android supports a very large set of devices, encompassing a variety of
+ screen densities. In Android 4.4 (API level 19) and higher, the framework
+ supports various densities: <code>ldpi</code>, <code>mdpi</code>,
+ <code>tvdpi</code>, <code>hdpi,</code> <code>xhdpi</code>,
+ <code>xxhdpi</code> and <code>xxxhdpi</code>. Although Android supports all
+ these densities, you don't need to export your rasterized assets to each
+ density.
+</p>
+
+<p>
+ If you know that only a small percentage of your users have devices with
+ specific densities, consider whether you need to bundle those densities into
+ your app. If you don't include resources for a specific screen density,
+ Android automatically scales existing resources originally designed for other
+ screen densities.
+</p>
+
+<p>
+ If your app needs only scaled images, you can save even more space by having
+ a single variant of an image in <code>drawable-nodpi/</code>. We recommend
+ that every app include at least an <code>xxhdpi</code> image variant.
+</p>
+
+<p>
+ For more information screen densities, see <a class="external-link" href=
+ "{@docRoot}about/dashboards/index.html#Screens">Screen Sizes and
+ Densities</a>.
+</p>
+
+<h3 id="reduce-frames">
+ Reduce Animation Frames
+</h3>
+
+<p>
+ Frame-by-frame animations can drastically increase the size of your APK.
+ Figure 1 shows an example of a frame-by-frame animation separated into
+ multiple PNG files within a directory. Each image is one frame in the
+ animation.
+</p>
+
+<p>
+ For each frame that you add to the animation, you increase the number of
+ images stored in the APK. In Figure 1, the image animates at 30 FPS within
+ the app. If the image animated at only 15 FPS instead, the animation would
+ require only half the number of needed frames.
+</p>
+
+<figure id="fig-frame-animations">
+ <img src="{@docRoot}images/training/performance/animation-frames.png" srcset=
+ "{@docRoot}images/training/performance/animation-frames.png 1x, {@docRoot}images/training/performance/animation-frames_2x.png 2x"
+ width="803" alt="">
+ <figcaption>
+ <strong>Figure 1.</strong> Frame by frame animations stored as resources.
+ </figcaption>
+</figure>
+
+<h3 id="use-drawables">
+ Use Drawable Objects
+</h3>
+
+<p>
+ Some images don't require a static image resource; the framework can
+ dynamically draw the image at runtime instead. {@link
+ android.graphics.drawable.Drawable} objects (<code><shape></code> in
+ XML) can take up a tiny amount of space in your APK. In addition, XML {@link
+ android.graphics.drawable.Drawable} objects produce monochromatic images
+ compliant with material design guidelines.
+</p>
+
+<h3 id="reuse-resources">
+ Reuse Resources
+</h3>
+
+<p>
+ You can include a separate resource for variations of an image, such as
+ tinted, shaded, or rotated versions of the same image. We recommend, however,
+ that you reuse the same set of resources, customizing them as needed at
+ runtime.
+</p>
+
+<p>
+ Android provides several utilities to change the color of an asset, either
+ using the {@code android:tint} and {@code tintMode} attributes on Android 5.0
+ (API level 21) and higher. For lower versions of the platform, use the {@link
+ android.graphics.ColorFilter} class.
+</p>
+<p>
+ You can also omit resources that are only a rotated equivalent of another
+ resource. The following code snippet provides an example of turning an
+ "expand" arrow into a "collapse" arrow icon by simply rotating the original
+ image 180 degrees:
+</p>
+
+<pre class="prettyprint">
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/ic_arrow_expand"
+ android:fromDegrees="180"
+ android:pivotX="50%"
+ android:pivotY="50%"
+ android:toDegrees="180" />
+</pre>
+<h3 id="render-code">
+ Render From Code
+</h3>
+
+<p>
+ You can also reduce your APK size by procedurally rendering your images.
+ Procedural rendering frees up space because you no longer store an image file
+ in your APK.
+</p>
+
+<h3 id="crunch">
+ Crunch PNG Files
+</h3>
+
+<p>
+ The <code>aapt</code> tool can optimize the image resources placed in
+ <code>res/drawable/</code> with lossless compression during the build
+ process. For example, the <code>aapt</code> tool can convert a true-color PNG
+ that does not require more than 256 colors to an 8-bit PNG with a color
+ palette. Doing so results in an image of equal quality but a smaller memory
+ footprint.
+</p>
+
+<p>
+ Keep in mind that the <code>aapt</code> has the following limitations:
+</p>
+
+<ul>
+ <li>The <code>aapt</code> tool does not shrink PNG files contained in the
+ <code>asset/</code> folder.
+ </li>
+
+ <li>Image files need to use 256 or fewer colors for the <code>aapt</code>
+ tool to optimize them.
+ </li>
+
+ <li>The <code>aapt</code> tool may inflate PNG files that have already been
+ compressed. To prevent this, you can use the <code>cruncherEnabled</code>
+ flag in Gradle to disable this process for PNG files:
+ </li>
+</ul>
+
+<pre class="prettyprint">
+aaptOptions {
+ cruncherEnabled = false
+}
+</pre>
+<h3 id="compress">
+ Compress PNG and JPEG Files
+</h3>
+
+<p>
+ You can reduce PNG file sizes without losing image quality using tools like
+ <a class="external-link" href=
+ "http://pmt.sourceforge.net/pngcrush/">pngcrush</a>, <a class="external-link"
+ href="https://pngquant.org/">pngquant</a>, or <a class="external-link" href=
+ "https://github.com/google/zopfli">zopflipng</a>. All of these tools can
+ reduce PNG file size while preserving image quality.
+</p>
+
+<p>
+ The {@code pngcrush} tool is particularly effective: This tool iterates over
+ PNG filters and zlib (Deflate) parameters, using each combination of filters
+ and parameters to compress the image. It then chooses the configuration that
+ yields the smallest compressed output.
+</p>
+
+<p>
+ For JPEG files, you can use tools like <a class="external-link" href=
+ "http://www.elektronik.htw-aalen.de/packjpg/">packJPG</a> that compress JPEG
+ files into a more compact form.
+</p>
+
+<h3 id="use-webp">
+ Use WebP File Format
+</h3>
+
+<p>
+ Instead of using PNG or JPEG files, you can also use the <a class=
+ "external-link" href="https://developers.google.com/speed/webp/">WebP</a>
+ file format for your images. The WebP format provides lossy compression (like
+ JPEG) as well as transparency (like PNG) but can provide better compression
+ than either JPEG or PNG.
+</p>
+
+<p>
+ Using the WebP file format has a few notable drawbacks, however. First,
+ support for WebP is not available in versions of the platform lower than
+ Android 3.2 (API level 13). Second, it takes a longer amount of time for the
+ system to decode WebP than PNG files.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> Google Play accepts APKs only if the included icons
+ use the PNG format. You can't use other file formats like JPEG or WebP for
+ app icons if you intend to publish your app through Google Play.
+</p>
+
+<h3 id="vector">
+ Use Vector Graphics
+</h3>
+
+<p>
+ You can use vector graphics to create resolution-independent icons and other
+ scalable media. Using these graphics can greatly reduce your APK footprint.
+ Vector images are represented in Android as {@link
+ android.graphics.drawable.VectorDrawable} objects. With a {@link
+ android.graphics.drawable.VectorDrawable } object, a 100-byte file can
+ generate a sharp image the size of the screen.
+</p>
+
+<p>
+ However, it takes a significant amount of time for the system to render each
+ {@link android.graphics.drawable.VectorDrawable} object, and larger images
+ take even longer to appear on the screen. Therefore, consider using these
+ vector graphics only when displaying small images.
+</p>
+
+<p>
+ For more information on working with {@link
+ android.graphics.drawable.VectorDrawable } objects, see <a class=
+ "external-link" href="{@docRoot}training/material/drawables.html">Working
+ with Drawables</a>.
+</p>
+
+<h2 id="reduce-code">
+ Reduce Native and Java Code
+</h2>
+
+<p>
+ There are several methods you can use to reduce the size of the Java and
+ native codebase in your app.
+</p>
+
+<h3 id="remove-generated">
+ Remove Unnecessary Generated Code
+</h3>
+
+<p>
+ Make sure to understand the footprint of any code which is automatically
+ generated. For example, many protocol buffer tools generate an excessive
+ number of methods and classes, which can double or triple the size of your
+ app.
+</p>
+
+<h3 id="remove-enums">
+ Remove Enumerations
+</h3>
+
+<p>
+ A single enum can add about 1.0 to 1.4 KB of size to your app's
+ <code>classes.dex</code> file. These additions can quickly accumulate for
+ complex systems or shared libraries. If possible, consider using the
+ <code>@IntDef</code> annotation and <a href=
+ "{@docRoot}studio/build/shrink-code.html">ProGuard</a> to strip enumerations
+ out and convert them to integers. This type conversion preserves all of the
+ type safety benefits of enums.
+</p>
+
+<h3 id="reduce-binaries">
+ Reduce the Size of Native Binaries
+</h3>
+
+<p>
+ If your app uses native code and the Android NDK, you can also reduce the
+ size of your app by optimizing your code. Two useful techniques are
+ removing debug symbols and not extracting native libraries.
+</p>
+
+<h4 id="remove-debug">
+ Remove Debug Symbols
+</h4>
+
+<p>
+ Using debug symbols makes sense if your application is in development and
+ still requires debugging. Use the <code>arm-eabi-strip</code> tool, provided
+ in the Android NDK, to remove unnecessary debug symbols from native
+ libraries. After that, you can compile your release build.
+</p>
+
+<h4 id="extract-false">
+ Avoid Extracting Native Libraries
+</h4>
+
+<p>
+ Store {@code .so} files uncompressed in the APK, and set the {@code
+ android:extractNativeLibs} flag to false in the <a href=
+ "{@docRoot}guide/topics/manifest/application-element.html">{@code
+ <application>}</a> element of your app manifest. This will prevent
+ {@link android.content.pm.PackageManager} from copying out {@code .so} files
+ from the APK to the filesystem during installation and will have the added
+ benefit of making delta updates of your app smaller.
+</p>
+
+<h2 id="multiple-apks">
+ Maintain Multiple Lean APKs
+</h2>
+
+<p>
+ Your APK can contain content that users download but never use, like regional
+ or language information. To create a minimal download for your users, you can
+ segment your app into several APKs, differentiated by factors such as screen
+ size or GPU texture support.
+</p>
+
+<p>
+ When a user downloads your app, their device receives the correct APK based
+ on the device's features and settings. This way, devices don't receive assets
+ for features that the devices don't have. For example, if a user has a
+ <code>hdpi</code> device, they don’t need <code>xxxhdpi</code> resources that
+ you might include for devices with higher density displays.
+</p>
+
+<p>
+ For more information, see <a href=
+ "{@docRoot}studio/build/configure-apk-splits.html">Configure APK Splits</a>
+ and <a class="external-link" href=
+ "{@docRoot}training/multiple-apks/index.html">Maintaining Multiple APKs</a>.
+</p>
diff --git a/docs/html/topic/performance/scheduling.jd b/docs/html/topic/performance/scheduling.jd
new file mode 100644
index 0000000..c11cf9b
--- /dev/null
+++ b/docs/html/topic/performance/scheduling.jd
@@ -0,0 +1,285 @@
+page.title=Intelligent Job-Scheduling
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+ <li><a href="#js">Android Framework JobScheduler</a></li>
+ <li><a href="#am">AlarmManager</a></li>
+ <li><a href="#fjd">Firebase JobDispatcher</a></li>
+ <li><a href="#gcmnm">GCM Network Manager</a></li>
+ <li><a href="#af">Additional Facilities</a></li>
+ <ul>
+ <li><a href="#sa">SyncAdapter</a></li>
+ <li><a href="#services">Services</a></li>
+ </ul>
+ <li><a href="#ap">Additional Points</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>
+Modern apps can perform many of their tasks asynchronously, outside the
+direct flow of user interaction. Some examples of these asynchronous tasks are:
+</p>
+
+<ul>
+ <li>Updating network resources.</li>
+ <li>Downloading information.</li>
+ <li>Updating background tasks.</li>
+ <li>Scheduling system service calls.</li>
+</ul>
+
+<p>
+Scheduling this work intelligently can improve your app’s performance,
+along with aspects of system health such as battery life. {@link android.app.job.JobScheduler}
+does this scheduling work for you.
+<p>
+
+<p>
+There are several APIs that your app can use to schedule background work. Chief
+among these options is {@link android.app.job.JobScheduler}.
+The {@link android.app.job.JobScheduler} API allows you to specify robust
+conditions for executing tasks,
+along with centralized task scheduling across the device for optimal
+system health. {@link android.app.job.JobScheduler} also offers highly
+scalable functionality: it is suitable for small tasks like clearing a cache,
+and for large ones such as syncing a database to the cloud.
+<p>
+
+<p>
+In addition to {@link android.app.job.JobScheduler}, there are several other
+facilities available to help your app schedule work. These include:
+</p>
+
+<ul>
+ <li><a href="{@docRoot}reference/android/app/AlarmManager.html">AlarmManager
+ </a></li>
+ <li><a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+ Firebase JobDispatcher</a></li>
+ <li><a href="https://developers.google.com/cloud-messaging/network-manager">
+ GCM Network Manager</a></li>
+ <li><a href="{@docRoot}reference/android/content/AbstractThreadedSyncAdapter.html">
+ SyncAdapter</a></li>
+ <li><a href="{@docRoot}reference/android/content/AbstractThreadedSyncAdapter.html">
+ Additional Facilities</a></li>
+</ul>
+
+<p>
+This page provides brief introductions to {@link android.app.job.JobScheduler}
+and other APIs that can help your app schedule work to maximize app performance
+and system health.
+</p>
+
+<h2 id="js">Android Framework JobScheduler</h2>
+
+<p>
+{@link android.app.job.JobScheduler} is the Android framework’s native platform
+for scheduling tasks or work. It first became available in Android 5.0 (API
+level 21), and remains under active development. Notably, Android N (API
+level 24) added the ability to trigger jobs based on
+{@link android.content.ContentProvider} changes.
+</p>
+
+<p>
+{@link android.app.job.JobScheduler} is implemented in the platform, which
+allows it to collect information about jobs that need to run across all apps.
+This information is used to schedule jobs to run at, or around, the same time.
+Batching job execution in this fashion allows the device to enter and stay in
+sleep states longer, preserving battery life.
+</p>
+
+<p>
+You use {@link android.app.job.JobScheduler} by registering jobs, specifying
+their requirements for network and timing. The system then gracefully schedules
+the jobs to execute at the appropriate times. At the same time, it also defers
+job execution as necessary to comply with
+<a href="{@docRoot}topic/performance/monitoring-device-state/doze-standby.html">
+Doze and App Standby</a> restrictions.
+{@link android.app.job.JobScheduler} provides many methods to define
+job-execution conditions.
+</p>
+
+<p>
+If your app targets Android 5.0 (API level 21), we recommend that you use the
+{@link android.app.job.JobScheduler} to execute background tasks. For more
+information about {@link android.app.job.JobScheduler}, see its
+<a href="{@docRoot}reference/android/app/job/JobScheduler.html">API-reference
+documentation.</a>
+</p>
+
+<h2 id="am">AlarmManager</h2>
+
+<p>
+The {@link android.app.AlarmManager} API is another option that the framework
+provides for scheduling tasks. This API is useful in cases in which an app
+needs to post a notification or set off an alarm at a very specific time.
+</p>
+
+<p>
+You should only use this API for tasks that must execute at a specific time,
+but do not require the other, more robust, execution conditions that
+{@link android.app.job.JobScheduler} allows you to specify, such as device
+idle and charging detect.
+</p>
+
+<p>
+{@link android.app.AlarmManager} does not honor
+<a href="{@docRoot}topic/performance/monitoring-device-state/doze-standby.html">
+Doze and App Standby</a> restrictions; it runs tasks even during
+<a href="{@docRoot}topic/performance/monitoring-device-state/doze-standby.html">
+Doze or App Standby</a> mode. Additionally,
+an app running during
+<a href="{@docRoot}topic/performance/monitoring-device-state/doze-standby.html">
+Doze or App Standby</a> mode cannot use the network.
+</p>
+
+<h2 id="fjd">Firebase JobDispatcher</h2>
+
+<p>
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a> is an open-source library that provides an API similar to
+{@link android.app.job.JobScheduler} in the Android platform.
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a> serves as a
+{@link android.app.job.JobScheduler}-compatibility layer for apps targeting
+versions of Android lower than 5.0 (API level 21).
+</p>
+
+<p>
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a> supports the use of Google Play services as an
+implementation for dispatching (running) jobs, but the library also allows you
+to define and use other implementations: For example, you might decide to use
+{@link android.app.job.JobScheduler} or write your own, custom code.
+Because of this versatility, we recommend that you use this
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a> if your app targets a version of Android lower
+than 5.0 (API level 21).
+</p>
+
+<p>
+For more information about
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a>, refer to its
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+documentation and source code</a>.
+</p>
+
+<h2 id = "gcmnm">GCM Network Manager</h2>
+
+<p>
+<a href="https://developers.google.com/cloud-messaging/network-manager">GCM
+Network Manager</a> is a compatibility port of the Android
+{@link android.app.job.JobScheduler} for apps that support versions of Android
+prior to 5.0 (API level 21). This API has all of the same advantages as
+{@link android.app.job.JobScheduler}. However, it depends on Google Play
+services, which acts like {@link android.app.job.JobScheduler} by taking care
+of cross-app job scheduling to improve battery life. This client library is
+part of the Google Play services GCM client library, but does not require
+that an app use
+<a href="https://developers.google.com/cloud-messaging/">Google Cloud
+Messaging</a>.
+</p>
+
+<p>
+This library is an earlier version of
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a>. Forward development on GCM Network Manager has
+stopped; we recommend that you use
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a> going forward.
+</p>
+
+<h2 id="af">Additional Facilities</h2>
+
+<p>
+In addition to the APIs and libraries described above, there are also sync
+adapters and services that can enable your app, under specific conditions,
+to perform better and more robustly.
+</p>
+
+<h3 id="sa">SyncAdapter</h3>
+
+<p>
+The framework continues to provide the
+{@link android.content.AbstractThreadedSyncAdapter SyncAdapter} class for
+managing tasks that sync data between the device and a server. Sync adapters are
+designed specifically for syncing data between a device and the cloud; you
+should only use them for this type of task. Sync adapters are more complex to
+implement than the libraries and APIs mentioned above, because they require at
+least a fake
+<a href="{@docRoot}training/sync-adapters/creating-authenticator.html">
+authenticator</a>and
+<a href="{@docRoot}training/sync-adapters/creating-stub-provider.html">
+content provider</a> implementation. For these reasons, you typically should
+not create a sync adapter just to sync data to the cloud in the
+background. Wherever possible, you should instead use
+{@link android.app.job.JobScheduler},
+<a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+Firebase JobDispatcher</a>, or
+<a href="https://developers.google.com/cloud-messaging/network-manager">GCM
+Network Manager</a> .
+</p>
+
+<p>
+In Android N (API level 24), the {@code SyncManager} sits on top of
+the {@link android.app.job.JobScheduler}. You should only use the
+{@link android.content.AbstractThreadedSyncAdapter SyncAdapter}
+class if you require the additional functionality that it provides.
+</p>
+
+<h3 id="services">Services</h3>
+
+<p>
+The <a href="{@docRoot}guide/components/services.html">Services</a>
+framework allows you to perform long-running operations in the background.
+We recommend foreground services for tasks, such as playing
+music, which need to stay resident for the user. Bound services also continue
+to be useful for various use cases: for example, when a service needs to
+run only when a user is viewing a fragment or activity.
+</p>
+
+<p>
+You should avoid using started services that run perpetually or
+perform periodic work, since they continue to use device resources
+even when they are not performing useful tasks. Instead, you
+should use other solutions that this page describes,
+and that provide native lifecycle management. Use started services
+only as a last resort. The Android platform may not support
+started services in the future.
+</p>
+
+<h2 id="ap">Additional Points</h2>
+
+<p>
+Regardless of the solution you adopt, keep the following points in mind:
+</p>
+
+<ul>
+ <li>Captive Internet Portals, VPNs, and proxies can pose
+ Internet-connectivity detection problems. A library or API may think the
+ Internet is available, but your service may not be accessible. Fail
+ gracefully and reschedule as few of your tasks as possible.</li>
+ <li>Depending on the conditions you assign for running a task,
+ such as network availability, after the task is triggered, a
+ change may occur so that those conditions are no longer met.
+ In such a case, your operation may fail unexpectedly and repeatedly.
+ For this reason, you
+ should code your background task logic to notice when tasks are failing
+ persistently, and perform exponential back-off to avoid
+ inadvertently over-using resources.</li>
+
+
+
+ <li>Remember to use exponential backoff when rescheduling any work,
+ especially when using {@link android.app.AlarmManager}. If your app uses
+ {@link android.app.job.JobScheduler},
+ <a href="https://developers.google.com/cloud-messaging/network-manager">GCM
+ Network Manager</a>,
+ <a href="https://github.com/firebase/firebase-jobdispatcher-android#user-content-firebase-jobdispatcher-">
+ Firebase JobDispatcher</a>, or sync adapters, exponential backoff is automatically used.</li>
+</ul>
diff --git a/docs/html/topic/performance/threads.jd b/docs/html/topic/performance/threads.jd
new file mode 100644
index 0000000..b2a2d9f
--- /dev/null
+++ b/docs/html/topic/performance/threads.jd
@@ -0,0 +1,453 @@
+page.title=Threading Performance
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#main">Main Thread</a>
+ <ol>
+ <li><a href="#internals">Internals</a></li>
+ </ol>
+</li>
+<li><a href="#references">Threading and UI Object References</a>
+ <ol>
+ <li><a href="#explicit">Explicit references</a></li>
+ <li><a href="#implicit">Implicit references</a></li>
+ </ol>
+</li>
+<li><a href="#lifecycles">Threading and App and Activity Lifecycles</a>
+ <ol>
+ <li><a href="#persisting">Persisting threads</a></li>
+ <li><a href="#priority">Thread priority</a></li>
+ </ol>
+ </li>
+<li><a href="#helper">Helper Classes for Threading</a>
+ <ol>
+ <li><a href="#asynctask">The AsyncTask class</a></li>
+ <li><a href="#handlerthread">The HandlerThread class</a></li>
+ <li><a href="#threadpool">The ThreadPoolExecutor class</a></li>
+ </ol>
+ </li>
+</ol>
+</div>
+</div>
+
+<p>
+Making adept use of threads on Android can help you boost your app’s
+performance. This page discusses several aspects of working with threads:
+working with the UI, or main, thread; the relationship between app lifecycle and
+thread priority; and, methods that the platform provides to help manage thread
+complexity. In each of these areas, this page describes potential pitfalls and
+strategies for avoiding them.
+</p>
+<h2 id="main">Main Thread</h2>
+<p>
+When the user launches your app, Android creates a new <a
+href="{@docRoot}guide/components/fundamentals.html">Linux
+process</a> along with an execution thread. This <strong>main thread,</strong>
+also known as the UI thread, is responsible for everything that happens
+onscreen. Understanding how it works can help you design your app to use the
+main thread for the best possible performance.
+</p>
+<h3 id="internals">Internals</h3>
+<p>
+The main thread has a very simple design: Its only job is to take and execute
+blocks of work from a thread-safe work queue until its app is terminated. The
+framework generates some of these blocks of work from a variety of places. These
+places include callbacks associated with lifecycle information, user events such
+as input, or events coming from other apps and processes. In addition, app can
+explicitly enqueue blocks on their own, without using the framework.
+</p>
+<p>
+Nearly <a
+href="https://www.youtube.com/watch?v=qk5F6Bxqhr4&index=1&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE">any
+block of code your app executes</a> is tied to an event callback, such as input,
+layout inflation, or draw. When something triggers an event, the thread where the event
+happened pushes the event out of itself, and into the main thread’s message
+queue. The main thread can then service the event.
+</p>
+
+<p>
+While an animation or screen update is occurring, the system tries to execute a
+block of work (which is responsible for drawing the screen) every 16ms or so, in
+order to render smoothly at <a
+href="https://www.youtube.com/watch?v=CaMTIgxCSqU&index=62&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE">60
+frames per second</a>. For the system to reach this goal, some operations must
+happen on the main thread. However, when the main thread’s messaging queue
+contains tasks that are either too numerous or too long for the main thread to
+complete work within the 16ms window, the app should move this work to a worker
+thread. If the main thread cannot finish executing blocks of work within 16ms,
+the user may observe hitching, lagging, or a lack of UI responsiveness to input.
+If the main thread blocks for approximately five seconds, the system displays
+the <a
+href="{@docRoot}training/articles/perf-anr.html"><em>Application
+Not Responding</em></a> (ANR) dialog, allowing the user to close the app directly.
+</p>
+<p>
+Moving numerous or long tasks from the main thread, so that they don’t interfere
+with smooth rendering and fast responsiveness to user input, is the biggest
+reason for you to adopt threading in your app.
+</p>
+<h2 id="references">Threading and UI Object References</h2>
+<p>
+By design, <a
+href="https://www.youtube.com/watch?v=tBHPmQQNiS8&index=3&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE">Android
+UI objects are not thread-safe</a>. An app is expected to create, use, and
+destroy UI objects, all on the main thread. If you try to modify
+or even reference a UI object in a thread other than the main thread, the result
+can be exceptions, silent failures, crashes, and other undefined misbehavior.
+</p>
+<p>
+Issues with references fall into two distinct categories: explicit references
+and implicit references.
+</p>
+<h3 id="explicit">Explicit references</h3>
+<p>
+Many tasks on non-main threads have the end goal of updating UI objects.
+However, if one of these threads accesses an object in the view hierarchy,
+application instability can result: If a worker thread changes the properties of
+that object at the same time that any other thread is referencing the object,
+the results are undefined.
+</p>
+<p>
+For example, consider an app that holds a direct reference to a UI object on a
+worker thread. The object on the worker thread may contain a reference to a
+{@link android.view.View}; but before the work completes, the {@link android.view.View} is
+removed from the view hierarchy. When these two actions happen simultaneously,
+the reference keeps the {@link android.view.View} object in memory and sets properties on it.
+However, the user never sees
+this object, and the app deletes the object once the reference to it is gone.
+</p>
+
+<p>
+In another example, {@link android.view.View} objects contain references to the activity
+that owns them. If
+that activity is destroyed, but there remains a threaded block of work that
+references it—directly or indirectly—the garbage collector will not collect
+the activity until that block of work finishes executing.
+</p>
+<p>
+This scenario can cause a problem in situations where threaded work may be in
+flight while some activity lifecycle event, such as a screen rotation, occurs.
+The system wouldn’t be able to perform garbage collection until the in-flight
+work completes. As a result, there may be two {@link android.app.Activity} objects in
+memory until garbage collection can take place.
+</p>
+
+<p>
+With scenarios like these, we suggest that your app not include explicit
+references to UI objects in threaded work tasks. Avoiding such references helps you avoid
+these types of memory leaks, while also steering clear of threading contention.
+</p>
+<p>
+In all cases, your app should only update UI objects on the main thread. This
+means that you should craft a negotiation policy that allows multiple threads to
+communicate work back to the main thread, which tasks the topmost activity or
+fragment with the work of updating the actual UI object.
+</p>
+<h3 id="implicit">Implicit references</h3>
+<p>
+A common code-design flaw with threaded objects can be seen in the snippet of
+code below:
+</p>
+<pre class="prettyprint">
+public class MainActivity extends Activity {
+ // …...
+ public class MyAsyncTask extends AsyncTask<Void, Void, String> {
+ @Override protected String doInBackground(Void... params) {...}
+ @Override protected void onPostExecute(String result) {...}
+ }
+}
+</pre>
+<p>
+The flaw in this snippet is that the code declares the threading object
+{@code MyAsyncTask} as an inner class of some activity. This declaration creates an
+implicit reference to the enclosing {@link android.app.Activity} object.
+As a result, the object contains a reference to the activity until the
+threaded work completes, causing a delay in the destruction of the referenced activity.
+This delay, in turn, puts more pressure on memory.
+</p>
+<p>
+A direct solution to this problem would be to define your overloaded class
+instances in their own files, thus removing the implicit reference.
+</p>
+<p>
+Another solution is to declare the {@link android.os.AsyncTask} object
+as a static nested class. Doing so eliminates the implicit reference problem
+because of the way a static nested
+class differs from an inner class: An instance of an inner class requires an
+instance of the outer class to be instantiated, and has direct access to the
+methods and fields of its enclosing instance. By contrast, a static nested class
+does not require a reference to an instance of enclosing class, so it contains
+no references to the outer class members.
+</p>
+<pre class="prettyprint">
+public class MainActivity extends Activity {
+ // …...
+ Static public class MyAsyncTask extends AsyncTask<Void, Void, String> {
+ @Override protected String doInBackground(Void... params) {...}
+ @Override protected void onPostExecute(String result) {...}
+ }
+}
+</pre>
+<h2 id="lifecycles">Threading and App and Activity Lifecycles</h2>
+<p>
+The app lifecycle can affect how threading works in your application.
+You may need to decide that a thread should, or should not, persist after an
+activity is destroyed. You should also be aware of the relationship between
+thread prioritization and whether an activity is running in the foreground or
+background.
+</p>
+<h3 id="persisting">Persisting threads</h3>
+<p>
+Threads persist past the lifetime of the activities that spawn them. Threads
+continue to execute, uninterrupted, regardless of the creation or destruction of
+activities. In some cases, this persistence is undesirable.
+</p>
+<p>
+Consider a case in which an activity spawns a set of threaded work blocks, and
+is then destroyed before a worker thread can execute the blocks. What should the
+app do with the blocks that are in flight?
+</p>
+
+<p>
+If the blocks were going to update a UI that no longer exists, there’s no reason
+for the work to continue. For example, if the work is to load user information
+from a database, and then update views, the thread is no longer necessary.
+</p>
+
+<p>
+By contrast, the work packets may have some benefit not entirely related to the
+UI. In this case, you should persist the thread. For example, the packets may be
+waiting to download an image, cache it to disk, and update the associated
+{@link android.view.View} object. Although the object no longer exists, the acts of downloading and
+caching the image may still be helpful, in case the user returns to the
+destroyed activity.
+</p>
+
+<p>
+Managing lifecycle responses manually for all threading objects can become
+extremely complex. If you don’t manage them correctly, your app can suffer from
+memory contention and performance issues. <a
+href="{@docRoot}guide/components/loaders.html">Loaders</a>
+are one solution to this problem. A loader facilitates asynchronous loading of
+data, while also persisting information through configuration changes.
+</p>
+<h3 id="priority">Thread priority</h3>
+<p>
+As described in <a
+href="{@docRoot}guide/topics/processes/process-lifecycle.html">Processes
+and the Application Lifecycle</a>, the priority that your app’s threads receive
+depends partly on where the app is in the app lifecycle. As you create and
+manage threads in your application, it’s important to set their priority so that
+the right threads get the right priorities at the right times. If set too high,
+your thread may interrupt the UI thread and RenderThread, causing your app to
+drop frames. If set too low, you can make your async tasks (such as image
+loading) slower than they need to be.
+</p>
+<p>
+Every time you create a thread, you should call
+{@link android.os.Process#setThreadPriority(int, int) setThreadPriority()}.
+The system’s thread
+scheduler gives preference to threads with high priorities, balancing those
+priorities with the need to eventually get all the work done. Generally, threads
+in the <a
+href="https://www.youtube.com/watch?v=NwFXVsM15Co&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE&index=9">foreground
+group get about 95%</a> of the total execution time from the device, while the
+background group gets roughly 5%.
+</p>
+<p>
+The system also assigns each thread its own priority value, using the
+{@link android.os.Process} class.
+</p>
+<p>
+By default, the system sets a thread’s priority to the same priority and group
+memberships as the spawning thread. However, your application can explicitly
+adjust thread priority by using
+{@link android.os.Process#setThreadPriority(int, int) setThreadPriority()}.
+</p>
+<p>
+The {@link android.os.Process}
+class</a> helps reduce complexity in assigning priority values by providing a
+set of constants that your app can use to set thread priorities. For example, <a
+href="{@docRoot}reference/android/os/Process.html#THREAD_PRIORITY_DEFAULT">THREAD_PRIORITY_DEFAULT</a>
+represents the default value for a thread. Your app should set the thread's priority to <a
+href="{@docRoot}reference/android/os/Process.html#THREAD_PRIORITY_BACKGROUND">THREAD_PRIORITY_BACKGROUND</a>
+for threads that are executing less-urgent work.
+</p>
+<p>
+Your app can use the <a
+href="{@docRoot}reference/android/os/Process.html#THREAD_PRIORITY_LESS_FAVORABLE">THREAD_PRIORITY_LESS_FAVORABLE</a>
+and <a
+href="{@docRoot}reference/android/os/Process.html#THREAD_PRIORITY_MORE_FAVORABLE">THREAD_PRIORITY_MORE_FAVORABLE</a>
+constants as incrementers to set relative priorities. A list of all of these
+enumerated states and modifiers appears in the reference documentation for
+the {@link android.os.Process#THREAD_PRIORITY_AUDIO} class.
+
+For more information on
+managing threads, see the reference documentation about the
+{@link java.lang.Thread} and {@link android.os.Process} classes.
+</p>
+<p>
+https://developer.android.com/reference/android/os/Process.html#THREAD_PRIORITY_AUDIO
+</p>
+<h2 id="helper">Helper Classes for Threading</h2>
+<p>
+The framework provides the same Java classes & primitives to facilitate
+threading, such as the {@link java.lang.Thread} and
+{@link java.lang.Runnable} classes.
+In order to help reduce the cognitive load associated with
+of developing threaded applications for
+Android, the framework provides a set of helpers which can aide in development.
+Each helper class has a specific set of performance nuances that make them
+unique for a specific subset of threading problems. Using the wrong class for
+the wrong situation can lead to performance issues.
+</p>
+<h3 id="asynctask">The AsyncTask class</h3>
+<p>
+
+The {@link android.os.AsyncTask} class
+is a simple, useful primitive for apps that need to quickly move work from the
+main thread onto worker threads. For example, an input event might trigger the
+need to update the UI with a loaded bitmap. An {@link android.os.AsyncTask}
+object can offload the
+bitmap loading and decoding to an alternate thread; once that processing is
+complete, the {@link android.os.AsyncTask} object can manage receiving the work
+back on the main thread to update the UI.
+</p>
+<p>
+When using {@link android.os.AsyncTask}, there are a few important performance
+aspects to keep in
+mind. First, by default, an app pushes all of the {@link android.os.AsyncTask}
+objects it creates into a
+single thread. Therefore, they execute in serial fashion, and—as with the
+main
+thread—an especially long work packet can block the queue. For this reason,
+we suggest that you only use {@link android.os.AsyncTask} to handle work items
+shorter than 5ms in duration.
+</p>
+<p>
+{@link android.os.AsyncTask} objects are also the most common offenders
+for implicit-reference issues.
+{@link android.os.AsyncTask} objects present risks related to explicit
+references, as well, but these are
+sometimes easier to work around. For example, an {@link android.os.AsyncTask}
+may require a reference to a UI object in order to update the UI object
+properly once {@link android.os.AsyncTask} executes its callbacks on the
+main thread. In such a situation, you
+can use a {@link java.lang.ref.WeakReference}
+to store a reference to the required UI object, and access the object once the
+{@link android.os.AsyncTask} is operating on the main thread. To be clear,
+holding a {@link java.lang.ref.WeakReference}
+to an object does not make the object thread-safe; the
+{@link java.lang.ref.WeakReference} merely
+provides a method to handle issues with explicit references and garbage
+collection.
+</p>
+<h3 id="handlerthread">The HandlerThread class</h3>
+<p>
+While an {@link android.os.AsyncTask}
+is useful,<a
+href="https://www.youtube.com/watch?v=adPLIAnx9og&index=5&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE">
+it may not always be the right solution</a> to your threading problem. Instead,
+you may need a more traditional approach to executing a block of work on a
+longer running thread, and some ability to manage that workflow manually.
+</p>
+
+<p>
+Consider a common challenge with getting preview frames from your
+{@link android.hardware.Camera} object.
+ When you register for Camera preview frames, you receive them in the
+ {@link android.hardware.Camera.PreviewCallback#onPreviewFrame(byte[], android.hardware.Camera) onPreviewFrame()}
+callback, which is invoked on the event thread it was called from. If this
+callback were invoked on the UI thread, the task of dealing with the huge pixel
+arrays would be interfering with rendering and event processing work. The same
+problem applies to {@link android.os.AsyncTask}, which also executes jobs serially and is
+susceptible to blocking.
+</p>
+<p>
+This is a situation where a handler thread would be appropriate: A handler thread
+is effectively a long-running thread that grabs work from a queue, and operates
+on it. In this example, when your app delegates the
+{@link android.hardware.Camera#open Camera.open()} command to a
+block of work on the handler thread, the associated
+ {@link android.hardware.Camera.PreviewCallback#onPreviewFrame(byte[], android.hardware.Camera) onPreviewFrame()}
+callback
+lands on the handler thread, rather than the UI or {@link android.os.AsyncTask}
+threads. So, if you’re going to be doing long-running work on the pixels, this
+may be a better solution for you.
+</p>
+<p>
+When your app creates a thread using {@link android.os.HandlerThread}, don’t
+forget to set the thread’s
+<a href="https://www.youtube.com/watch?v=NwFXVsM15Co&index=9&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE">
+priority based on the type of work it’s doing</a>. Remember, CPUs can only
+handle a small number of threads in parallel. Setting the priority helps
+the system know the right ways to schedule this work when all other threads
+are fighting for attention.
+</p>
+<h3 id="threadpool">The ThreadPoolExecutor class</h3>
+<p>
+There are certain types of work that can be reduced to highly parallel,
+distributed tasks. One such task, for example, is calculating a filter for each
+8x8 block of an 8 megapixel image. With the sheer volume of work packets this
+creates, <a
+href="https://www.youtube.com/watch?v=uCmHoEY1iTM&index=6&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE">
+{@code AsyncTask} and {@code HandlerThread} aren’t appropriate
+classes</a>. The single-threaded nature of {@link android.os.AsyncTask} would
+turn all the threadpooled work into a linear system.
+Using the {@link android.os.HandlerThread} class, on the other hand, would
+require the programmer to manually manage load balancing between a group of
+threads.
+</p>
+
+<p>
+{@link java.util.concurrent.ThreadPoolExecutor} is a helper class to make
+this process easier. This class manages the creation of a group of threads, sets
+their priorities, and manages how work is distributed among those threads.
+As workload increases or decreases, the class spins up or destroys more threads
+to adjust to the workload.
+</p>
+<p>
+This class also helps your app spawn an optimum number of threads. When it
+constructs a {@link java.util.concurrent.ThreadPoolExecutor}
+object, the app sets a minimum and maximum
+number of threads. As the workload given to the
+{@link java.util.concurrent.ThreadPoolExecutor} increases,
+the class will take the initialized minimum and maximum thread counts into
+account, and consider the amount of pending work there is to do. Based on these
+factors, {@link java.util.concurrent.ThreadPoolExecutor} decides on how many
+threads should be alive at any given time.
+</p>
+<h4>How many threads should you create?</h4>
+<p>
+Although from a software level, your code has the ability to create hundreds of
+threads, doing so can create performance issues. CPUs really only have the
+ability to handle a small number of threads in parallel; everything above that
+runs<a
+href="https://www.youtube.com/watch?v=NwFXVsM15Co&list=PLWz5rJ2EKKc9CBxr3BVjPTPoDPLdPIFCE&index=9">
+into priority and scheduling issues</a>. As such, it’s important to only create
+as many threads as your workload needs.
+</p>
+<p>
+Practically speaking, there’s a number of variables responsible for this, but
+picking a value (like 4, for starters), and testing it with <a
+href=”{@docRoot}studio/profile/systrace-commandline.html”>Systrace</a> is as
+solid a strategy as any other. You can use trial-and-error to discover the
+minimum number of threads you can use without running into problems.
+</p>
+<p>
+Another consideration in deciding on how many threads to have is that threads
+aren’t free: they take up memory. Each thread costs a minimum of 64k of memory.
+This adds up quickly across the many apps installed on a device, especially in
+situations where the call stacks grow significantly.
+</p>
+<p>
+Many system processes and third-party libraries often spin up their own
+threadpools. If your app can reuse an existing threadpool, this reuse may help
+performance by reducing contention for memory and processing resources.
+</p>
+
+
diff --git a/docs/html/training/_book.yaml b/docs/html/training/_book.yaml
index 00f9295..0523ec9e 100644
--- a/docs/html/training/_book.yaml
+++ b/docs/html/training/_book.yaml
@@ -420,6 +420,8 @@
path: /training/basics/network-ops/connecting.html
- title: Managing Network Usage
path: /training/basics/network-ops/managing.html
+ - title: Optimizing Network Data Usage
+ path: /training/basics/network-ops/data-saver.html
- title: Parsing XML Data
path: /training/basics/network-ops/xml.html
- title: Transferring Data Without Draining the Battery
@@ -436,7 +438,7 @@
path: /training/efficient-downloads/redundant_redundant.html
- title: Modifying Patterns Based on the Connectivity Type
path: /training/efficient-downloads/connectivity_patterns.html
- - title: Syncing to the Cloud
+ - title: Backing up App Data to the Cloud
path: /training/backup/index.html
path_attributes:
- name: description
@@ -695,6 +697,8 @@
path: /training/tv/playback/guided-step.html
- title: Enabling Background Playback
path: /training/tv/playback/options.html
+ - title: Adding Picture-in-picture
+ path: /training/tv/playback/picture-in-picture.html
- title: Helping Users Find Content on TV
path: /training/tv/discovery/index.html
path_attributes:
@@ -724,6 +728,8 @@
path: /training/tv/tif/channel.html
- title: Managing User Interaction
path: /training/tv/tif/ui.html
+ - title: Supporting Content Recording
+ path: /training/tv/tif/content-recording.html
- title: TV Apps Checklist
path: /training/tv/publishing/checklist.html
path_attributes:
@@ -1363,6 +1369,11 @@
path_attributes:
- name: description
value: How to ensure that your app is secure when performing network transactions.
+ - title: Network Security Configuration
+ path: /training/articles/security-config.html
+ path_attributes:
+ - name: description
+ value: Customize the behavior of your app's secure network connections safely.
- title: Updating Your Security Provider to Protect Against SSL Exploits
path: /training/articles/security-gms-provider.html
path_attributes:
@@ -1373,11 +1384,26 @@
path_attributes:
- name: description
value: How to use the SafetyNet service to analyze a device where your app is running and get information about its compatibility with your app.
+ - title: Verifying Hardware-backed Key Pairs with Key Attestation
+ path: /training/articles/security-key-attestation.html
+ path_attributes:
+ - name: description
+ value: How to retrieve and verify the properties of a device's hardware-backed key pair.
- title: Enhancing Security with Device Management Policies
path: /work/device-management-policy.html
path_attributes:
- name: description
value: How to create an application that enforces security policies on devices.
+ - title: Supporting Direct Boot
+ path: /training/articles/direct-boot.html
+ path_attributes:
+ - name: description
+ value: How use device encrypted storage during Direct Boot mode.
+ - title: Using Scoped Directory Access
+ path: /training/articles/scoped-directory-access.html
+ path_attributes:
+ - name: description
+ value: How to use scoped directory access to request access to external storage directories.
- title: Best Practices for Permissions & Identifiers
path: /training/best-permissions-ids.html
diff --git a/docs/html/training/_project.yaml b/docs/html/training/_project.yaml
new file mode 100644
index 0000000..6aa8760
--- /dev/null
+++ b/docs/html/training/_project.yaml
@@ -0,0 +1,6 @@
+name: "Training"
+home_url: /training/
+description: "Android Training provides a collection of classes that aim to help you build great apps for Android."
+content_license: cc3-apache2
+buganizer_id: 30209417
+parent_project_metadata_path: /develop/_project.yaml
diff --git a/docs/html/training/accessibility/accessible-app.jd b/docs/html/training/accessibility/accessible-app.jd
index dd26feb..54c185c 100644
--- a/docs/html/training/accessibility/accessible-app.jd
+++ b/docs/html/training/accessibility/accessible-app.jd
@@ -55,7 +55,7 @@
If you have a label that's likely not to change during the lifecycle of the
application (such as "Pause" or "Purchase"), you can add it via the XML layout,
by setting a UI element's <a
-
+
href="{@docRoot}reference/android/view/View.html#attr_android:contentDescription"
>{@code android:contentDescription}</a> attribute, like in this
example:</p>
@@ -163,7 +163,7 @@
android.view.accessibility.AccessibilityEvent} reference documentation.
<p>As an example, if you want to extend an image view such that you can write
-captions by typing on the keyboard when it has focus, it makes sense to fire an
+captions by typing on the keyboard when it has focus, it makes sense to fire an
{@link android.view.accessibility.AccessibilityEvent#TYPE_VIEW_TEXT_CHANGED}
event, even though that's not normally built into image views. The code to
generate that event would look like this:</p>
diff --git a/docs/html/training/accessibility/service.jd b/docs/html/training/accessibility/service.jd
index 5b99c46..de00db7 100755
--- a/docs/html/training/accessibility/service.jd
+++ b/docs/html/training/accessibility/service.jd
@@ -67,7 +67,7 @@
<p>Like any other service, you also declare it in the manifest file.
Remember to specify that it handles the {@code android.accessibilityservice} intent,
-so that the service is called when applications fire an
+so that the service is called when applications fire an
{@link android.view.accessibility.AccessibilityEvent}.</p>
<pre>
@@ -174,7 +174,7 @@
In that method, use {@link
android.view.accessibility.AccessibilityEvent#getEventType} to determine the
type of event, and {@link
-android.view.accessibility.AccessibilityEvent#getContentDescription} to extract
+android.view.accessibility.AccessibilityRecord#getContentDescription} to extract
any label text associated with the view that fired the event.</pre>
<pre>
@@ -211,7 +211,7 @@
</pre>
<p>Once that's done, get an {@link
android.view.accessibility.AccessibilityNodeInfo} object using {@link
-android.view.accessibility.AccessibilityEvent#getSource}. This call only
+android.view.accessibility.AccessibilityRecord#getSource}. This call only
returns an object if the window where the event originated is still the active
window. If not, it will return null, so <em>behave accordingly</em>. The
following example is a snippet of code that, when it receives an event, does
diff --git a/docs/html/training/animation/screen-slide.jd b/docs/html/training/animation/screen-slide.jd
index a68d475..d953c07 100644
--- a/docs/html/training/animation/screen-slide.jd
+++ b/docs/html/training/animation/screen-slide.jd
@@ -218,7 +218,7 @@
position of the page on the screen, which is obtained from the <code>position</code> parameter
of the {@link android.support.v4.view.ViewPager.PageTransformer#transformPage transformPage()} method.</p>
-<p>The <code>position</code> parameter indicates where a given page is located relative to the center of the screen.
+<p>The <code>position</code> parameter indicates where a given page is located relative to the center of the screen.
It is a dynamic property that changes as the user scrolls through the pages. When a page fills the screen, its position value is <code>0</code>.
When a page is drawn just off the right side of the screen, its position value is <code>1</code>. If the user scrolls halfway between pages one and two, page one has a position of -0.5 and page two has a position of 0.5. Based on the position of the pages on the screen, you can create custom slide animations by setting page properties with methods such as {@link android.view.View#setAlpha setAlpha()}, {@link android.view.View#setTranslationX setTranslationX()}, or
{@link android.view.View#setScaleY setScaleY()}.</p>
diff --git a/docs/html/training/animation/zoom.jd b/docs/html/training/animation/zoom.jd
index 6a38e7d..60de70e 100644
--- a/docs/html/training/animation/zoom.jd
+++ b/docs/html/training/animation/zoom.jd
@@ -297,13 +297,13 @@
set.play(ObjectAnimator
.ofFloat(expandedImageView, View.X, startBounds.left))
.with(ObjectAnimator
- .ofFloat(expandedImageView,
+ .ofFloat(expandedImageView,
View.Y,startBounds.top))
.with(ObjectAnimator
- .ofFloat(expandedImageView,
+ .ofFloat(expandedImageView,
View.SCALE_X, startScaleFinal))
.with(ObjectAnimator
- .ofFloat(expandedImageView,
+ .ofFloat(expandedImageView,
View.SCALE_Y, startScaleFinal));
set.setDuration(mShortAnimationDuration);
set.setInterpolator(new DecelerateInterpolator());
diff --git a/docs/html/training/app-indexing/deep-linking.jd b/docs/html/training/app-indexing/deep-linking.jd
index 2c4a131..a68e5a3 100644
--- a/docs/html/training/app-indexing/deep-linking.jd
+++ b/docs/html/training/app-indexing/deep-linking.jd
@@ -69,7 +69,7 @@
<!-- Accepts URIs that begin with "example://gizmos” -->
<data android:scheme="example"
android:host="gizmos" />
-
+
</intent-filter>
</activity>
</pre>
diff --git a/docs/html/training/articles/direct-boot.jd b/docs/html/training/articles/direct-boot.jd
new file mode 100644
index 0000000..ea2686e
--- /dev/null
+++ b/docs/html/training/articles/direct-boot.jd
@@ -0,0 +1,225 @@
+page.title=Supporting Direct Boot
+page.keywords=direct boot
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#run">Requesting Access to Run During Direct Boot</a></li>
+ <li><a href="#access">Accessing Device Encrypted Storage</a></li>
+ <li><a href="#notification">Getting Notified of User Unlock</a></li>
+ <li><a href="#migrating">Migrating Existing Data</a></li>
+ <li><a href="#testing">Testing Your Encryption Aware App</a></li>
+ <li><a href="#dpm">Checking Device Policy Encryption Status</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Android 7.0 runs in a secure, <i>Direct Boot</i> mode
+when the device has been powered on but the user has not unlocked the
+device. To support this, the system provides two storage locations for data:</p>
+
+<ul>
+<li><i>Credential encrypted storage</i>, which is the default storage location
+and only available after the user has unlocked the device.</li>
+<li><i>Device encrypted storage</i>, which is a storage location available both
+during Direct Boot mode and after the user has unlocked the device.</li>
+</ul>
+
+<p>By default, apps do not run during Direct Boot mode.
+If your app needs to take action during Direct Boot mode, you can register
+app components that should be run during this mode. Some common use cases
+for apps needing to run during Direct Boot mode include:</p>
+
+<ul>
+<li>Apps that have scheduled notifications, such as alarm clock
+apps.</li>
+<li>Apps that provide important user notifications, like SMS apps.</li>
+<li>Apps that provide accessibility services, like Talkback.</li>
+</ul>
+
+<p>If your app needs to access data while running in Direct Boot mode, use
+device encrypted storage. Device encrypted storage contains data
+encrypted with a key that is only available after a device has performed a
+successful verified boot.</p>
+
+<p>For data that should be encrypted with a key associated with user
+credentials, such as a PIN or password, use credential encrypted storage.
+Credential encrypted storage is only available after the user has successfully
+unlocked the device, up until when the user restarts the device again. If the
+user enables the lock screen after unlocking the device, this doesn't lock
+credential encrypted storage.</p>
+
+<h2 id="run">Requesting Access to Run During Direct Boot</h2>
+
+<p>Apps must register their components with the system before they
+can run during Direct Boot mode or access device encrypted
+storage. Apps register with the system by marking components as
+<i>encryption aware</i>. To mark your component as encryption aware, set the
+<code>android:directBootAware</code> attribute to true in your manifest.<p>
+
+<p>Encryption aware components can register to receive a
+{@link android.content.Intent#ACTION_LOCKED_BOOT_COMPLETED
+ACTION_LOCKED_BOOT_COMPLETED} broadcast message from the
+system when the device has been restarted. At this point device encrypted
+storage is available, and your component can execute tasks that need to be
+run during Direct Boot mode, such as triggering a scheduled alarm.</p>
+
+<p>The following code snippet is an example of how to register a
+{@link android.content.BroadcastReceiver} as encryption aware, and add an
+intent filter for {@link android.content.Intent#ACTION_LOCKED_BOOT_COMPLETED
+ACTION_LOCKED_BOOT_COMPLETED}, in the app manifest:</p>
+
+<pre>
+<receiver
+ android:directBootAware="true" >
+ ...
+ <intent-filter>
+ <action android:name="android.intent.action.ACTION_LOCKED_BOOT_COMPLETED" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>Once the user has unlocked the device, all components can access both the
+device encrypted storage as well as credential encrypted storage.</p>
+
+<h2 id="access">Accessing Device Encrypted Storage</h2>
+
+<p>To access device encrypted storage, create a second
+{@link android.content.Context} instance by calling
+{@link android.content.Context#createDeviceProtectedStorageContext
+Context.createDeviceProtectedStorageContext()}. All storage API
+calls made using this context access the device encrypted storage. The
+following example accesses the device encrypted storage and opens an existing
+app data file:</p>
+
+<pre>
+Context directBootContext = appContext.createDeviceProtectedStorageContext();
+// Access appDataFilename that lives in device encrypted storage
+FileInputStream inStream = directBootContext.openFileInput(appDataFilename);
+// Use inStream to read content...
+</pre>
+
+<p>Use device encrypted storage only for
+information that must be accessible during Direct Boot mode.
+Don't use device encrypted storage as a general-purpose encrypted store.
+For private user information, or encrypted data that isn't needed during
+Direct Boot mode, use credential encrypted storage.</p>
+
+<h2 id="notification">Getting Notified of User Unlock</h2>
+
+<p>When the user unlocks the device after restart, your app can switch to
+accessing credential encrypted storage and use regular system services that
+depend on user credentials.</p>
+
+<p>To get notified when the user unlocks the device after a reboot,
+register a {@link android.content.BroadcastReceiver} from a running component
+to listen for unlock notification messages. When the user unlocks the device
+after boot:
+</p>
+<ul>
+<li>If your app has foreground processes that need immediate notification,
+listen for the {@link android.content.Intent#ACTION_USER_UNLOCKED
+ACTION_USER_UNLOCKED} message.</li>
+<li>If your app only uses background processes that can act on a delayed
+notification, listen for the
+{@link android.content.Intent#ACTION_BOOT_COMPLETED ACTION_BOOT_COMPLETED}
+message.</li>
+</ul>
+
+<p>If the user has unlocked the device, you can find out by calling
+{@link android.os.UserManager#isUserUnlocked UserManager.isUserUnlocked()}.
+</p>
+
+<h2 id="migrating">Migrating Existing Data</h2>
+
+<p>If a user updates their device to use Direct Boot mode, you might have
+existing data that needs to get migrated to device encrypted storage. Use
+{@link android.content.Context#moveSharedPreferencesFrom
+Context.moveSharedPreferencesFrom()} and
+{@link android.content.Context#moveDatabaseFrom
+Context.moveDatabaseFrom()} to migrate preference and database
+data between credential encrypted storage and device encrypted storage.</p>
+
+<p>Use your best judgment when deciding what data to migrate from credential
+encrypted storage to device encrypted storage. You should not migrate
+private user information, such as passwords or authorization tokens, to
+device encrypted storage. In some scenarios, you might need to manage
+separate sets of data in the two encrypted stores.</p>
+
+<h2 id="testing">Testing Your Encryption Aware App</h2>
+
+<p>Test your encryption aware app with Direct Boot mode enabled. There are
+two ways to enable Direct Boot.</p>
+
+<p class="caution"><strong>Caution:</strong> Enabling Direct Boot
+wipes all user data on the device.</p>
+
+<p>On supported devices with Android 7.0 installed, enable
+Direct Boot by doing one of the following:</p>
+
+<ul>
+<li>On the device, enable <b>Developer options</b> if you haven't already by
+going to <b>Settings > About phone</b>, and tapping <b>Build number</b>
+seven times. Once the developer options screen is available, go to
+<b>Settings > Developer options</b> and select
+<b>Convert to file encryption</b>.</li>
+<li>Use the following adb shell commands to enable Direct Boot mode:
+<pre class="no-pretty-print">
+$ adb reboot-bootloader
+$ fastboot --wipe-and-use-fbe
+</pre>
+</li>
+</ul>
+
+<p>An emulated Direct Boot mode is also available, in case you need to switch
+modes on your test devices. Emulated mode should only be used during
+development and may cause data loss. To enable emulated Direct Boot mode,
+set a lock pattern on the device, choose "No thanks" if prompted for a
+secure start-up screen when setting a lock pattern, and then use the
+following adb shell command:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe true
+</pre>
+
+<p>To turn off emulated Direct Boot mode, use the following command:</p>
+
+<pre class="no-pretty-print">
+$ adb shell sm set-emulate-fbe false
+</pre>
+
+<p>Using these commands causes the device to reboot.</p>
+
+<h2 id="dpm">Checking Device Policy Encryption Status</h2>
+
+<p>Device administration apps can use
+{@link android.app.admin.DevicePolicyManager#getStorageEncryptionStatus
+DevicePolicyManager.getStorageEncryptionStatus()} to check the current
+encryption status of the device. If your app is targeting an API level
+lower than 24.0 (Android 7.0),
+{@link android.app.admin.DevicePolicyManager#getStorageEncryptionStatus
+getStorageEncryptionStatus()} will return
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE
+ENCRYPTION_STATUS_ACTIVE} if the device is either using full-disk encryption,
+or file-based encryption with Direct Boot. In both of these cases, data is
+always stored encrypted at rest. If your app is targeting an API level of
+24.0 or higher,
+{@link android.app.admin.DevicePolicyManager#getStorageEncryptionStatus
+getStorageEncryptionStatus()} will return
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE
+ENCRYPTION_STATUS_ACTIVE} if the device is using full-disk encryption. It will
+return
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_PER_USER
+ENCRYPTION_STATUS_ACTIVE_PER_USER} if the device is using file-based encryption
+with Direct Boot.</p>
+
+<p>If you build a device administration app
+that targets Android 7.0, make sure to check for both
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE
+ENCRYPTION_STATUS_ACTIVE} and
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_PER_USER
+ENCRYPTION_STATUS_ACTIVE_PER_USER} to determine if the device is
+encrypted.</p>
diff --git a/docs/html/training/articles/perf-anr.jd b/docs/html/training/articles/perf-anr.jd
index bbebec5..8848354 100644
--- a/docs/html/training/articles/perf-anr.jd
+++ b/docs/html/training/articles/perf-anr.jd
@@ -64,10 +64,10 @@
and Window Manager system services. Android will display the ANR dialog
for a particular application when it detects one of the following
conditions:</p>
-<ul>
- <li>No response to an input event (such as key press or screen touch events)
+<ul>
+ <li>No response to an input event (such as key press or screen touch events)
within 5 seconds.</li>
- <li>A {@link android.content.BroadcastReceiver BroadcastReceiver}
+ <li>A {@link android.content.BroadcastReceiver BroadcastReceiver}
hasn't finished executing within 10 seconds.</li>
</ul>
@@ -100,7 +100,7 @@
{@link android.os.AsyncTask#onProgressUpdate onProgressUpdate()} callback method. From your
implementation of {@link android.os.AsyncTask#onProgressUpdate onProgressUpdate()} (which
runs on the UI thread), you can notify the user. For example:</p>
-
+
<pre>
private class DownloadFilesTask extends AsyncTask<URL, Integer, Long> {
// Do the long-running work in here
@@ -127,14 +127,14 @@
}
}
</pre>
-
+
<p>To execute this worker thread, simply create an instance and
call {@link android.os.AsyncTask#execute execute()}:</p>
-
+
<pre>
new DownloadFilesTask().execute(url1, url2, url3);
</pre>
-
+
<p>Although it's more complicated than {@link android.os.AsyncTask}, you might want to instead
create your own {@link java.lang.Thread} or {@link android.os.HandlerThread} class. If you do,
@@ -143,10 +143,10 @@
android.os.Process#THREAD_PRIORITY_BACKGROUND}. If you don't set the thread to a lower priority
this way, then the thread could still slow down your app because it operates at the same priority
as the UI thread by default.</p>
-
+
<p>If you implement {@link java.lang.Thread} or {@link android.os.HandlerThread},
be sure that your UI thread does not block while waiting for the worker thread to
-complete—do not call {@link java.lang.Thread#wait Thread.wait()} or
+complete—do not call {@link java.lang.Object#wait Thread.wait()} or
{@link java.lang.Thread#sleep Thread.sleep()}. Instead of blocking while waiting for a worker
thread to complete, your main thread should provide a {@link
android.os.Handler} for the other threads to post back to upon completion.
@@ -183,16 +183,16 @@
<li>If your application is doing work in the background in response to
user input, show that progress is being made (such as with a {@link
android.widget.ProgressBar} in your UI).</li>
-
+
<li>For games specifically, do calculations for moves in a worker
thread.</li>
-
+
<li>If your application has a time-consuming initial setup phase, consider
showing a splash screen or rendering the main view as quickly as possible, indicate that
loading is in progress and fill the information asynchronously. In either case, you should
indicate somehow that progress is being made, lest the user perceive that
the application is frozen.</li>
-
+
<li>Use performance tools such as <a href="{@docRoot}tools/help/systrace.html">Systrace</a>
and <a href="{@docRoot}tools/help/traceview.html">Traceview</a> to determine bottlenecks
in your app's responsiveness.</li>
diff --git a/docs/html/training/articles/perf-jni.jd b/docs/html/training/articles/perf-jni.jd
index 5a9fa1e..8d2fd9b 100644
--- a/docs/html/training/articles/perf-jni.jd
+++ b/docs/html/training/articles/perf-jni.jd
@@ -564,9 +564,9 @@
that looked through the weak globals table, the arguments, the locals
table, and the globals table in that order. The first time it found your
direct pointer, it would report that your reference was of the type it
- happened to be examining. This meant, for example, that if
+ happened to be examining. This meant, for example, that if
you called <code>GetObjectRefType</code> on a global jclass that happened
- to be the same as the jclass passed as an implicit argument to your static
+ to be the same as the jclass passed as an implicit argument to your static
native method, you'd get <code>JNILocalRefType</code> rather than
<code>JNIGlobalRefType</code>.
</ul>
diff --git a/docs/html/training/articles/perf-tips.jd b/docs/html/training/articles/perf-tips.jd
index 4a3184c..82de69a 100644
--- a/docs/html/training/articles/perf-tips.jd
+++ b/docs/html/training/articles/perf-tips.jd
@@ -43,7 +43,7 @@
that you can simply say "device X is a factor F faster/slower than device Y",
and scale your results from one device to others. In particular, measurement
on the emulator tells you very little about performance on any device. There
-are also huge differences between devices with and without a
+are also huge differences between devices with and without a
<acronym title="Just In Time compiler">JIT</acronym>: the best
code for a device with a JIT is not always the best code for a device
without.</p>
@@ -88,7 +88,7 @@
but this also generalizes to the fact that two parallel arrays of ints
are also a <strong>lot</strong> more efficient than an array of {@code (int,int)}
objects. The same goes for any combination of primitive types.</li>
-
+
<li>If you need to implement a container that stores tuples of {@code (Foo,Bar)}
objects, try to remember that two parallel {@code Foo[]} and {@code Bar[]} arrays are
generally much better than a single array of custom {@code (Foo,Bar)} objects.
@@ -401,19 +401,6 @@
need to solve. Make sure you can accurately measure your existing performance,
or you won't be able to measure the benefit of the alternatives you try.</p>
-<p>Every claim made in this document is backed up by a benchmark. The source
-to these benchmarks can be found in the <a
-href="http://code.google.com/p/dalvik/source/browse/#svn/trunk/benchmarks">code.google.com
-"dalvik" project</a>.</p>
-
-<p>The benchmarks are built with the
-<a href="http://code.google.com/p/caliper/">Caliper</a> microbenchmarking
-framework for Java. Microbenchmarks are hard to get right, so Caliper goes out
-of its way to do the hard work for you, and even detect some cases where you're
-not measuring what you think you're measuring (because, say, the VM has
-managed to optimize all your code away). We highly recommend you use Caliper
-to run your own microbenchmarks.</p>
-
<p>You may also find
<a href="{@docRoot}tools/debugging/debugging-tracing.html">Traceview</a> useful
for profiling, but it's important to realize that it currently disables the JIT,
diff --git a/docs/html/training/articles/scoped-directory-access.jd b/docs/html/training/articles/scoped-directory-access.jd
new file mode 100644
index 0000000..1e0bf39
--- /dev/null
+++ b/docs/html/training/articles/scoped-directory-access.jd
@@ -0,0 +1,162 @@
+page.title=Using Scoped Directory Access
+page.keywords=scoped directory access
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#accessing">Accessing an External Storage Directory</a></li>
+ <li><a href="#removable">Accessing a Directory on Removable Media</a></li>
+ <li><a href="#best">Best Practices</a></li>
+ </ol>
+</div>
+</div>
+
+<p>Apps such as photo apps usually just need access to specific directories in
+external storage, such as the <code>Pictures</code> directory. Existing
+approaches to accessing external storage aren't designed to easily provide
+targeted directory access for these types of apps. For example:</p>
+
+<ul>
+<li>Requesting {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}
+or {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} in your manifest
+allows access to all public directories on external storage, which might be
+more access than what your app needs.</li>
+<li>Using the
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+Access Framework</a> usually makes your user pick directories
+via a system UI, which is unnecessary if your app always accesses the same
+external directory.</li>
+</ul>
+
+<p>Android 7.0 provides a simplified API to access common external storage
+directories.</p>
+
+<h2 id="accessing">Accessing an External Storage Directory</h2>
+
+<p>Use the {@link android.os.storage.StorageManager} class to get the
+appropriate {@link android.os.storage.StorageVolume} instance. Then, create
+an intent by calling the
+{@link android.os.storage.StorageVolume#createAccessIntent
+StorageVolume.createAccessIntent()} method of that instance.
+Use this intent to access external storage directories. To get a list of
+all available volumes, including removable media
+volumes, use {@link android.os.storage.StorageManager#getStorageVolumes
+StorageManager.getStorageVolumes()}.</p>
+
+<p>If you have information about a specific file, use
+{@link android.os.storage.StorageManager#getStorageVolume
+StorageManager.getStorageVolume(File)} to get the
+{@link android.os.storage.StorageVolume} that contains the file. Call
+{@link android.os.storage.StorageVolume#createAccessIntent
+createAccessIntent()} on this
+{@link android.os.storage.StorageVolume} to access
+the external storage directory for the file.</p>
+
+<p>
+On secondary volumes, such as external SD cards, pass in null when calling
+{@link android.os.storage.StorageVolume#createAccessIntent
+createAccessIntent()} to request access to the entire
+volume, instead of a specific directory.
+{@link android.os.storage.StorageVolume#createAccessIntent
+createAccessIntent()} returns null if you pass in
+null to the primary volume, or if you pass in an invalid directory name.
+</p>
+
+<p>The following code snippet is an example of how to open the
+<code>Pictures</code> directory in the primary shared storage:</p>
+
+<pre>
+StorageManager sm = (StorageManager)getSystemService(Context.STORAGE_SERVICE);
+StorageVolume volume = sm.getPrimaryStorageVolume();
+Intent intent = volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<p>The system attempts to grant access to the external directory, and if
+necessary confirms access with the user using a simplified UI:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-framed.png"
+srcset="{@docRoot}images/android-7.0/scoped-directory-access-framed.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-framed_2x.png 2x" />
+<p class="img-caption"><strong>Figure 1.</strong> An application requesting
+access to the Pictures directory.</p>
+
+<p>If the user grants access, the system calls your
+{@link android.app.Activity#onActivityResult onActivityResult()} override
+with a result code of {@link android.app.Activity#RESULT_OK
+RESULT_OK}, and intent data that contains the URI. Use
+the provided URI to access directory information, similar to using URIs
+returned by the
+<a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
+Access Framework</a>.</p>
+
+<p>If the user doesn't grant access, the system calls your
+{@link android.app.Activity#onActivityResult onActivityResult()} override
+with a result code of {@link android.app.Activity#RESULT_CANCELED
+RESULT_CANCELED}, and null intent data.</p>
+
+<p>Getting access to a specific external directory
+also gains access to subdirectories within that directory.</p>
+
+<h2 id="removable">Accessing a Directory on Removable Media</h2>
+
+<p>To use Scoped Directory Access to access directories on removable media,
+first add a {@link android.content.BroadcastReceiver} that listens for the
+{@link android.os.Environment#MEDIA_MOUNTED} notification, for example:</p>
+
+<pre>
+<receiver
+ android:name=".MediaMountedReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED" />
+ <data android:scheme="file" />
+ </intent-filter>
+</receiver>
+</pre>
+
+<p>When the user mounts removable media, like an SD card, the system sends a
+{@link android.os.Environment#MEDIA_MOUNTED} notification. This notification
+provides a {@link android.os.storage.StorageVolume} object in the intent data
+that you can use to access directories on the removable media. The following
+example accesses the <code>Pictures</code> directory on removable media:</p>
+
+<pre>
+// BroadcastReceiver has already cached the MEDIA_MOUNTED
+// notification Intent in mediaMountedIntent
+StorageVolume volume = (StorageVolume)
+ mediaMountedIntent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME);
+volume.createAccessIntent(Environment.DIRECTORY_PICTURES);
+startActivityForResult(intent, request_code);
+</pre>
+
+<h2 id="best">Best Practices</h2>
+
+<p>Where possible, persist the external directory access URI so you don't have
+to repeatedly ask the user for access. Once the user has granted access, call
+{@link android.content.Context#getContentResolver getContentResolver()} and
+with the returned {@link android.content.ContentResolver} call
+{@link android.content.ContentResolver#takePersistableUriPermission
+takePersistableUriPermission()} with the directory access URI. The system will
+persist the URI and subsequent access requests will return
+{@link android.app.Activity#RESULT_OK RESULT_OK} and not show confirmation
+UI to the user.</p>
+
+<p>If the user denies access to an external directory, do not immediately
+request access again. Repeatedly insisting on access results in a poor user
+experience. If a request is denied by the user, and the app requests access
+again, the UI displays a <b>Don't ask again</b> checkbox:</p>
+
+<img src="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png"
+srcset="{@docRoot}images/android-7.0/scoped-directory-access-dont-ask.png 1x,
+{@docRoot}images/android-7.0/scoped-directory-access-dont-ask_2x.png 2x" />
+<p class="img-caption"><strong>Figure 1.</strong> An application making a
+second request for access to removable media.</p>
+
+<p>If the user selects <b>Don't ask again</b> and denies the request, all
+future requests for the given directory from your app will be automatically
+denied, and no request UI will be presented to the user.</p>
\ No newline at end of file
diff --git a/docs/html/training/articles/security-config.jd b/docs/html/training/articles/security-config.jd
new file mode 100644
index 0000000..90a93fa
--- /dev/null
+++ b/docs/html/training/articles/security-config.jd
@@ -0,0 +1,752 @@
+page.title=Network Security Configuration
+page.keywords=security,network,config
+page.metaDescription=Feature that allows app developers to customize network security settings in a safe configuration file.
+page.image=images/cards/card-nyc_2x.jpg
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>In this document</h2>
+<ol>
+ <li><a href="#manifest">Adding a Security Configuration File</a></li>
+ <li><a href="#CustomTrust">Customizing Trusted CAs</a>
+ <ol>
+ <li><a href="#ConfigCustom">Configuring a Trusted Custom CA</a></li>
+ <li><a href="#LimitingCas">Limiting the Set of Trusted CAs</a></li>
+ <li><a href="#TrustingAdditionalCas">Trusting Additional CAs</a></li>
+ </ol>
+ </li>
+ <li><a href="#TrustingDebugCa">Debugging-only CAs</a></li>
+ <li><a href="#CleartextTrafficPermitted">Opting Out of Cleartext Traffic</a></li>
+ <li><a href="#CertificatePinning">Pinning Certificates</a></li>
+ <li><a href="#ConfigInheritance">Configuration Inheritance Behavior</a></li>
+ <li><a href="#FileFormat">Configuration File Format</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+ The Network Security Configuration feature lets apps customize their network
+ security settings in a safe, declarative configuration file without modifying
+ app code. These settings can be configured for specific domains and for a
+ specific app. The key capabilities of this feature are as follows:
+</p>
+
+<ul>
+ <li>
+ <b>Custom trust anchors:</b> Customize which Certificate Authorities (CA)
+ are trusted for an app's secure connections. For
+ example, trusting particular self-signed certificates or restricting the
+ set of public CAs that the app trusts.
+ </li>
+
+ <li>
+ <b>Debug-only overrides:</b> Safely debug secure connections in an app
+ without added risk to the installed base.
+ </li>
+
+ <li>
+ <b>Cleartext traffic opt-out:</b> Protect apps from
+ accidental usage of cleartext traffic.
+ </li>
+
+ <li>
+ <b>Certificate pinning:</b> Restrict an app's secure connection to
+ particular certificates.
+ </li>
+</ul>
+
+
+<h2 id="manifest">Adding a Security Configuration File</h2>
+
+<p>
+ The Network Security Configuration feature uses an XML file where you specify
+ the settings for your app. You must include an entry in the manifest of your
+ app to point to this file. The following code excerpt from a manifest
+ demonstrates how to create this entry:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application android:networkSecurityConfig="@xml/network_security_config"
+ ... >
+ ...
+ </application>
+</manifest>
+</pre>
+
+<h2 id="CustomTrust">Customizing Trusted CAs</h2>
+
+<p>
+ An app may want to trust a custom set of CAs instead of the platform
+ default. The most common reasons of this are:
+</p>
+
+<ul>
+ <li>Connecting to a host with a custom certificate authority, such as a
+ CA that is self-signed or is issued internally within a company.
+ </li>
+
+ <li>Limiting the set of CAs to only the CAs you trust instead of every
+ pre-installed CA.
+ </li>
+
+ <li>Trusting additional CAs not included in the system.
+ </li>
+</ul>
+
+<p>
+ By default, secure connections (using protocols like TLS and HTTPS) from all
+ apps trust the pre-installed system CAs, and apps targeting Android 6.0 (API
+ level 23) and lower also trust the user-added CA store by default. An app can
+ customize its own connections using {@code base-config} (for app-wide
+ customization) or {@code domain-config} (for per-domain customization).
+</p>
+
+
+<h3 id="ConfigCustom">Configuring a Custom CA</h3>
+
+<p>
+ Assume you want to connect to your host which uses a self-signed SSL
+ certificate or to a host whose SSL certificate is issued by a non-public CA
+ which you trust, such as your company's internal CA.
+</p>
+
+<p>
+ <code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Add the self-signed or non-public CA certificate, in PEM or DER format, to
+ {@code res/raw/my_ca}.
+</p>
+
+
+<h3 id="LimitingCas">Limiting the Set of Trusted CAs</h3>
+
+<p>
+ An app that does not want to trust all CAs trusted by system can
+ instead specify its own reduced set of CAs to trust. This protects the
+ app from fradulent certificates issued by any of the other CAs.
+</p>
+
+<p>
+ The configuration to limit the set of trusted CAs is similar to <a href=
+ "#ConfigCustom">trusting a custom CA</a> for a specific domain except
+ that multiple CAs are provided in the resource.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">secure.example.com</domain>
+ <domain includeSubdomains="true">cdn.example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/trusted_roots"/>
+ </trust-anchors>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+<p>
+ Add the trusted CAs, in PEM or DER format, to {@code res/raw/trusted_roots}.
+ Note that if using PEM format the file must contain <em>only</em> PEM data
+ and no extra text. You can also provide multiple
+ <a href="#certificates"><code><certificates></code></a>
+elements instead of one.
+</p>
+
+
+<h3 id="TrustingAdditionalCas">
+ Trusting Additional CAs
+</h3>
+
+<p>
+ An app may want to trust additional CAs not trusted by the system,
+ this could be due to the system not yet including the CA or a CA that does
+ not meet the requirements for inclusion into the Android system. An
+ app can do this by specifying multiple certificate sources for a
+ configuration.
+</p>
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="@raw/extracas"/>
+ <certificates src="system"/>
+ </trust-anchors>
+ </base-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="TrustingDebugCa">Configuring CAs for Debugging</h2>
+
+<p>
+ When debugging an app that connects over HTTPS, you may want to
+ connect to a local development server, which does not have the SSL
+ certificate for your production server. In order to support this without any
+ modification to your app's code, you can specify debug-only CAs, which
+ are trusted <i>only</i> when <a href=
+ "{@docRoot}guide/topics/manifest/application-element.html#debug">
+android:debuggable</a>
+ is {@code true}, by using {@code debug-overrides}. Normally, IDEs and build
+ tools set this flag automatically for non-release builds.
+</p>
+
+<p>
+ This is safer than the usual conditional code because, as a security
+ precaution, app stores do not accept apps which are marked
+ debuggable.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="@raw/debug_cas"/>
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CleartextTrafficPermitted">Opting Out of Cleartext Traffic</h2>
+
+<p>
+ Applications intending to connect to destinations using only secure
+ connections can opt-out of supporting cleartext (using the unencrypted HTTP
+ protocol instead of HTTPS) to those destinations. This option helps prevent
+ accidental regressions in apps due to changes in URLs provided by external
+ sources such as backend servers.
+ See {@link android.security.NetworkSecurityPolicy#isCleartextTrafficPermitted
+ NetworkSecurityPolicy.isCleartextTrafficPermitted()} for more details.
+</p>
+
+<p>
+ For example, an app may want to ensure that all connections to {@code
+ secure.example.com} are always done over HTTPS to protect sensitive traffic
+ from hostile networks.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="CertificatePinning">Pinning Certificates</h2>
+
+<p>
+ Normally, an app trusts all pre-installed CAs. If any of these CAs were to
+ issue a fradulent certificate, the app would be at risk from a
+ man-in-the-middle attack. Some apps choose to limit the set of certificates
+ they accept by either limiting the set of CAs they trust or by certificate
+ pinning.
+</p>
+
+<p>
+ Certificate pinning is done by providing a set of certificates by hash of the
+ public key (<code>SubjectPublicKeyInfo</code> of the X.509 certificate). A
+ certificate chain is then valid only if the certificate chain contains at
+ least one of the pinned public keys.
+</p>
+
+<p>
+ Note that, when using certificate pinning, you should always include a backup
+ key so that if you are forced to switch to new keys or change CAs (when
+ pinning to a CA certificate or an intermediate of that CA), your
+ app's connectivity is unaffected. Otherwise, you must push out
+ an update to the app to restore connectivity.
+</p>
+
+<p>
+ Additionally, it is possible to set an expiration time for pins after which
+ pinning is not performed. This helps prevent connectivity issues in
+ apps which have not been updated. However, setting an expiration time
+ on pins may enable pinning bypass.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <pin-set expiration="2018-01-01">
+ <pin digest="SHA-256">7HIpactkIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ <!-- backup pin -->
+ <pin digest="SHA-256">fwza0LRMXouZHRC8Ei+4PyuldPDcf3UKgO/04cDM1oE=</pin>
+ </pin-set>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="ConfigInheritance">Configuration Inheritance Behavior</h2>
+
+<p>
+ Values not set in a specific configuration are inherited. This behavior allows
+ more complex configurations while keeping the configuration file readable.
+</p>
+
+<p>
+ If a value is not set in a specific entry, then the value from the more
+ general entry is used. For example, values not set in a {@code domain-config}
+ are taken from the parent {@code domain-config}, if nested, or from the {@code
+ base-config} if not. Values not set in the {@code base-config} use the
+ platform default values.
+</p>
+
+<p>
+ For example, consider where all connections to subdomains of {@code
+ example.com} must use a custom set of CAs. Additonally, cleartext traffic to
+ these domains is permitted <em>except</em> when connecting to {@code
+ secure.example.com}. By nesting the configuration for {@code
+ secure.example.com} inside the configuration for {@code example.com}, the
+ {@code trust-anchors} does not need to be duplicated.
+</p>
+
+<p>
+<code>res/xml/network_security_config.xml</code>:
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config>
+ <domain includeSubdomains="true">example.com</domain>
+ <trust-anchors>
+ <certificates src="@raw/my_ca"/>
+ </trust-anchors>
+ <domain-config cleartextTrafficPermitted="false">
+ <domain includeSubdomains="true">secure.example.com</domain>
+ </domain-config>
+ </domain-config>
+</network-security-config>
+</pre>
+</p>
+
+
+<h2 id="FileFormat">Configuration File Format</h2>
+
+<p>
+ The Network Security Configuration feature uses an XML file format.
+ The overall structure of the file is shown in the following code sample:
+</p>
+
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </base-config>
+
+ <domain-config>
+ <domain>android.com</domain>
+ ...
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ <pin-set>
+ <pin digest="...">...</pin>
+ ...
+ </pin-set>
+ </domain-config>
+ ...
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="..."/>
+ ...
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
+</pre>
+
+<p>
+ The following sections describe the syntax and other details of the file
+ format.
+</p>
+
+<h3 id="network-security-config">
+ <network-security-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ can contain:
+ </dt>
+
+ <dd>
+ 0 or 1 of <code><a href="#base-config"><base-config></a></code><br>
+ Any number of <code><a href=
+ "#domain-config"><domain-config></a></code><br>
+ 0 or 1 of <code><a href="#debug-overrides"><debug-overrides></a></code>
+ </dd>
+</dl>
+
+<h3 id="base-config">
+ <base-config>
+</h3>
+
+<dl class="xml">
+ <dt>
+ syntax:
+ </dt>
+</dl>
+
+<pre class="stx">
+<base-config <a href=
+"#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" | "false"]>
+ ...
+</base-config>
+</pre>
+<dl class="xml">
+ <dt>
+ can contain:
+ </dt>
+
+ <dd>
+ <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ description:
+ </dt>
+
+ <dd>
+ The default configuration used by all connections whose destination is not
+ covered by a <a href="#domain-config"><code>domain-config</code></a>.
+
+<p>
+ Any values that are not set use the platform default values. The default
+ configuration for apps targeting Android 7.0 (API level 24) and higher is as
+ follows:
+</p>
+
+<pre>
+<base-config cleartextTrafficPermitted="true">
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+</base-config>
+</pre>
+The default configuration for apps targeting Android 6.0 (API level 23) and
+lower is as follows:
+<pre>
+<base-config cleartextTrafficPermitted="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+</base-config>
+</pre>
+
+ </dd>
+</dl>
+
+<h3 id="domain-config"><domain-config></h3>
+<dl class="xml">
+<dt>syntax:</dt>
+<dd>
+<pre class="stx"><domain-config <a href="#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" | "false"]>
+ ...
+</domain-config></pre>
+</dd>
+
+<dt>Can Contain:</dt>
+
+<dd>
+1 or more <code><a href="#domain"><domain></a></code>
+<br/>0 or 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+<br/>0 or 1 <code><a href="#pin-set"><pin-set></code></a>
+<br/>Any number of nested <code><domain-config></code></dd>
+
+<dt>Description</dt>
+<dd>Configuration used for connections to specific destinations, as defined by
+the {@code domain} elements.
+
+<p>Note that if multiple {@code domain-config} elements cover a destination, the
+configuration with the most specific (longest) matching domain rule is
+used.</p></dd>
+</dl>
+
+<h3 id="domain"><domain></h3>
+
+<dl class="xml">
+ <dt>
+ syntax:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<domain includeSubdomains=["true" | "false"]>example.com</domain>
+</pre>
+ </dd>
+
+ <dt>
+ Attributes:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code includeSubdomains}
+ </dt>
+
+ <dd>
+ If {@code "true"}, then this domain rule matches the domain and all
+ subdomains, including subdomains of subdomains. Otherwise, the rule only
+ applies to exact matches.
+ </dd>
+ </dl>
+ </dd>
+
+ <dt>
+ Description:
+ </dt>
+</dl>
+
+<h3 id="debug-overrides"><debug-overrides></h3>
+
+<dl class="xml">
+ <dt>
+ syntax:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<debug-overrides>
+ ...
+</debug-overrides>
+</pre>
+ </dd>
+
+ <dt>
+ Can Contain:
+ </dt>
+
+ <dd>
+ 0 or 1 <code><a href="#trust-anchors"><trust-anchors></a></code>
+ </dd>
+
+ <dt>
+ Description:
+ </dt>
+
+ <dd>
+ Overrides to be applied when <a href=
+ "{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ is {@code "true"}, which is normally the case for non-release builds
+ generated by IDEs and build tools. Trust anchors specified in {@code
+ debug-overrides} are added to all other configurations, and certificate
+ pinning is not performed when the server's certificate chain uses one of
+ these debug-only trust anchors. If <a href=
+ "{@docRoot}guide/topics/manifest/application-element.html#debug">android:debuggable</a>
+ is {@code "false"}, then this section is completely ignored.
+ </dd>
+</dl>
+
+<h3 id="trust-anchors"><trust-anchors></h3>
+<dl class="xml">
+ <dt>
+ syntax:
+ </dt>
+
+ <dd>
+ <pre class="stx">
+<trust-anchors>
+...
+</trust-anchors>
+</pre>
+ </dd>
+
+ <dt>
+ Can Contain:
+ </dt>
+
+ <dd>
+ Any number of <code><a href="#certificates"><certificates></a></code>
+ </dd>
+
+ <dt>
+ Description:
+ </dt>
+
+ <dd>
+ Set of trust anchors for secure connections.
+ </dd>
+</dl>
+
+
+<h3 id="certificates"><certificates></h3>
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx"><certificates src=["system" | "user" | "<i>raw resource</i>"]
+ overridePins=["true" | "false"] />
+</pre></dd>
+<dt>description:</dt>
+<dd>Set of X.509 certificates for {@code trust-anchors} elements.</dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt>{@code src}</dt>
+<dd>
+The source of CA certificates. Each certificate can be one of the following:
+<ul>
+ <li>a raw resource ID pointing to a file containing X.509 certificates.
+ Certificates must be encoded in DER or PEM format. In the case of PEM
+ certificates, the file <em>must not</em> contain extra non-PEM data such as
+ comments.
+ </li>
+
+ <li>{@code "system"} for the pre-installed system CA certificates
+ </li>
+
+ <li>{@code "user"} for user-added CA certificates
+ </li>
+</ul>
+</dd>
+
+<dt>{@code overridePins}</dt>
+<dd>
+ <p>
+ Specifies if the CAs from this source bypass certificate pinning. If {@code
+ "true"}, then pinning is not performed on certificate chains which are
+ signed by one of the CAs from this source. This can be useful for debugging
+ CAs or for testing man-in-the-middle attacks on your app's secure traffic.
+ </p>
+
+ <p>
+ Default is {@code "false"} unless specified in a {@code debug-overrides}
+ element, in which case the default is {@code "true"}.
+ </p>
+</dd>
+</dl>
+</dd>
+
+
+<h3 id="pin-set"><pin-set></h3>
+
+<dl class="xml">
+ <dt>
+ syntax:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin-set expiration="date">
+...
+</pin-set>
+</pre>
+ </dd>
+
+ <dt>
+ Can Contain:
+ </dt>
+
+ <dd>
+ Any number of <code><a href="#pin"><pin></a></code>
+ </dd>
+
+ <dt>
+ Description:
+ </dt>
+
+ <dd>
+ A set of public key pins. For a secure connection to be trusted, one of the
+ public keys in the chain of trust must be in the set of pins. See
+ <code><a href="#pin"><pin></a></code> for the format of pins.
+ </dd>
+
+ <dt>
+ Attributes:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code expiration}
+ </dt>
+
+ <dd>
+ The date, in {@code yyyy-MM-dd} format, on which the pins expire, thus
+ disabling pinning. If the attribute is not set, then the pins do not
+ expire.
+ <p>
+ Expiration helps prevent connectivity issues in apps which do not get
+ updates to their pin set, such as when the user disables app updates.
+ </p>
+ </dd>
+ </dl>
+ </dd>
+</dl>
+
+<h3 id="pin"><pin></h3>
+<dl class="xml">
+ <dt>
+ syntax:
+ </dt>
+
+ <dd>
+<pre class="stx">
+<pin digest=["SHA-256"]>base64 encoded digest of X.509
+ SubjectPublicKeyInfo (SPKI)</pin>
+</pre>
+ </dd>
+
+ <dt>
+ Attributes:
+ </dt>
+
+ <dd>
+ <dl class="attr">
+ <dt>
+ {@code digest}
+ </dt>
+
+ <dd>
+ The digest algorithm used to generate the pin. Currently, only
+ {@code "SHA-256"} is supported.
+ </dd>
+ </dl>
+ </dd>
+</dl>
diff --git a/docs/html/training/articles/security-key-attestation.jd b/docs/html/training/articles/security-key-attestation.jd
new file mode 100644
index 0000000..9145d30
--- /dev/null
+++ b/docs/html/training/articles/security-key-attestation.jd
@@ -0,0 +1,861 @@
+page.title=Key Attestation
+page.metaDescription=A tool for verifying security properties of hardware-backed key pairs.
+page.keywords="security", "TEE", "hardware-backed", "keystore", "certificate", "key attestation"
+
+@jd:body
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#verifying">Retrieving and Verifying a Hardware-backed Key Pair</a></li>
+ <li><a href="#certificate_schema">Certificate Extension Data Schema</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ Key Attestation gives you more confidence that the keys you use in your app
+ are stored in a device's hardware-backed keystore. The following sections
+ describe how to verify the properties of hardware-backed keys and how to
+ interpret the schema of the attestation certificate's extension data.
+</p>
+
+<p class="note">
+ <strong>Note: </strong>Only a small number of devices running Android 7.0 (API
+ level 24) support hardware-level key attestation; all other devices running
+ Android 7.0 use software-level key attestation instead. Before you verify the
+ properties of a device's hardware-backed keys in a production-level
+ environment, you should make sure that the device supports hardware-level key
+ attestation. To do so, you should check that the attestation certificate chain
+ contains a root certificate that is signed by the Google attestation root key
+ and that the <code>attestationSecurityLevel</code> element within the <a
+ href="#certificate_schema_keydescription">key description</a> data structure
+ is set to the TrustedEnvironment security level.
+</p>
+
+<h2 id="verifying">
+ Retrieving and Verifying a Hardware-backed Key Pair
+</h2>
+
+<p>
+ During key attestation, you specify the alias of a key pair. The attestation
+ tool, in return, provides a certificate chain, which you can use to verify
+ the properties of that key pair.
+</p>
+
+<p>
+ If the device supports hardware-level key attestation, the root certificate
+ within this chain is signed using an attestation root key, which the device
+ manufacturer injects into the device’s hardware-backed keystore at the
+ factory.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> On devices that ship with hardware-level key
+ attestation, Android 7.0 (API level 24), and Google Play services, the root
+ certificate is signed by the Google attestation root key. You should verify
+ that this root certificate appears within Google’s list of root certificates.
+</p>
+
+<p>
+ To implement key attestation, complete the following steps:
+</p>
+
+<ol>
+ <li>
+ Use a {@link java.security.KeyStore KeyStore} object's
+ {@link java.security.KeyStore#getCertificateChain getCertificateChain()}
+ method to get a reference to the chain of X.509 certificates associated with
+ the hardware-backed keystore.
+ </li>
+
+ <li>
+ <p>
+ Check each certificate’s validity using a
+ {@link java.security.cert.CRL CRL} object's
+ {@link java.security.cert.CRL#isRevoked isRevoked()} method.
+ </p>
+
+ <p class="caution">
+ <strong>Caution:</strong> Although you can complete this process within
+ your app directly, it’s safer to check the certificates’ revocation lists
+ on a separate server that you trust.
+ </p>
+ </li>
+
+ <li>
+ <p>
+ Create an <code>Attestation</code> object, passing in the first element of
+ the certificate chain as an argument:</p>
+
+<pre>
+// "certificates" contains the certificate chain associated with a specific key
+// pair in the device's hardware-backed keystore.
+X509Certificate attestationCert = (X509Certificate) certificates[0];
+Attestation hardwareKeyAttestation = new Attestation(attestationCert);
+</pre>
+
+ <p>
+ An attestation object extracts the extension data within this certificate
+ and stores this information in a more accessible format. For more details
+ about the schema of the extension data, see <a href=
+ "#certificate_schema">Certificate Extension Data Schema</a>.
+ </p>
+ </li>
+
+ <li>
+ <p>
+ Use the accessor methods within the <code>Attestation</code> class to
+ retrieve the extension data from the certificate. These methods use the
+ same names and structure hierarchy as in the certificate extension data
+ schema.
+ </p>
+
+ <p>
+ For example, to view the verified boot key for the device’s TEE, use the
+ following method sequence:
+ </p>
+
+<pre>
+// "hardwareKeyAttestation" contains the first element of the attestation
+// certificate chain.
+AuthorizationList teeAuthList = hardwareKeyAttestation.getTeeEnforced();
+RootOfTrust teeRootOfTrust = teeAuthList.getRootOfTrust();
+byte[] teeVerifiedBootKey = teeRootOfTrust.getVerifiedBootKey();
+</pre>
+
+ </li>
+
+ <li>
+ <p>
+ Compare the extension data from the <code>Attestation</code> object with
+ the set of values that you expect the hardware-backed key to contain.
+ </p>
+
+ <p class="caution">
+ <strong>Caution:</strong> Although you can complete this process within
+ your app directly, it’s safer to check the certificate’s extension data
+ on a separate server that you trust.
+ </p>
+ </li>
+</ol>
+
+<h2 id="certificate_schema">
+ Certificate Extension Data Schema
+</h2>
+
+<p>
+ Key attestation verifies the extension data that appears in the first
+ certificate within the chain in a device’s hardware-backed keystore. The
+ certificate stores the information according to the following ASN.1 schema:
+</p>
+
+<pre class="no-pretty-print">
+KeyDescription ::= SEQUENCE {
+ attestationVersion INTEGER,
+ attestationSecurityLevel SecurityLevel,
+ keymasterVersion INTEGER,
+ keymasterSecurityLevel SecurityLevel,
+ attestationChallenge OCTET_STRING,
+ <var>reserved OCTET_STRING</var>,
+ softwareEnforced AuthorizationList,
+ teeEnforced AuthorizationList,
+}
+
+SecurityLevel ::= ENUMERATED {
+ Software (0),
+ TrustedEnvironment (1),
+}
+
+AuthorizationList ::= SEQUENCE {
+ purpose [1] EXPLICIT SET OF INTEGER OPTIONAL,
+ algorithm [2] EXPLICIT INTEGER OPTIONAL,
+ keySize [3] EXPLICIT INTEGER OPTIONAL,
+ digest [5] EXPLICIT SET OF INTEGER OPTIONAL,
+ padding [6] EXPLICIT SET OF INTEGER OPTIONAL,
+ ecCurve [10] EXPLICIT INTEGER OPTIONAL,
+ rsaPublicExponent [200] EXPLICIT INTEGER OPTIONAL,
+ activeDateTime [400] EXPLICIT INTEGER OPTIONAL,
+ originationExpireDateTime [401] EXPLICIT INTEGER OPTIONAL,
+ usageExpireDateTime [402] EXPLICIT INTEGER OPTIONAL,
+ noAuthRequired [503] EXPLICIT NULL OPTIONAL,
+ userAuthType [504] EXPLICIT INTEGER OPTIONAL,
+ authTimeout [505] EXPLICIT INTEGER OPTIONAL,
+ allowWhileOnBody [506] EXPLICIT NULL OPTIONAL,
+ allApplications [600] EXPLICIT NULL OPTIONAL,
+ applicationId [601] EXPLICIT OCTET_STRING OPTIONAL,
+ creationDateTime [701] EXPLICIT INTEGER OPTIONAL,
+ origin [702] EXPLICIT INTEGER OPTIONAL,
+ rollbackResistant [703] EXPLICIT NULL OPTIONAL,
+ rootOfTrust [704] EXPLICIT RootOfTrust OPTIONAL,
+ osVersion [705] EXPLICIT INTEGER OPTIONAL,
+ osPatchLevel [706] EXPLICIT INTEGER OPTIONAL,
+ attestationChallenge [708] EXPLICIT INTEGER OPTIONAL,
+ attestationApplicationId [709] EXPLICIT OCTET_STRING OPTIONAL,
+}
+
+RootOfTrust ::= SEQUENCE {
+ verifiedBootKey OCTET_STRING,
+ deviceLocked BOOLEAN,
+ verifiedBootState VerifiedBootState,
+}
+
+VerifiedBootState ::= ENUMERATED {
+ Verified (0),
+ SelfSigned (1),
+ Unverified (2),
+ Failed (3),
+}
+</pre>
+
+<p>
+ The following list presents a description of each element within the schema:
+</p>
+
+<h3 id="certificate_schema_keydescription">
+ KeyDescription
+</h3>
+
+<p>
+ This sequence of values presents general information about the key pair being
+ verified through key attestation and provides easy access to additional
+ details.
+</p>
+
+<dl>
+ <dt>
+ <code>attestationVersion</code>
+ </dt>
+
+ <dd>
+ The version of the key attestation feature. Should be set to 1.
+ </dd>
+
+ <dt>
+ <code>attestationSecurityLevel</code>
+ </dt>
+
+ <dd>
+ <p>
+ The <a href="#certificate_schema_securitylevel">security
+ level</a> of the attestation.
+ </p>
+
+ <p class="caution">
+ <strong>Warning:</strong> Although it is possible to attest keys that are
+ stored in the Android system—that is, if the value of
+ <code>attestationSecurityLevel</code> is set to Software—you
+ cannot trust these attestations if the Android system becomes compromised.
+ </p>
+ </dd>
+
+ <dt>
+ <code>keymasterVersion</code>
+ </dt>
+
+ <dd>
+ The version of the Keymaster hardware abstraction layer (HAL). Use 0 to
+ represent version 0.2 or 0.3, 1 to represent version 1.0, and 2 to represent
+ version 2.0.
+ </dd>
+
+ <dt>
+ <code>keymasterSecurityLevel</code>
+ </dt>
+
+ <dd>
+ The <a href="#certificate_schema_securitylevel">security
+ level</a> of the Keymaster implementation.
+ </dd>
+
+ <dt>
+ <code>attestationChallenge</code>
+ </dt>
+
+ <dd>
+ The challenge string associated with a key pair that is verified using key
+ attestation.
+ </dd>
+
+ <dt>
+ <code><var>reserved</var></code>
+ </dt>
+
+ <dd>
+ Only system apps use this value. In all other apps, this value is empty.
+ </dd>
+
+ <dt>
+ <code>softwareEnforced</code>
+ </dt>
+
+ <dd>
+ Optional. The Keymaster <a href=
+ "#certificate_schema_authorizationlist">authorization
+ list</a> that is enforced by the Android system, not by the device’s TEE.
+ </dd>
+
+ <dt>
+ <code>teeEnforced</code>
+ </dt>
+
+ <dd>
+ Optional. The Keymaster <a href=
+ "#certificate_schema_authorizationlist">authorization
+ list</a> that is enforced by the device’s TEE.
+ </dd>
+</dl>
+
+<h3 id="certificate_schema_securitylevel">
+ SecurityLevel
+</h3>
+
+<p>
+ This data structure indicates the extent to which a software feature, such as
+ a key pair, is protected based on its location within the device.
+</p>
+
+<p>
+ Because the data structure is an enumeration, it takes on exactly one of the
+ following values:
+</p>
+
+<dl>
+ <dt>
+ Software
+ </dt>
+
+ <dd>
+ The logic for creating and managing the feature is implemented in the
+ Android system. For the purposes of creating and storing key pairs, this
+ location is less secure than the TEE but is more secure than your app's
+ process space.
+ </dd>
+
+ <dt>
+ TrustedEnvironment
+ </dt>
+
+ <dd>
+ The logic for creating and managing the feature is implemented in secure
+ hardware, such as a TEE. For the purposes of creating and storing key pairs,
+ this location is more secure because secure hardware is highly resistant to
+ remote compromise.
+ </dd>
+</dl>
+
+<h3 id="certificate_schema_authorizationlist">
+ AuthorizationList
+</h3>
+
+<p>
+ This data structure contains the key pair’s properties themselves, as defined
+ in the Keymaster hardware abstraction layer (HAL). You compare these values
+ to the device’s current state or to a set of expected values to verify that a
+ key pair is still valid for use in your app.
+</p>
+
+<p>
+ Each field name corresponds to a similarly-named Keymaster tag. For example,
+ the <code>keySize</code> field in an authorization list corresponds to the
+ <a href="https://source.android.com/security/keystore/implementer-ref.html#km_tag_key_size">
+ <code>KM_TAG_KEY_SIZE</code></a> Keymaster tag.
+</p>
+
+<p>
+ Each field in the following list is optional:
+</p>
+
+<dl>
+ <dt>
+ <code>purpose</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_purpose">
+ KM_TAG_PURPOSE</a></code> Keymaster tag, which uses a tag ID value of 1.
+ </dd>
+
+ <dt>
+ <code>algorithm</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_algorithm">
+ KM_TAG_ALGORITHM</a></code> Keymaster tag, which uses a tag ID value of
+ 2.
+ </p>
+
+ <p>
+ When an <code>AuthorizationList</code> object is associated with key
+ attestation, this value is always <code>KM_ALGORITHM_RSA</code> or
+ <code>KM_ALGORITHM_EC</code>.
+ </p>
+ </dd>
+
+ <dt>
+ <code>keySize</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_key_size">
+ KM_TAG_KEY_SIZE</a></code> Keymaster tag, which uses a tag ID value of 3.
+ </dd>
+
+ <dt>
+ <code>digest</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_digest">
+ KM_TAG_DIGEST</a></code> Keymaster tag, which uses a tag ID value of 5.
+ </dd>
+
+ <dt>
+ <code>padding</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_padding">
+ KM_TAG_PADDING</a></code> Keymaster tag, which uses a tag ID value of 6.
+ </dd>
+
+ <dt>
+ <code>ecCurve</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_EC_CURVE</code> Keymaster tag, which uses
+ a tag ID value of 10.
+ </p>
+
+ <p>
+ The set of parameters used to generate an elliptic curve (EC) key pair,
+ which uses ECDSA for signing and verification, within the Android system
+ keystore.
+ </p>
+ </dd>
+
+ <dt>
+ <code>rsaPublicExponent</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_rsa_public_exponent">
+ KM_TAG_RSA_PUBLIC_EXPONENT</a></code> Keymaster tag, which uses a tag ID
+ value of 200.
+ </dd>
+
+ <dt>
+ <code>activeDateTime</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_active_datetime">
+ KM_TAG_ACTIVE_DATETIME</a></code> Keymaster tag, which uses a tag ID value
+ of 400.
+ </dd>
+
+ <dt>
+ <code>originationExpireDateTime</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_origination_expire_datetime">
+ KM_TAG_ORIGINATION_EXPIRE_DATETIME</a></code> Keymaster tag, which uses a
+ tag ID value of 401.
+ </dd>
+
+ <dt>
+ <code>usageExpireDateTime</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_usage_expire_datetime">
+ KM_TAG_USAGE_EXPIRE_DATETIME</a></code> Keymaster tag, which uses a tag ID
+ value of 402.
+ </dd>
+
+ <dt>
+ <code>noAuthRequired</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_no_auth_required">
+ KM_TAG_NO_AUTH_REQUIRED</a></code> Keymaster tag, which uses a tag ID
+ value of 503.
+ </p>
+
+ <p>
+ When an <code>AuthorizationList</code> object is associated with key
+ attestation, this value is always true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>userAuthType</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_user_auth_type">
+ KM_TAG_USER_AUTH_TYPE</a></code> Keymaster tag, which uses a tag ID value
+ of 504.
+ </dd>
+
+ <dt>
+ <code>authTimeout</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_auth_timeout">
+ KM_TAG_AUTH_TIMEOUT</a></code> Keymaster tag, which uses a tag ID value of
+ 505.
+ </dd>
+
+ <dt>
+ <code>allowWhileOnBody</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_ALLOW_WHILE_ON_BODY</code> Keymaster tag,
+ which uses a tag ID value of 506.
+ </p>
+
+ <p>
+ Allows the key to be used after its authentication timeout period if the
+ user is still wearing the device on their body. Note that a secure
+ on-body sensor determines whether the device is being worn on the user’s
+ body.
+ </p>
+
+ <p>
+ When an <code>AuthorizationList</code> object is associated with key
+ attestation, this value is always true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>allApplications</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_ALL_APPLICATIONS</code> Keymaster tag,
+ which uses a tag ID value of 600.
+ </p>
+
+ <p>
+ Indicates whether all apps on a device can access the key pair.
+ </p>
+
+ <p>
+ When an <code>AuthorizationList</code> object is associated with key
+ attestation, this value is always true.
+ </p>
+ </dd>
+
+ <dt>
+ <code>applicationId</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_application_id">
+ KM_TAG_APPLICATION_ID</a></code> Keymaster tag, which uses a tag ID value
+ of 601.
+ </dd>
+
+ <dt>
+ <code>creationDateTime</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_creation_datetime">
+ KM_TAG_CREATION_DATETIME</a></code> Keymaster tag, which uses a tag ID
+ value of 701.
+ </dd>
+
+ <dt>
+ <code>origin</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_origin">
+ KM_TAG_ORIGIN</a></code> Keymaster tag, which uses a tag ID value of 702.
+ </p>
+
+ <p>
+ When an <code>AuthorizationList</code> object is associated with key
+ attestation, this value is usually set to
+ <code>KM_ORIGIN_GENERATED</code>. If the attestation uses Keymaster
+ version 0.2 or 0.3, however, the origin may be set to
+ <code>KM_ORIGIN_UNKNOWN</code> instead.
+ </p>
+ </dd>
+
+ <dt>
+ <code>rollbackResistant</code>
+ </dt>
+
+ <dd>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_rollback_resistant">
+ KM_TAG_ROLLBACK_RESISTANT</a></code> Keymaster tag, which uses a tag ID
+ value of 703.
+ </dd>
+
+ <dt>
+ <code>rootOfTrust</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code><a href=
+ "https://source.android.com/security/keystore/implementer-ref.html#km_tag_root_of_trust">
+ KM_TAG_ROOT_OF_TRUST</a></code> Keymaster tag, which uses a tag ID value
+ of 704.
+ </p>
+
+ <p>
+ For more details, see the section describing the <code><a href=
+ "#certificate_schema_rootoftrust">RootOfTrust</a></code>
+ data structure.
+ </p>
+ </dd>
+
+ <dt>
+ <code>osVersion</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_OS_VERSION</code> Keymaster tag, which
+ uses a tag ID value of 705.
+ </p>
+
+ <p>
+ The version of the Android operating system associated with the
+ Keymaster, specified as a six-digit integer. For example, version 6.0.1
+ is represented as 060001.
+ </p>
+
+ <p>
+ Only Keymaster version 1.0 or higher includes this value in the
+ authorization list.
+ </p>
+ </dd>
+
+ <dt>
+ <code>osPatchLevel</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_PATCHLEVEL</code> Keymaster tag, which
+ uses a tag ID value of 706.
+ </p>
+
+ <p>
+ The month and year associated with the security patch that is being used
+ within the Keymaster, specified as a six-digit integer. For example, the
+ June 2016 patch is represented as 201606.
+ </p>
+
+ <p>
+ Only Keymaster version 1.0 or higher includes this value in the
+ authorization list.
+ </p>
+ </dd>
+
+ <dt>
+ <code>attestationChallenge</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_ATTESTATION_CHALLENGE</code> Keymaster
+ tag, which uses a tag ID value of 708.
+ </p>
+
+ <p>
+ The challenge string associated with the key pair that is defined in the
+ Keymaster.
+ </p>
+ </dd>
+
+ <dt>
+ <code>attestationApplicationId</code>
+ </dt>
+
+ <dd>
+ <p>
+ Corresponds to the <code>KM_TAG_ATTESTATION_APPLICATION_ID</code>
+ Keymaster tag, which uses a tag ID value of 709.
+ </p>
+
+ <p>
+ The unique ID of the attestation certificate that signed the key pair
+ that is in the Keymaster.
+ </p>
+ </dd>
+</dl>
+
+<h3 id="certificate_schema_rootoftrust">
+ RootOfTrust
+</h3>
+
+<p>
+ This collection of values defines key information about the device’s status.
+</p>
+
+<p>
+ Each field in the following list is required:
+</p>
+
+<dl>
+ <dt>
+ <code>verifiedBootKey</code>
+ </dt>
+
+ <dd>
+ <p>
+ A secure hash of the key that verifies the system image. It is recommended
+ that you use the SHA-256 algorithm for this hash.
+ </p>
+ </dd>
+
+ <dt>
+ <code>deviceLocked</code>
+ </dt>
+
+ <dd>
+ True if the device’s bootloader is locked, which enables Verified Boot
+ checking and prevents an unsigned device image from being flashed onto the
+ device. For more information about this feature, see the <a class=
+ "external-link" href=
+ "https://source.android.com/security/verifiedboot/verified-boot.html">Verifying
+ Boot</a> documentation.
+ </dd>
+
+ <dt>
+ <code>verifiedBootState</code>
+ </dt>
+
+ <dd>
+ The <a href="#certificate_schema_verifiedbootstate">boot
+ state</a> of the device, according to the Verified Boot feature.
+ </dd>
+
+ <dt>
+ <code>osVersion</code>
+ </dt>
+
+ <dd>
+ The current version of the Android operating system on the device,
+ specified as a six-digit integer. For example, version 6.0.1 is represented
+ as 060001.
+ </dd>
+
+ <dt>
+ <code>patchMonthYear</code>
+ </dt>
+
+ <dd>
+ The month and year associated with the security patch that is currently
+ installed on the device, specified as a six-digit integer. For example, the
+ August 2016 patch is represented as 201608.
+ </dd>
+</dl>
+
+<h3 id="certificate_schema_verifiedbootstate">
+ VerifiedBootState
+</h3>
+
+<p>
+ This data structure provides the device’s current boot state, which
+ represents the level of protection provided to the user and to apps after the
+ device finishes booting. For more information about this feature, see the
+ <a class="external-link" href=
+ "https://source.android.com/security/verifiedboot/verified-boot.html#boot_state">
+ Boot State</a> section within the Verifying Boot documentation.
+</p>
+
+<p>
+ This data structure is an enumeration, so it takes on exactly one of the
+ following values:
+</p>
+
+<dl>
+ <dt>
+ Verified
+ </dt>
+
+ <dd>
+ <p>
+ Indicates a full chain of trust, which includes the bootloader, the boot
+ partition, and all verified partitions.
+ </p>
+
+ <p>
+ When the device is in this boot state, the <code>verifiedBootKey</code> is
+ the hash of the device-embedded certificate, which the device manufacturer
+ adds to the device's ROM at the factory.
+ </p>
+ </dd>
+
+ <dt>
+ SelfSigned
+ </dt>
+
+ <dd>
+ <p>
+ Indicates that the device-embedded certificate has verified the device’s
+ boot partition and that the signature is valid.
+ </p>
+
+ <p>
+ When the device is in this boot state, the <code>verifiedBootKey</code> is
+ the hash of a user-installed certificate, which signs a boot partition
+ that the user adds to the device in place of the original,
+ manufacturer-provided boot partition.
+ </p>
+ </dd>
+
+ <dt>
+ Unverified
+ </dt>
+
+ <dd>
+ Indicates that the user can modify the device freely. Therefore, the user is
+ responsible for verifying the device’s integrity.
+ </dd>
+
+ <dt>
+ Failed
+ </dt>
+
+ <dd>
+ Indicates that the device has failed verification. The attestation
+ certificate should never use this value for <code>VerifiedBootState</code>.
+ </dd>
+</dl>
diff --git a/docs/html/training/articles/smp.jd b/docs/html/training/articles/smp.jd
index 0b45987..a95931b 100644
--- a/docs/html/training/articles/smp.jd
+++ b/docs/html/training/articles/smp.jd
@@ -75,7 +75,7 @@
multiprocessor architectures. This document introduces issues that
can arise when writing code for symmetric multiprocessor systems in C, C++, and the Java
programming language (hereafter referred to simply as “Java” for the sake of
-brevity). It's intended as a primer for Android app developers, not as a complete
+brevity). It's intended as a primer for Android app developers, not as a complete
discussion on the subject. The focus is on the ARM CPU architecture.</p>
<p>If you’re in a hurry, you can skip the <a href="#theory">Theory</a> section
diff --git a/docs/html/training/articles/user-data-overview.jd b/docs/html/training/articles/user-data-overview.jd
index 8715d36..dc0df20 100644
--- a/docs/html/training/articles/user-data-overview.jd
+++ b/docs/html/training/articles/user-data-overview.jd
@@ -266,4 +266,4 @@
href="http://stackoverflow.com/questions/24374701/alternative-to-read-phone-state-permission-for-getting-notified-of-call">source</a>)</em></p>
<p>[2] <em>Using Personal Examples to Improve Risk Communication for Security and Privacy Decisions</em>, by M. Harbach, M. Hettig, S. Weber, and M. Smith. In Proceedings of ACM CHI 2014.</p>
<p>[3] <em>Modeling Users’ Mobile App Privacy Preferences: Restoring Usability in a Sea of Permission Settings</em>, by J. Lin B. Liu, N. Sadeh and J. Hong. In Proceedings of SOUPS 2014.</p>
-<p>[4] <em>Teens and Mobile Apps Privacy. (<a href="http://www.pewinternet.org/files/old-media/Files/Reports/2013/PIP_Teens%20and%20Mobile%20Apps%20Privacy.pdf">source</a>)</em></p>
+<p>[4] <em>Teens and Mobile Apps Privacy. (<a href="http://www.pewinternet.org/files/old-media/Files/Reports/2013/PIP_Teens%20and%20Mobile%20Apps%20Privacy.pdf">source</a>)</em></p>
diff --git a/docs/html/training/articles/user-data-permissions.jd b/docs/html/training/articles/user-data-permissions.jd
index edc7558..ace5f7f 100644
--- a/docs/html/training/articles/user-data-permissions.jd
+++ b/docs/html/training/articles/user-data-permissions.jd
@@ -56,7 +56,7 @@
see <a href="{@docRoot}training/permissions/index.html">Working with System Permissions</a>.
For best practices for working with unique identifiers, please see <a href=
"{@docRoot}training/articles/user-data-ids.html">Best Practices for
- Unique Identifiers</a>.
+ Unique Identifiers</a>.
</p>
<h2 id="tenets_of_working_with_android_permissions">Tenets of Working
diff --git a/docs/html/training/auto/index.jd b/docs/html/training/auto/index.jd
index 0a7ceb3..a0d0bb8 100644
--- a/docs/html/training/auto/index.jd
+++ b/docs/html/training/auto/index.jd
@@ -8,7 +8,9 @@
@jd:body
-<iframe width="448" height="252" src="//www.youtube.com/embed/ctiaVxgclsg?autohide=1&showinfo=0" frameborder="0" allowfullscreen="" style="float: right; margin: 0 0 20px 20px;"></iframe>
+ <iframe width="338" height="169" src="//www.youtube.com/embed/LfVBFFoy9Y0?utm_source=dac&utm_medium=video&utm_content=andfuntrain&utm_campaign=udacint?rel=0&hd=1" frameborder="0" allowfullscreen></iframe>
+ <p><a href="https://www.udacity.com/course/ud853" class="button"
+ style="width:100%">Start the video course</a>
<p>
The Android platform enables you to extend your app to work with in-vehicle console systems
@@ -27,7 +29,7 @@
For more information, follow the links below to learn how to extend your Android app to support
use in vehicles.
</p>
-
+
<h2 id="overview">Get Started</h2>
<p>
diff --git a/docs/html/training/auto/testing/index.jd b/docs/html/training/auto/testing/index.jd
index c93012f..e3e2d86 100644
--- a/docs/html/training/auto/testing/index.jd
+++ b/docs/html/training/auto/testing/index.jd
@@ -523,7 +523,7 @@
<ol>
<li>Install the Android Media Browser simulator
-({@code <sdk>/extras/google/simulators/media-browser-simulator.apk}) on
+({@code <sdk>/extras/google/simulators/media-browser-simulator.apk}) on
the test device. You can do this using
the <a href="{@docRoot}tools/help/adb.html#move">adb</a> command line tool.</li>
<li>Enable <a href="{@docRoot}tools/device.html#developer-device-options">
@@ -540,7 +540,7 @@
<ol>
<li>Install the Android Messaging simulator
- ({@code <sdk>/extras/google/simulators/messaging-simulator.apk})
+ ({@code <sdk>/extras/google/simulators/messaging-simulator.apk})
on the test device. You can do this using the
<a href="{@docRoot}tools/help/adb.html#move">adb</a> command line tool.</li>
<li>Enable the simulator to read notifications posted on the system:
diff --git a/docs/html/training/backup/autosyncapi.jd b/docs/html/training/backup/autosyncapi.jd
index 0e2a9a9..e0df7bb 100644
--- a/docs/html/training/backup/autosyncapi.jd
+++ b/docs/html/training/backup/autosyncapi.jd
@@ -257,7 +257,7 @@
<a href="{@docRoot}guide/topics/manifest/application-element.html">app manifest</a>. If your app
used this legacy approach, you can transition to full-data backups by adding the
{@code android:fullBackupOnly="true"} attribute to the
-<a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application/>}</a>
+<a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application/>}</a>
element in the manifest. When running on a device with Android 5.1
(API level 22) or lower, your app ignores this value in the manifest, and continues performing
backups in the previous manner.</p>
@@ -349,7 +349,7 @@
<pre>$ adb shell bmgr wipe <TRANSPORT> <PACKAGE></pre>
<p>
- You must prepend <code>com.google.android.gms</code> to the {@code <TRANSPORT>} value.
+ You must prepend <code>com.google.android.gms</code> to the {@code <TRANSPORT>} value.
To get the list of <a href="{@docRoot}google/backup/index.html">transports</a>, execute the
following command:
</p>
diff --git a/docs/html/training/backup/backupapi.jd b/docs/html/training/backup/backupapi.jd
index b115b8b..2f3e939 100644
--- a/docs/html/training/backup/backupapi.jd
+++ b/docs/html/training/backup/backupapi.jd
@@ -1,5 +1,5 @@
page.title=Using the Backup API
-parent.title=Syncing to the Cloud
+parent.title=Backing up App Data to the Cloud
parent.link=index.html
trainingnavtop=true
diff --git a/docs/html/training/basics/activity-lifecycle/index.jd b/docs/html/training/basics/activity-lifecycle/index.jd
index afeab86..95ed21e 100644
--- a/docs/html/training/basics/activity-lifecycle/index.jd
+++ b/docs/html/training/basics/activity-lifecycle/index.jd
@@ -41,7 +41,7 @@
lifecycle. For instance, when your
activity starts for the first time, it comes to the foreground of the system and receives user
focus. During this process, the Android system calls a series of lifecycle methods on the
-activity in which you set up the user interface and other components. If the user performs an
+activity in which you set up the user interface and other components. If the user performs an
action that starts another activity or switches to another app, the system calls another set of
lifecycle methods on your activity as it moves into the background (where the activity is no
longer visible, but the instance and its state remains intact).</p>
@@ -57,7 +57,7 @@
user expects and does not consume system resources when your activity doesn't need them.</p>
<h2>Lessons</h2>
-
+
<dl>
<dt><b><a href="starting.html">Starting an Activity</a></b></dt>
<dd>Learn the basics about the activity lifecycle, how the user can launch your app, and how
@@ -70,5 +70,5 @@
<dt><b><a href="recreating.html">Recreating an Activity</a></b></dt>
<dd>Learn what happens when your activity is destroyed and how you can rebuild the activity
state when necessary.</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/basics/activity-lifecycle/pausing.jd b/docs/html/training/basics/activity-lifecycle/pausing.jd
index 223e41a..64fa60b 100644
--- a/docs/html/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html/training/basics/activity-lifecycle/pausing.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#Pause">Pause Your Activity</a></li>
<li><a href="#Resume">Resume Your Activity</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Activities</a>
@@ -32,25 +32,34 @@
</div>
</div>
-<p>During normal app use, the foreground activity is sometimes obstructed by other
-visual components that cause the activity to <em>pause</em>. For example, when a semi-transparent
-activity opens (such as one in the style of a dialog), the previous activity pauses. As long as the
-activity is still partially visible but currently not the activity in focus, it remains paused.</p>
+<p>
+ During normal app use, the app sometimes loses focus, causing the activity to
+ <em>pause</em>. For example, when apps run in <a href=
+ "{@docRoot}guide/topics/ui/multi-window.html">multi-window mode</a>, only one
+ of the apps has the focus at any time; the system pauses all other apps. Similarly,
+ when a semi-transparent activity opens (such as one in the style of a
+ dialog), the previous activity pauses. As long as the activity is still
+ partially visible but currently not the activity in focus, it remains paused.
+</p>
<p>However, once the activity is fully-obstructed and not visible, it <em>stops</em> (which is
discussed in the next lesson).</p>
<p>As your activity enters the paused state, the system calls the {@link
android.app.Activity#onPause onPause()} method on your {@link android.app.Activity}, which allows
-you to stop ongoing actions that should not continue while paused (such as a video) or persist
+you to stop ongoing actions that should not continue while paused or persist
any information that should be permanently saved in case the user continues to leave your app. If
the user returns to your activity from the paused state, the system resumes it and calls the
{@link android.app.Activity#onResume onResume()} method.</p>
-<p class="note"><strong>Note:</strong> When your activity receives a call to {@link
-android.app.Activity#onPause()}, it may be an indication that the activity will be paused for a
-moment and the user may return focus to your activity. However, it's usually the first indication
-that the user is leaving your activity.</p>
+<p class="note">
+ <strong>Note:</strong> When the system calls your activity's {@link
+ android.app.Activity#onPause()} method, the system may be signaling that the
+ activity will be paused for a moment and the user may return focus to your
+ activity, or that the app is running in multi-window mode. However, this
+ method call may also be the first indication that the user is leaving your
+ activity.
+</p>
<img src="{@docRoot}images/training/basics/basic-lifecycle-paused.png" />
<p class="img-caption"><strong>Figure 1.</strong> When a semi-transparent activity obscures
@@ -60,14 +69,18 @@
<h2 id="Pause">Pause Your Activity</h2>
-
+
<p>When the system calls {@link android.app.Activity#onPause()} for your activity, it
technically means your activity is still partially visible, but most often is an indication that
the user is leaving the activity and it will soon enter the Stopped state. You should usually use
the {@link android.app.Activity#onPause()} callback to:</p>
<ul>
- <li>Stop animations or other ongoing actions that could consume CPU.</li>
+ <li>Check if the activity is visible; if it is not, stop animations or other
+ ongoing actions that could consume CPU. Remember, beginning with Android
+ 7.0, a paused app might be running in <a
+ href="{@docRoot}guide/topics/ui/multi-window.html">multi-window mode</a>.
+ In this case, you would not want to stop animations or video playback.</li>
<li>Commit unsaved changes, but only if users expect such changes to be permanently saved when
they leave (such as a draft email).</li>
<li>Release system resources, such as broadcast receivers, handles to sensors (like
diff --git a/docs/html/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd
index a52d5fd..60a3377 100644
--- a/docs/html/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html/training/basics/activity-lifecycle/recreating.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#SaveState">Save Your Activity State</a></li>
<li><a href="#RestoreState">Restore Your Activity State</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}training/basics/supporting-devices/screens.html">Supporting
@@ -106,7 +106,7 @@
// Save the user's current game state
savedInstanceState.putInt(STATE_SCORE, mCurrentScore);
savedInstanceState.putInt(STATE_LEVEL, mCurrentLevel);
-
+
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
}
@@ -139,7 +139,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // Always call the superclass first
-
+
// Check whether we're recreating a previously destroyed instance
if (savedInstanceState != null) {
// Restore value of members from saved state
@@ -158,12 +158,12 @@
after the {@link android.app.Activity#onStart()} method. The system calls {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} only if there is a saved
state to restore, so you do not need to check whether the {@link android.os.Bundle} is null:</p>
-
+
<pre>
public void onRestoreInstanceState(Bundle savedInstanceState) {
// Always call the superclass so it can restore the view hierarchy
super.onRestoreInstanceState(savedInstanceState);
-
+
// Restore state members from saved instance
mCurrentScore = savedInstanceState.getInt(STATE_SCORE);
mCurrentLevel = savedInstanceState.getInt(STATE_LEVEL);
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index 5b238b8..06f3a6c 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -9,7 +9,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#lifecycle-states">Understand the Lifecycle Callbacks</a></li>
@@ -17,7 +17,7 @@
<li><a href="#Create">Create a New Instance</a></li>
<li><a href="#Destroy">Destroy the Activity</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Activities</a></li>
@@ -84,7 +84,7 @@
</ul>
<!--
-<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
+<p class="table-caption"><strong>Table 1.</strong> Activity lifecycle state pairs and callback
methods.</p>
<table>
<tr>
@@ -139,7 +139,7 @@
-<h2 id="launching-activity">Specify Your App's Launcher Activity</h2>
+<h2 id="launching-activity">Specify Your App's Launcher Activity</h2>
<p>When the user selects your app icon from the Home screen, the system calls the {@link
android.app.Activity#onCreate onCreate()} method for the {@link android.app.Activity} in your app
@@ -154,7 +154,7 @@
href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
<intent-filter>}</a> that includes the {@link
android.content.Intent#ACTION_MAIN MAIN} action and
-{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} category. For example:</p>
+{@link android.content.Intent#CATEGORY_LAUNCHER LAUNCHER} category. For example:</p>
<pre>
<activity android:name=".MainActivity" android:label="@string/app_name">
@@ -203,10 +203,10 @@
// Set the user interface layout for this Activity
// The layout file is defined in the project res/layout/main_activity.xml file
setContentView(R.layout.main_activity);
-
+
// Initialize member TextView so we can manipulate it later
mTextView = (TextView) findViewById(R.id.text_message);
-
+
// Make sure we're running on Honeycomb or higher to use ActionBar APIs
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// For the main activity, make sure the app icon in the action bar
@@ -271,7 +271,7 @@
@Override
public void onDestroy() {
super.onDestroy(); // Always call the superclass
-
+
// Stop method tracing that the activity started during onCreate()
android.os.Debug.stopMethodTracing();
}
diff --git a/docs/html/training/basics/activity-lifecycle/stopping.jd b/docs/html/training/basics/activity-lifecycle/stopping.jd
index 51c95ea..3246374 100644
--- a/docs/html/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html/training/basics/activity-lifecycle/stopping.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#Stop">Stop Your Activity</a></li>
<li><a href="#Start">Start/Restart Your Activity</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/components/activities.html">Activities</a>
@@ -154,13 +154,13 @@
@Override
protected void onStart() {
super.onStart(); // Always call the superclass method first
-
+
// The activity is either being restarted or started for the first time
// so this is where we should make sure that GPS is enabled
- LocationManager locationManager =
+ LocationManager locationManager =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
+
if (!gpsEnabled) {
// Create a dialog here that requests the user to enable GPS, and use an intent
// with the android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS action
@@ -171,8 +171,8 @@
@Override
protected void onRestart() {
super.onRestart(); // Always call the superclass method first
-
- // Activity being restarted from stopped state
+
+ // Activity being restarted from stopped state
}
</pre>
diff --git a/docs/html/training/basics/data-storage/databases.jd b/docs/html/training/basics/data-storage/databases.jd
index 4a91d0d..f42bf65 100644
--- a/docs/html/training/basics/data-storage/databases.jd
+++ b/docs/html/training/basics/data-storage/databases.jd
@@ -119,11 +119,11 @@
accessible to other applications.</p>
<p>A useful set of APIs is available in the {@link
-android.database.sqlite.SQLiteOpenHelper} class.
+android.database.sqlite.SQLiteOpenHelper} class.
When you use this class to obtain references to your database, the system
-performs the potentially
+performs the potentially
long-running operations of creating and updating the database only when
-needed and <em>not during app startup</em>. All you need to do is call
+needed and <em>not during app startup</em>. All you need to do is call
{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} or
{@link android.database.sqlite.SQLiteOpenHelper#getReadableDatabase}.</p>
diff --git a/docs/html/training/basics/data-storage/files.jd b/docs/html/training/basics/data-storage/files.jd
index 58a1d5f..349af78 100644
--- a/docs/html/training/basics/data-storage/files.jd
+++ b/docs/html/training/basics/data-storage/files.jd
@@ -192,7 +192,7 @@
try {
String fileName = Uri.parse(url).getLastPathSegment();
file = File.createTempFile(fileName, null, context.getCacheDir());
- catch (IOException e) {
+ } catch (IOException e) {
// Error while creating file
}
return file;
@@ -259,7 +259,7 @@
your app. Although these files are technically accessible by the user and other apps because they
are on the external storage, they are files that realistically don't provide value to the user
outside your app. When the user uninstalls your app, the system deletes
- all files in your app's external private directory.
+ all files in your app's external private directory.
<p>For example, additional resources downloaded by your app or temporary media files.</p>
</dd>
</dl>
@@ -274,7 +274,7 @@
<pre>
public File getAlbumStorageDir(String albumName) {
- // Get the directory for the user's public pictures directory.
+ // Get the directory for the user's public pictures directory.
File file = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -296,7 +296,7 @@
<pre>
public File getAlbumStorageDir(Context context, String albumName) {
- // Get the directory for the app's private pictures directory.
+ // Get the directory for the app's private pictures directory.
File file = new File(context.getExternalFilesDir(
Environment.DIRECTORY_PICTURES), albumName);
if (!file.mkdirs()) {
@@ -375,7 +375,7 @@
<div class="note">
<p><strong>Note:</strong> When the user uninstalls your app, the Android system deletes
-the following:</p>
+the following:</p>
<ul>
<li>All files you saved on internal storage</li>
<li>All files you saved on external storage using {@link
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 275500c..a680c73 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd
@@ -71,38 +71,31 @@
<h2 id="LinearLayout">Create a Linear Layout</h2>
<ol>
-<li>In Android Studio, from the <code>res/layout</code> directory, open the {@code content_my.xml}
-file.
-<p>The BlankActivity template you chose when you created this project includes the
-<code>content_my.xml</code> file with a {@link android.widget.RelativeLayout} root view and a
-{@link android.widget.TextView} child view.</p>
-</li>
-<li>In the <strong>Preview</strong> pane, click the Hide icon <img src="{@docRoot}images/tools/as-hide-side.png"
- style="vertical-align:baseline;margin:0; max-height:1.5em" /> to close the Preview pane.
- <p> In Android Studio, when you open a layout file, you’re first shown
- the Preview pane. Clicking elements in this pane opens the WYSIWYG tools in the Design pane. For
- this lesson, you’re going to work directly with the XML.</p></li>
-<li>Delete the {@link android.widget.TextView <TextView>} element.</li>
-<li>Change the {@link android.widget.RelativeLayout <RelativeLayout>} element to
-{@link android.widget.LinearLayout <LinearLayout>}.</li>
-<li>Add the <a href="{@docRoot}reference/android/widget/LinearLayout.html#attr_android:orientation">
-{@code android:orientation}</a> attribute and set it to <code>"horizontal"</code>.</li>
-<li>Remove the {@code android:padding} attributes and the {@code tools:context} attribute.
-</ol>
-
-<p>The result looks like this:</p>
-
-<pre>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+ <li>From the <code>res/layout/</code> directory, open the
+ <code>activity_main.xml</code> file.
+ <p>This XML file defines the layout of your activity. It contains the
+ default "Hello World" text view.</p>
+ </li>
+ <li>When you open a layout file, you’re first shown the design editor in the
+ <a href="/studio/write/layout-editor.html">Layout Editor</a>. For this lesson,
+ you work directly with the XML, so click the <b>Text</b> tab to switch to
+ the text editor.
+ </li>
+ <li>Replace the contents of the file with the following XML:
+ <pre><?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:showIn="@layout/activity_my">
+ android:orientation="horizontal">
+</LinearLayout>
</pre>
+ </li>
+
+</ol>
+
<p>{@link android.widget.LinearLayout} is a view group (a subclass of {@link
android.view.ViewGroup}) that lays out child views in either a vertical or horizontal orientation,
as specified by the <a
@@ -128,29 +121,25 @@
<h2 id="TextInput">Add a Text Field</h2>
-<p>As with every {@link android.view.View} object, you must define certain XML attributes to specify
-the {@link android.widget.EditText} object's properties.</p>
+<p>In the <code>activity_main.xml</code> file, within the
+{@link android.widget.LinearLayout <LinearLayout>} element, add the following
+{@link android.widget.EditText <EditText>} element:</p>
-<ol>
-<li>In the <code>content_my.xml</code> file, within the
-{@link android.widget.LinearLayout <LinearLayout>} element, define an
-{@link android.widget.EditText <EditText>} element with the <code>id</code> attribute
-set to <code>@+id/edit_message</code>.</li>
-<li>Define the <code>layout_width</code> and <code>layout_height</code> attributes as
-<code>wrap_content</code>.</li>
-<li>Define a <code>hint</code> attribute as a string object named <code>edit_message</code>.</li>
-</ol>
-
-<p>The {@link android.widget.EditText <EditText>} element should read as follows:</p>
-
-<pre>
-<EditText android:id="@+id/edit_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:hint="@string/edit_message" />
+<pre><LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+ <b><EditText android:id="@+id/edit_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:hint="@string/edit_message" /></b>
+</LinearLayout>
</pre>
-<p>Here are the {@link android.widget.EditText <EditText>} attributes you added:</p>
+<p>Here is a description of the attributes in the
+ {@link android.widget.EditText <EditText>} you added:</p>
<dl>
<dt><a href="{@docRoot}reference/android/view/View.html#attr_android:id">{@code android:id}</a></dt>
@@ -222,29 +211,20 @@
<h2 id="Strings">Add String Resources</h2>
<p>By default, your Android project includes a string resource file at
-<code>res/values/strings.xml</code>. Here, you'll add a new string named
-<code>"edit_message"</code> and set the value to "Enter a message."</p>
+<code>res/values/strings.xml</code>. Here, you'll add two new strings.</p>
<ol>
-<li>In Android Studio, from the <code>res/values</code> directory, open <code>strings.xml</code>.</li>
-<li>Add a line for a string named <code>"edit_message"</code> with the value, "Enter a message".
-</li>
-<li>Add a line for a string named <code>"button_send"</code> with the value, "Send".
-<p>You'll create the button that uses this string in the next section.</p>
-</li>
-</ol>
-
-<p>The result for <code>strings.xml</code> looks like this:</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
+<li>From the <code>res/values/</code> directory, open <code>strings.xml</code>.</li>
+<li>Add two strings so that your file looks like this:
+<pre><?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My First App</string>
- <string name="edit_message">Enter a message</string>
- <string name="button_send">Send</string>
- <string name="action_settings">Settings</string>
+ <b><string name="edit_message">Enter a message</string>
+ <string name="button_send">Send</string></b>
</resources>
</pre>
+</li>
+</ol>
<p>For text in the user interface, always specify each string as
a resource. String resources allow you to manage all UI text in a single location,
@@ -260,40 +240,22 @@
<h2 id="Button">Add a Button</h2>
-<ol>
-<li>In Android Studio, from the <code>res/layout</code> directory, edit the <code>content_my.xml</code>
-file.</li>
-<li>Within the
-{@link android.widget.LinearLayout <LinearLayout>} element, define a
-{@link android.widget.Button <Button>} element immediately following the
-{@link android.widget.EditText <EditText>} element.</li>
-<li>Set the button's width and height attributes to <code>"wrap_content"</code> so
-the button is only as big as necessary to fit the button's text label.</li>
-<li>Define the button's text label with the <a
-href="{@docRoot}reference/android/widget/TextView.html#attr_android:text">{@code
-android:text}</a> attribute; set its value to the <code>button_send</code> string
-resource you defined in the previous section.</li>
-</ol>
-
-<p>Your {@link android.widget.LinearLayout <LinearLayout>} should look like this:</p>
-
-<pre>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<p>Go back to the <code>activity_main.xml</code> file and add a button after the
+ {@link android.widget.EditText <EditText>}. Your file should look like this:</p>
+<pre><LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:showIn="@layout/activity_my">
+ android:layout_height="match_parent">
<EditText android:id="@+id/edit_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:hint="@string/edit_message" />
- <Button
+ <b><Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/button_send" />
+ android:text="@string/button_send" /></b>
</LinearLayout>
</pre>
@@ -302,7 +264,7 @@
attribute, because it won't be referenced from the activity code.</p>
<p>The layout is currently designed so that both the {@link android.widget.EditText} and {@link
-android.widget.Button} widgets are only as big as necessary to fit their content, as Figure 2 shows.
+android.widget.Button} widgets are only as big as necessary to fit their content, as figure 2 shows.
</p>
<img src="{@docRoot}images/training/firstapp/edittext_wrap.png" />
@@ -334,53 +296,36 @@
<h2 id="Weight">Make the Input Box Fill in the Screen Width</h2>
-<p>To fill the remaining space in your layout with the {@link android.widget.EditText} element, do
-the following:</p>
-
-<ol>
-<li>In the <code>content_my.xml</code> file, assign the
-{@link android.widget.EditText <EditText>} element's <code>layout_weight</code> attribute a value
-of <code>1</code>.</li>
-<li>Also, assign {@link android.widget.EditText <EditText>} element's <code>layout_width</code>
-attribute a value of <code>0dp</code>.
+<p>In <code>activity_main.xml</code>, modify the
+ {@link android.widget.EditText <EditText>} so that the attributes look like
+ this:</p>
<pre>
-<EditText
- android:layout_weight="1"
- android:layout_width="0dp"
- ... />
+<EditText android:id="@+id/edit_message"
+ <b>android:layout_weight="1"
+ android:layout_width="0dp"</b>
+ android:layout_height="wrap_content"
+ android:hint="@string/edit_message" />
</pre>
-<p>To improve the layout efficiency when you specify the weight, you should change the
-width of the {@link android.widget.EditText} to be
-zero (0dp). Setting the width to zero improves layout performance because using
+<p>Setting the width to zero (0dp) improves layout performance because using
<code>"wrap_content"</code> as the width requires the system to calculate a width that is
ultimately irrelevant because the weight value requires another width calculation to fill the
remaining space.</p>
-<p>Figure 3
-shows the result when you assign all weight to the {@link android.widget.EditText} element.</p>
-
<img src="{@docRoot}images/training/firstapp/edittext_gravity.png" />
<p class="img-caption"><strong>Figure 3.</strong> The {@link android.widget.EditText} widget is
given all the layout weight, so it fills the remaining space in the {@link
android.widget.LinearLayout}.</p>
-</li>
-</ol>
+<p>Here’s how your complete <code>activity_main.xml</code>layout file should now look:</p>
-<p>Here’s how your complete <code>content_my.xml</code>layout file should now look:</p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
+<pre><?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:showIn="@layout/activity_my">
+ android:layout_height="match_parent">
<EditText android:id="@+id/edit_message"
android:layout_weight="1"
android:layout_width="0dp"
@@ -406,7 +351,4 @@
<p>Continue to the <a href="starting-activity.html">next
lesson</a> to learn how to respond to button presses, read content
-from the text field, start another activity, and more.</p>
-
-
-
+from the text field, start another activity, and more.</p>
\ No newline at end of file
diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd
index e66237a..cad32bf 100644
--- a/docs/html/training/basics/firstapp/creating-project.jd
+++ b/docs/html/training/basics/firstapp/creating-project.jd
@@ -14,36 +14,19 @@
<div id="tb-wrapper">
<div id="tb">
-<h2>This lesson teaches you to</h2>
-
-<ol>
- <li><a href="#Studio">Create a Project with Android Studio</a></li>
-</ol>
-
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}tools/projects/index.html">Managing Projects</a></li>
+ <li><a href="{@docRoot}studio/projects/index.html">Projects Overview</a></li>
</ul>
</div>
</div>
-<p>An Android project contains all the files that comprise the source code for your Android
-app.</p>
-
-<p>This lesson
-shows how to create a new project either using Android Studio or using the
-SDK tools from a command line.</p>
-
-<p class="note"><strong>Note:</strong> You should already have Android Studio or the Android SDK
-command-line tools installed. If not, <a
-href="{@docRoot}studio/index.html">download them</a> before you start this
-lesson.</p>
-
-
-<h2 id="Studio">Create a Project with Android Studio</h2>
+<p>This lesson shows you how to create a new Android project with
+ <a href="{@docRoot}studio/index.html">Android Studio</a> and describes some
+ of the files in the project.</p>
<ol>
<li>In Android Studio, create a new project:
@@ -54,11 +37,12 @@
Project</strong>. The <em>Create New Project</em> screen appears.</li>
</ul>
</li>
- <li>Fill out the fields on the screen, and click <strong>Next</strong>.
- <p>It is easier to follow these lessons if you use the same values as shown.</p>
+ <li>Fill out the fields on the screen. For <strong>Application Name</strong>
+ use "My First App". For <strong>Company Domain</strong>, use "example.com".
+ For the other fields, use the default values and click <strong>Next</strong>
+ <p>Here's a brief explanation of each field:</p>
<ul>
- <li><strong>Application Name</strong> is the app name that appears to users.
- For this project, use "My First App."</li>
+ <li><strong>Application Name</strong> is the app name that appears to users.</li>
<li><strong>Company domain</strong> provides a qualifier that will be appended to the package
name; Android Studio will remember this qualifier for each new project you create.</li>
<li><strong>Package name</strong> is the fully qualified name for the project (following the
@@ -70,9 +54,8 @@
files.</li>
</ul>
</li>
- <li>Under <strong>Select the form factors your app will run on</strong>, check the box for <strong>
- Phone and Tablet</strong>.</li>
- <li>For <strong>Minimum SDK</strong>, select <strong>API 8: Android 2.2 (Froyo)</strong>.
+ <li>Under <strong>Target Android Devices</strong>, accept the default values
+ and click <strong>Next</strong>.
<p>The Minimum Required SDK is the earliest version of Android that your app supports,
indicated using the <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">
API level</a>. To support as many devices as possible, you should set this to the lowest
@@ -80,8 +63,13 @@
app is possible only on newer versions of Android and it's not critical to the app's core
feature set, you can enable the feature only when running on the versions that support it (as
discussed in <a href="{@docRoot}training/basics/supporting-devices/platforms.html">
- Supporting Different Platform Versions</a>).</p></li>
- <li>Leave all of the other options (TV, Wear, and Glass) unchecked and click <strong>Next.</strong></li>
+ Supporting Different Platform Versions</a>).</p>
+ </li>
+
+ <li>Under <strong>Add an Activity to Mobile</strong>, select <strong>Empty
+ Activity</strong> and click <strong>Next</strong>.
+ </li>
+
<div class="sidebox-wrapper">
<div class="sidebox">
<h3>Activities</h3>
@@ -93,37 +81,25 @@
Activities</a> for more information.</p>
</div>
</div>
- <li>Under <strong>Add an activity to <<em>template</em>></strong>, select <strong>Blank
- Activity</strong> and click <strong>Next</strong>.</li>
- <li>Under <strong>Customize the Activity</strong>, change the
- <strong>Activity Name</strong> to <em>MyActivity</em>. The <strong>Layout Name</strong> changes
- to <em>activity_my</em>, and the <strong>Title</strong> to <em>MyActivity</em>. The
- <strong>Menu Resource Name</strong> is <em>menu_my</em>.
- <li>Click the <strong>Finish</strong> button to create the project.</li>
+
+ <li>Under <strong>Customize the Activity</strong>, accept the default values
+ and click <strong>Finish</strong>.
</ol>
<p>Your Android project is now a basic "Hello World" app that contains some default files. Take a
moment to review the most important of these:</p>
<dl>
- <dt><code>app/src/main/res/layout/activity_my.xml</code></dt>
- <dd>This XML layout file is for the activity you added when you created the project
- with Android Studio. Following the New Project workflow, Android Studio presents this file
- with both a text
- view and a preview of the screen UI. The file contains some default interface elements
- from the material design library, including the
- <a href="{@docRoot}training/appbar/index.html">app bar</a> and a floating action button.
- It also includes a separate layout file with the main content.</dd>
+ <dt><code>app/src/main/java/com.example.myfirstapp/MainActivity.java</code></dt>
+ <dd>This file appears in Android Studio after the New Project wizard finishes.
+ It contains the class definition for the activity you created earlier. When you build
+ and run the app, the {@link android.app.Activity} starts and loads the
+ layout file that says "Hello World!"</dd>
- <dt><code>app/src/main/res/layout/content_my.xml</code></dt>
- <dd>This XML layout file resides in {@code activity_my.xml}, and contains some settings and
- a {@code TextView} element that displays the message, "Hello world!".</dd>
+ <dt><code>app/src/main/res/layout/activity_main.xml</code></dt>
+ <dd>This XML file defines the layout of the activity. It contains a {@code TextView}
+ element with the text "Hello world!".</dd>
- <dt><code>app/src/main/java/com.mycompany.myfirstapp/MyActivity.java</code></dt>
- <dd>A tab for this file appears in Android Studio when the New Project workflow finishes. When you
- select the file you see the class definition for the activity you created. When you build and
- run the app, the {@link android.app.Activity} class starts the activity and loads the layout file
- that says "Hello World!"</dd>
<dt><code>app/src/main/AndroidManifest.xml</code></dt>
<dd>The <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest file</a> describes
the fundamental characteristics of the app and defines each of its components. You'll revisit
@@ -137,15 +113,15 @@
<ul>
<li><code>compiledSdkVersion</code> is the platform version against which you will compile
your app. By default, this is set to the latest version of Android available in your SDK.
- (It should be Android 4.1 or greater; if you don't have such a version available, you must
- install one using the <a href="{@docRoot}studio/intro/update.html">SDK Manager</a>.)
+ By default, this is set to the latest version of Android SDK installed on your
+ development machine.
You can still build your app to support older versions, but setting this to the latest
version allows you to enable new features and optimize your app for a great user experience
on the latest devices.</li>
<li><code>applicationId</code> is the fully qualified package name for your application that
- you specified during the New Project workflow.</li>
+ you specified in the New Project wizard.</li>
<li><code>minSdkVersion</code> is the Minimum SDK version you specified during the New Project
- workflow. This is the earliest version of the Android SDK that your app supports.</li>
+ wizard. This is the earliest version of the Android SDK that your app supports.</li>
<li><code>targetSdkVersion</code> indicates the highest version of Android with which you have
tested your application. As new versions of Android become available, you should
test your app on the new version and update this value to match the latest API level and
@@ -166,8 +142,8 @@
for various <a href="{@docRoot}training/multiscreen/screendensities.html">densities</a>.
</dd>
<dt><code>layout/</code></dt>
- <dd>Directory for files that define your app's user interface like {@code activity_my.xml},
- discussed above, which describes a basic layout for the {@code MyActivity}
+ <dd>Directory for files that define your app's user interface like {@code activity_main.xml},
+ discussed above, which describes a basic layout for the {@code MainActivity}
class.</dd>
<dt><code>menu/</code></dt>
<dd>Directory for files that define your app's menu items.</dd>
@@ -180,4 +156,6 @@
string and color definitions.</dd>
</dl>
-<p>To run the app, continue to the <a href="running-app.html">next lesson</a>.</p>
+<p>
+ To run the app, continue to the <a href="running-app.html">next lesson</a>.
+</p>
\ No newline at end of file
diff --git a/docs/html/training/basics/firstapp/index.jd b/docs/html/training/basics/firstapp/index.jd
index cb5073f..48b7190 100644
--- a/docs/html/training/basics/firstapp/index.jd
+++ b/docs/html/training/basics/firstapp/index.jd
@@ -23,25 +23,10 @@
<p>Welcome to Android application development!</p>
-<p>This class teaches you how to build your first Android app. You’ll learn how to create an Android
-project and run a debuggable version of the app. You'll also learn some fundamentals of Android app
-design, including how to build a simple user interface and handle user input.</p>
+<p>This class teaches you how to build your first Android app. You’ll learn how
+ to create an Android project with Android Studio and run a debuggable version
+ of the app. You'll also learn some fundamentals of Android app design,
+ including how to build a simple user interface and handle user input.</p>
-<h2>Set Up Your Environment</h2>
-
-<p>Before you start this class, be sure you have your development environment set up. You need
-to:</p>
-<ol>
- <li>Download <a href="{@docRoot}studio/index.html">Android Studio</a>.</li>
- <li>Download the latest SDK tools and platforms using the
- <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li>
-</ol>
-
-<p class="note"><strong>Note:</strong> Although most of this training class
-expects that you're using Android Studio, some procedures include alternative
-instructions for using
-the SDK tools from the command line instead.</p>
-
-<p>This class uses a tutorial format to create a small Android app that teaches
-you some fundamental concepts about Android development, so it's important that you follow each
-step.</p>
+<p>Before you start this class, download and install
+ <a href="{@docRoot}studio/index.html">Android Studio</a>.</p>
\ No newline at end of file
diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd
index 21fb64d..e809871 100755
--- a/docs/html/training/basics/firstapp/running-app.jd
+++ b/docs/html/training/basics/firstapp/running-app.jd
@@ -26,7 +26,6 @@
<ul>
<li><a href="{@docRoot}tools/device.html">Using Hardware Devices</a></li>
<li><a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs with AVD Manager</a></li>
- <li><a href="{@docRoot}tools/projects/index.html">Managing Projects</a></li>
</ul>
@@ -34,27 +33,20 @@
</div>
-<p>If you followed the <a href="creating-project.html">previous lesson</a> to create an
-Android project, it includes a default set of "Hello World" source files that allow you to
-immediately run the app.</p>
-
-<p>How you run your app depends on two things: whether you have a real device running Android and
-whether you're using Android Studio. This lesson shows you how to install and run your app on a
-real device and on the Android emulator, and in both cases with either Android Studio or the command
-line tools.</p>
+<p>In the <a href="creating-project.html">previous lesson</a>, you created an
+ Android project. The project contains a default app that displays
+ "Hello World". In this lesson, you will run the app on a device or emulator.</p>
<h2 id="RealDevice">Run on a Real Device</h2>
-<p>If you have a device running Android, here's how to install and run your app.</p>
-
-<h3>Set up your device</h3>
+<p>Set up your device as follows:</p>
<ol>
- <li>Plug in your device to your development machine with a USB cable.
+ <li>Connect your device to your development machine with a USB cable.
If you're developing on Windows, you might need to install the appropriate USB driver for your
- device. For help installing drivers, see the <a href="{@docRoot}tools/extras/oem-usb.html">OEM
+ device. For help installing drivers, see the <a href="{@docRoot}studio/run/oem-usb.html">OEM
USB Drivers</a> document.</li>
- <li>Enable <strong>USB debugging</strong> on your device. On Android 4.0 and newer, go to
+ <li>Enable <strong>USB debugging</strong> on your device by going to
<strong>Settings > Developer options</strong>.
<p class="note"><strong>Note:</strong> On Android 4.2 and newer, <strong>Developer
options</strong> is hidden by default. To make it available, go
@@ -63,73 +55,61 @@
</li>
</ol>
-<h3>Run the app from Android Studio</h3>
+<p>Run the app from Android Studio as follows:</p>
+
<ol>
- <li>Select one of your project's files and click
-<strong>Run</strong> <img
-src="{@docRoot}images/tools/as-run.png" style="vertical-align:baseline;margin:0; max-height:1em" />
-from the toolbar.</li>
- <li>In the <strong>Choose Device</strong> window that appears, select the
- <strong>Choose a running device</strong> radio button, select your device, and click <strong>OK
- </strong>.</li>
+ <li>In Android Studio, select your project and click
+ <strong>Run</strong> <img src="{@docRoot}images/tools/as-run.png"
+ style="vertical-align:baseline;margin:0; max-height:1em" />
+ from the toolbar.</li>
+ <li>In the <strong>Select Deployment Target</strong> window,
+ select your device, and click <strong>OK</strong>.</li>
</ol>
<p>Android Studio installs the app on your connected device and starts it.</p>
<h2 id="Emulator">Run on the Emulator</h2>
-<p>Whether you're using Android Studio or the command line, to run your app on the emulator you need
-to first create an <a href="{@docRoot}tools/devices/index.html">Android Virtual Device</a> (AVD). An
-AVD is a device configuration for the Android emulator that allows you to model a specific
-device.</p>
+<p>Before you run your app on an emulator, you need to create an
+ <a href="{@docRoot}tools/devices/index.html">Android Virtual Device</a> (AVD)
+ definition. An AVD definition defines the characteristics of an Android phone,
+ tablet, Android Wear, or Android TV device that you want to simulate in the
+ Android Emulator.</p>
-
-<h3>Create an AVD</h3>
+<p>Create an AVD Definition as follows:</p>
<ol>
- <li>Launch the Android Virtual Device Manager:
- <ul>
- <li>In Android Studio, select <strong>Tools > Android > AVD Manager</strong>, or click
- the AVD Manager icon <img src="{@docRoot}images/tools/avd-manager-studio.png"
- style="vertical-align:bottom;margin:0;height:19px"> in the toolbar. The
- <em>AVD Manager</em> screen appears.</li>
- <li>Or, from the command line, change directories to
- <code>sdk/</code> and execute:
- <pre class="no-pretty-print">tools/android avd</pre>
- <p class="note"><strong>Note:</strong> The AVD Manager that appears
- when launched from the command line is different from the version in
- Android Studio, so the following instructions may not all apply.</p>
- </li>
- </ul>
-
- </li>
+ <li>Launch the Android Virtual Device Manager by selecting
+ <strong>Tools > Android > AVD Manager</strong>, or by clicking
+ the AVD Manager icon <img src="{@docRoot}images/tools/avd-manager-studio.png"
+ style="vertical-align:bottom;margin:0;height:19px"> in the toolbar.</li>
<li>On the AVD Manager main screen, click <strong>Create Virtual Device</strong>.</li>
- <li>In the Select Hardware window, select a device configuration, such as Nexus 6,
- then click <strong>Next</strong>.
+ <li>In the Select Hardware page, select a phone device, such as Nexus 6,
+ then click <strong>Next</strong>.
</li>
- <li>Select the desired system version for the AVD and click <strong>Next</strong>.
+ <li>In the Select Image page, choose the desired system image for the AVD and
+ click <strong>Next</strong>.
</li>
- <li>Verify the configuration settings, then click <strong>Finish</strong>.
+ <li>Verify the configuration settings (for your first AVD, leave all the
+ settings as they are), and then click <strong>Finish</strong>.
</li>
</ol>
<p>For more information about using AVDs, see
-<a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs with AVD Manager</a>.</p>
+<a href="{@docRoot}studio/run/managing-avds.html">Create and Manage Virtual Devices</a>.</p>
-<h3>Run the app from Android Studio</h3>
+<p>Run the app from Android Studio as follows:</p>
<ol>
- <li>In <strong>Android Studio</strong>, select your project and click <strong>Run</strong>
- <img src="{@docRoot}images/tools/as-run.png" style="vertical-align:baseline;margin:0; max-height:1em" /> from the toolbar.</li>
- <li>In the <strong>Choose Device</strong> window, click the <strong>Launch emulator</strong> radio
- button.</li>
- <li>From the <strong>Android virtual device</strong> pull-down menu, select the emulator
- you created, and click <strong>OK</strong>.</li>
+ <li>In <strong>Android Studio</strong>, select your project and click
+ <strong>Run</strong> <img src="{@docRoot}images/tools/as-run.png"
+ style="vertical-align:baseline;margin:0; max-height:1em" />
+ from the toolbar.</li>
+ <li>In the <strong>Select Deployment Target</strong> window,
+ select your emulator and click <strong>OK</strong>.</li>
</ol>
-<p>It can take a few minutes for the emulator to load itself. You may have to unlock the screen.
+<p>It can take a few minutes for the emulator to start. You may have to unlock the screen.
When you do, <em>My First App</em> appears on the emulator screen.</p>
<p>That's how you build and run your Android app on the emulator!
To start developing, continue to the <a href="building-ui.html">next
-lesson</a>.</p>
-
-
+lesson</a>.</p>
\ No newline at end of file
diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd
index e84e17e..ebf42cb 100644
--- a/docs/html/training/basics/firstapp/starting-activity.jd
+++ b/docs/html/training/basics/firstapp/starting-activity.jd
@@ -19,9 +19,7 @@
<ol>
<li><a href="#RespondToButton">Respond to the Send Button</a></li>
<li><a href="#BuildIntent">Build an Intent</a></li>
- <!-- <li><a href="#StartActivity">Start the Second Activity</a></li> -->
<li><a href="#CreateActivity">Create the Second Activity</a></li>
- <li><a href="#ReceiveIntent">Receive the Intent</a></li>
<li><a href="#DisplayMessage">Display the Message</a></li>
</ol>
@@ -33,55 +31,53 @@
<p>After completing the <a href="building-ui.html">previous lesson</a>, you have an app that
shows an activity (a single screen) with a text field and a button. In this lesson, you’ll add some
-code to <code>MyActivity</code> that
+code to <code>MainActivity</code> that
starts a new activity when the user clicks the Send button.</p>
<h2 id="RespondToButton">Respond to the Send Button</h2>
<ol>
-<li>In Android Studio, from the <code>res/layout</code> directory, edit the <code>content_my.xml</code>
-file.</li>
-<li>Add the <a
-href="{@docRoot}reference/android/view/View.html#attr_android:onClick">{@code android:onClick}</a>
-attribute to the {@link android.widget.Button <Button>} element.
+ <li>In the file <code>res/layout/activity_main.xml</code>, add the
+ <a href="{@docRoot}reference/android/view/View.html#attr_android:onClick">{@code android:onClick}</a>
+ attribute to the {@link android.widget.Button <Button>} element as
+ shown below:
+ <pre><Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/button_send"
+ <b>android:onClick="sendMessage"</b> />
+ </pre>
+ <p>This attribute tells the system to call the <code>sendMessage()</code>
+ method in your activity whenever a user clicks on the button.</p>
+ </li>
-<p class="code-caption">res/layout/content_my.xml</p>
-<pre>
-<Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/button_send"
- android:onClick="sendMessage" />
-</pre>
+ <li>In the file <code>java/com.example.myfirstapp/MainActivity.java</code>,
+ add the <code>sendMessage()</code> method stub as shown below:
-<p>The <a
-href="{@docRoot}reference/android/view/View.html#attr_android:onClick">{@code
-android:onClick}</a> attribute’s value, <code>"sendMessage"</code>, is the name of a method in your
-activity that the system calls when the user clicks the button.</p>
-</li>
-<li>In the <code>java/com.mycompany.myfirstapp</code> directory, open the <code>MyActivity.java</code> file.</li>
-<li>Within the <code>MyActivity</code> class, add the {@code sendMessage()} method stub shown
-below.
+ <pre>public class MainActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ }
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-/** Called when the user clicks the Send button */
-public void sendMessage(View view) {
- // Do something in response to button
-}
-</pre>
+ <b>/** Called when the user clicks the Send button */
+ public void sendMessage(View view) {
+ // Do something in response to button
+ }</b>
+}</pre>
-<p>In order for the system to match this method to the method name given to <a
-href="{@docRoot}reference/android/view/View.html#attr_android:onClick">{@code android:onClick}</a>,
-the signature must be exactly as shown. Specifically, the method must:</p>
+ <p>In order for the system to match this method to the method name given to <a
+ href="{@docRoot}reference/android/view/View.html#attr_android:onClick">{@code android:onClick}</a>,
+ the signature must be exactly as shown. Specifically, the method must:</p>
-<ul>
-<li>Be public</li>
-<li>Have a void return value</li>
-<li>Have a {@link android.view.View} as the only parameter (this will be the {@link
-android.view.View} that was clicked)</li>
-</ul>
+ <ul>
+ <li>Be public</li>
+ <li>Have a void return value</li>
+ <li>Have a {@link android.view.View} as the only parameter (this will be the {@link
+ android.view.View} that was clicked)</li>
+ </ul>
</li>
</ol>
@@ -90,422 +86,147 @@
another activity.</p>
<h2 id="BuildIntent">Build an Intent</h2>
+<p>An {@link android.content.Intent} is an object that provides runtime binding
+ between separate components (such as two activities). The
+ {@link android.content.Intent} represents an app’s "intent to do something."
+ You can use intents for a wide variety of tasks, but in this lesson, your intent
+ starts another activity.</p>
-<ol>
-<li>In <code>MyActivity.java</code>, inside the {@code sendMessage()} method, create an
-{@link android.content.Intent} to start an activity called {@code DisplayMessageActivity} with the
-following code:
+<p>In <code>MainActivity.java</code>, add the code shown below to
+ <code>sendMessage()</code>:</p>
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-public void sendMessage(View view) {
- Intent intent = new Intent(this, DisplayMessageActivity.class);
-}
-</pre>
-
-<div class="sidebox-wrapper">
-<div class="sidebox">
-<h3>Intents</h3>
-<p>An {@link android.content.Intent} is an object that provides runtime binding between separate
-components (such as two activities). The {@link android.content.Intent} represents an
-app’s "intent to do something." You can use intents for a wide
-variety of tasks, but most often they’re used to start another activity. For more information, see
-<a href="{@docRoot}guide/components/intents-filters.html ">Intents and Intent Filters</a>.</p>
-</div>
-</div>
-
-<p class="note"><strong>Note:</strong> The reference to {@code DisplayMessageActivity}
-will raise an error if you’re using an IDE such as Android Studio because the class doesn’t exist yet.
-Ignore the error for now; you’ll create the class soon.</p>
-
-<p>The constructor used here takes two parameters:</p>
-<ul>
- <li>A {@link
-android.content.Context} as its first parameter ({@code this} is used because the {@link
-android.app.Activity} class is a subclass of {@link android.content.Context})
- <li>The {@link java.lang.Class} of the app component to which the system should deliver
-the {@link android.content.Intent} (in this case, the activity that should be started)
-</ul>
-
-<p>Android Studio indicates that you must import the {@link android.content.Intent} class.</p>
-
-</li>
-<li>At the top of the file, import the {@link android.content.Intent} class:
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-import android.content.Intent;
-</pre>
-<p class="note"><strong>Tip:</strong> In Android Studio, press Alt + Enter (option + return on Mac)
- to import missing classes.</p>
-</li>
-
-<!-- I didn't think this was necessary
-<div class="sidebox-wrapper">
-<div class="sidebox">
- <h3>Sending an intent to other apps</h3>
- <p>The intent created in this lesson is what's considered an <em>explicit intent</em>, because the
-{@link android.content.Intent}
-specifies the exact app component to which the intent should be given. However, intents
-can also be <em>implicit</em>, in which case the {@link android.content.Intent} does not specify
-the desired component, but allows any app installed on the device to respond to the intent
-as long as it satisfies the meta-data specifications for the action that's specified in various
-{@link android.content.Intent} parameters. For more information, see the class about <a
-href="{@docRoot}training/basics/intents/index.html">Interacting with Other Apps</a>.</p>
-</div>
-</div>
--->
-
-<li>Inside the {@code sendMessage()} method,
-use {@link android.app.Activity#findViewById findViewById()} to get the
-{@link android.widget.EditText} element.
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-public void sendMessage(View view) {
- Intent intent = new Intent(this, DisplayMessageActivity.class);
- EditText editText = (EditText) findViewById(R.id.edit_message);
-}
-</pre>
-</li>
-
-<li>At the top of the file, import the {@link android.widget.EditText} class.
- <p>In Android Studio, press Alt + Enter (option + return on Mac) to import missing classes.</p>
-</li>
-
-<li>Assign the text to a local <code>message</code> variable, and use the
-{@link android.content.Intent#putExtra putExtra()} method to add its text value to the intent.
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-public void sendMessage(View view) {
- Intent intent = new Intent(this, DisplayMessageActivity.class);
- EditText editText = (EditText) findViewById(R.id.edit_message);
- String message = editText.getText().toString();
- intent.putExtra(EXTRA_MESSAGE, message);
-}
-</pre>
-
-<p>An {@link android.content.Intent} can carry data types as key-value
-pairs called <em>extras</em>. The {@link android.content.Intent#putExtra putExtra()} method takes the
-key name in the first parameter and the value in the second parameter.</p>
-
-</li>
-<li>At the top of the {@code MyActivity} class, add the {@code EXTRA_MESSAGE} definition as
-follows:
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-public class MyActivity extends AppCompatActivity {
- public final static String EXTRA_MESSAGE = "com.mycompany.myfirstapp.MESSAGE";
- ...
-}
-</pre>
-
-<p>For the next activity to query the extra data, you should define the key
-for your intent's extra using a public constant. It's generally a good practice to define keys for
-intent extras using your app's package name as a prefix. This ensures the keys are unique, in case
-your app interacts with other apps.</p>
-
-</li>
-
-<!-- <h2 id="StartActivity">Start the Second Activity</h2> -->
-
-<li>In the {@code sendMessage()} method, to finish the intent, call the
-{@link android.app.Activity#startActivity startActivity()} method, passing it the
-{@link android.content.Intent} object created in step 1.
-
-</ol>
-
-<p>With this new code, the complete {@code sendMessage()} method that's invoked by the Send
-button now looks like this:</p>
-<p class="code-caption">java/com.mycompany.myfirstapp/MyActivity.java</p>
-<pre>
-/** Called when the user clicks the Send button */
-public void sendMessage(View view) {
- Intent intent = new Intent(this, DisplayMessageActivity.class);
- EditText editText = (EditText) findViewById(R.id.edit_message);
- String message = editText.getText().toString();
- intent.putExtra(EXTRA_MESSAGE, message);
- startActivity(intent);
-}
-</pre>
-
-<p>The system receives this call and starts an instance of the {@link android.app.Activity}
-specified by the {@link android.content.Intent}. Now you need to create the
-{@code DisplayMessageActivity} class in order for this to work.</p>
-
-</li>
-</ol>
-
-
-<h2 id="CreateActivity">Create the Second Activity</h2>
-
-<p>All subclasses of {@link android.app.Activity} must implement the
-{@link android.app.Activity#onCreate onCreate()} method. This method is where the activity receives
-the intent with the message, then renders the message. Also, the
-{@link android.app.Activity#onCreate onCreate()} method must define the activity
-layout with the {@link android.app.Activity#setContentView setContentView()} method. This is where
-the activity performs the initial setup of the activity components.</p>
-
-<h3>Create a new activity using Android Studio</h3>
-
-<p>Android Studio includes a stub for the
-{@link android.app.Activity#onCreate onCreate()} method when you create a new activity. The
-<em>New Android Activity</em> window appears.</p>
-
-<ol>
- <li>In Android Studio, in the <code>java</code> directory, select the package,
- <strong>com.mycompany.myfirstapp</strong>, right-click, and select
- <strong>New > Activity > Blank Activity</strong>.</li>
- <li>In the <strong>Choose options</strong> window, fill in the activity details:
- <ul>
- <li><strong>Activity Name</strong>: DisplayMessageActivity</li>
- <li><strong>Layout Name</strong>: activity_display_message</li>
- <li><strong>Title</strong>: My Message</li>
- <li><strong>Hierarchical Parent</strong>: com.mycompany.myfirstapp.MyActivity</li>
- <li><strong>Package name</strong>: com.mycompany.myfirstapp</li>
- </ul>
- <p>Click <strong>Finish</strong>.</p>
- </li>
-
-<li>Open the {@code DisplayMessageActivity.java} file.
-
-<p>The class already includes an implementation of the required
-{@link android.app.Activity#onCreate onCreate()} method. You update the implementation of this
-method later.</p>
-
-<!-- Android Studio does not create a Fragment placeholder
-<p>Also, the file includes a <code>PlaceholderFragment</code> class that extends
-{@link android.app.Fragment}. This activity does not implement fragments, but you might use this
-later in the training. Fragments decompose application functionality and UI into reusable modules.
-For more information on fragments, see the
-<a href="{@docRoot}guide/components/fragments.html">Fragments API Guide</a> and follow the training,
-<a href="{@docRoot}training/basics/fragments/index.html">Building A Dynamic UI with Fragments</a>.
-</p>
--->
-</li>
-</ol>
-
-<!-- Not needed for Android Studio
-<p class="note"><strong>Note:</strong> Your activity may look different if you did not use
-the latest version of the ADT plugin. Make sure you install the latest version of the
-<a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT plugin</a> to complete this tutorial.</p>
--->
-
-<p>If you're developing with Android Studio, you can run the app now, but not much happens.
-Clicking the Send button starts the second activity, but it uses
-a default "Hello world" layout provided by the template. You'll soon update the
-activity to instead display a custom text view.</p>
-
-
-<h3>Create the activity without Android Studio</h3>
-
-<p>If you're using a different IDE or the command line tools, do the following:</p>
-
-<ol>
-<li>Create a new file named {@code DisplayMessageActivity.java} in the project's <code>src/</code>
-directory, next to the original {@code MyActivity.java} file.</li>
-<li>Add the following code to the file:
-
-<pre>
-public class DisplayMessageActivity extends AppCompatActivity {
-
+<pre>public class MainActivity extends AppCompatActivity {
+ <b>public final static String EXTRA_MESSAGE = "com.example.myfirstapp.MESSAGE";</b>
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_display_message);
-
- if (savedInstanceState == null) {
- getSupportFragmentManager().beginTransaction()
- .add(R.id.container, new PlaceholderFragment()).commit();
- }
+ setContentView(R.layout.activity_main);
}
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle app bar item clicks here. The app bar
- // automatically handles clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
- if (id == R.id.action_settings) {
- return true;
- }
- return super.onOptionsItemSelected(item);
+ /** Called when the user clicks the Send button */
+ public void sendMessage(View view) {
+ <b>Intent intent = new Intent(this, DisplayMessageActivity.class);
+ EditText editText = (EditText) findViewById(R.id.edit_message);
+ String message = editText.getText().toString();
+ intent.putExtra(EXTRA_MESSAGE, message);
+ startActivity(intent);</b>
}
+}</pre>
- /**
- * A placeholder fragment containing a simple view.
- */
- public static class PlaceholderFragment extends Fragment {
+<p class="note"><strong>Note: </strong>Android Studio will display
+ <code>Cannot resolve symbol</code> errors because the code references classes
+ like {@link android.content.Intent} and {@link android.widget.EditText}
+ that have not been imported. To import these classes, you can either 1)
+ use Android Studio's "import class" functionality by pressing Alt + Enter
+ (Option + Return on Mac) or 2) manually add import statements at the top of
+ the file.</p>
- public PlaceholderFragment() { }
+<p>There’s a lot going on in <code>sendMessage()</code>, so let’s explain
+ what's going on.</p>
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.fragment_display_message,
- container, false);
- return rootView;
- }
- }
-}
-</pre>
+<p>The {@link android.content.Intent} constructor takes two parameters:</p>
+<ul>
+ <li>A {@link android.content.Context} as its first parameter ({@code this}
+ is used because the {@link android.app.Activity} class is a subclass of
+ {@link android.content.Context})
+ <li>The {@link java.lang.Class} of the app component to which the system
+ should deliver the {@link android.content.Intent} (in this case, the
+ activity that should be started).
+ <p class="note"><strong>Note:</strong> The reference to
+ <code>DisplayMessageActivity</code> will raise an error in Android Studio
+ because the class doesn’t exist yet. Ignore the error for now; you’ll
+ create the class soon.</p>
+</ul>
-<p class="note"><strong>Note:</strong> If you are using an IDE other than Android Studio, your project
-does not contain the {@code activity_display_message} layout that's requested by
-{@link android.app.Activity#setContentView setContentView()}. That's OK because
-you will update this method later and won't be using that layout.</p>
+<p>The {@link android.content.Intent#putExtra(String, String) putExtra()}
+ method adds the <code>EditText</code>'s value to the intent. An <code>Intent</code>
+ can carry data types as key-value pairs called <em>extras</em>. Your key is a
+ public constant <code>EXTRA_MESSAGE</code> because the next
+ activity uses the key to retrive the text value. It's a good practice to
+ define keys for intent extras using your app's package name as a prefix. This
+ ensures the keys are unique, in case your app interacts with other apps.</p>
-</li>
+<p>The {@link android.app.Activity#startActivity(Intent) startActivity()}
+ method starts an instance of the <code>DisplayMessageActivity</code> specified
+ by the {@link android.content.Intent}. Now you need to create the class.</p>
-<li>To your {@code strings.xml} file, add the new activity's title as follows:
-<pre>
-<resources>
- ...
- <string name="title_activity_display_message">My Message</string>
-</resources>
-</pre>
-</li>
-
-<li>In your manifest file, <code>AndroidManifest.xml</code>, within the <code>Application</code>
-element, add the
-<a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> element
-for your {@code DisplayMessageActivity} class, as follows:
-
-<pre>
-<application ... >
- ...
- <activity
- android:name="com.mycompany.myfirstapp.DisplayMessageActivity"
- android:label="@string/title_activity_display_message"
- android:parentActivityName="com.mycompany.myfirstapp.MyActivity" >
- <meta-data
- android:name="android.support.PARENT_ACTIVITY"
- android:value="com.mycompany.myfirstapp.MyActivity" />
- </activity>
-</application>
-</pre>
-
-</li>
-</ol>
-
-<p>The <a href="{@docRoot}guide/topics/manifest/activity-element.html#parent">{@code
-android:parentActivityName}</a> attribute declares the name of this activity's parent activity
-within the app's logical hierarchy. The system uses this value
-to implement default navigation behaviors, such as <a
-href="{@docRoot}design/patterns/navigation.html">Up navigation</a> on
-Android 4.1 (API level 16) and higher. You can provide the same navigation behaviors for
-older versions of Android by using the
-<a href="{@docRoot}tools/support-library/index.html">Support Library</a> and adding
-the <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code
-<meta-data>}</a> element as shown here.</p>
-
-<p class="note"><strong>Note:</strong> Your Android SDK should already include
-the latest Android Support Library, which you installed during the
-<a href="{@docRoot}studio/intro/update.html">Adding SDK Packages</a> step.
-When using the templates in Android Studio, the Support Library is automatically added to your app project
-(you can see the library's JAR file listed under <em>Android Dependencies</em>). If you're not using
-Android Studio, you need to manually add the library to your project—follow the guide for <a
-href="{@docRoot}tools/support-library/setup.html">setting up the Support Library</a>
-then return here.</p>
-
-<p>If you're using a different IDE than Android Studio, don't worry that the app won't yet compile.
-You'll soon update the activity to display a custom text view.</p>
-
-
-<h2 id="ReceiveIntent">Receive the Intent</h2>
-
-<p>Every {@link android.app.Activity} is invoked by an {@link android.content.Intent}, regardless of
-how the user navigated there. You can get the {@link android.content.Intent} that started your
-activity by calling {@link android.app.Activity#getIntent()} and retrieve the data contained
-within the intent.</p>
+<h2 id="CreateActivity">Create the Second Activity</h2>
<ol>
-<li>In the <code>java/com.mycompany.myfirstapp</code> directory, edit the
- {@code DisplayMessageActivity.java} file.</li>
-<li>Get the intent and assign it to a local variable.
-<pre>
-Intent intent = getIntent();
-</pre>
-</li>
-<li>At the top of the file, import the {@link android.content.Intent} class.
- <p>In Android Studio, press Alt + Enter (option + return on Mac) to import missing classes.</p>
-</li>
-<li>Extract the message delivered by {@code MyActivity} with the
-{@link android.content.Intent#getStringExtra getStringExtra()} method.
-<pre>
-String message = intent.getStringExtra(MyActivity.EXTRA_MESSAGE);
-</pre>
-</li>
+ <li>In the <b>Project</b> window, right-click the <b>app</b> folder and select
+ <strong>New > Activity > Empty Activity</strong>.</li>
+ <li>In the <strong>Configure Activity</strong> window, enter
+ "DisplayMessageActivity" for <strong>Activity Name</strong> and click
+ <strong>Finish</strong>
+ </li>
</ol>
+<p>Android Studio automatically does three things:</p>
+<ul>
+ <li>Creates the class <code>DisplayMessageActivity.java</code> with an
+ implementation of the required {@link android.app.Activity#onCreate(Bundle) onCreate()}
+ method.</li>
+ <li>Creates the corresponding layout file <code>activity_display_message.xml</code>
+ </li>
+ <li>Adds the required
+ <a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a>
+ element in <code>AndroidManifest.xml</code>.
+</ul>
+
+<p>If you run the app and click the Send button on the first activity, the
+ second activity starts but is empty. This is because the second activity uses
+ the default empty layout provided by the template.</p>
+
<h2 id="DisplayMessage">Display the Message</h2>
+<p>Now you will modify the second activity to display the message that was passed
+by the first activity.</p>
<ol>
-<li>In the res/layout directory, edit the {@code content_display_message.xml} file.</li>
-<li>Add an {@code android:id} attribute to the {@code RelativeLayout}.
-You need this attribute to reference the object from your app code.</li>
-
-<pre>
-< RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-...
-android:id="@+id/content">
-</RelativeLayout>
-</pre>
-<li>Switch back to editing {@code DisplayMessageActivity.java}.</li>
-
-
-<li>In the {@link android.app.Activity#onCreate onCreate()} method, create a {@link android.widget.TextView} object.
-<pre>
-TextView textView = new TextView(this);
-</pre>
-</li>
-<li>Set the text size and message with {@link android.widget.TextView#setText setText()}.
-<pre>
-textView.setTextSize(40);
-textView.setText(message);
-</pre>
-</li>
-<li>Add the {@link android.widget.TextView} to the {@link android.widget.RelativeLayout}
-identified by {@code R.id.content}.
-<pre>
-RelativeLayout layout = (RelativeLayout) findViewById(R.id.content);
-layout.addView(textView);
-</pre>
-</li>
-<li>At the top of the file, import the {@link android.widget.TextView} class.
- <p>In Android Studio, press Alt + Enter (option + return on Mac) to import missing classes.</p>
-</li>
-</ol>
-
-<p>The complete {@link android.app.Activity#onCreate onCreate()} method for {@code
-DisplayMessageActivity} now looks like this:</p>
-
-<pre>
-@Override
+ <li>In {@code DisplayMessageActivity.java}, add the following code to the
+ <code>onCreate()</code> method:
+ <pre>@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_display_message);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
-
- FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
- fab.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
- .setAction("Action", null)
- .show();
- }
- });
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Intent intent = getIntent();
- String message = intent.getStringExtra(MyActivity.EXTRA_MESSAGE);
+ String message = intent.getStringExtra(MainActivity.EXTRA_MESSAGE);
TextView textView = new TextView(this);
textView.setTextSize(40);
textView.setText(message);
- RelativeLayout layout = (RelativeLayout) findViewById(R.id.content);
+ ViewGroup layout = (ViewGroup) findViewById(R.id.activity_display_message);
layout.addView(textView);
-</pre>
+}</pre>
+ </li>
+ <li>Press Alt + Enter (option + return on Mac) to import missing classes.</li>
+</ol>
+
+<p>There’s a lot going on here, so let’s explain:</p>
+
+<ol>
+ <li>The call {@link android.app.Activity#getIntent()} grabs the intent
+ that started the activity. Every {@link android.app.Activity} is invoked by an
+ {@link android.content.Intent}, regardless of how the user navigated there.
+ The call {@link android.content.Intent#getStringExtra(String) getStringExtra()}
+ retrieves the data from the first activity.</li>
+ <li>You programmatically create a {@link android.widget.TextView} and set
+ its size and message.
+ </li>
+ <li>You add the <code>TextView</code> to the layout identified by
+ {@code R.id.activity_display_message}. You cast the layout to
+ {@link android.view.ViewGroup} because it is the superclass of all layouts and
+ contains the {@link android.view.ViewGroup#addView(View) addView()}
+ method.</li>
+</ol>
+
+<p class="note"><strong>Note: </strong>The XML layout generated by previous
+ versions of Android Studio might not include the <code>android:id</code>
+ attribute. The call <code>findViewById()</code> will fail if the layout
+ does not have the <code>android:id</code> attribute. If this is the case,
+ open <code>activity_display_message.xml</code> and add the attribute
+ <code>android:id="@+id/activity_display_message"</code> to the layout element.
+</p>
<p>You can now run the app. When it opens, type a message in the text field, and click
<strong>Send</strong>. The second activity replaces the first one on the screen, showing
@@ -513,8 +234,4 @@
<p>That's it, you've built your first Android app!</p>
-<p>To learn more, follow the link below to the next class.</p>
-
-
-
-
+<p>To learn more, follow the link below to the next class.</p>
\ No newline at end of file
diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd
index 8c1ae21a..2e12072 100644
--- a/docs/html/training/basics/fragments/communicating.jd
+++ b/docs/html/training/basics/fragments/communicating.jd
@@ -7,14 +7,14 @@
@jd:body
<div id="tb-wrapper">
- <div id="tb">
+ <div id="tb">
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#DefineInterface">Define an Interface</a></li>
<li><a href="#Implement">Implement the Interface</a></li>
<li><a href="#Deliver">Deliver a Message to a Fragment</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/components/fragments.html">Fragments</a></li>
@@ -31,21 +31,21 @@
</div>
</div>
-<p>In order to reuse the Fragment UI components, you should build each as a completely
-self-contained, modular component that defines its own layout and behavior. Once you
-have defined these reusable Fragments, you can associate them with an Activity and
+<p>In order to reuse the Fragment UI components, you should build each as a completely
+self-contained, modular component that defines its own layout and behavior. Once you
+have defined these reusable Fragments, you can associate them with an Activity and
connect them with the application logic to realize the overall composite UI.</p>
-<p>Often you will want one Fragment to communicate with another, for example to change
-the content based on a user event. All Fragment-to-Fragment communication is done
+<p>Often you will want one Fragment to communicate with another, for example to change
+the content based on a user event. All Fragment-to-Fragment communication is done
through the associated Activity. Two Fragments should never communicate directly.</p>
<h2 id="DefineInterface">Define an Interface</h2>
-<p>To allow a Fragment to communicate up to its Activity, you can define an interface
-in the Fragment class and implement it within the Activity. The Fragment captures
-the interface implementation during its onAttach() lifecycle method and can then call
+<p>To allow a Fragment to communicate up to its Activity, you can define an interface
+in the Fragment class and implement it within the Activity. The Fragment captures
+the interface implementation during its onAttach() lifecycle method and can then call
the Interface methods in order to communicate with the Activity.</p>
<p>Here is an example of Fragment to Activity communication:</p>
@@ -62,7 +62,7 @@
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
-
+
// This makes sure that the container activity has implemented
// the callback interface. If not, it throws an exception
try {
@@ -72,7 +72,7 @@
+ " must implement OnHeadlineSelectedListener");
}
}
-
+
...
}
</pre>
@@ -105,7 +105,7 @@
public static class MainActivity extends Activity
implements HeadlinesFragment.OnHeadlineSelectedListener{
...
-
+
public void onArticleSelected(int position) {
// The user selected the headline of an article from the HeadlinesFragment
// Do something here to display that article
@@ -118,12 +118,12 @@
<h2 id="Deliver">Deliver a Message to a Fragment</h2>
<p>The host activity can deliver messages to a fragment by capturing the {@link
-android.support.v4.app.Fragment} instance
+android.support.v4.app.Fragment} instance
with {@link android.support.v4.app.FragmentManager#findFragmentById findFragmentById()}, then
directly call the fragment's public methods.</p>
<p>For instance, imagine that the activity shown above may contain another fragment that's used to
-display the item specified by the data returned in the above callback method. In this case,
+display the item specified by the data returned in the above callback method. In this case,
the activity can pass the information received in the callback method to the other fragment that
will display the item:</p>
@@ -152,7 +152,7 @@
Bundle args = new Bundle();
args.putInt(ArticleFragment.ARG_POSITION, position);
newFragment.setArguments(args);
-
+
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
// Replace whatever is in the fragment_container view with this fragment,
diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd
index c0bd0a4..4cfec76 100644
--- a/docs/html/training/basics/fragments/fragment-ui.jd
+++ b/docs/html/training/basics/fragments/fragment-ui.jd
@@ -7,13 +7,13 @@
@jd:body
<div id="tb-wrapper">
- <div id="tb">
+ <div id="tb">
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#AddAtRuntime">Add a Fragment to an Activity at Runtime</a></li>
<li><a href="#Replace">Replace One Fragment with Another</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/components/fragments.html">Fragments</a></li>
@@ -52,14 +52,14 @@
-<h2 id="AddAtRuntime">Add a Fragment to an Activity at Runtime</h2>
+<h2 id="AddAtRuntime">Add a Fragment to an Activity at Runtime</h2>
<p>Rather than defining the fragments for an activity in the layout file—as shown in the
<a href="creating.html">previous lesson</a> with the {@code <fragment>} element—you can add
a fragment to the activity during the activity runtime. This is necessary
if you plan to change fragments during the life of the activity.</p>
-<p>To perform a transaction such as add or
+<p>To perform a transaction such as add or
remove a fragment, you must use the {@link android.support.v4.app.FragmentManager} to create a
{@link android.support.v4.app.FragmentTransaction}, which provides APIs to add, remove, replace,
and perform other fragment transactions.</p>
@@ -126,11 +126,11 @@
// Create a new Fragment to be placed in the activity layout
HeadlinesFragment firstFragment = new HeadlinesFragment();
-
+
// In case this activity was started with special instructions from an
// Intent, pass the Intent's extras to the fragment as arguments
firstFragment.setArguments(getIntent().getExtras());
-
+
// Add the fragment to the 'fragment_container' FrameLayout
getSupportFragmentManager().beginTransaction()
.add(R.id.fragment_container, firstFragment).commit();
diff --git a/docs/html/training/basics/fragments/index.jd b/docs/html/training/basics/fragments/index.jd
index aba6459..4fb71e4 100644
--- a/docs/html/training/basics/fragments/index.jd
+++ b/docs/html/training/basics/fragments/index.jd
@@ -56,7 +56,7 @@
devices running versions as old as Android 1.6.</p>
<h2>Lessons</h2>
-
+
<dl>
<dt><b><a href="creating.html">Creating a Fragment</a></b></dt>
<dd>Learn how to build a fragment and implement basic behaviors within its callback
@@ -67,5 +67,5 @@
<dt><b><a href="communicating.html">Communicating with Other Fragments</a></b></dt>
<dd>Learn how to set up communication paths from a fragment to the activity and other
fragments.</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/basics/network-ops/connecting.jd b/docs/html/training/basics/network-ops/connecting.jd
index 798a9ee7..9651269 100644
--- a/docs/html/training/basics/network-ops/connecting.jd
+++ b/docs/html/training/basics/network-ops/connecting.jd
@@ -7,8 +7,8 @@
next.link=managing.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
@@ -20,7 +20,7 @@
<li><a href="#AsyncTask">Perform Network Operations on a Separate Thread</a></li>
<li><a href="#download">Connect and Download Data</a></li>
<li><a href="#stream">Convert the InputStream to a String</a></li>
-
+
</ol>
<h2>You should also read</h2>
@@ -32,7 +32,7 @@
<li><a href="{@docRoot}guide/components/fundamentals.html">Application Fundamentals</a></li>
</ul>
-</div>
+</div>
</div>
<p>This lesson shows you how to implement a simple application that connects to
@@ -57,11 +57,11 @@
<h2 id="connection">Check the Network Connection</h2>
<p>Before your app attempts to connect to the network, it should check to see whether a
-network connection is available using
+network connection is available using
{@link android.net.ConnectivityManager#getActiveNetworkInfo getActiveNetworkInfo()}
-and {@link android.net.NetworkInfo#isConnected isConnected()}.
+and {@link android.net.NetworkInfo#isConnected isConnected()}.
Remember, the device may be out of range of a
-network, or the user may have disabled both Wi-Fi and mobile data access.
+network, or the user may have disabled both Wi-Fi and mobile data access.
For more discussion of this topic, see the lesson <a
href="{@docRoot}training/basics/network-ops/managing.html">Managing Network
Usage</a>.</p>
@@ -69,7 +69,7 @@
<pre>
public void myClickHandler(View view) {
...
- ConnectivityManager connMgr = (ConnectivityManager)
+ ConnectivityManager connMgr = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
if (networkInfo != null && networkInfo.isConnected()) {
@@ -98,28 +98,28 @@
{@link android.os.AsyncTask} methods:</p>
<ul>
-
+
<li>{@link android.os.AsyncTask#doInBackground doInBackground()} executes
the method <code>downloadUrl()</code>. It passes the web page URL as a
parameter. The method <code>downloadUrl()</code> fetches and processes the web
page content. When it finishes, it passes back a result string.</li>
-
+
<li>{@link android.os.AsyncTask#onPostExecute onPostExecute()} takes the
returned string and displays it in the UI.</li>
-
-
+
+
</ul>
-
+
<pre>
public class HttpExampleActivity extends Activity {
private static final String DEBUG_TAG = "HttpExample";
private EditText urlText;
private TextView textView;
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
+ setContentView(R.layout.main);
urlText = (EditText) findViewById(R.id.myUrl);
textView = (TextView) findViewById(R.id.myText);
}
@@ -129,7 +129,7 @@
public void myClickHandler(View view) {
// Gets the URL from the UI's text field.
String stringUrl = urlText.getText().toString();
- ConnectivityManager connMgr = (ConnectivityManager)
+ ConnectivityManager connMgr = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
if (networkInfo != null && networkInfo.isConnected()) {
@@ -139,7 +139,7 @@
}
}
- // Uses AsyncTask to create a task away from the main UI thread. This task takes a
+ // Uses AsyncTask to create a task away from the main UI thread. This task takes a
// URL string and uses it to create an HttpUrlConnection. Once the connection
// has been established, the AsyncTask downloads the contents of the webpage as
// an InputStream. Finally, the InputStream is converted into a string, which is
@@ -147,7 +147,7 @@
private class DownloadWebpageTask extends AsyncTask<String, Void, String> {
@Override
protected String doInBackground(String... urls) {
-
+
// params comes from the execute() call: params[0] is the url.
try {
return downloadUrl(urls[0]);
@@ -167,28 +167,28 @@
<p>The sequence of events in this snippet is as follows:</p>
<ol>
- <li>When users click the button that invokes {@code myClickHandler()},
+ <li>When users click the button that invokes {@code myClickHandler()},
the app passes
the specified URL to the {@link android.os.AsyncTask} subclass
<code>DownloadWebpageTask</code>.</li>
-
+
<li>The {@link android.os.AsyncTask} method {@link
-android.os.AsyncTask#doInBackground doInBackground()} calls the
+android.os.AsyncTask#doInBackground doInBackground()} calls the
<code>downloadUrl()</code> method. </li>
-
+
<li>The <code>downloadUrl()</code> method takes a URL string as a parameter
and uses it to create a {@link java.net.URL} object.</li>
-
+
<li>The {@link java.net.URL} object is used to establish an {@link
java.net.HttpURLConnection}.</li>
-
+
<li>Once the connection has been established, the {@link
java.net.HttpURLConnection} object fetches the web page content as an {@link
java.io.InputStream}.</li>
-
+
<li>The {@link java.io.InputStream} is passed to the <code>readIt()</code>
method, which converts the stream to a string.</li>
-
+
<li>Finally, the {@link android.os.AsyncTask}'s {@link
android.os.AsyncTask#onPostExecute onPostExecute()} method displays the string
in the main activity's UI.</li>
@@ -196,19 +196,19 @@
</ol>
<h2 id="download">Connect and Download Data</h2>
-
- <p>In your thread that performs your network transactions, you can use
- {@link java.net.HttpURLConnection} to perform a {@code GET} and download your data.
- After you call {@code connect()}, you can get an {@link java.io.InputStream} of the data
+
+ <p>In your thread that performs your network transactions, you can use
+ {@link java.net.HttpURLConnection} to perform a {@code GET} and download your data.
+ After you call {@code connect()}, you can get an {@link java.io.InputStream} of the data
by calling {@code getInputStream()}.
-
+
<p>In the following snippet, the {@link android.os.AsyncTask#doInBackground
doInBackground()} method calls the method <code>downloadUrl()</code>. The
<code>downloadUrl()</code> method takes the given URL and uses it to connect to
the network via {@link java.net.HttpURLConnection}. Once a connection has been
established, the app uses the method <code>getInputStream()</code> to retrieve
the data as an {@link java.io.InputStream}.</p>
-
+
<pre>
// Given a URL, establishes an HttpUrlConnection and retrieves
// the web page content as a InputStream, which it returns as
@@ -218,7 +218,7 @@
// Only display the first 500 characters of the retrieved
// web page content.
int len = 500;
-
+
try {
URL url = new URL(myurl);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -235,13 +235,13 @@
// Convert the InputStream into a string
String contentAsString = readIt(is, len);
return contentAsString;
-
+
// Makes sure that the InputStream is closed after the app is
// finished using it.
} finally {
if (is != null) {
is.close();
- }
+ }
}
}</pre>
@@ -252,7 +252,7 @@
<h2 id="stream">Convert the InputStream to a String</h2>
-<p>An {@link java.io.InputStream} is a readable source of bytes. Once you get an {@link java.io.InputStream},
+<p>An {@link java.io.InputStream} is a readable source of bytes. Once you get an {@link java.io.InputStream},
it's common to decode or convert it into a
target data type. For example, if you were downloading image data, you might
decode and display it like this:</p>
@@ -271,7 +271,7 @@
<pre>// Reads an InputStream and converts it to a String.
public String readIt(InputStream stream, int len) throws IOException, UnsupportedEncodingException {
Reader reader = null;
- reader = new InputStreamReader(stream, "UTF-8");
+ reader = new InputStreamReader(stream, "UTF-8");
char[] buffer = new char[len];
reader.read(buffer);
return new String(buffer);
diff --git a/docs/html/training/basics/network-ops/data-saver.jd b/docs/html/training/basics/network-ops/data-saver.jd
new file mode 100644
index 0000000..75b7264
--- /dev/null
+++ b/docs/html/training/basics/network-ops/data-saver.jd
@@ -0,0 +1,253 @@
+page.title=Optimizing Network Data Usage
+parent.title=Performing Network Operations
+parent.link=index.html
+
+trainingnavtop=true
+next.title=Parsing XML Data
+next.link=xml.html
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+
+
+<h2>This lesson teaches you to</h2>
+<ol>
+ <li><a href="#status">Check Data-Saver Preferences</a>
+ <ul>
+ <li><a href="#request-whitelist">Request whitelist permissions</a></li>
+ </ul>
+ </li>
+ <li><a href="#monitor-changes">Monitor Changes to Data Saver Preferences</a></li>
+ <li><a href="#testing">Test with Android Debug Bridge Commands</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>
+ Over the life of a smartphone, the cost of a cellular data plan can easily
+ exceed the cost of the device itself. From Android 7.0 (API level 24),
+ users users can enable Data Saver on a device-wide basis in order
+ optimize their device's data usage, and use less data. This ability
+ is especially useful when roaming, near the end of the billing cycle,
+ or for a small prepaid data pack.
+</p>
+
+<p>
+ When a user enables Data Saver in <strong>Settings</strong> and the device is
+ on a metered network, the system blocks background data usage and signals
+ apps to use less data in the foreground wherever possible. Users can
+ whitelist specific apps to allow background metered data usage even when Data
+ Saver is turned on.
+</p>
+
+<p>
+ The N Developer Preview extends the {@link android.net.ConnectivityManager}
+ API to provide apps with a way to <a href="#status">retrieve the user’s Data
+ Saver preferences</a> and <a href="#monitor-changes">monitor preference
+ changes</a>. It is considered good practice for apps to check whether the
+ user has enabled Data Saver and make an effort to limit foreground and
+ background data usage.
+</p>
+
+<h2 id="status">
+ Checking Data Saver Preferences
+</h2>
+
+<p>
+ In the N Developer Preview, apps can use the {@link
+ android.net.ConnectivityManager} API to determine what data usage
+ restrictions are being applied. The {@code getRestrictBackgroundStatus()}
+ method returns one of the following values:
+</p>
+
+<dl>
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_DISABLED}
+ </dt>
+
+ <dd>
+ Data Saver is disabled.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_ENABLED}
+ </dt>
+
+ <dd>
+ The user has enabled Data Saver for this app. Apps should make an effort to limit data
+ usage in the foreground and gracefully handle restrictions to background
+ data usage.
+ </dd>
+
+ <dt>
+ {@code RESTRICT_BACKGROUND_STATUS_WHITELISTED}
+ </dt>
+
+ <dd>
+ The user has enabled Data Saver but the app is whitelisted. Apps should
+ still make an effort to limit foreground and background data usage.
+ </dd>
+</dl>
+
+<p>
+ It is considered good practice to limit data usage whenever the device is
+ connected to a metered network, even if Data Saver is disabled or the app
+ is whitelisted. The following sample code uses {@link
+ android.net.ConnectivityManager#isActiveNetworkMetered
+ ConnectivityManager.isActiveNetworkMetered()} and {@code
+ ConnectivityManager.getRestrictBackgroundStatus()} to determine how much data
+ the app should use:
+</p>
+
+<pre>
+ConnectivityManager connMgr = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+// Checks if the device is on a metered network
+if (connMgr.isActiveNetworkMetered()) {
+ // Checks user’s Data Saver settings.
+ switch (connMgr.getRestrictBackgroundStatus()) {
+ case RESTRICT_BACKGROUND_STATUS_ENABLED:
+ // Background data usage is blocked for this app. Wherever possible,
+ // the app should also use less data in the foreground.
+
+ case RESTRICT_BACKGROUND_STATUS_WHITELISTED:
+ // The app is whitelisted. Wherever possible,
+ // the app should use less data in the foreground and background.
+
+ case RESTRICT_BACKGROUND_STATUS_DISABLED:
+ // Data Saver is disabled. Since the device is connected to a
+ // metered network, the app should use less data wherever possible.
+ }
+} else {
+ // The device is not on a metered network.
+ // Use data as required to perform syncs, downloads, and updates.
+}
+</pre>
+
+<h3 id="request-whitelist">
+ Requesting whitelist permissions
+</h3>
+
+<p>
+ If your app needs to use data in the background, it can request whitelist
+ permissions by sending a
+ <code>Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS</code>
+ intent containing a URI of your app's package name: for example,
+ <code>package:MY_APP_ID</code>.
+</p>
+
+<p>
+ Sending the intent and URI launches the <strong>Settings</strong> app and
+ displays data usage settings for your app. The user can then decide whether
+ to enable background data for your app. Before you send this intent, it is
+ good practice to first ask the user if they want to launch the
+ <strong>Settings</strong> app for the purpose of enabling background data
+ usage.
+</p>
+
+<h2 id="monitor-changes">
+ Monitoring Changes to Data Saver Preferences
+</h2>
+
+<p>
+ Apps can monitor changes to Data Saver preferences by creating a {@link
+ android.content.BroadcastReceiver} to listen for {@code
+ ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED} and dynamically
+ registering the receiver with {@link android.content.Context#registerReceiver
+ Context.registerReceiver()}. When an app receives this broadcast, it should
+ <a href="#status">check if the new Data Saver preferences affect its
+ permissions</a> by calling {@code
+ ConnectivityManager.getRestrictBackgroundStatus()}.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> The system only sends this broadcast to apps that
+ dynamically register for them with {@link
+ android.content.Context#registerReceiver Context.registerReceiver()}. Apps
+ that register to receive this broadcast in their manifest will not receive
+ them.
+</p>
+
+<h2 id="testing">
+ Testing with Android Debug Bridge Commands
+</h2>
+
+<p>
+ The <a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a>
+ provides a few commands that you can use to test your app in Data Saver
+ conditions. You can check and configure network
+ permissions or set wireless networks as metered to test your app on unmetered
+ networks.
+</p>
+<dl>
+ <dt>
+ <code>$ adb shell dumpsys netpolicy</code>
+ </dt>
+
+ <dd>
+ Generates a report that includes the current global background network
+ restriction setting, package UIDs currently on a whitelist, and the network
+ permissions of other known packages.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy</code>
+ </dt>
+
+ <dd>
+ Displays a full list of Network Policy Manager (netpolicy) commands.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set restrict-background
+ <boolean></code>
+ </dt>
+
+ <dd>
+ Enables or disables Data Saver mode when passing <code>true</code> or
+ <code>false</code>, respectively.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy add restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Adds the specified package UID to the whitelist to allow background metered
+ data usage.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy remove restrict-background-whitelist
+ <UID></code>
+ </dt>
+
+ <dd>
+ Removes the specified package UID from the whitelist to block background
+ metered data usage while Data Saver is enabled.
+ </dd>
+
+ <dt>
+ <code>$ adb shell cmd netpolicy list wifi-networks</code>
+ </dt>
+
+ <dd>
+ Lists all wifi networks, displaying whether they're metered.
+ </dd>
+
+
+ <dt>
+ <code>$ adb shell cmd netpolicy set metered-network <WIFI_SSID>
+ true</code>
+ </dt>
+
+ <dd>
+ Sets wifi with the specified SSID as metered, allowing you to simulate a
+ metered network on an unmetered network.
+ </dd>
+</dl>
diff --git a/docs/html/training/basics/network-ops/index.jd b/docs/html/training/basics/network-ops/index.jd
index 1f6493f..1434562 100644
--- a/docs/html/training/basics/network-ops/index.jd
+++ b/docs/html/training/basics/network-ops/index.jd
@@ -42,7 +42,7 @@
<p>This class explains the basic tasks involved in connecting to the network,
monitoring the network connection (including connection changes), and giving
users control over an app's network usage. It also describes how to parse and
-consume XML data.</p>
+consume XML data.</p>
<p>This class includes a sample application that illustrates how to perform
common network operations. You can download the sample (to the right) and use it
@@ -66,18 +66,18 @@
<dl>
<dt><b><a href="connecting.html">Connecting to the Network</a></b></dt>
-
+
<dd>Learn how to connect to the network, choose an HTTP client, and perform
network operations outside of the UI thread.</dd>
<dt><b><a href="managing.html">Managing Network Usage</a></b></dt>
-
+
<dd>Learn how to check a
device's network connection, create a preferences UI for controlling network
usage, and respond to connection changes.</dd>
-
+
<dt><b><a href="xml.html">Parsing XML Data</a></b></dt>
<dd>Learn how to parse and consume XML data.</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/basics/network-ops/managing.jd b/docs/html/training/basics/network-ops/managing.jd
index a645b3f..a29e874 100644
--- a/docs/html/training/basics/network-ops/managing.jd
+++ b/docs/html/training/basics/network-ops/managing.jd
@@ -6,12 +6,12 @@
previous.title=Connecting to the Network
previous.link=connecting.html
-next.title=Parsing XML Data
-next.link=xml.html
+next.title=Optimizing Network Data Usage
+next.link=data-saver.html
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>This lesson teaches you to</h2>
@@ -37,7 +37,7 @@
<p class="filename">NetworkUsage.zip</p>
</div>
-</div>
+</div>
</div>
<p>This lesson describes how to write applications that have fine-grained
@@ -50,19 +50,19 @@
limits, because they can instead precisely control how much data your app
uses.</p>
-<p>For general guidelines on how to write apps that minimize the battery life
-impact of downloads and network connections, see
-<a href="{@docRoot}training/monitoring-device-state/index.html">Optimizing Battery Life</a>
+<p>For general guidelines on how to write apps that minimize the battery life
+impact of downloads and network connections, see
+<a href="{@docRoot}training/monitoring-device-state/index.html">Optimizing Battery Life</a>
and <a href="{@docRoot}training/efficient-downloads/index.html">Transferring Data Without Draining the Battery</a>.
<h2 id="check-connection">Check a Device's Network Connection</h2>
-<p>A device can have various types of network connections. This lesson
-focuses on using either a Wi-Fi or a mobile network connection. For the full
+<p>A device can have various types of network connections. This lesson
+focuses on using either a Wi-Fi or a mobile network connection. For the full
list of possible network types, see {@link android.net.ConnectivityManager}.<p>
<p>Wi-Fi is typically faster. Also, mobile data is often metered, which can get
-expensive.
+expensive.
A common strategy for apps is to only fetch large data
if a Wi-Fi network is available.</p>
@@ -77,11 +77,11 @@
<li>{@link android.net.ConnectivityManager}: Answers queries about the state
of network connectivity. It also notifies applications when network
connectivity changes. </li>
-
+
<li>{@link android.net.NetworkInfo}: Describes the status of a network
interface of a given type (currently either Mobile or Wi-Fi).
</li>
-
+
</ul>
@@ -94,16 +94,16 @@
<pre>
private static final String DEBUG_TAG = "NetworkStatusExample";
-...
-ConnectivityManager connMgr = (ConnectivityManager)
+...
+ConnectivityManager connMgr = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
-NetworkInfo networkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+NetworkInfo networkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
boolean isWifiConn = networkInfo.isConnected();
networkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
boolean isMobileConn = networkInfo.isConnected();
Log.d(DEBUG_TAG, "Wifi connected: " + isWifiConn);
Log.d(DEBUG_TAG, "Mobile connected: " + isMobileConn);
-</pre>
+</pre>
<p>Note that you should not base decisions on whether a network is
"available." You should always check {@link
@@ -122,7 +122,7 @@
<pre>
public boolean isOnline() {
- ConnectivityManager connMgr = (ConnectivityManager)
+ ConnectivityManager connMgr = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
return (networkInfo != null && networkInfo.isConnected());
@@ -148,37 +148,37 @@
</ul>
-<p>To write an app that supports network access and managing
-network usage, your manifest must have the right permissions and
+<p>To write an app that supports network access and managing
+network usage, your manifest must have the right permissions and
intent filters.
</p>
<ul>
<li>The manifest excerpted below includes the following permissions:
<ul>
-
+
<li>{@link android.Manifest.permission#INTERNET
android.permission.INTERNET}—Allows applications to open network
sockets.</li>
-
+
<li>{@link android.Manifest.permission#ACCESS_NETWORK_STATE
android.permission.ACCESS_NETWORK_STATE}—Allows applications to access
information about networks.</li>
-
+
</ul>
</li>
-
- <li>You can declare the intent filter for the
+
+ <li>You can declare the intent filter for the
{@link android.content.Intent#ACTION_MANAGE_NETWORK_USAGE} action (introduced in
Android 4.0) to indicate that your application defines an activity that offers
options to control data usage. {@link
android.content.Intent#ACTION_MANAGE_NETWORK_USAGE} shows settings for managing
-the network data usage of a specific application. When your app has a settings activity
-that allows users to control network usage, you should declare this intent filter for that activity.
+the network data usage of a specific application. When your app has a settings activity
+that allows users to control network usage, you should declare this intent filter for that activity.
In the sample application, this action is handled by the class
<code>SettingsActivity</code>, which displays a preferences UI to let users
decide when to download a feed.</li>
-
+
</ul>
@@ -188,9 +188,9 @@
package="com.example.android.networkusage"
...>
- <uses-sdk android:minSdkVersion="4"
+ <uses-sdk android:minSdkVersion="4"
android:targetSdkVersion="14" />
-
+
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -213,7 +213,7 @@
<code>SettingsActivity</code> has an intent filter for the {@link
android.content.Intent#ACTION_MANAGE_NETWORK_USAGE} action.
<code>SettingsActivity</code> is a subclass of {@link
-android.preference.PreferenceActivity}. It displays a preferences screen
+android.preference.PreferenceActivity}. It displays a preferences screen
(shown in figure 1) that
lets users specify the following:</p>
@@ -221,10 +221,10 @@
<li>Whether to display summaries for each XML feed entry, or just a link for
each entry.</li>
-
+
<li>Whether to download the XML feed if any network connection is available,
or only if Wi-Fi is available.</li>
-
+
</ul>
<img src="{@docRoot}images/training/basics/network-settings1.png" alt="Preferences panel" />
@@ -232,49 +232,49 @@
<img src="{@docRoot}images/training/basics/network-settings2.png" alt="Setting a network preference" />
<p class="img-caption"><strong>Figure 1.</strong> Preferences activity.</p>
-<p>Here is <code>SettingsActivity</code>. Note that it implements
-{@link android.content.SharedPreferences.OnSharedPreferenceChangeListener OnSharedPreferenceChangeListener}.
+<p>Here is <code>SettingsActivity</code>. Note that it implements
+{@link android.content.SharedPreferences.OnSharedPreferenceChangeListener OnSharedPreferenceChangeListener}.
When a user changes a preference, it fires
-{@link android.content.SharedPreferences.OnSharedPreferenceChangeListener#onSharedPreferenceChanged onSharedPreferenceChanged()},
-which sets {@code refreshDisplay} to true. This causes the display to refresh when the user
+{@link android.content.SharedPreferences.OnSharedPreferenceChangeListener#onSharedPreferenceChanged onSharedPreferenceChanged()},
+which sets {@code refreshDisplay} to true. This causes the display to refresh when the user
returns to the main activity:</p>
<pre>public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
-
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
// Loads the XML preferences file
addPreferencesFromResource(R.xml.preferences);
}
-
+
@Override
protected void onResume() {
super.onResume();
- // Registers a listener whenever a key changes
+ // Registers a listener whenever a key changes
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
}
-
+
@Override
protected void onPause() {
super.onPause();
// Unregisters the listener set in onResume().
- // It's best practice to unregister listeners when your app isn't using them to cut down on
- // unnecessary system overhead. You do this in onPause().
- getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+ // It's best practice to unregister listeners when your app isn't using them to cut down on
+ // unnecessary system overhead. You do this in onPause().
+ getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
}
-
- // When the user changes the preferences selection,
+
+ // When the user changes the preferences selection,
// onSharedPreferenceChanged() restarts the main activity as a new
// task. Sets the refreshDisplay flag to "true" to indicate that
// the main activity should update its display.
// The main activity queries the PreferenceManager to get the latest settings.
-
+
@Override
- public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
// Sets refreshDisplay to true so that when the user returns to the main
// activity, the display refreshes to reflect the new settings.
NetworkActivity.refreshDisplay = true;
@@ -295,31 +295,31 @@
public static final String WIFI = "Wi-Fi";
public static final String ANY = "Any";
private static final String URL = "http://stackoverflow.com/feeds/tag?tagnames=android&sort=newest";
-
+
// Whether there is a Wi-Fi connection.
- private static boolean wifiConnected = false;
+ private static boolean wifiConnected = false;
// Whether there is a mobile connection.
private static boolean mobileConnected = false;
// Whether the display should be refreshed.
public static boolean refreshDisplay = true;
-
+
// The user's current network preference setting.
public static String sPref = null;
-
+
// The BroadcastReceiver that tracks network connectivity changes.
private NetworkReceiver receiver = new NetworkReceiver();
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
// Registers BroadcastReceiver to track network connection changes.
IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
receiver = new NetworkReceiver();
this.registerReceiver(receiver, filter);
}
-
- @Override
+
+ @Override
public void onDestroy() {
super.onDestroy();
// Unregisters BroadcastReceiver when app is destroyed.
@@ -327,34 +327,34 @@
this.unregisterReceiver(receiver);
}
}
-
+
// Refreshes the display if the network connection and the
// pref settings allow it.
-
+
@Override
public void onStart () {
- super.onStart();
-
+ super.onStart();
+
// Gets the user's network preference settings
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-
+
// Retrieves a string value for the preferences. The second parameter
// is the default value to use if a preference value is not found.
sPref = sharedPrefs.getString("listPref", "Wi-Fi");
- updateConnectedFlags();
-
+ updateConnectedFlags();
+
if(refreshDisplay){
- loadPage();
+ loadPage();
}
}
-
+
// Checks the network connection and sets the wifiConnected and mobileConnected
- // variables accordingly.
+ // variables accordingly.
public void updateConnectedFlags() {
- ConnectivityManager connMgr = (ConnectivityManager)
+ ConnectivityManager connMgr = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeInfo = connMgr.getActiveNetworkInfo();
if (activeInfo != null && activeInfo.isConnected()) {
wifiConnected = activeInfo.getType() == ConnectivityManager.TYPE_WIFI;
@@ -362,9 +362,9 @@
} else {
wifiConnected = false;
mobileConnected = false;
- }
+ }
}
-
+
// Uses AsyncTask subclass to download the XML feed from stackoverflow.com.
public void loadPage() {
if (((sPref.equals(ANY)) && (wifiConnected || mobileConnected))
@@ -376,7 +376,7 @@
}
}
...
-
+
}</pre>
<h2 id="detect-changes">Detect Connection Changes</h2>
@@ -388,36 +388,36 @@
determines what the network connection status is, and sets the flags
<code>wifiConnected</code> and <code>mobileConnected</code> to true/false
accordingly. The upshot is that the next time the user returns to the app, the
-app will only download the latest feed and update the display if
+app will only download the latest feed and update the display if
<code>NetworkActivity.refreshDisplay</code> is set to <code>true</code>.</p>
-<p>Setting up a BroadcastReceiver that gets called unnecessarily can be a
+<p>Setting up a BroadcastReceiver that gets called unnecessarily can be a
drain on system resources.
-The sample application registers the
-{@link android.content.BroadcastReceiver} {@code NetworkReceiver} in
-{@link android.app.Activity#onCreate(android.os.Bundle) onCreate()},
-and it unregisters it in
-{@link android.app.Activity#onDestroy onDestroy()}. This is more lightweight
+The sample application registers the
+{@link android.content.BroadcastReceiver} {@code NetworkReceiver} in
+{@link android.app.Activity#onCreate(android.os.Bundle) onCreate()},
+and it unregisters it in
+{@link android.app.Activity#onDestroy onDestroy()}. This is more lightweight
than declaring a {@code <receiver>} in the manifest. When you declare a
{@code <receiver>} in the manifest, it can wake up your app at any time,
-even if you haven't run it for weeks. By registering and unregistering
-{@code NetworkReceiver} within the main activity, you ensure that the app won't
-be woken up after the user leaves the app.
+even if you haven't run it for weeks. By registering and unregistering
+{@code NetworkReceiver} within the main activity, you ensure that the app won't
+be woken up after the user leaves the app.
If you do declare a {@code <receiver>} in the manifest and you know exactly
-where you need it, you can use
+where you need it, you can use
{@link android.content.pm.PackageManager#setComponentEnabledSetting setComponentEnabledSetting()}
to enable and disable it as appropriate.</p>
<p>Here is <code>NetworkReceiver</code>:</p>
-<pre>public class NetworkReceiver extends BroadcastReceiver {
-
+<pre>public class NetworkReceiver extends BroadcastReceiver {
+
@Override
public void onReceive(Context context, Intent intent) {
ConnectivityManager conn = (ConnectivityManager)
context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = conn.getActiveNetworkInfo();
-
+
// Checks the user prefs and the network connection. Based on the result, decides whether
// to refresh the display or keep the current display.
// If the userpref is Wi-Fi only, checks to see if the device has a Wi-Fi connection.
@@ -432,9 +432,9 @@
// (which by process of elimination would be mobile), sets refreshDisplay to true.
} else if (ANY.equals(sPref) && networkInfo != null) {
refreshDisplay = true;
-
+
// Otherwise, the app can't download content--either because there is no network
- // connection (mobile or Wi-Fi), or because the pref setting is WIFI, and there
+ // connection (mobile or Wi-Fi), or because the pref setting is WIFI, and there
// is no Wi-Fi connection.
// Sets refreshDisplay to false.
} else {
diff --git a/docs/html/training/basics/network-ops/xml.jd b/docs/html/training/basics/network-ops/xml.jd
index 0ea696d..3385a63 100644
--- a/docs/html/training/basics/network-ops/xml.jd
+++ b/docs/html/training/basics/network-ops/xml.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
@@ -38,7 +38,7 @@
<p class="filename">NetworkUsage.zip</p>
</div>
-</div>
+</div>
</div>
<p>Extensible Markup Language (XML) is a set of rules for encoding documents in
@@ -55,11 +55,11 @@
implementations of this interface:</p>
<ul>
- <li><a href="http://kxml.sourceforge.net/"><code>KXmlParser</code></a>
- via {@link org.xmlpull.v1.XmlPullParserFactory#newPullParser XmlPullParserFactory.newPullParser()}.
+ <li><a href="http://kxml.sourceforge.net/"><code>KXmlParser</code></a>
+ via {@link org.xmlpull.v1.XmlPullParserFactory#newPullParser XmlPullParserFactory.newPullParser()}.
</li>
- <li><code>ExpatPullParser</code>, via
- {@link android.util.Xml#newPullParser Xml.newPullParser()}.
+ <li><code>ExpatPullParser</code>, via
+ {@link android.util.Xml#newPullParser Xml.newPullParser()}.
</li>
</ul>
@@ -69,15 +69,15 @@
<h2 id="analyze">Analyze the Feed</h2>
-<p>The first step in parsing a feed is to decide which fields you're interested in.
+<p>The first step in parsing a feed is to decide which fields you're interested in.
The parser extracts data for those fields and ignores the rest.</p>
<p>Here is an excerpt from the feed that's being parsed in the sample app. Each
post to <a href="http://stackoverflow.com">StackOverflow.com</a> appears in the
feed as an <code>entry</code> tag that contains several nested tags:</p>
-<pre><?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule" ...">
+<pre><?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule" ...">
<title type="text">newest questions tagged android - Stack Overflow</title>
...
<entry>
@@ -107,7 +107,7 @@
...
</feed></pre>
-<p>The sample app
+<p>The sample app
extracts data for the <code>entry</code> tag and its nested tags
<code>title</code>, <code>link</code>, and <code>summary</code>.</p>
@@ -125,7 +125,7 @@
<pre>public class StackOverflowXmlParser {
// We don't use namespaces
private static final String ns = null;
-
+
public List<Entry> parse(InputStream in) throws XmlPullParserException, IOException {
try {
XmlPullParser parser = Xml.newPullParser();
@@ -137,7 +137,7 @@
in.close();
}
}
- ...
+ ...
}</pre>
<h2 id="read">Read the Feed</h2>
@@ -166,7 +166,7 @@
} else {
skip(parser);
}
- }
+ }
return entries;
}</pre>
@@ -187,7 +187,7 @@
<li>A "read" method for each tag you're interested in. For example,
<code>readEntry()</code>, <code>readTitle()</code>, and so on. The parser reads
-tags from the input stream. When it encounters a tag named <code>entry</code>,
+tags from the input stream. When it encounters a tag named <code>entry</code>,
<code>title</code>,
<code>link</code> or <code>summary</code>, it calls the appropriate method
for that tag. Otherwise, it skips the tag.
@@ -201,7 +201,7 @@
<code>readText()</code>. This method extracts data for these tags by calling
<code>parser.getText()</code>.</li>
-<li>For the <code>link</code> tag, the parser extracts data for links by first
+<li>For the <code>link</code> tag, the parser extracts data for links by first
determining if the link is the kind
it's interested in. Then it uses <code>parser.getAttributeValue()</code> to
extract the link's value.</li>
@@ -215,7 +215,7 @@
</li>
<li>A helper <code>skip()</code> method that's recursive. For more discussion of this topic, see <a href="#skip">Skip Tags You Don't Care About</a>.</li>
</ul>
-
+
</li>
</ol>
@@ -231,7 +231,7 @@
this.link = link;
}
}
-
+
// Parses the contents of an entry. If it encounters a title, summary, or link tag, hands them off
// to their respective "read" methods for processing. Otherwise, skips the tag.
private Entry readEntry(XmlPullParser parser) throws XmlPullParserException, IOException {
@@ -264,18 +264,18 @@
parser.require(XmlPullParser.END_TAG, ns, "title");
return title;
}
-
+
// Processes link tags in the feed.
private String readLink(XmlPullParser parser) throws IOException, XmlPullParserException {
String link = "";
parser.require(XmlPullParser.START_TAG, ns, "link");
String tag = parser.getName();
- String relType = parser.getAttributeValue(null, "rel");
+ String relType = parser.getAttributeValue(null, "rel");
if (tag.equals("link")) {
if (relType.equals("alternate")){
link = parser.getAttributeValue(null, "href");
parser.nextTag();
- }
+ }
}
parser.require(XmlPullParser.END_TAG, ns, "link");
return link;
@@ -350,7 +350,7 @@
<ul>
<li>The first time through the <code>while</code> loop, the next tag the parser
-encounters after <code><author></code> is the <code>START_TAG</code> for
+encounters after <code><author></code> is the <code>START_TAG</code> for
<code><name></code>. The value for <code>depth</code> is incremented to
2.</li>
@@ -367,7 +367,7 @@
<code>depth</code> is decremented to 1.</li>
<li>The fifth time and final time through the <code>while</code> loop, the next
-tag the parser encounters is the <code>END_TAG</code>
+tag the parser encounters is the <code>END_TAG</code>
<code></author></code>. The value for <code>depth</code> is decremented to
0, indicating that the <code><author></code> element has been successfully
skipped.</li>
@@ -377,7 +377,7 @@
<h2 id="consume">Consume XML Data</h2>
<p>The example application fetches and parses the XML feed within an {@link
-android.os.AsyncTask}. This takes the processing off the main UI thread. When
+android.os.AsyncTask}. This takes the processing off the main UI thread. When
processing is complete, the app updates the UI in the main activity
(<code>NetworkActivity</code>).</p>
<p>In the excerpt shown below, the <code>loadPage()</code> method does the
@@ -386,33 +386,33 @@
<ul>
<li>Initializes a string variable with the URL for the XML feed.</li>
-
+
<li>If the user's settings and the network connection allow it, invokes
-<code>new DownloadXmlTask().execute(url)</code>. This instantiates a new
+<code>new DownloadXmlTask().execute(url)</code>. This instantiates a new
<code>DownloadXmlTask</code> object ({@link android.os.AsyncTask} subclass) and
runs its {@link android.os.AsyncTask#execute execute()} method, which downloads
and parses the feed and returns a string result to be displayed in the UI.</li>
-
+
</ul>
<pre>
public class NetworkActivity extends Activity {
public static final String WIFI = "Wi-Fi";
public static final String ANY = "Any";
private static final String URL = "http://stackoverflow.com/feeds/tag?tagnames=android&sort=newest";
-
+
// Whether there is a Wi-Fi connection.
- private static boolean wifiConnected = false;
+ private static boolean wifiConnected = false;
// Whether there is a mobile connection.
private static boolean mobileConnected = false;
// Whether the display should be refreshed.
- public static boolean refreshDisplay = true;
+ public static boolean refreshDisplay = true;
public static String sPref = null;
...
-
+
// Uses AsyncTask to download the XML feed from stackoverflow.com.
- public void loadPage() {
-
+ public void loadPage() {
+
if((sPref.equals(ANY)) && (wifiConnected || mobileConnected)) {
new DownloadXmlTask().execute(URL);
}
@@ -420,25 +420,25 @@
new DownloadXmlTask().execute(URL);
} else {
// show error
- }
+ }
}</pre>
-
+
<p>The {@link android.os.AsyncTask} subclass shown below,
<code>DownloadXmlTask</code>, implements the following {@link
android.os.AsyncTask} methods:</p>
<ul>
-
+
<li>{@link android.os.AsyncTask#doInBackground doInBackground()} executes
the method <code>loadXmlFromNetwork()</code>. It passes the feed URL as a
parameter. The method <code>loadXmlFromNetwork()</code> fetches and processes
the feed. When it finishes, it passes back a result string.</li>
-
+
<li>{@link android.os.AsyncTask#onPostExecute onPostExecute()} takes the
returned string and displays it in the UI.</li>
-
+
</ul>
-
+
<pre>
// Implementation of AsyncTask used to download XML feed from stackoverflow.com.
private class DownloadXmlTask extends AsyncTask<String, Void, String> {
@@ -454,7 +454,7 @@
}
@Override
- protected void onPostExecute(String result) {
+ protected void onPostExecute(String result) {
setContentView(R.layout.main);
// Displays the HTML string in the UI via a WebView
WebView myWebView = (WebView) findViewById(R.id.webview);
@@ -464,28 +464,28 @@
<p>Below is the method <code>loadXmlFromNetwork()</code> that is invoked from
<code>DownloadXmlTask</code>. It does the following:</p>
-
+
<ol>
-
+
<li>Instantiates a <code>StackOverflowXmlParser</code>. It also creates variables for
-a {@link java.util.List} of <code>Entry</code> objects (<code>entries</code>), and
+a {@link java.util.List} of <code>Entry</code> objects (<code>entries</code>), and
<code>title</code>, <code>url</code>, and <code>summary</code>, to hold the
values extracted from the XML feed for those fields.</li>
-
- <li>Calls <code>downloadUrl()</code>, which fetches the feed and returns it as
+
+ <li>Calls <code>downloadUrl()</code>, which fetches the feed and returns it as
an {@link java.io.InputStream}.</li>
-
- <li>Uses <code>StackOverflowXmlParser</code> to parse the {@link java.io.InputStream}.
- <code>StackOverflowXmlParser</code> populates a
+
+ <li>Uses <code>StackOverflowXmlParser</code> to parse the {@link java.io.InputStream}.
+ <code>StackOverflowXmlParser</code> populates a
{@link java.util.List} of <code>entries</code> with data from the feed.</li>
-
- <li>Processes the <code>entries</code> {@link java.util.List},
+
+ <li>Processes the <code>entries</code> {@link java.util.List},
and combines the feed data with HTML markup.</li>
-
+
<li>Returns an HTML string that is displayed in the main activity
UI by the {@link android.os.AsyncTask} method {@link
android.os.AsyncTask#onPostExecute onPostExecute()}.</li>
-
+
</ol>
<pre>
@@ -499,35 +499,35 @@
String title = null;
String url = null;
String summary = null;
- Calendar rightNow = Calendar.getInstance();
+ Calendar rightNow = Calendar.getInstance();
DateFormat formatter = new SimpleDateFormat("MMM dd h:mmaa");
-
+
// Checks whether the user set the preference to include summary text
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean pref = sharedPrefs.getBoolean("summaryPref", false);
-
+
StringBuilder htmlString = new StringBuilder();
htmlString.append("<h3>" + getResources().getString(R.string.page_title) + "</h3>");
- htmlString.append("<em>" + getResources().getString(R.string.updated) + " " +
+ htmlString.append("<em>" + getResources().getString(R.string.updated) + " " +
formatter.format(rightNow.getTime()) + "</em>");
-
+
try {
- stream = downloadUrl(urlString);
+ stream = downloadUrl(urlString);
entries = stackOverflowXmlParser.parse(stream);
// Makes sure that the InputStream is closed after the app is
// finished using it.
} finally {
if (stream != null) {
stream.close();
- }
+ }
}
-
+
// StackOverflowXmlParser returns a List (called "entries") of Entry objects.
// Each Entry object represents a single post in the XML feed.
// This section processes the entries list to combine each entry with HTML markup.
// Each entry is displayed in the UI as a link that optionally includes
// a text summary.
- for (Entry entry : entries) {
+ for (Entry entry : entries) {
htmlString.append("<p><a href='");
htmlString.append(entry.link);
htmlString.append("'>" + entry.title + "</a></p>");
diff --git a/docs/html/training/basics/supporting-devices/index.jd b/docs/html/training/basics/supporting-devices/index.jd
index 4644c31..c9f2e6c 100644
--- a/docs/html/training/basics/supporting-devices/index.jd
+++ b/docs/html/training/basics/supporting-devices/index.jd
@@ -35,7 +35,7 @@
variety of Android-compatible devices, using a single application package (APK).</p>
<h2>Lessons</h2>
-
+
<dl>
<dt><b><a href="languages.html">Supporting Different Languages</a></b></dt>
<dd>Learn how to support multiple languages with alternative string resources.</dd>
@@ -44,5 +44,5 @@
<dt><b><a href="platforms.html">Supporting Different Platform Versions</a></b></dt>
<dd>Learn how to use APIs available in new versions of Android while continuing to support
older versions of Android.</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/basics/supporting-devices/languages.jd b/docs/html/training/basics/supporting-devices/languages.jd
index ba7c016..0ad1faf 100644
--- a/docs/html/training/basics/supporting-devices/languages.jd
+++ b/docs/html/training/basics/supporting-devices/languages.jd
@@ -36,7 +36,7 @@
your string values.</p>
-<h2 id="CreateDirs">Create Locale Directories and String Files</h2>
+<h2 id="CreateDirs">Create Locale Directories and String Files</h2>
<p>To add support for more languages, create additional <code>values</code> directories inside
<code>res/</code> that include a hyphen and the ISO language code at the end of the
@@ -63,7 +63,7 @@
<p>At runtime, the Android system uses the appropriate set of string resources based on the
locale currently set for the user's device.</p>
-
+
<p>For example, the following are some different string resource files for different languages.</p>
@@ -112,7 +112,7 @@
<p>In your source code, you can refer to a string resource with the syntax {@code
R.string.<string_name>}. There are a variety of methods that accept a string resource this
way.</p>
-
+
<p>For example:</p>
<pre>
diff --git a/docs/html/training/basics/supporting-devices/platforms.jd b/docs/html/training/basics/supporting-devices/platforms.jd
index eecb356..6712029 100644
--- a/docs/html/training/basics/supporting-devices/platforms.jd
+++ b/docs/html/training/basics/supporting-devices/platforms.jd
@@ -10,14 +10,14 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#sdk-versions">Specify Minimum and Target API Levels</a></li>
<li><a href="#version-codes">Check System Version at Runtime</a></li>
<li><a href="#style-themes">Use Platform Styles and Themes</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">Android API Levels</a></li>
@@ -27,19 +27,19 @@
</div>
</div>
-<p>While the latest versions of Android often provide great APIs for your app, you should continue
-to support older versions of Android until more devices get updated. This
-lesson shows you how to take advantage of the latest APIs while continuing to support older
+<p>While the latest versions of Android often provide great APIs for your app, you should continue
+to support older versions of Android until more devices get updated. This
+lesson shows you how to take advantage of the latest APIs while continuing to support older
versions as well.</p>
<p>The dashboard for <a
href="http://developer.android.com/about/dashboards/index.html">Platform Versions</a>
-is updated regularly to show the distribution of active
-devices running each version of Android, based on the number of devices that visit the Google Play
-Store. Generally, it’s a good practice to support about 90% of the active devices, while
+is updated regularly to show the distribution of active
+devices running each version of Android, based on the number of devices that visit the Google Play
+Store. Generally, it’s a good practice to support about 90% of the active devices, while
targeting your app to the latest version.</p>
-<p class="note"><strong>Tip:</strong> In order to provide the best features and
+<p class="note"><strong>Tip:</strong> In order to provide the best features and
functionality across several Android versions, you should use the <a
href="{@docRoot}tools/support-library/index.html">Android Support Library</a> in your app,
which allows you to use several recent platform APIs on older versions.</p>
@@ -49,8 +49,8 @@
<h2 id="sdk-versions">Specify Minimum and Target API Levels</h2>
<p>The <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</a> file
-describes details about your app and
-identifies which versions of Android it supports. Specifically, the <code>minSdkVersion</code>
+describes details about your app and
+identifies which versions of Android it supports. Specifically, the <code>minSdkVersion</code>
and <code>targetSdkVersion</code> attributes for the <a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element
identify the lowest API level with which your app is compatible and the highest API level against
@@ -65,9 +65,9 @@
</manifest>
</pre>
-<p>As new versions of Android are released, some style and behaviors may change.
+<p>As new versions of Android are released, some style and behaviors may change.
To allow your app to take advantage of these changes and ensure that your app fits the style of
-each user's device, you should set the
+each user's device, you should set the
<a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code targetSdkVersion}</a>
value to match the latest Android version
@@ -93,24 +93,24 @@
-<p class="note"><strong>Note:</strong> When parsing XML resources, Android ignores XML
+<p class="note"><strong>Note:</strong> When parsing XML resources, Android ignores XML
attributes that aren’t supported by the current device. So you can safely use XML attributes that
are only supported by newer versions without worrying about older versions breaking when they
-encounter that code. For example, if you set the
+encounter that code. For example, if you set the
<code>targetSdkVersion="11"</code>, your app includes the {@link android.app.ActionBar} by default
-on Android 3.0 and higher. To then add menu items to the action bar, you need to set
-<code>android:showAsAction="ifRoom"</code> in your menu resource XML. It's safe to do this
-in a cross-version XML file, because the older versions of Android simply ignore the
-<code>showAsAction</code> attribute (that is, you <em>do not</em> need a separate
+on Android 3.0 and higher. To then add menu items to the action bar, you need to set
+<code>android:showAsAction="ifRoom"</code> in your menu resource XML. It's safe to do this
+in a cross-version XML file, because the older versions of Android simply ignore the
+<code>showAsAction</code> attribute (that is, you <em>do not</em> need a separate
version in <code>res/menu-v11/</code>).</p>
-<h2 id="style-themes">Use Platform Styles and Themes</h2>
+<h2 id="style-themes">Use Platform Styles and Themes</h2>
-<p>Android provides user experience themes that give apps the look and feel of the
-underlying operating system. These themes can be applied to your app within the
-manifest file. By using these built in styles and themes, your app will
+<p>Android provides user experience themes that give apps the look and feel of the
+underlying operating system. These themes can be applied to your app within the
+manifest file. By using these built in styles and themes, your app will
naturally follow the latest look and feel of Android with each new release.</p>
<p>To make your activity look like a dialog box:</p>
@@ -126,7 +126,7 @@
<pre><activity android:theme="@style/CustomTheme"></pre>
<p>To apply a theme to your entire app (all activities), add the <code>android:theme</code>
-attribute
+attribute
to the <a href="{@docRoot}guide/topics/manifest/application-element.html">{@code
<application>}</a> element:</p>
diff --git a/docs/html/training/basics/supporting-devices/screens.jd b/docs/html/training/basics/supporting-devices/screens.jd
index 4b54de8..9d5e7c1 100644
--- a/docs/html/training/basics/supporting-devices/screens.jd
+++ b/docs/html/training/basics/supporting-devices/screens.jd
@@ -8,13 +8,13 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#create-layouts">Create Different Layouts</a></li>
<li><a href="#create-bitmaps">Create Different Bitmaps</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}training/multiscreen/index.html">Designing for Multiple
@@ -26,9 +26,9 @@
</div>
</div>
-<p>Android categorizes device screens using two general properties: size and density. You should
-expect that your app will be installed on devices with screens that range in both size
-and density. As such, you should include some alternative resources that optimize your app’s
+<p>Android categorizes device screens using two general properties: size and density. You should
+expect that your app will be installed on devices with screens that range in both size
+and density. As such, you should include some alternative resources that optimize your app’s
appearance for different screen sizes and densities.</p>
<ul>
@@ -46,12 +46,12 @@
orientation.</p>
-<h2 id="create-layouts">Create Different Layouts</h2>
+<h2 id="create-layouts">Create Different Layouts</h2>
<p>To optimize your user experience on different screen sizes, you should create a unique layout XML
-file for each screen size you want to support. Each layout should be
-saved into the appropriate resources directory, named with a <code>-<screen_size></code>
-suffix. For example, a unique layout for large screens should be saved under
+file for each screen size you want to support. Each layout should be
+saved into the appropriate resources directory, named with a <code>-<screen_size></code>
+suffix. For example, a unique layout for large screens should be saved under
<code>res/layout-large/</code>.</p>
<p class="note"><strong>Note:</strong> Android automatically scales your layout in order to
@@ -85,7 +85,7 @@
}
</pre>
-<p>The system loads the layout file from the appropriate layout directory based on screen size of
+<p>The system loads the layout file from the appropriate layout directory based on screen size of
the device on which your app is running. More information about how Android selects the
appropriate resource is available in the <a
href="{@docRoot}guide/topics/resources/providing-resources.html#BestMatch">Providing Resources</a>
@@ -120,7 +120,7 @@
main.xml
</pre>
-<p class="note"><strong>Note:</strong> Android 3.2 and above supports an advanced method of
+<p class="note"><strong>Note:</strong> Android 3.2 and above supports an advanced method of
defining screen sizes that allows you to specify resources for screen sizes based on
the minimum width and height in terms of density-independent pixels. This lesson does not cover
this new technique. For more information, read <a
@@ -128,14 +128,14 @@
Screens</a>.</p>
-
+
<h2 id="create-bitmaps">Create Different Bitmaps</h2>
<p>You should always provide bitmap resources that are properly scaled to each of the generalized
density buckets: low, medium, high and extra-high density. This helps you achieve good graphical
quality and performance on all screen densities.</p>
-<p>To generate these images, you should start with your raw resource in vector format and generate
+<p>To generate these images, you should start with your raw resource in vector format and generate
the images for each density using the following size scale:</p>
<ul>
<li>xhdpi: 2.0</li>
@@ -144,7 +144,7 @@
<li>ldpi: 0.75</li>
</ul>
-<p>This means that if you generate a 200x200 image for xhdpi devices, you should generate the same
+<p>This means that if you generate a 200x200 image for xhdpi devices, you should generate the same
resource in 150x150 for hdpi, 100x100 for mdpi, and 75x75 for ldpi devices.</p>
<p>Then, place the files in the appropriate drawable resource directory:</p>
@@ -162,14 +162,14 @@
awesomeimage.png
</pre>
-<p>Any time you reference <code>@drawable/awesomeimage</code>, the system selects the
+<p>Any time you reference <code>@drawable/awesomeimage</code>, the system selects the
appropriate bitmap based on the screen's density.</p>
<p class="note"><strong>Note:</strong> Low-density (ldpi) resources aren’t always necessary. When
you provide hdpi assets, the system scales them down by one half to properly fit ldpi
screens.</p>
-<p>For more tips and guidelines about creating icon assets for your app, see the
+<p>For more tips and guidelines about creating icon assets for your app, see the
<a href="{@docRoot}design/style/iconography.html">Iconography design guide</a>.</p>
diff --git a/docs/html/training/building-userinfo.jd b/docs/html/training/building-userinfo.jd
index 40e5b94..a08899d 100644
--- a/docs/html/training/building-userinfo.jd
+++ b/docs/html/training/building-userinfo.jd
@@ -4,6 +4,6 @@
@jd:body
-<p>These lessons teach you how to include contact information and authenticate users with the same
-credentials they use for Google. These features allow your app to connect users with people they
+<p>These lessons teach you how to include contact information and authenticate users with the same
+credentials they use for Google. These features allow your app to connect users with people they
care about and provide a personalized experience without creating new user accounts.</p>
diff --git a/docs/html/training/camera/cameradirect.jd b/docs/html/training/camera/cameradirect.jd
index 6f358a5..851c7db 100644
--- a/docs/html/training/camera/cameradirect.jd
+++ b/docs/html/training/camera/cameradirect.jd
@@ -11,7 +11,7 @@
<div id="tb-wrapper">
<div id="tb">
-
+
<h2>This lesson teaches you to</h2>
<ol>
<li><a href="#TaskOpenCamera">Open the Camera Object</a></li>
@@ -22,7 +22,7 @@
<li><a href="#TaskRestartPreview">Restart the Preview</a></li>
<li><a href="#TaskReleaseCamera">Stop the Preview and Release the Camera</a></li>
</ol>
-
+
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}guide/topics/media/camera.html#custom-camera">Building
@@ -57,7 +57,7 @@
<pre>
private boolean safeCameraOpen(int id) {
boolean qOpened = false;
-
+
try {
releaseCameraAndPreview();
mCamera = Camera.open(id);
@@ -67,7 +67,7 @@
e.printStackTrace();
}
- return qOpened;
+ return qOpened;
}
private void releaseCameraAndPreview() {
@@ -136,22 +136,22 @@
<pre>
public void setCamera(Camera camera) {
if (mCamera == camera) { return; }
-
+
stopPreviewAndFreeCamera();
-
+
mCamera = camera;
-
+
if (mCamera != null) {
List<Size> localSizes = mCamera.getParameters().getSupportedPreviewSizes();
mSupportedPreviewSizes = localSizes;
requestLayout();
-
+
try {
mCamera.setPreviewDisplay(mHolder);
} catch (IOException e) {
e.printStackTrace();
}
-
+
// Important: Call startPreview() to start updating the preview
// surface. Preview must be started before you can take a picture.
mCamera.startPreview();
@@ -260,12 +260,12 @@
if (mCamera != null) {
// Call stopPreview() to stop updating the preview surface.
mCamera.stopPreview();
-
+
// Important: Call release() to release the camera for use by other
// applications. Applications should release the camera immediately
// during onPause() and re-open() it during onResume()).
mCamera.release();
-
+
mCamera = null;
}
}
diff --git a/docs/html/training/contacts-provider/display-contact-badge.jd b/docs/html/training/contacts-provider/display-contact-badge.jd
index b00ce0e..d286440 100644
--- a/docs/html/training/contacts-provider/display-contact-badge.jd
+++ b/docs/html/training/contacts-provider/display-contact-badge.jd
@@ -113,10 +113,10 @@
<p>
For Android 3.0 (API level 11) and later, include the following columns in your projection:</p>
<ul>
- <li>{@link android.provider.ContactsContract.Contacts#_ID Contacts._ID}</li>
- <li>{@link android.provider.ContactsContract.Contacts#LOOKUP_KEY Contacts.LOOKUP_KEY}</li>
+ <li>{@link android.provider.BaseColumns#_ID Contacts._ID}</li>
+ <li>{@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY Contacts.LOOKUP_KEY}</li>
<li>
- {@link android.provider.ContactsContract.Contacts#PHOTO_THUMBNAIL_URI
+ {@link android.provider.ContactsContract.ContactsColumns#PHOTO_THUMBNAIL_URI
Contacts.PHOTO_THUMBNAIL_URI}
</li>
</ul>
@@ -124,8 +124,8 @@
For Android 2.3.3 (API level 10) and earlier, use the following columns:
</p>
<ul>
- <li>{@link android.provider.ContactsContract.Contacts#_ID Contacts._ID}</li>
- <li>{@link android.provider.ContactsContract.Contacts#LOOKUP_KEY Contacts.LOOKUP_KEY}</li>
+ <li>{@link android.provider.BaseColumns#_ID Contacts._ID}</li>
+ <li>{@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY Contacts.LOOKUP_KEY}</li>
</ul>
<p>
The remainder of this lesson assumes that you've already loaded a
@@ -187,14 +187,14 @@
</p>
<p class="note">
<strong>Note:</strong> The
- {@link android.provider.ContactsContract.Contacts#PHOTO_THUMBNAIL_URI} column isn't available
+ {@link android.provider.ContactsContract.ContactsColumns#PHOTO_THUMBNAIL_URI} column isn't available
in platform versions prior to 3.0. For those versions, you must retrieve the URI
from the {@link android.provider.ContactsContract.Contacts.Photo Contacts.Photo} subtable.
</p>
<p>
First, set up variables for accessing the {@link android.database.Cursor} containing the
- {@link android.provider.ContactsContract.Contacts#_ID Contacts._ID} and
- {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY Contacts.LOOKUP_KEY} columns, as
+ {@link android.provider.BaseColumns#_ID Contacts._ID} and
+ {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY Contacts.LOOKUP_KEY} columns, as
described previously:
</p>
<pre>
@@ -268,7 +268,7 @@
Uri.withAppendedPath(
contactUri, Photo.CONTENT_DIRECTORY);
}
-
+
/*
* Retrieves an AssetFileDescriptor object for the thumbnail
* URI
diff --git a/docs/html/training/contacts-provider/index.jd b/docs/html/training/contacts-provider/index.jd
index f380d95..9562977 100644
--- a/docs/html/training/contacts-provider/index.jd
+++ b/docs/html/training/contacts-provider/index.jd
@@ -55,7 +55,7 @@
<a href="{@docRoot}guide/topics/providers/contacts-provider.html">Contacts Provider</a>.
</p>
<h2>Lessons</h2>
-
+
<dl>
<dt>
<b><a href="retrieve-names.html">Retrieving a List of Contacts</a></b>
diff --git a/docs/html/training/contacts-provider/modify-data.jd b/docs/html/training/contacts-provider/modify-data.jd
index 64853ef..e993c56 100644
--- a/docs/html/training/contacts-provider/modify-data.jd
+++ b/docs/html/training/contacts-provider/modify-data.jd
@@ -196,8 +196,8 @@
Contacts.CONTENT_LOOKUP_URI}, call
{@link android.provider.ContactsContract.Contacts#getLookupUri
Contacts.getLookupUri(id, lookupkey)} with the contact's
- {@link android.provider.ContactsContract.Contacts#_ID Contacts._ID} and
- {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY Contacts.LOOKUP_KEY} values as
+ {@link android.provider.BaseColumns#_ID Contacts._ID} and
+ {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY Contacts.LOOKUP_KEY} values as
arguments.
</p>
<p>
diff --git a/docs/html/training/contacts-provider/retrieve-details.jd b/docs/html/training/contacts-provider/retrieve-details.jd
index 0de3b67..a463b75 100644
--- a/docs/html/training/contacts-provider/retrieve-details.jd
+++ b/docs/html/training/contacts-provider/retrieve-details.jd
@@ -55,11 +55,11 @@
<p>
To retrieve all the details for a contact, search the
{@link android.provider.ContactsContract.Data} table for any rows that contain the contact's
- {@link android.provider.ContactsContract.Data#LOOKUP_KEY}. This column is available in
+ {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY}. This column is available in
the {@link android.provider.ContactsContract.Data} table, because the Contacts
Provider makes an implicit join between the {@link android.provider.ContactsContract.Contacts}
table and the {@link android.provider.ContactsContract.Data} table. The
- {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY} column is described
+ {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} column is described
in more detail in the <a href="retrieve-names.html">Retrieving Contact Names</a> lesson.
</p>
<p class="note">
@@ -85,9 +85,9 @@
the data is in different columns depending on the data type.
To ensure you get all the possible columns for all possible data types, you need to add all the
column names to your projection. Always retrieve
- {@link android.provider.ContactsContract.Data#_ID Data._ID} if you're binding the result
+ {@link android.provider.BaseColumns#_ID Data._ID} if you're binding the result
{@link android.database.Cursor} to a {@link android.widget.ListView}; otherwise, the binding
- won't work. Also retrieve {@link android.provider.ContactsContract.Data#MIMETYPE Data.MIMETYPE}
+ won't work. Also retrieve {@link android.provider.ContactsContract.DataColumns#MIMETYPE Data.MIMETYPE}
so you can identify the data type of each row you retrieve. For example:
</p>
<pre>
@@ -128,7 +128,7 @@
<p>
Define a constant for your selection clause, an array to hold selection arguments, and a
variable to hold the selection value. Use
- the {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY Contacts.LOOKUP_KEY} column to
+ the {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY Contacts.LOOKUP_KEY} column to
find the contact. For example:
</p>
<pre>
@@ -153,7 +153,7 @@
<p>
Define the sort order you want in the resulting {@link android.database.Cursor}. To
keep all rows for a particular data type together, sort by
- {@link android.provider.ContactsContract.Data#MIMETYPE Data.MIMETYPE}. This query argument
+ {@link android.provider.ContactsContract.DataColumns#MIMETYPE Data.MIMETYPE}. This query argument
groups all email rows together, all phone rows together, and so forth. For example:
</p>
<pre>
@@ -299,7 +299,7 @@
</dt>
<dd>
Modify the selection text to search for the
- {@link android.provider.ContactsContract.Data#MIMETYPE MIMETYPE} value that's specific to
+ {@link android.provider.ContactsContract.DataColumns#MIMETYPE MIMETYPE} value that's specific to
your data type.
</dd>
<dt>
@@ -307,7 +307,7 @@
</dt>
<dd>
Since you're only selecting a single detail type, don't group the returned
- {@link android.database.Cursor} by {@link android.provider.ContactsContract.Data#MIMETYPE
+ {@link android.database.Cursor} by {@link android.provider.ContactsContract.DataColumns#MIMETYPE
Data.MIMETYPE}.
</dd>
</dl>
@@ -344,9 +344,9 @@
<h3>Define selection criteria</h3>
<p>
Define a search text expression that retrieves rows for a specific contact's
- {@link android.provider.ContactsContract.Data#LOOKUP_KEY} and the
- {@link android.provider.ContactsContract.Data#MIMETYPE Data.MIMETYPE} of the details you
- want. Enclose the {@link android.provider.ContactsContract.Data#MIMETYPE MIMETYPE} value in
+ {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} and the
+ {@link android.provider.ContactsContract.DataColumns#MIMETYPE Data.MIMETYPE} of the details you
+ want. Enclose the {@link android.provider.ContactsContract.DataColumns#MIMETYPE MIMETYPE} value in
single quotes by concatenating a "<code>'</code>" (single-quote) character to the start and end
of the constant; otherwise, the provider interprets the constant as a variable name rather
than as a string value. You don't need to use a placeholder for this value, because you're
@@ -368,10 +368,10 @@
<h3>Define a sort order</h3>
<p>
Define a sort order for the returned {@link android.database.Cursor}. Since you're retrieving a
- specific data type, omit the sort on {@link android.provider.ContactsContract.Data#MIMETYPE}.
+ specific data type, omit the sort on {@link android.provider.ContactsContract.DataColumns#MIMETYPE}.
Instead, if the type of detail data you're searching includes a subtype, sort on it.
For example, for email data you can sort on
- {@link android.provider.ContactsContract.CommonDataKinds.Email#TYPE Email.TYPE}:
+ {@link android.provider.ContactsContract.CommonDataKinds.CommonColumns#TYPE Email.TYPE}:
</p>
<pre>
private static final String SORT_ORDER = Email.TYPE + " ASC ";
diff --git a/docs/html/training/contacts-provider/retrieve-names.jd b/docs/html/training/contacts-provider/retrieve-names.jd
index 49d6e95..7d70ceb 100755
--- a/docs/html/training/contacts-provider/retrieve-names.jd
+++ b/docs/html/training/contacts-provider/retrieve-names.jd
@@ -227,7 +227,7 @@
</pre>
<p class="note">
<strong>Note:</strong> Since
- {@link android.provider.ContactsContract.Contacts#DISPLAY_NAME_PRIMARY
+ {@link android.provider.ContactsContract.ContactNameColumns#DISPLAY_NAME_PRIMARY
Contacts.DISPLAY_NAME_PRIMARY} requires Android 3.0 (API version 11) or later, setting your
app's <code>minSdkVersion</code> to 10 or below generates an Android Lint warning in
Android Studio. To turn off this warning, add the annotation
@@ -261,7 +261,7 @@
that displays the contacts, you need to call {@link android.app.Activity#findViewById
Activity.findViewById()} using the parent activity of the
{@link android.support.v4.app.Fragment}. Use the {@link android.content.Context} of the
- parent activity when you call {@link android.widget.ListView#setAdapter setAdapter()}.
+ parent activity when you call {@link android.widget.AdapterView#setAdapter setAdapter()}.
For example:
</p>
<pre>
@@ -293,7 +293,7 @@
</p>
<p>
To continue setting up the listener, bind it to the {@link android.widget.ListView} by
- calling the method {@link android.widget.ListView#setOnItemClickListener
+ calling the method {@link android.widget.AdapterView#setOnItemClickListener
setOnItemClickListener()} in {@link android.support.v4.app.Fragment#onActivityCreated
onActivityCreated()}. For example:
</p>
@@ -318,15 +318,15 @@
the {@link android.widget.ListView} displays the contact's display name,
which contains the main form of the contact's name. In Android 3.0 (API version 11) and later,
the name of this column is
- {@link android.provider.ContactsContract.Contacts#DISPLAY_NAME_PRIMARY
+ {@link android.provider.ContactsContract.ContactNameColumns#DISPLAY_NAME_PRIMARY
Contacts.DISPLAY_NAME_PRIMARY}; in versions previous to that, its name is
- {@link android.provider.ContactsContract.Contacts#DISPLAY_NAME Contacts.DISPLAY_NAME}.
+ {@link android.provider.ContactsContract.ContactsColumns#DISPLAY_NAME Contacts.DISPLAY_NAME}.
</p>
<p>
- The column {@link android.provider.ContactsContract.Contacts#_ID Contacts._ID} is used by the
+ The column {@link android.provider.BaseColumns#_ID Contacts._ID} is used by the
{@link android.support.v4.widget.SimpleCursorAdapter} binding process.
- {@link android.provider.ContactsContract.Contacts#_ID Contacts._ID} and
- {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY} are used together to
+ {@link android.provider.BaseColumns#_ID Contacts._ID} and
+ {@link android.provider.ContactsContract.ContactsColumns#LOOKUP_KEY} are used together to
construct a content URI for the contact the user selects.
</p>
<pre>
@@ -635,7 +635,7 @@
</li>
<li>
The name of the column that contains the custom MIME type value. This name is always
- {@link android.provider.ContactsContract.Data#MIMETYPE Data.MIMETYPE}.
+ {@link android.provider.ContactsContract.DataColumns#MIMETYPE Data.MIMETYPE}.
</li>
<li>
The custom MIME type value for the data type. As described previously, this is the constant
diff --git a/docs/html/training/custom-views/index.jd b/docs/html/training/custom-views/index.jd
index 447da94..d249fbd 100755
--- a/docs/html/training/custom-views/index.jd
+++ b/docs/html/training/custom-views/index.jd
@@ -67,7 +67,7 @@
custom drawings run faster.
</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/displaying-bitmaps/cache-bitmap.jd b/docs/html/training/displaying-bitmaps/cache-bitmap.jd
index 7b9216e..d9622bc 100644
--- a/docs/html/training/displaying-bitmaps/cache-bitmap.jd
+++ b/docs/html/training/displaying-bitmaps/cache-bitmap.jd
@@ -187,7 +187,7 @@
appropriate place to store cached images if they are accessed more frequently, for example in an
image gallery application.</p>
-<p>The sample code of this class uses a {@code DiskLruCache} implementation that is pulled from the
+<p>The sample code of this class uses a {@code DiskLruCache} implementation that is pulled from the
<a href="https://android.googlesource.com/platform/libcore/+/jb-mr2-release/luni/src/main/java/libcore/io/DiskLruCache.java">Android source</a>.
Here’s updated example code that adds a disk cache in addition to the existing memory cache:</p>
diff --git a/docs/html/training/displaying-bitmaps/index.jd b/docs/html/training/displaying-bitmaps/index.jd
index 831c64d..aea473f 100644
--- a/docs/html/training/displaying-bitmaps/index.jd
+++ b/docs/html/training/displaying-bitmaps/index.jd
@@ -56,7 +56,7 @@
perform under this minimum memory limit. However, keep in mind many devices are configured with
higher limits.</li>
<li>Bitmaps take up a lot of memory, especially for rich images like photographs. For example, the
- camera on the <a href="http://www.android.com/devices/detail/galaxy-nexus">Galaxy Nexus</a> takes
+ camera on the <a href="http://www.android.com/devices/detail/galaxy-nexus">Galaxy Nexus</a> takes
photos up to 2592x1936 pixels (5 megapixels). If the bitmap configuration used is {@link
android.graphics.Bitmap.Config ARGB_8888} (the default from the Android 2.3 onward) then loading
this image into memory takes about 19MB of memory (2592*1936*4 bytes), immediately exhausting the
diff --git a/docs/html/training/displaying-bitmaps/load-bitmap.jd b/docs/html/training/displaying-bitmaps/load-bitmap.jd
index f963baa..81eb1ab 100644
--- a/docs/html/training/displaying-bitmaps/load-bitmap.jd
+++ b/docs/html/training/displaying-bitmaps/load-bitmap.jd
@@ -115,8 +115,8 @@
// Calculate the largest inSampleSize value that is a power of 2 and keeps both
// height and width larger than the requested height and width.
- while ((halfHeight / inSampleSize) > reqHeight
- && (halfWidth / inSampleSize) > reqWidth) {
+ while ((halfHeight / inSampleSize) >= reqHeight
+ && (halfWidth / inSampleSize) >= reqWidth) {
inSampleSize *= 2;
}
}
diff --git a/docs/html/training/displaying-bitmaps/manage-memory.jd b/docs/html/training/displaying-bitmaps/manage-memory.jd
index b7c72bc..ef3bd6c 100644
--- a/docs/html/training/displaying-bitmaps/manage-memory.jd
+++ b/docs/html/training/displaying-bitmaps/manage-memory.jd
@@ -42,11 +42,11 @@
<p>To set the stage for this lesson, here is how Android's management of
bitmap memory has evolved:</p>
-<ul>
+<ul>
<li>
-On Android Android 2.2 (API level 8) and lower, when garbage
+On Android Android 2.2 (API level 8) and lower, when garbage
collection occurs, your app's threads get stopped. This causes a lag that
-can degrade performance.
+can degrade performance.
<strong>Android 2.3 adds concurrent garbage collection, which means that
the memory is reclaimed soon after a bitmap is no longer referenced.</strong>
</li>
@@ -66,7 +66,7 @@
<h2 id="recycle">Manage Memory on Android 2.3.3 and Lower</h2>
-<p>On Android 2.3.3 (API level 10) and lower, using
+<p>On Android 2.3.3 (API level 10) and lower, using
{@link android.graphics.Bitmap#recycle recycle()}
is recommended. If you're displaying large amounts of bitmap data in your app,
you're likely to run into
@@ -82,12 +82,12 @@
<p>The following code snippet gives an example of calling
{@link android.graphics.Bitmap#recycle recycle()}. It uses reference counting
-(in the variables {@code mDisplayRefCount} and {@code mCacheRefCount}) to track
+(in the variables {@code mDisplayRefCount} and {@code mCacheRefCount}) to track
whether a bitmap is currently being displayed or in the cache. The
code recycles the bitmap when these conditions are met:</p>
<ul>
-<li>The reference count for both {@code mDisplayRefCount} and
+<li>The reference count for both {@code mDisplayRefCount} and
{@code mCacheRefCount} is 0.</li>
<li>The bitmap is not {@code null}, and it hasn't been recycled yet.</li>
</ul>
@@ -142,7 +142,7 @@
<p>Android 3.0 (API level 11) introduces the
{@link android.graphics.BitmapFactory.Options#inBitmap BitmapFactory.Options.inBitmap}
-field. If this option is set, decode methods that take the
+field. If this option is set, decode methods that take the
{@link android.graphics.BitmapFactory.Options Options} object
will attempt to reuse an existing bitmap when loading content. This means
that the bitmap's memory is reused, resulting in improved performance, and
@@ -154,7 +154,7 @@
<h3>Save a bitmap for later use</h3>
<p>The following snippet demonstrates how an existing bitmap is stored for possible
-later use in the sample app. When an app is running on Android 3.0 or higher and
+later use in the sample app. When an app is running on Android 3.0 or higher and
a bitmap is evicted from the {@link android.util.LruCache},
a soft reference to the bitmap is placed
in a {@link java.util.HashSet}, for possible reuse later with
@@ -238,7 +238,7 @@
}
}
-// This method iterates through the reusable bitmaps, looking for one
+// This method iterates through the reusable bitmaps, looking for one
// to use for inBitmap:
protected Bitmap getBitmapFromReusableSet(BitmapFactory.Options options) {
Bitmap bitmap = null;
diff --git a/docs/html/training/efficient-downloads/connectivity_patterns.jd b/docs/html/training/efficient-downloads/connectivity_patterns.jd
index 81f1540..079e967 100644
--- a/docs/html/training/efficient-downloads/connectivity_patterns.jd
+++ b/docs/html/training/efficient-downloads/connectivity_patterns.jd
@@ -26,7 +26,7 @@
</div>
<p>When it comes to impact on battery life, not all connection types are created equal. Not only does the Wi-Fi radio use significantly less battery than its wireless radio counterparts, but the radios used in different wireless radio technologies have different battery implications.</p>
-
+
<h2 id="WiFi">Use Wi-Fi</h2>
<p>In most cases a Wi-Fi radio will offer greater bandwidth at a significantly lower battery cost. As a result, you should endeavor to perform data transfers when connected over Wi-Fi whenever possible.</p>
@@ -50,22 +50,22 @@
TelephonyManager tm =
(TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-
+
int PrefetchCacheSize = DEFAULT_PREFETCH_CACHE;
-
+
switch (activeNetwork.getType()) {
- case (ConnectivityManager.TYPE_WIFI):
+ case (ConnectivityManager.TYPE_WIFI):
PrefetchCacheSize = MAX_PREFETCH_CACHE; break;
case (ConnectivityManager.TYPE_MOBILE): {
switch (tm.getNetworkType()) {
- case (TelephonyManager.NETWORK_TYPE_LTE |
- TelephonyManager.NETWORK_TYPE_HSPAP):
+ case (TelephonyManager.NETWORK_TYPE_LTE |
+ TelephonyManager.NETWORK_TYPE_HSPAP):
PrefetchCacheSize *= 4;
break;
- case (TelephonyManager.NETWORK_TYPE_EDGE |
- TelephonyManager.NETWORK_TYPE_GPRS):
+ case (TelephonyManager.NETWORK_TYPE_EDGE |
+ TelephonyManager.NETWORK_TYPE_GPRS):
PrefetchCacheSize /= 2;
break;
default: break;
diff --git a/docs/html/training/efficient-downloads/efficient-network-access.jd b/docs/html/training/efficient-downloads/efficient-network-access.jd
index 1d3a8a5..7f061ca 100644
--- a/docs/html/training/efficient-downloads/efficient-network-access.jd
+++ b/docs/html/training/efficient-downloads/efficient-network-access.jd
@@ -32,9 +32,9 @@
<p>Using the wireless radio to transfer data is potentially one of your app's most significant sources of battery drain. To minimize the battery drain associated with network activity, it's critical that you understand how your connectivity model will affect the underlying radio hardware.</p>
<p>This lesson introduces the wireless radio state machine and explains how your app's connectivity model interacts with it. It goes on to propose ways to minimize your data connections, use prefetching, and bundle your transfers in order to minimize the battery drain associated with your data transfers.</p>
-
-<h2 id="RadioStateMachine">The Radio State Machine</h2>
-
+
+<h2 id="RadioStateMachine">The Radio State Machine</h2>
+
<p>A fully active wireless radio consumes significant power, so it transitions between different energy states in order to conserve power when not in use, while attempting to minimize latency associated with "powering up" the radio when it's required.</p>
<p>The state machine for a typical 3G network radio consists of three energy states:
@@ -57,9 +57,9 @@
<p>This approach is particularly effective for typical web browsing as it prevents unwelcome latency while users browse the web. The relatively low tail-time also ensures that once a browsing session has finished, the radio can move to a lower energy state.</p>
<p>Unfortunately, this approach can lead to inefficient apps on modern smartphone OSs like Android, where apps run both in the foreground (where latency is important) and in the background (where battery life should be prioritized).</p>
-
-<h2 id="AppsStateMachine">How Apps Impact the Radio State Machine</h2>
-
+
+<h2 id="AppsStateMachine">How Apps Impact the Radio State Machine</h2>
+
<p>Every time you create a new network connection, the radio transitions to the full power state. In the case of the typical 3G radio state machine described above, it will remain at full power for the duration of your transfer—plus an additional 5 seconds of tail time—followed by 12 seconds at the low energy state. So for a typical 3G device, every data transfer session will cause the radio to draw energy for almost 20 seconds.</p>
<p>In practice, this means an app that transfers unbundled data for 1 second every 18 seconds will keep the wireless radio perpetually active, moving it back to high power just as it was about to become idle. As a result, every minute it will consume battery at the high power state for 18 seconds, and at the low power state for the remaining 42 seconds.</p>
@@ -71,7 +71,7 @@
<img src="{@docRoot}images/efficient-downloads/graphs.png" />
<p class="img-caption"><strong>Figure 2.</strong> Relative wireless radio power use for bundled versus unbundled transfers.</p>
-<h2 id="PrefetchData">Prefetch Data</h2>
+<h2 id="PrefetchData">Prefetch Data</h2>
<p>Prefetching data is an effective way to reduce the number of independent data transfer sessions. Prefetching allows you to download all the data you are likely to need for a given time period in a single burst, over a single connection, at full capacity.</p>
@@ -135,7 +135,7 @@
<p>Rather than creating multiple simultaneous connections to download data, or chaining multiple consecutive GET requests, where possible you should bundle those requests into a single GET.</p>
-<p>For example, it would be more efficient to make a single request for every news article to be returned in a single request / response than to make multiple queries for several news categories.
+<p>For example, it would be more efficient to make a single request for every news article to be returned in a single request / response than to make multiple queries for several news categories.
The wireless radio needs to become active in order to transmit the termination / termination acknowledgement packets associated with server and client timeout, so it's also good practice to close your connections when they aren't in use, rather than waiting for these timeouts.</p>
<p>That said, closing a connection too early can prevent it from being reused, which then requires additional overhead for establishing a new connection. A useful compromise is not to close the connection immediately, but to still close it before the inherent timeout expires.</p>
diff --git a/docs/html/training/efficient-downloads/index.jd b/docs/html/training/efficient-downloads/index.jd
index d9d7ef0..a4c2aa1 100644
--- a/docs/html/training/efficient-downloads/index.jd
+++ b/docs/html/training/efficient-downloads/index.jd
@@ -26,18 +26,18 @@
<p>In this class you will learn to minimize the battery life impact of downloads and network connections, particularly in relation to the wireless radio.</P
-<p>This class demonstrates the best practices for scheduling and executing downloads using techniques such as caching, polling, and prefetching. You will learn how the power-use profile of the wireless radio can affect your choices on when, what, and how to transfer data in order to minimize impact on battery life.</p>
+<p>This class demonstrates the best practices for scheduling and executing downloads using techniques such as caching, polling, and prefetching. You will learn how the power-use profile of the wireless radio can affect your choices on when, what, and how to transfer data in order to minimize impact on battery life.</p>
-<h2>Lessons</h2>
-
+<h2>Lessons</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
-<dl>
+will want to jump to a lesson or not.-->
+
+<dl>
<dt><b><a href="efficient-network-access.html">Optimizing Downloads for Efficient Network Access</a></b></dt>
<dd>This lesson introduces the wireless radio state machine, explains how your app’s connectivity model interacts with it, and how you can minimize your data connection and use prefetching and bundling to minimize the battery drain associated with your data transfers.</dd>
-
+
<dt><b><a href="regular_updates.html">Minimizing the Effect of Regular Updates</a></b></dt>
<dd>This lesson will examine how your refresh frequency can be varied to best mitigate the effect of background updates on the underlying wireless radio state machine.</dd>
@@ -47,4 +47,4 @@
<dt><b><a href="connectivity_patterns.html">Modifying your Download Patterns Based on the Connectivity Type</a></b></dt>
<dd>When it comes to impact on battery life, not all connection types are created equal. Not only does the Wi-Fi radio use significantly less battery than its wireless radio counterparts, but the radios used in different wireless radio technologies have different battery implications.</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/efficient-downloads/regular_updates.jd b/docs/html/training/efficient-downloads/regular_updates.jd
index 8e3842a..b87c512 100644
--- a/docs/html/training/efficient-downloads/regular_updates.jd
+++ b/docs/html/training/efficient-downloads/regular_updates.jd
@@ -33,9 +33,9 @@
<p><a href="{@docRoot}training/monitoring-device-state/index.html">Optimizing Battery Life</a> discusses how to build battery-efficient apps that modify their refresh frequency based on the state of the host device. That includes disabling background service updates when you lose connectivity and reducing the rate of updates when the battery level is low.</p>
<p>This lesson will examine how your refresh frequency can be varied to best mitigate the effect of background updates on the underlying wireless radio state machine.</p>
-
-<h2 id="GCM">Use Google Cloud Messaging as an Alternative to Polling</h2>
-
+
+<h2 id="GCM">Use Google Cloud Messaging as an Alternative to Polling</h2>
+
<p>Every time your app polls your server to check if an update is required, you activate the wireless radio, drawing power unnecessarily, for up to 20 seconds on a typical 3G connection.</p>
<p><a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging for Android (GCM)</a> is a lightweight mechanism used to transmit data from a server to a particular app instance. Using GCM, your server can notify your app running on a particular device that there is new data available for it.</p>
@@ -46,7 +46,7 @@
<p>GCM is implemented using a persistent TCP/IP connection. While it's possible to implement your own push service, it's best practice to use GCM. This minimizes the number of persistent connections and allows the platform to optimize bandwidth and minimize the associated impact on battery life.</p>
-<h2 id="OptimizedPolling">Optimize Polling with Inexact Repeating Alarms and Exponential Backoffs</h2>
+<h2 id="OptimizedPolling">Optimize Polling with Inexact Repeating Alarms and Exponential Backoffs</h2>
<p>Where polling is required, it's good practice to set the default data refresh frequency of your app as low as possible without detracting from the user experience.</p>
@@ -68,14 +68,14 @@
<p>One approach is to implement an exponential back-off pattern to reduce the frequency of your updates (and / or the degree of prefetching you perform) if the app hasn't been used since the previous update. It's often useful to assert a minimum update frequency and to reset the frequency whenever the app is used, for example:</p>
-<pre>SharedPreferences sp =
+<pre>SharedPreferences sp =
context.getSharedPreferences(PREFS, Context.MODE_WORLD_READABLE);
boolean appUsed = sp.getBoolean(PREFS_APPUSED, false);
long updateInterval = sp.getLong(PREFS_INTERVAL, DEFAULT_REFRESH_INTERVAL);
if (!appUsed)
- if ((updateInterval *= 2) > MAX_REFRESH_INTERVAL)
+ if ((updateInterval *= 2) > MAX_REFRESH_INTERVAL)
updateInterval = MAX_REFRESH_INTERVAL;
Editor spEdit = sp.edit();
@@ -92,10 +92,10 @@
<pre>private void retryIn(long interval) {
boolean success = attemptTransfer();
-
+
if (!success) {
- retryIn(interval*2 < MAX_RETRY_INTERVAL ?
- interval*2 : MAX_RETRY_INTERVAL);
+ retryIn(interval*2 < MAX_RETRY_INTERVAL ?
+ interval*2 : MAX_RETRY_INTERVAL);
}
}</pre>
diff --git a/docs/html/training/gestures/detector.jd b/docs/html/training/gestures/detector.jd
index 97f039c..0624e86 100644
--- a/docs/html/training/gestures/detector.jd
+++ b/docs/html/training/gestures/detector.jd
@@ -48,48 +48,48 @@
<ol>
<li>Gathering data about touch events.</li>
-
+
<li>Interpreting the data to see if it meets the criteria for any of the
-gestures your app supports. </li>
+gestures your app supports. </li>
</ol>
<h4>Support Library Classes</h4>
<p>The examples in this lesson use the {@link android.support.v4.view.GestureDetectorCompat}
-and {@link android.support.v4.view.MotionEventCompat} classes. These classes are in the
+and {@link android.support.v4.view.MotionEventCompat} classes. These classes are in the
<a href="{@docRoot}tools/support-library/index.html">Support Library</a>. You should use
-Support Library classes where possible to provide compatibility with devices
-running Android 1.6 and higher. Note that {@link android.support.v4.view.MotionEventCompat} is <em>not</em> a
-replacement for the {@link android.view.MotionEvent} class. Rather, it provides static utility
-methods to which you pass your {@link android.view.MotionEvent} object in order to receive
+Support Library classes where possible to provide compatibility with devices
+running Android 1.6 and higher. Note that {@link android.support.v4.view.MotionEventCompat} is <em>not</em> a
+replacement for the {@link android.view.MotionEvent} class. Rather, it provides static utility
+methods to which you pass your {@link android.view.MotionEvent} object in order to receive
the desired action associated with that event.</p>
<h2 id="data">Gather Data</h2>
<p>When a user places one or more fingers on the screen, this triggers the
-callback {@link android.view.View#onTouchEvent onTouchEvent()}
+callback {@link android.view.View#onTouchEvent onTouchEvent()}
on the View that received the touch events.
-For each sequence of touch events (position, pressure, size, addition of another finger, etc.)
+For each sequence of touch events (position, pressure, size, addition of another finger, etc.)
that is ultimately identified as a gesture,
{@link android.view.View#onTouchEvent onTouchEvent()} is fired several times.</p>
<p>The gesture starts when the user first touches the screen, continues as the system tracks
the position of the user's finger(s), and ends by capturing the final event of
-the user's fingers leaving the screen. Throughout this interaction,
-the {@link android.view.MotionEvent} delivered to {@link android.view.View#onTouchEvent onTouchEvent()}
-provides the details of every interaction. Your app can use the data provided by the {@link android.view.MotionEvent}
+the user's fingers leaving the screen. Throughout this interaction,
+the {@link android.view.MotionEvent} delivered to {@link android.view.View#onTouchEvent onTouchEvent()}
+provides the details of every interaction. Your app can use the data provided by the {@link android.view.MotionEvent}
to determine if a gesture it cares
about happened.</p>
<h3>Capturing touch events for an Activity or View</h3>
-<p><p>To intercept touch events in an Activity or View, override
+<p><p>To intercept touch events in an Activity or View, override
the {@link android.view.View#onTouchEvent onTouchEvent()} callback.</p>
-<p>The following snippet uses
+<p>The following snippet uses
{@link android.support.v4.view.MotionEventCompat#getActionMasked getActionMasked()}
-to extract the action the user performed from the {@code event} parameter. This gives you the raw
+to extract the action the user performed from the {@code event} parameter. This gives you the raw
data you need to determine if a gesture you care about occurred:</p>
<pre>
@@ -98,10 +98,10 @@
// This example shows an Activity, but you would use the same approach if
// you were subclassing a View.
@Override
-public boolean onTouchEvent(MotionEvent event){
-
+public boolean onTouchEvent(MotionEvent event){
+
int action = MotionEventCompat.getActionMasked(event);
-
+
switch(action) {
case (MotionEvent.ACTION_DOWN) :
Log.d(DEBUG_TAG,"Action was DOWN");
@@ -118,10 +118,10 @@
case (MotionEvent.ACTION_OUTSIDE) :
Log.d(DEBUG_TAG,"Movement occurred outside bounds " +
"of current screen element");
- return true;
- default :
+ return true;
+ default :
return super.onTouchEvent(event);
- }
+ }
}</pre>
<p>You can then do your own processing on these events to determine if a
@@ -143,22 +143,22 @@
events without subclassing an existing {@link android.view.View}. For
example:</p>
-<pre>View myView = findViewById(R.id.my_view);
+<pre>View myView = findViewById(R.id.my_view);
myView.setOnTouchListener(new OnTouchListener() {
public boolean onTouch(View v, MotionEvent event) {
- // ... Respond to touch events
+ // ... Respond to touch events
return true;
}
});</pre>
-<p>Beware of creating a listener that returns {@code false} for the
-{@link android.view.MotionEvent#ACTION_DOWN} event. If you do this, the listener will
-not be called for the subsequent {@link android.view.MotionEvent#ACTION_MOVE}
+<p>Beware of creating a listener that returns {@code false} for the
+{@link android.view.MotionEvent#ACTION_DOWN} event. If you do this, the listener will
+not be called for the subsequent {@link android.view.MotionEvent#ACTION_MOVE}
and {@link android.view.MotionEvent#ACTION_UP} string of events. This is because
{@link android.view.MotionEvent#ACTION_DOWN} is the starting point for all touch events.</p>
-<p>If you are creating a custom View, you can override
-{@link android.view.View#onTouchEvent onTouchEvent()},
+<p>If you are creating a custom View, you can override
+{@link android.view.View#onTouchEvent onTouchEvent()},
as described above.</p>
<h2 id="detect">Detect Gestures</h2>
@@ -168,24 +168,24 @@
android.view.GestureDetector.OnGestureListener#onDown onDown()}, {@link
android.view.GestureDetector.OnGestureListener#onLongPress onLongPress()},
{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}, and so
-on. You can use {@link android.view.GestureDetector} in conjunction with the
+on. You can use {@link android.view.GestureDetector} in conjunction with the
{@link android.view.View#onTouchEvent onTouchEvent()}
method described above.</p>
<h3>Detecting All Supported Gestures</h3>
-<p>When you instantiate a {@link android.support.v4.view.GestureDetectorCompat}
-object, one of the parameters it takes is a class that implements the
-{@link android.view.GestureDetector.OnGestureListener} interface.
-{@link android.view.GestureDetector.OnGestureListener} notifies users when
-a particular touch event has occurred. To make it possible for your
-{@link android.view.GestureDetector} object to receive events, you override
-the View or Activity's {@link android.view.View#onTouchEvent onTouchEvent()} method,
+<p>When you instantiate a {@link android.support.v4.view.GestureDetectorCompat}
+object, one of the parameters it takes is a class that implements the
+{@link android.view.GestureDetector.OnGestureListener} interface.
+{@link android.view.GestureDetector.OnGestureListener} notifies users when
+a particular touch event has occurred. To make it possible for your
+{@link android.view.GestureDetector} object to receive events, you override
+the View or Activity's {@link android.view.View#onTouchEvent onTouchEvent()} method,
and pass along all observed events to the detector instance.</p>
-<p>In the following snippet, a return value of {@code true} from the individual
+<p>In the following snippet, a return value of {@code true} from the individual
<code>on<em><TouchEvent></em></code> methods indicates that you
have handled the touch event. A return value of {@code false} passes events down
through the view stack until the touch has been successfully handled.</p>
@@ -195,14 +195,14 @@
android.view.MotionEvent} are for each touch event. You will realize how much
data is being generated for even simple interactions.</p>
-<pre>public class MainActivity extends Activity implements
+<pre>public class MainActivity extends Activity implements
GestureDetector.OnGestureListener,
GestureDetector.OnDoubleTapListener{
-
- private static final String DEBUG_TAG = "Gestures";
- private GestureDetectorCompat mDetector;
- // Called when the activity is first created.
+ private static final String DEBUG_TAG = "Gestures";
+ private GestureDetectorCompat mDetector;
+
+ // Called when the activity is first created.
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -216,21 +216,21 @@
mDetector.setOnDoubleTapListener(this);
}
- @Override
- public boolean onTouchEvent(MotionEvent event){
+ @Override
+ public boolean onTouchEvent(MotionEvent event){
this.mDetector.onTouchEvent(event);
// Be sure to call the superclass implementation
return super.onTouchEvent(event);
}
@Override
- public boolean onDown(MotionEvent event) {
- Log.d(DEBUG_TAG,"onDown: " + event.toString());
+ public boolean onDown(MotionEvent event) {
+ Log.d(DEBUG_TAG,"onDown: " + event.toString());
return true;
}
@Override
- public boolean onFling(MotionEvent event1, MotionEvent event2,
+ public boolean onFling(MotionEvent event1, MotionEvent event2,
float velocityX, float velocityY) {
Log.d(DEBUG_TAG, "onFling: " + event1.toString()+event2.toString());
return true;
@@ -238,7 +238,7 @@
@Override
public void onLongPress(MotionEvent event) {
- Log.d(DEBUG_TAG, "onLongPress: " + event.toString());
+ Log.d(DEBUG_TAG, "onLongPress: " + event.toString());
}
@Override
@@ -294,23 +294,23 @@
android.view.GestureDetector.OnGestureListener#onFling onFling()} and {@link
android.view.GestureDetector.OnGestureListener#onDown onDown()}.</p>
-<p>Whether or not you use {@link android.view.GestureDetector.OnGestureListener},
-it's best practice to implement an
-{@link android.view.GestureDetector.OnGestureListener#onDown onDown()}
-method that returns {@code true}. This is because all gestures begin with an
-{@link android.view.GestureDetector.OnGestureListener#onDown onDown()} message. If you return
-{@code false} from {@link android.view.GestureDetector.OnGestureListener#onDown onDown()},
-as {@link android.view.GestureDetector.SimpleOnGestureListener} does by default,
-the system assumes that you want to ignore the rest of the gesture, and the other methods of
-{@link android.view.GestureDetector.OnGestureListener} never get called.
-This has the potential to cause unexpected problems in your app.
-The only time you should return {@code false} from
-{@link android.view.GestureDetector.OnGestureListener#onDown onDown()}
+<p>Whether or not you use {@link android.view.GestureDetector.OnGestureListener},
+it's best practice to implement an
+{@link android.view.GestureDetector.OnGestureListener#onDown onDown()}
+method that returns {@code true}. This is because all gestures begin with an
+{@link android.view.GestureDetector.OnGestureListener#onDown onDown()} message. If you return
+{@code false} from {@link android.view.GestureDetector.OnGestureListener#onDown onDown()},
+as {@link android.view.GestureDetector.SimpleOnGestureListener} does by default,
+the system assumes that you want to ignore the rest of the gesture, and the other methods of
+{@link android.view.GestureDetector.OnGestureListener} never get called.
+This has the potential to cause unexpected problems in your app.
+The only time you should return {@code false} from
+{@link android.view.GestureDetector.OnGestureListener#onDown onDown()}
is if you truly want to ignore an entire gesture. </p>
-<pre>public class MainActivity extends Activity {
-
- private GestureDetectorCompat mDetector;
+<pre>public class MainActivity extends Activity {
+
+ private GestureDetectorCompat mDetector;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -319,23 +319,23 @@
mDetector = new GestureDetectorCompat(this, new MyGestureListener());
}
- @Override
- public boolean onTouchEvent(MotionEvent event){
+ @Override
+ public boolean onTouchEvent(MotionEvent event){
this.mDetector.onTouchEvent(event);
return super.onTouchEvent(event);
}
-
+
class MyGestureListener extends GestureDetector.SimpleOnGestureListener {
- private static final String DEBUG_TAG = "Gestures";
-
+ private static final String DEBUG_TAG = "Gestures";
+
@Override
- public boolean onDown(MotionEvent event) {
- Log.d(DEBUG_TAG,"onDown: " + event.toString());
+ public boolean onDown(MotionEvent event) {
+ Log.d(DEBUG_TAG,"onDown: " + event.toString());
return true;
}
@Override
- public boolean onFling(MotionEvent event1, MotionEvent event2,
+ public boolean onFling(MotionEvent event1, MotionEvent event2,
float velocityX, float velocityY) {
Log.d(DEBUG_TAG, "onFling: " + event1.toString()+event2.toString());
return true;
diff --git a/docs/html/training/gestures/index.jd b/docs/html/training/gestures/index.jd
index 260cfff..1b8f4c1 100644
--- a/docs/html/training/gestures/index.jd
+++ b/docs/html/training/gestures/index.jd
@@ -48,7 +48,7 @@
provide users with a consistent, intuitive experience, your app should follow
the accepted Android conventions for touch gestures. The <a
href="http://developer.android.com/design/patterns/gestures.html">Gestures
-design guide</a><a href="{@docRoot}design/patterns/notifications.html"></a>
+design guide</a><a href="https://material.google.com/patterns/notifications.html"></a>
shows you how to use common gestures in Android apps. Also see the Design Guide
for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a>. </p>
@@ -60,7 +60,7 @@
<strong><a href="detector.html">Detecting Common Gestures</a></strong>
</dt>
<dd>
- Learn how to detect basic touch gestures such as scrolling, flinging, and double-tapping, using
+ Learn how to detect basic touch gestures such as scrolling, flinging, and double-tapping, using
{@link android.view.GestureDetector}.
</dd>
@@ -84,7 +84,7 @@
</dt>
<dd>
Learn how to detect multi-pointer (finger) gestures.
- </dd>
+ </dd>
<dt>
<strong><a href="scale.html">Dragging and Scaling</a></strong>
</dt>
diff --git a/docs/html/training/gestures/movement.jd b/docs/html/training/gestures/movement.jd
index ed4928e..0a611b3 100644
--- a/docs/html/training/gestures/movement.jd
+++ b/docs/html/training/gestures/movement.jd
@@ -55,13 +55,13 @@
To help apps distinguish between movement-based gestures (such as a swipe) and
non-movement gestures (such as a single tap), Android includes the notion of
"touch slop." Touch slop refers to the distance in pixels a user's touch can wander
-before the gesture is interpreted as a movement-based gesture. For more discussion of this
+before the gesture is interpreted as a movement-based gesture. For more discussion of this
topic, see <a href="viewgroup.html#vc">Managing Touch Events in a ViewGroup</a>.</p>
<p>There are several different ways to track movement in a gesture, depending on
-the needs of your application. For example:</p>
+the needs of your application. For example:</p>
<ul>
@@ -89,8 +89,8 @@
<p> You could have a movement-based gesture that is simply based on the distance and/or direction the pointer traveled. But velocity often is a
determining factor in tracking a gesture's characteristics or even deciding
whether the gesture occurred. To make velocity calculation easier, Android
-provides the {@link android.view.VelocityTracker} class and the
-{@link android.support.v4.view.VelocityTrackerCompat} class in the
+provides the {@link android.view.VelocityTracker} class and the
+{@link android.support.v4.view.VelocityTrackerCompat} class in the
<a href="{@docRoot}tools/support-library/index.html">Support Library</a>.
{@link
android.view.VelocityTracker} helps you track the velocity of touch events. This
@@ -98,7 +98,7 @@
gesture, such as a fling.</p>
-<p>Here is a simple example that illustrates the purpose of the methods in the
+<p>Here is a simple example that illustrates the purpose of the methods in the
{@link android.view.VelocityTracker} API:</p>
<pre>public class MainActivity extends Activity {
@@ -126,16 +126,16 @@
break;
case MotionEvent.ACTION_MOVE:
mVelocityTracker.addMovement(event);
- // When you want to determine the velocity, call
- // computeCurrentVelocity(). Then call getXVelocity()
- // and getYVelocity() to retrieve the velocity for each pointer ID.
+ // When you want to determine the velocity, call
+ // computeCurrentVelocity(). Then call getXVelocity()
+ // and getYVelocity() to retrieve the velocity for each pointer ID.
mVelocityTracker.computeCurrentVelocity(1000);
// Log velocity of pixels per second
// Best practice to use VelocityTrackerCompat where possible.
- Log.d("", "X velocity: " +
- VelocityTrackerCompat.getXVelocity(mVelocityTracker,
+ Log.d("", "X velocity: " +
+ VelocityTrackerCompat.getXVelocity(mVelocityTracker,
pointerId));
- Log.d("", "Y velocity: " +
+ Log.d("", "Y velocity: " +
VelocityTrackerCompat.getYVelocity(mVelocityTracker,
pointerId));
break;
@@ -150,8 +150,8 @@
}
</pre>
-<p class="note"><strong>Note:</strong> Note that you should calculate velocity after an
-{@link android.view.MotionEvent#ACTION_MOVE} event,
-not after {@link android.view.MotionEvent#ACTION_UP}. After an {@link android.view.MotionEvent#ACTION_UP},
+<p class="note"><strong>Note:</strong> Note that you should calculate velocity after an
+{@link android.view.MotionEvent#ACTION_MOVE} event,
+not after {@link android.view.MotionEvent#ACTION_UP}. After an {@link android.view.MotionEvent#ACTION_UP},
the X and Y velocities will be 0.
</p>
diff --git a/docs/html/training/gestures/multi.jd b/docs/html/training/gestures/multi.jd
index 5840482..21860fc 100644
--- a/docs/html/training/gestures/multi.jd
+++ b/docs/html/training/gestures/multi.jd
@@ -47,15 +47,15 @@
<h2 id="track">Track Multiple Pointers</h2>
-<p>When multiple pointers touch the screen at the same time, the system generates the
+<p>When multiple pointers touch the screen at the same time, the system generates the
following touch events:</p>
<ul>
- <li>{@link android.view.MotionEvent#ACTION_DOWN}—For the first pointer that
-touches the screen. This starts the gesture. The pointer data for this pointer is
+ <li>{@link android.view.MotionEvent#ACTION_DOWN}—For the first pointer that
+touches the screen. This starts the gesture. The pointer data for this pointer is
always at index 0 in the {@link android.view.MotionEvent}.</li>
- <li>{@link android.support.v4.view.MotionEventCompat#ACTION_POINTER_DOWN}—For
-extra pointers that enter the screen beyond the first. The pointer data for this
+ <li>{@link android.support.v4.view.MotionEventCompat#ACTION_POINTER_DOWN}—For
+extra pointers that enter the screen beyond the first. The pointer data for this
pointer is at the index returned by {@link android.support.v4.view.MotionEventCompat#getActionIndex getActionIndex()}.</li>
<li>{@link android.view.MotionEvent#ACTION_MOVE}—A change has happened during a press gesture.</li>
<li>{@link android.support.v4.view.MotionEventCompat#ACTION_POINTER_UP}—Sent when a non-primary pointer goes up.</li>
@@ -66,20 +66,20 @@
android.view.MotionEvent} via each pointer's index and ID:</p>
<ul>
-<li><strong>Index</strong>: A {@link android.view.MotionEvent} effectively
-stores information about each pointer in an array. The index of a pointer is its position
+<li><strong>Index</strong>: A {@link android.view.MotionEvent} effectively
+stores information about each pointer in an array. The index of a pointer is its position
within this array. Most of the {@link
android.view.MotionEvent} methods you use to interact with pointers take the
pointer index as a parameter, not the pointer ID. </li>
-
-
+
+
<li><strong>ID</strong>: Each pointer also has an ID mapping that stays
-persistent across touch events to allow tracking an individual pointer across
+persistent across touch events to allow tracking an individual pointer across
the entire gesture.</li>
-
+
</ul>
-<p>The order in which individual pointers appear within a motion event is
+<p>The order in which individual pointers appear within a motion event is
undefined. Thus the index of a pointer can change from one event to the
next, but the pointer ID of a pointer is guaranteed to remain constant as long
as the pointer remains active. Use the {@link
@@ -91,7 +91,7 @@
<pre>private int mActivePointerId;
-
+
public boolean onTouchEvent(MotionEvent event) {
....
// Get the pointer ID
@@ -99,7 +99,7 @@
// ... Many touch events later...
- // Use the pointer ID to find the index of the active pointer
+ // Use the pointer ID to find the index of the active pointer
// and fetch its position
int pointerIndex = event.findPointerIndex(mActivePointerId);
// Get the pointer's current position
@@ -109,25 +109,25 @@
<h2 id="action">Get a MotionEvent's Action</h2>
-<p>You should always use the method
-{@link android.view.MotionEvent#getActionMasked getActionMasked()} (or better yet, the compatability version
-{@link android.support.v4.view.MotionEventCompat#getActionMasked MotionEventCompat.getActionMasked()}) to retrieve
+<p>You should always use the method
+{@link android.view.MotionEvent#getActionMasked getActionMasked()} (or better yet, the compatability version
+{@link android.support.v4.view.MotionEventCompat#getActionMasked MotionEventCompat.getActionMasked()}) to retrieve
the action of a
-{@link android.view.MotionEvent}. Unlike the older {@link android.view.MotionEvent#getAction getAction()}
-method, {@link android.support.v4.view.MotionEventCompat#getActionMasked getActionMasked()} is designed to work with
-multiple pointers. It returns the masked action
-being performed, without including the pointer index bits. You can then use
-{@link android.support.v4.view.MotionEventCompat#getActionIndex getActionIndex()} to return the index of
+{@link android.view.MotionEvent}. Unlike the older {@link android.view.MotionEvent#getAction getAction()}
+method, {@link android.support.v4.view.MotionEventCompat#getActionMasked getActionMasked()} is designed to work with
+multiple pointers. It returns the masked action
+being performed, without including the pointer index bits. You can then use
+{@link android.support.v4.view.MotionEventCompat#getActionIndex getActionIndex()} to return the index of
the pointer associated with the action. This is illustrated in the snippet below.</p>
-<p class="note"><strong>Note:</strong> This example uses the
+<p class="note"><strong>Note:</strong> This example uses the
{@link android.support.v4.view.MotionEventCompat}
-class. This class is in the
+class. This class is in the
<a href="{@docRoot}tools/support-library/index.html">Support Library</a>. You should use
{@link android.support.v4.view.MotionEventCompat} to provide the best support for a wide range of
-platforms. Note that {@link android.support.v4.view.MotionEventCompat} is <em>not</em> a
-replacement for the {@link android.view.MotionEvent} class. Rather, it provides static utility
-methods to which you pass your {@link android.view.MotionEvent} object in order to receive
+platforms. Note that {@link android.support.v4.view.MotionEventCompat} is <em>not</em> a
+replacement for the {@link android.view.MotionEvent} class. Rather, it provides static utility
+methods to which you pass your {@link android.view.MotionEvent} object in order to receive
the desired action associated with that event.</p>
<pre>int action = MotionEventCompat.getActionMasked(event);
@@ -137,17 +137,17 @@
int yPos = -1;
Log.d(DEBUG_TAG,"The action is " + actionToString(action));
-
+
if (event.getPointerCount() > 1) {
- Log.d(DEBUG_TAG,"Multitouch event");
- // The coordinates of the current screen contact, relative to
- // the responding View or Activity.
+ Log.d(DEBUG_TAG,"Multitouch event");
+ // The coordinates of the current screen contact, relative to
+ // the responding View or Activity.
xPos = (int)MotionEventCompat.getX(event, index);
yPos = (int)MotionEventCompat.getY(event, index);
} else {
// Single touch event
- Log.d(DEBUG_TAG,"Single touch event");
+ Log.d(DEBUG_TAG,"Single touch event");
xPos = (int)MotionEventCompat.getX(event, index);
yPos = (int)MotionEventCompat.getY(event, index);
}
@@ -156,7 +156,7 @@
// Given an action int, returns a string description
public static String actionToString(int action) {
switch (action) {
-
+
case MotionEvent.ACTION_DOWN: return "Down";
case MotionEvent.ACTION_MOVE: return "Move";
case MotionEvent.ACTION_POINTER_DOWN: return "Pointer Down";
@@ -168,7 +168,7 @@
return "";
}</pre>
-
+
<p>For more discussion of multi-touch and some examples, see the lesson <a href="scale.html">Dragging and Scaling</a>.
diff --git a/docs/html/training/gestures/scale.jd b/docs/html/training/gestures/scale.jd
index f2e4eb8..d4aa916 100644
--- a/docs/html/training/gestures/scale.jd
+++ b/docs/html/training/gestures/scale.jd
@@ -44,13 +44,13 @@
<p>This lesson describes how to use touch gestures to drag and scale on-screen
objects, using {@link android.view.View#onTouchEvent onTouchEvent()} to intercept
-touch events.
+touch events.
</p>
<h2 id="drag">Drag an Object</h2>
-<p class="note">If you are targeting Android 3.0 or higher, you can use the built-in drag-and-drop event
-listeners with {@link android.view.View.OnDragListener}, as described in
+<p class="note">If you are targeting Android 3.0 or higher, you can use the built-in drag-and-drop event
+listeners with {@link android.view.View.OnDragListener}, as described in
<a href="{@docRoot}guide/topics/ui/drag-drop.html">Drag and Drop</a>.
<p>A common operation for a touch gesture is to use it to drag an object across
@@ -66,14 +66,14 @@
individual pointers, it will regard the second pointer as the default and move
the image to that location.</li>
-<li>To prevent this from happening, your app needs to distinguish between the
-original pointer and any follow-on pointers. To do this, it tracks the
-{@link android.view.MotionEvent#ACTION_POINTER_DOWN} and
-{@link android.view.MotionEvent#ACTION_POINTER_UP} events described in
-<a href="multi.html">Handling Multi-Touch Gestures</a>.
-{@link android.view.MotionEvent#ACTION_POINTER_DOWN} and
-{@link android.view.MotionEvent#ACTION_POINTER_UP} are
-passed to the {@link android.view.View#onTouchEvent onTouchEvent()} callback
+<li>To prevent this from happening, your app needs to distinguish between the
+original pointer and any follow-on pointers. To do this, it tracks the
+{@link android.view.MotionEvent#ACTION_POINTER_DOWN} and
+{@link android.view.MotionEvent#ACTION_POINTER_UP} events described in
+<a href="multi.html">Handling Multi-Touch Gestures</a>.
+{@link android.view.MotionEvent#ACTION_POINTER_DOWN} and
+{@link android.view.MotionEvent#ACTION_POINTER_UP} are
+passed to the {@link android.view.View#onTouchEvent onTouchEvent()} callback
whenever a secondary pointer goes down or up. </li>
@@ -90,16 +90,16 @@
<p>The following snippet enables a user to drag an object around on the screen. It records the initial
position of the active pointer, calculates the distance the pointer traveled, and moves the object to the
new position. It correctly manages the possibility of additional pointers, as described
-above.</p>
+above.</p>
-<p>Notice that the snippet uses the {@link android.view.MotionEvent#getActionMasked getActionMasked()} method.
-You should always use this method (or better yet, the compatability version
-{@link android.support.v4.view.MotionEventCompat#getActionMasked MotionEventCompat.getActionMasked()})
+<p>Notice that the snippet uses the {@link android.view.MotionEvent#getActionMasked getActionMasked()} method.
+You should always use this method (or better yet, the compatability version
+{@link android.support.v4.view.MotionEventCompat#getActionMasked MotionEventCompat.getActionMasked()})
to retrieve the action of a
-{@link android.view.MotionEvent}. Unlike the older
-{@link android.view.MotionEvent#getAction getAction()}
-method, {@link android.support.v4.view.MotionEventCompat#getActionMasked getActionMasked()}
-is designed to work with multiple pointers. It returns the masked action
+{@link android.view.MotionEvent}. Unlike the older
+{@link android.view.MotionEvent#getAction getAction()}
+method, {@link android.support.v4.view.MotionEventCompat#getActionMasked getActionMasked()}
+is designed to work with multiple pointers. It returns the masked action
being performed, without including the pointer index bits.</p>
<pre>// The ‘active pointer’ is the one currently moving our object.
@@ -109,15 +109,15 @@
public boolean onTouchEvent(MotionEvent ev) {
// Let the ScaleGestureDetector inspect all events.
mScaleDetector.onTouchEvent(ev);
-
- final int action = MotionEventCompat.getActionMasked(ev);
-
- switch (action) {
+
+ final int action = MotionEventCompat.getActionMasked(ev);
+
+ switch (action) {
case MotionEvent.ACTION_DOWN: {
- final int pointerIndex = MotionEventCompat.getActionIndex(ev);
- final float x = MotionEventCompat.getX(ev, pointerIndex);
- final float y = MotionEventCompat.getY(ev, pointerIndex);
-
+ final int pointerIndex = MotionEventCompat.getActionIndex(ev);
+ final float x = MotionEventCompat.getX(ev, pointerIndex);
+ final float y = MotionEventCompat.getY(ev, pointerIndex);
+
// Remember where we started (for dragging)
mLastTouchX = x;
mLastTouchY = y;
@@ -125,15 +125,15 @@
mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
break;
}
-
+
case MotionEvent.ACTION_MOVE: {
// Find the index of the active pointer and fetch its position
- final int pointerIndex =
- MotionEventCompat.findPointerIndex(ev, mActivePointerId);
-
+ final int pointerIndex =
+ MotionEventCompat.findPointerIndex(ev, mActivePointerId);
+
final float x = MotionEventCompat.getX(ev, pointerIndex);
final float y = MotionEventCompat.getY(ev, pointerIndex);
-
+
// Calculate the distance moved
final float dx = x - mLastTouchX;
final float dy = y - mLastTouchY;
@@ -149,62 +149,62 @@
break;
}
-
+
case MotionEvent.ACTION_UP: {
mActivePointerId = INVALID_POINTER_ID;
break;
}
-
+
case MotionEvent.ACTION_CANCEL: {
mActivePointerId = INVALID_POINTER_ID;
break;
}
-
+
case MotionEvent.ACTION_POINTER_UP: {
-
- final int pointerIndex = MotionEventCompat.getActionIndex(ev);
- final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
+
+ final int pointerIndex = MotionEventCompat.getActionIndex(ev);
+ final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
if (pointerId == mActivePointerId) {
// This was our active pointer going up. Choose a new
// active pointer and adjust accordingly.
final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
- mLastTouchX = MotionEventCompat.getX(ev, newPointerIndex);
- mLastTouchY = MotionEventCompat.getY(ev, newPointerIndex);
+ mLastTouchX = MotionEventCompat.getX(ev, newPointerIndex);
+ mLastTouchY = MotionEventCompat.getY(ev, newPointerIndex);
mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
}
break;
}
- }
+ }
return true;
}</pre>
<h2 id="pan">Drag to Pan</h2>
-<p>The previous section showed an example of dragging an object around the screen. Another
-common scenario is <em>panning</em>, which is when a user's dragging motion causes scrolling
-in both the x and y axes. The above snippet directly intercepted the {@link android.view.MotionEvent}
-actions to implement dragging. The snippet in this section takes advantage of the platform's
-built-in support for common gestures. It overrides
-{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} in
+<p>The previous section showed an example of dragging an object around the screen. Another
+common scenario is <em>panning</em>, which is when a user's dragging motion causes scrolling
+in both the x and y axes. The above snippet directly intercepted the {@link android.view.MotionEvent}
+actions to implement dragging. The snippet in this section takes advantage of the platform's
+built-in support for common gestures. It overrides
+{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} in
{@link android.view.GestureDetector.SimpleOnGestureListener}.</p>
-<p>To provide a little more context, {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()}
-is called when a user is dragging his finger to pan the content.
-{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} is only called when
-a finger is down; as soon as the finger is lifted from the screen, the gesture either ends,
-or a fling gesture is started (if the finger was moving with some speed just before it was lifted).
+<p>To provide a little more context, {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()}
+is called when a user is dragging his finger to pan the content.
+{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} is only called when
+a finger is down; as soon as the finger is lifted from the screen, the gesture either ends,
+or a fling gesture is started (if the finger was moving with some speed just before it was lifted).
For more discussion of scrolling vs. flinging, see <a href="scroll.html">Animating a Scroll Gesture</a>.</p>
<p>Here is the snippet for {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()}:
-<pre>// The current viewport. This rectangle represents the currently visible
-// chart domain and range.
-private RectF mCurrentViewport =
+<pre>// The current viewport. This rectangle represents the currently visible
+// chart domain and range.
+private RectF mCurrentViewport =
new RectF(AXIS_X_MIN, AXIS_Y_MIN, AXIS_X_MAX, AXIS_Y_MAX);
-// The current destination rectangle (in pixel coordinates) into which the
+// The current destination rectangle (in pixel coordinates) into which the
// chart data should be drawn.
private Rect mContentRect;
@@ -213,18 +213,18 @@
...
@Override
-public boolean onScroll(MotionEvent e1, MotionEvent e2,
+public boolean onScroll(MotionEvent e1, MotionEvent e2,
float distanceX, float distanceY) {
// Scrolling uses math based on the viewport (as opposed to math using pixels).
-
+
// Pixel offset is the offset in screen pixels, while viewport offset is the
- // offset within the current viewport.
- float viewportOffsetX = distanceX * mCurrentViewport.width()
+ // offset within the current viewport.
+ float viewportOffsetX = distanceX * mCurrentViewport.width()
/ mContentRect.width();
- float viewportOffsetY = -distanceY * mCurrentViewport.height()
+ float viewportOffsetY = -distanceY * mCurrentViewport.height()
/ mContentRect.height();
...
- // Updates the viewport, refreshes the display.
+ // Updates the viewport, refreshes the display.
setViewportBottomLeft(
mCurrentViewport.left + viewportOffsetX,
mCurrentViewport.bottom + viewportOffsetY);
@@ -232,20 +232,20 @@
return true;
}</pre>
-<p>The implementation of {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()}
+<p>The implementation of {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()}
scrolls the viewport in response to the touch gesture:</p>
<pre>
/**
* Sets the current viewport (defined by mCurrentViewport) to the given
- * X and Y positions. Note that the Y value represents the topmost pixel position,
+ * X and Y positions. Note that the Y value represents the topmost pixel position,
* and thus the bottom of the mCurrentViewport rectangle.
*/
private void setViewportBottomLeft(float x, float y) {
/*
- * Constrains within the scroll range. The scroll range is simply the viewport
- * extremes (AXIS_X_MAX, etc.) minus the viewport size. For example, if the
- * extremes were 0 and 10, and the viewport size was 2, the scroll range would
+ * Constrains within the scroll range. The scroll range is simply the viewport
+ * extremes (AXIS_X_MAX, etc.) minus the viewport size. For example, if the
+ * extremes were 0 and 10, and the viewport size was 2, the scroll range would
* be 0 to 8.
*/
@@ -270,11 +270,11 @@
android.view.GestureDetector} and {@link android.view.ScaleGestureDetector} can
be used together when you want a view to recognize additional gestures.</p>
-<p>To report detected gesture events, gesture detectors use listener objects
-passed to their constructors. {@link android.view.ScaleGestureDetector} uses
-{@link android.view.ScaleGestureDetector.OnScaleGestureListener}.
-Android provides
-{@link android.view.ScaleGestureDetector.SimpleOnScaleGestureListener}
+<p>To report detected gesture events, gesture detectors use listener objects
+passed to their constructors. {@link android.view.ScaleGestureDetector} uses
+{@link android.view.ScaleGestureDetector.OnScaleGestureListener}.
+Android provides
+{@link android.view.ScaleGestureDetector.SimpleOnScaleGestureListener}
as a helper class that you can extend if you don’t care about all of the reported events.</p>
@@ -311,7 +311,7 @@
canvas.restore();
}
-private class ScaleListener
+private class ScaleListener
extends ScaleGestureDetector.SimpleOnScaleGestureListener {
@Override
public boolean onScale(ScaleGestureDetector detector) {
@@ -329,14 +329,14 @@
<h3>More complex scaling example</h3>
-<p>Here is a more complex example from the {@code InteractiveChart} sample provided with this class.
+<p>Here is a more complex example from the {@code InteractiveChart} sample provided with this class.
The {@code InteractiveChart} sample supports both scrolling (panning) and scaling with multiple fingers,
-using the {@link android.view.ScaleGestureDetector} "span"
-({@link android.view.ScaleGestureDetector#getCurrentSpanX getCurrentSpanX/Y}) and
+using the {@link android.view.ScaleGestureDetector} "span"
+({@link android.view.ScaleGestureDetector#getCurrentSpanX getCurrentSpanX/Y}) and
"focus" ({@link android.view.ScaleGestureDetector#getFocusX getFocusX/Y}) features:</p>
<pre>@Override
-private RectF mCurrentViewport =
+private RectF mCurrentViewport =
new RectF(AXIS_X_MIN, AXIS_Y_MIN, AXIS_X_MAX, AXIS_Y_MAX);
private Rect mContentRect;
private ScaleGestureDetector mScaleGestureDetector;
@@ -399,7 +399,7 @@
0,
0);
mCurrentViewport.right = mCurrentViewport.left + newWidth;
- mCurrentViewport.bottom = mCurrentViewport.top + newHeight;
+ mCurrentViewport.bottom = mCurrentViewport.top + newHeight;
...
// Invalidates the View to update the display.
ViewCompat.postInvalidateOnAnimation(InteractiveLineGraphView.this);
diff --git a/docs/html/training/gestures/scroll.jd b/docs/html/training/gestures/scroll.jd
index 4b82d69..374ceff 100644
--- a/docs/html/training/gestures/scroll.jd
+++ b/docs/html/training/gestures/scroll.jd
@@ -41,12 +41,12 @@
</div>
</div>
-<p>In Android, scrolling is typically achieved by using the
+<p>In Android, scrolling is typically achieved by using the
{@link android.widget.ScrollView}
-class. Any standard layout that might extend beyond the bounds of its container should be
-nested in a {@link android.widget.ScrollView} to provide a scrollable view that's
-managed by the framework. Implementing a custom scroller should only be
-necessary for special scenarios. This lesson describes such a scenario: displaying
+class. Any standard layout that might extend beyond the bounds of its container should be
+nested in a {@link android.widget.ScrollView} to provide a scrollable view that's
+managed by the framework. Implementing a custom scroller should only be
+necessary for special scenarios. This lesson describes such a scenario: displaying
a scrolling effect in response to touch gestures using <em>scrollers</em>.
@@ -54,8 +54,8 @@
android.widget.OverScroller}) to collect the data you need to produce a
scrolling animation in response to a touch event. They are similar, but
{@link android.widget.OverScroller}
-includes methods for indicating to users that they've reached the content edges
-after a pan or fling gesture. The {@code InteractiveChart} sample
+includes methods for indicating to users that they've reached the content edges
+after a pan or fling gesture. The {@code InteractiveChart} sample
uses the {@link android.widget.EdgeEffect} class
(actually the {@link android.support.v4.widget.EdgeEffectCompat} class)
to display a "glow" effect when users reach the content edges.</p>
@@ -68,7 +68,7 @@
<br />
Also note that you generally only need to use scrollers
when implementing scrolling yourself. {@link android.widget.ScrollView} and
-{@link android.widget.HorizontalScrollView} do all of this for you if you nest your
+{@link android.widget.HorizontalScrollView} do all of this for you if you nest your
layout within them.
</p>
@@ -86,71 +86,71 @@
<p>"Scrolling" is a word that can take on different meanings in Android, depending on the context.</p>
-<p><strong>Scrolling</strong> is the general process of moving the viewport (that is, the 'window'
-of content you're looking at). When scrolling is in both the x and y axes, it's called
-<em>panning</em>. The sample application provided with this class, {@code InteractiveChart}, illustrates
+<p><strong>Scrolling</strong> is the general process of moving the viewport (that is, the 'window'
+of content you're looking at). When scrolling is in both the x and y axes, it's called
+<em>panning</em>. The sample application provided with this class, {@code InteractiveChart}, illustrates
two different types of scrolling, dragging and flinging:</p>
<ul>
- <li><strong>Dragging</strong> is the type of scrolling that occurs when a user drags her
-finger across the touch screen. Simple dragging is often implemented by overriding
-{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} in
-{@link android.view.GestureDetector.OnGestureListener}. For more discussion of dragging, see
+ <li><strong>Dragging</strong> is the type of scrolling that occurs when a user drags her
+finger across the touch screen. Simple dragging is often implemented by overriding
+{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} in
+{@link android.view.GestureDetector.OnGestureListener}. For more discussion of dragging, see
<a href="scale.html">Dragging and Scaling</a>.</li>
- <li><strong>Flinging</strong> is the type of scrolling that occurs when a user
-drags and lifts her finger quickly. After the user lifts her finger, you generally
-want to keep scrolling (moving the viewport), but decelerate until the viewport stops moving.
-Flinging can be implemented by overriding
-{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}
-in {@link android.view.GestureDetector.OnGestureListener}, and by using
-a scroller object. This is the use
+ <li><strong>Flinging</strong> is the type of scrolling that occurs when a user
+drags and lifts her finger quickly. After the user lifts her finger, you generally
+want to keep scrolling (moving the viewport), but decelerate until the viewport stops moving.
+Flinging can be implemented by overriding
+{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}
+in {@link android.view.GestureDetector.OnGestureListener}, and by using
+a scroller object. This is the use
case that is the topic of this lesson.</li>
</ul>
-<p>It's common to use scroller objects
+<p>It's common to use scroller objects
in conjunction with a fling gesture, but they
can be used in pretty much any context where you want the UI to display
-scrolling in response to a touch event. For example, you could override
-{@link android.view.View#onTouchEvent onTouchEvent()} to process touch
-events directly, and produce a scrolling effect or a "snapping to page" animation
+scrolling in response to a touch event. For example, you could override
+{@link android.view.View#onTouchEvent onTouchEvent()} to process touch
+events directly, and produce a scrolling effect or a "snapping to page" animation
in response to those touch events.</p>
-<h2 id="#scroll">Implement Touch-Based Scrolling</h2>
+<h2 id="#scroll">Implement Touch-Based Scrolling</h2>
<p>This section describes how to use a scroller.
-The snippet shown below comes from the {@code InteractiveChart} sample
+The snippet shown below comes from the {@code InteractiveChart} sample
provided with this class.
-It uses a
-{@link android.view.GestureDetector}, and overrides the
-{@link android.view.GestureDetector.SimpleOnGestureListener} method
+It uses a
+{@link android.view.GestureDetector}, and overrides the
+{@link android.view.GestureDetector.SimpleOnGestureListener} method
{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}.
It uses {@link android.widget.OverScroller} to track the fling gesture.
-If the user reaches the content edges
+If the user reaches the content edges
after the fling gesture, the app displays a "glow" effect.
</p>
-<p class="note"><strong>Note:</strong> The {@code InteractiveChart} sample app displays a
-chart that you can zoom, pan, scroll, and so on. In the following snippet,
-{@code mContentRect} represents the rectangle coordinates within the view that the chart
-will be drawn into. At any given time, a subset of the total chart domain and range are drawn
-into this rectangular area.
-{@code mCurrentViewport} represents the portion of the chart that is currently
-visible in the screen. Because pixel offsets are generally treated as integers,
-{@code mContentRect} is of the type {@link android.graphics.Rect}. Because the
-graph domain and range are decimal/float values, {@code mCurrentViewport} is of
+<p class="note"><strong>Note:</strong> The {@code InteractiveChart} sample app displays a
+chart that you can zoom, pan, scroll, and so on. In the following snippet,
+{@code mContentRect} represents the rectangle coordinates within the view that the chart
+will be drawn into. At any given time, a subset of the total chart domain and range are drawn
+into this rectangular area.
+{@code mCurrentViewport} represents the portion of the chart that is currently
+visible in the screen. Because pixel offsets are generally treated as integers,
+{@code mContentRect} is of the type {@link android.graphics.Rect}. Because the
+graph domain and range are decimal/float values, {@code mCurrentViewport} is of
the type {@link android.graphics.RectF}.</p>
-<p>The first part of the snippet shows the implementation of
+<p>The first part of the snippet shows the implementation of
{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}:</p>
-<pre>// The current viewport. This rectangle represents the currently visible
+<pre>// The current viewport. This rectangle represents the currently visible
// chart domain and range. The viewport is the part of the app that the
// user manipulates via touch gestures.
-private RectF mCurrentViewport =
+private RectF mCurrentViewport =
new RectF(AXIS_X_MIN, AXIS_Y_MIN, AXIS_X_MAX, AXIS_Y_MAX);
-// The current destination rectangle (in pixel coordinates) into which the
+// The current destination rectangle (in pixel coordinates) into which the
// chart data should be drawn.
private Rect mContentRect;
@@ -171,7 +171,7 @@
}
...
@Override
- public boolean onFling(MotionEvent e1, MotionEvent e2,
+ public boolean onFling(MotionEvent e1, MotionEvent e2,
float velocityX, float velocityY) {
fling((int) -velocityX, (int) -velocityY);
return true;
@@ -184,10 +184,10 @@
// Flings use math in pixels (as opposed to math based on the viewport).
Point surfaceSize = computeScrollSurfaceSize();
mScrollerStartViewport.set(mCurrentViewport);
- int startX = (int) (surfaceSize.x * (mScrollerStartViewport.left -
+ int startX = (int) (surfaceSize.x * (mScrollerStartViewport.left -
AXIS_X_MIN) / (
AXIS_X_MAX - AXIS_X_MIN));
- int startY = (int) (surfaceSize.y * (AXIS_Y_MAX -
+ int startY = (int) (surfaceSize.y * (AXIS_Y_MAX -
mScrollerStartViewport.bottom) / (
AXIS_Y_MAX - AXIS_Y_MIN));
// Before flinging, aborts the current animation.
@@ -200,10 +200,10 @@
velocityX,
velocityY,
/*
- * Minimum and maximum scroll positions. The minimum scroll
- * position is generally zero and the maximum scroll position
- * is generally the content size less the screen size. So if the
- * content width is 1000 pixels and the screen width is 200
+ * Minimum and maximum scroll positions. The minimum scroll
+ * position is generally zero and the maximum scroll position
+ * is generally the content size less the screen size. So if the
+ * content width is 1000 pixels and the screen width is 200
* pixels, the maximum scroll offset should be 800 pixels.
*/
0, surfaceSize.x - mContentRect.width(),
@@ -216,21 +216,21 @@
ViewCompat.postInvalidateOnAnimation(this);
}</pre>
-<p>When {@link android.view.GestureDetector.OnGestureListener#onFling onFling()} calls
-{@link android.support.v4.view.ViewCompat#postInvalidateOnAnimation postInvalidateOnAnimation()},
-it triggers
-{@link android.view.View#computeScroll computeScroll()} to update the values for x and y.
+<p>When {@link android.view.GestureDetector.OnGestureListener#onFling onFling()} calls
+{@link android.support.v4.view.ViewCompat#postInvalidateOnAnimation postInvalidateOnAnimation()},
+it triggers
+{@link android.view.View#computeScroll computeScroll()} to update the values for x and y.
This is typically be done when a view child is animating a scroll using a scroller object, as in this example. </p>
-<p>Most views pass the scroller object's x and y position directly to
-{@link android.view.View#scrollTo scrollTo()}.
-The following implementation of {@link android.view.View#computeScroll computeScroll()}
-takes a different approach—it calls
-{@link android.widget.OverScroller#computeScrollOffset computeScrollOffset()} to get the current
-location of x and y. When the criteria for displaying an overscroll "glow" edge effect are met
-(the display is zoomed in, x or y is out of bounds, and the app isn't already showing an overscroll),
-the code sets up the overscroll glow effect and calls
-{@link android.support.v4.view.ViewCompat#postInvalidateOnAnimation postInvalidateOnAnimation()}
+<p>Most views pass the scroller object's x and y position directly to
+{@link android.view.View#scrollTo scrollTo()}.
+The following implementation of {@link android.view.View#computeScroll computeScroll()}
+takes a different approach—it calls
+{@link android.widget.OverScroller#computeScrollOffset computeScrollOffset()} to get the current
+location of x and y. When the criteria for displaying an overscroll "glow" edge effect are met
+(the display is zoomed in, x or y is out of bounds, and the app isn't already showing an overscroll),
+the code sets up the overscroll glow effect and calls
+{@link android.support.v4.view.ViewCompat#postInvalidateOnAnimation postInvalidateOnAnimation()}
to trigger an invalidate on the view:</p>
<pre>// Edge effect / overscroll tracking objects.
@@ -250,7 +250,7 @@
boolean needsInvalidate = false;
- // The scroller isn't finished, meaning a fling or programmatic pan
+ // The scroller isn't finished, meaning a fling or programmatic pan
// operation is currently active.
if (mScroller.computeScrollOffset()) {
Point surfaceSize = computeScrollSurfaceSize();
@@ -262,7 +262,7 @@
boolean canScrollY = (mCurrentViewport.top > AXIS_Y_MIN
|| mCurrentViewport.bottom < AXIS_Y_MAX);
- /*
+ /*
* If you are zoomed in and currX or currY is
* outside of bounds and you're not already
* showing overscroll, then render the overscroll
@@ -272,7 +272,7 @@
&& currX < 0
&& mEdgeEffectLeft.isFinished()
&& !mEdgeEffectLeftActive) {
- mEdgeEffectLeft.onAbsorb((int)
+ mEdgeEffectLeft.onAbsorb((int)
OverScrollerCompat.getCurrVelocity(mScroller));
mEdgeEffectLeftActive = true;
needsInvalidate = true;
@@ -280,7 +280,7 @@
&& currX > (surfaceSize.x - mContentRect.width())
&& mEdgeEffectRight.isFinished()
&& !mEdgeEffectRightActive) {
- mEdgeEffectRight.onAbsorb((int)
+ mEdgeEffectRight.onAbsorb((int)
OverScrollerCompat.getCurrVelocity(mScroller));
mEdgeEffectRightActive = true;
needsInvalidate = true;
@@ -290,7 +290,7 @@
&& currY < 0
&& mEdgeEffectTop.isFinished()
&& !mEdgeEffectTopActive) {
- mEdgeEffectTop.onAbsorb((int)
+ mEdgeEffectTop.onAbsorb((int)
OverScrollerCompat.getCurrVelocity(mScroller));
mEdgeEffectTopActive = true;
needsInvalidate = true;
@@ -298,7 +298,7 @@
&& currY > (surfaceSize.y - mContentRect.height())
&& mEdgeEffectBottom.isFinished()
&& !mEdgeEffectBottomActive) {
- mEdgeEffectBottom.onAbsorb((int)
+ mEdgeEffectBottom.onAbsorb((int)
OverScrollerCompat.getCurrVelocity(mScroller));
mEdgeEffectBottomActive = true;
needsInvalidate = true;
@@ -316,14 +316,14 @@
// If a zoom is in progress (either programmatically or via double
// touch), performs the zoom.
if (mZoomer.computeZoom()) {
- float newWidth = (1f - mZoomer.getCurrZoom()) *
+ float newWidth = (1f - mZoomer.getCurrZoom()) *
mScrollerStartViewport.width();
- float newHeight = (1f - mZoomer.getCurrZoom()) *
+ float newHeight = (1f - mZoomer.getCurrZoom()) *
mScrollerStartViewport.height();
- float pointWithinViewportX = (mZoomFocalPoint.x -
+ float pointWithinViewportX = (mZoomFocalPoint.x -
mScrollerStartViewport.left)
/ mScrollerStartViewport.width();
- float pointWithinViewportY = (mZoomFocalPoint.y -
+ float pointWithinViewportY = (mZoomFocalPoint.y -
mScrollerStartViewport.top)
/ mScrollerStartViewport.height();
mCurrentViewport.set(
@@ -339,9 +339,9 @@
}
</pre>
-<p>This is the {@code computeScrollSurfaceSize()} method that's called in the above snippet. It
-computes the current scrollable surface size, in pixels. For example, if the entire chart area is visible,
-this is simply the current size of {@code mContentRect}. If the chart is zoomed in 200% in both directions,
+<p>This is the {@code computeScrollSurfaceSize()} method that's called in the above snippet. It
+computes the current scrollable surface size, in pixels. For example, if the entire chart area is visible,
+this is simply the current size of {@code mContentRect}. If the chart is zoomed in 200% in both directions,
the returned size will be twice as large horizontally and vertically.</p>
<pre>private Point computeScrollSurfaceSize() {
@@ -352,8 +352,8 @@
/ mCurrentViewport.height()));
}</pre>
-<p>For another example of scroller usage, see the
-<a href="http://github.com/android/platform_frameworks_support/blob/master/v4/java/android/support/v4/view/ViewPager.java">source code</a> for the
-{@link android.support.v4.view.ViewPager} class. It scrolls in response to flings,
+<p>For another example of scroller usage, see the
+<a href="http://github.com/android/platform_frameworks_support/blob/master/v4/java/android/support/v4/view/ViewPager.java">source code</a> for the
+{@link android.support.v4.view.ViewPager} class. It scrolls in response to flings,
and uses scrolling to implement the "snapping to page" animation.</p>
diff --git a/docs/html/training/gestures/viewgroup.jd b/docs/html/training/gestures/viewgroup.jd
index 5b32300..7b5b24e 100644
--- a/docs/html/training/gestures/viewgroup.jd
+++ b/docs/html/training/gestures/viewgroup.jd
@@ -52,38 +52,38 @@
<h2 id="intercept">Intercept Touch Events in a ViewGroup</h2>
-<p>The {@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}
-method is called whenever a touch event is detected on the surface of a
-{@link android.view.ViewGroup}, including on the surface of its children. If
-{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}
-returns {@code true}, the {@link android.view.MotionEvent} is intercepted,
-meaning it will be not be passed on to the child, but rather to the
+<p>The {@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}
+method is called whenever a touch event is detected on the surface of a
+{@link android.view.ViewGroup}, including on the surface of its children. If
+{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}
+returns {@code true}, the {@link android.view.MotionEvent} is intercepted,
+meaning it will be not be passed on to the child, but rather to the
{@link android.view.View#onTouchEvent onTouchEvent()} method of the parent.</p>
-<p>The {@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}
-method gives a parent the chance to see any touch event before its children do.
-If you return {@code true} from
-{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()},
-the child view that was previously handling touch events
-receives an {@link android.view.MotionEvent#ACTION_CANCEL}, and the events from that
-point forward are sent to the parent's
-{@link android.view.View#onTouchEvent onTouchEvent()} method for the usual handling.
-{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()} can also
-return {@code false} and simply spy on events as they travel down the view hierarchy
+<p>The {@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}
+method gives a parent the chance to see any touch event before its children do.
+If you return {@code true} from
+{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()},
+the child view that was previously handling touch events
+receives an {@link android.view.MotionEvent#ACTION_CANCEL}, and the events from that
+point forward are sent to the parent's
+{@link android.view.View#onTouchEvent onTouchEvent()} method for the usual handling.
+{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()} can also
+return {@code false} and simply spy on events as they travel down the view hierarchy
to their usual targets, which will handle the events with their own
{@link android.view.View#onTouchEvent onTouchEvent()}.
-<p>In the following snippet, the class {@code MyViewGroup} extends
-{@link android.view.ViewGroup}.
-{@code MyViewGroup} contains multiple child views. If you drag your finger across
-a child view horizontally, the child view should no longer get touch events, and
-{@code MyViewGroup} should handle touch events by scrolling its contents. However,
-if you press buttons in the child view, or scroll the child view vertically,
-the parent shouldn't intercept those touch events, because the child is the
-intended target. In those cases,
+<p>In the following snippet, the class {@code MyViewGroup} extends
+{@link android.view.ViewGroup}.
+{@code MyViewGroup} contains multiple child views. If you drag your finger across
+a child view horizontally, the child view should no longer get touch events, and
+{@code MyViewGroup} should handle touch events by scrolling its contents. However,
+if you press buttons in the child view, or scroll the child view vertically,
+the parent shouldn't intercept those touch events, because the child is the
+intended target. In those cases,
{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()} should
-return {@code false}, and {@code MyViewGroup}'s
+return {@code false}, and {@code MyViewGroup}'s
{@link android.view.View#onTouchEvent onTouchEvent()} won't be called.</p>
<pre>public class MyViewGroup extends ViewGroup {
@@ -118,20 +118,20 @@
switch (action) {
case MotionEvent.ACTION_MOVE: {
if (mIsScrolling) {
- // We're currently scrolling, so yes, intercept the
+ // We're currently scrolling, so yes, intercept the
// touch event!
return true;
}
- // If the user has dragged her finger horizontally more than
+ // If the user has dragged her finger horizontally more than
// the touch slop, start the scroll
// left as an exercise for the reader
- final int xDiff = calculateDistanceX(ev);
+ final int xDiff = calculateDistanceX(ev);
- // Touch slop should be calculated using ViewConfiguration
+ // Touch slop should be calculated using ViewConfiguration
// constants.
- if (xDiff > mTouchSlop) {
+ if (xDiff > mTouchSlop) {
// Start scrolling!
mIsScrolling = true;
return true;
@@ -141,26 +141,26 @@
...
}
- // In general, we don't want to intercept touch events. They should be
+ // In general, we don't want to intercept touch events. They should be
// handled by the child view.
return false;
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
- // Here we actually handle the touch event (e.g. if the action is ACTION_MOVE,
+ // Here we actually handle the touch event (e.g. if the action is ACTION_MOVE,
// scroll this container).
- // This method will only be called if the touch event was intercepted in
+ // This method will only be called if the touch event was intercepted in
// onInterceptTouchEvent
...
}
}</pre>
-<p>Note that {@link android.view.ViewGroup} also provides a
-{@link android.view.ViewGroup#requestDisallowInterceptTouchEvent requestDisallowInterceptTouchEvent()} method.
-The {@link android.view.ViewGroup} calls this method when a child does not want the parent and its
-ancestors to intercept touch events with
-{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}.
+<p>Note that {@link android.view.ViewGroup} also provides a
+{@link android.view.ViewGroup#requestDisallowInterceptTouchEvent requestDisallowInterceptTouchEvent()} method.
+The {@link android.view.ViewGroup} calls this method when a child does not want the parent and its
+ancestors to intercept touch events with
+{@link android.view.ViewGroup#onInterceptTouchEvent onInterceptTouchEvent()}.
</p>
<h2 id="vc">Use ViewConfiguration Constants</h2>
@@ -176,10 +176,10 @@
prevent accidental scrolling when the user is performing some other touch
operation, such as touching on-screen elements.</p>
-<p>Two other commonly used {@link android.view.ViewConfiguration} methods are
-{@link android.view.ViewConfiguration#getScaledMinimumFlingVelocity getScaledMinimumFlingVelocity()}
+<p>Two other commonly used {@link android.view.ViewConfiguration} methods are
+{@link android.view.ViewConfiguration#getScaledMinimumFlingVelocity getScaledMinimumFlingVelocity()}
and {@link android.view.ViewConfiguration#getScaledMaximumFlingVelocity getScaledMaximumFlingVelocity()}.
-These methods return the minimum and maximum velocity (respectively) to initiate a fling,
+These methods return the minimum and maximum velocity (respectively) to initiate a fling,
as measured in pixels per second. For example:</p>
<pre>ViewConfiguration vc = ViewConfiguration.get(view.getContext());
@@ -209,14 +209,14 @@
<h2 id="delegate">Extend a Child View's Touchable Area</h2>
-<p>Android provides the {@link android.view.TouchDelegate} class to make it possible
-for a parent to extend the touchable area of a child view beyond the child's bounds.
+<p>Android provides the {@link android.view.TouchDelegate} class to make it possible
+for a parent to extend the touchable area of a child view beyond the child's bounds.
This is useful when the child has to be small, but should have a larger touch region. You can
also use this approach to shrink the child's touch region if need be.</p>
-<p>In the following example, an {@link android.widget.ImageButton} is the
-"delegate view" (that is, the child whose touch area the parent will extend).
+<p>In the following example, an {@link android.widget.ImageButton} is the
+"delegate view" (that is, the child whose touch area the parent will extend).
Here is the layout file:</p>
<pre>
@@ -225,7 +225,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity" >
-
+
<ImageButton android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -245,9 +245,9 @@
</ul>
-In its capacity as touch delegate for the {@link android.widget.ImageButton} child view, the
+In its capacity as touch delegate for the {@link android.widget.ImageButton} child view, the
parent view will receive all touch events. If the touch event occurred within the child's hit
-rectangle, the parent will pass the touch
+rectangle, the parent will pass the touch
event to the child for handling.</p>
@@ -261,7 +261,7 @@
setContentView(R.layout.activity_main);
// Get the parent view
View parentView = findViewById(R.id.parent_layout);
-
+
parentView.post(new Runnable() {
// Post in the parent's message queue to make sure the parent
// lays out its children before you call getHitRect()
@@ -275,29 +275,29 @@
myButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Toast.makeText(MainActivity.this,
- "Touch occurred within ImageButton touch region.",
+ Toast.makeText(MainActivity.this,
+ "Touch occurred within ImageButton touch region.",
Toast.LENGTH_SHORT).show();
}
});
-
+
// The hit rectangle for the ImageButton
myButton.getHitRect(delegateArea);
-
+
// Extend the touch area of the ImageButton beyond its bounds
// on the right and bottom.
delegateArea.right += 100;
delegateArea.bottom += 100;
-
+
// Instantiate a TouchDelegate.
- // "delegateArea" is the bounds in local coordinates of
+ // "delegateArea" is the bounds in local coordinates of
// the containing view to be mapped to the delegate view.
// "myButton" is the child view that should receive motion
// events.
- TouchDelegate touchDelegate = new TouchDelegate(delegateArea,
+ TouchDelegate touchDelegate = new TouchDelegate(delegateArea,
myButton);
-
- // Sets the TouchDelegate on the parent view, such that touches
+
+ // Sets the TouchDelegate on the parent view, such that touches
// within the touch delegate bounds are routed to the child.
if (View.class.isInstance(myButton.getParent())) {
((View) myButton.getParent()).setTouchDelegate(touchDelegate);
diff --git a/docs/html/training/graphics/opengl/touch.jd b/docs/html/training/graphics/opengl/touch.jd
index 089ede7..6a961da 100644
--- a/docs/html/training/graphics/opengl/touch.jd
+++ b/docs/html/training/graphics/opengl/touch.jd
@@ -36,7 +36,7 @@
getting some attention, but what if you want to have users interact with your OpenGL ES graphics?
The key to making your OpenGL ES application touch interactive is expanding your implementation of
{@link android.opengl.GLSurfaceView} to override the {@link
-android.opengl.GLSurfaceView#onTouchEvent onTouchEvent()} to listen for touch events.</p>
+android.view.View#onTouchEvent onTouchEvent()} to listen for touch events.</p>
<p>This lesson shows you how to listen for touch events to let users rotate an OpenGL ES object.</p>
@@ -44,7 +44,7 @@
<h2 id="listener">Setup a Touch Listener</h2>
<p>In order to make your OpenGL ES application respond to touch events, you must implement the
-{@link android.opengl.GLSurfaceView#onTouchEvent onTouchEvent()} method in your
+{@link android.view.View#onTouchEvent onTouchEvent()} method in your
{@link android.opengl.GLSurfaceView} class. The example implementation below shows how to listen for
{@link android.view.MotionEvent#ACTION_MOVE MotionEvent.ACTION_MOVE} events and translate them to
an angle of rotation for a shape.</p>
diff --git a/docs/html/training/id-auth/authenticate.jd b/docs/html/training/id-auth/authenticate.jd
index 65dbc39..bf32e8e 100644
--- a/docs/html/training/id-auth/authenticate.jd
+++ b/docs/html/training/id-auth/authenticate.jd
@@ -129,7 +129,7 @@
public void run(AccountManagerFuture<Bundle> result) {
// Get the result of the operation from the AccountManagerFuture.
Bundle bundle = result.getResult();
-
+
// The token is a named value in the bundle. The name of the value
// is stored in the constant AccountManager.KEY_AUTHTOKEN.
token = bundle.getString(AccountManager.KEY_AUTHTOKEN);
diff --git a/docs/html/training/id-auth/custom_auth.jd b/docs/html/training/id-auth/custom_auth.jd
index def9b51..3c106a9 100644
--- a/docs/html/training/id-auth/custom_auth.jd
+++ b/docs/html/training/id-auth/custom_auth.jd
@@ -81,7 +81,7 @@
credentials would be readable by anyone with {@code adb} access to the device.</p>
<p>With this in mind, you shouldn't pass the user's actual
-password to {@link android.accounts.AccountManager#addAccountExplicitly
+password to {@link android.accounts.AccountManager#addAccountExplicitly
AccountManager.addAccountExplicitly()}. Instead, you should store a
cryptographically secure token that would be of limited use to an attacker. If your
user credentials are protecting something valuable, you should carefully
diff --git a/docs/html/training/id-auth/index.jd b/docs/html/training/id-auth/index.jd
index f15ee29..45c6309 100644
--- a/docs/html/training/id-auth/index.jd
+++ b/docs/html/training/id-auth/index.jd
@@ -15,7 +15,7 @@
<li>Android 2.0 (API level 5) or higher</li>
<li>Experience with <a href="{@docRoot}guide/components/services.html">Services</a></li>
<li>Experience with <a href="http://oauth.net/2/">OAuth 2.0</a></li>
-</ul>
+</ul>
<h2>You should also read</h2>
<ul>
diff --git a/docs/html/training/implementing-navigation/nav-drawer.jd b/docs/html/training/implementing-navigation/nav-drawer.jd
index 679c240..d359a47 100644
--- a/docs/html/training/implementing-navigation/nav-drawer.jd
+++ b/docs/html/training/implementing-navigation/nav-drawer.jd
@@ -148,7 +148,7 @@
}
</pre>
-<p>This code also calls {@link android.widget.ListView#setOnItemClickListener
+<p>This code also calls {@link android.widget.AdapterView#setOnItemClickListener
setOnItemClickListener()} to receive click events in the navigation drawer's list.
The next section shows how to implement this interface
and change the content view when the user selects an item.</p>
@@ -160,7 +160,7 @@
<p>When the user selects an item in the drawer's list, the system calls {@link
android.widget.AdapterView.OnItemClickListener#onItemClick onItemClick()} on the
{@link android.widget.AdapterView.OnItemClickListener OnItemClickListener} given to
-{@link android.widget.ListView#setOnItemClickListener setOnItemClickListener()}.</p>
+{@link android.widget.AdapterView#setOnItemClickListener setOnItemClickListener()}.</p>
<p>What you do in the {@link
android.widget.AdapterView.OnItemClickListener#onItemClick onItemClick()} method
diff --git a/docs/html/training/improving-layouts/optimizing-layout.jd b/docs/html/training/improving-layouts/optimizing-layout.jd
index e0baedf..2f9f32d 100644
--- a/docs/html/training/improving-layouts/optimizing-layout.jd
+++ b/docs/html/training/improving-layouts/optimizing-layout.jd
@@ -145,7 +145,7 @@
<li>Deep layouts - Layouts with too much nesting are bad for performance. Consider using flatter layouts such as {@link android.widget.RelativeLayout} or {@link android.widget.GridLayout} to improve performance. The default maximum depth is 10.</li>
</ul>
-<p>Another benefit of Lint is that it is integrated into Android Studio. Lint automatically runs
+<p>Another benefit of Lint is that it is integrated into Android Studio. Lint automatically runs
whenever you compile your program. With Android Studio, you can also run lint inspections for a
specific build variant, or for all build variants. </p>
@@ -153,7 +153,7 @@
<strong>File>Settings>Project Settings</strong> option. The Inspection Configuration page
appears with the supported inspections.</p>
<p><img src="{@docRoot}images/tools/studio-inspections-config.png" alt="" /> </p>
-<p class="img-caption"><strong>Figure 5.</strong> Inspection Configuration</p>
+<p class="img-caption"><strong>Figure 5.</strong> Inspection Configuration</p>
<p>Lint has the ability to automatically fix some issues, provide suggestions for others and jump
directly to the offending code for review.</p>
diff --git a/docs/html/training/in-app-billing/list-iab-products.jd b/docs/html/training/in-app-billing/list-iab-products.jd
index c423fc1..c8de823 100644
--- a/docs/html/training/in-app-billing/list-iab-products.jd
+++ b/docs/html/training/in-app-billing/list-iab-products.jd
@@ -36,7 +36,7 @@
<p>To add new in-app products to your product list:</p>
<ol>
-<li>Build a signed APK file for your In-app Billing application. To learn how to build and sign your APK, see <a href="{@docRoot}tools/publishing/preparing.html#publishing-build">Building Your Application for Release</a>. Make sure that you are using your final (not debug) certificate and private key to sign your application.
+<li>Build a signed APK file for your In-app Billing application. To learn how to build and sign your APK, see <a href="{@docRoot}tools/publishing/preparing.html#publishing-build">Building Your Application for Release</a>. Make sure that you are using your final (not debug) certificate and private key to sign your application.
</li>
<li>In the Developer Console, open the application entry that you created earlier.</li>
<li>Click on the APK tab then click on Upload new APK. Upload the signed APK file to the Developer Console. Don’t publish the app yet!</li>
@@ -48,9 +48,9 @@
<h2 id="QueryDetails">Query Items Available for Purchase</h2>
<p>You can query Google Play to programmatically retrieve details of the in-app products that are associated with your application (such as the product’s price, title, description, and type). This is useful, for example, when you want to display a listing of unowned items that are still available for purchase to users.</p>
<p class="note"><strong>Note:</strong> When making the query, you will need to specify the product IDs for the products explicitly. You can manually find the product IDs from the Developer Console by opening the <strong>In-app Products</strong> tab for your application. The product IDs are listed under the column labeled <strong>Name/ID</strong>.</p>
-<p>To retrieve the product details, call {@code queryInventoryAsync(boolean, List, QueryInventoryFinishedListener)} on your IabHelper instance.
+<p>To retrieve the product details, call {@code queryInventoryAsync(boolean, List, QueryInventoryFinishedListener)} on your IabHelper instance.
<ul>
-<li>The first input argument indicates whether product details should be retrieved (should be set to {@code true}).</li>
+<li>The first input argument indicates whether product details should be retrieved (should be set to {@code true}).</li>
<li>The {@code List} argument consists of one or more product IDs (also called SKUs) for the products that you want to query.</li>
<li>Finally, the {@code QueryInventoryFinishedListener} argument specifies a listener is notified when the query operation has completed and handles the query response.</li>
</ul>
@@ -70,9 +70,9 @@
<p>The following code shows how you can retrieve the item prices from the result set.</p>
<pre>
-IabHelper.QueryInventoryFinishedListener
+IabHelper.QueryInventoryFinishedListener
mQueryFinishedListener = new IabHelper.QueryInventoryFinishedListener() {
- public void onQueryInventoryFinished(IabResult result, Inventory inventory)
+ public void onQueryInventoryFinished(IabResult result, Inventory inventory)
{
if (result.isFailure()) {
// handle error
@@ -84,7 +84,7 @@
String bananaPrice =
inventory.getSkuDetails(SKU_BANANA).getPrice();
- // update the UI
+ // update the UI
}
}
</pre>
diff --git a/docs/html/training/in-app-billing/preparing-iab-app.jd b/docs/html/training/in-app-billing/preparing-iab-app.jd
old mode 100755
new mode 100644
index 2c6e9a0..780f2f80
--- a/docs/html/training/in-app-billing/preparing-iab-app.jd
+++ b/docs/html/training/in-app-billing/preparing-iab-app.jd
@@ -31,23 +31,32 @@
</div>
<a class="notice-developers-video wide"
-href="https://www.youtube.com/watch?v=UvCl5Xx7Z5o">
+href="https://www.youtube.com/watch?v=UvCl5Xx7Z5o" class="external-link">
<div>
<h3>Video</h3>
<p>Implementing Freemium</p>
</div>
</a>
-<p>Before you can start using the In-app Billing service, you'll need to add the library that contains the In-app Billing Version 3 API to your Android project. You also need to set the permissions for your application to communicate with Google Play. In addition, you'll need to establish a connection between your application and Google Play. You should also verify that the In-app Billing API version that you are using in your application is supported by Google Play.</p>
+<p>Before you can start using the In-app Billing service, you need to add the library that
+ contains the In-app Billing Version 3 API to your Android project. You also need to set the
+ permissions for your application to communicate with Google Play. In addition, you need to
+ establish a connection between your application and Google Play. You must also verify that
+ the In-app Billing API version that you are using in your application is supported
+ by Google Play.</p>
<h2 id="GetSample">Download the Sample Application</h2>
-<p>In this training class, you will use a reference implementation for the In-app Billing Version 3 API called the {@code TrivialDrive} sample application. The sample includes convenience classes to quickly set up the In-app Billing service, marshal and unmarshal data types, and handle In-app Billing requests from the main thread of your application.</p>
-<p>To download the sample application:</p>
+<p>In this training class, you use a reference implementation for the In-app Billing
+ Version 3 API
+ called the {@code TrivialDrive} sample application. The sample includes convenience classes to
+ quickly set up the In-app Billing service, marshal and unmarshal data types, and handle In-app
+ Billing requests from the main thread of your application.</p>
+<p>To download the sample application, follow these steps:</p>
<ol>
<li>Open Android Studio and then close any open projects until you are
presented with the welcome screen.</li>
-<li>Choose <strong>Import an Android code sample</strong> from the
- <strong>Quick Start</strong> list on the right side the window.</li>
+<li>From the <strong>Quick Start</strong> list on the right side of the window, choose
+ <strong>Import an Android code sample</strong>.</li>
<li>Type {@code Trivial Drive} into the search bar and select the
<strong>Trivial Drive</strong> sample.</li>
<li>Follow the rest of the instructions in the <strong>Import Sample</strong>
@@ -56,66 +65,121 @@
</ol>
<p>Alternatively, you can use {@code git} to manually clone
- the repository from <a
+ the repository from the <a
href="https://github.com/googlesamples/android-play-billing"
- class="external-link">https://github.com/googlesamples/android-play-billing</a></p>
+ class="external-link">Google Samples</a> GitHub site.</p>
<h2 id="AddToDevConsole">Add Your Application to the Developer Console</h2>
-<p>The Google Play Developer Console is where you publish your In-app Billing application and manage the various digital goods that are available for purchase from your application. When you create a new application entry in the Developer Console, it automatically generates a public license key for your application. You will need this key to establish a trusted connection from your application to the Google Play servers. You only need to generate this key once per application, and don’t need to repeat these steps when you update the APK file for your application.</p>
-<p>To add your application to the Developer Console:</p>
+<p>The Google Play Developer Console is where you publish your In-app Billing application
+ and manage the various digital products that are available for purchase from your
+ application.
+ When you create a new application entry in the Developer Console, it automatically generates
+ a public license key for your application. You need this key to establish a trusted connection
+ from your application to the Google Play servers. You need to generate this key only once
+ per application, and you don’t need to repeat these steps when you update the APK file for
+ your application.</p>
+<p>To add your application to the Developer Console, follow these steps:</p>
<ol>
-<li>Go to the <a href="http://play.google.com/apps/publish">Google Play Developer Console</a> site and log in. You will need to register for a new developer account, if you have not registered previously. To sell in-app items, you also need to have a <a href="http://www.google.com/wallet/merchants.html">Google payments</a> merchant account.</li>
-<li>Click on <strong>Try the new design</strong> to access the preview version of the Developer Console, if you are not already logged on to that version. </li>
-<li>In the <strong>All Applications</strong> tab, add a new application entry.
+<li>Go to the <a href="http://play.google.com/apps/publish" class="external-link">
+Google Play Developer Console</a>
+ site and log in. If you have not registered previously, you need to register for a new
+ developer account. To sell in-app products, you also need a
+ <a href="http://www.google.com/wallet/merchants.html" class="external-link">
+ Google payments</a> merchant account.</li>
+
+<li>In the <strong>All Applications</strong> tab, complete these steps to add a new
+ application entry:
<ol type="a">
<li>Click <strong>Add new application</strong>.</li>
<li>Enter a name for your new In-app Billing application.</li>
<li>Click <strong>Prepare Store Listing</strong>.</li>
</ol>
</li>
-<li>In the <strong>Services & APIs</strong> tab, find and make a note of the public license key that Google Play generated for your application. This is a Base64 string that you will need to include in your application code later.</li>
+<li>In the <strong>Services & APIs</strong> tab, find and make a note of the public license key
+ that Google Play generated for your application. This is a Base64 string that you need to
+ include in your application code later.</li>
</ol>
<p>Your application should now appear in the list of applications in Developer Console.</p>
<h2 id="AddLibrary">Add the In-app Billing Library</h2>
-<p>To use the In-app Billing Version 3 features, you must add the {@code IInAppBillingService.aidl} file to your Android project. This Android Interface Definition Language (AIDL) file defines the interface to the Google Play service.</p>
-<p>You can find the {@code IInAppBillingService.aidl} file in the provided sample app. Depending on whether you are creating a new application or modifying an existing application, follow the instructions below to add the In-app Billing Library to your project.</p>
-<h3>New Project</h3>
-<p>To add the In-app Billing Version 3 library to your new In-app Billing project:</p>
+<p>To use the In-app Billing Version 3 features, you must add the
+ {@code IInAppBillingService.aidl}
+ file to your Android project. This Android Interface Definition Language
+ (AIDL) file defines the
+ interface to the Google Play service.</p>
+<p>You can find the {@code IInAppBillingService.aidl} file in the provided sample app.
+ To add the
+ In-app Billing library to your project, follow the instructions below for a new or
+ existing project.</p>
+<h3>Adding in-app billing to a new project</h3>
+<p>To add the In-app Billing Version 3 library to a new project, follow these steps:</p>
<ol>
<li>Copy the {@code TrivialDrive} sample files into your Android project.</li>
-<li>Modify the package name in the files you copied to use the package name for your project. In Android Studio, you can use this shortcut: right-click the package name, then select <strong>Refactor</strong> > <strong>Rename</strong>.</li>
-<li>Open the {@code AndroidManifest.xml} file and update the package attribute value to use the package name for your project.</li>
-<li>Fix import statements as needed so that your project compiles correctly. In Android Studio, you can use this shortcut: press <strong>Ctrl+Shift+O</strong> in each file showing errors.</li>
-<li>Modify the sample to create your own application. Remember to copy the Base64 public license key for your application from the Developer Console over to your {@code MainActivity.java}.</li>
+<li>Modify the package name in the files that you copied to use the package name
+ for your project.
+ In Android Studio, you can right-click the package name and then
+ select <strong>Refactor</strong> > <strong>Rename</strong>.</li>
+<li>Open the {@code AndroidManifest.xml} file and update the package attribute value to
+ use the package name for your project.</li>
+<li>Fix import statements as needed so that your project compiles correctly.
+ In Android Studio, you can press <strong>Ctrl+Shift+O</strong>
+ in each file showing errors.</li>
+<li>Modify the sample to create your own application. Remember to copy the Base64
+ public license key for your application from the Developer Console to
+ your {@code MainActivity.java}.</li>
</ol>
-<h3>Existing Project</h3>
-<p>To add the In-app Billing Version 3 library to your existing In-app Billing project:</p>
+<h3>Adding in-app billing to an existing project</h3>
+<p>To add the In-app Billing Version 3 library to an existing project, follow these steps:</p>
<ol>
<li>Copy the {@code IInAppBillingService.aidl} file to your Android project.
<ul>
- <li>In Android Studio: Create a directory named {@code aidl} under {@code src/main}, add a new
- package {@code com.android.vending.billing} in this directory, and import the
+ <li>In Android Studio: Create a directory named {@code aidl} under {@code src/main},
+ add a new
+ package {@code com.android.vending.billing} in this directory, and then import the
{@code IInAppBillingService.aidl} file into this package.</li>
- <li>In other dev environments: Create the following directory {@code /src/com/android/vending/billing} and copy the {@code IInAppBillingService.aidl} file into this directory.</li>
+ <li>In other dev environments: Create the following directory
+ {@code /src/com/android/vending/billing} and copy the {@code IInAppBillingService.aidl}
+ file into this directory.</li>
</ul>
</li>
-<li>Build your application. You should see a generated file named {@code IInAppBillingService.java} in the {@code /gen} directory of your project.</li>
-<li>Add the helper classes from the {@code /util} directory of the {@code TrivialDrive} sample to your project. Remember to change the package name declarations in those files accordingly so that your project compiles correctly.</li>
+<li>Build your application. You should see a generated file named
+ {@code IInAppBillingService.java}
+ in the {@code /gen} directory of your project.</li>
+<li>Add the helper classes from the {@code /util} directory of the {@code TrivialDrive}
+ sample to
+ your project. Remember to change the package name declarations in those files
+ accordingly so
+ that your project compiles correctly.</li>
</ol>
<p>Your project should now contain the In-app Billing Version 3 library.</p>
<h2 id="SetPermission">Set the Billing Permission</h2>
-<p>Your app needs to have permission to communicate request and response messages to the Google Play’s billing service. To give your app the necessary permission, add this line in your {@code AndroidManifest.xml} manifest file:</p>
+<p>Your app needs to have permission to communicate request and response messages to
+ the Google Play billing service. To give your app the necessary permission, add the following
+ line in your {@code AndroidManifest.xml} manifest file:</p>
<pre>
<uses-permission android:name="com.android.vending.BILLING" />
</pre>
<h2 id="Connect">Initiate a Connection with Google Play</h2>
-<p>You must bind your Activity to Google Play’s In-app Billing service to send In-app Billing requests to Google Play from your application. The convenience classes provided in the sample handles the binding to the In-app Billing service, so you don’t have to manage the network connection directly.</p>
-<p>To set up synchronous communication with Google Play, create an {@code IabHelper} instance in your activity's {@code onCreate} method. In the constructor, pass in the {@code Context} for the activity, along with a string containing the public license key that was generated earlier by the Google Play Developer Console. </p>
-<p class="note"><strong>Security Recommendation:</strong> It is highly recommended that you do not hard-code the exact public license key string value as provided by Google Play. Instead, you can construct the whole public license key string at runtime from substrings, or retrieve it from an encrypted store, before passing it to the constructor. This approach makes it more difficult for malicious third-parties to modify the public license key string in your APK file.</p>
+<p>To send In-app
+ Billing requests to Google Play from your application, you must bind your Activity
+ to the Google Play In-app Billing service. The sample includes convenience classes
+ that handle the binding to the In-app Billing service, so you don’t have to
+ manage the network connection directly.</p>
+<p>To set up synchronous communication with Google Play, create an {@code IabHelper}
+ instance in your activity's {@code onCreate} method, as shown in the following example.
+ In the constructor, pass in the {@code Context} for the activity along with a string
+ containing the public license key that was generated earlier by the Google Play
+ Developer Console.
+</p>
+<p class="caution"><strong>Security Recommendation:</strong> Google highly recommends that
+ you do not hard-code the exact public license key string value as provided by Google Play.
+ Instead, construct the whole public license key string at runtime from substrings
+ or retrieve it from an encrypted store before passing it to the constructor.
+ This approach makes it more difficult for malicious third parties to modify the public
+ license key string in your APK file.</p>
<pre>
IabHelper mHelper;
@@ -130,13 +194,20 @@
}
</pre>
-<p>Next, perform the service binding by calling the {@code startSetup} method on the {@code IabHelper} instance that you created. Pass the method an {@code OnIabSetupFinishedListener} instance, which is called once the {@code IabHelper} completes the asynchronous setup operation. As part of the setup process, the {@code IabHelper} also checks if the In-app Billing Version 3 API is supported by Google Play. If the API version is not supported, or if an error occured while establishing the service binding, the listener is notified and passed an {@code IabResult} object with the error message.</p>
+<p>Next, perform the service binding by calling the {@code startSetup} method on the
+ {@code IabHelper} instance that you created, as shown in the following example.
+ Pass the method an {@code OnIabSetupFinishedListener} instance, which is called once
+ the {@code IabHelper} completes the asynchronous setup operation. As part of the
+ setup process, the {@code IabHelper} also checks if the In-app Billing Version 3 API
+ is supported by Google Play. If the API version is not supported, or if an error occurs
+ while establishing the service binding, the listener is notified and passed an
+ {@code IabResult} object with the error message.</p>
<pre>
mHelper.startSetup(new IabHelper.OnIabSetupFinishedListener() {
public void onIabSetupFinished(IabResult result) {
if (!result.isSuccess()) {
- // Oh noes, there was a problem.
+ // Oh no, there was a problem.
Log.d(TAG, "Problem setting up In-app Billing: " + result);
}
// Hooray, IAB is fully set up!
@@ -144,9 +215,18 @@
});
</pre>
-<p>If the setup completed successfully, you can now use the {@code mHelper} reference to communicate with the Google Play service. When your application is launched, it is a good practice to query Google Play to find out what in-app items are owned by a user. This is covered further in the <a href="{@docRoot}training/in-app-billing/purchase-iab-products.html#QueryPurchases">Query Purchased Items</a> section.</p>
+<p>If the setup completed successfully, you can now use the {@code mHelper} reference
+ to communicate with the Google Play service. When your application is launched, it is
+ a good practice to query Google Play to find out what in-app items are owned by a user.
+ This is covered further in the
+ <a href="{@docRoot}training/in-app-billing/purchase-iab-products.html#QueryPurchases">
+ Query Purchased Items</a> section.</p>
-<p class="note"><strong>Important:</strong> Remember to unbind from the In-app Billing service when you are done with your activity. If you don’t unbind, the open service connection could cause your device’s performance to degrade. To unbind and free your system resources, call the {@code IabHelper}'s {@code dispose} method when your {@code Activity} is destroyed.</p>
+<p class="caution"><strong>Important:</strong> Remember to unbind from the In-app Billing service
+ when you are done with your activity. If you don’t unbind, the open service connection could
+ degrade device performance. To unbind and free your system resources, call the
+ {@code IabHelper}'s {@code dispose} method when your {@code Activity} is destroyed,
+ as shown in the following example.</p>
<pre>
@Override
@@ -156,8 +236,3 @@
mHelper = null;
}
</pre>
-
-
-
-
-
diff --git a/docs/html/training/in-app-billing/purchase-iab-products.jd b/docs/html/training/in-app-billing/purchase-iab-products.jd
index 4e6e035..165e311 100644
--- a/docs/html/training/in-app-billing/purchase-iab-products.jd
+++ b/docs/html/training/in-app-billing/purchase-iab-products.jd
@@ -45,7 +45,7 @@
<p>The following example shows how you can make a purchase request for a product with ID {@code SKU_GAS}, using an arbitrary value of 10001 for the request code, and an encoded developer payload string.</p>
<pre>
-mHelper.launchPurchaseFlow(this, SKU_GAS, 10001,
+mHelper.launchPurchaseFlow(this, SKU_GAS, 10001,
mPurchaseFinishedListener, "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
</pre>
@@ -54,14 +54,14 @@
<p>The following example shows how you can handle the purchase response in the listener, depending on whether the purchase order was completed successfully, and whether the user purchased gas or a premium upgrade. In this example, gas is an in-app product that can be purchased multiple times, so you should consume the purchase to allow the user to buy it again. To learn how to consume purchases, see the <a href="{@docRoot}training/in-app-billing/purchase-iab-products.html#Consume">Consuming Products</a> section. The premium upgrade is a one-time purchase so you don’t need to consume it. It is good practice to update the UI immediately so that your users can see their newly purchased items.</p>
<pre>
-IabHelper.OnIabPurchaseFinishedListener mPurchaseFinishedListener
+IabHelper.OnIabPurchaseFinishedListener mPurchaseFinishedListener
= new IabHelper.OnIabPurchaseFinishedListener() {
- public void onIabPurchaseFinished(IabResult result, Purchase purchase)
+ public void onIabPurchaseFinished(IabResult result, Purchase purchase)
{
if (result.isFailure()) {
Log.d(TAG, "Error purchasing: " + result);
return;
- }
+ }
else if (purchase.getSku().equals(SKU_GAS)) {
// consume the gas and update the UI
}
@@ -86,7 +86,7 @@
<p>If the query is successful, the query results are stored in an {@code Inventory} object that is passed back to the listener. The In-app Billing service returns only the purchases made by the user account that is currently logged in to the device.</p>
<pre>
-IabHelper.QueryInventoryFinishedListener mGotInventoryListener
+IabHelper.QueryInventoryFinishedListener mGotInventoryListener
= new IabHelper.QueryInventoryFinishedListener() {
public void onQueryInventoryFinished(IabResult result,
Inventory inventory) {
@@ -96,7 +96,7 @@
}
else {
// does the user have the premium upgrade?
- mIsPremium = inventory.hasPurchase(SKU_PREMIUM);
+ mIsPremium = inventory.hasPurchase(SKU_PREMIUM);
// update UI accordingly
}
}
@@ -111,7 +111,7 @@
<p>In this example, you want to consume the gas item that the user has previously purchased in your app.</p>
<pre>
-mHelper.consumeAsync(inventory.getPurchase(SKU_GAS),
+mHelper.consumeAsync(inventory.getPurchase(SKU_GAS),
mConsumeFinishedListener);
</pre>
diff --git a/docs/html/training/in-app-billing/test-iab-app.jd b/docs/html/training/in-app-billing/test-iab-app.jd
index 9d47a96..fc7fe1a 100644
--- a/docs/html/training/in-app-billing/test-iab-app.jd
+++ b/docs/html/training/in-app-billing/test-iab-app.jd
@@ -39,7 +39,7 @@
<li>Login to the <a href="https://play.google.com/apps/publish/" target="_blank">Developer Console</a> with your developer account.</li>
<li>Click <strong>Settings</strong> > <strong>Account</strong> details, then in the <strong>License Testing</strong> section, add the Google email addresses for your tester accounts.</li>
</ol>
-<li>Build a signed APK file for your In-app Billing application. To learn how to build and sign your APK, see <a href="{@docRoot}tools/publishing/preparing.html#publishing-build">Building Your Application for Release</a>. Make sure that you are using your final (not debug) certificate and private key to sign your application.
+<li>Build a signed APK file for your In-app Billing application. To learn how to build and sign your APK, see <a href="{@docRoot}tools/publishing/preparing.html#publishing-build">Building Your Application for Release</a>. Make sure that you are using your final (not debug) certificate and private key to sign your application.
</li>
<li>Make sure that you have uploaded the signed APK for your application to the Developer Console, and associated one or more in-app products with your application. You don't need to publish the application on Google Play to test it. <p class="note"><strong>Warning:</strong> It may take up to 2-3 hours after uploading the APK for Google Play to recognize your updated APK version. If you try to test your application before your uploaded APK is recognized by Google Play, your application will receive a ‘purchase cancelled’ response with an error message “This version of the application is not enabled for In-app Billing.”</p></li>
<li>Install the APK file to your physical test device by using the {@code adb} tool. To learn how to install the application, see <a href="{@docRoot}tools/building/building-cmdline.html#RunningOnDevice">Running on a Device</a>. Make sure that:
diff --git a/docs/html/training/keyboard-input/index.jd b/docs/html/training/keyboard-input/index.jd
index 46795c4..bd7ad18 100644
--- a/docs/html/training/keyboard-input/index.jd
+++ b/docs/html/training/keyboard-input/index.jd
@@ -32,9 +32,9 @@
<p>These topics and more are discussed in the following lessons.</p>
-<h2>Lessons</h2>
-
-<dl>
+<h2>Lessons</h2>
+
+<dl>
<dt><b><a href="style.html">Specifying the Input Method Type</a></b></dt>
<dd>Learn how to show certain soft input methods, such as those designed for phone numbers, web
addresses, or other formats. Also learn how to specify characteristics such
@@ -51,5 +51,5 @@
<dt><b><a href="commands.html">Handling Keyboard Actions</a></b></dt>
<dd>Learn how to respond directly to keyboard input for user actions.
</dd>
-
-</dl>
+
+</dl>
diff --git a/docs/html/training/keyboard-input/style.jd b/docs/html/training/keyboard-input/style.jd
index b0e506c..714c8b3 100644
--- a/docs/html/training/keyboard-input/style.jd
+++ b/docs/html/training/keyboard-input/style.jd
@@ -71,7 +71,7 @@
android:id="@+id/password"
android:hint="@string/password_hint"
android:inputType="textPassword"
- ... />
+ ... />
</pre>
<p>There are several possible values documented with the
diff --git a/docs/html/training/load-data-background/handle-results.jd b/docs/html/training/load-data-background/handle-results.jd
index ce0024f..7439d3e 100644
--- a/docs/html/training/load-data-background/handle-results.jd
+++ b/docs/html/training/load-data-background/handle-results.jd
@@ -127,7 +127,7 @@
*/
@Override
public void onLoaderReset(Loader<Cursor> loader) {
-
+
/*
* Clears out the adapter's reference to the Cursor.
* This prevents memory leaks.
diff --git a/docs/html/training/location/display-address.jd b/docs/html/training/location/display-address.jd
index 8606629..daa6fd3 100644
--- a/docs/html/training/location/display-address.jd
+++ b/docs/html/training/location/display-address.jd
@@ -324,7 +324,7 @@
process if needed. If the service is already running then it remains running.
Because the service extends {@link android.app.IntentService IntentService},
it shuts down automatically when all intents have been processed.</p>
-
+
<p>Start the service from your app's main activity,
and create an {@link android.content.Intent} to pass data to the service. You
need an <em>explicit</em> intent, because you want only your service
diff --git a/docs/html/training/location/geofencing.jd b/docs/html/training/location/geofencing.jd
index 1cf89fd..ce6ad55 100644
--- a/docs/html/training/location/geofencing.jd
+++ b/docs/html/training/location/geofencing.jd
@@ -369,7 +369,7 @@
GEOFENCE_TRANSITION_DWELL</a></code> instead of <code>
<a href="{@docRoot}reference/com/google/android/gms/location/Geofence.html#GEOFENCE_TRANSITION_ENTER">
GEOFENCE_TRANSITION_ENTER</a></code>. This way, the dwelling alert is sent only when the user stops
-inside a geofence for a given period of time. You can choose the duration by setting a
+inside a geofence for a given period of time. You can choose the duration by setting a
<a href="{@docRoot}reference/com/google/android/gms/location/Geofence.Builder.html#setLoiteringDelay(int)">
loitering delay</a>.</p>
diff --git a/docs/html/training/managing-audio/audio-output.jd b/docs/html/training/managing-audio/audio-output.jd
index 416e519..ed1623b 100644
--- a/docs/html/training/managing-audio/audio-output.jd
+++ b/docs/html/training/managing-audio/audio-output.jd
@@ -8,8 +8,8 @@
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>This lesson teaches you to</h2>
@@ -25,16 +25,16 @@
</ul>
-</div>
+</div>
</div>
<p>Users have a number of alternatives when it comes to enjoying the audio from their Android
devices. Most devices have a built-in speaker, headphone jacks for wired headsets, and many also
feature Bluetooth connectivity and support for A2DP audio. </p>
-
-<h2 id="CheckHardware">Check What Hardware is Being Used</h2>
-
+
+<h2 id="CheckHardware">Check What Hardware is Being Used</h2>
+
<p>How your app behaves might be affected by which hardware its output is being routed to.</p>
<p>You can query the {@link android.media.AudioManager} to determine if the audio is currently
@@ -48,13 +48,13 @@
// Adjust output for Speakerphone.
} else if (isWiredHeadsetOn()) {
// Adjust output for headsets
-} else {
+} else {
// If audio plays and noone can hear it, is it still playing?
}
</pre>
-<h2 id="HandleChanges">Handle Changes in the Audio Output Hardware</h2>
+<h2 id="HandleChanges">Handle Changes in the Audio Output Hardware</h2>
<p>When a headset is unplugged, or a Bluetooth device disconnected, the audio stream
automatically reroutes to the built in speaker. If you listen to your music at as high a volume as I
@@ -65,7 +65,7 @@
that listens for this intent whenever you’re playing audio. In the case of music players, users
typically expect the playback to be paused—while for games you may choose to significantly
lower the volume.</p>
-
+
<pre>
private class NoisyAudioStreamReceiver extends BroadcastReceiver {
@Override
diff --git a/docs/html/training/managing-audio/index.jd b/docs/html/training/managing-audio/index.jd
index 9391449..55b91c2 100644
--- a/docs/html/training/managing-audio/index.jd
+++ b/docs/html/training/managing-audio/index.jd
@@ -6,10 +6,10 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
-<h2>Dependencies and prerequisites</h2>
+<h2>Dependencies and prerequisites</h2>
<ul>
<li>Android 2.0 (API level 5) or higher</li>
<li>Experience with <a href="{@docRoot}guide/topics/media/mediaplayer.html">Media
@@ -21,41 +21,41 @@
<li><a href="{@docRoot}guide/components/services.html">Services</a></li>
</ul>
-</div>
+</div>
</div>
<p>If your app plays audio, it’s important that your users can control the audio in a predictable
manner. To ensure a great user experience, it’s also important that your app manages the audio focus
-to ensure multiple apps aren’t playing audio at the same time.</p>
+to ensure multiple apps aren’t playing audio at the same time.</p>
-<p>After this class, you will be able to build apps that respond to hardware audio key presses,
+<p>After this class, you will be able to build apps that respond to hardware audio key presses,
which request audio focus when playing audio, and which respond appropriately to changes in audio
-focus caused by the system or other applications.</p>
+focus caused by the system or other applications.</p>
-<h2>Lessons</h2>
-
+<h2>Lessons</h2>
+
<!-- Create a list of the lessons in this class along with a short description of each lesson.
These should be short and to the point. It should be clear from reading the summary whether someone
-will want to jump to a lesson or not.-->
-
+will want to jump to a lesson or not.-->
+
<dl>
<dt><b><a href="volume-playback.html">Controlling Your App’s Volume and
Playback</a></b></dt>
<dd>Learn how to ensure your users can control the volume of your app using the hardware or
software volume controls and where available the play, stop, pause, skip, and previous media
-playback keys.</dd>
-
+playback keys.</dd>
+
<dt><b><a href="audio-focus.html">Managing Audio Focus</a></b></dt>
<dd>With multiple apps potentially playing audio it's important to think about how they should
interact. To avoid every music app playing at the same time, Android uses audio focus to moderate
audio playback. Learn how to request the audio focus, listen for a loss of audio focus, and how to
-respond when that happens.</dd>
-
+respond when that happens.</dd>
+
<dt><b><a href="audio-output.html">Dealing with Audio Output Hardware</a></b></dt>
<dd>Audio can be played from a number of sources. Learn how to find out where the audio is being
-played and how to handle a headset being disconnected during playback.</dd>
- </dl>
+played and how to handle a headset being disconnected during playback.</dd>
+ </dl>
diff --git a/docs/html/training/managing-audio/volume-playback.jd b/docs/html/training/managing-audio/volume-playback.jd
index be0f583..7e28893 100644
--- a/docs/html/training/managing-audio/volume-playback.jd
+++ b/docs/html/training/managing-audio/volume-playback.jd
@@ -8,8 +8,8 @@
@jd:body
-
-<div id="tb-wrapper">
+
+<div id="tb-wrapper">
<div id="tb">
<h2>This lesson teaches you to</h2>
@@ -26,11 +26,11 @@
<li><a href="{@docRoot}guide/topics/media/mediaplayer.html">Media Playback</a></li>
</ul>
-</div>
+</div>
</div>
-
+
<p>A good user experience is a predictable one. If your app plays media it’s important that your
users can control the volume of your app using the hardware or software volume controls of their
device, bluetooth headset, or headphones.</p>
@@ -38,9 +38,9 @@
<p>Similarly, where appropriate and available, the play, stop, pause, skip, and previous media
playback keys should perform their respective actions on the audio stream used by your app.</p>
-
-<h2 id="IdentifyStream">Identify Which Audio Stream to Use</h2>
-
+
+<h2 id="IdentifyStream">Identify Which Audio Stream to Use</h2>
+
<p>The first step to creating a predictable audio experience is understanding which audio stream
your app will use.</p>
@@ -53,11 +53,11 @@
android.media.AudioManager#STREAM_MUSIC} stream.</p>
-<h2 id="HardwareVolumeKeys">Use Hardware Volume Keys to Control Your App’s Audio Volume</h2>
+<h2 id="HardwareVolumeKeys">Use Hardware Volume Keys to Control Your App’s Audio Volume</h2>
<p>By default, pressing the volume controls modify the volume of the active audio stream. If your
app isn't currently playing anything, hitting the volume keys adjusts the ringer volume.<p>
-
+
<p>If you've got a game or music app, then chances are good that when the user hits the volume keys
they want to control the volume of the game or music, even if they’re currently between songs or
there’s no music in the current game location.</p>
@@ -65,8 +65,8 @@
<p>You may be tempted to try and listen for volume key presses and modify the volume of your
audio stream that way. Resist the urge. Android provides the handy {@link
android.app.Activity#setVolumeControlStream setVolumeControlStream()} method to direct volume key
-presses to the audio stream you specify.<p>
-
+presses to the audio stream you specify.<p>
+
<p>Having identified the audio stream your application
will be using, you should set it as the volume stream target. You should make this call early in
your app’s lifecycle—because you only need to call it once during the activity lifecycle, you
@@ -85,7 +85,7 @@
<h2 id="PlaybackControls">Use Hardware Playback Control Keys to Control Your App’s Audio
-Playback</h2>
+Playback</h2>
<p>Media playback buttons such as play, pause, stop, skip, and previous are available on some
handsets and many connected or wireless headsets. Whenever a user presses one of these hardware
diff --git a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
index d5e7a85..2dd904f 100644
--- a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
@@ -11,7 +11,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>This lesson teaches you to</h2>
@@ -27,7 +27,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Intents and Intent Filters</a>
</ul>
-</div>
+</div>
</div>
<p>Some of the most common uses for repeating alarms and background services is to schedule regular
@@ -39,21 +39,21 @@
connected to the Internet, and if so, what type of connection is in place.</p>
-<h2 id="DetermineConnection">Determine if You Have an Internet Connection</h2>
-
+<h2 id="DetermineConnection">Determine if You Have an Internet Connection</h2>
+
<p>There's no need to schedule an update based on an Internet resource if you aren't connected to
-the Internet. The following snippet shows how to use the {@link android.net.ConnectivityManager}
+the Internet. The following snippet shows how to use the {@link android.net.ConnectivityManager}
to query the active network and determine if it has Internet connectivity.</p>
<pre>ConnectivityManager cm =
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
+
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork != null &&
activeNetwork.isConnectedOrConnecting();</pre>
-<h2 id="DetermineType">Determine the Type of your Internet Connection</h2>
+<h2 id="DetermineType">Determine the Type of your Internet Connection</h2>
<p>It's also possible to determine the type of Internet connection currently available.</p>
@@ -71,7 +71,7 @@
to resume them once an Internet connection has been established.</p>
-<h2 id="MonitorChanges">Monitor for Changes in Connectivity</h2>
+<h2 id="MonitorChanges">Monitor for Changes in Connectivity</h2>
<p>The {@link android.net.ConnectivityManager} broadcasts the {@link
android.net.ConnectivityManager#CONNECTIVITY_ACTION} ({@code
diff --git a/docs/html/training/monitoring-device-state/doze-standby.jd b/docs/html/training/monitoring-device-state/doze-standby.jd
index 9250288..7caef402 100644
--- a/docs/html/training/monitoring-device-state/doze-standby.jd
+++ b/docs/html/training/monitoring-device-state/doze-standby.jd
@@ -306,25 +306,22 @@
</p>
<p>
- An app that is whitelisted can use the network and hold
-
- <a href="{@docRoot}reference/android/os/PowerManager.html#PARTIAL_WAKE_LOCK">
- partial wake locks</a> during Doze and
- App Standby. However, <strong>other restrictions still apply</strong> to the
- whitelisted app, just as they do to other apps. For example, the whitelisted
- app’s jobs and syncs are deferred, and its regular {@link android.app.AlarmManager} alarms do not
- fire. An app can check whether it is currently on the exemption whitelist by
- calling {@link
+ An app that is whitelisted can use the network and hold <a href=
+ "{@docRoot}reference/android/os/PowerManager.html#PARTIAL_WAKE_LOCK">partial
+ wake locks</a> during Doze and App Standby. However, <strong>other
+ restrictions still apply</strong> to the whitelisted app, just as they do to
+ other apps. For example, the whitelisted app’s jobs and syncs are deferred
+ (on API level 23 and below), and its regular {@link android.app.AlarmManager}
+ alarms do not fire. An app can check whether it is currently on the exemption
+ whitelist by calling {@link
android.os.PowerManager#isIgnoringBatteryOptimizations(java.lang.String)
isIgnoringBatteryOptimizations()}.
- </li>
</p>
<p>
Users can manually configure the whitelist in <strong>Settings > Battery
> Battery Optimization.</strong> Alternatively, the system provides
ways for apps to ask users to whitelist them.
-
</p>
<ul>
diff --git a/docs/html/training/monitoring-device-state/manifest-receivers.jd b/docs/html/training/monitoring-device-state/manifest-receivers.jd
index ca184aa5..3e36dba 100644
--- a/docs/html/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html/training/monitoring-device-state/manifest-receivers.jd
@@ -9,7 +9,7 @@
@jd:body
-<div id="tb-wrapper">
+<div id="tb-wrapper">
<div id="tb">
<h2>This lesson teaches you to</h2>
@@ -24,7 +24,7 @@
<li><a href="{@docRoot}guide/components/intents-filters.html">Intents and Intent Filters</a>
</ul>
-</div>
+</div>
</div>
<p>The simplest way to monitor device state changes is to create a {@link
@@ -38,10 +38,10 @@
<p>A better approach is to disable or enable the broadcast receivers at runtime. That way you can
use the receivers you declared in the manifest as passive alarms that are triggered by system events
only when necessary.</p>
-
-<h2 id="ToggleReceivers">Toggle and Cascade State Change Receivers to Improve Efficiency </h2>
-
+
+<h2 id="ToggleReceivers">Toggle and Cascade State Change Receivers to Improve Efficiency </h2>
+
<p>You can use the {@link android.content.pm.PackageManager} to toggle the enabled state on any
component defined in the manifest, including whichever broadcast receivers you wish to enable or
disable as shown in the snippet below:</p>
@@ -59,6 +59,6 @@
stop listening for connectivity changes and simply check to see if you're online immediately before
performing an update and rescheduling a recurring update alarm.</p>
-<p>You can use the same technique to delay a download that requires higher bandwidth to complete.
+<p>You can use the same technique to delay a download that requires higher bandwidth to complete.
Simply enable a broadcast receiver that listens for connectivity changes and initiates the
download only after you are connected to Wi-Fi.</p>
diff --git a/docs/html/training/multiple-threads/create-threadpool.jd b/docs/html/training/multiple-threads/create-threadpool.jd
index e22afd3..df28833 100644
--- a/docs/html/training/multiple-threads/create-threadpool.jd
+++ b/docs/html/training/multiple-threads/create-threadpool.jd
@@ -48,7 +48,7 @@
also occurs in any object that is only instantiated once. To learn more about this, read the
<a href="{@docRoot}guide/components/processes-and-threads.html">
Processes and Threads</a> API guide.
-
+
</p>
<h2 id="ClassStructure">Define the Thread Pool Class</h2>
<p>
diff --git a/docs/html/training/multiscreen/adaptui.jd b/docs/html/training/multiscreen/adaptui.jd
index 34e9d7d..469012b 100644
--- a/docs/html/training/multiscreen/adaptui.jd
+++ b/docs/html/training/multiscreen/adaptui.jd
@@ -10,9 +10,9 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
-
+<div id="tb-wrapper">
+<div id="tb">
+
<h2>This lesson teaches you to</h2>
<ol>
@@ -28,18 +28,18 @@
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Supporting Tablets and
Handsets</a></li>
</ul>
-
+
<h2>Try it out</h2>
-
+
<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Download
the sample app</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+
+</div>
+</div>
<p>Depending on the layout that your application is currently showing, the UI
flow may be different. For example, if your application is in the dual-pane
@@ -66,7 +66,7 @@
setContentView(R.layout.main_layout);
View articleView = findViewById(R.id.article);
- mIsDualPane = articleView != null &&
+ mIsDualPane = articleView != null &&
articleView.getVisibility() == View.VISIBLE;
}
}
@@ -139,7 +139,7 @@
else {
/* use list navigation (spinner) */
actionBar.setNavigationMode(android.app.ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter adap = new ArrayAdapter<String>(this,
+ SpinnerAdapter adap = new ArrayAdapter<String>(this,
R.layout.headline_item, CATEGORIES);
actionBar.setListNavigationCallbacks(adap, handler);
}
@@ -157,7 +157,7 @@
<p>In cases like this, you can usually avoid code duplication by reusing the
same {@link android.app.Fragment} subclass in several activities. For example,
-<code>ArticleFragment</code>
+<code>ArticleFragment</code>
is used in the dual-pane layout:</p>
{@sample development/samples/training/multiscreen/newsreader/res/layout/twopanes.xml all}
@@ -206,7 +206,7 @@
public class HeadlinesFragment extends ListFragment {
...
@Override
- public void onItemClick(AdapterView<?> parent,
+ public void onItemClick(AdapterView<?> parent,
View view, int position, long id) {
if (null != mHeadlineSelectedListener) {
mHeadlineSelectedListener.onHeadlineSelected(position);
diff --git a/docs/html/training/multiscreen/index.jd b/docs/html/training/multiscreen/index.jd
index 8eff246..2c59fac 100644
--- a/docs/html/training/multiscreen/index.jd
+++ b/docs/html/training/multiscreen/index.jd
@@ -7,10 +7,10 @@
@jd:body
-<div id="tb-wrapper">
-<div id="tb">
-
-<h2>Dependencies and prerequisites</h2>
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>Dependencies and prerequisites</h2>
<ul>
<li>Android 1.6 or higher (2.1+ for the sample app)</li>
@@ -28,18 +28,18 @@
<ul>
<li><a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a></li>
</ul>
-
-<h2>Try it out</h2>
-
-<div class="download-box">
+
+<h2>Try it out</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Download
the sample app</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
-
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
+
<p>Android powers hundreds of device types with several different screen sizes,
ranging from small phones to large TV sets. Therefore, it’s important
that you design your application to be compatible with all screen sizes so it’s available to as many
@@ -62,26 +62,26 @@
href="{@docRoot}tools/support-library/index.html">support library</a> in order to use the {@link
android.app.Fragment} APIs on versions lower than Android 3.0. You must download and add the
library to your application in order to use all APIs in this class.</p>
-
-<h2>Lessons</h2>
-
-<dl>
- <dt><b><a href="screensizes.html">Supporting Different Screen Sizes</a></b></dt>
+
+<h2>Lessons</h2>
+
+<dl>
+ <dt><b><a href="screensizes.html">Supporting Different Screen Sizes</a></b></dt>
<dd>This lesson walks you through how to design layouts that adapts
several different screen sizes (using flexible dimensions for
views, {@link android.widget.RelativeLayout}, screen size and orientation qualifiers,
- alias filters, and nine-patch bitmaps).</dd>
-
+ alias filters, and nine-patch bitmaps).</dd>
+
<dt><b><a href="screendensities.html">Supporting Different Screen
- Densities</a></b></dt>
+ Densities</a></b></dt>
<dd>This lesson shows you how to support screens that have different
pixel densities (using density-independent pixels and providing
- bitmaps appropriate for each density).</dd>
-
- <dt><b><a href="adaptui.html">Implementing Adaptative UI Flows</a></b></dt>
+ bitmaps appropriate for each density).</dd>
+
+ <dt><b><a href="adaptui.html">Implementing Adaptative UI Flows</a></b></dt>
<dd>This lesson shows you how to implement your UI flow in a way
that adapts to several screen size/density combinations
(run-time detection of active layout, reacting according to
- current layout, handling screen configuration changes).</dd>
-</dl>
+ current layout, handling screen configuration changes).</dd>
+</dl>
diff --git a/docs/html/training/multiscreen/screensizes.jd b/docs/html/training/multiscreen/screensizes.jd
index 2cd59ee..040bb85 100755
--- a/docs/html/training/multiscreen/screensizes.jd
+++ b/docs/html/training/multiscreen/screensizes.jd
@@ -10,8 +10,8 @@
<!-- This is the training bar -->
-<div id="tb-wrapper">
-<div id="tb">
+<div id="tb-wrapper">
+<div id="tb">
<h2>This lesson teaches you to</h2>
<ol>
@@ -30,27 +30,27 @@
<li><a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a></li>
</ul>
-<h2>Try it out</h2>
-
-<div class="download-box">
+<h2>Try it out</h2>
+
+<div class="download-box">
<a href="http://developer.android.com/shareables/training/NewsReader.zip" class="button">Download
the sample app</a>
-<p class="filename">NewsReader.zip</p>
-</div>
-
-</div>
-</div>
+<p class="filename">NewsReader.zip</p>
+</div>
+
+</div>
+</div>
<p>This lesson shows you how to support different screen sizes by:</p>
-<ul>
- <li>Ensuring your layout can be adequately resized to fit the screen</li>
- <li>Providing appropriate UI layout according to screen configuration</li>
+<ul>
+ <li>Ensuring your layout can be adequately resized to fit the screen</li>
+ <li>Providing appropriate UI layout according to screen configuration</li>
<li>Ensuring the correct layout is applied to the correct screen</li>
- <li>Providing bitmaps that scale correctly</li>
-</ul>
+ <li>Providing bitmaps that scale correctly</li>
+</ul>
-<h2 id="TaskUseWrapMatchPar">Use "wrap_content" and "match_parent"</h2>
+<h2 id="TaskUseWrapMatchPar">Use "wrap_content" and "match_parent"</h2>
<p>To ensure that your layout is flexible and adapts to different screen sizes,
you should use <code>"wrap_content"</code> and <code>"match_parent"</code> for the width
@@ -78,11 +78,11 @@
and landscape (right).</p>
-<h2 id="TaskUseRelativeLayout">Use RelativeLayout</h2>
+<h2 id="TaskUseRelativeLayout">Use RelativeLayout</h2>
<p>You can construct fairly complex layouts using nested instances of {@link
android.widget.LinearLayout} and
-combinations of <code>"wrap_content"</code> and <code>"match_parent"</code> sizes.
+combinations of <code>"wrap_content"</code> and <code>"match_parent"</code> sizes.
However, {@link android.widget.LinearLayout} does not allow you to precisely control the
spacial relationships of child views; views in a {@link android.widget.LinearLayout} simply line up
side-by-side. If you need child views to be oriented in variations other than a straight line, a
@@ -139,8 +139,8 @@
spatial relationships are preserved as specified by the {@link
android.widget.RelativeLayout.LayoutParams}.</p>
-
-<h2 id="TaskUseSizeQuali">Use Size Qualifiers</h2>
+
+<h2 id="TaskUseSizeQuali">Use Size Qualifiers</h2>
<p>There's only so much mileage you can get from a flexible layout or relative layout
like the one in the previous sections. While those layouts adapt to
@@ -148,7 +148,7 @@
may not provide the best user experience for each screen size. Therefore, your
application should not only implement flexible layouts, but should also provide
several alternative layouts to target different screen configurations. You do
-so by using <a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">configuration qualifiers</a>, which allows the runtime
+so by using <a href="http://developer.android.com/guide/practices/screens_support.html#qualifiers">configuration qualifiers</a>, which allows the runtime
to automatically select the appropriate resource based on the current device’s
configuration (such as a different layout design for different screen sizes).</p>
@@ -209,13 +209,13 @@
<p>However, this won't work well on pre-3.2 devices, because they don't
recognize <code>sw600dp</code> as a size qualifier, so you still have to use the <code>large</code>
-qualifier as well. So, you should have a file named
+qualifier as well. So, you should have a file named
<code>res/layout-large/main.xml</code>
which is identical to <code>res/layout-sw600dp/main.xml</code>. In the next section
you'll see a technique that allows you to avoid duplicating the layout files this way.</p>
-<h2 id="TaskUseAliasFilters">Use Layout Aliases</h2>
+<h2 id="TaskUseAliasFilters">Use Layout Aliases</h2>
<p>The smallest-width qualifier is available only on Android 3.2 and above.
Therefore, you should also still use the abstract size bins (small, normal,
@@ -271,7 +271,7 @@
{@code large}, and post-3.2 will match <code>sw600dp</code>).</p>
-<h2 id="TaskUseOriQuali">Use Orientation Qualifiers</h2>
+<h2 id="TaskUseOriQuali">Use Orientation Qualifiers</h2>
<p>Some layouts work well in both landscape and portrait orientations, but most of them can
benefit from adjustments. In the News Reader sample app, here is how the layout
@@ -287,7 +287,7 @@
<li><b>TV, landscape:</b> dual pane, wide, with action bar</li>
</ul></p>
-<p>So each of these layouts is defined in an XML file in the
+<p>So each of these layouts is defined in an XML file in the
<code>res/layout/</code> directory. To then assign each layout to the various screen
configurations, the app uses layout aliases to match them to
each configuration:</p>
@@ -361,7 +361,7 @@
the right and bottom borders indicate where the content should be
placed.</p>
-<p>Also, notice the <code>.9.png</code> extension. You must use this
+<p>Also, notice the <code>.9.png</code> extension. You must use this
extension, since this is how the framework detects that this is a nine-patch
image, as opposed to a regular PNG image.</p>
diff --git a/docs/html/training/notify-user/build-notification.jd b/docs/html/training/notify-user/build-notification.jd
index d24a496..7df2787 100644
--- a/docs/html/training/notify-user/build-notification.jd
+++ b/docs/html/training/notify-user/build-notification.jd
@@ -31,7 +31,7 @@
</a>
</li>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design Guide
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design Guide
</li>
</ul>
@@ -42,9 +42,9 @@
<p>This lesson explains how to create and issue a notification.</p>
-<p>The examples in this class are based on the
-{@link android.support.v4.app.NotificationCompat.Builder} class.
-{@link android.support.v4.app.NotificationCompat.Builder}
+<p>The examples in this class are based on the
+{@link android.support.v4.app.NotificationCompat.Builder} class.
+{@link android.support.v4.app.NotificationCompat.Builder}
is in the <a href="{@docRoot}">Support Library</a>. You should use
{@link android.support.v4.app.NotificationCompat} and its subclasses,
particularly {@link android.support.v4.app.NotificationCompat.Builder}, to
@@ -52,9 +52,9 @@
<h2 id="builder">Create a Notification Builder</h2>
-<p>When creating a notification, specify the UI content and actions with a
-{@link android.support.v4.app.NotificationCompat.Builder} object. At bare minimum,
-a {@link android.support.v4.app.NotificationCompat.Builder Builder}
+<p>When creating a notification, specify the UI content and actions with a
+{@link android.support.v4.app.NotificationCompat.Builder} object. At bare minimum,
+a {@link android.support.v4.app.NotificationCompat.Builder Builder}
object must include the following:</p>
<ul>
@@ -96,7 +96,7 @@
android.app.Activity} from a notification, you must preserve the user's expected
navigation experience. In the snippet below, clicking the notification opens a
new activity that effectively extends the behavior of the notification. In this
-case there is no need to create an artificial back stack (see
+case there is no need to create an artificial back stack (see
<a href="navigation.html">Preserving Navigation when Starting an Activity</a> for
more information):</p>
@@ -132,11 +132,11 @@
<p>To issue the notification:</p>
<ul>
-<li>Get an instance of {@link android.app.NotificationManager}.</li>
+<li>Get an instance of {@link android.app.NotificationManager}.</li>
-<li>Use the {@link android.app.NotificationManager#notify notify()} method to issue the
-notification. When you call {@link android.app.NotificationManager#notify notify()}, specify a notification ID.
-You can use this ID to update the notification later on. This is described in more detail in
+<li>Use the {@link android.app.NotificationManager#notify(String, int, Notification)} method to issue the
+notification. When you call {@link android.app.NotificationManager#notify(String, int, Notification)}, specify a notification ID.
+You can use this ID to update the notification later on. This is described in more detail in
<a href="managing.html">Managing Notifications</a>.</li>
<li>Call {@link
@@ -152,7 +152,7 @@
// Sets an ID for the notification
int mNotificationId = 001;
// Gets an instance of the NotificationManager service
-NotificationManager mNotifyMgr =
+NotificationManager mNotifyMgr =
(NotificationManager) getSystemService(NOTIFICATION_SERVICE);
// Builds the notification and issues it.
mNotifyMgr.notify(mNotificationId, mBuilder.build());
diff --git a/docs/html/training/notify-user/display-progress.jd b/docs/html/training/notify-user/display-progress.jd
index 3439571..9018eb1 100644
--- a/docs/html/training/notify-user/display-progress.jd
+++ b/docs/html/training/notify-user/display-progress.jd
@@ -29,7 +29,7 @@
</a>
</li>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design Guide
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design Guide
</li>
</ul>
@@ -59,9 +59,9 @@
<h2 id="FixedProgress">Display a Fixed-duration Progress Indicator</h2>
<p>
To display a determinate progress bar, add the bar to your notification by calling
- {@link android.support.v4.app.NotificationCompat.Builder#setProgress
- setProgress(max, progress, false)} and then issue the notification.
- The third argument is a boolean that indicates whether the
+ {@link android.support.v4.app.NotificationCompat.Builder#setProgress
+ setProgress(max, progress, false)} and then issue the notification.
+ The third argument is a boolean that indicates whether the
progress bar is indeterminate (<strong>true</strong>) or determinate (<strong>false</strong>).
As your operation proceeds,
increment <code>progress</code>, and update the notification. At the end of the operation,
@@ -74,7 +74,7 @@
You can either leave the progress bar showing when the operation is done, or remove it. In
either case, remember to update the notification text to show that the operation is complete.
To remove the progress bar, call
- {@link android.support.v4.app.NotificationCompat.Builder#setProgress
+ {@link android.support.v4.app.NotificationCompat.Builder#setProgress
setProgress(0, 0, false)}. For example:
</p>
<pre>
@@ -136,14 +136,14 @@
<p>
To display a continuing (indeterminate) activity indicator, add it to your notification with
{@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress(0, 0, true)}
- and issue the notification. The first two arguments are ignored, and the third argument
+ and issue the notification. The first two arguments are ignored, and the third argument
declares that the indicator is indeterminate. The result is an indicator
that has the same style as a progress bar, except that its animation is ongoing.
</p>
<p>
Issue the notification at the beginning of the operation. The animation will run until you
modify your notification. When the operation is done, call
- {@link android.support.v4.app.NotificationCompat.Builder#setProgress
+ {@link android.support.v4.app.NotificationCompat.Builder#setProgress
setProgress(0, 0, false)} and then update the notification to remove the activity indicator.
Always do this; otherwise, the animation will run even when the operation is complete. Also
remember to change the notification text to indicate that the operation is complete.
@@ -160,7 +160,7 @@
</pre>
<p>
Replace the lines you've found with the following lines. Notice that the third parameter
- in the {@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}
+ in the {@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()}
call is set to {@code true} to indicate that the progress bar is
indeterminate:
</p>
diff --git a/docs/html/training/notify-user/expanded.jd b/docs/html/training/notify-user/expanded.jd
index b657426..60853ca 100644
--- a/docs/html/training/notify-user/expanded.jd
+++ b/docs/html/training/notify-user/expanded.jd
@@ -29,7 +29,7 @@
</a>
</li>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design Guide
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design Guide
</li>
</ul>
@@ -75,7 +75,7 @@
</ul>
<p>The normal view provides these features through a new activity that launches
-when the user clicks the notification. Keep this in mind as you design your notifications—first
+when the user clicks the notification. Keep this in mind as you design your notifications—first
provide the functionality in the normal view, since
this is how many users will interact with the notification.</p>
@@ -87,19 +87,19 @@
<p>In this snippet, the
{@link android.app.IntentService} method
-{@link android.app.IntentService#onHandleIntent onHandleIntent()} specifies the new activity
+{@link android.app.IntentService#onHandleIntent onHandleIntent()} specifies the new activity
that will be launched if the user
-clicks the notification itself. The method
-{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent setContentIntent()}
+clicks the notification itself. The method
+{@link android.support.v4.app.NotificationCompat.Builder#setContentIntent setContentIntent()}
defines a pending intent that should be fired when the user
clicks the notification, thereby launching the activity.</p>
<pre>Intent resultIntent = new Intent(this, ResultActivity.class);
resultIntent.putExtra(CommonConstants.EXTRA_MESSAGE, msg);
-resultIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+resultIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-// Because clicking the notification launches a new ("special") activity,
+
+// Because clicking the notification launches a new ("special") activity,
// there's no need to create an artificial back stack.
PendingIntent resultPendingIntent =
PendingIntent.getActivity(
@@ -130,8 +130,8 @@
PendingIntent piSnooze = PendingIntent.getService(this, 0, snoozeIntent, 0);
</pre>
-<p>This snippet shows how to construct the
-{@link android.support.v4.app.NotificationCompat.Builder Builder} object.
+<p>This snippet shows how to construct the
+{@link android.support.v4.app.NotificationCompat.Builder Builder} object.
It sets the style for the big
view to be "big text," and sets its content to be the reminder message. It uses
{@link android.support.v4.app.NotificationCompat.Builder#addAction addAction()}
diff --git a/docs/html/training/notify-user/index.jd b/docs/html/training/notify-user/index.jd
index 616e767..4d930e0 100644
--- a/docs/html/training/notify-user/index.jd
+++ b/docs/html/training/notify-user/index.jd
@@ -27,7 +27,7 @@
</a>
</li>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design Guide
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design Guide
</li>
</ul>
@@ -43,14 +43,14 @@
</div>
<p>
- A notification is a user interface element that you display outside your app's normal UI to indicate
- that an event has occurred. Users can choose to view the notification while using other apps and respond
- to it when it's convenient for them.
+ A notification is a user interface element that you display outside your app's normal UI to indicate
+ that an event has occurred. Users can choose to view the notification while using other apps and respond
+ to it when it's convenient for them.
</p>
<p>
- The <a href="{@docRoot}design/patterns/notifications.html">Notifications design guide</a> shows
+ The <a href="https://material.google.com/patterns/notifications.html">Notifications design guide</a> shows
you how to design effective notifications and when to use them. This class shows you how to
implement the most common notification designs.
</p>
@@ -86,10 +86,10 @@
</strong>
</dt>
<dd>
- Learn how to create a big view within an expanded notification, while still maintaining
+ Learn how to create a big view within an expanded notification, while still maintaining
backward compatibility.
</dd>
-
+
<dt>
<strong>
<a href="display-progress.html">Displaying Progress in a Notification</a>
diff --git a/docs/html/training/notify-user/managing.jd b/docs/html/training/notify-user/managing.jd
index fc12cfb..c68d6f9 100644
--- a/docs/html/training/notify-user/managing.jd
+++ b/docs/html/training/notify-user/managing.jd
@@ -29,7 +29,7 @@
</a>
</li>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design Guide
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design Guide
</li>
</ul>
diff --git a/docs/html/training/notify-user/navigation.jd b/docs/html/training/notify-user/navigation.jd
index b7051ab..65f8d48b 100644
--- a/docs/html/training/notify-user/navigation.jd
+++ b/docs/html/training/notify-user/navigation.jd
@@ -29,7 +29,7 @@
</a>
</li>
<li>
- <a href="{@docRoot}design/patterns/notifications.html">Notifications</a> Design Guide
+ <a href="https://material.google.com/patterns/notifications.html">Notifications</a> Design Guide
</li>
</ul>
@@ -37,7 +37,7 @@
</div>
</div>
<p>
- Part of designing a notification is preserving the user's expected navigation experience.
+ Part of designing a notification is preserving the user's expected navigation experience.
For a detailed discussion of this topic, see the
<a href="{@docRoot}guide/topics/ui/notifiers/notifications.html#NotificationResponse">Notifications</a>
API guide.
@@ -49,7 +49,7 @@
</dt>
<dd>
You're starting an {@link android.app.Activity} that's part of the application's normal
- workflow.
+ workflow.
</dd>
<dt>
Special activity
@@ -202,7 +202,7 @@
Intent notifyIntent =
new Intent(new ComponentName(this, ResultActivity.class));
// Sets the Activity to start in a new, empty task
-notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_CLEAR_TASK);
// Creates the PendingIntent
PendingIntent notifyIntent =
diff --git a/docs/html/training/run-background-service/report-status.jd b/docs/html/training/run-background-service/report-status.jd
index 41121c1..41fbb00 100644
--- a/docs/html/training/run-background-service/report-status.jd
+++ b/docs/html/training/run-background-service/report-status.jd
@@ -91,7 +91,7 @@
</p>
<h2 id="ReceiveStatus">Receive Status Broadcasts from an IntentService</h2>
<p>
-
+
To receive broadcast {@link android.content.Intent} objects, use a subclass of
{@link android.content.BroadcastReceiver}. In the subclass, implement the
{@link android.content.BroadcastReceiver#onReceive BroadcastReceiver.onReceive()} callback
@@ -137,7 +137,7 @@
// The filter's action is BROADCAST_ACTION
IntentFilter mStatusIntentFilter = new IntentFilter(
Constants.BROADCAST_ACTION);
-
+
// Adds a data filter for the HTTP scheme
mStatusIntentFilter.addDataScheme("http");
...
@@ -194,6 +194,6 @@
{@link android.content.Intent}.
</p>
<p>
-
+
</p>
diff --git a/docs/html/training/sign-in/index.jd b/docs/html/training/sign-in/index.jd
index d7c8e1d..a585944 100644
--- a/docs/html/training/sign-in/index.jd
+++ b/docs/html/training/sign-in/index.jd
@@ -11,8 +11,8 @@
alt="Google maps sample image">
<p>
- Google Sign-In for Android lets you authenticate a user with the same credentials they use on
- Google. After a user signs in with Google, you can create more engaging experiences and drive
+ Google Sign-In for Android lets you authenticate a user with the same credentials they use on
+ Google. After a user signs in with Google, you can create more engaging experiences and drive
usage of your app.
</p>
@@ -34,8 +34,8 @@
<h4>Access the profile and social graph</h4>
<p>
- After users have signed in with Google, your app can welcome them by name and display their
- picture. If your app requests social scopes, it can connect users with friends, and access
+ After users have signed in with Google, your app can welcome them by name and display their
+ picture. If your app requests social scopes, it can connect users with friends, and access
age range, language, and public profile information.<br>
<a href="https://developers.google.com/identity/sign-in/android/people" class="external-link">
Getting Profile Information</a>.
@@ -47,6 +47,6 @@
The Google Android APIs are part of the Google Play services platform. To use Google features,
set up the Google Play services SDK in your app development project. For more information, see
the <a class="external-link" href=
- "https://developers.google.com/identity/sign-in/android/start-integrating">Start Integrating</a>
+ "https://developers.google.com/identity/sign-in/android/start-integrating">Start Integrating</a>
guide for Google Sign-In.
</p>
\ No newline at end of file
diff --git a/docs/html/training/testing/integration-testing/service-testing.jd b/docs/html/training/testing/integration-testing/service-testing.jd
index 60b95ca..7ba00b0 100644
--- a/docs/html/training/testing/integration-testing/service-testing.jd
+++ b/docs/html/training/testing/integration-testing/service-testing.jd
@@ -81,7 +81,7 @@
<a href="{@docRoot}training/testing/unit-testing/instrumented-unit-tests.html#build">
Create an Instrumented Unit Test Class</a>.</p>
-<p>To create an integration test for your service, add the {@code @RunWith(AndroidJUnit4.class)}
+<p>To create an integration test for your service, add the {@code @RunWith(AndroidJUnit4.class)}
annotation at the beginning of your test class definition. You also need to specify the
<a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">
{@code AndroidJUnitRunner}</a> class that the Android Testing Support Library provides as your
@@ -91,7 +91,7 @@
<p>Next, create a
<a href="{@docRoot}reference/android/support/test/rule/ServiceTestRule.html">ServiceTestRule</a>
-instance in your test by using the {@code @Rule} annotation.</p>
+instance in your test by using the {@code @Rule} annotation.</p>
<pre>
@Rule
diff --git a/docs/html/training/testing/ui-testing/espresso-testing.jd b/docs/html/training/testing/ui-testing/espresso-testing.jd
index 7df67e7..d3d31de 100644
--- a/docs/html/training/testing/ui-testing/espresso-testing.jd
+++ b/docs/html/training/testing/ui-testing/espresso-testing.jd
@@ -188,9 +188,9 @@
{@code ActivityTestRule}</a> to reduce the amount of boilerplate code you need to write. By using
<a href="{@docRoot}reference/android/support/test/rule/ActivityTestRule.html">
{@code ActivityTestRule}</a>, the testing framework launches the activity under test
-before each test method annotated with {@code @Test} and before any method annotated with
-{@code @Before}. The framework handles shutting down the activity after the test finishes
-and all methods annotated with {@code @After} are run.</p>
+before each test method annotated with <code>@Test</code> and before any method annotated with
+<code>@Before</code>. The framework handles shutting down the activity after the test finishes
+and all methods annotated with <code>@After</code> are run.</p>
<pre>
package com.example.android.testing.espresso.BasicSample;
diff --git a/docs/html/training/testing/ui-testing/uiautomator-testing.jd b/docs/html/training/testing/ui-testing/uiautomator-testing.jd
index 05ddc34..53f497a 100644
--- a/docs/html/training/testing/ui-testing/uiautomator-testing.jd
+++ b/docs/html/training/testing/ui-testing/uiautomator-testing.jd
@@ -26,7 +26,7 @@
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}reference/android/support/test/package-summary.html">
+ <li><a href="{@docRoot}reference/android/support/test/uiautomator/package-summary.html">
UI Automator API Reference</a></li>
</ul>
@@ -172,7 +172,7 @@
<a href="{@docRoot}training/testing/unit-testing/instrumented-unit-tests.html#build">
Create an Instrumented Unit Test Class</a>.
</p>
-<p>Add the {@code @RunWith(AndroidJUnit4.class)} annotation at the beginning of your test class
+<p>Add the {@code @RunWith(AndroidJUnit4.class)} annotation at the beginning of your test class
definition. You also need to specify the
<a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">
{@code AndroidJUnitRunner}</a> class
@@ -279,7 +279,7 @@
}
</pre>
-<p>In the example, the {@code @SdkSuppress(minSdkVersion = 18)} statement helps to ensure that
+<p>In the example, the {@code @SdkSuppress(minSdkVersion = 18)} statement helps to ensure that
tests will only run on devices with Android 4.3 (API level 18) or higher, as required by the
UI Automator framework.</p>
diff --git a/docs/html/training/testing/unit-testing/instrumented-unit-tests.jd b/docs/html/training/testing/unit-testing/instrumented-unit-tests.jd
index f65766d..00622ee 100644
--- a/docs/html/training/testing/unit-testing/instrumented-unit-tests.jd
+++ b/docs/html/training/testing/unit-testing/instrumented-unit-tests.jd
@@ -122,7 +122,7 @@
creating JUnit 4 test classes and using JUnit 4 assertions and annotations, see
<a href="local-unit-tests.html#build">Create a Local Unit Test Class</a>.
</p>
-<p>To create an instrumented JUnit 4 test class, add the {@code @RunWith(AndroidJUnit4.class)}
+<p>To create an instrumented JUnit 4 test class, add the {@code @RunWith(AndroidJUnit4.class)}
annotation at the beginning of your test class definition. You also need to specify the
<a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">
{@code AndroidJUnitRunner}</a> class
@@ -200,8 +200,8 @@
class="external-link">{@code RunWith}</a> and
<a href="http://junit.sourceforge.net/javadoc/org/junit/runners/Suite.html"
class="external-link">{@code Suite}</a> classes. In your test suite, add the
-{@code @RunWith(Suite.class)} and the {@code @Suite.SuitClasses()} annotations. In
-the {@code @Suite.SuiteClasses()} annotation, list the individual test classes or test
+{@code @RunWith(Suite.class)} and the {@code @Suite.SuitClasses()} annotations. In
+the {@code @Suite.SuiteClasses()} annotation, list the individual test classes or test
suites as arguments.
</p>
diff --git a/docs/html/training/testing/unit-testing/local-unit-tests.jd b/docs/html/training/testing/unit-testing/local-unit-tests.jd
index 25b62fa..8b109ee 100644
--- a/docs/html/training/testing/unit-testing/local-unit-tests.jd
+++ b/docs/html/training/testing/unit-testing/local-unit-tests.jd
@@ -80,7 +80,7 @@
{@code junit.extensions} package.</p>
<p>To create a basic JUnit 4 test class, create a Java class that contains one or more test methods.
-A test method begins with the {@code @Test} annotation and contains the code to exercise
+A test method begins with the {@code @Test} annotation and contains the code to exercise
and verify a single functionality in the component that you want to test.</p>
<p>The following example shows how you might implement a local unit test class. The test method
@@ -136,11 +136,11 @@
<a href="#setup">Set Up Your Testing Environment</a>.
</li>
<li>At the beginning of your unit test class definition, add the
-{@code @RunWith(MockitoJUnitRunner.class)} annotation. This annotation tells the Mockito test
+{@code @RunWith(MockitoJUnitRunner.class)} annotation. This annotation tells the Mockito test
runner to validate that your usage of the framework is correct and simplifies the initialization of
your mock objects.
</li>
-<li>To create a mock object for an Android dependency, add the {@code @Mock} annotation before
+<li>To create a mock object for an Android dependency, add the {@code @Mock} annotation before
the field declaration.</li>
<li>To stub the behavior of the dependency, you can specify a condition and return
value when the condition is met by using the {@code when()} and {@code thenReturn()} methods.
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index e2aa5f4..d0dccba 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -656,7 +656,7 @@
description=
"How to sync and back up app and user data to remote web services in the
cloud and how to restore the data back to multiple devices."
- >Syncing to the Cloud</a>
+ >Backing up App Data to the Cloud</a>
</div>
<ul>
<li><a href="<?cs var:toroot ?>training/backup/autosyncapi.html">
diff --git a/docs/html/training/tv/playback/picture-in-picture.jd b/docs/html/training/tv/playback/picture-in-picture.jd
new file mode 100644
index 0000000..e48ae48
--- /dev/null
+++ b/docs/html/training/tv/playback/picture-in-picture.jd
@@ -0,0 +1,242 @@
+page.title=Adding Picture-in-picture
+page.keywords=preview,sdk,PIP,Picture-in-picture
+page.tags=androidn
+helpoutsWidget=true
+
+trainingnavtop=true
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+
+<h2>In this document</h2>
+<ol>
+ <li><a href="#declaring">Declaring Your Activity Supports
+Picture-in-picture</a></li>
+ <li><a href="#pip_button">Switching Your Activity to Picture-in-picture</a>
+</li>
+ <li><a href="#handling_ui">Handling UI During Picture-in-picture</a>
+</li>
+ <li><a href="#continuing_playback">Continuing Video Playback While in
+Picture-in-picture</a></li>
+ <li><a href="#single_playback">Using a Single Playback Activity for
+Picture-in-picture</a></li>
+ <li><a href="#best">Best Practices</a></li>
+</ol>
+
+<h2>See Also</h2>
+<ol>
+ <li><a href="{@docRoot}preview/features/multi-window.html">Multi-Window
+Support</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>In Android 7.0, Android TV users can now watch a video
+in a pinned window in a corner of the screen when navigating within or
+between apps. Picture-in-picture (PIP) mode lets apps run a video
+activity in the pinned window while another activity continues in the
+background. The PIP window lets users multitask while using Android TV,
+which helps users be more productive.</p>
+
+<p>Your app can decide when to trigger PIP mode. Here are some examples of
+when to enter PIP mode:</p>
+
+<ul>
+<li>Your app can move a video into PIP mode when the user navigates
+back from the video to browse other content.</li>
+<li>Your app can switch a video into PIP mode while a user watches the end
+of an episode of content. The main screen displays promotional or summary
+information about the next episode in the series.</li>
+<li>Your app can provide a way for users to queue up additional content while
+they watch a video. The video continues playing in PIP mode while the main
+screen displays a content selection activity.</li>
+</ul>
+
+<p>The PIP window is 240x135 dp and is shown at the top-most layer in one of
+the four corners of the screen, chosen by the system. The user can bring up a
+PIP menu that lets them toggle the PIP window to full-screen, or close the PIP
+window, by holding down the <b>Home</b> button on the remote. If another
+video starts playing on the main screen, the PIP window is automatically
+closed.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-active.png" />
+<p class="img-caption"><strong>Figure 1.</strong> A Picture-in-picture
+video visible in a corner of the screen while the user browses content
+on the main screen.</p>
+
+<p>PIP leverages the multi-window APIs available in Android 7.0 to
+provide the pinned video overlay window. To add PIP to your app, you need to
+register your activities that support PIP, switch your activity to PIP mode as
+needed, and make sure UI elements are hidden and video playback continues when
+the activity is in PIP mode.</p>
+
+<h2 id="declaring">Declaring Your Activity Supports Picture-in-picture</h2>
+
+<p>By default, the system does not automatically support PIP for apps.
+If you want support PIP in your app, register your video
+activity in your manifest by setting
+<code>android:supportsPictureInPicture</code> and
+<code>android:resizeableActivity</code> to <code>true</code>. Also, specify
+that your activity handles layout configuration changes so that your activity
+doesn't relaunch when layout changes occur during PIP mode transitions.</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ ...
+</pre>
+
+<p>When registering your activity, keep in mind that in PIP mode, your
+activity is shown in a small overlay window on a TV screen. Video playback
+activities with minimal UI provide the best user experience. Activities that
+contain small UI elements might not provide a good user experience
+when switched to PIP mode, because users can't see details of the UI elements
+in the PIP window.</p>
+
+<h2 id="pip_button">Switching Your Activity to Picture-in-picture</h2>
+
+When you need to switch your activity into PIP mode, call
+{@link android.app.Activity#enterPictureInPictureMode
+enterPictureInPictureMode()}. The following example
+switches to PIP mode when the user selects a dedicated PIP button on a media
+control bar:</p>
+
+<pre>
+@Override
+public void onActionClicked(Action action) {
+ if (action.getId() == R.id.lb_control_picture_in_picture) {
+ getActivity().enterPictureInPictureMode();
+ return;
+ }
+ ...
+</pre>
+
+<p>Adding a PIP button to your media control bar lets your user easily switch
+to PIP mode while controlling video playback.</p>
+
+<img src="{@docRoot}images/android-7.0/pip-button.png" />
+<p class="img-caption"><strong>Figure 1.</strong> A Picture-in-picture
+button on a media control bar.</p>
+
+<p>Android 7.0 includes a
+{@link android.support.v17.leanback.widget.PlaybackControlsRow.PictureInPictureAction
+PlaybackControlsRow.PictureInPictureAction} class which defines
+control bar PIP actions and uses the PIP icon.</p>
+
+<h2 id="handling_ui">Handling UI During Picture-in-picture</h2>
+
+<p>When your activity enters PIP mode, your activity should only show video
+playback. Remove UI elements before your activity enters PIP,
+and restore these elements when your activity becomes full-screen again.
+Override {@link android.app.Activity#onPictureInPictureModeChanged
+Activity.onPictureInPictureModeChanged()} or
+{@link android.app.Fragment#onPictureInPictureModeChanged
+Fragment.onPictureInPictureModeChanged()} and enable or
+disable your UI elements as needed, for example:</p>
+
+<pre>
+@Override
+public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+ if (isInPictureInPictureMode) {
+ // Hide the controls in picture-in-picture mode.
+ ...
+ } else {
+ // Restore the playback UI based on the playback status.
+ ...
+ }
+}
+</pre>
+
+<h2 id="continuing_playback">Continuing Video Playback While in
+Picture-in-picture</h2>
+
+<p>When your activity switches to PIP, the system considers the activity in a
+paused state, and calls your activity's {@link android.app.Activity#onPause
+onPause()} method. Video playback should not be paused and should continue
+playing if the activity is paused due to PIP mode.</p>
+
+<p>In Android 7.0, you should pause and resume video playback when the system
+calls your activity's {@link android.app.Activity#onStop onStop()} and
+{@link android.app.Activity#onStart onStart()}. By doing this, you can avoid
+having to check if your app is in PIP mode in
+{@link android.app.Activity#onPause onPause()} and explicitly
+continuing playback.</p>
+
+<p>If you have to pause playback in your {@link android.app.Activity#onPause
+onPause()} implementation, check for PIP mode by calling {@code
+isInPictureInPictureMode()} and handle playback appropriately, for example:</p>
+
+<pre>
+@Override
+public void onPause() {
+ // If called while in PIP mode, do not pause playback
+ if (isInPictureInPictureMode()) {
+ // Continue playback
+ ...
+ }
+ // If paused but not in PIP, pause playback if necessary
+ ...
+}
+</pre>
+
+<p>When your activity switches out of PIP mode back to full-screen mode, the
+system resumes your activity and calls your
+{@link android.app.Activity#onResume onResume()} method.</p>
+
+<h2 id="single_playback">Using a Single Playback Activity for
+Picture-in-picture</h2>
+
+<p>In your app, a user might select a new video when browsing for content on
+the main screen, while a video playback activity is in PIP mode. Play the new
+video in the existing playback activity in full screen mode, instead of
+launching a new activity that might confuse the user.</p>
+
+<p>To ensure a single activity is used for video playback requests and
+switched into or out of PIP mode as needed, set the activity's
+<code>android:launchMode</code> to <code>singleTask</code> in your manifest:
+</p>
+
+<pre>
+<activity android:name="VideoActivity"
+ ...
+ android:supportsPictureInPicture="true"
+ android:launchMode="singleTask"
+ ...
+</pre>
+
+<p>In your activity, override {@link android.app.Activity#onNewIntent
+onNewIntent()} and handle the new video, stopping any existing video
+playback if needed.</p>
+
+<h2 id="best">Best Practices</h2>
+
+<p>PIP is intended for activities that play full-screen video. When switching
+your activity into PIP mode, avoid showing anything except video content.
+Track when your activity enters PIP mode and hide UI elements, as described
+in <a href="#handling_ui">Handling UI During Picture-in-picture</a>.</p>
+
+<p>Since the PIP window is shown as a floating window in the corner of the
+screen, you should avoid showing critical information in the main screen
+in any area that can be obscured by the PIP window.</p>
+
+<p>When an activity is in PIP mode, by default it doesn't get input focus. To
+receive input events while in PIP mode, use
+{@link android.media.session.MediaSession#setCallback
+MediaSession.setCallback()}. For more information on using
+{@link android.media.session.MediaSession#setCallback setCallback()} see
+<a href="{@docRoot}training/tv/playback/now-playing.html">Displaying
+a Now Playing Card</a>.</p>
+
+<p>When your app is in PIP mode, video playback in the PIP window can cause
+audio interference with another app, such as a music player app or voice search
+app. To avoid this, request audio focus when you start playing the video,
+and handle audio focus change notifications, as described in
+<a href="{@docRoot}training/managing-audio/audio-focus.html">Managing Audio
+Focus</a>. If you receive notification of audio focus loss when in PIP mode,
+pause or stop video playback.</p>
diff --git a/docs/html/training/tv/tif/channel.jd b/docs/html/training/tv/tif/channel.jd
index 999f1ca..59e357a 100644
--- a/docs/html/training/tv/tif/channel.jd
+++ b/docs/html/training/tv/tif/channel.jd
@@ -13,6 +13,7 @@
<li><a href="#permission">Get Permission</a></li>
<li><a href="#register">Register Channels in the Database</a></li>
<li><a href="#update">Update Channel Data</a></li>
+ <li><a href="#applink">Add App Link Information</a></li>
</ol>
<h2>Try It Out</h2>
<ul>
@@ -22,10 +23,13 @@
</div>
</div>
-<p>Your TV input must provide Electronic Program Guide (EPG) data for at least one channel in its
-setup activity. You should also periodically update that data, with consideration for the size of
-the update and the processing thread that handles it. This lesson discusses creating and updating
-channel and program data on the system database with these considerations in mind.</p>
+<p>Your TV input must provide Electronic Program Guide (EPG) data for at least
+one channel in its setup activity. You should also periodically update that
+data, with consideration for the size of the update and the processing thread
+that handles it. Additionally, you can provide app links for channels
+that guide the user to related content and activities.
+This lesson discusses creating and updating channel and program data on the
+system database with these considerations in mind.</p>
<p> </p>
@@ -70,6 +74,10 @@
ID</li>
</ul>
+<p>If you want to provide app link details for your channels, you need to
+update some additional fields. For more information on app link fields, see
+<a href="#applink">Add App Link Information</a>.
+
<p>For internet streaming based TV inputs, assign your own values to the above accordingly so that
each channel can be identified uniquely.</p>
@@ -236,4 +244,112 @@
<p>Other techniques to separate the data update tasks from the UI thread include using the
{@link android.os.HandlerThread} class, or you may implement your own using {@link android.os.Looper}
and {@link android.os.Handler} classes. See <a href="{@docRoot}guide/components/processes-and-threads.html">
-Processes and Threads</a> for more information.</p>
\ No newline at end of file
+Processes and Threads</a> for more information.</p>
+
+<h2 id="applink">Add App Link Information</h2>
+
+<p>Channels can use <em>app links</em> to let users easily launch a related
+activity while they are watching channel content. Channel apps use
+app links to extend user engagement by launching activities that show
+related information or additional content. For example, you can use app links
+to do the following:</p>
+
+<ul>
+<li>Guide the user to discover and purchase related content.</li>
+<li>Provide additional information about currently playing content.</li>
+<li>While viewing episodic content, start viewing the next episode in a
+series.</li>
+<li>Let the user interact with content—for example, rate or review
+content—without interrupting content playback.</li>
+</ul>
+
+<p>App links are displayed when the user presses <b>Select</b> to show the
+TV menu while watching channel content.</p>
+
+<img alt="" src="{@docRoot}images/training/tv/tif/app-link.png"
+srcset="{@docRoot}images/training/tv/tif/app-link.png 1x,
+{@docRoot}images/training/tv/tif/app-link-2x.png 2x" id="figure1"/>
+<p class="img-caption"><strong>Figure 1.</strong> An example app link
+displayed on the <b>Channels</b> row while channel content is shown.</p>
+
+<p>When the user selects the app link, the system starts an activity using
+an intent URI specified by the channel app. Channel content continues to play
+while the app link activity is active. The user can return to the channel
+content by pressing <b>Back</b>.</p>
+
+<h3 id="card">Provide App Link Channel Data</h4>
+
+<p>Android TV automatically creates an app link for each channel,
+using information from the channel data. To provide app link information,
+specify the following details in your
+{@link android.media.tv.TvContract.Channels} fields:
+</p>
+
+<ul>
+<li>{@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_COLOR} - The
+accent color of the app link for this channel. For an example accent color,
+see figure 2, callout 3.
+</li>
+<li>{@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_ICON_URI} -
+The URI for the app badge icon of the app link for this channel. For an
+example app badge icon, see figure 2, callout 2.
+</li>
+<li>{@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_INTENT_URI} -
+The intent URI of the app link for this channel. You can create the URI
+using {@link android.content.Intent#toUri(int) toUri(int)} with
+{@link android.content.Intent#URI_INTENT_SCHEME URI_INTENT_SCHEME} and
+convert the URI back to the original intent with
+{@link android.content.Intent#parseUri parseUri()}.
+</li>
+<li>{@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_POSTER_ART_URI}
+- The URI for the poster art used as the background of the app link
+for this channel. For an example poster image, see figure 2, callout 1.</li>
+<li>{@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_TEXT} -
+The descriptive link text of the app link for this channel. For an example
+app link description, see the text in figure 2, callout 3.</li>
+</ul>
+
+<img alt="" src="{@docRoot}images/training/tv/tif/app-link-diagram.png"/>
+<p class="img-caption"><strong>Figure 2.</strong> App link details.</p>
+
+<p>If the channel data doesn't specify app link information, the system
+creates a default app link. The system chooses default details as follows:</p>
+
+<ul>
+<li>For the intent URI
+({@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_INTENT_URI}),
+the system uses the {@link android.content.Intent#ACTION_MAIN ACTION_MAIN}
+activity for the {@link android.content.Intent#CATEGORY_LEANBACK_LAUNCHER
+CATEGORY_LEANBACK_LAUNCHER} category, typically defined in the app manifest.
+If this activity is not defined, a non-functioning app link appears—if
+the user clicks it, nothing happens.</li>
+<li>For the descriptive text
+({@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_TEXT}), the system
+uses "Open <var>app-name</var>". If no viable app link intent URI is defined,
+the system uses "No link available".</li>
+<li>For the accent color
+({@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_COLOR}),
+the system uses the default app color.</li>
+<li>For the poster image
+({@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_POSTER_ART_URI}),
+the system uses the app's home screen banner. If the app doesn't provide a
+banner, the system uses a default TV app image.</li>
+<li>For the badge icon
+({@link android.media.tv.TvContract.Channels#COLUMN_APP_LINK_ICON_URI}), the
+system uses a badge that shows the app name. If the system is also using the
+app banner or default app image for the poster image, no app badge is shown.
+</li>
+</ul>
+
+<p>You specify app link details for your channels in your app's
+setup activity. You can update these app link details at any point, so
+if an app link needs to match channel changes, update app
+link details and call
+{@link android.content.ContentResolver#update(android.net.Uri,
+android.content.ContentValues, java.lang.String, java.lang.String[])
+ContentResolver.update()} as needed. For more details on updating
+channel data, see <a href="#update">Update Channel Data</a>.
+</p>
+
+
+
diff --git a/docs/html/training/tv/tif/content-recording.jd b/docs/html/training/tv/tif/content-recording.jd
new file mode 100644
index 0000000..ffdd14c
--- /dev/null
+++ b/docs/html/training/tv/tif/content-recording.jd
@@ -0,0 +1,171 @@
+page.title=Supporting Content Recording
+page.keywords=tv,recording,channel,tif
+page.tags=tv, tif
+helpoutsWidget=true
+
+trainingnavtop=true
+
+@jd:body
+
+<div id="tb-wrapper">
+<div id="tb">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#supporting">Indicating Support for Recording</a></li>
+ <li><a href="#recording">Recording a Session</a></li>
+ <li><a href="#errors">Handling Recording Errors</a></li>
+ <li><a href="#sessions">Managing Recorded Sessions</a></li>
+ <li><a href="#best">Best Practices</a></li>
+ </ol>
+</div>
+</div>
+
+<p>TV input services let the user pause and resume channel playback via
+time-shifting APIs. Android 7.0 expands on time-shifting
+by letting the user save multiple recorded sessions.</p>
+
+<p>Users can schedule recordings in advance, or start a recording as they watch
+a program. Once the system has saved a recording, the user can browse, manage,
+and play back the recording using the system TV app.</p>
+
+<p>If you want to provide recording functionality for your TV input service,
+you must indicate to the system that your app supports recording, implement
+the ability to record programs, handle and communicate any errors that occur
+during recording, and manage your recorded sessions.</p>
+
+<p class="note"><strong>Note:</strong> The Live Channels app does not yet
+provide a way for users to create or access recordings. Until changes are
+made to the Live Channels app, it may be difficult to fully test the recording
+experience for your TV input service.</p>
+
+<h2 id="supporting">Indicating Support for Recording</h2>
+
+<p>To tell the system that your TV input service supports recording, set
+the <code>android:canRecord</code> attribute in your service metadata XML file
+to <code>true</code>:
+</p>
+
+<pre>
+<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
+ <b>android:canRecord="true"</b>
+ android:setupActivity="com.example.sampletvinput.SampleTvInputSetupActivity" />
+</pre>
+
+<p>For more information on the service metadata file, see
+<a href="{@docRoot}training/tv/tif/tvinput.html#manifest">Declare Your TV Input
+Service in the Manifest</a>.
+</p>
+
+<p>Alternatively, you can indicate recording support in your code using
+these steps:</p>
+
+<ol>
+<li>In your TV input service {@link android.app.Service#onCreate onCreate()}
+method, create a new {@link android.media.tv.TvInputInfo} object using the
+{@link android.media.tv.TvInputInfo.Builder TvInputInfo.Builder} class.</li>
+<li>When creating the new {@link android.media.tv.TvInputInfo} object, call
+{@link android.media.tv.TvInputInfo.Builder#setCanRecord
+setCanRecord(true)} before calling
+{@link android.media.tv.TvInputInfo.Builder#build build()} to indicate your
+service supports recording.</li>
+<li>Register your {@link android.media.tv.TvInputInfo} object with the
+system by calling
+{@link android.media.tv.TvInputManager#updateTvInputInfo
+TvInputManager.updateTvInputInfo()}.</li>
+</ol>
+
+<h2 id="recording">Recording a Session</h2>
+
+<p>After your TV input service registers that it supports recording
+functionality, the system calls your
+{@link android.media.tv.TvInputService#onCreateRecordingSession
+TvInputService.onCreateRecordingSession()} method when it needs to access
+your app's recording implementation. Implement your own
+{@link android.media.tv.TvInputService.RecordingSession
+TvInputService.RecordingSession} subclass and return it
+when the {@link android.media.tv.TvInputService#onCreateRecordingSession
+onCreateRecordingSession()} callback fires. This subclass is responsible
+for switching to the correct channel data, recording the requested data,
+and communicating recording status and errors to the system.</p>
+
+<p>When the system calls
+{@link android.media.tv.TvInputService.RecordingSession#onTune
+RecordingSession.onTune()}, passing in a channel URI, tune to the channel
+that the URI specifies. Notify the system that your app has tuned to the
+desired channel by calling
+{@link android.media.tv.TvInputService.RecordingSession#notifyTuned
+notifyTuned()} or, if your app could not tune to the proper channel, call
+{@link android.media.tv.TvInputService.RecordingSession#notifyError
+notifyError()}.</p>
+
+<p>The system next invokes the
+{@link android.media.tv.TvInputService.RecordingSession#onStartRecording
+RecordingSession.onStartRecording()} callback. Your app must start recording
+immediately. When the system invokes this callback, it may provide a URI
+that contains information about the program that is about to be recorded.
+When the recording is done, you'll copy this data to the
+{@link android.media.tv.TvContract.RecordedPrograms RecordedPrograms}
+data table.</p>
+
+<p>Finally, the system calls
+{@link android.media.tv.TvInputService.RecordingSession#onStopRecording
+RecordingSession.onStopRecording()}. At this point, your app must stop
+recording immediately. You also need to create an entry in the
+{@link android.media.tv.TvContract.RecordedPrograms RecordedPrograms}
+table. This entry should include the recorded session data URI in the
+{@link android.media.tv.TvContract.RecordedPrograms#COLUMN_RECORDING_DATA_URI
+RecordedPrograms.COLUMN_RECORDING_DATA_URI} column, and any program
+information that the system provided in the initial call to
+{@link android.media.tv.TvInputService.RecordingSession#onStartRecording
+onStartRecording()}.</p>
+
+<p>For more details on how to access the
+{@link android.media.tv.TvContract.RecordedPrograms RecordedPrograms} table
+see <a href="#sessions">Managing Recorded Sessions</a>.</p>
+
+<h2 id="errors">Handling Recording Errors</h2>
+
+<p>If an error occurs during recording, resulting in unusable recorded data,
+notify the system by calling
+{@link android.media.tv.TvInputService.RecordingSession#notifyError
+notifyError()}. Similarly, you can call
+{@link android.media.tv.TvInputService.RecordingSession#notifyError
+notifyError()} after a recording session is created to let the system know
+that your app can no longer record sessions.</p>
+
+<p>If an error occurs during recording, but you'd like to provide a
+partial recording to users for playback, call
+{@link android.media.tv.TvInputService.RecordingSession#notifyRecordingStopped
+notifyRecordingStopped()} to enable the system to
+use the partial session.</p>
+
+<h2 id="sessions">Managing Recorded Sessions</h2>
+
+<p>The system maintains information for all recorded sessions from all
+recording-capable channel apps in the
+{@link android.media.tv.TvContract.RecordedPrograms RecordedPrograms}
+content provider table. This information is accessible via the
+{@link android.media.tv.TvContract.RecordedPrograms RecordedPrograms}
+content recording URIs. Use content provider APIs to
+read, add, and delete entries from this table.</p>
+
+<p>For more information on working with content provider data see
+<a href="{@docRoot}guide/topics/providers/content-provider-basics.html">
+Content Provider Basics</a>.</p>
+
+<h2 id="best">Best Practices</h2>
+
+<p>TV devices may have limited storage, so use your best judgment when
+allocating storage to save recorded sessions. Use
+{@link android.media.tv.TvRecordingClient.RecordingCallback#onError
+RecordingCallback.onError(RECORDING_ERROR_INSUFFICIENT_SPACE)} when
+there isn't enough space to save a recorded session.</p>
+
+<p>When the user initiates recording, you should start recording data as soon
+as possible. To facilitate this, complete any up-front time-consuming tasks,
+like accessing and allocating storage space, when the system invokes the
+{@link android.media.tv.TvInputService#onCreateRecordingSession
+onCreateRecordingSession()} callback. Doing so lets you start
+recording immediately when the
+{@link android.media.tv.TvInputService.RecordingSession#onStartRecording
+onStartRecording()} callback fires.</p>
diff --git a/docs/html/training/wearables/data-layer/events.jd b/docs/html/training/wearables/data-layer/events.jd
index 20f219d..db0ffcf6 100644
--- a/docs/html/training/wearables/data-layer/events.jd
+++ b/docs/html/training/wearables/data-layer/events.jd
@@ -242,7 +242,7 @@
per manifest, multiple intent filters per service, multiple actions per filter,
and multiple data stanzas per filter. Filters can match on a wildcard host or on
a specific one. To match on a wildcard host, use {@code host="*"}. To match
-on a specific host, specify {@code host=<node_id>}.
+on a specific host, specify {@code host=<node_id>}.
</p>
<p>
diff --git a/docs/html/training/wearables/notifications/creating.jd b/docs/html/training/wearables/notifications/creating.jd
index 6f8497a..35bb2bd 100644
--- a/docs/html/training/wearables/notifications/creating.jd
+++ b/docs/html/training/wearables/notifications/creating.jd
@@ -28,7 +28,7 @@
<p class="note"><strong>Note:</strong>
Notifications using {@link android.widget.RemoteViews} are stripped of custom
-layouts and the wearable only displays the text and icons. However, you can create
+layouts and the wearable only displays the text and icons. However, you can
<a href="{@docRoot}training/wearables/apps/layouts.html#CustomNotifications">create custom notifications</a>
that use custom card layouts by creating a wearable app that runs on the wearable device.</p>
@@ -58,7 +58,7 @@
<p>To create a notification with the support library, you create an instance of
{@link android.support.v4.app.NotificationCompat.Builder} and issue the notification by
-passing it to {@link android.support.v4.app.NotificationManagerCompat#notify notify()}. For example:
+passing it to {@link android.support.v4.app.NotificationManagerCompat#notify(int, android.app.Notification) notify()}. For example:
</p>
<pre>
diff --git a/docs/html/training/wearables/notifications/stacks.jd b/docs/html/training/wearables/notifications/stacks.jd
index 8056fc8..c3f43a7 100644
--- a/docs/html/training/wearables/notifications/stacks.jd
+++ b/docs/html/training/wearables/notifications/stacks.jd
@@ -37,7 +37,7 @@
<p>To create a stack, call {@link android.support.v4.app.NotificationCompat.Builder#setGroup setGroup()}
for each notification you want in the stack and specify a
-group key. Then call {@link android.support.v4.app.NotificationManagerCompat#notify notify()}
+group key. Then call {@link android.support.v4.app.NotificationManagerCompat#notify(int, android.app.Notification) notify()}
to send it to the wearable.</p>
<pre style="clear:right">
@@ -59,7 +59,7 @@
<p>Later on, when you create another notification, specify
the same group key. When you call
-{@link android.support.v4.app.NotificationManagerCompat#notify notify()},
+{@link android.support.v4.app.NotificationManagerCompat#notify(int, android.app.Notification) notify()},
this notification appears in the same stack as the previous notification,
instead of as a new card:</p>
diff --git a/docs/html/wear/_project.yaml b/docs/html/wear/_project.yaml
new file mode 100644
index 0000000..2a94274
--- /dev/null
+++ b/docs/html/wear/_project.yaml
@@ -0,0 +1,5 @@
+name: "Wear"
+home_url: /wear/
+description: "Small, powerful devices, worn on the body. Useful information when you need it most."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/wear/preview/_book.yaml b/docs/html/wear/preview/_book.yaml
index a4acad0..a231fb5 100644
--- a/docs/html/wear/preview/_book.yaml
+++ b/docs/html/wear/preview/_book.yaml
@@ -18,6 +18,8 @@
path: /wear/preview/features/ui-nav-actions.html
- title: Bridging for Notifications
path: /wear/preview/features/bridger.html
+ - title: Wrist Gestures
+ path: /wear/preview/features/gestures.html
- title: Get Started
path: /wear/preview/start.html
@@ -28,5 +30,8 @@
- title: License Agreement
path: /wear/preview/license.html
+- title: Behavior Changes
+ path: /wear/preview/behavior-changes.html
+
- title: Support and Release Notes
path: /wear/preview/support.html
diff --git a/docs/html/wear/preview/api-overview.jd b/docs/html/wear/preview/api-overview.jd
index 11331a7..4233624 100644
--- a/docs/html/wear/preview/api-overview.jd
+++ b/docs/html/wear/preview/api-overview.jd
@@ -25,6 +25,7 @@
<li><a href="#remote-input">Remote Input</a></li>
<li><a href="#bridging">Bridging Mode</a></li>
<li><a href="#imf">Input Method Framework</a></li>
+ <li><a href="#wrist-gestures">Wrist Gestures</a></li>
</ol>
</li>
@@ -79,12 +80,11 @@
watch face using the API.
</p>
-<p>For examples of how to use this feature,
+<p>For information about this API,
see <a href="{@docRoot}wear/preview/features/complications.html">
Watch Face Complications</a>.
</p>
-
<h3 id="drawers">Navigation and Action drawers</h3>
<p>Wear 2.0 introduces two new widgets, navigation drawer and action drawer. These
@@ -233,6 +233,24 @@
Input Method Framework</a>.
</p>
+<h3 id="wrist-gestures">Wrist Gestures</h3>
+
+<p>
+ Wrist gestures can enable quick, one-handed interactions with your app
+ when use of a touch screen is inconvenient. The following
+ <a href="https://support.google.com/androidwear/answer/6312406">wrist gestures</a>
+ are available for use by apps:
+</p>
+
+<ul>
+ <li>Flick wrist out</li>
+ <li>Flick wrist in</li>
+</ul>
+
+<p>For more information, see
+<a href="{@docRoot}wear/preview/features/gestures.html">
+ Wrist Gestures</a>.
+</p>
<h2 id="stand-alone">Standalone Devices</h2>
diff --git a/docs/html/wear/preview/behavior-changes.jd b/docs/html/wear/preview/behavior-changes.jd
new file mode 100644
index 0000000..0214622
--- /dev/null
+++ b/docs/html/wear/preview/behavior-changes.jd
@@ -0,0 +1,63 @@
+page.title=Behavior Changes
+meta.keywords="preview", "wear"
+page.tags="preview", "developer preview"
+
+@jd:body
+
+<p>
+ Along with new features, Android Wear 2.0 includes a variety of behavior
+ changes. This document highlights some of the key changes to
+ account for in your apps.
+</p>
+
+<p>
+ If you have previously published an app for Android Wear, be aware that
+ your app might be affected by these changes in the platform.
+</p>
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+
+<ul>
+ <li><a href="#activity-dismissal">Activity Dismissal</a></li>
+</ul>
+
+</div>
+</div>
+
+<h2 id="activity-dismissal">Activity Dismissal</h2>
+
+<p>
+ Starting in <a href="{@docRoot}wear/preview/index.html">Android Wear 2.0</a>,
+ users dismiss apps and activities by using
+ the power (stem) button on the watch.
+ Long-pressing to dismiss an app is no longer suggested.
+ Additionally, developers should not implement the
+ long-press for dismissing
+ <a href="{@docRoot}training/wearables/ui/exit.html">full screen</a>
+ activities (panning or immersive activities such as Google Maps).
+</p>
+
+<p>
+ In Android Wear 2.0, the power button of the watch is used
+ to navigate back in the
+ <a href="{@docRoot}guide/components/tasks-and-back-stack.html">back stack</a>,
+ including for full-screen panning activities.
+ Before Android Wear 2.0, the <code>DismissOverlayView</code> class was
+ used to implement the long-press for a user to dismiss an app.
+ (The <code>DismissOverlayView</code> class was added to a layout
+ for full-screen drawing and to draw over the other views.)
+ Developers should test the power button for going back
+ between an app's activities and for exiting an app.
+</p>
+
+<p>
+ Additionally, swipe for exiting an app or activity is not available.
+ Developers can consider how their user interfaces
+ can be enhanced with swipe-left and swipe-right,
+ in a way similar to the functionality described for
+ <a href="{@docRoot}wear/preview/features/ui-nav-actions.html">navigation
+ drawers</a>.
+</p>
diff --git a/docs/html/wear/preview/downloads.jd b/docs/html/wear/preview/downloads.jd
index 8689504..4bc401b 100644
--- a/docs/html/wear/preview/downloads.jd
+++ b/docs/html/wear/preview/downloads.jd
@@ -223,8 +223,8 @@
</p>
<p class="warning">
- <strong>Warning:</strong> Installing a system image on a watch removes all data from the
- watch, so you should back up your data first.
+ <strong>Warning:</strong> Installing a system image on a watch removes all
+ data from the watch, so you should back up your data first.
</p>
<h3 id="preview_system_images">
@@ -233,8 +233,13 @@
<p>
The preview includes system images for testing your app. Based on your
- device, you can download a preview system image from the following tables
- and flash it to the corresponding device.
+ device, you can download a preview system image from one of the
+ following tables and flash it to the corresponding device.
+ </p>
+
+ <p>
+ To restore your device to its original state during the preview,
+ you can flash the appropriate retail system image, below, to the device.
</p>
<h4 id="preview_image_for_lge_watch_urbane_2nd_edition">
@@ -261,9 +266,9 @@
<td>
Preview image for testing
</td>
- <td><a href="#top" onclick="onDownload(this)">nemo-nvd36i-factory-9cdd2ac0.tgz</a><br>
- MD5: b33ba8e59780fbe5c83d8936b108640f<br>
- SHA-1: 9cdd2ac01f2976cafe5a21958298dac159b7a325
+ <td><a href="#top" onclick="onDownload(this)">nemo-nvd83h-factory-48ac950c.tgz</a><br>
+ MD5: dd351884cce9fb5bf1bdec0a8e5f56e3<br>
+ SHA-1: 48ac950c48faef96a7770e3c1acb56d23a28d859
</td>
</tr>
@@ -302,9 +307,9 @@
<td>
Preview image for testing
</td>
- <td><a href="#top" onclick="onDownload(this)">sturgeon-nvd36i-factory-2cbe5080.tgz</a><br>
- MD5: ccc972cdc33cba778a2f624066ef5713<br>
- SHA-1: 2cbe5080ded060ce43ba65ff27e2290b28981634
+ <td><a href="#top" onclick="onDownload(this)">sturgeon-nvd83h-factory-cb5a11ab.tgz</a><br>
+ MD5: 38c1047992b1d28f6833d9f6c8470cdc<br>
+ SHA-1: cb5a11ab0260ea3ca7da5894e73e41f70357da6b
</td>
</tr>
<tr id="sturgeon-non-preview">
diff --git a/docs/html/wear/preview/features/complications.jd b/docs/html/wear/preview/features/complications.jd
index d33fd2a..3334cb7 100644
--- a/docs/html/wear/preview/features/complications.jd
+++ b/docs/html/wear/preview/features/complications.jd
@@ -113,8 +113,8 @@
<p>
To start receiving complication data, a watch face calls
- <code>setActiveComplications</code> within the
- <code>WatchFaceService.Engine</code> class with a list of watch face
+ <code>setActiveComplications</code>, in the
+ <code>WatchFaceService.Engine</code> class, with a list of watch face
complication IDs. A watch face creates these IDs to uniquely identify
slots on the watch face where complications can appear, and passes them
to the <code>createProviderChooserIntent</code> method (of the
@@ -283,7 +283,12 @@
</p>
<p>
- The configuration activity may also be used as an opportunity to request
+ If a data provider needs a specific permission to access a user's data,
+ then standard code
+ for runtime <a href="{@docRoot}training/articles/wear-permissions.html">
+ permissions</a> is needed.
+ A <a href="{@docRoot}training/wearables/watch-faces/configuration.html">
+ configuration activity</a> may be used as an opportunity to request
any permissions required by the provider.
</p>
diff --git a/docs/html/wear/preview/features/gestures.jd b/docs/html/wear/preview/features/gestures.jd
new file mode 100644
index 0000000..7806c4e
--- /dev/null
+++ b/docs/html/wear/preview/features/gestures.jd
@@ -0,0 +1,323 @@
+page.title=Wrist Gestures
+meta.keywords="wear-preview"
+page.tags="wear-preview"
+page.image=images/cards/card-n-sdk_2x.png
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+
+ <ul>
+ <li><a href="#using_wlv">Using a WearableListView</a></li>
+ <li><a href="#using_key_events">Using Key Events Directly</a></li>
+ <li><a href="#best_practices">Best Practices</a></li>
+ </ul>
+
+</div>
+</div>
+
+ <p>
+ Wrist gestures can enable quick, one-handed interactions with your app
+ when use of a touch screen is inconvenient. For example, a user can scroll
+ through notifications with one hand while holding a cup of water with the
+ other. Other examples of using wrist gestures when a touch screen would
+ be inconvenient include:
+ </p>
+
+ <ul>
+ <li>In an app for jogging, navigating through vertical screens that show
+ the steps taken, time elapsed, and current pace
+ </li>
+
+ <li>At the airport with luggage, scrolling through flight and gate
+ information
+ </li>
+
+ <li>Scrolling through news articles
+ </li>
+ </ul>
+
+ <p>
+ To review the wrist gestures on your watch, first confirm gestures are
+ turned on by selecting <strong>Settings > Gestures > Wrist Gestures
+ On</strong>. (Wrist gestures are on by default.) Then complete the
+ Gestures tutorial on the watch (<strong>Settings > Gestures >
+ Launch Tutorial</strong>).
+ </p>
+
+ <p>
+ The following gestures from the <a href=
+ "https://support.google.com/androidwear/answer/6312406">Android Wear
+ Help</a> are unavailable to apps:
+ </p>
+
+ <ul>
+ <li>Push wrist down
+ </li>
+
+ <li>Raise wrist up
+ </li>
+
+ <li>Shaking the wrist
+ </li>
+ </ul>
+
+ <p>
+ Wrist gestures can be used in these ways:
+ </p>
+
+ <ul>
+ <li>
+ <a href="#using_wlv">Using a WearableListView</a>, which
+ has predefined gesture actions
+ </li>
+
+ <li>
+ <a href="#using_key_events">Using key events directly</a> to
+ define new user actions
+ </li>
+ </ul>
+
+ <p>
+ Each wrist gesture is mapped to an <code>int</code> constant from the
+ <code><a href=
+ "{@docRoot}reference/android/view/KeyEvent.html">KeyEvent</a></code>
+ class, as shown in the following table:
+ </p>
+
+ <table>
+ <tr>
+ <th>
+ Gesture
+ </th>
+ <th>
+ KeyEvent
+ </th>
+ <th>
+ Description
+ </th>
+ </tr>
+
+ <tr>
+ <td>
+ Flick wrist out
+ </td>
+ <td>
+ <a href=
+ "{@docRoot}reference/android/view/KeyEvent.html#KEYCODE_NAVIGATE_NEXT">
+ KEYCODE_NAVIGATE_NEXT</a>
+ </td>
+ <td>
+ This key code goes to the next item.
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ Flick wrist in
+ </td>
+ <td>
+ <a href=
+ "{@docRoot}reference/android/view/KeyEvent.html#KEYCODE_NAVIGATE_PREVIOUS">
+ KEYCODE_NAVIGATE_PREVIOUS</a>
+ </td>
+ <td>
+ This key code goes to the previous item.
+ </td>
+ </tr>
+ </table>
+
+ <h2 id="using_wlv">
+ Using a WearableListView
+ </h2>
+
+ <p>
+ A <code><a href=
+ "{@docRoot}reference/android/support/wearable/view/WearableListView.html">
+ WearableListView</a></code> has predefined actions for occurrences of
+ wrist gestures when the View has the focus. For more information, see
+ <a href="#best_practices">Best Practices</a>. For information about using
+ <code>WearableListView</code>, see <a href=
+ "{@docRoot}training/wearables/ui/lists.html">Creating
+ Lists</a>.
+ </p>
+
+ <p>
+ Even if you use a <code>WearableListView</code>, you may want to use
+ constants from the <code><a href=
+ "{@docRoot}reference/android/view/KeyEvent.html">KeyEvent</a></code>
+ class. The predefined actions can be overridden by subclassing the
+ <code>WearableListView</code> and re-implementing the
+ <code>onKeyDown()</code> callback. The behavior can be disabled entirely
+ by using <code>setEnableGestureNavigation(false)</code>. Also see
+ <a href="{@docRoot}training/keyboard-input/commands.html">
+ Handling Keyboard Actions</a>.
+ </p>
+
+ <h2 id="using_key_events">
+ Using Key Events Directly
+ </h2>
+
+ <p>
+ You can use key events outside of a <code><a href=
+ "{@docRoot}reference/android/support/wearable/view/WearableListView.html">
+ WearableListView</a></code> to trigger new actions in response to gesture
+ events. Importantly, these gesture events:
+ </p>
+
+ <ul>
+ <li>Are recognized when a device is in Active mode
+ </li>
+
+ <li>Are delivered in the same way as all key events
+ </li>
+ </ul>
+
+ <p>
+ Specifically, these events are delivered to the top Activity, to the View
+ with keyboard focus. Just as any other key event, a class that relates to
+ user interaction (such as a View or an Activity) that implements
+ <code><a href=
+ "{@docRoot}reference/android/view/KeyEvent.Callback.html">
+ KeyEvent.Callback</a></code> can listen to key events that relate to
+ wrist gestures. The Android framework calls the View or Activity that has
+ the focus with the key events; for gestures, the <code>onKeyDown()</code>
+ method callback is called when gestures occur.
+ </p>
+
+ <p>
+ As an example, an app may override predefined actions in a View or
+ Activity (both implementing <code>KeyEvent.Callback</code>) as follows:
+ </p>
+
+ <pre>
+public final class GesturesActivity extends Activity {
+
+ @Override /* KeyEvent.Callback */
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_NAVIGATE_NEXT:
+ // Do something that advances a user View to the next item in an ordered list.
+ return moveToNextItem();
+ case KeyEvent.KEYCODE_NAVIGATE_PREVIOUS:
+ // Do something that advances a user View to the previous item in an ordered list.
+ return moveToPreviousItem();
+ }
+ // If you did not handle it, let it be handled by the next possible element as deemed by the Activity.
+ return super.onKeyDown(keyCode, event);
+ }
+
+ /** Shows the next item in the custom list. */
+ private boolean moveToNextItem() {
+ boolean handled = false;
+ …
+ // Return true if handled successfully, otherwise return false.
+ return handled;
+ }
+
+ /** Shows the previous item in the custom list. */
+ private boolean moveToPreviousItem() {
+ boolean handled = false;
+ …
+ // Return true if handled successfully, otherwise return false.
+ return handled;
+ }
+}
+</pre>
+
+ <h2 id="best_practices">
+ Best Practices
+ </h2>
+
+ <ul>
+ <li>Review the <code><a href=
+ "{@docRoot}reference/android/view/KeyEvent.html">KeyEvent</a></code>
+ and <code><a href=
+ "{@docRoot}reference/android/view/KeyEvent.Callback.html">
+ KeyEvent.Callback</a></code> pages for the delivery of key events to
+ your View and Activity.
+ </li>
+
+ <li>Keep a consistent directional affordance:
+ <ul>
+ <li>Use "Flick wrist out" for next, "Flick wrist in" for previous
+ </li>
+ </ul>
+ </li>
+
+ <li>Have a touch parallel for a gesture.
+ </li>
+
+ <li>Provide visual feedback.
+ </li>
+
+ <li>Don't use a keycode to implement functionality that would be
+ counter-intuitive to the rest of the system. For example, do not use
+ <code>KEYCODE_NAVIGATE_NEXT</code> to cancel an action or to navigate the
+ left-right axis with flicks.
+ </li>
+
+ <li>Don't intercept the key events on elements that are not part of the
+ user interface, for example the Views that are offscreen or partially
+ covered. This is the same as any other key event.
+ </li>
+
+ <li>Don't reinterpret repeated flick gestures into your own, new gesture.
+ It may conflict with the system's "Shaking the wrist" gesture.
+ </li>
+
+ <li>For a View to receive gesture key events, it must have <a href=
+ "{@docRoot}reference/android/view/View.html#attr_android:focusable">
+ focus</a>; see <a href=
+ "{@docRoot}reference/android/view/View.html#setFocusable(boolean)">
+ View::setFocusable()</a>. Because gestures are treated as key events,
+ they trigger a transition out of "Touch mode" that may do unexpected
+ things. Therefore, since users may alternate between using touch and
+ gestures, the <a href=
+ "{@docRoot}reference/android/view/View.html#setFocusableInTouchMode(boolean)">
+ View::setFocusableInTouchmode()</a> method may be necessary. In some
+ cases, it also may be necessary to use
+ <code>setDescendantFocusability(FOCUS_BEFORE_DESCENDANTS)</code> so
+ that when focus changes after a change to or from "Touch mode," your
+ intended View gets the focus.
+ </li>
+
+ <li>Use <code>requestFocus()</code> and <code>clearFocus()</code>
+ carefully:
+ <ul>
+ <li>When calling <code><a href=
+ "{@docRoot}reference/android/view/View.html#requestFocus()">
+ requestFocus()</a></code>, be sure that the View really should have
+ focus. If the View is offscreen, or is covered by another View,
+ surprises can occur when gestures trigger callbacks.
+ </li>
+
+ <li>The <code><a href=
+ "{@docRoot}reference/android/view/View.html#clearFocus()">
+ clearFocus()</a></code> initiates a focus search to find another
+ suitable View. Depending on the View hierarchy, this search might
+ require non-trivial computation. It can also end up assigning focus
+ to a View you don’t expect to receive focus.
+ </li>
+ </ul>
+ </li>
+
+ <li>Key events are delivered first to the View with focus in the View
+ hierarchy. If the focused View does not handle the event (i.e., returns
+ <code>false</code>), the event is not delivered to the parent View, even
+ if it can receive focus and has a <a href=
+ "{@docRoot}reference/android/text/method/KeyListener.html">
+ KeyListener</a>. Rather, the event is delivered to the current Activity
+ holding the View hierarchy with focus. Thus, it may be necessary to
+ catch all events at the higher level and then pass relevant codes down.
+ Alternatively, you might subclass the Activity and override the
+ <code><a href=
+ "{@docRoot}reference/android/app/Activity.html#dispatchKeyEvent(android.view.KeyEvent)">
+ dispatchKeyEvent(KeyEvent event)</a></code> method to ensure that keys
+ are intercepted when necessary, or are handled when not handled at
+ lower layers.
+ </li>
+ </ul>
diff --git a/docs/html/wear/preview/features/ime.jd b/docs/html/wear/preview/features/ime.jd
index 1301be9..b07736f 100644
--- a/docs/html/wear/preview/features/ime.jd
+++ b/docs/html/wear/preview/features/ime.jd
@@ -19,14 +19,14 @@
</div>
-<p>Wear 2.0 supports input methods beyond voice by extending the Android
+<p>Wear 2.0 supports input methods beyond voice by extending the Android
Input Method Framework (IMF) to Android Wear. IMF allows for virtual, on-screen
- keyboards and other input methods to be used for text entry. The IMF APIs used
- for Wear devices are the same as other form factors, though usage is slightly
+ keyboards and other input methods to be used for text entry. The IMF APIs used
+ for Wear devices are the same as other form factors, though usage is slightly
different due to limited screen real estate.</p>
-<p>Wear 2.0 comes with the system default Input Method Editor (IME)
-and opens up the IMF APIs for third-party developers to create custom input
+<p>Wear 2.0 comes with the system default Input Method Editor (IME)
+and opens up the IMF APIs for third-party developers to create custom input
methods for Wear.</p>
<p><img src="{@docRoot}wear/preview/images/new_input_methods.png"></p>
@@ -46,17 +46,17 @@
<h2 id="invoking">Invoking an Input Method</h2>
-If you are developing an IME for Wear, remember that the
-feature is supported only on Android 6.0 (API level 23) and higher versions of
-the platform.
-To ensure that your IME can only be installed on Wearables that support input
+If you are developing an IME for Wear, remember that the
+feature is supported only on Android 6.0 (API level 23) and higher versions of
+the platform.
+To ensure that your IME can only be installed on Wearables that support input
methods beyond voice, add the following to your app's manifest:
<pre>
<uses-sdk android:minSdkVersion="23" />
</pre>
-This indicates that your app requires Android 6.0 or higher.
+This indicates that your app requires Android 6.0 or higher.
For more information, see <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Levels</a>
- and the documentation for the <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a>
+ and the documentation for the <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a>
element.
<p>
To control how your app is filtered from devices that do not support Wear
@@ -67,14 +67,14 @@
</pre>
<p>Wear provides user settings on the watch that lets the user to enable multiple
- IMEs from the list of installed IMEs. Once the users enable your IME, they
+ IMEs from the list of installed IMEs. Once the users enable your IME, they
can invoke your IME from:</p>
<ul>
-<li>A notification or an app using the
+<li>A notification or an app using the
<a href="{@docRoot}reference/android/support/v4/app/RemoteInput.html">RemoteInput</a></code> API.</li>
-<li>Wear apps with an
+<li>Wear apps with an
<a href="{@docRoot}reference/android/widget/EditText.html">EditText</a>
- field. Touching a text field places the cursor in the field and automatically
+ field. Touching a text field places the cursor in the field and automatically
displays the IME on focus.</li>
</ul>
@@ -86,10 +86,10 @@
<ul>
<li><strong>Set Default Action</strong>
<p>
-<a href="http://developer.android.com/reference/android/support/v4/app/RemoteInput.html">{@code RemoteInput}</a>
+<a href="http://developer.android.com/reference/android/support/v4/app/RemoteInput.html">{@code RemoteInput}</a>
and Wear apps expect only single-line text entry. The ENTER key should always trigger
a call to <a href="{@docRoot}reference/android/inputmethodservice/InputMethodService.html#sendDefaultEditorAction(boolean)">sendDefaultEditorAction</a>,
- which causes the app to dismiss the keyboard and continue on to the next step
+ which causes the app to dismiss the keyboard and continue on to the next step
or action.</p>
</li>
@@ -97,22 +97,22 @@
<p>
Input methods on Wear consume most of the screen, leaving very little of the
app visible; using full-screen mode ensures an optimal user experience regardless
- of the app UI. In full-screen mode, an
+ of the app UI. In full-screen mode, an
<a href="{@docRoot}reference/android/view/inputmethod/ExtractedText.html">{@code ExtractEditText}</a> provides a mirrored
view of the text field being edited and can be styled to blend with the rest of
- the input method UI. For more details on full-screen mode, see
+ the input method UI. For more details on full-screen mode, see
<a href="{@docRoot}reference/android/inputmethodservice/InputMethodService.html">InputMethodService</a>.
</p>
</li>
<li><strong>Handle InputType flags</strong>
<p>
-For privacy reasons, at a minimum you should handle the {@code InputType}
-flag {@code TYPE_TEXT_VARIATION_PASSWORD} in your IME. When your IME is in
-password mode, make sure that your keyboard is optimized for single key press
-(auto spelling correction, auto completion and gesture input are disabled).
-Most importantly, keyboard in password mode should support ASCII symbols
-regardless of the input language. For more details, see
+For privacy reasons, at a minimum you should handle the {@code InputType}
+flag {@code TYPE_TEXT_VARIATION_PASSWORD} in your IME. When your IME is in
+password mode, make sure that your keyboard is optimized for single key press
+(auto spelling correction, auto completion and gesture input are disabled).
+Most importantly, keyboard in password mode should support ASCII symbols
+regardless of the input language. For more details, see
<a href="{@docRoot}training/keyboard-input/style.html">Specifying The Input Method Type</a>.
</p>
</li>
@@ -120,9 +120,9 @@
<li><strong>Provide a key for switching to the next input method</strong>
<p>
Android allows users to easily switch between all IMEs supported by the platform.
- In your IME implementation, set the boolean
+ In your IME implementation, set the boolean
<a href="{@docRoot}guide/topics/text/creating-input-method.html#Switching">supportsSwitchingToNextInputMethod = true</a>
- to enable your IME to support the switching mechanism
+ to enable your IME to support the switching mechanism
(so that apps can switch to the next platform-supported IME).
</p>
</li>
diff --git a/docs/html/wear/preview/features/notifications.jd b/docs/html/wear/preview/features/notifications.jd
index c84a470..dcc0970 100644
--- a/docs/html/wear/preview/features/notifications.jd
+++ b/docs/html/wear/preview/features/notifications.jd
@@ -155,7 +155,7 @@
<p>If you have a chat messaging app, your notifications should use
<a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>,
which is new in Android N. Wear 2.0 uses the chat messages included
- in a <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notification
+ in a <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notification
(see <a href="{@docRoot}preview/features/notification-updates.html#style">{@code addMessage()}</a>) to provide
a rich chat app-like experience in the expanded notification.
@@ -195,7 +195,7 @@
<li>Use <a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>.
</li>
<li>Call the method {@code setAllowGeneratedReplies()} for the notification action.
- For more information, see the downloadable
+ For more information, see the downloadable
<a href="{@docRoot}preview/setup-sdk.html#docs-dl">API reference</a>.
</li>
<li>Ensure that the notification action has a
diff --git a/docs/html/wear/preview/features/ui-nav-actions.jd b/docs/html/wear/preview/features/ui-nav-actions.jd
index 1ba275f..fb14264 100644
--- a/docs/html/wear/preview/features/ui-nav-actions.jd
+++ b/docs/html/wear/preview/features/ui-nav-actions.jd
@@ -12,7 +12,7 @@
<ol>
<li><a href="#create a drawer">Create a Drawer Layout</a></li>
<li><a href="#initialize">Initialize the Drawer List</a></li>
- <li><a href="#creating">Create a Custom View Drawer</a></li>
+ <li><a href="#creating">Create a Custom Drawer View</a></li>
<li><a href="#listen to events">Listen for Drawer Events</a></li>
<li><a href=#peeking">Peeking Drawers</a></li>
</ol>
@@ -37,8 +37,8 @@
</div>
</div>
<p>As part of the <a href="http://www.google.com/design/spec-wear">Material Design</a>
- for Android Wear, Wear 2.0 adds interactive navigation and action drawers.
- The navigation drawer appears at the top of the screen and lets users jump to
+ for Android Wear, Wear 2.0 adds interactive navigation and action drawers.
+ The navigation drawer appears at the top of the screen and lets users jump to
different views within
the app, similar to the navigation drawer on a phone. The action drawer appears
at the bottom of the screen and provides context-specific actions for the user,
@@ -59,7 +59,8 @@
<div class="cols">
<p>This lesson describes how to implement action and navigation drawers in your
-app using the {@code WearableDrawerLayout} APIs.
+app using the {@code WearableDrawerLayout} APIs. For more information, see the
+downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API reference</a>.
</p>
<h2 id="create a drawer">Create a Drawer Layout</h2>
@@ -99,41 +100,44 @@
</android.support.wearable.view.drawer.WearableDrawerLayout>
</pre>
+
<h2 id="initialize">Initialize the Drawer List</h2>
<p>One of the first things you need to do in your activity is to initialize the
drawers list of items. You should implement {@code WearableNavigationDrawerAdapter}
to populate the navigation drawer contents. To populate the action drawer with
-a list of actions, inflate an XML file into the Menu (via MenuInflater).</p>
+a list of actions, inflate an XML file into the Menu (via {@code MenuInflater}).
+</p>
<p>The following code snippet shows how to initialize the contents of your drawers:
</p>
+
<pre>
public class MainActivity extends WearableActivity implements
WearableActionDrawer.OnMenuItemClickListener{
private WearableDrawerLayout mwearableDrawerLayout;
private WearableNavigationDrawer mWearableNavigationDrawer;
private WearableActionDrawer mWearableActionDrawer;
-
+
...
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
-
+
......
-
-
+
+
// Main Wearable Drawer Layout that wraps all content
mWearableDrawerLayout = (WearableDrawerLayout) findViewById(R.id.drawer_layout);
-
+
// Top Navigation Drawer
mWearableNavigationDrawer = (WearableNavigationDrawer) findViewById(R.id.top_navigation_drawer);
mWearableNavigationDrawer.setAdapter(new YourImplementationNavigationAdapter(this));
// Peeks Navigation drawer on the top.
mWearableDrawerLayout.peekDrawer(Gravity.TOP);
-
+
// Bottom Action Drawer
mWearableActionDrawer = (WearableActionDrawer) findViewById(R.id.bottom_action_drawer);
@@ -149,44 +153,58 @@
}
</pre>
-<h2 id="creating">Create a Custom View Drawer</h2>
-<p>To use custom views in drawers, add <code>WearableDrawerView</code> to the
-<code>WearableDrawerLayout</code>. To set the contents of the drawer, call <code>
-<a href="https://x20web.corp.google.com/~psoulos/docs/reference/android/support/wearable/view/drawer/WearableDrawerView.html#setDrawerContent(android.view.View)">setDrawerContent(View)</a></code>
- instead of manually adding the view to the hierarchy. You must also specify the
- drawer position with the <code>android:layout_gravity</code> attribute. </p>
-<p> The following example specifies a top drawer:</p>
+<h2 id="creating">Create a Custom Drawer View</h2>
+
+<p>To use custom views in drawers, add <code>WearableDrawerView</code> to the
+<code>WearableDrawerLayout</code>. To set the peek view and drawer contents, add
+ them as children of the {@code WearableDrawerView} and specify their IDs in the
+ {@code peek_view} and {@code drawer_content} attributes respectively. You must
+ also specify the drawer position with the {@code android:layout_gravity}
+ attribute. </p>
+
+<p> The following example specifies a top drawer with peek view and drawer
+contents:</p>
+
<pre>
-<android.support.wearable.view.drawer.WearableDrawerLayout>
- <FrameLayout
- android:id=”@+id/content” />
-
- <WearableDrawerView
- android:layout_width=”match_parent”
- andndroid:layout_height=”match_parent”
- android:layout_gravity=”top”>
- <FrameLayout
- android:id=”@+id/top_drawer_content” />
- </WearableDrawerView>
-</android.support.wearable.view.drawer.WearableDrawerView>
+ <android.support.wearable.view.drawer.WearableDrawerView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="top"
+ android:background="@color/red"
+ app:drawer_content="@+id/drawer_content"
+ app:peek_view="@+id/peek_view">
+ <FrameLayout
+ android:id="@id/drawer_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <!-- Drawer content goes here. -->
+ </FrameLayout>
+ <LinearLayout
+ android:id="@id/peek_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:orientation="horizontal">
+ <!-- Peek view content goes here. -->
+ <LinearLayout>
+ </android.support.wearable.view.drawer.WearableDrawerView>
</pre>
<h2 id="listen to events">Listen for Drawer Events</h2>
-<p>To listen for drawer events, call {@code setDrawerStateCallback()}on your
+<p>To listen for drawer events, call {@code setDrawerStateCallback()} on your
{@code WearableDrawerLayout} and pass it an implementation of
{@code WearableDrawerLayout.DrawerStateCallback}. This interface provides callbacks
for drawer events such as <code>onDrawerOpened()</code>,
<code>onDrawerClosed(),</code> and <code>onDrawerStatechanged()</code>.</p>
<h2 id="peeking">Peeking Drawers</h2>
-<p>To set the drawers to temporarily appear, call <code>peekDrawer()</code> on
+<p>To set the drawers to temporarily appear, call <code>peekDrawer()</code> on
your {@code WearableDrawerLayout} and pass it the {@code Gravity} of the drawer.
This feature is especially useful because it allows immediate access to the
- alternate drawer views or actions associated with it. </p>
+ alternate drawer views or actions associated with it: </p>
-<pre>{@code mWearableDrawerLayout.peekDrawer</code>(<code>Gravity.BOTTOM);}</pre>
+<pre>{@code mWearableDrawerLayout.peekDrawer(Gravity.BOTTOM);}</pre>
-<p>You can also call {@code setPeekContent()} on your drawer to display a custom
- view when the drawer is peeking.</p>
+
diff --git a/docs/html/wear/preview/program.jd b/docs/html/wear/preview/program.jd
index a130663..e2bf92f 100644
--- a/docs/html/wear/preview/program.jd
+++ b/docs/html/wear/preview/program.jd
@@ -79,6 +79,11 @@
</div>
<div class="col-4of12">
+ <h5>
+ </h5>
+
+ <p>
+ </p>
</div>
</div>
</div>
@@ -90,7 +95,7 @@
<p>
The Android Wear 2.0 Developer Preview runs from 18 May 2016 until the
- final Android Wear public release to OEMs, planned for Q4 2016.
+ final Android Wear public release to OEMs.
</p>
<p>
@@ -136,7 +141,7 @@
</p>
<p>
- At milestones 4 and 5 you'll have access to the final Android Wear 2.0
+ At milestone 4, you'll have access to the final Android Wear 2.0
APIs and SDK to develop with, as well as near-final system images to test
system behaviors and features. Android Wear 2.0 will use the Android N
API level at this time. You can begin final compatibility testing of your
@@ -196,9 +201,9 @@
</h3>
<p>
- You can download these hardware system images at <a href=
+ You can download these hardware system images from the <a href=
"{@docRoot}wear/preview/downloads.html">Download and Test with a
- Device</a>:
+ Device</a> page:
</p>
<ul>
@@ -210,7 +215,15 @@
</ul>
<p>
- Please keep in mind that the Developer Preview system images
+ To restore your device to its
+ original state during the preview, you can flash the
+ appropriate retail system image from
+ the <a href="{@docRoot}wear/preview/downloads.html">Download and
+ Test with a Device</a> page.
+ </p>
+
+ <p>
+ Please keep in mind that the preview system images
are for app developers only, and for compatibility testing and
early development only, and are not ready for day-to-day use.
</p>
diff --git a/docs/html/wear/preview/start.jd b/docs/html/wear/preview/start.jd
index 65d4b56..8fccdc8 100644
--- a/docs/html/wear/preview/start.jd
+++ b/docs/html/wear/preview/start.jd
@@ -107,10 +107,10 @@
<tr>
<td>
- <a href="http://storage.googleapis.com/androiddevelopers/shareables/wear-preview/wearable-support-preview-1-docs.zip">wearable-support-preview-1-docs.zip</a>
+ <a href="http://storage.googleapis.com/androiddevelopers/shareables/wear-preview/wearable-support-preview-2-docs.zip">wearable-support-preview-2-docs.zip</a>
</td>
- <td>MD5: 02f9dc7714c00076b323c9081655c3b2<br>
- SHA-1: 075f3821ee9b66a919a0e8086f79c12bc9576fb2
+ <td>MD5: afb770c9c5c0431bbcbdde186f1eae06<br>
+ SHA-1: 81d681e61cee01f222ea82e83297d23c4e55b8f3
</td>
</tr>
</table>
@@ -146,16 +146,26 @@
plugin.
</li>
- <li>In the <code>build.gradle</code> file for the Wear module, in the
- <code>dependencies</code> section, update the existing reference to the
+ <li>In the <code>build.gradle</code> file for the Wear module:
+ <ul>
+ <li>In the <code>android</code> section, update the
+ <code>compileSdkVersion</code> to 24.
+ </li>
+
+ <li>In the <code>android</code> section, update the
+ <code>targetSdkVersion</code> to 24.
+ </li>
+
+ <li>In the <code>dependencies</code> section, update
+ the existing reference to the
Wearable Support Library (for example, <code>compile
'com.google.android.support:wearable:1.4.0'</code>) by changing it to the
following, which requires that your the Google Repository <a href=
"#install_android_studio_and_the_latest_packages">is the latest
version</a>:
- <pre>
-compile 'com.google.android.support:wearable:2.0.0-alpha1'
- </pre>
+ <code>compile 'com.google.android.support:wearable:2.0.0-alpha2'</code>
+ </li>
+ </ul>
</li>
<li>See the following page for setting up a watch or emulator with a
@@ -190,13 +200,24 @@
wizard.
</li>
- <li>In the <code>build.gradle</code> file for the Wear module, in the
- <code>dependencies</code> section, update the existing reference to the
- Wearable Support Library (perhaps <code>compile
- 'com.google.android.support:wearable:1.4.0'</code>) to:
- <pre>
-compile 'com.google.android.support:wearable:2.0.0-alpha1'
- </pre>
+ <li>In the <code>build.gradle</code> file for the Wear module:
+ <ul>
+ <li>In the <code>android</code> section, update the
+ <code>compileSdkVersion</code> to 24.
+ </li>
+ <li>In the <code>android</code> section, update the
+ <code>targetSdkVersion</code> to 24.
+ </li>
+ <li>In the <code>dependencies</code> section, update
+ the existing reference to the
+ Wearable Support Library (for example, <code>compile
+ 'com.google.android.support:wearable:1.4.0'</code>) by changing it to the
+ following, which requires that your the Google Repository <a href=
+ "#install_android_studio_and_the_latest_packages">is the latest
+ version</a>:
+ <code>compile 'com.google.android.support:wearable:2.0.0-alpha2'</code>
+ </li>
+ </ul>
</li>
<li>See the following page for setting up a watch or emulator with a
diff --git a/docs/html/wear/preview/support.jd b/docs/html/wear/preview/support.jd
index d03edf3..78b4e4b 100644
--- a/docs/html/wear/preview/support.jd
+++ b/docs/html/wear/preview/support.jd
@@ -16,7 +16,262 @@
Wear Developer Google+ community</a>.
</p>
-<h2 id="dp">Developer Preview 1</h2>
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+
+<ul>
+ <li><a href="#general">General Advisories</a></li>
+ <li><a href="#deprecations">Deprecations</a></li>
+ <li><a href="#dp2">Developer Preview 2</a></li>
+ <li><a href="#dp1">Developer Preview 1</a></li>
+</ul>
+
+</div>
+</div>
+
+<h2 id="general">General Advisories</h2>
+
+<p>
+ The developer preview is for <strong>app developers and other early
+ adopters</strong> and is available for daily use, development, or
+ compatibility testing. Please be aware of these general notes about the
+ release:
+</p>
+
+<ul>
+ <li>The developer preview may have various <strong>stability issues</strong> on
+ supported devices. Users may encounter system instability, such as kernel
+ panics and crashes.
+ </li>
+ <li>Some apps <strong>may not function as expected</strong> on the new
+ platform version. This includes Google’s apps and other apps.
+ </li>
+</ul>
+
+<h2 id="deprecations">Deprecations</h2>
+
+<p>The following fields are deprecated in the preview:</p>
+
+<ul>
+ <li>The <code>Notification.WearableExtender#setCustomSizePreset(int)</code>
+ method no longer accepts <code>SIZE_FULL_SCREEN</code> and this value is now
+ undefined.
+ </li>
+ <li>The <code>Notification.WearableExtender#setContentIcon(int)</code> method
+ is deprecated.
+ </li>
+</ul>
+
+<h2 id="dp2">Developer Preview 2</h2>
+
+<div class="wrap">
+ <div class="cols">
+ <div class="col-6of12">
+ <p><em>Date: July 2016<br />
+ Builds: Wearable Support 2.0.0-alpha2, NVD83H<br/>
+ Emulator support: x86 & ARM (32-bit)<br/>
+ </em></p>
+ </div>
+ </div>
+</div>
+
+<h3 id="new-in-fdp2">
+ <strong>New in Preview 2</strong>
+</h3>
+
+<h4 id="platform-version-24">
+ Platform API Version
+</h4>
+
+<p>
+ The Android Platform API version is incremented to 24 to match Android Nougat.
+ You can update the following in your Android Wear 2.0 Preview project
+ to <strong>24</strong>:
+</p>
+
+<ul>
+ <li><code>compileSdkVersion</code></li>
+ <li><code>targetSdkVersion</code></li>
+</ul>
+
+<h4 id="wearable-drawers">
+ Wearable drawers
+</h4>
+
+<p>
+ The following are feature additions for <a href=
+ "{@docRoot}wear/preview/features/ui-nav-actions.html">
+ wearable drawers</a>:
+</p>
+
+<ul>
+ <li>Drawer peeking is now supported in the <code>onCreate()</code> method
+ of your app's activity.
+ </li>
+
+ <li>The automatic drawer peeking behavior is
+ inverted. Now the bottom drawer peeks when the user scrolls down the view
+ and top drawer peeks when the user scrolls to the top of the view
+ (previously scrolling down did not show peek view).
+ </li>
+
+ <li>Two new attributes, <code>peek_view</code> and
+ <code>drawer_content</code>, are added to
+ <code>WearableDrawerView</code> to specify contents of custom drawers and
+ peek view in your XML layout (previously, custom drawer contents were
+ specified only through Java code).
+ </li>
+
+ <li>The Navigation drawer now displays page indicator dots.
+ </li>
+
+ <li>Peek views now close automatically after one second.
+ </li>
+
+ <li>The <code>WearableNavigationDrawer</code> now automatically closes
+ after five seconds or when an item is tapped.
+ </li>
+
+ <li>There is improved drawer handling (size and margins) for devices with chins:
+ <ul>
+ <li>Size: The bottom drawer is slightly smaller when there is a
+ chin.
+ </li>
+ <li>Margins: <code>WearableDrawerLayout</code> sets its bottom margin
+ size equal to the size of the chin, so that the bottom drawer is
+ fully visible.
+ </li>
+ </ul>
+ <li>The navigation drawer contents are now updated when
+ <code><a href="{@docRoot}reference/android/widget/ArrayAdapter.html#notifyDataSetChanged()">
+ notifyDataSetChanged</a></code> is called on the adapter.
+ </li>
+
+ <li>In your <code>WearableActionDrawer</code>, when there is only one
+ action, its icon is shown in the peek view and the action is executed
+ when the peek view is tapped.
+ </li>
+
+ <li>When the peek view of your <code>WearableActionDrawer</code> has
+ more than one action, both the first action and the overflow icons are
+ shown.
+ </li>
+</ul>
+
+<h4 id="gestures">
+ Wrist gestures
+</h4>
+
+<p>
+ Wrist gestures can enable quick, one-handed interactions with your app.
+ For example, a user can
+ scroll through notifications with one hand while holding a cup of water
+ with the other. For more information, see <a href=
+ "{@docRoot}wear/preview/features/gestures.html">
+ Wrist Gestures</a>.
+</p>
+
+<h3 id="known-issues-2">
+ <strong>Known Issues</strong>
+</h3>
+
+<h4 id="notifications-2">
+ Notifications
+</h4>
+
+<ul>
+ <li>This preview release does not include support for notification
+ groups.
+ </li>
+
+ <li>The user interface for the action drawer can sometimes have a
+ transparent background.
+ </li>
+
+ <li>The system does not generate Smart Reply responses even if
+ <code>setAllowGeneratedReplies(true)</code> is set.
+ </li>
+</ul>
+
+<h4 id="complications-2">
+ Complications
+</h4>
+
+<ul>
+ <li>When tapping on the music complication on a watch face, Play Music
+ crashes if the Apps launcher provider is used.
+ </li>
+</ul>
+
+<h4 id="system-user-interface-2">
+ System User Interface
+</h4>
+
+<ul>
+ <li>Pressing the hardware button in ambient mode triggers active mode
+ with the app launcher instead of active mode only.
+ </li>
+
+ <li>Double pressing the power hardware button while on the launcher
+ causes the watch screen to turn black.
+ </li>
+
+ <li>Dismissing multiple notifications can cause app to forcibly close.
+ </li>
+
+ <li>Turning screen lock to off (Enable and disable) functionality is not
+ reliable.
+ </li>
+
+ <li>The "Ok Google" detection and voice transcription may not work
+ reliably. Additionally, Search does not retrieve results.
+ </li>
+
+ <li>Tapping Google keyboard English (United States) displays a "Settings
+ under construction" message.
+ </li>
+
+ <li>First calendar event notification must be dismissed in order to show
+ the rest of the event card.
+ </li>
+
+ <li>Unable to turn off the Wi-Fi on a wearable.
+ </li>
+</ul>
+
+<h4 id="companion-app-2">
+ Companion App
+</h4>
+
+<ul>
+ <li>An actions card is shown in the Android Wear companion app, even
+ though there are no actions.
+ </li>
+</ul>
+
+<h4 id="devices-2">
+ Devices
+</h4>
+
+<ul>
+ <li>On the Huawei Watch, selecting the language, followed by multiple
+ acknowledgement dialogues results in a black screen.
+ </li>
+
+ <li>On the LG Watch Urbane 2nd Edition, when answering a call from the watch, the
+ watch does not provide audio from the caller.
+ </li>
+
+ <li>On the LG Watch Urbane 2nd Edition,
+ please do the following to prevent battery drain:
+ Turn on Airplane mode (to disable the cellular radio) and then
+ turn on Bluetooth.
+ </li>
+</ul>
+
+<h2 id="dp1">Developer Preview 1</h2>
<div class="wrap">
<div class="cols">
@@ -29,36 +284,10 @@
</div>
</div>
-
-<h3 id="general_advisories">General advisories</h3>
-
-<p>
- This Developer Preview release is for app developers only and is designed for
- use in compatibility testing and early development only.
-</p>
-
-<h4 id="deprecations">Deprecations</h4>
-
-
-<p>The following fields are deprecated in the Preview:</p>
-
-<ul>
- <li>The <code>Notification.WearableExtender#setCustomSizePreset(int)</code>
- method no longer accepts <code>SIZE_FULL_SCREEN</code> and this value is now
- undefined.
- </li>
-
- <li>The <code>Notification.WearableExtender#setContentIcon(int)</code> method
- is deprecated.
- </li>
-</ul>
-
<h3 id="known_issues">Known Issues</h3>
-
<h4 id="notifications">Notifications</h4>
-
<ul>
<li>This preview release does not include support for notification groups,
but will be supported in a future release.
@@ -74,18 +303,17 @@
</li>
</ul>
-
<h4 id="complications">Complications</h4>
<ul>
- <li>Battery information is not synchronized between watch face and drop down
- quick menu.
+ <li>Battery information is not synchronized between the
+ watch face and the drop-down Quick menu.
</li>
- <li>Play music crashes when tapping on music complication in watch face.
+ <li>When tapping on the music complication on a watch face, Play Music
+ crashes if the Apps launcher provider is used.
</li>
</ul>
-
<h4 id="system_user_interface">System User Interface</h4>
<ul>
@@ -114,26 +342,24 @@
</li>
</ul>
-
<h4 id="companion_app">Companion App</h4>
<ul>
- <li>'More actions' via Companion app shows a blank screen on phone running
- nyc-release and watch running feldspar-release.
- </li>
- <li>Select watch face on companion wear app will not change watch face on
- wearable.
- </li>
+ <li>Selecting a watch face on the companion app will not change the watch face on
+ wearable.</li>
+ <li>An actions card is shown in the Android Wear companion app, even
+ though there are no actions.
+ </li>
</ul>
-
<h4 id="devices">Devices</h4>
<ul>
<li>On the Huawei Watch, selecting the language, followed by multiple
acknowledgement dialogues results in a black screen.
</li>
- <li>On the LG Watch Urbane LTE, when answering call from the watch, the watch
+ <li>On the LG Watch Urbane 2nd Edition, when
+ answering a call from the watch, the watch
does not provide audio from the caller.
</li>
</ul>
diff --git a/docs/html/work/_project.yaml b/docs/html/work/_project.yaml
new file mode 100644
index 0000000..9db0466
--- /dev/null
+++ b/docs/html/work/_project.yaml
@@ -0,0 +1,5 @@
+name: "Work"
+home_url: /work/
+description: "Develop apps for Android for Work to take advantage of security and management features built into Android."
+content_license: cc3-apache2
+buganizer_id: 30209417
diff --git a/docs/html/work/cosu.jd b/docs/html/work/cosu.jd
index 8bc54d4..f66006b 100644
--- a/docs/html/work/cosu.jd
+++ b/docs/html/work/cosu.jd
@@ -223,7 +223,7 @@
</ul>
<p>
-Starting from Marshmallow, if your app is whitelisted by an EMM using {@link
+Starting from Marshmallow, if your app is whitelisted by an EMM using {@link
android.app.admin.DevicePolicyManager#setLockTaskPackages setLockTaskPackages},
your activities can automatically start lock task mode when the app is
launched.
@@ -253,15 +253,15 @@
<li>
The default value of the {@link android.R.attr#lockTaskMode} attribute is
-normal. When this attribute is set to normal, tasks don’t launch into
-{@link android.R.attr#lockTaskMode}, unless {@link android.app.Activity#startLockTask()}
+normal. When this attribute is set to normal, tasks don’t launch into
+{@link android.R.attr#lockTaskMode}, unless {@link android.app.Activity#startLockTask()}
is called. To call {@link android.app.Activity#startLockTask()},
-applications still need to be whitelisted using
-{@link android.app.admin.DevicePolicyManager#setLockTaskPackages setLockTaskPackages},
+applications still need to be whitelisted using
+{@link android.app.admin.DevicePolicyManager#setLockTaskPackages setLockTaskPackages},
otherwise, the user sees a dialog to approve entering pinned mode.
</li>
</ul>
-
+
<p>To have your activity <em>automatically</em> enter {@link android.R.attr#lockTaskMode},
change the value of this attribute to <code>if_whitelisted</code>.
Doing so causes your app to behave in this manner:
@@ -289,7 +289,7 @@
<p>
Given either of these options, you still need to create a mechanism for
calling {@link android.app.Activity#stopLockTask()} so that users can
-exit {@link android.R.attr#lockTaskMode}.
+exit {@link android.R.attr#lockTaskMode}.
</p>
<h2 id="create-dpc">
@@ -298,7 +298,7 @@
<p>
To manage applications in COSU, you need a DPC running as device
-owner to set several policies on the device.
+owner to set several policies on the device.
</p>
<p class="note">
diff --git a/docs/html/work/device-management-policy.jd b/docs/html/work/device-management-policy.jd
index d564b89..fd09150 100644
--- a/docs/html/work/device-management-policy.jd
+++ b/docs/html/work/device-management-policy.jd
@@ -14,7 +14,7 @@
<li><a href="#ActivateDeviceAdmin">Activate the Device Administrator</a></li>
<li><a href="#ImplementDevicePolicyController">Implement the Device Policy Controller</a></li>
</ol>
-
+
<!-- related docs (NOT javadocs) -->
<h2>You should also read</h2>
<ul>
diff --git a/docs/html/work/managed-configurations.jd b/docs/html/work/managed-configurations.jd
index dc3ef0d..76ca82f 100644
--- a/docs/html/work/managed-configurations.jd
+++ b/docs/html/work/managed-configurations.jd
@@ -35,7 +35,10 @@
</ul>
<p>
- This guide shows how to implement these configuration settings in your app.
+ This guide shows how to implement managed configuration settings in
+ your app. If you're an EMM developer, refer to the
+ <a href="https://developers.google.com/android/work/build-dpc"
+ >Build a Device Policy Controller</a> guide.
</p>
<p class="note">
@@ -71,8 +74,8 @@
<ul>
<li>Declare the managed configurations in your app manifest. Doing
- so allows the enterprise administrator to read the app's
- configurations through Google Play APIs.
+ so allows the enterprise administrator to read the app's
+ configurations through Google Play APIs.
</li>
<li>Whenever the app resumes, use the {@link
@@ -82,11 +85,11 @@
</li>
<li>Listen for the
- {@link android.content.Intent#ACTION_APPLICATION_RESTRICTIONS_CHANGED
- ACTION_APPLICATION_RESTRICTIONS_CHANGED} intent. When you receive this
- broadcast, check the {@link android.content.RestrictionsManager} to see what
- the current managed configurations are, and make any necessary changes to your
- app's behavior.
+ {@link android.content.Intent#ACTION_APPLICATION_RESTRICTIONS_CHANGED
+ ACTION_APPLICATION_RESTRICTIONS_CHANGED} intent. When you receive this
+ broadcast, check the {@link android.content.RestrictionsManager} to see what
+ the current managed configurations are, and make any necessary changes to your
+ app's behavior.
</li>
</ul>
@@ -96,11 +99,11 @@
<p>
Your app can support any managed configuration you want to define. You declare the
- app's managed configurations in a <em>managed configurations file</em>, and declare the
- configurations file in the manifest. Creating a configurations file allows other
- apps to examine the managed configurations your app provides. Enterprise Mobility
- Management (EMM) partners can read your app's configurations by using Google
- Play APIs.
+ app's managed configurations in a <em>managed configurations file</em>, and declare
+ the configurations file in the manifest. Creating a configurations file allows
+ other apps to examine the managed configurations your app provides. Enterprise
+ Mobility Management (EMM) partners can read your app's configurations by using
+ Google Play APIs.
</p>
<p>
@@ -138,6 +141,14 @@
</p>
<p>
+ The managed configuration provider can query the app to find details
+ on the app's available configurations, including their description
+ text. The configurations provider and enterprise administrator can
+ change your app's managed configurations at any time, even when the
+ app is not running.
+</p>
+
+<p>
For example, suppose your app can be remotely configured to allow or forbid
it to download data over a cellular connection. Your app could have a
<code><restriction></code> element like this:
@@ -145,24 +156,19 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
-<restrictions xmlns:android="http://schemas.android.com/apk/res/android" >
+<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
<restriction
android:key="downloadOnCellular"
- android:title="App is allowed to download data via cellular"
+ android:title="@string/download_on_cell_title"
android:restrictionType="bool"
- android:description="If 'false', app can only download data via Wi-Fi"
+ android:description="@string/download_on_cell_description"
android:defaultValue="true" />
</restrictions>
</pre>
<p>
- The supported types for the <code>android:restrictionType</code> element are
- documented in the reference for {@link android.content.RestrictionsManager}.
-</p>
-
-<p>
You use each configuration's <code>android:key</code> attribute to
read its value from a managed configuration bundle. For this reason,
each configuration must have a unique key string, and the string
@@ -172,19 +178,145 @@
<p class="note">
<strong>Note:</strong> In a production app, <code>android:title</code> and
<code>android:description</code> should be drawn from a localized resource
- file, as described in <a href=
- "{@docRoot}guide/topics/resources/localization.html">Localizing with
- Resources</a>.
+ file, as described in
+ <a href="{@docRoot}guide/topics/resources/localization.html"
+ >Localizing with Resources</a>.
</p>
-<p>
- The managed configuration provider can query the app to find details
- on the app's available configurations, including their description
- text. Configurations providers and enterprise administrators can
- change your app's managed configurations at any time, even when the
- app is not running.
+<p id="nested-restrictions">
+ An app can define one or multiple nested restriction elements using
+ the restriction types
+ {@link android.content.RestrictionEntry#TYPE_BUNDLE bundle} and
+ {@link android.content.RestrictionEntry#TYPE_BUNDLE_ARRAY bundle_array}.
+ For example, an app with multiple VPN connection options could define
+ each VPN server configuration in a bundle, with multiple bundles grouped
+ together in a bundle array:
</p>
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<restrictions xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <restriction
+ android:key="vpn_configuration_list"
+ android:restrictionType="bundle_array">
+ <restriction
+ android:key="vpn_configuration"
+ android:restrictionType="bundle">
+ <restriction
+ android:key="vpn_server"
+ android:restrictionType="string"/>
+ <restriction
+ android:key="vpn_username"
+ android:restrictionType="string"/>
+ <restriction
+ android:key="vpn_password"
+ android:restrictionType="string"/>
+ </restriction>
+ </restriction>
+
+</restrictions>
+</pre>
+
+<p>
+ The supported types for the <code>android:restrictionType</code> element
+ are listed in <a href="#restriction-types">Table 1</a> and documented in
+ the reference for {@link android.content.RestrictionsManager} and
+ {@link android.content.RestrictionEntry}.
+</p>
+
+<p class="table-caption" id="restriction-types">
+ <strong>Table 1.</strong> Restriction entry types and usage.
+</p>
+<table>
+ <tbody>
+ <tr>
+ <th>Type</th>
+ <th>android:restrictionType</th>
+ <th>Typical usage</th>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_BOOLEAN TYPE_BOOLEAN}
+ </td>
+ <td><code>"bool"</code></td>
+ <td>
+ A boolean value, true or false.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_STRING TYPE_STRING}
+ </td>
+ <td><code>"string"</code></td>
+ <td>
+ A string value, such as a name.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_INTEGER TYPE_INTEGER}
+ </td>
+ <td><code>"integer"</code></td>
+ <td>
+ An integer with a value from
+ {@link java.lang.Integer#MIN_VALUE MIN_VALUE} to
+ {@link java.lang.Integer#MAX_VALUE MAX_VALUE}.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_CHOICE TYPE_CHOICE}
+ </td>
+ <td><code>"choice"</code></td>
+ <td>
+ A string value, typically presented as a single-select list.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_MULTI_SELECT TYPE_MULTI_SELECT}
+ </td>
+ <td><code>"multi-select"</code></td>
+ <td>
+ Use this for presenting a multi-select list where more than
+ one entry can be selected, such as for choosing specific
+ titles to white-list.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_NULL TYPE_NULL}
+ </td>
+ <td><code>"hidden"</code></td>
+ <td>
+ Hidden restriction type. Use this type for information that
+ needs to be transferred across but shouldn't be presented to
+ the user in the UI. Stores a single string value.
+ </td>
+ </tr>
+ <tr>
+ <td>{@link android.content.RestrictionEntry#TYPE_BUNDLE TYPE_BUNDLE}</td>
+ <td><code>"bundle"</code></td>
+ <td>
+ Use this for storing {@link android.os.Bundle bundles} of
+ restrictions. Available in Android 6.0 (API level 23).
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {@link android.content.RestrictionEntry#TYPE_BUNDLE_ARRAY TYPE_BUNDLE_ARRAY}
+ </td>
+ <td><code>"bundle_array"</code></td>
+ <td>
+ Use this for storing arrays of restriction
+ <a href="{@docRoot}reference/android/os/Bundle.html"
+ >bundles</a>. Available in Android 6.0 (API level 23).
+ </td>
+ </tr>
+ </tbody>
+</table>
+
<h2 id="check-configuration">
Check Managed Configurations
</h2>
@@ -217,7 +349,7 @@
<p>
To get a {@link android.content.RestrictionsManager} object, get the current
activity with {@link android.app.Fragment#getActivity getActivity()}, then
- call that activity's {@link android.app.Activity#getSystemService
+ call that activity's {@link android.app.Activity#getSystemService(java.lang.String)
Activity.getSystemService()} method:
</p>
@@ -267,9 +399,9 @@
<code>String</code>, and <code>String[]</code>. Once you have the
managed configurations {@link android.os.Bundle}, you can check the current
configuration settings with the standard {@link android.os.Bundle} methods for
- those data types, such as {@link android.os.Bundle#getBoolean getBoolean()}
+ those data types, such as {@link android.os.BaseBundle#getBoolean getBoolean()}
or
- {@link android.os.Bundle#getString getString()}.
+ {@link android.os.BaseBundle#getString getString()}.
</p>
<p class="note">
@@ -292,11 +424,10 @@
<pre>
boolean appCanUseCellular;
-if appRestrictions.containsKey("downloadOnCellular") {
+if (appRestrictions.containsKey("downloadOnCellular")) {
appCanUseCellular = appRestrictions.getBoolean("downloadOnCellular");
} else {
- // here, cellularDefault is a boolean set with the restriction's
- // default value
+ // cellularDefault is a boolean using the restriction's default value
appCanUseCellular = cellularDefault;
}
@@ -305,6 +436,37 @@
// ...show appropriate notices to user
}</pre>
+<p>
+ To apply multiple <a href="#nested-restrictions">nested restrictions</a>, read
+ the {@link android.content.RestrictionEntry#TYPE_BUNDLE_ARRAY bundle_array}
+ restriction entry as a collection of {@link android.os.Parcelable} objects
+ and cast as a {@link android.os.Bundle}. In this example, each VPN's configuration
+ data is parsed and used to build a list of server connection choices:
+</p>
+
+<pre>
+// VpnConfig is a sample class used store config data, not defined
+List<VpnConfig> vpnConfigs = new ArrayList<>();
+
+Parcelable[] parcelables =
+ appRestrictions.getParcelableArray("vpn_configuration_list");
+
+if (parcelables != null && parcelables.length > 0) {
+ // iterate parcelables and cast as bundle
+ for (int i = 0; i < parcelables.length; i++) {
+ Bundle vpnConfigBundle = (Bundle) parcelables[i];
+ // parse bundle data and store in VpnConfig array
+ vpnConfigs.add(new VpnConfig()
+ .setServer(vpnConfigBundle.getString("vpn_server"))
+ .setUsername(vpnConfigBundle.getString("vpn_username"))
+ .setPassword(vpnConfigBundle.getString("vpn_password")));
+ }
+}
+
+if (!vpnConfigs.isEmpty()) {
+ // ...choose a VPN configuration or prompt user to select from list
+}</pre>
+
<h2 id="listen-configuration">
Listen for Managed Configuration Changes
</h2>
diff --git a/docs/image_sources/training/tv/tif/app-link-diagram.graffle.zip b/docs/image_sources/training/tv/tif/app-link-diagram.graffle.zip
new file mode 100644
index 0000000..8b6779d
--- /dev/null
+++ b/docs/image_sources/training/tv/tif/app-link-diagram.graffle.zip
Binary files differ
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index ddc380e..4257904 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -794,7 +794,7 @@
* @return true if the resulting is non-empty
*/
public boolean clipPath(@NonNull Path path, @NonNull Region.Op op) {
- return native_clipPath(mNativeCanvasWrapper, path.ni(), op.nativeInt);
+ return native_clipPath(mNativeCanvasWrapper, path.readOnlyNI(), op.nativeInt);
}
/**
@@ -913,7 +913,7 @@
* does not intersect with the canvas' clip
*/
public boolean quickReject(@NonNull Path path, @NonNull EdgeType type) {
- return native_quickReject(mNativeCanvasWrapper, path.ni());
+ return native_quickReject(mNativeCanvasWrapper, path.readOnlyNI());
}
/**
@@ -1265,7 +1265,7 @@
if (path.isSimplePath && path.rects != null) {
native_drawRegion(mNativeCanvasWrapper, path.rects.mNativeRegion, paint.getNativeInstance());
} else {
- native_drawPath(mNativeCanvasWrapper, path.ni(), paint.getNativeInstance());
+ native_drawPath(mNativeCanvasWrapper, path.readOnlyNI(), paint.getNativeInstance());
}
}
@@ -1901,7 +1901,7 @@
throw new ArrayIndexOutOfBoundsException();
}
native_drawTextOnPath(mNativeCanvasWrapper, text, index, count,
- path.ni(), hOffset, vOffset,
+ path.readOnlyNI(), hOffset, vOffset,
paint.mBidiFlags, paint.getNativeInstance(), paint.mNativeTypeface);
}
@@ -1921,7 +1921,7 @@
public void drawTextOnPath(@NonNull String text, @NonNull Path path, float hOffset,
float vOffset, @NonNull Paint paint) {
if (text.length() > 0) {
- native_drawTextOnPath(mNativeCanvasWrapper, text, path.ni(), hOffset, vOffset,
+ native_drawTextOnPath(mNativeCanvasWrapper, text, path.readOnlyNI(), hOffset, vOffset,
paint.mBidiFlags, paint.getNativeInstance(), paint.mNativeTypeface);
}
}
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 054e29f..888bbc2 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -1021,7 +1021,7 @@
* drawn with a hairline (width == 0)
*/
public boolean getFillPath(Path src, Path dst) {
- return nGetFillPath(mNativePaint, src.ni(), dst.ni());
+ return nGetFillPath(mNativePaint, src.readOnlyNI(), dst.mutateNI());
}
/**
@@ -1496,8 +1496,8 @@
/**
* Returns the font feature settings. The format is the same as the CSS
* font-feature-settings attribute:
- * <a href="http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings">
- * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings</a>
+ * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+ * https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>
*
* @return the paint's currently set font feature settings. Default is null.
*
@@ -1511,8 +1511,8 @@
* Set font feature settings.
*
* The format is the same as the CSS font-feature-settings attribute:
- * <a href="http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings">
- * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings</a>
+ * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+ * https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>
*
* @see #getFontFeatureSettings()
*
@@ -2394,7 +2394,7 @@
throw new ArrayIndexOutOfBoundsException();
}
nGetTextPath(mNativePaint, mNativeTypeface, mBidiFlags, text, index, count, x, y,
- path.ni());
+ path.mutateNI());
}
/**
@@ -2416,7 +2416,7 @@
throw new IndexOutOfBoundsException();
}
nGetTextPath(mNativePaint, mNativeTypeface, mBidiFlags, text, start, end, x, y,
- path.ni());
+ path.mutateNI());
}
/**
diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java
index de391af..2294b86 100644
--- a/graphics/java/android/graphics/Path.java
+++ b/graphics/java/android/graphics/Path.java
@@ -775,7 +775,12 @@
}
}
- final long ni() {
+ final long readOnlyNI() {
+ return mNativePath;
+ }
+
+ final long mutateNI() {
+ isSimplePath = false;
return mNativePath;
}
@@ -795,7 +800,6 @@
* Path. Typically this would be 0.5 so that
* the error is less than half a pixel.
* @return An array of components for points approximating the Path.
- * @hide
*/
public float[] approximate(float acceptableError) {
return native_approximate(mNativePath, acceptableError);
diff --git a/graphics/java/android/graphics/PathDashPathEffect.java b/graphics/java/android/graphics/PathDashPathEffect.java
index 4f43f68..2b6a6ed 100644
--- a/graphics/java/android/graphics/PathDashPathEffect.java
+++ b/graphics/java/android/graphics/PathDashPathEffect.java
@@ -41,7 +41,7 @@
*/
public PathDashPathEffect(Path shape, float advance, float phase,
Style style) {
- native_instance = nativeCreate(shape.ni(), advance, phase,
+ native_instance = nativeCreate(shape.readOnlyNI(), advance, phase,
style.native_style);
}
diff --git a/graphics/java/android/graphics/PathMeasure.java b/graphics/java/android/graphics/PathMeasure.java
index 2848949..78d892e 100644
--- a/graphics/java/android/graphics/PathMeasure.java
+++ b/graphics/java/android/graphics/PathMeasure.java
@@ -50,7 +50,7 @@
public PathMeasure(Path path, boolean forceClosed) {
// The native implementation does not copy the path, prevent it from being GC'd
mPath = path;
- native_instance = native_create(path != null ? path.ni() : 0,
+ native_instance = native_create(path != null ? path.readOnlyNI() : 0,
forceClosed);
}
@@ -60,7 +60,7 @@
public void setPath(Path path, boolean forceClosed) {
mPath = path;
native_setPath(native_instance,
- path != null ? path.ni() : 0,
+ path != null ? path.readOnlyNI() : 0,
forceClosed);
}
@@ -134,8 +134,7 @@
return false;
}
- dst.isSimplePath = false;
- return native_getSegment(native_instance, startD, stopD, dst.ni(), startWithMoveTo);
+ return native_getSegment(native_instance, startD, stopD, dst.mutateNI(), startWithMoveTo);
}
/**
diff --git a/graphics/java/android/graphics/Picture.java b/graphics/java/android/graphics/Picture.java
index 28d8690..08eeaff 100644
--- a/graphics/java/android/graphics/Picture.java
+++ b/graphics/java/android/graphics/Picture.java
@@ -21,11 +21,14 @@
/**
* A Picture records drawing calls (via the canvas returned by beginRecording)
- * and can then play them back into Canvas (via {@link Picture#draw(Canvas)} or
+ * and can then play them back into Canvas (via {@link Picture#draw(Canvas)} or
* {@link Canvas#drawPicture(Picture)}).For most content (e.g. text, lines, rectangles),
* drawing a sequence from a picture can be faster than the equivalent API
* calls, since the picture performs its playback without incurring any
* method-call overhead.
+ *
+ * <p class="note"><strong>Note:</strong> Prior to API level 23 a picture cannot
+ * be replayed on a hardware accelerated canvas.</p>
*/
public class Picture {
private Canvas mRecordingCanvas;
@@ -135,10 +138,6 @@
* have been persisted across device restarts are not guaranteed to decode
* properly and are highly discouraged.
*
- * <p>
- * <strong>Note:</strong> Prior to API level 23 a picture created from an
- * input stream cannot be replayed on a hardware accelerated canvas.
- *
* @see #writeToStream(java.io.OutputStream)
* @deprecated The recommended alternative is to not use writeToStream and
* instead draw the picture into a Bitmap from which you can persist it as
@@ -155,10 +154,6 @@
* The resulting stream is NOT to be persisted across device restarts as
* there is no guarantee that the Picture can be successfully reconstructed.
*
- * <p>
- * <strong>Note:</strong> Prior to API level 23 a picture created from an
- * input stream cannot be replayed on a hardware accelerated canvas.
- *
* @see #createFromStream(java.io.InputStream)
* @deprecated The recommended alternative is to draw the picture into a
* Bitmap from which you can persist it as raw or compressed pixels.
diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java
index de89ad0..dca6d9e 100644
--- a/graphics/java/android/graphics/Region.java
+++ b/graphics/java/android/graphics/Region.java
@@ -110,7 +110,7 @@
* (with no antialiasing).
*/
public boolean setPath(Path path, Region clip) {
- return nativeSetPath(mNativeRegion, path.ni(), clip.mNativeRegion);
+ return nativeSetPath(mNativeRegion, path.readOnlyNI(), clip.mNativeRegion);
}
/**
@@ -155,7 +155,7 @@
*/
public Path getBoundaryPath() {
Path path = new Path();
- nativeGetBoundaryPath(mNativeRegion, path.ni());
+ nativeGetBoundaryPath(mNativeRegion, path.mutateNI());
return path;
}
@@ -164,7 +164,7 @@
* path will also be empty.
*/
public boolean getBoundaryPath(Path path) {
- return nativeGetBoundaryPath(mNativeRegion, path.ni());
+ return nativeGetBoundaryPath(mNativeRegion, path.mutateNI());
}
/**
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index 0bdc76f..b8da518c 100644
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -144,6 +144,55 @@
* android:valueType="pathType"/>
* </set>
* </pre></li>
+ * <p>
+ * Since AAPT tool is now supporting a new format which can bundle several related XML files into
+ * one, we can merge the previous example into one XML file, like this:
+ * </p>
+ * <pre>
+ * <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" >
+ * <aapt:attr name="android:drawable">
+ * <vector
+ * android:height="64dp"
+ * android:width="64dp"
+ * android:viewportHeight="600"
+ * android:viewportWidth="600" >
+ * <group
+ * android:name="rotationGroup"
+ * android:pivotX="300.0"
+ * android:pivotY="300.0"
+ * android:rotation="45.0" >
+ * <path
+ * android:name="v"
+ * android:fillColor="#000000"
+ * android:pathData="M300,70 l 0,-70 70,70 0,0 -70,70z" />
+ * </group>
+ * </vector>
+ * </aapt:attr>
+ *
+ * <target android:name="rotationGroup"> *
+ * <aapt:attr name="android:animation">
+ * <objectAnimator
+ * android:duration="6000"
+ * android:propertyName="rotation"
+ * android:valueFrom="0"
+ * android:valueTo="360" />
+ * </aapt:attr>
+ * </target>
+ *
+ * <target android:name="v" >
+ * <aapt:attr name="android:animation">
+ * <set>
+ * <objectAnimator
+ * android:duration="3000"
+ * android:propertyName="pathData"
+ * android:valueFrom="M300,70 l 0,-70 70,70 0,0 -70,70z"
+ * android:valueTo="M300,70 l 0,-70 70,0 0,140 -70,0 z"
+ * android:valueType="pathType"/>
+ * </set>
+ * </aapt:attr>
+ * </target>
+ * </animated-vector>
+ * </pre>
*
* @attr ref android.R.styleable#AnimatedVectorDrawable_drawable
* @attr ref android.R.styleable#AnimatedVectorDrawableTarget_name
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index d5143da..cc7f5c7 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -851,8 +851,8 @@
private Drawable prepareDrawable(Drawable child) {
child.setLayoutDirection(mLayoutDirection);
- child.setCallback(mOwner);
child = child.mutate();
+ child.setCallback(mOwner);
return child;
}
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index d24cbce..7ea466e 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -700,7 +700,7 @@
float rad = mStrokePaint.getStrokeWidth();
canvas.saveLayer(mRect.left - rad, mRect.top - rad,
mRect.right + rad, mRect.bottom + rad,
- mLayerPaint, Canvas.HAS_ALPHA_LAYER_SAVE_FLAG);
+ mLayerPaint);
// don't perform the filter in our individual paints
// since the layer will do it for us
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index a8c8737..9ff6965 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -27,9 +27,9 @@
import android.graphics.ColorFilter;
import android.graphics.Insets;
import android.graphics.PixelFormat;
+import android.graphics.PorterDuff.Mode;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
-import android.graphics.PorterDuff.Mode;
import android.graphics.Shader;
import android.util.ArrayMap;
import android.util.AttributeSet;
@@ -140,12 +140,16 @@
* in the SVG's path data. This is defined in the viewport space.</dd>
* <dt><code>android:fillColor</code></dt>
* <dd>Specifies the color used to fill the path. May be a color or, for SDK 24+, a color state list
- * or a gradient color. If this property is animated, any value set by the animation will
- * override the original value. No path fill is drawn if this property is not specified.</dd>
+ * or a gradient color (See {@link android.R.styleable#GradientColor}
+ * and {@link android.R.styleable#GradientColorItem}).
+ * If this property is animated, any value set by the animation will override the original value.
+ * No path fill is drawn if this property is not specified.</dd>
* <dt><code>android:strokeColor</code></dt>
* <dd>Specifies the color used to draw the path outline. May be a color or, for SDK 24+, a color
- * state list or a gradient color. If this property is animated, any value set by the animation will
- * override the original value. No path outline is drawn if this property is not specified.</dd>
+ * state list or a gradient color (See {@link android.R.styleable#GradientColor}
+ * and {@link android.R.styleable#GradientColorItem}).
+ * If this property is animated, any value set by the animation will override the original value.
+ * No path outline is drawn if this property is not specified.</dd>
* <dt><code>android:strokeWidth</code></dt>
* <dd>The width a path stroke.</dd>
* <dt><code>android:strokeAlpha</code></dt>
@@ -166,8 +170,9 @@
* <dt><code>android:strokeMiterLimit</code></dt>
* <dd>Sets the Miter limit for a stroked path.</dd>
* <dt><code>android:fillType</code></dt>
- * <dd>Sets the fillType for a path. It is the same as SVG's "fill-rule" properties.
- * For more details, see https://www.w3.org/TR/SVG/painting.html#FillRuleProperty</dd>
+ * <dd>Sets the fillType for a path. The types can be either "evenOdd" or "nonZero". They behave the
+ * same as SVG's "fill-rule" properties. For more details, see
+ * <a href="https://www.w3.org/TR/SVG/painting.html#FillRuleProperty">FillRuleProperty</a></dd>
* </dl></dd>
* </dl>
*
@@ -201,7 +206,26 @@
* android:pathData="M300,70 l 0,-70 70,70 0,0 -70,70z" />
* </group>
* </vector>
- * </pre></li>
+ * </pre>
+ * </li>
+ * <li>And here is an example of linear gradient color, which is supported in SDK 24+.
+ * See more details in {@link android.R.styleable#GradientColor} and
+ * {@link android.R.styleable#GradientColorItem}.
+ * <pre>
+ * <gradient xmlns:android="http://schemas.android.com/apk/res/android"
+ * android:angle="90"
+ * android:startColor="?android:attr/colorPrimary"
+ * android:endColor="?android:attr/colorControlActivated"
+ * android:centerColor="#f00"
+ * android:startX="0"
+ * android:startY="0"
+ * android:endX="100"
+ * android:endY="100"
+ * android:type="linear">
+ * </gradient>
+ * </pre>
+ * </li>
+ *
*/
public class VectorDrawable extends Drawable {
@@ -235,7 +259,7 @@
private final Rect mTmpBounds = new Rect();
public VectorDrawable() {
- this(new VectorDrawableState(), null);
+ this(new VectorDrawableState(null), null);
}
/**
@@ -389,6 +413,11 @@
protected boolean onStateChange(int[] stateSet) {
boolean changed = false;
+ // When the VD is stateful, we need to mutate the drawable such that we don't share the
+ // cache bitmap with others. Such that the state change only affect this new cached bitmap.
+ if (isStateful()) {
+ mutate();
+ }
final VectorDrawableState state = mVectorState;
if (state.onStateChange(stateSet)) {
changed = true;
@@ -825,7 +854,8 @@
private static final int NATIVE_ALLOCATION_SIZE = 316;
- // Deep copy for mutate() or implicitly mutate.
+ // If copy is not null, deep copy the given VectorDrawableState. Otherwise, create a
+ // native vector drawable tree with an empty root group.
public VectorDrawableState(VectorDrawableState copy) {
if (copy != null) {
mThemeAttrs = copy.mThemeAttrs;
@@ -846,8 +876,11 @@
if (copy.mRootName != null) {
mVGTargetsMap.put(copy.mRootName, this);
}
- onTreeConstructionFinished();
+ } else {
+ mRootGroup = new VGroup();
+ createNativeTree(mRootGroup);
}
+ onTreeConstructionFinished();
}
private void createNativeTree(VGroup rootGroup) {
@@ -865,7 +898,8 @@
VMRuntime.getRuntime().registerNativeAllocation(NATIVE_ALLOCATION_SIZE);
}
-
+ // This should be called every time after a new RootGroup and all its subtrees are created
+ // (i.e. in constructors of VectorDrawableState and in inflate).
void onTreeConstructionFinished() {
mRootGroup.setTree(mNativeTree);
mAllocationOfAllNodes = mRootGroup.getNativeSize();
@@ -913,11 +947,6 @@
|| super.canApplyTheme();
}
- public VectorDrawableState() {
- mRootGroup = new VGroup();
- createNativeTree(mRootGroup);
- }
-
@Override
public Drawable newDrawable() {
return new VectorDrawable(this, null);
diff --git a/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java b/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java
index 8d01ea7..70f5976 100644
--- a/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java
+++ b/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java
@@ -23,7 +23,6 @@
TestSuite suite = new TestSuite(GraphicsTests.class.getName());
suite.addTestSuite(BitmapTest.class);
- suite.addTestSuite(TypefaceTest.class);
return suite;
}
}
diff --git a/graphics/tests/graphicstests/src/android/graphics/TypefaceTest.java b/graphics/tests/graphicstests/src/android/graphics/TypefaceTest.java
deleted file mode 100644
index 334fddf..0000000
--- a/graphics/tests/graphicstests/src/android/graphics/TypefaceTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.graphics;
-
-import android.graphics.Paint;
-import android.graphics.Typeface;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-import junit.framework.TestCase;
-
-
-public class TypefaceTest extends TestCase {
-
- // create array of all std faces
- private final Typeface[] mFaces = new Typeface[] {
- Typeface.create(Typeface.SANS_SERIF, 0),
- Typeface.create(Typeface.SANS_SERIF, 1),
- Typeface.create(Typeface.SERIF, 0),
- Typeface.create(Typeface.SERIF, 1),
- Typeface.create(Typeface.SERIF, 2),
- Typeface.create(Typeface.SERIF, 3),
- Typeface.create(Typeface.MONOSPACE, 0)
- };
-
- @SmallTest
- public void testBasic() throws Exception {
- assertTrue("basic", Typeface.DEFAULT != null);
- assertTrue("basic", Typeface.DEFAULT_BOLD != null);
- assertTrue("basic", Typeface.SANS_SERIF != null);
- assertTrue("basic", Typeface.SERIF != null);
- assertTrue("basic", Typeface.MONOSPACE != null);
- }
-
- @SmallTest
- public void testUnique() throws Exception {
- final int n = mFaces.length;
- for (int i = 0; i < n; i++) {
- for (int j = i + 1; j < n; j++) {
- assertTrue("unique", mFaces[i] != mFaces[j]);
- }
- }
- }
-
- @SmallTest
- public void testStyles() throws Exception {
- assertTrue("style", mFaces[0].getStyle() == Typeface.NORMAL);
- assertTrue("style", mFaces[1].getStyle() == Typeface.BOLD);
- assertTrue("style", mFaces[2].getStyle() == Typeface.NORMAL);
- assertTrue("style", mFaces[3].getStyle() == Typeface.BOLD);
- assertTrue("style", mFaces[4].getStyle() == Typeface.ITALIC);
- assertTrue("style", mFaces[5].getStyle() == Typeface.BOLD_ITALIC);
- assertTrue("style", mFaces[6].getStyle() == Typeface.NORMAL);
- }
-
- @MediumTest
- public void testUniformY() throws Exception {
- Paint p = new Paint();
- final int n = mFaces.length;
- for (int i = 1; i <= 36; i++) {
- p.setTextSize(i);
- float ascent = 0;
- float descent = 0;
- for (int j = 0; j < n; j++) {
- p.setTypeface(mFaces[j]);
- Paint.FontMetrics fm = p.getFontMetrics();
- if (j == 0) {
- ascent = fm.ascent;
- descent = fm.descent;
- } else {
- assertTrue("fontMetrics", fm.ascent == ascent);
- assertTrue("fontMetrics", fm.descent == descent);
- }
- }
- }
- }
-
-}
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h
index 9a3b990..ed77d9a 100644
--- a/include/android_runtime/AndroidRuntime.h
+++ b/include/android_runtime/AndroidRuntime.h
@@ -44,7 +44,7 @@
Tool,
};
- void setArgv0(const char* argv0);
+ void setArgv0(const char* argv0, bool setProcName = false);
void addOption(const char* optionString, void* extra_info = NULL);
/**
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index cce58c2..adfdfba 100644
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -25,6 +25,7 @@
import android.content.Intent;
import android.content.ServiceConnection;
import android.net.Uri;
+import android.os.Build;
import android.os.IBinder;
import android.os.Looper;
import android.os.Process;
@@ -179,7 +180,6 @@
// Compatible with old android.security.Credentials.PKCS12
public static final String EXTRA_PKCS12 = "PKCS12";
-
/**
* Broadcast Action: Indicates the trusted storage has changed. Sent when
* one of this happens:
@@ -191,10 +191,51 @@
* <li>trusted storage is reset (all user certs are cleared),
* <li>when permission to access a private key is changed.
* </ul>
+ *
+ * @deprecated Use {@link #ACTION_KEYCHAIN_CHANGED}, {@link #ACTION_TRUST_STORE_CHANGED} or
+ * {@link #ACTION_KEY_ACCESS_CHANGED}. Apps that target a version higher than
+ * {@link Build.VERSION_CODES#N_MR1} will not receive this broadcast.
*/
public static final String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
/**
+ * Broadcast Action: Indicates the contents of the keychain has changed. Sent when a KeyChain
+ * entry is added, modified or removed.
+ */
+ public static final String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";
+
+ /**
+ * Broadcast Action: Indicates the contents of the trusted certificate store has changed. Sent
+ * when one the following occurs:
+ *
+ * <ul>
+ * <li>A pre-installed CA is disabled or re-enabled</li>
+ * <li>A CA is added or removed from the trust store</li>
+ * </ul>
+ */
+ public static final String ACTION_TRUST_STORE_CHANGED =
+ "android.security.action.TRUST_STORE_CHANGED";
+
+ /**
+ * Broadcast Action: Indicates that the access permissions for a private key have changed.
+ *
+ */
+ public static final String ACTION_KEY_ACCESS_CHANGED =
+ "android.security.action.KEY_ACCESS_CHANGED";
+
+ /**
+ * Used as a String extra field in {@link #ACTION_KEY_ACCESS_CHANGED} to supply the alias of
+ * the key.
+ */
+ public static final String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";
+
+ /**
+ * Used as a boolean extra field in {@link #ACTION_KEY_ACCESS_CHANGED} to supply if the key is
+ * accessible to the application.
+ */
+ public static final String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";
+
+ /**
* Returns an {@code Intent} that can be used for credential
* installation. The intent may be used without any extras, in
* which case the user will be able to install credentials from
@@ -368,24 +409,26 @@
if (alias == null) {
throw new NullPointerException("alias == null");
}
- KeyChainConnection keyChainConnection = bind(context);
- try {
- final IKeyChainService keyChainService = keyChainConnection.getService();
- final String keyId = keyChainService.requestPrivateKey(alias);
- if (keyId == null) {
- return null;
- }
- return AndroidKeyStoreProvider.loadAndroidKeyStorePrivateKeyFromKeystore(
- KeyStore.getInstance(), keyId, KeyStore.UID_SELF);
+
+ final String keyId;
+ try (KeyChainConnection keyChainConnection = bind(context.getApplicationContext())) {
+ keyId = keyChainConnection.getService().requestPrivateKey(alias);
} catch (RemoteException e) {
throw new KeyChainException(e);
} catch (RuntimeException e) {
// only certain RuntimeExceptions can be propagated across the IKeyChainService call
throw new KeyChainException(e);
- } catch (UnrecoverableKeyException e) {
- throw new KeyChainException(e);
- } finally {
- keyChainConnection.close();
+ }
+
+ if (keyId == null) {
+ return null;
+ } else {
+ try {
+ return AndroidKeyStoreProvider.loadAndroidKeyStorePrivateKeyFromKeystore(
+ KeyStore.getInstance(), keyId, KeyStore.UID_SELF);
+ } catch (RuntimeException | UnrecoverableKeyException e) {
+ throw new KeyChainException(e);
+ }
}
}
@@ -412,16 +455,25 @@
if (alias == null) {
throw new NullPointerException("alias == null");
}
- KeyChainConnection keyChainConnection = bind(context);
- try {
- IKeyChainService keyChainService = keyChainConnection.getService();
- final byte[] certificateBytes = keyChainService.getCertificate(alias);
+ final byte[] certificateBytes;
+ final byte[] certChainBytes;
+ try (KeyChainConnection keyChainConnection = bind(context.getApplicationContext())) {
+ IKeyChainService keyChainService = keyChainConnection.getService();
+ certificateBytes = keyChainService.getCertificate(alias);
if (certificateBytes == null) {
return null;
}
+ certChainBytes = keyChainService.getCaCertificates(alias);
+ } catch (RemoteException e) {
+ throw new KeyChainException(e);
+ } catch (RuntimeException e) {
+ // only certain RuntimeExceptions can be propagated across the IKeyChainService call
+ throw new KeyChainException(e);
+ }
+
+ try {
X509Certificate leafCert = toCertificate(certificateBytes);
- final byte[] certChainBytes = keyChainService.getCaCertificates(alias);
// If the keypair is installed with a certificate chain by either
// DevicePolicyManager.installKeyPair or CertInstaller, return that chain.
if (certChainBytes != null && certChainBytes.length != 0) {
@@ -445,15 +497,8 @@
List<X509Certificate> chain = store.getCertificateChain(leafCert);
return chain.toArray(new X509Certificate[chain.size()]);
}
- } catch (CertificateException e) {
+ } catch (CertificateException | RuntimeException e) {
throw new KeyChainException(e);
- } catch (RemoteException e) {
- throw new KeyChainException(e);
- } catch (RuntimeException e) {
- // only certain RuntimeExceptions can be propagated across the IKeyChainService call
- throw new KeyChainException(e);
- } finally {
- keyChainConnection.close();
}
}
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
index 8c20ddc..f36c00c 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -228,7 +228,7 @@
if (exportResult.resultCode != KeyStore.NO_ERROR) {
throw (UnrecoverableKeyException)
new UnrecoverableKeyException("Failed to obtain X.509 form of public key")
- .initCause(KeyStore.getKeyStoreException(errorCode));
+ .initCause(KeyStore.getKeyStoreException(exportResult.resultCode));
}
final byte[] x509EncodedPublicKey = exportResult.exportData;
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 4e0504f..bf2648a 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -804,8 +804,14 @@
if (off < (mStringPoolSize-1)) {
const uint8_t* strings = (uint8_t*)mStrings;
const uint8_t* str = strings+off;
- *outLen = decodeLength(&str);
- size_t encLen = decodeLength(&str);
+
+ // Decode the UTF-16 length. This is not used if we're not
+ // converting to UTF-16 from UTF-8.
+ decodeLength(&str);
+
+ const size_t encLen = decodeLength(&str);
+ *outLen = encLen;
+
if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {
return (const char*)str;
} else {
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 12e46cd..513e376 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -2,8 +2,6 @@
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-HWUI_NEW_OPS := true
-
# Enables fine-grained GLES error checking
# If set to true, every GLES call is wrapped & error checked
# Has moderate overhead
@@ -26,6 +24,7 @@
renderstate/Stencil.cpp \
renderstate/TextureState.cpp \
renderthread/CanvasContext.cpp \
+ renderthread/OpenGLPipeline.cpp \
renderthread/DrawFrameTask.cpp \
renderthread/EglManager.cpp \
renderthread/RenderProxy.cpp \
@@ -45,19 +44,21 @@
Animator.cpp \
AnimatorManager.cpp \
AssetAtlas.cpp \
+ BakedOpDispatcher.cpp \
+ BakedOpRenderer.cpp \
+ BakedOpState.cpp \
Caches.cpp \
CanvasState.cpp \
ClipArea.cpp \
DamageAccumulator.cpp \
- DeferredDisplayList.cpp \
DeferredLayerUpdater.cpp \
DeviceInfo.cpp \
DisplayList.cpp \
- DisplayListCanvas.cpp \
Dither.cpp \
Extensions.cpp \
FboCache.cpp \
FontRenderer.cpp \
+ FrameBuilder.cpp \
FrameInfo.cpp \
FrameInfoVisualizer.cpp \
GammaFontRenderer.cpp \
@@ -68,23 +69,23 @@
Interpolator.cpp \
JankTracker.cpp \
Layer.cpp \
- LayerCache.cpp \
- LayerRenderer.cpp \
+ LayerBuilder.cpp \
LayerUpdateQueue.cpp \
Matrix.cpp \
- OpenGLRenderer.cpp \
+ OpDumper.cpp \
Patch.cpp \
PatchCache.cpp \
PathCache.cpp \
- PathTessellator.cpp \
PathParser.cpp \
+ PathTessellator.cpp \
PixelBuffer.cpp \
Program.cpp \
ProgramCache.cpp \
Properties.cpp \
- PropertyValuesHolder.cpp \
PropertyValuesAnimatorSet.cpp \
+ PropertyValuesHolder.cpp \
Readback.cpp \
+ RecordingCanvas.cpp \
RenderBufferCache.cpp \
RenderNode.cpp \
RenderProperties.cpp \
@@ -123,23 +124,16 @@
-DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\" \
-Wall -Wno-unused-parameter -Wunreachable-code -Werror
+ifeq ($(TARGET_USES_HWC2),true)
+ hwui_cflags += -DUSE_HWC2
+endif
+
# GCC false-positives on this warning, and since we -Werror that's
# a problem
hwui_cflags += -Wno-free-nonheap-object
-ifeq (true, $(HWUI_NEW_OPS))
- hwui_src_files += \
- BakedOpDispatcher.cpp \
- BakedOpRenderer.cpp \
- BakedOpState.cpp \
- FrameBuilder.cpp \
- LayerBuilder.cpp \
- OpDumper.cpp \
- RecordingCanvas.cpp
-
- hwui_cflags += -DHWUI_NEW_OPS
-
-endif
+# clang's warning is broken, see: https://llvm.org/bugs/show_bug.cgi?id=21629
+hwui_cflags += -Wno-missing-braces
ifndef HWUI_COMPILE_SYMBOLS
hwui_cflags += -fvisibility=hidden
@@ -252,40 +246,37 @@
LOCAL_SRC_FILES += \
$(hwui_test_common_src_files) \
tests/unit/main.cpp \
+ tests/unit/BakedOpDispatcherTests.cpp \
+ tests/unit/BakedOpRendererTests.cpp \
+ tests/unit/BakedOpStateTests.cpp \
tests/unit/CanvasStateTests.cpp \
tests/unit/ClipAreaTests.cpp \
tests/unit/DamageAccumulatorTests.cpp \
+ tests/unit/DeferredLayerUpdaterTests.cpp \
tests/unit/DeviceInfoTests.cpp \
tests/unit/FatVectorTests.cpp \
tests/unit/FontRendererTests.cpp \
+ tests/unit/FrameBuilderTests.cpp \
tests/unit/GlopBuilderTests.cpp \
tests/unit/GpuMemoryTrackerTests.cpp \
tests/unit/GradientCacheTests.cpp \
tests/unit/LayerUpdateQueueTests.cpp \
+ tests/unit/LeakCheckTests.cpp \
tests/unit/LinearAllocatorTests.cpp \
tests/unit/MatrixTests.cpp \
tests/unit/MeshStateTests.cpp \
tests/unit/OffscreenBufferPoolTests.cpp \
+ tests/unit/OpDumperTests.cpp \
+ tests/unit/RecordingCanvasTests.cpp \
tests/unit/RenderNodeTests.cpp \
tests/unit/RenderPropertiesTests.cpp \
tests/unit/SkiaBehaviorTests.cpp \
+ tests/unit/SkiaCanvasTests.cpp \
tests/unit/SnapshotTests.cpp \
tests/unit/StringUtilsTests.cpp \
tests/unit/TestUtilsTests.cpp \
tests/unit/TextDropShadowCacheTests.cpp \
- tests/unit/VectorDrawableTests.cpp
-
-ifeq (true, $(HWUI_NEW_OPS))
- LOCAL_SRC_FILES += \
- tests/unit/BakedOpDispatcherTests.cpp \
- tests/unit/BakedOpRendererTests.cpp \
- tests/unit/BakedOpStateTests.cpp \
- tests/unit/FrameBuilderTests.cpp \
- tests/unit/LeakCheckTests.cpp \
- tests/unit/OpDumperTests.cpp \
- tests/unit/RecordingCanvasTests.cpp \
- tests/unit/SkiaCanvasTests.cpp
-endif
+ tests/unit/VectorDrawableTests.cpp \
include $(LOCAL_PATH)/hwui_static_deps.mk
include $(BUILD_NATIVE_TEST)
@@ -297,12 +288,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp
-LOCAL_MODULE:= hwuitest
+LOCAL_MODULE:= hwuimacro
LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := hwuitest
-LOCAL_MODULE_STEM_64 := hwuitest64
LOCAL_CFLAGS := $(hwui_cflags)
LOCAL_C_INCLUDES := $(hwui_c_includes)
@@ -316,7 +304,7 @@
tests/macrobench/main.cpp
include $(LOCAL_PATH)/hwui_static_deps.mk
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_BENCHMARK)
# ------------------------
# Micro-bench app
@@ -340,15 +328,12 @@
tests/microbench/main.cpp \
tests/microbench/DisplayListCanvasBench.cpp \
tests/microbench/FontBench.cpp \
+ tests/microbench/FrameBuilderBench.cpp \
tests/microbench/LinearAllocatorBench.cpp \
tests/microbench/PathParserBench.cpp \
tests/microbench/ShadowBench.cpp \
tests/microbench/TaskManagerBench.cpp
-ifeq (true, $(HWUI_NEW_OPS))
- LOCAL_SRC_FILES += \
- tests/microbench/FrameBuilderBench.cpp
-endif
include $(LOCAL_PATH)/hwui_static_deps.mk
include $(BUILD_NATIVE_BENCHMARK)
diff --git a/libs/hwui/AnimationContext.h b/libs/hwui/AnimationContext.h
index 801fd87..97b53b0 100644
--- a/libs/hwui/AnimationContext.h
+++ b/libs/hwui/AnimationContext.h
@@ -57,7 +57,7 @@
private:
friend class AnimationContext;
- AnimationHandle(AnimationContext& context);
+ explicit AnimationHandle(AnimationContext& context);
AnimationHandle(RenderNode& animatingNode, AnimationContext& context);
~AnimationHandle();
@@ -75,7 +75,7 @@
class AnimationContext {
PREVENT_COPY_AND_ASSIGN(AnimationContext);
public:
- ANDROID_API AnimationContext(renderthread::TimeLord& clock);
+ ANDROID_API explicit AnimationContext(renderthread::TimeLord& clock);
ANDROID_API virtual ~AnimationContext();
nsecs_t frameTimeMs() { return mFrameTimeMs; }
diff --git a/libs/hwui/AnimatorManager.h b/libs/hwui/AnimatorManager.h
index 61f6179..8e6f820 100644
--- a/libs/hwui/AnimatorManager.h
+++ b/libs/hwui/AnimatorManager.h
@@ -35,7 +35,7 @@
class AnimatorManager {
PREVENT_COPY_AND_ASSIGN(AnimatorManager);
public:
- AnimatorManager(RenderNode& parent);
+ explicit AnimatorManager(RenderNode& parent);
~AnimatorManager();
void addAnimator(const sp<BaseRenderNodeAnimator>& animator);
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index f2d344f..fe3d859 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -17,7 +17,7 @@
#include "Caches.h"
#include "GammaFontRenderer.h"
-#include "LayerRenderer.h"
+#include "Layer.h"
#include "Properties.h"
#include "renderstate/RenderState.h"
#include "ShadowTessellator.h"
@@ -163,17 +163,15 @@
log.appendFormat("Current memory usage / total memory usage (bytes):\n");
log.appendFormat(" TextureCache %8d / %8d\n",
textureCache.getSize(), textureCache.getMaxSize());
- log.appendFormat(" LayerCache %8d / %8d (numLayers = %zu)\n",
- layerCache.getSize(), layerCache.getMaxSize(), layerCache.getCount());
if (mRenderState) {
int memused = 0;
for (std::set<Layer*>::iterator it = mRenderState->mActiveLayers.begin();
it != mRenderState->mActiveLayers.end(); it++) {
const Layer* layer = *it;
- log.appendFormat(" Layer size %dx%d; isTextureLayer()=%d; texid=%u fbo=%u; refs=%d\n",
+ log.appendFormat(" Layer size %dx%d; texid=%u refs=%d\n",
layer->getWidth(), layer->getHeight(),
- layer->isTextureLayer(), layer->getTextureId(),
- layer->getFbo(), layer->getStrongCount());
+ layer->getTextureId(),
+ layer->getStrongCount());
memused += layer->getWidth() * layer->getHeight() * 4;
}
log.appendFormat(" Layers total %8d (numLayers = %zu)\n",
@@ -248,7 +246,6 @@
tessellationCache.clear();
// fall through
case FlushMode::Layers:
- layerCache.clear();
renderBufferCache.clear();
break;
}
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h
index eac9359..344ee71 100644
--- a/libs/hwui/Caches.h
+++ b/libs/hwui/Caches.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_CACHES_H
-#define ANDROID_HWUI_CACHES_H
+#pragma once
#include "AssetAtlas.h"
#include "Dither.h"
@@ -23,7 +22,6 @@
#include "FboCache.h"
#include "GammaFontRenderer.h"
#include "GradientCache.h"
-#include "LayerCache.h"
#include "PatchCache.h"
#include "ProgramCache.h"
#include "PathCache.h"
@@ -77,7 +75,7 @@
return sInstance != nullptr;
}
private:
- Caches(RenderState& renderState);
+ explicit Caches(RenderState& renderState);
static Caches* sInstance;
public:
@@ -146,7 +144,6 @@
Extensions mExtensions;
public:
TextureCache textureCache;
- LayerCache layerCache;
RenderBufferCache renderBufferCache;
GradientCache gradientCache;
PatchCache patchCache;
@@ -205,5 +202,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_CACHES_H
diff --git a/libs/hwui/CanvasProperty.h b/libs/hwui/CanvasProperty.h
index 6074394..56671bb 100644
--- a/libs/hwui/CanvasProperty.h
+++ b/libs/hwui/CanvasProperty.h
@@ -28,7 +28,7 @@
class CanvasPropertyPrimitive : public VirtualLightRefBase {
PREVENT_COPY_AND_ASSIGN(CanvasPropertyPrimitive);
public:
- CanvasPropertyPrimitive(float initialValue) : value(initialValue) {}
+ explicit CanvasPropertyPrimitive(float initialValue) : value(initialValue) {}
float value;
};
@@ -36,7 +36,7 @@
class CanvasPropertyPaint : public VirtualLightRefBase {
PREVENT_COPY_AND_ASSIGN(CanvasPropertyPaint);
public:
- CanvasPropertyPaint(const SkPaint& initialValue) : value(initialValue) {}
+ explicit CanvasPropertyPaint(const SkPaint& initialValue) : value(initialValue) {}
SkPaint value;
};
diff --git a/libs/hwui/CanvasState.cpp b/libs/hwui/CanvasState.cpp
index e2149d1..7e2c28c 100644
--- a/libs/hwui/CanvasState.cpp
+++ b/libs/hwui/CanvasState.cpp
@@ -23,8 +23,7 @@
CanvasState::CanvasState(CanvasStateClient& renderer)
- : mDirtyClip(false)
- , mWidth(-1)
+ : mWidth(-1)
, mHeight(-1)
, mSaveCount(1)
, mCanvas(renderer)
@@ -205,19 +204,16 @@
bool CanvasState::clipRect(float left, float top, float right, float bottom, SkRegion::Op op) {
mSnapshot->clip(Rect(left, top, right, bottom), op);
- mDirtyClip = true;
return !mSnapshot->clipIsEmpty();
}
bool CanvasState::clipPath(const SkPath* path, SkRegion::Op op) {
mSnapshot->clipPath(*path, op);
- mDirtyClip = true;
return !mSnapshot->clipIsEmpty();
}
bool CanvasState::clipRegion(const SkRegion* region, SkRegion::Op op) {
mSnapshot->clipRegionTransformed(*region, op);
- mDirtyClip = true;
return !mSnapshot->clipIsEmpty();
}
@@ -236,15 +232,6 @@
}
}
-void CanvasState::setClippingRoundRect(LinearAllocator& allocator,
- const Rect& rect, float radius, bool highPriority) {
- mSnapshot->setClippingRoundRect(allocator, rect, radius, highPriority);
-}
-
-void CanvasState::setProjectionPathMask(LinearAllocator& allocator, const SkPath* path) {
- mSnapshot->setProjectionPathMask(allocator, path);
-}
-
///////////////////////////////////////////////////////////////////////////////
// Quick Rejection
///////////////////////////////////////////////////////////////////////////////
@@ -263,7 +250,7 @@
float right, float bottom,
bool* clipRequired, bool* roundRectClipRequired,
bool snapOut) const {
- if (mSnapshot->isIgnored() || bottom <= top || right <= left) {
+ if (bottom <= top || right <= left) {
return true;
}
@@ -291,7 +278,7 @@
bool CanvasState::quickRejectConservative(float left, float top,
float right, float bottom) const {
- if (mSnapshot->isIgnored() || bottom <= top || right <= left) {
+ if (bottom <= top || right <= left) {
return true;
}
diff --git a/libs/hwui/CanvasState.h b/libs/hwui/CanvasState.h
index b9e87ae..22c7e8a 100644
--- a/libs/hwui/CanvasState.h
+++ b/libs/hwui/CanvasState.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_CANVAS_STATE_H
-#define ANDROID_HWUI_CANVAS_STATE_H
+#pragma once
#include "Snapshot.h"
@@ -62,18 +61,18 @@
* Renderer interface. Drawing and recording classes that include a CanvasState will have
* different use cases:
*
- * Drawing code maintaining canvas state (i.e. OpenGLRenderer) can query attributes (such as
+ * Drawing code maintaining canvas state (e.g. FrameBuilder) can query attributes (such as
* transform) or hook into changes (e.g. save/restore) with minimal surface area for manipulating
* the stack itself.
*
- * Recording code maintaining canvas state (i.e. DisplayListCanvas) can both record and pass
+ * Recording code maintaining canvas state (e.g. RecordingCanvas) can both record and pass
* through state operations to CanvasState, so that not only will querying operations work
* (getClip/Matrix), but so that quickRejection can also be used.
*/
class CanvasState {
public:
- CanvasState(CanvasStateClient& renderer);
+ explicit CanvasState(CanvasStateClient& renderer);
~CanvasState();
/**
@@ -134,8 +133,12 @@
*/
void setClippingOutline(LinearAllocator& allocator, const Outline* outline);
void setClippingRoundRect(LinearAllocator& allocator,
- const Rect& rect, float radius, bool highPriority = true);
- void setProjectionPathMask(LinearAllocator& allocator, const SkPath* path);
+ const Rect& rect, float radius, bool highPriority = true) {
+ mSnapshot->setClippingRoundRect(allocator, rect, radius, highPriority);
+ }
+ void setProjectionPathMask(const SkPath* path) {
+ mSnapshot->setProjectionPathMask(path);
+ }
/**
* Returns true if drawing in the rectangle (left, top, right, bottom)
@@ -145,19 +148,12 @@
bool calculateQuickRejectForScissor(float left, float top, float right, float bottom,
bool* clipRequired, bool* roundRectClipRequired, bool snapOut) const;
- void setDirtyClip(bool opaque) { mDirtyClip = opaque; }
- bool getDirtyClip() const { return mDirtyClip; }
-
void scaleAlpha(float alpha) { mSnapshot->alpha *= alpha; }
- void setEmpty(bool value) { mSnapshot->empty = value; }
- void setInvisible(bool value) { mSnapshot->invisible = value; }
inline const mat4* currentTransform() const { return currentSnapshot()->transform; }
inline const Rect& currentRenderTargetClip() const { return currentSnapshot()->getRenderTargetClip(); }
- inline Region* currentRegion() const { return currentSnapshot()->region; }
inline int currentFlags() const { return currentSnapshot()->flags; }
const Vector3& currentLightCenter() const { return currentSnapshot()->getRelativeLightCenter(); }
- inline bool currentlyIgnored() const { return currentSnapshot()->isIgnored(); }
int getViewportWidth() const { return currentSnapshot()->getViewportWidth(); }
int getViewportHeight() const { return currentSnapshot()->getViewportHeight(); }
int getWidth() const { return mWidth; }
@@ -173,10 +169,6 @@
void freeSnapshot(Snapshot* snapshot);
void freeAllSnapshots();
- /// indicates that the clip has been changed since the last time it was consumed
- // TODO: delete when switching to HWUI_NEW_OPS
- bool mDirtyClip;
-
/// Dimensions of the drawing surface
int mWidth, mHeight;
@@ -201,5 +193,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_CANVAS_STATE_H
diff --git a/libs/hwui/ClipArea.cpp b/libs/hwui/ClipArea.cpp
index fe68239..84451ba 100644
--- a/libs/hwui/ClipArea.cpp
+++ b/libs/hwui/ClipArea.cpp
@@ -464,10 +464,7 @@
}
case ClipMode::Region:
other = getRegion(recordedClip);
-
- // TODO: handle non-translate transforms properly!
- other.translate(recordedClipTransform.getTranslateX(),
- recordedClipTransform.getTranslateY());
+ applyTransformToRegion(recordedClipTransform, &other);
}
ClipRegion* regionClip = allocator.create<ClipRegion>();
@@ -527,11 +524,29 @@
}
} else {
SkRegion region(getRegion(clip));
- // TODO: handle non-translate transforms properly!
- region.translate(transform.getTranslateX(), transform.getTranslateY());
+ applyTransformToRegion(transform, ®ion);
clipRegion(region, SkRegion::kIntersect_Op);
}
}
+void ClipArea::applyTransformToRegion(const Matrix4& transform, SkRegion* region) {
+ if (transform.rectToRect() && !transform.isPureTranslate()) {
+ // handle matrices with scale manually by mapping each rect
+ SkRegion other;
+ SkRegion::Iterator it(*region);
+ while (!it.done()) {
+ Rect rect(it.rect());
+ transform.mapRect(rect);
+ rect.snapGeometryToPixelBoundaries(true);
+ other.op(rect.left, rect.top, rect.right, rect.bottom, SkRegion::kUnion_Op);
+ it.next();
+ }
+ region->swap(other);
+ } else {
+ // TODO: handle non-translate transforms properly!
+ region->translate(transform.getTranslateX(), transform.getTranslateY());
+ }
+}
+
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/hwui/ClipArea.h b/libs/hwui/ClipArea.h
index 6eb2eef..53d9d03 100644
--- a/libs/hwui/ClipArea.h
+++ b/libs/hwui/ClipArea.h
@@ -179,6 +179,8 @@
const ClipBase* recordedClip, const Matrix4& recordedClipTransform);
void applyClip(const ClipBase* recordedClip, const Matrix4& recordedClipTransform);
+ static void applyTransformToRegion(const Matrix4& transform, SkRegion* region);
+
private:
void enterRectangleMode();
void rectangleModeClipRectWithTransform(const Rect& r, const mat4* transform, SkRegion::Op op);
diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp
deleted file mode 100644
index 689179d..0000000
--- a/libs/hwui/DeferredDisplayList.cpp
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <utils/Trace.h>
-#include <ui/Rect.h>
-#include <ui/Region.h>
-
-#include "Caches.h"
-#include "Debug.h"
-#include "DeferredDisplayList.h"
-#include "DisplayListOp.h"
-#include "OpenGLRenderer.h"
-#include "Properties.h"
-#include "utils/MathUtils.h"
-
-#if DEBUG_DEFER
- #define DEFER_LOGD(...) ALOGD(__VA_ARGS__)
-#else
- #define DEFER_LOGD(...)
-#endif
-
-namespace android {
-namespace uirenderer {
-
-// Depth of the save stack at the beginning of batch playback at flush time
-#define FLUSH_SAVE_STACK_DEPTH 2
-
-#define DEBUG_COLOR_BARRIER 0x1f000000
-#define DEBUG_COLOR_MERGEDBATCH 0x5f7f7fff
-#define DEBUG_COLOR_MERGEDBATCH_SOLO 0x5f7fff7f
-
-static bool avoidOverdraw() {
- // Don't avoid overdraw when visualizing it, since that makes it harder to
- // debug where it's coming from, and when the problem occurs.
- return !Properties::debugOverdraw;
-};
-
-/////////////////////////////////////////////////////////////////////////////////
-// Operation Batches
-/////////////////////////////////////////////////////////////////////////////////
-
-class Batch {
-public:
- virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) = 0;
- virtual ~Batch() {}
- virtual bool purelyDrawBatch() { return false; }
- virtual bool coversBounds(const Rect& bounds) { return false; }
-};
-
-class DrawBatch : public Batch {
-public:
- explicit DrawBatch(const DeferInfo& deferInfo) : mAllOpsOpaque(true),
- mBatchId(deferInfo.batchId), mMergeId(deferInfo.mergeId) {
- mOps.clear();
- }
-
- virtual ~DrawBatch() { mOps.clear(); }
-
- virtual void add(DrawOp* op, const DeferredDisplayState* state, bool opaqueOverBounds) {
- // NOTE: ignore empty bounds special case, since we don't merge across those ops
- mBounds.unionWith(state->mBounds);
- mAllOpsOpaque &= opaqueOverBounds;
- mOps.push_back(OpStatePair(op, state));
- }
-
- bool intersects(const Rect& rect) {
- if (!rect.intersects(mBounds)) return false;
-
- for (unsigned int i = 0; i < mOps.size(); i++) {
- if (rect.intersects(mOps[i].state->mBounds)) {
-#if DEBUG_DEFER
- DEFER_LOGD("op intersects with op %p with bounds %f %f %f %f:", mOps[i].op,
- mOps[i].state->mBounds.left, mOps[i].state->mBounds.top,
- mOps[i].state->mBounds.right, mOps[i].state->mBounds.bottom);
- mOps[i].op->output(2);
-#endif
- return true;
- }
- }
- return false;
- }
-
- virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) override {
- DEFER_LOGD("%d replaying DrawBatch %p, with %d ops (batch id %x, merge id %p)",
- index, this, mOps.size(), getBatchId(), getMergeId());
-
- for (unsigned int i = 0; i < mOps.size(); i++) {
- DrawOp* op = mOps[i].op;
- const DeferredDisplayState* state = mOps[i].state;
- renderer.restoreDisplayState(*state);
-
-#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS
- renderer.eventMark(op->name());
-#endif
- op->applyDraw(renderer, dirty);
-
-#if DEBUG_MERGE_BEHAVIOR
- const Rect& bounds = state->mBounds;
- int batchColor = 0x1f000000;
- if (getBatchId() & 0x1) batchColor |= 0x0000ff;
- if (getBatchId() & 0x2) batchColor |= 0x00ff00;
- if (getBatchId() & 0x4) batchColor |= 0xff0000;
- renderer.drawScreenSpaceColorRect(bounds.left, bounds.top, bounds.right, bounds.bottom,
- batchColor);
-#endif
- }
- }
-
- virtual bool purelyDrawBatch() override { return true; }
-
- virtual bool coversBounds(const Rect& bounds) override {
- if (CC_LIKELY(!mAllOpsOpaque || !mBounds.contains(bounds) || count() == 1)) return false;
-
- Region uncovered(android::Rect(bounds.left, bounds.top, bounds.right, bounds.bottom));
- for (unsigned int i = 0; i < mOps.size(); i++) {
- const Rect &r = mOps[i].state->mBounds;
- uncovered.subtractSelf(android::Rect(r.left, r.top, r.right, r.bottom));
- }
- return uncovered.isEmpty();
- }
-
- inline int getBatchId() const { return mBatchId; }
- inline mergeid_t getMergeId() const { return mMergeId; }
- inline int count() const { return mOps.size(); }
-
-protected:
- std::vector<OpStatePair> mOps;
- Rect mBounds; // union of bounds of contained ops
-private:
- bool mAllOpsOpaque;
- int mBatchId;
- mergeid_t mMergeId;
-};
-
-class MergingDrawBatch : public DrawBatch {
-public:
- MergingDrawBatch(DeferInfo& deferInfo, int width, int height) :
- DrawBatch(deferInfo), mClipRect(width, height),
- mClipSideFlags(kClipSide_None) {}
-
- /*
- * Helper for determining if a new op can merge with a MergingDrawBatch based on their bounds
- * and clip side flags. Positive bounds delta means new bounds fit in old.
- */
- static inline bool checkSide(const int currentFlags, const int newFlags, const int side,
- float boundsDelta) {
- bool currentClipExists = currentFlags & side;
- bool newClipExists = newFlags & side;
-
- // if current is clipped, we must be able to fit new bounds in current
- if (boundsDelta > 0 && currentClipExists) return false;
-
- // if new is clipped, we must be able to fit current bounds in new
- if (boundsDelta < 0 && newClipExists) return false;
-
- return true;
- }
-
- /*
- * Checks if a (mergeable) op can be merged into this batch
- *
- * If true, the op's multiDraw must be guaranteed to handle both ops simultaneously, so it is
- * important to consider all paint attributes used in the draw calls in deciding both a) if an
- * op tries to merge at all, and b) if the op can merge with another set of ops
- *
- * False positives can lead to information from the paints of subsequent merged operations being
- * dropped, so we make simplifying qualifications on the ops that can merge, per op type.
- */
- bool canMergeWith(const DrawOp* op, const DeferredDisplayState* state) {
- bool isTextBatch = getBatchId() == DeferredDisplayList::kOpBatch_Text ||
- getBatchId() == DeferredDisplayList::kOpBatch_ColorText;
-
- // Overlapping other operations is only allowed for text without shadow. For other ops,
- // multiDraw isn't guaranteed to overdraw correctly
- if (!isTextBatch || op->hasTextShadow()) {
- if (intersects(state->mBounds)) return false;
- }
- const DeferredDisplayState* lhs = state;
- const DeferredDisplayState* rhs = mOps[0].state;
-
- if (!MathUtils::areEqual(lhs->mAlpha, rhs->mAlpha)) return false;
-
- // Identical round rect clip state means both ops will clip in the same way, or not at all.
- // As the state objects are const, we can compare their pointers to determine mergeability
- if (lhs->mRoundRectClipState != rhs->mRoundRectClipState) return false;
- if (lhs->mProjectionPathMask != rhs->mProjectionPathMask) return false;
-
- /* Clipping compatibility check
- *
- * Exploits the fact that if a op or batch is clipped on a side, its bounds will equal its
- * clip for that side.
- */
- const int currentFlags = mClipSideFlags;
- const int newFlags = state->mClipSideFlags;
- if (currentFlags != kClipSide_None || newFlags != kClipSide_None) {
- const Rect& opBounds = state->mBounds;
- float boundsDelta = mBounds.left - opBounds.left;
- if (!checkSide(currentFlags, newFlags, kClipSide_Left, boundsDelta)) return false;
- boundsDelta = mBounds.top - opBounds.top;
- if (!checkSide(currentFlags, newFlags, kClipSide_Top, boundsDelta)) return false;
-
- // right and bottom delta calculation reversed to account for direction
- boundsDelta = opBounds.right - mBounds.right;
- if (!checkSide(currentFlags, newFlags, kClipSide_Right, boundsDelta)) return false;
- boundsDelta = opBounds.bottom - mBounds.bottom;
- if (!checkSide(currentFlags, newFlags, kClipSide_Bottom, boundsDelta)) return false;
- }
-
- // if paints are equal, then modifiers + paint attribs don't need to be compared
- if (op->mPaint == mOps[0].op->mPaint) return true;
-
- if (PaintUtils::getAlphaDirect(op->mPaint)
- != PaintUtils::getAlphaDirect(mOps[0].op->mPaint)) {
- return false;
- }
-
- if (op->mPaint && mOps[0].op->mPaint &&
- op->mPaint->getColorFilter() != mOps[0].op->mPaint->getColorFilter()) {
- return false;
- }
-
- if (op->mPaint && mOps[0].op->mPaint &&
- op->mPaint->getShader() != mOps[0].op->mPaint->getShader()) {
- return false;
- }
-
- return true;
- }
-
- virtual void add(DrawOp* op, const DeferredDisplayState* state,
- bool opaqueOverBounds) override {
- DrawBatch::add(op, state, opaqueOverBounds);
-
- const int newClipSideFlags = state->mClipSideFlags;
- mClipSideFlags |= newClipSideFlags;
- if (newClipSideFlags & kClipSide_Left) mClipRect.left = state->mClip.left;
- if (newClipSideFlags & kClipSide_Top) mClipRect.top = state->mClip.top;
- if (newClipSideFlags & kClipSide_Right) mClipRect.right = state->mClip.right;
- if (newClipSideFlags & kClipSide_Bottom) mClipRect.bottom = state->mClip.bottom;
- }
-
- virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) override {
- DEFER_LOGD("%d replaying MergingDrawBatch %p, with %d ops,"
- " clip flags %x (batch id %x, merge id %p)",
- index, this, mOps.size(), mClipSideFlags, getBatchId(), getMergeId());
- if (mOps.size() == 1) {
- DrawBatch::replay(renderer, dirty, -1);
- return;
- }
-
- // clipping in the merged case is done ahead of time since all ops share the clip (if any)
- renderer.setupMergedMultiDraw(mClipSideFlags ? &mClipRect : nullptr);
-
- DrawOp* op = mOps[0].op;
-#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS
- renderer.eventMark("multiDraw");
- renderer.eventMark(op->name());
-#endif
- op->multiDraw(renderer, dirty, mOps, mBounds);
-
-#if DEBUG_MERGE_BEHAVIOR
- renderer.drawScreenSpaceColorRect(mBounds.left, mBounds.top, mBounds.right, mBounds.bottom,
- DEBUG_COLOR_MERGEDBATCH);
-#endif
- }
-
-private:
- /*
- * Contains the effective clip rect shared by all merged ops. Initialized to the layer viewport,
- * it will shrink if an op must be clipped on a certain side. The clipped sides are reflected in
- * mClipSideFlags.
- */
- Rect mClipRect;
- int mClipSideFlags;
-};
-
-class StateOpBatch : public Batch {
-public:
- // creates a single operation batch
- StateOpBatch(const StateOp* op, const DeferredDisplayState* state) : mOp(op), mState(state) {}
-
- virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) override {
- DEFER_LOGD("replaying state op batch %p", this);
- renderer.restoreDisplayState(*mState);
-
- // use invalid save count because it won't be used at flush time - RestoreToCountOp is the
- // only one to use it, and we don't use that class at flush time, instead calling
- // renderer.restoreToCount directly
- int saveCount = -1;
- mOp->applyState(renderer, saveCount);
- }
-
-private:
- const StateOp* mOp;
- const DeferredDisplayState* mState;
-};
-
-class RestoreToCountBatch : public Batch {
-public:
- RestoreToCountBatch(const StateOp* op, const DeferredDisplayState* state, int restoreCount) :
- mState(state), mRestoreCount(restoreCount) {}
-
- virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) override {
- DEFER_LOGD("batch %p restoring to count %d", this, mRestoreCount);
-
- renderer.restoreDisplayState(*mState);
- renderer.restoreToCount(mRestoreCount);
- }
-
-private:
- // we use the state storage for the RestoreToCountOp, but don't replay the op itself
- const DeferredDisplayState* mState;
-
- /*
- * The count used here represents the flush() time saveCount. This is as opposed to the
- * DisplayList record time, or defer() time values (which are RestoreToCountOp's mCount, and
- * (saveCount + mCount) respectively). Since the count is different from the original
- * RestoreToCountOp, we don't store a pointer to the op, as elsewhere.
- */
- const int mRestoreCount;
-};
-
-#if DEBUG_MERGE_BEHAVIOR
-class BarrierDebugBatch : public Batch {
- virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) {
- renderer.drawScreenSpaceColorRect(0, 0, 10000, 10000, DEBUG_COLOR_BARRIER);
- }
-};
-#endif
-
-/////////////////////////////////////////////////////////////////////////////////
-// DeferredDisplayList
-/////////////////////////////////////////////////////////////////////////////////
-
-void DeferredDisplayList::resetBatchingState() {
- for (int i = 0; i < kOpBatch_Count; i++) {
- mBatchLookup[i] = nullptr;
- mMergingBatches[i].clear();
- }
-#if DEBUG_MERGE_BEHAVIOR
- if (mBatches.size() != 0) {
- mBatches.add(new BarrierDebugBatch());
- }
-#endif
- mEarliestBatchIndex = mBatches.size();
-}
-
-void DeferredDisplayList::clear() {
- resetBatchingState();
- mComplexClipStackStart = -1;
-
- for (unsigned int i = 0; i < mBatches.size(); i++) {
- delete mBatches[i];
- }
- mBatches.clear();
- mSaveStack.clear();
- mEarliestBatchIndex = 0;
- mEarliestUnclearedIndex = 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-// Operation adding
-/////////////////////////////////////////////////////////////////////////////////
-
-int DeferredDisplayList::getStateOpDeferFlags() const {
- // For both clipOp and save(Layer)Op, we don't want to save drawing info, and only want to save
- // the clip if we aren't recording a complex clip (and can thus trust it to be a rect)
- return recordingComplexClip() ? 0 : kStateDeferFlag_Clip;
-}
-
-int DeferredDisplayList::getDrawOpDeferFlags() const {
- return kStateDeferFlag_Draw | getStateOpDeferFlags();
-}
-
-/**
- * When an clipping operation occurs that could cause a complex clip, record the operation and all
- * subsequent clipOps, save/restores (if the clip flag is set). During a flush, instead of loading
- * the clip from deferred state, we play back all of the relevant state operations that generated
- * the complex clip.
- *
- * Note that we don't need to record the associated restore operation, since operations at defer
- * time record whether they should store the renderer's current clip
- */
-void DeferredDisplayList::addClip(OpenGLRenderer& renderer, ClipOp* op) {
- if (recordingComplexClip() || op->canCauseComplexClip() || !renderer.hasRectToRectTransform()) {
- DEFER_LOGD("%p Received complex clip operation %p", this, op);
-
- // NOTE: defer clip op before setting mComplexClipStackStart so previous clip is recorded
- storeStateOpBarrier(renderer, op);
-
- if (!recordingComplexClip()) {
- mComplexClipStackStart = renderer.getSaveCount() - 1;
- DEFER_LOGD(" Starting complex clip region, start is %d", mComplexClipStackStart);
- }
- }
-}
-
-/**
- * For now, we record save layer operations as barriers in the batch list, preventing drawing
- * operations from reordering around the saveLayer and it's associated restore()
- *
- * In the future, we should send saveLayer commands (if they can be played out of order) and their
- * contained drawing operations to a seperate list of batches, so that they may draw at the
- * beginning of the frame. This would avoid targetting and removing an FBO in the middle of a frame.
- *
- * saveLayer operations should be pulled to the beginning of the frame if the canvas doesn't have a
- * complex clip, and if the flags (SaveFlags::Clip & SaveFlags::ClipToLayer) are set.
- */
-void DeferredDisplayList::addSaveLayer(OpenGLRenderer& renderer,
- SaveLayerOp* op, int newSaveCount) {
- DEFER_LOGD("%p adding saveLayerOp %p, flags %x, new count %d",
- this, op, op->getFlags(), newSaveCount);
-
- storeStateOpBarrier(renderer, op);
- mSaveStack.push_back(newSaveCount);
-}
-
-/**
- * Takes save op and it's return value - the new save count - and stores it into the stream as a
- * barrier if it's needed to properly modify a complex clip
- */
-void DeferredDisplayList::addSave(OpenGLRenderer& renderer, SaveOp* op, int newSaveCount) {
- int saveFlags = op->getFlags();
- DEFER_LOGD("%p adding saveOp %p, flags %x, new count %d", this, op, saveFlags, newSaveCount);
-
- if (recordingComplexClip() && (saveFlags & SaveFlags::Clip)) {
- // store and replay the save operation, as it may be needed to correctly playback the clip
- DEFER_LOGD(" adding save barrier with new save count %d", newSaveCount);
- storeStateOpBarrier(renderer, op);
- mSaveStack.push_back(newSaveCount);
- }
-}
-
-/**
- * saveLayer() commands must be associated with a restoreToCount batch that will clean up and draw
- * the layer in the deferred list
- *
- * other save() commands which occur as children of a snapshot with complex clip will be deferred,
- * and must be restored
- *
- * Either will act as a barrier to draw operation reordering, as we want to play back layer
- * save/restore and complex canvas modifications (including save/restore) in order.
- */
-void DeferredDisplayList::addRestoreToCount(OpenGLRenderer& renderer, StateOp* op,
- int newSaveCount) {
- DEFER_LOGD("%p addRestoreToCount %d", this, newSaveCount);
-
- if (recordingComplexClip() && newSaveCount <= mComplexClipStackStart) {
- mComplexClipStackStart = -1;
- resetBatchingState();
- }
-
- if (mSaveStack.empty() || newSaveCount > mSaveStack.back()) {
- return;
- }
-
- while (!mSaveStack.empty() && mSaveStack.back() >= newSaveCount) mSaveStack.pop_back();
-
- storeRestoreToCountBarrier(renderer, op, mSaveStack.size() + FLUSH_SAVE_STACK_DEPTH);
-}
-
-void DeferredDisplayList::addDrawOp(OpenGLRenderer& renderer, DrawOp* op) {
- /* 1: op calculates local bounds */
- DeferredDisplayState* const state = createState();
- if (op->getLocalBounds(state->mBounds)) {
- if (state->mBounds.isEmpty()) {
- // valid empty bounds, don't bother deferring
- tryRecycleState(state);
- return;
- }
- } else {
- state->mBounds.setEmpty();
- }
-
- /* 2: renderer calculates global bounds + stores state */
- if (renderer.storeDisplayState(*state, getDrawOpDeferFlags())) {
- tryRecycleState(state);
- return; // quick rejected
- }
-
- /* 3: ask op for defer info, given renderer state */
- DeferInfo deferInfo;
- op->onDefer(renderer, deferInfo, *state);
-
- // complex clip has a complex set of expectations on the renderer state - for now, avoid taking
- // the merge path in those cases
- deferInfo.mergeable &= !recordingComplexClip();
- deferInfo.opaqueOverBounds &= !recordingComplexClip()
- && mSaveStack.empty()
- && !state->mRoundRectClipState;
-
- if (CC_LIKELY(avoidOverdraw()) && mBatches.size() &&
- state->mClipSideFlags != kClipSide_ConservativeFull &&
- deferInfo.opaqueOverBounds && state->mBounds.contains(mBounds)) {
- // avoid overdraw by resetting drawing state + discarding drawing ops
- discardDrawingBatches(mBatches.size() - 1);
- resetBatchingState();
- }
-
- if (CC_UNLIKELY(Properties::drawReorderDisabled)) {
- // TODO: elegant way to reuse batches?
- DrawBatch* b = new DrawBatch(deferInfo);
- b->add(op, state, deferInfo.opaqueOverBounds);
- mBatches.push_back(b);
- return;
- }
-
- // find the latest batch of the new op's type, and try to merge the new op into it
- DrawBatch* targetBatch = nullptr;
-
- // insertion point of a new batch, will hopefully be immediately after similar batch
- // (eventually, should be similar shader)
- int insertBatchIndex = mBatches.size();
- if (!mBatches.empty()) {
- if (state->mBounds.isEmpty()) {
- // don't know the bounds for op, so create new batch and start from scratch on next op
- DrawBatch* b = new DrawBatch(deferInfo);
- b->add(op, state, deferInfo.opaqueOverBounds);
- mBatches.push_back(b);
- resetBatchingState();
-#if DEBUG_DEFER
- DEFER_LOGD("Warning: Encountered op with empty bounds, resetting batches");
- op->output(2);
-#endif
- return;
- }
-
- if (deferInfo.mergeable) {
- // Try to merge with any existing batch with same mergeId.
- std::unordered_map<mergeid_t, DrawBatch*>& mergingBatch
- = mMergingBatches[deferInfo.batchId];
- auto getResult = mergingBatch.find(deferInfo.mergeId);
- if (getResult != mergingBatch.end()) {
- targetBatch = getResult->second;
- if (!((MergingDrawBatch*) targetBatch)->canMergeWith(op, state)) {
- targetBatch = nullptr;
- }
- }
- } else {
- // join with similar, non-merging batch
- targetBatch = (DrawBatch*)mBatchLookup[deferInfo.batchId];
- }
-
- if (targetBatch || deferInfo.mergeable) {
- // iterate back toward target to see if anything drawn since should overlap the new op
- // if no target, merging ops still interate to find similar batch to insert after
- for (int i = mBatches.size() - 1; i >= mEarliestBatchIndex; i--) {
- DrawBatch* overBatch = (DrawBatch*)mBatches[i];
-
- if (overBatch == targetBatch) break;
-
- // TODO: also consider shader shared between batch types
- if (deferInfo.batchId == overBatch->getBatchId()) {
- insertBatchIndex = i + 1;
- if (!targetBatch) break; // found insert position, quit
- }
-
- if (overBatch->intersects(state->mBounds)) {
- // NOTE: it may be possible to optimize for special cases where two operations
- // of the same batch/paint could swap order, such as with a non-mergeable
- // (clipped) and a mergeable text operation
- targetBatch = nullptr;
-#if DEBUG_DEFER
- DEFER_LOGD("op couldn't join batch %p, was intersected by batch %d",
- targetBatch, i);
- op->output(2);
-#endif
- break;
- }
- }
- }
- }
-
- if (!targetBatch) {
- if (deferInfo.mergeable) {
- targetBatch = new MergingDrawBatch(deferInfo,
- renderer.getViewportWidth(), renderer.getViewportHeight());
- mMergingBatches[deferInfo.batchId].insert(
- std::make_pair(deferInfo.mergeId, targetBatch));
- } else {
- targetBatch = new DrawBatch(deferInfo);
- mBatchLookup[deferInfo.batchId] = targetBatch;
- }
-
- DEFER_LOGD("creating %singBatch %p, bid %x, at %d",
- deferInfo.mergeable ? "Merg" : "Draw",
- targetBatch, deferInfo.batchId, insertBatchIndex);
- mBatches.insert(mBatches.begin() + insertBatchIndex, targetBatch);
- }
-
- targetBatch->add(op, state, deferInfo.opaqueOverBounds);
-}
-
-void DeferredDisplayList::storeStateOpBarrier(OpenGLRenderer& renderer, StateOp* op) {
- DEFER_LOGD("%p adding state op barrier at pos %d", this, mBatches.size());
-
- DeferredDisplayState* state = createState();
- renderer.storeDisplayState(*state, getStateOpDeferFlags());
- mBatches.push_back(new StateOpBatch(op, state));
- resetBatchingState();
-}
-
-void DeferredDisplayList::storeRestoreToCountBarrier(OpenGLRenderer& renderer, StateOp* op,
- int newSaveCount) {
- DEFER_LOGD("%p adding restore to count %d barrier, pos %d",
- this, newSaveCount, mBatches.size());
-
- // store displayState for the restore operation, as it may be associated with a saveLayer that
- // doesn't have SaveFlags::Clip set
- DeferredDisplayState* state = createState();
- renderer.storeDisplayState(*state, getStateOpDeferFlags());
- mBatches.push_back(new RestoreToCountBatch(op, state, newSaveCount));
- resetBatchingState();
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-// Replay / flush
-/////////////////////////////////////////////////////////////////////////////////
-
-static void replayBatchList(const std::vector<Batch*>& batchList,
- OpenGLRenderer& renderer, Rect& dirty) {
-
- for (unsigned int i = 0; i < batchList.size(); i++) {
- if (batchList[i]) {
- batchList[i]->replay(renderer, dirty, i);
- }
- }
- DEFER_LOGD("--flushed, drew %d batches", batchList.size());
-}
-
-void DeferredDisplayList::flush(OpenGLRenderer& renderer, Rect& dirty) {
- ATRACE_NAME("flush drawing commands");
- Caches::getInstance().fontRenderer.endPrecaching();
-
- if (isEmpty()) return; // nothing to flush
- renderer.restoreToCount(1);
-
- DEFER_LOGD("--flushing");
- renderer.eventMark("Flush");
-
- // save and restore so that reordering doesn't affect final state
- renderer.save(SaveFlags::MatrixClip);
-
- if (CC_LIKELY(avoidOverdraw())) {
- for (unsigned int i = 1; i < mBatches.size(); i++) {
- if (mBatches[i] && mBatches[i]->coversBounds(mBounds)) {
- discardDrawingBatches(i - 1);
- }
- }
- }
- // NOTE: depth of the save stack at this point, before playback, should be reflected in
- // FLUSH_SAVE_STACK_DEPTH, so that save/restores match up correctly
- replayBatchList(mBatches, renderer, dirty);
-
- renderer.restoreToCount(1);
-
- DEFER_LOGD("--flush complete, returning %x", status);
- clear();
-}
-
-void DeferredDisplayList::discardDrawingBatches(const unsigned int maxIndex) {
- for (unsigned int i = mEarliestUnclearedIndex; i <= maxIndex; i++) {
- // leave deferred state ops alone for simplicity (empty save restore pairs may now exist)
- if (mBatches[i] && mBatches[i]->purelyDrawBatch()) {
- delete mBatches[i];
- mBatches[i] = nullptr;
- }
- }
- mEarliestUnclearedIndex = maxIndex + 1;
-}
-
-}; // namespace uirenderer
-}; // namespace android
diff --git a/libs/hwui/DeferredDisplayList.h b/libs/hwui/DeferredDisplayList.h
deleted file mode 100644
index 98ccf11..0000000
--- a/libs/hwui/DeferredDisplayList.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HWUI_DEFERRED_DISPLAY_LIST_H
-#define ANDROID_HWUI_DEFERRED_DISPLAY_LIST_H
-
-#include <unordered_map>
-
-#include <utils/Errors.h>
-#include <utils/LinearAllocator.h>
-
-#include "Matrix.h"
-#include "OpenGLRenderer.h"
-#include "Rect.h"
-
-#include <vector>
-
-class SkBitmap;
-
-namespace android {
-namespace uirenderer {
-
-class ClipOp;
-class DrawOp;
-class SaveOp;
-class SaveLayerOp;
-class StateOp;
-
-class DeferredDisplayState;
-
-class Batch;
-class DrawBatch;
-class MergingDrawBatch;
-
-typedef const void* mergeid_t;
-
-class DeferredDisplayState {
-public:
- // global op bounds, mapped by mMatrix to be in screen space coordinates, clipped
- Rect mBounds;
-
- // the below are set and used by the OpenGLRenderer at record and deferred playback
- bool mClipValid;
- Rect mClip;
- int mClipSideFlags; // specifies which sides of the bounds are clipped, unclipped if cleared
- mat4 mMatrix;
- float mAlpha;
- const RoundRectClipState* mRoundRectClipState;
- const ProjectionPathMask* mProjectionPathMask;
-};
-
-class OpStatePair {
-public:
- OpStatePair()
- : op(nullptr), state(nullptr) {}
- OpStatePair(DrawOp* newOp, const DeferredDisplayState* newState)
- : op(newOp), state(newState) {}
- OpStatePair(const OpStatePair& other)
- : op(other.op), state(other.state) {}
- DrawOp* op;
- const DeferredDisplayState* state;
-};
-
-class DeferredDisplayList {
- friend struct DeferStateStruct; // used to give access to allocator
-public:
- DeferredDisplayList(const Rect& bounds)
- : mBounds(bounds) {
- clear();
- }
- ~DeferredDisplayList() { clear(); }
-
- enum OpBatchId {
- kOpBatch_None = 0, // Don't batch
- kOpBatch_Bitmap,
- kOpBatch_Patch,
- kOpBatch_AlphaVertices,
- kOpBatch_Vertices,
- kOpBatch_AlphaMaskTexture,
- kOpBatch_Text,
- kOpBatch_ColorText,
-
- kOpBatch_Count, // Add other batch ids before this
- };
-
- bool isEmpty() { return mBatches.empty(); }
-
- /**
- * Plays back all of the draw ops recorded into batches to the renderer.
- * Adjusts the state of the renderer as necessary, and restores it when complete
- */
- void flush(OpenGLRenderer& renderer, Rect& dirty);
-
- void addClip(OpenGLRenderer& renderer, ClipOp* op);
- void addSaveLayer(OpenGLRenderer& renderer, SaveLayerOp* op, int newSaveCount);
- void addSave(OpenGLRenderer& renderer, SaveOp* op, int newSaveCount);
- void addRestoreToCount(OpenGLRenderer& renderer, StateOp* op, int newSaveCount);
-
- /**
- * Add a draw op into the DeferredDisplayList, reordering as needed (for performance) if
- * disallowReorder is false, respecting draw order when overlaps occur.
- */
- void addDrawOp(OpenGLRenderer& renderer, DrawOp* op);
-
-private:
- DeferredDisplayList(const DeferredDisplayList& other); // disallow copy
-
- DeferredDisplayState* createState() {
- return mAllocator.create_trivial<DeferredDisplayState>();
- }
-
- void tryRecycleState(DeferredDisplayState* state) {
- mAllocator.rewindIfLastAlloc(state);
- }
-
- /**
- * Resets the batching back-pointers, creating a barrier in the operation stream so that no ops
- * added in the future will be inserted into a batch that already exist.
- */
- void resetBatchingState();
-
- void clear();
-
- void storeStateOpBarrier(OpenGLRenderer& renderer, StateOp* op);
- void storeRestoreToCountBarrier(OpenGLRenderer& renderer, StateOp* op, int newSaveCount);
-
- bool recordingComplexClip() const { return mComplexClipStackStart >= 0; }
-
- int getStateOpDeferFlags() const;
- int getDrawOpDeferFlags() const;
-
- void discardDrawingBatches(const unsigned int maxIndex);
-
- // layer space bounds of rendering
- Rect mBounds;
-
- /**
- * At defer time, stores the *defer time* savecount of save/saveLayer ops that were deferred, so
- * that when an associated restoreToCount is deferred, it can be recorded as a
- * RestoreToCountBatch
- */
- std::vector<int> mSaveStack;
- int mComplexClipStackStart;
-
- std::vector<Batch*> mBatches;
-
- // Maps batch ids to the most recent *non-merging* batch of that id
- Batch* mBatchLookup[kOpBatch_Count];
-
- // Points to the index after the most recent barrier
- int mEarliestBatchIndex;
-
- // Points to the first index that may contain a pure drawing batch
- int mEarliestUnclearedIndex;
-
- /**
- * Maps the mergeid_t returned by an op's getMergeId() to the most recently seen
- * MergingDrawBatch of that id. These ids are unique per draw type and guaranteed to not
- * collide, which avoids the need to resolve mergeid collisions.
- */
- std::unordered_map<mergeid_t, DrawBatch*> mMergingBatches[kOpBatch_Count];
-
- LinearAllocator mAllocator;
-};
-
-/**
- * Struct containing information that instructs the defer
- */
-struct DeferInfo {
-public:
- DeferInfo() :
- batchId(DeferredDisplayList::kOpBatch_None),
- mergeId((mergeid_t) -1),
- mergeable(false),
- opaqueOverBounds(false) {
- };
-
- int batchId;
- mergeid_t mergeId;
- bool mergeable;
- bool opaqueOverBounds; // opaque over bounds in DeferredDisplayState - can skip ops below
-};
-
-}; // namespace uirenderer
-}; // namespace android
-
-#endif // ANDROID_HWUI_DEFERRED_DISPLAY_LIST_H
diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp
index f833a54..c42ff1a 100644
--- a/libs/hwui/DeferredLayerUpdater.cpp
+++ b/libs/hwui/DeferredLayerUpdater.cpp
@@ -15,11 +15,9 @@
*/
#include "DeferredLayerUpdater.h"
-#include "OpenGLRenderer.h"
-
-#include "LayerRenderer.h"
#include "renderthread/EglManager.h"
#include "renderthread/RenderTask.h"
+#include "utils/PaintUtils.h"
namespace android {
namespace uirenderer {
@@ -29,10 +27,9 @@
, mTransform(nullptr)
, mNeedsGLContextAttach(false)
, mUpdateTexImage(false)
- , mLayer(layer)
- , mCaches(Caches::getInstance()) {
- mWidth = mLayer->layer.getWidth();
- mHeight = mLayer->layer.getHeight();
+ , mLayer(layer) {
+ mWidth = mLayer->getWidth();
+ mHeight = mLayer->getHeight();
mBlend = mLayer->isBlend();
mColorFilter = SkSafeRef(mLayer->getColorFilter());
mAlpha = mLayer->getAlpha();
@@ -54,7 +51,6 @@
}
void DeferredLayerUpdater::apply() {
- // These properties are applied the same to both layer types
mLayer->setColorFilter(mColorFilter);
mLayer->setAlpha(mAlpha, mMode);
@@ -110,8 +106,22 @@
LOG_ALWAYS_FATAL_IF(renderTarget != GL_TEXTURE_2D && renderTarget != GL_TEXTURE_EXTERNAL_OES,
"doUpdateTexImage target %x, 2d %x, EXT %x",
renderTarget, GL_TEXTURE_2D, GL_TEXTURE_EXTERNAL_OES);
- LayerRenderer::updateTextureLayer(mLayer, mWidth, mHeight,
- !mBlend, forceFilter, renderTarget, transform);
+ updateLayer(forceFilter, renderTarget, transform);
+ }
+}
+
+void DeferredLayerUpdater::updateLayer(bool forceFilter, GLenum renderTarget,
+ const float* textureTransform) {
+ mLayer->setBlend(mBlend);
+ mLayer->setForceFilter(forceFilter);
+ mLayer->setSize(mWidth, mHeight);
+ mLayer->getTexTransform().load(textureTransform);
+
+ if (renderTarget != mLayer->getRenderTarget()) {
+ mLayer->setRenderTarget(renderTarget);
+ mLayer->bindTexture();
+ mLayer->setFilter(GL_NEAREST, false, true);
+ mLayer->setWrap(GL_CLAMP_TO_EDGE, false, true);
}
}
diff --git a/libs/hwui/DeferredLayerUpdater.h b/libs/hwui/DeferredLayerUpdater.h
index 44a24c8..2376295 100644
--- a/libs/hwui/DeferredLayerUpdater.h
+++ b/libs/hwui/DeferredLayerUpdater.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef DEFERREDLAYERUPDATE_H_
-#define DEFERREDLAYERUPDATE_H_
+
+#pragma once
#include <cutils/compiler.h>
#include <gui/GLConsumer.h>
@@ -92,6 +92,8 @@
void detachSurfaceTexture();
+ void updateLayer(bool forceFilter, GLenum renderTarget, const float* textureTransform);
+
private:
// Generic properties
int mWidth;
@@ -100,19 +102,15 @@
SkColorFilter* mColorFilter;
int mAlpha;
SkXfermode::Mode mMode;
-
sp<GLConsumer> mSurfaceTexture;
SkMatrix* mTransform;
bool mNeedsGLContextAttach;
bool mUpdateTexImage;
Layer* mLayer;
- Caches& mCaches;
void doUpdateTexImage();
};
} /* namespace uirenderer */
} /* namespace android */
-
-#endif /* DEFERREDLAYERUPDATE_H_ */
diff --git a/libs/hwui/DeviceInfo.h b/libs/hwui/DeviceInfo.h
index f576a4f..e551eb9 100644
--- a/libs/hwui/DeviceInfo.h
+++ b/libs/hwui/DeviceInfo.h
@@ -16,7 +16,6 @@
#ifndef DEVICEINFO_H
#define DEVICEINFO_H
-#include "Extensions.h"
#include "utils/Macros.h"
namespace android {
@@ -34,8 +33,6 @@
// with HWUI_NULL_GPU
static void initialize();
- const Extensions& extensions() const { return mExtensions; }
-
int maxTextureSize() const { return mMaxTextureSize; }
private:
@@ -44,7 +41,6 @@
void load();
- Extensions mExtensions;
int mMaxTextureSize;
};
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index 28be05c..ca9e2bd 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -21,13 +21,8 @@
#include "Debug.h"
#include "DisplayList.h"
-#include "RenderNode.h"
-
-#if HWUI_NEW_OPS
#include "RecordedOp.h"
-#else
-#include "DisplayListOp.h"
-#endif
+#include "RenderNode.h"
namespace android {
namespace uirenderer {
@@ -45,8 +40,7 @@
, regions(stdAllocator)
, referenceHolders(stdAllocator)
, functors(stdAllocator)
- , vectorDrawables(stdAllocator)
- , hasDrawOps(false) {
+ , vectorDrawables(stdAllocator) {
}
DisplayList::~DisplayList() {
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index ccf71c6..a8205c8 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_DISPLAY_LIST_H
-#define ANDROID_HWUI_DISPLAY_LIST_H
+#pragma once
#include <SkCamera.h>
#include <SkMatrix.h>
@@ -34,7 +33,6 @@
#include "Debug.h"
#include "CanvasProperty.h"
-#include "DeferredDisplayList.h"
#include "GlFunctorLifecycleListener.h"
#include "Matrix.h"
#include "RenderProperties.h"
@@ -49,72 +47,20 @@
namespace android {
namespace uirenderer {
-class DeferredDisplayList;
-class DisplayListOp;
-class DisplayListCanvas;
-class OpenGLRenderer;
class Rect;
class Layer;
-#if HWUI_NEW_OPS
struct RecordedOp;
struct RenderNodeOp;
typedef RecordedOp BaseOpType;
typedef RenderNodeOp NodeOpType;
-#else
-class DrawRenderNodeOp;
-
-typedef DisplayListOp BaseOpType;
-typedef DrawRenderNodeOp NodeOpType;
-#endif
namespace VectorDrawable {
class Tree;
};
typedef uirenderer::VectorDrawable::Tree VectorDrawableRoot;
-/**
- * Holds data used in the playback a tree of DisplayLists.
- */
-struct PlaybackStateStruct {
-protected:
- PlaybackStateStruct(OpenGLRenderer& renderer, int replayFlags, LinearAllocator* allocator)
- : mRenderer(renderer)
- , mReplayFlags(replayFlags)
- , mAllocator(allocator) {}
-
-public:
- OpenGLRenderer& mRenderer;
- const int mReplayFlags;
-
- // Allocator with the lifetime of a single frame. replay uses an Allocator owned by the struct,
- // while defer shares the DeferredDisplayList's Allocator
- // TODO: move this allocator to be owned by object with clear frame lifecycle
- LinearAllocator * const mAllocator;
-
- SkPath* allocPathForFrame() {
- return mRenderer.allocPathForFrame();
- }
-};
-
-struct DeferStateStruct : public PlaybackStateStruct {
- DeferStateStruct(DeferredDisplayList& deferredList, OpenGLRenderer& renderer, int replayFlags)
- : PlaybackStateStruct(renderer, replayFlags, &(deferredList.mAllocator)),
- mDeferredList(deferredList) {}
-
- DeferredDisplayList& mDeferredList;
-};
-
-struct ReplayStateStruct : public PlaybackStateStruct {
- ReplayStateStruct(OpenGLRenderer& renderer, Rect& dirty, int replayFlags)
- : PlaybackStateStruct(renderer, replayFlags, &mReplayAllocator),
- mDirty(dirty) {}
-
- Rect& mDirty;
- LinearAllocator mReplayAllocator;
-};
-
struct FunctorContainer {
Functor* functor;
GlFunctorLifecycleListener* listener;
@@ -124,7 +70,6 @@
* Data structure that holds the list of commands used in display list stream
*/
class DisplayList {
- friend class DisplayListCanvas;
friend class RecordingCanvas;
public:
struct Chunk {
@@ -138,9 +83,9 @@
// whether children with non-zero Z in the chunk should be reordered
bool reorderChildren;
-#if HWUI_NEW_OPS
+
+ // clip at the beginning of a reorder section, applied to reordered children
const ClipBase* reorderClip;
-#endif
};
DisplayList();
@@ -169,11 +114,7 @@
return allocator.usedSize();
}
bool isEmpty() {
-#if HWUI_NEW_OPS
return ops.empty();
-#else
- return !hasDrawOps;
-#endif
}
private:
@@ -203,12 +144,8 @@
// gets special treatment exclusive for webview.
LsaVector<VectorDrawableRoot*> vectorDrawables;
- bool hasDrawOps; // only used if !HWUI_NEW_OPS
-
void cleanupResources();
};
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_OPENGL_RENDERER_H
diff --git a/libs/hwui/DisplayListCanvas.cpp b/libs/hwui/DisplayListCanvas.cpp
deleted file mode 100644
index bec66295..0000000
--- a/libs/hwui/DisplayListCanvas.cpp
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "DisplayListCanvas.h"
-
-#include "DeferredDisplayList.h"
-#include "DeferredLayerUpdater.h"
-#include "DisplayListOp.h"
-#include "ResourceCache.h"
-#include "RenderNode.h"
-#include "VectorDrawable.h"
-#include "utils/PaintUtils.h"
-
-#include <SkCamera.h>
-#include <SkCanvas.h>
-
-#include <private/hwui/DrawGlInfo.h>
-
-namespace android {
-namespace uirenderer {
-
-DisplayListCanvas::DisplayListCanvas(int width, int height)
- : mState(*this)
- , mResourceCache(ResourceCache::getInstance())
- , mDisplayList(nullptr)
- , mTranslateX(0.0f)
- , mTranslateY(0.0f)
- , mHasDeferredTranslate(false)
- , mDeferredBarrierType(kBarrier_None)
- , mHighContrastText(false)
- , mRestoreSaveCount(-1) {
- resetRecording(width, height);
-}
-
-DisplayListCanvas::~DisplayListCanvas() {
- LOG_ALWAYS_FATAL_IF(mDisplayList,
- "Destroyed a DisplayListCanvas during a record!");
-}
-
-void DisplayListCanvas::resetRecording(int width, int height) {
- LOG_ALWAYS_FATAL_IF(mDisplayList,
- "prepareDirty called a second time during a recording!");
- mDisplayList = new DisplayList();
-
- mState.initializeSaveStack(width, height,
- 0, 0, width, height, Vector3());
-
- mDeferredBarrierType = kBarrier_InOrder;
- mState.setDirtyClip(false);
- mRestoreSaveCount = -1;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Operations
-///////////////////////////////////////////////////////////////////////////////
-
-DisplayList* DisplayListCanvas::finishRecording() {
- flushRestoreToCount();
- flushTranslate();
-
- mPaintMap.clear();
- mRegionMap.clear();
- mPathMap.clear();
- DisplayList* displayList = mDisplayList;
- mDisplayList = nullptr;
- mSkiaCanvasProxy.reset(nullptr);
- return displayList;
-}
-
-void DisplayListCanvas::callDrawGLFunction(Functor* functor,
- GlFunctorLifecycleListener* listener) {
- addDrawOp(new (alloc()) DrawFunctorOp(functor));
- mDisplayList->functors.push_back({functor, listener});
- mDisplayList->ref(listener);
-}
-
-SkCanvas* DisplayListCanvas::asSkCanvas() {
- LOG_ALWAYS_FATAL_IF(!mDisplayList,
- "attempting to get an SkCanvas when we are not recording!");
- if (!mSkiaCanvasProxy) {
- mSkiaCanvasProxy.reset(new SkiaCanvasProxy(this));
- }
-
- // SkCanvas instances default to identity transform, but should inherit
- // the state of this Canvas; if this code was in the SkiaCanvasProxy
- // constructor, we couldn't cache mSkiaCanvasProxy.
- SkMatrix parentTransform;
- getMatrix(&parentTransform);
- mSkiaCanvasProxy.get()->setMatrix(parentTransform);
-
- return mSkiaCanvasProxy.get();
-}
-
-int DisplayListCanvas::save(SaveFlags::Flags flags) {
- addStateOp(new (alloc()) SaveOp((int) flags));
- return mState.save((int) flags);
-}
-
-void DisplayListCanvas::restore() {
- if (mRestoreSaveCount < 0) {
- restoreToCount(getSaveCount() - 1);
- return;
- }
-
- mRestoreSaveCount--;
- flushTranslate();
- mState.restore();
-}
-
-void DisplayListCanvas::restoreToCount(int saveCount) {
- mRestoreSaveCount = saveCount;
- flushTranslate();
- mState.restoreToCount(saveCount);
-}
-
-int DisplayListCanvas::saveLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, SaveFlags::Flags flags) {
- // force matrix/clip isolation for layer
- flags |= SaveFlags::MatrixClip;
-
- paint = refPaint(paint);
- addStateOp(new (alloc()) SaveLayerOp(left, top, right, bottom, paint, (int) flags));
- return mState.save((int) flags);
-}
-
-void DisplayListCanvas::translate(float dx, float dy) {
- if (dx == 0.0f && dy == 0.0f) return;
-
- mHasDeferredTranslate = true;
- mTranslateX += dx;
- mTranslateY += dy;
- flushRestoreToCount();
- mState.translate(dx, dy, 0.0f);
-}
-
-void DisplayListCanvas::rotate(float degrees) {
- if (degrees == 0.0f) return;
-
- addStateOp(new (alloc()) RotateOp(degrees));
- mState.rotate(degrees);
-}
-
-void DisplayListCanvas::scale(float sx, float sy) {
- if (sx == 1.0f && sy == 1.0f) return;
-
- addStateOp(new (alloc()) ScaleOp(sx, sy));
- mState.scale(sx, sy);
-}
-
-void DisplayListCanvas::skew(float sx, float sy) {
- addStateOp(new (alloc()) SkewOp(sx, sy));
- mState.skew(sx, sy);
-}
-
-void DisplayListCanvas::setMatrix(const SkMatrix& matrix) {
- addStateOp(new (alloc()) SetMatrixOp(matrix));
- mState.setMatrix(matrix);
-}
-
-void DisplayListCanvas::concat(const SkMatrix& matrix) {
- addStateOp(new (alloc()) ConcatMatrixOp(matrix));
- mState.concatMatrix(matrix);
-}
-
-bool DisplayListCanvas::getClipBounds(SkRect* outRect) const {
- Rect bounds = mState.getLocalClipBounds();
- *outRect = SkRect::MakeLTRB(bounds.left, bounds.top, bounds.right, bounds.bottom);
- return !(outRect->isEmpty());
-}
-
-bool DisplayListCanvas::quickRejectRect(float left, float top, float right, float bottom) const {
- return mState.quickRejectConservative(left, top, right, bottom);
-}
-
-bool DisplayListCanvas::quickRejectPath(const SkPath& path) const {
- SkRect bounds = path.getBounds();
- return mState.quickRejectConservative(bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom);
-}
-
-
-bool DisplayListCanvas::clipRect(float left, float top, float right, float bottom,
- SkRegion::Op op) {
- addStateOp(new (alloc()) ClipRectOp(left, top, right, bottom, op));
- return mState.clipRect(left, top, right, bottom, op);
-}
-
-bool DisplayListCanvas::clipPath(const SkPath* path, SkRegion::Op op) {
- path = refPath(path);
- addStateOp(new (alloc()) ClipPathOp(path, op));
- return mState.clipPath(path, op);
-}
-
-bool DisplayListCanvas::clipRegion(const SkRegion* region, SkRegion::Op op) {
- region = refRegion(region);
- addStateOp(new (alloc()) ClipRegionOp(region, op));
- return mState.clipRegion(region, op);
-}
-
-void DisplayListCanvas::drawRenderNode(RenderNode* renderNode) {
- LOG_ALWAYS_FATAL_IF(!renderNode, "missing rendernode");
- DrawRenderNodeOp* op = new (alloc()) DrawRenderNodeOp(
- renderNode,
- *mState.currentTransform(),
- mState.clipIsSimple());
- addRenderNodeOp(op);
-}
-
-void DisplayListCanvas::drawLayer(DeferredLayerUpdater* layerHandle) {
- // We ref the DeferredLayerUpdater due to its thread-safe ref-counting
- // semantics.
- mDisplayList->ref(layerHandle);
- addDrawOp(new (alloc()) DrawLayerOp(layerHandle->backingLayer()));
-}
-
-void DisplayListCanvas::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) {
- bitmap = refBitmap(*bitmap);
- paint = refPaint(paint);
-
- addDrawOp(new (alloc()) DrawBitmapOp(bitmap, paint));
-}
-
-void DisplayListCanvas::drawBitmap(const SkBitmap& bitmap, float left, float top,
- const SkPaint* paint) {
- save(SaveFlags::Matrix);
- translate(left, top);
- drawBitmap(&bitmap, paint);
- restore();
-}
-
-void DisplayListCanvas::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,
- const SkPaint* paint) {
- if (matrix.isIdentity()) {
- drawBitmap(&bitmap, paint);
- } else if (!(matrix.getType() & ~(SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask))
- && MathUtils::isPositive(matrix.getScaleX())
- && MathUtils::isPositive(matrix.getScaleY())) {
- // SkMatrix::isScaleTranslate() not available in L
- SkRect src;
- SkRect dst;
- bitmap.getBounds(&src);
- matrix.mapRect(&dst, src);
- drawBitmap(bitmap, src.fLeft, src.fTop, src.fRight, src.fBottom,
- dst.fLeft, dst.fTop, dst.fRight, dst.fBottom, paint);
- } else {
- save(SaveFlags::Matrix);
- concat(matrix);
- drawBitmap(&bitmap, paint);
- restore();
- }
-}
-
-void DisplayListCanvas::drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,
- float srcRight, float srcBottom, float dstLeft, float dstTop,
- float dstRight, float dstBottom, const SkPaint* paint) {
- if (srcLeft == 0 && srcTop == 0
- && srcRight == bitmap.width()
- && srcBottom == bitmap.height()
- && (srcBottom - srcTop == dstBottom - dstTop)
- && (srcRight - srcLeft == dstRight - dstLeft)) {
- // transform simple rect to rect drawing case into position bitmap ops, since they merge
- save(SaveFlags::Matrix);
- translate(dstLeft, dstTop);
- drawBitmap(&bitmap, paint);
- restore();
- } else {
- paint = refPaint(paint);
-
- if (paint && paint->getShader()) {
- float scaleX = (dstRight - dstLeft) / (srcRight - srcLeft);
- float scaleY = (dstBottom - dstTop) / (srcBottom - srcTop);
- if (!MathUtils::areEqual(scaleX, 1.0f) || !MathUtils::areEqual(scaleY, 1.0f)) {
- // Apply the scale transform on the canvas, so that the shader
- // effectively calculates positions relative to src rect space
-
- save(SaveFlags::Matrix);
- translate(dstLeft, dstTop);
- scale(scaleX, scaleY);
-
- dstLeft = 0.0f;
- dstTop = 0.0f;
- dstRight = srcRight - srcLeft;
- dstBottom = srcBottom - srcTop;
-
- addDrawOp(new (alloc()) DrawBitmapRectOp(refBitmap(bitmap),
- srcLeft, srcTop, srcRight, srcBottom,
- dstLeft, dstTop, dstRight, dstBottom, paint));
- restore();
- return;
- }
- }
-
- addDrawOp(new (alloc()) DrawBitmapRectOp(refBitmap(bitmap),
- srcLeft, srcTop, srcRight, srcBottom,
- dstLeft, dstTop, dstRight, dstBottom, paint));
- }
-}
-
-void DisplayListCanvas::drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,
- const float* vertices, const int* colors, const SkPaint* paint) {
- int vertexCount = (meshWidth + 1) * (meshHeight + 1);
- vertices = refBuffer<float>(vertices, vertexCount * 2); // 2 floats per vertex
- paint = refPaint(paint);
- colors = refBuffer<int>(colors, vertexCount); // 1 color per vertex
-
- addDrawOp(new (alloc()) DrawBitmapMeshOp(refBitmap(bitmap), meshWidth, meshHeight,
- vertices, colors, paint));
-}
-
-void DisplayListCanvas::drawNinePatch(const SkBitmap& bitmap, const Res_png_9patch& patch,
- float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint) {
- const SkBitmap* bitmapPtr = refBitmap(bitmap);
- const Res_png_9patch* patchPtr = refPatch(&patch);
- paint = refPaint(paint);
-
- addDrawOp(new (alloc()) DrawPatchOp(bitmapPtr, patchPtr,
- dstLeft, dstTop, dstRight, dstBottom, paint));
-}
-
-void DisplayListCanvas::drawColor(int color, SkXfermode::Mode mode) {
- addDrawOp(new (alloc()) DrawColorOp(color, mode));
-}
-
-void DisplayListCanvas::drawPaint(const SkPaint& paint) {
- SkRect bounds;
- if (getClipBounds(&bounds)) {
- drawRect(bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, paint);
- }
-}
-
-
-void DisplayListCanvas::drawRect(float left, float top, float right, float bottom,
- const SkPaint& paint) {
- addDrawOp(new (alloc()) DrawRectOp(left, top, right, bottom, refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawRoundRect(float left, float top, float right, float bottom,
- float rx, float ry, const SkPaint& paint) {
- addDrawOp(new (alloc()) DrawRoundRectOp(left, top, right, bottom, rx, ry, refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawRoundRect(
- CanvasPropertyPrimitive* left, CanvasPropertyPrimitive* top,
- CanvasPropertyPrimitive* right, CanvasPropertyPrimitive* bottom,
- CanvasPropertyPrimitive* rx, CanvasPropertyPrimitive* ry,
- CanvasPropertyPaint* paint) {
- mDisplayList->ref(left);
- mDisplayList->ref(top);
- mDisplayList->ref(right);
- mDisplayList->ref(bottom);
- mDisplayList->ref(rx);
- mDisplayList->ref(ry);
- mDisplayList->ref(paint);
- refBitmapsInShader(paint->value.getShader());
- addDrawOp(new (alloc()) DrawRoundRectPropsOp(&left->value, &top->value,
- &right->value, &bottom->value, &rx->value, &ry->value, &paint->value));
-}
-
-void DisplayListCanvas::drawCircle(float x, float y, float radius, const SkPaint& paint) {
- addDrawOp(new (alloc()) DrawCircleOp(x, y, radius, refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y,
- CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint) {
- mDisplayList->ref(x);
- mDisplayList->ref(y);
- mDisplayList->ref(radius);
- mDisplayList->ref(paint);
- refBitmapsInShader(paint->value.getShader());
- addDrawOp(new (alloc()) DrawCirclePropsOp(&x->value, &y->value,
- &radius->value, &paint->value));
-}
-
-void DisplayListCanvas::drawOval(float left, float top, float right, float bottom,
- const SkPaint& paint) {
- addDrawOp(new (alloc()) DrawOvalOp(left, top, right, bottom, refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawArc(float left, float top, float right, float bottom,
- float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) {
- if (fabs(sweepAngle) >= 360.0f) {
- drawOval(left, top, right, bottom, paint);
- } else {
- addDrawOp(new (alloc()) DrawArcOp(left, top, right, bottom,
- startAngle, sweepAngle, useCenter, refPaint(&paint)));
- }
-}
-
-void DisplayListCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
- addDrawOp(new (alloc()) DrawPathOp(refPath(&path), refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawLines(const float* points, int count, const SkPaint& paint) {
- points = refBuffer<float>(points, count);
-
- addDrawOp(new (alloc()) DrawLinesOp(points, count, refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawPoints(const float* points, int count, const SkPaint& paint) {
- points = refBuffer<float>(points, count);
-
- addDrawOp(new (alloc()) DrawPointsOp(points, count, refPaint(&paint)));
-}
-
-void DisplayListCanvas::drawVectorDrawable(VectorDrawableRoot* tree) {
- mDisplayList->ref(tree);
- mDisplayList->vectorDrawables.push_back(tree);
- addDrawOp(new (alloc()) DrawVectorDrawableOp(tree, tree->stagingProperties()->getBounds()));
-}
-
-void DisplayListCanvas::drawGlyphsOnPath(const uint16_t* glyphs, int count,
- const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) {
- if (!glyphs || count <= 0) return;
-
- int bytesCount = 2 * count;
- DrawOp* op = new (alloc()) DrawTextOnPathOp(refBuffer<glyph_t>(glyphs, count),
- bytesCount, count, refPath(&path),
- hOffset, vOffset, refPaint(&paint));
- addDrawOp(op);
-}
-
-void DisplayListCanvas::drawGlyphs(const uint16_t* glyphs, const float* positions,
- int count, const SkPaint& paint, float x, float y,
- float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
- float totalAdvance) {
-
- if (!glyphs || count <= 0 || PaintUtils::paintWillNotDrawText(paint)) return;
-
- int bytesCount = count * 2;
- positions = refBuffer<float>(positions, count * 2);
- Rect bounds(boundsLeft, boundsTop, boundsRight, boundsBottom);
-
- DrawOp* op = new (alloc()) DrawTextOp(refBuffer<glyph_t>(glyphs, count), bytesCount, count,
- x, y, positions, refPaint(&paint), totalAdvance, bounds);
- addDrawOp(op);
- drawTextDecorations(x, y, totalAdvance, paint);
-}
-
-void DisplayListCanvas::drawRegion(const SkRegion& region, const SkPaint& paint) {
- if (paint.getStyle() != SkPaint::kFill_Style ||
- (paint.isAntiAlias() && !mState.currentTransform()->isSimple())) {
- SkRegion::Iterator it(region);
- while (!it.done()) {
- const SkIRect& r = it.rect();
- drawRect(r.fLeft, r.fTop, r.fRight, r.fBottom, paint);
- it.next();
- }
- } else {
- int count = 0;
- Vector<float> rects;
- SkRegion::Iterator it(region);
- while (!it.done()) {
- const SkIRect& r = it.rect();
- rects.push(r.fLeft);
- rects.push(r.fTop);
- rects.push(r.fRight);
- rects.push(r.fBottom);
- count += 4;
- it.next();
- }
- drawRects(rects.array(), count, &paint);
- }
-}
-
-void DisplayListCanvas::drawRects(const float* rects, int count, const SkPaint* paint) {
- if (count <= 0) return;
-
- rects = refBuffer<float>(rects, count);
- paint = refPaint(paint);
- addDrawOp(new (alloc()) DrawRectsOp(rects, count, paint));
-}
-
-void DisplayListCanvas::setDrawFilter(SkDrawFilter* filter) {
- mDrawFilter.reset(SkSafeRef(filter));
-}
-
-void DisplayListCanvas::insertReorderBarrier(bool enableReorder) {
- flushRestoreToCount();
- flushTranslate();
- mDeferredBarrierType = enableReorder ? kBarrier_OutOfOrder : kBarrier_InOrder;
-}
-
-void DisplayListCanvas::flushRestoreToCount() {
- if (mRestoreSaveCount >= 0) {
- addOpAndUpdateChunk(new (alloc()) RestoreToCountOp(mRestoreSaveCount));
- mRestoreSaveCount = -1;
- }
-}
-
-void DisplayListCanvas::flushTranslate() {
- if (mHasDeferredTranslate) {
- if (mTranslateX != 0.0f || mTranslateY != 0.0f) {
- addOpAndUpdateChunk(new (alloc()) TranslateOp(mTranslateX, mTranslateY));
- mTranslateX = mTranslateY = 0.0f;
- }
- mHasDeferredTranslate = false;
- }
-}
-
-size_t DisplayListCanvas::addOpAndUpdateChunk(DisplayListOp* op) {
- int insertIndex = mDisplayList->ops.size();
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("unsupported");
-#else
- mDisplayList->ops.push_back(op);
-#endif
- if (mDeferredBarrierType != kBarrier_None) {
- // op is first in new chunk
- mDisplayList->chunks.emplace_back();
- DisplayList::Chunk& newChunk = mDisplayList->chunks.back();
- newChunk.beginOpIndex = insertIndex;
- newChunk.endOpIndex = insertIndex + 1;
- newChunk.reorderChildren = (mDeferredBarrierType == kBarrier_OutOfOrder);
-
- int nextChildIndex = mDisplayList->children.size();
- newChunk.beginChildIndex = newChunk.endChildIndex = nextChildIndex;
- mDeferredBarrierType = kBarrier_None;
- } else {
- // standard case - append to existing chunk
- mDisplayList->chunks.back().endOpIndex = insertIndex + 1;
- }
- return insertIndex;
-}
-
-size_t DisplayListCanvas::flushAndAddOp(DisplayListOp* op) {
- flushRestoreToCount();
- flushTranslate();
- return addOpAndUpdateChunk(op);
-}
-
-size_t DisplayListCanvas::addStateOp(StateOp* op) {
- return flushAndAddOp(op);
-}
-
-size_t DisplayListCanvas::addDrawOp(DrawOp* op) {
- Rect localBounds;
- if (op->getLocalBounds(localBounds)) {
- bool rejected = quickRejectRect(localBounds.left, localBounds.top,
- localBounds.right, localBounds.bottom);
- op->setQuickRejected(rejected);
- }
-
- mDisplayList->hasDrawOps = true;
- return flushAndAddOp(op);
-}
-
-size_t DisplayListCanvas::addRenderNodeOp(DrawRenderNodeOp* op) {
- int opIndex = addDrawOp(op);
-#if !HWUI_NEW_OPS
- int childIndex = mDisplayList->addChild(op);
-
- // update the chunk's child indices
- DisplayList::Chunk& chunk = mDisplayList->chunks.back();
- chunk.endChildIndex = childIndex + 1;
-
- if (op->renderNode->stagingProperties().isProjectionReceiver()) {
- // use staging property, since recording on UI thread
- mDisplayList->projectionReceiveIndex = opIndex;
- }
-#endif
- return opIndex;
-}
-
-void DisplayListCanvas::refBitmapsInShader(const SkShader* shader) {
- if (!shader) return;
-
- // If this paint has an SkShader that has an SkBitmap add
- // it to the bitmap pile
- SkBitmap bitmap;
- SkShader::TileMode xy[2];
- if (shader->isABitmap(&bitmap, nullptr, xy)) {
- refBitmap(bitmap);
- return;
- }
- SkShader::ComposeRec rec;
- if (shader->asACompose(&rec)) {
- refBitmapsInShader(rec.fShaderA);
- refBitmapsInShader(rec.fShaderB);
- return;
- }
-}
-
-}; // namespace uirenderer
-}; // namespace android
diff --git a/libs/hwui/DisplayListCanvas.h b/libs/hwui/DisplayListCanvas.h
deleted file mode 100644
index 664f79e..0000000
--- a/libs/hwui/DisplayListCanvas.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HWUI_DISPLAY_LIST_RENDERER_H
-#define ANDROID_HWUI_DISPLAY_LIST_RENDERER_H
-
-#include "CanvasState.h"
-#include "DisplayList.h"
-#include "RenderNode.h"
-#include "ResourceCache.h"
-#include "SkiaCanvasProxy.h"
-#include "hwui/Canvas.h"
-#include "utils/Macros.h"
-
-#include <SkDrawFilter.h>
-#include <SkMatrix.h>
-#include <SkPaint.h>
-#include <SkPath.h>
-#include <SkRegion.h>
-#include <SkTLazy.h>
-#include <cutils/compiler.h>
-
-namespace android {
-namespace uirenderer {
-
-///////////////////////////////////////////////////////////////////////////////
-// Defines
-///////////////////////////////////////////////////////////////////////////////
-
-// Debug
-#if DEBUG_DISPLAY_LIST
- #define DISPLAY_LIST_LOGD(...) ALOGD(__VA_ARGS__)
-#else
- #define DISPLAY_LIST_LOGD(...)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Display list
-///////////////////////////////////////////////////////////////////////////////
-
-class DeferredDisplayList;
-class DeferredLayerUpdater;
-class DisplayListOp;
-class DrawOp;
-class DrawRenderNodeOp;
-class RenderNode;
-class StateOp;
-
-/**
- * Records drawing commands in a display list for later playback into an OpenGLRenderer.
- */
-class ANDROID_API DisplayListCanvas: public Canvas, public CanvasStateClient {
-public:
- DisplayListCanvas(int width, int height);
- virtual ~DisplayListCanvas();
-
- virtual void resetRecording(int width, int height) override;
- virtual WARN_UNUSED_RESULT DisplayList* finishRecording() override;
-
-// ----------------------------------------------------------------------------
-// HWUI Canvas state operations
-// ----------------------------------------------------------------------------
-
- virtual void insertReorderBarrier(bool enableReorder) override;
-
-// ----------------------------------------------------------------------------
-// HWUI Canvas draw operations
-// ----------------------------------------------------------------------------
-
- // Shapes
- virtual void drawRoundRect(CanvasPropertyPrimitive* left, CanvasPropertyPrimitive* top,
- CanvasPropertyPrimitive* right, CanvasPropertyPrimitive* bottom,
- CanvasPropertyPrimitive* rx, CanvasPropertyPrimitive* ry,
- CanvasPropertyPaint* paint) override;
- virtual void drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y,
- CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint) override;
-
-// ----------------------------------------------------------------------------
-// HWUI Canvas draw operations - special
-// ----------------------------------------------------------------------------
- virtual void drawLayer(DeferredLayerUpdater* layerHandle) override;
- virtual void drawRenderNode(RenderNode* renderNode) override;
- virtual void callDrawGLFunction(Functor* functor,
- GlFunctorLifecycleListener* listener) override;
-
-// ----------------------------------------------------------------------------
-// CanvasStateClient interface
-// ----------------------------------------------------------------------------
- virtual void onViewportInitialized() override { }
- virtual void onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) override { }
- virtual GLuint getTargetFbo() const override { return -1; }
-
-// ----------------------------------------------------------------------------
-// android/graphics/Canvas interface
-// ----------------------------------------------------------------------------
- virtual SkCanvas* asSkCanvas() override;
-
- virtual void setBitmap(const SkBitmap& bitmap) override {
- LOG_ALWAYS_FATAL("DisplayListCanvas is not backed by a bitmap.");
- }
-
- virtual bool isOpaque() override { return false; }
- virtual int width() override { return mState.getWidth(); }
- virtual int height() override { return mState.getHeight(); }
-
- virtual void setHighContrastText(bool highContrastText) override {
- mHighContrastText = highContrastText;
- }
- virtual bool isHighContrastText() override { return mHighContrastText; }
-
-// ----------------------------------------------------------------------------
-// android/graphics/Canvas state operations
-// ----------------------------------------------------------------------------
- // Save (layer)
- virtual int getSaveCount() const override { return mState.getSaveCount(); }
- virtual int save(SaveFlags::Flags flags) override;
- virtual void restore() override;
- virtual void restoreToCount(int saveCount) override;
-
- virtual int saveLayer(float left, float top, float right, float bottom, const SkPaint* paint,
- SaveFlags::Flags flags) override;
- virtual int saveLayerAlpha(float left, float top, float right, float bottom,
- int alpha, SaveFlags::Flags flags) override {
- SkPaint paint;
- paint.setAlpha(alpha);
- return saveLayer(left, top, right, bottom, &paint, flags);
- }
-
- // Matrix
- virtual void getMatrix(SkMatrix* outMatrix) const override { mState.getMatrix(outMatrix); }
- virtual void setMatrix(const SkMatrix& matrix) override;
-
- virtual void concat(const SkMatrix& matrix) override;
- virtual void rotate(float degrees) override;
- virtual void scale(float sx, float sy) override;
- virtual void skew(float sx, float sy) override;
- virtual void translate(float dx, float dy) override;
-
- // Clip
- virtual bool getClipBounds(SkRect* outRect) const override;
- virtual bool quickRejectRect(float left, float top, float right, float bottom) const override;
- virtual bool quickRejectPath(const SkPath& path) const override;
-
- virtual bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op) override;
- virtual bool clipPath(const SkPath* path, SkRegion::Op op) override;
- virtual bool clipRegion(const SkRegion* region, SkRegion::Op op) override;
-
- // Misc
- virtual SkDrawFilter* getDrawFilter() override { return mDrawFilter.get(); }
- virtual void setDrawFilter(SkDrawFilter* filter) override;
-
-// ----------------------------------------------------------------------------
-// android/graphics/Canvas draw operations
-// ----------------------------------------------------------------------------
- virtual void drawColor(int color, SkXfermode::Mode mode) override;
- virtual void drawPaint(const SkPaint& paint) override;
-
- // Geometry
- virtual void drawPoint(float x, float y, const SkPaint& paint) override {
- float points[2] = { x, y };
- drawPoints(points, 2, paint);
- }
- virtual void drawPoints(const float* points, int count, const SkPaint& paint) override;
- virtual void drawLine(float startX, float startY, float stopX, float stopY,
- const SkPaint& paint) override {
- float points[4] = { startX, startY, stopX, stopY };
- drawLines(points, 4, paint);
- }
- virtual void drawLines(const float* points, int count, const SkPaint& paint) override;
- virtual void drawRect(float left, float top, float right, float bottom, const SkPaint& paint) override;
- virtual void drawRegion(const SkRegion& region, const SkPaint& paint) override;
- virtual void drawRoundRect(float left, float top, float right, float bottom,
- float rx, float ry, const SkPaint& paint) override;
- virtual void drawCircle(float x, float y, float radius, const SkPaint& paint) override;
- virtual void drawOval(float left, float top, float right, float bottom, const SkPaint& paint) override;
- virtual void drawArc(float left, float top, float right, float bottom,
- float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) override;
- virtual void drawPath(const SkPath& path, const SkPaint& paint) override;
- virtual void drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
- const float* verts, const float* tex, const int* colors,
- const uint16_t* indices, int indexCount, const SkPaint& paint) override
- { /* DisplayListCanvas does not support drawVertices(); ignore */ }
-
- // Bitmap-based
- virtual void drawBitmap(const SkBitmap& bitmap, float left, float top, const SkPaint* paint) override;
- virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,
- const SkPaint* paint) override;
- virtual void drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,
- float srcRight, float srcBottom, float dstLeft, float dstTop,
- float dstRight, float dstBottom, const SkPaint* paint) override;
- virtual void drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,
- const float* vertices, const int* colors, const SkPaint* paint) override;
- virtual void drawNinePatch(const SkBitmap& bitmap, const android::Res_png_9patch& chunk,
- float dstLeft, float dstTop, float dstRight, float dstBottom,
- const SkPaint* paint) override;
-
- virtual void drawVectorDrawable(VectorDrawableRoot* tree) override;
-
- // Text
- virtual void drawGlyphs(const uint16_t* glyphs, const float* positions, int count,
- const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop,
- float boundsRight, float boundsBottom, float totalAdvance) override;
- virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path,
- float hOffset, float vOffset, const SkPaint& paint) override;
- virtual bool drawTextAbsolutePos() const override { return false; }
-
-private:
-
- CanvasState mState;
- std::unique_ptr<SkiaCanvasProxy> mSkiaCanvasProxy;
-
- enum DeferredBarrierType {
- kBarrier_None,
- kBarrier_InOrder,
- kBarrier_OutOfOrder,
- };
-
- void drawBitmap(const SkBitmap* bitmap, const SkPaint* paint);
- void drawRects(const float* rects, int count, const SkPaint* paint);
-
- void flushRestoreToCount();
- void flushTranslate();
- void flushReorderBarrier();
-
- LinearAllocator& alloc() { return mDisplayList->allocator; }
-
- // Each method returns final index of op
- size_t addOpAndUpdateChunk(DisplayListOp* op);
- // flushes any deferred operations, and appends the op
- size_t flushAndAddOp(DisplayListOp* op);
-
- size_t addStateOp(StateOp* op);
- size_t addDrawOp(DrawOp* op);
- size_t addRenderNodeOp(DrawRenderNodeOp* op);
-
- void refBitmapsInShader(const SkShader* shader);
-
- template<class T>
- inline const T* refBuffer(const T* srcBuffer, int32_t count) {
- if (!srcBuffer) return nullptr;
-
- T* dstBuffer = (T*) mDisplayList->allocator.alloc<T>(count * sizeof(T));
- memcpy(dstBuffer, srcBuffer, count * sizeof(T));
- return dstBuffer;
- }
-
- inline const SkPath* refPath(const SkPath* path) {
- if (!path) return nullptr;
-
- // The points/verbs within the path are refcounted so this copy operation
- // is inexpensive and maintains the generationID of the original path.
- const SkPath* cachedPath = new SkPath(*path);
- mDisplayList->pathResources.push_back(cachedPath);
- return cachedPath;
- }
-
- inline const SkPaint* refPaint(const SkPaint* paint) {
- if (!paint) return nullptr;
-
- // If there is a draw filter apply it here and store the modified paint
- // so that we don't need to modify the paint every time we access it.
- SkTLazy<SkPaint> filteredPaint;
- if (mDrawFilter.get()) {
- filteredPaint.set(*paint);
- mDrawFilter->filter(filteredPaint.get(), SkDrawFilter::kPaint_Type);
- paint = filteredPaint.get();
- }
-
- // compute the hash key for the paint and check the cache.
- const uint32_t key = paint->getHash();
- const SkPaint* cachedPaint = mPaintMap.valueFor(key);
- // In the unlikely event that 2 unique paints have the same hash we do a
- // object equality check to ensure we don't erroneously dedup them.
- if (cachedPaint == nullptr || *cachedPaint != *paint) {
- cachedPaint = new SkPaint(*paint);
- std::unique_ptr<const SkPaint> copy(cachedPaint);
- mDisplayList->paints.push_back(std::move(copy));
-
- // replaceValueFor() performs an add if the entry doesn't exist
- mPaintMap.replaceValueFor(key, cachedPaint);
- refBitmapsInShader(cachedPaint->getShader());
- }
-
- return cachedPaint;
- }
-
- inline const SkRegion* refRegion(const SkRegion* region) {
- if (!region) {
- return region;
- }
-
- const SkRegion* cachedRegion = mRegionMap.valueFor(region);
- // TODO: Add generation ID to SkRegion
- if (cachedRegion == nullptr) {
- std::unique_ptr<const SkRegion> copy(new SkRegion(*region));
- cachedRegion = copy.get();
- mDisplayList->regions.push_back(std::move(copy));
-
- // replaceValueFor() performs an add if the entry doesn't exist
- mRegionMap.replaceValueFor(region, cachedRegion);
- }
-
- return cachedRegion;
- }
-
- inline const SkBitmap* refBitmap(const SkBitmap& bitmap) {
- // Note that this assumes the bitmap is immutable. There are cases this won't handle
- // correctly, such as creating the bitmap from scratch, drawing with it, changing its
- // contents, and drawing again. The only fix would be to always copy it the first time,
- // which doesn't seem worth the extra cycles for this unlikely case.
- SkBitmap* localBitmap = alloc().create<SkBitmap>(bitmap);
- mDisplayList->bitmapResources.push_back(localBitmap);
- return localBitmap;
- }
-
- inline const Res_png_9patch* refPatch(const Res_png_9patch* patch) {
- mDisplayList->patchResources.push_back(patch);
- mResourceCache.incrementRefcount(patch);
- return patch;
- }
-
- DefaultKeyedVector<uint32_t, const SkPaint*> mPaintMap;
- DefaultKeyedVector<const SkPath*, const SkPath*> mPathMap;
- DefaultKeyedVector<const SkRegion*, const SkRegion*> mRegionMap;
-
- ResourceCache& mResourceCache;
- DisplayList* mDisplayList;
-
- float mTranslateX;
- float mTranslateY;
- bool mHasDeferredTranslate;
- DeferredBarrierType mDeferredBarrierType;
- bool mHighContrastText;
-
- int mRestoreSaveCount;
-
- SkAutoTUnref<SkDrawFilter> mDrawFilter;
-
- friend class RenderNode;
-
-}; // class DisplayListCanvas
-
-}; // namespace uirenderer
-}; // namespace android
-
-#endif // ANDROID_HWUI_DISPLAY_LIST_RENDERER_H
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
deleted file mode 100644
index 2a85913..0000000
--- a/libs/hwui/DisplayListOp.h
+++ /dev/null
@@ -1,1555 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HWUI_DISPLAY_OPERATION_H
-#define ANDROID_HWUI_DISPLAY_OPERATION_H
-
-#include "OpenGLRenderer.h"
-#include "AssetAtlas.h"
-#include "DeferredDisplayList.h"
-#include "DisplayListCanvas.h"
-#include "GammaFontRenderer.h"
-#include "Patch.h"
-#include "RenderNode.h"
-#include "renderstate/RenderState.h"
-#include "UvMapper.h"
-#include "utils/LinearAllocator.h"
-#include "utils/PaintUtils.h"
-#include "VectorDrawable.h"
-
-#include <algorithm>
-
-#include <SkColor.h>
-#include <SkPath.h>
-#include <SkPathOps.h>
-#include <SkXfermode.h>
-
-#include <private/hwui/DrawGlInfo.h>
-
-// Use OP_LOG for logging with arglist, OP_LOGS if just printing char*
-#define OP_LOGS(s) OP_LOG("%s", (s))
-#define OP_LOG(s, ...) ALOGD( "%*s" s, level * 2, "", __VA_ARGS__ )
-
-namespace android {
-namespace uirenderer {
-
-/**
- * Structure for storing canvas operations when they are recorded into a DisplayList, so that they
- * may be replayed to an OpenGLRenderer.
- *
- * To avoid individual memory allocations, DisplayListOps may only be allocated into a
- * LinearAllocator's managed memory buffers. Each pointer held by a DisplayListOp is either a
- * pointer into memory also allocated in the LinearAllocator (mostly for text and float buffers) or
- * references a externally refcounted object (Sk... and Skia... objects). ~DisplayListOp() is
- * never called as LinearAllocators are simply discarded, so no memory management should be done in
- * this class.
- */
-class DisplayListOp {
-public:
- // These objects should always be allocated with a LinearAllocator, and never destroyed/deleted.
- // standard new() intentionally not implemented, and delete/deconstructor should never be used.
- virtual ~DisplayListOp() { LOG_ALWAYS_FATAL("Destructor not supported"); }
- static void operator delete(void* ptr) { LOG_ALWAYS_FATAL("delete not supported"); }
- static void* operator new(size_t size) = delete; /** PURPOSELY OMITTED **/
- static void* operator new(size_t size, LinearAllocator& allocator) {
- // FIXME: Quick hack to keep old pipeline working, delete this when
- // we no longer need to support HWUI_NEWOPS := false
- return allocator.alloc<char>(size);
- }
-
- enum OpLogFlag {
- kOpLogFlag_Recurse = 0x1,
- kOpLogFlag_JSON = 0x2 // TODO: add?
- };
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) = 0;
-
- virtual void replay(ReplayStateStruct& replayStruct, int saveCount, int level,
- bool useQuickReject) = 0;
-
- virtual void output(int level, uint32_t logFlags = 0) const = 0;
-
- // NOTE: it would be nice to declare constants and overriding the implementation in each op to
- // point at the constants, but that seems to require a .cpp file
- virtual const char* name() = 0;
-};
-
-class StateOp : public DisplayListOp {
-public:
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- // default behavior only affects immediate, deferrable state, issue directly to renderer
- applyState(deferStruct.mRenderer, saveCount);
- }
-
- /**
- * State operations are applied directly to the renderer, but can cause the deferred drawing op
- * list to flush
- */
- virtual void replay(ReplayStateStruct& replayStruct, int saveCount, int level,
- bool useQuickReject) override {
- applyState(replayStruct.mRenderer, saveCount);
- }
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const = 0;
-};
-
-class DrawOp : public DisplayListOp {
-friend class MergingDrawBatch;
-public:
- DrawOp(const SkPaint* paint)
- : mPaint(paint), mQuickRejected(false) {}
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- if (mQuickRejected && CC_LIKELY(useQuickReject)) {
- return;
- }
-
- deferStruct.mDeferredList.addDrawOp(deferStruct.mRenderer, this);
- }
-
- virtual void replay(ReplayStateStruct& replayStruct, int saveCount, int level,
- bool useQuickReject) override {
- if (mQuickRejected && CC_LIKELY(useQuickReject)) {
- return;
- }
-
- applyDraw(replayStruct.mRenderer, replayStruct.mDirty);
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) = 0;
-
- /**
- * Draw multiple instances of an operation, must be overidden for operations that merge
- *
- * Currently guarantees certain similarities between ops (see MergingDrawBatch::canMergeWith),
- * and pure translation transformations. Other guarantees of similarity should be enforced by
- * reducing which operations are tagged as mergeable.
- */
- virtual void multiDraw(OpenGLRenderer& renderer, Rect& dirty,
- const std::vector<OpStatePair>& ops, const Rect& bounds) {
- for (unsigned int i = 0; i < ops.size(); i++) {
- renderer.restoreDisplayState(*(ops[i].state), true);
- ops[i].op->applyDraw(renderer, dirty);
- }
- }
-
- /**
- * When this method is invoked the state field is initialized to have the
- * final rendering state. We can thus use it to process data as it will be
- * used at draw time.
- *
- * Additionally, this method allows subclasses to provide defer-time preferences for batching
- * and merging.
- *
- * if a subclass can set deferInfo.mergeable to true, it should implement multiDraw()
- */
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) {}
-
- /**
- * Query the conservative, local bounds (unmapped) bounds of the op.
- *
- * returns true if bounds exist
- */
- virtual bool getLocalBounds(Rect& localBounds) {
- return false;
- }
-
- // TODO: better refine localbounds usage
- void setQuickRejected(bool quickRejected) { mQuickRejected = quickRejected; }
- bool getQuickRejected() { return mQuickRejected; }
-
- virtual bool hasTextShadow() const {
- return false;
- }
-
- inline float strokeWidthOutset() {
- // since anything AA stroke with less than 1.0 pixel width is drawn with an alpha-reduced
- // 1.0 stroke, treat 1.0 as minimum.
-
- // TODO: it would be nice if this could take scale into account, but scale isn't stable
- // since higher levels of the view hierarchy can change scale out from underneath it.
- return std::max(mPaint->getStrokeWidth(), 1.0f) * 0.5f;
- }
-
-protected:
- // Helper method for determining op opaqueness. Assumes op fills its bounds in local
- // coordinates, and that paint's alpha is used
- inline bool isOpaqueOverBounds(const DeferredDisplayState& state) {
- // ensure that local bounds cover mapped bounds
- if (!state.mMatrix.isSimple()) return false;
-
- if (state.mRoundRectClipState) return false;
-
- // check state/paint for transparency
- if (mPaint) {
- if (mPaint->getAlpha() != 0xFF) {
- return false;
- }
- if (mPaint->getShader() && !mPaint->getShader()->isOpaque()) {
- return false;
- }
- if (PaintUtils::isBlendedColorFilter(mPaint->getColorFilter())) {
- return false;
- }
- }
-
- if (state.mAlpha != 1.0f) return false;
-
- SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(mPaint);
- return (mode == SkXfermode::kSrcOver_Mode ||
- mode == SkXfermode::kSrc_Mode);
-
- }
-
- const SkPaint* mPaint;
- bool mQuickRejected;
-};
-
-class DrawBoundedOp : public DrawOp {
-public:
- DrawBoundedOp(float left, float top, float right, float bottom, const SkPaint* paint)
- : DrawOp(paint), mLocalBounds(left, top, right, bottom) {}
-
- DrawBoundedOp(const Rect& localBounds, const SkPaint* paint)
- : DrawOp(paint), mLocalBounds(localBounds) {}
-
- // Calculates bounds as smallest rect encompassing all points
- // NOTE: requires at least 1 vertex, and doesn't account for stroke size (should be handled in
- // subclass' constructor)
- DrawBoundedOp(const float* points, int count, const SkPaint* paint)
- : DrawOp(paint), mLocalBounds(points[0], points[1], points[0], points[1]) {
- for (int i = 2; i < count; i += 2) {
- mLocalBounds.left = std::min(mLocalBounds.left, points[i]);
- mLocalBounds.right = std::max(mLocalBounds.right, points[i]);
- mLocalBounds.top = std::min(mLocalBounds.top, points[i + 1]);
- mLocalBounds.bottom = std::max(mLocalBounds.bottom, points[i + 1]);
- }
- }
-
- // default empty constructor for bounds, to be overridden in child constructor body
- DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { }
-
- virtual bool getLocalBounds(Rect& localBounds) override {
- localBounds.set(mLocalBounds);
- PaintUtils::TextShadow textShadow;
- if (PaintUtils::getTextShadow(mPaint, &textShadow)) {
- Rect shadow(mLocalBounds);
- shadow.translate(textShadow.dx, textShadow.dx);
- shadow.outset(textShadow.radius);
- localBounds.unionWith(shadow);
- }
- return true;
- }
-
-protected:
- Rect mLocalBounds; // displayed area in LOCAL coord. doesn't incorporate stroke, so check paint
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// STATE OPERATIONS - these may affect the state of the canvas/renderer, but do
-// not directly draw or alter output
-///////////////////////////////////////////////////////////////////////////////
-
-class SaveOp : public StateOp {
-public:
- SaveOp(int flags)
- : mFlags(flags) {}
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- int newSaveCount = deferStruct.mRenderer.save(mFlags);
- deferStruct.mDeferredList.addSave(deferStruct.mRenderer, this, newSaveCount);
- }
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.save(mFlags);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Save flags %x", mFlags);
- }
-
- virtual const char* name() override { return "Save"; }
-
- int getFlags() const { return mFlags; }
-private:
- int mFlags;
-};
-
-class RestoreToCountOp : public StateOp {
-public:
- RestoreToCountOp(int count)
- : mCount(count) {}
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- deferStruct.mDeferredList.addRestoreToCount(deferStruct.mRenderer,
- this, saveCount + mCount);
- deferStruct.mRenderer.restoreToCount(saveCount + mCount);
- }
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.restoreToCount(saveCount + mCount);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Restore to count %d", mCount);
- }
-
- virtual const char* name() override { return "RestoreToCount"; }
-
-private:
- int mCount;
-};
-
-class SaveLayerOp : public StateOp {
-public:
- SaveLayerOp(float left, float top, float right, float bottom, int alpha, int flags)
- : mArea(left, top, right, bottom)
- , mPaint(&mCachedPaint)
- , mFlags(flags)
- , mConvexMask(nullptr) {
- mCachedPaint.setAlpha(alpha);
- }
-
- SaveLayerOp(float left, float top, float right, float bottom, const SkPaint* paint, int flags)
- : mArea(left, top, right, bottom)
- , mPaint(paint)
- , mFlags(flags)
- , mConvexMask(nullptr)
- {}
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- // NOTE: don't bother with actual saveLayer, instead issuing it at flush time
- int newSaveCount = deferStruct.mRenderer.getSaveCount();
- deferStruct.mDeferredList.addSaveLayer(deferStruct.mRenderer, this, newSaveCount);
-
- // NOTE: don't issue full saveLayer, since that has side effects/is costly. instead just
- // setup the snapshot for deferral, and re-issue the op at flush time
- deferStruct.mRenderer.saveLayerDeferred(mArea.left, mArea.top, mArea.right, mArea.bottom,
- mPaint, mFlags);
- }
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.saveLayer(mArea.left, mArea.top, mArea.right, mArea.bottom,
- mPaint, mFlags, mConvexMask);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("SaveLayer%s of area " RECT_STRING,
- (isSaveLayerAlpha() ? "Alpha" : ""),RECT_ARGS(mArea));
- }
-
- virtual const char* name() override {
- return isSaveLayerAlpha() ? "SaveLayerAlpha" : "SaveLayer";
- }
-
- int getFlags() { return mFlags; }
-
- // Called to make SaveLayerOp clip to the provided mask when drawing back/restored
- void setMask(const SkPath* convexMask) {
- mConvexMask = convexMask;
- }
-
-private:
- bool isSaveLayerAlpha() const {
- SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(mPaint);
- int alpha = PaintUtils::getAlphaDirect(mPaint);
- return alpha < 255 && mode == SkXfermode::kSrcOver_Mode;
- }
-
- Rect mArea;
- const SkPaint* mPaint;
- SkPaint mCachedPaint;
- int mFlags;
-
- // Convex path, points at data in RenderNode, valid for the duration of the frame only
- // Only used for masking the SaveLayer which wraps projected RenderNodes
- const SkPath* mConvexMask;
-};
-
-class TranslateOp : public StateOp {
-public:
- TranslateOp(float dx, float dy)
- : mDx(dx), mDy(dy) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.translate(mDx, mDy);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Translate by %f %f", mDx, mDy);
- }
-
- virtual const char* name() override { return "Translate"; }
-
-private:
- float mDx;
- float mDy;
-};
-
-class RotateOp : public StateOp {
-public:
- RotateOp(float degrees)
- : mDegrees(degrees) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.rotate(mDegrees);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Rotate by %f degrees", mDegrees);
- }
-
- virtual const char* name() override { return "Rotate"; }
-
-private:
- float mDegrees;
-};
-
-class ScaleOp : public StateOp {
-public:
- ScaleOp(float sx, float sy)
- : mSx(sx), mSy(sy) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.scale(mSx, mSy);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Scale by %f %f", mSx, mSy);
- }
-
- virtual const char* name() override { return "Scale"; }
-
-private:
- float mSx;
- float mSy;
-};
-
-class SkewOp : public StateOp {
-public:
- SkewOp(float sx, float sy)
- : mSx(sx), mSy(sy) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.skew(mSx, mSy);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Skew by %f %f", mSx, mSy);
- }
-
- virtual const char* name() override { return "Skew"; }
-
-private:
- float mSx;
- float mSy;
-};
-
-class SetMatrixOp : public StateOp {
-public:
- SetMatrixOp(const SkMatrix& matrix)
- : mMatrix(matrix) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- // Setting a matrix on a Canvas isn't equivalent to setting a total matrix on the scene.
- // Set a canvas-relative matrix on the renderer instead.
- renderer.setLocalMatrix(mMatrix);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- if (mMatrix.isIdentity()) {
- OP_LOGS("SetMatrix (reset)");
- } else {
- OP_LOG("SetMatrix " SK_MATRIX_STRING, SK_MATRIX_ARGS(&mMatrix));
- }
- }
-
- virtual const char* name() override { return "SetMatrix"; }
-
-private:
- const SkMatrix mMatrix;
-};
-
-class ConcatMatrixOp : public StateOp {
-public:
- ConcatMatrixOp(const SkMatrix& matrix)
- : mMatrix(matrix) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.concatMatrix(mMatrix);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("ConcatMatrix " SK_MATRIX_STRING, SK_MATRIX_ARGS(&mMatrix));
- }
-
- virtual const char* name() override { return "ConcatMatrix"; }
-
-private:
- const SkMatrix mMatrix;
-};
-
-class ClipOp : public StateOp {
-public:
- ClipOp(SkRegion::Op op) : mOp(op) {}
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- // NOTE: must defer op BEFORE applying state, since it may read clip
- deferStruct.mDeferredList.addClip(deferStruct.mRenderer, this);
-
- // TODO: Can we avoid applying complex clips at defer time?
- applyState(deferStruct.mRenderer, saveCount);
- }
-
- bool canCauseComplexClip() {
- return ((mOp != SkRegion::kIntersect_Op) && (mOp != SkRegion::kReplace_Op)) || !isRect();
- }
-
-protected:
- virtual bool isRect() { return false; }
-
- SkRegion::Op mOp;
-};
-
-class ClipRectOp : public ClipOp {
-public:
- ClipRectOp(float left, float top, float right, float bottom, SkRegion::Op op)
- : ClipOp(op), mArea(left, top, right, bottom) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.clipRect(mArea.left, mArea.top, mArea.right, mArea.bottom, mOp);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("ClipRect " RECT_STRING, RECT_ARGS(mArea));
- }
-
- virtual const char* name() override { return "ClipRect"; }
-
-protected:
- virtual bool isRect() override { return true; }
-
-private:
- Rect mArea;
-};
-
-class ClipPathOp : public ClipOp {
-public:
- ClipPathOp(const SkPath* path, SkRegion::Op op)
- : ClipOp(op), mPath(path) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.clipPath(mPath, mOp);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- SkRect bounds = mPath->getBounds();
- OP_LOG("ClipPath bounds " RECT_STRING,
- bounds.left(), bounds.top(), bounds.right(), bounds.bottom());
- }
-
- virtual const char* name() override { return "ClipPath"; }
-
-private:
- const SkPath* mPath;
-};
-
-class ClipRegionOp : public ClipOp {
-public:
- ClipRegionOp(const SkRegion* region, SkRegion::Op op)
- : ClipOp(op), mRegion(region) {}
-
- virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
- renderer.clipRegion(mRegion, mOp);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- SkIRect bounds = mRegion->getBounds();
- OP_LOG("ClipRegion bounds %d %d %d %d",
- bounds.left(), bounds.top(), bounds.right(), bounds.bottom());
- }
-
- virtual const char* name() override { return "ClipRegion"; }
-
-private:
- const SkRegion* mRegion;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// DRAW OPERATIONS - these are operations that can draw to the canvas's device
-///////////////////////////////////////////////////////////////////////////////
-
-class DrawBitmapOp : public DrawBoundedOp {
-public:
- DrawBitmapOp(const SkBitmap* bitmap, const SkPaint* paint)
- : DrawBoundedOp(0, 0, bitmap->width(), bitmap->height(), paint)
- , mBitmap(bitmap)
- , mEntryValid(false), mEntry(nullptr) {
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawBitmap(mBitmap, mPaint);
- }
-
- AssetAtlas::Entry* getAtlasEntry(OpenGLRenderer& renderer) {
- if (!mEntryValid) {
- mEntryValid = true;
- mEntry = renderer.renderState().assetAtlas().getEntry(mBitmap->pixelRef());
- }
- return mEntry;
- }
-
-#define SET_TEXTURE(ptr, posRect, offsetRect, texCoordsRect, xDim, yDim) \
- TextureVertex::set((ptr)++, (posRect).xDim - (offsetRect).left, (posRect).yDim - (offsetRect).top, \
- (texCoordsRect).xDim, (texCoordsRect).yDim)
-
- /**
- * This multi-draw operation builds a mesh on the stack by generating a quad
- * for each bitmap in the batch. This method is also responsible for dirtying
- * the current layer, if any.
- */
- virtual void multiDraw(OpenGLRenderer& renderer, Rect& dirty,
- const std::vector<OpStatePair>& ops, const Rect& bounds) override {
- const DeferredDisplayState& firstState = *(ops[0].state);
- renderer.restoreDisplayState(firstState, true); // restore all but the clip
-
- TextureVertex vertices[6 * ops.size()];
- TextureVertex* vertex = &vertices[0];
-
- const bool hasLayer = renderer.hasLayer();
- bool pureTranslate = true;
-
- // TODO: manually handle rect clip for bitmaps by adjusting texCoords per op,
- // and allowing them to be merged in getBatchId()
- for (unsigned int i = 0; i < ops.size(); i++) {
- const DeferredDisplayState& state = *(ops[i].state);
- const Rect& opBounds = state.mBounds;
- // When we reach multiDraw(), the matrix can be either
- // pureTranslate or simple (translate and/or scale).
- // If the matrix is not pureTranslate, then we have a scale
- pureTranslate &= state.mMatrix.isPureTranslate();
-
- Rect texCoords(0, 0, 1, 1);
- ((DrawBitmapOp*) ops[i].op)->uvMap(renderer, texCoords);
-
- SET_TEXTURE(vertex, opBounds, bounds, texCoords, left, top);
- SET_TEXTURE(vertex, opBounds, bounds, texCoords, right, top);
- SET_TEXTURE(vertex, opBounds, bounds, texCoords, left, bottom);
-
- SET_TEXTURE(vertex, opBounds, bounds, texCoords, left, bottom);
- SET_TEXTURE(vertex, opBounds, bounds, texCoords, right, top);
- SET_TEXTURE(vertex, opBounds, bounds, texCoords, right, bottom);
-
- if (hasLayer) {
- renderer.dirtyLayer(opBounds.left, opBounds.top, opBounds.right, opBounds.bottom);
- }
- }
-
- renderer.drawBitmaps(mBitmap, mEntry, ops.size(), &vertices[0],
- pureTranslate, bounds, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw bitmap %p of size %dx%d%s",
- mBitmap, mBitmap->width(), mBitmap->height(),
- mEntry ? " using AssetAtlas" : "");
- }
-
- virtual const char* name() override { return "DrawBitmap"; }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap;
- deferInfo.mergeId = getAtlasEntry(renderer) ?
- (mergeid_t) mEntry->getMergeId() : (mergeid_t) mBitmap;
-
- // Don't merge non-simply transformed or neg scale ops, SET_TEXTURE doesn't handle rotation
- // Don't merge A8 bitmaps - the paint's color isn't compared by mergeId, or in
- // MergingDrawBatch::canMergeWith()
- // TODO: support clipped bitmaps by handling them in SET_TEXTURE
- deferInfo.mergeable = state.mMatrix.isSimple() && state.mMatrix.positiveScale() &&
- !state.mClipSideFlags &&
- PaintUtils::getXfermodeDirect(mPaint) == SkXfermode::kSrcOver_Mode &&
- (mBitmap->colorType() != kAlpha_8_SkColorType);
- }
-
- void uvMap(OpenGLRenderer& renderer, Rect& texCoords) {
- if (getAtlasEntry(renderer)) {
- mEntry->uvMapper.map(texCoords);
- }
- }
-
- const SkBitmap* bitmap() { return mBitmap; }
-protected:
- const SkBitmap* mBitmap;
- bool mEntryValid;
- AssetAtlas::Entry* mEntry;
-};
-
-class DrawBitmapRectOp : public DrawBoundedOp {
-public:
- DrawBitmapRectOp(const SkBitmap* bitmap,
- float srcLeft, float srcTop, float srcRight, float srcBottom,
- float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint)
- : DrawBoundedOp(dstLeft, dstTop, dstRight, dstBottom, paint),
- mBitmap(bitmap), mSrc(srcLeft, srcTop, srcRight, srcBottom) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawBitmap(mBitmap, mSrc, mLocalBounds, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw bitmap %p src=" RECT_STRING ", dst=" RECT_STRING,
- mBitmap, RECT_ARGS(mSrc), RECT_ARGS(mLocalBounds));
- }
-
- virtual const char* name() override { return "DrawBitmapRect"; }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap;
- }
-
-private:
- const SkBitmap* mBitmap;
- Rect mSrc;
-};
-
-class DrawBitmapMeshOp : public DrawBoundedOp {
-public:
- DrawBitmapMeshOp(const SkBitmap* bitmap, int meshWidth, int meshHeight,
- const float* vertices, const int* colors, const SkPaint* paint)
- : DrawBoundedOp(vertices, 2 * (meshWidth + 1) * (meshHeight + 1), paint),
- mBitmap(bitmap), mMeshWidth(meshWidth), mMeshHeight(meshHeight),
- mVertices(vertices), mColors(colors) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawBitmapMesh(mBitmap, mMeshWidth, mMeshHeight,
- mVertices, mColors, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw bitmap %p mesh %d x %d", mBitmap, mMeshWidth, mMeshHeight);
- }
-
- virtual const char* name() override { return "DrawBitmapMesh"; }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap;
- }
-
-private:
- const SkBitmap* mBitmap;
- int mMeshWidth;
- int mMeshHeight;
- const float* mVertices;
- const int* mColors;
-};
-
-class DrawPatchOp : public DrawBoundedOp {
-public:
- DrawPatchOp(const SkBitmap* bitmap, const Res_png_9patch* patch,
- float left, float top, float right, float bottom, const SkPaint* paint)
- : DrawBoundedOp(left, top, right, bottom, paint),
- mBitmap(bitmap), mPatch(patch), mGenerationId(0), mMesh(nullptr),
- mEntryValid(false), mEntry(nullptr) {
- };
-
- AssetAtlas::Entry* getAtlasEntry(OpenGLRenderer& renderer) {
- if (!mEntryValid) {
- mEntryValid = true;
- mEntry = renderer.renderState().assetAtlas().getEntry(mBitmap->pixelRef());
- }
- return mEntry;
- }
-
- const Patch* getMesh(OpenGLRenderer& renderer) {
- if (!mMesh || renderer.getCaches().patchCache.getGenerationId() != mGenerationId) {
- PatchCache& cache = renderer.getCaches().patchCache;
- mMesh = cache.get(getAtlasEntry(renderer), mBitmap->width(), mBitmap->height(),
- mLocalBounds.getWidth(), mLocalBounds.getHeight(), mPatch);
- mGenerationId = cache.getGenerationId();
- }
- return mMesh;
- }
-
- /**
- * This multi-draw operation builds an indexed mesh on the stack by copying
- * and transforming the vertices of each 9-patch in the batch. This method
- * is also responsible for dirtying the current layer, if any.
- */
- virtual void multiDraw(OpenGLRenderer& renderer, Rect& dirty,
- const std::vector<OpStatePair>& ops, const Rect& bounds) override {
- const DeferredDisplayState& firstState = *(ops[0].state);
- renderer.restoreDisplayState(firstState, true); // restore all but the clip
-
- // Batches will usually contain a small number of items so it's
- // worth performing a first iteration to count the exact number
- // of vertices we need in the new mesh
- uint32_t totalVertices = 0;
- for (unsigned int i = 0; i < ops.size(); i++) {
- totalVertices += ((DrawPatchOp*) ops[i].op)->getMesh(renderer)->verticesCount;
- }
-
- const bool hasLayer = renderer.hasLayer();
-
- uint32_t indexCount = 0;
-
- TextureVertex vertices[totalVertices];
- TextureVertex* vertex = &vertices[0];
-
- // Create a mesh that contains the transformed vertices for all the
- // 9-patch objects that are part of the batch. Note that onDefer()
- // enforces ops drawn by this function to have a pure translate or
- // identity matrix
- for (unsigned int i = 0; i < ops.size(); i++) {
- DrawPatchOp* patchOp = (DrawPatchOp*) ops[i].op;
- const DeferredDisplayState* state = ops[i].state;
- const Patch* opMesh = patchOp->getMesh(renderer);
- uint32_t vertexCount = opMesh->verticesCount;
- if (vertexCount == 0) continue;
-
- // We use the bounds to know where to translate our vertices
- // Using patchOp->state.mBounds wouldn't work because these
- // bounds are clipped
- const float tx = (int) floorf(state->mMatrix.getTranslateX() +
- patchOp->mLocalBounds.left + 0.5f);
- const float ty = (int) floorf(state->mMatrix.getTranslateY() +
- patchOp->mLocalBounds.top + 0.5f);
-
- // Copy & transform all the vertices for the current operation
- TextureVertex* opVertices = opMesh->vertices.get();
- for (uint32_t j = 0; j < vertexCount; j++, opVertices++) {
- TextureVertex::set(vertex++,
- opVertices->x + tx, opVertices->y + ty,
- opVertices->u, opVertices->v);
- }
-
- // Dirty the current layer if possible. When the 9-patch does not
- // contain empty quads we can take a shortcut and simply set the
- // dirty rect to the object's bounds.
- if (hasLayer) {
- if (!opMesh->hasEmptyQuads) {
- renderer.dirtyLayer(tx, ty,
- tx + patchOp->mLocalBounds.getWidth(),
- ty + patchOp->mLocalBounds.getHeight());
- } else {
- const size_t count = opMesh->quads.size();
- for (size_t i = 0; i < count; i++) {
- const Rect& quadBounds = opMesh->quads[i];
- const float x = tx + quadBounds.left;
- const float y = ty + quadBounds.top;
- renderer.dirtyLayer(x, y,
- x + quadBounds.getWidth(), y + quadBounds.getHeight());
- }
- }
- }
-
- indexCount += opMesh->indexCount;
- }
-
- renderer.drawPatches(mBitmap, getAtlasEntry(renderer),
- &vertices[0], indexCount, mPaint);
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- // We're not calling the public variant of drawPatch() here
- // This method won't perform the quickReject() since we've already done it at this point
- renderer.drawPatch(mBitmap, getMesh(renderer), getAtlasEntry(renderer),
- mLocalBounds.left, mLocalBounds.top, mLocalBounds.right, mLocalBounds.bottom,
- mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw patch " RECT_STRING "%s", RECT_ARGS(mLocalBounds),
- mEntry ? " with AssetAtlas" : "");
- }
-
- virtual const char* name() override { return "DrawPatch"; }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- deferInfo.batchId = DeferredDisplayList::kOpBatch_Patch;
- deferInfo.mergeId = getAtlasEntry(renderer) ? (mergeid_t) mEntry->getMergeId() : (mergeid_t) mBitmap;
- deferInfo.mergeable = state.mMatrix.isPureTranslate() &&
- PaintUtils::getXfermodeDirect(mPaint) == SkXfermode::kSrcOver_Mode;
- deferInfo.opaqueOverBounds = isOpaqueOverBounds(state) && mBitmap->isOpaque();
- }
-
-private:
- const SkBitmap* mBitmap;
- const Res_png_9patch* mPatch;
-
- uint32_t mGenerationId;
- const Patch* mMesh;
-
- bool mEntryValid;
- AssetAtlas::Entry* mEntry;
-};
-
-class DrawColorOp : public DrawOp {
-public:
- DrawColorOp(int color, SkXfermode::Mode mode)
- : DrawOp(nullptr), mColor(color), mMode(mode) {};
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawColor(mColor, mMode);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw color %#x, mode %d", mColor, mMode);
- }
-
- virtual const char* name() override { return "DrawColor"; }
-
-private:
- int mColor;
- SkXfermode::Mode mMode;
-};
-
-class DrawStrokableOp : public DrawBoundedOp {
-public:
- DrawStrokableOp(float left, float top, float right, float bottom, const SkPaint* paint)
- : DrawBoundedOp(left, top, right, bottom, paint) {};
- DrawStrokableOp(const Rect& localBounds, const SkPaint* paint)
- : DrawBoundedOp(localBounds, paint) {};
-
- virtual bool getLocalBounds(Rect& localBounds) override {
- localBounds.set(mLocalBounds);
- if (mPaint && mPaint->getStyle() != SkPaint::kFill_Style) {
- localBounds.outset(strokeWidthOutset());
- }
- return true;
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- if (mPaint->getPathEffect()) {
- deferInfo.batchId = DeferredDisplayList::kOpBatch_AlphaMaskTexture;
- } else {
- deferInfo.batchId = mPaint->isAntiAlias() ?
- DeferredDisplayList::kOpBatch_AlphaVertices :
- DeferredDisplayList::kOpBatch_Vertices;
- }
- }
-};
-
-class DrawRectOp : public DrawStrokableOp {
-public:
- DrawRectOp(float left, float top, float right, float bottom, const SkPaint* paint)
- : DrawStrokableOp(left, top, right, bottom, paint) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawRect(mLocalBounds.left, mLocalBounds.top,
- mLocalBounds.right, mLocalBounds.bottom, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Rect " RECT_STRING, RECT_ARGS(mLocalBounds));
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- DrawStrokableOp::onDefer(renderer, deferInfo, state);
- deferInfo.opaqueOverBounds = isOpaqueOverBounds(state) &&
- mPaint->getStyle() == SkPaint::kFill_Style;
- }
-
- virtual const char* name() override { return "DrawRect"; }
-};
-
-class DrawRectsOp : public DrawBoundedOp {
-public:
- DrawRectsOp(const float* rects, int count, const SkPaint* paint)
- : DrawBoundedOp(rects, count, paint),
- mRects(rects), mCount(count) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawRects(mRects, mCount, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Rects count %d", mCount);
- }
-
- virtual const char* name() override { return "DrawRects"; }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- deferInfo.batchId = DeferredDisplayList::kOpBatch_Vertices;
- }
-
-private:
- const float* mRects;
- int mCount;
-};
-
-class DrawRoundRectOp : public DrawStrokableOp {
-public:
- DrawRoundRectOp(float left, float top, float right, float bottom,
- float rx, float ry, const SkPaint* paint)
- : DrawStrokableOp(left, top, right, bottom, paint), mRx(rx), mRy(ry) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawRoundRect(mLocalBounds.left, mLocalBounds.top,
- mLocalBounds.right, mLocalBounds.bottom, mRx, mRy, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw RoundRect " RECT_STRING ", rx %f, ry %f", RECT_ARGS(mLocalBounds), mRx, mRy);
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- DrawStrokableOp::onDefer(renderer, deferInfo, state);
- if (!mPaint->getPathEffect()) {
- renderer.getCaches().tessellationCache.precacheRoundRect(state.mMatrix, *mPaint,
- mLocalBounds.getWidth(), mLocalBounds.getHeight(), mRx, mRy);
- }
- }
-
- virtual const char* name() override { return "DrawRoundRect"; }
-
-private:
- float mRx;
- float mRy;
-};
-
-class DrawRoundRectPropsOp : public DrawOp {
-public:
- DrawRoundRectPropsOp(float* left, float* top, float* right, float* bottom,
- float *rx, float *ry, const SkPaint* paint)
- : DrawOp(paint), mLeft(left), mTop(top), mRight(right), mBottom(bottom),
- mRx(rx), mRy(ry) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawRoundRect(*mLeft, *mTop, *mRight, *mBottom,
- *mRx, *mRy, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw RoundRect Props " RECT_STRING ", rx %f, ry %f",
- *mLeft, *mTop, *mRight, *mBottom, *mRx, *mRy);
- }
-
- virtual const char* name() override { return "DrawRoundRectProps"; }
-
-private:
- float* mLeft;
- float* mTop;
- float* mRight;
- float* mBottom;
- float* mRx;
- float* mRy;
-};
-
-class DrawCircleOp : public DrawStrokableOp {
-public:
- DrawCircleOp(float x, float y, float radius, const SkPaint* paint)
- : DrawStrokableOp(x - radius, y - radius, x + radius, y + radius, paint),
- mX(x), mY(y), mRadius(radius) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawCircle(mX, mY, mRadius, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Circle x %f, y %f, r %f", mX, mY, mRadius);
- }
-
- virtual const char* name() override { return "DrawCircle"; }
-
-private:
- float mX;
- float mY;
- float mRadius;
-};
-
-class DrawCirclePropsOp : public DrawOp {
-public:
- DrawCirclePropsOp(float* x, float* y, float* radius, const SkPaint* paint)
- : DrawOp(paint), mX(x), mY(y), mRadius(radius) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawCircle(*mX, *mY, *mRadius, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Circle Props x %p, y %p, r %p", mX, mY, mRadius);
- }
-
- virtual const char* name() override { return "DrawCircleProps"; }
-
-private:
- float* mX;
- float* mY;
- float* mRadius;
-};
-
-class DrawVectorDrawableOp : public DrawOp {
-public:
- DrawVectorDrawableOp(VectorDrawableRoot* tree, const SkRect& bounds)
- : DrawOp(nullptr), mTree(tree), mDst(bounds) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- const SkBitmap& bitmap = mTree->getBitmapUpdateIfDirty();
- SkPaint* paint = mTree->getPaint();
- renderer.drawBitmap(&bitmap, Rect(0, 0, bitmap.width(), bitmap.height()),
- mDst, paint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Vector Drawable %p", mTree);
- }
-
- virtual const char* name() override { return "DrawVectorDrawable"; }
-
-private:
- VectorDrawableRoot* mTree;
- SkRect mDst;
-
-};
-
-class DrawOvalOp : public DrawStrokableOp {
-public:
- DrawOvalOp(float left, float top, float right, float bottom, const SkPaint* paint)
- : DrawStrokableOp(left, top, right, bottom, paint) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawOval(mLocalBounds.left, mLocalBounds.top,
- mLocalBounds.right, mLocalBounds.bottom, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Oval " RECT_STRING, RECT_ARGS(mLocalBounds));
- }
-
- virtual const char* name() override { return "DrawOval"; }
-};
-
-class DrawArcOp : public DrawStrokableOp {
-public:
- DrawArcOp(float left, float top, float right, float bottom,
- float startAngle, float sweepAngle, bool useCenter, const SkPaint* paint)
- : DrawStrokableOp(left, top, right, bottom, paint),
- mStartAngle(startAngle), mSweepAngle(sweepAngle), mUseCenter(useCenter) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawArc(mLocalBounds.left, mLocalBounds.top,
- mLocalBounds.right, mLocalBounds.bottom,
- mStartAngle, mSweepAngle, mUseCenter, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Arc " RECT_STRING ", start %f, sweep %f, useCenter %d",
- RECT_ARGS(mLocalBounds), mStartAngle, mSweepAngle, mUseCenter);
- }
-
- virtual const char* name() override { return "DrawArc"; }
-
-private:
- float mStartAngle;
- float mSweepAngle;
- bool mUseCenter;
-};
-
-class DrawPathOp : public DrawBoundedOp {
-public:
- DrawPathOp(const SkPath* path, const SkPaint* paint)
- : DrawBoundedOp(paint), mPath(path) {
- float left, top, offset;
- uint32_t width, height;
- PathCache::computePathBounds(path, paint, left, top, offset, width, height);
- left -= offset;
- top -= offset;
- mLocalBounds.set(left, top, left + width, top + height);
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawPath(mPath, mPaint);
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- renderer.getCaches().pathCache.precache(mPath, mPaint);
-
- deferInfo.batchId = DeferredDisplayList::kOpBatch_AlphaMaskTexture;
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Path %p in " RECT_STRING, mPath, RECT_ARGS(mLocalBounds));
- }
-
- virtual const char* name() override { return "DrawPath"; }
-
-private:
- const SkPath* mPath;
-};
-
-class DrawLinesOp : public DrawBoundedOp {
-public:
- DrawLinesOp(const float* points, int count, const SkPaint* paint)
- : DrawBoundedOp(points, count, paint),
- mPoints(points), mCount(count) {
- mLocalBounds.outset(strokeWidthOutset());
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawLines(mPoints, mCount, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Lines count %d", mCount);
- }
-
- virtual const char* name() override { return "DrawLines"; }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- deferInfo.batchId = mPaint->isAntiAlias() ?
- DeferredDisplayList::kOpBatch_AlphaVertices :
- DeferredDisplayList::kOpBatch_Vertices;
- }
-
-protected:
- const float* mPoints;
- int mCount;
-};
-
-class DrawPointsOp : public DrawLinesOp {
-public:
- DrawPointsOp(const float* points, int count, const SkPaint* paint)
- : DrawLinesOp(points, count, paint) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawPoints(mPoints, mCount, mPaint);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Points count %d", mCount);
- }
-
- virtual const char* name() override { return "DrawPoints"; }
-};
-
-class DrawSomeTextOp : public DrawOp {
-public:
- DrawSomeTextOp(const glyph_t* text, int bytesCount, int count, const SkPaint* paint)
- : DrawOp(paint), mText(text), mBytesCount(bytesCount), mCount(count) {};
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw some text, %d bytes", mBytesCount);
- }
-
- virtual bool hasTextShadow() const override {
- return PaintUtils::hasTextShadow(mPaint);
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- FontRenderer& fontRenderer = renderer.getCaches().fontRenderer.getFontRenderer();
- fontRenderer.precache(mPaint, mText, mCount, SkMatrix::I());
-
- deferInfo.batchId = mPaint->getColor() == SK_ColorBLACK ?
- DeferredDisplayList::kOpBatch_Text :
- DeferredDisplayList::kOpBatch_ColorText;
- }
-
-protected:
- const glyph_t* mText;
- int mBytesCount;
- int mCount;
-};
-
-class DrawTextOnPathOp : public DrawSomeTextOp {
-public:
- DrawTextOnPathOp(const glyph_t* text, int bytesCount, int count,
- const SkPath* path, float hOffset, float vOffset, const SkPaint* paint)
- : DrawSomeTextOp(text, bytesCount, count, paint),
- mPath(path), mHOffset(hOffset), mVOffset(vOffset) {
- /* TODO: inherit from DrawBounded and init mLocalBounds */
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawTextOnPath(mText, mBytesCount, mCount, mPath,
- mHOffset, mVOffset, mPaint);
- }
-
- virtual const char* name() override { return "DrawTextOnPath"; }
-
-private:
- const SkPath* mPath;
- float mHOffset;
- float mVOffset;
-};
-
-class DrawTextOp : public DrawStrokableOp {
-public:
- DrawTextOp(const glyph_t* text, int bytesCount, int count, float x, float y,
- const float* positions, const SkPaint* paint, float totalAdvance, const Rect& bounds)
- : DrawStrokableOp(bounds, paint), mText(text), mBytesCount(bytesCount), mCount(count),
- mX(x), mY(y), mPositions(positions), mTotalAdvance(totalAdvance) {
- mPrecacheTransform = SkMatrix::InvalidMatrix();
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- FontRenderer& fontRenderer = renderer.getCaches().fontRenderer.getFontRenderer();
- SkMatrix transform;
- renderer.findBestFontTransform(state.mMatrix, &transform);
- if (mPrecacheTransform != transform) {
- fontRenderer.precache(mPaint, mText, mCount, transform);
- mPrecacheTransform = transform;
- }
- deferInfo.batchId = mPaint->getColor() == SK_ColorBLACK ?
- DeferredDisplayList::kOpBatch_Text :
- DeferredDisplayList::kOpBatch_ColorText;
-
- deferInfo.mergeId = reinterpret_cast<mergeid_t>(mPaint->getColor());
-
- // don't merge decorated text - the decorations won't draw in order
- bool hasDecorations = mPaint->getFlags()
- & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag);
-
- deferInfo.mergeable = state.mMatrix.isPureTranslate()
- && !hasDecorations
- && PaintUtils::getXfermodeDirect(mPaint) == SkXfermode::kSrcOver_Mode;
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- Rect bounds;
- getLocalBounds(bounds);
- renderer.drawText(mText, mBytesCount, mCount, mX, mY,
- mPositions, mPaint, mTotalAdvance, bounds);
- }
-
- virtual void multiDraw(OpenGLRenderer& renderer, Rect& dirty,
- const std::vector<OpStatePair>& ops, const Rect& bounds) override {
- for (unsigned int i = 0; i < ops.size(); i++) {
- const DeferredDisplayState& state = *(ops[i].state);
- DrawOpMode drawOpMode = (i == ops.size() - 1) ? DrawOpMode::kFlush : DrawOpMode::kDefer;
- renderer.restoreDisplayState(state, true); // restore all but the clip
-
- DrawTextOp& op = *((DrawTextOp*)ops[i].op);
- // quickReject() will not occure in drawText() so we can use mLocalBounds
- // directly, we do not need to account for shadow by calling getLocalBounds()
- renderer.drawText(op.mText, op.mBytesCount, op.mCount, op.mX, op.mY,
- op.mPositions, op.mPaint, op.mTotalAdvance, op.mLocalBounds,
- drawOpMode);
- }
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Text of count %d, bytes %d", mCount, mBytesCount);
- }
-
- virtual const char* name() override { return "DrawText"; }
-
-private:
- const glyph_t* mText;
- int mBytesCount;
- int mCount;
- float mX;
- float mY;
- const float* mPositions;
- float mTotalAdvance;
- SkMatrix mPrecacheTransform;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// SPECIAL DRAW OPERATIONS
-///////////////////////////////////////////////////////////////////////////////
-
-class DrawFunctorOp : public DrawOp {
-public:
- DrawFunctorOp(Functor* functor)
- : DrawOp(nullptr), mFunctor(functor) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.startMark("GL functor");
- renderer.callDrawGLFunction(mFunctor, dirty);
- renderer.endMark();
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Functor %p", mFunctor);
- }
-
- virtual const char* name() override { return "DrawFunctor"; }
-
-private:
- Functor* mFunctor;
-};
-
-class DrawRenderNodeOp : public DrawBoundedOp {
- friend class RenderNode; // grant RenderNode access to info of child
- friend class DisplayList; // grant DisplayList access to info of child
- friend class DisplayListCanvas;
- friend class TestUtils;
-public:
- DrawRenderNodeOp(RenderNode* renderNode, const mat4& transformFromParent, bool clipIsSimple)
- : DrawBoundedOp(0, 0,
- renderNode->stagingProperties().getWidth(),
- renderNode->stagingProperties().getHeight(),
- nullptr)
- , renderNode(renderNode)
- , mRecordedWithPotentialStencilClip(!clipIsSimple || !transformFromParent.isSimple())
- , localMatrix(transformFromParent)
- , skipInOrderDraw(false) {}
-
- virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
- bool useQuickReject) override {
- if (renderNode->isRenderable() && !skipInOrderDraw) {
- renderNode->defer(deferStruct, level + 1);
- }
- }
-
- virtual void replay(ReplayStateStruct& replayStruct, int saveCount, int level,
- bool useQuickReject) override {
- if (renderNode->isRenderable() && !skipInOrderDraw) {
- renderNode->replay(replayStruct, level + 1);
- }
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- LOG_ALWAYS_FATAL("should not be called, because replay() is overridden");
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw RenderNode %p %s", renderNode, renderNode->getName());
- if (renderNode && (logFlags & kOpLogFlag_Recurse)) {
- renderNode->output(level + 1);
- }
- }
-
- virtual const char* name() override { return "DrawRenderNode"; }
-
-private:
- RenderNode* renderNode;
-
- /**
- * This RenderNode was drawn into a DisplayList with the canvas in a state that will likely
- * require rendering with stencil clipping. Either:
- *
- * 1) A path clip or rotated rect clip was in effect on the canvas at record time
- * 2) The RenderNode was recorded with a non-simple canvas transform (e.g. rotation)
- *
- * Note: even if this is false, non-rect clipping may still be applied applied either due to
- * property-driven rotation (either in this RenderNode, or any ancestor), or record time
- * clipping in an ancestor. These are handled in RenderNode::prepareTreeImpl since they are
- * dynamic (relative to a static DisplayList of a parent), and don't affect this flag.
- */
- bool mRecordedWithPotentialStencilClip;
-
- ///////////////////////////
- // Properties below are used by RenderNode::computeOrderingImpl() and issueOperations()
- ///////////////////////////
- /**
- * Records transform vs parent, used for computing total transform without rerunning DL contents
- */
- const mat4 localMatrix;
-
- /**
- * Holds the transformation between the projection surface ViewGroup and this RenderNode
- * drawing instance. Represents any translations / transformations done within the drawing of
- * the compositing ancestor ViewGroup's draw, before the draw of the View represented by this
- * DisplayList draw instance.
- *
- * Note: doesn't include transformation within the RenderNode, or its properties.
- */
- mat4 transformFromCompositingAncestor;
- bool skipInOrderDraw;
-};
-
-/**
- * Not a canvas operation, used only by 3d / z ordering logic in RenderNode::iterate()
- */
-class DrawShadowOp : public DrawOp {
-public:
- DrawShadowOp(const mat4& transformXY, const mat4& transformZ,
- float casterAlpha, const SkPath* casterOutline)
- : DrawOp(nullptr)
- , mTransformXY(transformXY)
- , mTransformZ(transformZ)
- , mCasterAlpha(casterAlpha)
- , mCasterOutline(casterOutline) {
- }
-
- virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
- const DeferredDisplayState& state) override {
- renderer.getCaches().tessellationCache.precacheShadows(&state.mMatrix,
- renderer.getLocalClipBounds(), isCasterOpaque(), mCasterOutline,
- &mTransformXY, &mTransformZ, renderer.getLightCenter(), renderer.getLightRadius());
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- TessellationCache::vertexBuffer_pair_t buffers;
- Matrix4 drawTransform(*(renderer.currentTransform()));
- renderer.getCaches().tessellationCache.getShadowBuffers(&drawTransform,
- renderer.getLocalClipBounds(), isCasterOpaque(), mCasterOutline,
- &mTransformXY, &mTransformZ, renderer.getLightCenter(), renderer.getLightRadius(),
- buffers);
-
- renderer.drawShadow(mCasterAlpha, buffers.first, buffers.second);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOGS("DrawShadow");
- }
-
- virtual const char* name() override { return "DrawShadow"; }
-
-private:
- bool isCasterOpaque() { return mCasterAlpha >= 1.0f; }
-
- const mat4 mTransformXY;
- const mat4 mTransformZ;
- const float mCasterAlpha;
- const SkPath* mCasterOutline;
-};
-
-class DrawLayerOp : public DrawOp {
-public:
- DrawLayerOp(Layer* layer)
- : DrawOp(nullptr), mLayer(layer) {}
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawLayer(mLayer);
- }
-
- virtual void output(int level, uint32_t logFlags) const override {
- OP_LOG("Draw Layer %p", mLayer);
- }
-
- virtual const char* name() override { return "DrawLayer"; }
-
-private:
- Layer* mLayer;
-};
-
-}; // namespace uirenderer
-}; // namespace android
-
-#endif // ANDROID_HWUI_DISPLAY_OPERATION_H
diff --git a/libs/hwui/Dither.h b/libs/hwui/Dither.h
index b589b80..6af3e83 100644
--- a/libs/hwui/Dither.h
+++ b/libs/hwui/Dither.h
@@ -37,7 +37,7 @@
*/
class Dither {
public:
- Dither(Caches& caches);
+ explicit Dither(Caches& caches);
void clear();
void setupProgram(Program& program, GLuint* textureUnit);
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 276c18d..25dc92c 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -16,6 +16,9 @@
#include "FontRenderer.h"
+#include "BakedOpDispatcher.h"
+#include "BakedOpRenderer.h"
+#include "BakedOpState.h"
#include "Caches.h"
#include "Debug.h"
#include "Extensions.h"
@@ -27,15 +30,6 @@
#include "utils/Blur.h"
#include "utils/Timing.h"
-
-#if HWUI_NEW_OPS
-#include "BakedOpDispatcher.h"
-#include "BakedOpRenderer.h"
-#include "BakedOpState.h"
-#else
-#include "OpenGLRenderer.h"
-#endif
-
#include <algorithm>
#include <cutils/properties.h>
#include <SkGlyph.h>
@@ -67,7 +61,6 @@
int transformFlags = pureTranslate
? TransformFlags::MeshIgnoresCanvasTransform : TransformFlags::None;
Glop glop;
-#if HWUI_NEW_OPS
GlopBuilder(renderer->renderState(), renderer->caches(), &glop)
.setRoundRectClipState(bakedState->roundRectClipState)
.setMeshTexturedIndexedQuads(texture.mesh(), texture.meshElementCount())
@@ -77,16 +70,6 @@
.build();
// Note: don't pass dirty bounds here, so user must manage passing dirty bounds to renderer
renderer->renderGlop(nullptr, clip, glop);
-#else
- GlopBuilder(renderer->mRenderState, renderer->mCaches, &glop)
- .setRoundRectClipState(renderer->currentSnapshot()->roundRectClipState)
- .setMeshTexturedIndexedQuads(texture.mesh(), texture.meshElementCount())
- .setFillTexturePaint(texture.getTexture(), textureFillFlags, paint, renderer->currentSnapshot()->alpha)
- .setTransform(*(renderer->currentSnapshot()), transformFlags)
- .setModelViewOffsetRect(0, 0, Rect())
- .build();
- renderer->renderGlop(glop);
-#endif
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/libs/hwui/FontRenderer.h b/libs/hwui/FontRenderer.h
index e10a81b..dedc494 100644
--- a/libs/hwui/FontRenderer.h
+++ b/libs/hwui/FontRenderer.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_FONT_RENDERER_H
-#define ANDROID_HWUI_FONT_RENDERER_H
+#pragma once
#include "font/FontUtil.h"
#include "font/CacheTexture.h"
@@ -44,31 +43,21 @@
namespace android {
namespace uirenderer {
-#if HWUI_NEW_OPS
class BakedOpState;
class BakedOpRenderer;
struct ClipBase;
-#else
-class OpenGLRenderer;
-#endif
class TextDrawFunctor {
public:
TextDrawFunctor(
-#if HWUI_NEW_OPS
BakedOpRenderer* renderer,
const BakedOpState* bakedState,
const ClipBase* clip,
-#else
- OpenGLRenderer* renderer,
-#endif
float x, float y, bool pureTranslate,
int alpha, SkXfermode::Mode mode, const SkPaint* paint)
: renderer(renderer)
-#if HWUI_NEW_OPS
, bakedState(bakedState)
, clip(clip)
-#endif
, x(x)
, y(y)
, pureTranslate(pureTranslate)
@@ -79,13 +68,9 @@
void draw(CacheTexture& texture, bool linearFiltering);
-#if HWUI_NEW_OPS
BakedOpRenderer* renderer;
const BakedOpState* bakedState;
const ClipBase* clip;
-#else
- OpenGLRenderer* renderer;
-#endif
float x;
float y;
bool pureTranslate;
@@ -218,5 +203,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_FONT_RENDERER_H
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index 37d9d0e7..be4fdac 100644
--- a/libs/hwui/FrameBuilder.cpp
+++ b/libs/hwui/FrameBuilder.cpp
@@ -477,7 +477,7 @@
projectionReceiverOutline->transform(
skCurrentTransform,
&transformedMaskPath);
- mCanvasState.setProjectionPathMask(mAllocator, &transformedMaskPath);
+ mCanvasState.setProjectionPathMask(&transformedMaskPath);
}
for (size_t i = 0; i < renderNode.mProjectedNodes.size(); i++) {
diff --git a/libs/hwui/FrameInfo.cpp b/libs/hwui/FrameInfo.cpp
index 41e2233..09b3945 100644
--- a/libs/hwui/FrameInfo.cpp
+++ b/libs/hwui/FrameInfo.cpp
@@ -35,8 +35,14 @@
"IssueDrawCommandsStart",
"SwapBuffers",
"FrameCompleted",
+ "DequeueBufferDuration",
+ "QueueBufferDuration",
};
+static_assert((sizeof(FrameInfoNames)/sizeof(FrameInfoNames[0]))
+ == static_cast<int>(FrameInfoIndex::NumIndexes),
+ "size mismatch: FrameInfoNames doesn't match the enum!");
+
void FrameInfo::importUiThreadInfo(int64_t* info) {
memcpy(mFrameInfo, info, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t));
}
diff --git a/libs/hwui/FrameInfo.h b/libs/hwui/FrameInfo.h
index 0baca39..993b158 100644
--- a/libs/hwui/FrameInfo.h
+++ b/libs/hwui/FrameInfo.h
@@ -48,6 +48,9 @@
SwapBuffers,
FrameCompleted,
+ DequeueBufferDuration,
+ QueueBufferDuration,
+
// Must be the last value!
NumIndexes
};
@@ -65,7 +68,7 @@
class ANDROID_API UiFrameInfoBuilder {
public:
- UiFrameInfoBuilder(int64_t* buffer) : mBuffer(buffer) {
+ explicit UiFrameInfoBuilder(int64_t* buffer) : mBuffer(buffer) {
memset(mBuffer, 0, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t));
}
diff --git a/libs/hwui/FrameInfoVisualizer.cpp b/libs/hwui/FrameInfoVisualizer.cpp
index adadd32..570322d 100644
--- a/libs/hwui/FrameInfoVisualizer.cpp
+++ b/libs/hwui/FrameInfoVisualizer.cpp
@@ -15,11 +15,7 @@
*/
#include "FrameInfoVisualizer.h"
-#if HWUI_NEW_OPS
#include "BakedOpRenderer.h"
-#else
-#include "OpenGLRenderer.h"
-#endif
#include "utils/Color.h"
#include <cutils/compiler.h>
diff --git a/libs/hwui/FrameInfoVisualizer.h b/libs/hwui/FrameInfoVisualizer.h
index 83adf19..d60c002 100644
--- a/libs/hwui/FrameInfoVisualizer.h
+++ b/libs/hwui/FrameInfoVisualizer.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef DRAWPROFILER_H
-#define DRAWPROFILER_H
+
+#pragma once
#include "FrameInfo.h"
#include "Properties.h"
@@ -28,13 +28,8 @@
namespace android {
namespace uirenderer {
-#if HWUI_NEW_OPS
class BakedOpRenderer;
typedef BakedOpRenderer ContentRenderer;
-#else
-class OpenGLRenderer;
-typedef OpenGLRenderer ContentRenderer;
-#endif
// TODO: This is a bit awkward as it needs to match the thing in CanvasContext
// A better abstraction here would be nice but iterators are painful
@@ -45,7 +40,7 @@
class FrameInfoVisualizer {
public:
- FrameInfoVisualizer(FrameInfoSource& source);
+ explicit FrameInfoVisualizer(FrameInfoSource& source);
~FrameInfoVisualizer();
bool consumeProperties();
@@ -93,5 +88,3 @@
} /* namespace uirenderer */
} /* namespace android */
-
-#endif /* DRAWPROFILER_H */
diff --git a/libs/hwui/Glop.h b/libs/hwui/Glop.h
index 6433c86..46dd598 100644
--- a/libs/hwui/Glop.h
+++ b/libs/hwui/Glop.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_GLOP_H
-#define ANDROID_HWUI_GLOP_H
+#pragma once
#include "FloatColor.h"
#include "Matrix.h"
@@ -68,7 +67,7 @@
OffsetByFudgeFactor = 1 << 0,
// Canvas transform isn't applied to the mesh at draw time,
- //since it's already built in.
+ // since it's already built in.
MeshIgnoresCanvasTransform = 1 << 1, // TODO: remove for HWUI_NEW_OPS
};
};
@@ -168,14 +167,6 @@
GLenum dst;
} blend;
-#if !HWUI_NEW_OPS
- /**
- * Bounds of the drawing command in layer space. Only mapped into layer
- * space once GlopBuilder::build() is called.
- */
- Rect bounds; // TODO: remove for HWUI_NEW_OPS
-#endif
-
/**
* Additional render state to enumerate:
* - scissor + (bits for whether each of LTRB needed?)
@@ -185,5 +176,3 @@
} /* namespace uirenderer */
} /* namespace android */
-
-#endif // ANDROID_HWUI_GLOP_H
diff --git a/libs/hwui/GlopBuilder.cpp b/libs/hwui/GlopBuilder.cpp
index e502725..1091736 100644
--- a/libs/hwui/GlopBuilder.cpp
+++ b/libs/hwui/GlopBuilder.cpp
@@ -17,8 +17,10 @@
#include "Caches.h"
#include "Glop.h"
+#include "Layer.h"
#include "Matrix.h"
#include "Patch.h"
+#include "PathCache.h"
#include "renderstate/MeshState.h"
#include "renderstate/RenderState.h"
#include "SkiaShader.h"
@@ -165,20 +167,6 @@
return *this;
}
-GlopBuilder& GlopBuilder::setMeshTexturedMesh(TextureVertex* vertexData, int elementCount) {
- TRIGGER_STAGE(kMeshStage);
-
- mOutGlop->mesh.primitiveMode = GL_TRIANGLES;
- mOutGlop->mesh.indices = { 0, nullptr };
- mOutGlop->mesh.vertices = {
- 0,
- VertexAttribFlags::TextureCoord,
- &vertexData[0].x, &vertexData[0].u, nullptr,
- kTextureVertexStride };
- mOutGlop->mesh.elementCount = elementCount;
- return *this;
-}
-
GlopBuilder& GlopBuilder::setMeshColoredTexturedMesh(ColorTextureVertex* vertexData, int elementCount) {
TRIGGER_STAGE(kMeshStage);
@@ -514,9 +502,6 @@
mOutGlop->transform.modelView.loadTranslate(destination.left, destination.top, 0.0f);
mOutGlop->transform.modelView.scale(destination.getWidth(), destination.getHeight(), 1.0f);
-#if !HWUI_NEW_OPS
- mOutGlop->bounds = destination;
-#endif
return *this;
}
@@ -540,9 +525,6 @@
mOutGlop->transform.modelView.loadTranslate(left, top, 0.0f);
mOutGlop->transform.modelView.scale(destination.getWidth(), destination.getHeight(), 1.0f);
-#if !HWUI_NEW_OPS
- mOutGlop->bounds = destination;
-#endif
return *this;
}
@@ -550,10 +532,6 @@
TRIGGER_STAGE(kModelViewStage);
mOutGlop->transform.modelView.loadTranslate(offsetX, offsetY, 0.0f);
-#if !HWUI_NEW_OPS
- mOutGlop->bounds = source;
- mOutGlop->bounds.translate(offsetX, offsetY);
-#endif
return *this;
}
@@ -573,10 +551,6 @@
}
mOutGlop->transform.modelView.loadTranslate(offsetX, offsetY, 0.0f);
-#if !HWUI_NEW_OPS
- mOutGlop->bounds = source;
- mOutGlop->bounds.translate(offsetX, offsetY);
-#endif
return *this;
}
@@ -676,9 +650,6 @@
// Final step: populate program and map bounds into render target space
mOutGlop->fill.program = mCaches.programCache.get(mDescription);
-#if !HWUI_NEW_OPS
- mOutGlop->transform.meshTransform().mapRect(mOutGlop->bounds);
-#endif
}
void GlopBuilder::dump(const Glop& glop) {
@@ -718,9 +689,6 @@
ALOGD_IF(glop.roundRectClipState, "Glop RRCS %p", glop.roundRectClipState);
ALOGD("Glop blend %d %d", glop.blend.src, glop.blend.dst);
-#if !HWUI_NEW_OPS
- ALOGD("Glop bounds " RECT_STRING, RECT_ARGS(glop.bounds));
-#endif
}
} /* namespace uirenderer */
diff --git a/libs/hwui/GlopBuilder.h b/libs/hwui/GlopBuilder.h
index 1c520c2..1152461 100644
--- a/libs/hwui/GlopBuilder.h
+++ b/libs/hwui/GlopBuilder.h
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef RENDERSTATE_GLOPBUILDER_H
-#define RENDERSTATE_GLOPBUILDER_H
+
+#pragma once
#include "Glop.h"
-#include "OpenGLRenderer.h"
#include "Program.h"
#include "renderstate/Blend.h"
#include "utils/Macros.h"
@@ -30,9 +29,13 @@
class Caches;
class Matrix4;
+class Patch;
class RenderState;
class Texture;
+class UvMapper;
class VertexBuffer;
+struct PathTexture;
+struct ShadowTexture;
namespace TextureFillFlags {
enum {
@@ -53,7 +56,6 @@
GlopBuilder& setMeshTexturedUvQuad(const UvMapper* uvMapper, const Rect uvs);
GlopBuilder& setMeshVertexBuffer(const VertexBuffer& vertexBuffer);
GlopBuilder& setMeshIndexedQuads(Vertex* vertexData, int quadCount);
- GlopBuilder& setMeshTexturedMesh(TextureVertex* vertexData, int elementCount); // TODO: delete
GlopBuilder& setMeshColoredTexturedMesh(ColorTextureVertex* vertexData, int elementCount); // TODO: use indexed quads
GlopBuilder& setMeshTexturedIndexedQuads(TextureVertex* vertexData, int elementCount); // TODO: take quadCount
GlopBuilder& setMeshPatchQuads(const Patch& patch);
@@ -75,9 +77,6 @@
// Similarly setFillLayer normally forces its own wrap & filter mode
GlopBuilder& setFillExternalTexture(Texture& texture, Matrix4& textureTransform);
- GlopBuilder& setTransform(const Snapshot& snapshot, const int transformFlags) {
- return setTransform(*snapshot.transform, transformFlags);
- }
GlopBuilder& setTransform(const Matrix4& canvas, const int transformFlags);
GlopBuilder& setModelViewMapUnitToRect(const Rect destination);
@@ -133,5 +132,3 @@
} /* namespace uirenderer */
} /* namespace android */
-
-#endif // RENDERSTATE_GLOPBUILDER_H
diff --git a/libs/hwui/GradientCache.h b/libs/hwui/GradientCache.h
index dccd450..49be19a 100644
--- a/libs/hwui/GradientCache.h
+++ b/libs/hwui/GradientCache.h
@@ -103,7 +103,7 @@
*/
class GradientCache: public OnEntryRemoved<GradientCacheEntry, Texture*> {
public:
- GradientCache(Extensions& extensions);
+ explicit GradientCache(Extensions& extensions);
~GradientCache();
/**
diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index ebe9c42..ed6b211 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -16,6 +16,7 @@
#include "JankTracker.h"
#include "Properties.h"
+#include "utils/TimeUtils.h"
#include <algorithm>
#include <cutils/ashmem.h>
@@ -119,11 +120,27 @@
return index;
}
-JankTracker::JankTracker(nsecs_t frameIntervalNanos) {
+JankTracker::JankTracker(const DisplayInfo& displayInfo) {
// By default this will use malloc memory. It may be moved later to ashmem
// if there is shared space for it and a request comes in to do that.
mData = new ProfileData;
reset();
+ nsecs_t frameIntervalNanos = static_cast<nsecs_t>(1_s / displayInfo.fps);
+#if USE_HWC2
+ nsecs_t sfOffset = frameIntervalNanos - (displayInfo.presentationDeadline - 1_ms);
+ nsecs_t offsetDelta = sfOffset - displayInfo.appVsyncOffset;
+ // There are two different offset cases. If the offsetDelta is positive
+ // and small, then the intention is to give apps extra time by leveraging
+ // pipelining between the UI & RT threads. If the offsetDelta is large or
+ // negative, the intention is to subtract time from the total duration
+ // in which case we can't afford to wait for dequeueBuffer blockage.
+ if (offsetDelta <= 4_ms && offsetDelta >= 0) {
+ // SF will begin composition at VSYNC-app + offsetDelta. If we are triple
+ // buffered, this is the expected time at which dequeueBuffer will
+ // return due to the staggering of VSYNC-app & VSYNC-sf.
+ mDequeueTimeForgiveness = offsetDelta + 4_ms;
+ }
+#endif
setFrameInterval(frameIntervalNanos);
}
@@ -213,6 +230,19 @@
mData->totalFrameCount++;
// Fast-path for jank-free frames
int64_t totalDuration = frame.duration(sFrameStart, FrameInfoIndex::FrameCompleted);
+ if (mDequeueTimeForgiveness
+ && frame[FrameInfoIndex::DequeueBufferDuration] > 500_us) {
+ nsecs_t expectedDequeueDuration =
+ mDequeueTimeForgiveness + frame[FrameInfoIndex::Vsync]
+ - frame[FrameInfoIndex::IssueDrawCommandsStart];
+ if (expectedDequeueDuration > 0) {
+ // Forgive only up to the expected amount, but not more than
+ // the actual time spent blocked.
+ nsecs_t forgiveAmount = std::min(expectedDequeueDuration,
+ frame[FrameInfoIndex::DequeueBufferDuration]);
+ totalDuration -= forgiveAmount;
+ }
+ }
uint32_t framebucket = frameCountIndexForFrameTime(totalDuration);
// Keep the fast path as fast as possible.
if (CC_LIKELY(totalDuration < mFrameInterval)) {
diff --git a/libs/hwui/JankTracker.h b/libs/hwui/JankTracker.h
index 84b8c3f..8b482d5 100644
--- a/libs/hwui/JankTracker.h
+++ b/libs/hwui/JankTracker.h
@@ -21,6 +21,7 @@
#include "utils/RingBuffer.h"
#include <cutils/compiler.h>
+#include <ui/DisplayInfo.h>
#include <array>
#include <memory>
@@ -56,7 +57,7 @@
// TODO: Replace DrawProfiler with this
class JankTracker {
public:
- JankTracker(nsecs_t frameIntervalNanos);
+ explicit JankTracker(const DisplayInfo& displayInfo);
~JankTracker();
void addFrame(const FrameInfo& frame);
@@ -79,6 +80,14 @@
std::array<int64_t, NUM_BUCKETS> mThresholds;
int64_t mFrameInterval;
+ // The amount of time we will erase from the total duration to account
+ // for SF vsync offsets with HWC2 blocking dequeueBuffers.
+ // (Vsync + mDequeueBlockTolerance) is the point at which we expect
+ // SF to have released the buffer normally, so we will forgive up to that
+ // point in time by comparing to (IssueDrawCommandsStart + DequeueDuration)
+ // This is only used if we are in pipelined mode and are using HWC2,
+ // otherwise it's 0.
+ nsecs_t mDequeueTimeForgiveness = 0;
ProfileData* mData;
bool mIsMapped = false;
};
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index cdbbbab..4e12bce 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -17,9 +17,6 @@
#include "Layer.h"
#include "Caches.h"
-#include "DeferredDisplayList.h"
-#include "LayerRenderer.h"
-#include "OpenGLRenderer.h"
#include "RenderNode.h"
#include "renderstate/RenderState.h"
#include "utils/TraceUtils.h"
@@ -35,17 +32,16 @@
namespace android {
namespace uirenderer {
-Layer::Layer(Type layerType, RenderState& renderState, uint32_t layerWidth, uint32_t layerHeight)
+Layer::Layer(RenderState& renderState, uint32_t layerWidth, uint32_t layerHeight)
: GpuMemoryTracker(GpuObjectType::Layer)
, state(State::Uncached)
, caches(Caches::getInstance())
, renderState(renderState)
- , texture(caches)
- , type(layerType) {
+ , texture(caches) {
// TODO: This is a violation of Android's typical ref counting, but it
// preserves the old inc/dec ref locations. This should be changed...
incStrong(nullptr);
- renderTarget = GL_TEXTURE_2D;
+ renderTarget = GL_NONE; // see DeferredLayerUpdater::updateLayer()
texture.mWidth = layerWidth;
texture.mHeight = layerHeight;
renderState.registerLayer(this);
@@ -55,125 +51,15 @@
renderState.unregisterLayer(this);
SkSafeUnref(colorFilter);
- if (stencil || fbo || texture.mId) {
- removeFbo();
+ if (texture.mId) {
texture.deleteTexture();
}
-
- delete[] mesh;
}
void Layer::onGlContextLost() {
- removeFbo();
texture.deleteTexture();
}
-uint32_t Layer::computeIdealWidth(uint32_t layerWidth) {
- return uint32_t(ceilf(layerWidth / float(LAYER_SIZE)) * LAYER_SIZE);
-}
-
-uint32_t Layer::computeIdealHeight(uint32_t layerHeight) {
- return uint32_t(ceilf(layerHeight / float(LAYER_SIZE)) * LAYER_SIZE);
-}
-
-void Layer::requireRenderer() {
- if (!renderer) {
- renderer.reset(new LayerRenderer(renderState, this));
- renderer->initProperties();
- }
-}
-
-void Layer::updateLightPosFromRenderer(const OpenGLRenderer& rootRenderer) {
- if (renderer && rendererLightPosDirty) {
- // re-init renderer's light position, based upon last cached location in window
- Vector3 lightPos = rootRenderer.getLightCenter();
- cachedInvTransformInWindow.mapPoint3d(lightPos);
- renderer->initLight(rootRenderer.getLightRadius(),
- rootRenderer.getAmbientShadowAlpha(),
- rootRenderer.getSpotShadowAlpha());
- renderer->setLightCenter(lightPos);
- rendererLightPosDirty = false;
- }
-}
-
-bool Layer::resize(const uint32_t width, const uint32_t height) {
- uint32_t desiredWidth = computeIdealWidth(width);
- uint32_t desiredHeight = computeIdealWidth(height);
-
- if (desiredWidth <= getWidth() && desiredHeight <= getHeight()) {
- return true;
- }
-
- ATRACE_NAME("resizeLayer");
-
- const uint32_t maxTextureSize = caches.maxTextureSize;
- if (desiredWidth > maxTextureSize || desiredHeight > maxTextureSize) {
- ALOGW("Layer exceeds max. dimensions supported by the GPU (%dx%d, max=%dx%d)",
- desiredWidth, desiredHeight, maxTextureSize, maxTextureSize);
- return false;
- }
-
- uint32_t oldWidth = getWidth();
- uint32_t oldHeight = getHeight();
-
- setSize(desiredWidth, desiredHeight);
-
- if (fbo) {
- caches.textureState().activateTexture(0);
- bindTexture();
- allocateTexture();
-
- if (glGetError() != GL_NO_ERROR) {
- setSize(oldWidth, oldHeight);
- return false;
- }
- }
-
- if (stencil) {
- stencil->bind();
- stencil->resize(desiredWidth, desiredHeight);
-
- if (glGetError() != GL_NO_ERROR) {
- setSize(oldWidth, oldHeight);
- return false;
- }
- }
-
- return true;
-}
-
-void Layer::removeFbo(bool flush) {
- if (stencil) {
- GLuint previousFbo = renderState.getFramebuffer();
- renderState.bindFramebuffer(fbo);
- glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);
- renderState.bindFramebuffer(previousFbo);
-
- caches.renderBufferCache.put(stencil);
- stencil = nullptr;
- }
-
- if (fbo) {
- if (flush) LayerRenderer::flushLayer(renderState, this);
- renderState.deleteFramebuffer(fbo);
- fbo = 0;
- }
-}
-
-void Layer::updateDeferred(RenderNode* renderNode, int left, int top, int right, int bottom) {
- requireRenderer();
- this->renderNode = renderNode;
- const Rect r(left, top, right, bottom);
- dirtyRect.unionWith(r);
- deferredUpdateScheduled = true;
-}
-
-void Layer::setPaint(const SkPaint* paint) {
- alpha = PaintUtils::getAlphaDirect(paint);
- mode = PaintUtils::getXfermodeDirect(paint);
- setColorFilter((paint) ? paint->getColorFilter() : nullptr);
-}
-
void Layer::setColorFilter(SkColorFilter* filter) {
SkRefCnt_SafeAssign(colorFilter, filter);
}
@@ -184,12 +70,6 @@
}
}
-void Layer::bindStencilRenderBuffer() const {
- if (stencil) {
- stencil->bind();
- }
-}
-
void Layer::generateTexture() {
if (!texture.mId) {
glGenTextures(1, &texture.mId);
@@ -206,86 +86,6 @@
texture.mId = 0;
}
-void Layer::allocateTexture() {
-#if DEBUG_LAYERS
- ALOGD(" Allocate layer: %dx%d", getWidth(), getHeight());
-#endif
- if (texture.mId) {
- texture.updateSize(getWidth(), getHeight(), GL_RGBA);
- glTexImage2D(renderTarget, 0, GL_RGBA, getWidth(), getHeight(), 0,
- GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
- }
-}
-
-void Layer::defer(const OpenGLRenderer& rootRenderer) {
- ATRACE_LAYER_WORK("Optimize");
-
- updateLightPosFromRenderer(rootRenderer);
- const float width = layer.getWidth();
- const float height = layer.getHeight();
-
- if (dirtyRect.isEmpty() || (dirtyRect.left <= 0 && dirtyRect.top <= 0 &&
- dirtyRect.right >= width && dirtyRect.bottom >= height)) {
- dirtyRect.set(0, 0, width, height);
- }
-
- deferredList.reset(new DeferredDisplayList(dirtyRect));
-
- DeferStateStruct deferredState(*deferredList, *renderer,
- RenderNode::kReplayFlag_ClipChildren);
-
- renderer->setupFrameState(width, height, dirtyRect.left, dirtyRect.top,
- dirtyRect.right, dirtyRect.bottom, !isBlend());
-
- renderNode->computeOrdering();
- renderNode->defer(deferredState, 0);
-
- deferredUpdateScheduled = false;
-}
-
-void Layer::cancelDefer() {
- renderNode = nullptr;
- deferredUpdateScheduled = false;
- deferredList.reset(nullptr);
-}
-
-void Layer::flush() {
- // renderer is checked as layer may be destroyed/put in layer cache with flush scheduled
- if (deferredList && renderer) {
- ATRACE_LAYER_WORK("Issue");
- renderer->startMark((renderNode.get() != nullptr) ? renderNode->getName() : "Layer");
-
- renderer->prepareDirty(layer.getWidth(), layer.getHeight(),
- dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom, !isBlend());
-
- deferredList->flush(*renderer, dirtyRect);
-
- renderer->finish();
-
- dirtyRect.setEmpty();
- renderNode = nullptr;
-
- renderer->endMark();
- }
-}
-
-void Layer::render(const OpenGLRenderer& rootRenderer) {
- ATRACE_LAYER_WORK("Direct-Issue");
-
- updateLightPosFromRenderer(rootRenderer);
- renderer->prepareDirty(layer.getWidth(), layer.getHeight(),
- dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom, !isBlend());
-
- renderer->drawRenderNode(renderNode.get(), dirtyRect, RenderNode::kReplayFlag_ClipChildren);
-
- renderer->finish();
-
- dirtyRect.setEmpty();
-
- deferredUpdateScheduled = false;
- renderNode = nullptr;
-}
-
void Layer::postDecStrong() {
renderState.postDecStrong(this);
}
diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h
index 1e5498b..c688a96 100644
--- a/libs/hwui/Layer.h
+++ b/libs/hwui/Layer.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_LAYER_H
-#define ANDROID_HWUI_LAYER_H
+#pragma once
#include <cutils/compiler.h>
#include <sys/types.h>
@@ -46,22 +45,13 @@
// Forward declarations
class Caches;
-class RenderNode;
class RenderState;
-class OpenGLRenderer;
-class DeferredDisplayList;
-struct DeferStateStruct;
/**
* A layer has dimensions and is backed by an OpenGL texture or FBO.
*/
class Layer : public VirtualLightRefBase, GpuMemoryTracker {
public:
- enum class Type {
- Texture,
- DisplayList,
- };
-
// layer lifecycle, controlled from outside
enum class State {
Uncached = 0,
@@ -73,45 +63,9 @@
};
State state; // public for logging/debugging purposes
- Layer(Type type, RenderState& renderState, uint32_t layerWidth, uint32_t layerHeight);
+ Layer(RenderState& renderState, uint32_t layerWidth, uint32_t layerHeight);
~Layer();
- static uint32_t computeIdealWidth(uint32_t layerWidth);
- static uint32_t computeIdealHeight(uint32_t layerHeight);
-
- /**
- * Calling this method will remove (either by recycling or
- * destroying) the associated FBO, if present, and any render
- * buffer (stencil for instance.)
- */
- void removeFbo(bool flush = true);
-
- /**
- * Sets this layer's region to a rectangle. Computes the appropriate
- * texture coordinates.
- */
- void setRegionAsRect() {
- const android::Rect& bounds = region.getBounds();
- regionRect.set(bounds.leftTop().x, bounds.leftTop().y,
- bounds.rightBottom().x, bounds.rightBottom().y);
-
- const float texX = 1.0f / float(texture.mWidth);
- const float texY = 1.0f / float(texture.mHeight);
- const float height = layer.getHeight();
- texCoords.set(
- regionRect.left * texX, (height - regionRect.top) * texY,
- regionRect.right * texX, (height - regionRect.bottom) * texY);
-
- regionRect.translate(layer.left, layer.top);
- }
-
- void setWindowTransform(Matrix4& windowTransform) {
- cachedInvTransformInWindow.loadInverse(windowTransform);
- rendererLightPosDirty = true;
- }
-
- void updateDeferred(RenderNode* renderNode, int left, int top, int right, int bottom);
-
inline uint32_t getWidth() const {
return texture.mWidth;
}
@@ -120,23 +74,10 @@
return texture.mHeight;
}
- /**
- * Resize the layer and its texture if needed.
- *
- * @param width The new width of the layer
- * @param height The new height of the layer
- *
- * @return True if the layer was resized or nothing happened, false if
- * a failure occurred during the resizing operation
- */
- bool resize(const uint32_t width, const uint32_t height);
-
void setSize(uint32_t width, uint32_t height) {
texture.updateSize(width, height, texture.format());
}
- ANDROID_API void setPaint(const SkPaint* paint);
-
inline void setBlend(bool blend) {
texture.blend = blend;
}
@@ -170,36 +111,6 @@
return mode;
}
- inline void setEmpty(bool empty) {
- this->empty = empty;
- }
-
- inline bool isEmpty() const {
- return empty;
- }
-
- inline void setFbo(GLuint fbo) {
- this->fbo = fbo;
- }
-
- inline GLuint getFbo() const {
- return fbo;
- }
-
- inline void setStencilRenderBuffer(RenderBuffer* renderBuffer) {
- if (RenderBuffer::isStencilBuffer(renderBuffer->getFormat())) {
- this->stencil = renderBuffer;
- glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
- GL_RENDERBUFFER, stencil->getName());
- } else {
- ALOGE("The specified render buffer is not a stencil buffer");
- }
- }
-
- inline RenderBuffer* getStencilRenderBuffer() const {
- return stencil;
- }
-
inline GLuint getTextureId() const {
return texture.id();
}
@@ -228,52 +139,21 @@
texture.setFilter(filter, bindTexture, force, renderTarget);
}
- inline bool isCacheable() const {
- return cacheable;
- }
-
- inline void setCacheable(bool cacheable) {
- this->cacheable = cacheable;
- }
-
- inline bool isDirty() const {
- return dirty;
- }
-
- inline void setDirty(bool dirty) {
- this->dirty = dirty;
- }
-
- inline bool isTextureLayer() const {
- return type == Type::Texture;
- }
-
inline SkColorFilter* getColorFilter() const {
return colorFilter;
}
- ANDROID_API void setColorFilter(SkColorFilter* filter);
-
- inline void setConvexMask(const SkPath* convexMask) {
- this->convexMask = convexMask;
- }
-
- inline const SkPath* getConvexMask() {
- return convexMask;
- }
-
- void bindStencilRenderBuffer() const;
+ void setColorFilter(SkColorFilter* filter);
void bindTexture() const;
void generateTexture();
- void allocateTexture();
/**
* When the caller frees the texture itself, the caller
* must call this method to tell this layer that it lost
* the texture.
*/
- ANDROID_API void clearTexture();
+ void clearTexture();
inline mat4& getTexTransform() {
return texTransform;
@@ -283,11 +163,6 @@
return transform;
}
- void defer(const OpenGLRenderer& rootRenderer);
- void cancelDefer();
- void flush();
- void render(const OpenGLRenderer& rootRenderer);
-
/**
* Posts a decStrong call to the appropriate thread.
* Thread-safe.
@@ -300,93 +175,17 @@
*/
void onGlContextLost();
- /**
- * Bounds of the layer.
- */
- Rect layer;
- /**
- * Texture coordinates of the layer.
- */
- Rect texCoords;
- /**
- * Clipping rectangle.
- */
- Rect clipRect;
-
- /**
- * Dirty region indicating what parts of the layer
- * have been drawn.
- */
- Region region;
- /**
- * If the region is a rectangle, coordinates of the
- * region are stored here.
- */
- Rect regionRect;
-
- /**
- * If the layer can be rendered as a mesh, this is non-null.
- */
- TextureVertex* mesh = nullptr;
- GLsizei meshElementCount = 0;
-
- /**
- * Used for deferred updates.
- */
- bool deferredUpdateScheduled = false;
- std::unique_ptr<OpenGLRenderer> renderer;
- sp<RenderNode> renderNode;
- Rect dirtyRect;
- bool debugDrawUpdate = false;
- bool hasDrawnSinceUpdate = false;
- bool wasBuildLayered = false;
-
private:
- void requireRenderer();
- void updateLightPosFromRenderer(const OpenGLRenderer& rootRenderer);
-
Caches& caches;
RenderState& renderState;
/**
- * Name of the FBO used to render the layer. If the name is 0
- * this layer is not backed by an FBO, but a simple texture.
- */
- GLuint fbo = 0;
-
- /**
- * The render buffer used as the stencil buffer.
- */
- RenderBuffer* stencil = nullptr;
-
- /**
- * Indicates whether this layer has been used already.
- */
- bool empty = true;
-
- /**
* The texture backing this layer.
*/
Texture texture;
/**
- * If set to true (by default), the layer can be reused.
- */
- bool cacheable = true;
-
- /**
- * Denotes whether the layer is a DisplayList, or Texture layer.
- */
- const Type type;
-
- /**
- * When set to true, this layer is dirty and should be cleared
- * before any rendering occurs.
- */
- bool dirty = false;
-
- /**
* Indicates the render target.
*/
GLenum renderTarget = GL_TEXTURE_2D;
@@ -421,28 +220,7 @@
*/
mat4 transform;
- /**
- * Cached transform of layer in window, updated only on creation / resize
- */
- mat4 cachedInvTransformInWindow;
- bool rendererLightPosDirty = true;
-
- /**
- * Used to defer display lists when the layer is updated with a
- * display list.
- */
- std::unique_ptr<DeferredDisplayList> deferredList;
-
- /**
- * This convex path should be used to mask the layer's draw to the screen.
- *
- * Data not owned/managed by layer object.
- */
- const SkPath* convexMask = nullptr;
-
}; // struct Layer
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_LAYER_H
diff --git a/libs/hwui/LayerCache.cpp b/libs/hwui/LayerCache.cpp
deleted file mode 100644
index f5681ce..0000000
--- a/libs/hwui/LayerCache.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LayerCache.h"
-
-#include "Caches.h"
-#include "Properties.h"
-
-#include <utils/Log.h>
-
-#include <GLES2/gl2.h>
-
-namespace android {
-namespace uirenderer {
-
-///////////////////////////////////////////////////////////////////////////////
-// Constructors/destructor
-///////////////////////////////////////////////////////////////////////////////
-
-LayerCache::LayerCache()
- : mSize(0)
- , mMaxSize(Properties::layerPoolSize) {}
-
-LayerCache::~LayerCache() {
- clear();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Size management
-///////////////////////////////////////////////////////////////////////////////
-
-size_t LayerCache::getCount() {
- return mCache.size();
-}
-
-uint32_t LayerCache::getSize() {
- return mSize;
-}
-
-uint32_t LayerCache::getMaxSize() {
- return mMaxSize;
-}
-
-void LayerCache::setMaxSize(uint32_t maxSize) {
- clear();
- mMaxSize = maxSize;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Caching
-///////////////////////////////////////////////////////////////////////////////
-
-int LayerCache::LayerEntry::compare(const LayerCache::LayerEntry& lhs,
- const LayerCache::LayerEntry& rhs) {
- int deltaInt = int(lhs.mWidth) - int(rhs.mWidth);
- if (deltaInt != 0) return deltaInt;
-
- return int(lhs.mHeight) - int(rhs.mHeight);
-}
-
-void LayerCache::deleteLayer(Layer* layer) {
- if (layer) {
- LAYER_LOGD("Destroying layer %dx%d, fbo %d", layer->getWidth(), layer->getHeight(),
- layer->getFbo());
- mSize -= layer->getWidth() * layer->getHeight() * 4;
- layer->state = Layer::State::DeletedFromCache;
- layer->decStrong(nullptr);
- }
-}
-
-void LayerCache::clear() {
- for (auto entry : mCache) {
- deleteLayer(entry.mLayer);
- }
- mCache.clear();
-}
-
-Layer* LayerCache::get(RenderState& renderState, const uint32_t width, const uint32_t height) {
- Layer* layer = nullptr;
-
- LayerEntry entry(width, height);
- auto iter = mCache.find(entry);
-
- if (iter != mCache.end()) {
- entry = *iter;
- mCache.erase(iter);
-
- layer = entry.mLayer;
- layer->state = Layer::State::RemovedFromCache;
- mSize -= layer->getWidth() * layer->getHeight() * 4;
-
- LAYER_LOGD("Reusing layer %dx%d", layer->getWidth(), layer->getHeight());
- } else {
- LAYER_LOGD("Creating new layer %dx%d", entry.mWidth, entry.mHeight);
-
- layer = new Layer(Layer::Type::DisplayList, renderState, entry.mWidth, entry.mHeight);
- layer->setBlend(true);
- layer->generateTexture();
- layer->bindTexture();
- layer->setFilter(GL_NEAREST);
- layer->setWrap(GL_CLAMP_TO_EDGE, false);
-
-#if DEBUG_LAYERS
- dump();
-#endif
- }
-
- return layer;
-}
-
-void LayerCache::dump() {
- for (auto entry : mCache) {
- ALOGD(" Layer size %dx%d", entry.mWidth, entry.mHeight);
- }
-}
-
-bool LayerCache::put(Layer* layer) {
- if (!layer->isCacheable()) return false;
-
- const uint32_t size = layer->getWidth() * layer->getHeight() * 4;
- // Don't even try to cache a layer that's bigger than the cache
- if (size < mMaxSize) {
- // TODO: Use an LRU
- while (mSize + size > mMaxSize) {
- Layer* victim = mCache.begin()->mLayer;
- deleteLayer(victim);
- mCache.erase(mCache.begin());
-
- LAYER_LOGD(" Deleting layer %.2fx%.2f", victim->layer.getWidth(),
- victim->layer.getHeight());
- }
-
- layer->cancelDefer();
-
- LayerEntry entry(layer);
-
- mCache.insert(entry);
- mSize += size;
-
- layer->state = Layer::State::InCache;
- return true;
- }
-
- layer->state = Layer::State::FailedToCache;
- return false;
-}
-
-}; // namespace uirenderer
-}; // namespace android
diff --git a/libs/hwui/LayerCache.h b/libs/hwui/LayerCache.h
deleted file mode 100644
index 6fe7b3a..0000000
--- a/libs/hwui/LayerCache.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HWUI_LAYER_CACHE_H
-#define ANDROID_HWUI_LAYER_CACHE_H
-
-#include "Debug.h"
-#include "Layer.h"
-
-#include <set>
-
-namespace android {
-namespace uirenderer {
-
-class RenderState;
-
-///////////////////////////////////////////////////////////////////////////////
-// Defines
-///////////////////////////////////////////////////////////////////////////////
-
-#if DEBUG_LAYERS
- #define LAYER_LOGD(...) ALOGD(__VA_ARGS__)
-#else
- #define LAYER_LOGD(...)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Cache
-///////////////////////////////////////////////////////////////////////////////
-
-class LayerCache {
-public:
- LayerCache();
- ~LayerCache();
-
- /**
- * Returns a layer large enough for the specified dimensions. If no suitable
- * layer can be found, a new one is created and returned. If creating a new
- * layer fails, NULL is returned.
- *
- * When a layer is obtained from the cache, it is removed and the total
- * size of the cache goes down.
- *
- * @param width The desired width of the layer
- * @param height The desired height of the layer
- */
- Layer* get(RenderState& renderState, const uint32_t width, const uint32_t height);
-
- /**
- * Adds the layer to the cache. The layer will not be added if there is
- * not enough space available. Adding a layer can cause other layers to
- * be removed from the cache.
- *
- * @param layer The layer to add to the cache
- *
- * @return True if the layer was added, false otherwise.
- */
- bool put(Layer* layer);
- /**
- * Clears the cache. This causes all layers to be deleted.
- */
- void clear();
-
- /**
- * Sets the maximum size of the cache in bytes.
- */
- void setMaxSize(uint32_t maxSize);
- /**
- * Returns the maximum size of the cache in bytes.
- */
- uint32_t getMaxSize();
- /**
- * Returns the current size of the cache in bytes.
- */
- uint32_t getSize();
-
- size_t getCount();
-
- /**
- * Prints out the content of the cache.
- */
- void dump();
-
-private:
- struct LayerEntry {
- LayerEntry():
- mLayer(nullptr), mWidth(0), mHeight(0) {
- }
-
- LayerEntry(const uint32_t layerWidth, const uint32_t layerHeight): mLayer(nullptr) {
- mWidth = Layer::computeIdealWidth(layerWidth);
- mHeight = Layer::computeIdealHeight(layerHeight);
- }
-
- LayerEntry(Layer* layer):
- mLayer(layer), mWidth(layer->getWidth()), mHeight(layer->getHeight()) {
- }
-
- static int compare(const LayerEntry& lhs, const LayerEntry& rhs);
-
- bool operator==(const LayerEntry& other) const {
- return compare(*this, other) == 0;
- }
-
- bool operator!=(const LayerEntry& other) const {
- return compare(*this, other) != 0;
- }
-
- bool operator<(const LayerEntry& other) const {
- return LayerEntry::compare(*this, other) < 0;
- }
-
- Layer* mLayer;
- uint32_t mWidth;
- uint32_t mHeight;
- }; // struct LayerEntry
-
- void deleteLayer(Layer* layer);
-
- std::multiset<LayerEntry> mCache;
-
- uint32_t mSize;
- uint32_t mMaxSize;
-}; // class LayerCache
-
-}; // namespace uirenderer
-}; // namespace android
-
-#endif // ANDROID_HWUI_LAYER_CACHE_H
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
deleted file mode 100644
index 137316f..0000000
--- a/libs/hwui/LayerRenderer.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LayerCache.h"
-#include "LayerRenderer.h"
-#include "Matrix.h"
-#include "Properties.h"
-#include "Rect.h"
-#include "renderstate/RenderState.h"
-#include "utils/GLUtils.h"
-#include "utils/TraceUtils.h"
-
-#include <ui/Rect.h>
-
-#include <private/hwui/DrawGlInfo.h>
-
-
-namespace android {
-namespace uirenderer {
-
-///////////////////////////////////////////////////////////////////////////////
-// Rendering
-///////////////////////////////////////////////////////////////////////////////
-
-LayerRenderer::LayerRenderer(RenderState& renderState, Layer* layer)
- : OpenGLRenderer(renderState)
- , mLayer(layer) {
-}
-
-LayerRenderer::~LayerRenderer() {
-}
-
-void LayerRenderer::prepareDirty(int viewportWidth, int viewportHeight,
- float left, float top, float right, float bottom, bool opaque) {
- LAYER_RENDERER_LOGD("Rendering into layer, fbo = %d", mLayer->getFbo());
-
- mRenderState.bindFramebuffer(mLayer->getFbo());
-
- const float width = mLayer->layer.getWidth();
- const float height = mLayer->layer.getHeight();
-
- Rect dirty(left, top, right, bottom);
- if (dirty.isEmpty() || (dirty.left <= 0 && dirty.top <= 0 &&
- dirty.right >= width && dirty.bottom >= height)) {
- mLayer->region.clear();
- dirty.set(0.0f, 0.0f, width, height);
- } else {
- dirty.doIntersect(0.0f, 0.0f, width, height);
- android::Rect r(dirty.left, dirty.top, dirty.right, dirty.bottom);
- mLayer->region.subtractSelf(r);
- }
- mLayer->clipRect.set(dirty);
-
- OpenGLRenderer::prepareDirty(viewportWidth, viewportHeight,
- dirty.left, dirty.top, dirty.right, dirty.bottom, opaque);
-}
-
-void LayerRenderer::clear(float left, float top, float right, float bottom, bool opaque) {
- if (mLayer->isDirty()) {
- mRenderState.scissor().setEnabled(false);
- glClear(GL_COLOR_BUFFER_BIT);
-
- mRenderState.scissor().reset();
- mLayer->setDirty(false);
- } else {
- OpenGLRenderer::clear(left, top, right, bottom, opaque);
- }
-}
-
-bool LayerRenderer::finish() {
- bool retval = OpenGLRenderer::finish();
-
- generateMesh();
-
- LAYER_RENDERER_LOGD("Finished rendering into layer, fbo = %d", mLayer->getFbo());
-
- // No need to unbind our FBO, this will be taken care of by the caller
- // who will invoke OpenGLRenderer::resume()
- return retval;
-}
-
-GLuint LayerRenderer::getTargetFbo() const {
- return mLayer->getFbo();
-}
-
-bool LayerRenderer::suppressErrorChecks() const {
- return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Layer support
-///////////////////////////////////////////////////////////////////////////////
-
-bool LayerRenderer::hasLayer() const {
- return true;
-}
-
-void LayerRenderer::ensureStencilBuffer() {
- attachStencilBufferToLayer(mLayer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Dirty region tracking
-///////////////////////////////////////////////////////////////////////////////
-
-Region* LayerRenderer::getRegion() const {
- if (mState.currentFlags() & Snapshot::kFlagFboTarget) {
- return OpenGLRenderer::getRegion();
- }
- return &mLayer->region;
-}
-
-// TODO: This implementation uses a very simple approach to fixing T-junctions which keeps the
-// results as rectangles, and is thus not necessarily efficient in the geometry
-// produced. Eventually, it may be better to develop triangle-based mechanism.
-void LayerRenderer::generateMesh() {
- if (mLayer->region.isRect() || mLayer->region.isEmpty()) {
- if (mLayer->mesh) {
- delete[] mLayer->mesh;
- mLayer->mesh = nullptr;
- mLayer->meshElementCount = 0;
- }
-
- mLayer->setRegionAsRect();
- return;
- }
-
- // avoid T-junctions as they cause artifacts in between the resultant
- // geometry when complex transforms occur.
- // TODO: generate the safeRegion only if necessary based on drawing transform (see
- // OpenGLRenderer::composeLayerRegion())
- Region safeRegion = Region::createTJunctionFreeRegion(mLayer->region);
-
- size_t count;
- const android::Rect* rects = safeRegion.getArray(&count);
-
- GLsizei elementCount = count * 6;
-
- if (mLayer->mesh && mLayer->meshElementCount < elementCount) {
- delete[] mLayer->mesh;
- mLayer->mesh = nullptr;
- }
-
- if (!mLayer->mesh) {
- mLayer->mesh = new TextureVertex[count * 4];
- }
- mLayer->meshElementCount = elementCount;
-
- const float texX = 1.0f / float(mLayer->getWidth());
- const float texY = 1.0f / float(mLayer->getHeight());
- const float height = mLayer->layer.getHeight();
-
- TextureVertex* mesh = mLayer->mesh;
-
- for (size_t i = 0; i < count; i++) {
- const android::Rect* r = &rects[i];
-
- const float u1 = r->left * texX;
- const float v1 = (height - r->top) * texY;
- const float u2 = r->right * texX;
- const float v2 = (height - r->bottom) * texY;
-
- TextureVertex::set(mesh++, r->left, r->top, u1, v1);
- TextureVertex::set(mesh++, r->right, r->top, u2, v1);
- TextureVertex::set(mesh++, r->left, r->bottom, u1, v2);
- TextureVertex::set(mesh++, r->right, r->bottom, u2, v2);
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Layers management
-///////////////////////////////////////////////////////////////////////////////
-
-Layer* LayerRenderer::createRenderLayer(RenderState& renderState, uint32_t width, uint32_t height) {
- ATRACE_FORMAT("Allocate %ux%u HW Layer", width, height);
- LAYER_RENDERER_LOGD("Requesting new render layer %dx%d", width, height);
-
- Caches& caches = Caches::getInstance();
- GLuint fbo = renderState.createFramebuffer();
- if (!fbo) {
- ALOGW("Could not obtain an FBO");
- return nullptr;
- }
-
- caches.textureState().activateTexture(0);
- Layer* layer = caches.layerCache.get(renderState, width, height);
- if (!layer) {
- ALOGW("Could not obtain a layer");
- return nullptr;
- }
-
- // We first obtain a layer before comparing against the max texture size
- // because layers are not allocated at the exact desired size. They are
- // always created slightly larger to improve recycling
- const uint32_t maxTextureSize = caches.maxTextureSize;
- if (layer->getWidth() > maxTextureSize || layer->getHeight() > maxTextureSize) {
- ALOGW("Layer exceeds max. dimensions supported by the GPU (%dx%d, max=%dx%d)",
- width, height, maxTextureSize, maxTextureSize);
-
- // Creating a new layer always increment its refcount by 1, this allows
- // us to destroy the layer object if one was created for us
- layer->decStrong(nullptr);
-
- return nullptr;
- }
-
- layer->setFbo(fbo);
- layer->layer.set(0.0f, 0.0f, width, height);
- layer->texCoords.set(0.0f, height / float(layer->getHeight()),
- width / float(layer->getWidth()), 0.0f);
- layer->setAlpha(255, SkXfermode::kSrcOver_Mode);
- layer->setColorFilter(nullptr);
- layer->setDirty(true);
- layer->region.clear();
-
- GLuint previousFbo = renderState.getFramebuffer();
-
- renderState.bindFramebuffer(layer->getFbo());
- layer->bindTexture();
-
- // Initialize the texture if needed
- if (layer->isEmpty()) {
- layer->setEmpty(false);
- layer->allocateTexture();
-
- // This should only happen if we run out of memory
- if (CC_UNLIKELY(GLUtils::dumpGLErrors())) {
- LOG_ALWAYS_FATAL("Could not allocate texture for layer (fbo=%d %dx%d)",
- fbo, width, height);
- renderState.bindFramebuffer(previousFbo);
- layer->decStrong(nullptr);
- return nullptr;
- }
- }
-
- glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
- layer->getTextureId(), 0);
-
- renderState.bindFramebuffer(previousFbo);
-
- return layer;
-}
-
-bool LayerRenderer::resizeLayer(Layer* layer, uint32_t width, uint32_t height) {
- if (layer) {
- LAYER_RENDERER_LOGD("Resizing layer fbo = %d to %dx%d", layer->getFbo(), width, height);
-
- if (layer->resize(width, height)) {
- layer->layer.set(0.0f, 0.0f, width, height);
- layer->texCoords.set(0.0f, height / float(layer->getHeight()),
- width / float(layer->getWidth()), 0.0f);
- } else {
- return false;
- }
- }
-
- return true;
-}
-
-Layer* LayerRenderer::createTextureLayer(RenderState& renderState) {
- LAYER_RENDERER_LOGD("Creating new texture layer");
-
- Layer* layer = new Layer(Layer::Type::Texture, renderState, 0, 0);
- layer->setCacheable(false);
- layer->layer.set(0.0f, 0.0f, 0.0f, 0.0f);
- layer->texCoords.set(0.0f, 1.0f, 1.0f, 0.0f);
- layer->region.clear();
- layer->setRenderTarget(GL_NONE); // see ::updateTextureLayer()
-
- Caches::getInstance().textureState().activateTexture(0);
- layer->generateTexture();
-
- return layer;
-}
-
-void LayerRenderer::updateTextureLayer(Layer* layer, uint32_t width, uint32_t height,
- bool isOpaque, bool forceFilter, GLenum renderTarget, const float* textureTransform) {
- if (layer) {
- layer->setBlend(!isOpaque);
- layer->setForceFilter(forceFilter);
- layer->setSize(width, height);
- layer->layer.set(0.0f, 0.0f, width, height);
- layer->region.set(width, height);
- layer->regionRect.set(0.0f, 0.0f, width, height);
- layer->getTexTransform().load(textureTransform);
-
- if (renderTarget != layer->getRenderTarget()) {
- layer->setRenderTarget(renderTarget);
- layer->bindTexture();
- layer->setFilter(GL_NEAREST, false, true);
- layer->setWrap(GL_CLAMP_TO_EDGE, false, true);
- }
- }
-}
-
-void LayerRenderer::destroyLayer(Layer* layer) {
- if (layer) {
- ATRACE_FORMAT("Destroy %ux%u HW Layer", layer->getWidth(), layer->getHeight());
- LAYER_RENDERER_LOGD("Recycling layer, %dx%d fbo = %d",
- layer->getWidth(), layer->getHeight(), layer->getFbo());
-
- if (!Caches::getInstance().layerCache.put(layer)) {
- LAYER_RENDERER_LOGD(" Destroyed!");
- layer->decStrong(nullptr);
- } else {
- LAYER_RENDERER_LOGD(" Cached!");
-#if DEBUG_LAYER_RENDERER
- Caches::getInstance().layerCache.dump();
-#endif
- layer->removeFbo();
- layer->region.clear();
- }
- }
-}
-
-void LayerRenderer::flushLayer(RenderState& renderState, Layer* layer) {
-#ifdef GL_EXT_discard_framebuffer
- if (!layer) return;
-
- GLuint fbo = layer->getFbo();
- if (fbo) {
- // If possible, discard any enqueud operations on deferred
- // rendering architectures
- if (Caches::getInstance().extensions().hasDiscardFramebuffer()) {
- GLuint previousFbo = renderState.getFramebuffer();
- if (fbo != previousFbo) {
- renderState.bindFramebuffer(fbo);
- }
-
- const GLenum attachments[] = { GL_COLOR_ATTACHMENT0 };
- glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, attachments);
-
- if (fbo != previousFbo) {
- renderState.bindFramebuffer(previousFbo);
- }
- }
- }
-#endif
-}
-
-bool LayerRenderer::copyLayer(RenderState& renderState, Layer* layer, SkBitmap* bitmap) {
- Caches& caches = Caches::getInstance();
- if (layer && layer->isRenderable()
- && bitmap->width() <= caches.maxTextureSize
- && bitmap->height() <= caches.maxTextureSize) {
-
- GLuint fbo = renderState.createFramebuffer();
- if (!fbo) {
- ALOGW("Could not obtain an FBO");
- return false;
- }
-
- SkAutoLockPixels alp(*bitmap);
-
- GLuint texture;
- GLuint previousFbo;
- GLsizei previousViewportWidth;
- GLsizei previousViewportHeight;
-
- GLenum format;
- GLenum type;
-
- bool status = false;
-
- switch (bitmap->colorType()) {
- case kAlpha_8_SkColorType:
- format = GL_ALPHA;
- type = GL_UNSIGNED_BYTE;
- break;
- case kRGB_565_SkColorType:
- format = GL_RGB;
- type = GL_UNSIGNED_SHORT_5_6_5;
- break;
- case kARGB_4444_SkColorType:
- format = GL_RGBA;
- type = GL_UNSIGNED_SHORT_4_4_4_4;
- break;
- case kN32_SkColorType:
- default:
- format = GL_RGBA;
- type = GL_UNSIGNED_BYTE;
- break;
- }
-
- float alpha = layer->getAlpha();
- SkXfermode::Mode mode = layer->getMode();
- GLuint previousLayerFbo = layer->getFbo();
-
- layer->setAlpha(255, SkXfermode::kSrc_Mode);
- layer->setFbo(fbo);
-
- previousFbo = renderState.getFramebuffer();
- renderState.getViewport(&previousViewportWidth, &previousViewportHeight);
- renderState.bindFramebuffer(fbo);
-
- glGenTextures(1, &texture);
-
- caches.textureState().activateTexture(0);
- caches.textureState().bindTexture(texture);
-
- glPixelStorei(GL_PACK_ALIGNMENT, bitmap->bytesPerPixel());
-
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
- glTexImage2D(GL_TEXTURE_2D, 0, format, bitmap->width(), bitmap->height(),
- 0, format, type, nullptr);
-
- glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
- GL_TEXTURE_2D, texture, 0);
-
- {
- LayerRenderer renderer(renderState, layer);
- renderer.OpenGLRenderer::prepareDirty(bitmap->width(), bitmap->height(),
- 0.0f, 0.0f, bitmap->width(), bitmap->height(), !layer->isBlend());
-
- renderState.scissor().setEnabled(false);
- renderer.translate(0.0f, bitmap->height());
- renderer.scale(1.0f, -1.0f);
-
- {
- Rect bounds;
- bounds.set(0.0f, 0.0f, bitmap->width(), bitmap->height());
- renderer.drawTextureLayer(layer, bounds);
-
- glReadPixels(0, 0, bitmap->width(), bitmap->height(), format,
- type, bitmap->getPixels());
-
- }
-
- status = true;
- }
-
- renderState.bindFramebuffer(previousFbo);
- layer->setAlpha(alpha, mode);
- layer->setFbo(previousLayerFbo);
- caches.textureState().deleteTexture(texture);
- renderState.deleteFramebuffer(fbo);
- renderState.setViewport(previousViewportWidth, previousViewportHeight);
-
- GL_CHECKPOINT(MODERATE);
-
- return status;
- }
- return false;
-}
-
-}; // namespace uirenderer
-}; // namespace android
diff --git a/libs/hwui/LayerRenderer.h b/libs/hwui/LayerRenderer.h
deleted file mode 100644
index 38c3705..0000000
--- a/libs/hwui/LayerRenderer.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HWUI_LAYER_RENDERER_H
-#define ANDROID_HWUI_LAYER_RENDERER_H
-
-#include <cutils/compiler.h>
-
-#include "OpenGLRenderer.h"
-#include "Layer.h"
-
-#include <SkBitmap.h>
-
-namespace android {
-namespace uirenderer {
-
-class RenderState;
-
-///////////////////////////////////////////////////////////////////////////////
-// Defines
-///////////////////////////////////////////////////////////////////////////////
-
-// Debug
-#if DEBUG_LAYER_RENDERER
- #define LAYER_RENDERER_LOGD(...) ALOGD(__VA_ARGS__)
-#else
- #define LAYER_RENDERER_LOGD(...)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Renderer
-///////////////////////////////////////////////////////////////////////////////
-
-class LayerRenderer: public OpenGLRenderer {
-public:
- LayerRenderer(RenderState& renderState, Layer* layer);
- virtual ~LayerRenderer();
-
- virtual void onViewportInitialized() override { /* do nothing */ }
- virtual void prepareDirty(int viewportWidth, int viewportHeight,
- float left, float top, float right, float bottom, bool opaque) override;
- virtual void clear(float left, float top, float right, float bottom, bool opaque) override;
- virtual bool finish() override;
-
- static Layer* createTextureLayer(RenderState& renderState);
- static Layer* createRenderLayer(RenderState& renderState, uint32_t width, uint32_t height);
- static bool resizeLayer(Layer* layer, uint32_t width, uint32_t height);
- static void updateTextureLayer(Layer* layer, uint32_t width, uint32_t height,
- bool isOpaque, bool forceFilter, GLenum renderTarget, const float* textureTransform);
- static void destroyLayer(Layer* layer);
- static bool copyLayer(RenderState& renderState, Layer* layer, SkBitmap* bitmap);
-
- static void flushLayer(RenderState& renderState, Layer* layer);
-
-protected:
- virtual void ensureStencilBuffer() override;
- virtual bool hasLayer() const override;
- virtual Region* getRegion() const override;
- virtual GLuint getTargetFbo() const override;
- virtual bool suppressErrorChecks() const override;
-
-private:
- void generateMesh();
-
- Layer* mLayer;
-}; // class LayerRenderer
-
-}; // namespace uirenderer
-}; // namespace android
-
-#endif // ANDROID_HWUI_LAYER_RENDERER_H
diff --git a/libs/hwui/LayerUpdateQueue.cpp b/libs/hwui/LayerUpdateQueue.cpp
index db5f676..95f5cfb 100644
--- a/libs/hwui/LayerUpdateQueue.cpp
+++ b/libs/hwui/LayerUpdateQueue.cpp
@@ -26,6 +26,7 @@
}
void LayerUpdateQueue::enqueueLayerWithDamage(RenderNode* renderNode, Rect damage) {
+ damage.roundOut();
damage.doIntersect(0, 0, renderNode->getWidth(), renderNode->getHeight());
if (!damage.isEmpty()) {
for (Entry& entry : mEntries) {
diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h
index 9cde5d6..ba9cbbe 100644
--- a/libs/hwui/Matrix.h
+++ b/libs/hwui/Matrix.h
@@ -81,11 +81,11 @@
loadIdentity();
}
- Matrix4(const float* v) {
+ explicit Matrix4(const float* v) {
load(v);
}
- Matrix4(const SkMatrix& v) {
+ Matrix4(const SkMatrix& v) { // NOLINT, implicit
load(v);
}
diff --git a/libs/hwui/OpDumper.cpp b/libs/hwui/OpDumper.cpp
index ec9ffde..f4b7ee0 100644
--- a/libs/hwui/OpDumper.cpp
+++ b/libs/hwui/OpDumper.cpp
@@ -16,6 +16,7 @@
#include "OpDumper.h"
+#include "ClipArea.h"
#include "RecordedOp.h"
namespace android {
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
deleted file mode 100644
index 9d821f3..0000000
--- a/libs/hwui/OpenGLRenderer.cpp
+++ /dev/null
@@ -1,2451 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <GpuMemoryTracker.h>
-#include "OpenGLRenderer.h"
-
-#include "DeferredDisplayList.h"
-#include "GammaFontRenderer.h"
-#include "Glop.h"
-#include "GlopBuilder.h"
-#include "Patch.h"
-#include "PathTessellator.h"
-#include "Properties.h"
-#include "RenderNode.h"
-#include "renderstate/MeshState.h"
-#include "renderstate/RenderState.h"
-#include "ShadowTessellator.h"
-#include "SkiaShader.h"
-#include "Vector.h"
-#include "VertexBuffer.h"
-#include "hwui/Canvas.h"
-#include "utils/GLUtils.h"
-#include "utils/PaintUtils.h"
-#include "utils/TraceUtils.h"
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <SkColor.h>
-#include <SkPaintDefaults.h>
-#include <SkPathOps.h>
-#include <SkShader.h>
-#include <SkTypeface.h>
-
-#include <utils/Log.h>
-#include <utils/StopWatch.h>
-
-#include <private/hwui/DrawGlInfo.h>
-
-#include <ui/Rect.h>
-
-#if DEBUG_DETAILED_EVENTS
- #define EVENT_LOGD(...) eventMarkDEBUG(__VA_ARGS__)
-#else
- #define EVENT_LOGD(...)
-#endif
-
-namespace android {
-namespace uirenderer {
-
-///////////////////////////////////////////////////////////////////////////////
-// Constructors/destructor
-///////////////////////////////////////////////////////////////////////////////
-
-OpenGLRenderer::OpenGLRenderer(RenderState& renderState)
- : mState(*this)
- , mCaches(Caches::getInstance())
- , mRenderState(renderState)
- , mFrameStarted(false)
- , mScissorOptimizationDisabled(false)
- , mDirty(false)
- , mLightCenter((Vector3){FLT_MIN, FLT_MIN, FLT_MIN})
- , mLightRadius(FLT_MIN)
- , mAmbientShadowAlpha(0)
- , mSpotShadowAlpha(0) {
-}
-
-OpenGLRenderer::~OpenGLRenderer() {
- // The context has already been destroyed at this point, do not call
- // GL APIs. All GL state should be kept in Caches.h
-}
-
-void OpenGLRenderer::initProperties() {
- char property[PROPERTY_VALUE_MAX];
- if (property_get(PROPERTY_DISABLE_SCISSOR_OPTIMIZATION, property, "false")) {
- mScissorOptimizationDisabled = !strcasecmp(property, "true");
- INIT_LOGD(" Scissor optimization %s",
- mScissorOptimizationDisabled ? "disabled" : "enabled");
- } else {
- INIT_LOGD(" Scissor optimization enabled");
- }
-}
-
-void OpenGLRenderer::initLight(float lightRadius, uint8_t ambientShadowAlpha,
- uint8_t spotShadowAlpha) {
- mLightRadius = lightRadius;
- mAmbientShadowAlpha = ambientShadowAlpha;
- mSpotShadowAlpha = spotShadowAlpha;
-}
-
-void OpenGLRenderer::setLightCenter(const Vector3& lightCenter) {
- mLightCenter = lightCenter;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Setup
-///////////////////////////////////////////////////////////////////////////////
-
-void OpenGLRenderer::onViewportInitialized() {
- glDisable(GL_DITHER);
- glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void OpenGLRenderer::setupFrameState(int viewportWidth, int viewportHeight,
- float left, float top, float right, float bottom, bool opaque) {
- mCaches.clearGarbage();
- mState.initializeSaveStack(viewportWidth, viewportHeight,
- left, top, right, bottom, mLightCenter);
- mOpaque = opaque;
- mTilingClip.set(left, top, right, bottom);
-}
-
-void OpenGLRenderer::startFrame() {
- if (mFrameStarted) return;
- mFrameStarted = true;
-
- mState.setDirtyClip(true);
-
- discardFramebuffer(mTilingClip.left, mTilingClip.top, mTilingClip.right, mTilingClip.bottom);
-
- mRenderState.setViewport(mState.getWidth(), mState.getHeight());
-
- debugOverdraw(true, true);
-
- clear(mTilingClip.left, mTilingClip.top,
- mTilingClip.right, mTilingClip.bottom, mOpaque);
-}
-
-void OpenGLRenderer::prepareDirty(int viewportWidth, int viewportHeight,
- float left, float top, float right, float bottom, bool opaque) {
-
- setupFrameState(viewportWidth, viewportHeight, left, top, right, bottom, opaque);
-
- // Layer renderers will start the frame immediately
- // The framebuffer renderer will first defer the display list
- // for each layer and wait until the first drawing command
- // to start the frame
- if (currentSnapshot()->fbo == 0) {
- mRenderState.blend().syncEnabled();
- updateLayers();
- } else {
- startFrame();
- }
-}
-
-void OpenGLRenderer::discardFramebuffer(float left, float top, float right, float bottom) {
- // If we know that we are going to redraw the entire framebuffer,
- // perform a discard to let the driver know we don't need to preserve
- // the back buffer for this frame.
- if (mCaches.extensions().hasDiscardFramebuffer() &&
- left <= 0.0f && top <= 0.0f && right >= mState.getWidth() && bottom >= mState.getHeight()) {
- const bool isFbo = getTargetFbo() == 0;
- const GLenum attachments[] = {
- isFbo ? (const GLenum) GL_COLOR_EXT : (const GLenum) GL_COLOR_ATTACHMENT0,
- isFbo ? (const GLenum) GL_STENCIL_EXT : (const GLenum) GL_STENCIL_ATTACHMENT };
- glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, attachments);
- }
-}
-
-void OpenGLRenderer::clear(float left, float top, float right, float bottom, bool opaque) {
- if (!opaque) {
- mRenderState.scissor().setEnabled(true);
- mRenderState.scissor().set(left, getViewportHeight() - bottom, right - left, bottom - top);
- glClear(GL_COLOR_BUFFER_BIT);
- mDirty = true;
- return;
- }
-
- mRenderState.scissor().reset();
-}
-
-bool OpenGLRenderer::finish() {
- renderOverdraw();
- mTempPaths.clear();
-
- // When finish() is invoked on FBO 0 we've reached the end
- // of the current frame
- if (getTargetFbo() == 0) {
- mCaches.pathCache.trim();
- mCaches.tessellationCache.trim();
- }
-
- if (!suppressErrorChecks()) {
- GL_CHECKPOINT(MODERATE);
-
-#if DEBUG_MEMORY_USAGE
- mCaches.dumpMemoryUsage();
- GPUMemoryTracker::dump();
-#else
- if (Properties::debugLevel & kDebugMemory) {
- mCaches.dumpMemoryUsage();
- }
-#endif
- }
-
- mFrameStarted = false;
-
- return reportAndClearDirty();
-}
-
-void OpenGLRenderer::resumeAfterLayer() {
- mRenderState.setViewport(getViewportWidth(), getViewportHeight());
- mRenderState.bindFramebuffer(currentSnapshot()->fbo);
- debugOverdraw(true, false);
-
- mRenderState.scissor().reset();
- dirtyClip();
-}
-
-void OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
- if (mState.currentlyIgnored()) return;
-
- Rect clip(mState.currentRenderTargetClip());
- clip.snapToPixelBoundaries();
-
- // Since we don't know what the functor will draw, let's dirty
- // the entire clip region
- if (hasLayer()) {
- dirtyLayerUnchecked(clip, getRegion());
- }
-
- DrawGlInfo info;
- info.clipLeft = clip.left;
- info.clipTop = clip.top;
- info.clipRight = clip.right;
- info.clipBottom = clip.bottom;
- info.isLayer = hasLayer();
- info.width = getViewportWidth();
- info.height = getViewportHeight();
- currentTransform()->copyTo(&info.transform[0]);
-
- bool prevDirtyClip = mState.getDirtyClip();
- // setup GL state for functor
- if (mState.getDirtyClip()) {
- setStencilFromClip(); // can issue draws, so must precede enableScissor()/interrupt()
- }
- if (mRenderState.scissor().setEnabled(true) || prevDirtyClip) {
- setScissorFromClip();
- }
-
- mRenderState.invokeFunctor(functor, DrawGlInfo::kModeDraw, &info);
- // Scissor may have been modified, reset dirty clip
- dirtyClip();
-
- mDirty = true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Debug
-///////////////////////////////////////////////////////////////////////////////
-
-void OpenGLRenderer::eventMarkDEBUG(const char* fmt, ...) const {
-#if DEBUG_DETAILED_EVENTS
- const int BUFFER_SIZE = 256;
- va_list ap;
- char buf[BUFFER_SIZE];
-
- va_start(ap, fmt);
- vsnprintf(buf, BUFFER_SIZE, fmt, ap);
- va_end(ap);
-
- eventMark(buf);
-#endif
-}
-
-
-void OpenGLRenderer::eventMark(const char* name) const {
- mCaches.eventMark(0, name);
-}
-
-void OpenGLRenderer::startMark(const char* name) const {
- mCaches.startMark(0, name);
-}
-
-void OpenGLRenderer::endMark() const {
- mCaches.endMark();
-}
-
-void OpenGLRenderer::debugOverdraw(bool enable, bool clear) {
- mRenderState.debugOverdraw(enable, clear);
-}
-
-void OpenGLRenderer::renderOverdraw() {
- if (Properties::debugOverdraw && getTargetFbo() == 0) {
- const Rect* clip = &mTilingClip;
-
- mRenderState.scissor().setEnabled(true);
- mRenderState.scissor().set(clip->left,
- mState.firstSnapshot()->getViewportHeight() - clip->bottom,
- clip->right - clip->left,
- clip->bottom - clip->top);
-
- // 1x overdraw
- mRenderState.stencil().enableDebugTest(2);
- drawColor(mCaches.getOverdrawColor(1), SkXfermode::kSrcOver_Mode);
-
- // 2x overdraw
- mRenderState.stencil().enableDebugTest(3);
- drawColor(mCaches.getOverdrawColor(2), SkXfermode::kSrcOver_Mode);
-
- // 3x overdraw
- mRenderState.stencil().enableDebugTest(4);
- drawColor(mCaches.getOverdrawColor(3), SkXfermode::kSrcOver_Mode);
-
- // 4x overdraw and higher
- mRenderState.stencil().enableDebugTest(4, true);
- drawColor(mCaches.getOverdrawColor(4), SkXfermode::kSrcOver_Mode);
-
- mRenderState.stencil().disable();
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Layers
-///////////////////////////////////////////////////////////////////////////////
-
-bool OpenGLRenderer::updateLayer(Layer* layer, bool inFrame) {
- if (layer->deferredUpdateScheduled && layer->renderer
- && layer->renderNode.get() && layer->renderNode->isRenderable()) {
-
- if (inFrame) {
- debugOverdraw(false, false);
- }
-
- if (CC_UNLIKELY(inFrame || Properties::drawDeferDisabled)) {
- layer->render(*this);
- } else {
- layer->defer(*this);
- }
-
- if (inFrame) {
- resumeAfterLayer();
- }
-
- layer->debugDrawUpdate = Properties::debugLayersUpdates;
- layer->hasDrawnSinceUpdate = false;
-
- return true;
- }
-
- return false;
-}
-
-void OpenGLRenderer::updateLayers() {
- // If draw deferring is enabled this method will simply defer
- // the display list of each individual layer. The layers remain
- // in the layer updates list which will be cleared by flushLayers().
- int count = mLayerUpdates.size();
- if (count > 0) {
- if (CC_UNLIKELY(Properties::drawDeferDisabled)) {
- startMark("Layer Updates");
- } else {
- startMark("Defer Layer Updates");
- }
-
- // Note: it is very important to update the layers in order
- for (int i = 0; i < count; i++) {
- Layer* layer = mLayerUpdates[i].get();
- updateLayer(layer, false);
- }
-
- if (CC_UNLIKELY(Properties::drawDeferDisabled)) {
- mLayerUpdates.clear();
- mRenderState.bindFramebuffer(getTargetFbo());
- }
- endMark();
- }
-}
-
-void OpenGLRenderer::flushLayers() {
- int count = mLayerUpdates.size();
- if (count > 0) {
- startMark("Apply Layer Updates");
-
- // Note: it is very important to update the layers in order
- for (int i = 0; i < count; i++) {
- mLayerUpdates[i]->flush();
- }
-
- mLayerUpdates.clear();
- mRenderState.bindFramebuffer(getTargetFbo());
-
- endMark();
- }
-}
-
-void OpenGLRenderer::pushLayerUpdate(Layer* layer) {
- if (layer) {
- // Make sure we don't introduce duplicates.
- // SortedVector would do this automatically but we need to respect
- // the insertion order. The linear search is not an issue since
- // this list is usually very short (typically one item, at most a few)
- for (int i = mLayerUpdates.size() - 1; i >= 0; i--) {
- if (mLayerUpdates[i] == layer) {
- return;
- }
- }
- mLayerUpdates.push_back(layer);
- }
-}
-
-void OpenGLRenderer::cancelLayerUpdate(Layer* layer) {
- if (layer) {
- for (int i = mLayerUpdates.size() - 1; i >= 0; i--) {
- if (mLayerUpdates[i] == layer) {
- mLayerUpdates.erase(mLayerUpdates.begin() + i);
- break;
- }
- }
- }
-}
-
-void OpenGLRenderer::flushLayerUpdates() {
- ATRACE_NAME("Update HW Layers");
- mRenderState.blend().syncEnabled();
- updateLayers();
- flushLayers();
- // Wait for all the layer updates to be executed
- glFinish();
-}
-
-void OpenGLRenderer::markLayersAsBuildLayers() {
- for (size_t i = 0; i < mLayerUpdates.size(); i++) {
- mLayerUpdates[i]->wasBuildLayered = true;
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// State management
-///////////////////////////////////////////////////////////////////////////////
-
-void OpenGLRenderer::onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) {
- bool restoreViewport = removed.flags & Snapshot::kFlagIsFboLayer;
- bool restoreClip = removed.flags & Snapshot::kFlagClipSet;
- bool restoreLayer = removed.flags & Snapshot::kFlagIsLayer;
-
- if (restoreViewport) {
- mRenderState.setViewport(getViewportWidth(), getViewportHeight());
- }
-
- if (restoreClip) {
- dirtyClip();
- }
-
- if (restoreLayer) {
- endMark(); // Savelayer
- ATRACE_END(); // SaveLayer
- startMark("ComposeLayer");
- composeLayer(removed, restored);
- endMark();
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Layers
-///////////////////////////////////////////////////////////////////////////////
-
-int OpenGLRenderer::saveLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags, const SkPath* convexMask) {
- // force matrix/clip isolation for layer
- flags |= SaveFlags::MatrixClip;
-
- const int count = mState.saveSnapshot(flags);
-
- if (!mState.currentlyIgnored()) {
- createLayer(left, top, right, bottom, paint, flags, convexMask);
- }
-
- return count;
-}
-
-void OpenGLRenderer::calculateLayerBoundsAndClip(Rect& bounds, Rect& clip, bool fboLayer) {
- const Rect untransformedBounds(bounds);
-
- currentTransform()->mapRect(bounds);
-
- // Layers only make sense if they are in the framebuffer's bounds
- bounds.doIntersect(mState.currentRenderTargetClip());
- if (!bounds.isEmpty()) {
- // We cannot work with sub-pixels in this case
- bounds.snapToPixelBoundaries();
-
- // When the layer is not an FBO, we may use glCopyTexImage so we
- // need to make sure the layer does not extend outside the bounds
- // of the framebuffer
- const Snapshot& previous = *(currentSnapshot()->previous);
- Rect previousViewport(0, 0, previous.getViewportWidth(), previous.getViewportHeight());
-
- bounds.doIntersect(previousViewport);
- if (!bounds.isEmpty() && fboLayer) {
- clip.set(bounds);
- mat4 inverse;
- inverse.loadInverse(*currentTransform());
- inverse.mapRect(clip);
- clip.snapToPixelBoundaries();
- clip.doIntersect(untransformedBounds);
- if (!clip.isEmpty()) {
- clip.translate(-untransformedBounds.left, -untransformedBounds.top);
- bounds.set(untransformedBounds);
- }
- }
- }
-}
-
-void OpenGLRenderer::updateSnapshotIgnoreForLayer(const Rect& bounds, const Rect& clip,
- bool fboLayer, int alpha) {
- if (bounds.isEmpty() || bounds.getWidth() > mCaches.maxTextureSize ||
- bounds.getHeight() > mCaches.maxTextureSize ||
- (fboLayer && clip.isEmpty())) {
- writableSnapshot()->empty = fboLayer;
- } else {
- writableSnapshot()->invisible = writableSnapshot()->invisible || (alpha <= 0 && fboLayer);
- }
-}
-
-int OpenGLRenderer::saveLayerDeferred(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags) {
- const int count = mState.saveSnapshot(flags);
-
- if (!mState.currentlyIgnored() && (flags & SaveFlags::ClipToLayer)) {
- // initialize the snapshot as though it almost represents an FBO layer so deferred draw
- // operations will be able to store and restore the current clip and transform info, and
- // quick rejection will be correct (for display lists)
-
- Rect bounds(left, top, right, bottom);
- Rect clip;
- calculateLayerBoundsAndClip(bounds, clip, true);
- updateSnapshotIgnoreForLayer(bounds, clip, true, PaintUtils::getAlphaDirect(paint));
-
- if (!mState.currentlyIgnored()) {
- writableSnapshot()->resetTransform(-bounds.left, -bounds.top, 0.0f);
- writableSnapshot()->resetClip(clip.left, clip.top, clip.right, clip.bottom);
- writableSnapshot()->initializeViewport(bounds.getWidth(), bounds.getHeight());
- writableSnapshot()->roundRectClipState = nullptr;
- }
- }
-
- return count;
-}
-
-/**
- * Layers are viewed by Skia are slightly different than layers in image editing
- * programs (for instance.) When a layer is created, previously created layers
- * and the frame buffer still receive every drawing command. For instance, if a
- * layer is created and a shape intersecting the bounds of the layers and the
- * framebuffer is draw, the shape will be drawn on both (unless the layer was
- * created with the SaveFlags::ClipToLayer flag.)
- *
- * A way to implement layers is to create an FBO for each layer, backed by an RGBA
- * texture. Unfortunately, this is inefficient as it requires every primitive to
- * be drawn n + 1 times, where n is the number of active layers. In practice this
- * means, for every primitive:
- * - Switch active frame buffer
- * - Change viewport, clip and projection matrix
- * - Issue the drawing
- *
- * Switching rendering target n + 1 times per drawn primitive is extremely costly.
- * To avoid this, layers are implemented in a different way here, at least in the
- * general case. FBOs are used, as an optimization, when the "clip to layer" flag
- * is set. When this flag is set we can redirect all drawing operations into a
- * single FBO.
- *
- * This implementation relies on the frame buffer being at least RGBA 8888. When
- * a layer is created, only a texture is created, not an FBO. The content of the
- * frame buffer contained within the layer's bounds is copied into this texture
- * using glCopyTexImage2D(). The layer's region is then cleared(1) in the frame
- * buffer and drawing continues as normal. This technique therefore treats the
- * frame buffer as a scratch buffer for the layers.
- *
- * To compose the layers back onto the frame buffer, each layer texture
- * (containing the original frame buffer data) is drawn as a simple quad over
- * the frame buffer. The trick is that the quad is set as the composition
- * destination in the blending equation, and the frame buffer becomes the source
- * of the composition.
- *
- * Drawing layers with an alpha value requires an extra step before composition.
- * An empty quad is drawn over the layer's region in the frame buffer. This quad
- * is drawn with the rgba color (0,0,0,alpha). The alpha value offered by the
- * quad is used to multiply the colors in the frame buffer. This is achieved by
- * changing the GL blend functions for the GL_FUNC_ADD blend equation to
- * GL_ZERO, GL_SRC_ALPHA.
- *
- * Because glCopyTexImage2D() can be slow, an alternative implementation might
- * be use to draw a single clipped layer. The implementation described above
- * is correct in every case.
- *
- * (1) The frame buffer is actually not cleared right away. To allow the GPU
- * to potentially optimize series of calls to glCopyTexImage2D, the frame
- * buffer is left untouched until the first drawing operation. Only when
- * something actually gets drawn are the layers regions cleared.
- */
-bool OpenGLRenderer::createLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags, const SkPath* convexMask) {
- LAYER_LOGD("Requesting layer %.2fx%.2f", right - left, bottom - top);
- LAYER_LOGD("Layer cache size = %d", mCaches.layerCache.getSize());
-
- const bool fboLayer = flags & SaveFlags::ClipToLayer;
-
- // Window coordinates of the layer
- Rect clip;
- Rect bounds(left, top, right, bottom);
- calculateLayerBoundsAndClip(bounds, clip, fboLayer);
- updateSnapshotIgnoreForLayer(bounds, clip, fboLayer, PaintUtils::getAlphaDirect(paint));
-
- // Bail out if we won't draw in this snapshot
- if (mState.currentlyIgnored()) {
- return false;
- }
-
- mCaches.textureState().activateTexture(0);
- Layer* layer = mCaches.layerCache.get(mRenderState, bounds.getWidth(), bounds.getHeight());
- if (!layer) {
- return false;
- }
-
- layer->setPaint(paint);
- layer->layer.set(bounds);
- layer->texCoords.set(0.0f, bounds.getHeight() / float(layer->getHeight()),
- bounds.getWidth() / float(layer->getWidth()), 0.0f);
-
- layer->setBlend(true);
- layer->setDirty(false);
- layer->setConvexMask(convexMask); // note: the mask must be cleared before returning to the cache
-
- // Save the layer in the snapshot
- writableSnapshot()->flags |= Snapshot::kFlagIsLayer;
- writableSnapshot()->layer = layer;
-
- ATRACE_FORMAT_BEGIN("%ssaveLayer %ux%u",
- fboLayer ? "" : "unclipped ",
- layer->getWidth(), layer->getHeight());
- startMark("SaveLayer");
- if (fboLayer) {
- return createFboLayer(layer, bounds, clip);
- } else {
- // Copy the framebuffer into the layer
- layer->bindTexture();
- if (!bounds.isEmpty()) {
- if (layer->isEmpty()) {
- // Workaround for some GL drivers. When reading pixels lying outside
- // of the window we should get undefined values for those pixels.
- // Unfortunately some drivers will turn the entire target texture black
- // when reading outside of the window.
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, layer->getWidth(), layer->getHeight(),
- 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
- layer->setEmpty(false);
- }
-
- glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
- bounds.left, getViewportHeight() - bounds.bottom,
- bounds.getWidth(), bounds.getHeight());
-
- // Enqueue the buffer coordinates to clear the corresponding region later
- mLayers.push_back(Rect(bounds));
- }
- }
-
- return true;
-}
-
-bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, Rect& clip) {
- layer->clipRect.set(clip);
- layer->setFbo(mRenderState.createFramebuffer());
-
- writableSnapshot()->region = &writableSnapshot()->layer->region;
- writableSnapshot()->flags |= Snapshot::kFlagFboTarget | Snapshot::kFlagIsFboLayer;
- writableSnapshot()->fbo = layer->getFbo();
- writableSnapshot()->resetTransform(-bounds.left, -bounds.top, 0.0f);
- writableSnapshot()->resetClip(clip.left, clip.top, clip.right, clip.bottom);
- writableSnapshot()->initializeViewport(bounds.getWidth(), bounds.getHeight());
- writableSnapshot()->roundRectClipState = nullptr;
-
- debugOverdraw(false, false);
- // Bind texture to FBO
- mRenderState.bindFramebuffer(layer->getFbo());
- layer->bindTexture();
-
- // Initialize the texture if needed
- if (layer->isEmpty()) {
- layer->allocateTexture();
- layer->setEmpty(false);
- }
-
- glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
- layer->getTextureId(), 0);
-
- // Clear the FBO, expand the clear region by 1 to get nice bilinear filtering
- mRenderState.scissor().setEnabled(true);
- mRenderState.scissor().set(clip.left - 1.0f, bounds.getHeight() - clip.bottom - 1.0f,
- clip.getWidth() + 2.0f, clip.getHeight() + 2.0f);
- glClear(GL_COLOR_BUFFER_BIT);
-
- dirtyClip();
-
- // Change the ortho projection
- mRenderState.setViewport(bounds.getWidth(), bounds.getHeight());
- return true;
-}
-
-/**
- * Read the documentation of createLayer() before doing anything in this method.
- */
-void OpenGLRenderer::composeLayer(const Snapshot& removed, const Snapshot& restored) {
- if (!removed.layer) {
- ALOGE("Attempting to compose a layer that does not exist");
- return;
- }
-
- Layer* layer = removed.layer;
- const Rect& rect = layer->layer;
- const bool fboLayer = removed.flags & Snapshot::kFlagIsFboLayer;
-
- bool clipRequired = false;
- mState.calculateQuickRejectForScissor(rect.left, rect.top, rect.right, rect.bottom,
- &clipRequired, nullptr, false); // safely ignore return, should never be rejected
- mRenderState.scissor().setEnabled(mScissorOptimizationDisabled || clipRequired);
-
- if (fboLayer) {
- // Detach the texture from the FBO
- glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
-
- layer->removeFbo(false);
-
- // Unbind current FBO and restore previous one
- mRenderState.bindFramebuffer(restored.fbo);
- debugOverdraw(true, false);
- }
-
- if (!fboLayer && layer->getAlpha() < 255) {
- SkPaint layerPaint;
- layerPaint.setAlpha(layer->getAlpha());
- layerPaint.setXfermodeMode(SkXfermode::kDstIn_Mode);
- layerPaint.setColorFilter(layer->getColorFilter());
-
- drawColorRect(rect.left, rect.top, rect.right, rect.bottom, &layerPaint, true);
- // Required below, composeLayerRect() will divide by 255
- layer->setAlpha(255);
- }
-
- mRenderState.meshState().unbindMeshBuffer();
-
- mCaches.textureState().activateTexture(0);
-
- // When the layer is stored in an FBO, we can save a bit of fillrate by
- // drawing only the dirty region
- if (fboLayer) {
- dirtyLayer(rect.left, rect.top, rect.right, rect.bottom, *restored.transform);
- composeLayerRegion(layer, rect);
- } else if (!rect.isEmpty()) {
- dirtyLayer(rect.left, rect.top, rect.right, rect.bottom);
-
- save(0);
- // the layer contains screen buffer content that shouldn't be alpha modulated
- // (and any necessary alpha modulation was handled drawing into the layer)
- writableSnapshot()->alpha = 1.0f;
- composeLayerRectSwapped(layer, rect);
- restore();
- }
-
- dirtyClip();
-
- // Failing to add the layer to the cache should happen only if the layer is too large
- layer->setConvexMask(nullptr);
- if (!mCaches.layerCache.put(layer)) {
- LAYER_LOGD("Deleting layer");
- layer->decStrong(nullptr);
- }
-}
-
-void OpenGLRenderer::drawTextureLayer(Layer* layer, const Rect& rect) {
- const bool tryToSnap = !layer->getForceFilter()
- && layer->getWidth() == (uint32_t) rect.getWidth()
- && layer->getHeight() == (uint32_t) rect.getHeight();
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUvQuad(nullptr, Rect(0, 1, 1, 0)) // TODO: simplify with VBO
- .setFillTextureLayer(*layer, getLayerAlpha(layer))
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewMapUnitToRectOptionalSnap(tryToSnap, rect)
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::composeLayerRectSwapped(Layer* layer, const Rect& rect) {
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUvQuad(nullptr, layer->texCoords)
- .setFillLayer(layer->getTexture(), layer->getColorFilter(),
- getLayerAlpha(layer), layer->getMode(), Blend::ModeOrderSwap::Swap)
- .setTransform(*currentSnapshot(), TransformFlags::MeshIgnoresCanvasTransform)
- .setModelViewMapUnitToRect(rect)
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::composeLayerRect(Layer* layer, const Rect& rect) {
- if (layer->isTextureLayer()) {
- EVENT_LOGD("composeTextureLayerRect");
- drawTextureLayer(layer, rect);
- } else {
- EVENT_LOGD("composeHardwareLayerRect");
-
- const bool tryToSnap = layer->getWidth() == static_cast<uint32_t>(rect.getWidth())
- && layer->getHeight() == static_cast<uint32_t>(rect.getHeight());
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUvQuad(nullptr, layer->texCoords)
- .setFillLayer(layer->getTexture(), layer->getColorFilter(), getLayerAlpha(layer), layer->getMode(), Blend::ModeOrderSwap::NoSwap)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewMapUnitToRectOptionalSnap(tryToSnap, rect)
- .build();
- renderGlop(glop);
- }
-}
-
-/**
- * Issues the command X, and if we're composing a save layer to the fbo or drawing a newly updated
- * hardware layer with overdraw debug on, draws again to the stencil only, so that these draw
- * operations are correctly counted twice for overdraw. NOTE: assumes composeLayerRegion only used
- * by saveLayer's restore
- */
-#define DRAW_DOUBLE_STENCIL_IF(COND, DRAW_COMMAND) { \
- DRAW_COMMAND; \
- if (CC_UNLIKELY(Properties::debugOverdraw && getTargetFbo() == 0 && (COND))) { \
- glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); \
- DRAW_COMMAND; \
- glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); \
- } \
- }
-
-#define DRAW_DOUBLE_STENCIL(DRAW_COMMAND) DRAW_DOUBLE_STENCIL_IF(true, DRAW_COMMAND)
-
-// This class is purely for inspection. It inherits from SkShader, but Skia does not know how to
-// use it. The OpenGLRenderer will look at it to find its Layer and whether it is opaque.
-class LayerShader : public SkShader {
-public:
- LayerShader(Layer* layer, const SkMatrix* localMatrix)
- : INHERITED(localMatrix)
- , mLayer(layer) {
- }
-
- virtual bool asACustomShader(void** data) const override {
- if (data) {
- *data = static_cast<void*>(mLayer);
- }
- return true;
- }
-
- virtual bool isOpaque() const override {
- return !mLayer->isBlend();
- }
-
-protected:
- virtual void shadeSpan(int x, int y, SkPMColor[], int count) {
- LOG_ALWAYS_FATAL("LayerShader should never be drawn with raster backend.");
- }
-
- virtual void flatten(SkWriteBuffer&) const override {
- LOG_ALWAYS_FATAL("LayerShader should never be flattened.");
- }
-
- virtual Factory getFactory() const override {
- LOG_ALWAYS_FATAL("LayerShader should never be created from a stream.");
- return nullptr;
- }
-private:
- // Unowned.
- Layer* mLayer;
- typedef SkShader INHERITED;
-};
-
-void OpenGLRenderer::composeLayerRegion(Layer* layer, const Rect& rect) {
- if (CC_UNLIKELY(layer->region.isEmpty())) return; // nothing to draw
-
- if (layer->getConvexMask()) {
- save(SaveFlags::MatrixClip);
-
- // clip to the area of the layer the mask can be larger
- clipRect(rect.left, rect.top, rect.right, rect.bottom, SkRegion::kIntersect_Op);
-
- SkPaint paint;
- paint.setAntiAlias(true);
- paint.setColor(SkColorSetARGB(int(getLayerAlpha(layer) * 255), 0, 0, 0));
-
- // create LayerShader to map SaveLayer content into subsequent draw
- SkMatrix shaderMatrix;
- shaderMatrix.setTranslate(rect.left, rect.bottom);
- shaderMatrix.preScale(1, -1);
- LayerShader layerShader(layer, &shaderMatrix);
- paint.setShader(&layerShader);
-
- // Since the drawing primitive is defined in local drawing space,
- // we don't need to modify the draw matrix
- const SkPath* maskPath = layer->getConvexMask();
- DRAW_DOUBLE_STENCIL(drawConvexPath(*maskPath, &paint));
-
- paint.setShader(nullptr);
- restore();
-
- return;
- }
-
- if (layer->region.isRect()) {
- layer->setRegionAsRect();
-
- DRAW_DOUBLE_STENCIL(composeLayerRect(layer, layer->regionRect));
-
- layer->region.clear();
- return;
- }
-
- EVENT_LOGD("composeLayerRegion");
- // standard Region based draw
- size_t count;
- const android::Rect* rects;
- Region safeRegion;
- if (CC_LIKELY(hasRectToRectTransform())) {
- rects = layer->region.getArray(&count);
- } else {
- safeRegion = Region::createTJunctionFreeRegion(layer->region);
- rects = safeRegion.getArray(&count);
- }
-
- const float texX = 1.0f / float(layer->getWidth());
- const float texY = 1.0f / float(layer->getHeight());
- const float height = rect.getHeight();
-
- TextureVertex quadVertices[count * 4];
- TextureVertex* mesh = &quadVertices[0];
- for (size_t i = 0; i < count; i++) {
- const android::Rect* r = &rects[i];
-
- const float u1 = r->left * texX;
- const float v1 = (height - r->top) * texY;
- const float u2 = r->right * texX;
- const float v2 = (height - r->bottom) * texY;
-
- // TODO: Reject quads outside of the clip
- TextureVertex::set(mesh++, r->left, r->top, u1, v1);
- TextureVertex::set(mesh++, r->right, r->top, u2, v1);
- TextureVertex::set(mesh++, r->left, r->bottom, u1, v2);
- TextureVertex::set(mesh++, r->right, r->bottom, u2, v2);
- }
- Rect modelRect = Rect(rect.getWidth(), rect.getHeight());
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedIndexedQuads(&quadVertices[0], count * 6)
- .setFillLayer(layer->getTexture(), layer->getColorFilter(), getLayerAlpha(layer), layer->getMode(), Blend::ModeOrderSwap::NoSwap)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewOffsetRectSnap(rect.left, rect.top, modelRect)
- .build();
- DRAW_DOUBLE_STENCIL_IF(!layer->hasDrawnSinceUpdate, renderGlop(glop));
-
-#if DEBUG_LAYERS_AS_REGIONS
- drawRegionRectsDebug(layer->region);
-#endif
-
- layer->region.clear();
-}
-
-#if DEBUG_LAYERS_AS_REGIONS
-void OpenGLRenderer::drawRegionRectsDebug(const Region& region) {
- size_t count;
- const android::Rect* rects = region.getArray(&count);
-
- uint32_t colors[] = {
- 0x7fff0000, 0x7f00ff00,
- 0x7f0000ff, 0x7fff00ff,
- };
-
- int offset = 0;
- int32_t top = rects[0].top;
-
- for (size_t i = 0; i < count; i++) {
- if (top != rects[i].top) {
- offset ^= 0x2;
- top = rects[i].top;
- }
-
- SkPaint paint;
- paint.setColor(colors[offset + (i & 0x1)]);
- Rect r(rects[i].left, rects[i].top, rects[i].right, rects[i].bottom);
- drawColorRect(r.left, r.top, r.right, r.bottom, paint);
- }
-}
-#endif
-
-void OpenGLRenderer::drawRegionRects(const SkRegion& region, const SkPaint& paint, bool dirty) {
- Vector<float> rects;
-
- SkRegion::Iterator it(region);
- while (!it.done()) {
- const SkIRect& r = it.rect();
- rects.push(r.fLeft);
- rects.push(r.fTop);
- rects.push(r.fRight);
- rects.push(r.fBottom);
- it.next();
- }
-
- drawColorRects(rects.array(), rects.size(), &paint, true, dirty, false);
-}
-
-void OpenGLRenderer::dirtyLayer(const float left, const float top,
- const float right, const float bottom, const Matrix4& transform) {
- if (hasLayer()) {
- Rect bounds(left, top, right, bottom);
- transform.mapRect(bounds);
- dirtyLayerUnchecked(bounds, getRegion());
- }
-}
-
-void OpenGLRenderer::dirtyLayer(const float left, const float top,
- const float right, const float bottom) {
- if (hasLayer()) {
- Rect bounds(left, top, right, bottom);
- dirtyLayerUnchecked(bounds, getRegion());
- }
-}
-
-void OpenGLRenderer::dirtyLayerUnchecked(Rect& bounds, Region* region) {
- bounds.doIntersect(mState.currentRenderTargetClip());
- if (!bounds.isEmpty()) {
- bounds.snapToPixelBoundaries();
- android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom);
- if (!dirty.isEmpty()) {
- region->orSelf(dirty);
- }
- }
-}
-
-void OpenGLRenderer::clearLayerRegions() {
- const size_t quadCount = mLayers.size();
- if (quadCount == 0) return;
-
- if (!mState.currentlyIgnored()) {
- EVENT_LOGD("clearLayerRegions");
- // Doing several glScissor/glClear here can negatively impact
- // GPUs with a tiler architecture, instead we draw quads with
- // the Clear blending mode
-
- // The list contains bounds that have already been clipped
- // against their initial clip rect, and the current clip
- // is likely different so we need to disable clipping here
- bool scissorChanged = mRenderState.scissor().setEnabled(false);
-
- Vertex mesh[quadCount * 4];
- Vertex* vertex = mesh;
-
- for (uint32_t i = 0; i < quadCount; i++) {
- const Rect& bounds = mLayers[i];
-
- Vertex::set(vertex++, bounds.left, bounds.top);
- Vertex::set(vertex++, bounds.right, bounds.top);
- Vertex::set(vertex++, bounds.left, bounds.bottom);
- Vertex::set(vertex++, bounds.right, bounds.bottom);
- }
- // We must clear the list of dirty rects before we
- // call clearLayerRegions() in renderGlop to prevent
- // stencil setup from doing the same thing again
- mLayers.clear();
-
- const int transformFlags = TransformFlags::MeshIgnoresCanvasTransform;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(nullptr) // clear ignores clip state
- .setMeshIndexedQuads(&mesh[0], quadCount)
- .setFillClear()
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewOffsetRect(0, 0, Rect(currentSnapshot()->getRenderTargetClip()))
- .build();
- renderGlop(glop, GlopRenderType::LayerClear);
-
- if (scissorChanged) mRenderState.scissor().setEnabled(true);
- } else {
- mLayers.clear();
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// State Deferral
-///////////////////////////////////////////////////////////////////////////////
-
-bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDeferFlags) {
- const Rect& currentClip = mState.currentRenderTargetClip();
- const mat4* currentMatrix = currentTransform();
-
- if (stateDeferFlags & kStateDeferFlag_Draw) {
- // state has bounds initialized in local coordinates
- if (!state.mBounds.isEmpty()) {
- currentMatrix->mapRect(state.mBounds);
- Rect clippedBounds(state.mBounds);
- // NOTE: if we ever want to use this clipping info to drive whether the scissor
- // is used, it should more closely duplicate the quickReject logic (in how it uses
- // snapToPixelBoundaries)
-
- clippedBounds.doIntersect(currentClip);
- if (clippedBounds.isEmpty()) {
- // quick rejected
- return true;
- }
-
- state.mClipSideFlags = kClipSide_None;
- if (!currentClip.contains(state.mBounds)) {
- int& flags = state.mClipSideFlags;
- // op partially clipped, so record which sides are clipped for clip-aware merging
- if (currentClip.left > state.mBounds.left) flags |= kClipSide_Left;
- if (currentClip.top > state.mBounds.top) flags |= kClipSide_Top;
- if (currentClip.right < state.mBounds.right) flags |= kClipSide_Right;
- if (currentClip.bottom < state.mBounds.bottom) flags |= kClipSide_Bottom;
- }
- state.mBounds.set(clippedBounds);
- } else {
- // Empty bounds implies size unknown. Label op as conservatively clipped to disable
- // overdraw avoidance (since we don't know what it overlaps)
- state.mClipSideFlags = kClipSide_ConservativeFull;
- state.mBounds.set(currentClip);
- }
- }
-
- state.mClipValid = (stateDeferFlags & kStateDeferFlag_Clip);
- if (state.mClipValid) {
- state.mClip.set(currentClip);
- }
-
- // Transform and alpha always deferred, since they are used by state operations
- // (Note: saveLayer/restore use colorFilter and alpha, so we just save restore everything)
- state.mMatrix = *currentMatrix;
- state.mAlpha = currentSnapshot()->alpha;
-
- // always store/restore, since these are just pointers
- state.mRoundRectClipState = currentSnapshot()->roundRectClipState;
-#if !HWUI_NEW_OPS
- state.mProjectionPathMask = currentSnapshot()->projectionPathMask;
-#endif
- return false;
-}
-
-void OpenGLRenderer::restoreDisplayState(const DeferredDisplayState& state, bool skipClipRestore) {
- setGlobalMatrix(state.mMatrix);
- writableSnapshot()->alpha = state.mAlpha;
- writableSnapshot()->roundRectClipState = state.mRoundRectClipState;
-#if !HWUI_NEW_OPS
- writableSnapshot()->projectionPathMask = state.mProjectionPathMask;
-#endif
-
- if (state.mClipValid && !skipClipRestore) {
- writableSnapshot()->setClip(state.mClip.left, state.mClip.top,
- state.mClip.right, state.mClip.bottom);
- dirtyClip();
- }
-}
-
-/**
- * Merged multidraw (such as in drawText and drawBitmaps rely on the fact that no clipping is done
- * in the draw path. Instead, clipping is done ahead of time - either as a single clip rect (when at
- * least one op is clipped), or disabled entirely (because no merged op is clipped)
- *
- * This method should be called when restoreDisplayState() won't be restoring the clip
- */
-void OpenGLRenderer::setupMergedMultiDraw(const Rect* clipRect) {
- if (clipRect != nullptr) {
- writableSnapshot()->setClip(clipRect->left, clipRect->top, clipRect->right, clipRect->bottom);
- } else {
- writableSnapshot()->setClip(0, 0, mState.getWidth(), mState.getHeight());
- }
- dirtyClip();
- bool enableScissor = (clipRect != nullptr) || mScissorOptimizationDisabled;
- mRenderState.scissor().setEnabled(enableScissor);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Clipping
-///////////////////////////////////////////////////////////////////////////////
-
-void OpenGLRenderer::setScissorFromClip() {
- Rect clip(mState.currentRenderTargetClip());
- clip.snapToPixelBoundaries();
-
- if (mRenderState.scissor().set(clip.left, getViewportHeight() - clip.bottom,
- clip.getWidth(), clip.getHeight())) {
- mState.setDirtyClip(false);
- }
-}
-
-void OpenGLRenderer::ensureStencilBuffer() {
- // Thanks to the mismatch between EGL and OpenGL ES FBO we
- // cannot attach a stencil buffer to fbo0 dynamically. Let's
- // just hope we have one when hasLayer() returns false.
- if (hasLayer()) {
- attachStencilBufferToLayer(currentSnapshot()->layer);
- }
-}
-
-void OpenGLRenderer::attachStencilBufferToLayer(Layer* layer) {
- // The layer's FBO is already bound when we reach this stage
- if (!layer->getStencilRenderBuffer()) {
- RenderBuffer* buffer = mCaches.renderBufferCache.get(
- Stencil::getLayerStencilFormat(),
- layer->getWidth(), layer->getHeight());
- layer->setStencilRenderBuffer(buffer);
- }
-}
-
-static void handlePoint(std::vector<Vertex>& rectangleVertices, const Matrix4& transform,
- float x, float y) {
- Vertex v;
- v.x = x;
- v.y = y;
- transform.mapPoint(v.x, v.y);
- rectangleVertices.push_back(v);
-}
-
-static void handlePointNoTransform(std::vector<Vertex>& rectangleVertices, float x, float y) {
- Vertex v;
- v.x = x;
- v.y = y;
- rectangleVertices.push_back(v);
-}
-
-void OpenGLRenderer::drawRectangleList(const RectangleList& rectangleList) {
- int quadCount = rectangleList.getTransformedRectanglesCount();
- std::vector<Vertex> rectangleVertices(quadCount * 4);
- Rect scissorBox = rectangleList.calculateBounds();
- scissorBox.snapToPixelBoundaries();
- for (int i = 0; i < quadCount; ++i) {
- const TransformedRectangle& tr(rectangleList.getTransformedRectangle(i));
- const Matrix4& transform = tr.getTransform();
- Rect bounds = tr.getBounds();
- if (transform.rectToRect()) {
- transform.mapRect(bounds);
- bounds.doIntersect(scissorBox);
- if (!bounds.isEmpty()) {
- handlePointNoTransform(rectangleVertices, bounds.left, bounds.top);
- handlePointNoTransform(rectangleVertices, bounds.right, bounds.top);
- handlePointNoTransform(rectangleVertices, bounds.left, bounds.bottom);
- handlePointNoTransform(rectangleVertices, bounds.right, bounds.bottom);
- }
- } else {
- handlePoint(rectangleVertices, transform, bounds.left, bounds.top);
- handlePoint(rectangleVertices, transform, bounds.right, bounds.top);
- handlePoint(rectangleVertices, transform, bounds.left, bounds.bottom);
- handlePoint(rectangleVertices, transform, bounds.right, bounds.bottom);
- }
- }
-
- mRenderState.scissor().set(scissorBox.left, getViewportHeight() - scissorBox.bottom,
- scissorBox.getWidth(), scissorBox.getHeight());
- const int transformFlags = TransformFlags::MeshIgnoresCanvasTransform;
- Glop glop;
- Vertex* vertices = &rectangleVertices[0];
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshIndexedQuads(vertices, rectangleVertices.size() / 4)
- .setFillBlack()
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewOffsetRect(0, 0, scissorBox)
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::setStencilFromClip() {
- if (!Properties::debugOverdraw) {
- if (!currentSnapshot()->clipIsSimple()) {
- int incrementThreshold;
- EVENT_LOGD("setStencilFromClip - enabling");
-
- // NOTE: The order here is important, we must set dirtyClip to false
- // before any draw call to avoid calling back into this method
- mState.setDirtyClip(false);
-
- ensureStencilBuffer();
-
- const ClipArea& clipArea = currentSnapshot()->getClipArea();
-
- bool isRectangleList = clipArea.isRectangleList();
- if (isRectangleList) {
- incrementThreshold = clipArea.getRectangleList().getTransformedRectanglesCount();
- } else {
- incrementThreshold = 0;
- }
-
- mRenderState.stencil().enableWrite(incrementThreshold);
-
- // Clean and update the stencil, but first make sure we restrict drawing
- // to the region's bounds
- bool resetScissor = mRenderState.scissor().setEnabled(true);
- if (resetScissor) {
- // The scissor was not set so we now need to update it
- setScissorFromClip();
- }
-
- mRenderState.stencil().clear();
-
- // stash and disable the outline clip state, since stencil doesn't account for outline
- bool storedSkipOutlineClip = mSkipOutlineClip;
- mSkipOutlineClip = true;
-
- SkPaint paint;
- paint.setColor(SK_ColorBLACK);
- paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-
- if (isRectangleList) {
- drawRectangleList(clipArea.getRectangleList());
- } else {
- // NOTE: We could use the region contour path to generate a smaller mesh
- // Since we are using the stencil we could use the red book path
- // drawing technique. It might increase bandwidth usage though.
-
- // The last parameter is important: we are not drawing in the color buffer
- // so we don't want to dirty the current layer, if any
- drawRegionRects(clipArea.getClipRegion(), paint, false);
- }
- if (resetScissor) mRenderState.scissor().setEnabled(false);
- mSkipOutlineClip = storedSkipOutlineClip;
-
- mRenderState.stencil().enableTest(incrementThreshold);
-
- // Draw the region used to generate the stencil if the appropriate debug
- // mode is enabled
- // TODO: Implement for rectangle list clip areas
- if (Properties::debugStencilClip == StencilClipDebug::ShowRegion
- && !clipArea.isRectangleList()) {
- paint.setColor(0x7f0000ff);
- paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
- drawRegionRects(currentSnapshot()->getClipRegion(), paint);
- }
- } else {
- EVENT_LOGD("setStencilFromClip - disabling");
- mRenderState.stencil().disable();
- }
- }
-}
-
-/**
- * Returns false and sets scissor enable based upon bounds if drawing won't be clipped out.
- *
- * @param paint if not null, the bounds will be expanded to account for stroke depending on paint
- * style, and tessellated AA ramp
- */
-bool OpenGLRenderer::quickRejectSetupScissor(float left, float top, float right, float bottom,
- const SkPaint* paint) {
- bool snapOut = paint && paint->isAntiAlias();
-
- if (paint && paint->getStyle() != SkPaint::kFill_Style) {
- float outset = paint->getStrokeWidth() * 0.5f;
- left -= outset;
- top -= outset;
- right += outset;
- bottom += outset;
- }
-
- bool clipRequired = false;
- bool roundRectClipRequired = false;
- if (mState.calculateQuickRejectForScissor(left, top, right, bottom,
- &clipRequired, &roundRectClipRequired, snapOut)) {
- return true;
- }
-
- // not quick rejected, so enable the scissor if clipRequired
- mRenderState.scissor().setEnabled(mScissorOptimizationDisabled || clipRequired);
- mSkipOutlineClip = !roundRectClipRequired;
- return false;
-}
-
-void OpenGLRenderer::debugClip() {
-#if DEBUG_CLIP_REGIONS
- if (!currentSnapshot()->clipRegion->isEmpty()) {
- SkPaint paint;
- paint.setColor(0x7f00ff00);
- drawRegionRects(*(currentSnapshot()->clipRegion, paint);
-
- }
-#endif
-}
-
-void OpenGLRenderer::renderGlop(const Glop& glop, GlopRenderType type) {
- // TODO: It would be best if we could do this before quickRejectSetupScissor()
- // changes the scissor test state
- if (type != GlopRenderType::LayerClear) {
- // Regular draws need to clear the dirty area on the layer before they start drawing on top
- // of it. If this draw *is* a layer clear, it skips the clear step (since it would
- // infinitely recurse)
- clearLayerRegions();
- }
-
- if (mState.getDirtyClip()) {
- if (mRenderState.scissor().isEnabled()) {
- setScissorFromClip();
- }
-
- setStencilFromClip();
- }
- mRenderState.render(glop, currentSnapshot()->getOrthoMatrix());
- if (type == GlopRenderType::Standard && !mRenderState.stencil().isWriteEnabled()) {
- // TODO: specify more clearly when a draw should dirty the layer.
- // is writing to the stencil the only time we should ignore this?
-#if !HWUI_NEW_OPS
- dirtyLayer(glop.bounds.left, glop.bounds.top, glop.bounds.right, glop.bounds.bottom);
-#endif
- mDirty = true;
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Drawing
-///////////////////////////////////////////////////////////////////////////////
-
-void OpenGLRenderer::drawRenderNode(RenderNode* renderNode, Rect& dirty, int32_t replayFlags) {
- // All the usual checks and setup operations (quickReject, setupDraw, etc.)
- // will be performed by the display list itself
- if (renderNode && renderNode->isRenderable()) {
- // compute 3d ordering
- renderNode->computeOrdering();
- if (CC_UNLIKELY(Properties::drawDeferDisabled)) {
- startFrame();
- ReplayStateStruct replayStruct(*this, dirty, replayFlags);
- renderNode->replay(replayStruct, 0);
- return;
- }
-
- DeferredDisplayList deferredList(mState.currentRenderTargetClip());
- DeferStateStruct deferStruct(deferredList, *this, replayFlags);
- renderNode->defer(deferStruct, 0);
-
- flushLayers();
- startFrame();
-
- deferredList.flush(*this, dirty);
- } else {
- // Even if there is no drawing command(Ex: invisible),
- // it still needs startFrame to clear buffer and start tiling.
- startFrame();
- }
-}
-
-/**
- * Important note: this method is intended to draw batches of bitmaps and
- * will not set the scissor enable or dirty the current layer, if any.
- * The caller is responsible for properly dirtying the current layer.
- */
-void OpenGLRenderer::drawBitmaps(const SkBitmap* bitmap, AssetAtlas::Entry* entry,
- int bitmapCount, TextureVertex* vertices, bool pureTranslate,
- const Rect& bounds, const SkPaint* paint) {
- Texture* texture = entry ? entry->texture : mCaches.textureCache.get(bitmap);
- if (!texture) return;
-
- const AutoTexture autoCleanup(texture);
-
- // TODO: remove layer dirty in multi-draw callers
- // TODO: snap doesn't need to touch transform, only texture filter.
- bool snap = pureTranslate;
- const float x = floorf(bounds.left + 0.5f);
- const float y = floorf(bounds.top + 0.5f);
-
- const int textureFillFlags = (bitmap->colorType() == kAlpha_8_SkColorType)
- ? TextureFillFlags::IsAlphaMaskTexture : TextureFillFlags::None;
- const int transformFlags = TransformFlags::MeshIgnoresCanvasTransform;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedMesh(vertices, bitmapCount * 6)
- .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewOffsetRectOptionalSnap(snap, x, y, Rect(bounds.getWidth(), bounds.getHeight()))
- .build();
- renderGlop(glop, GlopRenderType::Multi);
-}
-
-void OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) {
- if (quickRejectSetupScissor(0, 0, bitmap->width(), bitmap->height())) {
- return;
- }
-
- mCaches.textureState().activateTexture(0);
- Texture* texture = getTexture(bitmap);
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- const int textureFillFlags = (bitmap->colorType() == kAlpha_8_SkColorType)
- ? TextureFillFlags::IsAlphaMaskTexture : TextureFillFlags::None;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUnitQuad(texture->uvMapper)
- .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewMapUnitToRectSnap(Rect(texture->width(), texture->height()))
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::drawBitmapMesh(const SkBitmap* bitmap, int meshWidth, int meshHeight,
- const float* vertices, const int* colors, const SkPaint* paint) {
- if (!vertices || mState.currentlyIgnored()) {
- return;
- }
-
- float left = FLT_MAX;
- float top = FLT_MAX;
- float right = FLT_MIN;
- float bottom = FLT_MIN;
-
- const uint32_t elementCount = meshWidth * meshHeight * 6;
-
- std::unique_ptr<ColorTextureVertex[]> mesh(new ColorTextureVertex[elementCount]);
- ColorTextureVertex* vertex = &mesh[0];
-
- std::unique_ptr<int[]> tempColors;
- if (!colors) {
- uint32_t colorsCount = (meshWidth + 1) * (meshHeight + 1);
- tempColors.reset(new int[colorsCount]);
- memset(tempColors.get(), 0xff, colorsCount * sizeof(int));
- colors = tempColors.get();
- }
-
- Texture* texture = mRenderState.assetAtlas().getEntryTexture(bitmap->pixelRef());
- const UvMapper& mapper(getMapper(texture));
-
- for (int32_t y = 0; y < meshHeight; y++) {
- for (int32_t x = 0; x < meshWidth; x++) {
- uint32_t i = (y * (meshWidth + 1) + x) * 2;
-
- float u1 = float(x) / meshWidth;
- float u2 = float(x + 1) / meshWidth;
- float v1 = float(y) / meshHeight;
- float v2 = float(y + 1) / meshHeight;
-
- mapper.map(u1, v1, u2, v2);
-
- int ax = i + (meshWidth + 1) * 2;
- int ay = ax + 1;
- int bx = i;
- int by = bx + 1;
- int cx = i + 2;
- int cy = cx + 1;
- int dx = i + (meshWidth + 1) * 2 + 2;
- int dy = dx + 1;
-
- ColorTextureVertex::set(vertex++, vertices[dx], vertices[dy], u2, v2, colors[dx / 2]);
- ColorTextureVertex::set(vertex++, vertices[ax], vertices[ay], u1, v2, colors[ax / 2]);
- ColorTextureVertex::set(vertex++, vertices[bx], vertices[by], u1, v1, colors[bx / 2]);
-
- ColorTextureVertex::set(vertex++, vertices[dx], vertices[dy], u2, v2, colors[dx / 2]);
- ColorTextureVertex::set(vertex++, vertices[bx], vertices[by], u1, v1, colors[bx / 2]);
- ColorTextureVertex::set(vertex++, vertices[cx], vertices[cy], u2, v1, colors[cx / 2]);
-
- left = std::min(left, std::min(vertices[ax], std::min(vertices[bx], vertices[cx])));
- top = std::min(top, std::min(vertices[ay], std::min(vertices[by], vertices[cy])));
- right = std::max(right, std::max(vertices[ax], std::max(vertices[bx], vertices[cx])));
- bottom = std::max(bottom, std::max(vertices[ay], std::max(vertices[by], vertices[cy])));
- }
- }
-
- if (quickRejectSetupScissor(left, top, right, bottom)) {
- return;
- }
-
- if (!texture) {
- texture = mCaches.textureCache.get(bitmap);
- if (!texture) {
- return;
- }
- }
- const AutoTexture autoCleanup(texture);
-
- /*
- * TODO: handle alpha_8 textures correctly by applying paint color, but *not*
- * shader in that case to mimic the behavior in SkiaCanvas::drawBitmapMesh.
- */
- const int textureFillFlags = TextureFillFlags::None;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshColoredTexturedMesh(mesh.get(), elementCount)
- .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewOffsetRect(0, 0, Rect(left, top, right, bottom))
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, Rect src, Rect dst, const SkPaint* paint) {
- if (quickRejectSetupScissor(dst)) {
- return;
- }
-
- Texture* texture = getTexture(bitmap);
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- Rect uv(std::max(0.0f, src.left / texture->width()),
- std::max(0.0f, src.top / texture->height()),
- std::min(1.0f, src.right / texture->width()),
- std::min(1.0f, src.bottom / texture->height()));
-
- const int textureFillFlags = (bitmap->colorType() == kAlpha_8_SkColorType)
- ? TextureFillFlags::IsAlphaMaskTexture : TextureFillFlags::None;
- const bool tryToSnap = MathUtils::areEqual(src.getWidth(), dst.getWidth())
- && MathUtils::areEqual(src.getHeight(), dst.getHeight());
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUvQuad(texture->uvMapper, uv)
- .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewMapUnitToRectOptionalSnap(tryToSnap, dst)
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::drawPatch(const SkBitmap* bitmap, const Patch* mesh,
- AssetAtlas::Entry* entry, float left, float top, float right, float bottom,
- const SkPaint* paint) {
- if (!mesh || !mesh->verticesCount || quickRejectSetupScissor(left, top, right, bottom)) {
- return;
- }
-
- Texture* texture = entry ? entry->texture : mCaches.textureCache.get(bitmap);
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- // 9 patches are built for stretching - always filter
- int textureFillFlags = TextureFillFlags::ForceFilter;
- if (bitmap->colorType() == kAlpha_8_SkColorType) {
- textureFillFlags |= TextureFillFlags::IsAlphaMaskTexture;
- }
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshPatchQuads(*mesh)
- .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewOffsetRectSnap(left, top, Rect(right - left, bottom - top)) // TODO: get minimal bounds from patch
- .build();
- renderGlop(glop);
-}
-
-/**
- * Important note: this method is intended to draw batches of 9-patch objects and
- * will not set the scissor enable or dirty the current layer, if any.
- * The caller is responsible for properly dirtying the current layer.
- */
-void OpenGLRenderer::drawPatches(const SkBitmap* bitmap, AssetAtlas::Entry* entry,
- TextureVertex* vertices, uint32_t elementCount, const SkPaint* paint) {
- mCaches.textureState().activateTexture(0);
- Texture* texture = entry ? entry->texture : mCaches.textureCache.get(bitmap);
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- // TODO: get correct bounds from caller
- const int transformFlags = TransformFlags::MeshIgnoresCanvasTransform;
- // 9 patches are built for stretching - always filter
- int textureFillFlags = TextureFillFlags::ForceFilter;
- if (bitmap->colorType() == kAlpha_8_SkColorType) {
- textureFillFlags |= TextureFillFlags::IsAlphaMaskTexture;
- }
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedIndexedQuads(vertices, elementCount)
- .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewOffsetRect(0, 0, Rect())
- .build();
- renderGlop(glop, GlopRenderType::Multi);
-}
-
-void OpenGLRenderer::drawVertexBuffer(float translateX, float translateY,
- const VertexBuffer& vertexBuffer, const SkPaint* paint, int displayFlags) {
- // not missing call to quickReject/dirtyLayer, always done at a higher level
- if (!vertexBuffer.getVertexCount()) {
- // no vertices to draw
- return;
- }
-
- bool shadowInterp = displayFlags & kVertexBuffer_ShadowInterp;
- const int transformFlags = TransformFlags::OffsetByFudgeFactor;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshVertexBuffer(vertexBuffer)
- .setFillPaint(*paint, currentSnapshot()->alpha, shadowInterp)
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewOffsetRect(translateX, translateY, vertexBuffer.getBounds())
- .build();
- renderGlop(glop);
-}
-
-/**
- * Renders a convex path via tessellation. For AA paths, this function uses a similar approach to
- * that of AA lines in the drawLines() function. We expand the convex path by a half pixel in
- * screen space in all directions. However, instead of using a fragment shader to compute the
- * translucency of the color from its position, we simply use a varying parameter to define how far
- * a given pixel is from the edge. For non-AA paths, the expansion and alpha varying are not used.
- *
- * Doesn't yet support joins, caps, or path effects.
- */
-void OpenGLRenderer::drawConvexPath(const SkPath& path, const SkPaint* paint) {
- VertexBuffer vertexBuffer;
- // TODO: try clipping large paths to viewport
-
- PathTessellator::tessellatePath(path, paint, *currentTransform(), vertexBuffer);
- drawVertexBuffer(vertexBuffer, paint);
-}
-
-/**
- * We create tristrips for the lines much like shape stroke tessellation, using a per-vertex alpha
- * and additional geometry for defining an alpha slope perimeter.
- *
- * Using GL_LINES can be difficult because the rasterization rules for those lines produces some
- * unexpected results, and may vary between hardware devices. Previously we used a varying-base
- * in-shader alpha region, but found it to be taxing on some GPUs.
- *
- * TODO: try using a fixed input buffer for non-capped lines as in text rendering. this may reduce
- * memory transfer by removing need for degenerate vertices.
- */
-void OpenGLRenderer::drawLines(const float* points, int count, const SkPaint* paint) {
- if (mState.currentlyIgnored() || count < 4) return;
-
- count &= ~0x3; // round down to nearest four
-
- VertexBuffer buffer;
- PathTessellator::tessellateLines(points, count, paint, *currentTransform(), buffer);
- const Rect& bounds = buffer.getBounds();
-
- if (quickRejectSetupScissor(bounds.left, bounds.top, bounds.right, bounds.bottom)) {
- return;
- }
-
- int displayFlags = paint->isAntiAlias() ? 0 : kVertexBuffer_Offset;
- drawVertexBuffer(buffer, paint, displayFlags);
-}
-
-void OpenGLRenderer::drawPoints(const float* points, int count, const SkPaint* paint) {
- if (mState.currentlyIgnored() || count < 2) return;
-
- count &= ~0x1; // round down to nearest two
-
- VertexBuffer buffer;
- PathTessellator::tessellatePoints(points, count, paint, *currentTransform(), buffer);
-
- const Rect& bounds = buffer.getBounds();
- if (quickRejectSetupScissor(bounds.left, bounds.top, bounds.right, bounds.bottom)) {
- return;
- }
-
- int displayFlags = paint->isAntiAlias() ? 0 : kVertexBuffer_Offset;
- drawVertexBuffer(buffer, paint, displayFlags);
-
- mDirty = true;
-}
-
-void OpenGLRenderer::drawColor(int color, SkXfermode::Mode mode) {
- // No need to check against the clip, we fill the clip region
- if (mState.currentlyIgnored()) return;
-
- Rect clip(mState.currentRenderTargetClip());
- clip.snapToPixelBoundaries();
-
- SkPaint paint;
- paint.setColor(color);
- paint.setXfermodeMode(mode);
-
- drawColorRect(clip.left, clip.top, clip.right, clip.bottom, &paint, true);
-
- mDirty = true;
-}
-
-void OpenGLRenderer::drawShape(float left, float top, PathTexture* texture,
- const SkPaint* paint) {
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- const float x = left + texture->left - texture->offset;
- const float y = top + texture->top - texture->offset;
-
- drawPathTexture(texture, x, y, paint);
-
- mDirty = true;
-}
-
-void OpenGLRenderer::drawRoundRect(float left, float top, float right, float bottom,
- float rx, float ry, const SkPaint* p) {
- if (mState.currentlyIgnored()
- || quickRejectSetupScissor(left, top, right, bottom, p)
- || PaintUtils::paintWillNotDraw(*p)) {
- return;
- }
-
- if (p->getPathEffect() != nullptr) {
- mCaches.textureState().activateTexture(0);
- PathTexture* texture = mCaches.pathCache.getRoundRect(
- right - left, bottom - top, rx, ry, p);
- drawShape(left, top, texture, p);
- } else {
- const VertexBuffer* vertexBuffer = mCaches.tessellationCache.getRoundRect(
- *currentTransform(), *p, right - left, bottom - top, rx, ry);
- drawVertexBuffer(left, top, *vertexBuffer, p);
- }
-}
-
-void OpenGLRenderer::drawCircle(float x, float y, float radius, const SkPaint* p) {
- if (mState.currentlyIgnored()
- || quickRejectSetupScissor(x - radius, y - radius, x + radius, y + radius, p)
- || PaintUtils::paintWillNotDraw(*p)) {
- return;
- }
-
- if (p->getPathEffect() != nullptr) {
- mCaches.textureState().activateTexture(0);
- PathTexture* texture = mCaches.pathCache.getCircle(radius, p);
- drawShape(x - radius, y - radius, texture, p);
- return;
- }
-
- SkPath path;
- if (p->getStyle() == SkPaint::kStrokeAndFill_Style) {
- path.addCircle(x, y, radius + p->getStrokeWidth() / 2);
- } else {
- path.addCircle(x, y, radius);
- }
-
-#if !HWUI_NEW_OPS
- if (CC_UNLIKELY(currentSnapshot()->projectionPathMask != nullptr)) {
- // mask ripples with projection mask
- SkPath maskPath = *(currentSnapshot()->projectionPathMask->projectionMask);
-
- Matrix4 screenSpaceTransform;
- currentSnapshot()->buildScreenSpaceTransform(&screenSpaceTransform);
-
- Matrix4 totalTransform;
- totalTransform.loadInverse(screenSpaceTransform);
- totalTransform.multiply(currentSnapshot()->projectionPathMask->projectionMaskTransform);
-
- SkMatrix skTotalTransform;
- totalTransform.copyTo(skTotalTransform);
- maskPath.transform(skTotalTransform);
-
- // Mask the ripple path by the projection mask, now that it's
- // in local space. Note that this can create CCW paths.
- Op(path, maskPath, kIntersect_SkPathOp, &path);
- }
-#endif
- drawConvexPath(path, p);
-}
-
-void OpenGLRenderer::drawOval(float left, float top, float right, float bottom,
- const SkPaint* p) {
- if (mState.currentlyIgnored()
- || quickRejectSetupScissor(left, top, right, bottom, p)
- || PaintUtils::paintWillNotDraw(*p)) {
- return;
- }
-
- if (p->getPathEffect() != nullptr) {
- mCaches.textureState().activateTexture(0);
- PathTexture* texture = mCaches.pathCache.getOval(right - left, bottom - top, p);
- drawShape(left, top, texture, p);
- } else {
- SkPath path;
- SkRect rect = SkRect::MakeLTRB(left, top, right, bottom);
- if (p->getStyle() == SkPaint::kStrokeAndFill_Style) {
- rect.outset(p->getStrokeWidth() / 2, p->getStrokeWidth() / 2);
- }
- path.addOval(rect);
- drawConvexPath(path, p);
- }
-}
-
-void OpenGLRenderer::drawArc(float left, float top, float right, float bottom,
- float startAngle, float sweepAngle, bool useCenter, const SkPaint* p) {
- if (mState.currentlyIgnored()
- || quickRejectSetupScissor(left, top, right, bottom, p)
- || PaintUtils::paintWillNotDraw(*p)) {
- return;
- }
-
- // TODO: support fills (accounting for concavity if useCenter && sweepAngle > 180)
- if (p->getStyle() != SkPaint::kStroke_Style || p->getPathEffect() != nullptr || useCenter) {
- mCaches.textureState().activateTexture(0);
- PathTexture* texture = mCaches.pathCache.getArc(right - left, bottom - top,
- startAngle, sweepAngle, useCenter, p);
- drawShape(left, top, texture, p);
- return;
- }
- SkRect rect = SkRect::MakeLTRB(left, top, right, bottom);
- if (p->getStyle() == SkPaint::kStrokeAndFill_Style) {
- rect.outset(p->getStrokeWidth() / 2, p->getStrokeWidth() / 2);
- }
-
- SkPath path;
- if (useCenter) {
- path.moveTo(rect.centerX(), rect.centerY());
- }
- path.arcTo(rect, startAngle, sweepAngle, !useCenter);
- if (useCenter) {
- path.close();
- }
- drawConvexPath(path, p);
-}
-
-void OpenGLRenderer::drawRect(float left, float top, float right, float bottom,
- const SkPaint* p) {
- if (mState.currentlyIgnored()
- || quickRejectSetupScissor(left, top, right, bottom, p)
- || PaintUtils::paintWillNotDraw(*p)) {
- return;
- }
-
- if (p->getStyle() != SkPaint::kFill_Style) {
- // only fill style is supported by drawConvexPath, since others have to handle joins
- static_assert(SkPaintDefaults_MiterLimit == 4.0f, "Miter limit has changed");
- if (p->getPathEffect() != nullptr || p->getStrokeJoin() != SkPaint::kMiter_Join ||
- p->getStrokeMiter() != SkPaintDefaults_MiterLimit) {
- mCaches.textureState().activateTexture(0);
- PathTexture* texture =
- mCaches.pathCache.getRect(right - left, bottom - top, p);
- drawShape(left, top, texture, p);
- } else {
- SkPath path;
- SkRect rect = SkRect::MakeLTRB(left, top, right, bottom);
- if (p->getStyle() == SkPaint::kStrokeAndFill_Style) {
- rect.outset(p->getStrokeWidth() / 2, p->getStrokeWidth() / 2);
- }
- path.addRect(rect);
- drawConvexPath(path, p);
- }
- } else {
- if (p->isAntiAlias() && !currentTransform()->isSimple()) {
- SkPath path;
- path.addRect(left, top, right, bottom);
- drawConvexPath(path, p);
- } else {
- drawColorRect(left, top, right, bottom, p);
-
- mDirty = true;
- }
- }
-}
-
-void OpenGLRenderer::drawTextShadow(const SkPaint* paint, const glyph_t* glyphs,
- int count, const float* positions,
- FontRenderer& fontRenderer, int alpha, float x, float y) {
- mCaches.textureState().activateTexture(0);
-
- PaintUtils::TextShadow textShadow;
- if (!PaintUtils::getTextShadow(paint, &textShadow)) {
- LOG_ALWAYS_FATAL("failed to query shadow attributes");
- }
-
- // NOTE: The drop shadow will not perform gamma correction
- // if shader-based correction is enabled
- mCaches.dropShadowCache.setFontRenderer(fontRenderer);
- ShadowTexture* texture = mCaches.dropShadowCache.get(
- paint, glyphs, count, textShadow.radius, positions);
- // If the drop shadow exceeds the max texture size or couldn't be
- // allocated, skip drawing
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- const float sx = x - texture->left + textShadow.dx;
- const float sy = y - texture->top + textShadow.dy;
-
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUnitQuad(nullptr)
- .setFillShadowTexturePaint(*texture, textShadow.color, *paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewMapUnitToRect(Rect(sx, sy, sx + texture->width(), sy + texture->height()))
- .build();
- renderGlop(glop);
-}
-
-// TODO: remove this, once mState.currentlyIgnored captures snapshot alpha
-bool OpenGLRenderer::canSkipText(const SkPaint* paint) const {
- float alpha = (PaintUtils::hasTextShadow(paint)
- ? 1.0f : paint->getAlpha()) * currentSnapshot()->alpha;
- return MathUtils::isZero(alpha)
- && PaintUtils::getXfermode(paint->getXfermode()) == SkXfermode::kSrcOver_Mode;
-}
-
-bool OpenGLRenderer::findBestFontTransform(const mat4& transform, SkMatrix* outMatrix) const {
- if (CC_LIKELY(transform.isPureTranslate())) {
- outMatrix->setIdentity();
- return false;
- } else if (CC_UNLIKELY(transform.isPerspective())) {
- outMatrix->setIdentity();
- return true;
- }
-
- /**
- * Input is a non-perspective, scaling transform. Generate a scale-only transform,
- * with values rounded to the nearest int.
- */
- float sx, sy;
- transform.decomposeScale(sx, sy);
- outMatrix->setScale(
- roundf(std::max(1.0f, sx)),
- roundf(std::max(1.0f, sy)));
- return true;
-}
-
-int OpenGLRenderer::getSaveCount() const {
- return mState.getSaveCount();
-}
-
-int OpenGLRenderer::save(int flags) {
- return mState.save(flags);
-}
-
-void OpenGLRenderer::restore() {
- mState.restore();
-}
-
-void OpenGLRenderer::restoreToCount(int saveCount) {
- mState.restoreToCount(saveCount);
-}
-
-
-void OpenGLRenderer::translate(float dx, float dy, float dz) {
- mState.translate(dx, dy, dz);
-}
-
-void OpenGLRenderer::rotate(float degrees) {
- mState.rotate(degrees);
-}
-
-void OpenGLRenderer::scale(float sx, float sy) {
- mState.scale(sx, sy);
-}
-
-void OpenGLRenderer::skew(float sx, float sy) {
- mState.skew(sx, sy);
-}
-
-void OpenGLRenderer::setLocalMatrix(const Matrix4& matrix) {
- mState.setMatrix(mBaseTransform);
- mState.concatMatrix(matrix);
-}
-
-void OpenGLRenderer::setLocalMatrix(const SkMatrix& matrix) {
- mState.setMatrix(mBaseTransform);
- mState.concatMatrix(matrix);
-}
-
-void OpenGLRenderer::concatMatrix(const Matrix4& matrix) {
- mState.concatMatrix(matrix);
-}
-
-bool OpenGLRenderer::clipRect(float left, float top, float right, float bottom, SkRegion::Op op) {
- return mState.clipRect(left, top, right, bottom, op);
-}
-
-bool OpenGLRenderer::clipPath(const SkPath* path, SkRegion::Op op) {
- return mState.clipPath(path, op);
-}
-
-bool OpenGLRenderer::clipRegion(const SkRegion* region, SkRegion::Op op) {
- return mState.clipRegion(region, op);
-}
-
-void OpenGLRenderer::setClippingOutline(LinearAllocator& allocator, const Outline* outline) {
- mState.setClippingOutline(allocator, outline);
-}
-
-void OpenGLRenderer::setClippingRoundRect(LinearAllocator& allocator,
- const Rect& rect, float radius, bool highPriority) {
- mState.setClippingRoundRect(allocator, rect, radius, highPriority);
-}
-
-void OpenGLRenderer::setProjectionPathMask(LinearAllocator& allocator, const SkPath* path) {
- mState.setProjectionPathMask(allocator, path);
-}
-
-void OpenGLRenderer::drawText(const glyph_t* glyphs, int bytesCount, int count, float x, float y,
- const float* positions, const SkPaint* paint, float totalAdvance, const Rect& bounds,
- DrawOpMode drawOpMode) {
-
- if (drawOpMode == DrawOpMode::kImmediate) {
- // The checks for corner-case ignorable text and quick rejection is only done for immediate
- // drawing as ops from DeferredDisplayList are already filtered for these
- if (glyphs == nullptr || count == 0 || mState.currentlyIgnored() || canSkipText(paint) ||
- quickRejectSetupScissor(bounds)) {
- return;
- }
- }
-
- const float oldX = x;
- const float oldY = y;
-
- const mat4& transform = *currentTransform();
- const bool pureTranslate = transform.isPureTranslate();
-
- if (CC_LIKELY(pureTranslate)) {
- x = floorf(x + transform.getTranslateX() + 0.5f);
- y = floorf(y + transform.getTranslateY() + 0.5f);
- }
-
- int alpha = PaintUtils::getAlphaDirect(paint) * currentSnapshot()->alpha;
- SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(paint);
-
- FontRenderer& fontRenderer = mCaches.fontRenderer.getFontRenderer();
-
- if (CC_UNLIKELY(PaintUtils::hasTextShadow(paint))) {
- fontRenderer.setFont(paint, SkMatrix::I());
- drawTextShadow(paint, glyphs, count, positions, fontRenderer,
- alpha, oldX, oldY);
- }
-
- const bool hasActiveLayer = hasLayer();
-
- // We only pass a partial transform to the font renderer. That partial
- // matrix defines how glyphs are rasterized. Typically we want glyphs
- // to be rasterized at their final size on screen, which means the partial
- // matrix needs to take the scale factor into account.
- // When a partial matrix is used to transform glyphs during rasterization,
- // the mesh is generated with the inverse transform (in the case of scale,
- // the mesh is generated at 1.0 / scale for instance.) This allows us to
- // apply the full transform matrix at draw time in the vertex shader.
- // Applying the full matrix in the shader is the easiest way to handle
- // rotation and perspective and allows us to always generated quads in the
- // font renderer which greatly simplifies the code, clipping in particular.
- SkMatrix fontTransform;
- bool linearFilter = findBestFontTransform(transform, &fontTransform)
- || fabs(y - (int) y) > 0.0f
- || fabs(x - (int) x) > 0.0f;
- fontRenderer.setFont(paint, fontTransform);
- fontRenderer.setTextureFiltering(linearFilter);
-
- // TODO: Implement better clipping for scaled/rotated text
- const Rect* clip = !pureTranslate ? nullptr : &mState.currentRenderTargetClip();
- Rect layerBounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f);
-
- bool status;
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("unsupported");
- TextDrawFunctor functor(nullptr, nullptr, nullptr, x, y, pureTranslate, alpha, mode, paint);
-#else
- TextDrawFunctor functor(this, x, y, pureTranslate, alpha, mode, paint);
-#endif
-
- // don't call issuedrawcommand, do it at end of batch
- bool forceFinish = (drawOpMode != DrawOpMode::kDefer);
- if (CC_UNLIKELY(paint->getTextAlign() != SkPaint::kLeft_Align)) {
- SkPaint paintCopy(*paint);
- paintCopy.setTextAlign(SkPaint::kLeft_Align);
- status = fontRenderer.renderPosText(&paintCopy, clip, glyphs, count, x, y,
- positions, hasActiveLayer ? &layerBounds : nullptr, &functor, forceFinish);
- } else {
- status = fontRenderer.renderPosText(paint, clip, glyphs, count, x, y,
- positions, hasActiveLayer ? &layerBounds : nullptr, &functor, forceFinish);
- }
-
- if ((status || drawOpMode != DrawOpMode::kImmediate) && hasActiveLayer) {
- if (!pureTranslate) {
- transform.mapRect(layerBounds);
- }
- dirtyLayerUnchecked(layerBounds, getRegion());
- }
-
- mDirty = true;
-}
-
-void OpenGLRenderer::drawTextOnPath(const glyph_t* glyphs, int bytesCount, int count,
- const SkPath* path, float hOffset, float vOffset, const SkPaint* paint) {
- if (glyphs == nullptr || count == 0 || mState.currentlyIgnored() || canSkipText(paint)) {
- return;
- }
-
- // TODO: avoid scissor by calculating maximum bounds using path bounds + font metrics
- mRenderState.scissor().setEnabled(true);
-
- FontRenderer& fontRenderer = mCaches.fontRenderer.getFontRenderer();
- fontRenderer.setFont(paint, SkMatrix::I());
- fontRenderer.setTextureFiltering(true);
-
- int alpha = PaintUtils::getAlphaDirect(paint) * currentSnapshot()->alpha;
- SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(paint);
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("unsupported");
- TextDrawFunctor functor(nullptr, nullptr, nullptr, 0.0f, 0.0f, false, alpha, mode, paint);
-#else
- TextDrawFunctor functor(this, 0.0f, 0.0f, false, alpha, mode, paint);
-#endif
-
- const Rect* clip = &writableSnapshot()->getLocalClip();
- Rect bounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f);
-
- if (fontRenderer.renderTextOnPath(paint, clip, glyphs, count, path,
- hOffset, vOffset, hasLayer() ? &bounds : nullptr, &functor)) {
- dirtyLayer(bounds.left, bounds.top, bounds.right, bounds.bottom, *currentTransform());
- mDirty = true;
- }
-}
-
-void OpenGLRenderer::drawPath(const SkPath* path, const SkPaint* paint) {
- if (mState.currentlyIgnored()) return;
-
- mCaches.textureState().activateTexture(0);
-
- PathTexture* texture = mCaches.pathCache.get(path, paint);
- if (!texture) return;
-
- const float x = texture->left - texture->offset;
- const float y = texture->top - texture->offset;
-
- drawPathTexture(texture, x, y, paint);
-
- if (texture->cleanup) {
- mCaches.pathCache.remove(path, paint);
- }
- mDirty = true;
-}
-
-void OpenGLRenderer::drawLayer(Layer* layer) {
- if (!layer) {
- return;
- }
-
- mat4* transform = nullptr;
- if (layer->isTextureLayer()) {
- transform = &layer->getTransform();
- if (!transform->isIdentity()) {
- save(SaveFlags::Matrix);
- concatMatrix(*transform);
- }
- }
-
- bool clipRequired = false;
- const bool rejected = mState.calculateQuickRejectForScissor(
- 0, 0, layer->layer.getWidth(), layer->layer.getHeight(),
- &clipRequired, nullptr, false);
-
- if (rejected) {
- if (transform && !transform->isIdentity()) {
- restore();
- }
- return;
- }
-
- EVENT_LOGD("drawLayer," RECT_STRING ", clipRequired %d", x, y,
- x + layer->layer.getWidth(), y + layer->layer.getHeight(), clipRequired);
-
- updateLayer(layer, true);
-
- mRenderState.scissor().setEnabled(mScissorOptimizationDisabled || clipRequired);
- mCaches.textureState().activateTexture(0);
-
- if (CC_LIKELY(!layer->region.isEmpty())) {
- if (layer->region.isRect()) {
- DRAW_DOUBLE_STENCIL_IF(!layer->hasDrawnSinceUpdate,
- composeLayerRect(layer, layer->regionRect));
- } else if (layer->mesh) {
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedIndexedQuads(layer->mesh, layer->meshElementCount)
- .setFillLayer(layer->getTexture(), layer->getColorFilter(), getLayerAlpha(layer), layer->getMode(), Blend::ModeOrderSwap::NoSwap)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewOffsetRectSnap(0, 0, Rect(layer->layer.getWidth(), layer->layer.getHeight()))
- .build();
- DRAW_DOUBLE_STENCIL_IF(!layer->hasDrawnSinceUpdate, renderGlop(glop));
-#if DEBUG_LAYERS_AS_REGIONS
- drawRegionRectsDebug(layer->region);
-#endif
- }
-
- if (layer->debugDrawUpdate) {
- layer->debugDrawUpdate = false;
-
- SkPaint paint;
- paint.setColor(0x7f00ff00);
- drawColorRect(0, 0, layer->layer.getWidth(), layer->layer.getHeight(), &paint);
- }
- }
- layer->hasDrawnSinceUpdate = true;
-
- if (transform && !transform->isIdentity()) {
- restore();
- }
-
- mDirty = true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Draw filters
-///////////////////////////////////////////////////////////////////////////////
-void OpenGLRenderer::setDrawFilter(SkDrawFilter* filter) {
- // We should never get here since we apply the draw filter when stashing
- // the paints in the DisplayList.
- LOG_ALWAYS_FATAL("OpenGLRenderer does not directly support DrawFilters");
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Drawing implementation
-///////////////////////////////////////////////////////////////////////////////
-
-Texture* OpenGLRenderer::getTexture(const SkBitmap* bitmap) {
- Texture* texture = mRenderState.assetAtlas().getEntryTexture(bitmap->pixelRef());
- if (!texture) {
- return mCaches.textureCache.get(bitmap);
- }
- return texture;
-}
-
-void OpenGLRenderer::drawPathTexture(PathTexture* texture, float x, float y,
- const SkPaint* paint) {
- if (quickRejectSetupScissor(x, y, x + texture->width(), y + texture->height())) {
- return;
- }
-
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshTexturedUnitQuad(nullptr)
- .setFillPathTexturePaint(*texture, *paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), TransformFlags::None)
- .setModelViewMapUnitToRect(Rect(x, y, x + texture->width(), y + texture->height()))
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::drawRects(const float* rects, int count, const SkPaint* paint) {
- if (mState.currentlyIgnored()) {
- return;
- }
-
- drawColorRects(rects, count, paint, false, true, true);
-}
-
-void OpenGLRenderer::drawShadow(float casterAlpha,
- const VertexBuffer* ambientShadowVertexBuffer, const VertexBuffer* spotShadowVertexBuffer) {
- if (mState.currentlyIgnored()) return;
-
- // TODO: use quickRejectWithScissor. For now, always force enable scissor.
- mRenderState.scissor().setEnabled(true);
-
- SkPaint paint;
- paint.setAntiAlias(true); // want to use AlphaVertex
-
- // The caller has made sure casterAlpha > 0.
- float ambientShadowAlpha = mAmbientShadowAlpha;
- if (CC_UNLIKELY(Properties::overrideAmbientShadowStrength >= 0)) {
- ambientShadowAlpha = Properties::overrideAmbientShadowStrength;
- }
- if (ambientShadowVertexBuffer && ambientShadowAlpha > 0) {
- paint.setARGB(casterAlpha * ambientShadowAlpha, 0, 0, 0);
- drawVertexBuffer(*ambientShadowVertexBuffer, &paint, kVertexBuffer_ShadowInterp);
- }
-
- float spotShadowAlpha = mSpotShadowAlpha;
- if (CC_UNLIKELY(Properties::overrideSpotShadowStrength >= 0)) {
- spotShadowAlpha = Properties::overrideSpotShadowStrength;
- }
- if (spotShadowVertexBuffer && spotShadowAlpha > 0) {
- paint.setARGB(casterAlpha * spotShadowAlpha, 0, 0, 0);
- drawVertexBuffer(*spotShadowVertexBuffer, &paint, kVertexBuffer_ShadowInterp);
- }
-
- mDirty=true;
-}
-
-void OpenGLRenderer::drawColorRects(const float* rects, int count, const SkPaint* paint,
- bool ignoreTransform, bool dirty, bool clip) {
- if (count == 0) {
- return;
- }
-
- float left = FLT_MAX;
- float top = FLT_MAX;
- float right = FLT_MIN;
- float bottom = FLT_MIN;
-
- Vertex mesh[count];
- Vertex* vertex = mesh;
-
- for (int index = 0; index < count; index += 4) {
- float l = rects[index + 0];
- float t = rects[index + 1];
- float r = rects[index + 2];
- float b = rects[index + 3];
-
- Vertex::set(vertex++, l, t);
- Vertex::set(vertex++, r, t);
- Vertex::set(vertex++, l, b);
- Vertex::set(vertex++, r, b);
-
- left = std::min(left, l);
- top = std::min(top, t);
- right = std::max(right, r);
- bottom = std::max(bottom, b);
- }
-
- if (clip && quickRejectSetupScissor(left, top, right, bottom)) {
- return;
- }
-
- const int transformFlags = ignoreTransform
- ? TransformFlags::MeshIgnoresCanvasTransform : TransformFlags::None;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshIndexedQuads(&mesh[0], count / 4)
- .setFillPaint(*paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewOffsetRect(0, 0, Rect(left, top, right, bottom))
- .build();
- renderGlop(glop);
-}
-
-void OpenGLRenderer::drawColorRect(float left, float top, float right, float bottom,
- const SkPaint* paint, bool ignoreTransform) {
- const int transformFlags = ignoreTransform
- ? TransformFlags::MeshIgnoresCanvasTransform : TransformFlags::None;
- Glop glop;
- GlopBuilder(mRenderState, mCaches, &glop)
- .setRoundRectClipState(currentSnapshot()->roundRectClipState)
- .setMeshUnitQuad()
- .setFillPaint(*paint, currentSnapshot()->alpha)
- .setTransform(*currentSnapshot(), transformFlags)
- .setModelViewMapUnitToRect(Rect(left, top, right, bottom))
- .build();
- renderGlop(glop);
-}
-
-float OpenGLRenderer::getLayerAlpha(const Layer* layer) const {
- return (layer->getAlpha() / 255.0f) * currentSnapshot()->alpha;
-}
-
-}; // namespace uirenderer
-}; // namespace android
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
deleted file mode 100755
index dacd8cc..0000000
--- a/libs/hwui/OpenGLRenderer.h
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HWUI_OPENGL_RENDERER_H
-#define ANDROID_HWUI_OPENGL_RENDERER_H
-
-#include "CanvasState.h"
-#include "Debug.h"
-#include "Extensions.h"
-#include "Matrix.h"
-#include "Program.h"
-#include "Rect.h"
-#include "Snapshot.h"
-#include "UvMapper.h"
-#include "Vertex.h"
-#include "Caches.h"
-#include "utils/PaintUtils.h"
-
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#include <SkBitmap.h>
-#include <SkCanvas.h>
-#include <SkColorFilter.h>
-#include <SkDrawLooper.h>
-#include <SkMatrix.h>
-#include <SkPaint.h>
-#include <SkRegion.h>
-#include <SkXfermode.h>
-
-#include <utils/Blur.h>
-#include <utils/Functor.h>
-#include <utils/RefBase.h>
-#include <utils/SortedVector.h>
-
-#include <cutils/compiler.h>
-
-#include <androidfw/ResourceTypes.h>
-
-#include <vector>
-
-class SkShader;
-
-namespace android {
-namespace uirenderer {
-
-enum class DrawOpMode {
- kImmediate,
- kDefer,
- kFlush
-};
-
-class DeferredDisplayState;
-struct Glop;
-class RenderState;
-class RenderNode;
-class TextDrawFunctor;
-class VertexBuffer;
-
-enum StateDeferFlags {
- kStateDeferFlag_Draw = 0x1,
- kStateDeferFlag_Clip = 0x2
-};
-
-enum ClipSideFlags {
- kClipSide_None = 0x0,
- kClipSide_Left = 0x1,
- kClipSide_Top = 0x2,
- kClipSide_Right = 0x4,
- kClipSide_Bottom = 0x8,
- kClipSide_Full = 0xF,
- kClipSide_ConservativeFull = 0x1F
-};
-
-enum VertexBufferDisplayFlags {
- kVertexBuffer_Offset = 0x1,
- kVertexBuffer_ShadowInterp = 0x2,
-};
-
-/**
- * Defines additional transformation that should be applied by the model view matrix, beyond that of
- * the currentTransform()
- */
-enum ModelViewMode {
- /**
- * Used when the model view should simply translate geometry passed to the shader. The resulting
- * matrix will be a simple translation.
- */
- kModelViewMode_Translate = 0,
-
- /**
- * Used when the model view should translate and scale geometry. The resulting matrix will be a
- * translation + scale. This is frequently used together with VBO 0, the (0,0,1,1) rect.
- */
- kModelViewMode_TranslateAndScale = 1,
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Renderer
-///////////////////////////////////////////////////////////////////////////////
-/**
- * OpenGL Renderer implementation.
- */
-class OpenGLRenderer : public CanvasStateClient {
-public:
- OpenGLRenderer(RenderState& renderState);
- virtual ~OpenGLRenderer();
-
- void initProperties();
- void initLight(float lightRadius, uint8_t ambientShadowAlpha,
- uint8_t spotShadowAlpha);
- void setLightCenter(const Vector3& lightCenter);
-
- /*
- * Prepares the renderer to draw a frame. This method must be invoked
- * at the beginning of each frame. Only the specified rectangle of the
- * frame is assumed to be dirty. A clip will automatically be set to
- * the specified rectangle.
- *
- * @param opaque If true, the target surface is considered opaque
- * and will not be cleared. If false, the target surface
- * will be cleared
- */
- virtual void prepareDirty(int viewportWidth, int viewportHeight,
- float left, float top, float right, float bottom, bool opaque);
-
- /**
- * Indicates the end of a frame. This method must be invoked whenever
- * the caller is done rendering a frame.
- * Returns true if any drawing was done during the frame (the output
- * has changed / is "dirty" and should be displayed to the user).
- */
- virtual bool finish();
-
- void callDrawGLFunction(Functor* functor, Rect& dirty);
-
- void pushLayerUpdate(Layer* layer);
- void cancelLayerUpdate(Layer* layer);
- void flushLayerUpdates();
- void markLayersAsBuildLayers();
-
- virtual int saveLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags) {
- return saveLayer(left, top, right, bottom, paint, flags, nullptr);
- }
-
- // Specialized saveLayer implementation, which will pass the convexMask to an FBO layer, if
- // created, which will in turn clip to that mask when drawn back/restored.
- int saveLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags, const SkPath* convexMask);
-
- int saveLayerDeferred(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags);
-
- void drawRenderNode(RenderNode* displayList, Rect& dirty, int32_t replayFlags = 1);
- void drawLayer(Layer* layer);
- void drawBitmap(const SkBitmap* bitmap, const SkPaint* paint);
- void drawBitmaps(const SkBitmap* bitmap, AssetAtlas::Entry* entry, int bitmapCount,
- TextureVertex* vertices, bool pureTranslate, const Rect& bounds, const SkPaint* paint);
- void drawBitmap(const SkBitmap* bitmap, Rect src, Rect dst,
- const SkPaint* paint);
- void drawBitmapMesh(const SkBitmap* bitmap, int meshWidth, int meshHeight,
- const float* vertices, const int* colors, const SkPaint* paint);
- void drawPatches(const SkBitmap* bitmap, AssetAtlas::Entry* entry,
- TextureVertex* vertices, uint32_t indexCount, const SkPaint* paint);
- void drawPatch(const SkBitmap* bitmap, const Patch* mesh, AssetAtlas::Entry* entry,
- float left, float top, float right, float bottom, const SkPaint* paint);
- void drawColor(int color, SkXfermode::Mode mode);
- void drawRect(float left, float top, float right, float bottom,
- const SkPaint* paint);
- void drawRoundRect(float left, float top, float right, float bottom,
- float rx, float ry, const SkPaint* paint);
- void drawCircle(float x, float y, float radius, const SkPaint* paint);
- void drawOval(float left, float top, float right, float bottom,
- const SkPaint* paint);
- void drawArc(float left, float top, float right, float bottom,
- float startAngle, float sweepAngle, bool useCenter, const SkPaint* paint);
- void drawPath(const SkPath* path, const SkPaint* paint);
- void drawLines(const float* points, int count, const SkPaint* paint);
- void drawPoints(const float* points, int count, const SkPaint* paint);
- void drawTextOnPath(const glyph_t* glyphs, int bytesCount, int count, const SkPath* path,
- float hOffset, float vOffset, const SkPaint* paint);
- void drawText(const glyph_t* glyphs, int bytesCount, int count, float x, float y,
- const float* positions, const SkPaint* paint, float totalAdvance, const Rect& bounds,
- DrawOpMode drawOpMode = DrawOpMode::kImmediate);
- void drawRects(const float* rects, int count, const SkPaint* paint);
-
- void drawShadow(float casterAlpha,
- const VertexBuffer* ambientShadowVertexBuffer,
- const VertexBuffer* spotShadowVertexBuffer);
-
- void setDrawFilter(SkDrawFilter* filter);
-
- /**
- * Store the current display state (most importantly, the current clip and transform), and
- * additionally map the state's bounds from local to window coordinates.
- *
- * Returns true if quick-rejected
- */
- bool storeDisplayState(DeferredDisplayState& state, int stateDeferFlags);
- void restoreDisplayState(const DeferredDisplayState& state, bool skipClipRestore = false);
- void setupMergedMultiDraw(const Rect* clipRect);
-
- bool isCurrentTransformSimple() {
- return currentTransform()->isSimple();
- }
-
- Caches& getCaches() {
- return mCaches;
- }
-
- RenderState& renderState() {
- return mRenderState;
- }
-
- int getViewportWidth() { return mState.getViewportWidth(); }
- int getViewportHeight() { return mState.getViewportHeight(); }
-
- /**
- * Scales the alpha on the current snapshot. This alpha value will be modulated
- * with other alpha values when drawing primitives.
- */
- void scaleAlpha(float alpha) { mState.scaleAlpha(alpha); }
-
- /**
- * Inserts a named event marker in the stream of GL commands.
- */
- void eventMark(const char* name) const;
-
- /**
- * Inserts a formatted event marker in the stream of GL commands.
- */
- void eventMarkDEBUG(const char *fmt, ...) const;
-
- /**
- * Inserts a named group marker in the stream of GL commands. This marker
- * can be used by tools to group commands into logical groups. A call to
- * this method must always be followed later on by a call to endMark().
- */
- void startMark(const char* name) const;
-
- /**
- * Closes the last group marker opened by startMark().
- */
- void endMark() const;
-
- /**
- * Build the best transform to use to rasterize text given a full
- * transform matrix, and whether filteration is needed.
- *
- * Returns whether filtration is needed
- */
- bool findBestFontTransform(const mat4& transform, SkMatrix* outMatrix) const;
-
-#if DEBUG_MERGE_BEHAVIOR
- void drawScreenSpaceColorRect(float left, float top, float right, float bottom, int color) {
- mCaches.setScissorEnabled(false);
-
- // should only be called outside of other draw ops, so stencil can only be in test state
- bool stencilWasEnabled = mCaches.stencil.isTestEnabled();
- mCaches.stencil.disable();
-
- drawColorRect(left, top, right, bottom, color, SkXfermode::kSrcOver_Mode, true);
-
- if (stencilWasEnabled) mCaches.stencil.enableTest();
- mDirty = true;
- }
-#endif
-
- const Vector3& getLightCenter() const { return mState.currentLightCenter(); }
- float getLightRadius() const { return mLightRadius; }
- uint8_t getAmbientShadowAlpha() const { return mAmbientShadowAlpha; }
- uint8_t getSpotShadowAlpha() const { return mSpotShadowAlpha; }
-
- ///////////////////////////////////////////////////////////////////
- /// State manipulation
-
- int getSaveCount() const;
- int save(int flags);
- void restore();
- void restoreToCount(int saveCount);
-
- void setGlobalMatrix(const Matrix4& matrix) {
- mState.setMatrix(matrix);
- }
- void setLocalMatrix(const Matrix4& matrix);
- void setLocalMatrix(const SkMatrix& matrix);
- void concatMatrix(const SkMatrix& matrix) { mState.concatMatrix(matrix); }
-
- void translate(float dx, float dy, float dz = 0.0f);
- void rotate(float degrees);
- void scale(float sx, float sy);
- void skew(float sx, float sy);
-
- void setMatrix(const Matrix4& matrix); // internal only convenience method
- void concatMatrix(const Matrix4& matrix); // internal only convenience method
-
- const Rect& getLocalClipBounds() const { return mState.getLocalClipBounds(); }
- const Rect& getRenderTargetClipBounds() const { return mState.getRenderTargetClipBounds(); }
- bool quickRejectConservative(float left, float top,
- float right, float bottom) const {
- return mState.quickRejectConservative(left, top, right, bottom);
- }
-
- bool clipRect(float left, float top,
- float right, float bottom, SkRegion::Op op);
- bool clipPath(const SkPath* path, SkRegion::Op op);
- bool clipRegion(const SkRegion* region, SkRegion::Op op);
-
- /**
- * Does not support different clipping Ops (that is, every call to setClippingOutline is
- * effectively using SkRegion::kReplaceOp)
- *
- * The clipping outline is independent from the regular clip.
- */
- void setClippingOutline(LinearAllocator& allocator, const Outline* outline);
- void setClippingRoundRect(LinearAllocator& allocator,
- const Rect& rect, float radius, bool highPriority = true);
- void setProjectionPathMask(LinearAllocator& allocator, const SkPath* path);
-
- inline bool hasRectToRectTransform() const { return mState.hasRectToRectTransform(); }
- inline const mat4* currentTransform() const { return mState.currentTransform(); }
-
- ///////////////////////////////////////////////////////////////////
- /// CanvasStateClient interface
-
- virtual void onViewportInitialized() override;
- virtual void onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) override;
- virtual GLuint getTargetFbo() const override { return 0; }
-
- SkPath* allocPathForFrame() {
- std::unique_ptr<SkPath> path(new SkPath());
- SkPath* returnPath = path.get();
- mTempPaths.push_back(std::move(path));
- return returnPath;
- }
-
- void setBaseTransform(const Matrix4& matrix) { mBaseTransform = matrix; }
-
-protected:
- /**
- * Perform the setup specific to a frame. This method does not
- * issue any OpenGL commands.
- */
- void setupFrameState(int viewportWidth, int viewportHeight,
- float left, float top, float right, float bottom, bool opaque);
-
- /**
- * Indicates the start of rendering. This method will setup the
- * initial OpenGL state (viewport, clearing the buffer, etc.)
- */
- void startFrame();
-
- /**
- * Clears the underlying surface if needed.
- */
- virtual void clear(float left, float top, float right, float bottom, bool opaque);
-
- /**
- * Call this method after updating a layer during a drawing pass.
- */
- void resumeAfterLayer();
-
- /**
- * This method is called whenever a stencil buffer is required. Subclasses
- * should override this method and call attachStencilBufferToLayer() on the
- * appropriate layer(s).
- */
- virtual void ensureStencilBuffer();
-
- /**
- * Obtains a stencil render buffer (allocating it if necessary) and
- * attaches it to the specified layer.
- */
- void attachStencilBufferToLayer(Layer* layer);
-
- /**
- * Draw a rectangle list. Currently only used for the the stencil buffer so that the stencil
- * will have a value of 'n' in every unclipped pixel, where 'n' is the number of rectangles
- * in the list.
- */
- void drawRectangleList(const RectangleList& rectangleList);
-
- bool quickRejectSetupScissor(float left, float top, float right, float bottom,
- const SkPaint* paint = nullptr);
- bool quickRejectSetupScissor(const Rect& bounds, const SkPaint* paint = nullptr) {
- return quickRejectSetupScissor(bounds.left, bounds.top,
- bounds.right, bounds.bottom, paint);
- }
-
- /**
- * Compose the layer defined in the current snapshot with the layer
- * defined by the previous snapshot.
- *
- * The current snapshot *must* be a layer (flag kFlagIsLayer set.)
- *
- * @param curent The current snapshot containing the layer to compose
- * @param previous The previous snapshot to compose the current layer with
- */
- virtual void composeLayer(const Snapshot& current, const Snapshot& previous);
-
- /**
- * Marks the specified region as dirty at the specified bounds.
- */
- void dirtyLayerUnchecked(Rect& bounds, Region* region);
-
- /**
- * Returns the region of the current layer.
- */
- virtual Region* getRegion() const {
- return mState.currentRegion();
- }
-
- /**
- * Indicates whether rendering is currently targeted at a layer.
- */
- virtual bool hasLayer() const {
- return (mState.currentFlags() & Snapshot::kFlagFboTarget) && mState.currentRegion();
- }
-
- /**
- * Renders the specified layer as a textured quad.
- *
- * @param layer The layer to render
- * @param rect The bounds of the layer
- */
- void drawTextureLayer(Layer* layer, const Rect& rect);
-
- /**
- * Gets the alpha from a layer, accounting for snapshot alpha
- *
- * @param layer The layer from which the alpha is extracted
- */
- inline float getLayerAlpha(const Layer* layer) const;
-
- /**
- * Set to true to suppress error checks at the end of a frame.
- */
- virtual bool suppressErrorChecks() const {
- return false;
- }
-
- CanvasState mState;
- Caches& mCaches;
- RenderState& mRenderState;
-
-private:
- enum class GlopRenderType {
- Standard,
- Multi,
- LayerClear
- };
-
- void renderGlop(const Glop& glop, GlopRenderType type = GlopRenderType::Standard);
-
- /**
- * Discards the content of the framebuffer if supported by the driver.
- * This method should be called at the beginning of a frame to optimize
- * rendering on some tiler architectures.
- */
- void discardFramebuffer(float left, float top, float right, float bottom);
-
- /**
- * Sets the clipping rectangle using glScissor. The clip is defined by
- * the current snapshot's clipRect member.
- */
- void setScissorFromClip();
-
- /**
- * Sets the clipping region using the stencil buffer. The clip region
- * is defined by the current snapshot's clipRegion member.
- */
- void setStencilFromClip();
-
- /**
- * Given the local bounds of the layer, calculates ...
- */
- void calculateLayerBoundsAndClip(Rect& bounds, Rect& clip, bool fboLayer);
-
- /**
- * Given the local bounds + clip of the layer, updates current snapshot's empty/invisible
- */
- void updateSnapshotIgnoreForLayer(const Rect& bounds, const Rect& clip,
- bool fboLayer, int alpha);
-
- /**
- * Creates a new layer stored in the specified snapshot.
- *
- * @param snapshot The snapshot associated with the new layer
- * @param left The left coordinate of the layer
- * @param top The top coordinate of the layer
- * @param right The right coordinate of the layer
- * @param bottom The bottom coordinate of the layer
- * @param alpha The translucency of the layer
- * @param mode The blending mode of the layer
- * @param flags The layer save flags
- * @param mask A mask to use when drawing the layer back, may be empty
- *
- * @return True if the layer was successfully created, false otherwise
- */
- bool createLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, int flags, const SkPath* convexMask);
-
- /**
- * Creates a new layer stored in the specified snapshot as an FBO.
- *
- * @param layer The layer to store as an FBO
- * @param snapshot The snapshot associated with the new layer
- * @param bounds The bounds of the layer
- */
- bool createFboLayer(Layer* layer, Rect& bounds, Rect& clip);
-
- /**
- * Compose the specified layer as a region.
- *
- * @param layer The layer to compose
- * @param rect The layer's bounds
- */
- void composeLayerRegion(Layer* layer, const Rect& rect);
-
- /**
- * Restores the content in layer to the screen, swapping the blend mode,
- * specifically used in the restore() of a saveLayerAlpha().
- *
- * This allows e.g. a layer that would have been drawn on top of existing content (with SrcOver)
- * to be drawn underneath.
- *
- * This will always ignore the canvas transform.
- */
- void composeLayerRectSwapped(Layer* layer, const Rect& rect);
-
- /**
- * Draws the content in layer to the screen.
- */
- void composeLayerRect(Layer* layer, const Rect& rect);
-
- /**
- * Clears all the regions corresponding to the current list of layers.
- * This method MUST be invoked before any drawing operation.
- */
- void clearLayerRegions();
-
- /**
- * Mark the layer as dirty at the specified coordinates. The coordinates
- * are transformed with the supplied matrix.
- */
- void dirtyLayer(const float left, const float top,
- const float right, const float bottom, const Matrix4& transform);
-
- /**
- * Mark the layer as dirty at the specified coordinates.
- */
- void dirtyLayer(const float left, const float top,
- const float right, const float bottom);
-
- /**
- * Draws a colored rectangle with the specified color. The specified coordinates
- * are transformed by the current snapshot's transform matrix unless specified
- * otherwise.
- *
- * @param left The left coordinate of the rectangle
- * @param top The top coordinate of the rectangle
- * @param right The right coordinate of the rectangle
- * @param bottom The bottom coordinate of the rectangle
- * @param paint The paint containing the color, blending mode, etc.
- * @param ignoreTransform True if the current transform should be ignored
- */
- void drawColorRect(float left, float top, float right, float bottom,
- const SkPaint* paint, bool ignoreTransform = false);
-
- /**
- * Draws a series of colored rectangles with the specified color. The specified
- * coordinates are transformed by the current snapshot's transform matrix unless
- * specified otherwise.
- *
- * @param rects A list of rectangles, 4 floats (left, top, right, bottom)
- * per rectangle
- * @param paint The paint containing the color, blending mode, etc.
- * @param ignoreTransform True if the current transform should be ignored
- * @param dirty True if calling this method should dirty the current layer
- * @param clip True if the rects should be clipped, false otherwise
- */
- void drawColorRects(const float* rects, int count, const SkPaint* paint,
- bool ignoreTransform = false, bool dirty = true, bool clip = true);
-
- /**
- * Draws the shape represented by the specified path texture.
- * This method invokes drawPathTexture() but takes into account
- * the extra left/top offset and the texture offset to correctly
- * position the final shape.
- *
- * @param left The left coordinate of the shape to render
- * @param top The top coordinate of the shape to render
- * @param texture The texture reprsenting the shape
- * @param paint The paint to draw the shape with
- */
- void drawShape(float left, float top, PathTexture* texture, const SkPaint* paint);
-
- /**
- * Renders a strip of polygons with the specified paint, used for tessellated geometry.
- *
- * @param vertexBuffer The VertexBuffer to be drawn
- * @param paint The paint to render with
- * @param flags flags with which to draw
- */
- void drawVertexBuffer(float translateX, float translateY, const VertexBuffer& vertexBuffer,
- const SkPaint* paint, int flags = 0);
-
- /**
- * Convenience for translating method
- */
- void drawVertexBuffer(const VertexBuffer& vertexBuffer,
- const SkPaint* paint, int flags = 0) {
- drawVertexBuffer(0.0f, 0.0f, vertexBuffer, paint, flags);
- }
-
- /**
- * Renders the convex hull defined by the specified path as a strip of polygons.
- *
- * @param path The hull of the path to draw
- * @param paint The paint to render with
- */
- void drawConvexPath(const SkPath& path, const SkPaint* paint);
-
- /**
- * Draws shadow layer on text (with optional positions).
- *
- * @param paint The paint to draw the shadow with
- * @param text The text to draw
- * @param count The number of glyphs in the text
- * @param positions The x, y positions of individual glyphs (or NULL)
- * @param fontRenderer The font renderer object
- * @param alpha The alpha value for drawing the shadow
- * @param x The x coordinate where the shadow will be drawn
- * @param y The y coordinate where the shadow will be drawn
- */
- void drawTextShadow(const SkPaint* paint, const glyph_t* glyphs, int count,
- const float* positions, FontRenderer& fontRenderer, int alpha,
- float x, float y);
-
- /**
- * Draws a path texture. Path textures are alpha8 bitmaps that need special
- * compositing to apply colors/filters/etc.
- *
- * @param texture The texture to render
- * @param x The x coordinate where the texture will be drawn
- * @param y The y coordinate where the texture will be drawn
- * @param paint The paint to draw the texture with
- */
- void drawPathTexture(PathTexture* texture, float x, float y, const SkPaint* paint);
-
- /**
- * Resets the texture coordinates stored in mMeshVertices. Setting the values
- * back to default is achieved by calling:
- *
- * resetDrawTextureTexCoords(0.0f, 0.0f, 1.0f, 1.0f);
- *
- * @param u1 The left coordinate of the texture
- * @param v1 The bottom coordinate of the texture
- * @param u2 The right coordinate of the texture
- * @param v2 The top coordinate of the texture
- */
- void resetDrawTextureTexCoords(float u1, float v1, float u2, float v2);
-
- /**
- * Returns true if the specified paint will draw invisible text.
- */
- bool canSkipText(const SkPaint* paint) const;
-
- bool updateLayer(Layer* layer, bool inFrame);
- void updateLayers();
- void flushLayers();
-
-#if DEBUG_LAYERS_AS_REGIONS
- /**
- * Renders the specified region as a series of rectangles. This method
- * is used for debugging only.
- */
- void drawRegionRectsDebug(const Region& region);
-#endif
-
- /**
- * Renders the specified region as a series of rectangles. The region
- * must be in screen-space coordinates.
- */
- void drawRegionRects(const SkRegion& region, const SkPaint& paint, bool dirty = false);
-
- /**
- * Draws the current clip region if any. Only when DEBUG_CLIP_REGIONS
- * is turned on.
- */
- void debugClip();
-
- void debugOverdraw(bool enable, bool clear);
- void renderOverdraw();
- void countOverdraw();
-
- /**
- * Should be invoked every time the glScissor is modified.
- */
- inline void dirtyClip() { mState.setDirtyClip(true); }
-
- inline const UvMapper& getMapper(const Texture* texture) {
- return texture && texture->uvMapper ? *texture->uvMapper : mUvMapper;
- }
-
- /**
- * Returns a texture object for the specified bitmap. The texture can
- * come from the texture cache or an atlas. If this method returns
- * NULL, the texture could not be found and/or allocated.
- */
- Texture* getTexture(const SkBitmap* bitmap);
-
- bool reportAndClearDirty() { bool ret = mDirty; mDirty = false; return ret; }
- inline Snapshot* writableSnapshot() { return mState.writableSnapshot(); }
- inline const Snapshot* currentSnapshot() const { return mState.currentSnapshot(); }
-
- // State used to define the clipping region
- Rect mTilingClip;
- // Is the target render surface opaque
- bool mOpaque;
- // Is a frame currently being rendered
- bool mFrameStarted;
-
- // Default UV mapper
- const UvMapper mUvMapper;
-
- // List of rectangles to clear after saveLayer() is invoked
- std::vector<Rect> mLayers;
- // List of layers to update at the beginning of a frame
- std::vector< sp<Layer> > mLayerUpdates;
-
- // See PROPERTY_DISABLE_SCISSOR_OPTIMIZATION in
- // Properties.h
- bool mScissorOptimizationDisabled;
-
- bool mSkipOutlineClip;
-
- // True if anything has been drawn since the last call to
- // reportAndClearDirty()
- bool mDirty;
-
- // Lighting + shadows
- Vector3 mLightCenter;
- float mLightRadius;
- uint8_t mAmbientShadowAlpha;
- uint8_t mSpotShadowAlpha;
-
- // Paths kept alive for the duration of the frame
- std::vector<std::unique_ptr<SkPath>> mTempPaths;
-
- /**
- * Initial transform for a rendering pass; transform from global device
- * coordinates to the current RenderNode's drawing content coordinates,
- * with the RenderNode's RenderProperty transforms already applied.
- * Calling setMatrix(mBaseTransform) will result in drawing at the origin
- * of the DisplayList's recorded surface prior to any Canvas
- * transformation.
- */
- Matrix4 mBaseTransform;
-
- friend class Layer;
- friend class TextDrawFunctor;
- friend class DrawBitmapOp;
- friend class DrawPatchOp;
-
-}; // class OpenGLRenderer
-
-}; // namespace uirenderer
-}; // namespace android
-
-#endif // ANDROID_HWUI_OPENGL_RENDERER_H
diff --git a/libs/hwui/PatchCache.h b/libs/hwui/PatchCache.h
index d1c5dbf..6e6a730 100644
--- a/libs/hwui/PatchCache.h
+++ b/libs/hwui/PatchCache.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_PATCH_CACHE_H
-#define ANDROID_HWUI_PATCH_CACHE_H
+#pragma once
#include <GLES2/gl2.h>
@@ -48,10 +47,11 @@
///////////////////////////////////////////////////////////////////////////////
class Caches;
+class RenderState;
class PatchCache {
public:
- PatchCache(RenderState& renderState);
+ explicit PatchCache(RenderState& renderState);
~PatchCache();
const Patch* get(const AssetAtlas::Entry* entry,
@@ -186,5 +186,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_PATCH_CACHE_H
diff --git a/libs/hwui/PathCache.h b/libs/hwui/PathCache.h
index 6368ddd..e1fcc31 100644
--- a/libs/hwui/PathCache.h
+++ b/libs/hwui/PathCache.h
@@ -288,7 +288,7 @@
class PathProcessor: public TaskProcessor<SkBitmap*> {
public:
- PathProcessor(Caches& caches);
+ explicit PathProcessor(Caches& caches);
~PathProcessor() { }
virtual void onProcess(const sp<Task<SkBitmap*> >& task) override;
diff --git a/libs/hwui/PixelBuffer.cpp b/libs/hwui/PixelBuffer.cpp
index 165c7db..2a96b69 100644
--- a/libs/hwui/PixelBuffer.cpp
+++ b/libs/hwui/PixelBuffer.cpp
@@ -37,8 +37,6 @@
uint8_t* map(AccessMode mode = kAccessMode_ReadWrite) override;
- uint8_t* getMappedPointer() const override;
-
void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) override;
protected:
@@ -64,10 +62,6 @@
mAccessMode = kAccessMode_None;
}
-uint8_t* CpuPixelBuffer::getMappedPointer() const {
- return mAccessMode == kAccessMode_None ? nullptr : mBuffer.get();
-}
-
void CpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) {
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height,
mFormat, GL_UNSIGNED_BYTE, &mBuffer[offset]);
@@ -84,8 +78,6 @@
uint8_t* map(AccessMode mode = kAccessMode_ReadWrite) override;
- uint8_t* getMappedPointer() const override;
-
void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) override;
protected:
@@ -142,10 +134,6 @@
}
}
-uint8_t* GpuPixelBuffer::getMappedPointer() const {
- return mMappedPointer;
-}
-
void GpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) {
// If the buffer is not mapped, unmap() will not bind it
mCaches.pixelBufferState().bind(mBuffer);
diff --git a/libs/hwui/PixelBuffer.h b/libs/hwui/PixelBuffer.h
index bbef36b..9536bc8 100644
--- a/libs/hwui/PixelBuffer.h
+++ b/libs/hwui/PixelBuffer.h
@@ -99,12 +99,6 @@
}
/**
- * Returns the currently mapped pointer. Returns NULL if the buffer
- * is not mapped.
- */
- virtual uint8_t* getMappedPointer() const = 0;
-
- /**
* Upload the specified rectangle of this pixel buffer as a
* GL_TEXTURE_2D texture. Calling this method will trigger
* an unmap() if necessary.
@@ -199,8 +193,7 @@
/**
* Unmaps this buffer, if needed. After the buffer is unmapped,
* the pointer previously returned by map() becomes invalid and
- * should not be used. After calling this method, getMappedPointer()
- * will always return NULL.
+ * should not be used.
*/
virtual void unmap() = 0;
diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h
index 1dadda1..9ac885b 100644
--- a/libs/hwui/ProgramCache.h
+++ b/libs/hwui/ProgramCache.h
@@ -40,7 +40,7 @@
*/
class ProgramCache {
public:
- ProgramCache(Extensions& extensions);
+ explicit ProgramCache(Extensions& extensions);
~ProgramCache();
Program* get(const ProgramDescription& description);
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index 6f68c2b..93b2e15 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -63,8 +63,10 @@
ProfileType Properties::sProfileType = ProfileType::None;
bool Properties::sDisableProfileBars = false;
+RenderPipelineType Properties::sRenderPipelineType = RenderPipelineType::NotInitialized;
bool Properties::waitForGpuCompletion = false;
+bool Properties::forceDrawFrame = false;
bool Properties::filterOutTestOverhead = false;
@@ -204,5 +206,21 @@
return sProfileType;
}
+RenderPipelineType Properties::getRenderPipelineType() {
+ if (RenderPipelineType::NotInitialized != sRenderPipelineType) {
+ return sRenderPipelineType;
+ }
+ char prop[PROPERTY_VALUE_MAX];
+ property_get(PROPERTY_DEFAULT_RENDERER, prop, "opengl");
+ if (!strcmp(prop, "skiagl") ) {
+ sRenderPipelineType = RenderPipelineType::SkiaGL;
+ } else if (!strcmp(prop, "skiavulkan") ) {
+ sRenderPipelineType = RenderPipelineType::SkiaVulkan;
+ } else { //"opengl"
+ sRenderPipelineType = RenderPipelineType::OpenGL;
+ }
+ return sRenderPipelineType;
+}
+
}; // namespace uirenderer
}; // namespace android
diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h
index 8fec429..133ae80 100644
--- a/libs/hwui/Properties.h
+++ b/libs/hwui/Properties.h
@@ -20,8 +20,7 @@
#include <cutils/properties.h>
/**
- * This file contains the list of system properties used to configure
- * the OpenGLRenderer.
+ * This file contains the list of system properties used to configure libhwui.
*/
namespace android {
@@ -153,6 +152,12 @@
#define PROPERTY_FILTER_TEST_OVERHEAD "debug.hwui.filter_test_overhead"
+/**
+ * Allows to set rendering pipeline mode to OpenGL (default), Skia OpenGL
+ * or Vulkan.
+ */
+#define PROPERTY_DEFAULT_RENDERER "debug.hwui.default_renderer"
+
///////////////////////////////////////////////////////////////////////////////
// Runtime configuration properties
///////////////////////////////////////////////////////////////////////////////
@@ -161,7 +166,7 @@
* Used to enable/disable scissor optimization. The accepted values are
* "true" and "false". The default value is "false".
*
- * When scissor optimization is enabled, OpenGLRenderer will attempt to
+ * When scissor optimization is enabled, libhwui will attempt to
* minimize the use of scissor by selectively enabling and disabling the
* GL scissor test.
* When the optimization is disabled, OpenGLRenderer will keep the GL
@@ -245,6 +250,13 @@
ShowRegion
};
+enum class RenderPipelineType {
+ OpenGL = 0,
+ SkiaGL,
+ SkiaVulkan,
+ NotInitialized = 128
+};
+
/**
* Renderthread-only singleton which manages several static rendering properties. Most of these
* are driven by system properties which are queried once at initialization, and again if init()
@@ -292,9 +304,11 @@
static int overrideSpotShadowStrength;
static ProfileType getProfileType();
+ static RenderPipelineType getRenderPipelineType();
// Should be used only by test apps
static bool waitForGpuCompletion;
+ static bool forceDrawFrame;
// Should only be set by automated tests to try and filter out
// any overhead they add
@@ -303,6 +317,7 @@
private:
static ProfileType sProfileType;
static bool sDisableProfileBars;
+ static RenderPipelineType sRenderPipelineType;
}; // class Caches
diff --git a/libs/hwui/PropertyValuesAnimatorSet.h b/libs/hwui/PropertyValuesAnimatorSet.h
index 49021bc..f9274e1 100644
--- a/libs/hwui/PropertyValuesAnimatorSet.h
+++ b/libs/hwui/PropertyValuesAnimatorSet.h
@@ -60,7 +60,7 @@
virtual uint32_t dirtyMask();
bool isInfinite() { return mIsInfinite; }
void setVectorDrawable(VectorDrawableRoot* vd) { mVectorDrawable = vd; }
- VectorDrawableRoot* getVectorDrawable() const { return mVectorDrawable; }
+ VectorDrawableRoot* getVectorDrawable() const { return mVectorDrawable.get(); }
AnimationListener* getOneShotListener() { return mOneShotListener.get(); }
void clearOneShotListener() { mOneShotListener = nullptr; }
uint32_t getRequestId() const { return mRequestId; }
@@ -78,7 +78,7 @@
std::vector< std::unique_ptr<PropertyAnimator> > mAnimators;
float mLastFraction = 0.0f;
bool mInitialized = false;
- VectorDrawableRoot* mVectorDrawable = nullptr;
+ sp<VectorDrawableRoot> mVectorDrawable;
bool mIsInfinite = false;
// This request id gets incremented (on UI thread only) when a new request to modfiy the
// lifecycle of an animation happens, namely when start/end/reset/reverse is called.
diff --git a/libs/hwui/Readback.cpp b/libs/hwui/Readback.cpp
index 55f823d..60eadff 100644
--- a/libs/hwui/Readback.cpp
+++ b/libs/hwui/Readback.cpp
@@ -19,6 +19,7 @@
#include "Caches.h"
#include "Image.h"
#include "GlopBuilder.h"
+#include "Layer.h"
#include "renderstate/RenderState.h"
#include "renderthread/EglManager.h"
#include "utils/GLUtils.h"
@@ -30,14 +31,8 @@
namespace android {
namespace uirenderer {
-CopyResult Readback::copySurfaceInto(renderthread::RenderThread& renderThread,
- Surface& surface, SkBitmap* bitmap) {
- // TODO: Clean this up and unify it with LayerRenderer::copyLayer,
- // of which most of this is copied from.
- renderThread.eglManager().initialize();
-
- Caches& caches = Caches::getInstance();
- RenderState& renderState = renderThread.renderState();
+static CopyResult copyTextureInto(Caches& caches, RenderState& renderState,
+ Texture& sourceTexture, Matrix4& texTransform, SkBitmap* bitmap) {
int destWidth = bitmap->width();
int destHeight = bitmap->height();
if (destWidth > caches.maxTextureSize
@@ -98,6 +93,44 @@
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, texture, 0);
+ {
+ // Draw & readback
+ renderState.setViewport(destWidth, destHeight);
+ renderState.scissor().setEnabled(false);
+ renderState.blend().syncEnabled();
+ renderState.stencil().disable();
+
+ Glop glop;
+ GlopBuilder(renderState, caches, &glop)
+ .setRoundRectClipState(nullptr)
+ .setMeshTexturedUnitQuad(nullptr)
+ .setFillExternalTexture(sourceTexture, texTransform)
+ .setTransform(Matrix4::identity(), TransformFlags::None)
+ .setModelViewMapUnitToRect(Rect(destWidth, destHeight))
+ .build();
+ Matrix4 ortho;
+ ortho.loadOrtho(destWidth, destHeight);
+ renderState.render(glop, ortho);
+
+ glReadPixels(0, 0, bitmap->width(), bitmap->height(), format,
+ type, bitmap->getPixels());
+ }
+
+ // Cleanup
+ caches.textureState().deleteTexture(texture);
+ renderState.deleteFramebuffer(fbo);
+
+ GL_CHECKPOINT(MODERATE);
+
+ return CopyResult::Success;
+}
+
+CopyResult Readback::copySurfaceInto(renderthread::RenderThread& renderThread,
+ Surface& surface, SkBitmap* bitmap) {
+ renderThread.eglManager().initialize();
+
+ Caches& caches = Caches::getInstance();
+
// Setup the source
sp<GraphicBuffer> sourceBuffer;
sp<Fence> sourceFence;
@@ -142,7 +175,7 @@
GLuint sourceTexId;
// Create a 2D texture to sample from the EGLImage
glGenTextures(1, &sourceTexId);
- Caches::getInstance().textureState().bindTexture(GL_TEXTURE_EXTERNAL_OES, sourceTexId);
+ caches.textureState().bindTexture(GL_TEXTURE_EXTERNAL_OES, sourceTexId);
glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, sourceImage);
GLenum status = GL_NO_ERROR;
@@ -155,37 +188,13 @@
sourceTexture.wrap(sourceTexId,
sourceBuffer->getWidth(), sourceBuffer->getHeight(), 0 /* total lie */);
- {
- // Draw & readback
- renderState.setViewport(destWidth, destHeight);
- renderState.scissor().setEnabled(false);
- renderState.blend().syncEnabled();
- renderState.stencil().disable();
+ return copyTextureInto(caches, renderThread.renderState(), sourceTexture, texTransform, bitmap);
+}
- Rect destRect(destWidth, destHeight);
- Glop glop;
- GlopBuilder(renderState, caches, &glop)
- .setRoundRectClipState(nullptr)
- .setMeshTexturedUnitQuad(nullptr)
- .setFillExternalTexture(sourceTexture, texTransform)
- .setTransform(Matrix4::identity(), TransformFlags::None)
- .setModelViewMapUnitToRect(destRect)
- .build();
- Matrix4 ortho;
- ortho.loadOrtho(destWidth, destHeight);
- renderState.render(glop, ortho);
-
- glReadPixels(0, 0, bitmap->width(), bitmap->height(), format,
- type, bitmap->getPixels());
- }
-
- // Cleanup
- caches.textureState().deleteTexture(texture);
- renderState.deleteFramebuffer(fbo);
-
- GL_CHECKPOINT(MODERATE);
-
- return CopyResult::Success;
+CopyResult Readback::copyTextureLayerInto(renderthread::RenderThread& renderThread,
+ Layer& layer, SkBitmap* bitmap) {
+ return copyTextureInto(Caches::getInstance(), renderThread.renderState(),
+ layer.getTexture(), layer.getTexTransform(), bitmap);
}
} // namespace uirenderer
diff --git a/libs/hwui/Readback.h b/libs/hwui/Readback.h
index a112c42..bd73734 100644
--- a/libs/hwui/Readback.h
+++ b/libs/hwui/Readback.h
@@ -24,6 +24,8 @@
namespace android {
namespace uirenderer {
+class Layer;
+
// Keep in sync with PixelCopy.java codes
enum class CopyResult {
Success = 0,
@@ -36,8 +38,18 @@
class Readback {
public:
+ /**
+ * Copies the surface's most recently queued buffer into the provided bitmap.
+ */
static CopyResult copySurfaceInto(renderthread::RenderThread& renderThread,
Surface& surface, SkBitmap* bitmap);
+
+ /**
+ * Copies the TextureLayer's texture content (thus, the currently rendering buffer) into the
+ * provided bitmap.
+ */
+ static CopyResult copyTextureLayerInto(renderthread::RenderThread& renderThread,
+ Layer& layer, SkBitmap* bitmap);
};
} // namespace uirenderer
diff --git a/libs/hwui/RecordedOp.h b/libs/hwui/RecordedOp.h
index aee9d63..f3078ce 100644
--- a/libs/hwui/RecordedOp.h
+++ b/libs/hwui/RecordedOp.h
@@ -14,16 +14,15 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_RECORDED_OP_H
-#define ANDROID_HWUI_RECORDED_OP_H
+#pragma once
-#include "RecordedOp.h"
#include "font/FontUtil.h"
#include "Matrix.h"
#include "Rect.h"
#include "RenderNode.h"
#include "TessellationCache.h"
#include "utils/LinearAllocator.h"
+#include "utils/PaintUtils.h"
#include "Vector.h"
#include <androidfw/ResourceTypes.h>
@@ -529,5 +528,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_RECORDED_OP_H
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index b35c926..9a242fb 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -20,6 +20,7 @@
#include "RecordedOp.h"
#include "RenderNode.h"
#include "VectorDrawable.h"
+#include "hwui/MinikinUtils.h"
namespace android {
namespace uirenderer {
@@ -43,7 +44,6 @@
mState.initializeRecordingSaveStack(width, height);
mDeferredBarrierType = DeferredBarrierType::InOrder;
- mState.setDirtyClip(false);
}
DisplayList* RecordingCanvas::finishRecording() {
@@ -127,7 +127,8 @@
// operations will be able to store and restore the current clip and transform info, and
// quick rejection will be correct (for display lists)
- const Rect unmappedBounds(left, top, right, bottom);
+ Rect unmappedBounds(left, top, right, bottom);
+ unmappedBounds.roundOut();
// determine clipped bounds relative to previous viewport.
Rect visibleBounds = unmappedBounds;
@@ -267,7 +268,7 @@
// Geometry
void RecordingCanvas::drawPoints(const float* points, int floatCount, const SkPaint& paint) {
- if (floatCount < 2) return;
+ if (CC_UNLIKELY(floatCount < 2 || PaintUtils::paintWillNotDraw(paint))) return;
floatCount &= ~0x1; // round down to nearest two
addOp(alloc().create_trivial<PointsOp>(
@@ -278,7 +279,7 @@
}
void RecordingCanvas::drawLines(const float* points, int floatCount, const SkPaint& paint) {
- if (floatCount < 4) return;
+ if (CC_UNLIKELY(floatCount < 4 || PaintUtils::paintWillNotDraw(paint))) return;
floatCount &= ~0x3; // round down to nearest four
addOp(alloc().create_trivial<LinesOp>(
@@ -289,6 +290,8 @@
}
void RecordingCanvas::drawRect(float left, float top, float right, float bottom, const SkPaint& paint) {
+ if (CC_UNLIKELY(PaintUtils::paintWillNotDraw(paint))) return;
+
addOp(alloc().create_trivial<RectOp>(
Rect(left, top, right, bottom),
*(mState.currentSnapshot()->transform),
@@ -330,6 +333,8 @@
}
void RecordingCanvas::drawRegion(const SkRegion& region, const SkPaint& paint) {
+ if (CC_UNLIKELY(PaintUtils::paintWillNotDraw(paint))) return;
+
if (paint.getStyle() == SkPaint::kFill_Style
&& (!paint.isAntiAlias() || mState.currentTransform()->isSimple())) {
int count = 0;
@@ -354,8 +359,11 @@
}
}
}
+
void RecordingCanvas::drawRoundRect(float left, float top, float right, float bottom,
float rx, float ry, const SkPaint& paint) {
+ if (CC_UNLIKELY(PaintUtils::paintWillNotDraw(paint))) return;
+
if (CC_LIKELY(MathUtils::isPositive(rx) || MathUtils::isPositive(ry))) {
addOp(alloc().create_trivial<RoundRectOp>(
Rect(left, top, right, bottom),
@@ -390,7 +398,8 @@
void RecordingCanvas::drawCircle(float x, float y, float radius, const SkPaint& paint) {
// TODO: move to Canvas.h
- if (radius <= 0) return;
+ if (CC_UNLIKELY(radius <= 0 || PaintUtils::paintWillNotDraw(paint))) return;
+
drawOval(x - radius, y - radius, x + radius, y + radius, paint);
}
@@ -410,6 +419,8 @@
}
void RecordingCanvas::drawOval(float left, float top, float right, float bottom, const SkPaint& paint) {
+ if (CC_UNLIKELY(PaintUtils::paintWillNotDraw(paint))) return;
+
addOp(alloc().create_trivial<OvalOp>(
Rect(left, top, right, bottom),
*(mState.currentSnapshot()->transform),
@@ -419,6 +430,8 @@
void RecordingCanvas::drawArc(float left, float top, float right, float bottom,
float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) {
+ if (CC_UNLIKELY(PaintUtils::paintWillNotDraw(paint))) return;
+
if (fabs(sweepAngle) >= 360.0f) {
drawOval(left, top, right, bottom, paint);
} else {
@@ -432,6 +445,8 @@
}
void RecordingCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+ if (CC_UNLIKELY(PaintUtils::paintWillNotDraw(paint))) return;
+
addOp(alloc().create_trivial<PathOp>(
Rect(path.getBounds()),
*(mState.currentSnapshot()->transform),
@@ -541,14 +556,20 @@
drawTextDecorations(x, y, totalAdvance, paint);
}
-void RecordingCanvas::drawGlyphsOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path,
- float hOffset, float vOffset, const SkPaint& paint) {
- if (!glyphs || glyphCount <= 0 || PaintUtils::paintWillNotDrawText(paint)) return;
- glyphs = refBuffer<glyph_t>(glyphs, glyphCount);
- addOp(alloc().create_trivial<TextOnPathOp>(
- *(mState.currentSnapshot()->transform),
- getRecordedClip(),
- refPaint(&paint), glyphs, glyphCount, refPath(&path), hOffset, vOffset));
+void RecordingCanvas::drawLayoutOnPath(const minikin::Layout& layout, float hOffset, float vOffset,
+ const SkPaint& paint, const SkPath& path, size_t start, size_t end) {
+ uint16_t glyphs[1];
+ for (size_t i = start; i < end; i++) {
+ glyphs[0] = layout.getGlyphId(i);
+ float x = hOffset + layout.getX(i);
+ float y = vOffset + layout.getY(i);
+ if (PaintUtils::paintWillNotDrawText(paint)) return;
+ const uint16_t* tempGlyphs = refBuffer<glyph_t>(glyphs, 1);
+ addOp(alloc().create_trivial<TextOnPathOp>(
+ *(mState.currentSnapshot()->transform),
+ getRecordedClip(),
+ refPaint(&paint), tempGlyphs, 1, refPath(&path), x, y));
+ }
}
void RecordingCanvas::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) {
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h
index 372be24..11773d4 100644
--- a/libs/hwui/RecordingCanvas.h
+++ b/libs/hwui/RecordingCanvas.h
@@ -196,8 +196,8 @@
const SkPaint& paint, float x, float y,
float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
float totalAdvance) override;
- virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path,
- float hOffset, float vOffset, const SkPaint& paint) override;
+ virtual void drawLayoutOnPath(const minikin::Layout& layout, float hOffset, float vOffset,
+ const SkPaint& paint, const SkPath& path, size_t start, size_t end) override;
private:
const ClipBase* getRecordedClip() {
diff --git a/libs/hwui/Rect.h b/libs/hwui/Rect.h
index de4fa55..eb05e91 100644
--- a/libs/hwui/Rect.h
+++ b/libs/hwui/Rect.h
@@ -73,7 +73,14 @@
bottom(height) {
}
- inline Rect(const SkRect& rect):
+ inline Rect(const SkIRect& rect): // NOLINT, implicit
+ left(rect.fLeft),
+ top(rect.fTop),
+ right(rect.fRight),
+ bottom(rect.fBottom) {
+ }
+
+ inline Rect(const SkRect& rect): // NOLINT, implicit
left(rect.fLeft),
top(rect.fTop),
right(rect.fRight),
diff --git a/libs/hwui/RenderBufferCache.h b/libs/hwui/RenderBufferCache.h
index f77f4c9..6444331 100644
--- a/libs/hwui/RenderBufferCache.h
+++ b/libs/hwui/RenderBufferCache.h
@@ -82,7 +82,7 @@
mBuffer(nullptr), mFormat(format), mWidth(width), mHeight(height) {
}
- RenderBufferEntry(RenderBuffer* buffer):
+ explicit RenderBufferEntry(RenderBuffer* buffer):
mBuffer(buffer), mFormat(buffer->getFormat()),
mWidth(buffer->getWidth()), mHeight(buffer->getHeight()) {
}
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index f8797bf..38c0e08 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -16,19 +16,16 @@
#include "RenderNode.h"
+#include "BakedOpRenderer.h"
#include "DamageAccumulator.h"
#include "Debug.h"
-#if HWUI_NEW_OPS
-#include "BakedOpRenderer.h"
-#include "RecordedOp.h"
#include "OpDumper.h"
-#endif
-#include "DisplayListOp.h"
-#include "LayerRenderer.h"
-#include "OpenGLRenderer.h"
+#include "RecordedOp.h"
#include "TreeInfo.h"
#include "utils/MathUtils.h"
#include "utils/TraceUtils.h"
+#include "VectorDrawable.h"
+#include "renderstate/RenderState.h"
#include "renderthread/CanvasContext.h"
#include "protos/hwui.pb.h"
@@ -41,23 +38,6 @@
namespace android {
namespace uirenderer {
-void RenderNode::debugDumpLayers(const char* prefix) {
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("TODO: dump layer");
-#else
- if (mLayer) {
- ALOGD("%sNode %p (%s) has layer %p (fbo = %u, wasBuildLayered = %s)",
- prefix, this, getName(), mLayer, mLayer->getFbo(),
- mLayer->wasBuildLayered ? "true" : "false");
- }
-#endif
- if (mDisplayList) {
- for (auto&& child : mDisplayList->getChildren()) {
- child->renderNode->debugDumpLayers(prefix);
- }
- }
-}
-
RenderNode::RenderNode()
: mDirtyPropertyFields(0)
, mNeedsDisplayListSync(false)
@@ -70,15 +50,7 @@
RenderNode::~RenderNode() {
deleteDisplayList(nullptr);
delete mStagingDisplayList;
-#if HWUI_NEW_OPS
LOG_ALWAYS_FATAL_IF(mLayer, "layer missed detachment!");
-#else
- if (mLayer) {
- ALOGW("Memory Warning: Layer %p missed its detachment, held on to for far too long!", mLayer);
- mLayer->postDecStrong();
- mLayer = nullptr;
- }
-#endif
}
void RenderNode::setStagingDisplayList(DisplayList* displayList, TreeObserver* observer) {
@@ -96,7 +68,6 @@
* This function is a simplified version of replay(), where we simply retrieve and log the
* display list. This function should remain in sync with the replay() function.
*/
-#if HWUI_NEW_OPS
void RenderNode::output(uint32_t level, const char* label) {
ALOGD("%s (%s %p%s%s%s%s%s)",
label,
@@ -123,26 +94,6 @@
}
ALOGD("%*s/RenderNode(%s %p)", level * 2, "", getName(), this);
}
-#else
-void RenderNode::output(uint32_t level) {
- ALOGD("%*sStart display list (%p, %s%s%s%s%s%s)", (level - 1) * 2, "", this,
- getName(),
- (MathUtils::isZero(properties().getAlpha()) ? ", zero alpha" : ""),
- (properties().hasShadow() ? ", casting shadow" : ""),
- (isRenderable() ? "" : ", empty"),
- (properties().getProjectBackwards() ? ", projected" : ""),
- (mLayer != nullptr ? ", on HW Layer" : ""));
- ALOGD("%*s%s %d", level * 2, "", "Save", SaveFlags::MatrixClip);
- properties().debugOutputProperties(level);
- if (mDisplayList) {
- // TODO: consider printing the chunk boundaries here
- for (auto&& op : mDisplayList->getOps()) {
- op->output(level, DisplayListOp::kOpLogFlag_Recurse);
- }
- }
- ALOGD("%*sDone (%p, %s)", (level - 1) * 2, "", this, getName());
- }
-#endif
void RenderNode::copyTo(proto::RenderNode *pnode) {
pnode->set_id(static_cast<uint64_t>(
@@ -272,36 +223,27 @@
}
}
-static layer_t* createLayer(RenderState& renderState, uint32_t width, uint32_t height) {
-#if HWUI_NEW_OPS
+static OffscreenBuffer* createLayer(RenderState& renderState, uint32_t width, uint32_t height) {
return renderState.layerPool().get(renderState, width, height);
-#else
- return LayerRenderer::createRenderLayer(renderState, width, height);
-#endif
}
-static void destroyLayer(layer_t* layer) {
-#if HWUI_NEW_OPS
+static void destroyLayer(OffscreenBuffer* layer) {
RenderState& renderState = layer->renderState;
renderState.layerPool().putOrDelete(layer);
-#else
- LayerRenderer::destroyLayer(layer);
-#endif
}
-static bool layerMatchesWidthAndHeight(layer_t* layer, int width, int height) {
-#if HWUI_NEW_OPS
+static bool layerMatchesWidthAndHeight(OffscreenBuffer* layer, int width, int height) {
return layer->viewportWidth == (uint32_t) width && layer->viewportHeight == (uint32_t)height;
-#else
- return layer->layer.getWidth() == width && layer->layer.getHeight() == height;
-#endif
}
void RenderNode::pushLayerUpdate(TreeInfo& info) {
LayerType layerType = properties().effectiveLayerType();
// If we are not a layer OR we cannot be rendered (eg, view was detached)
// we need to destroy any Layers we may have had previously
- if (CC_LIKELY(layerType != LayerType::RenderLayer) || CC_UNLIKELY(!isRenderable())) {
+ if (CC_LIKELY(layerType != LayerType::RenderLayer)
+ || CC_UNLIKELY(!isRenderable())
+ || CC_UNLIKELY(properties().getWidth() == 0)
+ || CC_UNLIKELY(properties().getHeight() == 0)) {
if (CC_UNLIKELY(mLayer)) {
destroyLayer(mLayer);
mLayer = nullptr;
@@ -312,22 +254,15 @@
bool transformUpdateNeeded = false;
if (!mLayer) {
mLayer = createLayer(info.canvasContext.getRenderState(), getWidth(), getHeight());
-#if !HWUI_NEW_OPS
- applyLayerPropertiesToLayer(info);
-#endif
damageSelf(info);
transformUpdateNeeded = true;
} else if (!layerMatchesWidthAndHeight(mLayer, getWidth(), getHeight())) {
-#if HWUI_NEW_OPS
// TODO: remove now irrelevant, currently enqueued damage (respecting damage ordering)
// Or, ideally, maintain damage between frames on node/layer so ordering is always correct
RenderState& renderState = mLayer->renderState;
if (properties().fitsOnLayer()) {
mLayer = renderState.layerPool().resize(mLayer, getWidth(), getHeight());
} else {
-#else
- if (!LayerRenderer::resizeLayer(mLayer, getWidth(), getHeight())) {
-#endif
destroyLayer(mLayer);
mLayer = nullptr;
}
@@ -362,19 +297,7 @@
mLayer->setWindowTransform(windowTransform);
}
-#if HWUI_NEW_OPS
info.layerUpdateQueue->enqueueLayerWithDamage(this, dirty);
-#else
- if (dirty.intersect(0, 0, getWidth(), getHeight())) {
- dirty.roundOut(&dirty);
- mLayer->updateDeferred(this, dirty.fLeft, dirty.fTop, dirty.fRight, dirty.fBottom);
- }
- // This is not inside the above if because we may have called
- // updateDeferred on a previous prepare pass that didn't have a renderer
- if (info.renderer && mLayer->deferredUpdateScheduled) {
- info.renderer->pushLayerUpdate(mLayer);
- }
-#endif
// There might be prefetched layers that need to be accounted for.
// That might be us, so tell CanvasContext that this layer is in the
@@ -450,9 +373,6 @@
damageSelf(info);
info.damageAccumulator->popTransform();
syncProperties();
-#if !HWUI_NEW_OPS
- applyLayerPropertiesToLayer(info);
-#endif
// We could try to be clever and only re-damage if the matrix changed.
// However, we don't need to worry about that. The cost of over-damaging
// here is only going to be a single additional map rect of this node
@@ -463,17 +383,6 @@
}
}
-#if !HWUI_NEW_OPS
-void RenderNode::applyLayerPropertiesToLayer(TreeInfo& info) {
- if (CC_LIKELY(!mLayer)) return;
-
- const LayerProperties& props = properties().layerProperties();
- mLayer->setAlpha(props.alpha(), props.xferMode());
- mLayer->setColorFilter(props.colorFilter());
- mLayer->setBlend(props.needsBlending());
-}
-#endif
-
void RenderNode::syncDisplayList(TreeInfo* info) {
// Make sure we inc first so that we don't fluctuate between 0 and 1,
// which would thrash the layer cache
@@ -526,15 +435,8 @@
}
for (auto&& op : subtree->getChildren()) {
RenderNode* childNode = op->renderNode;
-#if HWUI_NEW_OPS
info.damageAccumulator->pushTransform(&op->localMatrix);
bool childFunctorsNeedLayer = functorsNeedLayer; // TODO! || op->mRecordedWithPotentialStencilClip;
-#else
- info.damageAccumulator->pushTransform(&op->localMatrix);
- bool childFunctorsNeedLayer = functorsNeedLayer
- // Recorded with non-rect clip, or canvas-rotated by parent
- || op->mRecordedWithPotentialStencilClip;
-#endif
childNode->prepareTreeImpl(info, childFunctorsNeedLayer);
info.damageAccumulator->popTransform();
}
@@ -576,84 +478,6 @@
}
}
-/*
- * For property operations, we pass a savecount of 0, since the operations aren't part of the
- * displaylist, and thus don't have to compensate for the record-time/playback-time discrepancy in
- * base saveCount (i.e., how RestoreToCount uses saveCount + properties().getCount())
- */
-#define PROPERTY_SAVECOUNT 0
-
-template <class T>
-void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) {
-#if DEBUG_DISPLAY_LIST
- properties().debugOutputProperties(handler.level() + 1);
-#endif
- if (properties().getLeft() != 0 || properties().getTop() != 0) {
- renderer.translate(properties().getLeft(), properties().getTop());
- }
- if (properties().getStaticMatrix()) {
- renderer.concatMatrix(*properties().getStaticMatrix());
- } else if (properties().getAnimationMatrix()) {
- renderer.concatMatrix(*properties().getAnimationMatrix());
- }
- if (properties().hasTransformMatrix()) {
- if (properties().isTransformTranslateOnly()) {
- renderer.translate(properties().getTranslationX(), properties().getTranslationY());
- } else {
- renderer.concatMatrix(*properties().getTransformMatrix());
- }
- }
- const bool isLayer = properties().effectiveLayerType() != LayerType::None;
- int clipFlags = properties().getClippingFlags();
- if (properties().getAlpha() < 1) {
- if (isLayer) {
- clipFlags &= ~CLIP_TO_BOUNDS; // bounds clipping done by layer
- }
- if (CC_LIKELY(isLayer || !properties().getHasOverlappingRendering())) {
- // simply scale rendering content's alpha
- renderer.scaleAlpha(properties().getAlpha());
- } else {
- // savelayer needed to create an offscreen buffer
- Rect layerBounds(0, 0, getWidth(), getHeight());
- if (clipFlags) {
- properties().getClippingRectForFlags(clipFlags, &layerBounds);
- clipFlags = 0; // all clipping done by savelayer
- }
- SaveLayerOp* op = new (handler.allocator()) SaveLayerOp(
- layerBounds.left, layerBounds.top,
- layerBounds.right, layerBounds.bottom,
- (int) (properties().getAlpha() * 255),
- SaveFlags::HasAlphaLayer | SaveFlags::ClipToLayer);
- handler(op, PROPERTY_SAVECOUNT, properties().getClipToBounds());
- }
-
- if (CC_UNLIKELY(ATRACE_ENABLED() && properties().promotedToLayer())) {
- // pretend alpha always causes savelayer to warn about
- // performance problem affecting old versions
- ATRACE_FORMAT("%s alpha caused saveLayer %dx%d", getName(),
- static_cast<int>(getWidth()),
- static_cast<int>(getHeight()));
- }
- }
- if (clipFlags) {
- Rect clipRect;
- properties().getClippingRectForFlags(clipFlags, &clipRect);
- ClipRectOp* op = new (handler.allocator()) ClipRectOp(
- clipRect.left, clipRect.top, clipRect.right, clipRect.bottom,
- SkRegion::kIntersect_Op);
- handler(op, PROPERTY_SAVECOUNT, properties().getClipToBounds());
- }
-
- // TODO: support nesting round rect clips
- if (mProperties.getRevealClip().willClip()) {
- Rect bounds;
- mProperties.getRevealClip().getBounds(&bounds);
- renderer.setClippingRoundRect(handler.allocator(), bounds, mProperties.getRevealClip().getRadius());
- } else if (mProperties.getOutline().willClip()) {
- renderer.setClippingOutline(handler.allocator(), &(mProperties.getOutline()));
- }
-}
-
/**
* Apply property-based transformations to input matrix
*
@@ -714,14 +538,14 @@
// transform properties are applied correctly to top level children
if (mDisplayList == nullptr) return;
for (unsigned int i = 0; i < mDisplayList->getChildren().size(); i++) {
- renderNodeOp_t* childOp = mDisplayList->getChildren()[i];
+ RenderNodeOp* childOp = mDisplayList->getChildren()[i];
childOp->renderNode->computeOrderingImpl(childOp, &mProjectedNodes, &mat4::identity());
}
}
void RenderNode::computeOrderingImpl(
- renderNodeOp_t* opState,
- std::vector<renderNodeOp_t*>* compositedChildrenOfProjectionSurface,
+ RenderNodeOp* opState,
+ std::vector<RenderNodeOp*>* compositedChildrenOfProjectionSurface,
const mat4* transformFromProjectionSurface) {
mProjectedNodes.clear();
if (mDisplayList == nullptr || mDisplayList->isEmpty()) return;
@@ -745,10 +569,10 @@
const bool isProjectionReceiver = mDisplayList->projectionReceiveIndex >= 0;
bool haveAppliedPropertiesToProjection = false;
for (unsigned int i = 0; i < mDisplayList->getChildren().size(); i++) {
- renderNodeOp_t* childOp = mDisplayList->getChildren()[i];
+ RenderNodeOp* childOp = mDisplayList->getChildren()[i];
RenderNode* child = childOp->renderNode;
- std::vector<renderNodeOp_t*>* projectionChildren = nullptr;
+ std::vector<RenderNodeOp*>* projectionChildren = nullptr;
const mat4* projectionTransform = nullptr;
if (isProjectionReceiver && !child->properties().getProjectBackwards()) {
// if receiving projections, collect projecting descendant
@@ -771,372 +595,5 @@
}
}
-class DeferOperationHandler {
-public:
- DeferOperationHandler(DeferStateStruct& deferStruct, int level)
- : mDeferStruct(deferStruct), mLevel(level) {}
- inline void operator()(DisplayListOp* operation, int saveCount, bool clipToBounds) {
- operation->defer(mDeferStruct, saveCount, mLevel, clipToBounds);
- }
- inline LinearAllocator& allocator() { return *(mDeferStruct.mAllocator); }
- inline void startMark(const char* name) {} // do nothing
- inline void endMark() {}
- inline int level() { return mLevel; }
- inline int replayFlags() { return mDeferStruct.mReplayFlags; }
- inline SkPath* allocPathForFrame() { return mDeferStruct.allocPathForFrame(); }
-
-private:
- DeferStateStruct& mDeferStruct;
- const int mLevel;
-};
-
-void RenderNode::defer(DeferStateStruct& deferStruct, const int level) {
- DeferOperationHandler handler(deferStruct, level);
- issueOperations<DeferOperationHandler>(deferStruct.mRenderer, handler);
-}
-
-class ReplayOperationHandler {
-public:
- ReplayOperationHandler(ReplayStateStruct& replayStruct, int level)
- : mReplayStruct(replayStruct), mLevel(level) {}
- inline void operator()(DisplayListOp* operation, int saveCount, bool clipToBounds) {
-#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS
- mReplayStruct.mRenderer.eventMark(operation->name());
-#endif
- operation->replay(mReplayStruct, saveCount, mLevel, clipToBounds);
- }
- inline LinearAllocator& allocator() { return *(mReplayStruct.mAllocator); }
- inline void startMark(const char* name) {
- mReplayStruct.mRenderer.startMark(name);
- }
- inline void endMark() {
- mReplayStruct.mRenderer.endMark();
- }
- inline int level() { return mLevel; }
- inline int replayFlags() { return mReplayStruct.mReplayFlags; }
- inline SkPath* allocPathForFrame() { return mReplayStruct.allocPathForFrame(); }
-
-private:
- ReplayStateStruct& mReplayStruct;
- const int mLevel;
-};
-
-void RenderNode::replay(ReplayStateStruct& replayStruct, const int level) {
- ReplayOperationHandler handler(replayStruct, level);
- issueOperations<ReplayOperationHandler>(replayStruct.mRenderer, handler);
-}
-
-void RenderNode::buildZSortedChildList(const DisplayList::Chunk& chunk,
- std::vector<ZDrawRenderNodeOpPair>& zTranslatedNodes) {
-#if !HWUI_NEW_OPS
- if (chunk.beginChildIndex == chunk.endChildIndex) return;
-
- for (unsigned int i = chunk.beginChildIndex; i < chunk.endChildIndex; i++) {
- DrawRenderNodeOp* childOp = mDisplayList->getChildren()[i];
- RenderNode* child = childOp->renderNode;
- float childZ = child->properties().getZ();
-
- if (!MathUtils::isZero(childZ) && chunk.reorderChildren) {
- zTranslatedNodes.push_back(ZDrawRenderNodeOpPair(childZ, childOp));
- childOp->skipInOrderDraw = true;
- } else if (!child->properties().getProjectBackwards()) {
- // regular, in order drawing DisplayList
- childOp->skipInOrderDraw = false;
- }
- }
-
- // Z sort any 3d children (stable-ness makes z compare fall back to standard drawing order)
- std::stable_sort(zTranslatedNodes.begin(), zTranslatedNodes.end());
-#endif
-}
-
-template <class T>
-void RenderNode::issueDrawShadowOperation(const Matrix4& transformFromParent, T& handler) {
- if (properties().getAlpha() <= 0.0f
- || properties().getOutline().getAlpha() <= 0.0f
- || !properties().getOutline().getPath()
- || properties().getScaleX() == 0
- || properties().getScaleY() == 0) {
- // no shadow to draw
- return;
- }
-
- mat4 shadowMatrixXY(transformFromParent);
- applyViewPropertyTransforms(shadowMatrixXY);
-
- // Z matrix needs actual 3d transformation, so mapped z values will be correct
- mat4 shadowMatrixZ(transformFromParent);
- applyViewPropertyTransforms(shadowMatrixZ, true);
-
- const SkPath* casterOutlinePath = properties().getOutline().getPath();
- const SkPath* revealClipPath = properties().getRevealClip().getPath();
- if (revealClipPath && revealClipPath->isEmpty()) return;
-
- float casterAlpha = properties().getAlpha() * properties().getOutline().getAlpha();
-
-
- // holds temporary SkPath to store the result of intersections
- SkPath* frameAllocatedPath = nullptr;
- const SkPath* outlinePath = casterOutlinePath;
-
- // intersect the outline with the reveal clip, if present
- if (revealClipPath) {
- frameAllocatedPath = handler.allocPathForFrame();
-
- Op(*outlinePath, *revealClipPath, kIntersect_SkPathOp, frameAllocatedPath);
- outlinePath = frameAllocatedPath;
- }
-
- // intersect the outline with the clipBounds, if present
- if (properties().getClippingFlags() & CLIP_TO_CLIP_BOUNDS) {
- if (!frameAllocatedPath) {
- frameAllocatedPath = handler.allocPathForFrame();
- }
-
- Rect clipBounds;
- properties().getClippingRectForFlags(CLIP_TO_CLIP_BOUNDS, &clipBounds);
- SkPath clipBoundsPath;
- clipBoundsPath.addRect(clipBounds.left, clipBounds.top,
- clipBounds.right, clipBounds.bottom);
-
- Op(*outlinePath, clipBoundsPath, kIntersect_SkPathOp, frameAllocatedPath);
- outlinePath = frameAllocatedPath;
- }
-
- DisplayListOp* shadowOp = new (handler.allocator()) DrawShadowOp(
- shadowMatrixXY, shadowMatrixZ, casterAlpha, outlinePath);
- handler(shadowOp, PROPERTY_SAVECOUNT, properties().getClipToBounds());
-}
-
-#define SHADOW_DELTA 0.1f
-
-template <class T>
-void RenderNode::issueOperationsOf3dChildren(ChildrenSelectMode mode,
- const Matrix4& initialTransform, const std::vector<ZDrawRenderNodeOpPair>& zTranslatedNodes,
- OpenGLRenderer& renderer, T& handler) {
- const int size = zTranslatedNodes.size();
- if (size == 0
- || (mode == ChildrenSelectMode::NegativeZChildren && zTranslatedNodes[0].key > 0.0f)
- || (mode == ChildrenSelectMode::PositiveZChildren && zTranslatedNodes[size - 1].key < 0.0f)) {
- // no 3d children to draw
- return;
- }
-
- // Apply the base transform of the parent of the 3d children. This isolates
- // 3d children of the current chunk from transformations made in previous chunks.
- int rootRestoreTo = renderer.save(SaveFlags::Matrix);
- renderer.setGlobalMatrix(initialTransform);
-
- /**
- * Draw shadows and (potential) casters mostly in order, but allow the shadows of casters
- * with very similar Z heights to draw together.
- *
- * This way, if Views A & B have the same Z height and are both casting shadows, the shadows are
- * underneath both, and neither's shadow is drawn on top of the other.
- */
- const size_t nonNegativeIndex = findNonNegativeIndex(zTranslatedNodes);
- size_t drawIndex, shadowIndex, endIndex;
- if (mode == ChildrenSelectMode::NegativeZChildren) {
- drawIndex = 0;
- endIndex = nonNegativeIndex;
- shadowIndex = endIndex; // draw no shadows
- } else {
- drawIndex = nonNegativeIndex;
- endIndex = size;
- shadowIndex = drawIndex; // potentially draw shadow for each pos Z child
- }
-
- DISPLAY_LIST_LOGD("%*s%d %s 3d children:", (handler.level() + 1) * 2, "",
- endIndex - drawIndex, mode == kNegativeZChildren ? "negative" : "positive");
-
- float lastCasterZ = 0.0f;
- while (shadowIndex < endIndex || drawIndex < endIndex) {
- if (shadowIndex < endIndex) {
- DrawRenderNodeOp* casterOp = zTranslatedNodes[shadowIndex].value;
- RenderNode* caster = casterOp->renderNode;
- const float casterZ = zTranslatedNodes[shadowIndex].key;
- // attempt to render the shadow if the caster about to be drawn is its caster,
- // OR if its caster's Z value is similar to the previous potential caster
- if (shadowIndex == drawIndex || casterZ - lastCasterZ < SHADOW_DELTA) {
- caster->issueDrawShadowOperation(casterOp->localMatrix, handler);
-
- lastCasterZ = casterZ; // must do this even if current caster not casting a shadow
- shadowIndex++;
- continue;
- }
- }
-
- // only the actual child DL draw needs to be in save/restore,
- // since it modifies the renderer's matrix
- int restoreTo = renderer.save(SaveFlags::Matrix);
-
- DrawRenderNodeOp* childOp = zTranslatedNodes[drawIndex].value;
-
- renderer.concatMatrix(childOp->localMatrix);
- childOp->skipInOrderDraw = false; // this is horrible, I'm so sorry everyone
- handler(childOp, renderer.getSaveCount() - 1, properties().getClipToBounds());
- childOp->skipInOrderDraw = true;
-
- renderer.restoreToCount(restoreTo);
- drawIndex++;
- }
- renderer.restoreToCount(rootRestoreTo);
-}
-
-template <class T>
-void RenderNode::issueOperationsOfProjectedChildren(OpenGLRenderer& renderer, T& handler) {
- DISPLAY_LIST_LOGD("%*s%d projected children:", (handler.level() + 1) * 2, "", mProjectedNodes.size());
- const SkPath* projectionReceiverOutline = properties().getOutline().getPath();
- int restoreTo = renderer.getSaveCount();
-
- LinearAllocator& alloc = handler.allocator();
- handler(new (alloc) SaveOp(SaveFlags::MatrixClip),
- PROPERTY_SAVECOUNT, properties().getClipToBounds());
-
- // Transform renderer to match background we're projecting onto
- // (by offsetting canvas by translationX/Y of background rendernode, since only those are set)
- const DisplayListOp* op =
-#if HWUI_NEW_OPS
- nullptr;
- LOG_ALWAYS_FATAL("unsupported");
-#else
- (mDisplayList->getOps()[mDisplayList->projectionReceiveIndex]);
-#endif
- const DrawRenderNodeOp* backgroundOp = reinterpret_cast<const DrawRenderNodeOp*>(op);
- const RenderProperties& backgroundProps = backgroundOp->renderNode->properties();
- renderer.translate(backgroundProps.getTranslationX(), backgroundProps.getTranslationY());
-
- // If the projection receiver has an outline, we mask projected content to it
- // (which we know, apriori, are all tessellated paths)
- renderer.setProjectionPathMask(alloc, projectionReceiverOutline);
-
- // draw projected nodes
- for (size_t i = 0; i < mProjectedNodes.size(); i++) {
- renderNodeOp_t* childOp = mProjectedNodes[i];
-
- // matrix save, concat, and restore can be done safely without allocating operations
- int restoreTo = renderer.save(SaveFlags::Matrix);
- renderer.concatMatrix(childOp->transformFromCompositingAncestor);
- childOp->skipInOrderDraw = false; // this is horrible, I'm so sorry everyone
- handler(childOp, renderer.getSaveCount() - 1, properties().getClipToBounds());
- childOp->skipInOrderDraw = true;
- renderer.restoreToCount(restoreTo);
- }
-
- handler(new (alloc) RestoreToCountOp(restoreTo),
- PROPERTY_SAVECOUNT, properties().getClipToBounds());
-}
-
-/**
- * This function serves both defer and replay modes, and will organize the displayList's component
- * operations for a single frame:
- *
- * Every 'simple' state operation that affects just the matrix and alpha (or other factors of
- * DeferredDisplayState) may be issued directly to the renderer, but complex operations (with custom
- * defer logic) and operations in displayListOps are issued through the 'handler' which handles the
- * defer vs replay logic, per operation
- */
-template <class T>
-void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) {
- if (mDisplayList->isEmpty()) {
- DISPLAY_LIST_LOGD("%*sEmpty display list (%p, %s)", handler.level() * 2, "",
- this, getName());
- return;
- }
-
-#if HWUI_NEW_OPS
- const bool drawLayer = false;
-#else
- const bool drawLayer = (mLayer && (&renderer != mLayer->renderer.get()));
-#endif
- // If we are updating the contents of mLayer, we don't want to apply any of
- // the RenderNode's properties to this issueOperations pass. Those will all
- // be applied when the layer is drawn, aka when this is true.
- const bool useViewProperties = (!mLayer || drawLayer);
- if (useViewProperties) {
- const Outline& outline = properties().getOutline();
- if (properties().getAlpha() <= 0
- || (outline.getShouldClip() && outline.isEmpty())
- || properties().getScaleX() == 0
- || properties().getScaleY() == 0) {
- DISPLAY_LIST_LOGD("%*sRejected display list (%p, %s)", handler.level() * 2, "",
- this, getName());
- return;
- }
- }
-
- handler.startMark(getName());
-
-#if DEBUG_DISPLAY_LIST
- const Rect& clipRect = renderer.getLocalClipBounds();
- DISPLAY_LIST_LOGD("%*sStart display list (%p, %s), localClipBounds: %.0f, %.0f, %.0f, %.0f",
- handler.level() * 2, "", this, getName(),
- clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
-#endif
-
- LinearAllocator& alloc = handler.allocator();
- int restoreTo = renderer.getSaveCount();
- handler(new (alloc) SaveOp(SaveFlags::MatrixClip),
- PROPERTY_SAVECOUNT, properties().getClipToBounds());
-
- DISPLAY_LIST_LOGD("%*sSave %d %d", (handler.level() + 1) * 2, "",
- SaveFlags::MatrixClip, restoreTo);
-
- if (useViewProperties) {
- setViewProperties<T>(renderer, handler);
- }
-
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("legacy op traversal not supported");
-#else
- bool quickRejected = properties().getClipToBounds()
- && renderer.quickRejectConservative(0, 0, properties().getWidth(), properties().getHeight());
- if (!quickRejected) {
- Matrix4 initialTransform(*(renderer.currentTransform()));
- renderer.setBaseTransform(initialTransform);
-
- if (drawLayer) {
- handler(new (alloc) DrawLayerOp(mLayer),
- renderer.getSaveCount() - 1, properties().getClipToBounds());
- } else {
- const int saveCountOffset = renderer.getSaveCount() - 1;
- const int projectionReceiveIndex = mDisplayList->projectionReceiveIndex;
- for (size_t chunkIndex = 0; chunkIndex < mDisplayList->getChunks().size(); chunkIndex++) {
- const DisplayList::Chunk& chunk = mDisplayList->getChunks()[chunkIndex];
-
- std::vector<ZDrawRenderNodeOpPair> zTranslatedNodes;
- buildZSortedChildList(chunk, zTranslatedNodes);
-
- issueOperationsOf3dChildren(ChildrenSelectMode::NegativeZChildren,
- initialTransform, zTranslatedNodes, renderer, handler);
-
- for (size_t opIndex = chunk.beginOpIndex; opIndex < chunk.endOpIndex; opIndex++) {
- DisplayListOp *op = mDisplayList->getOps()[opIndex];
-#if DEBUG_DISPLAY_LIST
- op->output(handler.level() + 1);
-#endif
- handler(op, saveCountOffset, properties().getClipToBounds());
-
- if (CC_UNLIKELY(!mProjectedNodes.empty() && projectionReceiveIndex >= 0 &&
- opIndex == static_cast<size_t>(projectionReceiveIndex))) {
- issueOperationsOfProjectedChildren(renderer, handler);
- }
- }
-
- issueOperationsOf3dChildren(ChildrenSelectMode::PositiveZChildren,
- initialTransform, zTranslatedNodes, renderer, handler);
- }
- }
- }
-#endif
-
- DISPLAY_LIST_LOGD("%*sRestoreToCount %d", (handler.level() + 1) * 2, "", restoreTo);
- handler(new (alloc) RestoreToCountOp(restoreTo),
- PROPERTY_SAVECOUNT, properties().getClipToBounds());
-
- DISPLAY_LIST_LOGD("%*sDone (%p, %s)", handler.level() * 2, "", this, getName());
- handler.endMark();
-}
-
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index 1eaf5d6..ee045aa 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef RENDERNODE_H
-#define RENDERNODE_H
+
+#pragma once
#include <SkCamera.h>
#include <SkMatrix.h>
@@ -44,29 +44,13 @@
namespace uirenderer {
class CanvasState;
-class DisplayListCanvas;
class DisplayListOp;
-class OpenGLRenderer;
-class Rect;
-class SkiaShader;
-
-#if HWUI_NEW_OPS
class FrameBuilder;
class OffscreenBuffer;
+class Rect;
+class SkiaShader;
struct RenderNodeOp;
-typedef OffscreenBuffer layer_t;
-typedef RenderNodeOp renderNodeOp_t;
-#else
-class Layer;
-typedef Layer layer_t;
-typedef DrawRenderNodeOp renderNodeOp_t;
-#endif
-class ClipRectOp;
-class DrawRenderNodeOp;
-class SaveLayerOp;
-class SaveOp;
-class RestoreToCountOp;
class TreeInfo;
class TreeObserver;
@@ -78,9 +62,8 @@
* Primary class for storing recorded canvas commands, as well as per-View/ViewGroup display properties.
*
* Recording of canvas commands is somewhat similar to SkPicture, except the canvas-recording
- * functionality is split between DisplayListCanvas (which manages the recording), DisplayList
- * (which holds the actual data), and DisplayList (which holds properties and performs playback onto
- * a renderer).
+ * functionality is split between RecordingCanvas (which manages the recording), DisplayList
+ * (which holds the actual data), and RenderNode (which holds properties used for render playback).
*
* Note that DisplayList is swapped out from beneath an individual RenderNode when a view's
* recorded stream of canvas operations is refreshed. The RenderNode (and its properties) stay
@@ -115,20 +98,11 @@
kReplayFlag_ClipChildren = 0x1
};
- void debugDumpLayers(const char* prefix);
-
ANDROID_API void setStagingDisplayList(DisplayList* newData, TreeObserver* observer);
void computeOrdering();
- void defer(DeferStateStruct& deferStruct, const int level);
- void replay(ReplayStateStruct& replayStruct, const int level);
-
-#if HWUI_NEW_OPS
ANDROID_API void output(uint32_t level = 0, const char* label = "Root");
-#else
- ANDROID_API void output(uint32_t level = 1);
-#endif
ANDROID_API int getDebugSize();
void copyTo(proto::RenderNode* node);
@@ -223,16 +197,14 @@
const DisplayList* getDisplayList() const {
return mDisplayList;
}
-#if HWUI_NEW_OPS
OffscreenBuffer* getLayer() const { return mLayer; }
OffscreenBuffer** getLayerHandle() { return &mLayer; } // ugh...
-#endif
// Note: The position callbacks are relying on the listener using
// the frameNumber to appropriately batch/synchronize these transactions.
// There is no other filtering/batching to ensure that only the "final"
// state called once per frame.
- class ANDROID_API PositionListener {
+ class ANDROID_API PositionListener : public VirtualLightRefBase {
public:
virtual ~PositionListener() {}
// Called when the RenderNode's position changes
@@ -247,7 +219,7 @@
// before the RenderNode is used for drawing.
// RenderNode takes ownership of the pointer
ANDROID_API void setPositionListener(PositionListener* listener) {
- mPositionListener.reset(listener);
+ mPositionListener = listener;
}
// This is only modified in MODE_FULL, so it can be safely accessed
@@ -257,63 +229,10 @@
}
private:
- typedef key_value_pair_t<float, DrawRenderNodeOp*> ZDrawRenderNodeOpPair;
-
- static size_t findNonNegativeIndex(const std::vector<ZDrawRenderNodeOpPair>& nodes) {
- for (size_t i = 0; i < nodes.size(); i++) {
- if (nodes[i].key >= 0.0f) return i;
- }
- return nodes.size();
- }
-
- enum class ChildrenSelectMode {
- NegativeZChildren,
- PositiveZChildren
- };
-
- void computeOrderingImpl(renderNodeOp_t* opState,
- std::vector<renderNodeOp_t*>* compositedChildrenOfProjectionSurface,
+ void computeOrderingImpl(RenderNodeOp* opState,
+ std::vector<RenderNodeOp*>* compositedChildrenOfProjectionSurface,
const mat4* transformFromProjectionSurface);
- template <class T>
- inline void setViewProperties(OpenGLRenderer& renderer, T& handler);
-
- void buildZSortedChildList(const DisplayList::Chunk& chunk,
- std::vector<ZDrawRenderNodeOpPair>& zTranslatedNodes);
-
- template<class T>
- inline void issueDrawShadowOperation(const Matrix4& transformFromParent, T& handler);
-
- template <class T>
- inline void issueOperationsOf3dChildren(ChildrenSelectMode mode,
- const Matrix4& initialTransform, const std::vector<ZDrawRenderNodeOpPair>& zTranslatedNodes,
- OpenGLRenderer& renderer, T& handler);
-
- template <class T>
- inline void issueOperationsOfProjectedChildren(OpenGLRenderer& renderer, T& handler);
-
- /**
- * Issue the RenderNode's operations into a handler, recursing for subtrees through
- * DrawRenderNodeOp's defer() or replay() methods
- */
- template <class T>
- inline void issueOperations(OpenGLRenderer& renderer, T& handler);
-
- class TextContainer {
- public:
- size_t length() const {
- return mByteLength;
- }
-
- const char* text() const {
- return (const char*) mText;
- }
-
- size_t mByteLength;
- const char* mText;
- };
-
-
void syncProperties();
void syncDisplayList(TreeInfo* info);
@@ -321,9 +240,6 @@
void pushStagingPropertiesChanges(TreeInfo& info);
void pushStagingDisplayListChanges(TreeInfo& info);
void prepareSubTree(TreeInfo& info, bool functorsNeedLayer, DisplayList* subtree);
-#if !HWUI_NEW_OPS
- void applyLayerPropertiesToLayer(TreeInfo& info);
-#endif
void prepareLayer(TreeInfo& info, uint32_t dirtyMask);
void pushLayerUpdate(TreeInfo& info);
void deleteDisplayList(TreeObserver* observer, TreeInfo* info = nullptr);
@@ -349,14 +265,14 @@
// Owned by RT. Lifecycle is managed by prepareTree(), with the exception
// being in ~RenderNode() which may happen on any thread.
- layer_t* mLayer = nullptr;
+ OffscreenBuffer* mLayer = nullptr;
/**
* Draw time state - these properties are only set and used during rendering
*/
// for projection surfaces, contains a list of all children items
- std::vector<renderNodeOp_t*> mProjectedNodes;
+ std::vector<RenderNodeOp*> mProjectedNodes;
// How many references our parent(s) have to us. Typically this should alternate
// between 2 and 1 (when a staging push happens we inc first then dec)
@@ -366,10 +282,8 @@
// mDisplayList, not mStagingDisplayList.
uint32_t mParentCount;
- std::unique_ptr<PositionListener> mPositionListener;
+ sp<PositionListener> mPositionListener;
}; // class RenderNode
} /* namespace uirenderer */
} /* namespace android */
-
-#endif /* RENDERNODE_H */
diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp
index 5ebf545..7e3cad4 100644
--- a/libs/hwui/RenderProperties.cpp
+++ b/libs/hwui/RenderProperties.cpp
@@ -24,7 +24,6 @@
#include <SkPathOps.h>
#include "Matrix.h"
-#include "OpenGLRenderer.h"
#include "hwui/Canvas.h"
#include "utils/MathUtils.h"
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h
index c1221f7..00494a1 100644
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef RENDERNODEPROPERTIES_H
-#define RENDERNODEPROPERTIES_H
+
+#pragma once
#include "Caches.h"
#include "DeviceInfo.h"
@@ -22,6 +22,7 @@
#include "RevealClip.h"
#include "Outline.h"
#include "utils/MathUtils.h"
+#include "utils/PaintUtils.h"
#include <SkCamera.h>
#include <SkMatrix.h>
@@ -611,9 +612,7 @@
bool fitsOnLayer() const {
const DeviceInfo* deviceInfo = DeviceInfo::get();
return mPrimitiveFields.mWidth <= deviceInfo->maxTextureSize()
- && mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize()
- && mPrimitiveFields.mWidth > 0
- && mPrimitiveFields.mHeight > 0;
+ && mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize();
}
bool promotedToLayer() const {
@@ -680,5 +679,3 @@
} /* namespace uirenderer */
} /* namespace android */
-
-#endif /* RENDERNODEPROPERTIES_H */
diff --git a/libs/hwui/ResourceCache.h b/libs/hwui/ResourceCache.h
index 4583c8d..3ac7864 100644
--- a/libs/hwui/ResourceCache.h
+++ b/libs/hwui/ResourceCache.h
@@ -42,7 +42,7 @@
class ResourceReference {
public:
- ResourceReference(ResourceType type) {
+ explicit ResourceReference(ResourceType type) {
refCount = 0; destroyed = false; resourceType = type;
}
diff --git a/libs/hwui/ShadowTessellator.h b/libs/hwui/ShadowTessellator.h
index 5f4c9c5..2eaf187 100644
--- a/libs/hwui/ShadowTessellator.h
+++ b/libs/hwui/ShadowTessellator.h
@@ -80,8 +80,6 @@
static Vector2 centroid2d(const Vector2* poly, int polyLength);
- static bool isClockwise(const Vector2* polygon, int len);
-
static Vector2 calculateNormal(const Vector2& p1, const Vector2& p2);
static int getExtraVertexNumber(const Vector2& vector1, const Vector2& vector2,
diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index 600707ab..09775496 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -14,181 +14,26 @@
* limitations under the License.
*/
-#include "CanvasProperty.h"
-#include "Layer.h"
-#include "RenderNode.h"
-#include "hwui/Canvas.h"
+#include "SkiaCanvas.h"
-#include <SkCanvas.h>
-#include <SkClipStack.h>
+#include "CanvasProperty.h"
+#include "VectorDrawable.h"
+#include "hwui/MinikinUtils.h"
+
#include <SkDrawable.h>
#include <SkDevice.h>
#include <SkDeque.h>
#include <SkDrawFilter.h>
#include <SkGraphics.h>
#include <SkImage.h>
+#include <SkRSXform.h>
#include <SkShader.h>
-#include <SkTArray.h>
#include <SkTemplates.h>
-#include "VectorDrawable.h"
-
#include <memory>
namespace android {
-// Holds an SkCanvas reference plus additional native data.
-class SkiaCanvas : public Canvas {
-public:
- explicit SkiaCanvas(const SkBitmap& bitmap);
-
- /**
- * Create a new SkiaCanvas.
- *
- * @param canvas SkCanvas to handle calls made to this SkiaCanvas. Must
- * not be NULL. This constructor will ref() the SkCanvas, and unref()
- * it in its destructor.
- */
- explicit SkiaCanvas(SkCanvas* canvas) : mCanvas(canvas) {
- SkASSERT(canvas);
- canvas->ref();
- }
-
- virtual SkCanvas* asSkCanvas() override {
- return mCanvas.get();
- }
-
- virtual void resetRecording(int width, int height) override {
- LOG_ALWAYS_FATAL("SkiaCanvas cannot be reset as a recording canvas");
- }
-
- virtual uirenderer::DisplayList* finishRecording() override {
- LOG_ALWAYS_FATAL("SkiaCanvas does not produce a DisplayList");
- return nullptr;
- }
- virtual void insertReorderBarrier(bool enableReorder) override {
- LOG_ALWAYS_FATAL("SkiaCanvas does not support reordering barriers");
- }
-
- virtual void setBitmap(const SkBitmap& bitmap) override;
-
- virtual bool isOpaque() override;
- virtual int width() override;
- virtual int height() override;
-
- virtual void setHighContrastText(bool highContrastText) override {
- mHighContrastText = highContrastText;
- }
- virtual bool isHighContrastText() override { return mHighContrastText; }
-
- virtual int getSaveCount() const override;
- virtual int save(SaveFlags::Flags flags) override;
- virtual void restore() override;
- virtual void restoreToCount(int saveCount) override;
-
- virtual int saveLayer(float left, float top, float right, float bottom,
- const SkPaint* paint, SaveFlags::Flags flags) override;
- virtual int saveLayerAlpha(float left, float top, float right, float bottom,
- int alpha, SaveFlags::Flags flags) override;
-
- virtual void getMatrix(SkMatrix* outMatrix) const override;
- virtual void setMatrix(const SkMatrix& matrix) override;
- virtual void concat(const SkMatrix& matrix) override;
- virtual void rotate(float degrees) override;
- virtual void scale(float sx, float sy) override;
- virtual void skew(float sx, float sy) override;
- virtual void translate(float dx, float dy) override;
-
- virtual bool getClipBounds(SkRect* outRect) const override;
- virtual bool quickRejectRect(float left, float top, float right, float bottom) const override;
- virtual bool quickRejectPath(const SkPath& path) const override;
- virtual bool clipRect(float left, float top, float right, float bottom,
- SkRegion::Op op) override;
- virtual bool clipPath(const SkPath* path, SkRegion::Op op) override;
- virtual bool clipRegion(const SkRegion* region, SkRegion::Op op) override;
-
- virtual SkDrawFilter* getDrawFilter() override;
- virtual void setDrawFilter(SkDrawFilter* drawFilter) override;
-
- virtual void drawColor(int color, SkXfermode::Mode mode) override;
- virtual void drawPaint(const SkPaint& paint) override;
-
- virtual void drawPoint(float x, float y, const SkPaint& paint) override;
- virtual void drawPoints(const float* points, int count, const SkPaint& paint) override;
- virtual void drawLine(float startX, float startY, float stopX, float stopY,
- const SkPaint& paint) override;
- virtual void drawLines(const float* points, int count, const SkPaint& paint) override;
- virtual void drawRect(float left, float top, float right, float bottom,
- const SkPaint& paint) override;
- virtual void drawRegion(const SkRegion& region, const SkPaint& paint) override;
- virtual void drawRoundRect(float left, float top, float right, float bottom,
- float rx, float ry, const SkPaint& paint) override;
- virtual void drawCircle(float x, float y, float radius, const SkPaint& paint) override;
- virtual void drawOval(float left, float top, float right, float bottom,
- const SkPaint& paint) override;
- virtual void drawArc(float left, float top, float right, float bottom,
- float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) override;
- virtual void drawPath(const SkPath& path, const SkPaint& paint) override;
- virtual void drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
- const float* verts, const float* tex, const int* colors,
- const uint16_t* indices, int indexCount, const SkPaint& paint) override;
-
- virtual void drawBitmap(const SkBitmap& bitmap, float left, float top,
- const SkPaint* paint) override;
- virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,
- const SkPaint* paint) override;
- virtual void drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,
- float srcRight, float srcBottom, float dstLeft, float dstTop,
- float dstRight, float dstBottom, const SkPaint* paint) override;
- virtual void drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,
- const float* vertices, const int* colors, const SkPaint* paint) override;
- virtual void drawNinePatch(const SkBitmap& bitmap, const android::Res_png_9patch& chunk,
- float dstLeft, float dstTop, float dstRight, float dstBottom,
- const SkPaint* paint) override;
-
- virtual bool drawTextAbsolutePos() const override { return true; }
- virtual void drawVectorDrawable(VectorDrawableRoot* vectorDrawable) override;
-
- virtual void drawRoundRect(uirenderer::CanvasPropertyPrimitive* left,
- uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right,
- uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx,
- uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* paint) override;
- virtual void drawCircle(uirenderer::CanvasPropertyPrimitive* x,
- uirenderer::CanvasPropertyPrimitive* y, uirenderer::CanvasPropertyPrimitive* radius,
- uirenderer::CanvasPropertyPaint* paint) override;
-
- virtual void drawLayer(uirenderer::DeferredLayerUpdater* layerHandle) override;
- virtual void drawRenderNode(uirenderer::RenderNode* renderNode) override;
- virtual void callDrawGLFunction(Functor* functor,
- uirenderer::GlFunctorLifecycleListener* listener) override;
-
-protected:
- virtual void drawGlyphs(const uint16_t* text, const float* positions, int count,
- const SkPaint& paint, float x, float y,
- float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
- float totalAdvance) override;
- virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path,
- float hOffset, float vOffset, const SkPaint& paint) override;
-
-private:
- struct SaveRec {
- int saveCount;
- SaveFlags::Flags saveFlags;
- };
-
- bool mHighContrastText = false;
-
- void recordPartialSave(SaveFlags::Flags flags);
- void saveClipsForFrame(SkTArray<SkClipStack::Element>& clips, int frameSaveCount);
- void applyClips(const SkTArray<SkClipStack::Element>& clips);
-
- void drawPoints(const float* points, int count, const SkPaint& paint,
- SkCanvas::PointMode mode);
-
- SkAutoTUnref<SkCanvas> mCanvas;
- std::unique_ptr<SkDeque> mSaveStack; // lazily allocated, tracks partial saves.
-};
-
Canvas* Canvas::create_canvas(const SkBitmap& bitmap) {
return new SkiaCanvas(bitmap);
}
@@ -201,6 +46,12 @@
mCanvas.reset(new SkCanvas(bitmap));
}
+void SkiaCanvas::reset(SkCanvas* skiaCanvas) {
+ mCanvas.reset(SkRef(skiaCanvas));
+ mSaveStack.reset(nullptr);
+ mHighContrastText = false;
+}
+
// ----------------------------------------------------------------------------
// Canvas state operations: Replace Bitmap
// ----------------------------------------------------------------------------
@@ -224,18 +75,18 @@
};
void SkiaCanvas::setBitmap(const SkBitmap& bitmap) {
- SkCanvas* newCanvas = new SkCanvas(bitmap);
+ sk_sp<SkCanvas> newCanvas(new SkCanvas(bitmap));
if (!bitmap.isNull()) {
// Copy the canvas matrix & clip state.
newCanvas->setMatrix(mCanvas->getTotalMatrix());
- ClipCopier copier(newCanvas);
+ ClipCopier copier(newCanvas.get());
mCanvas->replayClips(&copier);
}
// unrefs the existing canvas
- mCanvas.reset(newCanvas);
+ mCanvas = std::move(newCanvas);
// clean up the old save stack
mSaveStack.reset(NULL);
@@ -402,7 +253,7 @@
}
void SkiaCanvas::applyClips(const SkTArray<SkClipStack::Element>& clips) {
- ClipCopier clipCopier(mCanvas);
+ ClipCopier clipCopier(mCanvas.get());
// The clip stack stores clips in device space.
SkMatrix origMatrix = mCanvas->getTotalMatrix();
@@ -494,7 +345,12 @@
}
bool SkiaCanvas::clipPath(const SkPath* path, SkRegion::Op op) {
- mCanvas->clipPath(*path, op);
+ SkRRect roundRect;
+ if (path->isRRect(&roundRect)) {
+ mCanvas->clipRRect(roundRect, op);
+ } else {
+ mCanvas->clipPath(*path, op);
+ }
return !mCanvas->isClipEmpty();
}
@@ -606,7 +462,15 @@
}
void SkiaCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
- mCanvas->drawPath(path, paint);
+ SkRect rect;
+ SkRRect roundRect;
+ if (path.isOval(&rect)) {
+ mCanvas->drawOval(rect, paint);
+ } else if (path.isRRect(&roundRect)) {
+ mCanvas->drawRRect(roundRect, paint);
+ } else {
+ mCanvas->drawPath(path, paint);
+ }
}
void SkiaCanvas::drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
@@ -629,7 +493,7 @@
}
void SkiaCanvas::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, const SkPaint* paint) {
- SkAutoCanvasRestore acr(mCanvas, true);
+ SkAutoCanvasRestore acr(mCanvas.get(), true);
mCanvas->concat(matrix);
mCanvas->drawBitmap(bitmap, 0, 0, paint);
}
@@ -742,7 +606,7 @@
void SkiaCanvas::drawNinePatch(const SkBitmap& bitmap, const Res_png_9patch& chunk,
float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint) {
SkRect bounds = SkRect::MakeLTRB(dstLeft, dstTop, dstRight, dstBottom);
- NinePatch::Draw(mCanvas, bounds, bitmap, chunk, paint, nullptr);
+ NinePatch::Draw(mCanvas.get(), bounds, bitmap, chunk, paint, nullptr);
}
void SkiaCanvas::drawVectorDrawable(VectorDrawableRoot* vectorDrawable) {
@@ -762,9 +626,32 @@
drawTextDecorations(x, y, totalAdvance, paint);
}
-void SkiaCanvas::drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path,
- float hOffset, float vOffset, const SkPaint& paint) {
- mCanvas->drawTextOnPathHV(glyphs, count << 1, path, hOffset, vOffset, paint);
+void SkiaCanvas::drawLayoutOnPath(const minikin::Layout& layout, float hOffset, float vOffset,
+ const SkPaint& paint, const SkPath& path, size_t start, size_t end) {
+ const int N = end - start;
+ SkAutoSMalloc<1024> storage(N * (sizeof(uint16_t) + sizeof(SkRSXform)));
+ SkRSXform* xform = (SkRSXform*)storage.get();
+ uint16_t* glyphs = (uint16_t*)(xform + N);
+ SkPathMeasure meas(path, false);
+
+ for (size_t i = start; i < end; i++) {
+ glyphs[i - start] = layout.getGlyphId(i);
+ float x = hOffset + layout.getX(i);
+ float y = vOffset + layout.getY(i);
+
+ SkPoint pos;
+ SkVector tan;
+ if (!meas.getPosTan(x, &pos, &tan)) {
+ pos.set(x, y);
+ tan.set(1, 0);
+ }
+ xform[i - start].fSCos = tan.x();
+ xform[i - start].fSSin = tan.y();
+ xform[i - start].fTx = pos.x() - tan.y() * y;
+ xform[i - start].fTy = pos.y() + tan.x() * y;
+ }
+
+ this->asSkCanvas()->drawTextRSXform(glyphs, sizeof(uint16_t) * N, xform, nullptr, paint);
}
// ----------------------------------------------------------------------------
@@ -826,14 +713,14 @@
uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right,
uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx,
uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* paint) {
- SkAutoTUnref<AnimatedRoundRect> drawable(
+ sk_sp<AnimatedRoundRect> drawable(
new AnimatedRoundRect(left, top, right, bottom, rx, ry, paint));
mCanvas->drawDrawable(drawable.get());
}
void SkiaCanvas::drawCircle(uirenderer::CanvasPropertyPrimitive* x, uirenderer::CanvasPropertyPrimitive* y,
uirenderer::CanvasPropertyPrimitive* radius, uirenderer::CanvasPropertyPaint* paint) {
- SkAutoTUnref<AnimatedCircle> drawable(new AnimatedCircle(x, y, radius, paint));
+ sk_sp<AnimatedCircle> drawable(new AnimatedCircle(x, y, radius, paint));
mCanvas->drawDrawable(drawable.get());
}
@@ -841,11 +728,17 @@
// Canvas draw operations: View System
// ----------------------------------------------------------------------------
-void SkiaCanvas::drawLayer(uirenderer::DeferredLayerUpdater* layer) { }
+void SkiaCanvas::drawLayer(uirenderer::DeferredLayerUpdater* layer) {
+ LOG_ALWAYS_FATAL("SkiaCanvas can't directly draw Layers");
+}
-void SkiaCanvas::drawRenderNode(uirenderer::RenderNode* renderNode) { }
+void SkiaCanvas::drawRenderNode(uirenderer::RenderNode* renderNode) {
+ LOG_ALWAYS_FATAL("SkiaCanvas can't directly draw RenderNodes");
+}
void SkiaCanvas::callDrawGLFunction(Functor* functor,
- uirenderer::GlFunctorLifecycleListener* listener) { }
+ uirenderer::GlFunctorLifecycleListener* listener) {
+ LOG_ALWAYS_FATAL("SkiaCanvas can't directly draw GL Content");
+}
} // namespace android
diff --git a/libs/hwui/SkiaCanvas.h b/libs/hwui/SkiaCanvas.h
new file mode 100644
index 0000000..0e506f4
--- /dev/null
+++ b/libs/hwui/SkiaCanvas.h
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#pragma once
+
+#include "hwui/Canvas.h"
+#include "CanvasProperty.h"
+#include "DeferredLayerUpdater.h"
+#include "RenderNode.h"
+#include "VectorDrawable.h"
+
+#include <SkCanvas.h>
+#include <SkClipStack.h>
+#include <SkTArray.h>
+
+namespace android {
+
+// Holds an SkCanvas reference plus additional native data.
+class SkiaCanvas : public Canvas {
+public:
+ explicit SkiaCanvas(const SkBitmap& bitmap);
+
+ /**
+ * Create a new SkiaCanvas.
+ *
+ * @param canvas SkCanvas to handle calls made to this SkiaCanvas. Must
+ * not be NULL. This constructor will ref() the SkCanvas, and unref()
+ * it in its destructor.
+ */
+ explicit SkiaCanvas(SkCanvas* canvas) : mCanvas(canvas) {
+ SkASSERT(canvas);
+ canvas->ref();
+ }
+
+ virtual SkCanvas* asSkCanvas() override {
+ return mCanvas.get();
+ }
+
+ virtual void resetRecording(int width, int height) override {
+ LOG_ALWAYS_FATAL("SkiaCanvas cannot be reset as a recording canvas");
+ }
+
+ virtual uirenderer::DisplayList* finishRecording() override {
+ LOG_ALWAYS_FATAL("SkiaCanvas does not produce a DisplayList");
+ return nullptr;
+ }
+ virtual void insertReorderBarrier(bool enableReorder) override {
+ LOG_ALWAYS_FATAL("SkiaCanvas does not support reordering barriers");
+ }
+
+ virtual void setBitmap(const SkBitmap& bitmap) override;
+
+ virtual bool isOpaque() override;
+ virtual int width() override;
+ virtual int height() override;
+
+ virtual void setHighContrastText(bool highContrastText) override {
+ mHighContrastText = highContrastText;
+ }
+ virtual bool isHighContrastText() override { return mHighContrastText; }
+
+ virtual int getSaveCount() const override;
+ virtual int save(SaveFlags::Flags flags) override;
+ virtual void restore() override;
+ virtual void restoreToCount(int saveCount) override;
+
+ virtual int saveLayer(float left, float top, float right, float bottom,
+ const SkPaint* paint, SaveFlags::Flags flags) override;
+ virtual int saveLayerAlpha(float left, float top, float right, float bottom,
+ int alpha, SaveFlags::Flags flags) override;
+
+ virtual void getMatrix(SkMatrix* outMatrix) const override;
+ virtual void setMatrix(const SkMatrix& matrix) override;
+ virtual void concat(const SkMatrix& matrix) override;
+ virtual void rotate(float degrees) override;
+ virtual void scale(float sx, float sy) override;
+ virtual void skew(float sx, float sy) override;
+ virtual void translate(float dx, float dy) override;
+
+ virtual bool getClipBounds(SkRect* outRect) const override;
+ virtual bool quickRejectRect(float left, float top, float right, float bottom) const override;
+ virtual bool quickRejectPath(const SkPath& path) const override;
+ virtual bool clipRect(float left, float top, float right, float bottom,
+ SkRegion::Op op) override;
+ virtual bool clipPath(const SkPath* path, SkRegion::Op op) override;
+ virtual bool clipRegion(const SkRegion* region, SkRegion::Op op) override;
+
+ virtual SkDrawFilter* getDrawFilter() override;
+ virtual void setDrawFilter(SkDrawFilter* drawFilter) override;
+
+ virtual void drawColor(int color, SkXfermode::Mode mode) override;
+ virtual void drawPaint(const SkPaint& paint) override;
+
+ virtual void drawPoint(float x, float y, const SkPaint& paint) override;
+ virtual void drawPoints(const float* points, int count, const SkPaint& paint) override;
+ virtual void drawLine(float startX, float startY, float stopX, float stopY,
+ const SkPaint& paint) override;
+ virtual void drawLines(const float* points, int count, const SkPaint& paint) override;
+ virtual void drawRect(float left, float top, float right, float bottom,
+ const SkPaint& paint) override;
+ virtual void drawRegion(const SkRegion& region, const SkPaint& paint) override;
+ virtual void drawRoundRect(float left, float top, float right, float bottom,
+ float rx, float ry, const SkPaint& paint) override;
+ virtual void drawCircle(float x, float y, float radius, const SkPaint& paint) override;
+ virtual void drawOval(float left, float top, float right, float bottom,
+ const SkPaint& paint) override;
+ virtual void drawArc(float left, float top, float right, float bottom,
+ float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) override;
+ virtual void drawPath(const SkPath& path, const SkPaint& paint) override;
+ virtual void drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
+ const float* verts, const float* tex, const int* colors,
+ const uint16_t* indices, int indexCount, const SkPaint& paint) override;
+
+ virtual void drawBitmap(const SkBitmap& bitmap, float left, float top,
+ const SkPaint* paint) override;
+ virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,
+ const SkPaint* paint) override;
+ virtual void drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,
+ float srcRight, float srcBottom, float dstLeft, float dstTop,
+ float dstRight, float dstBottom, const SkPaint* paint) override;
+ virtual void drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,
+ const float* vertices, const int* colors, const SkPaint* paint) override;
+ virtual void drawNinePatch(const SkBitmap& bitmap, const android::Res_png_9patch& chunk,
+ float dstLeft, float dstTop, float dstRight, float dstBottom,
+ const SkPaint* paint) override;
+
+ virtual bool drawTextAbsolutePos() const override { return true; }
+ virtual void drawVectorDrawable(VectorDrawableRoot* vectorDrawable) override;
+
+ virtual void drawRoundRect(uirenderer::CanvasPropertyPrimitive* left,
+ uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right,
+ uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx,
+ uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* paint) override;
+ virtual void drawCircle(uirenderer::CanvasPropertyPrimitive* x,
+ uirenderer::CanvasPropertyPrimitive* y, uirenderer::CanvasPropertyPrimitive* radius,
+ uirenderer::CanvasPropertyPaint* paint) override;
+
+ virtual void drawLayer(uirenderer::DeferredLayerUpdater* layerHandle) override;
+ virtual void drawRenderNode(uirenderer::RenderNode* renderNode) override;
+ virtual void callDrawGLFunction(Functor* functor,
+ uirenderer::GlFunctorLifecycleListener* listener) override;
+
+protected:
+ explicit SkiaCanvas() {}
+ void reset(SkCanvas* skiaCanvas);
+ void drawDrawable(SkDrawable* drawable) { mCanvas->drawDrawable(drawable); }
+
+ virtual void drawGlyphs(const uint16_t* text, const float* positions, int count,
+ const SkPaint& paint, float x, float y,
+ float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
+ float totalAdvance) override;
+ virtual void drawLayoutOnPath(const minikin::Layout& layout, float hOffset, float vOffset,
+ const SkPaint& paint, const SkPath& path, size_t start, size_t end) override;
+
+private:
+ struct SaveRec {
+ int saveCount;
+ SaveFlags::Flags saveFlags;
+ };
+
+ bool mHighContrastText = false;
+
+ void recordPartialSave(SaveFlags::Flags flags);
+ void saveClipsForFrame(SkTArray<SkClipStack::Element>& clips, int frameSaveCount);
+ void applyClips(const SkTArray<SkClipStack::Element>& clips);
+
+ void drawPoints(const float* points, int count, const SkPaint& paint,
+ SkCanvas::PointMode mode);
+
+ sk_sp<SkCanvas> mCanvas;
+ std::unique_ptr<SkDeque> mSaveStack; // lazily allocated, tracks partial saves.
+};
+
+} // namespace android
+
diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp
index 9df32b28..fded604 100644
--- a/libs/hwui/SkiaCanvasProxy.cpp
+++ b/libs/hwui/SkiaCanvasProxy.cpp
@@ -23,6 +23,8 @@
#include <SkPixelRef.h>
#include <SkRect.h>
#include <SkRRect.h>
+#include <SkRSXform.h>
+#include <SkSurface.h>
#include <memory>
@@ -153,7 +155,7 @@
mCanvas->drawVertices(mode, floatCount, vArray, tArray, cArray, indices, indexCount, paint);
}
-SkSurface* SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {
+sk_sp<SkSurface> SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {
SkDEBUGFAIL("SkiaCanvasProxy::onNewSurface is not supported");
return NULL;
}
@@ -322,9 +324,9 @@
// by Minikin then it had already computed these bounds. Unfortunately,
// there is no way to capture those bounds as part of the Skia drawPosText
// API so we need to do that computation again here.
- SkRect bounds;
+ SkRect bounds = SkRect::MakeEmpty();
for (int i = 0; i < glyphs.count; i++) {
- SkRect glyphBounds;
+ SkRect glyphBounds = SkRect::MakeEmpty();
glyphs.paint.measureText(&glyphs.glyphIDs[i], sizeof(uint16_t), &glyphBounds);
glyphBounds.offset(pos[i].fX, pos[i].fY);
bounds.join(glyphBounds);
@@ -347,11 +349,26 @@
void SkiaCanvasProxy::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
const SkMatrix* matrix, const SkPaint& origPaint) {
- // convert to glyphIDs if necessary
- GlyphIDConverter glyphs(text, byteLength, origPaint);
- mCanvas->drawGlyphsOnPath(glyphs.glyphIDs, glyphs.count, path, 0, 0, glyphs.paint);
+ SkDEBUGFAIL("SkiaCanvasProxy::onDrawTextOnPath is not supported");
}
+void SkiaCanvasProxy::onDrawTextRSXform(const void* text, size_t byteLength,
+ const SkRSXform xform[], const SkRect* cullRect, const SkPaint& paint) {
+ GlyphIDConverter glyphs(text, byteLength, paint); // Just get count
+ SkMatrix localM, currM, origM;
+ mCanvas->getMatrix(&currM);
+ origM = currM;
+ for (int i = 0; i < glyphs.count; i++) {
+ localM.setRSXform(*xform++);
+ currM.setConcat(origM, localM);
+ mCanvas->setMatrix(currM);
+ this->onDrawText((char*)text + (byteLength / glyphs.count * i),
+ byteLength / glyphs.count, 0, 0, paint);
+ }
+ mCanvas->setMatrix(origM);
+}
+
+
void SkiaCanvasProxy::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) {
SkDEBUGFAIL("SkiaCanvasProxy::onDrawTextBlob is not supported");
diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h
index 973c55f..3ee8c6e 100644
--- a/libs/hwui/SkiaCanvasProxy.h
+++ b/libs/hwui/SkiaCanvasProxy.h
@@ -39,12 +39,12 @@
*/
class ANDROID_API SkiaCanvasProxy : public SkCanvas {
public:
- SkiaCanvasProxy(Canvas* canvas, bool filterHwuiCalls = false);
+ explicit SkiaCanvasProxy(Canvas* canvas, bool filterHwuiCalls = false);
virtual ~SkiaCanvasProxy() {}
protected:
- virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+ virtual sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
virtual void willSave() override;
virtual SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;
@@ -81,6 +81,8 @@
SkScalar constY, const SkPaint&) override;
virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
const SkMatrix* matrix, const SkPaint&) override;
+ virtual void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform[],
+ const SkRect* cullRect, const SkPaint& paint);
virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) override;
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp
index 2c9c9d9..21c26f7 100644
--- a/libs/hwui/Snapshot.cpp
+++ b/libs/hwui/Snapshot.cpp
@@ -30,14 +30,11 @@
, previous(nullptr)
, layer(nullptr)
, fbo(0)
- , invisible(false)
- , empty(false)
, alpha(1.0f)
, roundRectClipState(nullptr)
, projectionPathMask(nullptr)
, mClipArea(&mClipAreaRoot) {
transform = &mTransformRoot;
- region = nullptr;
}
/**
@@ -49,8 +46,6 @@
, previous(s)
, layer(s->layer)
, fbo(s->fbo)
- , invisible(s->invisible)
- , empty(false)
, alpha(s->alpha)
, roundRectClipState(s->roundRectClipState)
, projectionPathMask(s->projectionPathMask)
@@ -70,13 +65,6 @@
} else {
mClipArea = s->mClipArea;
}
-
- if (s->flags & Snapshot::kFlagFboTarget) {
- flags |= Snapshot::kFlagFboTarget;
- region = s->region;
- } else {
- region = nullptr;
- }
}
///////////////////////////////////////////////////////////////////////////////
@@ -126,58 +114,6 @@
}
///////////////////////////////////////////////////////////////////////////////
-// Transforms
-///////////////////////////////////////////////////////////////////////////////
-
-void Snapshot::resetTransform(float x, float y, float z) {
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("not supported - light center managed differently");
-#else
- // before resetting, map current light pos with inverse of current transform
- Vector3 center = mRelativeLightCenter;
- mat4 inverse;
- inverse.loadInverse(*transform);
- inverse.mapPoint3d(center);
- mRelativeLightCenter = center;
-
- transform = &mTransformRoot;
- transform->loadTranslate(x, y, z);
-#endif
-}
-
-void Snapshot::buildScreenSpaceTransform(Matrix4* outTransform) const {
-#if HWUI_NEW_OPS
- LOG_ALWAYS_FATAL("not supported - not needed by new ops");
-#else
- // build (reverse ordered) list of the stack of snapshots, terminated with a NULL
- Vector<const Snapshot*> snapshotList;
- snapshotList.push(nullptr);
- const Snapshot* current = this;
- do {
- snapshotList.push(current);
- current = current->previous;
- } while (current);
-
- // traverse the list, adding in each transform that contributes to the total transform
- outTransform->loadIdentity();
- for (size_t i = snapshotList.size() - 1; i > 0; i--) {
- // iterate down the stack
- const Snapshot* current = snapshotList[i];
- const Snapshot* next = snapshotList[i - 1];
- if (current->flags & kFlagIsFboLayer) {
- // if we've hit a layer, translate by the layer's draw offset
- outTransform->translate(current->layer->layer.left, current->layer->layer.top);
- }
- if (!next || (next->flags & kFlagIsFboLayer)) {
- // if this snapshot is last, or if this snapshot is last before an
- // FBO layer (which reset the transform), apply it
- outTransform->multiply(*(current->transform));
- }
- }
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
// Clipping round rect
///////////////////////////////////////////////////////////////////////////////
@@ -226,20 +162,8 @@
roundRectClipState = state;
}
-void Snapshot::setProjectionPathMask(LinearAllocator& allocator, const SkPath* path) {
-#if HWUI_NEW_OPS
- // TODO: remove allocator param for HWUI_NEW_OPS
+void Snapshot::setProjectionPathMask(const SkPath* path) {
projectionPathMask = path;
-#else
- if (path) {
- ProjectionPathMask* mask = new (allocator) ProjectionPathMask;
- mask->projectionMask = path;
- buildScreenSpaceTransform(&(mask->projectionMaskTransform));
- projectionPathMask = mask;
- } else {
- projectionPathMask = nullptr;
- }
-#endif
}
static Snapshot* getClipRoot(Snapshot* target) {
@@ -273,13 +197,9 @@
// Queries
///////////////////////////////////////////////////////////////////////////////
-bool Snapshot::isIgnored() const {
- return invisible || empty;
-}
-
void Snapshot::dump() const {
- ALOGD("Snapshot %p, flags %x, prev %p, height %d, ignored %d, hasComplexClip %d",
- this, flags, previous, getViewportHeight(), isIgnored(), !mClipArea->isSimple());
+ ALOGD("Snapshot %p, flags %x, prev %p, height %d, hasComplexClip %d",
+ this, flags, previous, getViewportHeight(), !mClipArea->isSimple());
const Rect& clipRect(mClipArea->getClipRect());
ALOGD(" ClipRect %.1f %.1f %.1f %.1f, clip simple %d",
clipRect.left, clipRect.top, clipRect.right, clipRect.bottom, mClipArea->isSimple());
diff --git a/libs/hwui/Snapshot.h b/libs/hwui/Snapshot.h
index d8f926e..4ab5830 100644
--- a/libs/hwui/Snapshot.h
+++ b/libs/hwui/Snapshot.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_SNAPSHOT_H
-#define ANDROID_HWUI_SNAPSHOT_H
+#pragma once
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
@@ -63,18 +62,6 @@
float radius;
};
-// TODO: remove for HWUI_NEW_OPS
-class ProjectionPathMask {
-public:
- static void* operator new(size_t size) = delete;
- static void* operator new(size_t size, LinearAllocator& allocator) {
- return allocator.alloc<ProjectionPathMask>(size);
- }
-
- const SkPath* projectionMask;
- Matrix4 projectionMaskTransform;
-};
-
/**
* A snapshot holds information about the current state of the rendering
* surface. A snapshot is usually created whenever the user calls save()
@@ -113,11 +100,6 @@
* restored when this snapshot is restored.
*/
kFlagIsFboLayer = 0x4,
- /**
- * Indicates that this snapshot or an ancestor snapshot is
- * an FBO layer.
- */
- kFlagFboTarget = 0x8, // TODO: remove for HWUI_NEW_OPS
};
/**
@@ -179,11 +161,6 @@
*/
void resetClip(float left, float top, float right, float bottom);
- /**
- * Resets the current transform to a pure 3D translation.
- */
- void resetTransform(float x, float y, float z);
-
void initializeViewport(int width, int height) {
mViewportData.initialize(width, height);
mClipAreaRoot.setViewportDimensions(width, height);
@@ -207,13 +184,7 @@
/**
* Sets (and replaces) the current projection mask
*/
- void setProjectionPathMask(LinearAllocator& allocator, const SkPath* path);
-
- /**
- * Indicates whether this snapshot should be ignored. A snapshot
- * is typically ignored if its layer is invisible or empty.
- */
- bool isIgnored() const;
+ void setProjectionPathMask(const SkPath* path);
/**
* Indicates whether the current transform has perspective components.
@@ -221,13 +192,6 @@
bool hasPerspectiveTransform() const;
/**
- * Fills outTransform with the current, total transform to screen space,
- * across layer boundaries.
- */
- // TODO: remove for HWUI_NEW_OPS
- void buildScreenSpaceTransform(Matrix4* outTransform) const;
-
- /**
* Dirty flags.
*/
int flags;
@@ -251,19 +215,6 @@
GLuint fbo;
/**
- * Indicates that this snapshot is invisible and nothing should be drawn
- * inside it. This flag is set only when the layer clips drawing to its
- * bounds and is passed to subsequent snapshots.
- */
- bool invisible;
-
- /**
- * If set to true, the layer will not be composited. This is similar to
- * invisible but this flag is not passed to subsequent snapshots.
- */
- bool empty;
-
- /**
* Local transformation. Holds the current translation, scale and
* rotation values.
*
@@ -273,14 +224,6 @@
mat4* transform;
/**
- * The ancestor layer's dirty region.
- *
- * This is a reference to a region owned by a layer. This pointer must
- * not be freed.
- */
- Region* region;
-
- /**
* Current alpha value. This value is 1 by default, but may be set by a DisplayList which
* has translucent rendering in a non-overlapping View. This value will be used by
* the renderer to set the alpha in the current color being used for ensuing drawing
@@ -302,11 +245,7 @@
/**
* Current projection masking path - used exclusively to mask projected, tessellated circles.
*/
-#if HWUI_NEW_OPS
const SkPath* projectionPathMask;
-#else
- const ProjectionPathMask* projectionPathMask;
-#endif
void dump() const;
@@ -345,5 +284,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_SNAPSHOT_H
diff --git a/libs/hwui/SpotShadow.cpp b/libs/hwui/SpotShadow.cpp
index 760d814..e2ee5bf 100644
--- a/libs/hwui/SpotShadow.cpp
+++ b/libs/hwui/SpotShadow.cpp
@@ -302,21 +302,6 @@
}
/**
- * Make the polygon turn clockwise.
- *
- * @param polygon the polygon as a Vector2 array.
- * @param len the number of points of the polygon
- */
-void SpotShadow::makeClockwise(Vector2* polygon, int len) {
- if (polygon == nullptr || len == 0) {
- return;
- }
- if (!ShadowTessellator::isClockwise(polygon, len)) {
- reverse(polygon, len);
- }
-}
-
-/**
* Reverse the polygon
*
* @param polygon the polygon as a Vector2 array
diff --git a/libs/hwui/SpotShadow.h b/libs/hwui/SpotShadow.h
index 62a7e5d..6108bb6 100644
--- a/libs/hwui/SpotShadow.h
+++ b/libs/hwui/SpotShadow.h
@@ -54,7 +54,6 @@
static void quicksortX(Vector2* points, int low, int high);
static bool testPointInsidePolygon(const Vector2 testPoint, const Vector2* poly, int len);
- static void makeClockwise(Vector2* polygon, int len);
static void reverse(Vector2* polygon, int len);
static void generateTriangleStrip(bool isCasterOpaque, float shadowStrengthScale,
diff --git a/libs/hwui/TessellationCache.cpp b/libs/hwui/TessellationCache.cpp
index d9e8116..91e7ac3 100644
--- a/libs/hwui/TessellationCache.cpp
+++ b/libs/hwui/TessellationCache.cpp
@@ -18,7 +18,6 @@
#include <utils/Trace.h>
#include "Caches.h"
-#include "OpenGLRenderer.h"
#include "PathTessellator.h"
#include "ShadowTessellator.h"
#include "TessellationCache.h"
@@ -369,21 +368,6 @@
mShadowCache.put(key, task.get());
}
-void TessellationCache::getShadowBuffers(const Matrix4* drawTransform, const Rect& localClip,
- bool opaque, const SkPath* casterPerimeter,
- const Matrix4* transformXY, const Matrix4* transformZ,
- const Vector3& lightCenter, float lightRadius, vertexBuffer_pair_t& outBuffers) {
- ShadowDescription key(casterPerimeter, drawTransform);
- ShadowTask* task = static_cast<ShadowTask*>(mShadowCache.get(key));
- if (!task) {
- precacheShadows(drawTransform, localClip, opaque, casterPerimeter,
- transformXY, transformZ, lightCenter, lightRadius);
- task = static_cast<ShadowTask*>(mShadowCache.get(key));
- }
- LOG_ALWAYS_FATAL_IF(task == nullptr, "shadow not precached");
- outBuffers = task->getResult();
-}
-
sp<TessellationCache::ShadowTask> TessellationCache::getShadowTask(
const Matrix4* drawTransform, const Rect& localClip,
bool opaque, const SkPath* casterPerimeter,
diff --git a/libs/hwui/TessellationCache.h b/libs/hwui/TessellationCache.h
index 6141b4e..ccad1b7 100644
--- a/libs/hwui/TessellationCache.h
+++ b/libs/hwui/TessellationCache.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef ANDROID_HWUI_TESSELLATION_CACHE_H
-#define ANDROID_HWUI_TESSELLATION_CACHE_H
+#pragma once
#include "Debug.h"
#include "Matrix.h"
@@ -161,17 +160,6 @@
const VertexBuffer* getRoundRect(const Matrix4& transform, const SkPaint& paint,
float width, float height, float rx, float ry);
- // TODO: delete these when switching to HWUI_NEW_OPS
- void precacheShadows(const Matrix4* drawTransform, const Rect& localClip,
- bool opaque, const SkPath* casterPerimeter,
- const Matrix4* transformXY, const Matrix4* transformZ,
- const Vector3& lightCenter, float lightRadius);
- void getShadowBuffers(const Matrix4* drawTransform, const Rect& localClip,
- bool opaque, const SkPath* casterPerimeter,
- const Matrix4* transformXY, const Matrix4* transformZ,
- const Vector3& lightCenter, float lightRadius,
- vertexBuffer_pair_t& outBuffers);
-
sp<ShadowTask> getShadowTask(const Matrix4* drawTransform, const Rect& localClip,
bool opaque, const SkPath* casterPerimeter,
const Matrix4* transformXY, const Matrix4* transformZ,
@@ -184,6 +172,11 @@
typedef VertexBuffer* (*Tessellator)(const Description&);
+ void precacheShadows(const Matrix4* drawTransform, const Rect& localClip,
+ bool opaque, const SkPath* casterPerimeter,
+ const Matrix4* transformXY, const Matrix4* transformZ,
+ const Vector3& lightCenter, float lightRadius);
+
Buffer* getRectBuffer(const Matrix4& transform, const SkPaint& paint,
float width, float height);
Buffer* getRoundRectBuffer(const Matrix4& transform, const SkPaint& paint,
@@ -232,5 +225,3 @@
}; // namespace uirenderer
}; // namespace android
-
-#endif // ANDROID_HWUI_PATH_CACHE_H
diff --git a/libs/hwui/TextDropShadowCache.h b/libs/hwui/TextDropShadowCache.h
index d536c40..13e8774 100644
--- a/libs/hwui/TextDropShadowCache.h
+++ b/libs/hwui/TextDropShadowCache.h
@@ -111,7 +111,7 @@
* Alpha texture used to represent a shadow.
*/
struct ShadowTexture: public Texture {
- ShadowTexture(Caches& caches): Texture(caches) {
+ explicit ShadowTexture(Caches& caches): Texture(caches) {
}
float left;
@@ -121,7 +121,7 @@
class TextDropShadowCache: public OnEntryRemoved<ShadowText, ShadowTexture*> {
public:
TextDropShadowCache();
- TextDropShadowCache(uint32_t maxByteSize);
+ explicit TextDropShadowCache(uint32_t maxByteSize);
~TextDropShadowCache();
/**
diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h
index 9749f73..b72742f 100644
--- a/libs/hwui/Texture.h
+++ b/libs/hwui/Texture.h
@@ -34,7 +34,7 @@
*/
class Texture : public GpuMemoryTracker {
public:
- Texture(Caches& caches)
+ explicit Texture(Caches& caches)
: GpuMemoryTracker(GpuObjectType::Texture)
, mCaches(caches)
{ }
@@ -171,7 +171,7 @@
class AutoTexture {
public:
- AutoTexture(Texture* texture)
+ explicit AutoTexture(Texture* texture)
: texture(texture) {}
~AutoTexture() {
if (texture && texture->cleanup) {
diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h
index ac2bdcc..2087fca 100644
--- a/libs/hwui/TreeInfo.h
+++ b/libs/hwui/TreeInfo.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef TREEINFO_H
-#define TREEINFO_H
+
+#pragma once
#include "utils/Macros.h"
@@ -31,7 +31,6 @@
class DamageAccumulator;
class LayerUpdateQueue;
-class OpenGLRenderer;
class RenderNode;
class RenderState;
@@ -89,13 +88,7 @@
// Must not be null during actual usage
DamageAccumulator* damageAccumulator = nullptr;
-#if HWUI_NEW_OPS
LayerUpdateQueue* layerUpdateQueue = nullptr;
-#else
- // The renderer that will be drawing the next frame. Use this to push any
- // layer updates or similar. May be NULL.
- OpenGLRenderer* renderer = nullptr;
-#endif
ErrorHandler* errorHandler = nullptr;
// Optional, may be nullptr. Used to allow things to observe interesting
@@ -128,5 +121,3 @@
} /* namespace uirenderer */
} /* namespace android */
-
-#endif /* TREEINFO_H */
diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h
index 940b1ca..cf77cbb 100644
--- a/libs/hwui/VectorDrawable.h
+++ b/libs/hwui/VectorDrawable.h
@@ -685,6 +685,7 @@
TreeProperties* mutateProperties() { return &mProperties; }
// This should always be called from RT.
+ void markDirty() { mCache.dirty = true; }
bool isDirty() const { return mCache.dirty; }
bool getPropertyChangeWillBeConsumed() const { return mWillBeConsumed; }
void setPropertyChangeWillBeConsumed(bool willBeConsumed) { mWillBeConsumed = willBeConsumed; }
diff --git a/libs/hwui/font/CachedGlyphInfo.h b/libs/hwui/font/CachedGlyphInfo.h
index 0642d59..073d59b 100644
--- a/libs/hwui/font/CachedGlyphInfo.h
+++ b/libs/hwui/font/CachedGlyphInfo.h
@@ -17,8 +17,6 @@
#ifndef ANDROID_HWUI_CACHED_GLYPH_INFO_H
#define ANDROID_HWUI_CACHED_GLYPH_INFO_H
-#include <SkFixed.h>
-
namespace android {
namespace uirenderer {
@@ -41,14 +39,14 @@
float mBitmapMaxV;
// Minimize how much we call freetype
uint32_t mGlyphIndex;
- uint32_t mAdvanceX;
- uint32_t mAdvanceY;
+ float mAdvanceX;
+ float mAdvanceY;
// Values below contain a glyph's origin in the bitmap
int32_t mBitmapLeft;
int32_t mBitmapTop;
- // Auto-kerning
- SkFixed mLsbDelta;
- SkFixed mRsbDelta;
+ // Auto-kerning; represents a 2.6 fixed-point value with range [-1, 1].
+ int8_t mLsbDelta;
+ int8_t mRsbDelta;
CacheTexture* mCacheTexture;
};
diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp
index 8e04c87..9c812bc 100644
--- a/libs/hwui/font/Font.cpp
+++ b/libs/hwui/font/Font.cpp
@@ -304,7 +304,7 @@
}
int glyphsCount = 0;
- SkFixed prevRsbDelta = 0;
+ int prevRsbDelta = 0;
float penX = 0.0f;
@@ -332,14 +332,14 @@
}
CachedGlyphInfo* cachedGlyph = getCachedGlyph(paint, glyph);
- penX += SkFixedToFloat(AUTO_KERN(prevRsbDelta, cachedGlyph->mLsbDelta));
+ penX += AUTO_KERN(prevRsbDelta, cachedGlyph->mLsbDelta);
prevRsbDelta = cachedGlyph->mRsbDelta;
if (cachedGlyph->mIsValid && cachedGlyph->mCacheTexture) {
drawCachedGlyph(cachedGlyph, penX, hOffset, vOffset, measure, &position, &tangent);
}
- penX += SkFixedToFloat(cachedGlyph->mAdvanceX);
+ penX += cachedGlyph->mAdvanceX;
glyphsCount++;
}
diff --git a/libs/hwui/font/FontUtil.h b/libs/hwui/font/FontUtil.h
index aa77d98..07e8b34 100644
--- a/libs/hwui/font/FontUtil.h
+++ b/libs/hwui/font/FontUtil.h
@@ -44,6 +44,8 @@
#define GET_METRICS(cache, glyph) cache->getGlyphIDMetrics(glyph)
#define IS_END_OF_STRING(glyph) false
-#define AUTO_KERN(prev, next) (((next) - (prev) + 32) >> 6 << 16)
+// prev, next are assumed to be signed x.6 fixed-point numbers with range
+// [-1, 1]. Result is an integral float.
+#define AUTO_KERN(prev, next) static_cast<float>(((next) - (prev) + 32) >> 6)
#endif // ANDROID_HWUI_FONT_UTIL_H
diff --git a/libs/hwui/hwui/Canvas.cpp b/libs/hwui/hwui/Canvas.cpp
index dd0d72b..b18e794 100644
--- a/libs/hwui/hwui/Canvas.cpp
+++ b/libs/hwui/hwui/Canvas.cpp
@@ -16,7 +16,6 @@
#include "Canvas.h"
-#include "DisplayListCanvas.h"
#include "RecordingCanvas.h"
#include "MinikinUtils.h"
#include "Paint.h"
@@ -27,11 +26,7 @@
namespace android {
Canvas* Canvas::create_recording_canvas(int width, int height) {
-#if HWUI_NEW_OPS
return new uirenderer::RecordingCanvas(width, height);
-#else
- return new uirenderer::DisplayListCanvas(width, height);
-#endif
}
void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint& paint) {
@@ -190,13 +185,7 @@
}
void operator()(size_t start, size_t end) {
- uint16_t glyphs[1];
- for (size_t i = start; i < end; i++) {
- glyphs[0] = layout.getGlyphId(i);
- float x = hOffset + layout.getX(i);
- float y = vOffset + layout.getY(i);
- canvas->drawGlyphsOnPath(glyphs, 1, path, x, y, paint);
- }
+ canvas->drawLayoutOnPath(layout, hOffset, vOffset, paint, path, start, end);
}
private:
const minikin::Layout& layout;
diff --git a/libs/hwui/hwui/Canvas.h b/libs/hwui/hwui/Canvas.h
index 55af33e..d76143b 100644
--- a/libs/hwui/hwui/Canvas.h
+++ b/libs/hwui/hwui/Canvas.h
@@ -14,19 +14,23 @@
* limitations under the License.
*/
-#ifndef ANDROID_GRAPHICS_CANVAS_H
-#define ANDROID_GRAPHICS_CANVAS_H
+#pragma once
#include <cutils/compiler.h>
#include <utils/Functor.h>
#include "GlFunctorLifecycleListener.h"
+#include "utils/Macros.h"
#include "utils/NinePatch.h"
#include <SkBitmap.h>
#include <SkCanvas.h>
#include <SkMatrix.h>
+namespace minikin {
+ class Layout;
+}
+
namespace android {
namespace uirenderer {
@@ -70,7 +74,7 @@
static Canvas* create_canvas(const SkBitmap& bitmap);
- static Canvas* create_recording_canvas(int width, int height);
+ static WARN_UNUSED_RESULT Canvas* create_recording_canvas(int width, int height);
/**
* Create a new Canvas object which delegates to an SkCanvas.
@@ -220,7 +224,7 @@
/**
* Draws a VectorDrawable onto the canvas.
*/
- virtual void drawVectorDrawable(VectorDrawableRoot* tree);
+ virtual void drawVectorDrawable(VectorDrawableRoot* tree) = 0;
/**
* Converts utf16 text to glyphs, calculating position and boundary,
@@ -243,14 +247,11 @@
const SkPaint& paint, float x, float y,
float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
float totalAdvance) = 0;
- /** drawTextOnPath: count is of glyphs */
- virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path,
- float hOffset, float vOffset, const SkPaint& paint) = 0;
-
+ virtual void drawLayoutOnPath(const minikin::Layout& layout, float hOffset, float vOffset,
+ const SkPaint& paint, const SkPath& path, size_t start, size_t end) = 0;
friend class DrawTextFunctor;
friend class DrawTextOnPathFunctor;
friend class uirenderer::SkiaCanvasProxy;
};
}; // namespace android
-#endif // ANDROID_GRAPHICS_CANVAS_H
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index 5e60064..ee4619d 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -60,38 +60,6 @@
}
void RenderState::onGLContextDestroyed() {
-/*
- size_t size = mActiveLayers.size();
- if (CC_UNLIKELY(size != 0)) {
- ALOGE("Crashing, have %d contexts and %d layers at context destruction. isempty %d",
- mRegisteredContexts.size(), size, mActiveLayers.empty());
- mCaches->dumpMemoryUsage();
- for (std::set<renderthread::CanvasContext*>::iterator cit = mRegisteredContexts.begin();
- cit != mRegisteredContexts.end(); cit++) {
- renderthread::CanvasContext* context = *cit;
- ALOGE("Context: %p (root = %p)", context, context->mRootRenderNode.get());
- ALOGE(" Prefeteched layers: %zu", context->mPrefetechedLayers.size());
- for (std::set<RenderNode*>::iterator pit = context->mPrefetechedLayers.begin();
- pit != context->mPrefetechedLayers.end(); pit++) {
- (*pit)->debugDumpLayers(" ");
- }
- context->mRootRenderNode->debugDumpLayers(" ");
- }
-
-
- if (mActiveLayers.begin() == mActiveLayers.end()) {
- ALOGE("set has become empty. wat.");
- }
- for (std::set<const Layer*>::iterator lit = mActiveLayers.begin();
- lit != mActiveLayers.end(); lit++) {
- const Layer* layer = *(lit);
- ALOGE("Layer %p, state %d, texlayer %d, fbo %d, buildlayered %d",
- layer, layer->state, layer->isTextureLayer(), layer->getFbo(), layer->wasBuildLayered);
- }
- LOG_ALWAYS_FATAL("%d layers have survived gl context destruction", size);
- }
-*/
-
mLayerPool.clear();
// TODO: reset all cached state in state objects
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 2180976..a3004df 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -22,14 +22,14 @@
#include "DeferredLayerUpdater.h"
#include "EglManager.h"
#include "LayerUpdateQueue.h"
-#include "LayerRenderer.h"
-#include "OpenGLRenderer.h"
#include "Properties.h"
+#include "Readback.h"
#include "RenderThread.h"
#include "hwui/Canvas.h"
#include "renderstate/RenderState.h"
#include "renderstate/Stencil.h"
#include "protos/hwui.pb.h"
+#include "OpenGLPipeline.h"
#include "utils/GLUtils.h"
#include "utils/TimeUtils.h"
@@ -61,15 +61,40 @@
namespace uirenderer {
namespace renderthread {
+CanvasContext* CanvasContext::create(RenderThread& thread,
+ bool translucent, RenderNode* rootRenderNode, IContextFactory* contextFactory) {
+
+ auto renderType = Properties::getRenderPipelineType();
+
+ switch (renderType) {
+ case RenderPipelineType::OpenGL:
+ return new CanvasContext(thread, translucent, rootRenderNode, contextFactory,
+ std::make_unique<OpenGLPipeline>(thread));
+ case RenderPipelineType::SkiaGL:
+ //TODO: implement SKIA GL
+ LOG_ALWAYS_FATAL("skiaGL canvas type not implemented.");
+ break;
+ case RenderPipelineType::SkiaVulkan:
+ //TODO: implement Vulkan
+ LOG_ALWAYS_FATAL("Vulkan canvas type not implemented.");
+ break;
+ default:
+ LOG_ALWAYS_FATAL("canvas context type %d not supported", (int32_t) renderType);
+ break;
+ }
+ return nullptr;
+}
+
CanvasContext::CanvasContext(RenderThread& thread, bool translucent,
- RenderNode* rootRenderNode, IContextFactory* contextFactory)
+ RenderNode* rootRenderNode, IContextFactory* contextFactory,
+ std::unique_ptr<IRenderPipeline> renderPipeline)
: mRenderThread(thread)
- , mEglManager(thread.eglManager())
, mOpaque(!translucent)
, mAnimationContext(contextFactory->createAnimationContext(mRenderThread.timeLord()))
- , mJankTracker(thread.timeLord().frameIntervalNanos())
+ , mJankTracker(thread.mainDisplayInfo())
, mProfiler(mFrames)
- , mContentDrawBounds(0, 0, 0, 0) {
+ , mContentDrawBounds(0, 0, 0, 0)
+ , mRenderPipeline(std::move(renderPipeline)) {
mRenderNodes.emplace_back(rootRenderNode);
mRenderThread.renderState().registerCanvasContext(this);
mProfiler.setDensity(mRenderThread.mainDisplayInfo().density);
@@ -86,12 +111,6 @@
freePrefetchedLayers(observer);
destroyHardwareResources(observer);
mAnimationContext->destroy();
-#if !HWUI_NEW_OPS
- if (mCanvas) {
- delete mCanvas;
- mCanvas = nullptr;
- }
-#endif
}
void CanvasContext::setSurface(Surface* surface) {
@@ -99,24 +118,15 @@
mNativeSurface = surface;
- if (mEglSurface != EGL_NO_SURFACE) {
- mEglManager.destroySurface(mEglSurface);
- mEglSurface = EGL_NO_SURFACE;
- }
-
- if (surface) {
- mEglSurface = mEglManager.createSurface(surface);
- }
+ bool hasSurface = mRenderPipeline->setSurface(surface, mSwapBehavior);
mFrameNumber = -1;
- if (mEglSurface != EGL_NO_SURFACE) {
- const bool preserveBuffer = (mSwapBehavior != kSwap_discardBuffer);
- mBufferPreserved = mEglManager.setPreserveBuffer(mEglSurface, preserveBuffer);
- mHaveNewSurface = true;
- mSwapHistory.clear();
+ if (hasSurface) {
+ mHaveNewSurface = true;
+ mSwapHistory.clear();
} else {
- mRenderThread.removeFrameCallback(this);
+ mRenderThread.removeFrameCallback(this);
}
}
@@ -126,11 +136,6 @@
void CanvasContext::initialize(Surface* surface) {
setSurface(surface);
-#if !HWUI_NEW_OPS
- if (mCanvas) return;
- mCanvas = new OpenGLRenderer(mRenderThread.renderState());
- mCanvas->initProperties();
-#endif
}
void CanvasContext::updateSurface(Surface* surface) {
@@ -146,9 +151,7 @@
mStopped = stopped;
if (mStopped) {
mRenderThread.removeFrameCallback(this);
- if (mEglManager.isCurrent(mEglSurface)) {
- mEglManager.makeCurrent(EGL_NO_SURFACE);
- }
+ mRenderPipeline->onStop();
} else if (mIsDirty && hasSurface()) {
mRenderThread.postFrameCallback(this);
}
@@ -157,23 +160,13 @@
void CanvasContext::setup(float lightRadius,
uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
-#if HWUI_NEW_OPS
mLightGeometry.radius = lightRadius;
mLightInfo.ambientShadowAlpha = ambientShadowAlpha;
mLightInfo.spotShadowAlpha = spotShadowAlpha;
-#else
- if (!mCanvas) return;
- mCanvas->initLight(lightRadius, ambientShadowAlpha, spotShadowAlpha);
-#endif
}
void CanvasContext::setLightCenter(const Vector3& lightCenter) {
-#if HWUI_NEW_OPS
mLightGeometry.center = lightCenter;
-#else
- if (!mCanvas) return;
- mCanvas->setLightCenter(lightCenter);
-#endif
}
void CanvasContext::setOpaque(bool opaque) {
@@ -183,20 +176,71 @@
bool CanvasContext::makeCurrent() {
if (mStopped) return false;
- // TODO: Figure out why this workaround is needed, see b/13913604
- // In the meantime this matches the behavior of GLRenderer, so it is not a regression
- EGLint error = 0;
- mHaveNewSurface |= mEglManager.makeCurrent(mEglSurface, &error);
- if (error) {
- setSurface(nullptr);
+ auto result = mRenderPipeline->makeCurrent();
+ switch (result) {
+ case MakeCurrentResult::AlreadyCurrent:
+ return true;
+ case MakeCurrentResult::Failed:
+ mHaveNewSurface = true;
+ setSurface(nullptr);
+ return false;
+ case MakeCurrentResult::Succeeded:
+ mHaveNewSurface = true;
+ return true;
+ default:
+ LOG_ALWAYS_FATAL("unexpected result %d from IRenderPipeline::makeCurrent",
+ (int32_t) result);
}
- return !error;
+
+ return true;
}
static bool wasSkipped(FrameInfo* info) {
return info && ((*info)[FrameInfoIndex::Flags] & FrameInfoFlags::SkippedFrame);
}
+bool CanvasContext::isSwapChainStuffed() {
+ static const auto SLOW_THRESHOLD = 6_ms;
+
+ if (mSwapHistory.size() != mSwapHistory.capacity()) {
+ // We want at least 3 frames of history before attempting to
+ // guess if the queue is stuffed
+ return false;
+ }
+ nsecs_t frameInterval = mRenderThread.timeLord().frameIntervalNanos();
+ auto& swapA = mSwapHistory[0];
+
+ // Was there a happy queue & dequeue time? If so, don't
+ // consider it stuffed
+ if (swapA.dequeueDuration < SLOW_THRESHOLD
+ && swapA.queueDuration < SLOW_THRESHOLD) {
+ return false;
+ }
+
+ for (size_t i = 1; i < mSwapHistory.size(); i++) {
+ auto& swapB = mSwapHistory[i];
+
+ // If there's a multi-frameInterval gap we effectively already dropped a frame,
+ // so consider the queue healthy.
+ if (swapA.swapCompletedTime - swapB.swapCompletedTime > frameInterval * 3) {
+ return false;
+ }
+
+ // Was there a happy queue & dequeue time? If so, don't
+ // consider it stuffed
+ if (swapB.dequeueDuration < SLOW_THRESHOLD
+ && swapB.queueDuration < SLOW_THRESHOLD) {
+ return false;
+ }
+
+ swapA = swapB;
+ }
+
+ // All signs point to a stuffed swap chain
+ ATRACE_NAME("swap chain stuffed");
+ return true;
+}
+
void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo,
int64_t syncQueued, RenderNode* target) {
mRenderThread.removeFrameCallback(this);
@@ -211,11 +255,7 @@
mCurrentFrameInfo->markSyncStart();
info.damageAccumulator = &mDamageAccumulator;
-#if HWUI_NEW_OPS
info.layerUpdateQueue = &mLayerUpdateQueue;
-#else
- info.renderer = mCanvas;
-#endif
mAnimationContext->startFrame(info.mode);
for (const sp<RenderNode>& node : mRenderNodes) {
@@ -240,9 +280,9 @@
return;
}
- if (CC_LIKELY(mSwapHistory.size())) {
+ if (CC_LIKELY(mSwapHistory.size() && !Properties::forceDrawFrame)) {
nsecs_t latestVsync = mRenderThread.timeLord().latestVsync();
- const SwapHistory& lastSwap = mSwapHistory.back();
+ SwapHistory& lastSwap = mSwapHistory.back();
nsecs_t vsyncDelta = std::abs(lastSwap.vsyncTime - latestVsync);
// The slight fudge-factor is to deal with cases where
// the vsync was estimated due to being slow handling the signal.
@@ -252,15 +292,17 @@
// Already drew for this vsync pulse, UI draw request missed
// the deadline for RT animations
info.out.canDrawThisFrame = false;
- } else if (lastSwap.swapTime < latestVsync) {
+ } else if (vsyncDelta >= mRenderThread.timeLord().frameIntervalNanos() * 3
+ || (latestVsync - mLastDropVsync) < 500_ms) {
+ // It's been several frame intervals, assume the buffer queue is fine
+ // or the last drop was too recent
info.out.canDrawThisFrame = true;
} else {
- // We're maybe behind? Find out for sure
- int runningBehind = 0;
- // TODO: Have this method be on Surface, too, not just ANativeWindow...
- ANativeWindow* window = mNativeSurface.get();
- window->query(window, NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND, &runningBehind);
- info.out.canDrawThisFrame = !runningBehind;
+ info.out.canDrawThisFrame = !isSwapChainStuffed();
+ if (!info.out.canDrawThisFrame) {
+ // dropping frame
+ mLastDropVsync = mRenderThread.timeLord().latestVsync();
+ }
}
} else {
info.out.canDrawThisFrame = true;
@@ -290,11 +332,6 @@
}
void CanvasContext::draw() {
-#if !HWUI_NEW_OPS
- LOG_ALWAYS_FATAL_IF(!mCanvas || mEglSurface == EGL_NO_SURFACE,
- "drawRenderNode called on a context with no canvas or surface!");
-#endif
-
SkRect dirty;
mDamageAccumulator.finish(&dirty);
@@ -306,217 +343,38 @@
mCurrentFrameInfo->markIssueDrawCommandsStart();
- Frame frame = mEglManager.beginFrame(mEglSurface);
+ Frame frame = mRenderPipeline->getFrame();
- if (frame.width() != mLastFrameWidth || frame.height() != mLastFrameHeight) {
- // can't rely on prior content of window if viewport size changes
- dirty.setEmpty();
- mLastFrameWidth = frame.width();
- mLastFrameHeight = frame.height();
- } else if (mHaveNewSurface || frame.bufferAge() == 0) {
- // New surface needs a full draw
- dirty.setEmpty();
- } else {
- if (!dirty.isEmpty() && !dirty.intersect(0, 0, frame.width(), frame.height())) {
- ALOGW("Dirty " RECT_STRING " doesn't intersect with 0 0 %d %d ?",
- SK_RECT_ARGS(dirty), frame.width(), frame.height());
- dirty.setEmpty();
- }
- profiler().unionDirty(&dirty);
- }
+ SkRect windowDirty = computeDirtyRect(frame, &dirty);
- if (dirty.isEmpty()) {
- dirty.set(0, 0, frame.width(), frame.height());
- }
-
- // At this point dirty is the area of the screen to update. However,
- // the area of the frame we need to repaint is potentially different, so
- // stash the screen area for later
- SkRect screenDirty(dirty);
-
- // If the buffer age is 0 we do a full-screen repaint (handled above)
- // If the buffer age is 1 the buffer contents are the same as they were
- // last frame so there's nothing to union() against
- // Therefore we only care about the > 1 case.
- if (frame.bufferAge() > 1) {
- if (frame.bufferAge() > (int) mSwapHistory.size()) {
- // We don't have enough history to handle this old of a buffer
- // Just do a full-draw
- dirty.set(0, 0, frame.width(), frame.height());
- } else {
- // At this point we haven't yet added the latest frame
- // to the damage history (happens below)
- // So we need to damage
- for (int i = mSwapHistory.size() - 1;
- i > ((int) mSwapHistory.size()) - frame.bufferAge(); i--) {
- dirty.join(mSwapHistory[i].damage);
- }
- }
- }
-
- mEglManager.damageFrame(frame, dirty);
-
-#if HWUI_NEW_OPS
- auto& caches = Caches::getInstance();
- FrameBuilder frameBuilder(dirty, frame.width(), frame.height(), mLightGeometry, caches);
-
- frameBuilder.deferLayers(mLayerUpdateQueue);
- mLayerUpdateQueue.clear();
-
- frameBuilder.deferRenderNodeScene(mRenderNodes, mContentDrawBounds);
-
- BakedOpRenderer renderer(caches, mRenderThread.renderState(),
- mOpaque, mLightInfo);
- frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer);
- profiler().draw(&renderer);
- bool drew = renderer.didDraw();
-
- // post frame cleanup
- caches.clearGarbage();
- caches.pathCache.trim();
- caches.tessellationCache.trim();
-
-#if DEBUG_MEMORY_USAGE
- mCaches.dumpMemoryUsage();
-#else
- if (CC_UNLIKELY(Properties::debugLevel & kDebugMemory)) {
- caches.dumpMemoryUsage();
- }
-#endif
-
-#else
- mCanvas->prepareDirty(frame.width(), frame.height(),
- dirty.fLeft, dirty.fTop, dirty.fRight, dirty.fBottom, mOpaque);
-
- Rect outBounds;
- // It there are multiple render nodes, they are laid out as follows:
- // #0 - backdrop (content + caption)
- // #1 - content (positioned at (0,0) and clipped to - its bounds mContentDrawBounds)
- // #2 - additional overlay nodes
- // Usually the backdrop cannot be seen since it will be entirely covered by the content. While
- // resizing however it might become partially visible. The following render loop will crop the
- // backdrop against the content and draw the remaining part of it. It will then draw the content
- // cropped to the backdrop (since that indicates a shrinking of the window).
- //
- // Additional nodes will be drawn on top with no particular clipping semantics.
-
- // The bounds of the backdrop against which the content should be clipped.
- Rect backdropBounds = mContentDrawBounds;
- // Usually the contents bounds should be mContentDrawBounds - however - we will
- // move it towards the fixed edge to give it a more stable appearance (for the moment).
- Rect contentBounds;
- // If there is no content bounds we ignore the layering as stated above and start with 2.
- int layer = (mContentDrawBounds.isEmpty() || mRenderNodes.size() == 1) ? 2 : 0;
- // Draw all render nodes. Note that
- for (const sp<RenderNode>& node : mRenderNodes) {
- if (layer == 0) { // Backdrop.
- // Draw the backdrop clipped to the inverse content bounds, but assume that the content
- // was moved to the upper left corner.
- const RenderProperties& properties = node->properties();
- Rect targetBounds(properties.getLeft(), properties.getTop(),
- properties.getRight(), properties.getBottom());
- // Move the content bounds towards the fixed corner of the backdrop.
- const int x = targetBounds.left;
- const int y = targetBounds.top;
- contentBounds.set(x, y, x + mContentDrawBounds.getWidth(),
- y + mContentDrawBounds.getHeight());
- // Remember the intersection of the target bounds and the intersection bounds against
- // which we have to crop the content.
- backdropBounds.set(x, y, x + backdropBounds.getWidth(), y + backdropBounds.getHeight());
- backdropBounds.doIntersect(targetBounds);
- // Check if we have to draw something on the left side ...
- if (targetBounds.left < contentBounds.left) {
- mCanvas->save(SaveFlags::Clip);
- if (mCanvas->clipRect(targetBounds.left, targetBounds.top,
- contentBounds.left, targetBounds.bottom,
- SkRegion::kIntersect_Op)) {
- mCanvas->drawRenderNode(node.get(), outBounds);
- }
- // Reduce the target area by the area we have just painted.
- targetBounds.left = std::min(contentBounds.left, targetBounds.right);
- mCanvas->restore();
- }
- // ... or on the right side ...
- if (targetBounds.right > contentBounds.right &&
- !targetBounds.isEmpty()) {
- mCanvas->save(SaveFlags::Clip);
- if (mCanvas->clipRect(contentBounds.right, targetBounds.top,
- targetBounds.right, targetBounds.bottom,
- SkRegion::kIntersect_Op)) {
- mCanvas->drawRenderNode(node.get(), outBounds);
- }
- // Reduce the target area by the area we have just painted.
- targetBounds.right = std::max(targetBounds.left, contentBounds.right);
- mCanvas->restore();
- }
- // ... or at the top ...
- if (targetBounds.top < contentBounds.top &&
- !targetBounds.isEmpty()) {
- mCanvas->save(SaveFlags::Clip);
- if (mCanvas->clipRect(targetBounds.left, targetBounds.top, targetBounds.right,
- contentBounds.top,
- SkRegion::kIntersect_Op)) {
- mCanvas->drawRenderNode(node.get(), outBounds);
- }
- // Reduce the target area by the area we have just painted.
- targetBounds.top = std::min(contentBounds.top, targetBounds.bottom);
- mCanvas->restore();
- }
- // ... or at the bottom.
- if (targetBounds.bottom > contentBounds.bottom &&
- !targetBounds.isEmpty()) {
- mCanvas->save(SaveFlags::Clip);
- if (mCanvas->clipRect(targetBounds.left, contentBounds.bottom, targetBounds.right,
- targetBounds.bottom, SkRegion::kIntersect_Op)) {
- mCanvas->drawRenderNode(node.get(), outBounds);
- }
- mCanvas->restore();
- }
- } else if (layer == 1) { // Content
- // It gets cropped against the bounds of the backdrop to stay inside.
- mCanvas->save(SaveFlags::MatrixClip);
-
- // We shift and clip the content to match its final location in the window.
- const float left = mContentDrawBounds.left;
- const float top = mContentDrawBounds.top;
- const float dx = backdropBounds.left - left;
- const float dy = backdropBounds.top - top;
- const float width = backdropBounds.getWidth();
- const float height = backdropBounds.getHeight();
-
- mCanvas->translate(dx, dy);
- if (mCanvas->clipRect(left, top, left + width, top + height, SkRegion::kIntersect_Op)) {
- mCanvas->drawRenderNode(node.get(), outBounds);
- }
- mCanvas->restore();
- } else { // draw the rest on top at will!
- mCanvas->drawRenderNode(node.get(), outBounds);
- }
- layer++;
- }
-
- profiler().draw(mCanvas);
-
- bool drew = mCanvas->finish();
-#endif
+ bool drew = mRenderPipeline->draw(frame, windowDirty, dirty, mLightGeometry, &mLayerUpdateQueue,
+ mContentDrawBounds, mOpaque, mLightInfo, mRenderNodes, &(profiler()));
waitOnFences();
- GL_CHECKPOINT(LOW);
+ bool requireSwap = false;
+ bool didSwap = mRenderPipeline->swapBuffers(frame, drew, windowDirty, mCurrentFrameInfo,
+ &requireSwap);
- // Even if we decided to cancel the frame, from the perspective of jank
- // metrics the frame was swapped at this point
- mCurrentFrameInfo->markSwapBuffers();
mIsDirty = false;
- if (drew || mEglManager.damageRequiresSwap()) {
- if (CC_UNLIKELY(!mEglManager.swapBuffers(frame, screenDirty))) {
+ if (requireSwap) {
+ if (!didSwap) { //some error happened
setSurface(nullptr);
}
SwapHistory& swap = mSwapHistory.next();
- swap.damage = screenDirty;
- swap.swapTime = systemTime(CLOCK_MONOTONIC);
+ swap.damage = windowDirty;
+ swap.swapCompletedTime = systemTime(CLOCK_MONOTONIC);
swap.vsyncTime = mRenderThread.timeLord().latestVsync();
+ int durationUs;
+ mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs);
+ swap.dequeueDuration = us2ns(durationUs);
+ mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs);
+ swap.queueDuration = us2ns(durationUs);
+ mCurrentFrameInfo->set(FrameInfoIndex::DequeueBufferDuration)
+ = swap.dequeueDuration;
+ mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration)
+ = swap.queueDuration;
mHaveNewSurface = false;
mFrameNumber = -1;
}
@@ -550,11 +408,7 @@
// Called by choreographer to do an RT-driven animation
void CanvasContext::doFrame() {
-#if HWUI_NEW_OPS
- if (CC_UNLIKELY(mEglSurface == EGL_NO_SURFACE)) return;
-#else
- if (CC_UNLIKELY(!mCanvas || mEglSurface == EGL_NO_SURFACE)) return;
-#endif
+ if (!mRenderPipeline->isSurfaceReady()) return;
prepareAndDraw(nullptr);
}
@@ -604,10 +458,7 @@
void CanvasContext::buildLayer(RenderNode* node, TreeObserver* observer) {
ATRACE_CALL();
- if (!mEglManager.hasEglContext()) return;
-#if !HWUI_NEW_OPS
- if (!mCanvas) return;
-#endif
+ if (!mRenderPipeline->isContextReady()) return;
// buildLayer() will leave the tree in an unknown state, so we must stop drawing
stopDrawing();
@@ -615,11 +466,7 @@
TreeInfo info(TreeInfo::MODE_FULL, *this);
info.damageAccumulator = &mDamageAccumulator;
info.observer = observer;
-#if HWUI_NEW_OPS
info.layerUpdateQueue = &mLayerUpdateQueue;
-#else
- info.renderer = mCanvas;
-#endif
info.runAnimations = false;
node->prepareTree(info);
SkRect ignore;
@@ -628,41 +475,24 @@
// purposes when the frame is actually drawn
node->setPropertyFieldsDirty(RenderNode::GENERIC);
-#if HWUI_NEW_OPS
- static const std::vector< sp<RenderNode> > emptyNodeList;
- auto& caches = Caches::getInstance();
- FrameBuilder frameBuilder(mLayerUpdateQueue, mLightGeometry, caches);
- mLayerUpdateQueue.clear();
- BakedOpRenderer renderer(caches, mRenderThread.renderState(),
- mOpaque, mLightInfo);
- LOG_ALWAYS_FATAL_IF(renderer.didDraw(), "shouldn't draw in buildlayer case");
- frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer);
-#else
- mCanvas->markLayersAsBuildLayers();
- mCanvas->flushLayerUpdates();
-#endif
+ mRenderPipeline->renderLayers(mLightGeometry, &mLayerUpdateQueue, mOpaque, mLightInfo);
node->incStrong(nullptr);
mPrefetchedLayers.insert(node);
}
bool CanvasContext::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) {
- layer->apply();
- return LayerRenderer::copyLayer(mRenderThread.renderState(), layer->backingLayer(), bitmap);
+ return mRenderPipeline->copyLayerInto(layer, bitmap);
}
void CanvasContext::destroyHardwareResources(TreeObserver* observer) {
stopDrawing();
- if (mEglManager.hasEglContext()) {
+ if (mRenderPipeline->isContextReady()) {
freePrefetchedLayers(observer);
for (const sp<RenderNode>& node : mRenderNodes) {
node->destroyHardwareResources(observer);
}
- Caches& caches = Caches::getInstance();
- // Make sure to release all the textures we were owning as there won't
- // be another draw
- caches.textureCache.resetMarkInUse(this);
- mRenderThread.renderState().flush(Caches::FlushMode::Layers);
+ mRenderPipeline->onDestroyHardwareResources();
}
}
@@ -679,15 +509,8 @@
}
}
-void CanvasContext::runWithGlContext(RenderTask* task) {
- LOG_ALWAYS_FATAL_IF(!mEglManager.hasEglContext(),
- "GL context not initialized!");
- task->run();
-}
-
-Layer* CanvasContext::createTextureLayer() {
- mEglManager.initialize();
- return LayerRenderer::createTextureLayer(mRenderThread.renderState());
+DeferredLayerUpdater* CanvasContext::createTextureLayer() {
+ return mRenderPipeline->createTextureLayer();
}
void CanvasContext::setTextureAtlas(RenderThread& thread,
@@ -767,8 +590,8 @@
class CanvasContext::FuncTaskProcessor : public TaskProcessor<bool> {
public:
- explicit FuncTaskProcessor(Caches& caches)
- : TaskProcessor<bool>(&caches.tasks) {}
+ explicit FuncTaskProcessor(TaskManager* taskManager)
+ : TaskProcessor<bool>(taskManager) {}
virtual void onProcess(const sp<Task<bool> >& task) override {
FuncTask* t = static_cast<FuncTask*>(task.get());
@@ -779,10 +602,11 @@
void CanvasContext::enqueueFrameWork(std::function<void()>&& func) {
if (!mFrameWorkProcessor.get()) {
- mFrameWorkProcessor = new FuncTaskProcessor(Caches::getInstance());
+ mFrameWorkProcessor = new FuncTaskProcessor(mRenderPipeline->getTaskManager());
}
sp<FuncTask> task(new FuncTask());
task->func = func;
+ mFrameFences.push_back(task);
mFrameWorkProcessor->add(task);
}
@@ -794,6 +618,56 @@
return mFrameNumber;
}
+SkRect CanvasContext::computeDirtyRect(const Frame& frame, SkRect* dirty) {
+ if (frame.width() != mLastFrameWidth || frame.height() != mLastFrameHeight) {
+ // can't rely on prior content of window if viewport size changes
+ dirty->setEmpty();
+ mLastFrameWidth = frame.width();
+ mLastFrameHeight = frame.height();
+ } else if (mHaveNewSurface || frame.bufferAge() == 0) {
+ // New surface needs a full draw
+ dirty->setEmpty();
+ } else {
+ if (!dirty->isEmpty() && !dirty->intersect(0, 0, frame.width(), frame.height())) {
+ ALOGW("Dirty " RECT_STRING " doesn't intersect with 0 0 %d %d ?",
+ SK_RECT_ARGS(*dirty), frame.width(), frame.height());
+ dirty->setEmpty();
+ }
+ profiler().unionDirty(dirty);
+ }
+
+ if (dirty->isEmpty()) {
+ dirty->set(0, 0, frame.width(), frame.height());
+ }
+
+ // At this point dirty is the area of the window to update. However,
+ // the area of the frame we need to repaint is potentially different, so
+ // stash the screen area for later
+ SkRect windowDirty(*dirty);
+
+ // If the buffer age is 0 we do a full-screen repaint (handled above)
+ // If the buffer age is 1 the buffer contents are the same as they were
+ // last frame so there's nothing to union() against
+ // Therefore we only care about the > 1 case.
+ if (frame.bufferAge() > 1) {
+ if (frame.bufferAge() > (int) mSwapHistory.size()) {
+ // We don't have enough history to handle this old of a buffer
+ // Just do a full-draw
+ dirty->set(0, 0, frame.width(), frame.height());
+ } else {
+ // At this point we haven't yet added the latest frame
+ // to the damage history (happens below)
+ // So we need to damage
+ for (int i = mSwapHistory.size() - 1;
+ i > ((int) mSwapHistory.size()) - frame.bufferAge(); i--) {
+ dirty->join(mSwapHistory[i].damage);
+ }
+ }
+ }
+
+ return windowDirty;
+}
+
} /* namespace renderthread */
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index 2a4e616..a3b6261 100644
--- a/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@ -14,14 +14,17 @@
* limitations under the License.
*/
-#ifndef CANVASCONTEXT_H_
-#define CANVASCONTEXT_H_
+#pragma once
+#include "BakedOpDispatcher.h"
+#include "BakedOpRenderer.h"
#include "DamageAccumulator.h"
+#include "FrameBuilder.h"
#include "FrameInfo.h"
#include "FrameInfoVisualizer.h"
#include "FrameMetricsReporter.h"
#include "IContextFactory.h"
+#include "IRenderPipeline.h"
#include "LayerUpdateQueue.h"
#include "RenderNode.h"
#include "thread/Task.h"
@@ -30,12 +33,6 @@
#include "renderthread/RenderTask.h"
#include "renderthread/RenderThread.h"
-#if HWUI_NEW_OPS
-#include "BakedOpDispatcher.h"
-#include "BakedOpRenderer.h"
-#include "FrameBuilder.h"
-#endif
-
#include <cutils/compiler.h>
#include <EGL/egl.h>
#include <SkBitmap.h>
@@ -53,27 +50,22 @@
class AnimationContext;
class DeferredLayerUpdater;
-class OpenGLRenderer;
-class Rect;
class Layer;
+class Rect;
class RenderState;
namespace renderthread {
class EglManager;
-
-enum SwapBehavior {
- kSwap_default,
- kSwap_discardBuffer,
-};
+class Frame;
// This per-renderer class manages the bridge between the global EGL context
// and the render surface.
// TODO: Rename to Renderer or some other per-window, top-level manager
class CanvasContext : public IFrameCallback {
public:
- CanvasContext(RenderThread& thread, bool translucent, RenderNode* rootRenderNode,
- IContextFactory* contextFactory);
+ static CanvasContext* create(RenderThread& thread, bool translucent,
+ RenderNode* rootRenderNode, IContextFactory* contextFactory);
virtual ~CanvasContext();
// Won't take effect until next EGLSurface creation
@@ -108,9 +100,7 @@
static void invokeFunctor(RenderThread& thread, Functor* functor);
- void runWithGlContext(RenderTask* task);
-
- Layer* createTextureLayer();
+ DeferredLayerUpdater* createTextureLayer();
ANDROID_API static void setTextureAtlas(RenderThread& thread,
const sp<GraphicBuffer>& buffer, int64_t* map, size_t mapSize);
@@ -169,6 +159,9 @@
ANDROID_API int64_t getFrameNumber();
private:
+ CanvasContext(RenderThread& thread, bool translucent, RenderNode* rootRenderNode,
+ IContextFactory* contextFactory, std::unique_ptr<IRenderPipeline> renderPipeline);
+
friend class RegisterFrameCallbackTask;
// TODO: Replace with something better for layer & other GL object
// lifecycle tracking
@@ -180,37 +173,39 @@
void waitOnFences();
+ bool isSwapChainStuffed();
+
+ SkRect computeDirtyRect(const Frame& frame, SkRect* dirty);
+
EGLint mLastFrameWidth = 0;
EGLint mLastFrameHeight = 0;
RenderThread& mRenderThread;
- EglManager& mEglManager;
sp<Surface> mNativeSurface;
- EGLSurface mEglSurface = EGL_NO_SURFACE;
// stopped indicates the CanvasContext will reject actual redraw operations,
// and defer repaint until it is un-stopped
bool mStopped = false;
// CanvasContext is dirty if it has received an update that it has not
// painted onto its surface.
bool mIsDirty = false;
- bool mBufferPreserved = false;
- SwapBehavior mSwapBehavior = kSwap_default;
+ SwapBehavior mSwapBehavior = SwapBehavior::kSwap_default;
struct SwapHistory {
SkRect damage;
nsecs_t vsyncTime;
- nsecs_t swapTime;
+ nsecs_t swapCompletedTime;
+ nsecs_t dequeueDuration;
+ nsecs_t queueDuration;
};
RingBuffer<SwapHistory, 3> mSwapHistory;
int64_t mFrameNumber = -1;
+ // last vsync for a dropped frame due to stuffed queue
+ nsecs_t mLastDropVsync = 0;
+
bool mOpaque;
-#if HWUI_NEW_OPS
BakedOpRenderer::LightInfo mLightInfo;
FrameBuilder::LightGeometry mLightGeometry = { {0, 0, 0}, 0 };
-#else
- OpenGLRenderer* mCanvas = nullptr;
-#endif
bool mHaveNewSurface = false;
DamageAccumulator mDamageAccumulator;
@@ -241,9 +236,9 @@
std::vector< sp<FuncTask> > mFrameFences;
sp<TaskProcessor<bool> > mFrameWorkProcessor;
+ std::unique_ptr<IRenderPipeline> mRenderPipeline;
};
} /* namespace renderthread */
} /* namespace uirenderer */
} /* namespace android */
-#endif /* CANVASCONTEXT_H_ */
diff --git a/libs/hwui/renderthread/IRenderPipeline.h b/libs/hwui/renderthread/IRenderPipeline.h
new file mode 100644
index 0000000..3250fed
--- /dev/null
+++ b/libs/hwui/renderthread/IRenderPipeline.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "FrameInfoVisualizer.h"
+#include "EglManager.h"
+
+#include <SkRect.h>
+#include <utils/RefBase.h>
+
+namespace android {
+
+class Surface;
+
+namespace uirenderer {
+
+class DeferredLayerUpdater;
+
+namespace renderthread {
+
+enum class SwapBehavior {
+ kSwap_default,
+ kSwap_discardBuffer,
+};
+
+enum class MakeCurrentResult {
+ AlreadyCurrent,
+ Failed,
+ Succeeded
+};
+
+class IRenderPipeline {
+public:
+ virtual MakeCurrentResult makeCurrent() = 0;
+ virtual Frame getFrame() = 0;
+ virtual bool draw(const Frame& frame, const SkRect& screenDirty, const SkRect& dirty,
+ const FrameBuilder::LightGeometry& lightGeometry,
+ LayerUpdateQueue* layerUpdateQueue,
+ const Rect& contentDrawBounds, bool opaque,
+ const BakedOpRenderer::LightInfo& lightInfo,
+ const std::vector< sp<RenderNode> >& renderNodes,
+ FrameInfoVisualizer* profiler) = 0;
+ virtual bool swapBuffers(const Frame& frame, bool drew, const SkRect& screenDirty,
+ FrameInfo* currentFrameInfo, bool* requireSwap) = 0;
+ virtual bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) = 0;
+ virtual DeferredLayerUpdater* createTextureLayer() = 0;
+ virtual bool setSurface(Surface* window, SwapBehavior swapBehavior) = 0;
+ virtual void onStop() = 0;
+ virtual bool isSurfaceReady() = 0;
+ virtual bool isContextReady() = 0;
+ virtual void onDestroyHardwareResources() = 0;
+ virtual void renderLayers(const FrameBuilder::LightGeometry& lightGeometry,
+ LayerUpdateQueue* layerUpdateQueue, bool opaque,
+ const BakedOpRenderer::LightInfo& lightInfo) = 0;
+ virtual TaskManager* getTaskManager() = 0;
+
+ virtual ~IRenderPipeline() {}
+};
+
+} /* namespace renderthread */
+} /* namespace uirenderer */
+} /* namespace android */
diff --git a/libs/hwui/renderthread/OpenGLPipeline.cpp b/libs/hwui/renderthread/OpenGLPipeline.cpp
new file mode 100644
index 0000000..36be387
--- /dev/null
+++ b/libs/hwui/renderthread/OpenGLPipeline.cpp
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "OpenGLPipeline.h"
+
+#include "DeferredLayerUpdater.h"
+#include "EglManager.h"
+#include "renderstate/RenderState.h"
+#include "Readback.h"
+
+#include <android/native_window.h>
+#include <cutils/properties.h>
+#include <strings.h>
+
+namespace android {
+namespace uirenderer {
+namespace renderthread {
+
+OpenGLPipeline::OpenGLPipeline(RenderThread& thread)
+ : mEglManager(thread.eglManager()), mRenderThread(thread) {
+}
+
+MakeCurrentResult OpenGLPipeline::makeCurrent() {
+ // TODO: Figure out why this workaround is needed, see b/13913604
+ // In the meantime this matches the behavior of GLRenderer, so it is not a regression
+ EGLint error = 0;
+ bool haveNewSurface = mEglManager.makeCurrent(mEglSurface, &error);
+
+ Caches::getInstance().textureCache.resetMarkInUse(this);
+ if (!haveNewSurface) {
+ return MakeCurrentResult::AlreadyCurrent;
+ }
+ return error ? MakeCurrentResult::Failed : MakeCurrentResult::Succeeded;
+}
+
+Frame OpenGLPipeline::getFrame() {
+ LOG_ALWAYS_FATAL_IF(mEglSurface == EGL_NO_SURFACE,
+ "drawRenderNode called on a context with no surface!");
+ return mEglManager.beginFrame(mEglSurface);
+}
+
+bool OpenGLPipeline::draw(const Frame& frame, const SkRect& screenDirty, const SkRect& dirty,
+ const FrameBuilder::LightGeometry& lightGeometry,
+ LayerUpdateQueue* layerUpdateQueue,
+ const Rect& contentDrawBounds, bool opaque,
+ const BakedOpRenderer::LightInfo& lightInfo,
+ const std::vector< sp<RenderNode> >& renderNodes,
+ FrameInfoVisualizer* profiler) {
+
+ mEglManager.damageFrame(frame, dirty);
+
+ bool drew = false;
+
+
+ auto& caches = Caches::getInstance();
+ FrameBuilder frameBuilder(dirty, frame.width(), frame.height(), lightGeometry, caches);
+
+ frameBuilder.deferLayers(*layerUpdateQueue);
+ layerUpdateQueue->clear();
+
+ frameBuilder.deferRenderNodeScene(renderNodes, contentDrawBounds);
+
+ BakedOpRenderer renderer(caches, mRenderThread.renderState(),
+ opaque, lightInfo);
+ frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer);
+ profiler->draw(&renderer);
+ drew = renderer.didDraw();
+
+ // post frame cleanup
+ caches.clearGarbage();
+ caches.pathCache.trim();
+ caches.tessellationCache.trim();
+
+#if DEBUG_MEMORY_USAGE
+ mCaches.dumpMemoryUsage();
+#else
+ if (CC_UNLIKELY(Properties::debugLevel & kDebugMemory)) {
+ caches.dumpMemoryUsage();
+ }
+#endif
+
+ return drew;
+}
+
+bool OpenGLPipeline::swapBuffers(const Frame& frame, bool drew, const SkRect& screenDirty,
+ FrameInfo* currentFrameInfo, bool* requireSwap) {
+
+ GL_CHECKPOINT(LOW);
+
+ // Even if we decided to cancel the frame, from the perspective of jank
+ // metrics the frame was swapped at this point
+ currentFrameInfo->markSwapBuffers();
+
+ *requireSwap = drew || mEglManager.damageRequiresSwap();
+
+ if (*requireSwap && (CC_UNLIKELY(!mEglManager.swapBuffers(frame, screenDirty)))) {
+ return false;
+ }
+
+ return *requireSwap;
+}
+
+bool OpenGLPipeline::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) {
+ layer->apply();
+ return Readback::copyTextureLayerInto(mRenderThread, *(layer->backingLayer()), bitmap)
+ == CopyResult::Success;
+}
+
+DeferredLayerUpdater* OpenGLPipeline::createTextureLayer() {
+ mEglManager.initialize();
+ Layer* layer = new Layer(mRenderThread.renderState(), 0, 0);
+ Caches::getInstance().textureState().activateTexture(0);
+ layer->generateTexture();
+
+ return new DeferredLayerUpdater(layer);
+}
+
+void OpenGLPipeline::onStop() {
+ if (mEglManager.isCurrent(mEglSurface)) {
+ mEglManager.makeCurrent(EGL_NO_SURFACE);
+ }
+}
+
+bool OpenGLPipeline::setSurface(Surface* surface, SwapBehavior swapBehavior) {
+
+ if (mEglSurface != EGL_NO_SURFACE) {
+ mEglManager.destroySurface(mEglSurface);
+ mEglSurface = EGL_NO_SURFACE;
+ }
+
+ if (surface) {
+ mEglSurface = mEglManager.createSurface(surface);
+ }
+
+ if (mEglSurface != EGL_NO_SURFACE) {
+ const bool preserveBuffer = (swapBehavior != SwapBehavior::kSwap_discardBuffer);
+ mBufferPreserved = mEglManager.setPreserveBuffer(mEglSurface, preserveBuffer);
+ return true;
+ }
+
+ return false;
+}
+
+bool OpenGLPipeline::isSurfaceReady() {
+ return CC_UNLIKELY(mEglSurface != EGL_NO_SURFACE);
+}
+
+bool OpenGLPipeline::isContextReady() {
+ return CC_LIKELY(mEglManager.hasEglContext());
+}
+
+void OpenGLPipeline::onDestroyHardwareResources() {
+ Caches& caches = Caches::getInstance();
+ // Make sure to release all the textures we were owning as there won't
+ // be another draw
+ caches.textureCache.resetMarkInUse(this);
+ mRenderThread.renderState().flush(Caches::FlushMode::Layers);
+}
+
+void OpenGLPipeline::renderLayers(const FrameBuilder::LightGeometry& lightGeometry,
+ LayerUpdateQueue* layerUpdateQueue, bool opaque,
+ const BakedOpRenderer::LightInfo& lightInfo) {
+ static const std::vector< sp<RenderNode> > emptyNodeList;
+ auto& caches = Caches::getInstance();
+ FrameBuilder frameBuilder(*layerUpdateQueue, lightGeometry, caches);
+ layerUpdateQueue->clear();
+ BakedOpRenderer renderer(caches, mRenderThread.renderState(),
+ opaque, lightInfo);
+ LOG_ALWAYS_FATAL_IF(renderer.didDraw(), "shouldn't draw in buildlayer case");
+ frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer);
+}
+
+TaskManager* OpenGLPipeline::getTaskManager() {
+ return &Caches::getInstance().tasks;
+}
+
+} /* namespace renderthread */
+} /* namespace uirenderer */
+} /* namespace android */
diff --git a/libs/hwui/renderthread/OpenGLPipeline.h b/libs/hwui/renderthread/OpenGLPipeline.h
new file mode 100644
index 0000000..e08fd9b
--- /dev/null
+++ b/libs/hwui/renderthread/OpenGLPipeline.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "CanvasContext.h"
+#include "BakedOpDispatcher.h"
+#include "BakedOpRenderer.h"
+#include "FrameBuilder.h"
+#include "IRenderPipeline.h"
+
+namespace android {
+namespace uirenderer {
+namespace renderthread {
+
+class Frame;
+
+
+class OpenGLPipeline : public IRenderPipeline {
+public:
+ OpenGLPipeline(RenderThread& thread);
+ virtual ~OpenGLPipeline() {}
+
+ MakeCurrentResult makeCurrent() override;
+ Frame getFrame() override;
+ bool draw(const Frame& frame, const SkRect& screenDirty, const SkRect& dirty,
+ const FrameBuilder::LightGeometry& lightGeometry,
+ LayerUpdateQueue* layerUpdateQueue,
+ const Rect& contentDrawBounds, bool opaque,
+ const BakedOpRenderer::LightInfo& lightInfo,
+ const std::vector< sp<RenderNode> >& renderNodes,
+ FrameInfoVisualizer* profiler) override;
+ bool swapBuffers(const Frame& frame, bool drew, const SkRect& screenDirty,
+ FrameInfo* currentFrameInfo, bool* requireSwap) override;
+ bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) override;
+ DeferredLayerUpdater* createTextureLayer() override;
+ bool setSurface(Surface* window, SwapBehavior swapBehavior) override;
+ void onStop() override;
+ bool isSurfaceReady() override;
+ bool isContextReady() override;
+ void onDestroyHardwareResources() override;
+ void renderLayers(const FrameBuilder::LightGeometry& lightGeometry,
+ LayerUpdateQueue* layerUpdateQueue, bool opaque,
+ const BakedOpRenderer::LightInfo& lightInfo) override;
+ TaskManager* getTaskManager() override;
+
+private:
+ EglManager& mEglManager;
+ EGLSurface mEglSurface = EGL_NO_SURFACE;
+ bool mBufferPreserved = false;
+ RenderThread& mRenderThread;
+};
+
+} /* namespace renderthread */
+} /* namespace uirenderer */
+} /* namespace android */
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index 4055ff3..ad1af40 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -18,7 +18,6 @@
#include "DeferredLayerUpdater.h"
#include "DisplayList.h"
-#include "LayerRenderer.h"
#include "Readback.h"
#include "Rect.h"
#include "renderthread/CanvasContext.h"
@@ -55,7 +54,7 @@
CREATE_BRIDGE4(createContext, RenderThread* thread, bool translucent,
RenderNode* rootRenderNode, IContextFactory* contextFactory) {
- return new CanvasContext(*args->thread, args->translucent,
+ return CanvasContext::create(*args->thread, args->translucent,
args->rootRenderNode, args->contextFactory);
}
@@ -265,22 +264,8 @@
}
}
-CREATE_BRIDGE2(runWithGlContext, CanvasContext* context, RenderTask* task) {
- args->context->runWithGlContext(args->task);
- return nullptr;
-}
-
-void RenderProxy::runWithGlContext(RenderTask* gltask) {
- SETUP_TASK(runWithGlContext);
- args->context = mContext;
- args->task = gltask;
- postAndWait(task);
-}
-
CREATE_BRIDGE1(createTextureLayer, CanvasContext* context) {
- Layer* layer = args->context->createTextureLayer();
- if (!layer) return nullptr;
- return new DeferredLayerUpdater(layer);
+ return args->context->createTextureLayer();
}
DeferredLayerUpdater* RenderProxy::createTextureLayer() {
@@ -454,6 +439,19 @@
postAndWait(task);
}
+CREATE_BRIDGE2(frameTimePercentile, RenderThread* thread, int percentile) {
+ return reinterpret_cast<void*>(static_cast<uintptr_t>(
+ args->thread->jankTracker().findPercentile(args->percentile)));
+}
+
+uint32_t RenderProxy::frameTimePercentile(int p) {
+ SETUP_TASK(frameTimePercentile);
+ args->thread = &mRenderThread;
+ args->percentile = p;
+ return static_cast<uint32_t>(reinterpret_cast<uintptr_t>(
+ postAndWait(task)));
+}
+
CREATE_BRIDGE2(dumpGraphicsMemory, int fd, RenderThread* thread) {
args->thread->jankTracker().dump(args->fd);
@@ -465,11 +463,7 @@
} else {
fprintf(file, "\nNo caches instance.\n");
}
-#if HWUI_NEW_OPS
fprintf(file, "\nPipeline=FrameBuilder\n");
-#else
- fprintf(file, "\nPipeline=OpenGLRenderer\n");
-#endif
fflush(file);
return nullptr;
}
@@ -512,6 +506,10 @@
post(task);
}
+int RenderProxy::getRenderThreadTid() {
+ return mRenderThread.getTid();
+}
+
CREATE_BRIDGE3(addRenderNode, CanvasContext* context, RenderNode* node, bool placeFront) {
args->context->addRenderNode(args->node, args->placeFront);
return nullptr;
diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h
index d101c1e..0bee858 100644
--- a/libs/hwui/renderthread/RenderProxy.h
+++ b/libs/hwui/renderthread/RenderProxy.h
@@ -90,8 +90,6 @@
ANDROID_API static void invokeFunctor(Functor* functor, bool waitForCompletion);
- ANDROID_API void runWithGlContext(RenderTask* task);
-
ANDROID_API DeferredLayerUpdater* createTextureLayer();
ANDROID_API void buildLayer(RenderNode* node, TreeObserver* observer);
ANDROID_API bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap& bitmap);
@@ -111,10 +109,12 @@
ANDROID_API void dumpProfileInfo(int fd, int dumpFlags);
// Not exported, only used for testing
void resetProfileInfo();
+ uint32_t frameTimePercentile(int p);
ANDROID_API static void dumpGraphicsMemory(int fd);
ANDROID_API void setTextureAtlas(const sp<GraphicBuffer>& buffer, int64_t* map, size_t size);
ANDROID_API void setProcessStatsBuffer(int fd);
+ ANDROID_API int getRenderThreadTid();
ANDROID_API void serializeDisplayListTree();
diff --git a/libs/hwui/renderthread/RenderTask.h b/libs/hwui/renderthread/RenderTask.h
index 89c3a7d..9ea671b 100644
--- a/libs/hwui/renderthread/RenderTask.h
+++ b/libs/hwui/renderthread/RenderTask.h
@@ -73,7 +73,7 @@
class MethodInvokeRenderTask : public RenderTask {
public:
- MethodInvokeRenderTask(RunnableMethod method)
+ explicit MethodInvokeRenderTask(RunnableMethod method)
: mMethod(method), mReturnPtr(nullptr) {}
void* payload() { return mData; }
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 3c1c0bc..9688340 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -190,7 +190,7 @@
initializeDisplayEventReceiver();
mEglManager = new EglManager(*this);
mRenderState = new RenderState(*this);
- mJankTracker = new JankTracker(frameIntervalNanos);
+ mJankTracker = new JankTracker(mDisplayInfo);
}
int RenderThread::displayEventReceiverCallback(int fd, int events, void* data) {
diff --git a/libs/hwui/tests/common/LeakChecker.cpp b/libs/hwui/tests/common/LeakChecker.cpp
index 3ef4b45..d935382 100644
--- a/libs/hwui/tests/common/LeakChecker.cpp
+++ b/libs/hwui/tests/common/LeakChecker.cpp
@@ -70,7 +70,6 @@
// TODO: Until we can shutdown the RT thread we need to do this in
// two passes as GetUnreachableMemory has limited insight into
// thread-local caches so some leaks will not be properly tagged as leaks
- nsecs_t before = systemTime();
UnreachableMemoryInfo rtMemInfo;
TestUtils::runOnRenderThread([&rtMemInfo](renderthread::RenderThread& thread) {
if (Caches::hasInstance()) {
@@ -88,8 +87,6 @@
return;
}
logUnreachable({rtMemInfo, uiMemInfo});
- nsecs_t after = systemTime();
- cout << "Leak check took " << ns2ms(after - before) << "ms" << endl;
}
} /* namespace test */
diff --git a/libs/hwui/tests/common/TestContext.cpp b/libs/hwui/tests/common/TestContext.cpp
index 146e735..5e937f3 100644
--- a/libs/hwui/tests/common/TestContext.cpp
+++ b/libs/hwui/tests/common/TestContext.cpp
@@ -33,7 +33,6 @@
false, // secure?
0, // appVsyncOffset
0, // presentationDeadline
- 0, // colorTransform
};
DisplayInfo getBuiltInDisplay() {
@@ -62,20 +61,53 @@
TestContext::~TestContext() {}
sp<Surface> TestContext::surface() {
- if (!mSurfaceControl.get()) {
- mSurfaceControl = mSurfaceComposerClient->createSurface(String8("HwuiTest"),
- gDisplay.w, gDisplay.h, PIXEL_FORMAT_RGBX_8888);
-
- SurfaceComposerClient::openGlobalTransaction();
- mSurfaceControl->setLayer(0x7FFFFFF);
- mSurfaceControl->show();
- SurfaceComposerClient::closeGlobalTransaction();
+ if (!mSurface.get()) {
+ createSurface();
}
+ return mSurface;
+}
- return mSurfaceControl->getSurface();
+void TestContext::createSurface() {
+ if (mRenderOffscreen) {
+ createOffscreenSurface();
+ } else {
+ createWindowSurface();
+ }
+}
+
+void TestContext::createWindowSurface() {
+ mSurfaceControl = mSurfaceComposerClient->createSurface(String8("HwuiTest"),
+ gDisplay.w, gDisplay.h, PIXEL_FORMAT_RGBX_8888);
+
+ SurfaceComposerClient::openGlobalTransaction();
+ mSurfaceControl->setLayer(0x7FFFFFF);
+ mSurfaceControl->show();
+ SurfaceComposerClient::closeGlobalTransaction();
+ mSurface = mSurfaceControl->getSurface();
+}
+
+void TestContext::createOffscreenSurface() {
+ sp<IGraphicBufferProducer> producer;
+ sp<IGraphicBufferConsumer> consumer;
+ BufferQueue::createBufferQueue(&producer, &consumer);
+ producer->setMaxDequeuedBufferCount(3);
+ producer->setAsyncMode(true);
+ mConsumer = new BufferItemConsumer(consumer, GRALLOC_USAGE_HW_COMPOSER, 4);
+ mConsumer->setDefaultBufferSize(gDisplay.w, gDisplay.h);
+ mSurface = new Surface(producer);
}
void TestContext::waitForVsync() {
+ if (mConsumer.get()) {
+ BufferItem buffer;
+ if (mConsumer->acquireBuffer(&buffer, 0, false) == OK) {
+ // We assume the producer is internally ordered enough such that
+ // it is unneccessary to set a release fence
+ mConsumer->releaseBuffer(buffer);
+ }
+ // We running free, go go go!
+ return;
+ }
#if !HWUI_NULL_GPU
// Request vsync
mDisplayEventReceiver.requestNextVsync();
diff --git a/libs/hwui/tests/common/TestContext.h b/libs/hwui/tests/common/TestContext.h
index 2bbe5df..312988b 100644
--- a/libs/hwui/tests/common/TestContext.h
+++ b/libs/hwui/tests/common/TestContext.h
@@ -19,12 +19,16 @@
#include <gui/DisplayEventReceiver.h>
#include <gui/ISurfaceComposer.h>
+#include <gui/BufferItemConsumer.h>
#include <gui/SurfaceComposerClient.h>
#include <gui/SurfaceControl.h>
#include <gui/Surface.h>
#include <ui/DisplayInfo.h>
#include <utils/Looper.h>
+#include <thread>
+#include <atomic>
+
namespace android {
namespace uirenderer {
namespace test {
@@ -39,15 +43,29 @@
TestContext();
~TestContext();
+ // Must be called before surface();
+ void setRenderOffscreen(bool renderOffscreen) {
+ LOG_ALWAYS_FATAL_IF(mSurface.get(),
+ "Must be called before surface is created");
+ mRenderOffscreen = renderOffscreen;
+ }
+
sp<Surface> surface();
void waitForVsync();
private:
+ void createSurface();
+ void createWindowSurface();
+ void createOffscreenSurface();
+
sp<SurfaceComposerClient> mSurfaceComposerClient;
sp<SurfaceControl> mSurfaceControl;
+ sp<BufferItemConsumer> mConsumer;
DisplayEventReceiver mDisplayEventReceiver;
sp<Looper> mLooper;
+ sp<Surface> mSurface;
+ bool mRenderOffscreen;
};
} // namespace test
diff --git a/libs/hwui/tests/common/TestListViewSceneBase.cpp b/libs/hwui/tests/common/TestListViewSceneBase.cpp
index 847a6ff..b8484b9 100644
--- a/libs/hwui/tests/common/TestListViewSceneBase.cpp
+++ b/libs/hwui/tests/common/TestListViewSceneBase.cpp
@@ -25,7 +25,7 @@
namespace uirenderer {
namespace test {
-void TestListViewSceneBase::createContent(int width, int height, TestCanvas& canvas) {
+void TestListViewSceneBase::createContent(int width, int height, Canvas& canvas) {
srand(0);
mItemHeight = dp(60);
mItemSpacing = dp(16);
@@ -41,7 +41,7 @@
mListItems.push_back(node);
}
mListView = TestUtils::createNode(0, 0, width, height,
- [this](RenderProperties& props, TestCanvas& canvas) {
+ [this](RenderProperties& props, Canvas& canvas) {
for (size_t ci = 0; ci < mListItems.size(); ci++) {
canvas.drawRenderNode(mListItems[ci].get());
}
@@ -56,9 +56,8 @@
int itemIndexOffset = scrollPx / (mItemSpacing + mItemHeight);
int pxOffset = -(scrollPx % (mItemSpacing + mItemHeight));
- TestCanvas canvas(
- mListView->stagingProperties().getWidth(),
- mListView->stagingProperties().getHeight());
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(mListView->stagingProperties().getWidth(),
+ mListView->stagingProperties().getHeight()));
for (size_t ci = 0; ci < mListItems.size(); ci++) {
// update item position
auto listItem = mListItems[(ci + itemIndexOffset) % mListItems.size()];
@@ -68,9 +67,9 @@
listItem->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
// draw it to parent DisplayList
- canvas.drawRenderNode(mListItems[ci].get());
+ canvas->drawRenderNode(mListItems[ci].get());
}
- mListView->setStagingDisplayList(canvas.finishRecording(), nullptr);
+ mListView->setStagingDisplayList(canvas->finishRecording(), nullptr);
}
} // namespace test
diff --git a/libs/hwui/tests/common/TestListViewSceneBase.h b/libs/hwui/tests/common/TestListViewSceneBase.h
index 8ffe992..ed6867a 100644
--- a/libs/hwui/tests/common/TestListViewSceneBase.h
+++ b/libs/hwui/tests/common/TestListViewSceneBase.h
@@ -25,7 +25,7 @@
class TestListViewSceneBase : public TestScene {
public:
- virtual void createListItem(RenderProperties& props, TestCanvas& canvas, int id,
+ virtual void createListItem(RenderProperties& props, Canvas& canvas, int id,
int itemWidth, int itemHeight) = 0;
private:
int mItemHeight;
@@ -35,7 +35,7 @@
sp<RenderNode> mListView;
std::vector< sp<RenderNode> > mListItems;
- void createContent(int width, int height, TestCanvas& canvas) override;
+ void createContent(int width, int height, Canvas& canvas) override;
void doFrame(int frameNr) override;
};
diff --git a/libs/hwui/tests/common/TestScene.h b/libs/hwui/tests/common/TestScene.h
index 706f2ff..e3777ca 100644
--- a/libs/hwui/tests/common/TestScene.h
+++ b/libs/hwui/tests/common/TestScene.h
@@ -13,23 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef TESTS_TESTSCENE_H
-#define TESTS_TESTSCENE_H
+
+#pragma once
#include <string>
#include <unordered_map>
namespace android {
+
+class Canvas;
+
namespace uirenderer {
class RenderNode;
-
-#if HWUI_NEW_OPS
class RecordingCanvas;
-typedef RecordingCanvas TestCanvas;
-#else
-class DisplayListCanvas;
-typedef DisplayListCanvas TestCanvas;
-#endif
namespace test {
@@ -38,6 +34,7 @@
struct Options {
int count = 0;
int reportFrametimeWeight = 0;
+ bool renderOffscreen = true;
};
template <class T>
@@ -65,7 +62,7 @@
};
virtual ~TestScene() {}
- virtual void createContent(int width, int height, TestCanvas& renderer) = 0;
+ virtual void createContent(int width, int height, Canvas& renderer) = 0;
virtual void doFrame(int frameNr) = 0;
static std::unordered_map<std::string, Info>& testMap();
@@ -75,5 +72,3 @@
} // namespace test
} // namespace uirenderer
} // namespace android
-
-#endif /* TESTS_TESTSCENE_H */
diff --git a/libs/hwui/tests/common/TestUtils.cpp b/libs/hwui/tests/common/TestUtils.cpp
index 930067a..5b9b003 100644
--- a/libs/hwui/tests/common/TestUtils.cpp
+++ b/libs/hwui/tests/common/TestUtils.cpp
@@ -18,9 +18,9 @@
#include "hwui/Paint.h"
#include "DeferredLayerUpdater.h"
-#include "LayerRenderer.h"
#include <renderthread/EglManager.h>
+#include <renderthread/OpenGLPipeline.h>
#include <utils/Unicode.h>
namespace android {
@@ -46,20 +46,14 @@
sp<DeferredLayerUpdater> TestUtils::createTextureLayerUpdater(
renderthread::RenderThread& renderThread, uint32_t width, uint32_t height,
const SkMatrix& transform) {
- Layer* layer = LayerRenderer::createTextureLayer(renderThread.renderState());
- layer->getTransform().load(transform);
-
- sp<DeferredLayerUpdater> layerUpdater = new DeferredLayerUpdater(layer);
+ renderthread::OpenGLPipeline pipeline(renderThread);
+ sp<DeferredLayerUpdater> layerUpdater = pipeline.createTextureLayer();
+ layerUpdater->backingLayer()->getTransform().load(transform);
layerUpdater->setSize(width, height);
layerUpdater->setTransform(&transform);
// updateLayer so it's ready to draw
- bool isOpaque = true;
- bool forceFilter = true;
- GLenum renderTarget = GL_TEXTURE_EXTERNAL_OES;
- LayerRenderer::updateTextureLayer(layer, width, height, isOpaque, forceFilter,
- renderTarget, Matrix4::identity().data);
-
+ layerUpdater->updateLayer(true, GL_TEXTURE_EXTERNAL_OES, Matrix4::identity().data);
return layerUpdater;
}
@@ -114,17 +108,12 @@
void TestUtils::TestTask::run() {
// RenderState only valid once RenderThread is running, so queried here
renderthread::RenderThread& renderThread = renderthread::RenderThread::getInstance();
- bool hasEglContext = renderThread.eglManager().hasEglContext();
- RenderState& renderState = renderThread.renderState();
- if (!hasEglContext) {
- renderState.onGLContextCreated();
- }
+ renderThread.eglManager().initialize();
rtCallback(renderThread);
- if (!hasEglContext) {
- renderState.flush(Caches::FlushMode::Full);
- renderState.onGLContextDestroyed();
- }
+
+ renderThread.renderState().flush(Caches::FlushMode::Full);
+ renderThread.eglManager().destroy();
}
std::unique_ptr<uint16_t[]> TestUtils::asciiToUtf16(const char* str) {
diff --git a/libs/hwui/tests/common/TestUtils.h b/libs/hwui/tests/common/TestUtils.h
index 4536bef..ad94c96 100644
--- a/libs/hwui/tests/common/TestUtils.h
+++ b/libs/hwui/tests/common/TestUtils.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef TEST_UTILS_H
-#define TEST_UTILS_H
+
+#pragma once
#include <DeviceInfo.h>
#include <DisplayList.h>
@@ -25,25 +25,14 @@
#include <renderthread/RenderThread.h>
#include <Snapshot.h>
-#if HWUI_NEW_OPS
#include <RecordedOp.h>
#include <RecordingCanvas.h>
-#else
-#include <DisplayListOp.h>
-#include <DisplayListCanvas.h>
-#endif
#include <memory>
namespace android {
namespace uirenderer {
-#if HWUI_NEW_OPS
-typedef RecordingCanvas TestCanvas;
-#else
-typedef DisplayListCanvas TestCanvas;
-#endif
-
#define EXPECT_MATRIX_APPROX_EQ(a, b) \
EXPECT_TRUE(TestUtils::matricesAreApproxEqual(a, b))
@@ -155,7 +144,7 @@
}
static sp<RenderNode> createNode(int left, int top, int right, int bottom,
- std::function<void(RenderProperties& props, TestCanvas& canvas)> setup) {
+ std::function<void(RenderProperties& props, Canvas& canvas)> setup) {
#if HWUI_NULL_GPU
// if RenderNodes are being sync'd/used, device info will be needed, since
// DeviceInfo::maxTextureSize() affects layer property
@@ -166,7 +155,29 @@
RenderProperties& props = node->mutateStagingProperties();
props.setLeftTopRightBottom(left, top, right, bottom);
if (setup) {
- TestCanvas canvas(props.getWidth(), props.getHeight());
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(props.getWidth(),
+ props.getHeight()));
+ setup(props, *canvas.get());
+ node->setStagingDisplayList(canvas->finishRecording(), nullptr);
+ }
+ node->setPropertyFieldsDirty(0xFFFFFFFF);
+ return node;
+ }
+
+ template<class RecordingCanvasType>
+ static sp<RenderNode> createNode(int left, int top, int right, int bottom,
+ std::function<void(RenderProperties& props, RecordingCanvasType& canvas)> setup) {
+#if HWUI_NULL_GPU
+ // if RenderNodes are being sync'd/used, device info will be needed, since
+ // DeviceInfo::maxTextureSize() affects layer property
+ DeviceInfo::initialize();
+#endif
+
+ sp<RenderNode> node = new RenderNode();
+ RenderProperties& props = node->mutateStagingProperties();
+ props.setLeftTopRightBottom(left, top, right, bottom);
+ if (setup) {
+ RecordingCanvasType canvas(props.getWidth(), props.getHeight());
setup(props, canvas);
node->setStagingDisplayList(canvas.finishRecording(), nullptr);
}
@@ -175,11 +186,11 @@
}
static void recordNode(RenderNode& node,
- std::function<void(TestCanvas&)> contentCallback) {
- TestCanvas canvas(node.stagingProperties().getWidth(),
- node.stagingProperties().getHeight());
- contentCallback(canvas);
- node.setStagingDisplayList(canvas.finishRecording(), nullptr);
+ std::function<void(Canvas&)> contentCallback) {
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(
+ node.stagingProperties().getWidth(), node.stagingProperties().getHeight()));
+ contentCallback(*canvas.get());
+ node.setStagingDisplayList(canvas->finishRecording(), nullptr);
}
/**
@@ -251,5 +262,3 @@
} /* namespace uirenderer */
} /* namespace android */
-
-#endif /* TEST_UTILS_H */
diff --git a/libs/hwui/tests/common/scenes/ClippingAnimation.cpp b/libs/hwui/tests/common/scenes/ClippingAnimation.cpp
index a5fd712..47f40a1 100644
--- a/libs/hwui/tests/common/scenes/ClippingAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/ClippingAnimation.cpp
@@ -28,10 +28,10 @@
class ClippingAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(Color::White, SkXfermode::kSrcOver_Mode);
card = TestUtils::createNode(0, 0, 200, 400,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
canvas.save(SaveFlags::MatrixClip);
{
canvas.clipRect(0, 0, 200, 200, SkRegion::kIntersect_Op);
diff --git a/libs/hwui/tests/common/scenes/GlyphStressAnimation.cpp b/libs/hwui/tests/common/scenes/GlyphStressAnimation.cpp
index a61f6d0..9d6aa53 100644
--- a/libs/hwui/tests/common/scenes/GlyphStressAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/GlyphStressAnimation.cpp
@@ -33,7 +33,7 @@
class GlyphStressAnimation : public TestScene {
public:
sp<RenderNode> container;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
container = TestUtils::createNode(0, 0, width, height, nullptr);
doFrame(0); // update container
@@ -46,19 +46,20 @@
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
ssize_t textLength = 26 * 2;
- TestCanvas canvas(
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(
container->stagingProperties().getWidth(),
- container->stagingProperties().getHeight());
+ container->stagingProperties().getHeight()));
+
Paint paint;
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
paint.setAntiAlias(true);
paint.setColor(Color::Black);
for (int i = 0; i < 5; i++) {
paint.setTextSize(10 + (frameNr % 20) + i * 20);
- canvas.drawText(text.get(), 0, textLength, textLength,
+ canvas->drawText(text.get(), 0, textLength, textLength,
0, 100 * (i + 2), minikin::kBidi_Force_LTR, paint, nullptr);
}
- container->setStagingDisplayList(canvas.finishRecording(), nullptr);
+ container->setStagingDisplayList(canvas->finishRecording(), nullptr);
}
};
diff --git a/libs/hwui/tests/common/scenes/HwLayerAnimation.cpp b/libs/hwui/tests/common/scenes/HwLayerAnimation.cpp
index c212df4..00dba78 100644
--- a/libs/hwui/tests/common/scenes/HwLayerAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/HwLayerAnimation.cpp
@@ -28,9 +28,9 @@
class HwLayerAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
card = TestUtils::createNode(0, 0, 200, 200,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
canvas.drawColor(0xFF0000FF, SkXfermode::kSrcOver_Mode);
});
diff --git a/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp b/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp
index ba6074f..a5e91e4 100644
--- a/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp
@@ -29,7 +29,7 @@
});
class ListOfFadedTextAnimation : public TestListViewSceneBase {
- void createListItem(RenderProperties& props, TestCanvas& canvas, int id,
+ void createListItem(RenderProperties& props, Canvas& canvas, int id,
int itemWidth, int itemHeight) override {
canvas.drawColor(Color::White, SkXfermode::kSrcOver_Mode);
int length = dp(100);
diff --git a/libs/hwui/tests/common/scenes/ListViewAnimation.cpp b/libs/hwui/tests/common/scenes/ListViewAnimation.cpp
index a614044..24c3b23 100644
--- a/libs/hwui/tests/common/scenes/ListViewAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/ListViewAnimation.cpp
@@ -70,7 +70,7 @@
return bitmap;
}
- void createListItem(RenderProperties& props, TestCanvas& canvas, int cardId,
+ void createListItem(RenderProperties& props, Canvas& canvas, int cardId,
int itemWidth, int itemHeight) override {
static SkBitmap filledBox = createBoxBitmap(true);
static SkBitmap strokedBox = createBoxBitmap(false);
diff --git a/libs/hwui/tests/common/scenes/OpPropAnimation.cpp b/libs/hwui/tests/common/scenes/OpPropAnimation.cpp
index 5dfb2b4..c8e124c 100644
--- a/libs/hwui/tests/common/scenes/OpPropAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/OpPropAnimation.cpp
@@ -41,9 +41,9 @@
sp<CanvasPropertyPrimitive> mCircleRadius = new CanvasPropertyPrimitive(0);
sp<RenderNode> content;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
content = TestUtils::createNode(0, 0, width, height,
- [this, width, height](RenderProperties& props, TestCanvas& canvas) {
+ [this, width, height](RenderProperties& props, Canvas& canvas) {
mPaint->value.setAntiAlias(true);
mPaint->value.setColor(Color::Blue_500);
diff --git a/libs/hwui/tests/common/scenes/OvalAnimation.cpp b/libs/hwui/tests/common/scenes/OvalAnimation.cpp
index e56f2f9..f37c00c 100644
--- a/libs/hwui/tests/common/scenes/OvalAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/OvalAnimation.cpp
@@ -28,10 +28,10 @@
class OvalAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(Color::White, SkXfermode::kSrcOver_Mode);
card = TestUtils::createNode(0, 0, 200, 200,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
SkPaint paint;
paint.setAntiAlias(true);
paint.setColor(Color::Black);
diff --git a/libs/hwui/tests/common/scenes/PartialDamageAnimation.cpp b/libs/hwui/tests/common/scenes/PartialDamageAnimation.cpp
index 84265a4..bc2dc75 100644
--- a/libs/hwui/tests/common/scenes/PartialDamageAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/PartialDamageAnimation.cpp
@@ -29,7 +29,7 @@
class PartialDamageAnimation : public TestScene {
public:
std::vector< sp<RenderNode> > cards;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
static SkColor COLORS[] = {
0xFFF44336,
0xFF9C27B0,
@@ -44,7 +44,7 @@
SkColor color = COLORS[static_cast<int>((y / dp(116))) % 4];
sp<RenderNode> card = TestUtils::createNode(x, y,
x + dp(100), y + dp(100),
- [color](RenderProperties& props, TestCanvas& canvas) {
+ [color](RenderProperties& props, Canvas& canvas) {
canvas.drawColor(color, SkXfermode::kSrcOver_Mode);
});
canvas.drawRenderNode(card.get());
@@ -58,7 +58,7 @@
cards[0]->mutateStagingProperties().setTranslationY(curFrame);
cards[0]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- TestUtils::recordNode(*cards[0], [curFrame](TestCanvas& canvas) {
+ TestUtils::recordNode(*cards[0], [curFrame](Canvas& canvas) {
SkColor color = TestUtils::interpolateColor(
curFrame / 150.0f, 0xFFF44336, 0xFFF8BBD0);
canvas.drawColor(color, SkXfermode::kSrcOver_Mode);
diff --git a/libs/hwui/tests/common/scenes/RecentsAnimation.cpp b/libs/hwui/tests/common/scenes/RecentsAnimation.cpp
index 6509edd..3d4397a 100644
--- a/libs/hwui/tests/common/scenes/RecentsAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/RecentsAnimation.cpp
@@ -28,7 +28,7 @@
class RecentsAnimation : public TestScene {
public:
- void createContent(int width, int height, TestCanvas& renderer) override {
+ void createContent(int width, int height, Canvas& renderer) override {
static SkColor COLORS[] = {
Color::Red_500,
Color::Purple_500,
@@ -71,7 +71,7 @@
sp<RenderNode> createCard(int x, int y, int width, int height,
const SkBitmap& thumb) {
return TestUtils::createNode(x, y, x + width, y + height,
- [&thumb, width, height](RenderProperties& props, TestCanvas& canvas) {
+ [&thumb, width, height](RenderProperties& props, Canvas& canvas) {
props.setElevation(dp(16));
props.mutableOutline().setRoundRect(0, 0, width, height, dp(10), 1);
props.mutableOutline().setShouldClip(true);
diff --git a/libs/hwui/tests/common/scenes/RectGridAnimation.cpp b/libs/hwui/tests/common/scenes/RectGridAnimation.cpp
index a9293ab..e1d323e 100644
--- a/libs/hwui/tests/common/scenes/RectGridAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/RectGridAnimation.cpp
@@ -29,12 +29,12 @@
class RectGridAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
canvas.insertReorderBarrier(true);
card = TestUtils::createNode(50, 50, 250, 250,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
canvas.drawColor(0xFFFF00FF, SkXfermode::kSrcOver_Mode);
SkRegion region;
diff --git a/libs/hwui/tests/common/scenes/SaveLayerAnimation.cpp b/libs/hwui/tests/common/scenes/SaveLayerAnimation.cpp
index 6904bec..cd00ed3 100644
--- a/libs/hwui/tests/common/scenes/SaveLayerAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/SaveLayerAnimation.cpp
@@ -28,11 +28,11 @@
class SaveLayerAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(Color::White, SkXfermode::kSrcOver_Mode); // background
card = TestUtils::createNode(0, 0, 400, 800,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
// nested clipped saveLayers
canvas.saveLayerAlpha(0, 0, 400, 400, 200, SaveFlags::ClipToLayer);
canvas.drawColor(Color::Green_700, SkXfermode::kSrcOver_Mode);
diff --git a/libs/hwui/tests/common/scenes/ShadowGrid2Animation.cpp b/libs/hwui/tests/common/scenes/ShadowGrid2Animation.cpp
index d3249b8..d7d0c512 100644
--- a/libs/hwui/tests/common/scenes/ShadowGrid2Animation.cpp
+++ b/libs/hwui/tests/common/scenes/ShadowGrid2Animation.cpp
@@ -28,7 +28,7 @@
class ShadowGrid2Animation : public TestScene {
public:
std::vector< sp<RenderNode> > cards;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
canvas.insertReorderBarrier(true);
@@ -53,7 +53,7 @@
private:
sp<RenderNode> createCard(int x, int y, int width, int height) {
return TestUtils::createNode(x, y, x + width, y + height,
- [width, height](RenderProperties& props, TestCanvas& canvas) {
+ [width, height](RenderProperties& props, Canvas& canvas) {
props.setElevation(dp(16));
props.mutableOutline().setRoundRect(0, 0, width, height, dp(6), 1);
props.mutableOutline().setShouldClip(true);
diff --git a/libs/hwui/tests/common/scenes/ShadowGridAnimation.cpp b/libs/hwui/tests/common/scenes/ShadowGridAnimation.cpp
index 5ffedf0..75362dd 100644
--- a/libs/hwui/tests/common/scenes/ShadowGridAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/ShadowGridAnimation.cpp
@@ -28,7 +28,7 @@
class ShadowGridAnimation : public TestScene {
public:
std::vector< sp<RenderNode> > cards;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
canvas.insertReorderBarrier(true);
@@ -53,7 +53,7 @@
private:
sp<RenderNode> createCard(int x, int y, int width, int height) {
return TestUtils::createNode(x, y, x + width, y + height,
- [width, height](RenderProperties& props, TestCanvas& canvas) {
+ [width, height](RenderProperties& props, Canvas& canvas) {
props.setElevation(dp(16));
props.mutableOutline().setRoundRect(0, 0, width, height, dp(6), 1);
props.mutableOutline().setShouldClip(true);
diff --git a/libs/hwui/tests/common/scenes/ShapeAnimation.cpp b/libs/hwui/tests/common/scenes/ShapeAnimation.cpp
index 6d27c9d..e2370f7 100644
--- a/libs/hwui/tests/common/scenes/ShapeAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/ShapeAnimation.cpp
@@ -30,17 +30,17 @@
class ShapeAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
card = TestUtils::createNode(0, 0, width, height,
- [width](RenderProperties& props, TestCanvas& canvas) {
- std::function<void(TestCanvas&, float, const SkPaint&)> ops[] = {
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [width](RenderProperties& props, Canvas& canvas) {
+ std::function<void(Canvas&, float, const SkPaint&)> ops[] = {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
canvas.drawArc(0, 0, size, size, 50, 189, true, paint);
},
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
canvas.drawOval(0, 0, size, size, paint);
},
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
SkPath diamondPath;
diamondPath.moveTo(size / 2, 0);
diamondPath.lineTo(size, size / 2);
@@ -49,18 +49,18 @@
diamondPath.close();
canvas.drawPath(diamondPath, paint);
},
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
float data[] = {0, 0, size, size, 0, size, size, 0 };
canvas.drawLines(data, sizeof(data) / sizeof(float), paint);
},
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
float data[] = {0, 0, size, size, 0, size, size, 0 };
canvas.drawPoints(data, sizeof(data) / sizeof(float), paint);
},
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
canvas.drawRect(0, 0, size, size, paint);
},
- [](TestCanvas& canvas, float size, const SkPaint& paint) {
+ [](Canvas& canvas, float size, const SkPaint& paint) {
float rad = size / 4;
canvas.drawRoundRect(0, 0, size, size, rad, rad, paint);
}
diff --git a/libs/hwui/tests/common/scenes/TestSceneBase.h b/libs/hwui/tests/common/scenes/TestSceneBase.h
index 935ddcf..792312a 100644
--- a/libs/hwui/tests/common/scenes/TestSceneBase.h
+++ b/libs/hwui/tests/common/scenes/TestSceneBase.h
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef TESTS_SCENES_TESTSCENEBASE_H
-#define TESTS_SCENES_TESTSCENEBASE_H
-#include "DisplayListCanvas.h"
+#pragma once
+
#include "RecordingCanvas.h"
#include "RenderNode.h"
#include "tests/common/TestContext.h"
@@ -30,5 +29,3 @@
using namespace android::uirenderer;
using namespace android::uirenderer::renderthread;
using namespace android::uirenderer::test;
-
-#endif /* TESTS_SCENES_TESTSCENEBASE_H_ */
diff --git a/libs/hwui/tests/common/scenes/TextAnimation.cpp b/libs/hwui/tests/common/scenes/TextAnimation.cpp
index be8f48b..2933402 100644
--- a/libs/hwui/tests/common/scenes/TextAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/TextAnimation.cpp
@@ -28,10 +28,10 @@
class TextAnimation : public TestScene {
public:
sp<RenderNode> card;
- void createContent(int width, int height, TestCanvas& canvas) override {
+ void createContent(int width, int height, Canvas& canvas) override {
canvas.drawColor(Color::White, SkXfermode::kSrcOver_Mode);
card = TestUtils::createNode(0, 0, width, height,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
SkPaint paint;
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
paint.setAntiAlias(true);
diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
index 2d78437..c006d99 100644
--- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp
+++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
@@ -22,6 +22,7 @@
#include "renderthread/RenderProxy.h"
#include "renderthread/RenderTask.h"
+#include <benchmark/benchmark.h>
#include <cutils/log.h>
#include <gui/Surface.h>
#include <ui/PixelFormat.h>
@@ -62,13 +63,62 @@
T mAverage;
};
-void run(const TestScene::Info& info, const TestScene::Options& opts) {
+void outputBenchmarkReport(const TestScene::Info& info, const TestScene::Options& opts,
+ benchmark::BenchmarkReporter* reporter, RenderProxy* proxy,
+ double durationInS) {
+ using namespace benchmark;
+
+ struct ReportInfo {
+ int percentile;
+ const char* suffix;
+ };
+
+ static std::array<ReportInfo, 4> REPORTS = {
+ ReportInfo { 50, "_50th" },
+ ReportInfo { 90, "_90th" },
+ ReportInfo { 95, "_95th" },
+ ReportInfo { 99, "_99th" },
+ };
+
+ // Although a vector is used, it must stay with only a single element
+ // otherwise the BenchmarkReporter will automatically compute
+ // mean and stddev which doesn't make sense for our usage
+ std::vector<BenchmarkReporter::Run> reports;
+ BenchmarkReporter::Run report;
+ report.benchmark_name = info.name;
+ report.iterations = static_cast<int64_t>(opts.count);
+ report.real_accumulated_time = durationInS;
+ report.cpu_accumulated_time = durationInS;
+ report.items_per_second = opts.count / durationInS;
+ reports.push_back(report);
+ reporter->ReportRuns(reports);
+
+ // Pretend the percentiles are single-iteration runs of the test
+ // If rendering offscreen skip this as it's fps that's more interesting
+ // in that test case than percentiles.
+ if (!opts.renderOffscreen) {
+ for (auto& ri : REPORTS) {
+ reports[0].benchmark_name = info.name;
+ reports[0].benchmark_name += ri.suffix;
+ durationInS = proxy->frameTimePercentile(ri.percentile) / 1000.0;
+ reports[0].real_accumulated_time = durationInS;
+ reports[0].cpu_accumulated_time = durationInS;
+ reports[0].iterations = 1;
+ reports[0].items_per_second = 0;
+ reporter->ReportRuns(reports);
+ }
+ }
+}
+
+void run(const TestScene::Info& info, const TestScene::Options& opts,
+ benchmark::BenchmarkReporter* reporter) {
// Switch to the real display
gDisplay = getBuiltInDisplay();
std::unique_ptr<TestScene> scene(info.createScene(opts));
TestContext testContext;
+ testContext.setRenderOffscreen(opts.renderOffscreen);
// create the native surface
const int width = gDisplay.w;
@@ -76,7 +126,7 @@
sp<Surface> surface = testContext.surface();
sp<RenderNode> rootNode = TestUtils::createNode(0, 0, width, height,
- [&scene, width, height](RenderProperties& props, TestCanvas& canvas) {
+ [&scene, width, height](RenderProperties& props, Canvas& canvas) {
props.setClipToBounds(false);
scene->createContent(width, height, canvas);
});
@@ -91,7 +141,12 @@
proxy->setLightCenter((Vector3){lightX, dp(-200.0f), dp(800.0f)});
// Do a few cold runs then reset the stats so that the caches are all hot
- for (int i = 0; i < 5; i++) {
+ int warmupFrameCount = 5;
+ if (opts.renderOffscreen) {
+ // Do a few more warmups to try and boost the clocks up
+ warmupFrameCount = 10;
+ }
+ for (int i = 0; i < warmupFrameCount; i++) {
testContext.waitForVsync();
nsecs_t vsync = systemTime(CLOCK_MONOTONIC);
UiFrameInfoBuilder(proxy->frameInfo()).setVsync(vsync, vsync);
@@ -103,6 +158,7 @@
ModifiedMovingAverage<double> avgMs(opts.reportFrametimeWeight);
+ nsecs_t start = systemTime(CLOCK_MONOTONIC);
for (int i = 0; i < opts.count; i++) {
testContext.waitForVsync();
nsecs_t vsync = systemTime(CLOCK_MONOTONIC);
@@ -121,6 +177,13 @@
}
}
}
+ proxy->fence();
+ nsecs_t end = systemTime(CLOCK_MONOTONIC);
- proxy->dumpProfileInfo(STDOUT_FILENO, DumpFlags::JankStats);
+ if (reporter) {
+ outputBenchmarkReport(info, opts, reporter, proxy.get(),
+ (end - start) / (double) s2ns(1));
+ } else {
+ proxy->dumpProfileInfo(STDOUT_FILENO, DumpFlags::JankStats);
+ }
}
diff --git a/libs/hwui/tests/macrobench/how_to_run.txt b/libs/hwui/tests/macrobench/how_to_run.txt
index b051768f..3c3d36a 100644
--- a/libs/hwui/tests/macrobench/how_to_run.txt
+++ b/libs/hwui/tests/macrobench/how_to_run.txt
@@ -1,5 +1,5 @@
mmm -j8 frameworks/base/libs/hwui/ &&
- adb push $OUT/data/local/tmp/hwuitest /data/local/tmp/hwuitest &&
- adb shell /data/local/tmp/hwuitest
+adb push $OUT/data/benchmarktest/hwuimacro/hwuimacro /data/benchmarktest/hwuimacro/hwuimacro &&
+adb shell /data/benchmarktest/hwuimacro/hwuimacro shadowgrid2 --onscreen
Pass --help to get help
diff --git a/libs/hwui/tests/macrobench/main.cpp b/libs/hwui/tests/macrobench/main.cpp
index 5bad436..ebc1dd7 100644
--- a/libs/hwui/tests/macrobench/main.cpp
+++ b/libs/hwui/tests/macrobench/main.cpp
@@ -20,6 +20,8 @@
#include "protos/hwui.pb.h"
#include "Properties.h"
+#include <benchmark/benchmark.h>
+#include <../src/sysinfo.h>
#include <getopt.h>
#include <stdio.h>
#include <string>
@@ -40,12 +42,14 @@
static int gRepeatCount = 1;
static std::vector<TestScene::Info> gRunTests;
static TestScene::Options gOpts;
+std::unique_ptr<benchmark::BenchmarkReporter> gBenchmarkReporter;
-void run(const TestScene::Info& info, const TestScene::Options& opts);
+void run(const TestScene::Info& info, const TestScene::Options& opts,
+ benchmark::BenchmarkReporter* reporter);
static void printHelp() {
printf(R"(
-USAGE: hwuitest [OPTIONS] <TESTNAME>
+USAGE: hwuimacro [OPTIONS] <TESTNAME>
OPTIONS:
-c, --count=NUM NUM loops a test should run (example, number of frames)
@@ -59,6 +63,10 @@
moving average frametime. Weight is optional, default is 10
--cpuset=name Adds the test to the specified cpuset before running
Not supported on all devices and needs root
+ --offscreen Render tests off device screen. This option is on by default
+ --onscreen Render tests on device screen. By default tests
+ are offscreen rendered
+ --benchmark_format Set output format. Possible values are tabular, json, csv
)");
}
@@ -122,6 +130,20 @@
close(fd);
}
+static bool setBenchmarkFormat(const char* format) {
+ if (!strcmp(format, "tabular")) {
+ gBenchmarkReporter.reset(new benchmark::ConsoleReporter());
+ } else if (!strcmp(format, "json")) {
+ gBenchmarkReporter.reset(new benchmark::JSONReporter());
+ } else if (!strcmp(format, "csv")) {
+ gBenchmarkReporter.reset(new benchmark::CSVReporter());
+ } else {
+ fprintf(stderr, "Unknown format '%s'", format);
+ return false;
+ }
+ return true;
+}
+
// For options that only exist in long-form. Anything in the
// 0-255 range is reserved for short options (which just use their ASCII value)
namespace LongOpts {
@@ -131,6 +153,9 @@
WaitForGpu,
ReportFrametime,
CpuSet,
+ BenchmarkFormat,
+ Onscreen,
+ Offscreen,
};
}
@@ -142,6 +167,9 @@
{ "wait-for-gpu", no_argument, nullptr, LongOpts::WaitForGpu },
{ "report-frametime", optional_argument, nullptr, LongOpts::ReportFrametime },
{ "cpuset", required_argument, nullptr, LongOpts::CpuSet },
+ { "benchmark_format", required_argument, nullptr, LongOpts::BenchmarkFormat },
+ { "onscreen", no_argument, nullptr, LongOpts::Onscreen },
+ { "offscreen", no_argument, nullptr, LongOpts::Offscreen },
{ 0, 0, 0, 0 }
};
@@ -215,6 +243,24 @@
moveToCpuSet(optarg);
break;
+ case LongOpts::BenchmarkFormat:
+ if (!optarg) {
+ error = true;
+ break;
+ }
+ if (!setBenchmarkFormat(optarg)) {
+ error = true;
+ }
+ break;
+
+ case LongOpts::Onscreen:
+ gOpts.renderOffscreen = false;
+ break;
+
+ case LongOpts::Offscreen:
+ gOpts.renderOffscreen = true;
+ break;
+
case 'h':
printHelp();
exit(EXIT_SUCCESS);
@@ -247,7 +293,9 @@
}
} while (optind < argc);
} else {
- gRunTests.push_back(TestScene::testMap()["shadowgrid"]);
+ for (auto& iter : TestScene::testMap()) {
+ gRunTests.push_back(iter.second);
+ }
}
}
@@ -256,13 +304,36 @@
gOpts.count = 150;
parseOptions(argc, argv);
+ if (!gBenchmarkReporter && gOpts.renderOffscreen) {
+ gBenchmarkReporter.reset(new benchmark::ConsoleReporter());
+ }
+
+ if (gBenchmarkReporter) {
+ size_t name_field_width = 10;
+ for (auto&& test : gRunTests) {
+ name_field_width = std::max<size_t>(name_field_width, test.name.size());
+ }
+ // _50th, _90th, etc...
+ name_field_width += 5;
+
+ benchmark::BenchmarkReporter::Context context;
+ context.num_cpus = benchmark::NumCPUs();
+ context.mhz_per_cpu = benchmark::CyclesPerSecond() / 1000000.0f;
+ context.cpu_scaling_enabled = benchmark::CpuScalingEnabled();
+ context.name_field_width = name_field_width;
+ gBenchmarkReporter->ReportContext(context);
+ }
for (int i = 0; i < gRepeatCount; i++) {
for (auto&& test : gRunTests) {
- run(test, gOpts);
+ run(test, gOpts, gBenchmarkReporter.get());
}
}
- printf("Success!\n");
+
+ if (gBenchmarkReporter) {
+ gBenchmarkReporter->Finalize();
+ }
+
LeakChecker::checkForLeaks();
return 0;
}
diff --git a/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp b/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp
index cd4a3c9..2787fba 100644
--- a/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp
+++ b/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp
@@ -17,22 +17,12 @@
#include <benchmark/benchmark.h>
#include "DisplayList.h"
-#if HWUI_NEW_OPS
#include "RecordingCanvas.h"
-#else
-#include "DisplayListCanvas.h"
-#endif
#include "tests/common/TestUtils.h"
using namespace android;
using namespace android::uirenderer;
-#if HWUI_NEW_OPS
-typedef RecordingCanvas TestCanvas;
-#else
-typedef DisplayListCanvas TestCanvas;
-#endif
-
void BM_DisplayList_alloc(benchmark::State& benchState) {
while (benchState.KeepRunning()) {
auto displayList = new DisplayList();
@@ -52,42 +42,42 @@
BENCHMARK(BM_DisplayList_alloc_theoretical);
void BM_DisplayListCanvas_record_empty(benchmark::State& benchState) {
- TestCanvas canvas(100, 100);
- delete canvas.finishRecording();
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
+ delete canvas->finishRecording();
while (benchState.KeepRunning()) {
- canvas.resetRecording(100, 100);
- benchmark::DoNotOptimize(&canvas);
- delete canvas.finishRecording();
+ canvas->resetRecording(100, 100);
+ benchmark::DoNotOptimize(canvas.get());
+ delete canvas->finishRecording();
}
}
BENCHMARK(BM_DisplayListCanvas_record_empty);
void BM_DisplayListCanvas_record_saverestore(benchmark::State& benchState) {
- TestCanvas canvas(100, 100);
- delete canvas.finishRecording();
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
+ delete canvas->finishRecording();
while (benchState.KeepRunning()) {
- canvas.resetRecording(100, 100);
- canvas.save(SaveFlags::MatrixClip);
- canvas.save(SaveFlags::MatrixClip);
- benchmark::DoNotOptimize(&canvas);
- canvas.restore();
- canvas.restore();
- delete canvas.finishRecording();
+ canvas->resetRecording(100, 100);
+ canvas->save(SaveFlags::MatrixClip);
+ canvas->save(SaveFlags::MatrixClip);
+ benchmark::DoNotOptimize(canvas.get());
+ canvas->restore();
+ canvas->restore();
+ delete canvas->finishRecording();
}
}
BENCHMARK(BM_DisplayListCanvas_record_saverestore);
void BM_DisplayListCanvas_record_translate(benchmark::State& benchState) {
- TestCanvas canvas(100, 100);
- delete canvas.finishRecording();
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
+ delete canvas->finishRecording();
while (benchState.KeepRunning()) {
- canvas.resetRecording(100, 100);
- canvas.scale(10, 10);
- benchmark::DoNotOptimize(&canvas);
- delete canvas.finishRecording();
+ canvas->resetRecording(100, 100);
+ canvas->scale(10, 10);
+ benchmark::DoNotOptimize(canvas.get());
+ delete canvas->finishRecording();
}
}
BENCHMARK(BM_DisplayListCanvas_record_translate);
@@ -99,27 +89,27 @@
* View system frequently produces unneeded save/restores.
*/
void BM_DisplayListCanvas_record_simpleBitmapView(benchmark::State& benchState) {
- TestCanvas canvas(100, 100);
- delete canvas.finishRecording();
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
+ delete canvas->finishRecording();
SkPaint rectPaint;
SkBitmap iconBitmap = TestUtils::createSkBitmap(80, 80);
while (benchState.KeepRunning()) {
- canvas.resetRecording(100, 100);
+ canvas->resetRecording(100, 100);
{
- canvas.save(SaveFlags::MatrixClip);
- canvas.drawRect(0, 0, 100, 100, rectPaint);
- canvas.restore();
+ canvas->save(SaveFlags::MatrixClip);
+ canvas->drawRect(0, 0, 100, 100, rectPaint);
+ canvas->restore();
}
{
- canvas.save(SaveFlags::MatrixClip);
- canvas.translate(10, 10);
- canvas.drawBitmap(iconBitmap, 0, 0, nullptr);
- canvas.restore();
+ canvas->save(SaveFlags::MatrixClip);
+ canvas->translate(10, 10);
+ canvas->drawBitmap(iconBitmap, 0, 0, nullptr);
+ canvas->restore();
}
- benchmark::DoNotOptimize(&canvas);
- delete canvas.finishRecording();
+ benchmark::DoNotOptimize(canvas.get());
+ delete canvas->finishRecording();
}
}
BENCHMARK(BM_DisplayListCanvas_record_simpleBitmapView);
@@ -176,30 +166,30 @@
canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
});
- TestCanvas canvas(100, 100);
- delete canvas.finishRecording();
+ std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
+ delete canvas->finishRecording();
while (benchState.KeepRunning()) {
- canvas.resetRecording(200, 200);
- canvas.setHighContrastText(false);
- canvas.translate(0, 0); // mScrollX, mScrollY
+ canvas->resetRecording(200, 200);
+ canvas->setHighContrastText(false);
+ canvas->translate(0, 0); // mScrollX, mScrollY
// Clip to padding
// Can expect ~25% of views to have clip to padding with a non-null padding
- int clipRestoreCount = canvas.save(SaveFlags::MatrixClip);
- canvas.clipRect(1, 1, 199, 199, SkRegion::kIntersect_Op);
+ int clipRestoreCount = canvas->save(SaveFlags::MatrixClip);
+ canvas->clipRect(1, 1, 199, 199, SkRegion::kIntersect_Op);
- canvas.insertReorderBarrier(true);
+ canvas->insertReorderBarrier(true);
// Draw child loop
for (int i = 0; i < benchState.range_x(); i++) {
- canvas.drawRenderNode(child.get());
+ canvas->drawRenderNode(child.get());
}
- canvas.insertReorderBarrier(false);
- canvas.restoreToCount(clipRestoreCount);
+ canvas->insertReorderBarrier(false);
+ canvas->restoreToCount(clipRestoreCount);
- delete canvas.finishRecording();
+ delete canvas->finishRecording();
}
}
BENCHMARK(BM_DisplayListCanvas_basicViewGroupDraw)->Arg(1)->Arg(5)->Arg(10);
diff --git a/libs/hwui/tests/microbench/FrameBuilderBench.cpp b/libs/hwui/tests/microbench/FrameBuilderBench.cpp
index 84ef9c2..93aa574 100644
--- a/libs/hwui/tests/microbench/FrameBuilderBench.cpp
+++ b/libs/hwui/tests/microbench/FrameBuilderBench.cpp
@@ -39,7 +39,7 @@
const BakedOpRenderer::LightInfo sLightInfo = { 128, 128 };
static sp<RenderNode> createTestNode() {
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(10, 10);
SkPaint paint;
@@ -98,8 +98,8 @@
TestScene::Options opts;
std::unique_ptr<TestScene> scene(TestScene::testMap()[sceneName].createScene(opts));
- sp<RenderNode> rootNode = TestUtils::createNode(0, 0, gDisplay.w, gDisplay.h,
- [&scene](RenderProperties& props, TestCanvas& canvas) {
+ sp<RenderNode> rootNode = TestUtils::createNode<RecordingCanvas>(0, 0, gDisplay.w, gDisplay.h,
+ [&scene](RenderProperties& props, RecordingCanvas& canvas) {
scene->createContent(gDisplay.w, gDisplay.h, canvas);
});
diff --git a/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp b/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp
index 6b7b721..eb236c4 100644
--- a/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp
+++ b/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp
@@ -159,8 +159,8 @@
}
RENDERTHREAD_TEST(BakedOpDispatcher, renderTextWithShadow) {
- auto node = TestUtils::createNode(0, 0, 100, 100,
- [](RenderProperties& props, TestCanvas& canvas) {
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
android::Paint shadowPaint;
shadowPaint.setColor(SK_ColorRED);
@@ -196,8 +196,8 @@
static void validateLayerDraw(renderthread::RenderThread& renderThread,
std::function<void(const Glop& glop)> validator) {
- auto node = TestUtils::createNode(0, 0, 100, 100,
- [](RenderProperties& props, TestCanvas& canvas) {
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
// provide different blend mode, so decoration draws contrast
diff --git a/libs/hwui/tests/unit/ClipAreaTests.cpp b/libs/hwui/tests/unit/ClipAreaTests.cpp
index 54ca68d..d4d7919 100644
--- a/libs/hwui/tests/unit/ClipAreaTests.cpp
+++ b/libs/hwui/tests/unit/ClipAreaTests.cpp
@@ -275,5 +275,73 @@
}
}
+TEST(ClipArea, serializeIntersectedClip_scale) {
+ ClipArea area(createClipArea());
+ area.setClip(0, 0, 400, 400);
+ LinearAllocator allocator;
+
+ SkPath circlePath;
+ circlePath.addCircle(50, 50, 50);
+
+ ClipRegion recordedClip;
+ recordedClip.region.setPath(circlePath, SkRegion(SkIRect::MakeWH(100, 100)));
+ recordedClip.rect = Rect(100, 100);
+
+ Matrix4 translateScale;
+ translateScale.loadTranslate(100, 100, 0);
+ translateScale.scale(2, 2, 1);
+ auto resolvedClip = area.serializeIntersectedClip(allocator, &recordedClip, translateScale);
+
+ ASSERT_NE(nullptr, resolvedClip);
+ EXPECT_EQ(ClipMode::Region, resolvedClip->mode);
+ EXPECT_EQ(Rect(100, 100, 300, 300), resolvedClip->rect);
+ auto clipRegion = reinterpret_cast<const ClipRegion*>(resolvedClip);
+ EXPECT_EQ(SkIRect::MakeLTRB(100, 100, 300, 300), clipRegion->region.getBounds());
+}
+
+TEST(ClipArea, applyTransformToRegion_identity) {
+ SkRegion region(SkIRect::MakeLTRB(1, 2, 3, 4));
+ ClipArea::applyTransformToRegion(Matrix4::identity(), ®ion);
+ EXPECT_TRUE(region.isRect());
+ EXPECT_EQ(SkIRect::MakeLTRB(1, 2, 3, 4), region.getBounds());
+}
+
+TEST(ClipArea, applyTransformToRegion_translate) {
+ SkRegion region(SkIRect::MakeLTRB(1, 2, 3, 4));
+ Matrix4 transform;
+ transform.loadTranslate(10, 20, 0);
+ ClipArea::applyTransformToRegion(transform, ®ion);
+ EXPECT_TRUE(region.isRect());
+ EXPECT_EQ(SkIRect::MakeLTRB(11, 22, 13, 24), region.getBounds());
+}
+
+TEST(ClipArea, applyTransformToRegion_scale) {
+ SkRegion region(SkIRect::MakeLTRB(1, 2, 3, 4));
+ Matrix4 transform;
+ transform.loadScale(2, 3, 1);
+ ClipArea::applyTransformToRegion(transform, ®ion);
+ EXPECT_TRUE(region.isRect());
+ EXPECT_EQ(SkIRect::MakeLTRB(2, 6, 6, 12), region.getBounds());
+}
+
+TEST(ClipArea, applyTransformToRegion_translateScale) {
+ SkRegion region(SkIRect::MakeLTRB(1, 2, 3, 4));
+ Matrix4 transform;
+ transform.translate(10, 20);
+ transform.scale(2, 3, 1);
+ ClipArea::applyTransformToRegion(transform, ®ion);
+ EXPECT_TRUE(region.isRect());
+ EXPECT_EQ(SkIRect::MakeLTRB(12, 26, 16, 32), region.getBounds());
+}
+
+TEST(ClipArea, applyTransformToRegion_rotate90) {
+ SkRegion region(SkIRect::MakeLTRB(1, 2, 3, 4));
+ Matrix4 transform;
+ transform.loadRotate(90);
+ ClipArea::applyTransformToRegion(transform, ®ion);
+ EXPECT_TRUE(region.isRect());
+ EXPECT_EQ(SkIRect::MakeLTRB(-4, 1, -2, 3), region.getBounds());
+}
+
} // namespace uirenderer
} // namespace android
diff --git a/libs/hwui/tests/unit/DeferredLayerUpdaterTests.cpp b/libs/hwui/tests/unit/DeferredLayerUpdaterTests.cpp
new file mode 100644
index 0000000..0326aa9
--- /dev/null
+++ b/libs/hwui/tests/unit/DeferredLayerUpdaterTests.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "DeferredLayerUpdater.h"
+
+#include "renderthread/OpenGLPipeline.h"
+#include "tests/common/TestUtils.h"
+
+#include <gtest/gtest.h>
+
+using namespace android;
+using namespace android::uirenderer;
+
+RENDERTHREAD_TEST(DeferredLayerUpdater, updateLayer) {
+ renderthread::OpenGLPipeline pipeline(renderThread);
+ sp<DeferredLayerUpdater> layerUpdater = pipeline.createTextureLayer();
+ layerUpdater->setSize(100, 100);
+ layerUpdater->setBlend(true);
+
+
+ // updates are deferred so the backing layer should still be in its default state
+ EXPECT_EQ((uint32_t)GL_NONE, layerUpdater->backingLayer()->getRenderTarget());
+ EXPECT_EQ(0u, layerUpdater->backingLayer()->getWidth());
+ EXPECT_EQ(0u, layerUpdater->backingLayer()->getHeight());
+ EXPECT_FALSE(layerUpdater->backingLayer()->getForceFilter());
+ EXPECT_FALSE(layerUpdater->backingLayer()->isBlend());
+ EXPECT_EQ(Matrix4::identity(), layerUpdater->backingLayer()->getTexTransform());
+
+ // push the deferred updates to the layer
+ Matrix4 scaledMatrix;
+ scaledMatrix.loadScale(0.5, 0.5, 0.0);
+ layerUpdater->updateLayer(true, GL_TEXTURE_EXTERNAL_OES, scaledMatrix.data);
+
+ // the backing layer should now have all the properties applied.
+ EXPECT_EQ((uint32_t)GL_TEXTURE_EXTERNAL_OES, layerUpdater->backingLayer()->getRenderTarget());
+ EXPECT_EQ(100u, layerUpdater->backingLayer()->getWidth());
+ EXPECT_EQ(100u, layerUpdater->backingLayer()->getHeight());
+ EXPECT_TRUE(layerUpdater->backingLayer()->getForceFilter());
+ EXPECT_TRUE(layerUpdater->backingLayer()->isBlend());
+ EXPECT_EQ(scaledMatrix, layerUpdater->backingLayer()->getTexTransform());
+}
diff --git a/libs/hwui/tests/unit/FrameBuilderTests.cpp b/libs/hwui/tests/unit/FrameBuilderTests.cpp
index e5fc556..259686b 100644
--- a/libs/hwui/tests/unit/FrameBuilderTests.cpp
+++ b/libs/hwui/tests/unit/FrameBuilderTests.cpp
@@ -127,7 +127,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 100, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(25, 25);
canvas.drawRect(0, 0, 100, 200, SkPaint());
@@ -155,7 +155,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 100, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint strokedPaint;
strokedPaint.setStrokeWidth(10);
@@ -171,7 +171,7 @@
}
RENDERTHREAD_TEST(FrameBuilder, simpleRejection) {
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.save(SaveFlags::MatrixClip);
canvas.clipRect(200, 200, 400, 400, SkRegion::kIntersect_Op); // intersection should be empty
@@ -198,7 +198,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(10, 10,
kAlpha_8_SkColorType); // Disable merging by using alpha 8 bitmap
@@ -234,7 +234,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 100, 100,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 100, 100, SkPaint());
});
@@ -287,20 +287,20 @@
transparentPaint.setAlpha(128);
// backdrop
- nodes.push_back(TestUtils::createNode(100, 100, 700, 500, // 600x400
+ nodes.push_back(TestUtils::createNode<RecordingCanvas>(100, 100, 700, 500, // 600x400
[&transparentPaint](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 600, 400, transparentPaint);
}));
// content
Rect contentDrawBounds(150, 150, 650, 450); // 500x300
- nodes.push_back(TestUtils::createNode(0, 0, 800, 600,
+ nodes.push_back(TestUtils::createNode<RecordingCanvas>(0, 0, 800, 600,
[&transparentPaint](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 800, 600, transparentPaint);
}));
// overlay
- nodes.push_back(TestUtils::createNode(0, 0, 800, 600,
+ nodes.push_back(TestUtils::createNode<RecordingCanvas>(0, 0, 800, 600,
[&transparentPaint](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 800, 200, transparentPaint);
}));
@@ -346,7 +346,7 @@
EXPECT_EQ(1, mIndex++);
}
};
- auto node = TestUtils::createNode(10, 10, 110, 110,
+ auto node = TestUtils::createNode<RecordingCanvas>(10, 10, 110, 110,
[](RenderProperties& props, RecordingCanvas& canvas) {
// no drawn content
});
@@ -371,7 +371,7 @@
<< "Last rect should occlude others.";
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 200, 200, SkPaint());
canvas.drawRect(0, 0, 200, 200, SkPaint());
@@ -413,7 +413,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 50, 50,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 50, 50,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 50, 50, SkPaint());
canvas.drawRect(0, 0, 50, 50, SkPaint());
@@ -447,8 +447,8 @@
opList.clipSideFlags);
}
};
- auto node = TestUtils::createNode(0, 0, 100, 100,
- [](RenderProperties& props, TestCanvas& canvas) {
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(20, 20);
// left side clipped (to inset left half)
@@ -489,8 +489,8 @@
EXPECT_EQ(OpClipSideFlags::None, opList.states[1]->computedState.clipSideFlags);
}
};
- auto node = TestUtils::createNode(0, 0, 400, 400,
- [](RenderProperties& props, TestCanvas& canvas) {
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint paint;
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
paint.setAntiAlias(true);
@@ -520,7 +520,7 @@
EXPECT_EQ(5u, opList.count);
}
};
- auto node = TestUtils::createNode(0, 0, 200, 2000,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 2000,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint textPaint;
textPaint.setAntiAlias(true);
@@ -576,8 +576,8 @@
EXPECT_EQ(stroke, outsetFill);
}
};
- auto node = TestUtils::createNode(0, 0, 400, 400,
- [](RenderProperties& props, TestCanvas& canvas) {
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint paint;
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
paint.setAntiAlias(true);
@@ -616,7 +616,7 @@
auto layerUpdater = TestUtils::createTextureLayerUpdater(renderThread, 100, 100,
SkMatrix::MakeTrans(5, 5));
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[&layerUpdater](RenderProperties& props, RecordingCanvas& canvas) {
canvas.save(SaveFlags::MatrixClip);
canvas.clipRect(50, 50, 150, 150, SkRegion::kIntersect_Op);
@@ -648,7 +648,7 @@
auto layerUpdater = TestUtils::createTextureLayerUpdater(renderThread, 100, 100,
SkMatrix::MakeTrans(5, 5));
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[&layerUpdater](RenderProperties& props, RecordingCanvas& canvas) {
canvas.save(SaveFlags::MatrixClip);
canvas.translate(30, 40);
@@ -670,7 +670,7 @@
SkMatrix::MakeTrans(5, 5));
layerUpdater->backingLayer()->setRenderTarget(GL_NONE); // Should be rejected
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[&layerUpdater](RenderProperties& props, RecordingCanvas& canvas) {
canvas.drawLayer(layerUpdater.get());
});
@@ -693,7 +693,7 @@
Functor noopFunctor;
// 1 million pixel tall view, scrolled down 80%
- auto scrolledFunctorView = TestUtils::createNode(0, 0, 400, 1000000,
+ auto scrolledFunctorView = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 1000000,
[&noopFunctor](RenderProperties& props, RecordingCanvas& canvas) {
canvas.translate(0, -800000);
canvas.callDrawGLFunction(&noopFunctor, nullptr);
@@ -718,7 +718,7 @@
}
};
- auto unclippedColorView = TestUtils::createNode(0, 0, 10, 10,
+ auto unclippedColorView = TestUtils::createNode<RecordingCanvas>(0, 0, 10, 10,
[](RenderProperties& props, RecordingCanvas& canvas) {
props.setClipToBounds(false);
canvas.drawColor(SK_ColorWHITE, SkXfermode::Mode::kSrcOver_Mode);
@@ -752,14 +752,14 @@
}
};
- auto child = TestUtils::createNode(10, 10, 110, 110,
+ auto child = TestUtils::createNode<RecordingCanvas>(10, 10, 110, 110,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
});
- auto parent = TestUtils::createNode(0, 0, 200, 200,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[&child](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorDKGRAY);
@@ -791,7 +791,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(200, 200);
canvas.drawBitmap(bitmap, 0, 0, nullptr);
@@ -840,7 +840,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(10, 10, 190, 190, 128, SaveFlags::ClipToLayer);
canvas.drawRect(10, 10, 190, 190, SkPaint());
@@ -916,7 +916,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 800, 800,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 800, 800,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(0, 0, 800, 800, 128, SaveFlags::ClipToLayer);
{
@@ -940,7 +940,7 @@
}
RENDERTHREAD_TEST(FrameBuilder, saveLayer_contentRejection) {
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.save(SaveFlags::MatrixClip);
canvas.clipRect(200, 200, 400, 400, SkRegion::kIntersect_Op);
@@ -991,7 +991,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(10, 10, 190, 190, 128, (SaveFlags::Flags)(0));
canvas.drawRect(0, 0, 200, 200, SkPaint());
@@ -1024,7 +1024,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(10.95f, 10.5f, 189.75f, 189.25f, // values should all round out
128, (SaveFlags::Flags)(0));
@@ -1076,7 +1076,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
int restoreTo = canvas.save(SaveFlags::MatrixClip);
@@ -1123,7 +1123,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
// save smaller than clip, so we get unclipped behavior
canvas.saveLayerAlpha(10, 10, 190, 190, 128, (SaveFlags::Flags)(0));
@@ -1142,7 +1142,7 @@
}
RENDERTHREAD_TEST(FrameBuilder, saveLayerUnclipped_reject) {
- auto node = TestUtils::createNode(0, 0, 200, 200,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
// unclipped savelayer + rect both in area that won't intersect with dirty
canvas.saveLayerAlpha(100, 100, 200, 200, 128, (SaveFlags::Flags)(0));
@@ -1208,7 +1208,7 @@
}
};
- auto node = TestUtils::createNode(0, 0, 600, 600, // 500x500 triggers clipping
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 600, 600, // 500x500 triggers clipping
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(0, 0, 500, 500, 128, (SaveFlags::Flags)0); // unclipped
canvas.saveLayerAlpha(100, 100, 400, 400, 128, SaveFlags::ClipToLayer); // clipped
@@ -1260,7 +1260,7 @@
}
};
- auto node = TestUtils::createNode(10, 10, 110, 110,
+ auto node = TestUtils::createNode<RecordingCanvas>(10, 10, 110, 110,
[](RenderProperties& props, RecordingCanvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
SkPaint paint;
@@ -1355,7 +1355,7 @@
}
};
- auto child = TestUtils::createNode(50, 50, 150, 150,
+ auto child = TestUtils::createNode<RecordingCanvas>(50, 50, 150, 150,
[](RenderProperties& props, RecordingCanvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
SkPaint paint;
@@ -1366,7 +1366,7 @@
*(child->getLayerHandle()) = &childLayer;
RenderNode* childPtr = child.get();
- auto parent = TestUtils::createNode(0, 0, 200, 200,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[childPtr](RenderProperties& props, RecordingCanvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
SkPaint paint;
@@ -1430,7 +1430,7 @@
}
};
- auto node = TestUtils::createNode(10, 10, 110, 110,
+ auto node = TestUtils::createNode<RecordingCanvas>(10, 10, 110, 110,
[](RenderProperties& props, RecordingCanvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
canvas.drawColor(SK_ColorWHITE, SkXfermode::Mode::kSrcOver_Mode);
@@ -1457,13 +1457,14 @@
*layerHandle = nullptr;
}
-static void drawOrderedRect(RecordingCanvas* canvas, uint8_t expectedDrawOrder) {
+static void drawOrderedRect(Canvas* canvas, uint8_t expectedDrawOrder) {
SkPaint paint;
- paint.setColor(SkColorSetARGB(256, 0, 0, expectedDrawOrder)); // order put in blue channel
+ // order put in blue channel, transparent so overlapped content doesn't get rejected
+ paint.setColor(SkColorSetARGB(1, 0, 0, expectedDrawOrder));
canvas->drawRect(0, 0, 100, 100, paint);
}
-static void drawOrderedNode(RecordingCanvas* canvas, uint8_t expectedDrawOrder, float z) {
- auto node = TestUtils::createNode(0, 0, 100, 100,
+static void drawOrderedNode(Canvas* canvas, uint8_t expectedDrawOrder, float z) {
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[expectedDrawOrder](RenderProperties& props, RecordingCanvas& canvas) {
drawOrderedRect(&canvas, expectedDrawOrder);
});
@@ -1480,7 +1481,7 @@
}
};
- auto parent = TestUtils::createNode(0, 0, 100, 100,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[](RenderProperties& props, RecordingCanvas& canvas) {
drawOrderedNode(&canvas, 0, 10.0f); // in reorder=false at this point, so played inorder
drawOrderedRect(&canvas, 1);
@@ -1549,7 +1550,7 @@
* The parent is scrolled by scrollX/scrollY, but this does not affect the background
* (which isn't affected by scroll).
*/
- auto receiverBackground = TestUtils::createNode(0, 0, 100, 100,
+ auto receiverBackground = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setProjectionReceiver(true);
// scroll doesn't apply to background, so undone via translationX/Y
@@ -1561,7 +1562,7 @@
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
});
- auto projectingRipple = TestUtils::createNode(50, 0, 100, 50,
+ auto projectingRipple = TestUtils::createNode<RecordingCanvas>(50, 0, 100, 50,
[](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setProjectBackwards(true);
properties.setClipToBounds(false);
@@ -1569,14 +1570,14 @@
paint.setColor(SK_ColorDKGRAY);
canvas.drawRect(-10, -10, 60, 60, paint);
});
- auto child = TestUtils::createNode(0, 50, 100, 100,
+ auto child = TestUtils::createNode<RecordingCanvas>(0, 50, 100, 100,
[&projectingRipple](RenderProperties& properties, RecordingCanvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorBLUE);
canvas.drawRect(0, 0, 100, 50, paint);
canvas.drawRenderNode(projectingRipple.get());
});
- auto parent = TestUtils::createNode(0, 0, 100, 100,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[&receiverBackground, &child](RenderProperties& properties, RecordingCanvas& canvas) {
// Set a rect outline for the projecting ripple to be masked against.
properties.mutableOutline().setRoundRect(10, 10, 90, 90, 5, 1.0f);
@@ -1630,7 +1631,7 @@
ASSERT_EQ(nullptr, state.computedState.localProjectionPathMask);
}
};
- auto receiverBackground = TestUtils::createNode(0, 0, 400, 400,
+ auto receiverBackground = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
[](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setProjectionReceiver(true);
// scroll doesn't apply to background, so undone via translationX/Y
@@ -1640,19 +1641,19 @@
canvas.drawRect(0, 0, 400, 400, SkPaint());
});
- auto projectingRipple = TestUtils::createNode(0, 0, 200, 200,
+ auto projectingRipple = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setProjectBackwards(true);
properties.setClipToBounds(false);
canvas.drawOval(100, 100, 300, 300, SkPaint()); // drawn mostly out of layer bounds
});
- auto child = TestUtils::createNode(100, 100, 300, 300,
+ auto child = TestUtils::createNode<RecordingCanvas>(100, 100, 300, 300,
[&projectingRipple](RenderProperties& properties, RecordingCanvas& canvas) {
properties.mutateLayerProperties().setType(LayerType::RenderLayer);
canvas.drawRenderNode(projectingRipple.get());
canvas.drawArc(0, 0, 200, 200, 0.0f, 280.0f, true, SkPaint());
});
- auto parent = TestUtils::createNode(0, 0, 400, 400,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
[&receiverBackground, &child](RenderProperties& properties, RecordingCanvas& canvas) {
// Set a rect outline for the projecting ripple to be masked against.
properties.mutableOutline().setRoundRect(10, 10, 390, 390, 0, 1.0f);
@@ -1705,12 +1706,12 @@
EXPECT_TRUE(state.computedState.transform.isIdentity());
}
};
- auto receiverBackground = TestUtils::createNode(0, 0, 400, 400,
+ auto receiverBackground = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
[](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setProjectionReceiver(true);
canvas.drawRect(0, 0, 400, 400, SkPaint());
});
- auto projectingRipple = TestUtils::createNode(0, 0, 200, 200,
+ auto projectingRipple = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& properties, RecordingCanvas& canvas) {
// scroll doesn't apply to background, so undone via translationX/Y
// NOTE: translationX/Y only! no other transform properties may be set for a proj receiver!
@@ -1720,7 +1721,7 @@
properties.setClipToBounds(false);
canvas.drawOval(0, 0, 200, 200, SkPaint());
});
- auto child = TestUtils::createNode(0, 0, 400, 400,
+ auto child = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
[&projectingRipple](RenderProperties& properties, RecordingCanvas& canvas) {
// Record time clip will be ignored by projectee
canvas.clipRect(100, 100, 300, 300, SkRegion::kIntersect_Op);
@@ -1728,7 +1729,7 @@
canvas.translate(-scrollX, -scrollY); // Apply scroll (note: bg undoes this internally)
canvas.drawRenderNode(projectingRipple.get());
});
- auto parent = TestUtils::createNode(0, 0, 400, 400,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 400, 400,
[&receiverBackground, &child](RenderProperties& properties, RecordingCanvas& canvas) {
canvas.drawRenderNode(receiverBackground.get());
canvas.drawRenderNode(child.get());
@@ -1745,7 +1746,7 @@
// creates a 100x100 shadow casting node with provided translationZ
static sp<RenderNode> createWhiteRectShadowCaster(float translationZ) {
- return TestUtils::createNode(0, 0, 100, 100,
+ return TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[translationZ](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setTranslationZ(translationZ);
properties.mutableOutline().setRoundRect(0, 0, 100, 100, 0.0f, 1.0f);
@@ -1773,7 +1774,7 @@
}
};
- auto parent = TestUtils::createNode(0, 0, 200, 200,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.insertReorderBarrier(true);
canvas.drawRenderNode(createWhiteRectShadowCaster(5.0f).get());
@@ -1814,7 +1815,7 @@
}
};
- auto parent = TestUtils::createNode(0, 0, 200, 200,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
// save/restore outside of reorderBarrier, so they don't get moved out of place
canvas.translate(20, 10);
@@ -1857,7 +1858,7 @@
}
};
- auto parent = TestUtils::createNode(50, 60, 150, 160,
+ auto parent = TestUtils::createNode<RecordingCanvas>(50, 60, 150, 160,
[](RenderProperties& props, RecordingCanvas& canvas) {
props.mutateLayerProperties().setType(LayerType::RenderLayer);
canvas.insertReorderBarrier(true);
@@ -1904,7 +1905,7 @@
EXPECT_TRUE(index == 2 || index == 3);
}
};
- auto parent = TestUtils::createNode(0, 0, 200, 200,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.insertReorderBarrier(true);
canvas.drawRenderNode(createWhiteRectShadowCaster(5.0f).get());
@@ -1931,7 +1932,7 @@
EXPECT_EQ(1, mIndex++);
}
};
- auto parent = TestUtils::createNode(0, 0, 100, 100,
+ auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[](RenderProperties& props, RecordingCanvas& canvas) {
// Apply a clip before the reorder barrier/shadow casting child is drawn.
// This clip must be applied to the shadow cast by the child.
@@ -1962,7 +1963,7 @@
std::function<void(const RectOp&, const BakedOpState&)> mCallback;
};
- auto node = TestUtils::createNode(0, 0, 100, 100,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
[propSetupCallback](RenderProperties& props, RecordingCanvas& canvas) {
propSetupCallback(props);
SkPaint paint;
@@ -2106,7 +2107,7 @@
ASSERT_GT(10000, DeviceInfo::get()->maxTextureSize())
<< "Node must be bigger than max texture size to exercise saveLayer codepath";
- auto node = TestUtils::createNode(0, 0, 10000, 10000,
+ auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 10000, 10000,
[&propSetupCallback](RenderProperties& properties, RecordingCanvas& canvas) {
properties.setHasOverlappingRendering(true);
properties.setAlpha(0.5f); // force saveLayer, since too big for HW layer
@@ -2192,7 +2193,7 @@
<< "Expect resolved clip to be intersection of viewport clip and clip op";
}
};
- auto node = TestUtils::createNode(20, 20, 30, 30,
+ auto node = TestUtils::createNode<RecordingCanvas>(20, 20, 30, 30,
[](RenderProperties& props, RecordingCanvas& canvas) {
canvas.clipRect(0, -20, 10, 30, SkRegion::kReplace_Op);
canvas.drawColor(SK_ColorWHITE, SkXfermode::Mode::kSrcOver_Mode);
diff --git a/libs/hwui/tests/unit/GlopBuilderTests.cpp b/libs/hwui/tests/unit/GlopBuilderTests.cpp
index 95543d3..67e58e2 100644
--- a/libs/hwui/tests/unit/GlopBuilderTests.cpp
+++ b/libs/hwui/tests/unit/GlopBuilderTests.cpp
@@ -85,9 +85,6 @@
}
static void expectGlopEq(Glop& expectedGlop, Glop& builtGlop) {
-#if !HWUI_NEW_OPS
- EXPECT_EQ(expectedGlop.bounds, builtGlop.bounds);
-#endif
expectBlendEq(expectedGlop.blend, builtGlop.blend);
expectFillEq(expectedGlop.fill, builtGlop.fill);
expectMeshEq(expectedGlop.mesh, builtGlop.mesh);
@@ -138,9 +135,6 @@
// unit quad also should be translate by additional (0.3, 0.3) to snap to exact pixels.
goldenGlop->transform.modelView.loadTranslate(1.3, 1.3, 0);
goldenGlop->transform.modelView.scale(99, 99, 1);
-#if !HWUI_NEW_OPS
- goldenGlop->bounds = android::uirenderer::Rect(1.70, 1.70, 100.70, 100.70);
-#endif
goldenGlop->transform.canvas = simpleTranslate;
goldenGlop->fill.texture.filter = GL_NEAREST;
expectGlopEq(*goldenGlop, glop);
diff --git a/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp b/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp
index 8b0e91c..4db1cb9 100644
--- a/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp
+++ b/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp
@@ -39,17 +39,21 @@
TEST(LayerUpdateQueue, enqueueSimple) {
sp<RenderNode> a = createSyncedNode(100, 100);
sp<RenderNode> b = createSyncedNode(200, 200);
+ sp<RenderNode> c = createSyncedNode(200, 200);
LayerUpdateQueue queue;
queue.enqueueLayerWithDamage(a.get(), Rect(25, 25, 75, 75));
queue.enqueueLayerWithDamage(b.get(), Rect(100, 100, 300, 300));
+ queue.enqueueLayerWithDamage(c.get(), Rect(.5, .5, .5, .5));
- EXPECT_EQ(2u, queue.entries().size());
+ EXPECT_EQ(3u, queue.entries().size());
EXPECT_EQ(a.get(), queue.entries()[0].renderNode);
EXPECT_EQ(Rect(25, 25, 75, 75), queue.entries()[0].damage);
EXPECT_EQ(b.get(), queue.entries()[1].renderNode);
EXPECT_EQ(Rect(100, 100, 200, 200), queue.entries()[1].damage); // clipped to bounds
+ EXPECT_EQ(c.get(), queue.entries()[2].renderNode);
+ EXPECT_EQ(Rect(0, 0, 1, 1), queue.entries()[2].damage); // rounded out
}
TEST(LayerUpdateQueue, enqueueUnion) {
diff --git a/libs/hwui/tests/unit/LeakCheckTests.cpp b/libs/hwui/tests/unit/LeakCheckTests.cpp
index 6148b33..06599dd 100644
--- a/libs/hwui/tests/unit/LeakCheckTests.cpp
+++ b/libs/hwui/tests/unit/LeakCheckTests.cpp
@@ -31,7 +31,7 @@
RENDERTHREAD_TEST(LeakCheck, saveLayer_overdrawRejection) {
auto node = TestUtils::createNode(0, 0, 100, 100,
- [](RenderProperties& props, RecordingCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
canvas.saveLayerAlpha(0, 0, 100, 100, 128, SaveFlags::ClipToLayer);
canvas.drawRect(0, 0, 100, 100, SkPaint());
canvas.restore();
@@ -51,7 +51,7 @@
RENDERTHREAD_TEST(LeakCheck, saveLayerUnclipped_simple) {
auto node = TestUtils::createNode(0, 0, 200, 200,
- [](RenderProperties& props, RecordingCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
canvas.saveLayerAlpha(10, 10, 190, 190, 128, (SaveFlags::Flags)(0));
canvas.drawRect(0, 0, 200, 200, SkPaint());
canvas.restore();
diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp
index a6eaa81..51797b4 100644
--- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp
+++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp
@@ -81,6 +81,27 @@
ASSERT_EQ(0u, dl->getOps().size()) << "Must be zero ops. Rect should be rejected.";
}
+TEST(RecordingCanvas, emptyPaintRejection) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ SkPaint emptyPaint;
+ emptyPaint.setColor(Color::Transparent);
+
+ float points[] = {0, 0, 200, 200};
+ canvas.drawPoints(points, 4, emptyPaint);
+ canvas.drawLines(points, 4, emptyPaint);
+ canvas.drawRect(0, 0, 200, 200, emptyPaint);
+ canvas.drawRegion(SkRegion(SkIRect::MakeWH(200, 200)), emptyPaint);
+ canvas.drawRoundRect(0, 0, 200, 200, 10, 10, emptyPaint);
+ canvas.drawCircle(100, 100, 100, emptyPaint);
+ canvas.drawOval(0, 0, 200, 200, emptyPaint);
+ canvas.drawArc(0, 0, 200, 200, 0, 360, true, emptyPaint);
+ SkPath path;
+ path.addRect(0, 0, 200, 200);
+ canvas.drawPath(path, emptyPaint);
+ });
+ EXPECT_EQ(0u, dl->getOps().size()) << "Op should be rejected";
+}
+
TEST(RecordingCanvas, drawArc) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.drawArc(0, 0, 200, 200, 0, 180, true, SkPaint());
@@ -340,6 +361,36 @@
EXPECT_EQ(3, count);
}
+TEST(RecordingCanvas, saveLayer_rounding) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(100, 100, [](RecordingCanvas& canvas) {
+ canvas.saveLayerAlpha(10.25f, 10.75f, 89.25f, 89.75f, 128, SaveFlags::ClipToLayer);
+ canvas.drawRect(20, 20, 80, 80, SkPaint());
+ canvas.restore();
+ });
+ int count = 0;
+ playbackOps(*dl, [&count](const RecordedOp& op) {
+ Matrix4 expectedMatrix;
+ switch(count++) {
+ case 0:
+ EXPECT_EQ(RecordedOpId::BeginLayerOp, op.opId);
+ EXPECT_EQ(Rect(10, 10, 90, 90), op.unmappedBounds) << "Expect bounds rounded out";
+ break;
+ case 1:
+ EXPECT_EQ(RecordedOpId::RectOp, op.opId);
+ expectedMatrix.loadTranslate(-10, -10, 0);
+ EXPECT_MATRIX_APPROX_EQ(expectedMatrix, op.localMatrix) << "Expect rounded offset";
+ break;
+ case 2:
+ EXPECT_EQ(RecordedOpId::EndLayerOp, op.opId);
+ // Don't bother asserting recording state data - it's not used
+ break;
+ default:
+ ADD_FAILURE();
+ }
+ });
+ EXPECT_EQ(3, count);
+}
+
TEST(RecordingCanvas, saveLayer_missingRestore) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.saveLayerAlpha(0, 0, 200, 200, 128, SaveFlags::ClipToLayer);
@@ -496,7 +547,7 @@
TEST(RecordingCanvas, drawRenderNode_rejection) {
auto child = TestUtils::createNode(50, 50, 150, 150,
- [](RenderProperties& props, RecordingCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
@@ -511,7 +562,7 @@
TEST(RecordingCanvas, drawRenderNode_projection) {
sp<RenderNode> background = TestUtils::createNode(50, 50, 150, 150,
- [](RenderProperties& props, RecordingCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
diff --git a/libs/hwui/tests/unit/RenderNodeTests.cpp b/libs/hwui/tests/unit/RenderNodeTests.cpp
index fb5be0f..fd3cf37 100644
--- a/libs/hwui/tests/unit/RenderNodeTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeTests.cpp
@@ -39,11 +39,11 @@
TEST(RenderNode, hasParents) {
auto child = TestUtils::createNode(0, 0, 200, 400,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
canvas.drawColor(Color::Red_500, SkXfermode::kSrcOver_Mode);
});
auto parent = TestUtils::createNode(0, 0, 200, 400,
- [&child](RenderProperties& props, TestCanvas& canvas) {
+ [&child](RenderProperties& props, Canvas& canvas) {
canvas.drawRenderNode(child.get());
});
@@ -52,7 +52,7 @@
EXPECT_TRUE(child->hasParents()) << "Child node has no parent";
EXPECT_FALSE(parent->hasParents()) << "Root node shouldn't have any parents";
- TestUtils::recordNode(*parent, [](TestCanvas& canvas) {
+ TestUtils::recordNode(*parent, [](Canvas& canvas) {
canvas.drawColor(Color::Amber_500, SkXfermode::kSrcOver_Mode);
});
@@ -81,14 +81,14 @@
Functor noopFunctor;
auto node = TestUtils::createNode(0, 0, 200, 400,
- [&](RenderProperties& props, TestCanvas& canvas) {
+ [&](RenderProperties& props, Canvas& canvas) {
refcnt++;
canvas.callDrawGLFunction(&noopFunctor, listener.get());
});
TestUtils::syncHierarchyPropertiesAndDisplayList(node);
EXPECT_EQ(1, refcnt);
- TestUtils::recordNode(*node, [&](TestCanvas& canvas) {
+ TestUtils::recordNode(*node, [&](Canvas& canvas) {
refcnt++;
canvas.callDrawGLFunction(&noopFunctor, listener.get());
});
@@ -97,23 +97,25 @@
TestUtils::syncHierarchyPropertiesAndDisplayList(node);
EXPECT_EQ(1, refcnt);
- TestUtils::recordNode(*node, [](TestCanvas& canvas) {});
+ TestUtils::recordNode(*node, [](Canvas& canvas) {});
EXPECT_EQ(1, refcnt);
TestUtils::syncHierarchyPropertiesAndDisplayList(node);
EXPECT_EQ(0, refcnt);
}
RENDERTHREAD_TEST(RenderNode, prepareTree_nullableDisplayList) {
+ auto rootNode = TestUtils::createNode(0, 0, 200, 400, nullptr);
ContextFactory contextFactory;
- CanvasContext canvasContext(renderThread, false, nullptr, &contextFactory);
- TreeInfo info(TreeInfo::MODE_RT_ONLY, canvasContext);
+ std::unique_ptr<CanvasContext> canvasContext(CanvasContext::create(
+ renderThread, false, rootNode.get(), &contextFactory));
+ TreeInfo info(TreeInfo::MODE_RT_ONLY, *canvasContext.get());
DamageAccumulator damageAccumulator;
info.damageAccumulator = &damageAccumulator;
info.observer = nullptr;
{
auto nonNullDLNode = TestUtils::createNode(0, 0, 200, 400,
- [](RenderProperties& props, TestCanvas& canvas) {
+ [](RenderProperties& props, Canvas& canvas) {
canvas.drawColor(Color::Red_500, SkXfermode::kSrcOver_Mode);
});
TestUtils::syncHierarchyPropertiesAndDisplayList(nonNullDLNode);
@@ -128,5 +130,5 @@
nullDLNode->prepareTree(info);
}
- canvasContext.destroy(nullptr);
+ canvasContext->destroy(nullptr);
}
diff --git a/libs/hwui/tests/unit/RenderPropertiesTests.cpp b/libs/hwui/tests/unit/RenderPropertiesTests.cpp
index 9001098..85655fc 100644
--- a/libs/hwui/tests/unit/RenderPropertiesTests.cpp
+++ b/libs/hwui/tests/unit/RenderPropertiesTests.cpp
@@ -42,7 +42,7 @@
props.setLeftTopRightBottom(0, 0, maxTextureSize + 1, maxTextureSize + 1);
ASSERT_FALSE(props.fitsOnLayer());
- // Too small - can't have 0 dimen layer
+ // Too small, but still 'fits'. Not fitting is an error case, so don't report empty as such.
props.setLeftTopRightBottom(0, 0, 100, 0);
- ASSERT_FALSE(props.fitsOnLayer());
+ ASSERT_TRUE(props.fitsOnLayer());
}
diff --git a/libs/hwui/thread/Barrier.h b/libs/hwui/thread/Barrier.h
index 0a7acb0..17f82ba9 100644
--- a/libs/hwui/thread/Barrier.h
+++ b/libs/hwui/thread/Barrier.h
@@ -24,7 +24,7 @@
class Barrier {
public:
- Barrier(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mOpened(false) { }
+ explicit Barrier(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mOpened(false) { }
~Barrier() { }
void open() {
diff --git a/libs/hwui/thread/Future.h b/libs/hwui/thread/Future.h
index a3ff3bc..177eebd 100644
--- a/libs/hwui/thread/Future.h
+++ b/libs/hwui/thread/Future.h
@@ -27,7 +27,7 @@
template<typename T>
class Future: public LightRefBase<Future<T> > {
public:
- Future(Condition::WakeUpType type = Condition::WAKE_UP_ONE): mBarrier(type), mResult() { }
+ explicit Future(Condition::WakeUpType type = Condition::WAKE_UP_ONE): mBarrier(type), mResult() { }
~Future() { }
/**
diff --git a/libs/hwui/thread/Signal.h b/libs/hwui/thread/Signal.h
index d4cfeeb..93e6f4c 100644
--- a/libs/hwui/thread/Signal.h
+++ b/libs/hwui/thread/Signal.h
@@ -26,7 +26,7 @@
class Signal {
public:
- Signal(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mSignaled(false) { }
+ explicit Signal(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mSignaled(false) { }
~Signal() { }
void signal() {
diff --git a/libs/hwui/thread/TaskManager.h b/libs/hwui/thread/TaskManager.h
index e4808f7..0e4ffdc 100644
--- a/libs/hwui/thread/TaskManager.h
+++ b/libs/hwui/thread/TaskManager.h
@@ -78,7 +78,7 @@
class WorkerThread: public Thread {
public:
- WorkerThread(const String8 name): mSignal(Condition::WAKE_UP_ONE), mName(name) { }
+ explicit WorkerThread(const String8 name): mSignal(Condition::WAKE_UP_ONE), mName(name) { }
bool addTask(const TaskWrapper& task);
size_t getTaskCount() const;
diff --git a/libs/hwui/thread/TaskProcessor.h b/libs/hwui/thread/TaskProcessor.h
index 82538e9..5867450 100644
--- a/libs/hwui/thread/TaskProcessor.h
+++ b/libs/hwui/thread/TaskProcessor.h
@@ -36,7 +36,7 @@
template<typename T>
class TaskProcessor: public TaskProcessorBase {
public:
- TaskProcessor(TaskManager* manager): mManager(manager) { }
+ explicit TaskProcessor(TaskManager* manager): mManager(manager) { }
virtual ~TaskProcessor() { }
void add(const sp<Task<T> >& task) {
diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp
index e0b2593..b879f78 100644
--- a/libs/hwui/utils/TestWindowContext.cpp
+++ b/libs/hwui/utils/TestWindowContext.cpp
@@ -16,7 +16,6 @@
#include "TestWindowContext.h"
#include "AnimationContext.h"
-#include "DisplayListCanvas.h"
#include "IContextFactory.h"
#include "RecordingCanvas.h"
#include "RenderNode.h"
@@ -89,11 +88,7 @@
android::uirenderer::Vector3 lightVector { lightX, -200.0f, 800.0f };
mProxy->setup(800.0f, 255 * 0.075f, 255 * 0.15f);
mProxy->setLightCenter(lightVector);
-#if HWUI_NEW_OPS
mCanvas.reset(new android::uirenderer::RecordingCanvas(mSize.width(), mSize.height()));
-#else
- mCanvas.reset(new android::uirenderer::DisplayListCanvas(mSize.width(), mSize.height()));
-#endif
}
SkCanvas* prepareToDraw() {
@@ -171,11 +166,7 @@
std::unique_ptr<android::uirenderer::RenderNode> mRootNode;
std::unique_ptr<android::uirenderer::renderthread::RenderProxy> mProxy;
-#if HWUI_NEW_OPS
std::unique_ptr<android::uirenderer::RecordingCanvas> mCanvas;
-#else
- std::unique_ptr<android::uirenderer::DisplayListCanvas> mCanvas;
-#endif
android::sp<android::IGraphicBufferProducer> mProducer;
android::sp<android::IGraphicBufferConsumer> mConsumer;
android::sp<android::CpuConsumer> mCpuConsumer;
diff --git a/libs/hwui/utils/TimeUtils.h b/libs/hwui/utils/TimeUtils.h
index 8d42d7e..ce181b7 100644
--- a/libs/hwui/utils/TimeUtils.h
+++ b/libs/hwui/utils/TimeUtils.h
@@ -21,10 +21,18 @@
namespace android {
namespace uirenderer {
+constexpr nsecs_t operator"" _s (unsigned long long s) {
+ return seconds_to_nanoseconds(s);
+}
+
constexpr nsecs_t operator"" _ms (unsigned long long ms) {
return milliseconds_to_nanoseconds(ms);
}
+constexpr nsecs_t operator"" _us (unsigned long long us) {
+ return microseconds_to_nanoseconds(us);
+}
+
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/usb/tests/accessorytest/audio.c b/libs/usb/tests/accessorytest/audio.c
index d23d9b3..36ee6b8 100644
--- a/libs/usb/tests/accessorytest/audio.c
+++ b/libs/usb/tests/accessorytest/audio.c
@@ -164,7 +164,6 @@
static void* play_thread(void* arg)
{
struct pcm *pcm = arg;
- char *buffer;
int index, err;
fprintf(stderr, "play_thread start\n");
@@ -181,7 +180,6 @@
fprintf(stderr, "play_thread done\n");
pcm_close(pcm);
- free(buffer);
return NULL;
}
diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java
index 3151694..7db0466 100644
--- a/location/java/android/location/GnssMeasurementsEvent.java
+++ b/location/java/android/location/GnssMeasurementsEvent.java
@@ -98,13 +98,13 @@
throw new InvalidParameterException("Parameter 'clock' must not be null.");
}
if (measurements == null || measurements.length == 0) {
- throw new InvalidParameterException(
- "Parameter 'measurements' must not be null or empty.");
+ mReadOnlyMeasurements = Collections.emptyList();
+ } else {
+ Collection<GnssMeasurement> measurementCollection = Arrays.asList(measurements);
+ mReadOnlyMeasurements = Collections.unmodifiableCollection(measurementCollection);
}
mClock = clock;
- Collection<GnssMeasurement> measurementCollection = Arrays.asList(measurements);
- mReadOnlyMeasurements = Collections.unmodifiableCollection(measurementCollection);
}
/**
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java
index a4484e7..81cc93d 100644
--- a/media/java/android/media/AudioFormat.java
+++ b/media/java/android/media/AudioFormat.java
@@ -263,6 +263,9 @@
* on some platforms when converting to short internally.
*/
public static final int ENCODING_IEC61937 = 13;
+ /** Audio data format: DOLBY TRUEHD compressed
+ **/
+ public static final int ENCODING_DOLBY_TRUEHD = 14;
/** Invalid audio channel configuration */
/** @deprecated Use {@link #CHANNEL_INVALID} instead. */
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 4bdc70e..f19a262 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -2744,6 +2744,7 @@
* to be notified.
* Use {@link AudioManager#getActiveRecordingConfigurations()} to query the current
* configuration.
+ * @see AudioRecordingConfiguration
*/
public static abstract class AudioRecordingCallback {
/**
@@ -2850,6 +2851,7 @@
* Returns the current active audio recording configurations of the device.
* @return a non-null list of recording configurations. An empty list indicates there is
* no recording active when queried.
+ * @see AudioRecordingConfiguration
*/
public @NonNull List<AudioRecordingConfiguration> getActiveRecordingConfigurations() {
final IAudioService service = getService();
diff --git a/media/java/android/media/AudioRecordingConfiguration.java b/media/java/android/media/AudioRecordingConfiguration.java
index 5935166..50dbd03 100644
--- a/media/java/android/media/AudioRecordingConfiguration.java
+++ b/media/java/android/media/AudioRecordingConfiguration.java
@@ -28,8 +28,18 @@
/**
* The AudioRecordingConfiguration class collects the information describing an audio recording
- * session. This information is returned through the
- * {@link AudioManager#getActiveRecordingConfigurations()} method.
+ * session.
+ * <p>Direct polling (see {@link AudioManager#getActiveRecordingConfigurations()}) or callback
+ * (see {@link AudioManager#registerAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback, android.os.Handler)}
+ * methods are ways to receive information about the current recording configuration of the device.
+ * <p>An audio recording configuration contains information about the recording format as used by
+ * the application ({@link #getClientFormat()}, as well as the recording format actually used by
+ * the device ({@link #getFormat()}). The two recording formats may, for instance, be at different
+ * sampling rates due to hardware limitations (e.g. application recording at 44.1kHz whereas the
+ * device always records at 48kHz, and the Android framework resamples for the application).
+ * <p>The configuration also contains the use case for which audio is recorded
+ * ({@link #getClientAudioSource()}), enabling the ability to distinguish between different
+ * activities such as ongoing voice recognition or camcorder recording.
*
*/
public final class AudioRecordingConfiguration implements Parcelable {
@@ -47,12 +57,12 @@
/**
* @hide
*/
- public AudioRecordingConfiguration(int session, int source, AudioFormat devFormat,
- AudioFormat clientFormat, int patchHandle) {
+ public AudioRecordingConfiguration(int session, int source, AudioFormat clientFormat,
+ AudioFormat devFormat, int patchHandle) {
mSessionId = session;
mClientSource = source;
- mDeviceFormat = devFormat;
mClientFormat = clientFormat;
+ mDeviceFormat = devFormat;
mPatchHandle = patchHandle;
}
@@ -198,4 +208,4 @@
&& (mClientFormat.equals(that.mClientFormat))
&& (mDeviceFormat.equals(that.mDeviceFormat)));
}
-}
\ No newline at end of file
+}
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 0e7f995..dad6701 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -42,6 +42,7 @@
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@@ -67,8 +68,9 @@
public class ExifInterface {
private static final String TAG = "ExifInterface";
private static final boolean DEBUG = false;
+ private static final boolean HANDLE_RAW = false;
- // The Exif tag names
+ // The Exif tag names. See Tiff 6.0 Section 3 and Section 8.
/** Type is String. */
public static final String TAG_ARTIST = "Artist";
/** Type is int. */
@@ -213,6 +215,8 @@
public static final String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";
/** Type is int. */
public static final String TAG_METERING_MODE = "MeteringMode";
+ /** Type is int. */
+ public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
/** Type is String. */
public static final String TAG_OECF = "OECF";
/** Type is int. */
@@ -237,6 +241,8 @@
public static final String TAG_SPATIAL_FREQUENCY_RESPONSE = "SpatialFrequencyResponse";
/** Type is String. */
public static final String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";
+ /** Type is int. */
+ public static final String TAG_SUBFILE_TYPE = "SubfileType";
/** Type is String. */
public static final String TAG_SUBSEC_TIME = "SubSecTime";
/**
@@ -341,17 +347,68 @@
public static final String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";
/** Type is int. */
public static final String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";
+ /** Type is int. DNG Specification 1.4.0.0. Section 4 */
+ public static final String TAG_DEFAULT_CROP_SIZE = "DefaultCropSize";
+ /** Type is undefined. See Olympus MakerNote tags in http://www.exiv2.org/tags-olympus.html. */
+ public static final String TAG_ORF_THUMBNAIL_IMAGE = "ThumbnailImage";
+ /** Type is int. See Olympus Camera Settings tags in http://www.exiv2.org/tags-olympus.html. */
+ public static final String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";
+ /** Type is int. See Olympus Camera Settings tags in http://www.exiv2.org/tags-olympus.html. */
+ public static final String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";
+ /** Type is int. See Olympus Image Processing tags in http://www.exiv2.org/tags-olympus.html. */
+ public static final String TAG_ORF_ASPECT_FRAME = "AspectFrame";
+ /**
+ * Type is int. See PanasonicRaw tags in
+ * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html
+ */
+ public static final String TAG_RW2_SENSOR_BOTTOM_BORDER = "SensorBottomBorder";
+ /**
+ * Type is int. See PanasonicRaw tags in
+ * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html
+ */
+ public static final String TAG_RW2_SENSOR_LEFT_BORDER = "SensorLeftBorder";
+ /**
+ * Type is int. See PanasonicRaw tags in
+ * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html
+ */
+ public static final String TAG_RW2_SENSOR_RIGHT_BORDER = "SensorRightBorder";
+ /**
+ * Type is int. See PanasonicRaw tags in
+ * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html
+ */
+ public static final String TAG_RW2_SENSOR_TOP_BORDER = "SensorTopBorder";
+ /**
+ * Type is int. See PanasonicRaw tags in
+ * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html
+ */
+ public static final String TAG_RW2_ISO = "ISO";
+ /**
+ * Type is undefined. See PanasonicRaw tags in
+ * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html
+ */
+ public static final String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";
- // Private tags used for pointing the other IFD offset. The types of the following tags are int.
+ /**
+ * Private tags used for pointing the other IFD offsets.
+ * The types of the following tags are int.
+ * See JEITA CP-3451C Section 4.6.3: Exif-specific IFD.
+ * For SubIFD, see Note 1 of Adobe PageMaker® 6.0 TIFF Technical Notes.
+ */
private static final String TAG_EXIF_IFD_POINTER = "ExifIFDPointer";
private static final String TAG_GPS_INFO_IFD_POINTER = "GPSInfoIFDPointer";
private static final String TAG_INTEROPERABILITY_IFD_POINTER = "InteroperabilityIFDPointer";
+ private static final String TAG_SUB_IFD_POINTER = "SubIFDPointer";
+ // Proprietary pointer tags used for ORF files.
+ // See http://www.exiv2.org/tags-olympus.html
+ private static final String TAG_ORF_CAMERA_SETTINGS_IFD_POINTER = "CameraSettingsIFDPointer";
+ private static final String TAG_ORF_IMAGE_PROCESSING_IFD_POINTER = "ImageProcessingIFDPointer";
// Private tags used for thumbnail information.
private static final String TAG_HAS_THUMBNAIL = "HasThumbnail";
private static final String TAG_THUMBNAIL_OFFSET = "ThumbnailOffset";
private static final String TAG_THUMBNAIL_LENGTH = "ThumbnailLength";
private static final String TAG_THUMBNAIL_DATA = "ThumbnailData";
+ private static final int MAX_THUMBNAIL_SIZE = 512;
// Constants used for the Orientation Exif tag.
public static final int ORIENTATION_UNDEFINED = 0;
@@ -370,8 +427,36 @@
public static final int WHITEBALANCE_AUTO = 0;
public static final int WHITEBALANCE_MANUAL = 1;
+ // Maximum size for checking file type signature (see image_type_recognition_lite.cc)
+ private static final int SIGNATURE_CHECK_SIZE = 5000;
+
private static final byte[] JPEG_SIGNATURE = new byte[] {(byte) 0xff, (byte) 0xd8, (byte) 0xff};
- private static final int JPEG_SIGNATURE_SIZE = 3;
+ private static final String RAF_SIGNATURE = "FUJIFILMCCD-RAW";
+ private static final int RAF_OFFSET_TO_JPEG_IMAGE_OFFSET = 84;
+ private static final int RAF_INFO_SIZE = 160;
+ private static final int RAF_JPEG_LENGTH_VALUE_SIZE = 4;
+
+ // See http://fileformats.archiveteam.org/wiki/Olympus_ORF
+ private static final short ORF_SIGNATURE_1 = 0x4f52;
+ private static final short ORF_SIGNATURE_2 = 0x5352;
+ // There are two formats for Olympus Makernote Headers. Each has different identifiers and
+ // offsets to the actual data.
+ // See http://www.exiv2.org/makernote.html#R1
+ private static final byte[] ORF_MAKER_NOTE_HEADER_1 = new byte[] {(byte) 0x4f, (byte) 0x4c,
+ (byte) 0x59, (byte) 0x4d, (byte) 0x50, (byte) 0x00}; // "OLYMP\0"
+ private static final byte[] ORF_MAKER_NOTE_HEADER_2 = new byte[] {(byte) 0x4f, (byte) 0x4c,
+ (byte) 0x59, (byte) 0x4d, (byte) 0x50, (byte) 0x55, (byte) 0x53, (byte) 0x00,
+ (byte) 0x49, (byte) 0x49}; // "OLYMPUS\0II"
+ private static final int ORF_MAKER_NOTE_HEADER_1_SIZE = 8;
+ private static final int ORF_MAKER_NOTE_HEADER_2_SIZE = 12;
+
+ // See http://fileformats.archiveteam.org/wiki/RW2
+ private static final short RW2_SIGNATURE = 0x0055;
+
+ // See http://fileformats.archiveteam.org/wiki/Pentax_PEF
+ private static final String PEF_SIGNATURE = "PENTAX";
+ // See http://www.exiv2.org/makernote.html#R11
+ private static final int PEF_MAKER_NOTE_SKIP_SIZE = 6;
private static SimpleDateFormat sFormatter;
@@ -380,11 +465,15 @@
// They are called "Image File Directory". They have multiple data formats to cover various
// image metadata from GPS longitude to camera model name.
- // Types of Exif byte alignments (see JEITA CP-3451 page 10)
+ // Types of Exif byte alignments (see JEITA CP-3451C Section 4.5.2)
private static final short BYTE_ALIGN_II = 0x4949; // II: Intel order
private static final short BYTE_ALIGN_MM = 0x4d4d; // MM: Motorola order
- // Formats for the value in IFD entry (See TIFF 6.0 spec Types page 15).
+ // TIFF Header Fixed Constant (see JEITA CP-3451C Section 4.5.2)
+ private static final byte START_CODE = 0x2a; // 42
+ private static final int IFD_OFFSET = 8;
+
+ // Formats for the value in IFD entry (See TIFF 6.0 Section 2, "Image File Directory".)
private static final int IFD_FORMAT_BYTE = 1;
private static final int IFD_FORMAT_STRING = 2;
private static final int IFD_FORMAT_USHORT = 3;
@@ -397,6 +486,8 @@
private static final int IFD_FORMAT_SRATIONAL = 10;
private static final int IFD_FORMAT_SINGLE = 11;
private static final int IFD_FORMAT_DOUBLE = 12;
+ // Format indicating a new IFD entry (See Adobe PageMaker® 6.0 TIFF Technical Notes, "New Tag")
+ private static final int IFD_FORMAT_IFD = 13;
// Names for the data formats for debugging purpose.
private static final String[] IFD_FORMAT_NAMES = new String[] {
"", "BYTE", "STRING", "USHORT", "ULONG", "URATIONAL", "SBYTE", "UNDEFINED", "SSHORT",
@@ -404,12 +495,33 @@
};
// Sizes of the components of each IFD value format
private static final int[] IFD_FORMAT_BYTES_PER_FORMAT = new int[] {
- 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8
+ 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 1
};
private static final byte[] EXIF_ASCII_PREFIX = new byte[] {
0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0
};
+ /**
+ * Constants used for Compression tag.
+ * For Value 1, 2, 32773, see TIFF 6.0 Spec Section 3: Bilevel Images, Compression
+ * For Value 6, see TIFF 6.0 Spec Section 22: JPEG Compression, Extensions to Existing Fields
+ * For Value 7, 8, 34892, see DNG Specification 1.4.0.0. Section 3, Compression
+ */
+ private static final int DATA_UNCOMPRESSED = 1;
+ private static final int DATA_HUFFMAN_COMPRESSED = 2;
+ private static final int DATA_JPEG = 6;
+ private static final int DATA_JPEG_COMPRESSED = 7;
+ private static final int DATA_DEFLATE_ZIP = 8;
+ private static final int DATA_PACK_BITS_COMPRESSED = 32773;
+ private static final int DATA_LOSSY_JPEG = 34892;
+
+ /**
+ * Constants used for NewSubfileType tag.
+ * See TIFF 6.0 Spec Section 8
+ * */
+ private static final int ORIGINAL_RESOLUTION_IMAGE = 0;
+ private static final int REDUCED_RESOLUTION_IMAGE = 1;
+
// A class for indicating EXIF rational type.
private static class Rational {
public final long numerator;
@@ -814,8 +926,11 @@
}
}
- // Primary image IFD TIFF tags (See JEITA CP-3451 Table 14. page 54).
+ // Primary image IFD TIFF tags (See JEITA CP-3451C Section 4.6.8 Tag Support Levels)
private static final ExifTag[] IFD_TIFF_TAGS = new ExifTag[] {
+ // For below two, see TIFF 6.0 Spec Section 3: Bilevel Images.
+ new ExifTag(TAG_NEW_SUBFILE_TYPE, 254, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_SUBFILE_TYPE, 255, IFD_FORMAT_ULONG),
new ExifTag(TAG_IMAGE_WIDTH, 256, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
new ExifTag(TAG_IMAGE_LENGTH, 257, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
new ExifTag(TAG_BITS_PER_SAMPLE, 258, IFD_FORMAT_USHORT),
@@ -839,6 +954,8 @@
new ExifTag(TAG_ARTIST, 315, IFD_FORMAT_STRING),
new ExifTag(TAG_WHITE_POINT, 318, IFD_FORMAT_URATIONAL),
new ExifTag(TAG_PRIMARY_CHROMATICITIES, 319, IFD_FORMAT_URATIONAL),
+ // See Adobe PageMaker® 6.0 TIFF Technical Notes, Note 1.
+ new ExifTag(TAG_SUB_IFD_POINTER, 330, IFD_FORMAT_ULONG),
new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, 513, IFD_FORMAT_ULONG),
new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, IFD_FORMAT_ULONG),
new ExifTag(TAG_Y_CB_CR_COEFFICIENTS, 529, IFD_FORMAT_URATIONAL),
@@ -848,9 +965,17 @@
new ExifTag(TAG_COPYRIGHT, 33432, IFD_FORMAT_STRING),
new ExifTag(TAG_EXIF_IFD_POINTER, 34665, IFD_FORMAT_ULONG),
new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG),
+ // RW2 file tags
+ // See http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PanasonicRaw.html)
+ new ExifTag(TAG_RW2_SENSOR_TOP_BORDER, 4, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_RW2_SENSOR_LEFT_BORDER, 5, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_RW2_SENSOR_BOTTOM_BORDER, 6, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_RW2_SENSOR_RIGHT_BORDER, 7, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_RW2_ISO, 23, IFD_FORMAT_USHORT),
+ new ExifTag(TAG_RW2_JPG_FROM_RAW, 46, IFD_FORMAT_UNDEFINED)
};
- // Primary image IFD Exif Private tags (See JEITA CP-3451 Table 15. page 55).
+ // Primary image IFD Exif Private tags (See JEITA CP-3451C Section 4.6.8 Tag Support Levels)
private static final ExifTag[] IFD_EXIF_TAGS = new ExifTag[] {
new ExifTag(TAG_EXPOSURE_TIME, 33434, IFD_FORMAT_URATIONAL),
new ExifTag(TAG_F_NUMBER, 33437, IFD_FORMAT_URATIONAL),
@@ -909,9 +1034,10 @@
new ExifTag(TAG_DEVICE_SETTING_DESCRIPTION, 41995, IFD_FORMAT_UNDEFINED),
new ExifTag(TAG_SUBJECT_DISTANCE_RANGE, 41996, IFD_FORMAT_USHORT),
new ExifTag(TAG_IMAGE_UNIQUE_ID, 42016, IFD_FORMAT_STRING),
+ new ExifTag(TAG_DEFAULT_CROP_SIZE, 50720, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG)
};
- // Primary image IFD GPS Info tags (See JEITA CP-3451 Table 16. page 56).
+ // Primary image IFD GPS Info tags (See JEITA CP-3451C Section 4.6.8 Tag Support Levels)
private static final ExifTag[] IFD_GPS_TAGS = new ExifTag[] {
new ExifTag(TAG_GPS_VERSION_ID, 0, IFD_FORMAT_BYTE),
new ExifTag(TAG_GPS_LATITUDE_REF, 1, IFD_FORMAT_STRING),
@@ -943,14 +1069,17 @@
new ExifTag(TAG_GPS_PROCESSING_METHOD, 27, IFD_FORMAT_UNDEFINED),
new ExifTag(TAG_GPS_AREA_INFORMATION, 28, IFD_FORMAT_UNDEFINED),
new ExifTag(TAG_GPS_DATESTAMP, 29, IFD_FORMAT_STRING),
- new ExifTag(TAG_GPS_DIFFERENTIAL, 30, IFD_FORMAT_USHORT),
+ new ExifTag(TAG_GPS_DIFFERENTIAL, 30, IFD_FORMAT_USHORT)
};
- // Primary image IFD Interoperability tag (See JEITA CP-3451 Table 17. page 56).
+ // Primary image IFD Interoperability tag (See JEITA CP-3451C Section 4.6.8 Tag Support Levels)
private static final ExifTag[] IFD_INTEROPERABILITY_TAGS = new ExifTag[] {
- new ExifTag(TAG_INTEROPERABILITY_INDEX, 1, IFD_FORMAT_STRING),
+ new ExifTag(TAG_INTEROPERABILITY_INDEX, 1, IFD_FORMAT_STRING)
};
- // IFD Thumbnail tags (See JEITA CP-3451 Table 18. page 57).
+ // IFD Thumbnail tags (See JEITA CP-3451C Section 4.6.8 Tag Support Levels)
private static final ExifTag[] IFD_THUMBNAIL_TAGS = new ExifTag[] {
+ // For below two, see TIFF 6.0 Spec Section 3: Bilevel Images.
+ new ExifTag(TAG_NEW_SUBFILE_TYPE, 254, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_SUBFILE_TYPE, 255, IFD_FORMAT_ULONG),
new ExifTag(TAG_THUMBNAIL_IMAGE_WIDTH, 256, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
new ExifTag(TAG_THUMBNAIL_IMAGE_LENGTH, 257, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
new ExifTag(TAG_BITS_PER_SAMPLE, 258, IFD_FORMAT_USHORT),
@@ -959,7 +1088,7 @@
new ExifTag(TAG_IMAGE_DESCRIPTION, 270, IFD_FORMAT_STRING),
new ExifTag(TAG_MAKE, 271, IFD_FORMAT_STRING),
new ExifTag(TAG_MODEL, 272, IFD_FORMAT_STRING),
- new ExifTag(TAG_STRIP_OFFSETS, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_STRIP_OFFSETS, 273, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
new ExifTag(TAG_ORIENTATION, 274, IFD_FORMAT_USHORT),
new ExifTag(TAG_SAMPLES_PER_PIXEL, 277, IFD_FORMAT_USHORT),
new ExifTag(TAG_ROWS_PER_STRIP, 278, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
@@ -974,6 +1103,8 @@
new ExifTag(TAG_ARTIST, 315, IFD_FORMAT_STRING),
new ExifTag(TAG_WHITE_POINT, 318, IFD_FORMAT_URATIONAL),
new ExifTag(TAG_PRIMARY_CHROMATICITIES, 319, IFD_FORMAT_URATIONAL),
+ // See Adobe PageMaker® 6.0 TIFF Technical Notes, Note 1.
+ new ExifTag(TAG_SUB_IFD_POINTER, 330, IFD_FORMAT_ULONG),
new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, 513, IFD_FORMAT_ULONG),
new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, IFD_FORMAT_ULONG),
new ExifTag(TAG_Y_CB_CR_COEFFICIENTS, 529, IFD_FORMAT_URATIONAL),
@@ -982,11 +1113,33 @@
new ExifTag(TAG_REFERENCE_BLACK_WHITE, 532, IFD_FORMAT_URATIONAL),
new ExifTag(TAG_COPYRIGHT, 33432, IFD_FORMAT_STRING),
new ExifTag(TAG_EXIF_IFD_POINTER, 34665, IFD_FORMAT_ULONG),
- new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG)
};
- // See JEITA CP-3451 Figure 5. page 9.
- // The following values are used for indicating pointers to the other Image File Directorys.
+ // RAF file tag (See piex.cc line 372)
+ private static final ExifTag TAG_RAF_IMAGE_SIZE =
+ new ExifTag(TAG_STRIP_OFFSETS, 273, IFD_FORMAT_USHORT);
+
+ // ORF file tags (See http://www.exiv2.org/tags-olympus.html)
+ private static final ExifTag[] ORF_MAKER_NOTE_TAGS = new ExifTag[] {
+ new ExifTag(TAG_ORF_THUMBNAIL_IMAGE, 256, IFD_FORMAT_UNDEFINED),
+ new ExifTag(TAG_ORF_CAMERA_SETTINGS_IFD_POINTER, 8224, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_ORF_IMAGE_PROCESSING_IFD_POINTER, 8256, IFD_FORMAT_ULONG)
+ };
+ private static final ExifTag[] ORF_CAMERA_SETTINGS_TAGS = new ExifTag[] {
+ new ExifTag(TAG_ORF_PREVIEW_IMAGE_START, 257, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_ORF_PREVIEW_IMAGE_LENGTH, 258, IFD_FORMAT_ULONG)
+ };
+ private static final ExifTag[] ORF_IMAGE_PROCESSING_TAGS = new ExifTag[] {
+ new ExifTag(TAG_ORF_ASPECT_FRAME, 4371, IFD_FORMAT_USHORT)
+ };
+ // PEF file tag (See http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Pentax.html)
+ private static final ExifTag[] PEF_TAGS = new ExifTag[] {
+ new ExifTag(TAG_COLOR_SPACE, 55, IFD_FORMAT_USHORT)
+ };
+
+ // See JEITA CP-3451C Section 4.6.3: Exif-specific IFD.
+ // The following values are used for indicating pointers to the other Image File Directories.
// Indices of Exif Ifd tag groups
private static final int IFD_TIFF_HINT = 0;
@@ -994,20 +1147,30 @@
private static final int IFD_GPS_HINT = 2;
private static final int IFD_INTEROPERABILITY_HINT = 3;
private static final int IFD_THUMBNAIL_HINT = 4;
+ private static final int IFD_PREVIEW_HINT = 5;
+ private static final int ORF_MAKER_NOTE_HINT = 6;
+ private static final int ORF_CAMERA_SETTINGS_HINT = 7;
+ private static final int ORF_IMAGE_PROCESSING_HINT = 8;
+ private static final int PEF_HINT = 9;
// List of Exif tag groups
private static final ExifTag[][] EXIF_TAGS = new ExifTag[][] {
IFD_TIFF_TAGS, IFD_EXIF_TAGS, IFD_GPS_TAGS, IFD_INTEROPERABILITY_TAGS,
- IFD_THUMBNAIL_TAGS
+ IFD_THUMBNAIL_TAGS, IFD_TIFF_TAGS, ORF_MAKER_NOTE_TAGS, ORF_CAMERA_SETTINGS_TAGS,
+ ORF_IMAGE_PROCESSING_TAGS, PEF_TAGS
};
// List of tags for pointing to the other image file directory offset.
- private static final ExifTag[] IFD_POINTER_TAGS = new ExifTag[] {
+ private static final ExifTag[] EXIF_POINTER_TAGS = new ExifTag[] {
+ new ExifTag(TAG_SUB_IFD_POINTER, 330, IFD_FORMAT_ULONG),
new ExifTag(TAG_EXIF_IFD_POINTER, 34665, IFD_FORMAT_ULONG),
new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG),
new ExifTag(TAG_INTEROPERABILITY_IFD_POINTER, 40965, IFD_FORMAT_ULONG),
+ new ExifTag(TAG_ORF_CAMERA_SETTINGS_IFD_POINTER, 8224, IFD_FORMAT_BYTE),
+ new ExifTag(TAG_ORF_IMAGE_PROCESSING_IFD_POINTER, 8256, IFD_FORMAT_BYTE)
};
- // List of indices of the indicated tag groups according to the IFD_POINTER_TAGS
- private static final int[] IFD_POINTER_TAG_HINTS = new int[] {
- IFD_EXIF_HINT, IFD_GPS_HINT, IFD_INTEROPERABILITY_HINT
+ // List of indices of the indicated tag groups according to the EXIF_POINTER_TAGS
+ private static final int[] EXIF_POINTER_TAG_HINTS = new int[] {
+ IFD_TIFF_HINT, IFD_EXIF_HINT, IFD_GPS_HINT, IFD_INTEROPERABILITY_HINT,
+ ORF_CAMERA_SETTINGS_HINT, ORF_IMAGE_PROCESSING_HINT
};
// Tags for indicating the thumbnail offset and length
private static final ExifTag JPEG_INTERCHANGE_FORMAT_TAG =
@@ -1054,6 +1217,20 @@
private static final byte MARKER_COM = (byte) 0xfe;
private static final byte MARKER_EOI = (byte) 0xd9;
+ // Supported Image File Types
+ private static final int IMAGE_TYPE_UNKNOWN = 0;
+ private static final int IMAGE_TYPE_ARW = 1;
+ private static final int IMAGE_TYPE_CR2 = 2;
+ private static final int IMAGE_TYPE_DNG = 3;
+ private static final int IMAGE_TYPE_JPEG = 4;
+ private static final int IMAGE_TYPE_NEF = 5;
+ private static final int IMAGE_TYPE_NRW = 6;
+ private static final int IMAGE_TYPE_ORF = 7;
+ private static final int IMAGE_TYPE_PEF = 8;
+ private static final int IMAGE_TYPE_RAF = 9;
+ private static final int IMAGE_TYPE_RW2 = 10;
+ private static final int IMAGE_TYPE_SRW = 11;
+
static {
System.loadLibrary("media_jni");
nativeInitRaw();
@@ -1076,6 +1253,7 @@
private final AssetManager.AssetInputStream mAssetInputStream;
private final boolean mIsInputStream;
private boolean mIsRaw;
+ private int mMimeType;
private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length];
private ByteOrder mExifByteOrder = ByteOrder.BIG_ENDIAN;
private boolean mHasThumbnail;
@@ -1083,6 +1261,11 @@
private int mThumbnailOffset;
private int mThumbnailLength;
private byte[] mThumbnailBytes;
+ private int mExifOffset;
+ private int mOrfMakerNoteOffset;
+ private int mOrfThumbnailOffset;
+ private int mOrfThumbnailLength;
+ private int mRw2JpgFromRawOffset;
// Pattern to check non zero timestamp
private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*");
@@ -1451,33 +1634,79 @@
mAttributes[i] = new HashMap();
}
- // Process RAW input stream
- if (mAssetInputStream != null) {
- long asset = mAssetInputStream.getNativeAsset();
- if (handleRawResult(nativeGetRawAttributesFromAsset(asset))) {
- return;
- }
- } else if (mSeekableFileDescriptor != null) {
- if (handleRawResult(nativeGetRawAttributesFromFileDescriptor(
- mSeekableFileDescriptor))) {
- return;
- }
- } else {
- in = new BufferedInputStream(in, JPEG_SIGNATURE_SIZE);
- if (!isJpegInputStream((BufferedInputStream) in) && handleRawResult(
- nativeGetRawAttributesFromInputStream(in))) {
- return;
- }
- }
+ if (HANDLE_RAW) {
+ // Check file type
+ in = new BufferedInputStream(in, SIGNATURE_CHECK_SIZE);
+ mMimeType = getMimeType((BufferedInputStream) in);
- // Process JPEG input stream
- getJpegAttributes(in);
+ switch (mMimeType) {
+ case IMAGE_TYPE_JPEG: {
+ getJpegAttributes(in, 0, IFD_TIFF_HINT); // 0 is offset
+ break;
+ }
+ case IMAGE_TYPE_RAF: {
+ getRafAttributes(in);
+ break;
+ }
+ case IMAGE_TYPE_ORF: {
+ getOrfAttributes(in);
+ break;
+ }
+ case IMAGE_TYPE_RW2: {
+ getRw2Attributes(in);
+ break;
+ }
+ case IMAGE_TYPE_ARW:
+ case IMAGE_TYPE_CR2:
+ case IMAGE_TYPE_DNG:
+ case IMAGE_TYPE_NEF:
+ case IMAGE_TYPE_NRW:
+ case IMAGE_TYPE_PEF:
+ case IMAGE_TYPE_SRW:
+ case IMAGE_TYPE_UNKNOWN: {
+ getRawAttributes(in);
+ break;
+ }
+ default: {
+ break;
+ }
+ }
+ // Set thumbnail image offset and length
+ setThumbnailData(in);
+ } else {
+ if (mAssetInputStream != null) {
+ long asset = mAssetInputStream.getNativeAsset();
+ if (handleRawResult(nativeGetRawAttributesFromAsset(asset))) {
+ return;
+ }
+ } else if (mSeekableFileDescriptor != null) {
+ if (handleRawResult(nativeGetRawAttributesFromFileDescriptor(
+ mSeekableFileDescriptor))) {
+ return;
+ }
+ } else {
+ in.mark(JPEG_SIGNATURE.length);
+ byte[] signatureBytes = new byte[JPEG_SIGNATURE.length];
+ if (in.read(signatureBytes) != JPEG_SIGNATURE.length) {
+ throw new EOFException();
+ }
+ in.reset();
+ if (!isJpegFormat(signatureBytes) && handleRawResult(
+ nativeGetRawAttributesFromInputStream(in))) {
+ return;
+ }
+ }
+ // Process JPEG input stream
+ getJpegAttributes(in, 0, IFD_TIFF_HINT);
+ }
} catch (IOException e) {
// Ignore exceptions in order to keep the compatibility with the old versions of
// ExifInterface.
- Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file"
- + "(ExifInterface supports JPEG and some RAW image formats only) "
- + "or a corrupted JPEG file to ExifInterface.", e);
+ if (DEBUG) {
+ Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file"
+ + "(ExifInterface supports JPEG and some RAW image formats only) "
+ + "or a corrupted JPEG file to ExifInterface.", e);
+ }
} finally {
addDefaultValuesForCompatibility();
@@ -1487,19 +1716,11 @@
}
}
- private static boolean isJpegInputStream(BufferedInputStream in) throws IOException {
- in.mark(JPEG_SIGNATURE_SIZE);
- byte[] signatureBytes = new byte[JPEG_SIGNATURE_SIZE];
- if (in.read(signatureBytes) != JPEG_SIGNATURE_SIZE) {
- throw new EOFException();
- }
- boolean isJpeg = Arrays.equals(JPEG_SIGNATURE, signatureBytes);
- in.reset();
- return isJpeg;
- }
-
private boolean handleRawResult(HashMap map) {
if (map == null) {
+ if (DEBUG) {
+ Log.d(TAG, "Raw image file not detected");
+ }
return false;
}
@@ -1817,15 +2038,126 @@
}
}
- // Loads EXIF attributes from a JPEG input stream.
- private void getJpegAttributes(InputStream inputStream) throws IOException {
- // See JPEG File Interchange Format Specification page 5.
+ // Checks the type of image file
+ private int getMimeType(BufferedInputStream in) throws IOException {
+ in.mark(SIGNATURE_CHECK_SIZE);
+ byte[] signatureCheckBytes = new byte[SIGNATURE_CHECK_SIZE];
+ if (in.read(signatureCheckBytes) != SIGNATURE_CHECK_SIZE) {
+ throw new EOFException();
+ }
+ in.reset();
+ if (isJpegFormat(signatureCheckBytes)) {
+ return IMAGE_TYPE_JPEG;
+ } else if (isRafFormat(signatureCheckBytes)) {
+ return IMAGE_TYPE_RAF;
+ } else if (isOrfFormat(signatureCheckBytes)) {
+ return IMAGE_TYPE_ORF;
+ } else if (isRw2Format(signatureCheckBytes)) {
+ return IMAGE_TYPE_RW2;
+ }
+ // Certain file formats (PEF) are identified in readImageFileDirectory()
+ return IMAGE_TYPE_UNKNOWN;
+ }
+
+ /**
+ * This method looks at the first 3 bytes to determine if this file is a JPEG file.
+ * See http://www.media.mit.edu/pia/Research/deepview/exif.html, "JPEG format and Marker"
+ */
+ private static boolean isJpegFormat(byte[] signatureCheckBytes) throws IOException {
+ for (int i = 0; i < JPEG_SIGNATURE.length; i++) {
+ if (signatureCheckBytes[i] != JPEG_SIGNATURE[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * This method looks at the first 15 bytes to determine if this file is a RAF file.
+ * There is no official specification for RAF files from Fuji, but there is an online archive of
+ * image file specifications:
+ * http://fileformats.archiveteam.org/wiki/Fujifilm_RAF
+ */
+ private boolean isRafFormat(byte[] signatureCheckBytes) throws IOException {
+ byte[] rafSignatureBytes = RAF_SIGNATURE.getBytes();
+ for (int i = 0; i < rafSignatureBytes.length; i++) {
+ if (signatureCheckBytes[i] != rafSignatureBytes[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * ORF has a similar structure to TIFF but it contains a different signature at the TIFF Header.
+ * This method looks at the 2 bytes following the Byte Order bytes to determine if this file is
+ * an ORF file.
+ * There is no official specification for ORF files from Olympus, but there is an online archive
+ * of image file specifications:
+ * http://fileformats.archiveteam.org/wiki/Olympus_ORF
+ */
+ private boolean isOrfFormat(byte[] signatureCheckBytes) throws IOException {
+ ByteOrderAwarenessDataInputStream signatureInputStream =
+ new ByteOrderAwarenessDataInputStream(signatureCheckBytes);
+ // Read byte order
+ mExifByteOrder = readByteOrder(signatureInputStream);
+ // Set byte order
+ signatureInputStream.setByteOrder(mExifByteOrder);
+
+ short orfSignature = signatureInputStream.readShort();
+ if (orfSignature == ORF_SIGNATURE_1 || orfSignature == ORF_SIGNATURE_2) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * RW2 is TIFF-based, but stores 0x55 signature byte instead of 0x42 at the header
+ * See http://lclevy.free.fr/raw/
+ */
+ private boolean isRw2Format(byte[] signatureCheckBytes) throws IOException {
+ ByteOrderAwarenessDataInputStream signatureInputStream =
+ new ByteOrderAwarenessDataInputStream(signatureCheckBytes);
+ // Read byte order
+ mExifByteOrder = readByteOrder(signatureInputStream);
+ // Set byte order
+ signatureInputStream.setByteOrder(mExifByteOrder);
+
+ short signatureByte = signatureInputStream.readShort();
+ if (signatureByte == RW2_SIGNATURE) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Loads EXIF attributes from a JPEG input stream.
+ *
+ * @param inputStream The input stream that starts with the JPEG data.
+ * @param jpegOffset The offset value in input stream for JPEG data.
+ * @param imageTypes The image type from which to retrieve metadata. Use IFD_TIFF_HINT for
+ * primary image, IFD_PREVIEW_HINT for preview image, and
+ * IFD_THUMBNAIL_HINT for thumbnail image.
+ * @throws IOException If the data contains invalid JPEG markers, offsets, or length values.
+ */
+ private void getJpegAttributes(InputStream inputStream, int jpegOffset, int imageType)
+ throws IOException {
+ // See JPEG File Interchange Format Specification, "JFIF Specification"
if (DEBUG) {
Log.d(TAG, "getJpegAttributes starting with: " + inputStream);
}
+
DataInputStream dataInputStream = new DataInputStream(inputStream);
+ // Mark current position to reset after retrieving data
+ dataInputStream.mark(dataInputStream.available());
+
+ // Skip to JPEG data
+ if (dataInputStream.skip(jpegOffset) != jpegOffset) {
+ throw new IOException("Invalid JPEG offset");
+ }
+ int bytesRead = jpegOffset;
+
byte marker;
- int bytesRead = 0;
if ((marker = dataInputStream.readByte()) != MARKER) {
throw new IOException("Invalid marker: " + Integer.toHexString(marker & 0xff));
}
@@ -1885,13 +2217,17 @@
if (DEBUG) {
Log.d(TAG, "readExifSegment with a byte array (length: " + length + ")");
}
+ // Save offset values for createJpegThumbnailBitmap() function
+ mExifOffset = bytesRead;
+
byte[] bytes = new byte[length];
if (dataInputStream.read(bytes) != length) {
throw new IOException("Invalid exif");
}
- readExifSegment(bytes, bytesRead);
bytesRead += length;
length = 0;
+
+ readExifSegment(bytes, imageType);
break;
}
@@ -1924,9 +2260,9 @@
if (dataInputStream.skipBytes(1) != 1) {
throw new IOException("Invalid SOFx");
}
- mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, ExifAttribute.createULong(
+ mAttributes[imageType].put(TAG_IMAGE_LENGTH, ExifAttribute.createULong(
dataInputStream.readUnsignedShort(), mExifByteOrder));
- mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, ExifAttribute.createULong(
+ mAttributes[imageType].put(TAG_IMAGE_WIDTH, ExifAttribute.createULong(
dataInputStream.readUnsignedShort(), mExifByteOrder));
length -= 5;
break;
@@ -1944,12 +2280,299 @@
}
bytesRead += length;
}
+ // Reset dataInputStream to marked position
+ dataInputStream.reset();
+ }
+
+ private void getRawAttributes(InputStream in) throws IOException {
+ int totalBytes = in.available();
+ byte[] exifBytes = new byte[totalBytes];
+ in.mark(in.available());
+ in.read(exifBytes);
+ in.reset();
+
+ ByteOrderAwarenessDataInputStream dataInputStream =
+ new ByteOrderAwarenessDataInputStream(exifBytes);
+
+ // Parse TIFF Headers. See JEITA CP-3451C Section 4.5.2. Table 1.
+ parseTiffHeaders(dataInputStream, exifBytes.length);
+
+ // Read TIFF image file directories. See JEITA CP-3451C Section 4.5.2. Figure 6.
+ readImageFileDirectory(dataInputStream, IFD_PREVIEW_HINT);
+
+ // Check if the preview image data should be a primary image data.
+ // The 0th IFD (first to be parsed) is presumed to be a preview image data, with a SubIFD
+ // that is a primary image data.
+ // But if the 0th IFD does not have a SubIFD, then it must be a primary image data since
+ // a primary image data must exist, but a preview image data does not have to.
+ if (mAttributes[IFD_TIFF_HINT].isEmpty() && !mAttributes[IFD_PREVIEW_HINT].isEmpty()) {
+ mAttributes[IFD_TIFF_HINT] = mAttributes[IFD_PREVIEW_HINT];
+ mAttributes[IFD_PREVIEW_HINT] = new HashMap();
+ }
+
+ // Update TAG_IMAGE_WIDTH and TAG_IMAGE_LENGTH for primary image.
+ updatePrimaryImageSizeValues(in);
+
+ // Check if the preview image data should be a thumbnail image data.
+ // In a RAW file, there may be a preview image, which is smaller than a primary image but
+ // larger than a thumbnail image. Normally, the preview image can be considered a thumbnail
+ // image if its size meets the requirements. Therefore, when a thumbnail image has not yet
+ // been found, we should check if the preview image can be one.
+ if (!mAttributes[IFD_PREVIEW_HINT].isEmpty() && mAttributes[IFD_THUMBNAIL_HINT].isEmpty()) {
+ // Update preview image size if necessary
+ retrieveJpegImageSize(in, IFD_PREVIEW_HINT);
+
+ if (isThumbnail(mAttributes[IFD_PREVIEW_HINT])) {
+ mAttributes[IFD_THUMBNAIL_HINT] = mAttributes[IFD_PREVIEW_HINT];
+ mAttributes[IFD_PREVIEW_HINT] = new HashMap();
+ }
+ }
+
+ if (mMimeType == IMAGE_TYPE_PEF) {
+ // PEF files contain a MakerNote data, which contains the data for ColorSpace tag.
+ // See http://lclevy.free.fr/raw/ and piex.cc PefGetPreviewData()
+ ExifAttribute makerNoteAttribute =
+ (ExifAttribute) mAttributes[IFD_EXIF_HINT].get(TAG_MAKER_NOTE);
+ if (makerNoteAttribute != null) {
+ // Create an ordered DataInputStream for MakerNote
+ ByteOrderAwarenessDataInputStream makerNoteDataInputStream =
+ new ByteOrderAwarenessDataInputStream(makerNoteAttribute.bytes);
+ makerNoteDataInputStream.setByteOrder(mExifByteOrder);
+
+ // Seek to MakerNote data
+ makerNoteDataInputStream.seek(PEF_MAKER_NOTE_SKIP_SIZE);
+
+ // Read IFD data from MakerNote
+ readImageFileDirectory(makerNoteDataInputStream, PEF_HINT);
+
+ // Update ColorSpace tag
+ ExifAttribute colorSpaceAttribute =
+ (ExifAttribute) mAttributes[PEF_HINT].get(TAG_COLOR_SPACE);
+ if (colorSpaceAttribute != null) {
+ mAttributes[IFD_EXIF_HINT].put(TAG_COLOR_SPACE, colorSpaceAttribute);
+ }
+ }
+ }
+ }
+
+ /**
+ * RAF files contains a JPEG and a CFA data.
+ * The JPEG contains two images, a preview and a thumbnail, while the CFA contains a RAW image.
+ * This method looks at the first 160 bytes of a RAF file to retrieve the offset and length
+ * values for the JPEG and CFA data.
+ * Using that data, it parses the JPEG data to retrieve the preview and thumbnail image data,
+ * then parses the CFA metadata to retrieve the primary image length/width values.
+ * For data format details, see http://fileformats.archiveteam.org/wiki/Fujifilm_RAF
+ */
+ private void getRafAttributes(InputStream in) throws IOException {
+ // Retrieve offset & length values
+ in.mark(RAF_INFO_SIZE);
+ in.skip(RAF_OFFSET_TO_JPEG_IMAGE_OFFSET);
+ byte[] jpegOffsetBytes = new byte[4];
+ byte[] cfaHeaderOffsetBytes = new byte[4];
+ byte[] cfaHeaderLengthBytes = new byte[4];
+ in.read(jpegOffsetBytes);
+ // Skip JPEG length value since it is not needed
+ in.skip(RAF_JPEG_LENGTH_VALUE_SIZE);
+ in.read(cfaHeaderOffsetBytes);
+ in.read(cfaHeaderLengthBytes);
+ int rafJpegOffset = ByteBuffer.wrap(jpegOffsetBytes).getInt();
+ int rafCfaHeaderOffset = ByteBuffer.wrap(cfaHeaderOffsetBytes).getInt();
+ int rafCfaHeaderLength = ByteBuffer.wrap(cfaHeaderLengthBytes).getInt();
+ in.reset();
+
+ // Retrieve JPEG image metadata
+ getJpegAttributes(in, rafJpegOffset, IFD_PREVIEW_HINT);
+
+ // Skip to CFA header offset.
+ // A while loop is used because the skip method may not be able to skip the requested amount
+ // at once because the size of the buffer may be restricted.
+ in.mark(rafCfaHeaderOffset + rafCfaHeaderLength);
+ int totalSkip = rafCfaHeaderOffset;
+ while (totalSkip > 0) {
+ long skipped = in.skip(totalSkip);
+ totalSkip -= skipped;
+ }
+
+ // Retrieve primary image length/width values, if TAG_RAF_IMAGE_SIZE exists
+ byte[] exifBytes = new byte[rafCfaHeaderLength];
+ if (in.read(exifBytes) != rafCfaHeaderLength) {
+ throw new EOFException();
+ }
+ in.reset();
+ ByteOrderAwarenessDataInputStream dataInputStream =
+ new ByteOrderAwarenessDataInputStream(exifBytes);
+ int numberOfDirectoryEntry = dataInputStream.readInt();
+ if (DEBUG) {
+ Log.d(TAG, "numberOfDirectoryEntry: " + numberOfDirectoryEntry);
+ }
+ // CFA stores some metadata about the RAW image. Since CFA uses proprietary tags, can only
+ // find and retrieve image size information tags, while skipping others.
+ // See piex.cc RafGetDimension()
+ for (int i = 0; i < numberOfDirectoryEntry; ++i) {
+ int tagNumber = dataInputStream.readUnsignedShort();
+ int numberOfBytes = dataInputStream.readUnsignedShort();
+ if (tagNumber == TAG_RAF_IMAGE_SIZE.number) {
+ int imageLength = dataInputStream.readShort();
+ int imageWidth = dataInputStream.readShort();
+ ExifAttribute imageLengthAttribute =
+ ExifAttribute.createUShort(imageLength, mExifByteOrder);
+ ExifAttribute imageWidthAttribute =
+ ExifAttribute.createUShort(imageWidth, mExifByteOrder);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, imageLengthAttribute);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, imageWidthAttribute);
+ if (DEBUG) {
+ Log.d(TAG, "Updated to length: " + imageLength + ", width: " + imageWidth);
+ }
+ return;
+ }
+ dataInputStream.skip(numberOfBytes);
+ }
+ }
+
+ /**
+ * ORF files contains a primary image data and a MakerNote data that contains preview/thumbnail
+ * images. Both data takes the form of IFDs and can therefore be read with the
+ * readImageFileDirectory() method.
+ * This method reads all the necessary data and updates the primary/preview/thumbnail image
+ * information according to the GetOlympusPreviewImage() method in piex.cc.
+ * For data format details, see the following:
+ * http://fileformats.archiveteam.org/wiki/Olympus_ORF
+ * https://libopenraw.freedesktop.org/wiki/Olympus_ORF
+ */
+ private void getOrfAttributes(InputStream in) throws IOException {
+ // Retrieve primary image data
+ // Other Exif data will be located in the Makernote.
+ getRawAttributes(in);
+
+ // Additionally retrieve preview/thumbnail information from MakerNote tag, which contains
+ // proprietary tags and therefore does not have offical documentation
+ // See GetOlympusPreviewImage() in piex.cc & http://www.exiv2.org/tags-olympus.html
+ ExifAttribute makerNoteAttribute =
+ (ExifAttribute) mAttributes[IFD_EXIF_HINT].get(TAG_MAKER_NOTE);
+ if (makerNoteAttribute != null) {
+ // Create an ordered DataInputStream for MakerNote
+ ByteOrderAwarenessDataInputStream makerNoteDataInputStream =
+ new ByteOrderAwarenessDataInputStream(makerNoteAttribute.bytes);
+ makerNoteDataInputStream.setByteOrder(mExifByteOrder);
+
+ // There are two types of headers for Olympus MakerNotes
+ // See http://www.exiv2.org/makernote.html#R1
+ byte[] makerNoteHeader1Bytes = new byte[ORF_MAKER_NOTE_HEADER_1.length];
+ makerNoteDataInputStream.readFully(makerNoteHeader1Bytes);
+ makerNoteDataInputStream.seek(0);
+ byte[] makerNoteHeader2Bytes = new byte[ORF_MAKER_NOTE_HEADER_2.length];
+ makerNoteDataInputStream.readFully(makerNoteHeader2Bytes);
+ // Skip the corresponding amount of bytes for each header type
+ if (Arrays.equals(makerNoteHeader1Bytes, ORF_MAKER_NOTE_HEADER_1)) {
+ makerNoteDataInputStream.seek(ORF_MAKER_NOTE_HEADER_1_SIZE);
+ } else if (Arrays.equals(makerNoteHeader2Bytes, ORF_MAKER_NOTE_HEADER_2)) {
+ makerNoteDataInputStream.seek(ORF_MAKER_NOTE_HEADER_2_SIZE);
+ }
+
+ // Read IFD data from MakerNote
+ readImageFileDirectory(makerNoteDataInputStream, ORF_MAKER_NOTE_HINT);
+
+ // Retrieve & update preview image offset & length values
+ ExifAttribute imageLengthAttribute = (ExifAttribute)
+ mAttributes[ORF_CAMERA_SETTINGS_HINT].get(TAG_ORF_PREVIEW_IMAGE_START);
+ ExifAttribute bitsPerSampleAttribute = (ExifAttribute)
+ mAttributes[ORF_CAMERA_SETTINGS_HINT].get(TAG_ORF_PREVIEW_IMAGE_LENGTH);
+
+ if (imageLengthAttribute != null && bitsPerSampleAttribute != null) {
+ mAttributes[IFD_PREVIEW_HINT].put(TAG_JPEG_INTERCHANGE_FORMAT,
+ imageLengthAttribute);
+ mAttributes[IFD_PREVIEW_HINT].put(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
+ bitsPerSampleAttribute);
+ }
+
+ // TODO: Check this behavior in other ORF files
+ // Retrieve primary image length & width values
+ // See piex.cc GetOlympusPreviewImage()
+ ExifAttribute aspectFrameAttribute = (ExifAttribute)
+ mAttributes[ORF_IMAGE_PROCESSING_HINT].get(TAG_ORF_ASPECT_FRAME);
+ if (aspectFrameAttribute != null) {
+ int[] aspectFrameValues = new int[4];
+ aspectFrameValues = (int[]) aspectFrameAttribute.getValue(mExifByteOrder);
+ if (aspectFrameValues[2] > aspectFrameValues[0] &&
+ aspectFrameValues[3] > aspectFrameValues[1]) {
+ int primaryImageWidth = aspectFrameValues[2] - aspectFrameValues[0] + 1;
+ int primaryImageLength = aspectFrameValues[3] - aspectFrameValues[1] + 1;
+ // Swap width & length values
+ if (primaryImageWidth < primaryImageLength) {
+ primaryImageWidth += primaryImageLength;
+ primaryImageLength = primaryImageWidth - primaryImageLength;
+ primaryImageWidth -= primaryImageLength;
+ }
+ ExifAttribute primaryImageWidthAttribute =
+ ExifAttribute.createUShort(primaryImageWidth, mExifByteOrder);
+ ExifAttribute primaryImageLengthAttribute =
+ ExifAttribute.createUShort(primaryImageLength, mExifByteOrder);
+
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, primaryImageWidthAttribute);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, primaryImageLengthAttribute);
+ }
+ }
+ }
+ }
+
+ // RW2 contains the primary image data in IFD0 and the preview and/or thumbnail image data in
+ // the JpgFromRaw tag
+ // See https://libopenraw.freedesktop.org/wiki/Panasonic_RAW/ and piex.cc Rw2GetPreviewData()
+ private void getRw2Attributes(InputStream in) throws IOException {
+ // Retrieve primary image data
+ getRawAttributes(in);
+
+ // Retrieve preview and/or thumbnail image data
+ ExifAttribute jpgFromRawAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_RW2_JPG_FROM_RAW);
+ if (jpgFromRawAttribute != null) {
+ getJpegAttributes(in, mRw2JpgFromRawOffset, IFD_PREVIEW_HINT);
+ }
+
+ // Set ISO tag value if necessary
+ ExifAttribute rw2IsoAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_RW2_ISO);
+ ExifAttribute exifIsoAttribute =
+ (ExifAttribute) mAttributes[IFD_EXIF_HINT].get(TAG_ISO_SPEED_RATINGS);
+ if (rw2IsoAttribute != null && exifIsoAttribute == null) {
+ // Place this attribute only if it doesn't exist
+ mAttributes[IFD_EXIF_HINT].put(TAG_ISO_SPEED_RATINGS, rw2IsoAttribute);
+ }
+ }
+
+ // PEF is TIFF-based and contains 3 IFDs. It also contains a MakerNote data, which contains the
+ // ColorSpace tag data.
+ // See http://lclevy.free.fr/raw/ and piex.cc PefGetPreviewData()
+ private void getPefAttributes(InputStream in) throws IOException {
+ // Retrieve ColorSpace tag
+ ExifAttribute makerNoteAttribute =
+ (ExifAttribute) mAttributes[IFD_EXIF_HINT].get(TAG_MAKER_NOTE);
+ if (makerNoteAttribute != null) {
+ // Create an ordered DataInputStream for MakerNote
+ ByteOrderAwarenessDataInputStream makerNoteDataInputStream =
+ new ByteOrderAwarenessDataInputStream(makerNoteAttribute.bytes);
+ makerNoteDataInputStream.setByteOrder(mExifByteOrder);
+
+ // Seek to MakerNote data
+ makerNoteDataInputStream.seek(PEF_MAKER_NOTE_SKIP_SIZE);
+
+ // Read IFD data from MakerNote
+ readImageFileDirectory(makerNoteDataInputStream, PEF_HINT);
+
+ // Update ColorSpace tag
+ ExifAttribute colorSpaceAttribute =
+ (ExifAttribute) mAttributes[PEF_HINT].get(TAG_COLOR_SPACE);
+ if (colorSpaceAttribute != null) {
+ mAttributes[IFD_EXIF_HINT].put(TAG_COLOR_SPACE, colorSpaceAttribute);
+ }
+ }
}
// Stores a new JPEG image with EXIF attributes into a given output stream.
private void saveJpegAttributes(InputStream inputStream, OutputStream outputStream)
throws IOException {
- // See JPEG File Interchange Format Specification page 5.
+ // See JPEG File Interchange Format Specification, "JFIF Specification"
if (DEBUG) {
Log.d(TAG, "saveJpegAttributes starting with (inputStream: " + inputStream
+ ", outputStream: " + outputStream + ")");
@@ -2045,92 +2668,15 @@
}
// Reads the given EXIF byte area and save its tag data into attributes.
- private void readExifSegment(byte[] exifBytes, int exifOffsetFromBeginning) throws IOException {
- // Parse TIFF Headers. See JEITA CP-3451C Table 1. page 10.
+ private void readExifSegment(byte[] exifBytes, int imageType) throws IOException {
ByteOrderAwarenessDataInputStream dataInputStream =
new ByteOrderAwarenessDataInputStream(exifBytes);
- // Read byte align
- short byteOrder = dataInputStream.readShort();
- switch (byteOrder) {
- case BYTE_ALIGN_II:
- if (DEBUG) {
- Log.d(TAG, "readExifSegment: Byte Align II");
- }
- mExifByteOrder = ByteOrder.LITTLE_ENDIAN;
- break;
- case BYTE_ALIGN_MM:
- if (DEBUG) {
- Log.d(TAG, "readExifSegment: Byte Align MM");
- }
- mExifByteOrder = ByteOrder.BIG_ENDIAN;
- break;
- default:
- throw new IOException("Invalid byte order: " + Integer.toHexString(byteOrder));
- }
+ // Parse TIFF Headers. See JEITA CP-3451C Section 4.5.2. Table 1.
+ parseTiffHeaders(dataInputStream, exifBytes.length);
- // Set byte order.
- dataInputStream.setByteOrder(mExifByteOrder);
-
- int startCode = dataInputStream.readUnsignedShort();
- if (startCode != 0x2a) {
- throw new IOException("Invalid exif start: " + Integer.toHexString(startCode));
- }
-
- // Read first ifd offset
- long firstIfdOffset = dataInputStream.readUnsignedInt();
- if (firstIfdOffset < 8 || firstIfdOffset >= exifBytes.length) {
- throw new IOException("Invalid first Ifd offset: " + firstIfdOffset);
- }
- firstIfdOffset -= 8;
- if (firstIfdOffset > 0) {
- if (dataInputStream.skip(firstIfdOffset) != firstIfdOffset) {
- throw new IOException("Couldn't jump to first Ifd: " + firstIfdOffset);
- }
- }
-
- // Read primary image TIFF image file directory.
- readImageFileDirectory(dataInputStream, IFD_TIFF_HINT);
-
- // Process thumbnail.
- String jpegInterchangeFormatString = getAttribute(JPEG_INTERCHANGE_FORMAT_TAG.name);
- String jpegInterchangeFormatLengthString =
- getAttribute(JPEG_INTERCHANGE_FORMAT_LENGTH_TAG.name);
- if (jpegInterchangeFormatString != null && jpegInterchangeFormatLengthString != null) {
- try {
- int jpegInterchangeFormat = Integer.parseInt(jpegInterchangeFormatString);
- int jpegInterchangeFormatLength = Integer
- .parseInt(jpegInterchangeFormatLengthString);
- // The following code limits the size of thumbnail size not to overflow EXIF data area.
- jpegInterchangeFormatLength = Math.min(jpegInterchangeFormat
- + jpegInterchangeFormatLength, exifBytes.length) - jpegInterchangeFormat;
- if (jpegInterchangeFormat > 0 && jpegInterchangeFormatLength > 0) {
- mHasThumbnail = true;
- mThumbnailOffset = exifOffsetFromBeginning + jpegInterchangeFormat;
- mThumbnailLength = jpegInterchangeFormatLength;
-
- if (mFilename == null && mAssetInputStream == null
- && mSeekableFileDescriptor == null) {
- // Save the thumbnail in memory if the input doesn't support reading again.
- byte[] thumbnailBytes = new byte[jpegInterchangeFormatLength];
- dataInputStream.seek(jpegInterchangeFormat);
- dataInputStream.readFully(thumbnailBytes);
- mThumbnailBytes = thumbnailBytes;
-
- if (DEBUG) {
- Bitmap bitmap = BitmapFactory.decodeByteArray(
- thumbnailBytes, 0, thumbnailBytes.length);
- Log.d(TAG, "Thumbnail offset: " + mThumbnailOffset + ", length: "
- + mThumbnailLength + ", width: " + bitmap.getWidth()
- + ", height: "
- + bitmap.getHeight());
- }
- }
- }
- } catch (NumberFormatException e) {
- // Ignored the corrupted image.
- }
- }
+ // Read TIFF image file directories. See JEITA CP-3451C Section 4.5.2. Figure 6.
+ readImageFileDirectory(dataInputStream, imageType);
}
private void addDefaultValuesForCompatibility() {
@@ -2160,6 +2706,52 @@
}
}
+ private ByteOrder readByteOrder(ByteOrderAwarenessDataInputStream dataInputStream)
+ throws IOException {
+ // Read byte order.
+ short byteOrder = dataInputStream.readShort();
+ switch (byteOrder) {
+ case BYTE_ALIGN_II:
+ if (DEBUG) {
+ Log.d(TAG, "readExifSegment: Byte Align II");
+ }
+ return ByteOrder.LITTLE_ENDIAN;
+ case BYTE_ALIGN_MM:
+ if (DEBUG) {
+ Log.d(TAG, "readExifSegment: Byte Align MM");
+ }
+ return ByteOrder.BIG_ENDIAN;
+ default:
+ throw new IOException("Invalid byte order: " + Integer.toHexString(byteOrder));
+ }
+ }
+
+ private void parseTiffHeaders(ByteOrderAwarenessDataInputStream dataInputStream,
+ int exifBytesLength) throws IOException {
+ // Read byte order
+ mExifByteOrder = readByteOrder(dataInputStream);
+ // Set byte order
+ dataInputStream.setByteOrder(mExifByteOrder);
+
+ // Check start code
+ int startCode = dataInputStream.readUnsignedShort();
+ if (mMimeType != IMAGE_TYPE_ORF && mMimeType != IMAGE_TYPE_RW2 && startCode != START_CODE) {
+ throw new IOException("Invalid start code: " + Integer.toHexString(startCode));
+ }
+
+ // Read and skip to first ifd offset
+ int firstIfdOffset = dataInputStream.readInt();
+ if (firstIfdOffset < 8 || firstIfdOffset >= exifBytesLength) {
+ throw new IOException("Invalid first Ifd offset: " + firstIfdOffset);
+ }
+ firstIfdOffset -= 8;
+ if (firstIfdOffset > 0) {
+ if (dataInputStream.skip(firstIfdOffset) != firstIfdOffset) {
+ throw new IOException("Couldn't jump to first Ifd: " + firstIfdOffset);
+ }
+ }
+ }
+
// Reads image file directory, which is a tag group in EXIF.
private void readImageFileDirectory(ByteOrderAwarenessDataInputStream dataInputStream, int hint)
throws IOException {
@@ -2167,7 +2759,7 @@
// Return if there is no data from the offset.
return;
}
- // See JEITA CP-3451 Figure 5. page 9.
+ // See TIFF 6.0 Section 2: TIFF Structure, Figure 1.
short numberOfDirectoryEntry = dataInputStream.readShort();
if (dataInputStream.peek() + 12 * numberOfDirectoryEntry > dataInputStream.mLength) {
// Return if the size of entries is too big.
@@ -2178,14 +2770,16 @@
Log.d(TAG, "numberOfDirectoryEntry: " + numberOfDirectoryEntry);
}
+ // See TIFF 6.0 Section 2: TIFF Structure, "Image File Directory".
for (short i = 0; i < numberOfDirectoryEntry; ++i) {
int tagNumber = dataInputStream.readUnsignedShort();
int dataFormat = dataInputStream.readUnsignedShort();
int numberOfComponents = dataInputStream.readInt();
- long nextEntryOffset = dataInputStream.peek() + 4; // next four bytes is for data
- // offset or value.
+ // Next four bytes is for data offset or value.
+ long nextEntryOffset = dataInputStream.peek() + 4;
+
// Look up a corresponding tag from tag number
- final ExifTag tag = (ExifTag) sExifTagMapsForReading[hint].get(tagNumber);
+ ExifTag tag = (ExifTag) sExifTagMapsForReading[hint].get(tagNumber);
if (DEBUG) {
Log.d(TAG, String.format("hint: %d, tagNumber: %d, tagName: %s, dataFormat: %d, " +
@@ -2209,14 +2803,41 @@
// field if the size of the entry value is bigger than 4.
int byteCount = numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat];
if (byteCount > 4) {
- long offset = dataInputStream.readUnsignedInt();
+ int offset = dataInputStream.readInt();
if (DEBUG) {
Log.d(TAG, "seek to data offset: " + offset);
}
+ if (mMimeType == IMAGE_TYPE_ORF) {
+ if (tag.name == TAG_MAKER_NOTE) {
+ // Save offset value for reading thumbnail
+ mOrfMakerNoteOffset = offset;
+ } else if (hint == ORF_MAKER_NOTE_HINT && tag.name == TAG_ORF_THUMBNAIL_IMAGE) {
+ // Retrieve & update values for thumbnail offset and length values for ORF
+ mOrfThumbnailOffset = offset;
+ mOrfThumbnailLength = numberOfComponents;
+
+ ExifAttribute compressionAttribute =
+ ExifAttribute.createUShort(DATA_JPEG, mExifByteOrder);
+ ExifAttribute jpegInterchangeFormatAttribute =
+ ExifAttribute.createULong(mOrfThumbnailOffset, mExifByteOrder);
+ ExifAttribute jpegInterchangeFormatLengthAttribute =
+ ExifAttribute.createULong(mOrfThumbnailLength, mExifByteOrder);
+
+ mAttributes[IFD_THUMBNAIL_HINT].put(TAG_COMPRESSION, compressionAttribute);
+ mAttributes[IFD_THUMBNAIL_HINT].put(TAG_JPEG_INTERCHANGE_FORMAT,
+ jpegInterchangeFormatAttribute);
+ mAttributes[IFD_THUMBNAIL_HINT].put(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
+ jpegInterchangeFormatLengthAttribute);
+ }
+ } else if (mMimeType == IMAGE_TYPE_RW2) {
+ if (tag.name == TAG_RW2_JPG_FROM_RAW) {
+ mRw2JpgFromRawOffset = offset;
+ }
+ }
if (offset + byteCount <= dataInputStream.mLength) {
dataInputStream.seek(offset);
} else {
- // Skip if invalid data offset.
+ // Skip if invalid data offset.
Log.w(TAG, "Skip the tag entry since data offset is invalid: " + offset);
dataInputStream.seek(nextEntryOffset);
continue;
@@ -2245,7 +2866,8 @@
offset = dataInputStream.readUnsignedInt();
break;
}
- case IFD_FORMAT_SLONG: {
+ case IFD_FORMAT_SLONG:
+ case IFD_FORMAT_IFD: {
offset = dataInputStream.readInt();
break;
}
@@ -2268,17 +2890,29 @@
continue;
}
- byte[] bytes = new byte[numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat]];
+ byte[] bytes = new byte[byteCount];
dataInputStream.readFully(bytes);
- mAttributes[hint].put(
- tag.name, new ExifAttribute(dataFormat, numberOfComponents, bytes));
+ ExifAttribute attribute = new ExifAttribute(dataFormat, numberOfComponents, bytes);
+ mAttributes[hint].put(tag.name, attribute);
+
+ // PEF files have a Make or Model tag that begins with "PENTAX" or a compression tag
+ // that is 65535.
+ // See http://fileformats.archiveteam.org/wiki/Pentax_PEF
+ if (((tag.name == TAG_MAKE || tag.name == TAG_MODEL)
+ && attribute.getStringValue(mExifByteOrder).contains(PEF_SIGNATURE))
+ || (tag.name == TAG_COMPRESSION
+ && attribute.getIntValue(mExifByteOrder) == 65535)) {
+ mMimeType = IMAGE_TYPE_PEF;
+ }
+
+ // Seek to next tag offset
if (dataInputStream.peek() != nextEntryOffset) {
dataInputStream.seek(nextEntryOffset);
}
}
if (dataInputStream.peek() + 4 <= dataInputStream.mLength) {
- long nextIfdOffset = dataInputStream.readUnsignedInt();
+ int nextIfdOffset = dataInputStream.readInt();
if (DEBUG) {
Log.d(TAG, String.format("nextIfdOffset: %d", nextIfdOffset));
}
@@ -2286,16 +2920,257 @@
// since the first IFD offset is at least 8.
if (nextIfdOffset > 8 && nextIfdOffset < dataInputStream.mLength) {
dataInputStream.seek(nextIfdOffset);
- readImageFileDirectory(dataInputStream, IFD_THUMBNAIL_HINT);
+ if (mAttributes[IFD_THUMBNAIL_HINT].isEmpty()) {
+ // Do not overwrite thumbnail IFD data if it alreay exists.
+ readImageFileDirectory(dataInputStream, IFD_THUMBNAIL_HINT);
+ }
+ }
+ }
+ }
+
+ /**
+ * JPEG compressed images do not contain IMAGE_LENGTH & IMAGE_WIDTH tags.
+ * This value uses JpegInterchangeFormat(JPEG data offset) value, and calls getJpegAttributes()
+ * to locate SOF(Start of Frame) marker and update the image length & width values.
+ * See JEITA CP-3451C Table 5 and Section 4.8.1. B.
+ */
+ private void retrieveJpegImageSize(InputStream in, int imageType) throws IOException {
+ // Check if image already has IMAGE_LENGTH & IMAGE_WIDTH values
+ ExifAttribute imageLengthAttribute =
+ (ExifAttribute) mAttributes[imageType].get(TAG_IMAGE_LENGTH);
+ ExifAttribute imageWidthAttribute =
+ (ExifAttribute) mAttributes[imageType].get(TAG_IMAGE_WIDTH);
+
+ if (imageLengthAttribute == null || imageWidthAttribute == null) {
+ // Find if offset for JPEG data exists
+ ExifAttribute jpegInterchangeFormatAttribute =
+ (ExifAttribute) mAttributes[imageType].get(TAG_JPEG_INTERCHANGE_FORMAT);
+ if (jpegInterchangeFormatAttribute != null) {
+ int jpegInterchangeFormat =
+ jpegInterchangeFormatAttribute.getIntValue(mExifByteOrder);
+
+ // Searches for SOF marker in JPEG data and updates IMAGE_LENGTH & IMAGE_WIDTH tags
+ getJpegAttributes(in, jpegInterchangeFormat, imageType);
+ }
+ }
+ }
+
+ // Sets thumbnail offset & length attributes based on JpegInterchangeFormat or StripOffsets tags
+ private void setThumbnailData(InputStream in) throws IOException {
+ HashMap thumbnailData = mAttributes[IFD_THUMBNAIL_HINT];
+
+ ExifAttribute compressionAttribute =
+ (ExifAttribute) thumbnailData.get(TAG_COMPRESSION);
+ if (compressionAttribute != null) {
+ int compressionValue = compressionAttribute.getIntValue(mExifByteOrder);
+ switch (compressionValue) {
+ case DATA_UNCOMPRESSED: {
+ // TODO: add implementation for reading uncompressed thumbnail data (b/28156704)
+ Log.d(TAG, "Uncompressed thumbnail data cannot be processed");
+ break;
+ }
+ case DATA_JPEG: {
+ handleThumbnailFromJfif(in, thumbnailData);
+ break;
+ }
+ case DATA_JPEG_COMPRESSED: {
+ handleThumbnailFromStrips(in, thumbnailData);
+ break;
+ }
+ default: {
+ break;
+ }
+ }
+ } else {
+ // Thumbnail data may not contain Compression tag value
+ handleThumbnailFromJfif(in, thumbnailData);
+ }
+ }
+
+ // Check JpegInterchangeFormat(JFIF) tags to retrieve thumbnail offset & length values and
+ // create a bitmap based on those values
+ private void handleThumbnailFromJfif(InputStream in, HashMap thumbnailData) throws IOException {
+ ExifAttribute jpegInterchangeFormatAttribute =
+ (ExifAttribute) thumbnailData.get(TAG_JPEG_INTERCHANGE_FORMAT);
+ ExifAttribute jpegInterchangeFormatLengthAttribute =
+ (ExifAttribute) thumbnailData.get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+ if (jpegInterchangeFormatAttribute != null
+ && jpegInterchangeFormatLengthAttribute != null) {
+ int jpegInterchangeFormat =
+ jpegInterchangeFormatAttribute.getIntValue(mExifByteOrder);
+ int jpegInterchangeFormatLength =
+ jpegInterchangeFormatLengthAttribute.getIntValue(mExifByteOrder);
+ createJpegThumbnailBitmap(in, jpegInterchangeFormat, jpegInterchangeFormatLength);
+ }
+ }
+
+ // Check StripOffsets & StripByteCounts tags to retrieve thumbnail offset & length values and
+ // create a bitmap based on those values
+ private void handleThumbnailFromStrips(InputStream in, HashMap thumbnailData)
+ throws IOException {
+ ExifAttribute stripOffsetsAttribute =
+ (ExifAttribute) thumbnailData.get(TAG_STRIP_OFFSETS);
+ ExifAttribute stripByteCountsAttribute =
+ (ExifAttribute) thumbnailData.get(TAG_STRIP_BYTE_COUNTS);
+ if (stripOffsetsAttribute != null && stripByteCountsAttribute != null) {
+ long[] stripOffsetsArray =
+ (long[]) stripOffsetsAttribute.getValue(mExifByteOrder);
+ long[] stripByteCountsArray =
+ (long[]) stripByteCountsAttribute.getValue(mExifByteOrder);
+ if (stripOffsetsArray.length == 1) {
+ int stripOffsetsSum = (int) Arrays.stream(stripOffsetsArray).sum();
+ int stripByteCountsSum = (int) Arrays.stream(stripByteCountsArray).sum();
+ createJpegThumbnailBitmap(in, stripOffsetsSum, stripByteCountsSum);
+ } else {
+ // TODO: implement method to read multiple strips (b/29737797)
+ Log.d(TAG, "Multiple strip thumbnail data cannot be processed");
+ }
+ }
+ }
+
+ // Creates a bitmap data based on thumbnail offset and length for JPEG Compression
+ private void createJpegThumbnailBitmap(InputStream in, int thumbnailOffset, int thumbnailLength)
+ throws IOException {
+ // The following code limits the size of thumbnail size not to overflow EXIF data area.
+ thumbnailLength = Math.min(thumbnailLength, in.available() - thumbnailOffset);
+ if (mMimeType == IMAGE_TYPE_JPEG || mMimeType == IMAGE_TYPE_RAF
+ || mMimeType == IMAGE_TYPE_RW2) {
+ thumbnailOffset += mExifOffset;
+ } else if (mMimeType == IMAGE_TYPE_ORF) {
+ // Update offset value since RAF files have IFD data preceding MakerNote data.
+ thumbnailOffset += mOrfMakerNoteOffset;
+ }
+ if (DEBUG) {
+ Log.d(TAG, "Creating JPEG Thumbnail with offset: " + thumbnailOffset);
+ }
+ if (thumbnailOffset > 0 && thumbnailLength > 0) {
+ mHasThumbnail = true;
+ mThumbnailOffset = thumbnailOffset;
+ mThumbnailLength = thumbnailLength;
+ if (mFilename == null && mAssetInputStream == null && mSeekableFileDescriptor == null) {
+ // Save the thumbnail in memory if the input doesn't support reading again.
+ byte[] thumbnailBytes = new byte[thumbnailLength];
+ in.skip(thumbnailOffset);
+ in.read(thumbnailBytes);
+ mThumbnailBytes = thumbnailBytes;
+ if (DEBUG) {
+ Bitmap bitmap = BitmapFactory.decodeByteArray(
+ thumbnailBytes, 0, thumbnailBytes.length);
+ Log.d(TAG, "Thumbnail offset: " + mThumbnailOffset + ", length: "
+ + mThumbnailLength + ", width: " + bitmap.getWidth()
+ + ", height: "
+ + bitmap.getHeight());
+ }
+ }
+ }
+ }
+
+ // Returns true if the image length and width values are <= 512.
+ // See Section 4.8 of http://standardsproposals.bsigroup.com/Home/getPDF/567
+ private boolean isThumbnail(HashMap map) throws IOException {
+ ExifAttribute imageLengthAttribute = (ExifAttribute) map.get(TAG_IMAGE_LENGTH);
+ ExifAttribute imageWidthAttribute = (ExifAttribute) map.get(TAG_IMAGE_WIDTH);
+
+ if (imageLengthAttribute != null && imageWidthAttribute != null) {
+ int imageLengthValue = imageLengthAttribute.getIntValue(mExifByteOrder);
+ int imageWidthValue = imageWidthAttribute.getIntValue(mExifByteOrder);
+ if (imageLengthValue <= MAX_THUMBNAIL_SIZE && imageWidthValue <= MAX_THUMBNAIL_SIZE) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * If image is uncompressed, ImageWidth/Length tags are used to store size info.
+ * However, uncompressed images often store extra pixels around the edges of the final image,
+ * which results in larger values for TAG_IMAGE_WIDTH and TAG_IMAGE_LENGTH tags.
+ * This method corrects those tag values by checking first the values of TAG_DEFAULT_CROP_SIZE
+ * See DNG Specification 1.4.0.0. Section 4. (DefaultCropSize)
+ *
+ * If image is JPEG compressed, PixelXDimension/PixelYDimension tags are used for size info.
+ * However, an image may have padding at the right end or bottom end of the image to make sure
+ * that the values are multiples of 64. If so, the increased value will be saved in the
+ * SOF(Start of Frame). In order to assure that valid image size values are stored, this method
+ * checks TAG_PIXEL_X_DIMENSION & TAG_PIXEL_Y_DIMENSION and updates values if necessary.
+ * See JEITA CP-3451C Table 5 and Section 4.8.1. B.
+ *
+ * If image is a RW2 file, valid image sizes are stored in SensorBorder tags.
+ * See tiff_parser.cc GetFullDimension32()
+ * */
+ private void updatePrimaryImageSizeValues(InputStream in) throws IOException {
+ // Uncompressed image valid image size values
+ ExifAttribute defaultCropSizeAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_DEFAULT_CROP_SIZE);
+ // Compressed image valid image size values
+ ExifAttribute pixelXDimAttribute =
+ (ExifAttribute) mAttributes[IFD_EXIF_HINT].get(TAG_PIXEL_X_DIMENSION);
+ ExifAttribute pixelYDimAttribute =
+ (ExifAttribute) mAttributes[IFD_EXIF_HINT].get(TAG_PIXEL_Y_DIMENSION);
+ // RW2 image valid image size values
+ ExifAttribute topBorderAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_RW2_SENSOR_TOP_BORDER);
+ ExifAttribute leftBorderAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_RW2_SENSOR_LEFT_BORDER);
+ ExifAttribute bottomBorderAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_RW2_SENSOR_BOTTOM_BORDER);
+ ExifAttribute rightBorderAttribute =
+ (ExifAttribute) mAttributes[IFD_TIFF_HINT].get(TAG_RW2_SENSOR_RIGHT_BORDER);
+
+ if (defaultCropSizeAttribute != null) {
+ // Update for uncompressed image
+ ExifAttribute defaultCropSizeXAttribute, defaultCropSizeYAttribute;
+ if (defaultCropSizeAttribute.format == IFD_FORMAT_URATIONAL) {
+ Rational[] defaultCropSizeValue =
+ (Rational[]) defaultCropSizeAttribute.getValue(mExifByteOrder);
+ defaultCropSizeXAttribute =
+ ExifAttribute.createURational(defaultCropSizeValue[0], mExifByteOrder);
+ defaultCropSizeYAttribute =
+ ExifAttribute.createURational(defaultCropSizeValue[1], mExifByteOrder);
+ } else {
+ int[] defaultCropSizeValue =
+ (int[]) defaultCropSizeAttribute.getValue(mExifByteOrder);
+ defaultCropSizeXAttribute =
+ ExifAttribute.createUShort(defaultCropSizeValue[0], mExifByteOrder);
+ defaultCropSizeYAttribute =
+ ExifAttribute.createUShort(defaultCropSizeValue[1], mExifByteOrder);
+ }
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, defaultCropSizeXAttribute);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, defaultCropSizeYAttribute);
+ } else if (topBorderAttribute != null && leftBorderAttribute != null &&
+ bottomBorderAttribute != null && rightBorderAttribute != null) {
+ // Update for RW2 image
+ int topBorderValue = topBorderAttribute.getIntValue(mExifByteOrder);
+ int bottomBorderValue = bottomBorderAttribute.getIntValue(mExifByteOrder);
+ int rightBorderValue = rightBorderAttribute.getIntValue(mExifByteOrder);
+ int leftBorderValue = leftBorderAttribute.getIntValue(mExifByteOrder);
+ if (bottomBorderValue > topBorderValue && rightBorderValue > leftBorderValue) {
+ int length = bottomBorderValue - topBorderValue;
+ int width = rightBorderValue - leftBorderValue;
+ ExifAttribute imageLengthAttribute =
+ ExifAttribute.createUShort(length, mExifByteOrder);
+ ExifAttribute imageWidthAttribute =
+ ExifAttribute.createUShort(width, mExifByteOrder);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, imageLengthAttribute);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, imageWidthAttribute);
+ }
+ } else {
+ // Update for JPEG image
+ if (pixelXDimAttribute != null && pixelYDimAttribute != null) {
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, pixelXDimAttribute);
+ mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, pixelYDimAttribute);
+ } else {
+ // Update image size values from SOF marker if necessary
+ retrieveJpegImageSize(in, IFD_TIFF_HINT);
}
}
}
// Gets the corresponding IFD group index of the given tag number for writing Exif Tags.
private static int getIfdHintFromTagNumber(int tagNumber) {
- for (int i = 0; i < IFD_POINTER_TAG_HINTS.length; ++i) {
- if (IFD_POINTER_TAGS[i].number == tagNumber) {
- return IFD_POINTER_TAG_HINTS[i];
+ for (int i = 0; i < EXIF_POINTER_TAG_HINTS.length; ++i) {
+ if (EXIF_POINTER_TAGS[i].number == tagNumber) {
+ return EXIF_POINTER_TAG_HINTS[i];
}
}
return -1;
@@ -2309,7 +3184,7 @@
int[] ifdDataSizes = new int[EXIF_TAGS.length];
// Remove IFD pointer tags (we'll re-add it later.)
- for (ExifTag tag : IFD_POINTER_TAGS) {
+ for (ExifTag tag : EXIF_POINTER_TAGS) {
removeAttribute(tag.name);
}
// Remove old thumbnail data
@@ -2328,22 +3203,22 @@
// Add IFD pointer tags. The next offset of primary image TIFF IFD will have thumbnail IFD
// offset when there is one or more tags in the thumbnail IFD.
- if (!mAttributes[IFD_INTEROPERABILITY_HINT].isEmpty()) {
- mAttributes[IFD_EXIF_HINT].put(IFD_POINTER_TAGS[2].name,
- ExifAttribute.createULong(0, mExifByteOrder));
- }
if (!mAttributes[IFD_EXIF_HINT].isEmpty()) {
- mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[0].name,
+ mAttributes[IFD_TIFF_HINT].put(EXIF_POINTER_TAGS[1].name,
ExifAttribute.createULong(0, mExifByteOrder));
}
if (!mAttributes[IFD_GPS_HINT].isEmpty()) {
- mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[1].name,
+ mAttributes[IFD_TIFF_HINT].put(EXIF_POINTER_TAGS[2].name,
+ ExifAttribute.createULong(0, mExifByteOrder));
+ }
+ if (!mAttributes[IFD_INTEROPERABILITY_HINT].isEmpty()) {
+ mAttributes[IFD_EXIF_HINT].put(EXIF_POINTER_TAGS[3].name,
ExifAttribute.createULong(0, mExifByteOrder));
}
if (mHasThumbnail) {
- mAttributes[IFD_TIFF_HINT].put(JPEG_INTERCHANGE_FORMAT_TAG.name,
+ mAttributes[IFD_THUMBNAIL_HINT].put(JPEG_INTERCHANGE_FORMAT_TAG.name,
ExifAttribute.createULong(0, mExifByteOrder));
- mAttributes[IFD_TIFF_HINT].put(JPEG_INTERCHANGE_FORMAT_LENGTH_TAG.name,
+ mAttributes[IFD_THUMBNAIL_HINT].put(JPEG_INTERCHANGE_FORMAT_LENGTH_TAG.name,
ExifAttribute.createULong(mThumbnailLength, mExifByteOrder));
}
@@ -2371,7 +3246,7 @@
}
if (mHasThumbnail) {
int thumbnailOffset = position;
- mAttributes[IFD_TIFF_HINT].put(JPEG_INTERCHANGE_FORMAT_TAG.name,
+ mAttributes[IFD_THUMBNAIL_HINT].put(JPEG_INTERCHANGE_FORMAT_TAG.name,
ExifAttribute.createULong(thumbnailOffset, mExifByteOrder));
mThumbnailOffset = exifOffsetFromBeginning + thumbnailOffset;
position += mThumbnailLength;
@@ -2389,31 +3264,31 @@
// Update IFD pointer tags with the calculated offsets.
if (!mAttributes[IFD_EXIF_HINT].isEmpty()) {
- mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[0].name,
+ mAttributes[IFD_TIFF_HINT].put(EXIF_POINTER_TAGS[1].name,
ExifAttribute.createULong(ifdOffsets[IFD_EXIF_HINT], mExifByteOrder));
}
if (!mAttributes[IFD_GPS_HINT].isEmpty()) {
- mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[1].name,
+ mAttributes[IFD_TIFF_HINT].put(EXIF_POINTER_TAGS[2].name,
ExifAttribute.createULong(ifdOffsets[IFD_GPS_HINT], mExifByteOrder));
}
if (!mAttributes[IFD_INTEROPERABILITY_HINT].isEmpty()) {
- mAttributes[IFD_EXIF_HINT].put(IFD_POINTER_TAGS[2].name, ExifAttribute.createULong(
+ mAttributes[IFD_EXIF_HINT].put(EXIF_POINTER_TAGS[3].name, ExifAttribute.createULong(
ifdOffsets[IFD_INTEROPERABILITY_HINT], mExifByteOrder));
}
- // Write TIFF Headers. See JEITA CP-3451C Table 1. page 10.
+ // Write TIFF Headers. See JEITA CP-3451C Section 4.5.2. Table 1.
dataOutputStream.writeUnsignedShort(totalSize);
dataOutputStream.write(IDENTIFIER_EXIF_APP1);
dataOutputStream.writeShort(mExifByteOrder == ByteOrder.BIG_ENDIAN
? BYTE_ALIGN_MM : BYTE_ALIGN_II);
dataOutputStream.setByteOrder(mExifByteOrder);
- dataOutputStream.writeUnsignedShort(0x2a);
- dataOutputStream.writeUnsignedInt(8);
+ dataOutputStream.writeUnsignedShort(START_CODE);
+ dataOutputStream.writeUnsignedInt(IFD_OFFSET);
- // Write IFD groups. See JEITA CP-3451C Figure 7. page 12.
+ // Write IFD groups. See JEITA CP-3451C Section 4.5.8. Figure 9.
for (int hint = 0; hint < EXIF_TAGS.length; ++hint) {
if (!mAttributes[hint].isEmpty()) {
- // See JEITA CP-3451C 4.6.2 IFD structure. page 13.
+ // See JEITA CP-3451C Section 4.6.2: IFD structure.
// Write entry count
dataOutputStream.writeUnsignedShort(mAttributes[hint].size());
@@ -2482,7 +3357,7 @@
data formats for the given entry value, returns {@code -1} in the second of the pair.
*/
private static Pair<Integer, Integer> guessDataFormat(String entryValue) {
- // See TIFF 6.0 spec Types. page 15.
+ // See TIFF 6.0 Section 2, "Image File Directory".
// Take the first component if there are more than one component.
if (entryValue.contains(",")) {
String[] entryValues = entryValue.split(",");
@@ -2523,7 +3398,7 @@
long numerator = Long.parseLong(rationalNumber[0]);
long denominator = Long.parseLong(rationalNumber[1]);
if (numerator < 0L || denominator < 0L) {
- return new Pair<>(IFD_FORMAT_SRATIONAL, - 1);
+ return new Pair<>(IFD_FORMAT_SRATIONAL, -1);
}
if (numerator > Integer.MAX_VALUE || denominator > Integer.MAX_VALUE) {
return new Pair<>(IFD_FORMAT_URATIONAL, -1);
@@ -2577,8 +3452,12 @@
}
public void seek(long byteCount) throws IOException {
- mPosition = 0L;
- reset();
+ if (mPosition > byteCount) {
+ mPosition = 0L;
+ reset();
+ } else {
+ byteCount -= mPosition;
+ }
if (skip(byteCount) != byteCount) {
throw new IOException("Couldn't seek up to the byteCount");
}
@@ -2775,6 +3654,21 @@
}
}
+ // Checks if there is a match
+ private boolean containsMatch(byte[] mainBytes, byte[] findBytes) {
+ for (int i = 0; i < mainBytes.length - findBytes.length; i++) {
+ for (int j = 0; j < findBytes.length; j++) {
+ if (mainBytes[i + j] != findBytes[j]) {
+ break;
+ }
+ if (j == findBytes.length - 1) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
// JNI methods for RAW formats.
private static native void nativeInitRaw();
private static native byte[] nativeGetThumbnailFromAsset(
@@ -2782,4 +3676,4 @@
private static native HashMap nativeGetRawAttributesFromAsset(long asset);
private static native HashMap nativeGetRawAttributesFromFileDescriptor(FileDescriptor fd);
private static native HashMap nativeGetRawAttributesFromInputStream(InputStream in);
-}
+}
\ No newline at end of file
diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java
index ec2d4bc..2cbeb3a2 100644
--- a/media/java/android/media/ImageReader.java
+++ b/media/java/android/media/ImageReader.java
@@ -512,11 +512,36 @@
mAcquiredImages.clear();
nativeClose();
- }
- if (mEstimatedNativeAllocBytes > 0) {
- VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);
- mEstimatedNativeAllocBytes = 0;
+ if (mEstimatedNativeAllocBytes > 0) {
+ VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);
+ mEstimatedNativeAllocBytes = 0;
+ }
+ }
+ }
+
+ /**
+ * Discard any free buffers owned by this ImageReader.
+ *
+ * <p>
+ * Generally, the ImageReader caches buffers for reuse once they have been
+ * allocated, for best performance. However, sometimes it may be important to
+ * release all the cached, unused buffers to save on memory.
+ * </p>
+ * <p>
+ * Calling this method will discard all free cached buffers. This does not include any buffers
+ * associated with Images acquired from the ImageReader, any filled buffers waiting to be
+ * acquired, and any buffers currently in use by the source rendering buffers into the
+ * ImageReader's Surface.
+ * <p>
+ * The ImageReader continues to be usable after this call, but may need to reallocate buffers
+ * when more buffers are needed for rendering.
+ * </p>
+ * @hide
+ */
+ public void discardFreeBuffers() {
+ synchronized (mCloseLock) {
+ nativeDiscardFreeBuffers();
}
}
@@ -872,6 +897,7 @@
private synchronized native void nativeReleaseImage(Image i);
private synchronized native Surface nativeGetSurface();
private synchronized native int nativeDetachImage(Image i);
+ private synchronized native void nativeDiscardFreeBuffers();
/**
* @return A return code {@code ACQUIRE_*}
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 5b0845c..264944f 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -125,6 +125,78 @@
All video codecs support flexible YUV 4:2:0 buffers since {@link
android.os.Build.VERSION_CODES#LOLLIPOP_MR1}.
+ <h4>Accessing Raw Video ByteBuffers on Older Devices</h4>
+ <p>
+ Prior to {@link android.os.Build.VERSION_CODES#LOLLIPOP} and {@link Image} support, you need to
+ use the {@link MediaFormat#KEY_STRIDE} and {@link MediaFormat#KEY_SLICE_HEIGHT} output format
+ values to understand the layout of the raw output buffers.
+ <p class=note>
+ Note that on some devices the slice-height is advertised as 0. This could mean either that the
+ slice-height is the same as the frame height, or that the slice-height is the frame height
+ aligned to some value (usually a power of 2). Unfortunately, there is no standard and simple way
+ to tell the actual slice height in this case. Furthermore, the vertical stride of the {@code U}
+ plane in planar formats is also not specified or defined, though usually it is half of the slice
+ height.
+ <p>
+ The {@link MediaFormat#KEY_WIDTH} and {@link MediaFormat#KEY_HEIGHT} keys specify the size of the
+ video frames; however, for most encondings the video (picture) only occupies a portion of the
+ video frame. This is represented by the 'crop rectangle'.
+ <p>
+ You need to use the following keys to get the crop rectangle of raw output images from the
+ {@linkplain #getOutputFormat output format}. If these keys are not present, the video occupies the
+ entire video frame.The crop rectangle is understood in the context of the output frame
+ <em>before</em> applying any {@linkplain MediaFormat#KEY_ROTATION rotation}.
+ <table style="width: 0%">
+ <thead>
+ <tr>
+ <th>Format Key</th>
+ <th>Type</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{@code "crop-left"}</td>
+ <td>Integer</td>
+ <td>The left-coordinate (x) of the crop rectangle</td>
+ </tr><tr>
+ <td>{@code "crop-top"}</td>
+ <td>Integer</td>
+ <td>The top-coordinate (y) of the crop rectangle</td>
+ </tr><tr>
+ <td>{@code "crop-right"}</td>
+ <td>Integer</td>
+ <td>The right-coordinate (x) <strong>MINUS 1</strong> of the crop rectangle</td>
+ </tr><tr>
+ <td>{@code "crop-bottom"}</td>
+ <td>Integer</td>
+ <td>The bottom-coordinate (y) <strong>MINUS 1</strong> of the crop rectangle</td>
+ </tr><tr>
+ <td colspan=3>
+ The right and bottom coordinates can be understood as the coordinates of the right-most
+ valid column/bottom-most valid row of the cropped output image.
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <p>
+ The size of the video frame (before rotation) can be calculated as such:
+ <pre class=prettyprint>
+ MediaFormat format = decoder.getOutputFormat(…);
+ int width = format.getInteger(MediaFormat.KEY_WIDTH);
+ if (format.containsKey("crop-left") && format.containsKey("crop-right")) {
+ width = format.getInteger("crop-right") + 1 - format.getInteger("crop-left");
+ }
+ int height = format.getInteger(MediaFormat.KEY_HEIGHT);
+ if (format.containsKey("crop-top") && format.containsKey("crop-bottom")) {
+ height = format.getInteger("crop-bottom") + 1 - format.getInteger("crop-top");
+ }
+ </pre>
+ <p class=note>
+ Also note that the meaning of {@link BufferInfo#offset BufferInfo.offset} was not consistent across
+ devices. On some devices the offset pointed to the top-left pixel of the crop rectangle, while on
+ most devices it pointed to the top-left pixel of the entire frame.
+
<h3>States</h3>
<p>
During its life a codec conceptually exists in one of three states: Stopped, Executing or
@@ -226,8 +298,8 @@
Codec-specific data in the format is automatically submitted to the codec upon {@link #start};
you <strong>MUST NOT</strong> submit this data explicitly. If the format did not contain codec
specific data, you can choose to submit it using the specified number of buffers in the correct
- order, according to the format requirements. Alternately, you can concatenate all codec-specific
- data and submit it as a single codec-config buffer.
+ order, according to the format requirements. In case of H.264 AVC, you can also concatenate all
+ codec-specific data and submit it as a single codec-config buffer.
<p>
Android uses the following codec-specific data buffers. These are also required to be set in
the track format for proper {@link MediaMuxer} track configuration. Each parameter set and the
@@ -284,6 +356,13 @@
<td class=NA>Not Used</td>
<td class=NA>Not Used</td>
</tr>
+ <tr>
+ <td>VP9</td>
+ <td>VP9 <a href="http://wiki.webmproject.org/vp9-codecprivate">CodecPrivate</a> Data
+ (optional)</td>
+ <td class=NA>Not Used</td>
+ <td class=NA>Not Used</td>
+ </tr>
</tbody>
</table>
@@ -535,6 +614,33 @@
Also since {@link android.os.Build.VERSION_CODES#M}, you can change the output Surface
dynamically using {@link #setOutputSurface setOutputSurface}.
+ <h4>Transformations When Rendering onto Surface</h4>
+
+ If the codec is configured into Surface mode, any crop rectangle, {@linkplain
+ MediaFormat#KEY_ROTATION rotation} and {@linkplain #setVideoScalingMode video scaling
+ mode} will be automatically applied with one exception:
+ <p class=note>
+ Prior to the {@link android.os.Build.VERSION_CODES#M} release, software decoders may not
+ have applied the rotation when being rendered onto a Surface. Unfortunately, there is no standard
+ and simple way to identify software decoders, or if they apply the rotation other than by trying
+ it out.
+ <p>
+ There are also some caveats.
+ <p class=note>
+ Note that the pixel aspect ratio is not considered when displaying the output onto the
+ Surface. This means that if you are using {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT} mode, you
+ must position the output Surface so that it has the proper final display aspect ratio. Conversely,
+ you can only use {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING} mode for content with
+ square pixels (pixel aspect ratio or 1:1).
+ <p class=note>
+ Note also that as of {@link android.os.Build.VERSION_CODES#N} release, {@link
+ #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING} mode may not work correctly for videos rotated
+ by 90 or 270 degrees.
+ <p class=note>
+ When setting the video scaling mode, note that it must be reset after each time the output
+ buffers change. Since the {@link #INFO_OUTPUT_BUFFERS_CHANGED} event is deprecated, you can
+ do this after each time the output format changes.
+
<h4>Using an Input Surface</h4>
<p>
When using an input Surface, there are no accessible input buffers, as buffers are automatically
@@ -2984,7 +3090,13 @@
/**
* The content is scaled, maintaining its aspect ratio, the whole
- * surface area is used, content may be cropped
+ * surface area is used, content may be cropped.
+ * <p class=note>
+ * This mode is only suitable for content with 1:1 pixel aspect ratio as you cannot
+ * configure the pixel aspect ratio for a {@link Surface}.
+ * <p class=note>
+ * As of {@link android.os.Build.VERSION_CODES#N} release, this mode may not work if
+ * the video is {@linkplain MediaFormat#KEY_ROTATION rotated} by 90 or 270 degrees.
*/
public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2;
@@ -2999,10 +3111,15 @@
/**
* If a surface has been specified in a previous call to {@link #configure}
* specifies the scaling mode to use. The default is "scale to fit".
- * <p class=note>The scaling mode may be reset to the <strong>default</strong> each time an
+ * <p class=note>
+ * The scaling mode may be reset to the <strong>default</strong> each time an
* {@link #INFO_OUTPUT_BUFFERS_CHANGED} event is received from the codec; therefore, the client
* must call this method after every buffer change event (and before the first output buffer is
- * released for rendering) to ensure consistent scaling mode.</p>
+ * released for rendering) to ensure consistent scaling mode.
+ * <p class=note>
+ * Since the {@link #INFO_OUTPUT_BUFFERS_CHANGED} event is deprecated, this can also be done
+ * after each {@link #INFO_OUTPUT_FORMAT_CHANGED} event.
+ *
* @throws IllegalArgumentException if mode is not recognized.
* @throws IllegalStateException if in the Released state.
*/
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index db5abca..8ada295f 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -541,6 +541,72 @@
* frame rate}. Use
* <code class=prettyprint>format.setString(MediaFormat.KEY_FRAME_RATE, null)</code>
* to clear any existing frame rate setting in the format.
+ * <p>
+ *
+ * The following table summarizes the format keys considered by this method.
+ *
+ * <table style="width: 0%">
+ * <thead>
+ * <tr>
+ * <th rowspan=3>OS Version(s)</th>
+ * <td colspan=3>{@code MediaFormat} keys considered for</th>
+ * </tr><tr>
+ * <th>Audio Codecs</th>
+ * <th>Video Codecs</th>
+ * <th>Encoders</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</th>
+ * <td rowspan=3>{@link MediaFormat#KEY_MIME}<sup>*</sup>,<br>
+ * {@link MediaFormat#KEY_SAMPLE_RATE},<br>
+ * {@link MediaFormat#KEY_CHANNEL_COUNT},</td>
+ * <td>{@link MediaFormat#KEY_MIME}<sup>*</sup>,<br>
+ * {@link CodecCapabilities#FEATURE_AdaptivePlayback}<sup>D</sup>,<br>
+ * {@link CodecCapabilities#FEATURE_SecurePlayback}<sup>D</sup>,<br>
+ * {@link CodecCapabilities#FEATURE_TunneledPlayback}<sup>D</sup>,<br>
+ * {@link MediaFormat#KEY_WIDTH},<br>
+ * {@link MediaFormat#KEY_HEIGHT},<br>
+ * <strong>no</strong> {@code KEY_FRAME_RATE}</td>
+ * <td rowspan=4>{@link MediaFormat#KEY_BITRATE_MODE},<br>
+ * {@link MediaFormat#KEY_PROFILE}
+ * (and/or {@link MediaFormat#KEY_AAC_PROFILE}<sup>~</sup>),<br>
+ * <!-- {link MediaFormat#KEY_QUALITY},<br> -->
+ * {@link MediaFormat#KEY_COMPLEXITY}
+ * (and/or {@link MediaFormat#KEY_FLAC_COMPRESSION_LEVEL}<sup>~</sup>)</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</th>
+ * <td rowspan=2>as above, plus<br>
+ * {@link MediaFormat#KEY_FRAME_RATE}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#M}</th>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#N}</th>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_PROFILE},<br>
+ * <!-- {link MediaFormat#KEY_MAX_BIT_RATE},<br> -->
+ * {@link MediaFormat#KEY_BIT_RATE}</td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_PROFILE},<br>
+ * {@link MediaFormat#KEY_LEVEL}<sup>+</sup>,<br>
+ * <!-- {link MediaFormat#KEY_MAX_BIT_RATE},<br> -->
+ * {@link MediaFormat#KEY_BIT_RATE},<br>
+ * {@link CodecCapabilities#FEATURE_IntraRefresh}<sup>E</sup></td>
+ * </tr>
+ * <tr>
+ * <td colspan=4>
+ * <p class=note><strong>Notes:</strong><br>
+ * *: must be specified; otherwise, method returns {@code false}.<br>
+ * +: method does not verify that the format parameters are supported
+ * by the specified level.<br>
+ * D: decoders only<br>
+ * E: encoders only<br>
+ * ~: if both keys are provided values must match
+ * </td>
+ * </tr>
+ * </tbody>
+ * </table>
*
* @param format media format with optional feature directives.
* @throws IllegalArgumentException if format is not a valid media format.
diff --git a/media/java/android/media/MediaCodecList.java b/media/java/android/media/MediaCodecList.java
index 42ce511..3cb4cbe 100644
--- a/media/java/android/media/MediaCodecList.java
+++ b/media/java/android/media/MediaCodecList.java
@@ -201,6 +201,9 @@
* <code class=prettyprint>format.setString(MediaFormat.KEY_FRAME_RATE, null)</code>
* to clear any existing frame rate setting in the format.
*
+ * @see MediaCodecList.CodecCapabilities.isFormatSupported for format keys
+ * considered per android versions when evaluating suitable codecs.
+ *
* @param format A decoder media format with optional feature directives.
* @throws IllegalArgumentException if format is not a valid media format.
* @throws NullPointerException if format is null.
@@ -222,6 +225,9 @@
* <code class=prettyprint>format.setString(MediaFormat.KEY_FRAME_RATE, null)</code>
* to clear any existing frame rate setting in the format.
*
+ * @see MediaCodecList.CodecCapabilities.isFormatSupported for format keys
+ * considered per android versions when evaluating suitable codecs.
+ *
* @param format An encoder media format with optional feature directives.
* @throws IllegalArgumentException if format is not a valid media format.
* @throws NullPointerException if format is null.
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index 24a400e4..9e560d5 100644
--- a/media/java/android/media/MediaExtractor.java
+++ b/media/java/android/media/MediaExtractor.java
@@ -68,6 +68,9 @@
* extractor.release();
* extractor = null;
* </pre>
+ *
+ * <p>This class requires the {@link android.Manifest.permission#INTERNET} permission
+ * when used with network-based content.
*/
final public class MediaExtractor {
public MediaExtractor() {
@@ -89,6 +92,10 @@
*
* @param context the Context to use when resolving the Uri
* @param uri the Content URI of the data you want to extract from.
+ *
+ * <p>When <code>uri</code> refers to a network file the
+ * {@link android.Manifest.permission#INTERNET} permission is required.
+ *
* @param headers the headers to be sent together with the request for the data.
* This can be {@code null} if no specific headers are to be sent with the
* request.
@@ -136,6 +143,10 @@
* Sets the data source (file-path or http URL) to use.
*
* @param path the path of the file, or the http URL
+ *
+ * <p>When <code>path</code> refers to a network file the
+ * {@link android.Manifest.permission#INTERNET} permission is required.
+ *
* @param headers the headers associated with the http request for the stream you want to play.
* This can be {@code null} if no specific headers are to be sent with the
* request.
@@ -181,6 +192,9 @@
* directory), and that the pathname should reference a world-readable file.
* As an alternative, the application could first open the file for reading,
* and then use the file descriptor form {@link #setDataSource(FileDescriptor)}.
+ *
+ * <p>When <code>path</code> refers to a network file the
+ * {@link android.Manifest.permission#INTERNET} permission is required.
*/
public final void setDataSource(@NonNull String path) throws IOException {
nativeSetDataSource(
@@ -333,7 +347,113 @@
/**
* Get the track format at the specified index.
+ *
* More detail on the representation can be found at {@link android.media.MediaCodec}
+ * <p>
+ * The following table summarizes support for format keys across android releases:
+ *
+ * <table style="width: 0%">
+ * <thead>
+ * <tr>
+ * <th rowspan=2>OS Version(s)</th>
+ * <td colspan=3>{@code MediaFormat} keys used for</th>
+ * </tr><tr>
+ * <th>All Tracks</th>
+ * <th>Audio Tracks</th>
+ * <th>Video Tracks</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN}</td>
+ * <td rowspan=8>{@link MediaFormat#KEY_MIME},<br>
+ * {@link MediaFormat#KEY_DURATION},<br>
+ * {@link MediaFormat#KEY_MAX_INPUT_SIZE}</td>
+ * <td rowspan=5>{@link MediaFormat#KEY_SAMPLE_RATE},<br>
+ * {@link MediaFormat#KEY_CHANNEL_COUNT},<br>
+ * {@link MediaFormat#KEY_CHANNEL_MASK},<br>
+ * gapless playback information<sup>.mp3, .mp4</sup>,<br>
+ * {@link MediaFormat#KEY_IS_ADTS}<sup>AAC if streaming</sup>,<br>
+ * codec-specific data<sup>AAC, Vorbis</sup></td>
+ * <td rowspan=2>{@link MediaFormat#KEY_WIDTH},<br>
+ * {@link MediaFormat#KEY_HEIGHT},<br>
+ * codec-specific data<sup>AVC, MPEG4</sup></td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}</td>
+ * <td rowspan=3>as above, plus<br>
+ * Pixel aspect ratio information<sup>AVC, *</sup></td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#KITKAT}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#KITKAT_WATCH}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td>
+ * <td rowspan=2>as above, plus<br>
+ * {@link MediaFormat#KEY_BIT_RATE}<sup>AAC</sup>,<br>
+ * codec-specific data<sup>Opus</sup></td>
+ * <td rowspan=2>as above, plus<br>
+ * {@link MediaFormat#KEY_ROTATION}<sup>.mp4</sup>,<br>
+ * {@link MediaFormat#KEY_BIT_RATE}<sup>MPEG4</sup>,<br>
+ * codec-specific data<sup>HEVC</sup></td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#M}</td>
+ * <td>as above, plus<br>
+ * gapless playback information<sup>Opus</sup></td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_FRAME_RATE} (integer)</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#N}</td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_TRACK_ID},<br>
+ * <!-- {link MediaFormat#KEY_MAX_BIT_RATE}<sup>#, .mp4</sup>,<br> -->
+ * {@link MediaFormat#KEY_BIT_RATE}<sup>#, .mp4</sup></td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_PCM_ENCODING},<br>
+ * {@link MediaFormat#KEY_PROFILE}<sup>AAC</sup></td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_HDR_STATIC_INFO}<sup>#, .webm</sup>,<br>
+ * {@link MediaFormat#KEY_COLOR_STANDARD}<sup>#</sup>,<br>
+ * {@link MediaFormat#KEY_COLOR_TRANSFER}<sup>#</sup>,<br>
+ * {@link MediaFormat#KEY_COLOR_RANGE}<sup>#</sup>,<br>
+ * {@link MediaFormat#KEY_PROFILE}<sup>MPEG2, H.263, MPEG4, AVC, HEVC, VP9</sup>,<br>
+ * {@link MediaFormat#KEY_LEVEL}<sup>H.263, MPEG4, AVC, HEVC, VP9</sup>,<br>
+ * codec-specific data<sup>VP9</sup></td>
+ * </tr>
+ * <tr>
+ * <td colspan=4>
+ * <p class=note><strong>Notes:</strong><br>
+ * #: container-specified value only.<br>
+ * .mp4, .webm…: for listed containers<br>
+ * MPEG4, AAC…: for listed codecs
+ * </td>
+ * </tr><tr>
+ * <td colspan=4>
+ * <p class=note>Note that that level information contained in the container many times
+ * does not match the level of the actual bitstream. You may want to clear the level using
+ * {@code MediaFormat.setString(KEY_LEVEL, null)} before using the track format to find a
+ * decoder that can play back a particular track.
+ * </td>
+ * </tr><tr>
+ * <td colspan=4>
+ * <p class=note><strong>*Pixel (sample) aspect ratio</strong> is returned in the following
+ * keys. The display width can be calculated for example as:
+ * <p align=center>
+ * display-width = display-height * crop-width / crop-height * sar-width / sar-height
+ * </td>
+ * </tr><tr>
+ * <th>Format Key</th><th>Value Type</th><th colspan=2>Description</th>
+ * </tr><tr>
+ * <td>{@code "sar-width"}</td><td>Integer</td><td colspan=2>Pixel aspect ratio width</td>
+ * </tr><tr>
+ * <td>{@code "sar-height"}</td><td>Integer</td><td colspan=2>Pixel aspect ratio height</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ *
*/
@NonNull
public MediaFormat getTrackFormat(int index) {
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index f7becf5..2f48ffb 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -20,7 +20,7 @@
import android.media.DecoderCapabilities.VideoDecoder;
import android.media.DecoderCapabilities.AudioDecoder;
import android.mtp.MtpConstants;
-
+import com.android.internal.util.Preconditions;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -69,8 +69,9 @@
// More video file types
public static final int FILE_TYPE_MP2PS = 200;
+ public static final int FILE_TYPE_QT = 201;
private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;
- private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;
+ private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_QT;
// Image file types
public static final int FILE_TYPE_JPEG = 31;
@@ -149,11 +150,15 @@
sMimeTypeMap.put(mimeType, Integer.valueOf(fileType));
}
- static void addFileType(String extension, int fileType, String mimeType, int mtpFormatCode) {
+ private static void addFileType(String extension, int fileType, String mimeType,
+ int mtpFormatCode, boolean primaryType) {
addFileType(extension, fileType, mimeType);
sFileTypeToFormatMap.put(extension, Integer.valueOf(mtpFormatCode));
sMimeTypeToFormatMap.put(mimeType, Integer.valueOf(mtpFormatCode));
- sFormatToMimeTypeMap.put(mtpFormatCode, mimeType);
+ if (primaryType) {
+ Preconditions.checkArgument(!sFormatToMimeTypeMap.containsKey(mtpFormatCode));
+ sFormatToMimeTypeMap.put(mtpFormatCode, mimeType);
+ }
}
private static boolean isWMAEnabled() {
@@ -181,20 +186,20 @@
}
static {
- addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);
- addFileType("MPGA", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);
- addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG);
- addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav", MtpConstants.FORMAT_WAV);
+ addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3, true);
+ addFileType("MPGA", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3, false);
+ addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG, false);
+ addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav", MtpConstants.FORMAT_WAV, true);
addFileType("AMR", FILE_TYPE_AMR, "audio/amr");
addFileType("AWB", FILE_TYPE_AWB, "audio/amr-wb");
if (isWMAEnabled()) {
- addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma", MtpConstants.FORMAT_WMA);
+ addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma", MtpConstants.FORMAT_WMA, true);
}
- addFileType("OGG", FILE_TYPE_OGG, "audio/ogg", MtpConstants.FORMAT_OGG);
- addFileType("OGG", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG);
- addFileType("OGA", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG);
- addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC);
- addFileType("AAC", FILE_TYPE_AAC, "audio/aac-adts", MtpConstants.FORMAT_AAC);
+ addFileType("OGG", FILE_TYPE_OGG, "audio/ogg", MtpConstants.FORMAT_OGG, false);
+ addFileType("OGG", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG, true);
+ addFileType("OGA", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG, false);
+ addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC, true);
+ addFileType("AAC", FILE_TYPE_AAC, "audio/aac-adts", MtpConstants.FORMAT_AAC, false);
addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska");
addFileType("MID", FILE_TYPE_MID, "audio/midi");
@@ -207,61 +212,63 @@
addFileType("OTA", FILE_TYPE_MID, "audio/midi");
addFileType("MXMF", FILE_TYPE_MID, "audio/midi");
- addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
- addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
- addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG);
- addFileType("M4V", FILE_TYPE_M4V, "video/mp4", MtpConstants.FORMAT_MPEG);
- addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);
- addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);
- addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);
- addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);
+ addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG, true);
+ addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG, false);
+ addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG, false);
+ addFileType("M4V", FILE_TYPE_M4V, "video/mp4", MtpConstants.FORMAT_MPEG, false);
+ addFileType("MOV", FILE_TYPE_QT, "video/quicktime", MtpConstants.FORMAT_MPEG, false);
+
+ addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER, true);
+ addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER, false);
+ addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER, false);
+ addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER, false);
addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");
addFileType("WEBM", FILE_TYPE_WEBM, "video/webm");
addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");
addFileType("AVI", FILE_TYPE_AVI, "video/avi");
if (isWMVEnabled()) {
- addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv", MtpConstants.FORMAT_WMV);
+ addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv", MtpConstants.FORMAT_WMV, true);
addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");
}
- addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);
- addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);
- addFileType("GIF", FILE_TYPE_GIF, "image/gif", MtpConstants.FORMAT_GIF);
- addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG);
- addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP);
- addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp", MtpConstants.FORMAT_DEFINED);
- addFileType("WEBP", FILE_TYPE_WEBP, "image/webp", MtpConstants.FORMAT_DEFINED);
+ addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG, true);
+ addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG, false);
+ addFileType("GIF", FILE_TYPE_GIF, "image/gif", MtpConstants.FORMAT_GIF, true);
+ addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG, true);
+ addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP, true);
+ addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp", MtpConstants.FORMAT_DEFINED, false);
+ addFileType("WEBP", FILE_TYPE_WEBP, "image/webp", MtpConstants.FORMAT_DEFINED, false);
- addFileType("DNG", FILE_TYPE_DNG, "image/x-adobe-dng", MtpConstants.FORMAT_DNG);
- addFileType("CR2", FILE_TYPE_CR2, "image/x-canon-cr2", MtpConstants.FORMAT_TIFF);
- addFileType("NEF", FILE_TYPE_NEF, "image/x-nikon-nef", MtpConstants.FORMAT_TIFF_EP);
- addFileType("NRW", FILE_TYPE_NRW, "image/x-nikon-nrw", MtpConstants.FORMAT_TIFF);
- addFileType("ARW", FILE_TYPE_ARW, "image/x-sony-arw", MtpConstants.FORMAT_TIFF);
- addFileType("RW2", FILE_TYPE_RW2, "image/x-panasonic-rw2", MtpConstants.FORMAT_TIFF);
- addFileType("ORF", FILE_TYPE_ORF, "image/x-olympus-orf", MtpConstants.FORMAT_TIFF);
- addFileType("RAF", FILE_TYPE_RAF, "image/x-fuji-raf", MtpConstants.FORMAT_DEFINED);
- addFileType("PEF", FILE_TYPE_PEF, "image/x-pentax-pef", MtpConstants.FORMAT_TIFF);
- addFileType("SRW", FILE_TYPE_SRW, "image/x-samsung-srw", MtpConstants.FORMAT_TIFF);
+ addFileType("DNG", FILE_TYPE_DNG, "image/x-adobe-dng", MtpConstants.FORMAT_DNG, true);
+ addFileType("CR2", FILE_TYPE_CR2, "image/x-canon-cr2", MtpConstants.FORMAT_TIFF, false);
+ addFileType("NEF", FILE_TYPE_NEF, "image/x-nikon-nef", MtpConstants.FORMAT_TIFF_EP, false);
+ addFileType("NRW", FILE_TYPE_NRW, "image/x-nikon-nrw", MtpConstants.FORMAT_TIFF, false);
+ addFileType("ARW", FILE_TYPE_ARW, "image/x-sony-arw", MtpConstants.FORMAT_TIFF, false);
+ addFileType("RW2", FILE_TYPE_RW2, "image/x-panasonic-rw2", MtpConstants.FORMAT_TIFF, false);
+ addFileType("ORF", FILE_TYPE_ORF, "image/x-olympus-orf", MtpConstants.FORMAT_TIFF, false);
+ addFileType("RAF", FILE_TYPE_RAF, "image/x-fuji-raf", MtpConstants.FORMAT_DEFINED, false);
+ addFileType("PEF", FILE_TYPE_PEF, "image/x-pentax-pef", MtpConstants.FORMAT_TIFF, false);
+ addFileType("SRW", FILE_TYPE_SRW, "image/x-samsung-srw", MtpConstants.FORMAT_TIFF, false);
- addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);
- addFileType("M3U", FILE_TYPE_M3U, "application/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);
- addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST);
- addFileType("WPL", FILE_TYPE_WPL, "application/vnd.ms-wpl", MtpConstants.FORMAT_WPL_PLAYLIST);
+ addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST, true);
+ addFileType("M3U", FILE_TYPE_M3U, "application/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST, false);
+ addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST, true);
+ addFileType("WPL", FILE_TYPE_WPL, "application/vnd.ms-wpl", MtpConstants.FORMAT_WPL_PLAYLIST, true);
addFileType("M3U8", FILE_TYPE_HTTPLIVE, "application/vnd.apple.mpegurl");
addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/mpegurl");
addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/x-mpegurl");
addFileType("FL", FILE_TYPE_FL, "application/x-android-drm-fl");
- addFileType("TXT", FILE_TYPE_TEXT, "text/plain", MtpConstants.FORMAT_TEXT);
- addFileType("HTM", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML);
- addFileType("HTML", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML);
+ addFileType("TXT", FILE_TYPE_TEXT, "text/plain", MtpConstants.FORMAT_TEXT, true);
+ addFileType("HTM", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML, true);
+ addFileType("HTML", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML, false);
addFileType("PDF", FILE_TYPE_PDF, "application/pdf");
- addFileType("DOC", FILE_TYPE_MS_WORD, "application/msword", MtpConstants.FORMAT_MS_WORD_DOCUMENT);
- addFileType("XLS", FILE_TYPE_MS_EXCEL, "application/vnd.ms-excel", MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET);
- addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/mspowerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION);
- addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC);
+ addFileType("DOC", FILE_TYPE_MS_WORD, "application/msword", MtpConstants.FORMAT_MS_WORD_DOCUMENT, true);
+ addFileType("XLS", FILE_TYPE_MS_EXCEL, "application/vnd.ms-excel", MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET, true);
+ addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/mspowerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION, true);
+ addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC, true);
addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");
addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");
addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p");
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 33e3957..d74aa81 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -49,12 +49,18 @@
* <tr><td>{@link #KEY_FRAME_RATE}</td><td>Integer or Float</td><td>required for <b>encoders</b>,
* optional for <b>decoders</b></td></tr>
* <tr><td>{@link #KEY_CAPTURE_RATE}</td><td>Integer</td><td></td></tr>
- * <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></td></tr>
+ * <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer (or Float)</td><td><b>encoder-only</b>,
+ * time-interval between key frames.
+ * Float support added in {@link android.os.Build.VERSION_CODES#N_MR1}</td></tr>
* <tr><td>{@link #KEY_INTRA_REFRESH_PERIOD}</td><td>Integer</td><td><b>encoder-only</b>, optional</td></tr>
* <tr><td>{@link #KEY_MAX_WIDTH}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution width</td></tr>
* <tr><td>{@link #KEY_MAX_HEIGHT}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution height</td></tr>
- * <tr><td>{@link #KEY_REPEAT_PREVIOUS_FRAME_AFTER}</td><td>Long</td><td><b>video encoder in surface-mode only</b></td></tr>
- * <tr><td>{@link #KEY_PUSH_BLANK_BUFFERS_ON_STOP}</td><td>Integer(1)</td><td><b>video decoder rendering to a surface only</b></td></tr>
+ * <tr><td>{@link #KEY_REPEAT_PREVIOUS_FRAME_AFTER}</td><td>Long</td><td><b>encoder in surface-mode
+ * only</b>, optional</td></tr>
+ * <tr><td>{@link #KEY_PUSH_BLANK_BUFFERS_ON_STOP}</td><td>Integer(1)</td><td><b>decoder rendering
+ * to a surface only</b>, optional</td></tr>
+ * <tr><td>{@link #KEY_TEMPORAL_LAYERING}</td><td>String</td><td><b>encoder only</b>, optional,
+ * temporal-layering schema</td></tr>
* </table>
* Specify both {@link #KEY_MAX_WIDTH} and {@link #KEY_MAX_HEIGHT} to enable
* adaptive playback (seamless resolution change) for a video decoder that
@@ -258,9 +264,20 @@
public static final String KEY_CAPTURE_RATE = "capture-rate";
/**
- * A key describing the frequency of I frames expressed in secs
- * between I frames.
- * The associated value is an integer.
+ * A key describing the frequency of key frames expressed in seconds between key frames.
+ * <p>
+ * This key is used by video encoders.
+ * A negative value means no key frames are requested after the first frame.
+ * A zero value means a stream containing all key frames is requested.
+ * <p class=note>
+ * Most video encoders will convert this value of the number of non-key-frames between
+ * key-frames, using the {@linkplain #KEY_FRAME_RATE frame rate} information; therefore,
+ * if the actual frame rate differs (e.g. input frames are dropped or the frame rate
+ * changes), the <strong>time interval</strong> between key frames will not be the
+ * configured value.
+ * <p>
+ * The associated value is an integer (or float since
+ * {@link android.os.Build.VERSION_CODES#N_MR1}).
*/
public static final String KEY_I_FRAME_INTERVAL = "i-frame-interval";
@@ -280,12 +297,18 @@
/**
* A key describing the temporal layering schema. This is an optional parameter
- * that applies only to video encoders. Use {@link MediaCodec#getInputFormat}
+ * that applies only to video encoders. Use {@link MediaCodec#getOutputFormat}
* after {@link MediaCodec#configure configure} to query if the encoder supports
- * the desired schema. Supported values are {@code webrtc.vp8.1-layer},
- * {@code webrtc.vp8.2-layer}, {@code webrtc.vp8.3-layer}, and {@code none}.
- * If the encoder does not support temporal layering, the input format will
- * not have an entry with this key.
+ * the desired schema. Supported values are {@code webrtc.vp8.N-layer},
+ * {@code android.generic.N}, {@code android.generic.N+M} and {@code none}, where
+ * {@code N} denotes the total number of non-bidirectional layers (which must be at least 1)
+ * and {@code M} denotes the total number of bidirectional layers (which must be non-negative).
+ * <p class=note>{@code android.generic.*} schemas have been added in {@link
+ * android.os.Build.VERSION_CODES#N_MR1}.
+ * <p>
+ * The encoder may support fewer temporal layers, in which case the output format
+ * will contain the configured schema. If the encoder does not support temporal
+ * layering, the output format will not have an entry with this key.
* The associated value is a string.
*/
public static final String KEY_TEMPORAL_LAYERING = "ts-schema";
@@ -295,17 +318,19 @@
* Stride (or row increment) is the difference between the index of a pixel
* and that of the pixel directly underneath. For YUV 420 formats, the
* stride corresponds to the Y plane; the stride of the U and V planes can
- * be calculated based on the color format.
+ * be calculated based on the color format, though it is generally undefined
+ * and depends on the device and release.
* The associated value is an integer, representing number of bytes.
*/
public static final String KEY_STRIDE = "stride";
/**
* A key describing the plane height of a multi-planar (YUV) video bytebuffer layout.
- * Slice height (or plane height) is the number of rows that must be skipped to get
- * from the top of the Y plane to the top of the U plane in the bytebuffer. In essence
+ * Slice height (or plane height/vertical stride) is the number of rows that must be skipped
+ * to get from the top of the Y plane to the top of the U plane in the bytebuffer. In essence
* the offset of the U plane is sliceHeight * stride. The height of the U/V planes
- * can be calculated based on the color format.
+ * can be calculated based on the color format, though it is generally undefined
+ * and depends on the device and release.
* The associated value is an integer, representing number of rows.
*/
public static final String KEY_SLICE_HEIGHT = "slice-height";
@@ -552,7 +577,9 @@
/**
* A key describing the desired clockwise rotation on an output surface.
* This key is only used when the codec is configured using an output surface.
- * The associated value is an integer, representing degrees.
+ * The associated value is an integer, representing degrees. Supported values
+ * are 0, 90, 180 or 270. This is an optional field; if not specified, rotation
+ * defaults to 0.
*
* @see MediaCodecInfo.CodecCapabilities#profileLevels
*/
diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java
index af26b0a..bdc0fda 100644
--- a/media/java/android/media/MediaMetadata.java
+++ b/media/java/android/media/MediaMetadata.java
@@ -804,8 +804,9 @@
* <li>{@link #METADATA_KEY_DISPLAY_ICON}</li>
* </ul>
* <p>
- * Large bitmaps may be scaled down by the system. To pass full
- * resolution images {@link Uri Uris} should be used with
+ * Large bitmaps may be scaled down by the system when
+ * {@link android.media.session.MediaSession#setMetadata} is called.
+ * To pass full resolution images {@link Uri Uris} should be used with
* {@link #putString}.
*
* @param key The key for referencing this value
diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java
index 7117fbd..e481aa1 100644
--- a/media/java/android/media/MediaMuxer.java
+++ b/media/java/android/media/MediaMuxer.java
@@ -266,6 +266,121 @@
/**
* Adds a track with the specified format.
+ * <p>
+ * The following table summarizes support for specific format keys across android releases.
+ * Keys marked with '+:' are required.
+ *
+ * <table style="width: 0%">
+ * <thead>
+ * <tr>
+ * <th rowspan=2>OS Version(s)</th>
+ * <td colspan=3>{@code MediaFormat} keys used for</th>
+ * </tr><tr>
+ * <th>All Tracks</th>
+ * <th>Audio Tracks</th>
+ * <th>Video Tracks</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}</td>
+ * <td rowspan=7>+: {@link MediaFormat#KEY_MIME}</td>
+ * <td rowspan=3>+: {@link MediaFormat#KEY_SAMPLE_RATE},<br>
+ * +: {@link MediaFormat#KEY_CHANNEL_COUNT},<br>
+ * +: <strong>codec-specific data<sup>AAC</sup></strong></td>
+ * <td rowspan=5>+: {@link MediaFormat#KEY_WIDTH},<br>
+ * +: {@link MediaFormat#KEY_HEIGHT},<br>
+ * no {@code KEY_ROTATION},
+ * use {@link #setOrientationHint setOrientationHint()}<sup>.mp4</sup>,<br>
+ * +: <strong>codec-specific data<sup>AVC, MPEG4</sup></strong></td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#KITKAT}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#KITKAT_WATCH}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td>
+ * <td rowspan=4>as above, plus<br>
+ * +: <strong>codec-specific data<sup>Vorbis & .webm</sup></strong></td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#M}</td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#KEY_BIT_RATE}<sup>AAC</sup></td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#N}</td>
+ * <td>as above, plus<br>
+ * <!-- {link MediaFormat#KEY_MAX_BIT_RATE}<sup>AAC, MPEG4</sup>,<br> -->
+ * {@link MediaFormat#KEY_BIT_RATE}<sup>MPEG4</sup>,<br>
+ * {@link MediaFormat#KEY_HDR_STATIC_INFO}<sup>#, .webm</sup>,<br>
+ * {@link MediaFormat#KEY_COLOR_STANDARD}<sup>#</sup>,<br>
+ * {@link MediaFormat#KEY_COLOR_TRANSFER}<sup>#</sup>,<br>
+ * {@link MediaFormat#KEY_COLOR_RANGE}<sup>#</sup>,<br>
+ * +: <strong>codec-specific data<sup>HEVC</sup></strong>,<br>
+ * codec-specific data<sup>VP9</sup></td>
+ * </tr>
+ * <tr>
+ * <td colspan=4>
+ * <p class=note><strong>Notes:</strong><br>
+ * #: storing into container metadata.<br>
+ * .mp4, .webm…: for listed containers<br>
+ * MPEG4, AAC…: for listed codecs
+ * </td>
+ * </tr><tr>
+ * <td colspan=4>
+ * <p class=note>Note that the codec-specific data for the track must be specified using
+ * this method. Furthermore, codec-specific data must not be passed/specified via the
+ * {@link #writeSampleData writeSampleData()} call.
+ * </td>
+ * </tr>
+ * </tbody>
+ * </table>
+ *
+ * <p>
+ * The following table summarizes codec support for containers across android releases:
+ *
+ * <table style="width: 0%">
+ * <thead>
+ * <tr>
+ * <th rowspan=2>OS Version(s)</th>
+ * <td colspan=3>Codec support</th>
+ * </tr><tr>
+ * <th>{@linkplain OutputFormat#MUXER_OUTPUT_MPEG_4 MP4}</th>
+ * <th>{@linkplain OutputFormat#MUXER_OUTPUT_WEBM WEBM}</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}</td>
+ * <td rowspan=6>{@link MediaFormat#MIMETYPE_AUDIO_AAC AAC},<br>
+ * {@link MediaFormat#MIMETYPE_AUDIO_AMR_NB NB-AMR},<br>
+ * {@link MediaFormat#MIMETYPE_AUDIO_AMR_WB WB-AMR},<br>
+ * {@link MediaFormat#MIMETYPE_VIDEO_H263 H.263},<br>
+ * {@link MediaFormat#MIMETYPE_VIDEO_MPEG4 MPEG-4},<br>
+ * {@link MediaFormat#MIMETYPE_VIDEO_AVC AVC} (H.264)</td>
+ * <td rowspan=3>Not supported</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#KITKAT}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#KITKAT_WATCH}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td>
+ * <td rowspan=3>{@link MediaFormat#MIMETYPE_AUDIO_VORBIS Vorbis},<br>
+ * {@link MediaFormat#MIMETYPE_VIDEO_VP8 VP8}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#M}</td>
+ * </tr><tr>
+ * <td>{@link android.os.Build.VERSION_CODES#N}</td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#MIMETYPE_VIDEO_HEVC HEVC} (H.265)</td>
+ * <td>as above, plus<br>
+ * {@link MediaFormat#MIMETYPE_VIDEO_VP9 VP9}</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ *
* @param format The media format for the track. This must not be an empty
* MediaFormat.
* @return The track index for this newly added track, and it should be used
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 92adfd9..30395b8 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -3494,7 +3494,7 @@
* @param extra an extra code, specific to the info. Typically
* implementation dependent.
* @return True if the method handled the info, false if it didn't.
- * Returning false, or not having an OnErrorListener at all, will
+ * Returning false, or not having an OnInfoListener at all, will
* cause the info to be discarded.
*/
boolean onInfo(MediaPlayer mp, int what, int extra);
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 73485af..abbace1 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -746,6 +746,27 @@
}
/**
+ * Sets the video encoding profile for recording. Call this method before prepare().
+ * Prepare() may perform additional checks on the parameter to make sure whether the
+ * specified profile and level are applicable, and sometimes the passed profile or
+ * level will be discarded due to codec capablity or to ensure the video recording
+ * can proceed smoothly based on the capabilities of the platform.
+ * @hide
+ * @param profile declared in {@link MediaCodecInfo.CodecProfileLevel}.
+ * @param level declared in {@link MediaCodecInfo.CodecProfileLevel}.
+ */
+ public void setVideoEncodingProfileLevel(int profile, int level) {
+ if (profile <= 0) {
+ throw new IllegalArgumentException("Video encoding profile is not positive");
+ }
+ if (level <= 0) {
+ throw new IllegalArgumentException("Video encoding level is not positive");
+ }
+ setParameter("video-param-encoder-profile=" + profile);
+ setParameter("video-param-encoder-level=" + level);
+ }
+
+ /**
* Currently not implemented. It does nothing.
* @deprecated Time lapse mode video recording using camera still image capture
* is not desirable, and will not be supported.
@@ -952,7 +973,7 @@
/* Do not change these values without updating their counterparts
* in include/media/mediarecorder.h!
*/
- /** Unspecified media recorder error.
+ /** Unspecified media recorder info.
* @see android.media.MediaRecorder.OnInfoListener
*/
public static final int MEDIA_RECORDER_INFO_UNKNOWN = 1;
@@ -1035,22 +1056,22 @@
/**
- * Interface definition for a callback to be invoked when an error
- * occurs while recording.
+ * Interface definition of a callback to be invoked to communicate some
+ * info and/or warning about the recording.
*/
public interface OnInfoListener
{
/**
- * Called when an error occurs while recording.
+ * Called to indicate an info or a warning during recording.
*
- * @param mr the MediaRecorder that encountered the error
- * @param what the type of error that has occurred:
+ * @param mr the MediaRecorder the info pertains to
+ * @param what the type of info or warning that has occurred
* <ul>
* <li>{@link #MEDIA_RECORDER_INFO_UNKNOWN}
* <li>{@link #MEDIA_RECORDER_INFO_MAX_DURATION_REACHED}
* <li>{@link #MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED}
* </ul>
- * @param extra an extra code, specific to the error type
+ * @param extra an extra code, specific to the info type
*/
void onInfo(MediaRecorder mr, int what, int extra);
}
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 8b6c38b..f6e2a0c 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -60,11 +60,14 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
+import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -451,6 +454,8 @@
private class MyMediaScannerClient implements MediaScannerClient {
+ private final SimpleDateFormat mDateFormatter;
+
private String mArtist;
private String mAlbumArtist; // use this if mArtist is missing
private String mAlbum;
@@ -463,6 +468,7 @@
private int mYear;
private int mDuration;
private String mPath;
+ private long mDate;
private long mLastModified;
private long mFileSize;
private String mWriter;
@@ -472,6 +478,11 @@
private int mWidth;
private int mHeight;
+ public MyMediaScannerClient() {
+ mDateFormatter = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
+ mDateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+ }
+
public FileEntry beginFile(String path, String mimeType, long lastModified,
long fileSize, boolean isDirectory, boolean noMedia) {
mMimeType = mimeType;
@@ -537,6 +548,7 @@
mYear = 0;
mDuration = 0;
mPath = path;
+ mDate = 0;
mLastModified = lastModified;
mWriter = null;
mCompilation = 0;
@@ -627,6 +639,14 @@
return result;
}
+ private long parseDate(String date) {
+ try {
+ return mDateFormatter.parse(date).getTime();
+ } catch (ParseException e) {
+ return 0;
+ }
+ }
+
private int parseSubstring(String s, int start, int defaultValue) {
int length = s.length();
if (start == length) return defaultValue;
@@ -684,6 +704,8 @@
mCompilation = parseSubstring(value, 0, 0);
} else if (name.equalsIgnoreCase("isdrm")) {
mIsDrm = (parseSubstring(value, 0, 0) == 1);
+ } else if (name.equalsIgnoreCase("date")) {
+ mDate = parseDate(value);
} else if (name.equalsIgnoreCase("width")) {
mWidth = parseSubstring(value, 0, 0);
} else if (name.equalsIgnoreCase("height")) {
@@ -830,6 +852,9 @@
if (resolution != null) {
map.put(Video.Media.RESOLUTION, resolution);
}
+ if (mDate > 0) {
+ map.put(Video.Media.DATE_TAKEN, mDate);
+ }
} else if (MediaFile.isImageFileType(mFileType)) {
// FIXME - add DESCRIPTION
} else if (MediaFile.isAudioFileType(mFileType)) {
diff --git a/media/java/android/media/MediaScannerConnection.java b/media/java/android/media/MediaScannerConnection.java
index d714672..471fa2c 100644
--- a/media/java/android/media/MediaScannerConnection.java
+++ b/media/java/android/media/MediaScannerConnection.java
@@ -133,6 +133,10 @@
}
try {
mContext.unbindService(this);
+ if (mClient instanceof ClientProxy) {
+ mClient = null;
+ }
+ mService = null;
} catch (IllegalArgumentException ex) {
if (false) {
Log.v(TAG, "disconnect failed: " + ex);
@@ -205,6 +209,7 @@
void scanNextPath() {
if (mNextPath >= mPaths.length) {
mConnection.disconnect();
+ mConnection = null;
return;
}
String mimeType = mMimeTypes != null ? mMimeTypes[mNextPath] : null;
diff --git a/media/java/android/media/PlayerBase.java b/media/java/android/media/PlayerBase.java
index 0f7dc9a..b262d97 100644
--- a/media/java/android/media/PlayerBase.java
+++ b/media/java/android/media/PlayerBase.java
@@ -181,10 +181,15 @@
* @return
*/
boolean isRestricted_sync() {
+ // check app ops
+ if (mHasAppOpsPlayAudio) {
+ return false;
+ }
+ // check bypass flag
if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {
return false;
}
- return !mHasAppOpsPlayAudio;
+ return true;
}
// Abstract methods a subclass needs to implement
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 3164930..9fafda4 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -133,6 +133,8 @@
private final IAppOpsService mAppOps;
private final IAppOpsCallback mAppOpsCallback;
+ private static IAudioService sService;
+
/**
* Constructor. Constructs a SoundPool object with the following
* characteristics:
@@ -492,11 +494,42 @@
}
}
+ private static IAudioService getService()
+ {
+ if (sService != null) {
+ return sService;
+ }
+ IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
+ sService = IAudioService.Stub.asInterface(b);
+ return sService;
+ }
+
private boolean isRestricted() {
+ // check app ops
+ if (mHasAppOpsPlayAudio) {
+ return false;
+ }
+ // check bypass flag
if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {
return false;
}
- return !mHasAppOpsPlayAudio;
+ // check force audibility flag and camera restriction
+ if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_AUDIBILITY_ENFORCED) != 0) {
+// FIXME: should also check usage when set properly by camera app
+// && (mAttributes.getUsage() == AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+ boolean cameraSoundForced = false;
+ try {
+ cameraSoundForced = getService().isCameraSoundForced();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Cannot access AudioService in isRestricted()");
+ } catch (NullPointerException e) {
+ Log.e(TAG, "Null AudioService in isRestricted()");
+ }
+ if (cameraSoundForced) {
+ return false;
+ }
+ }
+ return true;
}
private void updateAppOpsPlayAudio() {
diff --git a/media/java/android/media/midi/MidiDeviceServer.java b/media/java/android/media/midi/MidiDeviceServer.java
index f0abf71..fbc8615 100644
--- a/media/java/android/media/midi/MidiDeviceServer.java
+++ b/media/java/android/media/midi/MidiDeviceServer.java
@@ -73,6 +73,10 @@
private final Callback mCallback;
+ private final HashMap<IBinder, PortClient> mPortClients = new HashMap<IBinder, PortClient>();
+ private final HashMap<MidiInputPort, PortClient> mInputPortClients =
+ new HashMap<MidiInputPort, PortClient>();
+
public interface Callback {
/**
* Called to notify when an our device status has changed
@@ -102,6 +106,10 @@
abstract void close();
+ MidiInputPort getInputPort() {
+ return null;
+ }
+
@Override
public void binderDied() {
close();
@@ -152,9 +160,12 @@
mInputPorts.remove(mInputPort);
IoUtils.closeQuietly(mInputPort);
}
- }
- private final HashMap<IBinder, PortClient> mPortClients = new HashMap<IBinder, PortClient>();
+ @Override
+ MidiInputPort getInputPort() {
+ return mInputPort;
+ }
+ }
// Binder interface stub for receiving connection requests from clients
private final IMidiDeviceServer mServer = new IMidiDeviceServer.Stub() {
@@ -215,6 +226,10 @@
ParcelFileDescriptor[] pair = ParcelFileDescriptor.createSocketPair(
OsConstants.SOCK_SEQPACKET);
MidiInputPort inputPort = new MidiInputPort(pair[0], portNumber);
+ // Configure the server-side socket in non-blocking mode to avoid stalling
+ // the entire MIDI framework if client app code gets stuck inside 'onSend'
+ // handler.
+ IoUtils.setBlocking(pair[0].getFileDescriptor(), false);
MidiDispatcher dispatcher = mOutputPortDispatchers[portNumber];
synchronized (dispatcher) {
dispatcher.getSender().connect(inputPort);
@@ -228,6 +243,9 @@
synchronized (mPortClients) {
mPortClients.put(token, client);
}
+ synchronized (mInputPortClients) {
+ mInputPortClients.put(inputPort, client);
+ }
return pair[1];
} catch (IOException e) {
Log.e(TAG, "unable to create ParcelFileDescriptors in openOutputPort");
@@ -237,12 +255,19 @@
@Override
public void closePort(IBinder token) {
+ MidiInputPort inputPort = null;
synchronized (mPortClients) {
PortClient client = mPortClients.remove(token);
if (client != null) {
+ inputPort = client.getInputPort();
client.close();
}
}
+ if (inputPort != null) {
+ synchronized (mInputPortClients) {
+ mInputPortClients.remove(inputPort);
+ }
+ }
}
@Override
@@ -270,6 +295,9 @@
synchronized (mPortClients) {
mPortClients.put(token, client);
}
+ synchronized (mInputPortClients) {
+ mInputPortClients.put(inputPort, client);
+ }
return Process.myPid(); // for caller to detect same process ID
}
@@ -303,7 +331,7 @@
mOutputPortDispatchers = new MidiDispatcher[numOutputPorts];
for (int i = 0; i < numOutputPorts; i++) {
- mOutputPortDispatchers[i] = new MidiDispatcher();
+ mOutputPortDispatchers[i] = new MidiDispatcher(mInputPortFailureHandler);
}
mInputPortOpen = new boolean[mInputPortCount];
@@ -312,6 +340,20 @@
mGuard.open("close");
}
+ private final MidiDispatcher.MidiReceiverFailureHandler mInputPortFailureHandler =
+ new MidiDispatcher.MidiReceiverFailureHandler() {
+ public void onReceiverFailure(MidiReceiver receiver, IOException failure) {
+ Log.e(TAG, "MidiInputPort failed to send data", failure);
+ PortClient client = null;
+ synchronized (mInputPortClients) {
+ client = mInputPortClients.remove(receiver);
+ }
+ if (client != null) {
+ client.close();
+ }
+ }
+ };
+
// Constructor for MidiDeviceService.onCreate()
/* package */ MidiDeviceServer(IMidiManager midiManager, MidiReceiver[] inputPortReceivers,
MidiDeviceInfo deviceInfo, Callback callback) {
diff --git a/media/java/android/media/midi/MidiOutputPort.java b/media/java/android/media/midi/MidiOutputPort.java
index 0096995..54c31e3 100644
--- a/media/java/android/media/midi/MidiOutputPort.java
+++ b/media/java/android/media/midi/MidiOutputPort.java
@@ -83,7 +83,7 @@
}
} catch (IOException e) {
// FIXME report I/O failure?
- Log.e(TAG, "read failed");
+ Log.e(TAG, "read failed", e);
} finally {
IoUtils.closeQuietly(mInputStream);
}
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 7f9653d..0959961 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -407,12 +407,14 @@
/**
* Update the current metadata. New metadata can be created using
- * {@link android.media.MediaMetadata.Builder}.
+ * {@link android.media.MediaMetadata.Builder}. This operation may take time proportional to
+ * the size of the bitmap to replace large bitmaps with a scaled down copy.
*
* @param metadata The new metadata
+ * @see android.media.MediaMetadata.Builder#putBitmap
*/
public void setMetadata(@Nullable MediaMetadata metadata) {
- if (metadata != null ) {
+ if (metadata != null) {
metadata = (new MediaMetadata.Builder(metadata, mMaxBitmapSize)).build();
}
try {
diff --git a/media/java/android/media/soundtrigger/SoundTriggerDetector.java b/media/java/android/media/soundtrigger/SoundTriggerDetector.java
index df0961b..d5296ae 100644
--- a/media/java/android/media/soundtrigger/SoundTriggerDetector.java
+++ b/media/java/android/media/soundtrigger/SoundTriggerDetector.java
@@ -15,6 +15,7 @@
*/
package android.media.soundtrigger;
+import static android.hardware.soundtrigger.SoundTrigger.STATUS_OK;
import android.annotation.IntDef;
import android.annotation.NonNull;
@@ -243,27 +244,29 @@
boolean allowMultipleTriggers =
(recognitionFlags & RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS) != 0;
+ int status = STATUS_OK;
try {
- mSoundTriggerService.startRecognition(new ParcelUuid(mSoundModelId),
+ status = mSoundTriggerService.startRecognition(new ParcelUuid(mSoundModelId),
mRecognitionCallback, new RecognitionConfig(captureTriggerAudio,
allowMultipleTriggers, null, null));
} catch (RemoteException e) {
return false;
}
- return true;
+ return status == STATUS_OK;
}
/**
* Stops recognition for the associated model.
*/
public boolean stopRecognition() {
+ int status = STATUS_OK;
try {
- mSoundTriggerService.stopRecognition(new ParcelUuid(mSoundModelId),
+ status = mSoundTriggerService.stopRecognition(new ParcelUuid(mSoundModelId),
mRecognitionCallback);
} catch (RemoteException e) {
return false;
}
- return true;
+ return status == STATUS_OK;
}
/**
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index ecc4a0d..aee9d38e 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -776,8 +776,8 @@
mSurface = null;
mSurfaceView = new SurfaceView(getContext(), mAttrs, mDefStyleAttr) {
@Override
- protected void updateWindow(boolean force, boolean redrawNeeded) {
- super.updateWindow(force, redrawNeeded);
+ protected void updateWindow() {
+ super.updateWindow();
relayoutSessionOverlayView();
}};
// The surface view's content should be treated as secure all the time.
diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java
index 4082778..6970cff 100644
--- a/media/java/android/mtp/MtpDevice.java
+++ b/media/java/android/mtp/MtpDevice.java
@@ -48,7 +48,8 @@
*
* @param device the {@link android.hardware.usb.UsbDevice} for the MTP or PTP device
*/
- public MtpDevice(UsbDevice device) {
+ public MtpDevice(@NonNull UsbDevice device) {
+ Preconditions.checkNotNull(device);
mDevice = device;
}
@@ -61,7 +62,7 @@
* @param connection an open {@link android.hardware.usb.UsbDeviceConnection} for the device
* @return true if the device was successfully opened.
*/
- public boolean open(UsbDeviceConnection connection) {
+ public boolean open(@NonNull UsbDeviceConnection connection) {
boolean result = native_open(mDevice.getDeviceName(), connection.getFileDescriptor());
if (!result) {
connection.close();
@@ -94,7 +95,7 @@
*
* @return the device name
*/
- public String getDeviceName() {
+ public @NonNull String getDeviceName() {
return mDevice.getDeviceName();
}
@@ -110,16 +111,16 @@
}
@Override
- public String toString() {
+ public @NonNull String toString() {
return mDevice.getDeviceName();
}
/**
* Returns the {@link MtpDeviceInfo} for this device
*
- * @return the device info
+ * @return the device info, or null if fetching device info fails
*/
- public MtpDeviceInfo getDeviceInfo() {
+ public @Nullable MtpDeviceInfo getDeviceInfo() {
return native_get_device_info();
}
@@ -127,9 +128,9 @@
* Returns the list of IDs for all storage units on this device
* Information about each storage unit can be accessed via {@link #getStorageInfo}.
*
- * @return the list of storage IDs
+ * @return the list of storage IDs, or null if fetching storage IDs fails
*/
- public int[] getStorageIds() {
+ public @Nullable int[] getStorageIds() {
return native_get_storage_ids();
}
@@ -142,9 +143,9 @@
* @param format the format of the object to return, or zero for all formats
* @param objectHandle the parent object to query, -1 for the storage root,
* or zero for all objects
- * @return the object handles
+ * @return the object handles, or null if fetching object handles fails
*/
- public int[] getObjectHandles(int storageId, int format, int objectHandle) {
+ public @Nullable int[] getObjectHandles(int storageId, int format, int objectHandle) {
return native_get_object_handles(storageId, format, objectHandle);
}
@@ -158,7 +159,7 @@
* {@link MtpObjectInfo#getCompressedSize})
* @return the object's data, or null if reading fails
*/
- public byte[] getObject(int objectHandle, int objectSize) {
+ public @Nullable byte[] getObject(int objectHandle, int objectSize) {
Preconditions.checkArgumentNonnegative(objectSize, "objectSize should not be negative");
return native_get_object(objectHandle, objectSize);
}
@@ -176,7 +177,7 @@
* @param buffer Array to write data.
* @return Size of bytes that are actually read.
*/
- public long getPartialObject(int objectHandle, long offset, long size, byte[] buffer)
+ public long getPartialObject(int objectHandle, long offset, long size, @NonNull byte[] buffer)
throws IOException {
return native_get_partial_object(objectHandle, offset, size, buffer);
}
@@ -197,7 +198,7 @@
* @return Size of bytes that are actually read.
* @see MtpConstants#OPERATION_GET_PARTIAL_OBJECT_64
*/
- public long getPartialObject64(int objectHandle, long offset, long size, byte[] buffer)
+ public long getPartialObject64(int objectHandle, long offset, long size, @NonNull byte[] buffer)
throws IOException {
return native_get_partial_object_64(objectHandle, offset, size, buffer);
}
@@ -212,7 +213,7 @@
* @param objectHandle handle of the object to read
* @return the object's thumbnail, or null if reading fails
*/
- public byte[] getThumbnail(int objectHandle) {
+ public @Nullable byte[] getThumbnail(int objectHandle) {
return native_get_thumbnail(objectHandle);
}
@@ -220,9 +221,9 @@
* Retrieves the {@link MtpStorageInfo} for a storage unit.
*
* @param storageId the ID of the storage unit
- * @return the MtpStorageInfo
+ * @return the MtpStorageInfo, or null if fetching storage info fails
*/
- public MtpStorageInfo getStorageInfo(int storageId) {
+ public @Nullable MtpStorageInfo getStorageInfo(int storageId) {
return native_get_storage_info(storageId);
}
@@ -230,9 +231,9 @@
* Retrieves the {@link MtpObjectInfo} for an object.
*
* @param objectHandle the handle of the object
- * @return the MtpObjectInfo
+ * @return the MtpObjectInfo, or null if fetching object info fails
*/
- public MtpObjectInfo getObjectInfo(int objectHandle) {
+ public @Nullable MtpObjectInfo getObjectInfo(int objectHandle) {
return native_get_object_info(objectHandle);
}
@@ -279,7 +280,7 @@
* {@link android.os.Environment#getExternalStorageDirectory}
* @return true if the file transfer succeeds
*/
- public boolean importFile(int objectHandle, String destPath) {
+ public boolean importFile(int objectHandle, @NonNull String destPath) {
return native_import_file(objectHandle, destPath);
}
@@ -293,7 +294,7 @@
* @param descriptor file descriptor to write the data to for the file transfer.
* @return true if the file transfer succeeds
*/
- public boolean importFile(int objectHandle, ParcelFileDescriptor descriptor) {
+ public boolean importFile(int objectHandle, @NonNull ParcelFileDescriptor descriptor) {
return native_import_file(objectHandle, descriptor.getFd());
}
@@ -308,7 +309,8 @@
* @param descriptor file descriptor to read the data from.
* @return true if the file transfer succeeds
*/
- public boolean sendObject(int objectHandle, long size, ParcelFileDescriptor descriptor) {
+ public boolean sendObject(
+ int objectHandle, long size, @NonNull ParcelFileDescriptor descriptor) {
return native_send_object(objectHandle, size, descriptor.getFd());
}
@@ -319,9 +321,9 @@
* The returned {@link MtpObjectInfo} has the new object handle field filled in.
*
* @param info metadata of the entry
- * @return object info of the created entry or null if the operation failed.
+ * @return object info of the created entry, or null if sending object info fails
*/
- public MtpObjectInfo sendObjectInfo(MtpObjectInfo info) {
+ public @Nullable MtpObjectInfo sendObjectInfo(@NonNull MtpObjectInfo info) {
return native_send_object_info(info);
}
diff --git a/media/java/android/mtp/MtpDeviceInfo.java b/media/java/android/mtp/MtpDeviceInfo.java
index 86bd599..0304ee3 100644
--- a/media/java/android/mtp/MtpDeviceInfo.java
+++ b/media/java/android/mtp/MtpDeviceInfo.java
@@ -16,6 +16,8 @@
package android.mtp;
+import android.annotation.NonNull;
+
/**
* This class encapsulates information about an MTP device.
* This corresponds to the DeviceInfo Dataset described in
@@ -39,7 +41,7 @@
*
* @return the manufacturer name
*/
- public final String getManufacturer() {
+ public final @NonNull String getManufacturer() {
return mManufacturer;
}
@@ -48,7 +50,7 @@
*
* @return the model name
*/
- public final String getModel() {
+ public final @NonNull String getModel() {
return mModel;
}
@@ -57,7 +59,7 @@
*
* @return the device version
*/
- public final String getVersion() {
+ public final @NonNull String getVersion() {
return mVersion;
}
@@ -66,7 +68,7 @@
*
* @return the serial number
*/
- public final String getSerialNumber() {
+ public final @NonNull String getSerialNumber() {
return mSerialNumber;
}
@@ -110,7 +112,7 @@
* @see MtpConstants#OPERATION_SET_OBJECT_REFERENCES
* @see MtpConstants#OPERATION_SKIP
*/
- public final int[] getOperationsSupported() {
+ public final @NonNull int[] getOperationsSupported() {
return mOperationsSupported;
}
@@ -137,7 +139,7 @@
* @see MtpEvent#EVENT_OBJECT_PROP_DESC_CHANGED
* @see MtpEvent#EVENT_OBJECT_REFERENCES_CHANGED
*/
- public final int[] getEventsSupported() {
+ public final @NonNull int[] getEventsSupported() {
return mEventsSupported;
}
@@ -163,7 +165,7 @@
* Returns if the code set contains code.
* @hide
*/
- private static boolean isSupported(int[] set, int code) {
+ private static boolean isSupported(@NonNull int[] set, int code) {
for (final int element : set) {
if (element == code) {
return true;
diff --git a/media/java/android/mtp/MtpObjectInfo.java b/media/java/android/mtp/MtpObjectInfo.java
index 02092b1..35d8dfb 100644
--- a/media/java/android/mtp/MtpObjectInfo.java
+++ b/media/java/android/mtp/MtpObjectInfo.java
@@ -16,8 +16,13 @@
package android.mtp;
+import android.annotation.NonNull;
+import android.os.Build;
+
import com.android.internal.util.Preconditions;
+import dalvik.system.VMRuntime;
+
/**
* This class encapsulates information about an object on an MTP device.
* This corresponds to the ObjectInfo Dataset described in
@@ -40,10 +45,10 @@
private int mAssociationType;
private int mAssociationDesc;
private int mSequenceNumber;
- private String mName;
+ private String mName = "";
private long mDateCreated;
private long mDateModified;
- private String mKeywords;
+ private String mKeywords = "";
// only instantiated via JNI or via a builder
private MtpObjectInfo() {
@@ -311,7 +316,7 @@
*
* @return the object's name
*/
- public final String getName() {
+ public final @NonNull String getName() {
return mName;
}
@@ -340,7 +345,7 @@
*
* @return the object's keyword list
*/
- public final String getKeywords() {
+ public final @NonNull String getKeywords() {
return mKeywords;
}
@@ -435,12 +440,20 @@
return this;
}
- public Builder setKeywords(String value) {
+ public Builder setKeywords(@NonNull String value) {
+ if (VMRuntime.getRuntime().getTargetSdkVersion() > Build.VERSION_CODES.N_MR1) {
+ Preconditions.checkNotNull(value);
+ } else if (value == null) {
+ // Before N_MR1 we accept null value and it was regarded as an empty string in
+ // MtpDevice#sendObjectInfo.
+ value = "";
+ }
mObjectInfo.mKeywords = value;
return this;
}
- public Builder setName(String value) {
+ public Builder setName(@NonNull String value) {
+ Preconditions.checkNotNull(value);
mObjectInfo.mName = value;
return this;
}
diff --git a/media/java/android/mtp/MtpServer.java b/media/java/android/mtp/MtpServer.java
index 61fbfb9..99f93e4 100644
--- a/media/java/android/mtp/MtpServer.java
+++ b/media/java/android/mtp/MtpServer.java
@@ -16,6 +16,8 @@
package android.mtp;
+import com.android.internal.util.Preconditions;
+
/**
* Java wrapper for MTP/PTP support as USB responder.
* {@hide}
@@ -24,13 +26,15 @@
private long mNativeContext; // accessed by native methods
private final MtpDatabase mDatabase;
+ private final Runnable mOnTerminate;
static {
System.loadLibrary("media_jni");
}
- public MtpServer(MtpDatabase database, boolean usePtp) {
- mDatabase = database;
+ public MtpServer(MtpDatabase database, boolean usePtp, Runnable onTerminate) {
+ mDatabase = Preconditions.checkNotNull(database);
+ mOnTerminate = Preconditions.checkNotNull(onTerminate);
native_setup(database, usePtp);
database.setServer(this);
}
@@ -45,6 +49,7 @@
native_run();
native_cleanup();
mDatabase.close();
+ mOnTerminate.run();
}
public void sendObjectAdded(int handle) {
diff --git a/media/java/android/mtp/MtpStorageInfo.java b/media/java/android/mtp/MtpStorageInfo.java
index d1b86fc..af9f24a 100644
--- a/media/java/android/mtp/MtpStorageInfo.java
+++ b/media/java/android/mtp/MtpStorageInfo.java
@@ -16,6 +16,8 @@
package android.mtp;
+import android.annotation.NonNull;
+
/**
* This class encapsulates information about a storage unit on an MTP device.
* This corresponds to the StorageInfo Dataset described in
@@ -68,7 +70,7 @@
*
* @return the storage unit description
*/
- public final String getDescription() {
+ public final @NonNull String getDescription() {
return mDescription;
}
@@ -77,7 +79,7 @@
*
* @return the storage volume identifier
*/
- public final String getVolumeIdentifier() {
+ public final @NonNull String getVolumeIdentifier() {
return mVolumeIdentifier;
}
}
diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java
index 6321b7b..a811ad0 100644
--- a/media/java/android/service/media/MediaBrowserService.java
+++ b/media/java/android/service/media/MediaBrowserService.java
@@ -363,6 +363,7 @@
* @see BrowserRoot#EXTRA_RECENT
* @see BrowserRoot#EXTRA_OFFLINE
* @see BrowserRoot#EXTRA_SUGGESTED
+ * @see BrowserRoot#EXTRA_SUGGESTION_KEYWORDS
*/
public abstract @Nullable BrowserRoot onGetRoot(@NonNull String clientPackageName,
int clientUid, @Nullable Bundle rootHints);
@@ -500,6 +501,7 @@
* @see MediaBrowserService.BrowserRoot#EXTRA_RECENT
* @see MediaBrowserService.BrowserRoot#EXTRA_OFFLINE
* @see MediaBrowserService.BrowserRoot#EXTRA_SUGGESTED
+ * @see MediaBrowserService.BrowserRoot#EXTRA_SUGGESTION_KEYWORDS
*/
public final Bundle getBrowserRootHints() {
if (mCurConnection == null) {
@@ -735,6 +737,7 @@
*
* @see #EXTRA_OFFLINE
* @see #EXTRA_SUGGESTED
+ * @see #EXTRA_SUGGESTION_KEYWORDS
*/
public static final String EXTRA_RECENT = "android.service.media.extra.RECENT";
@@ -752,6 +755,7 @@
*
* @see #EXTRA_RECENT
* @see #EXTRA_SUGGESTED
+ * @see #EXTRA_SUGGESTION_KEYWORDS
*/
public static final String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE";
@@ -770,9 +774,31 @@
*
* @see #EXTRA_RECENT
* @see #EXTRA_OFFLINE
+ * @see #EXTRA_SUGGESTION_KEYWORDS
*/
public static final String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED";
+ /**
+ * The lookup key for a string that indicates specific keywords which will be considered
+ * when the browser service suggests media items.
+ *
+ * <p>When creating a media browser for a given media browser service, this key can be
+ * supplied as a root hint together with {@link #EXTRA_SUGGESTED} for retrieving suggested
+ * media items related with the keywords. The list of media items passed in
+ * {@link android.media.browse.MediaBrowser.SubscriptionCallback#onChildrenLoaded(String, List)}
+ * is considered ordered by relevance, first being the top suggestion.
+ * If the media browser service can provide such media items, the implementation must return
+ * the key in the root hint when {@link #onGetRoot(String, int, Bundle)} is called back.
+ *
+ * <p>The root hint may contain multiple keys.
+ *
+ * @see #EXTRA_RECENT
+ * @see #EXTRA_OFFLINE
+ * @see #EXTRA_SUGGESTED
+ */
+ public static final String EXTRA_SUGGESTION_KEYWORDS
+ = "android.service.media.extra.SUGGESTION_KEYWORDS";
+
final private String mRootId;
final private Bundle mExtras;
diff --git a/media/jni/android_media_ExifInterface.cpp b/media/jni/android_media_ExifInterface.cpp
index 731deae..10b3170 100644
--- a/media/jni/android_media_ExifInterface.cpp
+++ b/media/jni/android_media_ExifInterface.cpp
@@ -130,7 +130,6 @@
piex::PreviewImageData image_data;
if (!GetExifFromRawImage(piexStream.get(), String8("[piex stream]"), image_data)) {
- ALOGI("Raw image not detected");
return NULL;
}
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index c3993ae..724fc02 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -611,6 +611,23 @@
return OK;
}
+static void ImageReader_discardFreeBuffers(JNIEnv* env, jobject thiz) {
+ ALOGV("%s:", __FUNCTION__);
+ JNIImageReaderContext* ctx = ImageReader_getContext(env, thiz);
+ if (ctx == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", "ImageReader was already closed");
+ return;
+ }
+
+ BufferItemConsumer* bufferConsumer = ctx->getBufferConsumer();
+ status_t res = bufferConsumer->discardFreeBuffers();
+ if (res != OK) {
+ ALOGE("Buffer discard failed: %s (%d)", strerror(-res), res);
+ jniThrowRuntimeException(env,
+ "nativeDicardFreebuffers failed");
+ }
+}
+
static jobject ImageReader_getSurface(JNIEnv* env, jobject thiz)
{
ALOGV("%s: ", __FUNCTION__);
@@ -773,6 +790,7 @@
{"nativeImageSetup", "(Landroid/media/Image;)I", (void*)ImageReader_imageSetup },
{"nativeGetSurface", "()Landroid/view/Surface;", (void*)ImageReader_getSurface },
{"nativeDetachImage", "(Landroid/media/Image;)I", (void*)ImageReader_detachImage },
+ {"nativeDiscardFreeBuffers", "()V", (void*)ImageReader_discardFreeBuffers }
};
static const JNINativeMethod gImageMethods[] = {
diff --git a/media/jni/android_media_MediaDataSource.cpp b/media/jni/android_media_MediaDataSource.cpp
index d07942b..2ab7e39 100644
--- a/media/jni/android_media_MediaDataSource.cpp
+++ b/media/jni/android_media_MediaDataSource.cpp
@@ -26,6 +26,7 @@
#include "JNIHelp.h"
#include <binder/MemoryDealer.h>
+#include <drm/drm_framework_common.h>
#include <media/stagefright/foundation/ADebug.h>
#include <nativehelper/ScopedLocalRef.h>
@@ -159,4 +160,8 @@
return String8::format("JMediaDataSource(pid %d, uid %d)", getpid(), getuid());
}
+sp<DecryptHandle> JMediaDataSource::DrmInitialization(const char * /* mime */) {
+ return NULL;
+}
+
} // namespace android
diff --git a/media/jni/android_media_MediaDataSource.h b/media/jni/android_media_MediaDataSource.h
index 378baf4..39405d2 100644
--- a/media/jni/android_media_MediaDataSource.h
+++ b/media/jni/android_media_MediaDataSource.h
@@ -47,6 +47,7 @@
virtual void close();
virtual uint32_t getFlags();
virtual String8 toString();
+ virtual sp<DecryptHandle> DrmInitialization(const char *mime);
private:
// Protect all member variables with mLock because this object will be
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 922ad79..6c79ab7 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -172,6 +172,10 @@
return;
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setCamera(c->remote(), c->getRecordingProxy()),
"java/lang/RuntimeException", "setCamera failed.");
}
@@ -185,6 +189,10 @@
return;
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setVideoSource(vs), "java/lang/RuntimeException", "setVideoSource failed.");
}
@@ -199,6 +207,10 @@
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setAudioSource(as), "java/lang/RuntimeException", "setAudioSource failed.");
}
@@ -211,6 +223,10 @@
return;
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setOutputFormat(of), "java/lang/RuntimeException", "setOutputFormat failed.");
}
@@ -223,6 +239,10 @@
return;
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setVideoEncoder(ve), "java/lang/RuntimeException", "setVideoEncoder failed.");
}
@@ -235,6 +255,10 @@
return;
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setAudioEncoder(ae), "java/lang/RuntimeException", "setAudioEncoder failed.");
}
@@ -249,6 +273,10 @@
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
const char* params8 = env->GetStringUTFChars(params, NULL);
if (params8 == NULL)
@@ -271,6 +299,10 @@
}
int fd = jniGetFDFromFileDescriptor(env, fileDescriptor);
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
status_t opStatus = mr->setOutputFile(fd, offset, length);
process_media_recorder_call(env, opStatus, "java/io/IOException", "setOutputFile failed.");
}
@@ -280,6 +312,10 @@
{
ALOGV("setVideoSize(%d, %d)", width, height);
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
if (width <= 0 || height <= 0) {
jniThrowException(env, "java/lang/IllegalArgumentException", "invalid video size");
@@ -297,6 +333,10 @@
return;
}
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->setVideoFrameRate(rate), "java/lang/RuntimeException", "setVideoFrameRate failed.");
}
@@ -305,6 +345,10 @@
{
ALOGV("setMaxDuration(%d)", max_duration_ms);
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
char params[64];
sprintf(params, "max-duration=%d", max_duration_ms);
@@ -318,6 +362,10 @@
{
ALOGV("setMaxFileSize(%lld)", (long long)max_filesize_bytes);
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
char params[64];
sprintf(params, "max-filesize=%" PRId64, max_filesize_bytes);
@@ -330,6 +378,10 @@
{
ALOGV("prepare");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
jobject surface = env->GetObjectField(thiz, fields.surface);
if (surface != NULL) {
@@ -356,6 +408,10 @@
{
ALOGV("getMaxAmplitude");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return 0;
+ }
int result = 0;
process_media_recorder_call(env, mr->getMaxAmplitude(&result), "java/lang/RuntimeException", "getMaxAmplitude failed.");
return (jint) result;
@@ -366,6 +422,10 @@
{
ALOGV("getSurface");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return NULL;
+ }
sp<IGraphicBufferProducer> bufferProducer = mr->querySurfaceMediaSourceFromMediaServer();
if (bufferProducer == NULL) {
@@ -386,6 +446,10 @@
{
ALOGV("start");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->start(), "java/lang/RuntimeException", "start failed.");
}
@@ -394,6 +458,10 @@
{
ALOGV("stop");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->stop(), "java/lang/RuntimeException", "stop failed.");
}
@@ -402,6 +470,10 @@
{
ALOGV("pause");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->pause(), "java/lang/RuntimeException", "pause failed.");
}
@@ -410,6 +482,10 @@
{
ALOGV("resume");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->resume(), "java/lang/RuntimeException", "resume failed.");
}
@@ -418,6 +494,10 @@
{
ALOGV("native_reset");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
process_media_recorder_call(env, mr->reset(), "java/lang/RuntimeException", "native_reset failed.");
}
@@ -516,6 +596,10 @@
ALOGV("android_media_MediaRecorder_setInputSurface");
sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
+ if (mr == NULL) {
+ jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ return;
+ }
sp<PersistentSurface> persistentSurface = get_persistentSurface(env, object);
diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp
index 1faa0c4..8bcc85f 100644
--- a/media/jni/android_mtp_MtpDevice.cpp
+++ b/media/jni/android_mtp_MtpDevice.cpp
@@ -601,12 +601,12 @@
{
MtpDevice* device = get_device_from_object(env, thiz);
if (!device) {
- return JNI_FALSE;
+ return NULL;
}
// Updating existing objects is not supported.
if (env->GetIntField(info, field_objectInfo_handle) != -1) {
- return JNI_FALSE;
+ return NULL;
}
MtpObjectInfo* object_info = new MtpObjectInfo(-1);
diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk
index 0ff7658..d89b1e9 100644
--- a/media/mca/filterpacks/Android.mk
+++ b/media/mca/filterpacks/Android.mk
@@ -50,4 +50,8 @@
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
+# Bug: http://b/29823425 Disable constant-conversion warning triggered in
+# native/imageproc/to_rgba.c
+LOCAL_CFLAGS += -Wno-constant-conversion
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 590af06..4154ef0 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -16,6 +16,13 @@
package android.opengl;
+import android.content.Context;
+import android.os.Trace;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+
import java.io.Writer;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -29,15 +36,6 @@
import javax.microedition.khronos.opengles.GL;
import javax.microedition.khronos.opengles.GL10;
-import android.content.Context;
-import android.content.pm.ConfigurationInfo;
-import android.os.SystemProperties;
-import android.os.Trace;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
/**
* An implementation of SurfaceView that uses the dedicated surface for
* displaying OpenGL rendering.
@@ -119,9 +117,9 @@
* {@link #setRenderMode}. The default is continuous rendering.
* <p>
* <h3>Activity Life-cycle</h3>
- * A GLSurfaceView must be notified when the activity is paused and resumed. GLSurfaceView clients
- * are required to call {@link #onPause()} when the activity pauses and
- * {@link #onResume()} when the activity resumes. These calls allow GLSurfaceView to
+ * A GLSurfaceView must be notified when to pause and resume rendering. GLSurfaceView clients
+ * are required to call {@link #onPause()} when the activity stops and
+ * {@link #onResume()} when the activity starts. These calls allow GLSurfaceView to
* pause and resume the rendering thread, and also allow GLSurfaceView to release and recreate
* the OpenGL display.
* <p>
@@ -294,10 +292,12 @@
* resumed.
* <p>
* If set to true, then the EGL context may be preserved when the GLSurfaceView is paused.
- * Whether the EGL context is actually preserved or not depends upon whether the
- * Android device that the program is running on can support an arbitrary number of EGL
- * contexts or not. Devices that can only support a limited number of EGL contexts must
- * release the EGL context in order to allow multiple applications to share the GPU.
+ * <p>
+ * Prior to API level 11, whether the EGL context is actually preserved or not
+ * depends upon whether the Android device can support an arbitrary number of
+ * EGL contexts or not. Devices that can only support a limited number of EGL
+ * contexts must release the EGL context in order to allow multiple applications
+ * to share the GPU.
* <p>
* If set to false, the EGL context will be released when the GLSurfaceView is paused,
* and recreated when the GLSurfaceView is resumed.
@@ -554,9 +554,13 @@
/**
- * Inform the view that the activity is paused. The owner of this view must
- * call this method when the activity is paused. Calling this method will
- * pause the rendering thread.
+ * Pause the rendering thread, optionally tearing down the EGL context
+ * depending upon the value of {@link #setPreserveEGLContextOnPause(boolean)}.
+ *
+ * This method should be called when it is no longer desirable for the
+ * GLSurfaceView to continue rendering, such as in response to
+ * {@link android.app.Activity#onStop Activity.onStop}.
+ *
* Must not be called before a renderer has been set.
*/
public void onPause() {
@@ -564,10 +568,12 @@
}
/**
- * Inform the view that the activity is resumed. The owner of this view must
- * call this method when the activity is resumed. Calling this method will
- * recreate the OpenGL display and resume the rendering
- * thread.
+ * Resumes the rendering thread, re-creating the OpenGL context if necessary. It
+ * is the counterpart to {@link #onPause()}.
+ *
+ * This method should typically be called in
+ * {@link android.app.Activity#onStart Activity.onStart}.
+ *
* Must not be called before a renderer has been set.
*/
public void onResume() {
@@ -1354,7 +1360,7 @@
GLSurfaceView view = mGLSurfaceViewWeakRef.get();
boolean preserveEglContextOnPause = view == null ?
false : view.mPreserveEGLContextOnPause;
- if (!preserveEglContextOnPause || sGLThreadManager.shouldReleaseEGLContextWhenPausing()) {
+ if (!preserveEglContextOnPause) {
stopEglContextLocked();
if (LOG_SURFACE) {
Log.i("GLThread", "releasing EGL context because paused tid=" + getId());
@@ -1362,16 +1368,6 @@
}
}
- // When pausing, optionally terminate EGL:
- if (pausing) {
- if (sGLThreadManager.shouldTerminateEGLWhenPausing()) {
- mEglHelper.finish();
- if (LOG_SURFACE) {
- Log.i("GLThread", "terminating EGL because paused tid=" + getId());
- }
- }
- }
-
// Have we lost the SurfaceView surface?
if ((! mHasSurface) && (! mWaitingForSurface)) {
if (LOG_SURFACE) {
@@ -1411,7 +1407,7 @@
if (! mHaveEglContext) {
if (askedToReleaseEglContext) {
askedToReleaseEglContext = false;
- } else if (sGLThreadManager.tryAcquireEglContextLocked(this)) {
+ } else {
try {
mEglHelper.start();
} catch (RuntimeException t) {
@@ -1506,7 +1502,6 @@
if (createGlInterface) {
gl = (GL10) mEglHelper.createGL();
- sGLThreadManager.checkGLDriver(gl);
createGlInterface = false;
}
@@ -1888,111 +1883,16 @@
Log.i("GLThread", "exiting tid=" + thread.getId());
}
thread.mExited = true;
- if (mEglOwner == thread) {
- mEglOwner = null;
- }
notifyAll();
}
/*
- * Tries once to acquire the right to use an EGL
- * context. Does not block. Requires that we are already
- * in the sGLThreadManager monitor when this is called.
- *
- * @return true if the right to use an EGL context was acquired.
- */
- public boolean tryAcquireEglContextLocked(GLThread thread) {
- if (mEglOwner == thread || mEglOwner == null) {
- mEglOwner = thread;
- notifyAll();
- return true;
- }
- checkGLESVersion();
- if (mMultipleGLESContextsAllowed) {
- return true;
- }
- // Notify the owning thread that it should release the context.
- // TODO: implement a fairness policy. Currently
- // if the owning thread is drawing continuously it will just
- // reacquire the EGL context.
- if (mEglOwner != null) {
- mEglOwner.requestReleaseEglContextLocked();
- }
- return false;
- }
-
- /*
* Releases the EGL context. Requires that we are already in the
* sGLThreadManager monitor when this is called.
*/
public void releaseEglContextLocked(GLThread thread) {
- if (mEglOwner == thread) {
- mEglOwner = null;
- }
notifyAll();
}
-
- public synchronized boolean shouldReleaseEGLContextWhenPausing() {
- // Release the EGL context when pausing even if
- // the hardware supports multiple EGL contexts.
- // Otherwise the device could run out of EGL contexts.
- return mLimitedGLESContexts;
- }
-
- public synchronized boolean shouldTerminateEGLWhenPausing() {
- checkGLESVersion();
- return !mMultipleGLESContextsAllowed;
- }
-
- public synchronized void checkGLDriver(GL10 gl) {
- if (! mGLESDriverCheckComplete) {
- checkGLESVersion();
- String renderer = gl.glGetString(GL10.GL_RENDERER);
- if (mGLESVersion < kGLES_20) {
- mMultipleGLESContextsAllowed =
- ! renderer.startsWith(kMSM7K_RENDERER_PREFIX);
- notifyAll();
- }
- mLimitedGLESContexts = !mMultipleGLESContextsAllowed;
- if (LOG_SURFACE) {
- Log.w(TAG, "checkGLDriver renderer = \"" + renderer + "\" multipleContextsAllowed = "
- + mMultipleGLESContextsAllowed
- + " mLimitedGLESContexts = " + mLimitedGLESContexts);
- }
- mGLESDriverCheckComplete = true;
- }
- }
-
- private void checkGLESVersion() {
- if (! mGLESVersionCheckComplete) {
- mGLESVersion = SystemProperties.getInt(
- "ro.opengles.version",
- ConfigurationInfo.GL_ES_VERSION_UNDEFINED);
- if (mGLESVersion >= kGLES_20) {
- mMultipleGLESContextsAllowed = true;
- }
- if (LOG_SURFACE) {
- Log.w(TAG, "checkGLESVersion mGLESVersion =" +
- " " + mGLESVersion + " mMultipleGLESContextsAllowed = " + mMultipleGLESContextsAllowed);
- }
- mGLESVersionCheckComplete = true;
- }
- }
-
- /**
- * This check was required for some pre-Android-3.0 hardware. Android 3.0 provides
- * support for hardware-accelerated views, therefore multiple EGL contexts are
- * supported on all Android 3.0+ EGL drivers.
- */
- private boolean mGLESVersionCheckComplete;
- private int mGLESVersion;
- private boolean mGLESDriverCheckComplete;
- private boolean mMultipleGLESContextsAllowed;
- private boolean mLimitedGLESContexts;
- private static final int kGLES_20 = 0x20000;
- private static final String kMSM7K_RENDERER_PREFIX =
- "Q3Dimension MSM7500 ";
- private GLThread mEglOwner;
}
private static final GLThreadManager sGLThreadManager = new GLThreadManager();
diff --git a/packages/BackupRestoreConfirmation/res/values-fr/strings.xml b/packages/BackupRestoreConfirmation/res/values-fr/strings.xml
index b8d6b56..f40b02a 100644
--- a/packages/BackupRestoreConfirmation/res/values-fr/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-fr/strings.xml
@@ -18,10 +18,10 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="backup_confirm_title" msgid="827563724209303345">"Sauvegarde complète"</string>
<string name="restore_confirm_title" msgid="5469365809567486602">"Restauration complète"</string>
- <string name="backup_confirm_text" msgid="1878021282758896593">"Vous avez demandé une sauvegarde complète de l\'ensemble des données vers un ordinateur de bureau connecté. Voulez-vous l\'autoriser ?\n\nSi vous n\'avez pas demandé la sauvegarde vous-même, n\'autorisez pas la poursuite de l\'opération."</string>
+ <string name="backup_confirm_text" msgid="1878021282758896593">"Vous avez demandé une sauvegarde complète de l\'ensemble des données vers un ordinateur connecté. Voulez-vous l\'autoriser ?\n\nSi vous n\'avez pas demandé la sauvegarde vous-même, n\'autorisez pas la poursuite de l\'opération."</string>
<string name="allow_backup_button_label" msgid="4217228747769644068">"Sauvegarder mes données"</string>
<string name="deny_backup_button_label" msgid="6009119115581097708">"Ne pas sauvegarder"</string>
- <string name="restore_confirm_text" msgid="7499866728030461776">"Vous avez demandé une restauration complète de l\'ensemble des données à partir d\'un ordinateur de bureau connecté. Voulez-vous l\'autoriser ?\n\nSi vous n\'avez pas demandé vous-même la restauration, n\'autorisez pas sa poursuite. Cette opération remplacera toutes les données actuellement sur l\'appareil !"</string>
+ <string name="restore_confirm_text" msgid="7499866728030461776">"Vous avez demandé une restauration complète de l\'ensemble des données à partir d\'un ordinateur connecté. Voulez-vous l\'autoriser ?\n\nSi vous n\'avez pas demandé vous-même la restauration, n\'autorisez pas sa poursuite. Cette opération remplacera toutes les données actuellement sur l\'appareil !"</string>
<string name="allow_restore_button_label" msgid="3081286752277127827">"Restaurer mes données"</string>
<string name="deny_restore_button_label" msgid="1724367334453104378">"Ne pas restaurer"</string>
<string name="current_password_text" msgid="8268189555578298067">"Veuillez saisir votre mot de passe de sauvegarde actuel ci-dessous :"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml b/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
index d499771..9134649 100644
--- a/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
@@ -26,7 +26,7 @@
<string name="deny_restore_button_label" msgid="1724367334453104378">"ပြန်လည်ရယူခြင်းအား မပြုလုပ်ပါနှင့်"</string>
<string name="current_password_text" msgid="8268189555578298067">"သင့်လက်ရှိ အရံသိမ်းဆည်းမှု လျှို့ဝှက်စကားဝှက်အား ထည့်သွင်းပါ။"</string>
<string name="device_encryption_restore_text" msgid="1570864916855208992">"သင့်စက်၏ လျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက်စကားဝှက်ကို ထည့်သွင်းပါ။"</string>
- <string name="device_encryption_backup_text" msgid="5866590762672844664">"သင့်စက်၏လျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက် လျှို့ဝှက်စကားဝှက်အားထည့်ပါ။ အရံသိမ်းဆည်းမှု သိမ်းဆည်းနေရာတွင်လည်း အသုံးပြုမည်ဖြစ်သည်။"</string>
+ <string name="device_encryption_backup_text" msgid="5866590762672844664">"သင့်စက်၏အသွင်ပြောင်းခြင်းအတွက် စကားဝှက်ကို ထည့်ပါ။ အရန်မှတ်တမ်းတွင်လည်း အသုံးပြုပါမည်။"</string>
<string name="backup_enc_password_text" msgid="4981585714795233099">"ဒေတာအားလုံးအားအရန်သိမ်းဆည်းခြင်းပြီးလျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက် လျှို့ဝှက်နံပါတ်/စာကိုထည့်ပါ။ အကယ်၍ ကွက်လပ်ထားပါက ယခုသင့်လက်ရှိလျှို့ဝှက်စကားဝှက်အား အသုံးပြုပါမည်။"</string>
<string name="backup_enc_password_optional" msgid="1350137345907579306">"အကယ်၍ ဒေတာအားလုံးအားအရန်သိမ်းဆည်းခြင်းကို ဝှက်လိုပါက အောက်တွင်လျှို့ဝှက်နံပါတ်/စာကိုထည့်ပါ။"</string>
<string name="backup_enc_password_required" msgid="7889652203371654149">"သင်၏ ကိရိယာကို လျှို့ဝျက်ကုဒ် သွင်းထားရာ၊ သင်သည် သင်၏ ဘက်အာပ်ကိုပါ လျှို့ဝျက်ကုဒ် သွင်းရန် လိုအပ်သည်။ ကျေးဇူးပြုပြီး အောက်မှာ စကားဝှက်ကို ထည့်သွင်းပါ:"</string>
diff --git a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml b/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
index 41d3d79..e25570d 100644
--- a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
@@ -7,5 +7,5 @@
<string name="action_bar_label" msgid="917235635415966620">"ကွန်ယက်သို့ လက်မှတ်ထိုးဝင်ရန်"</string>
<string name="ssl_error_warning" msgid="6653188881418638872">"သင်ချိတ်ဆက်ရန် ကြိုးစားနေသည့် ကွန်ရက်သည် လုံခြုံရေးပြဿနာ ရှိနေသည်။"</string>
<string name="ssl_error_example" msgid="647898534624078900">"ဥပမာ၊ ဝင်ရောက်ရန် စာမျက်နှာသည် ပြသထားသည့် အဖွဲ့အစည်းနှင့် သက်ဆိုင်မှု မရှိနိုင်ပါ။"</string>
- <string name="ssl_error_continue" msgid="6492718244923937110">"ဘရောက်ဇာမှတစ်ဆင့် ရှေ့ဆက်ရန်"</string>
+ <string name="ssl_error_continue" msgid="6492718244923937110">"ဘရောက်ဇာမှတစ်ဆင့် ဆက်လုပ်ရန်"</string>
</resources>
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 6fb8b51..b58c87a 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -96,7 +96,7 @@
// Exit app if Network disappears.
final NetworkCapabilities networkCapabilities = mCm.getNetworkCapabilities(mNetwork);
if (networkCapabilities == null) {
- finish();
+ finishAndRemoveTask();
return;
}
mNetworkCallback = new NetworkCallback() {
@@ -163,7 +163,7 @@
mCaptivePortal.useNetwork();
break;
}
- finish();
+ finishAndRemoveTask();
}
@Override
diff --git a/packages/DocumentsUI/Android.mk b/packages/DocumentsUI/Android.mk
deleted file mode 100644
index 9d44a6d..0000000
--- a/packages/DocumentsUI/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-# The design lib requires that the client package use appcompat themes.
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
-# Supplies material design components, e.g. Snackbar.
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
-LOCAL_STATIC_JAVA_LIBRARIES += guava
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-# Not quite sure why it is necessary to explicitly pull in resources from the
-# appcompat lib, but the demo code indicates it's necessary (see
-# development/samples/Support7Demos/Android.mk)
-LOCAL_RESOURCE_DIR += \
- frameworks/support/v7/appcompat/res \
- frameworks/support/design/res \
- frameworks/support/v7/recyclerview/res
-
-# Again, required to pull in appcompat resources. See abovementioned demo code.
-LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages android.support.v7.appcompat \
- --extra-packages android.support.design \
- --extra-packages android.support.v7.recyclerview
-
-LOCAL_JACK_FLAGS := \
- -D jack.optimization.inner-class.accessors=true
-
-# Only enable asserts on userdebug/eng builds
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-LOCAL_JACK_FLAGS += -D jack.assert.policy=always
-endif
-
-LOCAL_PACKAGE_NAME := DocumentsUI
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml
deleted file mode 100644
index 69bcbc2..0000000
--- a/packages/DocumentsUI/AndroidManifest.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.documentsui">
-
- <uses-permission android:name="android.permission.GET_APP_GRANTED_URI_PERMISSIONS" />
- <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
- <uses-permission android:name="android.permission.REMOVE_TASKS" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.CACHE_CONTENT" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
- <application
- android:name=".DocumentsApplication"
- android:label="@string/app_label"
- android:supportsRtl="true">
-
- <activity
- android:name=".DocumentsActivity"
- android:theme="@style/DocumentsTheme"
- android:icon="@drawable/ic_doc_text">
- <intent-filter>
- <action android:name="android.intent.action.OPEN_DOCUMENT" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.OPENABLE" />
- <data android:mimeType="*/*" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.CREATE_DOCUMENT" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.OPENABLE" />
- <data android:mimeType="*/*" />
- </intent-filter>
- <intent-filter android:priority="100">
- <action android:name="android.intent.action.GET_CONTENT" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.OPENABLE" />
- <data android:mimeType="*/*" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <activity
- android:name=".LauncherActivity"
- android:label="@string/downloads_label"
- android:icon="@mipmap/ic_launcher_downloads"
- android:theme="@android:style/Theme.NoDisplay">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <activity
- android:name=".FilesActivity"
- android:label="@string/downloads_label"
- android:icon="@mipmap/ic_launcher_downloads"
- android:documentLaunchMode="intoExisting"
- android:theme="@style/DocumentsTheme">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.provider.action.BROWSE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.document/root" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW_DOWNLOADS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="application/zip"
- android:host="com.android.providers.downloads.documents"
- android:scheme="content" />
- <data android:mimeType="application/x-zip"
- android:host="com.android.providers.downloads.documents"
- android:scheme="content" />
- <data android:mimeType="application/x-zip-compressed"
- android:host="com.android.providers.downloads.documents"
- android:scheme="content" />
- </intent-filter>
- </activity>
-
- <activity
- android:name=".OpenExternalDirectoryActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar">
- <intent-filter>
- <action android:name="android.os.storage.action.OPEN_EXTERNAL_DIRECTORY" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <provider
- android:name=".RecentsProvider"
- android:authorities="com.android.documentsui.recents"
- android:exported="false"/>
-
- <receiver android:name=".PackageReceiver">
- <intent-filter>
- <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
- <action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
- <data android:scheme="package" />
- </intent-filter>
- </receiver>
-
- <receiver android:name=".BootReceiver" android:enabled="false">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
- </intent-filter>
- </receiver>
-
- <!-- Run FileOperationService in a separate process so that we can use FileLock class to
- wait until jumbo clip is done writing to disk before reading it. See ClipStorage for
- details. -->
- <service
- android:name=".services.FileOperationService"
- android:exported="false"
- android:process=":com.android.documentsui.services">
- </service>
- </application>
-</manifest>
diff --git a/packages/DocumentsUI/MOVED b/packages/DocumentsUI/MOVED
new file mode 100644
index 0000000..d1dc514
--- /dev/null
+++ b/packages/DocumentsUI/MOVED
@@ -0,0 +1 @@
+../../../../packages/apps/DocumentsUI
diff --git a/packages/DocumentsUI/app-perf-tests/Android.mk b/packages/DocumentsUI/app-perf-tests/Android.mk
deleted file mode 100644
index 3f12906..0000000
--- a/packages/DocumentsUI/app-perf-tests/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-#LOCAL_SDK_VERSION := current
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-
-LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator
-
-LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests
-LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/packages/DocumentsUI/app-perf-tests/AndroidManifest.xml b/packages/DocumentsUI/app-perf-tests/AndroidManifest.xml
deleted file mode 100644
index 0013b6b..0000000
--- a/packages/DocumentsUI/app-perf-tests/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.documentsui.appperftests">
-
- <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
-
- <application>
- <uses-library android:name="android.test.runner" />
-
- <activity
- android:name="com.android.documentsui.LauncherActivity" />
- </application>
-
- <!-- This package instrumentates itself, so the DocumentsUI process can be killed without
- killing the testing package. -->
- <instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.documentsui.appperftests"
- android:label="App performance tests for DocumentsUI" />
-
-</manifest>
diff --git a/packages/DocumentsUI/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java b/packages/DocumentsUI/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java
deleted file mode 100644
index ce2fc13..0000000
--- a/packages/DocumentsUI/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.support.test.uiautomator.UiDevice;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-
-@LargeTest
-public class FilesAppPerfTest extends InstrumentationTestCase {
-
- // Keys used to report metrics to APCT.
- private static final String KEY_FILES_COLD_START_PERFORMANCE_MEDIAN =
- "files-cold-start-performance-median";
- private static final String KEY_FILES_WARM_START_PERFORMANCE_MEDIAN =
- "files-warm-start-performance-median";
-
- private static final String TARGET_PACKAGE = "com.android.documentsui";
-
- private static final int NUM_MEASUREMENTS = 10;
-
- private LauncherActivity mActivity;
- private UiDevice mDevice;
-
- @Override
- public void setUp() {
- mDevice = UiDevice.getInstance(getInstrumentation());
- }
-
- public void testFilesColdStartPerformance() throws Exception {
- runFilesStartPerformanceTest(true);
- }
-
- public void testFilesWarmStartPerformance() throws Exception {
- runFilesStartPerformanceTest(false);
- }
-
- public void runFilesStartPerformanceTest(boolean cold) throws Exception {
- long[] measurements = new long[NUM_MEASUREMENTS];
- for (int i = 0; i < NUM_MEASUREMENTS; i++) {
- if (cold) {
- // Kill all providers, as well as DocumentsUI to measure a cold start.
- killProviders();
- mDevice.executeShellCommand("am force-stop " + TARGET_PACKAGE);
- }
- mDevice.waitForIdle();
-
- LauncherActivity.testCaseLatch = new CountDownLatch(1);
- mActivity = launchActivity(getInstrumentation().getTargetContext().getPackageName(),
- LauncherActivity.class, null);
- LauncherActivity.testCaseLatch.await();
- measurements[i] = LauncherActivity.measurement;
- }
-
- reportMetrics(cold ? KEY_FILES_COLD_START_PERFORMANCE_MEDIAN
- : KEY_FILES_WARM_START_PERFORMANCE_MEDIAN, measurements);
- }
-
- private void reportMetrics(String key, long[] measurements) {
- final Bundle status = new Bundle();
- Arrays.sort(measurements);
- final long median = measurements[NUM_MEASUREMENTS / 2 - 1];
- status.putDouble(key, median);
-
- getInstrumentation().sendStatus(Activity.RESULT_OK, status);
- }
-
- private void killProviders() throws Exception {
- final Context context = getInstrumentation().getContext();
- final PackageManager pm = context.getPackageManager();
- final ActivityManager am = (ActivityManager) context.getSystemService(
- Context.ACTIVITY_SERVICE);
- final Intent intent = new Intent(DocumentsContract.PROVIDER_INTERFACE);
- final List<ResolveInfo> providers = pm.queryIntentContentProviders(intent, 0);
- for (ResolveInfo info : providers) {
- final String packageName = info.providerInfo.packageName;
- am.killBackgroundProcesses(packageName);
- }
- }
-}
diff --git a/packages/DocumentsUI/app-perf-tests/src/com/android/documentsui/LauncherActivity.java b/packages/DocumentsUI/app-perf-tests/src/com/android/documentsui/LauncherActivity.java
deleted file mode 100644
index 21fc52e..0000000
--- a/packages/DocumentsUI/app-perf-tests/src/com/android/documentsui/LauncherActivity.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.EXTRA_BENCHMARK;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-
-import java.util.concurrent.CountDownLatch;
-
-public class LauncherActivity extends Activity {
- private static final String TARGET_PACKAGE = "com.android.documentsui";
- private static final int BENCHMARK_REQUEST_CODE = 1986;
-
- public static CountDownLatch testCaseLatch = null;
- public static long measurement = -1;
-
- private long mStartTime = -1;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- new Handler().post(new Runnable() {
- @Override public void run() {
- final Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT");
- intent.addCategory(Intent.CATEGORY_OPENABLE);
- intent.putExtra(EXTRA_BENCHMARK, true);
- intent.setType("*/*");
-
- mStartTime = System.currentTimeMillis();
- startActivityForResult(intent, BENCHMARK_REQUEST_CODE);
- }
- });
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (requestCode == BENCHMARK_REQUEST_CODE) {
- measurement = System.currentTimeMillis() - mStartTime;
- testCaseLatch.countDown();
- finish();
- }
- }
-}
diff --git a/packages/DocumentsUI/lint.xml b/packages/DocumentsUI/lint.xml
deleted file mode 100644
index 09661ba..0000000
--- a/packages/DocumentsUI/lint.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
- <!--
- Lint configuration for the framework-lint tool (go/fwlint). See
- http://tools.android.com/tips/lint for full docs on the lint tool.
- -->
-
- <!-- min-sdk doesn't apply to platform apps. -->
- <issue id="UsesMinSdkAttributes" severity="ignore" />
-
- <!-- Protected permissions don't apply to system apps. -->
- <issue id="ProtectedPermissions" severity="ignore" />
-
- <!-- Other recommended suppressions copied from go/fwlint. -->
- <issue id="Assert" severity="ignore" />
- <issue id="ClickableViewAccessibility" severity="ignore" />
- <issue id="GoogleAppIndexingWarning" severity="ignore" />
- <issue id="MissingPermission" severity="ignore" />
- <issue id="ParcelClassLoader" severity="ignore" />
- <issue id="ParcelCreator" severity="ignore" />
- <issue id="Registered" severity="ignore" />
- <issue id="RtlHardcoded" severity="ignore" />
- <issue id="ShiftFlags" severity="ignore" />
- <issue id="SuspiciousImport" severity="ignore" />
-
- <!-- Don't lint automatically translated strings. -->
- <issue id="all">
- <ignore path="res/values-*/strings.xml" />
- </issue>
-
- <!-- Don't warn about missing translations. -->
- <issue id="MissingTranslation">
- <ignore path="res/values/strings.xml" />
- </issue>
-
-</lint>
diff --git a/packages/DocumentsUI/perf-tests/Android.mk b/packages/DocumentsUI/perf-tests/Android.mk
deleted file mode 100644
index 39a08f7..0000000
--- a/packages/DocumentsUI/perf-tests/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- $(call all-java-files-under, ../tests/src/com/android/documentsui/bots) \
- ../tests/src/com/android/documentsui/ActivityTest.java \
- ../tests/src/com/android/documentsui/DocumentsProviderHelper.java \
- ../tests/src/com/android/documentsui/StubProvider.java
-
-LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator ub-janktesthelper espresso-core
-
-LOCAL_PACKAGE_NAME := DocumentsUIPerfTests
-LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/packages/DocumentsUI/perf-tests/AndroidManifest.xml b/packages/DocumentsUI/perf-tests/AndroidManifest.xml
deleted file mode 100644
index 97353e7..0000000
--- a/packages/DocumentsUI/perf-tests/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.documentsui.perftests">
-
- <application>
- <uses-library android:name="android.test.runner" />
- <provider
- android:name="com.android.documentsui.StressProvider"
- android:authorities="com.android.documentsui.stressprovider"
- android:exported="true"
- android:grantUriPermissions="true"
- android:permission="android.permission.MANAGE_DOCUMENTS"
- android:enabled="true">
- <intent-filter>
- <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
- </intent-filter>
- </provider>
- </application>
-
- <instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.documentsui"
- android:label="Performance tests for DocumentsUI" />
-
-</manifest>
diff --git a/packages/DocumentsUI/perf-tests/res/raw/earth_small.jpg b/packages/DocumentsUI/perf-tests/res/raw/earth_small.jpg
deleted file mode 100644
index dd2da3e..0000000
--- a/packages/DocumentsUI/perf-tests/res/raw/earth_small.jpg
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java b/packages/DocumentsUI/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
deleted file mode 100644
index bf056f1..0000000
--- a/packages/DocumentsUI/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.StressProvider.DEFAULT_AUTHORITY;
-import static com.android.documentsui.StressProvider.STRESS_ROOT_0_ID;
-import static com.android.documentsui.StressProvider.STRESS_ROOT_1_ID;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.EventListener;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-
-@LargeTest
-public class FilesActivityPerfTest extends ActivityTest<FilesActivity> {
-
- // Constants starting with KEY_ are used to report metrics to APCT.
- private static final String KEY_FILES_LISTED_PERFORMANCE_FIRST =
- "files-listed-performance-first";
-
- private static final String KEY_FILES_LISTED_PERFORMANCE_MEDIAN =
- "files-listed-performance-median";
-
- private static final String TESTED_URI =
- "content://com.android.documentsui.stressprovider/document/STRESS_ROOT_1_DOC";
-
- private static final int NUM_MEASUREMENTS = 10;
-
- public FilesActivityPerfTest() {
- super(FilesActivity.class);
- }
-
- @Override
- protected RootInfo getInitialRoot() {
- return rootDir0;
- }
-
- @Override
- protected String getTestingProviderAuthority() {
- return DEFAULT_AUTHORITY;
- }
-
- @Override
- protected void setupTestingRoots() throws RemoteException {
- rootDir0 = mDocsHelper.getRoot(STRESS_ROOT_0_ID);
- rootDir1 = mDocsHelper.getRoot(STRESS_ROOT_1_ID);
- }
-
- @Override
- public void initTestFiles() throws RemoteException {
- // Nothing to create, already done by StressProvider.
- }
-
- public void testFilesListedPerformance() throws Exception {
- final BaseActivity activity = getActivity();
-
- final List<Long> measurements = new ArrayList<Long>();
- EventListener listener;
- for (int i = 0; i < 10; i++) {
- final CountDownLatch signal = new CountDownLatch(1);
- listener = new EventListener() {
- @Override
- public void onDirectoryNavigated(Uri uri) {
- if (uri != null && TESTED_URI.equals(uri.toString())) {
- mStartTime = System.currentTimeMillis();
- } else {
- mStartTime = -1;
- }
- }
-
- @Override
- public void onDirectoryLoaded(Uri uri) {
- if (uri == null || !TESTED_URI.equals(uri.toString())) {
- return;
- }
- assertTrue(mStartTime != -1);
- getInstrumentation().waitForIdle(new Runnable() {
- @Override
- public void run() {
- assertTrue(mStartTime != -1);
- measurements.add(System.currentTimeMillis() - mStartTime);
- signal.countDown();
- }
- });
- }
-
- private long mStartTime = -1;
- };
-
- try {
- activity.addEventListener(listener);
- bots.roots.openRoot(STRESS_ROOT_1_ID);
- signal.await();
- } finally {
- activity.removeEventListener(listener);
- }
-
- assertEquals(i + 1, measurements.size());
-
- // Go back to the empty root.
- bots.roots.openRoot(STRESS_ROOT_0_ID);
- }
-
- assertEquals(NUM_MEASUREMENTS, measurements.size());
-
- final Bundle status = new Bundle();
- status.putDouble(KEY_FILES_LISTED_PERFORMANCE_FIRST, measurements.get(0));
-
- final Long[] rawMeasurements = measurements.toArray(new Long[NUM_MEASUREMENTS]);
- Arrays.sort(rawMeasurements);
-
- final long median = rawMeasurements[NUM_MEASUREMENTS / 2 - 1];
- status.putDouble(KEY_FILES_LISTED_PERFORMANCE_MEDIAN, median);
-
- getInstrumentation().sendStatus(Activity.RESULT_OK, status);
- }
-}
diff --git a/packages/DocumentsUI/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java b/packages/DocumentsUI/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
deleted file mode 100644
index cb2d904..0000000
--- a/packages/DocumentsUI/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.StressProvider.DEFAULT_AUTHORITY;
-import static com.android.documentsui.StressProvider.STRESS_ROOT_0_ID;
-import static com.android.documentsui.StressProvider.STRESS_ROOT_2_ID;
-
-import android.app.Activity;
-import android.os.RemoteException;
-import android.test.suitebuilder.annotation.LargeTest;
-
-import android.content.Intent;
-import android.content.Context;
-import android.support.test.jank.JankTest;
-import android.support.test.jank.JankTestBase;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.jank.GfxMonitor;
-import android.support.test.uiautomator.UiScrollable;
-import android.util.Log;
-
-import com.android.documentsui.FilesActivity;
-import com.android.documentsui.bots.RootsListBot;
-import com.android.documentsui.bots.DirectoryListBot;
-
-@LargeTest
-public class FilesJankPerfTest extends JankTestBase {
- private static final String DOCUMENTSUI_PACKAGE = "com.android.documentsui";
- private static final int MAX_FLINGS = 10;
- private static final int BOT_TIMEOUT = 5000;
-
- private RootsListBot mRootsListBot;
- private DirectoryListBot mDirListBot;
- private Activity mActivity = null;
-
- public void setUpInLoop() {
- final UiDevice device = UiDevice.getInstance(getInstrumentation());
- final Context context = getInstrumentation().getTargetContext();
- mRootsListBot = new RootsListBot(device, context, BOT_TIMEOUT);
- mDirListBot = new DirectoryListBot(device, context, BOT_TIMEOUT);
-
- final Intent intent = new Intent(context, FilesActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mActivity = getInstrumentation().startActivitySync(intent);
- }
-
- public void tearDownInLoop() {
- if (mActivity != null) {
- mActivity.finish();
- mActivity = null;
- }
- }
-
- public void setupAndOpenInLoop() throws Exception {
- setUpInLoop();
- openRoot();
- }
-
- public void openRoot() throws Exception {
- mRootsListBot.openRoot(STRESS_ROOT_2_ID);
- }
-
- @JankTest(expectedFrames=0, beforeLoop="setUpInLoop", afterLoop="tearDownInLoop")
- @GfxMonitor(processName=DOCUMENTSUI_PACKAGE)
- public void testOpenRootJankPerformance() throws Exception {
- openRoot();
- getInstrumentation().waitForIdleSync();
- }
-
- @JankTest(expectedFrames=0, beforeLoop="setupAndOpenInLoop", afterLoop="tearDownInLoop")
- @GfxMonitor(processName=DOCUMENTSUI_PACKAGE)
- public void testFlingJankPerformance() throws Exception {
- new UiScrollable(mDirListBot.findDocumentsList().getSelector()).flingToEnd(MAX_FLINGS);
- getInstrumentation().waitForIdleSync();
- }
-}
diff --git a/packages/DocumentsUI/perf-tests/src/com/android/documentsui/StressProvider.java b/packages/DocumentsUI/perf-tests/src/com/android/documentsui/StressProvider.java
deleted file mode 100644
index f9b06f8..0000000
--- a/packages/DocumentsUI/perf-tests/src/com/android/documentsui/StressProvider.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.content.pm.ProviderInfo;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.database.MatrixCursor.RowBuilder;
-import android.database.MatrixCursor;
-import android.graphics.Point;
-import android.os.CancellationSignal;
-import android.os.FileUtils;
-import android.os.ParcelFileDescriptor;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsContract.Root;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsProvider;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-/**
- * Provider with thousands of files for testing loading time of directories in DocumentsUI.
- * It doesn't support any file operations.
- */
-public class StressProvider extends DocumentsProvider {
-
- public static final String DEFAULT_AUTHORITY = "com.android.documentsui.stressprovider";
-
- // Empty root.
- public static final String STRESS_ROOT_0_ID = "STRESS_ROOT_0";
-
- // Root with thousands of directories.
- public static final String STRESS_ROOT_1_ID = "STRESS_ROOT_1";
-
- // Root with hundreds of files.
- public static final String STRESS_ROOT_2_ID = "STRESS_ROOT_2";
-
- private static final String STRESS_ROOT_0_DOC_ID = "STRESS_ROOT_0_DOC";
- private static final String STRESS_ROOT_1_DOC_ID = "STRESS_ROOT_1_DOC";
- private static final String STRESS_ROOT_2_DOC_ID = "STRESS_ROOT_2_DOC";
-
- private static final int STRESS_ROOT_1_ITEMS = 10000;
- private static final int STRESS_ROOT_2_ITEMS = 300;
-
- private static final String MIME_TYPE_IMAGE = "image/jpeg";
- private static final long REFERENCE_TIMESTAMP = 1459159369359L;
-
- private static final String[] DEFAULT_ROOT_PROJECTION = new String[] {
- Root.COLUMN_ROOT_ID, Root.COLUMN_FLAGS, Root.COLUMN_TITLE, Root.COLUMN_DOCUMENT_ID,
- Root.COLUMN_AVAILABLE_BYTES
- };
- private static final String[] DEFAULT_DOCUMENT_PROJECTION = new String[] {
- Document.COLUMN_DOCUMENT_ID, Document.COLUMN_MIME_TYPE, Document.COLUMN_DISPLAY_NAME,
- Document.COLUMN_LAST_MODIFIED, Document.COLUMN_FLAGS, Document.COLUMN_SIZE,
- };
-
- private String mAuthority = DEFAULT_AUTHORITY;
-
- // Map from a root document id to children document ids.
- private Map<String, ArrayList<StubDocument>> mChildDocuments = new HashMap<>();
-
- private Map<String, StubDocument> mDocuments = new HashMap<>();
- private Map<String, StubRoot> mRoots = new HashMap<>();
-
- @Override
- public void attachInfo(Context context, ProviderInfo info) {
- mAuthority = info.authority;
- super.attachInfo(context, info);
- }
-
- @Override
- public boolean onCreate() {
- StubDocument document;
-
- ArrayList<StubDocument> children = new ArrayList<StubDocument>();
- mChildDocuments.put(STRESS_ROOT_1_DOC_ID, children);
- for (int i = 0; i < STRESS_ROOT_1_ITEMS; i++) {
- document = StubDocument.createDirectory(i);
- mDocuments.put(document.id, document);
- children.add(document);
- }
-
- children = new ArrayList<StubDocument>();
- mChildDocuments.put(STRESS_ROOT_2_DOC_ID, children);
- for (int i = 0; i < STRESS_ROOT_2_ITEMS; i++) {
- try {
- document = StubDocument.createFile(
- getContext(), MIME_TYPE_IMAGE,
- com.android.documentsui.perftests.R.raw.earth_small,
- STRESS_ROOT_1_ITEMS + i);
- } catch (IOException e) {
- return false;
- }
- mDocuments.put(document.id, document);
- children.add(document);
- }
-
- mRoots.put(STRESS_ROOT_0_ID, new StubRoot(STRESS_ROOT_0_ID, STRESS_ROOT_0_DOC_ID));
- mRoots.put(STRESS_ROOT_1_ID, new StubRoot(STRESS_ROOT_1_ID, STRESS_ROOT_1_DOC_ID));
- mRoots.put(STRESS_ROOT_2_ID, new StubRoot(STRESS_ROOT_2_ID, STRESS_ROOT_2_DOC_ID));
-
- mDocuments.put(STRESS_ROOT_0_DOC_ID, StubDocument.createDirectory(STRESS_ROOT_0_DOC_ID));
- mDocuments.put(STRESS_ROOT_1_DOC_ID, StubDocument.createDirectory(STRESS_ROOT_1_DOC_ID));
- mDocuments.put(STRESS_ROOT_2_DOC_ID, StubDocument.createDirectory(STRESS_ROOT_2_DOC_ID));
-
- return true;
- }
-
- @Override
- public Cursor queryRoots(String[] projection) throws FileNotFoundException {
- final MatrixCursor result = new MatrixCursor(DEFAULT_ROOT_PROJECTION);
- for (StubRoot root : mRoots.values()) {
- includeRoot(result, root);
- }
- return result;
- }
-
- @Override
- public Cursor queryDocument(String documentId, String[] projection)
- throws FileNotFoundException {
- final MatrixCursor result = new MatrixCursor(DEFAULT_DOCUMENT_PROJECTION);
- final StubDocument document = mDocuments.get(documentId);
- includeDocument(result, document);
- return result;
- }
-
- @Override
- public Cursor queryChildDocuments(String parentDocumentId, String[] projection,
- String sortOrder)
- throws FileNotFoundException {
- final MatrixCursor result = new MatrixCursor(DEFAULT_DOCUMENT_PROJECTION);
- final ArrayList<StubDocument> childDocuments = mChildDocuments.get(parentDocumentId);
- if (childDocuments != null) {
- for (StubDocument document : childDocuments) {
- includeDocument(result, document);
- }
- }
- return result;
- }
-
- @Override
- public AssetFileDescriptor openDocumentThumbnail(String docId, Point sizeHint,
- CancellationSignal signal)
- throws FileNotFoundException {
- final StubDocument document = mDocuments.get(docId);
- return getContext().getResources().openRawResourceFd(document.thumbnail);
- }
-
- @Override
- public ParcelFileDescriptor openDocument(String docId, String mode,
- CancellationSignal signal)
- throws FileNotFoundException {
- throw new UnsupportedOperationException();
- }
-
- private void includeRoot(MatrixCursor result, StubRoot root) {
- final RowBuilder row = result.newRow();
- row.add(Root.COLUMN_ROOT_ID, root.id);
- row.add(Root.COLUMN_FLAGS, 0);
- row.add(Root.COLUMN_TITLE, root.id);
- row.add(Root.COLUMN_DOCUMENT_ID, root.documentId);
- }
-
- private void includeDocument(MatrixCursor result, StubDocument document) {
- final RowBuilder row = result.newRow();
- row.add(Document.COLUMN_DOCUMENT_ID, document.id);
- row.add(Document.COLUMN_DISPLAY_NAME, document.id);
- row.add(Document.COLUMN_SIZE, document.size);
- row.add(Document.COLUMN_MIME_TYPE, document.mimeType);
- row.add(Document.COLUMN_FLAGS,
- document.thumbnail != -1 ? Document.FLAG_SUPPORTS_THUMBNAIL : 0);
- row.add(Document.COLUMN_LAST_MODIFIED, document.lastModified);
- }
-
- private static String getStubDocumentIdForFile(File file) {
- return file.getAbsolutePath();
- }
-
- private static class StubDocument {
- final String mimeType;
- final String id;
- final int size;
- final long lastModified;
- final int thumbnail;
-
- private StubDocument(String mimeType, String id, int size, long lastModified,
- int thumbnail) {
- this.mimeType = mimeType;
- this.id = id;
- this.size = size;
- this.lastModified = lastModified;
- this.thumbnail = thumbnail;
- }
-
- public static StubDocument createDirectory(int index) {
- return new StubDocument(
- DocumentsContract.Document.MIME_TYPE_DIR, createRandomId(index), 0,
- createRandomTime(index), -1);
- }
-
- public static StubDocument createDirectory(String id) {
- return new StubDocument(DocumentsContract.Document.MIME_TYPE_DIR, id, 0, 0, -1);
- }
-
- public static StubDocument createFile(Context context, String mimeType, int thumbnail,
- int index) throws IOException {
- return new StubDocument(
- mimeType, createRandomId(index), createRandomSize(index),
- createRandomTime(index), thumbnail);
- }
-
- private static String createRandomId(int index) {
- final Random random = new Random(index);
- final StringBuilder builder = new StringBuilder();
- for (int i = 0; i < 20; i++) {
- builder.append((char) (random.nextInt(96) + 32));
- }
- builder.append(index); // Append a number to guarantee uniqueness.
- return builder.toString();
- }
-
- private static int createRandomSize(int index) {
- final Random random = new Random(index);
- return random.nextInt(1024 * 1024 * 100); // Up to 100 MB.
- }
-
- private static long createRandomTime(int index) {
- final Random random = new Random(index);
- // Up to 30 days backwards from REFERENCE_TIMESTAMP.
- return REFERENCE_TIMESTAMP - random.nextLong() % 1000L * 60 * 60 * 24 * 30;
- }
- }
-
- private static class StubRoot {
- final String id;
- final String documentId;
-
- public StubRoot(String id, String documentId) {
- this.id = id;
- this.documentId = documentId;
- }
- }
-}
diff --git a/packages/DocumentsUI/res/animator/dir_enter.xml b/packages/DocumentsUI/res/animator/dir_enter.xml
deleted file mode 100644
index 570104e..0000000
--- a/packages/DocumentsUI/res/animator/dir_enter.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:ordering="together">
-
- <objectAnimator
- android:valueFrom="0f"
- android:valueTo="1f"
- android:propertyName="alpha"
- android:valueType="floatType"
- android:duration="200"
- android:interpolator="@android:interpolator/decelerate_quad" />
-
- <!-- position property maps to AnimationView.setPosition -->
- <objectAnimator
- android:propertyName="position"
- android:valueFrom="1"
- android:valueTo="0"
- android:valueType="floatType"
- android:duration="350"
- android:interpolator="@android:interpolator/decelerate_quad" />
-
-</set>
diff --git a/packages/DocumentsUI/res/animator/dir_leave.xml b/packages/DocumentsUI/res/animator/dir_leave.xml
deleted file mode 100644
index 5929625..0000000
--- a/packages/DocumentsUI/res/animator/dir_leave.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:ordering="together">
-
- <objectAnimator
- android:valueFrom="1f"
- android:valueTo="0f"
- android:propertyName="alpha"
- android:valueType="floatType"
- android:duration="150"
- android:startOffset="100"
- android:interpolator="@android:interpolator/decelerate_quad" />
-
- <!-- position property maps to AnimationView.setPosition -->
- <objectAnimator
- android:valueFrom="0"
- android:valueTo="1"
- android:propertyName="position"
- android:valueType="floatType"
- android:duration="250"
- android:interpolator="@android:interpolator/accelerate_quad" />
-
-</set>
\ No newline at end of file
diff --git a/packages/DocumentsUI/res/animator/fade_in.xml b/packages/DocumentsUI/res/animator/fade_in.xml
deleted file mode 100644
index 3ce012b..0000000
--- a/packages/DocumentsUI/res/animator/fade_in.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
- android:valueFrom="0f"
- android:valueTo="1f"
- android:propertyName="alpha"
- android:valueType="floatType"
- android:duration="@android:integer/config_mediumAnimTime"
- android:interpolator="@android:interpolator/decelerate_quad" />
diff --git a/packages/DocumentsUI/res/animator/fade_out.xml b/packages/DocumentsUI/res/animator/fade_out.xml
deleted file mode 100644
index 8d02c77..0000000
--- a/packages/DocumentsUI/res/animator/fade_out.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
- android:valueFrom="1f"
- android:valueTo="0f"
- android:propertyName="alpha"
- android:valueType="floatType"
- android:duration="@android:integer/config_mediumAnimTime"
- android:interpolator="@android:interpolator/decelerate_quad" />
diff --git a/packages/DocumentsUI/res/color/item_details.xml b/packages/DocumentsUI/res/color/item_details.xml
deleted file mode 100644
index ac21fe3..0000000
--- a/packages/DocumentsUI/res/color/item_details.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_enabled="true"
- android:color="?android:attr/textColorPrimary"
- android:alpha="0.54" />
-</selector>
diff --git a/packages/DocumentsUI/res/color/item_doc_grid_border.xml b/packages/DocumentsUI/res/color/item_doc_grid_border.xml
deleted file mode 100644
index e144af8..0000000
--- a/packages/DocumentsUI/res/color/item_doc_grid_border.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_focused="true"
- android:color="?android:attr/colorAccent"/>
- <item
- android:color="@android:color/transparent" />
-</selector>
diff --git a/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml b/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml
deleted file mode 100644
index 7d7a110..0000000
--- a/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_activated="true"
- android:color="?android:attr/colorAccent"
- android:alpha="0.1" />
- <item
- android:color="@android:color/transparent" />
-</selector>
diff --git a/packages/DocumentsUI/res/color/item_root_icon.xml b/packages/DocumentsUI/res/color/item_root_icon.xml
deleted file mode 100644
index e1d7e61..0000000
--- a/packages/DocumentsUI/res/color/item_root_icon.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_activated="false"
- android:color="@*android:color/secondary_text_material_light" />
- <item
- android:state_activated="true"
- android:color="@color/root_activated_color" />
-</selector>
diff --git a/packages/DocumentsUI/res/color/item_root_primary_text.xml b/packages/DocumentsUI/res/color/item_root_primary_text.xml
deleted file mode 100644
index a5a65b2..0000000
--- a/packages/DocumentsUI/res/color/item_root_primary_text.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:state_activated="true" android:color="@color/root_activated_color" />
- <item android:state_focused="false" android:state_activated="true" android:color="@color/root_activated_color" />
- <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@*android:color/primary_text_default_material_light" />
- <item android:color="@*android:color/primary_text_default_material_light" />
-</selector>
diff --git a/packages/DocumentsUI/res/color/item_title.xml b/packages/DocumentsUI/res/color/item_title.xml
deleted file mode 100644
index 9fff2f1..0000000
--- a/packages/DocumentsUI/res/color/item_title.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_enabled="true"
- android:color="?android:attr/textColorPrimary"
- android:alpha="0.87" />
- <item
- android:state_enabled="false"
- android:color="?android:attr/textColorPrimary"
- android:alpha="0.54" />
-</selector>
diff --git a/packages/DocumentsUI/res/color/root_activated.xml b/packages/DocumentsUI/res/color/root_activated.xml
deleted file mode 100644
index 36a016d..0000000
--- a/packages/DocumentsUI/res/color/root_activated.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_activated="true" android:color="?android:attr/colorAccent" />
- <item android:color="@*android:color/secondary_text_material_light" />
-</selector>
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_breadcrumb_arrow_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_breadcrumb_arrow_am_alpha.png
deleted file mode 100644
index 67f890c..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_breadcrumb_arrow_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_cancel_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_cancel_alpha.png
deleted file mode 100644
index 1a9cd75..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_cancel_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_alert_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_alert_alpha.png
deleted file mode 100644
index 4c3d9a4..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_alert_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_info_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_info_alpha.png
deleted file mode 100644
index da56077..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_info_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder_alpha.png
deleted file mode 100644
index 874fde7..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_hamburger_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_hamburger_alpha.png
deleted file mode 100644
index 3f8ebd6..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_hamburger_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_copy_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_copy_alpha.png
deleted file mode 100644
index 9a9e570..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_copy_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_delete_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_delete_alpha.png
deleted file mode 100644
index dbbb602..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_delete_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder_am_alpha.png
deleted file mode 100644
index 1d25a2d..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search_alpha.png
deleted file mode 100644
index c593e7a..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share_alpha.png
deleted file mode 100644
index 20ba480..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am_alpha.png
deleted file mode 100644
index 5e66488..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid_alpha.png
deleted file mode 100644
index 7e15a8c..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list_alpha.png
deleted file mode 100644
index c15537a..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_download_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_download_alpha.png
deleted file mode 100644
index d9aacea..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_root_download_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent_alpha.png
deleted file mode 100644
index 9e003f0..0000000
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_breadcrumb_arrow_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_breadcrumb_arrow_am_alpha.png
deleted file mode 100644
index 9a048f1..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_breadcrumb_arrow_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_cancel_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_cancel_alpha.png
deleted file mode 100644
index 40a1a84..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_cancel_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_alert_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_alert_alpha.png
deleted file mode 100644
index e768d11..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_alert_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_info_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_info_alpha.png
deleted file mode 100644
index 5ef3dc0..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_info_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder_alpha.png
deleted file mode 100644
index 44e0e37..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_hamburger_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_hamburger_alpha.png
deleted file mode 100644
index ef2a48c..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_hamburger_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_copy_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_copy_alpha.png
deleted file mode 100644
index c94cc28..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_copy_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_delete_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_delete_alpha.png
deleted file mode 100644
index 999aa4c..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_delete_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder_am_alpha.png
deleted file mode 100644
index 6e6b870..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search_alpha.png
deleted file mode 100644
index 6b16343..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share_alpha.png
deleted file mode 100644
index f02d360..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am_alpha.png
deleted file mode 100644
index 04a12a4..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid_alpha.png
deleted file mode 100644
index 5f968d5..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list_alpha.png
deleted file mode 100644
index 7a8eae9..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_download_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_download_alpha.png
deleted file mode 100644
index c2c845e..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_root_download_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent_alpha.png
deleted file mode 100644
index f500d58..0000000
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_breadcrumb_arrow_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_breadcrumb_arrow_am_alpha.png
deleted file mode 100644
index 073583e..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_breadcrumb_arrow_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_cancel_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_cancel_alpha.png
deleted file mode 100644
index 6bc4372..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_cancel_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert_alpha.png
deleted file mode 100644
index 2ea6164..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_info_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_info_alpha.png
deleted file mode 100644
index 46ed12a..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_info_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder_alpha.png
deleted file mode 100644
index 1a4e7c4..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_hamburger_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_hamburger_alpha.png
deleted file mode 100644
index 4e0286b..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_hamburger_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy_alpha.png
deleted file mode 100644
index 1cf76a9..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_delete_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_delete_alpha.png
deleted file mode 100644
index 796ccd2..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_delete_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder_am_alpha.png
deleted file mode 100644
index 49272b0..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search_alpha.png
deleted file mode 100644
index 6381902..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share_alpha.png
deleted file mode 100644
index 81c80b7..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am_alpha.png
deleted file mode 100644
index 9e4fd61..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid_alpha.png
deleted file mode 100644
index 630188c..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list_alpha.png
deleted file mode 100644
index 73372f4..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download_alpha.png
deleted file mode 100644
index f5afb24..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent_alpha.png
deleted file mode 100644
index fe71c25..0000000
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_breadcrumb_arrow_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_breadcrumb_arrow_am_alpha.png
deleted file mode 100644
index b96cfd1..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_breadcrumb_arrow_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_cancel_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_cancel_alpha.png
deleted file mode 100644
index 51b4401..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_cancel_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert_alpha.png
deleted file mode 100644
index ed36f70..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_info_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_info_alpha.png
deleted file mode 100644
index a81eeb9..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_info_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder_alpha.png
deleted file mode 100644
index d7b2bfb..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_hamburger_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_hamburger_alpha.png
deleted file mode 100644
index 7dae60b..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_hamburger_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy_alpha.png
deleted file mode 100644
index 074ea88..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_delete_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_delete_alpha.png
deleted file mode 100644
index 6d7cb81..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_delete_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder_am_alpha.png
deleted file mode 100644
index 5c4360a..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search_alpha.png
deleted file mode 100644
index 3ae490e..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share_alpha.png
deleted file mode 100644
index 784933a..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am_alpha.png
deleted file mode 100644
index cb9d196..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid_alpha.png
deleted file mode 100644
index 7560f62..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list_alpha.png
deleted file mode 100644
index b9483c3..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download_alpha.png
deleted file mode 100644
index ce97c85..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent_alpha.png
deleted file mode 100644
index 1dad2a8..0000000
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_breadcrumb_arrow_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_breadcrumb_arrow_am_alpha.png
deleted file mode 100644
index 6f2dc5b..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_breadcrumb_arrow_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_cab_cancel_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_cab_cancel_alpha.png
deleted file mode 100644
index df42fee..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_cab_cancel_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_dialog_alert_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_dialog_alert_alpha.png
deleted file mode 100644
index 3f4d539..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_dialog_alert_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_dialog_info_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_dialog_info_alpha.png
deleted file mode 100644
index c8f86b9..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_dialog_info_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_grid_folder_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_grid_folder_alpha.png
deleted file mode 100644
index ca6be0e..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_grid_folder_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_hamburger_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_hamburger_alpha.png
deleted file mode 100644
index 5c747ed..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_hamburger_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_copy_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_copy_alpha.png
deleted file mode 100644
index 1f6af72..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_copy_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_delete_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_delete_alpha.png
deleted file mode 100644
index f2b75c3..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_delete_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_new_folder_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_new_folder_am_alpha.png
deleted file mode 100644
index 073d8533..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_new_folder_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_search_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_search_alpha.png
deleted file mode 100644
index 21be572..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_search_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_share_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_share_alpha.png
deleted file mode 100644
index 5a8544ce..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_share_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_sortby_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_sortby_am_alpha.png
deleted file mode 100644
index 631663a..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_sortby_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_view_grid_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_view_grid_alpha.png
deleted file mode 100644
index 5d1e8d9..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_view_grid_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_view_list_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_view_list_alpha.png
deleted file mode 100644
index 7c1506b..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_menu_view_list_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_root_download_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_root_download_alpha.png
deleted file mode 100644
index 8c83bff..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_root_download_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_root_recent_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_root_recent_alpha.png
deleted file mode 100644
index 68df974..0000000
--- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_root_recent_alpha.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable/band_select_overlay.xml b/packages/DocumentsUI/res/drawable/band_select_overlay.xml
deleted file mode 100644
index ba4d526..0000000
--- a/packages/DocumentsUI/res/drawable/band_select_overlay.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/band_select_background" />
- <stroke android:width="1dp" android:color="@color/band_select_border" />
-</shape>
diff --git a/packages/DocumentsUI/res/drawable/cabinet.xml b/packages/DocumentsUI/res/drawable/cabinet.xml
deleted file mode 100644
index 843ffc7..0000000
--- a/packages/DocumentsUI/res/drawable/cabinet.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="672dp"
- android:height="921dp"
- android:viewportWidth="672.0"
- android:viewportHeight="921.0">
- <path
- android:pathData="M286,0c5,0,10,0,15,0c0.1,1.8,1.5,1.8,2.8,2.1c11.1,2,22.1,4,33.2,6.1c31.8,6.1,63.7,12.3,95.5,18.5 c16.1,3.1,32.1,6.2,48.2,9.3c26,4.9,52.1,9.3,78,14.6c10.8,2.2,21.6,4.6,32.3,6.5c11.3,2,22.6,4.7,34,6c7.9,0.9,7.9,1.1,7.9,9.2 c0,237.3,0,474.5,0,711.8c-1.5,0.9,-3,2,-4.6,2.8c-18.3,8.3,-36.6,16.6,-54.8,25c-29.3,13.4,-58.5,26.8,-87.8,40.3 c-23.5,10.9,-47,21.8,-70.4,32.8c-2.1,1,-4.2,1.5,-6.3,1.1c-6.8,-1.3,-13.6,-2.5,-20.1,-4.9c5.9,-0.3,11.4,1.9,17.1,2.9c5.9,1.1,5.9,1,5.9,-4.9 c0,-17.1,0.1,-34.3,0,-51.4c-0.3,-68.9,-0.7,-137.8,-1,-206.7c0,-35.8,0,-71.6,0.1,-107.4c0,-3.8,-0.6,-5.2,-4.7,-3.7c-7.9,2.9,-16,5.4,-24.1,7.8 c-14.1,4.3,-27.8,10,-42.2,13.2c0,-64,0,-127.9,-0.1,-191.9c0,-4.1,1.3,-5.9,5.1,-7c21,-6.6,42,-13.4,63,-20.2c2.3,-0.8,4.4,-1.8,4,-4.9 c0,-59.3,0,-118.7,0,-178c0,-1.3,-0.7,-2,-2,-2c-2.6,-0.4,-5.2,-0.7,-7.8,-1.2c-30.2,-5.3,-60.5,-10.6,-90.7,-16c-31.9,-5.6,-63.7,-11.3,-95.6,-16.9 c-24.9,-4.4,-49.8,-8.7,-74.6,-13.1C117.1,75.6,93.1,71.3,69,67c-0.3,-0.3,-0.7,-0.7,-1,-1c17.4,-5.3,34.8,-10.7,52.3,-15.9 c29.4,-8.7,58.8,-17.2,88.2,-25.8c24.3,-7.1,48.6,-14.2,72.9,-21.4C283.1,2.4,285.6,2.7,286,0z"
- android:fillColor="#EFEFEE"/>
- <path
- android:pathData="M412,307c0.4,3,-1.7,4.1,-4,4.9c-21,6.8,-42,13.6,-63,20.2c-3.8,1.2,-5.1,3,-5.1,7C340,403.1,340,467,340,531 c-11.8,-1.2,-23.3,-4.5,-34.9,-6.5c-10,-1.7,-19.9,-4.6,-30.1,-5.5c-0.7,-0.3,-1.4,-0.9,-2.2,-1c-19.8,-4,-39.5,-8,-59.3,-12c-12.2,-2.4,-24.3,-4.7,-36.5,-7 c-0.9,-0.3,-1.8,-0.8,-2.8,-1c-24.5,-4.9,-48.9,-9.9,-73.5,-14.6C89.3,481.3,78,477.1,66,478c-0.7,-1.6,-2.1,-1.8,-3.6,-2.1 c-11.1,-2.2,-22.2,-4.7,-33.3,-6.7c-9.7,-1.7,-19.1,-4.9,-29.1,-5.3c0,-64.3,0,-128.7,0,-193c0.8,-0.2,1.6,-0.4,2.4,-0.7c19,-7.8,37.9,-15.9,57.1,-23.4 c5.4,-2.1,6.7,-4.8,6.6,-10.2c-0.2,-55.1,-0.1,-110.2,-0.1,-165.4c0,-1.9,-1.4,-4.6,1.9,-5.4c0.3,0.3,0.7,0.7,1,1c-1.3,4.9,-1,9.9,-1,14.9 c0,51.1,0,102.3,0,153.4c0,1.2,0,2.3,0,3.5c0.1,3.5,1.2,5.9,5.3,6.5c7,1.1,14,2.6,21,3.9c22.1,4.3,44.1,8.6,66.2,12.8 c27.3,5.2,54.6,10.1,81.9,15.3c21.8,4.1,43.5,8.5,65.2,12.6c28.1,5.4,56.2,10.8,84.3,15.8C398.4,306.8,405.1,310.5,412,307z M105,329c0,3.3,0,6.7,-0.1,10c-0.1,2.5,0.4,3.6,3.4,4.2c30,5.3,59.9,10.9,89.8,16.5c3.4,0.6,5.1,0.2,4.9,-3.7 c-0.2,-3.3,-0.1,-6.7,-0.1,-10c0.5,-3.6,-0.1,-6.3,-4.7,-6.1c-1.1,0.1,-2.2,-0.6,-3.4,-0.8c-28.3,-5,-56.6,-9.9,-84.9,-14.9 C105.6,323.4,104.5,325.2,105,329z M65.9,280.8c13.7,2.5,27.4,4.9,41.1,7.4c32.6,5.9,65.2,11.8,97.8,17.8 c41.4,7.6,82.8,15.2,124.2,22.8c6.8,1.2,13.3,1.4,20,-1.3c9.3,-3.6,18.9,-6.3,28.4,-9.4c6.4,-2.1,12.8,-4.2,19.2,-6.4 c-4.2,-2,-8.3,-3,-12.4,-3.8c-22.6,-4.2,-45.3,-8,-67.9,-12.6c-14.6,-3,-29.2,-5.6,-43.8,-8.5c-24,-4.6,-48,-9.2,-72,-13.7c-15.9,-3,-31.8,-6.2,-47.8,-9.2 c-19,-3.6,-38,-7.3,-57,-10.6c-9.9,-1.7,-19.6,-4.5,-29.7,-5.2C48,255.6,30.1,263,12.2,270.4c0,0.4,0,0.7,0,1.1 C30.1,274.6,48,277.7,65.9,280.8z"
- android:fillColor="#EAEAEA"/>
- <path
- android:pathData="M672,782c-6,0.9,-11.1,4.3,-16.4,6.9c-30.8,15,-61.5,30.3,-92.3,45.4c-34.8,17.1,-69.5,34.3,-104.5,51.1 c-13,6.3,-26,12.8,-39,19.1c-1.5,0.7,-3.7,1,-3.9,3.4c-3.7,0,-7.3,0,-11,0c-0.4,-3,-3.1,-2.3,-4.7,-2.7c-19.3,-4.8,-38.6,-9.5,-57.9,-14.1 c-27.5,-6.5,-55.2,-12.7,-82.6,-19.4c-30.9,-7.5,-61.8,-15,-92.7,-22.1c-24.8,-5.8,-49.5,-12,-74.3,-18C70.8,826.5,48.9,821.3,27,816 c-1.1,-0.3,-2.3,-0.5,-3.3,-1c-3.2,-1.3,-3.5,-3.3,-0.7,-5.4c0.9,-0.7,2,-1.2,3.1,-1.7c12,-5.3,24,-10.7,36,-16c0.4,-0.2,0.9,-0.2,1.9,-0.3 c0,3.6,0,7,0,10.5c0,1.6,-0.5,3.5,2,3.9c0.7,2.8,3.2,2.5,5.2,3c39.3,9,78.7,18.1,118.1,27c43.9,10,87.7,20,131.6,29.9 c9.7,2.2,19.2,4.9,29.1,6c1.1,1.5,2.6,0.9,4,1l0,0c4.1,2,8.5,2.6,13,3l0,0c7.2,2.4,14.4,4.3,22,5l0,0c6.5,2.5,13.3,3.6,20.1,4.9 c2.1,0.4,4.2,-0.1,6.3,-1.1c23.5,-11,46.9,-21.9,70.4,-32.8c29.2,-13.5,58.5,-26.9,87.8,-40.3c18.3,-8.4,36.6,-16.6,54.8,-25 c1.6,-0.7,3.1,-1.9,4.6,-2.8c2,-2.9,1.1,-6.2,0.9,-9.2c-0.3,-4.7,1.9,-5.5,5.7,-4.7c10.8,2.2,21.6,4.6,32.5,6.9C672,778.7,672,780.3,672,782z "
- android:fillColor="#E6E4E4"/>
- <path
- android:pathData="M350,872c-9.9,-1.1,-19.4,-3.9,-29.1,-6C277,856,233.1,846,189.2,836c-39.4,-9,-78.7,-18,-118.1,-27 c-2,-0.4,-4.5,-0.2,-5.2,-3c0,-85.7,0,-171.4,0.1,-257.1c6.5,0.1,12.7,2.3,19,3.6c26.4,5.4,52.8,10.9,79.2,16.5c25.9,5.4,51.8,11,77.7,16.4 c26.2,5.5,52.5,11,78.7,16.5c30.1,6.3,60.2,12.6,90.3,19c0.3,68.9,0.7,137.8,1,206.7c0.1,17.1,0,34.3,0,51.4c0,5.9,0,6,-5.9,4.9 c-5.7,-1.1,-11.2,-3.2,-17.1,-2.9c0,0,0,0,0,0c-7,-3.1,-14.2,-5.4,-22,-5c0,0,0,0,0,0c-3.9,-2.9,-8.4,-2.9,-13,-3c0,0,0,0,0,0 C352.9,871.5,351.4,872.1,350,872z M177,687c0,3.2,0.1,6.3,0,9.5c-0.1,2.7,0.7,4,3.8,4.6c29.7,5.8,59.3,11.7,89,17.7 c2.4,0.5,4.7,0.1,4.9,-2.6c0.4,-3.7,1.2,-7.6,-0.6,-11.2c1,-3,1.2,-5.3,-3,-6c-29.6,-5.4,-59.2,-10.8,-88.7,-16.5C177.7,681.6,176.5,682.8,177,687 z"
- android:fillColor="#E5E5E5"/>
- <path
- android:pathData="M411,621c-30.1,-6.3,-60.2,-12.6,-90.3,-19c-26.2,-5.5,-52.5,-11,-78.7,-16.5c-25.9,-5.5,-51.8,-11,-77.7,-16.4 c-26.4,-5.5,-52.8,-11.1,-79.2,-16.5c-6.3,-1.3,-12.5,-3.5,-19,-3.6c0,-23.6,0,-47.3,0,-70.9c12,-0.9,23.2,3.3,34.7,5.5c24.5,4.6,49,9.7,73.5,14.6 c1,0.2,1.9,0.6,2.8,1c0,3.3,0.7,6.7,0.7,9.9c0,5.6,2.4,7.5,7.5,8.4c15.3,2.7,30.5,5.8,45.8,8.7c12,2.3,24,4.4,36.1,6.6 c1.9,0.3,4.8,1.5,4.7,-1.4c-0.2,-4.6,1.7,-8.2,3.3,-12.1c10.2,0.9,20,3.8,30.1,5.5c11.7,2,23.1,5.3,34.9,6.5 c14.5,-3.2,28.1,-8.9,42.2,-13.2c8.1,-2.5,16.2,-5,24.1,-7.8c4.1,-1.5,4.8,-0.1,4.7,3.7C411,549.4,411,585.2,411,621z"
- android:fillColor="#D9D9D9"/>
- <path
- android:pathData="M412,307c-6.9,3.5,-13.6,-0.2,-20.1,-1.3c-28.2,-5,-56.2,-10.4,-84.3,-15.8c-21.8,-4.1,-43.5,-8.5,-65.2,-12.6 c-27.3,-5.2,-54.6,-10.1,-81.9,-15.3c-22.1,-4.2,-44.1,-8.5,-66.2,-12.8c-7,-1.3,-13.9,-2.9,-21,-3.9c-4.1,-0.6,-5.2,-3,-5.3,-6.5c0,-1.2,0,-2.3,0,-3.5 c0,-51.1,0,-102.3,0,-153.4c0,-5,-0.3,-10,1,-14.9c24.1,4.3,48.1,8.6,72.2,12.8c24.9,4.4,49.8,8.7,74.6,13.1c31.9,5.6,63.7,11.3,95.6,16.9 c30.2,5.3,60.5,10.6,90.7,16c2.6,0.5,5.2,0.8,7.8,1.2c0,1.3,0.7,2,2,2C412,188.3,412,247.7,412,307z M409,217.4c0,-25.5,0,-51,0,-76.5 c0,-10.9,0.1,-11.2,-10.7,-13.2c-23.4,-4.4,-46.8,-8.5,-70.3,-12.6c-24.1,-4.3,-48.2,-8.4,-72.3,-12.6c-17.7,-3.1,-35.5,-6.3,-53.2,-9.4 c-22.1,-3.9,-44.3,-7.6,-66.4,-11.5c-20,-3.5,-40,-7.1,-60.1,-10.5c-6,-1,-6.1,-0.8,-6.1,5.6c0,53,0,105.9,0,158.9c0,1,0,2,0,3 c0.2,2.6,1,4.1,4,4.6c10.1,1.7,20.1,3.9,30.2,5.8c27.3,5.1,54.6,10.1,81.9,15.2c22.1,4.2,44.1,8.6,66.2,12.8 c27.3,5.2,54.6,10.2,81.9,15.3c22.7,4.3,45.5,8.6,68.2,12.8c6.5,1.2,6.5,1.1,6.5,-5.7C409,272,409,244.7,409,217.4z"
- android:fillColor="#E8E8E8"/>
- <path
- android:pathData="M412,129c-1.3,0,-2,-0.7,-2,-2C411.3,127,412,127.7,412,129z"
- android:fillColor="#EAEAEA"/>
- <path
- android:pathData="M65.8,248.3c10.1,0.7,19.8,3.5,29.7,5.2c19,3.3,38,7,57,10.6c15.9,3,31.8,6.2,47.8,9.2 c24,4.6,48,9.1,72,13.7c14.6,2.8,29.3,5.5,43.8,8.5c22.5,4.6,45.3,8.4,67.9,12.6c4.1,0.8,8.2,1.8,12.4,3.8 c-6.4,2.1,-12.8,4.3,-19.2,6.4c-9.5,3.1,-19.1,5.8,-28.4,9.4c-6.7,2.6,-13.3,2.5,-20,1.3c-41.4,-7.6,-82.8,-15.2,-124.2,-22.8 c-32.6,-6,-65.2,-11.9,-97.8,-17.8c-13.7,-2.5,-27.4,-4.9,-41.1,-7.4C65.9,270,65.9,259.1,65.8,248.3z"
- android:fillColor="#E6A3A3"/>
- <path
- android:pathData="M275,519c-1.5,3.9,-3.5,7.5,-3.3,12.1c0.1,2.9,-2.8,1.7,-4.7,1.4c-12,-2.2,-24.1,-4.3,-36.1,-6.6 c-15.3,-2.9,-30.5,-6,-45.8,-8.7c-5.1,-0.9,-7.5,-2.8,-7.5,-8.4c0,-3.2,-0.8,-6.5,-0.7,-9.9c12.2,2.3,24.4,4.6,36.5,7c19.8,3.9,39.5,8,59.3,12 C273.6,518.2,274.3,518.7,275,519z"
- android:fillColor="#CBCBCA"/>
- <path
- android:pathData="M202.9,345.9c0,3.3,-0.1,6.7,0.1,10c0.2,3.9,-1.4,4.3,-4.9,3.7c-29.9,-5.6,-59.8,-11.2,-89.8,-16.5 c-3,-0.5,-3.5,-1.7,-3.4,-4.2c0.1,-3.3,0.1,-6.7,0.1,-10c21.7,3.9,43.4,7.9,65.2,11.6C181.1,342.4,191.8,345.3,202.9,345.9z"
- android:fillColor="#CFCFCE"/>
- <path
- android:pathData="M65.8,248.3c0,10.9,0,21.7,0,32.6c-17.9,-3.1,-35.8,-6.2,-53.7,-9.3c0,-0.4,0,-0.7,0,-1.1 C30.1,263,48,255.6,65.8,248.3z"
- android:fillColor="#E57474"/>
- <path
- android:pathData="M202.9,345.9c-11.1,-0.6,-21.8,-3.5,-32.6,-5.4c-21.8,-3.7,-43.5,-7.7,-65.2,-11.6c-0.6,-3.8,0.6,-5.6,4.8,-4.8 c28.3,5,56.6,9.9,84.9,14.9c1.1,0.2,2.3,0.8,3.4,0.8C202.8,339.6,203.4,342.3,202.9,345.9z"
- android:fillColor="#BDBDBD"/>
- <path
- android:pathData="M367,876c7.8,-0.4,15,1.9,22,5C381.4,880.3,374.2,878.4,367,876z"
- android:fillColor="#EFEFEE"/>
- <path
- android:pathData="M354,873c4.5,0.1,9.1,0.1,13,3C362.5,875.6,358.1,875,354,873z"
- android:fillColor="#EFEFEE"/>
- <path
- android:pathData="M350,872c1.4,0.1,3,-0.5,4,1C352.6,872.9,351,873.5,350,872z"
- android:fillColor="#EFEFEE"/>
- <path
- android:pathData="M274.1,705c1.9,3.6,1,7.5,0.6,11.2c-0.3,2.8,-2.5,3.1,-4.9,2.6c-29.7,-5.9,-59.3,-11.9,-89,-17.7 c-3.1,-0.6,-3.9,-1.9,-3.8,-4.6c0.1,-3.2,0,-6.3,0,-9.5c1.2,0,2.4,-0.1,3.5,0.1c19.2,3.8,38.4,7.7,57.6,11.4 C250.1,700.8,261.9,703.8,274.1,705z"
- android:fillColor="#D6D6D5"/>
- <path
- android:pathData="M274.1,705c-12.1,-1.2,-24,-4.2,-35.9,-6.5c-19.2,-3.7,-38.4,-7.6,-57.6,-11.4c-1.1,-0.2,-2.3,-0.1,-3.5,-0.1 c-0.5,-4.2,0.7,-5.4,5.3,-4.5c29.5,5.7,59.1,11.1,88.7,16.5C275.3,699.7,275.1,702,274.1,705z"
- android:fillColor="#C9C9C8"/>
- <path
- android:pathData="M409,217.4c0,27.3,0,54.6,0,82c0,6.8,0,6.9,-6.5,5.7c-22.7,-4.2,-45.5,-8.6,-68.2,-12.8 c-27.3,-5.1,-54.6,-10.1,-81.9,-15.3c-22.1,-4.2,-44.1,-8.6,-66.2,-12.8c-27.3,-5.2,-54.6,-10.1,-81.9,-15.2c-10.1,-1.9,-20.1,-4.1,-30.2,-5.8 c-3,-0.5,-3.9,-2.1,-4,-4.6c-0.1,-1,0,-2,0,-3c0,-53,0,-105.9,0,-158.9c0,-6.4,0,-6.6,6.1,-5.6c20,3.4,40,7,60.1,10.5c22.1,3.9,44.3,7.6,66.4,11.5 c17.7,3.1,35.5,6.3,53.2,9.4c24.1,4.2,48.2,8.4,72.3,12.6c23.4,4.1,46.9,8.2,70.3,12.6c10.8,2,10.7,2.3,10.7,13.2 C409,166.4,409,191.9,409,217.4z M283.9,146.9c0.4,-3.2,-0.2,-5.3,-4,-6c-29.7,-5,-59.4,-9.9,-89,-15.3c-4.8,-0.9,-5.2,0.7,-4.8,4.4 c0,3.5,-0.1,7,0,10.5c0,1.3,-0.4,3.2,1.4,3.3c2.9,0.1,5.3,1.8,8.1,2.3c13.8,2.4,27.6,4.9,41.4,7.4c13.3,2.4,26.5,5.1,39.8,7.4 c6.6,1.2,7.3,0.4,7.3,-6.5C284,151.9,283.9,149.4,283.9,146.9z"
- android:fillColor="#E8E7E7"/>
- <path
- android:pathData="M283.9,146.9c0,2.5,0.1,5,0.1,7.5c0,6.9,-0.7,7.7,-7.3,6.5c-13.3,-2.4,-26.5,-5,-39.8,-7.4 c-13.8,-2.5,-27.6,-5.1,-41.4,-7.4c-2.8,-0.5,-5.2,-2.2,-8.1,-2.3c-1.8,-0.1,-1.4,-2,-1.4,-3.3c0,-3.5,0,-7,0,-10.5c1.9,0.3,3.9,0.7,5.8,1 c21.6,4,43.1,8.1,64.7,11.8C265.6,144.4,274.5,147.1,283.9,146.9z"
- android:fillColor="#CFCFCE"/>
- <path
- android:pathData="M283.9,146.9c-9.3,0.2,-18.3,-2.5,-27.3,-4.1c-21.6,-3.7,-43.1,-7.8,-64.7,-11.8c-1.9,-0.4,-3.9,-0.7,-5.8,-1 c-0.4,-3.6,-0.1,-5.2,4.8,-4.4c29.6,5.4,59.3,10.4,89,15.3C283.7,141.6,284.3,143.7,283.9,146.9z"
- android:fillColor="#BDBDBD"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/drag_shadow_background.xml b/packages/DocumentsUI/res/drawable/drag_shadow_background.xml
deleted file mode 100644
index 49465cb..0000000
--- a/packages/DocumentsUI/res/drawable/drag_shadow_background.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/item_doc_background" />
- <stroke
- android:width="1dp"
- android:color="#ff9f9f9f" />
- <corners
- android:bottomRightRadius="3dp"
- android:bottomLeftRadius="3dp"
- android:topLeftRadius="3dp"
- android:topRightRadius="3dp"/>
-</shape>
diff --git a/packages/DocumentsUI/res/drawable/hourglass.xml b/packages/DocumentsUI/res/drawable/hourglass.xml
deleted file mode 100644
index 9b8d0e2..0000000
--- a/packages/DocumentsUI/res/drawable/hourglass.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<!--
-Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="421dp"
- android:height="909dp"
- android:viewportWidth="421.0"
- android:viewportHeight="909.0">
- <path
- android:pathData="M36,122.9c-2.8,-2.6,-5.7,-5.1,-8.3,-7.8c-5.6,-6,-9.2,-12.9,-8.8,-21.5c0.3,-7.5,0.6,-15,-0.1,-22.5 c-1.2,-14.1,5.5,-23.9,16,-31.9c16.7,-12.8,36.1,-19.6,56.1,-25.1c23.8,-6.5,48,-10.2,72.5,-12.3C168.6,1.3,174,2.2,179,0 c19.3,0,38.7,0,58,0c6,2.1,12.4,1.3,18.6,1.8c30.2,2.7,59.9,7.6,88.5,17.5c16.5,5.7,32.6,12.6,45.2,25.4c6.5,6.6,10.3,14,9.8,23.6 c-0.4,7.8,-0.5,15.7,0,23.4c0.6,10.3,-3.4,18.4,-10.6,25.2c-2.2,2,-4.4,4,-6.6,6c-3,2,-6.1,4,-9.1,5.9c-9.2,4.5,-18.5,9,-28.2,12.3 c-42.4,14.5,-86.3,18.8,-130.8,19.6c-10.9,0.2,-21.9,-0.4,-32.9,-0.7c-4.6,-0.4,-9.2,-0.8,-13.9,-1.1c-18.9,-1.1,-37.5,-3.9,-56,-7.6 c-15.3,-3.1,-30.2,-7.6,-44.9,-12.6c-7.6,-3.7,-15.3,-7.4,-22.9,-11.1C41.1,125.8,38.6,124.3,36,122.9z M41,72c2.9,6.9,7.1,12.6,13.1,17.2 c13,10,27.9,15.8,43.4,20.6c28.2,8.8,57.2,12.8,86.5,14c31.8,1.2,63.7,0.8,95.3,-4.6c25.3,-4.4,50.1,-10,72.9,-22.2 c10.8,-5.8,20,-13.1,24.7,-24.9c2.3,-11,-2.3,-19.5,-10.2,-26.4c-10.5,-9.2,-23.1,-14.9,-36.2,-19.6C295.2,13.4,258.4,9.7,221.2,8.1 c-11.1,-0.5,-22.2,0,-33.4,0.6c-21.4,1,-42.6,3.1,-63.6,7.3c-22.2,4.5,-44.1,10.3,-63.4,22.6C48.9,46.3,38.4,55.4,41,72z"
- android:fillColor="#9F9F9F"/>
- <path
- android:pathData="M0,829c3.7,-2.8,4.7,-7.6,7.8,-10.9c2.6,-2.8,4.9,-5.7,9.2,-7.6c0,3.4,-0.1,6.5,0,9.5c0,1.5,-0.7,3.5,1.7,4 c0.4,3.3,1.4,6.4,2.9,9.4c3.8,7.7,10,13,16.8,17.9c9.2,6.7,19.7,10.8,29.8,15.5c-0.7,2.4,1.3,0.7,1.8,1.1l0,0c1.5,2.1,3.7,2.2,6,2 l0,0c0.8,0.6,1.5,1.4,2.4,1.7c9.5,2.7,18.9,5.8,28.7,7.4c3.6,0.6,7,3.5,10.9,1.1c2.4,0.4,4.8,0.8,7.1,1.2c0.2,1.5,1.3,1.6,2.5,1.8 c6.6,0.9,13.3,2.4,19.9,2.8c5.1,0.3,10.3,2.9,15.4,0.3c0.4,0,0.8,0.1,1.1,0.1c0.3,2.2,2.1,1.8,3.5,1.8c3.8,0,7.6,0,11.5,0 c1.1,1.4,2.7,1,4.1,1c17.2,0,34.5,0,51.7,0c1.4,0,3,0.4,4.1,-1c3.8,0,7.6,0,11.5,0c1.4,0,3.2,0.4,3.5,-1.8c9.4,-1,18.7,-2.1,28.1,-3.1 c6,1.3,11.6,0.4,16.9,-2.8c21.2,-4.2,42.1,-9.3,61.8,-18.4c15.8,-7.3,30.8,-15.8,38,-33.1c2.4,-2,1.9,-4.8,2.2,-7.4c0.3,-3,0,-6,0.1,-9 c0,-1,-0.3,-2.1,0.7,-2.7c1.1,-0.7,1.7,0.5,2.5,1c7.2,5,12.1,11.7,14.8,20c0.4,1.2,0.6,2.2,2.1,2.3c0,3.3,0,6.7,0,10 c-1.5,0,-1.8,1.1,-2.2,2.2c-3.8,10.2,-11.2,17.5,-20.1,23.3c-20.8,13.6,-44.1,21.2,-68.1,26.7c-29.2,6.7,-58.7,11,-88.7,11.7 c-1.6,0,-3.5,-0.5,-3.9,2c-18.7,0,-37.3,0,-56,0c-0.3,-2.5,-2.3,-1.9,-3.9,-2c-5.6,-0.1,-11.2,-0.5,-16.9,-0.8c-18.5,-1.2,-36.8,-3.8,-55,-7.3 C79.9,893.9,54,887,30.2,874C19,867.9,8.5,860.9,2.5,849C2,848,1.4,847,0,847C0,841,0,835,0,829z"
- android:fillColor="#E6E4E4"/>
- <path
- android:pathData="M372.9,128.9c3,-2,6.1,-4,9.1,-5.9c-0.2,2.7,0.2,5.4,1,8c-1.5,1.6,-0.3,1.8,1,2c0.3,1,0.7,2,1,3 c-1.5,1.6,-0.3,1.8,1,2c0.7,2,1.3,4,2,6c-1.5,1.6,-0.3,1.8,1,2c0.3,1.7,0.7,3.3,1,5c-1,2.3,-0.6,4.1,2,5c4.9,23.8,9,47.6,8,72 c-3.5,1.5,-2.1,3.8,-1,6c-1,6,-2,12,-3,18c-1.3,1,-1.3,2,0,3c0,0.7,0,1.3,0,2c-2.1,0.4,-2.6,1.3,-1,3c0,0.3,0,0.7,0,1 c-1.3,0.2,-2.5,0.4,-1,2c0.4,2.1,-0.7,4,-1,6c-1.3,0.2,-2.5,0.4,-1,2c-3.7,9.3,-7.3,18.7,-11,28c-2.7,1.2,-4.2,2.9,-3,6 c-3.4,6.9,-7.8,13.3,-12.2,19.5c-6.1,8.6,-12.4,17.3,-19.4,25.2c-7.3,8.3,-15.5,15.8,-23.9,23c-11.9,10.3,-24.9,19.3,-38.1,27.7 c-12.2,7.8,-25.4,14.1,-38.4,20.5c-12.1,6,-18.5,15.8,-21,28.6c-1.5,7.8,-0.5,15.4,2,22.8c1.2,3.5,3.7,6.1,5.6,9.2 c5.4,8.6,14.8,10.5,22.6,15c15.3,9,30.8,17.7,45.3,28.1c14.4,10.4,28.2,21.5,40.5,34.1c10.1,10.4,18.5,22.2,26.8,34.3 c6.5,9.5,11.3,19.6,16.1,29.8c-1.5,1.6,-0.3,1.8,1,2c0.7,2,1.3,4,2,6c-1,2.3,-0.6,4.1,2,5c0.7,1.2,1.2,2.5,1,4c-1,2.3,-0.6,4.1,2,5 c1.2,12.3,4.6,24.1,5.7,36.5c0.8,8.4,1.4,16.8,1,25.1c-0.3,5.9,-1.1,12,-1.9,18c-1.2,8.7,-2.3,17.4,-4.2,25.9 c-1.5,6.6,-3.7,13.1,-5.6,19.6c-1.8,3.1,-2.9,6.5,-3.9,9.9c-3.4,6.4,-5.6,13.6,-11.9,18.2c-0.1,-3.8,1.6,-7.1,3,-10.4 c8.7,-20.9,13,-42.8,14.7,-65.1c1,-12.9,0.2,-25.8,-1.7,-38.7c-2.7,-18.5,-7.8,-36.2,-15.8,-53.1c-7.3,-15.4,-16.8,-29.3,-27.7,-42.4 c-2.7,-3.2,-6.3,-5.7,-9.6,-8.6c0.4,0.8,0.7,1.4,1,1.9c0.7,1.1,1.5,2.2,2.3,3.3c16.5,21.5,28.5,45.2,34.2,71.7c0.7,3.3,3.1,6.9,0.3,10.4 c-1,-1.9,-2.1,-3.7,-3.1,-5.6c-3.3,-6.3,-6.1,-12.9,-11.7,-17.6c-0.4,-0.9,-0.8,-1.8,-1.3,-2.6c-4,-6.3,-10.4,-10.4,-14.8,-16.2c0,-5.4,-2.7,-9.9,-4.8,-14.5 c-8.4,-18.6,-20.4,-34.9,-32.9,-50.8c-8.4,-10.8,-15.5,-22.8,-28.7,-28.8c-5.3,-2.4,-10,-6,-15.1,-8.6c-5.1,-2.6,-9.9,-6.4,-16.3,-5.2 c-5.2,1,-10.4,2.1,-15.3,4.1c-29.3,11.9,-48.4,34.1,-61.8,61.9c-0.3,0.3,-0.7,0.6,-1,1c-7.1,0.8,-13.9,2.9,-20.7,5.1 c-32.6,10.6,-61,27.4,-82.3,54.9c-9.2,11.6,-15.4,24.7,-18.9,39c-1.5,-1.1,-1.1,-2.7,-1.1,-4.1c-0.1,-9.6,0.3,-19.2,1.8,-28.7 c3.7,-22.6,11.8,-43.5,24,-62.8c12.6,-20,28.6,-36.9,47,-51.7c21.3,-17.3,44.6,-31.3,69.3,-42.9c14.5,-6.8,20,-18.8,21.8,-33.1 c1.8,-13.3,-4.9,-24.1,-12.2,-34.4c-3.6,-5,-7.4,-9.8,-13.2,-12.5c-5.8,-2.8,-11.6,-5.7,-17.4,-8.7c-22,-11.6,-42.6,-25.1,-61.1,-41.7 c-20.7,-18.6,-37.9,-40,-48.8,-65.9c-6.7,-15.7,-10.9,-32.1,-12,-49c-1.8,-27.1,2.1,-53.6,11.7,-79.1c3.8,-10.1,7.1,-20.4,13.3,-29.4 c14.7,5,29.6,9.5,44.9,12.6c18.5,3.7,37.2,6.5,56,7.6c4.6,0.3,9.3,0.7,13.9,1.1c0.2,3.6,-1.5,6.8,-2.6,10 c-11.9,33.6,-17.8,68.2,-17.2,103.8c0.2,9.7,1.3,19.4,2.7,29.1c3.8,24.6,11.4,47.7,26,68.1c12.2,17.1,28.4,28.6,49,33.4 c4.7,1.1,9.5,2.2,14.5,-0.5c18.7,-10.2,36.8,-21.2,53.7,-34.2c15.4,-11.9,29.4,-25.3,41.5,-40.5c12.9,-16.2,23.4,-33.8,30.4,-53.4 c6.4,-17.6,10.3,-35.6,10.9,-54.3c0.5,-15.9,0.2,-31.9,-3,-47.6C383.8,158.7,380.1,143.3,372.9,128.9z"
- android:fillColor="#EDECEC"/>
- <path
- android:pathData="M383,780c1.1,-3.4,2.1,-6.8,3.9,-9.9c7.8,7.1,12.8,15.2,12.2,26.4c-0.6,10.7,-0.3,21.5,-0.5,32.3 c-7.2,17.3,-22.2,25.8,-38,33.1c-19.7,9.1,-40.6,14.1,-61.8,18.4c-5.6,0.9,-11.3,1.9,-16.9,2.8c-9.4,1,-18.7,2.1,-28.1,3.1 c-5,0.3,-9.9,0.7,-14.9,1c-20,1.2,-40,0.9,-60,0c-5,-0.3,-9.9,-0.7,-14.9,-1c-0.4,0,-0.8,-0.1,-1.1,-0.1c-12.6,-1.6,-25.2,-3.2,-37.9,-4.8 c-2.4,-0.4,-4.8,-0.8,-7.1,-1.2c-2.6,-0.6,-5.1,-1.3,-7.7,-1.8c-11.6,-2,-22.6,-6.3,-34.2,-8.4c0,0,0,0,0,0c-1.7,-1.6,-3.7,-2.2,-6,-2c0,0,0,0,0,0 c-0.2,-1,-1.1,-0.9,-1.8,-1.1c-10.2,-4.7,-20.6,-8.8,-29.8,-15.5c-6.8,-4.9,-13,-10.2,-16.8,-17.9c-1.5,-3,-2.4,-6.1,-2.9,-9.4 c0.1,-10.3,0,-20.6,0.2,-30.9c0.1,-8.3,3.5,-15,10,-20.2c2,3.5,3.4,7.1,4.1,11c-1.1,0.8,-1,2,-1.1,3.1c-0.6,8.2,2.9,14.9,8.3,20.6 c8.9,9.6,20.4,15.4,32.3,20.2c17.9,7.2,36.5,11.9,55.4,15.4c20.1,3.7,40.3,5.7,60.6,6.5c21.4,0.8,42.8,0.4,64.2,-1.6 c19.8,-1.9,39.4,-4.6,58.7,-9.3c19.9,-4.8,39.3,-11.2,56.4,-22.9c7.8,-5.3,15.2,-11.3,17.4,-21C386.4,790.1,388.3,784.3,383,780z"
- android:fillColor="#9F9F9F"/>
- <path
- android:pathData="M378,305c-1.2,-3.1,0.3,-4.8,3,-6C380.6,301.3,379.7,303.3,378,305z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M399,234c-1.1,-2.2,-2.5,-4.5,1,-6C399.7,230,400.8,232.2,399,234z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M392,156c-2.6,-0.9,-3,-2.7,-2,-5C391.4,152.4,391.6,154.2,392,156z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M389,636c-2.6,-0.9,-3,-2.7,-2,-5C388.4,632.4,388.6,634.2,389,636z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M392,645c-2.6,-0.9,-3,-2.7,-2,-5C391.4,641.4,391.6,643.2,392,645z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M396,255c-1.3,-1,-1.3,-2,0,-3C397.3,253,397.3,254,396,255z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M395,260c-1.6,-1.7,-1.1,-2.6,1,-3C395.7,258,395.3,259,395,260z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M384,133c-1.3,-0.2,-2.5,-0.4,-1,-2C383.8,131.4,384,132.2,384,133z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M385,625c-1.3,-0.2,-2.5,-0.4,-1,-2C384.8,623.4,385,624.2,385,625z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M392,271c-1.5,-1.6,-0.3,-1.8,1,-2C393,269.8,392.8,270.6,392,271z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M394,263c-1.5,-1.6,-0.3,-1.8,1,-2C395,261.8,394.8,262.6,394,263z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M386,138c-1.3,-0.2,-2.5,-0.4,-1,-2C385.8,136.4,386,137.2,386,138z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M389,146c-1.3,-0.2,-2.5,-0.4,-1,-2C388.8,144.4,389,145.2,389,146z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M33.1,783.9c-0.8,-3.9,-2.2,-7.6,-4.1,-11c-3.7,-11.7,-7.2,-23.5,-9.2,-35.5c-1.3,-7.6,-1.9,-15.4,-2.7,-23.2 c-0.6,-6.2,-0.9,-12.4,-1,-18.5c-0.2,-7.9,1.9,-15.7,2.3,-23.4c0.5,-10.1,2.9,-19.5,5.5,-29c6.3,-23.1,17.3,-43.9,31.5,-62.8 c23.4,-31.1,53.3,-54.7,86.9,-74.1c10.1,-5.8,20.3,-11.6,30.9,-16.2c11.7,-5.2,16.3,-14.9,18.8,-26.3c3.2,-14.9,-2.8,-26.6,-12.7,-37.1 c-1.8,-1.9,-3.9,-3.1,-6.2,-4.2c-23.7,-11.4,-46.4,-24.4,-67.2,-40.7c-16.2,-12.6,-31.3,-26.5,-44.2,-42.6c-16.2,-20.3,-28.8,-42.5,-36.2,-67.5 c-3.1,-10.6,-5.4,-21.3,-6.2,-32.4c-0.7,-9.6,-3.2,-19.3,-2,-28.8c0.8,-6.6,1.5,-13.4,1.9,-20c1,-15.2,4.9,-29.6,9.2,-44c1.7,-5.7,4,-11.3,6.4,-16.8 c0.9,-2.2,1.3,-4.4,1.3,-6.8c2.6,1.4,5.1,2.9,7.2,4.9c-0.6,0.8,-1.4,1.4,-1.8,2.3c-11.2,26.2,-16.2,53.8,-17.4,82.2 c-0.4,8.8,1,17.5,1.9,26.2c2,19.7,7.4,38.4,15.6,56.3c17.9,39.2,46.6,69.1,81.3,93.6c18.5,13.1,38.1,24.3,58.5,34.1 c3.3,1.6,6,3.7,8.1,6.5c8,10.6,12.6,22.1,9.6,35.7c-2.1,9.4,-6.5,17.9,-14.8,22.7c-8.2,4.7,-16.9,8.5,-25.3,12.9 c-22.5,12,-43.8,25.8,-62.6,43c-21.9,19.9,-40.8,42.1,-53.7,69.2C26.3,646.5,20.6,682,24.1,719c1.8,18.7,7,36.7,12.7,54.6 c5.9,18.7,18.2,30.9,35.3,38.9c15.4,7.2,31.5,12.2,48.1,15.8c1.6,0.4,4.3,-0.3,4.8,2.6c-18,-2.8,-35.4,-7.5,-52.3,-14.5 c-12.2,-5.1,-23.4,-11.4,-32.4,-21.4C37.2,791.7,36.5,787,33.1,783.9z"
- android:fillColor="#EDECEC"/>
- <path
- android:pathData="M372.9,128.9c7.2,14.3,10.9,29.8,14.1,45.4c3.2,15.7,3.5,31.6,3,47.6c-0.6,18.7,-4.6,36.7,-10.9,54.3 c-7.1,19.6,-17.6,37.2,-30.4,53.4c-12.1,15.2,-26.1,28.6,-41.5,40.5c-16.9,13,-35,24,-53.7,34.2c-5,2.7,-9.8,1.6,-14.5,0.5 c-20.6,-4.8,-36.8,-16.3,-49,-33.4c-14.6,-20.4,-22.3,-43.5,-26,-68.1c-1.5,-9.7,-2.6,-19.4,-2.7,-29.1c-0.6,-35.6,5.4,-70.2,17.2,-103.8 c1.2,-3.3,2.8,-6.4,2.6,-10c11,0.2,21.9,0.9,32.9,0.7c44.4,-0.8,88.4,-5.2,130.8,-19.6C354.4,137.9,363.7,133.5,372.9,128.9z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M377,72c-4.6,11.9,-13.9,19.1,-24.7,24.9c-22.9,12.2,-47.6,17.9,-72.9,22.2c-31.6,5.4,-63.5,5.9,-95.3,4.6 c-29.3,-1.1,-58.3,-5.1,-86.5,-14C82.1,105,67.2,99.1,54.2,89.2C48.2,84.6,43.9,78.8,41,72c3.9,-1.8,4.6,-6.2,7.3,-9 c10.3,-10.5,22.9,-16.9,36.5,-21.8c19.7,-7.1,40,-11.5,60.7,-14.5c19.4,-2.8,38.9,-3.9,58.4,-4.5c17.9,-0.6,35.8,0.8,53.6,2.8 c15,1.6,29.9,3.5,44.5,7.1c20,4.9,39.7,10.7,57.2,22.1C366.5,58.8,371.5,65.5,377,72z"
- android:fillColor="#8D8E8E"/>
- <path
- android:pathData="M125,831c-0.4,-2.9,-3.2,-2.3,-4.8,-2.6c-16.6,-3.7,-32.7,-8.7,-48.1,-15.8c-17.1,-8,-29.4,-20.2,-35.3,-38.9 c-5.7,-17.9,-10.9,-35.9,-12.7,-54.6c-3.6,-37.1,2.1,-72.5,18.4,-106.4c13,-27.1,31.9,-49.3,53.7,-69.2c18.8,-17.1,40.2,-30.9,62.6,-43 c8.4,-4.5,17.1,-8.2,25.3,-12.9c8.4,-4.8,12.7,-13.3,14.8,-22.7c3.1,-13.6,-1.6,-25.1,-9.6,-35.7c-2.1,-2.8,-4.8,-4.9,-8.1,-6.5 c-20.4,-9.9,-40,-21.1,-58.5,-34.1c-34.7,-24.6,-63.4,-54.5,-81.3,-93.6c-8.2,-17.9,-13.6,-36.6,-15.6,-56.3c-0.9,-8.7,-2.3,-17.5,-1.9,-26.2 c1.2,-28.3,6.2,-55.9,17.4,-82.2c0.4,-0.9,1.2,-1.5,1.8,-2.3c7.6,3.7,15.3,7.4,22.9,11.1c-6.2,9,-9.5,19.3,-13.3,29.4 c-9.6,25.5,-13.5,52,-11.7,79.1c1.1,16.9,5.4,33.3,12,49c11,25.9,28.1,47.4,48.8,65.9c18.5,16.6,39.1,30.2,61.1,41.7 c5.7,3,11.5,5.9,17.4,8.7c5.8,2.8,9.7,7.6,13.2,12.5c7.3,10.3,14,21.1,12.2,34.4c-1.9,14.3,-7.4,26.3,-21.8,33.1 c-24.7,11.6,-48,25.7,-69.3,42.9c-18.3,14.9,-34.3,31.7,-47,51.7c-12.2,19.3,-20.3,40.2,-24,62.8c-1.6,9.6,-2,19.1,-1.8,28.7 c0,1.4,-0.4,3.1,1.1,4.1c-0.6,14.9,0.1,29.8,3,44.5c4.2,21.4,9.1,42.6,26,58.4c-0.2,2.3,0.9,4.1,2.2,5.9c8.8,12.3,22,18.6,35.3,24.1 c26.4,10.9,54.2,16.1,82.4,19.1c1.7,0.2,3,0.4,3,2.4c-4.5,0.7,-9,0.9,-13.4,0.5c-13.2,-1,-26.5,-1.9,-39.6,-4.1c-0.6,-2.4,-1.7,-2.3,-3.1,-0.6 c-1.3,-0.1,-2.6,-0.3,-3.9,-0.4c-0.6,-2.3,-1.6,-2.4,-3.1,-0.7c-0.6,-0.1,-1.3,-0.2,-1.9,-0.3c-0.6,-2.4,-1.7,-2.4,-3.1,-0.6 C126.2,831.2,125.6,831.1,125,831z"
- android:fillColor="#E8E8E7"/>
- <path
- android:pathData="M377,72c-5.4,-6.4,-10.5,-13.2,-17.7,-17.9C341.7,42.7,322.1,36.9,302,32c-14.6,-3.6,-29.5,-5.5,-44.5,-7.1 c-17.8,-1.9,-35.7,-3.3,-53.6,-2.8c-19.5,0.6,-39,1.7,-58.4,4.5c-20.7,3,-41,7.4,-60.7,14.5C71.3,46.1,58.7,52.4,48.4,63 c-2.7,2.8,-3.5,7.2,-7.3,9c-2.6,-16.6,7.9,-25.6,19.8,-33.3c19.3,-12.3,41.2,-18.2,63.4,-22.6c21,-4.2,42.2,-6.3,63.6,-7.3 c11.1,-0.5,22.3,-1,33.4,-0.6c37.2,1.5,74,5.3,109.4,17.9c13.1,4.6,25.6,10.4,36.2,19.6C374.7,52.5,379.3,61,377,72z"
- android:fillColor="#808080"/>
- <path
- android:pathData="M179,887.2c20,0.9,40,1.2,60,0c0,0.3,0,0.5,0,0.8c-1.1,1.4,-2.7,1,-4.1,1c-17.2,0,-34.5,0,-51.7,0 c-1.4,0,-3,0.4,-4.1,-1C179,887.7,179,887.5,179,887.2z"
- android:fillColor="#F4F3F2"/>
- <path
- android:pathData="M76,869.9c11.6,2.2,22.6,6.5,34.2,8.4c2.6,0.4,5.2,1.2,7.7,1.8c-3.9,2.3,-7.3,-0.6,-10.9,-1.1 c-9.8,-1.6,-19.2,-4.7,-28.7,-7.4C77.5,871.3,76.8,870.5,76,869.9z"
- android:fillColor="#F4F3F2"/>
- <path
- android:pathData="M125.1,881.3c12.6,1.6,25.2,3.2,37.9,4.8c-5.2,2.6,-10.3,0,-15.4,-0.3c-6.7,-0.4,-13.3,-1.9,-19.9,-2.8 C126.3,882.9,125.2,882.8,125.1,881.3z"
- android:fillColor="#F4F3F2"/>
- <path
- android:pathData="M282,883.1c5.6,-0.9,11.3,-1.9,16.9,-2.8C293.7,883.4,288.1,884.4,282,883.1z"
- android:fillColor="#F4F3F2"/>
- <path
- android:pathData="M179,887.2c0,0.3,0,0.5,0,0.8c-3.8,0,-7.6,0,-11.5,0c-1.4,0,-3.2,0.4,-3.5,-1.8C169,886.5,174,886.9,179,887.2z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M239,888c0,-0.3,0,-0.5,0,-0.8c5,-0.3,9.9,-0.7,14.9,-1c-0.3,2.2,-2.1,1.8,-3.5,1.8C246.6,888,242.8,888,239,888z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M70,867.9c2.3,-0.2,4.3,0.4,6,2C73.8,870.1,71.6,870,70,867.9z"
- android:fillColor="#F4F3F2"/>
- <path
- android:pathData="M68.2,866.8c0.7,0.2,1.6,0.2,1.8,1.1C69.5,867.4,67.6,869.2,68.2,866.8z"
- android:fillColor="#F4F3F2"/>
- <path
- android:pathData="M165,584c0.3,-0.3,0.7,-0.6,1,-1c10.5,-1.3,21,-3.3,31.5,-3.8c20.8,-1.1,41.4,0.7,61.7,5.4 c30.5,7,57.8,20.3,81.8,40.5c4.4,5.9,10.8,10,14.8,16.2c0.5,0.8,0.9,1.7,1.3,2.6c-2.4,4.1,-4.7,8.1,-7.1,12.2c-4,3.7,-6.3,8.9,-11,12 c-1.6,-0.1,-2.8,0.5,-4.1,1.5c-12.6,9.3,-26.7,15.6,-41.5,20.1c-31,9.4,-62.6,13.3,-95.1,11.6c-12.3,-0.6,-24.5,-1.5,-36.5,-3.4 c-4.5,-0.7,-5.3,0.5,-4.8,4.2c-0.5,0,-1,0.1,-1.5,0c-17.8,-3.9,-34.7,-10.3,-50.9,-18.7c-1,-0.5,-1.6,-1.1,-1.6,-2.3c2.3,-0.3,4.1,1.1,6.1,2 c14.2,6.2,28.9,10.6,44.1,13.3c2.5,0.4,3,0.2,2.4,-2.3c-2.5,-9.3,-3.7,-18.7,-4.8,-28.3c-1.5,-13.7,-0.3,-27.1,1.7,-40.5 C154.6,610.8,159.7,597.4,165,584z"
- android:fillColor="#E57474"/>
- <path
- android:pathData="M103,681c0.1,1.1,0.7,1.8,1.6,2.3c16.2,8.4,33.1,14.8,50.9,18.7c0.5,0.1,1,0,1.5,0c0.6,0.4,1.3,0.7,1.9,1.1 c-0.1,2.7,1,5.2,1.9,7.6c6.5,17.8,16.5,33.6,27.5,48.8c12.5,17.1,27.1,32.1,45.1,43.6c6.6,4.2,13.7,7.3,20.5,11 c-15.6,2.8,-31.4,2.5,-47.1,2.4c-9.9,0,-19.9,-0.2,-29.8,-1.1c-18.2,-1.6,-36.2,-3.9,-54,-8.3c-18.1,-4.4,-35.9,-9.5,-51,-21.1 c-16.9,-15.8,-21.8,-37,-26,-58.4c-2.9,-14.7,-3.6,-29.6,-3,-44.5c3.5,-14.4,9.7,-27.4,18.9,-39c3.4,4.8,6.2,10.1,10.3,14.2 c6,6.1,11.6,13,19.7,16.8c0.5,0.8,1.2,1,2.1,1c0,0,0,0,0,0c0.3,0.3,0.7,0.7,1,1c0,0,0,0,0,0c0.3,0.3,0.7,0.7,1,1l0,0 c1,1.3,2.4,1.8,4,2l0,0C100.7,681.2,101.9,681,103,681L103,681z"
- android:fillColor="#E6A3A3"/>
- <path
- android:pathData="M341,625c-24,-20.1,-51.3,-33.5,-81.8,-40.5c-20.3,-4.7,-41,-6.5,-61.7,-5.4c-10.5,0.6,-21,2.5,-31.5,3.8 c13.4,-27.8,32.5,-49.9,61.8,-61.9c4.9,-2,10.1,-3.1,15.3,-4.1c6.3,-1.2,11.2,2.6,16.3,5.2c5.2,2.6,9.9,6.2,15.1,8.6 c13.3,6,20.3,18,28.7,28.8c12.5,16,24.6,32.2,32.9,50.8C338.3,615.2,341,619.7,341,625z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M91.9,675c-8,-3.8,-13.6,-10.7,-19.7,-16.8c-4.1,-4.1,-6.9,-9.4,-10.3,-14.2c21.3,-27.5,49.8,-44.3,82.3,-54.9 c6.8,-2.2,13.6,-4.3,20.7,-5.1c-5.3,13.4,-10.4,26.9,-12.5,41.2c-2,13.4,-3.2,26.8,-1.7,40.5c1.1,9.6,2.3,19,4.8,28.3 c0.7,2.5,0.1,2.7,-2.4,2.3c-15.2,-2.6,-29.9,-7.1,-44.1,-13.3c-2,-0.9,-3.7,-2.3,-6.1,-2c0,0,0,0,0,0c-0.7,-1.2,-1.9,-1,-3,-1c0,0,0,0,0,0 c-0.3,-2.7,-2.4,-1.8,-4,-2c0,0,0,0,0,0c-0.3,-0.3,-0.7,-0.7,-1,-1c0,0,0,0,0,0c-0.3,-0.3,-0.7,-0.7,-1,-1c0,0,0,0,0,0 C93.6,675.2,92.8,675,91.9,675z"
- android:fillColor="#D86868"/>
- <path
- android:pathData="M135,832.8c1.3,0.1,2.6,0.3,3.9,0.4c0.9,0.8,2,0.7,3.1,0.6c13.1,2.2,26.4,3,39.6,4.1 c4.5,0.3,9,0.2,13.4,-0.5c3.1,0.3,6.3,0.7,9.4,0.8c22.6,0.4,45.2,-0.9,67.6,-4.1c23.9,-3.3,47.4,-8.2,69.8,-17.6 c10.7,-4.5,21.4,-9.3,29.3,-18.3l0,0.1c6.2,-4.6,8.5,-11.8,11.9,-18.2c5.2,4.3,3.3,10.1,2.2,15c-2.2,9.7,-9.6,15.7,-17.4,21 c-17.1,11.7,-36.5,18.1,-56.4,22.9c-19.3,4.7,-38.9,7.4,-58.7,9.3c-21.4,2,-42.8,2.5,-64.2,1.6c-20.3,-0.8,-40.5,-2.8,-60.6,-6.5 c-19,-3.5,-37.6,-8.2,-55.4,-15.4c-11.9,-4.8,-23.4,-10.6,-32.3,-20.2c-5.3,-5.8,-8.9,-12.4,-8.3,-20.6c0.1,-1.2,0,-2.4,1.1,-3.1 c3.3,3.1,4.1,7.8,7.2,11.1c9,9.9,20.2,16.3,32.4,21.4c16.8,7,34.3,11.7,52.3,14.5c0.6,0.1,1.2,0.2,1.9,0.3c0.9,0.8,2,0.7,3.1,0.6 c0.6,0.1,1.3,0.2,1.9,0.3C132.8,833,133.9,833,135,832.8z"
- android:fillColor="#999899"/>
- <path
- android:pathData="M371.9,667c2.8,-3.5,0.4,-7.1,-0.3,-10.4c-5.7,-26.6,-17.7,-50.3,-34.2,-71.7c-0.8,-1,-1.5,-2.2,-2.3,-3.3 c-0.3,-0.5,-0.6,-1.1,-1,-1.9c3.4,3,6.9,5.4,9.6,8.6c10.8,13.1,20.4,27,27.7,42.4c8,16.9,13.1,34.6,15.8,53.1 c1.9,12.9,2.6,25.8,1.7,38.7c-1.7,22.4,-6,44.3,-14.7,65.1c-1.4,3.3,-3.1,6.6,-3,10.4c0,0,0,-0.1,0,-0.1c-1.8,-0.3,-3.3,0.4,-4.7,1.2 c-6.3,3.7,-12.6,7.3,-19.4,10.2c-24,10.3,-48.8,14.5,-74.7,9.2c-4.2,-0.9,-9.4,-0.2,-12.4,-4.8c13.8,-2,27.6,-4.4,41.1,-8 c10,-2.7,20,-5.4,29,-10.8c1.5,-0.5,3.2,-0.9,4.6,-1.6c10.6,-5.1,19.5,-12.1,25.3,-22.6c4.7,-3.1,8.2,-10.7,6.9,-15c0.3,-1.4,0.6,-2.9,1,-4.3 c5.4,-16.2,7.5,-33.1,9,-50C378,689.7,375.5,678.3,371.9,667z"
- android:fillColor="#F1F0F0"/>
- <path
- android:pathData="M371.9,667c3.6,11.3,6.1,22.7,5.1,34.6c-1.5,16.9,-3.6,33.8,-9,50c-0.5,1.4,-0.7,2.9,-1,4.3 c-2.3,5,-4.6,10,-6.9,15c-5.8,10.5,-14.7,17.5,-25.3,22.6c-1.5,0.7,-3.1,1.1,-4.6,1.6c-0.3,-2.1,0.3,-3.9,1.1,-5.7 c3.4,-7.4,6.4,-14.9,8.9,-22.6c6,-18.1,10,-36.5,12,-55.6c1.2,-11.6,0.9,-23.2,0.6,-34.8c-0.2,-6.8,-0.7,-13.8,-2.8,-20.5 c2.4,-4.1,4.7,-8.1,7.1,-12.2c5.6,4.7,8.4,11.3,11.7,17.6C369.8,663.3,370.8,665.2,371.9,667z"
- android:fillColor="#E6A3A3"/>
- <path
- android:pathData="M260,814c2.9,4.6,8.1,3.9,12.4,4.8c25.9,5.3,50.7,1.1,74.7,-9.2c6.7,-2.9,13.1,-6.4,19.4,-10.2 c1.4,-0.9,2.9,-1.6,4.7,-1.2c-7.9,9.1,-18.6,13.8,-29.3,18.3c-22.3,9.4,-45.9,14.3,-69.8,17.6c-22.4,3.1,-45,4.4,-67.6,4.1 c-3.1,-0.1,-6.3,-0.5,-9.4,-0.8c-0.1,-2,-1.4,-2.2,-3,-2.4c-28.3,-3,-56,-8.2,-82.4,-19.1c-13.4,-5.5,-26.5,-11.8,-35.3,-24.1c-1.3,-1.8,-2.4,-3.6,-2.2,-5.9 c15.1,11.6,32.9,16.7,51,21.1c17.7,4.4,35.8,6.6,54,8.3c10,0.9,20,1.1,29.8,1.1c15.7,0.1,31.5,0.4,47.1,-2.4 C256,814,258,814,260,814z"
- android:fillColor="#EDECEC"/>
- <path
- android:pathData="M130,831.9c-1.1,0.1,-2.2,0.2,-3.1,-0.6C128.3,829.5,129.4,829.5,130,831.9z"
- android:fillColor="#EDECEC"/>
- <path
- android:pathData="M135,832.8c-1.1,0.1,-2.2,0.2,-3.1,-0.7C133.4,830.5,134.4,830.6,135,832.8z"
- android:fillColor="#EDECEC"/>
- <path
- android:pathData="M142,833.8c-1.1,0.1,-2.2,0.2,-3.1,-0.6C140.3,831.5,141.4,831.5,142,833.8z"
- android:fillColor="#EDECEC"/>
- <path
- android:pathData="M260,814c-2,0,-4,0,-6,0c-6.8,-3.7,-13.9,-6.8,-20.5,-11c-18,-11.5,-32.7,-26.4,-45.1,-43.6c-11,-15.2,-21,-31,-27.5,-48.8 c-0.9,-2.5,-2,-4.9,-1.9,-7.7c0.7,0,1.4,-0.1,2,0.1c16.2,4.6,33.1,5.3,49.6,5.3c10,0,20.1,-0.2,30.2,-1.3c19.5,-2,38.7,-5.3,57,-12.4 c15.6,-6,30.1,-13.9,41.3,-26.9c4.7,-3.1,7,-8.3,11,-12c2.1,6.7,2.6,13.7,2.8,20.5c0.3,11.6,0.6,23.1,-0.6,34.8c-2,19,-6,37.5,-12,55.6 c-2.6,7.7,-5.5,15.3,-8.9,22.6c-0.9,1.9,-1.5,3.7,-1.1,5.7c-9,5.4,-19,8.1,-29,10.8C287.6,809.6,273.8,811.9,260,814z"
- android:fillColor="#E6A3A3"/>
- <path
- android:pathData="M339,668c-11.1,13,-25.7,20.8,-41.3,26.9c-18.3,7.1,-37.5,10.4,-57,12.4c-10.1,1,-20.3,1.3,-30.2,1.3 c-16.6,0,-33.4,-0.7,-49.6,-5.3c-0.6,-0.2,-1.3,-0.1,-2,-0.1c-0.6,-0.4,-1.3,-0.7,-1.9,-1.1c-0.4,-3.8,0.3,-5,4.8,-4.2c12.1,2,24.3,2.8,36.5,3.4 c32.4,1.7,64.1,-2.3,95.1,-11.6c14.8,-4.5,29,-10.8,41.5,-20.1C336.3,668.5,337.5,667.9,339,668z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M96,678c1.6,0.2,3.7,-0.7,4,2C98.4,679.8,97,679.3,96,678z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M100,680c1.1,0,2.3,-0.2,3,1C101.9,681,100.7,681.2,100,680z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M91.9,675c0.8,0,1.6,0.2,2.1,1C93.2,676,92.4,675.8,91.9,675z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M94,676c0.3,0.3,0.7,0.7,1,1C94.7,676.7,94.3,676.3,94,676z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M95,677c0.3,0.3,0.7,0.7,1,1C95.7,677.7,95.3,677.3,95,677z"
- android:fillColor="#C5C5C5"/>
- <path
- android:pathData="M360,771c2.3,-5,4.6,-10,6.9,-15C368.2,760.3,364.7,767.8,360,771z"
- android:fillColor="#EDECEC"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_breadcrumb_arrow.xml b/packages/DocumentsUI/res/drawable/ic_breadcrumb_arrow.xml
deleted file mode 100644
index 76c0e1f..0000000
--- a/packages/DocumentsUI/res/drawable/ic_breadcrumb_arrow.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_breadcrumb_arrow_am_alpha"
- android:tint="?android:attr/colorControlNormal"
- android:autoMirrored="true" />
diff --git a/packages/DocumentsUI/res/drawable/ic_breadcrumb_arrow_down.xml b/packages/DocumentsUI/res/drawable/ic_breadcrumb_arrow_down.xml
deleted file mode 100644
index 199a308..0000000
--- a/packages/DocumentsUI/res/drawable/ic_breadcrumb_arrow_down.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
- android:fromDegrees="90"
- android:toDegrees="90"
- android:pivotX="50%"
- android:pivotY="50%"
- android:drawable="@drawable/ic_breadcrumb_arrow">
-</rotate>
\ No newline at end of file
diff --git a/packages/DocumentsUI/res/drawable/ic_cab_cancel.xml b/packages/DocumentsUI/res/drawable/ic_cab_cancel.xml
deleted file mode 100644
index 629100c..0000000
--- a/packages/DocumentsUI/res/drawable/ic_cab_cancel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_cab_cancel_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_check_circle.xml b/packages/DocumentsUI/res/drawable/ic_check_circle.xml
deleted file mode 100644
index d49ba6a..0000000
--- a/packages/DocumentsUI/res/drawable/ic_check_circle.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF009688"
- android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_dialog_alert.xml b/packages/DocumentsUI/res/drawable/ic_dialog_alert.xml
deleted file mode 100644
index 5132df3..0000000
--- a/packages/DocumentsUI/res/drawable/ic_dialog_alert.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_dialog_alert_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_dialog_info.xml b/packages/DocumentsUI/res/drawable/ic_dialog_info.xml
deleted file mode 100644
index a029cca..0000000
--- a/packages/DocumentsUI/res/drawable/ic_dialog_info.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_dialog_info_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_doc_album.xml b/packages/DocumentsUI/res/drawable/ic_doc_album.xml
deleted file mode 100644
index 1ce3f02..0000000
--- a/packages/DocumentsUI/res/drawable/ic_doc_album.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF737373"
- android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm0 14.5c-2.49 0,-4.5,-2.01,-4.5,-4.5S9.51 7.5 12 7.5s4.5 2.01 4.5 4.5,-2.01 4.5,-4.5 4.5zm0,-5.5c-.55 0,-1 .45,-1 1s.45 1 1 1 1,-.45 1,-1,-.45,-1,-1,-1z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_grid_folder.xml b/packages/DocumentsUI/res/drawable/ic_grid_folder.xml
deleted file mode 100644
index 0c87869..0000000
--- a/packages/DocumentsUI/res/drawable/ic_grid_folder.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_grid_folder_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_hamburger.xml b/packages/DocumentsUI/res/drawable/ic_hamburger.xml
deleted file mode 100644
index 7cda32e..0000000
--- a/packages/DocumentsUI/res/drawable/ic_hamburger.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_hamburger_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_copy.xml b/packages/DocumentsUI/res/drawable/ic_menu_copy.xml
deleted file mode 100644
index e0abe07..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_copy.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_copy_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_delete.xml b/packages/DocumentsUI/res/drawable/ic_menu_delete.xml
deleted file mode 100644
index e52ed97..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_delete.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_delete_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_new_folder.xml b/packages/DocumentsUI/res/drawable/ic_menu_new_folder.xml
deleted file mode 100644
index b105535..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_new_folder.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_new_folder_am_alpha"
- android:tint="?android:attr/colorControlNormal"
- android:autoMirrored="true" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_search.xml b/packages/DocumentsUI/res/drawable/ic_menu_search.xml
deleted file mode 100644
index 33f548b..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_search.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_search_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_share.xml b/packages/DocumentsUI/res/drawable/ic_menu_share.xml
deleted file mode 100644
index 927e7d3..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_share.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_share_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_sortby.xml b/packages/DocumentsUI/res/drawable/ic_menu_sortby.xml
deleted file mode 100644
index 065ea87..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_sortby.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_sortby_am_alpha"
- android:tint="?android:attr/colorControlNormal"
- android:autoMirrored="true" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_view_grid.xml b/packages/DocumentsUI/res/drawable/ic_menu_view_grid.xml
deleted file mode 100644
index dc09a0c..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_view_grid.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_view_grid_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_menu_view_list.xml b/packages/DocumentsUI/res/drawable/ic_menu_view_list.xml
deleted file mode 100644
index 23c5777..0000000
--- a/packages/DocumentsUI/res/drawable/ic_menu_view_list.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_menu_view_list_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_root_documents.xml b/packages/DocumentsUI/res/drawable/ic_root_documents.xml
deleted file mode 100644
index afd886d..0000000
--- a/packages/DocumentsUI/res/drawable/ic_root_documents.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_root_download.xml b/packages/DocumentsUI/res/drawable/ic_root_download.xml
deleted file mode 100644
index f07d8f0..0000000
--- a/packages/DocumentsUI/res/drawable/ic_root_download.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_root_download_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_root_recent.xml b/packages/DocumentsUI/res/drawable/ic_root_recent.xml
deleted file mode 100644
index 41e6a5e..0000000
--- a/packages/DocumentsUI/res/drawable/ic_root_recent.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_root_recent_alpha"
- android:tint="?android:attr/colorControlNormal" />
diff --git a/packages/DocumentsUI/res/drawable/ic_root_smartphone.xml b/packages/DocumentsUI/res/drawable/ic_root_smartphone.xml
deleted file mode 100644
index 3021b16..0000000
--- a/packages/DocumentsUI/res/drawable/ic_root_smartphone.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M17 1.01L7 1c-1.1 0,-2 .9,-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2,-.9 2,-2V3c0,-1.1,-.9,-1.99,-2,-1.99zM17 19H7V5h10v14z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_sd_storage.xml b/packages/DocumentsUI/res/drawable/ic_sd_storage.xml
deleted file mode 100644
index 5aeebbb..0000000
--- a/packages/DocumentsUI/res/drawable/ic_sd_storage.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M18 2h-8L4.02 8 4 20c0 1.1.9 2 2 2h12c1.1 0 2,-.9 2,-2V4c0,-1.1,-.9,-2,-2,-2zm-6 6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_subdirectory_arrow.xml b/packages/DocumentsUI/res/drawable/ic_subdirectory_arrow.xml
deleted file mode 100644
index 0f34ba4..0000000
--- a/packages/DocumentsUI/res/drawable/ic_subdirectory_arrow.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="?android:attr/colorControlNormal"
- android:pathData="M19 15l-6 6,-1.42,-1.42L15.17 16H4V4h2v10h9.17l-3.59,-3.58L13 9l6 6z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/ic_usb_storage.xml b/packages/DocumentsUI/res/drawable/ic_usb_storage.xml
deleted file mode 100644
index 2a8d024..0000000
--- a/packages/DocumentsUI/res/drawable/ic_usb_storage.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M15 7v4h1v2h-3V5h2l-3,-4,-3 4h2v8H8v-2.07c.7,-.37 1.2,-1.08 1.2,-1.93 0,-1.21,-.99,-2.2,-2.2,-2.2,-1.21 0,-2.2.99,-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37,-1.2 1.1,-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2,-.98 2.2,-2.2 0,-.85,-.49,-1.58,-1.2,-1.95V15h3c1.11 0 2,-.89 2,-2v-2h1V7h-4z"/>
-</vector>
diff --git a/packages/DocumentsUI/res/drawable/item_doc_grid_border.xml b/packages/DocumentsUI/res/drawable/item_doc_grid_border.xml
deleted file mode 100644
index db66094..0000000
--- a/packages/DocumentsUI/res/drawable/item_doc_grid_border.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <stroke
- android:width="2dp"
- android:color="@color/item_doc_grid_border"/>
-</shape>
diff --git a/packages/DocumentsUI/res/drawable/item_doc_list_background.xml b/packages/DocumentsUI/res/drawable/item_doc_list_background.xml
deleted file mode 100644
index 13910bb..0000000
--- a/packages/DocumentsUI/res/drawable/item_doc_list_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/item_doc_list_background_activated" />
-</shape>
diff --git a/packages/DocumentsUI/res/drawable/progress_indeterminate_horizontal_material_trimmed.xml b/packages/DocumentsUI/res/drawable/progress_indeterminate_horizontal_material_trimmed.xml
deleted file mode 100644
index 070b9a1..0000000
--- a/packages/DocumentsUI/res/drawable/progress_indeterminate_horizontal_material_trimmed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which
- draws the whole height of the progress bar instead having blank space above and below the
- bar. -->
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/vector_drawable_progress_indeterminate_horizontal_trimmed" >
- <target
- android:name="rect2_grp"
- android:animation="@*android:anim/progress_indeterminate_horizontal_rect2" />
- <target
- android:name="rect1_grp"
- android:animation="@*android:anim/progress_indeterminate_horizontal_rect1" />
-</animated-vector>
diff --git a/packages/DocumentsUI/res/drawable/root_item_background.xml b/packages/DocumentsUI/res/drawable/root_item_background.xml
deleted file mode 100644
index cc56f1e..0000000
--- a/packages/DocumentsUI/res/drawable/root_item_background.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.android.documentsui"
- android:color="?attr/colorControlHighlight">
- <item
- android:id="@android:id/mask"
- android:drawable="@android:color/white"/>
-
- <item>
- <selector>
- <item
- app:state_highlighted="true"
- android:drawable="@color/item_doc_background_selected"/>
- <item
- app:state_highlighted="false"
- android:drawable="@android:color/transparent"/>
- </selector>
- </item>
-</ripple>
\ No newline at end of file
diff --git a/packages/DocumentsUI/res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml b/packages/DocumentsUI/res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml
deleted file mode 100644
index 39e3a37..0000000
--- a/packages/DocumentsUI/res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Variant of vector_drawable_progress_indeterminate_horizontal in frameworks/base/core/res, which
- draws the whole height of the progress bar instead having blank space above and below the
- bar. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="10dp"
- android:width="360dp"
- android:viewportHeight="10"
- android:viewportWidth="360" >
- <group
- android:name="progress_group"
- android:translateX="180"
- android:translateY="5" >
- <path
- android:name="background_track"
- android:pathData="M -180.0,-5.0 l 360.0,0 l 0,10.0 l -360.0,0 Z"
- android:fillColor="?android:attr/colorControlActivated"
- android:fillAlpha="?android:attr/disabledAlpha"/>
- <group
- android:name="rect2_grp"
- android:translateX="-197.60001"
- android:scaleX="0.1" >
- <path
- android:name="rect2"
- android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z"
- android:fillColor="?android:attr/colorControlActivated" />
- </group>
- <group
- android:name="rect1_grp"
- android:translateX="-522.59998"
- android:scaleX="0.1" >
- <path
- android:name="rect1"
- android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z"
- android:fillColor="?android:attr/colorControlActivated" />
- </group>
- </group>
-</vector>
diff --git a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml
deleted file mode 100644
index ecc26e1..0000000
--- a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<com.android.documentsui.ListItem xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/item_doc_background"
- android:focusable="true"
- android:orientation="horizontal" >
-
- <View
- android:id="@+id/focus_indicator"
- android:layout_width="4dp"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- android:minHeight="@dimen/list_item_height"
- android:orientation="horizontal"
- android:paddingEnd="@dimen/list_item_padding"
- android:paddingStart="@dimen/list_item_padding" >
-
- <FrameLayout
- android:id="@android:id/icon"
- android:layout_width="@dimen/list_item_thumbnail_size"
- android:layout_height="@dimen/list_item_thumbnail_size"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="0dp" >
-
- <ImageView
- android:id="@+id/icon_mime"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:scaleType="centerInside" />
-
- <ImageView
- android:id="@+id/icon_thumb"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:scaleType="centerCrop" />
-
- <ImageView
- android:id="@+id/icon_check"
- android:layout_width="@dimen/check_icon_size"
- android:layout_height="@dimen/check_icon_size"
- android:layout_gravity="center"
- android:alpha="0"
- android:contentDescription="@null"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_check_circle" />
-
- </FrameLayout>
-
- <!-- This is the one special case where we want baseline alignment! -->
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="horizontal" >
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_weight="0.5"
- android:ellipsize="middle"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary" />
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_weight="0.25"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorSecondary" />
-
- <TextView
- android:id="@+id/size"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_weight="0.125"
- android:ellipsize="end"
- android:minWidth="70dp"
- android:singleLine="true"
- android:textAlignment="viewEnd"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorSecondary" />
-
- <TextView
- android:id="@+id/date"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_weight="0.125"
- android:ellipsize="end"
- android:minWidth="70dp"
- android:singleLine="true"
- android:textAlignment="viewEnd"
- android:textAppearance="@android:style/TextAppearance.Material.Body1"
- android:textColor="?android:attr/textColorSecondary" />
- </LinearLayout>
- </LinearLayout>
-
-</com.android.documentsui.ListItem>
diff --git a/packages/DocumentsUI/res/layout/dialog_delete_confirmation.xml b/packages/DocumentsUI/res/layout/dialog_delete_confirmation.xml
deleted file mode 100644
index a1c2910..0000000
--- a/packages/DocumentsUI/res/layout/dialog_delete_confirmation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="24dp"
- android:paddingStart="24dp"
- android:paddingEnd="24dp"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="@*android:color/primary_text_default_material_light">
-</TextView>
diff --git a/packages/DocumentsUI/res/layout/dialog_file_name.xml b/packages/DocumentsUI/res/layout/dialog_file_name.xml
deleted file mode 100644
index 3a95a13..0000000
--- a/packages/DocumentsUI/res/layout/dialog_file_name.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:fitsSystemWindows="true"
- android:padding="?android:attr/listPreferredItemPaddingEnd">
-
- <EditText
- android:id="@android:id/text1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text" />
-
-</FrameLayout>
diff --git a/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml b/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml
deleted file mode 100644
index bfb0271..0000000
--- a/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:theme="@style/Theme.AppCompat.Light.Dialog.Alert"
- android:orientation="vertical"
- android:paddingEnd="24dp"
- android:paddingStart="24dp" >
-
- <TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/message"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingEnd="24dp"
- android:paddingStart="32dp"
- android:paddingTop="24dp">
- </TextView>
-
- <CheckBox
- android:id="@+id/do_not_ask_checkbox"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:text="@string/never_ask_again"
- android:textColor="?android:attr/textColorSecondary"
- android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
diff --git a/packages/DocumentsUI/res/layout/directory_cluster.xml b/packages/DocumentsUI/res/layout/directory_cluster.xml
deleted file mode 100644
index d84ef08..0000000
--- a/packages/DocumentsUI/res/layout/directory_cluster.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <FrameLayout
- android:id="@+id/container_message_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:elevation="8dp"
- android:background="@color/material_grey_50"/>
-
- <FrameLayout
- android:id="@+id/container_directory"
- android:clipToPadding="false"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <FrameLayout
- android:id="@+id/container_save"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/material_grey_50"
- android:elevation="8dp" />
-
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/drag_shadow_layout.xml b/packages/DocumentsUI/res/layout/drag_shadow_layout.xml
deleted file mode 100644
index 26613ef..0000000
--- a/packages/DocumentsUI/res/layout/drag_shadow_layout.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:orientation="horizontal"
- android:gravity="center_vertical|left"
- android:background="@drawable/drag_shadow_background">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/root_icon_size"
- android:layout_height="@dimen/root_icon_size"
- android:scaleType="centerInside"
- android:contentDescription="@null"
- android:duplicateParentState="true"/>
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:maxLines="1"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textColor="@color/item_title"
- android:paddingStart="8dp"/>
-
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/drawer_layout.xml b/packages/DocumentsUI/res/layout/drawer_layout.xml
deleted file mode 100644
index 4898f13..0000000
--- a/packages/DocumentsUI/res/layout/drawer_layout.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
- floating action buttons) to operate correctly. -->
-<android.support.design.widget.CoordinatorLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/coordinator_layout">
-
- <android.support.v4.widget.DrawerLayout
- android:id="@+id/drawer_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <com.android.documentsui.DocumentsToolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="?android:attr/colorPrimary"
- android:elevation="8dp"
- android:theme="?actionBarTheme"
- android:popupTheme="?actionBarPopupTheme">
-
- <com.android.documentsui.DropdownBreadcrumb
- android:id="@+id/breadcrumb"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="4dp"
- android:popupTheme="?actionBarPopupTheme"
- android:background="@android:color/transparent"
- android:overlapAnchor="true" />
-
- </com.android.documentsui.DocumentsToolbar>
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <include layout="@layout/directory_cluster"/>
-
- <!-- Drawer edge is a dummy view used to capture hovering event
- on view edge to open the drawer. (b/28345294) -->
- <View
- android:id="@+id/drawer_edge"
- android:background="@android:color/transparent"
- android:layout_width="@dimen/drawer_edge_width"
- android:layout_height="match_parent"/>
- </FrameLayout>
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/drawer_roots"
- android:layout_width="256dp"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:orientation="vertical"
- android:elevation="16dp"
- android:background="@color/drawer_background">
-
- <Toolbar
- android:id="@+id/roots_toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="?android:attr/colorPrimary"
- android:elevation="8dp"
- android:theme="?actionBarTheme"
- android:popupTheme="?actionBarPopupTheme" />
-
- <FrameLayout
- android:id="@+id/container_roots"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- </LinearLayout>
-
- </android.support.v4.widget.DrawerLayout>
-</android.support.design.widget.CoordinatorLayout>
diff --git a/packages/DocumentsUI/res/layout/fixed_layout.xml b/packages/DocumentsUI/res/layout/fixed_layout.xml
deleted file mode 100644
index 2ea9366..0000000
--- a/packages/DocumentsUI/res/layout/fixed_layout.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
- floating action buttons) to operate correctly. -->
-<!-- focusableInTouchMode is set in order to force key events to go to the activity's global key
- callback, which is necessary for proper event routing. See BaseActivity.onKeyDown. -->
-<android.support.design.widget.CoordinatorLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/coordinator_layout"
- android:focusableInTouchMode="true">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <com.android.documentsui.DocumentsToolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="?android:attr/colorPrimary"
- android:elevation="8dp"
- android:theme="?actionBarTheme"
- android:popupTheme="?actionBarPopupTheme">
-
- <com.android.documentsui.HorizontalBreadcrumb
- android:id="@+id/breadcrumb"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- </com.android.documentsui.DocumentsToolbar>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:orientation="horizontal"
- android:baselineAligned="false">
-
- <FrameLayout
- android:id="@+id/container_roots"
- android:layout_width="256dp"
- android:layout_height="match_parent" />
-
- <include layout="@layout/directory_cluster"
- android:layout_width="0dp"
- android:elevation="8dp" />
-
- </LinearLayout>
-
- </LinearLayout>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml
deleted file mode 100644
index 8eb46dd..0000000
--- a/packages/DocumentsUI/res/layout/fragment_directory.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<com.android.documentsui.dirlist.AnimationView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/directory_background"
- android:outlineProvider="bounds"
- android:elevation="4dp"
- android:orientation="vertical">
-
- <ProgressBar
- android:id="@+id/progressbar"
- android:layout_width="match_parent"
- android:layout_height="@dimen/progress_bar_height"
- android:indeterminate="true"
- style="@style/TrimmedHorizontalProgressBar"
- android:visibility="gone"/>
-
- <FrameLayout
- android:id="@+id/container_message_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:elevation="8dp"
- android:background="@color/material_grey_50"
- android:visibility="gone"/>
-
- <!-- The empty container view -->
- <FrameLayout
- android:id="@android:id/empty"
- android:gravity="center"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@color/directory_background"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:visibility="gone">
-
- <LinearLayout
- android:id="@+id/content"
- android:gravity="center"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/artwork"
- android:src="@drawable/cabinet"
- android:adjustViewBounds="true"
- android:layout_height="250dp"
- android:layout_width="fill_parent"
- android:alpha="1"
- android:layout_centerVertical="true"
- android:layout_marginBottom="25dp"
- android:scaleType="fitCenter"
- android:contentDescription="@null" />
-
- <TextView
- android:id="@+id/message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/empty"
- style="@android:style/TextAppearance.Material.Subhead" />
-
- </LinearLayout>
- </FrameLayout>
-
- <!-- This FrameLayout works around b/24189541 -->
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <android.support.v7.widget.RecyclerView
- android:id="@+id/dir_list"
- android:scrollbars="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingStart="0dp"
- android:paddingEnd="0dp"
- android:paddingTop="0dp"
- android:paddingBottom="0dp"
- android:clipToPadding="false"
- android:scrollbarStyle="outsideOverlay"
- android:drawSelectorOnTop="true" />
-
- </FrameLayout>
-
-</com.android.documentsui.dirlist.AnimationView>
diff --git a/packages/DocumentsUI/res/layout/fragment_message_bar.xml b/packages/DocumentsUI/res/layout/fragment_message_bar.xml
deleted file mode 100644
index 47e4e77..0000000
--- a/packages/DocumentsUI/res/layout/fragment_message_bar.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:animateLayoutChanges="true"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:orientation="vertical"
- android:paddingLeft="@dimen/list_item_padding"
- android:paddingRight="@dimen/list_item_padding"
- android:paddingTop="@dimen/list_item_padding">
-
- <LinearLayout
- android:id="@+id/container_info"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal"
- android:visibility="gone">
-
- <FrameLayout
- android:layout_height="@dimen/icon_size"
- android:layout_width="@dimen/icon_size">
-
- <ImageView
- android:contentDescription="@null"
- android:id="@+id/icon_info"
- android:layout_height="match_parent"
- android:layout_width="wrap_content"
- android:scaleType="centerInside"/>
-
- </FrameLayout>
-
- <TextView
- android:id="@+id/textview_info"
- android:layout_gravity="center_vertical"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:selectAllOnFocus="true"/>
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/container_error"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal"
- android:visibility="gone">
-
- <FrameLayout
- android:layout_height="@dimen/icon_size"
- android:layout_width="@dimen/icon_size">
-
- <ImageView
- android:contentDescription="@null"
- android:id="@+id/icon_error"
- android:layout_height="match_parent"
- android:layout_width="wrap_content"
- android:scaleType="centerInside"/>
-
- </FrameLayout>
-
- <TextView
- android:id="@+id/textview_error"
- android:layout_gravity="center_vertical"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:selectAllOnFocus="true"/>
-
- </LinearLayout>
-
- <LinearLayout
- android:layout_gravity="right"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal">
-
- <Button
- android:id="@+id/button_dismiss"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:text="@string/button_dismiss"
- style="?android:attr/buttonBarPositiveButtonStyle"/>
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/fragment_pick.xml b/packages/DocumentsUI/res/layout/fragment_pick.xml
deleted file mode 100644
index 40d4eb5..0000000
--- a/packages/DocumentsUI/res/layout/fragment_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="end"
- android:paddingEnd="8dp"
- android:minHeight="?android:attr/listPreferredItemHeightSmall">
- <Button
- android:id="@android:id/button2"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:text="@android:string/cancel"
- android:visibility="gone"
- style="?android:attr/buttonBarNegativeButtonStyle" />
- <Button
- android:id="@android:id/button1"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="?android:attr/buttonBarPositiveButtonStyle" />
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/fragment_roots.xml b/packages/DocumentsUI/res/layout/fragment_roots.xml
deleted file mode 100644
index ae46207..0000000
--- a/packages/DocumentsUI/res/layout/fragment_roots.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<com.android.documentsui.RootsList xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/roots_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="8dp"
- android:listSelector="@android:color/transparent"
- android:drawSelectorOnTop="true"
- android:divider="@null" />
diff --git a/packages/DocumentsUI/res/layout/fragment_save.xml b/packages/DocumentsUI/res/layout/fragment_save.xml
deleted file mode 100644
index a889b9f..0000000
--- a/packages/DocumentsUI/res/layout/fragment_save.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="@dimen/list_item_padding"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- android:fitsSystemWindows="true"
- android:minHeight="?android:attr/listPreferredItemHeightSmall">
-
- <FrameLayout
- android:layout_width="@dimen/icon_size"
- android:layout_height="@dimen/icon_size"
- android:layout_marginEnd="16dp">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/root_icon_size"
- android:layout_height="match_parent"
- android:scaleType="centerInside"
- android:contentDescription="@null" />
-
- </FrameLayout>
-
- <EditText
- android:id="@android:id/title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:singleLine="true"
- android:selectAllOnFocus="true" />
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent">
-
- <Button
- android:id="@android:id/button1"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:text="@string/menu_save"
- style="?android:attr/buttonBarPositiveButtonStyle" />
-
- <ProgressBar
- android:id="@android:id/progress"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:visibility="gone"
- android:indeterminate="true"
- android:padding="8dp"
- style="?android:attr/progressBarStyle" />
-
- </FrameLayout>
-
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/item_dir_grid.xml b/packages/DocumentsUI/res/layout/item_dir_grid.xml
deleted file mode 100644
index 36af9b9..0000000
--- a/packages/DocumentsUI/res/layout/item_dir_grid.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/grid_item_margin"
- android:background="@color/item_doc_background"
- android:elevation="@dimen/grid_item_elevation"
- android:focusable="true" >
-
- <!-- The height is 48px.
- paddingTop (9dp) + @dimen/check_icon_size (30dp) + paddingBottom (9dp) -->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal"
- android:paddingBottom="9dp"
- android:paddingLeft="9dp"
- android:paddingRight="12dp"
- android:paddingTop="9dp"
- android:gravity="center_vertical">
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp" >
-
- <ImageView
- android:id="@+id/icon_mime_sm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:scaleType="centerInside"
- android:src="@drawable/ic_doc_folder" />
-
- <ImageView
- android:id="@+id/icon_check"
- android:layout_width="@dimen/check_icon_size"
- android:layout_height="@dimen/check_icon_size"
- android:alpha="0"
- android:contentDescription="@null"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_check_circle" />
-
- </FrameLayout>
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="@color/item_title" />
-
- </LinearLayout>
-
- <!-- An overlay that draws the item border when it is focused. -->
-
- <View
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/item_doc_grid_border"
- android:contentDescription="@null"
- android:duplicateParentState="true" />
-
-</FrameLayout>
diff --git a/packages/DocumentsUI/res/layout/item_doc_grid.xml b/packages/DocumentsUI/res/layout/item_doc_grid.xml
deleted file mode 100644
index 56a061f..0000000
--- a/packages/DocumentsUI/res/layout/item_doc_grid.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/grid_item_margin"
- android:background="@color/item_doc_background"
- android:elevation="@dimen/grid_item_elevation"
- android:focusable="true">
-
- <!-- Main item thumbnail. Comprised of two overlapping images, the
- visibility of which is controlled by code in
- DirectoryFragment.java. -->
-
- <FrameLayout
- android:id="@+id/thumbnail"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <com.android.documentsui.GridItemThumbnail
- android:id="@+id/icon_thumb"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="centerCrop"
- android:contentDescription="@null" />
-
- <com.android.documentsui.GridItemThumbnail
- android:id="@+id/icon_mime_lg"
- android:layout_width="@dimen/icon_size"
- android:layout_height="@dimen/icon_size"
- android:layout_gravity="center"
- android:scaleType="fitCenter"
- android:contentDescription="@null" />
-
- </FrameLayout>
-
- <!-- Item nameplate. Has a mime-type icon and some text fields (title,
- size, mod-time, etc). -->
-
- <RelativeLayout
- android:id="@+id/nameplate"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/thumbnail"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:paddingLeft="12dp"
- android:paddingRight="12dp">
-
- <ImageView
- android:id="@+id/icon_mime_sm"
- android:layout_width="@dimen/grid_item_icon_size"
- android:layout_height="@dimen/grid_item_icon_size"
- android:layout_marginEnd="8dp"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:scaleType="center"
- android:contentDescription="@null"/>
-
- <ImageView
- android:id="@+id/icon_check"
- android:src="@drawable/ic_check_circle"
- android:alpha="0"
- android:layout_width="@dimen/check_icon_size"
- android:layout_height="@dimen/check_icon_size"
- android:layout_marginEnd="8dp"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:contentDescription="@null"/>
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_toEndOf="@id/icon_mime_sm"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="@color/item_title" />
-
- <TextView
- android:id="@+id/size"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toEndOf="@id/icon_mime_sm"
- android:layout_below="@android:id/title"
- android:layout_marginEnd="4dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@color/item_details" />
-
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/title"
- android:layout_toEndOf="@id/size"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@color/item_details" />
-
- </RelativeLayout>
-
- <!-- An overlay that draws the item border when it is focused. -->
- <View
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBottom="@id/nameplate"
- android:layout_alignTop="@id/thumbnail"
- android:layout_alignLeft="@id/thumbnail"
- android:layout_alignRight="@id/thumbnail"
- android:contentDescription="@null"
- android:background="@drawable/item_doc_grid_border"
- android:duplicateParentState="true" />
-
-</RelativeLayout>
diff --git a/packages/DocumentsUI/res/layout/item_doc_list.xml b/packages/DocumentsUI/res/layout/item_doc_list.xml
deleted file mode 100644
index a939fcd..0000000
--- a/packages/DocumentsUI/res/layout/item_doc_list.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<com.android.documentsui.ListItem xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/item_doc_background"
- android:focusable="true"
- android:orientation="horizontal" >
-
- <View
- android:id="@+id/focus_indicator"
- android:layout_width="4dp"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- android:minHeight="@dimen/list_item_height"
- android:orientation="horizontal"
- android:paddingEnd="@dimen/list_item_padding"
- android:paddingStart="@dimen/list_item_padding" >
-
- <FrameLayout
- android:id="@android:id/icon"
- android:layout_width="@dimen/list_item_thumbnail_size"
- android:layout_height="@dimen/list_item_thumbnail_size"
- android:layout_marginEnd="16dp" >
-
- <ImageView
- android:id="@+id/icon_mime"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:scaleType="centerInside" />
-
- <ImageView
- android:id="@+id/icon_thumb"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:contentDescription="@null"
- android:scaleType="centerCrop" />
-
- <ImageView
- android:id="@+id/icon_check"
- android:layout_width="@dimen/check_icon_size"
- android:layout_height="@dimen/check_icon_size"
- android:layout_gravity="center"
- android:alpha="0"
- android:contentDescription="@null"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_check_circle" />
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_gravity="center_vertical" >
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="@color/item_title" />
-
- <LinearLayout
- android:id="@+id/line2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- android:orientation="horizontal" >
-
- <TextView
- android:id="@+id/date"
- android:layout_width="90dp"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@color/item_details" />
-
- <TextView
- android:id="@+id/size"
- android:layout_width="90dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@color/item_details" />
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_weight="1"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@color/item_details" />
- </LinearLayout>
- </LinearLayout>
- </LinearLayout>
-
-</com.android.documentsui.ListItem>
diff --git a/packages/DocumentsUI/res/layout/item_root.xml b/packages/DocumentsUI/res/layout/item_root.xml
deleted file mode 100644
index 3e447c9..0000000
--- a/packages/DocumentsUI/res/layout/item_root.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<com.android.documentsui.RootItemView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- android:paddingStart="@dimen/list_item_padding"
- android:paddingEnd="@dimen/list_item_padding"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:baselineAligned="false"
- android:background="@drawable/root_item_background">
-
- <FrameLayout
- android:layout_width="@dimen/icon_size"
- android:layout_height="@dimen/icon_size"
- android:duplicateParentState="true">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/root_icon_size"
- android:layout_height="match_parent"
- android:scaleType="centerInside"
- android:contentDescription="@null"
- android:duplicateParentState="true" />
-
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:orientation="vertical">
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Menu"
- android:textColor="@color/item_root_primary_text" />
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@color/item_root_primary_text" />
-
- </LinearLayout>
-
-</com.android.documentsui.RootItemView>
diff --git a/packages/DocumentsUI/res/layout/item_root_header.xml b/packages/DocumentsUI/res/layout/item_root_header.xml
deleted file mode 100644
index 6b9857d..0000000
--- a/packages/DocumentsUI/res/layout/item_root_header.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="12dp">
-
- <TextView
- android:id="@android:id/title"
- android:textColor="?android:attr/textColorTertiary"
- style="?android:attr/listSeparatorTextViewStyle" />
-
-</FrameLayout>
diff --git a/packages/DocumentsUI/res/layout/item_root_spacer.xml b/packages/DocumentsUI/res/layout/item_root_spacer.xml
deleted file mode 100644
index b3beced..0000000
--- a/packages/DocumentsUI/res/layout/item_root_spacer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/listDivider" />
-
-</FrameLayout>
diff --git a/packages/DocumentsUI/res/layout/item_subdir.xml b/packages/DocumentsUI/res/layout/item_subdir.xml
deleted file mode 100644
index ffe4afe..0000000
--- a/packages/DocumentsUI/res/layout/item_subdir.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:baselineAligned="false">
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary" />
-
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/item_subdir_title.xml b/packages/DocumentsUI/res/layout/item_subdir_title.xml
deleted file mode 100644
index 8d0d807..0000000
--- a/packages/DocumentsUI/res/layout/item_subdir_title.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingEnd="8dp"
- android:orientation="horizontal"
- android:baselineAligned="false">
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:drawablePadding="12dp"
- android:drawableRight="@drawable/ic_breadcrumb_arrow_down"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" />
-</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml b/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml
deleted file mode 100644
index ab9d3b2..0000000
--- a/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-
-<!--
- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
- floating action buttons) to operate correctly.
--->
-<!--
- focusableInTouchMode is set in order to force key events to go to the activity's global key
- callback, which is necessary for proper event routing. See BaseActivity.onKeyDown.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentTop="true"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/breadcrumb_text"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" />
-
- <ImageView
- android:id="@+id/breadcrumb_arrow"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_breadcrumb_arrow"
- android:layout_marginTop="2dp"
- android:layout_marginRight="3dp"
- android:layout_marginLeft="3dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/packages/DocumentsUI/res/layout/single_pane_layout.xml b/packages/DocumentsUI/res/layout/single_pane_layout.xml
deleted file mode 100644
index 7b7e229..0000000
--- a/packages/DocumentsUI/res/layout/single_pane_layout.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
- floating action buttons) to operate correctly. -->
-<!-- focusableInTouchMode is set in order to force key events to go to the activity's global key
- callback, which is necessary for proper event routing. See BaseActivity.onKeyDown. -->
-<android.support.design.widget.CoordinatorLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/coordinator_layout"
- android:focusableInTouchMode="true">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <com.android.documentsui.DocumentsToolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="?android:attr/colorPrimary"
- android:elevation="8dp"
- android:theme="?actionBarTheme"
- android:popupTheme="?actionBarPopupTheme">
-
- <Spinner
- android:id="@+id/stack"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:popupTheme="?actionBarPopupTheme"
- android:background="@android:color/transparent"
- android:layout_marginStart="4dp"
- android:overlapAnchor="true" />
-
- </com.android.documentsui.DocumentsToolbar>
-
- <include layout="@layout/directory_cluster"/>
-
- </LinearLayout>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml
deleted file mode 100644
index ed47bbc..0000000
--- a/packages/DocumentsUI/res/menu/activity.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- showAsAction flag impacts the behavior of SearchView.
- When set to collapseActionView, collapsing SearchView to icon is the
- default behavior. It would fit UX, however after expanding SearchView is
- shown on the left site of the toolbar (replacing title). Since no way to
- prevent this behavior was found, the flag is set to always. SearchView is
- always visible by default and it is being collapse manually by calling
- setIconified() method
--->
- <item
- android:id="@+id/menu_search"
- android:title="@string/menu_search"
- android:icon="@drawable/ic_menu_search"
- android:showAsAction="always"
- android:actionViewClass="android.widget.SearchView"
- android:imeOptions="actionSearch"
- android:visible="false" />
-<!-- This group is being hidden when searching is in full bar mode-->
- <group android:id="@+id/group_hide_when_searching">
- <item
- android:id="@+id/menu_grid"
- android:title="@string/menu_grid"
- android:icon="@drawable/ic_menu_view_grid"
- android:showAsAction="always" />
- <item
- android:id="@+id/menu_list"
- android:title="@string/menu_list"
- android:icon="@drawable/ic_menu_view_list"
- android:showAsAction="always" />
-
- <item
- android:id="@+id/menu_new_window"
- android:title="@string/menu_new_window"
- android:alphabeticShortcut="n"
- android:showAsAction="never"
- android:visible="false" />
- <item
- android:id="@+id/menu_create_dir"
- android:title="@string/menu_create_dir"
- android:icon="@drawable/ic_menu_new_folder"
- android:alphabeticShortcut="e"
- android:showAsAction="never"
- android:visible="false" />
- <item
- android:id="@+id/menu_sort"
- android:title="@string/menu_sort"
- android:icon="@drawable/ic_menu_sortby"
- android:showAsAction="ifRoom">
- <menu>
- <item
- android:id="@+id/menu_sort_name"
- android:title="@string/sort_name" />
- <item
- android:id="@+id/menu_sort_date"
- android:title="@string/sort_date" />
- <item
- android:id="@+id/menu_sort_size"
- android:title="@string/sort_size" />
- </menu>
- </item>
- <item
- android:id="@+id/menu_file_size"
- android:showAsAction="never"
- android:visible="false" />
- <item
- android:id="@+id/menu_advanced"
- android:showAsAction="never"
- android:visible="false" />
- <item
- android:id="@+id/menu_settings"
- android:title="@string/menu_settings"
- android:showAsAction="never"
- android:visible="false" />
- </group>
-</menu>
diff --git a/packages/DocumentsUI/res/menu/context_menu.xml b/packages/DocumentsUI/res/menu/context_menu.xml
deleted file mode 100644
index 7474859..0000000
--- a/packages/DocumentsUI/res/menu/context_menu.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/menu_cut_to_clipboard"
- android:title="@string/menu_cut_to_clipboard" />
- <item
- android:id="@+id/menu_copy_to_clipboard"
- android:title="@string/menu_copy_to_clipboard" />
- <item
- android:id="@+id/menu_paste_from_clipboard"
- android:title="@string/menu_paste_from_clipboard" />
-</menu>
diff --git a/packages/DocumentsUI/res/menu/mode_directory.xml b/packages/DocumentsUI/res/menu/mode_directory.xml
deleted file mode 100644
index e2125ad..0000000
--- a/packages/DocumentsUI/res/menu/mode_directory.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/menu_open"
- android:title="@string/menu_open"
- android:showAsAction="always" />
- <item
- android:id="@+id/menu_share"
- android:icon="@drawable/ic_menu_share"
- android:title="@string/menu_share"
- android:showAsAction="always" />
- <item
- android:id="@+id/menu_delete"
- android:icon="@drawable/ic_menu_delete"
- android:title="@string/menu_delete"
- android:showAsAction="always" />
- <item
- android:id="@+id/menu_select_all"
- android:title="@string/menu_select_all"
- android:showAsAction="never" />
- <item
- android:id="@+id/menu_copy_to"
- android:title="@string/menu_copy"
- android:showAsAction="never"
- android:visible="false" />
- <item
- android:id="@+id/menu_move_to"
- android:title="@string/menu_move"
- android:showAsAction="never"
- android:visible="false" />
- <item
- android:id="@+id/menu_rename"
- android:title="@string/menu_rename"
- android:showAsAction="never"
- android:visible="false" />
-</menu>
diff --git a/packages/DocumentsUI/res/mipmap-hdpi/ic_launcher_downloads.png b/packages/DocumentsUI/res/mipmap-hdpi/ic_launcher_downloads.png
deleted file mode 100644
index f958bbd..0000000
--- a/packages/DocumentsUI/res/mipmap-hdpi/ic_launcher_downloads.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/mipmap-mdpi/ic_launcher_downloads.png b/packages/DocumentsUI/res/mipmap-mdpi/ic_launcher_downloads.png
deleted file mode 100644
index f2e9376..0000000
--- a/packages/DocumentsUI/res/mipmap-mdpi/ic_launcher_downloads.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/mipmap-xhdpi/ic_launcher_downloads.png b/packages/DocumentsUI/res/mipmap-xhdpi/ic_launcher_downloads.png
deleted file mode 100644
index 4dc5336..0000000
--- a/packages/DocumentsUI/res/mipmap-xhdpi/ic_launcher_downloads.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/mipmap-xxhdpi/ic_launcher_downloads.png b/packages/DocumentsUI/res/mipmap-xxhdpi/ic_launcher_downloads.png
deleted file mode 100644
index 8716290..0000000
--- a/packages/DocumentsUI/res/mipmap-xxhdpi/ic_launcher_downloads.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/mipmap-xxxhdpi/ic_launcher_downloads.png b/packages/DocumentsUI/res/mipmap-xxxhdpi/ic_launcher_downloads.png
deleted file mode 100644
index f5be219..0000000
--- a/packages/DocumentsUI/res/mipmap-xxxhdpi/ic_launcher_downloads.png
+++ /dev/null
Binary files differ
diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml
deleted file mode 100644
index 0908e8a..0000000
--- a/packages/DocumentsUI/res/values-af/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumente"</string>
- <string name="downloads_label" msgid="959113951084633612">"Aflaaie"</string>
- <string name="title_open" msgid="4353228937663917801">"Maak oop vanuit"</string>
- <string name="title_save" msgid="2433679664882857999">"Stoor na"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nuwe vouer"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Roosteraansig"</string>
- <string name="menu_list" msgid="7279285939892417279">"Lysaansig"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sorteer volgens"</string>
- <string name="menu_search" msgid="3816712084502856974">"Soek"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Berginginstellings"</string>
- <string name="menu_open" msgid="432922957274920903">"Maak oop"</string>
- <string name="menu_save" msgid="2394743337684426338">"Stoor"</string>
- <string name="menu_share" msgid="3075149983979628146">"Deel"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Vee uit"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Kies alles"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopieer na …"</string>
- <string name="menu_move" msgid="1828090633118079817">"Skuif na …"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nuwe venster"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Knip"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopieer"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Plak"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Wys interne berging"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Versteek interne berging"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Wys lêergrootte"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Versteek lêergrootte"</string>
- <string name="button_select" msgid="527196987259139214">"Kies"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopieer"</string>
- <string name="button_move" msgid="2202666023104202232">"Skuif"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Maak toe"</string>
- <string name="button_retry" msgid="4392027584153752797">"Probeer weer"</string>
- <string name="sort_name" msgid="9183560467917256779">"Volgens naam"</string>
- <string name="sort_date" msgid="586080032956151448">"Volgens datum gewysig"</string>
- <string name="sort_size" msgid="3350681319735474741">"Volgens grootte"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Wys wortels"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Versteek wortels"</string>
- <string name="save_error" msgid="6167009778003223664">"Kon nie dokument stoor nie"</string>
- <string name="create_error" msgid="3735649141335444215">"Kon nie vouer skep nie"</string>
- <string name="query_error" msgid="5999895349602476581">"Kan nie op die oomblik inhoud laai nie"</string>
- <string name="root_recent" msgid="4470053704320518133">"Onlangs"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> gratis"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Bergingdienste"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Kortpaaie"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Toestelle"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Nog programme"</string>
- <string name="empty" msgid="7858882803708117596">"Geen items nie"</string>
- <string name="no_results" msgid="6622510343880730446">"Geen passings in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Kan nie lêer oopmaak nie"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Kan sommige dokumente nie uitvee nie"</string>
- <string name="share_via" msgid="8966594246261344259">"Deel via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopieer tans lêers"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Skuif tans lêers"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Vee tans lêers uit"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> oor"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Kopieer tans <xliff:g id="COUNT_1">%1$d</xliff:g> lêers.</item>
- <item quantity="one">Kopieer tans <xliff:g id="COUNT_0">%1$d</xliff:g> lêer.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Skuif tans <xliff:g id="COUNT_1">%1$d</xliff:g> lêers.</item>
- <item quantity="one">Skuif tans <xliff:g id="COUNT_0">%1$d</xliff:g> lêer.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Vee tans <xliff:g id="COUNT_1">%1$d</xliff:g> lêers uit.</item>
- <item quantity="one">Vee tans <xliff:g id="COUNT_0">%1$d</xliff:g> lêer uit.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Ontdoen"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Maak tans gereed vir kopieer …"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Berei tans voor vir skuif …"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Maak tans gereed om uit te vee …"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Kon <xliff:g id="COUNT_1">%1$d</xliff:g> lêers nie kopieer nie</item>
- <item quantity="one">Kon <xliff:g id="COUNT_0">%1$d</xliff:g> lêer nie kopieer nie</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Kon <xliff:g id="COUNT_1">%1$d</xliff:g> lêers nie skuif nie</item>
- <item quantity="one">Kon <xliff:g id="COUNT_0">%1$d</xliff:g> lêer nie skuif nie</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Kon <xliff:g id="COUNT_1">%1$d</xliff:g> lêers nie uitvee nie</item>
- <item quantity="one">Kon <xliff:g id="COUNT_0">%1$d</xliff:g> lêer nie uitvee nie</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tik om besonderhede te bekyk"</string>
- <string name="close" msgid="3043722427445528732">"Maak toe"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Hierdie lêers is nie gekopieer nie: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Hierdie lêers is nie geskuif nie: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Hierdie lêers is nie uitgevee nie: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Hierdie lêers is na \'n ander formaat omgeskakel: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Het <xliff:g id="COUNT_1">%1$d</xliff:g> lêers na die knipbord gekopieer.</item>
- <item quantity="one">Het <xliff:g id="COUNT_0">%1$d</xliff:g> lêer na die knipbord gekopieer.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Kan nie die geselekteerde lêers in hierdie ligging plak nie."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Hernoem"</string>
- <string name="rename_error" msgid="4203041674883412606">"Kon nie dokument hernoem nie"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sommige lêers is omgeskakel"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Gee <xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang tot <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>-gids op <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Gee <xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang tot <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>-gids?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Gee <xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang tot jou data, insluitend foto\'s en video\'s, op <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Moenie weer vra nie"</string>
- <string name="allow" msgid="7225948811296386551">"Laat toe"</string>
- <string name="deny" msgid="2081879885755434506">"Weier"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> gekies</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gekies</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vee \"<xliff:g id="NAME">%1$s</xliff:g>\" uit?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vee vouer \"<xliff:g id="NAME">%1$s</xliff:g>\" en sy inhoud uit?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Vee <xliff:g id="COUNT_1">%1$d</xliff:g> lêers uit?</item>
- <item quantity="one">Vee <xliff:g id="COUNT_0">%1$d</xliff:g> lêer uit?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Vee <xliff:g id="COUNT_1">%1$d</xliff:g> vouers en hul inhoud uit?</item>
- <item quantity="one">Vee <xliff:g id="COUNT_0">%1$d</xliff:g> vouer en sy inhoud uit?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Vee <xliff:g id="COUNT_1">%1$d</xliff:g> items uit?</item>
- <item quantity="one">Vee <xliff:g id="COUNT_0">%1$d</xliff:g> item uit?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml
deleted file mode 100644
index f0aaf7e..0000000
--- a/packages/DocumentsUI/res/values-am/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ሰነዶች"</string>
- <string name="downloads_label" msgid="959113951084633612">"የወረዱ"</string>
- <string name="title_open" msgid="4353228937663917801">"ክፈት ከ"</string>
- <string name="title_save" msgid="2433679664882857999">"አስቀምጥ ወደ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"አዲስ አቃፊ"</string>
- <string name="menu_grid" msgid="6878021334497835259">"የፍርግርግ እይታ"</string>
- <string name="menu_list" msgid="7279285939892417279">"የዝርዝር እይታ"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ደርድር በ"</string>
- <string name="menu_search" msgid="3816712084502856974">"ፈልግ"</string>
- <string name="menu_settings" msgid="8239065133341597825">"የማከማቻ ቅንብሮች"</string>
- <string name="menu_open" msgid="432922957274920903">"ክፈት"</string>
- <string name="menu_save" msgid="2394743337684426338">"አስቀምጥ"</string>
- <string name="menu_share" msgid="3075149983979628146">"አጋራ"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ሰርዝ"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"ሁሉንም ምረጥ"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ቅዳ ወደ…"</string>
- <string name="menu_move" msgid="1828090633118079817">"ይውሰዱ ወደ..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"አዲሰ መስኮት"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ቁረጥ"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ቅዳ"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ለጥፍ"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"ውስጣዊ ማከማቻ አሳይ"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"ውስጣዊ ማከማቻ ደብቅ"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"የፋይል መጠን አሳይ"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"የፋይል መጠን ደብቅ"</string>
- <string name="button_select" msgid="527196987259139214">"ምረጥ"</string>
- <string name="button_copy" msgid="8706475544635021302">"ቅዳ"</string>
- <string name="button_move" msgid="2202666023104202232">"አንቀሳቀስ"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"አሰናብት"</string>
- <string name="button_retry" msgid="4392027584153752797">"እንደገና ይሞክሩ"</string>
- <string name="sort_name" msgid="9183560467917256779">"በስም"</string>
- <string name="sort_date" msgid="586080032956151448">"በተለወጠበት ቀን"</string>
- <string name="sort_size" msgid="3350681319735474741">"በመጠን"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ስሮችን አሳይ"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ስሮችን ደብቅ"</string>
- <string name="save_error" msgid="6167009778003223664">"ሰነድ ማስቀመጥ አልተሳካም"</string>
- <string name="create_error" msgid="3735649141335444215">"አቃፊ መፍጠር አልተሳካም"</string>
- <string name="query_error" msgid="5999895349602476581">"አሁን ይዘትን መጫን አልተቻለም"</string>
- <string name="root_recent" msgid="4470053704320518133">"የቅርብ ጊዜ"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ነፃ"</string>
- <string name="root_type_service" msgid="2178854894416775409">"የማከማቻ አገልግሎቶች"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"አቋራጮች"</string>
- <string name="root_type_device" msgid="7121342474653483538">"መሣሪያዎች"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"ተጨማሪ መተግበሪያዎች"</string>
- <string name="empty" msgid="7858882803708117596">"ምንም ንጥሎች የሉም"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ውስጥ ምንም ተዛማጆች የሉም"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ፋይሉን መክፈት አይቻልም"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"አንዳንድ ሰነዶችን መሰረዝ አልተቻለም"</string>
- <string name="share_via" msgid="8966594246261344259">"በሚከተለው በኩል ያጋሩ"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ፋይሎች በመገልበጥ ላይ"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ፋይሎችን በመውሰድ ላይ"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ፋይሎችን በመሰረዝ ላይ"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ቀርቷል"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች በመቅዳት ላይ።</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች በመቅዳት ላይ።</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን በመውሰድ ላይ።</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን በመውሰድ ላይ።</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን በመሰረዝ ላይ።</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን በመሰረዝ ላይ።</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"ቀልብስ"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"ቅጂ በማዘጋጀት ላይ…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"ለመውሰድ በማዘጋጀት ላይ…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"ለመሰረዝ በመዘጋጀት ላይ…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መቅዳት አልተቻለም</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መቅዳት አልተቻለም</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መውሰድ አልተቻለም</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መውሰድ አልተቻለም</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መሰረዝ አልተቻለም</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መሰረዝ አልተቻለም</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"ዝርዝሮችን ለመመልከት መታ ያድርጉ"</string>
- <string name="close" msgid="3043722427445528732">"ዝጋ"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"እነዚህ ፋይሎች አልተቀዱም፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"እነዚህ ፋይሎች አልተወሰዱም፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"እነዚህ ፋይሎች አልተሰረዙም፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"እነዚህ ፋይሎች ወደ ሌላ ቅርጸት ተለውጠዋል፦ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ወደ ቅንጥብ ሰሌዳ ቀድቷል።</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ወደ ቅንጥብ ሰሌዳ ቀድተዋል።</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"የተመረጡትን ፋይሎች ወደዚህ አካባቢ መለጠፍ አይቻልም።"</string>
- <string name="menu_rename" msgid="7678802479104285353">"እንደገና ሰይም"</string>
- <string name="rename_error" msgid="4203041674883412606">"ሰነዱን ዳግም መሰየም አልተሳካም"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"አንዳንድ ፋይሎች ተለውጠዋል"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> በ<xliff:g id="STORAGE"><i>^3</i></xliff:g> ላይ የ<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ማውጫ መደረሻ ይሰጠው?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"የ<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ማውጫ መዳረሻ ለ<xliff:g id="APPNAME"><b>^1</b></xliff:g> ይሰጠው?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"በ<xliff:g id="STORAGE"><i>^2</i></xliff:g> ላይ ያሉትን ፎቶዎች እና ቪዲዮዎች ጨምሮ የውሂብዎ መዳረሻ ለ<xliff:g id="APPNAME"><b>^1</b></xliff:g> ይሰጥ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"ዳግም አትጠይቅ"</string>
- <string name="allow" msgid="7225948811296386551">"ይፍቀዱ"</string>
- <string name="deny" msgid="2081879885755434506">"ያስተባብሉ"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጠዋል</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጠዋል</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ንጥሎች</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ንጥሎች</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"«<xliff:g id="NAME">%1$s</xliff:g>» ይሰረዝ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"አቃፊ «<xliff:g id="NAME">%1$s</xliff:g>» እና ይዘቶቹ ይሰረዙ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ይሰረዙ?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ይሰረዙ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> አቃፊዎች እና ይዘቶቻቸው ይሰረዙ?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> አቃፊዎች እና ይዘቶቻቸው ይሰረዙ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ንጥሎች ይሰረዙ?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ንጥሎች ይሰረዙ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ar/strings.xml b/packages/DocumentsUI/res/values-ar/strings.xml
deleted file mode 100644
index d04691b..0000000
--- a/packages/DocumentsUI/res/values-ar/strings.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"مستندات"</string>
- <string name="downloads_label" msgid="959113951084633612">"التنزيلات"</string>
- <string name="title_open" msgid="4353228937663917801">"فتح من"</string>
- <string name="title_save" msgid="2433679664882857999">"حفظ في"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"مجلد جديد"</string>
- <string name="menu_grid" msgid="6878021334497835259">"عرض الشبكة"</string>
- <string name="menu_list" msgid="7279285939892417279">"عرض القائمة"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ترتيب بحسب"</string>
- <string name="menu_search" msgid="3816712084502856974">"بحث"</string>
- <string name="menu_settings" msgid="8239065133341597825">"إعدادات سعة التخزين"</string>
- <string name="menu_open" msgid="432922957274920903">"فتح"</string>
- <string name="menu_save" msgid="2394743337684426338">"حفظ"</string>
- <string name="menu_share" msgid="3075149983979628146">"مشاركة"</string>
- <string name="menu_delete" msgid="8138799623850614177">"حذف"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"تحديد الكل"</string>
- <string name="menu_copy" msgid="3612326052677229148">"نسخ إلى…"</string>
- <string name="menu_move" msgid="1828090633118079817">"نقل إلى..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"نافذة جديدة"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"قص"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"نسخ"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"لصق"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"إظهار وحدة التخزين الداخلية"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"إخفاء وحدة التخزين الداخلية"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"إظهار حجم الملف"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"إخفاء حجم الملف"</string>
- <string name="button_select" msgid="527196987259139214">"تحديد"</string>
- <string name="button_copy" msgid="8706475544635021302">"نسخ"</string>
- <string name="button_move" msgid="2202666023104202232">"نقل"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"إزالة"</string>
- <string name="button_retry" msgid="4392027584153752797">"إعادة المحاولة"</string>
- <string name="sort_name" msgid="9183560467917256779">"بحسب الاسم"</string>
- <string name="sort_date" msgid="586080032956151448">"بحسب تاريخ التعديل"</string>
- <string name="sort_size" msgid="3350681319735474741">"بحسب الحجم"</string>
- <string name="drawer_open" msgid="4545466532430226949">"عرض الجذور"</string>
- <string name="drawer_close" msgid="7602734368552123318">"إخفاء الجذور"</string>
- <string name="save_error" msgid="6167009778003223664">"أخفق حفظ المستند"</string>
- <string name="create_error" msgid="3735649141335444215">"أخفق إنشاء المجلد"</string>
- <string name="query_error" msgid="5999895349602476581">"يتعذر تحميل المحتوى في الوقت الحالي"</string>
- <string name="root_recent" msgid="4470053704320518133">"الأخيرة"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> خالية"</string>
- <string name="root_type_service" msgid="2178854894416775409">"خدمات التخزين"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"اختصارات"</string>
- <string name="root_type_device" msgid="7121342474653483538">"أجهزة"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"المزيد من التطبيقات"</string>
- <string name="empty" msgid="7858882803708117596">"ليس هناك أي عناصر"</string>
- <string name="no_results" msgid="6622510343880730446">"لا نتائج مطابقة في %1$s."</string>
- <string name="toast_no_application" msgid="4632640357724698144">"يتعذر فتح الملف"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"تعذر حذف بعض المستندات"</string>
- <string name="share_via" msgid="8966594246261344259">"مشاركة عبر"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"جارٍ نسخ الملفات"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"نقل الملفات"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"جارٍ حذف الملفات"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"المدة المتبقية: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="zero">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات.</item>
- <item quantity="two">جارٍ نسخ ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>).</item>
- <item quantity="few">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات.</item>
- <item quantity="many">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا.</item>
- <item quantity="other">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> من الملفات.</item>
- <item quantity="one">جارٍ نسخ ملف واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>).</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="zero">لا ملفات <xliff:g id="COUNT_1">%1$d</xliff:g> يجري نقلها.</item>
- <item quantity="two">جارٍ نقل ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>).</item>
- <item quantity="few">جارٍ نقل <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات.</item>
- <item quantity="many">جارٍ نقل <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا.</item>
- <item quantity="other">جارٍ نقل <xliff:g id="COUNT_1">%1$d</xliff:g> من الملفات.</item>
- <item quantity="one">جارٍ نقل <xliff:g id="COUNT_0">%1$d</xliff:g> ملف واحد.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="zero">جارٍ حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملف.</item>
- <item quantity="two">جارٍ حذف ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>).</item>
- <item quantity="few">جارٍ حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات.</item>
- <item quantity="many">جارٍ حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا.</item>
- <item quantity="other">جارٍ حذف <xliff:g id="COUNT_1">%1$d</xliff:g> من الملفات.</item>
- <item quantity="one">جارٍ حذف <xliff:g id="COUNT_0">%1$d</xliff:g> ملف.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"تراجع"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"جارٍ التحضير للنسخ ..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"جارٍ التحضير للنقل…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"جارٍ الإعداد للحذف…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="zero">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="two">تعذر نسخ ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>
- <item quantity="few">تعذر نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات</item>
- <item quantity="many">تعذر نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا</item>
- <item quantity="other">تعذر نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملف</item>
- <item quantity="one">تعذر نسخ ملف (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="zero">Couldn’t move <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="two">تعذر نقل ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>
- <item quantity="few">تعذر نقل <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات</item>
- <item quantity="many">تعذر نقل <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا</item>
- <item quantity="other">تعذر نقل <xliff:g id="COUNT_1">%1$d</xliff:g> ملف</item>
- <item quantity="one">تعذر نقل ملف (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="zero">Couldn’t delete <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="two">تعذر حذف ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>
- <item quantity="few">تعذر حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات</item>
- <item quantity="many">تعذر حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا</item>
- <item quantity="other">تعذر حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملف</item>
- <item quantity="one">تعذر حذف ملف (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"انقر لعرض التفاصيل."</string>
- <string name="close" msgid="3043722427445528732">"إغلاق"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"لم يتم نسخ هذه الملفات: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"لم يتم نقل هذه الملفات: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"لم يتم حذف هذه الملفات: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"تم تحويل هذه الملفات إلى تنسيق آخر: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="zero">لم يتم نسخ أي ملف (<xliff:g id="COUNT_1">%1$d</xliff:g>) إلى الحافظة.</item>
- <item quantity="two">تم نسخ ملفين اثنين (<xliff:g id="COUNT_1">%1$d</xliff:g>) إلى الحافظة.</item>
- <item quantity="few">تم نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات إلى الحافظة.</item>
- <item quantity="many">تم نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا إلى الحافظة.</item>
- <item quantity="other">تم نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> من الملفات إلى الحافظة.</item>
- <item quantity="one">تم نسخ ملف واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>) إلى الحافظة.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"يتعذر لصق الملفات المحددة في هذا الموقع."</string>
- <string name="menu_rename" msgid="7678802479104285353">"إعادة تسمية"</string>
- <string name="rename_error" msgid="4203041674883412606">"أخفقت إعادة تسمية المستند."</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"تم تحويل بعض الملفات"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"هل تريد منح التطبيق <xliff:g id="APPNAME"><b>^1</b></xliff:g> حق الوصول إلى الدليل <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> على <xliff:g id="STORAGE"><i>^3</i></xliff:g>؟"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"هل تريد تمكين <xliff:g id="APPNAME"><b>^1</b></xliff:g> من الدخول إلى دليل <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>؟"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"هل تريد منح <xliff:g id="APPNAME"><b>^1</b></xliff:g> حق الوصول إلى بياناتك، بما في ذلك الصور ومقاطع الفيديو على <xliff:g id="STORAGE"><i>^2</i></xliff:g>؟"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"عدم السؤال مرة أخرى"</string>
- <string name="allow" msgid="7225948811296386551">"السماح"</string>
- <string name="deny" msgid="2081879885755434506">"رفض"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="zero">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="two">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="few">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="many">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">تم تحديد <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> عنصر</item>
- <item quantity="two">عنصران (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> عناصر</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> عنصرًا</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> عنصر</item>
- <item quantity="one">عنصر واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"هل تريد حذف \"<xliff:g id="NAME">%1$s</xliff:g>\"؟"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"هل تريد حذف المجلد \"<xliff:g id="NAME">%1$s</xliff:g>\" ومحتوياته؟"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="zero">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملف؟</item>
- <item quantity="two">هل تريد حذف ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>)؟</item>
- <item quantity="few">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات؟</item>
- <item quantity="many">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا؟</item>
- <item quantity="other">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملف؟</item>
- <item quantity="one">هل تريد حذف <xliff:g id="COUNT_0">%1$d</xliff:g> ملف؟</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="zero">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> مجلد ومحتوياته؟</item>
- <item quantity="two">هل تريد حذف مجلدين (<xliff:g id="COUNT_1">%1$d</xliff:g>) ومحتوياتهما؟</item>
- <item quantity="few">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> مجلدات ومحتوياتها؟</item>
- <item quantity="many">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> مجلدًا ومحتويات هذه المجلدات؟</item>
- <item quantity="other">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> مجلد ومحتويات هذه المجلدات؟</item>
- <item quantity="one">هل تريد حذف <xliff:g id="COUNT_0">%1$d</xliff:g> مجلد ومحتوياته؟</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="zero">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> عنصر؟</item>
- <item quantity="two">هل تريد حذف عنصرين (<xliff:g id="COUNT_1">%1$d</xliff:g>)؟</item>
- <item quantity="few">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> عناصر؟</item>
- <item quantity="many">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> عنصرًا؟</item>
- <item quantity="other">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> عنصر؟</item>
- <item quantity="one">هل تريد حذف <xliff:g id="COUNT_0">%1$d</xliff:g> عنصر؟</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
deleted file mode 100644
index 611a669..0000000
--- a/packages/DocumentsUI/res/values-az-rAZ/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Sənədlər"</string>
- <string name="downloads_label" msgid="959113951084633612">"Endirmələr"</string>
- <string name="title_open" msgid="4353228937663917801">"Vasitəsilə açın"</string>
- <string name="title_save" msgid="2433679664882857999">"buraya saxlayın"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Yeni qovluq"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Torlu görünüş"</string>
- <string name="menu_list" msgid="7279285939892417279">"Siyahı görünüşü"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sıralayın"</string>
- <string name="menu_search" msgid="3816712084502856974">"Axtarış"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Yaddaş ayarları"</string>
- <string name="menu_open" msgid="432922957274920903">"Açın"</string>
- <string name="menu_save" msgid="2394743337684426338">"Yadda saxlayın"</string>
- <string name="menu_share" msgid="3075149983979628146">"Paylaşın"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Sil"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Hamısını seçin"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Buraya kopyalayın:"</string>
- <string name="menu_move" msgid="1828090633118079817">"Daşıyın..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Yeni pəncərə"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Kəsin"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopyalayın"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Yerləşdirin"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Daxili yaddaşı göstərin"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Daxili yaddaşı gizlədin"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Fayl ölçüsünü göstərin"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Fayl ölçüsünü gizlədin"</string>
- <string name="button_select" msgid="527196987259139214">"Seçin"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopyala"</string>
- <string name="button_move" msgid="2202666023104202232">"Köçürün"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Rədd edin"</string>
- <string name="button_retry" msgid="4392027584153752797">"Yenidən cəhd edin"</string>
- <string name="sort_name" msgid="9183560467917256779">"Ad üzrə"</string>
- <string name="sort_date" msgid="586080032956151448">"Tarix üzrə dəyişmiş"</string>
- <string name="sort_size" msgid="3350681319735474741">"Ölçü üzrə"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Kökləri göstərin"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Kökləri gizlədin"</string>
- <string name="save_error" msgid="6167009778003223664">"Sənədi yadda saxlaya bilmədi"</string>
- <string name="create_error" msgid="3735649141335444215">"Qovluq yaradıla bilmədi"</string>
- <string name="query_error" msgid="5999895349602476581">"Məzmun hazırda yüklənmir"</string>
- <string name="root_recent" msgid="4470053704320518133">"Son"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ödənişsiz"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Saxlama xidmətləri"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Qısa yollar"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Cihazlar"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Digər tətbiqlər"</string>
- <string name="empty" msgid="7858882803708117596">"Heç nə yoxdur"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ilə heç bir uyğunluq yoxdur"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Fayl açılmır"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Bəzi sənədləri silə bilmir"</string>
- <string name="share_via" msgid="8966594246261344259">"Bunun vasitəsilə paylaş:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Fayllar kopyalanır"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Fayllar köçürülür"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Fayllar silinir"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> qalıb"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl kopyalanır.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl kopyalanır.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl köçürülür.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl köçürülür.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl silinir.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl silinir.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Ləğv edin"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopyalanmaq üçün hazırlanır ..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Köçürmə üçün hazırlanır..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Silmək üçün hazırlanır..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fayl kopyalanmadı</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fayl kopyalanmadı</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fayl köçürülmədi</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fayl köçürülmədi</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fayl silinmədi</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fayl silinmədi</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Detallara baxmaq üçün basın"</string>
- <string name="close" msgid="3043722427445528732">"Bağla"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Bu fayllar kopyalanmadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Bu fayllar köçürülmədi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Bu fayllar silinmədi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Bu fayllar başqa formata konvertasiya edilib: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl buferə kopyalandı.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl buferə kopyalandı.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Seçilmiş faylları bu məkana yerləşdirmək olmaz."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Adını dəyişdirin"</string>
- <string name="rename_error" msgid="4203041674883412606">"Sənəd adını dəyişmək uğursuz oldu"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bəzi fayllar konvertasiya edilib"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> yaddaşında <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> kataloquna <xliff:g id="APPNAME"><b>^1</b></xliff:g> girişi təqdim edilsin?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> kataloquna <xliff:g id="APPNAME"><b>^1</b></xliff:g> girişi təqdim edilsin?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> yaddaşında foto və videolar daxil olmaqla datanıza <xliff:g id="APPNAME"><b>^1</b></xliff:g> girişi təmin edilsin?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Bir daha soruşmayın"</string>
- <string name="allow" msgid="7225948811296386551">"İcazə verin"</string>
- <string name="deny" msgid="2081879885755434506">"Rədd et"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seçilib</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seçilib</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> element</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" silinsin?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" qovluğu və onun məzmunu silinsin?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fayl silinsin?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl silinsin?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> qovluq və onun məzmunu silinsin?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> qovluq və onun məzmunu silinsin?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> element silinsin?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element silinsin?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 4e4aae5..0000000
--- a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Preuzimanja"</string>
- <string name="title_open" msgid="4353228937663917801">"Otvori sa"</string>
- <string name="title_save" msgid="2433679664882857999">"Sačuvaj u"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Novi direktorijum"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Prikaz mreže"</string>
- <string name="menu_list" msgid="7279285939892417279">"Prikaz liste"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortiraj prema"</string>
- <string name="menu_search" msgid="3816712084502856974">"Pretraži"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Podešavanja memorije"</string>
- <string name="menu_open" msgid="432922957274920903">"Otvori"</string>
- <string name="menu_save" msgid="2394743337684426338">"Sačuvaj"</string>
- <string name="menu_share" msgid="3075149983979628146">"Deli"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Izaberi sve"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiraj na..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Premesti u..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Iseci"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Nalepi"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Prikaži internu memoriju"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij internu memoriju"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Prikaži veličinu datoteke"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string>
- <string name="button_select" msgid="527196987259139214">"Izaberi"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
- <string name="button_move" msgid="2202666023104202232">"Premesti"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Odbaci"</string>
- <string name="button_retry" msgid="4392027584153752797">"Pokušaj ponovo"</string>
- <string name="sort_name" msgid="9183560467917256779">"Prema imenu"</string>
- <string name="sort_date" msgid="586080032956151448">"Prema datumu izmene"</string>
- <string name="sort_size" msgid="3350681319735474741">"Prema veličini"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Prikaži osnovne elemente"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Sakrij osnovne elemente"</string>
- <string name="save_error" msgid="6167009778003223664">"Čuvanje dokumenta nije uspelo"</string>
- <string name="create_error" msgid="3735649141335444215">"Direktorijum nije napravljen"</string>
- <string name="query_error" msgid="5999895349602476581">"Učitavanje sadržaja trenutno nije moguće"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nedavno"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Slobodno je <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Usluge skladištenja"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Prečice"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Uređaji"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Još aplikacija"</string>
- <string name="empty" msgid="7858882803708117596">"Nema stavki"</string>
- <string name="no_results" msgid="6622510343880730446">"Nema podudaranja u %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Otvaranje datoteke nije uspelo"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nije moguće izbrisati neke dokumente"</string>
- <string name="share_via" msgid="8966594246261344259">"Delite preko"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopiranje datoteka"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Datoteke se premeštaju"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Datoteke se brišu"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Još <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="few">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Premešta se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- <item quantity="few">Premeštaju se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">Premešta se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- <item quantity="few">Brišu se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Opozovi"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Priprema se kopiranje…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Priprema se premeštanje..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Priprema se brisanje…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Nismo uspeli da kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku</item>
- <item quantity="few">Nismo uspeli da kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke</item>
- <item quantity="other">Nismo uspeli da kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
- <item quantity="few">Premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
- <item quantity="other">Premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije uspelo</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
- <item quantity="few">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
- <item quantity="other">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije uspelo</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Dodirnite da biste prikazali detalje"</string>
- <string name="close" msgid="3043722427445528732">"Zatvori"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Sledeće datoteke nisu kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Sledeće datoteke nisu premeštene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Sledeće datoteke nisu izbrisane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove datoteke su konvertovane u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku u privremenu memoriju.</item>
- <item quantity="few">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke u privremenu memoriju.</item>
- <item quantity="other">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka u privremenu memoriju.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Izabrane datoteke ne mogu da se nalepe na ovoj lokaciji."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string>
- <string name="rename_error" msgid="4203041674883412606">"Preimenovanje dokumenta nije uspelo"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke datoteke su konvertovane"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Želite li da aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobrite pristup direktorijumu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> na memorijskom prostoru <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Želite da dozvolite da <xliff:g id="APPNAME"><b>^1</b></xliff:g> pristupa direktorijumu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Želite da li da dozvolite da aplikacija <xliff:g id="APPNAME"><b>^1</b></xliff:g> pristupa podacima, uključujući slike i video snimke, na lokaciji <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ne pitaj ponovo"</string>
- <string name="allow" msgid="7225948811296386551">"Dozvoli"</string>
- <string name="deny" msgid="2081879885755434506">"Odbij"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Izabrana je <xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
- <item quantity="few">Izabrane su <xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
- <item quantity="other">Izabrano je <xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Želite li da izbrišete „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Želite li da izbrišete direktorijum „<xliff:g id="NAME">%1$s</xliff:g>“ i njegov sadržaj?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku?</item>
- <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item>
- <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> direktorijum i njihov sadržaj?</item>
- <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> direktorijuma i njihov sadržaj?</item>
- <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> direktorijuma i njihov sadržaj?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> stavku?</item>
- <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> stavke?</item>
- <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> stavki?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-be-rBY/strings.xml b/packages/DocumentsUI/res/values-be-rBY/strings.xml
deleted file mode 100644
index 5b19b31..0000000
--- a/packages/DocumentsUI/res/values-be-rBY/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Дакументы"</string>
- <string name="downloads_label" msgid="959113951084633612">"Спампоўкі"</string>
- <string name="title_open" msgid="4353228937663917801">"Адкрыць з"</string>
- <string name="title_save" msgid="2433679664882857999">"Захаваць у"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Новая папка"</string>
- <string name="menu_grid" msgid="6878021334497835259">"У выглядзе табліцы"</string>
- <string name="menu_list" msgid="7279285939892417279">"У выглядзе спіса"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Сартаваць па:"</string>
- <string name="menu_search" msgid="3816712084502856974">"Шукаць"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Налады сховішча"</string>
- <string name="menu_open" msgid="432922957274920903">"Адкрыць"</string>
- <string name="menu_save" msgid="2394743337684426338">"Захаваць"</string>
- <string name="menu_share" msgid="3075149983979628146">"Абагуліць"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Выдаліць"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Выбраць усё"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Капіраваць у..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Перамясціць у..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Новае акно"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Выразаць"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Капіраваць"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Уставіць"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Паказаць унутр. сховішча"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Схаваць унутр. сховішча"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Паказаць памеры файлаў"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Схаваць памеры файлаў"</string>
- <string name="button_select" msgid="527196987259139214">"Выбраць"</string>
- <string name="button_copy" msgid="8706475544635021302">"Капіраваць"</string>
- <string name="button_move" msgid="2202666023104202232">"Перамясціць"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Адхіліць"</string>
- <string name="button_retry" msgid="4392027584153752797">"Паўтарыце спробу"</string>
- <string name="sort_name" msgid="9183560467917256779">"Па назве"</string>
- <string name="sort_date" msgid="586080032956151448">"Па даце змянення"</string>
- <string name="sort_size" msgid="3350681319735474741">"Па памеры"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Паказаць каранёвыя папкі"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Схаваць каранёвыя папкі"</string>
- <string name="save_error" msgid="6167009778003223664">"Не атрымалася захаваць дакумент"</string>
- <string name="create_error" msgid="3735649141335444215">"Не атрымалася стварыць папку"</string>
- <string name="query_error" msgid="5999895349602476581">"Зараз немагчыма загрузіць змесціва"</string>
- <string name="root_recent" msgid="4470053704320518133">"Нядаўнія"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> свабодна"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Службы захоўвання"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Ярлыкі"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Прылады"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Іншыя праграмы"</string>
- <string name="empty" msgid="7858882803708117596">"Няма элементаў"</string>
- <string name="no_results" msgid="6622510343880730446">"Няма супадзенняў у %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Немагчыма адкрыць файл"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Немагчыма выдаліць некаторыя дакументы"</string>
- <string name="share_via" msgid="8966594246261344259">"Абагуліць праз"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Капіраванне файлаў"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Перамяшчэнне файлаў"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Выдаленне файлаў"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Засталося <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- <item quantity="few">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="many">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="other">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- <item quantity="few">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="many">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="other">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- <item quantity="few">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="many">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="other">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Адрабіць"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Падрыхтоўка да капіравання..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Падрыхтоўка да перамяшчэння..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Падрыхтоўка да выдалення..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item>
- <item quantity="many">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item>
- <item quantity="other">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item>
- <item quantity="many">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item>
- <item quantity="other">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item>
- <item quantity="many">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item>
- <item quantity="other">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Дакраніцеся, каб прагледзець больш падрабязна"</string>
- <string name="close" msgid="3043722427445528732">"Закрыць"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Не былі скапіраваны наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Не былі перамешчаны наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Не былі выдалены наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Гэтыя файлы былі сканвертаваныя ў іншы фармат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
- <item quantity="few">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файлы.</item>
- <item quantity="many">У буфер абмену скапіравана <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
- <item quantity="other">У буфер абмену скапіравана <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Немагчыма ўставіць выбраныя файлы ў гэта месца."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Перайменаваць"</string>
- <string name="rename_error" msgid="4203041674883412606">"Не атрымалася перайменаваць дакумент"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Некаторыя файлы былі сканвертаваныя"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Даць праграме <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да дырэкторыі <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> у <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Даць праграме <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да каталога <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Даць <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да вашых даных, у тым ліку фатаграфій і відэа, на <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Больш не пытацца"</string>
- <string name="allow" msgid="7225948811296386551">"Дазволіць"</string>
- <string name="deny" msgid="2081879885755434506">"Адмовіць"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Выбраны <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="few">Выбраны <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="many">Выбрана <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Выбрана <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> элемент</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> элементы</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> элементаў</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> элемента</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Выдаліць \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Выдаліць папку \"<xliff:g id="NAME">%1$s</xliff:g>\" і яе змесціва?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
- <item quantity="few">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы?</item>
- <item quantity="many">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў?</item>
- <item quantity="other">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папку і іх змесціва?</item>
- <item quantity="few">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папкі і іх змесціва?</item>
- <item quantity="many">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папак і іх змесціва?</item>
- <item quantity="other">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папкі і іх змесціва?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элемент?</item>
- <item quantity="few">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элементы?</item>
- <item quantity="many">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элементаў?</item>
- <item quantity="other">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элемента?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml
deleted file mode 100644
index 967b6e7..0000000
--- a/packages/DocumentsUI/res/values-bg/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документи"</string>
- <string name="downloads_label" msgid="959113951084633612">"Изтегляния"</string>
- <string name="title_open" msgid="4353228937663917801">"Отваряне от"</string>
- <string name="title_save" msgid="2433679664882857999">"Запазване във:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Нова папка"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Изглед в мрежа"</string>
- <string name="menu_list" msgid="7279285939892417279">"Списъчен изглед"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Сортиране по"</string>
- <string name="menu_search" msgid="3816712084502856974">"Търсене"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Настройки на хранилището"</string>
- <string name="menu_open" msgid="432922957274920903">"Отваряне"</string>
- <string name="menu_save" msgid="2394743337684426338">"Запазване"</string>
- <string name="menu_share" msgid="3075149983979628146">"Споделяне"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Изтриване"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Избиране на всичко"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Копиране във…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Преместване във…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Нов прозорец"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Изрязване"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копиране"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Поставяне"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Вътр. хранилище: Показв."</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Вътр. хранилище: Скрив."</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Размер на файла: Показв."</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Размер на файла: Скрив."</string>
- <string name="button_select" msgid="527196987259139214">"Избиране"</string>
- <string name="button_copy" msgid="8706475544635021302">"Копиране"</string>
- <string name="button_move" msgid="2202666023104202232">"Преместване"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Отхвърляне"</string>
- <string name="button_retry" msgid="4392027584153752797">"Нов опит"</string>
- <string name="sort_name" msgid="9183560467917256779">"По име"</string>
- <string name="sort_date" msgid="586080032956151448">"По дата на промяната"</string>
- <string name="sort_size" msgid="3350681319735474741">"По размер"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Показване на основните елементи"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Скриване на основните елементи"</string>
- <string name="save_error" msgid="6167009778003223664">"Запазването на документа не бе успешно"</string>
- <string name="create_error" msgid="3735649141335444215">"Създаването на папката не бе успешно"</string>
- <string name="query_error" msgid="5999895349602476581">"Понастоящем съдържанието не може да се зареди"</string>
- <string name="root_recent" msgid="4470053704320518133">"Скорошни"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Свободно: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Услуги за съхранение"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Преки пътища"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Устройства"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Още приложения"</string>
- <string name="empty" msgid="7858882803708117596">"Няма елементи"</string>
- <string name="no_results" msgid="6622510343880730446">"В/ъв „%1$s“ няма съответствия"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Файлът не може да се отвори"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Някои документи не могат да бъдат изтрити"</string>
- <string name="share_via" msgid="8966594246261344259">"Споделяне чрез"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Файловете се копират"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Файловете се преместват"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Изтриване на файлове"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Оставащо време: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Копират се <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- <item quantity="one">Копира се <xliff:g id="COUNT_0">%1$d</xliff:g> файл.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файла се преместват.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл се премества.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Изтриват се <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- <item quantity="one">Изтрива се <xliff:g id="COUNT_0">%1$d</xliff:g> файл.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Отмяна"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Подготвя се за копиране…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Преместването се подготвя…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Подготвя се за изтриване..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файла не можаха да се копират</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл не можа да се копира</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файла не можаха да бъдат преместени</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл не можа да бъде преместен</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файла не можаха да бъдат изтрити</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл не можа да бъде изтрит</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Докоснете, за да видите подробности"</string>
- <string name="close" msgid="3043722427445528732">"Затваряне"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Следните файлове не бяха копирани: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Следните файлове не бяха преместени: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Следните файлове не бяха изтрити: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Следните файлове бяха преобразувани в друг формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Копирахте <xliff:g id="COUNT_1">%1$d</xliff:g> файла в буферната памет.</item>
- <item quantity="one">Копирахте <xliff:g id="COUNT_0">%1$d</xliff:g> файл в буферната памет.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Избраните файлове не могат да се поставят на това място."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Преименуване"</string>
- <string name="rename_error" msgid="4203041674883412606">"Преименуването на документа не бе успешно"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Някои файлове бяха преобразувани"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Да се предостави ли на <xliff:g id="APPNAME"><b>^1</b></xliff:g> достъп до директорията „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ в/ъв <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Да се предостави ли на <xliff:g id="APPNAME"><b>^1</b></xliff:g> достъп до директорията „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Да се предостави ли на <xliff:g id="APPNAME"><b>^1</b></xliff:g> достъп до данните ви в хранилището (<xliff:g id="STORAGE"><i>^2</i></xliff:g>), включително снимки и видеоклипове?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Без повторно питане"</string>
- <string name="allow" msgid="7225948811296386551">"Разрешаване"</string>
- <string name="deny" msgid="2081879885755434506">"Отказване"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">Избрахте <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Избрахте <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> елемента</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> елемент</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Искате ли да изтриете „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Искате ли да изтриете папката „<xliff:g id="NAME">%1$s</xliff:g>“ и съдържанието в нея?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Искате ли да изтриете <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
- <item quantity="one">Искате ли да изтриете <xliff:g id="COUNT_0">%1$d</xliff:g> файл?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Искате ли да изтриете <xliff:g id="COUNT_1">%1$d</xliff:g> папки и съдържанието в тях?</item>
- <item quantity="one">Искате ли да изтриете <xliff:g id="COUNT_0">%1$d</xliff:g> папка и съдържанието в нея?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Искате ли да изтриете <xliff:g id="COUNT_1">%1$d</xliff:g> елемента?</item>
- <item quantity="one">Искате ли да изтриете <xliff:g id="COUNT_0">%1$d</xliff:g> елемент?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 035ad42..0000000
--- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"দস্তাবেজগুলি"</string>
- <string name="downloads_label" msgid="959113951084633612">"ডাউনলোডগুলি"</string>
- <string name="title_open" msgid="4353228937663917801">"এখান থেকে খুলুন"</string>
- <string name="title_save" msgid="2433679664882857999">"এতে সংরক্ষণ করুন"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"নতুন ফোল্ডার"</string>
- <string name="menu_grid" msgid="6878021334497835259">"গ্রিড দৃশ্য"</string>
- <string name="menu_list" msgid="7279285939892417279">"তালিকা দৃশ্য"</string>
- <string name="menu_sort" msgid="7677740407158414452">"এই অনুসারে বাছুন"</string>
- <string name="menu_search" msgid="3816712084502856974">"অনুসন্ধান করুন"</string>
- <string name="menu_settings" msgid="8239065133341597825">"সঞ্চয়স্থান সেটিংস"</string>
- <string name="menu_open" msgid="432922957274920903">"খুলুন"</string>
- <string name="menu_save" msgid="2394743337684426338">"সংরক্ষণ করুন"</string>
- <string name="menu_share" msgid="3075149983979628146">"শেয়ার করুন"</string>
- <string name="menu_delete" msgid="8138799623850614177">"মুছুন"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"সবগুলি নির্বাচন করুন"</string>
- <string name="menu_copy" msgid="3612326052677229148">"এতে কপি করুন…"</string>
- <string name="menu_move" msgid="1828090633118079817">"এতে সরান..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"নতুন উইন্ডো"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"কাট করুন"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"প্রতিলিপি করুন"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"আটকান"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"অভ্যন্তরীণ সঞ্চয়স্থান দেখান"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"অভ্যন্তরীণ সঞ্চয়স্থান লুকান"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ফাইলের আকার দেখান"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ফাইলের আকার লুকান"</string>
- <string name="button_select" msgid="527196987259139214">"নির্বাচন করুন"</string>
- <string name="button_copy" msgid="8706475544635021302">"কপি করুন"</string>
- <string name="button_move" msgid="2202666023104202232">"সরান"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"খারিজ করুন"</string>
- <string name="button_retry" msgid="4392027584153752797">"আবার চেষ্টা করুন"</string>
- <string name="sort_name" msgid="9183560467917256779">"নামের দ্বারা"</string>
- <string name="sort_date" msgid="586080032956151448">"পরিবর্তনের তারিখ দ্বারা"</string>
- <string name="sort_size" msgid="3350681319735474741">"আকার অনুযায়ী"</string>
- <string name="drawer_open" msgid="4545466532430226949">"রুটগুলি দেখান"</string>
- <string name="drawer_close" msgid="7602734368552123318">"রুটগুলি লুকান"</string>
- <string name="save_error" msgid="6167009778003223664">"দস্তাবেজ সংরক্ষণ করতে ব্যর্থ হয়েছে"</string>
- <string name="create_error" msgid="3735649141335444215">"ফোল্ডার তৈরি করতে ব্যর্থ হয়েছে"</string>
- <string name="query_error" msgid="5999895349602476581">"এই মুহূর্তে সামগ্রী লোড করা যাবে না"</string>
- <string name="root_recent" msgid="4470053704320518133">"সাম্প্রতিক"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> খালি আছে"</string>
- <string name="root_type_service" msgid="2178854894416775409">"সঞ্চয়স্থান পরিষেবাগুলি"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"শর্টকাটগুলি"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ডিভাইসগুলি"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"আরো অ্যাপ্লিকেশান"</string>
- <string name="empty" msgid="7858882803708117596">"কোনো আইটেম নেই"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s এ কোনো মিল নেই"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ফাইল খোলা যাবে না"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"কিছু দস্তাবেজ মুছতে অসমর্থ"</string>
- <string name="share_via" msgid="8966594246261344259">"এর মাধ্যমে শেয়ার করুন"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ফাইলগুলি অনুলিপি করা হচ্ছে"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ফাইলগুলি সরানো হচ্ছে"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ফাইলগুলি মোছা হচ্ছে"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> বাকি"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল অনুলিপি করা হচ্ছে৷</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল অনুলিপি করা হচ্ছে৷</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল সরানো হচ্ছে৷</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল সরানো হচ্ছে৷</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মোছা হচ্ছে।</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মোছা হচ্ছে।</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"পূর্বাবস্থায় ফিরুন"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"অনুলিপি করার জন্য প্রস্তুত করা হচ্ছে..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"সরানোর জন্য প্রস্তুত হচ্ছে..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"মোছার জন্য প্রস্তুত করা হচ্ছে..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল প্রতিলিপি করা গেল না</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল প্রতিলিপি করা গেল না</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল সরানো গেল না</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল সরানো গেল না</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মোছা গেল না</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মোছা গেল না</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"বিশদ বিবরণ দেখতে আলতো চাপুন"</string>
- <string name="close" msgid="3043722427445528732">"বন্ধ করুন"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"এই ফাইলগুলির প্রতিলিপি করা হয়নি: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"এই ফাইলগুলি সরানো হয়নি: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"এই ফাইলগুলি মোছা হয়নি: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"এই ফাইলগুলি অন্য ফরম্যাটে রূপান্তর করা হয়েছে: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল ক্লিপবোর্ডে প্রতিলিপি করা হয়েছে।</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল ক্লিপবোর্ডে প্রতিলিপি করা হয়েছে।</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"এই স্থানে নির্বাচিত ফাইলগুলি আটকানো যাবে না।"</string>
- <string name="menu_rename" msgid="7678802479104285353">"পুনঃনামকরণ"</string>
- <string name="rename_error" msgid="4203041674883412606">"দস্তাবেজের পুনঃনামকরণ ব্যর্থ হয়েছে৷"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"কিছু ফাইল রূপান্তরিত হয়েছে"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> কে <xliff:g id="STORAGE"><i>^3</i></xliff:g> এ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> সংগ্রহ অ্যাক্সেস করার মঞ্জুরি দিতে চান?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> কে <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> সংগ্রহ অ্যাক্সেস করার অনুমতি দেবেন?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> এ থাকা ফটো ও ভিডিওগুলি সমেত <xliff:g id="APPNAME"><b>^1</b></xliff:g> কে আপনার ডেটা অ্যাক্সেস করার অনুমতি দেবেন?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"আর জিজ্ঞাসা করবেন না"</string>
- <string name="allow" msgid="7225948811296386551">"অনুমতি দিন"</string>
- <string name="deny" msgid="2081879885755434506">"আস্বীকার করুন"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি আইটেম</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি আইটেম</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" মুছবেন?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ফোল্ডার এবং এটির সামগ্রীগুলিকে মুছবেন?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মুছবেন?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মুছবেন?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফোল্ডার এবং সেগুলির সামগ্রী মুছবেন?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফোল্ডার এবং সেগুলির সামগ্রী মুছবেন?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি আইটেম মুছবেন?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি আইটেম মুছবেন?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
deleted file mode 100644
index ab6ff12..0000000
--- a/packages/DocumentsUI/res/values-bs-rBA/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Preuzimanja"</string>
- <string name="title_open" msgid="4353228937663917801">"Otvori iz"</string>
- <string name="title_save" msgid="2433679664882857999">"Sačuvaj u"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nova fascikla"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Prikaz u vidu mreže"</string>
- <string name="menu_list" msgid="7279285939892417279">"Prikaz u vidu liste"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortiraj po"</string>
- <string name="menu_search" msgid="3816712084502856974">"Traži"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Postavke pohrane"</string>
- <string name="menu_open" msgid="432922957274920903">"Otvori"</string>
- <string name="menu_save" msgid="2394743337684426338">"Sačuvaj"</string>
- <string name="menu_share" msgid="3075149983979628146">"Podijeli"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Odaberi sve"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiraj na..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Premjesti u..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Izreži"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Zalijepi"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži internu pohranu"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij internu pohranu"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži veličinu fajla"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu fajla"</string>
- <string name="button_select" msgid="527196987259139214">"Odaberi"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
- <string name="button_move" msgid="2202666023104202232">"Premjesti"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Odbaci"</string>
- <string name="button_retry" msgid="4392027584153752797">"Pokušajte ponovo"</string>
- <string name="sort_name" msgid="9183560467917256779">"Po nazivu"</string>
- <string name="sort_date" msgid="586080032956151448">"Po datumu izmjene"</string>
- <string name="sort_size" msgid="3350681319735474741">"Po veličini"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Pokaži korijeni"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Sakrij korijenske foldere"</string>
- <string name="save_error" msgid="6167009778003223664">"Pohranjivanje dokumenta nije uspjelo"</string>
- <string name="create_error" msgid="3735649141335444215">"Kreiranje mape nije uspjelo"</string>
- <string name="query_error" msgid="5999895349602476581">"Trenutno nije moguće učitati sadržaj"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nedavni"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> slobodno"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Usluge pohranjivanja"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Prečice"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Uređaji"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Više aplikacija"</string>
- <string name="empty" msgid="7858882803708117596">"Nema stavki"</string>
- <string name="no_results" msgid="6622510343880730446">"Nema rezultata u %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Nije moguće otvoriti fajl"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nije moguće obrisati neke dokumente"</string>
- <string name="share_via" msgid="8966594246261344259">"Podijeli preko"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopiraju se fajlovi"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Premještanje fajlova"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Brisanje fajlova"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Još <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kopira se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item>
- <item quantity="few">Kopiraju se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item>
- <item quantity="other">Kopira se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Premješta se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item>
- <item quantity="few">Premještaju se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item>
- <item quantity="other">Premješta se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item>
- <item quantity="few">Brišu se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item>
- <item quantity="other">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Vrati"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Priprema se kopiranje..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Priprema za premještanje..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Pripremanje za brisanje…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item>
- <item quantity="few">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla</item>
- <item quantity="other">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Nije moguće premjestiti <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item>
- <item quantity="few">Nije moguće premjestiti <xliff:g id="COUNT_1">%1$d</xliff:g> fajla</item>
- <item quantity="other">Nije moguće premjestiti <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Nije moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item>
- <item quantity="few">Nije moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla</item>
- <item quantity="other">Nije moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Dodirnite za prikaz detalja"</string>
- <string name="close" msgid="3043722427445528732">"Zatvori"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Nisu kopirani sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Nisu premješteni sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Nisu izbrisani sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove datoteke su pretvorene u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fajl je kopiran u međuspremnik.</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> fajla su kopirana u međuspremnik.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fajlova je kopirano u međuspremnik.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Odabrani fajlovi se ne mogu zalijepiti na ovu lokaciju."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string>
- <string name="rename_error" msgid="4203041674883412606">"Nije uspjelo preimenovanje dokumenta"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke od datoteka su pretvorene"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Omogućiti <xliff:g id="APPNAME"><b>^1</b></xliff:g> pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> sa <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Odobriti aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Želite li odobriti aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> pristup svojim podacima, uključujući fotografije i video zapise, na <xliff:g id="STORAGE"><i>^2</i></xliff:g> ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ne pitaj ponovo"</string>
- <string name="allow" msgid="7225948811296386551">"Dozvoli"</string>
- <string name="deny" msgid="2081879885755434506">"Odbijte"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka je odabrana</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke su odabrane</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki je odabrano</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Želite li izbrisati \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Želite li izbrisati folder \"<xliff:g id="NAME">%1$s</xliff:g>\" i njegov sadržaj?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl?</item>
- <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla?</item>
- <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> folder i njihov sadržaj?</item>
- <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> foldera i njihov sadržaj?</item>
- <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> foldera i njihov sadržaj?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavku?</item>
- <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavke?</item>
- <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavki?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml
deleted file mode 100644
index c1491e5..0000000
--- a/packages/DocumentsUI/res/values-ca/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documents"</string>
- <string name="downloads_label" msgid="959113951084633612">"Baixades"</string>
- <string name="title_open" msgid="4353228937663917801">"Obre des de"</string>
- <string name="title_save" msgid="2433679664882857999">"Desa a"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Carpeta nova"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Visualització de quadrícula"</string>
- <string name="menu_list" msgid="7279285939892417279">"Visualització de llista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordena per"</string>
- <string name="menu_search" msgid="3816712084502856974">"Cerca"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Config. d\'emmagatzematge"</string>
- <string name="menu_open" msgid="432922957274920903">"Obre"</string>
- <string name="menu_save" msgid="2394743337684426338">"Desa"</string>
- <string name="menu_share" msgid="3075149983979628146">"Comparteix"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Suprimeix"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Selecciona-ho tot"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copia a…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Mou a..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Finestra nova"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Retalla"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copia"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Enganxa"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostra emmagatz. intern"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Amaga emmagatz. intern"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostra la mida del fitxer"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Amaga la mida del fitxer"</string>
- <string name="button_select" msgid="527196987259139214">"Selecciona"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copia"</string>
- <string name="button_move" msgid="2202666023104202232">"Desplaça"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Ignora"</string>
- <string name="button_retry" msgid="4392027584153752797">"Torna-ho a provar"</string>
- <string name="sort_name" msgid="9183560467917256779">"Per nom"</string>
- <string name="sort_date" msgid="586080032956151448">"Per data de modificació"</string>
- <string name="sort_size" msgid="3350681319735474741">"Per mida"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostra les arrels"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Amaga les arrels"</string>
- <string name="save_error" msgid="6167009778003223664">"No s\'ha pogut desar el document."</string>
- <string name="create_error" msgid="3735649141335444215">"No s\'ha pogut crear la carpeta"</string>
- <string name="query_error" msgid="5999895349602476581">"En aquest moment no es pot carregar el contingut"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recent"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> lliures"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Serveis d\'emmagatzematge"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Dreceres"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositius"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Més aplicacions"</string>
- <string name="empty" msgid="7858882803708117596">"Sense elements"</string>
- <string name="no_results" msgid="6622510343880730446">"No hi ha cap coincidència a %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"No es pot obrir el fitxer"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"No es poden suprimir alguns documents."</string>
- <string name="share_via" msgid="8966594246261344259">"Comparteix mitjançant"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"S\'estan copiant fitxers"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"S\'estan movent fitxers"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Suprimint els fitxers"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Temps restant: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">S\'estan copiant <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers.</item>
- <item quantity="one">S\'està copiant <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">S\'estan movent <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers.</item>
- <item quantity="one">S\'està movent <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">S\'estan suprimint <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers.</item>
- <item quantity="one">S\'està suprimint <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Desfés"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"S\'està preparant una còpia…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"S\'està preparant per moure\'ls..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"S\'està preparant per suprimir…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">No s\'han pogut copiar <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers</item>
- <item quantity="one">No s\'ha pogut copiar <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">No s\'han pogut moure <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers</item>
- <item quantity="one">No s\'ha pogut moure <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">No s\'han pogut suprimir <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers</item>
- <item quantity="one">No s\'ha pogut suprimir <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Toca per veure\'n els detalls"</string>
- <string name="close" msgid="3043722427445528732">"Tanca"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Aquests fitxers no s\'han copiat: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Aquests fitxers no s\'han mogut: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Aquests fitxers no s\'han suprimit: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Aquests fitxers s\'han convertit a un altre format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">S\'han copiat <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers al porta-retalls.</item>
- <item quantity="one">S\'ha copiat <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer al porta-retalls.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"No s\'han pogut enganxar els fitxers seleccionats en aquesta ubicació."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Canvia el nom"</string>
- <string name="rename_error" msgid="4203041674883412606">"No s\'ha pogut canviar el nom del document"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"S\'han convertit alguns fitxers"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Vols que l\'aplicació <xliff:g id="APPNAME"><b>^1</b></xliff:g> tingui accés al directori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> de l\'emmagatzematge <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Vols que l\'aplicació <xliff:g id="APPNAME"><b>^1</b></xliff:g> tingui accés al directori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Vols que l\'aplicació <xliff:g id="APPNAME"><b>^1</b></xliff:g> tingui accés a les dades de <xliff:g id="STORAGE"><i>^2</i></xliff:g>, incloses les fotos i els vídeos?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"No m\'ho demanis més"</string>
- <string name="allow" msgid="7225948811296386551">"Permet"</string>
- <string name="deny" msgid="2081879885755434506">"Denega"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elements seleccionats</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element seleccionat</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elements</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vols suprimir el fitxer <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vols suprimir la carpeta <xliff:g id="NAME">%1$s</xliff:g> i el seu contingut?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Vols suprimir <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers?</item>
- <item quantity="one">Vols suprimir <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Vols suprimir <xliff:g id="COUNT_1">%1$d</xliff:g> carpetes i el seu contingut?</item>
- <item quantity="one">Vols suprimir <xliff:g id="COUNT_0">%1$d</xliff:g> carpeta i el seu contingut?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Vols suprimir <xliff:g id="COUNT_1">%1$d</xliff:g> elements?</item>
- <item quantity="one">Vols suprimir <xliff:g id="COUNT_0">%1$d</xliff:g> element?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml
deleted file mode 100644
index 2564447..0000000
--- a/packages/DocumentsUI/res/values-cs/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenty"</string>
- <string name="downloads_label" msgid="959113951084633612">"Stahování"</string>
- <string name="title_open" msgid="4353228937663917801">"Otevřít"</string>
- <string name="title_save" msgid="2433679664882857999">"Uložit do"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nová složka"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Mřížkové zobrazení"</string>
- <string name="menu_list" msgid="7279285939892417279">"Zobrazení seznamu"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Řadit podle"</string>
- <string name="menu_search" msgid="3816712084502856974">"Hledat"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Nastavení úložiště"</string>
- <string name="menu_open" msgid="432922957274920903">"Otevřít"</string>
- <string name="menu_save" msgid="2394743337684426338">"Uložit"</string>
- <string name="menu_share" msgid="3075149983979628146">"Sdílet"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Smazat"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Vybrat vše"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopírovat do…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Přesunout do…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nové okno"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Vyjmout"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopírovat"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Vložit"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Zobrazit inter. úložiště"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Skrýt interní úložiště"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Zobrazit velikost souboru"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Skrýt velikost souboru"</string>
- <string name="button_select" msgid="527196987259139214">"Vybrat"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopírovat"</string>
- <string name="button_move" msgid="2202666023104202232">"Přesunout"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Zavřít"</string>
- <string name="button_retry" msgid="4392027584153752797">"Zkusit znovu"</string>
- <string name="sort_name" msgid="9183560467917256779">"Podle názvu"</string>
- <string name="sort_date" msgid="586080032956151448">"Podle data úpravy"</string>
- <string name="sort_size" msgid="3350681319735474741">"Podle velikosti"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Zobrazit kořeny"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Skrýt kořeny"</string>
- <string name="save_error" msgid="6167009778003223664">"Uložení dokumentu se nezdařilo"</string>
- <string name="create_error" msgid="3735649141335444215">"Složku se nepodařilo vytvořit"</string>
- <string name="query_error" msgid="5999895349602476581">"Obsah nyní nelze načíst"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nedávné"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Volné místo: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Služby úložiště"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Klávesové zkratky"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Zařízení"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Další aplikace"</string>
- <string name="empty" msgid="7858882803708117596">"Žádné položky"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s – žádné shody"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Soubor nelze otevřít"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Některé dokumenty nelze smazat"</string>
- <string name="share_via" msgid="8966594246261344259">"Sdílet pomocí"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopírování souborů"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Přesouvání souborů"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Mazání souborů"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Zbývající čas: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="few">Kopírování <xliff:g id="COUNT_1">%1$d</xliff:g> souborů</item>
- <item quantity="many">Kopírování <xliff:g id="COUNT_1">%1$d</xliff:g> souboru</item>
- <item quantity="other">Kopírování <xliff:g id="COUNT_1">%1$d</xliff:g> souborů</item>
- <item quantity="one">Kopírování <xliff:g id="COUNT_0">%1$d</xliff:g> souboru</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="few">Přesouvají se <xliff:g id="COUNT_1">%1$d</xliff:g> soubory.</item>
- <item quantity="many">Přesouvá se <xliff:g id="COUNT_1">%1$d</xliff:g> souboru.</item>
- <item quantity="other">Přesouvá se <xliff:g id="COUNT_1">%1$d</xliff:g> souborů.</item>
- <item quantity="one">Přesouvá se <xliff:g id="COUNT_0">%1$d</xliff:g> soubor.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="few">Mazání <xliff:g id="COUNT_1">%1$d</xliff:g> souborů.</item>
- <item quantity="many">Mazání <xliff:g id="COUNT_1">%1$d</xliff:g> souboru.</item>
- <item quantity="other">Mazání <xliff:g id="COUNT_1">%1$d</xliff:g> souborů.</item>
- <item quantity="one">Mazání <xliff:g id="COUNT_0">%1$d</xliff:g> souboru.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Vrátit zpět"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Příprava na kopírování…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Příprava na přesunutí…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Příprava na mazání…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> soubory se zkopírovat nepodařilo</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> souboru se zkopírovat nepodařilo</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> souborů se zkopírovat nepodařilo</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> soubor se zkopírovat nepodařilo</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> soubory nelze přesunout</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> souboru nelze přesunout</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> souborů nelze přesunout</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> soubor nelze přesunout</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> soubory se smazat nepodařilo</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> souboru se smazat nepodařilo</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> souborů se smazat nepodařilo</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> soubor se smazat nepodařilo</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Klepnutím zobrazíte podrobnosti"</string>
- <string name="close" msgid="3043722427445528732">"Zavřít"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Následující soubory nebyly zkopírovány: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Následující soubory nebyly přesunuty: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Následující soubory nebyly smazány: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Soubory byly převedeny do jiného formátu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> soubory byly zkopírovány do schránky.</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> souboru bylo zkopírováno do schránky.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> souborů bylo zkopírováno do schránky.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> soubor byl zkopírován do schránky.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Vybrané soubory nelze vložit do tohoto umístění."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Přejmenovat"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokument se nepodařilo přejmenovat."</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Některé soubory byly převedeny"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Chcete aplikaci <xliff:g id="APPNAME"><b>^1</b></xliff:g> udělit přístup k adresáři <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> v úložišti <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Chcete aplikaci <xliff:g id="APPNAME"><b>^1</b></xliff:g> udělit přístup k adresáři <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Chcete aplikaci <xliff:g id="APPNAME"><b>^1</b></xliff:g> udělit přístup ke svým datům v úložišti <xliff:g id="STORAGE"><i>^2</i></xliff:g>, včetně fotek a videí?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Příště se neptat"</string>
- <string name="allow" msgid="7225948811296386551">"Povolit"</string>
- <string name="deny" msgid="2081879885755434506">"Odepřít"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="few">Vybrány <xliff:g id="COUNT_1">%1$d</xliff:g> položky</item>
- <item quantity="many">Vybráno <xliff:g id="COUNT_1">%1$d</xliff:g> položky</item>
- <item quantity="other">Vybráno <xliff:g id="COUNT_1">%1$d</xliff:g> položek</item>
- <item quantity="one">Vybrána <xliff:g id="COUNT_0">%1$d</xliff:g> položka</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> položky</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> položky</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> položek</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> položka</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Smazat soubor <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Smazat složku <xliff:g id="NAME">%1$s</xliff:g> a její obsah?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="few">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> soubory?</item>
- <item quantity="many">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> souboru?</item>
- <item quantity="other">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> souborů?</item>
- <item quantity="one">Smazat <xliff:g id="COUNT_0">%1$d</xliff:g> soubor?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="few">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> složky a jejich obsah?</item>
- <item quantity="many">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> složky a jejich obsah?</item>
- <item quantity="other">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> složek a jejich obsah?</item>
- <item quantity="one">Smazat <xliff:g id="COUNT_0">%1$d</xliff:g> složku a její obsah?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="few">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> položky?</item>
- <item quantity="many">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> položky?</item>
- <item quantity="other">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> položek?</item>
- <item quantity="one">Smazat <xliff:g id="COUNT_0">%1$d</xliff:g> položku?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml
deleted file mode 100644
index 7c77786..0000000
--- a/packages/DocumentsUI/res/values-da/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenter"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Åbn fra"</string>
- <string name="title_save" msgid="2433679664882857999">"Gem i"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Ny mappe"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Gittervisning"</string>
- <string name="menu_list" msgid="7279285939892417279">"Listevisning"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortér efter"</string>
- <string name="menu_search" msgid="3816712084502856974">"Søg"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Indstillinger for lager"</string>
- <string name="menu_open" msgid="432922957274920903">"Åbn"</string>
- <string name="menu_save" msgid="2394743337684426338">"Gem"</string>
- <string name="menu_share" msgid="3075149983979628146">"Del"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Slet"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Markér alle"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiér til…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Flyt til…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nyt vindue"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Klip"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiér"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Indsæt"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Vis intern lagerplads"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Skjul intern lagerplads"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Vis filstørrelse"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelse"</string>
- <string name="button_select" msgid="527196987259139214">"Vælg"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiér"</string>
- <string name="button_move" msgid="2202666023104202232">"Flyt"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Luk"</string>
- <string name="button_retry" msgid="4392027584153752797">"Prøv igen"</string>
- <string name="sort_name" msgid="9183560467917256779">"Efter navn"</string>
- <string name="sort_date" msgid="586080032956151448">"Efter ændringsdato"</string>
- <string name="sort_size" msgid="3350681319735474741">"Efter størrelse"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Vis rødder"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Skjul rødder"</string>
- <string name="save_error" msgid="6167009778003223664">"Dokumentet kunne ikke gemmes"</string>
- <string name="create_error" msgid="3735649141335444215">"Mappen kunne ikke oprettes"</string>
- <string name="query_error" msgid="5999895349602476581">"Der kan ikke indlæses indhold i øjeblikket"</string>
- <string name="root_recent" msgid="4470053704320518133">"Seneste"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ledig plads"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Lagringstjenester"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Genveje"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Enheder"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Flere apps"</string>
- <string name="empty" msgid="7858882803708117596">"Ingen elementer"</string>
- <string name="no_results" msgid="6622510343880730446">"Ingen kampe i %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Filen kan ikke åbnes"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nogle dokumenter kan ikke slettes"</string>
- <string name="share_via" msgid="8966594246261344259">"Del via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopierer filer"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Flytter filer"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Filerne slettes"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> tilbage"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kopierer <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="other">Kopierer <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Flytter <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="other">Flytter <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> filer slettes.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer slettes.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Fortryd"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Forbereder kopiering…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Forbereder flytning…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Forbereder til sletning…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fil kunne ikke kopieres</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer kunne ikke kopieres</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fil kunne ikke flyttes</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer kunne ikke flyttes</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fil kunne ikke slettes</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer kunne ikke slettes</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tryk for at se oplysninger"</string>
- <string name="close" msgid="3043722427445528732">"Luk"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Disse filer blev ikke kopieret: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Disse filer blev ikke flyttet: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Disse filer blev ikke slettet: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Disse filer er konverteret til et andet format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> filer blev kopieret til udklipsholder.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer blev kopieret til udklipsholder.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"De valgte filer kan ikke indsættes på denne placering."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Omdøb"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokumentet kunne ikke omdøbes"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Nogle filer er konverteret"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Vil du give <xliff:g id="APPNAME"><b>^1</b></xliff:g> adgang til mappen <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> på <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Vil du give <xliff:g id="APPNAME"><b>^1</b></xliff:g> adgang til indekset <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Vil du give <xliff:g id="APPNAME"><b>^1</b></xliff:g> adgang til dine data, herunder billeder og videoer på <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Spørg ikke igen"</string>
- <string name="allow" msgid="7225948811296386551">"Tillad"</string>
- <string name="deny" msgid="2081879885755434506">"Afvis"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Der er valgt <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Der er valgt <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> element</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementer</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vil du slette \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vil du slette mappen \"<xliff:g id="NAME">%1$s</xliff:g>\" og dens indhold?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> fil?</item>
- <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> mappe og dens indhold?</item>
- <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> mapper og deres indhold?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> element?</item>
- <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> elementer?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml
deleted file mode 100644
index 6d4307b..0000000
--- a/packages/DocumentsUI/res/values-de/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumente"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Öffnen von"</string>
- <string name="title_save" msgid="2433679664882857999">"Speichern unter"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Neuer Ordner"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Rasteransicht"</string>
- <string name="menu_list" msgid="7279285939892417279">"Listenansicht"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortieren nach"</string>
- <string name="menu_search" msgid="3816712084502856974">"Suchen"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Speichereinstellungen"</string>
- <string name="menu_open" msgid="432922957274920903">"Öffnen"</string>
- <string name="menu_save" msgid="2394743337684426338">"Speichern"</string>
- <string name="menu_share" msgid="3075149983979628146">"Teilen"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Löschen"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Alle auswählen"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopieren nach..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Verschieben nach…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Neues Fenster"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Ausschneiden"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopieren"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Einfügen"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Int. Speicher anzeigen"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Int. Speicher ausblenden"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Dateigröße anzeigen"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Dateigröße ausblenden"</string>
- <string name="button_select" msgid="527196987259139214">"Auswählen"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopieren"</string>
- <string name="button_move" msgid="2202666023104202232">"Verschieben"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Schließen"</string>
- <string name="button_retry" msgid="4392027584153752797">"Erneut versuchen"</string>
- <string name="sort_name" msgid="9183560467917256779">"Nach Name"</string>
- <string name="sort_date" msgid="586080032956151448">"Nach Änderungsdatum"</string>
- <string name="sort_size" msgid="3350681319735474741">"Nach Größe"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Root-Verzeichnis anzeigen"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Root-Verzeichnis ausblenden"</string>
- <string name="save_error" msgid="6167009778003223664">"Dokument konnte nicht gespeichert werden."</string>
- <string name="create_error" msgid="3735649141335444215">"Ordner konnte nicht erstellt werden."</string>
- <string name="query_error" msgid="5999895349602476581">"Inhalte können momentan nicht geladen werden"</string>
- <string name="root_recent" msgid="4470053704320518133">"Letzte"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> verfügbar"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Speicherdienste"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Verknüpfungen"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Geräte"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Weitere Apps"</string>
- <string name="empty" msgid="7858882803708117596">"Keine Dokumente"</string>
- <string name="no_results" msgid="6622510343880730446">"Keine Übereinstimmungen in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Datei kann nicht geöffnet werden"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Einige Dokumente konnten nicht gelöscht werden."</string>
- <string name="share_via" msgid="8966594246261344259">"Teilen über"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Dateien werden kopiert"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Dateien werden verschoben"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Dateien werden gelöscht"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Noch <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien werden kopiert.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wird kopiert.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien werden verschoben.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wird verschoben.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien werden gelöscht.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wird gelöscht.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Rückgängig machen"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopieren wird vorbereitet…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Verschieben wird vorbereitet…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Löschvorgang wird vorbereitet…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien konnten nicht kopiert werden</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei konnte nicht kopiert werden</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien konnten nicht verschoben werden</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei konnte nicht verschoben werden</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien konnten nicht gelöscht werden</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei konnte nicht gelöscht werden</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Zum Ansehen der Details tippen"</string>
- <string name="close" msgid="3043722427445528732">"Schließen"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Diese Dateien wurden nicht kopiert: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Diese Dateien wurden nicht verschoben: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Diese Dateien wurden nicht gelöscht: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Folgende Dateien wurden in ein anderes Format konvertiert: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien wurden in die Zwischenablage kopiert.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wurde in die Zwischenablage kopiert.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Die ausgewählten Dateien können an diesem Ort nicht eingefügt werden."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Umbenennen"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokument konnte nicht umbenannt werden"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Einige Dateien wurden konvertiert"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> auf <xliff:g id="STORAGE"><i>^3</i></xliff:g> geben?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Möchtest du <xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> geben?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Möchtest du <xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf deine Daten auf <xliff:g id="STORAGE"><i>^2</i></xliff:g> geben, einschließlich Fotos und Videos?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Nicht mehr fragen"</string>
- <string name="allow" msgid="7225948811296386551">"Zulassen"</string>
- <string name="deny" msgid="2081879885755434506">"Ablehnen"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ausgewählt</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ausgewählt</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Einträge</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Eintrag</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" löschen?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ordner \"<xliff:g id="NAME">%1$s</xliff:g>\" und dessen Inhalte löschen?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Möchtest du <xliff:g id="COUNT_1">%1$d</xliff:g> Dateien löschen?</item>
- <item quantity="one">Möchtest du <xliff:g id="COUNT_0">%1$d</xliff:g> Datei löschen?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Möchtest du <xliff:g id="COUNT_1">%1$d</xliff:g> Ordner und deren Inhalte löschen?</item>
- <item quantity="one">Möchtest du <xliff:g id="COUNT_0">%1$d</xliff:g> Ordner und dessen Inhalte löschen?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Möchtest du <xliff:g id="COUNT_1">%1$d</xliff:g> Elemente löschen?</item>
- <item quantity="one">Möchtest du <xliff:g id="COUNT_0">%1$d</xliff:g> Element löschen?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-el/strings.xml b/packages/DocumentsUI/res/values-el/strings.xml
deleted file mode 100644
index 0e9c9bb..0000000
--- a/packages/DocumentsUI/res/values-el/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Έγγραφα"</string>
- <string name="downloads_label" msgid="959113951084633612">"Λήψεις"</string>
- <string name="title_open" msgid="4353228937663917801">"Άνοιγμα από"</string>
- <string name="title_save" msgid="2433679664882857999">"Αποθήκευση σε"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Νέος φάκελος"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Προβολή πλέγματος"</string>
- <string name="menu_list" msgid="7279285939892417279">"Προβολή λίστας"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ταξινόμηση κατά"</string>
- <string name="menu_search" msgid="3816712084502856974">"Αναζήτηση"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Ρυθμίσεις αποθ/κού χώρου"</string>
- <string name="menu_open" msgid="432922957274920903">"Άνοιγμα"</string>
- <string name="menu_save" msgid="2394743337684426338">"Αποθήκευση"</string>
- <string name="menu_share" msgid="3075149983979628146">"Κοινή χρήση"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Διαγραφή"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Επιλογή όλων"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Αντιγραφή σε…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Μετακίνηση σε..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Νέο παράθυρο"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Αποκοπή"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Αντιγραφή"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Επικόλληση"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Εμφ.εσωτ.χώρου αποθήκ."</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Απόκρ.εσωτ.χώρου αποθήκ."</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Εμφ. μεγέθους αρχείου"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Απόκρ. μεγέθους αρχείου"</string>
- <string name="button_select" msgid="527196987259139214">"Επιλογή"</string>
- <string name="button_copy" msgid="8706475544635021302">"Αντιγραφή"</string>
- <string name="button_move" msgid="2202666023104202232">"Μετακίνηση"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Παράβλεψη"</string>
- <string name="button_retry" msgid="4392027584153752797">"Δοκιμάστε ξανά"</string>
- <string name="sort_name" msgid="9183560467917256779">"Κατά όνομα"</string>
- <string name="sort_date" msgid="586080032956151448">"Κατά ημερομηνία τροποποίησης"</string>
- <string name="sort_size" msgid="3350681319735474741">"Κατά μέγεθος"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Εμφάνιση ρίζας"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Απόκρυψη ρίζας"</string>
- <string name="save_error" msgid="6167009778003223664">"Αποτυχία αποθήκευσης του εγγράφου"</string>
- <string name="create_error" msgid="3735649141335444215">"Αποτυχία δημιουργίας φακέλου"</string>
- <string name="query_error" msgid="5999895349602476581">"Δεν είναι δυνατή η φόρτωση περιεχομένου τώρα"</string>
- <string name="root_recent" msgid="4470053704320518133">"Πρόσφατα"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ελεύθερα"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Υπηρεσίες αποθήκευσης"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Συντομεύσεις"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Συσκευές"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Περισσότερες εφαρμογές"</string>
- <string name="empty" msgid="7858882803708117596">"Δεν υπάρχουν στοιχεία"</string>
- <string name="no_results" msgid="6622510343880730446">"Χωρίς αντιστοιχίσεις στο %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Δεν είναι δυνατό το άνοιγμα του αρχείου"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Δεν είναι δυνατή η διαγραφή ορισμένων εγγράφων"</string>
- <string name="share_via" msgid="8966594246261344259">"Κοινοποίηση μέσω"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Αντιγραφή αρχείων"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Μετακίνηση αρχείων"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Διαγραφή αρχείων"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Απομένουν <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Αντιγραφή <xliff:g id="COUNT_1">%1$d</xliff:g> αρχείων.</item>
- <item quantity="one">Αντιγραφή <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Μετακίνηση <xliff:g id="COUNT_1">%1$d</xliff:g> αρχείων.</item>
- <item quantity="one">Μετακίνηση <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Διαγραφή <xliff:g id="COUNT_1">%1$d</xliff:g> αρχείων.</item>
- <item quantity="one">Διαγραφή <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Αναίρεση"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Προετοιμασία για αντιγραφή…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Προετοιμασία για μετακίνηση…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Προετοιμασία για διαγραφή…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Δεν ήταν δυνατή η αντιγραφή <xliff:g id="COUNT_1">%1$d</xliff:g> αρχείων</item>
- <item quantity="one">Δεν ήταν δυνατή η αντιγραφή <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Δεν ήταν δυνατή η μετακίνηση <xliff:g id="COUNT_1">%1$d</xliff:g> αρχείων</item>
- <item quantity="one">Δεν ήταν δυνατή η μετακίνηση <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Δεν ήταν δυνατή η διαγραφή <xliff:g id="COUNT_1">%1$d</xliff:g> αρχείων</item>
- <item quantity="one">Δεν ήταν δυνατή η διαγραφή <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείου</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Πατήστε για προβολή λεπτομερειών"</string>
- <string name="close" msgid="3043722427445528732">"Κλείσιμο"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Αυτά τα αρχεία δεν αντιγράφηκαν: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Αυτά τα αρχεία δεν μετακινήθηκαν: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Αυτά τα αρχεία δεν διαγράφηκαν: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Αυτά τα αρχεία μετατράπηκαν σε άλλη μορφή: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> αρχεία αντιγράφηκαν στο πρόχειρο.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> αρχείο αντιγράφηκε στο πρόχειρο.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Δεν είναι δυνατή η επικόλληση των επιλεγμένων αρχείων σε αυτήν την τοποθεσία."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Μετονομασία"</string>
- <string name="rename_error" msgid="4203041674883412606">"Αποτυχία μετονομασίας εγγράφου"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Ορισμένα αρχεία μετατράπηκαν"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Να εκχωρηθεί στην εφαρμογή <xliff:g id="APPNAME"><b>^1</b></xliff:g> πρόσβαση στον κατάλογο <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> στον αποθηκευτικό χώρο <xliff:g id="STORAGE"><i>^3</i></xliff:g>;"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Εκχώρηση πρόσβασης στην εφαρμογή <xliff:g id="APPNAME"><b>^1</b></xliff:g> στον κατάλογο <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>;"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Θέλετε να εκχωρήσετε πρόσβαση στα δεδομένα σας στην εφαρμογή <xliff:g id="APPNAME"><b>^1</b></xliff:g>, συμπεριλαμβανομένων των φωτογραφιών και των βίντεό σας, στον αποθηκευτικό χώρο <xliff:g id="STORAGE"><i>^2</i></xliff:g>;"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Να μην ερωτηθώ ξανά"</string>
- <string name="allow" msgid="7225948811296386551">"Να επιτρέπεται"</string>
- <string name="deny" msgid="2081879885755434506">"Άρνηση"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> επιλεγμένα</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> επιλεγμένο</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> στοιχεία</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> στοιχείο</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Να διαγραφεί το αρχείο \"<xliff:g id="NAME">%1$s</xliff:g>\";"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Να διαγραφεί ο φάκελος \"<xliff:g id="NAME">%1$s</xliff:g>\" και τα περιεχόμενά του;"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Να διαγραφούν <xliff:g id="COUNT_1">%1$d</xliff:g> αρχεία;</item>
- <item quantity="one">Να διαγραφεί <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείο;</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Να διαγραφούν <xliff:g id="COUNT_1">%1$d</xliff:g> φάκελοι και τα περιεχόμενά τους;</item>
- <item quantity="one">Να διαγραφεί <xliff:g id="COUNT_0">%1$d</xliff:g> φάκελος και τα περιεχόμενά του;</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Να διαγραφούν <xliff:g id="COUNT_1">%1$d</xliff:g> στοιχεία;</item>
- <item quantity="one">Να διαγραφεί <xliff:g id="COUNT_0">%1$d</xliff:g> στοιχείο;</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-en-rAU/strings.xml b/packages/DocumentsUI/res/values-en-rAU/strings.xml
deleted file mode 100644
index c1238be..0000000
--- a/packages/DocumentsUI/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documents"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Open from"</string>
- <string name="title_save" msgid="2433679664882857999">"Save to"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"New folder"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Grid view"</string>
- <string name="menu_list" msgid="7279285939892417279">"List view"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sort by"</string>
- <string name="menu_search" msgid="3816712084502856974">"Search"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Storage settings"</string>
- <string name="menu_open" msgid="432922957274920903">"Open"</string>
- <string name="menu_save" msgid="2394743337684426338">"Save"</string>
- <string name="menu_share" msgid="3075149983979628146">"Share"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Delete"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Select all"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copy to…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Move to…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"New window"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cut"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copy"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Paste"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Show internal storage"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Hide internal storage"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
- <string name="button_select" msgid="527196987259139214">"select"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copy"</string>
- <string name="button_move" msgid="2202666023104202232">"Move"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Dismiss"</string>
- <string name="button_retry" msgid="4392027584153752797">"Try again"</string>
- <string name="sort_name" msgid="9183560467917256779">"By name"</string>
- <string name="sort_date" msgid="586080032956151448">"By date modified"</string>
- <string name="sort_size" msgid="3350681319735474741">"By size"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Show roots"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Hide roots"</string>
- <string name="save_error" msgid="6167009778003223664">"Failed to save document"</string>
- <string name="create_error" msgid="3735649141335444215">"Failed to create folder"</string>
- <string name="query_error" msgid="5999895349602476581">"Can’t load content at the moment"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recent"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> free"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Storage services"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Shortcuts"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Devices"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"More apps"</string>
- <string name="empty" msgid="7858882803708117596">"No items"</string>
- <string name="no_results" msgid="6622510343880730446">"No matches in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Can’t open file"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Unable to delete some documents"</string>
- <string name="share_via" msgid="8966594246261344259">"Share via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copying files"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Moving files"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Deleting files"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> left"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copying <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Copying <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Moving <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Moving <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Deleting <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Deleting <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Undo"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparing for copy…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparing for move…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparing to delete…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t copy <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Couldn’t move <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t move <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Couldn’t delete <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t delete <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tap to view details"</string>
- <string name="close" msgid="3043722427445528732">"Close"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"These files weren’t copied: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"These files weren’t moved: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"These files weren’t deleted: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"These files were converted to another format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> files to clipboard.</item>
- <item quantity="one">Copied <xliff:g id="COUNT_0">%1$d</xliff:g> file to clipboard.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Cannot paste the selected files in this location."</string>
- <string name="menu_rename" msgid="7678802479104285353">"rename"</string>
- <string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory on <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to your data, including photos and videos, on <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Don\'t ask again"</string>
- <string name="allow" msgid="7225948811296386551">"Allow"</string>
- <string name="deny" msgid="2081879885755434506">"Deny"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Delete \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Delete folder \"<xliff:g id="NAME">%1$s</xliff:g>\" and its contents?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> folders and their contents?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> folder and its contents?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> items?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-en-rGB/strings.xml b/packages/DocumentsUI/res/values-en-rGB/strings.xml
deleted file mode 100644
index c1238be..0000000
--- a/packages/DocumentsUI/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documents"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Open from"</string>
- <string name="title_save" msgid="2433679664882857999">"Save to"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"New folder"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Grid view"</string>
- <string name="menu_list" msgid="7279285939892417279">"List view"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sort by"</string>
- <string name="menu_search" msgid="3816712084502856974">"Search"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Storage settings"</string>
- <string name="menu_open" msgid="432922957274920903">"Open"</string>
- <string name="menu_save" msgid="2394743337684426338">"Save"</string>
- <string name="menu_share" msgid="3075149983979628146">"Share"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Delete"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Select all"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copy to…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Move to…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"New window"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cut"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copy"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Paste"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Show internal storage"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Hide internal storage"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
- <string name="button_select" msgid="527196987259139214">"select"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copy"</string>
- <string name="button_move" msgid="2202666023104202232">"Move"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Dismiss"</string>
- <string name="button_retry" msgid="4392027584153752797">"Try again"</string>
- <string name="sort_name" msgid="9183560467917256779">"By name"</string>
- <string name="sort_date" msgid="586080032956151448">"By date modified"</string>
- <string name="sort_size" msgid="3350681319735474741">"By size"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Show roots"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Hide roots"</string>
- <string name="save_error" msgid="6167009778003223664">"Failed to save document"</string>
- <string name="create_error" msgid="3735649141335444215">"Failed to create folder"</string>
- <string name="query_error" msgid="5999895349602476581">"Can’t load content at the moment"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recent"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> free"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Storage services"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Shortcuts"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Devices"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"More apps"</string>
- <string name="empty" msgid="7858882803708117596">"No items"</string>
- <string name="no_results" msgid="6622510343880730446">"No matches in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Can’t open file"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Unable to delete some documents"</string>
- <string name="share_via" msgid="8966594246261344259">"Share via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copying files"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Moving files"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Deleting files"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> left"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copying <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Copying <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Moving <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Moving <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Deleting <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Deleting <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Undo"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparing for copy…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparing for move…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparing to delete…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t copy <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Couldn’t move <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t move <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Couldn’t delete <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t delete <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tap to view details"</string>
- <string name="close" msgid="3043722427445528732">"Close"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"These files weren’t copied: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"These files weren’t moved: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"These files weren’t deleted: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"These files were converted to another format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> files to clipboard.</item>
- <item quantity="one">Copied <xliff:g id="COUNT_0">%1$d</xliff:g> file to clipboard.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Cannot paste the selected files in this location."</string>
- <string name="menu_rename" msgid="7678802479104285353">"rename"</string>
- <string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory on <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to your data, including photos and videos, on <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Don\'t ask again"</string>
- <string name="allow" msgid="7225948811296386551">"Allow"</string>
- <string name="deny" msgid="2081879885755434506">"Deny"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Delete \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Delete folder \"<xliff:g id="NAME">%1$s</xliff:g>\" and its contents?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> folders and their contents?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> folder and its contents?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> items?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-en-rIN/strings.xml b/packages/DocumentsUI/res/values-en-rIN/strings.xml
deleted file mode 100644
index c1238be..0000000
--- a/packages/DocumentsUI/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documents"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Open from"</string>
- <string name="title_save" msgid="2433679664882857999">"Save to"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"New folder"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Grid view"</string>
- <string name="menu_list" msgid="7279285939892417279">"List view"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sort by"</string>
- <string name="menu_search" msgid="3816712084502856974">"Search"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Storage settings"</string>
- <string name="menu_open" msgid="432922957274920903">"Open"</string>
- <string name="menu_save" msgid="2394743337684426338">"Save"</string>
- <string name="menu_share" msgid="3075149983979628146">"Share"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Delete"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Select all"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copy to…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Move to…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"New window"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cut"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copy"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Paste"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Show internal storage"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Hide internal storage"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
- <string name="button_select" msgid="527196987259139214">"select"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copy"</string>
- <string name="button_move" msgid="2202666023104202232">"Move"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Dismiss"</string>
- <string name="button_retry" msgid="4392027584153752797">"Try again"</string>
- <string name="sort_name" msgid="9183560467917256779">"By name"</string>
- <string name="sort_date" msgid="586080032956151448">"By date modified"</string>
- <string name="sort_size" msgid="3350681319735474741">"By size"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Show roots"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Hide roots"</string>
- <string name="save_error" msgid="6167009778003223664">"Failed to save document"</string>
- <string name="create_error" msgid="3735649141335444215">"Failed to create folder"</string>
- <string name="query_error" msgid="5999895349602476581">"Can’t load content at the moment"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recent"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> free"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Storage services"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Shortcuts"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Devices"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"More apps"</string>
- <string name="empty" msgid="7858882803708117596">"No items"</string>
- <string name="no_results" msgid="6622510343880730446">"No matches in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Can’t open file"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Unable to delete some documents"</string>
- <string name="share_via" msgid="8966594246261344259">"Share via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copying files"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Moving files"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Deleting files"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> left"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copying <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Copying <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Moving <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Moving <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Deleting <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>
- <item quantity="one">Deleting <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Undo"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparing for copy…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparing for move…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparing to delete…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t copy <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Couldn’t move <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t move <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Couldn’t delete <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>
- <item quantity="one">Couldn’t delete <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tap to view details"</string>
- <string name="close" msgid="3043722427445528732">"Close"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"These files weren’t copied: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"These files weren’t moved: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"These files weren’t deleted: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"These files were converted to another format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> files to clipboard.</item>
- <item quantity="one">Copied <xliff:g id="COUNT_0">%1$d</xliff:g> file to clipboard.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Cannot paste the selected files in this location."</string>
- <string name="menu_rename" msgid="7678802479104285353">"rename"</string>
- <string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory on <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to your data, including photos and videos, on <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Don\'t ask again"</string>
- <string name="allow" msgid="7225948811296386551">"Allow"</string>
- <string name="deny" msgid="2081879885755434506">"Deny"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Delete \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Delete folder \"<xliff:g id="NAME">%1$s</xliff:g>\" and its contents?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> folders and their contents?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> folder and its contents?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> items?</item>
- <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml
deleted file mode 100644
index 5a1c10c..0000000
--- a/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documentos"</string>
- <string name="downloads_label" msgid="959113951084633612">"Descargas"</string>
- <string name="title_open" msgid="4353228937663917801">"Abrir desde"</string>
- <string name="title_save" msgid="2433679664882857999">"Guardar en"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Carpeta nueva"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Vista de cuadrícula"</string>
- <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
- <string name="menu_search" msgid="3816712084502856974">"Buscar"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Configuración"</string>
- <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
- <string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Seleccionar todo"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiar a…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Mover a…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Ventana nueva"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cortar"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Pegar"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar almacen. interno"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño archivos"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño archivos"</string>
- <string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
- <string name="button_move" msgid="2202666023104202232">"Mover"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Descartar"</string>
- <string name="button_retry" msgid="4392027584153752797">"Reintentar"</string>
- <string name="sort_name" msgid="9183560467917256779">"Por nombre"</string>
- <string name="sort_date" msgid="586080032956151448">"Por fecha de modificación"</string>
- <string name="sort_size" msgid="3350681319735474741">"Por tamaño"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostrar raíces"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ocultar raíces"</string>
- <string name="save_error" msgid="6167009778003223664">"Error al guardar el documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Error al crear la carpeta"</string>
- <string name="query_error" msgid="5999895349602476581">"No se puede cargar el contenido en este momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recientes"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> de espacio libre"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Almacenamiento"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Accesos directos"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Más aplicaciones"</string>
- <string name="empty" msgid="7858882803708117596">"Sin elementos"</string>
- <string name="no_results" msgid="6622510343880730446">"No hay coincidencias en %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"No se puede abrir el archivo"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"No es posible eliminar algunos documentos."</string>
- <string name="share_via" msgid="8966594246261344259">"Compartir mediante"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copiando archivos"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Moviendo archivos"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Borrando los archivos"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Faltan <xliff:g id="DURATION">%s</xliff:g>."</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">Copiando <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Moviendo <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">Moviendo <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Se están borrando <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
- <item quantity="one">Se está borrando <xliff:g id="COUNT_0">%1$d</xliff:g> archivo.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Deshacer"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparando para copiar…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparación para mover archivos…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparando para borrar…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">No se pudieron copiar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">No se pudo copiar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">No se pudieron trasladar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">No se pudo trasladar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">No se pudieron borrar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">No se pudo borrar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Presiona para ver los detalles"</string>
- <string name="close" msgid="3043722427445528732">"Cerrar"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Los siguientes archivos no se pudieron copiar: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Los siguientes archivos no se trasladaron: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Los siguientes archivos no se pudieron borrar: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estos archivos se convirtieron a otro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Se copiaron <xliff:g id="COUNT_1">%1$d</xliff:g> archivos al portapapeles.</item>
- <item quantity="one">Se copió <xliff:g id="COUNT_0">%1$d</xliff:g> archivo al portapapeles.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"No se pueden pegar los archivos seleccionados en esta ubicación."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Cambiar nombre"</string>
- <string name="rename_error" msgid="4203041674883412606">"No se pudo cambiar el nombre del documento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Se convirtieron algunos archivos"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"¿Otorgar acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> al directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> en <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"¿Quieres otorgar acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> al directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"¿Quieres otorgar acceso a la app de <xliff:g id="APPNAME"><b>^1</b></xliff:g> a tus datos, incluidas tus fotos y videos en <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"No volver a preguntar"</string>
- <string name="allow" msgid="7225948811296386551">"Permitir"</string>
- <string name="deny" msgid="2081879885755434506">"Denegar"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos seleccionados</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento seleccionado</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"¿Deseas borrar \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"¿Deseas borrar la carpeta \"<xliff:g id="NAME">%1$s</xliff:g>\" y su contenido?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">¿Deseas borrar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos?</item>
- <item quantity="one">¿Deseas borrar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">¿Deseas borrar <xliff:g id="COUNT_1">%1$d</xliff:g> carpetas y su contenido?</item>
- <item quantity="one">¿Deseas borrar <xliff:g id="COUNT_0">%1$d</xliff:g> carpeta y su contenido?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">¿Deseas borrar <xliff:g id="COUNT_1">%1$d</xliff:g> elementos?</item>
- <item quantity="one">¿Deseas borrar <xliff:g id="COUNT_0">%1$d</xliff:g> elemento?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml
deleted file mode 100644
index bb075d0..0000000
--- a/packages/DocumentsUI/res/values-es/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documentos"</string>
- <string name="downloads_label" msgid="959113951084633612">"Descargas"</string>
- <string name="title_open" msgid="4353228937663917801">"Abrir desde"</string>
- <string name="title_save" msgid="2433679664882857999">"Guardar en"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nueva carpeta"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Vista de cuadrícula"</string>
- <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
- <string name="menu_search" msgid="3816712084502856974">"Buscar"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Ajustes de almacenamiento"</string>
- <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
- <string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Seleccionar todo"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiar en…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Mover a…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nueva ventana"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cortar"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Pegar"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar almac. interno"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar almac. interno"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño del archivo"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño del archivo"</string>
- <string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
- <string name="button_move" msgid="2202666023104202232">"Mover"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Descartar"</string>
- <string name="button_retry" msgid="4392027584153752797">"Reintentar"</string>
- <string name="sort_name" msgid="9183560467917256779">"Por nombre"</string>
- <string name="sort_date" msgid="586080032956151448">"Por fecha de modificación"</string>
- <string name="sort_size" msgid="3350681319735474741">"Por tamaño"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostrar raíces"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ocultar raíces"</string>
- <string name="save_error" msgid="6167009778003223664">"Error al guardar documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Error al crear la carpeta"</string>
- <string name="query_error" msgid="5999895349602476581">"No se puede cargar contenido en este momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Reciente"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> de espacio libre"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Servicios almacenamiento"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Accesos directos"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Más aplicaciones"</string>
- <string name="empty" msgid="7858882803708117596">"No hay elementos"</string>
- <string name="no_results" msgid="6622510343880730446">"Sin coincidencias en %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"No se puede abrir el archivo"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"No es posible eliminar algunos documentos"</string>
- <string name="share_via" msgid="8966594246261344259">"Compartir a través de"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copiando archivos"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Moviendo archivos"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Eliminando archivos"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Tiempo restante: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
- <item quantity="one">Copiando <xliff:g id="COUNT_0">%1$d</xliff:g> archivo.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Moviendo <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
- <item quantity="one">Moviendo <xliff:g id="COUNT_0">%1$d</xliff:g> archivo.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Eliminando <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
- <item quantity="one">Eliminando <xliff:g id="COUNT_0">%1$d</xliff:g> archivo.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Deshacer"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparando para copiar..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparando para mover…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparando para eliminar…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">No se han podido copiar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">No se ha podido copiar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">No se han podido mover <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">No se ha podido mover <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">No se han podido eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos</item>
- <item quantity="one">No se ha podido eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Toca para ver detalles"</string>
- <string name="close" msgid="3043722427445528732">"Cerrar"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Archivos que no se han copiado: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Archivos que no se han movido: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Archivos que no se han eliminado: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estos archivos se han convertido a otro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Se han copiado <xliff:g id="COUNT_1">%1$d</xliff:g> archivos al portapapeles.</item>
- <item quantity="one">Se ha copiado <xliff:g id="COUNT_0">%1$d</xliff:g> archivo al portapapeles.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Los archivos seleccionados no se pueden pegar en esta ubicación."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Cambiar nombre"</string>
- <string name="rename_error" msgid="4203041674883412606">"Error al cambiar el nombre del documento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Se han convertido algunos archivos"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"¿Permitir que <xliff:g id="APPNAME"><b>^1</b></xliff:g> acceda al directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> (<xliff:g id="STORAGE"><i>^3</i></xliff:g>)?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"¿Permitir que <xliff:g id="APPNAME"><b>^1</b></xliff:g> acceda al directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"¿Permitir que <xliff:g id="APPNAME"><b>^1</b></xliff:g> acceda a tus datos, incluidos los vídeos y las fotos, de <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"No volver a preguntar"</string>
- <string name="allow" msgid="7225948811296386551">"Permitir"</string>
- <string name="deny" msgid="2081879885755434506">"Denegar"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seleccionados</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seleccionado</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"¿Eliminar <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"¿Eliminar la carpeta <xliff:g id="NAME">%1$s</xliff:g> y su contenido?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">¿Eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos?</item>
- <item quantity="one">¿Eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">¿Eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> carpetas y su contenido?</item>
- <item quantity="one">¿Eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> carpeta y su contenido?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">¿Eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> elementos?</item>
- <item quantity="one">¿Eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> elemento?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml
deleted file mode 100644
index e1cf4c9..0000000
--- a/packages/DocumentsUI/res/values-et-rEE/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumendid"</string>
- <string name="downloads_label" msgid="959113951084633612">"Allalaadimised"</string>
- <string name="title_open" msgid="4353228937663917801">"Ava asukohast:"</string>
- <string name="title_save" msgid="2433679664882857999">"Salvesta:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Uus kaust"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Ruudustikkuva"</string>
- <string name="menu_list" msgid="7279285939892417279">"Loendikuva"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortimisalus"</string>
- <string name="menu_search" msgid="3816712084502856974">"Otsing"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Salvestusruumi seaded"</string>
- <string name="menu_open" msgid="432922957274920903">"Ava"</string>
- <string name="menu_save" msgid="2394743337684426338">"Salvesta"</string>
- <string name="menu_share" msgid="3075149983979628146">"Jaga"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Kustuta"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Vali kõik"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopeeri asukohta..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Teisalda asukohta..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Uus aken"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Lõika"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopeeri"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Kleebi"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Kuva sis. salvestusruum"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Peida sis. salvestusruum"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Kuva faili suurus"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Peida faili suurus"</string>
- <string name="button_select" msgid="527196987259139214">"Vali"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopeeri"</string>
- <string name="button_move" msgid="2202666023104202232">"Teisalda"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Loobu"</string>
- <string name="button_retry" msgid="4392027584153752797">"Proovi uuesti"</string>
- <string name="sort_name" msgid="9183560467917256779">"Nime järgi"</string>
- <string name="sort_date" msgid="586080032956151448">"Muutmiskuupäeva järgi"</string>
- <string name="sort_size" msgid="3350681319735474741">"Suuruse järgi"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Kuva juured"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Peida juured"</string>
- <string name="save_error" msgid="6167009778003223664">"Dokumendi salvestamine ebaõnnestus"</string>
- <string name="create_error" msgid="3735649141335444215">"Kausta loomine ebaõnnestus"</string>
- <string name="query_error" msgid="5999895349602476581">"Sisu ei saa praegu laadida"</string>
- <string name="root_recent" msgid="4470053704320518133">"Hiljutised"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> on vaba"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Mäluruumi teenused"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Otseteed"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Seadmed"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Rohkem rakendusi"</string>
- <string name="empty" msgid="7858882803708117596">"Üksusi ei ole"</string>
- <string name="no_results" msgid="6622510343880730446">"Otsing %1$s ei andnud vasteid"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Faili ei saa avada"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Mõnda dokumenti ei õnnestu kustutada"</string>
- <string name="share_via" msgid="8966594246261344259">"Jagage teenusega"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Failide kopeerimine"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Failide teisaldamine"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Failide kustutamine"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Jäänud on <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili kopeerimine.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> faili kopeerimine.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Teisaldatakse <xliff:g id="COUNT_1">%1$d</xliff:g> faili.</item>
- <item quantity="one">Teisaldatakse <xliff:g id="COUNT_0">%1$d</xliff:g> fail.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Kustutatakse <xliff:g id="COUNT_1">%1$d</xliff:g> faili.</item>
- <item quantity="one">Kustutatakse <xliff:g id="COUNT_0">%1$d</xliff:g> fail.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Võta tagasi"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopeerimise ettevalmistamine …"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Teisaldamise ettevalmistamine …"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Kustutamise ettevalmistamine …"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili ei saanud kopeerida</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> faili ei saanud kopeerida</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili ei saanud teisaldada</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> faili ei saanud teisaldada</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili ei saanud kustutada</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> faili ei saanud kustutada</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Puudutage üksikasjade vaatamiseks"</string>
- <string name="close" msgid="3043722427445528732">"Sule"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Neid faile ei kopeeritud: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Neid faile ei teisaldatud: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Neid faile ei kustutatud: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Need failid teisendati teise vormingusse: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili kopeeriti lõikelauale.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fail kopeeriti lõikelauale.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Valitud faile ei saa sellesse asukohta kleepida."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Nimeta ümber"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokumendi ümbernimetamine ebaõnnestus"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Mõned failid teisendati"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Kas anda rakendusele <xliff:g id="APPNAME"><b>^1</b></xliff:g> juurdepääs kataloogile <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> salvestusruumis <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Kas anda rakendusele <xliff:g id="APPNAME"><b>^1</b></xliff:g> juurdepääs kataloogile <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Kas anda rakendusele <xliff:g id="APPNAME"><b>^1</b></xliff:g> juurdepääs teie andmetele (sh fotod ja videod) salvestusruumis <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ära enam küsi"</string>
- <string name="allow" msgid="7225948811296386551">"Luba"</string>
- <string name="deny" msgid="2081879885755434506">"Keela"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> on valitud</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> on valitud</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> üksust</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> üksus</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Kas kustutada fail „<xliff:g id="NAME">%1$s</xliff:g>”?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Kas kustutada kaust „<xliff:g id="NAME">%1$s</xliff:g>” ja selle sisu?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Kas kustutada <xliff:g id="COUNT_1">%1$d</xliff:g> faili?</item>
- <item quantity="one">Kas kustutada <xliff:g id="COUNT_0">%1$d</xliff:g> fail?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Kas kustutada <xliff:g id="COUNT_1">%1$d</xliff:g> kausta ja nende sisu?</item>
- <item quantity="one">Kas kustutada <xliff:g id="COUNT_0">%1$d</xliff:g> kaust ja selle sisu?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Kas kustutada <xliff:g id="COUNT_1">%1$d</xliff:g> üksust?</item>
- <item quantity="one">Kas kustutada <xliff:g id="COUNT_0">%1$d</xliff:g> üksus?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml
deleted file mode 100644
index 7cc21ed..0000000
--- a/packages/DocumentsUI/res/values-eu-rES/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumentuak"</string>
- <string name="downloads_label" msgid="959113951084633612">"Deskargak"</string>
- <string name="title_open" msgid="4353228937663917801">"Ireki hemendik"</string>
- <string name="title_save" msgid="2433679664882857999">"Gorde hemen"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Karpeta berria"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Sareta-ikuspegia"</string>
- <string name="menu_list" msgid="7279285939892417279">"Zerrenda-ikuspegia"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordenatzeko irizpidea"</string>
- <string name="menu_search" msgid="3816712084502856974">"Bilatu"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Memoriaren ezarpenak"</string>
- <string name="menu_open" msgid="432922957274920903">"Ireki"</string>
- <string name="menu_save" msgid="2394743337684426338">"Gorde"</string>
- <string name="menu_share" msgid="3075149983979628146">"Partekatu"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Ezabatu"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Hautatu guztiak"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiatu hemen…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Eraman hona…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Leiho berria"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Ebaki"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiatu"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Itsatsi"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Erakutsi barneko memoria"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ezkutatu barneko memoria"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Erakutsi fitxategi-tamaina"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ezkutatu fitxategi-tamaina"</string>
- <string name="button_select" msgid="527196987259139214">"Hautatu"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiatu"</string>
- <string name="button_move" msgid="2202666023104202232">"Mugitu"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Baztertu"</string>
- <string name="button_retry" msgid="4392027584153752797">"Saiatu berriro"</string>
- <string name="sort_name" msgid="9183560467917256779">"Izenaren arabera"</string>
- <string name="sort_date" msgid="586080032956151448">"Aldatze-dataren arabera"</string>
- <string name="sort_size" msgid="3350681319735474741">"Tamainaren arabera"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Erakutsi erroko karpetak"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ezkutatu erroko karpetak"</string>
- <string name="save_error" msgid="6167009778003223664">"Ezin izan da dokumentua gorde"</string>
- <string name="create_error" msgid="3735649141335444215">"Ezin izan da karpeta sortu"</string>
- <string name="query_error" msgid="5999895349602476581">"Une honetan ezin da kargatu edukia"</string>
- <string name="root_recent" msgid="4470053704320518133">"Azkenak"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> doan"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Biltegiratze-zerbitzuak"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Lasterbideak"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Gailuak"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Aplikazio gehiago"</string>
- <string name="empty" msgid="7858882803708117596">"Ez dago elementurik"</string>
- <string name="no_results" msgid="6622510343880730446">"Ez da aurkitu ezer %1$s atalean"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Ezin da ireki fitxategia"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Ezin izan dira dokumentu batzuk ezabatu"</string>
- <string name="share_via" msgid="8966594246261344259">"Partekatu honen bidez:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Fitxategiak kopiatzen"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Fitxategiak mugitzea"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Fitxategiak ezabatzea"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Falta den denbora: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi kopiatzen.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi kopiatzen.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi mugitzen.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi mugitzen.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi ezabatzen ari dira.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi ezabatzen ari da.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Desegin"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopiatzeko prestatzen…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Mugitzeko prestatzen…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Ezabatzeko prestatzen…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Ezin izan dira kopiatu <xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi</item>
- <item quantity="one">Ezin izan da kopiatu <xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Ezin izan dira mugitu <xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi</item>
- <item quantity="one">Ezin izan da mugitu <xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Ezin izan dira ezabatu <xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi</item>
- <item quantity="one">Ezin izan da ezabatu <xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Sakatu xehetasunak ikusteko"</string>
- <string name="close" msgid="3043722427445528732">"Itxi"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Ez dira kopiatu fitxategi hauek: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Ez dira mugitu fitxategi hauek: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Ez dira ezabatu fitxategi hauek: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Fitxategi hauek beste formatu bateko fitxategi bihurtu dira: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi kopiatu dira arbelean.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi kopiatu da arbelean.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Ezin dira itsatsi hautatutako fitxategiak kokapen honetan."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Aldatu izena"</string>
- <string name="rename_error" msgid="4203041674883412606">"Ezin izan zaio aldatu izena dokumentuari"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Artxibo batzuk bihurtu dira"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari <xliff:g id="STORAGE"><i>^3</i></xliff:g> unitateko <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> direktorioa atzitzeko baimena eman nahi diozu?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> direktoriorako sarbidea eman nahi diozu?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari zure datuak atzitzea baimendu nahi diozu, besteak beste, <xliff:g id="STORAGE"><i>^2</i></xliff:g> biltegian dituzun argazkiak eta bideoak?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ez galdetu berriro"</string>
- <string name="allow" msgid="7225948811296386551">"Onartu"</string>
- <string name="deny" msgid="2081879885755434506">"Ukatu"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> hautatuta</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hautatuta</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementu</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elementu</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ezabatu nahi duzu?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" karpeta eta bertako edukia ezabatu nahi duzu?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi ezabatu nahi dituzu?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi ezabatu nahi duzu?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> karpeta eta beren eduki guztia ezabatu nahi duzu?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> karpeta eta bere eduki guztia ezabatu nahi duzu?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementu ezabatu nahi dituzu?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elementu ezabatu nahi duzu?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml
deleted file mode 100644
index 63cd365..0000000
--- a/packages/DocumentsUI/res/values-fa/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"اسناد"</string>
- <string name="downloads_label" msgid="959113951084633612">"بارگیریها"</string>
- <string name="title_open" msgid="4353228937663917801">"باز کردن از"</string>
- <string name="title_save" msgid="2433679664882857999">"ذخیره در"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"پوشه جدید"</string>
- <string name="menu_grid" msgid="6878021334497835259">"نمای جدولی"</string>
- <string name="menu_list" msgid="7279285939892417279">"نمای فهرستی"</string>
- <string name="menu_sort" msgid="7677740407158414452">"مرتبسازی براساس"</string>
- <string name="menu_search" msgid="3816712084502856974">"جستجو"</string>
- <string name="menu_settings" msgid="8239065133341597825">"تنظیمات ذخیرهسازی"</string>
- <string name="menu_open" msgid="432922957274920903">"باز کردن"</string>
- <string name="menu_save" msgid="2394743337684426338">"ذخیره"</string>
- <string name="menu_share" msgid="3075149983979628146">"اشتراکگذاری"</string>
- <string name="menu_delete" msgid="8138799623850614177">"حذف"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"انتخاب همه"</string>
- <string name="menu_copy" msgid="3612326052677229148">"کپی در..."</string>
- <string name="menu_move" msgid="1828090633118079817">"انتقال به…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"پنجره جدید"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"برش"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"کپی"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"جایگذاری"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"نمایش فضای ذخیرهسازی داخلی"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"پنهان کردن فضای ذخیرهسازی داخلی"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"نمایش اندازه فایل"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"پنهان کردن اندازه فایل"</string>
- <string name="button_select" msgid="527196987259139214">"انتخاب"</string>
- <string name="button_copy" msgid="8706475544635021302">"کپی"</string>
- <string name="button_move" msgid="2202666023104202232">"انتقال"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"نپذیرفتن"</string>
- <string name="button_retry" msgid="4392027584153752797">"دوباره امتحان کنید"</string>
- <string name="sort_name" msgid="9183560467917256779">"براساس نام"</string>
- <string name="sort_date" msgid="586080032956151448">"براساس تاریخ اصلاح"</string>
- <string name="sort_size" msgid="3350681319735474741">"براساس اندازه"</string>
- <string name="drawer_open" msgid="4545466532430226949">"نمایش ریشهها"</string>
- <string name="drawer_close" msgid="7602734368552123318">"پنهان کردن ریشهها"</string>
- <string name="save_error" msgid="6167009778003223664">"ذخیره سند انجام نشد"</string>
- <string name="create_error" msgid="3735649141335444215">"ایجاد پوشه انجام نشد"</string>
- <string name="query_error" msgid="5999895349602476581">"محتوا درحال حاضر بارگیری نمیشود"</string>
- <string name="root_recent" msgid="4470053704320518133">"اخیر"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> آزاد"</string>
- <string name="root_type_service" msgid="2178854894416775409">"خدمات ذخیرهسازی"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"میانبرها"</string>
- <string name="root_type_device" msgid="7121342474653483538">"دستگاهها"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"برنامههای بیشتر"</string>
- <string name="empty" msgid="7858882803708117596">"موردی موجود نیست"</string>
- <string name="no_results" msgid="6622510343880730446">"مورد منطبقی در %1$s وجود ندارد"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"فایل باز نمیشود"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"برخی از اسناد حذف نمیشوند"</string>
- <string name="share_via" msgid="8966594246261344259">"اشتراکگذاری از طریق"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"در حال کپی کردن فایلها"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"درحال انتقال فایلها"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"در حال حذف فایلها"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> باقیمانده"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">در حال کپی کردن <xliff:g id="COUNT_1">%1$d</xliff:g> فایل.</item>
- <item quantity="other">در حال کپی کردن <xliff:g id="COUNT_1">%1$d</xliff:g> فایل.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">در حال انتقال <xliff:g id="COUNT_1">%1$d</xliff:g> فایل.</item>
- <item quantity="other">در حال انتقال <xliff:g id="COUNT_1">%1$d</xliff:g> فایل.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">در حال حذف <xliff:g id="COUNT_1">%1$d</xliff:g> فایل.</item>
- <item quantity="other">در حال حذف <xliff:g id="COUNT_1">%1$d</xliff:g> فایل.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"لغو"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"در حال آمادهسازی برای کپی..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"درحال آمادهسازی برای انتقال…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"درحال آمادهسازی برای حذف…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> فایل کپی نشد</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> فایل کپی نشد</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> فایل منتقل نشد</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> فایل منتقل نشد</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف نشد</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف نشد</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"برای مشاهده جزئیات ضربه بزنید"</string>
- <string name="close" msgid="3043722427445528732">"بستن"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"این فایلها کپی نشدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"این فایلها منتقل نشدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"این فایلها حذف نشدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"این فایلها به قالب دیگری تبدیل شدند: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل در بریدهدان کپی شد.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل در بریدهدان کپی شد.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"نمیتوان فایلهای انتخابی را در این مکان جایگذاری کرد."</string>
- <string name="menu_rename" msgid="7678802479104285353">"تغییر نام"</string>
- <string name="rename_error" msgid="4203041674883412606">"نام سند تغییر نکرد"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"بعضی از فایلها تبدیل شدند"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"به <xliff:g id="APPNAME"><b>^1</b></xliff:g> اجازه داده شود به فهرست راهنمای <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> در <xliff:g id="STORAGE"><i>^3</i></xliff:g> دسترسی داشته باشد؟"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"به <xliff:g id="APPNAME"><b>^1</b></xliff:g> اجازه دسترسی به دایرکتوری <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> داده شود؟"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"به <xliff:g id="APPNAME"><b>^1</b></xliff:g> اجازه میدهید به دادههایتان دسترسی پیدا کند، از جمله عکسها و ویدیوهایتان در <xliff:g id="STORAGE"><i>^2</i></xliff:g>؟"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"دوباره سؤال نشود"</string>
- <string name="allow" msgid="7225948811296386551">"ارزیابیشده"</string>
- <string name="deny" msgid="2081879885755434506">"اجازه ندارد"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد انتخاب شد</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد انتخاب شد</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"«<xliff:g id="NAME">%1$s</xliff:g>» حذف شود؟"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"پوشه «<xliff:g id="NAME">%1$s</xliff:g>» و محتوای آن حذف شود؟"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف شود؟</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف شود؟</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> پوشه و محتوای آنها حذف شود؟</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> پوشه و محتوای آنها حذف شود؟</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد حذف شود؟</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد حذف شود؟</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml
deleted file mode 100644
index 368bc73..0000000
--- a/packages/DocumentsUI/res/values-fi/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Asiakirjat"</string>
- <string name="downloads_label" msgid="959113951084633612">"Lataukset"</string>
- <string name="title_open" msgid="4353228937663917801">"Avaa sijainnista"</string>
- <string name="title_save" msgid="2433679664882857999">"Tallenna kohteeseen"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Uusi kansio"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Ruudukkonäkymä"</string>
- <string name="menu_list" msgid="7279285939892417279">"Luettelonäkymä"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Lajitteluperuste"</string>
- <string name="menu_search" msgid="3816712084502856974">"Haku"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Tallennusasetukset"</string>
- <string name="menu_open" msgid="432922957274920903">"Avaa"</string>
- <string name="menu_save" msgid="2394743337684426338">"Tallenna"</string>
- <string name="menu_share" msgid="3075149983979628146">"Jaa"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Poista"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Valitse kaikki"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopioi kohteeseen…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Siirrä kohteeseen…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Uusi ikkuna"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Leikkaa"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopioi"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Liitä"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Näytä sis. tallennustila"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Piilota sis. tallennust."</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Näytä tiedostokoko"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Piilota tiedostokoko"</string>
- <string name="button_select" msgid="527196987259139214">"Valitse"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopioi"</string>
- <string name="button_move" msgid="2202666023104202232">"Siirrä"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Hylkää"</string>
- <string name="button_retry" msgid="4392027584153752797">"Yritä uudelleen"</string>
- <string name="sort_name" msgid="9183560467917256779">"Nimen mukaan"</string>
- <string name="sort_date" msgid="586080032956151448">"Muokkauspäivän mukaan"</string>
- <string name="sort_size" msgid="3350681319735474741">"Koon mukaan"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Näytä juuret"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Piilota juuret"</string>
- <string name="save_error" msgid="6167009778003223664">"Asiakirjan tallennus epäonnistui"</string>
- <string name="create_error" msgid="3735649141335444215">"Kansion luominen epäonnistui"</string>
- <string name="query_error" msgid="5999895349602476581">"Sisältöä ei juuri nyt voi ladata."</string>
- <string name="root_recent" msgid="4470053704320518133">"Viimeisimmät"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> vapaana"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Tallennuspalvelut"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Pikakuvakkeet"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Laitteet"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Lisää sovelluksia"</string>
- <string name="empty" msgid="7858882803708117596">"Ei kohteita"</string>
- <string name="no_results" msgid="6622510343880730446">"Ei osumia kohteessa %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Tiedoston avaaminen epäonnistui."</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Joitakin asiakirjoja ei voi poistaa"</string>
- <string name="share_via" msgid="8966594246261344259">"Jaa sovelluksessa"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopioidaan tiedostoja"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Siirretään tiedostoja"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Poistetaan tiedostoja"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> jäljellä"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Kopioidaan <xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa.</item>
- <item quantity="one">Kopioidaan <xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Siirretään <xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa.</item>
- <item quantity="one">Siirretään <xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Poistetaan <xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa.</item>
- <item quantity="one">Poistetaan <xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Kumoa"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Valmistellaan kopiointia…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Valmistellaan siirtämistä…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Valmistellaan poistamista…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> tiedoston kopioiminen epäonnistui.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tiedoston kopioiminen epäonnistui.</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> tiedoston siirtäminen epäonnistui.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tiedoston siirtäminen epäonnistui.</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> tiedoston poistaminen epäonnistui.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tiedoston poistaminen epäonnistui.</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tarkastele tietoja napauttamalla"</string>
- <string name="close" msgid="3043722427445528732">"Sulje"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Näitä tiedostoja ei kopioitu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Näitä tiedostoja ei siirretty: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Näitä tiedostoja ei poistettu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Seuraavat tiedostot muunnettiin toiseen muotoon: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa kopioitiin leikepöydälle.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto kopioitiin leikepöydälle.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Valittuja tiedostoja ei voi liittää tähän sijaintiin."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Nimeä uudelleen"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokumentin nimen muuttaminen epäonnistui."</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Joitakin tiedostoja muunnettiin."</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Myönnetäänkö sovellukselle <xliff:g id="APPNAME"><b>^1</b></xliff:g> sijainnissa <xliff:g id="STORAGE"><i>^3</i></xliff:g> olevan hakemiston <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> käyttöoikeus?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Saako <xliff:g id="APPNAME"><b>^1</b></xliff:g> käyttää hakemistoa <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Myönnetäänkö sovellukselle <xliff:g id="APPNAME"><b>^1</b></xliff:g> sijainnissa <xliff:g id="STORAGE"><i>^2</i></xliff:g> olevien tietojesi, mukaan lukien valokuviesi ja videoidesi, käyttöoikeus?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Älä kysy uudestaan"</string>
- <string name="allow" msgid="7225948811296386551">"Salli"</string>
- <string name="deny" msgid="2081879885755434506">"Kiellä"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valittu</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> valittu</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> kohdetta</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kohde</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Poistetaanko <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Poistetaanko kansio <xliff:g id="NAME">%1$s</xliff:g> ja sen sisältö?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Poistetaanko <xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa?</item>
- <item quantity="one">Poistetaanko <xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Poistetaanko <xliff:g id="COUNT_1">%1$d</xliff:g> kansiota ja niiden sisältö?</item>
- <item quantity="one">Poistetaanko <xliff:g id="COUNT_0">%1$d</xliff:g> kansio ja sen sisältö?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Poistetaanko <xliff:g id="COUNT_1">%1$d</xliff:g> kohdetta?</item>
- <item quantity="one">Poistetaanko <xliff:g id="COUNT_0">%1$d</xliff:g> kohde?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 1ddf29c..0000000
--- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documents"</string>
- <string name="downloads_label" msgid="959113951084633612">"Téléchargements"</string>
- <string name="title_open" msgid="4353228937663917801">"Ouvrir à partir de"</string>
- <string name="title_save" msgid="2433679664882857999">"Enregistrer dans"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nouveau dossier"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Grille"</string>
- <string name="menu_list" msgid="7279285939892417279">"Liste"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Trier par"</string>
- <string name="menu_search" msgid="3816712084502856974">"Rechercher"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Paramètres de stockage"</string>
- <string name="menu_open" msgid="432922957274920903">"Ouvrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string>
- <string name="menu_share" msgid="3075149983979628146">"Partager"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Supprimer"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Tout sélectionner"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copier dans..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Déplacer dans…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nouvelle fenêtre"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Couper"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copier"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Coller"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Masquer mém. stock. int."</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
- <string name="button_select" msgid="527196987259139214">"Sélectionner"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copier"</string>
- <string name="button_move" msgid="2202666023104202232">"Déplacer"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Faire disparaître"</string>
- <string name="button_retry" msgid="4392027584153752797">"Réessayer"</string>
- <string name="sort_name" msgid="9183560467917256779">"Par nom"</string>
- <string name="sort_date" msgid="586080032956151448">"Par date de modification"</string>
- <string name="sort_size" msgid="3350681319735474741">"Par taille"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Afficher les racines"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Masquer les racines"</string>
- <string name="save_error" msgid="6167009778003223664">"Échec de l\'enregistrement du document"</string>
- <string name="create_error" msgid="3735649141335444215">"Échec de la création du dossier"</string>
- <string name="query_error" msgid="5999895349602476581">"Impossible de charger le contenu pour le moment"</string>
- <string name="root_recent" msgid="4470053704320518133">"Récents"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> disponible"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Services de stockage"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Raccourcis"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Appareils"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Plus d\'applications"</string>
- <string name="empty" msgid="7858882803708117596">"Aucun élément"</string>
- <string name="no_results" msgid="6622510343880730446">"Aucune correspondance dans %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Impossible d\'ouvrir le fichier"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Impossible de supprimer certains documents"</string>
- <string name="share_via" msgid="8966594246261344259">"Partager par"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copie de fichiers..."</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Déplacement des fichiers"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Suppression des fichiers"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Durée restante : <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Copier de <xliff:g id="COUNT_1">%1$d</xliff:g> fichier en cours.</item>
- <item quantity="other">Copier de <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers en cours.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Déplacement de <xliff:g id="COUNT_1">%1$d</xliff:g> fichier en cours.</item>
- <item quantity="other">Déplacement de <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers en cours.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Suppression de <xliff:g id="COUNT_1">%1$d</xliff:g> fichier.</item>
- <item quantity="other">Suppression de <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Annuler"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Préparation de la copie en cours"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Préparation du déplacement..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Préparation de la suppression..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> fichier</item>
- <item quantity="other">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Impossible de déplacer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier</item>
- <item quantity="other">Impossible de déplacer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossier</item>
- <item quantity="other">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossiers</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Touchez pour afficher les détails"</string>
- <string name="close" msgid="3043722427445528732">"Fermer"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Ces fichiers ne ont pas été copiés : <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Ces fichiers n\'ont pas été déplacés : <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Ces fichiers n\'ont pas été supprimés : <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ces fichiers ont été convertis dans un autre format : <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fichier a été copié dans le presse-papiers.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fichiers ont été copiés dans le presse-papiers.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Impossible de coller les fichiers sélectionnés à cet endroit."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Renommer"</string>
- <string name="rename_error" msgid="4203041674883412606">"Impossible de renommer le document"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Certains fichiers ont été convertis"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Accorder à <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accès au répertoire <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> sur <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Accorder à <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accès au répertoire <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Voulez-vous accorder l\'accès à vos données à <xliff:g id="APPNAME"><b>^1</b></xliff:g>, y compris vos photos et vos vidéos, sur <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ne plus me demander"</string>
- <string name="allow" msgid="7225948811296386551">"Autoriser"</string>
- <string name="deny" msgid="2081879885755434506">"Refuser"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> sélectionné</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> sélectionnés</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> article</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> articles</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Supprimer « <xliff:g id="NAME">%1$s</xliff:g> »?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Supprimer le dossier « <xliff:g id="NAME">%1$s</xliff:g> » et son contenu?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier?</item>
- <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossier et son contenu?</item>
- <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossiers et leur contenu?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> élément?</item>
- <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> éléments?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml
deleted file mode 100644
index 2d1e8d3..0000000
--- a/packages/DocumentsUI/res/values-fr/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Docs"</string>
- <string name="downloads_label" msgid="959113951084633612">"Téléchargements"</string>
- <string name="title_open" msgid="4353228937663917801">"Ouvrir à partir de"</string>
- <string name="title_save" msgid="2433679664882857999">"Enregistrer sous"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nouveau dossier"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Grille"</string>
- <string name="menu_list" msgid="7279285939892417279">"Liste"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Trier par"</string>
- <string name="menu_search" msgid="3816712084502856974">"Rechercher"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Paramètres de stockage"</string>
- <string name="menu_open" msgid="432922957274920903">"Ouvrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string>
- <string name="menu_share" msgid="3075149983979628146">"Partager"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Supprimer"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Tout sélectionner"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copier vers…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Placer dans…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nouvelle fenêtre"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Couper"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copier"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Coller"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Masquer mém. stock. int."</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
- <string name="button_select" msgid="527196987259139214">"Sélectionner"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copier"</string>
- <string name="button_move" msgid="2202666023104202232">"Déplacer"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Fermer"</string>
- <string name="button_retry" msgid="4392027584153752797">"Réessayer"</string>
- <string name="sort_name" msgid="9183560467917256779">"Par nom"</string>
- <string name="sort_date" msgid="586080032956151448">"Par date de modification"</string>
- <string name="sort_size" msgid="3350681319735474741">"Par taille"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Afficher les répertoires racines"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Masquer les répertoires racines"</string>
- <string name="save_error" msgid="6167009778003223664">"Échec de l\'enregistrement du document."</string>
- <string name="create_error" msgid="3735649141335444215">"Échec de la création du dossier."</string>
- <string name="query_error" msgid="5999895349602476581">"Impossible de charger le contenu pour le moment"</string>
- <string name="root_recent" msgid="4470053704320518133">"Récents"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Espace disponible : <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Services de stockage"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Raccourcis"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Appareils"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Autres applications"</string>
- <string name="empty" msgid="7858882803708117596">"Aucun élément"</string>
- <string name="no_results" msgid="6622510343880730446">"Aucune correspondance dans %1$s."</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Impossible d\'ouvrir le fichier"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Impossible de supprimer certains documents."</string>
- <string name="share_via" msgid="8966594246261344259">"Partager via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copie de fichiers en cours"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Déplacement de fichiers"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Suppression des fichiers…"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Temps restant : <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Copie de <xliff:g id="COUNT_1">%1$d</xliff:g> fichier en cours…</item>
- <item quantity="other">Copie de <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers en cours…</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Déplacement de <xliff:g id="COUNT_1">%1$d</xliff:g> fichier en cours…</item>
- <item quantity="other">Déplacement de <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers en cours…</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Suppression de <xliff:g id="COUNT_1">%1$d</xliff:g> fichier en cours…</item>
- <item quantity="other">Suppression de <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers en cours…</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Annuler"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Préparation de la copie en cours…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Préparation au déplacement…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Préparation à la suppression…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> fichier</item>
- <item quantity="other">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Impossible de déplacer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier</item>
- <item quantity="other">Impossible de déplacer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier</item>
- <item quantity="other">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Appuyez pour afficher plus d\'informations."</string>
- <string name="close" msgid="3043722427445528732">"Fermer"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Les fichiers suivants n\'ont pas été copiés : <xliff:g id="LIST">%1$s</xliff:g>."</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Les fichiers suivants n\'ont pas été déplacés : <xliff:g id="LIST">%1$s</xliff:g>."</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Les fichiers suivants n\'ont pas été supprimés : <xliff:g id="LIST">%1$s</xliff:g>."</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ces fichiers ont été convertis dans un autre format : <xliff:g id="LIST">%1$s</xliff:g>."</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fichier a bien été copié dans le Presse-papiers.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fichiers ont bien été copiés dans le Presse-papiers.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Impossible de coller les fichiers sélectionnés à cet endroit."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Renommer"</string>
- <string name="rename_error" msgid="4203041674883412606">"Échec du changement de nom du document."</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Certains fichiers ont été convertis"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Autoriser <xliff:g id="APPNAME"><b>^1</b></xliff:g> à accéder à l\'annuaire \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\" sur <xliff:g id="STORAGE"><i>^3</i></xliff:g> ?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Autoriser <xliff:g id="APPNAME"><b>^1</b></xliff:g> à accéder à l\'annuaire \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\" ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Autoriser <xliff:g id="APPNAME"><b>^1</b></xliff:g> à accéder à vos données, y compris les photos et les vidéos, sur <xliff:g id="STORAGE"><i>^2</i></xliff:g> ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ne plus demander"</string>
- <string name="allow" msgid="7225948811296386551">"Autoriser"</string>
- <string name="deny" msgid="2081879885755434506">"Refuser"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Supprimer \"<xliff:g id="NAME">%1$s</xliff:g>\" ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Supprimer le dossier \"<xliff:g id="NAME">%1$s</xliff:g>\" et son contenu ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier ?</item>
- <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossier et son contenu ?</item>
- <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> dossiers et leur contenu ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> élément ?</item>
- <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> éléments ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml
deleted file mode 100644
index 451f5af..0000000
--- a/packages/DocumentsUI/res/values-gl-rES/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documentos"</string>
- <string name="downloads_label" msgid="959113951084633612">"Descargas"</string>
- <string name="title_open" msgid="4353228937663917801">"Abrir desde"</string>
- <string name="title_save" msgid="2433679664882857999">"Gardar en"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Novo cartafol"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Vista de grade"</string>
- <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
- <string name="menu_search" msgid="3816712084502856974">"Buscar"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Configur. almacenamento"</string>
- <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Gardar"</string>
- <string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Seleccionar todo"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiar en…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Mover a…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nova ventá"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cortar"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Pegar"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar almacen. interno"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño ficheiro"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño ficheiro"</string>
- <string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
- <string name="button_move" msgid="2202666023104202232">"Mover"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Ignorar"</string>
- <string name="button_retry" msgid="4392027584153752797">"Tentar de novo"</string>
- <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
- <string name="sort_date" msgid="586080032956151448">"Por data de modificación"</string>
- <string name="sort_size" msgid="3350681319735474741">"Por tamaño"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostrar raíces"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ocultar raíces"</string>
- <string name="save_error" msgid="6167009778003223664">"Non se puido gardar o documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Non se puido crear o cartafol"</string>
- <string name="query_error" msgid="5999895349602476581">"Non se pode cargar o contido neste momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recentes"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> libres"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Servizos de almacenamento"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Atallos"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Máis aplicacións"</string>
- <string name="empty" msgid="7858882803708117596">"Ningún elemento"</string>
- <string name="no_results" msgid="6622510343880730446">"Non hai coincidencias en %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Non se pode abrir o ficheiro"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Non se poden eliminar algúns documentos"</string>
- <string name="share_via" msgid="8966594246261344259">"Compartir a través de"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copiando ficheiros"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Mover ficheiros"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Eliminando ficheiros"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Tempo restante: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros.</item>
- <item quantity="one">Copianto <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Movendo <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros.</item>
- <item quantity="one">Movendo <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Eliminando <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros.</item>
- <item quantity="one">Eliminando <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Desfacer"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparando para copiar…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparándose para mover..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparando para eliminar…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Non se puideron copiar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros</item>
- <item quantity="one">Non se puido copiar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Non se puideron mover <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros</item>
- <item quantity="one">Non se puido mover <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Non se puideron eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros</item>
- <item quantity="one">Non se puido eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Toca para ver detalles"</string>
- <string name="close" msgid="3043722427445528732">"Pechar"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Non se copiaron estes ficheiros: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Non se moveron estes ficheiros: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Non se eliminaron estes ficheiros: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estes ficheiros convertéronse a outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Copiáronse <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros no portapapeis.</item>
- <item quantity="one">Copiouse <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro no portapapeis.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Non se poden pegar os ficheiros seleccionados nesta localización."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Cambiar nome"</string>
- <string name="rename_error" msgid="4203041674883412606">"Non se puido cambiar o nome do documento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Convertéronse algúns ficheiros"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Queres outorgar acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> ao directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no almacenamento de <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Queres darlle acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> ao directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Queres darlle acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> aos teus datos almacenados en <xliff:g id="STORAGE"><i>^2</i></xliff:g>, incluídos vídeos e fotos?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Non preguntar de novo"</string>
- <string name="allow" msgid="7225948811296386551">"Permitir"</string>
- <string name="deny" msgid="2081879885755434506">"Rexeitar"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">Seleccionáronse <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Seleccionouse <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Queres eliminar \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Queres eliminar o cartafol \"<xliff:g id="NAME">%1$s</xliff:g>\" e o seu contido?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Queres eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros?</item>
- <item quantity="one">Queres eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Queres eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> cartafoles e os seus contidos?</item>
- <item quantity="one">Queres eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> cartafol e os seus contidos?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Queres eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> elementos?</item>
- <item quantity="one">Queres eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> elemento?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
deleted file mode 100644
index e4e7995..0000000
--- a/packages/DocumentsUI/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"દસ્તાવેજો"</string>
- <string name="downloads_label" msgid="959113951084633612">"ડાઉનલોડ્સ"</string>
- <string name="title_open" msgid="4353228937663917801">"અહીંથી ખોલો"</string>
- <string name="title_save" msgid="2433679664882857999">"આમાં સાચવો"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"નવું ફોલ્ડર"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ગ્રિડ દૃશ્ય"</string>
- <string name="menu_list" msgid="7279285939892417279">"સૂચિ દૃશ્ય"</string>
- <string name="menu_sort" msgid="7677740407158414452">"આ પ્રમાણે સૉર્ટ કરો"</string>
- <string name="menu_search" msgid="3816712084502856974">"શોધો"</string>
- <string name="menu_settings" msgid="8239065133341597825">"સ્ટોરેજ સેટિંગ્સ"</string>
- <string name="menu_open" msgid="432922957274920903">"ખોલો"</string>
- <string name="menu_save" msgid="2394743337684426338">"સાચવો"</string>
- <string name="menu_share" msgid="3075149983979628146">"શેર કરો"</string>
- <string name="menu_delete" msgid="8138799623850614177">"કાઢી નાખો"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"બધા પસંદ કરો"</string>
- <string name="menu_copy" msgid="3612326052677229148">"આના પર કૉપિ કરો…"</string>
- <string name="menu_move" msgid="1828090633118079817">"આમાં ખસેડો…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"નવી વિંડો"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"કાપો"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"કૉપિ કરો"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"પેસ્ટ કરો"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"આંતરિક સ્ટોરેજ બતાવો"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"આંતરિક સંગ્રહ છુપાવો"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ફાઇલ કદ બતાવો"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ફાઇલ કદ છુપાવો"</string>
- <string name="button_select" msgid="527196987259139214">"પસંદ કરો"</string>
- <string name="button_copy" msgid="8706475544635021302">"કૉપિ કરો"</string>
- <string name="button_move" msgid="2202666023104202232">"ખસેડો"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"છોડી દો"</string>
- <string name="button_retry" msgid="4392027584153752797">"ફરીથી પ્રયત્ન કરો"</string>
- <string name="sort_name" msgid="9183560467917256779">"નામ દ્વારા"</string>
- <string name="sort_date" msgid="586080032956151448">"સંશોધન તારીખ દ્વારા"</string>
- <string name="sort_size" msgid="3350681319735474741">"કદ દ્વારા"</string>
- <string name="drawer_open" msgid="4545466532430226949">"રૂટ્સ બતાવો"</string>
- <string name="drawer_close" msgid="7602734368552123318">"રૂટ્સ છુપાવો"</string>
- <string name="save_error" msgid="6167009778003223664">"દસ્તાવેજ સાચવવામાં નિષ્ફળ થયાં."</string>
- <string name="create_error" msgid="3735649141335444215">"ફોલ્ડર બનાવવામાં નિષ્ફળ થયા"</string>
- <string name="query_error" msgid="5999895349602476581">"આ પળે સામગ્રી લોડ કરી શકતાં નથી"</string>
- <string name="root_recent" msgid="4470053704320518133">"તાજેતરના"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ખાલી"</string>
- <string name="root_type_service" msgid="2178854894416775409">"સંગ્રહ સેવાઓ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"શોર્ટકટ્સ"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ઉપકરણો"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"વધુ ઍપ્લિકેશનો"</string>
- <string name="empty" msgid="7858882803708117596">"કોઈ આઇટમ્સ નથી"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s માં કોઇ મેળ નથી"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ફાઇલ ખોલી શકતાં નથી"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"કેટલાક દસ્તાવેજો કાઢી નાખવામાં અસમર્થ"</string>
- <string name="share_via" msgid="8966594246261344259">"આના દ્વારા શેર કરો"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ફાઇલો કૉપિ કરી રહ્યાં છે"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ફાઇલો ખસેડી રહ્યાં છે"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ફાઇલને નીકાળી રહ્યાં છે"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> બાકી"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી રહ્યાં છે.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી રહ્યાં છે.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો ખસેડી રહ્યાં છે.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો ખસેડી રહ્યાં છે.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખી રહ્યાં છે.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખી રહ્યાં છે.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"પૂર્વવત્ કરો"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"કૉપિ માટે તૈયારી કરી રહ્યું છે…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"ખસેડવા માટે તૈયાર કરી રહ્યું છે…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"કાઢી નાખવાની તૈયારી કરી રહ્યાં છે…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કૉપિ કરી શક્યાં નથી</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કૉપિ કરી શક્યાં નથી</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ ખસેડી શક્યાં નથી</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ ખસેડી શક્યાં નથી</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખી શક્યાં નથી</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખી શક્યાં નથી</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"વિગતો જોવા માટે ટૅપ કરો"</string>
- <string name="close" msgid="3043722427445528732">"બંધ કરો"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"આ ફાઇલો કૉપિ કરી નહોતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"આ ફાઇલો ખસેડી નહોતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"આ ફાઇલો કાઢી નાખી નહોતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"આ ફાઇલો બીજા ફોર્મેટમાં રૂપાંતરિત કરી હતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">ક્લિપબોર્ડ પર <xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી.</item>
- <item quantity="other">ક્લિપબોર્ડ પર <xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"આ સ્થાનમાં પસંદ કરેલ ફાઇલો પેસ્ટ કરી શકાતી નથી."</string>
- <string name="menu_rename" msgid="7678802479104285353">"નામ બદલો"</string>
- <string name="rename_error" msgid="4203041674883412606">"દસ્તાવેજનું નામ બદલવામાં નિષ્ફળ થયાં"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"કેટલીક ફાઇલો રૂપાંતરિત કરી હતી"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ને <xliff:g id="STORAGE"><i>^3</i></xliff:g> પર <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> નિર્દેશિકાની ઍક્સેસ આપીએ?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ને <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> નિર્દેશિકાની ઍક્સેસ આપીએ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ને <xliff:g id="STORAGE"><i>^2</i></xliff:g> પર ફોટા અને વિડિઓઝ સહિત તમારા ડેટાની અૅક્સેસ આપીએ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"ફરીથી પૂછશો નહીં"</string>
- <string name="allow" msgid="7225948811296386551">"મંજૂરી આપો"</string>
- <string name="deny" msgid="2081879885755434506">"નકારો"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> આઇટમ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> આઇટમ</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ને કાઢી નાખીએ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ફોલ્ડર અને તેની સામગ્રીઓને કાઢી નાખીએ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખીએ?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખીએ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફોલ્ડર અને તેમની સામગ્રીઓ કાઢી નાખીએ?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફોલ્ડર અને તેમની સામગ્રીઓ કાઢી નાખીએ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> આઇટમ કાઢી નાખીએ?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> આઇટમ કાઢી નાખીએ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml
deleted file mode 100644
index 24d796a..0000000
--- a/packages/DocumentsUI/res/values-hi/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"दस्तावेज़"</string>
- <string name="downloads_label" msgid="959113951084633612">"डाउनलोड"</string>
- <string name="title_open" msgid="4353228937663917801">"यहां से खोलें"</string>
- <string name="title_save" msgid="2433679664882857999">"यहां सहेजें"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"नया फ़ोल्डर"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ग्रिड दृश्य"</string>
- <string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string>
- <string name="menu_sort" msgid="7677740407158414452">"इससे क्रमित करें"</string>
- <string name="menu_search" msgid="3816712084502856974">"खोजें"</string>
- <string name="menu_settings" msgid="8239065133341597825">"मेमोरी सेटिंग"</string>
- <string name="menu_open" msgid="432922957274920903">"खोलें"</string>
- <string name="menu_save" msgid="2394743337684426338">"जोड़ें"</string>
- <string name="menu_share" msgid="3075149983979628146">"साझा करें"</string>
- <string name="menu_delete" msgid="8138799623850614177">"हटाएं"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"सभी चुनें"</string>
- <string name="menu_copy" msgid="3612326052677229148">"इनकी कॉपी बनाएं..."</string>
- <string name="menu_move" msgid="1828090633118079817">"इसमें ले जाएं…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"नई विंडो"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"काटें"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"कॉपी करें"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"चिपकाएं"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"आंतरिक मेमोरी दिखाएं"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"आंतरिक मेमोरी छिपाएं"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"फ़ाइल आकार दिखाएं"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"फ़ाइल आकार छिपाएं"</string>
- <string name="button_select" msgid="527196987259139214">"चुनें"</string>
- <string name="button_copy" msgid="8706475544635021302">"कॉपी करें"</string>
- <string name="button_move" msgid="2202666023104202232">"ले जाएं"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ख़ारिज करें"</string>
- <string name="button_retry" msgid="4392027584153752797">"पुनः प्रयास करें"</string>
- <string name="sort_name" msgid="9183560467917256779">"नाम के अनुसार"</string>
- <string name="sort_date" msgid="586080032956151448">"बदलाव के दिनांक के अनुसार"</string>
- <string name="sort_size" msgid="3350681319735474741">"आकार के अनुसार"</string>
- <string name="drawer_open" msgid="4545466532430226949">"रूट दिखाएं"</string>
- <string name="drawer_close" msgid="7602734368552123318">"रूट छिपाएं"</string>
- <string name="save_error" msgid="6167009778003223664">"दस्तावेज़ सहेजने में विफल रहा"</string>
- <string name="create_error" msgid="3735649141335444215">"फ़ोल्डर बनाने में विफल"</string>
- <string name="query_error" msgid="5999895349602476581">"इस समय सामग्री लोड नहीं की जा सकती"</string>
- <string name="root_recent" msgid="4470053704320518133">"हाल ही के"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> खाली"</string>
- <string name="root_type_service" msgid="2178854894416775409">"मेमोरी सेवाएं"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"शॉर्टकट"</string>
- <string name="root_type_device" msgid="7121342474653483538">"डिवाइस"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"अधिक ऐप्स"</string>
- <string name="empty" msgid="7858882803708117596">"कोई आइटम नहीं"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s में कोई मिलान नहीं मिला"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"फ़ाइल नहीं खोली जा सकती"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"कुछ दस्तावेज़ों को हटाने में अक्षम"</string>
- <string name="share_via" msgid="8966594246261344259">"इसके द्वारा साझा करें"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"फ़ाइलें कॉपी हो रही हैं"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"फाइलें ले जाई जा रही हैं"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"फ़ाइलें हटाई जा रही हैं"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> शेष"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें कॉपी की जा रही हैं.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें कॉपी की जा रही हैं.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें ले जाई जा रही हैं.</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें ले जाई जा रही हैं.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाई जा रही हैं.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाई जा रही हैं.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"वापस लाएं"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"कॉपी करने की तैयारी हो रही है…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"ले जाने की तैयारी हो रही है…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"हटाने के लिए तैयार हो रहा है…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलों को कॉपी नहीं किया जा सका</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलों को कॉपी नहीं किया जा सका</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें नहीं ले जाई जा सकीं</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें नहीं ले जाई जा सकीं</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाई नहीं जा सकीं</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाई नहीं जा सकीं</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"विवरणों को देखने के लिए टैप करें"</string>
- <string name="close" msgid="3043722427445528732">"बंद करें"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"इन फ़ाइलों की कॉपी नहीं बनाई गई: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ये फ़ाइलें नहीं ले जाई गईं: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"इन फ़ाइलों को हटाया नहीं गया: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ये फ़ाइलें किसी अन्य प्रारूप में रूपांतरित हो गई थीं: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">क्लिपबोर्ड पर <xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलों की कॉपी बनाई गई.</item>
- <item quantity="other">क्लिपबोर्ड पर <xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलों की कॉपी बनाई गई.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"चयनित फ़ाइलों को इस स्थान में नहीं चिपकाया जा सकता."</string>
- <string name="menu_rename" msgid="7678802479104285353">"नाम बदलें"</string>
- <string name="rename_error" msgid="4203041674883412606">"दस्तावेज़ का नाम बदलना विफल रहा"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"कुछ फ़ाइलें रूपांतरित हो गई थीं"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> को <xliff:g id="STORAGE"><i>^3</i></xliff:g> पर <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिका का एक्सेस दें?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> को <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिका का एक्सेस प्रदान करें?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> को <xliff:g id="STORAGE"><i>^2</i></xliff:g> पर मौजूद फ़ोटो और वीडियो सहित, अपने डेटा का एक्सेस प्रदान करें?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"फिर से ना पूछें"</string>
- <string name="allow" msgid="7225948811296386551">"अनुमति दें"</string>
- <string name="deny" msgid="2081879885755434506">"अस्वीकारें"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> आइटम</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> आइटम</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" को हटाएं?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" फ़ोल्डर और उसकी सामग्रियां हटाएं?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाएं?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाएं?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ोल्डर और उनकी सामग्री हटाएं?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ोल्डर और उनकी सामग्री हटाएं?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> आइटम हटाएं?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> आइटम हटाएं?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml
deleted file mode 100644
index 762a4a3..0000000
--- a/packages/DocumentsUI/res/values-hr/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Preuzimanja"</string>
- <string name="title_open" msgid="4353228937663917801">"Otvori iz"</string>
- <string name="title_save" msgid="2433679664882857999">"Spremi u"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nova mapa"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Prikaz rešetke"</string>
- <string name="menu_list" msgid="7279285939892417279">"Prikaz popisa"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Poredano po"</string>
- <string name="menu_search" msgid="3816712084502856974">"Pretraživanje"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Postavke pohrane"</string>
- <string name="menu_open" msgid="432922957274920903">"Otvaranje"</string>
- <string name="menu_save" msgid="2394743337684426338">"Spremi"</string>
- <string name="menu_share" msgid="3075149983979628146">"Dijeli"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Odaberi sve"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiraj u…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Premjesti u…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Izreži"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Zalijepi"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži internu pohranu"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij internu pohranu"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži veličinu datoteke"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string>
- <string name="button_select" msgid="527196987259139214">"Odaberi"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
- <string name="button_move" msgid="2202666023104202232">"Premjesti"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Odbaci"</string>
- <string name="button_retry" msgid="4392027584153752797">"Pokušaj ponovo"</string>
- <string name="sort_name" msgid="9183560467917256779">"Po nazivu"</string>
- <string name="sort_date" msgid="586080032956151448">"Po datumu izmjene"</string>
- <string name="sort_size" msgid="3350681319735474741">"Po veličini"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Prikaži korijene"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Sakrij korijene"</string>
- <string name="save_error" msgid="6167009778003223664">"Nije uspjelo spremanje dokumenta"</string>
- <string name="create_error" msgid="3735649141335444215">"Izrada mape nije uspjela"</string>
- <string name="query_error" msgid="5999895349602476581">"Sadržaj se trenutačno ne može učitati"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nedavno"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> besplatno"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Usluge pohrane"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Prečaci"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Uređaji"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Više aplikacija"</string>
- <string name="empty" msgid="7858882803708117596">"Nema stavki"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ne sadrži podudaranja"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Datoteka se ne može otvoriti"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nije moguće izbrisati neke dokumente"</string>
- <string name="share_via" msgid="8966594246261344259">"Dijeli putem"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopiranje datoteka"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Premještanje datoteka"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Brisanje datoteka"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Još <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="few">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Premještanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="few">Premještanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">Premještanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="few">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Poništi"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Priprema za kopiranje…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Priprema za premještanje…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Priprema za brisanje…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije kopirana</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nisu kopirane</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije kopirano</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije premještena</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nisu premještene</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije premješteno</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije izbrisana</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nisu izbrisane</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije izbrisano</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Dodirnite da biste vidjeli pojedinosti"</string>
- <string name="close" msgid="3043722427445528732">"Zatvori"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Ove datoteke nisu kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Ove datoteke nisu premještene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Ove datoteke nisu izbrisane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove su datoteke konvertirane u neki drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka kopirana je u međuspremnik.</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke kopirane su u međuspremnik.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteka kopirano je u međuspremnik.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Nije moguće zalijepiti odabrane datoteke na ovu lokaciju."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Promijeni naziv"</string>
- <string name="rename_error" msgid="4203041674883412606">"Naziv dokumenta nije promijenjen"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke su datoteke konvertirane"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobriti pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> na pohrani <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobriti da pristupa direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> dopustiti pristup podacima, uključujući fotografije i videozapise na vanjskoj pohrani (<xliff:g id="STORAGE"><i>^2</i></xliff:g>)?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Više me ne pitaj"</string>
- <string name="allow" msgid="7225948811296386551">"Dopusti"</string>
- <string name="deny" msgid="2081879885755434506">"Odbij"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Odabrano: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="few">Odabrano: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Odabrano: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Želite li izbrisati datoteku \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Želite li izbrisati mapu \"<xliff:g id="NAME">%1$s</xliff:g>\" i njezin sadržaj?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku?</item>
- <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item>
- <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> mapu i njihov sadržaj?</item>
- <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> mape i njihov sadržaj?</item>
- <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> mapa i njihov sadržaj?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavku?</item>
- <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavke?</item>
- <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavki?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml
deleted file mode 100644
index bc5359a..0000000
--- a/packages/DocumentsUI/res/values-hu/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumentumok"</string>
- <string name="downloads_label" msgid="959113951084633612">"Letöltések"</string>
- <string name="title_open" msgid="4353228937663917801">"Megnyitás innen"</string>
- <string name="title_save" msgid="2433679664882857999">"Mentés ide"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Új mappa"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Rács"</string>
- <string name="menu_list" msgid="7279285939892417279">"Lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Rendezés alapja"</string>
- <string name="menu_search" msgid="3816712084502856974">"Keresés"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Tárolóhely beállításai"</string>
- <string name="menu_open" msgid="432922957274920903">"Megnyitás"</string>
- <string name="menu_save" msgid="2394743337684426338">"Mentés"</string>
- <string name="menu_share" msgid="3075149983979628146">"Megosztás"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Törlés"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Összes kijelölése"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Másolás ide…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Áthelyezés…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Új ablak"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Kivágás"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Másolás"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Beillesztés"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Belső tárhely"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Belső tárhely elrejtése"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Fájlméret megjelenítése"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Fájlméret elrejtése"</string>
- <string name="button_select" msgid="527196987259139214">"Kiválasztás"</string>
- <string name="button_copy" msgid="8706475544635021302">"Másolás"</string>
- <string name="button_move" msgid="2202666023104202232">"Áthelyezés"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Elvetés"</string>
- <string name="button_retry" msgid="4392027584153752797">"Újrapróbálkozás"</string>
- <string name="sort_name" msgid="9183560467917256779">"Név szerint"</string>
- <string name="sort_date" msgid="586080032956151448">"Módosítás dátuma szerint"</string>
- <string name="sort_size" msgid="3350681319735474741">"Méret szerint"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Gyökérszint megjelenítése"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Gyökérszint elrejtése"</string>
- <string name="save_error" msgid="6167009778003223664">"Nem sikerült menteni a dokumentumot"</string>
- <string name="create_error" msgid="3735649141335444215">"Nem sikerült létrehozni a mappát"</string>
- <string name="query_error" msgid="5999895349602476581">"Jelenleg nem lehet tartalmat betölteni"</string>
- <string name="root_recent" msgid="4470053704320518133">"Legutóbbiak"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> szabad"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Tárhelyszolgáltatások"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Parancsikonok"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Eszközök"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"További alkalmazások"</string>
- <string name="empty" msgid="7858882803708117596">"Nincsenek elemek"</string>
- <string name="no_results" msgid="6622510343880730446">"Nincs találat itt: %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"A fájlt nem lehet megnyitni"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Néhány dokumentumot nem lehet törölni"</string>
- <string name="share_via" msgid="8966594246261344259">"Megosztás itt:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Fájlok másolása"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Fájlok áthelyezése"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Fájlok törlése"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> van hátra"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fájl másolása.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájl másolása.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fájl áthelyezése.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájl áthelyezése.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fájl törlése.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájl törlése.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Visszavonás"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Felkészülés a másolásra…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Áthelyezés előkészítése…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Törlés előkészítése…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fájlt nem sikerült átmásolni</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájlt nem sikerült átmásolni</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fájlt nem sikerült áthelyezni</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájlt nem sikerült áthelyezni</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fájlt nem sikerült törölni</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fájlt nem sikerült törölni</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Koppintson rá a részletek megtekintéséhez"</string>
- <string name="close" msgid="3043722427445528732">"Bezárás"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"A következő fájlokat nem sikerült átmásolni: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"A következő fájlokat nem sikerült áthelyezni: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"A következő fájlokat nem sikerült törölni: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"A következő fájlokat a rendszer más formátumba konvertálta: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fájl vágólapra másolva.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fájl vágólapra másolva.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"A kijelölt fájlokat nem lehet beilleszteni erre a helyre."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Átnevezés"</string>
- <string name="rename_error" msgid="4203041674883412606">"Nem sikerült átnevezni a dokumentumot"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Egyes fájlokat konvertált a rendszer"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Hozzáférést biztosít a(z) <xliff:g id="APPNAME"><b>^1</b></xliff:g> számára a(z) <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> könyvtárhoz itt: <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Hozzáférést biztosít a(z) <xliff:g id="APPNAME"><b>^1</b></xliff:g> alkalmazásnak a(z) <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> könyvtárhoz?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Hozzáférést biztosít a(z) <xliff:g id="APPNAME"><b>^1</b></xliff:g> számára az Ön adataihoz, beleértve a következő tárhelyen található képekhez és videókhoz: <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ne jelenjen meg többé"</string>
- <string name="allow" msgid="7225948811296386551">"Engedélyezés"</string>
- <string name="deny" msgid="2081879885755434506">"Elutasítás"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> kiválasztva</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kiválasztva</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elem</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elem</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Törli a következőt: „<xliff:g id="NAME">%1$s</xliff:g>”?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Törli „<xliff:g id="NAME">%1$s</xliff:g>” mappát a tartalmával együtt?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Töröl <xliff:g id="COUNT_1">%1$d</xliff:g> fájlt?</item>
- <item quantity="one">Töröl <xliff:g id="COUNT_0">%1$d</xliff:g> fájlt?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Töröl <xliff:g id="COUNT_1">%1$d</xliff:g> mappát a tartalmukkal együtt?</item>
- <item quantity="one">Töröl <xliff:g id="COUNT_0">%1$d</xliff:g> mappát a tartalmával együtt?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Töröl <xliff:g id="COUNT_1">%1$d</xliff:g> elemet?</item>
- <item quantity="one">Töröl <xliff:g id="COUNT_0">%1$d</xliff:g> elemet?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
deleted file mode 100644
index 1e74ec2..0000000
--- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Փաստաթղթեր"</string>
- <string name="downloads_label" msgid="959113951084633612">"Ներբեռնումներ"</string>
- <string name="title_open" msgid="4353228937663917801">"Բացել այստեղից"</string>
- <string name="title_save" msgid="2433679664882857999">"Պահել այստեղ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Նոր պանակ"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Ցանցի տեսքով"</string>
- <string name="menu_list" msgid="7279285939892417279">"Ցուցակի տեսք"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Դասավորել ըստ"</string>
- <string name="menu_search" msgid="3816712084502856974">"Որոնել"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Հիշասարքի կարգավորումներ"</string>
- <string name="menu_open" msgid="432922957274920903">"Բացել"</string>
- <string name="menu_save" msgid="2394743337684426338">"Պահել"</string>
- <string name="menu_share" msgid="3075149983979628146">"Կիսվել"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Ջնջել"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Ընտրել բոլորը"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Պատճենել…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Տեղափոխել…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Նոր պատուհան"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Կտրել"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Պատճենել"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Տեղադրել"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Ցույց տալ ներքին պահոցը"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Թաքցնել ներքին պահոցը"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Ցույց տալ ֆայլի չափը"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Թաքցնել ֆայլի չափը"</string>
- <string name="button_select" msgid="527196987259139214">"Ընտրել"</string>
- <string name="button_copy" msgid="8706475544635021302">"Պատճենել"</string>
- <string name="button_move" msgid="2202666023104202232">"Տեղափոխել"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Փակել"</string>
- <string name="button_retry" msgid="4392027584153752797">"Փորձել նորից"</string>
- <string name="sort_name" msgid="9183560467917256779">"Ըստ անվան"</string>
- <string name="sort_date" msgid="586080032956151448">"Ըստ փոփոխման ամսաթվի"</string>
- <string name="sort_size" msgid="3350681319735474741">"Ըստ չափի"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Ցույց տալ արմատները"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Թաքցնել արմատները"</string>
- <string name="save_error" msgid="6167009778003223664">"Չհաջողվեց պահել փաստաթուղթը"</string>
- <string name="create_error" msgid="3735649141335444215">"Չհաջողվեց ստեղծել պանակը"</string>
- <string name="query_error" msgid="5999895349602476581">"Այս պահին հնարավոր չէ բեռնել բովանդակությունը"</string>
- <string name="root_recent" msgid="4470053704320518133">"Վերջին"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ազատ է"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Պահուստի ծառայություններ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Դյուրանցումներ"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Սարքեր"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Հավելյալ ծրագրեր"</string>
- <string name="empty" msgid="7858882803708117596">"Ոչինչ չկա"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s-ում համընկնումներ չկան"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Հնարավոր չէ բացել ֆայլը"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Անհնար է ջնջել որոշ փաստաթղթեր"</string>
- <string name="share_via" msgid="8966594246261344259">"Կիսվել"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Ֆայլերի պատճենում"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Ֆայլերի տեղափոխում"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Ֆայլերը ջնջվում են"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Մնացել է <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլի պատճենում:</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլի պատճենում:</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլի տեղափոխում:</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլի տեղափոխում:</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլի ջնջում:</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլի ջնջում:</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Հետարկել"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Պատճենման նախապատրաստում…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Տեղափոխման նախապատրաստում…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Պատրաստվում է ջնջել…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Չհաջողվեց պատճենել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
- <item quantity="other">Չհաջողվեց պատճենել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Չհաջողվեց տեղափոխել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
- <item quantity="other">Չհաջողվեց տեղափոխել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Չհաջողվեց ջնջել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
- <item quantity="other">Չհաջողվեց ջնջել <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Հպեք՝ մանրամասները դիտելու համար"</string>
- <string name="close" msgid="3043722427445528732">"Փակել"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Հետևյալ ֆայլերը չեն պատճենվել՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Հետևյալ ֆայլերը չեն տեղափոխվել՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Հետևյալ ֆայլերը չեն ջնջվել՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Այս ֆայլերը փոխարկվել են մեկ այլ ձևաչափի՝ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ պատճենվեց սեղմատախտակին:</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ պատճենվեց սեղմատախտակին:</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Հնարավոր չէ տեղադրել ընտրված ֆայլերը այս տեղադրությունում:"</string>
- <string name="menu_rename" msgid="7678802479104285353">"Վերանվանել"</string>
- <string name="rename_error" msgid="4203041674883412606">"Չհաջողվեց վերանվանել փաստաթուղթը"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Որոշ ֆայլեր փոխարկվել են"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> հավելվածին տրամադրե՞լ <xliff:g id="STORAGE"><i>^3</i></xliff:g>-ի <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> գրացուցակն օգտագործելու թույլտվություն:"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> հավելվածին տրամադրե՞լ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> գրացուցակն օգտագործելու թույլտվություն:"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> հավելվածին տրամադրե՞լ <xliff:g id="STORAGE"><i>^2</i></xliff:g>-ում պահվող ձեր տվյալները, այդ թվում նաև լուսանկարները և տեսանյութերը, օգտագործելու թույլտվություն:"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Այլևս չհարցնել"</string>
- <string name="allow" msgid="7225948811296386551">"Թույլատրել"</string>
- <string name="deny" msgid="2081879885755434506">"Մերժել"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> տարր</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> տարր</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ջնջե՞լ «<xliff:g id="NAME">%1$s</xliff:g>» ֆայլը:"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ջնջե՞լ «<xliff:g id="NAME">%1$s</xliff:g>» պանակը՝ բովանդակության հետ մեկտեղ:"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ:</item>
- <item quantity="other">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ:</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> պանակ՝ բովանդակության հետ մեկտեղ:</item>
- <item quantity="other">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> պանակ՝ բովանդակության հետ մեկտեղ:</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> տարր:</item>
- <item quantity="other">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> տարր:</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml
deleted file mode 100644
index f5103ae..0000000
--- a/packages/DocumentsUI/res/values-in/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumen"</string>
- <string name="downloads_label" msgid="959113951084633612">"Unduhan"</string>
- <string name="title_open" msgid="4353228937663917801">"Buka dari"</string>
- <string name="title_save" msgid="2433679664882857999">"Simpan ke"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Folder baru"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Tampilan kisi"</string>
- <string name="menu_list" msgid="7279285939892417279">"Tampilan daftar"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Urutkan menurut"</string>
- <string name="menu_search" msgid="3816712084502856974">"Telusuri"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Setelan penyimpanan"</string>
- <string name="menu_open" msgid="432922957274920903">"Buka"</string>
- <string name="menu_save" msgid="2394743337684426338">"Simpan"</string>
- <string name="menu_share" msgid="3075149983979628146">"Bagikan"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Hapus"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Pilih semua"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Salin ke…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Pindahkan ke..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Jendela baru"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Potong"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Salin"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Tempel"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Tampilkan simpanan internal"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Sembunyikan simpanan internal"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Tampilkan ukuran file"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan ukuran file"</string>
- <string name="button_select" msgid="527196987259139214">"Pilih"</string>
- <string name="button_copy" msgid="8706475544635021302">"Salin"</string>
- <string name="button_move" msgid="2202666023104202232">"Pindahkan"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Tutup"</string>
- <string name="button_retry" msgid="4392027584153752797">"Coba Lagi"</string>
- <string name="sort_name" msgid="9183560467917256779">"Menurut nama"</string>
- <string name="sort_date" msgid="586080032956151448">"Menurut tanggal diubah"</string>
- <string name="sort_size" msgid="3350681319735474741">"Menurut ukuran"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Tampilkan akar"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Sembunyikan akar"</string>
- <string name="save_error" msgid="6167009778003223664">"Gagal menyimpan dokumen"</string>
- <string name="create_error" msgid="3735649141335444215">"Gagal membuat folder"</string>
- <string name="query_error" msgid="5999895349602476581">"Saat ini tidak dapat memuat konten"</string>
- <string name="root_recent" msgid="4470053704320518133">"Terkini"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> kosong"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Layanan penyimpanan"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Pintasan"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Perangkat"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Aplikasi lain"</string>
- <string name="empty" msgid="7858882803708117596">"Tidak ada item"</string>
- <string name="no_results" msgid="6622510343880730446">"Tidak ada kecocokan dalam %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Tidak dapat membuka file"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Tidak dapat menghapus beberapa dokumen"</string>
- <string name="share_via" msgid="8966594246261344259">"Bagikan melalui"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Menyalin file"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Memindahkan file"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Menghapus file"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> lagi"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Menyalin <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="one">Menyalin <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Memindahkan <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="one">Memindahkan <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Menghapus <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="one">Menghapus <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Urungkan"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Menyiapkan salinan..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Menyiapkan pemindahan…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Bersiap menghapus…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Tidak dapat menyalin <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="one">Tidak dapat menyalin <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Tidak dapat memindahkan <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="one">Tidak dapat memindahkan <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Tidak dapat menghapus <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="one">Tidak dapat menghapus <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Ketuk untuk melihat detail"</string>
- <string name="close" msgid="3043722427445528732">"Tutup"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Semua file ini tidak disalin: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Semua file ini tidak dipindahkan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Semua file ini tidak dihapus: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"File ini dikonversi ke format lain: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> file disalin ke papan klip.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> file disalin ke papan klip.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Tidak dapat menempel file yang dipilih di lokasi ini."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Ganti nama"</string>
- <string name="rename_error" msgid="4203041674883412606">"Gagal mengganti nama dokumen"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Beberapa file dikonversi"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses ke direktori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> di <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses ke direktori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses ke data Anda, termasuk foto dan video, di <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Jangan tanya lagi"</string>
- <string name="allow" msgid="7225948811296386551">"Izinkan"</string>
- <string name="deny" msgid="2081879885755434506">"Tolak"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> item</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Hapus \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Hapus folder \"<xliff:g id="NAME">%1$s</xliff:g>\" dan kontennya?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Hapus <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item>
- <item quantity="one">Hapus <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Hapus <xliff:g id="COUNT_1">%1$d</xliff:g> folder dan kontennya?</item>
- <item quantity="one">Hapus <xliff:g id="COUNT_0">%1$d</xliff:g> folder dan kontennya?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Hapus <xliff:g id="COUNT_1">%1$d</xliff:g> item?</item>
- <item quantity="one">Hapus <xliff:g id="COUNT_0">%1$d</xliff:g> item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml
deleted file mode 100644
index 9744e2c..0000000
--- a/packages/DocumentsUI/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Skjöl"</string>
- <string name="downloads_label" msgid="959113951084633612">"Niðurhal"</string>
- <string name="title_open" msgid="4353228937663917801">"Opna frá"</string>
- <string name="title_save" msgid="2433679664882857999">"Vista í"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Ný mappa"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Töfluyfirlit"</string>
- <string name="menu_list" msgid="7279285939892417279">"Listayfirlit"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Raða eftir"</string>
- <string name="menu_search" msgid="3816712084502856974">"Leita"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Geymslustillingar"</string>
- <string name="menu_open" msgid="432922957274920903">"Opna"</string>
- <string name="menu_save" msgid="2394743337684426338">"Vista"</string>
- <string name="menu_share" msgid="3075149983979628146">"Deila"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Eyða"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Velja allt"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Afrita í ..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Færa í…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nýr gluggi"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Klippa"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Afrita"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Líma"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Sýna innbyggða geymslu"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Fela innbyggða geymslu"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Sýna skráarstærð"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Fela skráarstærð"</string>
- <string name="button_select" msgid="527196987259139214">"Velja"</string>
- <string name="button_copy" msgid="8706475544635021302">"Afrita"</string>
- <string name="button_move" msgid="2202666023104202232">"Færa"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Hunsa"</string>
- <string name="button_retry" msgid="4392027584153752797">"Reyna aftur"</string>
- <string name="sort_name" msgid="9183560467917256779">"Eftir heiti"</string>
- <string name="sort_date" msgid="586080032956151448">"Eftir breytingadags."</string>
- <string name="sort_size" msgid="3350681319735474741">"Eftir stærð"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Sýna rótarsöfn"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Fela rótarsöfn"</string>
- <string name="save_error" msgid="6167009778003223664">"Mistókst að vista skjalið"</string>
- <string name="create_error" msgid="3735649141335444215">"Mistókst að búa til möppu"</string>
- <string name="query_error" msgid="5999895349602476581">"Ekki hægt að hlaða efni í augnablikinu"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nýlegt"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> laus"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Geymsluþjónusta"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Flýtileiðir"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Tæki"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Fleiri forrit"</string>
- <string name="empty" msgid="7858882803708117596">"Engin atriði"</string>
- <string name="no_results" msgid="6622510343880730446">"Engar samsvarandi niðurstöður í %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Ekki hægt að opna skrá"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Ekki er hægt að eyða einhverjum skjölum"</string>
- <string name="share_via" msgid="8966594246261344259">"Deila í gegnum"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Afritar skrár"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Skrár færðar"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Eyðir skrám"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> eftir"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Afritar <xliff:g id="COUNT_1">%1$d</xliff:g> skrá.</item>
- <item quantity="other">Afritar <xliff:g id="COUNT_1">%1$d</xliff:g> skrár.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Færir <xliff:g id="COUNT_1">%1$d</xliff:g> skrá.</item>
- <item quantity="other">Færir <xliff:g id="COUNT_1">%1$d</xliff:g> skrár.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Eyðir <xliff:g id="COUNT_1">%1$d</xliff:g> skrá.</item>
- <item quantity="other">Eyðir <xliff:g id="COUNT_1">%1$d</xliff:g> skrám.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Afturkalla"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Undirbúningur fyrir afritun…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Flutningur undirbúinn…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Býr sig undir að eyða…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Ekki tókst að afrita <xliff:g id="COUNT_1">%1$d</xliff:g> skrá</item>
- <item quantity="other">Ekki tókst að afrita <xliff:g id="COUNT_1">%1$d</xliff:g> skrár</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Ekki tókst að færa <xliff:g id="COUNT_1">%1$d</xliff:g> skrá</item>
- <item quantity="other">Ekki tókst að færa <xliff:g id="COUNT_1">%1$d</xliff:g> skrár</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Ekki tókst að eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrá</item>
- <item quantity="other">Ekki tókst að eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrám</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Ýttu til að skoða frekari upplýsingar"</string>
- <string name="close" msgid="3043722427445528732">"Loka"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Þessar skrár voru ekki afritaðar: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Þessar skrár voru ekki færðar: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Þessum skrám var ekki eytt: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Þessum skrám var umbreytt yfir á annað snið: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> skrá afrituð á klippiborð.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> skrár afritaðar á klippiborð.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Ekki er hægt að vista valdar skrár á þessum stað."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Endurnefna"</string>
- <string name="rename_error" msgid="4203041674883412606">"Ekki tókst að endurnefna skjalið"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sumum skrám var umbreytt"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Veita <xliff:g id="APPNAME"><b>^1</b></xliff:g> aðgang að skráasafninu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> á <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Viltu veita <xliff:g id="APPNAME"><b>^1</b></xliff:g> aðgang að skráasafninu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Veita <xliff:g id="APPNAME"><b>^1</b></xliff:g> aðgang að gögnunum þínum, þar á meðal myndum og myndskeiðum, á <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ekki spyrja aftur"</string>
- <string name="allow" msgid="7225948811296386551">"Leyfa"</string>
- <string name="deny" msgid="2081879885755434506">"Hafna"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> valið</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valin</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> atriði</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> atriði</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Eyða „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Eyða möppunni „<xliff:g id="NAME">%1$s</xliff:g>“ og öllu innihaldi hennar?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrá?</item>
- <item quantity="other">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrám?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> möppu og innihaldi þeirra?</item>
- <item quantity="other">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> möppum og innihaldi þeirra?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> atriði?</item>
- <item quantity="other">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> atriðum?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml
deleted file mode 100644
index eb384d4..0000000
--- a/packages/DocumentsUI/res/values-it/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Download"</string>
- <string name="title_open" msgid="4353228937663917801">"Apri da"</string>
- <string name="title_save" msgid="2433679664882857999">"Salva in"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nuova cartella"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Visualizzazione griglia"</string>
- <string name="menu_list" msgid="7279285939892417279">"Visualizzazione elenco"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordina per"</string>
- <string name="menu_search" msgid="3816712084502856974">"Cerca"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Impostazioni memoria"</string>
- <string name="menu_open" msgid="432922957274920903">"Apri"</string>
- <string name="menu_save" msgid="2394743337684426338">"Salva"</string>
- <string name="menu_share" msgid="3075149983979628146">"Condividi"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Elimina"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Seleziona tutto"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copia in…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Sposta in..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nuova finestra"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Taglia"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copia"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Incolla"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostra memoria interna"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Nascondi memoria interna"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostra dimensioni file"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Nascondi dimensioni file"</string>
- <string name="button_select" msgid="527196987259139214">"Seleziona"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copia"</string>
- <string name="button_move" msgid="2202666023104202232">"Sposta"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Ignora"</string>
- <string name="button_retry" msgid="4392027584153752797">"Riprova"</string>
- <string name="sort_name" msgid="9183560467917256779">"Per nome"</string>
- <string name="sort_date" msgid="586080032956151448">"Per data di modifica"</string>
- <string name="sort_size" msgid="3350681319735474741">"Per dimensioni"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostra nodi principali"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Nascondi nodi principali"</string>
- <string name="save_error" msgid="6167009778003223664">"Impossibile salvare il documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Impossibile creare la cartella"</string>
- <string name="query_error" msgid="5999895349602476581">"Impossibile caricare i contenuti al momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recenti"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> liberi"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Servizi di archiviazione"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Scorciatoie"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivi"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Altre app"</string>
- <string name="empty" msgid="7858882803708117596">"Nessun elemento"</string>
- <string name="no_results" msgid="6622510343880730446">"Nessuna corrispondenza in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Impossibile aprire il file"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Impossibile eliminare alcuni documenti"</string>
- <string name="share_via" msgid="8966594246261344259">"Condividi via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copia di file in corso"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Spostamento di file"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Eliminazione dei file"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> rimanenti"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Copia di <xliff:g id="COUNT_1">%1$d</xliff:g> file in corso.</item>
- <item quantity="one">Copia di <xliff:g id="COUNT_0">%1$d</xliff:g> file in corso.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Spostamento di <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="one">Spostamento di <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Eliminazione di <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="one">Eliminazione di <xliff:g id="COUNT_0">%1$d</xliff:g> file.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Annulla"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparazione alla copia…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparazione dello spostamento…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparazione eliminazione…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Impossibile copiare <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="one">Impossibile copiare <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Impossibile spostare <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="one">Impossibile spostare <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Impossibile eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="one">Impossibile eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tocca per vedere i dettagli"</string>
- <string name="close" msgid="3043722427445528732">"Chiudi"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"I seguenti file non sono stati copiati: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"I seguenti file non sono stati spostati: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"I seguenti file non sono stati eliminati: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"I file sono stati convertiti in un altro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> file copiati negli appunti.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> file copiato negli appunti.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Impossibile incollare i file selezionati in questa posizione."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Rinomina"</string>
- <string name="rename_error" msgid="4203041674883412606">"Ridenominazione documento non riuscita"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alcuni file sono stati convertiti"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> su <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso ai tuoi dati, inclusi video e foto, sull\'unità <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Non chiedermelo più"</string>
- <string name="allow" msgid="7225948811296386551">"Consenti"</string>
- <string name="deny" msgid="2081879885755434506">"Nega"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> file selezionati</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> file selezionato</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Eliminare \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Eliminare la cartella \"<xliff:g id="NAME">%1$s</xliff:g>\" e i relativi contenuti?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item>
- <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> cartelle e i relativi contenuti?</item>
- <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> cartella e i relativi contenuti?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> elementi?</item>
- <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> elemento?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml
deleted file mode 100644
index 0ae158d..0000000
--- a/packages/DocumentsUI/res/values-iw/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"מסמכים"</string>
- <string name="downloads_label" msgid="959113951084633612">"הורדות"</string>
- <string name="title_open" msgid="4353228937663917801">"פתח מ-"</string>
- <string name="title_save" msgid="2433679664882857999">"שמור ב-"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"תיקייה חדשה"</string>
- <string name="menu_grid" msgid="6878021334497835259">"תצוגת רשת"</string>
- <string name="menu_list" msgid="7279285939892417279">"תצוגת רשימה"</string>
- <string name="menu_sort" msgid="7677740407158414452">"מיין לפי"</string>
- <string name="menu_search" msgid="3816712084502856974">"חפש"</string>
- <string name="menu_settings" msgid="8239065133341597825">"הגדרות אחסון"</string>
- <string name="menu_open" msgid="432922957274920903">"פתח"</string>
- <string name="menu_save" msgid="2394743337684426338">"שמור"</string>
- <string name="menu_share" msgid="3075149983979628146">"שתף"</string>
- <string name="menu_delete" msgid="8138799623850614177">"מחק"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"בחר הכל"</string>
- <string name="menu_copy" msgid="3612326052677229148">"העתק אל…"</string>
- <string name="menu_move" msgid="1828090633118079817">"העבר אל…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"חלון חדש"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"גזור"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"העתק"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"הדבק"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"הצג אחסון פנימי"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"הסתר אחסון פנימי"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"הצג גודל קובץ"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"הסתר גודל קובץ"</string>
- <string name="button_select" msgid="527196987259139214">"בחר"</string>
- <string name="button_copy" msgid="8706475544635021302">"העתק"</string>
- <string name="button_move" msgid="2202666023104202232">"העבר"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"הסר"</string>
- <string name="button_retry" msgid="4392027584153752797">"נסה שוב"</string>
- <string name="sort_name" msgid="9183560467917256779">"לפי שם"</string>
- <string name="sort_date" msgid="586080032956151448">"לפי תאריך שינוי"</string>
- <string name="sort_size" msgid="3350681319735474741">"לפי גודל"</string>
- <string name="drawer_open" msgid="4545466532430226949">"הצג שורשים"</string>
- <string name="drawer_close" msgid="7602734368552123318">"הסתר שורשים"</string>
- <string name="save_error" msgid="6167009778003223664">"שמירת המסמך נכשלה"</string>
- <string name="create_error" msgid="3735649141335444215">"יצירת התיקיה נכשלה"</string>
- <string name="query_error" msgid="5999895349602476581">"לא ניתן כרגע לטעון תוכן"</string>
- <string name="root_recent" msgid="4470053704320518133">"מהזמן האחרון"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> של שטח פנוי"</string>
- <string name="root_type_service" msgid="2178854894416775409">"שירותי אחסון"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"קיצורי דרך"</string>
- <string name="root_type_device" msgid="7121342474653483538">"מכשירים"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"עוד אפליקציות"</string>
- <string name="empty" msgid="7858882803708117596">"אין פריטים"</string>
- <string name="no_results" msgid="6622510343880730446">"אין התאמות ב-%1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"לא ניתן לפתוח את הקובץ"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"לא ניתן למחוק חלק מהמסמכים"</string>
- <string name="share_via" msgid="8966594246261344259">"שתף באמצעות"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"מעתיק קבצים"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"מעביר קבצים"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"מחיקת קבצים מתבצעת"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"זמן נותר: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="two">מעתיק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="many">מעתיק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="other">מעתיק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="one">מעתיק קובץ <xliff:g id="COUNT_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="two">מעביר <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="many">מעביר <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="other">מעביר <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="one">מעביר קובץ <xliff:g id="COUNT_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="two">מוחק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="many">מוחק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="other">מוחק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים.</item>
- <item quantity="one"> מוחק קובץ <xliff:g id="COUNT_0">%1$d</xliff:g>.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"בטל"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"מתכונן להעתקה..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"מתכונן להעברה…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"מתכונן למחיקה…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="two">לא ניתן היה להעתיק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="many">לא ניתן היה להעתיק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="other">לא ניתן היה להעתיק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="one">לא ניתן היה להעתיק <xliff:g id="COUNT_0">%1$d</xliff:g> קובץ</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="two">לא ניתן היה להעביר <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="many">לא ניתן היה להעביר <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="other">לא ניתן היה להעביר <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="one">לא ניתן היה להעביר <xliff:g id="COUNT_0">%1$d</xliff:g> קובץ</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="two">לא ניתן היה למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="many">לא ניתן היה למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="other">לא ניתן היה למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים</item>
- <item quantity="one">לא ניתן היה למחוק <xliff:g id="COUNT_0">%1$d</xliff:g> קובץ</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"הקש כדי להציג פרטים"</string>
- <string name="close" msgid="3043722427445528732">"סגור"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"הקבצים הבאים לא הועתקו: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"הקבצים הבאים לא הועברו: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"הקבצים הבאים לא נמחקו: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"הקבצים האלה הומרו לפורמט אחר: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> קבצים הועתקו אל הלוח.</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> קבצים הועתקו אל הלוח.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> קבצים הועתקו אל הלוח.</item>
- <item quantity="one">קובץ <xliff:g id="COUNT_0">%1$d</xliff:g> הועתק אל הלוח.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"לא ניתן להדביק את הקבצים הנבחרים במיקום הזה."</string>
- <string name="menu_rename" msgid="7678802479104285353">"שנה שם"</string>
- <string name="rename_error" msgid="4203041674883412606">"ניסיון שינוי שם המסמך נכשל"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"קבצים מסוימים הומרו"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"האם להעניק לאפליקציה <xliff:g id="APPNAME"><b>^1</b></xliff:g> גישה לספריה <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> באחסון <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"האם להעניק לאפליקציה <xliff:g id="APPNAME"><b>^1</b></xliff:g> גישה אל ספריית <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"האם להעניק לאפליקציה <xliff:g id="APPNAME"><b>^1</b></xliff:g> גישה לנתונים שלך, כולל תמונות וסרטונים, השמורים ב<xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"אל תשאל שוב"</string>
- <string name="allow" msgid="7225948811296386551">"אפשר"</string>
- <string name="deny" msgid="2081879885755434506">"דחה"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> נבחרו</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> נבחרו</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> נבחרו</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> נבחר</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> פריטים</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> פריטים</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> פריטים</item>
- <item quantity="one">פריט <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"האם למחוק את \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"האם למחוק את התיקייה \"<xliff:g id="NAME">%1$s</xliff:g>\" ואת התוכן שלה?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="two">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים?</item>
- <item quantity="many">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים?</item>
- <item quantity="other">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים?</item>
- <item quantity="one">האם למחוק <xliff:g id="COUNT_0">%1$d</xliff:g> קובץ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="two">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> תיקיות ואת התוכן שלהן?</item>
- <item quantity="many">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> תיקיות ואת התוכן שלהן?</item>
- <item quantity="other">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> תיקיות ואת התוכן שלהן?</item>
- <item quantity="one">האם למחוק <xliff:g id="COUNT_0">%1$d</xliff:g> תיקייה ואת התוכן שלה?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="two">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> פריטים?</item>
- <item quantity="many">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> פריטים?</item>
- <item quantity="other">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> פריטים?</item>
- <item quantity="one">האם למחוק <xliff:g id="COUNT_0">%1$d</xliff:g> פריט?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml
deleted file mode 100644
index 141dc5d6..0000000
--- a/packages/DocumentsUI/res/values-ja/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ドキュメント"</string>
- <string name="downloads_label" msgid="959113951084633612">"ダウンロード"</string>
- <string name="title_open" msgid="4353228937663917801">"次から開く:"</string>
- <string name="title_save" msgid="2433679664882857999">"次に保存:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"新しいフォルダ"</string>
- <string name="menu_grid" msgid="6878021334497835259">"グリッド表示"</string>
- <string name="menu_list" msgid="7279285939892417279">"リスト表示"</string>
- <string name="menu_sort" msgid="7677740407158414452">"並べ替え"</string>
- <string name="menu_search" msgid="3816712084502856974">"検索"</string>
- <string name="menu_settings" msgid="8239065133341597825">"ストレージの設定"</string>
- <string name="menu_open" msgid="432922957274920903">"開く"</string>
- <string name="menu_save" msgid="2394743337684426338">"保存"</string>
- <string name="menu_share" msgid="3075149983979628146">"共有"</string>
- <string name="menu_delete" msgid="8138799623850614177">"削除"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"すべて選択"</string>
- <string name="menu_copy" msgid="3612326052677229148">"コピー…"</string>
- <string name="menu_move" msgid="1828090633118079817">"移動..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"新しいウィンドウ"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"切り取り"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"コピー"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"貼り付け"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"内部ストレージを表示"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"内部ストレージを非表示"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ファイルサイズを表示"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ファイルサイズを非表示"</string>
- <string name="button_select" msgid="527196987259139214">"選択"</string>
- <string name="button_copy" msgid="8706475544635021302">"コピー"</string>
- <string name="button_move" msgid="2202666023104202232">"移動"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"表示しない"</string>
- <string name="button_retry" msgid="4392027584153752797">"再試行"</string>
- <string name="sort_name" msgid="9183560467917256779">"名前順"</string>
- <string name="sort_date" msgid="586080032956151448">"更新日順"</string>
- <string name="sort_size" msgid="3350681319735474741">"サイズ順"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ルートを表示する"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ルートを非表示にする"</string>
- <string name="save_error" msgid="6167009778003223664">"ドキュメントを保存できませんでした"</string>
- <string name="create_error" msgid="3735649141335444215">"フォルダを作成できませんでした"</string>
- <string name="query_error" msgid="5999895349602476581">"現在、コンテンツを読み込むことができません"</string>
- <string name="root_recent" msgid="4470053704320518133">"最近"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"空き容量: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"ストレージサービス"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"ショートカット"</string>
- <string name="root_type_device" msgid="7121342474653483538">"端末"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"その他のアプリ"</string>
- <string name="empty" msgid="7858882803708117596">"アイテムがありません"</string>
- <string name="no_results" msgid="6622510343880730446">"該当するものは %1$s にありません"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ファイルを開けません"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"一部のドキュメントを削除できません"</string>
- <string name="share_via" msgid="8966594246261344259">"共有ツール"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ファイルのコピー中"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ファイルを移動中"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ファイルを削除しています"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"残り<xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>個のファイルをコピーしています。</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>個のファイルをコピーしています。</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>個のファイルを移動しています。</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>個のファイルを移動しています。</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>件のファイルを削除しています。</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>件のファイルを削除しています。</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"元に戻す"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"コピーの準備をしています…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"移動の準備をしています…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"削除の準備をしています…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のファイルをコピーできませんでした</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のファイルをコピーできませんでした</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のファイルを移動できませんでした</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のファイルを移動できませんでした</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のファイルを削除できませんでした</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のファイルを削除できませんでした</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"タップすると詳細が表示されます"</string>
- <string name="close" msgid="3043722427445528732">"閉じる"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"次のファイルをコピーできませんでした: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"次のファイルを移動できませんでした: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"次のファイルを削除できませんでした: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"次のファイルが別の形式に変換されました: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>件のファイルをクリップボードにコピーしました。</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>件のファイルをクリップボードにコピーしました。</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"選択したファイルをこの場所に貼り付けることはできません。"</string>
- <string name="menu_rename" msgid="7678802479104285353">"名前を変更"</string>
- <string name="rename_error" msgid="4203041674883412606">"ドキュメントの名前を変更できませんでした"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"一部のファイルが変換されました"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"「<xliff:g id="STORAGE"><i>^3</i></xliff:g>」の「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」ディレクトリに「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」へのアクセスを許可しますか？"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」アプリに「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」ディレクトリへのアクセスを許可しますか？"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>の写真や動画などのデータへのアクセスを「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」に許可しますか？"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"今後表示しない"</string>
- <string name="allow" msgid="7225948811296386551">"許可"</string>
- <string name="deny" msgid="2081879885755434506">"拒否"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個を選択中</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個を選択中</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のアイテム</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のアイテム</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"「<xliff:g id="NAME">%1$s</xliff:g>」を削除しますか？"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"フォルダ「<xliff:g id="NAME">%1$s</xliff:g>」とそのコンテンツを削除しますか？"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のファイルを削除しますか？</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のファイルを削除しますか？</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のフォルダとそのコンテンツを削除しますか？</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のフォルダとそのコンテンツを削除しますか？</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個の項目を削除しますか？</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個の項目を削除しますか？</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
deleted file mode 100644
index c5c6e97..0000000
--- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"დოკუმენტები"</string>
- <string name="downloads_label" msgid="959113951084633612">"ჩამოტვირთვები"</string>
- <string name="title_open" msgid="4353228937663917801">"გახსნა აქედან:"</string>
- <string name="title_save" msgid="2433679664882857999">"შენახვა აქ:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"ახალი საქაღალდე"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ბადის ხედი"</string>
- <string name="menu_list" msgid="7279285939892417279">"სიის ხედი"</string>
- <string name="menu_sort" msgid="7677740407158414452">"სორტირება:"</string>
- <string name="menu_search" msgid="3816712084502856974">"ძიება"</string>
- <string name="menu_settings" msgid="8239065133341597825">"საცავის პარამეტრები"</string>
- <string name="menu_open" msgid="432922957274920903">"გახსნა"</string>
- <string name="menu_save" msgid="2394743337684426338">"შენახვა"</string>
- <string name="menu_share" msgid="3075149983979628146">"გაზიარება"</string>
- <string name="menu_delete" msgid="8138799623850614177">"წაშლა"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"ყველას არჩევა"</string>
- <string name="menu_copy" msgid="3612326052677229148">"კოპირება…"</string>
- <string name="menu_move" msgid="1828090633118079817">"გადაადგილება..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"ახალი ფანჯარა"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ამოჭრა"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"კოპირება"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ჩასმა"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"შიდა საცავის ჩვენება"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"შიდა მეხსიერების დამალვა"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ფაილის ზომის ჩვენება"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ფაილის ზომის დამალვა"</string>
- <string name="button_select" msgid="527196987259139214">"არჩევა"</string>
- <string name="button_copy" msgid="8706475544635021302">"კოპირება"</string>
- <string name="button_move" msgid="2202666023104202232">"გადაადგილება"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"დახურვა"</string>
- <string name="button_retry" msgid="4392027584153752797">"ისევ ცდა"</string>
- <string name="sort_name" msgid="9183560467917256779">"სახელით"</string>
- <string name="sort_date" msgid="586080032956151448">"ცვლილების თარიღით"</string>
- <string name="sort_size" msgid="3350681319735474741">"ზომით"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ფესვების ჩვენება"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ფესვების დამალვა"</string>
- <string name="save_error" msgid="6167009778003223664">"დოკუმენტის შენახვა ვერ მოხერხდა"</string>
- <string name="create_error" msgid="3735649141335444215">"საქაღალდის შექმნა ვერ მოხერხდა"</string>
- <string name="query_error" msgid="5999895349602476581">"კონტენტის ჩატვირთვა ამჟამად ვერ ხერხდება"</string>
- <string name="root_recent" msgid="4470053704320518133">"ბოლო"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> თავისუფალია"</string>
- <string name="root_type_service" msgid="2178854894416775409">"მეხსიერების სერვისები"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"მალსახმობები"</string>
- <string name="root_type_device" msgid="7121342474653483538">"მოწყობილობები"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"მეტი აპები"</string>
- <string name="empty" msgid="7858882803708117596">"ერთეულები არ არის"</string>
- <string name="no_results" msgid="6622510343880730446">"„%1$s“-ში დამთხვევა ვერ მოიძებნა"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ფაილის გახსნა ვერ ხერხდება"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"ზოგიერთი დოკუმენტის წაშლა ვერ ხერხდება"</string>
- <string name="share_via" msgid="8966594246261344259">"გაზიარება:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"მიმდ. ფაილების კოპირება"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ფაილების გადაადგილება"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ფაილების წაშლა…"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"დარჩა <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">მიმდინარეობს <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილის კოპირება.</item>
- <item quantity="one">მიმდინარეობს <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილის კოპირება.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">გადაადგილდება <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილი.</item>
- <item quantity="one">გადაადგილდება <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილი.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">მიმდინარეობს <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილის წაშლა.</item>
- <item quantity="one">მიმდინარეობს <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილის წაშლა.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"დაბრუნება"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"მომზადება კოპირებისთვის…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"გადაადგილება მზადდება..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"მზადდება წასაშლელად…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ფაილი ვერ დაკოპირდა</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ფაილი ვერ დაკოპირდა</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ფაილი ვერ გადაადგილდა</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ფაილი ვერ გადაადგილდა</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ფაილი ვერ წაიშალა</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ფაილი ვერ წაიშალა</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"შეეხეთ დეტალების სანახავად"</string>
- <string name="close" msgid="3043722427445528732">"დახურვა"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"შემდეგი ფაილები არ დაკოპირდა: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"შემდეგი ფაილები არ გადაადგილდა: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"შემდეგი ფაილები არ წაიშალა: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"შემდეგი ფაილები გარდაქმნილია სხვა ფორმატში: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">მოხდა <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილის გაცვლის ბუფერში კოპირება.</item>
- <item quantity="one">მოხდა <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილის გაცვლის ბუფერში კოპირება.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ამ მდებარეობაში შერჩეული ფაილების ჩასმა შეუძლებელია."</string>
- <string name="menu_rename" msgid="7678802479104285353">"გადარქმევა"</string>
- <string name="rename_error" msgid="4203041674883412606">"დოკუმენტის გადარქმევა ვერ მოხერხდა"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ზოგიერთი ფაილი გარდაქმნილია"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"გსურთ, <xliff:g id="APPNAME"><b>^1</b></xliff:g> სარგებლობდეს <xliff:g id="STORAGE"><i>^3</i></xliff:g>-ის დირექტორიაზე „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ წვდომის უფლებით?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"გსურთ, <xliff:g id="APPNAME"><b>^1</b></xliff:g> სარგებლობდეს დირექტორიაზე „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ წვდომის უფლებით?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"გსურთ, <xliff:g id="APPNAME"><b>^1</b></xliff:g> სარგებლობდეს <xliff:g id="STORAGE"><i>^2</i></xliff:g>-ზე არსებულ მონაცემებზე, მათ შორის, ფოტოებსა და ვიდეოებზე, წვდომის უფლებით?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"აღარ მკითხოთ"</string>
- <string name="allow" msgid="7225948811296386551">"უფლების მიცემა"</string>
- <string name="deny" msgid="2081879885755434506">"აკრძალვა"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">არჩეულია <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">არჩეულია <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ერთეული</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ერთეული</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"გსურთ, წაშალოთ „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"გსურთ, წაშალოთ საქაღალდე „<xliff:g id="NAME">%1$s</xliff:g>“ და მისი შიგთავსი?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">გსურთ <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილის წაშლა?</item>
- <item quantity="one">გსურთ <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილის წაშლა?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">გსურთ <xliff:g id="COUNT_1">%1$d</xliff:g> საქაღალდისა და მათი შიგთავსის წაშლა?</item>
- <item quantity="one">გსურთ <xliff:g id="COUNT_0">%1$d</xliff:g> საქაღალდისა და მისი შიგთავსის წაშლა?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">გსურთ <xliff:g id="COUNT_1">%1$d</xliff:g> ერთეულის წაშლა?</item>
- <item quantity="one">გსურთ <xliff:g id="COUNT_0">%1$d</xliff:g> ერთეულის წაშლა?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 3dfe49f..0000000
--- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Құжаттар"</string>
- <string name="downloads_label" msgid="959113951084633612">"Жүктеулер"</string>
- <string name="title_open" msgid="4353228937663917801">"Мынадан ашу:"</string>
- <string name="title_save" msgid="2433679664882857999">"Сақталатын орны"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Жаңа қалта"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Торлы көрініс"</string>
- <string name="menu_list" msgid="7279285939892417279">"Тізім көрінісі"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Белгіге қарай сұрыптау"</string>
- <string name="menu_search" msgid="3816712084502856974">"Іздеу"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Жад параметрлері"</string>
- <string name="menu_open" msgid="432922957274920903">"Ашу"</string>
- <string name="menu_save" msgid="2394743337684426338">"Сақтау"</string>
- <string name="menu_share" msgid="3075149983979628146">"Бөлісу"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Жою"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Барлығын таңдау"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Көшіру орны…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Орнын ауыстыру…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Жаңа терезе"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Қиып алу"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Көшіру"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Қою"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Ішкі жадты көрсету"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ішкі жадты жасыру"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Файл өлшемін көрсету"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Файл өлшемін жасыру"</string>
- <string name="button_select" msgid="527196987259139214">"Таңдау"</string>
- <string name="button_copy" msgid="8706475544635021302">"Көшіру"</string>
- <string name="button_move" msgid="2202666023104202232">"Жылжыту"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Өшіру"</string>
- <string name="button_retry" msgid="4392027584153752797">"Әрекетті қайталау"</string>
- <string name="sort_name" msgid="9183560467917256779">"Атауы бойынша"</string>
- <string name="sort_date" msgid="586080032956151448">"Өзгертілген мерзімі бойынша"</string>
- <string name="sort_size" msgid="3350681319735474741">"Өлшемі бойынша"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Тамырын көрсету"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Тамырын жасыру"</string>
- <string name="save_error" msgid="6167009778003223664">"Құжатты сақтау орындалмады"</string>
- <string name="create_error" msgid="3735649141335444215">"Қалта жасақтау іске аспады"</string>
- <string name="query_error" msgid="5999895349602476581">"Қазір мазмұнды жүктеу мүмкін емес"</string>
- <string name="root_recent" msgid="4470053704320518133">"Жуықта қолданылған"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> бос"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Жад қызметтері"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Төте пернелер"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Құрылғылар"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Басқа қолданбалар"</string>
- <string name="empty" msgid="7858882803708117596">"Бос"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ішінде сәйкестіктер жоқ"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Файлды ашу мүмкін емес"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Кейбір құжаттарды жою мүмкін болмады"</string>
- <string name="share_via" msgid="8966594246261344259">"Бөлісу"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Файлдарды көшіру"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Файлдар тасымалдануда"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Файлдар жойылуда"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> қалды"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлды көшіру.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды көшіру.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл орын ауыстыруда.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл орын ауыстыруда.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл жойылуда.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жойылуда.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Кері қайтару"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Көшіруге дайындау…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Тасымалдауға дайындалуда..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Жоюға дайындалуда…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлды көшіру мүмкін болмады</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды көшіру мүмкін болмады</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлды жылжыту мүмкін болмады</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды жылжыту мүмкін болмады</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлды жою мүмкін болмады</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды жою мүмкін болмады</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Мәліметтерді көру үшін түртіңіз"</string>
- <string name="close" msgid="3043722427445528732">"Жабу"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Мына файлдар көшірілген жоқ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Мына файлдар жылжытылған жоқ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Келесі файлдар жойылмады: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Мына файлдар басқа пішімге түрлендірілді: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Аралық сақтағышқа <xliff:g id="COUNT_1">%1$d</xliff:g> файл көшірілді.</item>
- <item quantity="one">Аралық сақтағышқа <xliff:g id="COUNT_0">%1$d</xliff:g> файл көшірілді.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Таңдалған файлдарды бұл орынға қою мүмкін емес."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Атын өзгерту"</string>
- <string name="rename_error" msgid="4203041674883412606">"Құжат қайта аталмады"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Кейбір файлдар түрлендірілді"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> қолданбасына <xliff:g id="STORAGE"><i>^3</i></xliff:g> қоймасындағы <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> каталогына өтуге рұқсат беру керек пе?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> қолданбасына <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> каталогына кіруге рұқсат беру керек пе?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> <xliff:g id="STORAGE"><i>^2</i></xliff:g> қоймасындағы деректерге, соның ішінде фотосуреттерге және бейнелерге кіру мүмкіндігін беру керек пе?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Қайта сұралмасын"</string>
- <string name="allow" msgid="7225948811296386551">"Рұқсат беру"</string>
- <string name="deny" msgid="2081879885755434506">"Бас тарту"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> таңдалды</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> таңдалды</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> элемент</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> элемент</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" жою керек пе?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" қалтасын және оның мазмұнын жою керек пе?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлды жою керек пе?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды жою керек пе?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> қалтаны ішіндегісімен бірге жою керек пе?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> қалтаны ішіндегісімен бірге жою керек пе?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> элементті жою керек пе?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> элементті жою керек пе?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml
deleted file mode 100644
index a8196a9..0000000
--- a/packages/DocumentsUI/res/values-km-rKH/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ឯកសារ"</string>
- <string name="downloads_label" msgid="959113951084633612">"ទាញយក"</string>
- <string name="title_open" msgid="4353228937663917801">"បើកពី"</string>
- <string name="title_save" msgid="2433679664882857999">"រក្សាទុកទៅ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"ថតថ្មី"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ទិដ្ឋភាពក្រឡា"</string>
- <string name="menu_list" msgid="7279285939892417279">"ទិដ្ឋភាពបញ្ជី"</string>
- <string name="menu_sort" msgid="7677740407158414452">"តម្រៀបតាម"</string>
- <string name="menu_search" msgid="3816712084502856974">"ស្វែងរក"</string>
- <string name="menu_settings" msgid="8239065133341597825">"កំណត់ការផ្ទុក"</string>
- <string name="menu_open" msgid="432922957274920903">"បើក"</string>
- <string name="menu_save" msgid="2394743337684426338">"រក្សាទុក"</string>
- <string name="menu_share" msgid="3075149983979628146">"ចែករំលែក"</string>
- <string name="menu_delete" msgid="8138799623850614177">"លុប"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"ជ្រើសរើសទាំងអស់"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ថតចម្លងទៅ…"</string>
- <string name="menu_move" msgid="1828090633118079817">"ផ្លាស់ទីទៅ៖"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"បង្អួចថ្មី"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"កាត់"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ចម្លង"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"បិទភ្ជាប់"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"បង្ហាញឧបករណ៍ផ្ទុកខាងក្នុង"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"លាក់ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"បង្ហាញទំហំឯកសារ"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"លាក់ទំហំឯកសារ"</string>
- <string name="button_select" msgid="527196987259139214">"ជ្រើស"</string>
- <string name="button_copy" msgid="8706475544635021302">"ចម្លង"</string>
- <string name="button_move" msgid="2202666023104202232">"ផ្លាស់ទី"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"បដិសេធ"</string>
- <string name="button_retry" msgid="4392027584153752797">"ព្យាយាមម្ដងទៀត"</string>
- <string name="sort_name" msgid="9183560467917256779">"តាមឈ្មោះ"</string>
- <string name="sort_date" msgid="586080032956151448">"តាមកាលបរិច្ឆេទបានកែប្រែ"</string>
- <string name="sort_size" msgid="3350681319735474741">"តាមទំហំ"</string>
- <string name="drawer_open" msgid="4545466532430226949">"បង្ហាញ roots"</string>
- <string name="drawer_close" msgid="7602734368552123318">"លាក់ roots"</string>
- <string name="save_error" msgid="6167009778003223664">"បានបរាជ័យក្នុងការរក្សាទុកឯកសារ"</string>
- <string name="create_error" msgid="3735649141335444215">"បានបរាជ័យក្នុងការបង្កើតថត"</string>
- <string name="query_error" msgid="5999895349602476581">"មិនអាចដំណើរការមាតិកាបានទេនៅពេលនេះ"</string>
- <string name="root_recent" msgid="4470053704320518133">"ថ្មីៗ"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"ទំនេរ <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"សេវាកម្មផ្ដល់ឧបករណ៍ផ្ទុក"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"ផ្លូវកាត់"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ឧបករណ៍"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"កម្មវិធីច្រើនទៀត"</string>
- <string name="empty" msgid="7858882803708117596">"គ្មានធាតុ"</string>
- <string name="no_results" msgid="6622510343880730446">"មិនមានការប្រកួតនៅក្នុង %1$s ទេ"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"មិនអាចបើកឯកសារបានទេ"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"មិនអាចលុបឯកសារមួយចំនួន"</string>
- <string name="share_via" msgid="8966594246261344259">"ចែករំលែកតាម"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"កំពុងថតចម្លងឯកសារ"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ផ្លាស់ទីឯកសារ"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"កំពុងលុបឯកសារ"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"នៅសល់ <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">កំពុងថតចម្លងឯកសារចំនួន <xliff:g id="COUNT_1">%1$d</xliff:g> ។</item>
- <item quantity="one">កំពុងថតចម្លងឯកសារចំនួន <xliff:g id="COUNT_0">%1$d</xliff:g> ។</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">កំពុងផ្លាស់ទីឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g>។</item>
- <item quantity="one">កំពុងផ្លាស់ទីឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g>។</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">កំពុងលុបឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">កំពុងលុបឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"មិនធ្វើវិញ"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"កំពុងរៀបចំចម្លង…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"កំពុងរៀបចំផ្លាស់ទី…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"កំពុងរៀបចំលុប…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">មិនអាចថតចម្លងឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ច្បាប់</item>
- <item quantity="one">មិនអាចថតចម្លងឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ច្បាប់</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">មិនអាចផ្លាស់ទីឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ច្បាប់</item>
- <item quantity="one">មិនអាចផ្លាស់ទីឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ច្បាប់</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">មិនអាចលុបឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ច្បាប់</item>
- <item quantity="one">មិនអាចលុបឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ច្បាប់</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"ប៉ះដើម្បីមើលព័ត៌មានលម្អិត"</string>
- <string name="close" msgid="3043722427445528732">"បិទ"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ឯកសារទាំងនេះមិនត្រូវបានថតចម្លងទេ៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ឯកសារទាំងនេះមិនត្រូវបានផ្លាស់ទីទេ៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ឯកសារទាំងនេះមិនត្រូវបានលុបទេ៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ឯកសារទាំងនេះត្រូវបានបម្លែងទៅជាទម្រង់ផ្សេង៖ <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">បានចម្លងឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ទៅតម្បៀតខ្ទាស់។</item>
- <item quantity="one">បានចម្លងឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ទៅតម្បៀតខ្ទាស់។</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"មិនអាចបិទភ្ជាប់ឯកសារដែលបានជ្រើសនៅក្នុងទីតាំងនេះបានទេ។"</string>
- <string name="menu_rename" msgid="7678802479104285353">"ប្ដូរឈ្មោះ"</string>
- <string name="rename_error" msgid="4203041674883412606">"បានបរាជ័យក្នុងការប្តូរឈ្មោះឯកសារ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ឯកសារមួយចំនួនត្រូវបានបម្លែង"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"ផ្តល់សិទ្ធិឲ្យ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ចូលដំណើរការថត <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> នៅលើ <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"ផ្តល់សិទ្ធិឲ្យ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ចូលដំណើរការថត <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ឬ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"ផ្តល់សិទ្ធិអនុញ្ញាតដល់ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ដើម្បីចូលដំណើរការទិន្នន័យរបស់អ្នក រាប់បញ្ចូលទាំងរូបថត និងវីដេអូ នៅលើ <xliff:g id="STORAGE"><i>^2</i></xliff:g> ឬទេ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"កុំសួរទៀត"</string>
- <string name="allow" msgid="7225948811296386551">"អនុញ្ញាត"</string>
- <string name="deny" msgid="2081879885755434506">"បដិសេធ"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">បានជ្រើស <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">បានជ្រើស <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ធាតុ</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ធាតុ</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"លុប \"<xliff:g id="NAME">%1$s</xliff:g>\" ឬ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"លុបថតឯកសារ \"<xliff:g id="NAME">%1$s</xliff:g>\" និងមាតិការបស់វាឬ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">លុបឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ច្បាប់ឬ?</item>
- <item quantity="one">លុបឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ច្បាប់ឬ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">លុបថតឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> និងមាតិការបស់វាឬ?</item>
- <item quantity="one">លុបថតឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> និងមាតិការបស់វាឬ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">លុបធាតុ <xliff:g id="COUNT_1">%1$d</xliff:g> ឬ?</item>
- <item quantity="one">លុបធាតុ <xliff:g id="COUNT_0">%1$d</xliff:g> ឬ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 4380514..0000000
--- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ಡಾಕ್ಯುಮೆಂಟ್ಗಳು"</string>
- <string name="downloads_label" msgid="959113951084633612">"ಡೌನ್ಲೋಡ್ಗಳು"</string>
- <string name="title_open" msgid="4353228937663917801">"ಇದರ ಮೂಲಕ ತೆರೆಯಿರಿ"</string>
- <string name="title_save" msgid="2433679664882857999">"ಇವುಗಳಲ್ಲಿ ಉಳಿಸಿ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"ಹೊಸ ಫೋಲ್ಡರ್"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ಗ್ರಿಡ್ ವೀಕ್ಷಣೆ"</string>
- <string name="menu_list" msgid="7279285939892417279">"ಪಟ್ಟಿ ವೀಕ್ಷಣೆ"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು"</string>
- <string name="menu_search" msgid="3816712084502856974">"ಹುಡುಕು"</string>
- <string name="menu_settings" msgid="8239065133341597825">"ಸಂಗ್ರಹಣೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <string name="menu_open" msgid="432922957274920903">"ತೆರೆ"</string>
- <string name="menu_save" msgid="2394743337684426338">"ಉಳಿಸು"</string>
- <string name="menu_share" msgid="3075149983979628146">"ಹಂಚು"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ಅಳಿಸು"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ಇದಕ್ಕೆ ನಕಲಿಸಿ…"</string>
- <string name="menu_move" msgid="1828090633118079817">"ಇದಕ್ಕೆ ಸರಿಸು…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"ಹೊಸ ವಿಂಡೋ"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ಕತ್ತರಿಸು"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ನಕಲಿಸು"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ಅಂಟಿಸು"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ತೋರಿಸು"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ಮರೆಮಾಡಿ"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ಫೈಲ್ ಗಾತ್ರವನ್ನು ತೋರಿಸು"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ಫೈಲ್ ಗಾತ್ರವನ್ನು ಮರೆಮಾಡಿ"</string>
- <string name="button_select" msgid="527196987259139214">"ಆಯ್ಕೆಮಾಡು"</string>
- <string name="button_copy" msgid="8706475544635021302">"ನಕಲಿಸು"</string>
- <string name="button_move" msgid="2202666023104202232">"ಸರಿಸು"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ವಜಾಗೊಳಿಸಿ"</string>
- <string name="button_retry" msgid="4392027584153752797">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
- <string name="sort_name" msgid="9183560467917256779">"ಹೆಸರಿನ ಪ್ರಕಾರ"</string>
- <string name="sort_date" msgid="586080032956151448">"ಮಾರ್ಪಡಿಸಿರುವ ದಿನಾಂಕದ ಪ್ರಕಾರ"</string>
- <string name="sort_size" msgid="3350681319735474741">"ಗಾತ್ರದ ಪ್ರಕಾರ"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ರೂಟ್ಗಳನ್ನು ತೋರಿಸು"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ರೂಟ್ಗಳನ್ನು ಮರೆಮಾಡು"</string>
- <string name="save_error" msgid="6167009778003223664">"ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
- <string name="create_error" msgid="3735649141335444215">"ಫೋಲ್ಡರ್ ರಚಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
- <string name="query_error" msgid="5999895349602476581">"ಈ ಕ್ಷಣದಲ್ಲಿ ವಿಷಯವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
- <string name="root_recent" msgid="4470053704320518133">"ಇತ್ತೀಚಿನದು"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ಮುಕ್ತವಾಗಿದೆ"</string>
- <string name="root_type_service" msgid="2178854894416775409">"ಸಂಗ್ರಹಣೆ ಸೇವೆಗಳು"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"ಶಾರ್ಟ್ಕಟ್ಗಳು"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ಸಾಧನಗಳು"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"ಇನ್ನಷ್ಟು ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
- <string name="empty" msgid="7858882803708117596">"ಯಾವುದೇ ಐಟಂಗಳಿಲ್ಲ"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ರಲ್ಲಿ ಯಾವುದೇ ಹೊಂದಾಣಿಕೆಗಳಿಲ್ಲ"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ಫೈಲ್ ತೆರೆಯಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"ಕೆಲವು ಡಾಕ್ಯುಮೆಂಟ್ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
- <string name="share_via" msgid="8966594246261344259">"ಈ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಿ"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ಫೈಲ್ ಅಳಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ಉಳಿದಿದೆ"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗುತ್ತಿದೆ.</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗುತ್ತಿದೆ.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"ರದ್ದುಗೊಳಿಸಿ"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"ನಕಲಿಸಲು ಸಿದ್ಧಪಡಿಸಲಾಗುತ್ತಿದೆ..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"ಸರಿಸಲು ಸಿದ್ಧಪಡಿಸಲಾಗುತ್ತಿದೆ…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"ಅಳಿಸಲು ಸಿದ್ಧಪಡಿಸಲಾಗುತ್ತಿದೆ…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗಲಿಲ್ಲ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗಲಿಲ್ಲ</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"ವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <string name="close" msgid="3043722427445528732">"ಮುಚ್ಚು"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ಈ ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗಿಲ್ಲ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ಈ ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲಾಗಿಲ್ಲ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ಈ ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಲಾಗಿಲ್ಲ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ಈ ಫೈಲ್ಗಳನ್ನು ಮತ್ತೊಂದು ಫಾರ್ಮೆಟ್ಗೆ ಪರಿವರ್ತಿಸಲಾಗಿತ್ತು: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗಿದೆ.</item>
- <item quantity="other">ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ನಕಲಿಸಲಾಗಿದೆ.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ಈ ಸ್ಥಳದಲ್ಲಿ ಆಯ್ಕೆಮಾಡಿದ ಫೈಲ್ಗಳನ್ನು ಅಂಟಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
- <string name="menu_rename" msgid="7678802479104285353">"ಮರುಹೆಸರಿಸು"</string>
- <string name="rename_error" msgid="4203041674883412606">"ಡಾಕ್ಯುಮೆಂಟ್ ಮರುಹೆಸರಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ಕೆಲವು ಫೈಲ್ಗಳನ್ನು ಪರಿವರ್ತಿಸಲಾಗಿದೆ"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> ರಲ್ಲಿ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ಡೈರೆಕ್ಟರಿಗೆ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ಪ್ರವೇಶ ನೀಡುವುದೇ?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g><xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ಡೈರೆಕ್ಟರಿ ಪ್ರವೇಶಿಸಲು ಅನುಮತಿಸುವುದೇ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> ಸಂಗ್ರಹಣೆಯಲ್ಲಿನ ಪೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳು ಸೇರಿದಂತೆ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು <xliff:g id="APPNAME"><b>^1</b></xliff:g> ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"ಮತ್ತೆ ಕೇಳಬೇಡಿ"</string>
- <string name="allow" msgid="7225948811296386551">"ಅನುಮತಿಸು"</string>
- <string name="deny" msgid="2081879885755434506">"ನಿರಾಕರಿಸು"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಐಟಂಗಳು</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಐಟಂಗಳು</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ಅಳಿಸುವುದೇ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ಫೋಲ್ಡರ್ ಮತ್ತು ಅದರ ವಿಷಯಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸುವುದೇ?</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸುವುದೇ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೋಲ್ಡರ್ಗಳು ಮತ್ತು ಅವುಗಳ ವಿಷಯಗಳನ್ನು ಅಳಿಸುವುದೇ?</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೋಲ್ಡರ್ಗಳು ಮತ್ತು ಅವುಗಳ ವಿಷಯಗಳನ್ನು ಅಳಿಸುವುದೇ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಐಟಂಗಳನ್ನು ಅಳಿಸುವುದೇ?</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಐಟಂಗಳನ್ನು ಅಳಿಸುವುದೇ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml
deleted file mode 100644
index 51af15f..0000000
--- a/packages/DocumentsUI/res/values-ko/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"문서"</string>
- <string name="downloads_label" msgid="959113951084633612">"다운로드"</string>
- <string name="title_open" msgid="4353228937663917801">"열기:"</string>
- <string name="title_save" msgid="2433679664882857999">"저장 위치:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"새 폴더"</string>
- <string name="menu_grid" msgid="6878021334497835259">"바둑판식 보기"</string>
- <string name="menu_list" msgid="7279285939892417279">"목록 보기"</string>
- <string name="menu_sort" msgid="7677740407158414452">"정렬 기준"</string>
- <string name="menu_search" msgid="3816712084502856974">"검색"</string>
- <string name="menu_settings" msgid="8239065133341597825">"저장소 설정"</string>
- <string name="menu_open" msgid="432922957274920903">"열기"</string>
- <string name="menu_save" msgid="2394743337684426338">"저장"</string>
- <string name="menu_share" msgid="3075149983979628146">"공유"</string>
- <string name="menu_delete" msgid="8138799623850614177">"삭제"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"모두 선택"</string>
- <string name="menu_copy" msgid="3612326052677229148">"복사…"</string>
- <string name="menu_move" msgid="1828090633118079817">"이동…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"새 창"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"잘라내기"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"복사"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"붙여넣기"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"내부 저장소 표시"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"내부 저장소 숨기기"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"파일 크기 표시"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"파일 크기 숨기기"</string>
- <string name="button_select" msgid="527196987259139214">"선택"</string>
- <string name="button_copy" msgid="8706475544635021302">"복사"</string>
- <string name="button_move" msgid="2202666023104202232">"이동"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"닫기"</string>
- <string name="button_retry" msgid="4392027584153752797">"다시 시도"</string>
- <string name="sort_name" msgid="9183560467917256779">"이름순"</string>
- <string name="sort_date" msgid="586080032956151448">"수정된 날짜순"</string>
- <string name="sort_size" msgid="3350681319735474741">"크기순"</string>
- <string name="drawer_open" msgid="4545466532430226949">"루트 표시"</string>
- <string name="drawer_close" msgid="7602734368552123318">"루트 숨기기"</string>
- <string name="save_error" msgid="6167009778003223664">"문서 저장 실패"</string>
- <string name="create_error" msgid="3735649141335444215">"폴더를 만들지 못함"</string>
- <string name="query_error" msgid="5999895349602476581">"현재 콘텐츠를 로드할 수 없습니다."</string>
- <string name="root_recent" msgid="4470053704320518133">"최근"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> 남음"</string>
- <string name="root_type_service" msgid="2178854894416775409">"저장용량 서비스"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"바로가기"</string>
- <string name="root_type_device" msgid="7121342474653483538">"기기"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"앱 더보기"</string>
- <string name="empty" msgid="7858882803708117596">"항목 없음"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s에 일치하는 항목이 없습니다."</string>
- <string name="toast_no_application" msgid="4632640357724698144">"파일을 열 수 없습니다."</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"일부 문서를 삭제할 수 없음"</string>
- <string name="share_via" msgid="8966594246261344259">"공유 방법"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"파일 복사 중"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"파일 이동"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"파일 삭제"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> 남음"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 복사합니다.</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 복사합니다.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개 이동</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개 이동</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개 삭제</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개 삭제</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"실행취소"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"사본 준비 중…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"이동 준비 중…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"삭제 준비 중..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 복사할 수 없습니다.</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 복사할 수 없습니다.</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 이동할 수 없습니다.</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 이동할 수 없습니다.</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 삭제할 수 없습니다.</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 삭제할 수 없습니다.</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"세부정보를 보려면 탭하세요."</string>
- <string name="close" msgid="3043722427445528732">"닫기"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"다음 파일이 복사되지 않았습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"다음 파일이 이동되지 않았습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"다음 파일이 삭제되지 않았습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"파일이 다음과 같이 다른 형식으로 변환되었습니다. <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 클립보드에 복사함</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 클립보드에 복사함</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"선택한 파일을 이 위치에 붙여넣을 수 없습니다."</string>
- <string name="menu_rename" msgid="7678802479104285353">"이름 바꾸기"</string>
- <string name="rename_error" msgid="4203041674883412606">"문서 이름을 변경하지 못했습니다."</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"일부 파일이 변환되었습니다."</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>이(가) <xliff:g id="STORAGE"><i>^3</i></xliff:g>에서 <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> 디렉토리에 액세스하도록 허용하시겠습니까?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>이(가) <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> 디렉토리에 액세스하도록 허용하시겠습니까?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>에서 사진, 동영상 등 <xliff:g id="STORAGE"><i>^2</i></xliff:g>의 내 데이터에 액세스하도록 허용하시겠습니까?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"다시 묻지 않음"</string>
- <string name="allow" msgid="7225948811296386551">"허용"</string>
- <string name="deny" msgid="2081879885755434506">"거부"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>개 선택됨</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>개 선택됨</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other">항목 <xliff:g id="COUNT_1">%1$d</xliff:g>개</item>
- <item quantity="one">항목 <xliff:g id="COUNT_0">%1$d</xliff:g>개</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 삭제하시겠습니까?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\'<xliff:g id="NAME">%1$s</xliff:g>\' 폴더와 폴더에 포함된 콘텐츠를 삭제하시겠습니까?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 삭제하시겠습니까?</item>
- <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 삭제하시겠습니까?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">폴더 <xliff:g id="COUNT_1">%1$d</xliff:g>개와 폴더에 포함된 콘텐츠를 삭제하시겠습니까?</item>
- <item quantity="one">폴더 <xliff:g id="COUNT_0">%1$d</xliff:g>개와 폴더에 포함된 콘텐츠를 삭제하시겠습니까?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">항목 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 삭제하시겠습니까?</item>
- <item quantity="one">항목 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 삭제하시겠습니까?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
deleted file mode 100644
index 23efd0f..0000000
--- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документтер"</string>
- <string name="downloads_label" msgid="959113951084633612">"Жүктөлүп алынгандар"</string>
- <string name="title_open" msgid="4353228937663917801">"Кийинкиден ачуу:"</string>
- <string name="title_save" msgid="2433679664882857999">"Кийинкиге сактоо:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Жаңы куржун"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Тор көрүнүшү"</string>
- <string name="menu_list" msgid="7279285939892417279">"Тизмек көрүнүшү"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ылгоо"</string>
- <string name="menu_search" msgid="3816712084502856974">"Издөө"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Сактагычтын жөндөөлөрү"</string>
- <string name="menu_open" msgid="432922957274920903">"Ачуу"</string>
- <string name="menu_save" msgid="2394743337684426338">"Сактоо"</string>
- <string name="menu_share" msgid="3075149983979628146">"Бөлүшүү"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Жок кылуу"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Бардыгын тандоо"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Төмөнкүгө көчүрүү…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Төмөнкүгө жылдыруу..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Жаңы терезе"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Кесүү"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Көчүрүү"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Чаптоо"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Ички сактагычты көрсөтүү"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ички эстутумду жашыруу"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Файл өлчөмүн көрсөтүү"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Файл өлчөмүн жашыруу"</string>
- <string name="button_select" msgid="527196987259139214">"Тандоо"</string>
- <string name="button_copy" msgid="8706475544635021302">"Көчүрүү"</string>
- <string name="button_move" msgid="2202666023104202232">"Жылдыруу"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Этибарга албоо"</string>
- <string name="button_retry" msgid="4392027584153752797">"Дагы аракет кылыңыз"</string>
- <string name="sort_name" msgid="9183560467917256779">"Аты боюнча"</string>
- <string name="sort_date" msgid="586080032956151448">"Өзгөртүлгөн күнү боюнча"</string>
- <string name="sort_size" msgid="3350681319735474741">"Өлчөмү боюнча"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Папкаларды көрсөтүү"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Папкаларды жашыруу"</string>
- <string name="save_error" msgid="6167009778003223664">"Документтерди сактоо кыйрады"</string>
- <string name="create_error" msgid="3735649141335444215">"Папка түзүү кыйрады"</string>
- <string name="query_error" msgid="5999895349602476581">"Учурда мазмун жүктөлбөй жатат"</string>
- <string name="root_recent" msgid="4470053704320518133">"Акыркы"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> бош"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Сактагыч кызматтар"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Тез чакырмалар"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Түзмөктөр"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Көбүрөөк колдонмолор"</string>
- <string name="empty" msgid="7858882803708117596">"Эч нерсе жок"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ичинде дал келүүлөр жок"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Файл ачылбай жатат"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Кээ бир документтерди өчүрүү кыйрады"</string>
- <string name="share_via" msgid="8966594246261344259">"Кийинки аркылуу бөлүшүү:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Файлдар көчүрүлүүдө"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Файлдар жылдырылууда…"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Файлдар жок кылынууда"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> калды"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл көчүрүлүүдө.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл көчүрүлүүдө.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файл жылдырылууда.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файл жылдырылууда.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл жок кылынууда.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жок кылынууда.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Артка кайтаруу"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Көчүрүүгө даярдалууда…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Жылдырууга даярдалууда…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Жок кылууга даярдалууда…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл көчүрүлбөй койду</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл көчүрүлбөй койду</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл жылдырылбай койду</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жылдырылбай койду</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл жок кылынбай койду</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жок кылынбай койду</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Чоо-жайын көрүү үчүн таптаңыз"</string>
- <string name="close" msgid="3043722427445528732">"Жабуу"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Төмөнкү файлдар көчүрүлгөн жок: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Төмөнкү файлдар жылдырылган жок: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Төмөнкү файлдар өчүрүлгөн жок: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Бул файлдар башка форматка айландырылды: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл буферге көчүрүлдү.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файл буферге көчүрүлдү.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Тандалган файлдарды бул жерге чаптоого мүмкүн эмес."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Аталышын өзгөртүү"</string>
- <string name="rename_error" msgid="4203041674883412606">"Документтин аталышы өзгөртүлбөй калды"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Айрым файлдардын форматы өзгөртүлдү"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> колдонмосуна <xliff:g id="STORAGE"><i>^3</i></xliff:g> түзмөгүндөгү <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> папканы пайдалануу мүмкүнчүлүгү берилсинби?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> колдонмосуна <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> каталогун пайдалануу мүмкүнчүлүгү берилсинби?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> колдонмосуна <xliff:g id="STORAGE"><i>^2</i></xliff:g> түзмөгүндөгү дайындарыңыз, сүрөттөрүңүз жана видеолоруңузду пайдалануу мүмкүнчүлүгү берилсинби?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Экинчи суралбасын"</string>
- <string name="allow" msgid="7225948811296386551">"Уруксат берүү"</string>
- <string name="deny" msgid="2081879885755434506">"Жок"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> тандалды</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> тандалды</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> нерсе</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> нерсе</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" жок кылынсынбы?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" куржуну мазмуну менен жок кылынсынбы?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл жок кылынсынбы?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жок кылынсынбы?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> куржун мазмуну менен жок кылынсынбы?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> куржун мазмуну менен жок кылынсынбы?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> нерсе жок кылынсынбы?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> нерсе жок кылынсынбы?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ldrtl/config.xml b/packages/DocumentsUI/res/values-ldrtl/config.xml
deleted file mode 100644
index 22f8131..0000000
--- a/packages/DocumentsUI/res/values-ldrtl/config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <bool name="list_divider_inset_left">false</bool>
-</resources>
diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
deleted file mode 100644
index 4c21e8a..0000000
--- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ເອກະສານ"</string>
- <string name="downloads_label" msgid="959113951084633612">"ການດາວໂຫລດ"</string>
- <string name="title_open" msgid="4353228937663917801">"ເປີດຈາກ"</string>
- <string name="title_save" msgid="2433679664882857999">"ບັນທຶກໄປທີ່"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"ໂຟລເດີໃໝ່"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ມຸມມອງແບບຊ່ອງ"</string>
- <string name="menu_list" msgid="7279285939892417279">"ມຸມມອງແບບລາຍຊື່"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ຮຽງລຳດັບຕາມ"</string>
- <string name="menu_search" msgid="3816712084502856974">"ຊອກຫາ"</string>
- <string name="menu_settings" msgid="8239065133341597825">"ການຕັ້ງຄ່າບ່ອນເກັບຂໍ້ມູນ"</string>
- <string name="menu_open" msgid="432922957274920903">"ເປີດ"</string>
- <string name="menu_save" msgid="2394743337684426338">"ບັນທຶກ"</string>
- <string name="menu_share" msgid="3075149983979628146">"ແບ່ງປັນ"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ລຶບ"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"ເລືອກທັງຫມົດ"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ສຳເນົາໄປໃສ່..."</string>
- <string name="menu_move" msgid="1828090633118079817">"ຍ້າຍໄປໃສ່..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"ໜ້າຈໍໃໝ່"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ຕັດ"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ສຳເນົາ"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ວາງໃສ່"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"ສະແດງໂຕເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"ເຊື່ອງໂຕເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ສະແດງຂະໜາດໄຟລ໌"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ເຊື່ອງຂະຫນາດໄຟລ໌"</string>
- <string name="button_select" msgid="527196987259139214">"ເລືອກ"</string>
- <string name="button_copy" msgid="8706475544635021302">"ສຳເນົາ"</string>
- <string name="button_move" msgid="2202666023104202232">"ຍ້າຍ"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ປິດໄວ້"</string>
- <string name="button_retry" msgid="4392027584153752797">"ລອງໃໝ່ອີກ"</string>
- <string name="sort_name" msgid="9183560467917256779">"ຕາມຊື່"</string>
- <string name="sort_date" msgid="586080032956151448">"ຕາມວັນທີທີ່ແກ້ໄຂ"</string>
- <string name="sort_size" msgid="3350681319735474741">"ຕາມຂະໜາດ"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ສະແດງ roots"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ເຊື່ອງ roots"</string>
- <string name="save_error" msgid="6167009778003223664">"ການບັນທຶກເອກະສານລົ້ມເຫລວ"</string>
- <string name="create_error" msgid="3735649141335444215">"ການສ້າງໂຟນເດີລົ້ມເຫຼວ"</string>
- <string name="query_error" msgid="5999895349602476581">"ບໍ່ສາມາດໂຫຼດເນື້ອຫາໄດ້ໃນຂະນະນີ້"</string>
- <string name="root_recent" msgid="4470053704320518133">"ຫຼ້າສຸດ"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"ຟຣີ <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"ບໍລິການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"ທາງລັດ"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ອຸປະກອນ"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"ແອັບຯອື່ນໆ"</string>
- <string name="empty" msgid="7858882803708117596">"ບໍ່ມີລາຍການ"</string>
- <string name="no_results" msgid="6622510343880730446">"ບໍ່ພົບສິ່ງກົງກັນໃນ %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ບໍ່ສາມາດເປີດໄຟລ໌ໄດ້"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"ບໍ່ສາມາດລຶບບາງເອກະສານໄດ້"</string>
- <string name="share_via" msgid="8966594246261344259">"ແບ່ງປັນຜ່ານ"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ກຳລັງອັດສຳເນົາໄຟລ໌"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ກຳລັງຍ້າຍໄຟລ໌"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ກຳລັງລຶບໄຟລ໌"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ຍັງເຫຼືອຢູ່"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">ກຳລັງອັດສຳເນົາ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌.</item>
- <item quantity="one">ກຳລັງອັດສຳເນົາ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">ກຳລັງຍ້າຍ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌.</item>
- <item quantity="one">ກຳລັງຍ້າຍ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">ກຳລັງລຶບ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌.</item>
- <item quantity="one">ກຳລັງລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"ບໍ່ເຮັດ"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"ກຳລັງກຽມອັດສຳເນົາ…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"ກຳລັງກະກຽມຍ້າຍ…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"ກຳລັງກະກຽມລຶບ…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">ບໍ່ສາມາດສຳເນົາ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ໄດ້</item>
- <item quantity="one">ບໍ່ສາມາດສຳເນົາ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ໄດ້</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">ບໍ່ສາມາດຍ້າຍ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ໄດ້</item>
- <item quantity="one">ບໍ່ສາມາດຍ້າຍ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ໄດ້</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">ບໍ່ສາມາດລຶບ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ໄດ້</item>
- <item quantity="one">ບໍ່ສາມາດລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ໄດ້</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"ແຕະເພື່ອເບິ່ງລາຍລະອຽດ"</string>
- <string name="close" msgid="3043722427445528732">"ປິດ"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ໄຟລ໌ເຫຼົ່ານີ້ບໍ່ໄດ້ຖືກສຳເນົາ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ໄຟລ໌ເຫຼົ່ານີ້ບໍ່ໄດ້ຖືກຍ້າຍ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ໄຟລ໌ເຫຼົ່ານີ້ບໍ່ໄດ້ຖືກລຶບເທື່ອ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ໄຟລ໌ເຫຼົ່ານີ້ໄດ້ຖືກປ່ຽນເປັນຮູບແບບອື່ນແລ້ວ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">ອັດສຳເນົາ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ໃສ່ຄລິບບອດແລ້ວ.</item>
- <item quantity="one">ອັດສຳເນົາ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ໃສ່ຄລິບບອດແລ້ວ.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ບໍ່ສາມາດແປະໄຟລ໌ເລືອກໄວ້ຢູ່ໃນທີ່ຕັ້ງນີ້ໄດ້."</string>
- <string name="menu_rename" msgid="7678802479104285353">"ປ່ຽນຊື່"</string>
- <string name="rename_error" msgid="4203041674883412606">"ປ່ຽນຊື່ເອກະສານບໍ່ສຳເລັດ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ປ່ຽນແປງບາງໄຟລ໌ແລ້ວ"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"ອະນຸຍາດສິດເຂົ້າເຖິງໃຫ້ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ເພື່ອເຂົ້າໄດເຣກທໍຣີ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ຢູ່ <xliff:g id="STORAGE"><i>^3</i></xliff:g> ບໍ?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"ອະນຸມັດ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ໃຫ້ເຂົ້າຫາໄດເຣັກທໍຣີ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ບໍ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"ອະນຸມັດໃຫ້ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ເຂົ້າເຖິງຂໍ້ມູນຂອງທ່ານ ເຊິ່ງຮວມເຖິງຮູບພາບ ແລະ ວິດີໂອໃນ <xliff:g id="STORAGE"><i>^2</i></xliff:g> ໄດ້ບໍ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"ບໍ່ຕ້ອງຖາມຄືນ"</string>
- <string name="allow" msgid="7225948811296386551">"ອະນຸຍາດ"</string>
- <string name="deny" msgid="2081879885755434506">"ປະຕິເສດ"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">ເລືອກ <xliff:g id="COUNT_1">%1$d</xliff:g> ແລ້ວ</item>
- <item quantity="one">ເລືອກ <xliff:g id="COUNT_0">%1$d</xliff:g> ແລ້ວ</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ລາຍການ</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ລາຍການ</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"ລຶບ \"<xliff:g id="NAME">%1$s</xliff:g>\" ອອກບໍ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"ລຶບໂຟນເດີ \"<xliff:g id="NAME">%1$s</xliff:g>\" ແລະ ເນື້ອຫາທັງໝົດຂອງມັນອອກບໍ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">ລຶບ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ອອກບໍ?</item>
- <item quantity="one">ລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ອອກບໍ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">ລຶບ <xliff:g id="COUNT_1">%1$d</xliff:g> ໂຟນເດີ ແລະ ເນື້ອຫາຂອງມັນອອກບໍ?</item>
- <item quantity="one">ລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ໂຟນເດີ ແລະ ເນື້ອຫາຂອງມັນອອກບໍ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">ລຶບ <xliff:g id="COUNT_1">%1$d</xliff:g> ລາຍການອອກບໍ?</item>
- <item quantity="one">ລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ລາຍການອອກບໍ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-lt/strings.xml b/packages/DocumentsUI/res/values-lt/strings.xml
deleted file mode 100644
index 435da97..0000000
--- a/packages/DocumentsUI/res/values-lt/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumentai"</string>
- <string name="downloads_label" msgid="959113951084633612">"Atsisiuntimai"</string>
- <string name="title_open" msgid="4353228937663917801">"Atidaryti iš"</string>
- <string name="title_save" msgid="2433679664882857999">"Išsaugoti į"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Naujas aplankas"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Tinklelio rodinys"</string>
- <string name="menu_list" msgid="7279285939892417279">"Sąrašo rodinys"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Rūšiuoti pagal"</string>
- <string name="menu_search" msgid="3816712084502856974">"Ieškoti"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Saugyklos nustatymai"</string>
- <string name="menu_open" msgid="432922957274920903">"Atidaryti"</string>
- <string name="menu_save" msgid="2394743337684426338">"Išsaugoti"</string>
- <string name="menu_share" msgid="3075149983979628146">"Bendrinti"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Ištrinti"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Pasirinkti viską"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopijuoti į..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Perkelti į…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Naujas langas"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Iškirpti"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopijuoti"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Įklijuoti"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Rodyti vidinę atmintį"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Slėpti vidinę atmintį"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Rodyti failo dydį"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Slėpti failo dydį"</string>
- <string name="button_select" msgid="527196987259139214">"Pasirinkti"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopijuoti"</string>
- <string name="button_move" msgid="2202666023104202232">"Perkelti"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Atsisakyti"</string>
- <string name="button_retry" msgid="4392027584153752797">"Bandyti dar kartą"</string>
- <string name="sort_name" msgid="9183560467917256779">"Pagal pavadinimą"</string>
- <string name="sort_date" msgid="586080032956151448">"Pagal keitimo datą"</string>
- <string name="sort_size" msgid="3350681319735474741">"Pagal dydį"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Rodyti šaknis"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Slėpti šaknis"</string>
- <string name="save_error" msgid="6167009778003223664">"Nepavyko išsaugoti dokumento"</string>
- <string name="create_error" msgid="3735649141335444215">"Nepavyko sukurti aplanko"</string>
- <string name="query_error" msgid="5999895349602476581">"Šiuo metu nepavyksta įkelti turinio"</string>
- <string name="root_recent" msgid="4470053704320518133">"Naujausi"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Laisvos vietos: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Saugyklos paslaugos"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Spartieji klavišai"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Įrenginiai"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Daugiau programų"</string>
- <string name="empty" msgid="7858882803708117596">"Nėra elementų"</string>
- <string name="no_results" msgid="6622510343880730446">"Nėra jokių atitikčių pagal %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Nepavyksta atidaryti failo"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nepavyko ištrinti kai kurių dokumentų"</string>
- <string name="share_via" msgid="8966594246261344259">"Bendrinti naudojant"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopijuojami failai"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Perkeliami failai"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Failų ištrynimas"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Liko: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kopijuojamas <xliff:g id="COUNT_1">%1$d</xliff:g> failas.</item>
- <item quantity="few">Kopijuojami <xliff:g id="COUNT_1">%1$d</xliff:g> failai.</item>
- <item quantity="many">Kopijuojama <xliff:g id="COUNT_1">%1$d</xliff:g> failo.</item>
- <item quantity="other">Kopijuojama <xliff:g id="COUNT_1">%1$d</xliff:g> failų.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Perkeliamas <xliff:g id="COUNT_1">%1$d</xliff:g> failas.</item>
- <item quantity="few">Perkeliami <xliff:g id="COUNT_1">%1$d</xliff:g> failai.</item>
- <item quantity="many">Perkeliama <xliff:g id="COUNT_1">%1$d</xliff:g> failo.</item>
- <item quantity="other">Perkeliama <xliff:g id="COUNT_1">%1$d</xliff:g> failų.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Trinamas <xliff:g id="COUNT_1">%1$d</xliff:g> failas.</item>
- <item quantity="few">Trinami <xliff:g id="COUNT_1">%1$d</xliff:g> failai.</item>
- <item quantity="many">Trinama <xliff:g id="COUNT_1">%1$d</xliff:g> failo.</item>
- <item quantity="other">Trinama <xliff:g id="COUNT_1">%1$d</xliff:g> failų.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Anuliuoti"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Ruošiamasi kopijuoti…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Ruošiamasi perkelti…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Ruošiama ištrinti…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Nepavyko nukopijuoti <xliff:g id="COUNT_1">%1$d</xliff:g> failo</item>
- <item quantity="few">Nepavyko nukopijuoti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
- <item quantity="many">Nepavyko nukopijuoti <xliff:g id="COUNT_1">%1$d</xliff:g> failo</item>
- <item quantity="other">Nepavyko nukopijuoti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Nepavyko perkelti <xliff:g id="COUNT_1">%1$d</xliff:g> failo</item>
- <item quantity="few">Nepavyko perkelti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
- <item quantity="many">Nepavyko perkelti <xliff:g id="COUNT_1">%1$d</xliff:g> failo</item>
- <item quantity="other">Nepavyko perkelti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Nepavyko ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failo</item>
- <item quantity="few">Nepavyko ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
- <item quantity="many">Nepavyko ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failo</item>
- <item quantity="other">Nepavyko ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failų</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Palieskite, kad peržiūrėtumėte informaciją"</string>
- <string name="close" msgid="3043722427445528732">"Uždaryti"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Šie failai nebuvo nukopijuoti: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Šie failai nebuvo perkelti: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Šie failai nebuvo ištrinti: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Šie failai konvertuoti į kitą formatą: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Nukopijuotas <xliff:g id="COUNT_1">%1$d</xliff:g> failas į iškarpinę.</item>
- <item quantity="few">Nukopijuoti <xliff:g id="COUNT_1">%1$d</xliff:g> failai į iškarpinę.</item>
- <item quantity="many">Nukopijuota <xliff:g id="COUNT_1">%1$d</xliff:g> failo į iškarpinę.</item>
- <item quantity="other">Nukopijuota <xliff:g id="COUNT_1">%1$d</xliff:g> failų į iškarpinę.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Nepavyko įklijuoti pasirinktų failų šioje vietoje."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Pervardyti"</string>
- <string name="rename_error" msgid="4203041674883412606">"Nepavyko pervardyti dokumento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Kai kurie failai buvo konvertuoti"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Suteikti „<xliff:g id="APPNAME"><b>^1</b></xliff:g>“ prieigą prie katalogo „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Suteikti „<xliff:g id="APPNAME"><b>^1</b></xliff:g>“ prieigą prie katalogo „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Suteikti programai „<xliff:g id="APPNAME"><b>^1</b></xliff:g>“ prieigą prie duomenų, įskaitant nuotraukas ir vaizdo įrašus, <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Daugiau neklausti"</string>
- <string name="allow" msgid="7225948811296386551">"Leisti"</string>
- <string name="deny" msgid="2081879885755434506">"Atmesti"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Pasirinktas <xliff:g id="COUNT_1">%1$d</xliff:g> elementas</item>
- <item quantity="few">Pasirinkti <xliff:g id="COUNT_1">%1$d</xliff:g> elementai</item>
- <item quantity="many">Pasirinkta <xliff:g id="COUNT_1">%1$d</xliff:g> elemento</item>
- <item quantity="other">Pasirinkta <xliff:g id="COUNT_1">%1$d</xliff:g> elementų</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> elementas</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> elementai</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> elemento</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementų</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ištrinti „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ištrinti aplanką „<xliff:g id="NAME">%1$s</xliff:g>“ ir jo turinį?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failą?</item>
- <item quantity="few">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failus?</item>
- <item quantity="many">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failo?</item>
- <item quantity="other">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failų?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> aplanką ir jų turinį?</item>
- <item quantity="few">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> aplankus ir jų turinį?</item>
- <item quantity="many">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> aplanko ir jų turinį?</item>
- <item quantity="other">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> aplankų ir jų turinį?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> elementą?</item>
- <item quantity="few">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> elementus?</item>
- <item quantity="many">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> elemento?</item>
- <item quantity="other">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> elementų?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml
deleted file mode 100644
index c69232c..0000000
--- a/packages/DocumentsUI/res/values-lv/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Lejupielādes"</string>
- <string name="title_open" msgid="4353228937663917801">"Atvēršana no:"</string>
- <string name="title_save" msgid="2433679664882857999">"Saglabāšana:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Jauna mape"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Režģis"</string>
- <string name="menu_list" msgid="7279285939892417279">"Saraksts"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Kārtot pēc"</string>
- <string name="menu_search" msgid="3816712084502856974">"Meklēt"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Atmiņas iestatījumi"</string>
- <string name="menu_open" msgid="432922957274920903">"Atvērt"</string>
- <string name="menu_save" msgid="2394743337684426338">"Saglabāt"</string>
- <string name="menu_share" msgid="3075149983979628146">"Kopīgot"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Dzēst"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Atlasīt visus"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopēt…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Pārvietot uz…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Jauns logs"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Izgriezt"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopēt"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Ielīmēt"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Rādīt iekšējo atmiņu"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Paslēpt iekšējo atmiņu"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Rādīt failu lielumu"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Paslēpt failu lielumu"</string>
- <string name="button_select" msgid="527196987259139214">"Atlasīt"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopēt"</string>
- <string name="button_move" msgid="2202666023104202232">"Pārvietot"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Noraidīt"</string>
- <string name="button_retry" msgid="4392027584153752797">"Mēģināt vēlreiz"</string>
- <string name="sort_name" msgid="9183560467917256779">"Pēc nosaukuma"</string>
- <string name="sort_date" msgid="586080032956151448">"Pēc pārveidošanas datuma"</string>
- <string name="sort_size" msgid="3350681319735474741">"Pēc lieluma"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Rādīt saknes"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Slēpt saknes"</string>
- <string name="save_error" msgid="6167009778003223664">"Neizdevās saglabāt dokumentu."</string>
- <string name="create_error" msgid="3735649141335444215">"Neizdevās izveidot mapi."</string>
- <string name="query_error" msgid="5999895349602476581">"Pašlaik nevar ielādēt saturu."</string>
- <string name="root_recent" msgid="4470053704320518133">"Pēdējie"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Brīva vieta: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Glabāšanas pakalpojumi"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Saīsnes"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Ierīces"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Vairāk lietotņu"</string>
- <string name="empty" msgid="7858882803708117596">"Nav vienumu"</string>
- <string name="no_results" msgid="6622510343880730446">"Failā %1$s nav atbilstību"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Nevar atvērt failu."</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nevar dzēst dažus dokumentus."</string>
- <string name="share_via" msgid="8966594246261344259">"Kopīgot, izmantojot"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Notiek failu kopēšana"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Failu pārvietošana"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Notiek failu dzēšana"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Atlikušais laiks: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="zero">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> failu kopēšana.</item>
- <item quantity="one">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> faila kopēšana.</item>
- <item quantity="other">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> failu kopēšana.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="zero">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> failu pārvietošana.</item>
- <item quantity="one">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> faila pārvietošana.</item>
- <item quantity="other">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> failu pārvietošana.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="zero">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> failu dzēšana.</item>
- <item quantity="one">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> faila dzēšana.</item>
- <item quantity="other">Notiek <xliff:g id="COUNT_1">%1$d</xliff:g> failu dzēšana.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Atsaukt"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Gatavošanās kopēšanai…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Sagatavošana pārvietošanai…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Notiek gatavošanās dzēšanai…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="zero">Nevarēja nokopēt <xliff:g id="COUNT_1">%1$d</xliff:g> failus</item>
- <item quantity="one">Nevarēja nokopēt <xliff:g id="COUNT_1">%1$d</xliff:g> failu</item>
- <item quantity="other">Nevarēja nokopēt <xliff:g id="COUNT_1">%1$d</xliff:g> failus</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="zero">Nevarēja pārvietot <xliff:g id="COUNT_1">%1$d</xliff:g> failus</item>
- <item quantity="one">Nevarēja pārvietot <xliff:g id="COUNT_1">%1$d</xliff:g> failu</item>
- <item quantity="other">Nevarēja pārvietot <xliff:g id="COUNT_1">%1$d</xliff:g> failus</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="zero">Nevarēja izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus</item>
- <item quantity="one">Nevarēja izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failu</item>
- <item quantity="other">Nevarēja izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Pieskarieties, lai skatītu informāciju"</string>
- <string name="close" msgid="3043722427445528732">"Aizvērt"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Netika nokopēti šādi faili: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Netika pārvietoti šādi faili: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Netika izdzēsti šādi faili: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Šie faili tika pārveidoti citā formātā: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> faili tika kopēti starpliktuvē.</item>
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fails tika kopēts starpliktuvē.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> faili tika kopēti starpliktuvē.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Atlasītos failus šeit nevar ielīmēt."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Pārdēvēt"</string>
- <string name="rename_error" msgid="4203041674883412606">"Neizdevās pārdēvēt dokumentu"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Daži faili tika pārveidoti."</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Vai atļaut lietotnei <xliff:g id="APPNAME"><b>^1</b></xliff:g> piekļūt direktorijam <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> šajā krātuvē: <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Vai piešķirt lietotnei <xliff:g id="APPNAME"><b>^1</b></xliff:g> piekļuvi direktorijam <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Vai atļaut lietotnei <xliff:g id="APPNAME"><b>^1</b></xliff:g> piekļūt jūsu datiem, tostarp fotoattēliem un videoklipiem, šajā krātuvē: <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Turpmāk vairs nejautāt"</string>
- <string name="allow" msgid="7225948811296386551">"Atļaut"</string>
- <string name="deny" msgid="2081879885755434506">"Noraidīt"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīti</item>
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīts</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīti</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> vienumu</item>
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> vienums</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vienumi</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vai izdzēst failu “<xliff:g id="NAME">%1$s</xliff:g>”?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vai izdzēst mapi “<xliff:g id="NAME">%1$s</xliff:g>” un tās saturu?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="zero">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus?</item>
- <item quantity="one">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failu?</item>
- <item quantity="other">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="zero">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> mapes un to saturu?</item>
- <item quantity="one">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> mapi un to saturu?</item>
- <item quantity="other">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> mapes un to saturu?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="zero">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> vienumus?</item>
- <item quantity="one">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> vienumu?</item>
- <item quantity="other">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> vienumus?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
deleted file mode 100644
index 6fa64f0..0000000
--- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документи"</string>
- <string name="downloads_label" msgid="959113951084633612">"Преземања"</string>
- <string name="title_open" msgid="4353228937663917801">"Отвори од"</string>
- <string name="title_save" msgid="2433679664882857999">"Зачувај во"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Нова папка"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Приказ на мрежа"</string>
- <string name="menu_list" msgid="7279285939892417279">"Приказ на список"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Подреди по"</string>
- <string name="menu_search" msgid="3816712084502856974">"Пребарај"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Поставки на меморија"</string>
- <string name="menu_open" msgid="432922957274920903">"Отвори"</string>
- <string name="menu_save" msgid="2394743337684426338">"Зачувај"</string>
- <string name="menu_share" msgid="3075149983979628146">"Сподели"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Избриши"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Избери ги сите"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Копирај во…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Премести во..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Нов прозорец"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Исечи"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копирај"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Залепи"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Прикажи внатрешна мемор."</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Скриј внатрешна меморија"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Прикажи ја големината"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Сокриј ја големината"</string>
- <string name="button_select" msgid="527196987259139214">"Избери"</string>
- <string name="button_copy" msgid="8706475544635021302">"Копирај"</string>
- <string name="button_move" msgid="2202666023104202232">"Премести"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Отфрли"</string>
- <string name="button_retry" msgid="4392027584153752797">"Обиди се пак"</string>
- <string name="sort_name" msgid="9183560467917256779">"По име"</string>
- <string name="sort_date" msgid="586080032956151448">"Изменети по датум"</string>
- <string name="sort_size" msgid="3350681319735474741">"По големина"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Прикажи корени"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Сокриј корени"</string>
- <string name="save_error" msgid="6167009778003223664">"Документот не успеа да се зачува"</string>
- <string name="create_error" msgid="3735649141335444215">"Не успеа да се создаде папка"</string>
- <string name="query_error" msgid="5999895349602476581">"Во моментов не може да се вчита содржина."</string>
- <string name="root_recent" msgid="4470053704320518133">"Последни"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> слободен простор"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Услуги на складирање"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Кратенки"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Уреди"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Повеќе апликации"</string>
- <string name="empty" msgid="7858882803708117596">"Нема ставки"</string>
- <string name="no_results" msgid="6622510343880730446">"Нема совпаѓања во %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Датотеката не може да се отвори"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Некои документи не може да се избришат"</string>
- <string name="share_via" msgid="8966594246261344259">"Сподели преку"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Се копираат датотеки"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Датотеките се преместуваат"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Се бришат датотеките"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Уште <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Се копира <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- <item quantity="other">Се копираат <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Се преместува <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- <item quantity="other">Се преместуваат <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Се брише <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- <item quantity="other">Се бришат <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Врати"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Се подготвува за копирање…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Се подготвува за преместување…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Се подготвува за бришење…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Не може да копира <xliff:g id="COUNT_1">%1$d</xliff:g> датотека</item>
- <item quantity="other">Не може да копира <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Не може да премести <xliff:g id="COUNT_1">%1$d</xliff:g> датотека</item>
- <item quantity="other">Не може да премести <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Не може да избрише <xliff:g id="COUNT_1">%1$d</xliff:g> датотека</item>
- <item quantity="other">Не може да избрише <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Допрете за да ги погледнете деталите"</string>
- <string name="close" msgid="3043722427445528732">"Затвори"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Датотекиве не се ископирани: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Датотекиве не се преместени: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Датотекиве не се избришани: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Овие датотеки беа конвертирани во друг формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Копирана е <xliff:g id="COUNT_1">%1$d</xliff:g> датотека на таблата со исечоци.</item>
- <item quantity="other">Копирани се <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки на таблата со исечоци.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Не може да ги залепи избраните датотеки на локацијава."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Преименувај"</string>
- <string name="rename_error" msgid="4203041674883412606">"Не успеа да се преименува документот"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Некои датотеки беа конвертирани"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Овозможете пристап на <xliff:g id="APPNAME"><b>^1</b></xliff:g> до директориумот <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Овозможете пристап на <xliff:g id="APPNAME"><b>^1</b></xliff:g> до директориумот <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Да се овозможи пристап на <xliff:g id="APPNAME"><b>^1</b></xliff:g> до вашите податоци, вклучувајќи фотографии и видеа, на <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Не прашувај повторно"</string>
- <string name="allow" msgid="7225948811296386551">"Дозволи"</string>
- <string name="deny" msgid="2081879885755434506">"Одбиј"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> е избрана</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> се избрани</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ставка</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ставки</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Да се избрише „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Да се избрише папката „<xliff:g id="NAME">%1$s</xliff:g>“ и нејзините содржини?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Да се избрише <xliff:g id="COUNT_1">%1$d</xliff:g> датотека?</item>
- <item quantity="other">Да се избришат <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Да се избрише <xliff:g id="COUNT_1">%1$d</xliff:g> папка и нивните содржини?</item>
- <item quantity="other">Да се избришат <xliff:g id="COUNT_1">%1$d</xliff:g> папки и нивните содржини?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Да се избрише <xliff:g id="COUNT_1">%1$d</xliff:g> ставка?</item>
- <item quantity="other">Да се избришат <xliff:g id="COUNT_1">%1$d</xliff:g> ставки?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
deleted file mode 100644
index 3a54bb3..0000000
--- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"പ്രമാണങ്ങൾ"</string>
- <string name="downloads_label" msgid="959113951084633612">"ഡൗണ്ലോഡുകൾ"</string>
- <string name="title_open" msgid="4353228937663917801">"ഇതിൽ നിന്നും തുറക്കുക"</string>
- <string name="title_save" msgid="2433679664882857999">"ഇതില് സംരക്ഷിക്കുക"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"പുതിയ ഫോൾഡർ"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ഗ്രിഡ് കാഴ്ച"</string>
- <string name="menu_list" msgid="7279285939892417279">"ലിസ്റ്റ് കാഴ്ച"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ഇപ്രകാരം അടുക്കുക"</string>
- <string name="menu_search" msgid="3816712084502856974">"തിരയൽ"</string>
- <string name="menu_settings" msgid="8239065133341597825">"സ്റ്റോറേജ് ക്രമീകരണം"</string>
- <string name="menu_open" msgid="432922957274920903">"തുറക്കുക"</string>
- <string name="menu_save" msgid="2394743337684426338">"സംരക്ഷിക്കുക"</string>
- <string name="menu_share" msgid="3075149983979628146">"പങ്കിടുക"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ഇല്ലാതാക്കുക"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ഇതിൽ പകർത്തുക…"</string>
- <string name="menu_move" msgid="1828090633118079817">"ഇതിലേക്ക് നീക്കുക..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"പുതിയ വിന്ഡോ"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"മുറിക്കുക"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"പകര്ത്തുക"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ഒട്ടിക്കുക"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"ആന്തരിക സ്റ്റോറേജ് കാണിക്കുക"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"ആന്തരിക സ്റ്റോറേജ് മറയ്ക്കുക"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ഫയൽ വലുപ്പം കാണിക്കുക"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ഫയൽ വലുപ്പം മറയ്ക്കുക"</string>
- <string name="button_select" msgid="527196987259139214">"തിരഞ്ഞെടുക്കുക"</string>
- <string name="button_copy" msgid="8706475544635021302">"പകര്ത്തുക"</string>
- <string name="button_move" msgid="2202666023104202232">"നീക്കുക"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ഡിസ്മിസ് ചെയ്യുക"</string>
- <string name="button_retry" msgid="4392027584153752797">"വീണ്ടും ശ്രമിക്കുക"</string>
- <string name="sort_name" msgid="9183560467917256779">"പേര് പ്രകാരം"</string>
- <string name="sort_date" msgid="586080032956151448">"പരിഷ്ക്കരിച്ച തീയതി പ്രകാരം"</string>
- <string name="sort_size" msgid="3350681319735474741">"വലുപ്പം പ്രകാരം"</string>
- <string name="drawer_open" msgid="4545466532430226949">"റൂട്ടുകൾ ദൃശ്യമാക്കുക"</string>
- <string name="drawer_close" msgid="7602734368552123318">"റൂട്ടുകൾ മറയ്ക്കുക"</string>
- <string name="save_error" msgid="6167009778003223664">"പ്രമാണം സംരക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
- <string name="create_error" msgid="3735649141335444215">"ഫോൾഡർ സൃഷ്ടിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
- <string name="query_error" msgid="5999895349602476581">"ഇപ്പോൾ ഉള്ളടക്കം ലോഡുചെയ്യാൻ കഴിയില്ല"</string>
- <string name="root_recent" msgid="4470053704320518133">"അടുത്തിടെയുള്ളവ"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ലഭ്യമാണ്"</string>
- <string name="root_type_service" msgid="2178854894416775409">"സംഭരണ സേവനങ്ങൾ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"കുറുക്കുവഴികൾ"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ഉപകരണങ്ങൾ"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"കൂടുതൽ അപ്ലിക്കേഷനുകൾ"</string>
- <string name="empty" msgid="7858882803708117596">"ഇനങ്ങളൊന്നുമില്ല"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s എന്നതിൽ പൊരുത്തങ്ങളില്ല"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ഫയൽ തുറക്കാൻ കഴിയില്ല"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"ചില പ്രമാണങ്ങൾ ഇല്ലാതാക്കാനായില്ല"</string>
- <string name="share_via" msgid="8966594246261344259">"ഇതുവഴി പങ്കിടുക"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ഫയലുകൾ പകർത്തുന്നു"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ഫയലുകൾ നീക്കുന്നു"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ഫയലുകൾ ഇല്ലാതാക്കുന്നു"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ശേഷിക്കുന്നു"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ പകർത്തുന്നു.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ പകർത്തുന്നു.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ നീക്കുന്നു.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ നീക്കുന്നു.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ ഇല്ലാതാക്കുന്നു.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ഇല്ലാതാക്കുന്നു.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"പഴയപടിയാക്കുക"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"പകർപ്പിനായി തയ്യാറെടുക്കുന്നു…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"നീക്കാനൊരുങ്ങുന്നു…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"ഇല്ലാതാക്കാൻ തയ്യാറെടുക്കുന്നു..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ പകർത്താനായില്ല</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ പകർത്താനായില്ല</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ നീക്കാനായില്ല</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ നീക്കാനായില്ല</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ ഇല്ലാതാക്കാനായില്ല</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ഇല്ലാതാക്കാനായില്ല</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"വിശദാംശങ്ങൾ കാണുന്നതിന് ടാപ്പുചെയ്യുക"</string>
- <string name="close" msgid="3043722427445528732">"അടയ്ക്കുക"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ഈ ഫയലുകൾ പകർത്തിയില്ല: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ഈ ഫയലുകൾ നീക്കിയില്ല: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ഈ ഫയലുകൾ ഇല്ലാതാക്കിയില്ല: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ഈ ഫയലുകൾ മറ്റൊരു ഫോർമാറ്റിലേക്ക് പരിവർത്തനം ചെയ്യപ്പെട്ടു: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"തിരഞ്ഞെടുത്ത ഫയലുകൾ ഈ ലൊക്കേഷനിൽ ഒട്ടിക്കാനാകുന്നില്ല."</string>
- <string name="menu_rename" msgid="7678802479104285353">"പേരുമാറ്റുക"</string>
- <string name="rename_error" msgid="4203041674883412606">"ഡോക്യുമെന്റിന്റെ പേരുമാറ്റുന്നത് പരാജയപ്പെട്ടു"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ചില ഫയലുകൾ പരിവർത്തനം ചെയ്യപ്പെട്ടു"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> സ്റ്റോറേജിലെ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> എന്ന ഡയറക്റ്ററിയിലേക്ക് <xliff:g id="APPNAME"><b>^1</b></xliff:g> ആപ്പിന് ആക്സസ് അനുവദിക്കണോ?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> എന്ന ഡയറക്ടറിയിലേക്ക് <xliff:g id="APPNAME"><b>^1</b></xliff:g> ആപ്പിന് ആക്സസ് അനുവദിക്കണോ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> സ്റ്റോറേജിലെ ഫോട്ടോകളും വീഡിയോകളും ഉൾപ്പെടെ, നിങ്ങളുടെ ഡാറ്റയിലേക്ക് <xliff:g id="APPNAME"><b>^1</b></xliff:g> ആപ്പിന് ആക്സസ്സ് അനുവദിക്കണോ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"വീണ്ടും ആവശ്യപ്പെടരുത്"</string>
- <string name="allow" msgid="7225948811296386551">"അനുവദിക്കുക"</string>
- <string name="deny" msgid="2081879885755434506">"നിരസിക്കുക"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഇനങ്ങൾ</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഇനം</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ഇല്ലാതാക്കണോ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" എന്ന ഫോൾഡറും അതിലെ ഉള്ളടങ്ങളും ഇല്ലാതാക്കണോ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ ഇല്ലാതാക്കണോ?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ഇല്ലാതാക്കണോ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫോൾഡറുകളും അവയിലെ ഉള്ളടക്കങ്ങളും ഇല്ലാതാക്കണോ?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫോൾഡറും അതിലെ ഉള്ളടക്കങ്ങളും ഇല്ലാതാക്കണോ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഇനങ്ങൾ ഇല്ലാതാക്കണോ?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഇനം ഇല്ലാതാക്കണോ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
deleted file mode 100644
index 4cea9cc2..0000000
--- a/packages/DocumentsUI/res/values-mn-rMN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документүүд"</string>
- <string name="downloads_label" msgid="959113951084633612">"Таталт"</string>
- <string name="title_open" msgid="4353228937663917801">"Нээх"</string>
- <string name="title_save" msgid="2433679664882857999">"Хадгалах"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Шинэ фолдер"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Эгнүүлж харах"</string>
- <string name="menu_list" msgid="7279285939892417279">"Жагсааж харах"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Эрэмбэлэх"</string>
- <string name="menu_search" msgid="3816712084502856974">"Хайх"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Хадгалах сангийн тохиргоо"</string>
- <string name="menu_open" msgid="432922957274920903">"Нээх"</string>
- <string name="menu_save" msgid="2394743337684426338">"Хадгалах"</string>
- <string name="menu_share" msgid="3075149983979628146">"Хуваалцах"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Устгах"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Бүгдийг сонгох"</string>
- <string name="menu_copy" msgid="3612326052677229148">"...руу хуулах"</string>
- <string name="menu_move" msgid="1828090633118079817">"Байршуулах газар"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Шинэ цонх"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Таслах"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Хуулах"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Буулгах"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Дотоод санг харуулах"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Дотоод санг нуух"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Файлын хэмжээг харуулах"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Файлын хэмжээг нуух"</string>
- <string name="button_select" msgid="527196987259139214">"Сонгох"</string>
- <string name="button_copy" msgid="8706475544635021302">"Хуулах"</string>
- <string name="button_move" msgid="2202666023104202232">"Зөөх"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Алгасах"</string>
- <string name="button_retry" msgid="4392027584153752797">"Дахин оролдоно уу"</string>
- <string name="sort_name" msgid="9183560467917256779">"Нэрээр"</string>
- <string name="sort_date" msgid="586080032956151448">"Өөрчлөгдсөн огноогоор"</string>
- <string name="sort_size" msgid="3350681319735474741">"Хэмжээгээр"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Язгуурыг харуулах"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Язгуурыг нууцлах"</string>
- <string name="save_error" msgid="6167009778003223664">"Документыг хадгалж чадсангүй"</string>
- <string name="create_error" msgid="3735649141335444215">"Фолдер үүсгэж чадсангүй"</string>
- <string name="query_error" msgid="5999895349602476581">"Одоогоор агуулгыг ачааллах боломжгүй байна"</string>
- <string name="root_recent" msgid="4470053704320518133">"Саяхны"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> чөлөөтэй"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Сангийн үйлчилгээ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Товчлол"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Төхөөрөмжүүд"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Өөр апп-ууд"</string>
- <string name="empty" msgid="7858882803708117596">"Хоосон"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s-д тохирох зүйл байхгүй байна"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Файлыг нээх боломжгүй байна"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Зарим документуудыг устгах боломжгүй"</string>
- <string name="share_via" msgid="8966594246261344259">"Дараахаар дамжуулан хуваалцах"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Файлуудыг хуулж байна"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Файлыг зөөвөрлөж байна"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Эдгээр файлыг устгаж байна"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> үлдсэн"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файлуудыг хуулж байна.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файл хуулж байна.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файл зөөж байна.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файл зөөж байна.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлыг устгаж байна.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлыг устгаж байна.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Буцаах"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Хуулбарлахад бэлтгэж байна..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Зөөвөрлөхөд бэлтгэж байна..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Устгах гэж байна..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файлыг хуулж чадсангүй</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файлыг хуулж чадахгүй байна</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файлыг зөөх боломжгүй байна</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файлыг зөөх боломжгүй байна</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файлыг устгаж чадсангүй</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файлыг устгаж чадсангүй</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Дэлгэрэнгүй мэдээллийг үзэхийн тулд дарна уу"</string>
- <string name="close" msgid="3043722427445528732">"Хаах"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Эдгээр файлыг хуулж чадсангүй: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Эдгээр файлыг зөөж чадсангүй: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Эдгээр файл устсангүй: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Эдгээр файлыг өөр хэлбэршилтэд хөрвүүлсэн байна: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> материалыг түр санах ой руу хуулсан.</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> материалыг түр санах ой руу хуулсан.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Энэ байршилд сонгосон файлыг байршуулах боломжгүй байна."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Нэр өөрчлөх"</string>
- <string name="rename_error" msgid="4203041674883412606">"Баримт бичгийн нэрийн өөрчилж чадсангүй"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Зарим файлыг хөрвүүлсэн"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g>-д байгаа <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> лавлагаанд хандахыг <xliff:g id="APPNAME"><b>^1</b></xliff:g>-д зөвшөөрөх үү?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> лавлагаанд хандах эрхийг <xliff:g id="APPNAME"><b>^1</b></xliff:g>-д олгох уу?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>-д байгаа зураг, видео гэх мэт таны өгөгдөлд <xliff:g id="APPNAME"><b>^1</b></xliff:g> хандахыг зөвшөөрөх үү?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Дахин бүү асуу"</string>
- <string name="allow" msgid="7225948811296386551">"Зөвшөөрөх"</string>
- <string name="deny" msgid="2081879885755434506">"Татгалзах"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> сонгосон</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> сонгосон</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> зүйл</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> зүйл</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\"-г устгах уу?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" фолдер болон үүний агуулгыг устгах уу?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файлыг устгах уу?</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файлыг устгах уу?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> фолдер болон агуулгуудыг нь устгах уу?</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> фолдер болон агуулгыг нь устгах уу?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> зүйлийг устгах уу?</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> зүйлийг устгах уу?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
deleted file mode 100644
index 8576344..0000000
--- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"दस्तऐवज"</string>
- <string name="downloads_label" msgid="959113951084633612">"डाउनलोड"</string>
- <string name="title_open" msgid="4353228937663917801">"वरून उघडा"</string>
- <string name="title_save" msgid="2433679664882857999">"येथे जतन करा"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"नवीन फोल्डर"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ग्रिड दृश्य"</string>
- <string name="menu_list" msgid="7279285939892417279">"सूची"</string>
- <string name="menu_sort" msgid="7677740407158414452">"नुसार क्रमवारी लावा"</string>
- <string name="menu_search" msgid="3816712084502856974">"शोध"</string>
- <string name="menu_settings" msgid="8239065133341597825">"संचयन सेटिंग्ज"</string>
- <string name="menu_open" msgid="432922957274920903">"उघडा"</string>
- <string name="menu_save" msgid="2394743337684426338">"जतन करा"</string>
- <string name="menu_share" msgid="3075149983979628146">"सामायिक करा"</string>
- <string name="menu_delete" msgid="8138799623850614177">"हटवा"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"सर्व निवडा"</string>
- <string name="menu_copy" msgid="3612326052677229148">"यावर कॉपी करा…"</string>
- <string name="menu_move" msgid="1828090633118079817">"यावर हलवा…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"नवीन विंडो"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"कट करा"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"कॉपी करा"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"पेस्ट करा"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"अंतर्गत संचयन दर्शवा"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"अंतर्गत संचयन लपवा"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"फाईल आकार दर्शवा"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"फाईल आकार लपवा"</string>
- <string name="button_select" msgid="527196987259139214">"निवडा"</string>
- <string name="button_copy" msgid="8706475544635021302">"कॉपी करा"</string>
- <string name="button_move" msgid="2202666023104202232">"हलवा"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"डिसमिस करा"</string>
- <string name="button_retry" msgid="4392027584153752797">"पुन्हा प्रयत्न करा"</string>
- <string name="sort_name" msgid="9183560467917256779">"नावानुसार"</string>
- <string name="sort_date" msgid="586080032956151448">"सुधारित केलेल्या तारखेनुसार"</string>
- <string name="sort_size" msgid="3350681319735474741">"आकारानुसार"</string>
- <string name="drawer_open" msgid="4545466532430226949">"रूट दर्शवा"</string>
- <string name="drawer_close" msgid="7602734368552123318">"रूट लपवा"</string>
- <string name="save_error" msgid="6167009778003223664">"दस्तऐवज जतन करणे अयशस्वी झाले"</string>
- <string name="create_error" msgid="3735649141335444215">"फोल्डर तयार करण्यात अयशस्वी"</string>
- <string name="query_error" msgid="5999895349602476581">"याक्षणी सामग्री लोड करू शकत नाही"</string>
- <string name="root_recent" msgid="4470053704320518133">"अलीकडील"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> विनामूल्य"</string>
- <string name="root_type_service" msgid="2178854894416775409">"संचयन सेवा"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"शॉर्टकट"</string>
- <string name="root_type_device" msgid="7121342474653483538">"डिव्हाइसेस"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"अधिक अॅप्स"</string>
- <string name="empty" msgid="7858882803708117596">"कोणतेही आयटम नाहीत"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s मध्ये कोणत्याही जुळण्या नाहीत"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"फाईल उघडू शकत नाही"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"काही दस्तऐवज हटविण्यात अक्षम"</string>
- <string name="share_via" msgid="8966594246261344259">"द्वारे सामायिक करा"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"फायली कॉपी करीत आहे"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"फायली हलविणे"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"फायली हटवित आहे"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> शिल्लक"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फाईल कॉपी करीत आहे.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फायली कॉपी करीत आहे.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फाईल हलवित आहे.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फायली हलवित आहे.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फाईल हटवित आहे.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फायली हटवित आहे.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"पूर्ववत करा"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"कॉपी करण्यासाठी तयार करीत आहे…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"हलविण्यास तयार होत आहे…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"हटविण्यासाठी तयार करीत आहे..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाईल कॉपी करणे शक्य झाले नाही</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फायली कॉपी करणे शक्य झाले नाही</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाईल हलविणे शक्य झाले नाही</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फायली हलविणे शक्य झाले नाही</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाईल हटविणे शक्य झाले नाही</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फायली हटविणे शक्य झाले नाही</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"तपशील पाहण्यासाठी टॅप करा"</string>
- <string name="close" msgid="3043722427445528732">"बंद करा"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"या फायलींची कॉपी झाली नाही: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"या फायली हलविल्या नाहीत: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"या फायली हटविल्या नाहीत: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"या फायली दुसऱ्या स्वरूपनात रूपांतरित केल्या होत्या: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">क्लिपबोर्डवर <xliff:g id="COUNT_1">%1$d</xliff:g> फाईल कॉपी केली.</item>
- <item quantity="other">क्लिपबोर्डवर <xliff:g id="COUNT_1">%1$d</xliff:g> फायली कॉपी केल्या.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"या स्थानामध्ये निवडलेल्या फायली पेस्ट करू शकत नाही."</string>
- <string name="menu_rename" msgid="7678802479104285353">"पुनर्नामित करा"</string>
- <string name="rename_error" msgid="4203041674883412606">"दस्तऐवज पुनर्नामित करण्यात अयशस्वी झाले"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"काही फायली रूपांतरित केल्या होत्या"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> वर <xliff:g id="APPNAME"><b>^1</b></xliff:g> ला <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिकेवर प्रवेशाची मंजूरी द्यायची?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ला <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिकमध्ये प्रवेश मंजूर करायचा?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ला <xliff:g id="STORAGE"><i>^2</i></xliff:g> वर फोटो आणि व्हिडिओंसह, आपल्या डेटामध्ये प्रवेश करण्याची मंजूरी द्यायची?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"पुन्हा विचारू नका"</string>
- <string name="allow" msgid="7225948811296386551">"अनुमती द्या"</string>
- <string name="deny" msgid="2081879885755434506">"नकार द्या"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडला</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडले</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> आयटम</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> आयटम</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" हटवायची?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" फोल्डर आणि त्यामधील सामग्री हटवायची?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फाईल हटवायची?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फायली हटवायच्या?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फोल्डर आणि त्यामधील सामग्री हटवायची?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फोल्डर आणि त्यामधील सामग्री हटवायची?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> आयटम हटवायचा?</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> आयटम हटवायचे?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 9d8bea6..0000000
--- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumen"</string>
- <string name="downloads_label" msgid="959113951084633612">"Muat turun"</string>
- <string name="title_open" msgid="4353228937663917801">"Buka dari"</string>
- <string name="title_save" msgid="2433679664882857999">"Simpan ke"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Folder baharu"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Paparan grid"</string>
- <string name="menu_list" msgid="7279285939892417279">"Paparan senarai"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Isih mengikut"</string>
- <string name="menu_search" msgid="3816712084502856974">"Cari"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Tetapan storan"</string>
- <string name="menu_open" msgid="432922957274920903">"Buka"</string>
- <string name="menu_save" msgid="2394743337684426338">"Simpan"</string>
- <string name="menu_share" msgid="3075149983979628146">"Kongsi"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Padam"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Pilih semua"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Salin ke..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Alihkan ke…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Tetingkap baharu"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Potong"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Salin"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Tampal"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Papar storan dalaman"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Sembunyikan storan dlmn"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Papar saiz fail"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan saiz fail"</string>
- <string name="button_select" msgid="527196987259139214">"Pilih"</string>
- <string name="button_copy" msgid="8706475544635021302">"Salin"</string>
- <string name="button_move" msgid="2202666023104202232">"Alihkan"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Tolak"</string>
- <string name="button_retry" msgid="4392027584153752797">"Cuba Lagi"</string>
- <string name="sort_name" msgid="9183560467917256779">"Mengikut nama"</string>
- <string name="sort_date" msgid="586080032956151448">"Mengikut tarikh diubah"</string>
- <string name="sort_size" msgid="3350681319735474741">"Mengikut saiz"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Tunjukkan akar"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Sembunyikan akar"</string>
- <string name="save_error" msgid="6167009778003223664">"Gagal menyimpan dokumen"</string>
- <string name="create_error" msgid="3735649141335444215">"Gagal membuat folder"</string>
- <string name="query_error" msgid="5999895349602476581">"Tidak dapat memuatkan kandungan pada masa ini"</string>
- <string name="root_recent" msgid="4470053704320518133">"Terbaharu"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> kosong"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Perkhidmatan storan"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Pintasan"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Peranti"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Lebih banyak apl"</string>
- <string name="empty" msgid="7858882803708117596">"Tiada item"</string>
- <string name="no_results" msgid="6622510343880730446">"Tiada padanan dalam %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Tidak dapat membuka fail"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Tidak dapat memadam beberapa dokumen"</string>
- <string name="share_via" msgid="8966594246261344259">"Kongsi melalui"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Menyalin fail"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Mengalihkan fail"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Memadamkan fail"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> lagi"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Menyalin <xliff:g id="COUNT_1">%1$d</xliff:g> fail.</item>
- <item quantity="one">Menyalin <xliff:g id="COUNT_0">%1$d</xliff:g> fail.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Mengalihkan <xliff:g id="COUNT_1">%1$d</xliff:g> fail.</item>
- <item quantity="one">Mengalihkan <xliff:g id="COUNT_0">%1$d</xliff:g> fail.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Memadam <xliff:g id="COUNT_1">%1$d</xliff:g> fail.</item>
- <item quantity="one">Memadam <xliff:g id="COUNT_0">%1$d</xliff:g> fail.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Buat asal"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Bersedia untuk salin..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Bersedia untuk mengalih…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Bersedia untuk memadam…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Tidak dapat menyalin <xliff:g id="COUNT_1">%1$d</xliff:g> fail</item>
- <item quantity="one">Tidak dapat menyalin <xliff:g id="COUNT_0">%1$d</xliff:g> fail</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Tidak dapat mengalihkan <xliff:g id="COUNT_1">%1$d</xliff:g> fail</item>
- <item quantity="one">Tidak dapat mengalihkan <xliff:g id="COUNT_0">%1$d</xliff:g> fail</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Tidak dapat memadamkan <xliff:g id="COUNT_1">%1$d</xliff:g> fail</item>
- <item quantity="one">Tidak dapat memadamkan <xliff:g id="COUNT_0">%1$d</xliff:g> fail</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Ketik untuk melihat butiran"</string>
- <string name="close" msgid="3043722427445528732">"Tutup"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Fail ini tidak disalin: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Fail ini tidak dialihkan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Fail ini tidak dipadamkan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Fail ini telah ditukarkan kepada format lain: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fail disalin ke papan keratan.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fail disalin ke papan keratan.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Tidak boleh menampalkan fail yang dipilih dalam lokasi ini."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Namakan semula"</string>
- <string name="rename_error" msgid="4203041674883412606">"Gagal menamakan semula dokumen"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sesetengah fail telah ditukarkan"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses kepada direktori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> di <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses kepada direktori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses kepada data anda, termasuk foto dan video pada <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Jangan tanya lagi"</string>
- <string name="allow" msgid="7225948811296386551">"Benarkan"</string>
- <string name="deny" msgid="2081879885755434506">"Nafi"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> item</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Padamkan \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Padamkan folder \"<xliff:g id="NAME">%1$s</xliff:g>\" dan kandungannya?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Padamkan <xliff:g id="COUNT_1">%1$d</xliff:g> fail?</item>
- <item quantity="one">Padamkan <xliff:g id="COUNT_0">%1$d</xliff:g> fail?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Padamkan <xliff:g id="COUNT_1">%1$d</xliff:g> folder dan kandungannya?</item>
- <item quantity="one">Padamkan <xliff:g id="COUNT_0">%1$d</xliff:g> folder dan kandungannya?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Padamkan <xliff:g id="COUNT_1">%1$d</xliff:g> item?</item>
- <item quantity="one">Padamkan <xliff:g id="COUNT_0">%1$d</xliff:g> item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml
deleted file mode 100644
index d608996..0000000
--- a/packages/DocumentsUI/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"စာရွက်စာတန်းများ"</string>
- <string name="downloads_label" msgid="959113951084633612">"ဒေါင်းလုဒ်များ"</string>
- <string name="title_open" msgid="4353228937663917801">"မှ ဖွင့်ပါ"</string>
- <string name="title_save" msgid="2433679664882857999">"သို့ သိမ်းပါ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"ဖိုလ်ဒါ အသစ်"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ဖယားကွက်မြင်ကွင်း"</string>
- <string name="menu_list" msgid="7279285939892417279">"အစဉ်လိုက်မြင်ကွင်း"</string>
- <string name="menu_sort" msgid="7677740407158414452">"အစဉ်အလိုက် စီခြင်း"</string>
- <string name="menu_search" msgid="3816712084502856974">"ရှာဖွေရန်"</string>
- <string name="menu_settings" msgid="8239065133341597825">"သိုလှောင်မှု ဆက်တင်များ"</string>
- <string name="menu_open" msgid="432922957274920903">"ဖွင့်ရန်"</string>
- <string name="menu_save" msgid="2394743337684426338">"သိမ်းပါ"</string>
- <string name="menu_share" msgid="3075149983979628146">"မျှဝေခြင်း"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ဖျက်ပစ်ရန်"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"အားလုံးကို ရွေးရန်"</string>
- <string name="menu_copy" msgid="3612326052677229148">"…သို့ကူးယူရန်"</string>
- <string name="menu_move" msgid="1828090633118079817">"...သို့ ရွှေ့ရန်"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"ဝင်းဒိုးသစ်"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ဖြတ်ယူရန်"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ကူးယူရန်"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ကပ်ရန်"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"စက်ရှိစတိုရုံ ပြပါ"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"စက်ရှိစတိုရုံ ဖျောက်ထားပါ"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ဖိုင်အရွယ်အစား ပြပါ"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ဖိုင်အရွယ်အစား ဝှက်ပါ"</string>
- <string name="button_select" msgid="527196987259139214">"ရွေးရန်"</string>
- <string name="button_copy" msgid="8706475544635021302">"ကူးယူရန်"</string>
- <string name="button_move" msgid="2202666023104202232">"ရွေ့မည်"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ပယ်ရန်"</string>
- <string name="button_retry" msgid="4392027584153752797">"ထပ် စမ်းကြည့်ပါ"</string>
- <string name="sort_name" msgid="9183560467917256779">"အမည်ဖြင့်"</string>
- <string name="sort_date" msgid="586080032956151448">"ပြင်ဆင်မှု ရက်စွဲဖြင့်"</string>
- <string name="sort_size" msgid="3350681319735474741">"အရွယ်အစားဖြင့်"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ဖိုဒါကို ဖွင့်လိုက်ပါ"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ဖိုဒါကို ပိတ်လိုက်ပါ"</string>
- <string name="save_error" msgid="6167009778003223664">"စာရွက်စာတန်း သိမ်းဆည်းမှု မအောင်မြင်ပါ"</string>
- <string name="create_error" msgid="3735649141335444215">"အကန့်အသစ် ဖန်တီးခြင်း မအောင်မြင်ပါ"</string>
- <string name="query_error" msgid="5999895349602476581">"အကြောင်းအရာများကို လောလောဆယ်တွင် တင်၍မရသေးပါ"</string>
- <string name="root_recent" msgid="4470053704320518133">"လတ်တလော"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> အသုံးချနိုင်ပါသည်"</string>
- <string name="root_type_service" msgid="2178854894416775409">"သိုလှောင်ရန်ဆားဗစ်များ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"အတိုကောက်များ"</string>
- <string name="root_type_device" msgid="7121342474653483538">"စက်ပစ္စည်းများ"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"နောက်ထပ်အပလီကေးရှင်းများ"</string>
- <string name="empty" msgid="7858882803708117596">"ဘာမှ မရှိပါ"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s တွင်ကိုက်ညီမှုမရှိပါ"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ဖိုင်ကိုဖွင့်၍မရပါ"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"တချို့ စာရွက်စာတန်းများ မဖျက်စီးနိုင်ပါ"</string>
- <string name="share_via" msgid="8966594246261344259">"မှ ဝေမျှပါ"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ဖိုင်များကူယူနေသည်"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ဖိုင်များ ရွှေ့နေသည်"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ဖိုင်များကို ဖျက်နေသည်"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ကျန်ရှိသည်"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ဖိုင်များကို ကူးယူနေသည်။</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ဖိုင် ကူးယူနေသည်။</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ဖိုင် ရွှေ့နေစဉ်</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ဖိုင် ရွှေ့နေစဉ်</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">ဖိုင် <xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုဖျက်နေသည်။</item>
- <item quantity="one">ဖိုင် <xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုဖျက်နေသည်။</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"ပြန်ဖျက်ရန်"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"မိတ္တူကူးရန်ပြင်ဆင်နေ..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"ရွှေ့ရန် ပြင်ဆင်နေသည်…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"ဖျက်ရန်အတွက် ပြင်ဆင်နေသည်..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">ဖိုင်<xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုကူးယူ၍မရခဲ့ပါ</item>
- <item quantity="one">ဖိုင်<xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုကူးယူ၍မရခဲ့ပါ</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">ဖိုင်<xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုရွှေ့၍မရခဲ့ပါ</item>
- <item quantity="one">ဖိုင်<xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုရွှေ့၍မရခဲ့ပါ</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">ဖိုင်<xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုဖျက်၍မရခဲ့ပါ</item>
- <item quantity="one">ဖိုင်<xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုဖျက်၍မရခဲ့ပါ</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"အသေးစိတ်ကြည့်ရန် တို့ပါ"</string>
- <string name="close" msgid="3043722427445528732">"ပိတ်ပါ"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ဤဖိုင်များကို မကူးယူခဲ့ပါ − <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ဤဖိုင်များကို မရွှေ့ခဲ့ပါ − <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ဤဖိုင်များကို ဖျက်၍မရခဲ့ပါ − <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ဤဖိုင်များကို အခြားပုံစံစနစ်တစ်ခုသို့ ပြောင်းလဲခဲ့သည် − <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"> ဖိုင် <xliff:g id="COUNT_1">%1$d</xliff:g> ဖိုင်ကိုအချက်အလက်သိမ်းတဲ့နေရာသို့ ကူးယူပါ။</item>
- <item quantity="one"> ဖိုင် <xliff:g id="COUNT_0">%1$d</xliff:g> ဖိုင်ကိုအချက်အလက်သိမ်းတဲ့နေရာသို့ ကူးယူပါ။</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ဤနေရာတွင် ရွေးချယ်ထားသည့် ဖိုင်များကို ကူးထည့်၍မရပါ။"</string>
- <string name="menu_rename" msgid="7678802479104285353">"အမည်ပြောင်းရန်"</string>
- <string name="rename_error" msgid="4203041674883412606">"စာရွက်စာတမ်းကို အမည်ပြောင်းခြင်း မအောင်မြင်ပါ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"အချို့ဖိုင်များကို ပြောင်းလဲထားသည်"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ကို <xliff:g id="STORAGE"><i>^3</i></xliff:g> ရှိ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> လမ်းညွှန်အား အသုံးပြုခွင့်ပေးမလား။"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> အား <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> စာရင်းကို အသုံးပြုခွင့်ပေးမလား။"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> ရှိဓာတ်ပုံများနှင့် ဗီဒီယိုများအပါအဝင် သင့်ဒေတာများကို <xliff:g id="APPNAME"><b>^1</b></xliff:g> အားအသုံးပြုခွင့်ပေးမလား။"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"နောက်ထပ်မမေးပါနှင့်"</string>
- <string name="allow" msgid="7225948811296386551">"ခွင့်ပြုသည်"</string>
- <string name="deny" msgid="2081879885755434506">"ငြင်းပယ်သည်"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ခုရွေးချယ်ထားသည်</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ခုရွေးချယ်ထားသည်</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ခု</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ခု</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ကိုဖျက်မလား။"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ဖိုင်တွဲနှင့် ၎င်းတွင်ပါဝင်သည့် အကြောင်းအရာများကို ဖျက်မလား။"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">ဖိုင် <xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုဖျက်မလား။</item>
- <item quantity="one">ဖိုင် <xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုဖျက်မလား။</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">ဖိုင်တွဲ <xliff:g id="COUNT_1">%1$d</xliff:g> ခုနှင့် ၎င်း၏အကြောင်းအရာများကို ဖျက်မလား။</item>
- <item quantity="one">ဖိုင်တွဲ <xliff:g id="COUNT_0">%1$d</xliff:g> ခုနှင့် ၎င်း၏အကြောင်းအရာများကို ဖျက်မလား။</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">အကြောင်းအရာ <xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုဖျက်မလား။</item>
- <item quantity="one">အကြောင်းအရာ <xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုဖျက်မလား။</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml
deleted file mode 100644
index c02e019..0000000
--- a/packages/DocumentsUI/res/values-nb/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenter"</string>
- <string name="downloads_label" msgid="959113951084633612">"Nedlastinger"</string>
- <string name="title_open" msgid="4353228937663917801">"Åpne fra"</string>
- <string name="title_save" msgid="2433679664882857999">"Lagre i"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Ny mappe"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Rutenettvisning"</string>
- <string name="menu_list" msgid="7279285939892417279">"Listevisning"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortér etter"</string>
- <string name="menu_search" msgid="3816712084502856974">"Søk"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Lagringsinnstillinger"</string>
- <string name="menu_open" msgid="432922957274920903">"Åpne"</string>
- <string name="menu_save" msgid="2394743337684426338">"Lagre"</string>
- <string name="menu_share" msgid="3075149983979628146">"Del"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Slett"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Markér alt"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiér til …"</string>
- <string name="menu_move" msgid="1828090633118079817">"Flytt til"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nytt vindu"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Klipp ut"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiér"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Lim inn"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Vis den interne lagringen"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Skjul den interne lagringen"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Vis filstørrelsen"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelsen"</string>
- <string name="button_select" msgid="527196987259139214">"Velg"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiér"</string>
- <string name="button_move" msgid="2202666023104202232">"Flytt"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Avvis"</string>
- <string name="button_retry" msgid="4392027584153752797">"Prøv på nytt"</string>
- <string name="sort_name" msgid="9183560467917256779">"Etter navn"</string>
- <string name="sort_date" msgid="586080032956151448">"Etter endringsdato"</string>
- <string name="sort_size" msgid="3350681319735474741">"Etter størrelse"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Vis røtter"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Skjul røtter"</string>
- <string name="save_error" msgid="6167009778003223664">"Kunne ikke lagre dokumentet"</string>
- <string name="create_error" msgid="3735649141335444215">"Kunne ikke opprette mappen"</string>
- <string name="query_error" msgid="5999895349602476581">"Kan ikke laste inn innholdet for øyeblikket"</string>
- <string name="root_recent" msgid="4470053704320518133">"Siste"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ledig"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Lagringstjenester"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Snarveier"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Enheter"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Flere apper"</string>
- <string name="empty" msgid="7858882803708117596">"Ingen elementer"</string>
- <string name="no_results" msgid="6622510343880730446">"Ingen treff i %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Kan ikke åpne filen"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Enkelte dokumenter kunne ikke slettes"</string>
- <string name="share_via" msgid="8966594246261344259">"Del via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopierer filer"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Flytter filer"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Sletter filene"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> gjenstår"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Kopierer <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="one">Kopierer <xliff:g id="COUNT_0">%1$d</xliff:g> fil.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Flytter <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="one">Flytter <xliff:g id="COUNT_0">%1$d</xliff:g> fil.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Sletter <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="one">Sletter <xliff:g id="COUNT_0">%1$d</xliff:g> fil.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Angre"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Forbereder kopiering …"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Forbereder flytting …"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Gjøres klar for sletting …"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Kunne ikke kopiere <xliff:g id="COUNT_1">%1$d</xliff:g> filer</item>
- <item quantity="one">Kunne ikke kopiere <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Kunne ikke flytte <xliff:g id="COUNT_1">%1$d</xliff:g> filer</item>
- <item quantity="one">Kunne ikke flytte <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Kunne ikke slette <xliff:g id="COUNT_1">%1$d</xliff:g> filer</item>
- <item quantity="one">Kunne ikke slette <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Trykk for å se detaljer"</string>
- <string name="close" msgid="3043722427445528732">"Lukk"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Disse filene er ikke kopiert: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Disse filene er ikke flyttet: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Disse filene ble ikke slettet: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Disse filene er konvertert til et annet format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Kopierte <xliff:g id="COUNT_1">%1$d</xliff:g> filer til utklippstavlen.</item>
- <item quantity="one">Kopierte <xliff:g id="COUNT_0">%1$d</xliff:g> fil til utklippstavlen.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Kan ikke lime inn de valgte filene her."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Gi nytt navn"</string>
- <string name="rename_error" msgid="4203041674883412606">"Kunne ikke gi dokumentet nytt navn"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Noen filer er konvertert"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Vil du gi <xliff:g id="APPNAME"><b>^1</b></xliff:g> tilgang til <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>-katalogen på <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Vil du gi <xliff:g id="APPNAME"><b>^1</b></xliff:g> tilgang til <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>-katalogen?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Vil du gi <xliff:g id="APPNAME"><b>^1</b></xliff:g> tilgang til dataene dine – inkludert bilder og videoer – på <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ikke spør igjen"</string>
- <string name="allow" msgid="7225948811296386551">"Tillat"</string>
- <string name="deny" msgid="2081879885755434506">"Avslå"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> er valgt</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> er valgt</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> varer</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vare</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vil du slette «<xliff:g id="NAME">%1$s</xliff:g>»?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vil du slette «<xliff:g id="NAME">%1$s</xliff:g>»-mappen og innholdet i den?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item>
- <item quantity="one">Vil du slette <xliff:g id="COUNT_0">%1$d</xliff:g> fil?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> mapper og innholdet i dem?</item>
- <item quantity="one">Vil du slette <xliff:g id="COUNT_0">%1$d</xliff:g> mappe og innholdet i den?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> elementer?</item>
- <item quantity="one">Vil du slette <xliff:g id="COUNT_0">%1$d</xliff:g> element?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 32ba7ad..0000000
--- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"कागजातहरू"</string>
- <string name="downloads_label" msgid="959113951084633612">"डाउनलोडहरू"</string>
- <string name="title_open" msgid="4353228937663917801">"यसबाट खोल्नुहोस्"</string>
- <string name="title_save" msgid="2433679664882857999">"यसमा सुरक्षित गर्नुहोस्"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"नयाँ फोल्डर"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ग्रिड दृश्य"</string>
- <string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string>
- <string name="menu_sort" msgid="7677740407158414452">"यसद्वारा क्रमवद्घ गर्नुहोस्"</string>
- <string name="menu_search" msgid="3816712084502856974">"खोज्नुहोस्"</string>
- <string name="menu_settings" msgid="8239065133341597825">"भण्डारण सेटिङहरू"</string>
- <string name="menu_open" msgid="432922957274920903">"खोल्नुहोस्"</string>
- <string name="menu_save" msgid="2394743337684426338">"सुरक्षित गर्नुहोस्"</string>
- <string name="menu_share" msgid="3075149983979628146">"साझेदारी गर्नुहोस्"</string>
- <string name="menu_delete" msgid="8138799623850614177">"मेटाउनुहोस्"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"सबै चयन गर्नुहोस्"</string>
- <string name="menu_copy" msgid="3612326052677229148">"यसमा प्रतिलिपि गर्नुहोस् ..."</string>
- <string name="menu_move" msgid="1828090633118079817">"…मा सार्नुहोस्"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"नयाँ विन्डो"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"काट्नुहोस्"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"प्रतिलिपि बनाउनुहोस्"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"टाँस्नुहोस्"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"आन्तरिक भण्डारण देखाउनुहोस्"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"आन्तरिक भण्डारण लुकाउनुहोस्"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"फाइल आकार देखाउनुहोस्"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"फाइल आकार लुकाउनुहोस्"</string>
- <string name="button_select" msgid="527196987259139214">"चयन गर्नुहोस्"</string>
- <string name="button_copy" msgid="8706475544635021302">"प्रतिलिपि बनाउनुहोस्"</string>
- <string name="button_move" msgid="2202666023104202232">"सार्नुहोस्"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"खारेज गर्नुहोस्"</string>
- <string name="button_retry" msgid="4392027584153752797">"पुन: प्रयास गर्नुहोस्"</string>
- <string name="sort_name" msgid="9183560467917256779">"नाम अनुसार"</string>
- <string name="sort_date" msgid="586080032956151448">"परिमार्जित मिति अनुसार"</string>
- <string name="sort_size" msgid="3350681319735474741">"आकार अनुसार"</string>
- <string name="drawer_open" msgid="4545466532430226949">"मूलहरू देखाउनुहोस्"</string>
- <string name="drawer_close" msgid="7602734368552123318">"मूलहरू लुकाउनुहोस्"</string>
- <string name="save_error" msgid="6167009778003223664">"कागजात सुरक्षित गर्न विफल भयो"</string>
- <string name="create_error" msgid="3735649141335444215">"फोल्डर सिर्जना गर्न असफल भयो"</string>
- <string name="query_error" msgid="5999895349602476581">"अहिले सामग्री लोड गर्न सक्दैन"</string>
- <string name="root_recent" msgid="4470053704320518133">"हालैको"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> खाली"</string>
- <string name="root_type_service" msgid="2178854894416775409">"भण्डारण सेवाहरू"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"सर्टकटहरू"</string>
- <string name="root_type_device" msgid="7121342474653483538">"उपकरणहरू"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"थप अनुप्रयोगहरू"</string>
- <string name="empty" msgid="7858882803708117596">"कुनै वस्तु छैन।"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s मा कुनै पनि मेल खानेहरू छैन"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"फाइल खोल्न सक्दैन"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"केही कागजातहरू मेट्न असमर्थ छ"</string>
- <string name="share_via" msgid="8966594246261344259">"माध्यमबाट साझेदारी गर्नुहोस्"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"फाइलहरू प्रतिलिपि गर्दै:"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"फाइलहरू सार्दै"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"फाइलहरूलाई मेट्दै"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g>बाँकी"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g>फाइलहरू प्रतिलिप गर्दै।</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> फाइल प्रतिलिपि गर्दै।</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू सार्दै।</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> फाइलहरु सार्दै।</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू मेट्दै।</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> फाइल मेट्दै।</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"अनडू गर्नुहोस्"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"प्रतिलिपिको लागि तयारी गर्दै ..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"सार्नको लागि तयारी गर्दै ..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"मेटाउन तयारी गर्दै..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू प्रतिलिपि गर्न सकेन</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> फाइल प्रतिलिपि गर्न सकेन</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू सार्न सकेन</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> फाइल सार्न सकेन</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू मेटाउन सकेन</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> फाइल मेटाउन सकेन</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"विवरणहरू हेर्न ट्याप गर्नुहोस्"</string>
- <string name="close" msgid="3043722427445528732">"बन्द गर्नुहोस्"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"यी फाइलहरू प्रतिलिपि गरिएको थिएनः <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"यी फाइलहरू सारिएको थिएन: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"यी फाइलहरूलाई मेटाइएको थिएन: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"यी फाइलहरू अर्को ढाँचामा परिणत गरिएका थिए: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"> क्लिपबोर्डमा <xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरू प्रतिलिपि बनाइए।</item>
- <item quantity="one"> क्लिपबोर्डमा <xliff:g id="COUNT_0">%1$d</xliff:g> फाइलहरूका प्रतिलिपि बनाइए।</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"यो स्थानमा चयन गरिएका फाइलहरू टाँस्न सकिँदैन।"</string>
- <string name="menu_rename" msgid="7678802479104285353">"पुन: नामाकरण गर्नुहोस्"</string>
- <string name="rename_error" msgid="4203041674883412606">"कागजात पुन: नामाकरण गर्न असफल भयो"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"केही फाइलहरू परिवर्तन गरिएका थिए"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> लाई <xliff:g id="STORAGE"><i>^3</i></xliff:g> मा भएको <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिकामा पहुँच गर्न अनुमति दिने हो?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> लाई <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिकामाथि पहुँच गर्न अनुमति प्रदान गर्ने हो?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> लाई <xliff:g id="STORAGE"><i>^2</i></xliff:g> मा भएका तस्बिर र भिडियोहरू लगायत तपाईँको डेटामा पहुँच गर्नका लागि अनुमति दिने हो?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"फेरि नसोध्नुहोस्"</string>
- <string name="allow" msgid="7225948811296386551">"अनुमति दिनुहोस्"</string>
- <string name="deny" msgid="2081879885755434506">"अस्वीकार गर्नुहोस्"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> लाई चयन गरियो</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> लाई चयन गरियो</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> वस्तुहरू</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> वस्तु</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" लाई मेट्ने हो?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"फोल्डर \"<xliff:g id="NAME">%1$s</xliff:g>\" र यसका सामग्रीहरूलाई मेट्ने हो?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरूलाई मेट्ने हो?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> फाइललाई मेट्ने हो?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फोल्डरहरू र तिनीहरूका सामग्रीहरूलाई मेट्ने हो?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> फोल्डर र यसका सामग्रीहरूलाई मेट्ने हो?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> वस्तुहरूलाई मेट्ने हो?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> वस्तुलाई मेट्ने हो?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml
deleted file mode 100644
index 7108230..0000000
--- a/packages/DocumentsUI/res/values-nl/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documenten"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Openen vanuit"</string>
- <string name="title_save" msgid="2433679664882857999">"Opslaan in"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nieuwe map"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Rasterweergave"</string>
- <string name="menu_list" msgid="7279285939892417279">"Lijstweergave"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sorteren op"</string>
- <string name="menu_search" msgid="3816712084502856974">"Zoeken"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Instellingen voor opslag"</string>
- <string name="menu_open" msgid="432922957274920903">"Openen"</string>
- <string name="menu_save" msgid="2394743337684426338">"Opslaan"</string>
- <string name="menu_share" msgid="3075149983979628146">"Delen"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Verwijderen"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Alles selecteren"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiëren naar…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Verplaatsen naar…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nieuw venster"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Knippen"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiëren"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Plakken"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Interne opslag weergeven"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Interne opslag verbergen"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Bestandsgrootte weergeven"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Bestandsgrootte verbergen"</string>
- <string name="button_select" msgid="527196987259139214">"Selecteren"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiëren"</string>
- <string name="button_move" msgid="2202666023104202232">"Verplaatsen"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Sluiten"</string>
- <string name="button_retry" msgid="4392027584153752797">"Opnieuw proberen"</string>
- <string name="sort_name" msgid="9183560467917256779">"Op naam"</string>
- <string name="sort_date" msgid="586080032956151448">"Op aanpassingsdatum"</string>
- <string name="sort_size" msgid="3350681319735474741">"Op grootte"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Roots weergeven"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Roots verbergen"</string>
- <string name="save_error" msgid="6167009778003223664">"Kan document niet opslaan"</string>
- <string name="create_error" msgid="3735649141335444215">"Kan map niet maken"</string>
- <string name="query_error" msgid="5999895349602476581">"Kan content momenteel niet laden"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recent"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> vrij"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Opslagservices"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Sneltoetsen"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Apparaten"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Meer apps"</string>
- <string name="empty" msgid="7858882803708117596">"Geen items"</string>
- <string name="no_results" msgid="6622510343880730446">"Geen overeenkomsten in %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Kan bestand niet openen"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Kan bepaalde documenten niet verwijderen"</string>
- <string name="share_via" msgid="8966594246261344259">"Delen via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Bestanden kopiëren"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Bestanden verplaatsen"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Bestanden verwijderen"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> resterend"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden kopiëren.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand kopiëren.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verplaatsen.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verplaatsen.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verwijderen.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verwijderen.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Ongedaan maken"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopiëren voorbereiden…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Verplaatsen voorbereiden…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Verwijderen voorbereiden…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> bestanden niet kopiëren</item>
- <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> bestand niet kopiëren</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> bestanden niet verplaatsen</item>
- <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> bestand niet verplaatsen</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> bestanden niet verwijderen</item>
- <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> bestand niet verwijderen</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tik om details te bekijken"</string>
- <string name="close" msgid="3043722427445528732">"Sluiten"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Deze bestanden zijn niet gekopieerd: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Deze bestanden zijn niet verplaatst: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Deze bestanden zijn niet verwijderd: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Deze bestanden zijn geconverteerd vanuit een andere indeling: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden gekopieerd naar klembord.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand gekopieerd naar klembord.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Kan de geselecteerde bestanden niet plakken op deze locatie."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Naam wijzigen"</string>
- <string name="rename_error" msgid="4203041674883412606">"Kan naam van document niet wijzigen"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sommige bestanden zijn geconverteerd"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang verlenen tot de map <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> op <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang verlenen tot de map <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang verlenen tot je gegevens, waaronder foto\'s en video\'s, op <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Niet meer vragen"</string>
- <string name="allow" msgid="7225948811296386551">"Toestaan"</string>
- <string name="deny" msgid="2081879885755434506">"Weigeren"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"<xliff:g id="NAME">%1$s</xliff:g> verwijderen?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Map <xliff:g id="NAME">%1$s</xliff:g> en de bijbehorende inhoud verwijderen?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verwijderen?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verwijderen?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> mappen en de bijbehorende inhoud verwijderen?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> map en de bijbehorende inhoud verwijderen?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verwijderen?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verwijderen?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
deleted file mode 100644
index a4ba3ad..0000000
--- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ਦਸਤਾਵੇਜ਼"</string>
- <string name="downloads_label" msgid="959113951084633612">"ਡਾਊਨਲੋਡ"</string>
- <string name="title_open" msgid="4353228937663917801">"ਤੋਂ ਖੋਲ੍ਹੋ"</string>
- <string name="title_save" msgid="2433679664882857999">"ਇਸ ਵਿੱਚ ਰੱਖਿਅਤ ਕਰੋ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"ਨਵਾਂ ਫੋਲਡਰ"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ਗ੍ਰਿਡ ਵਿਊ"</string>
- <string name="menu_list" msgid="7279285939892417279">"ਸੂਚੀ ਦ੍ਰਿਸ਼"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
- <string name="menu_search" msgid="3816712084502856974">"ਖੋਜੋ"</string>
- <string name="menu_settings" msgid="8239065133341597825">"ਸਟੋਰੇਜ ਸੈਟਿੰਗਾਂ"</string>
- <string name="menu_open" msgid="432922957274920903">"ਖੋਲ੍ਹੋ"</string>
- <string name="menu_save" msgid="2394743337684426338">"ਰੱਖਿਅਤ ਕਰੋ"</string>
- <string name="menu_share" msgid="3075149983979628146">"ਸਾਂਝਾ ਕਰੋ"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ਮਿਟਾਓ"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"ਸਭ ਚੁਣੋ"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ਇਸ ਵਿੱਚ ਕਾਪੀ ਕਰੋ…"</string>
- <string name="menu_move" msgid="1828090633118079817">"ਏਥੇ ਤਬਾਦਲਾ ਕਰੋ..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"ਨਵੀਂ ਵਿੰਡੋ"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ਕੱਟੋ"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ਕਾਪੀ ਕਰੋ"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ਪੇਸਟ ਕਰੋ"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਦਿਖਾਓ"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਲੁਕਾਓ"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ਫਾਈਲ ਆਕਾਰ ਦਿਖਾਓ"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ਫਾਈਲ ਆਕਾਰ ਲੁਕਾਓ"</string>
- <string name="button_select" msgid="527196987259139214">"ਚੁਣੋ"</string>
- <string name="button_copy" msgid="8706475544635021302">"ਕਾਪੀ ਕਰੋ"</string>
- <string name="button_move" msgid="2202666023104202232">"ਮੂਵ ਕਰੋ"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ਖਾਰਜ ਕਰੋ"</string>
- <string name="button_retry" msgid="4392027584153752797">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
- <string name="sort_name" msgid="9183560467917256779">"ਨਾਮ ਮੁਤਾਬਕ"</string>
- <string name="sort_date" msgid="586080032956151448">"ਸੋਧੇ ਜਾਣ ਦੀ ਤਾਰੀਖ਼ ਮੁਤਾਬਕ"</string>
- <string name="sort_size" msgid="3350681319735474741">"ਆਕਾਰ ਮੁਤਾਬਕ"</string>
- <string name="drawer_open" msgid="4545466532430226949">"ਰੂਟਸ ਦਿਖਾਓ"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ਰੂਟਸ ਲੁਕਾਓ"</string>
- <string name="save_error" msgid="6167009778003223664">"ਦਸਾਤਵੇਜ਼ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
- <string name="create_error" msgid="3735649141335444215">"ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"</string>
- <string name="query_error" msgid="5999895349602476581">"ਇਸ ਵੇਲੇ ਸਮੱਗਰੀ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
- <string name="root_recent" msgid="4470053704320518133">"ਹਾਲੀਆ"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ਖਾਲੀ"</string>
- <string name="root_type_service" msgid="2178854894416775409">"ਸਟੋਰੇਜ ਸੇਵਾਵਾਂ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"ਸ਼ੌਰਟਕਟਸ"</string>
- <string name="root_type_device" msgid="7121342474653483538">"ਡਿਵਾਈਸਾਂ"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"ਹੋਰ ਐਪਸ"</string>
- <string name="empty" msgid="7858882803708117596">"ਕੋਈ ਆਈਟਮਾਂ ਨਹੀਂ"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s ਵਿੱਚ ਕੋਈ ਮੇਲ ਨਹੀਂ"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ਫ਼ਾਈਲ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"ਕੁਝ ਦਸਤਾਵੇਜ਼ ਮਿਟਾਉਣ ਵਿੱਚ ਅਸਮਰੱਥ"</string>
- <string name="share_via" msgid="8966594246261344259">"ਇਸ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ਫਾਈਲਾਂ ਕਾਪੀ ਕਰ ਰਿਹਾ ਹੈ"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ਫ਼ਾਈਲਾਂ ਨੂੰ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ਬਾਕੀ"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ਫਾਈਲਾਂ ਕਾਪੀ ਕਰ ਰਿਹਾ ਹੈ।</item>
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ਫਾਈਲਾਂ ਕਾਪੀ ਕਰ ਰਿਹਾ ਹੈ।</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮੂਵ ਕਰਨਾ।</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮੂਵ ਕਰਨਾ।</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਮਿਟਾ ਰਿਹਾ ਹੈ।</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਮਿਟਾ ਰਿਹਾ ਹੈ।</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"ਅਣਕੀਤਾ ਕਰੋ"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"ਕਾਪੀ ਲਈ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"ਮੂਵ ਲਈ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"ਮਿਟਾਉਣ ਦੀ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
- <string name="close" msgid="3043722427445528732">"ਬੰਦ ਕਰੋ"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ਇਹ ਫ਼ਾਈਲਾਂ ਕਾਪੀ ਨਹੀਂ ਹੋਈਆਂ ਸਨ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ਇਹ ਫ਼ਾਈਲਾਂ ਤਬਦੀਲ ਨਹੀਂ ਹੋਈਆਂ ਸਨ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ਇਹਨਾਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਇਆ ਨਹੀਂ ਗਿਆ ਸੀ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ਇਹ ਫ਼ਾਈਲਾਂ ਕਿਸੇ ਹੋਰ ਫੌਰਮੈਟ ਵਿੱਚ ਤਬਦੀਲ ਕੀਤੀਆਂ ਗਈਆਂ ਸਨ: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਬਣਾਈ ਗਈ।</item>
- <item quantity="other">ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਬਣਾਈ ਗਈ।</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ਇਸ ਸਥਾਨ ਵਿੱਚ ਚੁਣੀਆਂ ਗਈਆਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਪੇਸਟ ਨਹੀਂ ਕਰ ਸਕਦਾ ਹੈ।"</string>
- <string name="menu_rename" msgid="7678802479104285353">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
- <string name="rename_error" msgid="4203041674883412606">"ਦਸਤਾਵੇਜ਼ ਦਾ ਮੁੜ-ਨਾਮਕਰਨ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ਕੁਝ ਫ਼ਾਈਲਾਂ ਤਬਦੀਲ ਕੀਤੀਆਂ ਗਈਆਂ ਸਨ"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"ਕੀ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ਨੂੰ <xliff:g id="STORAGE"><i>^3</i></xliff:g> \'ਤੇ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ਡਾਇਰੈਕਟਰੀ \'ਤੇ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"ਕੀ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ਨੂੰ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ਡਾਇਰੈਕਟਰੀ \'ਤੇ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"ਕੀ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ਨੂੰ <xliff:g id="STORAGE"><i>^2</i></xliff:g> \'ਤੇ ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਸਮੇਤ, ਤੁਹਾਡੇ ਡੈਟੇ \'ਤੇ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛੋ"</string>
- <string name="allow" msgid="7225948811296386551">"ਆਗਿਆ ਦਿਓ"</string>
- <string name="deny" msgid="2081879885755434506">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣੀ ਗਈ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣੀਆਂ ਗਈਆਂ</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਆਈਟਮਾਂ</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਆਈਟਮਾਂ</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"ਕੀ \"<xliff:g id="NAME">%1$s</xliff:g>\" ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"ਫੋਲਡਰ \"<xliff:g id="NAME">%1$s</xliff:g>\" ਅਤੇ ਉਸ ਦੀਆਂ ਸਮੱਗਰੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item>
- <item quantity="other">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫੋਲਡਰਾਂ ਅਤੇ ਉਹਨਾਂ ਦੀਆਂ ਸਮੱਗਰੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item>
- <item quantity="other">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫੋਲਡਰਾਂ ਅਤੇ ਉਹਨਾਂ ਦੀਆਂ ਸਮੱਗਰੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਆਈਟਮਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item>
- <item quantity="other">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਆਈਟਮਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml
deleted file mode 100644
index 3fc0ffd..0000000
--- a/packages/DocumentsUI/res/values-pl/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenty"</string>
- <string name="downloads_label" msgid="959113951084633612">"Pobrane"</string>
- <string name="title_open" msgid="4353228937663917801">"Otwórz z"</string>
- <string name="title_save" msgid="2433679664882857999">"Zapisz w"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nowy folder"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Widok siatki"</string>
- <string name="menu_list" msgid="7279285939892417279">"Widok listy"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortuj według"</string>
- <string name="menu_search" msgid="3816712084502856974">"Szukaj"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Ustawienia pamięci"</string>
- <string name="menu_open" msgid="432922957274920903">"Otwórz"</string>
- <string name="menu_save" msgid="2394743337684426338">"Zapisz"</string>
- <string name="menu_share" msgid="3075149983979628146">"Udostępnij"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Usuń"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Zaznacz wszystko"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiuj do…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Przenieś do…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nowe okno"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Wytnij"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiuj"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Wklej"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaż pamięć wewnętrzną"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ukryj pamięć wewnętrzną"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaż rozmiar pliku"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ukryj rozmiar pliku"</string>
- <string name="button_select" msgid="527196987259139214">"Wybierz"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiuj"</string>
- <string name="button_move" msgid="2202666023104202232">"Przenieś"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Zamknij"</string>
- <string name="button_retry" msgid="4392027584153752797">"Spróbuj ponownie"</string>
- <string name="sort_name" msgid="9183560467917256779">"Według nazwy"</string>
- <string name="sort_date" msgid="586080032956151448">"Według daty edycji"</string>
- <string name="sort_size" msgid="3350681319735474741">"Według rozmiaru"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Pokaż elementy główne"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ukryj elementy główne"</string>
- <string name="save_error" msgid="6167009778003223664">"Nie udało się zapisać dokumentu"</string>
- <string name="create_error" msgid="3735649141335444215">"Nie udało się utworzyć folderu"</string>
- <string name="query_error" msgid="5999895349602476581">"Teraz nie można załadować zawartości"</string>
- <string name="root_recent" msgid="4470053704320518133">"Ostatnie"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> wolne"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Usługi pamięci masowej"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Skróty"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Urządzenia"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Więcej aplikacji"</string>
- <string name="empty" msgid="7858882803708117596">"Brak elementów"</string>
- <string name="no_results" msgid="6622510343880730446">"Brak wyników w %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Nie można otworzyć pliku"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nie można usunąć niektórych dokumentów"</string>
- <string name="share_via" msgid="8966594246261344259">"Udostępnij przez:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopiowanie plików"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Przenoszenie plików"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Usuwam pliki"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Pozostało: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="few">Kopiowanie <xliff:g id="COUNT_1">%1$d</xliff:g> plików.</item>
- <item quantity="many">Kopiowanie <xliff:g id="COUNT_1">%1$d</xliff:g> plików.</item>
- <item quantity="other">Kopiowanie <xliff:g id="COUNT_1">%1$d</xliff:g> pliku.</item>
- <item quantity="one">Kopiowanie <xliff:g id="COUNT_0">%1$d</xliff:g> pliku.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="few">Przenoszę <xliff:g id="COUNT_1">%1$d</xliff:g> pliki.</item>
- <item quantity="many">Przenoszę <xliff:g id="COUNT_1">%1$d</xliff:g> plików.</item>
- <item quantity="other">Przenoszę <xliff:g id="COUNT_1">%1$d</xliff:g> pliku.</item>
- <item quantity="one">Przenoszę <xliff:g id="COUNT_0">%1$d</xliff:g> plik.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="few">Usuwam <xliff:g id="COUNT_1">%1$d</xliff:g> pliki.</item>
- <item quantity="many">Usuwam <xliff:g id="COUNT_1">%1$d</xliff:g> plików.</item>
- <item quantity="other">Usuwam <xliff:g id="COUNT_1">%1$d</xliff:g> pliku.</item>
- <item quantity="one">Usuwam <xliff:g id="COUNT_0">%1$d</xliff:g> plik.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Cofnij"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Przygotowuję do kopiowania…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Przygotowuję przenoszenie…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Przygotowuję do usunięcia…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="few">Nie udało się skopiować <xliff:g id="COUNT_1">%1$d</xliff:g> plików</item>
- <item quantity="many">Nie udało się skopiować <xliff:g id="COUNT_1">%1$d</xliff:g> plików</item>
- <item quantity="other">Nie udało się skopiować <xliff:g id="COUNT_1">%1$d</xliff:g> pliku</item>
- <item quantity="one">Nie udało się skopiować <xliff:g id="COUNT_0">%1$d</xliff:g> pliku</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="few">Nie udało się przenieść <xliff:g id="COUNT_1">%1$d</xliff:g> plików</item>
- <item quantity="many">Nie udało się przenieść <xliff:g id="COUNT_1">%1$d</xliff:g> plików</item>
- <item quantity="other">Nie udało się przenieść <xliff:g id="COUNT_1">%1$d</xliff:g> pliku</item>
- <item quantity="one">Nie udało się przenieść <xliff:g id="COUNT_0">%1$d</xliff:g> pliku</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="few">Nie udało się usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> plików</item>
- <item quantity="many">Nie udało się usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> plików</item>
- <item quantity="other">Nie udało się usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> pliku</item>
- <item quantity="one">Nie udało się usunąć <xliff:g id="COUNT_0">%1$d</xliff:g> pliku</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Kliknij, by zobaczyć szczegóły"</string>
- <string name="close" msgid="3043722427445528732">"Zamknij"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Te pliki nie zostały skopiowane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Te pliki nie zostały przeniesione: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Te pliki nie zostały usunięte: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Te pliki zostały przekonwertowane na inny format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="few">Skopiowano <xliff:g id="COUNT_1">%1$d</xliff:g> pliki do schowka.</item>
- <item quantity="many">Skopiowano <xliff:g id="COUNT_1">%1$d</xliff:g> plików do schowka.</item>
- <item quantity="other">Skopiowano <xliff:g id="COUNT_1">%1$d</xliff:g> pliku do schowka.</item>
- <item quantity="one">Skopiowano <xliff:g id="COUNT_0">%1$d</xliff:g> plik do schowka.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Nie można wkleić wybranych plików w tej lokalizacji."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Zmień nazwę"</string>
- <string name="rename_error" msgid="4203041674883412606">"Nie udało się zmienić nazwy dokumentu"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Niektóre pliki zostały przekonwertowane"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Zezwolić aplikacji <xliff:g id="APPNAME"><b>^1</b></xliff:g> na dostęp do katalogu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> w pamięci masowej <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Przyznać aplikacji <xliff:g id="APPNAME"><b>^1</b></xliff:g> dostęp do katalogu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Zezwolić aplikacji <xliff:g id="APPNAME"><b>^1</b></xliff:g> na dostęp do Twoich danych, w tym zdjęć i filmów, zapisanych w pamięci <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Nie pytaj ponownie"</string>
- <string name="allow" msgid="7225948811296386551">"Zezwól"</string>
- <string name="deny" msgid="2081879885755434506">"Odmów"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="few">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="many">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Wybrano <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> elementy</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> elementów</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementu</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Usunąć „<xliff:g id="NAME">%1$s</xliff:g>”?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Usunąć folder „<xliff:g id="NAME">%1$s</xliff:g>” i jego zawartość?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="few">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> pliki?</item>
- <item quantity="many">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> plików?</item>
- <item quantity="other">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> pliku?</item>
- <item quantity="one">Usunąć <xliff:g id="COUNT_0">%1$d</xliff:g> plik?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="few">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> foldery wraz z zawartością?</item>
- <item quantity="many">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> folderów wraz z zawartością?</item>
- <item quantity="other">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> folderu wraz z zawartością?</item>
- <item quantity="one">Usunąć <xliff:g id="COUNT_0">%1$d</xliff:g> folder wraz z zawartością?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="few">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> elementy?</item>
- <item quantity="many">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> elementów?</item>
- <item quantity="other">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> elementu?</item>
- <item quantity="one">Usunąć <xliff:g id="COUNT_0">%1$d</xliff:g> element?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 92f6c60..0000000
--- a/packages/DocumentsUI/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documentos"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Abrir de"</string>
- <string name="title_save" msgid="2433679664882857999">"Salvar em"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nova pasta"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Visualização em grade"</string>
- <string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string>
- <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Configurações de armazenamento"</string>
- <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Salvar"</string>
- <string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Excluir"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Selecionar tudo"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiar para..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Mover para..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nova janela"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cortar"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Colar"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. do arquivo"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. do arquivo"</string>
- <string name="button_select" msgid="527196987259139214">"Selecionar"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
- <string name="button_move" msgid="2202666023104202232">"Mover"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Dispensar"</string>
- <string name="button_retry" msgid="4392027584153752797">"Tentar novamente"</string>
- <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
- <string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
- <string name="sort_size" msgid="3350681319735474741">"Por tamanho"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostrar raízes"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ocultar raízes"</string>
- <string name="save_error" msgid="6167009778003223664">"Falha ao salvar o documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Falha ao criar a pasta"</string>
- <string name="query_error" msgid="5999895349602476581">"Não é possível carregar o conteúdo no momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recentes"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> livres"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Serviços de armazenamento"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Atalhos"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Mais apps"</string>
- <string name="empty" msgid="7858882803708117596">"Nenhum item"</string>
- <string name="no_results" msgid="6622510343880730446">"Nenhum resultado em %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Não é possível abrir o arquivo"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Não foi possível excluir alguns documentos"</string>
- <string name="share_via" msgid="8966594246261344259">"Compartilhar via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copiando arquivos"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Movendo arquivos"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Excluindo arquivos"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> restantes"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- <item quantity="other">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Movendo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- <item quantity="other">Movendo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Excluindo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- <item quantity="other">Excluindo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Desfazer"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparando para copiar..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparando para mover..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparando-se para excluir..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- <item quantity="other">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Não foi possível mover <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- <item quantity="other">Não foi possível mover <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Não foi possível excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- <item quantity="other">Não foi possível excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tocar para ver detalhes"</string>
- <string name="close" msgid="3043722427445528732">"Fechar"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Estes arquivos não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Estes arquivos não foram movidos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Estes arquivos não foram excluídos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Esses arquivos foram convertidos em outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Não é possível colar os arquivos selecionados neste local."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Renomear"</string>
- <string name="rename_error" msgid="4203041674883412606">"Falha ao renomear documento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns arquivos foram convertidos"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Conceder ao <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Conceder acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> para <xliff:g id="APPNAME"><b>^1</b></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso aos seus dados, incluindo fotos e vídeos, no/na <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Não perguntar novamente"</string>
- <string name="allow" msgid="7225948811296386551">"Permitir"</string>
- <string name="deny" msgid="2081879885755434506">"Negar"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionado</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> itens</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> itens</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Excluir \" <xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Excluir pasta \"<xliff:g id="NAME">%1$s</xliff:g>\" e o respectivo conteúdo?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item>
- <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> pastas e o respectivo conteúdo?</item>
- <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> pastas e o respectivo conteúdo?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> itens?</item>
- <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> itens?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 3bec575..0000000
--- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documentos"</string>
- <string name="downloads_label" msgid="959113951084633612">"Transferências"</string>
- <string name="title_open" msgid="4353228937663917801">"Abrir de"</string>
- <string name="title_save" msgid="2433679664882857999">"Guardar em"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nova pasta"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Vista de grelha"</string>
- <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
- <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Defin. de armazenamento"</string>
- <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
- <string name="menu_share" msgid="3075149983979628146">"Partilhar"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Selecionar tudo"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiar para…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Mover para..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nova janela"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cortar"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Colar"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar mem. armaz. int."</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar mem. armaz. int."</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. de fich."</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. de fich."</string>
- <string name="button_select" msgid="527196987259139214">"Selecionar"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
- <string name="button_move" msgid="2202666023104202232">"Mover"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Ignorar"</string>
- <string name="button_retry" msgid="4392027584153752797">"Tentar novamente"</string>
- <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
- <string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
- <string name="sort_size" msgid="3350681319735474741">"Por tamanho"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostrar raízes"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ocultar raízes"</string>
- <string name="save_error" msgid="6167009778003223664">"Falha ao guardar o documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Falha ao criar a pasta"</string>
- <string name="query_error" msgid="5999895349602476581">"Não é possível carregar o conteúdo neste momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recentes"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> espaço livre"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Serv. de armazenamento"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Atalhos"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Mais aplicações"</string>
- <string name="empty" msgid="7858882803708117596">"Sem itens"</string>
- <string name="no_results" msgid="6622510343880730446">"Sem correspondências para %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Não é possível abrir o ficheiro"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Não é possível eliminar alguns documentos"</string>
- <string name="share_via" msgid="8966594246261344259">"Partilhar através de"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"A copiar ficheiros"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"A mover ficheiros"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Eliminar ficheiros"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Faltam <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">A copiar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros.</item>
- <item quantity="one">A copiar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">A mover <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros.</item>
- <item quantity="one">A mover <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">A eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros.</item>
- <item quantity="one">A eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Anular"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"A preparar para copiar…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"A preparar para mover…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"A preparar para eliminar…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros</item>
- <item quantity="one">Não foi possível copiar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Não foi possível mover <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros</item>
- <item quantity="one">Não foi possível mover <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Não foi possível eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros</item>
- <item quantity="one">Não foi possível eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Toque para ver detalhes"</string>
- <string name="close" msgid="3043722427445528732">"Fechar"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Os seguintes ficheiros não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Os seguintes ficheiros não foram movidos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Estes ficheiros não foram eliminados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Estes ficheiros foram convertidos para outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Copiou <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros para a área de transferência.</item>
- <item quantity="one">Copiou <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro para a área de transferência.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Não é possível colar os ficheiros selecionados nesta localização."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Mudar o nome"</string>
- <string name="rename_error" msgid="4203041674883412606">"Falha ao mudar o nome do documento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns ficheiros foram convertidos"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Pretende conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no(a) <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Pretende conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Pretende conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso aos seus dados, incluindo fotos e vídeos, no(a) <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Não perguntar novamente"</string>
- <string name="allow" msgid="7225948811296386551">"Permitir"</string>
- <string name="deny" msgid="2081879885755434506">"Recusar"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selecionado</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> itens</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Pretende eliminar \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Pretende eliminar a pasta \"<xliff:g id="NAME">%1$s</xliff:g>\" e os respetivos conteúdos?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Pretende eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros?</item>
- <item quantity="one">Pretende eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Pretende eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> pastas e os respetivos conteúdos?</item>
- <item quantity="one">Pretende eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> pasta e os respetivos conteúdos?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Pretende eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> itens?</item>
- <item quantity="one">Pretende eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml
deleted file mode 100644
index 92f6c60..0000000
--- a/packages/DocumentsUI/res/values-pt/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documentos"</string>
- <string name="downloads_label" msgid="959113951084633612">"Downloads"</string>
- <string name="title_open" msgid="4353228937663917801">"Abrir de"</string>
- <string name="title_save" msgid="2433679664882857999">"Salvar em"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nova pasta"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Visualização em grade"</string>
- <string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string>
- <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Configurações de armazenamento"</string>
- <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
- <string name="menu_save" msgid="2394743337684426338">"Salvar"</string>
- <string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Excluir"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Selecionar tudo"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiar para..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Mover para..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nova janela"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cortar"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiar"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Colar"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. do arquivo"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. do arquivo"</string>
- <string name="button_select" msgid="527196987259139214">"Selecionar"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
- <string name="button_move" msgid="2202666023104202232">"Mover"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Dispensar"</string>
- <string name="button_retry" msgid="4392027584153752797">"Tentar novamente"</string>
- <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
- <string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
- <string name="sort_size" msgid="3350681319735474741">"Por tamanho"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Mostrar raízes"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ocultar raízes"</string>
- <string name="save_error" msgid="6167009778003223664">"Falha ao salvar o documento"</string>
- <string name="create_error" msgid="3735649141335444215">"Falha ao criar a pasta"</string>
- <string name="query_error" msgid="5999895349602476581">"Não é possível carregar o conteúdo no momento"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recentes"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> livres"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Serviços de armazenamento"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Atalhos"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Mais apps"</string>
- <string name="empty" msgid="7858882803708117596">"Nenhum item"</string>
- <string name="no_results" msgid="6622510343880730446">"Nenhum resultado em %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Não é possível abrir o arquivo"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Não foi possível excluir alguns documentos"</string>
- <string name="share_via" msgid="8966594246261344259">"Compartilhar via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Copiando arquivos"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Movendo arquivos"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Excluindo arquivos"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> restantes"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- <item quantity="other">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Movendo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- <item quantity="other">Movendo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Excluindo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- <item quantity="other">Excluindo <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Desfazer"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Preparando para copiar..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Preparando para mover..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Preparando-se para excluir..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- <item quantity="other">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Não foi possível mover <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- <item quantity="other">Não foi possível mover <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Não foi possível excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- <item quantity="other">Não foi possível excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tocar para ver detalhes"</string>
- <string name="close" msgid="3043722427445528732">"Fechar"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Estes arquivos não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Estes arquivos não foram movidos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Estes arquivos não foram excluídos: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Esses arquivos foram convertidos em outro formato: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> arquivos copiados para a área de transferência.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Não é possível colar os arquivos selecionados neste local."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Renomear"</string>
- <string name="rename_error" msgid="4203041674883412606">"Falha ao renomear documento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns arquivos foram convertidos"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Conceder ao <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Conceder acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> para <xliff:g id="APPNAME"><b>^1</b></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso aos seus dados, incluindo fotos e vídeos, no/na <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Não perguntar novamente"</string>
- <string name="allow" msgid="7225948811296386551">"Permitir"</string>
- <string name="deny" msgid="2081879885755434506">"Negar"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionado</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> itens</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> itens</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Excluir \" <xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Excluir pasta \"<xliff:g id="NAME">%1$s</xliff:g>\" e o respectivo conteúdo?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item>
- <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> pastas e o respectivo conteúdo?</item>
- <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> pastas e o respectivo conteúdo?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> itens?</item>
- <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> itens?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml
deleted file mode 100644
index 538dbd2..0000000
--- a/packages/DocumentsUI/res/values-ro/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Documente"</string>
- <string name="downloads_label" msgid="959113951084633612">"Descărcări"</string>
- <string name="title_open" msgid="4353228937663917801">"Deschideți din"</string>
- <string name="title_save" msgid="2433679664882857999">"Salvați în"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Dosar nou"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Afișare tip grilă"</string>
- <string name="menu_list" msgid="7279285939892417279">"Afișare tip listă"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortați după"</string>
- <string name="menu_search" msgid="3816712084502856974">"Căutați"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Setări de stocare"</string>
- <string name="menu_open" msgid="432922957274920903">"Deschideți"</string>
- <string name="menu_save" msgid="2394743337684426338">"Salvați"</string>
- <string name="menu_share" msgid="3075149983979628146">"Distribuiți"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Ștergeți"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Selectați tot"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Copiați în…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Mutați în…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Fereastră nouă"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Decupați"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Copiați"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Inserați"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Afișați stocarea internă"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ascundeți stocarea internă"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Afișați dimensiunea"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ascundeți dimensiunea"</string>
- <string name="button_select" msgid="527196987259139214">"Selectați"</string>
- <string name="button_copy" msgid="8706475544635021302">"Copiați"</string>
- <string name="button_move" msgid="2202666023104202232">"Mutați"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Închideți"</string>
- <string name="button_retry" msgid="4392027584153752797">"Încercați din nou"</string>
- <string name="sort_name" msgid="9183560467917256779">"După nume"</string>
- <string name="sort_date" msgid="586080032956151448">"După data modificării"</string>
- <string name="sort_size" msgid="3350681319735474741">"După dimensiune"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Afișați directoarele rădăcină"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ascundeți directoarele rădăcină"</string>
- <string name="save_error" msgid="6167009778003223664">"Salvarea documentului nu a reușit"</string>
- <string name="create_error" msgid="3735649141335444215">"Eroare la crearea dosarului"</string>
- <string name="query_error" msgid="5999895349602476581">"Momentan, conținutul nu poate fi încărcat"</string>
- <string name="root_recent" msgid="4470053704320518133">"Recente"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> spațiu liber"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Servicii de stocare"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Comenzi rapide"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Dispozitive"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Alte aplicații"</string>
- <string name="empty" msgid="7858882803708117596">"Niciun element"</string>
- <string name="no_results" msgid="6622510343880730446">"Niciun rezultat în %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Fișierul nu poate fi deschis"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Unele documente nu au putut fi șterse"</string>
- <string name="share_via" msgid="8966594246261344259">"Trimiteți prin"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Se copiază fișierele"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Se mută fișierele"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Se șterg fișierele"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Timp rămas: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="few">Se copiază <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere.</item>
- <item quantity="other">Se copiază <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere.</item>
- <item quantity="one">Se copiază <xliff:g id="COUNT_0">%1$d</xliff:g> fișier.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="few">Se mută <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere.</item>
- <item quantity="other">Se mută <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere.</item>
- <item quantity="one">Se mută <xliff:g id="COUNT_0">%1$d</xliff:g> fișier.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="few">Se șterg <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere.</item>
- <item quantity="other">Se șterg <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere.</item>
- <item quantity="one">Se șterge <xliff:g id="COUNT_0">%1$d</xliff:g> fișier.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Anulați"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Se pregătește copierea..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Se pregătește mutarea…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Se pregătește ștergerea…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="few">Nu s-au putut copia <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere</item>
- <item quantity="other">Nu s-au putut copia <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere</item>
- <item quantity="one">Nu s-a putut copia <xliff:g id="COUNT_0">%1$d</xliff:g> fișier</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="few">Nu s-au putut muta <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere</item>
- <item quantity="other">Nu s-au putut muta <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere</item>
- <item quantity="one">Nu s-a putut muta <xliff:g id="COUNT_0">%1$d</xliff:g> fișier</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="few">Nu s-au putut șterge <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere</item>
- <item quantity="other">Nu s-au putut șterge <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere</item>
- <item quantity="one">Nu s-a putut șterge <xliff:g id="COUNT_0">%1$d</xliff:g> fișier</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Atingeți pentru a vedea detaliile"</string>
- <string name="close" msgid="3043722427445528732">"Închideți"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Aceste fișiere nu au fost copiate: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Aceste fișiere nu au fost mutate: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Aceste fișiere nu au fost șterse: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Aceste fișiere au fost convertite în alt format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="few">Au fost copiate <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere în clipboard.</item>
- <item quantity="other">Au fost copiate <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere în clipboard.</item>
- <item quantity="one">A fost copiat <xliff:g id="COUNT_0">%1$d</xliff:g> fișier în clipboard.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Fișierele selectate nu au putut fi inserate în această locație."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Redenumiți"</string>
- <string name="rename_error" msgid="4203041674883412606">"Documentul nu a putut fi redenumit"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Unele fișiere au fost convertite"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Permiteți aplicației <xliff:g id="APPNAME"><b>^1</b></xliff:g> accesul la directorul <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> de pe <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Permiteți aplicației <xliff:g id="APPNAME"><b>^1</b></xliff:g> să acceseze directorul <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Permiteți aplicației <xliff:g id="APPNAME"><b>^1</b></xliff:g> să vă acceseze datele, inclusiv fotografiile și videoclipurile, de pe <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Nu mai întreba"</string>
- <string name="allow" msgid="7225948811296386551">"Permiteți"</string>
- <string name="deny" msgid="2081879885755434506">"Refuzați"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selectat</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> elemente</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> de elemente</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ștergeți „<xliff:g id="NAME">%1$s</xliff:g>”?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ștergeți dosarul „<xliff:g id="NAME">%1$s</xliff:g>” și conținutul acestuia?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="few">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere?</item>
- <item quantity="other">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere?</item>
- <item quantity="one">Ștergeți <xliff:g id="COUNT_0">%1$d</xliff:g> fișier?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="few">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> dosare și conținutul acestora?</item>
- <item quantity="other">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> de dosare și conținutul acestora?</item>
- <item quantity="one">Ștergeți <xliff:g id="COUNT_0">%1$d</xliff:g> dosar și conținutul acestuia?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="few">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> elemente?</item>
- <item quantity="other">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> de elemente?</item>
- <item quantity="one">Ștergeți <xliff:g id="COUNT_0">%1$d</xliff:g> element?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml
deleted file mode 100644
index bb0bc91..0000000
--- a/packages/DocumentsUI/res/values-ru/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документы"</string>
- <string name="downloads_label" msgid="959113951084633612">"Загрузки"</string>
- <string name="title_open" msgid="4353228937663917801">"Открыть"</string>
- <string name="title_save" msgid="2433679664882857999">"Сохранить"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Создать папку"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Сетка"</string>
- <string name="menu_list" msgid="7279285939892417279">"Список"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Сортировать"</string>
- <string name="menu_search" msgid="3816712084502856974">"Поиск"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Память"</string>
- <string name="menu_open" msgid="432922957274920903">"Открыть"</string>
- <string name="menu_save" msgid="2394743337684426338">"Сохранить"</string>
- <string name="menu_share" msgid="3075149983979628146">"Поделиться"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Удалить"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Выбрать все"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Копировать в…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Переместить в…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Новое окно"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Вырезать"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копировать"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Вставить"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Внутренняя память"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Скрыть внутреннюю память"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Показать размер файлов"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Скрыть размер файлов"</string>
- <string name="button_select" msgid="527196987259139214">"Выбрать"</string>
- <string name="button_copy" msgid="8706475544635021302">"Копировать"</string>
- <string name="button_move" msgid="2202666023104202232">"Переместить"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Скрыть"</string>
- <string name="button_retry" msgid="4392027584153752797">"Повторить"</string>
- <string name="sort_name" msgid="9183560467917256779">"По названию"</string>
- <string name="sort_date" msgid="586080032956151448">"По дате изменения"</string>
- <string name="sort_size" msgid="3350681319735474741">"По размеру"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Показать"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Скрыть"</string>
- <string name="save_error" msgid="6167009778003223664">"Не удалось сохранить документ"</string>
- <string name="create_error" msgid="3735649141335444215">"Не удалось создать папку"</string>
- <string name="query_error" msgid="5999895349602476581">"Не удалось загрузить контент"</string>
- <string name="root_recent" msgid="4470053704320518133">"Недавние"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Свободно <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Службы хранения"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Ярлыки"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Устройства"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Другие приложения"</string>
- <string name="empty" msgid="7858882803708117596">"Ничего нет"</string>
- <string name="no_results" msgid="6622510343880730446">"В \"%1$s\" ничего не найдено"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Не удалось открыть файл"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Не удалось удалить некоторые документы"</string>
- <string name="share_via" msgid="8966594246261344259">"Поделиться"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Копирование файлов"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Перемещение файлов"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Удаление файлов…"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Осталось <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Копируется <xliff:g id="COUNT_1">%1$d</xliff:g> файл...</item>
- <item quantity="few">Копируется <xliff:g id="COUNT_1">%1$d</xliff:g> файла...</item>
- <item quantity="many">Копируется <xliff:g id="COUNT_1">%1$d</xliff:g> файлов...</item>
- <item quantity="other">Копируется <xliff:g id="COUNT_1">%1$d</xliff:g> файла...</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файла...</item>
- <item quantity="few">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов...</item>
- <item quantity="many">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов...</item>
- <item quantity="other">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файла...</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
- <item quantity="few">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
- <item quantity="many">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
- <item quantity="other">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Отменить"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Подготовка к копированию…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Подготовка…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Подготовка к удалению…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- <item quantity="many">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
- <item quantity="other">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- <item quantity="many">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
- <item quantity="other">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- <item quantity="many">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
- <item quantity="other">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Нажмите, чтобы узнать подробности."</string>
- <string name="close" msgid="3043722427445528732">"Закрыть"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Не удалось скопировать следующие файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Не удалось переместить следующие файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Следующие файлы не были удалены: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Формат этих файлов изменен: <xliff:g id="LIST">%1$s</xliff:g>."</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Скопирован <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- <item quantity="many">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
- <item quantity="other">Скопированы <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Не удается вставить сюда выбранные файлы"</string>
- <string name="menu_rename" msgid="7678802479104285353">"Переименовать"</string>
- <string name="rename_error" msgid="4203041674883412606">"Не удалось переименовать документ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Формат некоторых файлов изменен"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Открыть приложению \"<xliff:g id="APPNAME"><b>^1</b></xliff:g>\" доступ к папке \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\" на устройстве \"<xliff:g id="STORAGE"><i>^3</i></xliff:g>\"?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Открыть приложению \"<xliff:g id="APPNAME"><b>^1</b></xliff:g>\" доступ к папке \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\"?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Открыть приложению \"<xliff:g id="APPNAME"><b>^1</b></xliff:g>\" доступ к вашим данным, включая фото и видео, на носителе: <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Больше не спрашивать"</string>
- <string name="allow" msgid="7225948811296386551">"Разрешить"</string>
- <string name="deny" msgid="2081879885755434506">"Отклонить"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="few">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="many">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> объект</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> объектов</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Удалить файл \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Удалить папку \"<xliff:g id="NAME">%1$s</xliff:g>\" со всем содержимым?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
- <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
- <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов?</item>
- <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папку со всем содержимым?</item>
- <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папки со всем содержимым?</item>
- <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папок со всем содержимым?</item>
- <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папки со всем содержимым?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объект?</item>
- <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объекта?</item>
- <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объектов?</item>
- <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объекта?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml
deleted file mode 100644
index 1ece0ea..0000000
--- a/packages/DocumentsUI/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ලේඛන"</string>
- <string name="downloads_label" msgid="959113951084633612">"බාගැනීම්"</string>
- <string name="title_open" msgid="4353228937663917801">"විවෘත වන්නේ"</string>
- <string name="title_save" msgid="2433679664882857999">"සුරකින්නේ"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"නව ෆෝල්ඩරය"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ජාල පෙනුම"</string>
- <string name="menu_list" msgid="7279285939892417279">"ලැයිස්තු පෙනුම"</string>
- <string name="menu_sort" msgid="7677740407158414452">"අනුපිළිවෙලට සකසා ඇත්තේ"</string>
- <string name="menu_search" msgid="3816712084502856974">"සෙවීම"</string>
- <string name="menu_settings" msgid="8239065133341597825">"ගබඩා සැකසීම්"</string>
- <string name="menu_open" msgid="432922957274920903">"විවෘත කරන්න"</string>
- <string name="menu_save" msgid="2394743337684426338">"සුරකින්න"</string>
- <string name="menu_share" msgid="3075149983979628146">"බෙදාගන්න"</string>
- <string name="menu_delete" msgid="8138799623850614177">"මකන්න"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"සියල්ල තෝරන්න"</string>
- <string name="menu_copy" msgid="3612326052677229148">"වෙත පිටපත් කරන්න..."</string>
- <string name="menu_move" msgid="1828090633118079817">"වෙත ගෙනයන්න..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"නව කවුළුව"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"කපන්න"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"පිටපත් කරන්න"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"අලවන්න"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"අභ්යන්තර ආචයනය පෙන්වන්න"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"අභ්යන්තර ආචයනය සඟවන්න"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ගොනු ප්රමණය පෙන්වන්න"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ගොනු ප්රමණය සඟවන්න"</string>
- <string name="button_select" msgid="527196987259139214">"තෝරන්න"</string>
- <string name="button_copy" msgid="8706475544635021302">"පිටපත් කිරීම"</string>
- <string name="button_move" msgid="2202666023104202232">"ගෙන යන්න"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ඉවතලන්න"</string>
- <string name="button_retry" msgid="4392027584153752797">"නැවත උත්සාහ කරන්න"</string>
- <string name="sort_name" msgid="9183560467917256779">"නමින්"</string>
- <string name="sort_date" msgid="586080032956151448">"වෙනස් කරන ලද දිනයෙන්"</string>
- <string name="sort_size" msgid="3350681319735474741">"ප්රමාණය මගින්"</string>
- <string name="drawer_open" msgid="4545466532430226949">"මුල් පෙන්වන්න"</string>
- <string name="drawer_close" msgid="7602734368552123318">"මුල් සඟවන්න"</string>
- <string name="save_error" msgid="6167009778003223664">"ලේඛනය සුරැකීමට අපොහොසත් විය"</string>
- <string name="create_error" msgid="3735649141335444215">"ෆෝල්ඩරය සැදීම අසාර්ථක විය"</string>
- <string name="query_error" msgid="5999895349602476581">"මේ මොහොතේ අන්තර්ගතය පූරණය කිරීමට නොහැකිය"</string>
- <string name="root_recent" msgid="4470053704320518133">"මෑත"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ඉතිරියි"</string>
- <string name="root_type_service" msgid="2178854894416775409">"ආචයන සේවා"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"කෙටිමං"</string>
- <string name="root_type_device" msgid="7121342474653483538">"උපාංග"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"තවත් යෙදුම්"</string>
- <string name="empty" msgid="7858882803708117596">"අයිතම නැත"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s හි තරඟ නැත"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ගොනුව විවෘත කළ නොහැකිය"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"සමහර ලේඛන මැකීමට නොහැකි විය"</string>
- <string name="share_via" msgid="8966594246261344259">"හරහා බෙදාගන්න"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ගොනු පිටපත් කරමින්"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ගොනු ගෙන යාම"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ගොනු මකමින්"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ඉතිරියි"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් පිටපත් කරමින්.</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් පිටපත් කරමින්.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් ගෙන යමින්.</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් ගෙන යමින්.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මකමින්.</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මකමින්.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"අස් කරන්න"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"පිටපතක් සඳහා සූදානම් කරමින්..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"ගෙන යාම සඳහා පිළියෙළ කරමින් ..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"මැකීම සඳහා සූදානම් කරමින්..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් පිටපත් කළ නොහැකි විය</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් පිටපත් කළ නොහැකි විය</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් ගෙන යාමට නොහැකි විය</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් ගෙන යාමට නොහැකි විය</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මැකීමට නොහැකි විය</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මැකීමට නොහැකි විය</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"විස්තර බැලීමට තට්ටු කරන්න"</string>
- <string name="close" msgid="3043722427445528732">"වසන්න"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"මෙම ගොනු පිටපත් නොකරන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"මෙම ගොනු ගෙන නොයන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"මෙම ගොනු නොමකන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"මෙම ගොනු වෙනත් ආකෘතියකට පරිවර්තනය කරන ලදී: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">පසුරු පුවරුවට ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් පිටපත් කරන ලදි.</item>
- <item quantity="other">පසුරු පුවරුවට ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් පිටපත් කරන ලදි.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"මෙම ස්ථානය තුළ තෝරාගත් ගොනු ඇලවිය නොහැක."</string>
- <string name="menu_rename" msgid="7678802479104285353">"යළි නම් කරන්න"</string>
- <string name="rename_error" msgid="4203041674883412606">"ලේඛනය යළි නම් කිරීම අසාර්ථක විය"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"සමහර ගොනු පරිවර්තනය කරන ලදී"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> හට <xliff:g id="STORAGE"><i>^3</i></xliff:g> මත <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> නාමාවලිය වෙත ප්රවේශය දෙන්නද?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ප්රවේශය <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> නාමාවලිය වෙත ලබා දෙන්නද?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> හි, ඡායාරූප සහ වීඩියෝ ඇතුළුව, ඔබේ දත්තවලට <xliff:g id="APPNAME"><b>^1</b></xliff:g> හට ප්රවේශය ලබා දෙන්නද?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"නැවත අසන්න එපා"</string>
- <string name="allow" msgid="7225948811296386551">"අවසර දෙන්න"</string>
- <string name="deny" msgid="2081879885755434506">"ප්රතික්ෂේප කරන්න"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>ක් තෝරන ලදී</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>ක් තෝරන ලදී</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one">අයිතම <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">අයිතම <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" මකන්නද?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ෆෝල්ඩරය හා එහි අන්තර්ගත මකන්නද?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් මකන්නද?</item>
- <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g> ක් මකන්නද?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">ෆෝල්ඩර <xliff:g id="COUNT_1">%1$d</xliff:g> ක් හා එහි අන්තර්ගත මකන්නද?</item>
- <item quantity="other">ෆෝල්ඩර <xliff:g id="COUNT_1">%1$d</xliff:g> ක් හා එහි අන්තර්ගත මකන්නද?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">අයිතම <xliff:g id="COUNT_1">%1$d</xliff:g> ක් මකන්නද?</item>
- <item quantity="other">අයිතම <xliff:g id="COUNT_1">%1$d</xliff:g> ක් මකන්නද?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml
deleted file mode 100644
index 165d4a8..0000000
--- a/packages/DocumentsUI/res/values-sk/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenty"</string>
- <string name="downloads_label" msgid="959113951084633612">"Stiahnuté súbory"</string>
- <string name="title_open" msgid="4353228937663917801">"Otvoriť z"</string>
- <string name="title_save" msgid="2433679664882857999">"Uložiť do"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nový priečinok"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Zobrazenie mriežky"</string>
- <string name="menu_list" msgid="7279285939892417279">"Zobrazenie zoznamu"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Zoradiť podľa"</string>
- <string name="menu_search" msgid="3816712084502856974">"Hľadať"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Nastavenia úložiska"</string>
- <string name="menu_open" msgid="432922957274920903">"Otvoriť"</string>
- <string name="menu_save" msgid="2394743337684426338">"Uložiť"</string>
- <string name="menu_share" msgid="3075149983979628146">"Zdieľať"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Odstrániť"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Vybrať všetko"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopírovať do…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Presunúť do…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nové okno"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Vystrihnúť"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopírovať"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Prilepiť"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Zobraziť interné úložisko"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Skryť interné úložisko"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Zobraziť veľkosť súboru"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Skryť veľkosť súboru"</string>
- <string name="button_select" msgid="527196987259139214">"Vybrať"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopírovať"</string>
- <string name="button_move" msgid="2202666023104202232">"Presunúť"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Odmietnuť"</string>
- <string name="button_retry" msgid="4392027584153752797">"Skúsiť znova"</string>
- <string name="sort_name" msgid="9183560467917256779">"Podľa názvu"</string>
- <string name="sort_date" msgid="586080032956151448">"Podľa dátumu zmeny"</string>
- <string name="sort_size" msgid="3350681319735474741">"Podľa veľkosti"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Zobraziť korene"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Skryť korene"</string>
- <string name="save_error" msgid="6167009778003223664">"Dokument sa nepodarilo uložiť"</string>
- <string name="create_error" msgid="3735649141335444215">"Priečinok sa nepodarilo vytvoriť"</string>
- <string name="query_error" msgid="5999895349602476581">"Obsah momentálne nie je možné načítať"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nedávne"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Voľné <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Služby úložiska"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Skratky"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Zariadenia"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Ďalšie aplikácie"</string>
- <string name="empty" msgid="7858882803708117596">"Žiadne položky"</string>
- <string name="no_results" msgid="6622510343880730446">"Žiadne zhody – %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Súbor nie je možné otvoriť"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Niektoré dokumenty sa nepodarilo odstrániť"</string>
- <string name="share_via" msgid="8966594246261344259">"Zdieľať"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopírovanie súborov"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Presúvajú sa súbory"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Odstraňujú sa súbory"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Zostáva: <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="few">Kopírujú sa <xliff:g id="COUNT_1">%1$d</xliff:g> súbory.</item>
- <item quantity="many">Kopíruje sa <xliff:g id="COUNT_1">%1$d</xliff:g> súboru.</item>
- <item quantity="other">Kopíruje sa <xliff:g id="COUNT_1">%1$d</xliff:g> súborov.</item>
- <item quantity="one">Kopíruje sa <xliff:g id="COUNT_0">%1$d</xliff:g> súbor.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="few">Presúvajú sa <xliff:g id="COUNT_1">%1$d</xliff:g> súbory.</item>
- <item quantity="many">Presúva sa <xliff:g id="COUNT_1">%1$d</xliff:g> súboru.</item>
- <item quantity="other">Presúva sa <xliff:g id="COUNT_1">%1$d</xliff:g> súborov.</item>
- <item quantity="one">Presúva sa <xliff:g id="COUNT_0">%1$d</xliff:g> súbor.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="few">Odstraňujú sa <xliff:g id="COUNT_1">%1$d</xliff:g> súbory.</item>
- <item quantity="many">Odstraňuje sa <xliff:g id="COUNT_1">%1$d</xliff:g> súboru.</item>
- <item quantity="other">Odstraňuje sa <xliff:g id="COUNT_1">%1$d</xliff:g> súborov.</item>
- <item quantity="one">Odstraňuje sa <xliff:g id="COUNT_0">%1$d</xliff:g> súbor.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Späť"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Pripravuje sa na kopírovanie..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Prebieha príprava na presunutie…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Príprava na odstránenie…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="few">Nepodarilo sa skopírovať <xliff:g id="COUNT_1">%1$d</xliff:g> súbory</item>
- <item quantity="many">Nepodarilo sa skopírovať <xliff:g id="COUNT_1">%1$d</xliff:g> súboru</item>
- <item quantity="other">Nepodarilo sa skopírovať <xliff:g id="COUNT_1">%1$d</xliff:g> súborov</item>
- <item quantity="one">Nepodarilo sa skopírovať <xliff:g id="COUNT_0">%1$d</xliff:g> súbor</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> súbory nie je možné presunúť</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> súboru nie je možné presunúť</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> súborov nie je možné presunúť</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> súbor nie je možné presunúť</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="few">Nepodarilo sa odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súbory</item>
- <item quantity="many">Nepodarilo sa odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súboru</item>
- <item quantity="other">Nepodarilo sa odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súborov</item>
- <item quantity="one">Nepodarilo sa odstrániť <xliff:g id="COUNT_0">%1$d</xliff:g> súbor</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Klepnutím zobrazíte podrobnosti"</string>
- <string name="close" msgid="3043722427445528732">"Zavrieť"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Tieto súbory neboli skopírované: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Tieto súbory neboli presunuté: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Tieto súbory neboli odstránené: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Tieto súbory boli konvertované do iného formátu: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="few">Do schránky boli skopírované <xliff:g id="COUNT_1">%1$d</xliff:g> súbory.</item>
- <item quantity="many">Do schránky bolo skopírovaného <xliff:g id="COUNT_1">%1$d</xliff:g> súboru.</item>
- <item quantity="other">Do schránky bolo skopírovaných <xliff:g id="COUNT_1">%1$d</xliff:g> súborov.</item>
- <item quantity="one">Do schránky bol skopírovaný <xliff:g id="COUNT_0">%1$d</xliff:g> súbor.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Do tohto umiestnenia nie je možné prilepiť vybrané súbory"</string>
- <string name="menu_rename" msgid="7678802479104285353">"Premenovať"</string>
- <string name="rename_error" msgid="4203041674883412606">"Premenovanie dokumentu zlyhalo"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Niektoré súbory boli konvertované"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Udeliť aplikácii <xliff:g id="APPNAME"><b>^1</b></xliff:g> prístup k adresáru <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> v úložisku <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Udeliť aplikácii <xliff:g id="APPNAME"><b>^1</b></xliff:g> prístup k adresáru <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Chcete aplikácii <xliff:g id="APPNAME"><b>^1</b></xliff:g> udeliť prístup k dátam (vrátane fotiek a videí) v úložisku <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Nabudúce sa nepýtať"</string>
- <string name="allow" msgid="7225948811296386551">"Povoliť"</string>
- <string name="deny" msgid="2081879885755434506">"Zamietnuť"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="few">Vybraté: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="many">Vybraté: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Vybraté: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Vybraté: <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> položky</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> položky</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> položiek</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> položka</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Odstrániť <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Odstrániť priečinok <xliff:g id="NAME">%1$s</xliff:g> a jeho obsah?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="few">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súbory?</item>
- <item quantity="many">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súboru?</item>
- <item quantity="other">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súborov?</item>
- <item quantity="one">Odstrániť <xliff:g id="COUNT_0">%1$d</xliff:g> súbor?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="few">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> priečinky a ich obsah?</item>
- <item quantity="many">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> priečinka a jeho obsah?</item>
- <item quantity="other">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> priečinkov a ich obsah?</item>
- <item quantity="one">Odstrániť <xliff:g id="COUNT_0">%1$d</xliff:g> priečinok a jeho obsah?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="few">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> položky?</item>
- <item quantity="many">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> položky?</item>
- <item quantity="other">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> položiek?</item>
- <item quantity="one">Odstrániť <xliff:g id="COUNT_0">%1$d</xliff:g> položku?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml
deleted file mode 100644
index 523eb07..0000000
--- a/packages/DocumentsUI/res/values-sl/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Prenosi"</string>
- <string name="title_open" msgid="4353228937663917801">"Odpri iz mape"</string>
- <string name="title_save" msgid="2433679664882857999">"Shrani v"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Nova mapa"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Mrežni pogled"</string>
- <string name="menu_list" msgid="7279285939892417279">"Pogled seznama"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Razvrsti glede na"</string>
- <string name="menu_search" msgid="3816712084502856974">"Iskanje"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Nastavitve shrambe"</string>
- <string name="menu_open" msgid="432922957274920903">"Odpri"</string>
- <string name="menu_save" msgid="2394743337684426338">"Shrani"</string>
- <string name="menu_share" msgid="3075149983979628146">"Skupna raba"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Izberi vse"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiraj v …"</string>
- <string name="menu_move" msgid="1828090633118079817">"Premakni v ..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Novo okno"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Izreži"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Prilepi"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži notranjo shrambo"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Skrij notranjo shrambo"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži velikost datoteke"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Skrij velikost datoteke"</string>
- <string name="button_select" msgid="527196987259139214">"Izberi"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
- <string name="button_move" msgid="2202666023104202232">"Premik"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Opusti"</string>
- <string name="button_retry" msgid="4392027584153752797">"Poskusite znova"</string>
- <string name="sort_name" msgid="9183560467917256779">"Po imenu"</string>
- <string name="sort_date" msgid="586080032956151448">"Po datumu spremembe"</string>
- <string name="sort_size" msgid="3350681319735474741">"Po velikosti"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Pokaži korene"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Skrij korene"</string>
- <string name="save_error" msgid="6167009778003223664">"Dokumenta ni bilo mogoče shraniti"</string>
- <string name="create_error" msgid="3735649141335444215">"Mape ni bilo mogoče ustvariti"</string>
- <string name="query_error" msgid="5999895349602476581">"Vsebine trenutno ni mogoče naložiti"</string>
- <string name="root_recent" msgid="4470053704320518133">"Nedavno"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Prosto: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Storitve shrambe"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Bližnjice"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Naprave"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Več aplikacij"</string>
- <string name="empty" msgid="7858882803708117596">"Ni elementov"</string>
- <string name="no_results" msgid="6622510343880730446">"Tukaj ni ujemanj: %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Datoteke ni mogoče odpreti"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Nekaterih dokumentov ni mogoče izbrisati"</string>
- <string name="share_via" msgid="8966594246261344259">"Deli z drugimi prek"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopiranje datotek"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Premikanje datotek"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Brisanje datotek"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Še <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="two">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- <item quantity="few">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- <item quantity="other">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Premikanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="two">Premikanje <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- <item quantity="few">Premikanje <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- <item quantity="other">Premikanje <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Izbris <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke</item>
- <item quantity="two">Izbris <xliff:g id="COUNT_1">%1$d</xliff:g> datotek</item>
- <item quantity="few">Izbris <xliff:g id="COUNT_1">%1$d</xliff:g> datotek</item>
- <item quantity="other">Izbris <xliff:g id="COUNT_1">%1$d</xliff:g> datotek</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Razveljavi"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Pripravljanje na kopiranje …"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Priprava na premikanje …"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Pripravljanje na izbris …"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke ni bilo mogoče kopirati</item>
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče kopirati</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče kopirati</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče kopirati</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke ni bilo mogoče premakniti</item>
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče premakniti</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče premakniti</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče premakniti</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> datoteke ni bilo mogoče izbrisati</item>
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče izbrisati</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče izbrisati</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> datotek ni bilo mogoče izbrisati</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Dotaknite se za prikaz podrobnosti"</string>
- <string name="close" msgid="3043722427445528732">"Zapri"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Te datoteke niso bile kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Te datoteke niso bile premaknjene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Te datoteke niso bile izbrisane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Te datoteke so bile spremenjene v drugo obliko zapisa: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">V odložišče je bila kopirana <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
- <item quantity="two">V odložišče sta bili kopirani <xliff:g id="COUNT_1">%1$d</xliff:g> datoteki.</item>
- <item quantity="few">V odložišče so bile kopirane <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
- <item quantity="other">V odložišče je bilo kopiranih <xliff:g id="COUNT_1">%1$d</xliff:g> datotek.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Izbranih datotek ni mogoče prilepiti sem."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokumenta ni bilo mogoče preimenovati"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Nekatere datoteke so bile pretvorjene"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Želite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> dovoliti dostop do imenika <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> v shrambi <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Želite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> dovoliti dostop do imenika <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Odobrite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> dostop do podatkov, vključno s fotografijami in videoposnetki, v shrambi <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ne sprašuj več"</string>
- <string name="allow" msgid="7225948811296386551">"Dovoli"</string>
- <string name="deny" msgid="2081879885755434506">"Zavrni"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> izbran</item>
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> izbrana</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> izbrani</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> izbranih</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> element</item>
- <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> elementa</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementov</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ali želite izbrisati »<xliff:g id="NAME">%1$s</xliff:g>«?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ali želite izbrisati mapo »<xliff:g id="NAME">%1$s</xliff:g>« in njeno vsebino?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteko?</item>
- <item quantity="two">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteki?</item>
- <item quantity="few">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item>
- <item quantity="other">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datotek?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> mapo in njihovo vsebino?</item>
- <item quantity="two">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> mapi in njihovo vsebino?</item>
- <item quantity="few">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> mape in njihovo vsebino?</item>
- <item quantity="other">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> map in njihovo vsebino?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> element?</item>
- <item quantity="two">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> elementa?</item>
- <item quantity="few">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> elemente?</item>
- <item quantity="other">Ali želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> elementov?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
deleted file mode 100644
index 7bf9665..0000000
--- a/packages/DocumentsUI/res/values-sq-rAL/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokumente"</string>
- <string name="downloads_label" msgid="959113951084633612">"Shkarkimet"</string>
- <string name="title_open" msgid="4353228937663917801">"Hap nga"</string>
- <string name="title_save" msgid="2433679664882857999">"Ruaje te"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Dosje e re"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Pamje rrjete"</string>
- <string name="menu_list" msgid="7279285939892417279">"Pamje liste"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Rendit sipas"</string>
- <string name="menu_search" msgid="3816712084502856974">"Kërko"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Cilësimet e hapësirës ruajtëse"</string>
- <string name="menu_open" msgid="432922957274920903">"Hap"</string>
- <string name="menu_save" msgid="2394743337684426338">"Ruaj"</string>
- <string name="menu_share" msgid="3075149983979628146">"Shpërnda"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Fshi"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Zgjidhi të gjitha"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopjo te..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Zhvendos te..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Dritare e re"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Prit"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopjo"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Ngjit"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Trego hapësirën e brendshme ruajtëse"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Fshih hapësirën ruajtëse të brendshme"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Shfaq madhësinë e skedarit"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Fshih madhësinë e skedarit"</string>
- <string name="button_select" msgid="527196987259139214">"Zgjidh"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopjo"</string>
- <string name="button_move" msgid="2202666023104202232">"Zhvendos"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Largoje"</string>
- <string name="button_retry" msgid="4392027584153752797">"Provo sërish"</string>
- <string name="sort_name" msgid="9183560467917256779">"Sipas emrit"</string>
- <string name="sort_date" msgid="586080032956151448">"Sipas datës së modifikimit"</string>
- <string name="sort_size" msgid="3350681319735474741">"Sipas madhësisë"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Trego rrënjët"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Fshih rrënjët"</string>
- <string name="save_error" msgid="6167009778003223664">"Ruajtja e dokumentit dështoi"</string>
- <string name="create_error" msgid="3735649141335444215">"Krijimi i dosjes dështoi"</string>
- <string name="query_error" msgid="5999895349602476581">"Përmbajtja nuk mund të ngarkohet për momentin"</string>
- <string name="root_recent" msgid="4470053704320518133">"Të kohëve të fundit"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Të lirë: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Shërbimet e hapësirës ruajtëse"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Shkurtore"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Pajisjet"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Aplikacione të tjera"</string>
- <string name="empty" msgid="7858882803708117596">"Nuk ka artikuj"</string>
- <string name="no_results" msgid="6622510343880730446">"Nuk ka asnjë përputhje në %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Skedari nuk mund të hapet"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"E pamundur të fshihen disa dokumente"</string>
- <string name="share_via" msgid="8966594246261344259">"Shpërnda publikisht përmes"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Po kopjon skedarët"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Po zhvendos skedarët"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Po fshin skedarët"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> të mbetura"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Po kopjon <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë.</item>
- <item quantity="one">Po kopjon <xliff:g id="COUNT_0">%1$d</xliff:g> skedar.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Po zhvendos <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë.</item>
- <item quantity="one">Po zhvendos <xliff:g id="COUNT_0">%1$d</xliff:g> skedar.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Po fshin <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë.</item>
- <item quantity="one">Po fshin <xliff:g id="COUNT_0">%1$d</xliff:g> skedar.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Zhbëj"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Po përgatitet për kopjimin…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Po përgatitet për zhvendosjen…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Po përgatitet për fshirje…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> skedarë nuk mund të kopjoheshin</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> skedar nuk mund të kopjohej</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> skedarë nuk mund të zhvendoseshin</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> skedar nuk mund të zhvendosej</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> skedarë nuk mund të fshiheshin</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> skedar nuk mund të fshihej</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Trokit për të parë detajet"</string>
- <string name="close" msgid="3043722427445528732">"Mbyll"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Këta skedarë nuk u kopjuan: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Këta skedarë nuk u zhvendosën: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Këta skedarë nuk u fshinë: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Këta skedarë janë konvertuar në format tjetër: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">U kopjuan <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë në kujtesën e fragmenteve.</item>
- <item quantity="one">U kopjua <xliff:g id="COUNT_0">%1$d</xliff:g> skedar në kujtesën e fragmenteve.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Skedarët e zgjedhur nuk mund të ngjiten në këtë vendndodhje."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Riemërto"</string>
- <string name="rename_error" msgid="4203041674883412606">"Riemërtimi i dokumentit dështoi"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Disa skedarë u konvertuan"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Jepi aplikacionit <xliff:g id="APPNAME"><b>^1</b></xliff:g> qasje te direktoria <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> në <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"T\'i jepet aplikacionit <xliff:g id="APPNAME"><b>^1</b></xliff:g> qasje te direktoria <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"T\'i jepet aplikacionit <xliff:g id="APPNAME"><b>^1</b></xliff:g> qasje te të dhënat, duke përfshirë fotografitë dhe videot, në <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Mos pyet përsëri"</string>
- <string name="allow" msgid="7225948811296386551">"Lejo"</string>
- <string name="deny" msgid="2081879885755434506">"Moho"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> të zgjedhur</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> i zgjedhur</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> artikuj</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> artikull</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Të fshihet \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Të fshihet dosja \"<xliff:g id="NAME">%1$s</xliff:g>\" dhe përmbajtja e saj?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Të fshihen <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë?</item>
- <item quantity="one">Të fshihet <xliff:g id="COUNT_0">%1$d</xliff:g> skedar?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Të fshihen <xliff:g id="COUNT_1">%1$d</xliff:g> dosje dhe përmbajtjet e saj?</item>
- <item quantity="one">Të fshihet <xliff:g id="COUNT_0">%1$d</xliff:g> dosje dhe përmbajtjet e saj?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Të fshihen <xliff:g id="COUNT_1">%1$d</xliff:g> artikuj?</item>
- <item quantity="one">Të fshihet <xliff:g id="COUNT_0">%1$d</xliff:g> artikull?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml
deleted file mode 100644
index 0edd8fa..0000000
--- a/packages/DocumentsUI/res/values-sr/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документи"</string>
- <string name="downloads_label" msgid="959113951084633612">"Преузимања"</string>
- <string name="title_open" msgid="4353228937663917801">"Отвори са"</string>
- <string name="title_save" msgid="2433679664882857999">"Сачувај у"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Нови директоријум"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Приказ мреже"</string>
- <string name="menu_list" msgid="7279285939892417279">"Приказ листе"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Сортирај према"</string>
- <string name="menu_search" msgid="3816712084502856974">"Претражи"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Подешавања меморије"</string>
- <string name="menu_open" msgid="432922957274920903">"Отвори"</string>
- <string name="menu_save" msgid="2394743337684426338">"Сачувај"</string>
- <string name="menu_share" msgid="3075149983979628146">"Дели"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Избриши"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Изабери све"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Копирај на..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Премести у..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Нови прозор"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Исеци"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копирај"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Налепи"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Прикажи интерну меморију"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Сакриј интерну меморију"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Прикажи величину датотеке"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Сакриј величину датотеке"</string>
- <string name="button_select" msgid="527196987259139214">"Изабери"</string>
- <string name="button_copy" msgid="8706475544635021302">"Копирај"</string>
- <string name="button_move" msgid="2202666023104202232">"Премести"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Одбаци"</string>
- <string name="button_retry" msgid="4392027584153752797">"Покушај поново"</string>
- <string name="sort_name" msgid="9183560467917256779">"Према имену"</string>
- <string name="sort_date" msgid="586080032956151448">"Према датуму измене"</string>
- <string name="sort_size" msgid="3350681319735474741">"Према величини"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Прикажи основне елементе"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Сакриј основне елементе"</string>
- <string name="save_error" msgid="6167009778003223664">"Чување документа није успело"</string>
- <string name="create_error" msgid="3735649141335444215">"Директоријум није направљен"</string>
- <string name="query_error" msgid="5999895349602476581">"Учитавање садржаја тренутно није могуће"</string>
- <string name="root_recent" msgid="4470053704320518133">"Недавно"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"Слободно је <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Услуге складиштења"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Пречице"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Уређаји"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Још апликација"</string>
- <string name="empty" msgid="7858882803708117596">"Нема ставки"</string>
- <string name="no_results" msgid="6622510343880730446">"Нема подударања у %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Отварање датотеке није успело"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Није могуће избрисати неке документе"</string>
- <string name="share_via" msgid="8966594246261344259">"Делите преко"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Копирање датотека"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Датотеке се премештају"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Датотеке се бришу"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Још <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Копирање <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке.</item>
- <item quantity="few">Копирање <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке.</item>
- <item quantity="other">Копирање <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Премешта се <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- <item quantity="few">Премештају се <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке.</item>
- <item quantity="other">Премешта се <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Брише се <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- <item quantity="few">Бришу се <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке.</item>
- <item quantity="other">Брише се <xliff:g id="COUNT_1">%1$d</xliff:g> датотека.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Опозови"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Припрема се копирање…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Припрема се премештање..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Припрема се брисање…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Нисмо успели да копирамо <xliff:g id="COUNT_1">%1$d</xliff:g> датотеку</item>
- <item quantity="few">Нисмо успели да копирамо <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке</item>
- <item quantity="other">Нисмо успели да копирамо <xliff:g id="COUNT_1">%1$d</xliff:g> датотека</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Премештање <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке није успело</item>
- <item quantity="few">Премештање <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке није успело</item>
- <item quantity="other">Премештање <xliff:g id="COUNT_1">%1$d</xliff:g> датотека није успело</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Брисање <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке није успело</item>
- <item quantity="few">Брисање <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке није успело</item>
- <item quantity="other">Брисање <xliff:g id="COUNT_1">%1$d</xliff:g> датотека није успело</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Додирните да бисте приказали детаље"</string>
- <string name="close" msgid="3043722427445528732">"Затвори"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Следеће датотеке нису копиране: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Следеће датотеке нису премештене: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Следеће датотеке нису избрисане: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ове датотеке су конвертоване у други формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Копирали сте <xliff:g id="COUNT_1">%1$d</xliff:g> датотеку у привремену меморију.</item>
- <item quantity="few">Копирали сте <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке у привремену меморију.</item>
- <item quantity="other">Копирали сте <xliff:g id="COUNT_1">%1$d</xliff:g> датотека у привремену меморију.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Изабране датотеке не могу да се налепе на овој локацији."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Преименуј"</string>
- <string name="rename_error" msgid="4203041674883412606">"Преименовање документа није успело"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Неке датотеке су конвертоване"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Желите ли да апликацији <xliff:g id="APPNAME"><b>^1</b></xliff:g> одобрите приступ директоријуму <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на меморијском простору <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Желите да дозволите да <xliff:g id="APPNAME"><b>^1</b></xliff:g> приступа директоријуму <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Желите да ли да дозволите да апликација <xliff:g id="APPNAME"><b>^1</b></xliff:g> приступа подацима, укључујући слике и видео снимке, на локацији <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Не питај поново"</string>
- <string name="allow" msgid="7225948811296386551">"Дозволи"</string>
- <string name="deny" msgid="2081879885755434506">"Одбиј"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Изабрана је <xliff:g id="COUNT_1">%1$d</xliff:g> ставка</item>
- <item quantity="few">Изабране су <xliff:g id="COUNT_1">%1$d</xliff:g> ставке</item>
- <item quantity="other">Изабрано је <xliff:g id="COUNT_1">%1$d</xliff:g> ставки</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ставка</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> ставке</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ставки</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Желите ли да избришете „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Желите ли да избришете директоријум „<xliff:g id="NAME">%1$s</xliff:g>“ и његов садржај?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> датотеку?</item>
- <item quantity="few">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке?</item>
- <item quantity="other">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> датотека?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> директоријум и њихов садржај?</item>
- <item quantity="few">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> директоријума и њихов садржај?</item>
- <item quantity="other">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> директоријума и њихов садржај?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> ставку?</item>
- <item quantity="few">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> ставке?</item>
- <item quantity="other">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> ставки?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sv/strings.xml b/packages/DocumentsUI/res/values-sv/strings.xml
deleted file mode 100644
index 618e12b..0000000
--- a/packages/DocumentsUI/res/values-sv/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokument"</string>
- <string name="downloads_label" msgid="959113951084633612">"Nedladdningar"</string>
- <string name="title_open" msgid="4353228937663917801">"Öppna från"</string>
- <string name="title_save" msgid="2433679664882857999">"Spara till"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Ny mapp"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Rutnätsvy"</string>
- <string name="menu_list" msgid="7279285939892417279">"Listvy"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sortera efter"</string>
- <string name="menu_search" msgid="3816712084502856974">"Sök"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Lagringsinställningar"</string>
- <string name="menu_open" msgid="432922957274920903">"Öppna"</string>
- <string name="menu_save" msgid="2394743337684426338">"Spara"</string>
- <string name="menu_share" msgid="3075149983979628146">"Dela"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Ta bort"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Markera allt"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopiera till …"</string>
- <string name="menu_move" msgid="1828090633118079817">"Flytta till ..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Nytt fönster"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Klipp ut"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiera"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Klistra in"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Visa internminne"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Dölj internminne"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Visa filstorlek"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Dölj filstorlek"</string>
- <string name="button_select" msgid="527196987259139214">"Välj"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopiera"</string>
- <string name="button_move" msgid="2202666023104202232">"Flytta"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Ta bort permanent"</string>
- <string name="button_retry" msgid="4392027584153752797">"Försök igen"</string>
- <string name="sort_name" msgid="9183560467917256779">"Efter namn"</string>
- <string name="sort_date" msgid="586080032956151448">"Efter ändringsdatum"</string>
- <string name="sort_size" msgid="3350681319735474741">"Efter storlek"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Visa rötter"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Dölj rötter"</string>
- <string name="save_error" msgid="6167009778003223664">"Det gick inte att spara dokumentet"</string>
- <string name="create_error" msgid="3735649141335444215">"Det gick inte att skapa mappen"</string>
- <string name="query_error" msgid="5999895349602476581">"Det går inte att läsa in innehållet just nu"</string>
- <string name="root_recent" msgid="4470053704320518133">"Senaste"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ledigt"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Lagringstjänster"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Genvägar"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Enheter"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Fler appar"</string>
- <string name="empty" msgid="7858882803708117596">"Inga objekt"</string>
- <string name="no_results" msgid="6622510343880730446">"Det finns inga träffar i %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Det går inte att öppna filen"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Det gick inte att ta bort vissa dokument"</string>
- <string name="share_via" msgid="8966594246261344259">"Dela via"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kopierar filer"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Filer flyttas"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Filerna tas bort"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> återstår"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Kopierar <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="one">Kopierar <xliff:g id="COUNT_0">%1$d</xliff:g> fil.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Flyttar <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="one">Flyttar <xliff:g id="COUNT_0">%1$d</xliff:g> fil.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Raderar <xliff:g id="COUNT_1">%1$d</xliff:g> filer.</item>
- <item quantity="one">Raderar <xliff:g id="COUNT_0">%1$d</xliff:g> fil.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Ångra"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopieringen förbereds …"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Förbereder för att flytta …"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Radering förbereds …"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Det gick inte att kopiera <xliff:g id="COUNT_1">%1$d</xliff:g> filer</item>
- <item quantity="one">Det gick inte att kopiera <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Det gick inte att flytta <xliff:g id="COUNT_1">%1$d</xliff:g> filer</item>
- <item quantity="one">Det gick inte att flytta <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Det gick inte att radera <xliff:g id="COUNT_1">%1$d</xliff:g> filer</item>
- <item quantity="one">Det gick inte att radera <xliff:g id="COUNT_0">%1$d</xliff:g> fil</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Tryck om du vill visa informationen"</string>
- <string name="close" msgid="3043722427445528732">"Stäng"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Följande filer kopierades inte: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Följande filer flyttades inte: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Följande filer raderades inte: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Filerna konverterades till ett annat format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> filer har kopierats till Urklipp.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fil har kopierats till Urklipp.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Det går inte att klistra in den valda filen på den här platsen."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Byt namn"</string>
- <string name="rename_error" msgid="4203041674883412606">"Det gick inte att byta namn på dokumentet"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Vissa filer konverterades"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Vill du ge <xliff:g id="APPNAME"><b>^1</b></xliff:g> åtkomst till katalogen <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> på <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Vill du ge <xliff:g id="APPNAME"><b>^1</b></xliff:g> åtkomst till katalogen <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Vill du ge <xliff:g id="APPNAME"><b>^1</b></xliff:g> åtkomst till din data (inklusive foton och videor) på <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Fråga inte igen"</string>
- <string name="allow" msgid="7225948811296386551">"Tillåt"</string>
- <string name="deny" msgid="2081879885755434506">"Neka"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> har valts</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> har valts</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> objekt</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> objekt</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vill du radera <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vill du radera mappen <xliff:g id="NAME">%1$s</xliff:g> och dess innehåll?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Vill du radera <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item>
- <item quantity="one">Vill du radera <xliff:g id="COUNT_0">%1$d</xliff:g> fil?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Vill du radera <xliff:g id="COUNT_1">%1$d</xliff:g> mappar och deras innehåll?</item>
- <item quantity="one">Vill du radera <xliff:g id="COUNT_0">%1$d</xliff:g> mapp och dess innehåll?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Vill du radera <xliff:g id="COUNT_1">%1$d</xliff:g> objekt?</item>
- <item quantity="one">Vill du radera <xliff:g id="COUNT_0">%1$d</xliff:g> objekt?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml
deleted file mode 100644
index 5f57cd1..0000000
--- a/packages/DocumentsUI/res/values-sw/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Hati"</string>
- <string name="downloads_label" msgid="959113951084633612">"Vipakuliwa"</string>
- <string name="title_open" msgid="4353228937663917801">"Fungua kutoka"</string>
- <string name="title_save" msgid="2433679664882857999">"Hifadhi kwenye"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Folda mpya"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Mwonekano gridi"</string>
- <string name="menu_list" msgid="7279285939892417279">"Mwonekano orodha"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Panga kwa"</string>
- <string name="menu_search" msgid="3816712084502856974">"Utafutaji"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Mipangilio ya hifadhi"</string>
- <string name="menu_open" msgid="432922957274920903">"Fungua"</string>
- <string name="menu_save" msgid="2394743337684426338">"Hifadhi"</string>
- <string name="menu_share" msgid="3075149983979628146">"Shiriki"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Futa"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Chagua zote"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Nakili kwenda..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Hamisha hadi..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Dirisha jipya"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Kata"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Nakili"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Bandika"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Onyesha hifadhi ya ndani"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ficha hifadhi ya ndani"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Onyesha ukubwa wa faili"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ficha ukubwa wa faili"</string>
- <string name="button_select" msgid="527196987259139214">"Teua"</string>
- <string name="button_copy" msgid="8706475544635021302">"Nakili"</string>
- <string name="button_move" msgid="2202666023104202232">"Hamisha"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Ondoa"</string>
- <string name="button_retry" msgid="4392027584153752797">"Jaribu Tena"</string>
- <string name="sort_name" msgid="9183560467917256779">"Kwa jina"</string>
- <string name="sort_date" msgid="586080032956151448">"Kwa tarehe viliporekebishwa"</string>
- <string name="sort_size" msgid="3350681319735474741">"Kwa ukubwa"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Onyesha usuli"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ficha usuli"</string>
- <string name="save_error" msgid="6167009778003223664">"Imeshindwa kuhifadhi hati"</string>
- <string name="create_error" msgid="3735649141335444215">"Ilishindwa kuunda folda"</string>
- <string name="query_error" msgid="5999895349602476581">"Haiwezi kupakia maudhui kwa sasa"</string>
- <string name="root_recent" msgid="4470053704320518133">"Za hivi karibuni"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> bila malipo"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Huduma za hifadhi"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Njia za mkato"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Vifaa"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Programu zaidi"</string>
- <string name="empty" msgid="7858882803708117596">"Hakuna chochote"</string>
- <string name="no_results" msgid="6622510343880730446">"Hakuna zinazolingana katika %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Haiwezi kufungua faili"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Imeshindwa kufuta baadhi ya hati"</string>
- <string name="share_via" msgid="8966594246261344259">"Shiriki kupitia"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Inanakili faili"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Inahamisha faili"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Inafuta faili"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Zimesalia <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Inanakili faili <xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- <item quantity="one">Inanakili faili <xliff:g id="COUNT_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Inahamisha faili <xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- <item quantity="one">Inahamisha faili <xliff:g id="COUNT_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Inafuta faili <xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- <item quantity="one">Inafuta faili <xliff:g id="COUNT_0">%1$d</xliff:g>.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Tendua"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Inaanda kunakili..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Inatayarisha kuhamisha..."</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Inajitayarisha kufuta..."</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Haikuweza kunakili faili <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Haikuweza kunakili faili <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Haikuweza kuhamisha faili <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Haikuweza kuhamisha faili <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Haikuweza kufuta faili <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Haikuweza kufuta faili <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Gonga ili uangalie maelezo"</string>
- <string name="close" msgid="3043722427445528732">"Funga"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Haikunakili faili zifuatazo: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Haikuhamisha faili zifuatazo: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Imeshindwa kufuta faili zifuatazo: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Faili hizi zimebadilishwa muundo. <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Alinakili faili <xliff:g id="COUNT_1">%1$d</xliff:g> kwenye ubao wa kunakili.</item>
- <item quantity="one">Alinakili faili <xliff:g id="COUNT_0">%1$d</xliff:g> kwenye ubao wa kunakili.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Haiwezi kubandika faili zilizochaguliwa katika eneo hili."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Badilisha jina"</string>
- <string name="rename_error" msgid="4203041674883412606">"Imeshindwa kubadilisha jina la hati"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Baadhi ya faili zimebadilishwa muundo"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Ungependa kuruhusu <xliff:g id="APPNAME"><b>^1</b></xliff:g> ifikie saraka ya <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> kwenye <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Ungependa kuruhusu <xliff:g id="APPNAME"><b>^1</b></xliff:g> ifikie saraka ya <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Ungependa kuruhusu <xliff:g id="APPNAME"><b>^1</b></xliff:g> ifikie data yako, ikiwa ni pamoja na picha na video kwenye <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Usiniulize tena"</string>
- <string name="allow" msgid="7225948811296386551">"Ruhusu"</string>
- <string name="deny" msgid="2081879885755434506">"Kataza"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> zimechaguliwa</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> imechaguliwa</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other">Vipengee <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Kipengee <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ungependa kufuta \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ungependa kufuta folda ya \"<xliff:g id="NAME">%1$s</xliff:g>\" na maudhui yake?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Ungependa kufuta faili <xliff:g id="COUNT_1">%1$d</xliff:g>?</item>
- <item quantity="one">Ungependa kufuta faili <xliff:g id="COUNT_0">%1$d</xliff:g>?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Ungependa kufuta folda <xliff:g id="COUNT_1">%1$d</xliff:g> na maudhui yaliyomo?</item>
- <item quantity="one">Ungependa kufuta folda <xliff:g id="COUNT_0">%1$d</xliff:g> na maudhui yaliyomo?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Ungependa kufuta vipengee <xliff:g id="COUNT_1">%1$d</xliff:g>?</item>
- <item quantity="one">Ungependa kufuta kipengee <xliff:g id="COUNT_0">%1$d</xliff:g>?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw600dp/dimens.xml b/packages/DocumentsUI/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 642ff7e..0000000
--- a/packages/DocumentsUI/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <dimen name="root_icon_margin">8dp</dimen>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp-land/config.xml b/packages/DocumentsUI/res/values-sw720dp-land/config.xml
deleted file mode 100644
index 6893d7a..0000000
--- a/packages/DocumentsUI/res/values-sw720dp-land/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp-land/dimens.xml b/packages/DocumentsUI/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 1b67ee5..0000000
--- a/packages/DocumentsUI/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <dimen name="list_item_height">64dp</dimen>
- <dimen name="list_item_padding">24dp</dimen>
-
- <dimen name="list_divider_inset">80dp</dimen>
-
- <dimen name="max_drawer_width">320dp</dimen>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp-land/layouts.xml b/packages/DocumentsUI/res/values-sw720dp-land/layouts.xml
deleted file mode 100644
index 0e1807c..0000000
--- a/packages/DocumentsUI/res/values-sw720dp-land/layouts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <item name="files_activity" type="layout">@layout/fixed_layout</item>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp/colors.xml b/packages/DocumentsUI/res/values-sw720dp/colors.xml
deleted file mode 100644
index 3ecafe2..0000000
--- a/packages/DocumentsUI/res/values-sw720dp/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <color name="menu_search_background">#ff676f74</color>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp/config.xml b/packages/DocumentsUI/res/values-sw720dp/config.xml
deleted file mode 100644
index 4898e74..0000000
--- a/packages/DocumentsUI/res/values-sw720dp/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <!-- Indicates if search view is taking the whole toolbar space -->
- <bool name="full_bar_search_view">false</bool>
-</resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp/dimens.xml b/packages/DocumentsUI/res/values-sw720dp/dimens.xml
deleted file mode 100644
index 982b204..0000000
--- a/packages/DocumentsUI/res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <dimen name="grid_padding_horiz">16dp</dimen>
- <dimen name="grid_padding_vert">16dp</dimen>
-
- <dimen name="list_item_padding">24dp</dimen>
-
- <dimen name="max_drawer_width">320dp</dimen>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 3a9975f..0000000
--- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"ஆவணங்கள்"</string>
- <string name="downloads_label" msgid="959113951084633612">"இறக்கங்கள்"</string>
- <string name="title_open" msgid="4353228937663917801">"இதில் திற"</string>
- <string name="title_save" msgid="2433679664882857999">"இதில் சேமி"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"புதிய கோப்புறை"</string>
- <string name="menu_grid" msgid="6878021334497835259">"கட்டக் காட்சி"</string>
- <string name="menu_list" msgid="7279285939892417279">"பட்டியல்"</string>
- <string name="menu_sort" msgid="7677740407158414452">"இதன்படி வரிசைப்படுத்து"</string>
- <string name="menu_search" msgid="3816712084502856974">"தேடு"</string>
- <string name="menu_settings" msgid="8239065133341597825">"சேமிப்பிட அமைப்புகள்"</string>
- <string name="menu_open" msgid="432922957274920903">"திற"</string>
- <string name="menu_save" msgid="2394743337684426338">"சேமி"</string>
- <string name="menu_share" msgid="3075149983979628146">"பகிர்"</string>
- <string name="menu_delete" msgid="8138799623850614177">"நீக்கு"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
- <string name="menu_copy" msgid="3612326052677229148">"இங்கு நகலெடு…"</string>
- <string name="menu_move" msgid="1828090633118079817">"இதற்கு நகர்த்து…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"புதிய சாளரம்"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"வெட்டு"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"நகலெடு"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ஒட்டு"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"அகச் சேமிப்பகத்தைக் காட்டு"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"அகச் சேமிப்பகத்தை மறை"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"கோப்பு அளவைக் காட்டு"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"கோப்பு அளவை மறை"</string>
- <string name="button_select" msgid="527196987259139214">"தேர்ந்தெடு"</string>
- <string name="button_copy" msgid="8706475544635021302">"நகலெடு"</string>
- <string name="button_move" msgid="2202666023104202232">"நகர்த்து"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"நிராகரி"</string>
- <string name="button_retry" msgid="4392027584153752797">"மீண்டும் முயற்சிக்கவும்"</string>
- <string name="sort_name" msgid="9183560467917256779">"பெயரின்படி"</string>
- <string name="sort_date" msgid="586080032956151448">"திருத்தப்பட்ட தேதியின்படி"</string>
- <string name="sort_size" msgid="3350681319735474741">"அளவின்படி"</string>
- <string name="drawer_open" msgid="4545466532430226949">"வழிகளைக் காட்டு"</string>
- <string name="drawer_close" msgid="7602734368552123318">"வழிகளை மறை"</string>
- <string name="save_error" msgid="6167009778003223664">"ஆவணத்தைச் சேமிப்பதில் தோல்வி"</string>
- <string name="create_error" msgid="3735649141335444215">"கோப்புறையை உருவாக்குவதில் தோல்வி"</string>
- <string name="query_error" msgid="5999895349602476581">"தற்போது உள்ளடக்கத்தை ஏற்ற முடியாது"</string>
- <string name="root_recent" msgid="4470053704320518133">"சமீபத்தியவை"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> இலவசம்"</string>
- <string name="root_type_service" msgid="2178854894416775409">"சேமிப்பிட சாதனங்கள்"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"குறுக்குவழிகள்"</string>
- <string name="root_type_device" msgid="7121342474653483538">"சாதனங்கள்"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"மேலும் பயன்பாடுகள்"</string>
- <string name="empty" msgid="7858882803708117596">"எதுவும் இல்லை"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s இல் பொருந்தும் முடிவு இல்லை"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"கோப்பைத் திறக்க முடியாது"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"சில ஆவணங்களை நீக்க முடியவில்லை"</string>
- <string name="share_via" msgid="8966594246261344259">"இதன் வழியாகப் பகிர்"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"கோப்புகளை நகலெடுத்தல்"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"கோப்புகளை நகர்த்துதல்"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"கோப்புகளை நீக்குகிறது"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> மீதமுள்ளது"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நகலெடுக்கிறது.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நகலெடுக்கிறது.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நகர்த்துகிறது.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நகர்த்துகிறது.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நீக்குகிறது.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நீக்குகிறது.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"செயல்தவிர்"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"நகல் தயாராகிறது…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"நகர்த்துவதற்குத் தயார்படுத்துகிறது…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"நீக்கத் தயாராகிறது…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நகலெடுக்க முடியவில்லை</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நகலெடுக்க முடியவில்லை</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நகர்த்த முடியவில்லை</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நகர்த்த முடியவில்லை</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நீக்க முடியவில்லை</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நீக்க முடியவில்லை</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"விவரங்களைப் பார்க்க, தட்டவும்"</string>
- <string name="close" msgid="3043722427445528732">"மூடு"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"பின்வரும் கோப்புகள் நகலெடுக்கப்படவில்லை: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"பின்வரும் கோப்புகள் நகர்த்தப்படவில்லை: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"பின்வரும் கோப்புகள் நீக்கப்படவில்லை: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"இந்தக் கோப்புகள் வேறொரு வடிவத்திற்கு மாற்றப்பட்டன: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">கிளிப்போர்டிற்கு <xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகள் நகலெடுக்கப்பட்டன.</item>
- <item quantity="one">கிளிப்போர்டிற்கு <xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பு நகலெடுக்கப்பட்டது.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"தேர்ந்தெடுத்த கோப்புகளை இங்கு ஒட்ட முடியாது."</string>
- <string name="menu_rename" msgid="7678802479104285353">"மறுபெயரிடு"</string>
- <string name="rename_error" msgid="4203041674883412606">"ஆவணத்திற்கு மறுபெயரிடுவதில் தோல்வி"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"சில கோப்புகள் மாற்றப்பட்டன"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> இல் உள்ள <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> கோப்பகத்தை அணுக <xliff:g id="APPNAME"><b>^1</b></xliff:g>ஐ அனுமதிக்கவா?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> கோப்பகத்தை அணுக, <xliff:g id="APPNAME"><b>^1</b></xliff:g>ஐ அனுமதிக்கவா?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g> இல் உள்ள படங்கள், வீடியோக்கள் உட்பட எல்லா தரவையும் அணுக, <xliff:g id="APPNAME"><b>^1</b></xliff:g>ஐ அனுமதிக்கவா?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"மீண்டும் கேட்காதே"</string>
- <string name="allow" msgid="7225948811296386551">"அனுமதி"</string>
- <string name="deny" msgid="2081879885755434506">"நிராகரி"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டன</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> உருப்படிகள்</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> உருப்படி</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\"ஐ நீக்கவா?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" கோப்புறையையும் அதன் உள்ளடக்கத்தையும் நீக்கவா?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நீக்கவா?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நீக்கவா?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புறைகளையும் அவற்றின் உள்ளடக்கத்தையும் நீக்கவா?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்புறையையும் அதன் உள்ளடக்கத்தையும் நீக்கவா?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> உருப்படிகளை நீக்கவா?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> உருப்படியை நீக்கவா?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml
deleted file mode 100644
index 5efdab9..0000000
--- a/packages/DocumentsUI/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"పత్రాలు"</string>
- <string name="downloads_label" msgid="959113951084633612">"డౌన్లోడ్లు"</string>
- <string name="title_open" msgid="4353228937663917801">"ఇక్కడి నుండి తెరువు"</string>
- <string name="title_save" msgid="2433679664882857999">"ఇందులో సేవ్ చేయి"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"కొత్త ఫోల్డర్"</string>
- <string name="menu_grid" msgid="6878021334497835259">"గ్రిడ్ వీక్షణ"</string>
- <string name="menu_list" msgid="7279285939892417279">"జాబితా వీక్షణ"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ఇలా క్రమబద్ధీకరించు"</string>
- <string name="menu_search" msgid="3816712084502856974">"శోధించు"</string>
- <string name="menu_settings" msgid="8239065133341597825">"నిల్వ సెట్టింగ్లు"</string>
- <string name="menu_open" msgid="432922957274920903">"తెరువు"</string>
- <string name="menu_save" msgid="2394743337684426338">"సేవ్ చేయి"</string>
- <string name="menu_share" msgid="3075149983979628146">"భాగస్వామ్యం చేయి"</string>
- <string name="menu_delete" msgid="8138799623850614177">"తొలగించు"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"అన్నీ ఎంచుకోండి"</string>
- <string name="menu_copy" msgid="3612326052677229148">"ఇక్కడికి కాపీ చేయి…"</string>
- <string name="menu_move" msgid="1828090633118079817">"దీనికి తరలించు..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"కొత్త విండో"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"కత్తిరించు"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"కాపీ చేయి"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"అతికించు"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"అంతర్గత నిల్వను చూపు"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"అంతర్గత నిల్వను దాచు"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"ఫైల్ పరిమాణాన్ని చూపు"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ఫైల్ పరిమాణాన్ని దాచు"</string>
- <string name="button_select" msgid="527196987259139214">"ఎంచుకోండి"</string>
- <string name="button_copy" msgid="8706475544635021302">"కాపీ చేయి"</string>
- <string name="button_move" msgid="2202666023104202232">"తరలించు"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"తీసివేయి"</string>
- <string name="button_retry" msgid="4392027584153752797">"మళ్లీ ప్రయత్నించు"</string>
- <string name="sort_name" msgid="9183560467917256779">"పేరు ద్వారా"</string>
- <string name="sort_date" msgid="586080032956151448">"సవరించిన తేదీ ద్వారా"</string>
- <string name="sort_size" msgid="3350681319735474741">"పరిమాణం ద్వారా"</string>
- <string name="drawer_open" msgid="4545466532430226949">"మూలాలను చూపు"</string>
- <string name="drawer_close" msgid="7602734368552123318">"మూలాలను దాచు"</string>
- <string name="save_error" msgid="6167009778003223664">"పత్రాన్ని సేవ్ చేయడంలో విఫలమైంది"</string>
- <string name="create_error" msgid="3735649141335444215">"ఫోల్డర్ను సృష్టించడంలో విఫలమైంది"</string>
- <string name="query_error" msgid="5999895349602476581">"ఈ సమయంలో కంటెంట్ను లోడ్ చేయడం సాధ్యపడదు"</string>
- <string name="root_recent" msgid="4470053704320518133">"ఇటీవల"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ఖాళీ"</string>
- <string name="root_type_service" msgid="2178854894416775409">"నిల్వ పరికరాలు"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"సత్వరమార్గాలు"</string>
- <string name="root_type_device" msgid="7121342474653483538">"పరికరాలు"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"మరిన్ని అనువర్తనాలు"</string>
- <string name="empty" msgid="7858882803708117596">"అంశాలు లేవు"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$sలో సరిపోలినవి లేవు"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"ఫైల్ను తెరవడం సాధ్యపడదు"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"కొన్ని పత్రాలను తొలగించడం సాధ్యపడలేదు"</string>
- <string name="share_via" msgid="8966594246261344259">"దీని ద్వారా భాగస్వామ్యం చేయండి"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"ఫైల్లు కాపీ అవుతున్నాయి"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"ఫైల్లను తరలిస్తోంది"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"ఫైల్లను తొలగిస్తోంది"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> మిగిలి ఉంది"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను కాపీ చేస్తోంది.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను కాపీ చేస్తోంది.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను తరలిస్తోంది.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తరలిస్తోంది.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను తొలగిస్తోంది.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తొలగిస్తోంది.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"చర్య రద్దు చేయి"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"కాపీ చేయడానికి సిద్ధం చేస్తోంది…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"తరలించడానికి సిద్ధమవుతోంది…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"తొలగించడానికి సిద్ధం చేస్తోంది…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను కాపీ చేయడం సాధ్యపడలేదు</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను కాపీ చేయడం సాధ్యపడలేదు</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను తరలించడం సాధ్యపడలేదు</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తరలించడం సాధ్యపడలేదు</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను తొలగించడం సాధ్యపడలేదు</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తొలగించడం సాధ్యపడలేదు</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"వివరాలను వీక్షించడానికి నొక్కండి"</string>
- <string name="close" msgid="3043722427445528732">"మూసివేయి"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ఈ ఫైల్లు కాపీ చేయబడలేదు: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ఈ ఫైల్లు తరలించబడలేదు: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ఈ ఫైల్లు తొలగించబడలేదు: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ఈ ఫైల్లు మరొక ఆకృతికి మార్చబడ్డాయి: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">క్లిప్బోర్డ్కి <xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను కాపీ చేసారు.</item>
- <item quantity="one">క్లిప్బోర్డ్కి <xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను కాపీ చేసారు.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ఎంచుకున్న ఫైల్లను ఈ స్థానంలోకి తీసుకురావడం సాధ్యపడదు."</string>
- <string name="menu_rename" msgid="7678802479104285353">"పేరు మార్చు"</string>
- <string name="rename_error" msgid="4203041674883412606">"పత్రం పేరు మార్చడంలో విఫలమైంది"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"కొన్ని పైల్లు మార్చబడ్డాయి"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="STORAGE"><i>^3</i></xliff:g>లో <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ ప్రాప్యతను మంజూరు చేయాలా?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ ప్రాప్యతను మంజూరు చేయాలా?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>లో ఫోటోలు మరియు వీడియోలతో సహా మీ డేటా ప్రాప్యతను <xliff:g id="APPNAME"><b>^1</b></xliff:g>కి మంజూరు చేయాలా?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"మళ్లీ అడగవద్దు"</string>
- <string name="allow" msgid="7225948811296386551">"అనుమతించండి"</string>
- <string name="deny" msgid="2081879885755434506">"తిరస్కరించండి"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఎంచుకోబడ్డాయి</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఎంచుకోబడింది</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> అంశాలు</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> అంశం</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\"ని తొలగించాలా?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ఫోల్డర్ని మరియు అందులోని కంటెంట్లను తొలగించాలా?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను తొలగించాలా?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తొలగించాలా?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫోల్డర్లు మరియు వీటిలోని కంటెంట్లను తొలగించాలా?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫోల్డర్ మరియు దీనిలోని కంటెంట్లను తొలగించాలా?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> అంశాలను తొలగించాలా?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> అంశాన్ని తొలగించాలా?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml
deleted file mode 100644
index 0564b9d..0000000
--- a/packages/DocumentsUI/res/values-th/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"เอกสาร"</string>
- <string name="downloads_label" msgid="959113951084633612">"การดาวน์โหลด"</string>
- <string name="title_open" msgid="4353228937663917801">"เปิดจาก"</string>
- <string name="title_save" msgid="2433679664882857999">"บันทึกไปยัง"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"โฟลเดอร์ใหม่"</string>
- <string name="menu_grid" msgid="6878021334497835259">"มุมมองตาราง"</string>
- <string name="menu_list" msgid="7279285939892417279">"มุมมองรายการ"</string>
- <string name="menu_sort" msgid="7677740407158414452">"จัดเรียงตาม"</string>
- <string name="menu_search" msgid="3816712084502856974">"ค้นหา"</string>
- <string name="menu_settings" msgid="8239065133341597825">"การตั้งค่าที่เก็บข้อมูล"</string>
- <string name="menu_open" msgid="432922957274920903">"เปิด"</string>
- <string name="menu_save" msgid="2394743337684426338">"บันทึก"</string>
- <string name="menu_share" msgid="3075149983979628146">"แชร์"</string>
- <string name="menu_delete" msgid="8138799623850614177">"ลบ"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"เลือกทั้งหมด"</string>
- <string name="menu_copy" msgid="3612326052677229148">"คัดลอกไปยัง…"</string>
- <string name="menu_move" msgid="1828090633118079817">"ย้ายไปที่…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"หน้าต่างใหม่"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"ตัด"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"คัดลอก"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"วาง"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"แสดงที่จัดเก็บภายใน"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"ซ่อนที่จัดเก็บภายใน"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"แสดงขนาดไฟล์"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"ซ่อนขนาดไฟล์"</string>
- <string name="button_select" msgid="527196987259139214">"เลือก"</string>
- <string name="button_copy" msgid="8706475544635021302">"คัดลอก"</string>
- <string name="button_move" msgid="2202666023104202232">"ย้าย"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"ปิด"</string>
- <string name="button_retry" msgid="4392027584153752797">"ลองอีกครั้ง"</string>
- <string name="sort_name" msgid="9183560467917256779">"ตามชื่อ"</string>
- <string name="sort_date" msgid="586080032956151448">"ตามวันที่ที่ปรับเปลี่ยน"</string>
- <string name="sort_size" msgid="3350681319735474741">"ตามขนาด"</string>
- <string name="drawer_open" msgid="4545466532430226949">"แสดงราก"</string>
- <string name="drawer_close" msgid="7602734368552123318">"ซ่อนราก"</string>
- <string name="save_error" msgid="6167009778003223664">"การบันทึกเอกสารล้มเหลว"</string>
- <string name="create_error" msgid="3735649141335444215">"การสร้างโฟลเดอร์ล้มเหลว"</string>
- <string name="query_error" msgid="5999895349602476581">"โหลดเนื้อหาไม่ได้ในขณะนี้"</string>
- <string name="root_recent" msgid="4470053704320518133">"ล่าสุด"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"ว่าง <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"บริการที่เก็บข้อมูล"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"ทางลัด"</string>
- <string name="root_type_device" msgid="7121342474653483538">"อุปกรณ์"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"แอปเพิ่มเติม"</string>
- <string name="empty" msgid="7858882803708117596">"ไม่มีรายการ"</string>
- <string name="no_results" msgid="6622510343880730446">"ไม่พบข้อมูลที่ตรงกันใน %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"เปิดไฟล์ไม่ได้"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"ไม่สามารถลบเอกสารบางรายการ"</string>
- <string name="share_via" msgid="8966594246261344259">"แชร์ผ่าน"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"กำลังคัดลอกไฟล์"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"กำลังย้ายไฟล์"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"กำลังลบไฟล์"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"เหลือ <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">กำลังคัดลอก <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์</item>
- <item quantity="one">กำลังคัดลอก <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">กำลังย้าย <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์</item>
- <item quantity="one">กำลังย้าย <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">กำลังลบ <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์</item>
- <item quantity="one">กำลังลบ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"เลิกทำ"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"กำลังเตรียมการคัดลอก…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"กำลังเตรียมการย้าย…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"กำลังเตรียมลบ…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">คัดลอกไม่ได้ <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์</item>
- <item quantity="one">คัดลอกไม่ได้ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">ย้ายไม่ได้ <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์</item>
- <item quantity="one">ย้ายไม่ได้ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">ลบไม่ได้ <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์</item>
- <item quantity="one">ลบไม่ได้ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"แตะเพื่อดูรายละเอียด"</string>
- <string name="close" msgid="3043722427445528732">"ปิด"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"ไม่ได้คัดลอกไฟล์เหล่านี้: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"ไม่ได้ย้ายไฟล์เหล่านี้: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"ไม่ได้ลบไฟล์เหล่านี้: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ไฟล์ต่อไปนี้แปลงเป็นอีกรูปแบบหนึ่งแล้ว: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">คัดลอก <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์ไปยังคลิปบอร์ดแล้ว</item>
- <item quantity="one">คัดลอก <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์ไปยังคลิปบอร์ดแล้ว</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"ไม่สามารถวางไฟล์ที่เลือกในตำแหน่งนี้"</string>
- <string name="menu_rename" msgid="7678802479104285353">"เปลี่ยนชื่อ"</string>
- <string name="rename_error" msgid="4203041674883412606">"ไม่สามารถเปลี่ยนชื่อเอกสาร"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"แปลงบางไฟล์แล้ว"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"ให้สิทธิ์ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ในการเข้าถึงไดเรกทอรี <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ใน <xliff:g id="STORAGE"><i>^3</i></xliff:g> ไหม"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"ให้สิทธิ์ <xliff:g id="APPNAME"><b>^1</b></xliff:g> เข้าถึงไดเรกทอรี <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ไหม"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"ให้สิทธิ์ <xliff:g id="APPNAME"><b>^1</b></xliff:g> เข้าถึงข้อมูลของคุณ รวมถึงรูปภาพและวิดีโอใน <xliff:g id="STORAGE"><i>^2</i></xliff:g> ไหม"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"ไม่ต้องถามอีก"</string>
- <string name="allow" msgid="7225948811296386551">"อนุญาต"</string>
- <string name="deny" msgid="2081879885755434506">"ปฏิเสธ"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">เลือกไว้ <xliff:g id="COUNT_1">%1$d</xliff:g> รายการ</item>
- <item quantity="one">เลือกไว้ <xliff:g id="COUNT_0">%1$d</xliff:g> รายการ</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> รายการ</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> รายการ</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"ลบ \"<xliff:g id="NAME">%1$s</xliff:g>\" ไหม"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"ลบโฟลเดอร์ \"<xliff:g id="NAME">%1$s</xliff:g>\" และเนื้อหาข้างในไหม"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">ลบ <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์ใช่ไหม</item>
- <item quantity="one">ลบ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์ใช่ไหม</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">ลบ <xliff:g id="COUNT_1">%1$d</xliff:g> โฟลเดอร์และเนื้อหาข้างในใช่ไหม</item>
- <item quantity="one">ลบ <xliff:g id="COUNT_0">%1$d</xliff:g> โฟลเดอร์และเนื้อหาข้างในใช่ไหม</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">ลบ <xliff:g id="COUNT_1">%1$d</xliff:g> รายการใช่ไหม</item>
- <item quantity="one">ลบ <xliff:g id="COUNT_0">%1$d</xliff:g> รายการใช่ไหม</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml
deleted file mode 100644
index ec3f982..0000000
--- a/packages/DocumentsUI/res/values-tl/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Mga Dokumento"</string>
- <string name="downloads_label" msgid="959113951084633612">"Mga Download"</string>
- <string name="title_open" msgid="4353228937663917801">"Buksan mula sa"</string>
- <string name="title_save" msgid="2433679664882857999">"I-save sa"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Bagong folder"</string>
- <string name="menu_grid" msgid="6878021334497835259">"View na grid"</string>
- <string name="menu_list" msgid="7279285939892417279">"View na listahan"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Uriin ayon sa"</string>
- <string name="menu_search" msgid="3816712084502856974">"Maghanap"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Mga setting ng storage"</string>
- <string name="menu_open" msgid="432922957274920903">"Buksan"</string>
- <string name="menu_save" msgid="2394743337684426338">"I-save"</string>
- <string name="menu_share" msgid="3075149983979628146">"Ibahagi"</string>
- <string name="menu_delete" msgid="8138799623850614177">"I-delete"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Piliin lahat"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopyahin sa..."</string>
- <string name="menu_move" msgid="1828090633118079817">"Ilipat sa…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Bagong window"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"I-cut"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopyahin"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"I-paste"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Ipakita internal storage"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Itago internal storage"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Ipakita ang laki ng file"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Itago ang laki ng file"</string>
- <string name="button_select" msgid="527196987259139214">"Pumili"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopyahin"</string>
- <string name="button_move" msgid="2202666023104202232">"Ilipat"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"I-dismiss"</string>
- <string name="button_retry" msgid="4392027584153752797">"Subukang Muli"</string>
- <string name="sort_name" msgid="9183560467917256779">"Ayon sa pangalan"</string>
- <string name="sort_date" msgid="586080032956151448">"Ayon sa petsa ng pagbago"</string>
- <string name="sort_size" msgid="3350681319735474741">"Ayon sa laki"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Ipakita ang mga root"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Itago ang mga root"</string>
- <string name="save_error" msgid="6167009778003223664">"Hindi na-save ang dokumento"</string>
- <string name="create_error" msgid="3735649141335444215">"Hindi nagawa ang folder"</string>
- <string name="query_error" msgid="5999895349602476581">"Hindi ma-load ang content sa ngayon"</string>
- <string name="root_recent" msgid="4470053704320518133">"Kamakailan"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ang libre"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Mga serbisyo ng storage"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Mga Shortcut"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Mga Device"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Higit pang apps"</string>
- <string name="empty" msgid="7858882803708117596">"Walang mga item"</string>
- <string name="no_results" msgid="6622510343880730446">"Walang mga katugma sa %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Hindi mabuksan ang file"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Hindi matanggal ang ilang dokumento"</string>
- <string name="share_via" msgid="8966594246261344259">"Ibahagi sa pamamagitan ng"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Kinokopya ang mga file"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Inililipat ang mga file"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Pagde-delete ng mga file"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> na lang ang natitira"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Kumokopya ng <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="other">Kumokopya ng <xliff:g id="COUNT_1">%1$d</xliff:g> na file.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Inililipat ang <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="other">Inililipat ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Dine-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> file.</item>
- <item quantity="other">Dine-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"I-undo"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Naghahanda para sa pagkopya…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Naghahanda para sa paglilipat…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Naghahanda para sa pag-delete…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Hindi makopya ang <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="other">Hindi makopya ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Hindi mailipat ang <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="other">Hindi mailipat ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Hindi ma-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>
- <item quantity="other">Hindi ma-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"I-tap upang tingnan ang mga detalye"</string>
- <string name="close" msgid="3043722427445528732">"Isara"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Hindi nakopya ang mga file na ito: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Hindi nailipat ang mga file na ito: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Hindi na-delete ang mga file na ito: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Na-convert ang mga file na ito sa ibang format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Nakopya ang <xliff:g id="COUNT_1">%1$d</xliff:g> file sa clipboard.</item>
- <item quantity="other">Nakopya ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file sa clipboard.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Hindi mai-paste sa lokasyong ito ang mga piniling file."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Palitan ang pangalan"</string>
- <string name="rename_error" msgid="4203041674883412606">"Hindi napalitan ang pangalan ng dokumento"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Na-convert ang ilang file"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Bigyan ang <xliff:g id="APPNAME"><b>^1</b></xliff:g> ng access sa directory ng <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> sa <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Bibigyan ang <xliff:g id="APPNAME"><b>^1</b></xliff:g> ng access sa direktoryong <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Bigyan ang <xliff:g id="APPNAME"><b>^1</b></xliff:g> ng access sa iyong data, kabilang ang mga larawan at video, sa <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Huwag nang tatanunging muli"</string>
- <string name="allow" msgid="7225948811296386551">"Payagan"</string>
- <string name="deny" msgid="2081879885755434506">"Tanggihan"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> item</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> na item</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Gusto mo bang i-delete ang \"<xliff:g id="NAME">%1$s</xliff:g>?\""</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Gusto mo bang i-delete ang folder na \"<xliff:g id="NAME">%1$s</xliff:g>\" at ang mga content nito?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item>
- <item quantity="other">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> (na) file?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> folder at mga content ng mga ito?</item>
- <item quantity="other">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> na folder at mga content ng mga ito?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> item?</item>
- <item quantity="other">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> na item?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml
deleted file mode 100644
index b0d8d4d..0000000
--- a/packages/DocumentsUI/res/values-tr/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Dokümanlar"</string>
- <string name="downloads_label" msgid="959113951084633612">"İndirilenler"</string>
- <string name="title_open" msgid="4353228937663917801">"Şuradan aç:"</string>
- <string name="title_save" msgid="2433679664882857999">"Şuraya kaydet:"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Yeni klasör"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Tablo görünümü"</string>
- <string name="menu_list" msgid="7279285939892417279">"Liste görünümü"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sıralama ölçütü"</string>
- <string name="menu_search" msgid="3816712084502856974">"Ara"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Depolama ayarları"</string>
- <string name="menu_open" msgid="432922957274920903">"Aç"</string>
- <string name="menu_save" msgid="2394743337684426338">"Kaydet"</string>
- <string name="menu_share" msgid="3075149983979628146">"Paylaş"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Sil"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Tümünü seç"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopyala…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Taşı..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Yeni pencere"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Kes"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopyala"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Yapıştır"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Dahili depolamayı göster"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Dahili depolamayı gizle"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Dosya boyutunu göster"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Dosya boyutunu gizle"</string>
- <string name="button_select" msgid="527196987259139214">"Seç"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopyala"</string>
- <string name="button_move" msgid="2202666023104202232">"Taşı"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Kapat"</string>
- <string name="button_retry" msgid="4392027584153752797">"Tekrar Dene"</string>
- <string name="sort_name" msgid="9183560467917256779">"Ada göre"</string>
- <string name="sort_date" msgid="586080032956151448">"Değişiklik tarihine göre"</string>
- <string name="sort_size" msgid="3350681319735474741">"Boyuta göre"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Kökleri göster"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Kökleri sakla"</string>
- <string name="save_error" msgid="6167009778003223664">"Doküman kaydedilemedi"</string>
- <string name="create_error" msgid="3735649141335444215">"Klasör oluşturulamadı"</string>
- <string name="query_error" msgid="5999895349602476581">"İçerik şu anda yüklenemiyor"</string>
- <string name="root_recent" msgid="4470053704320518133">"En son"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> boş"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Depolama hizmetleri"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Kısayollar"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Cihazlar"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Diğer uygulamalar"</string>
- <string name="empty" msgid="7858882803708117596">"Öğe yok"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s içinde eşleşme bulunamadı"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Dosya açılamıyor"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Bazı dokümanlar silinemiyor"</string>
- <string name="share_via" msgid="8966594246261344259">"Şunu kullanarak paylaş:"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Dosyalar kopyalanıyor"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Dosyalar taşınıyor"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Dosyalar siliniyor"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> kaldı"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya kopyalanıyor.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya kopyalanıyor.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya taşınıyor.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya taşınıyor.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya siliniyor.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya siliniyor.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Geri al"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Kopyalanmak için hazırlanıyor…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Taşıma için hazırlanıyor…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Silmek için hazırlanıyor…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya kopyalanamadı</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya kopyalanamadı</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya taşınamadı</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya taşınamadı</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya silinemedi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya silinemedi</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Ayrıntıları görmek için hafifçe dokunun"</string>
- <string name="close" msgid="3043722427445528732">"Kapat"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Şu dosyalar kopyalanamadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Şu dosyalar taşınamadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Şu dosyalar silinemedi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Bu dosyalar başka bir biçime dönüştürüldü: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya panoya kopyalandı.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya panoya kopyalandı.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Seçili dosyalar bu konuma yapıştırılamıyor."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Yeniden adlandır"</string>
- <string name="rename_error" msgid="4203041674883412606">"Dokümanın adı değiştirilemedi"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bazı dosyalar dönüştürüldü"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> uygulamasına <xliff:g id="STORAGE"><i>^3</i></xliff:g> depolama alanındaki <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> dizinine erişim izni verilsin mi?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> dizinine erişmek için <xliff:g id="APPNAME"><b>^1</b></xliff:g> uygulamasına izin verilsin mi?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> uygulamasının, fotoğraflar ve videolar dahil olmak üzere <xliff:g id="STORAGE"><i>^2</i></xliff:g> üzerindeki verilerinize erişmesine izin verilsin mi?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Tekrar sorma"</string>
- <string name="allow" msgid="7225948811296386551">"İzin Ver"</string>
- <string name="deny" msgid="2081879885755434506">"Reddet"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> öğe seçildi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> öğe seçildi</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> öğe</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> öğe</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" silinsin mi?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" adlı klasör ve içindekiler silinsin mi?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya silinsin mi?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya silinsin mi?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> klasör ve içindekiler silinsin mi?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> klasör ve içindekiler silinsin mi?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> öğe silinsin mi?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> öğe silinsin mi?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml
deleted file mode 100644
index df35071..0000000
--- a/packages/DocumentsUI/res/values-uk/strings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Документи"</string>
- <string name="downloads_label" msgid="959113951084633612">"Завантаження"</string>
- <string name="title_open" msgid="4353228937663917801">"Відкрити"</string>
- <string name="title_save" msgid="2433679664882857999">"Зберегти в"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Нова папка"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Режим таблиці"</string>
- <string name="menu_list" msgid="7279285939892417279">"Режим списку"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Параметри сортування"</string>
- <string name="menu_search" msgid="3816712084502856974">"Пошук"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Налаштування пам’яті"</string>
- <string name="menu_open" msgid="432922957274920903">"Відкрити"</string>
- <string name="menu_save" msgid="2394743337684426338">"Зберегти"</string>
- <string name="menu_share" msgid="3075149983979628146">"Поділитися"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Видалити"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Вибрати все"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Копіювати в…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Перемістити в…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Нове вікно"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Вирізати"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Копіювати"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Вставити"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Показати внутр. пам’ять"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Сховати внутр. пам’ять"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Показати розмір файлу"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Сховати розмір файлу"</string>
- <string name="button_select" msgid="527196987259139214">"Вибрати"</string>
- <string name="button_copy" msgid="8706475544635021302">"Копіювати"</string>
- <string name="button_move" msgid="2202666023104202232">"Перемістити"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Закрити"</string>
- <string name="button_retry" msgid="4392027584153752797">"Повторити спробу"</string>
- <string name="sort_name" msgid="9183560467917256779">"За назвою"</string>
- <string name="sort_date" msgid="586080032956151448">"За датою змінення"</string>
- <string name="sort_size" msgid="3350681319735474741">"За розміром"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Показати кореневі каталоги"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Сховати кореневі каталоги"</string>
- <string name="save_error" msgid="6167009778003223664">"Не вдалося зберегти документ"</string>
- <string name="create_error" msgid="3735649141335444215">"Помилка створення папки"</string>
- <string name="query_error" msgid="5999895349602476581">"Зараз не вдається завантажити вміст"</string>
- <string name="root_recent" msgid="4470053704320518133">"Останні"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> вільного місця"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Онлайн-сховища"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Ярлики"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Пристрої"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Інші програми"</string>
- <string name="empty" msgid="7858882803708117596">"Нічого немає"</string>
- <string name="no_results" msgid="6622510343880730446">"Немає збігів для запиту \"%1$s\""</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Не вдалося відкрити файл"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Не вдалося видалити деякі документи"</string>
- <string name="share_via" msgid="8966594246261344259">"Надіслати через"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Копіювання файлів"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Переміщення файлів"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Видалення файлів"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Залишилося <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Копіювання <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
- <item quantity="few">Копіювання <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="many">Копіювання <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="other">Копіювання <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Переміщення <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- <item quantity="few">Переміщення <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="many">Переміщення <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="other">Переміщення <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Видалення <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
- <item quantity="few">Видалення <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="many">Видалення <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="other">Видалення <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Відмінити"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Підготовка до копіювання…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Підготовка до переміщення…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Підготовка до видалення…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
- <item quantity="many">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
- <item quantity="other">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
- <item quantity="many">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
- <item quantity="other">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
- <item quantity="few">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
- <item quantity="many">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
- <item quantity="other">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Торкніться, щоб переглянути деталі"</string>
- <string name="close" msgid="3043722427445528732">"Закрити"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Ці файли не скопійовано: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Ці файли не переміщено: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Ці файли не видалено: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ці файли конвертовано в інший формат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">У буфер обміну скопійовано <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
- <item quantity="few">У буфер обміну скопійовано <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
- <item quantity="many">У буфер обміну скопійовано <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
- <item quantity="other">У буфер обміну скопійовано <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Не вдається вставити вибрані файли в цю папку."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Перейменувати"</string>
- <string name="rename_error" msgid="4203041674883412606">"Не вдалося перейменувати документ"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Деякі файли конвертовано"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Надати додатку <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ до каталогу <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на пристрої пам’яті <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Надати додатку <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ до каталогу \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\"?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Надати додатку <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ до ваших даних, зокрема до фотографій і відео, які містить <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Не запитувати знову"</string>
- <string name="allow" msgid="7225948811296386551">"Дозвол."</string>
- <string name="deny" msgid="2081879885755434506">"Забор."</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> елемент</item>
- <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> елементи</item>
- <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> елементів</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> елемента</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Видалити файл <xliff:g id="NAME">%1$s</xliff:g>?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Видалити папку \"<xliff:g id="NAME">%1$s</xliff:g>\" та її вміст?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
- <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли?</item>
- <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів?</item>
- <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папку та їх вміст?</item>
- <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папки та їх вміст?</item>
- <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папок та їх вміст?</item>
- <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папки та їх вміст?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елемент?</item>
- <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елементи?</item>
- <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елементів?</item>
- <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елемента?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
deleted file mode 100644
index c8003b3..0000000
--- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"دستاویزات"</string>
- <string name="downloads_label" msgid="959113951084633612">"ڈاؤن لوڈز"</string>
- <string name="title_open" msgid="4353228937663917801">"کھولیں از"</string>
- <string name="title_save" msgid="2433679664882857999">"اس میں محفوظ کریں"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"نیا فولڈر"</string>
- <string name="menu_grid" msgid="6878021334497835259">"گرڈ منظر"</string>
- <string name="menu_list" msgid="7279285939892417279">"فہرست منظر"</string>
- <string name="menu_sort" msgid="7677740407158414452">"ترتیب دیں بلحاظ"</string>
- <string name="menu_search" msgid="3816712084502856974">"تلاش کریں"</string>
- <string name="menu_settings" msgid="8239065133341597825">"اسٹوریج کی ترتیبات"</string>
- <string name="menu_open" msgid="432922957274920903">"کھولیں"</string>
- <string name="menu_save" msgid="2394743337684426338">"محفوظ کریں"</string>
- <string name="menu_share" msgid="3075149983979628146">"اشتراک کریں"</string>
- <string name="menu_delete" msgid="8138799623850614177">"حذف کریں"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"سبھی کو منتخب کریں"</string>
- <string name="menu_copy" msgid="3612326052677229148">"اس میں کاپی کریں…"</string>
- <string name="menu_move" msgid="1828090633118079817">"اس میں منتقل کریں…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"نئی ونڈو"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"کٹ کریں"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"کاپی کریں"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"پیسٹ کریں"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"داخلی اسٹوریج دکھائیں"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"داخلی اسٹوریج چھپائیں"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"فائل سائز دکھائیں"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"فائل سائز چھپائیں"</string>
- <string name="button_select" msgid="527196987259139214">"منتخب کریں"</string>
- <string name="button_copy" msgid="8706475544635021302">"کاپی کریں"</string>
- <string name="button_move" msgid="2202666023104202232">"منتقل کریں"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"برخاست کریں"</string>
- <string name="button_retry" msgid="4392027584153752797">"دوبارہ کوشش کریں"</string>
- <string name="sort_name" msgid="9183560467917256779">"نام کے لحاظ سے"</string>
- <string name="sort_date" msgid="586080032956151448">"ترمیم کی تاریخ کے لحاظ سے"</string>
- <string name="sort_size" msgid="3350681319735474741">"سائز کے لحاظ سے"</string>
- <string name="drawer_open" msgid="4545466532430226949">"روٹس دکھائیں"</string>
- <string name="drawer_close" msgid="7602734368552123318">"روٹس کو چھپائیں"</string>
- <string name="save_error" msgid="6167009778003223664">"دستاویز کو محفوظ کرنے میں ناکام ہو گیا۔"</string>
- <string name="create_error" msgid="3735649141335444215">"فولڈر بنانے میں ناکام ہو گیا"</string>
- <string name="query_error" msgid="5999895349602476581">"اس وقت مواد لوڈ نہیں ہو سکتا"</string>
- <string name="root_recent" msgid="4470053704320518133">"حالیہ"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> خالی"</string>
- <string name="root_type_service" msgid="2178854894416775409">"اسٹوریج سروسز"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"شارٹ کٹس"</string>
- <string name="root_type_device" msgid="7121342474653483538">"آلات"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"مزید ایپس"</string>
- <string name="empty" msgid="7858882803708117596">"کوئی آئٹمز نہيں ہیں"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s میں کوئی مماثل نہیں"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"فائل نہیں کھل سکتی"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"کچھ دستاویزات کو حذف کرنے سے قاصر"</string>
- <string name="share_via" msgid="8966594246261344259">"اشتراک کریں بذریعہ"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"فائلیں کاپی ہو رہی ہیں"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"فائلیں منتقل ہو رہی ہیں"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"فائلیں حذف کی جا رہی ہیں"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> باقی ہے"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں کاپی کی جا رہی ہیں۔</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل کاپی کی جا رہی ہے۔</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلز منتقل کی جا رہی ہیں۔</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل منتقل کی جا رہی ہے۔</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں حذف ہو رہی ہیں۔</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل حذف ہو رہی ہے۔</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"کالعدم کریں"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"کاپی کیلئے تیار ہو رہا ہے…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"منتقلی کیلئے تیار ہو رہی ہیں…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"حذف کرنے کیلئے تیاری ہو رہی ہے…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں کاپی نہیں ہو سکیں</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل کاپی نہیں ہو سکی</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں منتقل نہیں ہو سکیں</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل منتقل نہیں ہو سکی</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں حذف نہیں ہو سکیں</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل حذف نہیں ہو سکی</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"تفصیلات دیکھنے کیلئے تھپتھپائیں"</string>
- <string name="close" msgid="3043722427445528732">"بند کریں"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"یہ فائلیں کاپی نہیں ہوئیں: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"یہ فائلیں منتقل نہیں ہوئیں: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"یہ فائلیں حذف نہیں ہوئیں: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"ان فائلوں کو ایک دوسرے فارمیٹ میں تبدیل کیا گیا تھا: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلز کلپ بورڈ پر کاپی کی گئیں۔</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل کلپ بورڈ پر کاپی کی گئی۔</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"منتخب کردہ فائلز کو اس مقام پر پیسٹ نہیں کیا جا سکتا۔"</string>
- <string name="menu_rename" msgid="7678802479104285353">"نام تبدیل کریں"</string>
- <string name="rename_error" msgid="4203041674883412606">"دستاویز کا نام تبدیل کرنے میں ناکام"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"کچھ فائلوں کو تبدیل کیا گیا تھا"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> کو <xliff:g id="STORAGE"><i>^3</i></xliff:g> پر <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ڈائرکٹری تک رسائی عطا کریں؟"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> کو <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ڈائرکٹری تک رسائی دیں؟"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> کو اپنے ڈیٹا بشمول <xliff:g id="STORAGE"><i>^2</i></xliff:g> پر موجود تصاویر اور ویڈیوز تک رسائی عطا کریں؟"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"دوبارہ نہ پوچھیں"</string>
- <string name="allow" msgid="7225948811296386551">"اجازت دیں"</string>
- <string name="deny" msgid="2081879885755434506">"مسترد کریں"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> منتخب کردہ</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> منتخب کردہ</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> آئٹمز</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> آئٹم</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" حذف کریں؟"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" فولڈر اور اس کی مشمولات حذف کریں؟"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں حذف کریں؟</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل حذف کریں؟</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فولڈرز اور ان کے مشمولات حذف کریں؟</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فولڈر اور اس کے مشمولات حذف کریں؟</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> آئٹمز حذف کریں؟</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> آئٹم حذف کریں؟</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index fca7386..0000000
--- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Hujjatlar"</string>
- <string name="downloads_label" msgid="959113951084633612">"Yuklanmalar"</string>
- <string name="title_open" msgid="4353228937663917801">"Ochish"</string>
- <string name="title_save" msgid="2433679664882857999">"Saqlash"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Yangi jild"</string>
- <string name="menu_grid" msgid="6878021334497835259">"To‘r ko‘rinishida"</string>
- <string name="menu_list" msgid="7279285939892417279">"Ro‘yxat ko‘rinishida"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Saralash"</string>
- <string name="menu_search" msgid="3816712084502856974">"Qidirish"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Xotira sozlamalari"</string>
- <string name="menu_open" msgid="432922957274920903">"Ochish"</string>
- <string name="menu_save" msgid="2394743337684426338">"Saqlash"</string>
- <string name="menu_share" msgid="3075149983979628146">"Baham ko‘rish"</string>
- <string name="menu_delete" msgid="8138799623850614177">"O‘chirish"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Hammasini belgilash"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Nusxalash…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Ko‘chirib o‘tkazish…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Yangi oyna"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Kesish"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Nusxalash"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Joylash"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Ichki xotirani ko‘rsatish"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ichki xotirani berkitish"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Fayllar hajmi ko‘rsatilsin"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Fayllar hajmi ko‘rsatilmasin"</string>
- <string name="button_select" msgid="527196987259139214">"Tanlash"</string>
- <string name="button_copy" msgid="8706475544635021302">"Nusxalash"</string>
- <string name="button_move" msgid="2202666023104202232">"Ko‘chirib o‘tkazish"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"O‘chirish"</string>
- <string name="button_retry" msgid="4392027584153752797">"Qayta urinish"</string>
- <string name="sort_name" msgid="9183560467917256779">"Nomi bo‘yicha"</string>
- <string name="sort_date" msgid="586080032956151448">"Tahrir sanasi bo‘yicha"</string>
- <string name="sort_size" msgid="3350681319735474741">"Hajmi bo‘yicha"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Asosiy jildlarni ko‘rsatish"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Asosiy jildlarni yashirish"</string>
- <string name="save_error" msgid="6167009778003223664">"Hujjat saqlanmadi"</string>
- <string name="create_error" msgid="3735649141335444215">"Jild yaratilmadi"</string>
- <string name="query_error" msgid="5999895349602476581">"Ayni paytda kontentni yuklab bo‘lmayapti"</string>
- <string name="root_recent" msgid="4470053704320518133">"Yaqinda"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> bo‘sh"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Xotira xizmatlari"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Yorliqlar"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Qurilmalar"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Ko‘proq dasturlar"</string>
- <string name="empty" msgid="7858882803708117596">"Hech narsa yo‘q"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s jildidan topilmadi"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Fayl ochilmadi"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Ba’zi hujjatlar o‘chirilmadi"</string>
- <string name="share_via" msgid="8966594246261344259">"Baham ko‘rish"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Fayllar nusxalanmoqda"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Ko‘chirib o‘tkazilmoqda"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Fayllar o‘chirilmoqda"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> qoldi"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ta fayl nusxalanmoqda</item>
- <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> ta fayl nusxalanmoqda</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayl ko‘chirib o‘tkazilmoqda.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayl ko‘chirib o‘tkazilmoqda.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayl o‘chirilmoqda.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayl o‘chirilmoqda.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Bekor qilish"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Nuxsa olishga tayyorgarlik..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Ko‘chirishga tayyorgarlik…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"O‘chirishga tayyorlanmoqda…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayldan nusxa olib bo‘lmadi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayldan nusxa olib bo‘lmadi</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta faylni ko‘chirib bo‘lmadi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta faylni ko‘chirib bo‘lmadi</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta faylni o‘chirib bo‘lmadi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta faylni o‘chirib bo‘lmadi</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Batafsil ma’lumot olish uchun bosing"</string>
- <string name="close" msgid="3043722427445528732">"Yopish"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Quyidagi fayllardan nusxa olinmadi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Quyidagi fayllar ko‘chirilmadi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Quyidagi fayllar o‘chirib tashlanmadi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ushbu fayllar boshqa formatga o‘girildi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayldan vaqtinchalik xotiraga nusxa olindi.</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayldan vaqtinchalik xotiraga nusxa olindi.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Tanlangan fayllarni bu yerga joylab bo‘lmadi."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Qayta nomlash"</string>
- <string name="rename_error" msgid="4203041674883412606">"Hujjatni qayta nomlab bo‘lmadi"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bir nechta fayllar o‘girildi"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ilovasiga <xliff:g id="STORAGE"><i>^3</i></xliff:g> xotirasidagi “<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>” jildidan foydalanishiga ruxsat berilsinmi?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ilovasiga “<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>” jildidan foydalanishiga ruxsat berilsinmi?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ilovasiga <xliff:g id="STORAGE"><i>^2</i></xliff:g> xotirasidagi ma’lumotlardan, jumladan, rasmlar va videolardan foydalanishiga ruxsat berilsinmi?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Boshqa so‘ralmasin"</string>
- <string name="allow" msgid="7225948811296386551">"Ruxsat berish"</string>
- <string name="deny" msgid="2081879885755434506">"Rad qilish"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta belgilandi</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta belgilandi</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta element</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta element</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"“<xliff:g id="NAME">%1$s</xliff:g>” o‘chirib tashlansinmi?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"“<xliff:g id="NAME">%1$s</xliff:g>” jildi ichidagi kontentlari bilan o‘chirib tashlansinmi?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayl o‘chirilsinmi?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayl o‘chirib tashlansinmi?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta jild ichidagi kontentlari bilan o‘chirib tashlansinmi?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta jild ichidagi kontentlari bilan o‘chirib tashlansinmi?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta element o‘chirib tashlansinmi?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta element o‘chirib tashlansinmi?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml
deleted file mode 100644
index de5bf7c..0000000
--- a/packages/DocumentsUI/res/values-vi/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Tài liệu"</string>
- <string name="downloads_label" msgid="959113951084633612">"Tải xuống"</string>
- <string name="title_open" msgid="4353228937663917801">"Mở từ"</string>
- <string name="title_save" msgid="2433679664882857999">"Lưu vào"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Thư mục mới"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Chế độ xem lưới"</string>
- <string name="menu_list" msgid="7279285939892417279">"Chế độ xem danh sách"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Sắp xếp theo"</string>
- <string name="menu_search" msgid="3816712084502856974">"Tìm kiếm"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Cài đặt bộ nhớ"</string>
- <string name="menu_open" msgid="432922957274920903">"Mở"</string>
- <string name="menu_save" msgid="2394743337684426338">"Lưu"</string>
- <string name="menu_share" msgid="3075149983979628146">"Chia sẻ"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Xóa"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Chọn tất cả"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Sao chép vào…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Chuyển tới..."</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Cửa sổ mới"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Cắt"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Sao chép"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Dán"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Hiển thị bộ nhớ trong"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Ẩn bộ nhớ trong"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Hiển thị kích thước tệp"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Ẩn kích thước tệp"</string>
- <string name="button_select" msgid="527196987259139214">"Chọn"</string>
- <string name="button_copy" msgid="8706475544635021302">"Sao chép"</string>
- <string name="button_move" msgid="2202666023104202232">"Di chuyển"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Loại bỏ"</string>
- <string name="button_retry" msgid="4392027584153752797">"Thử lại"</string>
- <string name="sort_name" msgid="9183560467917256779">"Theo tên"</string>
- <string name="sort_date" msgid="586080032956151448">"Theo ngày sửa đổi"</string>
- <string name="sort_size" msgid="3350681319735474741">"Theo kích thước"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Hiển thị gốc"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Ẩn gốc"</string>
- <string name="save_error" msgid="6167009778003223664">"Không lưu tài liệu được"</string>
- <string name="create_error" msgid="3735649141335444215">"Không thể tạo thư mục"</string>
- <string name="query_error" msgid="5999895349602476581">"Không thể tải nội dung vào lúc này"</string>
- <string name="root_recent" msgid="4470053704320518133">"Gần đây"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> còn trống"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Dịch vụ lưu trữ"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Lối tắt"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Thiết bị"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Các ứng dụng khác"</string>
- <string name="empty" msgid="7858882803708117596">"Không có mục nào"</string>
- <string name="no_results" msgid="6622510343880730446">"Không có kết quả phù hợp trong %1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Không thể mở tệp"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Không thể xóa một số tài liệu"</string>
- <string name="share_via" msgid="8966594246261344259">"Chia sẻ qua"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Đang sao chép tệp"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Đang di chuyển tệp"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Đang xóa tệp"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"Còn <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">Đang sao chép <xliff:g id="COUNT_1">%1$d</xliff:g> tệp.</item>
- <item quantity="one">Đang sao chép <xliff:g id="COUNT_0">%1$d</xliff:g> tệp.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">Đang di chuyển <xliff:g id="COUNT_1">%1$d</xliff:g> tệp.</item>
- <item quantity="one">Đang di chuyển <xliff:g id="COUNT_0">%1$d</xliff:g> tệp.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">Xóa <xliff:g id="COUNT_1">%1$d</xliff:g> tệp.</item>
- <item quantity="one">Xóa <xliff:g id="COUNT_0">%1$d</xliff:g> tệp.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Hoàn tác"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Đang chuẩn bị sao chép…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"Đang chuẩn bị di chuyển…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Đang chuẩn bị xóa…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">Không thể sao chép <xliff:g id="COUNT_1">%1$d</xliff:g> tệp</item>
- <item quantity="one">Không thể sao chép <xliff:g id="COUNT_0">%1$d</xliff:g> tệp</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">Không thể di chuyển <xliff:g id="COUNT_1">%1$d</xliff:g> tệp</item>
- <item quantity="one">Không thể di chuyển <xliff:g id="COUNT_0">%1$d</xliff:g> tệp</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">Không thể xóa <xliff:g id="COUNT_1">%1$d</xliff:g> tệp</item>
- <item quantity="one">Không thể xóa <xliff:g id="COUNT_0">%1$d</xliff:g> tệp</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Nhấn để xem chi tiết"</string>
- <string name="close" msgid="3043722427445528732">"Đóng"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Những tệp này chưa được sao chép: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Những tệp này chưa được di chuyển: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Những tệp này chưa được xóa: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Các tệp này đã được chuyển đổi sang định dạng khác: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">Đã sao chép <xliff:g id="COUNT_1">%1$d</xliff:g> tệp vào khay nhớ tạm.</item>
- <item quantity="one">Đã sao chép <xliff:g id="COUNT_0">%1$d</xliff:g> tệp vào khay nhớ tạm.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Không thể dán các tệp đã chọn vào vị trí này."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Đổi tên"</string>
- <string name="rename_error" msgid="4203041674883412606">"Không đổi được tên tài liệu"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Đã chuyển đổi một số tệp"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Cấp cho <xliff:g id="APPNAME"><b>^1</b></xliff:g> quyền truy cập vào thư mục <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> trong <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Cấp cho <xliff:g id="APPNAME"><b>^1</b></xliff:g> quyền truy cập thư mục <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Cấp cho <xliff:g id="APPNAME"><b>^1</b></xliff:g> quyền truy cập vào dữ liệu của bạn, kể cả ảnh và video trên <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Không hỏi lại"</string>
- <string name="allow" msgid="7225948811296386551">"Cho phép"</string>
- <string name="deny" msgid="2081879885755434506">"Từ chối"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">Đã chọn <xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="one">Đã chọn <xliff:g id="COUNT_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> mục</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> mục</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Xóa \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Xóa thư mục \"<xliff:g id="NAME">%1$s</xliff:g>\" và nội dung của thư mục?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">Xóa <xliff:g id="COUNT_1">%1$d</xliff:g> tệp?</item>
- <item quantity="one">Xóa <xliff:g id="COUNT_0">%1$d</xliff:g> tệp?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">Xóa <xliff:g id="COUNT_1">%1$d</xliff:g> thư mục và nội dung trong đó?</item>
- <item quantity="one">Xóa <xliff:g id="COUNT_0">%1$d</xliff:g> thư mục và nội dung trong đó?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">Xóa <xliff:g id="COUNT_1">%1$d</xliff:g> mục?</item>
- <item quantity="one">Xóa <xliff:g id="COUNT_0">%1$d</xliff:g> mục?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 1a72d9f..0000000
--- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"文档"</string>
- <string name="downloads_label" msgid="959113951084633612">"下载"</string>
- <string name="title_open" msgid="4353228937663917801">"打开文件"</string>
- <string name="title_save" msgid="2433679664882857999">"保存文件"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"新建文件夹"</string>
- <string name="menu_grid" msgid="6878021334497835259">"网格视图"</string>
- <string name="menu_list" msgid="7279285939892417279">"列表视图"</string>
- <string name="menu_sort" msgid="7677740407158414452">"排序依据"</string>
- <string name="menu_search" msgid="3816712084502856974">"搜索"</string>
- <string name="menu_settings" msgid="8239065133341597825">"存储设置"</string>
- <string name="menu_open" msgid="432922957274920903">"打开"</string>
- <string name="menu_save" msgid="2394743337684426338">"保存"</string>
- <string name="menu_share" msgid="3075149983979628146">"分享"</string>
- <string name="menu_delete" msgid="8138799623850614177">"删除"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"全选"</string>
- <string name="menu_copy" msgid="3612326052677229148">"复制到…"</string>
- <string name="menu_move" msgid="1828090633118079817">"移动到…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"新建窗口"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"剪切"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"复制"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"粘贴"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"显示内部存储设备"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"隐藏内部存储设备"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"显示文件大小"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"隐藏文件大小"</string>
- <string name="button_select" msgid="527196987259139214">"选择"</string>
- <string name="button_copy" msgid="8706475544635021302">"复制"</string>
- <string name="button_move" msgid="2202666023104202232">"移动"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"关闭"</string>
- <string name="button_retry" msgid="4392027584153752797">"重试"</string>
- <string name="sort_name" msgid="9183560467917256779">"按名称"</string>
- <string name="sort_date" msgid="586080032956151448">"按修改日期"</string>
- <string name="sort_size" msgid="3350681319735474741">"按大小"</string>
- <string name="drawer_open" msgid="4545466532430226949">"显示根目录"</string>
- <string name="drawer_close" msgid="7602734368552123318">"隐藏根目录"</string>
- <string name="save_error" msgid="6167009778003223664">"无法保存文档"</string>
- <string name="create_error" msgid="3735649141335444215">"无法创建文件夹"</string>
- <string name="query_error" msgid="5999895349602476581">"暂时无法加载内容"</string>
- <string name="root_recent" msgid="4470053704320518133">"最近"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"可用空间：<xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"存储服务"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"捷径"</string>
- <string name="root_type_device" msgid="7121342474653483538">"设备"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"更多应用"</string>
- <string name="empty" msgid="7858882803708117596">"无任何文件"</string>
- <string name="no_results" msgid="6622510343880730446">"%1$s中没有任何相符项"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"无法打开文件"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"无法删除部分文档"</string>
- <string name="share_via" msgid="8966594246261344259">"分享方式"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"正在复制文件"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"正在移动文件"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"正在删除文件"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"剩余时间：<xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">正在复制 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
- <item quantity="one">正在复制 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">正在移动 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
- <item quantity="one">正在移动 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">正在删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
- <item quantity="one">正在删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"撤消"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"正在准备复制…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"正在准备移动…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"正在准备删除…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">无法复制 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件</item>
- <item quantity="one">无法复制 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">无法移动 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件</item>
- <item quantity="one">无法移动 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">无法删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件</item>
- <item quantity="one">无法删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"点按即可查看详情"</string>
- <string name="close" msgid="3043722427445528732">"关闭"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"无法复制以下文件：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"无法移动以下文件：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"未能删除以下文件：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"下列文件已转换成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">已将 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件复制到剪贴板。</item>
- <item quantity="one">已将 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件复制到剪贴板。</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"无法将所选文件粘贴到此位置。"</string>
- <string name="menu_rename" msgid="7678802479104285353">"重命名"</string>
- <string name="rename_error" msgid="4203041674883412606">"无法重命名文档"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分文件已转换成其他格式"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"要授权<xliff:g id="APPNAME"><b>^1</b></xliff:g>访问 <xliff:g id="STORAGE"><i>^3</i></xliff:g>上的“<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>”目录吗？"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"要授权<xliff:g id="APPNAME"><b>^1</b></xliff:g>访问“<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>”目录吗？"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"要授权<xliff:g id="APPNAME"><b>^1</b></xliff:g>访问您 <xliff:g id="STORAGE"><i>^2</i></xliff:g>上的数据（包括照片和视频）吗？"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"不再询问"</string>
- <string name="allow" msgid="7225948811296386551">"允许"</string>
- <string name="deny" msgid="2081879885755434506">"拒绝"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item>
- <item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 项</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 项</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"确定要删除“<xliff:g id="NAME">%1$s</xliff:g>”吗？"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要删除文件夹“<xliff:g id="NAME">%1$s</xliff:g>”及其中的内容吗？"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件？</item>
- <item quantity="one">删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件？</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件夹及其中的内容？</item>
- <item quantity="one">删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件夹及其中的内容？</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 项？</item>
- <item quantity="one">删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 项？</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
deleted file mode 100644
index e6cec8c..0000000
--- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"文件"</string>
- <string name="downloads_label" msgid="959113951084633612">"下載"</string>
- <string name="title_open" msgid="4353228937663917801">"開啟檔案"</string>
- <string name="title_save" msgid="2433679664882857999">"儲存至"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"新增資料夾"</string>
- <string name="menu_grid" msgid="6878021334497835259">"格狀檢視"</string>
- <string name="menu_list" msgid="7279285939892417279">"清單檢視"</string>
- <string name="menu_sort" msgid="7677740407158414452">"排序方式"</string>
- <string name="menu_search" msgid="3816712084502856974">"搜尋"</string>
- <string name="menu_settings" msgid="8239065133341597825">"儲存空間設定"</string>
- <string name="menu_open" msgid="432922957274920903">"開啟"</string>
- <string name="menu_save" msgid="2394743337684426338">"儲存"</string>
- <string name="menu_share" msgid="3075149983979628146">"分享"</string>
- <string name="menu_delete" msgid="8138799623850614177">"刪除"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"全部選取"</string>
- <string name="menu_copy" msgid="3612326052677229148">"複製到…"</string>
- <string name="menu_move" msgid="1828090633118079817">"移至…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"新視窗"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"剪下"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"複製"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"貼上"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"顯示內部儲存空間"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"隱藏內部儲存空間"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"隱藏檔案大小"</string>
- <string name="button_select" msgid="527196987259139214">"選取"</string>
- <string name="button_copy" msgid="8706475544635021302">"複製"</string>
- <string name="button_move" msgid="2202666023104202232">"移動"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"關閉"</string>
- <string name="button_retry" msgid="4392027584153752797">"再試一次"</string>
- <string name="sort_name" msgid="9183560467917256779">"按名稱"</string>
- <string name="sort_date" msgid="586080032956151448">"按修改日期"</string>
- <string name="sort_size" msgid="3350681319735474741">"按大小"</string>
- <string name="drawer_open" msgid="4545466532430226949">"顯示根目錄"</string>
- <string name="drawer_close" msgid="7602734368552123318">"隱藏根目錄"</string>
- <string name="save_error" msgid="6167009778003223664">"無法儲存文件"</string>
- <string name="create_error" msgid="3735649141335444215">"無法建立資料夾"</string>
- <string name="query_error" msgid="5999895349602476581">"目前無法載入內容"</string>
- <string name="root_recent" msgid="4470053704320518133">"最近"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"可用空間：<xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"儲存空間服務"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"捷徑"</string>
- <string name="root_type_device" msgid="7121342474653483538">"裝置"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"更多應用程式"</string>
- <string name="empty" msgid="7858882803708117596">"沒有項目"</string>
- <string name="no_results" msgid="6622510343880730446">"「%1$s」中沒有相符結果"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"無法開啟檔案"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"無法刪除部分文件"</string>
- <string name="share_via" msgid="8966594246261344259">"分享方式："</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"正在複製檔案"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"正在移動檔案"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"正在刪除檔案"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"剩餘 <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">正在複製 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">正在複製 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">正在轉移 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">正在轉移 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">正在刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">正在刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"復原"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"正在準備複製…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"正在準備移動…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"正在準備刪除…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">無法複製 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案</item>
- <item quantity="one">無法複製 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">無法移動 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案</item>
- <item quantity="one">無法移動 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">無法刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案</item>
- <item quantity="one">無法刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"輕按即可查看詳細資訊"</string>
- <string name="close" msgid="3043722427445528732">"關閉"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"以下檔案未能複製：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"以下檔案未能移動：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"無法刪除以下檔案：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"這些檔案已轉換成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">已複製 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案到剪貼簿。</item>
- <item quantity="one">已複製 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案到剪貼簿。</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"無法在此位置貼上選取檔案。"</string>
- <string name="menu_rename" msgid="7678802479104285353">"重新命名"</string>
- <string name="rename_error" msgid="4203041674883412606">"無法重新命名文件"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分檔案已轉換成其他格式"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"要為「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」開放 <xliff:g id="STORAGE"><i>^3</i></xliff:g>上的「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」目錄存取權嗎？"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"要為「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」開放「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」目錄的存取權嗎？"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"要向「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」開放 <xliff:g id="STORAGE"><i>^2</i></xliff:g>上的相片和影片等資料的存取權嗎？"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"不要再詢問"</string>
- <string name="allow" msgid="7225948811296386551">"允許"</string>
- <string name="deny" msgid="2081879885755434506">"拒絕"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
- <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」嗎？"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」資料夾及其內容嗎？"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案嗎？</item>
- <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案嗎？</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個資料夾及其內容嗎？</item>
- <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個資料夾及其內容嗎？</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目嗎？</item>
- <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目嗎？</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 2caf07f..0000000
--- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"文件"</string>
- <string name="downloads_label" msgid="959113951084633612">"下載"</string>
- <string name="title_open" msgid="4353228937663917801">"開啟檔案"</string>
- <string name="title_save" msgid="2433679664882857999">"儲存至"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"新增資料夾"</string>
- <string name="menu_grid" msgid="6878021334497835259">"格狀檢視"</string>
- <string name="menu_list" msgid="7279285939892417279">"清單檢視"</string>
- <string name="menu_sort" msgid="7677740407158414452">"排序依據"</string>
- <string name="menu_search" msgid="3816712084502856974">"搜尋"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Storage 設定"</string>
- <string name="menu_open" msgid="432922957274920903">"開啟"</string>
- <string name="menu_save" msgid="2394743337684426338">"儲存"</string>
- <string name="menu_share" msgid="3075149983979628146">"共用"</string>
- <string name="menu_delete" msgid="8138799623850614177">"刪除"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"全選"</string>
- <string name="menu_copy" msgid="3612326052677229148">"複製到…"</string>
- <string name="menu_move" msgid="1828090633118079817">"移至…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"新增視窗"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"剪下"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"複製"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"貼上"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"顯示內部儲存空間"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"隱藏內部儲存空間"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"隱藏檔案大小"</string>
- <string name="button_select" msgid="527196987259139214">"選取"</string>
- <string name="button_copy" msgid="8706475544635021302">"複製"</string>
- <string name="button_move" msgid="2202666023104202232">"移動"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"關閉"</string>
- <string name="button_retry" msgid="4392027584153752797">"再試一次"</string>
- <string name="sort_name" msgid="9183560467917256779">"依名稱"</string>
- <string name="sort_date" msgid="586080032956151448">"依修改日期"</string>
- <string name="sort_size" msgid="3350681319735474741">"依大小"</string>
- <string name="drawer_open" msgid="4545466532430226949">"顯示根目錄"</string>
- <string name="drawer_close" msgid="7602734368552123318">"隱藏根目錄"</string>
- <string name="save_error" msgid="6167009778003223664">"無法儲存文件"</string>
- <string name="create_error" msgid="3735649141335444215">"無法建立資料夾"</string>
- <string name="query_error" msgid="5999895349602476581">"目前無法載入內容"</string>
- <string name="root_recent" msgid="4470053704320518133">"最近"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"可用空間：<xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="root_type_service" msgid="2178854894416775409">"儲存空間服務"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"捷徑"</string>
- <string name="root_type_device" msgid="7121342474653483538">"裝置"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"更多應用程式"</string>
- <string name="empty" msgid="7858882803708117596">"沒有任何項目"</string>
- <string name="no_results" msgid="6622510343880730446">"沒有與「%1$s」相符的結果"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"無法開啟檔案"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"無法刪除部分文件"</string>
- <string name="share_via" msgid="8966594246261344259">"分享方式："</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"複製檔案"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"正在移動檔案"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"正在刪除檔案"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"剩餘 <xliff:g id="DURATION">%s</xliff:g>"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="other">正在複製 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">正在複製 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="other">正在移動 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">正在移動 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="other">正在刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">正在刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"復原"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"正在準備複製…"</string>
- <string name="move_preparing" msgid="2772219441375531410">"準備移動…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"正在準備刪除…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="other">無法複製 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案</item>
- <item quantity="one">無法複製 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="other">無法移動 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案</item>
- <item quantity="one">無法移動 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="other">無法刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案</item>
- <item quantity="one">無法刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案</item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"輕觸即可查看詳細資訊"</string>
- <string name="close" msgid="3043722427445528732">"關閉"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"未複製下列檔案：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"未移動下列檔案：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"未刪除下列檔案：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"下列檔案已轉換成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="other">已將 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案複製到剪貼簿。</item>
- <item quantity="one">已將 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案複製到剪貼簿。</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"無法將所選檔案貼到這個位置。"</string>
- <string name="menu_rename" msgid="7678802479104285353">"重新命名"</string>
- <string name="rename_error" msgid="4203041674883412606">"無法重新命名文件"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分檔案已轉換成其他格式"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"要允許<xliff:g id="APPNAME"><b>^1</b></xliff:g>存取 <xliff:g id="STORAGE"><i>^3</i></xliff:g>上的「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」目錄嗎？"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"要允許<xliff:g id="APPNAME"><b>^1</b></xliff:g>存取「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」目錄嗎？"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"要允許「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」存取 <xliff:g id="STORAGE"><i>^2</i></xliff:g>上的資料 (包括相片和影片) 嗎？"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"不要再詢問"</string>
- <string name="allow" msgid="7225948811296386551">"允許"</string>
- <string name="deny" msgid="2081879885755434506">"拒絕"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
- <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」嗎？"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」資料夾和當中的內容嗎？"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案嗎？</item>
- <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案嗎？</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個資料夾和當中的內容嗎？</item>
- <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個資料夾和當中的內容嗎？</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目嗎？</item>
- <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目嗎？</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml
deleted file mode 100644
index 9efcd96..0000000
--- a/packages/DocumentsUI/res/values-zu/strings.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2783841764617238354">"Amadokhumenti"</string>
- <string name="downloads_label" msgid="959113951084633612">"Okulandiwe"</string>
- <string name="title_open" msgid="4353228937663917801">"Vula kusuka ku-"</string>
- <string name="title_save" msgid="2433679664882857999">"Londoloza ku-"</string>
- <string name="menu_create_dir" msgid="2547620241173881754">"Ifolda entsha"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Ukubuka kwegridi"</string>
- <string name="menu_list" msgid="7279285939892417279">"Ukubuka uhlu"</string>
- <string name="menu_sort" msgid="7677740407158414452">"Hlunga nge-"</string>
- <string name="menu_search" msgid="3816712084502856974">"Sesha"</string>
- <string name="menu_settings" msgid="8239065133341597825">"Izilungiselelo zesitoreji"</string>
- <string name="menu_open" msgid="432922957274920903">"Vula"</string>
- <string name="menu_save" msgid="2394743337684426338">"Londoloza"</string>
- <string name="menu_share" msgid="3075149983979628146">"Yabelana"</string>
- <string name="menu_delete" msgid="8138799623850614177">"Susa"</string>
- <string name="menu_select_all" msgid="8323579667348729928">"Khetha konke"</string>
- <string name="menu_copy" msgid="3612326052677229148">"Kopishela ku…"</string>
- <string name="menu_move" msgid="1828090633118079817">"Hambisa ku…"</string>
- <string name="menu_new_window" msgid="1226032889278727538">"Iwindi elisha"</string>
- <string name="menu_cut_to_clipboard" msgid="2467149185452488383">"Sika"</string>
- <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopisha"</string>
- <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Namathisela"</string>
- <string name="menu_advanced_show" msgid="4693652895715631401">"Bonisa isitoreji sangaphakathi"</string>
- <string name="menu_advanced_hide" msgid="4218809952721972589">"Fihla isitoreji sangaphakathi"</string>
- <string name="menu_file_size_show" msgid="3240323619260823076">"Bonisa usayizi wefayela"</string>
- <string name="menu_file_size_hide" msgid="8881975928502581042">"Fihla usayizi wefayela"</string>
- <string name="button_select" msgid="527196987259139214">"Khetha"</string>
- <string name="button_copy" msgid="8706475544635021302">"Kopisha"</string>
- <string name="button_move" msgid="2202666023104202232">"Hambisa"</string>
- <string name="button_dismiss" msgid="3714065566893946085">"Cashisa"</string>
- <string name="button_retry" msgid="4392027584153752797">"Zama futhi"</string>
- <string name="sort_name" msgid="9183560467917256779">"Ngegama"</string>
- <string name="sort_date" msgid="586080032956151448">"Ngedethi yokuguqula"</string>
- <string name="sort_size" msgid="3350681319735474741">"Ngosayizi"</string>
- <string name="drawer_open" msgid="4545466532430226949">"Bonisa izimpande"</string>
- <string name="drawer_close" msgid="7602734368552123318">"Fihla izimpande"</string>
- <string name="save_error" msgid="6167009778003223664">"Yehlulekile ukulondoloza idokhumenti"</string>
- <string name="create_error" msgid="3735649141335444215">"Yehlulekile ukudala ifolda"</string>
- <string name="query_error" msgid="5999895349602476581">"Ayikwazanga ukulayisha okuqukethwe okwamanje"</string>
- <string name="root_recent" msgid="4470053704320518133">"Okwakamuva"</string>
- <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> okhululekile"</string>
- <string name="root_type_service" msgid="2178854894416775409">"Amasevisi wesitoreji"</string>
- <string name="root_type_shortcut" msgid="3318760609471618093">"Izinqamuleli"</string>
- <string name="root_type_device" msgid="7121342474653483538">"Amadivayisi"</string>
- <string name="root_type_apps" msgid="8838065367985945189">"Izinhlelo zokusebenza eziningi"</string>
- <string name="empty" msgid="7858882803708117596">"Azikho izinto"</string>
- <string name="no_results" msgid="6622510343880730446">"Akukho okufanayo ku-%1$s"</string>
- <string name="toast_no_application" msgid="4632640357724698144">"Ayikwazanga ukuvula ifayela"</string>
- <string name="toast_failed_delete" msgid="2180678019407244069">"Ayikwazi ukususa amanye amadokhumenti"</string>
- <string name="share_via" msgid="8966594246261344259">"Yabelana nge-"</string>
- <string name="copy_notification_title" msgid="6374299806748219777">"Ikopisha amafayela"</string>
- <string name="move_notification_title" msgid="6193835179777284805">"Ihambisa amafayela"</string>
- <string name="delete_notification_title" msgid="3329403967712437496">"Ukususa amafayela"</string>
- <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> okusele"</string>
- <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
- <item quantity="one">Ikopisha amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- <item quantity="other">Ikopisha amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
- <item quantity="one">Ihambisa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- <item quantity="other">Ihambisa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="deleting" formatted="false" msgid="5054338566802559411">
- <item quantity="one">Isusa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- <item quantity="other">Isusa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>.</item>
- </plurals>
- <string name="undo" msgid="7905788502491742328">"Hlehlisa"</string>
- <string name="copy_preparing" msgid="3896202461003039386">"Ilungiselela ukukopisha..."</string>
- <string name="move_preparing" msgid="2772219441375531410">"Ilungiselela ukuhambisa…"</string>
- <string name="delete_preparing" msgid="5655813182533491992">"Ilungiselela ukususa…"</string>
- <!-- no translation found for delete_progress (5399405983046157222) -->
- <skip />
- <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689">
- <item quantity="one">Ayikwazanga ukukopisha amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Ayikwazanga ukukopisha amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012">
- <item quantity="one">Ayikwazanga ukuhambisa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Ayikwazanga ukuhambisa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199">
- <item quantity="one">Ayikwazanga ukususa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
- <item quantity="other">Ayikwazanga ukususa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g></item>
- </plurals>
- <string name="notification_touch_for_details" msgid="6268189413228855582">"Thepha ukuze ubuke imininingwane"</string>
- <string name="close" msgid="3043722427445528732">"Vala"</string>
- <string name="copy_failure_alert_content" msgid="4563147454522476183">"Lawo mafayela awakopishwanga: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="move_failure_alert_content" msgid="2635075788682922861">"Lawa mafayela awazange ahanjiswe: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="delete_failure_alert_content" msgid="892393767207938353">"Lawa mafayela awazange asuswe: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <string name="copy_converted_warning_content" msgid="5753861488218674361">"Lawo mafayela aguqulelwe kwenye ifomethi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
- <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
- <item quantity="one">Kukopishwe amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g> kubhodi lokunamathisela.</item>
- <item quantity="other">Kukopishwe amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g> kubhodi lokunamathisela.</item>
- </plurals>
- <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Ayikwazi ukunamathisela amafayela akhethiwe kule ndawo."</string>
- <string name="menu_rename" msgid="7678802479104285353">"Qamba kabusha"</string>
- <string name="rename_error" msgid="4203041674883412606">"Yehlulekile ukuqamba kabusha idokhumenti"</string>
- <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Amanye amafayela aguqulelwe"</string>
- <string name="open_external_dialog_request" msgid="5789329484285817629">"Nika i-<xliff:g id="APPNAME"><b>^1</b></xliff:g> ukufinyelela ekuqondiseni kwe-<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ku-<xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
- <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"Nika ukufinyelela kwe-<xliff:g id="APPNAME"><b>^1</b></xliff:g> kwinkomba ye-<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="8899108702926347720">"Nikeza i-<xliff:g id="APPNAME"><b>^1</b></xliff:g> ukufinyelela kudatha yakho, okufaka izithombe namavidiyo, ku-<xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
- <string name="never_ask_again" msgid="4295278542972859268">"Ungaphindi ubuze"</string>
- <string name="allow" msgid="7225948811296386551">"Vumela"</string>
- <string name="deny" msgid="2081879885755434506">"Yala"</string>
- <plurals name="elements_selected" formatted="false" msgid="1376955402452875047">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item>
- </plurals>
- <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> izinto</item>
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> izinto</item>
- </plurals>
- <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Susa i-\"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
- <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Susa ifolda engu-\"<xliff:g id="NAME">%1$s</xliff:g>\" nokuqukethwe kwalo?"</string>
- <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802">
- <item quantity="one">Susa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>?</item>
- <item quantity="other">Susa amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>?</item>
- </plurals>
- <plurals name="delete_folders_confirmation_message" formatted="false" msgid="9185648028213507769">
- <item quantity="one">Susa amafolda angu-<xliff:g id="COUNT_1">%1$d</xliff:g> nokuqukethwe kwawo?</item>
- <item quantity="other">Susa amafolda angu-<xliff:g id="COUNT_1">%1$d</xliff:g> nokuqukethwe kwawo?</item>
- </plurals>
- <plurals name="delete_items_confirmation_message" formatted="false" msgid="5376214433530243459">
- <item quantity="one">Susa izinto ezingu-<xliff:g id="COUNT_1">%1$d</xliff:g>?</item>
- <item quantity="other">Susa izinto ezingu-<xliff:g id="COUNT_1">%1$d</xliff:g>?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values/attrs.xml b/packages/DocumentsUI/res/values/attrs.xml
deleted file mode 100644
index b48c52f..0000000
--- a/packages/DocumentsUI/res/values/attrs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <declare-styleable name="DocumentsTheme">
- <attr name="colorActionMode" format="color"/>
- </declare-styleable>
-
- <declare-styleable name="RootItemView">
- <attr name="state_highlighted" format="boolean"/>
- </declare-styleable>
-</resources>
diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml
deleted file mode 100644
index cf0643d..0000000
--- a/packages/DocumentsUI/res/values/colors.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <color name="material_grey_400">#ffbdbdbd</color>
- <color name="material_teal_700">#ff00796b</color>
-
- <!-- This is the window background, but also the background for anything
- else that needs to manually declare a background matching the "default"
- app background (e.g. the drawer overlay). -->
- <color name="window_background">#fff1f1f1</color>
- <color name="drawer_background">#fff1f1f1</color>
- <color name="directory_background">#fff7f7f7</color>
- <color name="menu_search_background">@android:color/transparent</color>
-
- <color name="primary_dark">@*android:color/primary_dark_material_dark</color>
- <color name="primary">@*android:color/material_blue_grey_900</color>
- <color name="accent">@*android:color/accent_material_light</color>
- <color name="accent_dark">@*android:color/accent_material_dark</color>
- <color name="action_mode">@color/material_grey_400</color>
- <color name="status_bar_color">@*android:color/material_blue_grey_950</color>
-
- <color name="band_select_background">#88ffffff</color>
- <color name="band_select_border">#44000000</color>
-
- <color name="item_doc_background_disabled">#fff4f4f4</color>
-
- <color name="root_activated_color">@color/material_teal_700</color>
-
- <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->
- <color name="item_doc_background">#fffafafa</color>
- <color name="item_doc_background_selected">#ffe0f2f1</color>
-
-</resources>
diff --git a/packages/DocumentsUI/res/values/config.xml b/packages/DocumentsUI/res/values/config.xml
deleted file mode 100644
index f0cab08..0000000
--- a/packages/DocumentsUI/res/values/config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <!-- Allow Advanced Devices default value to be customised -->
- <bool name="config_defaultAdvancedDevices">false</bool>
-
- <!-- Intentionally unset. Vendors should set this in an overlay. -->
- <string name="trusted_quick_viewer_package" translatable="false"></string>
-
- <!-- overridden for RTL langs -->
- <bool name="list_divider_inset_left">true</bool>
-
- <!-- Flags setup as productivity oriented in which case Downloads app will be presented
- as Files app. Including showing of the Documents and "advanced" roots. -->
- <bool name="productivity_device">false</bool>
-
- <!-- Indicates if search view is taking the whole toolbar space -->
- <bool name="full_bar_search_view">true</bool>
-
-</resources>
diff --git a/packages/DocumentsUI/res/values/dimens.xml b/packages/DocumentsUI/res/values/dimens.xml
deleted file mode 100644
index cad26e2..0000000
--- a/packages/DocumentsUI/res/values/dimens.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <dimen name="grid_container_padding">10dp</dimen>
- <dimen name="list_container_padding">0dp</dimen>
- <dimen name="icon_size">40dp</dimen>
- <dimen name="root_icon_size">24dp</dimen>
- <dimen name="root_icon_margin">0dp</dimen>
- <dimen name="check_icon_size">30dp</dimen>
- <dimen name="list_item_thumbnail_size">40dp</dimen>
- <dimen name="grid_item_icon_size">30dp</dimen>
- <dimen name="progress_bar_height">4dp</dimen>
- <dimen name="grid_width">152dp</dimen>
- <dimen name="grid_height">176dp</dimen>
- <dimen name="grid_item_width">152dp</dimen>
- <dimen name="grid_item_height">176dp</dimen>
- <dimen name="grid_item_margin">4dp</dimen>
- <dimen name="grid_padding_horiz">4dp</dimen>
- <dimen name="grid_padding_vert">4dp</dimen>
- <dimen name="list_item_height">72dp</dimen>
- <dimen name="list_item_padding">16dp</dimen>
- <dimen name="list_divider_inset">72dp</dimen>
- <dimen name="dir_elevation">8dp</dimen>
- <dimen name="drag_shadow_size">120dp</dimen>
- <dimen name="grid_item_elevation">2dp</dimen>
- <dimen name="max_drawer_width">280dp</dimen>
-
- <dimen name="drawer_edge_width">12dp</dimen>
-
- <dimen name="drag_shadow_width">160dp</dimen>
- <dimen name="drag_shadow_height">48dp</dimen>
-
-</resources>
diff --git a/packages/DocumentsUI/res/values/layouts.xml b/packages/DocumentsUI/res/values/layouts.xml
deleted file mode 100644
index c9308a1..0000000
--- a/packages/DocumentsUI/res/values/layouts.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <item name="documents_activity" type="layout">@layout/drawer_layout</item>
- <item name="files_activity" type="layout">@layout/drawer_layout</item>
- <item name="downloads_activity" type="layout">@layout/single_pane_layout</item>
-</resources>
diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml
deleted file mode 100644
index bf34461..0000000
--- a/packages/DocumentsUI/res/values/strings.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Title of the documents application [CHAR LIMIT=32] -->
- <string name="app_label">Documents</string>
-
- <!-- Title of the standalone downloads activity. [CHAR LIMIT=32] -->
- <string name="downloads_label">Downloads</string>
-
- <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
- <string name="title_open">Open from</string>
- <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
- <string name="title_save">Save to</string>
-
- <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
- <string name="menu_create_dir">New folder</string>
- <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
- <string name="menu_grid">Grid view</string>
- <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
- <string name="menu_list">List view</string>
- <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
- <string name="menu_sort">Sort by</string>
- <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
- <string name="menu_search">Search</string>
- <!-- Menu item that enters activity to change settings for current root [CHAR LIMIT=24] -->
- <string name="menu_settings">Storage settings</string>
-
- <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
- <string name="menu_open">Open</string>
- <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
- <string name="menu_save">Save</string>
- <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
- <string name="menu_share">Share</string>
- <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
- <string name="menu_delete">Delete</string>
- <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
- <string name="menu_select_all">Select all</string>
- <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
- <string name="menu_copy">Copy to\u2026</string>
- <!-- Menu item title that moves the selected documents [CHAR LIMIT=24] -->
- <string name="menu_move">Move to\u2026</string>
-
- <!-- Menu item title that creates a new window in the activity [CHAR LIMIT=24] -->
- <string name="menu_new_window">New window</string>
- <!-- Menu item title that cuts the selected documents to clipboard [CHAR LIMIT=24] -->
- <string name="menu_cut_to_clipboard">Cut</string>
- <!-- Menu item title that copies the selected documents to clipboard [CHAR LIMIT=24] -->
- <string name="menu_copy_to_clipboard">Copy</string>
- <!-- Menu item title that pastes files from the clipboard [CHAR LIMIT=24] -->
- <string name="menu_paste_from_clipboard">Paste</string>
-
- <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
- <string name="menu_advanced_show">Show internal storage</string>
- <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
- <string name="menu_advanced_hide">Hide internal storage</string>
-
- <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
- <string name="menu_file_size_show">Show file size</string>
- <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
- <string name="menu_file_size_hide">Hide file size</string>
-
- <!-- Button label that select the current directory [CHAR LIMIT=24] -->
- <string name="button_select">Select</string>
- <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
- <string name="button_copy">Copy</string>
- <!-- Button label that moves files to the current directory [CHAR LIMIT=24] -->
- <string name="button_move">Move</string>
- <!-- Button label that hides the error bar [CHAR LIMIT=24] -->
- <string name="button_dismiss">Dismiss</string>
- <string name="button_retry">Try Again</string>
-
- <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
- <string name="sort_name">By name</string>
- <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
- <string name="sort_date">By date modified</string>
- <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
- <string name="sort_size">By size</string>
-
- <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
- <string name="drawer_open">Show roots</string>
- <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
- <string name="drawer_close">Hide roots</string>
-
- <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
- <string name="save_error">Failed to save document</string>
- <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
- <string name="create_error">Failed to create folder</string>
- <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
- <string name="query_error">Can\u2019t load content at the moment</string>
-
- <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
- <string name="root_recent">Recent</string>
- <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
- <string name="root_available_bytes"><xliff:g id="size" example="3GB">%1$s</xliff:g> free</string>
-
- <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
- <string name="root_type_service">Storage services</string>
- <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
- <string name="root_type_shortcut">Shortcuts</string>
- <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
- <string name="root_type_device">Devices</string>
- <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
- <string name="root_type_apps">More apps</string>
-
- <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
- <string name="empty">No items</string>
- <!-- Text shown when a file search returns no items [CHAR LIMIT=32] -->
- <string name="no_results">No matches in %1$s</string>
-
- <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
- <string name="toast_no_application">Can\u2019t open file</string>
- <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
- <string name="toast_failed_delete">Unable to delete some documents</string>
-
- <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
- <string name="share_via">Share via</string>
-
- <!-- Title of the copy notification [CHAR LIMIT=24] -->
- <string name="copy_notification_title">Copying files</string>
- <!-- Title of the move notification [CHAR LIMIT=24] -->
- <string name="move_notification_title">Moving files</string>
- <!-- Title of the move notification [CHAR LIMIT=24] -->
- <string name="delete_notification_title">Deleting files</string>
- <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
- <string name="copy_remaining"><xliff:g id="duration" example="3 minutes">%s</xliff:g> left</string>
- <!-- Toast shown when a file copy is kicked off -->
- <plurals name="copy_begin">
- <item quantity="one">Copying <xliff:g id="count" example="1">%1$d</xliff:g> file.</item>
- <item quantity="other">Copying <xliff:g id="count" example="3">%1$d</xliff:g> files.</item>
- </plurals>
- <plurals name="move_begin">
- <item quantity="one">Moving <xliff:g id="count" example="1">%1$d</xliff:g> file.</item>
- <item quantity="other">Moving <xliff:g id="count" example="3">%1$d</xliff:g> files.</item>
- </plurals>
- <!-- Text shown when files are deleted -->
- <plurals name="deleting">
- <item quantity="one">Deleting <xliff:g id="count" example="1">%1$d</xliff:g> file.</item>
- <item quantity="other">Deleting <xliff:g id="count" example="3">%1$d</xliff:g> files.</item>
- </plurals>
- <!-- Text shown for the undo button -->
- <string name="undo">Undo</string>
- <!-- Text shown on the notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
- <string name="copy_preparing">Preparing for copy\u2026</string>
- <!-- Text shown on the notification while DocumentsUI performs setup in preparation for moving files [CHAR LIMIT=32] -->
- <string name="move_preparing">Preparing for move\u2026</string>
- <!-- Text shown on the notification while DocumentsUI performs setup in preparation for deleting files [CHAR LIMIT=32] -->
- <string name="delete_preparing">Preparing for delete\u2026</string>
- <!-- Text progress shown on the notification while DocumentsUI is deleting files. -->
- <string name="delete_progress"><xliff:g id="count" example="3">%1$d</xliff:g> / <xliff:g id="totalCount" example="5">%2$d</xliff:g></string>
- <!-- Title of the copy error notification [CHAR LIMIT=48] -->
- <plurals name="copy_error_notification_title">
- <item quantity="one">Couldn\u2019t copy <xliff:g id="count" example="1">%1$d</xliff:g> file</item>
- <item quantity="other">Couldn\u2019t copy <xliff:g id="count" example="2">%1$d</xliff:g> files</item>
- </plurals>
- <!-- Title of the move error notification [CHAR LIMIT=48] -->
- <plurals name="move_error_notification_title">
- <item quantity="one">Couldn\u2019t move <xliff:g id="count" example="1">%1$d</xliff:g> file</item>
- <item quantity="other">Couldn\u2019t move <xliff:g id="count" example="2">%1$d</xliff:g> files</item>
- </plurals>
- <!-- Title of the delete error notification [CHAR LIMIT=48] -->
- <plurals name="delete_error_notification_title">
- <item quantity="one">Couldn\u2019t delete <xliff:g id="count" example="1">%1$d</xliff:g> file</item>
- <item quantity="other">Couldn\u2019t delete <xliff:g id="count" example="2">%1$d</xliff:g> files</item>
- </plurals>
- <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
- <string name="notification_touch_for_details">Tap to view details</string>
- <!-- Label of the close dialog button.[CHAR LIMIT=24] -->
- <string name="close">Close</string>
- <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
- <string name="copy_failure_alert_content">These files weren\u2019t copied: <xliff:g id="list">%1$s</xliff:g></string>
- <!-- Contents of the moving failure alert dialog. [CHAR LIMIT=48] -->
- <string name="move_failure_alert_content">These files weren\u2019t moved: <xliff:g id="list">%1$s</xliff:g></string>
- <!-- Message shown to users when an operation to delete one or more files has failed. Presented in a dialog. [CHAR LIMIT=48] -->
- <string name="delete_failure_alert_content">These files weren\u2019t deleted: <xliff:g id="list">%1$s</xliff:g></string>
- <!-- Contents of the copying warning dialog due to converted files. [CHAR LIMIT=64] -->
- <string name="copy_converted_warning_content">These files were converted to another format: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></string>
- <!-- Toast shown when a user copies files to clipboard. -->
- <plurals name="clipboard_files_clipped">
- <item quantity="one">Copied <xliff:g id="count" example="1">%1$d</xliff:g> file to clipboard.</item>
- <item quantity="other">Copied <xliff:g id="count" example="3">%1$d</xliff:g> files to clipboard.</item>
- </plurals>
- <!-- Toast shown when a user tries to paste files into an unsupported location. -->
- <string name="clipboard_files_cannot_paste">Cannot paste the selected files in this location.</string>
- <!-- Menu item that renames the selected document [CHAR LIMIT=24] -->
- <string name="menu_rename">Rename</string>
- <!-- Toast shown when renaming document failed with an error [CHAR LIMIT=48] -->
- <string name="rename_error">Failed to rename document</string>
- <!-- First line for notifications saying that some files were converted to a different format
- during a copy. [CHAR LIMIT=48] -->
- <string name="notification_copy_files_converted_title">Some files were converted</string>
-
- <!-- Text in an alert dialog asking user to grant app access to a given directory in an external storage volume -->
- <string name="open_external_dialog_request">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>
- access to <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> directory on
- <xliff:g id="storage" example="SD Card"><i>^3</i></xliff:g>?</string>
- <!-- Text in an alert dialog asking user to grant app access to a given directory in the internal storage -->
- <string name="open_external_dialog_request_primary_volume">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>
- access to <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> directory?</string>
- <!-- Text in an alert dialog asking user to grant app access to all data in an external storage volume -->
- <string name="open_external_dialog_root_request">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>
- access to your data, including photos and videos, on <xliff:g id="storage" example="SD Card"><i>^2</i></xliff:g>?</string>
- <!-- Checkbox that allows user to not be questioned about the directory access request again -->
- <string name="never_ask_again">Don\'t ask again</string>
- <!-- Text in the button asking user to allow access to a given directory. -->
- <string name="allow">Allow</string>
- <!-- Text in the button asking user to deny access to a given directory. -->
- <string name="deny">Deny</string>
- <!-- Dialog text shown to users when asking if they want to delete files (a confirmation). -->
- <!-- Label text showing user how many items are selected. Can be one or more elements. -->
- <plurals name="elements_selected">
- <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item>
- <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> selected</item>
- </plurals>
-
- <!-- Label text showing user how many items are being dragged. Can be one or more elements. -->
- <plurals name="elements_dragged">
- <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> item</item>
- <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> items</item>
- </plurals>
-
- <!-- Dialog text shown to users when asking if they want to delete a file (a confirmation) -->
- <string name="delete_filename_confirmation_message">Delete \"<xliff:g id="name" example="cat.jpg">%1$s</xliff:g>\"?</string>
- <!-- Dialog text shown to users when asking if they want to delete a folder (a confirmation) -->
- <string name="delete_foldername_confirmation_message">Delete folder \"<xliff:g id="name" example="Photos">%1$s</xliff:g>\" and its contents?</string>
- <!-- Dialog text shown to users when asking if they want to delete files (a confirmation). -->
- <plurals name="delete_files_confirmation_message">
- <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> file?</item>
- <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> files?</item>
- </plurals>
- <!-- Dialog text shown to users when asking if they want to delete folders (a confirmation). -->
- <plurals name="delete_folders_confirmation_message">
- <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> folder and its contents?</item>
- <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> folders and their contents?</item>
- </plurals>
- <!-- Dialog text shown to users when asking if they want to delete mixed type items: files and folders (a confirmation). -->
- <plurals name="delete_items_confirmation_message">
- <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> item?</item>
- <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> items?</item>
- </plurals>
-</resources>
diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml
deleted file mode 100644
index 9f09ebc..0000000
--- a/packages/DocumentsUI/res/values/styles.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
- <style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar" />
- <style name="ActionBarPopupTheme" parent="@*android:style/ThemeOverlay.Material.Light" />
-
- <style name="DocumentsTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
- <item name="actionBarWidgetTheme">@null</item>
- <item name="actionBarTheme">@style/ActionBarTheme</item>
- <item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
-
- <item name="android:windowBackground">@color/window_background</item>
- <item name="android:colorPrimaryDark">@color/primary_dark</item>
- <item name="android:colorPrimary">@color/primary</item>
- <item name="android:colorAccent">@color/accent</item>
- <item name="colorActionMode">@color/action_mode</item>
- <item name="android:queryBackground">@color/menu_search_background</item>
- <item name="android:statusBarColor">@color/status_bar_color</item>
-
- <item name="android:listDivider">@*android:drawable/list_divider_material</item>
-
- <item name="android:windowActionBar">false</item>
- <item name="android:windowActionModeOverlay">true</item>
- <item name="android:windowNoTitle">true</item>
-
- <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
- </style>
-
- <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
- <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
- <item name="android:minHeight">3dp</item>
- <item name="android:maxHeight">3dp</item>
- </style>
-
-</resources>
diff --git a/packages/DocumentsUI/res/values/tags.xml b/packages/DocumentsUI/res/values/tags.xml
deleted file mode 100644
index a7ff3d6..0000000
--- a/packages/DocumentsUI/res/values/tags.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <item name="drag_hovering_tag" type="id" />
- <item name="item_position_tag" type="id" />
- <item name="layout_id_tag" type="id" />
-</resources>
\ No newline at end of file
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
deleted file mode 100644
index a2f588b..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ /dev/null
@@ -1,854 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.EXTRA_BENCHMARK;
-import static com.android.documentsui.State.ACTION_CREATE;
-import static com.android.documentsui.State.ACTION_GET_CONTENT;
-import static com.android.documentsui.State.ACTION_OPEN;
-import static com.android.documentsui.State.ACTION_OPEN_TREE;
-import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
-import static com.android.documentsui.State.MODE_GRID;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.MessageQueue.IdleHandler;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Root;
-import android.support.annotation.CallSuper;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.documentsui.MenuManager.DirectoryDetails;
-import com.android.documentsui.NavigationViewManager.Breadcrumb;
-import com.android.documentsui.SearchViewManager.SearchManagerListener;
-import com.android.documentsui.State.ViewMode;
-import com.android.documentsui.dirlist.AnimationView;
-import com.android.documentsui.dirlist.DirectoryFragment;
-import com.android.documentsui.dirlist.FragmentTuner;
-import com.android.documentsui.dirlist.Model;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.RootInfo;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Executor;
-
-public abstract class BaseActivity extends Activity
- implements SearchManagerListener, NavigationViewManager.Environment {
-
- private static final String BENCHMARK_TESTING_PACKAGE = "com.android.documentsui.appperftests";
-
- State mState;
- @Nullable RetainedState mRetainedState;
- RootsCache mRoots;
- SearchViewManager mSearchManager;
- DrawerController mDrawer;
- NavigationViewManager mNavigator;
- List<EventListener> mEventListeners = new ArrayList<>();
-
- private final String mTag;
- private final ContentObserver mRootsCacheObserver = new ContentObserver(new Handler()) {
- @Override
- public void onChange(boolean selfChange) {
- new HandleRootsChangedTask(BaseActivity.this).execute(getCurrentRoot());
- }
- };
-
- @LayoutRes
- private int mLayoutId;
-
- private boolean mNavDrawerHasFocus;
- private long mStartTime;
-
- public abstract void onDocumentPicked(DocumentInfo doc, Model model);
- public abstract void onDocumentsPicked(List<DocumentInfo> docs);
- public abstract FragmentTuner createFragmentTuner();
- public abstract MenuManager getMenuManager();
- public abstract DirectoryDetails getDirectoryDetails();
-
- abstract void onTaskFinished(Uri... uris);
- abstract void refreshDirectory(int anim);
- /** Allows sub-classes to include information in a newly created State instance. */
- abstract void includeState(State initialState);
-
- public BaseActivity(@LayoutRes int layoutId, String tag) {
- mLayoutId = layoutId;
- mTag = tag;
- }
-
- @CallSuper
- @Override
- public void onCreate(Bundle icicle) {
- // Record the time when onCreate is invoked for metric.
- mStartTime = new Date().getTime();
-
- super.onCreate(icicle);
-
- final Intent intent = getIntent();
-
- addListenerForLaunchCompletion();
-
- setContentView(mLayoutId);
-
- mDrawer = DrawerController.create(this);
- mState = getState(icicle);
- Metrics.logActivityLaunch(this, mState, intent);
-
- // we're really interested in retainining state in our very complex
- // DirectoryFragment. So we do a little code yoga to extend
- // support to that fragment.
- mRetainedState = (RetainedState) getLastNonConfigurationInstance();
- mRoots = DocumentsApplication.getRootsCache(this);
-
- getContentResolver().registerContentObserver(
- RootsCache.sNotificationUri, false, mRootsCacheObserver);
-
- mSearchManager = new SearchViewManager(this, icicle);
-
- DocumentsToolbar toolbar = (DocumentsToolbar) findViewById(R.id.toolbar);
- Breadcrumb breadcrumb = (Breadcrumb) findViewById(R.id.breadcrumb);
- setActionBar(toolbar);
- mNavigator = new NavigationViewManager(mDrawer, toolbar, mState, this, breadcrumb);
-
- // Base classes must update result in their onCreate.
- setResult(Activity.RESULT_CANCELED);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- boolean showMenu = super.onCreateOptionsMenu(menu);
-
- getMenuInflater().inflate(R.menu.activity, menu);
- mNavigator.update();
- boolean fullBarSearch = getResources().getBoolean(R.bool.full_bar_search_view);
- mSearchManager.install((DocumentsToolbar) findViewById(R.id.toolbar), fullBarSearch);
-
- return showMenu;
- }
-
- @Override
- @CallSuper
- public boolean onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
- mSearchManager.showMenu(canSearchRoot());
- return true;
- }
-
- @Override
- protected void onDestroy() {
- getContentResolver().unregisterContentObserver(mRootsCacheObserver);
- super.onDestroy();
- }
-
- private State getState(@Nullable Bundle icicle) {
- if (icicle != null) {
- State state = icicle.<State>getParcelable(Shared.EXTRA_STATE);
- if (DEBUG) Log.d(mTag, "Recovered existing state object: " + state);
- return state;
- }
-
- State state = new State();
-
- final Intent intent = getIntent();
-
- state.localOnly = intent.getBooleanExtra(Intent.EXTRA_LOCAL_ONLY, false);
- state.forceSize = intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, false);
- state.showSize = state.forceSize || LocalPreferences.getDisplayFileSize(this);
- state.initAcceptMimes(intent);
- state.excludedAuthorities = getExcludedAuthorities();
-
- includeState(state);
-
- // Advanced roots are shown by default without menu option if forced by config or intent.
- boolean forceAdvanced = Shared.shouldShowDeviceRoot(this, intent);
- boolean chosenAdvanced = LocalPreferences.getShowDeviceRoot(this, state.action);
- state.showAdvanced = forceAdvanced || chosenAdvanced;
-
- // Menu option is shown for whitelisted intents if advanced roots are not shown by default.
- state.showAdvancedOption = !forceAdvanced && (
- Shared.shouldShowFancyFeatures(this)
- || state.action == ACTION_OPEN
- || state.action == ACTION_CREATE
- || state.action == ACTION_OPEN_TREE
- || state.action == ACTION_PICK_COPY_DESTINATION
- || state.action == ACTION_GET_CONTENT);
-
- if (DEBUG) Log.d(mTag, "Created new state object: " + state);
-
- return state;
- }
-
- public void setRootsDrawerOpen(boolean open) {
- mNavigator.revealRootsDrawer(open);
- }
-
- void onRootPicked(RootInfo root) {
- // Clicking on the current root removes search
- mSearchManager.cancelSearch();
-
- // Skip refreshing if root nor directory didn't change
- if (root.equals(getCurrentRoot()) && mState.stack.size() == 1) {
- return;
- }
-
- mState.derivedMode = LocalPreferences.getViewMode(this, root, MODE_GRID);
-
- // Clear entire backstack and start in new root
- mState.onRootChanged(root);
-
- // Recents is always in memory, so we just load it directly.
- // Otherwise we delegate loading data from disk to a task
- // to ensure a responsive ui.
- if (mRoots.isRecentsRoot(root)) {
- refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
- } else {
- new PickRootTask(this, root).executeOnExecutor(getExecutorForCurrentDirectory());
- }
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
-
- switch (item.getItemId()) {
- case android.R.id.home:
- onBackPressed();
- return true;
-
- case R.id.menu_create_dir:
- showCreateDirectoryDialog();
- return true;
-
- case R.id.menu_search:
- // SearchViewManager listens for this directly.
- return false;
-
- case R.id.menu_sort_name:
- setUserSortOrder(State.SORT_ORDER_DISPLAY_NAME);
- return true;
-
- case R.id.menu_sort_date:
- setUserSortOrder(State.SORT_ORDER_LAST_MODIFIED);
- return true;
-
- case R.id.menu_sort_size:
- setUserSortOrder(State.SORT_ORDER_SIZE);
- return true;
-
- case R.id.menu_grid:
- setViewMode(State.MODE_GRID);
- return true;
-
- case R.id.menu_list:
- setViewMode(State.MODE_LIST);
- return true;
-
- case R.id.menu_advanced:
- setDisplayAdvancedDevices(!mState.showAdvanced);
- return true;
-
- case R.id.menu_file_size:
- setDisplayFileSize(!LocalPreferences.getDisplayFileSize(this));
- return true;
-
- case R.id.menu_settings:
- Metrics.logUserAction(this, Metrics.USER_ACTION_SETTINGS);
-
- final RootInfo root = getCurrentRoot();
- final Intent intent = new Intent(DocumentsContract.ACTION_DOCUMENT_ROOT_SETTINGS);
- intent.setDataAndType(root.getUri(), DocumentsContract.Root.MIME_TYPE_ITEM);
- startActivity(intent);
- return true;
-
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- final @Nullable DirectoryFragment getDirectoryFragment() {
- return DirectoryFragment.get(getFragmentManager());
- }
-
- void showCreateDirectoryDialog() {
- Metrics.logUserAction(this, Metrics.USER_ACTION_CREATE_DIR);
-
- CreateDirectoryFragment.show(getFragmentManager());
- }
-
- void onDirectoryCreated(DocumentInfo doc) {
- // By default we do nothing, just let the new directory appear.
- // DocumentsActivity auto-opens directories after creating them
- // As that is more attuned to the "picker" use cases it supports.
- }
-
- /**
- * Returns true if a directory can be created in the current location.
- * @return
- */
- boolean canCreateDirectory() {
- final RootInfo root = getCurrentRoot();
- final DocumentInfo cwd = getCurrentDirectory();
- return cwd != null
- && cwd.isCreateSupported()
- && !mSearchManager.isSearching()
- && !root.isRecents()
- && !root.isDownloads();
- }
-
- void openContainerDocument(DocumentInfo doc) {
- assert(doc.isContainer());
-
- notifyDirectoryNavigated(doc.derivedUri);
-
- mState.pushDocument(doc);
- // Show an opening animation only if pressing "back" would get us back to the
- // previous directory. Especially after opening a root document, pressing
- // back, wouldn't go to the previous root, but close the activity.
- final int anim = (mState.hasLocationChanged() && mState.stack.size() > 1)
- ? AnimationView.ANIM_ENTER : AnimationView.ANIM_NONE;
- refreshCurrentRootAndDirectory(anim);
- }
-
- /**
- * Refreshes the content of the director and the menu/action bar.
- * The current directory name and selection will get updated.
- * @param anim
- */
- @Override
- public final void refreshCurrentRootAndDirectory(int anim) {
- mSearchManager.cancelSearch();
-
- refreshDirectory(anim);
-
- final RootsFragment roots = RootsFragment.get(getFragmentManager());
- if (roots != null) {
- roots.onCurrentRootChanged();
- }
-
- mNavigator.update();
- invalidateOptionsMenu();
- }
-
- final void loadRoot(final Uri uri) {
- new LoadRootTask(this, uri).executeOnExecutor(
- ProviderExecutor.forAuthority(uri.getAuthority()));
- }
-
- /**
- * This is called when user hovers over a doc for enough time during a drag n' drop, to open a
- * folder that accepts drop. We should only open a container that's not an archive.
- */
- public void springOpenDirectory(DocumentInfo doc) {
- }
-
- /**
- * Called when search results changed.
- * Refreshes the content of the directory. It doesn't refresh elements on the action bar.
- * e.g. The current directory name displayed on the action bar won't get updated.
- */
- @Override
- public void onSearchChanged(@Nullable String query) {
- // We should not get here if root is not searchable
- assert(canSearchRoot());
- reloadSearch(query);
- }
-
- @Override
- public void onSearchFinished() {
- // Restores menu icons state
- invalidateOptionsMenu();
- }
-
- private void reloadSearch(String query) {
- FragmentManager fm = getFragmentManager();
- RootInfo root = getCurrentRoot();
- DocumentInfo cwd = getCurrentDirectory();
-
- DirectoryFragment.reloadSearch(fm, root, cwd, query);
- }
-
- final List<String> getExcludedAuthorities() {
- List<String> authorities = new ArrayList<>();
- if (getIntent().getBooleanExtra(DocumentsContract.EXTRA_EXCLUDE_SELF, false)) {
- // Exclude roots provided by the calling package.
- String packageName = getCallingPackageMaybeExtra();
- try {
- PackageInfo pkgInfo = getPackageManager().getPackageInfo(packageName,
- PackageManager.GET_PROVIDERS);
- for (ProviderInfo provider: pkgInfo.providers) {
- authorities.add(provider.authority);
- }
- } catch (PackageManager.NameNotFoundException e) {
- Log.e(mTag, "Calling package name does not resolve: " + packageName);
- }
- }
- return authorities;
- }
-
- boolean canSearchRoot() {
- final RootInfo root = getCurrentRoot();
- return (root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0;
- }
-
- final String getCallingPackageMaybeExtra() {
- String callingPackage = getCallingPackage();
- // System apps can set the calling package name using an extra.
- try {
- ApplicationInfo info = getPackageManager().getApplicationInfo(callingPackage, 0);
- if (info.isSystemApp() || info.isUpdatedSystemApp()) {
- final String extra = getIntent().getStringExtra(DocumentsContract.EXTRA_PACKAGE_NAME);
- if (extra != null) {
- callingPackage = extra;
- }
- }
- } finally {
- return callingPackage;
- }
- }
-
- public static BaseActivity get(Fragment fragment) {
- return (BaseActivity) fragment.getActivity();
- }
-
- public State getDisplayState() {
- return mState;
- }
-
- /*
- * Get the default directory to be presented after starting the activity.
- * Method can be overridden if the change of the behavior of the the child activity is needed.
- */
- public Uri getDefaultRoot() {
- return Shared.shouldShowDocumentsRoot(this, getIntent())
- ? DocumentsContract.buildHomeUri()
- : DocumentsContract.buildRootUri(
- "com.android.providers.downloads.documents", "downloads");
- }
-
- /**
- * Set internal storage visible based on explicit user action.
- */
- void setDisplayAdvancedDevices(boolean display) {
- Metrics.logUserAction(this,
- display ? Metrics.USER_ACTION_SHOW_ADVANCED : Metrics.USER_ACTION_HIDE_ADVANCED);
-
- LocalPreferences.setShowDeviceRoot(this, mState.action, display);
- mState.showAdvanced = display;
- RootsFragment.get(getFragmentManager()).onDisplayStateChanged();
- invalidateOptionsMenu();
- }
-
- /**
- * Set file size visible based on explicit user action.
- */
- void setDisplayFileSize(boolean display) {
- Metrics.logUserAction(this,
- display ? Metrics.USER_ACTION_SHOW_SIZE : Metrics.USER_ACTION_HIDE_SIZE);
-
- LocalPreferences.setDisplayFileSize(this, display);
- mState.showSize = display;
- DirectoryFragment dir = getDirectoryFragment();
- if (dir != null) {
- dir.onDisplayStateChanged();
- }
- invalidateOptionsMenu();
- }
-
- /**
- * Set state sort order based on explicit user action.
- */
- void setUserSortOrder(int sortOrder) {
- switch(sortOrder) {
- case State.SORT_ORDER_DISPLAY_NAME:
- Metrics.logUserAction(this, Metrics.USER_ACTION_SORT_NAME);
- break;
- case State.SORT_ORDER_LAST_MODIFIED:
- Metrics.logUserAction(this, Metrics.USER_ACTION_SORT_DATE);
- break;
- case State.SORT_ORDER_SIZE:
- Metrics.logUserAction(this, Metrics.USER_ACTION_SORT_SIZE);
- break;
- }
-
- mState.userSortOrder = sortOrder;
- DirectoryFragment dir = getDirectoryFragment();
- if (dir != null) {
- dir.onSortOrderChanged();
- }
- }
-
- /**
- * Set mode based on explicit user action.
- */
- void setViewMode(@ViewMode int mode) {
- if (mode == State.MODE_GRID) {
- Metrics.logUserAction(this, Metrics.USER_ACTION_GRID);
- } else if (mode == State.MODE_LIST) {
- Metrics.logUserAction(this, Metrics.USER_ACTION_LIST);
- }
-
- LocalPreferences.setViewMode(this, getCurrentRoot(), mode);
- mState.derivedMode = mode;
-
- // view icon needs to be updated, but we *could* do it
- // in onOptionsItemSelected, and not do the full invalidation
- // But! That's a larger refactoring we'll save for another day.
- invalidateOptionsMenu();
- DirectoryFragment dir = getDirectoryFragment();
- if (dir != null) {
- dir.onViewModeChanged();
- }
- }
-
- public void setPending(boolean pending) {
- final SaveFragment save = SaveFragment.get(getFragmentManager());
- if (save != null) {
- save.setPending(pending);
- }
- }
-
- @Override
- protected void onSaveInstanceState(Bundle state) {
- super.onSaveInstanceState(state);
- state.putParcelable(Shared.EXTRA_STATE, mState);
- mSearchManager.onSaveInstanceState(state);
- }
-
- @Override
- protected void onRestoreInstanceState(Bundle state) {
- super.onRestoreInstanceState(state);
- }
-
- /**
- * Delegate ths call to the current fragment so it can save selection.
- * Feel free to expand on this with other useful state.
- */
- @Override
- public RetainedState onRetainNonConfigurationInstance() {
- RetainedState retained = new RetainedState();
- DirectoryFragment fragment = DirectoryFragment.get(getFragmentManager());
- if (fragment != null) {
- fragment.retainState(retained);
- }
- return retained;
- }
-
- public @Nullable RetainedState getRetainedState() {
- return mRetainedState;
- }
-
- @Override
- public boolean isSearchExpanded() {
- return mSearchManager.isExpanded();
- }
-
- @Override
- public RootInfo getCurrentRoot() {
- if (mState.stack.root != null) {
- return mState.stack.root;
- } else {
- return mRoots.getRecentsRoot();
- }
- }
-
- public DocumentInfo getCurrentDirectory() {
- return mState.stack.peek();
- }
-
- public Executor getExecutorForCurrentDirectory() {
- final DocumentInfo cwd = getCurrentDirectory();
- if (cwd != null && cwd.authority != null) {
- return ProviderExecutor.forAuthority(cwd.authority);
- } else {
- return AsyncTask.THREAD_POOL_EXECUTOR;
- }
- }
-
- @Override
- public void onBackPressed() {
- // While action bar is expanded, the state stack UI is hidden.
- if (mSearchManager.cancelSearch()) {
- return;
- }
-
- DirectoryFragment dir = getDirectoryFragment();
- if (dir != null && dir.onBackPressed()) {
- return;
- }
-
- if (!mState.hasLocationChanged()) {
- super.onBackPressed();
- return;
- }
-
- if (onBeforePopDir() || popDir()) {
- return;
- }
-
- super.onBackPressed();
- }
-
- boolean onBeforePopDir() {
- // Files app overrides this with some fancy logic.
- return false;
- }
-
- public void onStackPicked(DocumentStack stack) {
- try {
- // Update the restored stack to ensure we have freshest data
- stack.updateDocuments(getContentResolver());
- mState.setStack(stack);
- refreshCurrentRootAndDirectory(AnimationView.ANIM_SIDE);
-
- } catch (FileNotFoundException e) {
- Log.w(mTag, "Failed to restore stack: " + e);
- }
- }
-
- /**
- * Declare a global key handler to route key events when there isn't a specific focus view. This
- * covers the scenario where a user opens DocumentsUI and just starts typing.
- *
- * @param keyCode
- * @param event
- * @return
- */
- @CallSuper
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (Events.isNavigationKeyCode(keyCode)) {
- // Forward all unclaimed navigation keystrokes to the DirectoryFragment. This causes any
- // stray navigation keystrokes focus the content pane, which is probably what the user
- // is trying to do.
- DirectoryFragment df = DirectoryFragment.get(getFragmentManager());
- if (df != null) {
- df.requestFocus();
- return true;
- }
- } else if (keyCode == KeyEvent.KEYCODE_TAB) {
- // Tab toggles focus on the navigation drawer.
- toggleNavDrawerFocus();
- return true;
- } else if (keyCode == KeyEvent.KEYCODE_DEL) {
- popDir();
- return true;
- }
- return super.onKeyDown(keyCode, event);
- }
-
- public void addEventListener(EventListener listener) {
- mEventListeners.add(listener);
- }
-
- public void removeEventListener(EventListener listener) {
- mEventListeners.remove(listener);
- }
-
- public void notifyDirectoryLoaded(Uri uri) {
- for (EventListener listener : mEventListeners) {
- listener.onDirectoryLoaded(uri);
- }
- }
-
- void notifyDirectoryNavigated(Uri uri) {
- for (EventListener listener : mEventListeners) {
- listener.onDirectoryNavigated(uri);
- }
- }
-
- /**
- * Toggles focus between the navigation drawer and the directory listing. If the drawer isn't
- * locked, open/close it as appropriate.
- */
- void toggleNavDrawerFocus() {
- if (mNavDrawerHasFocus) {
- mDrawer.setOpen(false);
- DirectoryFragment df = DirectoryFragment.get(getFragmentManager());
- if (df != null) {
- df.requestFocus();
- }
- } else {
- mDrawer.setOpen(true);
- RootsFragment rf = RootsFragment.get(getFragmentManager());
- if (rf != null) {
- rf.requestFocus();
- }
- }
- mNavDrawerHasFocus = !mNavDrawerHasFocus;
- }
-
- DocumentInfo getRootDocumentBlocking(RootInfo root) {
- try {
- final Uri uri = DocumentsContract.buildDocumentUri(
- root.authority, root.documentId);
- return DocumentInfo.fromUri(getContentResolver(), uri);
- } catch (FileNotFoundException e) {
- Log.w(mTag, "Failed to find root", e);
- return null;
- }
- }
-
- /**
- * Pops the top entry off the directory stack, and returns the user to the previous directory.
- * If the directory stack only contains one item, this method does nothing.
- *
- * @return Whether the stack was popped.
- */
- private boolean popDir() {
- if (mState.stack.size() > 1) {
- mState.stack.pop();
- refreshCurrentRootAndDirectory(AnimationView.ANIM_LEAVE);
- return true;
- }
- return false;
- }
-
- /**
- * Closes the activity when it's idle.
- */
- private void addListenerForLaunchCompletion() {
- addEventListener(new EventListener() {
- @Override
- public void onDirectoryNavigated(Uri uri) {
- }
-
- @Override
- public void onDirectoryLoaded(Uri uri) {
- removeEventListener(this);
- getMainLooper().getQueue().addIdleHandler(new IdleHandler() {
- @Override
- public boolean queueIdle() {
- // If startup benchmark is requested by a whitelisted testing package, then
- // close the activity once idle, and notify the testing activity.
- if (getIntent().getBooleanExtra(EXTRA_BENCHMARK, false) &&
- BENCHMARK_TESTING_PACKAGE.equals(getCallingPackage())) {
- setResult(RESULT_OK);
- finish();
- }
-
- Metrics.logStartupMs(
- BaseActivity.this, (int) (new Date().getTime() - mStartTime));
-
- // Remove the idle handler.
- return false;
- }
- });
- new Handler().post(new Runnable() {
- @Override public void run() {
- }
- });
- }
- });
- }
-
- private static final class PickRootTask extends PairedTask<BaseActivity, Void, DocumentInfo> {
- private RootInfo mRoot;
-
- public PickRootTask(BaseActivity activity, RootInfo root) {
- super(activity);
- mRoot = root;
- }
-
- @Override
- protected DocumentInfo run(Void... params) {
- return mOwner.getRootDocumentBlocking(mRoot);
- }
-
- @Override
- protected void finish(DocumentInfo result) {
- if (result != null) {
- mOwner.openContainerDocument(result);
- }
- }
- }
-
- private static final class HandleRootsChangedTask
- extends PairedTask<BaseActivity, RootInfo, RootInfo> {
- RootInfo mCurrentRoot;
- DocumentInfo mDefaultRootDocument;
-
- public HandleRootsChangedTask(BaseActivity activity) {
- super(activity);
- }
-
- @Override
- protected RootInfo run(RootInfo... roots) {
- assert(roots.length == 1);
- mCurrentRoot = roots[0];
- final Collection<RootInfo> cachedRoots = mOwner.mRoots.getRootsBlocking();
- for (final RootInfo root : cachedRoots) {
- if (root.getUri().equals(mCurrentRoot.getUri())) {
- // We don't need to change the current root as the current root was not removed.
- return null;
- }
- }
-
- // Choose the default root.
- final RootInfo defaultRoot = mOwner.mRoots.getDefaultRootBlocking(mOwner.mState);
- assert(defaultRoot != null);
- if (!defaultRoot.isRecents()) {
- mDefaultRootDocument = mOwner.getRootDocumentBlocking(defaultRoot);
- }
- return defaultRoot;
- }
-
- @Override
- protected void finish(RootInfo defaultRoot) {
- if (defaultRoot == null) {
- return;
- }
-
- // If the activity has been launched for the specific root and it is removed, finish the
- // activity.
- final Uri uri = mOwner.getIntent().getData();
- if (uri != null && uri.equals(mCurrentRoot.getUri())) {
- mOwner.finish();
- return;
- }
-
- // Clear entire backstack and start in new root.
- mOwner.mState.onRootChanged(defaultRoot);
- mOwner.mSearchManager.update(defaultRoot);
-
- if (defaultRoot.isRecents()) {
- mOwner.refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
- } else {
- mOwner.openContainerDocument(mDefaultRootDocument);
- }
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BootReceiver.java b/packages/DocumentsUI/src/com/android/documentsui/BootReceiver.java
deleted file mode 100644
index cdea9d7..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/BootReceiver.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * Prime {@link RootsCache} when the system is booted.
- */
-public class BootReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- // We already spun up our application object before getting here, which
- // kicked off a task to load roots, so this broadcast is finished once
- // that first pass is done.
- DocumentsApplication.getRootsCache(context).setBootCompletedResult(goAsync());
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ClipDetails.java b/packages/DocumentsUI/src/com/android/documentsui/ClipDetails.java
deleted file mode 100644
index 6cd0353..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/ClipDetails.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.DocumentClipper.OP_JUMBO_SELECTION_SIZE;
-import static com.android.documentsui.DocumentClipper.OP_JUMBO_SELECTION_TAG;
-import static com.android.documentsui.DocumentClipper.OP_TYPE_KEY;
-import static com.android.documentsui.DocumentClipper.SRC_PARENT_KEY;
-
-import android.annotation.CallSuper;
-import android.annotation.Nullable;
-import android.content.ClipData;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.PersistableBundle;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
-
-/**
- * ClipDetails is a parcelable project providing information of different type of file
- * management operations like cut, move and copy.
- *
- * Under the hood it provides cross-process synchronization support such that its consumer doesn't
- * need to explicitly synchronize its access.
- */
-public abstract class ClipDetails implements Parcelable {
- private final @OpType int mOpType;
-
- // This field is used only for moving and deleting. Currently it's not the case,
- // but in the future those files may be from multiple different parents. In
- // such case, this needs to be replaced with pairs of parent and child.
- private final @Nullable Uri mSrcParent;
-
- private ClipDetails(ClipData clipData) {
- PersistableBundle bundle = clipData.getDescription().getExtras();
- mOpType = bundle.getInt(OP_TYPE_KEY);
-
- String srcParentString = bundle.getString(SRC_PARENT_KEY);
- mSrcParent = (srcParentString == null) ? null : Uri.parse(srcParentString);
-
- // Only copy doesn't need src parent
- assert(mOpType == FileOperationService.OPERATION_COPY || mSrcParent != null);
- }
-
- private ClipDetails(@OpType int opType, @Nullable Uri srcParent) {
- mOpType = opType;
- mSrcParent = srcParent;
-
- // Only copy doesn't need src parent
- assert(mOpType == FileOperationService.OPERATION_COPY || mSrcParent != null);
- }
-
- public @OpType int getOpType() {
- return mOpType;
- }
-
- public @Nullable Uri getSrcParent() {
- return mSrcParent;
- }
-
- public abstract int getItemCount();
-
- /**
- * Gets doc list from this clip detail. This may only be called once because it may read a file
- * to get the list.
- */
- public Iterable<Uri> getDocs(Context context) throws IOException {
- ClipStorage storage = DocumentsApplication.getClipStorage(context);
-
- return getDocs(storage);
- }
-
- @VisibleForTesting
- abstract Iterable<Uri> getDocs(ClipStorage storage) throws IOException;
-
- public void dispose(Context context) {
- ClipStorage storage = DocumentsApplication.getClipStorage(context);
- dispose(storage);
- }
-
- @VisibleForTesting
- void dispose(ClipStorage storage) {}
-
- private ClipDetails(Parcel in) {
- mOpType = in.readInt();
- mSrcParent = in.readParcelable(ClassLoader.getSystemClassLoader());
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @CallSuper
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(mOpType);
- dest.writeParcelable(mSrcParent, 0);
- }
-
- private void appendTo(StringBuilder builder) {
- builder.append("opType=").append(mOpType);
- builder.append(", srcParent=").append(mSrcParent);
- }
-
- public static ClipDetails createClipDetails(ClipData clipData) {
- ClipDetails details;
- PersistableBundle bundle = clipData.getDescription().getExtras();
- if (bundle.containsKey(OP_JUMBO_SELECTION_TAG)) {
- details = new JumboClipDetails(clipData);
- } else {
- details = new StandardClipDetails(clipData);
- }
-
- return details;
- }
-
- public static ClipDetails createClipDetails(@OpType int opType, @Nullable Uri srcParent,
- Selection selection, Function<String, Uri> uriBuilder, Context context) {
- ClipStorage storage = DocumentsApplication.getClipStorage(context);
-
- List<Uri> uris = new ArrayList<>(selection.size());
- for (String id : selection) {
- uris.add(uriBuilder.apply(id));
- }
-
- return createClipDetails(opType, srcParent, uris, storage);
- }
-
- @VisibleForTesting
- static ClipDetails createClipDetails(@OpType int opType, @Nullable Uri srcParent,
- List<Uri> uris, ClipStorage storage) {
- ClipDetails details = (uris.size() > Shared.MAX_DOCS_IN_INTENT)
- ? new JumboClipDetails(opType, srcParent, uris, storage)
- : new StandardClipDetails(opType, srcParent, uris);
-
- return details;
- }
-
- private static class JumboClipDetails extends ClipDetails {
- private static final String TAG = "JumboClipDetails";
-
- private final long mSelectionTag;
- private final int mSelectionSize;
-
- private transient ClipStorage.Reader mReader;
-
- private JumboClipDetails(ClipData clipData) {
- super(clipData);
-
- PersistableBundle bundle = clipData.getDescription().getExtras();
- mSelectionTag = bundle.getLong(OP_JUMBO_SELECTION_TAG, ClipStorage.NO_SELECTION_TAG);
- assert(mSelectionTag != ClipStorage.NO_SELECTION_TAG);
-
- mSelectionSize = bundle.getInt(OP_JUMBO_SELECTION_SIZE);
- assert(mSelectionSize > Shared.MAX_DOCS_IN_INTENT);
- }
-
- private JumboClipDetails(@OpType int opType, @Nullable Uri srcParent, Collection<Uri> uris,
- ClipStorage storage) {
- super(opType, srcParent);
-
- mSelectionTag = storage.createTag();
- new ClipStorage.PersistTask(storage, uris, mSelectionTag).execute();
- mSelectionSize = uris.size();
- }
-
- @Override
- public int getItemCount() {
- return mSelectionSize;
- }
-
- @Override
- public Iterable<Uri> getDocs(ClipStorage storage) throws IOException {
- if (mReader != null) {
- throw new IllegalStateException(
- "JumboClipDetails#getDocs() can only be called once.");
- }
-
- mReader = storage.createReader(mSelectionTag);
-
- return mReader;
- }
-
- @Override
- void dispose(ClipStorage storage) {
- if (mReader != null) {
- try {
- mReader.close();
- } catch (IOException e) {
- Log.w(TAG, "Failed to close the reader.", e);
- }
- }
- try {
- storage.delete(mSelectionTag);
- } catch(IOException e) {
- Log.w(TAG, "Failed to delete clip with tag: " + mSelectionTag + ".", e);
- }
- }
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("JumboClipDetails{");
- super.appendTo(builder);
- builder.append(", selectionTag=").append(mSelectionTag);
- builder.append(", selectionSize=").append(mSelectionSize);
- builder.append("}");
- return builder.toString();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
-
- dest.writeLong(mSelectionTag);
- dest.writeInt(mSelectionSize);
- }
-
- private JumboClipDetails(Parcel in) {
- super(in);
-
- mSelectionTag = in.readLong();
- mSelectionSize = in.readInt();
- }
-
- public static final Parcelable.Creator<JumboClipDetails> CREATOR =
- new Parcelable.Creator<JumboClipDetails>() {
-
- @Override
- public JumboClipDetails createFromParcel(Parcel source) {
- return new JumboClipDetails(source);
- }
-
- @Override
- public JumboClipDetails[] newArray(int size) {
- return new JumboClipDetails[size];
- }
- };
- }
-
- @VisibleForTesting
- public static class StandardClipDetails extends ClipDetails {
- private final List<Uri> mDocs;
-
- private StandardClipDetails(ClipData clipData) {
- super(clipData);
- mDocs = listDocs(clipData);
- }
-
- @VisibleForTesting
- public StandardClipDetails(@OpType int opType, @Nullable Uri srcParent, List<Uri> docs) {
- super(opType, srcParent);
-
- mDocs = docs;
- }
-
- private List<Uri> listDocs(ClipData clipData) {
- ArrayList<Uri> docs = new ArrayList<>(clipData.getItemCount());
-
- for (int i = 0; i < clipData.getItemCount(); ++i) {
- Uri uri = clipData.getItemAt(i).getUri();
- assert(uri != null);
- docs.add(uri);
- }
-
- return docs;
- }
-
- @Override
- public int getItemCount() {
- return mDocs.size();
- }
-
- @Override
- public Iterable<Uri> getDocs(ClipStorage storage) {
- return mDocs;
- }
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("StandardClipDetails{");
- super.appendTo(builder);
- builder.append(", ").append("docs=").append(mDocs.toString());
- builder.append("}");
- return builder.toString();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
-
- dest.writeTypedList(mDocs);
- }
-
- private StandardClipDetails(Parcel in) {
- super(in);
-
- mDocs = in.createTypedArrayList(Uri.CREATOR);
- }
-
- public static final Parcelable.Creator<StandardClipDetails> CREATOR =
- new Parcelable.Creator<StandardClipDetails>() {
-
- @Override
- public StandardClipDetails createFromParcel(Parcel source) {
- return new StandardClipDetails(source);
- }
-
- @Override
- public StandardClipDetails[] newArray(int size) {
- return new StandardClipDetails[size];
- }
- };
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ClipStorage.java b/packages/DocumentsUI/src/com/android/documentsui/ClipStorage.java
deleted file mode 100644
index 5102718..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/ClipStorage.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileLock;
-import java.util.Scanner;
-
-/**
- * Provides support for storing lists of documents identified by Uri.
- *
- * <li>Access to this object *must* be synchronized externally.
- * <li>All calls to this class are I/O intensive and must be wrapped in an AsyncTask.
- */
-public final class ClipStorage {
-
- private static final String TAG = "ClipStorage";
-
- private static final byte[] LINE_SEPARATOR = System.lineSeparator().getBytes();
- public static final long NO_SELECTION_TAG = -1;
-
- private final File mOutDir;
-
- /**
- * @param outDir see {@link #prepareStorage(File)}.
- */
- public ClipStorage(File outDir) {
- assert(outDir.isDirectory());
- mOutDir = outDir;
- }
-
- /**
- * Creates a clip tag.
- *
- * NOTE: this tag doesn't guarantee perfect uniqueness, but should work well unless user creates
- * clips more than hundreds of times per second.
- */
- public long createTag() {
- return System.currentTimeMillis();
- }
-
- /**
- * Returns a writer. Callers must close the writer when finished.
- */
- public Writer createWriter(long tag) throws IOException {
- File file = toTagFile(tag);
- return new Writer(file);
- }
-
- @VisibleForTesting
- public Reader createReader(long tag) throws IOException {
- File file = toTagFile(tag);
- return new Reader(file);
- }
-
- @VisibleForTesting
- public void delete(long tag) throws IOException {
- toTagFile(tag).delete();
- }
-
- private File toTagFile(long tag) {
- return new File(mOutDir, String.valueOf(tag));
- }
-
- /**
- * Provides initialization of the clip data storage directory.
- */
- static File prepareStorage(File cacheDir) {
- File clipDir = getClipDir(cacheDir);
- clipDir.mkdir();
-
- assert(clipDir.isDirectory());
- return clipDir;
- }
-
- public static boolean hasDocList(long tag) {
- return tag != NO_SELECTION_TAG;
- }
-
- private static File getClipDir(File cacheDir) {
- return new File(cacheDir, "clippings");
- }
-
- static final class Reader implements Iterable<Uri>, Closeable {
-
- private final Scanner mScanner;
- private final FileLock mLock;
-
- private Reader(File file) throws IOException {
- FileInputStream inStream = new FileInputStream(file);
-
- // Lock the file here so it won't pass this line until the corresponding writer is done
- // writing.
- mLock = inStream.getChannel().lock(0L, Long.MAX_VALUE, true);
-
- mScanner = new Scanner(inStream);
- }
-
- @Override
- public Iterator iterator() {
- return new Iterator(mScanner);
- }
-
- @Override
- public void close() throws IOException {
- if (mLock != null) {
- mLock.release();
- }
-
- if (mScanner != null) {
- mScanner.close();
- }
- }
- }
-
- private static final class Iterator implements java.util.Iterator {
- private final Scanner mScanner;
-
- private Iterator(Scanner scanner) {
- mScanner = scanner;
- }
-
- @Override
- public boolean hasNext() {
- return mScanner.hasNextLine();
- }
-
- @Override
- public Uri next() {
- String line = mScanner.nextLine();
- return Uri.parse(line);
- }
- }
-
- private static final class Writer implements Closeable {
-
- private final FileOutputStream mOut;
- private final FileLock mLock;
-
- private Writer(File file) throws IOException {
- mOut = new FileOutputStream(file);
-
- // Lock the file here so copy tasks would wait until everything is flushed to disk
- // before start to run.
- mLock = mOut.getChannel().lock();
- }
-
- public void write(Uri uri) throws IOException {
- mOut.write(uri.toString().getBytes());
- mOut.write(LINE_SEPARATOR);
- }
-
- @Override
- public void close() throws IOException {
- if (mLock != null) {
- mLock.release();
- }
-
- if (mOut != null) {
- mOut.close();
- }
- }
- }
-
- /**
- * An {@link AsyncTask} that persists doc uris in {@link ClipStorage}.
- */
- static final class PersistTask extends AsyncTask<Void, Void, Void> {
-
- private final ClipStorage mClipStorage;
- private final Iterable<Uri> mUris;
- private final long mTag;
-
- PersistTask(ClipStorage clipStorage, Iterable<Uri> uris, long tag) {
- mClipStorage = clipStorage;
- mUris = uris;
- mTag = tag;
- }
-
- @Override
- protected Void doInBackground(Void... params) {
- try (ClipStorage.Writer writer = mClipStorage.createWriter(mTag)) {
- for (Uri uri: mUris) {
- assert(uri != null);
- writer.write(uri);
- }
- } catch (IOException e) {
- Log.e(TAG, "Caught exception trying to write jumbo clip to disk.", e);
- }
-
- return null;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
deleted file mode 100644
index 5b5a96e..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.TAG;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.inputmethod.EditorInfo;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-
-import com.android.documentsui.model.DocumentInfo;
-
-/**
- * Dialog to create a new directory.
- */
-public class CreateDirectoryFragment extends DialogFragment {
- private static final String TAG_CREATE_DIRECTORY = "create_directory";
-
- public static void show(FragmentManager fm) {
- final CreateDirectoryFragment dialog = new CreateDirectoryFragment();
- dialog.show(fm, TAG_CREATE_DIRECTORY);
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- final Context context = getActivity();
- final ContentResolver resolver = context.getContentResolver();
-
- final AlertDialog.Builder builder = new AlertDialog.Builder(context);
- final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
-
- final View view = dialogInflater.inflate(R.layout.dialog_file_name, null, false);
- final EditText editText = (EditText) view.findViewById(android.R.id.text1);
-
- builder.setTitle(R.string.menu_create_dir);
- builder.setView(view);
-
- builder.setPositiveButton(
- android.R.string.ok,
- new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- createDirectory(editText.getText().toString());
- }
- });
-
- builder.setNegativeButton(android.R.string.cancel, null);
- final AlertDialog dialog = builder.create();
-
- // Workaround for the problem - virtual keyboard doesn't show on the phone.
- Shared.ensureKeyboardPresent(context, dialog);
-
- editText.setOnEditorActionListener(
- new OnEditorActionListener() {
- @Override
- public boolean onEditorAction(
- TextView view, int actionId, @Nullable KeyEvent event) {
- if ((actionId == EditorInfo.IME_ACTION_DONE) || (event != null
- && event.getKeyCode() == KeyEvent.KEYCODE_ENTER
- && event.hasNoModifiers())) {
- createDirectory(editText.getText().toString());
- dialog.dismiss();
- return true;
- }
- return false;
- }
- });
-
-
- return dialog;
- }
-
- private void createDirectory(String name) {
- final BaseActivity activity = (BaseActivity) getActivity();
- final DocumentInfo cwd = activity.getCurrentDirectory();
-
- new CreateDirectoryTask(activity, cwd, name).executeOnExecutor(
- ProviderExecutor.forAuthority(cwd.authority));
- }
-
- private class CreateDirectoryTask extends AsyncTask<Void, Void, DocumentInfo> {
- private final BaseActivity mActivity;
- private final DocumentInfo mCwd;
- private final String mDisplayName;
-
- public CreateDirectoryTask(
- BaseActivity activity, DocumentInfo cwd, String displayName) {
- mActivity = activity;
- mCwd = cwd;
- mDisplayName = displayName;
- }
-
- @Override
- protected void onPreExecute() {
- mActivity.setPending(true);
- }
-
- @Override
- protected DocumentInfo doInBackground(Void... params) {
- final ContentResolver resolver = mActivity.getContentResolver();
- ContentProviderClient client = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(
- resolver, mCwd.derivedUri.getAuthority());
- final Uri childUri = DocumentsContract.createDocument(
- client, mCwd.derivedUri, Document.MIME_TYPE_DIR, mDisplayName);
- return DocumentInfo.fromUri(resolver, childUri);
- } catch (Exception e) {
- Log.w(TAG, "Failed to create directory", e);
- return null;
- } finally {
- ContentProviderClient.releaseQuietly(client);
- }
- }
-
- @Override
- protected void onPostExecute(DocumentInfo result) {
- if (result != null) {
- // Navigate into newly created child
- mActivity.onDirectoryCreated(result);
- Metrics.logCreateDirOperation(getContext());
- } else {
- Snackbars.makeSnackbar(mActivity, R.string.create_error, Snackbar.LENGTH_SHORT)
- .show();
- Metrics.logCreateDirError(getContext());
- }
- mActivity.setPending(false);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java
deleted file mode 100644
index d2e918c..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.TAG;
-import static com.android.documentsui.State.SORT_ORDER_DISPLAY_NAME;
-import static com.android.documentsui.State.SORT_ORDER_LAST_MODIFIED;
-import static com.android.documentsui.State.SORT_ORDER_SIZE;
-
-import android.content.AsyncTaskLoader;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.CancellationSignal;
-import android.os.OperationCanceledException;
-import android.os.RemoteException;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.util.Log;
-
-import com.android.documentsui.dirlist.DirectoryFragment;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.RootInfo;
-
-import libcore.io.IoUtils;
-
-import java.io.FileNotFoundException;
-
-public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
-
- private static final String[] SEARCH_REJECT_MIMES = new String[] { Document.MIME_TYPE_DIR };
-
- private final ForceLoadContentObserver mObserver = new ForceLoadContentObserver();
-
- private final int mType;
- private final RootInfo mRoot;
- private final Uri mUri;
- private final int mUserSortOrder;
- private final boolean mSearchMode;
-
- private DocumentInfo mDoc;
- private CancellationSignal mSignal;
- private DirectoryResult mResult;
-
- public DirectoryLoader(Context context, int type, RootInfo root, DocumentInfo doc, Uri uri,
- int userSortOrder, boolean inSearchMode) {
- super(context, ProviderExecutor.forAuthority(root.authority));
- mType = type;
- mRoot = root;
- mUri = uri;
- mUserSortOrder = userSortOrder;
- mDoc = doc;
- mSearchMode = inSearchMode;
- }
-
- @Override
- public final DirectoryResult loadInBackground() {
- synchronized (this) {
- if (isLoadInBackgroundCanceled()) {
- throw new OperationCanceledException();
- }
- mSignal = new CancellationSignal();
- }
-
- final ContentResolver resolver = getContext().getContentResolver();
- final String authority = mUri.getAuthority();
-
- final DirectoryResult result = new DirectoryResult();
- result.doc = mDoc;
-
- // Use default document when searching
- if (mSearchMode) {
- final Uri docUri = DocumentsContract.buildDocumentUri(
- mRoot.authority, mRoot.documentId);
- try {
- mDoc = DocumentInfo.fromUri(resolver, docUri);
- } catch (FileNotFoundException e) {
- Log.w(TAG, "Failed to query", e);
- result.exception = e;
- return result;
- }
- }
-
- if (mUserSortOrder != State.SORT_ORDER_UNKNOWN) {
- result.sortOrder = mUserSortOrder;
- } else {
- if ((mDoc.flags & Document.FLAG_DIR_PREFERS_LAST_MODIFIED) != 0) {
- result.sortOrder = State.SORT_ORDER_LAST_MODIFIED;
- } else {
- result.sortOrder = State.SORT_ORDER_DISPLAY_NAME;
- }
- }
-
- // Search always uses ranking from provider
- if (mSearchMode) {
- result.sortOrder = State.SORT_ORDER_UNKNOWN;
- }
-
- if (DEBUG)
- Log.d(TAG, "userSortOrder=" + mUserSortOrder + ", sortOrder=" + result.sortOrder);
-
- ContentProviderClient client = null;
- Cursor cursor = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(resolver, authority);
- cursor = client.query(
- mUri, null, null, null, getQuerySortOrder(result.sortOrder), mSignal);
- if (cursor == null) {
- throw new RemoteException("Provider returned null");
- }
-
- cursor.registerContentObserver(mObserver);
-
- cursor = new RootCursorWrapper(mUri.getAuthority(), mRoot.rootId, cursor, -1);
-
- if (mSearchMode) {
- // Filter directories out of search results, for now
- cursor = new FilteringCursorWrapper(cursor, null, SEARCH_REJECT_MIMES);
- }
-
- result.client = client;
- result.cursor = cursor;
- } catch (Exception e) {
- Log.w(TAG, "Failed to query", e);
- result.exception = e;
- ContentProviderClient.releaseQuietly(client);
- } finally {
- synchronized (this) {
- mSignal = null;
- }
- }
-
- return result;
- }
-
- @Override
- public void cancelLoadInBackground() {
- super.cancelLoadInBackground();
-
- synchronized (this) {
- if (mSignal != null) {
- mSignal.cancel();
- }
- }
- }
-
- @Override
- public void deliverResult(DirectoryResult result) {
- if (isReset()) {
- IoUtils.closeQuietly(result);
- return;
- }
- DirectoryResult oldResult = mResult;
- mResult = result;
-
- if (isStarted()) {
- super.deliverResult(result);
- }
-
- if (oldResult != null && oldResult != result) {
- IoUtils.closeQuietly(oldResult);
- }
- }
-
- @Override
- protected void onStartLoading() {
- if (mResult != null) {
- deliverResult(mResult);
- }
- if (takeContentChanged() || mResult == null) {
- forceLoad();
- }
- }
-
- @Override
- protected void onStopLoading() {
- cancelLoad();
- }
-
- @Override
- public void onCanceled(DirectoryResult result) {
- IoUtils.closeQuietly(result);
- }
-
- @Override
- protected void onReset() {
- super.onReset();
-
- // Ensure the loader is stopped
- onStopLoading();
-
- IoUtils.closeQuietly(mResult);
- mResult = null;
-
- getContext().getContentResolver().unregisterContentObserver(mObserver);
- }
-
- public static String getQuerySortOrder(int sortOrder) {
- switch (sortOrder) {
- case SORT_ORDER_DISPLAY_NAME:
- return Document.COLUMN_DISPLAY_NAME + " ASC";
- case SORT_ORDER_LAST_MODIFIED:
- return Document.COLUMN_LAST_MODIFIED + " DESC";
- case SORT_ORDER_SIZE:
- return Document.COLUMN_SIZE + " DESC";
- default:
- return null;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java
deleted file mode 100644
index 6268643..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.State.MODE_UNKNOWN;
-import static com.android.documentsui.State.SORT_ORDER_UNKNOWN;
-
-import android.content.ContentProviderClient;
-import android.database.Cursor;
-
-import com.android.documentsui.model.DocumentInfo;
-
-import libcore.io.IoUtils;
-
-public class DirectoryResult implements AutoCloseable {
- ContentProviderClient client;
- public Cursor cursor;
- public Exception exception;
- public DocumentInfo doc;
-
- public int sortOrder = SORT_ORDER_UNKNOWN;
-
- @Override
- public void close() {
- IoUtils.closeQuietly(cursor);
- ContentProviderClient.releaseQuietly(client);
- cursor = null;
- client = null;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Display.java b/packages/DocumentsUI/src/com/android/documentsui/Display.java
deleted file mode 100644
index 8b13222..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Display.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Point;
-import android.util.TypedValue;
-
-/*
- * Convenience class for getting display related attributes
- */
-public final class Display {
- /*
- * Returns the screen width in raw pixels.
- */
- public static float screenWidth(Activity activity) {
- Point size = new Point();
- activity.getWindowManager().getDefaultDisplay().getSize(size);
- return size.x;
- }
-
- /*
- * Returns logical density of the display.
- */
- public static float density(Context context) {
- return context.getResources().getDisplayMetrics().density;
- }
-
- /*
- * Returns action bar height in raw pixels.
- */
- public static float actionBarHeight(Context context) {
- int actionBarHeight = 0;
- TypedValue tv = new TypedValue();
- if (context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
- actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data,
- context.getResources().getDisplayMetrics());
- }
- return actionBarHeight;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java
deleted file mode 100644
index 4c103c4..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.ClipData;
-import android.content.ClipDescription;
-import android.content.ClipboardManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.BaseBundle;
-import android.os.PersistableBundle;
-import android.provider.DocumentsContract;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-import com.android.documentsui.services.FileOperations;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-
-/**
- * ClipboardManager wrapper class providing higher level logical
- * support for dealing with Documents.
- */
-public final class DocumentClipper implements ClipboardManager.OnPrimaryClipChangedListener {
-
- private static final String TAG = "DocumentClipper";
-
- static final String SRC_PARENT_KEY = "srcParent";
- static final String OP_TYPE_KEY = "opType";
- static final String OP_JUMBO_SELECTION_SIZE = "jumboSelection-size";
- static final String OP_JUMBO_SELECTION_TAG = "jumboSelection-tag";
-
- // Use shared preference to store last seen primary clip tag, so that we can delete the file
- // when we realize primary clip has been changed when we're not running.
- private static final String PREF_NAME = "DocumentClipperPref";
- private static final String LAST_PRIMARY_CLIP_TAG = "lastPrimaryClipTag";
-
- private final Context mContext;
- private final ClipStorage mClipStorage;
- private final ClipboardManager mClipboard;
-
- // Here we're tracking the last clipped tag ids so we can delete them later.
- private long mLastDragClipTag = ClipStorage.NO_SELECTION_TAG;
- private long mLastUnusedPrimaryClipTag = ClipStorage.NO_SELECTION_TAG;
-
- private final SharedPreferences mPref;
-
- DocumentClipper(Context context, ClipStorage storage) {
- mContext = context;
- mClipStorage = storage;
- mClipboard = context.getSystemService(ClipboardManager.class);
-
- mClipboard.addPrimaryClipChangedListener(this);
-
- // Primary clips may be changed when we're not running, now it's time to clean up the
- // remnant.
- mPref = context.getSharedPreferences(PREF_NAME, 0);
- mLastUnusedPrimaryClipTag =
- mPref.getLong(LAST_PRIMARY_CLIP_TAG, ClipStorage.NO_SELECTION_TAG);
- deleteLastUnusedPrimaryClip();
- }
-
- public boolean hasItemsToPaste() {
- if (mClipboard.hasPrimaryClip()) {
- ClipData clipData = mClipboard.getPrimaryClip();
-
- int count = clipData.getItemCount();
- if (count > 0) {
- for (int i = 0; i < count; ++i) {
- ClipData.Item item = clipData.getItemAt(i);
- Uri uri = item.getUri();
- if (isDocumentUri(uri)) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- private boolean isDocumentUri(@Nullable Uri uri) {
- return uri != null && DocumentsContract.isDocumentUri(mContext, uri);
- }
-
- /**
- * Returns {@link ClipData} representing the selection, or null if selection is empty,
- * or cannot be converted.
- *
- * This is specialized for drag and drop so that we know which file to delete if nobody accepts
- * the drop.
- */
- public @Nullable ClipData getClipDataForDrag(
- Function<String, Uri> uriBuilder, Selection selection, @OpType int opType) {
- ClipData data = getClipDataForDocuments(uriBuilder, selection, opType);
-
- mLastDragClipTag = getTag(data);
-
- return data;
- }
-
- /**
- * Returns {@link ClipData} representing the selection, or null if selection is empty,
- * or cannot be converted.
- */
- private @Nullable ClipData getClipDataForDocuments(
- Function<String, Uri> uriBuilder, Selection selection, @OpType int opType) {
-
- assert(selection != null);
-
- if (selection.isEmpty()) {
- Log.w(TAG, "Attempting to clip empty selection. Ignoring.");
- return null;
- }
-
- return (selection.size() > Shared.MAX_DOCS_IN_INTENT)
- ? createJumboClipData(uriBuilder, selection, opType)
- : createStandardClipData(uriBuilder, selection, opType);
- }
-
- /**
- * Returns ClipData representing the selection.
- */
- private @Nullable ClipData createStandardClipData(
- Function<String, Uri> uriBuilder, Selection selection, @OpType int opType) {
-
- assert(!selection.isEmpty());
- assert(selection.size() <= Shared.MAX_DOCS_IN_INTENT);
-
- final ContentResolver resolver = mContext.getContentResolver();
- final ArrayList<ClipData.Item> clipItems = new ArrayList<>();
- final Set<String> clipTypes = new HashSet<>();
-
- PersistableBundle bundle = new PersistableBundle();
- bundle.putInt(OP_TYPE_KEY, opType);
-
- for (String id : selection) {
- assert(id != null);
- Uri uri = uriBuilder.apply(id);
- DocumentInfo.addMimeTypes(resolver, uri, clipTypes);
- clipItems.add(new ClipData.Item(uri));
- }
-
- ClipDescription description = new ClipDescription(
- "", // Currently "label" is not displayed anywhere in the UI.
- clipTypes.toArray(new String[0]));
- description.setExtras(bundle);
-
- return new ClipData(description, clipItems);
- }
-
- /**
- * Returns ClipData representing the list of docs
- */
- private @Nullable ClipData createJumboClipData(
- Function<String, Uri> uriBuilder, Selection selection, @OpType int opType) {
-
- assert(!selection.isEmpty());
- assert(selection.size() > Shared.MAX_DOCS_IN_INTENT);
-
- final List<Uri> uris = new ArrayList<>(selection.size());
-
- final int capacity = Math.min(selection.size(), Shared.MAX_DOCS_IN_INTENT);
- final ArrayList<ClipData.Item> clipItems = new ArrayList<>(capacity);
-
- // Set up mime types for the first Shared.MAX_DOCS_IN_INTENT
- final ContentResolver resolver = mContext.getContentResolver();
- final Set<String> clipTypes = new HashSet<>();
- int docCount = 0;
- for (String id : selection) {
- assert(id != null);
- Uri uri = uriBuilder.apply(id);
- if (docCount++ < Shared.MAX_DOCS_IN_INTENT) {
- DocumentInfo.addMimeTypes(resolver, uri, clipTypes);
- clipItems.add(new ClipData.Item(uri));
- }
-
- uris.add(uri);
- }
-
- // Prepare metadata
- PersistableBundle bundle = new PersistableBundle();
- bundle.putInt(OP_TYPE_KEY, opType);
- bundle.putInt(OP_JUMBO_SELECTION_SIZE, selection.size());
-
- // Creates a clip tag
- long tag = mClipStorage.createTag();
- bundle.putLong(OP_JUMBO_SELECTION_TAG, tag);
-
- ClipDescription description = new ClipDescription(
- "", // Currently "label" is not displayed anywhere in the UI.
- clipTypes.toArray(new String[0]));
- description.setExtras(bundle);
-
- // Persists clip items
- new ClipStorage.PersistTask(mClipStorage, uris, tag).execute();
-
- return new ClipData(description, clipItems);
- }
-
- /**
- * Puts {@code ClipData} in a primary clipboard, describing a copy operation
- */
- public void clipDocumentsForCopy(Function<String, Uri> uriBuilder, Selection selection) {
- ClipData data =
- getClipDataForDocuments(uriBuilder, selection, FileOperationService.OPERATION_COPY);
- assert(data != null);
-
- setPrimaryClip(data);
- }
-
- /**
- * Puts {@Code ClipData} in a primary clipboard, describing a cut operation
- */
- public void clipDocumentsForCut(
- Function<String, Uri> uriBuilder, Selection selection, DocumentInfo parent) {
- assert(!selection.isEmpty());
- assert(parent.derivedUri != null);
-
- ClipData data = getClipDataForDocuments(uriBuilder, selection,
- FileOperationService.OPERATION_MOVE);
- assert(data != null);
-
- PersistableBundle bundle = data.getDescription().getExtras();
- bundle.putString(SRC_PARENT_KEY, parent.derivedUri.toString());
-
- setPrimaryClip(data);
- }
-
- private void setPrimaryClip(ClipData data) {
- deleteLastPrimaryClip();
-
- long tag = getTag(data);
- setLastUnusedPrimaryClipTag(tag);
-
- mClipboard.setPrimaryClip(data);
- }
-
- /**
- * Sets this primary tag to both class variable and shared preference.
- */
- private void setLastUnusedPrimaryClipTag(long tag) {
- mLastUnusedPrimaryClipTag = tag;
- mPref.edit().putLong(LAST_PRIMARY_CLIP_TAG, tag).commit();
- }
-
- /**
- * This is a good chance for us to remove previous clip file for cut/copy because we know a new
- * primary clip is set.
- */
- @Override
- public void onPrimaryClipChanged() {
- deleteLastUnusedPrimaryClip();
- }
-
- private void deleteLastUnusedPrimaryClip() {
- ClipData primary = mClipboard.getPrimaryClip();
- long primaryTag = getTag(primary);
-
- // onPrimaryClipChanged is also called after we call setPrimaryClip(), so make sure we don't
- // delete the clip file we just created.
- if (mLastUnusedPrimaryClipTag != primaryTag) {
- deleteLastPrimaryClip();
- }
- }
-
- private void deleteLastPrimaryClip() {
- deleteClip(mLastUnusedPrimaryClipTag);
- setLastUnusedPrimaryClipTag(ClipStorage.NO_SELECTION_TAG);
- }
-
- /**
- * Deletes the last seen drag clip file.
- */
- public void deleteDragClip() {
- deleteClip(mLastDragClipTag);
- mLastDragClipTag = ClipStorage.NO_SELECTION_TAG;
- }
-
- private void deleteClip(long tag) {
- try {
- mClipStorage.delete(tag);
- } catch (IOException e) {
- Log.w(TAG, "Error deleting clip file with tag: " + tag, e);
- }
- }
-
- /**
- * Copies documents from clipboard. It's the same as {@link #copyFromClipData} with clipData
- * returned from {@link ClipboardManager#getPrimaryClip()}.
- *
- * @param destination destination document.
- * @param docStack the document stack to the destination folder,
- * @param callback callback to notify when operation finishes.
- */
- public void copyFromClipboard(
- DocumentInfo destination,
- DocumentStack docStack,
- FileOperations.Callback callback) {
-
- // The primary clip has been claimed by a file operation. It's now the operation's duty
- // to make sure the clip file is deleted after use.
- setLastUnusedPrimaryClipTag(ClipStorage.NO_SELECTION_TAG);
-
- copyFromClipData(destination, docStack, mClipboard.getPrimaryClip(), callback);
- }
-
- /**
- * Copies documents from given clip data.
- *
- * @param destination destination document
- * @param docStack the document stack to the destination folder
- * @param clipData the clipData to copy from, or null to copy from clipboard
- * @param callback callback to notify when operation finishes
- */
- public void copyFromClipData(
- final DocumentInfo destination,
- DocumentStack docStack,
- final @Nullable ClipData clipData,
- final FileOperations.Callback callback) {
-
- if (clipData == null) {
- Log.i(TAG, "Received null clipData. Ignoring.");
- return;
- }
-
- ClipDetails details = ClipDetails.createClipDetails(clipData);
-
- if (!canCopy(destination)) {
- callback.onOperationResult(
- FileOperations.Callback.STATUS_REJECTED, details.getOpType(), 0);
- return;
- }
-
- if (details.getItemCount() == 0) {
- callback.onOperationResult(
- FileOperations.Callback.STATUS_ACCEPTED, details.getOpType(), 0);
- return;
- }
-
- DocumentStack dstStack = new DocumentStack();
- dstStack.push(destination);
- dstStack.addAll(docStack);
-
- // Pass root here so that we can perform "download" root check when
- dstStack.root = docStack.root;
-
- FileOperations.start(mContext, details, dstStack, callback);
- }
-
- /**
- * Returns true if the list of files can be copied to destination. Note that this
- * is a policy check only. Currently the method does not attempt to verify
- * available space or any other environmental aspects possibly resulting in
- * failure to copy.
- *
- * @return true if the list of files can be copied to destination.
- */
- private static boolean canCopy(DocumentInfo dest) {
- if (dest == null || !dest.isDirectory() || !dest.isCreateSupported()) {
- return false;
- }
-
- return true;
- }
-
- /**
- * Obtains tag from {@link ClipData}. Returns {@link ClipStorage#NO_SELECTION_TAG}
- * if it's not a jumbo clip.
- */
- private static long getTag(@Nullable ClipData data) {
- if (data == null) {
- return ClipStorage.NO_SELECTION_TAG;
- }
-
- ClipDescription description = data.getDescription();
- BaseBundle bundle = description.getExtras();
- return bundle.getLong(OP_JUMBO_SELECTION_TAG, ClipStorage.NO_SELECTION_TAG);
- }
-
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
deleted file mode 100644
index b8559bc1..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.State.ACTION_CREATE;
-import static com.android.documentsui.State.ACTION_GET_CONTENT;
-import static com.android.documentsui.State.ACTION_OPEN;
-import static com.android.documentsui.State.ACTION_OPEN_TREE;
-import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.ClipData;
-import android.content.ComponentName;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.provider.DocumentsContract;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.documentsui.MenuManager.DirectoryDetails;
-import com.android.documentsui.RecentsProvider.RecentColumns;
-import com.android.documentsui.RecentsProvider.ResumeColumns;
-import com.android.documentsui.dirlist.AnimationView;
-import com.android.documentsui.dirlist.DirectoryFragment;
-import com.android.documentsui.dirlist.FragmentTuner;
-import com.android.documentsui.dirlist.FragmentTuner.DocumentsTuner;
-import com.android.documentsui.dirlist.Model;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DurableUtils;
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.services.FileOperationService;
-
-import libcore.io.IoUtils;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-public class DocumentsActivity extends BaseActivity {
- private static final int CODE_FORWARD = 42;
- private static final String TAG = "DocumentsActivity";
- private DocumentsMenuManager mMenuManager;
- private DirectoryDetails mDetails;
-
- public DocumentsActivity() {
- super(R.layout.documents_activity, TAG);
- }
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- mMenuManager = new DocumentsMenuManager(mSearchManager, getDisplayState());
- mDetails = new DirectoryDetails(this);
-
- if (mState.action == ACTION_CREATE) {
- final String mimeType = getIntent().getType();
- final String title = getIntent().getStringExtra(Intent.EXTRA_TITLE);
- SaveFragment.show(getFragmentManager(), mimeType, title);
- } else if (mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_PICK_COPY_DESTINATION) {
- PickFragment.show(getFragmentManager());
- }
-
- if (mState.action == ACTION_GET_CONTENT) {
- final Intent moreApps = new Intent(getIntent());
- moreApps.setComponent(null);
- moreApps.setPackage(null);
- RootsFragment.show(getFragmentManager(), moreApps);
- } else if (mState.action == ACTION_OPEN ||
- mState.action == ACTION_CREATE ||
- mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_PICK_COPY_DESTINATION) {
- RootsFragment.show(getFragmentManager(), null);
- }
-
- if (mState.restored) {
- if (DEBUG) Log.d(TAG, "Stack already resolved");
- } else {
- // We set the activity title in AsyncTask.onPostExecute().
- // To prevent talkback from reading aloud the default title, we clear it here.
- setTitle("");
-
- // As a matter of policy we don't load the last used stack for the copy
- // destination picker (user is already in Files app).
- // Concensus was that the experice was too confusing.
- // In all other cases, where the user is visiting us from another app
- // we restore the stack as last used from that app.
- if (mState.action == ACTION_PICK_COPY_DESTINATION) {
- if (DEBUG) Log.d(TAG, "Launching directly into Home directory.");
- loadRoot(getDefaultRoot());
- } else {
- if (DEBUG) Log.d(TAG, "Attempting to load last used stack for calling package.");
- new LoadLastUsedStackTask(this).execute();
- }
- }
- }
-
- @Override
- void includeState(State state) {
- final Intent intent = getIntent();
- final String action = intent.getAction();
- if (Intent.ACTION_OPEN_DOCUMENT.equals(action)) {
- state.action = ACTION_OPEN;
- } else if (Intent.ACTION_CREATE_DOCUMENT.equals(action)) {
- state.action = ACTION_CREATE;
- } else if (Intent.ACTION_GET_CONTENT.equals(action)) {
- state.action = ACTION_GET_CONTENT;
- } else if (Intent.ACTION_OPEN_DOCUMENT_TREE.equals(action)) {
- state.action = ACTION_OPEN_TREE;
- } else if (Shared.ACTION_PICK_COPY_DESTINATION.equals(action)) {
- state.action = ACTION_PICK_COPY_DESTINATION;
- }
-
- if (state.action == ACTION_OPEN || state.action == ACTION_GET_CONTENT) {
- state.allowMultiple = intent.getBooleanExtra(
- Intent.EXTRA_ALLOW_MULTIPLE, false);
- }
-
- if (state.action == ACTION_OPEN || state.action == ACTION_GET_CONTENT
- || state.action == ACTION_CREATE) {
- state.openableOnly = intent.hasCategory(Intent.CATEGORY_OPENABLE);
- }
-
- if (state.action == ACTION_PICK_COPY_DESTINATION) {
- // Indicates that a copy operation (or move) includes a directory.
- // Why? Directory creation isn't supported by some roots (like Downloads).
- // This allows us to restrict available roots to just those with support.
- state.directoryCopy = intent.getBooleanExtra(
- Shared.EXTRA_DIRECTORY_COPY, false);
- state.copyOperationSubType = intent.getIntExtra(
- FileOperationService.EXTRA_OPERATION,
- FileOperationService.OPERATION_COPY);
- }
- }
-
- public void onAppPicked(ResolveInfo info) {
- final Intent intent = new Intent(getIntent());
- intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_FORWARD_RESULT);
- intent.setComponent(new ComponentName(
- info.activityInfo.applicationInfo.packageName, info.activityInfo.name));
- startActivityForResult(intent, CODE_FORWARD);
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (DEBUG) Log.d(TAG, "onActivityResult() code=" + resultCode);
-
- // Only relay back results when not canceled; otherwise stick around to
- // let the user pick another app/backend.
- if (requestCode == CODE_FORWARD && resultCode != RESULT_CANCELED) {
-
- // Remember that we last picked via external app
- final String packageName = getCallingPackageMaybeExtra();
- final ContentValues values = new ContentValues();
- values.put(ResumeColumns.EXTERNAL, 1);
- getContentResolver().insert(RecentsProvider.buildResume(packageName), values);
-
- // Pass back result to original caller
- setResult(resultCode, data);
- finish();
- } else {
- super.onActivityResult(requestCode, resultCode, data);
- }
- }
-
- @Override
- protected void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
- mDrawer.update();
- mNavigator.update();
- }
-
- @Override
- public String getDrawerTitle() {
- String title = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT);
- if (title == null) {
- if (mState.action == ACTION_OPEN ||
- mState.action == ACTION_GET_CONTENT ||
- mState.action == ACTION_OPEN_TREE) {
- title = getResources().getString(R.string.title_open);
- } else if (mState.action == ACTION_CREATE ||
- mState.action == ACTION_PICK_COPY_DESTINATION) {
- title = getResources().getString(R.string.title_save);
- } else {
- // If all else fails, just call it "Documents".
- title = getResources().getString(R.string.app_label);
- }
- }
-
- return title;
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
- mMenuManager.updateOptionMenu(menu, mDetails);
-
- final DocumentInfo cwd = getCurrentDirectory();
-
- if (mState.action == ACTION_CREATE) {
- final FragmentManager fm = getFragmentManager();
- SaveFragment.get(fm).prepareForDirectory(cwd);
- }
-
- return true;
- }
-
- @Override
- void refreshDirectory(int anim) {
- final FragmentManager fm = getFragmentManager();
- final RootInfo root = getCurrentRoot();
- final DocumentInfo cwd = getCurrentDirectory();
-
- if (cwd == null) {
- // No directory means recents
- if (mState.action == ACTION_CREATE ||
- mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_PICK_COPY_DESTINATION) {
- RecentsCreateFragment.show(fm);
- } else {
- DirectoryFragment.showRecentsOpen(fm, anim);
-
- // In recents we pick layout mode based on the mimetype,
- // picking GRID for visual types. We intentionally don't
- // consult a user's saved preferences here since they are
- // set per root (not per root and per mimetype).
- boolean visualMimes = MimePredicate.mimeMatches(
- MimePredicate.VISUAL_MIMES, mState.acceptMimes);
- mState.derivedMode = visualMimes ? State.MODE_GRID : State.MODE_LIST;
- }
- } else {
- // Normal boring directory
- DirectoryFragment.showDirectory(fm, root, cwd, anim);
- }
-
- // Forget any replacement target
- if (mState.action == ACTION_CREATE) {
- final SaveFragment save = SaveFragment.get(fm);
- if (save != null) {
- save.setReplaceTarget(null);
- }
- }
-
- if (mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_PICK_COPY_DESTINATION) {
- final PickFragment pick = PickFragment.get(fm);
- if (pick != null) {
- pick.setPickTarget(mState.action, mState.copyOperationSubType, cwd);
- }
- }
- }
-
- void onSaveRequested(DocumentInfo replaceTarget) {
- new ExistingFinishTask(this, replaceTarget.derivedUri)
- .executeOnExecutor(getExecutorForCurrentDirectory());
- }
-
- @Override
- void onDirectoryCreated(DocumentInfo doc) {
- assert(doc.isDirectory());
- openContainerDocument(doc);
- }
-
- void onSaveRequested(String mimeType, String displayName) {
- new CreateFinishTask(this, mimeType, displayName)
- .executeOnExecutor(getExecutorForCurrentDirectory());
- }
-
- @Override
- public void onDocumentPicked(DocumentInfo doc, Model model) {
- final FragmentManager fm = getFragmentManager();
- if (doc.isContainer()) {
- openContainerDocument(doc);
- } else if (mState.action == ACTION_OPEN || mState.action == ACTION_GET_CONTENT) {
- // Explicit file picked, return
- new ExistingFinishTask(this, doc.derivedUri)
- .executeOnExecutor(getExecutorForCurrentDirectory());
- } else if (mState.action == ACTION_CREATE) {
- // Replace selected file
- SaveFragment.get(fm).setReplaceTarget(doc);
- }
- }
-
- @Override
- public void onDocumentsPicked(List<DocumentInfo> docs) {
- if (mState.action == ACTION_OPEN || mState.action == ACTION_GET_CONTENT) {
- final int size = docs.size();
- final Uri[] uris = new Uri[size];
- for (int i = 0; i < size; i++) {
- uris[i] = docs.get(i).derivedUri;
- }
- new ExistingFinishTask(this, uris)
- .executeOnExecutor(getExecutorForCurrentDirectory());
- }
- }
-
- public void onPickRequested(DocumentInfo pickTarget) {
- Uri result;
- if (mState.action == ACTION_OPEN_TREE) {
- result = DocumentsContract.buildTreeDocumentUri(
- pickTarget.authority, pickTarget.documentId);
- } else if (mState.action == ACTION_PICK_COPY_DESTINATION) {
- result = pickTarget.derivedUri;
- } else {
- // Should not be reached.
- throw new IllegalStateException("Invalid mState.action.");
- }
- new PickFinishTask(this, result).executeOnExecutor(getExecutorForCurrentDirectory());
- }
-
- void writeStackToRecentsBlocking() {
- final ContentResolver resolver = getContentResolver();
- final ContentValues values = new ContentValues();
-
- final byte[] rawStack = DurableUtils.writeToArrayOrNull(mState.stack);
- if (mState.action == ACTION_CREATE ||
- mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_PICK_COPY_DESTINATION) {
- // Remember stack for last create
- values.clear();
- values.put(RecentColumns.KEY, mState.stack.buildKey());
- values.put(RecentColumns.STACK, rawStack);
- resolver.insert(RecentsProvider.buildRecent(), values);
- }
-
- // Remember location for next app launch
- final String packageName = getCallingPackageMaybeExtra();
- values.clear();
- values.put(ResumeColumns.STACK, rawStack);
- values.put(ResumeColumns.EXTERNAL, 0);
- resolver.insert(RecentsProvider.buildResume(packageName), values);
- }
-
- @Override
- void onTaskFinished(Uri... uris) {
- if (DEBUG) Log.d(TAG, "onFinished() " + Arrays.toString(uris));
-
- final Intent intent = new Intent();
- if (uris.length == 1) {
- intent.setData(uris[0]);
- } else if (uris.length > 1) {
- final ClipData clipData = new ClipData(
- null, mState.acceptMimes, new ClipData.Item(uris[0]));
- for (int i = 1; i < uris.length; i++) {
- clipData.addItem(new ClipData.Item(uris[i]));
- }
- intent.setClipData(clipData);
- }
-
- if (mState.action == ACTION_GET_CONTENT) {
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- } else if (mState.action == ACTION_OPEN_TREE) {
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
- | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
- | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
- | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
- } else if (mState.action == ACTION_PICK_COPY_DESTINATION) {
- // Picking a copy destination is only used internally by us, so we
- // don't need to extend permissions to the caller.
- intent.putExtra(Shared.EXTRA_STACK, (Parcelable) mState.stack);
- intent.putExtra(FileOperationService.EXTRA_OPERATION, mState.copyOperationSubType);
- } else {
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
- | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
- | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
- }
-
- setResult(Activity.RESULT_OK, intent);
- finish();
- }
-
-
- public static DocumentsActivity get(Fragment fragment) {
- return (DocumentsActivity) fragment.getActivity();
- }
-
- @Override
- public FragmentTuner createFragmentTuner() {
- // Currently DocumentsTuner maintains a state specific to the fragment instance. Because of
- // that, we create a new instance everytime it is needed
- return new DocumentsTuner(this, getDisplayState());
- }
-
- @Override
- public MenuManager getMenuManager() {
- return mMenuManager;
- }
-
- @Override
- public DirectoryDetails getDirectoryDetails() {
- return mDetails;
- }
-
- /**
- * Loads the last used path (stack) from Recents (history).
- * The path selected is based on the calling package name. So the last
- * path for an app like Gmail can be different than the last path
- * for an app like DropBox.
- */
- private static final class LoadLastUsedStackTask
- extends PairedTask<DocumentsActivity, Void, Void> {
-
- private volatile boolean mRestoredStack;
- private volatile boolean mExternal;
- private State mState;
-
- public LoadLastUsedStackTask(DocumentsActivity activity) {
- super(activity);
- mState = activity.mState;
- }
-
- @Override
- protected Void run(Void... params) {
- if (DEBUG && !mState.stack.isEmpty()) {
- Log.w(TAG, "Overwriting existing stack.");
- }
- RootsCache roots = DocumentsApplication.getRootsCache(mOwner);
-
- String packageName = mOwner.getCallingPackageMaybeExtra();
- Uri resumeUri = RecentsProvider.buildResume(packageName);
- Cursor cursor = mOwner.getContentResolver().query(resumeUri, null, null, null, null);
- try {
- if (cursor.moveToFirst()) {
- mExternal = cursor.getInt(cursor.getColumnIndex(ResumeColumns.EXTERNAL)) != 0;
- final byte[] rawStack = cursor.getBlob(
- cursor.getColumnIndex(ResumeColumns.STACK));
- DurableUtils.readFromArray(rawStack, mState.stack);
- mRestoredStack = true;
- }
- } catch (IOException e) {
- Log.w(TAG, "Failed to resume: " + e);
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- if (mRestoredStack) {
- // Update the restored stack to ensure we have freshest data
- final Collection<RootInfo> matchingRoots = roots.getMatchingRootsBlocking(mState);
- try {
- mState.stack.updateRoot(matchingRoots);
- mState.stack.updateDocuments(mOwner.getContentResolver());
- } catch (FileNotFoundException e) {
- Log.w(TAG, "Failed to restore stack for package: " + packageName
- + " because of error: "+ e);
- mState.stack.reset();
- mRestoredStack = false;
- }
- }
-
- return null;
- }
-
- @Override
- protected void finish(Void result) {
- mState.restored = true;
- mState.external = mExternal;
- mOwner.refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
- }
- }
-
- private static final class PickFinishTask extends PairedTask<DocumentsActivity, Void, Void> {
- private final Uri mUri;
-
- public PickFinishTask(DocumentsActivity activity, Uri uri) {
- super(activity);
- mUri = uri;
- }
-
- @Override
- protected Void run(Void... params) {
- mOwner.writeStackToRecentsBlocking();
- return null;
- }
-
- @Override
- protected void finish(Void result) {
- mOwner.onTaskFinished(mUri);
- }
- }
-
- private static final class ExistingFinishTask extends PairedTask<DocumentsActivity, Void, Void> {
- private final Uri[] mUris;
-
- public ExistingFinishTask(DocumentsActivity activity, Uri... uris) {
- super(activity);
- mUris = uris;
- }
-
- @Override
- protected Void run(Void... params) {
- mOwner.writeStackToRecentsBlocking();
- return null;
- }
-
- @Override
- protected void finish(Void result) {
- mOwner.onTaskFinished(mUris);
- }
- }
-
- /**
- * Task that creates a new document in the background.
- */
- private static final class CreateFinishTask extends PairedTask<DocumentsActivity, Void, Uri> {
- private final String mMimeType;
- private final String mDisplayName;
-
- public CreateFinishTask(DocumentsActivity activity, String mimeType, String displayName) {
- super(activity);
- mMimeType = mimeType;
- mDisplayName = displayName;
- }
-
- @Override
- protected void prepare() {
- mOwner.setPending(true);
- }
-
- @Override
- protected Uri run(Void... params) {
- final ContentResolver resolver = mOwner.getContentResolver();
- final DocumentInfo cwd = mOwner.getCurrentDirectory();
-
- ContentProviderClient client = null;
- Uri childUri = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(
- resolver, cwd.derivedUri.getAuthority());
- childUri = DocumentsContract.createDocument(
- client, cwd.derivedUri, mMimeType, mDisplayName);
- } catch (Exception e) {
- Log.w(TAG, "Failed to create document", e);
- } finally {
- ContentProviderClient.releaseQuietly(client);
- }
-
- if (childUri != null) {
- mOwner.writeStackToRecentsBlocking();
- }
-
- return childUri;
- }
-
- @Override
- protected void finish(Uri result) {
- if (result != null) {
- mOwner.onTaskFinished(result);
- } else {
- Snackbars.makeSnackbar(
- mOwner, R.string.save_error, Snackbar.LENGTH_SHORT).show();
- }
-
- mOwner.setPending(false);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
deleted file mode 100644
index 3d3902d..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.app.ActivityManager;
-import android.app.Application;
-import android.content.BroadcastReceiver;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.text.format.DateUtils;
-
-public class DocumentsApplication extends Application {
- private static final long PROVIDER_ANR_TIMEOUT = 20 * DateUtils.SECOND_IN_MILLIS;
-
- private RootsCache mRoots;
-
- private ThumbnailCache mThumbnailCache;
- private ClipStorage mClipStorage;
- private DocumentClipper mClipper;
-
- public static RootsCache getRootsCache(Context context) {
- return ((DocumentsApplication) context.getApplicationContext()).mRoots;
- }
-
- public static ThumbnailCache getThumbnailCache(Context context) {
- final DocumentsApplication app = (DocumentsApplication) context.getApplicationContext();
- return app.mThumbnailCache;
- }
-
- public static ContentProviderClient acquireUnstableProviderOrThrow(
- ContentResolver resolver, String authority) throws RemoteException {
- final ContentProviderClient client = resolver.acquireUnstableContentProviderClient(
- authority);
- if (client == null) {
- throw new RemoteException("Failed to acquire provider for " + authority);
- }
- client.setDetectNotResponding(PROVIDER_ANR_TIMEOUT);
- return client;
- }
-
- public static DocumentClipper getDocumentClipper(Context context) {
- return ((DocumentsApplication) context.getApplicationContext()).mClipper;
- }
-
- public static ClipStorage getClipStorage(Context context) {
- return ((DocumentsApplication) context.getApplicationContext()).mClipStorage;
- }
-
- @Override
- public void onCreate() {
- super.onCreate();
-
- final ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
- final int memoryClassBytes = am.getMemoryClass() * 1024 * 1024;
-
- mRoots = new RootsCache(this);
- mRoots.updateAsync(false);
-
- mThumbnailCache = new ThumbnailCache(memoryClassBytes / 4);
-
- mClipStorage = new ClipStorage(ClipStorage.prepareStorage(getCacheDir()));
- mClipper = new DocumentClipper(this, mClipStorage);
-
- final IntentFilter packageFilter = new IntentFilter();
- packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
- packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
- packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
- packageFilter.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED);
- packageFilter.addDataScheme("package");
- registerReceiver(mCacheReceiver, packageFilter);
-
- final IntentFilter localeFilter = new IntentFilter();
- localeFilter.addAction(Intent.ACTION_LOCALE_CHANGED);
- registerReceiver(mCacheReceiver, localeFilter);
- }
-
- @Override
- public void onTrimMemory(int level) {
- super.onTrimMemory(level);
-
- mThumbnailCache.onTrimMemory(level);
- }
-
- private BroadcastReceiver mCacheReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- final Uri data = intent.getData();
- if (data != null) {
- final String packageName = data.getSchemeSpecificPart();
- mRoots.updatePackageAsync(packageName);
- } else {
- mRoots.updateAsync(true);
- }
- }
- };
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java
deleted file mode 100644
index 9b07b49..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.State.ACTION_CREATE;
-import static com.android.documentsui.State.ACTION_GET_CONTENT;
-import static com.android.documentsui.State.ACTION_OPEN;
-import static com.android.documentsui.State.ACTION_OPEN_TREE;
-import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
-
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.documentsui.MenuManager.DirectoryDetails;
-
-final class DocumentsMenuManager extends MenuManager {
-
- private boolean mPicking;
-
- public DocumentsMenuManager(SearchViewManager searchManager, State displayState) {
- super(searchManager, displayState);
-
- mPicking = mState.action == ACTION_CREATE
- || mState.action == ACTION_OPEN_TREE
- || mState.action == ACTION_PICK_COPY_DESTINATION;
- }
-
- @Override
- public void updateOptionMenu(Menu menu, DirectoryDetails details) {
- super.updateOptionMenu(menu, details);
- if (mPicking) {
- // May already be hidden because the root
- // doesn't support search.
- mSearchManager.showMenu(false);
- }
- }
-
- @Override
- void updateModePicker(MenuItem grid, MenuItem list, DirectoryDetails directoryDetails) {
- // No display options in recent directories
- if (mPicking && directoryDetails.isInRecents()) {
- grid.setVisible(false);
- list.setVisible(false);
- } else {
- super.updateModePicker(grid, list, directoryDetails);
- }
- }
-
- @Override
- void updateFileSize(MenuItem fileSize, DirectoryDetails directoryDetails) {
- super.updateFileSize(fileSize, directoryDetails);
- fileSize.setVisible(fileSize.isVisible() && !mPicking);
- }
-
- @Override
- void updateSelectAll(MenuItem selectAll, SelectionDetails selectionDetails) {
- selectAll.setVisible(mState.allowMultiple);
- }
-
- @Override
- void updateCreateDir(MenuItem createDir, DirectoryDetails directoryDetails) {
- createDir.setVisible(mPicking);
- createDir.setEnabled(mPicking && directoryDetails.canCreateDirectory());
- }
-
- @Override
- void updateOpen(MenuItem open, SelectionDetails selectionDetails) {
- open.setVisible(mState.action == ACTION_GET_CONTENT
- || mState.action == ACTION_OPEN);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolbar.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolbar.java
deleted file mode 100644
index 7742cbf..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolbar.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MenuItem;
-import android.widget.Toolbar;
-
-/**
- * ToolBar of Documents UI.
- */
-public class DocumentsToolbar extends Toolbar {
- interface OnActionViewCollapsedListener {
- void onActionViewCollapsed();
- }
-
- private OnActionViewCollapsedListener mOnActionViewCollapsedListener;
-
- public DocumentsToolbar(Context context, AttributeSet attrs,
- int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- }
-
- public DocumentsToolbar(Context context, AttributeSet attrs,
- int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- public DocumentsToolbar(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public DocumentsToolbar(Context context) {
- super(context);
- }
-
- @Override
- public void collapseActionView() {
- super.collapseActionView();
- if (mOnActionViewCollapsedListener != null) {
- mOnActionViewCollapsedListener.onActionViewCollapsed();
- }
- }
-
- /**
- * Adds a listener that is invoked after collapsing the action view.
- * @param listener
- */
- public void setOnActionViewCollapsedListener(
- OnActionViewCollapsedListener listener) {
- mOnActionViewCollapsedListener = listener;
- }
-
- public MenuItem getSearchMenu() {
- return getMenu().findItem(R.id.menu_search);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java b/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java
deleted file mode 100644
index 97d459b..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.IntDef;
-import android.app.Activity;
-import android.support.annotation.ColorRes;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.DrawerLayout.DrawerListener;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toolbar;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * A facade over the various pieces comprising "roots fragment in a Drawer".
- *
- * @see DrawerController#create(DrawerLayout)
- */
-abstract class DrawerController implements DrawerListener {
- public static final String TAG = "DrawerController";
-
- // Drawer opening triggered by tapping the navigation icon
- public static final int OPENED_HAMBURGER = 0;
- // Drawer opening triggered by swiping right from the edge of the screen
- public static final int OPENED_SWIPE = 1;
- // Mostly programmatically forced drawer opening
- public static final int OPENED_OTHER = 2;
-
- @IntDef(flag = true, value = {
- OPENED_HAMBURGER,
- OPENED_SWIPE,
- OPENED_OTHER
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface Trigger {}
-
- /**
- * Toggles the drawer and sets the OPENED_OTHER as the action that causes opening the drawer.
- * @param open
- */
- abstract void setOpen(boolean open);
-
- /**
- * Toggles the drawer.
- * @param open
- * @param trigger Indicates what action caused opening the drawer. It is ignored for closing.
- */
- abstract void setOpen(boolean open, @Trigger int trigger);
- abstract boolean isPresent();
- abstract boolean isOpen();
- abstract void setTitle(String title);
- abstract void update();
-
- /**
- * Returns a controller suitable for {@code Layout}.
- */
- static DrawerController create(Activity activity) {
-
- DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout);
-
- if (layout == null) {
- return new DummyDrawerController();
- }
-
- View drawer = activity.findViewById(R.id.drawer_roots);
- Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar);
-
- drawer.getLayoutParams().width = calculateDrawerWidth(activity);
-
- ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
- activity,
- layout,
- R.drawable.ic_hamburger,
- R.string.drawer_open,
- R.string.drawer_close);
-
- return new RuntimeDrawerController(layout, drawer, toggle, toolbar);
- }
-
- /**
- * Returns a controller suitable for {@code Layout}.
- */
- static DrawerController createDummy() {
- return new DummyDrawerController();
- }
-
- private static int calculateDrawerWidth(Activity activity) {
- // Material design specification for navigation drawer:
- // https://www.google.com/design/spec/patterns/navigation-drawer.html
- float width = Display.screenWidth(activity) - Display.actionBarHeight(activity);
- float maxWidth = activity.getResources().getDimension(R.dimen.max_drawer_width);
- int finalWidth = (int) ((width > maxWidth ? maxWidth : width));
-
- if (DEBUG)
- Log.d(TAG, "Calculated drawer width:" + (finalWidth / Display.density(activity)));
-
- return finalWidth;
- }
-
- /**
- * Runtime controller that manages a real drawer.
- */
- private static final class RuntimeDrawerController extends DrawerController
- implements ItemDragListener.DragHost {
- private final ActionBarDrawerToggle mToggle;
- private DrawerLayout mLayout;
- private View mDrawer;
- private Toolbar mToolbar;
- private @Trigger int mTrigger = OPENED_OTHER;
-
- public RuntimeDrawerController(
- DrawerLayout layout, View drawer, ActionBarDrawerToggle toggle,
- Toolbar drawerToolbar) {
- mToolbar = drawerToolbar;
- assert(layout != null);
-
- mLayout = layout;
- mDrawer = drawer;
- mToggle = toggle;
-
- mLayout.setDrawerListener(this);
-
- View edge = layout.findViewById(R.id.drawer_edge);
- edge.setOnDragListener(new ItemDragListener<>(this));
- }
-
- @Override
- public void runOnUiThread(Runnable runnable) {
- mDrawer.post(runnable);
- }
-
- @Override
- public void setDropTargetHighlight(View v, boolean highlight) {
- assert (v.getId() == R.id.drawer_edge);
-
- @ColorRes int id = highlight ? R.color.item_doc_background_selected :
- android.R.color.transparent;
- v.setBackgroundColor(id);
- }
-
- @Override
- public void onViewHovered(View v) {
- assert (v.getId() == R.id.drawer_edge);
-
- setOpen(true);
- }
-
- @Override
- void setOpen(boolean open) {
- setOpen(open, OPENED_OTHER);
- }
-
- @Override
- void setOpen(boolean open, @Trigger int trigger) {
- if (open) {
- mLayout.openDrawer(mDrawer);
- mTrigger = trigger;
- } else {
- mLayout.closeDrawer(mDrawer);
- }
- }
-
- @Override
- boolean isOpen() {
- return mLayout.isDrawerOpen(mDrawer);
- }
-
- @Override
- boolean isPresent() {
- return true;
- }
-
- @Override
- void setTitle(String title) {
- mToolbar.setTitle(title);
- }
-
- @Override
- void update() {
- mToggle.syncState();
- }
-
- @Override
- public void onDrawerSlide(View drawerView, float slideOffset) {
- mToggle.onDrawerSlide(drawerView, slideOffset);
- }
-
- @Override
- public void onDrawerOpened(View drawerView) {
- mToggle.onDrawerOpened(drawerView);
- Metrics.logDrawerOpened(mToolbar.getContext(), mTrigger);
- }
-
- @Override
- public void onDrawerClosed(View drawerView) {
- mToggle.onDrawerClosed(drawerView);
- mTrigger = OPENED_OTHER;
- }
-
- @Override
- public void onDrawerStateChanged(int newState) {
- mToggle.onDrawerStateChanged(newState);
- if (newState == DrawerLayout.STATE_DRAGGING) {
- mTrigger = OPENED_SWIPE;
- }
- }
- }
-
- /*
- * Dummy controller useful with clients that don't host a real drawer.
- */
- private static final class DummyDrawerController extends DrawerController {
-
- @Override
- void setOpen(boolean open) {}
-
- @Override
- void setOpen(boolean open, @Trigger int trigger) {}
-
- @Override
- boolean isOpen() {
- return false;
- }
-
- @Override
- boolean isPresent() {
- return false;
- }
-
- @Override
- void setTitle(String title) {}
-
- @Override
- void update() {}
-
- @Override
- public void onDrawerSlide(View drawerView, float slideOffset) {}
-
- @Override
- public void onDrawerOpened(View drawerView) {}
-
- @Override
- public void onDrawerClosed(View drawerView) {}
-
- @Override
- public void onDrawerStateChanged(int newState) {}
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DropdownBreadcrumb.java b/packages/DocumentsUI/src/com/android/documentsui/DropdownBreadcrumb.java
deleted file mode 100644
index 71d7334..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/DropdownBreadcrumb.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.documentsui.NavigationViewManager.Breadcrumb;
-import com.android.documentsui.NavigationViewManager.Environment;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.RootInfo;
-
-import java.util.function.Consumer;
-
-/**
- * Dropdown implementation of breadcrumb used for phone device layouts
- */
-
-public final class DropdownBreadcrumb extends Spinner implements Breadcrumb {
-
- private DropdownAdapter mAdapter;
-
- public DropdownBreadcrumb(
- Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- }
-
- public DropdownBreadcrumb(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- public DropdownBreadcrumb(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public DropdownBreadcrumb(Context context) {
- super(context);
- }
-
- @Override
- public void setup(Environment env, State state, Consumer<Integer> listener) {
- mAdapter = new DropdownAdapter(state, env);
- setOnItemSelectedListener(
- new OnItemSelectedListener() {
- @Override
- public void onItemSelected(
- AdapterView<?> parent, View view, int position, long id) {
- listener.accept(position);
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> parent) {}
- });
- }
-
- @Override
- public void show(boolean visibility) {
- if (visibility) {
- setVisibility(VISIBLE);
- setAdapter(mAdapter);
- } else {
- setVisibility(GONE);
- setAdapter(null);
- }
- }
-
- @Override
- public void postUpdate() {
- setSelection(mAdapter.getCount() - 1, false);
- }
-
- private static final class DropdownAdapter extends BaseAdapter {
- private Environment mEnv;
- private State mState;
-
- public DropdownAdapter(State state, Environment env) {
- mState = state;
- mEnv = env;
- }
-
- @Override
- public int getCount() {
- return mState.stack.size();
- }
-
- @Override
- public DocumentInfo getItem(int position) {
- return mState.stack.get(mState.stack.size() - position - 1);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- if (convertView == null) {
- convertView = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.item_subdir_title, parent, false);
- }
-
- final TextView title = (TextView) convertView.findViewById(android.R.id.title);
- final DocumentInfo doc = getItem(position);
-
- if (position == 0) {
- final RootInfo root = mEnv.getCurrentRoot();
- title.setText(root.title);
- } else {
- title.setText(doc.displayName);
- }
-
- return convertView;
- }
-
- @Override
- public View getDropDownView(int position, View convertView, ViewGroup parent) {
- if (convertView == null) {
- convertView = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.item_subdir, parent, false);
- }
-
- final TextView title = (TextView) convertView.findViewById(android.R.id.title);
- final DocumentInfo doc = getItem(position);
-
- if (position == 0) {
- final RootInfo root = mEnv.getCurrentRoot();
- title.setText(root.title);
- } else {
- title.setText(doc.displayName);
- }
-
- return convertView;
- }
- }
-
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/EventListener.java b/packages/DocumentsUI/src/com/android/documentsui/EventListener.java
deleted file mode 100644
index c15e9a6..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/EventListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.net.Uri;
-import android.support.annotation.Nullable;
-
-public interface EventListener {
- /**
- * @param uri Uri navigated to. If recents, then null.
- */
- void onDirectoryNavigated(@Nullable Uri uri);
-
- /**
- * @param uri Uri of the loaded directory. If recents, then null.
- */
- void onDirectoryLoaded(@Nullable Uri uri);
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Events.java b/packages/DocumentsUI/src/com/android/documentsui/Events.java
deleted file mode 100644
index 1162923..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Events.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.graphics.Point;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.util.Pools;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-
-/**
- * Utility code for dealing with MotionEvents.
- */
-public final class Events {
-
- /**
- * Returns true if event was triggered by a mouse.
- */
- public static boolean isMouseEvent(MotionEvent e) {
- return isMouseType(e.getToolType(0));
- }
-
- /**
- * Returns true if event was triggered by a finger or stylus touch.
- */
- public static boolean isTouchEvent(MotionEvent e) {
- return isTouchType(e.getToolType(0));
- }
-
- /**
- * Returns true if event was triggered by a mouse.
- */
- public static boolean isMouseType(int toolType) {
- return toolType == MotionEvent.TOOL_TYPE_MOUSE;
- }
-
- /**
- * Returns true if event was triggered by a finger or stylus touch.
- */
- public static boolean isTouchType(int toolType) {
- return toolType == MotionEvent.TOOL_TYPE_FINGER
- || toolType == MotionEvent.TOOL_TYPE_STYLUS;
- }
-
- /**
- * Returns true if event was triggered by a finger or stylus touch.
- */
- public static boolean isActionDown(MotionEvent e) {
- return e.getActionMasked() == MotionEvent.ACTION_DOWN;
- }
-
- /**
- * Returns true if event was triggered by a finger or stylus touch.
- */
- public static boolean isActionUp(MotionEvent e) {
- return e.getActionMasked() == MotionEvent.ACTION_UP;
- }
-
- /**
- * Returns true if the shift is pressed.
- */
- public boolean isShiftPressed(MotionEvent e) {
- return hasShiftBit(e.getMetaState());
- }
-
- /**
- * Whether or not the given keyCode represents a navigation keystroke (e.g. up, down, home).
- *
- * @param keyCode
- * @return
- */
- public static boolean isNavigationKeyCode(int keyCode) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_UP:
- case KeyEvent.KEYCODE_DPAD_DOWN:
- case KeyEvent.KEYCODE_DPAD_LEFT:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- case KeyEvent.KEYCODE_MOVE_HOME:
- case KeyEvent.KEYCODE_MOVE_END:
- case KeyEvent.KEYCODE_PAGE_UP:
- case KeyEvent.KEYCODE_PAGE_DOWN:
- return true;
- default:
- return false;
- }
- }
-
-
- /**
- * Returns true if the "SHIFT" bit is set.
- */
- public static boolean hasShiftBit(int metaState) {
- return (metaState & KeyEvent.META_SHIFT_ON) != 0;
- }
-
- /**
- * A facade over MotionEvent primarily designed to permit for unit testing
- * of related code.
- */
- public interface InputEvent {
- boolean isMouseEvent();
- boolean isPrimaryButtonPressed();
- boolean isSecondaryButtonPressed();
- boolean isShiftKeyDown();
-
- /** Returns true if the action is the initial press of a mouse or touch. */
- boolean isActionDown();
-
- /** Returns true if the action is the final release of a mouse or touch. */
- boolean isActionUp();
-
- Point getOrigin();
- float getX();
- float getY();
-
- /** Returns true if the there is an item under the finger/cursor. */
- boolean isOverItem();
-
- /** Returns the adapter position of the item under the finger/cursor. */
- int getItemPosition();
- }
-
- public static final class MotionInputEvent implements InputEvent {
- private static final String TAG = "MotionInputEvent";
-
- private static final Pools.SimplePool<MotionInputEvent> sPool = new Pools.SimplePool<>(1);
-
- private MotionEvent mEvent;
- interface PositionProvider {
- int get(MotionEvent e);
- }
-
- private int mPosition;
-
- private MotionInputEvent() {
- if (DEBUG) Log.i(TAG, "Created a new instance.");
- }
-
- public static MotionInputEvent obtain(MotionEvent event, RecyclerView view) {
- Shared.checkMainLoop();
-
- MotionInputEvent instance = sPool.acquire();
- instance = (instance != null ? instance : new MotionInputEvent());
-
- instance.mEvent = event;
-
- // Consider determining position lazily as an optimization.
- View child = view.findChildViewUnder(event.getX(), event.getY());
- instance.mPosition = (child != null)
- ? view.getChildAdapterPosition(child)
- : RecyclerView.NO_POSITION;
-
- return instance;
- }
-
- public static MotionInputEvent obtain(
- MotionEvent event, PositionProvider positionProvider) {
- Shared.checkMainLoop();
-
- MotionInputEvent instance = sPool.acquire();
- instance = (instance != null ? instance : new MotionInputEvent());
-
- instance.mEvent = event;
- instance.mPosition = positionProvider.get(event);
-
- return instance;
- }
-
- public void recycle() {
- Shared.checkMainLoop();
-
- mEvent = null;
- mPosition = -1;
-
- boolean released = sPool.release(this);
- // This assert is used to guarantee we won't generate too many instances that can't be
- // held in the pool, which indicates our pool size is too small.
- //
- // Right now one instance is enough because we expect all instances are only used in
- // main thread.
- assert(released);
- }
-
- @Override
- public boolean isMouseEvent() {
- return Events.isMouseEvent(mEvent);
- }
-
- @Override
- public boolean isPrimaryButtonPressed() {
- return mEvent.isButtonPressed(MotionEvent.BUTTON_PRIMARY);
- }
-
- @Override
- public boolean isSecondaryButtonPressed() {
- return mEvent.isButtonPressed(MotionEvent.BUTTON_SECONDARY);
- }
-
- @Override
- public boolean isShiftKeyDown() {
- return Events.hasShiftBit(mEvent.getMetaState());
- }
-
- @Override
- public boolean isActionDown() {
- return mEvent.getActionMasked() == MotionEvent.ACTION_DOWN;
- }
-
- @Override
- public boolean isActionUp() {
- return mEvent.getActionMasked() == MotionEvent.ACTION_UP;
- }
-
- @Override
- public Point getOrigin() {
- return new Point((int) mEvent.getX(), (int) mEvent.getY());
- }
-
- @Override
- public float getX() {
- return mEvent.getX();
- }
-
- @Override
- public float getY() {
- return mEvent.getY();
- }
-
- @Override
- public boolean isOverItem() {
- return getItemPosition() != RecyclerView.NO_POSITION;
- }
-
- @Override
- public int getItemPosition() {
- return mPosition;
- }
-
- @Override
- public String toString() {
- return new StringBuilder()
- .append("MotionInputEvent {")
- .append("isMouseEvent=").append(isMouseEvent())
- .append(" isPrimaryButtonPressed=").append(isPrimaryButtonPressed())
- .append(" isSecondaryButtonPressed=").append(isSecondaryButtonPressed())
- .append(" isShiftKeyDown=").append(isShiftKeyDown())
- .append(" isActionDown=").append(isActionDown())
- .append(" isActionUp=").append(isActionUp())
- .append(" getOrigin=").append(getOrigin())
- .append(" isOverItem=").append(isOverItem())
- .append(" getItemPosition=").append(getItemPosition())
- .append("}")
- .toString();
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Files.java b/packages/DocumentsUI/src/com/android/documentsui/Files.java
deleted file mode 100644
index 38f98be..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Files.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import java.io.File;
-
-/**
- * Utility class for working with {@link File} instances.
- */
-public final class Files {
-
- private Files() {} // no initialization for utility classes.
-
- public static void deleteRecursively(File file) {
- if (file.exists()) {
- if (file.isDirectory()) {
- for (File child : file.listFiles()) {
- deleteRecursively(child);
- }
- }
- file.delete();
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
deleted file mode 100644
index f82bdf1..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.provider.DocumentsContract;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.documentsui.MenuManager.DirectoryDetails;
-import com.android.documentsui.OperationDialogFragment.DialogType;
-import com.android.documentsui.RecentsProvider.ResumeColumns;
-import com.android.documentsui.dirlist.AnimationView;
-import com.android.documentsui.dirlist.DirectoryFragment;
-import com.android.documentsui.dirlist.FragmentTuner;
-import com.android.documentsui.dirlist.FragmentTuner.FilesTuner;
-import com.android.documentsui.dirlist.Model;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.DurableUtils;
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.services.FileOperationService;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Standalone file management activity.
- */
-public class FilesActivity extends BaseActivity {
-
- public static final String TAG = "FilesActivity";
-
- // See comments where this const is referenced for details.
- private static final int DRAWER_NO_FIDDLE_DELAY = 1500;
-
- // Track the time we opened the drawer in response to back being pressed.
- // We use the time gap to figure out whether to close app or reopen the drawer.
- private long mDrawerLastFiddled;
- private DocumentClipper mClipper;
- private FilesMenuManager mMenuManager;
- private DirectoryDetails mDetails;
-
- public FilesActivity() {
- super(R.layout.files_activity, TAG);
- }
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- mClipper = DocumentsApplication.getDocumentClipper(this);
- mMenuManager = new FilesMenuManager(mSearchManager, getDisplayState());
- mDetails = new DirectoryDetails(this) {
- @Override
- public boolean hasItemsToPaste() {
- return mClipper.hasItemsToPaste();
- }
- };
-
- RootsFragment.show(getFragmentManager(), null);
-
- final Intent intent = getIntent();
- final Uri uri = intent.getData();
-
- if (mState.restored) {
- if (DEBUG) Log.d(TAG, "Stack already resolved for uri: " + intent.getData());
- } else if (!mState.stack.isEmpty()) {
- // If a non-empty stack is present in our state, it was read (presumably)
- // from EXTRA_STACK intent extra. In this case, we'll skip other means of
- // loading or restoring the stack (like URI).
- //
- // When restoring from a stack, if a URI is present, it should only ever be:
- // -- a launch URI: Launch URIs support sensible activity management,
- // but don't specify a real content target)
- // -- a fake Uri from notifications. These URIs have no authority (TODO: details).
- //
- // Any other URI is *sorta* unexpected...except when browsing an archive
- // in downloads.
- if(uri != null
- && uri.getAuthority() != null
- && !uri.equals(mState.stack.peek())
- && !LauncherActivity.isLaunchUri(uri)) {
- if (DEBUG) Log.w(TAG,
- "Launching with non-empty stack. Ignoring unexpected uri: " + uri);
- } else {
- if (DEBUG) Log.d(TAG, "Launching with non-empty stack.");
- }
- refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
- } else if (Intent.ACTION_VIEW.equals(intent.getAction())) {
- assert(uri != null);
- new OpenUriForViewTask(this).executeOnExecutor(
- ProviderExecutor.forAuthority(uri.getAuthority()), uri);
- } else if (DocumentsContract.isRootUri(this, uri)) {
- if (DEBUG) Log.d(TAG, "Launching with root URI.");
- // If we've got a specific root to display, restore that root using a dedicated
- // authority. That way a misbehaving provider won't result in an ANR.
- loadRoot(uri);
- } else {
- if (DEBUG) Log.d(TAG, "All other means skipped. Launching into default directory.");
- loadRoot(getDefaultRoot());
- }
-
- final @DialogType int dialogType = intent.getIntExtra(
- FileOperationService.EXTRA_DIALOG_TYPE, DIALOG_TYPE_UNKNOWN);
- // DialogFragment takes care of restoring the dialog on configuration change.
- // Only show it manually for the first time (icicle is null).
- if (icicle == null && dialogType != DIALOG_TYPE_UNKNOWN) {
- final int opType = intent.getIntExtra(
- FileOperationService.EXTRA_OPERATION,
- FileOperationService.OPERATION_COPY);
- final ArrayList<DocumentInfo> srcList =
- intent.getParcelableArrayListExtra(FileOperationService.EXTRA_SRC_LIST);
- OperationDialogFragment.show(
- getFragmentManager(),
- dialogType,
- srcList,
- mState.stack,
- opType);
- }
- }
-
- @Override
- void includeState(State state) {
- final Intent intent = getIntent();
-
- state.action = State.ACTION_BROWSE;
- state.allowMultiple = true;
-
- // Options specific to the DocumentsActivity.
- assert(!intent.hasExtra(Intent.EXTRA_LOCAL_ONLY));
-
- final DocumentStack stack = intent.getParcelableExtra(Shared.EXTRA_STACK);
- if (stack != null) {
- state.stack = stack;
- }
- }
-
- @Override
- protected void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
- // This check avoids a flicker from "Recents" to "Home".
- // Only update action bar at this point if there is an active
- // serach. Why? Because this avoid an early (undesired) load of
- // the recents root...which is the default root in other activities.
- // In Files app "Home" is the default, but it is loaded async.
- // update will be called once Home root is loaded.
- // Except while searching we need this call to ensure the
- // search bits get layed out correctly.
- if (mSearchManager.isSearching()) {
- mNavigator.update();
- }
- }
-
- @Override
- public void onResume() {
- super.onResume();
-
- final RootInfo root = getCurrentRoot();
-
- // If we're browsing a specific root, and that root went away, then we
- // have no reason to hang around.
- // TODO: Rather than just disappearing, maybe we should inform
- // the user what has happened, let them close us. Less surprising.
- if (mRoots.getRootBlocking(root.authority, root.rootId) == null) {
- finish();
- }
- }
-
- @Override
- public String getDrawerTitle() {
- Intent intent = getIntent();
- return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))
- ? intent.getStringExtra(Intent.EXTRA_TITLE)
- : getTitle().toString();
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
- mMenuManager.updateOptionMenu(menu, mDetails);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_create_dir:
- assert(canCreateDirectory());
- showCreateDirectoryDialog();
- break;
- case R.id.menu_new_window:
- createNewWindow();
- break;
- case R.id.menu_paste_from_clipboard:
- DirectoryFragment dir = getDirectoryFragment();
- if (dir != null) {
- dir.pasteFromClipboard();
- }
- break;
- default:
- return super.onOptionsItemSelected(item);
- }
- return true;
- }
-
- private void createNewWindow() {
- Metrics.logUserAction(this, Metrics.USER_ACTION_NEW_WINDOW);
-
- Intent intent = LauncherActivity.createLaunchIntent(this);
- intent.putExtra(Shared.EXTRA_STACK, (Parcelable) mState.stack);
-
- // With new multi-window mode we have to pick how we are launched.
- // By default we'd be launched in-place above the existing app.
- // By setting launch-to-side ActivityManager will open us to side.
- if (isInMultiWindowMode()) {
- intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
- }
-
- startActivity(intent);
- }
-
- @Override
- void refreshDirectory(int anim) {
- final FragmentManager fm = getFragmentManager();
- final RootInfo root = getCurrentRoot();
- final DocumentInfo cwd = getCurrentDirectory();
-
- assert(!mSearchManager.isSearching());
-
- if (cwd == null) {
- DirectoryFragment.showRecentsOpen(fm, anim);
- } else {
- // Normal boring directory
- DirectoryFragment.showDirectory(fm, root, cwd, anim);
- }
- }
-
- @Override
- public void onDocumentsPicked(List<DocumentInfo> docs) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void onDocumentPicked(DocumentInfo doc, Model model) {
- // Anything on downloads goes through the back through downloads manager
- // (that's the MANAGE_DOCUMENT bit).
- // This is done for two reasons:
- // 1) The file in question might be a failed/queued or otherwise have some
- // specialized download handling.
- // 2) For APKs, the download manager will add on some important security stuff
- // like origin URL.
- // All other files not on downloads, event APKs, would get no benefit from this
- // treatment, thusly the "isDownloads" check.
-
- // Launch MANAGE_DOCUMENTS only for the root level files, so it's not called for
- // files in archives. Also, if the activity is already browsing a ZIP from downloads,
- // then skip MANAGE_DOCUMENTS.
- final boolean isViewing = Intent.ACTION_VIEW.equals(getIntent().getAction());
- final boolean isInArchive = mState.stack.size() > 1;
- if (getCurrentRoot().isDownloads() && !isInArchive && !isViewing) {
- // First try managing the document; we expect manager to filter
- // based on authority, so we don't grant.
- final Intent manage = new Intent(DocumentsContract.ACTION_MANAGE_DOCUMENT);
- manage.setData(doc.derivedUri);
-
- try {
- startActivity(manage);
- return;
- } catch (ActivityNotFoundException ex) {
- // fall back to regular handling below.
- }
- }
-
- if (doc.isContainer()) {
- openContainerDocument(doc);
- } else {
- openDocument(doc, model);
- }
- }
-
- @Override
- public void springOpenDirectory(DocumentInfo doc) {
- assert(doc.isContainer());
- assert(!doc.isArchive());
- openContainerDocument(doc);
- }
-
- /**
- * Launches an intent to view the specified document.
- */
- private void openDocument(DocumentInfo doc, Model model) {
- Intent intent = new QuickViewIntentBuilder(
- getPackageManager(), getResources(), doc, model).build();
-
- if (intent != null) {
- // TODO: un-work around issue b/24963914. Should be fixed soon.
- try {
- startActivity(intent);
- return;
- } catch (SecurityException e) {
- // Carry on to regular view mode.
- Log.e(TAG, "Caught security error: " + e.getLocalizedMessage());
- }
- }
-
- // Fall back to traditional VIEW action...
- intent = new Intent(Intent.ACTION_VIEW);
- intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.setData(doc.derivedUri);
-
- if (DEBUG && intent.getClipData() != null) {
- Log.d(TAG, "Starting intent w/ clip data: " + intent.getClipData());
- }
-
- try {
- startActivity(intent);
- } catch (ActivityNotFoundException e) {
- Snackbars.makeSnackbar(
- this, R.string.toast_no_application, Snackbar.LENGTH_SHORT).show();
- }
- }
-
- @Override
- public boolean onKeyShortcut(int keyCode, KeyEvent event) {
- DirectoryFragment dir;
- // TODO: All key events should be statically bound using alphabeticShortcut.
- // But not working.
- switch (keyCode) {
- case KeyEvent.KEYCODE_A:
- dir = getDirectoryFragment();
- if (dir != null) {
- dir.selectAllFiles();
- }
- return true;
- case KeyEvent.KEYCODE_X:
- dir = getDirectoryFragment();
- if (dir != null) {
- dir.cutSelectedToClipboard();
- }
- return true;
- case KeyEvent.KEYCODE_C:
- dir = getDirectoryFragment();
- if (dir != null) {
- dir.copySelectedToClipboard();
- }
- return true;
- case KeyEvent.KEYCODE_V:
- dir = getDirectoryFragment();
- if (dir != null) {
- dir.pasteFromClipboard();
- }
- return true;
- default:
- return super.onKeyShortcut(keyCode, event);
- }
- }
-
- // Do some "do what a I want" drawer fiddling, but don't
- // do it if user already hit back recently and we recently
- // did some fiddling.
- @Override
- boolean onBeforePopDir() {
- int size = mState.stack.size();
-
- if (mDrawer.isPresent()
- && (System.currentTimeMillis() - mDrawerLastFiddled) > DRAWER_NO_FIDDLE_DELAY) {
- // Close drawer if it is open.
- if (mDrawer.isOpen()) {
- mDrawer.setOpen(false);
- mDrawerLastFiddled = System.currentTimeMillis();
- return true;
- }
-
- // Open the Close drawer if it is closed and we're at the top of a root.
- if (size <= 1) {
- mDrawer.setOpen(true);
- // Remember so we don't just close it again if back is pressed again.
- mDrawerLastFiddled = System.currentTimeMillis();
- return true;
- }
- }
-
- return false;
- }
-
- // Turns out only DocumentsActivity was ever calling saveStackBlocking.
- // There may be a case where we want to contribute entries from
- // Behavior here in FilesActivity, but it isn't yet obvious.
- // TODO: Contribute to recents, or remove this.
- void writeStackToRecentsBlocking() {
- final ContentResolver resolver = getContentResolver();
- final ContentValues values = new ContentValues();
-
- final byte[] rawStack = DurableUtils.writeToArrayOrNull(mState.stack);
-
- // Remember location for next app launch
- final String packageName = getCallingPackageMaybeExtra();
- values.clear();
- values.put(ResumeColumns.STACK, rawStack);
- values.put(ResumeColumns.EXTERNAL, 0);
- resolver.insert(RecentsProvider.buildResume(packageName), values);
- }
-
- @Override
- void onTaskFinished(Uri... uris) {
- if (DEBUG) Log.d(TAG, "onFinished() " + Arrays.toString(uris));
-
- final Intent intent = new Intent();
- if (uris.length == 1) {
- intent.setData(uris[0]);
- } else if (uris.length > 1) {
- final ClipData clipData = new ClipData(
- null, mState.acceptMimes, new ClipData.Item(uris[0]));
- for (int i = 1; i < uris.length; i++) {
- clipData.addItem(new ClipData.Item(uris[i]));
- }
- intent.setClipData(clipData);
- }
-
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
- | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
- | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
-
- setResult(Activity.RESULT_OK, intent);
- finish();
- }
-
- @Override
- public FragmentTuner createFragmentTuner() {
- return new FilesTuner(this, getDisplayState());
- }
-
- @Override
- public MenuManager getMenuManager() {
- return mMenuManager;
- }
-
- @Override
- public DirectoryDetails getDirectoryDetails() {
- return mDetails;
- }
-
- /**
- * Builds a stack for the specific Uris. Multi roots are not supported, as it's impossible
- * to know which root to select. Also, the stack doesn't contain intermediate directories.
- * It's primarly used for opening ZIP archives from Downloads app.
- */
- private static final class OpenUriForViewTask extends PairedTask<FilesActivity, Uri, Void> {
-
- private final State mState;
- public OpenUriForViewTask(FilesActivity activity) {
- super(activity);
- mState = activity.mState;
- }
-
- @Override
- public Void run(Uri... params) {
- final Uri uri = params[0];
-
- final RootsCache rootsCache = DocumentsApplication.getRootsCache(mOwner);
- final String authority = uri.getAuthority();
-
- final Collection<RootInfo> roots =
- rootsCache.getRootsForAuthorityBlocking(authority);
- if (roots.isEmpty()) {
- Log.e(TAG, "Failed to find root for the requested Uri: " + uri);
- return null;
- }
-
- final RootInfo root = roots.iterator().next();
- mState.stack.root = root;
- try {
- mState.stack.add(DocumentInfo.fromUri(mOwner.getContentResolver(), uri));
- } catch (FileNotFoundException e) {
- Log.e(TAG, "Failed to resolve DocumentInfo from Uri: " + uri);
- }
- mState.stack.add(mOwner.getRootDocumentBlocking(root));
- return null;
- }
-
- @Override
- public void finish(Void result) {
- mOwner.refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java b/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
deleted file mode 100644
index 78d95f6..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.State.ACTION_CREATE;
-import static com.android.documentsui.State.ACTION_GET_CONTENT;
-import static com.android.documentsui.State.ACTION_OPEN;
-import static com.android.documentsui.State.ACTION_OPEN_TREE;
-import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
-
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.documentsui.MenuManager.DirectoryDetails;
-
-final class FilesMenuManager extends MenuManager {
-
- public FilesMenuManager(SearchViewManager searchManager, State displayState) {
- super(searchManager, displayState);
- }
-
- @Override
- public void updateOptionMenu(Menu menu, DirectoryDetails details) {
- super.updateOptionMenu(menu, details);
-
- // It hides icon if searching in progress
- mSearchManager.updateMenu();
- }
-
- @Override
- void updateSettings(MenuItem settings, DirectoryDetails directoryDetails) {
- settings.setVisible(directoryDetails.hasRootSettings());
- }
-
- @Override
- void updateNewWindow(MenuItem newWindow, DirectoryDetails directoryDetails) {
- newWindow.setVisible(directoryDetails.shouldShowFancyFeatures());
- }
-
- @Override
- void updateMoveTo(MenuItem moveTo, SelectionDetails selectionDetails) {
- moveTo.setVisible(true);
- moveTo.setEnabled(!selectionDetails.containsPartialFiles() && selectionDetails.canDelete());
- }
-
- @Override
- void updateCopyTo(MenuItem copyTo, SelectionDetails selectionDetails) {
- copyTo.setVisible(true);
- copyTo.setEnabled(!selectionDetails.containsPartialFiles());
- }
-
- @Override
- void updateSelectAll(MenuItem selectAll, SelectionDetails selectionDetails) {
- selectAll.setVisible(true);
- }
-
- @Override
- void updateCreateDir(MenuItem createDir, DirectoryDetails directoryDetails) {
- createDir.setVisible(true);
- createDir.setEnabled(directoryDetails.canCreateDirectory());
- }
-
- @Override
- void updateShare(MenuItem share, SelectionDetails selectionDetails) {
- share.setVisible(!selectionDetails.containsDirectories()
- && !selectionDetails.containsPartialFiles());
- }
-
- @Override
- void updateDelete(MenuItem delete, SelectionDetails selectionDetails) {
- delete.setVisible(selectionDetails.canDelete());
- }
-
- @Override
- void updateRename(MenuItem rename, SelectionDetails selectionDetails) {
- rename.setVisible(true);
- rename.setEnabled(!selectionDetails.containsPartialFiles() && selectionDetails.canRename());
- }
-}
\ No newline at end of file
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilteringCursorWrapper.java b/packages/DocumentsUI/src/com/android/documentsui/FilteringCursorWrapper.java
deleted file mode 100644
index 7426af5..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/FilteringCursorWrapper.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.TAG;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.database.AbstractCursor;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.DocumentsContract.Document;
-import android.util.Log;
-
-/**
- * Cursor wrapper that filters MIME types not matching given list.
- */
-public class FilteringCursorWrapper extends AbstractCursor {
- private final Cursor mCursor;
-
- private final int[] mPosition;
- private int mCount;
-
- public FilteringCursorWrapper(Cursor cursor, String[] acceptMimes) {
- this(cursor, acceptMimes, null, Long.MIN_VALUE);
- }
-
- public FilteringCursorWrapper(Cursor cursor, String[] acceptMimes, String[] rejectMimes) {
- this(cursor, acceptMimes, rejectMimes, Long.MIN_VALUE);
- }
-
- public FilteringCursorWrapper(
- Cursor cursor, String[] acceptMimes, String[] rejectMimes, long rejectBefore) {
- mCursor = cursor;
-
- final int count = cursor.getCount();
- mPosition = new int[count];
-
- cursor.moveToPosition(-1);
- while (cursor.moveToNext() && mCount < count) {
- final String mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final long lastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED);
- if (rejectMimes != null && MimePredicate.mimeMatches(rejectMimes, mimeType)) {
- continue;
- }
- if (lastModified < rejectBefore) {
- continue;
- }
- if (MimePredicate.mimeMatches(acceptMimes, mimeType)) {
- mPosition[mCount++] = cursor.getPosition();
- }
- }
-
- if (DEBUG && mCount != cursor.getCount()) {
- Log.d(TAG, "Before filtering " + cursor.getCount() + ", after " + mCount);
- }
- }
-
- @Override
- public Bundle getExtras() {
- return mCursor.getExtras();
- }
-
- @Override
- public void close() {
- super.close();
- mCursor.close();
- }
-
- @Override
- public boolean onMove(int oldPosition, int newPosition) {
- return mCursor.moveToPosition(mPosition[newPosition]);
- }
-
- @Override
- public String[] getColumnNames() {
- return mCursor.getColumnNames();
- }
-
- @Override
- public int getCount() {
- return mCount;
- }
-
- @Override
- public double getDouble(int column) {
- return mCursor.getDouble(column);
- }
-
- @Override
- public float getFloat(int column) {
- return mCursor.getFloat(column);
- }
-
- @Override
- public int getInt(int column) {
- return mCursor.getInt(column);
- }
-
- @Override
- public long getLong(int column) {
- return mCursor.getLong(column);
- }
-
- @Override
- public short getShort(int column) {
- return mCursor.getShort(column);
- }
-
- @Override
- public String getString(int column) {
- return mCursor.getString(column);
- }
-
- @Override
- public int getType(int column) {
- return mCursor.getType(column);
- }
-
- @Override
- public boolean isNull(int column) {
- return mCursor.isNull(column);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/GridItemThumbnail.java b/packages/DocumentsUI/src/com/android/documentsui/GridItemThumbnail.java
deleted file mode 100644
index 38d6d72..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/GridItemThumbnail.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-/**
- * Ensures that grid thumbnails are always square.
- */
-public class GridItemThumbnail extends ImageView {
- public GridItemThumbnail(Context context) {
- super(context);
- }
-
- public GridItemThumbnail(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public GridItemThumbnail(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- @Override
- public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- // Grid layout uses item width to figure out the number of columns, then dynamically fits
- // rows into the view. The upshot of this is that changing the item width will mess up the
- // grid layout - so to make the items square, throw out the height and use the width for
- // both dimensions. The grid layout will correctly adjust the row height.
- //
- // Note that this code will need to be changed if the layout manager's orientation is
- // changed from VERTICAL to HORIZONTAL.
- super.onMeasure(widthMeasureSpec, widthMeasureSpec);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java b/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java
deleted file mode 100644
index 9f6b79b..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.documentsui.NavigationViewManager.Breadcrumb;
-import com.android.documentsui.NavigationViewManager.Environment;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.RootInfo;
-
-import java.util.function.Consumer;
-
-/**
- * Horizontal implementation of breadcrumb used for tablet / desktop device layouts
- */
-public final class HorizontalBreadcrumb extends RecyclerView implements Breadcrumb {
-
- private LinearLayoutManager mLayoutManager;
- private BreadcrumbAdapter mAdapter;
- private Consumer<Integer> mListener;
-
- public HorizontalBreadcrumb(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- public HorizontalBreadcrumb(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public HorizontalBreadcrumb(Context context) {
- super(context);
- }
-
- @Override
- public void setup(Environment env,
- com.android.documentsui.State state,
- Consumer<Integer> listener) {
-
- mListener = listener;
- mLayoutManager = new LinearLayoutManager(
- getContext(), LinearLayoutManager.HORIZONTAL, false);
- mAdapter = new BreadcrumbAdapter(state, env);
-
- setLayoutManager(mLayoutManager);
- addOnItemTouchListener(new ClickListener(getContext(), this::onSingleTapUp));
- }
-
- @Override
- public void show(boolean visibility) {
- if (visibility) {
- setVisibility(VISIBLE);
- setAdapter(mAdapter);
- mLayoutManager.scrollToPosition(mAdapter.getItemCount() - 1);
- } else {
- setVisibility(GONE);
- setAdapter(null);
- }
- }
-
- @Override
- public void postUpdate() {
- }
-
- private void onSingleTapUp(MotionEvent e) {
- View itemView = findChildViewUnder(e.getX(), e.getY());
- int pos = getChildAdapterPosition(itemView);
- if (pos != mAdapter.getItemCount() - 1) {
- mListener.accept(pos);
- }
- }
-
- private static final class BreadcrumbAdapter
- extends RecyclerView.Adapter<BreadcrumbHolder> {
-
- private Environment mEnv;
- private com.android.documentsui.State mState;
-
- public BreadcrumbAdapter(com.android.documentsui.State state, Environment env) {
- mState = state;
- mEnv = env;
- }
-
- @Override
- public BreadcrumbHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View v = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.navigation_breadcrumb_item, null);
- return new BreadcrumbHolder(v);
- }
-
- @Override
- public void onBindViewHolder(BreadcrumbHolder holder, int position) {
- final DocumentInfo doc = getItem(position);
-
- if (position == 0) {
- final RootInfo root = mEnv.getCurrentRoot();
- holder.title.setText(root.title);
- } else {
- holder.title.setText(doc.displayName);
- }
-
- if (position == getItemCount() - 1) {
- holder.arrow.setVisibility(View.GONE);
- }
- }
-
- private DocumentInfo getItem(int position) {
- return mState.stack.get(mState.stack.size() - position - 1);
- }
-
- @Override
- public int getItemCount() {
- return mState.stack.size();
- }
- }
-
- private static class BreadcrumbHolder extends RecyclerView.ViewHolder {
-
- protected TextView title;
- protected ImageView arrow;
-
- public BreadcrumbHolder(View itemView) {
- super(itemView);
- title = (TextView) itemView.findViewById(R.id.breadcrumb_text);
- arrow = (ImageView) itemView.findViewById(R.id.breadcrumb_arrow);
- }
- }
-
- private static final class ClickListener extends GestureDetector
- implements OnItemTouchListener {
-
- public ClickListener(Context context, Consumer<MotionEvent> listener) {
- super(context, new SimpleOnGestureListener() {
- @Override
- public boolean onSingleTapUp(MotionEvent e) {
- listener.accept(e);
- return true;
- }
- });
- }
-
- @Override
- public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
- onTouchEvent(e);
- return false;
- }
-
- @Override
- public void onTouchEvent(RecyclerView rv, MotionEvent e) {
- onTouchEvent(e);
- }
-
- @Override
- public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
deleted file mode 100644
index c28fae8..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
-import android.graphics.drawable.Drawable;
-import android.provider.DocumentsContract.Document;
-import android.util.TypedValue;
-
-import java.util.HashMap;
-
-public class IconUtils {
-
- private static HashMap<String, Integer> sMimeIcons = new HashMap<>();
-
- private static void add(String mimeType, int resId) {
- if (sMimeIcons.put(mimeType, resId) != null) {
- throw new RuntimeException(mimeType + " already registered!");
- }
- }
-
- static {
- int icon;
-
- // Package
- icon = R.drawable.ic_doc_apk;
- add("application/vnd.android.package-archive", icon);
-
- // Audio
- icon = R.drawable.ic_doc_audio;
- add("application/ogg", icon);
- add("application/x-flac", icon);
-
- // Certificate
- icon = R.drawable.ic_doc_certificate;
- add("application/pgp-keys", icon);
- add("application/pgp-signature", icon);
- add("application/x-pkcs12", icon);
- add("application/x-pkcs7-certreqresp", icon);
- add("application/x-pkcs7-crl", icon);
- add("application/x-x509-ca-cert", icon);
- add("application/x-x509-user-cert", icon);
- add("application/x-pkcs7-certificates", icon);
- add("application/x-pkcs7-mime", icon);
- add("application/x-pkcs7-signature", icon);
-
- // Source code
- icon = R.drawable.ic_doc_codes;
- add("application/rdf+xml", icon);
- add("application/rss+xml", icon);
- add("application/x-object", icon);
- add("application/xhtml+xml", icon);
- add("text/css", icon);
- add("text/html", icon);
- add("text/xml", icon);
- add("text/x-c++hdr", icon);
- add("text/x-c++src", icon);
- add("text/x-chdr", icon);
- add("text/x-csrc", icon);
- add("text/x-dsrc", icon);
- add("text/x-csh", icon);
- add("text/x-haskell", icon);
- add("text/x-java", icon);
- add("text/x-literate-haskell", icon);
- add("text/x-pascal", icon);
- add("text/x-tcl", icon);
- add("text/x-tex", icon);
- add("application/x-latex", icon);
- add("application/x-texinfo", icon);
- add("application/atom+xml", icon);
- add("application/ecmascript", icon);
- add("application/json", icon);
- add("application/javascript", icon);
- add("application/xml", icon);
- add("text/javascript", icon);
- add("application/x-javascript", icon);
-
- // Compressed
- icon = R.drawable.ic_doc_compressed;
- add("application/mac-binhex40", icon);
- add("application/rar", icon);
- add("application/zip", icon);
- add("application/x-apple-diskimage", icon);
- add("application/x-debian-package", icon);
- add("application/x-gtar", icon);
- add("application/x-iso9660-image", icon);
- add("application/x-lha", icon);
- add("application/x-lzh", icon);
- add("application/x-lzx", icon);
- add("application/x-stuffit", icon);
- add("application/x-tar", icon);
- add("application/x-webarchive", icon);
- add("application/x-webarchive-xml", icon);
- add("application/gzip", icon);
- add("application/x-7z-compressed", icon);
- add("application/x-deb", icon);
- add("application/x-rar-compressed", icon);
-
- // Contact
- icon = R.drawable.ic_doc_contact;
- add("text/x-vcard", icon);
- add("text/vcard", icon);
-
- // Event
- icon = R.drawable.ic_doc_event;
- add("text/calendar", icon);
- add("text/x-vcalendar", icon);
-
- // Font
- icon = R.drawable.ic_doc_font;
- add("application/x-font", icon);
- add("application/font-woff", icon);
- add("application/x-font-woff", icon);
- add("application/x-font-ttf", icon);
-
- // Image
- icon = R.drawable.ic_doc_image;
- add("application/vnd.oasis.opendocument.graphics", icon);
- add("application/vnd.oasis.opendocument.graphics-template", icon);
- add("application/vnd.oasis.opendocument.image", icon);
- add("application/vnd.stardivision.draw", icon);
- add("application/vnd.sun.xml.draw", icon);
- add("application/vnd.sun.xml.draw.template", icon);
-
- // PDF
- icon = R.drawable.ic_doc_pdf;
- add("application/pdf", icon);
-
- // Presentation
- icon = R.drawable.ic_doc_presentation;
- add("application/vnd.stardivision.impress", icon);
- add("application/vnd.sun.xml.impress", icon);
- add("application/vnd.sun.xml.impress.template", icon);
- add("application/x-kpresenter", icon);
- add("application/vnd.oasis.opendocument.presentation", icon);
-
- // Spreadsheet
- icon = R.drawable.ic_doc_spreadsheet;
- add("application/vnd.oasis.opendocument.spreadsheet", icon);
- add("application/vnd.oasis.opendocument.spreadsheet-template", icon);
- add("application/vnd.stardivision.calc", icon);
- add("application/vnd.sun.xml.calc", icon);
- add("application/vnd.sun.xml.calc.template", icon);
- add("application/x-kspread", icon);
-
- // Document
- icon = R.drawable.ic_doc_document;
- add("application/vnd.oasis.opendocument.text", icon);
- add("application/vnd.oasis.opendocument.text-master", icon);
- add("application/vnd.oasis.opendocument.text-template", icon);
- add("application/vnd.oasis.opendocument.text-web", icon);
- add("application/vnd.stardivision.writer", icon);
- add("application/vnd.stardivision.writer-global", icon);
- add("application/vnd.sun.xml.writer", icon);
- add("application/vnd.sun.xml.writer.global", icon);
- add("application/vnd.sun.xml.writer.template", icon);
- add("application/x-abiword", icon);
- add("application/x-kword", icon);
-
- // Video
- icon = R.drawable.ic_doc_video;
- add("application/x-quicktimeplayer", icon);
- add("application/x-shockwave-flash", icon);
-
- // Word
- icon = R.drawable.ic_doc_word;
- add("application/msword", icon);
- add("application/vnd.openxmlformats-officedocument.wordprocessingml.document", icon);
- add("application/vnd.openxmlformats-officedocument.wordprocessingml.template", icon);
-
- // Excel
- icon = R.drawable.ic_doc_excel;
- add("application/vnd.ms-excel", icon);
- add("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", icon);
- add("application/vnd.openxmlformats-officedocument.spreadsheetml.template", icon);
-
- // Powerpoint
- icon = R.drawable.ic_doc_powerpoint;
- add("application/vnd.ms-powerpoint", icon);
- add("application/vnd.openxmlformats-officedocument.presentationml.presentation", icon);
- add("application/vnd.openxmlformats-officedocument.presentationml.template", icon);
- add("application/vnd.openxmlformats-officedocument.presentationml.slideshow", icon);
- }
-
- public static Drawable loadPackageIcon(Context context, String authority, int icon) {
- if (icon != 0) {
- if (authority != null) {
- final PackageManager pm = context.getPackageManager();
- final ProviderInfo info = pm.resolveContentProvider(authority, 0);
- if (info != null) {
- return pm.getDrawable(info.packageName, icon, info.applicationInfo);
- }
- } else {
- return context.getDrawable(icon);
- }
- }
- return null;
- }
-
- public static Drawable loadMimeIcon(
- Context context, String mimeType, String authority, String docId, int mode) {
- if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- // TODO: eventually move these hacky assets into that package
- if ("com.android.providers.media.documents".equals(authority)
- && docId.startsWith("album")) {
- return context.getDrawable(R.drawable.ic_doc_album);
- }
-
- if (mode == State.MODE_GRID) {
- return context.getDrawable(R.drawable.ic_grid_folder);
- } else {
- return context.getDrawable(R.drawable.ic_doc_folder);
- }
- }
-
- return loadMimeIcon(context, mimeType);
- }
-
- public static Drawable loadMimeIcon(Context context, String mimeType) {
- if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- return context.getDrawable(R.drawable.ic_doc_folder);
- }
-
- // Look for exact match first
- Integer resId = sMimeIcons.get(mimeType);
- if (resId != null) {
- return context.getDrawable(resId);
- }
-
- if (mimeType == null) {
- // TODO: generic icon?
- return null;
- }
-
- // Otherwise look for partial match
- final String typeOnly = mimeType.split("/")[0];
- if ("audio".equals(typeOnly)) {
- return context.getDrawable(R.drawable.ic_doc_audio);
- } else if ("image".equals(typeOnly)) {
- return context.getDrawable(R.drawable.ic_doc_image);
- } else if ("text".equals(typeOnly)) {
- return context.getDrawable(R.drawable.ic_doc_text);
- } else if ("video".equals(typeOnly)) {
- return context.getDrawable(R.drawable.ic_doc_video);
- } else {
- return context.getDrawable(R.drawable.ic_doc_generic);
- }
- }
-
- public static Drawable applyTintColor(Context context, int drawableId, int tintColorId) {
- final Drawable icon = context.getDrawable(drawableId);
- icon.mutate();
- icon.setTintList(context.getColorStateList(tintColorId));
- return icon;
- }
-
- public static Drawable applyTintAttr(Context context, int drawableId, int tintAttrId) {
- final TypedValue outValue = new TypedValue();
- context.getTheme().resolveAttribute(tintAttrId, outValue, true);
- return applyTintColor(context, drawableId, outValue.resourceId);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ItemDragListener.java b/packages/DocumentsUI/src/com/android/documentsui/ItemDragListener.java
deleted file mode 100644
index 66b94fc..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/ItemDragListener.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.ClipData;
-import android.graphics.drawable.Drawable;
-import android.util.Log;
-import android.view.DragEvent;
-import android.view.View;
-import android.view.View.OnDragListener;
-import android.view.ViewConfiguration;
-
-import com.android.documentsui.ItemDragListener.DragHost;
-import com.android.internal.annotations.VisibleForTesting;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * An {@link OnDragListener} that adds support for "spring loading views". Use this when you want
- * items to pop-open when user hovers on them during a drag n drop.
- */
-public class ItemDragListener<H extends DragHost> implements OnDragListener {
-
- private static final String TAG = "ItemDragListener";
-
- @VisibleForTesting
- static final int SPRING_TIMEOUT = ViewConfiguration.getLongPressTimeout();
-
- protected final H mDragHost;
- private final Timer mHoverTimer;
-
- public ItemDragListener(H dragHost) {
- this(dragHost, new Timer());
- }
-
- @VisibleForTesting
- protected ItemDragListener(H dragHost, Timer timer) {
- mDragHost = dragHost;
- mHoverTimer = timer;
- }
-
- @Override
- public boolean onDrag(final View v, DragEvent event) {
- switch (event.getAction()) {
- case DragEvent.ACTION_DRAG_STARTED:
- return true;
- case DragEvent.ACTION_DRAG_ENTERED:
- handleEnteredEvent(v);
- return true;
- case DragEvent.ACTION_DRAG_LOCATION:
- handleLocationEvent(v, event.getX(), event.getY());
- return true;
- case DragEvent.ACTION_DRAG_EXITED:
- case DragEvent.ACTION_DRAG_ENDED:
- handleExitedEndedEvent(v);
- return true;
- case DragEvent.ACTION_DROP:
- return handleDropEvent(v, event);
- }
-
- return false;
- }
-
- private void handleEnteredEvent(View v) {
- mDragHost.setDropTargetHighlight(v, true);
-
- TimerTask task = createOpenTask(v);
- assert (task != null);
- v.setTag(R.id.drag_hovering_tag, task);
- mHoverTimer.schedule(task, ViewConfiguration.getLongPressTimeout());
- }
-
- private void handleLocationEvent(View v, float x, float y) {
- Drawable background = v.getBackground();
- if (background != null) {
- background.setHotspot(x, y);
- }
- }
-
- private void handleExitedEndedEvent(View v) {
- mDragHost.setDropTargetHighlight(v, false);
-
- TimerTask task = (TimerTask) v.getTag(R.id.drag_hovering_tag);
- if (task != null) {
- task.cancel();
- }
- }
-
- private boolean handleDropEvent(View v, DragEvent event) {
- ClipData clipData = event.getClipData();
- if (clipData == null) {
- Log.w(TAG, "Received invalid drop event with null clipdata. Ignoring.");
- return false;
- }
-
- return handleDropEventChecked(v, event);
- }
-
- @VisibleForTesting
- TimerTask createOpenTask(final View v) {
- TimerTask task = new TimerTask() {
- @Override
- public void run() {
- mDragHost.runOnUiThread(() -> {
- mDragHost.onViewHovered(v);
- });
- }
- };
- return task;
- }
-
- /**
- * Handles a drop event. Override it if you want to do something on drop event. It's called when
- * {@link DragEvent#ACTION_DROP} happens. ClipData in DragEvent is guaranteed not null.
- *
- * @param v The view where user drops.
- * @param event the drag event.
- * @return true if this event is consumed; false otherwise
- */
- public boolean handleDropEventChecked(View v, DragEvent event) {
- return false; // we didn't handle the drop
- }
-
- /**
- * An interface {@link ItemDragListener} uses to make some callbacks.
- */
- public interface DragHost {
-
- /**
- * Runs this runnable in main thread.
- */
- void runOnUiThread(Runnable runnable);
-
- /**
- * Highlights/unhighlights the view to visually indicate this view is being hovered.
- * @param v the view being hovered
- * @param highlight true if highlight the view; false if unhighlight it
- */
- void setDropTargetHighlight(View v, boolean highlight);
-
- /**
- * Notifies hovering timeout has elapsed
- * @param v the view being hovered
- */
- void onViewHovered(View v);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java b/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java
deleted file mode 100644
index 5e27e78..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.AppTask;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * Provides FilesActivity task grouping support. This allows multiple FilesActivities to be
- * launched (a behavior imparted by way of {@code documentLaunchMode="intoExisting"} and
- * our use of pseudo document {@link Uri}s. This also lets us move an existing task
- * to the foreground when a suitable task exists.
- *
- * Requires that {@code documentLaunchMode="intoExisting"} be set on target activity.
- *
- */
-public class LauncherActivity extends Activity {
-
- private static final String LAUNCH_CONTROL_AUTHORITY = "com.android.documentsui.launchControl";
- private static final String TAG = "LauncherActivity";
-
- // Array of boolean extras that should be copied when creating new launch intents.
- // Missing intents will be ignored.
- private static final String[] PERSISTENT_BOOLEAN_EXTRAS = {
- DocumentsContract.EXTRA_SHOW_FILESIZE,
- DocumentsContract.EXTRA_SHOW_ADVANCED,
- DocumentsContract.EXTRA_FANCY_FEATURES,
- Shared.EXTRA_PRODUCTIVITY_MODE
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- ActivityManager activities = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
-
- Intent intent = findTask(activities);
- if (intent != null) {
- restoreTask(intent);
- } else {
- startTask();
- }
-
- finish();
- }
-
- private @Nullable Intent findTask(ActivityManager activities) {
- List<AppTask> tasks = activities.getAppTasks();
- for (AppTask task : tasks) {
- Intent intent = task.getTaskInfo().baseIntent;
- Uri uri = intent.getData();
- if (isLaunchUri(uri)) {
- return intent;
- }
- }
- return null;
- }
-
- private void startTask() {
- Intent intent = createLaunchIntent(this);
-
- // Forward any flags from the original intent.
- intent.setFlags(getIntent().getFlags());
- if (DEBUG) Log.d(TAG, "Starting new task > " + intent.getData());
- startActivity(intent);
- }
-
- private void restoreTask(Intent intent) {
- if (DEBUG) Log.d(TAG, "Restoring existing task > " + intent.getData());
- // TODO: This doesn't appear to restore a task once it has stopped running.
- startActivity(intent);
- }
-
- static final Intent createLaunchIntent(Activity activity) {
- Intent intent = new Intent(activity, FilesActivity.class);
- intent.setData(buildLaunchUri());
-
- // Relay any config overrides bits present in the original intent.
- Intent original = activity.getIntent();
- if (original != null) {
- copyExtras(original, intent);
- if (original.hasExtra(Intent.EXTRA_TITLE)) {
- intent.putExtra(
- Intent.EXTRA_TITLE,
- original.getStringExtra(Intent.EXTRA_TITLE));
- }
- }
- return intent;
- }
-
- private static void copyExtras(Intent src, Intent dest) {
- for (String extra : PERSISTENT_BOOLEAN_EXTRAS) {
- if (src.hasExtra(extra)) {
- dest.putExtra(extra, src.getBooleanExtra(extra, false));
- }
- }
- }
-
- private static Uri buildLaunchUri() {
- return new Uri.Builder()
- .authority(LAUNCH_CONTROL_AUTHORITY)
- .fragment(String.valueOf(System.currentTimeMillis()))
- .build();
- }
-
- static boolean isLaunchUri(@Nullable Uri uri) {
- boolean result = uri != null && LAUNCH_CONTROL_AUTHORITY.equals(uri.getAuthority());
- return result;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ListItem.java b/packages/DocumentsUI/src/com/android/documentsui/ListItem.java
deleted file mode 100644
index 6d6f21e..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/ListItem.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.widget.LinearLayout;
-
-/**
- * Layout for a single item in List mode. This class overrides the default focus listener in order
- * to light up a focus indicator when it is focused.
- */
-public class ListItem extends LinearLayout
-{
- public ListItem(Context context) {
- super(context);
- }
-
- public ListItem(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
- TypedValue color = new TypedValue();
- int colorId = gainFocus ? android.R.attr.colorAccent : android.R.color.transparent;
- getContext().getTheme().resolveAttribute(colorId, color, true);
-
- findViewById(R.id.focus_indicator).setBackgroundColor(color.data);
- super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/LoadRootTask.java b/packages/DocumentsUI/src/com/android/documentsui/LoadRootTask.java
deleted file mode 100644
index c5d359b..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/LoadRootTask.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.util.Log;
-
-import com.android.documentsui.model.RootInfo;
-
-final class LoadRootTask extends PairedTask<BaseActivity, Void, RootInfo> {
- private static final String TAG = "RestoreRootTask";
-
- private final Uri mRootUri;
-
- public LoadRootTask(BaseActivity activity, Uri rootUri) {
- super(activity);
- mRootUri = rootUri;
- }
-
- @Override
- protected RootInfo run(Void... params) {
- String rootId = DocumentsContract.getRootId(mRootUri);
- return mOwner.mRoots.getRootOneshot(mRootUri.getAuthority(), rootId);
- }
-
- @Override
- protected void finish(RootInfo root) {
- mOwner.mState.restored = true;
-
- if (root != null) {
- mOwner.onRootPicked(root);
- } else {
- Log.w(TAG, "Failed to find root: " + mRootUri);
- mOwner.finish();
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java b/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java
deleted file mode 100644
index d2e9885..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.State.MODE_UNKNOWN;
-
-import android.annotation.IntDef;
-import android.annotation.Nullable;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.UserHandle;
-import android.preference.PreferenceManager;
-
-import com.android.documentsui.State.ActionType;
-import com.android.documentsui.State.ViewMode;
-import com.android.documentsui.model.RootInfo;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-public class LocalPreferences {
- private static final String KEY_FILE_SIZE = "fileSize";
- private static final String INCLUDE_DEVICE_ROOT = "includeDeviceRoot-";
- private static final String ROOT_VIEW_MODE_PREFIX = "rootViewMode-";
-
- public static boolean getDisplayFileSize(Context context) {
- return getPrefs(context).getBoolean(KEY_FILE_SIZE, false);
- }
-
- public static @ViewMode int getViewMode(Context context, RootInfo root,
- @ViewMode int fallback) {
- return getPrefs(context).getInt(createKey(root), fallback);
- }
-
- public static void setDisplayFileSize(Context context, boolean display) {
- getPrefs(context).edit().putBoolean(KEY_FILE_SIZE, display).apply();
- }
-
- public static boolean getShowDeviceRoot(Context context, @ActionType int action) {
- return getPrefs(context).getBoolean(INCLUDE_DEVICE_ROOT + action, false);
- }
-
- public static void setShowDeviceRoot(
- Context context, @ActionType int action, boolean display) {
- getPrefs(context).edit().putBoolean(INCLUDE_DEVICE_ROOT + action, display).apply();
- }
-
- public static void setViewMode(Context context, RootInfo root, @ViewMode int viewMode) {
- assert(viewMode != MODE_UNKNOWN);
- getPrefs(context).edit().putInt(createKey(root), viewMode).apply();
- }
-
- private static SharedPreferences getPrefs(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context);
- }
-
- private static String createKey(RootInfo root) {
- return ROOT_VIEW_MODE_PREFIX + root.authority + root.rootId;
- }
-
- public static final int PERMISSION_ASK = 0;
- public static final int PERMISSION_ASK_AGAIN = 1;
- public static final int PERMISSION_NEVER_ASK = -1;
-
- @IntDef(flag = true, value = {
- PERMISSION_ASK,
- PERMISSION_ASK_AGAIN,
- PERMISSION_NEVER_ASK,
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface PermissionStatus {}
-
- /**
- * Methods below are used to keep track of denied user requests on scoped directory access so
- * the dialog is not offered when user checked the 'Do not ask again' box
- *
- * <p>It uses a shared preferences, whose key is:
- * <ol>
- * <li>{@code USER_ID|PACKAGE_NAME|VOLUME_UUID|DIRECTORY} for storage volumes that have a UUID
- * (typically physical volumes like SD cards).
- * <li>{@code USER_ID|PACKAGE_NAME||DIRECTORY} for storage volumes that do not have a UUID
- * (typically the emulated volume used for primary storage
- * </ol>
- */
- static @PermissionStatus int getScopedAccessPermissionStatus(Context context,
- String packageName, @Nullable String uuid, String directory) {
- final String key = getScopedAccessDenialsKey(packageName, uuid, directory);
- return getPrefs(context).getInt(key, PERMISSION_ASK);
- }
-
- static void setScopedAccessPermissionStatus(Context context, String packageName,
- @Nullable String uuid, String directory, @PermissionStatus int status) {
- final String key = getScopedAccessDenialsKey(packageName, uuid, directory);
- getPrefs(context).edit().putInt(key, status).apply();
- }
-
- private static String getScopedAccessDenialsKey(String packageName, String uuid,
- String directory) {
- final int userId = UserHandle.myUserId();
- return uuid == null
- ? userId + "|" + packageName + "||" + directory
- : userId + "|" + packageName + "|" + uuid + "|" + directory;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/MenuManager.java b/packages/DocumentsUI/src/com/android/documentsui/MenuManager.java
deleted file mode 100644
index 6e960be..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/MenuManager.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.annotation.Nullable;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public abstract class MenuManager {
-
- final State mState;
- final SearchViewManager mSearchManager;
-
- public MenuManager(SearchViewManager searchManager, State displayState) {
- mSearchManager = searchManager;
- mState = displayState;
- }
-
- /** @See DirectoryFragment.SelectionModeListener#updateActionMenu */
- public void updateActionMenu(Menu menu, SelectionDetails selection) {
- updateOpen(menu.findItem(R.id.menu_open), selection);
- updateDelete(menu.findItem(R.id.menu_delete), selection);
- updateShare(menu.findItem(R.id.menu_share), selection);
- updateRename(menu.findItem(R.id.menu_rename), selection);
- updateSelectAll(menu.findItem(R.id.menu_select_all), selection);
- updateMoveTo(menu.findItem(R.id.menu_move_to), selection);
- updateCopyTo(menu.findItem(R.id.menu_copy_to), selection);
-
- Menus.disableHiddenItems(menu);
- }
-
- /** @See Activity#onPrepareOptionsMenu */
- public void updateOptionMenu(Menu menu, DirectoryDetails directoryDetails) {
- updateCreateDir(menu.findItem(R.id.menu_create_dir), directoryDetails);
- updateSettings(menu.findItem(R.id.menu_settings), directoryDetails);
- updateNewWindow(menu.findItem(R.id.menu_new_window), directoryDetails);
- updateFileSize(menu.findItem(R.id.menu_file_size), directoryDetails);
- updateModePicker(menu.findItem(
- R.id.menu_grid), menu.findItem(R.id.menu_list), directoryDetails);
- updateSort(menu.findItem(R.id.menu_sort),
- menu.findItem(R.id.menu_sort_size),
- directoryDetails);
- updateAdvanced(menu.findItem(R.id.menu_advanced), directoryDetails);
-
- Menus.disableHiddenItems(menu);
- }
-
- /** @See DirectoryFragment.onCreateContextMenu */
- public void updateContextMenu(Menu menu,
- @Nullable SelectionDetails selectionDetails,
- DirectoryDetails directoryDetails) {
-
- MenuItem cut = menu.findItem(R.id.menu_cut_to_clipboard);
- MenuItem copy = menu.findItem(R.id.menu_copy_to_clipboard);
- MenuItem paste = menu.findItem(R.id.menu_paste_from_clipboard);
- MenuItem delete = menu.findItem(R.id.menu_delete);
- MenuItem rename = menu.findItem(R.id.menu_rename);
- MenuItem createDir = menu.findItem(R.id.menu_create_dir);
-
- if (selectionDetails == null) {
- cut.setEnabled(false);
- copy.setEnabled(false);
- rename.setEnabled(false);
- delete.setEnabled(false);
- } else {
- copy.setEnabled(!selectionDetails.containsPartialFiles());
- cut.setEnabled(
- !selectionDetails.containsPartialFiles() && selectionDetails.canDelete());
- updateRename(rename, selectionDetails);
- updateDelete(delete, selectionDetails);
- }
- menu.findItem(R.id.menu_paste_from_clipboard)
- .setEnabled(directoryDetails.hasItemsToPaste());
- updateCreateDir(createDir, directoryDetails);
-
- //Cut, Copy, Paste and Delete should always be visible
- cut.setVisible(true);
- copy.setVisible(true);
- paste.setVisible(true);
- delete.setVisible(true);
- }
-
- void updateModePicker(MenuItem grid, MenuItem list, DirectoryDetails directoryDetails) {
- grid.setVisible(mState.derivedMode != State.MODE_GRID);
- list.setVisible(mState.derivedMode != State.MODE_LIST);
- }
-
- void updateFileSize(MenuItem fileSize, DirectoryDetails directoryDetails) {
- fileSize.setVisible(!mState.forceSize);
- fileSize.setTitle(directoryDetails.getDisplayFileSize()
- ? R.string.menu_file_size_hide : R.string.menu_file_size_show);
- }
-
- void updateSort(MenuItem sort, MenuItem sortSize, DirectoryDetails directoryDetails) {
- // Search uses backend ranking; no sorting, recents doesn't support sort.
- sort.setEnabled(!directoryDetails.isInRecents() && !mSearchManager.isSearching());
- sort.setVisible(true);
- sortSize.setVisible(mState.showSize); // Only sort by size when file sizes are visible
- }
-
- void updateAdvanced(MenuItem advanced, DirectoryDetails directoryDetails) {
- advanced.setVisible(mState.showAdvancedOption);
- advanced.setTitle(mState.showAdvancedOption && mState.showAdvanced
- ? R.string.menu_advanced_hide : R.string.menu_advanced_show);
- }
-
- void updateSettings(MenuItem settings, DirectoryDetails directoryDetails) {
- settings.setVisible(false);
- }
-
- void updateNewWindow(MenuItem newWindow, DirectoryDetails directoryDetails) {
- newWindow.setVisible(false);
- }
-
- void updateOpen(MenuItem open, SelectionDetails selectionDetails) {
- open.setVisible(false);
- }
-
- void updateShare(MenuItem share, SelectionDetails selectionDetails) {
- share.setVisible(false);
- }
-
- void updateDelete(MenuItem delete, SelectionDetails selectionDetails) {
- delete.setVisible(false);
- }
-
- void updateRename(MenuItem rename, SelectionDetails selectionDetails) {
- rename.setVisible(false);
- }
-
- void updateMoveTo(MenuItem moveTo, SelectionDetails selectionDetails) {
- moveTo.setVisible(false);
- }
-
- void updateCopyTo(MenuItem copyTo, SelectionDetails selectionDetails) {
- copyTo.setVisible(false);
- }
-
- abstract void updateSelectAll(MenuItem selectAll, SelectionDetails selectionDetails);
- abstract void updateCreateDir(MenuItem createDir, DirectoryDetails directoryDetails);
-
- /**
- * Access to meta data about the selection.
- */
- public interface SelectionDetails {
- boolean containsDirectories();
-
- boolean containsPartialFiles();
-
- // TODO: Update these to express characteristics instead of answering concrete questions,
- // since the answer to those questions is (or can be) activity specific.
- boolean canDelete();
-
- boolean canRename();
- }
-
- public static class DirectoryDetails {
- private final BaseActivity mActivity;
-
- public DirectoryDetails(BaseActivity activity) {
- mActivity = activity;
- }
-
- public boolean shouldShowFancyFeatures() {
- return Shared.shouldShowFancyFeatures(mActivity);
- }
-
- public boolean hasRootSettings() {
- return mActivity.getCurrentRoot().hasSettings();
- }
-
- public boolean hasItemsToPaste() {
- return false;
- }
-
- public boolean isInRecents() {
- return mActivity.getCurrentDirectory() == null;
- }
-
- public boolean canCreateDirectory() {
- return mActivity.canCreateDirectory();
- }
-
- public boolean getDisplayFileSize() {
- return LocalPreferences.getDisplayFileSize(mActivity);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Menus.java b/packages/DocumentsUI/src/com/android/documentsui/Menus.java
deleted file mode 100644
index 5277d2b..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Menus.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.view.Menu;
-import android.view.MenuItem;
-
-public final class Menus {
-
- private Menus() {}
-
- /**
- * Disables hidden menu items so that they are not invokable via command shortcuts
- */
- public static void disableHiddenItems(Menu menu, MenuItem... exclusions) {
- for (int i = 0; i < menu.size(); i++) {
- MenuItem item = menu.getItem(i);
- if (item.isVisible()) {
- continue;
- }
- if (contains(exclusions, item)) {
- continue;
- }
- item.setEnabled(false);
- }
- }
-
- private static boolean contains(MenuItem[] exclusions, MenuItem item) {
- for (int x = 0; x < exclusions.length; x++) {
- if (exclusions[x] == item) {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java b/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java
deleted file mode 100644
index 5c6213f..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.annotation.Nullable;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-/**
- * A message bar displaying some info/error messages and a Dismiss button.
- */
-public class MessageBar extends Fragment {
- private View mView;
- private ViewGroup mContainer;
-
- /**
- * Creates an instance of a MessageBar. Note that the new MessagBar is not visible by default,
- * and has to be shown by calling MessageBar.show.
- */
- public static MessageBar create(FragmentManager fm) {
- final MessageBar fragment = new MessageBar();
-
- final FragmentTransaction ft = fm.beginTransaction();
- ft.replace(R.id.container_message_bar, fragment);
- ft.commitAllowingStateLoss();
-
- return fragment;
- }
-
- /**
- * Sets the info message. Can be null, in which case no info message will be displayed. The
- * message bar layout will be adjusted accordingly.
- */
- public void setInfo(@Nullable String info) {
- View infoContainer = mView.findViewById(R.id.container_info);
- if (info != null) {
- TextView infoText = (TextView) mView.findViewById(R.id.textview_info);
- infoText.setText(info);
- infoContainer.setVisibility(View.VISIBLE);
- } else {
- infoContainer.setVisibility(View.GONE);
- }
- }
-
- /**
- * Sets the error message. Can be null, in which case no error message will be displayed. The
- * message bar layout will be adjusted accordingly.
- */
- public void setError(@Nullable String error) {
- View errorView = mView.findViewById(R.id.container_error);
- if (error != null) {
- TextView errorText = (TextView) mView.findViewById(R.id.textview_error);
- errorText.setText(error);
- errorView.setVisibility(View.VISIBLE);
- } else {
- errorView.setVisibility(View.GONE);
- }
- }
-
- @Override
- public View onCreateView(
- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
- mView = inflater.inflate(R.layout.fragment_message_bar, container, false);
-
- ImageView infoIcon = (ImageView) mView.findViewById(R.id.icon_info);
- infoIcon.setImageResource(R.drawable.ic_dialog_info);
-
- ImageView errorIcon = (ImageView) mView.findViewById(R.id.icon_error);
- errorIcon.setImageResource(R.drawable.ic_dialog_alert);
-
- Button dismiss = (Button) mView.findViewById(R.id.button_dismiss);
- dismiss.setOnClickListener(
- new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- hide();
- }
- });
-
- mContainer = container;
-
- return mView;
- }
-
- public void hide() {
- // The container view is used to show/hide the error bar. If a container is not provided,
- // fall back to showing/hiding the error bar View, which also works, but does not provide
- // the same animated transition.
- if (mContainer != null) {
- mContainer.setVisibility(View.GONE);
- } else {
- mView.setVisibility(View.GONE);
- }
- }
-
- public void show() {
- // The container view is used to show/hide the error bar. If a container is not provided,
- // fall back to showing/hiding the error bar View, which also works, but does not provide
- // the same animated transition.
- if (mContainer != null) {
- mContainer.setVisibility(View.VISIBLE);
- } else {
- mView.setVisibility(View.VISIBLE);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
deleted file mode 100644
index 3c45a93..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
+++ /dev/null
@@ -1,853 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static android.os.Environment.STANDARD_DIRECTORIES;
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.IntDef;
-import android.annotation.Nullable;
-import android.annotation.StringDef;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.util.Log;
-
-import com.android.documentsui.State.ActionType;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.List;
-
-/** @hide */
-public final class Metrics {
- private static final String TAG = "Metrics";
-
- // These are the native provider authorities that the metrics code is capable of recognizing and
- // explicitly counting.
- private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
- private static final String AUTHORITY_STORAGE = "com.android.externalstorage.documents";
- private static final String AUTHORITY_DOWNLOADS = "com.android.providers.downloads.documents";
- private static final String AUTHORITY_MTP = "com.android.mtp.documents";
-
- // These strings have to be whitelisted in tron. Do not change them.
- private static final String COUNT_LAUNCH_ACTION = "docsui_launch_action";
- private static final String COUNT_ROOT_VISITED = "docsui_root_visited";
- private static final String COUNT_OPEN_MIME = "docsui_open_mime";
- private static final String COUNT_CREATE_MIME = "docsui_create_mime";
- private static final String COUNT_GET_CONTENT_MIME = "docsui_get_content_mime";
- private static final String COUNT_BROWSE_ROOT = "docsui_browse_root";
- @Deprecated private static final String COUNT_MANAGE_ROOT = "docsui_manage_root";
- @Deprecated private static final String COUNT_MULTI_WINDOW = "docsui_multi_window";
- private static final String COUNT_FILEOP_SYSTEM = "docsui_fileop_system";
- private static final String COUNT_FILEOP_EXTERNAL = "docsui_fileop_external";
- private static final String COUNT_FILEOP_CANCELED = "docsui_fileop_canceled";
- private static final String COUNT_STARTUP_MS = "docsui_startup_ms";
- private static final String COUNT_DRAWER_OPENED = "docsui_drawer_opened";
- private static final String COUNT_USER_ACTION = "docsui_menu_action";
-
- // Indices for bucketing roots in the roots histogram. "Other" is the catch-all index for any
- // root that is not explicitly recognized by the Metrics code (see {@link
- // #getSanitizedRootIndex}). Apps are also bucketed in this histogram.
- // Do not change or rearrange these values, that will break historical data. Only add to the end
- // of the list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- private static final int ROOT_NONE = 1;
- private static final int ROOT_OTHER = 2;
- private static final int ROOT_AUDIO = 3;
- private static final int ROOT_DEVICE_STORAGE = 4;
- private static final int ROOT_DOWNLOADS = 5;
- private static final int ROOT_HOME = 6;
- private static final int ROOT_IMAGES = 7;
- private static final int ROOT_RECENTS = 8;
- private static final int ROOT_VIDEOS = 9;
- private static final int ROOT_MTP = 10;
- // Apps aren't really "roots", but they are treated as such in the roots fragment UI and so they
- // are logged analogously to roots.
- private static final int ROOT_THIRD_PARTY_APP = 100;
-
- @IntDef(flag = true, value = {
- ROOT_NONE,
- ROOT_OTHER,
- ROOT_AUDIO,
- ROOT_DEVICE_STORAGE,
- ROOT_DOWNLOADS,
- ROOT_HOME,
- ROOT_IMAGES,
- ROOT_RECENTS,
- ROOT_VIDEOS,
- ROOT_MTP,
- ROOT_THIRD_PARTY_APP
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface Root {}
-
- // Indices for bucketing mime types.
- // Do not change or rearrange these values, that will break historical data. Only add to the end
- // of the list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- private static final int MIME_NONE = 1; // null mime
- private static final int MIME_ANY = 2; // */*
- private static final int MIME_APPLICATION = 3; // application/*
- private static final int MIME_AUDIO = 4; // audio/*
- private static final int MIME_IMAGE = 5; // image/*
- private static final int MIME_MESSAGE = 6; // message/*
- private static final int MIME_MULTIPART = 7; // multipart/*
- private static final int MIME_TEXT = 8; // text/*
- private static final int MIME_VIDEO = 9; // video/*
- private static final int MIME_OTHER = 10; // anything not enumerated below
-
- @IntDef(flag = true, value = {
- MIME_NONE,
- MIME_ANY,
- MIME_APPLICATION,
- MIME_AUDIO,
- MIME_IMAGE,
- MIME_MESSAGE,
- MIME_MULTIPART,
- MIME_TEXT,
- MIME_VIDEO,
- MIME_OTHER
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface Mime {}
-
- // Codes representing different kinds of file operations. These are used for bucketing
- // operations in the COUNT_FILEOP_{SYSTEM|EXTERNAL} histograms.
- // Do not change or rearrange these values, that will break historical data. Only add to the
- // list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- private static final int FILEOP_OTHER = 1; // any file operation not listed below
- private static final int FILEOP_COPY_INTRA_PROVIDER = 2; // Copy within a provider
- private static final int FILEOP_COPY_SYSTEM_PROVIDER = 3; // Copy to a system provider.
- private static final int FILEOP_COPY_EXTERNAL_PROVIDER = 4; // Copy to a 3rd-party provider.
- private static final int FILEOP_MOVE_INTRA_PROVIDER = 5; // Move within a provider.
- private static final int FILEOP_MOVE_SYSTEM_PROVIDER = 6; // Move to a system provider.
- private static final int FILEOP_MOVE_EXTERNAL_PROVIDER = 7; // Move to a 3rd-party provider.
- private static final int FILEOP_DELETE = 8;
- private static final int FILEOP_RENAME = 9;
- private static final int FILEOP_CREATE_DIR = 10;
- private static final int FILEOP_OTHER_ERROR = 100;
- private static final int FILEOP_DELETE_ERROR = 101;
- private static final int FILEOP_MOVE_ERROR = 102;
- private static final int FILEOP_COPY_ERROR = 103;
- private static final int FILEOP_RENAME_ERROR = 104;
- private static final int FILEOP_CREATE_DIR_ERROR = 105;
-
- @IntDef(flag = true, value = {
- FILEOP_OTHER,
- FILEOP_COPY_INTRA_PROVIDER,
- FILEOP_COPY_SYSTEM_PROVIDER,
- FILEOP_COPY_EXTERNAL_PROVIDER,
- FILEOP_MOVE_INTRA_PROVIDER,
- FILEOP_MOVE_SYSTEM_PROVIDER,
- FILEOP_MOVE_EXTERNAL_PROVIDER,
- FILEOP_DELETE,
- FILEOP_RENAME,
- FILEOP_CREATE_DIR,
- FILEOP_OTHER_ERROR,
- FILEOP_COPY_ERROR,
- FILEOP_MOVE_ERROR,
- FILEOP_DELETE_ERROR,
- FILEOP_RENAME_ERROR,
- FILEOP_CREATE_DIR_ERROR
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface FileOp {}
-
- // Codes representing different kinds of file operations. These are used for bucketing
- // operations in the COUNT_FILEOP_CANCELED histogram.
- // Do not change or rearrange these values, that will break historical data. Only add to the
- // list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- private static final int OPERATION_UNKNOWN = 1;
- private static final int OPERATION_COPY = 2;
- private static final int OPERATION_MOVE = 3;
- private static final int OPERATION_DELETE= 4;
-
- @IntDef(flag = true, value = {
- OPERATION_UNKNOWN,
- OPERATION_COPY,
- OPERATION_MOVE,
- OPERATION_DELETE
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface MetricsOpType {}
-
- // Codes representing different provider types. Used for sorting file operations when logging.
- private static final int PROVIDER_INTRA = 0;
- private static final int PROVIDER_SYSTEM = 1;
- private static final int PROVIDER_EXTERNAL = 2;
-
- @IntDef(flag = false, value = {
- PROVIDER_INTRA,
- PROVIDER_SYSTEM,
- PROVIDER_EXTERNAL
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface Provider {}
-
-
- // Codes representing different user actions. These are used for bucketing stats in the
- // COUNT_USER_ACTION histogram.
- // The historgram includes action triggered from menu or invoked by keyboard shortcut.
- // Do not change or rearrange these values, that will break historical data. Only add to the
- // list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- public static final int USER_ACTION_OTHER = 1;
- public static final int USER_ACTION_GRID = 2;
- public static final int USER_ACTION_LIST = 3;
- public static final int USER_ACTION_SORT_NAME = 4;
- public static final int USER_ACTION_SORT_DATE = 5;
- public static final int USER_ACTION_SORT_SIZE = 6;
- public static final int USER_ACTION_SEARCH = 7;
- public static final int USER_ACTION_SHOW_SIZE = 8;
- public static final int USER_ACTION_HIDE_SIZE = 9;
- public static final int USER_ACTION_SETTINGS = 10;
- public static final int USER_ACTION_COPY_TO = 11;
- public static final int USER_ACTION_MOVE_TO = 12;
- public static final int USER_ACTION_DELETE = 13;
- public static final int USER_ACTION_RENAME = 14;
- public static final int USER_ACTION_CREATE_DIR = 15;
- public static final int USER_ACTION_SELECT_ALL = 16;
- public static final int USER_ACTION_SHARE = 17;
- public static final int USER_ACTION_OPEN = 18;
- public static final int USER_ACTION_SHOW_ADVANCED = 19;
- public static final int USER_ACTION_HIDE_ADVANCED = 20;
- public static final int USER_ACTION_NEW_WINDOW = 21;
- public static final int USER_ACTION_PASTE_CLIPBOARD = 22;
- public static final int USER_ACTION_COPY_CLIPBOARD = 23;
- public static final int USER_ACTION_DRAG_N_DROP = 24;
- public static final int USER_ACTION_DRAG_N_DROP_MULTI_WINDOW = 25;
- public static final int USER_ACTION_CUT_CLIPBOARD = 26;
-
- @IntDef(flag = false, value = {
- USER_ACTION_OTHER,
- USER_ACTION_GRID,
- USER_ACTION_LIST,
- USER_ACTION_SORT_NAME,
- USER_ACTION_SORT_DATE,
- USER_ACTION_SORT_SIZE,
- USER_ACTION_SEARCH,
- USER_ACTION_SHOW_SIZE,
- USER_ACTION_HIDE_SIZE,
- USER_ACTION_SETTINGS,
- USER_ACTION_COPY_TO,
- USER_ACTION_MOVE_TO,
- USER_ACTION_DELETE,
- USER_ACTION_RENAME,
- USER_ACTION_CREATE_DIR,
- USER_ACTION_SELECT_ALL,
- USER_ACTION_SHARE,
- USER_ACTION_OPEN,
- USER_ACTION_SHOW_ADVANCED,
- USER_ACTION_HIDE_ADVANCED,
- USER_ACTION_NEW_WINDOW,
- USER_ACTION_PASTE_CLIPBOARD,
- USER_ACTION_COPY_CLIPBOARD,
- USER_ACTION_DRAG_N_DROP,
- USER_ACTION_DRAG_N_DROP_MULTI_WINDOW,
- USER_ACTION_CUT_CLIPBOARD
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface UserAction {}
-
- // Codes representing different menu actions. These are used for bucketing stats in the
- // COUNT_MENU_ACTION histogram.
- // Do not change or rearrange these values, that will break historical data. Only add to the
- // list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- private static final int ACTION_OTHER = 1;
- private static final int ACTION_OPEN = 2;
- private static final int ACTION_CREATE = 3;
- private static final int ACTION_GET_CONTENT = 4;
- private static final int ACTION_OPEN_TREE = 5;
- @Deprecated private static final int ACTION_MANAGE = 6;
- private static final int ACTION_BROWSE = 7;
- private static final int ACTION_PICK_COPY_DESTINATION = 8;
-
- @IntDef(flag = true, value = {
- ACTION_OTHER,
- ACTION_OPEN,
- ACTION_CREATE,
- ACTION_GET_CONTENT,
- ACTION_OPEN_TREE,
- ACTION_MANAGE,
- ACTION_BROWSE,
- ACTION_PICK_COPY_DESTINATION
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface MetricsAction {}
-
- // Codes representing different actions to open the drawer. They are used for bucketing stats in
- // the COUNT_DRAWER_OPENED histogram.
- // Do not change or rearrange these values, that will break historical data. Only add to the
- // list.
- // Do not use negative numbers or zero; clearcut only handles positive integers.
- private static final int DRAWER_OPENED_HAMBURGER = 1;
- private static final int DRAWER_OPENED_SWIPE = 2;
-
- @IntDef(flag = true, value = {
- DRAWER_OPENED_HAMBURGER,
- DRAWER_OPENED_SWIPE
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface DrawerTrigger {}
-
- /**
- * Logs when DocumentsUI is started, and how. Call this when DocumentsUI first starts up.
- *
- * @param context
- * @param state
- * @param intent
- */
- public static void logActivityLaunch(Context context, State state, Intent intent) {
- // Log the launch action.
- logHistogram(context, COUNT_LAUNCH_ACTION, toMetricsAction(state.action));
- // Then log auxiliary data (roots/mime types) associated with some actions.
- Uri uri = intent.getData();
- switch (state.action) {
- case State.ACTION_OPEN:
- logHistogram(context, COUNT_OPEN_MIME, sanitizeMime(intent.getType()));
- break;
- case State.ACTION_CREATE:
- logHistogram(context, COUNT_CREATE_MIME, sanitizeMime(intent.getType()));
- break;
- case State.ACTION_GET_CONTENT:
- logHistogram(context, COUNT_GET_CONTENT_MIME, sanitizeMime(intent.getType()));
- break;
- case State.ACTION_BROWSE:
- logHistogram(context, COUNT_BROWSE_ROOT, sanitizeRoot(uri));
- break;
- default:
- break;
- }
- }
-
- /**
- * Logs a root visited event. Call this when the user visits on a root in the RootsFragment.
- *
- * @param context
- * @param info
- */
- public static void logRootVisited(Context context, RootInfo info) {
- logHistogram(context, COUNT_ROOT_VISITED, sanitizeRoot(info));
- }
-
- /**
- * Logs an app visited event. Call this when the user visits on an app in the RootsFragment.
- *
- * @param context
- * @param info
- */
- public static void logAppVisited(Context context, ResolveInfo info) {
- logHistogram(context, COUNT_ROOT_VISITED, sanitizeRoot(info));
- }
-
- /**
- * Logs a drawer opened event. Call this when the user opens drawer by swipe or by clicking the
- * hamburger icon.
- * @param context
- * @param trigger type of action that opened the drawer
- */
- public static void logDrawerOpened(Context context, @DrawerController.Trigger int trigger) {
- if (trigger == DrawerController.OPENED_HAMBURGER) {
- logHistogram(context, COUNT_DRAWER_OPENED, DRAWER_OPENED_HAMBURGER);
- } else if (trigger == DrawerController.OPENED_SWIPE) {
- logHistogram(context, COUNT_DRAWER_OPENED, DRAWER_OPENED_SWIPE);
- }
- }
-
- /**
- * Logs file operation stats. Call this when a file operation has completed. The given
- * DocumentInfo is only used to distinguish broad categories of actions (e.g. copying from one
- * provider to another vs copying within a given provider). No PII is logged.
- *
- * @param context
- * @param operationType
- * @param srcs
- * @param dst
- */
- public static void logFileOperation(
- Context context,
- @OpType int operationType,
- List<DocumentInfo> srcs,
- @Nullable DocumentInfo dst) {
- ProviderCounts counts = countProviders(srcs, dst);
-
- if (counts.intraProvider > 0) {
- logIntraProviderFileOps(context, dst.authority, operationType);
- }
- if (counts.systemProvider > 0) {
- // Log file operations on system providers.
- logInterProviderFileOps(context, COUNT_FILEOP_SYSTEM, dst, operationType);
- }
- if (counts.externalProvider > 0) {
- // Log file operations on external providers.
- logInterProviderFileOps(context, COUNT_FILEOP_EXTERNAL, dst, operationType);
- }
- }
-
- /**
- * Logs create directory operation. It is a part of file operation stats. We do not
- * differentiate between internal and external locations, all create directory operations are
- * logged under COUNT_FILEOP_SYSTEM. Call this when a create directory operation has completed.
- *
- * @param context
- */
- public static void logCreateDirOperation(Context context) {
- logHistogram(context, COUNT_FILEOP_SYSTEM, FILEOP_CREATE_DIR);
- }
-
- /**
- * Logs rename file operation. It is a part of file operation stats. We do not differentiate
- * between internal and external locations, all rename operations are logged under
- * COUNT_FILEOP_SYSTEM. Call this when a rename file operation has completed.
- *
- * @param context
- */
- public static void logRenameFileOperation(Context context) {
- logHistogram(context, COUNT_FILEOP_SYSTEM, FILEOP_RENAME);
- }
-
- /**
- * Logs some kind of file operation error. Call this when a file operation (e.g. copy, delete)
- * fails.
- *
- * @param context
- * @param operationType
- * @param failedFiles
- */
- public static void logFileOperationErrors(Context context, @OpType int operationType,
- List<DocumentInfo> failedFiles) {
- ProviderCounts counts = countProviders(failedFiles, null);
-
- @FileOp int opCode = FILEOP_OTHER_ERROR;
- switch (operationType) {
- case FileOperationService.OPERATION_COPY:
- opCode = FILEOP_COPY_ERROR;
- break;
- case FileOperationService.OPERATION_DELETE:
- opCode = FILEOP_DELETE_ERROR;
- break;
- case FileOperationService.OPERATION_MOVE:
- opCode = FILEOP_MOVE_ERROR;
- break;
- }
- if (counts.systemProvider > 0) {
- logHistogram(context, COUNT_FILEOP_SYSTEM, opCode);
- }
- if (counts.externalProvider > 0) {
- logHistogram(context, COUNT_FILEOP_EXTERNAL, opCode);
- }
- }
-
- /**
- * Logs create directory operation error. We do not differentiate between internal and external
- * locations, all create directory errors are logged under COUNT_FILEOP_SYSTEM. Call this when a
- * create directory operation fails.
- *
- * @param context
- */
- public static void logCreateDirError(Context context) {
- logHistogram(context, COUNT_FILEOP_SYSTEM, FILEOP_CREATE_DIR_ERROR);
- }
-
- /**
- * Logs rename file operation error. We do not differentiate between internal and external
- * locations, all rename errors are logged under COUNT_FILEOP_SYSTEM. Call this
- * when a rename file operation fails.
- *
- * @param context
- */
- public static void logRenameFileError(Context context) {
- logHistogram(context, COUNT_FILEOP_SYSTEM, FILEOP_RENAME_ERROR);
- }
-
- /**
- * Logs the cancellation of a file operation. Call this when a Job is canceled.
- * @param context
- * @param operationType
- */
- public static void logFileOperationCancelled(Context context, @OpType int operationType) {
- logHistogram(context, COUNT_FILEOP_CANCELED, toMetricsOpType(operationType));
- }
-
- /**
- * Logs startup time in milliseconds.
- * @param context
- * @param startupMs Startup time in milliseconds.
- */
- public static void logStartupMs(Context context, int startupMs) {
- logHistogram(context, COUNT_STARTUP_MS, startupMs);
- }
-
- private static void logInterProviderFileOps(
- Context context,
- String histogram,
- DocumentInfo dst,
- @OpType int operationType) {
- if (operationType == FileOperationService.OPERATION_DELETE) {
- logHistogram(context, histogram, FILEOP_DELETE);
- } else {
- assert(dst != null);
- @Provider int providerType =
- isSystemProvider(dst.authority) ? PROVIDER_SYSTEM : PROVIDER_EXTERNAL;
- logHistogram(context, histogram, getOpCode(operationType, providerType));
- }
- }
-
- private static void logIntraProviderFileOps(
- Context context, String authority, @OpType int operationType) {
- // Find the right histogram to log to, then log the operation.
- String histogram = isSystemProvider(authority) ? COUNT_FILEOP_SYSTEM : COUNT_FILEOP_EXTERNAL;
- logHistogram(context, histogram, getOpCode(operationType, PROVIDER_INTRA));
- }
-
- // Types for logInvalidScopedAccessRequest
- public static final String SCOPED_DIRECTORY_ACCESS_INVALID_ARGUMENTS =
- "docsui_scoped_directory_access_invalid_args";
- public static final String SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY =
- "docsui_scoped_directory_access_invalid_dir";
- public static final String SCOPED_DIRECTORY_ACCESS_ERROR =
- "docsui_scoped_directory_access_error";
-
- @StringDef(value = {
- SCOPED_DIRECTORY_ACCESS_INVALID_ARGUMENTS,
- SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY,
- SCOPED_DIRECTORY_ACCESS_ERROR
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface InvalidScopedAccess{}
-
- public static void logInvalidScopedAccessRequest(Context context,
- @InvalidScopedAccess String type) {
- switch (type) {
- case SCOPED_DIRECTORY_ACCESS_INVALID_ARGUMENTS:
- case SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY:
- case SCOPED_DIRECTORY_ACCESS_ERROR:
- logCount(context, type);
- break;
- default:
- Log.wtf(TAG, "invalid InvalidScopedAccess: " + type);
- }
- }
-
- // Types for logValidScopedAccessRequest
- public static final int SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED = 0;
- public static final int SCOPED_DIRECTORY_ACCESS_GRANTED = 1;
- public static final int SCOPED_DIRECTORY_ACCESS_DENIED = 2;
- public static final int SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST = 3;
- public static final int SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED = 4;
-
- @IntDef(flag = true, value = {
- SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED,
- SCOPED_DIRECTORY_ACCESS_GRANTED,
- SCOPED_DIRECTORY_ACCESS_DENIED,
- SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST,
- SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface ScopedAccessGrant {}
-
- public static void logValidScopedAccessRequest(Activity activity, String directory,
- @ScopedAccessGrant int type) {
- int index = -1;
- if (OpenExternalDirectoryActivity.DIRECTORY_ROOT.equals(directory)) {
- index = -2;
- } else {
- for (int i = 0; i < STANDARD_DIRECTORIES.length; i++) {
- if (STANDARD_DIRECTORIES[i].equals(directory)) {
- index = i;
- break;
- }
- }
- }
- final String packageName = activity.getCallingPackage();
- switch (type) {
- case SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED:
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED_BY_PACKAGE, packageName);
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED_BY_FOLDER, index);
- break;
- case SCOPED_DIRECTORY_ACCESS_GRANTED:
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_GRANTED_BY_PACKAGE, packageName);
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_GRANTED_BY_FOLDER, index);
- break;
- case SCOPED_DIRECTORY_ACCESS_DENIED:
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_DENIED_BY_PACKAGE, packageName);
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_DENIED_BY_FOLDER, index);
- break;
- case SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST:
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST_BY_PACKAGE, packageName);
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST_BY_FOLDER, index);
- break;
- case SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED:
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED_BY_PACKAGE, packageName);
- MetricsLogger.action(activity, MetricsEvent
- .ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED_BY_FOLDER, index);
- break;
- default:
- Log.wtf(TAG, "invalid ScopedAccessGrant: " + type);
- }
- }
-
- /**
- * Logs the action that was started by user.
- * @param context
- * @param userAction
- */
- public static void logUserAction(Context context, @UserAction int userAction) {
- logHistogram(context, COUNT_USER_ACTION, userAction);
- }
-
- /**
- * Internal method for making a MetricsLogger.count call. Increments the given counter by 1.
- *
- * @param context
- * @param name The counter to increment.
- */
- private static void logCount(Context context, String name) {
- if (DEBUG) Log.d(TAG, name + ": " + 1);
- MetricsLogger.count(context, name, 1);
- }
-
- /**
- * Internal method for making a MetricsLogger.histogram call.
- *
- * @param context
- * @param name The name of the histogram.
- * @param bucket The bucket to increment.
- */
- private static void logHistogram(Context context, String name, @ActionType int bucket) {
- if (DEBUG) Log.d(TAG, name + ": " + bucket);
- MetricsLogger.histogram(context, name, bucket);
- }
-
- /**
- * Generates an integer identifying the given root. For privacy, this function only recognizes a
- * small set of hard-coded roots (ones provided by the system). Other roots are all grouped into
- * a single ROOT_OTHER bucket.
- */
- private static @Root int sanitizeRoot(Uri uri) {
- if (uri == null || uri.getAuthority() == null || LauncherActivity.isLaunchUri(uri)) {
- return ROOT_NONE;
- }
-
- switch (uri.getAuthority()) {
- case AUTHORITY_MEDIA:
- switch (DocumentsContract.getRootId(uri)) {
- case "audio_root":
- return ROOT_AUDIO;
- case "images_root":
- return ROOT_IMAGES;
- case "videos_root":
- return ROOT_VIDEOS;
- default:
- return ROOT_OTHER;
- }
- case AUTHORITY_STORAGE:
- if ("home".equals(DocumentsContract.getRootId(uri))) {
- return ROOT_HOME;
- } else {
- return ROOT_DEVICE_STORAGE;
- }
- case AUTHORITY_DOWNLOADS:
- return ROOT_DOWNLOADS;
- case AUTHORITY_MTP:
- return ROOT_MTP;
- default:
- return ROOT_OTHER;
- }
- }
-
- /** @see #sanitizeRoot(Uri) */
- private static @Root int sanitizeRoot(RootInfo root) {
- if (root.isRecents()) {
- // Recents root is special and only identifiable via this method call. Other roots are
- // identified by URI.
- return ROOT_RECENTS;
- } else {
- return sanitizeRoot(root.getUri());
- }
- }
-
- /** @see #sanitizeRoot(Uri) */
- private static @Root int sanitizeRoot(ResolveInfo info) {
- // Log all apps under a single bucket in the roots histogram.
- return ROOT_THIRD_PARTY_APP;
- }
-
- /**
- * Generates an int identifying a mime type. For privacy, this function only recognizes a small
- * set of hard-coded types. For any other type, this function returns "other".
- *
- * @param mimeType
- * @return
- */
- private static @Mime int sanitizeMime(String mimeType) {
- if (mimeType == null) {
- return MIME_NONE;
- } else if ("*/*".equals(mimeType)) {
- return MIME_ANY;
- } else {
- String type = mimeType.substring(0, mimeType.indexOf('/'));
- switch (type) {
- case "application":
- return MIME_APPLICATION;
- case "audio":
- return MIME_AUDIO;
- case "image":
- return MIME_IMAGE;
- case "message":
- return MIME_MESSAGE;
- case "multipart":
- return MIME_MULTIPART;
- case "text":
- return MIME_TEXT;
- case "video":
- return MIME_VIDEO;
- }
- }
- // Bucket all other types into one bucket.
- return MIME_OTHER;
- }
-
- private static boolean isSystemProvider(String authority) {
- switch (authority) {
- case AUTHORITY_MEDIA:
- case AUTHORITY_STORAGE:
- case AUTHORITY_DOWNLOADS:
- return true;
- default:
- return false;
- }
- }
-
- /**
- * @param operation
- * @param providerType
- * @return An opcode, suitable for use as histogram bucket, for the given operation/provider
- * combination.
- */
- private static @FileOp int getOpCode(@OpType int operation, @Provider int providerType) {
- switch (operation) {
- case FileOperationService.OPERATION_COPY:
- switch (providerType) {
- case PROVIDER_INTRA:
- return FILEOP_COPY_INTRA_PROVIDER;
- case PROVIDER_SYSTEM:
- return FILEOP_COPY_SYSTEM_PROVIDER;
- case PROVIDER_EXTERNAL:
- return FILEOP_COPY_EXTERNAL_PROVIDER;
- }
- case FileOperationService.OPERATION_MOVE:
- switch (providerType) {
- case PROVIDER_INTRA:
- return FILEOP_MOVE_INTRA_PROVIDER;
- case PROVIDER_SYSTEM:
- return FILEOP_MOVE_SYSTEM_PROVIDER;
- case PROVIDER_EXTERNAL:
- return FILEOP_MOVE_EXTERNAL_PROVIDER;
- }
- case FileOperationService.OPERATION_DELETE:
- return FILEOP_DELETE;
- default:
- Log.w(TAG, "Unrecognized operation type when logging a file operation");
- return FILEOP_OTHER;
- }
- }
-
- /**
- * Maps FileOperationService OpType values, to MetricsOpType values.
- */
- private static @MetricsOpType int toMetricsOpType(@OpType int operation) {
- switch (operation) {
- case FileOperationService.OPERATION_COPY:
- return OPERATION_COPY;
- case FileOperationService.OPERATION_MOVE:
- return OPERATION_MOVE;
- case FileOperationService.OPERATION_DELETE:
- return OPERATION_DELETE;
- case FileOperationService.OPERATION_UNKNOWN:
- default:
- return OPERATION_UNKNOWN;
- }
- }
-
- private static @MetricsAction int toMetricsAction(int action) {
- switch(action) {
- case State.ACTION_OPEN:
- return ACTION_OPEN;
- case State.ACTION_CREATE:
- return ACTION_CREATE;
- case State.ACTION_GET_CONTENT:
- return ACTION_GET_CONTENT;
- case State.ACTION_OPEN_TREE:
- return ACTION_OPEN_TREE;
- case State.ACTION_BROWSE:
- return ACTION_BROWSE;
- case State.ACTION_PICK_COPY_DESTINATION:
- return ACTION_PICK_COPY_DESTINATION;
- default:
- return ACTION_OTHER;
- }
- }
-
- /**
- * Count the given src documents and provide a tally of how many come from the same provider as
- * the dst document (if a dst is provided), how many come from system providers, and how many
- * come from external 3rd-party providers.
- */
- private static ProviderCounts countProviders(
- List<DocumentInfo> srcs, @Nullable DocumentInfo dst) {
- ProviderCounts counts = new ProviderCounts();
- for (DocumentInfo doc: srcs) {
- if (dst != null && doc.authority.equals(dst.authority)) {
- counts.intraProvider++;
- } else if (isSystemProvider(doc.authority)){
- counts.systemProvider++;
- } else {
- counts.externalProvider++;
- }
- }
- return counts;
- }
-
- private static class ProviderCounts {
- int intraProvider;
- int systemProvider;
- int externalProvider;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java b/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java
deleted file mode 100644
index 859763b..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.annotation.Nullable;
-import android.provider.DocumentsContract.Document;
-
-import com.android.documentsui.model.DocumentInfo;
-import com.android.internal.util.Predicate;
-
-public class MimePredicate implements Predicate<DocumentInfo> {
- private final String[] mFilters;
-
- private static final String APK_TYPE = "application/vnd.android.package-archive";
- /**
- * MIME types that are visual in nature. For example, they should always be
- * shown as thumbnails in list mode.
- */
- public static final String[] VISUAL_MIMES = new String[] { "image/*", "video/*" };
-
- public MimePredicate(String[] filters) {
- mFilters = filters;
- }
-
- @Override
- public boolean apply(DocumentInfo doc) {
- if (doc.isDirectory()) {
- return true;
- }
- if (mimeMatches(mFilters, doc.mimeType)) {
- return true;
- }
- return false;
- }
-
- public static boolean mimeMatches(String[] filters, String[] tests) {
- if (tests == null) {
- return false;
- }
- for (String test : tests) {
- if (mimeMatches(filters, test)) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean mimeMatches(String filter, String[] tests) {
- if (tests == null) {
- return true;
- }
- for (String test : tests) {
- if (mimeMatches(filter, test)) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean mimeMatches(String[] filters, String test) {
- if (filters == null) {
- return true;
- }
- for (String filter : filters) {
- if (mimeMatches(filter, test)) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean mimeMatches(String filter, String test) {
- if (test == null) {
- return false;
- } else if (filter == null || "*/*".equals(filter)) {
- return true;
- } else if (filter.equals(test)) {
- return true;
- } else if (filter.endsWith("/*")) {
- return filter.regionMatches(0, test, 0, filter.indexOf('/'));
- } else {
- return false;
- }
- }
-
- public static boolean isApkType(@Nullable String mimeType) {
- return APK_TYPE.equals(mimeType);
- }
-
- public static boolean isDirectoryType(@Nullable String mimeType) {
- return Document.MIME_TYPE_DIR.equals(mimeType);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/NavigationViewManager.java b/packages/DocumentsUI/src/com/android/documentsui/NavigationViewManager.java
deleted file mode 100644
index 2554246..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/NavigationViewManager.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.Nullable;
-import android.graphics.drawable.Drawable;
-import android.util.Log;
-import android.view.View;
-
-import com.android.documentsui.dirlist.AnimationView;
-import com.android.documentsui.model.RootInfo;
-
-import java.util.function.Consumer;
-
-/**
- * A facade over the portions of the app and drawer toolbars.
- */
-public class NavigationViewManager {
-
- private static final String TAG = "NavigationViewManager";
-
- final DrawerController mDrawer;
- final DocumentsToolbar mToolbar;
- final State mState;
- final NavigationViewManager.Environment mEnv;
- final Breadcrumb mBreadcrumb;
-
- public NavigationViewManager(
- DrawerController drawer,
- DocumentsToolbar toolbar,
- State state,
- NavigationViewManager.Environment env,
- Breadcrumb breadcrumb) {
-
- mToolbar = toolbar;
- mDrawer = drawer;
- mState = state;
- mEnv = env;
- mBreadcrumb = breadcrumb;
- mBreadcrumb.setup(env, state, this::onNavigationItemSelected);
-
- mToolbar.setNavigationOnClickListener(
- new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onNavigationIconClicked();
- }
- });
- }
-
- private void onNavigationIconClicked() {
- if (mDrawer.isPresent()) {
- mDrawer.setOpen(true, DrawerController.OPENED_HAMBURGER);
- }
- }
-
- void onNavigationItemSelected(int position) {
- boolean changed = false;
- while (mState.stack.size() > position + 1) {
- changed = true;
- mState.popDocument();
- }
- if (changed) {
- mEnv.refreshCurrentRootAndDirectory(AnimationView.ANIM_LEAVE);
- }
- }
-
- void update() {
-
- // TODO: Looks to me like this block is never getting hit.
- if (mEnv.isSearchExpanded()) {
- mToolbar.setTitle(null);
- mBreadcrumb.show(false);
- return;
- }
-
- mDrawer.setTitle(mEnv.getDrawerTitle());
-
- mToolbar.setNavigationIcon(getActionBarIcon());
- mToolbar.setNavigationContentDescription(R.string.drawer_open);
-
- if (mState.stack.size() <= 1) {
- mBreadcrumb.show(false);
- String title = mEnv.getCurrentRoot().title;
- if (DEBUG) Log.d(TAG, "New toolbar title is: " + title);
- mToolbar.setTitle(title);
- } else {
- mBreadcrumb.show(true);
- mToolbar.setTitle(null);
- mBreadcrumb.postUpdate();
- }
-
- if (DEBUG) Log.d(TAG, "Final toolbar title is: " + mToolbar.getTitle());
- }
-
- // Hamburger if drawer is present, else sad nullness.
- private @Nullable Drawable getActionBarIcon() {
- if (mDrawer.isPresent()) {
- return mToolbar.getContext().getDrawable(R.drawable.ic_hamburger);
- } else {
- return null;
- }
- }
-
- void revealRootsDrawer(boolean open) {
- mDrawer.setOpen(open);
- }
-
- interface Breadcrumb {
- void setup(Environment env, State state, Consumer<Integer> listener);
- void show(boolean visibility);
- void postUpdate();
- }
-
- interface Environment {
- RootInfo getCurrentRoot();
- String getDrawerTitle();
- void refreshCurrentRootAndDirectory(int animation);
- boolean isSearchExpanded();
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
deleted file mode 100644
index 6588ee1..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static android.os.Environment.isStandardDirectory;
-import static android.os.Environment.STANDARD_DIRECTORIES;
-import static android.os.storage.StorageVolume.EXTRA_DIRECTORY_NAME;
-import static android.os.storage.StorageVolume.EXTRA_STORAGE_VOLUME;
-
-import static com.android.documentsui.LocalPreferences.getScopedAccessPermissionStatus;
-import static com.android.documentsui.LocalPreferences.PERMISSION_ASK;
-import static com.android.documentsui.LocalPreferences.PERMISSION_ASK_AGAIN;
-import static com.android.documentsui.LocalPreferences.PERMISSION_NEVER_ASK;
-import static com.android.documentsui.LocalPreferences.setScopedAccessPermissionStatus;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_DENIED;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_ERROR;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_GRANTED;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_INVALID_ARGUMENTS;
-import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY;
-import static com.android.documentsui.Metrics.logInvalidScopedAccessRequest;
-import static com.android.documentsui.Metrics.logValidScopedAccessRequest;
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.ContentProviderClient;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.content.UriPermission;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.os.storage.VolumeInfo;
-import android.provider.DocumentsContract;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.TextView;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Activity responsible for handling {@link Intent#ACTION_OPEN_EXTERNAL_DOCUMENT}.
- */
-public class OpenExternalDirectoryActivity extends Activity {
- private static final String TAG = "OpenExternalDirectory";
- private static final String FM_TAG = "open_external_directory";
- private static final String EXTERNAL_STORAGE_AUTH = "com.android.externalstorage.documents";
- private static final String EXTRA_FILE = "com.android.documentsui.FILE";
- private static final String EXTRA_APP_LABEL = "com.android.documentsui.APP_LABEL";
- private static final String EXTRA_VOLUME_LABEL = "com.android.documentsui.VOLUME_LABEL";
- private static final String EXTRA_VOLUME_UUID = "com.android.documentsui.VOLUME_UUID";
- private static final String EXTRA_IS_ROOT = "com.android.documentsui.IS_ROOT";
- private static final String EXTRA_IS_PRIMARY = "com.android.documentsui.IS_PRIMARY";
- // Special directory name representing the full volume
- static final String DIRECTORY_ROOT = "ROOT_DIRECTORY";
-
- private ContentProviderClient mExternalStorageClient;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (savedInstanceState != null) {
- if (DEBUG) Log.d(TAG, "activity.onCreateDialog(): reusing instance");
- return;
- }
-
- final Intent intent = getIntent();
- if (intent == null) {
- if (DEBUG) Log.d(TAG, "missing intent");
- logInvalidScopedAccessRequest(this, SCOPED_DIRECTORY_ACCESS_INVALID_ARGUMENTS);
- setResult(RESULT_CANCELED);
- finish();
- return;
- }
- final Parcelable storageVolume = intent.getParcelableExtra(EXTRA_STORAGE_VOLUME);
- if (!(storageVolume instanceof StorageVolume)) {
- if (DEBUG)
- Log.d(TAG, "extra " + EXTRA_STORAGE_VOLUME + " is not a StorageVolume: "
- + storageVolume);
- logInvalidScopedAccessRequest(this, SCOPED_DIRECTORY_ACCESS_INVALID_ARGUMENTS);
- setResult(RESULT_CANCELED);
- finish();
- return;
- }
- String directoryName = intent.getStringExtra(EXTRA_DIRECTORY_NAME );
- if (directoryName == null) {
- directoryName = DIRECTORY_ROOT;
- }
- final StorageVolume volume = (StorageVolume) storageVolume;
- if (getScopedAccessPermissionStatus(getApplicationContext(), getCallingPackage(),
- volume.getUuid(), directoryName) == PERMISSION_NEVER_ASK) {
- logValidScopedAccessRequest(this, directoryName,
- SCOPED_DIRECTORY_ACCESS_ALREADY_DENIED);
- setResult(RESULT_CANCELED);
- finish();
- return;
- }
-
- final int userId = UserHandle.myUserId();
- if (!showFragment(this, userId, volume, directoryName)) {
- setResult(RESULT_CANCELED);
- finish();
- return;
- }
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- if (mExternalStorageClient != null) {
- mExternalStorageClient.close();
- }
- }
-
- /**
- * Validates the given path (volume + directory) and display the appropriate dialog asking the
- * user to grant access to it.
- */
- private static boolean showFragment(OpenExternalDirectoryActivity activity, int userId,
- StorageVolume storageVolume, String directoryName) {
- if (DEBUG)
- Log.d(TAG, "showFragment() for volume " + storageVolume.dump() + ", directory "
- + directoryName + ", and user " + userId);
- final boolean isRoot = directoryName.equals(DIRECTORY_ROOT);
- final boolean isPrimary = storageVolume.isPrimary();
-
- if (isRoot && isPrimary) {
- if (DEBUG) Log.d(TAG, "root access requested on primary volume");
- return false;
- }
-
- final File volumeRoot = storageVolume.getPathFile();
- File file;
- try {
- file = isRoot ? volumeRoot : new File(volumeRoot, directoryName).getCanonicalFile();
- } catch (IOException e) {
- Log.e(TAG, "Could not get canonical file for volume " + storageVolume.dump()
- + " and directory " + directoryName);
- logInvalidScopedAccessRequest(activity, SCOPED_DIRECTORY_ACCESS_ERROR);
- return false;
- }
- final StorageManager sm =
- (StorageManager) activity.getSystemService(Context.STORAGE_SERVICE);
-
- final String root, directory;
- if (isRoot) {
- root = volumeRoot.getAbsolutePath();
- directory = ".";
- } else {
- root = file.getParent();
- directory = file.getName();
- // Verify directory is valid.
- if (TextUtils.isEmpty(directory) || !isStandardDirectory(directory)) {
- if (DEBUG)
- Log.d(TAG, "Directory '" + directory + "' is not standard (full path: '"
- + file.getAbsolutePath() + "')");
- logInvalidScopedAccessRequest(activity, SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY);
- return false;
- }
- }
-
- // Gets volume label and converted path.
- String volumeLabel = null;
- String volumeUuid = null;
- final List<VolumeInfo> volumes = sm.getVolumes();
- if (DEBUG) Log.d(TAG, "Number of volumes: " + volumes.size());
- File internalRoot = null;
- boolean found = true;
- for (VolumeInfo volume : volumes) {
- if (isRightVolume(volume, root, userId)) {
- found = true;
- internalRoot = volume.getInternalPathForUser(userId);
- // Must convert path before calling getDocIdForFileCreateNewDir()
- if (DEBUG) Log.d(TAG, "Converting " + root + " to " + internalRoot);
- file = isRoot ? internalRoot : new File(internalRoot, directory);
- volumeUuid = storageVolume.getUuid();
- volumeLabel = sm.getBestVolumeDescription(volume);
- if (TextUtils.isEmpty(volumeLabel)) {
- volumeLabel = storageVolume.getDescription(activity);
- }
- if (TextUtils.isEmpty(volumeLabel)) {
- volumeLabel = activity.getString(android.R.string.unknownName);
- Log.w(TAG, "No volume description for " + volume + "; using " + volumeLabel);
- }
- break;
- }
- }
- if (internalRoot == null) {
- // Should not happen on normal circumstances, unless app crafted an invalid volume
- // using reflection or the list of mounted volumes changed.
- Log.e(TAG, "Didn't find right volume for '" + storageVolume.dump() + "' on " + volumes);
- return false;
- }
-
- // Checks if the user has granted the permission already.
- final Intent intent = getIntentForExistingPermission(activity, isRoot, internalRoot, file);
- if (intent != null) {
- logValidScopedAccessRequest(activity, directory,
- SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED);
- activity.setResult(RESULT_OK, intent);
- activity.finish();
- return true;
- }
-
- if (!found) {
- Log.e(TAG, "Could not get volume for " + file);
- logInvalidScopedAccessRequest(activity, SCOPED_DIRECTORY_ACCESS_ERROR);
- return false;
- }
-
- // Gets the package label.
- final String appLabel = getAppLabel(activity);
- if (appLabel == null) {
- // Error already logged.
- return false;
- }
-
- // Sets args that will be retrieve on onCreate()
- final Bundle args = new Bundle();
- args.putString(EXTRA_FILE, file.getAbsolutePath());
- args.putString(EXTRA_VOLUME_LABEL, volumeLabel);
- args.putString(EXTRA_VOLUME_UUID, volumeUuid);
- args.putString(EXTRA_APP_LABEL, appLabel);
- args.putBoolean(EXTRA_IS_ROOT, isRoot);
- args.putBoolean(EXTRA_IS_PRIMARY, isPrimary);
-
- final FragmentManager fm = activity.getFragmentManager();
- final FragmentTransaction ft = fm.beginTransaction();
- final OpenExternalDirectoryDialogFragment fragment =
- new OpenExternalDirectoryDialogFragment();
- fragment.setArguments(args);
- ft.add(fragment, FM_TAG);
- ft.commitAllowingStateLoss();
-
- return true;
- }
-
- private static String getAppLabel(Activity activity) {
- final String packageName = activity.getCallingPackage();
- final PackageManager pm = activity.getPackageManager();
- try {
- return pm.getApplicationLabel(pm.getApplicationInfo(packageName, 0)).toString();
- } catch (NameNotFoundException e) {
- logInvalidScopedAccessRequest(activity, SCOPED_DIRECTORY_ACCESS_ERROR);
- Log.w(TAG, "Could not get label for package " + packageName);
- return null;
- }
- }
-
- private static boolean isRightVolume(VolumeInfo volume, String root, int userId) {
- final File userPath = volume.getPathForUser(userId);
- final String path = userPath == null ? null : volume.getPathForUser(userId).getPath();
- final boolean isMounted = volume.isMountedReadable();
- if (DEBUG)
- Log.d(TAG, "Volume: " + volume
- + "\n\tuserId: " + userId
- + "\n\tuserPath: " + userPath
- + "\n\troot: " + root
- + "\n\tpath: " + path
- + "\n\tisMounted: " + isMounted);
-
- return isMounted && root.equals(path);
- }
-
- private static Uri getGrantedUriPermission(Context context, ContentProviderClient provider,
- File file) {
- // Calls ExternalStorageProvider to get the doc id for the file
- final Bundle bundle;
- try {
- bundle = provider.call("getDocIdForFileCreateNewDir", file.getPath(), null);
- } catch (RemoteException e) {
- Log.e(TAG, "Did not get doc id from External Storage provider for " + file, e);
- logInvalidScopedAccessRequest(context, SCOPED_DIRECTORY_ACCESS_ERROR);
- return null;
- }
- final String docId = bundle == null ? null : bundle.getString("DOC_ID");
- if (docId == null) {
- Log.e(TAG, "Did not get doc id from External Storage provider for " + file);
- logInvalidScopedAccessRequest(context, SCOPED_DIRECTORY_ACCESS_ERROR);
- return null;
- }
- if (DEBUG) Log.d(TAG, "doc id for " + file + ": " + docId);
-
- final Uri uri = DocumentsContract.buildTreeDocumentUri(EXTERNAL_STORAGE_AUTH, docId);
- if (uri == null) {
- Log.e(TAG, "Could not get URI for doc id " + docId);
- return null;
- }
- if (DEBUG) Log.d(TAG, "URI for " + file + ": " + uri);
- return uri;
- }
-
- private static Intent createGrantedUriPermissionsIntent(Context context,
- ContentProviderClient provider, File file) {
- final Uri uri = getGrantedUriPermission(context, provider, file);
- return createGrantedUriPermissionsIntent(uri);
- }
-
- private static Intent createGrantedUriPermissionsIntent(Uri uri) {
- final Intent intent = new Intent();
- intent.setData(uri);
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
- | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
- | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
- | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
- return intent;
- }
-
- private static Intent getIntentForExistingPermission(OpenExternalDirectoryActivity activity,
- boolean isRoot, File root, File file) {
- final String packageName = activity.getCallingPackage();
- final ContentProviderClient storageClient = activity.getExternalStorageClient();
- final Uri grantedUri = getGrantedUriPermission(activity, storageClient, file);
- final Uri rootUri = root.equals(file) ? grantedUri
- : getGrantedUriPermission(activity, storageClient, root);
-
- if (DEBUG)
- Log.d(TAG, "checking if " + packageName + " already has permission for " + grantedUri
- + " or its root (" + rootUri + ")");
- final ActivityManager am =
- (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
- for (UriPermission uriPermission : am.getGrantedUriPermissions(packageName).getList()) {
- final Uri uri = uriPermission.getUri();
- if (uri == null) {
- Log.w(TAG, "null URI for " + uriPermission);
- continue;
- }
- if (uri.equals(grantedUri) || uri.equals(rootUri)) {
- if (DEBUG) Log.d(TAG, packageName + " already has permission: " + uriPermission);
- return createGrantedUriPermissionsIntent(grantedUri);
- }
- }
- if (DEBUG) Log.d(TAG, packageName + " does not have permission for " + grantedUri);
- return null;
- }
-
- public static class OpenExternalDirectoryDialogFragment extends DialogFragment {
-
- private File mFile;
- private String mVolumeUuid;
- private String mVolumeLabel;
- private String mAppLabel;
- private boolean mIsRoot;
- private boolean mIsPrimary;
- private CheckBox mDontAskAgain;
- private OpenExternalDirectoryActivity mActivity;
- private AlertDialog mDialog;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setRetainInstance(true);
- final Bundle args = getArguments();
- if (args != null) {
- mFile = new File(args.getString(EXTRA_FILE));
- mVolumeUuid = args.getString(EXTRA_VOLUME_UUID);
- mVolumeLabel = args.getString(EXTRA_VOLUME_LABEL);
- mAppLabel = args.getString(EXTRA_APP_LABEL);
- mIsRoot = args.getBoolean(EXTRA_IS_ROOT);
- mIsPrimary= args.getBoolean(EXTRA_IS_PRIMARY);
- }
- mActivity = (OpenExternalDirectoryActivity) getActivity();
- }
-
- @Override
- public void onDestroyView() {
- // Workaround for https://code.google.com/p/android/issues/detail?id=17423
- if (mDialog != null && getRetainInstance()) {
- mDialog.setDismissMessage(null);
- }
- super.onDestroyView();
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- if (mDialog != null) {
- if (DEBUG) Log.d(TAG, "fragment.onCreateDialog(): reusing dialog");
- return mDialog;
- }
- if (mActivity != getActivity()) {
- // Sanity check.
- Log.wtf(TAG, "activity references don't match on onCreateDialog(): mActivity = "
- + mActivity + " , getActivity() = " + getActivity());
- mActivity = (OpenExternalDirectoryActivity) getActivity();
- }
- final String directory = mFile.getName();
- final String directoryName = mIsRoot ? DIRECTORY_ROOT : directory;
- final Context context = mActivity.getApplicationContext();
- final OnClickListener listener = new OnClickListener() {
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Intent intent = null;
- if (which == DialogInterface.BUTTON_POSITIVE) {
- intent = createGrantedUriPermissionsIntent(mActivity,
- mActivity.getExternalStorageClient(), mFile);
- }
- if (which == DialogInterface.BUTTON_NEGATIVE || intent == null) {
- logValidScopedAccessRequest(mActivity, directoryName,
- SCOPED_DIRECTORY_ACCESS_DENIED);
- final boolean checked = mDontAskAgain.isChecked();
- if (checked) {
- logValidScopedAccessRequest(mActivity, directory,
- SCOPED_DIRECTORY_ACCESS_DENIED_AND_PERSIST);
- setScopedAccessPermissionStatus(context, mActivity.getCallingPackage(),
- mVolumeUuid, directoryName, PERMISSION_NEVER_ASK);
- } else {
- setScopedAccessPermissionStatus(context, mActivity.getCallingPackage(),
- mVolumeUuid, directoryName, PERMISSION_ASK_AGAIN);
- }
- mActivity.setResult(RESULT_CANCELED);
- } else {
- logValidScopedAccessRequest(mActivity, directory,
- SCOPED_DIRECTORY_ACCESS_GRANTED);
- mActivity.setResult(RESULT_OK, intent);
- }
- mActivity.finish();
- }
- };
-
- @SuppressLint("InflateParams")
- // It's ok pass null ViewRoot on AlertDialogs.
- final View view = View.inflate(mActivity, R.layout.dialog_open_scoped_directory, null);
- final CharSequence message;
- if (mIsRoot) {
- message = TextUtils.expandTemplate(getText(
- R.string.open_external_dialog_root_request), mAppLabel, mVolumeLabel);
- } else {
- message = TextUtils.expandTemplate(
- getText(mIsPrimary ? R.string.open_external_dialog_request_primary_volume
- : R.string.open_external_dialog_request),
- mAppLabel, directory, mVolumeLabel);
- }
- final TextView messageField = (TextView) view.findViewById(R.id.message);
- messageField.setText(message);
- mDialog = new AlertDialog.Builder(mActivity, R.style.Theme_AppCompat_Light_Dialog_Alert)
- .setView(view)
- .setPositiveButton(R.string.allow, listener)
- .setNegativeButton(R.string.deny, listener)
- .create();
-
- mDontAskAgain = (CheckBox) view.findViewById(R.id.do_not_ask_checkbox);
- if (getScopedAccessPermissionStatus(context, mActivity.getCallingPackage(),
- mVolumeUuid, directoryName) == PERMISSION_ASK_AGAIN) {
- mDontAskAgain.setVisibility(View.VISIBLE);
- mDontAskAgain.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(!isChecked);
- }
- });
- }
-
- return mDialog;
- }
-
- @Override
- public void onCancel(DialogInterface dialog) {
- super.onCancel(dialog);
- final Activity activity = getActivity();
- logValidScopedAccessRequest(activity, mFile.getName(), SCOPED_DIRECTORY_ACCESS_DENIED);
- activity.setResult(RESULT_CANCELED);
- activity.finish();
- }
- }
-
- private synchronized ContentProviderClient getExternalStorageClient() {
- if (mExternalStorageClient == null) {
- mExternalStorageClient =
- getContentResolver().acquireContentProviderClient(EXTERNAL_STORAGE_AUTH);
- }
- return mExternalStorageClient;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/OperationDialogFragment.java b/packages/DocumentsUI/src/com/android/documentsui/OperationDialogFragment.java
deleted file mode 100644
index 9a3f7a8..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/OperationDialogFragment.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.annotation.IntDef;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.text.Html;
-
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-
-/**
- * Alert dialog for operation dialogs.
- */
-public class OperationDialogFragment extends DialogFragment {
-
- public static final int DIALOG_TYPE_UNKNOWN = 0;
- public static final int DIALOG_TYPE_FAILURE = 1;
- public static final int DIALOG_TYPE_CONVERTED = 2;
-
- @IntDef(flag = true, value = {
- DIALOG_TYPE_UNKNOWN,
- DIALOG_TYPE_FAILURE,
- DIALOG_TYPE_CONVERTED
- })
-
- @Retention(RetentionPolicy.SOURCE)
- public @interface DialogType {}
-
- private static final String TAG = "OperationDialogFragment";
-
- public static void show(FragmentManager fm, @DialogType int dialogType,
- ArrayList<DocumentInfo> failedSrcList, DocumentStack dstStack,
- @OpType int operationType) {
- final Bundle args = new Bundle();
- args.putInt(FileOperationService.EXTRA_DIALOG_TYPE, dialogType);
- args.putInt(FileOperationService.EXTRA_OPERATION, operationType);
- args.putParcelableArrayList(FileOperationService.EXTRA_SRC_LIST, failedSrcList);
-
- final FragmentTransaction ft = fm.beginTransaction();
- final OperationDialogFragment fragment = new OperationDialogFragment();
- fragment.setArguments(args);
-
- ft.add(fragment, TAG);
- ft.commitAllowingStateLoss();
- }
-
- @Override
- public Dialog onCreateDialog(Bundle inState) {
- super.onCreate(inState);
-
- final @DialogType int dialogType =
- getArguments().getInt(FileOperationService.EXTRA_DIALOG_TYPE);
- final @OpType int operationType =
- getArguments().getInt(FileOperationService.EXTRA_OPERATION);
- final ArrayList<DocumentInfo> srcList = getArguments().getParcelableArrayList(
- FileOperationService.EXTRA_SRC_LIST);
-
- final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- String messageFormat;
-
- switch (dialogType) {
- case DIALOG_TYPE_CONVERTED:
- messageFormat = getString(R.string.copy_converted_warning_content);
- break;
-
- case DIALOG_TYPE_FAILURE:
- switch (operationType) {
- case FileOperationService.OPERATION_COPY:
- messageFormat = getString(R.string.copy_failure_alert_content);
- break;
- case FileOperationService.OPERATION_DELETE:
- messageFormat = getString(R.string.delete_failure_alert_content);
- break;
- case FileOperationService.OPERATION_MOVE:
- messageFormat = getString(R.string.move_failure_alert_content);
- break;
- default:
- throw new UnsupportedOperationException();
- }
- break;
-
- default:
- throw new UnsupportedOperationException();
- }
-
- final StringBuilder list = new StringBuilder("<p>");
- for (DocumentInfo documentInfo : srcList) {
- list.append(String.format("• %s<br>", Html.escapeHtml(documentInfo.displayName)));
- }
- list.append("</p>");
- builder.setMessage(Html.fromHtml(String.format(messageFormat, list.toString())));
- builder.setPositiveButton(
- R.string.close,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
-
- return builder.create();
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/PackageReceiver.java b/packages/DocumentsUI/src/com/android/documentsui/PackageReceiver.java
deleted file mode 100644
index aef63af..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/PackageReceiver.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-/**
- * Clean up {@link RecentsProvider} when packages are removed.
- */
-public class PackageReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- final ContentResolver resolver = context.getContentResolver();
-
- final String action = intent.getAction();
- if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) {
- resolver.call(RecentsProvider.buildRecent(), RecentsProvider.METHOD_PURGE, null, null);
-
- } else if (Intent.ACTION_PACKAGE_DATA_CLEARED.equals(action)) {
- final Uri data = intent.getData();
- if (data != null) {
- final String packageName = data.getSchemeSpecificPart();
- resolver.call(RecentsProvider.buildRecent(), RecentsProvider.METHOD_PURGE_PACKAGE,
- packageName, null);
- }
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/PairedTask.java b/packages/DocumentsUI/src/com/android/documentsui/PairedTask.java
deleted file mode 100644
index b74acb8..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/PairedTask.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.app.Activity;
-import android.os.AsyncTask;
-
-/**
- * An {@link AsyncTask} that guards work with checks that a paired {@link Activity}
- * is still alive. Instances of this class make no progress.
- *
- * <p>Use this type of task for greater safety when executing tasks that might complete
- * after an Activity is destroyed.
- *
- * <p>Also useful as tasks can be static, limiting scope, but still have access to
- * the owning class (by way the A template and the mActivity field).
- *
- * @template Owner Activity type.
- * @template Input input type
- * @template Output output type
- */
-abstract class PairedTask<Owner extends Activity, Input, Output>
- extends AsyncTask<Input, Void, Output> {
-
- protected final Owner mOwner;
-
- public PairedTask(Owner owner) {
- mOwner = owner;
- }
-
- /** Called prior to run being executed. Analogous to {@link AsyncTask#onPreExecute} */
- void prepare() {}
-
- /** Analogous to {@link AsyncTask#doInBackground} */
- abstract Output run(Input... input);
-
- /** Analogous to {@link AsyncTask#onPostExecute} */
- abstract void finish(Output output);
-
- @Override
- final protected void onPreExecute() {
- if (mOwner.isDestroyed()) {
- return;
- }
- prepare();
- }
-
- @Override
- final protected Output doInBackground(Input... input) {
- if (mOwner.isDestroyed()) {
- return null;
- }
- return run(input);
- }
-
- @Override
- final protected void onPostExecute(Output result) {
- if (mOwner.isDestroyed()) {
- return;
- }
- finish(result);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java b/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java
deleted file mode 100644
index 933506c..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE;
-import static com.android.documentsui.services.FileOperationService.OPERATION_MOVE;
-import static com.android.documentsui.services.FileOperationService.OPERATION_UNKNOWN;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-/**
- * Display pick confirmation bar, usually for selecting a directory.
- */
-public class PickFragment extends Fragment {
- public static final String TAG = "PickFragment";
-
- private int mAction;
- // Only legal values are OPERATION_COPY, OPERATION_MOVE, and unset (OPERATION_UNKNOWN).
- private @OpType int mCopyOperationSubType = OPERATION_UNKNOWN;
- private DocumentInfo mPickTarget;
- private View mContainer;
- private Button mPick;
- private Button mCancel;
-
- public static void show(FragmentManager fm) {
- // Fragment can be restored by FragmentManager automatically.
- if (get(fm) != null) {
- return;
- }
-
- final PickFragment fragment = new PickFragment();
- final FragmentTransaction ft = fm.beginTransaction();
- ft.replace(R.id.container_save, fragment, TAG);
- ft.commitAllowingStateLoss();
- }
-
- public static PickFragment get(FragmentManager fm) {
- return (PickFragment) fm.findFragmentByTag(TAG);
- }
-
- @Override
- public View onCreateView(
- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- mContainer = inflater.inflate(R.layout.fragment_pick, container, false);
-
- mPick = (Button) mContainer.findViewById(android.R.id.button1);
- mPick.setOnClickListener(mPickListener);
-
- mCancel = (Button) mContainer.findViewById(android.R.id.button2);
- mCancel.setOnClickListener(mCancelListener);
-
- updateView();
- return mContainer;
- }
-
- private View.OnClickListener mPickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- final DocumentsActivity activity = DocumentsActivity.get(PickFragment.this);
- activity.onPickRequested(mPickTarget);
- }
- };
-
- private View.OnClickListener mCancelListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- final BaseActivity activity = BaseActivity.get(PickFragment.this);
- activity.setResult(Activity.RESULT_CANCELED);
- activity.finish();
- }
- };
-
- /**
- * @param action Which action defined in State is the picker shown for.
- */
- public void setPickTarget(
- int action, @OpType int copyOperationSubType, DocumentInfo pickTarget) {
- assert(copyOperationSubType != OPERATION_DELETE);
-
- mAction = action;
- mCopyOperationSubType = copyOperationSubType;
- mPickTarget = pickTarget;
- if (mContainer != null) {
- updateView();
- }
- }
-
- /**
- * Applies the state of fragment to the view components.
- */
- private void updateView() {
- switch (mAction) {
- case State.ACTION_OPEN_TREE:
- mPick.setText(R.string.button_select);
- mCancel.setVisibility(View.GONE);
- break;
- case State.ACTION_PICK_COPY_DESTINATION:
- mPick.setText(mCopyOperationSubType == OPERATION_MOVE
- ? R.string.button_move : R.string.button_copy);
- mCancel.setVisibility(View.VISIBLE);
- break;
- default:
- mContainer.setVisibility(View.GONE);
- return;
- }
-
- if (mPickTarget != null && (
- mAction == State.ACTION_OPEN_TREE ||
- mPickTarget.isCreateSupported())) {
- mContainer.setVisibility(View.VISIBLE);
- } else {
- mContainer.setVisibility(View.GONE);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ProviderExecutor.java b/packages/DocumentsUI/src/com/android/documentsui/ProviderExecutor.java
deleted file mode 100644
index 8145edc..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/ProviderExecutor.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.os.AsyncTask;
-
-import com.android.internal.annotations.GuardedBy;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class ProviderExecutor extends Thread implements Executor {
-
- @GuardedBy("sExecutors")
- private static HashMap<String, ProviderExecutor> sExecutors = new HashMap<>();
-
- public static ProviderExecutor forAuthority(String authority) {
- synchronized (sExecutors) {
- ProviderExecutor executor = sExecutors.get(authority);
- if (executor == null) {
- executor = new ProviderExecutor();
- executor.setName("ProviderExecutor: " + authority);
- executor.start();
- sExecutors.put(authority, executor);
- }
- return executor;
- }
- }
-
- public interface Preemptable {
- void preempt();
- }
-
- private final LinkedBlockingQueue<Runnable> mQueue = new LinkedBlockingQueue<Runnable>();
-
- private final ArrayList<WeakReference<Preemptable>> mPreemptable = new ArrayList<>();
-
- private void preempt() {
- synchronized (mPreemptable) {
- int count = 0;
- for (WeakReference<Preemptable> ref : mPreemptable) {
- final Preemptable p = ref.get();
- if (p != null) {
- count++;
- p.preempt();
- }
- }
- mPreemptable.clear();
- }
- }
-
- /**
- * Execute the given task. If given task is not {@link Preemptable}, it will
- * preempt all outstanding preemptable tasks.
- */
- public <P> void execute(AsyncTask<P, ?, ?> task, P... params) {
- if (task instanceof Preemptable) {
- synchronized (mPreemptable) {
- mPreemptable.add(new WeakReference<Preemptable>((Preemptable) task));
- }
- task.executeOnExecutor(mNonPreemptingExecutor, params);
- } else {
- task.executeOnExecutor(this, params);
- }
- }
-
- private Executor mNonPreemptingExecutor = new Executor() {
- @Override
- public void execute(Runnable command) {
- assert(command != null);
- mQueue.add(command);
- }
- };
-
- @Override
- public void execute(Runnable command) {
- preempt();
- assert(command != null);
- mQueue.add(command);
- }
-
- @Override
- public void run() {
- while (true) {
- try {
- final Runnable command = mQueue.take();
- command.run();
- } catch (InterruptedException e) {
- // That was weird; let's go look for more tasks.
- }
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
deleted file mode 100644
index af6aee7..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.MAX_DOCS_IN_INTENT;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.content.ClipData;
-import android.content.ClipDescription;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.Range;
-
-import com.android.documentsui.dirlist.Model;
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Provides support for gather a list of quick-viewable files into a quick view intent.
- */
-final class QuickViewIntentBuilder {
-
- private static final String TAG = "QuickViewIntentBuilder";
-
- private final DocumentInfo mDocument;
- private final Model mModel;
-
- private final PackageManager mPkgManager;
- private final Resources mResources;
-
- public QuickViewIntentBuilder(
- PackageManager pkgManager,
- Resources resources,
- DocumentInfo doc,
- Model model) {
-
- mPkgManager = pkgManager;
- mResources = resources;
- mDocument = doc;
- mModel = model;
- }
-
- /**
- * Builds the intent for quick viewing. Short circuits building if a handler cannot
- * be resolved; in this case {@code null} is returned.
- */
- @Nullable Intent build() {
- if (DEBUG) Log.d(TAG, "Preparing intent for doc:" + mDocument.documentId);
-
- String trustedPkg = mResources.getString(R.string.trusted_quick_viewer_package);
-
- if (!TextUtils.isEmpty(trustedPkg)) {
- Intent intent = new Intent(Intent.ACTION_QUICK_VIEW);
- intent.setDataAndType(mDocument.derivedUri, mDocument.mimeType);
- intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.setPackage(trustedPkg);
- if (hasRegisteredHandler(intent)) {
- final ArrayList<Uri> uris = new ArrayList<Uri>();
- final int documentLocation = collectViewableUris(uris);
- final Range<Integer> range = computeSiblingsRange(uris, documentLocation);
-
- ClipData clipData = null;
- ClipData.Item item;
- Uri uri;
- for (int i = range.getLower(); i <= range.getUpper(); i++) {
- uri = uris.get(i);
- item = new ClipData.Item(uri);
- if (DEBUG) Log.d(TAG, "Including file: " + uri);
- if (clipData == null) {
- clipData = new ClipData(
- "URIs", new String[] { ClipDescription.MIMETYPE_TEXT_URILIST },
- item);
- } else {
- clipData.addItem(item);
- }
- }
-
- // The documentLocation variable contains an index in "uris". However,
- // ClipData contains a slice of "uris", so we need to shift the location
- // so it points to the same Uri.
- intent.putExtra(Intent.EXTRA_INDEX, documentLocation - range.getLower());
- intent.setClipData(clipData);
-
- return intent;
- } else {
- Log.e(TAG, "Can't resolve trusted quick view package: " + trustedPkg);
- }
- }
-
- return null;
- }
-
- private int collectViewableUris(ArrayList<Uri> uris) {
- final String[] siblingIds = mModel.getModelIds();
- uris.ensureCapacity(siblingIds.length);
-
- int documentLocation = 0;
- Cursor cursor;
- String mimeType;
- String id;
- String authority;
- Uri uri;
-
- // Cursor's are not guaranteed to be immutable. Hence, traverse it only once.
- for (int i = 0; i < siblingIds.length; i++) {
- cursor = mModel.getItem(siblingIds[i]);
-
- if (cursor == null) {
- if (DEBUG) Log.d(TAG,
- "Unable to obtain cursor for sibling document, modelId: "
- + siblingIds[i]);
- continue;
- }
-
- mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- if (DEBUG) Log.d(TAG,
- "Skipping directory, not supported by quick view. modelId: "
- + siblingIds[i]);
- continue;
- }
-
- id = getCursorString(cursor, Document.COLUMN_DOCUMENT_ID);
- authority = getCursorString(cursor, RootCursorWrapper.COLUMN_AUTHORITY);
- uri = DocumentsContract.buildDocumentUri(authority, id);
-
- uris.add(uri);
-
- if (id.equals(mDocument.documentId)) {
- documentLocation = uris.size() - 1; // Position in "uris", not in the model.
- if (DEBUG) Log.d(TAG, "Found starting point for QV. " + documentLocation);
- }
- }
-
- return documentLocation;
- }
-
- private static Range<Integer> computeSiblingsRange(List<Uri> uris, int documentLocation) {
- // Restrict number of siblings to avoid hitting the IPC limit.
- // TODO: Remove this restriction once ClipData can hold an arbitrary number of
- // items.
- int firstSibling;
- int lastSibling;
- if (documentLocation < uris.size() / 2) {
- firstSibling = Math.max(0, documentLocation - MAX_DOCS_IN_INTENT / 2);
- lastSibling = Math.min(uris.size() - 1, firstSibling + MAX_DOCS_IN_INTENT - 1);
- } else {
- lastSibling = Math.min(uris.size() - 1, documentLocation + MAX_DOCS_IN_INTENT / 2);
- firstSibling = Math.max(0, lastSibling - MAX_DOCS_IN_INTENT + 1);
- }
-
- if (DEBUG) Log.d(TAG, "Copmuted siblings from index: " + firstSibling
- + " to: " + lastSibling);
-
- return new Range(firstSibling, lastSibling);
- }
-
- private boolean hasRegisteredHandler(Intent intent) {
- // Try to resolve the intent. If a matching app isn't installed, it won't resolve.
- return intent.resolveActivity(mPkgManager) != null;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
deleted file mode 100644
index 7bdfe8e..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.TAG;
-import static com.android.documentsui.State.ACTION_CREATE;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Loader;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils.TruncateAt;
-import android.text.style.ImageSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.documentsui.Events.MotionInputEvent;
-import com.android.documentsui.RecentsProvider.RecentColumns;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.DurableUtils;
-import com.android.documentsui.model.RootInfo;
-
-import libcore.io.IoUtils;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Display directories where recent creates took place.
- */
-public class RecentsCreateFragment extends Fragment {
-
- private View mEmptyView;
- private RecyclerView mRecView;
- private DocumentStackAdapter mAdapter;
- private LoaderCallbacks<List<DocumentStack>> mCallbacks;
-
- private static final int LOADER_RECENTS = 3;
-
- public static void show(FragmentManager fm) {
- final RecentsCreateFragment fragment = new RecentsCreateFragment();
- final FragmentTransaction ft = fm.beginTransaction();
- ft.replace(R.id.container_directory, fragment);
- ft.commitAllowingStateLoss();
- }
-
- @Override
- public View onCreateView(
- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- final Context context = inflater.getContext();
-
- final View view = inflater.inflate(R.layout.fragment_directory, container, false);
-
- mRecView = (RecyclerView) view.findViewById(R.id.dir_list);
- mRecView.setLayoutManager(new LinearLayoutManager(getContext()));
- mRecView.addOnItemTouchListener(mItemListener);
-
- mEmptyView = view.findViewById(android.R.id.empty);
-
- mAdapter = new DocumentStackAdapter();
- mRecView.setAdapter(mAdapter);
-
- final RootsCache roots = DocumentsApplication.getRootsCache(context);
- final State state = ((BaseActivity) getActivity()).getDisplayState();
-
- mCallbacks = new LoaderCallbacks<List<DocumentStack>>() {
- @Override
- public Loader<List<DocumentStack>> onCreateLoader(int id, Bundle args) {
- return new RecentsCreateLoader(context, roots, state);
- }
-
- @Override
- public void onLoadFinished(
- Loader<List<DocumentStack>> loader, List<DocumentStack> data) {
- mAdapter.update(data);
-
- // When launched into empty recents, show drawer
- if (mAdapter.isEmpty() && !state.hasLocationChanged()
- && state.action != ACTION_CREATE
- && context instanceof DocumentsActivity) {
- ((DocumentsActivity) context).setRootsDrawerOpen(true);
- }
- }
-
- @Override
- public void onLoaderReset(Loader<List<DocumentStack>> loader) {
- mAdapter.update(null);
- }
- };
-
- return view;
- }
-
- @Override
- public void onStart() {
- super.onStart();
- getLoaderManager().restartLoader(LOADER_RECENTS, getArguments(), mCallbacks);
- }
-
- @Override
- public void onStop() {
- super.onStop();
- getLoaderManager().destroyLoader(LOADER_RECENTS);
- }
-
- private RecyclerView.OnItemTouchListener mItemListener =
- new RecyclerView.OnItemTouchListener() {
- @Override
- public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
- final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);
- try {
- if (event.isOverItem() && event.isActionUp()) {
- final DocumentStack stack = mAdapter.getItem(event.getItemPosition());
- ((BaseActivity) getActivity()).onStackPicked(stack);
- return true;
- }
-
- return false;
- } finally {
- event.recycle();
- }
- }
-
- @Override
- public void onTouchEvent(RecyclerView rv, MotionEvent e) {}
- @Override
- public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {}
- };
-
- public static class RecentsCreateLoader extends UriDerivativeLoader<Uri, List<DocumentStack>> {
- private final RootsCache mRoots;
- private final State mState;
-
- public RecentsCreateLoader(Context context, RootsCache roots, State state) {
- super(context, RecentsProvider.buildRecent());
- mRoots = roots;
- mState = state;
- }
-
- @Override
- public List<DocumentStack> loadInBackground(Uri uri, CancellationSignal signal) {
- final Collection<RootInfo> matchingRoots = mRoots.getMatchingRootsBlocking(mState);
- final ArrayList<DocumentStack> result = new ArrayList<>();
-
- final ContentResolver resolver = getContext().getContentResolver();
- final Cursor cursor = resolver.query(
- uri, null, null, null, RecentColumns.TIMESTAMP + " DESC", signal);
- try {
- while (cursor != null && cursor.moveToNext()) {
- final byte[] rawStack = cursor.getBlob(
- cursor.getColumnIndex(RecentColumns.STACK));
- try {
- final DocumentStack stack = new DocumentStack();
- DurableUtils.readFromArray(rawStack, stack);
-
- // Only update root here to avoid spinning up all
- // providers; we update the stack during the actual
- // restore. This also filters away roots that don't
- // match current filter.
- stack.updateRoot(matchingRoots);
- result.add(stack);
- } catch (IOException e) {
- Log.w(TAG, "Failed to resolve stack: " + e);
- }
- }
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- return result;
- }
- }
-
- private static final class StackHolder extends RecyclerView.ViewHolder {
- public View view;
- public StackHolder(View view) {
- super(view);
- this.view = view;
- }
- }
-
- private class DocumentStackAdapter extends RecyclerView.Adapter<StackHolder> {
- @Nullable private List<DocumentStack> mItems;
-
- DocumentStack getItem(int position) {
- return mItems.get(position);
- }
-
- @Override
- public int getItemCount() {
- return mItems == null ? 0 : mItems.size();
- }
-
- boolean isEmpty() {
- return mItems == null ? true : mItems.isEmpty();
- }
-
- void update(@Nullable List<DocumentStack> items) {
- mItems = items;
-
- if (isEmpty()) {
- mEmptyView.setVisibility(View.VISIBLE);
- } else {
- mEmptyView.setVisibility(View.GONE);
- }
-
- notifyDataSetChanged();
- }
-
- @Override
- public StackHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- final Context context = parent.getContext();
-
- final LayoutInflater inflater = LayoutInflater.from(context);
- return new StackHolder(
- (View) inflater.inflate(R.layout.item_doc_list, parent, false));
- }
-
- @Override
- public void onBindViewHolder(StackHolder holder, int position) {
- Context context = getContext();
- View view = holder.view;
-
- final ImageView iconMime = (ImageView) view.findViewById(R.id.icon_mime);
- final TextView title = (TextView) view.findViewById(android.R.id.title);
- final View line2 = view.findViewById(R.id.line2);
-
- final DocumentStack stack = getItem(position);
- iconMime.setImageDrawable(stack.root.loadIcon(context));
-
- final Drawable crumb = context.getDrawable(R.drawable.ic_breadcrumb_arrow);
- crumb.setBounds(0, 0, crumb.getIntrinsicWidth(), crumb.getIntrinsicHeight());
-
- final SpannableStringBuilder builder = new SpannableStringBuilder();
- builder.append(stack.root.title);
- for (int i = stack.size() - 2; i >= 0; i--) {
- appendDrawable(builder, crumb);
- builder.append(stack.get(i).displayName);
- }
- title.setText(builder);
- title.setEllipsize(TruncateAt.MIDDLE);
-
- if (line2 != null) line2.setVisibility(View.GONE);
- }
- }
-
- private static void appendDrawable(SpannableStringBuilder b, Drawable d) {
- final int length = b.length();
- b.append("\u232a");
- b.setSpan(new ImageSpan(d), length, b.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java
deleted file mode 100644
index cebc9b0..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.TAG;
-import static com.android.documentsui.State.SORT_ORDER_LAST_MODIFIED;
-
-import android.app.ActivityManager;
-import android.content.AsyncTaskLoader;
-import android.content.ContentProviderClient;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MergeCursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.text.format.DateUtils;
-import android.util.Log;
-
-import com.android.documentsui.model.RootInfo;
-import com.android.internal.annotations.GuardedBy;
-
-import com.google.common.util.concurrent.AbstractFuture;
-
-import libcore.io.IoUtils;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> {
- // TODO: clean up cursor ownership so background thread doesn't traverse
- // previously returned cursors for filtering/sorting; this currently races
- // with the UI thread.
-
- private static final int MAX_OUTSTANDING_RECENTS = 4;
- private static final int MAX_OUTSTANDING_RECENTS_SVELTE = 2;
-
- /**
- * Time to wait for first pass to complete before returning partial results.
- */
- private static final int MAX_FIRST_PASS_WAIT_MILLIS = 500;
-
- /** Maximum documents from a single root. */
- private static final int MAX_DOCS_FROM_ROOT = 64;
-
- /** Ignore documents older than this age. */
- private static final long REJECT_OLDER_THAN = 45 * DateUtils.DAY_IN_MILLIS;
-
- /** MIME types that should always be excluded from recents. */
- private static final String[] RECENT_REJECT_MIMES = new String[] { Document.MIME_TYPE_DIR };
-
- private final Semaphore mQueryPermits;
-
- private final RootsCache mRoots;
- private final State mState;
-
- @GuardedBy("mTasks")
- private final HashMap<RootInfo, RecentsTask> mTasks = new HashMap<>();
-
- private final int mSortOrder = State.SORT_ORDER_LAST_MODIFIED;
-
- private CountDownLatch mFirstPassLatch;
- private volatile boolean mFirstPassDone;
-
- private DirectoryResult mResult;
-
- public RecentsLoader(Context context, RootsCache roots, State state) {
- super(context);
- mRoots = roots;
- mState = state;
-
- // Keep clients around on high-RAM devices, since we'd be spinning them
- // up moments later to fetch thumbnails anyway.
- final ActivityManager am = (ActivityManager) getContext().getSystemService(
- Context.ACTIVITY_SERVICE);
- mQueryPermits = new Semaphore(
- am.isLowRamDevice() ? MAX_OUTSTANDING_RECENTS_SVELTE : MAX_OUTSTANDING_RECENTS);
- }
-
- @Override
- public DirectoryResult loadInBackground() {
- synchronized (mTasks) {
- return loadInBackgroundLocked();
- }
- }
-
- private DirectoryResult loadInBackgroundLocked() {
- if (mFirstPassLatch == null) {
- // First time through we kick off all the recent tasks, and wait
- // around to see if everyone finishes quickly.
-
- final Collection<RootInfo> roots = mRoots.getMatchingRootsBlocking(mState);
- for (RootInfo root : roots) {
- if (root.supportsRecents()) {
- mTasks.put(root, new RecentsTask(root.authority, root.rootId));
- }
- }
-
- mFirstPassLatch = new CountDownLatch(mTasks.size());
- for (RecentsTask task : mTasks.values()) {
- ProviderExecutor.forAuthority(task.authority).execute(task);
- }
-
- try {
- mFirstPassLatch.await(MAX_FIRST_PASS_WAIT_MILLIS, TimeUnit.MILLISECONDS);
- mFirstPassDone = true;
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
-
- final long rejectBefore = System.currentTimeMillis() - REJECT_OLDER_THAN;
-
- // Collect all finished tasks
- boolean allDone = true;
- List<Cursor> cursors = new ArrayList<>();
- for (RecentsTask task : mTasks.values()) {
- if (task.isDone()) {
- try {
- final Cursor cursor = task.get();
- if (cursor == null) continue;
-
- final FilteringCursorWrapper filtered = new FilteringCursorWrapper(
- cursor, mState.acceptMimes, RECENT_REJECT_MIMES, rejectBefore) {
- @Override
- public void close() {
- // Ignored, since we manage cursor lifecycle internally
- }
- };
- cursors.add(filtered);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- } catch (ExecutionException e) {
- // We already logged on other side
- }
- } else {
- allDone = false;
- }
- }
-
- if (DEBUG) {
- Log.d(TAG, "Found " + cursors.size() + " of " + mTasks.size() + " recent queries done");
- }
-
- final DirectoryResult result = new DirectoryResult();
- result.sortOrder = SORT_ORDER_LAST_MODIFIED;
-
- final Cursor merged;
- if (cursors.size() > 0) {
- merged = new MergeCursor(cursors.toArray(new Cursor[cursors.size()]));
- } else {
- // Return something when nobody is ready
- merged = new MatrixCursor(new String[0]);
- }
-
- // Tell the UI if this is an in-progress result. When loading is complete, another update is
- // sent with EXTRA_LOADING set to false.
- Bundle extras = new Bundle();
- extras.putBoolean(DocumentsContract.EXTRA_LOADING, !allDone);
- merged.setExtras(extras);
-
- result.cursor = merged;
-
- return result;
- }
-
- @Override
- public void cancelLoadInBackground() {
- super.cancelLoadInBackground();
- }
-
- @Override
- public void deliverResult(DirectoryResult result) {
- if (isReset()) {
- IoUtils.closeQuietly(result);
- return;
- }
- DirectoryResult oldResult = mResult;
- mResult = result;
-
- if (isStarted()) {
- super.deliverResult(result);
- }
-
- if (oldResult != null && oldResult != result) {
- IoUtils.closeQuietly(oldResult);
- }
- }
-
- @Override
- protected void onStartLoading() {
- if (mResult != null) {
- deliverResult(mResult);
- }
- if (takeContentChanged() || mResult == null) {
- forceLoad();
- }
- }
-
- @Override
- protected void onStopLoading() {
- cancelLoad();
- }
-
- @Override
- public void onCanceled(DirectoryResult result) {
- IoUtils.closeQuietly(result);
- }
-
- @Override
- protected void onReset() {
- super.onReset();
-
- // Ensure the loader is stopped
- onStopLoading();
-
- synchronized (mTasks) {
- for (RecentsTask task : mTasks.values()) {
- IoUtils.closeQuietly(task);
- }
- }
-
- IoUtils.closeQuietly(mResult);
- mResult = null;
- }
-
- // TODO: create better transfer of ownership around cursor to ensure its
- // closed in all edge cases.
-
- public class RecentsTask extends AbstractFuture<Cursor> implements Runnable, Closeable {
- public final String authority;
- public final String rootId;
-
- private Cursor mWithRoot;
-
- public RecentsTask(String authority, String rootId) {
- this.authority = authority;
- this.rootId = rootId;
- }
-
- @Override
- public void run() {
- if (isCancelled()) return;
-
- try {
- mQueryPermits.acquire();
- } catch (InterruptedException e) {
- return;
- }
-
- try {
- runInternal();
- } finally {
- mQueryPermits.release();
- }
- }
-
- public void runInternal() {
- ContentProviderClient client = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(
- getContext().getContentResolver(), authority);
-
- final Uri uri = DocumentsContract.buildRecentDocumentsUri(authority, rootId);
- final Cursor cursor = client.query(
- uri, null, null, null, DirectoryLoader.getQuerySortOrder(mSortOrder));
- mWithRoot = new RootCursorWrapper(authority, rootId, cursor, MAX_DOCS_FROM_ROOT);
-
- } catch (Exception e) {
- Log.w(TAG, "Failed to load " + authority + ", " + rootId, e);
- } finally {
- ContentProviderClient.releaseQuietly(client);
- }
-
- set(mWithRoot);
-
- mFirstPassLatch.countDown();
- if (mFirstPassDone) {
- onContentChanged();
- }
- }
-
- @Override
- public void close() throws IOException {
- IoUtils.closeQuietly(mWithRoot);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java
deleted file mode 100644
index 6ef9154..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.UriMatcher;
-import android.content.pm.ResolveInfo;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsContract.Root;
-import android.text.format.DateUtils;
-import android.util.Log;
-
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.DurableUtils;
-import com.android.internal.util.Predicate;
-
-import com.google.android.collect.Sets;
-
-import libcore.io.IoUtils;
-
-import java.io.IOException;
-import java.util.Set;
-
-public class RecentsProvider extends ContentProvider {
- private static final String TAG = "RecentsProvider";
-
- private static final long MAX_HISTORY_IN_MILLIS = 45 * DateUtils.DAY_IN_MILLIS;
-
- private static final String AUTHORITY = "com.android.documentsui.recents";
-
- private static final UriMatcher sMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-
- private static final int URI_RECENT = 1;
- private static final int URI_STATE = 2;
- private static final int URI_RESUME = 3;
-
- public static final String METHOD_PURGE = "purge";
- public static final String METHOD_PURGE_PACKAGE = "purgePackage";
-
- static {
- sMatcher.addURI(AUTHORITY, "recent", URI_RECENT);
- // state/authority/rootId/docId
- sMatcher.addURI(AUTHORITY, "state/*/*/*", URI_STATE);
- // resume/packageName
- sMatcher.addURI(AUTHORITY, "resume/*", URI_RESUME);
- }
-
- public static final String TABLE_RECENT = "recent";
- public static final String TABLE_STATE = "state";
- public static final String TABLE_RESUME = "resume";
-
- public static class RecentColumns {
- public static final String KEY = "key";
- public static final String STACK = "stack";
- public static final String TIMESTAMP = "timestamp";
- }
-
- public static class StateColumns {
- public static final String AUTHORITY = "authority";
- public static final String ROOT_ID = Root.COLUMN_ROOT_ID;
- public static final String DOCUMENT_ID = Document.COLUMN_DOCUMENT_ID;
-
- @Deprecated // mode is tracked in local preferences now...by root only
- public static final String MODE = "mode";
- public static final String SORT_ORDER = "sortOrder";
- }
-
- public static class ResumeColumns {
- public static final String PACKAGE_NAME = "package_name";
- public static final String STACK = "stack";
- public static final String TIMESTAMP = "timestamp";
- // Indicates handler was an external app, like photos.
- public static final String EXTERNAL = "external";
- }
-
- public static Uri buildRecent() {
- return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
- .authority(AUTHORITY).appendPath("recent").build();
- }
-
- public static Uri buildState(String authority, String rootId, String documentId) {
- return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(AUTHORITY)
- .appendPath("state").appendPath(authority).appendPath(rootId).appendPath(documentId)
- .build();
- }
-
- public static Uri buildResume(String packageName) {
- return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
- .authority(AUTHORITY).appendPath("resume").appendPath(packageName).build();
- }
-
- private DatabaseHelper mHelper;
-
- private static class DatabaseHelper extends SQLiteOpenHelper {
- private static final String DB_NAME = "recents.db";
-
- private static final int VERSION_INIT = 1;
- private static final int VERSION_AS_BLOB = 3;
- private static final int VERSION_ADD_EXTERNAL = 4;
- private static final int VERSION_ADD_RECENT_KEY = 5;
-
- public DatabaseHelper(Context context) {
- super(context, DB_NAME, null, VERSION_ADD_RECENT_KEY);
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
-
- db.execSQL("CREATE TABLE " + TABLE_RECENT + " (" +
- RecentColumns.KEY + " TEXT PRIMARY KEY ON CONFLICT REPLACE," +
- RecentColumns.STACK + " BLOB DEFAULT NULL," +
- RecentColumns.TIMESTAMP + " INTEGER" +
- ")");
-
- db.execSQL("CREATE TABLE " + TABLE_STATE + " (" +
- StateColumns.AUTHORITY + " TEXT," +
- StateColumns.ROOT_ID + " TEXT," +
- StateColumns.DOCUMENT_ID + " TEXT," +
- StateColumns.MODE + " INTEGER," +
- StateColumns.SORT_ORDER + " INTEGER," +
- "PRIMARY KEY (" + StateColumns.AUTHORITY + ", " + StateColumns.ROOT_ID + ", "
- + StateColumns.DOCUMENT_ID + ")" +
- ")");
-
- db.execSQL("CREATE TABLE " + TABLE_RESUME + " (" +
- ResumeColumns.PACKAGE_NAME + " TEXT NOT NULL PRIMARY KEY," +
- ResumeColumns.STACK + " BLOB DEFAULT NULL," +
- ResumeColumns.TIMESTAMP + " INTEGER," +
- ResumeColumns.EXTERNAL + " INTEGER NOT NULL DEFAULT 0" +
- ")");
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- Log.w(TAG, "Upgrading database; wiping app data");
- db.execSQL("DROP TABLE IF EXISTS " + TABLE_RECENT);
- db.execSQL("DROP TABLE IF EXISTS " + TABLE_STATE);
- db.execSQL("DROP TABLE IF EXISTS " + TABLE_RESUME);
- onCreate(db);
- }
- }
-
- @Override
- public boolean onCreate() {
- mHelper = new DatabaseHelper(getContext());
- return true;
- }
-
- @Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
- final SQLiteDatabase db = mHelper.getReadableDatabase();
- switch (sMatcher.match(uri)) {
- case URI_RECENT:
- final long cutoff = System.currentTimeMillis() - MAX_HISTORY_IN_MILLIS;
- return db.query(TABLE_RECENT, projection, RecentColumns.TIMESTAMP + ">" + cutoff,
- null, null, null, sortOrder);
- case URI_STATE:
- final String authority = uri.getPathSegments().get(1);
- final String rootId = uri.getPathSegments().get(2);
- final String documentId = uri.getPathSegments().get(3);
- return db.query(TABLE_STATE, projection, StateColumns.AUTHORITY + "=? AND "
- + StateColumns.ROOT_ID + "=? AND " + StateColumns.DOCUMENT_ID + "=?",
- new String[] { authority, rootId, documentId }, null, null, sortOrder);
- case URI_RESUME:
- final String packageName = uri.getPathSegments().get(1);
- return db.query(TABLE_RESUME, projection, ResumeColumns.PACKAGE_NAME + "=?",
- new String[] { packageName }, null, null, sortOrder);
- default:
- throw new UnsupportedOperationException("Unsupported Uri " + uri);
- }
- }
-
- @Override
- public String getType(Uri uri) {
- return null;
- }
-
- @Override
- public Uri insert(Uri uri, ContentValues values) {
- final SQLiteDatabase db = mHelper.getWritableDatabase();
- final ContentValues key = new ContentValues();
- switch (sMatcher.match(uri)) {
- case URI_RECENT:
- values.put(RecentColumns.TIMESTAMP, System.currentTimeMillis());
- db.insert(TABLE_RECENT, null, values);
- final long cutoff = System.currentTimeMillis() - MAX_HISTORY_IN_MILLIS;
- db.delete(TABLE_RECENT, RecentColumns.TIMESTAMP + "<" + cutoff, null);
- return uri;
- case URI_STATE:
- final String authority = uri.getPathSegments().get(1);
- final String rootId = uri.getPathSegments().get(2);
- final String documentId = uri.getPathSegments().get(3);
-
- key.put(StateColumns.AUTHORITY, authority);
- key.put(StateColumns.ROOT_ID, rootId);
- key.put(StateColumns.DOCUMENT_ID, documentId);
-
- // Ensure that row exists, then update with changed values
- db.insertWithOnConflict(TABLE_STATE, null, key, SQLiteDatabase.CONFLICT_IGNORE);
- db.update(TABLE_STATE, values, StateColumns.AUTHORITY + "=? AND "
- + StateColumns.ROOT_ID + "=? AND " + StateColumns.DOCUMENT_ID + "=?",
- new String[] { authority, rootId, documentId });
-
- return uri;
- case URI_RESUME:
- values.put(ResumeColumns.TIMESTAMP, System.currentTimeMillis());
-
- final String packageName = uri.getPathSegments().get(1);
- key.put(ResumeColumns.PACKAGE_NAME, packageName);
-
- // Ensure that row exists, then update with changed values
- db.insertWithOnConflict(TABLE_RESUME, null, key, SQLiteDatabase.CONFLICT_IGNORE);
- db.update(TABLE_RESUME, values, ResumeColumns.PACKAGE_NAME + "=?",
- new String[] { packageName });
- return uri;
- default:
- throw new UnsupportedOperationException("Unsupported Uri " + uri);
- }
- }
-
- @Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
- throw new UnsupportedOperationException("Unsupported Uri " + uri);
- }
-
- @Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
- throw new UnsupportedOperationException("Unsupported Uri " + uri);
- }
-
- @Override
- public Bundle call(String method, String arg, Bundle extras) {
- if (METHOD_PURGE.equals(method)) {
- // Purge references to unknown authorities
- final Intent intent = new Intent(DocumentsContract.PROVIDER_INTERFACE);
- final Set<String> knownAuth = Sets.newHashSet();
- for (ResolveInfo info : getContext()
- .getPackageManager().queryIntentContentProviders(intent, 0)) {
- knownAuth.add(info.providerInfo.authority);
- }
-
- purgeByAuthority(new Predicate<String>() {
- @Override
- public boolean apply(String authority) {
- // Purge unknown authorities
- return !knownAuth.contains(authority);
- }
- });
-
- return null;
-
- } else if (METHOD_PURGE_PACKAGE.equals(method)) {
- // Purge references to authorities in given package
- final Intent intent = new Intent(DocumentsContract.PROVIDER_INTERFACE);
- intent.setPackage(arg);
- final Set<String> packageAuth = Sets.newHashSet();
- for (ResolveInfo info : getContext()
- .getPackageManager().queryIntentContentProviders(intent, 0)) {
- packageAuth.add(info.providerInfo.authority);
- }
-
- if (!packageAuth.isEmpty()) {
- purgeByAuthority(new Predicate<String>() {
- @Override
- public boolean apply(String authority) {
- // Purge authority matches
- return packageAuth.contains(authority);
- }
- });
- }
-
- return null;
-
- } else {
- return super.call(method, arg, extras);
- }
- }
-
- /**
- * Purge all internal data whose authority matches the given
- * {@link Predicate}.
- */
- private void purgeByAuthority(Predicate<String> predicate) {
- final SQLiteDatabase db = mHelper.getWritableDatabase();
- final DocumentStack stack = new DocumentStack();
-
- Cursor cursor = db.query(TABLE_RECENT, null, null, null, null, null, null);
- try {
- while (cursor.moveToNext()) {
- try {
- final byte[] rawStack = cursor.getBlob(
- cursor.getColumnIndex(RecentColumns.STACK));
- DurableUtils.readFromArray(rawStack, stack);
-
- if (stack.root != null && predicate.apply(stack.root.authority)) {
- final String key = getCursorString(cursor, RecentColumns.KEY);
- db.delete(TABLE_RECENT, RecentColumns.KEY + "=?", new String[] { key });
- }
- } catch (IOException ignored) {
- }
- }
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- cursor = db.query(TABLE_STATE, new String[] {
- StateColumns.AUTHORITY }, null, null, StateColumns.AUTHORITY, null, null);
- try {
- while (cursor.moveToNext()) {
- final String authority = getCursorString(cursor, StateColumns.AUTHORITY);
- if (predicate.apply(authority)) {
- db.delete(TABLE_STATE, StateColumns.AUTHORITY + "=?", new String[] {
- authority });
- if (DEBUG) Log.d(TAG, "Purged state for " + authority);
- }
- }
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- cursor = db.query(TABLE_RESUME, null, null, null, null, null, null);
- try {
- while (cursor.moveToNext()) {
- try {
- final byte[] rawStack = cursor.getBlob(
- cursor.getColumnIndex(ResumeColumns.STACK));
- DurableUtils.readFromArray(rawStack, stack);
-
- if (stack.root != null && predicate.apply(stack.root.authority)) {
- final String packageName = getCursorString(
- cursor, ResumeColumns.PACKAGE_NAME);
- db.delete(TABLE_RESUME, ResumeColumns.PACKAGE_NAME + "=?",
- new String[] { packageName });
- }
- } catch (IOException ignored) {
- }
- }
- } finally {
- IoUtils.closeQuietly(cursor);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RetainedState.java b/packages/DocumentsUI/src/com/android/documentsui/RetainedState.java
deleted file mode 100644
index 57cf3b4..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RetainedState.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.support.annotation.Nullable;
-
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-
-/**
- * Object used to collect retained state from activity and fragments. Used
- * with Activity#onRetainNonConfigurationInstance. Information stored in
- * this class should be primarily ephemeral as instances of the class
- * only last across configuration changes (like device rotation). When
- * an application is fully town down, all instances are lost, fa-evah!
- */
-public final class RetainedState {
- public @Nullable Selection selection;
-
- public boolean hasSelection() {
- return selection != null;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootCursorWrapper.java b/packages/DocumentsUI/src/com/android/documentsui/RootCursorWrapper.java
deleted file mode 100644
index 0b58218..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RootCursorWrapper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.database.AbstractCursor;
-import android.database.Cursor;
-import android.os.Bundle;
-
-/**
- * Cursor wrapper that adds columns to identify which root a document came from.
- */
-public class RootCursorWrapper extends AbstractCursor {
- private final String mAuthority;
- private final String mRootId;
-
- private final Cursor mCursor;
- private final int mCount;
-
- private final String[] mColumnNames;
-
- private final int mAuthorityIndex;
- private final int mRootIdIndex;
-
- public static final String COLUMN_AUTHORITY = "android:authority";
- public static final String COLUMN_ROOT_ID = "android:rootId";
-
- public RootCursorWrapper(String authority, String rootId, Cursor cursor, int maxCount) {
- mAuthority = authority;
- mRootId = rootId;
- mCursor = cursor;
-
- final int count = cursor.getCount();
- if (maxCount > 0 && count > maxCount) {
- mCount = maxCount;
- } else {
- mCount = count;
- }
-
- if (cursor.getColumnIndex(COLUMN_AUTHORITY) != -1
- || cursor.getColumnIndex(COLUMN_ROOT_ID) != -1) {
- throw new IllegalArgumentException("Cursor contains internal columns!");
- }
- final String[] before = cursor.getColumnNames();
- mColumnNames = new String[before.length + 2];
- System.arraycopy(before, 0, mColumnNames, 0, before.length);
- mAuthorityIndex = before.length;
- mRootIdIndex = before.length + 1;
- mColumnNames[mAuthorityIndex] = COLUMN_AUTHORITY;
- mColumnNames[mRootIdIndex] = COLUMN_ROOT_ID;
- }
-
- @Override
- public Bundle getExtras() {
- return mCursor.getExtras();
- }
-
- @Override
- public void close() {
- super.close();
- mCursor.close();
- }
-
- @Override
- public boolean onMove(int oldPosition, int newPosition) {
- return mCursor.moveToPosition(newPosition);
- }
-
- @Override
- public String[] getColumnNames() {
- return mColumnNames;
- }
-
- @Override
- public int getCount() {
- return mCount;
- }
-
- @Override
- public double getDouble(int column) {
- return mCursor.getDouble(column);
- }
-
- @Override
- public float getFloat(int column) {
- return mCursor.getFloat(column);
- }
-
- @Override
- public int getInt(int column) {
- return mCursor.getInt(column);
- }
-
- @Override
- public long getLong(int column) {
- return mCursor.getLong(column);
- }
-
- @Override
- public short getShort(int column) {
- return mCursor.getShort(column);
- }
-
- @Override
- public String getString(int column) {
- if (column == mAuthorityIndex) {
- return mAuthority;
- } else if (column == mRootIdIndex) {
- return mRootId;
- } else {
- return mCursor.getString(column);
- }
- }
-
- @Override
- public int getType(int column) {
- return mCursor.getType(column);
- }
-
- @Override
- public boolean isNull(int column) {
- return mCursor.isNull(column);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootItemView.java b/packages/DocumentsUI/src/com/android/documentsui/RootItemView.java
deleted file mode 100644
index 93aa526..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RootItemView.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-
-public final class RootItemView extends LinearLayout {
- private static final int[] STATE_HIGHLIGHTED = {R.attr.state_highlighted};
-
- private boolean mHighlighted = false;
-
- public RootItemView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- public int[] onCreateDrawableState(int extraSpace) {
- final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
-
- if (mHighlighted) {
- mergeDrawableStates(drawableState, STATE_HIGHLIGHTED);
- }
-
- return drawableState;
- }
-
- public void setHighlight(boolean highlight) {
- mHighlighted = highlight;
- refreshDrawableState();
- }
-
- /**
- * Synthesizes pressed state to trick RippleDrawable starting a ripple effect.
- */
- public void drawRipple() {
- setPressed(true);
- setPressed(false);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
deleted file mode 100644
index 88eeb49..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.content.BroadcastReceiver.PendingResult;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
-import android.content.pm.ResolveInfo;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Root;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-
-import com.android.documentsui.model.RootInfo;
-import com.android.internal.annotations.GuardedBy;
-
-import libcore.io.IoUtils;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Cache of known storage backends and their roots.
- */
-public class RootsCache {
- public static final Uri sNotificationUri = Uri.parse(
- "content://com.android.documentsui.roots/");
-
- private static final String TAG = "RootsCache";
-
- private final Context mContext;
- private final ContentObserver mObserver;
-
- private final RootInfo mRecentsRoot;
-
- private final Object mLock = new Object();
- private final CountDownLatch mFirstLoad = new CountDownLatch(1);
-
- @GuardedBy("mLock")
- private boolean mFirstLoadDone;
- @GuardedBy("mLock")
- private PendingResult mBootCompletedResult;
-
- @GuardedBy("mLock")
- private Multimap<String, RootInfo> mRoots = ArrayListMultimap.create();
- @GuardedBy("mLock")
- private HashSet<String> mStoppedAuthorities = new HashSet<>();
-
- @GuardedBy("mObservedAuthorities")
- private final HashSet<String> mObservedAuthorities = new HashSet<>();
-
- public RootsCache(Context context) {
- mContext = context;
- mObserver = new RootsChangedObserver();
-
- // Create a new anonymous "Recents" RootInfo. It's a faker.
- mRecentsRoot = new RootInfo() {{
- // Special root for recents
- derivedIcon = R.drawable.ic_root_recent;
- derivedType = RootInfo.TYPE_RECENTS;
- flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_IS_CHILD
- | Root.FLAG_SUPPORTS_CREATE;
- title = mContext.getString(R.string.root_recent);
- availableBytes = -1;
- }};
- }
-
- private class RootsChangedObserver extends ContentObserver {
- public RootsChangedObserver() {
- super(new Handler());
- }
-
- @Override
- public void onChange(boolean selfChange, Uri uri) {
- if (uri == null) {
- Log.w(TAG, "Received onChange event for null uri. Skipping.");
- return;
- }
- if (DEBUG) Log.d(TAG, "Updating roots due to change at " + uri);
- updateAuthorityAsync(uri.getAuthority());
- }
- }
-
- /**
- * Gather roots from all known storage providers.
- */
- public void updateAsync(boolean forceRefreshAll) {
-
- // NOTE: This method is called when the UI language changes.
- // For that reason we update our RecentsRoot to reflect
- // the current language.
- mRecentsRoot.title = mContext.getString(R.string.root_recent);
-
- // Nothing else about the root should ever change.
- assert(mRecentsRoot.authority == null);
- assert(mRecentsRoot.rootId == null);
- assert(mRecentsRoot.derivedIcon == R.drawable.ic_root_recent);
- assert(mRecentsRoot.derivedType == RootInfo.TYPE_RECENTS);
- assert(mRecentsRoot.flags == (Root.FLAG_LOCAL_ONLY
- | Root.FLAG_SUPPORTS_IS_CHILD
- | Root.FLAG_SUPPORTS_CREATE));
- assert(mRecentsRoot.availableBytes == -1);
-
- new UpdateTask(forceRefreshAll, null)
- .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- }
-
- /**
- * Gather roots from storage providers belonging to given package name.
- */
- public void updatePackageAsync(String packageName) {
- new UpdateTask(false, packageName).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- }
-
- /**
- * Gather roots from storage providers belonging to given authority.
- */
- public void updateAuthorityAsync(String authority) {
- final ProviderInfo info = mContext.getPackageManager().resolveContentProvider(authority, 0);
- if (info != null) {
- updatePackageAsync(info.packageName);
- }
- }
-
- public void setBootCompletedResult(PendingResult result) {
- synchronized (mLock) {
- // Quickly check if we've already finished loading, otherwise hang
- // out until first pass is finished.
- if (mFirstLoadDone) {
- result.finish();
- } else {
- mBootCompletedResult = result;
- }
- }
- }
-
- /**
- * Block until the first {@link UpdateTask} pass has finished.
- *
- * @return {@code true} if cached roots is ready to roll, otherwise
- * {@code false} if we timed out while waiting.
- */
- private boolean waitForFirstLoad() {
- boolean success = false;
- try {
- success = mFirstLoad.await(15, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- }
- if (!success) {
- Log.w(TAG, "Timeout waiting for first update");
- }
- return success;
- }
-
- /**
- * Load roots from authorities that are in stopped state. Normal
- * {@link UpdateTask} passes ignore stopped applications.
- */
- private void loadStoppedAuthorities() {
- final ContentResolver resolver = mContext.getContentResolver();
- synchronized (mLock) {
- for (String authority : mStoppedAuthorities) {
- if (DEBUG) Log.d(TAG, "Loading stopped authority " + authority);
- mRoots.putAll(authority, loadRootsForAuthority(resolver, authority, true));
- }
- mStoppedAuthorities.clear();
- }
- }
-
- /**
- * Load roots from a stopped authority. Normal {@link UpdateTask} passes
- * ignore stopped applications.
- */
- private void loadStoppedAuthority(String authority) {
- final ContentResolver resolver = mContext.getContentResolver();
- synchronized (mLock) {
- if (!mStoppedAuthorities.contains(authority)) {
- return;
- }
- if (DEBUG) {
- Log.d(TAG, "Loading stopped authority " + authority);
- }
- mRoots.putAll(authority, loadRootsForAuthority(resolver, authority, true));
- mStoppedAuthorities.remove(authority);
- }
- }
-
- private class UpdateTask extends AsyncTask<Void, Void, Void> {
- private final boolean mForceRefreshAll;
- private final String mForceRefreshPackage;
-
- private final Multimap<String, RootInfo> mTaskRoots = ArrayListMultimap.create();
- private final HashSet<String> mTaskStoppedAuthorities = new HashSet<>();
-
- /**
- * Create task to update roots cache.
- *
- * @param forceRefreshAll when true, all previously cached values for
- * all packages should be ignored.
- * @param forceRefreshPackage when non-null, all previously cached
- * values for this specific package should be ignored.
- */
- public UpdateTask(boolean forceRefreshAll, String forceRefreshPackage) {
- mForceRefreshAll = forceRefreshAll;
- mForceRefreshPackage = forceRefreshPackage;
- }
-
- @Override
- protected Void doInBackground(Void... params) {
- final long start = SystemClock.elapsedRealtime();
-
- mTaskRoots.put(mRecentsRoot.authority, mRecentsRoot);
-
- final ContentResolver resolver = mContext.getContentResolver();
- final PackageManager pm = mContext.getPackageManager();
-
- // Pick up provider with action string
- final Intent intent = new Intent(DocumentsContract.PROVIDER_INTERFACE);
- final List<ResolveInfo> providers = pm.queryIntentContentProviders(intent, 0);
- for (ResolveInfo info : providers) {
- handleDocumentsProvider(info.providerInfo);
- }
-
- final long delta = SystemClock.elapsedRealtime() - start;
- if (DEBUG)
- Log.d(TAG, "Update found " + mTaskRoots.size() + " roots in " + delta + "ms");
- synchronized (mLock) {
- mFirstLoadDone = true;
- if (mBootCompletedResult != null) {
- mBootCompletedResult.finish();
- mBootCompletedResult = null;
- }
- mRoots = mTaskRoots;
- mStoppedAuthorities = mTaskStoppedAuthorities;
- }
- mFirstLoad.countDown();
- resolver.notifyChange(sNotificationUri, null, false);
- return null;
- }
-
- private void handleDocumentsProvider(ProviderInfo info) {
- // Ignore stopped packages for now; we might query them
- // later during UI interaction.
- if ((info.applicationInfo.flags & ApplicationInfo.FLAG_STOPPED) != 0) {
- if (DEBUG) Log.d(TAG, "Ignoring stopped authority " + info.authority);
- mTaskStoppedAuthorities.add(info.authority);
- return;
- }
-
- final boolean forceRefresh = mForceRefreshAll
- || Objects.equals(info.packageName, mForceRefreshPackage);
- mTaskRoots.putAll(info.authority, loadRootsForAuthority(mContext.getContentResolver(),
- info.authority, forceRefresh));
- }
- }
-
- /**
- * Bring up requested provider and query for all active roots.
- */
- private Collection<RootInfo> loadRootsForAuthority(ContentResolver resolver, String authority,
- boolean forceRefresh) {
- if (DEBUG) Log.d(TAG, "Loading roots for " + authority);
-
- synchronized (mObservedAuthorities) {
- if (mObservedAuthorities.add(authority)) {
- // Watch for any future updates
- final Uri rootsUri = DocumentsContract.buildRootsUri(authority);
- mContext.getContentResolver().registerContentObserver(rootsUri, true, mObserver);
- }
- }
-
- final Uri rootsUri = DocumentsContract.buildRootsUri(authority);
- if (!forceRefresh) {
- // Look for roots data that we might have cached for ourselves in the
- // long-lived system process.
- final Bundle systemCache = resolver.getCache(rootsUri);
- if (systemCache != null) {
- if (DEBUG) Log.d(TAG, "System cache hit for " + authority);
- return systemCache.getParcelableArrayList(TAG);
- }
- }
-
- final ArrayList<RootInfo> roots = new ArrayList<>();
- ContentProviderClient client = null;
- Cursor cursor = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(resolver, authority);
- cursor = client.query(rootsUri, null, null, null, null);
- while (cursor.moveToNext()) {
- final RootInfo root = RootInfo.fromRootsCursor(authority, cursor);
- roots.add(root);
- }
- } catch (Exception e) {
- Log.w(TAG, "Failed to load some roots from " + authority + ": " + e);
- } finally {
- IoUtils.closeQuietly(cursor);
- ContentProviderClient.releaseQuietly(client);
- }
-
- // Cache these freshly parsed roots over in the long-lived system
- // process, in case our process goes away. The system takes care of
- // invalidating the cache if the package or Uri changes.
- final Bundle systemCache = new Bundle();
- systemCache.putParcelableArrayList(TAG, roots);
- resolver.putCache(rootsUri, systemCache);
-
- return roots;
- }
-
- /**
- * Return the requested {@link RootInfo}, but only loading the roots for the
- * requested authority. This is useful when we want to load fast without
- * waiting for all the other roots to come back.
- */
- public RootInfo getRootOneshot(String authority, String rootId) {
- synchronized (mLock) {
- RootInfo root = getRootLocked(authority, rootId);
- if (root == null) {
- mRoots.putAll(authority,
- loadRootsForAuthority(mContext.getContentResolver(), authority, false));
- root = getRootLocked(authority, rootId);
- }
- return root;
- }
- }
-
- public RootInfo getRootBlocking(String authority, String rootId) {
- waitForFirstLoad();
- loadStoppedAuthorities();
- synchronized (mLock) {
- return getRootLocked(authority, rootId);
- }
- }
-
- private RootInfo getRootLocked(String authority, String rootId) {
- for (RootInfo root : mRoots.get(authority)) {
- if (Objects.equals(root.rootId, rootId)) {
- return root;
- }
- }
- return null;
- }
-
- public boolean isIconUniqueBlocking(RootInfo root) {
- waitForFirstLoad();
- loadStoppedAuthorities();
- synchronized (mLock) {
- final int rootIcon = root.derivedIcon != 0 ? root.derivedIcon : root.icon;
- for (RootInfo test : mRoots.get(root.authority)) {
- if (Objects.equals(test.rootId, root.rootId)) {
- continue;
- }
- final int testIcon = test.derivedIcon != 0 ? test.derivedIcon : test.icon;
- if (testIcon == rootIcon) {
- return false;
- }
- }
- return true;
- }
- }
-
- public RootInfo getRecentsRoot() {
- return mRecentsRoot;
- }
-
- public boolean isRecentsRoot(RootInfo root) {
- return mRecentsRoot.equals(root);
- }
-
- public Collection<RootInfo> getRootsBlocking() {
- waitForFirstLoad();
- loadStoppedAuthorities();
- synchronized (mLock) {
- return mRoots.values();
- }
- }
-
- public Collection<RootInfo> getMatchingRootsBlocking(State state) {
- waitForFirstLoad();
- loadStoppedAuthorities();
- synchronized (mLock) {
- return getMatchingRoots(mRoots.values(), state);
- }
- }
-
- /**
- * Returns a list of roots for the specified authority. If not found, then
- * an empty list is returned.
- */
- public Collection<RootInfo> getRootsForAuthorityBlocking(String authority) {
- waitForFirstLoad();
- loadStoppedAuthority(authority);
- synchronized (mLock) {
- final Collection<RootInfo> roots = mRoots.get(authority);
- return roots != null ? roots : Collections.<RootInfo>emptyList();
- }
- }
-
- /**
- * Returns the default root for the specified state.
- */
- public RootInfo getDefaultRootBlocking(State state) {
- for (RootInfo root : getMatchingRoots(getRootsBlocking(), state)) {
- if (root.isDownloads()) {
- return root;
- }
- }
- return mRecentsRoot;
- }
-
- @VisibleForTesting
- static List<RootInfo> getMatchingRoots(Collection<RootInfo> roots, State state) {
- final List<RootInfo> matching = new ArrayList<>();
- for (RootInfo root : roots) {
-
- if (DEBUG) Log.d(TAG, "Evaluating " + root);
-
- if (state.action == State.ACTION_CREATE && !root.supportsCreate()) {
- if (DEBUG) Log.d(TAG, "Excluding read-only root because: ACTION_CREATE.");
- continue;
- }
-
- if (state.action == State.ACTION_PICK_COPY_DESTINATION
- && !root.supportsCreate()) {
- if (DEBUG) Log.d(
- TAG, "Excluding read-only root because: ACTION_PICK_COPY_DESTINATION.");
- continue;
- }
-
- if (state.action == State.ACTION_OPEN_TREE && !root.supportsChildren()) {
- if (DEBUG) Log.d(
- TAG, "Excluding root !supportsChildren because: ACTION_OPEN_TREE.");
- continue;
- }
-
- if (!state.showAdvanced && root.isAdvanced()) {
- if (DEBUG) Log.d(TAG, "Excluding root because: unwanted advanced device.");
- continue;
- }
-
- if (state.localOnly && !root.isLocalOnly()) {
- if (DEBUG) Log.d(TAG, "Excluding root because: unwanted non-local device.");
- continue;
- }
-
- if (state.directoryCopy && root.isDownloads()) {
- if (DEBUG) Log.d(
- TAG, "Excluding downloads root because: unsupported directory copy.");
- continue;
- }
-
- if (state.action == State.ACTION_OPEN && root.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Excluding empty root because: ACTION_OPEN.");
- continue;
- }
-
- if (state.action == State.ACTION_GET_CONTENT && root.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Excluding empty root because: ACTION_GET_CONTENT.");
- continue;
- }
-
- final boolean overlap =
- MimePredicate.mimeMatches(root.derivedMimeTypes, state.acceptMimes) ||
- MimePredicate.mimeMatches(state.acceptMimes, root.derivedMimeTypes);
- if (!overlap) {
- if (DEBUG) Log.d(
- TAG, "Excluding root because: unsupported content types > "
- + state.acceptMimes);
- continue;
- }
-
- if (state.excludedAuthorities.contains(root.authority)) {
- if (DEBUG) Log.d(TAG, "Excluding root because: owned by calling package.");
- continue;
- }
-
- if (DEBUG) Log.d(TAG, "Including " + root);
- matching.add(root);
- }
- return matching;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
deleted file mode 100644
index b333379..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.LayoutRes;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Looper;
-import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.text.format.Formatter;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnDragListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.android.documentsui.model.RootInfo;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Display list of known storage backend roots.
- */
-public class RootsFragment extends Fragment implements ItemDragListener.DragHost {
-
- private static final String TAG = "RootsFragment";
- private static final String EXTRA_INCLUDE_APPS = "includeApps";
-
- private ListView mList;
- private RootsAdapter mAdapter;
- private LoaderCallbacks<Collection<RootInfo>> mCallbacks;
-
- public static void show(FragmentManager fm, Intent includeApps) {
- final Bundle args = new Bundle();
- args.putParcelable(EXTRA_INCLUDE_APPS, includeApps);
-
- final RootsFragment fragment = new RootsFragment();
- fragment.setArguments(args);
-
- final FragmentTransaction ft = fm.beginTransaction();
- ft.replace(R.id.container_roots, fragment);
- ft.commitAllowingStateLoss();
- }
-
- public static RootsFragment get(FragmentManager fm) {
- return (RootsFragment) fm.findFragmentById(R.id.container_roots);
- }
-
- @Override
- public View onCreateView(
- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
- final View view = inflater.inflate(R.layout.fragment_roots, container, false);
- mList = (ListView) view.findViewById(R.id.roots_list);
- mList.setOnItemClickListener(mItemListener);
- mList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
- return view;
- }
-
- @Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
-
- final Context context = getActivity();
- final RootsCache roots = DocumentsApplication.getRootsCache(context);
- final State state = ((BaseActivity) context).getDisplayState();
-
- mCallbacks = new LoaderCallbacks<Collection<RootInfo>>() {
- @Override
- public Loader<Collection<RootInfo>> onCreateLoader(int id, Bundle args) {
- return new RootsLoader(context, roots, state);
- }
-
- @Override
- public void onLoadFinished(
- Loader<Collection<RootInfo>> loader, Collection<RootInfo> result) {
- if (!isAdded()) {
- return;
- }
-
- Intent handlerAppIntent = getArguments().getParcelable(EXTRA_INCLUDE_APPS);
-
- mAdapter = new RootsAdapter(context, result, handlerAppIntent, state,
- new ItemDragListener<>(RootsFragment.this));
- mList.setAdapter(mAdapter);
-
- onCurrentRootChanged();
- }
-
- @Override
- public void onLoaderReset(Loader<Collection<RootInfo>> loader) {
- mAdapter = null;
- mList.setAdapter(null);
- }
- };
- }
-
- @Override
- public void onResume() {
- super.onResume();
- onDisplayStateChanged();
- }
-
- public void onDisplayStateChanged() {
- final Context context = getActivity();
- final State state = ((BaseActivity) context).getDisplayState();
-
- if (state.action == State.ACTION_GET_CONTENT) {
- mList.setOnItemLongClickListener(mItemLongClickListener);
- } else {
- mList.setOnItemLongClickListener(null);
- mList.setLongClickable(false);
- }
-
- getLoaderManager().restartLoader(2, null, mCallbacks);
- }
-
- public void onCurrentRootChanged() {
- if (mAdapter == null) {
- return;
- }
-
- final RootInfo root = ((BaseActivity) getActivity()).getCurrentRoot();
- for (int i = 0; i < mAdapter.getCount(); i++) {
- final Object item = mAdapter.getItem(i);
- if (item instanceof RootItem) {
- final RootInfo testRoot = ((RootItem) item).root;
- if (Objects.equals(testRoot, root)) {
- mList.setItemChecked(i, true);
- return;
- }
- }
- }
- }
-
- /**
- * Attempts to shift focus back to the navigation drawer.
- */
- public void requestFocus() {
- mList.requestFocus();
- }
-
- private void showAppDetails(ResolveInfo ri) {
- final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- intent.setData(Uri.fromParts("package", ri.activityInfo.packageName, null));
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
- startActivity(intent);
- }
-
- @Override
- public void runOnUiThread(Runnable runnable) {
- getActivity().runOnUiThread(runnable);
- }
-
- /**
- * {@inheritDoc}
- *
- * In RootsFragment we open the hovered root.
- */
- @Override
- public void onViewHovered(View view) {
- // SpacerView doesn't have DragListener so this view is guaranteed to be a RootItemView.
- RootItemView itemView = (RootItemView) view;
- itemView.drawRipple();
-
- final int position = (Integer) view.getTag(R.id.item_position_tag);
- final Item item = mAdapter.getItem(position);
- item.open(this);
- }
-
- @Override
- public void setDropTargetHighlight(View v, boolean highlight) {
- // SpacerView doesn't have DragListener so this view is guaranteed to be a RootItemView.
- RootItemView itemView = (RootItemView) v;
- itemView.setHighlight(highlight);
- }
-
- private OnItemClickListener mItemListener = new OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- final Item item = mAdapter.getItem(position);
- item.open(RootsFragment.this);
-
- ((BaseActivity) getActivity()).setRootsDrawerOpen(false);
- }
- };
-
- private OnItemLongClickListener mItemLongClickListener = new OnItemLongClickListener() {
- @Override
- public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
- final Item item = mAdapter.getItem(position);
- return item.showAppDetails(RootsFragment.this);
- }
- };
-
- private static abstract class Item {
- private final @LayoutRes int mLayoutId;
- private final String mStringId;
-
- public Item(@LayoutRes int layoutId, String stringId) {
- mLayoutId = layoutId;
- mStringId = stringId;
- }
-
- public View getView(View convertView, ViewGroup parent) {
- if (convertView == null
- || (Integer) convertView.getTag(R.id.layout_id_tag) != mLayoutId) {
- convertView = LayoutInflater.from(parent.getContext())
- .inflate(mLayoutId, parent, false);
- }
- convertView.setTag(R.id.layout_id_tag, mLayoutId);
- bindView(convertView);
- return convertView;
- }
-
- boolean showAppDetails(RootsFragment fragment) {
- return false;
- }
-
- abstract void bindView(View convertView);
-
- abstract boolean isDropTarget();
-
- abstract void open(RootsFragment fragment);
- }
-
- private static class RootItem extends Item {
- private static final String STRING_ID_FORMAT = "RootItem{%s/%s}";
-
- public final RootInfo root;
-
- public RootItem(RootInfo root) {
- super(R.layout.item_root, getStringId(root));
- this.root = root;
- }
-
- private static String getStringId(RootInfo root) {
- // Empty URI authority is invalid, so we can use empty string if root.authority is null.
- // Directly passing null to String.format() will write "null" which can be a valid URI
- // authority.
- String authority = (root.authority == null ? "" : root.authority);
- return String.format(STRING_ID_FORMAT, authority, root.rootId);
- }
-
- @Override
- public void bindView(View convertView) {
- final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
- final TextView title = (TextView) convertView.findViewById(android.R.id.title);
- final TextView summary = (TextView) convertView.findViewById(android.R.id.summary);
-
- final Context context = convertView.getContext();
- icon.setImageDrawable(root.loadDrawerIcon(context));
- title.setText(root.title);
-
- // Show available space if no summary
- String summaryText = root.summary;
- if (TextUtils.isEmpty(summaryText) && root.availableBytes >= 0) {
- summaryText = context.getString(R.string.root_available_bytes,
- Formatter.formatFileSize(context, root.availableBytes));
- }
-
- summary.setText(summaryText);
- summary.setVisibility(TextUtils.isEmpty(summaryText) ? View.GONE : View.VISIBLE);
- }
-
- @Override
- boolean isDropTarget() {
- return root.supportsCreate() && !root.isLibrary();
- }
-
- @Override
- void open(RootsFragment fragment) {
- BaseActivity activity = BaseActivity.get(fragment);
- Metrics.logRootVisited(fragment.getActivity(), root);
- activity.onRootPicked(root);
- }
- }
-
- private static class SpacerItem extends Item {
- private static final String STRING_ID = "SpacerItem";
-
- public SpacerItem() {
- // Multiple spacer items can share the same string id as they're identical.
- super(R.layout.item_root_spacer, STRING_ID);
- }
-
- @Override
- void bindView(View convertView) {
- // Nothing to bind
- }
-
- @Override
- boolean isDropTarget() {
- return false;
- }
-
- @Override
- void open(RootsFragment fragment) {
- if (DEBUG) Log.d(TAG, "Ignoring click/hover on spacer item.");
- }
- }
-
- private static class AppItem extends Item {
- private static final String STRING_ID_FORMAT = "AppItem{%s/%s}";
-
- public final ResolveInfo info;
-
- public AppItem(ResolveInfo info) {
- super(R.layout.item_root, getStringId(info));
- this.info = info;
- }
-
- private static String getStringId(ResolveInfo info) {
- ActivityInfo activityInfo = info.activityInfo;
-
- String component = String.format(
- STRING_ID_FORMAT, activityInfo.applicationInfo.packageName, activityInfo.name);
- return component;
- }
-
- @Override
- boolean showAppDetails(RootsFragment fragment) {
- fragment.showAppDetails(info);
- return true;
- }
-
- @Override
- void bindView(View convertView) {
- final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
- final TextView title = (TextView) convertView.findViewById(android.R.id.title);
- final TextView summary = (TextView) convertView.findViewById(android.R.id.summary);
-
- final PackageManager pm = convertView.getContext().getPackageManager();
- icon.setImageDrawable(info.loadIcon(pm));
- title.setText(info.loadLabel(pm));
-
- // TODO: match existing summary behavior from disambig dialog
- summary.setVisibility(View.GONE);
- }
-
- @Override
- boolean isDropTarget() {
- // We won't support drag n' drop in DocumentsActivity, and apps only show up there.
- return false;
- }
-
- @Override
- void open(RootsFragment fragment) {
- DocumentsActivity activity = DocumentsActivity.get(fragment);
- Metrics.logAppVisited(fragment.getActivity(), info);
- activity.onAppPicked(info);
- }
- }
-
- private static class RootsAdapter extends ArrayAdapter<Item> {
- private static final Map<String, Long> sIdMap = new HashMap<String, Long>();
- // the next available id to associate with a new string id
- private static long sNextAvailableId;
-
- private OnDragListener mDragListener;
-
- /**
- * @param handlerAppIntent When not null, apps capable of handling the original intent will
- * be included in list of roots (in special section at bottom).
- */
- public RootsAdapter(Context context, Collection<RootInfo> roots,
- @Nullable Intent handlerAppIntent, State state, OnDragListener dragListener) {
- super(context, 0);
-
- final List<RootItem> libraries = new ArrayList<>();
- final List<RootItem> others = new ArrayList<>();
-
- for (final RootInfo root : roots) {
- final RootItem item = new RootItem(root);
-
- if (root.isHome() &&
- !Shared.shouldShowDocumentsRoot(context,
- ((Activity) context).getIntent())) {
- continue;
- } else if (root.isLibrary()) {
- if (DEBUG) Log.d(TAG, "Adding " + root + " as library.");
- libraries.add(item);
- } else {
- if (DEBUG) Log.d(TAG, "Adding " + root + " as non-library.");
- others.add(item);
- }
- }
-
- final RootComparator comp = new RootComparator();
- Collections.sort(libraries, comp);
- Collections.sort(others, comp);
-
- addAll(libraries);
- // Only add the spacer if it is actually separating something.
- if (!libraries.isEmpty() && !others.isEmpty()) {
- add(new SpacerItem());
- }
- addAll(others);
-
- // Include apps that can handle this intent too.
- if (handlerAppIntent != null) {
- includeHandlerApps(context, handlerAppIntent);
- }
-
- mDragListener = dragListener;
- }
-
- /**
- * Adds apps capable of handling the original intent will be included in list of roots (in
- * special section at bottom).
- */
- private void includeHandlerApps(Context context, Intent handlerAppIntent) {
- final PackageManager pm = context.getPackageManager();
- final List<ResolveInfo> infos = pm.queryIntentActivities(
- handlerAppIntent, PackageManager.MATCH_DEFAULT_ONLY);
-
- final List<AppItem> apps = new ArrayList<>();
-
- // Omit ourselves from the list
- for (ResolveInfo info : infos) {
- if (!context.getPackageName().equals(info.activityInfo.packageName)) {
- apps.add(new AppItem(info));
- }
- }
-
- if (apps.size() > 0) {
- add(new SpacerItem());
- addAll(apps);
- }
- }
-
- @Override
- public boolean hasStableIds() {
- return true;
- }
-
- @Override
- public long getItemId(int position) {
- // Ensure this method is only called in main thread because we don't have any
- // concurrency protection.
- assert(Looper.myLooper() == Looper.getMainLooper());
-
- String stringId = getItem(position).mStringId;
-
- long id;
- if (sIdMap.containsKey(stringId)) {
- id = sIdMap.get(stringId);
- } else {
- id = sNextAvailableId++;
- sIdMap.put(stringId, id);
- }
-
- return id;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- final Item item = getItem(position);
- final View view = item.getView(convertView, parent);
-
- if (item.isDropTarget()) {
- view.setTag(R.id.item_position_tag, position);
- view.setOnDragListener(mDragListener);
- } else {
- view.setTag(R.id.item_position_tag, null);
- view.setOnDragListener(null);
- }
- return view;
- }
-
- @Override
- public boolean areAllItemsEnabled() {
- return false;
- }
-
- @Override
- public boolean isEnabled(int position) {
- return getItemViewType(position) != 1;
- }
-
- @Override
- public int getItemViewType(int position) {
- final Item item = getItem(position);
- if (item instanceof RootItem || item instanceof AppItem) {
- return 0;
- } else {
- return 1;
- }
- }
-
- @Override
- public int getViewTypeCount() {
- return 2;
- }
- }
-
- public static class RootComparator implements Comparator<RootItem> {
- @Override
- public int compare(RootItem lhs, RootItem rhs) {
- return lhs.root.compareTo(rhs.root);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsList.java b/packages/DocumentsUI/src/com/android/documentsui/RootsList.java
deleted file mode 100644
index bf03ffd..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsList.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.documentsui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.widget.ListView;
-
-/**
- * The list in the navigation drawer. This class exists for the purpose of overriding the key
- * handler on ListView. Ignoring keystrokes (e.g. the tab key) cannot be properly done using
- * View.OnKeyListener.
- */
-public class RootsList extends ListView {
-
- // Multiple constructors are needed to handle all the different ways this View could be
- // constructed by the framework. Don't remove them!
- public RootsList(Context context) {
- super(context);
- }
-
- public RootsList(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- }
-
- public RootsList(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- public RootsList(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- switch (keyCode) {
- // Ignore tab key events - this causes them to bubble up to the global key handler where
- // they are appropriately handled. See BaseActivity.onKeyDown.
- case KeyEvent.KEYCODE_TAB:
- return false;
- // Prevent left/right arrow keystrokes from shifting focus away from the roots list.
- case KeyEvent.KEYCODE_DPAD_LEFT:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- return true;
- default:
- return super.onKeyDown(keyCode, event);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsLoader.java b/packages/DocumentsUI/src/com/android/documentsui/RootsLoader.java
deleted file mode 100644
index 5c4ccdd..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsLoader.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.AsyncTaskLoader;
-import android.content.Context;
-
-import com.android.documentsui.model.RootInfo;
-
-import java.util.Collection;
-
-public class RootsLoader extends AsyncTaskLoader<Collection<RootInfo>> {
- private final ForceLoadContentObserver mObserver = new ForceLoadContentObserver();
-
- private final RootsCache mRoots;
- private final State mState;
-
- private Collection<RootInfo> mResult;
-
- public RootsLoader(Context context, RootsCache roots, State state) {
- super(context);
- mRoots = roots;
- mState = state;
-
- getContext().getContentResolver()
- .registerContentObserver(RootsCache.sNotificationUri, false, mObserver);
- }
-
- @Override
- public final Collection<RootInfo> loadInBackground() {
- return mRoots.getMatchingRootsBlocking(mState);
- }
-
- @Override
- public void deliverResult(Collection<RootInfo> result) {
- if (isReset()) {
- return;
- }
-
- mResult = result;
-
- if (isStarted()) {
- super.deliverResult(result);
- }
- }
-
- @Override
- protected void onStartLoading() {
- if (mResult != null) {
- deliverResult(mResult);
- }
- if (takeContentChanged() || mResult == null) {
- forceLoad();
- }
- }
-
- @Override
- protected void onStopLoading() {
- cancelLoad();
- }
-
- @Override
- protected void onReset() {
- super.onReset();
-
- // Ensure the loader is stopped
- onStopLoading();
-
- mResult = null;
-
- getContext().getContentResolver().unregisterContentObserver(mObserver);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/SaveFragment.java b/packages/DocumentsUI/src/com/android/documentsui/SaveFragment.java
deleted file mode 100644
index d830c61..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/SaveFragment.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-
-import com.android.documentsui.model.DocumentInfo;
-
-/**
- * Display document title editor and save button.
- */
-public class SaveFragment extends Fragment {
- public static final String TAG = "SaveFragment";
-
- private DocumentInfo mReplaceTarget;
- private EditText mDisplayName;
- private Button mSave;
- private ProgressBar mProgress;
- private boolean mIgnoreNextEdit;
-
- private static final String EXTRA_MIME_TYPE = "mime_type";
- private static final String EXTRA_DISPLAY_NAME = "display_name";
-
- public static void show(FragmentManager fm, String mimeType, String displayName) {
- final Bundle args = new Bundle();
- args.putString(EXTRA_MIME_TYPE, mimeType);
- args.putString(EXTRA_DISPLAY_NAME, displayName);
-
- final SaveFragment fragment = new SaveFragment();
- fragment.setArguments(args);
-
- final FragmentTransaction ft = fm.beginTransaction();
- ft.replace(R.id.container_save, fragment, TAG);
- ft.commitAllowingStateLoss();
- }
-
- public static SaveFragment get(FragmentManager fm) {
- return (SaveFragment) fm.findFragmentByTag(TAG);
- }
-
- @Override
- public View onCreateView(
- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- final Context context = inflater.getContext();
-
- final View view = inflater.inflate(R.layout.fragment_save, container, false);
-
- final ImageView icon = (ImageView) view.findViewById(android.R.id.icon);
- icon.setImageDrawable(
- IconUtils.loadMimeIcon(context, getArguments().getString(EXTRA_MIME_TYPE)));
-
- mDisplayName = (EditText) view.findViewById(android.R.id.title);
- mDisplayName.addTextChangedListener(mDisplayNameWatcher);
- mDisplayName.setText(getArguments().getString(EXTRA_DISPLAY_NAME));
- mDisplayName.setOnKeyListener(
- new View.OnKeyListener() {
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // Only handle key-down events. This is simpler, consistent with most other
- // UIs, and enables the handling of repeated key events from holding down a
- // key.
- if (event.getAction() != KeyEvent.ACTION_DOWN) {
- return false;
- }
-
- if (keyCode == KeyEvent.KEYCODE_ENTER && mSave.isEnabled()) {
- performSave();
- return true;
- }
- return false;
- }
- });
-
- mSave = (Button) view.findViewById(android.R.id.button1);
- mSave.setOnClickListener(mSaveListener);
- mSave.setEnabled(false);
-
- mProgress = (ProgressBar) view.findViewById(android.R.id.progress);
-
- return view;
- }
-
- private TextWatcher mDisplayNameWatcher = new TextWatcher() {
- @Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- if (mIgnoreNextEdit) {
- mIgnoreNextEdit = false;
- } else {
- mReplaceTarget = null;
- }
- }
-
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- // ignored
- }
-
- @Override
- public void afterTextChanged(Editable s) {
- // ignored
- }
- };
-
- private View.OnClickListener mSaveListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- performSave();
- }
-
- };
-
- private void performSave() {
- final DocumentsActivity activity = DocumentsActivity.get(SaveFragment.this);
- if (mReplaceTarget != null) {
- activity.onSaveRequested(mReplaceTarget);
- } else {
- final String mimeType = getArguments().getString(EXTRA_MIME_TYPE);
- final String displayName = mDisplayName.getText().toString();
- activity.onSaveRequested(mimeType, displayName);
- }
- }
-
- /**
- * Set given document as target for in-place writing if user hits save
- * without changing the filename. Can be set to {@code null} if user
- * navigates outside the target directory.
- */
- public void setReplaceTarget(DocumentInfo replaceTarget) {
- mReplaceTarget = replaceTarget;
-
- if (mReplaceTarget != null) {
- getArguments().putString(EXTRA_DISPLAY_NAME, replaceTarget.displayName);
- mIgnoreNextEdit = true;
- mDisplayName.setText(replaceTarget.displayName);
- }
- }
-
- public void prepareForDirectory(DocumentInfo cwd) {
- setSaveEnabled(cwd != null && cwd.isCreateSupported());
- }
-
- private void setSaveEnabled(boolean enabled) {
- mSave.setEnabled(enabled);
- }
-
- public void setPending(boolean pending) {
- mSave.setVisibility(pending ? View.INVISIBLE : View.VISIBLE);
- mProgress.setVisibility(pending ? View.VISIBLE : View.GONE);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java b/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java
deleted file mode 100644
index 46a14e6..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.Nullable;
-import android.os.Bundle;
-import android.provider.DocumentsContract.Root;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnActionExpandListener;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnFocusChangeListener;
-import android.widget.SearchView;
-import android.widget.SearchView.OnQueryTextListener;
-
-import com.android.documentsui.model.RootInfo;
-
-/**
- * Manages searching UI behavior.
- */
-public class SearchViewManager implements
- SearchView.OnCloseListener, OnQueryTextListener, OnClickListener, OnFocusChangeListener,
- OnActionExpandListener {
-
- public interface SearchManagerListener {
- void onSearchChanged(@Nullable String query);
- void onSearchFinished();
- }
-
- private static final String TAG = "SearchManager";
-
- private SearchManagerListener mListener;
- private boolean mSearchExpanded;
- private String mCurrentSearch;
- private boolean mIgnoreNextClose;
- private boolean mFullBar;
-
- private DocumentsToolbar mActionBar;
- private MenuItem mMenuItem;
- private SearchView mSearchView;
-
- public SearchViewManager(SearchManagerListener listener, @Nullable Bundle savedState) {
- mListener = listener;
- mCurrentSearch = savedState != null ? savedState.getString(Shared.EXTRA_QUERY) : null;
- }
-
- public void setSearchMangerListener(SearchManagerListener listener) {
- mListener = listener;
- }
-
- public void install(DocumentsToolbar actionBar, boolean isFullBarSearch) {
- mActionBar = actionBar;
- mMenuItem = actionBar.getSearchMenu();
- mSearchView = (SearchView) mMenuItem.getActionView();
-
- mSearchView.setOnQueryTextListener(this);
- mSearchView.setOnCloseListener(this);
- mSearchView.setOnSearchClickListener(this);
- mSearchView.setOnQueryTextFocusChangeListener(this);
-
- mFullBar = isFullBarSearch;
- if (mFullBar) {
- mMenuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
- | MenuItem.SHOW_AS_ACTION_ALWAYS);
- mMenuItem.setOnActionExpandListener(this);
- }
-
- restoreSearch();
- }
-
- /**
- * Used to hide menu icons, when the search is being restored. Needed because search restoration
- * is done before onPrepareOptionsMenu(Menu menu) that is overriding the icons visibility.
- */
- public void updateMenu() {
- if (isSearching() && mFullBar) {
- Menu menu = mActionBar.getMenu();
- menu.setGroupVisible(R.id.group_hide_when_searching, false);
- }
- }
-
- /**
- * @param root Info about the current directory.
- */
- void update(RootInfo root) {
- if (mMenuItem == null) {
- if (DEBUG) Log.d(TAG, "update called before Search MenuItem installed.");
- return;
- }
-
- if (mCurrentSearch != null) {
- mMenuItem.expandActionView();
-
- mSearchView.setIconified(false);
- mSearchView.clearFocus();
- mSearchView.setQuery(mCurrentSearch, false);
- } else {
- mSearchView.clearFocus();
- if (!mSearchView.isIconified()) {
- mIgnoreNextClose = true;
- mSearchView.setIconified(true);
- }
-
- if (mMenuItem.isActionViewExpanded()) {
- mMenuItem.collapseActionView();
- }
- }
-
- showMenu(root != null
- && ((root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0));
- }
-
- protected void showMenu(boolean visible) {
- if (mMenuItem == null) {
- if (DEBUG) Log.d(TAG, "showMenu called before Search MenuItem installed.");
- return;
- }
-
- if (!visible) {
- mCurrentSearch = null;
- }
-
- mMenuItem.setVisible(visible);
- }
-
- /**
- * Cancels current search operation. Triggers clearing and collapsing the SearchView.
- *
- * @return True if it cancels search. False if it does not operate search currently.
- */
- boolean cancelSearch() {
- if (isExpanded() || isSearching()) {
- // If the query string is not empty search view won't get iconified
- mSearchView.setQuery("", false);
-
- if (mFullBar) {
- onClose();
- } else {
- // Causes calling onClose(). onClose() is triggering directory content update.
- mSearchView.setIconified(true);
- }
- return true;
- }
- return false;
- }
-
- /**
- * Sets search view into the searching state. Used to restore state after device orientation
- * change.
- */
- private void restoreSearch() {
- if (isSearching()) {
- if(mFullBar) {
- mMenuItem.expandActionView();
- } else {
- mSearchView.setIconified(false);
- }
- onSearchExpanded();
- mSearchView.setQuery(mCurrentSearch, false);
- mSearchView.clearFocus();
- }
- }
-
- private void onSearchExpanded() {
- mSearchExpanded = true;
- if(mFullBar) {
- Menu menu = mActionBar.getMenu();
- menu.setGroupVisible(R.id.group_hide_when_searching, false);
- }
- }
-
- /**
- * Clears the search. Triggers refreshing of the directory content.
- * @return True if the default behavior of clearing/dismissing SearchView should be overridden.
- * False otherwise.
- */
- @Override
- public boolean onClose() {
- mSearchExpanded = false;
- if (mIgnoreNextClose) {
- mIgnoreNextClose = false;
- return false;
- }
-
- // Refresh the directory if a search was done
- if (mCurrentSearch != null) {
- mCurrentSearch = null;
- if (mListener != null) {
- mListener.onSearchChanged(mCurrentSearch);
- }
- }
-
- if(mFullBar) {
- mMenuItem.collapseActionView();
- }
- mListener.onSearchFinished();
-
- return false;
- }
-
- /**
- * Called when owning activity is saving state to be used to restore state during creation.
- * @param state Bundle to save state too
- */
- public void onSaveInstanceState(Bundle state) {
- state.putString(Shared.EXTRA_QUERY, mCurrentSearch);
- }
-
- /**
- * Sets mSearchExpanded. Called when search icon is clicked to start search for both search view
- * modes.
- */
- @Override
- public void onClick(View v) {
- onSearchExpanded();
- }
-
- @Override
- public boolean onQueryTextSubmit(String query) {
- mCurrentSearch = query;
- mSearchView.clearFocus();
- if (mListener != null) {
- mListener.onSearchChanged(mCurrentSearch);
- }
- return true;
- }
-
- /**
- * Used to detect and handle back button pressed event when search is expanded.
- */
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- if (!hasFocus) {
- if (mCurrentSearch == null) {
- mSearchView.setIconified(true);
- } else if (TextUtils.isEmpty(mSearchView.getQuery())) {
- cancelSearch();
- }
- }
- }
-
- @Override
- public boolean onQueryTextChange(String newText) {
- return false;
- }
-
- @Override
- public boolean onMenuItemActionCollapse(MenuItem item) {
- Menu menu = mActionBar.getMenu();
- menu.setGroupVisible(R.id.group_hide_when_searching, true);
-
- // Handles case when search view is collapsed by using the arrow on the left of the bar
- if (isExpanded() || isSearching()) {
- cancelSearch();
- return false;
- }
- return true;
- }
-
- @Override
- public boolean onMenuItemActionExpand(MenuItem item) {
- return true;
- }
-
- String getCurrentSearch() {
- return mCurrentSearch;
- }
-
- boolean isSearching() {
- return mCurrentSearch != null;
- }
-
- boolean isExpanded() {
- return mSearchExpanded;
- }
-
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/SectionedListAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/SectionedListAdapter.java
deleted file mode 100644
index ae959f9..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/SectionedListAdapter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListAdapter;
-
-import java.util.ArrayList;
-
-/**
- * Adapter that combines multiple adapters as sections, asking each section to
- * provide a header, and correctly handling item types across child adapters.
- */
-public class SectionedListAdapter extends BaseAdapter {
- private ArrayList<SectionAdapter> mSections = new ArrayList<>();
-
- public interface SectionAdapter extends ListAdapter {
- public View getHeaderView(View convertView, ViewGroup parent);
- }
-
- public void clearSections() {
- mSections.clear();
- notifyDataSetChanged();
- }
-
- /**
- * After mutating sections, you <em>must</em>
- * {@link AdapterView#setAdapter(android.widget.Adapter)} to correctly
- * recount view types.
- */
- public void addSection(SectionAdapter adapter) {
- mSections.add(adapter);
- notifyDataSetChanged();
- }
-
- @Override
- public int getCount() {
- int count = 0;
- final int size = mSections.size();
- for (int i = 0; i < size; i++) {
- count += mSections.get(i).getCount() + 1;
- }
- return count;
- }
-
- @Override
- public Object getItem(int position) {
- final int size = mSections.size();
- for (int i = 0; i < size; i++) {
- final SectionAdapter section = mSections.get(i);
- final int sectionSize = section.getCount() + 1;
-
- // Check if position inside this section
- if (position == 0) {
- return section;
- } else if (position < sectionSize) {
- return section.getItem(position - 1);
- }
-
- // Otherwise jump into next section
- position -= sectionSize;
- }
- throw new IllegalStateException("Unknown position " + position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- final int size = mSections.size();
- for (int i = 0; i < size; i++) {
- final SectionAdapter section = mSections.get(i);
- final int sectionSize = section.getCount() + 1;
-
- // Check if position inside this section
- if (position == 0) {
- return section.getHeaderView(convertView, parent);
- } else if (position < sectionSize) {
- return section.getView(position - 1, convertView, parent);
- }
-
- // Otherwise jump into next section
- position -= sectionSize;
- }
- throw new IllegalStateException("Unknown position " + position);
- }
-
- @Override
- public boolean areAllItemsEnabled() {
- return false;
- }
-
- @Override
- public boolean isEnabled(int position) {
- final int size = mSections.size();
- for (int i = 0; i < size; i++) {
- final SectionAdapter section = mSections.get(i);
- final int sectionSize = section.getCount() + 1;
-
- // Check if position inside this section
- if (position == 0) {
- return false;
- } else if (position < sectionSize) {
- return section.isEnabled(position - 1);
- }
-
- // Otherwise jump into next section
- position -= sectionSize;
- }
- throw new IllegalStateException("Unknown position " + position);
- }
-
- @Override
- public int getItemViewType(int position) {
- int type = 1;
- final int size = mSections.size();
- for (int i = 0; i < size; i++) {
- final SectionAdapter section = mSections.get(i);
- final int sectionSize = section.getCount() + 1;
-
- // Check if position inside this section
- if (position == 0) {
- return 0;
- } else if (position < sectionSize) {
- return type + section.getItemViewType(position - 1);
- }
-
- // Otherwise jump into next section
- position -= sectionSize;
- type += section.getViewTypeCount();
- }
- throw new IllegalStateException("Unknown position " + position);
- }
-
- @Override
- public int getViewTypeCount() {
- int count = 1;
- final int size = mSections.size();
- for (int i = 0; i < size; i++) {
- count += mSections.get(i).getViewTypeCount();
- }
- return count;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Shared.java b/packages/DocumentsUI/src/com/android/documentsui/Shared.java
deleted file mode 100644
index 2a81c48..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Shared.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Looper;
-import android.provider.DocumentsContract;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.text.format.Time;
-import android.util.Log;
-import android.view.WindowManager;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.List;
-
-/** @hide */
-public final class Shared {
-
- public static final String TAG = "Documents";
-
- public static final boolean DEBUG = true;
-
- /** Intent action name to pick a copy destination. */
- public static final String ACTION_PICK_COPY_DESTINATION =
- "com.android.documentsui.PICK_COPY_DESTINATION";
-
- /**
- * Extra flag allowing app to be opened in productivity mode (less downloadsy).
- * Useful developers and the likes. When set to true overrides the default
- * config value of productivity_device.
- */
- public static final String EXTRA_PRODUCTIVITY_MODE = "com.android.documentsui.PRODUCTIVITY";
-
- /**
- * Extra boolean flag for {@link ACTION_PICK_COPY_DESTINATION}, which
- * specifies if the destination directory needs to create new directory or not.
- */
- public static final String EXTRA_DIRECTORY_COPY = "com.android.documentsui.DIRECTORY_COPY";
-
- /**
- * Extra flag used to store the current stack so user opens in right spot.
- */
- public static final String EXTRA_STACK = "com.android.documentsui.STACK";
-
- /**
- * Extra flag used to store query of type String in the bundle.
- */
- public static final String EXTRA_QUERY = "query";
-
- /**
- * Extra flag used to store state of type State in the bundle.
- */
- public static final String EXTRA_STATE = "state";
-
- /**
- * Extra flag used to store type of DirectoryFragment's type ResultType type in the bundle.
- */
- public static final String EXTRA_TYPE = "type";
-
- /**
- * Extra flag used to store root of type RootInfo in the bundle.
- */
- public static final String EXTRA_ROOT = "root";
-
- /**
- * Extra flag used to store document of DocumentInfo type in the bundle.
- */
- public static final String EXTRA_DOC = "document";
-
- /**
- * Extra flag used to store DirectoryFragment's selection of Selection type in the bundle.
- */
- public static final String EXTRA_SELECTION = "selection";
-
- /**
- * Extra flag used to store DirectoryFragment's search mode of boolean type in the bundle.
- */
- public static final String EXTRA_SEARCH_MODE = "searchMode";
-
- /**
- * Extra flag used to store DirectoryFragment's ignore state of boolean type in the bundle.
- */
- public static final String EXTRA_IGNORE_STATE = "ignoreState";
-
- /**
- * Extra for an Intent for enabling performance benchmark. Used only by tests.
- */
- public static final String EXTRA_BENCHMARK = "com.android.documentsui.benchmark";
-
- /**
- * Maximum number of items in a Binder transaction packet.
- */
- public static final int MAX_DOCS_IN_INTENT = 500;
-
- private static final Collator sCollator;
-
- static {
- sCollator = Collator.getInstance();
- sCollator.setStrength(Collator.SECONDARY);
- }
-
- /**
- * Generates a formatted quantity string.
- */
- public static final String getQuantityString(Context context, int resourceId, int quantity) {
- return context.getResources().getQuantityString(resourceId, quantity, quantity);
- }
-
- public static String formatTime(Context context, long when) {
- // TODO: DateUtils should make this easier
- Time then = new Time();
- then.set(when);
- Time now = new Time();
- now.setToNow();
-
- int flags = DateUtils.FORMAT_NO_NOON | DateUtils.FORMAT_NO_MIDNIGHT
- | DateUtils.FORMAT_ABBREV_ALL;
-
- if (then.year != now.year) {
- flags |= DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE;
- } else if (then.yearDay != now.yearDay) {
- flags |= DateUtils.FORMAT_SHOW_DATE;
- } else {
- flags |= DateUtils.FORMAT_SHOW_TIME;
- }
-
- return DateUtils.formatDateTime(context, when, flags);
- }
-
- /**
- * A convenient way to transform any list into a (parcelable) ArrayList.
- * Uses cast if possible, else creates a new list with entries from {@code list}.
- */
- public static <T> ArrayList<T> asArrayList(List<T> list) {
- return list instanceof ArrayList
- ? (ArrayList<T>) list
- : new ArrayList<T>(list);
- }
-
- /**
- * Compare two strings against each other using system default collator in a
- * case-insensitive mode. Clusters strings prefixed with {@link DIR_PREFIX}
- * before other items.
- */
- public static int compareToIgnoreCaseNullable(String lhs, String rhs) {
- final boolean leftEmpty = TextUtils.isEmpty(lhs);
- final boolean rightEmpty = TextUtils.isEmpty(rhs);
-
- if (leftEmpty && rightEmpty) return 0;
- if (leftEmpty) return -1;
- if (rightEmpty) return 1;
-
- return sCollator.compare(lhs, rhs);
- }
-
- public static boolean isHardwareKeyboardAvailable(Context context) {
- return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
- }
-
- public static void ensureKeyboardPresent(Context context, AlertDialog dialog) {
- if (!isHardwareKeyboardAvailable(context)) {
- dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
- }
- }
-
- /*
- * Returns true if app is running in "productivity mode".
- */
- private static boolean isProductivityMode(Context context, Intent intent) {
- return intent.getBooleanExtra(
- Shared.EXTRA_PRODUCTIVITY_MODE,
- context.getResources().getBoolean(R.bool.productivity_device));
- }
-
- /*
- * Returns true if "Documents" root should be shown.
- */
- public static boolean shouldShowDocumentsRoot(Context context, Intent intent) {
- return isProductivityMode(context, intent);
- }
-
- /*
- * Returns true if device root should be shown.
- */
- public static boolean shouldShowDeviceRoot(Context context, Intent intent) {
- return isProductivityMode(context, intent)
- || intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, false);
- }
-
- /**
- * Returns true if device root should be shown.
- */
- public static boolean shouldShowFancyFeatures(Activity activity) {
- Intent intent = activity.getIntent();
- return isProductivityMode(activity, intent)
- || intent.getBooleanExtra(DocumentsContract.EXTRA_FANCY_FEATURES, false);
- }
-
- public static void checkMainLoop() {
- if (Looper.getMainLooper() != Looper.myLooper()) {
- Log.e(TAG, "Calling from non-UI thread!");
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java b/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java
deleted file mode 100644
index c3a82d7..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.annotation.StringRes;
-import android.app.Activity;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-
-public final class Snackbars {
- private Snackbars() {}
-
- public static final void showDocumentsClipped(Activity activity, int docCount) {
- String msg = Shared.getQuantityString(
- activity, R.plurals.clipboard_files_clipped, docCount);
- Snackbars.makeSnackbar(activity, msg, Snackbar.LENGTH_SHORT).show();
- }
-
- public static final void showMove(Activity activity, int docCount) {
- CharSequence message = Shared.getQuantityString(activity, R.plurals.move_begin, docCount);
- makeSnackbar(activity, message, Snackbar.LENGTH_SHORT).show();
- }
-
- public static final void showCopy(Activity activity, int docCount) {
- CharSequence message = Shared.getQuantityString(activity, R.plurals.copy_begin, docCount);
- makeSnackbar(activity, message, Snackbar.LENGTH_SHORT).show();
- }
-
- public static final void showPasteFailed(Activity activity) {
- makeSnackbar(activity, R.string.clipboard_files_cannot_paste, Snackbar.LENGTH_SHORT).show();
- }
-
- public static final Snackbar makeSnackbar(Activity activity, @StringRes int messageId,
- int duration) {
- return Snackbars.makeSnackbar(
- activity, activity.getResources().getText(messageId), duration);
- }
-
- public static final Snackbar makeSnackbar(
- Activity activity, CharSequence message, int duration) {
- final View view = activity.findViewById(R.id.coordinator_layout);
- return Snackbar.make(view, message, duration);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/State.java b/packages/DocumentsUI/src/com/android/documentsui/State.java
deleted file mode 100644
index 9cdf1a8..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/State.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.IntDef;
-import android.content.Intent;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.DurableUtils;
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class State implements android.os.Parcelable {
-
- private static final String TAG = "State";
-
- @IntDef(flag = true, value = {
- ACTION_BROWSE,
- ACTION_PICK_COPY_DESTINATION,
- ACTION_OPEN,
- ACTION_CREATE,
- ACTION_GET_CONTENT,
- ACTION_OPEN_TREE
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface ActionType {}
- // File manager and related private picking activity.
- public static final int ACTION_BROWSE = 1;
- public static final int ACTION_PICK_COPY_DESTINATION = 2;
- // All public picking activities
- public static final int ACTION_OPEN = 3;
- public static final int ACTION_CREATE = 4;
- public static final int ACTION_GET_CONTENT = 5;
- public static final int ACTION_OPEN_TREE = 6;
-
- @IntDef(flag = true, value = {
- MODE_UNKNOWN,
- MODE_LIST,
- MODE_GRID
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface ViewMode {}
- public static final int MODE_UNKNOWN = 0;
- public static final int MODE_LIST = 1;
- public static final int MODE_GRID = 2;
-
- public static final int SORT_ORDER_UNKNOWN = 0;
- public static final int SORT_ORDER_DISPLAY_NAME = 1;
- public static final int SORT_ORDER_LAST_MODIFIED = 2;
- public static final int SORT_ORDER_SIZE = 3;
-
- public @ActionType int action;
- public String[] acceptMimes;
-
- /** Derived from local preferences */
- public @ViewMode int derivedMode = MODE_GRID;
-
- /** Explicit user choice */
- public int userSortOrder = SORT_ORDER_UNKNOWN;
- /** Derived after loader */
- public int derivedSortOrder = SORT_ORDER_DISPLAY_NAME;
-
- public boolean allowMultiple;
- public boolean forceSize;
- public boolean showSize;
- public boolean localOnly;
- public boolean showAdvancedOption;
- public boolean showAdvanced;
- public boolean restored;
- /*
- * Indicates handler was an external app, like photos.
- */
- public boolean external;
-
- // Indicates that a copy operation (or move) includes a directory.
- // Why? Directory creation isn't supported by some roots (like Downloads).
- // This allows us to restrict available roots to just those with support.
- public boolean directoryCopy;
- public boolean openableOnly;
-
- /**
- * This is basically a sub-type for the copy operation. It can be either COPY or MOVE.
- * The only legal values, if set, are: OPERATION_COPY, OPERATION_MOVE. Other pick
- * operations don't use this. In those cases OPERATION_UNKNOWN is also legal.
- */
- public @OpType int copyOperationSubType = FileOperationService.OPERATION_UNKNOWN;
-
- /** Current user navigation stack; empty implies recents. */
- public DocumentStack stack = new DocumentStack();
- private boolean mStackTouched;
- private boolean mInitialRootChanged;
- private boolean mInitialDocChanged;
-
- /** Instance state for every shown directory */
- public HashMap<String, SparseArray<Parcelable>> dirState = new HashMap<>();
-
- /** Name of the package that started DocsUI */
- public List<String> excludedAuthorities = new ArrayList<>();
-
- public void initAcceptMimes(Intent intent) {
- if (intent.hasExtra(Intent.EXTRA_MIME_TYPES)) {
- acceptMimes = intent.getStringArrayExtra(Intent.EXTRA_MIME_TYPES);
- } else {
- String glob = intent.getType();
- acceptMimes = new String[] { glob != null ? glob : "*/*" };
- }
- }
-
- public void onRootChanged(RootInfo root) {
- if (DEBUG) Log.d(TAG, "Root changed to: " + root);
- if (!mInitialRootChanged && stack.root != null && !root.equals(stack.root)) {
- mInitialRootChanged = true;
- }
- stack.root = root;
- stack.clear();
- mStackTouched = true;
- }
-
- public void pushDocument(DocumentInfo info) {
- if (DEBUG) Log.d(TAG, "Adding doc to stack: " + info);
- if (!mInitialDocChanged && stack.size() > 0 && !info.equals(stack.peek())) {
- mInitialDocChanged = true;
- }
- stack.push(info);
- mStackTouched = true;
- }
-
- public void popDocument() {
- if (DEBUG) Log.d(TAG, "Popping doc off stack.");
- stack.pop();
- mStackTouched = true;
- }
-
- public void setStack(DocumentStack stack) {
- if (DEBUG) Log.d(TAG, "Setting the whole darn stack to: " + stack);
- this.stack = stack;
- mStackTouched = true;
- }
-
- // This will return true even when the initial location is set.
- // To get a read on if the user has changed something, use #hasInitialLocationChanged.
- public boolean hasLocationChanged() {
- return mStackTouched;
- }
-
- public boolean hasInitialLocationChanged() {
- return mInitialRootChanged || mInitialDocChanged;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- out.writeInt(action);
- out.writeStringArray(acceptMimes);
- out.writeInt(userSortOrder);
- out.writeInt(allowMultiple ? 1 : 0);
- out.writeInt(forceSize ? 1 : 0);
- out.writeInt(showSize ? 1 : 0);
- out.writeInt(localOnly ? 1 : 0);
- out.writeInt(showAdvancedOption ? 1 : 0);
- out.writeInt(showAdvanced ? 1 : 0);
- out.writeInt(restored ? 1 : 0);
- out.writeInt(external ? 1 : 0);
- DurableUtils.writeToParcel(out, stack);
- out.writeMap(dirState);
- out.writeList(excludedAuthorities);
- out.writeInt(openableOnly ? 1 : 0);
- out.writeInt(mStackTouched ? 1 : 0);
- out.writeInt(mInitialRootChanged ? 1 : 0);
- out.writeInt(mInitialDocChanged ? 1 : 0);
- }
-
- public static final ClassLoaderCreator<State> CREATOR = new ClassLoaderCreator<State>() {
- @Override
- public State createFromParcel(Parcel in) {
- return createFromParcel(in, null);
- }
-
- @Override
- public State createFromParcel(Parcel in, ClassLoader loader) {
- final State state = new State();
- state.action = in.readInt();
- state.acceptMimes = in.readStringArray();
- state.userSortOrder = in.readInt();
- state.allowMultiple = in.readInt() != 0;
- state.forceSize = in.readInt() != 0;
- state.showSize = in.readInt() != 0;
- state.localOnly = in.readInt() != 0;
- state.showAdvancedOption = in.readInt() != 0;
- state.showAdvanced = in.readInt() != 0;
- state.restored = in.readInt() != 0;
- state.external = in.readInt() != 0;
- DurableUtils.readFromParcel(in, state.stack);
- in.readMap(state.dirState, loader);
- in.readList(state.excludedAuthorities, loader);
- state.openableOnly = in.readInt() != 0;
- state.mStackTouched = in.readInt() != 0;
- state.mInitialRootChanged = in.readInt() != 0;
- state.mInitialDocChanged = in.readInt() != 0;
- return state;
- }
-
- @Override
- public State[] newArray(int size) {
- return new State[size];
- }
- };
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ThumbnailCache.java b/packages/DocumentsUI/src/com/android/documentsui/ThumbnailCache.java
deleted file mode 100644
index ecde685..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/ThumbnailCache.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.annotation.IntDef;
-import android.annotation.Nullable;
-import android.content.ComponentCallbacks2;
-import android.graphics.Bitmap;
-import android.graphics.Point;
-import android.net.Uri;
-import android.util.LruCache;
-import android.util.Pair;
-import android.util.Pools;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.TreeMap;
-
-/**
- * An LRU cache that supports finding the thumbnail of the requested uri with a different size than
- * the requested one.
- */
-public class ThumbnailCache {
-
- private static final SizeComparator SIZE_COMPARATOR = new SizeComparator();
-
- /**
- * A 2-dimensional index into {@link #mCache} entries. Pair<Uri, Point> is the key to
- * {@link #mCache}. TreeMap is used to search the closest size to a given size and a given uri.
- */
- private final HashMap<Uri, TreeMap<Point, Pair<Uri, Point>>> mSizeIndex;
- private final Cache mCache;
-
- /**
- * Creates a thumbnail LRU cache.
- *
- * @param maxCacheSizeInBytes the maximum size of thumbnails in bytes this cache can hold.
- */
- public ThumbnailCache(int maxCacheSizeInBytes) {
- mSizeIndex = new HashMap<>();
- mCache = new Cache(maxCacheSizeInBytes);
- }
-
- /**
- * Obtains thumbnail given a uri and a size.
- *
- * @param uri the uri of the thumbnail in need
- * @param size the desired size of the thumbnail
- * @return the thumbnail result
- */
- public Result getThumbnail(Uri uri, Point size) {
- TreeMap<Point, Pair<Uri, Point>> sizeMap;
- sizeMap = mSizeIndex.get(uri);
- if (sizeMap == null || sizeMap.isEmpty()) {
- // There is not any thumbnail for this uri.
- return Result.obtainMiss();
- }
-
- // Look for thumbnail of the same size.
- Pair<Uri, Point> cacheKey = sizeMap.get(size);
- if (cacheKey != null) {
- Entry entry = mCache.get(cacheKey);
- if (entry != null) {
- return Result.obtain(Result.CACHE_HIT_EXACT, size, entry);
- }
- }
-
- // Look for thumbnail of bigger sizes.
- Point otherSize = sizeMap.higherKey(size);
- if (otherSize != null) {
- cacheKey = sizeMap.get(otherSize);
-
- if (cacheKey != null) {
- Entry entry = mCache.get(cacheKey);
- if (entry != null) {
- return Result.obtain(Result.CACHE_HIT_LARGER, otherSize, entry);
- }
- }
- }
-
- // Look for thumbnail of smaller sizes.
- otherSize = sizeMap.lowerKey(size);
- if (otherSize != null) {
- cacheKey = sizeMap.get(otherSize);
-
- if (cacheKey != null) {
- Entry entry = mCache.get(cacheKey);
- if (entry != null) {
- return Result.obtain(Result.CACHE_HIT_SMALLER, otherSize, entry);
- }
- }
- }
-
- // Cache miss.
- return Result.obtainMiss();
- }
-
- public void putThumbnail(Uri uri, Point size, Bitmap thumbnail, long lastModified) {
- Pair<Uri, Point> cacheKey = Pair.create(uri, size);
-
- TreeMap<Point, Pair<Uri, Point>> sizeMap;
- synchronized (mSizeIndex) {
- sizeMap = mSizeIndex.get(uri);
- if (sizeMap == null) {
- sizeMap = new TreeMap<>(SIZE_COMPARATOR);
- mSizeIndex.put(uri, sizeMap);
- }
- }
-
- Entry entry = new Entry(thumbnail, lastModified);
- mCache.put(cacheKey, entry);
- synchronized (sizeMap) {
- sizeMap.put(size, cacheKey);
- }
- }
-
- private void removeKey(Uri uri, Point size) {
- TreeMap<Point, Pair<Uri, Point>> sizeMap;
- synchronized (mSizeIndex) {
- sizeMap = mSizeIndex.get(uri);
- }
-
- // LruCache tells us to remove a key, which should exist, so sizeMap can't be null.
- assert (sizeMap != null);
- synchronized (sizeMap) {
- sizeMap.remove(size);
- }
- }
-
- public void onTrimMemory(int level) {
- if (level >= ComponentCallbacks2.TRIM_MEMORY_MODERATE) {
- mCache.evictAll();
- } else if (level >= ComponentCallbacks2.TRIM_MEMORY_BACKGROUND) {
- mCache.trimToSize(mCache.size() / 2);
- }
- }
-
- /**
- * A class that holds thumbnail and cache status.
- */
- public static final class Result {
-
- @Retention(RetentionPolicy.SOURCE)
- @IntDef({CACHE_MISS, CACHE_HIT_EXACT, CACHE_HIT_SMALLER, CACHE_HIT_LARGER})
- @interface Status {}
- /**
- * Indicates there is no thumbnail for the requested uri. The thumbnail will be null.
- */
- public static final int CACHE_MISS = 0;
- /**
- * Indicates the thumbnail matches the requested size and requested uri.
- */
- public static final int CACHE_HIT_EXACT = 1;
- /**
- * Indicates the thumbnail is in a smaller size than the requested one from the requested
- * uri.
- */
- public static final int CACHE_HIT_SMALLER = 2;
- /**
- * Indicates the thumbnail is in a larger size than the requested one from the requested
- * uri.
- */
- public static final int CACHE_HIT_LARGER = 3;
-
- private static final Pools.SimplePool<Result> sPool = new Pools.SimplePool<>(1);
-
- private @Status int mStatus;
- private @Nullable Bitmap mThumbnail;
- private @Nullable Point mSize;
- private long mLastModified;
-
- private static Result obtainMiss() {
- return obtain(CACHE_MISS, null, null, 0);
- }
-
- private static Result obtain(@Status int status, Point size, Entry entry) {
- return obtain(status, entry.mThumbnail, size, entry.mLastModified);
- }
-
- private static Result obtain(@Status int status, @Nullable Bitmap thumbnail,
- @Nullable Point size, long lastModified) {
- Shared.checkMainLoop();
-
- Result instance = sPool.acquire();
- instance = (instance != null ? instance : new Result());
-
- instance.mStatus = status;
- instance.mThumbnail = thumbnail;
- instance.mSize = size;
- instance.mLastModified = lastModified;
-
- return instance;
- }
-
- private Result() {}
-
- public void recycle() {
- Shared.checkMainLoop();
-
- mStatus = -1;
- mThumbnail = null;
- mSize = null;
- mLastModified = -1;
-
- boolean released = sPool.release(this);
- // This assert is used to guarantee we won't generate too many instances that can't be
- // held in the pool, which indicates our pool size is too small.
- //
- // Right now one instance is enough because we expect all instances are only used in
- // main thread.
- assert (released);
- }
-
- public @Status int getStatus() {
- return mStatus;
- }
-
- public @Nullable Bitmap getThumbnail() {
- return mThumbnail;
- }
-
- public @Nullable Point getSize() {
- return mSize;
- }
-
- public long getLastModified() {
- return mLastModified;
- }
-
- public boolean isHit() {
- return (mStatus != CACHE_MISS);
- }
-
- public boolean isExactHit() {
- return (mStatus == CACHE_HIT_EXACT);
- }
- }
-
- private static final class Entry {
- private final Bitmap mThumbnail;
- private final long mLastModified;
-
- private Entry(Bitmap thumbnail, long lastModified) {
- mThumbnail = thumbnail;
- mLastModified = lastModified;
- }
- }
-
- private final class Cache extends LruCache<Pair<Uri, Point>, Entry> {
-
- private Cache(int maxSizeBytes) {
- super(maxSizeBytes);
- }
-
- @Override
- protected int sizeOf(Pair<Uri, Point> key, Entry value) {
- return value.mThumbnail.getByteCount();
- }
-
- @Override
- protected void entryRemoved(
- boolean evicted, Pair<Uri, Point> key, Entry oldValue, Entry newValue) {
- if (newValue == null) {
- removeKey(key.first, key.second);
- }
- }
- }
-
- private static final class SizeComparator implements Comparator<Point> {
- @Override
- public int compare(Point size0, Point size1) {
- // Assume all sizes are roughly square, so we only compare them in one dimension.
- return size0.x - size1.x;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/UriDerivativeLoader.java b/packages/DocumentsUI/src/com/android/documentsui/UriDerivativeLoader.java
deleted file mode 100644
index 7bb662c..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/UriDerivativeLoader.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.AsyncTaskLoader;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.os.CancellationSignal;
-import android.os.OperationCanceledException;
-
-/**
- * Loader that derives its data from a Uri. Watches for {@link ContentObserver}
- * changes while started, manages {@link CancellationSignal}, and caches
- * returned results.
- */
-public abstract class UriDerivativeLoader<Param, Res> extends AsyncTaskLoader<Res> {
- final ForceLoadContentObserver mObserver;
-
- private final Param mParam;
-
- private Res mResult;
- private CancellationSignal mCancellationSignal;
-
- @Override
- public final Res loadInBackground() {
- synchronized (this) {
- if (isLoadInBackgroundCanceled()) {
- throw new OperationCanceledException();
- }
- mCancellationSignal = new CancellationSignal();
- }
- try {
- return loadInBackground(mParam, mCancellationSignal);
- } finally {
- synchronized (this) {
- mCancellationSignal = null;
- }
- }
- }
-
- public abstract Res loadInBackground(Param param, CancellationSignal signal);
-
- @Override
- public void cancelLoadInBackground() {
- super.cancelLoadInBackground();
-
- synchronized (this) {
- if (mCancellationSignal != null) {
- mCancellationSignal.cancel();
- }
- }
- }
-
- @Override
- public void deliverResult(Res result) {
- if (isReset()) {
- closeQuietly(result);
- return;
- }
- Res oldResult = mResult;
- mResult = result;
-
- if (isStarted()) {
- super.deliverResult(result);
- }
-
- if (oldResult != null && oldResult != result) {
- closeQuietly(oldResult);
- }
- }
-
- public UriDerivativeLoader(Context context, Param param) {
- super(context);
- mObserver = new ForceLoadContentObserver();
- mParam = param;
- }
-
- @Override
- protected void onStartLoading() {
- if (mResult != null) {
- deliverResult(mResult);
- }
- if (takeContentChanged() || mResult == null) {
- forceLoad();
- }
- }
-
- @Override
- protected void onStopLoading() {
- cancelLoad();
- }
-
- @Override
- public void onCanceled(Res result) {
- closeQuietly(result);
- }
-
- @Override
- protected void onReset() {
- super.onReset();
-
- // Ensure the loader is stopped
- onStopLoading();
-
- closeQuietly(mResult);
- mResult = null;
-
- getContext().getContentResolver().unregisterContentObserver(mObserver);
- }
-
- private void closeQuietly(Res result) {
- if (result instanceof AutoCloseable) {
- try {
- ((AutoCloseable) result).close();
- } catch (RuntimeException rethrown) {
- throw rethrown;
- } catch (Exception ignored) {
- }
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/AnimationView.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/AnimationView.java
deleted file mode 100644
index a666456..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/AnimationView.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.annotation.IntDef;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-
-import com.android.documentsui.R;
-import com.android.documentsui.Shared;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This class exists solely to support animated transition of our directory fragment.
- * The structure of this class is tightly coupled with the static animations defined in
- * res/animator, specifically the "position" property referenced by
- * res/animator/dir_{enter,leave}.xml.
- */
-public class AnimationView extends LinearLayout {
-
- @IntDef(flag = true, value = {
- ANIM_NONE,
- ANIM_SIDE,
- ANIM_LEAVE,
- ANIM_ENTER
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface AnimationType {}
- public static final int ANIM_NONE = 1;
- public static final int ANIM_SIDE = 2;
- public static final int ANIM_LEAVE = 3;
- public static final int ANIM_ENTER = 4;
-
- private float mPosition = 0f;
-
- // The distance the animation will cover...currently matches the height of the
- // content area.
- private int mSpan;
-
- public AnimationView(Context context) {
- super(context);
- }
-
- public AnimationView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- mSpan = h;
- setPosition(mPosition);
- }
-
- public float getPosition() {
- return mPosition;
- }
-
- public void setPosition(float position) {
- mPosition = position;
- // Warning! If we ever decide to switch this to setX (slide left/right)
- // please remember to add RLT variations of the animations under res/animator-ldrtl.
- setY((mSpan > 0) ? (mPosition * mSpan) : 0);
-
- if (mPosition != 0) {
- setTranslationZ(getResources().getDimensionPixelSize(R.dimen.dir_elevation));
- } else {
- setTranslationZ(0);
- }
- }
-
- /**
- * Configures custom animations on the transaction according to the specified
- * @AnimationType.
- */
- static void setupAnimations(
- FragmentTransaction ft, @AnimationType int anim, Bundle args) {
- switch (anim) {
- case AnimationView.ANIM_SIDE:
- args.putBoolean(Shared.EXTRA_IGNORE_STATE, true);
- break;
- case AnimationView.ANIM_ENTER:
- // TODO: Document which behavior is being tailored
- // by passing this bit. Remove if possible.
- args.putBoolean(Shared.EXTRA_IGNORE_STATE, true);
- ft.setCustomAnimations(R.animator.dir_enter, R.animator.fade_out);
- break;
- case AnimationView.ANIM_LEAVE:
- ft.setCustomAnimations(R.animator.fade_in, R.animator.dir_leave);
- break;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java
deleted file mode 100644
index 9581b3e..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java
+++ /dev/null
@@ -1,1265 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.dirlist.ModelBackedDocumentsAdapter.ITEM_TYPE_DIRECTORY;
-import static com.android.documentsui.dirlist.ModelBackedDocumentsAdapter.ITEM_TYPE_DOCUMENT;
-
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.util.SparseArray;
-import android.util.SparseBooleanArray;
-import android.util.SparseIntArray;
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.android.documentsui.Events;
-import com.android.documentsui.Events.InputEvent;
-import com.android.documentsui.Events.MotionInputEvent;
-import com.android.documentsui.R;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Provides mouse driven band-select support when used in conjunction with {@link RecyclerView}
- * and {@link MultiSelectManager}. This class is responsible for rendering the band select
- * overlay and selecting overlaid items via MultiSelectManager.
- */
-public class BandController extends RecyclerView.OnScrollListener {
-
- private static final int NOT_SET = -1;
-
- private static final String TAG = "BandController";
-
- private final Runnable mModelBuilder;
- private final SelectionEnvironment mEnvironment;
- private final DocumentsAdapter mAdapter;
- private final MultiSelectManager mSelectionManager;
- private final Runnable mViewScroller = new ViewScroller();
- private final GridModel.OnSelectionChangedListener mGridListener;
-
- @Nullable private Rect mBounds;
- @Nullable private Point mCurrentPosition;
- @Nullable private Point mOrigin;
- @Nullable private BandController.GridModel mModel;
-
- // The time at which the current band selection-induced scroll began. If no scroll is in
- // progress, the value is NOT_SET.
- private long mScrollStartTime = NOT_SET;
- private Selection mSelection;
-
- public BandController(
- final RecyclerView view,
- DocumentsAdapter adapter,
- MultiSelectManager selectionManager) {
- this(new RuntimeSelectionEnvironment(view), adapter, selectionManager);
-
- view.addOnItemTouchListener(
- new RecyclerView.OnItemTouchListener() {
- @Override
- public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
- final MotionInputEvent event = MotionInputEvent.obtain(e, view);
- try {
- return handleEvent(event);
- } finally {
- event.recycle();
- }
- }
- @Override
- public void onTouchEvent(RecyclerView rv, MotionEvent e) {
- if (Events.isMouseEvent(e)) {
- final MotionInputEvent event = MotionInputEvent.obtain(e, view);
- try {
- processInputEvent(event);
- } finally {
- event.recycle();
- }
- }
- }
- @Override
- public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {}
- });
- }
-
- private BandController(
- SelectionEnvironment env,
- DocumentsAdapter adapter,
- MultiSelectManager selectionManager) {
-
- selectionManager.bindContoller(this);
-
- mEnvironment = env;
- mAdapter = adapter;
- mSelectionManager = selectionManager;
-
- mEnvironment.addOnScrollListener(this);
-
- mAdapter.registerAdapterDataObserver(
- new RecyclerView.AdapterDataObserver() {
- @Override
- public void onChanged() {
- if (isActive()) {
- endBandSelect();
- }
- }
-
- @Override
- public void onItemRangeChanged(
- int startPosition, int itemCount, Object payload) {
- // No change in position. Ignoring.
- }
-
- @Override
- public void onItemRangeInserted(int startPosition, int itemCount) {
- if (isActive()) {
- endBandSelect();
- }
- }
-
- @Override
- public void onItemRangeRemoved(int startPosition, int itemCount) {
- assert(startPosition >= 0);
- assert(itemCount > 0);
-
- // TODO: Should update grid model.
- }
-
- @Override
- public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
- throw new UnsupportedOperationException();
- }
- });
-
- mGridListener = new GridModel.OnSelectionChangedListener() {
-
- @Override
- public void onSelectionChanged(Set<String> updatedSelection) {
- BandController.this.onSelectionChanged(updatedSelection);
- }
-
- @Override
- public boolean onBeforeItemStateChange(String id, boolean nextState) {
- return BandController.this.onBeforeItemStateChange(id, nextState);
- }
- };
-
- mModelBuilder = new Runnable() {
- @Override
- public void run() {
- mModel = new GridModel(mEnvironment, mAdapter);
- mModel.addOnSelectionChangedListener(mGridListener);
- }
- };
- }
-
- void bindSelection(Selection selection) {
- mSelection = selection;
- }
-
- private boolean handleEvent(MotionInputEvent e) {
- if (!e.isMouseEvent() && isActive()) {
- // Weird things happen if we keep up band select
- // when touch events happen.
- endBandSelect();
- return false;
- }
-
- // b/23793622 notes the fact that we *never* receive ACTION_DOWN
- // events in onTouchEvent. Where it not for this issue, we'd
- // push start handling down into handleInputEvent.
- if (shouldStart(e)) {
- // endBandSelect is handled in handleInputEvent.
- startBandSelect(e.getOrigin());
- } else if (isActive() && e.isActionUp()) {
- // Same issue here w b/23793622. The ACTION_UP event
- // is only evert dispatched to onTouchEvent when
- // there is some associated motion. If a user taps
- // mouse, but doesn't move, then band select gets
- // started BUT not ended. Causing phantom
- // bands to appear when the user later clicks to start
- // band select.
- if (e.isMouseEvent()) {
- processInputEvent(e);
- }
- }
-
- return isActive();
- }
-
- private boolean isActive() {
- return mModel != null;
- }
-
- /**
- * Handle a change in layout by cleaning up and getting rid of the old model and creating
- * a new model which will track the new layout.
- */
- public void handleLayoutChanged() {
- if (mModel != null) {
- mModel.removeOnSelectionChangedListener(mGridListener);
- mModel.stopListening();
-
- // build a new model, all fresh and happy.
- mModelBuilder.run();
- }
- }
-
- boolean shouldStart(MotionInputEvent e) {
- return !isActive()
- && e.isActionDown() // the initial button press
- && mAdapter.getItemCount() > 0
- && e.getItemPosition() == RecyclerView.NO_ID; // in empty space
- }
-
- boolean shouldStop(InputEvent input) {
- return isActive()
- && input.isMouseEvent()
- && input.isActionUp();
- }
-
- /**
- * Processes a MotionEvent by starting, ending, or resizing the band select overlay.
- * @param input
- */
- private void processInputEvent(InputEvent input) {
- assert(input.isMouseEvent());
-
- if (shouldStop(input)) {
- endBandSelect();
- return;
- }
-
- // We shouldn't get any events in this method when band select is not active,
- // but it turns some guests show up late to the party.
- if (!isActive()) {
- return;
- }
-
- mCurrentPosition = input.getOrigin();
- mModel.resizeSelection(input.getOrigin());
- scrollViewIfNecessary();
- resizeBandSelectRectangle();
- }
-
- /**
- * Starts band select by adding the drawable to the RecyclerView's overlay.
- */
- private void startBandSelect(Point origin) {
- if (DEBUG) Log.d(TAG, "Starting band select @ " + origin);
-
- mOrigin = origin;
- mModelBuilder.run(); // Creates a new selection model.
- mModel.startSelection(mOrigin);
- }
-
- /**
- * Scrolls the view if necessary.
- */
- private void scrollViewIfNecessary() {
- mEnvironment.removeCallback(mViewScroller);
- mViewScroller.run();
- mEnvironment.invalidateView();
- }
-
- /**
- * Resizes the band select rectangle by using the origin and the current pointer position as
- * two opposite corners of the selection.
- */
- private void resizeBandSelectRectangle() {
- mBounds = new Rect(Math.min(mOrigin.x, mCurrentPosition.x),
- Math.min(mOrigin.y, mCurrentPosition.y),
- Math.max(mOrigin.x, mCurrentPosition.x),
- Math.max(mOrigin.y, mCurrentPosition.y));
- mEnvironment.showBand(mBounds);
- }
-
- /**
- * Ends band select by removing the overlay.
- */
- private void endBandSelect() {
- if (DEBUG) Log.d(TAG, "Ending band select.");
-
- mEnvironment.hideBand();
- mSelection.applyProvisionalSelection();
- mModel.endSelection();
- int firstSelected = mModel.getPositionNearestOrigin();
- if (firstSelected != NOT_SET) {
- if (mSelection.contains(mAdapter.getModelId(firstSelected))) {
- // TODO: firstSelected should really be lastSelected, we want to anchor the item
- // where the mouse-up occurred.
- mSelectionManager.setSelectionRangeBegin(firstSelected);
- } else {
- // TODO: Check if this is really happening.
- Log.w(TAG, "First selected by band is NOT in selection!");
- }
- }
-
- mModel = null;
- mOrigin = null;
- }
-
- private void onSelectionChanged(Set<String> updatedSelection) {
- Map<String, Boolean> delta = mSelection.setProvisionalSelection(updatedSelection);
- for (Map.Entry<String, Boolean> entry: delta.entrySet()) {
- mSelectionManager.notifyItemStateChanged(entry.getKey(), entry.getValue());
- }
- mSelectionManager.notifySelectionChanged();
- }
-
- private boolean onBeforeItemStateChange(String id, boolean nextState) {
- return mSelectionManager.notifyBeforeItemStateChange(id, nextState);
- }
-
- private class ViewScroller implements Runnable {
- /**
- * The number of milliseconds of scrolling at which scroll speed continues to increase.
- * At first, the scroll starts slowly; then, the rate of scrolling increases until it
- * reaches its maximum value at after this many milliseconds.
- */
- private static final long SCROLL_ACCELERATION_LIMIT_TIME_MS = 2000;
-
- @Override
- public void run() {
- // Compute the number of pixels the pointer's y-coordinate is past the view.
- // Negative values mean the pointer is at or before the top of the view, and
- // positive values mean that the pointer is at or after the bottom of the view. Note
- // that one additional pixel is added here so that the view still scrolls when the
- // pointer is exactly at the top or bottom.
- int pixelsPastView = 0;
- if (mCurrentPosition.y <= 0) {
- pixelsPastView = mCurrentPosition.y - 1;
- } else if (mCurrentPosition.y >= mEnvironment.getHeight() - 1) {
- pixelsPastView = mCurrentPosition.y - mEnvironment.getHeight() + 1;
- }
-
- if (!isActive() || pixelsPastView == 0) {
- // If band selection is inactive, or if it is active but not at the edge of the
- // view, no scrolling is necessary.
- mScrollStartTime = NOT_SET;
- return;
- }
-
- if (mScrollStartTime == NOT_SET) {
- // If the pointer was previously not at the edge of the view but now is, set the
- // start time for the scroll.
- mScrollStartTime = System.currentTimeMillis();
- }
-
- // Compute the number of pixels to scroll, and scroll that many pixels.
- final int numPixels = computeScrollDistance(
- pixelsPastView, System.currentTimeMillis() - mScrollStartTime);
- mEnvironment.scrollBy(numPixels);
-
- mEnvironment.removeCallback(mViewScroller);
- mEnvironment.runAtNextFrame(this);
- }
-
- /**
- * Computes the number of pixels to scroll based on how far the pointer is past the end
- * of the view and how long it has been there. Roughly based on ItemTouchHelper's
- * algorithm for computing the number of pixels to scroll when an item is dragged to the
- * end of a {@link RecyclerView}.
- * @param pixelsPastView
- * @param scrollDuration
- * @return
- */
- private int computeScrollDistance(int pixelsPastView, long scrollDuration) {
- final int maxScrollStep = mEnvironment.getHeight();
- final int direction = (int) Math.signum(pixelsPastView);
- final int absPastView = Math.abs(pixelsPastView);
-
- // Calculate the ratio of how far out of the view the pointer currently resides to
- // the entire height of the view.
- final float outOfBoundsRatio = Math.min(
- 1.0f, (float) absPastView / mEnvironment.getHeight());
- // Interpolate this ratio and use it to compute the maximum scroll that should be
- // possible for this step.
- final float cappedScrollStep =
- direction * maxScrollStep * smoothOutOfBoundsRatio(outOfBoundsRatio);
-
- // Likewise, calculate the ratio of the time spent in the scroll to the limit.
- final float timeRatio = Math.min(
- 1.0f, (float) scrollDuration / SCROLL_ACCELERATION_LIMIT_TIME_MS);
- // Interpolate this ratio and use it to compute the final number of pixels to
- // scroll.
- final int numPixels = (int) (cappedScrollStep * smoothTimeRatio(timeRatio));
-
- // If the final number of pixels to scroll ends up being 0, the view should still
- // scroll at least one pixel.
- return numPixels != 0 ? numPixels : direction;
- }
-
- /**
- * Interpolates the given out of bounds ratio on a curve which starts at (0,0) and ends
- * at (1,1) and quickly approaches 1 near the start of that interval. This ensures that
- * drags that are at the edge or barely past the edge of the view still cause sufficient
- * scrolling. The equation y=(x-1)^5+1 is used, but this could also be tweaked if
- * needed.
- * @param ratio A ratio which is in the range [0, 1].
- * @return A "smoothed" value, also in the range [0, 1].
- */
- private float smoothOutOfBoundsRatio(float ratio) {
- return (float) Math.pow(ratio - 1.0f, 5) + 1.0f;
- }
-
- /**
- * Interpolates the given time ratio on a curve which starts at (0,0) and ends at (1,1)
- * and stays close to 0 for most input values except those very close to 1. This ensures
- * that scrolls start out very slowly but speed up drastically after the scroll has been
- * in progress close to SCROLL_ACCELERATION_LIMIT_TIME_MS. The equation y=x^5 is used,
- * but this could also be tweaked if needed.
- * @param ratio A ratio which is in the range [0, 1].
- * @return A "smoothed" value, also in the range [0, 1].
- */
- private float smoothTimeRatio(float ratio) {
- return (float) Math.pow(ratio, 5);
- }
- };
-
- @Override
- public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
- if (!isActive()) {
- return;
- }
-
- // Adjust the y-coordinate of the origin the opposite number of pixels so that the
- // origin remains in the same place relative to the view's items.
- mOrigin.y -= dy;
- resizeBandSelectRectangle();
- }
-
- /**
- * Provides a band selection item model for views within a RecyclerView. This class queries the
- * RecyclerView to determine where its items are placed; then, once band selection is underway,
- * it alerts listeners of which items are covered by the selections.
- */
- @VisibleForTesting
- static final class GridModel extends RecyclerView.OnScrollListener {
-
- public static final int NOT_SET = -1;
-
- // Enum values used to determine the corner at which the origin is located within the
- private static final int UPPER = 0x00;
- private static final int LOWER = 0x01;
- private static final int LEFT = 0x00;
- private static final int RIGHT = 0x02;
- private static final int UPPER_LEFT = UPPER | LEFT;
- private static final int UPPER_RIGHT = UPPER | RIGHT;
- private static final int LOWER_LEFT = LOWER | LEFT;
- private static final int LOWER_RIGHT = LOWER | RIGHT;
-
- private final SelectionEnvironment mHelper;
- private final DocumentsAdapter mAdapter;
-
- private final List<GridModel.OnSelectionChangedListener> mOnSelectionChangedListeners =
- new ArrayList<>();
-
- // Map from the x-value of the left side of a SparseBooleanArray of adapter positions, keyed
- // by their y-offset. For example, if the first column of the view starts at an x-value of 5,
- // mColumns.get(5) would return an array of positions in that column. Within that array, the
- // value for key y is the adapter position for the item whose y-offset is y.
- private final SparseArray<SparseIntArray> mColumns = new SparseArray<>();
-
- // List of limits along the x-axis (columns).
- // This list is sorted from furthest left to furthest right.
- private final List<GridModel.Limits> mColumnBounds = new ArrayList<>();
-
- // List of limits along the y-axis (rows). Note that this list only contains items which
- // have been in the viewport.
- private final List<GridModel.Limits> mRowBounds = new ArrayList<>();
-
- // The adapter positions which have been recorded so far.
- private final SparseBooleanArray mKnownPositions = new SparseBooleanArray();
-
- // Array passed to registered OnSelectionChangedListeners. One array is created and reused
- // throughout the lifetime of the object.
- private final Set<String> mSelection = new HashSet<>();
-
- // The current pointer (in absolute positioning from the top of the view).
- private Point mPointer = null;
-
- // The bounds of the band selection.
- private RelativePoint mRelativeOrigin;
- private RelativePoint mRelativePointer;
-
- private boolean mIsActive;
-
- // Tracks where the band select originated from. This is used to determine where selections
- // should expand from when Shift+click is used.
- private int mPositionNearestOrigin = NOT_SET;
-
- GridModel(SelectionEnvironment helper, DocumentsAdapter adapter) {
- mHelper = helper;
- mAdapter = adapter;
- mHelper.addOnScrollListener(this);
- }
-
- /**
- * Stops listening to the view's scrolls. Call this function before discarding a
- * BandSelecModel object to prevent memory leaks.
- */
- void stopListening() {
- mHelper.removeOnScrollListener(this);
- }
-
- /**
- * Start a band select operation at the given point.
- * @param relativeOrigin The origin of the band select operation, relative to the viewport.
- * For example, if the view is scrolled to the bottom, the top-left of the viewport
- * would have a relative origin of (0, 0), even though its absolute point has a higher
- * y-value.
- */
- void startSelection(Point relativeOrigin) {
- recordVisibleChildren();
- if (isEmpty()) {
- // The selection band logic works only if there is at least one visible child.
- return;
- }
-
- mIsActive = true;
- mPointer = mHelper.createAbsolutePoint(relativeOrigin);
- mRelativeOrigin = new RelativePoint(mPointer);
- mRelativePointer = new RelativePoint(mPointer);
- computeCurrentSelection();
- notifyListeners();
- }
-
- /**
- * Resizes the selection by adjusting the pointer (i.e., the corner of the selection
- * opposite the origin.
- * @param relativePointer The pointer (opposite of the origin) of the band select operation,
- * relative to the viewport. For example, if the view is scrolled to the bottom, the
- * top-left of the viewport would have a relative origin of (0, 0), even though its
- * absolute point has a higher y-value.
- */
- @VisibleForTesting
- void resizeSelection(Point relativePointer) {
- mPointer = mHelper.createAbsolutePoint(relativePointer);
- updateModel();
- }
-
- /**
- * Ends the band selection.
- */
- void endSelection() {
- mIsActive = false;
- }
-
- /**
- * @return The adapter position for the item nearest the origin corresponding to the latest
- * band select operation, or NOT_SET if the selection did not cover any items.
- */
- int getPositionNearestOrigin() {
- return mPositionNearestOrigin;
- }
-
- @Override
- public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
- if (!mIsActive) {
- return;
- }
-
- mPointer.x += dx;
- mPointer.y += dy;
- recordVisibleChildren();
- updateModel();
- }
-
- /**
- * Queries the view for all children and records their location metadata.
- */
- private void recordVisibleChildren() {
- for (int i = 0; i < mHelper.getVisibleChildCount(); i++) {
- int adapterPosition = mHelper.getAdapterPositionAt(i);
- // Sometimes the view is not attached, as we notify the multi selection manager
- // synchronously, while views are attached asynchronously. As a result items which
- // are in the adapter may not actually have a corresponding view (yet).
- if (mHelper.hasView(adapterPosition) &&
- !mHelper.isLayoutItem(adapterPosition) &&
- !mKnownPositions.get(adapterPosition)) {
- mKnownPositions.put(adapterPosition, true);
- recordItemData(mHelper.getAbsoluteRectForChildViewAt(i), adapterPosition);
- }
- }
- }
-
- /**
- * Checks if there are any recorded children.
- */
- private boolean isEmpty() {
- return mColumnBounds.size() == 0 || mRowBounds.size() == 0;
- }
-
- /**
- * Updates the limits lists and column map with the given item metadata.
- * @param absoluteChildRect The absolute rectangle for the child view being processed.
- * @param adapterPosition The position of the child view being processed.
- */
- private void recordItemData(Rect absoluteChildRect, int adapterPosition) {
- if (mColumnBounds.size() != mHelper.getColumnCount()) {
- // If not all x-limits have been recorded, record this one.
- recordLimits(
- mColumnBounds, new Limits(absoluteChildRect.left, absoluteChildRect.right));
- }
-
- recordLimits(mRowBounds, new Limits(absoluteChildRect.top, absoluteChildRect.bottom));
-
- SparseIntArray columnList = mColumns.get(absoluteChildRect.left);
- if (columnList == null) {
- columnList = new SparseIntArray();
- mColumns.put(absoluteChildRect.left, columnList);
- }
- columnList.put(absoluteChildRect.top, adapterPosition);
- }
-
- /**
- * Ensures limits exists within the sorted list limitsList, and adds it to the list if it
- * does not exist.
- */
- private void recordLimits(List<GridModel.Limits> limitsList, GridModel.Limits limits) {
- int index = Collections.binarySearch(limitsList, limits);
- if (index < 0) {
- limitsList.add(~index, limits);
- }
- }
-
- /**
- * Handles a moved pointer; this function determines whether the pointer movement resulted
- * in a selection change and, if it has, notifies listeners of this change.
- */
- private void updateModel() {
- RelativePoint old = mRelativePointer;
- mRelativePointer = new RelativePoint(mPointer);
- if (old != null && mRelativePointer.equals(old)) {
- return;
- }
-
- computeCurrentSelection();
- notifyListeners();
- }
-
- /**
- * Computes the currently-selected items.
- */
- private void computeCurrentSelection() {
- if (areItemsCoveredByBand(mRelativePointer, mRelativeOrigin)) {
- updateSelection(computeBounds());
- } else {
- mSelection.clear();
- mPositionNearestOrigin = NOT_SET;
- }
- }
-
- /**
- * Notifies all listeners of a selection change. Note that this function simply passes
- * mSelection, so computeCurrentSelection() should be called before this
- * function.
- */
- private void notifyListeners() {
- for (GridModel.OnSelectionChangedListener listener : mOnSelectionChangedListeners) {
- listener.onSelectionChanged(mSelection);
- }
- }
-
- /**
- * @param rect Rectangle including all covered items.
- */
- private void updateSelection(Rect rect) {
- int columnStart =
- Collections.binarySearch(mColumnBounds, new Limits(rect.left, rect.left));
- assert(columnStart >= 0);
- int columnEnd = columnStart;
-
- for (int i = columnStart; i < mColumnBounds.size()
- && mColumnBounds.get(i).lowerLimit <= rect.right; i++) {
- columnEnd = i;
- }
-
- int rowStart = Collections.binarySearch(mRowBounds, new Limits(rect.top, rect.top));
- if (rowStart < 0) {
- mPositionNearestOrigin = NOT_SET;
- return;
- }
-
- int rowEnd = rowStart;
- for (int i = rowStart; i < mRowBounds.size()
- && mRowBounds.get(i).lowerLimit <= rect.bottom; i++) {
- rowEnd = i;
- }
-
- updateSelection(columnStart, columnEnd, rowStart, rowEnd);
- }
-
- /**
- * Computes the selection given the previously-computed start- and end-indices for each
- * row and column.
- */
- private void updateSelection(
- int columnStartIndex, int columnEndIndex, int rowStartIndex, int rowEndIndex) {
- if (DEBUG) Log.d(TAG, String.format("updateSelection: %d, %d, %d, %d",
- columnStartIndex, columnEndIndex, rowStartIndex, rowEndIndex));
-
- mSelection.clear();
- for (int column = columnStartIndex; column <= columnEndIndex; column++) {
- SparseIntArray items = mColumns.get(mColumnBounds.get(column).lowerLimit);
- for (int row = rowStartIndex; row <= rowEndIndex; row++) {
- // The default return value for SparseIntArray.get is 0, which is a valid
- // position. Use a sentry value to prevent erroneously selecting item 0.
- final int rowKey = mRowBounds.get(row).lowerLimit;
- int position = items.get(rowKey, NOT_SET);
- if (position != NOT_SET) {
- String id = mAdapter.getModelId(position);
- if (id != null) {
- // The adapter inserts items for UI layout purposes that aren't associated
- // with files. Those will have a null model ID. Don't select them.
- if (canSelect(id)) {
- mSelection.add(id);
- }
- }
- if (isPossiblePositionNearestOrigin(column, columnStartIndex, columnEndIndex,
- row, rowStartIndex, rowEndIndex)) {
- // If this is the position nearest the origin, record it now so that it
- // can be returned by endSelection() later.
- mPositionNearestOrigin = position;
- }
- }
- }
- }
- }
-
- /**
- * @return True if the item is selectable.
- */
- private boolean canSelect(String id) {
- // TODO: Simplify the logic, so the check whether we can select is done in one place.
- // Consider injecting FragmentTuner, or move the checks from MultiSelectManager to
- // Selection.
- for (GridModel.OnSelectionChangedListener listener : mOnSelectionChangedListeners) {
- if (!listener.onBeforeItemStateChange(id, true)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * @return Returns true if the position is the nearest to the origin, or, in the case of the
- * lower-right corner, whether it is possible that the position is the nearest to the
- * origin. See comment below for reasoning for this special case.
- */
- private boolean isPossiblePositionNearestOrigin(int columnIndex, int columnStartIndex,
- int columnEndIndex, int rowIndex, int rowStartIndex, int rowEndIndex) {
- int corner = computeCornerNearestOrigin();
- switch (corner) {
- case UPPER_LEFT:
- return columnIndex == columnStartIndex && rowIndex == rowStartIndex;
- case UPPER_RIGHT:
- return columnIndex == columnEndIndex && rowIndex == rowStartIndex;
- case LOWER_LEFT:
- return columnIndex == columnStartIndex && rowIndex == rowEndIndex;
- case LOWER_RIGHT:
- // Note that in some cases, the last row will not have as many items as there
- // are columns (e.g., if there are 4 items and 3 columns, the second row will
- // only have one item in the first column). This function is invoked for each
- // position from left to right, so return true for any position in the bottom
- // row and only the right-most position in the bottom row will be recorded.
- return rowIndex == rowEndIndex;
- default:
- throw new RuntimeException("Invalid corner type.");
- }
- }
-
- /**
- * Listener for changes in which items have been band selected.
- */
- static interface OnSelectionChangedListener {
- public void onSelectionChanged(Set<String> updatedSelection);
- public boolean onBeforeItemStateChange(String id, boolean nextState);
- }
-
- void addOnSelectionChangedListener(GridModel.OnSelectionChangedListener listener) {
- mOnSelectionChangedListeners.add(listener);
- }
-
- void removeOnSelectionChangedListener(GridModel.OnSelectionChangedListener listener) {
- mOnSelectionChangedListeners.remove(listener);
- }
-
- /**
- * Limits of a view item. For example, if an item's left side is at x-value 5 and its right side
- * is at x-value 10, the limits would be from 5 to 10. Used to record the left- and right sides
- * of item columns and the top- and bottom sides of item rows so that it can be determined
- * whether the pointer is located within the bounds of an item.
- */
- private static class Limits implements Comparable<GridModel.Limits> {
- int lowerLimit;
- int upperLimit;
-
- Limits(int lowerLimit, int upperLimit) {
- this.lowerLimit = lowerLimit;
- this.upperLimit = upperLimit;
- }
-
- @Override
- public int compareTo(GridModel.Limits other) {
- return lowerLimit - other.lowerLimit;
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof GridModel.Limits)) {
- return false;
- }
-
- return ((GridModel.Limits) other).lowerLimit == lowerLimit &&
- ((GridModel.Limits) other).upperLimit == upperLimit;
- }
-
- @Override
- public String toString() {
- return "(" + lowerLimit + ", " + upperLimit + ")";
- }
- }
-
- /**
- * The location of a coordinate relative to items. This class represents a general area of the
- * view as it relates to band selection rather than an explicit point. For example, two
- * different points within an item are considered to have the same "location" because band
- * selection originating within the item would select the same items no matter which point
- * was used. Same goes for points between items as well as those at the very beginning or end
- * of the view.
- *
- * Tracking a coordinate (e.g., an x-value) as a CoordinateLocation instead of as an int has the
- * advantage of tying the value to the Limits of items along that axis. This allows easy
- * selection of items within those Limits as opposed to a search through every item to see if a
- * given coordinate value falls within those Limits.
- */
- private static class RelativeCoordinate
- implements Comparable<GridModel.RelativeCoordinate> {
- /**
- * Location describing points after the last known item.
- */
- static final int AFTER_LAST_ITEM = 0;
-
- /**
- * Location describing points before the first known item.
- */
- static final int BEFORE_FIRST_ITEM = 1;
-
- /**
- * Location describing points between two items.
- */
- static final int BETWEEN_TWO_ITEMS = 2;
-
- /**
- * Location describing points within the limits of one item.
- */
- static final int WITHIN_LIMITS = 3;
-
- /**
- * The type of this coordinate, which is one of AFTER_LAST_ITEM, BEFORE_FIRST_ITEM,
- * BETWEEN_TWO_ITEMS, or WITHIN_LIMITS.
- */
- final int type;
-
- /**
- * The limits before the coordinate; only populated when type == WITHIN_LIMITS or type ==
- * BETWEEN_TWO_ITEMS.
- */
- GridModel.Limits limitsBeforeCoordinate;
-
- /**
- * The limits after the coordinate; only populated when type == BETWEEN_TWO_ITEMS.
- */
- GridModel.Limits limitsAfterCoordinate;
-
- // Limits of the first known item; only populated when type == BEFORE_FIRST_ITEM.
- GridModel.Limits mFirstKnownItem;
- // Limits of the last known item; only populated when type == AFTER_LAST_ITEM.
- GridModel.Limits mLastKnownItem;
-
- /**
- * @param limitsList The sorted limits list for the coordinate type. If this
- * CoordinateLocation is an x-value, mXLimitsList should be passed; otherwise,
- * mYLimitsList should be pased.
- * @param value The coordinate value.
- */
- RelativeCoordinate(List<GridModel.Limits> limitsList, int value) {
- int index = Collections.binarySearch(limitsList, new Limits(value, value));
-
- if (index >= 0) {
- this.type = WITHIN_LIMITS;
- this.limitsBeforeCoordinate = limitsList.get(index);
- } else if (~index == 0) {
- this.type = BEFORE_FIRST_ITEM;
- this.mFirstKnownItem = limitsList.get(0);
- } else if (~index == limitsList.size()) {
- GridModel.Limits lastLimits = limitsList.get(limitsList.size() - 1);
- if (lastLimits.lowerLimit <= value && value <= lastLimits.upperLimit) {
- this.type = WITHIN_LIMITS;
- this.limitsBeforeCoordinate = lastLimits;
- } else {
- this.type = AFTER_LAST_ITEM;
- this.mLastKnownItem = lastLimits;
- }
- } else {
- GridModel.Limits limitsBeforeIndex = limitsList.get(~index - 1);
- if (limitsBeforeIndex.lowerLimit <= value && value <= limitsBeforeIndex.upperLimit) {
- this.type = WITHIN_LIMITS;
- this.limitsBeforeCoordinate = limitsList.get(~index - 1);
- } else {
- this.type = BETWEEN_TWO_ITEMS;
- this.limitsBeforeCoordinate = limitsList.get(~index - 1);
- this.limitsAfterCoordinate = limitsList.get(~index);
- }
- }
- }
-
- int toComparisonValue() {
- if (type == BEFORE_FIRST_ITEM) {
- return mFirstKnownItem.lowerLimit - 1;
- } else if (type == AFTER_LAST_ITEM) {
- return mLastKnownItem.upperLimit + 1;
- } else if (type == BETWEEN_TWO_ITEMS) {
- return limitsBeforeCoordinate.upperLimit + 1;
- } else {
- return limitsBeforeCoordinate.lowerLimit;
- }
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof GridModel.RelativeCoordinate)) {
- return false;
- }
-
- GridModel.RelativeCoordinate otherCoordinate = (GridModel.RelativeCoordinate) other;
- return toComparisonValue() == otherCoordinate.toComparisonValue();
- }
-
- @Override
- public int compareTo(GridModel.RelativeCoordinate other) {
- return toComparisonValue() - other.toComparisonValue();
- }
- }
-
- /**
- * The location of a point relative to the Limits of nearby items; consists of both an x- and
- * y-RelativeCoordinateLocation.
- */
- private class RelativePoint {
- final GridModel.RelativeCoordinate xLocation;
- final GridModel.RelativeCoordinate yLocation;
-
- RelativePoint(Point point) {
- this.xLocation = new RelativeCoordinate(mColumnBounds, point.x);
- this.yLocation = new RelativeCoordinate(mRowBounds, point.y);
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof RelativePoint)) {
- return false;
- }
-
- RelativePoint otherPoint = (RelativePoint) other;
- return xLocation.equals(otherPoint.xLocation) && yLocation.equals(otherPoint.yLocation);
- }
- }
-
- /**
- * Generates a rectangle which contains the items selected by the pointer and origin.
- * @return The rectangle, or null if no items were selected.
- */
- private Rect computeBounds() {
- Rect rect = new Rect();
- rect.left = getCoordinateValue(
- min(mRelativeOrigin.xLocation, mRelativePointer.xLocation),
- mColumnBounds,
- true);
- rect.right = getCoordinateValue(
- max(mRelativeOrigin.xLocation, mRelativePointer.xLocation),
- mColumnBounds,
- false);
- rect.top = getCoordinateValue(
- min(mRelativeOrigin.yLocation, mRelativePointer.yLocation),
- mRowBounds,
- true);
- rect.bottom = getCoordinateValue(
- max(mRelativeOrigin.yLocation, mRelativePointer.yLocation),
- mRowBounds,
- false);
- return rect;
- }
-
- /**
- * Computes the corner of the selection nearest the origin.
- * @return
- */
- private int computeCornerNearestOrigin() {
- int cornerValue = 0;
-
- if (mRelativeOrigin.yLocation ==
- min(mRelativeOrigin.yLocation, mRelativePointer.yLocation)) {
- cornerValue |= UPPER;
- } else {
- cornerValue |= LOWER;
- }
-
- if (mRelativeOrigin.xLocation ==
- min(mRelativeOrigin.xLocation, mRelativePointer.xLocation)) {
- cornerValue |= LEFT;
- } else {
- cornerValue |= RIGHT;
- }
-
- return cornerValue;
- }
-
- private GridModel.RelativeCoordinate min(GridModel.RelativeCoordinate first, GridModel.RelativeCoordinate second) {
- return first.compareTo(second) < 0 ? first : second;
- }
-
- private GridModel.RelativeCoordinate max(GridModel.RelativeCoordinate first, GridModel.RelativeCoordinate second) {
- return first.compareTo(second) > 0 ? first : second;
- }
-
- /**
- * @return The absolute coordinate (i.e., the x- or y-value) of the given relative
- * coordinate.
- */
- private int getCoordinateValue(GridModel.RelativeCoordinate coordinate,
- List<GridModel.Limits> limitsList, boolean isStartOfRange) {
- switch (coordinate.type) {
- case RelativeCoordinate.BEFORE_FIRST_ITEM:
- return limitsList.get(0).lowerLimit;
- case RelativeCoordinate.AFTER_LAST_ITEM:
- return limitsList.get(limitsList.size() - 1).upperLimit;
- case RelativeCoordinate.BETWEEN_TWO_ITEMS:
- if (isStartOfRange) {
- return coordinate.limitsAfterCoordinate.lowerLimit;
- } else {
- return coordinate.limitsBeforeCoordinate.upperLimit;
- }
- case RelativeCoordinate.WITHIN_LIMITS:
- return coordinate.limitsBeforeCoordinate.lowerLimit;
- }
-
- throw new RuntimeException("Invalid coordinate value.");
- }
-
- private boolean areItemsCoveredByBand(
- RelativePoint first, RelativePoint second) {
- return doesCoordinateLocationCoverItems(first.xLocation, second.xLocation) &&
- doesCoordinateLocationCoverItems(first.yLocation, second.yLocation);
- }
-
- private boolean doesCoordinateLocationCoverItems(
- GridModel.RelativeCoordinate pointerCoordinate,
- GridModel.RelativeCoordinate originCoordinate) {
- if (pointerCoordinate.type == RelativeCoordinate.BEFORE_FIRST_ITEM &&
- originCoordinate.type == RelativeCoordinate.BEFORE_FIRST_ITEM) {
- return false;
- }
-
- if (pointerCoordinate.type == RelativeCoordinate.AFTER_LAST_ITEM &&
- originCoordinate.type == RelativeCoordinate.AFTER_LAST_ITEM) {
- return false;
- }
-
- if (pointerCoordinate.type == RelativeCoordinate.BETWEEN_TWO_ITEMS &&
- originCoordinate.type == RelativeCoordinate.BETWEEN_TWO_ITEMS &&
- pointerCoordinate.limitsBeforeCoordinate.equals(
- originCoordinate.limitsBeforeCoordinate) &&
- pointerCoordinate.limitsAfterCoordinate.equals(
- originCoordinate.limitsAfterCoordinate)) {
- return false;
- }
-
- return true;
- }
- }
-
- /**
- * Provides functionality for BandController. Exists primarily to tests that are
- * fully isolated from RecyclerView.
- */
- interface SelectionEnvironment {
- void showBand(Rect rect);
- void hideBand();
- void addOnScrollListener(RecyclerView.OnScrollListener listener);
- void removeOnScrollListener(RecyclerView.OnScrollListener listener);
- void scrollBy(int dy);
- int getHeight();
- void invalidateView();
- void runAtNextFrame(Runnable r);
- void removeCallback(Runnable r);
- Point createAbsolutePoint(Point relativePoint);
- Rect getAbsoluteRectForChildViewAt(int index);
- int getAdapterPositionAt(int index);
- int getColumnCount();
- int getChildCount();
- int getVisibleChildCount();
- /**
- * Layout items are excluded from the GridModel.
- */
- boolean isLayoutItem(int adapterPosition);
- /**
- * Items may be in the adapter, but without an attached view.
- */
- boolean hasView(int adapterPosition);
- }
-
- /** Recycler view facade implementation backed by good ol' RecyclerView. */
- private static final class RuntimeSelectionEnvironment implements SelectionEnvironment {
-
- private final RecyclerView mView;
- private final Drawable mBand;
-
- private boolean mIsOverlayShown = false;
-
- RuntimeSelectionEnvironment(RecyclerView view) {
- mView = view;
- mBand = mView.getContext().getTheme().getDrawable(R.drawable.band_select_overlay);
- }
-
- @Override
- public int getAdapterPositionAt(int index) {
- return mView.getChildAdapterPosition(mView.getChildAt(index));
- }
-
- @Override
- public void addOnScrollListener(RecyclerView.OnScrollListener listener) {
- mView.addOnScrollListener(listener);
- }
-
- @Override
- public void removeOnScrollListener(RecyclerView.OnScrollListener listener) {
- mView.removeOnScrollListener(listener);
- }
-
- @Override
- public Point createAbsolutePoint(Point relativePoint) {
- return new Point(relativePoint.x + mView.computeHorizontalScrollOffset(),
- relativePoint.y + mView.computeVerticalScrollOffset());
- }
-
- @Override
- public Rect getAbsoluteRectForChildViewAt(int index) {
- final View child = mView.getChildAt(index);
- final Rect childRect = new Rect();
- child.getHitRect(childRect);
- childRect.left += mView.computeHorizontalScrollOffset();
- childRect.right += mView.computeHorizontalScrollOffset();
- childRect.top += mView.computeVerticalScrollOffset();
- childRect.bottom += mView.computeVerticalScrollOffset();
- return childRect;
- }
-
- @Override
- public int getChildCount() {
- return mView.getAdapter().getItemCount();
- }
-
- @Override
- public int getVisibleChildCount() {
- return mView.getChildCount();
- }
-
- @Override
- public int getColumnCount() {
- RecyclerView.LayoutManager layoutManager = mView.getLayoutManager();
- if (layoutManager instanceof GridLayoutManager) {
- return ((GridLayoutManager) layoutManager).getSpanCount();
- }
-
- // Otherwise, it is a list with 1 column.
- return 1;
- }
-
- @Override
- public int getHeight() {
- return mView.getHeight();
- }
-
- @Override
- public void invalidateView() {
- mView.invalidate();
- }
-
- @Override
- public void runAtNextFrame(Runnable r) {
- mView.postOnAnimation(r);
- }
-
- @Override
- public void removeCallback(Runnable r) {
- mView.removeCallbacks(r);
- }
-
- @Override
- public void scrollBy(int dy) {
- mView.scrollBy(0, dy);
- }
-
- @Override
- public void showBand(Rect rect) {
- mBand.setBounds(rect);
-
- if (!mIsOverlayShown) {
- mView.getOverlay().add(mBand);
- }
- }
-
- @Override
- public void hideBand() {
- mView.getOverlay().remove(mBand);
- }
-
- @Override
- public boolean isLayoutItem(int pos) {
- // The band selection model only operates on documents and directories. Exclude other
- // types of adapter items (e.g. whitespace items like dividers).
- RecyclerView.ViewHolder vh = mView.findViewHolderForAdapterPosition(pos);
- switch (vh.getItemViewType()) {
- case ITEM_TYPE_DOCUMENT:
- case ITEM_TYPE_DIRECTORY:
- return false;
- default:
- return true;
- }
- }
-
- @Override
- public boolean hasView(int pos) {
- return mView.findViewHolderForAdapterPosition(pos) != null;
- }
- }
-}
\ No newline at end of file
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryDragListener.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryDragListener.java
deleted file mode 100644
index 40ee14d..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryDragListener.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.view.DragEvent;
-import android.view.View;
-
-import com.android.documentsui.ItemDragListener;
-
-class DirectoryDragListener extends ItemDragListener<DirectoryFragment> {
-
- DirectoryDragListener(DirectoryFragment fragment) {
- super(fragment);
- }
-
- @Override
- public boolean onDrag(View v, DragEvent event) {
- final boolean result = super.onDrag(v, event);
-
- if (event.getAction() == DragEvent.ACTION_DRAG_ENDED) {
- // getResult() is true if drag was accepted
- if (event.getResult()) {
- mDragHost.clearSelection();
- } else {
- // When drag starts we might write a new clip file to disk.
- // No drop event happens, remove clip file here. This may be called multiple times,
- // but it should be OK because deletion is idempotent and cheap.
- mDragHost.deleteDragClipFile();
- }
- }
-
- return result;
- }
-
- @Override
- public boolean handleDropEventChecked(View v, DragEvent event) {
- return mDragHost.handleDropEvent(v, event);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
deleted file mode 100644
index afdcdf1..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ /dev/null
@@ -1,1744 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.State.MODE_GRID;
-import static com.android.documentsui.State.MODE_LIST;
-import static com.android.documentsui.State.SORT_ORDER_UNKNOWN;
-import static com.android.documentsui.model.DocumentInfo.getCursorInt;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.annotation.IntDef;
-import android.annotation.StringRes;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.ClipData;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.Loader;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.support.v13.view.DragStartHelper;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.GridLayoutManager.SpanSizeLookup;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.RecyclerListener;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.text.BidiFormatter;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.ActionMode;
-import android.view.ContextMenu;
-import android.view.DragEvent;
-import android.view.GestureDetector;
-import android.view.HapticFeedbackConstants;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import com.android.documentsui.BaseActivity;
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.DirectoryLoader;
-import com.android.documentsui.DirectoryResult;
-import com.android.documentsui.DocumentClipper;
-import com.android.documentsui.DocumentsActivity;
-import com.android.documentsui.DocumentsApplication;
-import com.android.documentsui.Events;
-import com.android.documentsui.Events.MotionInputEvent;
-import com.android.documentsui.ItemDragListener;
-import com.android.documentsui.MenuManager;
-import com.android.documentsui.Menus;
-import com.android.documentsui.MessageBar;
-import com.android.documentsui.Metrics;
-import com.android.documentsui.MimePredicate;
-import com.android.documentsui.R;
-import com.android.documentsui.RecentsLoader;
-import com.android.documentsui.RetainedState;
-import com.android.documentsui.RootsCache;
-import com.android.documentsui.Shared;
-import com.android.documentsui.Snackbars;
-import com.android.documentsui.State;
-import com.android.documentsui.State.ViewMode;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-import com.android.documentsui.services.FileOperations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
-
-/**
- * Display the documents inside a single directory.
- */
-public class DirectoryFragment extends Fragment
- implements DocumentsAdapter.Environment, LoaderCallbacks<DirectoryResult>,
- ItemDragListener.DragHost {
-
- @IntDef(flag = true, value = {
- TYPE_NORMAL,
- TYPE_RECENT_OPEN
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface ResultType {}
- public static final int TYPE_NORMAL = 1;
- public static final int TYPE_RECENT_OPEN = 2;
-
- @IntDef(flag = true, value = {
- REQUEST_COPY_DESTINATION
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface RequestCode {}
- public static final int REQUEST_COPY_DESTINATION = 1;
-
- private static final String TAG = "DirectoryFragment";
- private static final int LOADER_ID = 42;
-
- private Model mModel;
- private MultiSelectManager mSelectionManager;
- private Model.UpdateListener mModelUpdateListener = new ModelUpdateListener();
- private ItemEventListener mItemEventListener;
- private SelectionModeListener mSelectionModeListener;
- private FocusManager mFocusManager;
-
- private IconHelper mIconHelper;
-
- private View mEmptyView;
- private RecyclerView mRecView;
- private ListeningGestureDetector mGestureDetector;
-
- private String mStateKey;
-
- private int mLastSortOrder = SORT_ORDER_UNKNOWN;
- private DocumentsAdapter mAdapter;
- private FragmentTuner mTuner;
- private DocumentClipper mClipper;
- private GridLayoutManager mLayout;
- private int mColumnCount = 1; // This will get updated when layout changes.
-
- private LayoutInflater mInflater;
- private MessageBar mMessageBar;
- private View mProgressBar;
-
- // Directory fragment state is defined by: root, document, query, type, selection
- private @ResultType int mType = TYPE_NORMAL;
- private RootInfo mRoot;
- private DocumentInfo mDocument;
- private String mQuery = null;
- // Note, we use !null to indicate that selection was restored (from rotation).
- // So don't fiddle with this field unless you've got the bigger picture in mind.
- private @Nullable Selection mRestoredSelection = null;
- // Here we save the clip details of moveTo/copyTo actions when picker shows up.
- // This will be written to saved instance.
- private @Nullable ClipDetails mDetailsForCopy;
- private boolean mSearchMode = false;
-
- private @Nullable BandController mBandController;
- private @Nullable ActionMode mActionMode;
-
- private DirectoryDragListener mOnDragListener;
- private MenuManager mMenuManager;
-
- /**
- * A callback to show snackbar at the beginning of moving and copying.
- */
- private final FileOperations.Callback mFileOpCallback = (status, opType, docCount) -> {
- if (status == FileOperations.Callback.STATUS_REJECTED) {
- Snackbars.showPasteFailed(getActivity());
- return;
- }
-
- if (docCount == 0) {
- // Nothing has been pasted, so there is no need to show a snackbar.
- return;
- }
-
- switch (opType) {
- case FileOperationService.OPERATION_MOVE:
- Snackbars.showMove(getActivity(), docCount);
- break;
- case FileOperationService.OPERATION_COPY:
- Snackbars.showCopy(getActivity(), docCount);
- break;
- case FileOperationService.OPERATION_DELETE:
- // We don't show anything for deletion.
- break;
- default:
- throw new UnsupportedOperationException("Unsupported Operation: " + opType);
- }
- };
-
- @Override
- public View onCreateView(
- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- mInflater = inflater;
- final View view = inflater.inflate(R.layout.fragment_directory, container, false);
-
- mMessageBar = MessageBar.create(getChildFragmentManager());
- mProgressBar = view.findViewById(R.id.progressbar);
- mEmptyView = view.findViewById(android.R.id.empty);
- mRecView = (RecyclerView) view.findViewById(R.id.dir_list);
- mRecView.setRecyclerListener(
- new RecyclerListener() {
- @Override
- public void onViewRecycled(ViewHolder holder) {
- cancelThumbnailTask(holder.itemView);
- }
- });
-
- mRecView.setItemAnimator(new DirectoryItemAnimator(getActivity()));
-
- mOnDragListener = new DirectoryDragListener(this);
-
- // Make the recycler and the empty views responsive to drop events.
- mRecView.setOnDragListener(mOnDragListener);
- mEmptyView.setOnDragListener(mOnDragListener);
-
- return view;
- }
-
- @Override
- public void onDestroyView() {
- mSelectionManager.clearSelection();
-
- // Cancel any outstanding thumbnail requests
- final int count = mRecView.getChildCount();
- for (int i = 0; i < count; i++) {
- final View view = mRecView.getChildAt(i);
- cancelThumbnailTask(view);
- }
-
- super.onDestroyView();
- }
-
- @Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
-
- final Context context = getActivity();
- final State state = getDisplayState();
-
- // Read arguments when object created for the first time.
- // Restore state if fragment recreated.
- Bundle args = savedInstanceState == null ? getArguments() : savedInstanceState;
- mRoot = args.getParcelable(Shared.EXTRA_ROOT);
- mDocument = args.getParcelable(Shared.EXTRA_DOC);
- mStateKey = buildStateKey(mRoot, mDocument);
- mQuery = args.getString(Shared.EXTRA_QUERY);
- mType = args.getInt(Shared.EXTRA_TYPE);
- mSearchMode = args.getBoolean(Shared.EXTRA_SEARCH_MODE);
- mDetailsForCopy = args.getParcelable(FileOperationService.EXTRA_CLIP_DETAILS);
-
- // Restore any selection we may have squirreled away in retained state.
- @Nullable RetainedState retained = getBaseActivity().getRetainedState();
- if (retained != null && retained.hasSelection()) {
- // We claim the selection for ourselves and null it out once used
- // so we don't have a rando selection hanging around in RetainedState.
- mRestoredSelection = retained.selection;
- retained.selection = null;
- }
-
- mIconHelper = new IconHelper(context, MODE_GRID);
-
- mAdapter = new SectionBreakDocumentsAdapterWrapper(
- this, new ModelBackedDocumentsAdapter(this, mIconHelper));
-
- mRecView.setAdapter(mAdapter);
-
- mLayout = new GridLayoutManager(getContext(), mColumnCount);
- SpanSizeLookup lookup = mAdapter.createSpanSizeLookup();
- if (lookup != null) {
- mLayout.setSpanSizeLookup(lookup);
- }
- mRecView.setLayoutManager(mLayout);
-
- mGestureDetector =
- new ListeningGestureDetector(this.getContext(), mDragHelper, new GestureListener());
-
- mRecView.addOnItemTouchListener(mGestureDetector);
- mEmptyView.setOnTouchListener(mGestureDetector);
-
- // TODO: instead of inserting the view into the constructor, extract listener-creation code
- // and set the listener on the view after the fact. Then the view doesn't need to be passed
- // into the selection manager.
- mSelectionManager = new MultiSelectManager(
- mRecView,
- mAdapter,
- state.allowMultiple
- ? MultiSelectManager.MODE_MULTIPLE
- : MultiSelectManager.MODE_SINGLE,
- null);
-
- if (state.allowMultiple) {
- mBandController = new BandController(mRecView, mAdapter, mSelectionManager);
- }
-
- mSelectionModeListener = new SelectionModeListener();
- mSelectionManager.addCallback(mSelectionModeListener);
-
- mModel = new Model();
- mModel.addUpdateListener(mAdapter);
- mModel.addUpdateListener(mModelUpdateListener);
-
- // Make sure this is done after the RecyclerView is set up.
- mFocusManager = new FocusManager(context, mRecView, mModel);
-
- mItemEventListener = new ItemEventListener(
- mSelectionManager,
- mFocusManager,
- this::handleViewItem,
- this::deleteDocuments,
- this::canSelect);
-
- final BaseActivity activity = getBaseActivity();
- mTuner = activity.createFragmentTuner();
- mMenuManager = activity.getMenuManager();
- mClipper = DocumentsApplication.getDocumentClipper(getContext());
-
- final ActivityManager am = (ActivityManager) context.getSystemService(
- Context.ACTIVITY_SERVICE);
- boolean svelte = am.isLowRamDevice() && (mType == TYPE_RECENT_OPEN);
- mIconHelper.setThumbnailsEnabled(!svelte);
-
- // Kick off loader at least once
- getLoaderManager().restartLoader(LOADER_ID, null, this);
- }
-
- public void retainState(RetainedState state) {
- state.selection = mSelectionManager.getSelection(new Selection());
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
-
- outState.putInt(Shared.EXTRA_TYPE, mType);
- outState.putParcelable(Shared.EXTRA_ROOT, mRoot);
- outState.putParcelable(Shared.EXTRA_DOC, mDocument);
- outState.putString(Shared.EXTRA_QUERY, mQuery);
- outState.putBoolean(Shared.EXTRA_SEARCH_MODE, mSearchMode);
- outState.putParcelable(FileOperationService.EXTRA_CLIP_DETAILS, mDetailsForCopy);
- }
-
- @Override
- public void onActivityResult(@RequestCode int requestCode, int resultCode, Intent data) {
- switch (requestCode) {
- case REQUEST_COPY_DESTINATION:
- handleCopyResult(resultCode, data);
- break;
- default:
- throw new UnsupportedOperationException("Unknown request code: " + requestCode);
- }
- }
-
- @Override
- public void onCreateContextMenu(ContextMenu menu,
- View v,
- ContextMenu.ContextMenuInfo menuInfo) {
- super.onCreateContextMenu(menu, v, menuInfo);
- MenuInflater inflater = getActivity().getMenuInflater();
- inflater.inflate(R.menu.context_menu, menu);
-
- menu.add(Menu.NONE, R.id.menu_create_dir, Menu.NONE, R.string.menu_create_dir);
- menu.add(Menu.NONE, R.id.menu_delete, Menu.NONE, R.string.menu_delete);
- menu.add(Menu.NONE, R.id.menu_rename, Menu.NONE, R.string.menu_rename);
-
- if (v == mRecView || v == mEmptyView) {
- mMenuManager.updateContextMenu(menu, null, getBaseActivity().getDirectoryDetails());
- } else {
- mMenuManager.updateContextMenu(menu, mSelectionModeListener,
- getBaseActivity().getDirectoryDetails());
- }
- }
-
- @Override
- public boolean onContextItemSelected(MenuItem item) {
- return handleMenuItemClick(item);
- }
-
- private void handleCopyResult(int resultCode, Intent data) {
-
- ClipDetails details = mDetailsForCopy;
- mDetailsForCopy = null;
-
- if (resultCode == Activity.RESULT_CANCELED || data == null) {
- // User pressed the back button or otherwise cancelled the destination pick. Don't
- // proceed with the copy.
- details.dispose(getContext());
- return;
- }
-
- FileOperations.start(
- getContext(),
- details,
- data.getParcelableExtra(Shared.EXTRA_STACK),
- mFileOpCallback);
- }
-
- protected boolean onDoubleTap(MotionInputEvent event) {
- if (event.isMouseEvent()) {
- String id = getModelId(event);
- if (id != null) {
- return handleViewItem(id);
- }
- }
- return false;
- }
-
- protected boolean onRightClick(MotionEvent e) {
- // First get target to see if it's a blank window or a file/doc
- final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);
- try {
- if (event.getItemPosition() != RecyclerView.NO_POSITION) {
- final DocumentHolder holder = getTarget(event);
- String modelId = getModelId(holder.itemView);
- if (!mSelectionManager.getSelection().contains(modelId)) {
- mSelectionManager.clearSelection();
- // Set selection on the one single item
- List<String> ids = Collections.singletonList(modelId);
- mSelectionManager.setItemsSelected(ids, true);
- }
-
- // We are registering for context menu here so long-press doesn't trigger this
- // floating context menu, and then quickly unregister right afterwards
- registerForContextMenu(holder.itemView);
- mRecView.showContextMenuForChild(holder.itemView,
- e.getX() - holder.itemView.getLeft(), e.getY() - holder.itemView.getTop());
- unregisterForContextMenu(holder.itemView);
- }
- // If there was no corresponding item pos, that means user right-clicked on the blank
- // pane
- // We would want to show different options then, and not select any item
- // The blank pane could be the recyclerView or the emptyView, so we need to register
- // according to whichever one is visible
- else if (mEmptyView.getVisibility() == View.VISIBLE) {
- registerForContextMenu(mEmptyView);
- mEmptyView.showContextMenu(e.getX(), e.getY());
- unregisterForContextMenu(mEmptyView);
- return true;
- } else {
- registerForContextMenu(mRecView);
- mRecView.showContextMenu(e.getX(), e.getY());
- unregisterForContextMenu(mRecView);
- }
- } finally {
- event.recycle();
- }
- return true;
- }
-
- private boolean handleViewItem(String id) {
- final Cursor cursor = mModel.getItem(id);
-
- if (cursor == null) {
- Log.w(TAG, "Can't view item. Can't obtain cursor for modeId" + id);
- return false;
- }
-
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- if (mTuner.isDocumentEnabled(docMimeType, docFlags)) {
- final DocumentInfo doc = DocumentInfo.fromDirectoryCursor(cursor);
- getBaseActivity().onDocumentPicked(doc, mModel);
- mSelectionManager.clearSelection();
- return true;
- }
- return false;
- }
-
- @Override
- public void onStop() {
- super.onStop();
-
- // Remember last scroll location
- final SparseArray<Parcelable> container = new SparseArray<Parcelable>();
- getView().saveHierarchyState(container);
- final State state = getDisplayState();
- state.dirState.put(mStateKey, container);
- }
-
- public void onDisplayStateChanged() {
- updateDisplayState();
- }
-
- public void onSortOrderChanged() {
- // Sort order is implemented as a sorting wrapper around directory
- // results. So when sort order changes, we force a reload of the directory.
- getLoaderManager().restartLoader(LOADER_ID, null, this);
- }
-
- public void onViewModeChanged() {
- // Mode change is just visual change; no need to kick loader.
- updateDisplayState();
- }
-
- private void updateDisplayState() {
- State state = getDisplayState();
- updateLayout(state.derivedMode);
- mRecView.setAdapter(mAdapter);
- }
-
- /**
- * Updates the layout after the view mode switches.
- * @param mode The new view mode.
- */
- private void updateLayout(@ViewMode int mode) {
- mColumnCount = calculateColumnCount(mode);
- if (mLayout != null) {
- mLayout.setSpanCount(mColumnCount);
- }
-
- int pad = getDirectoryPadding(mode);
- mRecView.setPadding(pad, pad, pad, pad);
- mRecView.requestLayout();
- if (mBandController != null) {
- mBandController.handleLayoutChanged();
- }
- mIconHelper.setViewMode(mode);
- }
-
- private int calculateColumnCount(@ViewMode int mode) {
- if (mode == MODE_LIST) {
- // List mode is a "grid" with 1 column.
- return 1;
- }
-
- int cellWidth = getResources().getDimensionPixelSize(R.dimen.grid_width);
- int cellMargin = 2 * getResources().getDimensionPixelSize(R.dimen.grid_item_margin);
- int viewPadding = mRecView.getPaddingLeft() + mRecView.getPaddingRight();
-
- // RecyclerView sometimes gets a width of 0 (see b/27150284). Clamp so that we always lay
- // out the grid with at least 2 columns.
- int columnCount = Math.max(2,
- (mRecView.getWidth() - viewPadding) / (cellWidth + cellMargin));
-
- return columnCount;
- }
-
- private int getDirectoryPadding(@ViewMode int mode) {
- switch (mode) {
- case MODE_GRID:
- return getResources().getDimensionPixelSize(R.dimen.grid_container_padding);
- case MODE_LIST:
- return getResources().getDimensionPixelSize(R.dimen.list_container_padding);
- default:
- throw new IllegalArgumentException("Unsupported layout mode: " + mode);
- }
- }
-
- @Override
- public int getColumnCount() {
- return mColumnCount;
- }
-
- // Support method to replace getOwner().foo() with something
- // slightly less clumsy like: getOwner().foo().
- private BaseActivity getBaseActivity() {
- return (BaseActivity) getActivity();
- }
-
- /**
- * Manages the integration between our ActionMode and MultiSelectManager, initiating
- * ActionMode when there is a selection, canceling it when there is no selection,
- * and clearing selection when action mode is explicitly exited by the user.
- */
- private final class SelectionModeListener implements MultiSelectManager.Callback,
- ActionMode.Callback, MenuManager.SelectionDetails {
-
- private Selection mSelected = new Selection();
-
- // Partial files are files that haven't been fully downloaded.
- private int mPartialCount = 0;
- private int mDirectoryCount = 0;
- private int mNoDeleteCount = 0;
- private int mNoRenameCount = 0;
-
- private Menu mMenu;
-
- @Override
- public boolean onBeforeItemStateChange(String modelId, boolean selected) {
- if (selected) {
- final Cursor cursor = mModel.getItem(modelId);
- if (cursor == null) {
- Log.w(TAG, "Can't obtain cursor for modelId: " + modelId);
- return false;
- }
-
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- if (!mTuner.canSelectType(docMimeType, docFlags)) {
- return false;
- }
- return mTuner.canSelectType(docMimeType, docFlags);
- }
- return true;
- }
-
- @Override
- public void onItemStateChanged(String modelId, boolean selected) {
- final Cursor cursor = mModel.getItem(modelId);
- if (cursor == null) {
- Log.w(TAG, "Model returned null cursor for document: " + modelId
- + ". Ignoring state changed event.");
- return;
- }
-
- // TODO: Should this be happening in onSelectionChanged? Technically this callback is
- // triggered on "silent" selection updates (i.e. we might be reacting to unfinalized
- // selection changes here)
- final String mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- if (MimePredicate.isDirectoryType(mimeType)) {
- mDirectoryCount += selected ? 1 : -1;
- }
-
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- if ((docFlags & Document.FLAG_PARTIAL) != 0) {
- mPartialCount += selected ? 1 : -1;
- }
- if ((docFlags & Document.FLAG_SUPPORTS_DELETE) == 0) {
- mNoDeleteCount += selected ? 1 : -1;
- }
- if ((docFlags & Document.FLAG_SUPPORTS_RENAME) == 0) {
- mNoRenameCount += selected ? 1 : -1;
- }
- }
-
- @Override
- public void onSelectionChanged() {
- mSelectionManager.getSelection(mSelected);
- if (mSelected.size() > 0) {
- if (DEBUG) Log.d(TAG, "Maybe starting action mode.");
- if (mActionMode == null) {
- if (DEBUG) Log.d(TAG, "Yeah. Starting action mode.");
- mActionMode = getActivity().startActionMode(this);
- }
- updateActionMenu();
- } else {
- if (DEBUG) Log.d(TAG, "Finishing action mode.");
- if (mActionMode != null) {
- mActionMode.finish();
- }
- }
-
- if (mActionMode != null) {
- assert(!mSelected.isEmpty());
- final String title = Shared.getQuantityString(getActivity(),
- R.plurals.elements_selected, mSelected.size());
- mActionMode.setTitle(title);
- mRecView.announceForAccessibility(title);
- }
- }
-
- // Called when the user exits the action mode
- @Override
- public void onDestroyActionMode(ActionMode mode) {
- if (DEBUG) Log.d(TAG, "Handling action mode destroyed.");
- mActionMode = null;
- // clear selection
- mSelectionManager.clearSelection();
- mSelected.clear();
-
- mDirectoryCount = 0;
- mPartialCount = 0;
- mNoDeleteCount = 0;
- mNoRenameCount = 0;
-
- // Re-enable TalkBack for the toolbars, as they are no longer covered by action mode.
- final Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar);
- toolbar.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
-
- // This toolbar is not present in the fixed_layout
- final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(R.id.roots_toolbar);
- if (rootsToolbar != null) {
- rootsToolbar.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
- }
- }
-
- @Override
- public boolean onCreateActionMode(ActionMode mode, Menu menu) {
- if (mRestoredSelection != null) {
- // This is a careful little song and dance to avoid haptic feedback
- // when selection has been restored after rotation. We're
- // also responsible for cleaning up restored selection so the
- // object dones't unnecessarily hang around.
- mRestoredSelection = null;
- } else {
- mRecView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
- }
-
- int size = mSelectionManager.getSelection().size();
- mode.getMenuInflater().inflate(R.menu.mode_directory, menu);
- mode.setTitle(TextUtils.formatSelectedCount(size));
-
- if (size > 0) {
- // Hide the toolbars if action mode is enabled, so TalkBack doesn't navigate to
- // these controls when using linear navigation.
- final Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar);
- toolbar.setImportantForAccessibility(
- View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-
- // This toolbar is not present in the fixed_layout
- final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(
- R.id.roots_toolbar);
- if (rootsToolbar != null) {
- rootsToolbar.setImportantForAccessibility(
- View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
- }
- return true;
- }
-
- return false;
- }
-
- @Override
- public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
- mMenu = menu;
- updateActionMenu();
- return true;
- }
-
- @Override
- public boolean containsDirectories() {
- return mDirectoryCount > 0;
- }
-
- @Override
- public boolean containsPartialFiles() {
- return mPartialCount > 0;
- }
-
- @Override
- public boolean canDelete() {
- return mNoDeleteCount == 0;
- }
-
- @Override
- public boolean canRename() {
- return mNoRenameCount == 0 && mSelectionManager.getSelection().size() == 1;
- }
-
- private void updateActionMenu() {
- assert(mMenu != null);
- mMenuManager.updateActionMenu(mMenu, this);
- Menus.disableHiddenItems(mMenu);
- }
-
- @Override
- public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
- return handleMenuItemClick(item);
- }
- }
-
- private boolean handleMenuItemClick(MenuItem item) {
- Selection selection = mSelectionManager.getSelection(new Selection());
-
- switch (item.getItemId()) {
- case R.id.menu_open:
- openDocuments(selection);
- mActionMode.finish();
- return true;
-
- case R.id.menu_share:
- shareDocuments(selection);
- // TODO: Only finish selection if share action is completed.
- mActionMode.finish();
- return true;
-
- case R.id.menu_delete:
- // deleteDocuments will end action mode if the documents are deleted.
- // It won't end action mode if user cancels the delete.
- deleteDocuments(selection);
- return true;
-
- case R.id.menu_copy_to:
- transferDocuments(selection, FileOperationService.OPERATION_COPY);
- // TODO: Only finish selection mode if copy-to is not canceled.
- // Need to plum down into handling the way we do with deleteDocuments.
- mActionMode.finish();
- return true;
-
- case R.id.menu_move_to:
- // Exit selection mode first, so we avoid deselecting deleted documents.
- mActionMode.finish();
- transferDocuments(selection, FileOperationService.OPERATION_MOVE);
- return true;
-
- case R.id.menu_cut_to_clipboard:
- cutSelectedToClipboard();
- return true;
-
- case R.id.menu_copy_to_clipboard:
- copySelectedToClipboard();
- return true;
-
- case R.id.menu_paste_from_clipboard:
- pasteFromClipboard();
- return true;
-
- case R.id.menu_select_all:
- selectAllFiles();
- return true;
-
- case R.id.menu_rename:
- // Exit selection mode first, so we avoid deselecting deleted
- // (renamed) documents.
- mActionMode.finish();
- renameDocuments(selection);
- return true;
-
- default:
- // See if BaseActivity can handle this particular MenuItem
- if (!getBaseActivity().onOptionsItemSelected(item)) {
- if (DEBUG) Log.d(TAG, "Unhandled menu item selected: " + item);
- return false;
- }
- return true;
- }
- }
-
- public final boolean onBackPressed() {
- if (mSelectionManager.hasSelection()) {
- if (DEBUG) Log.d(TAG, "Clearing selection on selection manager.");
- mSelectionManager.clearSelection();
- return true;
- }
- return false;
- }
-
- private void cancelThumbnailTask(View view) {
- final ImageView iconThumb = (ImageView) view.findViewById(R.id.icon_thumb);
- if (iconThumb != null) {
- mIconHelper.stopLoading(iconThumb);
- }
- }
-
- private void openDocuments(final Selection selected) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_OPEN);
-
- new GetDocumentsTask() {
- @Override
- void onDocumentsReady(List<DocumentInfo> docs) {
- // TODO: Implement support in Files activity for opening multiple docs.
- BaseActivity.get(DirectoryFragment.this).onDocumentsPicked(docs);
- }
- }.execute(selected);
- }
-
- private void shareDocuments(final Selection selected) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_SHARE);
-
- new GetDocumentsTask() {
- @Override
- void onDocumentsReady(List<DocumentInfo> docs) {
- Intent intent;
-
- // Filter out directories and virtual files - those can't be shared.
- List<DocumentInfo> docsForSend = new ArrayList<>();
- for (DocumentInfo doc: docs) {
- if (!doc.isDirectory() && !doc.isVirtualDocument()) {
- docsForSend.add(doc);
- }
- }
-
- if (docsForSend.size() == 1) {
- final DocumentInfo doc = docsForSend.get(0);
-
- intent = new Intent(Intent.ACTION_SEND);
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
- intent.setType(doc.mimeType);
- intent.putExtra(Intent.EXTRA_STREAM, doc.derivedUri);
-
- } else if (docsForSend.size() > 1) {
- intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
-
- final ArrayList<String> mimeTypes = new ArrayList<>();
- final ArrayList<Uri> uris = new ArrayList<>();
- for (DocumentInfo doc : docsForSend) {
- mimeTypes.add(doc.mimeType);
- uris.add(doc.derivedUri);
- }
-
- intent.setType(findCommonMimeType(mimeTypes));
- intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
-
- } else {
- return;
- }
-
- intent = Intent.createChooser(intent, getActivity().getText(R.string.share_via));
- startActivity(intent);
- }
- }.execute(selected);
- }
-
- private String generateDeleteMessage(final List<DocumentInfo> docs) {
- String message;
- int dirsCount = 0;
-
- for (DocumentInfo doc : docs) {
- if (doc.isDirectory()) {
- ++dirsCount;
- }
- }
-
- if (docs.size() == 1) {
- // Deleteing 1 file xor 1 folder in cwd
-
- // Address b/28772371, where including user strings in message can result in
- // broken bidirectional support.
- String displayName = BidiFormatter.getInstance().unicodeWrap(docs.get(0).displayName);
- message = dirsCount == 0
- ? getActivity().getString(R.string.delete_filename_confirmation_message,
- displayName)
- : getActivity().getString(R.string.delete_foldername_confirmation_message,
- displayName);
- } else if (dirsCount == 0) {
- // Deleting only files in cwd
- message = Shared.getQuantityString(getActivity(),
- R.plurals.delete_files_confirmation_message, docs.size());
- } else if (dirsCount == docs.size()) {
- // Deleting only folders in cwd
- message = Shared.getQuantityString(getActivity(),
- R.plurals.delete_folders_confirmation_message, docs.size());
- } else {
- // Deleting mixed items (files and folders) in cwd
- message = Shared.getQuantityString(getActivity(),
- R.plurals.delete_items_confirmation_message, docs.size());
- }
- return message;
- }
-
- private void deleteDocuments(final Selection selected) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_DELETE);
-
- assert(!selected.isEmpty());
-
- final DocumentInfo srcParent = getDisplayState().stack.peek();
- new GetDocumentsTask() {
- @Override
- void onDocumentsReady(final List<DocumentInfo> docs) {
-
- TextView message =
- (TextView) mInflater.inflate(R.layout.dialog_delete_confirmation, null);
- message.setText(generateDeleteMessage(docs));
-
- // For now, we implement this dialog NOT
- // as a fragment (which can survive rotation and have its own state),
- // but as a simple runtime dialog. So rotating a device with an
- // active delete dialog...results in that dialog disappearing.
- // We can do better, but don't have cycles for it now.
- new AlertDialog.Builder(getActivity())
- .setView(message)
- .setPositiveButton(
- android.R.string.ok,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- // Finish selection mode first which clears selection so we
- // don't end up trying to deselect deleted documents.
- // This is done here, rather in the onActionItemClicked
- // so we can avoid de-selecting items in the case where
- // the user cancels the delete.
- if (mActionMode != null) {
- mActionMode.finish();
- } else {
- Log.w(TAG, "Action mode is null before deleting documents.");
- }
-
- ClipDetails details = ClipDetails.createClipDetails(
- FileOperationService.OPERATION_DELETE,
- srcParent.derivedUri,
- selected,
- mModel::getItemUri,
- getContext());
- FileOperations.start(getActivity(), details,
- getDisplayState().stack, mFileOpCallback);
- }
- })
- .setNegativeButton(android.R.string.cancel, null)
- .show();
- }
- }.execute(selected);
- }
-
- private void transferDocuments(final Selection selected, final @OpType int mode) {
- if(mode == FileOperationService.OPERATION_COPY) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COPY_TO);
- } else if (mode == FileOperationService.OPERATION_MOVE) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_MOVE_TO);
- }
-
- // Pop up a dialog to pick a destination. This is inadequate but works for now.
- // TODO: Implement a picker that is to spec.
- final Intent intent = new Intent(
- Shared.ACTION_PICK_COPY_DESTINATION,
- Uri.EMPTY,
- getActivity(),
- DocumentsActivity.class);
-
- Uri srcParent = getDisplayState().stack.peek().derivedUri;
- mDetailsForCopy = ClipDetails.createClipDetails(
- mode, srcParent, selected, mModel::getItemUri, getContext());
-
- // Relay any config overrides bits present in the original intent.
- Intent original = getActivity().getIntent();
- if (original != null && original.hasExtra(Shared.EXTRA_PRODUCTIVITY_MODE)) {
- intent.putExtra(
- Shared.EXTRA_PRODUCTIVITY_MODE,
- original.getBooleanExtra(Shared.EXTRA_PRODUCTIVITY_MODE, false));
- }
-
- // Set an appropriate title on the drawer when it is shown in the picker.
- // Coupled with the fact that we auto-open the drawer for copy/move operations
- // it should basically be the thing people see first.
- int drawerTitleId = mode == FileOperationService.OPERATION_MOVE
- ? R.string.menu_move : R.string.menu_copy;
- intent.putExtra(DocumentsContract.EXTRA_PROMPT, getResources().getString(drawerTitleId));
-
- new GetDocumentsTask() {
- @Override
- void onDocumentsReady(List<DocumentInfo> docs) {
- // Determine if there is a directory in the set of documents
- // to be copied? Why? Directory creation isn't supported by some roots
- // (like Downloads). This informs DocumentsActivity (the "picker")
- // to restrict available roots to just those with support.
- intent.putExtra(Shared.EXTRA_DIRECTORY_COPY, hasDirectory(docs));
-
- // This just identifies the type of request...we'll check it
- // when we reveive a response.
- startActivityForResult(intent, REQUEST_COPY_DESTINATION);
- }
-
- }.execute(selected);
- }
-
- private static boolean hasDirectory(List<DocumentInfo> docs) {
- for (DocumentInfo info : docs) {
- if (Document.MIME_TYPE_DIR.equals(info.mimeType)) {
- return true;
- }
- }
- return false;
- }
-
- private void renameDocuments(Selection selected) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_RENAME);
-
- // Batch renaming not supported
- // Rename option is only available in menu when 1 document selected
- assert(selected.size() == 1);
-
- new GetDocumentsTask() {
- @Override
- void onDocumentsReady(List<DocumentInfo> docs) {
- RenameDocumentFragment.show(getFragmentManager(), docs.get(0));
- }
- }.execute(selected);
- }
-
- @Override
- public void initDocumentHolder(DocumentHolder holder) {
- holder.addEventListener(mItemEventListener);
- holder.itemView.setOnFocusChangeListener(mFocusManager);
- }
-
- @Override
- public void onBindDocumentHolder(DocumentHolder holder, Cursor cursor) {
- setupDragAndDropOnDocumentView(holder.itemView, cursor);
- }
-
- @Override
- public State getDisplayState() {
- return getBaseActivity().getDisplayState();
- }
-
- @Override
- public Model getModel() {
- return mModel;
- }
-
- @Override
- public boolean isDocumentEnabled(String docMimeType, int docFlags) {
- return mTuner.isDocumentEnabled(docMimeType, docFlags);
- }
-
- private void showEmptyDirectory() {
- showEmptyView(R.string.empty, R.drawable.cabinet);
- }
-
- private void showNoResults(RootInfo root) {
- CharSequence msg = getContext().getResources().getText(R.string.no_results);
- showEmptyView(String.format(String.valueOf(msg), root.title), R.drawable.cabinet);
- }
-
- private void showQueryError() {
- showEmptyView(R.string.query_error, R.drawable.hourglass);
- }
-
- private void showEmptyView(@StringRes int id, int drawable) {
- showEmptyView(getContext().getResources().getText(id), drawable);
- }
-
- private void showEmptyView(CharSequence msg, int drawable) {
- View content = mEmptyView.findViewById(R.id.content);
- TextView msgView = (TextView) mEmptyView.findViewById(R.id.message);
- ImageView imageView = (ImageView) mEmptyView.findViewById(R.id.artwork);
- msgView.setText(msg);
- imageView.setImageResource(drawable);
-
- mEmptyView.setVisibility(View.VISIBLE);
- mEmptyView.requestFocus();
- mRecView.setVisibility(View.GONE);
- }
-
- private void showDirectory() {
- mEmptyView.setVisibility(View.GONE);
- mRecView.setVisibility(View.VISIBLE);
- mRecView.requestFocus();
- }
-
- private String findCommonMimeType(List<String> mimeTypes) {
- String[] commonType = mimeTypes.get(0).split("/");
- if (commonType.length != 2) {
- return "*/*";
- }
-
- for (int i = 1; i < mimeTypes.size(); i++) {
- String[] type = mimeTypes.get(i).split("/");
- if (type.length != 2) continue;
-
- if (!commonType[1].equals(type[1])) {
- commonType[1] = "*";
- }
-
- if (!commonType[0].equals(type[0])) {
- commonType[0] = "*";
- commonType[1] = "*";
- break;
- }
- }
-
- return commonType[0] + "/" + commonType[1];
- }
-
- public void copySelectedToClipboard() {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COPY_CLIPBOARD);
-
- Selection selection = mSelectionManager.getSelection(new Selection());
- if (selection.isEmpty()) {
- return;
- }
- mSelectionManager.clearSelection();
-
- mClipper.clipDocumentsForCopy(mModel::getItemUri, selection);
-
- Snackbars.showDocumentsClipped(getActivity(), selection.size());
- }
-
- public void cutSelectedToClipboard() {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_CUT_CLIPBOARD);
-
- Selection selection = mSelectionManager.getSelection(new Selection());
- if (selection.isEmpty()) {
- return;
- }
- mSelectionManager.clearSelection();
-
- mClipper.clipDocumentsForCut(mModel::getItemUri, selection, getDisplayState().stack.peek());
-
- Snackbars.showDocumentsClipped(getActivity(), selection.size());
- }
-
- public void pasteFromClipboard() {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_PASTE_CLIPBOARD);
-
- BaseActivity activity = (BaseActivity) getActivity();
- DocumentInfo destination = activity.getCurrentDirectory();
- mClipper.copyFromClipboard(destination, activity.getDisplayState().stack, mFileOpCallback);
- getActivity().invalidateOptionsMenu();
- }
-
- public void selectAllFiles() {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_SELECT_ALL);
-
- // Exclude disabled files
- List<String> enabled = new ArrayList<String>();
- for (String id : mAdapter.getModelIds()) {
- Cursor cursor = getModel().getItem(id);
- if (cursor == null) {
- Log.w(TAG, "Skipping selection. Can't obtain cursor for modeId: " + id);
- continue;
- }
- String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- if (isDocumentEnabled(docMimeType, docFlags)) {
- enabled.add(id);
- }
- }
-
- // Only select things currently visible in the adapter.
- boolean changed = mSelectionManager.setItemsSelected(enabled, true);
- if (changed) {
- updateDisplayState();
- }
- }
-
- /**
- * Attempts to restore focus on the directory listing.
- */
- public void requestFocus() {
- mFocusManager.restoreLastFocus();
- }
-
- private void setupDragAndDropOnDocumentView(View view, Cursor cursor) {
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- if (Document.MIME_TYPE_DIR.equals(docMimeType)) {
- // Make a directory item a drop target. Drop on non-directories and empty space
- // is handled at the list/grid view level.
- view.setOnDragListener(mOnDragListener);
- }
-
- if (mTuner.dragAndDropEnabled()) {
- // Make all items draggable.
- view.setOnLongClickListener(onLongClickListener);
- }
- }
-
- public void clearSelection() {
- mSelectionManager.clearSelection();
- }
-
- @Override
- public void runOnUiThread(Runnable runnable) {
- getActivity().runOnUiThread(runnable);
- }
-
- /**
- * {@inheritDoc}
- *
- * In DirectoryFragment, we spring loads the hovered folder.
- */
- @Override
- public void onViewHovered(View view) {
- BaseActivity activity = (BaseActivity) getActivity();
- if (getModelId(view) != null) {
- activity.springOpenDirectory(getDestination(view));
- }
-
- activity.setRootsDrawerOpen(false);
- }
-
- void deleteDragClipFile() {
- mClipper.deleteDragClip();
- }
-
- boolean handleDropEvent(View v, DragEvent event) {
- BaseActivity activity = (BaseActivity) getActivity();
- activity.setRootsDrawerOpen(false);
-
- ClipData clipData = event.getClipData();
- assert (clipData != null);
-
- assert(ClipDetails.createClipDetails(clipData).getOpType()
- == FileOperationService.OPERATION_COPY);
-
- // Don't copy from the cwd into the cwd. Note: this currently doesn't work for
- // multi-window drag, because localState isn't carried over from one process to
- // another.
- Object src = event.getLocalState();
- DocumentInfo dst = getDestination(v);
- if (Objects.equals(src, dst)) {
- if (DEBUG) Log.d(TAG, "Drop target same as source. Ignoring.");
- return false;
- }
-
- // Recognize multi-window drag and drop based on the fact that localState is not
- // carried between processes. It will stop working when the localsState behavior
- // is changed. The info about window should be passed in the localState then.
- // The localState could also be null for copying from Recents in single window
- // mode, but Recents doesn't offer this functionality (no directories).
- Metrics.logUserAction(getContext(),
- src == null ? Metrics.USER_ACTION_DRAG_N_DROP_MULTI_WINDOW
- : Metrics.USER_ACTION_DRAG_N_DROP);
-
- mClipper.copyFromClipData(dst, getDisplayState().stack, clipData, mFileOpCallback);
- return true;
- }
-
- private DocumentInfo getDestination(View v) {
- String id = getModelId(v);
- if (id != null) {
- Cursor dstCursor = mModel.getItem(id);
- if (dstCursor == null) {
- Log.w(TAG, "Invalid destination. Can't obtain cursor for modelId: " + id);
- return null;
- }
- return DocumentInfo.fromDirectoryCursor(dstCursor);
- }
-
- if (v == mRecView || v == mEmptyView) {
- return getDisplayState().stack.peek();
- }
-
- return null;
- }
-
- @Override
- public void setDropTargetHighlight(View v, boolean highlight) {
- // Note: use exact comparison - this code is searching for views which are children of
- // the RecyclerView instance in the UI.
- if (v.getParent() == mRecView) {
- RecyclerView.ViewHolder vh = mRecView.getChildViewHolder(v);
- if (vh instanceof DocumentHolder) {
- ((DocumentHolder) vh).setHighlighted(highlight);
- }
- }
- }
-
- /**
- * Gets the model ID for a given motion event (using the event position)
- */
- private String getModelId(MotionInputEvent e) {
- RecyclerView.ViewHolder vh = getTarget(e);
- if (vh instanceof DocumentHolder) {
- return ((DocumentHolder) vh).modelId;
- } else {
- return null;
- }
- }
-
- private @Nullable DocumentHolder getTarget(MotionInputEvent e) {
- View childView = mRecView.findChildViewUnder(e.getX(), e.getY());
- if (childView != null) {
- return (DocumentHolder) mRecView.getChildViewHolder(childView);
- } else {
- return null;
- }
- }
-
- /**
- * Gets the model ID for a given RecyclerView item.
- * @param view A View that is a document item view, or a child of a document item view.
- * @return The Model ID for the given document, or null if the given view is not associated with
- * a document item view.
- */
- protected @Nullable String getModelId(View view) {
- View itemView = mRecView.findContainingItemView(view);
- if (itemView != null) {
- RecyclerView.ViewHolder vh = mRecView.getChildViewHolder(itemView);
- if (vh instanceof DocumentHolder) {
- return ((DocumentHolder) vh).modelId;
- }
- }
- return null;
- }
-
- /**
- * Abstract task providing support for loading documents *off*
- * the main thread. And if it isn't obvious, creating a list
- * of documents (especially large lists) can be pretty expensive.
- */
- private abstract class GetDocumentsTask
- extends AsyncTask<Selection, Void, List<DocumentInfo>> {
- @Override
- protected final List<DocumentInfo> doInBackground(Selection... selected) {
- return mModel.getDocuments(selected[0]);
- }
-
- @Override
- protected final void onPostExecute(List<DocumentInfo> docs) {
- onDocumentsReady(docs);
- }
-
- abstract void onDocumentsReady(List<DocumentInfo> docs);
- }
-
- @Override
- public boolean isSelected(String modelId) {
- return mSelectionManager.getSelection().contains(modelId);
- }
-
- private final class ModelUpdateListener implements Model.UpdateListener {
- @Override
- public void onModelUpdate(Model model) {
- if (model.info != null || model.error != null) {
- mMessageBar.setInfo(model.info);
- mMessageBar.setError(model.error);
- mMessageBar.show();
- }
-
- mProgressBar.setVisibility(model.isLoading() ? View.VISIBLE : View.GONE);
-
- if (model.isEmpty()) {
- if (mSearchMode) {
- showNoResults(getDisplayState().stack.root);
- } else {
- showEmptyDirectory();
- }
- } else {
- showDirectory();
- mAdapter.notifyDataSetChanged();
- }
-
- if (!model.isLoading()) {
- getBaseActivity().notifyDirectoryLoaded(
- model.doc != null ? model.doc.derivedUri : null);
- }
- }
-
- @Override
- public void onModelUpdateFailed(Exception e) {
- showQueryError();
- }
- }
-
- private Drawable getDragIcon(Selection selection) {
- if (selection.size() == 1) {
- DocumentInfo doc = getSingleSelectedDocument(selection);
- return mIconHelper.getDocumentIcon(getContext(), doc);
- }
- return getContext().getDrawable(R.drawable.ic_doc_generic);
- }
-
- private String getDragTitle(Selection selection) {
- assert (!selection.isEmpty());
- if (selection.size() == 1) {
- DocumentInfo doc = getSingleSelectedDocument(selection);
- return doc.displayName;
- }
-
- return Shared.getQuantityString(getContext(), R.plurals.elements_dragged, selection.size());
- }
-
- private DocumentInfo getSingleSelectedDocument(Selection selection) {
- assert (selection.size() == 1);
- final List<DocumentInfo> docs = mModel.getDocuments(mSelectionManager.getSelection());
- assert (docs.size() == 1);
- return docs.get(0);
- }
-
- private DragStartHelper.OnDragStartListener mOnDragStartListener =
- new DragStartHelper.OnDragStartListener() {
- @Override
- public boolean onDragStart(View v, DragStartHelper helper) {
- Selection selection = mSelectionManager.getSelection();
-
- if (v == null) {
- Log.d(TAG, "Ignoring drag event, null view");
- return false;
- }
- if (!isSelected(getModelId(v))) {
- Log.d(TAG, "Ignoring drag event, unselected view.");
- return false;
- }
-
- // NOTE: Preparation of the ClipData object can require a lot of time
- // and ideally should be done in the background. Unfortunately
- // the current code layout and framework assumptions don't support
- // this. So for now, we could end up doing a bunch of i/o on main thread.
- v.startDragAndDrop(
- mClipper.getClipDataForDrag(
- mModel::getItemUri,
- selection,
- FileOperationService.OPERATION_COPY),
- new DragShadowBuilder(
- getActivity(),
- getDragTitle(selection),
- getDragIcon(selection)),
- getDisplayState().stack.peek(),
- View.DRAG_FLAG_GLOBAL
- | View.DRAG_FLAG_GLOBAL_URI_READ
- | View.DRAG_FLAG_GLOBAL_URI_WRITE);
-
- return true;
- }
- };
-
-
- private DragStartHelper mDragHelper = new DragStartHelper(null, mOnDragStartListener);
-
- private View.OnLongClickListener onLongClickListener = new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- return mDragHelper.onLongClick(v);
- }
- };
-
- private boolean canSelect(String modelId) {
-
- // TODO: Combine this method with onBeforeItemStateChange, as both of them are almost
- // the same, and responsible for the same thing (whether to select or not).
- final Cursor cursor = mModel.getItem(modelId);
- if (cursor == null) {
- Log.w(TAG, "Couldn't obtain cursor for modelId: " + modelId);
- return false;
- }
-
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- return mTuner.canSelectType(docMimeType, docFlags);
- }
-
- /**
- * The gesture listener for items in the list/grid view. Interprets gestures and sends the
- * events to the target DocumentHolder, whence they are routed to the appropriate listener.
- */
- class GestureListener extends GestureDetector.SimpleOnGestureListener {
- // From the RecyclerView, we get two events sent to
- // ListeningGestureDetector#onInterceptTouchEvent on a mouse click; we first get an
- // ACTION_DOWN Event for clicking on the mouse, and then an ACTION_UP event from releasing
- // the mouse click. ACTION_UP event doesn't have information regarding the button (primary
- // vs. secondary), so we have to save that somewhere first from ACTION_DOWN, and then reuse
- // it later. The ACTION_DOWN event doesn't get forwarded to GestureListener, so we have open
- // up a public set method to set it.
- private int mLastButtonState = -1;
-
- public void setLastButtonState(int state) {
- mLastButtonState = state;
- }
-
- @Override
- public boolean onSingleTapUp(MotionEvent e) {
- // Single tap logic:
- // We first see if it's a mouse event, and if it was right click by checking on
- // @{code ListeningGestureDetector#mLastButtonState}
- // If the selection manager is active, it gets first whack at handling tap
- // events. Otherwise, tap events are routed to the target DocumentHolder.
- if (Events.isMouseEvent(e) && mLastButtonState == MotionEvent.BUTTON_SECONDARY) {
- mLastButtonState = -1;
- return onRightClick(e);
- }
-
- final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);
- try {
- boolean handled = mSelectionManager.onSingleTapUp(event);
-
- if (handled) {
- return handled;
- }
-
- // Give the DocumentHolder a crack at the event.
- DocumentHolder holder = DirectoryFragment.this.getTarget(event);
- if (holder != null) {
- handled = holder.onSingleTapUp(e);
- }
-
- return handled;
- } finally {
- event.recycle();
- }
- }
-
- @Override
- public void onLongPress(MotionEvent e) {
- // Long-press events get routed directly to the selection manager. They can be
- // changed to route through the DocumentHolder if necessary.
- final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);
- try {
- mSelectionManager.onLongPress(event);
- } finally {
- event.recycle();
- }
- }
-
- @Override
- public boolean onDoubleTap(MotionEvent e) {
- // Double-tap events are handled directly by the DirectoryFragment. They can be changed
- // to route through the DocumentHolder if necessary.
- final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);
- return DirectoryFragment.this.onDoubleTap(event);
- }
-
- public boolean onRightClick(MotionEvent e) {
- return DirectoryFragment.this.onRightClick(e);
- }
- }
-
- public static void showDirectory(
- FragmentManager fm, RootInfo root, DocumentInfo doc, int anim) {
- create(fm, TYPE_NORMAL, root, doc, null, anim);
- }
-
- public static void showRecentsOpen(FragmentManager fm, int anim) {
- create(fm, TYPE_RECENT_OPEN, null, null, null, anim);
- }
-
- public static void reloadSearch(FragmentManager fm, RootInfo root, DocumentInfo doc,
- String query) {
- DirectoryFragment df = get(fm);
-
- df.mQuery = query;
- df.mRoot = root;
- df.mDocument = doc;
- df.mSearchMode = query != null;
- df.getLoaderManager().restartLoader(LOADER_ID, null, df);
- }
-
- public static void reload(FragmentManager fm, int type, RootInfo root, DocumentInfo doc,
- String query) {
- DirectoryFragment df = get(fm);
- df.mType = type;
- df.mQuery = query;
- df.mRoot = root;
- df.mDocument = doc;
- df.mSearchMode = query != null;
- df.getLoaderManager().restartLoader(LOADER_ID, null, df);
- }
-
- public static void create(FragmentManager fm, int type, RootInfo root, DocumentInfo doc,
- String query, int anim) {
- final Bundle args = new Bundle();
- args.putInt(Shared.EXTRA_TYPE, type);
- args.putParcelable(Shared.EXTRA_ROOT, root);
- args.putParcelable(Shared.EXTRA_DOC, doc);
- args.putString(Shared.EXTRA_QUERY, query);
- args.putParcelable(Shared.EXTRA_SELECTION, new Selection());
-
- final FragmentTransaction ft = fm.beginTransaction();
- AnimationView.setupAnimations(ft, anim, args);
-
- final DirectoryFragment fragment = new DirectoryFragment();
- fragment.setArguments(args);
-
- ft.replace(getFragmentId(), fragment);
- ft.commitAllowingStateLoss();
- }
-
- private static String buildStateKey(RootInfo root, DocumentInfo doc) {
- final StringBuilder builder = new StringBuilder();
- builder.append(root != null ? root.authority : "null").append(';');
- builder.append(root != null ? root.rootId : "null").append(';');
- builder.append(doc != null ? doc.documentId : "null");
- return builder.toString();
- }
-
- public static @Nullable DirectoryFragment get(FragmentManager fm) {
- // TODO: deal with multiple directories shown at once
- Fragment fragment = fm.findFragmentById(getFragmentId());
- return fragment instanceof DirectoryFragment
- ? (DirectoryFragment) fragment
- : null;
- }
-
- private static int getFragmentId() {
- return R.id.container_directory;
- }
-
- @Override
- public Loader<DirectoryResult> onCreateLoader(int id, Bundle args) {
- Context context = getActivity();
- State state = getDisplayState();
-
- Uri contentsUri;
- switch (mType) {
- case TYPE_NORMAL:
- contentsUri = mSearchMode ? DocumentsContract.buildSearchDocumentsUri(
- mRoot.authority, mRoot.rootId, mQuery)
- : DocumentsContract.buildChildDocumentsUri(
- mDocument.authority, mDocument.documentId);
- if (mTuner.managedModeEnabled()) {
- contentsUri = DocumentsContract.setManageMode(contentsUri);
- }
- return new DirectoryLoader(
- context, mType, mRoot, mDocument, contentsUri, state.userSortOrder,
- mSearchMode);
- case TYPE_RECENT_OPEN:
- final RootsCache roots = DocumentsApplication.getRootsCache(context);
- return new RecentsLoader(context, roots, state);
-
- default:
- throw new IllegalStateException("Unknown type " + mType);
- }
- }
-
- @Override
- public void onLoadFinished(Loader<DirectoryResult> loader, DirectoryResult result) {
- if (!isAdded()) return;
-
- if (mSearchMode) {
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_SEARCH);
- }
-
- State state = getDisplayState();
-
- mAdapter.notifyDataSetChanged();
- mModel.update(result);
-
- state.derivedSortOrder = result.sortOrder;
-
- updateLayout(state.derivedMode);
-
- if (mRestoredSelection != null) {
- mSelectionManager.restoreSelection(mRestoredSelection);
- // Note, we'll take care of cleaning up retained selection
- // in the selection handler where we already have some
- // specialized code to handle when selection was restored.
- }
-
- // Restore any previous instance state
- final SparseArray<Parcelable> container = state.dirState.remove(mStateKey);
- if (container != null && !getArguments().getBoolean(Shared.EXTRA_IGNORE_STATE, false)) {
- getView().restoreHierarchyState(container);
- } else if (mLastSortOrder != state.derivedSortOrder) {
- // The derived sort order takes the user sort order into account, but applies
- // directory-specific defaults when the user doesn't explicitly set the sort
- // order. Scroll to the top if the sort order actually changed.
- mRecView.smoothScrollToPosition(0);
- }
-
- mLastSortOrder = state.derivedSortOrder;
-
- mTuner.onModelLoaded(mModel, mType, mSearchMode);
-
- }
-
- @Override
- public void onLoaderReset(Loader<DirectoryResult> loader) {
- mModel.update(null);
- }
- }
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java
deleted file mode 100644
index 1135c21..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.animation.Animator;
-import android.animation.ArgbEvaluator;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.RecyclerView;
-import android.util.TypedValue;
-
-import com.android.documentsui.R;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Performs change animations on Items in DirectoryFragment's RecyclerView. This class overrides
- * the way selection animations are normally performed - instead of cross fading the old Item with a
- * new Item, this class manually animates a background color change. This enables selected Items to
- * correctly maintain focus.
- */
-class DirectoryItemAnimator extends DefaultItemAnimator {
- private final List<ColorAnimation> mPendingAnimations = new ArrayList<>();
- private final Map<RecyclerView.ViewHolder, ColorAnimation> mRunningAnimations =
- new ArrayMap<>();
- private final Integer mDefaultColor;
- private final Integer mSelectedColor;
-
- public DirectoryItemAnimator(Context context) {
- mDefaultColor = context.getResources().getColor(R.color.item_doc_background);
- mSelectedColor = context.getResources().getColor(R.color.item_doc_background_selected);
- }
-
- @Override
- public void runPendingAnimations() {
- super.runPendingAnimations();
- for (ColorAnimation anim: mPendingAnimations) {
- anim.start();
- mRunningAnimations.put(anim.viewHolder, anim);
- }
- mPendingAnimations.clear();
- }
-
- @Override
- public void endAnimation(RecyclerView.ViewHolder vh) {
- super.endAnimation(vh);
-
- for (int i = mPendingAnimations.size() - 1; i >= 0; --i) {
- ColorAnimation anim = mPendingAnimations.get(i);
- if (anim.viewHolder == vh) {
- mPendingAnimations.remove(i);
- anim.end();
- }
- }
-
- ColorAnimation anim = mRunningAnimations.get(vh);
- if (anim != null) {
- anim.cancel();
- }
- }
-
- @Override
- public ItemHolderInfo recordPreLayoutInformation(
- RecyclerView.State state,
- RecyclerView.ViewHolder viewHolder,
- @AdapterChanges int changeFlags,
- List<Object> payloads) {
- ItemInfo info = (ItemInfo) super.recordPreLayoutInformation(state,
- viewHolder, changeFlags, payloads);
- info.isActivated = viewHolder.itemView.isActivated();
- return info;
- }
-
-
- @Override
- public ItemHolderInfo recordPostLayoutInformation(
- RecyclerView.State state, RecyclerView.ViewHolder viewHolder) {
- ItemInfo info = (ItemInfo) super.recordPostLayoutInformation(state,
- viewHolder);
- info.isActivated = viewHolder.itemView.isActivated();
- return info;
- }
-
- @Override
- public boolean animateChange(final RecyclerView.ViewHolder oldHolder,
- RecyclerView.ViewHolder newHolder, ItemHolderInfo preInfo,
- ItemHolderInfo postInfo) {
- if (oldHolder != newHolder) {
- return super.animateChange(oldHolder, newHolder, preInfo, postInfo);
- }
-
- ItemInfo pre = (ItemInfo)preInfo;
- ItemInfo post = (ItemInfo)postInfo;
-
- if (pre.isActivated == post.isActivated) {
- dispatchAnimationFinished(oldHolder);
- return false;
- } else {
- Integer startColor = pre.isActivated ? mSelectedColor : mDefaultColor;
- Integer endColor = post.isActivated ? mSelectedColor : mDefaultColor;
- oldHolder.itemView.setBackgroundColor(startColor);
- mPendingAnimations.add(new ColorAnimation(oldHolder, startColor, endColor));
- }
- return true;
- }
-
- @Override
- public ItemHolderInfo obtainHolderInfo() {
- return new ItemInfo();
- }
-
- @Override
- public boolean canReuseUpdatedViewHolder(RecyclerView.ViewHolder vh) {
- return true;
- }
-
- class ItemInfo extends DefaultItemAnimator.ItemHolderInfo {
- boolean isActivated;
- };
-
- /**
- * Animates changes in background color.
- */
- class ColorAnimation
- implements ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
- ValueAnimator mValueAnimator;
- final RecyclerView.ViewHolder viewHolder;
- int mEndColor;
-
- public ColorAnimation(RecyclerView.ViewHolder vh, int startColor, int endColor)
- {
- viewHolder = vh;
- mValueAnimator = ValueAnimator.ofObject(new ArgbEvaluator(), startColor, endColor);
- mValueAnimator.addUpdateListener(this);
- mValueAnimator.addListener(this);
-
- mEndColor = endColor;
- }
-
- public void start() {
- mValueAnimator.start();
- }
-
- public void cancel() {
- mValueAnimator.cancel();
- }
-
- public void end() {
- mValueAnimator.end();
- }
-
- @Override
- public void onAnimationUpdate(ValueAnimator animator) {
- viewHolder.itemView.setBackgroundColor((Integer)animator.getAnimatedValue());
- }
-
- @Override
- public void onAnimationEnd(Animator animator) {
- viewHolder.itemView.setBackgroundColor(mEndColor);
- mRunningAnimations.remove(viewHolder);
- dispatchAnimationFinished(viewHolder);
- }
-
- @Override
- public void onAnimationStart(Animator animation) {
- dispatchAnimationStarted(viewHolder);
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {}
-
- @Override
- public void onAnimationRepeat(Animator animation) {}
- };
-};
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java
deleted file mode 100644
index 2288fe74..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.annotation.ColorInt;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.documentsui.Events;
-import com.android.documentsui.R;
-import com.android.documentsui.State;
-
-public abstract class DocumentHolder
- extends RecyclerView.ViewHolder
- implements View.OnKeyListener {
-
- static final float DISABLED_ALPHA = 0.3f;
-
- public @Nullable String modelId;
-
- final Context mContext;
- final @ColorInt int mDefaultBgColor;
- final @ColorInt int mSelectedBgColor;
-
- DocumentHolder.EventListener mEventListener;
- private View.OnKeyListener mKeyListener;
- private View mSelectionHotspot;
-
-
- public DocumentHolder(Context context, ViewGroup parent, int layout) {
- this(context, inflateLayout(context, parent, layout));
- }
-
- public DocumentHolder(Context context, View item) {
- super(item);
-
- itemView.setOnKeyListener(this);
-
- mContext = context;
-
- mDefaultBgColor = context.getColor(R.color.item_doc_background);
- mSelectedBgColor = context.getColor(R.color.item_doc_background_selected);
-
- mSelectionHotspot = itemView.findViewById(R.id.icon_check);
- }
-
- /**
- * Binds the view to the given item data.
- * @param cursor
- * @param modelId
- * @param state
- */
- public abstract void bind(Cursor cursor, String modelId, State state);
-
- /**
- * Makes the associated item view appear selected. Note that this merely affects the appearance
- * of the view, it doesn't actually select the item.
- * TODO: Use the DirectoryItemAnimator instead of manually controlling animation using a boolean
- * flag.
- *
- * @param selected
- * @param animate Whether or not to animate the change. Only selection changes initiated by the
- * selection manager should be animated. See
- * {@link ModelBackedDocumentsAdapter#onBindViewHolder(DocumentHolder, int, java.util.List)}
- */
- public void setSelected(boolean selected, boolean animate) {
- // Note: the animate param doesn't apply for this base implementation, because the
- // DirectoryItemAnimator takes care of it. It's required by subclasses, which perform their
- // own animation.
- itemView.setActivated(selected);
- itemView.setBackgroundColor(selected ? mSelectedBgColor : mDefaultBgColor);
- }
-
- /**
- * Highlights the associated item view.
- * @param highlighted
- */
- public void setHighlighted(boolean highlighted) {
- itemView.setBackgroundColor(highlighted ? mSelectedBgColor : mDefaultBgColor);
- }
-
- public void setEnabled(boolean enabled) {
- setEnabledRecursive(itemView, enabled);
- }
-
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // Event listener should always be set.
- assert(mEventListener != null);
-
- return mEventListener.onKey(this, keyCode, event);
- }
-
- public void addEventListener(DocumentHolder.EventListener listener) {
- // Just handle one for now; switch to a list if necessary.
- assert(mEventListener == null);
- mEventListener = listener;
- }
-
- public void addOnKeyListener(View.OnKeyListener listener) {
- // Just handle one for now; switch to a list if necessary.
- assert(mKeyListener == null);
- mKeyListener = listener;
- }
-
- public boolean onSingleTapUp(MotionEvent event) {
- if (Events.isMouseEvent(event)) {
- // Mouse clicks select.
- // TODO: && input.isPrimaryButtonPressed(), but it is returning false.
- if (mEventListener != null) {
- return mEventListener.onSelect(this);
- }
- } else if (Events.isTouchEvent(event)) {
- // Touch events select if they occur in the selection hotspot, otherwise they activate.
- if (mEventListener == null) {
- return false;
- }
-
- // Do everything in global coordinates - it makes things simpler.
- int[] coords = new int[2];
- mSelectionHotspot.getLocationOnScreen(coords);
- Rect rect = new Rect(coords[0], coords[1], coords[0] + mSelectionHotspot.getWidth(),
- coords[1] + mSelectionHotspot.getHeight());
-
- // If the tap occurred within the icon rect, consider it a selection.
- if (rect.contains((int) event.getRawX(), (int) event.getRawY())) {
- return mEventListener.onSelect(this);
- } else {
- return mEventListener.onActivate(this);
- }
- }
- return false;
- }
-
- static void setEnabledRecursive(View itemView, boolean enabled) {
- if (itemView == null) return;
- if (itemView.isEnabled() == enabled) return;
- itemView.setEnabled(enabled);
-
- if (itemView instanceof ViewGroup) {
- final ViewGroup vg = (ViewGroup) itemView;
- for (int i = vg.getChildCount() - 1; i >= 0; i--) {
- setEnabledRecursive(vg.getChildAt(i), enabled);
- }
- }
- }
-
- private static View inflateLayout(Context context, ViewGroup parent, int layout) {
- final LayoutInflater inflater = LayoutInflater.from(context);
- return inflater.inflate(layout, parent, false);
- }
-
- /**
- * Implement this in order to be able to respond to events coming from DocumentHolders.
- */
- interface EventListener {
- /**
- * Handles activation events on the document holder.
- *
- * @param doc The target DocumentHolder
- * @return Whether the event was handled.
- */
- public boolean onActivate(DocumentHolder doc);
-
- /**
- * Handles selection events on the document holder.
- *
- * @param doc The target DocumentHolder
- * @return Whether the event was handled.
- */
- public boolean onSelect(DocumentHolder doc);
-
- /**
- * Handles key events on the document holder.
- *
- * @param doc The target DocumentHolder.
- * @param keyCode Key code for the event.
- * @param event KeyEvent for the event.
- * @return Whether the event was handled.
- */
- public boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentsAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentsAdapter.java
deleted file mode 100644
index 4b35447..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentsAdapter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.DocumentsContract.Document;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-import com.android.documentsui.State;
-
-import java.util.List;
-
-/**
- * DocumentsAdapter provides glue between a directory Model, and RecylcerView. We've
- * abstracted this a bit in order to decompose some specialized support
- * for adding dummy layout objects (@see SectionBreakDocumentsAdapter). Handling of the
- * dummy layout objects was error prone when interspersed with the core mode / adapter code.
- *
- * @see ModelBackedDocumentsAdapter
- * @see SectionBreakDocumentsAdapter
- */
-abstract class DocumentsAdapter
- extends RecyclerView.Adapter<DocumentHolder>
- implements Model.UpdateListener {
-
- // Payloads for notifyItemChange to distinguish between selection and other events.
- static final String SELECTION_CHANGED_MARKER = "Selection-Changed";
-
- /**
- * Returns a list of model IDs of items currently in the adapter. Excludes items that are
- * currently hidden (see {@link #hide(String...)}).
- *
- * @return A list of Model IDs.
- */
- abstract List<String> getModelIds();
-
- /**
- * Triggers item-change notifications by stable ID (as opposed to position).
- * Passing an unrecognized ID will result in a warning in logcat, but no other error.
- */
- abstract void onItemSelectionChanged(String id);
-
- /**
- * @return The model ID of the item at the given adapter position.
- */
- abstract String getModelId(int position);
-
- /**
- * Returns a class that yields the span size for a particular element. This is
- * primarily useful in {@link SectionBreakDocumentsAdapterWrapper} where
- * we adjust sizes.
- */
- GridLayoutManager.SpanSizeLookup createSpanSizeLookup() {
- throw new UnsupportedOperationException();
- }
-
- static boolean isDirectory(Cursor cursor) {
- final String mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- return Document.MIME_TYPE_DIR.equals(mimeType);
- }
-
- boolean isDirectory(Model model, int position) {
- String modelId = getModelIds().get(position);
- Cursor cursor = model.getItem(modelId);
- return isDirectory(cursor);
- }
-
- /**
- * Environmental access for View adapter implementations.
- */
- interface Environment {
- Context getContext();
- int getColumnCount();
- State getDisplayState();
- boolean isSelected(String id);
- Model getModel();
- boolean isDocumentEnabled(String mimeType, int flags);
- void initDocumentHolder(DocumentHolder holder);
- void onBindDocumentHolder(DocumentHolder holder, Cursor cursor);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DragShadowBuilder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DragShadowBuilder.java
deleted file mode 100644
index c7d7a64..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DragShadowBuilder.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.documentsui.R;
-
-final class DragShadowBuilder extends View.DragShadowBuilder {
-
- private final View mShadowView;
- private final TextView mTitle;
- private final ImageView mIcon;
- private final int mWidth;
- private final int mHeight;
-
- public DragShadowBuilder(Context context, String title, Drawable icon) {
- mWidth = context.getResources().getDimensionPixelSize(R.dimen.drag_shadow_width);
- mHeight= context.getResources().getDimensionPixelSize(R.dimen.drag_shadow_height);
-
- mShadowView = LayoutInflater.from(context).inflate(R.layout.drag_shadow_layout, null);
- mTitle = (TextView) mShadowView.findViewById(android.R.id.title);
- mIcon = (ImageView) mShadowView.findViewById(android.R.id.icon);
-
- mTitle.setText(title);
- mIcon.setImageDrawable(icon);
- }
-
- @Override
- public void onProvideShadowMetrics(
- Point shadowSize, Point shadowTouchPoint) {
- shadowSize.set(mWidth, mHeight);
- shadowTouchPoint.set(mWidth, mHeight);
- }
-
- @Override
- public void onDrawShadow(Canvas canvas) {
- Rect r = canvas.getClipBounds();
- // Calling measure is necessary in order for all child views to get correctly laid out.
- mShadowView.measure(
- View.MeasureSpec.makeMeasureSpec(r.right- r.left, View.MeasureSpec.EXACTLY),
- View.MeasureSpec.makeMeasureSpec(r.top- r.bottom, View.MeasureSpec.EXACTLY));
- mShadowView.layout(r.left, r.top, r.right, r.bottom);
- mShadowView.draw(canvas);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java
deleted file mode 100644
index f274df3..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.annotation.Nullable;
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.SystemClock;
-import android.provider.DocumentsContract.Document;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
-import android.text.Spannable;
-import android.text.method.KeyListener;
-import android.text.method.TextKeyListener;
-import android.text.method.TextKeyListener.Capitalize;
-import android.text.style.BackgroundColorSpan;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.documentsui.Events;
-import com.android.documentsui.R;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * A class that handles navigation and focus within the DirectoryFragment.
- */
-class FocusManager implements View.OnFocusChangeListener {
- private static final String TAG = "FocusManager";
-
- private RecyclerView mView;
- private DocumentsAdapter mAdapter;
- private GridLayoutManager mLayout;
-
- private TitleSearchHelper mSearchHelper;
- private Model mModel;
-
- private int mLastFocusPosition = RecyclerView.NO_POSITION;
-
- public FocusManager(Context context, RecyclerView view, Model model) {
- mView = view;
- mAdapter = (DocumentsAdapter) view.getAdapter();
- mLayout = (GridLayoutManager) view.getLayoutManager();
- mModel = model;
-
- mSearchHelper = new TitleSearchHelper(context);
- }
-
- /**
- * Handles navigation (setting focus, adjusting selection if needed) arising from incoming key
- * events.
- *
- * @param doc The DocumentHolder receiving the key event.
- * @param keyCode
- * @param event
- * @return Whether the event was handled.
- */
- public boolean handleKey(DocumentHolder doc, int keyCode, KeyEvent event) {
- // Search helper gets first crack, for doing type-to-focus.
- if (mSearchHelper.handleKey(doc, keyCode, event)) {
- return true;
- }
-
- // Translate space/shift-space into PgDn/PgUp
- if (keyCode == KeyEvent.KEYCODE_SPACE) {
- if (event.isShiftPressed()) {
- keyCode = KeyEvent.KEYCODE_PAGE_UP;
- } else {
- keyCode = KeyEvent.KEYCODE_PAGE_DOWN;
- }
- }
-
- if (Events.isNavigationKeyCode(keyCode)) {
- // Find the target item and focus it.
- int endPos = findTargetPosition(doc.itemView, keyCode, event);
-
- if (endPos != RecyclerView.NO_POSITION) {
- focusItem(endPos);
- }
- // Swallow all navigation keystrokes. Otherwise they go to the app's global
- // key-handler, which will route them back to the DF and cause focus to be reset.
- return true;
- }
- return false;
- }
-
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- // Remember focus events on items.
- if (hasFocus && v.getParent() == mView) {
- mLastFocusPosition = mView.getChildAdapterPosition(v);
- }
- }
-
- /**
- * Requests focus on the item that last had focus. Scrolls to that item if necessary.
- */
- public void restoreLastFocus() {
- if (mAdapter.getItemCount() == 0) {
- // Nothing to focus.
- return;
- }
-
- if (mLastFocusPosition != RecyclerView.NO_POSITION) {
- // The system takes care of situations when a view is no longer on screen, etc,
- focusItem(mLastFocusPosition);
- } else {
- // Focus the first visible item
- focusItem(mLayout.findFirstVisibleItemPosition());
- }
- }
-
- /**
- * @return The adapter position of the last focused item.
- */
- public int getFocusPosition() {
- return mLastFocusPosition;
- }
-
- /**
- * Finds the destination position where the focus should land for a given navigation event.
- *
- * @param view The view that received the event.
- * @param keyCode The key code for the event.
- * @param event
- * @return The adapter position of the destination item. Could be RecyclerView.NO_POSITION.
- */
- private int findTargetPosition(View view, int keyCode, KeyEvent event) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_MOVE_HOME:
- return 0;
- case KeyEvent.KEYCODE_MOVE_END:
- return mAdapter.getItemCount() - 1;
- case KeyEvent.KEYCODE_PAGE_UP:
- case KeyEvent.KEYCODE_PAGE_DOWN:
- return findPagedTargetPosition(view, keyCode, event);
- }
-
- // Find a navigation target based on the arrow key that the user pressed.
- int searchDir = -1;
- switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_UP:
- searchDir = View.FOCUS_UP;
- break;
- case KeyEvent.KEYCODE_DPAD_DOWN:
- searchDir = View.FOCUS_DOWN;
- break;
- }
-
- if (inGridMode()) {
- int currentPosition = mView.getChildAdapterPosition(view);
- // Left and right arrow keys only work in grid mode.
- switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_LEFT:
- if (currentPosition > 0) {
- // Stop backward focus search at the first item, otherwise focus will wrap
- // around to the last visible item.
- searchDir = View.FOCUS_BACKWARD;
- }
- break;
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- if (currentPosition < mAdapter.getItemCount() - 1) {
- // Stop forward focus search at the last item, otherwise focus will wrap
- // around to the first visible item.
- searchDir = View.FOCUS_FORWARD;
- }
- break;
- }
- }
-
- if (searchDir != -1) {
- // Focus search behaves badly if the parent RecyclerView is focused. However, focusable
- // shouldn't be unset on RecyclerView, otherwise focus isn't properly restored after
- // events that cause a UI rebuild (like rotating the device). Compromise: turn focusable
- // off while performing the focus search.
- // TODO: Revisit this when RV focus issues are resolved.
- mView.setFocusable(false);
- View targetView = view.focusSearch(searchDir);
- mView.setFocusable(true);
- // TargetView can be null, for example, if the user pressed <down> at the bottom
- // of the list.
- if (targetView != null) {
- // Ignore navigation targets that aren't items in the RecyclerView.
- if (targetView.getParent() == mView) {
- return mView.getChildAdapterPosition(targetView);
- }
- }
- }
-
- return RecyclerView.NO_POSITION;
- }
-
- /**
- * Given a PgUp/PgDn event and the current view, find the position of the target view.
- * This returns:
- * <li>The position of the topmost (or bottom-most) visible item, if the current item is not
- * the top- or bottom-most visible item.
- * <li>The position of an item that is one page's worth of items up (or down) if the current
- * item is the top- or bottom-most visible item.
- * <li>The first (or last) item, if paging up (or down) would go past those limits.
- * @param view The view that received the key event.
- * @param keyCode Must be KEYCODE_PAGE_UP or KEYCODE_PAGE_DOWN.
- * @param event
- * @return The adapter position of the target item.
- */
- private int findPagedTargetPosition(View view, int keyCode, KeyEvent event) {
- int first = mLayout.findFirstVisibleItemPosition();
- int last = mLayout.findLastVisibleItemPosition();
- int current = mView.getChildAdapterPosition(view);
- int pageSize = last - first + 1;
-
- if (keyCode == KeyEvent.KEYCODE_PAGE_UP) {
- if (current > first) {
- // If the current item isn't the first item, target the first item.
- return first;
- } else {
- // If the current item is the first item, target the item one page up.
- int target = current - pageSize;
- return target < 0 ? 0 : target;
- }
- }
-
- if (keyCode == KeyEvent.KEYCODE_PAGE_DOWN) {
- if (current < last) {
- // If the current item isn't the last item, target the last item.
- return last;
- } else {
- // If the current item is the last item, target the item one page down.
- int target = current + pageSize;
- int max = mAdapter.getItemCount() - 1;
- return target < max ? target : max;
- }
- }
-
- throw new IllegalArgumentException("Unsupported keyCode: " + keyCode);
- }
-
- /**
- * Requests focus for the item in the given adapter position, scrolling the RecyclerView if
- * necessary.
- *
- * @param pos
- */
- private void focusItem(final int pos) {
- focusItem(pos, null);
- }
-
- /**
- * Requests focus for the item in the given adapter position, scrolling the RecyclerView if
- * necessary.
- *
- * @param pos
- * @param callback A callback to call after the given item has been focused.
- */
- private void focusItem(final int pos, @Nullable final FocusCallback callback) {
- // If the item is already in view, focus it; otherwise, scroll to it and focus it.
- RecyclerView.ViewHolder vh = mView.findViewHolderForAdapterPosition(pos);
- if (vh != null) {
- if (vh.itemView.requestFocus() && callback != null) {
- callback.onFocus(vh.itemView);
- }
- } else {
- // Set a one-time listener to request focus when the scroll has completed.
- mView.addOnScrollListener(
- new RecyclerView.OnScrollListener() {
- @Override
- public void onScrollStateChanged(RecyclerView view, int newState) {
- if (newState == RecyclerView.SCROLL_STATE_IDLE) {
- // When scrolling stops, find the item and focus it.
- RecyclerView.ViewHolder vh =
- view.findViewHolderForAdapterPosition(pos);
- if (vh != null) {
- if (vh.itemView.requestFocus() && callback != null) {
- callback.onFocus(vh.itemView);
- }
- } else {
- // This might happen in weird corner cases, e.g. if the user is
- // scrolling while a delete operation is in progress. In that
- // case, just don't attempt to focus the missing item.
- Log.w(TAG, "Unable to focus position " + pos + " after scroll");
- }
- view.removeOnScrollListener(this);
- }
- }
- });
- mView.smoothScrollToPosition(pos);
- }
- }
-
- /**
- * @return Whether the layout manager is currently in a grid-configuration.
- */
- private boolean inGridMode() {
- return mLayout.getSpanCount() > 1;
- }
-
- private interface FocusCallback {
- public void onFocus(View view);
- }
-
- /**
- * A helper class for handling type-to-focus. Instantiate this class, and pass it KeyEvents via
- * the {@link #handleKey(DocumentHolder, int, KeyEvent)} method. The class internally will build
- * up a string from individual key events, and perform searching based on that string. When an
- * item is found that matches the search term, that item will be focused. This class also
- * highlights instances of the search term found in the view.
- */
- private class TitleSearchHelper {
- static private final int SEARCH_TIMEOUT = 500; // ms
-
- private final KeyListener mTextListener = new TextKeyListener(Capitalize.NONE, false);
- private final Editable mSearchString = Editable.Factory.getInstance().newEditable("");
- private final Highlighter mHighlighter = new Highlighter();
- private final BackgroundColorSpan mSpan;
-
- private List<String> mIndex;
- private boolean mActive;
- private Timer mTimer;
- private KeyEvent mLastEvent;
- private Handler mUiRunner;
-
- public TitleSearchHelper(Context context) {
- mSpan = new BackgroundColorSpan(context.getColor(R.color.accent_dark));
- // Handler for running things on the main UI thread. Needed for updating the UI from a
- // timer (see #activate, below).
- mUiRunner = new Handler(Looper.getMainLooper());
- }
-
- /**
- * Handles alphanumeric keystrokes for type-to-focus. This method builds a search term out
- * of individual key events, and then performs a search for the given string.
- *
- * @param doc The document holder receiving the key event.
- * @param keyCode
- * @param event
- * @return Whether the event was handled.
- */
- public boolean handleKey(DocumentHolder doc, int keyCode, KeyEvent event) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_ESCAPE:
- case KeyEvent.KEYCODE_ENTER:
- if (mActive) {
- // These keys end any active searches.
- endSearch();
- return true;
- } else {
- // Don't handle these key events if there is no active search.
- return false;
- }
- case KeyEvent.KEYCODE_SPACE:
- // This allows users to search for files with spaces in their names, but ignores
- // spacebar events when a text search is not active. Ignoring the spacebar
- // event is necessary because other handlers (see FocusManager#handleKey) also
- // listen for and handle it.
- if (!mActive) {
- return false;
- }
- }
-
- // Navigation keys also end active searches.
- if (Events.isNavigationKeyCode(keyCode)) {
- endSearch();
- // Don't handle the keycode, so navigation still occurs.
- return false;
- }
-
- // Build up the search string, and perform the search.
- boolean handled = mTextListener.onKeyDown(doc.itemView, mSearchString, keyCode, event);
-
- // Delete is processed by the text listener, but not "handled". Check separately for it.
- if (keyCode == KeyEvent.KEYCODE_DEL) {
- handled = true;
- }
-
- if (handled) {
- mLastEvent = event;
- if (mSearchString.length() == 0) {
- // Don't perform empty searches.
- return false;
- }
- search();
- }
-
- return handled;
- }
-
- /**
- * Activates the search helper, which changes its key handling and updates the search index
- * and highlights if necessary. Call this each time the search term is updated.
- */
- private void search() {
- if (!mActive) {
- // The model listener invalidates the search index when the model changes.
- mModel.addUpdateListener(mModelListener);
-
- // Used to keep the current search alive until the timeout expires. If the user
- // presses another key within that time, that keystroke is added to the current
- // search. Otherwise, the current search ends, and subsequent keystrokes start a new
- // search.
- mTimer = new Timer();
- mActive = true;
- }
-
- // If the search index was invalidated, rebuild it
- if (mIndex == null) {
- buildIndex();
- }
-
- // Search for the current search term.
- // Perform case-insensitive search.
- String searchString = mSearchString.toString().toLowerCase();
- for (int pos = 0; pos < mIndex.size(); pos++) {
- String title = mIndex.get(pos);
- if (title != null && title.startsWith(searchString)) {
- focusItem(pos, new FocusCallback() {
- @Override
- public void onFocus(View view) {
- mHighlighter.applyHighlight(view);
- // Using a timer repeat period of SEARCH_TIMEOUT/2 means the amount of
- // time between the last keystroke and a search expiring is actually
- // between 500 and 750 ms. A smaller timer period results in less
- // variability but does more polling.
- mTimer.schedule(new TimeoutTask(), 0, SEARCH_TIMEOUT / 2);
- }
- });
- break;
- }
- }
- }
-
- /**
- * Ends the current search (see {@link #search()}.
- */
- private void endSearch() {
- if (mActive) {
- mModel.removeUpdateListener(mModelListener);
- mTimer.cancel();
- }
-
- mHighlighter.removeHighlight();
-
- mIndex = null;
- mSearchString.clear();
- mActive = false;
- }
-
- /**
- * Builds a search index for finding items by title. Queries the model and adapter, so both
- * must be set up before calling this method.
- */
- private void buildIndex() {
- int itemCount = mAdapter.getItemCount();
- List<String> index = new ArrayList<>(itemCount);
- for (int i = 0; i < itemCount; i++) {
- String modelId = mAdapter.getModelId(i);
- Cursor cursor = mModel.getItem(modelId);
- if (modelId != null && cursor != null) {
- String title = getCursorString(cursor, Document.COLUMN_DISPLAY_NAME);
- // Perform case-insensitive search.
- index.add(title.toLowerCase());
- } else {
- index.add("");
- }
- }
- mIndex = index;
- }
-
- private Model.UpdateListener mModelListener = new Model.UpdateListener() {
- @Override
- public void onModelUpdate(Model model) {
- // Invalidate the search index when the model updates.
- mIndex = null;
- }
-
- @Override
- public void onModelUpdateFailed(Exception e) {
- // Invalidate the search index when the model updates.
- mIndex = null;
- }
- };
-
- private class TimeoutTask extends TimerTask {
- @Override
- public void run() {
- long last = mLastEvent.getEventTime();
- long now = SystemClock.uptimeMillis();
- if ((now - last) > SEARCH_TIMEOUT) {
- // endSearch must run on the main thread because it does UI work
- mUiRunner.post(new Runnable() {
- @Override
- public void run() {
- endSearch();
- }
- });
- }
- }
- };
-
- private class Highlighter {
- private Spannable mCurrentHighlight;
-
- /**
- * Applies title highlights to the given view. The view must have a title field that is a
- * spannable text field. If this condition is not met, this function does nothing.
- *
- * @param view
- */
- private void applyHighlight(View view) {
- TextView titleView = (TextView) view.findViewById(android.R.id.title);
- if (titleView == null) {
- return;
- }
-
- CharSequence tmpText = titleView.getText();
- if (tmpText instanceof Spannable) {
- if (mCurrentHighlight != null) {
- mCurrentHighlight.removeSpan(mSpan);
- }
- mCurrentHighlight = (Spannable) tmpText;
- mCurrentHighlight.setSpan(
- mSpan, 0, mSearchString.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- }
- }
-
- /**
- * Removes title highlights from the given view. The view must have a title field that is a
- * spannable text field. If this condition is not met, this function does nothing.
- *
- * @param view
- */
- private void removeHighlight() {
- if (mCurrentHighlight != null) {
- mCurrentHighlight.removeSpan(mSpan);
- }
- }
- };
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
deleted file mode 100644
index e175331..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.State.ACTION_BROWSE;
-import static com.android.documentsui.State.ACTION_CREATE;
-import static com.android.documentsui.State.ACTION_GET_CONTENT;
-import static com.android.documentsui.State.ACTION_OPEN;
-import static com.android.documentsui.State.ACTION_OPEN_TREE;
-import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
-
-import android.content.Context;
-import android.provider.DocumentsContract.Document;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.documentsui.BaseActivity;
-import com.android.documentsui.Menus;
-import com.android.documentsui.MimePredicate;
-import com.android.documentsui.R;
-import com.android.documentsui.State;
-import com.android.documentsui.dirlist.DirectoryFragment.ResultType;
-
-/**
- * Providers support for specializing the DirectoryFragment to the "host" Activity.
- * Feel free to expand the role of this class to handle other specializations.
- */
-public abstract class FragmentTuner {
-
- final Context mContext;
- final State mState;
-
- public FragmentTuner(Context context, State state) {
- mContext = context;
- mState = state;
- }
-
- // Subtly different from isDocumentEnabled. The reason may be illuminated as follows.
- // A folder is enabled such that it may be double clicked, even in settings
- // when the folder itself cannot be selected. This may also be true of container types.
- public boolean canSelectType(String docMimeType, int docFlags) {
- return true;
- }
-
- public boolean isDocumentEnabled(String docMimeType, int docFlags) {
- return true;
- }
-
- /**
- * When managed mode is enabled, active downloads will be visible in the UI.
- * Presumably this should only be true when in the downloads directory.
- */
- boolean managedModeEnabled() {
- return false;
- }
-
- /**
- * Whether drag n' drop is allowed in this context
- */
- boolean dragAndDropEnabled() {
- return false;
- }
-
- abstract void onModelLoaded(Model model, @ResultType int resultType, boolean isSearch);
-
- /**
- * Provides support for Platform specific specializations of DirectoryFragment.
- */
- public static final class DocumentsTuner extends FragmentTuner {
-
- // We use this to keep track of whether a model has been previously loaded or not so we can
- // open the drawer on empty directories on first launch
- private boolean mModelPreviousLoaded;
-
- public DocumentsTuner(Context context, State state) {
- super(context, state);
- }
-
- @Override
- public boolean canSelectType(String docMimeType, int docFlags) {
- if (!isDocumentEnabled(docMimeType, docFlags)) {
- return false;
- }
-
- if (MimePredicate.isDirectoryType(docMimeType)) {
- return false;
- }
-
- if (mState.action == ACTION_OPEN_TREE
- || mState.action == ACTION_PICK_COPY_DESTINATION) {
- // In this case nothing *ever* is selectable...the expected user behavior is
- // they navigate *into* a folder, then click a confirmation button indicating
- // that the current directory is the directory they are picking.
- return false;
- }
-
- return true;
- }
-
- @Override
- public boolean isDocumentEnabled(String mimeType, int docFlags) {
- // Directories are always enabled.
- if (MimePredicate.isDirectoryType(mimeType)) {
- return true;
- }
-
- switch (mState.action) {
- case ACTION_CREATE:
- // Read-only files are disabled when creating.
- if ((docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
- return false;
- }
- case ACTION_OPEN:
- case ACTION_GET_CONTENT:
- final boolean isVirtual = (docFlags & Document.FLAG_VIRTUAL_DOCUMENT) != 0;
- if (isVirtual && mState.openableOnly) {
- return false;
- }
- }
-
- return MimePredicate.mimeMatches(mState.acceptMimes, mimeType);
- }
-
- @Override
- void onModelLoaded(Model model, @ResultType int resultType, boolean isSearch) {
- boolean showDrawer = false;
-
- if (MimePredicate.mimeMatches(MimePredicate.VISUAL_MIMES, mState.acceptMimes)) {
- showDrawer = false;
- }
- if (mState.external && mState.action == ACTION_GET_CONTENT) {
- showDrawer = true;
- }
- if (mState.action == ACTION_PICK_COPY_DESTINATION) {
- showDrawer = true;
- }
-
- // When launched into empty root, open drawer.
- if (model.isEmpty()) {
- showDrawer = true;
- }
-
- if (showDrawer && !mState.hasInitialLocationChanged() && !isSearch
- && !mModelPreviousLoaded) {
- // This noops on layouts without drawer, so no need to guard.
- ((BaseActivity) mContext).setRootsDrawerOpen(true);
- }
- mModelPreviousLoaded = true;
- }
- }
-
- /**
- * Provides support for Files activity specific specializations of DirectoryFragment.
- */
- public static final class FilesTuner extends FragmentTuner {
-
- // We use this to keep track of whether a model has been previously loaded or not so we can
- // open the drawer on empty directories on first launch
- private boolean mModelPreviousLoaded;
-
- public FilesTuner(Context context, State state) {
- super(context, state);
- }
-
-
-
- @Override
- void onModelLoaded(Model model, @ResultType int resultType, boolean isSearch) {
- // When launched into empty root, open drawer.
- if (model.isEmpty() && !mState.hasInitialLocationChanged() && !isSearch
- && !mModelPreviousLoaded) {
- // This noops on layouts without drawer, so no need to guard.
- ((BaseActivity) mContext).setRootsDrawerOpen(true);
- }
- mModelPreviousLoaded = true;
- }
-
- @Override
- public boolean managedModeEnabled() {
- // When in downloads top level directory, we also show active downloads.
- // And while we don't allow folders in Downloads, we do allow Zip files in
- // downloads that themselves can be opened and viewed like directories.
- // This method helps us understand when to kick in on those special behaviors.
- return mState.stack.root != null
- && mState.stack.root.isDownloads()
- && mState.stack.size() == 1;
- }
-
- @Override
- public boolean dragAndDropEnabled() {
- return true;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
deleted file mode 100644
index ce5bcb1..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.DocumentsContract.Document;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.documentsui.R;
-import com.android.documentsui.State;
-
-final class GridDirectoryHolder extends DocumentHolder {
- final TextView mTitle;
- private ImageView mIconCheck;
- private ImageView mIconMime;
-
- public GridDirectoryHolder(Context context, ViewGroup parent) {
- super(context, parent, R.layout.item_dir_grid);
-
- mTitle = (TextView) itemView.findViewById(android.R.id.title);
- mIconMime = (ImageView) itemView.findViewById(R.id.icon_mime_sm);
- mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
- }
-
- @Override
- public void setSelected(boolean selected, boolean animate) {
- super.setSelected(selected, animate);
- float checkAlpha = selected ? 1f : 0f;
-
- if (animate) {
- mIconCheck.animate().alpha(checkAlpha).start();
- mIconMime.animate().alpha(1f - checkAlpha).start();
- } else {
- mIconCheck.setAlpha(checkAlpha);
- mIconMime.setAlpha(1f - checkAlpha);
- }
- }
-
- /**
- * Bind this view to the given document for display.
- * @param cursor Pointing to the item to be bound.
- * @param modelId The model ID of the item.
- * @param state Current display state.
- */
- public void bind(Cursor cursor, String modelId, State state) {
- assert(cursor != null);
-
- this.modelId = modelId;
-
- final String docDisplayName = getCursorString(cursor, Document.COLUMN_DISPLAY_NAME);
- mTitle.setText(docDisplayName, TextView.BufferType.SPANNABLE);
-
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java
deleted file mode 100644
index 7ba4bdd..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.model.DocumentInfo.getCursorInt;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.annotation.ColorInt;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.text.format.Formatter;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.documentsui.R;
-import com.android.documentsui.RootCursorWrapper;
-import com.android.documentsui.Shared;
-import com.android.documentsui.State;
-
-final class GridDocumentHolder extends DocumentHolder {
-
- private static boolean mHideTitles;
-
- final TextView mTitle;
- final TextView mDate;
- final TextView mSize;
- final ImageView mIconMimeLg;
- final ImageView mIconMimeSm;
- final ImageView mIconThumb;
- final ImageView mIconCheck;
- final IconHelper mIconHelper;
-
- private final @ColorInt int mDisabledBgColor;
-
- public GridDocumentHolder(Context context, ViewGroup parent, IconHelper iconHelper) {
- super(context, parent, R.layout.item_doc_grid);
-
- mDisabledBgColor = context.getColor(R.color.item_doc_background_disabled);
-
- mTitle = (TextView) itemView.findViewById(android.R.id.title);
- mDate = (TextView) itemView.findViewById(R.id.date);
- mSize = (TextView) itemView.findViewById(R.id.size);
- mIconMimeLg = (ImageView) itemView.findViewById(R.id.icon_mime_lg);
- mIconMimeSm = (ImageView) itemView.findViewById(R.id.icon_mime_sm);
- mIconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
- mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
-
- mIconHelper = iconHelper;
- }
-
- @Override
- public void setSelected(boolean selected, boolean animate) {
- // We always want to make sure our check box disappears if we're not selected,
- // even if the item is disabled. This is because this object can be reused
- // and this method will be called to setup initial state.
- float checkAlpha = selected ? 1f : 0f;
- if (animate) {
- mIconCheck.animate().alpha(checkAlpha).start();
- } else {
- mIconCheck.setAlpha(checkAlpha);
- }
-
- // But it should be an error to be set to selected && be disabled.
- if (!itemView.isEnabled()) {
- assert(!selected);
- return;
- }
-
- super.setSelected(selected, animate);
-
- if (animate) {
- mIconMimeSm.animate().alpha(1f - checkAlpha).start();
- } else {
- mIconMimeSm.setAlpha(1f - checkAlpha);
- }
- }
-
- public void setEnabled(boolean enabled) {
- super.setEnabled(enabled);
-
- // Text colors enabled/disabled is handle via a color set.
- itemView.setBackgroundColor(enabled ? mDefaultBgColor : mDisabledBgColor);
- float imgAlpha = enabled ? 1f : DISABLED_ALPHA;
-
- mIconMimeLg.setAlpha(imgAlpha);
- mIconMimeSm.setAlpha(imgAlpha);
- mIconThumb.setAlpha(imgAlpha);
- }
-
- /**
- * Bind this view to the given document for display.
- * @param cursor Pointing to the item to be bound.
- * @param modelId The model ID of the item.
- * @param state Current display state.
- */
- public void bind(Cursor cursor, String modelId, State state) {
- assert(cursor != null);
-
- this.modelId = modelId;
-
- final String docAuthority = getCursorString(cursor, RootCursorWrapper.COLUMN_AUTHORITY);
- final String docId = getCursorString(cursor, Document.COLUMN_DOCUMENT_ID);
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final String docDisplayName = getCursorString(cursor, Document.COLUMN_DISPLAY_NAME);
- final long docLastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED);
- final int docIcon = getCursorInt(cursor, Document.COLUMN_ICON);
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- final long docSize = getCursorLong(cursor, Document.COLUMN_SIZE);
-
- mIconHelper.stopLoading(mIconThumb);
-
- mIconMimeLg.animate().cancel();
- mIconMimeLg.setAlpha(1f);
- mIconThumb.animate().cancel();
- mIconThumb.setAlpha(0f);
-
- final Uri uri = DocumentsContract.buildDocumentUri(docAuthority, docId);
- mIconHelper.load(uri, docMimeType, docFlags, docIcon, docLastModified, mIconThumb,
- mIconMimeLg, mIconMimeSm);
-
- if (mHideTitles) {
- mTitle.setVisibility(View.GONE);
- } else {
- mTitle.setText(docDisplayName, TextView.BufferType.SPANNABLE);
- mTitle.setVisibility(View.VISIBLE);
- }
-
- if (docLastModified == -1) {
- mDate.setText(null);
- } else {
- mDate.setText(Shared.formatTime(mContext, docLastModified));
- }
-
- if (!state.showSize || Document.MIME_TYPE_DIR.equals(docMimeType) || docSize == -1) {
- mSize.setVisibility(View.GONE);
- } else {
- mSize.setVisibility(View.VISIBLE);
- mSize.setText(Formatter.formatFileSize(mContext, docSize));
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
deleted file mode 100644
index ec72314..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.State.MODE_GRID;
-import static com.android.documentsui.State.MODE_LIST;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Point;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.CancellationSignal;
-import android.os.OperationCanceledException;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.android.documentsui.DocumentsApplication;
-import com.android.documentsui.IconUtils;
-import com.android.documentsui.MimePredicate;
-import com.android.documentsui.ProviderExecutor;
-import com.android.documentsui.ProviderExecutor.Preemptable;
-import com.android.documentsui.R;
-import com.android.documentsui.State;
-import com.android.documentsui.State.ViewMode;
-import com.android.documentsui.ThumbnailCache;
-import com.android.documentsui.ThumbnailCache.Result;
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.function.BiConsumer;
-
-/**
- * A class to assist with loading and managing the Images (i.e. thumbnails and icons) associated
- * with items in the directory listing.
- */
-public class IconHelper {
- private static final String TAG = "IconHelper";
-
- // Two animations applied to image views. The first is used to switch mime icon and thumbnail.
- // The second is used when we need to update thumbnail.
- private static final BiConsumer<View, View> ANIM_FADE_IN = (mime, thumb) -> {
- float alpha = mime.getAlpha();
- mime.animate().alpha(0f).start();
- thumb.setAlpha(0f);
- thumb.animate().alpha(alpha).start();
- };
- private static final BiConsumer<View, View> ANIM_NO_OP = (mime, thumb) -> {};
-
- private final Context mContext;
- private final ThumbnailCache mThumbnailCache;
-
- // The display mode (MODE_GRID, MODE_LIST, etc).
- private int mMode;
- private Point mCurrentSize;
- private boolean mThumbnailsEnabled = true;
-
- /**
- * @param context
- * @param mode MODE_GRID or MODE_LIST
- */
- public IconHelper(Context context, int mode) {
- mContext = context;
- setViewMode(mode);
- mThumbnailCache = DocumentsApplication.getThumbnailCache(context);
- }
-
- /**
- * Enables or disables thumbnails. When thumbnails are disabled, mime icons (or custom icons, if
- * specified by the document) are used instead.
- *
- * @param enabled
- */
- public void setThumbnailsEnabled(boolean enabled) {
- mThumbnailsEnabled = enabled;
- }
-
- /**
- * Sets the current display mode. This affects the thumbnail sizes that are loaded.
- *
- * @param mode See {@link State.MODE_LIST} and {@link State.MODE_GRID}.
- */
- public void setViewMode(@ViewMode int mode) {
- mMode = mode;
- int thumbSize = getThumbSize(mode);
- mCurrentSize = new Point(thumbSize, thumbSize);
- }
-
- private int getThumbSize(int mode) {
- int thumbSize;
- switch (mode) {
- case MODE_GRID:
- thumbSize = mContext.getResources().getDimensionPixelSize(R.dimen.grid_width);
- break;
- case MODE_LIST:
- thumbSize = mContext.getResources().getDimensionPixelSize(
- R.dimen.list_item_thumbnail_size);
- break;
- default:
- throw new IllegalArgumentException("Unsupported layout mode: " + mode);
- }
- return thumbSize;
- }
-
- /**
- * Cancels any ongoing load operations associated with the given ImageView.
- *
- * @param icon
- */
- public void stopLoading(ImageView icon) {
- final LoaderTask oldTask = (LoaderTask) icon.getTag();
- if (oldTask != null) {
- oldTask.preempt();
- icon.setTag(null);
- }
- }
-
- /** Internal task for loading thumbnails asynchronously. */
- private static class LoaderTask
- extends AsyncTask<Uri, Void, Bitmap>
- implements Preemptable {
- private final Uri mUri;
- private final ImageView mIconMime;
- private final ImageView mIconThumb;
- private final Point mThumbSize;
- private final long mLastModified;
-
- // A callback to apply animation to image views after the thumbnail is loaded.
- private final BiConsumer<View, View> mImageAnimator;
-
- private final CancellationSignal mSignal;
-
- public LoaderTask(Uri uri, ImageView iconMime, ImageView iconThumb,
- Point thumbSize, long lastModified, BiConsumer<View, View> animator) {
- mUri = uri;
- mIconMime = iconMime;
- mIconThumb = iconThumb;
- mThumbSize = thumbSize;
- mImageAnimator = animator;
- mLastModified = lastModified;
- mSignal = new CancellationSignal();
- if (DEBUG) Log.d(TAG, "Starting icon loader task for " + mUri);
- }
-
- @Override
- public void preempt() {
- if (DEBUG) Log.d(TAG, "Icon loader task for " + mUri + " was cancelled.");
- cancel(false);
- mSignal.cancel();
- }
-
- @Override
- protected Bitmap doInBackground(Uri... params) {
- if (isCancelled()) {
- return null;
- }
-
- final Context context = mIconThumb.getContext();
- final ContentResolver resolver = context.getContentResolver();
-
- ContentProviderClient client = null;
- Bitmap result = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(
- resolver, mUri.getAuthority());
- result = DocumentsContract.getDocumentThumbnail(client, mUri, mThumbSize, mSignal);
- if (result != null) {
- final ThumbnailCache cache = DocumentsApplication.getThumbnailCache(context);
- cache.putThumbnail(mUri, mThumbSize, result, mLastModified);
- }
- } catch (Exception e) {
- if (!(e instanceof OperationCanceledException)) {
- Log.w(TAG, "Failed to load thumbnail for " + mUri + ": " + e);
- }
- } finally {
- ContentProviderClient.releaseQuietly(client);
- }
- return result;
- }
-
- @Override
- protected void onPostExecute(Bitmap result) {
- if (DEBUG) Log.d(TAG, "Loader task for " + mUri + " completed");
-
- if (mIconThumb.getTag() == this && result != null) {
- mIconThumb.setTag(null);
- mIconThumb.setImageBitmap(result);
-
- mImageAnimator.accept(mIconMime, mIconThumb);
- }
- }
- }
-
- /**
- * Load thumbnails for a directory list item.
- *
- * @param uri The URI for the file being represented.
- * @param mimeType The mime type of the file being represented.
- * @param docFlags Flags for the file being represented.
- * @param docIcon Custom icon (if any) for the file being requested.
- * @param docLastModified the last modified value of the file being requested.
- * @param iconThumb The itemview's thumbnail icon.
- * @param iconMime The itemview's mime icon. Hidden when iconThumb is shown.
- * @param subIconMime The second itemview's mime icon. Always visible.
- * @return
- */
- public void load(Uri uri, String mimeType, int docFlags, int docIcon, long docLastModified,
- ImageView iconThumb, ImageView iconMime, @Nullable ImageView subIconMime) {
- boolean loadedThumbnail = false;
-
- final String docAuthority = uri.getAuthority();
-
- final boolean supportsThumbnail = (docFlags & Document.FLAG_SUPPORTS_THUMBNAIL) != 0;
- final boolean allowThumbnail = (mMode == MODE_GRID)
- || MimePredicate.mimeMatches(MimePredicate.VISUAL_MIMES, mimeType);
- final boolean showThumbnail = supportsThumbnail && allowThumbnail && mThumbnailsEnabled;
- if (showThumbnail) {
- loadedThumbnail =
- loadThumbnail(uri, docAuthority, docLastModified, iconThumb, iconMime);
- }
-
- final Drawable mimeIcon = getDocumentIcon(mContext, docAuthority,
- DocumentsContract.getDocumentId(uri), mimeType, docIcon);
- if (subIconMime != null) {
- setMimeIcon(subIconMime, mimeIcon);
- }
-
- if (loadedThumbnail) {
- hideImageView(iconMime);
- } else {
- // Add a mime icon if the thumbnail is not shown.
- setMimeIcon(iconMime, mimeIcon);
- hideImageView(iconThumb);
- }
- }
-
- private boolean loadThumbnail(Uri uri, String docAuthority, long docLastModified,
- ImageView iconThumb, ImageView iconMime) {
- final Result result = mThumbnailCache.getThumbnail(uri, mCurrentSize);
-
- try {
- final Bitmap cachedThumbnail = result.getThumbnail();
- iconThumb.setImageBitmap(cachedThumbnail);
-
- boolean stale = (docLastModified > result.getLastModified());
- if (DEBUG) Log.d(TAG,
- String.format("Load thumbnail for %s, got result %d and stale %b.",
- uri.toString(), result.getStatus(), stale));
- if (!result.isExactHit() || stale) {
- final BiConsumer<View, View> animator =
- (cachedThumbnail == null ? ANIM_FADE_IN : ANIM_NO_OP);
- final LoaderTask task = new LoaderTask(uri, iconMime, iconThumb, mCurrentSize,
- docLastModified, animator);
-
- iconThumb.setTag(task);
-
- ProviderExecutor.forAuthority(docAuthority).execute(task);
- }
-
- return result.isHit();
- } finally {
- result.recycle();
- }
- }
-
- private void setMimeIcon(ImageView view, Drawable icon) {
- view.setImageDrawable(icon);
- view.setAlpha(1f);
- }
-
- private void hideImageView(ImageView view) {
- view.setImageDrawable(null);
- view.setAlpha(0f);
- }
-
- private Drawable getDocumentIcon(
- Context context, String authority, String id, String mimeType, int icon) {
- if (icon != 0) {
- return IconUtils.loadPackageIcon(context, authority, icon);
- } else {
- return IconUtils.loadMimeIcon(context, mimeType, authority, id, mMode);
- }
- }
-
- /**
- * Returns a mime icon or package icon for a {@link DocumentInfo}.
- */
- public Drawable getDocumentIcon(Context context, DocumentInfo doc) {
- return getDocumentIcon(
- context, doc.authority, doc.documentId, doc.mimeType, doc.icon);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ItemEventListener.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ItemEventListener.java
deleted file mode 100644
index cffba8d..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ItemEventListener.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.view.KeyEvent;
-
-import com.android.documentsui.Events;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/**
- * Handles click/tap/key events on individual DocumentHolders.
- */
-class ItemEventListener implements DocumentHolder.EventListener {
- private MultiSelectManager mSelectionManager;
- private FocusManager mFocusManager;
-
- private Consumer<String> mViewItemCallback;
- private Consumer<Selection> mDeleteDocumentsCallback;
- private Predicate<String> mCanSelectPredicate;
-
- public ItemEventListener(
- MultiSelectManager selectionManager,
- FocusManager focusManager,
- Consumer<String> viewItemCallback,
- Consumer<Selection> deleteDocumentsCallback,
- Predicate<String> canSelectPredicate) {
-
- mSelectionManager = selectionManager;
- mFocusManager = focusManager;
- mViewItemCallback = viewItemCallback;
- mDeleteDocumentsCallback = deleteDocumentsCallback;
- mCanSelectPredicate = canSelectPredicate;
- }
-
- @Override
- public boolean onActivate(DocumentHolder doc) {
- // Toggle selection if we're in selection mode, othewise, view item.
- if (mSelectionManager.hasSelection()) {
- mSelectionManager.toggleSelection(doc.modelId);
- } else {
- mViewItemCallback.accept(doc.modelId);
- }
- return true;
- }
-
- @Override
- public boolean onSelect(DocumentHolder doc) {
- mSelectionManager.toggleSelection(doc.modelId);
- mSelectionManager.setSelectionRangeBegin(doc.getAdapterPosition());
- return true;
- }
-
- @Override
- public boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event) {
- // Only handle key-down events. This is simpler, consistent with most other UIs, and
- // enables the handling of repeated key events from holding down a key.
- if (event.getAction() != KeyEvent.ACTION_DOWN) {
- return false;
- }
-
- // Ignore tab key events. Those should be handled by the top-level key handler.
- if (keyCode == KeyEvent.KEYCODE_TAB) {
- return false;
- }
-
- if (mFocusManager.handleKey(doc, keyCode, event)) {
- // Handle range selection adjustments. Extending the selection will adjust the
- // bounds of the in-progress range selection. Each time an unshifted navigation
- // event is received, the range selection is restarted.
- if (shouldExtendSelection(doc, event)) {
- if (!mSelectionManager.isRangeSelectionActive()) {
- // Start a range selection if one isn't active
- mSelectionManager.startRangeSelection(doc.getAdapterPosition());
- }
- mSelectionManager.snapRangeSelection(mFocusManager.getFocusPosition());
- } else {
- mSelectionManager.endRangeSelection();
- }
- return true;
- }
-
- // Handle enter key events
- switch (keyCode) {
- case KeyEvent.KEYCODE_ENTER:
- if (event.isShiftPressed()) {
- return onSelect(doc);
- }
- // For non-shifted enter keypresses, fall through.
- case KeyEvent.KEYCODE_DPAD_CENTER:
- case KeyEvent.KEYCODE_BUTTON_A:
- return onActivate(doc);
- case KeyEvent.KEYCODE_FORWARD_DEL:
- // This has to be handled here instead of in a keyboard shortcut, because
- // keyboard shortcuts all have to be modified with the 'Ctrl' key.
- if (mSelectionManager.hasSelection()) {
- Selection selection = mSelectionManager.getSelection(new Selection());
- mDeleteDocumentsCallback.accept(selection);
- }
- // Always handle the key, even if there was nothing to delete. This is a
- // precaution to prevent other handlers from potentially picking up the event
- // and triggering extra behaviours.
- return true;
- }
-
- return false;
- }
-
- private boolean shouldExtendSelection(DocumentHolder doc, KeyEvent event) {
- if (!Events.isNavigationKeyCode(event.getKeyCode()) || !event.isShiftPressed()) {
- return false;
- }
-
- return mCanSelectPredicate.test(doc.modelId);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ListDocumentHolder.java
deleted file mode 100644
index e88be0c..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.model.DocumentInfo.getCursorInt;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.text.format.Formatter;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.documentsui.R;
-import com.android.documentsui.RootCursorWrapper;
-import com.android.documentsui.Shared;
-import com.android.documentsui.State;
-
-final class ListDocumentHolder extends DocumentHolder {
- final TextView mTitle;
- final LinearLayout mDetails; // Container of date/size/summary
- final TextView mDate;
- final TextView mSize;
- final TextView mSummary;
- final ImageView mIconMime;
- final ImageView mIconThumb;
- final ImageView mIconCheck;
- final IconHelper mIconHelper;
-
- public ListDocumentHolder(Context context, ViewGroup parent, IconHelper iconHelper) {
- super(context, parent, R.layout.item_doc_list);
-
- mTitle = (TextView) itemView.findViewById(android.R.id.title);
- mDate = (TextView) itemView.findViewById(R.id.date);
- mSize = (TextView) itemView.findViewById(R.id.size);
- mSummary = (TextView) itemView.findViewById(android.R.id.summary);
- mIconMime = (ImageView) itemView.findViewById(R.id.icon_mime);
- mIconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
- mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
- // Warning: mDetails view doesn't exists in layout-sw720dp-land layout
- mDetails = (LinearLayout) itemView.findViewById(R.id.line2);
-
- mIconHelper = iconHelper;
- }
-
- @Override
- public void setSelected(boolean selected, boolean animate) {
- // We always want to make sure our check box disappears if we're not selected,
- // even if the item is disabled. But it should be an error (see assert below)
- // to be set to selected && be disabled.
- float checkAlpha = selected ? 1f : 0f;
- if (animate) {
- mIconCheck.animate().alpha(checkAlpha).start();
- } else {
- mIconCheck.setAlpha(checkAlpha);
- }
-
- if (!itemView.isEnabled()) {
- assert(!selected);
- return;
- }
-
- super.setSelected(selected, animate);
-
- if (animate) {
- mIconMime.animate().alpha(1f - checkAlpha).start();
- mIconThumb.animate().alpha(1f - checkAlpha).start();
- } else {
- mIconMime.setAlpha(1f - checkAlpha);
- mIconThumb.setAlpha(1f - checkAlpha);
- }
- }
-
- @Override
- public void setEnabled(boolean enabled) {
- super.setEnabled(enabled);
-
- // Text colors enabled/disabled is handle via a color set.
- final float imgAlpha = enabled ? 1f : DISABLED_ALPHA;
- mIconMime.setAlpha(imgAlpha);
- mIconThumb.setAlpha(imgAlpha);
- }
-
- /**
- * Bind this view to the given document for display.
- * @param cursor Pointing to the item to be bound.
- * @param modelId The model ID of the item.
- * @param state Current display state.
- */
- @Override
- public void bind(Cursor cursor, String modelId, State state) {
- assert(cursor != null);
-
- this.modelId = modelId;
-
- final String docAuthority = getCursorString(cursor, RootCursorWrapper.COLUMN_AUTHORITY);
- final String docId = getCursorString(cursor, Document.COLUMN_DOCUMENT_ID);
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final String docDisplayName = getCursorString(cursor, Document.COLUMN_DISPLAY_NAME);
- final long docLastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED);
- final int docIcon = getCursorInt(cursor, Document.COLUMN_ICON);
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- final String docSummary = getCursorString(cursor, Document.COLUMN_SUMMARY);
- final long docSize = getCursorLong(cursor, Document.COLUMN_SIZE);
- final boolean isDirectory = Document.MIME_TYPE_DIR.equals(docMimeType);
-
- mIconHelper.stopLoading(mIconThumb);
-
- mIconMime.animate().cancel();
- mIconMime.setAlpha(1f);
- mIconThumb.animate().cancel();
- mIconThumb.setAlpha(0f);
-
- final Uri uri = DocumentsContract.buildDocumentUri(docAuthority, docId);
- mIconHelper.load(uri, docMimeType, docFlags, docIcon, docLastModified, mIconThumb,
- mIconMime, null);
-
- mTitle.setText(docDisplayName, TextView.BufferType.SPANNABLE);
- mTitle.setVisibility(View.VISIBLE);
-
-
- boolean hasDetails = false;
- if (isDirectory) {
- // Note, we don't show any details for any directory...ever.
- hasDetails = false;
- } else {
- if (docSummary != null) {
- hasDetails = true;
- mSummary.setText(docSummary);
- mSummary.setVisibility(View.VISIBLE);
- } else {
- mSummary.setVisibility(View.INVISIBLE);
- }
-
- if (docLastModified > 0) {
- hasDetails = true;
- mDate.setText(Shared.formatTime(mContext, docLastModified));
- } else {
- mDate.setText(null);
- }
-
- if (state.showSize && docSize > -1) {
- hasDetails = true;
- mSize.setVisibility(View.VISIBLE);
- mSize.setText(Formatter.formatFileSize(mContext, docSize));
- } else {
- mSize.setVisibility(View.GONE);
- }
- }
-
- // mDetails view doesn't exists in layout-sw720dp-land layout
- if (mDetails != null) {
- mDetails.setVisibility(hasDetails ? View.VISIBLE : View.GONE);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ListeningGestureDetector.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
deleted file mode 100644
index 96e15d9..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.Context;
-import android.support.v13.view.DragStartHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.OnItemTouchListener;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnTouchListener;
-
-import com.android.documentsui.Events;
-import com.android.documentsui.dirlist.DirectoryFragment.GestureListener;
-
-// Previously we listened to events with one class, only to bounce them forward
-// to GestureDetector. We're still doing that here, but with a single class
-// that reduces overall complexity in our glue code.
-final class ListeningGestureDetector extends GestureDetector
- implements OnItemTouchListener, OnTouchListener {
-
- private DragStartHelper mDragHelper;
- private GestureListener mGestureListener;
-
- public ListeningGestureDetector(
- Context context, DragStartHelper dragHelper, GestureListener listener) {
- super(context, listener);
- mDragHelper = dragHelper;
- mGestureListener = listener;
- setOnDoubleTapListener(listener);
- }
-
- @Override
- public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
- if (e.getAction() == MotionEvent.ACTION_DOWN && Events.isMouseEvent(e)) {
- mGestureListener.setLastButtonState(e.getButtonState());
- }
-
- // Detect drag events. When a drag is detected, intercept the rest of the gesture.
- View itemView = rv.findChildViewUnder(e.getX(), e.getY());
- if (itemView != null && mDragHelper.onTouch(itemView, e)) {
- return true;
- }
- // Forward unhandled events to the GestureDetector.
- onTouchEvent(e);
-
- return false;
- }
-
- @Override
- public void onTouchEvent(RecyclerView rv, MotionEvent e) {
- View itemView = rv.findChildViewUnder(e.getX(), e.getY());
- mDragHelper.onTouch(itemView, e);
- // Note: even though this event is being handled as part of a drag gesture, continue
- // forwarding to the GestureDetector. The detector needs to see the entire cluster of
- // events in order to properly interpret gestures.
- onTouchEvent(e);
- }
-
- @Override
- public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {}
-
- // For mEmptyView right-click context menu
- @Override
- public boolean onTouch(View v, MotionEvent event) {
- if (event.getButtonState() == MotionEvent.BUTTON_SECONDARY) {
- return mGestureListener.onRightClick(event);
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
deleted file mode 100644
index 5c15228..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.State.SORT_ORDER_DISPLAY_NAME;
-import static com.android.documentsui.State.SORT_ORDER_LAST_MODIFIED;
-import static com.android.documentsui.State.SORT_ORDER_SIZE;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.database.Cursor;
-import android.database.MergeCursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-
-import com.android.documentsui.DirectoryResult;
-import com.android.documentsui.RootCursorWrapper;
-import com.android.documentsui.Shared;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The data model for the current loaded directory.
- */
-@VisibleForTesting
-public class Model {
- private static final String TAG = "Model";
-
- private boolean mIsLoading;
- private List<UpdateListener> mUpdateListeners = new ArrayList<>();
- @Nullable private Cursor mCursor;
- private int mCursorCount;
- /** Maps Model ID to cursor positions, for looking up items by Model ID. */
- private Map<String, Integer> mPositions = new HashMap<>();
- /**
- * A sorted array of model IDs for the files currently in the Model. Sort order is determined
- * by {@link #mSortOrder}
- */
- private String mIds[] = new String[0];
- private int mSortOrder = SORT_ORDER_DISPLAY_NAME;
-
- @Nullable String info;
- @Nullable String error;
- @Nullable DocumentInfo doc;
-
- private void notifyUpdateListeners() {
- for (UpdateListener listener: mUpdateListeners) {
- listener.onModelUpdate(this);
- }
- }
-
- private void notifyUpdateListeners(Exception e) {
- for (UpdateListener listener: mUpdateListeners) {
- listener.onModelUpdateFailed(e);
- }
- }
-
- void update(DirectoryResult result) {
- if (DEBUG) Log.i(TAG, "Updating model with new result set.");
-
- if (result == null) {
- mCursor = null;
- mCursorCount = 0;
- mIds = new String[0];
- mPositions.clear();
- info = null;
- error = null;
- doc = null;
- mIsLoading = false;
- notifyUpdateListeners();
- return;
- }
-
- if (result.exception != null) {
- Log.e(TAG, "Error while loading directory contents", result.exception);
- notifyUpdateListeners(result.exception);
- return;
- }
-
- mCursor = result.cursor;
- mCursorCount = mCursor.getCount();
- mSortOrder = result.sortOrder;
- doc = result.doc;
-
- updateModelData();
-
- final Bundle extras = mCursor.getExtras();
- if (extras != null) {
- info = extras.getString(DocumentsContract.EXTRA_INFO);
- error = extras.getString(DocumentsContract.EXTRA_ERROR);
- mIsLoading = extras.getBoolean(DocumentsContract.EXTRA_LOADING, false);
- }
-
- notifyUpdateListeners();
- }
-
- @VisibleForTesting
- int getItemCount() {
- return mCursorCount;
- }
-
- /**
- * Scan over the incoming cursor data, generate Model IDs for each row, and sort the IDs
- * according to the current sort order.
- */
- private void updateModelData() {
- int[] positions = new int[mCursorCount];
- mIds = new String[mCursorCount];
- boolean[] isDirs = new boolean[mCursorCount];
- String[] displayNames = null;
- long[] longValues = null;
-
- switch (mSortOrder) {
- case SORT_ORDER_DISPLAY_NAME:
- displayNames = new String[mCursorCount];
- break;
- case SORT_ORDER_LAST_MODIFIED:
- case SORT_ORDER_SIZE:
- longValues = new long[mCursorCount];
- break;
- }
-
- String mimeType;
-
- mCursor.moveToPosition(-1);
- for (int pos = 0; pos < mCursorCount; ++pos) {
- if (!mCursor.moveToNext()) {
- Log.e(TAG, "Fail to move cursor to next pos: " + pos);
- return;
- }
- positions[pos] = pos;
-
- // Generates a Model ID for a cursor entry that refers to a document. The Model ID is a
- // unique string that can be used to identify the document referred to by the cursor.
- // If the cursor is a merged cursor over multiple authorities, then prefix the ids
- // with the authority to avoid collisions.
- if (mCursor instanceof MergeCursor) {
- mIds[pos] = getCursorString(mCursor, RootCursorWrapper.COLUMN_AUTHORITY) + "|" +
- getCursorString(mCursor, Document.COLUMN_DOCUMENT_ID);
- } else {
- mIds[pos] = getCursorString(mCursor, Document.COLUMN_DOCUMENT_ID);
- }
-
- mimeType = getCursorString(mCursor, Document.COLUMN_MIME_TYPE);
- isDirs[pos] = Document.MIME_TYPE_DIR.equals(mimeType);
-
- switch(mSortOrder) {
- case SORT_ORDER_DISPLAY_NAME:
- final String displayName = getCursorString(
- mCursor, Document.COLUMN_DISPLAY_NAME);
- displayNames[pos] = displayName;
- break;
- case SORT_ORDER_LAST_MODIFIED:
- longValues[pos] = getLastModified(mCursor);
- break;
- case SORT_ORDER_SIZE:
- longValues[pos] = getCursorLong(mCursor, Document.COLUMN_SIZE);
- break;
- }
- }
-
- switch (mSortOrder) {
- case SORT_ORDER_DISPLAY_NAME:
- binarySort(displayNames, isDirs, positions, mIds);
- break;
- case SORT_ORDER_LAST_MODIFIED:
- case SORT_ORDER_SIZE:
- binarySort(longValues, isDirs, positions, mIds);
- break;
- }
-
- // Populate the positions.
- mPositions.clear();
- for (int i = 0; i < mCursorCount; ++i) {
- mPositions.put(mIds[i], positions[i]);
- }
- }
-
- /**
- * Sorts model data. Takes three columns of index-corresponded data. The first column is the
- * sort key. Rows are sorted in ascending alphabetical order on the sort key.
- * Directories are always shown first. This code is based on TimSort.binarySort().
- *
- * @param sortKey Data is sorted in ascending alphabetical order.
- * @param isDirs Array saying whether an item is a directory or not.
- * @param positions Cursor positions to be sorted.
- * @param ids Model IDs to be sorted.
- */
- private static void binarySort(String[] sortKey, boolean[] isDirs, int[] positions, String[] ids) {
- final int count = positions.length;
- for (int start = 1; start < count; start++) {
- final int pivotPosition = positions[start];
- final String pivotValue = sortKey[start];
- final boolean pivotIsDir = isDirs[start];
- final String pivotId = ids[start];
-
- int left = 0;
- int right = start;
-
- while (left < right) {
- int mid = (left + right) >>> 1;
-
- // Directories always go in front.
- int compare = 0;
- final boolean rhsIsDir = isDirs[mid];
- if (pivotIsDir && !rhsIsDir) {
- compare = -1;
- } else if (!pivotIsDir && rhsIsDir) {
- compare = 1;
- } else {
- final String lhs = pivotValue;
- final String rhs = sortKey[mid];
- compare = Shared.compareToIgnoreCaseNullable(lhs, rhs);
- }
-
- if (compare < 0) {
- right = mid;
- } else {
- left = mid + 1;
- }
- }
-
- int n = start - left;
- switch (n) {
- case 2:
- positions[left + 2] = positions[left + 1];
- sortKey[left + 2] = sortKey[left + 1];
- isDirs[left + 2] = isDirs[left + 1];
- ids[left + 2] = ids[left + 1];
- case 1:
- positions[left + 1] = positions[left];
- sortKey[left + 1] = sortKey[left];
- isDirs[left + 1] = isDirs[left];
- ids[left + 1] = ids[left];
- break;
- default:
- System.arraycopy(positions, left, positions, left + 1, n);
- System.arraycopy(sortKey, left, sortKey, left + 1, n);
- System.arraycopy(isDirs, left, isDirs, left + 1, n);
- System.arraycopy(ids, left, ids, left + 1, n);
- }
-
- positions[left] = pivotPosition;
- sortKey[left] = pivotValue;
- isDirs[left] = pivotIsDir;
- ids[left] = pivotId;
- }
- }
-
- /**
- * Sorts model data. Takes four columns of index-corresponded data. The first column is the sort
- * key, and the second is an array of mime types. The rows are first bucketed by mime type
- * (directories vs documents) and then each bucket is sorted independently in descending
- * numerical order on the sort key. This code is based on TimSort.binarySort().
- *
- * @param sortKey Data is sorted in descending numerical order.
- * @param isDirs Array saying whether an item is a directory or not.
- * @param positions Cursor positions to be sorted.
- * @param ids Model IDs to be sorted.
- */
- private static void binarySort(
- long[] sortKey, boolean[] isDirs, int[] positions, String[] ids) {
- final int count = positions.length;
- for (int start = 1; start < count; start++) {
- final int pivotPosition = positions[start];
- final long pivotValue = sortKey[start];
- final boolean pivotIsDir = isDirs[start];
- final String pivotId = ids[start];
-
- int left = 0;
- int right = start;
-
- while (left < right) {
- int mid = ((left + right) >>> 1);
-
- // Directories always go in front.
- int compare = 0;
- final boolean rhsIsDir = isDirs[mid];
- if (pivotIsDir && !rhsIsDir) {
- compare = -1;
- } else if (!pivotIsDir && rhsIsDir) {
- compare = 1;
- } else {
- final long lhs = pivotValue;
- final long rhs = sortKey[mid];
- // Sort in descending numerical order. This matches legacy behaviour, which
- // yields largest or most recent items on top.
- compare = -Long.compare(lhs, rhs);
- }
-
- // If numerical comparison yields a tie, use document ID as a tie breaker. This
- // will yield stable results even if incoming items are continually shuffling and
- // have identical numerical sort keys. One common example of this scenario is seen
- // when sorting a set of active downloads by mod time.
- if (compare == 0) {
- compare = pivotId.compareTo(ids[mid]);
- }
-
- if (compare < 0) {
- right = mid;
- } else {
- left = mid + 1;
- }
- }
-
- int n = start - left;
- switch (n) {
- case 2:
- positions[left + 2] = positions[left + 1];
- sortKey[left + 2] = sortKey[left + 1];
- isDirs[left + 2] = isDirs[left + 1];
- ids[left + 2] = ids[left + 1];
- case 1:
- positions[left + 1] = positions[left];
- sortKey[left + 1] = sortKey[left];
- isDirs[left + 1] = isDirs[left];
- ids[left + 1] = ids[left];
- break;
- default:
- System.arraycopy(positions, left, positions, left + 1, n);
- System.arraycopy(sortKey, left, sortKey, left + 1, n);
- System.arraycopy(isDirs, left, isDirs, left + 1, n);
- System.arraycopy(ids, left, ids, left + 1, n);
- }
-
- positions[left] = pivotPosition;
- sortKey[left] = pivotValue;
- isDirs[left] = pivotIsDir;
- ids[left] = pivotId;
- }
- }
-
- /**
- * @return Timestamp for the given document. Some docs (e.g. active downloads) have a null
- * timestamp - these will be replaced with MAX_LONG so that such files get sorted to the top
- * when sorting by date.
- */
- long getLastModified(Cursor cursor) {
- long l = getCursorLong(mCursor, Document.COLUMN_LAST_MODIFIED);
- return (l == -1) ? Long.MAX_VALUE : l;
- }
-
- public @Nullable Cursor getItem(String modelId) {
- Integer pos = mPositions.get(modelId);
- if (pos == null) {
- if (DEBUG) Log.d(TAG, "Unabled to find cursor position for modelId: " + modelId);
- return null;
- }
-
- if (!mCursor.moveToPosition(pos)) {
- if (DEBUG) Log.d(TAG,
- "Unabled to move cursor to position " + pos + " for modelId: " + modelId);
- return null;
- }
-
- return mCursor;
- }
-
- boolean isEmpty() {
- return mCursorCount == 0;
- }
-
- boolean isLoading() {
- return mIsLoading;
- }
-
- List<DocumentInfo> getDocuments(Selection selection) {
- final int size = (selection != null) ? selection.size() : 0;
-
- final List<DocumentInfo> docs = new ArrayList<>(size);
- // NOTE: That as this now iterates over only final (non-provisional) selection.
- for (String modelId: selection) {
- final Cursor cursor = getItem(modelId);
- if (cursor == null) {
- Log.w(TAG, "Skipping document. Unabled to obtain cursor for modelId: " + modelId);
- continue;
- }
- docs.add(DocumentInfo.fromDirectoryCursor(cursor));
- }
- return docs;
- }
-
- public Uri getItemUri(String modelId) {
- final Cursor cursor = getItem(modelId);
- return DocumentInfo.getUri(cursor);
- }
-
- void addUpdateListener(UpdateListener listener) {
- mUpdateListeners.add(listener);
- }
-
- void removeUpdateListener(UpdateListener listener) {
- mUpdateListeners.remove(listener);
- }
-
- static interface UpdateListener {
- /**
- * Called when a successful update has occurred.
- */
- void onModelUpdate(Model model);
-
- /**
- * Called when an update has been attempted but failed.
- */
- void onModelUpdateFailed(Exception e);
- }
-
- /**
- * @return An ordered array of model IDs representing the documents in the model. It is sorted
- * according to the current sort order, which was set by the last model update.
- */
- public String[] getModelIds() {
- return mIds;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
deleted file mode 100644
index 2c1a221..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.State.MODE_GRID;
-import static com.android.documentsui.State.MODE_LIST;
-import static com.android.documentsui.model.DocumentInfo.getCursorInt;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.database.Cursor;
-import android.provider.DocumentsContract.Document;
-import android.util.Log;
-import android.view.ViewGroup;
-
-import com.android.documentsui.State;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Adapts from dirlist.Model to something RecyclerView understands.
- */
-final class ModelBackedDocumentsAdapter extends DocumentsAdapter {
-
- private static final String TAG = "ModelBackedDocuments";
- public static final int ITEM_TYPE_DOCUMENT = 1;
- public static final int ITEM_TYPE_DIRECTORY = 2;
-
- // Provides access to information needed when creating and view holders. This
- // isn't an ideal pattern (more transitive dependency stuff) but good enough for now.
- private final Environment mEnv;
- private final IconHelper mIconHelper; // a transitive dependency of the holders.
-
- /**
- * An ordered list of model IDs. This is the data structure that determines what shows up in
- * the UI, and where.
- */
- private List<String> mModelIds = new ArrayList<>();
-
- // List of files that have been deleted. Some transient directory updates
- // may happen while files are being deleted. During this time we don't
- // want once-hidden files to be re-shown. We only remove
- // items from this list when we get a model update where the model
- // does not contain a corresponding id. This ensures hidden entries
- // don't momentarily re-appear if we get intermediate updates from
- // the file system.
- private Set<String> mHiddenIds = new HashSet<>();
-
- public ModelBackedDocumentsAdapter(Environment env, IconHelper iconHelper) {
- mEnv = env;
- mIconHelper = iconHelper;
- }
-
- @Override
- public DocumentHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- DocumentHolder holder = null;
- final State state = mEnv.getDisplayState();
- switch (state.derivedMode) {
- case MODE_GRID:
- switch (viewType) {
- case ITEM_TYPE_DIRECTORY:
- holder = new GridDirectoryHolder(mEnv.getContext(), parent);
- break;
- case ITEM_TYPE_DOCUMENT:
- holder = new GridDocumentHolder(mEnv.getContext(), parent, mIconHelper);
- break;
- default:
- throw new IllegalStateException("Unsupported layout type.");
- }
- break;
- case MODE_LIST:
- holder = new ListDocumentHolder(mEnv.getContext(), parent, mIconHelper);
- break;
- default:
- throw new IllegalStateException("Unsupported layout mode.");
- }
-
- mEnv.initDocumentHolder(holder);
- return holder;
- }
-
- @Override
- public void onBindViewHolder(DocumentHolder holder, int position, List<Object> payload) {
- if (payload.contains(SELECTION_CHANGED_MARKER)) {
- final boolean selected = mEnv.isSelected(mModelIds.get(position));
- holder.setSelected(selected, true);
- } else {
- onBindViewHolder(holder, position);
- }
- }
-
- @Override
- public void onBindViewHolder(DocumentHolder holder, int position) {
- String modelId = mModelIds.get(position);
- Cursor cursor = mEnv.getModel().getItem(modelId);
- holder.bind(cursor, modelId, mEnv.getDisplayState());
-
- final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
-
- boolean enabled = mEnv.isDocumentEnabled(docMimeType, docFlags);
- boolean selected = mEnv.isSelected(modelId);
- if (!enabled) {
- assert(!selected);
- }
- holder.setEnabled(enabled);
- holder.setSelected(mEnv.isSelected(modelId), false);
-
- mEnv.onBindDocumentHolder(holder, cursor);
- }
-
- @Override
- public int getItemCount() {
- return mModelIds.size();
- }
-
- @Override
- public void onModelUpdate(Model model) {
- if (DEBUG && mHiddenIds.size() > 0) {
- Log.d(TAG, "Updating model with hidden ids: " + mHiddenIds);
- }
-
- String[] modelIds = model.getModelIds();
- mModelIds = new ArrayList<>(modelIds.length);
- for (String id : modelIds) {
- if (!mHiddenIds.contains(id)) {
- mModelIds.add(id);
- } else {
- if (DEBUG) Log.d(TAG, "Omitting hidden id from model during update: " + id);
- }
- }
-
- // Finally remove any hidden ids that aren't present in the model.
- // This assumes that model updates represent a complete set of files.
- mHiddenIds.retainAll(mModelIds);
- }
-
- @Override
- public void onModelUpdateFailed(Exception e) {
- Log.w(TAG, "Model update failed.", e);
- mModelIds.clear();
- }
-
- @Override
- public String getModelId(int adapterPosition) {
- return mModelIds.get(adapterPosition);
- }
-
- @Override
- public List<String> getModelIds() {
- return mModelIds;
- }
-
- @Override
- public int getItemViewType(int position) {
- return isDirectory(mEnv.getModel(), position)
- ? ITEM_TYPE_DIRECTORY
- : ITEM_TYPE_DOCUMENT;
- }
-
- @Override
- public void onItemSelectionChanged(String id) {
- int position = mModelIds.indexOf(id);
-
- if (position >= 0) {
- notifyItemChanged(position, SELECTION_CHANGED_MARKER);
- } else {
- Log.w(TAG, "Item change notification received for unknown item: " + id);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java
deleted file mode 100644
index eeefac0..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.IntDef;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-
-import com.android.documentsui.Events.InputEvent;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * MultiSelectManager provides support traditional multi-item selection support to RecyclerView.
- * Additionally it can be configured to restrict selection to a single element, @see
- * #setSelectMode.
- */
-public final class MultiSelectManager {
-
- @IntDef(flag = true, value = {
- MODE_MULTIPLE,
- MODE_SINGLE
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface SelectionMode {}
- public static final int MODE_MULTIPLE = 0;
- public static final int MODE_SINGLE = 1;
-
- private static final String TAG = "MultiSelectManager";
-
- private final Selection mSelection = new Selection();
-
- private final DocumentsAdapter mAdapter;
- private final List<MultiSelectManager.Callback> mCallbacks = new ArrayList<>(1);
-
- private Range mRanger;
- private boolean mSingleSelect;
-
- /**
- * @param mode Selection single or multiple selection mode.
- * @param initialSelection selection state probably preserved in external state.
- */
- public MultiSelectManager(
- final RecyclerView recyclerView,
- DocumentsAdapter adapter,
- @SelectionMode int mode,
- @Nullable Selection initialSelection) {
-
- this(adapter, mode, initialSelection);
- }
-
- /**
- * Constructs a new instance with {@code adapter} and {@code helper}.
- * @param runtimeSelectionEnvironment
- * @hide
- */
- @VisibleForTesting
- MultiSelectManager(
- DocumentsAdapter adapter,
- @SelectionMode int mode,
- @Nullable Selection initialSelection) {
-
- assert(adapter != null);
-
- mAdapter = adapter;
-
- mSingleSelect = mode == MODE_SINGLE;
- if (initialSelection != null) {
- mSelection.copyFrom(initialSelection);
- }
-
- mAdapter.registerAdapterDataObserver(
- new RecyclerView.AdapterDataObserver() {
-
- private List<String> mModelIds;
-
- @Override
- public void onChanged() {
- mModelIds = mAdapter.getModelIds();
-
- // Update the selection to remove any disappeared IDs.
- mSelection.cancelProvisionalSelection();
- mSelection.intersect(mModelIds);
- }
-
- @Override
- public void onItemRangeChanged(
- int startPosition, int itemCount, Object payload) {
- // No change in position. Ignoring.
- }
-
- @Override
- public void onItemRangeInserted(int startPosition, int itemCount) {
- mSelection.cancelProvisionalSelection();
- }
-
- @Override
- public void onItemRangeRemoved(int startPosition, int itemCount) {
- assert(startPosition >= 0);
- assert(itemCount > 0);
-
- mSelection.cancelProvisionalSelection();
- // Remove any disappeared IDs from the selection.
- mSelection.intersect(mModelIds);
- }
-
- @Override
- public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
- throw new UnsupportedOperationException();
- }
- });
- }
-
- void bindContoller(BandController controller) {
- // Provides BandController with access to private mSelection state.
- controller.bindSelection(mSelection);
- }
-
- /**
- * Adds {@code callback} such that it will be notified when {@code MultiSelectManager}
- * events occur.
- *
- * @param callback
- */
- public void addCallback(MultiSelectManager.Callback callback) {
- mCallbacks.add(callback);
- }
-
- public boolean hasSelection() {
- return !mSelection.isEmpty();
- }
-
- /**
- * Returns a Selection object that provides a live view
- * on the current selection.
- *
- * @see #getSelection(Selection) on how to get a snapshot
- * of the selection that will not reflect future changes
- * to selection.
- *
- * @return The current selection.
- */
- public Selection getSelection() {
- return mSelection;
- }
-
- /**
- * Updates {@code dest} to reflect the current selection.
- * @param dest
- *
- * @return The Selection instance passed in, for convenience.
- */
- public Selection getSelection(Selection dest) {
- dest.copyFrom(mSelection);
- return dest;
- }
-
- /**
- * Returns an unordered array of selected positions, including any
- * provisional selection currently in effect.
- */
- public void restoreSelection(Selection other) {
- setItemsSelected(other.mSelection, true);
- // NOTE: We intentionally don't restore provisional selection. It's provisional.
- }
-
- /**
- * Sets the selected state of the specified items. Note that the callback will NOT
- * be consulted to see if an item can be selected.
- *
- * @param ids
- * @param selected
- * @return
- */
- public boolean setItemsSelected(Iterable<String> ids, boolean selected) {
- boolean changed = false;
- for (String id: ids) {
- boolean itemChanged = selected ? mSelection.add(id) : mSelection.remove(id);
- if (itemChanged) {
- notifyItemStateChanged(id, selected);
- }
- changed |= itemChanged;
- }
- notifySelectionChanged();
- return changed;
- }
-
- /**
- * Clears the selection and notifies (even if nothing changes).
- */
- public void clearSelection() {
- clearSelectionQuietly();
- notifySelectionChanged();
- }
-
- /**
- * Clears the selection, without notifying selection listeners. UI elements still need to be
- * notified about state changes so that they can update their appearance.
- */
- private void clearSelectionQuietly() {
- mRanger = null;
-
- if (!hasSelection()) {
- return;
- }
-
- Selection oldSelection = getSelection(new Selection());
- mSelection.clear();
-
- for (String id: oldSelection.mSelection) {
- notifyItemStateChanged(id, false);
- }
- for (String id: oldSelection.mProvisionalSelection) {
- notifyItemStateChanged(id, false);
- }
- }
-
- @VisibleForTesting
- void onLongPress(InputEvent input) {
- if (DEBUG) Log.d(TAG, "Handling long press event.");
-
- if (!input.isOverItem()) {
- if (DEBUG) Log.i(TAG, "Cannot handle tap. No adapter position available.");
- }
-
- handleAdapterEvent(input);
- }
-
- boolean onSingleTapUp(InputEvent input) {
- if (DEBUG) Log.d(TAG, "Processing tap event.");
- if (!hasSelection()) {
- // No selection active - do nothing.
- return false;
- }
-
- if (!input.isOverItem()) {
- if (DEBUG) Log.d(TAG, "Activity has no position. Canceling selection.");
- clearSelection();
- return false;
- }
-
- handleAdapterEvent(input);
- return true;
- }
-
- /**
- * Handles a change caused by a click on the item with the given position. If the Shift key is
- * held down, this performs a range select; otherwise, it simply toggles the item's selection
- * state.
- */
- private void handleAdapterEvent(InputEvent input) {
- if (mRanger != null && input.isShiftKeyDown()) {
- mRanger.snapSelection(input.getItemPosition());
-
- // We're being lazy here notifying even when something might not have changed.
- // To make this more correct, we'd need to update the Ranger class to return
- // information about what has changed.
- notifySelectionChanged();
- } else {
- int position = input.getItemPosition();
- toggleSelection(position);
- setSelectionRangeBegin(position);
- }
- }
-
- /**
- * A convenience method for toggling selection by adapter position.
- *
- * @param position Adapter position to toggle.
- */
- private void toggleSelection(int position) {
- // Position may be special "no position" during certain
- // transitional phases. If so, skip handling of the event.
- if (position == RecyclerView.NO_POSITION) {
- if (DEBUG) Log.d(TAG, "Ignoring toggle for element with no position.");
- return;
- }
- String id = mAdapter.getModelId(position);
- if (id != null) {
- toggleSelection(id);
- }
- }
-
- /**
- * Toggles selection on the item with the given model ID.
- *
- * @param modelId
- */
- public void toggleSelection(String modelId) {
- assert(modelId != null);
-
- boolean changed = false;
- if (mSelection.contains(modelId)) {
- changed = attemptDeselect(modelId);
- } else {
- changed = attemptSelect(modelId);
- }
-
- if (changed) {
- notifySelectionChanged();
- }
- }
-
- /**
- * Starts a range selection. If a range selection is already active, this will start a new range
- * selection (which will reset the range anchor).
- *
- * @param pos The anchor position for the selection range.
- */
- void startRangeSelection(int pos) {
- attemptSelect(mAdapter.getModelId(pos));
- setSelectionRangeBegin(pos);
- }
-
- /**
- * Sets the end point for the current range selection, started by a call to
- * {@link #startRangeSelection(int)}. This function should only be called when a range selection
- * is active (see {@link #isRangeSelectionActive()}. Items in the range [anchor, end] will be
- * selected.
- *
- * @param pos The new end position for the selection range.
- */
- void snapRangeSelection(int pos) {
- assert(mRanger != null);
-
- mRanger.snapSelection(pos);
- notifySelectionChanged();
- }
-
- /**
- * Stops an in-progress range selection.
- */
- void endRangeSelection() {
- mRanger = null;
- }
-
- /**
- * @return Whether or not there is a current range selection active.
- */
- boolean isRangeSelectionActive() {
- return mRanger != null;
- }
-
- /**
- * Sets the magic location at which a selection range begins (the selection anchor). This value
- * is consulted when determining how to extend, and modify selection ranges. Calling this when a
- * range selection is active will reset the range selection.
- *
- * @throws IllegalStateException if {@code position} is not already be selected
- * @param position
- */
- void setSelectionRangeBegin(int position) {
- if (position == RecyclerView.NO_POSITION) {
- return;
- }
-
- if (mSelection.contains(mAdapter.getModelId(position))) {
- mRanger = new Range(position);
- }
- }
-
- /**
- * Try to set selection state for all elements in range. Not that callbacks can cancel selection
- * of specific items, so some or even all items may not reflect the desired state after the
- * update is complete.
- *
- * @param begin Adapter position for range start (inclusive).
- * @param end Adapter position for range end (inclusive).
- * @param selected New selection state.
- */
- private void updateRange(int begin, int end, boolean selected) {
- assert(end >= begin);
- for (int i = begin; i <= end; i++) {
- String id = mAdapter.getModelId(i);
- if (id == null) {
- continue;
- }
-
- if (selected) {
- boolean canSelect = notifyBeforeItemStateChange(id, true);
- if (canSelect) {
- if (mSingleSelect && hasSelection()) {
- clearSelectionQuietly();
- }
- selectAndNotify(id);
- }
- } else {
- attemptDeselect(id);
- }
- }
- }
-
- /**
- * @param modelId
- * @return True if the update was applied.
- */
- private boolean selectAndNotify(String modelId) {
- boolean changed = mSelection.add(modelId);
- if (changed) {
- notifyItemStateChanged(modelId, true);
- }
- return changed;
- }
-
- /**
- * @param id
- * @return True if the update was applied.
- */
- private boolean attemptDeselect(String id) {
- assert(id != null);
- if (notifyBeforeItemStateChange(id, false)) {
- mSelection.remove(id);
- notifyItemStateChanged(id, false);
- if (DEBUG) Log.d(TAG, "Selection after deselect: " + mSelection);
- return true;
- } else {
- if (DEBUG) Log.d(TAG, "Select cancelled by listener.");
- return false;
- }
- }
-
- /**
- * @param id
- * @return True if the update was applied.
- */
- private boolean attemptSelect(String id) {
- assert(id != null);
- boolean canSelect = notifyBeforeItemStateChange(id, true);
- if (!canSelect) {
- return false;
- }
- if (mSingleSelect && hasSelection()) {
- clearSelectionQuietly();
- }
-
- selectAndNotify(id);
- return true;
- }
-
- boolean notifyBeforeItemStateChange(String id, boolean nextState) {
- int lastListener = mCallbacks.size() - 1;
- for (int i = lastListener; i > -1; i--) {
- if (!mCallbacks.get(i).onBeforeItemStateChange(id, nextState)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Notifies registered listeners when the selection status of a single item
- * (identified by {@code position}) changes.
- */
- void notifyItemStateChanged(String id, boolean selected) {
- assert(id != null);
- int lastListener = mCallbacks.size() - 1;
- for (int i = lastListener; i > -1; i--) {
- mCallbacks.get(i).onItemStateChanged(id, selected);
- }
- mAdapter.onItemSelectionChanged(id);
- }
-
- /**
- * Notifies registered listeners when the selection has changed. This
- * notification should be sent only once a full series of changes
- * is complete, e.g. clearingSelection, or updating the single
- * selection from one item to another.
- */
- void notifySelectionChanged() {
- int lastListener = mCallbacks.size() - 1;
- for (int i = lastListener; i > -1; i--) {
- mCallbacks.get(i).onSelectionChanged();
- }
- }
-
- /**
- * Class providing support for managing range selections.
- */
- private final class Range {
- private static final int UNDEFINED = -1;
-
- final int mBegin;
- int mEnd = UNDEFINED;
-
- public Range(int begin) {
- if (DEBUG) Log.d(TAG, "New Ranger created beginning @ " + begin);
- mBegin = begin;
- }
-
- private void snapSelection(int position) {
- assert(mRanger != null);
- assert(position != RecyclerView.NO_POSITION);
-
- if (mEnd == UNDEFINED || mEnd == mBegin) {
- // Reset mEnd so it can be established in establishRange.
- mEnd = UNDEFINED;
- establishRange(position);
- } else {
- reviseRange(position);
- }
- }
-
- private void establishRange(int position) {
- assert(mRanger.mEnd == UNDEFINED);
-
- if (position == mBegin) {
- mEnd = position;
- }
-
- if (position > mBegin) {
- updateRange(mBegin + 1, position, true);
- } else if (position < mBegin) {
- updateRange(position, mBegin - 1, true);
- }
-
- mEnd = position;
- }
-
- private void reviseRange(int position) {
- assert(mEnd != UNDEFINED);
- assert(mBegin != mEnd);
-
- if (position == mEnd) {
- if (DEBUG) Log.i(TAG, "Skipping no-op revision click on mEndRange.");
- }
-
- if (mEnd > mBegin) {
- reviseAscendingRange(position);
- } else if (mEnd < mBegin) {
- reviseDescendingRange(position);
- }
- // the "else" case is covered by checkState at beginning of method.
-
- mEnd = position;
- }
-
- /**
- * Updates an existing ascending seleciton.
- * @param position
- */
- private void reviseAscendingRange(int position) {
- // Reducing or reversing the range....
- if (position < mEnd) {
- if (position < mBegin) {
- updateRange(mBegin + 1, mEnd, false);
- updateRange(position, mBegin -1, true);
- } else {
- updateRange(position + 1, mEnd, false);
- }
- }
-
- // Extending the range...
- else if (position > mEnd) {
- updateRange(mEnd + 1, position, true);
- }
- }
-
- private void reviseDescendingRange(int position) {
- // Reducing or reversing the range....
- if (position > mEnd) {
- if (position > mBegin) {
- updateRange(mEnd, mBegin - 1, false);
- updateRange(mBegin + 1, position, true);
- } else {
- updateRange(mEnd, position - 1, false);
- }
- }
-
- // Extending the range...
- else if (position < mEnd) {
- updateRange(position, mEnd - 1, true);
- }
- }
- }
-
- /**
- * Object representing the current selection. Provides read only access
- * public access, and private write access.
- */
- public static final class Selection implements Iterable<String>, Parcelable {
-
- // This class tracks selected items by managing two sets: the saved selection, and the total
- // selection. Saved selections are those which have been completed by tapping an item or by
- // completing a band select operation. Provisional selections are selections which have been
- // temporarily created by an in-progress band select operation (once the user releases the
- // mouse button during a band select operation, the selected items become saved). The total
- // selection is the combination of both the saved selection and the provisional
- // selection. Tracking both separately is necessary to ensure that saved selections do not
- // become deselected when they are removed from the provisional selection; for example, if
- // item A is tapped (and selected), then an in-progress band select covers A then uncovers
- // A, A should still be selected as it has been saved. To ensure this behavior, the saved
- // selection must be tracked separately.
- private final Set<String> mSelection;
- private final Set<String> mProvisionalSelection;
- private String mDirectoryKey;
-
- public Selection() {
- mSelection = new HashSet<String>();
- mProvisionalSelection = new HashSet<String>();
- }
-
- /**
- * Used by CREATOR.
- */
- private Selection(String directoryKey, Set<String> selection) {
- mDirectoryKey = directoryKey;
- mSelection = selection;
- mProvisionalSelection = new HashSet<String>();
- }
-
- /**
- * @param id
- * @return true if the position is currently selected.
- */
- public boolean contains(@Nullable String id) {
- return mSelection.contains(id) || mProvisionalSelection.contains(id);
- }
-
- /**
- * Returns an {@link Iterator} that iterators over the selection, *excluding*
- * any provisional selection.
- *
- * {@inheritDoc}
- */
- @Override
- public Iterator<String> iterator() {
- return mSelection.iterator();
- }
-
- /**
- * @return size of the selection including both final and provisional selected items.
- */
- public int size() {
- return mSelection.size() + mProvisionalSelection.size();
- }
-
- /**
- * @return true if the selection is empty.
- */
- public boolean isEmpty() {
- return mSelection.isEmpty() && mProvisionalSelection.isEmpty();
- }
-
- /**
- * Sets the provisional selection, which is a temporary selection that can be saved,
- * canceled, or adjusted at a later time. When a new provision selection is applied, the old
- * one (if it exists) is abandoned.
- * @return Map of ids added or removed. Added ids have a value of true, removed are false.
- */
- @VisibleForTesting
- protected Map<String, Boolean> setProvisionalSelection(Set<String> newSelection) {
- Map<String, Boolean> delta = new HashMap<>();
-
- for (String id: mProvisionalSelection) {
- // Mark each item that used to be in the selection but is unsaved and not in the new
- // provisional selection.
- if (!newSelection.contains(id) && !mSelection.contains(id)) {
- delta.put(id, false);
- }
- }
-
- for (String id: mSelection) {
- // Mark each item that used to be in the selection but is unsaved and not in the new
- // provisional selection.
- if (!newSelection.contains(id)) {
- delta.put(id, false);
- }
- }
-
- for (String id: newSelection) {
- // Mark each item that was not previously in the selection but is in the new
- // provisional selection.
- if (!mSelection.contains(id) && !mProvisionalSelection.contains(id)) {
- delta.put(id, true);
- }
- }
-
- // Now, iterate through the changes and actually add/remove them to/from the current
- // selection. This could not be done in the previous loops because changing the size of
- // the selection mid-iteration changes iteration order erroneously.
- for (Map.Entry<String, Boolean> entry: delta.entrySet()) {
- String id = entry.getKey();
- if (entry.getValue()) {
- mProvisionalSelection.add(id);
- } else {
- mProvisionalSelection.remove(id);
- }
- }
-
- return delta;
- }
-
- /**
- * Saves the existing provisional selection. Once the provisional selection is saved,
- * subsequent provisional selections which are different from this existing one cannot
- * cause items in this existing provisional selection to become deselected.
- */
- @VisibleForTesting
- protected void applyProvisionalSelection() {
- mSelection.addAll(mProvisionalSelection);
- mProvisionalSelection.clear();
- }
-
- /**
- * Abandons the existing provisional selection so that all items provisionally selected are
- * now deselected.
- */
- @VisibleForTesting
- void cancelProvisionalSelection() {
- mProvisionalSelection.clear();
- }
-
- /** @hide */
- @VisibleForTesting
- boolean add(String id) {
- if (!mSelection.contains(id)) {
- mSelection.add(id);
- return true;
- }
- return false;
- }
-
- /** @hide */
- @VisibleForTesting
- boolean remove(String id) {
- if (mSelection.contains(id)) {
- mSelection.remove(id);
- return true;
- }
- return false;
- }
-
- public void clear() {
- mSelection.clear();
- }
-
- /**
- * Trims this selection to be the intersection of itself with the set of given IDs.
- */
- public void intersect(Collection<String> ids) {
- mSelection.retainAll(ids);
- mProvisionalSelection.retainAll(ids);
- }
-
- @VisibleForTesting
- void copyFrom(Selection source) {
- mSelection.clear();
- mSelection.addAll(source.mSelection);
-
- mProvisionalSelection.clear();
- mProvisionalSelection.addAll(source.mProvisionalSelection);
- }
-
- @Override
- public String toString() {
- if (size() <= 0) {
- return "size=0, items=[]";
- }
-
- StringBuilder buffer = new StringBuilder(size() * 28);
- buffer.append("Selection{")
- .append("applied{size=" + mSelection.size())
- .append(", entries=" + mSelection)
- .append("}, provisional{size=" + mProvisionalSelection.size())
- .append(", entries=" + mProvisionalSelection)
- .append("}}");
- return buffer.toString();
- }
-
- @Override
- public int hashCode() {
- return mSelection.hashCode() ^ mProvisionalSelection.hashCode();
- }
-
- @Override
- public boolean equals(Object that) {
- if (this == that) {
- return true;
- }
-
- if (!(that instanceof Selection)) {
- return false;
- }
-
- return mSelection.equals(((Selection) that).mSelection) &&
- mProvisionalSelection.equals(((Selection) that).mProvisionalSelection);
- }
-
- /**
- * Sets the state key for this selection, which allows us to match selections
- * to particular states (of DirectoryFragment). Basically this lets us avoid
- * loading a persisted selection in the wrong directory.
- */
- public void setDirectoryKey(String key) {
- mDirectoryKey = key;
- }
-
- /**
- * Sets the state key for this selection, which allows us to match selections
- * to particular states (of DirectoryFragment). Basically this lets us avoid
- * loading a persisted selection in the wrong directory.
- */
- public boolean hasDirectoryKey(String key) {
- return key.equals(mDirectoryKey);
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(mDirectoryKey);
- dest.writeStringList(new ArrayList<>(mSelection));
- // We don't include provisional selection since it is
- // typically coupled to some other runtime state (like a band).
- }
-
- public static final ClassLoaderCreator<Selection> CREATOR =
- new ClassLoaderCreator<Selection>() {
- @Override
- public Selection createFromParcel(Parcel in) {
- return createFromParcel(in, null);
- }
-
- @Override
- public Selection createFromParcel(Parcel in, ClassLoader loader) {
- String directoryKey = in.readString();
-
- ArrayList<String> selected = new ArrayList<>();
- in.readStringList(selected);
-
- return new Selection(directoryKey, new HashSet<String>(selected));
- }
-
- @Override
- public Selection[] newArray(int size) {
- return new Selection[size];
- }
- };
- }
-
- public interface Callback {
- /**
- * Called when an item is selected or unselected while in selection mode.
- *
- * @param position Adapter position of the item that was checked or unchecked
- * @param selected <code>true</code> if the item is now selected, <code>false</code>
- * if the item is now unselected.
- */
- public void onItemStateChanged(String id, boolean selected);
-
- /**
- * Called prior to an item changing state. Callbacks can cancel
- * the change at {@code position} by returning {@code false}.
- *
- * @param id Adapter position of the item that was checked or unchecked
- * @param selected <code>true</code> if the item is to be selected, <code>false</code>
- * if the item is to be unselected.
- */
- public boolean onBeforeItemStateChange(String id, boolean selected);
-
- /**
- * Called immediately after completion of any set of changes.
- */
- public void onSelectionChanged();
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
deleted file mode 100644
index 73aa366..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.Shared.TAG;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-
-import com.android.documentsui.BaseActivity;
-import com.android.documentsui.DocumentsApplication;
-import com.android.documentsui.Metrics;
-import com.android.documentsui.R;
-import com.android.documentsui.Shared;
-import com.android.documentsui.Snackbars;
-import com.android.documentsui.model.DocumentInfo;
-
-/**
- * Dialog to rename file or directory.
- */
-public class RenameDocumentFragment extends DialogFragment {
- private static final String TAG_RENAME_DOCUMENT = "rename_document";
- private DocumentInfo mDocument;
- private EditText mEditText;
-
- public static void show(FragmentManager fm, DocumentInfo document) {
- final RenameDocumentFragment dialog = new RenameDocumentFragment();
- dialog.mDocument = document;
- dialog.show(fm, TAG_RENAME_DOCUMENT);
- }
-
- /**
- * Creates the dialog UI.
- * @param savedInstanceState
- * @return
- */
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- Context context = getActivity();
- AlertDialog.Builder builder = new AlertDialog.Builder(context);
- LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
- View view = dialogInflater.inflate(R.layout.dialog_file_name, null, false);
-
- mEditText = (EditText) view.findViewById(android.R.id.text1);
- builder.setTitle(R.string.menu_rename);
- builder.setView(view);
-
- builder.setPositiveButton(
- android.R.string.ok,
- new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- renameDocuments(mEditText.getText().toString());
- }
- });
-
- builder.setNegativeButton(android.R.string.cancel, null);
-
- final AlertDialog dialog = builder.create();
-
- // Workaround for the problem - virtual keyboard doesn't show on the phone.
- Shared.ensureKeyboardPresent(context, dialog);
-
- mEditText.setOnEditorActionListener(
- new OnEditorActionListener() {
- @Override
- public boolean onEditorAction(
- TextView view, int actionId, @Nullable KeyEvent event) {
- if ((actionId == EditorInfo.IME_ACTION_DONE) || (event != null
- && event.getKeyCode() == KeyEvent.KEYCODE_ENTER
- && event.hasNoModifiers())) {
- renameDocuments(mEditText.getText().toString());
- dialog.dismiss();
- return true;
- }
- return false;
- }
- });
- return dialog;
- }
-
- /**
- * Sets/Restores the data.
- * @param savedInstanceState
- * @return
- */
- @Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
-
- if(savedInstanceState == null) {
- // Fragment created for the first time, we set the text.
- // mDocument value was set in show
- mEditText.setText(mDocument.displayName);
- }
- else {
- // Fragment restored, text was restored automatically.
- // mDocument value needs to be restored.
- mDocument = savedInstanceState.getParcelable(Shared.EXTRA_DOC);
- }
- // Do selection in both cases, because we cleared it.
- selectFileName(mEditText);
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- // Clear selection before storing state and restore it manually,
- // because otherwise after rotation selection is displayed with cut/copy menu visible :/
- clearFileNameSelection(mEditText);
-
- super.onSaveInstanceState(outState);
-
- outState.putParcelable(Shared.EXTRA_DOC, mDocument);
- }
-
- /**
- * Validates if string is a proper document name.
- * Checks if string is not empty. More rules might be added later.
- * @param docName string representing document name
- * @returns true if string is a valid name.
- **/
- private boolean isValidDocumentName(String docName) {
- return !docName.isEmpty();
- }
-
- /**
- * Fills text field with the file name and selects the name without extension.
- *
- * @param editText text field to be filled
- */
- private void selectFileName(EditText editText) {
- String text = editText.getText().toString();
- int separatorIndex = text.indexOf(".");
- editText.setSelection(0,
- (separatorIndex == -1 || mDocument.isDirectory()) ? text.length() : separatorIndex);
- }
-
- /**
- * Clears selection in text field.
- *
- * @param editText text field to be cleared.
- */
- private void clearFileNameSelection(EditText editText) {
- editText.setSelection(0, 0);
- }
-
- private void renameDocuments(String newDisplayName) {
- BaseActivity activity = (BaseActivity) getActivity();
-
- if (isValidDocumentName(newDisplayName)) {
- new RenameDocumentsTask(activity, newDisplayName).execute(mDocument);
- } else {
- Log.w(TAG, "Failed to rename file - invalid name:" + newDisplayName);
- Snackbars.makeSnackbar(getActivity(), R.string.rename_error,
- Snackbar.LENGTH_SHORT).show();
- }
-
- }
-
- private class RenameDocumentsTask extends AsyncTask<DocumentInfo, Void, DocumentInfo> {
- private final BaseActivity mActivity;
- private final String mNewDisplayName;
-
- public RenameDocumentsTask(BaseActivity activity, String newDisplayName) {
- mActivity = activity;
- mNewDisplayName = newDisplayName;
- }
-
- @Override
- protected void onPreExecute() {
- mActivity.setPending(true);
- }
-
- @Override
- protected DocumentInfo doInBackground(DocumentInfo... document) {
- assert(document.length == 1);
- final ContentResolver resolver = mActivity.getContentResolver();
- ContentProviderClient client = null;
-
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(
- resolver, document[0].derivedUri.getAuthority());
- Uri newUri = DocumentsContract.renameDocument(
- client, document[0].derivedUri, mNewDisplayName);
- return DocumentInfo.fromUri(resolver, newUri);
- } catch (Exception e) {
- Log.w(TAG, "Failed to rename file", e);
- return null;
- } finally {
- ContentProviderClient.releaseQuietly(client);
- }
- }
-
- @Override
- protected void onPostExecute(DocumentInfo result) {
- if (result != null) {
- Metrics.logRenameFileOperation(getContext());
- } else {
- Snackbars.makeSnackbar(mActivity, R.string.rename_error, Snackbar.LENGTH_SHORT)
- .show();
- Metrics.logRenameFileError(getContext());
- }
- mActivity.setPending(false);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapper.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapper.java
deleted file mode 100644
index 55a6de7..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapper.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView.AdapterDataObserver;
-import android.view.ViewGroup;
-import android.widget.Space;
-
-import com.android.documentsui.R;
-import com.android.documentsui.State;
-
-import java.util.List;
-
-/**
- * Adapter wrapper that inserts a sort of line break item between directories and regular files.
- * Only needs to be used in GRID mode...at this time.
- */
-final class SectionBreakDocumentsAdapterWrapper extends DocumentsAdapter {
-
- private static final String TAG = "SectionBreakDocumentsAdapterWrapper";
- private static final int ITEM_TYPE_SECTION_BREAK = Integer.MAX_VALUE;
-
- private final Environment mEnv;
- private final DocumentsAdapter mDelegate;
-
- private int mBreakPosition = -1;
-
- SectionBreakDocumentsAdapterWrapper(Environment environment, DocumentsAdapter delegate) {
- mEnv = environment;
- mDelegate = delegate;
-
- // Relay events published by our delegate to our listeners (presumably RecyclerView)
- // with adjusted positions.
- mDelegate.registerAdapterDataObserver(new EventRelay());
- }
-
- public GridLayoutManager.SpanSizeLookup createSpanSizeLookup() {
- return new GridLayoutManager.SpanSizeLookup() {
- @Override
- public int getSpanSize(int position) {
- // Make layout whitespace span the grid. This has the effect of breaking
- // grid rows whenever layout whitespace is encountered.
- if (getItemViewType(position) == ITEM_TYPE_SECTION_BREAK) {
- return mEnv.getColumnCount();
- } else {
- return 1;
- }
- }
- };
- }
-
- @Override
- public DocumentHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- if (viewType == ITEM_TYPE_SECTION_BREAK) {
- return new EmptyDocumentHolder(mEnv.getContext());
- } else {
- return mDelegate.createViewHolder(parent, viewType);
- }
- }
-
- @Override
- public void onBindViewHolder(DocumentHolder holder, int p, List<Object> payload) {
- if (holder.getItemViewType() != ITEM_TYPE_SECTION_BREAK) {
- mDelegate.onBindViewHolder(holder, toDelegatePosition(p), payload);
- } else {
- ((EmptyDocumentHolder)holder).bind(mEnv.getDisplayState());
- }
- }
-
- @Override
- public void onBindViewHolder(DocumentHolder holder, int p) {
- if (holder.getItemViewType() != ITEM_TYPE_SECTION_BREAK) {
- mDelegate.onBindViewHolder(holder, toDelegatePosition(p));
- } else {
- ((EmptyDocumentHolder)holder).bind(mEnv.getDisplayState());
- }
- }
-
- @Override
- public int getItemCount() {
- return mBreakPosition == -1
- ? mDelegate.getItemCount()
- : mDelegate.getItemCount() + 1;
- }
-
- @Override
- public void onModelUpdate(Model model) {
- mDelegate.onModelUpdate(model);
- mBreakPosition = -1;
-
- // Walk down the list of IDs till we encounter something that's not a directory, and
- // insert a whitespace element - this introduces a visual break in the grid between
- // folders and documents.
- // TODO: This code makes assumptions about the model, namely, that it performs a
- // bucketed sort where directories will always be ordered before other files. CBB.
- List<String> modelIds = mDelegate.getModelIds();
- for (int i = 0; i < modelIds.size(); i++) {
- if (!isDirectory(model, i)) {
- // If the break is the first thing in the list, then there are actually no
- // directories. In that case, don't insert a break at all.
- if (i > 0) {
- mBreakPosition = i;
- }
- break;
- }
- }
- }
-
- @Override
- public void onModelUpdateFailed(Exception e) {
- mDelegate.onModelUpdateFailed(e);
- }
-
- @Override
- public int getItemViewType(int p) {
- if (p == mBreakPosition) {
- return ITEM_TYPE_SECTION_BREAK;
- } else {
- return mDelegate.getItemViewType(toDelegatePosition(p));
- }
- }
-
- /**
- * Returns the position of an item in the delegate, adjusting
- * values that are greater than the break position.
- *
- * @param p Position within the view
- * @return Position within the delegate
- */
- private int toDelegatePosition(int p) {
- return (mBreakPosition != -1 && p > mBreakPosition) ? p - 1 : p;
- }
-
- /**
- * Returns the position of an item in the view, adjusting
- * values that are greater than the break position.
- *
- * @param p Position within the delegate
- * @return Position within the view
- */
- private int toViewPosition(int p) {
- // If position is greater than or equal to the break, increase by one.
- return (mBreakPosition != -1 && p >= mBreakPosition) ? p + 1 : p;
- }
-
- @Override
- List<String> getModelIds() {
- return mDelegate.getModelIds();
- }
-
- @Override
- String getModelId(int p) {
- return (p == mBreakPosition) ? null : mDelegate.getModelId(toDelegatePosition(p));
- }
-
- @Override
- public void onItemSelectionChanged(String id) {
- mDelegate.onItemSelectionChanged(id);
- }
-
- // Listener we add to our delegate. This allows us to relay events published
- // by the delegate to our listeners (presumably RecyclerView) with adjusted positions.
- private final class EventRelay extends AdapterDataObserver {
- public void onChanged() {
- throw new UnsupportedOperationException();
- }
-
- public void onItemRangeChanged(int positionStart, int itemCount) {
- throw new UnsupportedOperationException();
- }
-
- public void onItemRangeChanged(int positionStart, int itemCount, Object payload) {
- assert(itemCount == 1);
- notifyItemRangeChanged(toViewPosition(positionStart), itemCount, payload);
- }
-
- public void onItemRangeInserted(int positionStart, int itemCount) {
- assert(itemCount == 1);
- if (positionStart < mBreakPosition) {
- mBreakPosition++;
- }
- notifyItemRangeInserted(toViewPosition(positionStart), itemCount);
- }
-
- public void onItemRangeRemoved(int positionStart, int itemCount) {
- assert(itemCount == 1);
- if (positionStart < mBreakPosition) {
- mBreakPosition--;
- }
- notifyItemRangeRemoved(toViewPosition(positionStart), itemCount);
- }
-
- public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
- throw new UnsupportedOperationException();
- }
- }
-
- /**
- * The most elegant transparent blank box that spans N rows ever conceived.
- */
- private static final class EmptyDocumentHolder extends DocumentHolder {
- final int mVisibleHeight;
-
- public EmptyDocumentHolder(Context context) {
- super(context, new Space(context));
-
- // Per UX spec, this puts a bigger gap between the folders and documents in the grid.
- mVisibleHeight = context.getResources().getDimensionPixelSize(
- R.dimen.grid_item_margin);
- }
-
- public void bind(State state) {
- bind(null, null, state);
- }
-
- @Override
- public void bind(Cursor cursor, String modelId, State state) {
- if (state.derivedMode == State.MODE_GRID) {
- itemView.setMinimumHeight(mVisibleHeight);
- } else {
- itemView.setMinimumHeight(0);
- }
- return;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
deleted file mode 100644
index b54c9bb..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.model;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsProvider;
-import android.support.annotation.VisibleForTesting;
-
-import com.android.documentsui.DocumentsApplication;
-import com.android.documentsui.RootCursorWrapper;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Set;
-
-import libcore.io.IoUtils;
-
-/**
- * Representation of a {@link Document}.
- */
-public class DocumentInfo implements Durable, Parcelable {
- private static final int VERSION_INIT = 1;
- private static final int VERSION_SPLIT_URI = 2;
-
- public String authority;
- public String documentId;
- public String mimeType;
- public String displayName;
- public long lastModified;
- public int flags;
- public String summary;
- public long size;
- public int icon;
-
- /** Derived fields that aren't persisted */
- public Uri derivedUri;
-
- public DocumentInfo() {
- reset();
- }
-
- @Override
- public void reset() {
- authority = null;
- documentId = null;
- mimeType = null;
- displayName = null;
- lastModified = -1;
- flags = 0;
- summary = null;
- size = -1;
- icon = 0;
- derivedUri = null;
- }
-
- @Override
- public void read(DataInputStream in) throws IOException {
- final int version = in.readInt();
- switch (version) {
- case VERSION_INIT:
- throw new ProtocolException("Ignored upgrade");
- case VERSION_SPLIT_URI:
- authority = DurableUtils.readNullableString(in);
- documentId = DurableUtils.readNullableString(in);
- mimeType = DurableUtils.readNullableString(in);
- displayName = DurableUtils.readNullableString(in);
- lastModified = in.readLong();
- flags = in.readInt();
- summary = DurableUtils.readNullableString(in);
- size = in.readLong();
- icon = in.readInt();
- deriveFields();
- break;
- default:
- throw new ProtocolException("Unknown version " + version);
- }
- }
-
- @Override
- public void write(DataOutputStream out) throws IOException {
- out.writeInt(VERSION_SPLIT_URI);
- DurableUtils.writeNullableString(out, authority);
- DurableUtils.writeNullableString(out, documentId);
- DurableUtils.writeNullableString(out, mimeType);
- DurableUtils.writeNullableString(out, displayName);
- out.writeLong(lastModified);
- out.writeInt(flags);
- DurableUtils.writeNullableString(out, summary);
- out.writeLong(size);
- out.writeInt(icon);
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- DurableUtils.writeToParcel(dest, this);
- }
-
- public static final Creator<DocumentInfo> CREATOR = new Creator<DocumentInfo>() {
- @Override
- public DocumentInfo createFromParcel(Parcel in) {
- final DocumentInfo doc = new DocumentInfo();
- DurableUtils.readFromParcel(in, doc);
- return doc;
- }
-
- @Override
- public DocumentInfo[] newArray(int size) {
- return new DocumentInfo[size];
- }
- };
-
- public static DocumentInfo fromDirectoryCursor(Cursor cursor) {
- assert(cursor != null);
- final String authority = getCursorString(cursor, RootCursorWrapper.COLUMN_AUTHORITY);
- return fromCursor(cursor, authority);
- }
-
- public static DocumentInfo fromCursor(Cursor cursor, String authority) {
- assert(cursor != null);
- final DocumentInfo info = new DocumentInfo();
- info.updateFromCursor(cursor, authority);
- return info;
- }
-
- public void updateFromCursor(Cursor cursor, String authority) {
- this.authority = authority;
- this.documentId = getCursorString(cursor, Document.COLUMN_DOCUMENT_ID);
- this.mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
- this.displayName = getCursorString(cursor, Document.COLUMN_DISPLAY_NAME);
- this.lastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED);
- this.flags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- this.summary = getCursorString(cursor, Document.COLUMN_SUMMARY);
- this.size = getCursorLong(cursor, Document.COLUMN_SIZE);
- this.icon = getCursorInt(cursor, Document.COLUMN_ICON);
- this.deriveFields();
- }
-
- public static DocumentInfo fromUri(ContentResolver resolver, Uri uri)
- throws FileNotFoundException {
- final DocumentInfo info = new DocumentInfo();
- info.updateFromUri(resolver, uri);
- return info;
- }
-
- /**
- * Update a possibly stale restored document against a live
- * {@link DocumentsProvider}.
- */
- public void updateSelf(ContentResolver resolver) throws FileNotFoundException {
- updateFromUri(resolver, derivedUri);
- }
-
- public void updateFromUri(ContentResolver resolver, Uri uri) throws FileNotFoundException {
- ContentProviderClient client = null;
- Cursor cursor = null;
- try {
- client = DocumentsApplication.acquireUnstableProviderOrThrow(
- resolver, uri.getAuthority());
- cursor = client.query(uri, null, null, null, null);
- if (!cursor.moveToFirst()) {
- throw new FileNotFoundException("Missing details for " + uri);
- }
- updateFromCursor(cursor, uri.getAuthority());
- } catch (Throwable t) {
- throw asFileNotFoundException(t);
- } finally {
- IoUtils.closeQuietly(cursor);
- ContentProviderClient.releaseQuietly(client);
- }
- }
-
- @VisibleForTesting
- void deriveFields() {
- derivedUri = DocumentsContract.buildDocumentUri(authority, documentId);
- }
-
- @Override
- public String toString() {
- return "Document{"
- + "docId=" + documentId
- + ", name=" + displayName
- + ", isContainer=" + isContainer()
- + ", isDirectory=" + isDirectory()
- + ", isArchive=" + isArchive()
- + ", isPartial=" + isPartial()
- + ", isVirtualDocument=" + isVirtualDocument()
- + ", isDeleteSupported=" + isDeleteSupported()
- + ", isCreateSupported=" + isCreateSupported()
- + ", isRenameSupported=" + isRenameSupported()
- + "}";
- }
-
- public boolean isCreateSupported() {
- return (flags & Document.FLAG_DIR_SUPPORTS_CREATE) != 0;
- }
-
- public boolean isThumbnailSupported() {
- return (flags & Document.FLAG_SUPPORTS_THUMBNAIL) != 0;
- }
-
- public boolean isDirectory() {
- return Document.MIME_TYPE_DIR.equals(mimeType);
- }
-
- public boolean isGridPreferred() {
- return (flags & Document.FLAG_DIR_PREFERS_GRID) != 0;
- }
-
- public boolean isDeleteSupported() {
- return (flags & Document.FLAG_SUPPORTS_DELETE) != 0;
- }
-
- public boolean isRemoveSupported() {
- return (flags & Document.FLAG_SUPPORTS_REMOVE) != 0;
- }
-
- public boolean isRenameSupported() {
- return (flags & Document.FLAG_SUPPORTS_RENAME) != 0;
- }
-
- public boolean isArchive() {
- return (flags & Document.FLAG_ARCHIVE) != 0;
- }
-
- public boolean isPartial() {
- return (flags & Document.FLAG_PARTIAL) != 0;
- }
-
- public boolean isContainer() {
- return isDirectory() || isArchive();
- }
-
- public boolean isVirtualDocument() {
- return (flags & Document.FLAG_VIRTUAL_DOCUMENT) != 0;
- }
-
- @Override
- public int hashCode() {
- return derivedUri.hashCode() + mimeType.hashCode();
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == null) {
- return false;
- }
-
- if (this == o) {
- return true;
- }
-
- if (o instanceof DocumentInfo) {
- DocumentInfo other = (DocumentInfo) o;
- // Uri + mime type should be totally unique.
- return Objects.equals(derivedUri, other.derivedUri)
- && Objects.equals(mimeType, other.mimeType);
- }
-
- return false;
- }
-
- public static String getCursorString(Cursor cursor, String columnName) {
- final int index = cursor.getColumnIndex(columnName);
- return (index != -1) ? cursor.getString(index) : null;
- }
-
- /**
- * Missing or null values are returned as -1.
- */
- public static long getCursorLong(Cursor cursor, String columnName) {
- final int index = cursor.getColumnIndex(columnName);
- if (index == -1) return -1;
- final String value = cursor.getString(index);
- if (value == null) return -1;
- try {
- return Long.parseLong(value);
- } catch (NumberFormatException e) {
- return -1;
- }
- }
-
- /**
- * Missing or null values are returned as 0.
- */
- public static int getCursorInt(Cursor cursor, String columnName) {
- final int index = cursor.getColumnIndex(columnName);
- return (index != -1) ? cursor.getInt(index) : 0;
- }
-
- public static FileNotFoundException asFileNotFoundException(Throwable t)
- throws FileNotFoundException {
- if (t instanceof FileNotFoundException) {
- throw (FileNotFoundException) t;
- }
- final FileNotFoundException fnfe = new FileNotFoundException(t.getMessage());
- fnfe.initCause(t);
- throw fnfe;
- }
-
- public static Uri getUri(Cursor cursor) {
- return DocumentsContract.buildDocumentUri(
- getCursorString(cursor, RootCursorWrapper.COLUMN_AUTHORITY),
- getCursorString(cursor, Document.COLUMN_DOCUMENT_ID));
- }
-
- public static void addMimeTypes(ContentResolver resolver, Uri uri, Set<String> mimeTypes) {
- assert(uri != null);
- if ("content".equals(uri.getScheme())) {
- mimeTypes.add(resolver.getType(uri));
- final String[] streamTypes = resolver.getStreamTypes(uri, "*/*");
- if (streamTypes != null) {
- mimeTypes.addAll(Arrays.asList(streamTypes));
- }
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentStack.java b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentStack.java
deleted file mode 100644
index 34bd696..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentStack.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.model;
-
-import android.content.ContentResolver;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.provider.DocumentsProvider;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.util.Collection;
-import java.util.LinkedList;
-
-/**
- * Representation of a stack of {@link DocumentInfo}, usually the result of a
- * user-driven traversal.
- */
-public class DocumentStack extends LinkedList<DocumentInfo> implements Durable, Parcelable {
- private static final int VERSION_INIT = 1;
- private static final int VERSION_ADD_ROOT = 2;
-
- public RootInfo root;
-
- public String getTitle() {
- if (size() == 1 && root != null) {
- return root.title;
- } else if (size() > 1) {
- return peek().displayName;
- } else {
- return null;
- }
- }
-
- public boolean isRecents() {
- return size() == 0;
- }
-
- public void updateRoot(Collection<RootInfo> matchingRoots) throws FileNotFoundException {
- for (RootInfo root : matchingRoots) {
- if (root.equals(this.root)) {
- this.root = root;
- return;
- }
- }
- throw new FileNotFoundException("Failed to find matching root for " + root);
- }
-
- /**
- * Update a possibly stale restored stack against a live
- * {@link DocumentsProvider}.
- */
- public void updateDocuments(ContentResolver resolver) throws FileNotFoundException {
- for (DocumentInfo info : this) {
- info.updateSelf(resolver);
- }
- }
-
- /**
- * Build key that uniquely identifies this stack. It omits most of the raw
- * details included in {@link #write(DataOutputStream)}, since they change
- * too regularly to be used as a key.
- */
- public String buildKey() {
- final StringBuilder builder = new StringBuilder();
- if (root != null) {
- builder.append(root.authority).append('#');
- builder.append(root.rootId).append('#');
- } else {
- builder.append("[null]").append('#');
- }
- for (DocumentInfo doc : this) {
- builder.append(doc.documentId).append('#');
- }
- return builder.toString();
- }
-
- @Override
- public void reset() {
- clear();
- root = null;
- }
-
- @Override
- public void read(DataInputStream in) throws IOException {
- final int version = in.readInt();
- switch (version) {
- case VERSION_INIT:
- throw new ProtocolException("Ignored upgrade");
- case VERSION_ADD_ROOT:
- if (in.readBoolean()) {
- root = new RootInfo();
- root.read(in);
- }
- final int size = in.readInt();
- for (int i = 0; i < size; i++) {
- final DocumentInfo doc = new DocumentInfo();
- doc.read(in);
- add(doc);
- }
- break;
- default:
- throw new ProtocolException("Unknown version " + version);
- }
- }
-
- @Override
- public void write(DataOutputStream out) throws IOException {
- out.writeInt(VERSION_ADD_ROOT);
- if (root != null) {
- out.writeBoolean(true);
- root.write(out);
- } else {
- out.writeBoolean(false);
- }
- final int size = size();
- out.writeInt(size);
- for (int i = 0; i < size; i++) {
- final DocumentInfo doc = get(i);
- doc.write(out);
- }
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- DurableUtils.writeToParcel(dest, this);
- }
-
- public static final Creator<DocumentStack> CREATOR = new Creator<DocumentStack>() {
- @Override
- public DocumentStack createFromParcel(Parcel in) {
- final DocumentStack stack = new DocumentStack();
- DurableUtils.readFromParcel(in, stack);
- return stack;
- }
-
- @Override
- public DocumentStack[] newArray(int size) {
- return new DocumentStack[size];
- }
- };
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/Durable.java b/packages/DocumentsUI/src/com/android/documentsui/model/Durable.java
deleted file mode 100644
index 01633ed..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/model/Durable.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.model;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public interface Durable {
- public void reset();
- public void read(DataInputStream in) throws IOException;
- public void write(DataOutputStream out) throws IOException;
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/DurableUtils.java b/packages/DocumentsUI/src/com/android/documentsui/model/DurableUtils.java
deleted file mode 100644
index e21dd49..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/model/DurableUtils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.model;
-
-import static com.android.documentsui.Shared.TAG;
-
-import android.os.BadParcelableException;
-import android.os.Parcel;
-import android.util.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class DurableUtils {
- public static <D extends Durable> byte[] writeToArray(D d) throws IOException {
- final ByteArrayOutputStream out = new ByteArrayOutputStream();
- d.write(new DataOutputStream(out));
- return out.toByteArray();
- }
-
- public static <D extends Durable> D readFromArray(byte[] data, D d) throws IOException {
- if (data == null) throw new IOException("Missing data");
- final ByteArrayInputStream in = new ByteArrayInputStream(data);
- d.reset();
- try {
- d.read(new DataInputStream(in));
- } catch (IOException e) {
- d.reset();
- throw e;
- }
- return d;
- }
-
- public static <D extends Durable> byte[] writeToArrayOrNull(D d) {
- try {
- return writeToArray(d);
- } catch (IOException e) {
- Log.w(TAG, "Failed to write", e);
- return null;
- }
- }
-
- public static <D extends Durable> D readFromArrayOrNull(byte[] data, D d) {
- try {
- return readFromArray(data, d);
- } catch (IOException e) {
- Log.w(TAG, "Failed to read", e);
- return null;
- }
- }
-
- public static <D extends Durable> void writeToParcel(Parcel parcel, D d) {
- try {
- parcel.writeByteArray(writeToArray(d));
- } catch (IOException e) {
- throw new BadParcelableException(e);
- }
- }
-
- public static <D extends Durable> D readFromParcel(Parcel parcel, D d) {
- try {
- return readFromArray(parcel.createByteArray(), d);
- } catch (IOException e) {
- throw new BadParcelableException(e);
- }
- }
-
- public static void writeNullableString(DataOutputStream out, String value) throws IOException {
- if (value != null) {
- out.write(1);
- out.writeUTF(value);
- } else {
- out.write(0);
- }
- }
-
- public static String readNullableString(DataInputStream in) throws IOException {
- if (in.read() != 0) {
- return in.readUTF();
- } else {
- return null;
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
deleted file mode 100644
index d54bdfd..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.model;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.compareToIgnoreCaseNullable;
-import static com.android.documentsui.model.DocumentInfo.getCursorInt;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-
-import android.annotation.IntDef;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Root;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.documentsui.IconUtils;
-import com.android.documentsui.R;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.net.ProtocolException;
-import java.util.Objects;
-
-/**
- * Representation of a {@link Root}.
- */
-public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
-
- private static final String TAG = "RootInfo";
- private static final int VERSION_INIT = 1;
- private static final int VERSION_DROP_TYPE = 2;
-
- // The values of these constants determine the sort order of various roots in the RootsFragment.
- @IntDef(flag = false, value = {
- TYPE_IMAGES,
- TYPE_VIDEO,
- TYPE_AUDIO,
- TYPE_RECENTS,
- TYPE_DOWNLOADS,
- TYPE_LOCAL,
- TYPE_MTP,
- TYPE_SD,
- TYPE_USB,
- TYPE_OTHER
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface RootType {}
- public static final int TYPE_IMAGES = 1;
- public static final int TYPE_VIDEO = 2;
- public static final int TYPE_AUDIO = 3;
- public static final int TYPE_RECENTS = 4;
- public static final int TYPE_DOWNLOADS = 5;
- public static final int TYPE_LOCAL = 6;
- public static final int TYPE_MTP = 7;
- public static final int TYPE_SD = 8;
- public static final int TYPE_USB = 9;
- public static final int TYPE_OTHER = 10;
-
- public String authority;
- public String rootId;
- public int flags;
- public int icon;
- public String title;
- public String summary;
- public String documentId;
- public long availableBytes;
- public String mimeTypes;
-
- /** Derived fields that aren't persisted */
- public String[] derivedMimeTypes;
- public int derivedIcon;
- public @RootType int derivedType;
-
- public RootInfo() {
- reset();
- }
-
- @Override
- public void reset() {
- authority = null;
- rootId = null;
- flags = 0;
- icon = 0;
- title = null;
- summary = null;
- documentId = null;
- availableBytes = -1;
- mimeTypes = null;
-
- derivedMimeTypes = null;
- derivedIcon = 0;
- derivedType = 0;
- }
-
- @Override
- public void read(DataInputStream in) throws IOException {
- final int version = in.readInt();
- switch (version) {
- case VERSION_DROP_TYPE:
- authority = DurableUtils.readNullableString(in);
- rootId = DurableUtils.readNullableString(in);
- flags = in.readInt();
- icon = in.readInt();
- title = DurableUtils.readNullableString(in);
- summary = DurableUtils.readNullableString(in);
- documentId = DurableUtils.readNullableString(in);
- availableBytes = in.readLong();
- mimeTypes = DurableUtils.readNullableString(in);
- deriveFields();
- break;
- default:
- throw new ProtocolException("Unknown version " + version);
- }
- }
-
- @Override
- public void write(DataOutputStream out) throws IOException {
- out.writeInt(VERSION_DROP_TYPE);
- DurableUtils.writeNullableString(out, authority);
- DurableUtils.writeNullableString(out, rootId);
- out.writeInt(flags);
- out.writeInt(icon);
- DurableUtils.writeNullableString(out, title);
- DurableUtils.writeNullableString(out, summary);
- DurableUtils.writeNullableString(out, documentId);
- out.writeLong(availableBytes);
- DurableUtils.writeNullableString(out, mimeTypes);
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- DurableUtils.writeToParcel(dest, this);
- }
-
- public static final Creator<RootInfo> CREATOR = new Creator<RootInfo>() {
- @Override
- public RootInfo createFromParcel(Parcel in) {
- final RootInfo root = new RootInfo();
- DurableUtils.readFromParcel(in, root);
- return root;
- }
-
- @Override
- public RootInfo[] newArray(int size) {
- return new RootInfo[size];
- }
- };
-
- public static RootInfo fromRootsCursor(String authority, Cursor cursor) {
- final RootInfo root = new RootInfo();
- root.authority = authority;
- root.rootId = getCursorString(cursor, Root.COLUMN_ROOT_ID);
- root.flags = getCursorInt(cursor, Root.COLUMN_FLAGS);
- root.icon = getCursorInt(cursor, Root.COLUMN_ICON);
- root.title = getCursorString(cursor, Root.COLUMN_TITLE);
- root.summary = getCursorString(cursor, Root.COLUMN_SUMMARY);
- root.documentId = getCursorString(cursor, Root.COLUMN_DOCUMENT_ID);
- root.availableBytes = getCursorLong(cursor, Root.COLUMN_AVAILABLE_BYTES);
- root.mimeTypes = getCursorString(cursor, Root.COLUMN_MIME_TYPES);
- root.deriveFields();
- return root;
- }
-
- private void deriveFields() {
- derivedMimeTypes = (mimeTypes != null) ? mimeTypes.split("\n") : null;
-
- if (isHome()) {
- derivedType = TYPE_LOCAL;
- derivedIcon = R.drawable.ic_root_documents;
- } else if (isMtp()) {
- derivedType = TYPE_MTP;
- derivedIcon = R.drawable.ic_usb_storage;
- } else if (isUsb()) {
- derivedType = TYPE_USB;
- derivedIcon = R.drawable.ic_usb_storage;
- } else if (isSd()) {
- derivedType = TYPE_SD;
- derivedIcon = R.drawable.ic_sd_storage;
- } else if (isExternalStorage()) {
- derivedType = TYPE_LOCAL;
- derivedIcon = R.drawable.ic_root_smartphone;
- } else if (isDownloads()) {
- derivedType = TYPE_DOWNLOADS;
- derivedIcon = R.drawable.ic_root_download;
- } else if (isImages()) {
- derivedType = TYPE_IMAGES;
- derivedIcon = R.drawable.ic_doc_image;
- } else if (isVideos()) {
- derivedType = TYPE_VIDEO;
- derivedIcon = R.drawable.ic_doc_video;
- } else if (isAudio()) {
- derivedType = TYPE_AUDIO;
- derivedIcon = R.drawable.ic_doc_audio;
- } else if (isRecents()) {
- derivedType = TYPE_RECENTS;
- } else {
- derivedType = TYPE_OTHER;
- }
-
- if (DEBUG) Log.d(TAG, "Finished deriving fields: " + this);
- }
-
- public Uri getUri() {
- return DocumentsContract.buildRootUri(authority, rootId);
- }
-
- public boolean isRecents() {
- return authority == null && rootId == null;
- }
-
- public boolean isHome() {
- // Note that "home" is the expected root id for the auto-created
- // user home directory on external storage. The "home" value should
- // match ExternalStorageProvider.ROOT_ID_HOME.
- return isExternalStorage() && "home".equals(rootId);
- }
-
- public boolean isExternalStorage() {
- return "com.android.externalstorage.documents".equals(authority);
- }
-
- public boolean isDownloads() {
- return "com.android.providers.downloads.documents".equals(authority);
- }
-
- public boolean isImages() {
- return "com.android.providers.media.documents".equals(authority)
- && "images_root".equals(rootId);
- }
-
- public boolean isVideos() {
- return "com.android.providers.media.documents".equals(authority)
- && "videos_root".equals(rootId);
- }
-
- public boolean isAudio() {
- return "com.android.providers.media.documents".equals(authority)
- && "audio_root".equals(rootId);
- }
-
- public boolean isMtp() {
- return "com.android.mtp.documents".equals(authority);
- }
-
- public boolean isLibrary() {
- return derivedType == TYPE_IMAGES
- || derivedType == TYPE_VIDEO
- || derivedType == TYPE_AUDIO
- || derivedType == TYPE_RECENTS;
- }
-
- public boolean hasSettings() {
- return (flags & Root.FLAG_HAS_SETTINGS) != 0;
- }
-
- public boolean supportsChildren() {
- return (flags & Root.FLAG_SUPPORTS_IS_CHILD) != 0;
- }
-
- public boolean supportsCreate() {
- return (flags & Root.FLAG_SUPPORTS_CREATE) != 0;
- }
-
- public boolean supportsRecents() {
- return (flags & Root.FLAG_SUPPORTS_RECENTS) != 0;
- }
-
- public boolean supportsSearch() {
- return (flags & Root.FLAG_SUPPORTS_SEARCH) != 0;
- }
-
- public boolean isAdvanced() {
- return (flags & Root.FLAG_ADVANCED) != 0;
- }
-
- public boolean isLocalOnly() {
- return (flags & Root.FLAG_LOCAL_ONLY) != 0;
- }
-
- public boolean isEmpty() {
- return (flags & Root.FLAG_EMPTY) != 0;
- }
-
- public boolean isSd() {
- return (flags & Root.FLAG_REMOVABLE_SD) != 0;
- }
-
- public boolean isUsb() {
- return (flags & Root.FLAG_REMOVABLE_USB) != 0;
- }
-
- public Drawable loadIcon(Context context) {
- if (derivedIcon != 0) {
- return context.getDrawable(derivedIcon);
- } else {
- return IconUtils.loadPackageIcon(context, authority, icon);
- }
- }
-
- public Drawable loadDrawerIcon(Context context) {
- if (derivedIcon != 0) {
- return IconUtils.applyTintColor(context, derivedIcon, R.color.item_root_icon);
- } else {
- return IconUtils.loadPackageIcon(context, authority, icon);
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == null) {
- return false;
- }
-
- if (this == o) {
- return true;
- }
-
- if (o instanceof RootInfo) {
- RootInfo other = (RootInfo) o;
- return Objects.equals(authority, other.authority)
- && Objects.equals(rootId, other.rootId);
- }
-
- return false;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(authority, rootId);
- }
-
- @Override
- public int compareTo(RootInfo other) {
- // Sort by root type, then title, then summary.
- int score = derivedType - other.derivedType;
- if (score != 0) {
- return score;
- }
-
- score = compareToIgnoreCaseNullable(title, other.title);
- if (score != 0) {
- return score;
- }
-
- return compareToIgnoreCaseNullable(summary, other.summary);
- }
-
- @Override
- public String toString() {
- return "Root{"
- + "authority=" + authority
- + ", rootId=" + rootId
- + ", title=" + title
- + ", isUsb=" + isUsb()
- + ", isSd=" + isSd()
- + ", isMtp=" + isMtp()
- + "}";
- }
-
- public String getDirectoryString() {
- return !TextUtils.isEmpty(summary) ? summary : title;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java
deleted file mode 100644
index fac8667..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static android.os.SystemClock.elapsedRealtime;
-import static android.provider.DocumentsContract.buildChildDocumentsUri;
-import static android.provider.DocumentsContract.buildDocumentUri;
-import static android.provider.DocumentsContract.getDocumentId;
-import static android.provider.DocumentsContract.isChildDocument;
-
-import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_CONVERTED;
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-import static com.android.documentsui.services.FileOperationService.EXTRA_DIALOG_TYPE;
-import static com.android.documentsui.services.FileOperationService.EXTRA_OPERATION;
-import static com.android.documentsui.services.FileOperationService.EXTRA_SRC_LIST;
-
-import android.annotation.StringRes;
-import android.app.Notification;
-import android.app.Notification.Builder;
-import android.app.PendingIntent;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.os.RemoteException;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.text.format.DateUtils;
-import android.util.Log;
-import android.webkit.MimeTypeMap;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.Metrics;
-import com.android.documentsui.R;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.RootInfo;
-
-import libcore.io.IoUtils;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-class CopyJob extends Job {
-
- private static final String TAG = "CopyJob";
-
- final List<DocumentInfo> mSrcs;
- final ArrayList<DocumentInfo> convertedFiles = new ArrayList<>();
-
- private long mStartTime = -1;
-
- private long mBatchSize;
- private volatile long mBytesCopied;
- // Speed estimation
- private long mBytesCopiedSample;
- private long mSampleTime;
- private long mSpeed;
- private long mRemainingTime;
-
- /**
- * @see @link {@link Job} constructor for most param descriptions.
- *
- * @param details clip details containing source file list
- */
- CopyJob(Context service, Context appContext, Listener listener,
- String id, DocumentStack destination, ClipDetails details) {
- super(service, appContext, listener, id, destination, details);
-
- assert(details.getItemCount() > 0);
-
- // delay the initialization of it to setUp() because it may be IO extensive.
- mSrcs = new ArrayList<>(details.getItemCount());
- }
-
- @Override
- Builder createProgressBuilder() {
- return super.createProgressBuilder(
- service.getString(R.string.copy_notification_title),
- R.drawable.ic_menu_copy,
- service.getString(android.R.string.cancel),
- R.drawable.ic_cab_cancel);
- }
-
- @Override
- public Notification getSetupNotification() {
- return getSetupNotification(service.getString(R.string.copy_preparing));
- }
-
- Notification getProgressNotification(@StringRes int msgId) {
- updateRemainingTimeEstimate();
-
- if (mBatchSize >= 0) {
- double completed = (double) this.mBytesCopied / mBatchSize;
- mProgressBuilder.setProgress(100, (int) (completed * 100), false);
- mProgressBuilder.setSubText(
- NumberFormat.getPercentInstance().format(completed));
- } else {
- // If the total file size failed to compute on some files, then show
- // an indeterminate spinner. CopyJob would most likely fail on those
- // files while copying, but would continue with another files.
- // Also, if the total size is 0 bytes, show an indeterminate spinner.
- mProgressBuilder.setProgress(0, 0, true);
- }
-
- if (mRemainingTime > 0) {
- mProgressBuilder.setContentText(service.getString(msgId,
- DateUtils.formatDuration(mRemainingTime)));
- } else {
- mProgressBuilder.setContentText(null);
- }
-
- return mProgressBuilder.build();
- }
-
- @Override
- public Notification getProgressNotification() {
- return getProgressNotification(R.string.copy_remaining);
- }
-
- void onBytesCopied(long numBytes) {
- this.mBytesCopied += numBytes;
- }
-
- /**
- * Generates an estimate of the remaining time in the copy.
- */
- private void updateRemainingTimeEstimate() {
- long elapsedTime = elapsedRealtime() - mStartTime;
-
- // mBytesCopied is modified in worker thread, but this method is called in monitor thread,
- // so take a snapshot of mBytesCopied to make sure the updated estimate is consistent.
- final long bytesCopied = mBytesCopied;
- final long sampleDuration = Math.max(elapsedTime - mSampleTime, 1L); // avoid dividing 0
- final long sampleSpeed = ((bytesCopied - mBytesCopiedSample) * 1000) / sampleDuration;
- if (mSpeed == 0) {
- mSpeed = sampleSpeed;
- } else {
- mSpeed = ((3 * mSpeed) + sampleSpeed) / 4;
- }
-
- if (mSampleTime > 0 && mSpeed > 0) {
- mRemainingTime = ((mBatchSize - bytesCopied) * 1000) / mSpeed;
- } else {
- mRemainingTime = 0;
- }
-
- mSampleTime = elapsedTime;
- mBytesCopiedSample = bytesCopied;
- }
-
- @Override
- Notification getFailureNotification() {
- return getFailureNotification(
- R.plurals.copy_error_notification_title, R.drawable.ic_menu_copy);
- }
-
- @Override
- Notification getWarningNotification() {
- final Intent navigateIntent = buildNavigateIntent(INTENT_TAG_WARNING);
- navigateIntent.putExtra(EXTRA_DIALOG_TYPE, DIALOG_TYPE_CONVERTED);
- navigateIntent.putExtra(EXTRA_OPERATION, operationType);
-
- navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, convertedFiles);
-
- // TODO: Consider adding a dialog on tapping the notification with a list of
- // converted files.
- final Notification.Builder warningBuilder = new Notification.Builder(service)
- .setContentTitle(service.getResources().getString(
- R.string.notification_copy_files_converted_title))
- .setContentText(service.getString(
- R.string.notification_touch_for_details))
- .setContentIntent(PendingIntent.getActivity(appContext, 0, navigateIntent,
- PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT))
- .setCategory(Notification.CATEGORY_ERROR)
- .setSmallIcon(R.drawable.ic_menu_copy)
- .setAutoCancel(true);
- return warningBuilder.build();
- }
-
- @Override
- boolean setUp() {
-
- try {
- buildDocumentList();
- } catch (ResourceException e) {
- Log.e(TAG, "Failed to get the list of docs.", e);
- return false;
- }
-
- if (isCanceled()) {
- return false;
- }
-
- try {
- mBatchSize = calculateSize(mSrcs);
- } catch (ResourceException e) {
- Log.w(TAG, "Failed to calculate total size. Copying without progress.", e);
- mBatchSize = -1;
- }
-
- return true;
- }
-
- @Override
- void start() {
- mStartTime = elapsedRealtime();
- DocumentInfo srcInfo;
- DocumentInfo dstInfo = stack.peek();
- for (int i = 0; i < mSrcs.size() && !isCanceled(); ++i) {
- srcInfo = mSrcs.get(i);
-
- if (DEBUG) Log.d(TAG,
- "Copying " + srcInfo.displayName + " (" + srcInfo.derivedUri + ")"
- + " to " + dstInfo.displayName + " (" + dstInfo.derivedUri + ")");
-
- try {
- if (dstInfo.equals(srcInfo) || isDescendentOf(srcInfo, dstInfo)) {
- Log.e(TAG, "Skipping recursive copy of " + srcInfo.derivedUri);
- onFileFailed(srcInfo);
- } else {
- processDocument(srcInfo, null, dstInfo);
- }
- } catch (ResourceException e) {
- Log.e(TAG, "Failed to copy " + srcInfo.derivedUri, e);
- onFileFailed(srcInfo);
- }
- }
- Metrics.logFileOperation(service, operationType, mSrcs, dstInfo);
- }
-
- private void buildDocumentList() throws ResourceException {
- try {
- final ContentResolver resolver = appContext.getContentResolver();
- final Iterable<Uri> uris = details.getDocs(appContext);
- for (Uri uri : uris) {
- DocumentInfo doc = DocumentInfo.fromUri(resolver, uri);
- if (canCopy(doc, stack.root)) {
- mSrcs.add(doc);
- } else {
- onFileFailed(doc);
- }
-
- if (isCanceled()) {
- return;
- }
- }
- } catch(IOException e) {
- failedFileCount += details.getItemCount();
- throw new ResourceException("Failed to open the list of docs to copy.", e);
- }
- }
-
- private static boolean canCopy(DocumentInfo doc, RootInfo root) {
- // Can't copy folders to downloads, because we don't show folders there.
- return !root.isDownloads() || !doc.isDirectory();
- }
-
- @Override
- boolean hasWarnings() {
- return !convertedFiles.isEmpty();
- }
-
- /**
- * Logs progress on the current copy operation. Displays/Updates the progress notification.
- *
- * @param bytesCopied
- */
- private void makeCopyProgress(long bytesCopied) {
- onBytesCopied(bytesCopied);
- }
-
- /**
- * Copies a the given document to the given location.
- *
- * @param src DocumentInfos for the documents to copy.
- * @param srcParent DocumentInfo for the parent of the document to process.
- * @param dstDirInfo The destination directory.
- * @throws ResourceException
- *
- * TODO: Stop passing srcParent, as it's not used for copy, but for move only.
- */
- void processDocument(DocumentInfo src, DocumentInfo srcParent,
- DocumentInfo dstDirInfo) throws ResourceException {
-
- // TODO: When optimized copy kicks in, we'll not making any progress updates.
- // For now. Local storage isn't using optimized copy.
-
- // When copying within the same provider, try to use optimized copying.
- // If not supported, then fallback to byte-by-byte copy/move.
- if (src.authority.equals(dstDirInfo.authority)) {
- if ((src.flags & Document.FLAG_SUPPORTS_COPY) != 0) {
- try {
- if (DocumentsContract.copyDocument(getClient(src), src.derivedUri,
- dstDirInfo.derivedUri) != null) {
- return;
- }
- } catch (RemoteException | RuntimeException e) {
- Log.e(TAG, "Provider side copy failed for: " + src.derivedUri
- + " due to an exception.", e);
- }
-
- // If optimized copy fails, then fallback to byte-by-byte copy.
- if (DEBUG) Log.d(TAG, "Fallback to byte-by-byte copy for: " + src.derivedUri);
- }
- }
-
- // If we couldn't do an optimized copy...we fall back to vanilla byte copy.
- byteCopyDocument(src, dstDirInfo);
- }
-
- void byteCopyDocument(DocumentInfo src, DocumentInfo dest) throws ResourceException {
- final String dstMimeType;
- final String dstDisplayName;
-
- if (DEBUG) Log.d(TAG, "Doing byte copy of document: " + src);
- // If the file is virtual, but can be converted to another format, then try to copy it
- // as such format. Also, append an extension for the target mime type (if known).
- if (src.isVirtualDocument()) {
- String[] streamTypes = null;
- try {
- streamTypes = getContentResolver().getStreamTypes(src.derivedUri, "*/*");
- } catch (RuntimeException e) {
- throw new ResourceException(
- "Failed to obtain streamable types for %s due to an exception.",
- src.derivedUri, e);
- }
- if (streamTypes != null && streamTypes.length > 0) {
- dstMimeType = streamTypes[0];
- final String extension = MimeTypeMap.getSingleton().
- getExtensionFromMimeType(dstMimeType);
- dstDisplayName = src.displayName +
- (extension != null ? "." + extension : src.displayName);
- } else {
- throw new ResourceException("Cannot copy virtual file %s. No streamable formats "
- + "available.", src.derivedUri);
- }
- } else {
- dstMimeType = src.mimeType;
- dstDisplayName = src.displayName;
- }
-
- // Create the target document (either a file or a directory), then copy recursively the
- // contents (bytes or children).
- Uri dstUri = null;
- try {
- dstUri = DocumentsContract.createDocument(
- getClient(dest), dest.derivedUri, dstMimeType, dstDisplayName);
- } catch (RemoteException | RuntimeException e) {
- throw new ResourceException(
- "Couldn't create destination document " + dstDisplayName + " in directory %s "
- + "due to an exception.", dest.derivedUri, e);
- }
- if (dstUri == null) {
- // If this is a directory, the entire subdir will not be copied over.
- throw new ResourceException(
- "Couldn't create destination document " + dstDisplayName + " in directory %s.",
- dest.derivedUri);
- }
-
- DocumentInfo dstInfo = null;
- try {
- dstInfo = DocumentInfo.fromUri(getContentResolver(), dstUri);
- } catch (FileNotFoundException | RuntimeException e) {
- throw new ResourceException("Could not load DocumentInfo for newly created file %s.",
- dstUri);
- }
-
- if (Document.MIME_TYPE_DIR.equals(src.mimeType)) {
- copyDirectoryHelper(src, dstInfo);
- } else {
- copyFileHelper(src, dstInfo, dest, dstMimeType);
- }
- }
-
- /**
- * Handles recursion into a directory and copying its contents. Note that in linux terms, this
- * does the equivalent of "cp src/* dst", not "cp -r src dst".
- *
- * @param srcDir Info of the directory to copy from. The routine will copy the directory's
- * contents, not the directory itself.
- * @param destDir Info of the directory to copy to. Must be created beforehand.
- * @throws ResourceException
- */
- private void copyDirectoryHelper(DocumentInfo srcDir, DocumentInfo destDir)
- throws ResourceException {
- // Recurse into directories. Copy children into the new subdirectory.
- final String queryColumns[] = new String[] {
- Document.COLUMN_DISPLAY_NAME,
- Document.COLUMN_DOCUMENT_ID,
- Document.COLUMN_MIME_TYPE,
- Document.COLUMN_SIZE,
- Document.COLUMN_FLAGS
- };
- Cursor cursor = null;
- boolean success = true;
- // Iterate over srcs in the directory; copy to the destination directory.
- final Uri queryUri = buildChildDocumentsUri(srcDir.authority, srcDir.documentId);
- try {
- try {
- cursor = getClient(srcDir).query(queryUri, queryColumns, null, null, null);
- } catch (RemoteException | RuntimeException e) {
- throw new ResourceException("Failed to query children of %s due to an exception.",
- srcDir.derivedUri, e);
- }
-
- DocumentInfo src;
- while (cursor.moveToNext() && !isCanceled()) {
- try {
- src = DocumentInfo.fromCursor(cursor, srcDir.authority);
- processDocument(src, srcDir, destDir);
- } catch (RuntimeException e) {
- Log.e(TAG, String.format(
- "Failed to recursively process a file %s due to an exception.",
- srcDir.derivedUri.toString()), e);
- success = false;
- }
- }
- } catch (RuntimeException e) {
- Log.e(TAG, String.format(
- "Failed to copy a file %s to %s. ",
- srcDir.derivedUri.toString(), destDir.derivedUri.toString()), e);
- success = false;
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- if (!success) {
- throw new RuntimeException("Some files failed to copy during a recursive "
- + "directory copy.");
- }
- }
-
- /**
- * Handles copying a single file.
- *
- * @param src Info of the file to copy from.
- * @param dest Info of the *file* to copy to. Must be created beforehand.
- * @param destParent Info of the parent of the destination.
- * @param mimeType Mime type for the target. Can be different than source for virtual files.
- * @throws ResourceException
- */
- private void copyFileHelper(DocumentInfo src, DocumentInfo dest, DocumentInfo destParent,
- String mimeType) throws ResourceException {
- CancellationSignal canceller = new CancellationSignal();
- AssetFileDescriptor srcFileAsAsset = null;
- ParcelFileDescriptor srcFile = null;
- ParcelFileDescriptor dstFile = null;
- InputStream in = null;
- ParcelFileDescriptor.AutoCloseOutputStream out = null;
- boolean success = false;
-
- try {
- // If the file is virtual, but can be converted to another format, then try to copy it
- // as such format.
- if (src.isVirtualDocument()) {
- try {
- srcFileAsAsset = getClient(src).openTypedAssetFileDescriptor(
- src.derivedUri, mimeType, null, canceller);
- } catch (FileNotFoundException | RemoteException | RuntimeException e) {
- throw new ResourceException("Failed to open a file as asset for %s due to an "
- + "exception.", src.derivedUri, e);
- }
- srcFile = srcFileAsAsset.getParcelFileDescriptor();
- try {
- in = new AssetFileDescriptor.AutoCloseInputStream(srcFileAsAsset);
- } catch (IOException e) {
- throw new ResourceException("Failed to open a file input stream for %s due "
- + "an exception.", src.derivedUri, e);
- }
- } else {
- try {
- srcFile = getClient(src).openFile(src.derivedUri, "r", canceller);
- } catch (FileNotFoundException | RemoteException | RuntimeException e) {
- throw new ResourceException(
- "Failed to open a file for %s due to an exception.", src.derivedUri, e);
- }
- in = new ParcelFileDescriptor.AutoCloseInputStream(srcFile);
- }
-
- try {
- dstFile = getClient(dest).openFile(dest.derivedUri, "w", canceller);
- } catch (FileNotFoundException | RemoteException | RuntimeException e) {
- throw new ResourceException("Failed to open the destination file %s for writing "
- + "due to an exception.", dest.derivedUri, e);
- }
- out = new ParcelFileDescriptor.AutoCloseOutputStream(dstFile);
-
- byte[] buffer = new byte[32 * 1024];
- int len;
- try {
- while ((len = in.read(buffer)) != -1) {
- if (isCanceled()) {
- if (DEBUG) Log.d(TAG, "Canceled copy mid-copy of: " + src.derivedUri);
- return;
- }
- out.write(buffer, 0, len);
- makeCopyProgress(len);
- }
-
- // Need to invoke IoUtils.close explicitly to avoid from ignoring errors at flush.
- IoUtils.close(dstFile.getFileDescriptor());
- srcFile.checkError();
- } catch (IOException e) {
- throw new ResourceException(
- "Failed to copy bytes from %s to %s due to an IO exception.",
- src.derivedUri, dest.derivedUri, e);
- }
-
- if (src.isVirtualDocument()) {
- convertedFiles.add(src);
- }
-
- success = true;
- } finally {
- if (!success) {
- if (dstFile != null) {
- try {
- dstFile.closeWithError("Error copying bytes.");
- } catch (IOException closeError) {
- Log.w(TAG, "Error closing destination.", closeError);
- }
- }
-
- if (DEBUG) Log.d(TAG, "Cleaning up failed operation leftovers.");
- canceller.cancel();
- try {
- deleteDocument(dest, destParent);
- } catch (ResourceException e) {
- Log.w(TAG, "Failed to cleanup after copy error: " + src.derivedUri, e);
- }
- }
-
- // This also ensures the file descriptors are closed.
- IoUtils.closeQuietly(in);
- IoUtils.closeQuietly(out);
- }
- }
-
- /**
- * Calculates the cumulative size of all the documents in the list. Directories are recursed
- * into and totaled up.
- *
- * @param srcs
- * @return Size in bytes.
- * @throws ResourceException
- */
- private long calculateSize(List<DocumentInfo> srcs) throws ResourceException {
- long result = 0;
-
- for (DocumentInfo src : srcs) {
- if (src.isDirectory()) {
- // Directories need to be recursed into.
- try {
- result += calculateFileSizesRecursively(getClient(src), src.derivedUri);
- } catch (RemoteException e) {
- throw new ResourceException("Failed to obtain the client for %s.",
- src.derivedUri);
- }
- } else {
- result += src.size;
- }
-
- if (isCanceled()) {
- return result;
- }
- }
- return result;
- }
-
- /**
- * Calculates (recursively) the cumulative size of all the files under the given directory.
- *
- * @throws ResourceException
- */
- private long calculateFileSizesRecursively(
- ContentProviderClient client, Uri uri) throws ResourceException {
- final String authority = uri.getAuthority();
- final Uri queryUri = buildChildDocumentsUri(authority, getDocumentId(uri));
- final String queryColumns[] = new String[] {
- Document.COLUMN_DOCUMENT_ID,
- Document.COLUMN_MIME_TYPE,
- Document.COLUMN_SIZE
- };
-
- long result = 0;
- Cursor cursor = null;
- try {
- cursor = client.query(queryUri, queryColumns, null, null, null);
- while (cursor.moveToNext() && !isCanceled()) {
- if (Document.MIME_TYPE_DIR.equals(
- getCursorString(cursor, Document.COLUMN_MIME_TYPE))) {
- // Recurse into directories.
- final Uri dirUri = buildDocumentUri(authority,
- getCursorString(cursor, Document.COLUMN_DOCUMENT_ID));
- result += calculateFileSizesRecursively(client, dirUri);
- } else {
- // This may return -1 if the size isn't defined. Ignore those cases.
- long size = getCursorLong(cursor, Document.COLUMN_SIZE);
- result += size > 0 ? size : 0;
- }
- }
- } catch (RemoteException | RuntimeException e) {
- throw new ResourceException(
- "Failed to calculate size for %s due to an exception.", uri, e);
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- return result;
- }
-
- /**
- * Returns true if {@code doc} is a descendant of {@code parentDoc}.
- * @throws ResourceException
- */
- boolean isDescendentOf(DocumentInfo doc, DocumentInfo parent)
- throws ResourceException {
- if (parent.isDirectory() && doc.authority.equals(parent.authority)) {
- try {
- return isChildDocument(getClient(doc), doc.derivedUri, parent.derivedUri);
- } catch (RemoteException | RuntimeException e) {
- throw new ResourceException(
- "Failed to check if %s is a child of %s due to an exception.",
- doc.derivedUri, parent.derivedUri, e);
- }
- }
- return false;
- }
-
- @Override
- public String toString() {
- return new StringBuilder()
- .append("CopyJob")
- .append("{")
- .append("id=" + id)
- .append(", details=" + details)
- .append(", destination=" + stack)
- .append("}")
- .toString();
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java
deleted file mode 100644
index f5bc85e..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.app.Notification;
-import android.app.Notification.Builder;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.net.Uri;
-import android.util.Log;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.Metrics;
-import com.android.documentsui.R;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-final class DeleteJob extends Job {
-
- private static final String TAG = "DeleteJob";
-
- private volatile int mDocsProcessed = 0;
-
- /**
- * Moves files to a destination identified by {@code destination}.
- * Performs most work by delegating to CopyJob, then deleting
- * a file after it has been copied.
- *
- * @see @link {@link Job} constructor for most param descriptions.
- *
- * @param details details that contains files to be deleted and their parent
- */
- DeleteJob(Context service, Context appContext, Listener listener,
- String id, DocumentStack stack, ClipDetails details) {
- super(service, appContext, listener, id, stack, details);
- }
-
- @Override
- Builder createProgressBuilder() {
- return super.createProgressBuilder(
- service.getString(R.string.delete_notification_title),
- R.drawable.ic_menu_delete,
- service.getString(android.R.string.cancel),
- R.drawable.ic_cab_cancel);
- }
-
- @Override
- public Notification getSetupNotification() {
- return getSetupNotification(service.getString(R.string.delete_preparing));
- }
-
- @Override
- public Notification getProgressNotification() {
- mProgressBuilder.setProgress(details.getItemCount(), mDocsProcessed, false);
- String format = service.getString(R.string.delete_progress);
- mProgressBuilder.setSubText(String.format(format, mDocsProcessed, details.getItemCount()));
-
- mProgressBuilder.setContentText(null);
-
- return mProgressBuilder.build();
- }
-
- @Override
- Notification getFailureNotification() {
- return getFailureNotification(
- R.plurals.delete_error_notification_title, R.drawable.ic_menu_delete);
- }
-
- @Override
- Notification getWarningNotification() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- void start() {
- try {
- final List<DocumentInfo> srcs = new ArrayList<>(details.getItemCount());
-
- final Iterable<Uri> uris = details.getDocs(appContext);
-
- final ContentResolver resolver = appContext.getContentResolver();
- final DocumentInfo srcParent = DocumentInfo.fromUri(resolver, details.getSrcParent());
- for (Uri uri : uris) {
- DocumentInfo doc = DocumentInfo.fromUri(resolver, uri);
- srcs.add(doc);
-
- if (DEBUG) Log.d(TAG, "Deleting document @ " + doc.derivedUri);
- try {
- deleteDocument(doc, srcParent);
-
- if (isCanceled()) {
- // Canceled, dump the rest of the work. Deleted docs are not recoverable.
- return;
- }
- } catch (ResourceException e) {
- Log.e(TAG, "Failed to delete document @ " + doc.derivedUri, e);
- onFileFailed(doc);
- }
-
- ++mDocsProcessed;
- }
- Metrics.logFileOperation(service, operationType, srcs, null);
- } catch(IOException e) {
- Log.e(TAG, "Failed to get list of docs or parent source.", e);
- failedFileCount += details.getItemCount();
- }
- }
-
- @Override
- public String toString() {
- return new StringBuilder()
- .append("DeleteJob")
- .append("{")
- .append("id=" + id)
- .append(", details=" + details)
- .append(", location=" + stack)
- .append("}")
- .toString();
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java b/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
deleted file mode 100644
index fec0050..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.annotation.IntDef;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.Shared;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.services.Job.Factory;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import javax.annotation.concurrent.GuardedBy;
-
-public class FileOperationService extends Service implements Job.Listener {
-
- private static final int POOL_SIZE = 2; // "pool size", not *max* "pool size".
- private static final int NOTIFICATION_ID_PROGRESS = 0;
- private static final int NOTIFICATION_ID_FAILURE = 1;
- private static final int NOTIFICATION_ID_WARNING = 2;
-
- public static final String TAG = "FileOperationService";
-
- public static final String EXTRA_JOB_ID = "com.android.documentsui.JOB_ID";
- public static final String EXTRA_OPERATION = "com.android.documentsui.OPERATION";
- public static final String EXTRA_CANCEL = "com.android.documentsui.CANCEL";
- public static final String EXTRA_CLIP_DETAILS = "com.android.documentsui.SRC_CLIP_DETAIL";
- public static final String EXTRA_DIALOG_TYPE = "com.android.documentsui.DIALOG_TYPE";
-
- public static final String EXTRA_SRC_LIST = "com.android.documentsui.SRC_LIST";
-
- @IntDef(flag = true, value = {
- OPERATION_UNKNOWN,
- OPERATION_COPY,
- OPERATION_MOVE,
- OPERATION_DELETE
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface OpType {}
- public static final int OPERATION_UNKNOWN = -1;
- public static final int OPERATION_COPY = 1;
- public static final int OPERATION_MOVE = 2;
- public static final int OPERATION_DELETE = 3;
-
- // TODO: Move it to a shared file when more operations are implemented.
- public static final int FAILURE_COPY = 1;
-
- // The executor and job factory are visible for testing and non-final
- // so we'll have a way to inject test doubles from the test. It's
- // a sub-optimal arrangement.
- @VisibleForTesting ExecutorService executor;
-
- // Use a separate thread pool to prioritize deletions.
- @VisibleForTesting ExecutorService deletionExecutor;
- @VisibleForTesting Factory jobFactory;
-
- // Use a handler to schedule monitor tasks.
- @VisibleForTesting Handler handler;
-
- private PowerManager mPowerManager;
- private PowerManager.WakeLock mWakeLock; // the wake lock, if held.
- private NotificationManager mNotificationManager;
-
- @GuardedBy("mRunning")
- private final Map<String, JobRecord> mRunning = new HashMap<>();
-
- private int mLastServiceId;
-
- @Override
- public void onCreate() {
- // Allow tests to pre-set these with test doubles.
- if (executor == null) {
- executor = Executors.newFixedThreadPool(POOL_SIZE);
- }
-
- if (deletionExecutor == null) {
- deletionExecutor = Executors.newCachedThreadPool();
- }
-
- if (jobFactory == null) {
- jobFactory = Job.Factory.instance;
- }
-
- if (handler == null) {
- // Monitor tasks are small enough to schedule them on main thread.
- handler = new Handler();
- }
-
- if (DEBUG) Log.d(TAG, "Created.");
- mPowerManager = getSystemService(PowerManager.class);
- mNotificationManager = getSystemService(NotificationManager.class);
- }
-
- @Override
- public void onDestroy() {
- if (DEBUG) Log.d(TAG, "Shutting down executor.");
-
- List<Runnable> unfinishedCopies = executor.shutdownNow();
- List<Runnable> unfinishedDeletions = deletionExecutor.shutdownNow();
- List<Runnable> unfinished =
- new ArrayList<>(unfinishedCopies.size() + unfinishedDeletions.size());
- unfinished.addAll(unfinishedCopies);
- unfinished.addAll(unfinishedDeletions);
- if (!unfinished.isEmpty()) {
- Log.w(TAG, "Shutting down, but executor reports running jobs: " + unfinished);
- }
-
- executor = null;
- deletionExecutor = null;
- handler = null;
-
- if (DEBUG) Log.d(TAG, "Destroyed.");
- }
-
- @Override
- public int onStartCommand(Intent intent, int flags, int serviceId) {
- // TODO: Ensure we're not being called with retry or redeliver.
- // checkArgument(flags == 0); // retry and redeliver are not supported.
-
- String jobId = intent.getStringExtra(EXTRA_JOB_ID);
- assert(jobId != null);
-
- if (DEBUG) Log.d(TAG, "onStartCommand: " + jobId + " with serviceId " + serviceId);
-
- if (intent.hasExtra(EXTRA_CANCEL)) {
- handleCancel(intent);
- } else {
- ClipDetails details = intent.getParcelableExtra(EXTRA_CLIP_DETAILS);
- assert(details.getOpType() != OPERATION_UNKNOWN);
- handleOperation(intent, jobId, details);
- }
-
- // Track the service supplied id so we can stop the service once we're out of work to do.
- mLastServiceId = serviceId;
-
- return START_NOT_STICKY;
- }
-
- private void handleOperation(Intent intent, String jobId, ClipDetails details) {
- synchronized (mRunning) {
- if (mWakeLock == null) {
- mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
- }
-
- DocumentStack stack = intent.getParcelableExtra(Shared.EXTRA_STACK);
-
- Job job = createJob(jobId, details, stack);
-
- if (job == null) {
- return;
- }
-
- mWakeLock.acquire();
-
- assert (job != null);
- if (DEBUG) Log.d(TAG, "Scheduling job " + job.id + ".");
- Future<?> future = getExecutorService(details.getOpType()).submit(job);
- mRunning.put(jobId, new JobRecord(job, future));
- }
- }
-
- /**
- * Cancels the operation corresponding to job id, identified in "EXTRA_JOB_ID".
- *
- * @param intent The cancellation intent.
- */
- private void handleCancel(Intent intent) {
- assert(intent.hasExtra(EXTRA_CANCEL));
- assert(intent.getStringExtra(EXTRA_JOB_ID) != null);
-
- String jobId = intent.getStringExtra(EXTRA_JOB_ID);
-
- if (DEBUG) Log.d(TAG, "handleCancel: " + jobId);
-
- synchronized (mRunning) {
- // Do nothing if the cancelled ID doesn't match the current job ID. This prevents racey
- // cancellation requests from affecting unrelated copy jobs. However, if the current job ID
- // is null, the service most likely crashed and was revived by the incoming cancel intent.
- // In that case, always allow the cancellation to proceed.
- JobRecord record = mRunning.get(jobId);
- if (record != null) {
- record.job.cancel();
- }
- }
-
- // Dismiss the progress notification here rather than in the copy loop. This preserves
- // interactivity for the user in case the copy loop is stalled.
- // Try to cancel it even if we don't have a job id...in case there is some sad
- // orphan notification.
- mNotificationManager.cancel(jobId, NOTIFICATION_ID_PROGRESS);
-
- // TODO: Guarantee the job is being finalized
- }
-
- /**
- * Creates a new job. Returns null if a job with {@code id} already exists.
- * @return
- */
- @GuardedBy("mRunning")
- private @Nullable Job createJob(
- String id, ClipDetails details, DocumentStack stack) {
-
- assert(details.getItemCount() > 0);
-
- if (mRunning.containsKey(id)) {
- Log.w(TAG, "Duplicate job id: " + id
- + ". Ignoring job request for details: " + details + ", stack: " + stack + ".");
- return null;
- }
-
- switch (details.getOpType()) {
- case OPERATION_COPY:
- return jobFactory.createCopy(
- this, getApplicationContext(), this, id, stack, details);
- case OPERATION_MOVE:
- return jobFactory.createMove(
- this, getApplicationContext(), this, id, stack, details);
- case OPERATION_DELETE:
- return jobFactory.createDelete(
- this, getApplicationContext(), this, id, stack, details);
- default:
- throw new UnsupportedOperationException();
- }
- }
-
- private ExecutorService getExecutorService(@OpType int operationType) {
- switch (operationType) {
- case OPERATION_COPY:
- case OPERATION_MOVE:
- return executor;
- case OPERATION_DELETE:
- return deletionExecutor;
- default:
- throw new UnsupportedOperationException();
- }
- }
-
- @GuardedBy("mRunning")
- private void deleteJob(Job job) {
- if (DEBUG) Log.d(TAG, "deleteJob: " + job.id);
-
- JobRecord record = mRunning.remove(job.id);
- assert(record != null);
- record.job.cleanup();
-
- if (mRunning.isEmpty()) {
- shutdown();
- }
- }
-
- /**
- * Most likely shuts down. Won't shut down if service has a pending
- * message. Thread pool is deal with in onDestroy.
- */
- private void shutdown() {
- if (DEBUG) Log.d(TAG, "Shutting down. Last serviceId was " + mLastServiceId);
- mWakeLock.release();
- mWakeLock = null;
-
- // Turns out, for us, stopSelfResult always returns false in tests,
- // so we can't guard executor shutdown. For this reason we move
- // executor shutdown to #onDestroy.
- boolean gonnaStop = stopSelfResult(mLastServiceId);
- if (DEBUG) Log.d(TAG, "Stopping service: " + gonnaStop);
- if (!gonnaStop) {
- Log.w(TAG, "Service should be stopping, but reports otherwise.");
- }
- }
-
- @VisibleForTesting
- boolean holdsWakeLock() {
- return mWakeLock != null && mWakeLock.isHeld();
- }
-
- @Override
- public void onStart(Job job) {
- if (DEBUG) Log.d(TAG, "onStart: " + job.id);
-
- // Show start up notification
- mNotificationManager.notify(
- job.id, NOTIFICATION_ID_PROGRESS, job.getSetupNotification());
-
- // Set up related monitor
- JobMonitor monitor = new JobMonitor(job, mNotificationManager, handler);
- monitor.start();
- }
-
- @Override
- public void onFinished(Job job) {
- assert(job.isFinished());
- if (DEBUG) Log.d(TAG, "onFinished: " + job.id);
-
- // Use the same thread of monitors to tackle notifications to avoid race conditions.
- // Otherwise we may fail to dismiss progress notification.
- handler.post(() -> {
- // Dismiss the ongoing copy notification when the copy is done.
- mNotificationManager.cancel(job.id, NOTIFICATION_ID_PROGRESS);
-
- if (job.hasFailures()) {
- Log.e(TAG, "Job failed on files: " + job.failedFileCount + ".");
- mNotificationManager.notify(
- job.id, NOTIFICATION_ID_FAILURE, job.getFailureNotification());
- }
-
- if (job.hasWarnings()) {
- if (DEBUG) Log.d(TAG, "Job finished with warnings.");
- mNotificationManager.notify(
- job.id, NOTIFICATION_ID_WARNING, job.getWarningNotification());
- }
- });
-
- synchronized (mRunning) {
- deleteJob(job);
- }
- }
-
- private static final class JobRecord {
- private final Job job;
- private final Future<?> future;
-
- public JobRecord(Job job, Future<?> future) {
- this.job = job;
- this.future = future;
- }
- }
-
- /**
- * A class used to periodically polls state of a job.
- *
- * <p>It's possible that jobs hang because underlying document providers stop responding. We
- * still need to update notifications if jobs hang, so instead of jobs pushing their states,
- * we poll states of jobs.
- */
- private static final class JobMonitor implements Runnable {
- private static final long PROGRESS_INTERVAL_MILLIS = 500L;
-
- private final Job mJob;
- private final NotificationManager mNotificationManager;
- private final Handler mHandler;
-
- private JobMonitor(Job job, NotificationManager notificationManager, Handler handler) {
- mJob = job;
- mNotificationManager = notificationManager;
- mHandler = handler;
- }
-
- private void start() {
- mHandler.post(this);
- }
-
- @Override
- public void run() {
- if (mJob.isFinished()) {
- // Finish notification is already shown. Progress notification is removed.
- // Just finish itself.
- return;
- }
-
- // Only job in set up state has progress bar
- if (mJob.getState() == Job.STATE_SET_UP) {
- mNotificationManager.notify(
- mJob.id, NOTIFICATION_ID_PROGRESS, mJob.getProgressNotification());
- }
-
- mHandler.postDelayed(this, PROGRESS_INTERVAL_MILLIS);
- }
- }
-
- @Override
- public IBinder onBind(Intent intent) {
- return null; // Boilerplate. See super#onBind
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/FileOperations.java b/packages/DocumentsUI/src/com/android/documentsui/services/FileOperations.java
deleted file mode 100644
index 034c0d7..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/FileOperations.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static android.os.SystemClock.elapsedRealtime;
-
-import static com.android.documentsui.Shared.DEBUG;
-import static com.android.documentsui.Shared.EXTRA_STACK;
-import static com.android.documentsui.services.FileOperationService.EXTRA_CANCEL;
-import static com.android.documentsui.services.FileOperationService.EXTRA_JOB_ID;
-import static com.android.documentsui.services.FileOperationService.EXTRA_CLIP_DETAILS;
-
-import android.annotation.IntDef;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Parcelable;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Helper functions for starting various file operations.
- */
-public final class FileOperations {
-
- private static final String TAG = "FileOperations";
-
- private static final IdBuilder idBuilder = new IdBuilder();
-
- private FileOperations() {}
-
- public static String createJobId() {
- return idBuilder.getNext();
- }
-
- /**
- * Tries to start the activity. Returns the job id.
- */
- public static String start(Context context, ClipDetails details,
- DocumentStack stack, Callback callback) {
-
- if (DEBUG) Log.d(TAG, "Handling generic 'start' call.");
-
- String jobId = createJobId();
- Intent intent = createBaseIntent(context, jobId, details, stack);
-
- callback.onOperationResult(
- Callback.STATUS_ACCEPTED, details.getOpType(), details.getItemCount());
-
- context.startService(intent);
-
- return jobId;
- }
-
- @VisibleForTesting
- public static void cancel(Activity activity, String jobId) {
- if (DEBUG) Log.d(TAG, "Attempting to canceling operation: " + jobId);
-
- Intent intent = new Intent(activity, FileOperationService.class);
- intent.putExtra(EXTRA_CANCEL, true);
- intent.putExtra(EXTRA_JOB_ID, jobId);
-
- activity.startService(intent);
- }
-
- /**
- * Starts the service for an operation.
- *
- * @param jobId A unique jobid for this job.
- * Use {@link #createJobId} if you don't have one handy.
- * @param details the clip details that contains source files and their parent
- * @return Id of the job.
- */
- public static Intent createBaseIntent(
- Context context, String jobId, ClipDetails details,
- DocumentStack localeStack) {
-
- Intent intent = new Intent(context, FileOperationService.class);
- intent.putExtra(EXTRA_JOB_ID, jobId);
- intent.putExtra(EXTRA_CLIP_DETAILS, details);
- intent.putExtra(EXTRA_STACK, (Parcelable) localeStack);
-
- return intent;
- }
-
- private static final class IdBuilder {
-
- // Remember last job time so we can guard against collisions.
- private long mLastJobTime;
-
- // If we detect a collision, use subId to make distinct.
- private int mSubId;
-
- public synchronized String getNext() {
- long time = elapsedRealtime();
- if (time == mLastJobTime) {
- mSubId++;
- } else {
- mSubId = 0;
- }
- mLastJobTime = time;
- return String.valueOf(mLastJobTime) + "-" + String.valueOf(mSubId);
- }
- }
-
- /**
- * A functional callback called when the file operation starts or fails to start.
- */
- @FunctionalInterface
- public interface Callback {
- @Retention(RetentionPolicy.SOURCE)
- @IntDef({STATUS_ACCEPTED, STATUS_REJECTED})
- @interface Status {}
- static final int STATUS_ACCEPTED = 0;
- static final int STATUS_REJECTED = 1;
-
- /**
- * Performs operation when the file operation starts or fails to start.
- *
- * @param status {@link Status} of this operation
- * @param opType file operation type {@link OpType}.
- * @param docCount number of documents operated.
- */
- void onOperationResult(@Status int status, @OpType int opType, int docCount);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java
deleted file mode 100644
index 0b4735f..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.DocumentsApplication.acquireUnstableProviderOrThrow;
-import static com.android.documentsui.services.FileOperationService.EXTRA_CANCEL;
-import static com.android.documentsui.services.FileOperationService.EXTRA_DIALOG_TYPE;
-import static com.android.documentsui.services.FileOperationService.EXTRA_JOB_ID;
-import static com.android.documentsui.services.FileOperationService.EXTRA_OPERATION;
-import static com.android.documentsui.services.FileOperationService.EXTRA_SRC_LIST;
-import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
-import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE;
-import static com.android.documentsui.services.FileOperationService.OPERATION_MOVE;
-import static com.android.documentsui.services.FileOperationService.OPERATION_UNKNOWN;
-
-import android.annotation.DrawableRes;
-import android.annotation.IntDef;
-import android.annotation.PluralsRes;
-import android.app.Notification;
-import android.app.Notification.Builder;
-import android.app.PendingIntent;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Parcelable;
-import android.os.RemoteException;
-import android.provider.DocumentsContract;
-import android.util.Log;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.FilesActivity;
-import com.android.documentsui.Metrics;
-import com.android.documentsui.OperationDialogFragment;
-import com.android.documentsui.R;
-import com.android.documentsui.Shared;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A mashup of work item and ui progress update factory. Used by {@link FileOperationService}
- * to do work and show progress relating to this work.
- */
-abstract public class Job implements Runnable {
- private static final String TAG = "Job";
-
- @Retention(RetentionPolicy.SOURCE)
- @IntDef({STATE_CREATED, STATE_STARTED, STATE_SET_UP, STATE_COMPLETED, STATE_CANCELED})
- @interface State {}
- static final int STATE_CREATED = 0;
- static final int STATE_STARTED = 1;
- static final int STATE_SET_UP = 2;
- static final int STATE_COMPLETED = 3;
- /**
- * A job is in canceled state as long as {@link #cancel()} is called on it, even after it is
- * completed.
- */
- static final int STATE_CANCELED = 4;
-
- static final String INTENT_TAG_WARNING = "warning";
- static final String INTENT_TAG_FAILURE = "failure";
- static final String INTENT_TAG_PROGRESS = "progress";
- static final String INTENT_TAG_CANCEL = "cancel";
-
- final Context service;
- final Context appContext;
- final Listener listener;
-
- final @OpType int operationType;
- final String id;
- final DocumentStack stack;
- final ClipDetails details;
-
- int failedFileCount = 0;
- final ArrayList<DocumentInfo> failedFiles = new ArrayList<>();
- final Notification.Builder mProgressBuilder;
-
- private final Map<String, ContentProviderClient> mClients = new HashMap<>();
- private volatile @State int mState = STATE_CREATED;
-
- /**
- * A simple progressable job, much like an AsyncTask, but with support
- * for providing various related notification, progress and navigation information.
- * @param service The service context in which this job is running.
- * @param appContext The context of the invoking application. This is usually
- * just {@code getApplicationContext()}.
- * @param listener
- * @param id Arbitrary string ID
- * @param stack The documents stack context relating to this request. This is the
- * destination in the Files app where the user will be take when the
- * navigation intent is invoked (presumably from notification).
- * @param details details that contains {@link FileOperationService.OpType}
- */
- Job(Context service, Context appContext, Listener listener,
- String id, DocumentStack stack, ClipDetails details) {
-
- assert(details.getOpType() != OPERATION_UNKNOWN);
-
- this.service = service;
- this.appContext = appContext;
- this.listener = listener;
- this.operationType = details.getOpType();
-
- this.id = id;
- this.stack = stack;
- this.details = details;
-
- mProgressBuilder = createProgressBuilder();
- }
-
- @Override
- public final void run() {
- if (isCanceled()) {
- // Canceled before running
- return;
- }
-
- mState = STATE_STARTED;
- listener.onStart(this);
- try {
- boolean result = setUp();
- if (result && !isCanceled()) {
- mState = STATE_SET_UP;
- start();
- }
- } catch (RuntimeException e) {
- // No exceptions should be thrown here, as all calls to the provider must be
- // handled within Job implementations. However, just in case catch them here.
- Log.e(TAG, "Operation failed due to an unhandled runtime exception.", e);
- Metrics.logFileOperationErrors(service, operationType, failedFiles);
- } finally {
- mState = (mState == STATE_STARTED || mState == STATE_SET_UP) ? STATE_COMPLETED : mState;
- listener.onFinished(this);
-
- // NOTE: If this details is a JumboClipDetails, and it's still referred in primary clip
- // at this point, user won't be able to paste it to anywhere else because the underlying
- details.dispose(appContext);
- }
- }
-
- boolean setUp() {
- return true;
- }
- abstract void start();
-
- abstract Notification getSetupNotification();
- abstract Notification getProgressNotification();
- abstract Notification getFailureNotification();
-
- abstract Notification getWarningNotification();
-
- Uri getDataUriForIntent(String tag) {
- return Uri.parse(String.format("data,%s-%s", tag, id));
- }
-
- ContentProviderClient getClient(DocumentInfo doc) throws RemoteException {
- ContentProviderClient client = mClients.get(doc.authority);
- if (client == null) {
- // Acquire content providers.
- client = acquireUnstableProviderOrThrow(
- getContentResolver(),
- doc.authority);
-
- mClients.put(doc.authority, client);
- }
-
- assert(client != null);
- return client;
- }
-
- final void cleanup() {
- for (ContentProviderClient client : mClients.values()) {
- ContentProviderClient.releaseQuietly(client);
- }
- }
-
- final @State int getState() {
- return mState;
- }
-
- final void cancel() {
- mState = STATE_CANCELED;
- Metrics.logFileOperationCancelled(service, operationType);
- }
-
- final boolean isCanceled() {
- return mState == STATE_CANCELED;
- }
-
- final boolean isFinished() {
- return mState == STATE_CANCELED || mState == STATE_COMPLETED;
- }
-
- final ContentResolver getContentResolver() {
- return service.getContentResolver();
- }
-
- void onFileFailed(DocumentInfo file) {
- ++failedFileCount;
- failedFiles.add(file);
- }
-
- final boolean hasFailures() {
- return failedFileCount > 0;
- }
-
- boolean hasWarnings() {
- return false;
- }
-
- final void deleteDocument(DocumentInfo doc, DocumentInfo parent) throws ResourceException {
- try {
- if (doc.isRemoveSupported()) {
- DocumentsContract.removeDocument(getClient(doc), doc.derivedUri, parent.derivedUri);
- } else if (doc.isDeleteSupported()) {
- DocumentsContract.deleteDocument(getClient(doc), doc.derivedUri);
- } else {
- throw new ResourceException("Unable to delete source document as the file is " +
- "not deletable nor removable: %s.", doc.derivedUri);
- }
- } catch (RemoteException | RuntimeException e) {
- throw new ResourceException("Failed to delete file %s due to an exception.",
- doc.derivedUri, e);
- }
- }
-
- Notification getSetupNotification(String content) {
- mProgressBuilder.setProgress(0, 0, true)
- .setContentText(content);
- return mProgressBuilder.build();
- }
-
- Notification getFailureNotification(@PluralsRes int titleId, @DrawableRes int icon) {
- final Intent navigateIntent = buildNavigateIntent(INTENT_TAG_FAILURE);
- navigateIntent.putExtra(EXTRA_DIALOG_TYPE, OperationDialogFragment.DIALOG_TYPE_FAILURE);
- navigateIntent.putExtra(EXTRA_OPERATION, operationType);
- navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, failedFiles);
-
- final Notification.Builder errorBuilder = new Notification.Builder(service)
- .setContentTitle(service.getResources().getQuantityString(titleId,
- failedFileCount, failedFileCount))
- .setContentText(service.getString(R.string.notification_touch_for_details))
- .setContentIntent(PendingIntent.getActivity(appContext, 0, navigateIntent,
- PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT))
- .setCategory(Notification.CATEGORY_ERROR)
- .setSmallIcon(icon)
- .setAutoCancel(true);
-
- return errorBuilder.build();
- }
-
- abstract Builder createProgressBuilder();
-
- final Builder createProgressBuilder(
- String title, @DrawableRes int icon,
- String actionTitle, @DrawableRes int actionIcon) {
- Notification.Builder progressBuilder = new Notification.Builder(service)
- .setContentTitle(title)
- .setContentIntent(
- PendingIntent.getActivity(appContext, 0,
- buildNavigateIntent(INTENT_TAG_PROGRESS), 0))
- .setCategory(Notification.CATEGORY_PROGRESS)
- .setSmallIcon(icon)
- .setOngoing(true);
-
- final Intent cancelIntent = createCancelIntent();
-
- progressBuilder.addAction(
- actionIcon,
- actionTitle,
- PendingIntent.getService(
- service,
- 0,
- cancelIntent,
- PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT));
-
- return progressBuilder;
- }
-
- /**
- * Creates an intent for navigating back to the destination directory.
- */
- Intent buildNavigateIntent(String tag) {
- Intent intent = new Intent(service, FilesActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setAction(DocumentsContract.ACTION_BROWSE);
- intent.setData(getDataUriForIntent(tag));
- intent.putExtra(Shared.EXTRA_STACK, (Parcelable) stack);
- return intent;
- }
-
- Intent createCancelIntent() {
- final Intent cancelIntent = new Intent(service, FileOperationService.class);
- cancelIntent.setData(getDataUriForIntent(INTENT_TAG_CANCEL));
- cancelIntent.putExtra(EXTRA_CANCEL, true);
- cancelIntent.putExtra(EXTRA_JOB_ID, id);
- return cancelIntent;
- }
-
- @Override
- public String toString() {
- return new StringBuilder()
- .append("Job")
- .append("{")
- .append("id=" + id)
- .append("}")
- .toString();
- }
-
- /**
- * Factory class that facilitates our testing FileOperationService.
- */
- static class Factory {
-
- static final Factory instance = new Factory();
-
- Job createCopy(Context service, Context appContext, Listener listener,
- String id, DocumentStack stack, ClipDetails details) {
- assert(details.getOpType() == OPERATION_COPY);
- assert(details.getItemCount() > 0);
- assert(stack.peek().isCreateSupported());
- return new CopyJob(service, appContext, listener, id, stack, details);
- }
-
- Job createMove(Context service, Context appContext, Listener listener,
- String id, DocumentStack stack, ClipDetails details) {
- assert(details.getOpType() == OPERATION_MOVE);
- assert(details.getItemCount() > 0);
- assert(stack.peek().isCreateSupported());
- return new MoveJob(service, appContext, listener, id, stack, details);
- }
-
- Job createDelete(Context service, Context appContext, Listener listener,
- String id, DocumentStack stack, ClipDetails details) {
- assert(details.getOpType() == OPERATION_DELETE);
- assert(details.getItemCount() > 0);
- // stack is empty if we delete docs from recent.
- // we can't currently delete from archives.
- assert(stack.isEmpty() || stack.peek().isDirectory());
- return new DeleteJob(service, appContext, listener, id, stack, details);
- }
- }
-
- /**
- * Listener interface employed by the service that owns us as well as tests.
- */
- interface Listener {
- void onStart(Job job);
- void onFinished(Job job);
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java
deleted file mode 100644
index 75c4dc0..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.Shared.DEBUG;
-
-import android.app.Notification;
-import android.app.Notification.Builder;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.RemoteException;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.util.Log;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.R;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-
-import java.io.FileNotFoundException;
-
-// TODO: Stop extending CopyJob.
-final class MoveJob extends CopyJob {
-
- private static final String TAG = "MoveJob";
-
- DocumentInfo mSrcParent;
-
- /**
- * Moves files to a destination identified by {@code destination}.
- * Performs most work by delegating to CopyJob, then deleting
- * a file after it has been copied.
- *
- * @see @link {@link Job} constructor for most param descriptions.
- *
- * @param details {@link ClipDetails} that contains list of files to be moved and their parent
- */
- MoveJob(Context service, Context appContext, Listener listener,
- String id, DocumentStack destination, ClipDetails details) {
- super(service, appContext, listener, id, destination, details);
- }
-
- @Override
- Builder createProgressBuilder() {
- return super.createProgressBuilder(
- service.getString(R.string.move_notification_title),
- R.drawable.ic_menu_copy,
- service.getString(android.R.string.cancel),
- R.drawable.ic_cab_cancel);
- }
-
- @Override
- public Notification getSetupNotification() {
- return getSetupNotification(service.getString(R.string.move_preparing));
- }
-
- @Override
- public Notification getProgressNotification() {
- return getProgressNotification(R.string.copy_remaining);
- }
-
- @Override
- Notification getFailureNotification() {
- return getFailureNotification(
- R.plurals.move_error_notification_title, R.drawable.ic_menu_copy);
- }
-
- @Override
- public void start() {
- final ContentResolver resolver = appContext.getContentResolver();
- try {
- mSrcParent = DocumentInfo.fromUri(resolver, details.getSrcParent());
- } catch(FileNotFoundException e) {
- Log.e(TAG, "Failed to create srcParent.", e);
- failedFileCount += details.getItemCount();
- return;
- }
-
- super.start();
- }
-
- void processDocument(DocumentInfo src, DocumentInfo srcParent, DocumentInfo dest)
- throws ResourceException {
-
- // TODO: When optimized move kicks in, we're not making any progress updates. FIX IT!
-
- // When moving within the same provider, try to use optimized moving.
- // If not supported, then fallback to byte-by-byte copy/move.
- if (src.authority.equals(dest.authority)) {
- if ((src.flags & Document.FLAG_SUPPORTS_MOVE) != 0) {
- try {
- if (DocumentsContract.moveDocument(getClient(src), src.derivedUri,
- srcParent != null ? srcParent.derivedUri : mSrcParent.derivedUri,
- dest.derivedUri) != null) {
- return;
- }
- } catch (RemoteException | RuntimeException e) {
- Log.e(TAG, "Provider side move failed for: " + src.derivedUri
- + " due to an exception: ", e);
- }
- // If optimized move fails, then fallback to byte-by-byte copy.
- if (DEBUG) Log.d(TAG, "Fallback to byte-by-byte move for: " + src.derivedUri);
- }
- }
-
- // Moving virtual files by bytes is not supported. This is because, it would involve
- // conversion, and the source file should not be deleted in such case (as it's a different
- // file).
- if (src.isVirtualDocument()) {
- throw new ResourceException("Cannot move virtual file %s byte by byte.",
- src.derivedUri);
- }
-
- // If we couldn't do an optimized copy...we fall back to vanilla byte copy.
- byteCopyDocument(src, dest);
-
- // Remove the source document.
- deleteDocument(src, srcParent);
- }
-
- @Override
- public String toString() {
- return new StringBuilder()
- .append("MoveJob")
- .append("{")
- .append("id=" + id)
- .append(", srcs=" + mSrcs)
- .append(", srcParent=" + mSrcParent)
- .append(", destination=" + stack)
- .append("}")
- .toString();
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/ResourceException.java b/packages/DocumentsUI/src/com/android/documentsui/services/ResourceException.java
deleted file mode 100644
index 7d3d91a..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/services/ResourceException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import android.net.Uri;
-
-public class ResourceException extends Exception {
- public ResourceException(String message, Exception e) {
- super(message, e);
- }
-
- public ResourceException(String message, Uri uri1, Exception e) {
- super(String.format(message, uri1.toString()), e);
- }
-
- public ResourceException(String message, Uri uri1, Uri uri2, Exception e) {
- super(String.format(message, uri1.toString(), uri2.toString()), e);
- }
-
- public ResourceException(String message) {
- super(message);
- }
-
- public ResourceException(String message, Uri uri1) {
- super(String.format(message, uri1.toString()));
- }
-
- public ResourceException(String message, Uri uri1, Uri uri2) {
- super(message.format(uri1.toString(), uri2.toString()));
- }
-}
diff --git a/packages/DocumentsUI/tests/Android.mk b/packages/DocumentsUI/tests/Android.mk
deleted file mode 100644
index febc542..0000000
--- a/packages/DocumentsUI/tests/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-#LOCAL_SDK_VERSION := current
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava
-LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-
-LOCAL_PACKAGE_NAME := DocumentsUITests
-LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/packages/DocumentsUI/tests/AndroidManifest.xml b/packages/DocumentsUI/tests/AndroidManifest.xml
deleted file mode 100644
index 0b76766..0000000
--- a/packages/DocumentsUI/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.documentsui.tests">
-
- <uses-permission android:name="android.permission.INTERNET" />
-
- <application>
- <uses-library android:name="android.test.runner" />
- <provider
- android:name="com.android.documentsui.StubProvider"
- android:authorities="com.android.documentsui.stubprovider"
- android:exported="true"
- android:grantUriPermissions="true"
- android:permission="android.permission.MANAGE_DOCUMENTS"
- android:enabled="true">
- <intent-filter>
- <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
- </intent-filter>
- </provider>
- </application>
-
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.documentsui"
- android:label="Tests for DocumentsUI" />
-
-</manifest>
diff --git a/packages/DocumentsUI/tests/jarjar-rules.txt b/packages/DocumentsUI/tests/jarjar-rules.txt
deleted file mode 100644
index 360b69b..0000000
--- a/packages/DocumentsUI/tests/jarjar-rules.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-rule com.google.common.** docsui.@0
-rule android.support.annotation.** docsui.@0
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java
deleted file mode 100644
index 683fd6c..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.StubProvider.DEFAULT_AUTHORITY;
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.RemoteException;
-import android.provider.DocumentsContract.Document;
-import android.support.test.uiautomator.Configurator;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-import android.view.MotionEvent;
-
-import com.android.documentsui.BaseActivity;
-import com.android.documentsui.EventListener;
-import com.android.documentsui.bots.DirectoryListBot;
-import com.android.documentsui.bots.KeyboardBot;
-import com.android.documentsui.bots.RootsListBot;
-import com.android.documentsui.bots.UiBot;
-import com.android.documentsui.model.RootInfo;
-
-/**
- * Provides basic test environment for UI tests:
- * - Launches activity
- * - Creates and gives access to test root directories and test files
- * - Cleans up the test environment
- */
-public abstract class ActivityTest<T extends Activity> extends ActivityInstrumentationTestCase2<T> {
-
- static final int TIMEOUT = 5000;
-
- // Testing files. For custom ones, override initTestFiles().
- public static final String dirName1 = "Dir1";
- public static final String fileName1 = "file1.log";
- public static final String fileName2 = "file12.png";
- public static final String fileName3 = "anotherFile0.log";
- public static final String fileName4 = "poodles.text";
- public static final String fileNameNoRename = "NO_RENAMEfile.txt";
-
- public Bots bots;
- public UiDevice device;
- public Context context;
-
- public RootInfo rootDir0;
- public RootInfo rootDir1;
- ContentResolver mResolver;
- DocumentsProviderHelper mDocsHelper;
- ContentProviderClient mClient;
-
- public ActivityTest(Class<T> activityClass) {
- super(activityClass);
- }
-
- /*
- * Returns the root that will be opened within the activity.
- * By default tests are started with one of the test roots.
- * Override the method if you want to open different root on start.
- * @return Root that will be opened. Return null if you want to open activity's default root.
- */
- @Nullable
- protected RootInfo getInitialRoot() {
- return rootDir0;
- }
-
- /**
- * Returns the authority of the testing provider begin used.
- * By default it's StubProvider's authority.
- * @return Authority of the provider.
- */
- protected String getTestingProviderAuthority() {
- return DEFAULT_AUTHORITY;
- }
-
- /**
- * Resolves testing roots.
- */
- protected void setupTestingRoots() throws RemoteException {
- rootDir0 = mDocsHelper.getRoot(ROOT_0_ID);
- rootDir1 = mDocsHelper.getRoot(ROOT_1_ID);
- }
-
- @Override
- public void setUp() throws Exception {
- device = UiDevice.getInstance(getInstrumentation());
- // NOTE: Must be the "target" context, else security checks in content provider will fail.
- context = getInstrumentation().getTargetContext();
-
- bots = new Bots(device, context, TIMEOUT);
-
- Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_MOUSE);
-
- mResolver = context.getContentResolver();
- mClient = mResolver.acquireUnstableContentProviderClient(getTestingProviderAuthority());
- mDocsHelper = new DocumentsProviderHelper(getTestingProviderAuthority(), mClient);
-
- setupTestingRoots();
-
- launchActivity();
- resetStorage();
- }
-
- @Override
- public void tearDown() throws Exception {
- mClient.release();
- super.tearDown();
- }
-
- void launchActivity() {
- final Intent intent = context.getPackageManager().getLaunchIntentForPackage(
- UiBot.TARGET_PKG);
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
- if (getInitialRoot() != null) {
- intent.setData(getInitialRoot().getUri());
- }
- setActivityIntent(intent);
- getActivity(); // Launch the activity.
- }
-
- void resetStorage() throws RemoteException {
- mClient.call("clear", null, null);
- device.waitForIdle();
- }
-
- void initTestFiles() throws RemoteException {
- mDocsHelper.createFolder(rootDir0, dirName1);
- mDocsHelper.createDocument(rootDir0, "text/plain", fileName1);
- mDocsHelper.createDocument(rootDir0, "image/png", fileName2);
- mDocsHelper.createDocumentWithFlags(rootDir0.documentId, "text/plain", fileNameNoRename,
- Document.FLAG_SUPPORTS_WRITE);
-
- mDocsHelper.createDocument(rootDir1, "text/plain", fileName3);
- mDocsHelper.createDocument(rootDir1, "text/plain", fileName4);
- }
-
- void assertDefaultContentOfTestDir0() throws UiObjectNotFoundException {
- bots.directory.assertDocumentsCount(4);
- bots.directory.assertDocumentsPresent(fileName1, fileName2, dirName1, fileNameNoRename);
- }
-
- void assertDefaultContentOfTestDir1() throws UiObjectNotFoundException {
- bots.directory.assertDocumentsCount(2);
- bots.directory.assertDocumentsPresent(fileName3, fileName4);
- }
-
- /**
- * Handy collection of bots for working with Files app.
- */
- public static final class Bots {
- public final UiBot main;
- public final RootsListBot roots;
- public final DirectoryListBot directory;
- public final KeyboardBot keyboard;
-
- private Bots(UiDevice device, Context context, int timeout) {
- this.main = new UiBot(device, context, TIMEOUT);
- this.roots = new RootsListBot(device, context, TIMEOUT);
- this.directory = new DirectoryListBot(device, context, TIMEOUT);
- this.keyboard = new KeyboardBot(device, context, TIMEOUT);
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ClipDetailsTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ClipDetailsTest.java
deleted file mode 100644
index b0647b8..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/ClipDetailsTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.DocumentsContract;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.documentsui.services.FileOperationService;
-import com.android.documentsui.services.FileOperationService.OpType;
-import com.android.documentsui.testing.TestScheduledExecutorService;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ClipDetailsTest {
-
- private static final String AUTHORITY = "foo";
- private static final @OpType int OP_TYPE = FileOperationService.OPERATION_COPY;
- private static final Uri SRC_PARENT =
- DocumentsContract.buildDocumentUri(AUTHORITY, Integer.toString(0));
- private static final List<Uri> SHORT_URI_LIST = createList(3);
- private static final List<Uri> LONG_URI_LIST = createList(Shared.MAX_DOCS_IN_INTENT + 5);
-
- @Rule
- public TemporaryFolder folder = new TemporaryFolder();
-
- private TestScheduledExecutorService mExecutor;
- private ClipStorage mStorage;
-
- @Before
- public void setUp() {
- mExecutor = new TestScheduledExecutorService();
- AsyncTask.setDefaultExecutor(mExecutor);
-
- mStorage = new ClipStorage(folder.getRoot());
- }
-
- @AfterClass
- public static void tearDownOnce() {
- AsyncTask.setDefaultExecutor(AsyncTask.SERIAL_EXECUTOR);
- }
-
- @Test
- public void testOpTypeEquals_shortList() {
- ClipDetails details = createDetailsWithShortList();
-
- assertEquals(OP_TYPE, details.getOpType());
- }
-
- @Test
- public void testOpTypeEquals_longList() {
- ClipDetails details = createDetailsWithLongList();
-
- assertEquals(OP_TYPE, details.getOpType());
- }
-
- @Test
- public void testItemCountEquals_shortList() {
- ClipDetails details = createDetailsWithShortList();
-
- assertEquals(SHORT_URI_LIST.size(), details.getItemCount());
- }
-
- @Test
- public void testItemCountEquals_longList() {
- ClipDetails details = createDetailsWithLongList();
-
- assertEquals(LONG_URI_LIST.size(), details.getItemCount());
- }
-
- @Test
- public void testGetDocsEquals_shortList() throws Exception {
- ClipDetails details = createDetailsWithShortList();
-
- assertIterableEquals(SHORT_URI_LIST, details.getDocs(mStorage));
- }
-
- @Test
- public void testGetDocsEquals_longList() throws Exception {
- ClipDetails details = createDetailsWithLongList();
-
- assertIterableEquals(LONG_URI_LIST, details.getDocs(mStorage));
- }
-
- @Test
- public void testDispose_shortList() throws Exception {
- ClipDetails details = createDetailsWithShortList();
-
- details.dispose(mStorage);
- }
-
- @Test
- public void testDispose_longList() throws Exception {
- ClipDetails details = createDetailsWithLongList();
-
- details.dispose(mStorage);
- }
-
- private ClipDetails createDetailsWithShortList() {
- return ClipDetails.createClipDetails(OP_TYPE, SRC_PARENT, SHORT_URI_LIST, mStorage);
- }
-
- private ClipDetails createDetailsWithLongList() {
- ClipDetails details =
- ClipDetails.createClipDetails(OP_TYPE, SRC_PARENT, LONG_URI_LIST, mStorage);
-
- mExecutor.runAll();
-
- return details;
- }
-
- private void assertIterableEquals(Iterable<Uri> expected, Iterable<Uri> value) {
- Iterator<Uri> expectedIter = expected.iterator();
- Iterator<Uri> valueIter = value.iterator();
-
- while (expectedIter.hasNext() && valueIter.hasNext()) {
- assertEquals(expectedIter.next(), valueIter.next());
- }
-
- assertFalse(expectedIter.hasNext());
- assertFalse(expectedIter.hasNext());
- }
-
- private static List<Uri> createList(int count) {
- List<Uri> uris = new ArrayList<>(count);
-
- for (int i = 0; i < count; ++i) {
- uris.add(DocumentsContract.buildDocumentUri(AUTHORITY, Integer.toString(i)));
- }
-
- return uris;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ClipStorageTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ClipStorageTest.java
deleted file mode 100644
index 851000b..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/ClipStorageTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.documentsui.ClipStorage.Reader;
-import com.android.documentsui.dirlist.TestModel;
-import com.android.documentsui.testing.TestScheduledExecutorService;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ClipStorageTest {
- private static final List<Uri> TEST_URIS = createList(
- "content://ham/fancy",
- "content://poodle/monkey/giraffe");
-
- @Rule
- public TemporaryFolder folder = new TemporaryFolder();
-
- private TestScheduledExecutorService mExecutor;
-
- private ClipStorage mStorage;
- private TestModel mModel;
-
- private long mTag;
-
- @Before
- public void setUp() {
- File clipDir = ClipStorage.prepareStorage(folder.getRoot());
- mStorage = new ClipStorage(clipDir);
-
- mExecutor = new TestScheduledExecutorService();
- AsyncTask.setDefaultExecutor(mExecutor);
-
- mTag = mStorage.createTag();
- }
-
- @AfterClass
- public static void tearDownOnce() {
- AsyncTask.setDefaultExecutor(AsyncTask.SERIAL_EXECUTOR);
- }
-
- @Test
- public void testWrite() throws Exception {
- writeAll(mTag, TEST_URIS);
- }
-
- @Test
- public void testRead() throws Exception {
- writeAll(mTag, TEST_URIS);
- List<Uri> uris = new ArrayList<>();
- try(Reader provider = mStorage.createReader(mTag)) {
- for (Uri uri : provider) {
- uris.add(uri);
- }
- }
- assertEquals(TEST_URIS, uris);
- }
-
- @Test
- public void testDelete() throws Exception {
- writeAll(mTag, TEST_URIS);
- mStorage.delete(mTag);
- try {
- mStorage.createReader(mTag);
- } catch (IOException expected) {}
- }
-
- @Test
- public void testPrepareStorage_CreatesDir() throws Exception {
- File clipDir = ClipStorage.prepareStorage(folder.getRoot());
- assertTrue(clipDir.exists());
- assertTrue(clipDir.isDirectory());
- assertFalse(clipDir.equals(folder.getRoot()));
- }
-
- private void writeAll(long tag, List<Uri> uris) {
- new ClipStorage.PersistTask(mStorage, uris, tag).execute();
- mExecutor.runAll();
- }
-
- private static List<Uri> createList(String... values) {
- List<Uri> uris = new ArrayList<>(values.length);
- for (int i = 0; i < values.length; i++) {
- uris.add(i, Uri.parse(values[i]));
- }
- return uris;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/DocumentsMenuManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/DocumentsMenuManagerTest.java
deleted file mode 100644
index b6540d5..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/DocumentsMenuManagerTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.State.ACTION_CREATE;
-import static com.android.documentsui.State.ACTION_OPEN;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.documentsui.testing.TestDirectoryDetails;
-import com.android.documentsui.testing.TestMenu;
-import com.android.documentsui.testing.TestMenuItem;
-import com.android.documentsui.testing.TestSearchViewManager;
-import com.android.documentsui.testing.TestSelectionDetails;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public final class DocumentsMenuManagerTest {
-
- private TestMenu testMenu;
- private TestMenuItem open;
- private TestMenuItem share;
- private TestMenuItem delete;
- private TestMenuItem rename;
- private TestMenuItem selectAll;
- private TestMenuItem createDir;
- private TestMenuItem fileSize;
- private TestMenuItem grid;
- private TestMenuItem list;
- private TestMenuItem cut;
- private TestMenuItem copy;
- private TestMenuItem paste;
- private TestMenuItem sort;
- private TestMenuItem sortSize;
- private TestMenuItem advanced;
-
- private TestSelectionDetails selectionDetails;
- private TestDirectoryDetails directoryDetails;
- private TestSearchViewManager testSearchManager;
- private State state = new State();
-
- @Before
- public void setUp() {
- testMenu = TestMenu.create();
- open = testMenu.findItem(R.id.menu_open);
- share = testMenu.findItem(R.id.menu_share);
- delete = testMenu.findItem(R.id.menu_delete);
- rename = testMenu.findItem(R.id.menu_rename);
- selectAll = testMenu.findItem(R.id.menu_select_all);
- createDir = testMenu.findItem(R.id.menu_create_dir);
- fileSize = testMenu.findItem(R.id.menu_file_size);
- grid = testMenu.findItem(R.id.menu_grid);
- list = testMenu.findItem(R.id.menu_list);
- cut = testMenu.findItem(R.id.menu_cut_to_clipboard);
- copy = testMenu.findItem(R.id.menu_copy_to_clipboard);
- paste = testMenu.findItem(R.id.menu_paste_from_clipboard);
- sort = testMenu.findItem(R.id.menu_sort);
- sortSize = testMenu.findItem(R.id.menu_sort_size);
- advanced = testMenu.findItem(R.id.menu_advanced);
-
- selectionDetails = new TestSelectionDetails();
- directoryDetails = new TestDirectoryDetails();
- testSearchManager = new TestSearchViewManager();
- state.action = ACTION_CREATE;
- state.allowMultiple = true;
- }
-
- @Test
- public void testActionMenu() {
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- open.assertInvisible();
- delete.assertInvisible();
- share.assertInvisible();
- rename.assertInvisible();
- selectAll.assertVisible();
- }
-
- @Test
- public void testActionMenu_openAction() {
- state.action = ACTION_OPEN;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- open.assertVisible();
- }
-
-
- @Test
- public void testActionMenu_notAllowMultiple() {
- state.allowMultiple = false;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- selectAll.assertInvisible();
- }
-
- @Test
- public void testOptionMenu() {
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- sort.assertEnabled();
- sortSize.assertInvisible();
- advanced.assertInvisible();
- advanced.assertTitle(R.string.menu_advanced_show);
- createDir.assertDisabled();
- fileSize.assertInvisible();
- assertTrue(testSearchManager.showMenuCalled());
- }
-
- @Test
- public void testOptionMenu_hideSize() {
- state.showSize = true;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- sortSize.assertVisible();
- }
-
- @Test
- public void testOptionMenu_notPicking() {
- state.action = ACTION_OPEN;
- state.derivedMode = State.MODE_LIST;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- createDir.assertInvisible();
- grid.assertVisible();
- list.assertInvisible();
- assertFalse(testSearchManager.showMenuCalled());
- }
-
- @Test
- public void testOptionMenu_canCreateDirectory() {
- directoryDetails.canCreateDirectory = true;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- createDir.assertEnabled();
- }
-
- @Test
- public void testOptionMenu_showAdvanced() {
- state.showAdvanced = true;
- state.showAdvancedOption = true;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- advanced.assertVisible();
- advanced.assertTitle(R.string.menu_advanced_hide);
- }
-
- @Test
- public void testOptionMenu_inRecents() {
- directoryDetails.isInRecents = true;
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- sort.assertDisabled();
- grid.assertInvisible();
- list.assertInvisible();
- }
-
- @Test
- public void testContextMenu_NoSelection() {
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateContextMenu(testMenu, null, directoryDetails);
- cut.assertVisible();
- copy.assertVisible();
- cut.assertDisabled();
- copy.assertDisabled();
- paste.assertVisible();
- createDir.assertVisible();
- delete.assertVisible();
- }
-
- @Test
- public void testContextMenu_Selection() {
- DocumentsMenuManager mgr = new DocumentsMenuManager(testSearchManager, state);
- mgr.updateContextMenu(testMenu, selectionDetails, directoryDetails);
- cut.assertVisible();
- copy.assertVisible();
- paste.assertVisible();
- rename.assertInvisible();
- createDir.assertVisible();
- delete.assertVisible();
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/DocumentsProviderHelper.java b/packages/DocumentsUI/tests/src/com/android/documentsui/DocumentsProviderHelper.java
deleted file mode 100644
index 16ed2d9..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/DocumentsProviderHelper.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static android.provider.DocumentsContract.buildChildDocumentsUri;
-import static android.provider.DocumentsContract.buildDocumentUri;
-import static android.provider.DocumentsContract.buildRootsUri;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
-import static com.android.internal.util.Preconditions.checkArgument;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.fail;
-
-import android.content.ContentProviderClient;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
-import android.os.ParcelFileDescriptor.AutoCloseInputStream;
-import android.os.ParcelFileDescriptor.AutoCloseOutputStream;
-import android.os.RemoteException;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsContract.Root;
-import android.support.annotation.Nullable;
-import android.test.MoreAsserts;
-import android.text.TextUtils;
-
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.RootInfo;
-
-import com.google.android.collect.Lists;
-
-import libcore.io.IoUtils;
-import libcore.io.Streams;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Provides support for creation of documents in a test settings.
- */
-public class DocumentsProviderHelper {
-
- private final String mAuthority;
- private final ContentProviderClient mClient;
-
- public DocumentsProviderHelper(String authority, ContentProviderClient client) {
- checkArgument(!TextUtils.isEmpty(authority));
- mAuthority = authority;
- mClient = client;
- }
-
- public RootInfo getRoot(String documentId) throws RemoteException {
- final Uri rootsUri = buildRootsUri(mAuthority);
- Cursor cursor = null;
- try {
- cursor = mClient.query(rootsUri, null, null, null, null);
- while (cursor.moveToNext()) {
- if (documentId.equals(getCursorString(cursor, Root.COLUMN_ROOT_ID))) {
- return RootInfo.fromRootsCursor(mAuthority, cursor);
- }
- }
- throw new IllegalArgumentException("Can't find matching root for id=" + documentId);
- } catch (Exception e) {
- throw new RuntimeException("Can't load root for id=" + documentId , e);
- } finally {
- IoUtils.closeQuietly(cursor);
- }
- }
-
- public Uri createDocument(Uri parentUri, String mimeType, String name) {
- if (name.contains("/")) {
- throw new IllegalArgumentException("Name and mimetype probably interposed.");
- }
- try {
- Uri uri = DocumentsContract.createDocument(mClient, parentUri, mimeType, name);
- return uri;
- } catch (RemoteException e) {
- throw new RuntimeException("Couldn't create document: " + name + " with mimetype "
- + mimeType, e);
- }
- }
-
- public Uri createDocument(String parentId, String mimeType, String name) {
- Uri parentUri = buildDocumentUri(mAuthority, parentId);
- return createDocument(parentUri, mimeType, name);
- }
-
- public Uri createDocument(RootInfo root, String mimeType, String name) {
- return createDocument(root.documentId, mimeType, name);
- }
-
- public Uri createDocumentWithFlags(String documentId, String mimeType, String name, int flags,
- String... streamTypes)
- throws RemoteException {
- Bundle in = new Bundle();
- in.putInt(StubProvider.EXTRA_FLAGS, flags);
- in.putString(StubProvider.EXTRA_PARENT_ID, documentId);
- in.putString(Document.COLUMN_MIME_TYPE, mimeType);
- in.putString(Document.COLUMN_DISPLAY_NAME, name);
- in.putStringArrayList(StubProvider.EXTRA_STREAM_TYPES, Lists.newArrayList(streamTypes));
-
- Bundle out = mClient.call("createDocumentWithFlags", null, in);
- Uri uri = out.getParcelable(DocumentsContract.EXTRA_URI);
- return uri;
- }
-
- public Uri createFolder(Uri parentUri, String name) {
- return createDocument(parentUri, Document.MIME_TYPE_DIR, name);
- }
-
- public Uri createFolder(String parentId, String name) {
- Uri parentUri = buildDocumentUri(mAuthority, parentId);
- return createDocument(parentUri, Document.MIME_TYPE_DIR, name);
- }
-
- public Uri createFolder(RootInfo root, String name) {
- return createDocument(root, Document.MIME_TYPE_DIR, name);
- }
-
- public void writeDocument(Uri documentUri, byte[] contents)
- throws RemoteException, IOException {
- ParcelFileDescriptor file = mClient.openFile(documentUri, "w", null);
- try (AutoCloseOutputStream out = new AutoCloseOutputStream(file)) {
- out.write(contents, 0, contents.length);
- }
- }
-
- public byte[] readDocument(Uri documentUri) throws RemoteException, IOException {
- ParcelFileDescriptor file = mClient.openFile(documentUri, "r", null);
- byte[] buf = null;
- try (AutoCloseInputStream in = new AutoCloseInputStream(file)) {
- buf = Streams.readFully(in);
- }
- return buf;
- }
-
- public void assertChildCount(Uri parentUri, int expected) throws Exception {
- List<DocumentInfo> children = listChildren(parentUri);
- assertEquals("Incorrect file count after copy", expected, children.size());
- }
-
- public void assertChildCount(String parentId, int expected) throws Exception {
- List<DocumentInfo> children = listChildren(parentId);
- assertEquals("Incorrect file count after copy", expected, children.size());
- }
-
- public void assertChildCount(RootInfo root, int expected) throws Exception {
- assertChildCount(root.documentId, expected);
- }
-
- public void assertHasFile(Uri parentUri, String name) throws Exception {
- List<DocumentInfo> children = listChildren(parentUri);
- for (DocumentInfo child : children) {
- if (name.equals(child.displayName) && !child.isDirectory()) {
- return;
- }
- }
- fail("Could not find file named=" + name + " in children " + children);
- }
-
- public void assertHasFile(String parentId, String name) throws Exception {
- Uri parentUri = buildDocumentUri(mAuthority, parentId);
- assertHasFile(parentUri, name);
- }
-
- public void assertHasFile(RootInfo root, String name) throws Exception {
- assertHasFile(root.documentId, name);
- }
-
- public void assertHasDirectory(Uri parentUri, String name) throws Exception {
- List<DocumentInfo> children = listChildren(parentUri);
- for (DocumentInfo child : children) {
- if (name.equals(child.displayName) && child.isDirectory()) {
- return;
- }
- }
- fail("Could not find name=" + name + " in children " + children);
- }
-
- public void assertHasDirectory(String parentId, String name) throws Exception {
- Uri parentUri = buildDocumentUri(mAuthority, parentId);
- assertHasDirectory(parentUri, name);
- }
-
- public void assertHasDirectory(RootInfo root, String name) throws Exception {
- assertHasDirectory(root.documentId, name);
- }
-
- public void assertDoesNotExist(Uri parentUri, String name) throws Exception {
- List<DocumentInfo> children = listChildren(parentUri);
- for (DocumentInfo child : children) {
- if (name.equals(child.displayName)) {
- fail("Found name=" + name + " in children " + children);
- }
- }
- }
-
- public void assertDoesNotExist(String parentId, String name) throws Exception {
- Uri parentUri = buildDocumentUri(mAuthority, parentId);
- assertDoesNotExist(parentUri, name);
- }
-
- public void assertDoesNotExist(RootInfo root, String name) throws Exception {
- assertDoesNotExist(root.getUri(), name);
- }
-
- public @Nullable DocumentInfo findFile(String parentId, String name)
- throws Exception {
- List<DocumentInfo> children = listChildren(parentId);
- for (DocumentInfo child : children) {
- if (name.equals(child.displayName)) {
- return child;
- }
- }
- return null;
- }
-
- public DocumentInfo findDocument(String parentId, String name) throws Exception {
- List<DocumentInfo> children = listChildren(parentId);
- for (DocumentInfo child : children) {
- if (name.equals(child.displayName)) {
- return child;
- }
- }
- return null;
- }
-
- public DocumentInfo findDocument(Uri parentUri, String name) throws Exception {
- List<DocumentInfo> children = listChildren(parentUri);
- for (DocumentInfo child : children) {
- if (name.equals(child.displayName)) {
- return child;
- }
- }
- return null;
- }
-
- public List<DocumentInfo> listChildren(Uri parentUri) throws Exception {
- String id = DocumentsContract.getDocumentId(parentUri);
- return listChildren(id);
- }
-
- public List<DocumentInfo> listChildren(String documentId) throws Exception {
- Uri uri = buildChildDocumentsUri(mAuthority, documentId);
- List<DocumentInfo> children = new ArrayList<>();
- try (Cursor cursor = mClient.query(uri, null, null, null, null, null)) {
- Cursor wrapper = new RootCursorWrapper(mAuthority, "totally-fake", cursor, 100);
- while (wrapper.moveToNext()) {
- children.add(DocumentInfo.fromDirectoryCursor(wrapper));
- }
- }
- return children;
- }
-
- public void assertFileContents(Uri documentUri, byte[] expected) throws Exception {
- MoreAsserts.assertEquals(
- "Copied file contents differ",
- expected, readDocument(documentUri));
- }
-
- public void assertFileContents(String parentId, String fileName, byte[] expected)
- throws Exception {
- DocumentInfo file = findFile(parentId, fileName);
- assertNotNull(file);
- assertFileContents(file.derivedUri, expected);
- }
-
- /**
- * A helper method for StubProvider only. Won't work with other providers.
- * @throws RemoteException
- */
- public Uri createVirtualFile(
- RootInfo root, String path, String mimeType, byte[] content, String... streamTypes)
- throws RemoteException {
-
- Bundle args = new Bundle();
- args.putString(StubProvider.EXTRA_ROOT, root.rootId);
- args.putString(StubProvider.EXTRA_PATH, path);
- args.putString(Document.COLUMN_MIME_TYPE, mimeType);
- args.putStringArrayList(StubProvider.EXTRA_STREAM_TYPES, Lists.newArrayList(streamTypes));
- args.putByteArray(StubProvider.EXTRA_CONTENT, content);
-
- Bundle result = mClient.call("createVirtualFile", null, args);
- String documentId = result.getString(Document.COLUMN_DOCUMENT_ID);
-
- return DocumentsContract.buildDocumentUri(mAuthority, documentId);
- }
-
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
deleted file mode 100644
index 75843b0..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
-
-import android.app.DownloadManager;
-import android.app.DownloadManager.Request;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.DocumentsContract;
-import android.support.test.uiautomator.Configurator;
-import android.support.test.uiautomator.UiObject;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-import com.android.documentsui.model.RootInfo;
-
-@LargeTest
-public class FilesActivityUiTest extends ActivityTest<FilesActivity> {
-
- public FilesActivityUiTest() {
- super(FilesActivity.class);
- }
-
- @Override
- protected RootInfo getInitialRoot() {
- return null;
- }
-
- @Override
- public void initTestFiles() throws RemoteException {
- mDocsHelper.createFolder(rootDir0, dirName1);
-
- mDocsHelper.createDocument(rootDir0, "text/plain", "file0.log");
- mDocsHelper.createDocument(rootDir0, "image/png", "file1.png");
- mDocsHelper.createDocument(rootDir0, "text/csv", "file2.csv");
-
- mDocsHelper.createDocument(rootDir1, "text/plain", "anotherFile0.log");
- mDocsHelper.createDocument(rootDir1, "text/plain", "poodles.text");
- }
-
- public void testRootsListed() throws Exception {
- initTestFiles();
-
- // Should also have Drive, but that requires pre-configuration of devices
- // We omit for now.
- bots.roots.assertRootsPresent(
- "Images",
- "Videos",
- "Audio",
- "Downloads",
- ROOT_0_ID,
- ROOT_1_ID);
-
- // Separate logic for "Documents" root, which presence depends on the config setting
- if (docsRootEnabled()) {
- bots.roots.assertRootsPresent("Documents");
- } else {
- bots.roots.assertRootsAbsent("Documents");
- }
- }
-
- public void testFilesListed() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
- bots.directory.assertDocumentsPresent("file0.log", "file1.png", "file2.csv");
- }
-
- public void testLoadsDefaultDirectory() throws Exception {
- initTestFiles();
-
- device.waitForIdle();
-
- // Separate logic for "Documents" root, which presence depends on the config setting
- if (docsRootEnabled()) {
- bots.main.assertWindowTitle("Documents");
- } else {
- bots.main.assertWindowTitle("Downloads");
- }
- }
-
- public void testRootClickSetsWindowTitle() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot("Images");
- bots.main.assertWindowTitle("Images");
- }
-
- public void testFilesList_LiveUpdate() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
- mDocsHelper.createDocument(rootDir0, "yummers/sandwich", "Ham & Cheese.sandwich");
-
- bots.directory.waitForDocument("Ham & Cheese.sandwich");
- bots.directory.assertDocumentsPresent(
- "file0.log", "file1.png", "file2.csv", "Ham & Cheese.sandwich");
- }
-
- public void testCreateDirectory() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.main.openOverflowMenu();
- bots.main.menuNewFolder().click();
- bots.main.setDialogText("Kung Fu Panda");
-
- bots.keyboard.pressEnter();
-
- bots.directory.assertDocumentsPresent("Kung Fu Panda");
- }
-
- public void testOpenBreadcrumb() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.directory.openDocument(dirName1);
- if (bots.main.isTablet()) {
- openBreadcrumbTabletHelper();
- } else {
- openBreadcrumbPhoneHelper();
- }
- bots.main.assertBreadcrumbItemsPresent(dirName1, "TEST_ROOT_0");
- bots.main.clickBreadcrumbItem("TEST_ROOT_0");
-
- bots.directory.assertDocumentsPresent(dirName1);
- }
-
- private void openBreadcrumbTabletHelper() throws Exception {
- }
-
- private void openBreadcrumbPhoneHelper() throws Exception {
- bots.main.clickDropdownBreadcrumb();
- }
-
- public void testDeleteDocument() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.directory.clickDocument("file1.png");
- device.waitForIdle();
- bots.main.menuDelete().click();
-
- bots.main.clickDialogOkButton();
-
- bots.directory.assertDocumentsAbsent("file1.png");
- }
-
- public void testKeyboard_CutDocument() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.directory.clickDocument("file1.png");
- device.waitForIdle();
- bots.main.pressKey(KeyEvent.KEYCODE_X, KeyEvent.META_CTRL_ON);
-
- device.waitForIdle();
-
- bots.roots.openRoot(ROOT_1_ID);
- bots.main.pressKey(KeyEvent.KEYCODE_V, KeyEvent.META_CTRL_ON);
-
- bots.directory.waitForDocument("file1.png");
- bots.directory.assertDocumentsPresent("file1.png");
-
- bots.roots.openRoot(ROOT_0_ID);
- bots.directory.assertDocumentsAbsent("file1.png");
- }
-
- public void testKeyboard_CopyDocument() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.directory.clickDocument("file1.png");
- device.waitForIdle();
- bots.main.pressKey(KeyEvent.KEYCODE_C, KeyEvent.META_CTRL_ON);
-
- device.waitForIdle();
-
- bots.roots.openRoot(ROOT_1_ID);
- bots.main.pressKey(KeyEvent.KEYCODE_V, KeyEvent.META_CTRL_ON);
-
- bots.directory.waitForDocument("file1.png");
- bots.directory.assertDocumentsPresent("file1.png");
-
- bots.roots.openRoot(ROOT_0_ID);
- bots.directory.assertDocumentsPresent("file1.png");
- }
-
- public void testDeleteDocument_Cancel() throws Exception {
- initTestFiles();
-
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.directory.clickDocument("file1.png");
- device.waitForIdle();
- bots.main.menuDelete().click();
-
- bots.main.clickDialogCancelButton();
-
- bots.directory.assertDocumentsPresent("file1.png");
- }
-
- // Tests that pressing tab switches focus between the roots and directory listings.
- @Suppress
- public void testKeyboard_tab() throws Exception {
- bots.main.pressKey(KeyEvent.KEYCODE_TAB);
- bots.roots.assertHasFocus();
- bots.main.pressKey(KeyEvent.KEYCODE_TAB);
- bots.directory.assertHasFocus();
- }
-
- // Tests that arrow keys do not switch focus away from the dir list.
- @Suppress
- public void testKeyboard_arrowsDirList() throws Exception {
- for (int i = 0; i < 10; i++) {
- bots.main.pressKey(KeyEvent.KEYCODE_DPAD_LEFT);
- bots.directory.assertHasFocus();
- }
- for (int i = 0; i < 10; i++) {
- bots.main.pressKey(KeyEvent.KEYCODE_DPAD_RIGHT);
- bots.directory.assertHasFocus();
- }
- }
-
- // Tests that arrow keys do not switch focus away from the roots list.
- public void testKeyboard_arrowsRootsList() throws Exception {
- bots.main.pressKey(KeyEvent.KEYCODE_TAB);
- for (int i = 0; i < 10; i++) {
- bots.main.pressKey(KeyEvent.KEYCODE_DPAD_RIGHT);
- bots.roots.assertHasFocus();
- }
- for (int i = 0; i < 10; i++) {
- bots.main.pressKey(KeyEvent.KEYCODE_DPAD_LEFT);
- bots.roots.assertHasFocus();
- }
- }
-
- // We don't really need to test the entirety of download support
- // since downloads is (almost) just another provider.
- @Suppress
- public void testDownload_Queued() throws Exception {
- DownloadManager dm = (DownloadManager) context.getSystemService(
- Context.DOWNLOAD_SERVICE);
- // This downloads ends up being queued (because DNS can't be resolved).
- // We'll still see an entry in the downloads UI with a "Queued" label.
- dm.enqueue(new Request(Uri.parse("http://hammychamp.toodles")));
-
- bots.roots.openRoot("Downloads");
- bots.directory.assertDocumentsPresent("Queued");
- }
-
- @Suppress
- public void testDownload_RetryUnsuccessful() throws Exception {
- DownloadManager dm = (DownloadManager) context.getSystemService(
- Context.DOWNLOAD_SERVICE);
- // This downloads fails! But it'll still show up.
- dm.enqueue(new Request(Uri.parse("http://www.google.com/hamfancy")));
-
- bots.roots.openRoot("Downloads");
- UiObject doc = bots.directory.findDocument("Unsuccessful");
- doc.waitForExists(TIMEOUT);
-
- int toolType = Configurator.getInstance().getToolType();
- Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_FINGER);
- doc.click();
- Configurator.getInstance().setToolType(toolType);
-
- assertTrue(bots.main.findDownloadRetryDialog().exists());
-
- device.pressBack(); // to clear the dialog.
- }
-
- private boolean docsRootEnabled() {
- return Shared.shouldShowDocumentsRoot(context, new Intent(DocumentsContract.ACTION_BROWSE));
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesMenuManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesMenuManagerTest.java
deleted file mode 100644
index 00b9fd2..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesMenuManagerTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static org.junit.Assert.assertTrue;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.documentsui.testing.TestDirectoryDetails;
-import com.android.documentsui.testing.TestMenu;
-import com.android.documentsui.testing.TestMenuItem;
-import com.android.documentsui.testing.TestSearchViewManager;
-import com.android.documentsui.testing.TestSelectionDetails;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public final class FilesMenuManagerTest {
-
- private TestMenu testMenu;
- private TestMenuItem rename;
- private TestMenuItem moveTo;
- private TestMenuItem copyTo;
- private TestMenuItem share;
- private TestMenuItem delete;
- private TestMenuItem createDir;
- private TestMenuItem fileSize;
- private TestMenuItem settings;
- private TestMenuItem newWindow;
- private TestMenuItem cut;
- private TestMenuItem copy;
- private TestMenuItem paste;
- private TestMenuItem sort;
- private TestMenuItem sortSize;
- private TestMenuItem advanced;
- private TestSelectionDetails selectionDetails;
- private TestDirectoryDetails directoryDetails;
- private TestSearchViewManager testSearchManager;
- private State state = new State();
-
- @Before
- public void setUp() {
- testMenu = TestMenu.create();
- rename = testMenu.findItem(R.id.menu_rename);
- moveTo = testMenu.findItem(R.id.menu_move_to);
- copyTo = testMenu.findItem(R.id.menu_copy_to);
- share = testMenu.findItem(R.id.menu_share);
- delete = testMenu.findItem(R.id.menu_delete);
- createDir = testMenu.findItem(R.id.menu_create_dir);
- fileSize = testMenu.findItem(R.id.menu_file_size);
- settings = testMenu.findItem(R.id.menu_settings);
- newWindow = testMenu.findItem(R.id.menu_new_window);
- cut = testMenu.findItem(R.id.menu_cut_to_clipboard);
- copy = testMenu.findItem(R.id.menu_copy_to_clipboard);
- paste = testMenu.findItem(R.id.menu_paste_from_clipboard);
- sort = testMenu.findItem(R.id.menu_sort);
- sortSize = testMenu.findItem(R.id.menu_sort_size);
- advanced = testMenu.findItem(R.id.menu_advanced);
-
- // These items by default are visible
- testMenu.findItem(R.id.menu_select_all).setVisible(true);
- testMenu.findItem(R.id.menu_list).setVisible(true);
- testMenu.findItem(R.id.menu_file_size).setVisible(true);
-
- selectionDetails = new TestSelectionDetails();
- directoryDetails = new TestDirectoryDetails();
- testSearchManager = new TestSearchViewManager();
- }
-
- @Test
- public void testActionMenu() {
- selectionDetails.canDelete = true;
- selectionDetails.canRename = true;
-
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- rename.assertEnabled();
- delete.assertVisible();
- share.assertVisible();
- copyTo.assertEnabled();
- moveTo.assertEnabled();
- }
-
- @Test
- public void testActionMenu_containsPartial() {
- selectionDetails.containPartial = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- rename.assertDisabled();
- share.assertInvisible();
- copyTo.assertDisabled();
- moveTo.assertDisabled();
- }
-
- @Test
- public void testActionMenu_cantRename() {
- selectionDetails.canRename = false;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- rename.assertDisabled();
- }
-
- @Test
- public void testActionMenu_cantDelete() {
- selectionDetails.canDelete = false;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- delete.assertInvisible();
- // We shouldn't be able to move files if we can't delete them
- moveTo.assertDisabled();
- }
-
- @Test
- public void testActionMenu_containsDirectory() {
- selectionDetails.containDirectories = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- // We can't share directories
- share.assertInvisible();
- }
-
- @Test
- public void testOptionMenu() {
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- sort.assertEnabled();
- sortSize.assertInvisible();
- advanced.assertInvisible();
- advanced.assertTitle(R.string.menu_advanced_show);
- createDir.assertDisabled();
- fileSize.assertVisible();
- assertTrue(testSearchManager.updateMenuCalled());
- }
-
- @Test
- public void testOptionMenu_hideSize() {
- state.showSize = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- sortSize.assertVisible();
- }
-
- @Test
- public void testOptionMenu_showAdvanced() {
- state.showAdvanced = true;
- state.showAdvancedOption = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- advanced.assertVisible();
- advanced.assertTitle(R.string.menu_advanced_hide);
- }
-
- @Test
- public void testOptionMenu_inRecents() {
- directoryDetails.isInRecents = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- sort.assertDisabled();
- }
-
- @Test
- public void testOptionMenu_canCreateDirectory() {
- directoryDetails.canCreateDirectory = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- createDir.assertEnabled();
- }
-
- @Test
- public void testOptionMenu_hasRootSettings() {
- directoryDetails.hasRootSettings = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- settings.assertVisible();
- }
-
- @Test
- public void testOptionMenu_shouldShowFancyFeatures() {
- directoryDetails.shouldShowFancyFeatures = true;
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateOptionMenu(testMenu, directoryDetails);
-
- newWindow.assertVisible();
- }
-
- @Test
- public void testContextMenu_NoSelection() {
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateContextMenu(testMenu, null, directoryDetails);
- cut.assertVisible();
- copy.assertVisible();
- cut.assertDisabled();
- copy.assertDisabled();
- paste.assertVisible();
- createDir.assertVisible();
- delete.assertVisible();
- }
-
- @Test
- public void testContextMenu_Selection() {
- FilesMenuManager mgr = new FilesMenuManager(testSearchManager, state);
- mgr.updateContextMenu(testMenu, selectionDetails, directoryDetails);
- cut.assertVisible();
- copy.assertVisible();
- paste.assertVisible();
- rename.assertVisible();
- createDir.assertVisible();
- delete.assertVisible();
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ItemDragListenerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ItemDragListenerTest.java
deleted file mode 100644
index 37f6532..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/ItemDragListenerTest.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import android.content.ClipData;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.view.DragEvent;
-import android.view.View;
-
-import com.android.documentsui.testing.ClipDatas;
-import com.android.documentsui.testing.DragEvents;
-import com.android.documentsui.testing.TestDrawable;
-import com.android.documentsui.testing.TestTimer;
-import com.android.documentsui.testing.Views;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ItemDragListenerTest {
-
- private static final long DELAY_AFTER_HOVERING = ItemDragListener.SPRING_TIMEOUT + 1;
-
- private View mTestView;
- private TestDrawable mTestBackground;
- private TestDragHost mTestDragHost;
- private TestTimer mTestTimer;
-
- private TestDragListener mListener;
-
- @Before
- public void setUp() {
- mTestView = Views.createTestView();
- mTestBackground = new TestDrawable();
- mTestTimer = new TestTimer();
- mTestDragHost = new TestDragHost();
-
- mListener = new TestDragListener(mTestDragHost, mTestTimer);
- }
-
- @Test
- public void testDragStarted_ReturnsTrue() {
- assertTrue(triggerDragEvent(DragEvent.ACTION_DRAG_STARTED));
- }
-
- @Test
- public void testDragEntered_HighlightsView() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
- assertSame(mTestView, mTestDragHost.mHighlightedView);
- }
-
- @Test
- public void testDragExited_UnhighlightsView() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- triggerDragEvent(DragEvent.ACTION_DRAG_EXITED);
- assertNull(mTestDragHost.mHighlightedView);
- }
-
- @Test
- public void testDragEnded_UnhighlightsView() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- triggerDragEvent(DragEvent.ACTION_DRAG_ENDED);
- assertNull(mTestDragHost.mHighlightedView);
- }
-
- @Test
- public void testDragLocation_notCrashWithoutBackground() {
- DragEvent locationEvent = DragEvents.createTestLocationEvent(3, 4);
- mListener.onDrag(mTestView, locationEvent);
- }
-
- @Test
- public void testDragLocation_setHotSpotOnBackground() {
- Views.setBackground(mTestView, mTestBackground);
-
- final float x = 2;
- final float y = 4;
- DragEvent locationEvent = DragEvents.createTestLocationEvent(x, y);
- mListener.onDrag(mTestView, locationEvent);
-
- assertEquals(x, mTestBackground.hotspotX, 0);
- assertEquals(y, mTestBackground.hotspotY, 0);
- }
-
- @Test
- public void testHover_OpensView() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- mTestTimer.fastForwardTo(DELAY_AFTER_HOVERING);
-
- assertSame(mTestView, mTestDragHost.mLastOpenedView);
- }
-
- @Test
- public void testDragExited_CancelsHoverTask() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- triggerDragEvent(DragEvent.ACTION_DRAG_EXITED);
-
- mTestTimer.fastForwardTo(DELAY_AFTER_HOVERING);
-
- assertNull(mTestDragHost.mLastOpenedView);
- }
-
- @Test
- public void testDragEnded_CancelsHoverTask() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- triggerDragEvent(DragEvent.ACTION_DRAG_ENDED);
-
- mTestTimer.fastForwardTo(DELAY_AFTER_HOVERING);
-
- assertNull(mTestDragHost.mLastOpenedView);
- }
-
- @Test
- public void testNoDropWithoutClipData() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- final DragEvent dropEvent = DragEvents.createTestDropEvent(null);
- assertFalse(mListener.onDrag(mTestView, dropEvent));
- }
-
- @Test
- public void testDoDropWithClipData() {
- triggerDragEvent(DragEvent.ACTION_DRAG_ENTERED);
-
- final ClipData data = ClipDatas.createTestClipData();
- final DragEvent dropEvent = DragEvents.createTestDropEvent(data);
- mListener.onDrag(mTestView, dropEvent);
-
- assertSame(mTestView, mListener.mLastDropOnView);
- assertSame(dropEvent, mListener.mLastDropEvent);
- }
-
- protected boolean triggerDragEvent(int actionId) {
- final DragEvent testEvent = DragEvents.createTestDragEvent(actionId);
-
- return mListener.onDrag(mTestView, testEvent);
- }
-
- private static class TestDragListener extends ItemDragListener<TestDragHost> {
-
- private View mLastDropOnView;
- private DragEvent mLastDropEvent;
-
- protected TestDragListener(TestDragHost dragHost, Timer timer) {
- super(dragHost, timer);
- }
-
- @Override
- public TimerTask createOpenTask(View v) {
- TimerTask task = super.createOpenTask(v);
- TestTimer.Task testTask = new TestTimer.Task(task);
-
- return testTask;
- }
-
- @Override
- public boolean handleDropEventChecked(View v, DragEvent event) {
- mLastDropOnView = v;
- mLastDropEvent = event;
- return true;
- }
-
- }
-
- private static class TestDragHost implements ItemDragListener.DragHost {
- private View mHighlightedView;
- private View mLastOpenedView;
-
- @Override
- public void setDropTargetHighlight(View v, boolean highlight) {
- mHighlightedView = highlight ? v : null;
- }
-
- @Override
- public void runOnUiThread(Runnable runnable) {
- runnable.run();
- }
-
- @Override
- public void onViewHovered(View v) {
- mLastOpenedView = v;
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java
deleted file mode 100644
index 1f831ee..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.swipeLeft;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
-
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
-
-@LargeTest
-public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
-
- private final String newName = "kitties.log";
-
- public RenameDocumentUiTest() {
- super(FilesActivity.class);
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- initTestFiles();
- bots.roots.closeDrawer();
- }
-
- public void testRenameEnabled_SingleSelection() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.main.openOverflowMenu();
- bots.main.assertMenuEnabled(R.string.menu_rename, true);
-
- // Dismiss more options window
- device.pressBack();
- }
-
- public void testNoRenameSupport_SingleSelection() throws Exception {
- bots.directory.selectDocument(fileNameNoRename);
- bots.main.openOverflowMenu();
- bots.main.assertMenuEnabled(R.string.menu_rename, false);
-
- // Dismiss more options window
- device.pressBack();
- }
-
- public void testOneHasRenameSupport_MultipleSelection() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.directory.selectDocument(fileNameNoRename);
- bots.main.openOverflowMenu();
- bots.main.assertMenuEnabled(R.string.menu_rename, false);
-
- // Dismiss more options window
- device.pressBack();
- }
-
- public void testRenameDisabled_MultipleSelection() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.directory.selectDocument(fileName2);
- bots.main.openOverflowMenu();
- bots.main.assertMenuEnabled(R.string.menu_rename, false);
-
- // Dismiss more options window
- device.pressBack();
- }
-
- public void testRenameFile_OkButton() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.main.openOverflowMenu();
- bots.main.menuRename().click();
- bots.main.setDialogText(newName);
-
- bots.main.clickDialogOkButton();
-
- bots.directory.assertDocumentsAbsent(fileName1);
- bots.directory.assertDocumentsPresent(newName);
- bots.directory.assertDocumentsCount(4);
- }
-
- public void testRenameFile_Enter() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.main.openOverflowMenu();
- bots.main.menuRename().click();
- bots.main.setDialogText(newName);
-
- bots.keyboard.pressEnter();
-
- bots.directory.assertDocumentsAbsent(fileName1);
- bots.directory.assertDocumentsPresent(newName);
- bots.directory.assertDocumentsCount(4);
- }
-
- public void testRenameFile_Cancel() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.main.openOverflowMenu();
- bots.main.menuRename().click();
- bots.main.setDialogText(newName);
-
- bots.main.clickDialogCancelButton();
-
- bots.directory.assertDocumentsPresent(fileName1);
- bots.directory.assertDocumentsAbsent(newName);
- bots.directory.assertDocumentsCount(4);
- }
-
- public void testRenameDir() throws Exception {
- String oldName = "Dir1";
- String newName = "Dir123";
-
- bots.directory.selectDocument(oldName);
- bots.main.openOverflowMenu();
- bots.main.menuRename().click();
- bots.main.setDialogText(newName);
-
- bots.keyboard.pressEnter();
-
- bots.directory.assertDocumentsAbsent(oldName);
- bots.directory.assertDocumentsPresent(newName);
- bots.directory.assertDocumentsCount(4);
- }
-
- public void testRename_NameExists() throws Exception {
- // Check that document with the new name exists
- bots.directory.assertDocumentsPresent(fileName2);
- bots.directory.selectDocument(fileName1);
- bots.main.openOverflowMenu();
- bots.main.menuRename().click();
- bots.main.setDialogText(fileName2);
-
- bots.keyboard.pressEnter();
-
- bots.directory.assertSnackbar(R.string.rename_error);
- bots.directory.assertDocumentsPresent(fileName1);
- bots.directory.assertDocumentsPresent(fileName2);
- bots.directory.assertDocumentsCount(4);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsCacheTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/RootsCacheTest.java
deleted file mode 100644
index 2e81545..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsCacheTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.RootsCache.getMatchingRoots;
-import static com.google.common.collect.Lists.newArrayList;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.documentsui.model.RootInfo;
-
-import com.google.common.collect.Lists;
-
-import java.util.List;
-
-@SmallTest
-public class RootsCacheTest extends AndroidTestCase {
-
- private static RootInfo mNull = new RootInfo();
- private static RootInfo mEmpty = buildForMimeTypes();
- private static RootInfo mWild = buildForMimeTypes("*/*");
- private static RootInfo mImages = buildForMimeTypes("image/*");
- private static RootInfo mAudio = buildForMimeTypes(
- "audio/*", "application/ogg", "application/x-flac");
- private static RootInfo mDocs = buildForMimeTypes(
- "application/msword", "application/vnd.ms-excel");
- private static RootInfo mMalformed1 = buildForMimeTypes("meow");
- private static RootInfo mMalformed2 = buildForMimeTypes("*/meow");
-
- private List<RootInfo> mRoots;
-
- private State mState;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- mRoots = Lists.newArrayList(
- mNull, mWild, mEmpty, mImages, mAudio, mDocs, mMalformed1, mMalformed2);
-
- mState = new State();
- mState.action = State.ACTION_OPEN;
- mState.showAdvanced = true;
- mState.localOnly = false;
- }
-
- public void testMatchingRoots_Everything() throws Exception {
- mState.acceptMimes = new String[] { "*/*" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mImages, mAudio, mDocs, mMalformed1, mMalformed2),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_DirectoryCopy() throws Exception {
- RootInfo downloads = buildForMimeTypes("*/*");
- downloads.authority = "com.android.providers.downloads.documents";
- mRoots.add(downloads);
-
- mState.acceptMimes = new String[] { "*/*" };
- mState.directoryCopy = true;
-
- // basically we're asserting that the results don't contain downloads
- assertContainsExactly(
- newArrayList(mNull, mWild, mImages, mAudio, mDocs, mMalformed1, mMalformed2),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_PngOrWild() throws Exception {
- mState.acceptMimes = new String[] { "image/png", "*/*" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mImages, mAudio, mDocs, mMalformed1, mMalformed2),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_AudioWild() throws Exception {
- mState.acceptMimes = new String[] { "audio/*" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mAudio),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_AudioWildOrImageWild() throws Exception {
- mState.acceptMimes = new String[] { "audio/*", "image/*" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mAudio, mImages),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_AudioSpecific() throws Exception {
- mState.acceptMimes = new String[] { "audio/mpeg" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mAudio),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_Document() throws Exception {
- mState.acceptMimes = new String[] { "application/msword" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mDocs),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_Application() throws Exception {
- mState.acceptMimes = new String[] { "application/*" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mAudio, mDocs),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testMatchingRoots_FlacOrPng() throws Exception {
- mState.acceptMimes = new String[] { "application/x-flac", "image/png" };
- assertContainsExactly(
- newArrayList(mNull, mWild, mAudio, mImages),
- getMatchingRoots(mRoots, mState));
- }
-
- public void testExcludedAuthorities() throws Exception {
- final List<RootInfo> roots = newArrayList();
-
- // Set up some roots
- for (int i = 0; i < 5; ++i) {
- RootInfo root = new RootInfo();
- root.authority = "authority" + i;
- roots.add(root);
- }
- // Make some allowed authorities
- List<RootInfo> allowedRoots = newArrayList(
- roots.get(0), roots.get(2), roots.get(4));
- // Set up the excluded authority list
- for (RootInfo root: roots) {
- if (!allowedRoots.contains(root)) {
- mState.excludedAuthorities.add(root.authority);
- }
- }
- mState.acceptMimes = new String[] { "*/*" };
-
- assertContainsExactly(
- allowedRoots,
- getMatchingRoots(roots, mState));
- }
-
- private static void assertContainsExactly(List<?> expected, List<?> actual) {
- assertEquals(expected.size(), actual.size());
- for (Object o : expected) {
- assertTrue(actual.contains(o));
- }
- }
-
- private static RootInfo buildForMimeTypes(String... mimeTypes) {
- final RootInfo root = new RootInfo();
- root.derivedMimeTypes = mimeTypes;
- return root;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java
deleted file mode 100644
index 038a208..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
-
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
-
-@LargeTest
-public class RootsUiTest extends ActivityTest<FilesActivity> {
-
- private static final String TAG = "RootUiTest";
-
- public RootsUiTest() {
- super(FilesActivity.class);
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- initTestFiles();
- }
-
- public void testRootTapped_GoToRootFromChildDir() throws Exception {
- bots.directory.openDocument(dirName1);
- bots.main.assertBreadcrumbTitle(dirName1);
- bots.roots.openRoot(ROOT_0_ID);
- bots.main.assertWindowTitle(ROOT_0_ID);
- assertDefaultContentOfTestDir0();
- }
-
- @Suppress
- public void testRootChanged_ClearSelection() throws Exception {
- bots.directory.selectDocument(fileName1);
- bots.main.assertInActionMode(true);
-
- bots.roots.openRoot(ROOT_1_ID);
- bots.main.assertInActionMode(false);
- }
-
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java
deleted file mode 100644
index 1c99db1..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.swipeLeft;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
-
-import android.content.res.Configuration;
-import android.support.v7.recyclerview.R;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
-
-@LargeTest
-public class SearchViewUiTest extends ActivityTest<FilesActivity> {
-
- public SearchViewUiTest() {
- super(FilesActivity.class);
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- // Drawer interferes with a lot of search action; going to try to close any opened ones
- bots.roots.closeDrawer();
- }
-
- public void testSearchView_ExpandsOnClick() throws Exception {
- bots.main.openSearchView();
- bots.main.assertSearchTextFiledAndIcon(true, false);
- }
-
- public void testSearchView_CollapsesOnBack() throws Exception {
- bots.main.openSearchView();
-
- device.pressBack();
-
- bots.main.assertSearchTextFiledAndIcon(false, true);
- }
-
- public void testSearchView_ClearsTextOnBack() throws Exception {
- String query = "file2";
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
-
- device.pressBack();
-
- bots.main.assertSearchTextFiledAndIcon(false, true);
- }
-
- public void testSearch_ResultsFound() throws Exception {
- initTestFiles();
- assertDefaultContentOfTestDir0();
-
- String query = "file1";
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
- bots.main.assertSearchTextField(true, query);
-
- bots.keyboard.pressEnter();
-
- bots.directory.assertDocumentsCountOnList(true, 2);
- bots.directory.assertDocumentsPresent(fileName1, fileName2);
-
- bots.main.assertSearchTextField(false, query);
- }
-
- public void testSearchDownloads() throws Exception {
- initTestFiles();
- bots.roots.openRoot(ROOT_0_ID);
-
- bots.directory.copyFilesToClipboard(fileName1, fileName2);
- device.waitForIdle();
-
- bots.roots.openRoot("Downloads");
- bots.directory.pasteFilesFromClipboard();
-
- //TODO: Why do we need to click on Downloads again so this will work?
- bots.roots.openRoot(ROOT_0_ID);
- bots.roots.openRoot("Downloads");
- device.waitForIdle();
-
- String query = "file12";
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
-
- bots.keyboard.pressEnter();
-
- bots.directory.assertDocumentsCountOnList(true, 1);
- bots.directory.assertDocumentsPresent(fileName2);
-
- device.pressBack();
- }
-
- public void testSearchResultsFound_ClearsOnBack() throws Exception {
- initTestFiles();
- assertDefaultContentOfTestDir0();
-
- String query = fileName1;
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
-
- bots.keyboard.pressEnter();
- device.pressBack();
-
- assertDefaultContentOfTestDir0();
- }
-
- public void testSearch_NoResults() throws Exception {
- initTestFiles();
- assertDefaultContentOfTestDir0();
-
- String query = "chocolate";
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
-
- bots.keyboard.pressEnter();
-
- String msg = String.valueOf(context.getString(R.string.no_results));
- bots.directory.assertMessageTextView(String.format(msg, "TEST_ROOT_0"));
-
- bots.main.assertSearchTextField(false, query);
- }
-
- public void testSearchNoResults_ClearsOnBack() throws Exception {
- initTestFiles();
- assertDefaultContentOfTestDir0();
-
- String query = "chocolate";
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
-
- bots.keyboard.pressEnter();
- device.pressBack();
-
- device.waitForIdle();
- assertDefaultContentOfTestDir0();
- }
-
-
- public void testSearchResultsFound_ClearsOnDirectoryChange() throws Exception {
- // Skipping this test for phones since currently there's no way to open the drawer on
- // phones after doing a search (it's a back button instead of a hamburger button)
- if (!bots.main.isTablet()) {
- return;
- }
-
- initTestFiles();
- assertDefaultContentOfTestDir0();
-
- String query = fileName1;
- bots.main.openSearchView();
- bots.main.setSearchQuery(query);
-
- bots.keyboard.pressEnter();
-
- bots.roots.openRoot(ROOT_1_ID);
- assertDefaultContentOfTestDir1();
-
- bots.roots.openRoot(ROOT_0_ID);
- assertDefaultContentOfTestDir0();
- }
-
- public void testSearchIconVisible_RootWithSearchSupport() throws Exception {
- bots.roots.openRoot(ROOT_0_ID);
- bots.main.assertSearchTextFiledAndIcon(false, true);
- }
-
- public void testSearchIconHidden_RootNoSearchSupport() throws Exception {
- bots.roots.openRoot(ROOT_1_ID);
- bots.main.assertSearchTextFiledAndIcon(false, false);
- }
-
- @Override
- public void tearDown() throws Exception {
- try {
- // Proper clean up of #testSearchDownloads
- bots.directory.clickDocument(fileName1 + ".txt");
- bots.directory.clickDocument(fileName2);
- device.waitForIdle();
- bots.main.menuDelete().click();
- bots.main.clickDialogOkButton();
- } catch (Exception e) {
- } finally {
- super.tearDown();
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/StateTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/StateTest.java
deleted file mode 100644
index f057850..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/StateTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.documentsui.model.DocumentInfo;
-
-@SmallTest
-public class StateTest extends AndroidTestCase {
-
- private static final DocumentInfo DIR_1;
- private static final DocumentInfo DIR_2;
-
- private State mState;
-
- static {
- DIR_1 = new DocumentInfo();
- DIR_1.displayName = "firstDirectory";
- DIR_2 = new DocumentInfo();
- DIR_2.displayName = "secondDirectory";
- }
-
- @Override
- protected void setUp() throws Exception {
- mState = new State();
- }
-
- public void testInitialStateEmpty() {
- assertFalse(mState.hasLocationChanged());
- }
-
- public void testPushDocument_ChangesLocation() {
- mState.pushDocument(DIR_1);
- mState.pushDocument(DIR_2);
- assertTrue(mState.hasLocationChanged());
- }
-
- public void testPushDocument_ModifiesStack() {
- mState.pushDocument(DIR_1);
- mState.pushDocument(DIR_2);
- assertEquals(DIR_2, mState.stack.getFirst());
- }
-
- public void testPopDocument_ModifiesStack() {
- mState.pushDocument(DIR_1);
- mState.pushDocument(DIR_2);
- mState.popDocument();
- assertEquals(DIR_1, mState.stack.getFirst());
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java b/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java
deleted file mode 100644
index f71ce5d..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.ProviderInfo;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MatrixCursor.RowBuilder;
-import android.graphics.Point;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.FileUtils;
-import android.os.ParcelFileDescriptor;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsContract.Root;
-import android.provider.DocumentsProvider;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Log;
-
-import libcore.io.IoUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class StubProvider extends DocumentsProvider {
-
- public static final String DEFAULT_AUTHORITY = "com.android.documentsui.stubprovider";
- public static final String ROOT_0_ID = "TEST_ROOT_0";
- public static final String ROOT_1_ID = "TEST_ROOT_1";
-
- public static final String EXTRA_SIZE = "com.android.documentsui.stubprovider.SIZE";
- public static final String EXTRA_ROOT = "com.android.documentsui.stubprovider.ROOT";
- public static final String EXTRA_PATH = "com.android.documentsui.stubprovider.PATH";
- public static final String EXTRA_STREAM_TYPES
- = "com.android.documentsui.stubprovider.STREAM_TYPES";
- public static final String EXTRA_CONTENT = "com.android.documentsui.stubprovider.CONTENT";
-
- public static final String EXTRA_FLAGS = "com.android.documentsui.stubprovider.FLAGS";
- public static final String EXTRA_PARENT_ID = "com.android.documentsui.stubprovider.PARENT";
-
- private static final String TAG = "StubProvider";
-
- private static final String STORAGE_SIZE_KEY = "documentsui.stubprovider.size";
- private static int DEFAULT_ROOT_SIZE = 1024 * 1024 * 100; // 100 MB.
-
- private static final String[] DEFAULT_ROOT_PROJECTION = new String[] {
- Root.COLUMN_ROOT_ID, Root.COLUMN_FLAGS, Root.COLUMN_TITLE, Root.COLUMN_DOCUMENT_ID,
- Root.COLUMN_AVAILABLE_BYTES
- };
- private static final String[] DEFAULT_DOCUMENT_PROJECTION = new String[] {
- Document.COLUMN_DOCUMENT_ID, Document.COLUMN_MIME_TYPE, Document.COLUMN_DISPLAY_NAME,
- Document.COLUMN_LAST_MODIFIED, Document.COLUMN_FLAGS, Document.COLUMN_SIZE,
- };
-
- private final Map<String, StubDocument> mStorage = new HashMap<>();
- private final Map<String, RootInfo> mRoots = new HashMap<>();
- private final Object mWriteLock = new Object();
-
- private String mAuthority = DEFAULT_AUTHORITY;
- private SharedPreferences mPrefs;
- private Set<String> mSimulateReadErrorIds = new HashSet<>();
-
- @Override
- public void attachInfo(Context context, ProviderInfo info) {
- mAuthority = info.authority;
- super.attachInfo(context, info);
- }
-
- @Override
- public boolean onCreate() {
- clearCacheAndBuildRoots();
- return true;
- }
-
- @VisibleForTesting
- public void clearCacheAndBuildRoots() {
- Log.d(TAG, "Resetting storage.");
- removeChildrenRecursively(getContext().getCacheDir());
- mStorage.clear();
- mSimulateReadErrorIds.clear();
-
- mPrefs = getContext().getSharedPreferences(
- "com.android.documentsui.stubprovider.preferences", Context.MODE_PRIVATE);
- Collection<String> rootIds = mPrefs.getStringSet("roots", null);
- if (rootIds == null) {
- rootIds = Arrays.asList(new String[] { ROOT_0_ID, ROOT_1_ID });
- }
-
- mRoots.clear();
- for (String rootId : rootIds) {
- // Make a subdir in the cache dir for each root.
- final File file = new File(getContext().getCacheDir(), rootId);
- if (file.mkdir()) {
- Log.i(TAG, "Created new root directory @ " + file.getPath());
- }
- final RootInfo rootInfo = new RootInfo(file, getSize(rootId));
-
- if(rootId.equals(ROOT_1_ID)) {
- rootInfo.setSearchEnabled(false);
- }
-
- mStorage.put(rootInfo.document.documentId, rootInfo.document);
- mRoots.put(rootId, rootInfo);
- }
- }
-
- /**
- * @return Storage size, in bytes.
- */
- private long getSize(String rootId) {
- final String key = STORAGE_SIZE_KEY + "." + rootId;
- return mPrefs.getLong(key, DEFAULT_ROOT_SIZE);
- }
-
- @Override
- public Cursor queryRoots(String[] projection) throws FileNotFoundException {
- final MatrixCursor result = new MatrixCursor(projection != null ? projection
- : DEFAULT_ROOT_PROJECTION);
- for (Map.Entry<String, RootInfo> entry : mRoots.entrySet()) {
- final String id = entry.getKey();
- final RootInfo info = entry.getValue();
- final RowBuilder row = result.newRow();
- row.add(Root.COLUMN_ROOT_ID, id);
- row.add(Root.COLUMN_FLAGS, info.flags);
- row.add(Root.COLUMN_TITLE, id);
- row.add(Root.COLUMN_DOCUMENT_ID, info.document.documentId);
- row.add(Root.COLUMN_AVAILABLE_BYTES, info.getRemainingCapacity());
- }
- return result;
- }
-
- @Override
- public Cursor queryDocument(String documentId, String[] projection)
- throws FileNotFoundException {
- final MatrixCursor result = new MatrixCursor(projection != null ? projection
- : DEFAULT_DOCUMENT_PROJECTION);
- final StubDocument file = mStorage.get(documentId);
- if (file == null) {
- throw new FileNotFoundException();
- }
- includeDocument(result, file);
- return result;
- }
-
- @Override
- public boolean isChildDocument(String parentDocId, String docId) {
- final StubDocument parentDocument = mStorage.get(parentDocId);
- final StubDocument childDocument = mStorage.get(docId);
- return FileUtils.contains(parentDocument.file, childDocument.file);
- }
-
- @Override
- public String createDocument(String parentId, String mimeType, String displayName)
- throws FileNotFoundException {
- StubDocument parent = mStorage.get(parentId);
- File file = createFile(parent, mimeType, displayName);
-
- final StubDocument document = StubDocument.createRegularDocument(file, mimeType, parent);
- mStorage.put(document.documentId, document);
- Log.d(TAG, "Created document " + document.documentId);
- notifyParentChanged(document.parentId);
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildDocumentUri(mAuthority, document.documentId),
- null, false);
-
- return document.documentId;
- }
-
- @Override
- public void deleteDocument(String documentId)
- throws FileNotFoundException {
- final StubDocument document = mStorage.get(documentId);
- final long fileSize = document.file.length();
- if (document == null || !document.file.delete())
- throw new FileNotFoundException();
- synchronized (mWriteLock) {
- document.rootInfo.size -= fileSize;
- mStorage.remove(documentId);
- }
- Log.d(TAG, "Document deleted: " + documentId);
- notifyParentChanged(document.parentId);
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildDocumentUri(mAuthority, document.documentId),
- null, false);
- }
-
- @Override
- public Cursor queryChildDocumentsForManage(String parentDocumentId, String[] projection,
- String sortOrder) throws FileNotFoundException {
- return queryChildDocuments(parentDocumentId, projection, sortOrder);
- }
-
- @Override
- public Cursor queryChildDocuments(String parentDocumentId, String[] projection, String sortOrder)
- throws FileNotFoundException {
- final StubDocument parentDocument = mStorage.get(parentDocumentId);
- if (parentDocument == null || parentDocument.file.isFile()) {
- throw new FileNotFoundException();
- }
- final MatrixCursor result = new MatrixCursor(projection != null ? projection
- : DEFAULT_DOCUMENT_PROJECTION);
- result.setNotificationUri(getContext().getContentResolver(),
- DocumentsContract.buildChildDocumentsUri(mAuthority, parentDocumentId));
- StubDocument document;
- for (File file : parentDocument.file.listFiles()) {
- document = mStorage.get(getDocumentIdForFile(file));
- if (document != null) {
- includeDocument(result, document);
- }
- }
- return result;
- }
-
- @Override
- public Cursor queryRecentDocuments(String rootId, String[] projection)
- throws FileNotFoundException {
- final MatrixCursor result = new MatrixCursor(projection != null ? projection
- : DEFAULT_DOCUMENT_PROJECTION);
- return result;
- }
-
- @Override
- public Cursor querySearchDocuments(String rootId, String query, String[] projection)
- throws FileNotFoundException {
-
- StubDocument parentDocument = mRoots.get(rootId).document;
- if (parentDocument == null || parentDocument.file.isFile()) {
- throw new FileNotFoundException();
- }
-
- final MatrixCursor result = new MatrixCursor(
- projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
-
- for (File file : parentDocument.file.listFiles()) {
- if (file.getName().toLowerCase().contains(query)) {
- StubDocument document = mStorage.get(getDocumentIdForFile(file));
- if (document != null) {
- includeDocument(result, document);
- }
- }
- }
- return result;
- }
-
- @Override
- public String renameDocument(String documentId, String displayName)
- throws FileNotFoundException {
-
- StubDocument oldDoc = mStorage.get(documentId);
-
- File before = oldDoc.file;
- File after = new File(before.getParentFile(), displayName);
-
- if (after.exists()) {
- throw new IllegalStateException("Already exists " + after);
- }
-
- boolean result = before.renameTo(after);
-
- if (!result) {
- throw new IllegalStateException("Failed to rename to " + after);
- }
-
- StubDocument newDoc = StubDocument.createRegularDocument(after, oldDoc.mimeType,
- mStorage.get(oldDoc.parentId));
-
- mStorage.remove(documentId);
- notifyParentChanged(oldDoc.parentId);
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildDocumentUri(mAuthority, oldDoc.documentId), null, false);
-
- mStorage.put(newDoc.documentId, newDoc);
- notifyParentChanged(newDoc.parentId);
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildDocumentUri(mAuthority, newDoc.documentId), null, false);
-
- if (!TextUtils.equals(documentId, newDoc.documentId)) {
- return newDoc.documentId;
- } else {
- return null;
- }
- }
-
- @Override
- public ParcelFileDescriptor openDocument(String docId, String mode, CancellationSignal signal)
- throws FileNotFoundException {
-
- final StubDocument document = mStorage.get(docId);
- if (document == null || !document.file.isFile()) {
- throw new FileNotFoundException();
- }
- if ((document.flags & Document.FLAG_VIRTUAL_DOCUMENT) != 0) {
- throw new IllegalStateException("Tried to open a virtual file.");
- }
-
- if ("r".equals(mode)) {
- if (mSimulateReadErrorIds.contains(docId)) {
- Log.d(TAG, "Simulated errs enabled. Open in the wrong mode.");
- return ParcelFileDescriptor.open(
- document.file, ParcelFileDescriptor.MODE_WRITE_ONLY);
- }
- return ParcelFileDescriptor.open(document.file, ParcelFileDescriptor.MODE_READ_ONLY);
- }
- if ("w".equals(mode)) {
- return startWrite(document);
- }
-
- throw new FileNotFoundException();
- }
-
- @VisibleForTesting
- public void simulateReadErrorsForFile(Uri uri) {
- simulateReadErrorsForFile(DocumentsContract.getDocumentId(uri));
- }
-
- public void simulateReadErrorsForFile(String id) {
- mSimulateReadErrorIds.add(id);
- }
-
- @Override
- public AssetFileDescriptor openDocumentThumbnail(
- String docId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException {
- throw new FileNotFoundException();
- }
-
- @Override
- public AssetFileDescriptor openTypedDocument(
- String docId, String mimeTypeFilter, Bundle opts, CancellationSignal signal)
- throws FileNotFoundException {
- final StubDocument document = mStorage.get(docId);
- if (document == null || !document.file.isFile() || document.streamTypes == null) {
- throw new FileNotFoundException();
- }
- for (final String mimeType : document.streamTypes) {
- // Strict compare won't accept wildcards, but that's OK for tests, as DocumentsUI
- // doesn't use them for getStreamTypes nor openTypedDocument.
- if (mimeType.equals(mimeTypeFilter)) {
- ParcelFileDescriptor pfd = ParcelFileDescriptor.open(
- document.file, ParcelFileDescriptor.MODE_READ_ONLY);
- if (mSimulateReadErrorIds.contains(docId)) {
- pfd = new ParcelFileDescriptor(pfd) {
- @Override
- public void checkError() throws IOException {
- throw new IOException("Test error");
- }
- };
- }
- return new AssetFileDescriptor(pfd, 0, document.file.length());
- }
- }
- throw new IllegalArgumentException("Invalid MIME type filter for openTypedDocument().");
- }
-
- @Override
- public String[] getStreamTypes(Uri uri, String mimeTypeFilter) {
- final StubDocument document = mStorage.get(DocumentsContract.getDocumentId(uri));
- if (document == null) {
- throw new IllegalArgumentException(
- "The provided Uri is incorrect, or the file is gone.");
- }
- if (!"*/*".equals(mimeTypeFilter)) {
- // Not used by DocumentsUI, so don't bother implementing it.
- throw new UnsupportedOperationException();
- }
- if (document.streamTypes == null) {
- return null;
- }
- return document.streamTypes.toArray(new String[document.streamTypes.size()]);
- }
-
- private ParcelFileDescriptor startWrite(final StubDocument document)
- throws FileNotFoundException {
- ParcelFileDescriptor[] pipe;
- try {
- pipe = ParcelFileDescriptor.createReliablePipe();
- } catch (IOException exception) {
- throw new FileNotFoundException();
- }
- final ParcelFileDescriptor readPipe = pipe[0];
- final ParcelFileDescriptor writePipe = pipe[1];
-
- new Thread() {
- @Override
- public void run() {
- InputStream inputStream = null;
- OutputStream outputStream = null;
- try {
- Log.d(TAG, "Opening write stream on file " + document.documentId);
- inputStream = new ParcelFileDescriptor.AutoCloseInputStream(readPipe);
- outputStream = new FileOutputStream(document.file);
- byte[] buffer = new byte[32 * 1024];
- int bytesToRead;
- int bytesRead = 0;
- while (bytesRead != -1) {
- synchronized (mWriteLock) {
- // This cast is safe because the max possible value is buffer.length.
- bytesToRead = (int) Math.min(document.rootInfo.getRemainingCapacity(),
- buffer.length);
- if (bytesToRead == 0) {
- closePipeWithErrorSilently(readPipe, "Not enough space.");
- break;
- }
- bytesRead = inputStream.read(buffer, 0, bytesToRead);
- if (bytesRead == -1) {
- break;
- }
- outputStream.write(buffer, 0, bytesRead);
- document.rootInfo.size += bytesRead;
- }
- }
- } catch (IOException e) {
- Log.e(TAG, "Error on close", e);
- closePipeWithErrorSilently(readPipe, e.getMessage());
- } finally {
- IoUtils.closeQuietly(inputStream);
- IoUtils.closeQuietly(outputStream);
- Log.d(TAG, "Closing write stream on file " + document.documentId);
- notifyParentChanged(document.parentId);
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildDocumentUri(mAuthority, document.documentId),
- null, false);
- }
- }
- }.start();
-
- return writePipe;
- }
-
- private void closePipeWithErrorSilently(ParcelFileDescriptor pipe, String error) {
- try {
- pipe.closeWithError(error);
- } catch (IOException ignore) {
- }
- }
-
- @Override
- public Bundle call(String method, String arg, Bundle extras) {
- // We're not supposed to override any of the default DocumentsProvider
- // methods that are supported by "call", so javadoc asks that we
- // always call super.call first and return if response is not null.
- Bundle result = super.call(method, arg, extras);
- if (result != null) {
- return result;
- }
-
- switch (method) {
- case "clear":
- clearCacheAndBuildRoots();
- return null;
- case "configure":
- configure(arg, extras);
- return null;
- case "createVirtualFile":
- return createVirtualFileFromBundle(extras);
- case "simulateReadErrorsForFile":
- simulateReadErrorsForFile(arg);
- return null;
- case "createDocumentWithFlags":
- return dispatchCreateDocumentWithFlags(extras);
- }
-
- return null;
- }
-
- private Bundle createVirtualFileFromBundle(Bundle extras) {
- try {
- Uri uri = createVirtualFile(
- extras.getString(EXTRA_ROOT),
- extras.getString(EXTRA_PATH),
- extras.getString(Document.COLUMN_MIME_TYPE),
- extras.getStringArrayList(EXTRA_STREAM_TYPES),
- extras.getByteArray(EXTRA_CONTENT));
-
- String documentId = DocumentsContract.getDocumentId(uri);
- Bundle result = new Bundle();
- result.putString(Document.COLUMN_DOCUMENT_ID, documentId);
- return result;
- } catch (IOException e) {
- Log.e(TAG, "Couldn't create virtual file.");
- }
-
- return null;
- }
-
- private Bundle dispatchCreateDocumentWithFlags(Bundle extras) {
- String rootId = extras.getString(EXTRA_PARENT_ID);
- String mimeType = extras.getString(Document.COLUMN_MIME_TYPE);
- String name = extras.getString(Document.COLUMN_DISPLAY_NAME);
- List<String> streamTypes = extras.getStringArrayList(EXTRA_STREAM_TYPES);
- int flags = extras.getInt(EXTRA_FLAGS);
-
- Bundle out = new Bundle();
- String documentId = null;
- try {
- documentId = createDocument(rootId, mimeType, name, flags, streamTypes);
- Uri uri = DocumentsContract.buildDocumentUri(mAuthority, documentId);
- out.putParcelable(DocumentsContract.EXTRA_URI, uri);
- } catch (FileNotFoundException e) {
- Log.d(TAG, "Creating document with flags failed" + name);
- }
- return out;
- }
-
- public String createDocument(String parentId, String mimeType, String displayName, int flags,
- List<String> streamTypes) throws FileNotFoundException {
-
- StubDocument parent = mStorage.get(parentId);
- File file = createFile(parent, mimeType, displayName);
-
- final StubDocument document = StubDocument.createDocumentWithFlags(file, mimeType, parent,
- flags, streamTypes);
- mStorage.put(document.documentId, document);
- Log.d(TAG, "Created document " + document.documentId);
- notifyParentChanged(document.parentId);
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildDocumentUri(mAuthority, document.documentId),
- null, false);
-
- return document.documentId;
- }
-
- private File createFile(StubDocument parent, String mimeType, String displayName)
- throws FileNotFoundException {
- if (parent == null) {
- throw new IllegalArgumentException(
- "Can't create file " + displayName + " in null parent.");
- }
- if (!parent.file.isDirectory()) {
- throw new IllegalArgumentException(
- "Can't create file " + displayName + " inside non-directory parent "
- + parent.file.getName());
- }
-
- final File file = new File(parent.file, displayName);
- if (file.exists()) {
- throw new FileNotFoundException(
- "Duplicate file names not supported for " + file);
- }
-
- if (mimeType.equals(Document.MIME_TYPE_DIR)) {
- if (!file.mkdirs()) {
- throw new FileNotFoundException("Failed to create directory(s): " + file);
- }
- Log.i(TAG, "Created new directory: " + file);
- } else {
- boolean created = false;
- try {
- created = file.createNewFile();
- } catch (IOException e) {
- // We'll throw an FNF exception later :)
- Log.e(TAG, "createNewFile operation failed for file: " + file, e);
- }
- if (!created) {
- throw new FileNotFoundException("createNewFile operation failed for: " + file);
- }
- Log.i(TAG, "Created new file: " + file);
- }
- return file;
- }
-
- private void configure(String arg, Bundle extras) {
- Log.d(TAG, "Configure " + arg);
- String rootName = extras.getString(EXTRA_ROOT, ROOT_0_ID);
- long rootSize = extras.getLong(EXTRA_SIZE, 1) * 1024 * 1024;
- setSize(rootName, rootSize);
- }
-
- private void notifyParentChanged(String parentId) {
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildChildDocumentsUri(mAuthority, parentId), null, false);
- // Notify also about possible change in remaining space on the root.
- getContext().getContentResolver().notifyChange(DocumentsContract.buildRootsUri(mAuthority),
- null, false);
- }
-
- private void includeDocument(MatrixCursor result, StubDocument document) {
- final RowBuilder row = result.newRow();
- row.add(Document.COLUMN_DOCUMENT_ID, document.documentId);
- row.add(Document.COLUMN_DISPLAY_NAME, document.file.getName());
- row.add(Document.COLUMN_SIZE, document.file.length());
- row.add(Document.COLUMN_MIME_TYPE, document.mimeType);
- row.add(Document.COLUMN_FLAGS, document.flags);
- row.add(Document.COLUMN_LAST_MODIFIED, document.file.lastModified());
- }
-
- private void removeChildrenRecursively(File file) {
- for (File childFile : file.listFiles()) {
- if (childFile.isDirectory()) {
- removeChildrenRecursively(childFile);
- }
- childFile.delete();
- }
- }
-
- public void setSize(String rootId, long rootSize) {
- RootInfo root = mRoots.get(rootId);
- if (root != null) {
- final String key = STORAGE_SIZE_KEY + "." + rootId;
- Log.d(TAG, "Set size of " + key + " : " + rootSize);
-
- // Persist the size.
- SharedPreferences.Editor editor = mPrefs.edit();
- editor.putLong(key, rootSize);
- editor.apply();
- // Apply the size in the current instance of this provider.
- root.capacity = rootSize;
- getContext().getContentResolver().notifyChange(
- DocumentsContract.buildRootsUri(mAuthority),
- null, false);
- } else {
- Log.e(TAG, "Attempt to configure non-existent root: " + rootId);
- }
- }
-
- @VisibleForTesting
- public Uri createRegularFile(String rootId, String path, String mimeType, byte[] content)
- throws FileNotFoundException, IOException {
- final File file = createFile(rootId, path, mimeType, content);
- final StubDocument parent = mStorage.get(getDocumentIdForFile(file.getParentFile()));
- if (parent == null) {
- throw new FileNotFoundException("Parent not found.");
- }
- final StubDocument document = StubDocument.createRegularDocument(file, mimeType, parent);
- mStorage.put(document.documentId, document);
- return DocumentsContract.buildDocumentUri(mAuthority, document.documentId);
- }
-
- @VisibleForTesting
- public Uri createVirtualFile(
- String rootId, String path, String mimeType, List<String> streamTypes, byte[] content)
- throws FileNotFoundException, IOException {
-
- final File file = createFile(rootId, path, mimeType, content);
- final StubDocument parent = mStorage.get(getDocumentIdForFile(file.getParentFile()));
- if (parent == null) {
- throw new FileNotFoundException("Parent not found.");
- }
- final StubDocument document = StubDocument.createVirtualDocument(
- file, mimeType, streamTypes, parent);
- mStorage.put(document.documentId, document);
- return DocumentsContract.buildDocumentUri(mAuthority, document.documentId);
- }
-
- @VisibleForTesting
- public File getFile(String rootId, String path) throws FileNotFoundException {
- StubDocument root = mRoots.get(rootId).document;
- if (root == null) {
- throw new FileNotFoundException("No roots with the ID " + rootId + " were found");
- }
- // Convert the path string into a path that's relative to the root.
- File needle = new File(root.file, path.substring(1));
-
- StubDocument found = mStorage.get(getDocumentIdForFile(needle));
- if (found == null) {
- return null;
- }
- return found.file;
- }
-
- private File createFile(String rootId, String path, String mimeType, byte[] content)
- throws FileNotFoundException, IOException {
- Log.d(TAG, "Creating test file " + rootId + " : " + path);
- StubDocument root = mRoots.get(rootId).document;
- if (root == null) {
- throw new FileNotFoundException("No roots with the ID " + rootId + " were found");
- }
- final File file = new File(root.file, path.substring(1));
- if (DocumentsContract.Document.MIME_TYPE_DIR.equals(mimeType)) {
- if (!file.mkdirs()) {
- throw new FileNotFoundException("Couldn't create directory " + file.getPath());
- }
- } else {
- if (!file.createNewFile()) {
- throw new FileNotFoundException("Couldn't create file " + file.getPath());
- }
- try (final FileOutputStream fout = new FileOutputStream(file)) {
- fout.write(content);
- }
- }
- return file;
- }
-
- final static class RootInfo {
- private static final int DEFAULT_ROOTS_FLAGS = Root.FLAG_SUPPORTS_SEARCH
- | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_IS_CHILD;
-
- public final String name;
- public final StubDocument document;
- public long capacity;
- public long size;
- public int flags;
-
- RootInfo(File file, long capacity) {
- this.name = file.getName();
- this.capacity = 1024 * 1024;
- this.flags = DEFAULT_ROOTS_FLAGS;
- this.capacity = capacity;
- this.size = 0;
- this.document = StubDocument.createRootDocument(file, this);
- }
-
- public long getRemainingCapacity() {
- return capacity - size;
- }
-
- public void setSearchEnabled(boolean enabled) {
- flags = enabled ? (flags | Root.FLAG_SUPPORTS_SEARCH)
- : (flags & ~Root.FLAG_SUPPORTS_SEARCH);
- }
-
- }
-
- final static class StubDocument {
- public final File file;
- public final String documentId;
- public final String mimeType;
- public final List<String> streamTypes;
- public final int flags;
- public final String parentId;
- public final RootInfo rootInfo;
-
- private StubDocument(File file, String mimeType, List<String> streamTypes, int flags,
- StubDocument parent) {
- this.file = file;
- this.documentId = getDocumentIdForFile(file);
- this.mimeType = mimeType;
- this.streamTypes = streamTypes;
- this.flags = flags;
- this.parentId = parent.documentId;
- this.rootInfo = parent.rootInfo;
- }
-
- private StubDocument(File file, RootInfo rootInfo) {
- this.file = file;
- this.documentId = getDocumentIdForFile(file);
- this.mimeType = Document.MIME_TYPE_DIR;
- this.streamTypes = new ArrayList<String>();
- this.flags = Document.FLAG_DIR_SUPPORTS_CREATE | Document.FLAG_SUPPORTS_RENAME;
- this.parentId = null;
- this.rootInfo = rootInfo;
- }
-
- public static StubDocument createRootDocument(File file, RootInfo rootInfo) {
- return new StubDocument(file, rootInfo);
- }
-
- public static StubDocument createRegularDocument(
- File file, String mimeType, StubDocument parent) {
- int flags = Document.FLAG_SUPPORTS_DELETE | Document.FLAG_SUPPORTS_RENAME;
- if (file.isDirectory()) {
- flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
- } else {
- flags |= Document.FLAG_SUPPORTS_WRITE;
- }
- return new StubDocument(file, mimeType, new ArrayList<String>(), flags, parent);
- }
-
- public static StubDocument createDocumentWithFlags(
- File file, String mimeType, StubDocument parent, int flags,
- List<String> streamTypes) {
- return new StubDocument(file, mimeType, streamTypes, flags, parent);
- }
-
- public static StubDocument createVirtualDocument(
- File file, String mimeType, List<String> streamTypes, StubDocument parent) {
- int flags = Document.FLAG_SUPPORTS_DELETE | Document.FLAG_SUPPORTS_WRITE
- | Document.FLAG_VIRTUAL_DOCUMENT;
- return new StubDocument(file, mimeType, streamTypes, flags, parent);
- }
-
- @Override
- public String toString() {
- return "StubDocument{"
- + "path:" + file.getPath()
- + ", documentId:" + documentId
- + ", mimeType:" + mimeType
- + ", streamTypes:" + streamTypes.toString()
- + ", flags:" + flags
- + ", parentId:" + parentId
- + ", rootInfo:" + rootInfo
- + "}";
- }
- }
-
- private static String getDocumentIdForFile(File file) {
- return file.getAbsolutePath();
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java b/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java
deleted file mode 100644
index a215488..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.android.documentsui;
-
-import android.graphics.Point;
-import android.support.v7.widget.RecyclerView;
-
-public class TestInputEvent implements Events.InputEvent {
-
- public boolean mouseEvent;
- public boolean primaryButtonPressed;
- public boolean secondaryButtonPressed;
- public boolean shiftKeyDow;
- public boolean actionDown;
- public boolean actionUp;
- public Point location;
- public int position = Integer.MIN_VALUE;
-
- public TestInputEvent() {}
-
- public TestInputEvent(int position) {
- this.position = position;
- }
-
- @Override
- public boolean isMouseEvent() {
- return mouseEvent;
- }
-
- @Override
- public boolean isPrimaryButtonPressed() {
- return primaryButtonPressed;
- }
-
- @Override
- public boolean isSecondaryButtonPressed() {
- return secondaryButtonPressed;
- }
-
- @Override
- public boolean isShiftKeyDown() {
- return shiftKeyDow;
- }
-
- @Override
- public boolean isActionDown() {
- return actionDown;
- }
-
- @Override
- public boolean isActionUp() {
- return actionUp;
- }
-
- @Override
- public Point getOrigin() {
- return location;
- }
-
- @Override
- public float getX() {
- return location.x;
- }
-
- @Override
- public float getY() {
- return location.y;
- }
-
- @Override
- public boolean isOverItem() {
- return position != Integer.MIN_VALUE && position != RecyclerView.NO_POSITION;
- }
-
- @Override
- public int getItemPosition() {
- return position;
- }
-
- public static TestInputEvent tap(int position) {
- return new TestInputEvent(position);
- }
-
- public static TestInputEvent shiftTap(int position) {
- TestInputEvent e = new TestInputEvent(position);
- e.shiftKeyDow = true;
- return e;
- }
-
- public static TestInputEvent click(int position) {
- TestInputEvent e = new TestInputEvent(position);
- e.mouseEvent = true;
- return e;
- }
-
- public static TestInputEvent shiftClick(int position) {
- TestInputEvent e = new TestInputEvent(position);
- e.mouseEvent = true;
- e.shiftKeyDow = true;
- return e;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ThumbnailCacheTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ThumbnailCacheTest.java
deleted file mode 100644
index dda4918..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/ThumbnailCacheTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import android.content.ComponentCallbacks2;
-import android.graphics.Bitmap;
-import android.graphics.Point;
-import android.net.Uri;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.documentsui.ThumbnailCache.Result;
-import com.android.documentsui.testing.Bitmaps;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ThumbnailCacheTest {
-
- private static final Uri URI_0 = Uri.parse("content://authority/document/0");
- private static final Uri URI_1 = Uri.parse("content://authority/document/1");
-
- private static final Point SMALL_SIZE = new Point(1, 1);
- private static final Point MID_SIZE = new Point(2, 2);
- private static final Point LARGE_SIZE = new Point(3, 3);
-
- private static final Bitmap SMALL_BITMAP = Bitmaps.createTestBitmap(1, 1);
- private static final Bitmap MIDSIZE_BITMAP = Bitmaps.createTestBitmap(2, 2);
- private static final Bitmap LARGE_BITMAP = Bitmaps.createTestBitmap(3, 3);
-
- private static final long LAST_MODIFIED = 100;
-
- private static final int CACHE_SIZE_LIMIT =
- MIDSIZE_BITMAP.getByteCount() + LARGE_BITMAP.getByteCount();
-
- private ThumbnailCache mCache;
-
- @Before
- public void setUp() {
- mCache = new ThumbnailCache(CACHE_SIZE_LIMIT);
- }
-
- @Test
- public void testMiss() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_1, MID_SIZE);
-
- assertMiss(result);
- }
-
- @Test
- public void testHit_Exact() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
-
- assertHitExact(result);
- assertSame(MIDSIZE_BITMAP, result.getThumbnail());
- }
-
- @Test
- public void testHit_Smaller() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_0, LARGE_SIZE);
-
- assertHitSmaller(result);
- assertSame(MIDSIZE_BITMAP, result.getThumbnail());
- }
-
- @Test
- public void testHit_Larger() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_0, SMALL_SIZE);
-
- assertHitLarger(result);
- assertSame(MIDSIZE_BITMAP, result.getThumbnail());
- }
-
- @Test
- public void testHit_Larger_HasBothSize() {
- mCache.putThumbnail(URI_0, LARGE_SIZE, LARGE_BITMAP, LAST_MODIFIED);
- mCache.putThumbnail(URI_0, SMALL_SIZE, SMALL_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
-
- assertHitLarger(result);
- assertSame(LARGE_BITMAP, result.getThumbnail());
- }
-
- @Test
- public void testHit_Exact_MultiplePut() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
-
- Bitmap localBitmap = Bitmaps.createTestBitmap(MID_SIZE.x, MID_SIZE.y);
- long localLastModified = LAST_MODIFIED + 100;
- mCache.putThumbnail(URI_0, MID_SIZE, localBitmap, localLastModified);
-
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
-
- assertHitExact(result);
- assertSame(localBitmap, result.getThumbnail());
- }
-
- @Test
- public void testHit_EqualLastModified() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
-
- assertEquals(LAST_MODIFIED, result.getLastModified());
- }
-
- @Test
- public void testEvictOldest_SizeExceeded() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
- mCache.putThumbnail(URI_1, SMALL_SIZE, SMALL_BITMAP, LAST_MODIFIED);
- mCache.putThumbnail(URI_1, LARGE_SIZE, LARGE_BITMAP, LAST_MODIFIED);
-
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
-
- assertMiss(result);
- }
-
- @Test
- public void testCacheShrink_OnTrimMemory_Moderate() {
- mCache.putThumbnail(URI_0, MID_SIZE, MIDSIZE_BITMAP, LAST_MODIFIED);
- mCache.putThumbnail(URI_0, SMALL_SIZE, SMALL_BITMAP, LAST_MODIFIED);
- mCache.putThumbnail(URI_0, LARGE_SIZE, LARGE_BITMAP, LAST_MODIFIED);
-
- mCache.onTrimMemory(ComponentCallbacks2.TRIM_MEMORY_MODERATE);
-
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
- assertMiss(result);
- }
-
- @Test
- public void testCacheShrink_OnTrimMemory_Background() {
- mCache.putThumbnail(URI_0, LARGE_SIZE, LARGE_BITMAP, LAST_MODIFIED);
- mCache.putThumbnail(URI_0, SMALL_SIZE, SMALL_BITMAP, LAST_MODIFIED);
-
- mCache.onTrimMemory(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND);
-
- // Math here (size of each pixel omitted):
- // Limit = midSize + largeSize = 2 * 2 + 3 * 3 = 13, so after all putThumbnail the cache is
- // full.
- //
- // HalfLimit = Limit / 2 = 5. After evicting largeSize bitmap, cache size decreases to 4,
- // which is smaller than 5. Then smallSize bitmap remains.
- Result result = mCache.getThumbnail(URI_0, MID_SIZE);
- assertHitSmaller(result);
- assertSame(SMALL_BITMAP, result.getThumbnail());
- }
-
- private static void assertMiss(Result result) {
- assertEquals(Result.CACHE_MISS, result.getStatus());
- assertFalse(result.isExactHit());
- assertFalse(result.isHit());
- }
-
- private static void assertHitExact(Result result) {
- assertEquals(Result.CACHE_HIT_EXACT, result.getStatus());
- assertTrue(result.isExactHit());
- assertTrue(result.isHit());
- }
-
- private static void assertHitSmaller(Result result) {
- assertEquals(Result.CACHE_HIT_SMALLER, result.getStatus());
- assertFalse(result.isExactHit());
- assertTrue(result.isHit());
- }
-
- private static void assertHitLarger(Result result) {
- assertEquals(Result.CACHE_HIT_LARGER, result.getStatus());
- assertFalse(result.isExactHit());
- assertTrue(result.isHit());
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/BaseBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/BaseBot.java
deleted file mode 100644
index 1d2b47f..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/BaseBot.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.bots;
-
-import static junit.framework.Assert.assertNotNull;
-
-import android.content.Context;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.Until;
-
-/**
- * A test helper class that provides support for controlling directory list
- * and making assertions against the state of it.
- */
-abstract class BaseBot {
- final UiDevice mDevice;
- final Context mContext;
- final int mTimeout;
-
- BaseBot(UiDevice device, Context context, int timeout) {
- mDevice = device;
- mContext = context;
- mTimeout = timeout;
- }
-
- /**
- * Asserts that the specified view or one of its descendents has focus.
- */
- protected void assertHasFocus(String resourceName) {
- UiObject2 candidate = mDevice.findObject(By.res(resourceName));
- assertNotNull("Expected " + resourceName + " to have focus, but it didn't.",
- candidate.findObject(By.focused(true)));
- }
-
- protected UiObject2 find(BySelector selector) {
- mDevice.wait(Until.findObject(selector), mTimeout);
- return mDevice.findObject(selector);
- }
-
- protected UiObject findObject(String resourceId) {
- final UiSelector object = new UiSelector().resourceId(resourceId);
- return mDevice.findObject(object);
- }
-
- protected UiObject findObject(String parentResourceId, String childResourceId) {
- final UiSelector selector = new UiSelector()
- .resourceId(parentResourceId)
- .childSelector(new UiSelector().resourceId(childResourceId));
- return mDevice.findObject(selector);
- }
-
- protected void waitForIdle() {
- mDevice.waitForIdle(mTimeout);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/DirectoryListBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/DirectoryListBot.java
deleted file mode 100644
index e2aabc7..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/DirectoryListBot.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.bots;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
-import android.content.Context;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Configurator;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.Until;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-import junit.framework.Assert;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * A test helper class that provides support for controlling directory list
- * and making assertions against the state of it.
- */
-public class DirectoryListBot extends BaseBot {
- private static final String DIR_LIST_ID = "com.android.documentsui:id/dir_list";
-
- private static final BySelector SNACK_DELETE =
- By.desc(Pattern.compile("^Deleting [0-9]+ file.+"));
-
- public DirectoryListBot(UiDevice device, Context context, int timeout) {
- super(device, context, timeout);
- }
-
- public void assertDocumentsCount(int count) throws UiObjectNotFoundException {
- UiObject docsList = findDocumentsList();
- assertEquals(count, docsList.getChildCount());
- }
-
- public void assertDocumentsPresent(String... labels) throws UiObjectNotFoundException {
- List<String> absent = new ArrayList<>();
- for (String label : labels) {
- if (!findDocument(label).exists()) {
- absent.add(label);
- }
- }
- if (!absent.isEmpty()) {
- Assert.fail("Expected documents " + Arrays.asList(labels)
- + ", but missing " + absent);
- }
- }
-
- public void assertDocumentsAbsent(String... labels) throws UiObjectNotFoundException {
- List<String> found = new ArrayList<>();
- for (String label : labels) {
- if (findDocument(label).exists()) {
- found.add(label);
- }
- }
- if (!found.isEmpty()) {
- Assert.fail("Expected documents not present" + Arrays.asList(labels)
- + ", but present " + found);
- }
- }
-
- public void assertDocumentsCountOnList(boolean exists, int count) throws UiObjectNotFoundException {
- UiObject docsList = findDocumentsList();
- assertEquals(exists, docsList.exists());
- if(docsList.exists()) {
- assertEquals(count, docsList.getChildCount());
- }
- }
-
- public void assertMessageTextView(String message) throws UiObjectNotFoundException {
- UiObject messageTextView = findMessageTextView();
- assertTrue(messageTextView.exists());
-
- String msg = String.valueOf(message);
- assertEquals(String.format(msg, "TEST_ROOT_0"), messageTextView.getText());
-
- }
-
- private UiObject findMessageTextView() {
- return findObject(
- "com.android.documentsui:id/container_directory",
- "com.android.documentsui:id/message");
- }
-
- public void assertSnackbar(int id) {
- assertNotNull(getSnackbar(mContext.getString(id)));
- }
-
- public void openDocument(String label) throws UiObjectNotFoundException {
- int toolType = Configurator.getInstance().getToolType();
- Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_FINGER);
- UiObject doc = findDocument(label);
- doc.click();
- Configurator.getInstance().setToolType(toolType);
- }
-
- public void clickDocument(String label) throws UiObjectNotFoundException {
- findDocument(label).click();
- }
-
- public UiObject selectDocument(String label) throws UiObjectNotFoundException {
- UiObject doc = findDocument(label);
- doc.longClick();
- return doc;
- }
-
- public void copyFilesToClipboard(String...labels) throws UiObjectNotFoundException {
- for (String label: labels) {
- clickDocument(label);
- }
- mDevice.pressKeyCode(KeyEvent.KEYCODE_C, KeyEvent.META_CTRL_ON);
- }
-
- public void pasteFilesFromClipboard() {
- mDevice.pressKeyCode(KeyEvent.KEYCODE_V, KeyEvent.META_CTRL_ON);
- }
-
- public UiObject2 getSnackbar(String message) {
- return mDevice.wait(Until.findObject(By.text(message)), mTimeout);
- }
-
- public void waitForDeleteSnackbar() {
- mDevice.wait(Until.findObject(SNACK_DELETE), mTimeout);
- }
-
- public void waitForDeleteSnackbarGone() {
- // wait a little longer for snackbar to go away, as it disappears after a timeout.
- mDevice.wait(Until.gone(SNACK_DELETE), mTimeout * 2);
- }
-
- public void waitForDocument(String label) throws UiObjectNotFoundException {
- findDocument(label).waitForExists(mTimeout);
- }
-
- public UiObject findDocument(String label) throws UiObjectNotFoundException {
- final UiSelector docList = new UiSelector().resourceId(
- "com.android.documentsui:id/container_directory").childSelector(
- new UiSelector().resourceId(DIR_LIST_ID));
-
- // Wait for the first list item to appear
- new UiObject(docList.childSelector(new UiSelector())).waitForExists(mTimeout);
-
- // new UiScrollable(docList).scrollIntoView(new UiSelector().text(label));
- return mDevice.findObject(docList.childSelector(new UiSelector().text(label)));
- }
-
- public boolean hasDocuments(String... labels) throws UiObjectNotFoundException {
- for (String label : labels) {
- if (!findDocument(label).exists()) {
- return false;
- }
- }
- return true;
- }
-
- public UiObject findDocumentsList() {
- return findObject(
- "com.android.documentsui:id/container_directory",
- DIR_LIST_ID);
- }
-
- public void assertHasFocus() {
- assertHasFocus(DIR_LIST_ID);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/KeyboardBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/KeyboardBot.java
deleted file mode 100644
index b0a4d76..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/KeyboardBot.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.bots;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.pressImeActionButton;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-
-import android.content.Context;
-import android.support.test.uiautomator.UiDevice;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-/**
- * A test helper class that provides support for keyboard manipulation.
- */
-public class KeyboardBot extends BaseBot {
-
- public KeyboardBot(UiDevice device, Context context, int timeout) {
- super(device, context, timeout);
- }
-
- public void dismissKeyboardIfPresent() {
- if(isKeyboardPresent()) {
- mDevice.pressBack();
- }
- }
-
- // Indirect way to detect the keyboard.
- private boolean isKeyboardPresent() {
- InputMethodManager inputManager = (InputMethodManager) mContext
- .getSystemService(Context.INPUT_METHOD_SERVICE);
- return inputManager.isAcceptingText();
- }
-
- public void pressEnter() {
- //TODO: There seems to be a bug on N/Espresso that makes pressing Enter not work
- // This is a temporary workaround that somehow works
- // See b/28399576
- onView(isAssignableFrom(EditText.class)).perform(pressImeActionButton());
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/Matchers.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/Matchers.java
deleted file mode 100644
index 2343a49..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/Matchers.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.bots;
-
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withResourceName;
-import static org.hamcrest.CoreMatchers.allOf;
-
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Spinner;
-import android.widget.Toolbar;
-
-import com.android.documentsui.R;
-import com.android.internal.view.menu.ActionMenuItemView;
-
-import org.hamcrest.Matcher;
-
-/**
- * Handy matchers useful for finding stuff in the UI. Use with Espresso testing.
- */
-final class Matchers {
- static final Matcher<View> TOOLBAR = allOf(isAssignableFrom(Toolbar.class),
- withId(R.id.toolbar));
- static final Matcher<View> SEARCH_MENU = allOf(withId(R.id.menu_search), isDisplayed());
- static final Matcher<View> SEARCH_BUTTON = allOf(isAssignableFrom(ImageView.class),
- withResourceName("search_button"));
- static final Matcher<View> BREADCRUMB = allOf(isAssignableFrom(Spinner.class),
- withId(R.id.breadcrumb));
- static final Matcher<View> MENU_SEARCH = allOf(isAssignableFrom(ActionMenuItemView.class),
- withResourceName("menu_search"));
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java
deleted file mode 100644
index ef22bb5..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.bots;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.action.ViewActions.swipeLeft;
-import static android.support.test.espresso.action.ViewActions.swipeRight;
-
-import android.content.Context;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
-import android.support.v4.view.GravityCompat;
-import android.util.Log;
-
-import android.view.View;
-import junit.framework.Assert;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-
-import com.android.documentsui.R;
-
-/**
- * A test helper class that provides support for controlling and asserting against
- * the roots list drawer.
- */
-public class RootsListBot extends BaseBot {
- private static final String ROOTS_LIST_ID = "com.android.documentsui:id/roots_list";
- private static final String TAG = "RootsListBot";
-
- public RootsListBot(UiDevice device, Context context, int timeout) {
- super(device, context, timeout);
- }
-
- private UiObject findRoot(String label) throws UiObjectNotFoundException {
- final UiSelector rootsList = new UiSelector().resourceId(
- "com.android.documentsui:id/container_roots").childSelector(
- new UiSelector().resourceId(ROOTS_LIST_ID));
-
- // We might need to expand drawer if not visible
- if (!new UiObject(rootsList).waitForExists(mTimeout)) {
- Log.d(TAG, "Failed to find roots list; trying to expand");
- final UiSelector hamburger = new UiSelector().resourceId(
- "com.android.documentsui:id/toolbar").childSelector(
- new UiSelector().className("android.widget.ImageButton").clickable(true));
- new UiObject(hamburger).click();
- }
-
- // Wait for the first list item to appear
- new UiObject(rootsList.childSelector(new UiSelector())).waitForExists(mTimeout);
-
- // Now scroll around to find our item
- new UiScrollable(rootsList).scrollIntoView(new UiSelector().text(label));
- return new UiObject(rootsList.childSelector(new UiSelector().text(label)));
- }
-
- public void openRoot(String label) throws UiObjectNotFoundException {
- findRoot(label).click();
- // Close the drawer in case we select a pre-selected root already
- closeDrawer();
- }
-
- public void closeDrawer() {
- // Espresso will try to close the drawer if it's opened
- // But if no drawer exists (Tablet devices), we will have to catch the exception
- // and continue on the test
- // Why can't we do something like .exist() first?
- // http://stackoverflow.com/questions/20807131/espresso-return-boolean-if-view-exists
- try {
- if (mContext.getResources().getConfiguration()
- .getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
- onView(withId(R.id.drawer_layout)).perform(swipeRight());
- } else {
- onView(withId(R.id.drawer_layout)).perform(swipeLeft());
- }
- } catch (Exception e) {
- }
- }
-
- public void assertRootsPresent(String... labels) throws UiObjectNotFoundException {
- List<String> missing = new ArrayList<>();
- for (String label : labels) {
- if (!findRoot(label).exists()) {
- missing.add(label);
- }
- }
- if (!missing.isEmpty()) {
- Assert.fail(
- "Expected roots " + Arrays.asList(labels) + ", but missing " + missing);
- }
- }
-
- public void assertRootsAbsent(String... labels) throws UiObjectNotFoundException {
- List<String> unexpected = new ArrayList<>();
- for (String label : labels) {
- if (findRoot(label).exists()) {
- unexpected.add(label);
- }
- }
- if (!unexpected.isEmpty()) {
- Assert.fail("Unexpected roots " + unexpected);
- }
- }
-
- public void assertHasFocus() {
- assertHasFocus(ROOTS_LIST_ID);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java
deleted file mode 100644
index f33d90b..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/UiBot.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.bots;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static org.hamcrest.CoreMatchers.is;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.support.test.espresso.matcher.BoundedMatcher;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiSelector;
-import android.widget.Spinner;
-import android.widget.Toolbar;
-
-import com.android.documentsui.R;
-import com.android.documentsui.model.DocumentInfo;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
-/**
- * A test helper class that provides support for controlling DocumentsUI activities
- * programmatically, and making assertions against the state of the UI.
- * <p>
- * Support for working directly with Roots and Directory view can be found in the respective bots.
- */
-public class UiBot extends BaseBot {
-
- public static final String TARGET_PKG = "com.android.documentsui";
-
- public UiBot(UiDevice device, Context context, int timeout) {
- super(device, context, timeout);
- }
-
- public void assertWindowTitle(String expected) {
- onView(Matchers.TOOLBAR)
- .check(matches(withToolbarTitle(is(expected))));
- }
-
- public void assertBreadcrumbTitle(String expected) {
- if (!isTablet()) {
- onView(Matchers.BREADCRUMB)
- .check(matches(withBreadcrumbTitle(is(expected))));
- }
- }
-
- public void assertMenuEnabled(int id, boolean enabled) {
- UiObject2 menu = findMenuWithName(mContext.getString(id));
- assertNotNull(menu);
- assertEquals(enabled, menu.isEnabled());
- }
-
- public void assertSearchTextField(boolean isFocused, String query)
- throws UiObjectNotFoundException {
- UiObject textField = findSearchViewTextField();
- boolean searchIconVisible = isSearchIconVisible();
-
- assertFalse(searchIconVisible);
- assertTrue(textField.exists());
- assertEquals(isFocused, textField.isFocused());
- if (query != null) {
- assertEquals(query, textField.getText());
- }
- }
-
- public void assertSearchTextFiledAndIcon(
- boolean searchTextFieldExists, boolean searchIconExists) {
- assertEquals(searchTextFieldExists, findSearchViewTextField().exists());
- boolean searchIconVisible = isSearchIconVisible();
- assertEquals(searchIconExists, searchIconVisible);
- }
-
- public void assertInActionMode(boolean inActionMode) {
- UiObject actionModeBar = findActionModeBar();
- assertEquals(inActionMode, actionModeBar.exists());
- }
-
- public void openSearchView() throws UiObjectNotFoundException {
- UiObject searchView = findSearchView();
- searchView.click();
- assertTrue(searchView.exists());
- }
-
- public void setSearchQuery(String query) throws UiObjectNotFoundException {
- onView(Matchers.SEARCH_MENU).perform(typeText(query));
- }
-
- public UiObject openOverflowMenu() throws UiObjectNotFoundException {
- UiObject obj = findMenuMoreOptions();
- obj.click();
- mDevice.waitForIdle(mTimeout);
- return obj;
- }
-
- public void setDialogText(String text) throws UiObjectNotFoundException {
- findDialogEditText().setText(text);
- }
-
- public boolean isTablet() {
- return (mContext.getResources().getConfiguration().screenLayout &
- Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
- }
-
- void switchViewMode() {
- UiObject2 mode = menuGridMode();
- if (mode != null) {
- mode.click();
- } else {
- menuListMode().click();
- }
- }
-
- boolean isSearchIconVisible() {
- boolean searchIconVisible = true;
- boolean isTablet = isTablet();
- try {
- if (isTablet) {
- // Tablets use ImageView for its search icon, and has search_button as its res name
- onView(Matchers.SEARCH_BUTTON)
- .check(matches(isDisplayed()));
- } else {
- // Phones use ActionMenuItemView for its search icon, and has menu_search as its res
- // name
- onView(Matchers.MENU_SEARCH)
- .check(matches(isDisplayed()));
- }
- } catch (Exception | AssertionFailedError e) {
- searchIconVisible = false;
- }
- return searchIconVisible;
- }
-
- UiObject2 menuGridMode() {
- // Note that we're using By.desc rather than By.res, because of b/25285770
- return find(By.desc("Grid view"));
- }
-
- UiObject2 menuListMode() {
- // Note that we're using By.desc rather than By.res, because of b/25285770
- return find(By.desc("List view"));
- }
-
- public UiObject2 menuDelete() {
- return find(By.res("com.android.documentsui:id/menu_delete"));
- }
-
- public UiObject2 menuShare() {
- return find(By.res("com.android.documentsui:id/menu_share"));
- }
-
- public UiObject2 menuRename() {
- return findMenuWithName(mContext.getString(R.string.menu_rename));
- }
-
- public UiObject2 menuNewFolder() {
- return findMenuWithName(mContext.getString(R.string.menu_create_dir));
- }
-
- UiObject findSearchView() {
- return findObject("com.android.documentsui:id/menu_search");
- }
-
- UiObject findSearchViewTextField() {
- return findObject("com.android.documentsui:id/menu_search", "android:id/search_src_text");
- }
-
- UiObject findSearchViewIcon() {
- return mContext.getResources().getBoolean(R.bool.full_bar_search_view)
- ? findObject("com.android.documentsui:id/menu_search")
- : findObject("com.android.documentsui:id/menu_search", "android:id/search_button");
- }
-
- public void clickBreadcrumbItem(String label) throws UiObjectNotFoundException {
- if (isTablet()) {
- findBreadcrumb(label).click();
- } else {
- findMenuWithName(label).click();
- }
- }
-
- public void clickDropdownBreadcrumb() throws UiObjectNotFoundException {
- assertFalse(isTablet());
- onView(isAssignableFrom(Spinner.class)).perform(click());
- }
-
- public UiObject findBreadcrumb(String label) throws UiObjectNotFoundException {
- final UiSelector breadcrumbList = new UiSelector().resourceId(
- "com.android.documentsui:id/breadcrumb");
-
- // Wait for the first list item to appear
- new UiObject(breadcrumbList.childSelector(new UiSelector())).waitForExists(mTimeout);
-
- return mDevice.findObject(breadcrumbList.childSelector(new UiSelector().text(label)));
- }
-
- public void assertBreadcrumbItemsPresent(String... labels) throws UiObjectNotFoundException {
- List<String> absent = new ArrayList<>();
- for (String label : labels) {
- // For non-Tablet devices, a dropdown List menu is shown instead
- if (isTablet() ? !findBreadcrumb(label).exists() : findMenuWithName(label) == null) {
- absent.add(label);
- }
- }
- if (!absent.isEmpty()) {
- Assert.fail("Expected documents " + Arrays.asList(labels)
- + ", but missing " + absent);
- }
- }
-
- UiObject findActionModeBar() {
- return findObject("android:id/action_mode_bar");
- }
-
- public UiObject findDialogEditText() {
- return findObject("android:id/content", "android:id/text1");
- }
-
- public UiObject findDownloadRetryDialog() {
- UiSelector selector = new UiSelector().text("Couldn't download");
- UiObject title = mDevice.findObject(selector);
- title.waitForExists(mTimeout);
- return title;
- }
-
- public void clickDialogOkButton() {
- // Espresso has flaky results when keyboard shows up, so hiding it for now
- // before trying to click on any dialog button
- onView(withId(android.R.id.button1)).perform(closeSoftKeyboard(), click());
- }
-
- public void clickDialogCancelButton() throws UiObjectNotFoundException {
- // Espresso has flaky results when keyboard shows up, so hiding it for now
- // before trying to click on any dialog button
- onView(withId(android.R.id.button2)).perform(closeSoftKeyboard(), click());
- }
-
- UiObject findMenuLabelWithName(String label) {
- UiSelector selector = new UiSelector().text(label);
- return mDevice.findObject(selector);
- }
-
- UiObject2 findMenuWithName(String label) {
- List<UiObject2> menuItems = mDevice.findObjects(By.clazz("android.widget.LinearLayout"));
- Iterator<UiObject2> it = menuItems.iterator();
-
- UiObject2 menuItem = null;
- while (it.hasNext()) {
- menuItem = it.next();
- UiObject2 text = menuItem.findObject(By.text(label));
- if (text != null) {
- break;
- }
- }
- return menuItem;
- }
-
- UiObject findMenuMoreOptions() {
- UiSelector selector = new UiSelector().className("android.widget.ImageButton")
- .descriptionContains("More options");
- // TODO: use the system string ? android.R.string.action_menu_overflow_description
- return mDevice.findObject(selector);
- }
-
- public void pressKey(int keyCode) {
- mDevice.pressKeyCode(keyCode);
- }
-
- public void pressKey(int keyCode, int metaState) {
- mDevice.pressKeyCode(keyCode, metaState);
- }
-
- private static Matcher<Object> withToolbarTitle(
- final Matcher<CharSequence> textMatcher) {
- return new BoundedMatcher<Object, Toolbar>(Toolbar.class) {
- @Override
- public boolean matchesSafely(Toolbar toolbar) {
- return textMatcher.matches(toolbar.getTitle());
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("with toolbar title: ");
- textMatcher.describeTo(description);
- }
- };
- }
-
- private static Matcher<Object> withBreadcrumbTitle(
- final Matcher<CharSequence> textMatcher) {
- return new BoundedMatcher<Object, Spinner>(Spinner.class) {
- @Override
- public boolean matchesSafely(Spinner breadcrumb) {
- DocumentInfo selectedDoc = (DocumentInfo) breadcrumb.getSelectedItem();
- return textMatcher.matches(selectedDoc.displayName);
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("with breadcrumb title: ");
- textMatcher.describeTo(description);
- }
- };
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/BandController_GridModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/BandController_GridModelTest.java
deleted file mode 100644
index 59547ad..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/BandController_GridModelTest.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import static com.android.documentsui.dirlist.BandController.GridModel.NOT_SET;
-
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView.OnScrollListener;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.documentsui.dirlist.BandController.GridModel;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-@SmallTest
-public class BandController_GridModelTest extends AndroidTestCase {
-
- private static final int VIEW_PADDING_PX = 5;
- private static final int CHILD_VIEW_EDGE_PX = 100;
- private static final int VIEWPORT_HEIGHT = 500;
-
- private GridModel model;
- private TestEnvironment env;
- private TestDocumentsAdapter adapter;
- private Set<String> lastSelection;
- private int viewWidth;
-
- // TLDR: Don't call model.{start|resize}Selection; use the local #startSelection and
- // #resizeSelection methods instead.
- //
- // The reason for this is that selection is stateful and involves operations that take the
- // current UI state (e.g scrolling) into account. This test maintains its own copy of the
- // selection bounds as control data for verifying selections. Keep this data in sync by calling
- // #startSelection and
- // #resizeSelection.
- private Point mSelectionOrigin;
- private Point mSelectionPoint;
-
- private void initData(final int numChildren, int numColumns) {
- env = new TestEnvironment(numChildren, numColumns);
- adapter = new TestDocumentsAdapter(new ArrayList<String>()) {
- @Override
- public String getModelId(int position) {
- return Integer.toString(position);
- }
-
- @Override
- public int getItemCount() {
- return numChildren;
- }
- };
-
- viewWidth = VIEW_PADDING_PX + numColumns * (VIEW_PADDING_PX + CHILD_VIEW_EDGE_PX);
- model = new GridModel(env, adapter);
- model.addOnSelectionChangedListener(
- new GridModel.OnSelectionChangedListener() {
- @Override
- public void onSelectionChanged(Set<String> updatedSelection) {
- lastSelection = updatedSelection;
- }
-
- @Override
- public boolean onBeforeItemStateChange(String id, boolean nextState) {
- return true;
- }
- });
- }
-
- @Override
- public void tearDown() {
- model = null;
- env = null;
- lastSelection = null;
- }
-
- public void testSelectionLeftOfItems() {
- initData(20, 5);
- startSelection(new Point(0, 10));
- resizeSelection(new Point(1, 11));
- assertNoSelection();
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testSelectionRightOfItems() {
- initData(20, 4);
- startSelection(new Point(viewWidth - 1, 10));
- resizeSelection(new Point(viewWidth - 2, 11));
- assertNoSelection();
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testSelectionAboveItems() {
- initData(20, 4);
- startSelection(new Point(10, 0));
- resizeSelection(new Point(11, 1));
- assertNoSelection();
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testSelectionBelowItems() {
- initData(5, 4);
- startSelection(new Point(10, VIEWPORT_HEIGHT - 1));
- resizeSelection(new Point(11, VIEWPORT_HEIGHT - 2));
- assertNoSelection();
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testVerticalSelectionBetweenItems() {
- initData(20, 4);
- startSelection(new Point(106, 0));
- resizeSelection(new Point(107, 200));
- assertNoSelection();
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testHorizontalSelectionBetweenItems() {
- initData(20, 4);
- startSelection(new Point(0, 105));
- resizeSelection(new Point(200, 106));
- assertNoSelection();
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testGrowingAndShrinkingSelection() {
- initData(20, 4);
- startSelection(new Point(0, 0));
-
- resizeSelection(new Point(5, 5));
- verifySelection();
-
- resizeSelection(new Point(109, 109));
- verifySelection();
-
- resizeSelection(new Point(110, 109));
- verifySelection();
-
- resizeSelection(new Point(110, 110));
- verifySelection();
-
- resizeSelection(new Point(214, 214));
- verifySelection();
-
- resizeSelection(new Point(215, 214));
- verifySelection();
-
- resizeSelection(new Point(214, 214));
- verifySelection();
-
- resizeSelection(new Point(110, 110));
- verifySelection();
-
- resizeSelection(new Point(110, 109));
- verifySelection();
-
- resizeSelection(new Point(109, 109));
- verifySelection();
-
- resizeSelection(new Point(5, 5));
- verifySelection();
-
- resizeSelection(new Point(0, 0));
- verifySelection();
-
- assertEquals(NOT_SET, model.getPositionNearestOrigin());
- }
-
- public void testSelectionMovingAroundOrigin() {
- initData(16, 4);
-
- startSelection(new Point(210, 210));
- resizeSelection(new Point(viewWidth - 1, 0));
- verifySelection();
-
- resizeSelection(new Point(0, 0));
- verifySelection();
-
- resizeSelection(new Point(0, 420));
- verifySelection();
-
- resizeSelection(new Point(viewWidth - 1, 420));
- verifySelection();
-
- // This is manually figured and will need to be adjusted if the separator position is
- // changed.
- assertEquals(7, model.getPositionNearestOrigin());
- }
-
- public void testScrollingBandSelect() {
- initData(40, 4);
-
- startSelection(new Point(0, 0));
- resizeSelection(new Point(100, VIEWPORT_HEIGHT - 1));
- verifySelection();
-
- scroll(CHILD_VIEW_EDGE_PX);
- verifySelection();
-
- resizeSelection(new Point(200, VIEWPORT_HEIGHT - 1));
- verifySelection();
-
- scroll(CHILD_VIEW_EDGE_PX);
- verifySelection();
-
- scroll(-2 * CHILD_VIEW_EDGE_PX);
- verifySelection();
-
- resizeSelection(new Point(100, VIEWPORT_HEIGHT - 1));
- verifySelection();
-
- assertEquals(0, model.getPositionNearestOrigin());
- }
-
- /** Returns the current selection area as a Rect. */
- private Rect getSelectionArea() {
- // Construct a rect from the two selection points.
- Rect selectionArea = new Rect(
- mSelectionOrigin.x, mSelectionOrigin.y, mSelectionOrigin.x, mSelectionOrigin.y);
- selectionArea.union(mSelectionPoint.x, mSelectionPoint.y);
- // Rect intersection tests are exclusive of bounds, while the MSM's selection code is
- // inclusive. Expand the rect by 1 pixel in all directions to account for this.
- selectionArea.inset(-1, -1);
-
- return selectionArea;
- }
-
- /** Asserts that the selection is currently empty. */
- private void assertNoSelection() {
- assertEquals("Unexpected items " + lastSelection + " in selection " + getSelectionArea(),
- 0, lastSelection.size());
- }
-
- /** Verifies the selection using actual bbox checks. */
- private void verifySelection() {
- Rect selectionArea = getSelectionArea();
- for (TestEnvironment.Item item: env.items) {
- if (Rect.intersects(selectionArea, item.rect)) {
- assertTrue("Expected item " + item + " was not in selection " + selectionArea,
- lastSelection.contains(item.name));
- } else {
- assertFalse("Unexpected item " + item + " in selection" + selectionArea,
- lastSelection.contains(item.name));
- }
- }
- }
-
- private void startSelection(Point p) {
- model.startSelection(p);
- mSelectionOrigin = env.createAbsolutePoint(p);
- }
-
- private void resizeSelection(Point p) {
- model.resizeSelection(p);
- mSelectionPoint = env.createAbsolutePoint(p);
- }
-
- private void scroll(int dy) {
- assertTrue(env.verticalOffset + VIEWPORT_HEIGHT + dy <= env.getTotalHeight());
- env.verticalOffset += dy;
- // Correct the cached selection point as well.
- mSelectionPoint.y += dy;
- model.onScrolled(null, 0, dy);
- }
-
- private static final class TestEnvironment implements BandController.SelectionEnvironment {
-
- private final int mNumColumns;
- private final int mNumRows;
- private final int mNumChildren;
- private final int mSeparatorPosition;
-
- public int horizontalOffset = 0;
- public int verticalOffset = 0;
- private List<Item> items = new ArrayList<>();
-
- public TestEnvironment(int numChildren, int numColumns) {
- mNumChildren = numChildren;
- mNumColumns = numColumns;
- mSeparatorPosition = mNumColumns + 1;
- mNumRows = setupGrid();
- }
-
- private int setupGrid() {
- // Split the input set into folders and documents. Do this such that there is a
- // partially-populated row in the middle of the grid, to test corner cases in layout
- // code.
- int y = VIEW_PADDING_PX;
- int i = 0;
- int numRows = 0;
- while (i < mNumChildren) {
- int top = y;
- int height = CHILD_VIEW_EDGE_PX;
- int width = CHILD_VIEW_EDGE_PX;
- for (int j = 0; j < mNumColumns && i < mNumChildren; j++) {
- int left = VIEW_PADDING_PX + (j * (width + VIEW_PADDING_PX));
- items.add(new Item(
- Integer.toString(i),
- new Rect(
- left,
- top,
- left + width - 1,
- top + height - 1)));
-
- // Create a partially populated row at the separator position.
- if (++i == mSeparatorPosition) {
- break;
- }
- }
- y += height + VIEW_PADDING_PX;
- numRows++;
- }
-
- return numRows;
- }
-
- private int getTotalHeight() {
- return CHILD_VIEW_EDGE_PX * mNumRows + VIEW_PADDING_PX * (mNumRows + 1);
- }
-
- private int getFirstVisibleRowIndex() {
- return verticalOffset / (CHILD_VIEW_EDGE_PX + VIEW_PADDING_PX);
- }
-
- private int getLastVisibleRowIndex() {
- int lastVisibleRowUncapped =
- (VIEWPORT_HEIGHT + verticalOffset - 1) / (CHILD_VIEW_EDGE_PX + VIEW_PADDING_PX);
- return Math.min(lastVisibleRowUncapped, mNumRows - 1);
- }
-
- private int getNumItemsInRow(int index) {
- assertTrue(index >= 0 && index < mNumRows);
- int mod = mSeparatorPosition % mNumColumns;
- if (index == (mSeparatorPosition / mNumColumns)) {
- // The row containing the separator may be incomplete
- return mod > 0 ? mod : mNumColumns;
- }
- // Account for the partial separator row in the final row tally.
- if (index == mNumRows - 1) {
- // The last row may be incomplete
- int finalRowCount = (mNumChildren - mod) % mNumColumns;
- return finalRowCount > 0 ? finalRowCount : mNumColumns;
- }
-
- return mNumColumns;
- }
-
- @Override
- public void addOnScrollListener(OnScrollListener listener) {}
-
- @Override
- public void removeOnScrollListener(OnScrollListener listener) {}
-
- @Override
- public Point createAbsolutePoint(Point relativePoint) {
- return new Point(
- relativePoint.x + horizontalOffset, relativePoint.y + verticalOffset);
- }
-
- @Override
- public int getVisibleChildCount() {
- int childCount = 0;
- for (int i = getFirstVisibleRowIndex(); i <= getLastVisibleRowIndex(); i++) {
- childCount += getNumItemsInRow(i);
- }
- return childCount;
- }
-
- @Override
- public int getAdapterPositionAt(int index) {
- // Account for partial rows by actually tallying up the items in hidden rows.
- int hiddenCount = 0;
- for (int i = 0; i < getFirstVisibleRowIndex(); i++) {
- hiddenCount += getNumItemsInRow(i);
- }
- return index + hiddenCount;
- }
-
- @Override
- public Rect getAbsoluteRectForChildViewAt(int index) {
- int adapterPosition = getAdapterPositionAt(index);
- return items.get(adapterPosition).rect;
- }
-
- @Override
- public int getChildCount() {
- return mNumChildren;
- }
-
- @Override
- public int getColumnCount() {
- return mNumColumns;
- }
-
- @Override
- public void showBand(Rect rect) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void hideBand() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void scrollBy(int dy) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getHeight() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void invalidateView() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void runAtNextFrame(Runnable r) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void removeCallback(Runnable r) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean isLayoutItem(int adapterPosition) {
- return false;
- }
-
- @Override
- public boolean hasView(int adapterPosition) {
- return true;
- }
-
- public static final class Item {
- public String name;
- public Rect rect;
-
- public Item(String n, Rect r) {
- name = n;
- rect = r;
- }
-
- public String toString() {
- return name + ": " + rect;
- }
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java
deleted file mode 100644
index 87cd42f..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Rect;
-import android.os.SystemClock;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.MotionEvent.PointerCoords;
-import android.view.MotionEvent.PointerProperties;
-
-import com.android.documentsui.R;
-import com.android.documentsui.State;
-
-@SmallTest
-public class DocumentHolderTest extends AndroidTestCase {
-
- DocumentHolder mHolder;
- TestListener mListener;
-
- public void setUp() throws Exception {
- Context context = getContext();
- LayoutInflater inflater = LayoutInflater.from(context);
- mHolder = new DocumentHolder(getContext(), inflater.inflate(R.layout.item_doc_list, null)) {
- @Override
- public void bind(Cursor cursor, String modelId, State state) {}
- };
-
- mListener = new TestListener();
- mHolder.addEventListener(mListener);
-
- mHolder.itemView.requestLayout();
- mHolder.itemView.invalidate();
- }
-
- public void testClickActivates() {
- click();
- mListener.assertSelected();
- }
-
- public void testTapActivates() {
- tap();
- mListener.assertActivated();
- }
-
- public void click() {
- mHolder.onSingleTapUp(createEvent(MotionEvent.TOOL_TYPE_MOUSE));
- }
-
- public void tap() {
- mHolder.onSingleTapUp(createEvent(MotionEvent.TOOL_TYPE_FINGER));
- }
-
- public MotionEvent createEvent(int tooltype) {
- long time = SystemClock.uptimeMillis();
-
- PointerProperties properties[] = new PointerProperties[] {
- new PointerProperties()
- };
- properties[0].toolType = tooltype;
-
- PointerCoords coords[] = new PointerCoords[] {
- new PointerCoords()
- };
-
- Rect rect = new Rect();
- mHolder.itemView.getHitRect(rect);
- coords[0].x = rect.left;
- coords[0].y = rect.top;
-
- return MotionEvent.obtain(
- time, // down time
- time, // event time
- MotionEvent.ACTION_UP, // action
- 1, // pointer count
- properties, // pointer properties
- coords, // pointer coords
- 0, // metastate
- 0, // button state
- 0, // xprecision
- 0, // yprecision
- 0, // deviceid
- 0, // edgeflags
- 0, // source
- 0 // flags
- );
- }
-
- private class TestListener implements DocumentHolder.EventListener {
- private boolean mActivated = false;
- private boolean mSelected = false;
-
- public void assertActivated() {
- assertTrue(mActivated);
- assertFalse(mSelected);
- }
-
- public void assertSelected() {
- assertTrue(mSelected);
- assertFalse(mActivated);
- }
-
- @Override
- public boolean onActivate(DocumentHolder doc) {
- mActivated = true;
- return true;
- }
-
- @Override
- public boolean onSelect(DocumentHolder doc) {
- mSelected = true;
- return true;
- }
-
- @Override
- public boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event) {
- return false;
- }
-
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java
deleted file mode 100644
index 236621f..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.ViewGroup;
-
-import com.android.documentsui.State;
-
-@SmallTest
-public class ModelBackedDocumentsAdapterTest extends AndroidTestCase {
-
- private static final String AUTHORITY = "test_authority";
- private static final String[] NAMES = new String[] {
- "4",
- "foo",
- "1",
- "bar",
- "*(Ljifl;a",
- "0",
- "baz",
- "2",
- "3",
- "%$%VD"
- };
-
- private TestModel mModel;
- private ModelBackedDocumentsAdapter mAdapter;
-
- public void setUp() {
-
- final Context testContext = TestContext.createStorageTestContext(getContext(), AUTHORITY);
- mModel = new TestModel(AUTHORITY);
- mModel.update(NAMES);
-
- DocumentsAdapter.Environment env = new TestEnvironment(testContext);
-
- mAdapter = new ModelBackedDocumentsAdapter(
- env, new IconHelper(testContext, State.MODE_GRID));
- mAdapter.onModelUpdate(mModel);
- }
-
- // Tests that the item count is correct.
- public void testItemCount() {
- assertEquals(mModel.getItemCount(), mAdapter.getItemCount());
- }
-
- private final class TestEnvironment implements DocumentsAdapter.Environment {
- private final Context testContext;
-
- private TestEnvironment(Context testContext) {
- this.testContext = testContext;
- }
-
- @Override
- public boolean isSelected(String id) {
- return false;
- }
-
- @Override
- public boolean isDocumentEnabled(String mimeType, int flags) {
- return true;
- }
-
- @Override
- public void initDocumentHolder(DocumentHolder holder) {}
-
- @Override
- public Model getModel() {
- return mModel;
- }
-
- @Override
- public State getDisplayState() {
- return null;
- }
-
- @Override
- public Context getContext() {
- return testContext;
- }
-
- @Override
- public int getColumnCount() {
- return 4;
- }
-
- @Override
- public void onBindDocumentHolder(DocumentHolder holder, Cursor cursor) {}
- }
-
- private static class DummyListener implements Model.UpdateListener {
- public void onModelUpdate(Model model) {}
- public void onModelUpdateFailed(Exception e) {}
- }
-
- private static class DummyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
- public int getItemCount() { return 0; }
- public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {}
- public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- return null;
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java
deleted file mode 100644
index b816287..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MergeCursor;
-import android.provider.DocumentsContract.Document;
-import android.test.AndroidTestCase;
-import android.test.mock.MockContentResolver;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.documentsui.DirectoryResult;
-import com.android.documentsui.RootCursorWrapper;
-import com.android.documentsui.Shared;
-import com.android.documentsui.State;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
-
-@SmallTest
-public class ModelTest extends AndroidTestCase {
-
- private static final int ITEM_COUNT = 10;
- private static final String AUTHORITY = "test_authority";
-
- private static final String[] COLUMNS = new String[]{
- RootCursorWrapper.COLUMN_AUTHORITY,
- Document.COLUMN_DOCUMENT_ID,
- Document.COLUMN_FLAGS,
- Document.COLUMN_DISPLAY_NAME,
- Document.COLUMN_SIZE,
- Document.COLUMN_LAST_MODIFIED,
- Document.COLUMN_MIME_TYPE
- };
-
- private static final String[] NAMES = new String[] {
- "4",
- "foo",
- "1",
- "bar",
- "*(Ljifl;a",
- "0",
- "baz",
- "2",
- "3",
- "%$%VD"
- };
-
- private Cursor cursor;
- private Context context;
- private Model model;
- private TestContentProvider provider;
-
- public void setUp() {
- setupTestContext();
-
- Random rand = new Random();
-
- MatrixCursor c = new MatrixCursor(COLUMNS);
- for (int i = 0; i < ITEM_COUNT; ++i) {
- MatrixCursor.RowBuilder row = c.newRow();
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
- row.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- row.add(Document.COLUMN_FLAGS, Document.FLAG_SUPPORTS_DELETE);
- // Generate random document names and sizes. This forces the model's internal sort code
- // to actually do something.
- row.add(Document.COLUMN_DISPLAY_NAME, NAMES[i]);
- row.add(Document.COLUMN_SIZE, rand.nextInt());
- }
- cursor = c;
-
- DirectoryResult r = new DirectoryResult();
- r.cursor = cursor;
-
- // Instantiate the model with a dummy view adapter and listener that (for now) do nothing.
- model = new Model();
- model.addUpdateListener(new DummyListener());
- model.update(r);
- }
-
- // Tests that the model is properly emptied out after a null update.
- public void testNullUpdate() {
- model.update(null);
-
- assertTrue(model.isEmpty());
- assertEquals(0, model.getItemCount());
- assertEquals(0, model.getModelIds().length);
- }
-
- // Tests that the item count is correct.
- public void testItemCount() {
- assertEquals(ITEM_COUNT, model.getItemCount());
- }
-
- // Tests multiple authorities with clashing document IDs.
- public void testModelIdIsUnique() {
- MatrixCursor cIn1 = new MatrixCursor(COLUMNS);
- MatrixCursor cIn2 = new MatrixCursor(COLUMNS);
-
- // Make two sets of items with the same IDs, under different authorities.
- final String AUTHORITY0 = "auth0";
- final String AUTHORITY1 = "auth1";
-
- for (int i = 0; i < ITEM_COUNT; ++i) {
- MatrixCursor.RowBuilder row0 = cIn1.newRow();
- row0.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY0);
- row0.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
-
- MatrixCursor.RowBuilder row1 = cIn2.newRow();
- row1.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY1);
- row1.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- }
-
- Cursor cIn = new MergeCursor(new Cursor[] { cIn1, cIn2 });
-
- // Update the model, then make sure it contains all the expected items.
- DirectoryResult r = new DirectoryResult();
- r.cursor = cIn;
- model.update(r);
-
- assertEquals(ITEM_COUNT * 2, model.getItemCount());
- BitSet b0 = new BitSet(ITEM_COUNT);
- BitSet b1 = new BitSet(ITEM_COUNT);
-
- for (String id: model.getModelIds()) {
- Cursor cOut = model.getItem(id);
- String authority =
- DocumentInfo.getCursorString(cOut, RootCursorWrapper.COLUMN_AUTHORITY);
- String docId = DocumentInfo.getCursorString(cOut, Document.COLUMN_DOCUMENT_ID);
-
- switch (authority) {
- case AUTHORITY0:
- b0.set(Integer.parseInt(docId));
- break;
- case AUTHORITY1:
- b1.set(Integer.parseInt(docId));
- break;
- default:
- fail("Unrecognized authority string");
- }
- }
-
- assertEquals(ITEM_COUNT, b0.cardinality());
- assertEquals(ITEM_COUNT, b1.cardinality());
- }
-
- // Tests the base case for Model.getItem.
- public void testGetItem() {
- String[] ids = model.getModelIds();
- assertEquals(ITEM_COUNT, ids.length);
- for (int i = 0; i < ITEM_COUNT; ++i) {
- Cursor c = model.getItem(ids[i]);
- assertEquals(i, c.getPosition());
- }
- }
-
- // Tests sorting by item name.
- public void testSort_names() {
- BitSet seen = new BitSet(ITEM_COUNT);
- List<String> names = new ArrayList<>();
-
- DirectoryResult r = new DirectoryResult();
- r.cursor = cursor;
- r.sortOrder = State.SORT_ORDER_DISPLAY_NAME;
- model.update(r);
-
- for (String id: model.getModelIds()) {
- Cursor c = model.getItem(id);
- seen.set(c.getPosition());
- names.add(DocumentInfo.getCursorString(c, Document.COLUMN_DISPLAY_NAME));
- }
-
- assertEquals(ITEM_COUNT, seen.cardinality());
- for (int i = 0; i < names.size()-1; ++i) {
- assertTrue(Shared.compareToIgnoreCaseNullable(names.get(i), names.get(i+1)) <= 0);
- }
- }
-
- // Tests sorting by item size.
- public void testSort_sizes() {
- DirectoryResult r = new DirectoryResult();
- r.cursor = cursor;
- r.sortOrder = State.SORT_ORDER_SIZE;
- model.update(r);
-
- BitSet seen = new BitSet(ITEM_COUNT);
- int previousSize = Integer.MAX_VALUE;
- for (String id: model.getModelIds()) {
- Cursor c = model.getItem(id);
- seen.set(c.getPosition());
- // Check sort order - descending numerical
- int size = DocumentInfo.getCursorInt(c, Document.COLUMN_SIZE);
- assertTrue(previousSize >= size);
- previousSize = size;
- }
- // Check that all items were accounted for.
- assertEquals(ITEM_COUNT, seen.cardinality());
- }
-
- // Tests that directories and files are properly bucketed when sorting by size
- public void testSort_sizesWithBucketing() {
- MatrixCursor c = new MatrixCursor(COLUMNS);
-
- for (int i = 0; i < ITEM_COUNT; ++i) {
- MatrixCursor.RowBuilder row = c.newRow();
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
- row.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- row.add(Document.COLUMN_SIZE, i);
- // Interleave directories and text files.
- String mimeType =(i % 2 == 0) ? Document.MIME_TYPE_DIR : "text/*";
- row.add(Document.COLUMN_MIME_TYPE, mimeType);
- }
-
- DirectoryResult r = new DirectoryResult();
- r.cursor = c;
- r.sortOrder = State.SORT_ORDER_SIZE;
- model.update(r);
-
- boolean seenAllDirs = false;
- int previousSize = Integer.MAX_VALUE;
- BitSet seen = new BitSet(ITEM_COUNT);
- // Iterate over items in sort order. Once we've encountered a document (i.e. not a
- // directory), all subsequent items must also be documents. That is, all directories are
- // bucketed at the front of the list, sorted by size, followed by documents, sorted by size.
- for (String id: model.getModelIds()) {
- Cursor cOut = model.getItem(id);
- seen.set(cOut.getPosition());
-
- String mimeType = DocumentInfo.getCursorString(cOut, Document.COLUMN_MIME_TYPE);
- if (seenAllDirs) {
- assertFalse(Document.MIME_TYPE_DIR.equals(mimeType));
- } else {
- if (!Document.MIME_TYPE_DIR.equals(mimeType)) {
- seenAllDirs = true;
- // Reset the previous size seen, because documents are bucketed separately by
- // the sort.
- previousSize = Integer.MAX_VALUE;
- }
- }
- // Check sort order - descending numerical
- int size = DocumentInfo.getCursorInt(c, Document.COLUMN_SIZE);
- assertTrue(previousSize >= size);
- previousSize = size;
- }
-
- // Check that all items were accounted for.
- assertEquals(ITEM_COUNT, seen.cardinality());
- }
-
- public void testSort_time() {
- final int DL_COUNT = 3;
- MatrixCursor c = new MatrixCursor(COLUMNS);
- Set<String> currentDownloads = new HashSet<>();
-
- // Add some files
- for (int i = 0; i < ITEM_COUNT; i++) {
- MatrixCursor.RowBuilder row = c.newRow();
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
- row.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- row.add(Document.COLUMN_LAST_MODIFIED, System.currentTimeMillis());
- }
- // Add some current downloads (no timestamp)
- for (int i = ITEM_COUNT; i < ITEM_COUNT + DL_COUNT; i++) {
- MatrixCursor.RowBuilder row = c.newRow();
- String id = Integer.toString(i);
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
- row.add(Document.COLUMN_DOCUMENT_ID, id);
- currentDownloads.add(id);
- }
-
- DirectoryResult r = new DirectoryResult();
- r.cursor = c;
- r.sortOrder = State.SORT_ORDER_LAST_MODIFIED;
- model.update(r);
-
- String[] ids = model.getModelIds();
-
- // Check that all items were accounted for
- assertEquals(ITEM_COUNT + DL_COUNT, ids.length);
-
- // Check that active downloads are sorted to the top.
- for (int i = 0; i < DL_COUNT; i++) {
- assertTrue(currentDownloads.contains(ids[i]));
- }
- }
-
- private void setupTestContext() {
- final MockContentResolver resolver = new MockContentResolver();
- context = new ContextWrapper(getContext()) {
- @Override
- public ContentResolver getContentResolver() {
- return resolver;
- }
- };
- provider = new TestContentProvider();
- resolver.addProvider(AUTHORITY, provider);
- }
-
- private Selection positionToSelection(int... positions) {
- String[] ids = model.getModelIds();
- Selection s = new Selection();
- // Construct a selection of the given positions.
- for (int p: positions) {
- s.add(ids[p]);
- }
- return s;
- }
-
- private static class DummyListener implements Model.UpdateListener {
- public void onModelUpdate(Model model) {}
- public void onModelUpdateFailed(Exception e) {}
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java
deleted file mode 100644
index 9401da8..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.support.v7.widget.RecyclerView;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.SparseBooleanArray;
-
-import com.android.documentsui.TestInputEvent;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-
-import com.google.common.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@SmallTest
-public class MultiSelectManagerTest extends AndroidTestCase {
-
- private static final List<String> items;
- static {
- items = new ArrayList<String>();
- for (int i = 0; i < 100; ++i) {
- items.add(Integer.toString(i));
- }
- }
-
- private MultiSelectManager mManager;
- private TestCallback mCallback;
- private TestDocumentsAdapter mAdapter;
-
- public void setUp() throws Exception {
- mCallback = new TestCallback();
- mAdapter = new TestDocumentsAdapter(items);
- mManager = new MultiSelectManager(mAdapter, MultiSelectManager.MODE_MULTIPLE, null);
- mManager.addCallback(mCallback);
- }
-
- public void testSelection() {
- // Check selection.
- mManager.toggleSelection(items.get(7));
- assertSelection(items.get(7));
- // Check deselection.
- mManager.toggleSelection(items.get(7));
- assertSelectionSize(0);
- }
-
- public void testSelection_NotifiesSelectionChanged() {
- // Selection should notify.
- mManager.toggleSelection(items.get(7));
- mCallback.assertSelectionChanged();
- // Deselection should notify.
- mManager.toggleSelection(items.get(7));
- mCallback.assertSelectionChanged();
- }
-
- public void testMouseClick_ShiftClickExtendsSelection() {
- longPress(7);
- shiftClick(11);
- assertRangeSelection(7, 11);
- }
-
- public void testMouseClick_NoPosition_ClearsSelection() {
- longPress(7);
- click(11);
- click(RecyclerView.NO_POSITION);
- assertSelection();
- }
-
- public void testSetSelectionFocusBegin() {
- mManager.setItemsSelected(Lists.newArrayList(items.get(7)), true);
- mManager.setSelectionRangeBegin(7);
- shiftClick(11);
- assertRangeSelection(7, 11);
- }
-
- public void testLongPress_StartsSelectionMode() {
- longPress(7);
- assertSelection(items.get(7));
- }
-
- public void testLongPress_SecondPressExtendsSelection() {
- longPress(7);
- longPress(99);
- assertSelection(items.get(7), items.get(99));
- }
-
- public void testSingleTapUp_UnselectsSelectedItem() {
- longPress(7);
- tap(7);
- assertSelection();
- }
-
- public void testSingleTapUp_NoPosition_ClearsSelection() {
- longPress(7);
- tap(11);
- tap(RecyclerView.NO_POSITION);
- assertSelection();
- }
-
- public void testSingleTapUp_ExtendsSelection() {
- longPress(99);
- tap(7);
- tap(13);
- assertSelection(items.get(7), items.get(99), items.get(13));
- }
-
- public void testSingleTapUp_ShiftCreatesRangeSelection() {
- longPress(7);
- shiftTap(17);
- assertRangeSelection(7, 17);
- }
-
- public void testSingleTapUp_ShiftCreatesRangeSeletion_Backwards() {
- longPress(17);
- shiftTap(7);
- assertRangeSelection(7, 17);
- }
-
- public void testSingleTapUp_SecondShiftClickExtendsSelection() {
- longPress(7);
- shiftTap(11);
- shiftTap(17);
- assertRangeSelection(7, 17);
- }
-
- public void testSingleTapUp_MultipleContiguousRangesSelected() {
- longPress(7);
- shiftTap(11);
- tap(20);
- shiftTap(25);
- assertRangeSelected(7, 11);
- assertRangeSelected(20, 25);
- assertSelectionSize(11);
- }
-
- public void testSingleTapUp_ShiftReducesSelectionRange_FromPreviousShiftClick() {
- longPress(7);
- shiftTap(17);
- shiftTap(10);
- assertRangeSelection(7, 10);
- }
-
- public void testSingleTapUp_ShiftReducesSelectionRange_FromPreviousShiftClick_Backwards() {
- mManager.onLongPress(TestInputEvent.tap(17));
- shiftTap(7);
- shiftTap(14);
- assertRangeSelection(14, 17);
- }
-
- public void testSingleTapUp_ShiftReversesSelectionDirection() {
- longPress(7);
- shiftTap(17);
- shiftTap(0);
- assertRangeSelection(0, 7);
- }
-
- public void testSingleSelectMode() {
- mManager = new MultiSelectManager(mAdapter, MultiSelectManager.MODE_SINGLE, null);
- mManager.addCallback(mCallback);
- longPress(20);
- tap(13);
- assertSelection(items.get(13));
- }
-
- public void testSingleSelectMode_ShiftTap() {
- mManager = new MultiSelectManager(mAdapter, MultiSelectManager.MODE_SINGLE, null);
- mManager.addCallback(mCallback);
- longPress(13);
- shiftTap(20);
- assertSelection(items.get(20));
- }
-
- public void testRangeSelection() {
- mManager.startRangeSelection(15);
- mManager.snapRangeSelection(19);
- assertRangeSelection(15, 19);
- }
-
- public void testRangeSelection_snapExpand() {
- mManager.startRangeSelection(15);
- mManager.snapRangeSelection(19);
- mManager.snapRangeSelection(27);
- assertRangeSelection(15, 27);
- }
-
- public void testRangeSelection_snapContract() {
- mManager.startRangeSelection(15);
- mManager.snapRangeSelection(27);
- mManager.snapRangeSelection(19);
- assertRangeSelection(15, 19);
- }
-
- public void testRangeSelection_snapInvert() {
- mManager.startRangeSelection(15);
- mManager.snapRangeSelection(27);
- mManager.snapRangeSelection(3);
- assertRangeSelection(3, 15);
- }
-
- public void testRangeSelection_multiple() {
- mManager.startRangeSelection(15);
- mManager.snapRangeSelection(27);
- mManager.endRangeSelection();
- mManager.startRangeSelection(42);
- mManager.snapRangeSelection(57);
- assertSelectionSize(29);
- assertRangeSelected(15, 27);
- assertRangeSelected(42, 57);
-
- }
-
- public void testRangeSelection_singleSelect() {
- mManager = new MultiSelectManager(mAdapter, MultiSelectManager.MODE_SINGLE, null);
- mManager.addCallback(mCallback);
- mManager.startRangeSelection(11);
- mManager.snapRangeSelection(19);
- assertSelectionSize(1);
- assertSelection(items.get(19));
- }
-
- public void testProvisionalSelection() {
- Selection s = mManager.getSelection();
- assertSelection();
-
- SparseBooleanArray provisional = new SparseBooleanArray();
- provisional.append(1, true);
- provisional.append(2, true);
- s.setProvisionalSelection(getItemIds(provisional));
- assertSelection(items.get(1), items.get(2));
- }
-
- public void testProvisionalSelection_Replace() {
- Selection s = mManager.getSelection();
-
- SparseBooleanArray provisional = new SparseBooleanArray();
- provisional.append(1, true);
- provisional.append(2, true);
- s.setProvisionalSelection(getItemIds(provisional));
-
- provisional.clear();
- provisional.append(3, true);
- provisional.append(4, true);
- s.setProvisionalSelection(getItemIds(provisional));
- assertSelection(items.get(3), items.get(4));
- }
-
- public void testProvisionalSelection_IntersectsExistingProvisionalSelection() {
- Selection s = mManager.getSelection();
-
- SparseBooleanArray provisional = new SparseBooleanArray();
- provisional.append(1, true);
- provisional.append(2, true);
- s.setProvisionalSelection(getItemIds(provisional));
-
- provisional.clear();
- provisional.append(1, true);
- s.setProvisionalSelection(getItemIds(provisional));
- assertSelection(items.get(1));
- }
-
- public void testProvisionalSelection_Apply() {
- Selection s = mManager.getSelection();
-
- SparseBooleanArray provisional = new SparseBooleanArray();
- provisional.append(1, true);
- provisional.append(2, true);
- s.setProvisionalSelection(getItemIds(provisional));
- s.applyProvisionalSelection();
- assertSelection(items.get(1), items.get(2));
- }
-
- public void testProvisionalSelection_Cancel() {
- mManager.toggleSelection(items.get(1));
- mManager.toggleSelection(items.get(2));
- Selection s = mManager.getSelection();
-
- SparseBooleanArray provisional = new SparseBooleanArray();
- provisional.append(3, true);
- provisional.append(4, true);
- s.setProvisionalSelection(getItemIds(provisional));
- s.cancelProvisionalSelection();
-
- // Original selection should remain.
- assertSelection(items.get(1), items.get(2));
- }
-
- public void testProvisionalSelection_IntersectsAppliedSelection() {
- mManager.toggleSelection(items.get(1));
- mManager.toggleSelection(items.get(2));
- Selection s = mManager.getSelection();
-
- SparseBooleanArray provisional = new SparseBooleanArray();
- provisional.append(2, true);
- provisional.append(3, true);
- s.setProvisionalSelection(getItemIds(provisional));
- assertSelection(items.get(1), items.get(2), items.get(3));
- }
-
- private static Set<String> getItemIds(SparseBooleanArray selection) {
- Set<String> ids = new HashSet<>();
-
- int count = selection.size();
- for (int i = 0; i < count; ++i) {
- ids.add(items.get(selection.keyAt(i)));
- }
-
- return ids;
- }
-
- private void longPress(int position) {
- mManager.onLongPress(TestInputEvent.tap(position));
- }
-
- private void tap(int position) {
- mManager.onSingleTapUp(TestInputEvent.tap(position));
- }
-
- private void shiftTap(int position) {
- mManager.onSingleTapUp(TestInputEvent.shiftTap(position));
- }
-
- private void click(int position) {
- mManager.onSingleTapUp(TestInputEvent.click(position));
- }
-
- private void shiftClick(int position) {
- mManager.onSingleTapUp(TestInputEvent.shiftClick(position));
- }
-
- private void assertSelected(String... expected) {
- for (int i = 0; i < expected.length; i++) {
- Selection selection = mManager.getSelection();
- String err = String.format(
- "Selection %s does not contain %s", selection, expected[i]);
- assertTrue(err, selection.contains(expected[i]));
- }
- }
-
- private void assertSelection(String... expected) {
- assertSelectionSize(expected.length);
- assertSelected(expected);
- }
-
- private void assertRangeSelected(int begin, int end) {
- for (int i = begin; i <= end; i++) {
- assertSelected(items.get(i));
- }
- }
-
- private void assertRangeSelection(int begin, int end) {
- assertSelectionSize(end - begin + 1);
- assertRangeSelected(begin, end);
- }
-
- private void assertSelectionSize(int expected) {
- Selection selection = mManager.getSelection();
- assertEquals(selection.toString(), expected, selection.size());
- }
-
- private static final class TestCallback implements MultiSelectManager.Callback {
-
- Set<String> ignored = new HashSet<>();
- private boolean mSelectionChanged = false;
-
- @Override
- public void onItemStateChanged(String modelId, boolean selected) {}
-
- @Override
- public boolean onBeforeItemStateChange(String modelId, boolean selected) {
- return !ignored.contains(modelId);
- }
-
- @Override
- public void onSelectionChanged() {
- mSelectionChanged = true;
- }
-
- void assertSelectionChanged() {
- assertTrue(mSelectionChanged);
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
deleted file mode 100644
index 444b2dc..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.google.common.collect.Sets;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@SmallTest
-public class MultiSelectManager_SelectionTest extends AndroidTestCase {
-
- private Selection selection;
-
- private String[] ids = new String[]{
- "foo",
- "43",
- "auth|id=@53di*/f3#d"
- };
-
- @Override
- public void setUp() throws Exception {
- selection = new Selection();
- selection.add(ids[0]);
- selection.add(ids[1]);
- selection.add(ids[2]);
- }
-
- public void testAdd() {
- // We added in setUp.
- assertEquals(3, selection.size());
- assertContains(ids[0]);
- assertContains(ids[1]);
- assertContains(ids[2]);
- }
-
- public void testRemove() {
- selection.remove(ids[0]);
- selection.remove(ids[2]);
- assertEquals(1, selection.size());
- assertContains(ids[1]);
- }
-
- public void testClear() {
- selection.clear();
- assertEquals(0, selection.size());
- }
-
- public void testIsEmpty() {
- assertTrue(new Selection().isEmpty());
- selection.clear();
- assertTrue(selection.isEmpty());
- }
-
- public void testSize() {
- Selection other = new Selection();
- for (int i = 0; i < selection.size(); i++) {
- other.add(ids[i]);
- }
- assertEquals(selection.size(), other.size());
- }
-
- public void testEqualsSelf() {
- assertEquals(selection, selection);
- }
-
- public void testEqualsOther() {
- Selection other = new Selection();
- other.add(ids[0]);
- other.add(ids[1]);
- other.add(ids[2]);
- assertEquals(selection, other);
- assertEquals(selection.hashCode(), other.hashCode());
- }
-
- public void testEqualsCopy() {
- Selection other = new Selection();
- other.copyFrom(selection);
- assertEquals(selection, other);
- assertEquals(selection.hashCode(), other.hashCode());
- }
-
- public void testNotEquals() {
- Selection other = new Selection();
- other.add("foobar");
- assertFalse(selection.equals(other));
- }
-
- public void testIntersection_empty0() {
- Selection testSelection = new Selection();
- testSelection.intersect(new HashSet<String>());
- assertTrue(testSelection.isEmpty());
- }
-
- public void testIntersection_empty1() {
- Selection testSelection = new Selection();
- testSelection.intersect(Sets.newHashSet("foo"));
- assertTrue(testSelection.isEmpty());
- }
-
- public void testIntersection_empty2() {
- assertFalse(selection.isEmpty());
- selection.intersect(new HashSet<String>());
- assertTrue(selection.isEmpty());
- }
-
- public void testIntersection_exclusive() {
- String[] ids0 = new String[]{"foo", "bar", "baz"};
- String[] ids1 = new String[]{"0", "1", "2"};
-
- Selection testSelection = new Selection();
- testSelection.add(ids0[0]);
- testSelection.add(ids0[1]);
- testSelection.add(ids0[2]);
-
- Set<String> set = Sets.newHashSet(ids1);
- testSelection.intersect(set);
-
- assertTrue(testSelection.isEmpty());
- }
-
- public void testIntersection_subset() {
- String[] ids0 = new String[]{"foo", "bar", "baz"};
- String[] ids1 = new String[]{"0", "baz", "1", "foo", "2"};
-
- Selection testSelection = new Selection();
- testSelection.add(ids0[0]);
- testSelection.add(ids0[1]);
- testSelection.add(ids0[2]);
-
- testSelection.intersect(Sets.newHashSet(ids1));
-
- assertTrue(testSelection.contains("foo"));
- assertFalse(testSelection.contains("bar"));
- assertTrue(testSelection.contains("baz"));
- }
-
- public void testIntersection_all() {
- String[] ids0 = new String[]{"foo", "bar", "baz"};
- String[] ids1 = new String[]{"0", "baz", "1", "foo", "2", "bar"};
-
- Selection testSelection = new Selection();
- testSelection.add(ids0[0]);
- testSelection.add(ids0[1]);
- testSelection.add(ids0[2]);
-
- Selection control = new Selection();
- control.copyFrom(testSelection);
-
- testSelection.intersect(Sets.newHashSet(ids1));
-
- assertTrue(testSelection.equals(control));
- }
-
- private void assertContains(String id) {
- String err = String.format("Selection %s does not contain %s", selection, id);
- assertTrue(err, selection.contains(id));
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java
deleted file mode 100644
index 7c324e7..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.provider.DocumentsContract.Document;
-import android.support.v7.widget.RecyclerView;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.ViewGroup;
-
-import com.android.documentsui.DirectoryResult;
-import com.android.documentsui.RootCursorWrapper;
-import com.android.documentsui.State;
-
-@SmallTest
-public class SectionBreakDocumentsAdapterWrapperTest extends AndroidTestCase {
-
- private static final String AUTHORITY = "test_authority";
- private static final String[] NAMES = new String[] {
- "4",
- "foo",
- "1",
- "bar",
- "*(Ljifl;a",
- "0",
- "baz",
- "2",
- "3",
- "%$%VD"
- };
-
- private TestModel mModel;
- private SectionBreakDocumentsAdapterWrapper mAdapter;
-
- public void setUp() {
-
- final Context testContext = TestContext.createStorageTestContext(getContext(), AUTHORITY);
- DocumentsAdapter.Environment env = new TestEnvironment(testContext);
-
- mModel = new TestModel(AUTHORITY);
- mAdapter = new SectionBreakDocumentsAdapterWrapper(
- env,
- new ModelBackedDocumentsAdapter(
- env, new IconHelper(testContext, State.MODE_GRID)));
-
- mModel.addUpdateListener(mAdapter);
- }
-
- // Tests that the item count is correct for a directory containing only subdirs.
- public void testItemCount_allDirs() {
- MatrixCursor c = new MatrixCursor(TestModel.COLUMNS);
-
- for (int i = 0; i < 5; ++i) {
- MatrixCursor.RowBuilder row = c.newRow();
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
- row.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- row.add(Document.COLUMN_SIZE, i);
- row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR);
- }
- DirectoryResult r = new DirectoryResult();
- r.cursor = c;
- r.sortOrder = State.SORT_ORDER_SIZE;
- mModel.update(r);
-
- assertEquals(mModel.getItemCount(), mAdapter.getItemCount());
- }
-
- // Tests that the item count is correct for a directory containing only files.
- public void testItemCount_allFiles() {
- mModel.update(NAMES);
- assertEquals(mModel.getItemCount(), mAdapter.getItemCount());
- }
-
- // Tests that the item count is correct for a directory containing files and subdirs.
- public void testItemCount_mixed() {
- MatrixCursor c = new MatrixCursor(TestModel.COLUMNS);
-
- for (int i = 0; i < 5; ++i) {
- MatrixCursor.RowBuilder row = c.newRow();
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
- row.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- row.add(Document.COLUMN_SIZE, i);
- String mimeType =(i < 2) ? Document.MIME_TYPE_DIR : "text/*";
- row.add(Document.COLUMN_MIME_TYPE, mimeType);
- }
- DirectoryResult r = new DirectoryResult();
- r.cursor = c;
- r.sortOrder = State.SORT_ORDER_SIZE;
- mModel.update(r);
-
- assertEquals(mModel.getItemCount() + 1, mAdapter.getItemCount());
- }
-
- private final class TestEnvironment implements DocumentsAdapter.Environment {
- private final Context testContext;
-
- private TestEnvironment(Context testContext) {
- this.testContext = testContext;
- }
-
- @Override
- public boolean isSelected(String id) {
- return false;
- }
-
- @Override
- public boolean isDocumentEnabled(String mimeType, int flags) {
- return true;
- }
-
- @Override
- public void initDocumentHolder(DocumentHolder holder) {}
-
- @Override
- public Model getModel() {
- return mModel;
- }
-
- @Override
- public State getDisplayState() {
- return null;
- }
-
- @Override
- public Context getContext() {
- return testContext;
- }
-
- @Override
- public int getColumnCount() {
- return 4;
- }
-
- @Override
- public void onBindDocumentHolder(DocumentHolder holder, Cursor cursor) {}
- }
-
- private static class DummyListener implements Model.UpdateListener {
- public void onModelUpdate(Model model) {}
- public void onModelUpdateFailed(Exception e) {}
- }
-
- private static class DummyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
- public int getItemCount() { return 0; }
- public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {}
- public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- return null;
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestContentProvider.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestContentProvider.java
deleted file mode 100644
index c8d424f..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestContentProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.test.mock.MockContentProvider;
-
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple test double for ContentProvider. Useful in this package only.
- */
-class TestContentProvider extends MockContentProvider {
- List<Uri> mDeleted = new ArrayList<>();
-
- @Override
- public Bundle call(String method, String arg, Bundle extras) {
- // Intercept and log delete method calls.
- if (DocumentsContract.METHOD_DELETE_DOCUMENT.equals(method)) {
- final Uri documentUri = extras.getParcelable(DocumentsContract.EXTRA_URI);
- mDeleted.add(documentUri);
- return new Bundle();
- } else {
- return super.call(method, arg, extras);
- }
- }
-
- public void assertWasDeleted(DocumentInfo doc) {
- ModelTest.assertTrue(mDeleted.contains(doc.derivedUri));
- }
-}
\ No newline at end of file
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestContext.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestContext.java
deleted file mode 100644
index 714062d..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestContext.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.test.mock.MockContentResolver;
-
-public final class TestContext {
-
- /**
- * Returns a Context configured with test provider for authority.
- */
- static Context createStorageTestContext(Context context, String authority) {
- final MockContentResolver testResolver = new MockContentResolver();
- TestContentProvider provider = new TestContentProvider();
- testResolver.addProvider(authority, provider);
-
- return new ContextWrapper(context) {
- @Override
- public ContentResolver getContentResolver() {
- return testResolver;
- }
- };
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestDocumentsAdapter.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestDocumentsAdapter.java
deleted file mode 100644
index 4df0fa1..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestDocumentsAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A skeletal {@link DocumentsAdapter} test double.
- */
-public class TestDocumentsAdapter extends DocumentsAdapter {
-
- List<String> mModelIds = new ArrayList<>();
-
- public TestDocumentsAdapter(List<String> modelIds) {
- mModelIds = modelIds;
- }
-
- @Override
- public void onModelUpdate(Model model) {
- }
-
- @Override
- public void onModelUpdateFailed(Exception e) {
- }
-
- @Override
- List<String> getModelIds() {
- return mModelIds;
- }
-
- @Override
- void onItemSelectionChanged(String id) {
- }
-
- @Override
- String getModelId(int position) {
- return mModelIds.get(position);
- }
-
- @Override
- public DocumentHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void onBindViewHolder(DocumentHolder holder, int position) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getItemCount() {
- return mModelIds.size();
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java
deleted file mode 100644
index 2d819ff..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.database.MatrixCursor;
-import android.provider.DocumentsContract.Document;
-
-import com.android.documentsui.DirectoryResult;
-import com.android.documentsui.RootCursorWrapper;
-
-import java.util.Random;
-
-public class TestModel extends Model {
-
- static final String[] COLUMNS = new String[]{
- RootCursorWrapper.COLUMN_AUTHORITY,
- Document.COLUMN_DOCUMENT_ID,
- Document.COLUMN_FLAGS,
- Document.COLUMN_DISPLAY_NAME,
- Document.COLUMN_SIZE,
- Document.COLUMN_MIME_TYPE
- };
-
- private final String mAuthority;
-
- public TestModel(String authority) {
- super();
- mAuthority = authority;
- }
-
- void update(String... names) {
- Random rand = new Random();
-
- MatrixCursor c = new MatrixCursor(COLUMNS);
- for (int i = 0; i < names.length; i++) {
- MatrixCursor.RowBuilder row = c.newRow();
- row.add(RootCursorWrapper.COLUMN_AUTHORITY, mAuthority);
- row.add(Document.COLUMN_DOCUMENT_ID, Integer.toString(i));
- row.add(Document.COLUMN_FLAGS, Document.FLAG_SUPPORTS_DELETE);
- // Generate random document names and sizes. This forces the model's internal sort code
- // to actually do something.
- row.add(Document.COLUMN_DISPLAY_NAME, names[i]);
- row.add(Document.COLUMN_SIZE, rand.nextInt());
- }
-
- DirectoryResult r = new DirectoryResult();
- r.cursor = c;
- update(r);
- }
-
- String idForPosition(int p) {
- return Integer.toString(p);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java
deleted file mode 100644
index b69787c..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.dirlist;
-
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView.OnScrollListener;
-
-import com.android.documentsui.dirlist.BandController.SelectionEnvironment;
-
-import java.util.List;
-
-public class TestSelectionEnvironment implements SelectionEnvironment {
-
- public TestSelectionEnvironment(List<String> items) {
- }
-
- @Override
- public void showBand(Rect rect) {
- }
-
- @Override
- public void hideBand() {
- }
-
- @Override
- public void addOnScrollListener(OnScrollListener listener) {
- }
-
- @Override
- public void removeOnScrollListener(OnScrollListener listener) {
- }
-
- @Override
- public void scrollBy(int dy) {
- }
-
- @Override
- public int getHeight() {
- return 0;
- }
-
- @Override
- public void invalidateView() {
- }
-
- @Override
- public void runAtNextFrame(Runnable r) {
- }
-
- @Override
- public void removeCallback(Runnable r) {
- }
-
- @Override
- public Point createAbsolutePoint(Point relativePoint) {
- return null;
- }
-
- @Override
- public Rect getAbsoluteRectForChildViewAt(int index) {
- return null;
- }
-
- @Override
- public int getAdapterPositionAt(int index) {
- return 0;
- }
-
- @Override
- public int getColumnCount() {
- return 0;
- }
-
- @Override
- public int getChildCount() {
- return 0;
- }
-
- @Override
- public int getVisibleChildCount() {
- return 0;
- }
-
- @Override
- public boolean isLayoutItem(int adapterPosition) {
- return false;
- }
-
- @Override
- public boolean hasView(int adapterPosition) {
- return true;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/model/DocumentInfoTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/model/DocumentInfoTest.java
deleted file mode 100644
index 2481dc3..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/model/DocumentInfoTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.model;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-@SmallTest
-public class DocumentInfoTest extends AndroidTestCase {
-
- private static final DocumentInfo TEST_DOC
- = createDocInfo("authority.a", "doc.1", "text/plain");
-
- public void testEquals() throws Exception {
- assertEquals(TEST_DOC, TEST_DOC);
- assertEquals(TEST_DOC, createDocInfo("authority.a", "doc.1", "text/plain"));
- }
-
- public void testEquals_HandlesNulls() throws Exception {
- assertFalse(TEST_DOC.equals(null));
- }
-
- public void testEquals_HandlesNullFields() throws Exception {
- assertFalse(TEST_DOC.equals(new DocumentInfo()));
- assertFalse(new DocumentInfo().equals(TEST_DOC));
- }
-
- public void testNotEquals_differentAuthority() throws Exception {
- assertFalse(TEST_DOC.equals(createDocInfo("authority.b", "doc.1", "text/plain")));
- }
-
- public void testNotEquals_differentDocId() throws Exception {
- assertFalse(TEST_DOC.equals(createDocInfo("authority.a", "doc.2", "text/plain")));
- }
-
- public void testNotEquals_differentMimetype() throws Exception {
- assertFalse(TEST_DOC.equals(createDocInfo("authority.a", "doc.1", "image/png")));
- }
-
- private static DocumentInfo createDocInfo(String authority, String docId, String mimeType) {
- DocumentInfo doc = new DocumentInfo();
- doc.authority = authority;
- doc.documentId = docId;
- doc.mimeType = mimeType;
- doc.deriveFields();
- return doc;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/AbstractCopyJobTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/AbstractCopyJobTest.java
deleted file mode 100644
index cd05939..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/AbstractCopyJobTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
-
-import static com.google.common.collect.Lists.newArrayList;
-
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.List;
-
-@MediumTest
-public abstract class AbstractCopyJobTest<T extends CopyJob> extends AbstractJobTest<T> {
-
- public void runCopyFilesTest() throws Exception {
- Uri testFile1 = mDocs.createDocument(mSrcRoot, "text/plain", "test1.txt");
- mDocs.writeDocument(testFile1, HAM_BYTES);
-
- Uri testFile2 = mDocs.createDocument(mSrcRoot, "text/plain", "test2.txt");
- mDocs.writeDocument(testFile2, FRUITY_BYTES);
-
- createJob(newArrayList(testFile1, testFile2)).run();
- mJobListener.waitForFinished();
-
- mDocs.assertChildCount(mDestRoot, 2);
- mDocs.assertHasFile(mDestRoot, "test1.txt");
- mDocs.assertHasFile(mDestRoot, "test2.txt");
- mDocs.assertFileContents(mDestRoot.documentId, "test1.txt", HAM_BYTES);
- mDocs.assertFileContents(mDestRoot.documentId, "test2.txt", FRUITY_BYTES);
- }
-
- public void runCopyVirtualTypedFileTest() throws Exception {
- Uri testFile = mDocs.createVirtualFile(
- mSrcRoot, "/virtual.sth", "virtual/mime-type",
- FRUITY_BYTES, "application/pdf", "text/html");
-
- createJob(newArrayList(testFile)).run();
-
- mJobListener.waitForFinished();
-
- mDocs.assertChildCount(mDestRoot, 1);
- mDocs.assertHasFile(mDestRoot, "virtual.sth.pdf"); // copy should convert file to PDF.
- mDocs.assertFileContents(mDestRoot.documentId, "virtual.sth.pdf", FRUITY_BYTES);
- }
-
- public void runCopyVirtualNonTypedFileTest() throws Exception {
- Uri testFile = mDocs.createVirtualFile(
- mSrcRoot, "/virtual.sth", "virtual/mime-type",
- FRUITY_BYTES);
-
- createJob(newArrayList(testFile)).run();
-
- mJobListener.waitForFinished();
- mJobListener.assertFailed();
- mJobListener.assertFilesFailed(newArrayList("virtual.sth"));
-
- mDocs.assertChildCount(mDestRoot, 0);
- }
-
- public void runCopyEmptyDirTest() throws Exception {
- Uri testDir = mDocs.createFolder(mSrcRoot, "emptyDir");
-
- createJob(newArrayList(testDir)).run();
- mJobListener.waitForFinished();
-
- mDocs.assertChildCount(mDestRoot, 1);
- mDocs.assertHasDirectory(mDestRoot, "emptyDir");
- }
-
- public void runCopyDirRecursivelyTest() throws Exception {
-
- Uri testDir1 = mDocs.createFolder(mSrcRoot, "dir1");
- mDocs.createDocument(testDir1, "text/plain", "test1.txt");
-
- Uri testDir2 = mDocs.createFolder(testDir1, "dir2");
- mDocs.createDocument(testDir2, "text/plain", "test2.txt");
-
- createJob(newArrayList(testDir1)).run();
- mJobListener.waitForFinished();
-
- DocumentInfo dir1Copy = mDocs.findDocument(mDestRoot.documentId, "dir1");
-
- mDocs.assertChildCount(dir1Copy.derivedUri, 2);
- mDocs.assertHasDirectory(dir1Copy.derivedUri, "dir2");
- mDocs.assertHasFile(dir1Copy.derivedUri, "test1.txt");
-
- DocumentInfo dir2Copy = mDocs.findDocument(dir1Copy.documentId, "dir2");
- mDocs.assertChildCount(dir2Copy.derivedUri, 1);
- mDocs.assertHasFile(dir2Copy.derivedUri, "test2.txt");
- }
-
- public void runNoCopyDirToSelfTest() throws Exception {
- Uri testDir = mDocs.createFolder(mSrcRoot, "someDir");
-
- createJob(OPERATION_COPY,
- newArrayList(testDir),
- DocumentsContract.buildDocumentUri(AUTHORITY, mSrcRoot.documentId),
- testDir).run();
-
- mJobListener.waitForFinished();
- mJobListener.assertFailed();
- mJobListener.assertFilesFailed(newArrayList("someDir"));
-
- mDocs.assertChildCount(mDestRoot, 0);
- }
-
- public void runNoCopyDirToDescendentTest() throws Exception {
- Uri testDir = mDocs.createFolder(mSrcRoot, "someDir");
- Uri destDir = mDocs.createFolder(testDir, "theDescendent");
-
- createJob(OPERATION_COPY,
- newArrayList(testDir),
- DocumentsContract.buildDocumentUri(AUTHORITY, mSrcRoot.documentId),
- destDir).run();
-
- mJobListener.waitForFinished();
- mJobListener.assertFailed();
- mJobListener.assertFilesFailed(newArrayList("someDir"));
-
- mDocs.assertChildCount(mDestRoot, 0);
- }
-
- public void runCopyFileWithReadErrorsTest() throws Exception {
- Uri testFile = mDocs.createDocument(mSrcRoot, "text/plain", "test1.txt");
- mDocs.writeDocument(testFile, HAM_BYTES);
-
- String testId = DocumentsContract.getDocumentId(testFile);
- mClient.call("simulateReadErrorsForFile", testId, null);
-
- createJob(newArrayList(testFile)).run();
-
- mJobListener.waitForFinished();
- mJobListener.assertFailed();
- mJobListener.assertFilesFailed(newArrayList("test1.txt"));
-
- mDocs.assertChildCount(mDestRoot, 0);
- }
-
- /**
- * Creates a job with a stack consisting to the default source and destination.
- * TODO: Clean up, as mDestRoot.documentInfo may not really be the parent of
- * srcs.
- */
- final T createJob(List<Uri> srcs) throws Exception {
- Uri srcParent = DocumentsContract.buildDocumentUri(AUTHORITY, mSrcRoot.documentId);
- Uri destination = DocumentsContract.buildDocumentUri(AUTHORITY, mDestRoot.documentId);
- return createJob(OPERATION_COPY, srcs, srcParent, destination);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/AbstractJobTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/AbstractJobTest.java
deleted file mode 100644
index c3cbe3f..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/AbstractJobTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.DocumentsProviderHelper;
-import com.android.documentsui.StubProvider;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.model.RootInfo;
-import com.android.documentsui.services.FileOperationService.OpType;
-import com.android.documentsui.testing.ClipDetailsFactory;
-
-import java.util.List;
-
-@MediumTest
-public abstract class AbstractJobTest<T extends Job> extends AndroidTestCase {
-
- static String AUTHORITY = StubProvider.DEFAULT_AUTHORITY;
- static final byte[] HAM_BYTES = "ham and cheese".getBytes();
- static final byte[] FRUITY_BYTES = "I love fruit cakes!".getBytes();
-
- Context mContext;
- ContentResolver mResolver;
- ContentProviderClient mClient;
- DocumentsProviderHelper mDocs;
- TestJobListener mJobListener;
- RootInfo mSrcRoot;
- RootInfo mDestRoot;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- mJobListener = new TestJobListener();
-
- // NOTE: Must be the "target" context, else security checks in content provider will fail.
- mContext = getContext();
- mResolver = mContext.getContentResolver();
-
- mClient = mResolver.acquireContentProviderClient(AUTHORITY);
- mDocs = new DocumentsProviderHelper(AUTHORITY, mClient);
-
- initTestFiles();
- }
-
- @Override
- protected void tearDown() throws Exception {
- resetStorage();
- mClient.release();
- super.tearDown();
- }
-
- private void resetStorage() throws RemoteException {
- mClient.call("clear", null, null);
- }
-
- private void initTestFiles() throws RemoteException {
- mSrcRoot = mDocs.getRoot(ROOT_0_ID);
- mDestRoot = mDocs.getRoot(ROOT_1_ID);
- }
-
- final T createJob(@OpType int opType, List<Uri> srcs, Uri srcParent, Uri destination)
- throws Exception {
- DocumentStack stack = new DocumentStack();
- stack.push(DocumentInfo.fromUri(mResolver, destination));
- stack.root = mSrcRoot;
-
- ClipDetails details = ClipDetailsFactory.createClipDetails(opType, srcParent, srcs);
- return createJob(details, stack);
- }
-
- abstract T createJob(ClipDetails details, DocumentStack destination)
- throws Exception;
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/CopyJobTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/CopyJobTest.java
deleted file mode 100644
index eac06ca..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/CopyJobTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.google.common.collect.Lists.newArrayList;
-
-import android.net.Uri;
-import android.provider.DocumentsContract.Document;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.model.DocumentStack;
-
-@MediumTest
-public class CopyJobTest extends AbstractCopyJobTest<CopyJob> {
-
- public void testCopyFiles() throws Exception {
- runCopyFilesTest();
- }
-
- public void testCopyVirtualTypedFile() throws Exception {
- runCopyVirtualTypedFileTest();
- }
-
- public void testCopyVirtualNonTypedFile() throws Exception {
- runCopyVirtualNonTypedFileTest();
- }
-
- public void testCopy_BackendSideVirtualTypedFile_Fallback() throws Exception {
- mDocs.assertChildCount(mDestRoot, 0);
-
- Uri testFile = mDocs.createDocumentWithFlags(
- mSrcRoot.documentId, "virtual/mime-type", "tokyo.sth",
- Document.FLAG_VIRTUAL_DOCUMENT | Document.FLAG_SUPPORTS_COPY
- | Document.FLAG_SUPPORTS_MOVE, "application/pdf");
-
- createJob(newArrayList(testFile)).run();
-
- mJobListener.waitForFinished();
- mDocs.assertChildCount(mDestRoot, 1);
- mDocs.assertHasFile(mDestRoot, "tokyo.sth.pdf"); // Copy should convert file to PDF.
- }
-
- public void testCopyEmptyDir() throws Exception {
- runCopyEmptyDirTest();
- }
-
- public void testCopyDirRecursively() throws Exception {
- runCopyDirRecursivelyTest();
- }
-
- public void testNoCopyDirToSelf() throws Exception {
- runNoCopyDirToSelfTest();
- }
-
- public void testNoCopyDirToDescendent() throws Exception {
- runNoCopyDirToDescendentTest();
- }
-
- public void testCopyFileWithReadErrors() throws Exception {
- runCopyFileWithReadErrorsTest();
- }
-
- @Override
- CopyJob createJob(ClipDetails details, DocumentStack stack)
- throws Exception {
- return new CopyJob(
- mContext, mContext, mJobListener, FileOperations.createJobId(), stack, details);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/DeleteJobTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/DeleteJobTest.java
deleted file mode 100644
index 050c7ea..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/DeleteJobTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE;
-
-import static com.google.common.collect.Lists.newArrayList;
-
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.model.DocumentStack;
-
-import java.util.List;
-
-@MediumTest
-public class DeleteJobTest extends AbstractJobTest<DeleteJob> {
-
- public void testDeleteFiles() throws Exception {
- Uri testFile1 = mDocs.createDocument(mSrcRoot, "text/plain", "test1.txt");
- mDocs.writeDocument(testFile1, HAM_BYTES);
-
- Uri testFile2 = mDocs.createDocument(mSrcRoot, "text/plain", "test2.txt");
- mDocs.writeDocument(testFile2, FRUITY_BYTES);
-
- createJob(newArrayList(testFile1, testFile2),
- DocumentsContract.buildDocumentUri(AUTHORITY, mSrcRoot.documentId)).run();
- mJobListener.waitForFinished();
-
- mDocs.assertChildCount(mSrcRoot, 0);
- }
-
- /**
- * Creates a job with a stack consisting to the default src directory.
- */
- private final DeleteJob createJob(List<Uri> srcs, Uri srcParent) throws Exception {
- Uri stack = DocumentsContract.buildDocumentUri(AUTHORITY, mSrcRoot.documentId);
- return createJob(OPERATION_DELETE, srcs, srcParent, stack);
- }
-
- // TODO: Remove inheritance, as stack is not used for deleting, nor srcParent.
- @Override
- DeleteJob createJob(ClipDetails details, DocumentStack stack)
- throws Exception {
- return new DeleteJob(
- mContext, mContext, mJobListener, FileOperations.createJobId(), stack, details);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/FileOperationServiceTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/FileOperationServiceTest.java
deleted file mode 100644
index e16d5ae..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/FileOperationServiceTest.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
-import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE;
-import static com.android.documentsui.services.FileOperations.createBaseIntent;
-import static com.android.documentsui.services.FileOperations.createJobId;
-
-import static com.google.android.collect.Lists.newArrayList;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.test.ServiceTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-import com.android.documentsui.services.Job.Listener;
-import com.android.documentsui.testing.ClipDetailsFactory;
-import com.android.documentsui.testing.TestHandler;
-import com.android.documentsui.testing.TestScheduledExecutorService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@MediumTest
-public class FileOperationServiceTest extends ServiceTestCase<FileOperationService> {
-
- private static final Uri SRC_PARENT =
- Uri.parse("content://com.android.documentsui.testing/parent");
- private static final DocumentInfo ALPHA_DOC = createDoc("alpha");
- private static final DocumentInfo BETA_DOC = createDoc("alpha");
- private static final DocumentInfo GAMMA_DOC = createDoc("gamma");
- private static final DocumentInfo DELTA_DOC = createDoc("delta");
-
- private FileOperationService mService;
- private TestScheduledExecutorService mExecutor;
- private TestScheduledExecutorService mDeletionExecutor;
- private TestHandler mHandler;
- private TestJobFactory mJobFactory;
-
- public FileOperationServiceTest() {
- super(FileOperationService.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- setupService(); // must be called first for our test setup to work correctly.
-
- mExecutor = new TestScheduledExecutorService();
- mDeletionExecutor = new TestScheduledExecutorService();
- mHandler = new TestHandler();
- mJobFactory = new TestJobFactory();
-
- // Install test doubles.
- mService = getService();
-
- assertNull(mService.executor);
- mService.executor = mExecutor;
-
- assertNull(mService.deletionExecutor);
- mService.deletionExecutor = mDeletionExecutor;
-
- assertNull(mService.handler);
- mService.handler = mHandler;
-
- assertNull(mService.jobFactory);
- mService.jobFactory = mJobFactory;
- }
-
- public void testRunsCopyJobs() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- startService(createCopyIntent(newArrayList(GAMMA_DOC), DELTA_DOC));
-
- mExecutor.runAll();
- mJobFactory.assertAllCopyJobsStarted();
- }
-
- public void testRunsCopyJobs_AfterExceptionInJobCreation() throws Exception {
- try {
- startService(createCopyIntent(new ArrayList<>(), BETA_DOC));
- } catch(AssertionError e) {
- // Expected AssertionError
- }
- startService(createCopyIntent(newArrayList(GAMMA_DOC), DELTA_DOC));
-
- mJobFactory.assertJobsCreated(1);
-
- mExecutor.runAll();
- mJobFactory.assertAllCopyJobsStarted();
- }
-
- public void testRunsCopyJobs_AfterFailure() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- startService(createCopyIntent(newArrayList(GAMMA_DOC), DELTA_DOC));
-
- mJobFactory.copyJobs.get(0).fail(ALPHA_DOC);
-
- mExecutor.runAll();
- mJobFactory.assertAllCopyJobsStarted();
- }
-
- public void testRunsCopyJobs_notRunsDeleteJobs() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- startService(createDeleteIntent(newArrayList(GAMMA_DOC)));
-
- mExecutor.runAll();
- mJobFactory.assertNoDeleteJobsStarted();
- }
-
- public void testRunsDeleteJobs() throws Exception {
- startService(createDeleteIntent(newArrayList(ALPHA_DOC)));
-
- mDeletionExecutor.runAll();
- mJobFactory.assertAllDeleteJobsStarted();
- }
-
- public void testRunsDeleteJobs_NotRunsCopyJobs() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- startService(createDeleteIntent(newArrayList(GAMMA_DOC)));
-
- mDeletionExecutor.runAll();
- mJobFactory.assertNoCopyJobsStarted();
- }
-
- public void testUpdatesNotification() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- mExecutor.runAll();
-
- // Assert monitoring continues until job is done
- assertTrue(mHandler.hasScheduledMessage());
- // Two notifications -- one for setup; one for progress
- assertEquals(2, mJobFactory.copyJobs.get(0).getNumOfNotifications());
- }
-
- public void testStopsUpdatingNotificationAfterFinished() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- mExecutor.runAll();
-
- mHandler.dispatchNextMessage();
- // Assert monitoring stops once job is completed.
- assertFalse(mHandler.hasScheduledMessage());
-
- // Assert no more notification is generated after finish.
- assertEquals(2, mJobFactory.copyJobs.get(0).getNumOfNotifications());
-
- }
-
- public void testHoldsWakeLockWhileWorking() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
-
- assertTrue(mService.holdsWakeLock());
- }
-
- public void testReleasesWakeLock_AfterSuccess() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
-
- assertTrue(mService.holdsWakeLock());
- mExecutor.runAll();
- assertFalse(mService.holdsWakeLock());
- }
-
- public void testReleasesWakeLock_AfterFailure() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
-
- assertTrue(mService.holdsWakeLock());
- mExecutor.runAll();
- assertFalse(mService.holdsWakeLock());
- }
-
- public void testShutdownStopsExecutor_AfterSuccess() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
-
- mExecutor.assertAlive();
- mDeletionExecutor.assertAlive();
-
- mExecutor.runAll();
- shutdownService();
-
- assertExecutorsShutdown();
- }
-
- public void testShutdownStopsExecutor_AfterMixedFailures() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- startService(createCopyIntent(newArrayList(GAMMA_DOC), DELTA_DOC));
-
- mJobFactory.copyJobs.get(0).fail(ALPHA_DOC);
-
- mExecutor.runAll();
- shutdownService();
-
- assertExecutorsShutdown();
- }
-
- public void testShutdownStopsExecutor_AfterTotalFailure() throws Exception {
- startService(createCopyIntent(newArrayList(ALPHA_DOC), BETA_DOC));
- startService(createCopyIntent(newArrayList(GAMMA_DOC), DELTA_DOC));
-
- mJobFactory.copyJobs.get(0).fail(ALPHA_DOC);
- mJobFactory.copyJobs.get(1).fail(GAMMA_DOC);
-
- mExecutor.runAll();
- shutdownService();
-
- assertExecutorsShutdown();
- }
-
- private Intent createCopyIntent(ArrayList<DocumentInfo> files, DocumentInfo dest)
- throws Exception {
- DocumentStack stack = new DocumentStack();
- stack.push(dest);
-
- List<Uri> uris = new ArrayList<>(files.size());
- for (DocumentInfo file: files) {
- uris.add(file.derivedUri);
- }
-
- ClipDetails details =
- ClipDetailsFactory.createClipDetails(OPERATION_COPY, SRC_PARENT, uris);
-
- return createBaseIntent(getContext(), createJobId(), details, stack);
- }
-
- private Intent createDeleteIntent(ArrayList<DocumentInfo> files) {
- DocumentStack stack = new DocumentStack();
-
- List<Uri> uris = new ArrayList<>(files.size());
- for (DocumentInfo file: files) {
- uris.add(file.derivedUri);
- }
-
- ClipDetails details =
- ClipDetailsFactory.createClipDetails(OPERATION_DELETE, SRC_PARENT, uris);
-
- return createBaseIntent(getContext(), createJobId(), details, stack);
- }
-
- private static DocumentInfo createDoc(String name) {
- // Doesn't need to be valid content Uri, just some urly looking thing.
- Uri uri = new Uri.Builder()
- .scheme("content")
- .authority("com.android.documentsui.testing")
- .path(name)
- .build();
-
- return createDoc(uri);
- }
-
- private static DocumentInfo createDoc(Uri destination) {
- DocumentInfo destDoc = new DocumentInfo();
- destDoc.derivedUri = destination;
- return destDoc;
- }
-
- private void assertExecutorsShutdown() {
- mExecutor.assertShutdown();
- mDeletionExecutor.assertShutdown();
- }
-
- private final class TestJobFactory extends Job.Factory {
-
- private final List<TestJob> copyJobs = new ArrayList<>();
- private final List<TestJob> deleteJobs = new ArrayList<>();
-
- private Runnable mJobRunnable = () -> {
- // The following statement is executed concurrently to Job.start() in real situation.
- // Call it in TestJob.start() to mimic this behavior.
- mHandler.dispatchNextMessage();
- };
-
- void assertAllCopyJobsStarted() {
- for (TestJob job : copyJobs) {
- job.assertStarted();
- }
- }
-
- void assertAllDeleteJobsStarted() {
- for (TestJob job : deleteJobs) {
- job.assertStarted();
- }
- }
-
- void assertNoCopyJobsStarted() {
- for (TestJob job : copyJobs) {
- job.assertNotStarted();
- }
- }
-
- void assertNoDeleteJobsStarted() {
- for (TestJob job : deleteJobs) {
- job.assertNotStarted();
- }
- }
-
- void assertJobsCreated(int expected) {
- assertEquals(expected, copyJobs.size() + deleteJobs.size());
- }
-
- @Override
- Job createCopy(Context service, Context appContext, Listener listener, String id,
- DocumentStack stack, ClipDetails details) {
-
- if (details.getItemCount() == 0) {
- throw new RuntimeException("Empty srcs not supported!");
- }
-
- TestJob job = new TestJob(
- service, appContext, listener, id, stack, details, mJobRunnable);
- copyJobs.add(job);
- return job;
- }
-
- @Override
- Job createDelete(Context service, Context appContext, Listener listener, String id,
- DocumentStack stack, ClipDetails details) {
-
- if (details.getItemCount() == 0) {
- throw new RuntimeException("Empty srcs not supported!");
- }
-
- TestJob job = new TestJob(
- service, appContext, listener, id, stack, details, mJobRunnable);
- deleteJobs.add(job);
-
- return job;
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/MoveJobTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/MoveJobTest.java
deleted file mode 100644
index fd5c92a..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/MoveJobTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static com.google.common.collect.Lists.newArrayList;
-
-import android.net.Uri;
-import android.provider.DocumentsContract.Document;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.model.DocumentStack;
-
-@MediumTest
-public class MoveJobTest extends AbstractCopyJobTest<MoveJob> {
-
- public void testMoveFiles() throws Exception {
- runCopyFilesTest();
-
- mDocs.assertChildCount(mSrcRoot, 0);
- }
-
- public void testMoveVirtualTypedFile() throws Exception {
- mDocs.createFolder(mSrcRoot, "hello");
- Uri testFile = mDocs.createVirtualFile(
- mSrcRoot, "/hello/virtual.sth", "virtual/mime-type",
- FRUITY_BYTES, "application/pdf", "text/html");
- createJob(newArrayList(testFile)).run();
-
- mJobListener.waitForFinished();
-
- // Should have failed, source not deleted. Moving by bytes for virtual files
- // is not supported.
- mDocs.assertChildCount(mDestRoot, 0);
- mDocs.assertChildCount(mSrcRoot, 1);
- }
-
- public void testMoveVirtualNonTypedFile() throws Exception {
- runCopyVirtualNonTypedFileTest();
-
- // Should have failed, source not deleted.
- mDocs.assertChildCount(mSrcRoot, 1);
- }
-
- public void testMove_BackendSideVirtualTypedFile_Fallback() throws Exception {
- Uri testFile = mDocs.createDocumentWithFlags(
- mSrcRoot.documentId, "virtual/mime-type", "tokyo.sth",
- Document.FLAG_VIRTUAL_DOCUMENT | Document.FLAG_SUPPORTS_COPY
- | Document.FLAG_SUPPORTS_MOVE, "application/pdf");
-
- createJob(newArrayList(testFile)).run();
- mJobListener.waitForFinished();
-
- // Should have failed, source not deleted. Moving by bytes for virtual files
- // is not supported.
- mDocs.assertChildCount(mDestRoot, 0);
- mDocs.assertChildCount(mSrcRoot, 1);
- }
-
- public void testMoveEmptyDir() throws Exception {
- runCopyEmptyDirTest();
-
- mDocs.assertChildCount(mSrcRoot, 0);
- }
-
- public void testMoveDirRecursively() throws Exception {
- runCopyDirRecursivelyTest();
-
- mDocs.assertChildCount(mSrcRoot, 0);
- }
-
- public void testNoMoveDirToSelf() throws Exception {
- runNoCopyDirToSelfTest();
-
- // should have failed, source not deleted
- mDocs.assertChildCount(mSrcRoot, 1);
- }
-
- public void testNoMoveDirToDescendent() throws Exception {
- runNoCopyDirToDescendentTest();
-
- // should have failed, source not deleted
- mDocs.assertChildCount(mSrcRoot, 1);
- }
-
- public void testMoveFileWithReadErrors() throws Exception {
- runCopyFileWithReadErrorsTest();
-
- // should have failed, source not deleted
- mDocs.assertChildCount(mSrcRoot, 1);
- }
-
- // TODO: Add test cases for moving when multi-parented.
-
- @Override
- MoveJob createJob(ClipDetails details, DocumentStack stack)
- throws Exception {
- return new MoveJob(
- mContext, mContext, mJobListener, FileOperations.createJobId(), stack, details);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestContentResolver.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestContentResolver.java
deleted file mode 100644
index 8f39b14..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestContentResolver.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.test.mock.MockContentResolver;
-import android.util.Log;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * A test resolver that enables this test suite to listen for notifications that mark when copy
- * operations are done.
- */
-class TestContentResolver extends MockContentResolver {
-
- private static final String TAG = "TestContextResolver";
-
- private CountDownLatch mReadySignal;
- private CountDownLatch mNotificationSignal;
- private Context mContext;
-
- public TestContentResolver(Context context) {
- mContext = context;
- mReadySignal = new CountDownLatch(1);
- }
-
- /**
- * Wait for the given number of files to be copied to destination. Times out after 1 sec.
- */
- public void waitForChanges(int count) throws Exception {
- // Wait for no more than 1 second by default.
- waitForChanges(count, 1000);
- }
-
- /**
- * Wait for files to be copied to destination.
- *
- * @param count Number of files to wait for.
- * @param timeOut Timeout in ms. TimeoutException will be thrown if this function times out.
- */
- public void waitForChanges(int count, int timeOut) throws Exception {
- mNotificationSignal = new CountDownLatch(count);
- // Signal that the test is now waiting for files.
- mReadySignal.countDown();
- if (!mNotificationSignal.await(timeOut, TimeUnit.MILLISECONDS)) {
- throw new TimeoutException("Timed out waiting for file operations to complete.");
- }
- }
-
- @Override
- public void notifyChange(Uri uri, ContentObserver observer, boolean syncToNetwork) {
- // Wait until the test is ready to receive file notifications.
- try {
- mReadySignal.await();
- } catch (InterruptedException e) {
- Log.d(TAG, "Interrupted while waiting for file copy readiness");
- Thread.currentThread().interrupt();
- }
- if (DocumentsContract.isDocumentUri(mContext, uri)) {
- Log.d(TAG, "Notification: " + uri);
- // Watch for document URI change notifications - this signifies the end of a copy.
- mNotificationSignal.countDown();
- }
- }
-}
\ No newline at end of file
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJob.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJob.java
deleted file mode 100644
index a7e1d66..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJob.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-import android.app.Notification;
-import android.app.Notification.Builder;
-import android.content.Context;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.R;
-import com.android.documentsui.model.DocumentInfo;
-import com.android.documentsui.model.DocumentStack;
-
-import java.text.NumberFormat;
-
-public class TestJob extends Job {
-
- private boolean mStarted;
- private Runnable mStartRunnable;
-
- private int mNumOfNotifications = 0;
-
- TestJob(
- Context service, Context appContext, Listener listener,
- String id, DocumentStack stack, ClipDetails details, Runnable startRunnable) {
- super(service, appContext, listener, id, stack, details);
-
- mStartRunnable = startRunnable;
- }
-
- @Override
- void start() {
- mStarted = true;
-
- mStartRunnable.run();
- }
-
- void assertStarted() {
- assertTrue(mStarted);
- }
-
- void assertNotStarted() {
- assertFalse(mStarted);
- }
-
- void fail(DocumentInfo doc) {
- onFileFailed(doc);
- }
-
- int getNumOfNotifications() {
- return mNumOfNotifications;
- }
-
- @Override
- Notification getSetupNotification() {
- ++mNumOfNotifications;
- return getSetupNotification(service.getString(R.string.copy_preparing));
- }
-
- @Override
- Notification getProgressNotification() {
- ++mNumOfNotifications;
- double completed = mStarted ? 1F : 0F;
- return mProgressBuilder
- .setProgress(1, (int) completed, true)
- .setSubText(NumberFormat.getPercentInstance().format(completed))
- .build();
- }
-
- @Override
- Notification getFailureNotification() {
- // the "copy" stuff was just convenient and available :)
- return getFailureNotification(
- R.plurals.copy_error_notification_title, R.drawable.ic_menu_copy);
- }
-
- @Override
- Notification getWarningNotification() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- Builder createProgressBuilder() {
- ++mNumOfNotifications;
- // the "copy" stuff was just convenient and available :)
- return super.createProgressBuilder(
- service.getString(R.string.copy_notification_title),
- R.drawable.ic_menu_copy,
- service.getString(android.R.string.cancel),
- R.drawable.ic_cab_cancel);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJobListener.java b/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJobListener.java
deleted file mode 100644
index e9c68c6..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJobListener.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.services;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import android.support.annotation.Nullable;
-
-import com.android.documentsui.model.DocumentInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class TestJobListener implements Job.Listener {
-
- private final CountDownLatch latch = new CountDownLatch(1);
- private final List<Job> progress = new ArrayList<>();
- @Nullable private Job started;
- @Nullable private Job finished;
-
- @Override
- public void onStart(Job job) {
- started = job;
- }
-
- @Override
- public void onFinished(Job job) {
- this.finished = job;
- latch.countDown();
- }
-
- public void assertStarted() {
- if (started == null) {
- fail("Job didn't start. onStart never called.");
- }
- }
-
- public void assertFinished() {
- if (finished == null) {
- fail("Job didn't finish. onFinish never called.");
- }
- }
-
- public void assertFailed() {
- if (finished == null || !finished.hasFailures()) {
- fail("Job didn't fail. onFailed never called.");
- }
- }
-
- public void assertFilesFailed(ArrayList<String> names) {
- if (finished == null || !finished.hasFailures()) {
- fail("Can't test failed documetns. Job didn't fail.");
- }
-
- assertEquals(finished.failedFiles.size(), names.size());
- for (String name : names) {
- assertFileFailed(name);
- }
- }
-
- public void assertFileFailed(String name) {
- if (finished == null || !finished.hasFailures()) {
- fail("Can't test failed documetns. Job didn't fail.");
- }
-
- for (DocumentInfo failed : finished.failedFiles) {
- if (name.equals(failed.displayName)) {
- return;
- }
- }
- fail("Couldn't find failed file: " + name);
- }
-
- public void assertCanceled() {
- if (finished == null) {
- fail("Can't determine if job was canceled. Job didn't finish.");
- }
- if (!finished.isCanceled()) {
- fail("Job wasn't canceled. Job#isCanceled returned false.");
- }
- }
-
- public void assertMadeProgress() {
- if (progress.isEmpty()) {
- fail("Job made no progress. onProgress never called.");
- }
- }
-
- public void waitForFinished() throws InterruptedException {
- latch.await(500, TimeUnit.MILLISECONDS);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/Bitmaps.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/Bitmaps.java
deleted file mode 100644
index 1b94b15..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/Bitmaps.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.graphics.Bitmap;
-
-public final class Bitmaps {
-
- private Bitmaps() {}
-
- public static Bitmap createTestBitmap(int width, int height) {
- final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
- return bitmap;
- }
-
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/ClipDatas.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/ClipDatas.java
deleted file mode 100644
index 525a02e..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/ClipDatas.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.content.ClipData;
-
-import org.mockito.Mockito;
-
-public final class ClipDatas {
-
- private ClipDatas() {}
-
- public static ClipData createTestClipData() {
- final ClipData data = Mockito.mock(ClipData.class);
-
- return data;
- }
-
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/ClipDetailsFactory.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/ClipDetailsFactory.java
deleted file mode 100644
index d833528..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/ClipDetailsFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.net.Uri;
-
-import com.android.documentsui.ClipDetails;
-import com.android.documentsui.services.FileOperationService.OpType;
-
-import java.util.List;
-
-public final class ClipDetailsFactory {
- private ClipDetailsFactory() {}
-
- public static ClipDetails createClipDetails(@OpType int opType, Uri srcParent, List<Uri> docs) {
- return new ClipDetails.StandardClipDetails(opType, srcParent, docs);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/DragEvents.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/DragEvents.java
deleted file mode 100644
index 4ad9ec0..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/DragEvents.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.content.ClipData;
-import android.view.DragEvent;
-
-import org.mockito.Mockito;
-
-public final class DragEvents {
-
- private DragEvents() {}
-
- public static DragEvent createTestDragEvent(int actionId) {
- final DragEvent mockEvent = Mockito.mock(DragEvent.class);
- Mockito.when(mockEvent.getAction()).thenReturn(actionId);
-
- return mockEvent;
- }
-
- public static DragEvent createTestLocationEvent(float x, float y) {
- final DragEvent locationEvent = createTestDragEvent(DragEvent.ACTION_DRAG_LOCATION);
- Mockito.when(locationEvent.getX()).thenReturn(x);
- Mockito.when(locationEvent.getY()).thenReturn(y);
-
- return locationEvent;
- }
-
- public static DragEvent createTestDropEvent(ClipData clipData) {
- final DragEvent dropEvent = createTestDragEvent(DragEvent.ACTION_DROP);
- Mockito.when(dropEvent.getClipData()).thenReturn(clipData);
-
- return dropEvent;
- }
-
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestDirectoryDetails.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestDirectoryDetails.java
deleted file mode 100644
index e2891bf..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestDirectoryDetails.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import com.android.documentsui.MenuManager.DirectoryDetails;
-
-/**
- * Test copy of DirectoryDetails, everything default to false
- */
-public class TestDirectoryDetails extends DirectoryDetails {
-
- public boolean shouldShowFancyFeatures;
- public boolean isInRecents;
- public boolean hasRootSettings;
- public boolean hasItemsToPaste;
- public boolean canCreateDirectory;
- public boolean getDisplayFileSize;
-
- public TestDirectoryDetails() {
- super(null);
- }
-
- @Override
- public boolean shouldShowFancyFeatures() {
- return shouldShowFancyFeatures;
- }
-
- @Override
- public boolean hasRootSettings() {
- return hasRootSettings;
- }
-
- @Override
- public boolean hasItemsToPaste() {
- return hasItemsToPaste;
- }
-
- @Override
- public boolean isInRecents() {
- return isInRecents;
- }
-
- @Override
- public boolean canCreateDirectory() {
- return canCreateDirectory;
- }
-
- @Override
- public boolean getDisplayFileSize() {
- return getDisplayFileSize;
- }
-}
\ No newline at end of file
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestDrawable.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestDrawable.java
deleted file mode 100644
index bc3831ec..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestDrawable.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.drawable.Drawable;
-
-public class TestDrawable extends Drawable {
-
- public float hotspotX;
- public float hotspotY;
-
- @Override
- public void setHotspot(float x, float y) {
- hotspotX = x;
- hotspotY = y;
- }
-
- @Override
- public void draw(Canvas canvas) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setAlpha(int alpha) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setColorFilter(ColorFilter colorFilter) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getOpacity() {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestHandler.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestHandler.java
deleted file mode 100644
index c18ef1f..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-
-import java.util.TimerTask;
-
-/**
- * A test double of {@link Handler}, backed by {@link TestTimer}.
- */
-public class TestHandler extends Handler {
- private TestTimer mTimer = new TestTimer();
-
- public TestHandler() {
- // Use main looper to trick underlying handler, we're not using it at all.
- super(Looper.getMainLooper());
- }
-
- public boolean hasScheduledMessage() {
- return mTimer.hasScheduledTask();
- }
-
- public void dispatchNextMessage() {
- mTimer.fastForwardToNextTask();
- }
-
- @Override
- public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
- msg.setTarget(this);
- TimerTask task = new MessageTimerTask(msg);
- mTimer.scheduleAtTime(new TestTimer.Task(task), uptimeMillis);
- return true;
- }
-
- private static class MessageTimerTask extends TimerTask {
- private Message mMessage;
-
- private MessageTimerTask(Message message) {
- mMessage = message;
- }
-
- @Override
- public void run() {
- mMessage.getTarget().dispatchMessage(mMessage);
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestMenu.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestMenu.java
deleted file mode 100644
index 7e35266..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestMenu.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.util.SparseArray;
-import android.view.Menu;
-
-import com.android.documentsui.R;
-
-import org.mockito.Mockito;
-
-/**
- *
- * Test copy of {@link android.view.Menu}.
- *
- * We use abstract so we don't have to implement all the necessary methods from the interface,
- * and we use Mockito to just mock out the methods we need.
- * To get an instance, use {@link #create(int...)}.
- */
-public abstract class TestMenu implements Menu {
-
- private SparseArray<TestMenuItem> items = new SparseArray<>();
-
- public static TestMenu create() {
- return create(R.id.menu_open,
- R.id.menu_rename,
- R.id.menu_move_to,
- R.id.menu_copy_to,
- R.id.menu_cut_to_clipboard,
- R.id.menu_copy_to_clipboard,
- R.id.menu_paste_from_clipboard,
- R.id.menu_share,
- R.id.menu_delete,
- R.id.menu_create_dir,
- R.id.menu_settings,
- R.id.menu_new_window,
- R.id.menu_select_all,
- R.id.menu_file_size,
- R.id.menu_grid,
- R.id.menu_list,
- R.id.menu_sort,
- R.id.menu_sort_size,
- R.id.menu_advanced);
- }
-
- public static TestMenu create(int... ids) {
- final TestMenu menu = Mockito.mock(TestMenu.class,
- Mockito.withSettings().defaultAnswer(Mockito.CALLS_REAL_METHODS));
- menu.items = new SparseArray<>();
- for (int id : ids) {
- TestMenuItem item = TestMenuItem.create(id);
- menu.addMenuItem(id, item);
- }
- return menu;
- }
-
- public void addMenuItem(int id, TestMenuItem item) {
- items.put(id, item);
- }
-
- @Override
- public TestMenuItem findItem(int id) {
- return items.get(id);
- }
-
- @Override
- public int size() {
- return items.size();
- }
-
- @Override
- public TestMenuItem getItem(int index) {
- return items.valueAt(index);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestMenuItem.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestMenuItem.java
deleted file mode 100644
index 6314b7b..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestMenuItem.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.annotation.StringRes;
-import android.view.MenuItem;
-
-import org.mockito.Mockito;
-
-/**
-*
-* Test copy of {@link android.view.MenuItem}.
-*
-* We use abstract so we don't have to implement all the necessary methods from the interface,
-* and we use Mockito to just mock out the methods we need.
-* To get an instance, use {@link #create(int)}.
-*/
-
-public abstract class TestMenuItem implements MenuItem {
-
- boolean enabled;
- boolean visible;
- @StringRes int title;
-
- public static TestMenuItem create(int id) {
- final TestMenuItem mockMenuItem = Mockito.mock(TestMenuItem.class,
- Mockito.withSettings().defaultAnswer(Mockito.CALLS_REAL_METHODS));
-
- return mockMenuItem;
- }
-
- @Override
- public TestMenuItem setTitle(@StringRes int title) {
- this.title = title;
- return this;
- }
-
- @Override
- public MenuItem setEnabled(boolean enabled) {
- this.enabled = enabled;
- return this;
- }
-
- @Override
- public MenuItem setVisible(boolean visible) {
- this.visible = visible;
- return this;
- }
-
- @Override
- public boolean isVisible() {
- return this.visible;
- }
-
- @Override
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public void assertEnabled() {
- assertTrue(this.enabled);
- }
-
- public void assertDisabled() {
- assertFalse(this.enabled);
- }
-
- public void assertVisible() {
- assertTrue(this.visible);
- }
-
- public void assertInvisible() {
- assertFalse(this.visible);
- }
-
- public void assertTitle(@StringRes int title) {
- assertTrue(this.title == title);
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestScheduledExecutorService.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestScheduledExecutorService.java
deleted file mode 100644
index f5001ee..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestScheduledExecutorService.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Delayed;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class TestScheduledExecutorService implements ScheduledExecutorService {
-
- private List<TestFuture> scheduled = new ArrayList<>();
- private boolean shutdown;
-
- @Override
- public void shutdown() {
- this.shutdown = true;
- }
-
- @Override
- public List<Runnable> shutdownNow() {
- this.shutdown = true;
- return new ArrayList<>();
- }
-
- public void assertShutdown() {
- if (!shutdown) {
- fail("Executor wasn't shut down.");
- }
- }
-
- @Override
- public boolean isShutdown() {
- return shutdown;
- }
-
- @Override
- public boolean isTerminated() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T> Future<T> submit(Callable<T> task) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T> Future<T> submit(Runnable task, T result) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Future<?> submit(Runnable task) {
- return schedule(task, 0, TimeUnit.MILLISECONDS);
- }
-
- @Override
- public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
- throws InterruptedException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout,
- TimeUnit unit) throws InterruptedException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
- throws InterruptedException, ExecutionException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void execute(Runnable command) {
- schedule(command, 0, TimeUnit.MILLISECONDS);
- }
-
- @Override
- public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
- TestFuture future = new TestFuture(command, delay, unit);
- scheduled.add(future);
- return future;
- }
-
- @Override
- public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period,
- TimeUnit unit) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay,
- long delay, TimeUnit unit) {
- throw new UnsupportedOperationException();
- }
-
- public void runAll() {
- for (TestFuture future : scheduled) {
- future.runnable.run();
- }
- }
-
- public void run(int taskIndex) {
- scheduled.get(taskIndex).runnable.run();
- }
-
- public void assertAlive() {
- assertFalse(isShutdown());
- }
-
- static class TestFuture implements ScheduledFuture<Void> {
-
- final Runnable runnable;
- final long delay;
- final TimeUnit unit;
-
- public TestFuture(Runnable runnable, long delay, TimeUnit unit) {
- this.runnable = runnable;
- this.delay = delay;
- this.unit = unit;
- }
-
- @Override
- public long getDelay(TimeUnit unit) {
- return 0;
- }
-
- @Override
- public int compareTo(Delayed arg0) {
- return 0;
- }
-
- @Override
- public boolean cancel(boolean mayInterruptIfRunning) {
- return false;
- }
-
- @Override
- public boolean isCancelled() {
- return false;
- }
-
- @Override
- public boolean isDone() {
- return false;
- }
-
- @Override
- public Void get() throws InterruptedException, ExecutionException {
- return null;
- }
-
- @Override
- public Void get(long timeout, TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
- return null;
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestSearchViewManager.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestSearchViewManager.java
deleted file mode 100644
index 29ae3bd..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestSearchViewManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.os.Bundle;
-
-import com.android.documentsui.SearchViewManager;
-
-/**
- * Test copy of {@link com.android.documentsui.SearchViewManager}
- *
- * Specficially used to test whether {@link #showMenu(boolean)}
- * and {@link #updateMenu()} are called.
- */
-public class TestSearchViewManager extends SearchViewManager {
-
- boolean updateMenuCalled;
- boolean showMenuCalled;
-
- public TestSearchViewManager(SearchManagerListener listener, Bundle savedState) {
- super(listener, savedState);
- }
-
- public TestSearchViewManager() {
- super(null, null);
- }
-
- @Override
- protected void showMenu(boolean visible) {
- showMenuCalled = true;
- }
-
- @Override
- public void updateMenu() {
- updateMenuCalled = true;
- }
-
- public boolean showMenuCalled() {
- return showMenuCalled;
- }
-
- public boolean updateMenuCalled() {
- return updateMenuCalled;
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestSelectionDetails.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestSelectionDetails.java
deleted file mode 100644
index 20796ca..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestSelectionDetails.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import com.android.documentsui.MenuManager.SelectionDetails;
-
-/**
- * Test copy of SelectionDetails, everything default to false
- */
-public class TestSelectionDetails implements SelectionDetails {
-
- public boolean canRename;
- public boolean canDelete;
- public boolean containPartial;
- public boolean containDirectories;
-
- @Override
- public boolean containsPartialFiles() {
- return containPartial;
- }
-
- @Override
- public boolean containsDirectories() {
- return containDirectories;
- }
-
- @Override
- public boolean canRename() {
- return canRename;
- }
-
- @Override
- public boolean canDelete() {
- return canDelete;
- }
- }
\ No newline at end of file
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestTimer.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestTimer.java
deleted file mode 100644
index 04af283..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/TestTimer.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.ListIterator;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * A {@link Timer} for testing that can dial its clock hands to any future time.
- */
-public class TestTimer extends Timer {
-
- private long mNow = 0;
-
- private final LinkedList<Task> mTaskList = new LinkedList<>();
-
- public void fastForwardTo(long time) {
- if (time < mNow) {
- throw new IllegalArgumentException("Can't fast forward to past.");
- }
-
- mNow = time;
- while (!mTaskList.isEmpty() && mTaskList.getFirst().mExecuteTime <= mNow) {
- Task task = mTaskList.getFirst();
- if (!task.isCancelled()) {
- task.run();
- }
- mTaskList.removeFirst();
- }
- }
-
- public boolean hasScheduledTask() {
- return !mTaskList.isEmpty();
- }
-
- public void fastForwardToNextTask() {
- if (!hasScheduledTask()) {
- throw new IllegalStateException("There is no scheduled task!");
- }
- fastForwardTo(mTaskList.getFirst().mExecuteTime);
- }
-
- @Override
- public void cancel() {
- mTaskList.clear();
- }
-
- @Override
- public int purge() {
- int count = 0;
- Iterator<Task> iter = mTaskList.iterator();
- while (iter.hasNext()) {
- Task task = iter.next();
- if (task.isCancelled()) {
- iter.remove();
- ++count;
- }
- }
- return count;
- }
-
- @Override
- public void schedule(TimerTask task, Date time) {
- long executeTime = time.getTime();
- scheduleAtTime(task, executeTime);
- }
-
- @Override
- public void schedule(TimerTask task, Date firstTime, long period) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void schedule(TimerTask task, long delay) {
- long executeTime = mNow + delay;
- scheduleAtTime(task, executeTime);
- }
-
- @Override
- public void schedule(TimerTask task, long delay, long period) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void scheduleAtFixedRate(TimerTask task, Date firstTime, long period) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void scheduleAtFixedRate(TimerTask task, long delay, long period) {
- throw new UnsupportedOperationException();
- }
-
- public void scheduleAtTime(TimerTask task, long executeTime) {
- Task testTimerTask = (Task) task;
- testTimerTask.mExecuteTime = executeTime;
-
- ListIterator<Task> iter = mTaskList.listIterator(0);
- while (iter.hasNext()) {
- if (iter.next().mExecuteTime >= executeTime) {
- break;
- }
- }
- iter.add(testTimerTask);
- }
-
- public static class Task extends TimerTask {
- private boolean mIsCancelled;
- private long mExecuteTime;
-
- private TimerTask mDelegate;
-
- public Task(TimerTask delegate) {
- mDelegate = delegate;
- }
-
- @Override
- public boolean cancel() {
- mIsCancelled = true;
- return mDelegate.cancel();
- }
-
- @Override
- public void run() {
- mDelegate.run();
- }
-
- boolean isCancelled() {
- return mIsCancelled;
- }
- }
-}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/Views.java b/packages/DocumentsUI/tests/src/com/android/documentsui/testing/Views.java
deleted file mode 100644
index 52a9cbc..0000000
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/testing/Views.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.documentsui.testing;
-
-import android.graphics.drawable.Drawable;
-import android.view.View;
-
-import org.mockito.Mockito;
-
-public final class Views {
-
- private Views() {}
-
- public static View createTestView() {
- final View view = Mockito.mock(View.class);
- Mockito.doCallRealMethod().when(view).setTag(Mockito.anyInt(), Mockito.any());
- Mockito.doCallRealMethod().when(view).getTag(Mockito.anyInt());
-
- return view;
- }
-
- public static void setBackground(View testView, Drawable background) {
- Mockito.when(testView.getBackground()).thenReturn(background);
- }
-}
diff --git a/packages/DocumentsUI/wrap_alpha.py b/packages/DocumentsUI/wrap_alpha.py
deleted file mode 100644
index 92a3d59..0000000
--- a/packages/DocumentsUI/wrap_alpha.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-"""
-# assume everything needs alpha suffixes
-for root, dirs, files in os.walk('.'):
- if "res/drawable-" not in root: continue
-
- for before in files:
- if "_alpha.png" in before: continue
-
- after = before.replace(".png", "_alpha.png")
- os.rename(os.path.join(root, before), os.path.join(root, after))
-"""
-
-# build xml redirection
-for root, dirs, files in os.walk('.'):
- if "res/drawable-" not in root: continue
-
- for src in files:
- if not src.endswith(".png"): continue
- src = src[0:-4]
-
- src_clause = '\n android:src="@drawable/%s"' % (src)
-
- alpha = src.endswith("_alpha")
- if alpha:
- src = src[0:-6]
- if "ic_doc" in src or "ic_root" in src or "ic_grid_folder" in src:
- alpha_clause = '\n android:tint="@*android:color/secondary_text_material_light"'
- else:
- alpha_clause = '\n android:tint="?android:attr/colorControlNormal"'
- else:
- alpha_clause = ''
-
- am = src.endswith("_am")
- if am:
- src = src[0:-3]
- am_clause = '\n android:autoMirrored="true"'
- else:
- am_clause = ''
-
- with open("res/drawable/%s.xml" % (src), 'w') as xml:
- xml.write("""<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"%s%s%s />
-""" % (src_clause, alpha_clause, am_clause))
diff --git a/packages/EasterEgg/AndroidManifest.xml b/packages/EasterEgg/AndroidManifest.xml
index 50e8b5c..fbc2386 100644
--- a/packages/EasterEgg/AndroidManifest.xml
+++ b/packages/EasterEgg/AndroidManifest.xml
@@ -31,6 +31,7 @@
android:label="@string/app_name">
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
+ <action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
diff --git a/packages/EasterEgg/res/drawable/collar.xml b/packages/EasterEgg/res/drawable/collar.xml
index 6c0d90a..5e4d0fd 100644
--- a/packages/EasterEgg/res/drawable/collar.xml
+++ b/packages/EasterEgg/res/drawable/collar.xml
@@ -18,5 +18,5 @@
android:height="48dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
- <path android:name="collar" android:fillColor="#FF000000" android:pathData="M9,18.4h30v1.6h-30z"/>
+ <path android:name="collar" android:fillColor="#FF000000" android:pathData="M9,18.4h30v1.7h-30z"/>
</vector>
diff --git a/packages/EasterEgg/res/drawable/food_bacon.xml b/packages/EasterEgg/res/drawable/food_bacon.xml
deleted file mode 100644
index 1df325c..0000000
--- a/packages/EasterEgg/res/drawable/food_bacon.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="48dp"
- android:height="48dp"
- android:viewportWidth="48.0"
- android:viewportHeight="48.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M42.6,14.9c-0.8,0,-2.6,-1.3,-2.7,-1.6c-0.2,-0.2,-2.2,-0.9,-2.7,-2c-0.2,-0.4,-1.1,-3.4,-1.1,-3.4s0,0,-1.8,3 c-1.8,3,-4.3,3.1,-7.6,3c-3.3,-0.1,-3,3.4,-5.5,5.8c-2.5,2.4,-5.4,3,-9.6,2.5c-4.2,-0.6,-6.8,6.7,-6.8,6.7s1.5,0.5,2.5,0.5s2.5,1.2,3.3,5 c0.8,3.9,5.1,6.5,5.1,6.5s0.1,-6.3,1.2,-9.2c1.1,-2.9,6.4,-0.5,9.8,-1.3c3.4,-0.8,3.3,-4.8,4.2,-6.7c0.9,-1.9,3.9,-2.6,7.6,-3.4 C42.2,19.4,43.4,14.9,42.6,14.9z M13.4,30.7c-0.6,2.1,-0.6,1.7,-0.6,1.7s0,-2.6,0.8,-3.3c0.8,-0.6,4.8,-1,4.8,-1S14.1,28.6,13.4,30.7z M13.4,25.6c-1.5,0.8,-3,1.8,-3,1.8s-1.1,-1.7,1.1,-2.3c2.2,-0.6,9,0.6,10,-2.2c1,-2.6,3.8,-7.5,4.5,-7.1c-1.5,1.7,-3.1,7,-4.3,8.6 C20.8,25.7,14.9,24.8,13.4,25.6z M31.7,17.3c-2.1,0.9,-3.9,2.3,-5.3,5.7c-1.4,3.3,-3.5,2.7,-3.5,2.7c5.6,-5,3.2,-7.4,5.5,-8.4 c3.5,-1.5,2.6,0.2,4.8,-1.3c2.3,-1.6,3.1,-2.6,3.1,-2.6C36.4,13.4,34.1,16.3,31.7,17.3z"/>
-</vector>
diff --git a/packages/EasterEgg/res/drawable/food_chicken.xml b/packages/EasterEgg/res/drawable/food_chicken.xml
new file mode 100644
index 0000000..95b2fb5
--- /dev/null
+++ b/packages/EasterEgg/res/drawable/food_chicken.xml
@@ -0,0 +1,39 @@
+<!--
+Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48.0"
+ android:viewportHeight="48.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M9,12v14h10V11H9z M11.7,16.3c-0.7,0,-1.3,-0.6,-1.3,-1.3s0.6,-1.3,1.3,-1.3S13,14.3,13,15S12.4,16.3,11.7,16.3z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M5.7,20.1l1.6,-3.0l-1.6,-3.0l4.4,3.0z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M19.0,6.0l-2.3,2.3l-2.7,-2.6l-2.7,2.6l-2.3,-2.3l0.0,4.0l10.0,0.0z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M9,25c0,8.3,6.7,15,15,15s15,-6.7,15,-15H9z M29.9,31.5h-11v-1h12L29.9,31.5z M31.9,29.5h-13v-1h14L31.9,29.5z M33.9,27.5 h-15v-1h16L33.9,27.5z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M27.0,38.6h2.0v6.0h-2.0z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M17.4,44.6l-2.1999998,0.0l4.4000006,-6.0l2.1999989,0.0z"/>
+</vector>
diff --git a/packages/EasterEgg/res/drawable/icon.xml b/packages/EasterEgg/res/drawable/icon.xml
index 5e08fcb..defa83a 100644
--- a/packages/EasterEgg/res/drawable/icon.xml
+++ b/packages/EasterEgg/res/drawable/icon.xml
@@ -14,15 +14,15 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="48dp"
- android:height="48dp"
+ android:width="512dp"
+ android:height="512dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
<path
- android:fillColor="#00796B"
+ android:fillColor="#FF7E5BBF"
android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
<path
- android:fillColor="#00796B"
+ android:fillColor="#FF7E5BBF"
android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
<path
android:fillColor="#40000000"
@@ -31,8 +31,7 @@
android:fillColor="#40000000"
android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
<path
- android:fillColor="#4DB6AC"
+ android:fillColor="#FF55C4F5"
android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>
</vector>
-
diff --git a/packages/EasterEgg/res/drawable/leg1.xml b/packages/EasterEgg/res/drawable/leg1.xml
index 6257333..d72c746 100644
--- a/packages/EasterEgg/res/drawable/leg1.xml
+++ b/packages/EasterEgg/res/drawable/leg1.xml
@@ -18,5 +18,5 @@
android:height="48dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
- <path android:name="leg1" android:fillColor="#FF000000" android:pathData="M9,38h5v5h-5z"/>
+ <path android:name="leg1" android:fillColor="#FF000000" android:pathData="M9,37h5v6h-5z"/>
</vector>
diff --git a/packages/EasterEgg/res/drawable/leg2.xml b/packages/EasterEgg/res/drawable/leg2.xml
index 73352f6..a772a87 100644
--- a/packages/EasterEgg/res/drawable/leg2.xml
+++ b/packages/EasterEgg/res/drawable/leg2.xml
@@ -18,5 +18,5 @@
android:height="48dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
- <path android:name="leg2" android:fillColor="#FF000000" android:pathData="M16,38h5v5h-5z"/>
+ <path android:name="leg2" android:fillColor="#FF000000" android:pathData="M16,37h5v6h-5z"/>
</vector>
diff --git a/packages/EasterEgg/res/drawable/leg2_shadow.xml b/packages/EasterEgg/res/drawable/leg2_shadow.xml
index 77f4893..b01bd69 100644
--- a/packages/EasterEgg/res/drawable/leg2_shadow.xml
+++ b/packages/EasterEgg/res/drawable/leg2_shadow.xml
@@ -18,5 +18,5 @@
android:height="48dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
- <path android:name="leg2_shadow" android:fillColor="#FF000000" android:pathData="M16,38h5v1h-5z"/>
+ <path android:name="leg2_shadow" android:fillColor="#FF000000" android:pathData="M16,37h5v3h-5z"/>
</vector>
diff --git a/packages/EasterEgg/res/drawable/leg3.xml b/packages/EasterEgg/res/drawable/leg3.xml
index 53dea5c..d471236 100644
--- a/packages/EasterEgg/res/drawable/leg3.xml
+++ b/packages/EasterEgg/res/drawable/leg3.xml
@@ -18,5 +18,5 @@
android:height="48dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
- <path android:name="leg3" android:fillColor="#FF000000" android:pathData="M27,38h5v5h-5z"/>
+ <path android:name="leg3" android:fillColor="#FF000000" android:pathData="M27,37h5v6h-5z"/>
</vector>
diff --git a/packages/EasterEgg/res/drawable/leg4.xml b/packages/EasterEgg/res/drawable/leg4.xml
index f2ce73e..e5868eb 100644
--- a/packages/EasterEgg/res/drawable/leg4.xml
+++ b/packages/EasterEgg/res/drawable/leg4.xml
@@ -18,5 +18,5 @@
android:height="48dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
- <path android:name="leg4" android:fillColor="#FF000000" android:pathData="M34,38h5v5h-5z"/>
+ <path android:name="leg4" android:fillColor="#FF000000" android:pathData="M34,37h5v6h-5z"/>
</vector>
diff --git a/packages/EasterEgg/res/layout/cat_view.xml b/packages/EasterEgg/res/layout/cat_view.xml
index 82ced2f2..85b494d 100644
--- a/packages/EasterEgg/res/layout/cat_view.xml
+++ b/packages/EasterEgg/res/layout/cat_view.xml
@@ -20,12 +20,14 @@
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center_horizontal"
android:clipToPadding="false">
<FrameLayout
- android:layout_width="wrap_content"
+ android:layout_width="96dp"
android:layout_height="wrap_content">
<ImageView
@@ -33,6 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
+ android:layout_gravity="center"
android:scaleType="fitCenter" />
<LinearLayout
diff --git a/packages/EasterEgg/res/values/dimens.xml b/packages/EasterEgg/res/values/dimens.xml
new file mode 100644
index 0000000..e9dcebd
--- /dev/null
+++ b/packages/EasterEgg/res/values/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <dimen name="neko_display_size">64dp</dimen>
+</resources>
diff --git a/packages/EasterEgg/res/values/strings.xml b/packages/EasterEgg/res/values/strings.xml
index 074a864..8478a43 100644
--- a/packages/EasterEgg/res/values/strings.xml
+++ b/packages/EasterEgg/res/values/strings.xml
@@ -21,18 +21,19 @@
<string name="notification_title" translatable="false">A cat is here.</string>
<string name="default_cat_name" translatable="false">Cat #%s</string>
<string name="directory_name" translatable="false">Cats</string>
+ <string name="confirm_delete" translatable="false">Forget %s?</string>
<string-array name="food_names" translatable="false">
<item>Empty dish</item>
<item>Bits</item>
<item>Fish</item>
- <item>Bacon</item>
+ <item>Chicken</item>
<item>Treat</item>
</string-array>
<array name="food_icons">
<item>@drawable/food_dish</item>
<item>@drawable/food_bits</item>
<item>@drawable/food_sysuituna</item>
- <item>@drawable/food_bacon</item>
+ <item>@drawable/food_chicken</item>
<item>@drawable/food_donut</item>
</array>
<integer-array name="food_intervals">
@@ -45,8 +46,8 @@
<integer-array name="food_new_cat_prob">
<item>0</item>
<item>5</item>
- <item>25</item>
- <item>50</item>
- <item>75</item>
+ <item>35</item>
+ <item>65</item>
+ <item>90</item>
</integer-array>
</resources>
diff --git a/packages/EasterEgg/src/com/android/egg/neko/Cat.java b/packages/EasterEgg/src/com/android/egg/neko/Cat.java
index 525b035..a4df372 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/Cat.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/Cat.java
@@ -16,7 +16,6 @@
import android.app.Notification;
import android.app.PendingIntent;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
@@ -25,17 +24,23 @@
import android.graphics.drawable.Icon;
import android.os.Bundle;
+import java.io.ByteArrayOutputStream;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
import com.android.egg.R;
+import com.android.internal.logging.MetricsLogger;
public class Cat extends Drawable {
+ public static final long[] PURR = {0, 40, 20, 40, 20, 40, 20, 40, 20, 40, 20, 40};
+
private Random mNotSoRandom;
private Bitmap mBitmap;
private long mSeed;
private String mName;
private int mBodyColor;
+ private int mFootType;
+ private boolean mBowTie;
private synchronized Random notSoRandom(long seed) {
if (mNotSoRandom == null) {
@@ -65,6 +70,15 @@
return a[i+1];
}
+ public static final int getColorIndex(int q, int[] a) {
+ for(int i = 1; i < a.length; i+=2) {
+ if (a[i] == q) {
+ return i/2;
+ }
+ }
+ return -1;
+ }
+
public static final int[] P_BODY_COLORS = {
180, 0xFF212121, // black
180, 0xFFFFFFFF, // white
@@ -129,7 +143,7 @@
mSeed = seed;
setName(context.getString(R.string.default_cat_name,
- String.valueOf(mSeed).substring(0, 3)));
+ String.valueOf(mSeed % 1000)));
final Random nsr = notSoRandom(seed);
@@ -154,14 +168,19 @@
tint(0xFF000000, D.mouth, D.nose);
}
+ mFootType = 0;
if (nsr.nextFloat() < 0.25f) {
+ mFootType = 4;
tint(0xFFFFFFFF, D.foot1, D.foot2, D.foot3, D.foot4);
} else {
if (nsr.nextFloat() < 0.25f) {
- tint(0xFFFFFFFF, D.foot1, D.foot2);
+ mFootType = 2;
+ tint(0xFFFFFFFF, D.foot1, D.foot3);
} else if (nsr.nextFloat() < 0.25f) {
- tint(0xFFFFFFFF, D.foot3, D.foot4);
+ mFootType = 3; // maybe -2 would be better? meh.
+ tint(0xFFFFFFFF, D.foot2, D.foot4);
} else if (nsr.nextFloat() < 0.1f) {
+ mFootType = 1;
tint(0xFFFFFFFF, (Drawable) choose(nsr, D.foot1, D.foot2, D.foot3, D.foot4));
}
}
@@ -174,7 +193,8 @@
final int collarColor = chooseP(nsr, P_COLLAR_COLORS);
tint(collarColor, D.collar);
- tint((nsr.nextFloat() < 0.1f) ? collarColor : 0, D.bowtie);
+ mBowTie = nsr.nextFloat() < 0.1f;
+ tint(mBowTie ? collarColor : 0, D.bowtie);
}
public static Cat create(Context context) {
@@ -189,7 +209,7 @@
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return new Notification.Builder(context)
.setSmallIcon(Icon.createWithResource(context, R.drawable.stat_icon))
- .setLargeIcon(createLargeIcon(context))
+ .setLargeIcon(createNotificationLargeIcon(context))
.setColor(getBodyColor())
.setPriority(Notification.PRIORITY_LOW)
.setContentTitle(context.getString(R.string.notification_title))
@@ -198,6 +218,7 @@
.setContentText(getName())
.setContentIntent(PendingIntent.getActivity(context, 0, intent, 0))
.setAutoCancel(true)
+ .setVibrate(PURR)
.addExtras(extras);
}
@@ -238,11 +259,24 @@
return result;
}
- public Icon createLargeIcon(Context context) {
- final Resources res = context.getResources();
- final int w = res.getDimensionPixelSize(android.R.dimen.notification_large_icon_width);
- final int h = res.getDimensionPixelSize(android.R.dimen.notification_large_icon_height);
+ public static Icon recompressIcon(Icon bitmapIcon) {
+ if (bitmapIcon.getType() != Icon.TYPE_BITMAP) return bitmapIcon;
+ final Bitmap bits = bitmapIcon.getBitmap();
+ final ByteArrayOutputStream ostream = new ByteArrayOutputStream(
+ bits.getWidth() * bits.getHeight() * 2); // guess 50% compression
+ final boolean ok = bits.compress(Bitmap.CompressFormat.PNG, 100, ostream);
+ if (!ok) return null;
+ return Icon.createWithData(ostream.toByteArray(), 0, ostream.size());
+ }
+ public Icon createNotificationLargeIcon(Context context) {
+ final Resources res = context.getResources();
+ final int w = 2*res.getDimensionPixelSize(android.R.dimen.notification_large_icon_width);
+ final int h = 2*res.getDimensionPixelSize(android.R.dimen.notification_large_icon_height);
+ return recompressIcon(createIcon(context, w, h));
+ }
+
+ public Icon createIcon(Context context, int w, int h) {
Bitmap result = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
final Canvas canvas = new Canvas(result);
final Paint pt = new Paint();
@@ -288,6 +322,30 @@
return mBodyColor;
}
+ public void logAdd(Context context) {
+ logCatAction(context, "egg_neko_add");
+ }
+
+ public void logRename(Context context) {
+ logCatAction(context, "egg_neko_rename");
+ }
+
+ public void logRemove(Context context) {
+ logCatAction(context, "egg_neko_remove");
+ }
+
+ public void logShare(Context context) {
+ logCatAction(context, "egg_neko_share");
+ }
+
+ private void logCatAction(Context context, String prefix) {
+ MetricsLogger.count(context, prefix, 1);
+ MetricsLogger.histogram(context, prefix +"_color",
+ getColorIndex(mBodyColor, P_BODY_COLORS));
+ MetricsLogger.histogram(context, prefix + "_bowtie", mBowTie ? 1 : 0);
+ MetricsLogger.histogram(context, prefix + "_feet", mFootType);
+ }
+
public static class CatParts {
public Drawable leftEar;
public Drawable rightEar;
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java b/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java
index 8fbab99..c0b725c 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java
@@ -18,22 +18,39 @@
import android.content.ComponentName;
import android.content.pm.PackageManager;
import android.util.Log;
+import android.widget.Toast;
+
+import com.android.internal.logging.MetricsLogger;
public class NekoActivationActivity extends Activity {
+ private void toastUp(String s) {
+ Toast toast = Toast.makeText(this, s, Toast.LENGTH_SHORT);
+ toast.getView().setBackgroundDrawable(null);
+ toast.show();
+ }
+
@Override
public void onStart() {
+ super.onStart();
+
final PackageManager pm = getPackageManager();
final ComponentName cn = new ComponentName(this, NekoTile.class);
if (pm.getComponentEnabledSetting(cn) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
if (NekoLand.DEBUG) {
Log.v("Neko", "Disabling tile.");
}
- pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
+ pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+ PackageManager.DONT_KILL_APP);
+ MetricsLogger.histogram(this, "egg_neko_enable", 0);
+ toastUp("\uD83D\uDEAB");
} else {
if (NekoLand.DEBUG) {
Log.v("Neko", "Enabling tile.");
}
- pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
+ pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+ PackageManager.DONT_KILL_APP);
+ MetricsLogger.histogram(this, "egg_neko_enable", 1);
+ toastUp("\uD83D\uDC31");
}
finish();
}
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java b/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java
index a2ffd3e..2d2fbe8 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java
@@ -26,6 +26,7 @@
import android.widget.TextView;
import com.android.egg.R;
+import com.android.internal.logging.MetricsLogger;
import java.util.ArrayList;
@@ -51,6 +52,7 @@
if (currentState == 0 && food.getType() != 0) {
NekoService.registerJob(getContext(), food.getInterval(getContext()));
}
+ MetricsLogger.histogram(getContext(), "egg_neko_offered_food", food.getType());
prefs.setFoodState(food.getType());
dismiss();
}
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java b/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
index e6a4177..f59f0d9 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
@@ -24,6 +24,7 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.media.MediaScannerConnection;
import android.net.Uri;
@@ -44,16 +45,22 @@
import com.android.egg.R;
import com.android.egg.neko.PrefState.PrefsListener;
+import com.android.internal.logging.MetricsLogger;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
public class NekoLand extends Activity implements PrefsListener {
public static boolean DEBUG = false;
public static boolean DEBUG_NOTIFICATIONS = false;
+ private static final int EXPORT_BITMAP_SIZE = 600;
+
private static final int STORAGE_PERM_REQUEST = 123;
private static boolean CAT_GEN = false;
@@ -79,7 +86,8 @@
mAdapter = new CatAdapter();
recyclerView.setAdapter(mAdapter);
recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
- updateCats();
+ int numCats = updateCats();
+ MetricsLogger.histogram(this, "egg_neko_visit_gallery", numCats);
}
@Override
@@ -88,7 +96,7 @@
mPrefs.setListener(null);
}
- private void updateCats() {
+ private int updateCats() {
Cat[] cats;
if (CAT_GEN) {
cats = new Cat[50];
@@ -96,9 +104,22 @@
cats[i] = Cat.create(this);
}
} else {
- cats = mPrefs.getCats().toArray(new Cat[0]);
+ final float[] hsv = new float[3];
+ List<Cat> list = mPrefs.getCats();
+ Collections.sort(list, new Comparator<Cat>() {
+ @Override
+ public int compare(Cat cat, Cat cat2) {
+ Color.colorToHSV(cat.getBodyColor(), hsv);
+ float bodyH1 = hsv[0];
+ Color.colorToHSV(cat2.getBodyColor(), hsv);
+ float bodyH2 = hsv[0];
+ return Float.compare(bodyH1, bodyH2);
+ }
+ });
+ cats = list.toArray(new Cat[0]);
}
mAdapter.setCats(cats);
+ return cats.length;
}
private void onCatClick(Cat cat) {
@@ -115,18 +136,21 @@
}
private void onCatRemove(Cat cat) {
+ cat.logRemove(this);
mPrefs.removeCat(cat);
}
private void showNameDialog(final Cat cat) {
- Context context = new ContextThemeWrapper(this,
+ final Context context = new ContextThemeWrapper(this,
android.R.style.Theme_Material_Light_Dialog_NoActionBar);
// TODO: Move to XML, add correct margins.
View view = LayoutInflater.from(context).inflate(R.layout.edit_text, null);
final EditText text = (EditText) view.findViewById(android.R.id.edit);
text.setText(cat.getName());
text.setSelection(cat.getName().length());
- Drawable catIcon = cat.createLargeIcon(this).loadDrawable(this);
+ final int size = context.getResources()
+ .getDimensionPixelSize(android.R.dimen.app_icon_size);
+ Drawable catIcon = cat.createIcon(this, size, size).loadDrawable(this);
new AlertDialog.Builder(context)
.setTitle(" ")
.setIcon(catIcon)
@@ -134,6 +158,7 @@
.setPositiveButton(android.R.string.ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
+ cat.logRename(context);
cat.setName(text.getText().toString().trim());
mPrefs.addCat(cat);
}
@@ -160,10 +185,36 @@
.inflate(R.layout.cat_view, parent, false));
}
+ private void setContextGroupVisible(final CatHolder holder, boolean vis) {
+ final View group = holder.contextGroup;
+ if (vis && group.getVisibility() != View.VISIBLE) {
+ group.setAlpha(0);
+ group.setVisibility(View.VISIBLE);
+ group.animate().alpha(1.0f).setDuration(333);
+ Runnable hideAction = new Runnable() {
+ @Override
+ public void run() {
+ setContextGroupVisible(holder, false);
+ }
+ };
+ group.setTag(hideAction);
+ group.postDelayed(hideAction, 5000);
+ } else if (!vis && group.getVisibility() == View.VISIBLE) {
+ group.removeCallbacks((Runnable) group.getTag());
+ group.animate().alpha(0f).setDuration(250).withEndAction(new Runnable() {
+ @Override
+ public void run() {
+ group.setVisibility(View.INVISIBLE);
+ }
+ });
+ }
+ }
+
@Override
public void onBindViewHolder(final CatHolder holder, int position) {
Context context = holder.itemView.getContext();
- holder.imageView.setImageIcon(mCats[position].createLargeIcon(context));
+ final int size = context.getResources().getDimensionPixelSize(R.dimen.neko_display_size);
+ holder.imageView.setImageIcon(mCats[position].createIcon(context, size, size));
holder.textView.setText(mCats[position].getName());
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
@@ -174,30 +225,30 @@
holder.itemView.setOnLongClickListener(new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
- holder.contextGroup.removeCallbacks((Runnable) holder.contextGroup.getTag());
- holder.contextGroup.setVisibility(View.VISIBLE);
- Runnable hideAction = new Runnable() {
- @Override
- public void run() {
- holder.contextGroup.setVisibility(View.INVISIBLE);
- }
- };
- holder.contextGroup.setTag(hideAction);
- holder.contextGroup.postDelayed(hideAction, 5000);
+ setContextGroupVisible(holder, true);
return true;
}
});
holder.delete.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- holder.contextGroup.setVisibility(View.INVISIBLE);
- holder.contextGroup.removeCallbacks((Runnable) holder.contextGroup.getTag());
- onCatRemove(mCats[holder.getAdapterPosition()]);
+ setContextGroupVisible(holder, false);
+ new AlertDialog.Builder(NekoLand.this)
+ .setTitle(getString(R.string.confirm_delete, mCats[position].getName()))
+ .setNegativeButton(android.R.string.cancel, null)
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ onCatRemove(mCats[holder.getAdapterPosition()]);
+ }
+ })
+ .show();
}
});
holder.share.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ setContextGroupVisible(holder, false);
Cat cat = mCats[holder.getAdapterPosition()];
if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
!= PackageManager.PERMISSION_GRANTED) {
@@ -227,7 +278,7 @@
return;
}
final File png = new File(dir, cat.getName().replaceAll("[/ #:]+", "_") + ".png");
- Bitmap bitmap = cat.createBitmap(512, 512);
+ Bitmap bitmap = cat.createBitmap(EXPORT_BITMAP_SIZE, EXPORT_BITMAP_SIZE);
if (bitmap != null) {
try {
OutputStream os = new FileOutputStream(png);
@@ -244,6 +295,7 @@
intent.putExtra(Intent.EXTRA_SUBJECT, cat.getName());
intent.setType("image/png");
startActivity(Intent.createChooser(intent, null));
+ cat.logShare(this);
} catch (IOException e) {
Log.e("NekoLand", "save: error: " + e);
}
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoService.java b/packages/EasterEgg/src/com/android/egg/neko/NekoService.java
index 1ee3851..32e3358 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoService.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoService.java
@@ -82,6 +82,7 @@
if (cats.size() == 0 || rng.nextFloat() <= new_cat_prob) {
cat = Cat.create(this);
prefs.addCat(cat);
+ cat.logAdd(this);
Log.v(TAG, "A new cat is here: " + cat.getName());
} else {
cat = cats.get(rng.nextInt(cats.size()));
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoTile.java b/packages/EasterEgg/src/com/android/egg/neko/NekoTile.java
index d5e143c..8a3ec8f 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoTile.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoTile.java
@@ -20,6 +20,7 @@
import android.util.Log;
import com.android.egg.neko.PrefState.PrefsListener;
+import com.android.internal.logging.MetricsLogger;
public class NekoTile extends TileService implements PrefsListener {
@@ -47,6 +48,18 @@
}
@Override
+ public void onTileAdded() {
+ super.onTileAdded();
+ MetricsLogger.count(this, "egg_neko_tile_added", 1);
+ }
+
+ @Override
+ public void onTileRemoved() {
+ super.onTileRemoved();
+ MetricsLogger.count(this, "egg_neko_tile_removed", 1);
+ }
+
+ @Override
public void onPrefsChanged() {
updateState();
}
@@ -65,6 +78,7 @@
public void onClick() {
if (mPrefs.getFoodState() != 0) {
// there's already food loaded, let's empty it
+ MetricsLogger.count(this, "egg_neko_empty_food", 1);
mPrefs.setFoodState(0);
NekoService.cancelJob(this);
} else {
@@ -91,6 +105,7 @@
private void showNekoDialog() {
Log.d(TAG, "showNekoDialog");
+ MetricsLogger.count(this, "egg_neko_select_food", 1);
showDialog(new NekoDialog(this));
}
}
diff --git a/packages/ExternalStorageProvider/AndroidManifest.xml b/packages/ExternalStorageProvider/AndroidManifest.xml
index 3185917..0b290ce 100644
--- a/packages/ExternalStorageProvider/AndroidManifest.xml
+++ b/packages/ExternalStorageProvider/AndroidManifest.xml
@@ -4,6 +4,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<application android:label="@string/app_label">
<provider
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 62f33bf..1341476 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -25,6 +25,7 @@
import android.database.MatrixCursor.RowBuilder;
import android.graphics.Point;
import android.net.Uri;
+import android.os.Binder;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Environment;
@@ -86,6 +87,7 @@
private static class RootInfo {
public String rootId;
+ public String volumeId;
public int flags;
public String title;
public String docId;
@@ -182,6 +184,7 @@
mRoots.put(rootId, root);
root.rootId = rootId;
+ root.volumeId = volume.id;
root.flags = Root.FLAG_LOCAL_ONLY
| Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD;
@@ -193,6 +196,10 @@
root.flags |= Root.FLAG_REMOVABLE_USB;
}
+ if (!VolumeInfo.ID_EMULATED_INTERNAL.equals(volume.getId())) {
+ root.flags |= Root.FLAG_SUPPORTS_EJECT;
+ }
+
if (volume.isPrimary()) {
// save off the primary volume for subsequent "Home" dir initialization.
primaryVolume = volume;
@@ -484,6 +491,8 @@
@Override
public void deleteDocument(String docId) throws FileNotFoundException {
final File file = getFileForDocId(docId);
+ final File visibleFile = getFileForDocId(docId, true);
+
final boolean isDirectory = file.isDirectory();
if (isDirectory) {
FileUtils.deleteContents(file);
@@ -492,23 +501,25 @@
throw new IllegalStateException("Failed to delete " + file);
}
- final ContentResolver resolver = getContext().getContentResolver();
- final Uri externalUri = MediaStore.Files.getContentUri("external");
+ if (visibleFile != null) {
+ final ContentResolver resolver = getContext().getContentResolver();
+ final Uri externalUri = MediaStore.Files.getContentUri("external");
- // Remove media store entries for any files inside this directory, using
- // path prefix match. Logic borrowed from MtpDatabase.
- if (isDirectory) {
- final String path = file.getAbsolutePath() + "/";
+ // Remove media store entries for any files inside this directory, using
+ // path prefix match. Logic borrowed from MtpDatabase.
+ if (isDirectory) {
+ final String path = visibleFile.getAbsolutePath() + "/";
+ resolver.delete(externalUri,
+ "_data LIKE ?1 AND lower(substr(_data,1,?2))=lower(?3)",
+ new String[] { path + "%", Integer.toString(path.length()), path });
+ }
+
+ // Remove media store entry for this exact file.
+ final String path = visibleFile.getAbsolutePath();
resolver.delete(externalUri,
- "_data LIKE ?1 AND lower(substr(_data,1,?2))=lower(?3)",
- new String[] { path + "%", Integer.toString(path.length()), path });
+ "_data LIKE ?1 AND lower(_data)=lower(?2)",
+ new String[] { path, path });
}
-
- // Remove media store entry for this exact file.
- final String path = file.getAbsolutePath();
- resolver.delete(externalUri,
- "_data LIKE ?1 AND lower(_data)=lower(?2)",
- new String[] { path, path });
}
@Override
@@ -584,6 +595,24 @@
}
@Override
+ public boolean ejectRoot(String rootId) {
+ final long token = Binder.clearCallingIdentity();
+ boolean ejected = false;
+ RootInfo root = mRoots.get(rootId);
+ if (root != null) {
+ try {
+ mStorageManager.unmount(root.volumeId);
+ ejected = true;
+ } catch (RuntimeException e) {
+ Log.w(TAG, "Root '" + root.title + "' could not be ejected");
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+ return ejected;
+ }
+
+ @Override
public String getDocumentType(String documentId) throws FileNotFoundException {
if (mArchiveHelper.isArchivedDocument(documentId)) {
return mArchiveHelper.getDocumentType(documentId);
diff --git a/packages/Keyguard/Android.mk b/packages/Keyguard/Android.mk
index 9083212..f9e2686 100644
--- a/packages/Keyguard/Android.mk
+++ b/packages/Keyguard/Android.mk
@@ -16,6 +16,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)
LOCAL_MODULE := Keyguard
@@ -30,6 +32,8 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_JAR_EXCLUDE_FILES := none
+
include $(BUILD_STATIC_JAVA_LIBRARY)
#include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Keyguard/res/values-my-rMM/dimens.xml b/packages/Keyguard/res/values-my-rMM/dimens.xml
new file mode 100644
index 0000000..21b2a46
--- /dev/null
+++ b/packages/Keyguard/res/values-my-rMM/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources>
+ <dimen name="bottom_text_spacing_digital">4dp</dimen>
+</resources>
diff --git a/packages/Keyguard/res/values-my-rMM/strings.xml b/packages/Keyguard/res/values-my-rMM/strings.xml
index 5db7e95..fd800e4 100644
--- a/packages/Keyguard/res/values-my-rMM/strings.xml
+++ b/packages/Keyguard/res/values-my-rMM/strings.xml
@@ -55,7 +55,7 @@
<string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"SIM PIN နေရာ"</string>
<string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"SIM PUK နေရာ"</string>
<string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"<xliff:g id="ALARM">%1$s</xliff:g> အတွက် နောက် သတိပေးရန် သတ်မှတ်ချက်"</string>
- <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်ခလုတ်"</string>
+ <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်"</string>
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enterခလုတ်"</string>
<string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"ပုံဖော်မှုအား မေ့လျော့ခြင်း"</string>
<string name="kg_wrong_pattern" msgid="1850806070801358830">"ပုံဆွဲအမှား"</string>
diff --git a/packages/Keyguard/res/values-uz-rUZ/strings.xml b/packages/Keyguard/res/values-uz-rUZ/strings.xml
index 84416f2..ad71a56 100644
--- a/packages/Keyguard/res/values-uz-rUZ/strings.xml
+++ b/packages/Keyguard/res/values-uz-rUZ/strings.xml
@@ -54,7 +54,7 @@
<string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"PIN-kod maydoni"</string>
<string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"SIM karta PIN kodi maydoni"</string>
<string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"SIM karta PUK kodi maydoni"</string>
- <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"Uyg‘otkich signali <xliff:g id="ALARM">%1$s</xliff:g> da chalinadi."</string>
+ <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"Signal <xliff:g id="ALARM">%1$s</xliff:g> da chalinadi."</string>
<string name="keyboardview_keycode_delete" msgid="3337914833206635744">"O‘chirish"</string>
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Kiritish"</string>
<string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Grafik kalit esimdan chiqdi"</string>
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
index cca9163..766eab7 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
@@ -137,12 +137,21 @@
entry,
userId,
new LockPatternChecker.OnCheckCallback() {
+
+ @Override
+ public void onEarlyMatched() {
+ onPasswordChecked(userId, true /* matched */, 0 /* timeoutMs */,
+ true /* isValidPassword */);
+ }
+
@Override
public void onChecked(boolean matched, int timeoutMs) {
setPasswordEntryInputEnabled(true);
mPendingLockCheck = null;
- onPasswordChecked(userId, matched, timeoutMs,
- true /* isValidPassword */);
+ if (!matched) {
+ onPasswordChecked(userId, false /* matched */, timeoutMs,
+ true /* isValidPassword */);
+ }
}
});
}
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
index 7ea767c..4f5152a 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
@@ -36,6 +36,7 @@
private final AppearAnimationUtils mAppearAnimationUtils;
private final DisappearAnimationUtils mDisappearAnimationUtils;
+ private final DisappearAnimationUtils mDisappearAnimationUtilsLocked;
private ViewGroup mContainer;
private ViewGroup mRow0;
private ViewGroup mRow1;
@@ -44,6 +45,7 @@
private View mDivider;
private int mDisappearYTranslation;
private View[][] mViews;
+ private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
public KeyguardPINView(Context context) {
this(context, null);
@@ -56,8 +58,14 @@
125, 0.6f /* translationScale */,
0.45f /* delayScale */, AnimationUtils.loadInterpolator(
mContext, android.R.interpolator.fast_out_linear_in));
+ mDisappearAnimationUtilsLocked = new DisappearAnimationUtils(context,
+ (long) (125 * KeyguardPatternView.DISAPPEAR_MULTIPLIER_LOCKED),
+ 0.6f /* translationScale */,
+ 0.45f /* delayScale */, AnimationUtils.loadInterpolator(
+ mContext, android.R.interpolator.fast_out_linear_in));
mDisappearYTranslation = getResources().getDimensionPixelSize(
R.dimen.disappear_y_translation);
+ mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(context);
}
@Override
@@ -136,7 +144,10 @@
setTranslationY(0);
AppearAnimationUtils.startTranslationYAnimation(this, 0 /* delay */, 280 /* duration */,
mDisappearYTranslation, mDisappearAnimationUtils.getInterpolator());
- mDisappearAnimationUtils.startAnimation2d(mViews,
+ DisappearAnimationUtils disappearAnimationUtils = mKeyguardUpdateMonitor.isUserUnlocked()
+ ? mDisappearAnimationUtils
+ : mDisappearAnimationUtilsLocked;
+ disappearAnimationUtils.startAnimation2d(mViews,
new Runnable() {
@Override
public void run() {
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
index 23015b5..69eb538 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
@@ -55,9 +55,13 @@
// how many cells the user has to cross before we poke the wakelock
private static final int MIN_PATTERN_BEFORE_POKE_WAKELOCK = 2;
+ // How much we scale up the duration of the disappear animation when the current user is locked
+ public static final float DISAPPEAR_MULTIPLIER_LOCKED = 1.5f;
+
private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
private final AppearAnimationUtils mAppearAnimationUtils;
private final DisappearAnimationUtils mDisappearAnimationUtils;
+ private final DisappearAnimationUtils mDisappearAnimationUtilsLocked;
private CountDownTimer mCountdownTimer = null;
private LockPatternUtils mLockPatternUtils;
@@ -109,6 +113,10 @@
125, 1.2f /* translationScale */,
0.6f /* delayScale */, AnimationUtils.loadInterpolator(
mContext, android.R.interpolator.fast_out_linear_in));
+ mDisappearAnimationUtilsLocked = new DisappearAnimationUtils(context,
+ (long) (125 * DISAPPEAR_MULTIPLIER_LOCKED), 1.2f /* translationScale */,
+ 0.6f /* delayScale */, AnimationUtils.loadInterpolator(
+ mContext, android.R.interpolator.fast_out_linear_in));
mDisappearYTranslation = getResources().getDimensionPixelSize(
R.dimen.disappear_y_translation);
}
@@ -239,11 +247,21 @@
pattern,
userId,
new LockPatternChecker.OnCheckCallback() {
+
+ @Override
+ public void onEarlyMatched() {
+ onPatternChecked(userId, true /* matched */, 0 /* timeoutMs */,
+ true /* isValidPattern */);
+ }
+
@Override
public void onChecked(boolean matched, int timeoutMs) {
mLockPatternView.enableInput();
mPendingLockCheck = null;
- onPatternChecked(userId, matched, timeoutMs, true);
+ if (!matched) {
+ onPatternChecked(userId, false /* matched */, timeoutMs,
+ true /* isValidPattern */);
+ }
}
});
if (pattern.size() > MIN_PATTERN_BEFORE_POKE_WAKELOCK) {
@@ -390,25 +408,30 @@
@Override
public boolean startDisappearAnimation(final Runnable finishRunnable) {
+ float durationMultiplier = mKeyguardUpdateMonitor.isUserUnlocked()
+ ? 1f
+ : DISAPPEAR_MULTIPLIER_LOCKED;
mLockPatternView.clearPattern();
enableClipping(false);
setTranslationY(0);
- AppearAnimationUtils.startTranslationYAnimation(this, 0 /* delay */, 300 /* duration */,
+ AppearAnimationUtils.startTranslationYAnimation(this, 0 /* delay */,
+ (long) (300 * durationMultiplier),
-mDisappearAnimationUtils.getStartTranslation(),
mDisappearAnimationUtils.getInterpolator());
- mDisappearAnimationUtils.startAnimation2d(mLockPatternView.getCellStates(),
- new Runnable() {
- @Override
- public void run() {
- enableClipping(true);
- if (finishRunnable != null) {
- finishRunnable.run();
- }
+
+ DisappearAnimationUtils disappearAnimationUtils = mKeyguardUpdateMonitor.isUserUnlocked()
+ ? mDisappearAnimationUtils
+ : mDisappearAnimationUtilsLocked;
+ disappearAnimationUtils.startAnimation2d(mLockPatternView.getCellStates(),
+ () -> {
+ enableClipping(true);
+ if (finishRunnable != null) {
+ finishRunnable.run();
}
}, KeyguardPatternView.this);
if (!TextUtils.isEmpty(mSecurityMessageDisplay.getText())) {
mDisappearAnimationUtils.createAnimation(mSecurityMessageDisplay, 0,
- 200,
+ (long) (200 * durationMultiplier),
- mDisappearAnimationUtils.getStartTranslation() * 3,
false /* appearing */,
mDisappearAnimationUtils.getInterpolator(),
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
index 9d1df26..e1657c7 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
@@ -127,6 +127,11 @@
super.onConfigurationChanged(newConfig);
mClockView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimensionPixelSize(R.dimen.widget_big_font_size));
+ // Some layouts like burmese have a different margin for the clock
+ MarginLayoutParams layoutParams = (MarginLayoutParams) mClockView.getLayoutParams();
+ layoutParams.bottomMargin = getResources().getDimensionPixelSize(
+ R.dimen.bottom_text_spacing_digital);
+ mClockView.setLayoutParams(layoutParams);
mDateView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimensionPixelSize(R.dimen.widget_label_font_size));
mOwnerInfo.setTextSize(TypedValue.COMPLEX_UNIT_PX,
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 94d9550..1b83ccd 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -16,6 +16,16 @@
package com.android.keyguard;
+import static android.os.BatteryManager.BATTERY_HEALTH_UNKNOWN;
+import static android.os.BatteryManager.BATTERY_STATUS_FULL;
+import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
+import static android.os.BatteryManager.EXTRA_HEALTH;
+import static android.os.BatteryManager.EXTRA_LEVEL;
+import static android.os.BatteryManager.EXTRA_MAX_CHARGING_CURRENT;
+import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;
+import static android.os.BatteryManager.EXTRA_PLUGGED;
+import static android.os.BatteryManager.EXTRA_STATUS;
+
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.AlarmManager;
@@ -29,7 +39,6 @@
import android.content.IntentFilter;
import android.database.ContentObserver;
import android.graphics.Bitmap;
-import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
@@ -41,7 +50,9 @@
import android.os.Message;
import android.os.RemoteException;
import android.os.SystemClock;
+import android.os.Trace;
import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.Settings;
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
@@ -69,16 +80,6 @@
import java.util.List;
import java.util.Map.Entry;
-import static android.os.BatteryManager.BATTERY_HEALTH_UNKNOWN;
-import static android.os.BatteryManager.BATTERY_STATUS_FULL;
-import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
-import static android.os.BatteryManager.EXTRA_HEALTH;
-import static android.os.BatteryManager.EXTRA_LEVEL;
-import static android.os.BatteryManager.EXTRA_MAX_CHARGING_CURRENT;
-import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;
-import static android.os.BatteryManager.EXTRA_PLUGGED;
-import static android.os.BatteryManager.EXTRA_STATUS;
-
/**
* Watches for updates that may be interesting to the keyguard, and provides
* the up to date information as well as a registration for callbacks that care
@@ -176,6 +177,7 @@
private boolean mGoingToSleep;
private boolean mBouncer;
private boolean mBootCompleted;
+ private boolean mUserUnlocked;
// Device provisioning state
private boolean mDeviceProvisioned;
@@ -202,6 +204,7 @@
private AlarmManager mAlarmManager;
private List<SubscriptionInfo> mSubscriptionInfo;
private TrustManager mTrustManager;
+ private UserManager mUserManager;
private int mFingerprintRunningState = FINGERPRINT_STATE_STOPPED;
private final Handler mHandler = new Handler() {
@@ -257,10 +260,14 @@
handleFinishedGoingToSleep(msg.arg1);
break;
case MSG_STARTED_WAKING_UP:
+ Trace.beginSection("KeyguardUpdateMonitor#handler MSG_STARTED_WAKING_UP");
handleStartedWakingUp();
+ Trace.endSection();
break;
case MSG_FACE_UNLOCK_STATE_CHANGED:
+ Trace.beginSection("KeyguardUpdateMonitor#handler MSG_FACE_UNLOCK_STATE_CHANGED");
handleFaceUnlockStateChanged(msg.arg1 != 0, msg.arg2);
+ Trace.endSection();
break;
case MSG_SIM_SUBSCRIPTION_INFO_CHANGED:
handleSimSubscriptionInfoChanged();
@@ -275,7 +282,9 @@
handleScreenTurnedOn();
break;
case MSG_SCREEN_TURNED_OFF:
+ Trace.beginSection("KeyguardUpdateMonitor#handler MSG_SCREEN_TURNED_ON");
handleScreenTurnedOff();
+ Trace.endSection();
break;
}
}
@@ -397,6 +406,7 @@
}
private void onFingerprintAuthenticated(int userId) {
+ Trace.beginSection("KeyGuardUpdateMonitor#onFingerPrintAuthenticated");
mUserFingerprintAuthenticated.put(userId, true);
// If fingerprint unlocking is allowed, this event will lead to a Keyguard dismiss or to a
@@ -409,6 +419,7 @@
cb.onFingerprintAuthenticated(userId);
}
}
+ Trace.endSection();
}
private void handleFingerprintAuthFailed() {
@@ -434,6 +445,7 @@
}
private void handleFingerprintAuthenticated() {
+ Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated");
try {
final int userId;
try {
@@ -450,6 +462,7 @@
} finally {
setFingerprintRunningState(FINGERPRINT_STATE_STOPPED);
}
+ Trace.endSection();
}
private void handleFingerprintHelp(int msgId, String helpString) {
@@ -554,6 +567,10 @@
&& !hasFingerprintUnlockTimedOut(sCurrentUser);
}
+ public boolean isUserUnlocked() {
+ return mUserUnlocked;
+ }
+
public StrongAuthTracker getStrongAuthTracker() {
return mStrongAuthTracker;
}
@@ -684,8 +701,10 @@
mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_INFO_CHANGED,
intent.getIntExtra(Intent.EXTRA_USER_HANDLE, getSendingUserId()), 0));
} else if (ACTION_FACE_UNLOCK_STARTED.equals(action)) {
+ Trace.beginSection("KeyguardUpdateMonitor.mBroadcastAllReceiver#onReceive ACTION_FACE_UNLOCK_STARTED");
mHandler.sendMessage(mHandler.obtainMessage(MSG_FACE_UNLOCK_STATE_CHANGED, 1,
getSendingUserId()));
+ Trace.endSection();
} else if (ACTION_FACE_UNLOCK_STOPPED.equals(action)) {
mHandler.sendMessage(mHandler.obtainMessage(MSG_FACE_UNLOCK_STATE_CHANGED, 0,
getSendingUserId()));
@@ -725,7 +744,9 @@
@Override
public void onAuthenticationSucceeded(AuthenticationResult result) {
+ Trace.beginSection("KeyguardUpdateMonitor#onAuthenticationSucceeded");
handleFingerprintAuthenticated();
+ Trace.endSection();
}
@Override
@@ -900,6 +921,7 @@
}
protected void handleStartedWakingUp() {
+ Trace.beginSection("KeyguardUpdateMonitor#handleStartedWakingUp");
updateFingerprintListeningState();
final int count = mCallbacks.size();
for (int i = 0; i < count; i++) {
@@ -908,6 +930,7 @@
cb.onStartedWakingUp();
}
}
+ Trace.endSection();
}
protected void handleStartedGoingToSleep(int arg1) {
@@ -1058,6 +1081,8 @@
if (mFpm != null) {
mFpm.addLockoutResetCallback(mLockoutResetCallback);
}
+
+ mUserManager = context.getSystemService(UserManager.class);
}
private void updateFingerprintListeningState() {
@@ -1390,6 +1415,7 @@
private void handleKeyguardReset() {
if (DEBUG) Log.d(TAG, "handleKeyguardReset");
updateFingerprintListeningState();
+ mUserUnlocked = mUserManager.isUserUnlocked(getCurrentUser());
}
/**
diff --git a/packages/Keyguard/src/com/android/keyguard/NumPadKey.java b/packages/Keyguard/src/com/android/keyguard/NumPadKey.java
index 2ff7e12..1518bdc 100644
--- a/packages/Keyguard/src/com/android/keyguard/NumPadKey.java
+++ b/packages/Keyguard/src/com/android/keyguard/NumPadKey.java
@@ -23,6 +23,7 @@
import android.util.AttributeSet;
import android.view.HapticFeedbackConstants;
import android.view.LayoutInflater;
+import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
@@ -53,8 +54,7 @@
if (mTextView != null && mTextView.isEnabled()) {
mTextView.append(Character.forDigit(mDigit, 10));
}
- userActivity();
- doHapticKeyClick();
+ userActivity();;
}
};
@@ -126,6 +126,14 @@
}
@Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+ doHapticKeyClick();
+ }
+ return super.onTouchEvent(event);
+ }
+
+ @Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
diff --git a/packages/Keyguard/test/Android.mk b/packages/Keyguard/test/Android.mk
index 15059c6..54224b7 100644
--- a/packages/Keyguard/test/Android.mk
+++ b/packages/Keyguard/test/Android.mk
@@ -16,6 +16,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := KeyguardTest
diff --git a/packages/Keyguard/test/SampleTrustAgent/Android.mk b/packages/Keyguard/test/SampleTrustAgent/Android.mk
index 2a18ee1..6ffb018 100644
--- a/packages/Keyguard/test/SampleTrustAgent/Android.mk
+++ b/packages/Keyguard/test/SampleTrustAgent/Android.mk
@@ -16,6 +16,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := SampleTrustAgent
@@ -27,6 +29,6 @@
# LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
include $(BUILD_PACKAGE)
diff --git a/packages/MtpDocumentsProvider/res/values-am/strings.xml b/packages/MtpDocumentsProvider/res/values-am/strings.xml
new file mode 100644
index 0000000..7b721c8
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-am/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"የMTP አስተናጋጅ"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"የወረዱ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"ፋይሎችን ከ<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> በመድረስ ላይ"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"ሌላኛው መሣሪያ ሥራ በዝቶበታል። እስከሚገኝ ድረስ ፋይሎችን ማስተላለፍ አይችሉም።"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ምንም ፋይሎች አልተገኙም። ሌላኛው መሣሪያ ተቆልፎ ሊሆን ይችላል። ተቆልፎ ከሆነ ይክፈቱት እና እንደገና ይሞክሩ።"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ar/strings.xml b/packages/MtpDocumentsProvider/res/values-ar/strings.xml
new file mode 100644
index 0000000..284a860
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ar/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"مضيف بروتوكول نقل الوسائط (MTP)"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"التنزيلات"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"جارٍ الوصول إلى الملفات من <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"الجهاز الآخر مشغول، ولا يمكنك نقل الملفات إلا بعد أن يصبح متاحًا."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"لم يتم العثور على ملفات، وربما يكون الجهاز الآخر في وضع القفل. إذا كان الأمر كذلك، فعليك إلغاء قفله وإعادة المحاولة."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-az-rAZ/strings.xml b/packages/MtpDocumentsProvider/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..e8ed124
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-az-rAZ/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Endirmələr"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Fayllara <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> cihazından daxil olunur"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Digər cihaz məşğuldur. Əlçatan olmayana kimi fayl köçürə bilməzsiniz."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Fayl tapılmadı. Digər cihaz kilidlənmiş ola bilər. Elədirsə, kiliddən çıxarın və yenidən cəhd edin."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-b+sr+Latn/strings.xml b/packages/MtpDocumentsProvider/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..bc900996
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Preuzimanja"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Pristup datotekama sa uređaja <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Drugi uređaj je zauzet. Datoteke možete da prenesete tek kad on postane dostupan."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nije pronađena nijedna datoteka. Drugi uređaj je možda zaključan. Ako jeste, otključajte ga i pokušajte ponovo."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-be-rBY/strings.xml b/packages/MtpDocumentsProvider/res/values-be-rBY/strings.xml
new file mode 100644
index 0000000..f6263ac
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-be-rBY/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Вузел MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Спампоўкі"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Доступ да файлаў з <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Іншая прылада занята. Вы не можаце перадаць файлы, пакуль яна не стане даступнай."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Файлы не знойдзены. Іншая прылада можа быць заблакіравана. Калі гэта так, разблакіруйце яе і паўтарыце спробу."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-bg/strings.xml b/packages/MtpDocumentsProvider/res/values-bg/strings.xml
new file mode 100644
index 0000000..52d3119
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-bg/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP хост"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Изтегляния"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> на <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"От <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> се осъществява достъп до файловете"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Другото устройство е заето. Не можете да прехвърляте файлове, докато то не се освободи."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Няма намерени файлове. Другото устройство може да е заключено. Ако е така, отключете го и опитайте отново."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-bn-rBD/strings.xml b/packages/MtpDocumentsProvider/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000..7fad89e
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-bn-rBD/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP হোস্ট"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ডাউনলোডগুলি"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> থেকে ফাইলগুলিকে অ্যাক্সেস করা হচ্ছে"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"অন্য ডিভাইসটি ব্যস্ত আছে৷ এটি উপলব্ধ না হওয়া পর্যন্ত আপনি ফাইলগুলিকে স্থানান্তর করতে পারবেন না৷"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"কোনো ফাইল পাওয়া যায়নি৷ অন্য ডিভাইসটি লক থাকতে পারে৷ যদি তাই হয়, তাহলে এটিকে আনলক করে আবার চেষ্টা করুন৷"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-bs-rBA/strings.xml b/packages/MtpDocumentsProvider/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..33323f8
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-bs-rBA/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Preuzimanja"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Pristupanje datotekama iz uređaja <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Drugi uređaj je zauzet. Nećete moći prenositi fajlove dok ne bude dostupan."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Fajlovi nisu pronađeni. Moguće je da je drugi uređaj zaključan. Ako jeste, otključajte ga i pokušajte ponovo."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ca/strings.xml b/packages/MtpDocumentsProvider/res/values-ca/strings.xml
new file mode 100644
index 0000000..b2aa599
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ca/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Amfitrió MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Baixades"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> de <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"S\'està accedint als fitxers del dispositiu <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"L\'altre dispositiu està ocupat. No pots transferir fitxers fins que estigui disponible."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No s\'han trobat fitxers. És possible que l\'altre dispositiu estigui bloquejat. Si és així, desbloqueja\'l i torna-ho a provar."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-cs/strings.xml b/packages/MtpDocumentsProvider/res/values-cs/strings.xml
new file mode 100644
index 0000000..2156e8c
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-cs/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Hostitel MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Stahování"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> – <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Používání souborů ze zařízení <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Druhé zařízení je zaneprázdněné. Dokud nebude dostupné, soubory nelze přenést."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nebyly nalezeny žádné soubory. Druhé zařízení je možná uzamčené. Pokud ano, odemkněte jej a zkuste to znovu."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-da/strings.xml b/packages/MtpDocumentsProvider/res/values-da/strings.xml
new file mode 100644
index 0000000..b82c5e8
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-da/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Adgang til filer fra <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Den anden enhed er optaget. Du kan ikke overføre filer, før den er tilgængelig."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Der blev ikke fundet nogen filer. Den anden enhed er muligvis låst. Hvis dette er tilfældet, skal du låse den op og prøve igen."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-de/strings.xml b/packages/MtpDocumentsProvider/res/values-de/strings.xml
new file mode 100644
index 0000000..9a71c76
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-de/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> von <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Zugriff auf Dateien von <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Das andere Gerät ist nicht verfügbar. Du kannst die Dateien übertragen, sobald das Gerät wieder verfügbar ist."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Keine Dateien gefunden. Das andere Gerät ist möglicherweise gesperrt. Entsperre es in diesem Fall und versuche es noch einmal."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-el/strings.xml b/packages/MtpDocumentsProvider/res/values-el/strings.xml
new file mode 100644
index 0000000..562d295
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-el/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Κεντρικός υπολογιστής MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Λήψεις"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Πρόσβαση στα αρχεία από τη συσκευή <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Η άλλη συσκευή είναι απασχολημένη. Δεν μπορείτε να μεταφέρετε αρχεία μέχρι να γίνει διαθέσιμη."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Δεν βρέθηκαν αρχεία. Η άλλη συσκευή ενδέχεται να είναι κλειδωμένη. Εάν ισχύει αυτό, ξεκλειδώστε την και δοκιμάστε ξανά."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-en-rAU/strings.xml b/packages/MtpDocumentsProvider/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..5f2167e
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-en-rAU/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accessing files from <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"The other device is busy. You can\'t transfer files until it\'s available."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No files found. The other device may be locked. If so, unlock it and try again."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-en-rGB/strings.xml b/packages/MtpDocumentsProvider/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..5f2167e
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-en-rGB/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accessing files from <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"The other device is busy. You can\'t transfer files until it\'s available."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No files found. The other device may be locked. If so, unlock it and try again."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-en-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..5f2167e
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-en-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accessing files from <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"The other device is busy. You can\'t transfer files until it\'s available."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No files found. The other device may be locked. If so, unlock it and try again."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-es-rUS/strings.xml b/packages/MtpDocumentsProvider/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..740d224
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-es-rUS/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Descargas"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accediendo a los archivos de <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"El otro dispositivo está ocupado. No podrás transferir archivos hasta que esté disponible."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No se encontraron archivos. Es posible que el otro dispositivo esté bloqueado. Si es así, desbloquéalo y vuelve a intentarlo."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-es/strings.xml b/packages/MtpDocumentsProvider/res/values-es/strings.xml
new file mode 100644
index 0000000..d80a75a
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-es/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host de MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Descargas"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> de <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accediendo a los archivos desde <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"El otro dispositivo está ocupado. No se pueden transferir archivos hasta que esté disponible."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No se ha encontrado ningún archivo. Es posible que el otro dispositivo esté bloqueado. Si es así, desbloquéalo y vuelve a intentarlo."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-et-rEE/strings.xml b/packages/MtpDocumentsProvider/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..7568777
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-et-rEE/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Allalaadimised"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>, <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Juurdepääsemine failidele seadmest <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Teine seade on hõivatud. Te ei saa faile üle viia enne, kui see seade on saadaval."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Faile ei leitud. Teine seade võib olla lukustatud. Kui see on nii, avage see ja proovige uuesti."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-eu-rES/strings.xml b/packages/MtpDocumentsProvider/res/values-eu-rES/strings.xml
new file mode 100644
index 0000000..dc9d463
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-eu-rES/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ostalaria"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Deskargak"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> gailuko fitxategiak atzitzen"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Beste gailua lanpetuta dago. Erabilgarri egon arte ezingo duzu transferitu fitxategirik."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Ez da aurkitu fitxategirik. Baliteke beste gailua blokeatuta egotea. Hala bada, desblokea ezazu eta saiatu berriro."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-fa/strings.xml b/packages/MtpDocumentsProvider/res/values-fa/strings.xml
new file mode 100644
index 0000000..9ac58c7
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-fa/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"میزبان MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"بارگیریها"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"دسترسی به فایلها از <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"دستگاه دیگر مشغول است. تا زمانی که این دستگاه دردسترس قرار نگیرد نمیتوانید فایلها را منتقل کنید."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"فایلی پیدا نشد. دستگاه دیگر ممکن است قفل باشد. اگر اینطور است، قفل آن را باز کنید و دوباره تلاش کنید."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-fi/strings.xml b/packages/MtpDocumentsProvider/res/values-fi/strings.xml
new file mode 100644
index 0000000..0a61d08
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-fi/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-isäntä"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Lataukset"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Käytetään laitteen <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> tiedostoja"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Toinen laite on varattu. Et voi siirtää tiedostoja, ennen kuin se on käytettävissä."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Tiedostoja ei löytynyt. Toinen laite voi olla lukittu. Jos näin on, avaa se ja yritä uudelleen."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-fr-rCA/strings.xml b/packages/MtpDocumentsProvider/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..281760e
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-fr-rCA/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Hôte MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Téléchargements"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accès aux fichiers à partir de l\'appareil <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"L\'autre appareil est occupé. Vous devez attendre qu\'il soit disponible pour transférer des fichiers."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Aucun fichier trouvé. L\'autre appareil est peut-être verrouillé. Si c\'est le cas, déverrouillez-le, puis réessayez."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-fr/strings.xml b/packages/MtpDocumentsProvider/res/values-fr/strings.xml
new file mode 100644
index 0000000..96c713b
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-fr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Hôte MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Téléchargements"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> – <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accès aux fichiers depuis le <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>…"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"L\'autre appareil est occupé. Vous devez attendre qu\'il soit disponible pour transférer des fichiers."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Aucun fichier trouvé. L\'autre appareil est peut-être verrouillé. Si tel est le cas, déverrouillez-le, puis réessayez."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-gl-rES/strings.xml b/packages/MtpDocumentsProvider/res/values-gl-rES/strings.xml
new file mode 100644
index 0000000..54bf4a9
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-gl-rES/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Descargas"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> de <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accedendo aos ficheiros de <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"O outro dispositivo está ocupado. Non podes transferir ficheiros ata que estea dispoñible."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Non se atopou ningún ficheiro. Se o outro dispositivo está bloqueado, desbloquéao e téntao de novo."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-gu-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..40ec38d
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-gu-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP હોસ્ટ"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ડાઉનલોડ્સ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> ની ફાઇલોને ઍક્સેસ કરી રહ્યાં છે"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"અન્ય ઉપકરણ વ્યસ્ત છે. તે ઉપલબ્ધ ન થાય ત્યાં સુધી તમે ફાઇલોને સ્થાનાંતરિત કરી શકતાં નથી."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"કોઈ ફાઇલો મળી નહીં. અન્ય ઉપકરણ લૉક કરેલ હોઈ શકે છે. જો આમ હોય, તો તેને અનલૉક કરો અને ફરી પ્રયાસ કરો."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-hi/strings.xml b/packages/MtpDocumentsProvider/res/values-hi/strings.xml
new file mode 100644
index 0000000..1cf1c03
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-hi/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP होस्ट"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"डाउनलोड"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> से फ़ाइलें एक्सेस कर रहा है"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"दूसरा डिवाइस व्यस्त है. आप उसके उपलब्ध हो जाने तक फ़ाइलें स्थानांतरित नहीं कर सकते हैं."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"कोई फ़ाइल नहीं मिली. हो सकता है कि दूसरा डिवाइस लॉक हो. यदि ऐसा है, तो उसे अनलॉक करें और पुन: प्रयास करें."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-hr/strings.xml b/packages/MtpDocumentsProvider/res/values-hr/strings.xml
new file mode 100644
index 0000000..63fc5c7
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-hr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Preuzimanja"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g><xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Pristupanje datotekama s uređaja <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Drugi je uređaj zauzet. Datoteke ćete moći prenijeti kada postane dostupan."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Datoteke nisu pronađene. Drugi je uređaj možda zaključan. U tom ga slučaju otključajte i pokušajte ponovo."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-hu/strings.xml b/packages/MtpDocumentsProvider/res/values-hu/strings.xml
new file mode 100644
index 0000000..e5b822c
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-hu/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Letöltések"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Hozzáférés a fájlokhoz a következő eszközről: <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"A másik eszköz elfoglalt. Nem vihetők át fájlok addig, amíg rendelkezésre nem áll."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nem található fájl. Lehet, hogy a másik eszköz zárolva van. Ha igen, oldja fel, és próbálkozzon újra."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-hy-rAM/strings.xml b/packages/MtpDocumentsProvider/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..3a6bfb5
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-hy-rAM/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP խնամորդ"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Ներբեռնումներ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Մուտք է գործում ֆայլեր <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> սարքից"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Մյուս սարքը զբաղված է: Ֆայլերը կարող եք փոխանցել միայն երբ այն հասանելի է:"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Ֆայլեր չեն գտնվել: Հնարավոր է, որ մյուս սարքը կողպված է: Եթե դա այդպես է, ապակողպեք այն և փորձեք նորից:"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-in/strings.xml b/packages/MtpDocumentsProvider/res/values-in/strings.xml
new file mode 100644
index 0000000..905daec
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-in/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Unduhan"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Mengakses file dari <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Perangkat lainnya sedang sibuk. Anda dapat mentransfer file jika telah tersedia."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"File tidak ditemukan. Perangkat lainnya mungkin terkunci. Jika begitu, buka kuncinya dan coba lagi."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-is-rIS/strings.xml b/packages/MtpDocumentsProvider/res/values-is-rIS/strings.xml
new file mode 100644
index 0000000..9388f7e
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-is-rIS/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-hýsill"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Niðurhal"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Fær aðgang að skrám frá <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Hitt tækið er upptekið. Þú getur ekki fært skrár fyrr en það er tiltækt."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Engar skrár fundust. Hitt tækið gæti verið læst. Ef svo er skaltu opna það og reyna aftur."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-it/strings.xml b/packages/MtpDocumentsProvider/res/values-it/strings.xml
new file mode 100644
index 0000000..a41699f
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-it/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Download"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> di <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accesso ai file da <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"L\'altro dispositivo è occupato. I file non possono essere trasferiti fino a quando non sarà disponibile."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nessun file trovato. L\'altro dispositivo potrebbe essere bloccato. In questo caso, sbloccalo e riprova."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-iw/strings.xml b/packages/MtpDocumentsProvider/res/values-iw/strings.xml
new file mode 100644
index 0000000..62dfe7d
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-iw/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"מארח פרוטוקול העברת מדיה (MTP)"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"הורדות"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"גישה לקבצים מ-<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"המכשיר השני לא פנוי. ניתן יהיה להעביר קבצים רק לאחר שהוא יהיה זמין."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"לא נמצאו קבצים. ייתכן שהמכשיר השני נעול. אם כן, פתח אותו ונסה שוב."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ja/strings.xml b/packages/MtpDocumentsProvider/res/values-ja/strings.xml
new file mode 100644
index 0000000..4ae59f5
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ja/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ホスト"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ダウンロード"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> からファイルにアクセスしています"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"接続先の端末は使用中のため、利用できるようになるまでファイルを転送できません。"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ファイルが見つかりません。接続先の端末がロックされている可能性があります。その場合は、ロックを解除してからもう一度お試しください。"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ka-rGE/strings.xml b/packages/MtpDocumentsProvider/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..33812df
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ka-rGE/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ჰოსტი"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ჩამოტვირთვები"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"მიმდინარეობს <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>-ზე არსებულ ფაილებზე წვდომა"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"სხვა მოწყობილობა დაკავებულია. ფაილების გადატანა ვერ მოხერხდება, სანამ ის ხელმისაწვდომი არ გახდება."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ფაილები ვერ მოიძებნა. მეორე მოწყობილობა შეიძლება დაბლოკილი იყოს. ამ შემთხვევაში, განბლოკეთ ის და ცადეთ ხელახლა."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-kk-rKZ/strings.xml b/packages/MtpDocumentsProvider/res/values-kk-rKZ/strings.xml
new file mode 100644
index 0000000..a6dea5b
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-kk-rKZ/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP хосты"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Жүктеп алынғандар"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Файлдарға <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> құрылғысынан кіру"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Екінші құрылғы бос емес. Ол босамайынша, файлдар тасымалданбайды."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Ешқандай файл табылмады. Екінші құрылғы құлыптаулы болуы мүмкін. Құлыптаулы болса, құлпын ашып, қайталап көріңіз."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-km-rKH/strings.xml b/packages/MtpDocumentsProvider/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..baffa95
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-km-rKH/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"ម៉ាស៊ីន MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ដោយឡូត"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"កំពុងចូលដំណើរការពី <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"ឧបករណ៍ផ្សេងទៀតកំពុងជាប់រវល់។ អ្នកមិនផ្ទេរឯកសារបានទេ រហូតទាល់តែវាអាចប្រើបាន។"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"រកមិនឃើញឯកសារទេ។ ឧបករណ៍ផ្សេងទៀតប្រហែលជាត្រូវបានចាក់សោ។ ប្រសិនបើវាត្រូវបានចាក់សោមែន សូមដោះសោ ហើយព្យាយាមម្តងទៀត។"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-kn-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-kn-rIN/strings.xml
new file mode 100644
index 0000000..3f16c14
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-kn-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ಹೋಸ್ಟ್"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ಡೌನ್ಲೋಡ್ಗಳು"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> ನಿಂದ ಫೈಲ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"ಬೇರೆಯ ಸಾಧನವು ಕಾರ್ಯನಿರತವಾಗಿದೆ. ಇದು ಲಭ್ಯವಾಗುವವರೆಗೆ ಫೈಲ್ಗಳನ್ನು ನಿಮಗೆ ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ಯಾವುದೇ ಫೈಲ್ಗಳು ಕಂಡುಬಂದಿಲ್ಲ. ಬೇರೆಯ ಸಾಧನವು ಲಾಕ್ ಆಗಿರಬಹುದು. ಹಾಗಾದಲ್ಲಿ, ಇದನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ko/strings.xml b/packages/MtpDocumentsProvider/res/values-ko/strings.xml
new file mode 100644
index 0000000..bbe2fe6
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ko/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP 호스트"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"다운로드"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>에서 파일에 액세스 중"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"다른 기기가 사용 중입니다. 다른 기기를 사용할 수 있을 때까지 파일을 전송할 수 없습니다."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"파일이 없습니다. 다른 기기가 잠겨 있을 수 있습니다. 기기의 잠금을 해제하고 다시 시도하세요."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ky-rKG/strings.xml b/packages/MtpDocumentsProvider/res/values-ky-rKG/strings.xml
new file mode 100644
index 0000000..e60a494
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ky-rKG/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP хосту"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Жүктөлүп алынган нерселер"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> түзмөгүндөгү файлдар колдонулууда"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Берки түзмөк бош эмес. Ал бошомоюнча файлдарды өткөрө албайсыз."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Бир дагы файл табылган жок. Берки түзмөк кулпуланып турат окшойт. Кулпусун ачып, кайра аракет кылып көрүңүз."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-lo-rLA/strings.xml b/packages/MtpDocumentsProvider/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..bcc0ee6
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-lo-rLA/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"ໂຮສ MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ການດາວໂຫລດ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"ກຳລັງເຂົ້າເຖິງໄຟລ໌ຈາກ <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"ອຸປະກອນອື່ນບໍ່ຫວ່າງເທື່ອ. ທ່ານບໍ່ສາມາດໂອນຍ້າຍໄຟລ໌ໄດ້ຈົນກວ່າມັນຈະຫວ່າງ."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ບໍ່ພົບໄຟລ໌. ອຸປະກອນອີກເຄື່ອງອາດຖືກລັອກໄວ້ຢູ່. ຫາກມັນຖືກລັອກໄວ້, ໃຫ້ປົດລັອກມັນກ່ອນແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-lt/strings.xml b/packages/MtpDocumentsProvider/res/values-lt/strings.xml
new file mode 100644
index 0000000..8bff3a8
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-lt/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MPP priegloba"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Atsisiuntimai"</string>
+ <string name="root_name" msgid="5819495383921089536">"„<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>“ <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Pasiekiami failai iš „<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>“"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Kitas įrenginys yra užsiėmęs. Failus galėsite perkelti tik tada, kai jis bus pasiekiamas."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nerasta failų. Gali būti, kad kitas įrenginys yra užrakintas. Jei taip yra, atrakinkite jį ir bandykite dar kartą."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-lv/strings.xml b/packages/MtpDocumentsProvider/res/values-lv/strings.xml
new file mode 100644
index 0000000..5e96338
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-lv/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP saimniekdators"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Lejupielādes"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Piekļuve failiem no: <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Otra ierīce ir aizņemta. Varēsiet pārsūtīt failus tikai tad, kad tā būs pieejama."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Neviens fails netika atrasts. Iespējams, otra ierīce ir bloķēta. Ja tā ir, atbloķējiet ierīci un mēģiniet vēlreiz."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-mk-rMK/strings.xml b/packages/MtpDocumentsProvider/res/values-mk-rMK/strings.xml
new file mode 100644
index 0000000..6028b71
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-mk-rMK/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-хост"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Преземања"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Се пристапува до датотеки од <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Другиот уред е зафатен. Не може да се пренесуваат датотеки сѐ додека не стане достапен."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Не се најдени датотеки. Другиот уред можеби е заклучен. Ако е така, отклучете го и обидете се повторно."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ml-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-ml-rIN/strings.xml
new file mode 100644
index 0000000..f357f96
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ml-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ഹോസ്റ്റ്"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ഡൗൺലോഡുകൾ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> ഉപകരണത്തിൽ നിന്ന് ഫയലുകൾ ആക്സസ്സ് ചെയ്യുന്നു"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"രണ്ടാമത്തെ ഉപകരണം തിരക്കിലാണ്. അത് ലഭ്യമാകുന്നത് വരെ നിങ്ങൾക്ക് ഫയലുകൾ കൈമാറാൻ കഴിയില്ല."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ഫയലുകളൊന്നും കണ്ടെത്തിയില്ല. രണ്ടാമത്തെ ഉപകരണം ലോക്കുചെയ്ത നിലയിലായിരിക്കാം. ആണെങ്കിൽ, അൺലോക്കുചെയ്ത് വീണ്ടും ശ്രമിക്കുക."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-mn-rMN/strings.xml b/packages/MtpDocumentsProvider/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..43b8204
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-mn-rMN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Хост"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Таталт"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>-с файлд хандаж байна"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Нөгөө төхөөрөмж завгүй байна. Үүнийг боломжтой болох хүртэл файл шилжүүлэх боломжгүй."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Файл олдсонгүй. Нөгөө төхөөрөмж түгжигдсэн байж болзошгүй. Ингэсэн тохиолдолд түгжээг нь тайлаад, дахин оролдоно уу."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-mr-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-mr-rIN/strings.xml
new file mode 100644
index 0000000..5b856dc
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-mr-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP होस्ट"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"डाउनलोड"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> मधून फायलींंमध्ये प्रवेश करीत आहे"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"अन्य डिव्हाइस व्यस्त आहे. ते उपलब्ध होईपर्यंत आपण फायली हस्तांतरित करू शकत नाही."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"कोणत्याही फायली आढळल्या नाहीत. अन्य डिव्हाइस कदाचित बंद असू शकते. तसे असल्यास, ते अनलॉक करा आणि पुन्हा प्रयत्न करा."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ms-rMY/strings.xml b/packages/MtpDocumentsProvider/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..febec1d
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ms-rMY/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Hos MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Muat turun"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Mengakses fail daripada <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Peranti lain sedang sibuk. Anda tidak boleh memindahkan fail sehingga peranti itu tersedia."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Tiada fail ditemui. Peranti lain itu mungkin dikunci. Jika benar, sila buka kuncinya dan cuba lagi."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-my-rMM/strings.xml b/packages/MtpDocumentsProvider/res/values-my-rMM/strings.xml
new file mode 100644
index 0000000..8b509fb
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-my-rMM/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP လက်ခံစက်"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ဒေါင်းလုဒ်များ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> မှ ဖိုင်များကို အသုံးပြုနေသည်"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"တခြားစက်ပစ္စည်းသည် မအားသေးပါ။ ၎င်းအဆင်သင့် မဖြစ်သေးသ၍ ဖိုင်များကို လွှဲပြောင်း၍ရမည် မဟုတ်ပါ။"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"မည်သည့်ဖိုင်မျှ မတွေ့ပါ။ ၎င်းစက်ပစ္စည်းကို လော့ခ်ချထားပုံရပါသည်။ သို့ဖြစ်လျှင် ၎င်းကိုလော့ခ်ဖြုတ်ပြီး ထပ်လုပ်ကြည့်ပါ။"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-nb/strings.xml b/packages/MtpDocumentsProvider/res/values-nb/strings.xml
new file mode 100644
index 0000000..40fabed
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-nb/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-vert"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Nedlastinger"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> på <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Bruker filer på <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Den andre enheten er opptatt. Du kan ikke overføre filer før den er tilgjengelig."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Ingen filer ble funnet. Den andre enheten kan være låst. I så fall må du låse den opp og prøve igjen."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ne-rNP/strings.xml b/packages/MtpDocumentsProvider/res/values-ne-rNP/strings.xml
new file mode 100644
index 0000000..9a059e2
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ne-rNP/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP होस्ट"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"डाउनलोडहरू"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> बाट फाइलहरूमाथि पहुँच राख्दै"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"अर्को यन्त्र व्यस्त छ। त्यो यन्त्र उपलब्ध नभएसम्म तपाईँ फाइल स्थानान्तरण गर्न सक्नुहुन्न।"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"कुनै फाइल भेट्टिएन। अर्को यन्त्र लक गरिएको हुन सक्छ। यदि त्यसो हो भने त्यसलाई अनलक गरेर फेरि प्रयास गर्नुहोस्।"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-nl/strings.xml b/packages/MtpDocumentsProvider/res/values-nl/strings.xml
new file mode 100644
index 0000000..b1a01b2
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-nl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Bestanden openen op <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Het andere apparaat wordt gebruikt. Je moet wachten tot het beschikbaar is om bestanden te kunnen overzetten."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Geen bestanden gevonden. Het kan zijn dat het andere apparaat is vergrendeld. Als dat het geval is, ontgrendel je het en probeer je het opnieuw."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-pa-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..ab8ba15
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-pa-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ਹੋਸਟ"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ਡਾਊਨਲੋਡ"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> ਦੀਆਂ ਫ਼ਾਈਲਾਂ \'ਤੇ ਪਹੁੰਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"ਦੂਜੀ ਡੀਵਾਈਸ ਰੁਝੇਵੇਂ ਵਿੱਚ ਹੈ। ਉਸਦੇ ਉਪਲਬਧ ਹੋਣ ਤੱਕ ਤੁਸੀਂ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ਕੋਈ ਫ਼ਾਈਲਾਂ ਨਹੀਂ ਮਿਲੀਆਂ। ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਦੂਜੀ ਡੀਵਾਈਸ ਲੌਕ ਹੋਵੇ। ਜੇਕਰ ਇੰਝ ਹੈ, ਤਾਂ ਉਸਨੂੰ ਅਨਲੌਕ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-pl/strings.xml b/packages/MtpDocumentsProvider/res/values-pl/strings.xml
new file mode 100644
index 0000000..69fa0f4
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-pl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Pobrane"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> – <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Uzyskuję dostęp do plików na urządzeniu <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Drugie urządzenie jest zajęte. Dopóki nie będzie dostępne, nie możesz przesłać plików."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nie znaleziono plików. Drugie urządzenie może być zablokowane. Jeśli tak jest, odblokuj je i spróbuj ponownie."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-pt-rBR/strings.xml b/packages/MtpDocumentsProvider/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..03a1426
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-pt-rBR/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host do MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> do <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Acessando arquivos do <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"O outro dispositivo está ocupado. Não é possível transferir arquivos até que ele esteja disponível."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nenhum arquivo encontrado. É possível que o outro dispositivo esteja bloqueado. Se for o caso, desbloqueie-o e tente novamente."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-pt-rPT/strings.xml b/packages/MtpDocumentsProvider/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..05d32d4
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-pt-rPT/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Anfitrião MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Transferências"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Aceder a ficheiros do <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"O outro dispositivo está ocupado. Não pode transferir os ficheiros enquanto não estiver disponível."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nenhum ficheiro encontrado. O outro dispositivo pode estar bloqueado. Se assim for, desbloqueie e tente novamente."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-pt/strings.xml b/packages/MtpDocumentsProvider/res/values-pt/strings.xml
new file mode 100644
index 0000000..03a1426
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-pt/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host do MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> do <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Acessando arquivos do <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"O outro dispositivo está ocupado. Não é possível transferir arquivos até que ele esteja disponível."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nenhum arquivo encontrado. É possível que o outro dispositivo esteja bloqueado. Se for o caso, desbloqueie-o e tente novamente."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ro/strings.xml b/packages/MtpDocumentsProvider/res/values-ro/strings.xml
new file mode 100644
index 0000000..21ebc57
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ro/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Gazdă MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Descărcări"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Se accesează fișierele de pe <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Celălalt dispozitiv este ocupat. Nu puteți să transferați fișiere înainte să fie disponibil."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nu s-au găsit fișiere. Este posibil ca celălalt dispozitiv să fie blocat. În acest caz, deblocați-l și încercați din nou."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ru/strings.xml b/packages/MtpDocumentsProvider/res/values-ru/strings.xml
new file mode 100644
index 0000000..717f12f
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ru/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP-хост"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Загрузки"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="STORAGE_NAME">%2$s</xliff:g> <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Доступ к файлам на устройстве <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>…"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Другое устройство занято. Вы сможете передать файлы, когда оно будет доступно."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Файлы не найдены. Если другое устройство заблокировано, разблокируйте его и повторите попытку."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-si-rLK/strings.xml b/packages/MtpDocumentsProvider/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..7a096b0
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-si-rLK/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP සංග්රාහක"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"බාගැනීම්"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> වෙතින් ගොනු වෙත පිවිසීම"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"අනෙක් උපාංගය කාර්ය බහුලය. එය ලබා ගත හැකි වන තෙක් ඔබට ගොනු මාරු කළ නොහැකිය."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ගොනු හමු නොවීය. අනෙක් උපාංගය අගුලු දමා තිබිය හැකිය. එසේ නම්, එය අගුලු හැර නැවත උත්සාහ කරන්න."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-sk/strings.xml b/packages/MtpDocumentsProvider/res/values-sk/strings.xml
new file mode 100644
index 0000000..365e1b7
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-sk/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Hostiteľ MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Stiahnuté súbory"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Prístup k súborom zo zariadenia <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Druhé zariadenie je zaneprázdnené. Súbory bude možné preniesť, keď bude k dispozícii."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nenašli sa žiadne súbory. Druhé zariadenie môže byť uzamknuté. Ak je to tak, odomknite ho a skúste to znova."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-sl/strings.xml b/packages/MtpDocumentsProvider/res/values-sl/strings.xml
new file mode 100644
index 0000000..60945d6
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-sl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Gostitelj MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Prenosi"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Dostopanje do datotek iz naprave <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Druga naprava ni na voljo. Dokler ne bo na voljo, ne bo mogoče prenašati datotek."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Ni datotek. Druga naprava je morda zaklenjena. Če je zaklenjena, jo odklenite in poskusite znova."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-sq-rAL/strings.xml b/packages/MtpDocumentsProvider/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..d92f29f
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-sq-rAL/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Pritësi i protokollit MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Shkarkimet"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Po qaset te skedarët nga <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Pajisja tjetër është e zënë. Nuk mund të transferosh skedarë deri sa të jetë në dispozicion."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Nuk u gjet asnjë skedar. Pajisja tjetër mund të jetë e kyçur. Nëse po, shkyçe dhe provo përsëri."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-sr/strings.xml b/packages/MtpDocumentsProvider/res/values-sr/strings.xml
new file mode 100644
index 0000000..d91c5c4
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-sr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP хост"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Преузимања"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Приступ датотекама са уређаја <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Други уређај је заузет. Датотеке можете да пренесете тек кад он постане доступан."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Није пронађена ниједна датотека. Други уређај је можда закључан. Ако јесте, откључајте га и покушајте поново."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-sw/strings.xml b/packages/MtpDocumentsProvider/res/values-sw/strings.xml
new file mode 100644
index 0000000..de3ed54
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-sw/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Seva pangishi ya MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Vipakuliwa"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Inafikia faili kwenye <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Kifaa hicho kingine kinatumika. Huwezi kuhamisha faili hadi kipatikane."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Hakuna faili zilizopatikana. Huenda kifaa hicho kingine kimefungwa. Ikiwa kimefungwa, kifungue na ujaribu tena."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ta-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-ta-rIN/strings.xml
new file mode 100644
index 0000000..c6e6e620
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ta-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP ஹோஸ்ட்"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"இறக்கங்கள்"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> இலிருந்து கோப்புகளை அணுகுகிறது"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"பிற சாதனம் பணிமிகுதியில் உள்ளதால், அந்தப் பணி முடியும் வரை கோப்புகளை இடமாற்ற முடியாது."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"கோப்புகள் இல்லை. பிற சாதனம் பூட்டப்பட்டிருக்கக்கூடும் என்பதால் முதலில் அதைத் திறந்து, மீண்டும் முயலவும்."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-te-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-te-rIN/strings.xml
new file mode 100644
index 0000000..7add858
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-te-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP హోస్ట్"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"డౌన్లోడ్లు"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> నుండి ఫైల్లను ప్రాప్యత చేస్తోంది"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"ఇతర పరికరం బిజీగా ఉంది. అది అందుబాటులోకి వచ్చే వరకు మీరు ఫైల్లను బదిలీ చేయలేరు."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ఫైల్లు ఏవీ కనుగొనబడలేదు. ఇతర పరికరం లాక్ చేయబడి ఉండవచ్చు. అలా జరిగి ఉంటే, దాన్ని అన్లాక్ చేసి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-th/strings.xml b/packages/MtpDocumentsProvider/res/values-th/strings.xml
new file mode 100644
index 0000000..d2b62fe
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-th/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"โฮสต์ MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ดาวน์โหลด"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"กำลังเข้าถึงไฟล์จาก <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"อุปกรณ์อีกเครื่องหนึ่งไม่ว่าง คุณไม่สามารถโอนไฟล์จนกว่าอุปกรณ์จะสามารถใช้ได้"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"ไม่พบไฟล์ อุปกรณ์อีกเครื่องหนึ่งอาจล็อกอยู่ หากเป็นเช่นนั้น ให้ปลดล็อกและลองอีกครั้ง"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-tl/strings.xml b/packages/MtpDocumentsProvider/res/values-tl/strings.xml
new file mode 100644
index 0000000..68b2eba
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-tl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Host ng MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Mga Download"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Nag-a-access ng mga file mula sa <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Abala ang kabilang device. Hindi ka makakapaglipat ng mga file hanggang sa maging available ito."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Walang natagpuang mga file. Maaaring naka-lock ang kabilang device. Kung gayon, i-unlock ito at subukang muli."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-tr/strings.xml b/packages/MtpDocumentsProvider/res/values-tr/strings.xml
new file mode 100644
index 0000000..14250ef
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-tr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Ana Makinesi"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"İndirilenler"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> cihazdaki dosyalara erişiliyor"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Diğer cihaz meşgul. Cihaz kullanılabilir duruma gelene kadar dosyaları aktaramazsınız."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Hiçbir dosya bulunamadı. Diğer cihaz kilitli olabilir. Kilitliyse, kilidini açıp tekrar deneyin."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-uk/strings.xml b/packages/MtpDocumentsProvider/res/values-uk/strings.xml
new file mode 100644
index 0000000..8589f8c
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-uk/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Хост MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Завантаження"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Відкриваються файли з пристрою <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Інший пристрій зайнятий. Щоб передавати файли, він має бути доступним."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Не вдалося знайти файли. Можливо, інший пристрій заблоковано. У такому разі розблокуйте його та повторіть спробу."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-ur-rPK/strings.xml b/packages/MtpDocumentsProvider/res/values-ur-rPK/strings.xml
new file mode 100644
index 0000000..17578ae
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-ur-rPK/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP میزبان"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"ڈاؤن لوڈز"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> سے فائلوں کی رسائی ہو رہی ہے"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"دوسرا آلہ مصروف ہے۔ اس کے دستیاب ہونے تک آپ فائلیں منتقل نہیں کر سکتے۔"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"کوئی فائلیں نہیں ملیں۔ ہو سکتا ہے دوسرا آلہ مقفل ہو۔ اگر ایسا ہے تو اسے غیر مقفل کریں اور دوبارہ کوشش کریں۔"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-uz-rUZ/strings.xml b/packages/MtpDocumentsProvider/res/values-uz-rUZ/strings.xml
new file mode 100644
index 0000000..dea4cff
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-uz-rUZ/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Yuklanishlar"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g><xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> qurilmasidan fayllar o‘qilmoqda"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Ulangan qurilma band. U bo‘shamaguncha fayllarni o‘tkazib bo‘lmaydi."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Hech qanday fayl topilmadi. Ulangan qurilma qulflangan bo‘lishi mumkin. Agar shunday bo‘lsa, uni qulfdan chiqaring va qayta urinib ko‘ring."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-vi/strings.xml b/packages/MtpDocumentsProvider/res/values-vi/strings.xml
new file mode 100644
index 0000000..0eb6310
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-vi/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Máy chủ MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Tải xuống"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Đang truy cập tệp từ <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Thiết bị khác đang bận. Bạn không thể chuyển tệp cho đến khi thiết bị rảnh."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Không tìm thấy tệp. Thiết bị khác có thể đã bị khóa. Nếu như vậy, hãy mở khóa thiết bị rồi thử lại."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-zh-rCN/strings.xml b/packages/MtpDocumentsProvider/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..7f1f394
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-zh-rCN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"MTP 主机"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"下载"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"正在访问 <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> 的文件"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"另一台设备正忙。您必须等到该设备可用时才能传输文件。"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"未找到任何文件。另一台设备可能处于锁定状态；如果是这样，请解锁该设备并重试。"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-zh-rHK/strings.xml b/packages/MtpDocumentsProvider/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..be8c548
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-zh-rHK/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"媒體傳輸協定主機"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"下載"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> 的「<xliff:g id="STORAGE_NAME">%2$s</xliff:g>」"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"正在從 <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> 存取檔案"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"另一部裝置目前處於忙碌狀態，要等到該裝置可用時才能轉移檔案。"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"找不到檔案。如果另一部裝置處於鎖定狀態，請解鎖該裝置，然後再試一次。"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-zh-rTW/strings.xml b/packages/MtpDocumentsProvider/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..2fe3c06
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-zh-rTW/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"媒體傳輸通訊協定主機"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"下載"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"正在從 <xliff:g id="DEVICE_MODEL">%1$s</xliff:g> 存取檔案"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"另一個裝置忙碌中。必須等到該裝置可用時才能轉移檔案。"</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"找不到任何檔案。如果另一個裝置處於鎖定狀態，請將該裝置解鎖後再試一次。"</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-zu/strings.xml b/packages/MtpDocumentsProvider/res/values-zu/strings.xml
new file mode 100644
index 0000000..f3f7206
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/values-zu/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6271216747302322594">"Ukusingatha kwe-MTP"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Okulandiwe"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Ifinyelela kumafayela kusukela ku-<xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"Enye idivayisi imatasatasa. Awukwazi ukudlulisela amafayela ize itholakale."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"Awekho amafayela atholiwe. Enye idivayisi kungenzeka ikhiyiwe. Uma kunjalo, yivule uphinde uzame futhi."</string>
+</resources>
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
index 90dd440..8f254e9 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
@@ -282,8 +282,8 @@
}
final MtpDeviceInfo info = mtpDevice.getDeviceInfo();
if (info != null) {
- operationsSupported = mtpDevice.getDeviceInfo().getOperationsSupported();
- eventsSupported = mtpDevice.getDeviceInfo().getEventsSupported();
+ operationsSupported = info.getOperationsSupported();
+ eventsSupported = info.getEventsSupported();
}
} else {
roots = new MtpRoot[0];
diff --git a/packages/PrintSpooler/res/drawable/print_button.xml b/packages/PrintSpooler/res/drawable/print_button.xml
index b59afba..0114103 100644
--- a/packages/PrintSpooler/res/drawable/print_button.xml
+++ b/packages/PrintSpooler/res/drawable/print_button.xml
@@ -16,7 +16,7 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/print_button_tint_color">
+ android:color="?android:attr/colorControlHighlight">
<item
android:drawable="@drawable/print_button_background">
</item>
diff --git a/packages/PrintSpooler/res/values-af/strings.xml b/packages/PrintSpooler/res/values-af/strings.xml
index 8e6d6de..ccfbf17 100644
--- a/packages/PrintSpooler/res/values-af/strings.xml
+++ b/packages/PrintSpooler/res/values-af/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Stoor as PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle drukkers…"</string>
<string name="print_dialog" msgid="32628687461331979">"Drukdialoog"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Bladsy <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> van <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Opsomming, kopieë <xliff:g id="COPIES">%1$s</xliff:g>, papiergrootte <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Vou handvatsel uit"</string>
diff --git a/packages/PrintSpooler/res/values-am/strings.xml b/packages/PrintSpooler/res/values-am/strings.xml
index 341b362..70daad6 100644
--- a/packages/PrintSpooler/res/values-am/strings.xml
+++ b/packages/PrintSpooler/res/values-am/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"እንደ PDF አስቀምጥ"</string>
<string name="all_printers" msgid="5018829726861876202">"ሁሉም አታሚዎች…"</string>
<string name="print_dialog" msgid="32628687461331979">"የህትመት መገናኛ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"ገጽ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ከ<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"ማጠቃለያ፣ ቅጂዎች <xliff:g id="COPIES">%1$s</xliff:g>፣ የወረቀት መጠን <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"እጀታን ወደ ውጪ ላክ"</string>
diff --git a/packages/PrintSpooler/res/values-ar/strings.xml b/packages/PrintSpooler/res/values-ar/strings.xml
index fee029f..ec12ba2 100644
--- a/packages/PrintSpooler/res/values-ar/strings.xml
+++ b/packages/PrintSpooler/res/values-ar/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"حفظ بتنسيق PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"جميع الطابعات…"</string>
<string name="print_dialog" msgid="32628687461331979">"مربع حوار الطباعة"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"الصفحة <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> من <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"الملخص، النسخ <xliff:g id="COPIES">%1$s</xliff:g>، حجم الورق <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"مقبض التوسيع"</string>
diff --git a/packages/PrintSpooler/res/values-az-rAZ/strings.xml b/packages/PrintSpooler/res/values-az-rAZ/strings.xml
index 19bdd72..a1c752e 100644
--- a/packages/PrintSpooler/res/values-az-rAZ/strings.xml
+++ b/packages/PrintSpooler/res/values-az-rAZ/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF olaraq yadda saxla"</string>
<string name="all_printers" msgid="5018829726861876202">"Bütün printerlər..."</string>
<string name="print_dialog" msgid="32628687461331979">"Dialoqu çap edin"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> səhifədən <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> səhifə"</string>
<string name="summary_template" msgid="8899734908625669193">"Cəm, nüsxə <xliff:g id="COPIES">%1$s</xliff:g>, kağız ölçüsü <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Dəstəyi genişləndirin"</string>
diff --git a/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml b/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml
index 333c386..ce8a81e 100644
--- a/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml
+++ b/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Sačuvaj kao PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Svi štampači…"</string>
<string name="print_dialog" msgid="32628687461331979">"Dijalog za štampanje"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. stranica od <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Rezime, kopije (<xliff:g id="COPIES">%1$s</xliff:g>), veličina papira <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Regulator za širenje"</string>
diff --git a/packages/PrintSpooler/res/values-be-rBY/strings.xml b/packages/PrintSpooler/res/values-be-rBY/strings.xml
index a6d6617..83d0627 100644
--- a/packages/PrintSpooler/res/values-be-rBY/strings.xml
+++ b/packages/PrintSpooler/res/values-be-rBY/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Захаваць як PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Усе прынтары..."</string>
<string name="print_dialog" msgid="32628687461331979">"Дыялог друку"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Старонка <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Зводка, копіі <xliff:g id="COPIES">%1$s</xliff:g>, памер паперы <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Маркер разгортвання"</string>
diff --git a/packages/PrintSpooler/res/values-bg/strings.xml b/packages/PrintSpooler/res/values-bg/strings.xml
index 1887c7c..60718ef 100644
--- a/packages/PrintSpooler/res/values-bg/strings.xml
+++ b/packages/PrintSpooler/res/values-bg/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Запазване като PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Всички принтери…"</string>
<string name="print_dialog" msgid="32628687461331979">"Диалогов прозорец за отпечатване"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Страница <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> от <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Обобщена информация: копия – <xliff:g id="COPIES">%1$s</xliff:g>, размер на хартията – <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Манипулатор за разгъване"</string>
diff --git a/packages/PrintSpooler/res/values-bn-rBD/strings.xml b/packages/PrintSpooler/res/values-bn-rBD/strings.xml
index 4d49d20..6f8ae0d 100644
--- a/packages/PrintSpooler/res/values-bn-rBD/strings.xml
+++ b/packages/PrintSpooler/res/values-bn-rBD/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF হিসাবে সংরক্ষণ করুন"</string>
<string name="all_printers" msgid="5018829726861876202">"সমস্ত মুদ্রক…"</string>
<string name="print_dialog" msgid="32628687461331979">"প্রিন্ট ডায়লগ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বর পৃষ্ঠা"</string>
<string name="summary_template" msgid="8899734908625669193">"সারাংশ, <xliff:g id="COPIES">%1$s</xliff:g>টি অনুলিপি, কাগজের আকার <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"প্রসারিত করার হ্যান্ডেল"</string>
diff --git a/packages/PrintSpooler/res/values-bs-rBA/strings.xml b/packages/PrintSpooler/res/values-bs-rBA/strings.xml
index ecd1e88..a50391f 100644
--- a/packages/PrintSpooler/res/values-bs-rBA/strings.xml
+++ b/packages/PrintSpooler/res/values-bs-rBA/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Sačuvaj kao PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Svi štampači…"</string>
<string name="print_dialog" msgid="32628687461331979">"Dijaloški okvir za štampanje"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Strana <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> od <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Rezime, primjeraka <xliff:g id="COPIES">%1$s</xliff:g>, veličina papira <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Regulator za proširivanje"</string>
diff --git a/packages/PrintSpooler/res/values-ca/strings.xml b/packages/PrintSpooler/res/values-ca/strings.xml
index 54be542..9a6dbe1 100644
--- a/packages/PrintSpooler/res/values-ca/strings.xml
+++ b/packages/PrintSpooler/res/values-ca/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Desa com a PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Totes les impressores…"</string>
<string name="print_dialog" msgid="32628687461331979">"Diàleg d\'impressió"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Pàgina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de: <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resum; còpies: <xliff:g id="COPIES">%1$s</xliff:g>; mida del paper: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Desplega l\'ansa"</string>
diff --git a/packages/PrintSpooler/res/values-cs/strings.xml b/packages/PrintSpooler/res/values-cs/strings.xml
index 9f86de4..a3b61f4 100644
--- a/packages/PrintSpooler/res/values-cs/strings.xml
+++ b/packages/PrintSpooler/res/values-cs/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Uložit ve formátu PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Všechny tiskárny…"</string>
<string name="print_dialog" msgid="32628687461331979">"Dialog tisku"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Stránka <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> z <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Souhrn, počet kopií: <xliff:g id="COPIES">%1$s</xliff:g>, velikost papíru: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Úchyt k rozbalení"</string>
diff --git a/packages/PrintSpooler/res/values-da/strings.xml b/packages/PrintSpooler/res/values-da/strings.xml
index 099ebce..2f5047d 100644
--- a/packages/PrintSpooler/res/values-da/strings.xml
+++ b/packages/PrintSpooler/res/values-da/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Gem som PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle printere..."</string>
<string name="print_dialog" msgid="32628687461331979">"Udskriftsdialog"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> af <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Side <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ud af <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Opsummering, kopier <xliff:g id="COPIES">%1$s</xliff:g>, papirstørrelse <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Håndtag til visning"</string>
diff --git a/packages/PrintSpooler/res/values-de/strings.xml b/packages/PrintSpooler/res/values-de/strings.xml
index 5d4fe73f..38ba698 100644
--- a/packages/PrintSpooler/res/values-de/strings.xml
+++ b/packages/PrintSpooler/res/values-de/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Als PDF speichern"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle Drucker…"</string>
<string name="print_dialog" msgid="32628687461331979">"Druckdialogfeld"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Seite <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> von <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Zusammenfassung: Kopien: <xliff:g id="COPIES">%1$s</xliff:g>, Papierformat <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Steuerelement zum Einblenden"</string>
diff --git a/packages/PrintSpooler/res/values-el/strings.xml b/packages/PrintSpooler/res/values-el/strings.xml
index 02b282c..3e19fad 100644
--- a/packages/PrintSpooler/res/values-el/strings.xml
+++ b/packages/PrintSpooler/res/values-el/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Αποθήκευση ως PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Όλοι οι εκτυπωτές…"</string>
<string name="print_dialog" msgid="32628687461331979">"Πλαίσιο διαλόγου εκτύπωσης"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Σελίδα <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> από <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Σύνοψη, αντίγραφα <xliff:g id="COPIES">%1$s</xliff:g>, μέγεθος χαρτιού <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Επέκταση λαβής"</string>
diff --git a/packages/PrintSpooler/res/values-en-rAU/strings.xml b/packages/PrintSpooler/res/values-en-rAU/strings.xml
index 74b311f..409acfc 100644
--- a/packages/PrintSpooler/res/values-en-rAU/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rAU/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
<string name="print_dialog" msgid="32628687461331979">"Print dialogue"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Summary, copies <xliff:g id="COPIES">%1$s</xliff:g>, paper size <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Expand handle"</string>
diff --git a/packages/PrintSpooler/res/values-en-rGB/strings.xml b/packages/PrintSpooler/res/values-en-rGB/strings.xml
index 74b311f..409acfc 100644
--- a/packages/PrintSpooler/res/values-en-rGB/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rGB/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
<string name="print_dialog" msgid="32628687461331979">"Print dialogue"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Summary, copies <xliff:g id="COPIES">%1$s</xliff:g>, paper size <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Expand handle"</string>
diff --git a/packages/PrintSpooler/res/values-en-rIN/strings.xml b/packages/PrintSpooler/res/values-en-rIN/strings.xml
index 74b311f..409acfc 100644
--- a/packages/PrintSpooler/res/values-en-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
<string name="print_dialog" msgid="32628687461331979">"Print dialogue"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Summary, copies <xliff:g id="COPIES">%1$s</xliff:g>, paper size <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Expand handle"</string>
diff --git a/packages/PrintSpooler/res/values-es-rUS/strings.xml b/packages/PrintSpooler/res/values-es-rUS/strings.xml
index 2f4fed5..dc1ae84 100644
--- a/packages/PrintSpooler/res/values-es-rUS/strings.xml
+++ b/packages/PrintSpooler/res/values-es-rUS/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Guardar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas las impresoras…"</string>
<string name="print_dialog" msgid="32628687461331979">"Cuadro de diálogo de impresión"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resumen, copias <xliff:g id="COPIES">%1$s</xliff:g>, tamaño de papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Controlador para expandir"</string>
diff --git a/packages/PrintSpooler/res/values-es/strings.xml b/packages/PrintSpooler/res/values-es/strings.xml
index f037631..ebce376 100644
--- a/packages/PrintSpooler/res/values-es/strings.xml
+++ b/packages/PrintSpooler/res/values-es/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Guardar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas las impresoras…"</string>
<string name="print_dialog" msgid="32628687461331979">"Cuadro de diálogo de impresión"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resumen, copias (<xliff:g id="COPIES">%1$s</xliff:g>), tamaño del papel (<xliff:g id="PAPER_SIZE">%2$s</xliff:g>)"</string>
<string name="expand_handle" msgid="7282974448109280522">"Controlador para ampliar"</string>
diff --git a/packages/PrintSpooler/res/values-et-rEE/strings.xml b/packages/PrintSpooler/res/values-et-rEE/strings.xml
index 6f33990..7af6883 100644
--- a/packages/PrintSpooler/res/values-et-rEE/strings.xml
+++ b/packages/PrintSpooler/res/values-et-rEE/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Salvesta PDF-ina"</string>
<string name="all_printers" msgid="5018829726861876202">"Kõik printerid …"</string>
<string name="print_dialog" msgid="32628687461331979">"Printimisdialoog"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. leht <xliff:g id="PAGE_COUNT">%2$d</xliff:g>-st"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g> lehest"</string>
<string name="summary_template" msgid="8899734908625669193">"Kokkuvõte, koopiad <xliff:g id="COPIES">%1$s</xliff:g>, paberi suurus <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Laiendamispide"</string>
diff --git a/packages/PrintSpooler/res/values-eu-rES/strings.xml b/packages/PrintSpooler/res/values-eu-rES/strings.xml
index d1fa354..e3c6f01 100644
--- a/packages/PrintSpooler/res/values-eu-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-eu-rES/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Gorde PDF gisa"</string>
<string name="all_printers" msgid="5018829726861876202">"Inprimagailu guztiak…"</string>
<string name="print_dialog" msgid="32628687461331979">"Inprimatzeko elkarrizketa-koadroa"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g> orria"</string>
<string name="summary_template" msgid="8899734908625669193">"Laburpena, <xliff:g id="COPIES">%1$s</xliff:g> kopia, <xliff:g id="PAPER_SIZE">%2$s</xliff:g> paper-tamaina"</string>
<string name="expand_handle" msgid="7282974448109280522">"Zabaldu heldulekua"</string>
diff --git a/packages/PrintSpooler/res/values-fa/strings.xml b/packages/PrintSpooler/res/values-fa/strings.xml
index 4002373..5aef254 100644
--- a/packages/PrintSpooler/res/values-fa/strings.xml
+++ b/packages/PrintSpooler/res/values-fa/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"ذخیره بهعنوان PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"همه چاپگرها..."</string>
<string name="print_dialog" msgid="32628687461331979">"چاپ گفتگو"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"صفحه <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> از <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"خلاصه، تعداد نسخه <xliff:g id="COPIES">%1$s</xliff:g>، اندازه کاغذ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"بزرگ کردن فهرست گزینهها"</string>
diff --git a/packages/PrintSpooler/res/values-fi/strings.xml b/packages/PrintSpooler/res/values-fi/strings.xml
index 3cffce6..10719aa 100644
--- a/packages/PrintSpooler/res/values-fi/strings.xml
+++ b/packages/PrintSpooler/res/values-fi/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Tallenna PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Kaikki tulostimet…"</string>
<string name="print_dialog" msgid="32628687461331979">"Tulostusikkuna"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Sivu <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Yhteenveto, kopioita <xliff:g id="COPIES">%1$s</xliff:g>, paperikoko <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Laajennuskahva"</string>
diff --git a/packages/PrintSpooler/res/values-fr-rCA/strings.xml b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
index e56987c..134ab87 100644
--- a/packages/PrintSpooler/res/values-fr-rCA/strings.xml
+++ b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Enregistrer en format PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Toutes les imprimantes…"</string>
<string name="print_dialog" msgid="32628687461331979">"Boîte de dialogue d\'impression"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sur <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Résumé, copies (<xliff:g id="COPIES">%1$s</xliff:g>), taille du papier (<xliff:g id="PAPER_SIZE">%2$s</xliff:g>)"</string>
<string name="expand_handle" msgid="7282974448109280522">"Poignée de développement"</string>
diff --git a/packages/PrintSpooler/res/values-fr/strings.xml b/packages/PrintSpooler/res/values-fr/strings.xml
index 134f3bf..dfb77b6 100644
--- a/packages/PrintSpooler/res/values-fr/strings.xml
+++ b/packages/PrintSpooler/res/values-fr/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Enregistrer au format PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Toutes les imprim."</string>
<string name="print_dialog" msgid="32628687461331979">"Boîte de dialogue d\'impression"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sur <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Résumé, copies (<xliff:g id="COPIES">%1$s</xliff:g>), taille du papier (<xliff:g id="PAPER_SIZE">%2$s</xliff:g>)"</string>
<string name="expand_handle" msgid="7282974448109280522">"Poignée de développement"</string>
diff --git a/packages/PrintSpooler/res/values-gl-rES/strings.xml b/packages/PrintSpooler/res/values-gl-rES/strings.xml
index 1299353..c54865f 100644
--- a/packages/PrintSpooler/res/values-gl-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-gl-rES/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Gardar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas as impresoras..."</string>
<string name="print_dialog" msgid="32628687461331979">"Diálogo de impresión"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Páxina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resumo, copias <xliff:g id="COPIES">%1$s</xliff:g>, tamaño do papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Amplía a agarradoira"</string>
diff --git a/packages/PrintSpooler/res/values-gu-rIN/strings.xml b/packages/PrintSpooler/res/values-gu-rIN/strings.xml
index cf21cc5..b3a0ca2 100644
--- a/packages/PrintSpooler/res/values-gu-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-gu-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF તરીકે સાચવો"</string>
<string name="all_printers" msgid="5018829726861876202">"બધા પ્રિન્ટર્સ…"</string>
<string name="print_dialog" msgid="32628687461331979">"પ્રિન્ટ સંવાદ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> માંથી <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> પૃષ્ઠ"</string>
<string name="summary_template" msgid="8899734908625669193">"સારાંશ, કૉપિઝ <xliff:g id="COPIES">%1$s</xliff:g>, કાગળનું કદ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"વિસ્તૃત કરો હેન્ડલ"</string>
diff --git a/packages/PrintSpooler/res/values-hi/strings.xml b/packages/PrintSpooler/res/values-hi/strings.xml
index 1e780d3..d108c20 100644
--- a/packages/PrintSpooler/res/values-hi/strings.xml
+++ b/packages/PrintSpooler/res/values-hi/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF के रूप में जोड़ें"</string>
<string name="all_printers" msgid="5018829726861876202">"सभी प्रिंटर..."</string>
<string name="print_dialog" msgid="32628687461331979">"प्रिंट डॉयलॉग"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> में से पृष्ठ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"सारांश, प्रतियां <xliff:g id="COPIES">%1$s</xliff:g>, काग़ज़ का आकार <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"हैंडल विस्तृत करें"</string>
diff --git a/packages/PrintSpooler/res/values-hr/strings.xml b/packages/PrintSpooler/res/values-hr/strings.xml
index 4a44c52..489b723 100644
--- a/packages/PrintSpooler/res/values-hr/strings.xml
+++ b/packages/PrintSpooler/res/values-hr/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Spremi kao PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Svi pisači…"</string>
<string name="print_dialog" msgid="32628687461331979">"Dijaloški okvir za ispis"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Stranica <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> od <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Sažetak, kopije <xliff:g id="COPIES">%1$s</xliff:g>, veličina papira <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Ručica za proširenje"</string>
diff --git a/packages/PrintSpooler/res/values-hu/strings.xml b/packages/PrintSpooler/res/values-hu/strings.xml
index df8799b..544f9e9 100644
--- a/packages/PrintSpooler/res/values-hu/strings.xml
+++ b/packages/PrintSpooler/res/values-hu/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Mentés PDF-ként"</string>
<string name="all_printers" msgid="5018829726861876202">"Az összes nyomtató…"</string>
<string name="print_dialog" msgid="32628687461331979">"Nyomtatási párbeszédablak"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>./<xliff:g id="PAGE_COUNT">%2$d</xliff:g> oldal"</string>
<string name="summary_template" msgid="8899734908625669193">"Összegzés, <xliff:g id="COPIES">%1$s</xliff:g> példány, papírméret: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"„Kibontás” fogantyú"</string>
diff --git a/packages/PrintSpooler/res/values-hy-rAM/strings.xml b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
index dc60230..b7c53bb 100644
--- a/packages/PrintSpooler/res/values-hy-rAM/strings.xml
+++ b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Պահել որպես PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Բոլոր տպիչները..."</string>
<string name="print_dialog" msgid="32628687461331979">"Տպելու երկխոսության պատուհան"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Էջ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>՝ <xliff:g id="PAGE_COUNT">%2$d</xliff:g>-ից"</string>
<string name="summary_template" msgid="8899734908625669193">"Ամփոփում, պատճենները՝ <xliff:g id="COPIES">%1$s</xliff:g> , թղթի չափը՝ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Ընդարձակման կարգավորում"</string>
diff --git a/packages/PrintSpooler/res/values-in/strings.xml b/packages/PrintSpooler/res/values-in/strings.xml
index 9d1dc0f..b2b56a0 100644
--- a/packages/PrintSpooler/res/values-in/strings.xml
+++ b/packages/PrintSpooler/res/values-in/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Simpan sebagai PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Semua printer…"</string>
<string name="print_dialog" msgid="32628687461331979">"Cetak dialog"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Halaman <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> dari <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Ringkasan, salinan <xliff:g id="COPIES">%1$s</xliff:g>, ukuran kertas <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Luaskan gagang"</string>
diff --git a/packages/PrintSpooler/res/values-is-rIS/strings.xml b/packages/PrintSpooler/res/values-is-rIS/strings.xml
index 7889c46..551d645 100644
--- a/packages/PrintSpooler/res/values-is-rIS/strings.xml
+++ b/packages/PrintSpooler/res/values-is-rIS/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Vista sem PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Allir prentarar…"</string>
<string name="print_dialog" msgid="32628687461331979">"Prentgluggi"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Síða <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> af <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Yfirlit, <xliff:g id="COPIES">%1$s</xliff:g> eintök, pappírsstærð <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Stækkunarhandfang"</string>
diff --git a/packages/PrintSpooler/res/values-it/strings.xml b/packages/PrintSpooler/res/values-it/strings.xml
index bdf2858..cd074be 100644
--- a/packages/PrintSpooler/res/values-it/strings.xml
+++ b/packages/PrintSpooler/res/values-it/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Salva in PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Tutte le stampanti…"</string>
<string name="print_dialog" msgid="32628687461331979">"Finestra di dialogo Stampa"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Pagina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> di <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Riepilogo, copie <xliff:g id="COPIES">%1$s</xliff:g>, <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Punto di controllo per l\'espansione"</string>
diff --git a/packages/PrintSpooler/res/values-iw/strings.xml b/packages/PrintSpooler/res/values-iw/strings.xml
index bfd32e1..4349230 100644
--- a/packages/PrintSpooler/res/values-iw/strings.xml
+++ b/packages/PrintSpooler/res/values-iw/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"שמור כ-PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"כל המדפסות…"</string>
<string name="print_dialog" msgid="32628687461331979">"תיבת דו שיח של מדפסת"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"עמוד <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> מתוך <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"סיכום, עותקים <xliff:g id="COPIES">%1$s</xliff:g>, גודל נייר <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ידית הרחבה"</string>
diff --git a/packages/PrintSpooler/res/values-ja/strings.xml b/packages/PrintSpooler/res/values-ja/strings.xml
index 2e10d92..6cbc657 100644
--- a/packages/PrintSpooler/res/values-ja/strings.xml
+++ b/packages/PrintSpooler/res/values-ja/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF形式で保存"</string>
<string name="all_printers" msgid="5018829726861876202">"すべてのプリンタ…"</string>
<string name="print_dialog" msgid="32628687461331979">"印刷ダイアログ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>ページ"</string>
<string name="summary_template" msgid="8899734908625669193">"概要、部数<xliff:g id="COPIES">%1$s</xliff:g>、用紙サイズ<xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"展開ハンドル"</string>
diff --git a/packages/PrintSpooler/res/values-ka-rGE/strings.xml b/packages/PrintSpooler/res/values-ka-rGE/strings.xml
index 8d5b383..3ebf2b2 100644
--- a/packages/PrintSpooler/res/values-ka-rGE/strings.xml
+++ b/packages/PrintSpooler/res/values-ka-rGE/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF-ად შენახვა"</string>
<string name="all_printers" msgid="5018829726861876202">"ყველა პრინტერი…"</string>
<string name="print_dialog" msgid="32628687461331979">"ბეჭდვის სარკმელი"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>-დან"</string>
<string name="page_description_template" msgid="6831239682256197161">"გვერდი <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>-დან"</string>
<string name="summary_template" msgid="8899734908625669193">"შეჯამება, ასლები <xliff:g id="COPIES">%1$s</xliff:g>, გვერდის ზომა <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"გაშლის სახელური"</string>
diff --git a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
index 779d0ed..7b739d7 100644
--- a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
+++ b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF ретінде сақтау"</string>
<string name="all_printers" msgid="5018829726861876202">"Барлық принтерлер…"</string>
<string name="print_dialog" msgid="32628687461331979">"Басу терезесі"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> ішінен <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> бет"</string>
<string name="summary_template" msgid="8899734908625669193">"Жиынтық мәліметтер, көшірмелер <xliff:g id="COPIES">%1$s</xliff:g>, қағаз өлшемі <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Кеңейту таңбалауышы"</string>
diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km-rKH/strings.xml
index b524241..e2a5e81f 100644
--- a/packages/PrintSpooler/res/values-km-rKH/strings.xml
+++ b/packages/PrintSpooler/res/values-km-rKH/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"រក្សាទុកជា PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"ម៉ាស៊ីនបោះពុម្ពទាំងអស់ ..."</string>
<string name="print_dialog" msgid="32628687461331979">"ប្រអប់បោះពុម្ព"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"ទំព័រ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> នៃ <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"សង្ខេប, ច្បាប់ចម្លង <xliff:g id="COPIES">%1$s</xliff:g>, ទំហំក្រដាស <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ពង្រីកចំណុចទាញ"</string>
diff --git a/packages/PrintSpooler/res/values-kn-rIN/strings.xml b/packages/PrintSpooler/res/values-kn-rIN/strings.xml
index 23dc6f9..3ce49aa 100644
--- a/packages/PrintSpooler/res/values-kn-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-kn-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF ರೂಪದಲ್ಲಿ ಉಳಿಸಿ"</string>
<string name="all_printers" msgid="5018829726861876202">"ಎಲ್ಲಾ ಪ್ರಿಂಟರ್ಗಳು…"</string>
<string name="print_dialog" msgid="32628687461331979">"ಮುದ್ರಣ ಸಂವಾದ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"ಪುಟ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"ಸಾರಾಂಶ, ನಕಲುಗಳು <xliff:g id="COPIES">%1$s</xliff:g>, ಪೇಪರ್ ಗಾತ್ರ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ಹ್ಯಾಂಡಲ್ ವಿಸ್ತರಿಸಿ"</string>
diff --git a/packages/PrintSpooler/res/values-ko/strings.xml b/packages/PrintSpooler/res/values-ko/strings.xml
index 1558db3..9b4d61f 100644
--- a/packages/PrintSpooler/res/values-ko/strings.xml
+++ b/packages/PrintSpooler/res/values-ko/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF로 저장"</string>
<string name="all_printers" msgid="5018829726861876202">"모든 프린터…"</string>
<string name="print_dialog" msgid="32628687461331979">"인쇄 대화상자"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"전체 <xliff:g id="PAGE_COUNT">%2$d</xliff:g>페이지 중 현재 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>페이지"</string>
<string name="summary_template" msgid="8899734908625669193">"요약, 매수 <xliff:g id="COPIES">%1$s</xliff:g>, 용지 크기 <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"펼치기 핸들"</string>
diff --git a/packages/PrintSpooler/res/values-ky-rKG/strings.xml b/packages/PrintSpooler/res/values-ky-rKG/strings.xml
index be7f654..66a5476 100644
--- a/packages/PrintSpooler/res/values-ky-rKG/strings.xml
+++ b/packages/PrintSpooler/res/values-ky-rKG/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF катары сактоо"</string>
<string name="all_printers" msgid="5018829726861876202">"Бардык принтерлер…"</string>
<string name="print_dialog" msgid="32628687461331979">"Басуу баарлашуусу"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> ичинен <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>-бет"</string>
<string name="summary_template" msgid="8899734908625669193">"Корутунду, <xliff:g id="COPIES">%1$s</xliff:g> көчүрмө, барак өлчөмү <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Тутканы жаюу"</string>
diff --git a/packages/PrintSpooler/res/values-lo-rLA/strings.xml b/packages/PrintSpooler/res/values-lo-rLA/strings.xml
index c1aa991..571586c 100644
--- a/packages/PrintSpooler/res/values-lo-rLA/strings.xml
+++ b/packages/PrintSpooler/res/values-lo-rLA/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"ບັນທຶກເປັນ PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"ທຸກເຄື່ອງພິມ..."</string>
<string name="print_dialog" msgid="32628687461331979">"ໜ້າຕ່າງການພິມ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"ໜ້າທີ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"ສະຫຼຸບ, ສໍາເນົາ <xliff:g id="COPIES">%1$s</xliff:g>, ຂະຫນາດ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ຂະຫຍາຍໂຕຈັດການ"</string>
diff --git a/packages/PrintSpooler/res/values-lt/strings.xml b/packages/PrintSpooler/res/values-lt/strings.xml
index 77a9d9e..44b9e31a 100644
--- a/packages/PrintSpooler/res/values-lt/strings.xml
+++ b/packages/PrintSpooler/res/values-lt/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Išsaugoti kaip PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Visi spausdintuvai…"</string>
<string name="print_dialog" msgid="32628687461331979">"Spausdinimo dialogo langas"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> psl. iš <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Suvestinė, kopijų: <xliff:g id="COPIES">%1$s</xliff:g>, popieriaus dydis: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Išskleidimo rankenėlė"</string>
diff --git a/packages/PrintSpooler/res/values-lv/strings.xml b/packages/PrintSpooler/res/values-lv/strings.xml
index 2b326e9..9f1a440 100644
--- a/packages/PrintSpooler/res/values-lv/strings.xml
+++ b/packages/PrintSpooler/res/values-lv/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Saglabāt kā PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Visi printeri…"</string>
<string name="print_dialog" msgid="32628687461331979">"Drukāšanas dialoglodziņš"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. no <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. lapa no <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Kopsavilkums, kopiju skaits: <xliff:g id="COPIES">%1$s</xliff:g>, papīra izmērs: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Izvēršanas turis"</string>
diff --git a/packages/PrintSpooler/res/values-mk-rMK/strings.xml b/packages/PrintSpooler/res/values-mk-rMK/strings.xml
index c916d87..4cf7926 100644
--- a/packages/PrintSpooler/res/values-mk-rMK/strings.xml
+++ b/packages/PrintSpooler/res/values-mk-rMK/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Зачувај како PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Сите печатачи..."</string>
<string name="print_dialog" msgid="32628687461331979">"Дијалог рамка Печати"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Страница <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> од <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Краток преглед, копии <xliff:g id="COPIES">%1$s</xliff:g>, големина на хартија <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Рачка за прикажување"</string>
diff --git a/packages/PrintSpooler/res/values-ml-rIN/strings.xml b/packages/PrintSpooler/res/values-ml-rIN/strings.xml
index 058ff8f..9802c03 100644
--- a/packages/PrintSpooler/res/values-ml-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-ml-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF ആയി സംരക്ഷിക്കുക"</string>
<string name="all_printers" msgid="5018829726861876202">"എല്ലാ പ്രിന്ററുകളും..."</string>
<string name="print_dialog" msgid="32628687461331979">"പ്രിന്റ് സംഭാഷണം"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g> പേജ്"</string>
<string name="summary_template" msgid="8899734908625669193">"സംഗ്രഹം, പകർപ്പുകൾ <xliff:g id="COPIES">%1$s</xliff:g>, പേപ്പർ വലുപ്പം <xliff:g id="PAPER_SIZE">%2$s</xliff:g> എന്നിവ"</string>
<string name="expand_handle" msgid="7282974448109280522">"വിപുലീകരണം കൈകാര്യം ചെയ്യുക"</string>
diff --git a/packages/PrintSpooler/res/values-mn-rMN/strings.xml b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
index eaf0169..df1780f 100644
--- a/packages/PrintSpooler/res/values-mn-rMN/strings.xml
+++ b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF болгож хадгалах"</string>
<string name="all_printers" msgid="5018829726861876202">"Бүх принтерүүд…"</string>
<string name="print_dialog" msgid="32628687461331979">"Хэвлэх диалоги"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g>-с <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> хуудас"</string>
<string name="summary_template" msgid="8899734908625669193">"Дүгнэлт, <xliff:g id="COPIES">%1$s</xliff:g> хувь, цаасны хэмжээ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Бариулыг дэлгэх"</string>
diff --git a/packages/PrintSpooler/res/values-mr-rIN/strings.xml b/packages/PrintSpooler/res/values-mr-rIN/strings.xml
index 9a62f15..2b1668d 100644
--- a/packages/PrintSpooler/res/values-mr-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-mr-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF म्हणून जतन करा"</string>
<string name="all_printers" msgid="5018829726861876202">"सर्व प्रिंटर..."</string>
<string name="print_dialog" msgid="32628687461331979">"मुद्रण संवाद"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> पृष्ठ"</string>
<string name="summary_template" msgid="8899734908625669193">"सारांश, प्रती <xliff:g id="COPIES">%1$s</xliff:g>, कागद आकार <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"विस्तृत करण्याचे हँडल"</string>
diff --git a/packages/PrintSpooler/res/values-ms-rMY/strings.xml b/packages/PrintSpooler/res/values-ms-rMY/strings.xml
index 29050ac..5aafe3c 100644
--- a/packages/PrintSpooler/res/values-ms-rMY/strings.xml
+++ b/packages/PrintSpooler/res/values-ms-rMY/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Simpan sebagai PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Semua pencetak..."</string>
<string name="print_dialog" msgid="32628687461331979">"Dialog cetakan"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Halaman <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> daripada <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Ringkasan, salinan <xliff:g id="COPIES">%1$s</xliff:g>, saiz kertas <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Pemegang untuk mengembangkan"</string>
diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my-rMM/strings.xml
index 6a5e313..66e48c8 100644
--- a/packages/PrintSpooler/res/values-my-rMM/strings.xml
+++ b/packages/PrintSpooler/res/values-my-rMM/strings.xml
@@ -33,13 +33,12 @@
<string name="pages_range_example" msgid="8558694453556945172">"ဥပမာ ၁-၅၊ ၈၊ ၁၁-၁၃"</string>
<string name="print_preview" msgid="8010217796057763343">"အစမ်းကြည့်ရှုရန်"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"အစမ်းကြည့်ရန် ပီဒီအက်ဖ် ဖတ်ရှုစရာ ထည့်သွင်းပါ"</string>
- <string name="printing_app_crashed" msgid="854477616686566398">"စာထုတ်လုပ်သော အက်ပ် ခဏ ပျက်သွားပါသည်"</string>
+ <string name="printing_app_crashed" msgid="854477616686566398">"စာထုတ်လုပ်သော အက်ပ်ခဏ ပျက်သွားပါသည်"</string>
<string name="generating_print_job" msgid="3119608742651698916">"စာထုတ်အလုပ်ကို လုပ်နေပါသည်"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"ပီဒီအက်ဖ် အဖြစ်သိမ်းဆည်းရန်"</string>
<string name="all_printers" msgid="5018829726861876202">"စာထုတ်စက် အားလုံး"</string>
<string name="print_dialog" msgid="32628687461331979">"စာထုတ်ရန် အချက်ပြခြင်း"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g>ထဲက စာမျက်နှာ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"အကျဉ်းချုပ်၊ ကော်ပီများ<xliff:g id="COPIES">%1$s</xliff:g>၊ စက္ကူ ဆိုက် <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ချဲ့ရန် လက်"</string>
@@ -82,7 +81,7 @@
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ကို ပယ်ဖျက်နေပါသည်"</string>
<string name="failed_notification_title_template" msgid="2256217208186530973">"စာထုတ်စက်မှ အမှား <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="blocked_notification_title_template" msgid="1175435827331588646">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ကိုစာထုတ်စက်ကငြင်းလိုက်သည်"</string>
- <string name="cancel" msgid="4373674107267141885">"မလုပ်တော့ပါ"</string>
+ <string name="cancel" msgid="4373674107267141885">"မလုပ်တော့"</string>
<string name="restart" msgid="2472034227037808749">"အစက ပြန်စရန်"</string>
<string name="no_connection_to_printer" msgid="2159246915977282728">"စာထုတ်စက်နဲ့ ဆက်သွယ်ထားမှု မရှိပါ"</string>
<string name="reason_unknown" msgid="5507940196503246139">"အကြောင်းအရာ မသိရှိ"</string>
diff --git a/packages/PrintSpooler/res/values-nb/strings.xml b/packages/PrintSpooler/res/values-nb/strings.xml
index fb3fdc5..6eedcee 100644
--- a/packages/PrintSpooler/res/values-nb/strings.xml
+++ b/packages/PrintSpooler/res/values-nb/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Lagre som PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle skrivere"</string>
<string name="print_dialog" msgid="32628687461331979">"Skriv ut dialog"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Side <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> av <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Oppsummering, <xliff:g id="COPIES">%1$s</xliff:g> kopier, papirstørrelse <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Håndtaket for å utvide"</string>
diff --git a/packages/PrintSpooler/res/values-ne-rNP/strings.xml b/packages/PrintSpooler/res/values-ne-rNP/strings.xml
index 09e55ee..7ccb0d4 100644
--- a/packages/PrintSpooler/res/values-ne-rNP/strings.xml
+++ b/packages/PrintSpooler/res/values-ne-rNP/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF को रूपमा सुरक्षित गर्नुहोस्"</string>
<string name="all_printers" msgid="5018829726861876202">"सबै प्रिन्टरहरू..."</string>
<string name="print_dialog" msgid="32628687461331979">"सम्वाद छाप्नुहोस्"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> को <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> पृष्ठ"</string>
<string name="summary_template" msgid="8899734908625669193">"सारांश, प्रतिहरू <xliff:g id="COPIES">%1$s</xliff:g> , कागज आकार <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ह्यान्डल विस्तार गर्नुहोस्"</string>
diff --git a/packages/PrintSpooler/res/values-nl/strings.xml b/packages/PrintSpooler/res/values-nl/strings.xml
index 99726ef..a67c84b 100644
--- a/packages/PrintSpooler/res/values-nl/strings.xml
+++ b/packages/PrintSpooler/res/values-nl/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Opslaan als pdf"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle printers…"</string>
<string name="print_dialog" msgid="32628687461331979">"Afdrukdialoogvenster"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Pagina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> van <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Overzicht, <xliff:g id="COPIES">%1$s</xliff:g> exemplaren, papierformaat <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Handgreep voor uitvouwen"</string>
diff --git a/packages/PrintSpooler/res/values-pa-rIN/strings.xml b/packages/PrintSpooler/res/values-pa-rIN/strings.xml
index 2acf516..3ac4054 100644
--- a/packages/PrintSpooler/res/values-pa-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-pa-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF ਦੇ ਤੌਰ ਤੇ ਰੱਖਿਅਤ ਕਰੋ"</string>
<string name="all_printers" msgid="5018829726861876202">"ਸਾਰੇ ਪ੍ਰਿੰਟਰ…"</string>
<string name="print_dialog" msgid="32628687461331979">"ਪ੍ਰਿੰਟ ਡਾਇਲੌਗ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> ਦਾ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ਸਫ਼ਾ"</string>
<string name="summary_template" msgid="8899734908625669193">"ਸਾਰ, ਕਾਪੀਆਂ <xliff:g id="COPIES">%1$s</xliff:g>, ਪੇਪਰ ਦਾ ਆਕਾਰ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ਹੈਂਡਲ ਨੂੰ ਵਿਸਤਾਰ ਦਿਓ"</string>
diff --git a/packages/PrintSpooler/res/values-pl/strings.xml b/packages/PrintSpooler/res/values-pl/strings.xml
index 7251e34..9e790c3 100644
--- a/packages/PrintSpooler/res/values-pl/strings.xml
+++ b/packages/PrintSpooler/res/values-pl/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Zapisz jako PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Wszystkie drukarki…"</string>
<string name="print_dialog" msgid="32628687461331979">"Okno drukowania"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Strona <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> z <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Posumowanie, liczba kopii <xliff:g id="COPIES">%1$s</xliff:g>, rozmiar papieru <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Uchwyt rozwijający"</string>
diff --git a/packages/PrintSpooler/res/values-pt-rBR/strings.xml b/packages/PrintSpooler/res/values-pt-rBR/strings.xml
index 27e2751..eb94447 100644
--- a/packages/PrintSpooler/res/values-pt-rBR/strings.xml
+++ b/packages/PrintSpooler/res/values-pt-rBR/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Salvar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas as impressoras…"</string>
<string name="print_dialog" msgid="32628687461331979">"Diálogo de impressão"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resumo, cópias <xliff:g id="COPIES">%1$s</xliff:g>, tamanho do papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Expandir alça"</string>
diff --git a/packages/PrintSpooler/res/values-pt-rPT/strings.xml b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
index f26324b..b095392 100644
--- a/packages/PrintSpooler/res/values-pt-rPT/strings.xml
+++ b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Guardar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas as impressoras..."</string>
<string name="print_dialog" msgid="32628687461331979">"Caixa de diálogo de impressão"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resumo, <xliff:g id="COPIES">%1$s</xliff:g> cópias, tamanho do papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Expandir alça"</string>
diff --git a/packages/PrintSpooler/res/values-pt/strings.xml b/packages/PrintSpooler/res/values-pt/strings.xml
index 27e2751..eb94447 100644
--- a/packages/PrintSpooler/res/values-pt/strings.xml
+++ b/packages/PrintSpooler/res/values-pt/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Salvar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas as impressoras…"</string>
<string name="print_dialog" msgid="32628687461331979">"Diálogo de impressão"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Resumo, cópias <xliff:g id="COPIES">%1$s</xliff:g>, tamanho do papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Expandir alça"</string>
diff --git a/packages/PrintSpooler/res/values-ro/strings.xml b/packages/PrintSpooler/res/values-ro/strings.xml
index e278863..8d120807 100644
--- a/packages/PrintSpooler/res/values-ro/strings.xml
+++ b/packages/PrintSpooler/res/values-ro/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Salvați ca PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Toate imprimantele..."</string>
<string name="print_dialog" msgid="32628687461331979">"Caseta de dialog de printare"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Pagina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> din <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Rezumat, copii <xliff:g id="COPIES">%1$s</xliff:g>, dimensiunea paginii <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Ghidaj de extindere"</string>
diff --git a/packages/PrintSpooler/res/values-ru/strings.xml b/packages/PrintSpooler/res/values-ru/strings.xml
index 8db8194..148c201 100644
--- a/packages/PrintSpooler/res/values-ru/strings.xml
+++ b/packages/PrintSpooler/res/values-ru/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Сохранить как PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Все принтеры"</string>
<string name="print_dialog" msgid="32628687461331979">"Диалоговое окно печати"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> из <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Страница <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. Всего: <xliff:g id="PAGE_COUNT">%2$d</xliff:g>."</string>
<string name="summary_template" msgid="8899734908625669193">"Общие сведения. Количество копий: <xliff:g id="COPIES">%1$s</xliff:g>. Размер бумаги: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>."</string>
<string name="expand_handle" msgid="7282974448109280522">"Развернуть."</string>
diff --git a/packages/PrintSpooler/res/values-si-rLK/strings.xml b/packages/PrintSpooler/res/values-si-rLK/strings.xml
index ea97993..ffff8e0 100644
--- a/packages/PrintSpooler/res/values-si-rLK/strings.xml
+++ b/packages/PrintSpooler/res/values-si-rLK/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF ලෙස සුරකින්න"</string>
<string name="all_printers" msgid="5018829726861876202">"සියලු මුද්රණ යන්ත්ර…"</string>
<string name="print_dialog" msgid="32628687461331979">"මුද්රණ සංවාද කොටුව"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"පිටු <xliff:g id="PAGE_COUNT">%2$d</xliff:g> න් <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"සාරාංශය, පිටපත් <xliff:g id="COPIES">%1$s</xliff:g>, පිටුවේ ප්රමණය <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"විහිදන මිට"</string>
diff --git a/packages/PrintSpooler/res/values-sk/strings.xml b/packages/PrintSpooler/res/values-sk/strings.xml
index d2a1cce..a91b689 100644
--- a/packages/PrintSpooler/res/values-sk/strings.xml
+++ b/packages/PrintSpooler/res/values-sk/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Uložiť ako PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Všetky tlačiarne..."</string>
<string name="print_dialog" msgid="32628687461331979">"Dialógové okno tlače"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Stránka <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> z <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Súhrn, počet kópií: <xliff:g id="COPIES">%1$s</xliff:g>, veľkosť papiera: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Obslužný nástroj na rozbalenie"</string>
diff --git a/packages/PrintSpooler/res/values-sl/strings.xml b/packages/PrintSpooler/res/values-sl/strings.xml
index d903a14..170215a 100644
--- a/packages/PrintSpooler/res/values-sl/strings.xml
+++ b/packages/PrintSpooler/res/values-sl/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Shrani kot PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Vsi tiskalniki …"</string>
<string name="print_dialog" msgid="32628687461331979">"Pogovorno okno za tiskanje"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Stran <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> od <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Povzetek, št. kopij <xliff:g id="COPIES">%1$s</xliff:g>, velikost papirja <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Ročica za razširitev"</string>
diff --git a/packages/PrintSpooler/res/values-sq-rAL/strings.xml b/packages/PrintSpooler/res/values-sq-rAL/strings.xml
index b5c1ac5..2bee709 100644
--- a/packages/PrintSpooler/res/values-sq-rAL/strings.xml
+++ b/packages/PrintSpooler/res/values-sq-rAL/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Ruaje si PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Të gjithë printerët…"</string>
<string name="print_dialog" msgid="32628687461331979">"Printo dialogun"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Faqja <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> nga gjithsej <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Përmbledhja, kopjet <xliff:g id="COPIES">%1$s</xliff:g>, madhësia e letrës <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Zgjero dorezën"</string>
diff --git a/packages/PrintSpooler/res/values-sr/strings.xml b/packages/PrintSpooler/res/values-sr/strings.xml
index 7e61aa8..012bbbc 100644
--- a/packages/PrintSpooler/res/values-sr/strings.xml
+++ b/packages/PrintSpooler/res/values-sr/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Сачувај као PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Сви штампачи…"</string>
<string name="print_dialog" msgid="32628687461331979">"Дијалог за штампање"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. страница од <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Резиме, копије (<xliff:g id="COPIES">%1$s</xliff:g>), величина папира <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Регулатор за ширење"</string>
diff --git a/packages/PrintSpooler/res/values-sv/strings.xml b/packages/PrintSpooler/res/values-sv/strings.xml
index 5aa015d..4c6f2ec 100644
--- a/packages/PrintSpooler/res/values-sv/strings.xml
+++ b/packages/PrintSpooler/res/values-sv/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Spara som PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alla skrivare ..."</string>
<string name="print_dialog" msgid="32628687461331979">"Dialogrutan Skriv ut"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Sidan <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> av <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Sammanfattning, antal kopior <xliff:g id="COPIES">%1$s</xliff:g>, pappersformat <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Handtag som expanderar utskriftsalternativen"</string>
diff --git a/packages/PrintSpooler/res/values-sw/strings.xml b/packages/PrintSpooler/res/values-sw/strings.xml
index 8a87537..5808b30 100644
--- a/packages/PrintSpooler/res/values-sw/strings.xml
+++ b/packages/PrintSpooler/res/values-sw/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Hifadhi kama PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Printa zote..."</string>
<string name="print_dialog" msgid="32628687461331979">"Chapisha mazungumzo"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Ukurasa wa <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> kati ya <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Muhtasari, nakala <xliff:g id="COPIES">%1$s</xliff:g>, ukubwa wa karatasi <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Panua kishikio"</string>
diff --git a/packages/PrintSpooler/res/values-ta-rIN/strings.xml b/packages/PrintSpooler/res/values-ta-rIN/strings.xml
index 8bc3d93..38ca714 100644
--- a/packages/PrintSpooler/res/values-ta-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-ta-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF ஆக சேமி"</string>
<string name="all_printers" msgid="5018829726861876202">"எல்லா அச்சுப்பொறிகளும்…"</string>
<string name="print_dialog" msgid="32628687461331979">"அச்சிடல் செய்தி"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"பக்கம்: <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"சுருக்கம், நகல்கள் <xliff:g id="COPIES">%1$s</xliff:g>, தாள் அளவு <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ஹேண்டிலை விரிவாக்கு"</string>
diff --git a/packages/PrintSpooler/res/values-te-rIN/strings.xml b/packages/PrintSpooler/res/values-te-rIN/strings.xml
index 7680bed..b8c95de 100644
--- a/packages/PrintSpooler/res/values-te-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-te-rIN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF వలె సేవ్ చేయి"</string>
<string name="all_printers" msgid="5018829726861876202">"అన్ని ప్రింటర్లు…"</string>
<string name="print_dialog" msgid="32628687461331979">"ముద్రణ డైలాగ్"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g>లో <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>వ పేజీ"</string>
<string name="summary_template" msgid="8899734908625669193">"సారాంశం, కాపీలు <xliff:g id="COPIES">%1$s</xliff:g>, కాగితం పరిమాణం <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"విస్తరణ హ్యాండిల్"</string>
diff --git a/packages/PrintSpooler/res/values-th/strings.xml b/packages/PrintSpooler/res/values-th/strings.xml
index 6d4131c..6e4d922 100644
--- a/packages/PrintSpooler/res/values-th/strings.xml
+++ b/packages/PrintSpooler/res/values-th/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"บันทึกเป็น PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"เครื่องพิมพ์ทั้งหมด…"</string>
<string name="print_dialog" msgid="32628687461331979">"ช่องโต้ตอบการพิมพ์"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"หน้า <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> จาก <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"สรุป สำเนา <xliff:g id="COPIES">%1$s</xliff:g>, ขนาดกระดาษ <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"ปุ่มขยาย"</string>
diff --git a/packages/PrintSpooler/res/values-tl/strings.xml b/packages/PrintSpooler/res/values-tl/strings.xml
index c2c87fc..9592448 100644
--- a/packages/PrintSpooler/res/values-tl/strings.xml
+++ b/packages/PrintSpooler/res/values-tl/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"I-save bilang PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Lahat ng printer…"</string>
<string name="print_dialog" msgid="32628687461331979">"Dialog ng pag-print"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ng <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Buod, mga kopya <xliff:g id="COPIES">%1$s</xliff:g>, laki ng papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Palakihin ang handle"</string>
diff --git a/packages/PrintSpooler/res/values-tr/strings.xml b/packages/PrintSpooler/res/values-tr/strings.xml
index 2df11f5..a9b80a5 100644
--- a/packages/PrintSpooler/res/values-tr/strings.xml
+++ b/packages/PrintSpooler/res/values-tr/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF olarak kaydet"</string>
<string name="all_printers" msgid="5018829726861876202">"Tüm yazıcılar…"</string>
<string name="print_dialog" msgid="32628687461331979">"Yazdırma iletişim kutusu"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Sayfa <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Özet. Kopya sayısı: <xliff:g id="COPIES">%1$s</xliff:g>, kağıt boyutu: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Genişletme tutacağı"</string>
diff --git a/packages/PrintSpooler/res/values-uk/strings.xml b/packages/PrintSpooler/res/values-uk/strings.xml
index 7a2d9d3..13b7c97 100644
--- a/packages/PrintSpooler/res/values-uk/strings.xml
+++ b/packages/PrintSpooler/res/values-uk/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Зберегти як PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Усі принтери…"</string>
<string name="print_dialog" msgid="32628687461331979">"Діалогове вікно друку"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Сторінка <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Підсумок – копій: <xliff:g id="COPIES">%1$s</xliff:g>, розмір паперу: <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Кнопка розгортання"</string>
diff --git a/packages/PrintSpooler/res/values-ur-rPK/strings.xml b/packages/PrintSpooler/res/values-ur-rPK/strings.xml
index 84459fa..f07cbd8 100644
--- a/packages/PrintSpooler/res/values-ur-rPK/strings.xml
+++ b/packages/PrintSpooler/res/values-ur-rPK/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF کے بطور محفوظ کریں"</string>
<string name="all_printers" msgid="5018829726861876202">"سبھی پرنٹرز…"</string>
<string name="print_dialog" msgid="32628687461331979">"پرنٹ ڈائلاگ"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"صفحہ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> از <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"خلاصہ، کاپیاں <xliff:g id="COPIES">%1$s</xliff:g>، کاغذ کا سائز <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"پھیلانے والا ہینڈل"</string>
diff --git a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml b/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
index 61bd9c2..00fe666 100644
--- a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
+++ b/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"PDF formatida saqlash"</string>
<string name="all_printers" msgid="5018829726861876202">"Barcha printerlar"</string>
<string name="print_dialog" msgid="32628687461331979">"Chop etish oynasi"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Sahifa: <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Xulosa: nusxalar soni – <xliff:g id="COPIES">%1$s</xliff:g>, qog‘oz o‘lchami – <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Dastakni yoyish"</string>
diff --git a/packages/PrintSpooler/res/values-vi/strings.xml b/packages/PrintSpooler/res/values-vi/strings.xml
index b04c513..bf18e8c 100644
--- a/packages/PrintSpooler/res/values-vi/strings.xml
+++ b/packages/PrintSpooler/res/values-vi/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Lưu dưới dạng PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Tất cả máy in…"</string>
<string name="print_dialog" msgid="32628687461331979">"Hộp thoại in"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Trang <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Tóm tắt, số bản sao <xliff:g id="COPIES">%1$s</xliff:g>, khổ giấy <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Mở rộng điều khiển"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rCN/strings.xml b/packages/PrintSpooler/res/values-zh-rCN/strings.xml
index b214d54..5e9d9c8 100644
--- a/packages/PrintSpooler/res/values-zh-rCN/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rCN/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"保存为 PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"所有打印机…"</string>
<string name="print_dialog" msgid="32628687461331979">"打印对话框"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"第<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>页，共<xliff:g id="PAGE_COUNT">%2$d</xliff:g>页"</string>
<string name="summary_template" msgid="8899734908625669193">"摘要，<xliff:g id="COPIES">%1$s</xliff:g>份，纸张尺寸为<xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"展开手柄"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rHK/strings.xml b/packages/PrintSpooler/res/values-zh-rHK/strings.xml
index 4597156..2ca6d37 100644
--- a/packages/PrintSpooler/res/values-zh-rHK/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rHK/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"儲存為 PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"所有打印機…"</string>
<string name="print_dialog" msgid="32628687461331979">"列印對話方塊"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"第 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> 頁，共 <xliff:g id="PAGE_COUNT">%2$d</xliff:g> 頁"</string>
<string name="page_description_template" msgid="6831239682256197161">"第 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> 頁，共 <xliff:g id="PAGE_COUNT">%2$d</xliff:g> 頁"</string>
<string name="summary_template" msgid="8899734908625669193">"摘要，<xliff:g id="COPIES">%1$s</xliff:g> 份，<xliff:g id="PAPER_SIZE">%2$s</xliff:g> 紙張大小"</string>
<string name="expand_handle" msgid="7282974448109280522">"展開控點"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rTW/strings.xml b/packages/PrintSpooler/res/values-zh-rTW/strings.xml
index a9a7e61..921bf45 100644
--- a/packages/PrintSpooler/res/values-zh-rTW/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rTW/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"儲存為 PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"所有印表機…"</string>
<string name="print_dialog" msgid="32628687461331979">"印表機對話方塊"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"第 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> 頁，共 <xliff:g id="PAGE_COUNT">%2$d</xliff:g> 頁"</string>
<string name="summary_template" msgid="8899734908625669193">"摘要，<xliff:g id="COPIES">%1$s</xliff:g> 份，紙張為 <xliff:g id="PAPER_SIZE">%2$s</xliff:g> 大小"</string>
<string name="expand_handle" msgid="7282974448109280522">"展開控點"</string>
diff --git a/packages/PrintSpooler/res/values-zu/strings.xml b/packages/PrintSpooler/res/values-zu/strings.xml
index 00c8f57..d3dcd13 100644
--- a/packages/PrintSpooler/res/values-zu/strings.xml
+++ b/packages/PrintSpooler/res/values-zu/strings.xml
@@ -38,8 +38,7 @@
<string name="save_as_pdf" msgid="5718454119847596853">"Londoloza njenge-PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Wonke amaphrinta…"</string>
<string name="print_dialog" msgid="32628687461331979">"Ingxoxo yokuphrinta"</string>
- <!-- no translation found for current_page_template (5145005201131935302) -->
- <skip />
+ <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="page_description_template" msgid="6831239682256197161">"Ikhasi <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> kwangu-<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
<string name="summary_template" msgid="8899734908625669193">"Isifinyezo, amakholi <xliff:g id="COPIES">%1$s</xliff:g>, usayisi wekhasi <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
<string name="expand_handle" msgid="7282974448109280522">"Nwebisa isibambi"</string>
diff --git a/packages/PrintSpooler/res/values/colors.xml b/packages/PrintSpooler/res/values/colors.xml
index 9b4e944..d83d364 100644
--- a/packages/PrintSpooler/res/values/colors.xml
+++ b/packages/PrintSpooler/res/values/colors.xml
@@ -16,8 +16,6 @@
<resources>
- <color name="print_button_tint_color">#EEFF41</color>
-
<color name="print_preview_scrim_color">#99000000</color>
<color name="print_preview_background_color">#F2F1F2</color>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
index 999d82d..6140428 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
@@ -838,9 +838,15 @@
try (ParcelFileDescriptor source = pipe[0]) {
try (ParcelFileDescriptor destination = pipe[1]) {
-
- mRenderer.renderPage(mPageIndex, bitmap.getWidth(), bitmap.getHeight(),
- mRenderSpec.printAttributes, destination);
+ synchronized (mLock) {
+ if (mRenderer != null) {
+ mRenderer.renderPage(mPageIndex, bitmap.getWidth(),
+ bitmap.getHeight(), mRenderSpec.printAttributes,
+ destination);
+ } else {
+ throw new IllegalStateException("Renderer is disconnected");
+ }
+ }
}
BitmapSerializeUtils.readBitmapPixels(bitmap, source);
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java b/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java
index 5b9b169..6e1385a 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java
@@ -94,6 +94,7 @@
// but the content has changed.
if (mNextCommand == null) {
if (mUpdateSpec.pages != null && (mDocumentInfo.changed
+ || mDocumentInfo.writtenPages == null
|| (mDocumentInfo.info.getPageCount()
!= PrintDocumentInfo.PAGE_COUNT_UNKNOWN
&& !PageRangeUtils.contains(mDocumentInfo.writtenPages,
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java
index ab3bbdb..1bebebc 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java
@@ -753,9 +753,11 @@
public void updateInstalledServices(List<PrintServiceInfo> services) {
mInstalledServices.clear();
- final int numServices = services.size();
- for (int i = 0; i < numServices; i++) {
- mInstalledServices.add(services.get(i).getComponentName().getPackageName());
+ if (services != null) {
+ final int numServices = services.size();
+ for (int i = 0; i < numServices; i++) {
+ mInstalledServices.add(services.get(i).getComponentName().getPackageName());
+ }
}
filterRecommendations();
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 02609b1..1d50a24 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -264,6 +264,8 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setTitle(R.string.print_dialog);
+
Bundle extras = getIntent().getExtras();
mPrintJob = extras.getParcelable(PrintManager.EXTRA_PRINT_JOB);
@@ -322,7 +324,6 @@
// Now that we are bound to the local print spooler service
// and the printer registry loaded the historical printers
// we can show the UI without flickering.
- setTitle(R.string.print_dialog);
setContentView(R.layout.print_activity);
try {
@@ -549,6 +550,14 @@
.setContentType(info.getContentType())
.setPageCount(pageCount)
.build();
+
+ File file = mFileProvider.acquireFile(null);
+ try {
+ adjustedInfo.setDataSize(file.length());
+ } finally {
+ mFileProvider.releaseFile();
+ }
+
mPrintJob.setDocumentInfo(adjustedInfo);
mPrintJob.setPages(document.printedPages);
}
@@ -2116,6 +2125,7 @@
if (mPrinterRegistry != null) {
mPrinterRegistry.setTrackedPrinter(null);
+ mPrinterRegistry.setOnPrintersChangeListener(null);
}
if (mPrintersObserver != null) {
@@ -3198,6 +3208,14 @@
.setContentType(oldDocInfo.getContentType())
.setPageCount(newPageCount)
.build();
+
+ File file = mFileProvider.acquireFile(null);
+ try {
+ newDocInfo.setDataSize(file.length());
+ } finally {
+ mFileProvider.releaseFile();
+ }
+
mPrintJob.setDocumentInfo(newDocInfo);
}
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrinterRegistry.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrinterRegistry.java
index 86366dd..9fca959 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrinterRegistry.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrinterRegistry.java
@@ -120,13 +120,11 @@
@Override
public void onLoaderReset(Loader<List<PrinterInfo>> loader) {
mPrinters.clear();
- if (mOnPrintersChangeListener != null) {
- // Post a message as we are in onLoadFinished and certain operations
- // are not allowed in this callback, such as fragment transactions.
- // Clients should not handle this explicitly.
- mHandler.obtainMessage(MyHandler.MSG_PRINTERS_INVALID,
- mOnPrintersChangeListener).sendToTarget();
- }
+
+ // Post a message as we are in onLoadFinished and certain operations
+ // are not allowed in this callback, such as fragment transactions.
+ // Clients should not handle this explicitly.
+ mHandler.obtainMessage(MyHandler.MSG_PRINTERS_INVALID).sendToTarget();
}
// LoaderCallbacks#onLoadFinished
@@ -134,15 +132,12 @@
public void onLoadFinished(Loader<List<PrinterInfo>> loader, List<PrinterInfo> printers) {
mPrinters.clear();
mPrinters.addAll(printers);
- if (mOnPrintersChangeListener != null) {
- // Post a message as we are in onLoadFinished and certain operations
- // are not allowed in this callback, such as fragment transactions.
- // Clients should not handle this explicitly.
- SomeArgs args = SomeArgs.obtain();
- args.arg1 = mOnPrintersChangeListener;
- args.arg2 = printers;
- mHandler.obtainMessage(MyHandler.MSG_PRINTERS_CHANGED, args).sendToTarget();
- }
+
+ // Post a message as we are in onLoadFinished and certain operations
+ // are not allowed in this callback, such as fragment transactions.
+ // Clients should not handle this explicitly.
+ mHandler.obtainMessage(MyHandler.MSG_PRINTERS_CHANGED, printers).sendToTarget();
+
if (!mReady) {
mReady = true;
if (mReadyCallback != null) {
@@ -158,7 +153,7 @@
}
};
- private static final class MyHandler extends Handler {
+ private final class MyHandler extends Handler {
public static final int MSG_PRINTERS_CHANGED = 0;
public static final int MSG_PRINTERS_INVALID = 1;
@@ -171,16 +166,17 @@
public void handleMessage(Message message) {
switch (message.what) {
case MSG_PRINTERS_CHANGED: {
- SomeArgs args = (SomeArgs) message.obj;
- OnPrintersChangeListener callback = (OnPrintersChangeListener) args.arg1;
- List<PrinterInfo> printers = (List<PrinterInfo>) args.arg2;
- args.recycle();
- callback.onPrintersChanged(printers);
+ List<PrinterInfo> printers = (List<PrinterInfo>) message.obj;
+
+ if (mOnPrintersChangeListener != null) {
+ mOnPrintersChangeListener.onPrintersChanged(printers);
+ }
} break;
case MSG_PRINTERS_INVALID: {
- OnPrintersChangeListener callback = (OnPrintersChangeListener) message.obj;
- callback.onPrintersInvalid();
+ if (mOnPrintersChangeListener != null) {
+ mOnPrintersChangeListener.onPrintersInvalid();
+ }
} break;
}
}
diff --git a/packages/SettingsLib/res/layout/usage_view.xml b/packages/SettingsLib/res/layout/usage_view.xml
index aa1a046..1d56668 100644
--- a/packages/SettingsLib/res/layout/usage_view.xml
+++ b/packages/SettingsLib/res/layout/usage_view.xml
@@ -71,9 +71,11 @@
android:id="@+id/bottom_label_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/usage_graph_labels_width"
android:orientation="horizontal">
-
+ <Space
+ android:id="@+id/bottom_label_space"
+ android:layout_width="@dimen/usage_graph_labels_width"
+ android:layout_height="wrap_content"/>
<include android:id="@+id/label_start"
layout="@layout/usage_side_label" />
diff --git a/packages/SettingsLib/res/values-af/arrays.xml b/packages/SettingsLib/res/values-af/arrays.xml
index 5193384..13c22c4 100644
--- a/packages/SettingsLib/res/values-af/arrays.xml
+++ b/packages/SettingsLib/res/values-af/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Af"</item>
<item msgid="3054662377365844197">"Alles"</item>
<item msgid="688870735111627832">"Alles behalwe radio"</item>
+ <item msgid="2850427388488887328">"net kern"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Af"</item>
<item msgid="172978079776521897">"Alle loglêerbuffers"</item>
<item msgid="3873873912383879240">"Alles behalwe radiologlêerbuffers"</item>
+ <item msgid="8489661142527693381">"net kernloglêerbuffer"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animasie af"</item>
diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml
index 54d1201..c16e08a 100644
--- a/packages/SettingsLib/res/values-af/strings.xml
+++ b/packages/SettingsLib/res/values-af/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Aktiveer aansigkenmerkinspeksie"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gebruik eerder die DHCP-kliënt van Lollipop af as die nuwe Android DHCP-kliënt."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Hou mobiele data altyd aktief, selfs wanneer Wi‑Fi aktief is (vir vinnige netwerkwisseling)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-ontfouting is net vir ontwikkelingsdoeleindes bedoel. Gebruik dit om data te kopieer tussen jou rekenaar en jou toestel, programme op jou toestel te installeer sonder kennisgewing en om loglêerdata te lees."</string>
diff --git a/packages/SettingsLib/res/values-am/arrays.xml b/packages/SettingsLib/res/values-am/arrays.xml
index e8176e1..5767829 100644
--- a/packages/SettingsLib/res/values-am/arrays.xml
+++ b/packages/SettingsLib/res/values-am/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ጠፍቷል"</item>
<item msgid="3054662377365844197">"ሁሉም"</item>
<item msgid="688870735111627832">"ከሬዲዮ በስተቀር ሁሉም"</item>
+ <item msgid="2850427388488887328">"አውራ ከዋኝ ብቻ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ጠፍቷል"</item>
<item msgid="172978079776521897">"የሁሉም ምዝግብ ማስታወሻ ቋቶች"</item>
<item msgid="3873873912383879240">"ከሬዲዮ ምዝግብ ማስታወሻ ቋቶች በስተቀር ሁሉም"</item>
+ <item msgid="8489661142527693381">"የአውራ ከዋኝ ምዝግብ ማስታወሻ ቋት ብቻ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"እነማ ጠፍቷል"</item>
diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml
index ecedd50..6e9dcd7 100644
--- a/packages/SettingsLib/res/values-am/strings.xml
+++ b/packages/SettingsLib/res/values-am/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"የእይታ አይነታ ምርመራን አንቃ"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ከአዲሱ የAndroid DHCP ደንበኛ ይልቅ የLollipop DHCP ደንበኛውን ይጠቀሙ።"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ምንም እንኳን Wi‑Fi ንቁ ቢሆንም የሞባይል ውሂብን ንቁ እንደሆነ አቆይ (ለፈጣን የአውታረ መረብ ቅይይር)።"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርህ ወደ መሳሪያህ ውሂብ ለመገልበጥ፣ መሣሪያህ ላይ ያለ ማሳወቂያ መተግበሪያዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
diff --git a/packages/SettingsLib/res/values-ar/arrays.xml b/packages/SettingsLib/res/values-ar/arrays.xml
index e50421e..e3d70fe 100644
--- a/packages/SettingsLib/res/values-ar/arrays.xml
+++ b/packages/SettingsLib/res/values-ar/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"إيقاف"</item>
<item msgid="3054662377365844197">"الكل"</item>
<item msgid="688870735111627832">"الكل دون اللاسلكي"</item>
+ <item msgid="2850427388488887328">"kernel فقط"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"إيقاف"</item>
<item msgid="172978079776521897">"كل المخازن المؤقتة للسجلات"</item>
<item msgid="3873873912383879240">"كل المخازن المؤقتة باستثناء مخازن سجلات اللاسلكي"</item>
+ <item msgid="8489661142527693381">"التخزين المؤقت لسجل kernel فقط"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"إيقاف الرسوم المتحركة"</item>
diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml
index 1f6e9bf..ee579dc 100644
--- a/packages/SettingsLib/res/values-ar/strings.xml
+++ b/packages/SettingsLib/res/values-ar/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"تمكين فحص سمة العرض"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"يمكنك استخدام برنامج DHCP من Lollipop بدلاً من برنامج DHCP الجديد على Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"اجعل بيانات الجوّال نشطة دائمًا، حتى عندما يكون اتصال Wi‑Fi نشطًا (لتبديل الشبكة بسرعة)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"هل تريد السماح بتصحيح أخطاء USB؟"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"تم تصميم تصحيح أخطاء USB لأغراض التطوير فقط. يمكن استخدامه لنسخ البيانات بين الكمبيوتر والجهاز، وتثبيت التطبيقات على جهازك بدون تنبيه، وقراءة بيانات السجل."</string>
diff --git a/packages/SettingsLib/res/values-az-rAZ/arrays.xml b/packages/SettingsLib/res/values-az-rAZ/arrays.xml
index 49bc262..396dfa1 100644
--- a/packages/SettingsLib/res/values-az-rAZ/arrays.xml
+++ b/packages/SettingsLib/res/values-az-rAZ/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Deaktiv"</item>
<item msgid="3054662377365844197">"Bütün"</item>
<item msgid="688870735111627832">"Radiodan başqa hamısı"</item>
+ <item msgid="2850427388488887328">"yalnız kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Qeyri-aktiv"</item>
<item msgid="172978079776521897">"Bütün loq buferləri"</item>
<item msgid="3873873912383879240">"Radio loq buferlərindən başqa hamısı"</item>
+ <item msgid="8489661142527693381">"yalnız kernel loq bufferi"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animasiya deaktiv"</item>
diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az-rAZ/strings.xml
index 2be5150..60d0169 100644
--- a/packages/SettingsLib/res/values-az-rAZ/strings.xml
+++ b/packages/SettingsLib/res/values-az-rAZ/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Sınaq yerləşmələrə icazə verin"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Sınaq yerləşmələrə icazə verin"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Atribut inspeksiyasına baxışa icazə verin"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Android DHCP klienti əvəzinə Lollipopdan DHCP klient istifadə edin."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Hətta Wi‑Fi aktiv olanda da mobil datanı həmişə aktiv saxlayın (sürətli şəbəkək keçidi üçün)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB debaq funksiyasına icazə verilsin?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB sazlanması yalnız inkişaf məqsədlidir. Kompüteriniz və cihazınız arasında datanı kopyalamaq üçün ondan istifadə edin, bildiriş olmadan tətbiqləri cihazınıza quraşdırın və qeydiyyat datasını oxuyun."</string>
diff --git a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml
index 47c6a28..3e9f904 100644
--- a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml
+++ b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Isključeno"</item>
<item msgid="3054662377365844197">"Sve"</item>
<item msgid="688870735111627832">"Sve sem radija"</item>
+ <item msgid="2850427388488887328">"samo jezgro"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Isključeno"</item>
<item msgid="172978079776521897">"Sve međumemorije evidencija"</item>
<item msgid="3873873912383879240">"Sve osim međumemorija evidencija za radio"</item>
+ <item msgid="8489661142527693381">"samo međumemorija evidencije jezgra"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacija je isključena"</item>
diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
index 1af4d23..060a5fb 100644
--- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
+++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Dozvoli lažne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dozvoli lažne lokacije"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Omogući proveru atributa za pregled"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Koristite DHCP klijent iz Lollipop-a umesto novog Android DHCP klijenta."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Neka podaci za mobilne uređaje uvek budu aktivni, čak i kada je Wi‑Fi aktivan (radi brze promene mreže)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Dozvoli otklanjanje USB grešaka?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Otklanjanje USB grešaka namenjeno je samo za svrhe programiranja. Koristite ga za kopiranje podataka sa računara na uređaj i obrnuto, instaliranje aplikacija na uređaju bez obaveštenja i čitanje podataka iz evidencije."</string>
diff --git a/packages/SettingsLib/res/values-be-rBY/arrays.xml b/packages/SettingsLib/res/values-be-rBY/arrays.xml
index 5374d28..20106ef 100644
--- a/packages/SettingsLib/res/values-be-rBY/arrays.xml
+++ b/packages/SettingsLib/res/values-be-rBY/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Адключана"</item>
<item msgid="3054662377365844197">"Усе"</item>
<item msgid="688870735111627832">"Усе, акрамя радыё"</item>
+ <item msgid="2850427388488887328">"толькі ядро"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Адключана"</item>
<item msgid="172978079776521897">"Усе буферы журналаў"</item>
<item msgid="3873873912383879240">"Усе, акрамя буфераў журналаў радыё"</item>
+ <item msgid="8489661142527693381">"толькі буфер журнала ядра"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Анімацыя выключаная"</item>
diff --git a/packages/SettingsLib/res/values-be-rBY/strings.xml b/packages/SettingsLib/res/values-be-rBY/strings.xml
index 90d5bca..03de8ba 100644
--- a/packages/SettingsLib/res/values-be-rBY/strings.xml
+++ b/packages/SettingsLib/res/values-be-rBY/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Дазволіць несапраўдныя месцы"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Дазволіць несапраўдныя месцы"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Уключыць прагляд атрыбутаў"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Выкарыстоўвайце кліент DHCP ад Lollipop замест новага кліента Android DHCP."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Перадача даных мабільнай сувязі заўсёды актыўна, нават калі актыўна сетка Wi‑Fi (для хуткага пераключэння паміж сеткамі)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Дазволіць адладку USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Адладка USB прызначана толькі для мэтаў распрацоўкі. Яна можа выкарыстоўвацца, каб капіяваць дадзеныя паміж кампутарам і прыладай, усталёўваць прыкладанні на прыладзе без папярэдняга апавяшчэння і чытаць дадзеныя дзённiка."</string>
diff --git a/packages/SettingsLib/res/values-bg/arrays.xml b/packages/SettingsLib/res/values-bg/arrays.xml
index 5831456..8e803f5 100644
--- a/packages/SettingsLib/res/values-bg/arrays.xml
+++ b/packages/SettingsLib/res/values-bg/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Изкл."</item>
<item msgid="3054662377365844197">"Всички"</item>
<item msgid="688870735111627832">"Вс. без радио"</item>
+ <item msgid="2850427388488887328">"само ядрото"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Изкл."</item>
<item msgid="172978079776521897">"Всички регистрационни буфери"</item>
<item msgid="3873873912383879240">"Всички регистрационни буфери освен тези за радиото"</item>
+ <item msgid="8489661142527693381">"само регистрационния буфер на ядрото"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Анимацията е изключена"</item>
diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml
index 81c834f..f6596dc 100644
--- a/packages/SettingsLib/res/values-bg/strings.xml
+++ b/packages/SettingsLib/res/values-bg/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Актив. на инспектирането на атрибутите за преглед"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Използване на клиентската програма за DHCP от Lollipop вместо новата програма на Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Мобилните данни са активни винаги – дори когато функцията за Wi‑Fi е включена (за бързо превключване между мрежите)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Отстраняването на грешки през USB е предназначено само за програмни цели. Използвайте го за копиране на данни между компютъра и устройството си, за инсталиране на приложения на устройството си без известяване и за четене на регистрационни данни."</string>
diff --git a/packages/SettingsLib/res/values-bn-rBD/arrays.xml b/packages/SettingsLib/res/values-bn-rBD/arrays.xml
index bf666cf..d653a97 100644
--- a/packages/SettingsLib/res/values-bn-rBD/arrays.xml
+++ b/packages/SettingsLib/res/values-bn-rBD/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"বন্ধ আছে"</item>
<item msgid="3054662377365844197">"সমস্ত"</item>
<item msgid="688870735111627832">"সমস্ত কিন্তু রেডিও"</item>
+ <item msgid="2850427388488887328">"শুধুমাত্র কার্নেল"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"বন্ধ আছে"</item>
<item msgid="172978079776521897">"সমস্ত লগ বাফার"</item>
<item msgid="3873873912383879240">"সমস্ত কিন্তু রেডিও লগ বাফারগুলি"</item>
+ <item msgid="8489661142527693381">"শুধুমাত্র কার্নেল লগ বাফার"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"অ্যানিমেশন বন্ধ করুন"</item>
diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn-rBD/strings.xml
index f6c2419..4a11198 100644
--- a/packages/SettingsLib/res/values-bn-rBD/strings.xml
+++ b/packages/SettingsLib/res/values-bn-rBD/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের অনুমতি দিন"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"মক অবস্থানগুলি মঞ্জুর করুন"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"অ্যাট্রিবিউট পরিদর্শন দেখা সক্ষম করুন"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"নতুন Android DHCP ক্লায়েন্টের পরিবর্তে Lollipop এর থেকে DHCP ক্লায়েন্ট ব্যবহার করুন৷"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ওয়াই-ফাই সক্রিয় থাকার সময়েও (দ্রুত নেটওয়ার্কে পাল্টানোর জন্য) সর্বদা মোবাইল ডেটা সক্রিয় রাখুন।"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB ডিবাগিং মঞ্জুর করবেন?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB ডিবাগিং কেবলমাত্র বিকাশ করার উদ্দেশ্যে। আপনার কম্পিউটার এবং আপনার ডিভাইসের মধ্যে ডেটা অনুলিপি করতে এটি ব্যবহার করুন, বিজ্ঞপ্তি ছাড়া আপনার ডিভাইসে অ্যাপ্লিকেশানগুলি ইনস্টল করুন এবং ডেটা লগ পড়ুন।"</string>
diff --git a/packages/SettingsLib/res/values-bs-rBA/arrays.xml b/packages/SettingsLib/res/values-bs-rBA/arrays.xml
index a02e0b2..8452696 100644
--- a/packages/SettingsLib/res/values-bs-rBA/arrays.xml
+++ b/packages/SettingsLib/res/values-bs-rBA/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Isključeno"</item>
<item msgid="3054662377365844197">"Svi"</item>
<item msgid="688870735111627832">"Svi osim radija"</item>
+ <item msgid="2850427388488887328">"samo kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Isključeno"</item>
<item msgid="172978079776521897">"Međuspremnici svih zapisnika"</item>
<item msgid="3873873912383879240">"Međuspremnici svih zapisnika osim radija"</item>
+ <item msgid="8489661142527693381">"samo međuspremnik zapisnika kernela"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacija isključena"</item>
diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml
index 471da39..a11bf32 100644
--- a/packages/SettingsLib/res/values-bs-rBA/strings.xml
+++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Dozvoli lažne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dozvoli lažne lokacije"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Koristi DHCP klijent iz Lollipopa umjesto novog Android DHCP klijenta."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Uvijek drži mobilne podatke aktivnim, čak i kada je Wi-Fi je aktivan (za brzo prebacivanje između mreža)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti USB otklanjanje grešaka?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB otklanjanje grešaka je namijenjeno samo u svrhe razvoja aplikacija. Koristite ga za kopiranje podataka između računara i uređaja, instaliranje aplikacija na uređaj bez obavještenja te čitanje podataka iz zapisnika."</string>
diff --git a/packages/SettingsLib/res/values-ca/arrays.xml b/packages/SettingsLib/res/values-ca/arrays.xml
index 9f987e6..e4f618e 100644
--- a/packages/SettingsLib/res/values-ca/arrays.xml
+++ b/packages/SettingsLib/res/values-ca/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desactivat"</item>
<item msgid="3054662377365844197">"Tot"</item>
<item msgid="688870735111627832">"Tot menys mòbil"</item>
+ <item msgid="2850427388488887328">"només kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desactivat"</item>
<item msgid="172978079776521897">"Totes les memòries intermèdies de registre"</item>
<item msgid="3873873912383879240">"Tot menys mem. interm. de registre de senyal mòbil"</item>
+ <item msgid="8489661142527693381">"només memòria intermèdia del registre de kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animació desactivada"</item>
diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml
index 13933ae..fb7180a 100644
--- a/packages/SettingsLib/res/values-ca/strings.xml
+++ b/packages/SettingsLib/res/values-ca/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Inspecció d\'atributs de visualització"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilitza el client DHCP de Lollipop en lloc del nou client DHCP d\'Android"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mantén les dades mòbils sempre actives, fins i tot quan la Wi‑Fi està activada (per canviar de xarxa ràpidament)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"La depuració USB només està indicada per a activitats de desenvolupament. Fes-la servir intercanviar dades entre l\'ordinador i el dispositiu, per instal·lar aplicacions al dispositiu sense rebre notificacions i per llegir dades de registre."</string>
diff --git a/packages/SettingsLib/res/values-cs/arrays.xml b/packages/SettingsLib/res/values-cs/arrays.xml
index f70eb78..b0185e8 100644
--- a/packages/SettingsLib/res/values-cs/arrays.xml
+++ b/packages/SettingsLib/res/values-cs/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Vypnuto"</item>
<item msgid="3054662377365844197">"Vše"</item>
<item msgid="688870735111627832">"Bezdrát. ne"</item>
+ <item msgid="2850427388488887328">"pouze jádro"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Vypnuto"</item>
<item msgid="172978079776521897">"Všechny vyrovnávací paměti protokolů"</item>
<item msgid="3873873912383879240">"Všechny kromě protokolu bezdrátových modulů"</item>
+ <item msgid="8489661142527693381">"pouze protokol vyrovnávací paměti jádra"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animace je vypnuta"</item>
diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml
index 781f65a..361ba1f 100644
--- a/packages/SettingsLib/res/values-cs/strings.xml
+++ b/packages/SettingsLib/res/values-cs/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Kontrola atributu zobrazení"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Namísto nového klientu DHCP Android použít klient DHCP z verze Lollipop."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mobilní data budou vždy ponechána aktivní, i když bude aktivní Wi-Fi (za účelem rychlého přepínání sítí)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Ladění prostřednictvím rozhraní USB je určeno pouze pro účely vývoje. Použijte je ke kopírování dat mezi počítačem a zařízením, instalaci aplikací do zařízení bez upozornění a čtení dat protokolů."</string>
diff --git a/packages/SettingsLib/res/values-da/arrays.xml b/packages/SettingsLib/res/values-da/arrays.xml
index 7413f65..d06f39f 100644
--- a/packages/SettingsLib/res/values-da/arrays.xml
+++ b/packages/SettingsLib/res/values-da/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Slået fra"</item>
<item msgid="3054662377365844197">"Alle"</item>
<item msgid="688870735111627832">"Radio undtaget"</item>
+ <item msgid="2850427388488887328">"kun kerne"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Slået fra"</item>
<item msgid="172978079776521897">"Alle logbuffere"</item>
<item msgid="3873873912383879240">"Alle undtagen radiologbuffere"</item>
+ <item msgid="8489661142527693381">"kun logbuffer for kerne"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation fra"</item>
diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml
index 45a3978..98f41fc 100644
--- a/packages/SettingsLib/res/values-da/strings.xml
+++ b/packages/SettingsLib/res/values-da/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér visning af attributinspektion"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Brug DHCP-klienten fra Lollipop i stedet for den nye DHCP-klient i Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Hold altid mobildata aktiveret, selv når Wi-Fi er aktiveret (for at skifte hurtigt mellem netværk)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-fejlretning er kun beregnet til udvikling og kan bruges til at kopiere data mellem din computer og enheden, installere apps på enheden uden meddelelser og læse logdata."</string>
diff --git a/packages/SettingsLib/res/values-de/arrays.xml b/packages/SettingsLib/res/values-de/arrays.xml
index ab62cd2..9a81e8f 100644
--- a/packages/SettingsLib/res/values-de/arrays.xml
+++ b/packages/SettingsLib/res/values-de/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Aus"</item>
<item msgid="3054662377365844197">"Alle"</item>
<item msgid="688870735111627832">"Alle außer Funkschnittstelle"</item>
+ <item msgid="2850427388488887328">"Nur Kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Aus"</item>
<item msgid="172978079776521897">"Alle Protokollzwischenspeicher"</item>
<item msgid="3873873912383879240">"Alle Protokollzwischenspeicher außer Funkschnittstelle"</item>
+ <item msgid="8489661142527693381">"Nur Kernelprotokoll-Zwischenspeicher"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation aus"</item>
diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml
index 9bbb117..c9da6c9 100644
--- a/packages/SettingsLib/res/values-de/strings.xml
+++ b/packages/SettingsLib/res/values-de/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Inspektion der Anzeigeattribute aktivieren"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"DHCP-Client von Lollipop statt des neuen Android-DHCP-Clients verwenden"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Die mobile Datennutzung bleibt auch dann aktiviert, wenn WLAN aktiviert ist. Dies dient einem schnelleren Wechsel zwischen Netzwerken."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit kannst du Daten zwischen deinem Computer und deinem Gerät kopieren, Apps auf deinem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
@@ -288,8 +287,8 @@
<string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Wechseln…"</string>
<string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dateiverschlüsselung wird bereits verwendet."</string>
<string name="title_convert_fbe" msgid="1263622876196444453">"Zu Dateiverschlüsselung wechseln"</string>
- <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Stelle von Datenpartitions- auf dateibasierte Verschlüsselung um.\n !!Achtung!! Dadurch werden alle deine Daten gelöscht.\n Es handelt sich um eine Alphaversion, die möglicherweise nicht korrekt funktioniert.\n Wähle \"Wischen und wechseln…\" aus, um fortzufahren."</string>
- <string name="button_convert_fbe" msgid="5152671181309826405">"Wischen und wechseln…"</string>
+ <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Du möchtest von Datenpartitions- zur dateibasierten Verschlüsselung wechseln.\nAchtung! Dadurch werden alle deine Daten gelöscht.\nEs handelt sich um eine Alphaversion, die möglicherweise nicht korrekt funktioniert.\nWähle \"Löschen und wechseln…\" aus, um fortzufahren."</string>
+ <string name="button_convert_fbe" msgid="5152671181309826405">"Löschen und wechseln…"</string>
<string name="picture_color_mode" msgid="4560755008730283695">"Farbmodus für Bilder"</string>
<string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB verwenden"</string>
<string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Deaktiviert"</string>
diff --git a/packages/SettingsLib/res/values-el/arrays.xml b/packages/SettingsLib/res/values-el/arrays.xml
index 8a0ff8c..a6ce80a 100644
--- a/packages/SettingsLib/res/values-el/arrays.xml
+++ b/packages/SettingsLib/res/values-el/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Ανενεργό"</item>
<item msgid="3054662377365844197">"Όλα"</item>
<item msgid="688870735111627832">"Όλοι εκτός από του αποστολέα"</item>
+ <item msgid="2850427388488887328">"μόνο πυρήνας"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Ανενεργό"</item>
<item msgid="172978079776521897">"Όλα τα αρχεία καταγραφής προσωρινής μνήμης"</item>
<item msgid="3873873912383879240">"Όλα εκτός από τα αρχεία κατ.προσ.μνήμης αποστολέα"</item>
+ <item msgid="8489661142527693381">"μόνο προσωρινή μνήμη αρχείου καταγραφής πυρήνα"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Κινούμ.εικόνες απενεργοποιημένες"</item>
diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml
index c808697..05e4e64 100644
--- a/packages/SettingsLib/res/values-el/strings.xml
+++ b/packages/SettingsLib/res/values-el/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Ενεργοποίηση του ελέγχου χαρακτηριστικών προβολής"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Χρήση εφαρμογής-πελάτη DHCP παλαιού τύπου από το Lollipop αντί για τη νέα εφαρμογή-πελάτη DHCP Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Τα δεδομένα κινητής τηλεφωνίας να διατηρούνται πάντα ενεργά, ακόμα και όταν είναι ενεργό το Wi-Fi (για γρήγορη εναλλαγή δικτύου)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Ο εντοπισμός σφαλμάτων USB προορίζεται μόνο για σκοπούς προγραμματισμού. Χρησιμοποιήστε τον για αντιγραφή δεδομένων μεταξύ του υπολογιστή και της συσκευής σας, για την εγκατάσταση εφαρμογών στη συσκευή σας χωρίς προειδοποίηση και για την ανάγνωση δεδομένων καταγραφής."</string>
diff --git a/packages/SettingsLib/res/values-en-rAU/arrays.xml b/packages/SettingsLib/res/values-en-rAU/arrays.xml
index 465fffa..2ee613f 100644
--- a/packages/SettingsLib/res/values-en-rAU/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rAU/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Off"</item>
<item msgid="3054662377365844197">"All"</item>
<item msgid="688870735111627832">"All but radio"</item>
+ <item msgid="2850427388488887328">"kernel only"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Off"</item>
<item msgid="172978079776521897">"All log buffers"</item>
<item msgid="3873873912383879240">"All but radio log buffers"</item>
+ <item msgid="8489661142527693381">"kernel log buffer only"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation off"</item>
diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml
index c407530..799802b 100644
--- a/packages/SettingsLib/res/values-en-rAU/strings.xml
+++ b/packages/SettingsLib/res/values-en-rAU/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Always keep mobile data active, even when Wi‑Fi is active (for fast network switching)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
diff --git a/packages/SettingsLib/res/values-en-rGB/arrays.xml b/packages/SettingsLib/res/values-en-rGB/arrays.xml
index 465fffa..2ee613f 100644
--- a/packages/SettingsLib/res/values-en-rGB/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rGB/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Off"</item>
<item msgid="3054662377365844197">"All"</item>
<item msgid="688870735111627832">"All but radio"</item>
+ <item msgid="2850427388488887328">"kernel only"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Off"</item>
<item msgid="172978079776521897">"All log buffers"</item>
<item msgid="3873873912383879240">"All but radio log buffers"</item>
+ <item msgid="8489661142527693381">"kernel log buffer only"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation off"</item>
diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml
index c407530..799802b 100644
--- a/packages/SettingsLib/res/values-en-rGB/strings.xml
+++ b/packages/SettingsLib/res/values-en-rGB/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Always keep mobile data active, even when Wi‑Fi is active (for fast network switching)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
diff --git a/packages/SettingsLib/res/values-en-rIN/arrays.xml b/packages/SettingsLib/res/values-en-rIN/arrays.xml
index 465fffa..2ee613f 100644
--- a/packages/SettingsLib/res/values-en-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Off"</item>
<item msgid="3054662377365844197">"All"</item>
<item msgid="688870735111627832">"All but radio"</item>
+ <item msgid="2850427388488887328">"kernel only"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Off"</item>
<item msgid="172978079776521897">"All log buffers"</item>
<item msgid="3873873912383879240">"All but radio log buffers"</item>
+ <item msgid="8489661142527693381">"kernel log buffer only"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation off"</item>
diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml
index c407530..799802b 100644
--- a/packages/SettingsLib/res/values-en-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-en-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Always keep mobile data active, even when Wi‑Fi is active (for fast network switching)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
diff --git a/packages/SettingsLib/res/values-es-rUS/arrays.xml b/packages/SettingsLib/res/values-es-rUS/arrays.xml
index d01c810..eae9b1b 100644
--- a/packages/SettingsLib/res/values-es-rUS/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rUS/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desactivado"</item>
<item msgid="3054662377365844197">"Todo"</item>
<item msgid="688870735111627832">"Excepto radio"</item>
+ <item msgid="2850427388488887328">"solo kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desactivado"</item>
<item msgid="172978079776521897">"Todos los búferes de registro"</item>
<item msgid="3873873912383879240">"Todos los búferes de registro, excepto radio"</item>
+ <item msgid="8489661142527693381">"solo búfer de registro de kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animación desactivada"</item>
diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml
index 3a93929..08e739a 100644
--- a/packages/SettingsLib/res/values-es-rUS/strings.xml
+++ b/packages/SettingsLib/res/values-es-rUS/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Usar el cliente DHCP de Lollipop en lugar del nuevo cliente DHCP de Android"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Siempre mantén los datos móviles activos, incluso cuando esté activada la conexión Wi‑Fi (para cambiar de red de forma rápida)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"La depuración por USB solo está indicada para actividades de programación. Úsala para copiar datos entre tu computadora y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
diff --git a/packages/SettingsLib/res/values-es/arrays.xml b/packages/SettingsLib/res/values-es/arrays.xml
index 42d9863..168f378 100644
--- a/packages/SettingsLib/res/values-es/arrays.xml
+++ b/packages/SettingsLib/res/values-es/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"No"</item>
<item msgid="3054662377365844197">"Todo"</item>
<item msgid="688870735111627832">"Todo menos señal móvil"</item>
+ <item msgid="2850427388488887328">"solo kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"No"</item>
<item msgid="172978079776521897">"Todos los búferes de registro"</item>
<item msgid="3873873912383879240">"Todo excepto búferes de registro de señal móvil"</item>
+ <item msgid="8489661142527693381">"solo búfer de registro del kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animación desactivada"</item>
diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml
index 61af3ac..3d2f6c1 100644
--- a/packages/SettingsLib/res/values-es/strings.xml
+++ b/packages/SettingsLib/res/values-es/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Inspección de atributos de vista"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliza el cliente DHCP de Lollipop en lugar del nuevo cliente DHCP de Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mantén los datos móviles siempre activos, aunque la conexión Wi‑Fi esté activada (para cambiar de red rápidamente)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"La depuración por USB solo está indicada para actividades de desarrollo. Puedes utilizarla para intercambiar datos entre el ordenador y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
diff --git a/packages/SettingsLib/res/values-et-rEE/arrays.xml b/packages/SettingsLib/res/values-et-rEE/arrays.xml
index 1df93cf..019bf50 100644
--- a/packages/SettingsLib/res/values-et-rEE/arrays.xml
+++ b/packages/SettingsLib/res/values-et-rEE/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Väljas"</item>
<item msgid="3054662377365844197">"Kõik"</item>
<item msgid="688870735111627832">"Kõik, v.a raadio"</item>
+ <item msgid="2850427388488887328">"ainult tuum"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Väljas"</item>
<item msgid="172978079776521897">"Kõik logi puhvrid"</item>
<item msgid="3873873912383879240">"Kõik, v.a raadiologi puhvrid"</item>
+ <item msgid="8489661142527693381">"ainult tuuma logi puhver"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animatsioon väljas"</item>
diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et-rEE/strings.xml
index 66c81e8..a7b0f64 100644
--- a/packages/SettingsLib/res/values-et-rEE/strings.xml
+++ b/packages/SettingsLib/res/values-et-rEE/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Luba kuva atribuudi hindamine"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Kasutage uue Androidi DHCP-kliendi asemel Lollipopi DHCP-klienti."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Hoidke mobiilne andmeside alati aktiivsena, isegi kui WiFi on aktiivne (võrkude kiireks vahetamiseks)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-silumine on mõeldud ainult arendamiseks. Kasutage seda andmete kopeerimiseks oma arvuti ja seadme vahel, seadmesse rakenduste installimiseks ilma teatisteta ning logiandmete lugemiseks."</string>
diff --git a/packages/SettingsLib/res/values-eu-rES/arrays.xml b/packages/SettingsLib/res/values-eu-rES/arrays.xml
index e349774..c617445 100644
--- a/packages/SettingsLib/res/values-eu-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-eu-rES/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desaktibatuta"</item>
<item msgid="3054662377365844197">"Guztiak"</item>
<item msgid="688870735111627832">"Guztiak, irratiarenak izan ezik"</item>
+ <item msgid="2850427388488887328">"kernela soilik"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desaktibatuta"</item>
<item msgid="172978079776521897">"Erregistroen buffer guztiak"</item>
<item msgid="3873873912383879240">"Erregistroen buffer guztiak, irratiarenak izan ezik"</item>
+ <item msgid="8489661142527693381">"kernelaren erregistroaren bufferra soilik"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animazioa desaktibatuta"</item>
diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu-rES/strings.xml
index e4c2d1b..f476511 100644
--- a/packages/SettingsLib/res/values-eu-rES/strings.xml
+++ b/packages/SettingsLib/res/values-eu-rES/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Onartu kokapen faltsuak"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Onartu kokapen faltsuak"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Gaitu ikuspegiaren atributuak ikuskatzeko aukera"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Erabili Lollipop bertsioko DHCP bezeroa eta ez Android DHCP bezero berria."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mantendu mugikorreko datuak beti aktibo, baita Wi-Fi konexioa aktibo dagoenean ere (sarez bizkor aldatu ahal izateko)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB arazketa onartu?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB arazketa garapen-xedeetarako soilik dago diseinatuta. Erabil ezazu ordenagailuaren eta gailuaren artean datuak kopiatzeko, aplikazioak gailuan jakinarazi gabe instalatzeko eta erregistro-datuak irakurtzeko."</string>
diff --git a/packages/SettingsLib/res/values-fa/arrays.xml b/packages/SettingsLib/res/values-fa/arrays.xml
index 60f1757..6dc8491 100644
--- a/packages/SettingsLib/res/values-fa/arrays.xml
+++ b/packages/SettingsLib/res/values-fa/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"خاموش"</item>
<item msgid="3054662377365844197">"همه"</item>
<item msgid="688870735111627832">"همه بهجز رادیو"</item>
+ <item msgid="2850427388488887328">"فقط هسته اصلی"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"خاموش"</item>
<item msgid="172978079776521897">"همه بافرهای گزارش"</item>
<item msgid="3873873912383879240">"همه بهجز بافرهای گزارش رادیو"</item>
+ <item msgid="8489661142527693381">"فقط بافر گزارش هسته اصلی"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"پویانمایی خاموش"</item>
diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml
index 541440a..4491851 100644
--- a/packages/SettingsLib/res/values-fa/strings.xml
+++ b/packages/SettingsLib/res/values-fa/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"مکانهای کاذب مجاز هستند"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"مکانهای کاذب مجاز هستند"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"فعال کردن بازبینی ویژگی بازدید"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"به جای کلاینت Android DHCP جدید، از کلاینت Lollipop DHCP استفاده کنید."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"داده سلولی همیشه فعال نگه داشته میشود، حتی وقتی Wi-Fi فعال است (برای جابهجایی سریع شبکه)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"اشکالزدایی USB انجام شود؟"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"اشکالزدایی USB فقط برای اهداف برنامهنویسی در نظر گرفته شده است. از آن برای رونوشتبرداری داده بین رایانه و دستگاهتان، نصب برنامهها در دستگاهتان بدون اعلان و خواندن دادههای گزارش استفاده کنید."</string>
diff --git a/packages/SettingsLib/res/values-fi/arrays.xml b/packages/SettingsLib/res/values-fi/arrays.xml
index 6796235..3c2fe61 100644
--- a/packages/SettingsLib/res/values-fi/arrays.xml
+++ b/packages/SettingsLib/res/values-fi/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Ei käytössä"</item>
<item msgid="3054662377365844197">"Kaikki"</item>
<item msgid="688870735111627832">"Kaikki paitsi radio"</item>
+ <item msgid="2850427388488887328">"vain kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Ei käytössä"</item>
<item msgid="172978079776521897">"Kaikki lokipuskurit"</item>
<item msgid="3873873912383879240">"Kaikki paitsi radiolokipuskurit"</item>
+ <item msgid="8489661142527693381">"vain kernel-lokipuskuri"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animaatio pois käytöstä"</item>
diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml
index 0999c86..cdef968 100644
--- a/packages/SettingsLib/res/values-fi/strings.xml
+++ b/packages/SettingsLib/res/values-fi/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Ota attribuuttinäkymän tarkistus käyttöön"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Käytä Lollipopin DHCP-asiakassovellusta Androidin uuden DHCP-asiakassovelluksen sijasta."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Pidä mobiilidata aina käytössä, vaikka Wi-Fi olisi aktiivinen. Tämä mahdollistaa nopeamman vaihtelun verkkojen välillä."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-vianetsintä on tarkoitettu vain kehittäjien käyttöön. Sen avulla voidaan kopioida tietoja tietokoneesi ja laitteesi välillä, asentaa laitteeseesi sovelluksia ilmoittamatta siitä sinulle ja lukea lokitietoja."</string>
diff --git a/packages/SettingsLib/res/values-fr-rCA/arrays.xml b/packages/SettingsLib/res/values-fr-rCA/arrays.xml
index b0be48a..ba25d27 100644
--- a/packages/SettingsLib/res/values-fr-rCA/arrays.xml
+++ b/packages/SettingsLib/res/values-fr-rCA/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Désactivé"</item>
<item msgid="3054662377365844197">"Tous"</item>
<item msgid="688870735111627832">"Tous sauf radio"</item>
+ <item msgid="2850427388488887328">"noyau uniquement"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Désactivé"</item>
<item msgid="172978079776521897">"Tous les tampons de journal"</item>
<item msgid="3873873912383879240">"Tous les tampons de journal sauf celui de la radio"</item>
+ <item msgid="8489661142527693381">"tampon journal du noyau uniquement"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation désactivée"</item>
diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml
index 62395b8..958b8fd 100644
--- a/packages/SettingsLib/res/values-fr-rCA/strings.xml
+++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliser le client DHCP de Lollipop au lieu du nouveau client DHCP Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Toujours garder les données cellulaires actives, même lorsque le Wi-Fi est activé (pour la commutation rapide entre les réseaux)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
diff --git a/packages/SettingsLib/res/values-fr/arrays.xml b/packages/SettingsLib/res/values-fr/arrays.xml
index 14f175c..3340afb 100644
--- a/packages/SettingsLib/res/values-fr/arrays.xml
+++ b/packages/SettingsLib/res/values-fr/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Désactivé"</item>
<item msgid="3054662377365844197">"Tous"</item>
<item msgid="688870735111627832">"Tous sauf radio"</item>
+ <item msgid="2850427388488887328">"noyau uniquement"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Désactivé"</item>
<item msgid="172978079776521897">"Toutes les mémoires tampon journal"</item>
<item msgid="3873873912383879240">"Toutes sauf les mémoires tampon journal radio"</item>
+ <item msgid="8489661142527693381">"tampon journal du noyau uniquement"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animation désactivée"</item>
diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml
index 5dd2516..cf08f3b 100644
--- a/packages/SettingsLib/res/values-fr/strings.xml
+++ b/packages/SettingsLib/res/values-fr/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Activer inspect. attribut affich."</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliser le client DHCP de Lollipop au lieu du nouveau client DHCP Android"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Maintenir l\'état actif des données mobiles, même lorsque le Wi‑Fi est actif (pour changer rapidement de réseau)"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
diff --git a/packages/SettingsLib/res/values-gl-rES/arrays.xml b/packages/SettingsLib/res/values-gl-rES/arrays.xml
index f6db5cd..201cda2 100644
--- a/packages/SettingsLib/res/values-gl-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-gl-rES/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desactivado"</item>
<item msgid="3054662377365844197">"Todo"</item>
<item msgid="688870735111627832">"Agás radio"</item>
+ <item msgid="2850427388488887328">"só kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desactivado"</item>
<item msgid="172978079776521897">"Todos os búfers de rexistro"</item>
<item msgid="3873873912383879240">"Todo agás os búfers de rexistro de radio"</item>
+ <item msgid="8489661142527693381">"só búfer do rexistro do kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animación desactivada"</item>
@@ -125,10 +127,10 @@
<item msgid="3414540279805870511">"720 p (seguro)"</item>
<item msgid="9039818062847141551">"1080 p"</item>
<item msgid="4939496949750174834">"1080 p (seguro)"</item>
- <item msgid="1833612718524903568">"4 K"</item>
- <item msgid="238303513127879234">"4 K (seguro)"</item>
- <item msgid="3547211260846843098">"4 K (mellorado)"</item>
- <item msgid="5411365648951414254">"4 K (mellorado e seguro)"</item>
+ <item msgid="1833612718524903568">"4K"</item>
+ <item msgid="238303513127879234">"4K (seguro)"</item>
+ <item msgid="3547211260846843098">"4K (mellorado)"</item>
+ <item msgid="5411365648951414254">"4K (mellorado e seguro)"</item>
<item msgid="1311305077526792901">"720 p, 1080 p (pantalla dual)"</item>
</string-array>
<string-array name="enable_opengl_traces_entries">
diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl-rES/strings.xml
index e1c2486..cdc4581 100644
--- a/packages/SettingsLib/res/values-gl-rES/strings.xml
+++ b/packages/SettingsLib/res/values-gl-rES/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Permitir localizacións falsas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permite localizacións falsas"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Activar a inspección de atributos de visualización"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliza o cliente DHCP de Lollipop en lugar do novo cliente DHCP de Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mantén sempre os datos móbiles activos, aínda que a wifi estea activada (para un rápido cambio de rede)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Queres permitir a depuración USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"A depuración de erros USB está deseñada unicamente para fins de programación. Utilízaa para copiar datos entre o ordenador e o dispositivo, instalar aplicacións no dispositivo sen enviar notificacións e ler os datos do rexistro."</string>
diff --git a/packages/SettingsLib/res/values-gu-rIN/arrays.xml b/packages/SettingsLib/res/values-gu-rIN/arrays.xml
index e2d4a06..c746188 100644
--- a/packages/SettingsLib/res/values-gu-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-gu-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"બંધ"</item>
<item msgid="3054662377365844197">"તમામ"</item>
<item msgid="688870735111627832">"તમામ પરંતુ રેડિઓ"</item>
+ <item msgid="2850427388488887328">"ફક્ત કર્નલ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"બંધ"</item>
<item msgid="172978079776521897">"તમામ લૉગ બફર્સ"</item>
<item msgid="3873873912383879240">"તમામ પરંતુ રેડિઓ લૉગ બફર્સ"</item>
+ <item msgid="8489661142527693381">"ફક્ત કર્નલ લૉગ બફર"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"એનિમેશન બંધ"</item>
diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu-rIN/strings.xml
index b7ec401..1b40e01 100644
--- a/packages/SettingsLib/res/values-gu-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-gu-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"મોક સ્થાનોની મંજૂરી આપો"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"મોક સ્થાનોની મંજૂરી આપો"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"લક્ષણ નિરીક્ષણ જોવાનું સક્ષમ કરો"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"નવા Android DHCP ક્લાઇન્ટને બદલે Lollipop પરના DHCP ક્લાઇન્ટનો ઉપયોગ કરો."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fi સક્રિય હોય ત્યારે પણ, હંમેશા મોબાઇલ ડેટાને સક્રિય રાખો (ઝડપી નેટવર્ક સ્વિચિંગ માટે)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB ડિબગિંગને મંજૂરી આપીએ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB ડિબગીંગ ફક્ત વિકાસ હેતુઓ માટે જ બનાવાયેલ છે. તેનો ઉપયોગ તમારા કમ્પ્યુટર અને તમારા ઉપકરણ વચ્ચે ડેટાને કૉપિ કરવા, સૂચના વગર તમારા ઉપકરણ પર ઍપ્લિકેશનો ઇન્સ્ટોલ કરવા અને લૉગ ડેટા વાંચવા માટે કરો."</string>
diff --git a/packages/SettingsLib/res/values-hi/arrays.xml b/packages/SettingsLib/res/values-hi/arrays.xml
index e54b8c5..29b6bef 100644
--- a/packages/SettingsLib/res/values-hi/arrays.xml
+++ b/packages/SettingsLib/res/values-hi/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"बंद"</item>
<item msgid="3054662377365844197">"सभी"</item>
<item msgid="688870735111627832">"रेडियो छोड़कर सभी"</item>
+ <item msgid="2850427388488887328">"केवल कर्नल"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"बंद"</item>
<item msgid="172978079776521897">"सभी लॉग बफ़र"</item>
<item msgid="3873873912383879240">"रेडियो लॉग बफ़र को छोड़कर सभी"</item>
+ <item msgid="8489661142527693381">"केवल कर्नल लॉग बफ़र"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"एनिमेशन बंद"</item>
diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml
index 45b3e3b..8dfbb4a 100644
--- a/packages/SettingsLib/res/values-hi/strings.xml
+++ b/packages/SettingsLib/res/values-hi/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्थानों को अनुमति दें"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्थानों को अनुमति दें"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"दृश्य विशेषता निरीक्षण सक्षम करें"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नए Android DHCP क्लाइंट के बजाय Lollipop के DHCP क्लाइंट का उपयोग करें."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"वाई-फ़ाई के सक्रिय रहने पर भी, हमेशा मोबाइल डेटा सक्रिय रखें (तेज़ी से नेटवर्क स्विच करने के लिए)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग डीबग करने का उद्देश्य केवल विकास है. इसका उपयोग आपके कंप्यूटर और आपके डिवाइस के बीच डेटा की प्रतिलिपि बनाने, बिना नोटिफिकेशन के आपके डिवाइस पर ऐप्स इंस्टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string>
diff --git a/packages/SettingsLib/res/values-hr/arrays.xml b/packages/SettingsLib/res/values-hr/arrays.xml
index 795cf68..a2d253c 100644
--- a/packages/SettingsLib/res/values-hr/arrays.xml
+++ b/packages/SettingsLib/res/values-hr/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Isključeno"</item>
<item msgid="3054662377365844197">"Sve"</item>
<item msgid="688870735111627832">"Sve osim radija"</item>
+ <item msgid="2850427388488887328">"samo jezgra"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Isključeno"</item>
<item msgid="172978079776521897">"Svi međuspremnici zapisa"</item>
<item msgid="3873873912383879240">"Sve osim međuspremnika zapisnika radija"</item>
+ <item msgid="8489661142527693381">"samo međuspremnik zapisnika jezgre"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacija isključena"</item>
diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml
index cda2fb9..07e4925 100644
--- a/packages/SettingsLib/res/values-hr/strings.xml
+++ b/packages/SettingsLib/res/values-hr/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Upotrebljavajte DHCP klijent iz Lollipopa umjesto novog Android DHCP klijenta."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Neka mobilni podaci uvijek budu aktivni, čak i kada je Wi‑Fi aktivan (za brzo prebacivanje s jedne na drugu mrežu)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti otklanjanje pogrešaka putem USB-a?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Otklanjanje pogrešaka putem USB-a namijenjeno je samo u razvojne svrhe. Može se upotrijebiti za kopiranje podataka s računala na uređaj i obrnuto, instalaciju aplikacija na uređaju bez obavijesti i za čitanje dnevničkih zapisa."</string>
diff --git a/packages/SettingsLib/res/values-hu/arrays.xml b/packages/SettingsLib/res/values-hu/arrays.xml
index 850ef5d..41ce4b0 100644
--- a/packages/SettingsLib/res/values-hu/arrays.xml
+++ b/packages/SettingsLib/res/values-hu/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Kikapcsolva"</item>
<item msgid="3054662377365844197">"Összes"</item>
<item msgid="688870735111627832">"Rádiót kivéve"</item>
+ <item msgid="2850427388488887328">"csak kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Kikapcsolva"</item>
<item msgid="172978079776521897">"Minden naplópuffer"</item>
<item msgid="3873873912383879240">"A rádiónapló-pufferen kívül mindegyik"</item>
+ <item msgid="8489661142527693381">"csak kernelnaplópuffer"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animáció ki"</item>
diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml
index 3531237..0d8ec26 100644
--- a/packages/SettingsLib/res/values-hu/strings.xml
+++ b/packages/SettingsLib/res/values-hu/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Nézetattribútum vizsgálatának engedélyezése"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"A Lollipop DHCP-kliensének használata az új androidos DHCP-kliens helyett."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"A mobiladat-kapcsolat mindig maradjon aktív, még akkor is, ha a Wi‑Fi aktív (a gyors hálózatváltás érdekében)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Az USB hibakeresés fejlesztési célokat szolgál. Használhatja adatok másolására a számítógép és a készülék között, alkalmazások a készülékre való értesítés nélküli telepítésére és naplózási adatok olvasására."</string>
@@ -327,7 +326,7 @@
<string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Rendszergazda által irányítva"</string>
<string name="enabled_by_admin" msgid="2386503803463071894">"Engedélyezve a rendszergazda által"</string>
<string name="disabled_by_admin" msgid="3669999613095206948">"Letiltva a rendszergazda által"</string>
- <string name="home" msgid="3256884684164448244">"Kezdőlap beállítása"</string>
+ <string name="home" msgid="3256884684164448244">"Beállítások kezdőlapja"</string>
<string-array name="battery_labels">
<item msgid="8494684293649631252">"0%"</item>
<item msgid="8934126114226089439">"50%"</item>
diff --git a/packages/SettingsLib/res/values-hy-rAM/arrays.xml b/packages/SettingsLib/res/values-hy-rAM/arrays.xml
index 43c5eab..e93cbfc 100644
--- a/packages/SettingsLib/res/values-hy-rAM/arrays.xml
+++ b/packages/SettingsLib/res/values-hy-rAM/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Անջատված է"</item>
<item msgid="3054662377365844197">"Բոլորը"</item>
<item msgid="688870735111627832">"Բոլորը, ռադիոյից բացի"</item>
+ <item msgid="2850427388488887328">"միայն միջուկը"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Անջատված է"</item>
<item msgid="172978079776521897">"Մատյանի բոլոր բուֆերները"</item>
<item msgid="3873873912383879240">"Մատյանի բոլոր բուֆերները, ռադիո բուֆերներից բացի"</item>
+ <item msgid="8489661142527693381">"միայն միջուկի մատյանի պահնակը"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Անջատել շարժապատկերը"</item>
diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy-rAM/strings.xml
index 8472f66..cb12fbf 100644
--- a/packages/SettingsLib/res/values-hy-rAM/strings.xml
+++ b/packages/SettingsLib/res/values-hy-rAM/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Միացնել ցուցադրման հատկանիշների ստուգումը"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Օգտագործել Lollipop-ի DHCP ծրագիրը՝ նոր Android DHCP ծրագրի փոխարեն:"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Միշտ ակտիվացրած պահել բջջային տվյալները, նույնիսկ Wi‑Fi-ը միացրած ժամանակ (ցանցերի միջև արագ փոխարկման համար):"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Թույլատրե՞լ USB-ի վրիպազերծումը:"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB վրիպազերծումը միայն ծրագրավորման նպատակների համար է: Օգտագործեք այն ձեր համակարգչից տվյալները ձեր սարք պատճենելու համար, առանց ծանուցման ձեր սարքի վրա ծրագրեր տեղադրելու և տվյալների մատյանը ընթերցելու համար:"</string>
diff --git a/packages/SettingsLib/res/values-in/arrays.xml b/packages/SettingsLib/res/values-in/arrays.xml
index 47223d2..a612639 100644
--- a/packages/SettingsLib/res/values-in/arrays.xml
+++ b/packages/SettingsLib/res/values-in/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Nonaktif"</item>
<item msgid="3054662377365844197">"Semua"</item>
<item msgid="688870735111627832">"Selain radio"</item>
+ <item msgid="2850427388488887328">"khusus kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Nonaktif"</item>
<item msgid="172978079776521897">"Semua penyangga log"</item>
<item msgid="3873873912383879240">"Semua kecuali penyangga log radio"</item>
+ <item msgid="8489661142527693381">"khusus penyangga log kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animasi mati"</item>
diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml
index 2d7115a..ffdb607 100644
--- a/packages/SettingsLib/res/values-in/strings.xml
+++ b/packages/SettingsLib/res/values-in/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Aktifkan inspeksi atribut tampilan"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gunakan klien DHCP dari Lollipop alih-alih klien DHCP Android baru."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Selalu aktifkan data seluler, meski Wi-Fi aktif (agar jaringan beralih dengan cepat)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Debugging USB dimaksudkan untuk tujuan pengembangan saja. Gunakan untuk menyalin data antara komputer dan perangkat Anda, memasang apl pada perangkat tanpa notifikasi, dan membaca data log."</string>
diff --git a/packages/SettingsLib/res/values-is-rIS/arrays.xml b/packages/SettingsLib/res/values-is-rIS/arrays.xml
index 324f689..64d4da2 100644
--- a/packages/SettingsLib/res/values-is-rIS/arrays.xml
+++ b/packages/SettingsLib/res/values-is-rIS/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Slökkt"</item>
<item msgid="3054662377365844197">"Allt"</item>
<item msgid="688870735111627832">"Allt n. útvarp"</item>
+ <item msgid="2850427388488887328">"einungis kjarni"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Slökkt"</item>
<item msgid="172978079776521897">"Allt biðminni"</item>
<item msgid="3873873912383879240">"Allt nema útvarpsbiðminni"</item>
+ <item msgid="8489661142527693381">"einungis kjarnaannálabiðminni"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Slökkt á hreyfiáhrifum"</item>
diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is-rIS/strings.xml
index db23162..25e13a4 100644
--- a/packages/SettingsLib/res/values-is-rIS/strings.xml
+++ b/packages/SettingsLib/res/values-is-rIS/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Leyfa gervistaðsetningar"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Leyfa gervistaðsetningar"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Virkja yfirlit skoðunar eiginda"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Nota gamla DHCP-biðlarann úr Lollipop í staðinn fyrir nýja Android DHCP-biðlarann."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Hafa alltaf kveikt á farsímagögnum, líka þegar kveikt er á Wi-Fi (til að skipta megi hratt milli kerfa)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Leyfa USB-villuleit?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-villuleit er aðeins ætluð til nota í þróunarskyni. Hana má nota til að afrita gögn á milli tölvu og tækis, setja forrit upp í tækinu án tilkynninga og lesa annálagögn."</string>
diff --git a/packages/SettingsLib/res/values-it/arrays.xml b/packages/SettingsLib/res/values-it/arrays.xml
index 45fe546..e6938e0 100644
--- a/packages/SettingsLib/res/values-it/arrays.xml
+++ b/packages/SettingsLib/res/values-it/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Off"</item>
<item msgid="3054662377365844197">"Tutti"</item>
<item msgid="688870735111627832">"Tutti tranne il segnale radio"</item>
+ <item msgid="2850427388488887328">"solo kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Off"</item>
<item msgid="172978079776521897">"Tutti i buffer log"</item>
<item msgid="3873873912383879240">"Tutti tranne i buffer log del segnale radio"</item>
+ <item msgid="8489661142527693381">"solo buffer log kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animazione disattivata"</item>
diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml
index 600e0e0..2907fab 100644
--- a/packages/SettingsLib/res/values-it/strings.xml
+++ b/packages/SettingsLib/res/values-it/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Attiva controllo attributi visualizzazione"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilizza il client DHCP di Lollipop anziché il nuovo client DHCP Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mantieni sempre i dati cellulare attivi, anche se il Wi‑Fi è attivo (per un passaggio fra reti rapido)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Il debug USB è solo a scopo di sviluppo. Utilizzalo per copiare dati tra il computer e il dispositivo, per installare applicazioni sul tuo dispositivo senza notifica e per leggere i dati dei log."</string>
diff --git a/packages/SettingsLib/res/values-iw/arrays.xml b/packages/SettingsLib/res/values-iw/arrays.xml
index 7a186a0..7bd46ad 100644
--- a/packages/SettingsLib/res/values-iw/arrays.xml
+++ b/packages/SettingsLib/res/values-iw/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"כבוי"</item>
<item msgid="3054662377365844197">"הכול"</item>
<item msgid="688870735111627832">"הכול מלבד רדיו"</item>
+ <item msgid="2850427388488887328">"ליבה בלבד"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"כבוי"</item>
<item msgid="172978079776521897">"כל מאגרי הנתונים הזמניים של היומן"</item>
<item msgid="3873873912383879240">"הכול מלבד מאגרי הנתונים הזמניים של יומן הרדיו"</item>
+ <item msgid="8489661142527693381">"מאגר נתונים זמני של היומן השמור בליבה בלבד"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"אנימציה כבויה"</item>
diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml
index e175e34..7c16e42 100644
--- a/packages/SettingsLib/res/values-iw/strings.xml
+++ b/packages/SettingsLib/res/values-iw/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"אפשר בדיקת תכונת תצוגה"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"השתמש בלקוח DHCP של Lollipop במקום לקוח DHCP החדש של Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"השאר את הנתונים לנייד פעילים תמיד, גם כש-Wi‑Fi פעיל (למעבר מהיר בין רשתות)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"לאפשר ניפוי באגים של USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"ניפוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת אפליקציות במכשיר ללא התראה ולקריאת נתוני יומן."</string>
diff --git a/packages/SettingsLib/res/values-ja/arrays.xml b/packages/SettingsLib/res/values-ja/arrays.xml
index e34f270..5b9b41c 100644
--- a/packages/SettingsLib/res/values-ja/arrays.xml
+++ b/packages/SettingsLib/res/values-ja/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"OFF"</item>
<item msgid="3054662377365844197">"すべて"</item>
<item msgid="688870735111627832">"ラジオ以外すべて"</item>
+ <item msgid="2850427388488887328">"カーネルのみ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"OFF"</item>
<item msgid="172978079776521897">"すべてのログバッファ"</item>
<item msgid="3873873912383879240">"ラジオ ログバッファ以外すべて"</item>
+ <item msgid="8489661142527693381">"カーネル ログ バッファのみ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"アニメーションオフ"</item>
diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml
index b9149b7..25f4152 100644
--- a/packages/SettingsLib/res/values-ja/strings.xml
+++ b/packages/SettingsLib/res/values-ja/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"表示属性検査を有効にする"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"新しいAndroid DHCPクライアントの代わりにLollipopのDHCPクライアントを使用します。"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fiが（ネットワークの自動切り替えで）ONのときでもモバイルデータが常にONになります。"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか？"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USBデバッグは開発専用に設計されています。パソコンと端末の間でデータをコピーする場合や、アプリを通知なしで端末にインストールする場合、ログデータを読み取る場合に使用できます。"</string>
diff --git a/packages/SettingsLib/res/values-ka-rGE/arrays.xml b/packages/SettingsLib/res/values-ka-rGE/arrays.xml
index d3fdb2b..5e63ddd 100644
--- a/packages/SettingsLib/res/values-ka-rGE/arrays.xml
+++ b/packages/SettingsLib/res/values-ka-rGE/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"გამორთული"</item>
<item msgid="3054662377365844197">"ყველა"</item>
<item msgid="688870735111627832">"რადიოს გარდა ყველა"</item>
+ <item msgid="2850427388488887328">"მხოლოდ ბირთვი"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"გამორთული"</item>
<item msgid="172978079776521897">"ჟურნალების ყველა ბუფერი"</item>
<item msgid="3873873912383879240">"რადიოჟურნალების ბუფერების გარდა ყველა"</item>
+ <item msgid="8489661142527693381">"მხოლოდ ბირთვის ჟურნალის ბუფერი"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"ანიმაციის გამორთვა"</item>
diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka-rGE/strings.xml
index a581a63..ffe194a 100644
--- a/packages/SettingsLib/res/values-ka-rGE/strings.xml
+++ b/packages/SettingsLib/res/values-ka-rGE/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"ნახვის ატრიბუტის ინსპექტირების ჩართვა"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ახალი Android DHCP კლიენტის ნაცვლად, Lollipop-ის DHCP კლიენტის გამოყენება."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"მობილური მოწყობილობის მონაცემები ყოველთვის აქტიური დარჩეს, მაშინაც კი, როდესაც Wi-Fi აქტიურია (ქსელის სწრაფი გადართვისთვის)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"ჩაირთოს USB გამართვა?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB გამართვა განკუთვნილია მხოლოდ დეველოპერული მიზნებისთვის. გამოიყენეთ კომპიუტერსა და თქვენ მოწყობილობას შორის მონაცემების გადასატანად, თქვენ მოწყობილობაზე აპების შეტყობინების გარეშე დასაყენებლად და ჟურნალის მონაცემების წასაკითხად."</string>
diff --git a/packages/SettingsLib/res/values-kk-rKZ/arrays.xml b/packages/SettingsLib/res/values-kk-rKZ/arrays.xml
index c7103ab..d1dae87 100644
--- a/packages/SettingsLib/res/values-kk-rKZ/arrays.xml
+++ b/packages/SettingsLib/res/values-kk-rKZ/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Өшірулі"</item>
<item msgid="3054662377365844197">"Барлығы"</item>
<item msgid="688870735111627832">"Радиодан басқасының барлығы"</item>
+ <item msgid="2850427388488887328">"тек ядро"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Өшірулі"</item>
<item msgid="172978079776521897">"Барлық журнал буфері"</item>
<item msgid="3873873912383879240">"Радио журналының буферлерінен басқасының барлығы"</item>
+ <item msgid="8489661142527693381">"тек ядро журналының буфері"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Aнимация өшірілген"</item>
diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk-rKZ/strings.xml
index 704af06..3dcc7eb 100644
--- a/packages/SettingsLib/res/values-kk-rKZ/strings.xml
+++ b/packages/SettingsLib/res/values-kk-rKZ/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Жасанды аймақтарға рұқсат беру"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Жасанды аймақтарды пайдалануға рұқсат беру"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Көру төлсипатын тексеруді қосу"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Жаңа Android DHCP клиентінің орнына Lollipop ішіндегі DHCP клиентін пайдалану"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fi қосулы кезде де ұялы деректерді белсенді етіп ұстау (желіні жылдам ауыстыру үшін)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB жөндеулеріне рұқсат берілсін бе?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB жөндеу дамыту мақсаттарына ғана арналған. Оны компьютер және құрылғы арасында дерек көшіру, құрылғыға ескертусіз қолданба орнату және тіркелім деректерін оқу үшін қолданыңыз."</string>
diff --git a/packages/SettingsLib/res/values-km-rKH/arrays.xml b/packages/SettingsLib/res/values-km-rKH/arrays.xml
index 08d3880..17371f6 100644
--- a/packages/SettingsLib/res/values-km-rKH/arrays.xml
+++ b/packages/SettingsLib/res/values-km-rKH/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"បិទ"</item>
<item msgid="3054662377365844197">"ទាំងអស់"</item>
<item msgid="688870735111627832">"ទាំងអស់ក្រៅពីវិទ្យុ"</item>
+ <item msgid="2850427388488887328">"kernel តែប៉ុណ្ណោះ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"បិទ"</item>
<item msgid="172978079776521897">"អង្គចងចាំកំណត់ហេតុបណ្តោះអាសន្នទាំងអស់"</item>
<item msgid="3873873912383879240">"ទាំងអស់ក្រៅពីអង្គចងចាំកំណត់ហេតុវិទ្យុបណ្តោះអាសន្ន"</item>
+ <item msgid="8489661142527693381">"អង្គចងចាំបណ្ដោះអាសន្នកំណត់ហេតុ kernel តែប៉ុណ្ណោះ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"បិទចលនា"</item>
diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km-rKH/strings.xml
index 996544b..aa0ce24 100644
--- a/packages/SettingsLib/res/values-km-rKH/strings.xml
+++ b/packages/SettingsLib/res/values-km-rKH/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យក្លែងទីតាំង"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាតទីតាំងក្លែងក្លាយ"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"បើកការត្រួតពិនិត្យគុណលក្ខណៈទិដ្ឋភាព"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ប្រើម៉ាស៊ីនកូន DHCP ចេញពី Lollipop ជំនួសឲ្យម៉ាស៊ីនកូន Android DHCP ថ្មី។"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"រក្សាទិន្នន័យចល័តឲ្យសកម្មជានិច្ច បើទោះបីជា Wi‑Fi សកម្មក៏ដោយ (សម្រាប់ការប្តូរបណ្តាញដែលមានល្បឿនលឿន)។"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"អនុញ្ញាតការកែកំហុសយូអេសប៊ី?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"ការកែកំហុសយូអេសប៊ីគឺសម្រាប់តែការអភិវឌ្ឍប៉ុណ្ណោះ។ ប្រើវាដើម្បីចម្លងទិន្នន័យរវាងកុំព្យូទ័រ និងឧបករណ៍របស់អ្នក ដំឡើងកម្មវិធីក្នុងឧបករណ៍របស់អ្នកដោយមិនជូនដំណឹង និងអានទិន្នន័យកំណត់ហេតុ។"</string>
diff --git a/packages/SettingsLib/res/values-kn-rIN/arrays.xml b/packages/SettingsLib/res/values-kn-rIN/arrays.xml
index 432d46c..5f6d699 100644
--- a/packages/SettingsLib/res/values-kn-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-kn-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ಆಫ್"</item>
<item msgid="3054662377365844197">"ಎಲ್ಲಾ"</item>
<item msgid="688870735111627832">"ಎಲ್ಲಾ ಆದರೆ ರೇಡಿಯೊ"</item>
+ <item msgid="2850427388488887328">"ಕೆರ್ನಲ್ ಮಾತ್ರ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ಆಫ್ ಆಗಿದೆ"</item>
<item msgid="172978079776521897">"ಎಲ್ಲಾ ಲಾಗ್ ಬಫರ್ಗಳು"</item>
<item msgid="3873873912383879240">"ಎಲ್ಲಾ ಆದರೆ ರೇಡಿಯೊ ಲಾಗ್ ಬಫರ್ಗಳು"</item>
+ <item msgid="8489661142527693381">"ಕೆರ್ನಲ್ ಲಾಗ್ ಬಫರ್ ಮಾತ್ರ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"ಆನಿಮೇಶನ್ ಆಫ್"</item>
diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn-rIN/strings.xml
index 7bf14a1..8578810d 100644
--- a/packages/SettingsLib/res/values-kn-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-kn-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆ"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ಹೊಸ Android DHCP ಕ್ಲೈಂಟ್ ಬದಲಾಗಿ Lollipop ನಿಂದ DHCP ಕ್ಲೈಂಟ್ ಬಳಸಿ."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ವೈ-ಫೈ ಸಕ್ರಿಯವಾಗಿರುವಾಗಲೂ, ಯಾವಾಗಲೂ ಮೊಬೈಲ್ ಡೇಟಾ ಸಕ್ರಿಯವಾಗಿರಿಸಿ (ವೇಗವಾಗಿ ನೆಟ್ವರ್ಕ್ ಬದಲಾಯಿಸಲು)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯು ಅಭಿವೃದ್ಧಿ ಉದ್ದೇಶಗಳಿಗೆ ಮಾತ್ರ ಆಗಿದೆ. ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ನಡುವೆ ಡೇಟಾವನ್ನು ನಕಲಿಸಲು, ಅಧಿಸೂಚನೆ ಇಲ್ಲದೆ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಮತ್ತು ಲಾಗ್ ಡೇಟಾ ಓದಲು ಅದನ್ನು ಬಳಸಿ."</string>
diff --git a/packages/SettingsLib/res/values-ko/arrays.xml b/packages/SettingsLib/res/values-ko/arrays.xml
index 936e7d8..596f93e 100644
--- a/packages/SettingsLib/res/values-ko/arrays.xml
+++ b/packages/SettingsLib/res/values-ko/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"사용 안함"</item>
<item msgid="3054662377365844197">"전체"</item>
<item msgid="688870735111627832">"라디오 외 모두"</item>
+ <item msgid="2850427388488887328">"커널만"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"사용 안함"</item>
<item msgid="172978079776521897">"모든 로그 버퍼"</item>
<item msgid="3873873912383879240">"라디오 로그 버퍼를 제외한 모든 버퍼"</item>
+ <item msgid="8489661142527693381">"커널 로그 버퍼만"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"애니메이션 사용 안함"</item>
diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml
index baa7300..aaf3463 100644
--- a/packages/SettingsLib/res/values-ko/strings.xml
+++ b/packages/SettingsLib/res/values-ko/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"보기 속성 검사 사용"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"새로운 Android DHCP 클라이언트 대신 Lollipop의 DHCP 클라이언트 사용"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fi가 활성화되어 있을 때에도 빠른 네트워크 전환을 위하여 항상 모바일 데이터를 활성 상태로 유지합니다."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB 디버깅은 개발용으로만 설계되었습니다. 이 기능을 사용하면 컴퓨터와 기기 간에 데이터를 복사하고 알림 없이 기기에 앱을 설치하며 로그 데이터를 읽을 수 있습니다."</string>
diff --git a/packages/SettingsLib/res/values-ky-rKG/arrays.xml b/packages/SettingsLib/res/values-ky-rKG/arrays.xml
index ffaaa5c..33a0b5d 100644
--- a/packages/SettingsLib/res/values-ky-rKG/arrays.xml
+++ b/packages/SettingsLib/res/values-ky-rKG/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Өчүк"</item>
<item msgid="3054662377365844197">"Бардыгы"</item>
<item msgid="688870735111627832">"Радиодон башка"</item>
+ <item msgid="2850427388488887328">"өзөк гана"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Өчүк"</item>
<item msgid="172978079776521897">"Бардык таржымал буферлери"</item>
<item msgid="3873873912383879240">"Радио таржымал буферлеринен башкаларынын баары"</item>
+ <item msgid="8489661142527693381">"өзөктүк журнал буфери гана"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Анимацияны өчүрүү"</item>
diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky-rKG/strings.xml
index bed6b6d..96c1ec0 100644
--- a/packages/SettingsLib/res/values-ky-rKG/strings.xml
+++ b/packages/SettingsLib/res/values-ky-rKG/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Жасалма жайгашкан жерди көрсөтүүгө уруксат берилсин"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Жасалма жайгашкан жерди көрсөтүүгө уруксат берилсин"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Аттрибут текшерүүсүнүн көрүнүшүн иштетүү"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Жаңы Android DHCP кардарынын ордуна Lollipop\'тон DHCP кардарын колдонуңуз."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi-Fi иштеп турганда да дайындар мобилдик тармак аркылуу өткөрүлө берсин (тармактар ортосунда тезирээк которулуу үчүн)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB аркылуу жөндөөгө уруксат берилсинби?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-жөндөө - өндүрүү максатында гана түзүлгөн. Аны компүтериңиз менен түзмөгүңүздүн ортосунда берилиштерди алмашуу, түзмөгүңүзгө колдонмолорду эскертүүсүз орнотуу жана лог берилиштерин окуу үчүн колдонсоңуз болот."</string>
diff --git a/packages/SettingsLib/res/values-lo-rLA/arrays.xml b/packages/SettingsLib/res/values-lo-rLA/arrays.xml
index 11ec7a8..7a6b77a 100644
--- a/packages/SettingsLib/res/values-lo-rLA/arrays.xml
+++ b/packages/SettingsLib/res/values-lo-rLA/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ປິດ"</item>
<item msgid="3054662377365844197">"ທັງໝົດ"</item>
<item msgid="688870735111627832">"ທັງໝົດຍົກເວັ້ນວິທະຍຸ"</item>
+ <item msgid="2850427388488887328">"ເຄີນເນວເທົ່ານັ້ນ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ປິດ"</item>
<item msgid="172978079776521897">"ບັບເຟີບັນທຶກທັງໝົດ"</item>
<item msgid="3873873912383879240">"ທັງໝົດຍົກເວັ້ນບັບເຟີບັນທຶກວິທະຍຸ"</item>
+ <item msgid="8489661142527693381">"ບັບເຟີບັນທຶກເຄີນເນວເທົ່ານັ້ນ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"ປິດອະນິເມຊັນ"</item>
diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo-rLA/strings.xml
index a2569bf..24f0c16 100644
--- a/packages/SettingsLib/res/values-lo-rLA/strings.xml
+++ b/packages/SettingsLib/res/values-lo-rLA/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"ເປີດນຳໃຊ້ການກວດສອບຄຸນສົມບັດມຸມມອງ"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ໃຊ້ລູກຄ້າ DHCP ຈາກ Lollipop ແທນລູກຄ້າ Android DHCP ໃໝ່."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ໃຫ້ຂໍ້ມູນມືຖືເປີດຢູ່ສະເໝີ, ແມ້ແຕ່ເມື່ອ Wi‑Fi ເປີດຢູ່ (ສຳລັບການສະຫຼັບເຄືອຂ່າຍໄວ)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"ອະນຸຍາດໃຫ້ດີບັ໊ກຜ່ານ USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"ການດີບັ໊ກຜ່ານ USB ແມ່ນມີຈຸດປະສົງເພື່ອການພັດທະນາເທົ່ານັ້ນ. ມັນສາມາດໃຊ້ເພື່ອສຳເນົາຂໍ້ມູນລະຫວ່າງຄອມພິວເຕີ ແລະອຸປະກອນຂອງທ່ານ, ຕິດຕັ້ງແອັບຯໂດຍບໍ່ຜ່ານການແຈ້ງເຕືອນ ແລະອ່ານຂໍ້ມູນການບັນທຶກ."</string>
diff --git a/packages/SettingsLib/res/values-lt/arrays.xml b/packages/SettingsLib/res/values-lt/arrays.xml
index 04bb2ed..49908ad 100644
--- a/packages/SettingsLib/res/values-lt/arrays.xml
+++ b/packages/SettingsLib/res/values-lt/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Išjungta"</item>
<item msgid="3054662377365844197">"Viskas"</item>
<item msgid="688870735111627832">"Viskas, išsk. rad. r."</item>
+ <item msgid="2850427388488887328">"tik branduolys"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Išjungta"</item>
<item msgid="172978079776521897">"Visi žurnalų buferiai"</item>
<item msgid="3873873912383879240">"Visi, išskyrus radijo ryšio žurnalų buferius"</item>
+ <item msgid="8489661142527693381">"tik branduolio žurnalo buferis"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacija išjungta"</item>
diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml
index f9decd6..4b8890d 100644
--- a/packages/SettingsLib/res/values-lt/strings.xml
+++ b/packages/SettingsLib/res/values-lt/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Įgalinti peržiūros atributų tikrinimą"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"DHCP kliento programos iš „Lollipop“ versijos naudojimas vietoje naujos „Android“ DHCP kliento programos."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Visada suaktyvinti mobiliojo ryšio duomenis, net kai aktyvus „Wi‑Fi“ ryšys (kad būtų galima greitai perjungti tinklą)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB derinimas skirtas naudoti tik kūrimo tikslais. Jis gali būti naudojamas norint kopijuoti duomenis iš kompiuterio į įrenginį ir atvirkščiai, įdiegti programas įrenginyje be pranešimo ir skaityti žurnalo duomenis."</string>
diff --git a/packages/SettingsLib/res/values-lv/arrays.xml b/packages/SettingsLib/res/values-lv/arrays.xml
index f59a870..801de5d 100644
--- a/packages/SettingsLib/res/values-lv/arrays.xml
+++ b/packages/SettingsLib/res/values-lv/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Izslēgts"</item>
<item msgid="3054662377365844197">"Visi"</item>
<item msgid="688870735111627832">"Visi, izņemot radio"</item>
+ <item msgid="2850427388488887328">"tikai kodolā"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Izslēgts"</item>
<item msgid="172978079776521897">"Visi reģistra buferi"</item>
<item msgid="3873873912383879240">"Visi, izņemot radio reģistra buferus"</item>
+ <item msgid="8489661142527693381">"tikai kodola žurnāla buferī"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animācija ir izslēgta"</item>
diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml
index 54a576f..4d76adc 100644
--- a/packages/SettingsLib/res/values-lv/strings.xml
+++ b/packages/SettingsLib/res/values-lv/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Iespējot atribūtu pārbaudi"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Lietot DHCP klientu no operētājsistēmas Lollipop, nevis jauno Android DHCP klientu."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mobilo datu savienojums būs vienmēr aktīvs, pat ja būs aktīvs Wi-Fi savienojums (ātrai ierīces pārslēgšanai uz citu tīklu)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB atkļūdošana ir paredzēta tikai ar izstrādi saistītām darbībām. Izmantojiet to datu kopēšanai no datora uz ierīci un pretēji, lietotņu instalēšanai ierīcē bez paziņojumiem un žurnāla datu lasīšanai."</string>
diff --git a/packages/SettingsLib/res/values-mk-rMK/arrays.xml b/packages/SettingsLib/res/values-mk-rMK/arrays.xml
index 7a1c320..a72bcd3 100644
--- a/packages/SettingsLib/res/values-mk-rMK/arrays.xml
+++ b/packages/SettingsLib/res/values-mk-rMK/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Исклучено"</item>
<item msgid="3054662377365844197">"Сите"</item>
<item msgid="688870735111627832">"Сите освен радио"</item>
+ <item msgid="2850427388488887328">"само јадро"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Исклучено"</item>
<item msgid="172978079776521897">"Привремена меморија на целата евиденција"</item>
<item msgid="3873873912383879240">"Привремена мем. на цела евиденција освен за радио"</item>
+ <item msgid="8489661142527693381">"само привремена меморија за евиденција на јадро"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Без анимација"</item>
diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk-rMK/strings.xml
index 3d4307d..953360a 100644
--- a/packages/SettingsLib/res/values-mk-rMK/strings.xml
+++ b/packages/SettingsLib/res/values-mk-rMK/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Овозможи лажни локации"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Овозможи лажни локации"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Овозможете проверка на атрибутот на приказот"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Користете го клиентот на DHCP од Lollipop наместо новиот клиент на DHCP на Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Секогаш држи го активен мобилниот интернет, дури и при активно Wi-Fi (за брзо префрлување мрежа)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Овозможи отстранување грешки на УСБ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Отстранувањето грешки на УСБ е наменето само за целите на развој. Користете го за копирање податоци меѓу вашиот компјутер и вашиот уред, за инсталирање апликации на вашиот уред без известување и за читање евиденција на податоци."</string>
diff --git a/packages/SettingsLib/res/values-ml-rIN/arrays.xml b/packages/SettingsLib/res/values-ml-rIN/arrays.xml
index ff0652f..ac6841e 100644
--- a/packages/SettingsLib/res/values-ml-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-ml-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ഓഫ്"</item>
<item msgid="3054662377365844197">"എല്ലാം"</item>
<item msgid="688870735111627832">"റേഡിയോ ഒഴികെയുള്ള എല്ലാം"</item>
+ <item msgid="2850427388488887328">"കേർനൽ മാത്രം"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ഓഫ്"</item>
<item msgid="172978079776521897">"എല്ലാ ലോഗ് ബഫറുകളും"</item>
<item msgid="3873873912383879240">"റേഡിയോ ലോഗ് ബഫറുകൾ ഒഴികെയുള്ള എല്ലാം"</item>
+ <item msgid="8489661142527693381">"കേർനൽ ലോഗ് ബഫർ മാത്രം"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"ആനിമേഷൻ ഓഫുചെയ്യുക"</item>
diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml-rIN/strings.xml
index 7126238..92c0448 100644
--- a/packages/SettingsLib/res/values-ml-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-ml-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"ആട്രിബ്യൂട്ട് പരിശോധന കാണൽ സജീവമാക്കൂ"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"പുതിയ Android DHCP ക്ലയന്റിനുപകരം Lollipop-ൽ നിന്ന് DHCP ക്ലയന്റ് ഉപയോഗിക്കുക."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"വൈഫൈ സജീവമാണെങ്കിലും, മൊബൈൽ ഡാറ്റ സജീവമായി നിർത്തുക (വേഗത്തിൽ നെറ്റ്വർക്ക് മാറുന്നതിനായി)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB ഡീബഗ്ഗുചെയ്യാൻ അനുവദിക്കണോ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB ഡീബഗ്ഗിംഗ് വികസന ആവശ്യകതകൾക്ക് മാത്രമുള്ളതാണ്. നിങ്ങളുടെ കമ്പ്യൂട്ടറിനും ഉപകരണത്തിനുമിടയിൽ ഡാറ്റ പകർത്തുന്നതിനും അറിയിപ്പില്ലാതെ തന്നെ നിങ്ങളുടെ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകൾ ഇൻസ്റ്റാളുചെയ്യുന്നതിനും ലോഗ് ഡാറ്റ റീഡുചെയ്യുന്നതിനും ഇത് ഉപയോഗിക്കുക."</string>
diff --git a/packages/SettingsLib/res/values-mn-rMN/arrays.xml b/packages/SettingsLib/res/values-mn-rMN/arrays.xml
index f7c81bc8..e812043 100644
--- a/packages/SettingsLib/res/values-mn-rMN/arrays.xml
+++ b/packages/SettingsLib/res/values-mn-rMN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Идэвхгүй"</item>
<item msgid="3054662377365844197">"Бүгд"</item>
<item msgid="688870735111627832">"Радиогоос бусад бүх"</item>
+ <item msgid="2850427388488887328">"зөвхөн төвд"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Идэвхгүй"</item>
<item msgid="172978079776521897">"Бүх логийн хамгаалалт"</item>
<item msgid="3873873912383879240">"Радиогоос бусад бүх логийн хамгаалалт"</item>
+ <item msgid="8489661142527693381">"зөвхөн үйлдлийн системийн төв логийн хамгаалалтад"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Дүрс амилуулалт идэвхгүй"</item>
diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn-rMN/strings.xml
index f8497d3..4c98c04 100644
--- a/packages/SettingsLib/res/values-mn-rMN/strings.xml
+++ b/packages/SettingsLib/res/values-mn-rMN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Харах тохируулгын шалгалтыг идэвхжүүлэх"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Шинэ Андройд DHCP харилцагчийн оронд Lollipop-ийн DHCP харилцагчийг хэрэглэ."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fi идэвхтэй байхад ч гэсэн гар утасны датаг идэвхтэй байлгадаг (сүлжээг түргэн солихын тулд)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB дебаг хийхийг зөвшөөрөх үү?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB дебаг нь зөвхөн хөгжүүлэлтийн зорилготой. Үүнийг өөрийн компьютер болон төхөөрөмжийн хооронд өгөгдөл хуулах, өөрийн төхөөрөмж дээр мэдэгдэлгүйгээр аппликешн суулгах, лог датаг унших зэрэгт ашиглаж болно."</string>
diff --git a/packages/SettingsLib/res/values-mr-rIN/arrays.xml b/packages/SettingsLib/res/values-mr-rIN/arrays.xml
index 956539c..5de2f49 100644
--- a/packages/SettingsLib/res/values-mr-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-mr-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"बंद"</item>
<item msgid="3054662377365844197">"सर्व"</item>
<item msgid="688870735111627832">"सर्व परंतु रेडिओ"</item>
+ <item msgid="2850427388488887328">"फक्त कर्नेल"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"बंद"</item>
<item msgid="172978079776521897">"सर्व लॉग बफर"</item>
<item msgid="3873873912383879240">"सर्व परंतु रेडिओ लॉग बफर"</item>
+ <item msgid="8489661142527693381">"फक्त कर्नेल लॉग बफर"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"अॅनिमेशन बंद"</item>
diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr-rIN/strings.xml
index 3dee818..e3a7cc4 100644
--- a/packages/SettingsLib/res/values-mr-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-mr-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"बनावट स्थानांना अनुमती द्या"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"बनावट स्थानांना अनुमती द्या"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"दृश्य विशेषता तपासणी सक्षम करा"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नवीन Android DHCP क्लायंट ऐवजी Lollipop वरून DHCP क्लायंटचा वापर करा."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"जरी वाय-फाय सक्रिय असले तरीही, नेहमी मोबाईल डेटा सक्रिय ठेवा (जलद नेटवर्क स्विच करण्यासाठी)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करण्यास अनुमती द्यायची?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग करण्याचा हेतू फक्त विकासाच्या उद्देशांसाठी आहे. याचा वापर आपला संगणक आणि आपले डिव्हाइस यांच्या दरम्यान डेटा कॉपी करण्यासाठी करा, सूचनेशिवाय आपल्या डिव्हाइसवर अॅप्स स्थापित करा आणि लॉग डेटा वाचा."</string>
diff --git a/packages/SettingsLib/res/values-ms-rMY/arrays.xml b/packages/SettingsLib/res/values-ms-rMY/arrays.xml
index 245af94..d6ea50c 100644
--- a/packages/SettingsLib/res/values-ms-rMY/arrays.xml
+++ b/packages/SettingsLib/res/values-ms-rMY/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Mati"</item>
<item msgid="3054662377365844197">"Semua"</item>
<item msgid="688870735111627832">"Sma kcli radio"</item>
+ <item msgid="2850427388488887328">"inti sahaja"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Mati"</item>
<item msgid="172978079776521897">"Semua penimbal log"</item>
<item msgid="3873873912383879240">"Semua kecuali penimbal log radio"</item>
+ <item msgid="8489661142527693381">"penimbal log inti sahaja"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animasi dimatikan"</item>
diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms-rMY/strings.xml
index 46bbe63..a1caa2a 100644
--- a/packages/SettingsLib/res/values-ms-rMY/strings.xml
+++ b/packages/SettingsLib/res/values-ms-rMY/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Dayakan pemeriksaan atribut paparan"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gunakan pelanggan DHCP daripada Lollipop bukannya pelanggan DHCP Android baharu."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Pastikan data mudah alih sentiasa aktif, walaupun Wi-Fi aktif (untuk penukaran rangkaian yang pantas)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Penyahpepijatan USB adalah dimaksudkan untuk tujuan pembangunan sahaja. Gunakannya untuk menyalin data antara komputer dan peranti anda, memasang aplikasi pada peranti anda tanpa pemberitahuan, dan membaca data log."</string>
diff --git a/packages/SettingsLib/res/values-my-rMM/arrays.xml b/packages/SettingsLib/res/values-my-rMM/arrays.xml
index 14981b6..7ba8e94 100644
--- a/packages/SettingsLib/res/values-my-rMM/arrays.xml
+++ b/packages/SettingsLib/res/values-my-rMM/arrays.xml
@@ -49,12 +49,12 @@
<item msgid="1805837518286731242">"နှေးကွေးသောဆက်သွယ်မှုကို ယာယီရှောင်ရှားထားသည်"</item>
</string-array>
<string-array name="hdcp_checking_titles">
- <item msgid="441827799230089869">"မည်သည့်အခါမှ မစစ်ဆေးပါနှင့်"</item>
+ <item msgid="441827799230089869">"ဘယ်တော့မှ မစစ်ဆေးပါနှင့်"</item>
<item msgid="6042769699089883931">"DRMအကြောင်းအရာကိုသာ စစ်ဆေးမည်"</item>
<item msgid="9174900380056846820">"အမြဲစစ်ဆေးရန်"</item>
</string-array>
<string-array name="hdcp_checking_summaries">
- <item msgid="505558545611516707">"HDCP checkingအားမည်သည့်အခါမျှမသုံးပါနှင့်"</item>
+ <item msgid="505558545611516707">"HDCP checking အား ဘယ်တော့မှ မသုံးပါနှင့်"</item>
<item msgid="3878793616631049349">"DRMအကြောင်းအရာအတွက် HDCPစစ်ဆေးခြင်းကိုသုံးမည်"</item>
<item msgid="45075631231212732">"HDCP checkingအားအမြဲသုံးပါ"</item>
</string-array>
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ပိတ်ပါ"</item>
<item msgid="3054662377365844197">"အားလုံး"</item>
<item msgid="688870735111627832">"ရေဒီယိုမှလွဲ၍ အားလုံး"</item>
+ <item msgid="2850427388488887328">"ကာနယ်သာ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ပိတ်ပါ"</item>
<item msgid="172978079776521897">"မှတ်တမ်းသိမ်းဆည်းရန် လျာထားချက်များ အားလုံး"</item>
<item msgid="3873873912383879240">"ရေဒီယို မှတ်တမ်းသိမ်းဆည်းရန်လျာထားချက်မှလွဲ၍ အားလုံး"</item>
+ <item msgid="8489661142527693381">"ကာနယ်မှတ်တမ်းသိမ်းဆည်းရန် လျာထားချက်သာ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"လှုပ်ရှားသက်ဝင်မှုပုံများကိုပိတ်ပါ"</item>
diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml
index 0610505..6a1c331 100644
--- a/packages/SettingsLib/res/values-my-rMM/strings.xml
+++ b/packages/SettingsLib/res/values-my-rMM/strings.xml
@@ -71,7 +71,7 @@
<string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ထည့်သွင်းရန်အသုံးပြုသည်"</string>
<string name="bluetooth_pairing_accept" msgid="6163520056536604875">"အတူတွဲပါ"</string>
<string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ချိတ်တွဲရန်"</string>
- <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"မလုပ်တော့ပါ"</string>
+ <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"မလုပ်တော့"</string>
<string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ချိတ်တွဲမှုက ချိတ်ဆက်ထားလျှင် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူခွင့် ပြုသည်။"</string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ"</string>
<string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ပင်နံပါတ် သို့မဟုတ် ဖြတ်သန်းခွင့်ကီးမမှန်ကန်သောကြောင့်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ။"</string>
@@ -159,8 +159,8 @@
<string name="oem_unlock_enable_summary" msgid="4720281828891618376">"အစပြုခြင်းကိရိယာအား သော့ဖွင့်ရန် ခွင့်ပြုမည်"</string>
<string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM သော့ဖွင့်ခြင်း ခွင့်ပြုမလား?"</string>
<string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"သတိပေးချက်: ဤချိန်ညှိချက်ဖွင့်ထားလျှင်၊ ဤစက်ပစ္စည်းပေါ်တွင် စက်ပစ္စည်းကာကွယ်သည့် အထူးပြုလုပ်ချက် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
- <string name="mock_location_app" msgid="7966220972812881854">"တည်နေရာအတုပြု အက်ပ် ရွေးရန်"</string>
- <string name="mock_location_app_not_set" msgid="809543285495344223">"တည်နေရာအတုပြ အက်ပ် သတ်မှတ်ထားခြင်းမရှိပါ"</string>
+ <string name="mock_location_app" msgid="7966220972812881854">"တည်နေရာအတုပြု အက်ပ်ရွေးရန်"</string>
+ <string name="mock_location_app_not_set" msgid="809543285495344223">"တည်နေရာအတုပြ အက်ပ်သတ်မှတ်ထားခြင်းမရှိပါ"</string>
<string name="mock_location_app_set" msgid="8966420655295102685">"တည်နေရာအတုပြ အက်ပ်- <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="debug_networking_category" msgid="7044075693643009662">"ကွန်ရက်လုပ်ငန်း"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"ကြိုးမဲ့ပြသမှု အသိအမှတ်ပြုလက်မှတ်"</string>
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Android DHCP ကလိုင်းယင့် အသစ် အစား Lollipop မှ DHCP ကလိုင်းယင့်အား သုံးပါ။"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ဝိုင်ဖိုင်ဖွင့်ထားလျှင်တောင် မိုဘိုင်းဒေတာအမြဲတမ်းဖွင့်မည် (မြန်ဆန်သည့် ကွန်ရက် ပြောင်းခြင်းအတွက်)။"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB ပြသနာရှာခြင်း ခွင့်ပြုပါမလား?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USBအမှားရှားခြင်းမှာ ဆော့ဝဲလ်ရေးသားရန်အတွက်သာ ရည်ရွယ်ပါသည်။ သင့်ကွန်ပြုတာနှင့်သင့်စက်ကြားတွင် ဒေတာများကိုကူးယူရန်၊ အကြောင်းမကြားပဲနှင့် သင့်စက်အတွင်းသို့ အပလီကေးရှင်းများထည့်သွင်းခြင်းနှင့် ဒေတာမှတ်တမ်းများဖတ်ရန်အတွက် အသုံးပြုပါ"</string>
@@ -205,7 +204,7 @@
<string name="select_application" msgid="5156029161289091703">"အပလီကေးရှင်းရွေးချယ်ရန်"</string>
<string name="no_application" msgid="2813387563129153880">"တခုမှမရှိ"</string>
<string name="wait_for_debugger" msgid="1202370874528893091">"အပြစ်ရှာဖွေ ဖယ်ရှားချက်ကိုစောင့်ရန်"</string>
- <string name="wait_for_debugger_summary" msgid="1766918303462746804">"အမှားပြင်ဆင်ရှာဖွေသည့် အပလီကေးရှင်းသည် လုပ်ငန်းမစမှီ တွဲဖက်ရန် အမှားရှာဖွေမည့်သူကို စောင့်နေသည်။"</string>
+ <string name="wait_for_debugger_summary" msgid="1766918303462746804">"အမှားပြင်ဆင်ရှာဖွေသည့် အပလီကေးရှင်းသည် လုပ်ငန်းမစမီ တွဲဖက်ရန် အမှားရှာဖွေမည့်သူကို စောင့်နေသည်။"</string>
<string name="debug_input_category" msgid="1811069939601180246">"ထည့်သွင်းရန်"</string>
<string name="debug_drawing_category" msgid="6755716469267367852">"ရေးဆွဲခြင်း"</string>
<string name="debug_hw_drawing_category" msgid="6220174216912308658">"ဟာ့ဒ်ဝဲ အရှိန်မြှင့် ပုံဖော်ခြင်း"</string>
@@ -218,11 +217,11 @@
<string name="show_touches" msgid="2642976305235070316">"တို့ခြင်းများကို ပြပါ"</string>
<string name="show_touches_summary" msgid="6101183132903926324">"တို့ခြင်းများအတွက် အမြင်ဖြင့် တုံ့ပြန်မှုပြပါ"</string>
<string name="show_screen_updates" msgid="5470814345876056420">"surface အဆင့်မြှင့်မှုများပြပါ"</string>
- <string name="show_screen_updates_summary" msgid="2569622766672785529">"အဆင့်မြှင့်နေစဉ် ဝင်းဒိုးမျက်နှာတပြင်လုံးကို အချက်ပြရန်"</string>
+ <string name="show_screen_updates_summary" msgid="2569622766672785529">"အပ်ဒိတ်လုပ်စဉ် ဝင်းဒိုးမျက်နှာပြင်တွင် အချက်ပြရန်"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPUမြင်ကွင်းအဆင့်မြှင့်ခြင်းများပြရန်"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU နှင့်ဆွဲစဉ် ၀င်းဒိုးအတွင်းပိုင်း လျှပ်တပြက်မြင်ကွင်းများ"</string>
<string name="show_hw_layers_updates" msgid="5645728765605699821">"ဟာ့ဒ်ဝဲအလွှာများအဆင်မြှင့်မှုကိုပြရန်"</string>
- <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"အဆင့်မြှင်ချိန် ဟာ့ဒ်ဝဲအလွှာများကို အစိမ်းရောင်ဖြင့်အချက်ပြရန်"</string>
+ <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"အပ်ဒိတ်လုပ်ချိန် ဟာ့ဒ်ဝဲအလွှာများ အစိမ်းရောင်ပြပါ"</string>
<string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU ပိုသုံးစွဲမှုအမှားရှာဖွေပြင်ဆင်ရန်"</string>
<string name="disable_overlays" msgid="2074488440505934665">"HWထပ်ဆင့်အရာများပိတ်ရန်"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"GPU ကိုမျက်နှာပြင်ခင်းကျင်းရာတွင် အမြဲသုံးပါ။"</string>
@@ -246,7 +245,7 @@
<string name="transition_animation_scale_title" msgid="387527540523595875">"သက်ဝင်အသွင်ပြောင်းခြင်း"</string>
<string name="animator_duration_scale_title" msgid="3406722410819934083">"လှုပ်ရှားမှုကြာချိန်စကေး"</string>
<string name="overlay_display_devices_title" msgid="5364176287998398539">"ဆင့်ပွားမျက်နှာပြင်များအသွင်ဆောင်သည်"</string>
- <string name="debug_applications_category" msgid="4206913653849771549">"အပလီကေးရှင်းများ"</string>
+ <string name="debug_applications_category" msgid="4206913653849771549">"အက်ပ်များ"</string>
<string name="immediately_destroy_activities" msgid="1579659389568133959">"ဆောင်ရွက်မှုများကို မသိမ်းထားပါနှင့်"</string>
<string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"အသုံးပြုသူထွက်ခွါသွားသည်နှင့် လုပ်ဆောင်ချက်များကို ဖျက်ပစ်မည်"</string>
<string name="app_process_limit_title" msgid="4280600650253107163">"နောက်ခံလုပ်ငန်းစဉ်ကန့်သတ်ခြင်း"</string>
@@ -274,7 +273,7 @@
<item msgid="8280754435979370728">"မျက်လုံးမှတွေ့ရသည့် သဘာဝအရောင်"</item>
<item msgid="5363960654009010371">"ဒီဂျစ်တယ်အကြောင်းအရာအတွက် ပြင်ဆင်ထားသည့် အရောင်များ"</item>
</string-array>
- <string name="inactive_apps_title" msgid="1317817863508274533">"အလုပ်မလုပ်သော အက်ပ် များ"</string>
+ <string name="inactive_apps_title" msgid="1317817863508274533">"အလုပ်မလုပ်သော အက်ပ်များ"</string>
<string name="inactive_app_inactive_summary" msgid="5091363706699855725">"ပွင့်မနေပါ။ ပြောင်းရန်တို့ပါ။"</string>
<string name="inactive_app_active_summary" msgid="4174921824958516106">"ပွင့်နေသည်။ ပြောင်းရန်တို့ပါ။"</string>
<string name="runningservices_settings_title" msgid="8097287939865165213">"အလုပ်လုပ်နေသောဝန်ဆောင်မှုများ"</string>
@@ -288,7 +287,7 @@
<string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ပြောင်းရန်…"</string>
<string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ဖိုင်ကို လုံခြုံအောင်ပြုလုပ်ပြီးပါပြီ"</string>
<string name="title_convert_fbe" msgid="1263622876196444453">"ဖိုင်အခြေပြုလုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းလဲရန်"</string>
- <string name="convert_to_fbe_warning" msgid="6139067817148865527">"အချက်အလက်အပိုင်းကို ဖိုင်အခြေပြုလုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းပါ။\n !!သတိ!! ၎င်းသည်သင့် အချက်အလက်များအားလုံးကို ဖျက်ပါမည်။ \n ဤလုပ်ဆောင်ချက်သည် ပထမအဆင့်တွင်သာ ရှိသေးပြီး မှန်ကန်စွာ လုပ်ဆောင်လိမ့်မည် မဟုတ်ပါ။\n ရှေ့ဆက်ရန် \'ရှင်းလင်းပြီး ပြောင်းလဲရန်…\' ကိုနှိပ်ပါ။"</string>
+ <string name="convert_to_fbe_warning" msgid="6139067817148865527">"အချက်အလက်အပိုင်းကို ဖိုင်အခြေပြုလုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းပါ။\n !!သတိ!! ၎င်းသည်သင့် အချက်အလက်များအားလုံးကို ဖျက်ပါမည်။ \n ဤလုပ်ဆောင်ချက်သည် ပထမအဆင့်တွင်သာ ရှိသေးပြီး မှန်ကန်စွာ လုပ်ဆောင်လိမ့်မည် မဟုတ်ပါ။\n ဆက်လုပ်ရန် \'ရှင်းလင်းပြီး ပြောင်းလဲရန်…\' ကိုနှိပ်ပါ။"</string>
<string name="button_convert_fbe" msgid="5152671181309826405">"ရှင်းလင်းပြီး ပြောင်းလဲရန်…"</string>
<string name="picture_color_mode" msgid="4560755008730283695">"ဓာတ်ပုံအရောင်မုဒ်"</string>
<string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ကို အသုံးပြုပါ"</string>
diff --git a/packages/SettingsLib/res/values-nb/arrays.xml b/packages/SettingsLib/res/values-nb/arrays.xml
index 45fcb87..bc4ff27 100644
--- a/packages/SettingsLib/res/values-nb/arrays.xml
+++ b/packages/SettingsLib/res/values-nb/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Av"</item>
<item msgid="3054662377365844197">"Alle"</item>
<item msgid="688870735111627832">"Unntatt radio"</item>
+ <item msgid="2850427388488887328">"bare kjerne"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Av"</item>
<item msgid="172978079776521897">"Alle loggbuffere"</item>
<item msgid="3873873912383879240">"Alle unntatt radiologgbuffere"</item>
+ <item msgid="8489661142527693381">"bare kjerneloggbuffer"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animasjon av"</item>
diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml
index d3fcdd2..5d8ae55 100644
--- a/packages/SettingsLib/res/values-nb/strings.xml
+++ b/packages/SettingsLib/res/values-nb/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Slå på inspeksjon av visningsattributt"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Bruk DHCP-klienten fra Lollipop i stedet for den nye DHCP-klienten for Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Ha alltid mobildata slått på, selv når Wi-Fi er aktiv (for hurtig nettverksbytting)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Tillate USB-feilsøking?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-feilsøking er bare ment for utviklingsformål. Bruk det til å kopiere data mellom datamaskinen og enheten, installere apper på enheten uten varsel og lese loggdata."</string>
diff --git a/packages/SettingsLib/res/values-ne-rNP/arrays.xml b/packages/SettingsLib/res/values-ne-rNP/arrays.xml
index 39b32d99..2063f17 100644
--- a/packages/SettingsLib/res/values-ne-rNP/arrays.xml
+++ b/packages/SettingsLib/res/values-ne-rNP/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"निष्क्रिय"</item>
<item msgid="3054662377365844197">"सबै"</item>
<item msgid="688870735111627832">"रेडियो बाहेक सबै"</item>
+ <item msgid="2850427388488887328">"कर्नेल मात्र"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"निष्क्रिय"</item>
<item msgid="172978079776521897">"सबै लग सम्बन्धी बफरहरू"</item>
<item msgid="3873873912383879240">"रेडियो सम्बन्धी लगका बफरहरू बाहेक सबै"</item>
+ <item msgid="8489661142527693381">"कर्नेलको लग सम्बन्धी बफर मात्र"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"सजीविकरण बन्द"</item>
diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne-rNP/strings.xml
index 3e53d1e..15cc8ea8 100644
--- a/packages/SettingsLib/res/values-ne-rNP/strings.xml
+++ b/packages/SettingsLib/res/values-ne-rNP/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"दृष्टिकोण विशेषता निरीक्षण सक्षम पार्नुहोस्"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नयाँ Android DHCP ग्राहकको सट्टा Lollipop बाट DHCP ग्राहक प्रयोग गर्नुहोस्।"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi-Fi सक्रिय हुँदा पनि मोबाइल डेटा सधैँ सक्रिय राख्नुहोस् (द्रूत नेटवर्क स्विच गर्नको लागि)।"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB डिबग गर्न लागि अनुमति दिने हो?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"युएसबी डिबगिङ विकास प्रयोजनका लागि मात्र निर्मित हुन्छ। यसलाई तपाईँको कम्प्युटर र तपाईँको उपकरणका बीच डेटा प्रतिलिपि गर्न, बिना सूचना तपाईँको उपकरणमा अनुप्रयोगहरू स्थापना गर्न र लग डेटा पढ्नका लागि प्रयोग गर्नुहोस्।"</string>
diff --git a/packages/SettingsLib/res/values-nl/arrays.xml b/packages/SettingsLib/res/values-nl/arrays.xml
index e4c1902..4cdd4fa 100644
--- a/packages/SettingsLib/res/values-nl/arrays.xml
+++ b/packages/SettingsLib/res/values-nl/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Uit"</item>
<item msgid="3054662377365844197">"Alle"</item>
<item msgid="688870735111627832">"Alle beh. keuzerondje"</item>
+ <item msgid="2850427388488887328">"alleen kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Uit"</item>
<item msgid="172978079776521897">"Alle logboekbuffers"</item>
<item msgid="3873873912383879240">"Alle logboekbuffers behalve voor keuzerondjes"</item>
+ <item msgid="8489661142527693381">"alleen kernel-logbuffer"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animatie uit"</item>
diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml
index 411fc0a..12bdb4f 100644
--- a/packages/SettingsLib/res/values-nl/strings.xml
+++ b/packages/SettingsLib/res/values-nl/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Inspectie van weergavekenmerk inschakelen"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"De DHCP-client van Lollipop gebruiken in plaats van de nieuwe Android DHCP-client."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mobiele gegevens altijd actief houden, ook als wifi actief is (voor sneller schakelen tussen netwerken)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-foutopsporing is alleen bedoeld voor ontwikkeldoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen je computer en je apparaat, apps zonder melding op je apparaat te installeren en loggegevens te lezen."</string>
diff --git a/packages/SettingsLib/res/values-pa-rIN/arrays.xml b/packages/SettingsLib/res/values-pa-rIN/arrays.xml
index 1a035e7..d0a26c8 100644
--- a/packages/SettingsLib/res/values-pa-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-pa-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ਬੰਦ"</item>
<item msgid="3054662377365844197">"ਸਭ"</item>
<item msgid="688870735111627832">"ਸਭ ਪਰ ਰੇਡੀਓ"</item>
+ <item msgid="2850427388488887328">"ਸਿਰਫ਼ ਕਰਨਲ"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ਬੰਦ"</item>
<item msgid="172978079776521897">"ਸਭ ਲੌਗ ਬਫ਼ਰ"</item>
<item msgid="3873873912383879240">"ਸਭ ਪਰ ਰੇਡੀਓ ਲੌਗ ਬਫ਼ਰ"</item>
+ <item msgid="8489661142527693381">"ਸਿਰਫ਼ ਕਰਨਲ ਲੌਗ ਬਫ਼ਰ"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"ਐਨੀਮੇਸ਼ਨ ਬੰਦ"</item>
diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa-rIN/strings.xml
index 037d2c1..21d11b0 100644
--- a/packages/SettingsLib/res/values-pa-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-pa-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ਨਕਲੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ਨਕਲੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"ਗੁਣ ਛਾਣਬੀਣ ਦੇਖੋ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ਨਵੇਂ Android DHCP ਕਲਾਈਂਟ ਦੀ ਬਜਾਇ Lollipop ਦਾ DHCP ਕਲਾਈਂਟ ਵਰਤੋ।"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ਹਮੇਸ਼ਾ ਮੋਬਾਈਲ ਡੇਟਾ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖੋ ਭਾਵੇਂ Wi‑Fi ਕਿਰਿਆਸ਼ੀਲ ਹੋਵੇ (ਤੇਜ਼ ਨੈੱਟਵਰਕ ਸਵਿੱਚਿੰਗ ਲਈ)।"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"ਕੀ USB ਡੀਬਗਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB ਡੀਬਗਿੰਗ ਕੇਵਲ ਵਿਕਾਸ ਮੰਤਵਾਂ ਲਈ ਹੁੰਦੀ ਹੈ। ਇਸਨੂੰ ਆਪਣੇ ਕੰਪਿਊਟਰ ਅਤੇ ਆਪਣੀ ਡੀਵਾਈਸ ਵਿਚਕਾਰ ਡੈਟਾ ਕਾਪੀ ਕਰਨ ਲਈ ਵਰਤੋ, ਸੂਚਨਾ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਡੀਵਾਈਸ ਤੇ ਐਪਸ ਇੰਸਟੌਲ ਕਰੋ ਅਤੇ ਲੌਗ ਡੈਟਾ ਪੜ੍ਹੋ।"</string>
diff --git a/packages/SettingsLib/res/values-pl/arrays.xml b/packages/SettingsLib/res/values-pl/arrays.xml
index b12ea23..ff36e42 100644
--- a/packages/SettingsLib/res/values-pl/arrays.xml
+++ b/packages/SettingsLib/res/values-pl/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Wyłączone"</item>
<item msgid="3054662377365844197">"Wszystkie"</item>
<item msgid="688870735111627832">"Bez radiowych"</item>
+ <item msgid="2850427388488887328">"tylko jądro"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Wyłączone"</item>
<item msgid="172978079776521897">"Wszystkie bufory dziennika"</item>
<item msgid="3873873912383879240">"Wszystkie oprócz buforów dzienników radiowych"</item>
+ <item msgid="8489661142527693381">"tylko bufor dziennika jądra"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacja wyłączona"</item>
diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml
index 0cf194e7..d5116a2 100644
--- a/packages/SettingsLib/res/values-pl/strings.xml
+++ b/packages/SettingsLib/res/values-pl/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Inspekcja wyświetlania atrybutu"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Użyj klienta DHCP z Lollipop zamiast nowego klienta DHCP Androida"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Nie wyłączaj transmisji danych przez sieć komórkową, nawet gdy aktywne jest połączenie Wi-Fi (aby szybko przełączać sieci)"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może służyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji na urządzeniu bez powiadamiania, a także odczytu danych dziennika."</string>
diff --git a/packages/SettingsLib/res/values-pt-rBR/arrays.xml b/packages/SettingsLib/res/values-pt-rBR/arrays.xml
index e39427d..90f061c 100644
--- a/packages/SettingsLib/res/values-pt-rBR/arrays.xml
+++ b/packages/SettingsLib/res/values-pt-rBR/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desativado"</item>
<item msgid="3054662377365844197">"Todos"</item>
<item msgid="688870735111627832">"Todos, exceto o rádio"</item>
+ <item msgid="2850427388488887328">"somente kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desativado"</item>
<item msgid="172978079776521897">"Todos os buffers de registro"</item>
<item msgid="3873873912383879240">"Todos, exceto os buffers de registro de rádio"</item>
+ <item msgid="8489661142527693381">"somente buffer de registro de kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animação desligada"</item>
diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml
index 4645821..f0cfa23 100644
--- a/packages/SettingsLib/res/values-pt-rBR/strings.xml
+++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualiz. insp. atributo"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Usar cliente DHCP do Lollipop, em vez do novo cliente DHCP do Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Sempre manter dados móveis ativos, mesmo quando o Wi-Fi estiver ativado (para troca rápida de rede)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB serve apenas para fins de desenvolvimento. Use-a para copiar dados entre o computador e o dispositivo, instalar apps no seu aparelho sem notificação e ler dados de registro."</string>
diff --git a/packages/SettingsLib/res/values-pt-rPT/arrays.xml b/packages/SettingsLib/res/values-pt-rPT/arrays.xml
index 92657e8..2c8b835 100644
--- a/packages/SettingsLib/res/values-pt-rPT/arrays.xml
+++ b/packages/SettingsLib/res/values-pt-rPT/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desativado"</item>
<item msgid="3054662377365844197">"Todos"</item>
<item msgid="688870735111627832">"Td, exc. rádio"</item>
+ <item msgid="2850427388488887328">"apenas kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desativado"</item>
<item msgid="172978079776521897">"Todos os buffers de registo"</item>
<item msgid="3873873912383879240">"Todos, exceto os buffers de registo de rádio"</item>
+ <item msgid="8489661142527693381">"apenas buffer do registo do kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animação desativada"</item>
diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml
index 9a2549e..40dfc74 100644
--- a/packages/SettingsLib/res/values-pt-rPT/strings.xml
+++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Ativar a inspeção do atributo de visualização"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilizar o cliente DHCP do Lollipop em vez do novo cliente DHCP do Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Manter sempre os dados móveis ativados, mesmo quando o Wi‑Fi estiver ativado (para mudança de rede rápida)"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB é utilizada apenas para fins de programação. Utilize-a para copiar dados entre o computador e o aparelho, instalar aplicações no aparelho sem notificação e ler dados de registo."</string>
@@ -226,7 +225,7 @@
<string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobreposição GPU"</string>
<string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
- <string name="simulate_color_space" msgid="6745847141353345872">"Simular espaço de cor"</string>
+ <string name="simulate_color_space" msgid="6745847141353345872">"Simular espaço da cor"</string>
<string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
<string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desativ. encam. áudio USB"</string>
<string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desativar encam. auto. para periféricos áudio USB"</string>
diff --git a/packages/SettingsLib/res/values-pt/arrays.xml b/packages/SettingsLib/res/values-pt/arrays.xml
index e39427d..90f061c 100644
--- a/packages/SettingsLib/res/values-pt/arrays.xml
+++ b/packages/SettingsLib/res/values-pt/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Desativado"</item>
<item msgid="3054662377365844197">"Todos"</item>
<item msgid="688870735111627832">"Todos, exceto o rádio"</item>
+ <item msgid="2850427388488887328">"somente kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Desativado"</item>
<item msgid="172978079776521897">"Todos os buffers de registro"</item>
<item msgid="3873873912383879240">"Todos, exceto os buffers de registro de rádio"</item>
+ <item msgid="8489661142527693381">"somente buffer de registro de kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animação desligada"</item>
diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml
index 4645821..f0cfa23 100644
--- a/packages/SettingsLib/res/values-pt/strings.xml
+++ b/packages/SettingsLib/res/values-pt/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualiz. insp. atributo"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Usar cliente DHCP do Lollipop, em vez do novo cliente DHCP do Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Sempre manter dados móveis ativos, mesmo quando o Wi-Fi estiver ativado (para troca rápida de rede)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB serve apenas para fins de desenvolvimento. Use-a para copiar dados entre o computador e o dispositivo, instalar apps no seu aparelho sem notificação e ler dados de registro."</string>
diff --git a/packages/SettingsLib/res/values-ro/arrays.xml b/packages/SettingsLib/res/values-ro/arrays.xml
index 35d39bd..d5574dd 100644
--- a/packages/SettingsLib/res/values-ro/arrays.xml
+++ b/packages/SettingsLib/res/values-ro/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Dezactivată"</item>
<item msgid="3054662377365844197">"Toate"</item>
<item msgid="688870735111627832">"Toate, fără radio"</item>
+ <item msgid="2850427388488887328">"numai nucleul"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Dezactivată"</item>
<item msgid="172978079776521897">"Toate zonele-tampon pentru jurnale"</item>
<item msgid="3873873912383879240">"Toate zonele-tampon pentru jurnale fără cele radio"</item>
+ <item msgid="8489661142527693381">"numai zona-tampon pentru jurnalul nucleului"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animație dezactivată"</item>
diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml
index be4bd2f..6cc0f87 100644
--- a/packages/SettingsLib/res/values-ro/strings.xml
+++ b/packages/SettingsLib/res/values-ro/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Permiteți locațiile fictive"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteți locațiile fictive"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Activați inspectarea atributelor de vizualizare"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Folosiți clientul DHCP din Lollipop în locul noului client Android DHCP."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Păstrați întotdeauna conexiunea de date mobile activată, chiar și atunci când funcția Wi‑Fi este activată (pentru comutarea rapidă între rețele)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permiteți depanarea USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Depanarea USB are exclusiv scopuri de dezvoltare. Utilizați-o pentru a copia date de pe computer pe dispozitiv, pentru a instala aplicații pe dispozitiv fără notificare și pentru a citi datele din jurnale."</string>
diff --git a/packages/SettingsLib/res/values-ru/arrays.xml b/packages/SettingsLib/res/values-ru/arrays.xml
index 48406e4..2fff9dd 100644
--- a/packages/SettingsLib/res/values-ru/arrays.xml
+++ b/packages/SettingsLib/res/values-ru/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Отключено"</item>
<item msgid="3054662377365844197">"Все"</item>
<item msgid="688870735111627832">"Все, кроме системных"</item>
+ <item msgid="2850427388488887328">"только ядро"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Отключено"</item>
<item msgid="172978079776521897">"Все буферы журналов"</item>
<item msgid="3873873912383879240">"Все, кроме буферов системного журнала"</item>
+ <item msgid="8489661142527693381">"только буфер журнала ядра"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Без анимации"</item>
diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml
index b3e48be..ad4db89 100644
--- a/packages/SettingsLib/res/values-ru/strings.xml
+++ b/packages/SettingsLib/res/values-ru/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Включить проверку атрибутов"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Использовать DHCP-клиент для Android 5.0, а не для новой версии."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Не отключать передачу данных по мобильной сети даже при активном Wi-Fi-подключении (для быстрого переключения между сетями)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Отладка по USB – это режим, который позволяет использовать ваше устройство как внешний накопитель: перемещать файлы (с компьютера и на компьютер), напрямую устанавливать приложения, а также просматривать системные журналы."</string>
diff --git a/packages/SettingsLib/res/values-si-rLK/arrays.xml b/packages/SettingsLib/res/values-si-rLK/arrays.xml
index 328cf99..518a330 100644
--- a/packages/SettingsLib/res/values-si-rLK/arrays.xml
+++ b/packages/SettingsLib/res/values-si-rLK/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ක්රියාවිරහිතය"</item>
<item msgid="3054662377365844197">"සියලු"</item>
<item msgid="688870735111627832">"සැම වුවද රේඩි."</item>
+ <item msgid="2850427388488887328">"කර්නල පමණි"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ක්රියාවිරහිතයි"</item>
<item msgid="172978079776521897">"සියලු ලොග අන්තරාචය"</item>
<item msgid="3873873912383879240">"සියලු නමුත් රේඩියෝ ලොග අන්තරාචය"</item>
+ <item msgid="8489661142527693381">"කර්නල ලොග් අන්තරාචය පමණි"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"සජිවිකරණය අක්රිය කිරීම"</item>
diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si-rLK/strings.xml
index aa7f59a..5efb400 100644
--- a/packages/SettingsLib/res/values-si-rLK/strings.xml
+++ b/packages/SettingsLib/res/values-si-rLK/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"ව්යාජ ස්ථානයන්ට අවසර දෙන්න"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ව්යාජ ස්ථාන අනුමත කරන්න"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"උපලක්ෂණ පරික්ෂාව බැලීම සබල කරන්න"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"නව Android DHCP සේවාලාභියා වෙනුවට Lollipop වෙතින් DHCP සේවාලාභියා භාවිත කරන්න."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fi අක්රිය විට පවා, සැම විටම ජංගම දත්ත ක්රියාකාරීව තබන්න (අවසන් ජාල මාරුව සඳහා)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB දෝශාවේක්ෂණයට ඉඩ දෙන්නද?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB දෝශාවේක්ෂණය සංවර්ධන කටයුතු සඳහා පමණක් යොදාගැනේ. එය ඔබගේ පරිගණකය සහ ඔබගේ උපාංගය අතර දත්ත පිටපත් කිරීමට පමණක් භාවිතා කරන්න, ඔබගේ උපාංගය මත දැනුම්දීම් රහිතව යෙදුම් ස්ථාපනය කරන්න, සහ ලොග් දත්ත කියවන්න."</string>
diff --git a/packages/SettingsLib/res/values-sk/arrays.xml b/packages/SettingsLib/res/values-sk/arrays.xml
index c8f9a06..2848040 100644
--- a/packages/SettingsLib/res/values-sk/arrays.xml
+++ b/packages/SettingsLib/res/values-sk/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Vypnuté"</item>
<item msgid="3054662377365844197">"Všetko"</item>
<item msgid="688870735111627832">"Okrem rádia"</item>
+ <item msgid="2850427388488887328">"iba jadro"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Vypnuté"</item>
<item msgid="172978079776521897">"Všetky vyrovnávacie pamäte denníka"</item>
<item msgid="3873873912383879240">"Všetky vyrovnávacie pamäte denníka (okrem rádia)"</item>
+ <item msgid="8489661142527693381">"iba vyrovnávacia pamäť denníka jadra"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animácia je vypnutá"</item>
diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml
index eaec1fc..7a7e3d4 100644
--- a/packages/SettingsLib/res/values-sk/strings.xml
+++ b/packages/SettingsLib/res/values-sk/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Kontrola atribútov zobrazenia"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Použitie klienta DHCP z verzie Lollipop namiesto nového klienta Android DHCP."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Vždy ponechávať mobilné dáta aktívne, dokonca aj pri aktívnej sieti Wi‑Fi (na rýchle prepínanie sietí)"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie cez USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Ladenie prostredníctvom USB je určené iba na účely vývoja. Použite ho na kopírovanie dát medzi počítačom a zariadením, inštaláciu aplikácií do zariadenia bez upozornenia a čítanie údajov denníka."</string>
diff --git a/packages/SettingsLib/res/values-sl/arrays.xml b/packages/SettingsLib/res/values-sl/arrays.xml
index 124b5d8..baa16ac 100644
--- a/packages/SettingsLib/res/values-sl/arrays.xml
+++ b/packages/SettingsLib/res/values-sl/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Izklopljeno"</item>
<item msgid="3054662377365844197">"Vse"</item>
<item msgid="688870735111627832">"Vse (brez rad.)"</item>
+ <item msgid="2850427388488887328">"samo jedro"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Izklopljeno"</item>
<item msgid="172978079776521897">"Vsi medpomnilniki dnevnika"</item>
<item msgid="3873873912383879240">"Vsi medpomnilniki dnevnika, razen za radio"</item>
+ <item msgid="8489661142527693381">"samo medpomnilnik dnevnika jedra"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacija je izključena"</item>
diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml
index df5f101..10bff6e 100644
--- a/packages/SettingsLib/res/values-sl/strings.xml
+++ b/packages/SettingsLib/res/values-sl/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Omogoči pregled atributa pogleda"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Uporaba odjemalca DHCP za Lollipop namesto novega odjemalca DHCP za Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Prenos podatkov v mobilnih omrežjih je vedno aktiven – tudi ko je aktivna povezava Wi-Fi (za hiter preklop med omrežji)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Odpravljanje težav s povezavo USB je namenjeno samo za razvoj. Lahko ga uporabljate za kopiranje podatkov med računalnikom in napravo, nameščanje aplikacij v napravo brez obveščanja in branje podatkov v dnevniku."</string>
diff --git a/packages/SettingsLib/res/values-sq-rAL/arrays.xml b/packages/SettingsLib/res/values-sq-rAL/arrays.xml
index 7c0cf61..c40ad83 100644
--- a/packages/SettingsLib/res/values-sq-rAL/arrays.xml
+++ b/packages/SettingsLib/res/values-sq-rAL/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Joaktive"</item>
<item msgid="3054662377365844197">"Të gjitha"</item>
<item msgid="688870735111627832">"Të gjitha përveç atyre radio"</item>
+ <item msgid="2850427388488887328">"vetëm bërthama"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Joaktive"</item>
<item msgid="172978079776521897">"Të gjitha memoriet e regjistrit"</item>
<item msgid="3873873912383879240">"Të gjitha memoriet e regjistrit, përveç atyre radio"</item>
+ <item msgid="8489661142527693381">"vetëm memoria e regjistrimit të bërthamës"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animacioni është i çaktivizuar"</item>
diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq-rAL/strings.xml
index 07e5c40..e4f0eaa 100644
--- a/packages/SettingsLib/res/values-sq-rAL/strings.xml
+++ b/packages/SettingsLib/res/values-sq-rAL/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Lejo vendndodhje të simuluara"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Lejo vendndodhje të simuluara"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Aktivizo shikimin e inspektimit të atributeve"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Përdor klientin DHCP nga Lollipop në vend të klientit të ri DHCP të Androidit."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mbaji të dhënat celulare gjithmonë aktive edhe kur Wi‑Fi është aktiv (për ndërrim të shpejtë të rrjetit)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Të lejohet korrigjimi i USB-së?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Korrigjuesi i USB-së është vetëm për qëllime zhvillimore. Përdore për të kopjuar të dhëna mes kompjuterit dhe pajisjes tënde, për të instaluar aplikacione në pajisjen tënde pa asnjë njoftim si dhe për të lexuar të dhënat e ditarit."</string>
diff --git a/packages/SettingsLib/res/values-sr/arrays.xml b/packages/SettingsLib/res/values-sr/arrays.xml
index fd93d4b..1817558 100644
--- a/packages/SettingsLib/res/values-sr/arrays.xml
+++ b/packages/SettingsLib/res/values-sr/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Искључено"</item>
<item msgid="3054662377365844197">"Све"</item>
<item msgid="688870735111627832">"Све сeм радија"</item>
+ <item msgid="2850427388488887328">"само језгро"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Искључено"</item>
<item msgid="172978079776521897">"Све међумеморије евиденција"</item>
<item msgid="3873873912383879240">"Све осим међумеморија евиденција за радио"</item>
+ <item msgid="8489661142527693381">"само међумеморија евиденције језгра"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Анимација је искључена"</item>
diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml
index d4e925e..fba58c5 100644
--- a/packages/SettingsLib/res/values-sr/strings.xml
+++ b/packages/SettingsLib/res/values-sr/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Омогући проверу атрибута за преглед"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Користите DHCP клијент из Lollipop-а уместо новог Android DHCP клијента."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Нека подаци за мобилне уређаје увек буду активни, чак и када је Wi‑Fi активан (ради брзе промене мреже)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Дозволи отклањање USB грешака?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Отклањање USB грешака намењено је само за сврхе програмирања. Користите га за копирање података са рачунара на уређај и обрнуто, инсталирање апликација на уређају без обавештења и читање података из евиденције."</string>
diff --git a/packages/SettingsLib/res/values-sv/arrays.xml b/packages/SettingsLib/res/values-sv/arrays.xml
index b8cd869..9ecedca 100644
--- a/packages/SettingsLib/res/values-sv/arrays.xml
+++ b/packages/SettingsLib/res/values-sv/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Av"</item>
<item msgid="3054662377365844197">"Alla"</item>
<item msgid="688870735111627832">"Alla utom radio"</item>
+ <item msgid="2850427388488887328">"endast kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Av"</item>
<item msgid="172978079776521897">"Alla loggbuffertar"</item>
<item msgid="3873873912383879240">"Alla loggbuffertar utom för radio"</item>
+ <item msgid="8489661142527693381">"endast buffert av kernellogg"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animering avstängd"</item>
diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml
index db47bb9..ecc728a 100644
--- a/packages/SettingsLib/res/values-sv/strings.xml
+++ b/packages/SettingsLib/res/values-sv/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Aktivera inspektion av visningsattribut"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Använd DHCP-klienten från Lollipop i stället för den nya Android DHCP-klienten."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Håll alltid mobildata aktiverad, även när Wi-Fi är aktiverat (så att du snabbt kan byta mellan nätverk)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB-felsökning ska endast användas i utvecklingssyfte. Använd den för att kopiera data mellan datorn och enheten, installera appar på enheten utan meddelanden och läsa loggdata."</string>
diff --git a/packages/SettingsLib/res/values-sw/arrays.xml b/packages/SettingsLib/res/values-sw/arrays.xml
index 0f78b8b..e2fbfc3 100644
--- a/packages/SettingsLib/res/values-sw/arrays.xml
+++ b/packages/SettingsLib/res/values-sw/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Yamezimwa"</item>
<item msgid="3054662377365844197">"Zote"</item>
<item msgid="688870735111627832">"Zote isipokuwa redio"</item>
+ <item msgid="2850427388488887328">"keneli pekee"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Imezimwa"</item>
<item msgid="172978079776521897">"Akiba ya kumbukumbu zote"</item>
<item msgid="3873873912383879240">"Zote isipokuwa akiba ya kumbukumbu za redio"</item>
+ <item msgid="8489661142527693381">"akiba ya kumbukumbu ya keneli pekee"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Haiwani imezimwa"</item>
diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml
index 20cf093..435a1bd 100644
--- a/packages/SettingsLib/res/values-sw/strings.xml
+++ b/packages/SettingsLib/res/values-sw/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Washa ukaguzi wa sifa ya onyesho"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Tumia kiteja cha DHCP kutoka Lollipop badala ya kiteja kipya cha DHCP cha Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Washa kila wakati data ya kifaa cha mkononi, hata kama Wi-Fi inatumika (katika uzimaji wa haraka wa mtandao)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Ueuaji wa USB umekusudiwa kwa malengo ya utengenezaji tu. Itumi kunakili data kati ya kompyuta yako na kifaa chako, kusanidi programu kwa kifaa chako bila arifa, na kusoma data ya rajisi."</string>
diff --git a/packages/SettingsLib/res/values-ta-rIN/arrays.xml b/packages/SettingsLib/res/values-ta-rIN/arrays.xml
index faecb0a..fed3cd1 100644
--- a/packages/SettingsLib/res/values-ta-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-ta-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"முடக்கத்தில்"</item>
<item msgid="3054662377365844197">"எல்லாம்"</item>
<item msgid="688870735111627832">"எல்லாம் (ரேடியோ தவிர்த்து)"</item>
+ <item msgid="2850427388488887328">"கெர்னல் மட்டும்"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"முடக்கத்தில்"</item>
<item msgid="172978079776521897">"தற்காலிகமாகச் சேமித்த எல்லா பதிவுகளும்"</item>
<item msgid="3873873912383879240">"எல்லாம் (தற்காலிகமாகச் சேமித்த ரேடியோ பதிவுகள் தவிர்த்து)"</item>
+ <item msgid="8489661142527693381">"கெர்னல் லாக் பஃபர் மட்டும்"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"அனிமேஷனை முடக்கு"</item>
diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta-rIN/strings.xml
index ec4719f..033955c 100644
--- a/packages/SettingsLib/res/values-ta-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-ta-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"போலி இருப்பிடங்களை அனுமதி"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"போலி இருப்பிடங்களை அனுமதி"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"காட்சி பண்புக்கூறு சோதனையை இயக்கு"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"புதிய Android DHCP க்ளையன்ட்டிற்குப் பதிலாக, Lollipop இலிருந்து DHCP க்ளையன்ட்டைப் பயன்படுத்தவும்."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"வைஃபை இயங்கும் போதும் (வேகமான நெட்வொர்க் மாற்றத்திற்கு), மொபைல் தரவை எப்போதும் இயக்கத்தில் வைக்கும்."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB பிழைத்திருத்தத்தை அனுமதிக்கவா?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB பிழைத்திருத்தம் மேம்படுத்தல் நோக்கங்களுக்காக மட்டுமே. அதை உங்கள் கணினி மற்றும் சாதனத்திற்கு இடையில் தரவை நகலெடுக்கவும், அறிவிப்பு இல்லாமல் உங்கள் சாதனத்தில் பயன்பாடுகளை நிறுவவும், பதிவு தரவைப் படிக்கவும் பயன்படுத்தவும்."</string>
diff --git a/packages/SettingsLib/res/values-te-rIN/arrays.xml b/packages/SettingsLib/res/values-te-rIN/arrays.xml
index 9d48a83..482a1da 100644
--- a/packages/SettingsLib/res/values-te-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-te-rIN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ఆఫ్ చేయి"</item>
<item msgid="3054662377365844197">"అన్నీ"</item>
<item msgid="688870735111627832">"అన్నీ కానీ రేడియో"</item>
+ <item msgid="2850427388488887328">"కెర్నెల్ మాత్రమే"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ఆఫ్ చేయి"</item>
<item msgid="172978079776521897">"అన్ని లాగ్ బఫర్లు"</item>
<item msgid="3873873912383879240">"అన్నీ కానీ రేడియో లాగ్ బఫర్లు"</item>
+ <item msgid="8489661142527693381">"కెర్నెల్ లాగ్ బఫర్ మాత్రమే"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"యానిమేషన్ ఆఫ్లో ఉంది"</item>
diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te-rIN/strings.xml
index 17c0f91..5758176 100644
--- a/packages/SettingsLib/res/values-te-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-te-rIN/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"అనుకృత స్థానాలను అనుమతించు"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"అనుకృత స్థానాలను అనుమతించు"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"వీక్షణ లక్షణ పర్యవేక్షణను ప్రారంభించు"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"కొత్త Android DHCP క్లయింట్కి బదులుగా Lollipop నుండి DHCP క్లయింట్ను ఉపయోగించండి."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ఎల్లప్పుడూ మొబైల్ డేటాను సక్రియంగా ఉంచు, Wi‑Fi సక్రియంగా ఉన్నా కూడా (వేగవంతమైన నెట్వర్క్ మార్పు కోసం)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB డీబగ్గింగ్ను అనుమతించాలా?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB డీబగ్గింగ్ అనేది అభివృద్ధి ప్రయోజనాల కోసం మాత్రమే ఉద్దేశించబడింది. మీ కంప్యూటర్ మరియు మీ పరికరం మధ్య డేటాను కాపీ చేయడానికి, నోటిఫికేషన్ లేకుండా మీ పరికరంలో అనువర్తనాలను ఇన్స్టాల్ చేయడానికి మరియు లాగ్ డేటాను చదవడానికి దీన్ని ఉపయోగించండి."</string>
diff --git a/packages/SettingsLib/res/values-th/arrays.xml b/packages/SettingsLib/res/values-th/arrays.xml
index e61d5ff..08caeb6 100644
--- a/packages/SettingsLib/res/values-th/arrays.xml
+++ b/packages/SettingsLib/res/values-th/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"ปิด"</item>
<item msgid="3054662377365844197">"ทั้งหมด"</item>
<item msgid="688870735111627832">"ทั้งหมดเว้นวิทยุ"</item>
+ <item msgid="2850427388488887328">"เฉพาะเคอร์เนล"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"ปิด"</item>
<item msgid="172978079776521897">"บัฟเฟอร์บันทึกทั้งหมด"</item>
<item msgid="3873873912383879240">"ทั้งหมดยกเว้นบัฟเฟอร์บันทึกวิทยุ"</item>
+ <item msgid="8489661142527693381">"เฉพาะบัฟเฟอร์ไฟล์บันทึกเคอร์เนล"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"ปิดภาพเคลื่อนไหว"</item>
diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml
index 97a17f3..4849e19 100644
--- a/packages/SettingsLib/res/values-th/strings.xml
+++ b/packages/SettingsLib/res/values-th/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"เปิดใช้การตรวจสอบแอตทริบิวต์มุมมอง"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ใช้ไคลเอ็นต์ DHCP จาก Lollipop แทนไคลเอ็นต์ DHCP ใหม่บน Android"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"เปิดใช้ข้อมูลมือถืออยู่เสมอ แม้ในเวลาที่ใช้งาน Wi-Fi อยู่ (สำหรับสวิตชิงเครือข่ายความเร็วสูง)"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"การแก้ไขข้อบกพร่อง USB มีไว้เพื่อการพัฒนาเท่านั้น ให้ใช้การแก้ไขนี้เพื่อคัดลอกข้อมูลระหว่างคอมพิวเตอร์และอุปกรณ์ ติดตั้งแอปพลิเคชันบนอุปกรณ์โดยไม่มีการแจ้งเตือน และอ่านข้อมูลบันทึก"</string>
diff --git a/packages/SettingsLib/res/values-tl/arrays.xml b/packages/SettingsLib/res/values-tl/arrays.xml
index 032d41b..a1505dc 100644
--- a/packages/SettingsLib/res/values-tl/arrays.xml
+++ b/packages/SettingsLib/res/values-tl/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Naka-off"</item>
<item msgid="3054662377365844197">"Lahat"</item>
<item msgid="688870735111627832">"Maliban sa radyo"</item>
+ <item msgid="2850427388488887328">"kernel lang"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Naka-off"</item>
<item msgid="172978079776521897">"Lahat ng buffer ng log"</item>
<item msgid="3873873912383879240">"Lahat maliban sa buffer ng log ng radyo"</item>
+ <item msgid="8489661142527693381">"kernel log buffer lang"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Naka-off ang animation"</item>
diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml
index a007665..24f5499 100644
--- a/packages/SettingsLib/res/values-tl/strings.xml
+++ b/packages/SettingsLib/res/values-tl/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"I-enable ang pagsisiyasat sa attribute na view"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gamitin ang DHCP client mula sa Lollipop sa halip na ang bagong Android DHCP client."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Palaging panatilihing aktibo ang mobile data, kahit na aktibo ang Wi‑Fi (para sa mabilis na paglipat ng network)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Ang pag-debug ng USB ay nilalayon para sa mga layuning pagpapabuti lamang. Gamitin ito upang kumopya ng data sa pagitan ng iyong computer at iyong device, mag-install ng apps sa iyong device nang walang notification, at magbasa ng data ng log."</string>
diff --git a/packages/SettingsLib/res/values-tr/arrays.xml b/packages/SettingsLib/res/values-tr/arrays.xml
index f706a70..c97e79c 100644
--- a/packages/SettingsLib/res/values-tr/arrays.xml
+++ b/packages/SettingsLib/res/values-tr/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Kapalı"</item>
<item msgid="3054662377365844197">"Tümü"</item>
<item msgid="688870735111627832">"Radyo hariç tümü"</item>
+ <item msgid="2850427388488887328">"yaln. çekirdek"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Kapalı"</item>
<item msgid="172978079776521897">"Günlük arabelleklerin tümü"</item>
<item msgid="3873873912383879240">"Radyo günlük arabellekleri hariç tümü"</item>
+ <item msgid="8489661142527693381">"yalnızca çekirdek günlük arabelleği"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animasyon kapalı"</item>
diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml
index 887efb9..950e322 100644
--- a/packages/SettingsLib/res/values-tr/strings.xml
+++ b/packages/SettingsLib/res/values-tr/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Görünüm özelliği incelemeyi etkinleştir"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Yeni Android DHCP istemcisi yerine Lollipop DHCP istemcisini kullan."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Kablosuz bağlantı etkin bile olsa mobil veri kullanımını her zaman etkin tut (ağlar arasında hızlı geçiş yapmak için)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB hata ayıklaması yalnızca geliştirme amaçlıdır. Verileri bilgisayarınızla cihazınız arasında kopyalamak, bildirim göndermeksizin uygulamaları cihazınıza yüklemek ve günlük verilerini okumak için kullanın."</string>
diff --git a/packages/SettingsLib/res/values-uk/arrays.xml b/packages/SettingsLib/res/values-uk/arrays.xml
index f6cc7b1..7b720f3 100644
--- a/packages/SettingsLib/res/values-uk/arrays.xml
+++ b/packages/SettingsLib/res/values-uk/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Вимкнено"</item>
<item msgid="3054662377365844197">"Усі"</item>
<item msgid="688870735111627832">"Усі, крім радіо"</item>
+ <item msgid="2850427388488887328">"лише ядро"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Вимкнено"</item>
<item msgid="172978079776521897">"Буфери всіх журналів"</item>
<item msgid="3873873912383879240">"Буфери всіх журналів, крім радіо"</item>
+ <item msgid="8489661142527693381">"лише буфер журналу ядра"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Анімацію вимкнено"</item>
diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml
index ad95431..6b49b14 100644
--- a/packages/SettingsLib/res/values-uk/strings.xml
+++ b/packages/SettingsLib/res/values-uk/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Увімкнути оцінку атрибуції переглядів"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Використовувати клієнт DHCP з Lollipop, а не новий клієнт DHCP з Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Не вимикати мобільний Інтернет, навіть якщо ввімкнено Wi‑Fi (щоб швидше переходити між мережами)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Дозвол. налагодж. USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Налагодження USB застосовується лише з метою розробки. Його можна використовувати для копіювання даних між комп’ютером і пристроєм, встановлення програм на вашому пристрої без сповіщення та читання даних журналу."</string>
diff --git a/packages/SettingsLib/res/values-ur-rPK/arrays.xml b/packages/SettingsLib/res/values-ur-rPK/arrays.xml
index 4b5e3f6..4f081e5 100644
--- a/packages/SettingsLib/res/values-ur-rPK/arrays.xml
+++ b/packages/SettingsLib/res/values-ur-rPK/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"آف"</item>
<item msgid="3054662377365844197">"تمام"</item>
<item msgid="688870735111627832">"ریڈیو کے سوا تمام"</item>
+ <item msgid="2850427388488887328">"صرف کرنل"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"آف"</item>
<item msgid="172978079776521897">"تمام لاگ بفرز"</item>
<item msgid="3873873912383879240">"ریڈیو لاگ بفرز کے سوا تمام"</item>
+ <item msgid="8489661142527693381">"صرف کرنل لاگ بفر"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"اینیمیشن آف ہے"</item>
diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur-rPK/strings.xml
index aedd6a1..2ac8a61 100644
--- a/packages/SettingsLib/res/values-ur-rPK/strings.xml
+++ b/packages/SettingsLib/res/values-ur-rPK/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"فرضی مقامات کی اجازت دیں"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"فرضی مقامات کی اجازت دیں"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"منظر انتساب کے معائنہ کو فعال کریں"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"نئے Android DHCP کلائنٹ کی بجائے Lollipop کا DHCP کلائنٹ استعمال کریں۔"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi‑Fi فعال ہونے پر بھی موبائل ڈیٹا کو ہمیشہ فعال رکھیں (تیزی سے نیٹ ورک سوئچ کرنے کیلئے)۔"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB ڈیبگ کرنے کی اجازت دیں؟"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB ڈیبگ کرنا صرف ڈیولپمنٹ کے مقاصد کیلئے ہے۔ اپنے کمپیوٹر اور اپنے آلہ کے درمیان ڈیٹا کاپی کرنے کیلئے اسے استعمال کریں، بغیر اطلاع کے اپنے آلہ پر ایپس انسٹال کریں اور لاگ ڈیٹا پڑھیں۔"</string>
diff --git a/packages/SettingsLib/res/values-uz-rUZ/arrays.xml b/packages/SettingsLib/res/values-uz-rUZ/arrays.xml
index ce81fee..f501242 100644
--- a/packages/SettingsLib/res/values-uz-rUZ/arrays.xml
+++ b/packages/SettingsLib/res/values-uz-rUZ/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"O‘chiq"</item>
<item msgid="3054662377365844197">"Hammasi"</item>
<item msgid="688870735111627832">"Radiodan boshqa hammasi"</item>
+ <item msgid="2850427388488887328">"faqat yadro"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"O‘chiq"</item>
<item msgid="172978079776521897">"Barcha jurnallar buferi"</item>
<item msgid="3873873912383879240">"Radio jurnallar buferidan tashqari hammasi"</item>
+ <item msgid="8489661142527693381">"faqat yadro jurnali buferi"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Animatsiya o‘chiq"</item>
diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz-rUZ/strings.xml
index 1132892..9022ad3 100644
--- a/packages/SettingsLib/res/values-uz-rUZ/strings.xml
+++ b/packages/SettingsLib/res/values-uz-rUZ/strings.xml
@@ -75,7 +75,7 @@
<string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Agar ulanishga ruxsat bersangiz, ulangan vaqtda kontakt va qo‘ng‘iroqlaringiz tarixiga kirishi mumkin."</string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan biriktirib bo‘lmadi."</string>
<string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanib bo‘lmadi, chunki PIN-kod yoki parol noto‘g‘ri kiritildi."</string>
- <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Quyidagi qurilma javob bermayapti: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+ <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” qurilmasi bilan aloqa o‘rnatib bo‘lmayapti."</string>
<string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> biriktirish so‘rovini rad qildi."</string>
<string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi o‘chiq."</string>
<string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi o‘chiq."</string>
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Qo‘lbola joylashuvlarga ruxsat berish"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Joylashuv emulyatsiyasiga ruxsat berish"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Alomatlar tekshiruvini yoqish"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Yangi Android DHCP mijoz-dasturi o‘rniga Lollipop tizimi DHCP mijoz-dasturidan foydalanilsin."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Mobil internet har doim yoniq tursin, hatto Wi-Fi yoniq bo‘lsa ham (bir tarmoqdan ikkinchisiga tezroq o‘tish uchun)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB orqali nosozliklarni tuzatishga ruxsat berilsinmi?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB orqali nosozliklarni tuzatish faqat dasturlash maqsadlarida yoqiladi. Undan ma‘lumotlarni qurilmangiz va kompyuter o‘rtasida ko‘chirish, ilovalarni xabarnomasiz o‘rnatish va jurnal ma‘lumotlarini o‘qish uchun foydalaniladi."</string>
diff --git a/packages/SettingsLib/res/values-vi/arrays.xml b/packages/SettingsLib/res/values-vi/arrays.xml
index ba2d4b9..237b4f4 100644
--- a/packages/SettingsLib/res/values-vi/arrays.xml
+++ b/packages/SettingsLib/res/values-vi/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Tắt"</item>
<item msgid="3054662377365844197">"Tất cả"</item>
<item msgid="688870735111627832">"Tất cả trừ đài"</item>
+ <item msgid="2850427388488887328">"chỉ kernel"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Tắt"</item>
<item msgid="172978079776521897">"Tất cả lần tải nhật ký"</item>
<item msgid="3873873912383879240">"Tất cả trừ lần tải nhật ký qua đài"</item>
+ <item msgid="8489661142527693381">"chỉ vùng đệm nhật ký kernel"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Tắt hình động"</item>
diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml
index 4d7f36d..c58f849 100644
--- a/packages/SettingsLib/res/values-vi/strings.xml
+++ b/packages/SettingsLib/res/values-vi/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Cho phép kiểm tra thuộc tính của chế độ xem"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Sử dụng ứng dụng DHCP từ Lollipop thay vì ứng dụng DHCP mới của Android."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Luôn giữ cho dữ liệu di động hoạt động, ngay cả khi Wi-Fi đang hoạt động (để chuyển đổi mạng nhanh)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Gỡ lỗi USB chỉ dành cho mục đích phát triển. Hãy sử dụng tính năng này để sao chép dữ liệu giữa máy tính và thiết bị của bạn, cài đặt ứng dụng trên thiết bị của bạn mà không thông báo và đọc dữ liệu nhật ký."</string>
diff --git a/packages/SettingsLib/res/values-zh-rCN/arrays.xml b/packages/SettingsLib/res/values-zh-rCN/arrays.xml
index fa1e909..8a3febd 100644
--- a/packages/SettingsLib/res/values-zh-rCN/arrays.xml
+++ b/packages/SettingsLib/res/values-zh-rCN/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"关闭"</item>
<item msgid="3054662377365844197">"全部"</item>
<item msgid="688870735111627832">"所有非无线电"</item>
+ <item msgid="2850427388488887328">"仅限内核"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"关闭"</item>
<item msgid="172978079776521897">"所有日志缓冲区"</item>
<item msgid="3873873912383879240">"所有非无线电日志缓冲区"</item>
+ <item msgid="8489661142527693381">"仅限内核日志缓冲区"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"关闭动画"</item>
diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml
index 0a0d35f..18ae80e 100644
--- a/packages/SettingsLib/res/values-zh-rCN/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml
@@ -132,8 +132,8 @@
<item msgid="164347302621392996">"快"</item>
<item msgid="5794028588101562009">"较快"</item>
<item msgid="7163942783888652942">"非常快"</item>
- <item msgid="7831712693748700507">"迅速"</item>
- <item msgid="5194774745031751806">"很迅速"</item>
+ <item msgid="7831712693748700507">"超快"</item>
+ <item msgid="5194774745031751806">"极快"</item>
<item msgid="9085102246155045744">"最快"</item>
</string-array>
<string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"启用视图属性检查功能"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 客户端，而不是新的 Android DHCP 客户端。"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"始终开启移动数据网络，即使 WLAN 网络已开启（便于快速切换网络）。"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"是否允许USB调试？"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
diff --git a/packages/SettingsLib/res/values-zh-rHK/arrays.xml b/packages/SettingsLib/res/values-zh-rHK/arrays.xml
index 63c7cac..fe65884 100644
--- a/packages/SettingsLib/res/values-zh-rHK/arrays.xml
+++ b/packages/SettingsLib/res/values-zh-rHK/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"關閉"</item>
<item msgid="3054662377365844197">"全部"</item>
<item msgid="688870735111627832">"所有非無線電"</item>
+ <item msgid="2850427388488887328">"只限核心"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"關閉"</item>
<item msgid="172978079776521897">"所有記錄緩衝區"</item>
<item msgid="3873873912383879240">"所有非無線電記錄緩衝區"</item>
+ <item msgid="8489661142527693381">"只限核心記錄緩衝區"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"關閉動畫"</item>
diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml
index 5594f82..660071d 100644
--- a/packages/SettingsLib/res/values-zh-rHK/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端，而不是新的 Android DHCP 用戶端。"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"即使 Wi‑Fi 已啟用，仍永遠啟用流動數據 (可快速切換網絡)。"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能，可讓您在電腦與裝置間複製資料、不用通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
diff --git a/packages/SettingsLib/res/values-zh-rTW/arrays.xml b/packages/SettingsLib/res/values-zh-rTW/arrays.xml
index e816f1a..0939e93 100644
--- a/packages/SettingsLib/res/values-zh-rTW/arrays.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"關閉"</item>
<item msgid="3054662377365844197">"全部"</item>
<item msgid="688870735111627832">"無線電以外"</item>
+ <item msgid="2850427388488887328">"僅限核心"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"關閉"</item>
<item msgid="172978079776521897">"所有紀錄緩衝區"</item>
<item msgid="3873873912383879240">"無線電紀錄緩衝區以外的所有紀錄緩衝區"</item>
+ <item msgid="8489661142527693381">"僅限核心紀錄緩衝區"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"關閉動畫"</item>
diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml
index 2834f58..bce6f24 100644
--- a/packages/SettingsLib/res/values-zh-rTW/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端，不使用新型 Android DHCP 用戶端。"</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"即使 Wi‑Fi 連線已啟用，一律將行動數據連線保持啟用狀態 (以便快速切換網路)。"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能，可讓您複製電腦和裝置中的資料、不需經由通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
diff --git a/packages/SettingsLib/res/values-zu/arrays.xml b/packages/SettingsLib/res/values-zu/arrays.xml
index f6a1f16..772dee8 100644
--- a/packages/SettingsLib/res/values-zu/arrays.xml
+++ b/packages/SettingsLib/res/values-zu/arrays.xml
@@ -84,11 +84,13 @@
<item msgid="1744840221860799971">"Valiwe"</item>
<item msgid="3054662377365844197">"Konke"</item>
<item msgid="688870735111627832">"Konke ngaphandle kwerediyo"</item>
+ <item msgid="2850427388488887328">"i-kernel kuphela"</item>
</string-array>
<string-array name="select_logpersist_summaries">
<item msgid="2216470072500521830">"Valiwe"</item>
<item msgid="172978079776521897">"Onke amabhafa elogi"</item>
<item msgid="3873873912383879240">"Konke ngaphandle kwamabhafa elogi yerediyo"</item>
+ <item msgid="8489661142527693381">"ilogi ye-kernel kuphela"</item>
</string-array>
<string-array name="window_animation_scale_entries">
<item msgid="8134156599370824081">"Isithombe esinyakazayo sivliwe"</item>
diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml
index c78a90f..07c6fce 100644
--- a/packages/SettingsLib/res/values-zu/strings.xml
+++ b/packages/SettingsLib/res/values-zu/strings.xml
@@ -184,7 +184,6 @@
<string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
<string name="debug_view_attributes" msgid="6485448367803310384">"Nika amandla ukubuka"</string>
- <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Sebenzisa iklayenti le-DHCP kusukela ku-Lollipop esikhundleni seklayenti elisha le-Android DHCP."</string>
<string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Hlala ugcine idatha yeselula isebenza, nanoma i-Wi-Fi isebenza (ngokushintshwa kwenethiwekhi okusheshayo)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"Ukulungisa iphutha le-USB kuhloselwe izinjongo zokuthuthukisa kuphela. Ingasebenziselwa ukukopisha idatha phakathi kwekhompyutha yakho nedivaysi yakho, faka izinhlelo zokusebenza kwidivaysi yakho ngaphandle kwesaziso, bese ufunda idatha yefayela lokungena."</string>
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index a4a0e6b..5f45f15 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -143,6 +143,7 @@
<item></item>
<item>all</item>
<item>default,security,kernel</item>
+ <item>kernel</item>
</string-array>
<!-- Titles for logpersist state selection preference. [CHAR LIMIT=14] -->
@@ -150,6 +151,7 @@
<item>Off</item>
<item>All</item>
<item>All but radio</item>
+ <item>kernel only</item>
</string-array>
<!-- Summaries for logpersist state selection preference. [CHAR LIMIT=50]-->
@@ -157,6 +159,7 @@
<item>Off</item>
<item>All log buffers</item>
<item>All but radio log buffers</item>
+ <item>kernel log buffer only</item>
</string-array>
<!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
@@ -287,11 +290,11 @@
<item>highlight</item>
</string-array>
- <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+ <!-- Titles for frame time tracking preference. [CHAR LIMIT=50] -->
<string-array name="track_frame_time_entries">
<item>Off</item>
<item>On screen as bars</item>
- <item>In adb shell dumpsys gfxinfo</item>
+ <item>In <xliff:g id="as_typed_command">adb shell dumpsys gfxinfo</xliff:g></item>
</string-array>
<!-- Values for frame time tracking preference. -->
@@ -383,4 +386,12 @@
<item>3</item>
</string-array>
+ <!-- IDs for each color mode. The values must match the corresponding constants in
+ android.view.Display -->
+ <integer-array name="color_mode_ids">
+ <item>0</item>
+ <item>-1</item>
+ <item>7</item>
+ </integer-array>
+
</resources>
diff --git a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
index ff1c866..b04948b 100644
--- a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
@@ -22,6 +22,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Build;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionInfo;
+import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.text.format.DateFormat;
import android.util.Log;
@@ -37,6 +40,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static android.content.Context.TELEPHONY_SERVICE;
+
public class DeviceInfoUtils {
private static final String TAG = "DeviceInfoUtils";
@@ -169,4 +174,40 @@
}
}
+ public static String getFormattedPhoneNumber(Context context, SubscriptionInfo subscriptionInfo) {
+ String formattedNumber = null;
+ if (subscriptionInfo != null) {
+ final TelephonyManager telephonyManager =
+ (TelephonyManager) context.getSystemService(TELEPHONY_SERVICE);
+ final String rawNumber =
+ telephonyManager.getLine1Number(subscriptionInfo.getSubscriptionId());
+ if (!TextUtils.isEmpty(rawNumber)) {
+ formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
+ }
+
+ }
+ return formattedNumber;
+ }
+
+ public static String getFormattedPhoneNumbers(Context context,
+ List<SubscriptionInfo> subscriptionInfo) {
+ StringBuilder sb = new StringBuilder();
+ if (subscriptionInfo != null) {
+ final TelephonyManager telephonyManager =
+ (TelephonyManager) context.getSystemService(TELEPHONY_SERVICE);
+ final int count = subscriptionInfo.size();
+ for (int i = 0; i < count; i++) {
+ final String rawNumber = telephonyManager.getLine1Number(
+ subscriptionInfo.get(i).getSubscriptionId());
+ if (!TextUtils.isEmpty(rawNumber)) {
+ sb.append(PhoneNumberUtils.formatNumber(rawNumber));
+ if (i < count - 1) {
+ sb.append("\n");
+ }
+ }
+ }
+ }
+ return sb.toString();
+ }
+
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
index 5791168..21116b8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
@@ -26,6 +26,7 @@
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.net.Uri;
+import android.provider.Settings.Global;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
@@ -92,6 +93,9 @@
*/
public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem,
String helpUriString, String backupContext) {
+ if (Global.getInt(activity.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+ return false;
+ }
if (TextUtils.isEmpty(helpUriString)) {
// The help url string is empty or null, so set the help menu item to be invisible.
helpMenuItem.setVisible(false);
@@ -129,6 +133,9 @@
public static Intent getHelpIntent(Context context, String helpUriString,
String backupContext) {
+ if (Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+ return null;
+ }
// Try to handle as Intent Uri, otherwise just treat as Uri.
try {
Intent intent = Intent.parseUri(helpUriString,
diff --git a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
index d368de9..151e0ea 100644
--- a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
+++ b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
@@ -16,18 +16,11 @@
package com.android.settingslib;
import android.content.Context;
-import android.net.wifi.WifiManager;
import android.os.SystemProperties;
import android.telephony.CarrierConfigManager;
public class TetherUtil {
- public static boolean setWifiTethering(boolean enable, Context context) {
- final WifiManager wifiManager =
- (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- return wifiManager.setWifiApEnabled(null, enable);
- }
-
private static boolean isEntitlementCheckRequired(Context context) {
final CarrierConfigManager configManager = (CarrierConfigManager) context
.getSystemService(Context.CARRIER_CONFIG_SERVICE);
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java
index 7993131..e049079 100644
--- a/packages/SettingsLib/src/com/android/settingslib/Utils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java
@@ -16,6 +16,7 @@
import android.net.ConnectivityManager;
import android.os.BatteryManager;
import android.os.UserManager;
+import android.print.PrintManager;
import com.android.internal.util.UserIcons;
import com.android.settingslib.drawable.UserIconDrawable;
@@ -168,7 +169,7 @@
* Determine whether a package is a "system package", in which case certain things (like
* disabling notifications or disabling the package altogether) should be disallowed.
*/
- public static boolean isSystemPackage(PackageManager pm, PackageInfo pkg) {
+ public static boolean isSystemPackage(Resources resources, PackageManager pm, PackageInfo pkg) {
if (sSystemSignature == null) {
sSystemSignature = new Signature[]{ getSystemSignature(pm) };
}
@@ -185,7 +186,9 @@
&& sSystemSignature[0].equals(getFirstSignature(pkg)))
|| pkg.packageName.equals(sPermissionControllerPackageName)
|| pkg.packageName.equals(sServicesSystemSharedLibPackageName)
- || pkg.packageName.equals(sSharedSystemSharedLibPackageName);
+ || pkg.packageName.equals(sSharedSystemSharedLibPackageName)
+ || pkg.packageName.equals(PrintManager.PRINT_SPOOLER_PACKAGE_NAME)
+ || isDeviceProvisioningPackage(resources, pkg.packageName);
}
private static Signature getFirstSignature(PackageInfo pkg) {
@@ -203,4 +206,14 @@
}
return null;
}
+
+ /**
+ * Returns {@code true} if the supplied package is the device provisioning app. Otherwise,
+ * returns {@code false}.
+ */
+ public static boolean isDeviceProvisioningPackage(Resources resources, String packageName) {
+ String deviceProvisioningPackage = resources.getString(
+ com.android.internal.R.string.config_deviceProvisioningPackage);
+ return deviceProvisioningPackage != null && deviceProvisioningPackage.equals(packageName);
+ }
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 7392453..a22a051 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -582,10 +582,10 @@
public ArrayList<AppEntry> rebuild(AppFilter filter, Comparator<AppEntry> comparator,
boolean foreground) {
synchronized (mRebuildSync) {
- synchronized (mEntriesMap) {
+ synchronized (mRebuildingSessions) {
mRebuildingSessions.add(this);
mRebuildRequested = true;
- mRebuildAsync = false;
+ mRebuildAsync = true;
mRebuildFilter = filter;
mRebuildComparator = comparator;
mRebuildForeground = foreground;
@@ -597,23 +597,7 @@
}
}
- // We will wait for .25s for the list to be built.
- long waitend = SystemClock.uptimeMillis()+250;
-
- while (mRebuildResult == null) {
- long now = SystemClock.uptimeMillis();
- if (now >= waitend) {
- break;
- }
- try {
- mRebuildSync.wait(waitend - now);
- } catch (InterruptedException e) {
- }
- }
-
- mRebuildAsync = true;
-
- return mRebuildResult;
+ return null;
}
}
@@ -765,6 +749,7 @@
static final int MSG_LOAD_ICONS = 3;
static final int MSG_LOAD_SIZES = 4;
static final int MSG_LOAD_LAUNCHER = 5;
+ static final int MSG_LOAD_HOME_APP = 6;
boolean mRunning;
@@ -776,7 +761,7 @@
public void handleMessage(Message msg) {
// Always try rebuilding list first thing, if needed.
ArrayList<Session> rebuildingSessions = null;
- synchronized (mEntriesMap) {
+ synchronized (mRebuildingSessions) {
if (mRebuildingSessions.size() > 0) {
rebuildingSessions = new ArrayList<Session>(mRebuildingSessions);
mRebuildingSessions.clear();
@@ -833,13 +818,33 @@
if (!mMainHandler.hasMessages(MainHandler.MSG_LOAD_ENTRIES_COMPLETE)) {
mMainHandler.sendEmptyMessage(MainHandler.MSG_LOAD_ENTRIES_COMPLETE);
}
- sendEmptyMessage(MSG_LOAD_LAUNCHER);
+ sendEmptyMessage(MSG_LOAD_HOME_APP);
}
} break;
+ case MSG_LOAD_HOME_APP: {
+ final List<ResolveInfo> homeActivities = new ArrayList<>();
+ mPm.getHomeActivities(homeActivities);
+ synchronized (mEntriesMap) {
+ final int entryCount = mEntriesMap.size();
+ for (int i = 0; i < entryCount; i++) {
+ if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_HOME_APP acquired lock");
+ final HashMap<String, AppEntry> userEntries = mEntriesMap.valueAt(i);
+ for (ResolveInfo activity : homeActivities) {
+ String packageName = activity.activityInfo.packageName;
+ AppEntry entry = userEntries.get(packageName);
+ if (entry != null) {
+ entry.isHomeApp = true;
+ }
+ }
+ if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_HOME_APP releasing lock");
+ }
+ }
+ sendEmptyMessage(MSG_LOAD_LAUNCHER);
+ }
+ break;
case MSG_LOAD_LAUNCHER: {
Intent launchIntent = new Intent(Intent.ACTION_MAIN, null)
.addCategory(Intent.CATEGORY_LAUNCHER);
-
for (int i = 0; i < mEntriesMap.size(); i++) {
int userId = mEntriesMap.keyAt(i);
// If we do not specify MATCH_DIRECT_BOOT_AWARE or
@@ -1135,6 +1140,11 @@
*/
public boolean hasLauncherEntry;
+ /**
+ * Whether or not it's a Home app.
+ */
+ public boolean isHomeApp;
+
public String getNormalizedLabel() {
if (normalizedLabel != null) {
return normalizedLabel;
@@ -1326,6 +1336,8 @@
return true;
} else if (entry.hasLauncherEntry) {
return true;
+ } else if ((entry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0 && entry.isHomeApp) {
+ return true;
}
return false;
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index c075703..a879d16f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -809,7 +809,9 @@
// No separate prompt is displayed after pairing.
if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {
if (mDevice.getBluetoothClass().getDeviceClass()
- == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
+ == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE ||
+ mDevice.getBluetoothClass().getDeviceClass()
+ == BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET) {
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
} else {
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
diff --git a/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java b/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
index 78d7c56..a99e668 100644
--- a/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.res.Resources;
+import android.hardware.display.DisplayManager;
import android.os.AsyncTask;
import android.os.RemoteException;
import android.util.DisplayMetrics;
@@ -95,7 +96,9 @@
}
final Resources res = context.getResources();
- final DisplayMetrics metrics = res.getDisplayMetrics();
+ final DisplayMetrics metrics = new DisplayMetrics();
+ context.getDisplay().getRealMetrics(metrics);
+
final int currentDensity = metrics.densityDpi;
int currentDensityIndex = -1;
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
index b9c758c..e70cc29 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
@@ -27,6 +27,7 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
+import android.provider.Settings.Global;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
@@ -115,6 +116,8 @@
public static List<DashboardCategory> getCategories(Context context,
HashMap<Pair<String, String>, Tile> cache) {
final long startTime = System.currentTimeMillis();
+ boolean setup = Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0)
+ != 0;
ArrayList<Tile> tiles = new ArrayList<>();
UserManager userManager = UserManager.get(context);
for (UserHandle user : userManager.getUserProfiles()) {
@@ -127,7 +130,9 @@
getTilesForAction(context, user, MANUFACTURER_SETTINGS, cache,
MANUFACTURER_DEFAULT_CATEGORY, tiles, false);
}
- getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false);
+ if (setup) {
+ getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false);
+ }
}
HashMap<String, DashboardCategory> categoryMap = new HashMap<>();
for (Tile tile : tiles) {
diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java b/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java
index ee1821d..c6a45bc 100644
--- a/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java
+++ b/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java
@@ -71,10 +71,11 @@
layout.addView(labels);
// Set gravity.
labels.setGravity(Gravity.END);
- // Swap the bottom label padding
+ // Swap the bottom space order.
LinearLayout bottomLabels = (LinearLayout) findViewById(R.id.bottom_label_group);
- bottomLabels.setPadding(bottomLabels.getPaddingRight(), bottomLabels.getPaddingTop(),
- bottomLabels.getPaddingLeft(), bottomLabels.getPaddingBottom());
+ View bottomSpace = bottomLabels.findViewById(R.id.bottom_label_space);
+ bottomLabels.removeView(bottomSpace);
+ bottomLabels.addView(bottomSpace);
} else if (gravity != Gravity.START) {
throw new IllegalArgumentException("Unsupported gravity " + gravity);
}
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 108814e..f7e9541 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -153,7 +153,7 @@
<integer name="def_download_manager_recommended_max_bytes_over_mobile">-1</integer>
<!-- Default for Settings.Secure.LONG_PRESS_TIMEOUT_MILLIS -->
- <integer name="def_long_press_timeout_millis">500</integer>
+ <integer name="def_long_press_timeout_millis">400</integer>
<!-- Default for Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD -->
<bool name="def_show_ime_with_hard_keyboard">false</bool>
@@ -216,7 +216,4 @@
<!-- Default setting for ability to add users from the lock screen -->
<bool name="def_add_users_from_lockscreen">false</bool>
-
- <!-- Default setting for disallow oem unlock. -->
- <bool name="def_oem_unlock_disallow">false</bool>
</resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index b79ce80..bf48e5d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -247,7 +247,6 @@
return Settings.Secure.getInt(mContext.getContentResolver(), name, 0) != 0;
case Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES:
case Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES:
- case Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX:
case Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER:
case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE:
return !TextUtils.isEmpty(Settings.Secure.getString(
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 950c7d3..d27f1f8 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -799,7 +799,8 @@
// If this is a setting that is currently restricted for this user, do not allow
// unrestricting changes.
- if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value)) {
+ if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value,
+ Binder.getCallingUid())) {
return false;
}
@@ -930,7 +931,8 @@
// If this is a setting that is currently restricted for this user, do not allow
// unrestricting changes.
- if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value)) {
+ if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value,
+ Binder.getCallingUid())) {
return false;
}
@@ -1153,7 +1155,7 @@
* @return true if the change is prohibited, false if the change is allowed.
*/
private boolean isGlobalOrSecureSettingRestrictedForUser(String setting, int userId,
- String value) {
+ String value, int callingUid) {
String restriction;
switch (setting) {
case Settings.Secure.LOCATION_MODE:
@@ -1191,6 +1193,20 @@
restriction = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
break;
+ case Settings.Secure.ALWAYS_ON_VPN_APP:
+ case Settings.Secure.ALWAYS_ON_VPN_LOCKDOWN:
+ // Whitelist system uid (ConnectivityService) and root uid to change always-on vpn
+ if (callingUid == Process.SYSTEM_UID || callingUid == Process.ROOT_UID) {
+ return false;
+ }
+ restriction = UserManager.DISALLOW_CONFIG_VPN;
+ break;
+
+ case Settings.Global.SAFE_BOOT_DISALLOWED:
+ if ("1".equals(value)) return false;
+ restriction = UserManager.DISALLOW_SAFE_BOOT;
+ break;
+
default:
if (setting != null && setting.startsWith(Settings.Global.DATA_ROAMING)) {
if ("0".equals(value)) return false;
@@ -2074,7 +2090,7 @@
}
private final class UpgradeController {
- private static final int SETTINGS_VERSION = 128;
+ private static final int SETTINGS_VERSION = 130;
private final int mUserId;
@@ -2330,17 +2346,67 @@
}
if (currentVersion == 127) {
- // Version 127: Disable OEM unlock setting by default on some devices.
- final SettingsState globalSettings = getGlobalSettingsLocked();
- String defaultOemUnlockDisabled = (getContext().getResources()
- .getBoolean(R.bool.def_oem_unlock_disallow) ? "1" : "0");
- globalSettings.insertSettingLocked(
- Settings.Global.OEM_UNLOCK_DISALLOWED,
- defaultOemUnlockDisabled,
- SettingsState.SYSTEM_PACKAGE_NAME);
+ // version 127 is no longer used.
currentVersion = 128;
}
+ if (currentVersion == 128) {
+ // Version 128: Allow OEMs to grant DND access to default apps. Note that
+ // the new apps are appended to the list of already approved apps.
+ final SettingsState systemSecureSettings =
+ getSecureSettingsLocked(userId);
+
+ final Setting policyAccess = systemSecureSettings.getSettingLocked(
+ Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES);
+ String defaultPolicyAccess = getContext().getResources().getString(
+ com.android.internal.R.string.config_defaultDndAccessPackages);
+ if (!TextUtils.isEmpty(defaultPolicyAccess)) {
+ if (policyAccess.isNull()) {
+ systemSecureSettings.insertSettingLocked(
+ Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
+ defaultPolicyAccess,
+ SettingsState.SYSTEM_PACKAGE_NAME);
+ } else {
+ StringBuilder currentSetting =
+ new StringBuilder(policyAccess.getValue());
+ currentSetting.append(":");
+ currentSetting.append(defaultPolicyAccess);
+ systemSecureSettings.updateSettingLocked(
+ Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
+ currentSetting.toString(),
+ SettingsState.SYSTEM_PACKAGE_NAME);
+ }
+ }
+
+ currentVersion = 129;
+ }
+
+ if (currentVersion == 129) {
+ // default longpress timeout changed from 500 to 400. If unchanged from the old
+ // default, update to the new default.
+ final SettingsState systemSecureSettings =
+ getSecureSettingsLocked(userId);
+ final String oldValue = systemSecureSettings.getSettingLocked(
+ Settings.Secure.LONG_PRESS_TIMEOUT).getValue();
+ if (TextUtils.equals("500", oldValue)) {
+ systemSecureSettings.insertSettingLocked(
+ Settings.Secure.LONG_PRESS_TIMEOUT,
+ String.valueOf(getContext().getResources().getInteger(
+ R.integer.def_long_press_timeout_millis)),
+ SettingsState.SYSTEM_PACKAGE_NAME);
+ }
+ currentVersion = 130;
+ }
+
+ if (currentVersion != newVersion) {
+ Slog.w("SettingsProvider", "warning: upgrading settings database to version "
+ + newVersion + " left it at "
+ + currentVersion + " instead; this is probably a bug", new Throwable());
+ if (DEBUG) {
+ throw new RuntimeException("db upgrade error");
+ }
+ }
+
// vXXX: Add new settings above this point.
// Return the current version.
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 2efefb3..f1789ea 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -142,7 +142,7 @@
<activity
android:name=".BugreportWarningActivity"
- android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
+ android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"
android:exported="false" />
diff --git a/packages/Shell/res/layout/confirm_repeat.xml b/packages/Shell/res/layout/confirm_repeat.xml
index ad90af1..9f1d53e 100644
--- a/packages/Shell/res/layout/confirm_repeat.xml
+++ b/packages/Shell/res/layout/confirm_repeat.xml
@@ -18,10 +18,10 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="16dip"
- android:paddingEnd="16dip"
- android:paddingTop="8dip"
- android:paddingBottom="16dip"
+ android:paddingStart="24dip"
+ android:paddingEnd="24dip"
+ android:paddingTop="24dip"
+ android:paddingBottom="8dip"
android:orientation="vertical"
android:keepScreenOn="true">
<ScrollView
diff --git a/packages/Shell/res/values-af/strings.xml b/packages/Shell/res/values-af/strings.xml
index 51679f7..391017e 100644
--- a/packages/Shell/res/values-af/strings.xml
+++ b/packages/Shell/res/values-af/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Foutverslag <xliff:g id="ID">#%d</xliff:g> is vasgevang"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Voeg tans besonderhede by die foutverslag"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Wag asseblief …"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swiep na links om jou foutverslag te deel"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Die foutverslag sal binnekort op die foon verskyn"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tik om jou foutverslag te deel"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tik om jou foutverslag sonder \'n skermkiekie te deel, of wag totdat die skermkiekie gereed is"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tik om jou foutverslag sonder \'n skermkiekie te deel, of wag totdat die skermkiekie gereed is"</string>
diff --git a/packages/Shell/res/values-am/strings.xml b/packages/Shell/res/values-am/strings.xml
index f04e882..dccf9dd 100644
--- a/packages/Shell/res/values-am/strings.xml
+++ b/packages/Shell/res/values-am/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"የሳንካ ሪፖርት <xliff:g id="ID">#%d</xliff:g> ተወስዷል"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ዝርዝሮችን ወደ የሳንካ ሪፖርቱ በማከል ላይ"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"እባክዎ ይጠብቁ…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"የሳንካ ሪፖርትዎን ለማጋራት ወደ ግራ ያንሸራትቱ"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"የሳንካ ሪፖርቱ ከትንሽ ጊዜ በኋላ በስልኩ ላይ ይመጣል"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"የሳንካ ሪፖርትዎን ለማጋራት መታ ያድርጉ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"የእርስዎን የሳንካ ሪፖርት ያለ ቅጽበታዊ ማያ ገጽ ለማጋራት መታ ያድርጉ ወይም ቅጽበታዊ ማያ ገጹ እስኪጨርስ ይጠብቁ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"የእርስዎን የሳንካ ሪፖርት ያለ ቅጽበታዊ ማያ ገጽ ለማጋራት መታ ያድርጉ ወይም ቅጽበታዊ ማያ ገጹ እስኪጨርስ ይጠብቁ"</string>
diff --git a/packages/Shell/res/values-ar/strings.xml b/packages/Shell/res/values-ar/strings.xml
index 37516a1..d2e3cc5 100644
--- a/packages/Shell/res/values-ar/strings.xml
+++ b/packages/Shell/res/values-ar/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"تم تسجيل تقرير الخطأ <xliff:g id="ID">#%d</xliff:g>."</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"إضافة تفاصيل إلى تقرير الخطأ"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"الرجاء الانتظار…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"مرر بسرعة لليمين لمشاركة تقرير الخطأ"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"سيظهر تقرير الخطأ على الهاتف بعد قليل"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"انقر لمشاركة تقرير الخطأ."</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"انقر لمشاركة تقرير الأخطاء بدون لقطة شاشة أو انتظر حتى انتهاء لقطة الشاشة"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"انقر لمشاركة تقرير الأخطاء بدون لقطة شاشة أو انتظر حتى انتهاء لقطة الشاشة"</string>
diff --git a/packages/Shell/res/values-az-rAZ/strings.xml b/packages/Shell/res/values-az-rAZ/strings.xml
index 303467b..9e6c84b 100644
--- a/packages/Shell/res/values-az-rAZ/strings.xml
+++ b/packages/Shell/res/values-az-rAZ/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Baq hesabatı <xliff:g id="ID">#%d</xliff:g> alındı"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Detallar baq hesabatına əlavə olunur"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Lütfən, gözləyin..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Baq raportunu paylaşmaq üçün sola sürüşdürün"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Baq həlli tezliklə telefonda görünəcək"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Baq hesabatınızı paylaşmaq üçün tıklayın"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"baq hesabatınızı skrinşot olmadan paylaşmaq üçün tıklayın, skrinşotun tamamlanması üçün isə gözləyin"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"baq hesabatınızı skrinşot olmadan paylaşmaq üçün tıklayın, skrinşotun tamamlanması üçün isə gözləyin"</string>
diff --git a/packages/Shell/res/values-b+sr+Latn/strings.xml b/packages/Shell/res/values-b+sr+Latn/strings.xml
index 185b690..3c7c7e8 100644
--- a/packages/Shell/res/values-b+sr+Latn/strings.xml
+++ b/packages/Shell/res/values-b+sr+Latn/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Izveštaj o grešci <xliff:g id="ID">#%d</xliff:g> je snimljen"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Dodaju se detalji u izveštaj o grešci"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Sačekajte..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prevucite ulevo da biste delili izveštaj o greškama"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Izveštaj o grešci će se uskoro pojaviti na telefonu"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dodirnite da biste delili izveštaj o grešci"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Dodirnite za deljenje izveštaja o grešci bez snimka ekrana ili sačekajte da se napravi snimak ekrana"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Dodirnite za deljenje izveštaja o grešci bez snimka ekrana ili sačekajte da se napravi snimak ekrana"</string>
diff --git a/packages/Shell/res/values-be-rBY/strings.xml b/packages/Shell/res/values-be-rBY/strings.xml
index fb29fbc..7e7fc79 100644
--- a/packages/Shell/res/values-be-rBY/strings.xml
+++ b/packages/Shell/res/values-be-rBY/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Справаздача <xliff:g id="ID">#%d</xliff:g> пра памылку зафіксавана"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Дадаванне падрабязнасцей да справаздачы пра памылкі"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Калі ласка, пачакайце..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Правядзіце пальцам налева, каб абагуліць сваю справаздачу пра памылку"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Паведамленне пра памылку хутка з\'явіцца на тэлефоне"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Дакраніцеся, каб абагуліць сваю справаздачу пра памылку"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Краніце, каб абагуліць справаздачу пра памылку без здымка экрана, або чакайце атрымання здымка."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Краніце, каб абагуліць справаздачу пра памылку без здымка экрана, або чакайце атрымання здымка."</string>
diff --git a/packages/Shell/res/values-bg/strings.xml b/packages/Shell/res/values-bg/strings.xml
index 0787900..ed8caaf 100644
--- a/packages/Shell/res/values-bg/strings.xml
+++ b/packages/Shell/res/values-bg/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Сигналът за програмна грешка „<xliff:g id="ID">#%d</xliff:g>“ е заснет"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Подробностите се добавят към сигнала за пр. грешка"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Моля, изчакайте…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Прекарайте пръст наляво, за да споделите сигнала си за програмна грешка"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Сигналът за програмна грешка скоро ще се покаже на телефона"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Докоснете, за да споделите сигнала си за програмна грешка"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Докоснете, за да споделите сигнала за прогр. грешка без екранна снимка, или изчакайте завършването й"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Докоснете, за да споделите сигнала за прогр. грешка без екранна снимка, или изчакайте завършването й"</string>
diff --git a/packages/Shell/res/values-bn-rBD/strings.xml b/packages/Shell/res/values-bn-rBD/strings.xml
index a51950a..b7d550c 100644
--- a/packages/Shell/res/values-bn-rBD/strings.xml
+++ b/packages/Shell/res/values-bn-rBD/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ত্রুটির প্রতিবেদন <xliff:g id="ID">#%d</xliff:g> ক্যাপচার করা হয়েছে"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ত্রুটির প্রতিবেদনে বিশদ বিবরণ যোগ করা হচ্ছে"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"অনুগ্রহ করে অপেক্ষা করুন..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"আপনার বাগ রিপোর্ট শেয়ার করতে বামে সোয়াইপ করুন"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ফোনে শীঘ্রই ত্রুটির প্রতিবেদন দেখা যাবে"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"আপনার ত্রুটির প্রতিবেদন শেয়ার করতে আলতো চাপ দিন"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"কোনো স্ক্রীনশট ছাড়াই ত্রুটির প্রতিবেদন শেয়ার করতে আলতো চাপ দিন বা সম্পন্ন করতে স্ক্রীনশটের জন্য অপেক্ষা করুন"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"কোনো স্ক্রীনশট ছাড়াই ত্রুটির প্রতিবেদন শেয়ার করতে আলতো চাপ দিন বা সম্পন্ন করতে স্ক্রীনশটের জন্য অপেক্ষা করুন"</string>
diff --git a/packages/Shell/res/values-bs-rBA/strings.xml b/packages/Shell/res/values-bs-rBA/strings.xml
index 80dddb5..88d247d 100644
--- a/packages/Shell/res/values-bs-rBA/strings.xml
+++ b/packages/Shell/res/values-bs-rBA/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Izvještaj o grešci <xliff:g id="ID">#%d</xliff:g> je snimljen"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Dodavanje detalja u izvještaj o greškama"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Pričekajte..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prevucite lijevo da podijelite izvještaj o greškama"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Izvještaj o greškama će se ubrzo pojaviti na ekranu"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dodirnite da biste podijelili izvještaj o grešci"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Dodirnite da podijelite izveštaj o greškama bez snimka ekrana ili sačekajte da snimak bude gotov"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Dodirnite da podijelite izveštaj o greškama bez snimka ekrana ili sačekajte da snimak bude gotov"</string>
diff --git a/packages/Shell/res/values-ca/strings.xml b/packages/Shell/res/values-ca/strings.xml
index f8ed813..d570a54 100644
--- a/packages/Shell/res/values-ca/strings.xml
+++ b/packages/Shell/res/values-ca/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"S\'ha capturat l\'informe d\'errors <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"S\'estan afegint detalls a l\'informe d\'errors"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Espera…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Llisca cap a l\'esquerra per compartir l\'informe d\'errors."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"L\'informe d\'errors es mostrarà al telèfon aviat"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toca per compartir l\'informe d\'errors"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toca per compartir l\'informe d\'errors sense captura de pantalla o espera que es creï la captura"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toca per compartir l\'informe d\'errors sense captura de pantalla o espera que es creï la captura"</string>
diff --git a/packages/Shell/res/values-cs/strings.xml b/packages/Shell/res/values-cs/strings.xml
index 4e41b79..f05a9ba 100644
--- a/packages/Shell/res/values-cs/strings.xml
+++ b/packages/Shell/res/values-cs/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Zpráva o chybě <xliff:g id="ID">#%d</xliff:g> byla vytvořena"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Přidávání podrobností do zprávy o chybě"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Čekejte prosím…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Chcete-li hlášení chyby sdílet, přejeďte doleva."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Na telefonu se brzy zobrazí zpráva o chybě."</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Zprávu o chybě můžete sdílet klepnutím"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Klepnutím můžete zprávu o chybě sdílet bez snímku obrazovky, nebo vyčkejte, než se snímek připraví"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Klepnutím můžete zprávu o chybě sdílet bez snímku obrazovky, nebo vyčkejte, než se snímek připraví"</string>
diff --git a/packages/Shell/res/values-da/strings.xml b/packages/Shell/res/values-da/strings.xml
index 19e800bf..3675eeb 100644
--- a/packages/Shell/res/values-da/strings.xml
+++ b/packages/Shell/res/values-da/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Fejrapporten <xliff:g id="ID">#%d</xliff:g> blev gemt"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Tilføjelse af oplysninger til fejlrapporten"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Vent et øjeblik…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Stryg til venstre for at dele din fejlrapport"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Fejlrapporten vises på telefonen om et øjeblik"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tryk for at dele din fejlrapport"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tryk for at dele din fejlrapport uden et skærmbillede, eller vent på, at skærmbilledet fuldføres"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tryk for at dele din fejlrapport uden et skærmbillede, eller vent på, at skærmbilledet fuldføres"</string>
diff --git a/packages/Shell/res/values-de/strings.xml b/packages/Shell/res/values-de/strings.xml
index 0235824..543ccdd 100644
--- a/packages/Shell/res/values-de/strings.xml
+++ b/packages/Shell/res/values-de/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Fehlerbericht <xliff:g id="ID">#%d</xliff:g> erfasst"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Informationen werden zum Fehlerbericht hinzugefügt"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Bitte warten…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Wische nach links, um deinen Fehlerbericht zu teilen."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Der Fehlerbericht wird in Kürze auf dem Smartphone angezeigt"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Zum Teilen des Fehlerberichts tippen"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tippe, um den Fehlerbericht ohne Screenshot zu teilen, oder warte auf den Screenshot"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tippe, um den Fehlerbericht ohne Screenshot zu teilen, oder warte auf den Screenshot"</string>
diff --git a/packages/Shell/res/values-el/strings.xml b/packages/Shell/res/values-el/strings.xml
index 4bed10c..a0222d8 100644
--- a/packages/Shell/res/values-el/strings.xml
+++ b/packages/Shell/res/values-el/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Έγινε λήψη της αναφοράς σφάλματος <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Προσθήκη λεπτομερειών στην αναφορά σφάλματος"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Περιμένετε…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Σύρετε προς τα αριστερά για κοινή χρήση της αναφοράς σφαλμάτων"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Η αναφορά σφαλμάτων θα εμφανιστεί σύντομα στο τηλέφωνο"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Πατήστε για κοινή χρήση της αναφοράς σφάλματος"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Πατήστε για κοινοποίηση της αναφοράς σφάλματος χωρίς στιγμιότυπο οθόνης ή περιμένετε να ολοκληρωθεί"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Πατήστε για κοινοποίηση της αναφοράς σφάλματος χωρίς στιγμιότυπο οθόνης ή περιμένετε να ολοκληρωθεί"</string>
diff --git a/packages/Shell/res/values-en-rAU/strings.xml b/packages/Shell/res/values-en-rAU/strings.xml
index 15b587b..55cfd60 100644
--- a/packages/Shell/res/values-en-rAU/strings.xml
+++ b/packages/Shell/res/values-en-rAU/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Bug report <xliff:g id="ID">#%d</xliff:g> captured"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Adding details to the bug report"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Please wait…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"The bug report will appear on the phone shortly"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tap to share your bug report"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
diff --git a/packages/Shell/res/values-en-rGB/strings.xml b/packages/Shell/res/values-en-rGB/strings.xml
index 15b587b..55cfd60 100644
--- a/packages/Shell/res/values-en-rGB/strings.xml
+++ b/packages/Shell/res/values-en-rGB/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Bug report <xliff:g id="ID">#%d</xliff:g> captured"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Adding details to the bug report"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Please wait…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"The bug report will appear on the phone shortly"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tap to share your bug report"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
diff --git a/packages/Shell/res/values-en-rIN/strings.xml b/packages/Shell/res/values-en-rIN/strings.xml
index 15b587b..55cfd60 100644
--- a/packages/Shell/res/values-en-rIN/strings.xml
+++ b/packages/Shell/res/values-en-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Bug report <xliff:g id="ID">#%d</xliff:g> captured"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Adding details to the bug report"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Please wait…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"The bug report will appear on the phone shortly"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tap to share your bug report"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
diff --git a/packages/Shell/res/values-es-rUS/strings.xml b/packages/Shell/res/values-es-rUS/strings.xml
index b7398db..dac7fdb 100644
--- a/packages/Shell/res/values-es-rUS/strings.xml
+++ b/packages/Shell/res/values-es-rUS/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Se capturó el informe de errores <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Agregando detalles al informe de errores"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Espera…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Desliza el dedo hacia la izquierda para compartir el informe de errores."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"El informe de errores aparecerá en el teléfono en breve"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toca para compartir el informe de errores"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toca para compartir tu informe de errores sin una captura de pantalla o espera a que finalice"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toca para compartir tu informe de errores sin una captura de pantalla o espera a que finalice"</string>
diff --git a/packages/Shell/res/values-es/strings.xml b/packages/Shell/res/values-es/strings.xml
index 81d8078..b090b8a3 100644
--- a/packages/Shell/res/values-es/strings.xml
+++ b/packages/Shell/res/values-es/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Informe de errores <xliff:g id="ID">#%d</xliff:g> capturado"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Añadiendo detalles al informe de errores"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Espera…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Desliza el dedo hacia la izquierda para compartir el informe de error"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"El informe de errores aparecerá en el teléfono en breve"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toca para compartir el informe de errores"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toca para compartir el informe de errores sin captura de pantalla o espera a que se haga la captura."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toca para compartir el informe de errores sin captura de pantalla o espera a que se haga la captura."</string>
diff --git a/packages/Shell/res/values-et-rEE/strings.xml b/packages/Shell/res/values-et-rEE/strings.xml
index edf1c09..aaae44b 100644
--- a/packages/Shell/res/values-et-rEE/strings.xml
+++ b/packages/Shell/res/values-et-rEE/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Jäädvustati veaaruanne <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Üksikasjade lisamine veaaruandesse"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Oodake …"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veaaruande jagamiseks pühkige vasakule"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Veaaruanne kuvatakse telefonis peagi"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Veaaruande jagamiseks puudutage"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Puudutage, et veaaruannet ilma ekraanipildita jagada, või oodake, kuni ekraanipilt tehtud saab."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Puudutage, et veaaruannet ilma ekraanipildita jagada, või oodake, kuni ekraanipilt tehtud saab."</string>
diff --git a/packages/Shell/res/values-eu-rES/strings.xml b/packages/Shell/res/values-eu-rES/strings.xml
index 1a220ea..f60e589 100644
--- a/packages/Shell/res/values-eu-rES/strings.xml
+++ b/packages/Shell/res/values-eu-rES/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Akatsen <xliff:g id="ID">#%d</xliff:g> txostena egin da"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Akatsen txostenean xehetasunak gehitzen"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Itxaron, mesedez…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Programa-akatsen txostena partekatzeko, pasatu hatza ezkerrera"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Akatsen txostena telefonoan agertuko da laster"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Sakatu akatsen txostena partekatzeko"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Sakatu akatsen txostena argazkirik gabe partekatzeko edo itxaron pantaila-argazkia atera arte"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Sakatu akatsen txostena argazkirik gabe partekatzeko edo itxaron pantaila-argazkia atera arte"</string>
diff --git a/packages/Shell/res/values-fa/strings.xml b/packages/Shell/res/values-fa/strings.xml
index 0a5b84e..f3e92d2 100644
--- a/packages/Shell/res/values-fa/strings.xml
+++ b/packages/Shell/res/values-fa/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"گزارش اشکال <xliff:g id="ID">#%d</xliff:g> ثبت شد"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"اضافه کردن جزئیات به گزارش اشکال"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"لطفاً منتظر بمانید..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"برای اشتراکگذاری گزارش اشکال، به تندی آن را به چپ بکشید"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"گزارش مشکل بهزودی در تلفن نشان داده میشود"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"برای به اشتراک گذاشتن گزارش اشکال، ضربه بزنید"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"برای اشتراکگذاری گزارش مشکل بدون عکس صفحهنمایش، ضربه بزنید یا صبر کنید تا عکس صفحهنمایش گرفته شود."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"برای اشتراکگذاری گزارش مشکل بدون عکس صفحهنمایش، ضربه بزنید یا صبر کنید تا عکس صفحهنمایش گرفته شود."</string>
diff --git a/packages/Shell/res/values-fi/strings.xml b/packages/Shell/res/values-fi/strings.xml
index 894217e..a790cd9 100644
--- a/packages/Shell/res/values-fi/strings.xml
+++ b/packages/Shell/res/values-fi/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Virheraportti <xliff:g id="ID">#%d</xliff:g> tallennettu"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Lisätään tietoja virheraporttiin"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Odota…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Jaa virheraportti pyyhkäisemällä vasemmalle"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Virheraportti näkyy puhelimessa pian."</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Jaa virheraportti napauttamalla."</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Jaa virheraportti ilman kuvakaappausta napauttamalla tai odota, että kuvakaappaus latautuu."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Jaa virheraportti ilman kuvakaappausta napauttamalla tai odota, että kuvakaappaus latautuu."</string>
diff --git a/packages/Shell/res/values-fr-rCA/strings.xml b/packages/Shell/res/values-fr-rCA/strings.xml
index 495d26d..baacdd1 100644
--- a/packages/Shell/res/values-fr-rCA/strings.xml
+++ b/packages/Shell/res/values-fr-rCA/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Rapport de bogue <xliff:g id="ID">#%d</xliff:g> enregistré"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Ajout de détails au rapport de bogue"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Veuillez patienter…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Faites glisser le doigt vers la gauche pour partager votre rapport de bogue."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Le rapport de bogue s\'affichera bientôt sur le téléphone"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Touchez ici pour partager votre rapport de bogue"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Touchez pour partager le rapport de bogue sans saisie d\'écran ou attendez que la saisie soit prête"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Touchez pour partager le rapport de bogue sans saisie d\'écran ou attendez que la saisie soit prête"</string>
diff --git a/packages/Shell/res/values-fr/strings.xml b/packages/Shell/res/values-fr/strings.xml
index 0465916..506cd68f9 100644
--- a/packages/Shell/res/values-fr/strings.xml
+++ b/packages/Shell/res/values-fr/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Le rapport de bug \"<xliff:g id="ID">#%d</xliff:g>\" a bien été enregistré"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Ajout d\'informations au rapport de bug"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Veuillez patienter…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Faites glisser le doigt vers la gauche pour partager votre rapport d\'erreur."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Le rapport de bug s\'affichera bientôt sur le téléphone."</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Appuyer pour partager votre rapport de bug"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Appuyer pour partager rapport de bug sans capture d\'écran ou attendre finalisation capture d\'écran"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Appuyer pour partager rapport de bug sans capture d\'écran ou attendre finalisation capture d\'écran"</string>
diff --git a/packages/Shell/res/values-gl-rES/strings.xml b/packages/Shell/res/values-gl-rES/strings.xml
index a06a49b..d2a39fd 100644
--- a/packages/Shell/res/values-gl-rES/strings.xml
+++ b/packages/Shell/res/values-gl-rES/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Rexistrouse o informe de erros <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Engadindo detalles ao informe de erro"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Agarda..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Pasa o dedo á esquerda para compartir o teu informe de erros"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"O informe de erros aparecerá no teléfono en breve"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toca para compartir o teu informe de erros"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toca para compartir o informe de erros sen captura de pantalla ou agarda a que finalice a captura"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toca para compartir o informe de erros sen captura de pantalla ou agarda a que finalice a captura"</string>
diff --git a/packages/Shell/res/values-gu-rIN/strings.xml b/packages/Shell/res/values-gu-rIN/strings.xml
index 83a0ab6..849f1ea 100644
--- a/packages/Shell/res/values-gu-rIN/strings.xml
+++ b/packages/Shell/res/values-gu-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"બગ રિપોર્ટ <xliff:g id="ID">#%d</xliff:g> કૅપ્ચર કરી"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"બગ રિપોર્ટમાં વિગતો ઉમેરવી"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"કૃપા કરીને રાહ જુઓ…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"તમારી બગ રિપોર્ટ શેર કરવા માટે ડાબે સ્વાઇપ કરો"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"બગ રિપોર્ટ ટૂંક સમયમાં ફોન પર દેખાશે"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"તમારી બગ રિપોર્ટ શેર કરવા ટૅપ કરો"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"સ્ક્રીનશૉટ વગર અથવા સ્ક્રીનશૉટ સમાપ્ત થવાની રાહ જોયા વગર તમારી બગ રિપોર્ટ શેર કરવા ટૅપ કરો"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"સ્ક્રીનશૉટ વગર અથવા સ્ક્રીનશૉટ સમાપ્ત થવાની રાહ જોયા વગર તમારી બગ રિપોર્ટ શેર કરવા ટૅપ કરો"</string>
diff --git a/packages/Shell/res/values-hi/strings.xml b/packages/Shell/res/values-hi/strings.xml
index 9086d89..fc314af 100644
--- a/packages/Shell/res/values-hi/strings.xml
+++ b/packages/Shell/res/values-hi/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"बग रिपोर्ट <xliff:g id="ID">#%d</xliff:g> कैप्चर की गई"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"बग रिपोर्ट में विवरण जोड़े जा रहे हैं"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"कृपया प्रतीक्षा करें…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"अपनी बग रिपोर्ट साझा करने के लिए बाएं स्वाइप करें"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"बग रिपोर्ट थोड़ी ही देर में फ़ोन पर दिखाई देगी"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"अपनी बग रिपोर्ट साझा करने के लिए टैप करें"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"अपनी बग रिपोर्ट को बिना स्क्रीनशॉट साझा करने हेतु टैप करें या स्क्रीनशॉट पूरा होने की प्रतीक्षा करें"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"अपनी बग रिपोर्ट को बिना स्क्रीनशॉट साझा करने हेतु टैप करें या स्क्रीनशॉट पूरा होने की प्रतीक्षा करें"</string>
diff --git a/packages/Shell/res/values-hr/strings.xml b/packages/Shell/res/values-hr/strings.xml
index 24b657b..ed48fd9 100644
--- a/packages/Shell/res/values-hr/strings.xml
+++ b/packages/Shell/res/values-hr/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Izvješće o programskoj pogrešci <xliff:g id="ID">#%d</xliff:g> snimljeno"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Dodavanje pojedinosti u izvješće o progr. pogrešci"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Pričekajte..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prijeđite prstom ulijevo da biste poslali izvješće o programskim pogreškama"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Izvješće o programskoj pogrešci uskoro će se pojaviti na telefonu"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dodirnite da biste podijelili izvješće o programskoj pogrešci"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Dodirnite za dijeljenje izvješća o pogrešci bez snimke zaslona ili pričekajte da se izradi snimka"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Dodirnite za dijeljenje izvješća o pogrešci bez snimke zaslona ili pričekajte da se izradi snimka"</string>
diff --git a/packages/Shell/res/values-hu/strings.xml b/packages/Shell/res/values-hu/strings.xml
index a8c5c76..b7def06 100644
--- a/packages/Shell/res/values-hu/strings.xml
+++ b/packages/Shell/res/values-hu/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Hibajelentés (<xliff:g id="ID">#%d</xliff:g>) rögzítve"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Információk hozzáadása a hibajelentéshez"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Kérjük, várjon..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Húzza ujját balra a hibajelentés megosztásához"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"A hibajelentés hamarosan megjelenik a telefonon."</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Koppintson a hibajelentés megosztásához"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Koppintson ide, ha képernyőkép nélkül osztaná meg a hibajelentést, vagy várjon a képernyőképre."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Koppintson ide, ha képernyőkép nélkül osztaná meg a hibajelentést, vagy várjon a képernyőképre."</string>
diff --git a/packages/Shell/res/values-hy-rAM/strings.xml b/packages/Shell/res/values-hy-rAM/strings.xml
index 56627f4..27e25c6 100644
--- a/packages/Shell/res/values-hy-rAM/strings.xml
+++ b/packages/Shell/res/values-hy-rAM/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"<xliff:g id="ID">#%d</xliff:g> վրիպակի զեկույցը գրանցվեց"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Տվյալների ավելացում վրիպակի զեկույցում"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Խնդրում ենք սպասել…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Սահեցրեք ձախ՝ սխալի հաշվետվությունը համօգտագործելու համար"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Վրիպակների մասին հաշվետվությունը շուտով կստանաք հեռախոսին"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Հպեք՝ վրիպակի զեկույցը տրամադրելու համար"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Հպեք՝ վրիպակի զեկույցն առանց էկրանի պատկերի ուղարկելու համար կամ սպասեք էկրանի պատկերի ստեղծմանը"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Հպեք՝ վրիպակի զեկույցն առանց էկրանի պատկերի ուղարկելու համար կամ սպասեք էկրանի պատկերի ստեղծմանը"</string>
diff --git a/packages/Shell/res/values-in/strings.xml b/packages/Shell/res/values-in/strings.xml
index 90700c7..d4851e3 100644
--- a/packages/Shell/res/values-in/strings.xml
+++ b/packages/Shell/res/values-in/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Laporan bug <xliff:g id="ID">#%d</xliff:g> dijepret"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Menambahkan detail ke laporan bug"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Harap tunggu..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Gesek ke kiri untuk membagikan laporan bug Anda"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Laporan bug akan segera muncul di ponsel"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Ketuk untuk membagikan laporan bug"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Ketuk untuk membagikan laporan bug tanpa tangkapan layar atau menunggu tangkapan layar selesai"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Ketuk untuk membagikan laporan bug tanpa tangkapan layar atau menunggu tangkapan layar selesai"</string>
diff --git a/packages/Shell/res/values-is-rIS/strings.xml b/packages/Shell/res/values-is-rIS/strings.xml
index dc21b35..872c029 100644
--- a/packages/Shell/res/values-is-rIS/strings.xml
+++ b/packages/Shell/res/values-is-rIS/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Villutilkynning <xliff:g id="ID">#%d</xliff:g> búin til"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Bætir upplýsingum við villutilkynningu"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Augnablik..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Strjúktu til vinstri til að deila villuskýrslunni"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Villuskýrslan birtist brátt í símanum"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Ýttu til að deila villutilkynningunni"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Ýttu til að deila villutilkynningunni án skjámyndar eða hinkraðu þangað til skjámyndin er tilbúin"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Ýttu til að deila villutilkynningunni án skjámyndar eða hinkraðu þangað til skjámyndin er tilbúin"</string>
diff --git a/packages/Shell/res/values-it/strings.xml b/packages/Shell/res/values-it/strings.xml
index 0fd6c7a..d1e7c09 100644
--- a/packages/Shell/res/values-it/strings.xml
+++ b/packages/Shell/res/values-it/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Segnalazione di bug <xliff:g id="ID">#%d</xliff:g> acquisita"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Aggiunta di dettagli alla segnalazione di bug"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Attendi..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Scorri verso sinistra per condividere il rapporto sui bug"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"La segnalazione di bug comparirà a breve sul telefono"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tocca per condividere la segnalazione di bug"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tocca per inviare la segnalazione del bug senza screenshot o attendi che lo screenshot sia completo"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tocca per inviare la segnalazione del bug senza screenshot o attendi che lo screenshot sia completo"</string>
diff --git a/packages/Shell/res/values-iw/strings.xml b/packages/Shell/res/values-iw/strings.xml
index b3f9d02..be4b190 100644
--- a/packages/Shell/res/values-iw/strings.xml
+++ b/packages/Shell/res/values-iw/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"הדוח על הבאג <xliff:g id="ID">#%d</xliff:g> צולם"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"מוסיף פרטים לדוח על הבאג"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"המתן…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"החלק שמאלה כדי לשתף את דוח הבאגים"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"הדוח על הבאג יופיע בטלפון בקרוב"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"הקש כדי לשתף את הדוח על הבאג"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"הקש כדי לשתף את הדוח על הבאג ללא צילום מסך, או המתן להשלמת צילום המסך"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"הקש כדי לשתף את הדוח על הבאג ללא צילום מסך, או המתן להשלמת צילום המסך"</string>
diff --git a/packages/Shell/res/values-ja/strings.xml b/packages/Shell/res/values-ja/strings.xml
index eca0ea0..c6682d9 100644
--- a/packages/Shell/res/values-ja/strings.xml
+++ b/packages/Shell/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"バグレポート <xliff:g id="ID">#%d</xliff:g> の記録完了"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"バグレポートに詳細情報を追加しています"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"お待ちください…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"バグレポートを共有するには左にスワイプ"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"バグレポートはまもなくスマートフォンに表示されます"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"バグレポートを共有するにはタップします"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"タップしてバグレポートをスクリーンショットなしで共有するか、スクリーンショット完成までお待ちください"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"タップしてバグレポートをスクリーンショットなしで共有するか、スクリーンショット完成までお待ちください"</string>
diff --git a/packages/Shell/res/values-ka-rGE/strings.xml b/packages/Shell/res/values-ka-rGE/strings.xml
index 43cdeee..f97f94a 100644
--- a/packages/Shell/res/values-ka-rGE/strings.xml
+++ b/packages/Shell/res/values-ka-rGE/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ხარვეზების შესახებ ანგარიში <xliff:g id="ID">#%d</xliff:g> აღბეჭდილია"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ხარვეზის შესახებ ანგარიშს დეტალები ემატება"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"გთხოვთ, მოითმინოთ..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"გაასრიალეთ მარცხნივ თქვენი ხარვეზის შეტყობინების გასაზიარებლად"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ხარვეზის შესახებ ანგარიში ტელეფონის ეკრანზე მალე გამოჩნდება."</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"შეეხეთ ხარვეზების შესახებ ანგარიშის გასაზიარებლად"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"შეეხეთ ხარვეზის შესახებ ანგარიშის ეკრანის ანაბეჭდის გარეშე გასაზიარებლად, ან დაელოდეთ მის შექმნას"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"შეეხეთ ხარვეზის შესახებ ანგარიშის ეკრანის ანაბეჭდის გარეშე გასაზიარებლად, ან დაელოდეთ მის შექმნას"</string>
diff --git a/packages/Shell/res/values-kk-rKZ/strings.xml b/packages/Shell/res/values-kk-rKZ/strings.xml
index 7d1218f..3d49f4c 100644
--- a/packages/Shell/res/values-kk-rKZ/strings.xml
+++ b/packages/Shell/res/values-kk-rKZ/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"<xliff:g id="ID">#%d</xliff:g> қате туралы есебі жазып алынды"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Қате туралы есепке мәліметтер қосылуда"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Күте тұрыңыз…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Қате туралы есепті бөлісу үшін солға жанаңыз"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Көп ұзамай қате туралы есеп телефон экранына шығады"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Қате туралы есепті бөлісу үшін түртіңіз"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Қате туралы есепті скриншотсыз бөлісу үшін түртіңіз немесе скриншот сақталып болғанша күтіңіз"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Қате туралы есепті скриншотсыз бөлісу үшін түртіңіз немесе скриншот сақталып болғанша күтіңіз"</string>
diff --git a/packages/Shell/res/values-km-rKH/strings.xml b/packages/Shell/res/values-km-rKH/strings.xml
index c9633db7f4..a73cfaa 100644
--- a/packages/Shell/res/values-km-rKH/strings.xml
+++ b/packages/Shell/res/values-km-rKH/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"<xliff:g id="ID">#%d</xliff:g> របាយការណ៍កំហុសត្រូវបានថត"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"កំពុងបន្ថែមព័ត៌មានលម្អិតទៅរបាយការណ៍កំហុស"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"សូមរង់ចាំ…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"អូសទៅឆ្វេង ដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នក"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"របាយការណ៍កំហុសនេះនឹងបង្ហាញនៅលើទូរស័ព្ទរបស់អ្នកនាពេលបន្តិចទៀតនេះ"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"ប៉ះដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នក"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ប៉ះដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នកដោយមិនចាំបាច់មានរូបថតអេក្រង់ ឬរង់ចាំការបញ្ចប់ការថតអេក្រង់"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ប៉ះដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នកដោយមិនចាំបាច់មានរូបថតអេក្រង់ ឬរង់ចាំការបញ្ចប់ការថតអេក្រង់"</string>
diff --git a/packages/Shell/res/values-kn-rIN/strings.xml b/packages/Shell/res/values-kn-rIN/strings.xml
index fc8d03c..117400a 100644
--- a/packages/Shell/res/values-kn-rIN/strings.xml
+++ b/packages/Shell/res/values-kn-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ದೋಷ ವರದಿಯ <xliff:g id="ID">#%d</xliff:g> ಅನ್ನು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಿಕೊಳ್ಳಲಾಗಿದೆ"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ಬಗ್ ವರದಿಗೆ ವಿವರಗಳನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ನಿಮ್ಮ ದೋಷ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಎಡಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ಬಗ್ ವರದಿ ಶೀಘ್ರದಲ್ಲೇ ಫೋನ್ನಲ್ಲಿ ಗೋಚರಿಸಲಿದೆ"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"ನಿಮ್ಮ ಬಗ್ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಇಲ್ಲದೇ ನಿಮ್ಮ ಬಗ್ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಸ್ಕ್ರೀನ್ಶಾಟ್ ಪೂರ್ತಿಯಾಗುವವರೆಗೂ ನಿರೀಕ್ಷಿಸಿ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಇಲ್ಲದೇ ನಿಮ್ಮ ಬಗ್ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಸ್ಕ್ರೀನ್ಶಾಟ್ ಪೂರ್ತಿಯಾಗುವವರೆಗೂ ನಿರೀಕ್ಷಿಸಿ"</string>
diff --git a/packages/Shell/res/values-ko/strings.xml b/packages/Shell/res/values-ko/strings.xml
index d382fb1..6fde072 100644
--- a/packages/Shell/res/values-ko/strings.xml
+++ b/packages/Shell/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"버그 신고 <xliff:g id="ID">#%d</xliff:g> 캡처됨"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"세부정보를 버그 보고서에 추가"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"잠시 기다려 주세요..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"왼쪽으로 스와이프하여 버그 신고서를 공유하세요."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"곧 버그 보고서가 휴대전화에 표시됩니다."</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"버그 신고를 공유하려면 탭하세요."</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"스크린샷 없이 버그 신고서를 공유하려면 탭하고 그렇지 않으면 스크린샷이 완료될 때까지 기다려 주세요."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"스크린샷 없이 버그 신고서를 공유하려면 탭하고 그렇지 않으면 스크린샷이 완료될 때까지 기다려 주세요."</string>
diff --git a/packages/Shell/res/values-ky-rKG/strings.xml b/packages/Shell/res/values-ky-rKG/strings.xml
index fe2dde4..2c97277 100644
--- a/packages/Shell/res/values-ky-rKG/strings.xml
+++ b/packages/Shell/res/values-ky-rKG/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Мүчүлүштүк тууралуу билдирүү <xliff:g id="ID">#%d</xliff:g> жаздырылды"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Мүчүлүштүк жөнүндө кабардын чоо-жайы кошулууда"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Күтө туруңуз…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Ката жөнүндө кабар менен бөлүшүү үчүн солго серпип коюңуз"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Мүчүлүштүктөр жөнүндө кабар жакында телефонго чыгат"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Мүчүлүштүк тууралуу билдирүүңүздү бөлүшүү үчүн таптап коюңуз"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Мүчүлүштүк тууралуу билдирүүңүздү скриншотсуз бөлүшүү үчүн таптап коюңуз же скриншот даяр болгуча күтө туруңуз"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Мүчүлүштүк тууралуу билдирүүңүздү скриншотсуз бөлүшүү үчүн таптап коюңуз же скриншот даяр болгуча күтө туруңуз"</string>
diff --git a/packages/Shell/res/values-lo-rLA/strings.xml b/packages/Shell/res/values-lo-rLA/strings.xml
index 2cc1573..0673c51 100644
--- a/packages/Shell/res/values-lo-rLA/strings.xml
+++ b/packages/Shell/res/values-lo-rLA/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ບັນທຶກລາຍງານຂໍ້ຜິດພາດ <xliff:g id="ID">#%d</xliff:g> ແລ້ວ"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ກຳລັງເພີ່ມລາຍລະອຽດໃສ່ລາຍງານຂໍ້ຜິດພາດ"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"ກະລຸນາລໍຖ້າ..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ປັດໄປຊ້າຍເພື່ອສົ່ງລາຍງານຂໍ້ຜິດພາດຂອງທ່ານ"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ລາຍງານຂໍ້ຜິດພາດຈະປາກົດໃນໂທລະສັບໃນໄວໆນີ້"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"ແຕະເພື່ອແບ່ງປັນລາຍງານຂໍ້ຜິດພາດຂອງທ່ານ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ແຕະເພື່ອແບ່ງປັນລາຍງານຂໍ້ຜິດພາດຂອງທ່ານໂດຍບໍ່ໃຊ້ຮູບໜ້າຈໍ ຫຼື ລໍຖ້າໃຫ້ຮູບໜ້າຈໍແລ້ວໆ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ແຕະເພື່ອແບ່ງປັນລາຍງານຂໍ້ຜິດພາດຂອງທ່ານໂດຍບໍ່ໃຊ້ຮູບໜ້າຈໍ ຫຼື ລໍຖ້າໃຫ້ຮູບໜ້າຈໍແລ້ວໆ"</string>
diff --git a/packages/Shell/res/values-lt/strings.xml b/packages/Shell/res/values-lt/strings.xml
index 23fba5f..8d7f0de 100644
--- a/packages/Shell/res/values-lt/strings.xml
+++ b/packages/Shell/res/values-lt/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Pranešimas apie riktą (<xliff:g id="ID">#%d</xliff:g>) užfiksuotas"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Pridedama informacijos prie pranešimo apie riktą"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Palaukite…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Perbraukite kairėn, kad bendrintumėte rikto ataskaitą"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Pranešimai apie riktus netrukus bus rodomi telefone"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Palieskite, kad bendrintumėte pranešimą apie riktą"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Palieskite ir bendrinkite pranešimą apie riktą be ekrano kopijos arba palaukite, kol ji bus sukurta"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Palieskite ir bendrinkite pranešimą apie riktą be ekrano kopijos arba palaukite, kol ji bus sukurta"</string>
diff --git a/packages/Shell/res/values-lv/strings.xml b/packages/Shell/res/values-lv/strings.xml
index d6bfee3..f2258a5 100644
--- a/packages/Shell/res/values-lv/strings.xml
+++ b/packages/Shell/res/values-lv/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Kļūdas pārskats <xliff:g id="ID">#%d</xliff:g> reģistrēts"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Informācijas pievienošana kļūdas pārskatam"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Lūdzu, uzgaidiet..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Velciet pa kreisi, lai kopīgotu savu kļūdu ziņojumu."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Tālrunī pēc brīža būs redzams kļūdu pārskats"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Pieskarieties, lai kopīgotu kļūdas pārskatu."</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Pieskarieties, lai kopīgotu kļūdas pārskatu bez ekrānuzņēmuma vai gaidiet ekrānuzņēmumu."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Pieskarieties, lai kopīgotu kļūdas pārskatu bez ekrānuzņēmuma vai gaidiet ekrānuzņēmumu."</string>
diff --git a/packages/Shell/res/values-mk-rMK/strings.xml b/packages/Shell/res/values-mk-rMK/strings.xml
index 3ce9436..f90f4ea 100644
--- a/packages/Shell/res/values-mk-rMK/strings.xml
+++ b/packages/Shell/res/values-mk-rMK/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Извештајот за грешки <xliff:g id="ID">#%d</xliff:g> е снимен"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Се додаваат детали на извештајот за грешка"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Почекајте..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Повлечете налево за да споделите пријава за грешка"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Извештајот за грешки наскоро ќе се појави на телефонот"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Допрете за да го споделите извештајот за грешки"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Допрете за споделување извештај за грешки без слика од екранот или почекајте да се подготви сликата"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Допрете за споделување извештај за грешки без слика од екранот или почекајте да се подготви сликата"</string>
diff --git a/packages/Shell/res/values-ml-rIN/strings.xml b/packages/Shell/res/values-ml-rIN/strings.xml
index 13d6ee4..930f723 100644
--- a/packages/Shell/res/values-ml-rIN/strings.xml
+++ b/packages/Shell/res/values-ml-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ബഗ് റിപ്പോർട്ട് <xliff:g id="ID">#%d</xliff:g> ക്യാപ്ചർ ചെയ്തു"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ബഗ് റിപ്പോർട്ടിലേക്ക് വിശദാംശങ്ങൾ ചേർക്കുന്നു"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"കാത്തിരിക്കുക..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടുന്നതിന് ഇടത്തേയ്ക്ക് സ്വൈപ്പുചെയ്യുക"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ബഗ് റിപ്പോർട്ട് താമസിയാതെ ഫോണിൽ ദൃശ്യമാകും"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടാൻ ടാപ്പുചെയ്യുക"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"സ്ക്രീൻഷോട്ട് കൂടാതെയോ സ്ക്രീൻഷോട്ട് പൂർത്തിയാകുന്നതിന് കാക്കാതെയോ നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടാൻ ടാപ്പുചെയ്യുക"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"സ്ക്രീൻഷോട്ട് കൂടാതെയോ സ്ക്രീൻഷോട്ട് പൂർത്തിയാകുന്നതിന് കാക്കാതെയോ നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടാൻ ടാപ്പുചെയ്യുക"</string>
diff --git a/packages/Shell/res/values-mn-rMN/strings.xml b/packages/Shell/res/values-mn-rMN/strings.xml
index 591e542..6bde789 100644
--- a/packages/Shell/res/values-mn-rMN/strings.xml
+++ b/packages/Shell/res/values-mn-rMN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Програмд гарсан алдааны мэдээллийн <xliff:g id="ID">#%d</xliff:g>-г бүртгэгдлээ"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Алдааны тайланд дэлгэрэнгүй мэдээлэл нэмж байна"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Түр хүлээнэ үү..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Өөрийн согог репортыг хуваалцахын тулд зүүн шудрана уу"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Утсанд удахгүй алдааны тайлан гарч ирэх болно"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Програмд гарсан алдааны мэдээллээ хуваалцах бол дарна уу"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Алдааны тайлангаа дэлгэцээс авсан зураггүйгээр хуваалцах бол дарж, эсвэл дэлгэцээс авсан зургийг бэлэн болтол нь хүлээнэ үү"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Алдааны тайлангаа дэлгэцээс авсан зураггүйгээр хуваалцах бол дарж, эсвэл дэлгэцээс авсан зургийг бэлэн болтол нь хүлээнэ үү"</string>
diff --git a/packages/Shell/res/values-mr-rIN/strings.xml b/packages/Shell/res/values-mr-rIN/strings.xml
index 035ac01..084901a 100644
--- a/packages/Shell/res/values-mr-rIN/strings.xml
+++ b/packages/Shell/res/values-mr-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"दोष अहवाल <xliff:g id="ID">#%d</xliff:g> कॅप्चर केला"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"दोष अहवालामध्ये तपशील जोडत आहे"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"कृपया प्रतीक्षा करा..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"आपला दोष अहवाल सामायिक करण्यासाठी डावीकडे स्वाइप करा"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"फोनवर दोष अहवाल लवकरच दिसेल"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"आपला दोष अहवाल सामायिक करण्यासाठी टॅप करा"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"स्क्रीनशॉट शिवाय आपला दोष अहवाल सामायिक करण्यासाठी टॅप करा किंवा समाप्त करण्यासाठी स्क्रीनशॉटची प्रतीक्षा करा"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"स्क्रीनशॉट शिवाय आपला दोष अहवाल सामायिक करण्यासाठी टॅप करा किंवा समाप्त करण्यासाठी स्क्रीनशॉटची प्रतीक्षा करा"</string>
diff --git a/packages/Shell/res/values-ms-rMY/strings.xml b/packages/Shell/res/values-ms-rMY/strings.xml
index 085152f..36e70c5 100644
--- a/packages/Shell/res/values-ms-rMY/strings.xml
+++ b/packages/Shell/res/values-ms-rMY/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Laporan pepijat <xliff:g id="ID">#%d</xliff:g> telah ditangkap"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Menambahkan butiran pada laporan pepijat"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Sila tunggu…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Leret ke kiri untuk berkongsi laporan pepijat anda"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Laporan pepijat akan dipaparkan pada telefon sebentar lagi"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Ketik untuk berkongsi laporan pepijat anda"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Ketik untuk berkongsi laporan pepijat anda tanpa tangkapan skrin atau tunggu tangkapan skrin selesai"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Ketik untuk berkongsi laporan pepijat anda tanpa tangkapan skrin atau tunggu tangkapan skrin selesai"</string>
diff --git a/packages/Shell/res/values-my-rMM/strings.xml b/packages/Shell/res/values-my-rMM/strings.xml
index c9486c9..ece4a869 100644
--- a/packages/Shell/res/values-my-rMM/strings.xml
+++ b/packages/Shell/res/values-my-rMM/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ချွတ်ယွင်းမှုအစီရင်ခံချက် <xliff:g id="ID">#%d</xliff:g> ကိုရယူထားပြီးပါပြီ"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ချွတ်ယွင်းချက်အစီရင်ခံချက်သို့ အသေးစိတ်များပေါင်းထည့်ရန်"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"ခေတ္တစောင့်ပါ..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"သင်၏ ဘာဂ် အစီရင်ခံစာကို မျှပေးရန် ဘယ်ဘက်သို့ ပွတ်ဆွဲရန်"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ချွတ်ယွင်းချက်အစီရင်ခံစာကို မကြာခင် ဖုန်းထဲတွင် မြင်တွေ့ရပါလိမ့်မည်"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"သင့်ချွတ်ယွင်းမှုအစီရင်ခံချက်ကို မျှဝေရန် တို့ပါ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ချွတ်ယွင်းချက်အစီရင်ခံစာကို ဖန်သားပြင်ဓာတ်ပုံမှတ်တမ်းမပါဘဲ မျှဝေရန် တို့ပါ သို့မဟုတ် ဖန်သားပြင်ဓာတ်ပုံမှတ်တမ်းတင်ခြင်း ပြီးဆုံးသည်အထိ စောင့်ပါ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ချွတ်ယွင်းချက်အစီရင်ခံစာကို ဖန်သားပြင်ဓာတ်ပုံမှတ်တမ်းမပါဘဲ မျှဝေရန် တို့ပါ သို့မဟုတ် ဖန်သားပြင်ဓာတ်ပုံမှတ်တမ်းတင်ခြင်း ပြီးဆုံးသည်အထိ စောင့်ပါ"</string>
@@ -39,5 +39,5 @@
<string name="bugreport_info_name" msgid="4414036021935139527">"ဖိုင်အမည်"</string>
<string name="bugreport_info_title" msgid="2306030793918239804">"ချွတ်ယွင်းချက် ခေါင်းစဉ်"</string>
<string name="bugreport_info_description" msgid="5072835127481627722">"ချွတ်ယွင်းချက် အကျဉ်းချုပ်"</string>
- <string name="save" msgid="4781509040564835759">"သိမ်းဆည်းပါ"</string>
+ <string name="save" msgid="4781509040564835759">"သိမ်းရန်"</string>
</resources>
diff --git a/packages/Shell/res/values-nb/strings.xml b/packages/Shell/res/values-nb/strings.xml
index 43fb97b..0d5db30 100644
--- a/packages/Shell/res/values-nb/strings.xml
+++ b/packages/Shell/res/values-nb/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Feilrapporten <xliff:g id="ID">#%d</xliff:g> er fullført"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Legger til detaljer i feilrapporten"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Vent litt"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Sveip til venstre for å dele feilrapporten din"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Feilrapporten vises snart på telefonen"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Trykk for å dele feilrapporten"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Trykk for å dele feilrapporten uten noen skjermdump, eller vent til skjermdumpen er klar"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Trykk for å dele feilrapporten uten noen skjermdump, eller vent til skjermdumpen er klar"</string>
diff --git a/packages/Shell/res/values-ne-rNP/strings.xml b/packages/Shell/res/values-ne-rNP/strings.xml
index 4ffa422..d71cb9f 100644
--- a/packages/Shell/res/values-ne-rNP/strings.xml
+++ b/packages/Shell/res/values-ne-rNP/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"बग रिपोर्ट <xliff:g id="ID">#%d</xliff:g>लाई कैद गरियो"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"बग रिपोर्टमा विवरणहरू थप्दै"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"कृपया प्रतीक्षा गर्नुहोला..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"तपाईँको बग रिपोर्ट साझेदारी गर्न बायाँ स्वाइप गर्नुहोस्"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"उक्त बग सम्बन्धी रिपोर्ट चाँडै नै यस फोनमा देखा पर्नेछ"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"तपाईंको बग रिपोर्टलाई साझेदारी गर्न ट्याप गर्नुहोस्"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"तपाईँको बग रिपोर्टलाई स्क्रिनसट बिना साझेदारी गर्नका लागि ट्याप गर्नुहोस् वा स्क्रिनसट लिने प्रक्रिया पूरा हुन प्रतीक्षा गर्नुहोस्"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"तपाईँको बग रिपोर्टलाई स्क्रिनसट बिना साझेदारी गर्नका लागि ट्याप गर्नुहोस् वा स्क्रिनसट लिने प्रक्रिया पूरा हुन प्रतीक्षा गर्नुहोस्"</string>
diff --git a/packages/Shell/res/values-nl/strings.xml b/packages/Shell/res/values-nl/strings.xml
index 1b60f0d..c13ad36 100644
--- a/packages/Shell/res/values-nl/strings.xml
+++ b/packages/Shell/res/values-nl/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Bugrapport <xliff:g id="ID">#%d</xliff:g> is vastgelegd"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Details toevoegen aan het bugrapport"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Even geduld…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veeg naar links om je bugmelding te delen"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Het bugrapport wordt over enkele ogenblikken op de telefoon weergegeven"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tik om je bugrapport te delen"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tik om je bugrapport te delen zonder screenshot of wacht tot het screenshot is voltooid"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tik om je bugrapport te delen zonder screenshot of wacht tot het screenshot is voltooid"</string>
diff --git a/packages/Shell/res/values-pa-rIN/strings.xml b/packages/Shell/res/values-pa-rIN/strings.xml
index db8b29f..f0bf46e 100644
--- a/packages/Shell/res/values-pa-rIN/strings.xml
+++ b/packages/Shell/res/values-pa-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"ਬੱਗ ਰਿਪੋਰਟ <xliff:g id="ID">#%d</xliff:g> ਕੈਪਚਰ ਕੀਤੀ ਗਈ"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"ਬੱਗ ਰਿਪੋਰਟ ਵਿੱਚ ਵੇਰਵਿਆਂ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ਤੁਹਾਡੀ ਬਗ ਰਿਪੋਰਟ ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਖੱਬੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"ਬੱਗ ਰਿਪੋਰਟ ਜਲਦ ਹੀ ਫ਼ੋਨ \'ਤੇ ਵਿਖਾਈ ਦੇਵੇਗੀ"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string>
diff --git a/packages/Shell/res/values-pl/strings.xml b/packages/Shell/res/values-pl/strings.xml
index d0375b6..73cd181 100644
--- a/packages/Shell/res/values-pl/strings.xml
+++ b/packages/Shell/res/values-pl/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Raport o błędzie <xliff:g id="ID">#%d</xliff:g> został zapisany"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Dodaję szczegóły do raportu o błędzie"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Czekaj..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Przesuń palcem w lewo, by udostępnić swoje zgłoszenie błędu"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Raport o błędzie będzie się pojawiał na telefonie przez chwilę"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Kliknij, by udostępnić raport o błędzie"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Kliknij, by udostępnić raport o błędzie bez zrzutu ekranu, lub poczekaj, aż zostanie on wygenerowany"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Kliknij, by udostępnić raport o błędzie bez zrzutu ekranu, lub poczekaj, aż zostanie on wygenerowany"</string>
diff --git a/packages/Shell/res/values-pt-rBR/strings.xml b/packages/Shell/res/values-pt-rBR/strings.xml
index 12cf2e4..2947122 100644
--- a/packages/Shell/res/values-pt-rBR/strings.xml
+++ b/packages/Shell/res/values-pt-rBR/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Relatório do bug <xliff:g id="ID">#%d</xliff:g> capturado"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Adicionando detalhes ao relatório do bug"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Aguarde…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"O relatório de bugs será exibido no smartphone em breve"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toque para compartilhar seu relatório do bug"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toque para compartilhar seu relatório de bug sem captura de tela ou aguarde a conclusão"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toque para compartilhar seu relatório de bug sem captura de tela ou aguarde a conclusão"</string>
diff --git a/packages/Shell/res/values-pt-rPT/strings.xml b/packages/Shell/res/values-pt-rPT/strings.xml
index 2148f97..0b08fd6 100644
--- a/packages/Shell/res/values-pt-rPT/strings.xml
+++ b/packages/Shell/res/values-pt-rPT/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Relatório de erro <xliff:g id="ID">#%d</xliff:g> criado"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"A adicionar detalhes ao relatório de erro"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Aguarde..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslizar rapidamente para a esquerda para partilhar o seu relatório de erros"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"O relatório de erro será apresentado brevemente no telemóvel"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toque para partilhar o relatório de erro"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toque para partilhar o relatório de erro sem uma captura de ecrã ou aguarde a conclusão da mesma"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toque para partilhar o relatório de erro sem uma captura de ecrã ou aguarde a conclusão da mesma"</string>
diff --git a/packages/Shell/res/values-pt/strings.xml b/packages/Shell/res/values-pt/strings.xml
index 12cf2e4..2947122 100644
--- a/packages/Shell/res/values-pt/strings.xml
+++ b/packages/Shell/res/values-pt/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Relatório do bug <xliff:g id="ID">#%d</xliff:g> capturado"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Adicionando detalhes ao relatório do bug"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Aguarde…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"O relatório de bugs será exibido no smartphone em breve"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Toque para compartilhar seu relatório do bug"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Toque para compartilhar seu relatório de bug sem captura de tela ou aguarde a conclusão"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Toque para compartilhar seu relatório de bug sem captura de tela ou aguarde a conclusão"</string>
diff --git a/packages/Shell/res/values-ro/strings.xml b/packages/Shell/res/values-ro/strings.xml
index 4e57b60..e154563 100644
--- a/packages/Shell/res/values-ro/strings.xml
+++ b/packages/Shell/res/values-ro/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Raportul de eroare <xliff:g id="ID">#%d</xliff:g> a fost creat"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Se adaugă detaliile la raportul de eroare"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Așteptați…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Glisați la stânga pentru a trimite raportul de erori"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Raportul de eroare va apărea curând pe telefon"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Atingeți pentru a trimite raportul de eroare"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Atingeți ca să trimiteți raportul de eroare fără captură de ecran sau așteptați finalizarea acesteia"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Atingeți ca să trimiteți raportul de eroare fără captură de ecran sau așteptați finalizarea acesteia"</string>
diff --git a/packages/Shell/res/values-ru/strings.xml b/packages/Shell/res/values-ru/strings.xml
index 62647ca..9ad590e 100644
--- a/packages/Shell/res/values-ru/strings.xml
+++ b/packages/Shell/res/values-ru/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Отчет об ошибке <xliff:g id="ID">#%d</xliff:g> сохранен"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Добавление данных в отчет об ошибке"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Подождите…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Проведите влево, чтобы отправить отчет"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Отчет об ошибке скоро появится на телефоне"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Нажмите, чтобы отправить отчет об ошибке."</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Нажмите, чтобы отправить отчет об ошибке сразу, или подождите, пока будет сохранен скриншот."</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Нажмите, чтобы отправить отчет об ошибке сразу, или подождите, пока будет сохранен скриншот."</string>
diff --git a/packages/Shell/res/values-si-rLK/strings.xml b/packages/Shell/res/values-si-rLK/strings.xml
index 0b1d478..ecc134e 100644
--- a/packages/Shell/res/values-si-rLK/strings.xml
+++ b/packages/Shell/res/values-si-rLK/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"දෝෂ වාර්තා <xliff:g id="ID">#%d</xliff:g> ග්රහණය කර ගන්නා ලදී"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"දෝෂ වාර්තාව වෙත විස්තර එක් කිරීම"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"කරුණාකර රැඳී සිටින්න..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ඔබගේ දෝෂ වාර්තාව බෙදාගැනීමට වමට ස්වයිප් කරන්න"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"දෝෂ වාර්තාව ඉක්මනින් දුරකථනය මත දිස් වනු ඇත"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"ඔබගේ දෝෂ වාර්තාව බෙදා ගැනීමට තට්ටු කරන්න"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"තිර රුවක් රහිතව ඔබගේ දෝෂ වාර්තාව බෙදා ගැනීමට තට්ටු කරන්න නැතහොත් තිර රුව ගැනීම අවසන් වන තෙක් රැඳෙන්න"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"තිර රුවක් රහිතව ඔබගේ දෝෂ වාර්තාව බෙදා ගැනීමට තට්ටු කරන්න නැතහොත් තිර රුව ගැනීම අවසන් වන තෙක් රැඳෙන්න"</string>
diff --git a/packages/Shell/res/values-sk/strings.xml b/packages/Shell/res/values-sk/strings.xml
index 3e3a0e4..733287e 100644
--- a/packages/Shell/res/values-sk/strings.xml
+++ b/packages/Shell/res/values-sk/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Hlásenie chyby <xliff:g id="ID">#%d</xliff:g> bolo zaznamenané"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Pridanie podrobností o hlásení chyby"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Čakajte prosím…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Ak chcete hlásenie o chybe zdieľať, prejdite prstom doľava."</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Hlásenie chyby sa čoskoro zobrazí na telefóne"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Hlásenie chyby môžete zdieľať klepnutím"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Klepnutím zdieľajte hlásenie chyby bez snímky obrazovky alebo počkajte na dokončenie snímky obrazovky"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Klepnutím zdieľajte hlásenie chyby bez snímky obrazovky alebo počkajte na dokončenie snímky obrazovky"</string>
diff --git a/packages/Shell/res/values-sl/strings.xml b/packages/Shell/res/values-sl/strings.xml
index 6b07e46..31c944c 100644
--- a/packages/Shell/res/values-sl/strings.xml
+++ b/packages/Shell/res/values-sl/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Poročilo o napaki <xliff:g id="ID">#%d</xliff:g> zajeto"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Dodajanje podrobnosti v poročilo o napakah"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Počakajte ..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Povlecite v levo, če želite poslati sporočilo o napaki"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Poročilo o napakah bo kmalu prikazano v telefonu"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dotaknite se, če želite poročilo o napaki dati v skupno rabo"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Dotaknite se za pošiljanje poročila o napakah brez posnetka zaslona ali počakajte, da se ta dokonča"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Dotaknite se za pošiljanje poročila o napakah brez posnetka zaslona ali počakajte, da se ta dokonča"</string>
diff --git a/packages/Shell/res/values-sq-rAL/strings.xml b/packages/Shell/res/values-sq-rAL/strings.xml
index 08c77c2..b97c6eb 100644
--- a/packages/Shell/res/values-sq-rAL/strings.xml
+++ b/packages/Shell/res/values-sq-rAL/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Raporti i defekteve në kod <xliff:g id="ID">#%d</xliff:g> u regjistrua"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Po shtohen detajet te raporti i defekteve në kod"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Qëndro në pritje..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Rrëshqit majtas për të ndarë raportin e defektit në kod"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Raporti i defektit nëkod do të shfaqet së shpejti në telefon"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Trokit për të ndarë raportin e defekteve në kod"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Trokit për të ndarë raportin e defekteve në kod pa një pamje çasti ose prit që pamja e çastit të përfundojë"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Trokit për të ndarë raportin e defekteve në kod pa një pamje çasti ose prit që pamja e çastit të përfundojë"</string>
diff --git a/packages/Shell/res/values-sr/strings.xml b/packages/Shell/res/values-sr/strings.xml
index 72a5dc8..c9547c0 100644
--- a/packages/Shell/res/values-sr/strings.xml
+++ b/packages/Shell/res/values-sr/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Извештај о грешци <xliff:g id="ID">#%d</xliff:g> је снимљен"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Додају се детаљи у извештај о грешци"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Сачекајте..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Превуците улево да бисте делили извештај о грешкама"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Извештај о грешци ће се ускоро појавити на телефону"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Додирните да бисте делили извештај о грешци"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Додирните за дељење извештаја о грешци без снимка екрана или сачекајте да се направи снимак екрана"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Додирните за дељење извештаја о грешци без снимка екрана или сачекајте да се направи снимак екрана"</string>
diff --git a/packages/Shell/res/values-sv/strings.xml b/packages/Shell/res/values-sv/strings.xml
index 52ff7c5..dcc38db 100644
--- a/packages/Shell/res/values-sv/strings.xml
+++ b/packages/Shell/res/values-sv/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Felrapporten <xliff:g id="ID">#%d</xliff:g> har skapats"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Lägger till information i felrapporten"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Vänta …"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Svep åt vänster om du vill dela felrapporten"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Felrapporten visas på mobilen inom kort"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tryck om du vill dela felrapporten"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tryck om du vill dela felrapporten utan en skärmdump eller vänta tills skärmdumpen är klar"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tryck om du vill dela felrapporten utan en skärmdump eller vänta tills skärmdumpen är klar"</string>
diff --git a/packages/Shell/res/values-sw/strings.xml b/packages/Shell/res/values-sw/strings.xml
index b31b54f..83f205d 100644
--- a/packages/Shell/res/values-sw/strings.xml
+++ b/packages/Shell/res/values-sw/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Ripoti ya hitilafu ya <xliff:g id="ID">#%d</xliff:g> imerekodiwa"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Inaongeza maelezo kwenye ripoti ya hitilafu"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Tafadhali subiri…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Telezesha kidole kushoto ili ushiriki ripoti yako ya hitilafu"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Tutatuma ripoti ya hitilafu kwenye simu baada ya muda mfupi"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Gonga ili ushiriki ripoti yako ya hitilafu"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Gonga ili ushiriki ripoti yako ya hitilafu bila picha ya skrini au usubiri picha ya skrini itayarishwe"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Gonga ili ushiriki ripoti yako ya hitilafu bila picha ya skrini au usubiri picha ya skrini itayarishwe"</string>
diff --git a/packages/Shell/res/values-ta-rIN/strings.xml b/packages/Shell/res/values-ta-rIN/strings.xml
index bd727ea..2a83db0 100644
--- a/packages/Shell/res/values-ta-rIN/strings.xml
+++ b/packages/Shell/res/values-ta-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"பிழை அறிக்கை <xliff:g id="ID">#%d</xliff:g> எடுக்கப்பட்டது"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"பிழை அறிக்கையில் விவரங்களைச் சேர்க்கிறது"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"காத்திருக்கவும்…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"பிழை அறிக்கையைப் பகிர இடது புறமாகத் தேய்க்கவும்"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"பிழை அறிக்கை சிறிது நேரத்தில் மொபைலில் தோன்றும்"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"பிழை அறிக்கையைப் பகிர, தட்டவும்"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ஸ்கிரீன்ஷாட் இல்லாமல் பிழை அறிக்கையைப் பகிர, தட்டவும் அல்லது ஸ்கிரீன்ஷாட் முடியும்வரை காத்திருக்கவும்"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ஸ்கிரீன்ஷாட் இல்லாமல் பிழை அறிக்கையைப் பகிர, தட்டவும் அல்லது ஸ்கிரீன்ஷாட் முடியும்வரை காத்திருக்கவும்"</string>
diff --git a/packages/Shell/res/values-te-rIN/strings.xml b/packages/Shell/res/values-te-rIN/strings.xml
index a6beb3c..47074fd 100644
--- a/packages/Shell/res/values-te-rIN/strings.xml
+++ b/packages/Shell/res/values-te-rIN/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"బగ్ నివేదిక <xliff:g id="ID">#%d</xliff:g> సంగ్రహించబడింది"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"బగ్ నివేదికకు వివరాలను జోడిస్తోంది"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"దయచేసి వేచి ఉండండి..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"మీ బగ్ నివేదికను భాగస్వామ్యం చేయడానికి ఎడమవైపుకు స్వైప్ చేయండి"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"బగ్ నివేదిక త్వరలో ఫోన్లో కనిపిస్తుంది"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"మీ బగ్ నివేదికను భాగస్వామ్యం చేయడానికి నొక్కండి"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"స్క్రీన్షాట్ లేకుండా మీ బగ్ నివే. భాగ. చేయడానికి నొక్కండి లేదా స్క్రీన్షాట్ ముగిసేదాకా వేచి ఉండండి"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"స్క్రీన్షాట్ లేకుండా మీ బగ్ నివే. భాగ. చేయడానికి నొక్కండి లేదా స్క్రీన్షాట్ ముగిసేదాకా వేచి ఉండండి"</string>
diff --git a/packages/Shell/res/values-th/strings.xml b/packages/Shell/res/values-th/strings.xml
index d76bf12..dddb3b0 100644
--- a/packages/Shell/res/values-th/strings.xml
+++ b/packages/Shell/res/values-th/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"บันทึกรายงานข้อบกพร่อง <xliff:g id="ID">#%d</xliff:g> แล้ว"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"กำลังเพิ่มรายละเอียดในรายงานข้อบกพร่อง"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"โปรดรอสักครู่…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"กวาดไปทางซ้ายเพื่อแชร์รายงานข้อบกพร่อง"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"รายงานข้อบกพร่องจะปรากฏบนโทรศัพท์ในไม่ช้า"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"แตะเพื่อแชร์รายงานข้อบกพร่องของคุณ"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"แตะเพื่อแชร์รายงานข้อบกพร่องของคุณโดยไม่มีภาพหน้าจอ หรือรอให้ภาพหน้าจอเสร็จสมบูรณ์"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"แตะเพื่อแชร์รายงานข้อบกพร่องของคุณโดยไม่มีภาพหน้าจอ หรือรอให้ภาพหน้าจอเสร็จสมบูรณ์"</string>
diff --git a/packages/Shell/res/values-tl/strings.xml b/packages/Shell/res/values-tl/strings.xml
index fc556e1..28805c8 100644
--- a/packages/Shell/res/values-tl/strings.xml
+++ b/packages/Shell/res/values-tl/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Na-capture ang ulat ng bug na <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Pagdaragdag ng mga detalye sa ulat ng bug"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Mangyaring maghintay..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Mag-swipe pakaliwa upang ibahagi ang iyong ulat ng bug"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Lalabas sa telepono ang ulat ng bug pagkalipas ng ilang sandali"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Mag-tap upang ibahagi ang iyong ulat ng bug"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Mag-tap para ibahagi ang iyong ulat ng bug nang walang screenshot o hintaying matapos ang screenshot"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Mag-tap para ibahagi ang iyong ulat ng bug nang walang screenshot o hintaying matapos ang screenshot"</string>
diff --git a/packages/Shell/res/values-tr/strings.xml b/packages/Shell/res/values-tr/strings.xml
index f2b02c3..d444d78 100644
--- a/packages/Shell/res/values-tr/strings.xml
+++ b/packages/Shell/res/values-tr/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Hata raporu (<xliff:g id="ID">#%d</xliff:g>) yakalandı"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Hata raporuna ayrıntılar ekleniyor"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Lütfen bekleyin…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Hata raporunuzu paylaşmak için hızlıca sola kaydırın"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Hata raporu kısa süre içinde telefonda görüntülenecektir"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Hata raporunuzu paylaşmak için hafifçe dokunun"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Hata raporunu ekran görüntüsüz paylaşmak için dokunun veya bitirmek için ekran görüntüsünü bekleyin"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Hata raporunu ekran görüntüsüz paylaşmak için dokunun veya bitirmek için ekran görüntüsünü bekleyin"</string>
diff --git a/packages/Shell/res/values-uk/strings.xml b/packages/Shell/res/values-uk/strings.xml
index 919a2b5..3bb101f 100644
--- a/packages/Shell/res/values-uk/strings.xml
+++ b/packages/Shell/res/values-uk/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Повідомлення про помилку <xliff:g id="ID">#%d</xliff:g> створено"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Додаються деталі до повідомлення про помилку"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Зачекайте…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Проведіть пальцем ліворуч, щоб надіслати звіт про помилки"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Звіт про помилку невдовзі з’явиться на телефоні"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Торкніться, щоб надіслати повідомлення про помилку"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Торкніться, щоб надіслати повідомлення про помилку без знімка екрана або зачекайте на знімок"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Торкніться, щоб надіслати повідомлення про помилку без знімка екрана або зачекайте на знімок"</string>
diff --git a/packages/Shell/res/values-ur-rPK/strings.xml b/packages/Shell/res/values-ur-rPK/strings.xml
index d97a693..3f85bf4 100644
--- a/packages/Shell/res/values-ur-rPK/strings.xml
+++ b/packages/Shell/res/values-ur-rPK/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"بگ رپورٹ <xliff:g id="ID">#%d</xliff:g> کیپچر ہو گئی"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"بگ رپورٹ میں تفصیلات شامل کی جا رہی ہیں"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"براہ کرم انتظار کریں…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"اپنی بگ رپورٹ کا اشتراک کرنے کیلئے بائیں سوائپ کریں"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"بگ رپورٹ فون پر تھوڑی دیر میں ظاہر ہوگی"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"اپنی بگ رپورٹ کا اشتراک کرنے کیلئے تھپتھپائیں"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"بغیر اسکرین شاٹ کے بگ رپورٹ کا اشتراک کرنے کیلئے تھپتھپائیں یا اسکرین شاٹ کے ختم ہونے کا انتظار کریں"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"بغیر اسکرین شاٹ کے بگ رپورٹ کا اشتراک کرنے کیلئے تھپتھپائیں یا اسکرین شاٹ کے ختم ہونے کا انتظار کریں"</string>
diff --git a/packages/Shell/res/values-uz-rUZ/strings.xml b/packages/Shell/res/values-uz-rUZ/strings.xml
index 605fc12..0738ece 100644
--- a/packages/Shell/res/values-uz-rUZ/strings.xml
+++ b/packages/Shell/res/values-uz-rUZ/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Xatoliklar hisoboti (<xliff:g id="ID">#%d</xliff:g>) yozib olindi"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Xatoliklar hisobotiga tafsilotlar qo‘shilmoqda"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Iltimos, kuting…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Xatolik hisobotini yuborish uchun barmog‘ingiz bilan chapga suring"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Xatoliklar hisoboti tez orada telefonda paydo bo‘ladi"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Xatoliklar hisobotini ulashish uchun bosing"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Xatoliklar hisobotini darhol yuborish uchun shu yerga bosing yoki skrinshot saqlanguncha kuting"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Xatoliklar hisobotini darhol yuborish uchun shu yerga bosing yoki skrinshot saqlanguncha kuting"</string>
diff --git a/packages/Shell/res/values-vi/strings.xml b/packages/Shell/res/values-vi/strings.xml
index e9b5a9d..f988801 100644
--- a/packages/Shell/res/values-vi/strings.xml
+++ b/packages/Shell/res/values-vi/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Đã chụp báo cáo lỗi <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Đang thêm thông tin chi tiết vào báo cáo lỗi"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Vui lòng đợi…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Vuốt sang trái để chia sẻ báo cáo lỗi của bạn"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Báo cáo lỗi sẽ xuất hiện ngay trên điện thoại"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Nhấn để chia sẻ báo cáo lỗi của bạn"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Bấm để chia sẻ báo cáo lỗi mà không cần ảnh chụp màn hình hoặc đợi hoàn tất ảnh chụp màn hình"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Bấm để chia sẻ báo cáo lỗi mà không cần ảnh chụp màn hình hoặc đợi hoàn tất ảnh chụp màn hình"</string>
diff --git a/packages/Shell/res/values-zh-rCN/strings.xml b/packages/Shell/res/values-zh-rCN/strings.xml
index ce10d56..a42534c 100644
--- a/packages/Shell/res/values-zh-rCN/strings.xml
+++ b/packages/Shell/res/values-zh-rCN/strings.xml
@@ -18,10 +18,10 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
<string name="bugreport_in_progress_title" msgid="4311705936714972757">"正在生成错误报告 <xliff:g id="ID">#%d</xliff:g>"</string>
- <string name="bugreport_finished_title" msgid="4429132808670114081">"已捕获错误报告 <xliff:g id="ID">#%d</xliff:g>"</string>
+ <string name="bugreport_finished_title" msgid="4429132808670114081">"已获取错误报告 <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"正在向错误报告添加详细信息"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"请稍候…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑动即可分享错误报告"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"错误报告将很快显示在手机上"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"点按即可分享您的错误报告"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"点按即可分享不含屏幕截图的错误报告；您也可以等待屏幕截图完成"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"点按即可分享不含屏幕截图的错误报告；您也可以等待屏幕截图完成"</string>
diff --git a/packages/Shell/res/values-zh-rHK/strings.xml b/packages/Shell/res/values-zh-rHK/strings.xml
index 8433d22..6004621 100644
--- a/packages/Shell/res/values-zh-rHK/strings.xml
+++ b/packages/Shell/res/values-zh-rHK/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"已擷取錯誤報告 <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"正在新增錯誤報告詳細資訊"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"請稍候…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑動即可分享錯誤報告"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"錯誤報告即將在手機上顯示"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"輕按即可分享錯誤報告"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"輕按以分享錯誤報告 (不包含螢幕擷圖)，或等待螢幕畫面擷取完成"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"輕按以分享錯誤報告 (不包含螢幕擷圖)，或等待螢幕畫面擷取完成"</string>
diff --git a/packages/Shell/res/values-zh-rTW/strings.xml b/packages/Shell/res/values-zh-rTW/strings.xml
index 85dde84..1b7bee3 100644
--- a/packages/Shell/res/values-zh-rTW/strings.xml
+++ b/packages/Shell/res/values-zh-rTW/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"已擷取錯誤報告 <xliff:g id="ID">#%d</xliff:g>"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"正在新增錯誤報告詳細資訊"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"請稍候…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑動即可分享錯誤報告"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"系統即將在手機上顯示錯誤報告"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"輕觸即可分享錯誤報告"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"輕觸即可分享無螢幕擷圖的錯誤報告；您也可以等候螢幕畫面擷取完畢"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"輕觸即可分享無螢幕擷圖的錯誤報告；您也可以等候螢幕畫面擷取完畢"</string>
diff --git a/packages/Shell/res/values-zu/strings.xml b/packages/Shell/res/values-zu/strings.xml
index a12a2b7..c1165ea 100644
--- a/packages/Shell/res/values-zu/strings.xml
+++ b/packages/Shell/res/values-zu/strings.xml
@@ -21,7 +21,7 @@
<string name="bugreport_finished_title" msgid="4429132808670114081">"Umbiko wesiphazamisi ongu-<xliff:g id="ID">#%d</xliff:g> uthwetshuliwe"</string>
<string name="bugreport_updating_title" msgid="4423539949559634214">"Ingeza imininingwane kumbiko wesiphazamisi"</string>
<string name="bugreport_updating_wait" msgid="3322151947853929470">"Sicela ulinde..."</string>
- <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swayiphela kwesokunxele ukuze wabelane umbiko wesiphazamiso sakho"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Umbiko wesiphazamisi uzobonakala efonini maduze"</string>
<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Thepha ukuze wabelane ngombiko wakho wesiphazamisi"</string>
<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Thepha ukuze wabelane ngombiko wesiphazamisi ngaphandle kwesithombe-skrini noma ulinde isithombe-skrini ukuthi siqede"</string>
<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Thepha ukuze wabelane ngombiko wesiphazamisi ngaphandle kwesithombe-skrini noma ulinde isithombe-skrini ukuthi siqede"</string>
diff --git a/packages/Shell/res/values/strings.xml b/packages/Shell/res/values/strings.xml
index 3d6643d..5dfac95 100644
--- a/packages/Shell/res/values/strings.xml
+++ b/packages/Shell/res/values/strings.xml
@@ -25,8 +25,8 @@
<!-- Content notification indicating a bugreport is being updated before it can be shared, asking the user to wait [CHAR LIMIT=50] -->
<string name="bugreport_updating_wait">Please wait\u2026</string>
- <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
- <string name="bugreport_finished_text" product="watch">Swipe left to share your bug report</string>
+ <!-- Text of notification indicating that bugreport will appear on the phone. [CHAR LIMIT=100] -->
+ <string name="bugreport_finished_text" product="watch">The bug report will appear on the phone shortly</string>
<!-- Text of notification indicating that tapping will share the captured bugreport. [CHAR LIMIT=100] -->
<string name="bugreport_finished_text" product="default">Tap to share your bug report</string>
<!-- Text of notification indicating that swipe left will share the captured bugreport, but giving user the option to wait for the screenshot. [CHAR LIMIT=100] -->
diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index 6bc4df7..235bfcc 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -17,6 +17,7 @@
package com.android.shell;
import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
+
import static com.android.shell.BugreportPrefs.STATE_HIDE;
import static com.android.shell.BugreportPrefs.STATE_UNKNOWN;
import static com.android.shell.BugreportPrefs.getWarningState;
@@ -44,6 +45,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+
import com.google.android.collect.Lists;
import android.accounts.Account;
@@ -78,6 +80,7 @@
import android.util.Log;
import android.util.Patterns;
import android.util.SparseArray;
+import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager;
import android.view.View.OnFocusChangeListener;
@@ -212,6 +215,8 @@
private static final Bundle sNotificationBundle = new Bundle();
+ private boolean mIsWatch;
+
@Override
public void onCreate() {
mContext = getApplicationContext();
@@ -225,6 +230,9 @@
Log.w(TAG, "Could not create directory " + mScreenshotsDir);
}
}
+ final Configuration conf = mContext.getResources().getConfiguration();
+ mIsWatch = (conf.uiMode & Configuration.UI_MODE_TYPE_MASK) ==
+ Configuration.UI_MODE_TYPE_WATCH;
}
@Override
@@ -439,56 +447,68 @@
return;
}
- final NumberFormat nf = NumberFormat.getPercentInstance();
- nf.setMinimumFractionDigits(2);
- nf.setMaximumFractionDigits(2);
- final String percentageText = nf.format((double) info.progress / info.max);
- final Action cancelAction = new Action.Builder(null, mContext.getString(
- com.android.internal.R.string.cancel), newCancelIntent(mContext, info)).build();
- final Intent infoIntent = new Intent(mContext, BugreportProgressService.class);
- infoIntent.setAction(INTENT_BUGREPORT_INFO_LAUNCH);
- infoIntent.putExtra(EXTRA_ID, info.id);
- final PendingIntent infoPendingIntent =
- PendingIntent.getService(mContext, info.id, infoIntent,
- PendingIntent.FLAG_UPDATE_CURRENT);
- final Action infoAction = new Action.Builder(null,
- mContext.getString(R.string.bugreport_info_action),
- infoPendingIntent).build();
- final Intent screenshotIntent = new Intent(mContext, BugreportProgressService.class);
- screenshotIntent.setAction(INTENT_BUGREPORT_SCREENSHOT);
- screenshotIntent.putExtra(EXTRA_ID, info.id);
- PendingIntent screenshotPendingIntent = mTakingScreenshot ? null : PendingIntent
- .getService(mContext, info.id, screenshotIntent,
- PendingIntent.FLAG_UPDATE_CURRENT);
- final Action screenshotAction = new Action.Builder(null,
- mContext.getString(R.string.bugreport_screenshot_action),
- screenshotPendingIntent).build();
-
- final String title = mContext.getString(R.string.bugreport_in_progress_title, info.id);
-
- final String name =
- info.name != null ? info.name : mContext.getString(R.string.bugreport_unnamed);
-
- final Notification notification = newBaseNotification(mContext)
- .setContentTitle(title)
- .setTicker(title)
- .setContentText(name)
- .setProgress(info.max, info.progress, false)
- .setOngoing(true)
- .setContentIntent(infoPendingIntent)
- .setActions(infoAction, screenshotAction, cancelAction)
- .build();
-
if (info.finished) {
Log.w(TAG, "Not sending progress notification because bugreport has finished already ("
+ info + ")");
return;
}
+
+ final NumberFormat nf = NumberFormat.getPercentInstance();
+ nf.setMinimumFractionDigits(2);
+ nf.setMaximumFractionDigits(2);
+ final String percentageText = nf.format((double) info.progress / info.max);
+
+ String title = mContext.getString(R.string.bugreport_in_progress_title, info.id);
+
+ // TODO: Remove this workaround when notification progress is implemented on Wear.
+ if (mIsWatch) {
+ nf.setMinimumFractionDigits(0);
+ nf.setMaximumFractionDigits(0);
+ final String watchPercentageText = nf.format((double) info.progress / info.max);
+ title = title + "\n" + watchPercentageText;
+ }
+
+ final String name =
+ info.name != null ? info.name : mContext.getString(R.string.bugreport_unnamed);
+
+ final Notification.Builder builder = newBaseNotification(mContext)
+ .setContentTitle(title)
+ .setTicker(title)
+ .setContentText(name)
+ .setProgress(info.max, info.progress, false)
+ .setOngoing(true);
+
+ // Wear bugreport doesn't need the bug info dialog, screenshot and cancel action.
+ if (!mIsWatch) {
+ final Action cancelAction = new Action.Builder(null, mContext.getString(
+ com.android.internal.R.string.cancel), newCancelIntent(mContext, info)).build();
+ final Intent infoIntent = new Intent(mContext, BugreportProgressService.class);
+ infoIntent.setAction(INTENT_BUGREPORT_INFO_LAUNCH);
+ infoIntent.putExtra(EXTRA_ID, info.id);
+ final PendingIntent infoPendingIntent =
+ PendingIntent.getService(mContext, info.id, infoIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT);
+ final Action infoAction = new Action.Builder(null,
+ mContext.getString(R.string.bugreport_info_action),
+ infoPendingIntent).build();
+ final Intent screenshotIntent = new Intent(mContext, BugreportProgressService.class);
+ screenshotIntent.setAction(INTENT_BUGREPORT_SCREENSHOT);
+ screenshotIntent.putExtra(EXTRA_ID, info.id);
+ PendingIntent screenshotPendingIntent = mTakingScreenshot ? null : PendingIntent
+ .getService(mContext, info.id, screenshotIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT);
+ final Action screenshotAction = new Action.Builder(null,
+ mContext.getString(R.string.bugreport_screenshot_action),
+ screenshotPendingIntent).build();
+ builder.setContentIntent(infoPendingIntent)
+ .setActions(infoAction, screenshotAction, cancelAction);
+ }
+
if (DEBUG) {
Log.d(TAG, "Sending 'Progress' notification for id " + info.id + " (pid " + info.pid
+ "): " + percentageText);
}
- sendForegroundabledNotification(info.id, notification);
+ sendForegroundabledNotification(info.id, builder.build());
}
private void sendForegroundabledNotification(int id, Notification notification) {
@@ -543,6 +563,7 @@
deleteScreenshots(info);
}
stopProgress(id);
+ mInfoDialog.cancel();
}
/**
@@ -854,10 +875,7 @@
// Stop running on foreground, otherwise share notification cannot be dismissed.
stopForegroundWhenDone(id);
- final Configuration conf = mContext.getResources().getConfiguration();
- if ((conf.uiMode & Configuration.UI_MODE_TYPE_MASK) != Configuration.UI_MODE_TYPE_WATCH) {
- triggerLocalNotification(mContext, info);
- }
+ triggerLocalNotification(mContext, info);
}
/**
@@ -1404,7 +1422,7 @@
/**
* Sets its internal state and displays the dialog.
*/
- private void initialize(final Context context, BugreportInfo info) {
+ void initialize(final Context context, BugreportInfo info) {
final String dialogTitle =
context.getString(R.string.bugreport_info_dialog_title, info.id);
// First initializes singleton.
@@ -1450,6 +1468,7 @@
}
})
.create();
+ mDialog.setCancelable(true);
mDialog.getWindow().setAttributes(
new WindowManager.LayoutParams(
@@ -1545,13 +1564,18 @@
* <p>Once the bugreport is finished dumpstate has already generated the final files, so
* changing the name would have no effect.
*/
- private void onBugreportFinished(int id) {
+ void onBugreportFinished(int id) {
if (mInfoName != null) {
mInfoName.setEnabled(false);
mInfoName.setText(mSavedName);
}
}
+ void cancel() {
+ if (mDialog != null) {
+ mDialog.cancel();
+ }
+ }
}
/**
diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
index 44e956a..ad66dfc 100644
--- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
+++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
@@ -153,7 +153,7 @@
Log.i(TAG, "#### setup() on " + getName());
Instrumentation instrumentation = getInstrumentation();
mContext = instrumentation.getTargetContext();
- mUiBot = new UiBot(UiDevice.getInstance(instrumentation), TIMEOUT);
+ mUiBot = new UiBot(instrumentation, TIMEOUT);
mListener = ActionSendMultipleConsumerActivity.getListener(mContext);
cancelExistingNotifications();
@@ -233,10 +233,7 @@
assertProgressNotification(NAME, 00.00f);
- openProgressNotification(ID);
- UiObject cancelButton = mUiBot.getVisibleObject(mContext.getString(
- com.android.internal.R.string.cancel).toUpperCase());
- mUiBot.click(cancelButton, "cancel_button");
+ cancelFromNotification();
waitForService(false);
}
@@ -323,6 +320,21 @@
assertServiceNotRunning();
}
+ public void testProgress_cancelBugClosesDetailsDialog() throws Exception {
+ resetProperties();
+ sendBugreportStarted(1000);
+ waitForScreenshotButtonEnabled(true);
+
+ DetailsUi detailsUi = new DetailsUi(mUiBot, ID);
+ detailsUi.assertName(NAME); // Sanity check
+
+ cancelFromNotification();
+ mUiBot.closeNotifications();
+
+ assertDetailsUiClosed();
+ assertServiceNotRunning();
+ }
+
public void testProgress_changeDetailsPlainBugreport() throws Exception {
changeDetailsTest(true);
}
@@ -579,6 +591,13 @@
}
}
+ private void cancelFromNotification() {
+ openProgressNotification(ID);
+ UiObject cancelButton = mUiBot.getVisibleObject(mContext.getString(
+ com.android.internal.R.string.cancel).toUpperCase());
+ mUiBot.click(cancelButton, "cancel_button");
+ }
+
private void assertProgressNotification(String name, float percent) {
// TODO: it currently looks for 3 distinct objects, without taking advantage of their
// relationship.
@@ -929,6 +948,11 @@
screenshotButton.isEnabled());
}
+ private void assertDetailsUiClosed() {
+ // TODO: unhardcode resource ids
+ mUiBot.assertNotVisibleById("android:id/alertTitle");
+ }
+
/**
* Helper class containing the UiObjects present in the bugreport info dialog.
*/
diff --git a/packages/Shell/tests/src/com/android/shell/UiBot.java b/packages/Shell/tests/src/com/android/shell/UiBot.java
index 30f1692..ef24791 100644
--- a/packages/Shell/tests/src/com/android/shell/UiBot.java
+++ b/packages/Shell/tests/src/com/android/shell/UiBot.java
@@ -16,6 +16,8 @@
package com.android.shell;
+import android.app.Instrumentation;
+import android.app.StatusBarManager;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject;
@@ -24,6 +26,8 @@
import android.support.test.uiautomator.UiSelector;
import android.support.test.uiautomator.Until;
import android.util.Log;
+
+import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
/**
@@ -34,11 +38,13 @@
private static final String TAG = "UiBot";
private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
+ private final Instrumentation mInstrumentation;
private final UiDevice mDevice;
private final int mTimeout;
- public UiBot(UiDevice device, int timeout) {
- mDevice = device;
+ public UiBot(Instrumentation instrumentation, int timeout) {
+ mInstrumentation = instrumentation;
+ mDevice = UiDevice.getInstance(instrumentation);
mTimeout = timeout;
}
@@ -57,6 +63,13 @@
return getObject(text);
}
+ public void closeNotifications() throws Exception {
+ // TODO: mDevice should provide such method..
+ StatusBarManager sbm =
+ (StatusBarManager) mInstrumentation.getContext().getSystemService("statusbar");
+ sbm.collapsePanels();
+ }
+
/**
* Opens the system notification and clicks a given notification.
*
@@ -111,6 +124,16 @@
return uiObject;
}
+ /**
+ * Asserts an object is not visible.
+ */
+ public void assertNotVisibleById(String id) {
+ // TODO: not working when the bugreport dialog is shown, it hangs until the dialog is
+ // dismissed and hence always work.
+ boolean hasIt = mDevice.hasObject(By.res(id));
+ assertFalse("should not have found object with id '" + id+ "'", hasIt);
+ }
+
/**
* Clicks on a UI element.
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index 6d8b9f6..258c82e 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -16,17 +16,21 @@
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
Keyguard \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
android-support-v14-preference \
- android-support-v17-leanback \
+ android-support-v17-leanback
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
framework-protos \
SystemUI-proto-tags
@@ -39,19 +43,6 @@
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_RESOURCE_DIR := \
- frameworks/base/packages/Keyguard/res \
- $(LOCAL_PATH)/res \
- frameworks/support/v7/preference/res \
- frameworks/support/v14/preference/res \
- frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res \
- frameworks/support/v17/leanback/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat \
- --extra-packages android.support.v17.leanback
-
ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_JACK_ENABLED := incremental
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 36fbb6a..c0a34ae 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -391,7 +391,7 @@
android:theme="@style/PipTheme"
android:launchMode="singleTop"
android:taskAffinity=""
- android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|locale|layoutDirection"
android:resizeableActivity="true"
android:supportsPictureInPicture="true"
androidprv:alwaysFocusable="true"
@@ -401,7 +401,7 @@
android:exported="true"
android:theme="@style/PipTheme"
android:taskAffinity=""
- android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|locale|layoutDirection"
android:resizeableActivity="true"
android:supportsPictureInPicture="true"
android:excludeFromRecents="true" />
diff --git a/packages/SystemUI/res/color/qs_detail_empty.xml b/packages/SystemUI/res/color/qs_detail_empty.xml
new file mode 100644
index 0000000..4be39c7
--- /dev/null
+++ b/packages/SystemUI/res/color/qs_detail_empty.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:alpha="0.14" android:color="@*android:color/quaternary_device_default_settings" />
+</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_night_mode.xml b/packages/SystemUI/res/drawable/ic_night_mode.xml
deleted file mode 100644
index caa7a47..0000000
--- a/packages/SystemUI/res/drawable/ic_night_mode.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0.0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3.0,16.25L3.0,21.0l4.75,0.0l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,0.0 0.4,-1.0 0.01,-1.42zM6.92,19.0L5.0,17.08l8.06,-8.06 1.92,1.92L6.92,19.0z"/>
-</vector>
diff --git a/packages/SystemUI/res/drawable/ic_night_mode_disabled.xml b/packages/SystemUI/res/drawable/ic_night_mode_disabled.xml
deleted file mode 100644
index 010815a..0000000
--- a/packages/SystemUI/res/drawable/ic_night_mode_disabled.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#4DFFFFFF"
- android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0.0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3.0,16.25L3.0,21.0l4.75,0.0l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,0.0 0.4,-1.0 0.01,-1.42zM6.92,19.0L5.0,17.08l8.06,-8.06 1.92,1.92L6.92,19.0z"/>
-</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_night_display_off.xml b/packages/SystemUI/res/drawable/ic_qs_night_display_off.xml
new file mode 100644
index 0000000..778ccbc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_night_display_off.xml
@@ -0,0 +1,27 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="64dp"
+ android:height="64dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:alpha="0.3">
+
+ <path
+ android:fillColor="#FFF"
+ android:pathData="M6,12c0,5.5,4.5,10,10,10c1,0,2-0.2,3-0.5c-4.1-1.3-7-5.1-7-9.5s2.9-8.3,7-9.5C18.1,2.2,17.1,2,16,2C10.5,2,6,6.5,6,12z" />
+
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml b/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml
new file mode 100644
index 0000000..aaca663
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="64dp"
+ android:height="64dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="#FFF"
+ android:pathData="M6,12c0,5.5,4.5,10,10,10c1,0,2-0.2,3-0.5c-4.1-1.3-7-5.1-7-9.5s2.9-8.3,7-9.5C18.1,2.2,17.1,2,16,2C10.5,2,6,6.5,6,12z" />
+
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml
index 258bd0f..4d7f325 100644
--- a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml
@@ -1,37 +1,30 @@
<!--
- Copyright (C) 2016 The Android Open Source Project
+ Copyright (C) 2016 The Android Open Source Project
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="18.0dp"
- android:height="24dp"
- android:viewportWidth="36.0"
- android:viewportHeight="36.0">
-
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
- android:fillColor="#FFFFFF"
- android:pathData="M6.797,13.334h1.231v1.522H6.797v2.509h-1.62v-2.509H1.101l-0.039-1.157l4.069-7.643h1.666V13.334z
-M2.648,13.334h2.53V8.721L5.137,8.713L4.984,9.148L2.648,13.334z" />
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4.6,7.8l0.7,0.0l0.0,1.3L4.6,9.1L4.6,11.0L3.0,11.0L3.0,9.2L0.1,9.2L0.0,8.2l3.0,-5.7l1.7,0.0L4.6,7.8L4.6,7.8zM1.7,7.8L3.0,7.8l0.0,-3.0L2.9,5.0L1.7,7.8z"/>
<path
- android:fillColor="#FFFFFF"
- android:pathData="M16.155,15.836c-0.269,0.439-0.695,0.832-1.282,1.177c-0.587,0.344-1.344,0.517-2.271,0.517
-c-1.151,0-2.098-0.432-2.841-1.294c-0.744-0.862-1.115-1.978-1.115-3.345v-2.36c0-1.367,0.359-2.481,1.077-3.343
-c0.719-0.863,1.643-1.293,2.772-1.293c1.132,0,2.017,0.331,2.649,0.994c0.633,0.663,0.941,1.528,0.924,2.594l-0.021,0.047h-1.545
-c0-0.638-0.171-1.15-0.513-1.538c-0.341-0.389-0.831-0.583-1.469-0.583c-0.674,0-1.217,0.292-1.63,0.877
-c-0.413,0.585-0.619,1.328-0.619,2.229v2.375c0,0.912,0.215,1.662,0.645,2.25c0.431,0.587,0.992,0.881,1.684,0.881
-c0.522,0,0.935-0.068,1.238-0.205c0.304-0.138,0.533-0.305,0.688-0.502v-2.338h-2.041v-1.413h3.668V15.836z" />
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M11.9,9.9c-0.2,0.4 -0.6,0.7 -1.0,0.9s-1.0,0.4 -1.8,0.4c-0.9,0.0 -1.7,-0.3 -2.2,-0.8S6.1,9.0 6.1,7.9L6.1,5.6c0.0,-1.1 0.3,-1.9 0.8,-2.4S8.2,2.4 9.0,2.4c1.0,0.0 1.7,0.2 2.1,0.7s0.7,1.2 0.7,2.1l-1.6,0.0c0.0,-0.5 -0.1,-0.9 -0.2,-1.1S9.5,3.7 9.0,3.7c-0.4,0.0 -0.7,0.2 -0.9,0.5S7.8,5.0 7.8,5.6l0.0,2.3c0.0,0.7 0.1,1.1 0.3,1.4c0.2,0.3 0.6,0.5 1.0,0.5c0.3,0.0 0.6,0.0 0.7,-0.1s0.3,-0.2 0.4,-0.3L10.2,7.8L9.0,7.8L9.0,6.6l2.9,0.0L11.9,9.9z"/>
<path
- android:fillColor="#FFFFFF"
- android:pathData="M19.366,14.701v-2.232h-2.25v-1.541h2.25V8.695h1.5v2.232h2.256v1.541h-2.256v2.232H19.366z" />
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M17.7,4.4l-1.900001,0.0 0.0,-1.9 -1.2,0.0 0.0,1.9 -1.900001,0.0 0.0,1.2 1.900001,0.0 0.0,1.9 1.2,0.0 0.0,-1.9 1.900001,0.0z"/>
</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml
new file mode 100644
index 0000000..3af0629
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml
@@ -0,0 +1,33 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M2.0,9.7l2.0,0.0L4.0,11.0L0.4,11.0L0.4,2.5L2.0,2.5L2.0,9.7z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M8.3,3.8L7.0,3.8L7.0,11.0L5.4,11.0L5.4,3.8L4.0,3.8L4.0,2.5l4.3,0.0L8.3,3.8z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12.4,7.3l-1.7,0.0l0.0,2.4l2.1,0.0L12.799999,11.0L9.0,11.0L9.0,2.5l3.7,0.0l0.0,1.3l-2.1,0.0l0.0,2.1l1.7,0.0L12.4,7.3L12.4,7.3z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M18.4,4.4l-1.9,0.0 0.0,-1.9 -1.2,0.0 0.0,1.9 -1.900001,0.0 0.0,1.2 1.900001,0.0 0.0,1.9 1.2,0.0 0.0,-1.9 1.9,0.0z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/recents_stack_action_background.xml b/packages/SystemUI/res/drawable/recents_stack_action_background.xml
new file mode 100644
index 0000000..2a40dd0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/recents_stack_action_background.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:attr/colorControlHighlight">
+ <item android:id="@android:id/mask">
+ <shape>
+ <corners android:radius="@dimen/recents_task_view_rounded_corners_radius" />
+ <solid android:color="@android:color/white" />
+ </shape>
+ </item>
+</ripple>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml
index 17a4394..3cdd3e1 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml
@@ -1,37 +1,30 @@
<!--
- Copyright (C) 2016 The Android Open Source Project
+ Copyright (C) 2016 The Android Open Source Project
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="15dp"
- android:height="20dp"
- android:viewportWidth="36"
- android:viewportHeight="36">
-
+ android:width="17.0dp"
+ android:height="17.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
- android:fillColor="#FFFFFF"
- android:pathData="M6.797,13.334h1.231v1.522H6.797v2.509h-1.62v-2.509H1.101l-0.039-1.157l4.069-7.643h1.666V13.334z
-M2.648,13.334h2.53V8.721L5.137,8.713L4.984,9.148L2.648,13.334z" />
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4.6,7.8l0.7,0.0l0.0,1.3L4.6,9.1L4.6,11.0L3.0,11.0L3.0,9.2L0.1,9.2L0.0,8.2l3.0,-5.7l1.7,0.0L4.6,7.8L4.6,7.8zM1.7,7.8L3.0,7.8l0.0,-3.0L2.9,5.0L1.7,7.8z"/>
<path
- android:fillColor="#FFFFFF"
- android:pathData="M16.155,15.836c-0.269,0.439-0.695,0.832-1.282,1.177c-0.587,0.344-1.344,0.517-2.271,0.517
-c-1.151,0-2.098-0.432-2.841-1.294c-0.744-0.862-1.115-1.978-1.115-3.345v-2.36c0-1.367,0.359-2.481,1.077-3.343
-c0.719-0.863,1.643-1.293,2.772-1.293c1.132,0,2.017,0.331,2.649,0.994c0.633,0.663,0.941,1.528,0.924,2.594l-0.021,0.047h-1.545
-c0-0.638-0.171-1.15-0.513-1.538c-0.341-0.389-0.831-0.583-1.469-0.583c-0.674,0-1.217,0.292-1.63,0.877
-c-0.413,0.585-0.619,1.328-0.619,2.229v2.375c0,0.912,0.215,1.662,0.645,2.25c0.431,0.587,0.992,0.881,1.684,0.881
-c0.522,0,0.935-0.068,1.238-0.205c0.304-0.138,0.533-0.305,0.688-0.502v-2.338h-2.041v-1.413h3.668V15.836z" />
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M11.9,9.9c-0.2,0.4 -0.6,0.7 -1.0,0.9s-1.0,0.4 -1.8,0.4c-0.9,0.0 -1.7,-0.3 -2.2,-0.8S6.1,9.0 6.1,7.9L6.1,5.6c0.0,-1.1 0.3,-1.9 0.8,-2.4S8.2,2.4 9.0,2.4c1.0,0.0 1.7,0.2 2.1,0.7s0.7,1.2 0.7,2.1l-1.6,0.0c0.0,-0.5 -0.1,-0.9 -0.2,-1.1S9.5,3.7 9.0,3.7c-0.4,0.0 -0.7,0.2 -0.9,0.5S7.8,5.0 7.8,5.6l0.0,2.3c0.0,0.7 0.1,1.1 0.3,1.4c0.2,0.3 0.6,0.5 1.0,0.5c0.3,0.0 0.6,0.0 0.7,-0.1s0.3,-0.2 0.4,-0.3L10.2,7.8L9.0,7.8L9.0,6.6l2.9,0.0L11.9,9.9z"/>
<path
- android:fillColor="#FFFFFF"
- android:pathData="M19.366,14.701v-2.232h-2.25v-1.541h2.25V8.695h1.5v2.232h2.256v1.541h-2.256v2.232H19.366z" />
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M17.7,4.4l-1.900001,0.0 0.0,-1.9 -1.2,0.0 0.0,1.9 -1.900001,0.0 0.0,1.2 1.900001,0.0 0.0,1.9 1.2,0.0 0.0,-1.9 1.900001,0.0z"/>
</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus.xml
new file mode 100644
index 0000000..db18fad
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus.xml
@@ -0,0 +1,33 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="17.0dp"
+ android:height="17.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M2.0,9.7l2.0,0.0L4.0,11.0L0.4,11.0L0.4,2.5L2.0,2.5L2.0,9.7z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M8.3,3.8L7.0,3.8L7.0,11.0L5.4,11.0L5.4,3.8L4.0,3.8L4.0,2.5l4.3,0.0L8.3,3.8z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12.4,7.3l-1.7,0.0l0.0,2.4l2.1,0.0L12.799999,11.0L9.0,11.0L9.0,2.5l3.7,0.0l0.0,1.3l-2.1,0.0l0.0,2.1l1.7,0.0L12.4,7.3L12.4,7.3z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M18.4,4.4l-1.9,0.0 0.0,-1.9 -1.2,0.0 0.0,1.9 -1.900001,0.0 0.0,1.2 1.900001,0.0 0.0,1.9 1.2,0.0 0.0,-1.9 1.9,0.0z"/>
+</vector>
diff --git a/packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml b/packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml
index ba5c0aa..a726161 100644
--- a/packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml
+++ b/packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml
@@ -20,7 +20,7 @@
android:id="@+id/date_time_alarm_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:gravity="start"
android:orientation="vertical">
@@ -62,7 +62,8 @@
<com.android.systemui.statusbar.AlphaOptimizedButton
android:id="@+id/alarm_status"
android:layout_width="wrap_content"
- android:layout_height="20dp"
+ android:layout_height="wrap_content"
+ android:minHeight="20dp"
android:paddingTop="3dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_access_alarms_small"
diff --git a/packages/SystemUI/res/layout-television/recents_tv_card_info_field.xml b/packages/SystemUI/res/layout-television/recents_tv_card_info_field.xml
index 20397c3..34cba07 100644
--- a/packages/SystemUI/res/layout-television/recents_tv_card_info_field.xml
+++ b/packages/SystemUI/res/layout-television/recents_tv_card_info_field.xml
@@ -18,8 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/card_info_field"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:showIn="@layout/recents_tv_task_card_view_fallback_banner">
+ android:layout_height="wrap_content">
<ImageView
android:id="@+id/card_extra_badge"
android:layout_width="@dimen/recents_tv_card_extra_badge_size"
@@ -44,4 +43,4 @@
android:paddingStart="@dimen/recents_tv_text_padding_start"
android:layout_marginBottom="@dimen/recents_tv_text_padding_bottom"
android:ellipsize="end"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml
index 1f24ab0..8abfcf6 100644
--- a/packages/SystemUI/res/layout/battery_detail.xml
+++ b/packages/SystemUI/res/layout/battery_detail.xml
@@ -25,7 +25,7 @@
android:id="@+id/charge_and_estimation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="72dp"
+ android:paddingStart="16dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/colorAccent" />
diff --git a/packages/SystemUI/res/layout/calibrate_sliders.xml b/packages/SystemUI/res/layout/calibrate_sliders.xml
deleted file mode 100644
index 0dec8a1..0000000
--- a/packages/SystemUI/res/layout/calibrate_sliders.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:orientation="vertical">
-
- <LinearLayout
- android:id="@+id/r_group"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="4dp"
- android:paddingBottom="4dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/color_modification_r"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <SeekBar android:id="@*android:id/seekbar"
- android:layout_marginStart="16dp"
- android:layout_gravity="center_vertical"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/g_group"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="4dp"
- android:paddingBottom="4dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/color_modification_g"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <SeekBar android:id="@*android:id/seekbar"
- android:layout_marginStart="16dp"
- android:layout_gravity="center_vertical"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/b_group"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="4dp"
- android:paddingBottom="4dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/color_modification_b"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <SeekBar android:id="@*android:id/seekbar"
- android:layout_marginStart="16dp"
- android:layout_gravity="center_vertical"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
- </LinearLayout>
-
-</LinearLayout>
diff --git a/packages/SystemUI/res/layout/night_mode_settings.xml b/packages/SystemUI/res/layout/night_mode_settings.xml
deleted file mode 100644
index 3725e78..0000000
--- a/packages/SystemUI/res/layout/night_mode_settings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <include layout="@layout/switch_bar" />
-
-</LinearLayout>
diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml
index 63390e2..967db26 100644
--- a/packages/SystemUI/res/layout/qs_detail.xml
+++ b/packages/SystemUI/res/layout/qs_detail.xml
@@ -47,11 +47,12 @@
<com.android.systemui.qs.NonInterceptingScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_weight="1"
+ android:fillViewport="true">
<FrameLayout
android:id="@android:id/content"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="match_parent"/>
</com.android.systemui.qs.NonInterceptingScrollView>
<include layout="@layout/qs_detail_buttons" />
diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml
index 8352e30..f809c68 100644
--- a/packages/SystemUI/res/layout/qs_detail_header.xml
+++ b/packages/SystemUI/res/layout/qs_detail_header.xml
@@ -25,20 +25,9 @@
android:background="@drawable/btn_borderless_rect"
android:gravity="center">
- <ImageView
- android:id="@*android:id/up"
- android:layout_width="@dimen/qs_detail_image_width"
- android:layout_height="@dimen/qs_detail_image_height"
- android:layout_marginEnd="@dimen/qs_detail_back_margin_end"
- android:padding="@dimen/qs_detail_image_padding"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@*android:string/action_bar_up_description"
- android:src="?android:attr/homeAsUpIndicator" />
-
<TextView
android:id="@android:id/title"
- android:paddingLeft="@dimen/qs_detail_header_text_padding"
+ android:paddingStart="@dimen/qs_detail_header_text_padding"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
diff --git a/packages/SystemUI/res/layout/qs_detail_items.xml b/packages/SystemUI/res/layout/qs_detail_items.xml
index 0b08a55..9a7e1b6 100644
--- a/packages/SystemUI/res/layout/qs_detail_items.xml
+++ b/packages/SystemUI/res/layout/qs_detail_items.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
<!-- extends FrameLayout -->
-<com.android.systemui.qs.QSDetailItems xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.systemui.qs.QSDetailItems
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:sysui="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -29,26 +30,26 @@
android:layout_height="match_parent"
android:orientation="vertical"
sysui:itemHeight="@dimen/qs_detail_item_height"
- style="@style/AutoSizingList" />
+ style="@style/AutoSizingList"/>
<LinearLayout
android:id="@android:id/empty"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_gravity="center"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
+ android:gravity="center"
+ android:orientation="vertical">
<ImageView
android:id="@android:id/icon"
android:layout_width="56dp"
- android:layout_height="56dp" />
+ android:layout_height="56dp"/>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
- android:textAppearance="@style/TextAppearance.QS.DetailEmpty" />
+ android:textAppearance="@style/TextAppearance.QS.DetailEmpty"/>
</LinearLayout>
</com.android.systemui.qs.QSDetailItems>
diff --git a/packages/SystemUI/res/layout/qs_user_detail_item.xml b/packages/SystemUI/res/layout/qs_user_detail_item.xml
index 58fc069..8c6c7cf 100644
--- a/packages/SystemUI/res/layout/qs_user_detail_item.xml
+++ b/packages/SystemUI/res/layout/qs_user_detail_item.xml
@@ -28,6 +28,7 @@
android:minHeight="112dp"
android:clipChildren="false"
android:clipToPadding="false"
+ android:focusable="true"
android:background="@drawable/ripple_drawable"
systemui:activatedFontFamily="sans-serif-medium">
@@ -65,4 +66,4 @@
android:visibility="gone" />
</LinearLayout>
-</com.android.systemui.qs.tiles.UserDetailItemView>
\ No newline at end of file
+</com.android.systemui.qs.tiles.UserDetailItemView>
diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
index 103e0b0..6673d6e 100644
--- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
@@ -44,6 +44,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
+ android:focusable="true"
android:background="@drawable/ripple_drawable" >
<ImageView android:id="@+id/multi_user_avatar"
android:layout_width="@dimen/multi_user_avatar_expanded_size"
@@ -110,7 +111,7 @@
android:layout_alignParentTop="true"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- android:paddingTop="2dp"
+ android:paddingTop="6dp"
android:visibility="gone"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.EmergencyCallsOnly"
android:text="@*android:string/emergency_calls_only"
@@ -121,7 +122,6 @@
<include
android:id="@+id/date_time_alarm_group"
layout="@layout/status_bar_alarm_group"
- android:layout_marginTop="16dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true" />
diff --git a/packages/SystemUI/res/layout/recents_stack_action_button.xml b/packages/SystemUI/res/layout/recents_stack_action_button.xml
index 43b3de1..541000b 100644
--- a/packages/SystemUI/res/layout/recents_stack_action_button.xml
+++ b/packages/SystemUI/res/layout/recents_stack_action_button.xml
@@ -31,6 +31,6 @@
android:shadowDy="2"
android:shadowRadius="5"
android:fontFamily="sans-serif-medium"
- android:background="?android:selectableItemBackground"
+ android:background="@drawable/recents_stack_action_background"
android:visibility="invisible"
android:forceHasOverlappingRendering="false" />
diff --git a/packages/SystemUI/res/layout/status_bar_alarm_group.xml b/packages/SystemUI/res/layout/status_bar_alarm_group.xml
index f94b727..701b621 100644
--- a/packages/SystemUI/res/layout/status_bar_alarm_group.xml
+++ b/packages/SystemUI/res/layout/status_bar_alarm_group.xml
@@ -20,7 +20,7 @@
android:id="@+id/date_time_alarm_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:gravity="start"
android:orientation="vertical">
@@ -60,7 +60,8 @@
<com.android.systemui.statusbar.AlphaOptimizedButton
android:id="@+id/alarm_status"
android:layout_width="wrap_content"
- android:layout_height="20dp"
+ android:layout_height="wrap_content"
+ android:minHeight="20dp"
android:paddingTop="3dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_access_alarms_small"
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index 68395cd..4cd635e 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -48,6 +48,7 @@
android:clickable="true"
android:soundEffectsEnabled="false"
android:src="@drawable/ic_volume_collapse_animation"
+ android:background="@drawable/ripple_drawable"
tools:ignore="RtlHardcoded"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml
index a30fc43..95019b8 100644
--- a/packages/SystemUI/res/layout/volume_dialog_row.xml
+++ b/packages/SystemUI/res/layout/volume_dialog_row.xml
@@ -22,7 +22,8 @@
android:id="@+id/volume_dialog_row"
android:paddingEnd="@dimen/volume_dialog_padding_end"
android:orientation="vertical"
- android:paddingBottom="@dimen/volume_row_padding_bottom" >
+ android:paddingBottom="@dimen/volume_row_padding_bottom"
+ android:animateLayoutChanges="true">
<TextView
android:id="@+id/volume_row_header"
diff --git a/packages/SystemUI/res/values-af/config.xml b/packages/SystemUI/res/values-af/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-af/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index d9138ef..126d636 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Swerwing"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Instellings"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Oorsig."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Maak toe"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Gebruiker <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi afgeskakel."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi aangeskakel."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g>-limiet"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> waarskuwing"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Werkmodus"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Aandbeligting"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Aandbeligting is aan, tik om af te skakel"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Aandbeligting is af, tik om aan te skakel"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Geen onlangse items nie"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Jy het alles toegemaak"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Programinligting"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> is die volumedialoog"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tik om die oorspronklike terug te stel."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Jy gebruik tans jou werkprofiel"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Bel"</item>
+ <item msgid="5997713001067658559">"Stelsel"</item>
+ <item msgid="7858983209929864160">"Laat toestel lui"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Wekker"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tik om te ontdemp."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tik om op vibreer te stel. Toeganklikheidsdienste kan dalk gedemp wees."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tik om te demp. Toeganklikheidsdienste kan dalk gedemp wees."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Meer instellings"</string>
<string name="notification_done" msgid="5279426047273930175">"Klaar"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g>-kennisgewingkontroles"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Kleur en voorkoms"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nagmodus"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibreer skerm"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aan"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Af"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Skakel outomaties aan"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Skakel oor na Nagmodus soos gepas vir ligging en tyd van die dag"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Wanneer Nagmodus aan is"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Gebruik donkertema vir Android-bedryfstelsel"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Verstel tint"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Verstel helderheid"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Die donkertema word toegepas op kernareas van Android-bedryfstelsel wat gewoonlik in \'n ligtema gewys word, soos instellings."</string>
- <string name="color_apply" msgid="9212602012641034283">"Pas toe"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Bevestig instellings"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Sommige kleurinstellings kan hierdie toestel onbruikbaar maak. Klik OK om hierdie kleurinstellings te bevestig; andersins sal hierdie instellings ná 10 sekondes teruggestel word."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Batterygebruik"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterybespaarder is nie beskikbaar wanneer gelaai word nie"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterybespaarder"</string>
diff --git a/packages/SystemUI/res/values-am/config.xml b/packages/SystemUI/res/values-am/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-am/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 69d6642..3a4c1d1 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"ኤል ቲ ኢ"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ውሂብን በማዛወር ላይ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ቅንብሮች"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"አጠቃላይ እይታ።"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"ዝጋ"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ተጠቃሚ <xliff:g id="USER">%s</xliff:g>።"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>።"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi ጠፍቷል።"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi በርቷል።"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ገደብ"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"የ<xliff:g id="DATA_LIMIT">%s</xliff:g> ማስጠንቀቂያ"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"የሥራ ሁነታ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"የምሽት ብርሃን"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"የምሽት ብርሃን በርቷል፣ ለማጥፋት መታ ያድርጉ"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"የምሽት ብርሃን ጠፍቷል፣ ለማብራት መታ ያድርጉ"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ምንም የቅርብ ጊዜ ንጥሎች የሉም"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ሁሉንም ነገር አጽድተዋል"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"የመተግበሪያ መረጃ"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> የድምጽ መጠን መገናኛው ነው"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"የመጀመሪያውን ወደነበረበት ለመመለስ መታ ያድርጉ።"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"የስራ መገለጫዎን እየተጠቀሙ ነው"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ደውል"</item>
+ <item msgid="5997713001067658559">"ሥርዓት"</item>
+ <item msgid="7858983209929864160">"ጥሪ"</item>
+ <item msgid="1850038478268896762">"ማህደረመረጃ"</item>
+ <item msgid="8265110906352372092">"ማንቂያ"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ብሉቱዝ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s። ድምጸ-ከል ለማድረግ መታ ያድርጉ"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s። ወደ ንዝረት ለማቀናበር መታ ያድርጉ። የተደራሽነት አገልግሎቶች ድምጸ-ከል ሊደረግባቸው ይችላል።"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s። ድምጸ-ከል ለማድረግ መታ ያድርጉ። የተደራሽነት አገልግሎቶች ድምጸ-ከል ሊደረግባቸው ይችላል።"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"ተጨማሪ ቅንብሮች"</string>
<string name="notification_done" msgid="5279426047273930175">"ተከናውኗል"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> ማሳወቂያ ቁጥጥሮች"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"ቀለም እና መልክ"</string>
- <string name="night_mode" msgid="3540405868248625488">"የሌሊት ሁነታ"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ማሳያን ይለኩ"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"በርቷል"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ጠፍቷል"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"በራስ-ሰር አብራ"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ለአካባቢው እና ለሰዓቱ ተገቢ በሆነ መልኩ ወደ የማታ ሁነታ ለውጥ"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"የማታ ሁነታ ሲበራ"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"ለAndroid ስርዓተ ክወና ጨለማ ገጽታን ተጠቀም"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ቅልም አስተካክል"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ብሩህነት አስተካክል"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ጨለማ ገጽታው እንደ ቅንብሮች ያሉ በመደበኛነት በብርሃን ገጽታ በሚታዩ የAndroid ስርዓተ ክወና ዋና ክፍሎች ላይ ይተገበራል።"</string>
- <string name="color_apply" msgid="9212602012641034283">"ተግብር"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ቅንብሮችን ያረጋግጡ"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"አንዳንድ የቀለም ቅንብሮች ይህን መሣሪያ የማይጠቅም ሊያደርጉት ይችላሉ። እነዚህን የቀለም ቅንብሮች ለማረጋገጥ እሺ የሚለውን ጠቅ ያድርጉ፣ አለበለዚያ እነዚህ ቅንብሮች ከ10 ሰከንዶች በኋላ ዳግም ይጀምራሉ።"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"የባትሪ አጠቃቀም"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ኃይል በሚሞላበት ጊዜ ባትሪ ቆጣቢ አይገኝም"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ባትሪ ቆጣቢ"</string>
diff --git a/packages/SystemUI/res/values-ar/config.xml b/packages/SystemUI/res/values-ar/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ar/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index d7962de..ce52115 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -147,7 +147,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"شبكة الجيل الثالث"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"شبكة 3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"شبكة الجيل الرابع"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"شبكة الجيل الرابع أو أحدث"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"تجوال"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"الإعدادات"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"النظرة عامة."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"إغلاق"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"المستخدم <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"تم إيقاف Wifi."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"تم تشغيل Wifi."</string>
@@ -325,6 +326,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"قيد <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"تحذير <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"وضع العمل"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"إضاءة ليلية"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"الإضاءة الليلية قيد العمل، انقر لإيقافها."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"الإضاءة الليلية قيد الإيقاف، انقر لتشغيلها."</string>
<string name="recents_empty_message" msgid="808480104164008572">"ليست هناك عناصر تم استخدامها مؤخرًا"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"لقد محوتَ كل شيء"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"معلومات التطبيق"</string>
@@ -442,6 +446,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> هو مربع حوار مستوى الصوت"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"انقر لاستعادة النسخة الأصلية."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"أنت تستخدم ملفك الشخصي للعمل"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"الاتصال"</item>
+ <item msgid="5997713001067658559">"النظام"</item>
+ <item msgid="7858983209929864160">"الرنين"</item>
+ <item msgid="1850038478268896762">"الوسائط"</item>
+ <item msgid="8265110906352372092">"المنبه"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"البلوتوث"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. انقر لإلغاء التجاهل."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. انقر للتعيين على الاهتزاز. قد يتم تجاهل خدمات إمكانية الوصول."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. انقر للتجاهل. قد يتم تجاهل خدمات إمكانية الوصول."</string>
@@ -512,21 +528,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"المزيد من الإعدادات"</string>
<string name="notification_done" msgid="5279426047273930175">"تم"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"عناصر التحكم في إشعارات <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"اللون والمظهر"</string>
- <string name="night_mode" msgid="3540405868248625488">"الوضع الليلي"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"معايرة الشاشة"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"تشغيل"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"إيقاف"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"التشغيل تلقائيًا"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"التبديل إلى الوضع الليلي بما يتناسب مع الموقع والوقت من اليوم"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"عند تشغيل الوضع الليلي"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"استخدام مظهر معتم لنظام التشغيل Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ضبط التلوين الخفيف"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ضبط السطوع"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"يتم تطبيق المظهر المعتم على المناطق الأساسية في نظام التشغيل Android والتي يتم عرضها عادة في مظهر مضيء، مثل الإعدادات."</string>
- <string name="color_apply" msgid="9212602012641034283">"تطبيق"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"تأكيد الإعدادات"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"يمكن أن تتسبب بعض إعدادات الألوان في تعطيل إمكانية استخدام الجهاز. يمكنك النقر على \"موافق\" لتأكيد إعدادات الألوان هذه، وإلا فستتم إعادة تعيين هذه الإعدادات بعد ۱۰ ثوانٍ."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"استخدام البطارية"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"وضع توفير شحن البطارية غير متاح أثناء الشحن."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"توفير شحن البطارية"</string>
diff --git a/packages/SystemUI/res/values-az-rAZ/config.xml b/packages/SystemUI/res/values-az-rAZ/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-az-rAZ/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml
index acb58ce..34f743c 100644
--- a/packages/SystemUI/res/values-az-rAZ/strings.xml
+++ b/packages/SystemUI/res/values-az-rAZ/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Rominq"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Ayarlar"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"İcmal"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Qapadın"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"İstifadəçi <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi deaktivdir."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi aktivdir."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> xəbərdarlığı"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"İş rejimi"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Gecə işığı"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Gecə işığı aktivdir, deaktiv etmək üçün tıklayın"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Gecə işığı deaktivdir, aktiv etmək üçün tıklayın"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Son elementlər yoxdur"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Hərşeyi təmizlədiniz"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Tətbiq haqqında"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> proqramı səs səviyyəsi dialoqudur"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Orijinalı bərpa etmək üçün tıklayın."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"İş profilinizi istifadə edirsiniz"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Çağrı"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Zəng"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Siqnal"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Səsli etmək üçün tıklayın."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Vibrasiyanı ayarlamaq üçün tıklayın. Əlçatımlılıq xidmətləri səssiz edilmiş ola bilər."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Səssiz etmək üçün tıklayın. Əlçatımlılıq xidmətləri səssiz edilmiş ola bilər."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Daha çox ayar"</string>
<string name="notification_done" msgid="5279426047273930175">"Hazırdır"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> bildiriş nəzarəti"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Rəng və görünüş"</string>
- <string name="night_mode" msgid="3540405868248625488">"Gecə rejimi"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Ekranı kalibrləyin"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aktiv"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Deaktiv"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Avtomatik aktivləşdirin"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Məkana və günün vaxtına uyğun olaraq Gecə Rejiminə keçin"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Gecə Rejimi aktiv olduqda"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS üçün tünd tema istifadə edin"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Çaları nizamlayın"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Parlaqlığı nizamlayın"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tünd tema Android sisteminin adətən açıq tonda göstərilən əsas elementlərinə (məsələn, \"Ayarlar\") tətbiq edilir."</string>
- <string name="color_apply" msgid="9212602012641034283">"Tətbiq edin"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Ayarları təsdiq edin"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Bəzi renk ayarları bu cihazı yararsız edə bilər. Bu rənk ayarlarını təsdiq etmək üçün OK basın, əks halda bu ayarlar 10 saniyə sonra sıfırlanacaq."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Batareya istifadəsi"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Enerji Qənaəti doldurulma zamanı əlçatan deyil"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Enerji Qənaəti"</string>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/config.xml b/packages/SystemUI/res/values-b+sr+Latn/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-b+sr+Latn/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
index f944e4b..6ee38e8 100644
--- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
@@ -144,7 +144,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -184,7 +186,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Podešavanja"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Pregled."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zatvori"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Korisnik: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi je isključen."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi je uključen."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje od <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje za <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Režim rada"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Noćno svetlo"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Noćno svetlo je uključeno, dodirnite da biste ga isključili"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Noćno svetlo je isključeno, dodirnite da biste ga uključili"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nema nedavnih stavki"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Obrisali ste sve"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> je dijalog za jačinu zvuka"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Dodirnite da biste vratili original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Koristite profil za Work"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Pozovi"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Prsten"</item>
+ <item msgid="1850038478268896762">"Medijumi"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Dodirnite da biste uključili zvuk."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Dodirnite da biste podesili na vibraciju. Zvuk usluga pristupačnosti će možda biti isključen."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Dodirnite da biste isključili zvuk. Zvuk usluga pristupačnosti će možda biti isključen."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Još podešavanja"</string>
<string name="notification_done" msgid="5279426047273930175">"Gotovo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrole obaveštenja za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Boja i izgled"</string>
- <string name="night_mode" msgid="3540405868248625488">"Noćni režim"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrišite ekran"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Uključeno"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Isključeno"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Automatski uključi"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Pređite na noćni režim u zavisnosti od lokacije i doba dana"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kada je noćni režim uključen"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Koristi tamnu temu za Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Prilagodi senku"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Prilagodi osvetljenost"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tamna tema se primenjuje na ključne delove Android OS-a koji se obično prikazuju u svetloj temi, poput Podešavanja."</string>
- <string name="color_apply" msgid="9212602012641034283">"Primeni"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Potvrdite podešavanja"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Neka podešavanja boja mogu da učine uređaj neupotrebljivim. Kliknite na Potvrdi da biste potvrdili ova podešavanja boja, pošto će se u suprotnom ova podešavanja resetovati nakon 10 sekundi."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Potrošnja baterije"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ušteda baterije nije dostupna tokom punjenja"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Ušteda baterije"</string>
diff --git a/packages/SystemUI/res/values-be-rBY/config.xml b/packages/SystemUI/res/values-be-rBY/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-be-rBY/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-be-rBY/strings.xml b/packages/SystemUI/res/values-be-rBY/strings.xml
index 12ba0cd..15a3119 100644
--- a/packages/SystemUI/res/values-be-rBY/strings.xml
+++ b/packages/SystemUI/res/values-be-rBY/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роўмінг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Налады"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Агляд."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Закрыць"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Карыстальнік: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi выключаны."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi уключаны."</string>
@@ -323,6 +324,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ліміт <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Папярэджанне: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Рэжым працы"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Начная падсветка"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"\"Начная падсветка\" ўключана; дакраніцеся, каб выключыць"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"\"Начная падсветка\" выключана; дакраніцеся, каб уключыць"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Няма нядаўніх элементаў"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Вы ачысцілі усё"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Звесткі аб праграме"</string>
@@ -350,8 +354,7 @@
<string name="zen_silence_introduction" msgid="3137882381093271568">"Гэта заблакіруе ЎСЕ гукі і вібрацыі, у тым ліку ад будзільнікаў, музыкі, відэа і гульняў."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Менш тэрміновыя апавяшчэнні ніжэй"</string>
- <!-- no translation found for notification_tap_again (7590196980943943842) -->
- <skip />
+ <string name="notification_tap_again" msgid="7590196980943943842">"Дакраніцеся яшчэ раз, каб адкрыць"</string>
<string name="keyguard_unlock" msgid="8043466894212841998">"Правядзіце пальцам уверх, каб разблакіраваць"</string>
<string name="phone_hint" msgid="4872890986869209950">"Тэлефон: правядзіце пальцам ад значка"</string>
<string name="voice_hint" msgid="8939888732119726665">"Галасавая дапамога: правядзіце пальцам ад значка"</string>
@@ -441,6 +444,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> з\'яўляецца дыялогам гучнасці"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Дакраніцеся, каб аднавіць арыгінал."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Вы выкарыстоўваеце свой працоўны профіль"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Выклік"</item>
+ <item msgid="5997713001067658559">"Сістэма"</item>
+ <item msgid="7858983209929864160">"Званок"</item>
+ <item msgid="1850038478268896762">"Медыя"</item>
+ <item msgid="8265110906352372092">"Будзільнік"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Дакраніцеся, каб уключыць гук."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Дакраніцеся, каб уключыць вібрацыю. Можа быць адключаны гук службаў спецыяльных магчымасцей."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Дакраніцеся, каб адключыць гук. Можа быць адключаны гук службаў спецыяльных магчымасцей."</string>
@@ -511,21 +526,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Дадатковыя налады"</string>
<string name="notification_done" msgid="5279426047273930175">"Гатова"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Элементы кантролю апавяшчэнняў <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Колер і выгляд"</string>
- <string name="night_mode" msgid="3540405868248625488">"Начны рэжым"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Каліброўка дысплэя"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Уключана"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Выключана"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Уключаць аўтаматычна"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Пераключэнне ў начны рэжым у залежнасці ад канкрэтнай мясцовасці і часу сутак"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Калі ўключаны Начны рэжым"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Выкарыстоўваць цёмную тэму для АС Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Рэгуляванне адценняў"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Рэгуляванне яркасці"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Цёмная тэма ўжываецца да асноўных вобласцяў АС Android, да якіх звычайна шжываецца светлая тэма, напрыклад, Налады."</string>
- <string name="color_apply" msgid="9212602012641034283">"Ужыць"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Пацвердзіце налады"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Некаторыя налады колеру могуць зрабіць гэту прыладу непрыдатнай для выкарыстання. Націсніце кнопку «ОК», каб пацвердзіць гэтыя налады колеру, у адваротным выпадку гэтыя налады будуць скінуты праз 10 секунд."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Выкарыстанне зараду"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Эканомія зараду акумулятара недаступная падчас зарадкі"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Эканомія зараду"</string>
diff --git a/packages/SystemUI/res/values-bg/config.xml b/packages/SystemUI/res/values-bg/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-bg/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index 8d7e8da..6939f06 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роуминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Настройки"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Общ преглед."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Затваряне"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Потребител: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Функцията за Wi-Fi се изключи."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Функцията за Wi-Fi се включи."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничение от <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Работен режим"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Нощно осветление"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Функцията за нощно осветление е включена. Докоснете, за да я изключите"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Функцията за нощно осветление е изключена. Докоснете, за да я включите"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Няма скорошни елементи"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Изчистихте всичко"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Информация за приложението"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> изпълнява ролята на диалоговия прозорец за силата на звука"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Докоснете, за да се възстанови първоначалната стойност."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Използвате служебния си потребителски профил"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Обаждане"</item>
+ <item msgid="5997713001067658559">"Система"</item>
+ <item msgid="7858983209929864160">"Позвъняване"</item>
+ <item msgid="1850038478268896762">"Мултимедия"</item>
+ <item msgid="8265110906352372092">"Будилник"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Докоснете, за да включите отново звука."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Докоснете, за да зададете вибриране. Възможно е звукът на услугите за достъпност да бъде заглушен."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Докоснете, за да заглушите звука. Възможно е звукът на услугите за достъпност да бъде заглушен."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Още настройки"</string>
<string name="notification_done" msgid="5279426047273930175">"Готово"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Контроли за известията от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Цвят и облик"</string>
- <string name="night_mode" msgid="3540405868248625488">"Нощен режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Калибриране на дисплея"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Вкл."</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Изкл."</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Автоматично включване"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Превключване към нощен режим според местоположението и часа от денонощието"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"При включен нощен режим"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Ползв. на тъмната тема за опер. с-ма Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Коригиране на нюансирането"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Коригиране на яркостта"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Тъмната тема се прилага към основните области на операционната система Android, които обикновено се показват със светла тема, като например настройките."</string>
- <string name="color_apply" msgid="9212602012641034283">"Прилагане"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Потвърждаване на настройките"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Някои настройки за цветовете могат да направят това устройство неизползваемо. За да ги потвърдите, кликнете върху „OK“. В противен случай те ще бъдат нулирани след 10 секунди."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Ползв. на батерията"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режимът за запазване на батерията не е налице при зареждане"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим за запазване на батерията"</string>
diff --git a/packages/SystemUI/res/values-bn-rBD/config.xml b/packages/SystemUI/res/values-bn-rBD/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-bn-rBD/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml
index e32fb06..c074c31 100644
--- a/packages/SystemUI/res/values-bn-rBD/strings.xml
+++ b/packages/SystemUI/res/values-bn-rBD/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"রোমিং"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"সেটিংস"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"এক নজরে৷"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"বন্ধ করুন"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ব্যবহারকারী <xliff:g id="USER">%s</xliff:g>৷"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>।"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"WiFi বন্ধ হয়েছে।"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"WiFi চালু হয়েছে।"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"সীমা <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> সতর্কতা"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"কাজের মোড"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"নাইট লাইট"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"নাইট লাইট চালু আছে, বন্ধ করতে আলতো চাপুন"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"নাইট লাইট বন্ধ আছে, চালু করতে আলতো চাপুন"</string>
<string name="recents_empty_message" msgid="808480104164008572">"কোনো সাম্প্রতিক আইটেম নেই"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"আপনি সবকিছু সাফ করেছেন"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"অ্যাপ্লিকেশানের তথ্য"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> হল ভলিউম ডায়লগ"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"আসলটি পুনঃস্থাপন করতে আলতো চাপ দিন৷"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"আপনি আপনার কাজের প্রোফাইল ব্যবহার করছেন"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"কল করুন"</item>
+ <item msgid="5997713001067658559">"সিস্টেম"</item>
+ <item msgid="7858983209929864160">"রিং"</item>
+ <item msgid="1850038478268896762">"মিডিয়া"</item>
+ <item msgid="8265110906352372092">"অ্যালার্ম"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ব্লুটুথ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s। সশব্দ করতে আলতো চাপুন।"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s। কম্পন এ সেট করতে আলতো চাপুন। অ্যাক্সেসযোগ্যতার পরিষেবাগুলিকে নিঃশব্দ করা হতে পারে।"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s। নিঃশব্দ করতে আলতো চাপুন। অ্যাক্সেসযোগ্যতার পরিষেবাগুলিকে নিঃশব্দ করা হতে পারে।"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"আরো সেটিংস"</string>
<string name="notification_done" msgid="5279426047273930175">"সম্পন্ন"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> বিজ্ঞপ্তির নিয়ন্ত্রণগুলি"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"রঙ এবং চেহারা"</string>
- <string name="night_mode" msgid="3540405868248625488">"রাতের মোড"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"প্রদর্শন ক্যালিব্রেট করুন"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"চালু আছে"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"বন্ধ আছে"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"স্বয়ংক্রিয়ভাবে চালু করুন"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"অবস্থান এবং সময়ের হিসাবে উপযুক্ত রাতের মোডে পাল্টান"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"যখন রাতের মোড চালু থাকবে"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS এর জন্য গাঢ় থিম ব্যবহার করুন"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"টিন্ট সমন্বয় করুন"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"উজ্জ্বলতা সমন্বয় করুন"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Android OS এর মূল অংশগুলিতে গাঢ় থিম প্রয়োগ করা হয়েছে যেটা সাধারণত একটি হালকা থিমে প্রদর্শিত হয়, যেমন সেটিংস৷"</string>
- <string name="color_apply" msgid="9212602012641034283">"প্রয়োগ করুন"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"সেটিংস নিশ্চিত করুন"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"কিছু রঙের সেটিংস এই ডিভাইসকে ব্যবহারের অযোগ্য করে দিতে পারে৷ এই রঙের সেটিংস নিশ্চিত করতে ঠিক আছে এ ক্লিক করুন, অন্যথায় ১০ সেকেন্ড পরে এই সেটিংস পুনরায় সেট হবে৷"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ব্যাটারির ব্যবহার"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"চার্জ করার সময় ব্যাটারি সেভার উপলব্ধ নয়"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ব্যাটারি সেভার"</string>
diff --git a/packages/SystemUI/res/values-bs-rBA/config.xml b/packages/SystemUI/res/values-bs-rBA/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-bs-rBA/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml
index c0b8985..c12aa13 100644
--- a/packages/SystemUI/res/values-bs-rBA/strings.xml
+++ b/packages/SystemUI/res/values-bs-rBA/strings.xml
@@ -144,7 +144,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -184,7 +186,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Postavke"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Pregled."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zatvori"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Korisnik <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi je isključen."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi je uključen."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Poslovni režim"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Noćno svjetlo"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Noćno svjetlo je uključeno, dodirnite da isključite"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Noćno svjetlo je isključeno, dodirnite da uključite"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nema nedavnih stavki"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Sve ste obrisali"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string>
@@ -346,8 +350,7 @@
<string name="zen_silence_introduction" msgid="3137882381093271568">"Ovim se blokiraju SVI zvukovi i vibracije, uključujući alarme, muziku, video zapise i igre."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Prikaži manje važna obavještenja ispod"</string>
- <!-- no translation found for notification_tap_again (7590196980943943842) -->
- <skip />
+ <string name="notification_tap_again" msgid="7590196980943943842">"Dodirnite ponovo da otvorite"</string>
<string name="keyguard_unlock" msgid="8043466894212841998">"Prevucite prema gore da otključate"</string>
<string name="phone_hint" msgid="4872890986869209950">"Prevucite preko ikone da otvorite telefon"</string>
<string name="voice_hint" msgid="8939888732119726665">"Prevucite preko ikone za glasovnu pomoć"</string>
@@ -437,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> je dijaloški okvir za jačinu zvuka"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Dodirnite za povrat originala."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Koristite svoj profil za posao"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Pozovi"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Zazvoni"</item>
+ <item msgid="1850038478268896762">"Mediji"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<!-- String.format failed for translation -->
<!-- no translation found for volume_stream_content_description_unmute (4436631538779230857) -->
<skip />
@@ -509,21 +524,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string>
<string name="notification_done" msgid="5279426047273930175">"Gotovo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrole <xliff:g id="APP_NAME">%1$s</xliff:g> obavještenja"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Boja i izgled"</string>
- <string name="night_mode" msgid="3540405868248625488">"Noćni način rada"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibracija zaslona"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Uključeno"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Isključeno"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Automatsko uključivanje"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Prebaciti u Noćni način rada u skladu sa lokacijom i dobom dana"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kada je Noćni režim rada uključen"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Koristiti tamne teme za OS Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Prilagođavanje nijanse"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Podešavanje osvijetljenosti"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tamna tema se primjenjuje na ključna područja OS Android koja se obično prikazuju u svijetloj temi, kao što je meni Postavke."</string>
- <string name="color_apply" msgid="9212602012641034283">"Prihvati"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Potvrdi postavke"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"S nekim postavkama boja ovaj uređaj može biti neupotrebljiv. Kliknite U redu da biste potvrdili ove postavke boja ili sačekajte 10 sekundi da se postavke vrate na početnu vrijednost."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Upotreba baterije"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ušteda baterije je isključena prilikom punjenja"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Ušteda baterije"</string>
diff --git a/packages/SystemUI/res/values-ca/config.xml b/packages/SystemUI/res/values-ca/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ca/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 789fdc3..3720a89 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Itinerància"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Vora"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Configuració"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Visió general"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Tanca"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuari <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"La xarxa Wi-Fi està desactivada."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"La xarxa Wi-Fi està activada."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertiment: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode de feina"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Llum nocturna"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"La llum nocturna està encesa; toca aquí per apagar-la"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"La llum nocturna està apagada; toca aquí per encendre-la"</string>
<string name="recents_empty_message" msgid="808480104164008572">"No hi ha cap element recent"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Ho has esborrat tot"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informació de l\'aplicació"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> és el diàleg de volum"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Toca la notificació per restaurar el valor original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Estàs utilitzant el perfil professional"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Truca"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Fes sonar"</item>
+ <item msgid="1850038478268896762">"Multimèdia"</item>
+ <item msgid="8265110906352372092">"Alarma"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Toca per activar el so."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Toca per activar la vibració. Pot ser que els serveis d\'accessibilitat se silenciïn."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Toca per silenciar el so. Pot ser que els serveis d\'accessibilitat se silenciïn."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Més opcions"</string>
<string name="notification_done" msgid="5279426047273930175">"Fet"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controls de notificació de l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Color i aparença"</string>
- <string name="night_mode" msgid="3540405868248625488">"Mode nocturn"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibra la pantalla"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Activat"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desactivat"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activa automàticament"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Canvia al mode nocturn d\'acord amb la ubicació i l\'hora del dia"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Quan el mode nocturn estigui activat"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Fes servir un tema fosc per a Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajusta el color"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajusta la brillantor"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"El tema fosc s\'aplica a les àrees clau d\'Android OS que normalment es mostren amb un tema clar, com ara Configuració."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplica"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirma la configuració"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algunes opcions de configuració de color poden deixar el dispositiu inservible. Fes clic a D\'acord per confirmar la configuració de color; en cas contrari, la configuració es restablirà al cap de 10 segons."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Ús de la bateria"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"La funció Estalvi de bateria no està disponible durant la càrrega"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Estalvi de bateria"</string>
diff --git a/packages/SystemUI/res/values-cs/config.xml b/packages/SystemUI/res/values-cs/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-cs/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 68ce2cb..850c264 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Nastavení"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Přehled"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zavřít"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Uživatel <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Připojení Wi-Fi je vypnuto."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Připojení Wi-Fi je zapnuto."</string>
@@ -323,6 +324,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozornění při <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Pracovní režim"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Noční režim"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Noční režim je zapnut, klepnutím jej vypnete"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Noční režim je vypnut, klepnutím jej zapnete"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Žádné nedávné položky"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vše je vymazáno"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informace o aplikaci"</string>
@@ -440,6 +444,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> je dialog hlasitosti"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Klepnutím obnovíte původní nastavení."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Používáte pracovní profil"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Hovor"</item>
+ <item msgid="5997713001067658559">"Systém"</item>
+ <item msgid="7858983209929864160">"Prozvonit"</item>
+ <item msgid="1850038478268896762">"Média"</item>
+ <item msgid="8265110906352372092">"Budík"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Klepnutím zapnete zvuk."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Klepnutím aktivujete režim vibrací. Služby přístupnosti mohou být ztlumeny."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Klepnutím vypnete zvuk. Služby přístupnosti mohou být ztlumeny."</string>
@@ -510,21 +526,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Další nastavení"</string>
<string name="notification_done" msgid="5279426047273930175">"Hotovo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Nastavení oznámení aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Barva a vzhled"</string>
- <string name="night_mode" msgid="3540405868248625488">"Noční režim"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrovat displej"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Zapnuto"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Vypnuto"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Zapnout automaticky"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Přejít do nočního režimu automaticky na základě místa a denní doby"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Když je noční režim zapnutý"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Použít v systému Android tmavý motiv"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Upravit tónování"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Upravit jas"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"V hlavních oblastech systému Android, které jsou běžně zobrazovány ve světlém motivu (například Nastavení), se použije tmavý motiv."</string>
- <string name="color_apply" msgid="9212602012641034283">"Použít"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Ověření nastavení"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Některá nastavení barev mohou způsobit, že zařízení nebude použitelné. Kliknutím na OK toto nastavení barev potvrdíte, v opačném případě se nastavení po 10 sekundách resetuje."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Využití baterie"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Spořič baterie při nabíjení není k dispozici."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Spořič baterie"</string>
diff --git a/packages/SystemUI/res/values-da/config.xml b/packages/SystemUI/res/values-da/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-da/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index 603d1e0..0415c08 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"Over 4G"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Indstillinger"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Oversigt."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Luk"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Bruger <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi er slået fra."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi er slået til."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Grænse: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advarsel ved <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbejdstilstand"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nattelys"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nattelys er tændt. Tryk for at slukke"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nattelys er slukket. Tryk for at tænde"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Ingen nye elementer"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du har ryddet alt"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Oplysninger om applikationen"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> er dialogboksen for lydstyrke"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tryk for at gendanne det oprindelige."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Du bruger din arbejdsprofil"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Opkald"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Ring"</item>
+ <item msgid="1850038478268896762">"Medier"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tryk for at slå lyden til."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tryk for at konfigurere til at vibrere. Tilgængelighedstjenester kan blive deaktiveret."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tryk for at slå lyden fra. Lyden i tilgængelighedstjenester kan blive slået fra."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Flere indstillinger"</string>
<string name="notification_done" msgid="5279426047273930175">"Færdig"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrolelementer til underretninger for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Farve og udseende"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nattilstand"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrer skærmen"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Til"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Fra"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Slå automatisk til"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Skift til natfunktion alt efter stedet og tidspunktet"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Når natfunktion er slået til"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Brug mørkt tema til Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Juster farvetonen"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Juster lysstyrken"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Det mørke tema anvendes på centrale områder i Android OS, der normalt vises med lyst tema, f.eks. Indstillinger."</string>
- <string name="color_apply" msgid="9212602012641034283">"Anvend"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Bekræft indstillingerne"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Nogle farveindstillinger kan medføre, at du ikke kan bruge enheden. Klik på OK for at bekræfte disse farveindstillinger. Ellers nulstilles disse indstillinger efter ti sekunder."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Batteriforbrug"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterisparefunktionen er ikke tilgængelig under opladning"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterisparefunktion"</string>
diff --git a/packages/SystemUI/res/values-de/config.xml b/packages/SystemUI/res/values-de/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-de/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 47040db..9dfda70 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Einstellungen"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Übersicht"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Schließen"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Nutzer: <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"WLAN ist deaktiviert."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"WLAN ist aktiviert."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> Datenlimit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Warnung für <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbeitsmodus"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nachtlicht"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nachtlicht an, zum Deaktivieren tippen"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nachtlicht aus, zum Aktivieren tippen"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Keine kürzlich verwendeten Elemente"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du hast alles gelöscht"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"App-Info"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> regelt die Lautstärke."</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tippe, um das Original wiederherzustellen."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Du verwendest dein Arbeitsprofil."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Anruf"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Klingeln lassen"</item>
+ <item msgid="1850038478268896762">"Medien"</item>
+ <item msgid="8265110906352372092">"Wecker"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Zum Aufheben der Stummschaltung tippen."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tippen, um Vibrieren festzulegen. Bedienungshilfen werden unter Umständen stummgeschaltet."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Zum Stummschalten tippen. Bedienungshilfen werden unter Umständen stummgeschaltet."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Weitere Einstellungen"</string>
<string name="notification_done" msgid="5279426047273930175">"Fertig"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g>-Benachrichtigungseinstellungen"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Farbe und Darstellung"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nachtmodus"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Bildschirm kalibrieren"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"An"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Aus"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Automatisch aktivieren"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Abhängig von Standort und Tageszeit in den Nachtmodus wechseln"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Bei aktiviertem Nachtmodus"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Dunkles Design unter Android OS verwenden"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Farbton anpassen"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Helligkeit anpassen"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Das dunkle Design wird unter Android OS in allen Hauptbereichen übernommen, die normalerweise hell dargestellt werden, wie beispielsweise Einstellungen."</string>
- <string name="color_apply" msgid="9212602012641034283">"Übernehmen"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Einstellungen bestätigen"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Einige Farbeinstellungen können dazu führen, dass das Gerät nicht mehr genutzt werden kann. Klicke auf \"OK\", um diese Farbeinstellungen zu bestätigen. Anderenfalls werden diese Einstellungen in 10 Sekunden zurückgesetzt."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Akkunutzung"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Der Energiesparmodus ist beim Aufladen nicht verfügbar."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Energiesparmodus"</string>
diff --git a/packages/SystemUI/res/values-el/config.xml b/packages/SystemUI/res/values-el/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-el/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 0c3c6ff..3b66b59 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Περιαγωγή"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Ρυθμίσεις"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Επισκόπηση."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Κλείσιμο"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Χρήστης <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Το Wi-fi απενεργοποιήθηκε."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Το Wi-fi ενεργοποιήθηκε."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Όριο <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Προειδοποίηση για <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Λειτουργία εργασίας"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Νυχτερινός φωτισμός"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Ο Νυχτερινός φωτισμός είναι ενεργοποιημένος. Πατήστε για απενεργοποίηση."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Ο Νυχτερινός φωτισμός είναι απενεργοποιημένος. Πατήστε για ενεργοποίηση."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Δεν υπάρχουν πρόσφατα στοιχεία"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Έχει γίνει εκκαθάριση όλων των στοιχείων"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Πληροφορίες εφαρμογής"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> αποτελεί το παράθυρο διαλόγου ελέγχου έντασης"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Πατήστε για να επαναφέρετε την αρχική μορφή της εικόνας."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Χρησιμοποιείτε το προφίλ εργασίας σας"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Κλήση"</item>
+ <item msgid="5997713001067658559">"Σύστημα"</item>
+ <item msgid="7858983209929864160">"Ήχος κλήσης"</item>
+ <item msgid="1850038478268896762">"Μέσα"</item>
+ <item msgid="8265110906352372092">"Ξυπνητήρι"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Πατήστε για κατάργηση σίγασης."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Πατήστε για ενεργοποιήσετε τη δόνηση. Οι υπηρεσίες προσβασιμότητας ενδέχεται να τεθούν σε σίγαση."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Πατήστε για σίγαση. Οι υπηρεσίες προσβασιμότητας ενδέχεται να τεθούν σε σίγαση."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Περισσότερες ρυθμίσεις"</string>
<string name="notification_done" msgid="5279426047273930175">"Τέλος"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Στοιχεία ελέγχου κοινοποίησης <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Χρώμα και εμφάνιση"</string>
- <string name="night_mode" msgid="3540405868248625488">"Νυχτερινή λειτουργία"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Βαθμονόμηση οθόνης"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Ενεργή"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Ανενεργή"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Αυτόματη ενεργοποίηση"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Αλλαγή σε νυχτερινή λειτουργία όπως απαιτείται βάσει τοποθεσίας και ώρας της ημέρας"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Όταν είναι ενεργή η νυχτερινή λειτουργία"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Χρήση σκοτεινού θέματος για Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ρύθμιση απόχρωσης"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ρύθμιση φωτεινότητας"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Το σκούρο θέμα εφαρμόζεται σε βασικές περιοχές του λειτουργικού συστήματος Android οι οποίες συνήθως εμφανίζονται με φωτεινό θέμα, όπως οι Ρυθμίσεις."</string>
- <string name="color_apply" msgid="9212602012641034283">"Εφαρμογή"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Επιβεβαίωση ρυθμίσεων"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Ορισμένες ρυθμίσεις χρωμάτων μπορεί να μην επιτρέπουν τη χρήση αυτής της συσκευής. Κάντε κλικ στην επιλογή OK για να επιβεβαιώσετε αυτές τις ρυθμίσεις χρωμάτων, διαφορετικά θα γίνει επαναφορά αυτών των ρυθμίσεων μετά από 10 δευτερόλεπτα."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Χρήση της μπαταρίας"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Η εξοικονόμηση μπαταρίας δεν είναι διαθέσιμη κατά τη διάρκεια της φόρτισης"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Εξοικονόμηση μπαταρίας"</string>
diff --git a/packages/SystemUI/res/values-en-rAU/config.xml b/packages/SystemUI/res/values-en-rAU/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rAU/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index 2ede279..fcf0cf5 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overview."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Close"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi turned off."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi turned on."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Night Light"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Night Light on, tap to turn off"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Night Light off, tap to turn on"</string>
<string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> is the volume dialogue"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tap to restore the original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"You\'re using your work profile"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Call"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Ring"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tap to unmute."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tap to set to vibrate. Accessibility services may be muted."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tap to mute. Accessibility services may be muted."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"More settings"</string>
<string name="notification_done" msgid="5279426047273930175">"Done"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string>
- <string name="night_mode" msgid="3540405868248625488">"Night mode"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrate display"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"On"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Off"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Turn on automatically"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Switch into Night Mode as appropriate for location and time of day"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"When Night Mode is on"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Use dark theme for Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Adjust tint"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Adjust brightness"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"The dark theme is applied to core areas of Android OS that are normally displayed in a light theme, such as Settings."</string>
- <string name="color_apply" msgid="9212602012641034283">"Apply"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirm Settings"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Some colour settings can make this device unusable. Click OK to confirm these colour settings, otherwise these settings will reset after 10 seconds."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string>
diff --git a/packages/SystemUI/res/values-en-rGB/config.xml b/packages/SystemUI/res/values-en-rGB/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rGB/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index 2ede279..fcf0cf5 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overview."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Close"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi turned off."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi turned on."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Night Light"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Night Light on, tap to turn off"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Night Light off, tap to turn on"</string>
<string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> is the volume dialogue"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tap to restore the original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"You\'re using your work profile"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Call"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Ring"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tap to unmute."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tap to set to vibrate. Accessibility services may be muted."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tap to mute. Accessibility services may be muted."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"More settings"</string>
<string name="notification_done" msgid="5279426047273930175">"Done"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string>
- <string name="night_mode" msgid="3540405868248625488">"Night mode"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrate display"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"On"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Off"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Turn on automatically"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Switch into Night Mode as appropriate for location and time of day"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"When Night Mode is on"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Use dark theme for Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Adjust tint"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Adjust brightness"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"The dark theme is applied to core areas of Android OS that are normally displayed in a light theme, such as Settings."</string>
- <string name="color_apply" msgid="9212602012641034283">"Apply"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirm Settings"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Some colour settings can make this device unusable. Click OK to confirm these colour settings, otherwise these settings will reset after 10 seconds."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string>
diff --git a/packages/SystemUI/res/values-en-rIN/config.xml b/packages/SystemUI/res/values-en-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index 2ede279..fcf0cf5 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overview."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Close"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi turned off."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi turned on."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Night Light"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Night Light on, tap to turn off"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Night Light off, tap to turn on"</string>
<string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> is the volume dialogue"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tap to restore the original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"You\'re using your work profile"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Call"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Ring"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tap to unmute."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tap to set to vibrate. Accessibility services may be muted."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tap to mute. Accessibility services may be muted."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"More settings"</string>
<string name="notification_done" msgid="5279426047273930175">"Done"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string>
- <string name="night_mode" msgid="3540405868248625488">"Night mode"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrate display"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"On"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Off"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Turn on automatically"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Switch into Night Mode as appropriate for location and time of day"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"When Night Mode is on"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Use dark theme for Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Adjust tint"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Adjust brightness"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"The dark theme is applied to core areas of Android OS that are normally displayed in a light theme, such as Settings."</string>
- <string name="color_apply" msgid="9212602012641034283">"Apply"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirm Settings"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Some colour settings can make this device unusable. Click OK to confirm these colour settings, otherwise these settings will reset after 10 seconds."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string>
diff --git a/packages/SystemUI/res/values-es-rUS/config.xml b/packages/SystemUI/res/values-es-rUS/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rUS/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index cd08f34..3b985e3 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Configuración"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Recientes"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Cerrar"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi desactivado"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi activado"</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabajo"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Luz nocturna"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Presiona para desactivar la Luz nocturna"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Presiona para activar la Luz nocturna"</string>
<string name="recents_empty_message" msgid="808480104164008572">"No hay elementos recientes"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Todo borrado"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> es el cuadro de diálogo de volumen."</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Presiona para restablecer el original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Estás usando tu perfil de trabajo"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Llamar"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Hacer sonar"</item>
+ <item msgid="1850038478268896762">"Multimedia"</item>
+ <item msgid="8265110906352372092">"Alarma"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Presiona para dejar de silenciar."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Presiona para establecer el modo vibración. Es posible que los servicios de accesibilidad estén silenciados."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Presiona para silenciar. Es posible que los servicios de accesibilidad estén silenciados."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Más opciones de configuración"</string>
<string name="notification_done" msgid="5279426047273930175">"Listo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controles de notificaciones de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Color y apariencia"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modo nocturno"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrar pantalla"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Activado"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desactivado"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activar automáticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Cambiar a modo nocturno según corresponda en relación con la ubicación y hora del día"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Cuando el modo nocturno está activado"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Usar tema oscuro para el SO Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajustar tinte"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajustar brillo"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"El tema oscuro se aplica en las áreas principales del SO Android que suelen mostrarse con un tema claro, como Configuración."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmar la configuración"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algunas opciones de configuración de color pueden provocar que el dispositivo quede inutilizable. Haz clic en Aceptar para confirmar estos parámetros de color. De lo contrario, la configuración se restablecerá en diez segundos."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Uso de la batería"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ahorro de batería no está disponible durante la carga"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Ahorro de batería"</string>
diff --git a/packages/SystemUI/res/values-es/config.xml b/packages/SystemUI/res/values-es/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-es/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index 5e0fa43e..bc6c071 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5 G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Itinerancia"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Tipo Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Ajustes"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Aplicaciones recientes."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Cerrar"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi desactivado."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi activado."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabajo"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Luz nocturna"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Luz nocturna activada; toca aquí para desactivarla"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Luz nocturna desactivada; toca aquí para activarla"</string>
<string name="recents_empty_message" msgid="808480104164008572">"No hay elementos recientes"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Has rechazado todo"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> es el cuadro de diálogo de volumen"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Toca para restaurar el original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Estás usando tu perfil de trabajo"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Llamar"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Hacer sonar"</item>
+ <item msgid="1850038478268896762">"Multimedia"</item>
+ <item msgid="8265110906352372092">"Alarma"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Toca para activar el sonido."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Toca para poner el dispositivo en vibración. Los servicios de accesibilidad pueden silenciarse."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Toca para silenciar. Los servicios de accesibilidad pueden silenciarse."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Más ajustes"</string>
<string name="notification_done" msgid="5279426047273930175">"Listo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controles de notificaciones de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Color y aspecto"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modo nocturno"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrar pantalla"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Sí"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"No"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activar automáticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Cambiar al modo nocturno cuando proceda según la ubicación y la hora del día"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Cuando el modo nocturno esté activado"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Tema oscuro para sistema operativo Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajustar tono"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajustar brillo"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"El tema oscuro se aplica a las áreas principales del sistema operativo Android que normalmente se muestran con un tema claro, como la aplicación Ajustes."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configuración"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algunas opciones de configuración de color pueden hacer que el dispositivo no se pueda utilizar. Haz clic en Aceptar para confirmar esta configuración. Si no lo haces, se restablecerá esta configuración cuando transcurran 10 segundos."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Uso de la batería"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ahorro de batería no disponible mientras se carga el dispositivo"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Ahorro de batería"</string>
diff --git a/packages/SystemUI/res/values-et-rEE/config.xml b/packages/SystemUI/res/values-et-rEE/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-et-rEE/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml
index 405d351..ca605d4 100644
--- a/packages/SystemUI/res/values-et-rEE/strings.xml
+++ b/packages/SystemUI/res/values-et-rEE/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Rändlus"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Serv"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Seaded"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Ülevaade."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Sulgemine"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Kasutaja <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"WiFi on välja lülitatud."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"WiFi on sisse lülitatud."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limiit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> hoiatus"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Töörežiim"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Öövalgus"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Öövalgus on sees, puudutage väljalülitamiseks"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Öövalgus on väljas, puudutage sisselülitamiseks"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Hiljutisi üksusi pole"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Olete kõik ära kustutanud"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Rakenduste teave"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> on helitugevuse dialoog"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Puudutage originaali taastamiseks."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Kasutate oma tööprofiili"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Helistamine"</item>
+ <item msgid="5997713001067658559">"Süsteem"</item>
+ <item msgid="7858983209929864160">"Helin"</item>
+ <item msgid="1850038478268896762">"Meedia"</item>
+ <item msgid="8265110906352372092">"Äratus"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Puudutage vaigistuse tühistamiseks."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Puudutage värinarežiimi määramiseks. Juurdepääsetavuse teenused võidakse vaigistada."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Puudutage vaigistamiseks. Juurdepääsetavuse teenused võidakse vaigistada."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Rohkem seadeid"</string>
<string name="notification_done" msgid="5279426047273930175">"Valmis"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> märguannete juhtnupud"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Värv ja ilme"</string>
- <string name="night_mode" msgid="3540405868248625488">"Öörežiim"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Ekraani kalibreerimine"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Sees"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Väljas"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Lülita automaatselt sisse"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Lülita öörežiimile, kui see on asukoha ja kellaaja suhtes sobilik"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kui öörežiim on sees"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Kasuta Android OS-is tumedat teemat"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Reguleeri tooni"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Reguleeri heledust"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tume teema rakendatakse Android OS-i põhialadele, mis kuvatakse tavaliselt heleda teemaga (nt seaded)."</string>
- <string name="color_apply" msgid="9212602012641034283">"Rakenda"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Seadete kinnitamine"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Mõni värviseade ei saa seadet võib-olla kasutada. Nende värviseadete kinnitamiseks klõpsake OK, muidu lähtestatakse need seaded 10 sekundi pärast."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Akukasutus"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Akusäästja pole laadimise ajal saadaval"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Akusäästja"</string>
diff --git a/packages/SystemUI/res/values-eu-rES/config.xml b/packages/SystemUI/res/values-eu-rES/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-eu-rES/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml
index d8e3446..519464c 100644
--- a/packages/SystemUI/res/values-eu-rES/strings.xml
+++ b/packages/SystemUI/res/values-eu-rES/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Ibiltaritza"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Ezarpenak"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Ikuspegi orokorra."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Itxi"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"<xliff:g id="USER">%s</xliff:g> erabiltzailea."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi konexioa desaktibatu egin da."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi konexioa aktibatu egin da."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Muga: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Abisua: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Lan modua"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Gaueko argia"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Aktibatuta dago gaueko argia. Sakatu desaktibatzeko."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Desaktibatuta dago gaueko argia. Sakatu aktibatzeko."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Ez dago azkenaldi honetako ezer"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Dena garbitu duzu"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Aplikazioaren informazioa"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> da bolumenaren leihoa"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Sakatu jatorrizkora leheneratzeko."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Work profila erabiltzen ari zara"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Deitu"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Tonua"</item>
+ <item msgid="1850038478268896762">"Multimedia-edukia"</item>
+ <item msgid="8265110906352372092">"Alarma"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth konexioa"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Sakatu audioa aktibatzeko."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Sakatu dardara ezartzeko. Baliteke erabilerraztasun-eginbideen audioa desaktibatzea."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Sakatu audioa desaktibatzeko. Baliteke erabilerraztasun-eginbideen audioa desaktibatzea."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Ezarpen gehiago"</string>
<string name="notification_done" msgid="5279426047273930175">"Eginda"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren jakinarazpenak kontrolatzeko aukerak"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Kolorea eta itxura"</string>
- <string name="night_mode" msgid="3540405868248625488">"Gau modua"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibratu pantaila"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aktibatuta"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desaktibatuta"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Aktibatu automatikoki"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Aldatu Gau modura, kokapena eta ordua kontuan izanda"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Gau modua aktibatuta dagoenean"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Erabili gai iluna Android sistema eragilean"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Doitu kolorea"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Doitu distira"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Gai iluna Android sistema eragileko eremu nagusietan aplikatzen da. Normalean gai argian bistaratzen dira eremu horiek, adibidez, Ezarpenak atalean."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplikatu"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Berretsi ezarpenak"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Baliteke gailua kolore-ezarpen batzuekin ezin erabili izatea. Kolore-ezarpenak berresteko, sakatu Ados. Bestela, hamar segundoren buruan berrezarriko dira ezarpenak."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Bateriaren erabilera"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Bateria-aurrezlea ez dago erabilgarri gailua kargatzen ari denean"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Bateria-aurrezlea"</string>
diff --git a/packages/SystemUI/res/values-fa/config.xml b/packages/SystemUI/res/values-fa/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-fa/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index 7c77d59..6315b42 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"رومینگ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"تنظیمات"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"نمای کلی."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"بستن"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"کاربر <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi خاموش شد."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi روشن شد."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> محدودیت"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"هشدار <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"حالت کار"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"نور شب"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"نور شب روشن است، برای خاموشکردن آن ضربه بزنید"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"نور شب خاموش است، برای روشنشدن آن ضربه بزنید"</string>
<string name="recents_empty_message" msgid="808480104164008572">"بدون موارد اخیر"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"همهچیز را پاک کردهاید"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"اطلاعات برنامه"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> کنترلکننده صدا است"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"برای بازیابی نسخه اصلی ضربه بزنید."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"درحال استفاده از نمایه کاریتان هستید"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"تماس"</item>
+ <item msgid="5997713001067658559">"سیستم"</item>
+ <item msgid="7858983209929864160">"تماس"</item>
+ <item msgid="1850038478268896762">"رسانه"</item>
+ <item msgid="8265110906352372092">"هشدار"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"بلوتوث"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. برای باصدا کردن ضربه بزنید."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. برای تنظیم روی لرزش ضربه بزنید. ممکن است سرویسهای دسترسپذیری بیصدا شوند."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. برای بیصدا کردن ضربه بزنید. ممکن است سرویسهای دسترسپذیری بیصدا شوند."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"تنظیمات بیشتر"</string>
<string name="notification_done" msgid="5279426047273930175">"تمام"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"کنترلهای اعلان <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"رنگ و ظاهر"</string>
- <string name="night_mode" msgid="3540405868248625488">"حالت شب"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"درجهبندی نمایشگر"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"روشن"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"خاموش"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"روشن شدن خودکار"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"تغییر به حالت شب وقتی برای مکان و زمان روز مناسب است"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"وقتی حالت شب روشن است"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"استفاده از زمینه تیره برای سیستمعامل Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"تنظیم سایهرنگ"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"تنظیم روشنایی"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"زمینه تیره بر قسمتهای اصلی سیستمعامل Android که بهطور معمول با زمینه روشن نشان داده میشوند (مثل «تنظیمات») اعمال میشود."</string>
- <string name="color_apply" msgid="9212602012641034283">"اعمال کردن"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"تأیید تنظیمات"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"بعضی از تنظیمات رنگ میتوانند این دستگاه را غیرقابل استفاده کنند. برای تأیید این تنظیمات رنگ روی «تأیید» کلیک کنید، در غیر این صورت این تغییرات بعد از ۱۰ ثانیه بازنشانی میشوند."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"مصرف باتری"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"هنگام شارژ شدن، «بهینهسازی باتری» در دسترس نیست"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"بهینهسازی باتری"</string>
diff --git a/packages/SystemUI/res/values-fi/config.xml b/packages/SystemUI/res/values-fi/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-fi/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index 3ae25e1..1d4354b 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Asetukset"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Viimeisimmät."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Sulje"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Käyttäjä: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi poistettiin käytöstä."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi otettiin käyttöön."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"kiintiö <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> – varoitus"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Työtila"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Yövalo"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Yövalo on käytössä. Poista se käytöstä koskettamalla."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Yövalo ei ole käytössä. Ota se käyttöön koskettamalla."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Ei viimeaikaisia kohteita"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Kaikki on hoidettu."</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Sovellustiedot"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> on äänenvoimakkuusvalinta."</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Palauta alkuperäinen napauttamalla."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Käytät työprofiilia."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Soita"</item>
+ <item msgid="5997713001067658559">"Järjestelmä"</item>
+ <item msgid="7858983209929864160">"Soittoääni"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Herätys"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Poista mykistys koskettamalla."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Siirry värinätilaan koskettamalla. Myös esteettömyyspalvelut saattavat mykistyä."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Mykistä koskettamalla. Myös esteettömyyspalvelut saattavat mykistyä."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Lisäasetukset"</string>
<string name="notification_done" msgid="5279426047273930175">"Valmis"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ilmoitusten hallinta"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Väri ja ulkoasu"</string>
- <string name="night_mode" msgid="3540405868248625488">"Yötila"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibroi näyttö"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Käytössä"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Pois käytöstä"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Ota käyttöön automaattisesti"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Ota yötila käyttöön sijainnin ja kellonajan perusteella."</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kun yötila on käytössä"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Käytä tummaa teemaa käyttöjärjestelmässä"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Säädä sävytystä"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Säädä kirkkautta"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tumma teema tulee käyttöön Android-käyttöjärjestelmän ydinosissa, kuten Asetuksissa, joissa käytetään tavallisesti vaaleaa teemaa."</string>
- <string name="color_apply" msgid="9212602012641034283">"Käytä"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Vahvista asetukset"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Jotkin väriasetukset voivat häiritä laitteen käyttöä. Vahvista uudet väriasetukset valitsemalla OK. Muussa tapauksessa aiemmat asetukset palautetaan 10 sekunnin kuluttua."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Akun käyttö"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Virransäästö ei ole käytettävissä latauksen aikana."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Virransäästö"</string>
diff --git a/packages/SystemUI/res/values-fr-rCA/config.xml b/packages/SystemUI/res/values-fr-rCA/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-fr-rCA/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index 9aa176f..2fa5edb 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3G+"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Itinérance"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Paramètres"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Aperçu"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Fermer"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilisateur : <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi désactivé"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi activé."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode Travail"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Éclairage nocturne"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Le mode Éclairage nocturne est activé. Touchez ici pour le désactiver."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Le mode Éclairage nocturne est désactivé. Touchez ici pour l\'activer."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Aucun élément récent"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vous avez tout effacé"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Détails de l\'application"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> correspond à la boîte de dialogue du volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Touchez pour restaurer l\'original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Vous utilisez votre profil professionnel."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Appeler"</item>
+ <item msgid="5997713001067658559">"Système"</item>
+ <item msgid="7858983209929864160">"Sonnerie"</item>
+ <item msgid="1850038478268896762">"Multimédia"</item>
+ <item msgid="8265110906352372092">"Alarme"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Touchez pour réactiver le son."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Touchez pour activer les vibrations. Il est possible de couper le son des services d\'accessibilité."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Touchez pour couper le son. Il est possible de couper le son des services d\'accessibilité."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Plus de paramètres"</string>
<string name="notification_done" msgid="5279426047273930175">"Terminé"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Commandes de notification pour <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Couleur et apparence"</string>
- <string name="night_mode" msgid="3540405868248625488">"Mode Nuit"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrer l\'affichage"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Activé"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Désactivé"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activer automatiquement"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Passer en mode Nuit en fonction de la position et de l\'heure de la journée"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Lorsque le mode Nuit est activé"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Utiliser thème foncé pour Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajuster la coloration"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Régler la luminosité"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Le thème foncé est appliqué à des zones essentielles de la plateforme Android qui sont habituellement affichées dans un thème clair, comme les paramètres."</string>
- <string name="color_apply" msgid="9212602012641034283">"Appliquer"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmer les paramètres"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Certains paramètres de couleurs peuvent rendre cet appareil inutilisable. Cliquez sur « OK » pour valider ces paramètres, sinon ils seront réinitialisés après 10 secondes."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Utilisation de la pile"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Le mode Économie d\'énergie n\'est pas accessible pendant la charge"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Économie d\'énergie"</string>
diff --git a/packages/SystemUI/res/values-fr/config.xml b/packages/SystemUI/res/values-fr/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-fr/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index b6c08ca..73f5a55 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3G+"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Itinérance"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Paramètres"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Aperçu"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Fermer"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilisateur <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi désactivé."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi activé."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> au maximum"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode Travail"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Éclairage nocturne"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Éclairage nocturne activé, appuyer pour désactiver"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Éclairage nocturne désactivé, appuyer pour activer"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Aucun élément récent"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vous avez tout effacé."</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Infos application"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> correspond à la boîte de dialogue du volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Appuyez pour rétablir la version d\'origine."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Vous utilisez votre profil professionnel."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Appeler"</item>
+ <item msgid="5997713001067658559">"Système"</item>
+ <item msgid="7858983209929864160">"Faire sonner"</item>
+ <item msgid="1850038478268896762">"Multimédia"</item>
+ <item msgid="8265110906352372092">"Alarme"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Appuyez pour ne plus ignorer."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Appuyez pour mettre en mode vibreur. Vous pouvez ignorer les services d\'accessibilité."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Appuyez pour ignorer. Vous pouvez ignorer les services d\'accessibilité."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Plus de paramètres"</string>
<string name="notification_done" msgid="5279426047273930175">"Terminé"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Commandes de notification de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Couleur et apparence"</string>
- <string name="night_mode" msgid="3540405868248625488">"Mode Nuit"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrer l\'affichage"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Activé"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Désactivé"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activer automatiquement"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Passer en mode Nuit en fonction de la position et de l\'heure de la journée"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Lorsque le mode Nuit est activé"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Utiliser thème foncé pour plate-forme Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajuster la coloration"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Régler la luminosité"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Le thème foncé est appliqué à des zones essentielles de la plate-forme Android qui sont habituellement affichées dans un thème clair, telles que les paramètres."</string>
- <string name="color_apply" msgid="9212602012641034283">"Appliquer"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Vérifier les paramètres"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Certains paramètres de couleurs peuvent rendre cet appareil inutilisable. Cliquez sur \"OK\" pour valider ces paramètres, sans quoi ils seront réinitialisés après 10 secondes."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Utilisation batterie"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"L\'économiseur de batterie n\'est pas disponible lorsque l\'appareil est en charge."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Économiseur de batterie"</string>
diff --git a/packages/SystemUI/res/values-gl-rES/config.xml b/packages/SystemUI/res/values-gl-rES/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-gl-rES/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml
index c18bae7..3a44b1b 100644
--- a/packages/SystemUI/res/values-gl-rES/strings.xml
+++ b/packages/SystemUI/res/values-gl-rES/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Itinerancia"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Configuración"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Visión xeral."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Pechar"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi desactivada."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi activada."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de traballo"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Luz nocturna"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"A función Luz nocturna está activada. Toca para desactivala"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"A función Luz nocturna está desactivada. Toca para activala"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Non hai elementos recentes"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Borraches todo"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Información da aplicación"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> é o cadro de diálogo de volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Toca para restaurar o orixinal."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Estás usando o perfil de traballo"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Chamar"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Facer soar"</item>
+ <item msgid="1850038478268896762">"Multimedia"</item>
+ <item msgid="8265110906352372092">"Alarma"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Toca para activar o son."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Toca para establecer a vibración. Pódense silenciar os servizos de accesibilidade."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Toca para silenciar. Pódense silenciar os servizos de accesibilidade."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Máis opcións"</string>
<string name="notification_done" msgid="5279426047273930175">"Feito"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controis de notificacións de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aspecto"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modo nocturno"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrar pantalla"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Activado"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desactivado"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activar automaticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Cambia ao modo nocturno segundo proceda para a localización e a hora do día"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Cando o modo nocturno está activado"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Usar tema escuro para SO Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Axustar ton"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Axustar brillo"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"O tema escuro aplícase ás áreas principais do SO Android que se mostran normalmente nun tema claro, como a configuración."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configuración"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algunhas opcións de configuración de cor poden facer que este dispositivo sexa inutilizable. Fai clic en Aceptar para confirmar esta configuración de cor; en caso contrario, a configuración restablecerase tras 10 segundos."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Uso de batería"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"A función aforro de batería non está dispoñible durante a carga"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Aforro de batería"</string>
diff --git a/packages/SystemUI/res/values-gu-rIN/config.xml b/packages/SystemUI/res/values-gu-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-gu-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml
index 8c00ebd..7a0b30d 100644
--- a/packages/SystemUI/res/values-gu-rIN/strings.xml
+++ b/packages/SystemUI/res/values-gu-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"રોમિંગ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"સેટિંગ્સ"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"વિહંગાવલોકન."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"બંધ કરો"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"વપરાશકર્તા <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi બંધ કર્યું."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi ચાલુ કર્યું."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> મર્યાદા"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ચેતવણી"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"કાર્ય મોડ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"રાત્રિ પ્રકાશ"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"રાત્રિ પ્રકાશ ચાલુ છે, બંધ કરવા માટે ટપ કરો"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"રાત્રિ પ્રકાશ બંધ છે, ચાલુ કરવા માટે ટૅપ કરો"</string>
<string name="recents_empty_message" msgid="808480104164008572">"કોઇ તાજેતરની આઇટમ્સ નથી"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"તમે બધું સાફ કર્યું"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ઍપ્લિકેશન માહિતી"</string>
@@ -344,8 +348,7 @@
<string name="zen_silence_introduction" msgid="3137882381093271568">"એલાર્મ્સ, સંગીત, વિડિઓઝ અને રમતો સહિત તમામ ધ્વનિઓ અને વાઇબ્રેશન્સને આ અવરોધિત કરે છે."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"નીચે ઓછી તાકીદની સૂચનાઓ"</string>
- <!-- no translation found for notification_tap_again (7590196980943943842) -->
- <skip />
+ <string name="notification_tap_again" msgid="7590196980943943842">"ખોલવા માટે ફરીથી ટૅપ કરો"</string>
<string name="keyguard_unlock" msgid="8043466894212841998">"અનલૉક કરવા માટે ઉપર સ્વાઇપ કરો"</string>
<string name="phone_hint" msgid="4872890986869209950">"ફોન માટે આયકનમાંથી સ્વાઇપ કરો"</string>
<string name="voice_hint" msgid="8939888732119726665">"વૉઇસ સહાય માટે આયકનમાંથી સ્વાઇપ કરો"</string>
@@ -435,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> એ વૉલ્યૂમ સંવાદ છે"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"મૂળને પુનઃસ્થાપિત કરવા માટે ટૅપ કરો."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"તમે તમારી કાર્ય પ્રોફાઇલનો ઉપયોગ કરી રહ્યાં છો"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"કૉલ કરો"</item>
+ <item msgid="5997713001067658559">"સિસ્ટમ"</item>
+ <item msgid="7858983209929864160">"રિંગ કરો"</item>
+ <item msgid="1850038478268896762">"મીડિયા"</item>
+ <item msgid="8265110906352372092">"એલાર્મ"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. અનમ્યૂટ કરવા માટે ટૅપ કરો."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. વાઇબ્રેટ પર સેટ કરવા માટે ટૅપ કરો. ઍક્સેસિબિલિટી સેવાઓ મ્યૂટ કરવામાં આવી શકે છે."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. મ્યૂટ કરવા માટે ટૅપ કરો. ઍક્સેસિબિલિટી સેવાઓ મ્યૂટ કરવામાં આવી શકે છે."</string>
@@ -505,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"વધુ સેટિંગ્સ"</string>
<string name="notification_done" msgid="5279426047273930175">"થઈ ગયું"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> સૂચના નિયંત્રણો"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"રંગ અને દેખાવ"</string>
- <string name="night_mode" msgid="3540405868248625488">"રાત્રિ મોડ"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"પ્રદર્શન કૅલિબ્રેટ કરો"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ચાલુ"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"બંધ"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"આપમેળે ચાલુ કરો"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"સ્થાન અને દિવસના સમય માટે યોગ્ય હોય તે રાત્રિ મોડ પર સ્વિચ કરો"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"જ્યારે રાત્રિ મોડ ચાલુ હોય"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS માટે ઘાટી થીમનો ઉપયોગ કરો"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ટિંટ સમાયોજિત કરો"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"તેજ સમાયોજિત કરો"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ઘાટી થીમને Android OS ના મુખ્ય ક્ષેત્રો પર લાગુ કરે છે જે સામાન્ય રીતે સેટિંગ્સ જેવી લાઇટ થીમમાં પ્રદર્શિત કરવામાં આવે છે."</string>
- <string name="color_apply" msgid="9212602012641034283">"લાગુ કરો"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"સેટિંગ્સની પુષ્ટિ કરો"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"કેટલીક રંગ સેટિંગ્સ આ ઉપકરણને બિનઉપયોગી બનાવી શકે છે. આ રંગ સેટિંગ્સની પુષ્ટિ કરવા માટે ઓકે ક્લિક કરો, અન્યથા 10 સેકંડ પછી આ સેટિંગ્સ ફરીથી સેટ થશે."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"બૅટરી વપરાશ"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ચાર્જિંગ દરમિયાન બૅટરી બચતકર્તા ઉપલબ્ધ નથી"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"બૅટરી બચતકર્તા"</string>
diff --git a/packages/SystemUI/res/values-hi/config.xml b/packages/SystemUI/res/values-hi/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-hi/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 983faed..f9323e8 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"रोमिंग"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"किनारा"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"सेटिंग"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"अवलोकन."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"बंद करें"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"उपयोगकर्ता <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"वाई-फ़ाई को बंद किया गया."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"वाई-फ़ाई को चालू किया गया."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> सीमा"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावनी"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"कार्य मोड"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"नाइट लाइट"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"नाइट लाइट चालू है, बंद करने के लिए टैप करें"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"नाइट लाइट बंद है, चालू करने के लिए टैप करें"</string>
<string name="recents_empty_message" msgid="808480104164008572">"हाल ही का कोई आइटम नहीं"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"आपने सब कुछ साफ़ कर दिया है"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"एप्लिकेशन जानकारी"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> वॉल्यूम संवाद है"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"मूल को पुन: स्थापित करने के लिए टैप करें."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"आप अपनी कार्य प्रोफ़ाइल का उपयोग कर रहे हैं"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"कॉल करें"</item>
+ <item msgid="5997713001067658559">"सिस्टम"</item>
+ <item msgid="7858983209929864160">"रिंग करें"</item>
+ <item msgid="1850038478268896762">"मीडिया"</item>
+ <item msgid="8265110906352372092">"अलार्म"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ब्लूटूथ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. अनम्यूट करने के लिए टैप करें."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. कंपन पर सेट करने के लिए टैप करें. एक्सेस-योग्यता सेवाएं म्यूट हो सकती हैं."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. म्यूट करने के लिए टैप करें. एक्सेस-योग्यता सेवाएं म्यूट हो सकती हैं."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"और सेटिंग"</string>
<string name="notification_done" msgid="5279426047273930175">"हो गया"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> नोटिफ़िकेशन नियंत्रण"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"रंग और दिखावट"</string>
- <string name="night_mode" msgid="3540405868248625488">"रात्रि मोड"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"स्क्रीन को कैलिब्रेट करें"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"चालू"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"बंद"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"अपने आप चालू करें"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"स्थान और दिन के समय के लिए उपयुक्त रात्रि मोड में बदलें"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"रात्रि मोड के चालू होने पर"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS के लिए गहरी थीम का उपयोग करें"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"टिंट समायोजित करें"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"स्क्रीन की रोशनी समायोजित करें"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"गहरी थीम को Android OS के मुख्य क्षेत्रों पर लागू किया जाता है जिन्हें सामान्यतः सेटिंग जैसी हल्की थीम में प्रदर्शित किया जाता है."</string>
- <string name="color_apply" msgid="9212602012641034283">"लागू करें"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"सेेटिंग की पुष्टि करें"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"कुछ रंग सेटिंग इस डिवाइस को अनुपयोगी बना सकती हैं. इन रंग सेटिंग की पुष्टि करने के लिए ठीक क्लिक करें, अन्यथा 10 सेकंड के बाद ये सेटिंग रीसेट हो जाएंगी."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"बैटरी उपयोग"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"चार्ज किए जाने के दौरान बैटरी सेवर उपलब्ध नहीं है"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"बैटरी सेवर"</string>
diff --git a/packages/SystemUI/res/values-hr/config.xml b/packages/SystemUI/res/values-hr/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-hr/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index e1afb4d..4f0f5ce 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -144,7 +144,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G i više"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -184,7 +186,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Postavke"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Pregled."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zatvaranje"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Korisnik <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi isključen."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi uključen."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje od <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Način rada"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Noćno svjetlo"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Noćno je svjetlo uključeno, dodirnite da biste ga isključili"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Noćno je svjetlo isključeno, dodirnite da biste ga uključili"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nema nedavnih stavki"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Izbrisali ste sve"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> predstavlja dijaloški okvir za upravljanje glasnoćom"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Dodirnite da biste vratili izvornik."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Upotrebljavate radni profil"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Poziv"</item>
+ <item msgid="5997713001067658559">"Sustav"</item>
+ <item msgid="7858983209929864160">"Zvonjenje"</item>
+ <item msgid="1850038478268896762">"Mediji"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Dodirnite da biste uključili zvuk."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Dodirnite da biste postavili na vibraciju. Usluge pristupačnosti možda neće imati zvuk."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Dodirnite da biste isključili zvuk. Usluge pristupačnosti možda neće imati zvuk."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string>
<string name="notification_done" msgid="5279426047273930175">"Gotovo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrole obavijesti za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Boja i izgled"</string>
- <string name="night_mode" msgid="3540405868248625488">"Noćni način rada"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibriranje zaslona"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Uključeno"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Isključeno"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Uključi automatski"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Prebacivanje na noćni način rada prema lokaciji i dobu dana"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kada je noćni način rada uključen"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Koristi tamnu temu za OS Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Prilagodi nijansu"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Prilagodi svjetlinu"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tamna se tema primjenjuje na glavna područja OS-a Android, kao što su, primjerice, postavke, koja se inače prikazuju u svijetloj temi."</string>
- <string name="color_apply" msgid="9212602012641034283">"Primijeni"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Potvrdite postavke"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Neke postavke boja mogu učiniti uređaj neupotrebljivim. Kliknite U redu da biste potvrdili postavke boja jer će se u suprotnom poništiti za 10 sekundi."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Potrošnja baterije"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Štednja baterije nije dostupna tijekom punjenja"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Štednja baterije"</string>
diff --git a/packages/SystemUI/res/values-hu/config.xml b/packages/SystemUI/res/values-hu/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-hu/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index ca2ca61..45e189a 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Barangolás"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Beállítások"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Áttekintés."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Bezárás"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Felhasználó: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi kikapcsolva."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi bekapcsolva."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> korlát"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Figyelem! <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Munka mód"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Éjszakai fény"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Éjszakai fény bekapcsolva, koppintson a kikapcsoláshoz"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Éjszakai fény kikapcsolva, koppintson a bekapcsoláshoz"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nincsenek mostanában használt elemek"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Mindent törölt"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Az alkalmazás adatai"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazás kezeli a hangerőt"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Koppintson az eredeti visszaállításához."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"A munkaprofilt használja"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Hívás"</item>
+ <item msgid="5997713001067658559">"Rendszer"</item>
+ <item msgid="7858983209929864160">"Csörgetés"</item>
+ <item msgid="1850038478268896762">"Média"</item>
+ <item msgid="8265110906352372092">"Ébresztő"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Koppintson a némítás megszüntetéséhez."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Koppintson a rezgés beállításához. Előfordulhat, hogy a kisegítő lehetőségek szolgáltatásai le vannak némítva."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Koppintson a némításhoz. Előfordulhat, hogy a kisegítő lehetőségek szolgáltatásai le vannak némítva."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"További beállítások"</string>
<string name="notification_done" msgid="5279426047273930175">"Kész"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g>-értesítések vezérlői"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Szín és megjelenés"</string>
- <string name="night_mode" msgid="3540405868248625488">"Éjszakai mód"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kijelző kalibrálása"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Bekapcsolva"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Kikapcsolva"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Automatikus bekapcsolás"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Váltás az Éjszakai módra a helynek és napszaknak megfelelően"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Amikor be van kapcsolva az Éjszakai mód"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Sötét téma használata az Android operációs rendszernél"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Színárnyalat módosítása"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Fényerő módosítása"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Sötét téma látható az Android operációs rendszer olyan alapterületeinél, amelyek normál állapotban világosan jelennek meg (például a Beállítások)."</string>
- <string name="color_apply" msgid="9212602012641034283">"Alkalmaz"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Beállítások megerősítése"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Bizonyos színbeállítások használhatatlanná tehetik ezt az eszközt. A színbeállítás megerősítéséhez kattintson az OK lehetőségre, máskülönben a rendszer 10 másodpercen belül visszaáll a korábbira."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Akkumulátorhasználat"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Az Akkumulátorkímélő módot töltés közben nem lehet használni"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Akkumulátorkímélő mód"</string>
diff --git a/packages/SystemUI/res/values-hy-rAM/config.xml b/packages/SystemUI/res/values-hy-rAM/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-hy-rAM/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml
index 5d01d15..875eeea 100644
--- a/packages/SystemUI/res/values-hy-rAM/strings.xml
+++ b/packages/SystemUI/res/values-hy-rAM/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Ռոումինգ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Կարգավորումներ"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Համատեսք"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Փակել"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Օգտվող <xliff:g id="USER">%s</xliff:g>:"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>:"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi-ն անջատվեց:"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi-ը միացավ:"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Սահմանաչափ՝ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> զգուշացում"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Աշխատանքային ռեժիմ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Գիշերային լույս"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Գիշերային լույսը միացված է, հպեք՝ անջատելու համար"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Գիշերային լույսն անջատված է, հպեք՝ միացնելու համար"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Վերջին տարրեր չկան"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Դուք ջնջել եք ամենը"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Հավելվածի մասին"</string>
@@ -423,7 +427,7 @@
<string name="accessibility_volume_collapse" msgid="3609549593031810875">"Կոծկել"</string>
<string name="screen_pinning_title" msgid="3273740381976175811">"Էկրանն ամրացված է"</string>
<string name="screen_pinning_description" msgid="7238941806855968768">"Էկրանը կմնա տեսադաշտում, մինչև այն ապամրացնեք: Ապամրացնելու համար հպեք և պահեք Հետ կոճակը:"</string>
- <string name="screen_pinning_positive" msgid="3783985798366751226">"Հասկանալի է"</string>
+ <string name="screen_pinning_positive" msgid="3783985798366751226">"Եղավ"</string>
<string name="screen_pinning_negative" msgid="3741602308343880268">"Ոչ, շնորհակալություն"</string>
<string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Թաքցնե՞լ <xliff:g id="TILE_LABEL">%1$s</xliff:g>-ը:"</string>
<string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Այն դարձյալ կհայտնվի, երբ նորից միացնեք կարգավորումներում:"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ը ձայնի ուժգնության երկխոսության հավելված է"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Հպեք՝ բնօրինակը վերականգնելու համար:"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Դուք օգտագործում եք ձեր աշխատանքային պրոֆիլը"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Զանգել"</item>
+ <item msgid="5997713001067658559">"Համակարգ"</item>
+ <item msgid="7858983209929864160">"Զանգ"</item>
+ <item msgid="1850038478268896762">"Մեդիա"</item>
+ <item msgid="8265110906352372092">"Զարթուցիչ"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s: Հպեք՝ ձայնը միացնելու համար:"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s: Հպեք՝ թրթռումը միացնելու համար: Մատչելիության ծառայությունների ձայնը կարող է անջատվել:"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s: Հպեք՝ ձայնն անջատելու համար: Մատչելիության ծառայությունների ձայնը կարող է անջատվել:"</string>
@@ -464,7 +480,7 @@
<string name="tuner_warning_title" msgid="7094689930793031682">"Զվարճանք մեկ՝ որոշակի մարդու համար"</string>
<string name="tuner_warning" msgid="8730648121973575701">"Համակարգի ՕՄ-ի ընդունիչը հնարավորություն է տալիս հարմարեցնել Android-ի օգտվողի միջերեսը: Այս փորձնական գործառույթները կարող են հետագա թողարկումների մեջ փոփոխվել, խափանվել կամ ընդհանրապես չհայտնվել: Եթե շարունակում եք, զգուշացեք:"</string>
<string name="tuner_persistent_warning" msgid="8597333795565621795">"Այս փորձնական գործառույթները կարող են հետագա թողարկումների մեջ փոփոխվել, խափանվել կամ ընդհանրապես չհայտնվել: Եթե շարունակում եք, զգուշացեք:"</string>
- <string name="got_it" msgid="2239653834387972602">"Հասկանալի է"</string>
+ <string name="got_it" msgid="2239653834387972602">"Եղավ"</string>
<string name="tuner_toast" msgid="603429811084428439">"Համակարգի ՕՄ-ի ընդունիչը ավելացվել է կարգավորումներին"</string>
<string name="remove_from_settings" msgid="8389591916603406378">"Հեռացնել կարգավորումներից"</string>
<string name="remove_from_settings_prompt" msgid="6069085993355887748">"Հեռացնե՞լ Համակարգի ՕՄ-ի ընդունիչը կարգավորումներից և չօգտվել այլևս նրա գործառույթներից:"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Այլ կարգավորումներ"</string>
<string name="notification_done" msgid="5279426047273930175">"Պատրաստ է"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի ծանուցումների կառավարներ"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Գույնը և արտաքին տեսքը"</string>
- <string name="night_mode" msgid="3540405868248625488">"Գիշերային ռեժիմ"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Չափաբերել էկրանը"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Միացված է"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Անջատված է"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Միացնել ավտոմատ կերպով"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Անցեք Գիշերային ռեժիմի, եթե դա պահանջում է տեղը և օրվա ժամանակը"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Երբ Գիշերային ռեժիմը միացված է"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Օգտագործել մուգ թեման Android OS-ի համար"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Կարգավորել երանգը"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Կարգավորել պայծառությունը"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Մուգ թեման կիրառվում է Android OS-ի հիմնական հատվածների նկատմամբ, որոնք սովորաբար ցուցադրվում են բաց թեմայում (օրինակ՝ Կարգավորումներ):"</string>
- <string name="color_apply" msgid="9212602012641034283">"Կիրառել"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Հաստատել կարգավորումները"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Գունային որոշ կարգավորումները կարող են այս սարքը օգտագործման համար ոչ պիտանի դարձնել: Սեղմեք Լավ կոճակը՝ գունային այս կարգավորումները հաստատելու համար: Հակառակ դեպքում այս կարգավորումները կվերակայվեն 10 վայրկյան հետո:"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Մարտկոցի օգտագործում"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Մարտկոցի տնտեսումը լիցքավորման ժամանակ հասանելի չէ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Մարտկոցի տնտեսում"</string>
diff --git a/packages/SystemUI/res/values-in/config.xml b/packages/SystemUI/res/values-in/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-in/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 293cd00..97288fc 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Setelan"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Ringkasan."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Tutup"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Pengguna <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi dinonaktifkan."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi diaktifkan."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Batas <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Peringatan <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode kerja"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Cahaya Malam"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Cahaya Malam hidup, ketuk untuk mematikan"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Cahaya Malam mati, ketuk untuk menyalakan"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Tidak ada item baru-baru ini"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Anda sudah menghapus semua"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Info Aplikasi"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> adalah dialog volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Ketuk untuk memulihkan aslinya."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Anda menggunakan profil kerja"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Telepon"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Dering"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Ketuk untuk menyuarakan."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Ketuk untuk menyetel agar bergetar. Layanan aksesibilitas mungkin dibisukan."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Ketuk untuk membisukan. Layanan aksesibilitas mungkin dibisukan."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Setelan lainnya"</string>
<string name="notification_done" msgid="5279426047273930175">"Selesai"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrol notifikasi <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Warna dan tampilan"</string>
- <string name="night_mode" msgid="3540405868248625488">"Mode malam"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrasi layar"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aktif"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Nonaktif"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Aktifkan secara otomatis"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Beralih ke Mode Malam yang sesuai untuk lokasi dan waktu"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Saat Mode Malam aktif"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Gunakan tema gelap untuk OS Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Sesuaikan rona"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Sesuaikan kecerahan"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tema gelap diterapkan ke area inti OS Android yang biasanya ditampilkan di tema terang, seperti Setelan."</string>
- <string name="color_apply" msgid="9212602012641034283">"Terapkan"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Konfirmasi setelan"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Beberapa setelan warna dapat membuat perangkat ini tidak dapat digunakan. Klik OKE untuk mengonfirmasi setelan warna ini. Jika tidak, setelan ini akan disetel ulang setelah 10 detik."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Pemakaian baterai"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Penghemat Baterai tidak tersedia selama pengisian daya"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Penghemat Baterai"</string>
diff --git a/packages/SystemUI/res/values-is-rIS/config.xml b/packages/SystemUI/res/values-is-rIS/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-is-rIS/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml
index 05e6256..dbd80d3 100644
--- a/packages/SystemUI/res/values-is-rIS/strings.xml
+++ b/packages/SystemUI/res/values-is-rIS/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Reiki"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Stillingar"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Yfirlit."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Loka"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Notandi: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Slökkt á Wi-Fi."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Kveikt á Wi-Fi."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> hámark"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> viðvörun"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Vinnustilling"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Næturljós"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Kveikt á næturljósi, ýttu til að slökkva"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Slökkt á næturljósi, ýttu til að kveikja"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Engin nýleg atriði"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Þú hefur hreinsað allt"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Forritsupplýsingar"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> er hljóðstyrksvalmyndin"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Ýttu til að færa í upprunalegt horf."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Þú ert að nota vinnusniðið"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Hringja"</item>
+ <item msgid="5997713001067658559">"Kerfi"</item>
+ <item msgid="7858983209929864160">"Hringing"</item>
+ <item msgid="1850038478268896762">"Margmiðlun"</item>
+ <item msgid="8265110906352372092">"Vekjari"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Ýttu til að hætta að þagga."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Ýttu til að stilla á titring. Hugsanlega verður slökkt á hljóði aðgengisþjónustu."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Ýttu til að þagga. Hugsanlega verður slökkt á hljóði aðgengisþjónustu."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Fleiri stillingar"</string>
<string name="notification_done" msgid="5279426047273930175">"Lokið"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Tilkynningastýringar <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Litur og útlit"</string>
- <string name="night_mode" msgid="3540405868248625488">"Næturstilling"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kvarða skjáinn"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Kveikt"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Slökkt"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Kveikja sjálfkrafa"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Skipta í næturstillingu í samræmi við staðsetningu og tíma dags"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Þegar kveikt er á næturstillingu"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Nota dökkt þema fyrir Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Stilla litblæ"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Stilla birtustig"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Dökka þemað er notað á þeim aðalsvæðum Android OS sem venjulega eru ljós, s.s. í stillingum."</string>
- <string name="color_apply" msgid="9212602012641034283">"Nota"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Staðfesta stillingar"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Sumar litastillingar kunna að bitna á notagildi tækisins. Veldu „Í lagi“ til að staðfesta þessar litastillingar, að öðrum kosti verða litirnir endurstilltir eftir tíu sekúndur."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Rafhlöðunotkun"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ekki er hægt að nota rafhlöðusparnað meðan á hleðslu stendur"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Rafhlöðusparnaður"</string>
diff --git a/packages/SystemUI/res/values-it/config.xml b/packages/SystemUI/res/values-it/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-it/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index e8aacd5..8f1db5a 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Impostazioni"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Panoramica."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Chiudi"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utente <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi disattivato."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi attivato."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite di <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avviso <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modalità Lavoro"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Luminosità notturna"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Luminosità notturna attiva, tocca per disattivarla"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Luminosità notturna disattivata, tocca per attivarla"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nessun elemento recente"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Hai cancellato tutto"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informazioni sull\'applicazione"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> rappresenta la finestra di dialogo relativa al volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tocca per ripristinare l\'originale."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Stai utilizzando il profilo di lavoro"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Chiamata"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Suoneria"</item>
+ <item msgid="1850038478268896762">"Contenuti multimediali"</item>
+ <item msgid="8265110906352372092">"Sveglia"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tocca per riattivare l\'audio."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tocca per attivare la vibrazione. L\'audio dei servizi di accessibilità può essere disattivato."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tocca per disattivare l\'audio. L\'audio dei servizi di accessibilità può essere disattivato."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Altre impostazioni"</string>
<string name="notification_done" msgid="5279426047273930175">"Fine"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controlli di notifica per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Colore e aspetto"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modalità notturna"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibra display"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Attiva"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Disattivata"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Attiva automaticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Attiva la modalità notturna in base alla località e all\'ora del giorno"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Quando la modalità notturna è attiva"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Utilizza tema scuro per sistema Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Regola tinta"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Regola luminosità"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Il tema scuro viene applicato agli elementi fondamentali del sistema operativo Android che vengono generalmente visualizzati con un tema chiaro, ad esempio le impostazioni."</string>
- <string name="color_apply" msgid="9212602012641034283">"Applica"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Conferma le impostazioni"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Alcune impostazioni relative ai colori potrebbero rendere inutilizzabile il dispositivo. Fai clic su OK per confermare queste impostazioni; in caso contrario, le impostazioni verranno reimpostate dopo 10 secondi."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Utilizzo batteria"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Risparmio energetico non disponibile durante la ricarica"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Risparmio energetico"</string>
diff --git a/packages/SystemUI/res/values-iw/config.xml b/packages/SystemUI/res/values-iw/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-iw/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index 2f1393e..2ce50d1 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"+4G"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"+LTE"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"נדידה"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"קצה"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"הגדרות"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"סקירה."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"סגור"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"משתמש <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi כבוי."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi מופעל."</string>
@@ -321,6 +322,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"הגבלה של <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"אזהרה - <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"מצב עבודה"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"תאורת לילה"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"תאורת לילה פועלת, הקש כדי לכבות"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"תאורת לילה כבויה, הקש כדי להפעיל"</string>
<string name="recents_empty_message" msgid="808480104164008572">"אין פריטים אחרונים"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"מחקת הכול"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"מידע על האפליקציה"</string>
@@ -438,6 +442,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> הוא תיבת הדו-שיח של עוצמת הקול"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"הקש כדי לשחזר את המקור."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"אתה משתמש בפרופיל העבודה שלך"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"שיחה"</item>
+ <item msgid="5997713001067658559">"מערכת"</item>
+ <item msgid="7858983209929864160">"השמע צלצול"</item>
+ <item msgid="1850038478268896762">"מדיה"</item>
+ <item msgid="8265110906352372092">"התראה"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. הקש כדי לבטל את ההשתקה."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. הקש כדי להגדיר רטט. ייתכן ששירותי הנגישות מושתקים."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. הקש כדי להשתיק. ייתכן ששירותי הנגישות מושתקים."</string>
@@ -508,21 +524,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"הגדרות נוספות"</string>
<string name="notification_done" msgid="5279426047273930175">"סיום"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> פקדי הודעות"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"צבע ומראה"</string>
- <string name="night_mode" msgid="3540405868248625488">"מצב לילה"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"כיול תצוגה"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"פועל"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"כבוי"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"הפעל אוטומטית"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"החלף למצב לילה בהתאם למיקום ולשעה ביום"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"כאשר מצב לילה מופעל"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"השתמש בעיצוב כהה למערכת ההפעלה של Android."</string>
- <string name="adjust_tint" msgid="3398569573231409878">"התאמת גוון"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"התאמת בהירות"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"העיצוב הכהה מוחל על התחומים העיקריים במערכת ההפעלה Android שמוצגים בדרך כלל בעיצוב בהיר, כמו \'הגדרות\'."</string>
- <string name="color_apply" msgid="9212602012641034283">"החל"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"אישור הגדרות"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"הגדרות צבע מסוימות עלולות להפוך את המכשיר הזה לבלתי שמיש. לחץ על אישור כדי לאשר את הגדרות הצבע האלה, אחרת הגדרות אלה יתאפסו לאחר 10 שניות."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"שימוש בסוללה"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"תכונת החיסכון בסוללה אינה זמינה בעת טעינת המכשיר"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"חיסכון בסוללה"</string>
diff --git a/packages/SystemUI/res/values-ja/config.xml b/packages/SystemUI/res/values-ja/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ja/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index 39b9ea7..ab75021 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ローミング中"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"最近"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"閉じる"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ユーザー: <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-FiをOFFにしました。"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-FiをONにしました。"</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"警告: 上限は<xliff:g id="DATA_LIMIT">%s</xliff:g>です"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work モード"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"読書灯"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"読書灯 ON: タップすると OFF になります"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"読書灯 OFF: タップすると ON になります"</string>
<string name="recents_empty_message" msgid="808480104164008572">"最近のタスクはありません"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"すべてのタスクを消去しました"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"アプリ情報"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g>を音量ダイアログとして使用"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"タップすると元に戻ります。"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"仕事用プロファイルを使用しています"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"通話"</item>
+ <item msgid="5997713001067658559">"システム"</item>
+ <item msgid="7858983209929864160">"着信音"</item>
+ <item msgid="1850038478268896762">"メディア"</item>
+ <item msgid="8265110906352372092">"アラーム"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s。タップしてミュートを解除します。"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s。タップしてバイブレーションに設定します。ユーザー補助機能サービスがミュートされる場合があります。"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s。タップしてミュートします。ユーザー補助機能サービスがミュートされる場合があります。"</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"詳細設定"</string>
<string name="notification_done" msgid="5279426047273930175">"完了"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」の通知の管理"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"色と表示"</string>
- <string name="night_mode" msgid="3540405868248625488">"夜間モード"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"表示の調整"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ON"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"OFF"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"自動的に ON"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"場所や時間に応じて夜間モードに切り替えます"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"夜間モードが ON のとき"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS でダークテーマを使用"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ティントを調整"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"明るさを調整"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"通常ライトテーマで表示される Android OS の主要領域（設定など）にダークテーマが適用されます。"</string>
- <string name="color_apply" msgid="9212602012641034283">"適用"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"設定の確認"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"一部の色設定を適用すると、この端末を使用できなくなることがあります。この色設定を確認するには、[OK] をクリックしてください。確認しない場合、10 秒後に設定はリセットされます。"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"電池の使用状況"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"充電中はバッテリー セーバーは利用できません"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"バッテリー セーバー"</string>
diff --git a/packages/SystemUI/res/values-ka-rGE/config.xml b/packages/SystemUI/res/values-ka-rGE/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ka-rGE/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml
index 378b36c..f4f7ddd 100644
--- a/packages/SystemUI/res/values-ka-rGE/strings.xml
+++ b/packages/SystemUI/res/values-ka-rGE/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5გბ"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"როუმინგი"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"პარამეტრები"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"მიმოხილვა"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"დახურვა"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"მომხმარებელი: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi გამორთულია."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi ჩართულია."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ლიმიტი: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> გაფრთხილება"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"სამსახურის რეჟიმი"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"ღამის განათება"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"ღამის განათება ჩართულია, შეეხეთ გამოსართავად"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"ღამის განათება გამორთულია, შეეხეთ ჩასართავად"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ბოლოს გამოყენებული ერთეულები არ არის"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ყველაფერი გასუფთავდა"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"აპლიკაციის შესახებ"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ხმოვან დიალოგშია"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"შეეხეთ ორიგინალის აღსადგენად."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"თქვენ სამსახურის პროფილს იყენებთ"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"დარეკვა"</item>
+ <item msgid="5997713001067658559">"სისტემა"</item>
+ <item msgid="7858983209929864160">"ზარი"</item>
+ <item msgid="1850038478268896762">"მედია"</item>
+ <item msgid="8265110906352372092">"მაღვიძარა"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. შეეხეთ დადუმების გასაუქმებლად."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. შეეხეთ ვიბრაციაზე დასაყენებლად. შეიძლება დადუმდეს მარტივი წვდომის სერვისებიც."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. შეეხეთ დასადუმებლად. შეიძლება დადუმდეს მარტივი წვდომის სერვისებიც."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"დამატებითი პარამეტრები"</string>
<string name="notification_done" msgid="5279426047273930175">"მზადაა"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> შეტყობინებების მართვის საშუალებები"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"ფერი და იერსახე"</string>
- <string name="night_mode" msgid="3540405868248625488">"ღამის რეჟიმი"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ეკრანის კალიბრაცია"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ჩართული"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"გამორთული"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"ავტომატურად ჩართვა"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ღამის რეჟიმზე გადართვა მდებარეობისა და დღე-ღამის მონაკვეთის შესაბამისად."</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"ღამის რეჟიმის ჩართვისას"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS-ისთვის მუქი თემის გამოყენება"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ელფერის გასწორება"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"სიკაშკაშის გასწორება"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"მუქი თემა მიესადაგება Android OS-ის ძირითად არეებს, რომლებიც, ჩვეულებრივ, ღია თემის მეშვეობით არის ნაჩვენები. მაგალითად, პარამეტრებს."</string>
- <string name="color_apply" msgid="9212602012641034283">"გამოყენება"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"პარამეტრების დადასტურება"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"ფერთა ზოგიერთ პარამეტრს ამ მოწყობილობასთან მუშაობის გართულება შეუძლია. ფერთა ამჟამინდელი პარამეტრების დასადასტურებლად, დააწკაპუნეთ „კარგი“-ზე. წინააღმდეგ შემთხვევაში, პარამეტრები 10 წამის შემდეგ ჩამოიყრება."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ბატარეის მოხმარება"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ბატარეის დამზოგი დატენვისას მიწვდომელია"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ბატარეის დამზოგი"</string>
diff --git a/packages/SystemUI/res/values-kk-rKZ/config.xml b/packages/SystemUI/res/values-kk-rKZ/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-kk-rKZ/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml
index 1e1544b..cb41a0e 100644
--- a/packages/SystemUI/res/values-kk-rKZ/strings.xml
+++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3Г"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5Г"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4Г"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"ҰМД"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA (кодтармен бөлінген бірнеше қол жетімділік)"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роуминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE (ұялы байланыстар жүйесіне арналған жетілдірілген деректер шамалары)"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Параметрлер"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Шолу."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Жабу"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Пайдаланушы <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi өшірілді."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi қосылды."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> шегі"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> туралы ескерту"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Жұмыс режимі"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Түнгі жарық"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Түнгі жарық қосулы, өшіру үшін оны түртіңіз"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Түнгі жарық өшірулі, қосу үшін оны түртіңіз"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Жақындағы элементтер жоқ"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Сіз барлығын өшірдіңіз"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Қолданба туралы ақпарат"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> — көлем диалогтық терезесі"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Бастапқы қалпына келтіру үшін түртіңіз."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Сіз жұмыс профиліңізді пайдаланып жатырсыз"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Қоңырау шалу"</item>
+ <item msgid="5997713001067658559">"Жүйе"</item>
+ <item msgid="7858983209929864160">"Шылдырлау"</item>
+ <item msgid="1850038478268896762">"Мультимeдиа"</item>
+ <item msgid="8265110906352372092">"Дабыл"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Дыбысын қосу үшін түртіңіз."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Діріл режимін орнату үшін түртіңіз. Арнайы мүмкіндік қызметтерінің дыбысы өшуі мүмкін."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Дыбысын өшіру үшін түртіңіз. Арнайы мүмкіндік қызметтерінің дыбысы өшуі мүмкін."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Қосымша параметрлер"</string>
<string name="notification_done" msgid="5279426047273930175">"Дайын"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> хабарландыруларды басқару элементтері"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Түс және сыртқы түрі"</string>
- <string name="night_mode" msgid="3540405868248625488">"Түнгі режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Дисплейді калибрлеу"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Қосулы"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Өшірулі"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Автоматты түрде қосу"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Орынға және күн уақытына тиісті түнгі режимге ауысу"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Түнгі режим қосулы кезде"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android ОЖ үшін күңгірт тақырыпты пайдалану"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Реңкті реттеу"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Жарықтықты реттеу"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Күңгірт тақырып Android операциялық жүйесінің әдетте \"Параметрлер\" сияқты ашық тақырыпта көрсетілетін негізгі аумақтарына қолданылады."</string>
- <string name="color_apply" msgid="9212602012641034283">"Қолдану"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Параметрлерді растау"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Кейбір түс параметрлері бұл құрылғыны пайдалану мүмкін емес етуі мүмкін. Бұл түс параметрлерін растау үшін OK түймесін басыңыз, әйтпесе параметрлер 10 секундтан кейін ысырылады."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Батареяны пайдалану"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Зарядтау кезінде Батарея үнемдегіш қол жетімді емес"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Батарея үнемдегіш"</string>
diff --git a/packages/SystemUI/res/values-km-rKH/config.xml b/packages/SystemUI/res/values-km-rKH/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-km-rKH/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml
index 84d3470..6bd184d 100644
--- a/packages/SystemUI/res/values-km-rKH/strings.xml
+++ b/packages/SystemUI/res/values-km-rKH/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"រ៉ូមីង"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ការកំណត់"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"ទិដ្ឋភាព។"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"បិទ"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"អ្នកប្រើ <xliff:g id="USER">%s</xliff:g> ។"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"បានបិទវ៉ាយហ្វាយ។"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"បានបើកវ៉ាយហ្វាយ។"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ដែនកំណត់ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ការព្រមាន"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"របៀបការងារ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"ពន្លឺពេលយប់"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"ពន្លឺពេលយប់បើកហើយ ប៉ះដើម្បីបិទ"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"ពន្លឺពេលយប់បិទហើយ ប៉ះដើម្បីបើក"</string>
<string name="recents_empty_message" msgid="808480104164008572">"មិនមានធាតុថ្មីៗទេ"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"អ្នកបានជម្រះអ្វីៗទាំងអស់"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ព័ត៌មានកម្មវិធី"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> គឺជាប្រអប់សម្លេង"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"ប៉ះដើម្បីស្តារច្បាប់ដើម"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"អ្នកកំពុងប្រើប្រវត្តិរូបការងាររបស់អ្នក"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ហៅ"</item>
+ <item msgid="5997713001067658559">"ប្រព័ន្ធ"</item>
+ <item msgid="7858983209929864160">"រោទ៍"</item>
+ <item msgid="1850038478268896762">"មេឌៀ"</item>
+ <item msgid="8265110906352372092">"ម៉ោងរោទ៍"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ប៊្លូធូស"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s។ ប៉ះដើម្បីបើកសំឡេង។"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s។ ប៉ះដើម្បីកំណត់ឲ្យញ័រ។ សេវាកម្មលទ្ធភាពប្រើប្រាស់អាចនឹងត្រូវបានបិទសំឡេង។"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s។ ប៉ះដើម្បីបិទសំឡេង។ សេវាកម្មលទ្ធភាពប្រើប្រាស់អាចនឹងត្រូវបានបិទសំឡេង។"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"ការកំណត់ច្រើនទៀត"</string>
<string name="notification_done" msgid="5279426047273930175">"រួចរាល់"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"អង្គគ្រប់គ្រងការជូនដំណឹង <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"ពណ៌ និងរូបរាង"</string>
- <string name="night_mode" msgid="3540405868248625488">"របៀបពេលយប់"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ការបង្ហាញក្រិត"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"បើក"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"បិទ"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"បើកដោយស្វ័យប្រវត្តិ"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ប្តូរទៅជារបៀបពេលយប់ដែលសមស្របទៅតាមទីកន្លែង និងពេលវេលា"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"នៅពេលបើករបៀបពេលយប់"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"ប្រើធីមងងឹតសម្រាប់ប្រព័ន្ធប្រតិបត្តិការ Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"កែសម្រួលពណ៌ព្រឿងៗ"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"កែសម្រួលពន្លឺ"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ធីមងងឹតត្រូវបានប្រើសម្រាប់ចំណុចស្នូលនៃប្រព័ន្ធប្រតិបត្តិការ Android ដែលជាទូទៅត្រូវបានបង្ហាញជាធីមភ្លឺ ដូចជាការកំណត់ជាដើម។"</string>
- <string name="color_apply" msgid="9212602012641034283">"អនុវត្ត"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"បញ្ជាក់ការកំណត់"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"ការកំណត់ពណ៌មួយចំនួនអាចធ្វើឲ្យឧបករណ៍នេះមិនអាចប្រើបាន។ សូមចុច យល់ព្រម ដើម្បីបញ្ជាក់ការកំណត់ពណ៌ទាំងនេះ បើមិនដូច្នេះទេការកំណត់ទាំងនេះនឹងកំណត់ឡើងវិញក្នុងរយៈពេល 10 វិនាទីបន្ទាប់។"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ការប្រើប្រាស់ថ្ម"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"កម្មវិធីសន្សំថ្មមិនអាចប្រើបានអំឡុងពេលសាកថ្មទេ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"កម្មវិធីសន្សំថ្ម"</string>
diff --git a/packages/SystemUI/res/values-kn-rIN/config.xml b/packages/SystemUI/res/values-kn-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-kn-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml
index ed48bcb..960c952 100644
--- a/packages/SystemUI/res/values-kn-rIN/strings.xml
+++ b/packages/SystemUI/res/values-kn-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ರೋಮಿಂಗ್"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ಎಡ್ಜ್"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"ಸಮಗ್ರ ನೋಟ."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"ಮುಚ್ಚು"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ಬಳಕೆದಾರ <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"ವೈಫೈ ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"ವೈಫೈ ಆನ್ ಮಾಡಲಾಗಿದೆ."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ಮಿತಿ"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ಎಚ್ಚರಿಕೆ"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"ಕೆಲಸದ ಮೋಡ್"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"ನೈಟ್ ಲೈಟ್"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"ನೈಟ್ ಲೈಟ್ ಆನ್ ಆಗಿದೆ, ಆಫ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"ನೈಟ್ ಲೈಟ್ ಆಫ್ ಆಗಿದೆ, ಆನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಐಟಂಗಳಿಲ್ಲ"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ನೀವು ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿರುವಿರಿ"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ವಾಲ್ಯೂಮ್ ಸಂವಾದವಾಗಿದೆ"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"ಮೂಲಕ್ಕೆ ಮರುಸ್ಥಾಪಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಅನ್ನು ನೀವು ಬಳಸುತ್ತಿರುವಿರಿ"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ಕರೆಮಾಡಿ"</item>
+ <item msgid="5997713001067658559">"ಸಿಸ್ಟಂ"</item>
+ <item msgid="7858983209929864160">"ಉಂಗುರ"</item>
+ <item msgid="1850038478268896762">"ಮಾಧ್ಯಮ"</item>
+ <item msgid="8265110906352372092">"ಅಲಾರಮ್"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ಬ್ಲೂಟೂತ್"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. ಅನ್ಮ್ಯೂಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. ಕಂಪನಕ್ಕೆ ಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಬಹುದು."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. ಮ್ಯೂಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ. ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಬಹುದು."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"ಹೆಚ್ಚಿನ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="notification_done" msgid="5279426047273930175">"ಮುಗಿದಿದೆ"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಅಧಿಸೂಚನೆ ನಿಯಂತ್ರಣಗಳು"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"ಬಣ್ಣ ಮತ್ತು ಗೋಚರತೆ"</string>
- <string name="night_mode" msgid="3540405868248625488">"ರಾತ್ರಿ ಮೋಡ್"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ಅಣಿಗೊಳಿಸುವ ಪ್ರದರ್ಶನ"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ಆನ್"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ಆಫ್"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡು"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ಸ್ಥಳ ಮತ್ತು ದಿನದ ಸಮಯಕ್ಕೆ ಸೂಕ್ತವಾಗುವಂತೆ ರಾತ್ರಿ ಮೋಡ್ ಅನ್ನು ಬದಲಾಯಿಸಿ"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"ರಾತ್ರಿ ಮೋಡ್ ಆನ್ ಆಗಿರುವಾಗ"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS ಗೆ ಕಪ್ಪು ಥೀಮ್ ಬಳಸಿ"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ಟಿಂಟ್ ಸರಿಹೊಂದಿಸು"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ಪ್ರಖರತೆಯನ್ನು ಸರಿಹೊಂದಿಸು"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ಕಪ್ಪು ಥೀಮ್ ಅನ್ನು Android OS ನ ಕೋರ್ ಪ್ರದೇಶಗಳಿಗೆ ಅನ್ವಯಿಸಲಾಗಿರುತ್ತದೆ. ಇದನ್ನು ಸೆಟ್ಟಿಂಗ್ಗಳಂತಹ ತಿಳಿಯಾದ ಥೀಮ್ನಲ್ಲಿ ಸಾಮಾನ್ಯವಾಗಿ ಪ್ರದರ್ಶಿಸಲಾಗುತ್ತದೆ."</string>
- <string name="color_apply" msgid="9212602012641034283">"ಅನ್ವಯಿಸು"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"ಕೆಲವು ಬಣ್ಣ ಸೆಟ್ಟಿಂಗ್ಗಳು ಈ ಸಾಧನವನ್ನು ಅನುಪಯುಕ್ತಗೊಳಿಸಬಹುದು. ಈ ಬಣ್ಣ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಸರಿ ಕ್ಲಿಕ್ ಮಾಡಿ, ಇಲ್ಲವಾದರೆ ಈ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು 10 ಸೆಕೆಂಡುಗಳ ನಂತರ ಮರುಹೊಂದಿಸಿ."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ಚಾರ್ಜಿಂಗ್ ಸಮಯದಲ್ಲಿ ಬ್ಯಾಟರಿ ಸೇವರ್ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ಬ್ಯಾಟರಿ ಸೇವರ್"</string>
diff --git a/packages/SystemUI/res/values-ko/config.xml b/packages/SystemUI/res/values-ko/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ko/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index 5c46e00..825092f 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G 이상"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"로밍"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"설정"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"최근 사용"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"닫기"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"사용자 <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi가 사용 중지되었습니다."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi를 사용합니다."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"한도: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 경고"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"작업 모드"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"야간 조명"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"야간 조명 사용 설정됨, 사용 중지하려면 탭"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"야간 조명 사용 중지됨, 사용 설정하려면 탭"</string>
<string name="recents_empty_message" msgid="808480104164008572">"최근 항목이 없습니다."</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"모든 항목을 삭제했습니다."</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"애플리케이션 정보"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g>은(는) 볼륨 대화입니다."</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"원본을 복원하려면 탭하세요."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"직장 프로필을 사용하고 있습니다."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"통화"</item>
+ <item msgid="5997713001067658559">"시스템"</item>
+ <item msgid="7858983209929864160">"벨 울리기"</item>
+ <item msgid="1850038478268896762">"미디어"</item>
+ <item msgid="8265110906352372092">"알람"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"블루투스"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. 탭하여 음소거를 해제하세요."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. 탭하여 진동으로 설정하세요. 접근성 서비스가 음소거될 수 있습니다."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. 탭하여 음소거로 설정하세요. 접근성 서비스가 음소거될 수 있습니다."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"설정 더보기"</string>
<string name="notification_done" msgid="5279426047273930175">"완료"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> 알림 관리"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"색상 및 모양"</string>
- <string name="night_mode" msgid="3540405868248625488">"야간 모드"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"디스플레이 보정"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"사용"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"사용 안함"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"자동으로 사용 설정"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"위치 및 시간대에 맞게 야간 모드로 전환"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"야간 모드 사용 중일 때"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS용 어두운 테마 사용"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"농담 효과 조정"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"밝기 조정"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"설정 등 밝은 테마에서 일반적으로 표시되는 Android OS의 핵심 영역에 어두운 테마가 적용됩니다."</string>
- <string name="color_apply" msgid="9212602012641034283">"적용"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"설정 확인"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"일부 색상 설정으로 인해 이 기기를 사용하지 못할 수 있습니다. 확인을 클릭하여 이러한 색상 설정을 확인하지 않으면 10초 후에 설정이 초기화됩니다."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"배터리 사용량"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"충전하는 동안 배터리 세이버는 사용할 수 없습니다."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"배터리 세이버"</string>
diff --git a/packages/SystemUI/res/values-ky-rKG/config.xml b/packages/SystemUI/res/values-ky-rKG/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ky-rKG/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml
index 46fed8b..e1daa6c 100644
--- a/packages/SystemUI/res/values-ky-rKG/strings.xml
+++ b/packages/SystemUI/res/values-ky-rKG/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роуминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Жөндөөлөр"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Көз жүгүртүү."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Жабуу"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Колдонуучу <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi өчүрүлдү."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi күйгүзүлдү."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> чектөө"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> эскертүү"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Иштөө режими"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Түнкү жарык"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Түнкү жарык күйүк, өчүрүү үчүн таптап коюңуз"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Түнкү жарык өчүк, күйгүзүү үчүн таптап коюңуз"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Акыркы колдонмолор жок"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Баарын тазаладыңыз"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Колдонмо жөнүндө маалымат"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> үндү катуулатуу диалогу"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Үндүн баштапкы деңгээлин калыбына келтирүү үчүн таптап коюңуз."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Жумуш профилиңизди колдонуп жатасыз"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Чалуу"</item>
+ <item msgid="5997713001067658559">"Тутум"</item>
+ <item msgid="7858983209929864160">"Шыңгыратуу"</item>
+ <item msgid="1850038478268896762">"Мультимедия"</item>
+ <item msgid="8265110906352372092">"Ойготкуч"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Үнүн чыгаруу үчүн таптап коюңуз."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Дирилдөөгө коюу үчүн таптап коюңуз. Атайын мүмкүнчүлүктөр кызматынын үнүн өчүрүп койсо болот."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Үнүн өчүрүү үчүн таптап коюңуз. Атайын мүмкүнчүлүктөр кызматынын үнүн өчүрүп койсо болот."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Дагы жөндөөлөр"</string>
<string name="notification_done" msgid="5279426047273930175">"Бүттү"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> эскертмесин башкаруу каражаттары"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Түсү жана көрүнүшү"</string>
- <string name="night_mode" msgid="3540405868248625488">"Түнкү режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Дисплейди калибрлөө"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Күйүк"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Өчүк"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Автоматтык түрдө күйгүзүү"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Жайгашкан жерге жана убакытка жараша түнкү режимге которулуңуз"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Түнкү режим күйүп турганда"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS үчүн караңгы тема колдонуу"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Кошумча түсүн тууралоо"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Жарыктыгын тууралоо"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Адатта жарык темада көрсөтүлүүчү Android тутумунун негизги элементтерине (Жөндөөлөр сыяктуу) колдонула турган караңгы тема."</string>
- <string name="color_apply" msgid="9212602012641034283">"Колдонуу"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Жөндөөлөрдү ырастоо"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Айрым түс жөндөөлөрү бул түзмөктү колдонулгус кылып коюшу мүмкүн. Бул түс жөндөөлөрүн ырастоо үчүн OK баскычын чыкылдатыңыз, болбосо бул жөндөөлөр 10 секунддан кийин баштапкы абалына келтирилет."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Батарея колдонулушу"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Батареяны үнөмдөгүч түзмөк кубатталып жатканда иштебейт"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Батареяны үнөмдөгүч"</string>
diff --git a/packages/SystemUI/res/values-ldrtl/config.xml b/packages/SystemUI/res/values-ldrtl/config.xml
new file mode 100644
index 0000000..40604c1
--- /dev/null
+++ b/packages/SystemUI/res/values-ldrtl/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows,
+ when the PIP menu is shown with settings. -->
+ <string translatable="false" name="pip_settings_bounds">"778 54 1258 324"</string>
+</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/config.xml b/packages/SystemUI/res/values-lo-rLA/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-lo-rLA/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml
index f8aea26..c969b53 100644
--- a/packages/SystemUI/res/values-lo-rLA/strings.xml
+++ b/packages/SystemUI/res/values-lo-rLA/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ໂຣມມິງ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ການຕັ້ງຄ່າ"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"ພາບຮວມ."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"ປິດ"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ຜູ່ໃຊ້ <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"ປິດ Wi-Fi ແລ້ວ."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"ເປີດ Wi-Fi ແລ້ວ."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ຈຳກັດ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"ຄຳເຕືອນ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"ໂໝດການເຮັດວຽກ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"ແສງກາງຄືນ"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"ເປີດແສງກາງຄືນຢູ່, ແຕະເພື່ອປິດໄວ້"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"ປິດແສງກາງຄືນຢູ່, ແຕະເພື່ອເປີດໃຊ້"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ບໍ່ມີລາຍການຫຼ້າສຸດ"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ທ່ານລຶບລ້າງທຸກຢ່າງແລ້ວ"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ຂໍ້ມູນແອັບພລິເຄຊັນ"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ແມ່ນໜ້າຕ່າງລະດັບສຽງ"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"ແຕະເພື່ອກູ້ຕົ້ນສະບັບຄືນມາ."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"ທ່ານກຳລັງໃຊ້ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ໂທ"</item>
+ <item msgid="5997713001067658559">"ລະບົບ"</item>
+ <item msgid="7858983209929864160">"ເຕືອນດ້ວຍສຽງ"</item>
+ <item msgid="1850038478268896762">"ມີເດຍ"</item>
+ <item msgid="8265110906352372092">"ໂມງປຸກ"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. ແຕະເພື່ອເຊົາປິດສຽງ."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. ແຕະເພື່ອຕັ້ງເປັນສັ່ນ. ບໍລິການຊ່ວຍເຂົ້າເຖິງອາດຖືກປິດສຽງໄວ້."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. ແຕະເພື່ອປິດສຽງ. ບໍລິການຊ່ວຍເຂົ້າເຖິງອາດຖືກປິດສຽງໄວ້."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"ການຕັ້ງຄ່າເພີ່ມເຕີມ"</string>
<string name="notification_done" msgid="5279426047273930175">"ສຳເລັດແລ້ວ"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"ການຄວບຄຸມການແຈ້ງເຕືອນ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"ສີ ແລະ ລັກສະນະ"</string>
- <string name="night_mode" msgid="3540405868248625488">"ໂໝດກາງຄືນ"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ປັບໜ້າຈໍ"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ເປີດ"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ປິດ"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"ເປີດໃຊ້ອັດຕະໂນມັດ"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ສະລັບໄປໃຊ້ໂໝດກາງຄືນຕາມຄວາມເໝາະສົມກັບສະຖານທີ່ ແລະ ເວລາໃນແຕ່ລະມື້"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"ເມື່ອເປີດໂໝດກາງຄືນ"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"ໃຊ້ຮູບແບບສີສັນແບບມືດສຳລັບ Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ປັບແຕ່ງໂທນສີ"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ປັບແຕ່ງຄວາມສະຫວ່າງ"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ຮູບແບບສີສັນມືດແມ່ນນຳໃຊ້ກັບພື້ນທີ່ຫຼັກຂອງ Android OS ທີ່ປົກກະຕິຈະສະແດງເປັນຮູບແບບສີສັນແຈ້ງ ເຊັ່ນ: ການຕັ້ງຄ່າ."</string>
- <string name="color_apply" msgid="9212602012641034283">"ນຳໃຊ້"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ຢືນຢັນການຕັ້ງຄ່າ"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"ບາງການຕັ້ງຄ່າສີສາມາດເຮັດໃຫ້ອຸປະກອນນີ້ບໍ່ສາມາດໃຊ້ໄດ້. ຄລິກ ຕົກລົງ ເພື່ອຢືນຢັນການຕັ້ງຄ່າສີເຫຼົ່ານີ້, ຖ້າບໍ່ດັ່ງນັ້ນ ການຕັ້ງຄ່າເຫຼົ່ານີ້ຈະຕັ້ງຄືນໃໝ່ ຫຼັງຈາກ 10 ວິນາທີ."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ການໃຊ້ແບັດເຕີຣີ"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ຕົວປະຢັດແບັດເຕີຣີບໍ່ມີໃຫ້ນຳໃຊ້ໃນລະຫວ່າງການສາກ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ຕົວປະຢັດແບັດເຕີຣີ"</string>
diff --git a/packages/SystemUI/res/values-lt/config.xml b/packages/SystemUI/res/values-lt/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-lt/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index a40bef9..1a90226 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Tarptinklinis ryšys"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Kraštas"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Nustatymai"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Apžvalga."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Uždaryti"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Naudotojas <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"„Wi-Fi“ ryšys išjungtas."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"„Wi-Fi“ ryšys įjungtas."</string>
@@ -321,6 +322,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limitas: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> įspėjimas"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Darbo režimas"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nakties šviesa"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nakties šviesa įjungta. Palieskite, kad išjungtumėte"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nakties šviesa išjungta. Palieskite, kad įjungtumėte"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nėra jokių naujausių elementų"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Viską išvalėte"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Programos informacija"</string>
@@ -438,6 +442,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ yra garsumo valdymo dialogo langas"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Palieskite, kad atkurtumėte originalą."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Naudojate darbo profilį"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Skambinti"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Skambinti"</item>
+ <item msgid="1850038478268896762">"Medija"</item>
+ <item msgid="8265110906352372092">"Signalas"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Palieskite, kad įjungtumėte garsą."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Palieskite, kad nustatytumėte vibravimą. Gali būti nutildytos pritaikymo neįgaliesiems paslaugos."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Palieskite, kad nutildytumėte. Gali būti nutildytos pritaikymo neįgaliesiems paslaugos."</string>
@@ -508,21 +524,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Daugiau nustatymų"</string>
<string name="notification_done" msgid="5279426047273930175">"Atlikta"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ pranešimų valdikliai"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Spalva ir išvaizda"</string>
- <string name="night_mode" msgid="3540405868248625488">"Naktinis režimas"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibruoti ekraną"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Įjungta"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Išjungta"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Įjungti automatiškai"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Perjungti į naktinį režimą pagal vietovę ir dienos laiką"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kai įjungtas naktinis režimas"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Naudoti tamsią „Android“ OS temą"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Koreguoti atspalvį"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Koreguoti šviesumą"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Pagrindinėms „Android“ OS dalims, kurioms paprastai taikoma šviesi tema, pvz., skilčiai „Nustatymai“, bus pritaikyta tamsi tema."</string>
- <string name="color_apply" msgid="9212602012641034283">"Taikyti"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Nustatymų patvirtinimas"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Dėl kai kurių spalvų nustatymų įrenginys gali būti netinkamas naudoti. Spustelėkite „Gerai“, kad patvirtintumėte šiuos spalvų nustatymus. Kitaip šie nustatymai bus nustatyti iš naujo po 10 sekundžių."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Akum. energ. vartoj."</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Akumuliatoriaus tausojimo priemonė nepasiekiama įkraunant"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Akumuliatoriaus tausojimo priemonė"</string>
diff --git a/packages/SystemUI/res/values-lv/config.xml b/packages/SystemUI/res/values-lv/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-lv/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index d5b29c4..f719f98 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -144,7 +144,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Viesabonēšana"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -184,7 +186,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Iestatījumi"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Pārskats."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Aizvērt"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Lietotājs: <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi ir izslēgts."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi ir ieslēgts."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ierobežojums: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> brīdinājums"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Darba režīms"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nakts režīms"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nakts režīms ir ieslēgts. Pieskarieties, lai to izslēgtu."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nakts režīms ir izslēgts. Pieskarieties, lai to ieslēgtu."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nav nesenu vienumu"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Visi uzdevumi ir notīrīti"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informācija par lietojumprogrammu"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ir skaļuma dialoglodziņš"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Pieskarieties, lai atjaunotu sākotnējo saturu."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Jūs izmantojat darba profilu."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Zvans"</item>
+ <item msgid="5997713001067658559">"Sistēma"</item>
+ <item msgid="7858983209929864160">"Zvanīt"</item>
+ <item msgid="1850038478268896762">"Multivide"</item>
+ <item msgid="8265110906352372092">"Signāls"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Pieskarieties, lai ieslēgtu skaņu."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Pieskarieties, lai iestatītu uz vibrozvanu. Var tikt izslēgti pieejamības pakalpojumu signāli."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Pieskarieties, lai izslēgtu skaņu. Var tikt izslēgti pieejamības pakalpojumu signāli."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Citi iestatījumi"</string>
<string name="notification_done" msgid="5279426047273930175">"Gatavs"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> paziņojumu vadīklas"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Krāsas un izskats"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nakts režīms"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Ekrāna kalibrēšana"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Ieslēgts"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Izslēgts"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Ieslēgt automātiski"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Pārslēgt uz nakts režīmu atbilstoši atrašanās vietai un diennakts laikam"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Ja ir ieslēgts nakts režīms"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Izmantot tumšo motīvu operētājsistēmai Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Regulēt toni"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Regulēt spilgtumu"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tumšais motīvs tiek lietots galvenajos operētājsistēmas Android elementos, kas parasti tiek rādīti ar gaišu motīvu, piemēram, lietotnē Iestatījumi."</string>
- <string name="color_apply" msgid="9212602012641034283">"Lietot"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Iestatījumu apstiprināšana"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Noteiktu krāsu iestatījumu dēļ šī ierīce var kļūt nelietojama. Lai apstiprinātu šos krāsu iestatījumus, noklikšķiniet uz Labi. Ja to neizdarīsiet, pēc 10 sekundēm šie iestatījumi tiks atiestatīti."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Akumulatora lietojums"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Akumulatora jaudas taupīšanas režīms uzlādes laikā nav pieejams."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Akumulatora jaudas taupīšanas režīms"</string>
diff --git a/packages/SystemUI/res/values-mk-rMK/config.xml b/packages/SystemUI/res/values-mk-rMK/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-mk-rMK/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml
index f4dd7bc..f1f98da 100644
--- a/packages/SystemUI/res/values-mk-rMK/strings.xml
+++ b/packages/SystemUI/res/values-mk-rMK/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роаминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Поставки"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Краток преглед."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Затвори"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Корисник <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi е исклученo."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi е вклученo."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Лимит: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупредување за <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Режим на работа"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Ноќно светло"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Ноќното светло е вклучено, допрете за да се исклучи"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Ноќното светло е исклучено, допрете за да се вклучи"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Нема неодамнешни ставки"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Исчистивте сѐ"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Информации за апликацијата"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> е дијалог за јачина на звук"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Допрете за да го вратите оригиналот."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Го користите работниот профил"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Повикај"</item>
+ <item msgid="5997713001067658559">"Систем"</item>
+ <item msgid="7858983209929864160">"Ѕвони"</item>
+ <item msgid="1850038478268896762">"Аудио-визуелни содржини"</item>
+ <item msgid="8265110906352372092">"Аларм"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Допрете за да вклучите звук."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Допрете за да поставите на вибрации. Можеби ќе се исклучи звукот на услугите за достапност."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Допрете за да исклучите звук. Можеби ќе се исклучи звукот на услугите за достапност."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Повеќе поставки"</string>
<string name="notification_done" msgid="5279426047273930175">"Готово"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Контроли за известувања на <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Боја и изглед"</string>
- <string name="night_mode" msgid="3540405868248625488">"Ноќен режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Калибрирај го екранот"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Вклучено"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Исклучено"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Вклучи автоматски"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Префрли во Ноќен режим како што е соодветно за локацијата и времето во денот"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Кога Ноќниот режим е вклучен"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Користете ја темната тема за ОС Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Приспособи ја бојата"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Приспособи ја осветленоста"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Темната тема се применува на основните области на Android OS што обично се прикажуваат во светла тема, како Поставки."</string>
- <string name="color_apply" msgid="9212602012641034283">"Примени"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Потврдете ги поставките"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Некои поставки на боите може да го направат уредот неупотреблив. Кликнете на Во ред за да ги потврдите овие поставки на боите, инаку тие поставки ќе се ресетираат по 10 секунди."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Користење батерија"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Штедачот на батерија не е достапен при полнење"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Штедач на батерија"</string>
diff --git a/packages/SystemUI/res/values-ml-rIN/config.xml b/packages/SystemUI/res/values-ml-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ml-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml
index 7178b29..9080b48 100644
--- a/packages/SystemUI/res/values-ml-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ml-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"റോമിംഗ്"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ക്രമീകരണം"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"കാഴ്ച."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"അടയ്ക്കുക"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ഉപയോക്താവ് <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"വൈഫൈ ഓഫാക്കി."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"വൈഫൈ ഓണാക്കി."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> പരിധി"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> മുന്നറിയിപ്പ്"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"പ്രവർത്തന മോഡ്"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"നൈറ്റ് ലൈറ്റ്"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"നൈറ്റ് ലൈറ്റ് ഓണാണ്, ഓഫാക്കുന്നതിന് ടാപ്പുചെയ്യുക"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"നൈറ്റ് ലൈറ്റ് ഓഫാണ്, ഓണാക്കുന്നതിന് ടാപ്പുചെയ്യുക"</string>
<string name="recents_empty_message" msgid="808480104164008572">"സമീപകാല ഇനങ്ങൾ ഒന്നുമില്ല"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"നിങ്ങൾ എല്ലാം മായ്ച്ചിരിക്കുന്നു"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ആപ്പ് വിവരം"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g>, വോളിയം ഡയലോഗാണ്"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"ഒറിജിനൽ പുനഃസ്ഥാപിക്കാൻ ടാപ്പുചെയ്യുക."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"നിങ്ങൾ ഉപയോഗിക്കുന്നത് ഔദ്യോഗിക പ്രൊഫൈലാണ്"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"വിളിക്കുക"</item>
+ <item msgid="5997713001067658559">"സിസ്റ്റം"</item>
+ <item msgid="7858983209929864160">"റിംഗുചെയ്യുക"</item>
+ <item msgid="1850038478268896762">"മീഡിയ"</item>
+ <item msgid="8265110906352372092">"അലാറം"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ബ്ലൂടൂത്ത്"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. അൺമ്യൂട്ടുചെയ്യുന്നതിന് ടാപ്പുചെയ്യുക."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. വൈബ്രേറ്റിലേക്ക് സജ്ജമാക്കുന്നതിന് ടാപ്പുചെയ്യുക. പ്രവേശനക്ഷമതാ സേവനങ്ങൾ മ്യൂട്ടുചെയ്യപ്പെട്ടേക്കാം."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. മ്യൂട്ടുചെയ്യുന്നതിന് ടാപ്പുചെയ്യുക. പ്രവേശനക്ഷമതാ സേവനങ്ങൾ മ്യൂട്ടുചെയ്യപ്പെട്ടേക്കാം."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"കൂടുതൽ ക്രമീകരണം"</string>
<string name="notification_done" msgid="5279426047273930175">"പൂർത്തിയായി"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> അറിയിപ്പ് നിയന്ത്രണങ്ങൾ"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"വർണ്ണവും രൂപഭാവവും"</string>
- <string name="night_mode" msgid="3540405868248625488">"നൈറ്റ് മോഡ്"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ഡിസ്പ്ലേ കാലിബ്രേറ്റുചെയ്യുക"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ഓൺ"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ഓഫ്"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"സ്വയമേവ ഓണാക്കുക"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ലൊക്കേഷനും ദിവസത്തിലെ സമയത്തിനും അനുയോജ്യമായ തരത്തിൽ നൈറ്റ് മോഡിലേക്ക് സ്വിച്ചുചെയ്യുക"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"നൈറ്റ് മോഡ് ഓണായിരിക്കുമ്പോൾ"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS-നുള്ള ഇരുണ്ട തീം ഉപയോഗിക്കുക"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ടിന്റ് ക്രമപ്പെടുത്തുക"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"തെളിച്ചം ക്രമപ്പെടുത്തുക"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ക്രമീകരണം പോലെയുള്ള, ഒരു ലൈറ്റ് തീമിൽ സാധാരണ ഗതിയിൽ പ്രദർശിപ്പിക്കപ്പെടുന്ന Android OS-ന്റെ അടിസ്ഥാന ഇടങ്ങളിലേക്ക്, ഇരുണ്ട തീം പ്രയോഗിക്കുന്നു."</string>
- <string name="color_apply" msgid="9212602012641034283">"ബാധകമാക്കുക"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ക്രമീകരണം സ്ഥിരീകരിക്കുക"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"ചില വർണ്ണ ക്രമീകരണത്തിന് ഈ ഉപകരണത്തെ ഉപയോഗരഹിതമാക്കാനാകും. ഈ വർണ്ണ ക്രമീകരണം സ്ഥിരീകരിക്കുന്നതിന് ശരി എന്നതിൽ ക്ലിക്കുചെയ്യുക, അല്ലെങ്കിൽ 10 സെക്കൻഡിന് ശേഷം ഈ ക്രമീകരണം പുനഃക്രമീകരിക്കപ്പെടും."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ബാറ്ററി ഉപയോഗം"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ചാർജുചെയ്യുന്ന സമയത്ത് ബാറ്ററി സേവർ ലഭ്യമല്ല"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ബാറ്ററി സേവർ"</string>
diff --git a/packages/SystemUI/res/values-mn-rMN/config.xml b/packages/SystemUI/res/values-mn-rMN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-mn-rMN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml
index 296658b..231359c 100644
--- a/packages/SystemUI/res/values-mn-rMN/strings.xml
+++ b/packages/SystemUI/res/values-mn-rMN/strings.xml
@@ -141,7 +141,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Рүүминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -181,7 +183,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Тохиргоо"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Тойм"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Хаах"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Хэрэглэгч <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi унтраасан."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi асаасан."</string>
@@ -315,6 +316,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> хязгаар"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> анхааруулга"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Ажлын горим"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Шөнийн гэрэл"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Шөнийн гэрэл асаалттай байна. Унтраахын тулд товшино уу"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Шөнийн гэрэл унтраалттай байна. Асаахын тулд товшино уу"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Сүүлийн үеийн зүйл байхгүй"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Та бүгдийг нь устгасан"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Аппликешны мэдээлэл"</string>
@@ -432,6 +436,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> нь дууны диалог юм."</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Эх хувилбарыг сэргээхийн тулд дарна уу."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Та өөрийн ажлын профайлыг ашиглаж байна"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Дуудлага"</item>
+ <item msgid="5997713001067658559">"Систем"</item>
+ <item msgid="7858983209929864160">"Хонх дуугаргах"</item>
+ <item msgid="1850038478268896762">"Медиа"</item>
+ <item msgid="8265110906352372092">"Сэрүүлэг"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Дууг нь нээхийн тулд товшино уу."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Чичиргээнд тохируулахын тулд товшино уу. Хүртээмжийн үйлчилгээний дууг хаасан."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Дууг нь хаахын тулд товшино уу. Хүртээмжийн үйлчилгээний дууг хаасан."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Бусад тохиргоо"</string>
<string name="notification_done" msgid="5279426047273930175">"Дууссан"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> мэдэгдлийн хяналт"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Өнгө, харагдах байдал"</string>
- <string name="night_mode" msgid="3540405868248625488">"Шөнийн горим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Дэлгэцийг тохируулах"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Идэвхтэй"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Идэвхгүй"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Автоматаар асаах"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Тухайн өдрийн байршил, цагийн тохиромжтой үед Шөнийн горимд шилжүүлэх"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Шөнийн горим идэвхтэй үед"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android-н үйлдлийн системд бараан загварыг ашиглах"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Өнгөний нягтаршилыг тохируулах"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Гэрэлтүүлгийг тохируулах"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Тохиргоо зэрэг тогтмол цайвар загварт харуулдаг Android үйлдлийн системийн гол хэсгийг бараан загварт харуулна."</string>
- <string name="color_apply" msgid="9212602012641034283">"Хэрэгжүүлэх"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Тохиргоог баталгаажуулах"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Зарим өнгөний тохиргоо энэ төхөөрөмжийг ашиглах боломжгүй болгож болзошгүй. OK товчлуурыг дарж эдгээр өнгөний тохиргоог зөвшөөрөхгүй бол энэ тохиргоо нь 10 секундын дараа шинэчлэгдэх болно."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Тэжээл ашиглалт"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Цэнэглэх үед тэжээл хэмнэгч ажиллахгүй"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Тэжээл хэмнэгч"</string>
diff --git a/packages/SystemUI/res/values-mr-rIN/config.xml b/packages/SystemUI/res/values-mr-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-mr-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml
index 1fb4beb..99105ca 100644
--- a/packages/SystemUI/res/values-mr-rIN/strings.xml
+++ b/packages/SystemUI/res/values-mr-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"रोमिंग"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"सेटिंग्ज"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"विहंगावलोकन."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"बंद करा"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"वापरकर्ता <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi बंद झाले."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi चालू झाले."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> मर्यादा"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावणी"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"कार्य मोड"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"रात्रीचा प्रकाश"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"रात्रीचा प्रकाश चालू आहे, बंद करण्यासाठी टॅप करा"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"रात्रीचा प्रकाश बंद आहे, चालू करण्यासाठी टॅप करा"</string>
<string name="recents_empty_message" msgid="808480104164008572">"अलीकडील कोणतेही आयटम नाहीत"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"आपण सर्वकाही साफ केले"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"अनुप्रयोग माहिती"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> हा व्हॉल्यूम संवाद आहे"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"मूळ पुनर्संचयित करण्यासाठी टॅप करा."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"आपण आपले कार्य प्रोफाईल वापरत आहात"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"कॉल करा"</item>
+ <item msgid="5997713001067658559">"सिस्टीम"</item>
+ <item msgid="7858983209929864160">"रिंग करा"</item>
+ <item msgid="1850038478268896762">"मीडिया"</item>
+ <item msgid="8265110906352372092">"अलार्म"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ब्लूटुथ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. सशब्द करण्यासाठी टॅप करा."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. कंपन सेट करण्यासाठी टॅप करा. प्रवेशयोग्यता सेवा नि:शब्द केल्या जाऊ शकतात."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. नि:शब्द करण्यासाठी टॅप करा. प्रवेशक्षमता सेवा नि:शब्द केल्या जाऊ शकतात."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"अधिक सेटिंग्ज"</string>
<string name="notification_done" msgid="5279426047273930175">"पूर्ण झाले"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> सूचना नियंत्रणे"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"रंग आणि स्वरूप"</string>
- <string name="night_mode" msgid="3540405868248625488">"रात्र मोड"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"प्रदर्शनाचे मापन करा"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"चालू"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"बंद"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"स्वयंचलितपणे चालू करा"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"स्थान आणि दिवसाच्या वेळेसाठी योग्य असल्यानुसार रात्र मोड मध्ये स्विच करा"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"रात्र मोड चालू असताना"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS साठी गडद थीमचा वापर करा"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"रंगाची छटा समायोजित करा"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"चकाकी समायोजित करा"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"सेटिंग्ज सारख्या प्रकाश थीममध्ये प्रदर्शित केल्या जाणाऱ्या Android OS च्या मुख्य क्षेत्रांवर गडद थीम लागू केली जाते."</string>
- <string name="color_apply" msgid="9212602012641034283">"लागू करा"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"सेटिंग्जची पुष्टी करा"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"काही रंग सेटिंग्ज या डिव्हाइसला निरुपयोगी करू शकतात. या रंग सेटिंग्जची पुष्टी करण्यासाठी ठीक आहे दाबा अन्यथा या सेटिंग्ज 10 सेकंदांनंतर रीसेट होतील."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"बॅटरी वापर"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"चार्ज करताना बॅटरी बचतकर्ता उपलब्ध नाही"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"बॅटरी बचतकर्ता"</string>
diff --git a/packages/SystemUI/res/values-ms-rMY/config.xml b/packages/SystemUI/res/values-ms-rMY/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ms-rMY/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml
index 8729ae8..400fdb6 100644
--- a/packages/SystemUI/res/values-ms-rMY/strings.xml
+++ b/packages/SystemUI/res/values-ms-rMY/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Perayauan"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Tetapan"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Ikhtisar."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Tutup"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Pengguna <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi dimatikan."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi dihidupkan."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> had"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Amaran <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mod kerja"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Cahaya Malam"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Cahaya Malam dihidupkan, ketik untuk mematikannya"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Cahaya Malam dimatikan, ketik untuk menghidupkannya"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Tiada item terbaharu"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Anda telah mengetepikan semua item"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Maklumat Aplikasi"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ialah dialog kelantangan"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Ketik untuk memulihkan yang asal."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Anda sedang menggunakan profil kerja"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Panggil"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Dering"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Penggera"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Ketik untuk menyahredam."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Ketik untuk menetapkan pada getar. Perkhidmatan kebolehaksesan mungkin diredamkan."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Ketik untuk meredam. Perkhidmatan kebolehaksesan mungkin diredamkan."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Lagi tetapan"</string>
<string name="notification_done" msgid="5279426047273930175">"Selesai"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kawalan pemberitahuan <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Warna dan penampilan"</string>
- <string name="night_mode" msgid="3540405868248625488">"Mod malam"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Tentukur paparan"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Hidup"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Mati"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Hidupkan secara automatik"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Beralih ke Mod Malam sebagaimana sesuai untuk lokasi dan masa"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Apabila Mod Malam dihidupkan"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Gunakan tema gelap untuk OS Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Laraskan seri warna"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Laraskan kecerahan"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tema gelap digunakan pada bahagian teras OS Android yang biasanya dipaparkan dalam tema cerah, seperti Tetapan."</string>
- <string name="color_apply" msgid="9212602012641034283">"Gunakan"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Sahkan tetapan"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Sesetengah tetapan warna boleh menjadikan peranti ini tidak dapat digunakan. Klik OK untuk mengesahkan tetapan warna ini, jika tidak, tetapan ini akan ditetapkan semula selepas 10 saat."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Penggunaan bateri"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Penjimat Bateri tidak tersedia semasa mengecas"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Penjimat Bateri"</string>
diff --git a/packages/SystemUI/res/values-my-rMM/config.xml b/packages/SystemUI/res/values-my-rMM/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-my-rMM/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml
index 2522e39..bd5874d 100644
--- a/packages/SystemUI/res/values-my-rMM/strings.xml
+++ b/packages/SystemUI/res/values-my-rMM/strings.xml
@@ -20,11 +20,11 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7164937344850004466">"စနစ်၏UI"</string>
- <string name="status_bar_clear_all_button" msgid="7774721344716731603">"ဖယ်ရှားရန်"</string>
+ <string name="status_bar_clear_all_button" msgid="7774721344716731603">"ရှင်းရန်"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"စာရင်းမှ ဖယ်မည်"</string>
- <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"အပ်ပလီကေးရှင်း အချက်အလက်များ"</string>
+ <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"အက်ပ်အချက်အလက်များ"</string>
<string name="status_bar_no_recent_apps" msgid="7374907845131203189">"သင်၏ မကြာမီက မျက်နှာပြင်များ ဒီမှာ ပေါ်လာကြမည်"</string>
- <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"လတ်တလောအပ်ပလီကေးရှင်းများအား ဖယ်ထုတ်မည်"</string>
+ <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"လတ်တလောအက်ပ်များအား ပယ်ရန်"</string>
<plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759">
<item quantity="other">ခြုံကြည့်မှုထဲမှ မျက်နှာပြင် %d ခု</item>
<item quantity="one">ခြုံကြည့်မှုထဲမှ မျက်နှာပြင် 1 ခု</item>
@@ -65,7 +65,7 @@
<string name="usb_debugging_always" msgid="303335496705863070">"ဒီကွန်ပျူတာမှ အမြဲခွင့်ပြုရန်"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB အမှားပြင်ဆင်ခြင်း ခွင့်မပြုပါ"</string>
<string name="usb_debugging_secondary_user_message" msgid="8572228137833020196">"ဤစက်ပစ္စည်းသို့ လက်ရှိဝင်ရောက်ထားသည့် အသုံးပြုသူသည် USB အမှားပြင်ဆင်ခြင်း ဖွင့်၍မရပါ။ ဤအင်္ဂါရပ်ကို အသုံးပြုရန်၊ ကျေးဇူးပြု၍ ကြီးကြပ်သူသို့ပြောင်းပါ။"</string>
- <string name="compat_mode_on" msgid="6623839244840638213">"ဖန်သားပြင်ပြည့် ချဲ့ခြင်း"</string>
+ <string name="compat_mode_on" msgid="6623839244840638213">"ဇူးမ်အပြည့်ဆွဲခြင်း"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ဖန်သားပြင်အပြည့်ဆန့်ခြင်း"</string>
<string name="screenshot_saving_ticker" msgid="7403652894056693515">"ဖန်သားပြင်ဓါတ်ပုံသိမ်းစဉ်.."</string>
<string name="screenshot_saving_title" msgid="8242282144535555697">"ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား သိမ်းဆည်းပါမည်"</string>
@@ -96,9 +96,9 @@
<string name="voice_assist_label" msgid="3956854378310019854">"အသံ အကူအညီအား ဖွင့်ရန်"</string>
<string name="camera_label" msgid="7261107956054836961">"ကင်မရာ ဖွင့်ရန်"</string>
<string name="recents_caption_resize" msgid="3517056471774958200">"အလုပ်သစ်စီစဥ်မှုကို ရွေးပါ။"</string>
- <string name="cancel" msgid="6442560571259935130">"မလုပ်တော့ပါ"</string>
- <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"အံ့ဝင်သောချုံ့ချဲ့ခလုတ်"</string>
- <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"ဖန်သားပြင်ပေါ်တွင် အသေးမှအကြီးသို့ချဲ့ခြင်း"</string>
+ <string name="cancel" msgid="6442560571259935130">"မလုပ်တော့"</string>
+ <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"အံဝင်ခွင်ကျ ဇူးမ်ခလုတ်"</string>
+ <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"ဖန်သားပြင်ပေါ်တွင် အသေးမှအကြီးသို့ ဇူးမ်ဆွဲခြင်း"</string>
<string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"ဘလူးတုသ်ချိတ်ဆက်ထားမှု"</string>
<string name="accessibility_bluetooth_disconnected" msgid="7416648669976870175">"ဘလူးတုသ်ချိတ်ဆက်မှုပြတ်တောက်သည်"</string>
<string name="accessibility_no_battery" msgid="358343022352820946">"ဘက်ထရီမရှိပါ။"</string>
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"မြန်နှုန်းမြင့်လိုင်း"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်း"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -170,10 +172,10 @@
<!-- no translation found for accessibility_casting (6887382141726543668) -->
<skip />
<string name="accessibility_work_mode" msgid="2478631941714607225">"အလုပ် မုဒ်"</string>
- <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"<xliff:g id="APP">%s</xliff:g>ကို ပယ်လိုက်ရန်"</string>
+ <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"<xliff:g id="APP">%s</xliff:g> ကို ပယ်ရန်"</string>
<string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> ထုတ်ထားသည်။"</string>
<string name="accessibility_recents_all_items_dismissed" msgid="4464697366179168836">"မကြာသေးမီက အပလီကေးရှင်းများအားလုံး ဖယ်ထုတ်ပြီးပါပြီ။"</string>
- <string name="accessibility_recents_item_open_app_info" msgid="5107479759905883540">"<xliff:g id="APP">%s</xliff:g> အက်ပ်အချက်အလက်ကို ဖွင့်ပါ။"</string>
+ <string name="accessibility_recents_item_open_app_info" msgid="5107479759905883540">"<xliff:g id="APP">%s</xliff:g> အပလီကေးရှင်းအချက်အလက်ကို ဖွင့်ပါ။"</string>
<string name="accessibility_recents_item_launched" msgid="7616039892382525203">"<xliff:g id="APP">%s</xliff:g>ကို စတင်နေသည်။"</string>
<string name="accessibility_recents_task_header" msgid="1437183540924535457">"<xliff:g id="APP">%1$s</xliff:g><xliff:g id="ACTIVITY_LABEL">%2$s</xliff:g>"</string>
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"အကြောင်းကြားချက်ကိုဖယ်ရှားပြီး"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ဆက်တင်များ"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"ခြုံကြည့်မှု။"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"ပိတ်ရန်"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"သုံးစွဲသူ <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>။"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"ကြိုးမဲ့ ပိတ်ထား။"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"ကြိုးမဲ့ ဖွင့်ထား။"</string>
@@ -317,9 +318,12 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ကန့်သတ်ချက်"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> သတိပေးချက်"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"အလုပ် မုဒ်"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"ညအလင်းရောင်"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"ညအလင်းရောင်ကို ဖွင့်ထားသည်၊ ပိတ်ရန်တို့ပါ"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"ညအလင်းရောင်ကို ပိတ်ထားသည်၊ ဖွင့်ရန်တို့ပါ"</string>
<string name="recents_empty_message" msgid="808480104164008572">"မကြာမီကဖွင့်ထားသည်များ မရှိပါ"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"သင်အားလုံးကို ရှင်းလင်းပြီးပါပြီ"</string>
- <string name="recents_app_info_button_label" msgid="2890317189376000030">"အက်ပ် အင်ဖို"</string>
+ <string name="recents_app_info_button_label" msgid="2890317189376000030">"အပလီကေးရှင်းအင်ဖို"</string>
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"မျက်နှာပြင် ပင်ထိုးမှု"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ရှာဖွေရန်"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ကို မစနိုင်ပါ။"</string>
@@ -374,9 +378,9 @@
<string name="guest_wipe_session_title" msgid="6419439912885956132">"ပြန်လာတာ ကြိုဆိုပါသည်၊ ဧည့်သည်!"</string>
<string name="guest_wipe_session_message" msgid="8476238178270112811">"သင်သည် သင်၏ ချိတ်ဆက်မှုကို ဆက်ပြုလုပ် လိုပါသလား?"</string>
<string name="guest_wipe_session_wipe" msgid="5065558566939858884">"အစမှ ပြန်စပါ"</string>
- <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"ဟုတ်ကဲ့၊ ဆက်လုပ်ပါ"</string>
+ <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"ဆက်လုပ်ပါ"</string>
<string name="guest_notification_title" msgid="1585278533840603063">"ဧည့်သည် အသုံးပြုသူ"</string>
- <string name="guest_notification_text" msgid="335747957734796689">"App များနှင့် ဒေတာအား ဖျက်ရန်၊ တခဏသုံးစွဲသူအား ဖယ်ရှားပါ"</string>
+ <string name="guest_notification_text" msgid="335747957734796689">"အက်ပ်များနှင့် ဒေတာအား ဖျက်ရန်၊ တခဏသုံးစွဲသူအား ဖယ်ရှားပါ"</string>
<string name="guest_notification_remove_action" msgid="8820670703892101990">"ဧည့်သည်ကို ဖယ်ထုတ်မည်"</string>
<string name="user_logout_notification_title" msgid="1453960926437240727">"အသုံးပြုသူ ထွက်လိုက်ပါ"</string>
<string name="user_logout_notification_text" msgid="3350262809611876284">"လက်ရှိ အသုံးပြုသူကို ထုတ်ပစ်ရန်"</string>
@@ -403,15 +407,15 @@
<string name="disable_vpn" msgid="4435534311510272506">"VPN ကို ပိတ်ထားရန်"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"VPN ကို အဆက်ဖြတ်ရန်"</string>
<string name="monitoring_description_device_owned" msgid="5780988291898461883">"သင့်စက်ကိရိယာကို<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nမှစီမံခန့်ခွဲထားပါသည်။သင့်စီမံခန့်ခွဲသူသည် ကြိုတင်ပြင်ဆင်မှုများ၊စုပေါင်းဝင်ရောက်ခွင့်၊အက်ပလီကေးရှင်းများ၊သင့်စက်ကိရိယာနှင့်ဆက်နွယ်နေသောအချက်အလက်နှင့်သင့်စက်ကိရိယာ ရဲ့နေရာအချက်အလက်များကိုကြီးကြပ်စောင့်ကြည့်နိုင်ပါသည်။အသေးစိတ်သိရှိလိုပါကသင်၏စီမံခန့်ခွဲသူကိုဆက်သွယ်ပါ။"</string>
- <string name="monitoring_description_vpn" msgid="4445150119515393526">"VPN ချိတ်ဆက်မှုပြုလုပ်ရန် အပ်ဖ်ကို သင်ခွင့်ပြုလိုက်သည်။ \n\n ဤအပ်ဖ်သည် အီးမေးလ်များ၊ အပ်ဖ်များနှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကိုယ်ရေးကိုယ်တာကွန်ရပ် လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်သည်။"</string>
+ <string name="monitoring_description_vpn" msgid="4445150119515393526">"VPN ချိတ်ဆက်မှုပြုလုပ်ရန် အက်ပ်ကို သင်ခွင့်ပြုလိုက်သည်။ \n\n ဤအက်ပ်သည် အီးမေးလ်များ၊ အက်ပ်များနှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လုပ်ဆောင်ချက်များကို စောင့်ကြည့်နိုင်သည်။"</string>
<string name="monitoring_description_vpn_device_owned" msgid="3090670777499161246">"သင့်စက်ကိရိယာကို<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n \n မှစီမံခန့်ခွဲထားပါသည်။သင့်စီမံခန့်ခွဲသူသည် ကြိုတင်ပြင်ဆင်မှုများ၊စုပေါင်းဝင်ရောက်ခွင့်၊အက်ပလီကေးရှင်းများ၊သင့်စက်ကိရိယာနှင့်ဆက်နွယ်နေသောအချက်အလက်နှင့်သင့်စက်ကိရိယာ ရဲ့နေရာအချက်အလက်များကိုကြီးကြပ်စောင့်ကြည့်နိုင်ပါသည်။ \n\n အီးမေးလ်များ၊အက်ပလီကေးရှင်းများနှင့် ဝက်ဘ်ဆိုက်များအပါအဝင်သင့်ကွန်ယက်လုပ်ဆောင်ချက်ကိုစောင့်ကြည့်နိုင်သည့် VPN ကိုချိတ်ဆက်ထားပြီဖြစ် သည်။\n\n အသေးစိတ်သိရှိလိုပါကသင်၏စီမံခန့်ခွဲသူကိုဆက်သွယ်ပါ။"</string>
- <string name="monitoring_description_vpn_profile_owned" msgid="2054949132145039290">"သင့်အလုပ်ပရိုဖိုင်ကို <xliff:g id="ORGANIZATION">%1$s</xliff:g>မှ စီမံခန့်ခွဲပါသည်။ \n\nသင့်စီမံခန့်ခွဲသူသည် အီးမေးလ်များ၊ အပ်ဖ်များ၊ နှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်သည်။ \n\nပိုမိုသော သတင်းအချက်အလက်အတွက်၊ သင့်စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။ \n\nသင်သည် VPN သို့လည်းဆက်သွယ်ထားပြီး၊ ၎င်းသည် သင့်ကွန်ရက်လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်ပါသည်။"</string>
+ <string name="monitoring_description_vpn_profile_owned" msgid="2054949132145039290">"သင့်အလုပ်ပရိုဖိုင်ကို <xliff:g id="ORGANIZATION">%1$s</xliff:g>မှ စီမံခန့်ခွဲပါသည်။ \n\nသင့်စီမံခန့်ခွဲသူသည် အီးမေးလ်များ၊ အက်ပ်များ၊ နှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လုပ်ဆောက်ချက်ကို စောင့်ကြည့်နိုင်သည်။ \n\nအချက်အလက်များ ပိုမိုရယူရန် သင်၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။ \n\nသင်သည် VPN တစ်ခုသို့ပါ ချိတ်ဆက်ထားပြီး ၎င်းကပါ သင်၏ ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်ပါသည်။"</string>
<string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string>
- <string name="monitoring_description_app" msgid="6259179342284742878">"သင်သည် <xliff:g id="APPLICATION">%1$s</xliff:g> သို့ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးများ၊ အပ်ဖ်များနှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လှုပ်ရှားမှုများကို စောင့်ကြည့်နိုင်သည်။"</string>
- <string name="monitoring_description_app_personal" msgid="484599052118316268">"သင်သည် <xliff:g id="APPLICATION">%1$s</xliff:g> သို့ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်များ၊ အပ်ဖ်များနှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကိုယ်ရေးကိုယ်တာကွန်ရပ် လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်သည်။"</string>
- <string name="monitoring_description_app_work" msgid="1754325860918060897">"သင့်အလုပ် ပရိုဖိုင်ကို <xliff:g id="ORGANIZATION">%1$s</xliff:g> မှစီမံခန့်ခွဲသည်။ ၎င်းကို <xliff:g id="APPLICATION">%2$s</xliff:g> သို့ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်များ၊ အပ်ဖ်များနှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကိုယ်ရေးကိုယ်တာကွန်ရပ် လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်သည်။ \n\nနောက်ထပ်အချက်အလက်များအတွက်၊ သင့်ကြီးကြပ်သူကို ဆက်သွယ်ပါ။"</string>
- <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"သင့်အလုပ် ပရိုဖိုင်ကို <xliff:g id="ORGANIZATION">%1$s</xliff:g> မှစီမံခန့်ခွဲသည်။ ၎င်းကို <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> သို့ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်များ၊ အပ်ဖ်များနှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကိုယ်ရေးကိုယ်တာကွန်ရပ် လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်သည်။ \n\n သင်သည်<xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> ကိုလည်းချိတ်ဆက်ထားသည်၊ ၎င်းသည် သင့်ကိုယ်ရေးကိုယ်တာ ကွန်ရက် လှုပ်ရှားမှုများကို စောင့်ကြည့်နိုင်သည်။"</string>
- <string name="monitoring_description_vpn_app_device_owned" msgid="4970443827043261703">"သင့်စက်ကိရိယာကို <xliff:g id="ORGANIZATION">%1$s</xliff:g> မှစီမံခန့်ခွဲပါသည်။ \n\n သင်စီမံခန့်ခွဲသူသည် ကြိုတင်ပြင်ဆင်မှုများ၊ စုပေါင်းဝင်ရောက်ခွင့်၊ အပ်ဖ်များ၊ သင့်ကိရိယာနှင့် သက်ဆိုင်သော ဒေတာ၊ နှင့် သင့်ကိရိယာ၏ တည်နေရာအချိက်အလက်များကို စောင့်ကြည့်ပြီး စီမံခန့်ခွဲနိုင်သည်။ \n\nသင်သည် <xliff:g id="APPLICATION">%2$s</xliff:g> သို့ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်းများ၊ အပ်ဖ်များ၊ နှင့် ဝက်ဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လှုပ်ရှားမှုကို စောင့်ကြည့်နိုင်သည်။ \n\nပိုမိုသော သတင်းအချက်အလက်အတွက်၊ သင့်စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
+ <string name="monitoring_description_app" msgid="6259179342284742878">"သင်သည် <xliff:g id="APPLICATION">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးများ၊ အက်ပ်များနှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လုပ်ဆောင်ချက်များကို စောင့်ကြည့်နိုင်သည်။"</string>
+ <string name="monitoring_description_app_personal" msgid="484599052118316268">"သင်သည် <xliff:g id="APPLICATION">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားသည်။ ၎င်းသည် အီးမေးလ်များ၊ အက်ပ်များနှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည်။"</string>
+ <string name="monitoring_description_app_work" msgid="1754325860918060897">"သင့်အလုပ်ပရိုဖိုင်ကို <xliff:g id="ORGANIZATION">%1$s</xliff:g> မှစီမံခန့်ခွဲသည်။ ၎င်းကို <xliff:g id="APPLICATION">%2$s</xliff:g> သို့ ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်များ၊ အက်ပ်များနှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်အလုပ်ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည်။ \n\nအချက်အလက်များ ပိုမိုရယူရန် သင်၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
+ <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"သင့်အလုပ် ပရိုဖိုင်ကို <xliff:g id="ORGANIZATION">%1$s</xliff:g> မှစီမံခန့်ခွဲသည်။ ၎င်းကို <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> သို့ ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်များ၊ အက်ပ်များနှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်အလုပ်ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည်။ \n\n သင်သည်<xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> ကိုလည်း ချိတ်ဆက်ထားသည်၊ ၎င်းသည် သင့်ကိုယ်ပိုင်ကွန်ရက်လုပ်ဆောင်ချက်များကို စောင့်ကြည့်နိုင်သည်။"</string>
+ <string name="monitoring_description_vpn_app_device_owned" msgid="4970443827043261703">"သင့်စက်ကိရိယာကို <xliff:g id="ORGANIZATION">%1$s</xliff:g> မှစီမံခန့်ခွဲပါသည်။ \n\n စီမံခန့်ခွဲသူသည် ကြိုတင်ပြင်ဆင်မှုများ၊ စုပေါင်းဝင်ရောက်ခွင့်၊ အက်ပ်များ၊ သင့်ကိရိယာနှင့်သက်ဆိုင်သော ဒေတာနှင့် သင့်ကိရိယာ၏ တည်နေရာအချက်အလက်များကို စောင့်ကြည့်ပြီး စီမံခန့်ခွဲနိုင်သည်။ \n\nသင်သည် <xliff:g id="APPLICATION">%2$s</xliff:g> သို့ချိတ်ဆက်ထားသည်၊ ၎င်းသည် အီးမေးလ်များ၊ အက်ပ်များ၊ နှင့် ဝဘ်ဆိုက်များအပါအဝင် သင့်ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည်။ \n\nအချက်အလက်များ ပိုမိုရယူရန် သင်၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
<string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"သင်က လက်ဖြင့် သော့မဖွင့်မချင်း ကိရိယာမှာ သော့ပိတ်လျက် ရှိနေမည်"</string>
<string name="hidden_notifications_title" msgid="7139628534207443290">"အကြောင်းကြားချက်များ မြန်မြန်ရရန်"</string>
<string name="hidden_notifications_text" msgid="2326409389088668981">"မဖွင့်ခင် ၎င်းတို့ကို ကြည့်ပါ"</string>
@@ -434,10 +438,22 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> သည် အသံဒိုင်ယာလော့ခ်ဖြစ်သည်"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"မူရင်းကိုပြန်ယူရန် တို့ပါ။"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"သင်သည် အလုပ်ပရိုဖိုင်းအား သုံးနေသည်"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ခေါ်ဆိုမှု"</item>
+ <item msgid="5997713001067658559">"စနစ်"</item>
+ <item msgid="7858983209929864160">"ဖုန်းခေါ်ဆိုမှု"</item>
+ <item msgid="1850038478268896762">"မီဒီယာ"</item>
+ <item msgid="8265110906352372092">"နှိုးစက်"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ဘလူးတုသ်"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s။ အသံပြန်ဖွင့်ရန် တို့ပါ။"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s။ တုန်ခါမှုကို သတ်မှတ်ရန် တို့ပါ။ အများသုံးစွဲနိုင်မှု ဝန်ဆောင်မှုများကို အသံပိတ်ထားနိုင်ပါသည်။"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s။ အသံပိတ်ရန် တို့ပါ။ အများသုံးစွဲနိုင်မှု ဝန်ဆောင်မှုများကို အသံပိတ်ထားနိုင်ပါသည်။"</string>
- <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"အသံအတိုးအလျှော့ခလုတ် %s ပြသထားပါသည်။ ပယ်ဖျက်ရန် ပွတ်ဆွဲပါ။"</string>
+ <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"အသံအတိုးအလျှော့ခလုတ် %s ပြသထားပါသည်။ ပယ်ရန် အပေါ်သို့ပွတ်ဆွဲပါ။"</string>
<string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"အသံအတိုးအလျှော့ခလုတ်များကို ဝှက်ထားပါသည်"</string>
<string name="system_ui_tuner" msgid="708224127392452018">"စနစ် UI ဖမ်းစက်"</string>
<string name="show_battery_percentage" msgid="5444136600512968798">"မြုတ်ထားသည့် ဘက်ထရီ ရာခိုင်နှုန်းကို ပြပါ"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"နောက်ထပ် ဆက်တင်များ"</string>
<string name="notification_done" msgid="5279426047273930175">"ပြီးပါပြီ"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> အကြောင်းကြားချက် ထိန်းချုပ်မှုများ"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"အရောင်နှင့် အပြင်အဆင်"</string>
- <string name="night_mode" msgid="3540405868248625488">"ညသုံးမုဒ်"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ပြသမှုအချိန်အဆကို ညှိပါ"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ဖွင့်ပါ"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ပိတ်ပါ"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"အလိုအလျောက် ဖွင့်ပါ"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"တည်နေရာနှင့် တစ်ရက်တာအချိန်နှင့် သင့်လျော်သလို ညသုံးမုဒ်သို့ ပြောင်းပါ"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"ညသုံမုဒ်ဖွင့်ထားစဉ်"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS အတွက်အရောင်ရင့်အပြင်အဆင်ကို သုံးပါ"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"အရောင်မွဲမှုကို ချိန်ပါ"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"အလင်းအမှောင်ချိန်ပါ"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"အရောင်ရင့်အပြင်အဆင်သည် ဆက်တင်များကဲ့သို့ ပုံမှန်အားဖြင့် အရောင်ဖျော့အပြင်အဆင်အဖြစ်ရှိသည့် Android OS ၏အဓိကနေရာများကို ပြောင်းလဲပေးပါသည်။"</string>
- <string name="color_apply" msgid="9212602012641034283">"အသုံးပြုပါ"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ဆက်တင်များကို အတည်ပြုပါ"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"အချို့သော အရောင်ဆက်တက်များက ဤကိရိယာကို သုံးမရအောင် လုပ်ပစ်နိုင်ပါသည်။ ဤအရောင် ဆက်တင်များကို အတည်ပြုရန် အိုကေကို နှိပ်ပါ၊ သို့မဟုတ် ဤဆက်တင်များကို ၁၀ စက္ကန့် အကြာတွင် ပြန်ညှိလိုက်ပါမည်။"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ဘက်ထရီ အသုံးပြုမှု"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"အားသွင်းနေချိန်မှာ Battery Saver ကို သုံးမရပါ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string>
@@ -543,7 +544,7 @@
<string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"ရှေ့သို့ရစ်ပါ"</string>
<string name="keyboard_key_page_up" msgid="5654098530106845603">"အပေါ်စာမျက်နှာသို့သွားပါ"</string>
<string name="keyboard_key_page_down" msgid="8720502083731906136">"အောက်စာမျက်နှာသို့သွားပါ"</string>
- <string name="keyboard_key_forward_del" msgid="1391451334716490176">"ဖျက်ပါ"</string>
+ <string name="keyboard_key_forward_del" msgid="1391451334716490176">"ဖျက်ရန်"</string>
<string name="keyboard_key_move_home" msgid="2765693292069487486">"ပင်မ"</string>
<string name="keyboard_key_move_end" msgid="5901174332047975247">"ပြီးပါပြီ"</string>
<string name="keyboard_key_insert" msgid="8530501581636082614">"ထည့်ပါ"</string>
@@ -587,7 +588,7 @@
<string name="menu_ime" msgid="4943221416525250684">"မန်နယူး / ကီးဘုတ်ပြောင်းစနစ်"</string>
<string name="select_button" msgid="1597989540662710653">"ပေါင်းထည့်ရန် ခလုတ်ကိုရွေးပါ"</string>
<string name="add_button" msgid="4134946063432258161">"ခလုတ်ပေါင်းထည့်ပါ"</string>
- <string name="save" msgid="2311877285724540644">"သိမ်းဆည်းပါ"</string>
+ <string name="save" msgid="2311877285724540644">"သိမ်းရန်"</string>
<string name="reset" msgid="2448168080964209908">"ပြန်လည်သတ်မှတ်ရန်"</string>
<string name="no_home_title" msgid="1563808595146071549">"ပင်မခလုတ်မတွေ့ပါ"</string>
<string name="no_home_message" msgid="5408485011659260911">"ဤစက်ပစ္စည်းကိုရွှေ့လျားနိုင်ရန် ပင်မခလုတ် လိုအပ်ပါသည်။ မသိမ်းဆည်းမီ ပင်မခလုတ်ကို ပေါင်းထည့်ပါ။"</string>
diff --git a/packages/SystemUI/res/values-my-rMM/strings_tv.xml b/packages/SystemUI/res/values-my-rMM/strings_tv.xml
index 2c5b94b..f91c5bc 100644
--- a/packages/SystemUI/res/values-my-rMM/strings_tv.xml
+++ b/packages/SystemUI/res/values-my-rMM/strings_tv.xml
@@ -27,7 +27,7 @@
<string name="pip_onboarding_title" msgid="7850436557670253991">"ပုံထဲမှပုံ"</string>
<string name="pip_onboarding_description" msgid="4028124563309465267">"နောက်တစ်ခုမဖွင့်မချင်း သင့်ဗီဒီယိုကို ပြသထားပါမည်။ ၎င်းကိုထိန်းချုပ်ရန် "<b>"ပင်မ"</b>" ခလုတ်ကို နှိပ်ပြီးဖိထားပါ။"</string>
<string name="pip_onboarding_button" msgid="3957426748484904611">"ရပါပြီ"</string>
- <string name="recents_tv_dismiss" msgid="3555093879593377731">"ပယ်ပါ"</string>
+ <string name="recents_tv_dismiss" msgid="3555093879593377731">"ပယ်ရန်"</string>
<string-array name="recents_tv_blacklist_array">
</string-array>
</resources>
diff --git a/packages/SystemUI/res/values-nb/config.xml b/packages/SystemUI/res/values-nb/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-nb/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index fc81c3c..179d90a 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Innstillinger"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Oversikt."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Lukk"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Bruker: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi er slått av."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi er slått på."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Grense på <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advarsel for <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbeidsmodus"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nattlys"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nattlys er på, trykk for å slå av"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nattlys er av, trykk for å slå på"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Ingen nylige elementer"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du har fjernet alt"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformasjon"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> er volumdialogen"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Trykk for å gjenopprette originalen."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Du bruker jobbprofilen din"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Ring"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Varsellyd"</item>
+ <item msgid="1850038478268896762">"Medier"</item>
+ <item msgid="8265110906352372092">"Alarmen"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Trykk for å slå på lyden."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Trykk for å angi vibrasjon. Lyden kan bli slått av for tilgjengelighetstjenestene."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Trykk for å slå av lyden. Lyden kan bli slått av for tilgjengelighetstjenestene."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Flere innstillinger"</string>
<string name="notification_done" msgid="5279426047273930175">"Ferdig"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Varselinnstillinger for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Farge og utseende"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nattmodus"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrer skjermen"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"På"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Av"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Slå på automatisk"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Bytt til nattmodus avhengig av tid og sted"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Når nattmodus er på"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Bruk et mørkt tema for Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Juster fargen"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Juster lysstyrken"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Det mørke temaet brukes på kjerneområdene i Android OS som vanligvis vises i et lyst tema, for eksempel Innstillinger."</string>
- <string name="color_apply" msgid="9212602012641034283">"Bruk"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Bekreft innstillingene"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Noen fargeinnstillinger kan gjøre denne enheten ubrukelig. Klikk på OK for å bekrefte disse fargeinnstillingene, ellers blir de tilbakestilt etter ti sekunder."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Batteribruk"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterisparing er ikke tilgjengelig under lading"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterisparing"</string>
diff --git a/packages/SystemUI/res/values-ne-rNP/config.xml b/packages/SystemUI/res/values-ne-rNP/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ne-rNP/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml
index 4f321cf..8e3681c 100644
--- a/packages/SystemUI/res/values-ne-rNP/strings.xml
+++ b/packages/SystemUI/res/values-ne-rNP/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"रोमिङ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"सेटिङहरू"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"सारांश।"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"बन्द गर्नुहोस्"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g>।"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>।"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi बन्द गरियो।"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi खुला गरियो।"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> सीमा"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावनी दिँदै"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"कार्य मोड"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"रात्रिको प्रकाश"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"रात्रिको प्रकाश सक्रिय छ, निष्क्रिय पार्न ट्याप गर्नुहोस्"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"रात्रिको प्रकाश निष्क्रिय छ, सक्रिय गर्न ट्याप गर्नुहोस्"</string>
<string name="recents_empty_message" msgid="808480104164008572">"हालका कुनै पनि वस्तुहरू छैनन्"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"तपाईँले सबै कुरा खाली गर्नुभएको छ"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"अनुप्रयोग जानकारी"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> भोल्यूम संवाद हो"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"मूललाई पुनर्स्थापना गर्न ट्याप गर्नुहोस्।"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"तपाईँले कार्य प्रोफाइल प्रयोग गर्दै हुनुहुन्छ"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"कल"</item>
+ <item msgid="5997713001067658559">"प्रणाली"</item>
+ <item msgid="7858983209929864160">"रिङटोन"</item>
+ <item msgid="1850038478268896762">"मिडिया"</item>
+ <item msgid="8265110906352372092">"अलार्म"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ब्लुटुथ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s। अनम्यूट गर्नका लागि ट्याप गर्नुहोस्।"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s। कम्पनमा सेट गर्नका लागि ट्याप गर्नुहोस्। पहुँच सम्बन्धी सेवाहरू म्यूट हुन सक्छन्।"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s। म्यूट गर्नका लागि ट्याप गर्नुहोस्। पहुँच सम्बन्धी सेवाहरू म्यूट हुन सक्छन्।"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"थप सेटिङहरू"</string>
<string name="notification_done" msgid="5279426047273930175">"सम्पन्न भयो"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> का सूचनाका लागि नियन्त्रणहरू"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"रंग र रूप"</string>
- <string name="night_mode" msgid="3540405868248625488">"रात्री मोड"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"प्रदर्शनको स्तर मिलाउनुहोस्"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"सक्रिय"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"निष्क्रिय"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"स्वतः सक्रिय पार्नुहोस्"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"स्थान र दिनको समयको लागि उपयुक्त रात्री मोडमा स्विच गर्नुहोस्"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"रात्री मोड सक्रिय हुँदा"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS का लागि गाढा रंगको विषयवस्तु प्रयोग गर्नुहोस्"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"रङ्गलाई समायोजन गर्नुहोस्"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"चमकलाई समायोजन गर्नुहोस्"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"गहिरो रंगको विषयवस्तुलाई Android OS का त्यस्ता मुख्य क्षेत्रहरूमा लागू गरिन्छ जसलाई सामान्यतया हल्का रंगमा देखाइन्छ, जस्तै सेटिङहरू।"</string>
- <string name="color_apply" msgid="9212602012641034283">"लागू गर्नुहोस्"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"सेटिङहरूको पुष्टि गर्नुहोस्"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"केही रङ सेटिङहरूले यस यन्त्रलाई अनुपयोगी बनाउन सक्छन्। यी रङ सेटिङहरू पुष्टि गर्न ठीक छ मा क्लिक गर्नुहोस्, अन्यथा यी सेटिङहरू १० सेकेण्डपछि रिसेट हुनेछन्।"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ब्याट्री उपयोग"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"चार्ज गर्ने समयमा ब्याट्री सेभर उपलब्ध छैन"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ब्याट्री सेभर"</string>
diff --git a/packages/SystemUI/res/values-nl/config.xml b/packages/SystemUI/res/values-nl/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-nl/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index 72f04bb..1015379 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Instellingen"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overzicht."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Sluiten"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Gebruiker: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi uitgeschakeld."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi ingeschakeld."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limiet van <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Waarschuwing voor <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Werkmodus"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nachtverlichting"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nachtverlichting is ingeschakeld. Tik om deze uit te schakelen."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nachtverlichting is uitgeschakeld. Tik om deze in te schakelen."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Geen recente items"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Je hebt alles gewist"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"App-informatie"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> is het volumedialoogvenster"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Tik om het origineel te herstellen."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"U gebruikt je werkprofiel"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Bellen"</item>
+ <item msgid="5997713001067658559">"Systeem"</item>
+ <item msgid="7858983209929864160">"Bellen"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tik om dempen op te heffen."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tik om in te stellen op trillen. Toegankelijkheidsservices kunnen zijn gedempt."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tik om te dempen. Toegankelijkheidsservices kunnen zijn gedempt."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Meer instellingen"</string>
<string name="notification_done" msgid="5279426047273930175">"Gereed"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Beheeropties voor <xliff:g id="APP_NAME">%1$s</xliff:g>-meldingen"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Kleur en uiterlijk"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nachtmodus"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Display kalibreren"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aan"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Uit"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Automatisch inschakelen"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Overschakelen naar nachtmodus indien van toepassing voor locatie en tijd van de dag"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Als nachtmodus is ingeschakeld"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Donker thema gebruiken voor Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Tint aanpassen"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Helderheid aanpassen"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Het donkere thema wordt toegepast op kerngedeelten van het Android-besturingssysteem die normaal gesproken worden weergegeven met een licht thema, zoals Instellingen."</string>
- <string name="color_apply" msgid="9212602012641034283">"Toepassen"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Instellingen bevestigen"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Bij sommige kleurinstellingen kan het apparaat onbruikbaar worden. Klik op OK om deze kleurinstellingen te bevestigen, anders worden deze instellingen na tien seconden gereset."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Accugebruik"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Accubesparing niet beschikbaar tijdens opladen"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Accubesparing"</string>
diff --git a/packages/SystemUI/res/values-pa-rIN/config.xml b/packages/SystemUI/res/values-pa-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-pa-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml
index d9cb04f..90334b0 100644
--- a/packages/SystemUI/res/values-pa-rIN/strings.xml
+++ b/packages/SystemUI/res/values-pa-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ਰੋਮਿੰਗ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ਕਿਨਾਰਾ"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ਸੈਟਿੰਗਾਂ"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"ਰੂਪ-ਰੇਖਾ।"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"ਬੰਦ ਕਰੋ"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g>।"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>।"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi ਬੰਦ ਕੀਤਾ।"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi ਚਾਲੂ ਕੀਤਾ।"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ਸੀਮਾ"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ਚਿਤਾਵਨੀ"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"ਕੰਮ ਮੋਡ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"ਰਾਤਰੀ ਲਾਈਟ"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"ਰਾਤਰੀ ਲਾਈਟ ਚਾਲੂ ਹੈ, ਬੰਦ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"ਰਾਤਰੀ ਲਾਈਟ ਬੰਦ ਹੈ, ਚਾਲੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ਕੋਈ ਹਾਲੀਆ ਆਈਟਮਾਂ ਨਹੀਂ"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ਤੁਸੀਂ ਸਭ ਕੁਝ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਹੈ"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ਐਪਲੀਕੇਸ਼ਨ ਜਾਣਕਾਰੀ"</string>
@@ -344,8 +348,7 @@
<string name="zen_silence_introduction" msgid="3137882381093271568">"ਇਹ ਅਲਾਰਮ, ਸੰਗੀਤ, ਵੀਡੀਓਜ਼, ਅਤੇ ਗੇਮਸ ਸਮੇਤ, ਸਾਰੀਆਂ ਧੁਨੀਆਂ ਅਤੇ ਵਾਇਬ੍ਰੇਸ਼ਨ ਨੂੰ ਬਲੌਕ ਕਰਦਾ ਹੈ।"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"ਹੇਠਾਂ ਘੱਟ ਲਾਜ਼ਮੀ ਸੂਚਨਾਵਾਂ"</string>
- <!-- no translation found for notification_tap_again (7590196980943943842) -->
- <skip />
+ <string name="notification_tap_again" msgid="7590196980943943842">"ਖੋਲ੍ਹਣ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
<string name="keyguard_unlock" msgid="8043466894212841998">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string>
<string name="phone_hint" msgid="4872890986869209950">"ਫ਼ੋਨ ਲਈ ਆਈਕਨ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="voice_hint" msgid="8939888732119726665">"ਵੌਇਸ ਅਸਿਸਟ ਲਈ ਆਈਕਨ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
@@ -435,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵੋਲਯੂਮ ਡਾਇਲੌਗ ਹੈ"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"ਅਸਲ ਨੂੰ ਮੁੜ-ਬਹਾਲ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"ਤੁਸੀਂ ਆਪਣੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਵਰਤ ਰਹੇ ਹੋ"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ਕਾਲ ਕਰੋ"</item>
+ <item msgid="5997713001067658559">"ਸਿਸਟਮ"</item>
+ <item msgid="7858983209929864160">"ਰਿੰਗ ਕਰੋ"</item>
+ <item msgid="1850038478268896762">"ਮੀਡੀਆ"</item>
+ <item msgid="8265110906352372092">"ਅਲਾਰਮ"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"ਬਲੂਟੁੱਥ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s। ਅਣਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s। ਥਰਥਰਾਹਟ ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ। ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਮਿਊਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s। ਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ। ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਮਿਊਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string>
@@ -505,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"ਹੋਰ ਸੈਟਿੰਗਾਂ"</string>
<string name="notification_done" msgid="5279426047273930175">"ਹੋ ਗਿਆ"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਸੂਚਨਾ ਕੰਟਰੋਲ"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"ਰੰਗ ਅਤੇ ਵਿਖਾਲਾ"</string>
- <string name="night_mode" msgid="3540405868248625488">"ਰਾਤ ਮੋਡ"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ਡਿਸਪਲੇ ਨੂੰ ਕੈਲੀਬ੍ਰੇਟ ਕਰੋ"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ਚਾਲੂ"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ਬੰਦ"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ਟਿਕਾਣੇ ਅਤੇ ਦਿਨ ਦੇ ਸਮੇਂ ਲਈ ਢੁਕਵੇਂ ਰਾਤ ਮੋਡ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"ਜਦੋਂ ਰਾਤ ਮੋਡ ਚਾਲੂ ਹੋਵੇ"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS ਲਈ ਗੂੜ੍ਹੇ ਥੀਮ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ਟਿੰਟ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ਚਮਕ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ Android OS ਦੇ ਉਹਨਾਂ ਮੁੱਖ ਖੇਤਰਾਂ \'ਤੇ ਲਾਗੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਜੋ ਆਮ ਤੌਰ \'ਤੇ ਇੱਕ ਹਲਕੇ ਥੀਮ ਵਿੱਚ ਵਿਖਾਏ ਜਾਂਦੇ ਹਨ, ਜਿਵੇਂ ਕਿ ਸੈਟਿੰਗਾਂ।"</string>
- <string name="color_apply" msgid="9212602012641034283">"ਲਾਗੂ ਕਰੋ"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ਸੈਟਿੰਗਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"ਕੁਝ ਰੰਗ ਸੈਟਿੰਗਾਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਬੇਕਾਰ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਇਹਨਾਂ ਰੰਗ ਸੈਟਿੰਗਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਠੀਕ \'ਤੇ ਕਲਿੱਕ ਕਰੋ, ਨਹੀਂ ਤਾਂ ਇਹ ਸੈਟਿੰਗਾਂ 10 ਸਕਿੰਟ ਬਾਅਦ ਮੁੜ-ਸੈੱਟ ਹੋ ਜਾਣਗੀਆਂ।"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ਬੈਟਰੀ ਸੇਵਰ ਚਾਰਜਿੰਗ ਦੌਰਾਨ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"ਬੈਟਰੀ ਸੇਵਰ"</string>
diff --git a/packages/SystemUI/res/values-pl/config.xml b/packages/SystemUI/res/values-pl/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-pl/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index 3cf8294..40caea2 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Ustawienia"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Przegląd."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zamknij"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Użytkownik: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi wyłączone."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi włączone."</string>
@@ -321,6 +322,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Ostrzeżenie: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Tryb pracy"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Podświetlenie nocne"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Podświetlenie nocne włączone – kliknij, by wyłączyć"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Podświetlenie nocne wyłączone – kliknij, by włączyć"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Brak ostatnich elementów"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Wszystko zostało wyczyszczone"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacje o aplikacji"</string>
@@ -438,6 +442,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> steruje głośnością"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Kliknij, by przywrócić ustawienie początkowe."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Używasz profilu do pracy"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Połączenie"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Dzwonek"</item>
+ <item msgid="1850038478268896762">"Multimedia"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Kliknij, by wyłączyć wyciszenie."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Kliknij, by włączyć wibracje. Ułatwienia dostępu mogą być wyciszone."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Kliknij, by wyciszyć. Ułatwienia dostępu mogą być wyciszone."</string>
@@ -508,21 +524,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Więcej ustawień"</string>
<string name="notification_done" msgid="5279426047273930175">"Gotowe"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> – ustawienia powiadomień"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Kolor i wygląd"</string>
- <string name="night_mode" msgid="3540405868248625488">"Tryb nocny"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibracja wyświetlacza"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Wł."</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Wył."</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Włącz automatycznie"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Przełączaj na tryb nocny odpowiednio do lokalizacji i pory dnia"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Gdy jest włączony tryb nocny"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Użyj motywu ciemnego dla Androida"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Dostosuj odcień"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Dostosuj jasność"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Motyw ciemny zostanie zastosowany do głównych obszarów Androida, które normalnie są jasne, takich jak Ustawienia."</string>
- <string name="color_apply" msgid="9212602012641034283">"Zastosuj"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Potwierdź ustawienia"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Niektóre ustawienia kolorów mogą utrudniać korzystanie z urządzenia. Kliknij OK, by potwierdzić te ustawienia kolorów. Jeśli tego nie zrobisz, zostaną one zresetowane po 10 sekundach."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Wykorzystanie baterii"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Oszczędzanie baterii nie jest dostępne podczas ładowania"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Oszczędzanie baterii"</string>
diff --git a/packages/SystemUI/res/values-pt-rBR/config.xml b/packages/SystemUI/res/values-pt-rBR/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-pt-rBR/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index 6feea20..63df40d 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Configurações"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Visão geral."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Fechar"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuário <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"O Wi-Fi foi desativado."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"O Wi-Fi foi ativado."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabalho"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Modo noturno"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Modo noturno ativado. Toque para desativar"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Modo noturno desativado. Toque para ativar"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nenhum item recente"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Você limpou tudo"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações do app"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> é a caixa de diálogo referente ao volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Toque para restaurar o original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Você está usando seu perfil de trabalho"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Chamar"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Tocar"</item>
+ <item msgid="1850038478268896762">"Mídia"</item>
+ <item msgid="8265110906352372092">"Alarme"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Toque para ativar o som."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Toque para configurar para vibrar. É possível que os serviços de acessibilidade sejam silenciados."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Toque para silenciar. É possível que os serviços de acessibilidade sejam silenciados."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Mais configurações"</string>
<string name="notification_done" msgid="5279426047273930175">"Concluído"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controles de notificação do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aparência"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modo noturno"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrar tela"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Ativado"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desativado"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Ativar automaticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Alternar para o modo noturno conforme apropriado para o local e hora do dia"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Quando o modo noturno está ativado"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Usar o tema escuro para o SO Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajustar tonalidade"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajustar brilho"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"O tema escuro é aplicado a áreas centrais do sistema operacional Android que normalmente são exibidas em um tema claro, como as configurações."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configurações"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algumas configurações de cor podem tornar o dispositivo inutilizável. Clique em \"OK\" para confirmar essas configurações de cor; caso contrário, essas configurações serão redefinidas após 10 segundos."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Uso da bateria"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"A Economia de bateria não fica disponível durante o carregamento"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Economia de bateria"</string>
diff --git a/packages/SystemUI/res/values-pt-rPT/config.xml b/packages/SystemUI/res/values-pt-rPT/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-pt-rPT/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index c393400..f2e2f61 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Definições"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Visão geral."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Fechar"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilizador <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi desligado."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi ligado."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabalho"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Luz noturna"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Luz noturna ativada; toque para desativar"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Luz noturna desativada; toque para ativar"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nenhum item recente"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Limpou tudo"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações da aplicação"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> é a caixa de diálogo do volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Toque para restaurar o original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Está a utilizar o seu perfil de trabalho"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Telefonar"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Tocar"</item>
+ <item msgid="1850038478268896762">"Multimédia"</item>
+ <item msgid="8265110906352372092">"Alarme"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Toque para reativar o som."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Toque para ativar a vibração. Os serviços de acessibilidade podem ser silenciados."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Toque para desativar o som. Os serviços de acessibilidade podem ser silenciados."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Mais definições"</string>
<string name="notification_done" msgid="5279426047273930175">"Concluído"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controlos de notificações do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aspeto"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modo noturno"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrar ecrã"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Ativado"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desativado"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Ligar automaticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Alternar para o Modo noturno consoante a localização e a hora do dia"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Quando o Modo noturno está ativado"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Utilizar o tema escuro para o SO Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajustar tonalidade"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajustar brilho"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"O tema escuro é aplicado a áreas essenciais do SO Android que são normalmente apresentadas num tema claro, como as Definições."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmar as definições"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algumas definições de cor podem tornar este dispositivo instável. Clique em OK para confirmar estas definições de cor. Caso contrário, estas definições serão repostas após 10 segundos."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Utiliz. da bateria"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Poupança de bateria não disponível durante o carregamento"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Poupança de bateria"</string>
diff --git a/packages/SystemUI/res/values-pt/config.xml b/packages/SystemUI/res/values-pt/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-pt/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index 6feea20..63df40d 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Configurações"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Visão geral."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Fechar"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuário <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"O Wi-Fi foi desativado."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"O Wi-Fi foi ativado."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabalho"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Modo noturno"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Modo noturno ativado. Toque para desativar"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Modo noturno desativado. Toque para ativar"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nenhum item recente"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Você limpou tudo"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações do app"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> é a caixa de diálogo referente ao volume"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Toque para restaurar o original."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Você está usando seu perfil de trabalho"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Chamar"</item>
+ <item msgid="5997713001067658559">"Sistema"</item>
+ <item msgid="7858983209929864160">"Tocar"</item>
+ <item msgid="1850038478268896762">"Mídia"</item>
+ <item msgid="8265110906352372092">"Alarme"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Toque para ativar o som."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Toque para configurar para vibrar. É possível que os serviços de acessibilidade sejam silenciados."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Toque para silenciar. É possível que os serviços de acessibilidade sejam silenciados."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Mais configurações"</string>
<string name="notification_done" msgid="5279426047273930175">"Concluído"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Controles de notificação do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aparência"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modo noturno"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrar tela"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Ativado"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Desativado"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Ativar automaticamente"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Alternar para o modo noturno conforme apropriado para o local e hora do dia"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Quando o modo noturno está ativado"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Usar o tema escuro para o SO Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajustar tonalidade"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajustar brilho"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"O tema escuro é aplicado a áreas centrais do sistema operacional Android que normalmente são exibidas em um tema claro, como as configurações."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configurações"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Algumas configurações de cor podem tornar o dispositivo inutilizável. Clique em \"OK\" para confirmar essas configurações de cor; caso contrário, essas configurações serão redefinidas após 10 segundos."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Uso da bateria"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"A Economia de bateria não fica disponível durante o carregamento"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Economia de bateria"</string>
diff --git a/packages/SystemUI/res/values-ro/config.xml b/packages/SystemUI/res/values-ro/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ro/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index 8c72f6a..6cdf7e1 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -144,7 +144,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -186,7 +188,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Setări"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Vizualizare generală"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Închideți"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilizatorul <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Conexiunea prin Wi-Fi este dezactivată."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Conexiunea prin Wi-Fi este activată."</string>
@@ -321,6 +322,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limită de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertizare: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modul de lucru"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Lumină de noapte"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Lumina de noapte este activată; atingeți pentru a o dezactiva"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Lumina de noapte este dezactivată; atingeți pentru a o activa"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Niciun element recent"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Ați șters tot"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informații despre aplicație"</string>
@@ -438,6 +442,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> afișează caseta de dialog pentru volum"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Atingeți pentru a restabili versiunea originală."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Acum folosiți profilul de serviciu"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Apel"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Sonerie"</item>
+ <item msgid="1850038478268896762">"Conținut media"</item>
+ <item msgid="8265110906352372092">"Alarmă"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Atingeți pentru a activa sunetul."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Atingeți pentru a seta vibrarea. Sunetul se poate dezactiva pentru serviciile de accesibilitate."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Atingeți pentru a dezactiva sunetul. Sunetul se poate dezactiva pentru serviciile de accesibilitate."</string>
@@ -508,21 +524,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Mai multe setări"</string>
<string name="notification_done" msgid="5279426047273930175">"Terminat"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Opțiuni privind notificările pentru <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Culoare și aspect"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modul Noapte"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Calibrați afișarea"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Activat"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Dezactivat"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Activați automat"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Comutați la modul Noapte în funcție de locație și de momentul zilei"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Când modul Noapte este activat"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Folosiți tema întunecată pentru SO Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Ajustați culoarea"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Ajustați luminozitatea"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tema întunecată se aplică zonelor principale ale sistemului de operare Android care sunt de obicei afișate cu o temă deschisă la culoare, cum ar fi Setările."</string>
- <string name="color_apply" msgid="9212602012641034283">"Aplicați"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Confirmați setările"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Unele setări pentru culori pot face dispozitivul să nu mai funcționeze. Dați clic pe OK pentru a confirma aceste setări pentru culori. În caz contrar, acestea se vor reseta după 10 secunde."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Utilizarea bateriei"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Economisirea bateriei nu este disponibilă pe durata încărcării"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Economisirea bateriei"</string>
diff --git a/packages/SystemUI/res/values-ru/config.xml b/packages/SystemUI/res/values-ru/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ru/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index 062ea48..ed7c46f 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роуминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Настройки"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Обзор."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Закрыть"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Пользователь <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Модуль Wi-Fi отключен."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Модуль Wi-Fi включен."</string>
@@ -323,6 +324,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Рабочий режим"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Ночной режим"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Ночной режим включен. Нажмите, чтобы отключить."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Ночной режим отключен. Нажмите, чтобы включить."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Недавних приложений нет"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Вы очистили всё"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Сведения о приложении"</string>
@@ -440,6 +444,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> назначено регулятором громкости"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Нажмите, чтобы восстановить оригинал"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Вы перешли в рабочий профиль"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Вызов"</item>
+ <item msgid="5997713001067658559">"Система"</item>
+ <item msgid="7858983209929864160">"Рингтон"</item>
+ <item msgid="1850038478268896762">"Мультимедиа"</item>
+ <item msgid="8265110906352372092">"Будильник"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Нажмите, чтобы включить звук."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Нажмите, чтобы включить вибрацию. Специальные возможности могут прекратить работу."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Нажмите, чтобы выключить звук. Специальные возможности могут прекратить работу."</string>
@@ -510,21 +526,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Другие настройки"</string>
<string name="notification_done" msgid="5279426047273930175">"Готово"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Управление уведомлениями (<xliff:g id="APP_NAME">%1$s</xliff:g>)"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Цвета и стиль"</string>
- <string name="night_mode" msgid="3540405868248625488">"Ночной режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Калибровка дисплея"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Включен"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Отключен"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Включать автоматически"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Включать ночной режим с учетом местоположения и времени суток"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"В ночном режиме"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Использовать темное оформление для Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Изменять оттенок"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Яркость"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Темное оформление применяется к основным элементам системы Android (таким, как приложение \"Настройки\"), которые обычно показываются в светлом."</string>
- <string name="color_apply" msgid="9212602012641034283">"Применить"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Подтвердите настройки"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Некоторые цветовые настройки могут затруднить работу с устройством. Чтобы применить выбранные параметры, нажмите \"ОК\". В противном случае они будут сброшены через 10 секунд."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Уровень заряда"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режим энергосбережения нельзя включить во время зарядки"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим энергосбережения"</string>
diff --git a/packages/SystemUI/res/values-si-rLK/config.xml b/packages/SystemUI/res/values-si-rLK/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-si-rLK/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml
index 90f75a6..641a047 100644
--- a/packages/SystemUI/res/values-si-rLK/strings.xml
+++ b/packages/SystemUI/res/values-si-rLK/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"රෝමිං"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"සැකසීම්"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"දළ විශ්ලේෂණය."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"වසන්න"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"පරිශීලකයා <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi අක්රියයි."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi සක්රියයි."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> සීමිත"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> අවවාද කිරීම"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"වැඩ ප්රකාරය"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"රාත්රී ආලෝකය"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"රාත්රී ආලෝකය ක්රියාත්මකයි, ක්රියාවිරහිත කිරීමට තට්ටු කරන්න"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"රාත්රී ආලෝකය ක්රියාවිරහිතයි, ක්රියාත්මක කිරීමට තට්ටු කරන්න"</string>
<string name="recents_empty_message" msgid="808480104164008572">"මෑත අයිතම නැත"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ඔබ සියලු දේ හිස් කර ඇත"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"යෙදුම් තොරතුරු"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ධාරිතා සංවාදයයි"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"මුල් තත්ත්වය නැවත ප්රතිසාධනය කිරීමට තට්ටු කරන්න."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"ඔබ ඔබේ කාර්යාල පැතිකඩ භාවිත කරමින් සිටී"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"ඇමතුම"</item>
+ <item msgid="5997713001067658559">"පද්ධතිය"</item>
+ <item msgid="7858983209929864160">"නාද කරන්න"</item>
+ <item msgid="1850038478268896762">"මාධ්ය"</item>
+ <item msgid="8265110906352372092">"එලාමය"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"බ්ලූටූත්"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. නිහඬ කිරීම ඉවත් කිරීමට තට්ටු කරන්න."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. කම්පනය කිරීමට තට්ටු කරන්න. ප්රවේශ්යතා සේවා නිහඬ කළ හැකිය."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. නිහඬ කිරීමට තට්ටු කරන්න. ප්රවේශ්යතා සේවා නිහඬ කළ හැකිය."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"තව සැකසීම්"</string>
<string name="notification_done" msgid="5279426047273930175">"නිමයි"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> දැනුම්දීම් පාලන"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"වර්ණය සහ පෙනුම"</string>
- <string name="night_mode" msgid="3540405868248625488">"රාත්රී ප්රකාරය"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"සංදර්ශකය ක්රමාංකනය කරන්න"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ක්රියාත්මකයි"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ක්රියාවිරහිතයි"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"ස්වයංක්රියව ක්රියාත්මක කරන්න"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"ස්ථානය සහ දවසේ වේලාවට ගැළපෙන ලෙස රාත්රී ප්රකාරයට මාරු වන්න"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"රාත්රී ප්රකාරය ක්රියාත්මක විට"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS සඳහා අඳුරු තේමාව භාවිත කරන්න"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"පැහැය සීරුමාරු කරන්න"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"දීප්තිය සීරුමාරු කරන්න"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"සැකසීම් වැනි, සාමාන්යයෙන් ලා පැහැ තේමාවක සංදර්ශනය වන Android OS හි මූලික ප්රදේශවලට අඳුරු තේමාව යෙදේ."</string>
- <string name="color_apply" msgid="9212602012641034283">"යොදන්න"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"සැකසීම් තහවුරු කරන්න"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"සමහර වර්ණ සැකසීම් මෙම උපාංගය භාවිත කළ නොහැකි තත්ත්වයට පත් කළ හැකිය. මෙම වර්ණ සැකසීම් තහවුරු කිරීමට හරි ක්ලික් කරන්න, නැතහොත් මෙම සැකසීම් තත්පර 10කට පසුව යළි සකසනු ඇත."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"බැටරි භාවිතය"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ආරෝපණය අතරතුර බැටරි සුරැකුම ලබා ගත නොහැකිය."</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"බැටරි සුරැකුම"</string>
diff --git a/packages/SystemUI/res/values-sk/config.xml b/packages/SystemUI/res/values-sk/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-sk/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index f0537c3..ac96132 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Nastavenia"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Prehľad"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zavrieť"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Používateľ: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Pripojenie Wi-Fi je vypnuté."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Pripojenie Wi-Fi je zapnuté."</string>
@@ -323,10 +324,13 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozornenie pri <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Pracovný režim"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nočný režim"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nočný režim je zapnutý (vypnete ho klepnutím)"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nočný režim je vypnutý (zapnete ho klepnutím)"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Žiadne nedávne položky"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vymazali ste všetko"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informácie o aplikácii"</string>
- <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripnutie k obrazovke"</string>
+ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripnutie obrazovky"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"hľadať"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikáciu <xliff:g id="APP">%s</xliff:g> sa nepodarilo spustiť"</string>
<string name="recents_launch_disabled_message" msgid="1624523193008871793">"Aplikácia <xliff:g id="APP">%s</xliff:g> je v núdzovom režime zakázaná."</string>
@@ -440,6 +444,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> je dialóg hlasitosti"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Klepnutím obnovíte pôvodnú verziu."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Používate svoj pracovný profil."</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Hovor"</item>
+ <item msgid="5997713001067658559">"Systém"</item>
+ <item msgid="7858983209929864160">"Zvonenie"</item>
+ <item msgid="1850038478268896762">"Médiá"</item>
+ <item msgid="8265110906352372092">"Budík"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Klepnutím zapnite zvuk."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Klepnutím aktivujte režim vibrovania. Služby dostupnosti je možné stlmiť."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Klepnutím vypnite zvuk. Služby dostupnosti je možné stlmiť."</string>
@@ -510,21 +526,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Ďalšie nastavenia"</string>
<string name="notification_done" msgid="5279426047273930175">"Hotovo"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Ovládacie prvky pre upozornenia z aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Farba a vzhľad"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nočný režim"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrovať obrazovku"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Zapnutý"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Vypnutý"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Zapínať automaticky"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Prepnúť do Nočného režimu podľa miesta a času dňa"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Keď je zapnutý Nočný režim"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Použiť tmavý motív pre systém Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Upraviť tónovanie"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Upraviť jas"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"V hlavných oblastiach systému Android OS (ako sú Nastavenia), ktoré sú obyčajne zobrazené vo svetlom motíve, je použitý tmavý motív."</string>
- <string name="color_apply" msgid="9212602012641034283">"Použiť"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Potvrdenie nastavení"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Niektoré nastavenia farieb môžu toto zariadenie znefunkčniť. Tieto nastavenia farieb potvrdíte kliknutím na tlačidlo OK, ináč sa tieto nastavenia o 10 sekúnd obnovia."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Využitie batérie"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Počas nabíjania nie je Šetrič batérie k dispozícii"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Šetrič batérie"</string>
@@ -591,12 +592,12 @@
<string name="end" msgid="125797972524818282">"Koniec"</string>
<string name="space" msgid="804232271282109749">"Medzerník"</string>
<string name="menu_ime" msgid="4943221416525250684">"Prepínač – ponuka/klávesnica"</string>
- <string name="select_button" msgid="1597989540662710653">"Výber tlačidla, ktoré sa má pridať"</string>
+ <string name="select_button" msgid="1597989540662710653">"Výber tlačidla"</string>
<string name="add_button" msgid="4134946063432258161">"Pridať tlačidlo"</string>
<string name="save" msgid="2311877285724540644">"Uložiť"</string>
<string name="reset" msgid="2448168080964209908">"Obnoviť"</string>
- <string name="no_home_title" msgid="1563808595146071549">"Tlačidlo Plocha sa nenašlo"</string>
- <string name="no_home_message" msgid="5408485011659260911">"Ak chcete používať navigáciu v tomto zariadení, musíte použiť tlačidlo Plocha. Pred uložením pridajte tlačidlo Plocha."</string>
+ <string name="no_home_title" msgid="1563808595146071549">"Nenašlo sa tlačidlo plochy"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Ak chcete používať navigáciu v tomto zariadení, musíte použiť tlačidlo plochy. Pred uložením pridajte tlačidlo plochy."</string>
<string name="adjust_button_width" msgid="6138616087197632947">"Upraviť šírku tlačidla"</string>
<string name="clipboard" msgid="1313879395099896312">"Schránka"</string>
<string name="clipboard_description" msgid="3819919243940546364">"Schránka umožňuje presunúť položky priamo do schránky. Ak ju máte k dispozícii, môžete ich z nej aj priamo vytiahnuť."</string>
diff --git a/packages/SystemUI/res/values-sl/config.xml b/packages/SystemUI/res/values-sl/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-sl/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 4eafc0b..38a4cce 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Gostovanje"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Nastavitve"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Pregled."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Zapri"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Uporabnik: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi je izklopljen."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi je vklopljen."</string>
@@ -323,6 +324,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Omejitev: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Opozorilo – <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Način za delo"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nočna svetloba"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nočna svetloba je vklopljena. Dotaknite se, če jo želite izklopiti."</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nočna svetloba je izklopljena. Dotaknite se, če jo želite vklopiti."</string>
<string name="recents_empty_message" msgid="808480104164008572">"Ni nedavnih elementov"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vse te počistili"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Podatki o aplikaciji"</string>
@@ -440,6 +444,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> je pogovorno okno glede prostornine"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Dotaknite se, če želite obnoviti prvotno stanje."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Uporabljate delovni profil"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Klic"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Zvonjenje"</item>
+ <item msgid="1850038478268896762">"Predstavnost"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Dotaknite se, če želite vklopiti zvok."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Dotaknite se, če želite nastaviti vibriranje. V storitvah za ljudi s posebnimi potrebami bo morda izklopljen zvok."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Dotaknite se, če želite izklopiti zvok. V storitvah za ljudi s posebnimi potrebami bo morda izklopljen zvok."</string>
@@ -510,21 +526,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Več nastavitev"</string>
<string name="notification_done" msgid="5279426047273930175">"Dokončano"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrolniki obvestil za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Barva in videz"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nočni način"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Umerjanje zaslona"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Vklopljeno"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Izklopljeno"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Samodejni vklop"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Preklop v nočni način, kot je ustrezno glede na lokacijo in uro v dnevu"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Ko je vklopljen nočni način"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Uporaba temne teme za sistem Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Prilagodi odtenek"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Prilagodi svetlost"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Za osrednja področja sistema Android, ki so običajno prikazana v svetli temi, na primer nastavitve, je uporabljena temna tema."</string>
- <string name="color_apply" msgid="9212602012641034283">"Uporabi"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Potrditev nastavitev"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Zaradi nekaterih barvnih nastavitev lahko postane ta naprava neuporabna. Kliknite »V redu«, če želite potrditi te barvne nastavitve. V nasprotnem primeru se bodo čez 10 sekund ponastavile na prvotno vrednost."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Poraba akumulatorja"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Varčevanje z energijo akumulatorja med polnjenjem ni na voljo"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Varčevanje z energijo akumulatorja"</string>
diff --git a/packages/SystemUI/res/values-sq-rAL/config.xml b/packages/SystemUI/res/values-sq-rAL/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-sq-rAL/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml
index 688e643..dab11af 100644
--- a/packages/SystemUI/res/values-sq-rAL/strings.xml
+++ b/packages/SystemUI/res/values-sq-rAL/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"Lidhje CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Cilësimet"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Përmbledhja."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Mbylle"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Përdoruesi <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi është i çaktivizuar."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi është i aktivizuar."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Kufiri: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Paralajmërim për kufirin prej <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modaliteti i punës"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Drita e natës"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Drita e natës është joaktive, trokit për ta çaktivizuar"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Drita e natës është joaktive, trokit për ta aktivizuar"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Nuk ka asnjë artikull të fundit"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"I ke pastruar të gjitha"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacioni i aplikacionit"</string>
@@ -344,8 +348,7 @@
<string name="zen_silence_introduction" msgid="3137882381093271568">"Kjo bllokon TË GJITHË tingujt dhe dridhjet, duke përfshirë edhe nga alarmet, muzika, videot dhe lojërat."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Njoftimet më pak urgjente, më poshtë!"</string>
- <!-- no translation found for notification_tap_again (7590196980943943842) -->
- <skip />
+ <string name="notification_tap_again" msgid="7590196980943943842">"Trokit përsëri për ta hapur"</string>
<string name="keyguard_unlock" msgid="8043466894212841998">"Rrëshqit për të shkyçur"</string>
<string name="phone_hint" msgid="4872890986869209950">"Rrëshqit për të hapur telefonin"</string>
<string name="voice_hint" msgid="8939888732119726665">"Rrëshqit për të hapur ndihmën zanore"</string>
@@ -435,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> është dialogu i volumit"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Trokit për të restauruar origjinalin."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Po përdor profilin tënd të punës"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Telefono"</item>
+ <item msgid="5997713001067658559">"Sistemi"</item>
+ <item msgid="7858983209929864160">"Bjeri ziles"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarmi"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Trokit për të aktivizuar."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Trokit për ta caktuar te dridhja. Shërbimet e qasshmërisë mund të çaktivizohen."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Trokit për të çaktivizuar. Shërbimet e qasshmërisë mund të çaktivizohen."</string>
@@ -505,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Cilësime të tjera"</string>
<string name="notification_done" msgid="5279426047273930175">"U krye"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Kontrollet e njoftimeve të <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Ngjyra dhe pamja"</string>
- <string name="night_mode" msgid="3540405868248625488">"Modaliteti i natës"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibro ekranin"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aktiv"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Joaktiv"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Aktivizoje automatikisht"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Kalo në \"Modalitetin e natës\" sipas përshtatshmërisë për vendin dhe kohën e ditës"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kur \"Modaliteti i natës\" është aktiv"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Përdor temën e errët për Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Rregullo nuancën"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Rregullo ndriçimin"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Tema e errët zbatohet në zonat kryesore të Android OS që shfaqen zakonisht në një temë të çelur, siç janë \"Cilësimet\"."</string>
- <string name="color_apply" msgid="9212602012641034283">"Zbato"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Konfirmo cilësimet"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Disa cilësime ngjyrash mund ta bëjnë këtë pajisje të papërdorshme. Kliko OK për të konfirmuar këto cilësime ngjyrash, përndryshe këto cilësime do të rivendosen pas 10 sekondash."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Përdorimi i baterisë"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"\"Kursyesi i baterisë\" nuk është i disponueshëm gjatë karikimit"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Kursyesi i baterisë"</string>
diff --git a/packages/SystemUI/res/values-sr/config.xml b/packages/SystemUI/res/values-sr/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-sr/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index 2bfdc88..8a649a3 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -144,7 +144,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роминг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -184,7 +186,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Подешавања"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Преглед."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Затвори"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Корисник: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi је искључен."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi је укључен."</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничење од <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Упозорење за <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Режим рада"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Ноћно светло"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Ноћно светло је укључено, додирните да бисте га искључили"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Ноћно светло је искључено, додирните да бисте га укључили"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Нема недавних ставки"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Обрисали сте све"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Информације о апликацији"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> је дијалог за јачину звука"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Додирните да бисте вратили оригинал."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Користите профил за Work"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Позови"</item>
+ <item msgid="5997713001067658559">"Систем"</item>
+ <item msgid="7858983209929864160">"Прстен"</item>
+ <item msgid="1850038478268896762">"Медијуми"</item>
+ <item msgid="8265110906352372092">"Аларм"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Додирните да бисте укључили звук."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Додирните да бисте подесили на вибрацију. Звук услуга приступачности ће можда бити искључен."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Додирните да бисте искључили звук. Звук услуга приступачности ће можда бити искључен."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Још подешавања"</string>
<string name="notification_done" msgid="5279426047273930175">"Готово"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Контроле обавештења за апликацију <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Боја и изглед"</string>
- <string name="night_mode" msgid="3540405868248625488">"Ноћни режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Калибришите екран"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Укључено"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Искључено"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Аутоматски укључи"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Пређите на ноћни режим у зависности од локације и доба дана"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Када је ноћни режим укључен"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Користи тамну тему за Android ОС"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Прилагоди сенку"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Прилагоди осветљеност"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Тамна тема се примењује на кључне делове Android ОС-а који се обично приказују у светлој теми, попут Подешавања."</string>
- <string name="color_apply" msgid="9212602012641034283">"Примени"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Потврдите подешавања"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Нека подешавања боја могу да учине уређај неупотребљивим. Кликните на Потврди да бисте потврдили ова подешавања боја, пошто ће се у супротном ова подешавања ресетовати након 10 секунди."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Потрошња батерије"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Уштеда батерије није доступна током пуњења"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Уштеда батерије"</string>
diff --git a/packages/SystemUI/res/values-sv/config.xml b/packages/SystemUI/res/values-sv/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-sv/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index 7c2f3af..5164d34 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Inställningar"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Översikt."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Stäng"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Användare <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi har inaktiverats."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi har aktiverats."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Gräns: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Varning <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbetsläge"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Nattljus"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Nattljus har aktiverats. Tryck för att inaktivera"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Nattljus har inaktiverats. Tryck för att aktivera"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Listan med de senaste åtgärderna är tom"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du har tömt listan"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformation"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> används som volymkontroll"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Återställ originalet genom att trycka här."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Du använder din jobbprofil"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Ring"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Ring"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tryck här om du vill slå på ljudet."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tryck här om du vill sätta på vibrationen. Tillgänglighetstjänster kanske inaktiveras."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tryck här om du vill stänga av ljudet. Tillgänglighetstjänsterna kanske inaktiveras."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Fler inställningar"</string>
<string name="notification_done" msgid="5279426047273930175">"Klar"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Inställningar för <xliff:g id="APP_NAME">%1$s</xliff:g>-aviseringar"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Färg och utseende"</string>
- <string name="night_mode" msgid="3540405868248625488">"Nattläge"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Kalibrera skärmen"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Aktiverat"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Inaktiverat"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Aktivera automatiskt"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Byt till Nattläge vid passande platser och tider på dygnet"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"När Nattläget är aktiverat"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Använd mörkt tema för Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Justera ton"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Justera ljusstyrka"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Det mörka temat används för kärnfunktioner i Android OS som brukar visas med ett ljust tema, t.ex. inställningarna."</string>
- <string name="color_apply" msgid="9212602012641034283">"Verkställ"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Bekräfta inställningarna"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Vissa färginställningar kan göra den här enheten oanvändbar. Klicka på OK om du vill bekräfta färginställningarna, annars återställs inställningarna efter 10 sekunder."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Batteriförbrukning"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterisparläget är inte tillgängligt vid laddning"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterisparläge"</string>
diff --git a/packages/SystemUI/res/values-sw/config.xml b/packages/SystemUI/res/values-sw/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-sw/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index 28b6153..3b29591 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Inatumia data nje mtandao wako wa kawaida"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Ukingo"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Mipangilio"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Muhtasari."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Funga"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Mtumiaji <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi imezimwa."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi imewashwa."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"kikomo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Onyo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Hali ya kazi"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Mwanga wa Usiku"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Umewasha hali ya Mwanga wa Usiku, gonga ili uizime"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Umezima hali ya Mwanga wa Usiku, gonga ili uiwashe"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Hakuna vipengee vya hivi karibuni"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Umeondoa vipengee vyote"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Maelezo ya Programu"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ni mazungumzo ya sauti"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Gonga ili urejeshe picha ya asili."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Unatumia wasifu wako wa kazini"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Piga simu"</item>
+ <item msgid="5997713001067658559">"Mfumo"</item>
+ <item msgid="7858983209929864160">"Pete"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Kengele"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Gonga ili urejeshe."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Gonga ili uweke mtetemo. Huenda ikakomesha huduma za zana za walio na matatizo ya kuona au kusikia."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Gonga ili ukomeshe. Huenda ikakomesha huduma za zana za walio na matatizo ya kuona au kusikia."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Mipangilio zaidi"</string>
<string name="notification_done" msgid="5279426047273930175">"Nimemaliza"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Vidhibiti vya arifa za <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Rangi na mwonekano"</string>
- <string name="night_mode" msgid="3540405868248625488">"Hali ya usiku"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Rekebisha onyesho"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Imewashwa"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Imezimwa"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Washa kiotomatiki"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Badilisha kuwa Hali ya Usiku kulingana na mahali na wakati"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Hali ya Usiku inapowashwa"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Tumia mandhari ya giza katika Mfumo wa Uendeshaji wa Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Rekebisha kivulivuli"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Rekebisha mwangaza"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Mandhari yenye giza yametumika katika maeneo muhimu ya Mfumo wa Uendeshaji wa Android ambayo kwa kawaida huonyeshwa katika mandhari yenye mwangaza, kama vile Mipangilio."</string>
- <string name="color_apply" msgid="9212602012641034283">"Tumia"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Thibitisha mipangilio"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Baadhi ya mipangilio ya rangi inaweza kufanya kifaa hiki kisitumike. Bofya Sawa ili uthibitishe mipangilio hii ya rangi, vinginevyo, mipangilio hii itajiweka upya baada ya sekunde 10."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Matumizi ya betri"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Kiokoa Betri hakipatikani unapochaji betri"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Kiokoa Betri"</string>
diff --git a/packages/SystemUI/res/values-ta-rIN/config.xml b/packages/SystemUI/res/values-ta-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ta-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml
index d7ba719..ace768a 100644
--- a/packages/SystemUI/res/values-ta-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ta-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ரோமிங்"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"அமைப்பு"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"மேலோட்டப் பார்வை."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"மூடு"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"பயனர் <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"வைஃபை முடக்கப்பட்டது."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"வைஃபை இயக்கப்பட்டது."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> வரம்பு"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> எச்சரிக்கை"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"பணிப் பயன்முறை"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"இரவு ஒளி"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"இரவு ஒளி இயக்கப்பட்டுள்ளது. முடக்க, தட்டவும்"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"இரவு ஒளி முடக்கப்பட்டுள்ளது. இயக்க, தட்டவும்"</string>
<string name="recents_empty_message" msgid="808480104164008572">"சமீபத்திய பணிகள் இல்லை"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"எல்லாவற்றையும் அழித்துவிட்டீர்கள்"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"பயன்பாட்டு தகவல்"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"ஒலியளவு செய்தி: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"அசலை மீட்டமைக்க, தட்டவும்."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"பணி சுயவிவரத்தைப் பயன்படுத்துகிறீர்கள்"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"அழைப்பு"</item>
+ <item msgid="5997713001067658559">"சாதனம்"</item>
+ <item msgid="7858983209929864160">"ரிங்"</item>
+ <item msgid="1850038478268896762">"மீடியா"</item>
+ <item msgid="8265110906352372092">"அலாரம்"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"புளூடூத்"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. ஒலி இயக்க, தட்டவும்."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. அதிர்விற்கு அமைக்க, தட்டவும். அணுகல்தன்மை சேவைகள் ஒலியடக்கப்படக்கூடும்."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. ஒலியடக்க, தட்டவும். அணுகல்தன்மை சேவைகள் ஒலியடக்கப்படக்கூடும்."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"மேலும் அமைப்புகள்"</string>
<string name="notification_done" msgid="5279426047273930175">"முடிந்தது"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> அறிவிப்புக் கட்டுப்பாடுகள்"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"வண்ணமும் தோற்றமும்"</string>
- <string name="night_mode" msgid="3540405868248625488">"இரவுப் பயன்முறை"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"திரையை அளவுத்திருத்தம் செய்"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"இயக்கத்தில்"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"முடக்கத்தில்"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"தானாகவே இயக்கு"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"இருப்பிடம் மற்றும் நேரத்தின்படி இரவுப் பயன்முறைக்கு மாற்று"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"இரவுப் பயன்முறை இயக்கப்பட்டிருக்கும் போது"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OSக்காக அடர் தீமினைப் பயன்படுத்து"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"டிண்ட்டைச் சரிசெய்"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ஒளிர்வைச் சரிசெய்"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"வழக்கமாக வெளிர் தீமில் காட்டப்படுகிற Android OS இன் முக்கிய பகுதிகளில் (எ.கா. அமைப்புகள்) அடர் தீம் பயன்படுத்தப்படுகிறது."</string>
- <string name="color_apply" msgid="9212602012641034283">"பயன்படுத்து"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"அமைப்புகளை உறுதிப்படுத்து"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"சில வண்ண அமைப்புகள் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாதபடி செய்யலாம். இந்த வண்ண அமைப்புகளை உறுதிப்படுத்த, சரி என்பதைக் கிளிக் செய்யவும், இல்லையெனில் இந்த அமைப்புகள் 10 வினாடிகளுக்குப் பின் மீட்டமைக்கப்படும்."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"பேட்டரி உபயோகம்"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"சார்ஜ் செய்யும் போது பேட்டரி சேமிப்பானைப் பயன்படுத்த முடியாது"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"பேட்டரி சேமிப்பான்"</string>
diff --git a/packages/SystemUI/res/values-te-rIN/config.xml b/packages/SystemUI/res/values-te-rIN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-te-rIN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml
index 1843ee4..0b38abc 100644
--- a/packages/SystemUI/res/values-te-rIN/strings.xml
+++ b/packages/SystemUI/res/values-te-rIN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"రోమింగ్"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ఎడ్జ్"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"సెట్టింగ్లు"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"అవలోకనం."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"మూసివేస్తుంది"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"వినియోగదారు <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"వైఫై ఆఫ్ చేయబడింది."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"వైఫై ఆన్ చేయబడింది."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> పరిమితి"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> హెచ్చరిక"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"పని మోడ్"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"రాత్రి కాంతి"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"రాత్రి కాంతి ఆన్లో ఉంది, ఆఫ్ చేయడానికి నొక్కండి"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"రాత్రి కాంతి ఆఫ్లో ఉంది, ఆన్ చేయడానికి నొక్కండి"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ఇటీవలి అంశాలు ఏవీ లేవు"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"మీరు అన్నింటినీ తీసివేసారు"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"అనువర్తన సమాచారం"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> అనేది వాల్యూమ్ డైలాగ్"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"అసలు దాన్ని పునరుద్ధరించడానికి నొక్కండి."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"మీరు మీ కార్యాలయ ప్రొఫైల్ను ఉపయోగిస్తున్నారు"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"కాల్"</item>
+ <item msgid="5997713001067658559">"సిస్టమ్"</item>
+ <item msgid="7858983209929864160">"రింగ్"</item>
+ <item msgid="1850038478268896762">"మీడియా"</item>
+ <item msgid="8265110906352372092">"అలారం"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"బ్లూటూత్"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. అన్మ్యూట్ చేయడానికి నొక్కండి."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. వైబ్రేషన్కు సెట్ చేయడానికి నొక్కండి. ప్రాప్యత సేవలు మ్యూట్ చేయబడవచ్చు."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. మ్యూట్ చేయడానికి నొక్కండి. ప్రాప్యత సేవలు మ్యూట్ చేయబడవచ్చు."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"మరిన్ని సెట్టింగ్లు"</string>
<string name="notification_done" msgid="5279426047273930175">"పూర్తయింది"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> నోటిఫికేషన్ నియంత్రణలు"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"రంగు మరియు కనిపించే తీరు"</string>
- <string name="night_mode" msgid="3540405868248625488">"రాత్రి మోడ్"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"డిస్ప్లేని క్రమాంకనం చేయండి"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"ఆన్లో ఉంది"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ఆఫ్లో ఉంది"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"స్వయంచాలకంగా ఆన్ చేయి"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"స్థానం మరియు రోజులో సమయానికి తగినట్లుగా రాత్రి మోడ్కి మారుస్తుంది"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"రాత్రి మోడ్ ఆన్లో ఉన్నప్పుడు"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS కోసం ముదురు రంగు థీమ్ ఉపయోగించండి"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"లేత రంగును సర్దుబాటు చేయండి"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ప్రకాశాన్ని సర్దుబాటు చేయండి"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"సాధారణంగా లేత రంగు థీమ్లో ప్రదర్శించబడే సెట్టింగ్ల వంటి Android OS ప్రధాన అంశాలకు ముదురు రంగు థీమ్ వర్తింపజేయబడుతుంది."</string>
- <string name="color_apply" msgid="9212602012641034283">"వర్తింపజేయి"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"సెట్టింగ్లను నిర్ధారించండి"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"కొన్ని రంగు సెట్టింగ్ల వలన ఈ పరికరం ఉపయోగించలేని విధంగా అయిపోవచ్చు. ఈ రంగు సెట్టింగ్లను నిర్ధారించడానికి సరే క్లిక్ చేయండి లేదంటే ఈ సెట్టింగ్లు 10 సెకన్ల తర్వాత రీసెట్ చేయబడతాయి."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"బ్యాటరీ వినియోగం"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ఛార్జ్ అవుతున్న సమయంలో బ్యాటరీ సేవర్ అందుబాటులో ఉండదు"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"బ్యాటరీ సేవర్"</string>
diff --git a/packages/SystemUI/res/values-th/config.xml b/packages/SystemUI/res/values-th/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-th/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index a20033a..57538fb 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"โรมมิ่ง"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"การตั้งค่า"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"ภาพรวม"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"ปิด"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ผู้ใช้ <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"ปิด Wi-Fi แล้ว"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"เปิด Wi-Fi แล้ว"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ขีดจำกัด <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"คำเตือน <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"โหมดการทำงาน"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"แสงตอนกลางคืน"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"แสงตอนกลางคืนเปิดอยู่ แตะเพื่อปิด"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"แสงตอนกลางคืนปิดอยู่ แตะเพื่อเปิด"</string>
<string name="recents_empty_message" msgid="808480104164008572">"ไม่มีรายการล่าสุด"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"คุณได้ล้างทุกอย่างแล้ว"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ข้อมูลแอปพลิเคชัน"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> เป็นช่องโต้ตอบระดับเสียง"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"แตะเพื่อคืนค่าเป็นค่าเดิม"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"คุณกำลังใช้โปรไฟล์งานของคุณ"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"โทร"</item>
+ <item msgid="5997713001067658559">"ระบบ"</item>
+ <item msgid="7858983209929864160">"ทำให้ส่งเสียง"</item>
+ <item msgid="1850038478268896762">"สื่อ"</item>
+ <item msgid="8265110906352372092">"การปลุก"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"บลูทูธ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s แตะเพื่อเปิดเสียง"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s แตะเพื่อตั้งค่าให้สั่น อาจมีการปิดเสียงบริการการเข้าถึง"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s แตะเพื่อปิดเสียง อาจมีการปิดเสียงบริการการเข้าถึง"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"การตั้งค่าเพิ่มเติม"</string>
<string name="notification_done" msgid="5279426047273930175">"เสร็จสิ้น"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"ส่วนควบคุมการแจ้งเตือนของ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"สีและลักษณะที่ปรากฏ"</string>
- <string name="night_mode" msgid="3540405868248625488">"โหมดกลางคืน"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"ปรับเทียบการแสดงผล"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"เปิด"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"ปิด"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"เปิดอัตโนมัติ"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"เปลี่ยนเป็นโหมดกลางคืนตามความเหมาะสมกับสถานที่และเวลาของวัน"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"เมื่อเปิดโหมดกลางคืน"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"ใช้ธีมสีเข้มสำหรับ Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ปรับการแต้มสี"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"ปรับความสว่าง"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ใช้ธีมสีเข้มในบริเวณสำคัญของระบบปฏิบัติการ Android ซึ่งปกติแล้วจะแสดงด้วยธีมสีอ่อน เช่น การตั้งค่า"</string>
- <string name="color_apply" msgid="9212602012641034283">"ใช้"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ยืนยันการตั้งค่า"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"การตั้งค่าสีบางอย่างอาจทำให้อุปกรณ์นี้ใช้งานไม่ได้ คลิกตกลงเพื่อยืนยันการตั้งค่าสีเหล่านี้ มิฉะนั้นระบบจะรีเซ็ตการตั้งค่าหลังจาก 10 วินาที"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"การใช้งานแบตเตอรี่"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"ไม่สามารถใช้โหมดประหยัดแบตเตอรี่ระหว่างการชาร์จ"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"โหมดประหยัดแบตเตอรี่"</string>
diff --git a/packages/SystemUI/res/values-tl/config.xml b/packages/SystemUI/res/values-tl/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-tl/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index 41326ab..3ad94eb 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Roaming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Mga Setting"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overview"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Isara"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User na si <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Na-off ang wifi."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Na-on ang wifi."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ang limitasyon"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Babala sa <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Night Light"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Naka-on ang Night Light, i-tap upang i-off"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Naka-off ang Night Light, i-tap upang i-on"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Walang mga kamakailang item"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Na-clear mo ang lahat"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Impormasyon ng Application"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"Ang <xliff:g id="APP_NAME">%1$s</xliff:g> ang volume dialog"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"I-tap upang i-restore ang orihinal."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Ginagamit mo ang iyong profile sa trabaho"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Tawag"</item>
+ <item msgid="5997713001067658559">"System"</item>
+ <item msgid="7858983209929864160">"Ipa-ring"</item>
+ <item msgid="1850038478268896762">"Media"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. I-tap upang i-unmute."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. I-tap upang itakda na mag-vibrate. Maaaring i-mute ang mga serbisyo sa Accessibility."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. I-tap upang i-mute. Maaaring i-mute ang mga serbisyo sa Accessibility."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Higit pang mga setting"</string>
<string name="notification_done" msgid="5279426047273930175">"Tapos Na"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Mga kontrol sa notification ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Kulay at hitsura"</string>
- <string name="night_mode" msgid="3540405868248625488">"Night mode"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"I-calibrate ang display"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Naka-on"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Naka-off"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Awtomatikong i-on"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Lumipat sa Night Mode kapag naaangkop sa lokasyon at oras"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Kapag naka-on ang Night Mode"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Gumamit ng madilim na tema para sa Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Isaayos ang tint"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Isaayos ang liwanag"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Ilalapat ang madilim na tema sa mga mahalagang bahagi ng Android OS na karaniwang ipinapakita nang may maliwanag na tema, gaya ng Mga Setting."</string>
- <string name="color_apply" msgid="9212602012641034283">"Ilapat"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Kumpirmahin ang mga setting"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Maaaring hindi magamit ang device na ito dahil sa ilang setting ng kulay. I-click ang OK upang kumpirmahin ang mga setting ng kulay na ito, kung hindi ay mare-reset ang mga setting na ito pagkatapos ng 10 segundo."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Paggamit ng baterya"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Hindi available ang Pangtipid sa Baterya kapag nagcha-charge"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Pangtipid sa Baterya"</string>
diff --git a/packages/SystemUI/res/values-tr/config.xml b/packages/SystemUI/res/values-tr/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-tr/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index e95785f..88a4f746 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Dolaşımda"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Ayarlar"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Genel Bakış."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Kapat"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Kullanıcı: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Kablosuz kapatıldı."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Kablosuz açıldı."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Sınır: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> uyarısı"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Çalışma modu"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Gece Işığı"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Geçe Işığı açık, kapatmak için dokunun"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Gece Işığı kapalı, açmak için dokunun"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Yeni öğe yok"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Her şeyi sildiniz"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Uygulama Bilgileri"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ses denetimi iletişim kutusu olarak ayarlandı"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Orijinali geri yüklemek için dokunun."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"İş profilinizi kullanıyorsunuz"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Çağrı"</item>
+ <item msgid="5997713001067658559">"Sistem"</item>
+ <item msgid="7858983209929864160">"Zili Çaldır"</item>
+ <item msgid="1850038478268896762">"Medya"</item>
+ <item msgid="8265110906352372092">"Alarm"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Sesi açmak için hafifçe dokunun."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Titreşime ayarlamak için hafifçe dokunun. Erişilebilirlik hizmetlerinin sesi kapatılabilir."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Sesi kapatmak için hafifçe dokunun. Erişilebilirlik hizmetlerinin sesi kapatılabilir."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Diğer ayarlar"</string>
<string name="notification_done" msgid="5279426047273930175">"Bitti"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> bildirim denetimleri"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Renk ve görünüm"</string>
- <string name="night_mode" msgid="3540405868248625488">"Gece modu"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Ekranı kalibre et"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Açık"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Kapalı"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Otomatik olarak aç"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Konuma ve günün saatine uygun şekilde Gece Modu\'na geç"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Gece Modu açık olduğunda"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS için koyu renk tema kullan"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Tonu ayarla"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Parlaklığı ayarla"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Koyu renk tema, Android OS\'nin normalde Ayarlar gibi açık renk bir temayla görüntülenen temel alanlarına uygulanır."</string>
- <string name="color_apply" msgid="9212602012641034283">"Uygula"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Ayarları onaylayın"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Bazı renkler bu cihazı kullanılmaz yapabilir. Bu renkleri onaylamak için Tamam\'ı tıklayın. Tıklamazsanız bu ayarlar 10 saniye sonra sıfırlanacaktır."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Pil kullanımı"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Şarj sırasında Pil Tasarrufu özelliği kullanılamaz"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Pil Tasarrufu"</string>
diff --git a/packages/SystemUI/res/values-uk/config.xml b/packages/SystemUI/res/values-uk/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-uk/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index f68521c..4820554 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -36,14 +36,14 @@
<string name="status_bar_latest_events_title" msgid="6594767438577593172">"Сповіщення"</string>
<string name="battery_low_title" msgid="6456385927409742437">"Низький рівень заряду акумулятора"</string>
<string name="battery_low_percent_format" msgid="2900940511201380775">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
- <string name="battery_low_percent_format_saver_started" msgid="6859235584035338833">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g>. Режим заощадження заряду акумулятора ввімкнено."</string>
+ <string name="battery_low_percent_format_saver_started" msgid="6859235584035338833">"Залишилося <xliff:g id="PERCENTAGE">%s</xliff:g>. Увімкнено режим енергозбереження."</string>
<string name="invalid_charger" msgid="4549105996740522523">"Заряджання USB не підтримується.\nВикористовуйте лише наданий у комплекті зарядний пристрій."</string>
<string name="invalid_charger_title" msgid="3515740382572798460">"Заряджання через USB не підтримується."</string>
<string name="invalid_charger_text" msgid="5474997287953892710">"Використовуйте лише зарядний пристрій, який постачається в комплекті."</string>
<string name="battery_low_why" msgid="4553600287639198111">"Налаштування"</string>
- <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Увімкнути режим заощадження заряду акумулятора?"</string>
+ <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Увімкнути режим енергозбереження?"</string>
<string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Увімкнути"</string>
- <string name="battery_saver_start_action" msgid="5576697451677486320">"Увімкнути режим заощадження заряду акумулятора"</string>
+ <string name="battery_saver_start_action" msgid="5576697451677486320">"Увімкнути режим енергозбереження"</string>
<string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Налаштування"</string>
<string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string>
<string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"Повертати екран автоматично"</string>
@@ -145,7 +145,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роумінг"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -187,7 +189,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Налаштування"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Огляд."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Закрити"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Користувач <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi вимкнено."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi увімкнено."</string>
@@ -323,6 +324,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Обмеження: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Застереження: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Робочий режим"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Нічний режим"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Нічний режим увімкнено. Торкніться, щоб вимкнути його"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Нічний режим вимкнено. Торкніться, щоб увімкнути його"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Немає нещодавніх завдань"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Ви очистили все"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Інформація про додаток"</string>
@@ -392,9 +396,9 @@
<string name="user_remove_user_title" msgid="4681256956076895559">"Видалити користувача?"</string>
<string name="user_remove_user_message" msgid="1453218013959498039">"Усі додатки й дані цього користувача буде видалено."</string>
<string name="user_remove_user_remove" msgid="7479275741742178297">"Видалити"</string>
- <string name="battery_saver_notification_title" msgid="237918726750955859">"Режим заощадження заряду акумулятора ввімкнено"</string>
+ <string name="battery_saver_notification_title" msgid="237918726750955859">"Режим енергозбереження ввімкнено"</string>
<string name="battery_saver_notification_text" msgid="820318788126672692">"Знижується продуктивність і обмежуються фонові дані"</string>
- <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Вимкнути режим заощадження заряду акумулятора"</string>
+ <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Вимкнути режим енергозбереження"</string>
<string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> отримає доступ до всіх даних, які відображаються на вашому екрані."</string>
<string name="media_projection_remember_text" msgid="3103510882172746752">"Більше не показувати"</string>
<string name="clear_all_notifications_text" msgid="814192889771462828">"Очистити все"</string>
@@ -440,6 +444,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> призначено регулятором гучності"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Торкніться, щоб відновити оригінал."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Ви в робочому профілі"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Виклик"</item>
+ <item msgid="5997713001067658559">"Система"</item>
+ <item msgid="7858983209929864160">"Дзвонити"</item>
+ <item msgid="1850038478268896762">"Медіа"</item>
+ <item msgid="8265110906352372092">"Будильник"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Торкніться, щоб увімкнути звук."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Торкніться, щоб налаштувати вібросигнал. Спеціальні можливості може бути вимкнено."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Торкніться, щоб вимкнути звук. Спеціальні можливості може бути вимкнено."</string>
@@ -510,24 +526,9 @@
<string name="notification_more_settings" msgid="816306283396553571">"Більше налаштувань"</string>
<string name="notification_done" msgid="5279426047273930175">"Готово"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Елементи керування сповіщеннями додатка <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Колір і вигляд"</string>
- <string name="night_mode" msgid="3540405868248625488">"Нічний режим"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Калібрувати дисплей"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Увімкнено"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Вимкнено"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Вмикати автоматично"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Переходити на нічний режим відповідно до місцезнаходження та часу доби"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Коли нічний режим увімкнено"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Використати нічну тему для ОС Android"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Налаштувати відтінок"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Регулювати яскравість"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Темна тема застосовується в основних областях ОС Android, які зазвичай відображаються у світлій темі, як-от у налаштуваннях."</string>
- <string name="color_apply" msgid="9212602012641034283">"Застосувати"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Підтвердити налаштування"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Деякі налаштування кольорів можуть зробити цей пристрій непридатним для використання. Натисніть OK, щоб підтвердити налаштування, інакше їх буде скинуто через 10 секунд."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Використання заряду"</string>
- <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режим економії заряду акумулятора недоступний під час заряджання"</string>
- <string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим економії заряду акумулятора"</string>
+ <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режим енергозбереження не можна ввімкнути під час заряджання"</string>
+ <string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим енергозбереження"</string>
<string name="battery_detail_switch_summary" msgid="9049111149407626804">"Знижується продуктивність і обмежується обмін даними у фоновому режимі"</string>
<string name="keyboard_key_button_template" msgid="6230056639734377300">"Кнопка <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="2243500072071305073">"Home"</string>
diff --git a/packages/SystemUI/res/values-ur-rPK/config.xml b/packages/SystemUI/res/values-ur-rPK/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-ur-rPK/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml
index 92139f1..967c688 100644
--- a/packages/SystemUI/res/values-ur-rPK/strings.xml
+++ b/packages/SystemUI/res/values-ur-rPK/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"رومنگ"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"ترتیبات"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"مجموعی جائزہ۔"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"بند کریں"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"صارف <xliff:g id="USER">%s</xliff:g>۔"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>۔"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi کو آف کر دیا گیا۔"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi کو آن کر دیا گیا۔"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> حد"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> وارننگ"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"کام موڈ"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"نائٹ لائٹ"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"نائٹ لائٹ آن ہے، آف کرنے کیلئے تھپتھپائیں"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"نائٹ لائٹ آف ہے، آن کرنے کیلئے تھپتھپائیں"</string>
<string name="recents_empty_message" msgid="808480104164008572">"کوئی حالیہ آئٹم نہیں"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"آپ نے سب کچھ صاف کر دیا ہے"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ایپلیکیشن کی معلومات"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> والیوم ڈائلاگ ہے"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"اصل بحال کرنے کیلئے تھپتھپائیں۔"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"آپ اپنا دفتری پروفائل استعمال کر رہے ہیں۔"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"کال"</item>
+ <item msgid="5997713001067658559">"سسٹم"</item>
+ <item msgid="7858983209929864160">"رِنگ"</item>
+ <item msgid="1850038478268896762">"میڈیا"</item>
+ <item msgid="8265110906352372092">"الارم"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"بلوٹوتھ"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s۔ آواز چالو کرنے کیلئے تھپتھپائیں۔"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s۔ ارتعاش پر سیٹ کرنے کیلئے تھپتھپائیں۔ Accessibility سروسز شاید خاموش ہوں۔"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s۔ خاموش کرنے کیلئے تھپتھپائیں۔ Accessibility سروسز شاید خاموش ہوں۔"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"مزید ترتیبات"</string>
<string name="notification_done" msgid="5279426047273930175">"ہوگیا"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے نوٹیفکیشن کنٹرولز"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"رنگ اور ظہور"</string>
- <string name="night_mode" msgid="3540405868248625488">"رات موڈ"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"نشان زد ڈسپلے"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"آن"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"آف"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"خودکار طور پر آن کریں"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"مقام اور دن کے وقت کی مناسبت سے نائٹ موڈ میں سوئچ کریں"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"جب نائٹ موڈ آن ہو"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android OS کیلئے ڈارک تھیم استعمال کریں"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"ٹنٹ ایڈجسٹ کریں"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"چمک کو ایڈجسٹ کریں"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"ڈارک تھیم Android OS کی بنیادی جگہوں پر لاگو کی جاتی ہے جو عام طور لائٹ تھیم میں ڈسپلے ہوتے ہیں، جیسے ترتیبات۔"</string>
- <string name="color_apply" msgid="9212602012641034283">"لاگو کریں"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"ترتیبات کی توثیق کریں"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"رنگوں کی کچھ ترتیبات اس آلے کو ناقابل استعمال بنا سکتی ہیں۔ رنگوں کی ان ترتیبات کی توثیق کرنے کیلئے ٹھیک ہے پر کلک کریں، بصورت دیگر 10 سیکنڈ بعد یہ ترتیبات ری سیٹ ہو جائیں گی۔"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"بیٹری کا استعمال"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"چارجنگ کے دوران بیٹری سیور دستیاب نہیں ہے"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"بیٹری سیور"</string>
diff --git a/packages/SystemUI/res/values-uz-rUZ/config.xml b/packages/SystemUI/res/values-uz-rUZ/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-uz-rUZ/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml
index 84e2a29..6dec3f6 100644
--- a/packages/SystemUI/res/values-uz-rUZ/strings.xml
+++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Rouming"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Sozlamalar"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Umumiy nazar."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Yopish"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Foydalanuvchi <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi o‘chirildi."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi yoqildi."</string>
@@ -213,7 +214,7 @@
<string name="accessibility_quick_settings_location_on" msgid="5809937096590102036">"Joylashuv ma’lumotini yuborish yoqilgan."</string>
<string name="accessibility_quick_settings_location_changed_off" msgid="8526845571503387376">"Joylashuv ma’lumotini yuborish o‘chirildi."</string>
<string name="accessibility_quick_settings_location_changed_on" msgid="339403053079338468">"Joylashuv ma’lumotini yuborish yoqildi."</string>
- <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Uyg‘otkich signali <xliff:g id="TIME">%s</xliff:g> da chalinadi."</string>
+ <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Signal <xliff:g id="TIME">%s</xliff:g> da chalinadi."</string>
<string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Panelni yopish."</string>
<string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"Ko‘proq vaqt."</string>
<string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"Kamroq vaqt."</string>
@@ -265,7 +266,7 @@
<string name="quick_settings_dnd_label" msgid="8735855737575028208">"Bezovta qilinmasin"</string>
<string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"Faqat muhimlari"</string>
<string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"Faqat signallar"</string>
- <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"Tinchlik saqlansin"</string>
+ <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"Jimjitlik"</string>
<string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"Bluetooth"</string>
<string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g>ta qurilma)"</string>
<string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth o‘chirilgan"</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Cheklov: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Ogohlantirish: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Ish rejimi"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Tungi rejim"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Tunji rejim yoniq, o‘chirish uchun bosing"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Tunji rejim o‘chiq, yoqish uchun bosing"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Hozircha hech narsa yo‘q"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Hammasi o‘chirildi"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Ilova haqida ma’lumot"</string>
@@ -340,7 +344,7 @@
<string name="description_target_search" msgid="3091587249776033139">"Qidirish"</string>
<string name="description_direction_up" msgid="7169032478259485180">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun yuqoriga suring."</string>
<string name="description_direction_left" msgid="7207478719805562165">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun chapga suring."</string>
- <string name="zen_priority_introduction" msgid="3070506961866919502">"Turli ovoz va tebranishlar endi sizni bezovta qilmaydi. Biroq uyg‘otkich signallari, eslatmalar, tadbirlar haqidagi bildirishnomalar va siz tanlagan abonentlardan kelgan qo‘ng‘iroqlar bundan mustasno."</string>
+ <string name="zen_priority_introduction" msgid="3070506961866919502">"Turli ovoz va tebranishlar endi sizni bezovta qilmaydi. Biroq signallar, eslatmalar, tadbirlar haqidagi bildirishnomalar va siz tanlagan abonentlardan kelgan qo‘ng‘iroqlar bundan mustasno."</string>
<string name="zen_priority_customize_button" msgid="7948043278226955063">"Sozlash"</string>
<string name="zen_silence_introduction_voice" msgid="2284540992298200729">"Bu BARCHA, jumladan signallar, musiqa, videolar va o‘yinlardan keladigan tovush va tebranishlarni to‘sib qo‘yadi. Siz telefon qo‘ng‘iroqlarini bemalol amalga oshirishingiz mumkin."</string>
<string name="zen_silence_introduction" msgid="3137882381093271568">"Bu BARCHA, jumladan, signallar, musiqa, videolar va o‘yinlardan keladigan tovush va tebranishlarni to‘sib qo‘yadi."</string>
@@ -351,8 +355,8 @@
<string name="phone_hint" msgid="4872890986869209950">"Telefonni ochish uchun suring"</string>
<string name="voice_hint" msgid="8939888732119726665">"Ovozli yordam: belgidan boshlab suring"</string>
<string name="camera_hint" msgid="7939688436797157483">"Kamerani ochish uchun suring"</string>
- <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"Tinchlik saqlansin. Ekrandan o‘qish dasturlari ham ishlamaydi."</string>
- <string name="interruption_level_none" msgid="6000083681244492992">"Tinchlik saqlansin"</string>
+ <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"Jimjitlik – tinchlik saqlanadi. Ekrandan o‘qish dasturlari ham ishlamaydi."</string>
+ <string name="interruption_level_none" msgid="6000083681244492992">"Jimjitlik"</string>
<string name="interruption_level_priority" msgid="6426766465363855505">"Faqat muhimlari"</string>
<string name="interruption_level_alarms" msgid="5226306993448328896">"Faqat signallar"</string>
<string name="interruption_level_none_twoline" msgid="3957581548190765889">"Tinchlik\nsaqlansin"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> ovoz balandligini boshqaradi"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Aslini tiklash uchun bosing."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Siz ishchi profildan foydalanmoqdasiz"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Qo‘ng‘iroq"</item>
+ <item msgid="5997713001067658559">"Tizim"</item>
+ <item msgid="7858983209929864160">"Jiringlatish"</item>
+ <item msgid="1850038478268896762">"Multimedia"</item>
+ <item msgid="8265110906352372092">"Signal"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Ovozini yoqish uchun ustiga bosing."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tebranishni yoqish uchun ustiga bosing. Maxsus imkoniyatlar ishlamasligi mumkin."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Ovozini o‘chirish uchun ustiga bosing. Maxsus imkoniyatlar ishlamasligi mumkin."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Boshqa sozlamalar"</string>
<string name="notification_done" msgid="5279426047273930175">"Tayyor"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> bildirishnomalarini boshqarish"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Rang va ko‘rinishi"</string>
- <string name="night_mode" msgid="3540405868248625488">"Tungi rejim"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Ekranni kalibrlash"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Yoniq"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"O‘chiq"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Avtomatik yoqish"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Joylashuv va vaqtga mos ravishda tungi rejimga o‘tish"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Agar tungi rejim yoniq bo‘lsa"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Android uchun to‘q rangli mavzudan foydalanish"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Rang tusini o‘zgartirish"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Yorqinlikni o‘zgartirish"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"To‘q rangli mavzu Android tizimining odatda och rangda ko‘rsatiladigan o‘zak sahifalariga (masalan, Sozlamalar) nisbatan qo‘llaniladi."</string>
- <string name="color_apply" msgid="9212602012641034283">"Qo‘llash"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Sozlamalarni tasdiqlang"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Ba’zi rang sozlamalari qurilmadan foydalanishni qiyinlashtirish mumkin. Tanlgan parametrlarni tasdiqlash uchun “OK” tugmasini bosing. Aks holda, ular 10 soniyadan so‘ng qayta tiklanadi."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Batareya sarfi"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Quvvat tejash rejimidan quvvatlash vaqtida foydalanib bo‘lmaydi"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Quvvat tejash rejimi"</string>
@@ -642,7 +643,7 @@
<string name="accessibility_quick_settings_settings" msgid="6132460890024942157">"Sozlamalarni ochish."</string>
<string name="accessibility_quick_settings_expand" msgid="2375165227880477530">"Tezkor sozlamalarni ochish."</string>
<string name="accessibility_quick_settings_collapse" msgid="1792625797142648105">"Tezkor sozlamalarni yopish."</string>
- <string name="accessibility_quick_settings_alarm_set" msgid="1863000242431528676">"Uyg‘otkich o‘rnatildi."</string>
+ <string name="accessibility_quick_settings_alarm_set" msgid="1863000242431528676">"Signal o‘rnatildi."</string>
<string name="accessibility_quick_settings_user" msgid="1567445362870421770">"<xliff:g id="ID_1">%s</xliff:g> sifatida kirgansiz"</string>
<string name="accessibility_quick_settings_no_internet" msgid="31890692343084075">"Internet yo‘q."</string>
<string name="accessibility_quick_settings_open_details" msgid="4230931801728005194">"Tafsilotlarini ko‘rsatish."</string>
diff --git a/packages/SystemUI/res/values-vi/config.xml b/packages/SystemUI/res/values-vi/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-vi/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index 24c2907..cf7cdfa 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3,5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Chuyển vùng"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Cạnh"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Cài đặt"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Tổng quan."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Đóng"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Người dùng <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Đã tắt Wifi."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Đã bật Wifi."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Giới hạn <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Cảnh báo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Chế độ làm việc"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Đèn đọc sách"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Đèn đọc sách được bật, nhấn để tắt"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Đèn đọc sách bị tắt, nhấn để bật"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Không có mục gần đây nào"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Bạn đã xóa mọi nội dung"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Thông tin ứng dụng"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> là hộp thoại khối lượng"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Nhấn để khôi phục ảnh chụp màn hình gốc."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Bạn đang sử dụng hồ sơ công việc của mình"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Gọi"</item>
+ <item msgid="5997713001067658559">"Hệ thống"</item>
+ <item msgid="7858983209929864160">"Chuông"</item>
+ <item msgid="1850038478268896762">"Phương tiện"</item>
+ <item msgid="8265110906352372092">"Báo thức"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Nhấn để bật tiếng."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Nhấn để đặt chế độ rung. Bạn có thể tắt tiếng dịch vụ trợ năng."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Nhấn để tắt tiếng. Bạn có thể tắt tiếng dịch vụ trợ năng."</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Cài đặt khác"</string>
<string name="notification_done" msgid="5279426047273930175">"Xong"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"Điều khiển thông báo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Màu sắc và giao diện"</string>
- <string name="night_mode" msgid="3540405868248625488">"Chế độ ban đêm"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Hiệu chỉnh hiển thị"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Bật"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Tắt"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Tự động bật"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Chuyển sang Chế bộ ban đêm khi thích hợp cho vị trí và thời gian trong ngày"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Khi Chế độ ban đêm đang bật"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Sử dụng chủ đề sẫm màu cho Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Điều chỉnh phủ màu"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Điều chỉnh độ sáng"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Chủ đề sẫm màu được áp dụng cho các vùng chính của Android OS được hiển thị bình thường trong chủ đề sáng màu, chẳng hạn như Cài đặt."</string>
- <string name="color_apply" msgid="9212602012641034283">"Áp dụng"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Xác nhận cài đặt"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Một số cài đặt màu có thể khiến thiết bị này không sử dụng được. Hãy nhấp vào OK để xác nhận các cài đặt màu này, nếu không những cài đặt này sẽ được đặt lại sau 10 giây."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Mức sử dụng pin"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Trình tiết kiệm pin không khả dụng trong khi sạc"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Trình tiết kiệm pin"</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/config.xml b/packages/SystemUI/res/values-zh-rCN/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rCN/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 7613099..bdeb188 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫游中"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"设置"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"概览。"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"关闭"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"用户：<xliff:g id="USER">%s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"WLAN已关闭。"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"WLAN已开启。"</string>
@@ -252,10 +253,10 @@
<string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知设置"</string>
<string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>设置"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"屏幕会自动旋转。"</string>
- <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"屏幕锁定为横向模式。"</string>
+ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"屏幕锁定为横屏模式。"</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"屏幕锁定为纵向模式。"</string>
<string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"屏幕将会自动旋转。"</string>
- <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"屏幕现已锁定为横向模式。"</string>
+ <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"屏幕现已锁定为横屏模式。"</string>
<string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"屏幕现已锁定为纵向模式。"</string>
<string name="dessert_case" msgid="1295161776223959221">"甜品盒"</string>
<string name="start_dreams" msgid="5640361424498338327">"屏保"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限为<xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g>警告"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"工作模式"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"夜间模式"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"夜间模式已开启，点按即可关闭"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"夜间模式已关闭，点按即可开启"</string>
<string name="recents_empty_message" msgid="808480104164008572">"近期没有任何内容"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"您已清除所有内容"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"应用信息"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”已用作音量控制对话框"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"点按即可恢复原始设置。"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"您当前正在使用工作资料"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"通话"</item>
+ <item msgid="5997713001067658559">"系统"</item>
+ <item msgid="7858983209929864160">"铃声"</item>
+ <item msgid="1850038478268896762">"媒体"</item>
+ <item msgid="8265110906352372092">"闹钟"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"蓝牙"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s。点按即可取消静音。"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s。点按即可设为振动，但可能会同时将无障碍服务设为静音。"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s。点按即可设为静音，但可能会同时将无障碍服务设为静音。"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"更多设置"</string>
<string name="notification_done" msgid="5279426047273930175">"完成"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g>通知设置"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"颜色和外观"</string>
- <string name="night_mode" msgid="3540405868248625488">"夜间模式"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"校准显示屏"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"开启"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"关闭"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"自动开启"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"根据地点和时间适时切换到夜间模式"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"夜间模式开启时"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"对 Android 操作系统使用深色主题背景"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"调整色调"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"调整亮度"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"系统会将深色主题背景应用于 Android 操作系统的核心区域（通常以浅色主题背景显示），例如“设置”部分。"</string>
- <string name="color_apply" msgid="9212602012641034283">"应用"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"确认设置"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"部分颜色设置可能会导致此设备无法使用。请点击“确定”确认这些颜色设置，否则，系统将在 10 秒后重置这些设置。"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"电池使用情况"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"充电过程中无法使用省电模式"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"省电模式"</string>
@@ -542,7 +543,7 @@
<string name="keyboard_key_media_rewind" msgid="2654808213360820186">"快退"</string>
<string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"快进"</string>
<string name="keyboard_key_page_up" msgid="5654098530106845603">"向上翻页"</string>
- <string name="keyboard_key_page_down" msgid="8720502083731906136">"向下翻页"</string>
+ <string name="keyboard_key_page_down" msgid="8720502083731906136">"PgDn"</string>
<string name="keyboard_key_forward_del" msgid="1391451334716490176">"删除"</string>
<string name="keyboard_key_move_home" msgid="2765693292069487486">"Home"</string>
<string name="keyboard_key_move_end" msgid="5901174332047975247">"End"</string>
diff --git a/packages/SystemUI/res/values-zh-rHK/config.xml b/packages/SystemUI/res/values-zh-rHK/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rHK/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 40d3429..bf23c9d 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫遊"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -185,7 +187,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"概覽"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"關閉"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"使用者：<xliff:g id="USER">%s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"WiFi 已關閉。"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"WiFi 已開啟。"</string>
@@ -319,6 +320,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限為 <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 警告"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"工作模式"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"夜燈模式"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"夜燈模式已開啟，輕按即可關閉"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"夜燈模式已關閉，輕按即可開啟"</string>
<string name="recents_empty_message" msgid="808480104164008572">"沒有最近項目"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"您已清除所有項目"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資料"</string>
@@ -436,6 +440,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」為音量對話框"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"輕按即可復原。"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"您正在使用工作設定檔"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"通話"</item>
+ <item msgid="5997713001067658559">"系統"</item>
+ <item msgid="7858983209929864160">"鈴聲"</item>
+ <item msgid="1850038478268896762">"媒體"</item>
+ <item msgid="8265110906352372092">"鬧鐘"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"藍牙"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s。輕按即可取消靜音。"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s。輕按即可設為震動。無障礙功能服務可能已經設為靜音。"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s。輕按即可設為靜音。無障礙功能服務可能已經設為靜音。"</string>
@@ -506,21 +522,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"更多設定"</string>
<string name="notification_done" msgid="5279426047273930175">"完成"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」通知控制項"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"顏色和外觀"</string>
- <string name="night_mode" msgid="3540405868248625488">"夜間模式"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"校準螢幕"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"已開啟"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"已關閉"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"自動開啟"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"在適當的位置和時間切換至「夜間模式」"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"「夜間模式」開啟時"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"在 Android OS 中使用深色主題背景"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"調整色調"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"調整亮度"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"系統會將深色主題背景套用至 Android OS 核心區域 (一般以淺色主題背景顯示)，例如「設定」。"</string>
- <string name="color_apply" msgid="9212602012641034283">"套用"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"確認設定"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"部分顏色設定會令此裝置無法使用。請按一下 [確定] 加以確認，否則這些顏色設定將於 10 秒後重設。"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"電池用量"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"充電時無法使用「省電模式」"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"省電模式"</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/config.xml b/packages/SystemUI/res/values-zh-rTW/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rTW/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index 7f03c5d..4bec5a7 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫遊中"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"總覽。"</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"關閉"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"使用者：<xliff:g id="USER">%s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"WiFi 已關閉。"</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"WiFi 已開啟。"</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限為 <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 警告"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"工作模式"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"夜燈"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"夜燈功能已開啟，輕觸即可關閉"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"夜燈功能已關閉，輕觸即可開啟"</string>
<string name="recents_empty_message" msgid="808480104164008572">"最近沒有任何項目"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"您已清除所有工作"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資訊"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」現在是預設的音量控制對話方塊。"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"輕觸即可恢復原始設定。"</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"您正在使用 Work 設定檔"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"通話"</item>
+ <item msgid="5997713001067658559">"系統"</item>
+ <item msgid="7858983209929864160">"鈴聲"</item>
+ <item msgid="1850038478268896762">"媒體"</item>
+ <item msgid="8265110906352372092">"鬧鐘"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"藍牙"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s。輕觸即可取消靜音。"</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s。輕觸即可設為震動，但系統可能會將無障礙服務一併設為靜音。"</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s。輕觸即可設為靜音，但系統可能會將無障礙服務一併設為靜音。"</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"更多設定"</string>
<string name="notification_done" msgid="5279426047273930175">"完成"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」通知控制項"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"顏色和外觀"</string>
- <string name="night_mode" msgid="3540405868248625488">"夜間模式"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"校正顯示畫面"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"開啟"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"關閉"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"自動開啟"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"根據地點和時段適時切換到「夜間模式」"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"「夜間模式」開啟時"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"針對 Android 作業系統使用深色主題"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"調整色調"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"調整亮度"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"深色主題會套用到 Android 作業系統的核心區塊 (一般是以淺色主題顯示)，例如「設定」區塊。"</string>
- <string name="color_apply" msgid="9212602012641034283">"套用"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"確認設定"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"部分顏色設定可能會造成這部裝置無法使用。請按一下 [確定] 來確認您要使用這類顏色設定，否則系統將在 10 秒後重設這些設定。"</string>
<string name="battery_panel_title" msgid="7944156115535366613">"電池用量"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"充電時無法使用節約耗電量模式"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"節約耗電量"</string>
diff --git a/packages/SystemUI/res/values-zu/config.xml b/packages/SystemUI/res/values-zu/config.xml
new file mode 100644
index 0000000..5309563
--- /dev/null
+++ b/packages/SystemUI/res/values-zu/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
+</resources>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index bedaeca..ffea746 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -143,7 +143,9 @@
<string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string>
<string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string>
<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
+ <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string>
<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"I-LTE"</string>
+ <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"I-LTE+"</string>
<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Iyazulazula"</string>
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Ekucupheleni"</string>
@@ -183,7 +185,6 @@
<string name="accessibility_desc_settings" msgid="3417884241751434521">"Izilungiselelo"</string>
<string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Buka konke."</string>
<string name="accessibility_desc_close" msgid="7479755364962766729">"Vala"</string>
- <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Umsebenzisi <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"I-Wifi ivaliwe."</string>
<string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"I-Wifi ivuliwe."</string>
@@ -317,6 +318,9 @@
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> umkhawulo"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> isexwayiso"</string>
<string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Imodi yomsebenzi"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Ukukhanya kwasebusuku"</string>
+ <string name="quick_settings_night_display_summary_on" msgid="1814901757887526769">"Ukukhanya kwasebusuku kuvuliwe, thepha ukuze uvale"</string>
+ <string name="quick_settings_night_display_summary_off" msgid="7892102914128777905">"Ukukhanya kwasebusuku kuvaliwe, thepha ukuze uvule"</string>
<string name="recents_empty_message" msgid="808480104164008572">"Azikho izinto zakamuva"</string>
<string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Usule yonke into"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Ulwazi lohlelo lokusebenza"</string>
@@ -434,6 +438,18 @@
<string name="volumeui_notification_title" msgid="4906770126345910955">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> yingxoxo yevolumu"</string>
<string name="volumeui_notification_text" msgid="8819536904234337445">"Thepha ukuze ubuyisele okwasekuqaleni."</string>
<string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Usebenzisa iphrofayela yakho yomsebenzi"</string>
+ <string-array name="volume_stream_titles">
+ <item msgid="5841843895402729630">"Shayela"</item>
+ <item msgid="5997713001067658559">"Isistimu"</item>
+ <item msgid="7858983209929864160">"Khalisa"</item>
+ <item msgid="1850038478268896762">"Abezindaba"</item>
+ <item msgid="8265110906352372092">"I-Alamu"</item>
+ <item msgid="5339394737636839168"></item>
+ <item msgid="2951313578278086204">"I-Bluetooth"</item>
+ <item msgid="2919807739709798970"></item>
+ <item msgid="150349973435223405"></item>
+ <item msgid="6761963760295549099"></item>
+ </string-array>
<string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Thepha ukuze ususe ukuthula."</string>
<string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Thepha ukuze usethe ukudlidliza. Amasevisi okufinyelela angathuliswa."</string>
<string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Thepha ukuze uthulise. Amasevisi okufinyelela angathuliswa."</string>
@@ -504,21 +520,6 @@
<string name="notification_more_settings" msgid="816306283396553571">"Izilungiselelo eziningi"</string>
<string name="notification_done" msgid="5279426047273930175">"Kwenziwe"</string>
<string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> izilawuli zasaziso"</string>
- <string name="color_and_appearance" msgid="1254323855964993144">"Umbala nokubonakala"</string>
- <string name="night_mode" msgid="3540405868248625488">"Imodi yasebusuku"</string>
- <string name="calibrate_display" msgid="5974642573432039217">"Sika isibonisi"</string>
- <string name="night_mode_on" msgid="5597545513026541108">"Vuliwe"</string>
- <string name="night_mode_off" msgid="8035605276956057508">"Valiwe"</string>
- <string name="turn_on_automatically" msgid="4167565356762016083">"Vula ngokuzenzakalela"</string>
- <string name="turn_on_auto_summary" msgid="2190994512406701520">"Shintshela kwimodi yasebusuku njengokuqondile ngendawo nesikhathi sosuku"</string>
- <string name="when_night_mode_on" msgid="2969436026899172821">"Uma imodi yasebusuku ivulekile"</string>
- <string name="use_dark_theme" msgid="2900938704964299312">"Sebenzisa ingqikithi emnyama ku-Android OS"</string>
- <string name="adjust_tint" msgid="3398569573231409878">"Lungisa i-tint"</string>
- <string name="adjust_brightness" msgid="980039329808178246">"Lungisa ukukhanya"</string>
- <string name="night_mode_disclaimer" msgid="598914896926759578">"Itimu emnyama isetshenziswa ezindaweni eziqinile ze-Android OS ezivamise ukuoniswa ngetimu ekhanyayo, efana nezilungiselelo."</string>
- <string name="color_apply" msgid="9212602012641034283">"Sebenzisa"</string>
- <string name="color_revert_title" msgid="4746666545480534663">"Qinisekisa izilungiselelo"</string>
- <string name="color_revert_message" msgid="9116001069397996691">"Ezinye izilungiselelo zombala zingenza le divayisi ingasebenziseki. Chofoza ku-KULUNGILE ukuze uqinisekise lezi zilungiselelo zombala, uma kungenjalo lezi zilungiselelo zizosethwa kabusha ngemuva kwamasekhondi angu-10."</string>
<string name="battery_panel_title" msgid="7944156115535366613">"Ukusetshenziswa kwebhethri"</string>
<string name="battery_detail_charging_summary" msgid="1279095653533044008">"Isilondolozi sebhethri asitholakali ngesikhathi sokushaja"</string>
<string name="battery_detail_switch_title" msgid="6285872470260795421">"Isilondolozi sebhethri"</string>
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index ac04ae5..cbaf23f 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -75,12 +75,6 @@
<attr name="horizontalSpacing" format="dimension" />
</declare-styleable>
- <declare-styleable name="AutoSizingList">
- <!-- Whether AutoSizingList will show only as many items as fit on screen and
- remove extra items instead of scrolling. -->
- <attr name="enableAutoSizing" format="boolean" />
- </declare-styleable>
-
<!-- Theme for icons in the status bar (light/dark). background/fillColor is used for dual tone
icons like wifi and signal, and singleToneColor is used for icons with only one tone.
Contract: Pixel with fillColor blended over backgroundColor blended over translucent should
@@ -109,6 +103,9 @@
</declare-styleable>
<declare-styleable name="AutoSizingList">
+ <!-- Whether AutoSizingList will show only as many items as fit on screen and
+ remove extra items instead of scrolling. -->
+ <attr name="enableAutoSizing" format="boolean" />
<attr name="itemHeight" format="dimension" />
</declare-styleable>
</resources>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index d12ef42..52565ba 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -30,12 +30,11 @@
<color name="batterymeter_charge_color">#FFFFFFFF</color>
<color name="batterymeter_bolt_color">#FFFFFFFF</color>
<color name="qs_batterymeter_frame_color">#FF404040</color>
- <color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
+ <color name="system_warning_color">@*android:color/system_error</color>
<color name="qs_text">#FFFFFFFF</color>
<color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->
<color name="qs_subhead">#99FFFFFF</color><!-- 60% white -->
- <color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200 -->
- <color name="qs_detail_button">#FFB0BEC5</color><!-- 100% blue grey 200 -->
+ <color name="qs_detail_button">@*android:color/quaternary_device_default_settings</color>
<color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white -->
<color name="qs_detail_transition">#66FFFFFF</color>
<color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white -->
@@ -122,7 +121,7 @@
<color name="segmented_buttons_background">#14FFFFFF</color><!-- 8% white -->
<color name="segmented_button_selected">#FFFFFFFF</color>
- <color name="segmented_button_unselected">#FFB0BEC5</color><!-- blue grey 200 -->
+ <color name="segmented_button_unselected">@*android:color/quaternary_device_default_settings</color>
<color name="dark_mode_icon_color_single_tone">#99000000</color>
<color name="dark_mode_icon_color_dual_tone_background">#3d000000</color>
@@ -134,7 +133,7 @@
<color name="volume_icon_color">#ffffffff</color>
<color name="volume_settings_icon_color">#7fffffff</color>
- <color name="volume_slider_inactive">#FFB0BEC5</color><!-- blue grey 200 -->
+ <color name="volume_slider_inactive">@*android:color/quaternary_device_default_settings</color>
<color name="docked_divider_background">#ff000000</color>
<color name="docked_divider_handle">#ffffff</color>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 134388f..f48039e 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -126,6 +126,9 @@
<!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->
<bool name="config_show4GForLTE">true</bool>
+ <!-- Should "LTE"/"4G" be shown instead of "LTE+"/"4G+" when on NETWORK_TYPE_LTE_CA? -->
+ <bool name="config_hideLtePlus">false</bool>
+
<!-- milliseconds before the heads up notification auto-dismisses. -->
<integer name="heads_up_notification_decay">5000</integer>
@@ -224,9 +227,25 @@
<!-- Doze: duration to avoid false pickup gestures triggered by notification vibrations -->
<integer name="doze_pickup_vibration_threshold">2000</integer>
- <!-- Doze: can we assume the pickup sensor includes a proximity check? -->
+ <!-- Doze: can we assume the pickup sensor includes a proximity check?
+ This is ignored if doze_pickup_subtype_performs_proximity_check is not empty.
+ @deprecated: use doze_pickup_subtype_performs_proximity_check instead.-->
<bool name="doze_pickup_performs_proximity_check">false</bool>
+ <!-- Doze: a list of pickup sensor subtypes that perform a proximity check before they trigger.
+ If not empty, either * or !* must appear to specify the default.
+ If empty, falls back to doze_pickup_performs_proximity_check.
+
+ Examples: 1,2,3,!* -> subtypes 1,2 and 3 perform the check, all others don't.
+ !1,!2,* -> subtypes 1 and 2 don't perform the check, all others do.
+ !8,* -> subtype 8 does not perform the check, all others do
+ 1,1,* -> illegal, every item may only appear once
+ 1,!1,* -> illegal, no contradictions allowed
+ 1,2 -> illegal, need either * or !*
+ 1,,4a3 -> illegal, no empty or non-numeric terms allowed
+ -->
+ <string name="doze_pickup_subtype_performs_proximity_check"></string>
+
<!-- Doze: pulse parameter - how long does it take to fade in? -->
<integer name="doze_pulse_duration_in">900</integer>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 9928682..5bd0e87 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -147,6 +147,9 @@
<!-- Margin start of the system icons super container -->
<dimen name="system_icons_super_container_margin_start">16dp</dimen>
+ <!-- Margin end of the system icons super container when the avatar is missing. -->
+ <dimen name="system_icons_super_container_avatarless_margin_end">6dp</dimen>
+
<!-- Width for the notification panel and related windows -->
<dimen name="match_parent">-1px</dimen>
<dimen name="standard_notification_panel_width">416dp</dimen>
@@ -178,8 +181,6 @@
<dimen name="qs_tile_margin_top">16dp</dimen>
<dimen name="qs_quick_tile_size">48dp</dimen>
<dimen name="qs_quick_tile_padding">12dp</dimen>
- <dimen name="qs_date_collapsed_text_size">14sp</dimen>
- <dimen name="qs_date_text_size">16sp</dimen>
<dimen name="qs_header_gear_translation">16dp</dimen>
<dimen name="qs_page_indicator_width">16dp</dimen>
<dimen name="qs_page_indicator_height">8dp</dimen>
@@ -211,7 +212,7 @@
<dimen name="qs_detail_empty_text_size">14sp</dimen>
<dimen name="qs_detail_margin_top">28dp</dimen>
<dimen name="qs_detail_back_margin_end">16dp</dimen>
- <dimen name="qs_detail_header_text_padding">0dp</dimen>
+ <dimen name="qs_detail_header_text_padding">16dp</dimen>
<dimen name="qs_data_usage_text_size">14sp</dimen>
<dimen name="qs_data_usage_usage_text_size">36sp</dimen>
<dimen name="qs_battery_padding">2dp</dimen>
@@ -395,6 +396,8 @@
<!-- The font size of the date in QS -->
<dimen name="qs_date_collapsed_size">14sp</dimen>
+ <!-- Amount the date/time move when emergency calls only is present -->
+ <dimen name="qs_date_time_translation">8dp</dimen>
<!-- Battery level text padding end when in expanded QS and on Keyguard -->
<dimen name="battery_level_padding_end">2dp</dimen>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 4f523f3..8ad4d9b 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -354,6 +354,9 @@
<!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_data_connection_lte">LTE</string>
+ <!-- Content description of the data connection type LTE+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_data_connection_lte_plus">LTE+</string>
+
<!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_data_connection_cdma">CDMA</string>
@@ -457,8 +460,6 @@
<!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_close">Close</string>
- <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
<!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>
<!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -752,6 +753,12 @@
<string name="quick_settings_cellular_detail_data_warning"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g> warning</string>
<!-- QuickSettings: Work mode [CHAR LIMIT=NONE] -->
<string name="quick_settings_work_mode_label">Work mode</string>
+ <!-- QuickSettings: Label for the toggle to activate Night display (renamed "Night Light" with title caps). [CHAR LIMIT=20] -->
+ <string name="quick_settings_night_display_label">Night Light</string>
+ <!-- QuickSettings: Summary for the toggle to deactivate Night display when it's on (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
+ <string name="quick_settings_night_display_summary_on">Night Light on, tap to turn off</string>
+ <!-- QuickSettings: Label for the toggle to activate Night display when it's off (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
+ <string name="quick_settings_night_display_summary_off">Night Light off, tap to turn on</string>
<!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
<string name="recents_empty_message">No recent items</string>
@@ -1336,59 +1343,6 @@
<!-- Notification: Gear: Content description for the gear. [CHAR LIMIT=NONE] -->
<string name="notification_gear_accessibility"><xliff:g id="app_name" example="YouTube">%1$s</xliff:g> notification controls</string>
- <!-- SysUI Tuner: Color and appearance screen title [CHAR LIMIT=50] -->
- <string name="color_and_appearance">Color and appearance</string>
-
- <!-- SysUI Tuner: Name of the night mode feature [CHAR LIMIT=30] -->
- <string name="night_mode">Night mode</string>
-
- <!-- SysUI Tuner: Name of calibrate display dialog [CHAR LIMIT=30] -->
- <string name="calibrate_display">Calibrate display</string>
-
- <!-- SysUI Tuner: Summary of night mode when its on [CHAR LIMIT=NONE] -->
- <string name="night_mode_on">On</string>
-
- <!-- SysUI Tuner: Summary of night mode when its off [CHAR LIMIT=NONE] -->
- <string name="night_mode_off">Off</string>
-
- <!-- SysUI Tuner: Label for switch to turn on night mode automatically [CHAR LIMIT=50] -->
- <string name="turn_on_automatically">Turn on automatically</string>
-
- <!-- SysUI Tuner: Summary for switch to turn on night mode automatically [CHAR LIMIT=NONE] -->
- <string name="turn_on_auto_summary">Switch into Night Mode as appropriate for location and time of day</string>
-
- <!-- SysUI Tuner: Label for section controlling what night mode does [CHAR LIMIT=60] -->
- <string name="when_night_mode_on">When Night Mode is on</string>
-
- <!-- SysUI Tuner: Switch controlling whether dark theme is turned on with night mode [CHAR LIMIT=45] -->
- <string name="use_dark_theme">Use dark theme for Android OS</string>
-
- <!-- SysUI Tuner: Switch controlling whether tint is changed with night mode [CHAR LIMIT=45] -->
- <string name="adjust_tint">Adjust tint</string>
-
- <!-- SysUI Tuner: Switch controlling whether brightness is changed with night mode [CHAR LIMIT=45] -->
- <string name="adjust_brightness">Adjust brightness</string>
-
- <!-- SysUI Tuner: Disclaimer about using dark theme with night mode [CHAR LIMIT=NONE] -->
- <string name="night_mode_disclaimer">The dark theme is applied to
- core areas of Android OS that are normally displayed in a light theme,
- such as Settings.</string>
-
- <!-- Button to apply settings [CHAR LIMIT=30] -->
- <string name="color_apply">Apply</string>
-
- <!-- Title of warning dialog about bad color settings. [CHAR LIMIT=30] -->
- <string name="color_revert_title">Confirm settings</string>
-
- <!-- Message warning user about custom color settings [CHAR LIMIT=NONE] -->
- <string name="color_revert_message">Some color settings can make this
- device unusable. Click OK to confirm these color settings,
- otherwise these settings will reset after 10 seconds.</string>
-
- <string name="color_modification_r" translatable="false">R</string>
- <string name="color_modification_g" translatable="false">G</string>
- <string name="color_modification_b" translatable="false">B</string>
-
<!-- Title of the battery settings detail panel [CHAR LIMIT=20] -->
<string name="battery_panel_title">Battery usage</string>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index a10498b..4edeb4c 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -293,7 +293,7 @@
<style name="TextAppearance.Volume.ZenDetail">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif</item>
- <item name="android:textColor">#ffb0b3c5</item>
+ <item name="android:textColor">@*android:color/quaternary_device_default_settings</item>
</style>
<style name="VolumeButtons" parent="@android:style/Widget.Material.Button.Borderless">
diff --git a/packages/SystemUI/res/xml/color_and_appearance.xml b/packages/SystemUI/res/xml/color_and_appearance.xml
deleted file mode 100644
index 21f890e..0000000
--- a/packages/SystemUI/res/xml/color_and_appearance.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:sysui="http://schemas.android.com/apk/res-auto"
- android:title="@string/color_and_appearance">
-
- <Preference
- android:key="night_mode"
- android:title="@string/night_mode"
- android:fragment="com.android.systemui.tuner.NightModeFragment" />
-
- <com.android.systemui.tuner.CalibratePreference
- android:key="calibrate"
- android:title="@string/calibrate_display" />
-
-</PreferenceScreen>
diff --git a/packages/SystemUI/res/xml/night_mode.xml b/packages/SystemUI/res/xml/night_mode.xml
deleted file mode 100644
index 34af820..0000000
--- a/packages/SystemUI/res/xml/night_mode.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:sysui="http://schemas.android.com/apk/res-auto"
- android:title="@string/night_mode">
-
- <SwitchPreference
- android:key="auto"
- android:title="@string/turn_on_automatically"
- android:summary="@string/turn_on_auto_summary" />
-
- <PreferenceCategory
- android:title="@string/when_night_mode_on">
-
- <SwitchPreference
- android:key="adjust_tint"
- android:title="@string/adjust_tint" />
-
- <SwitchPreference
- android:key="adjust_brightness"
- android:title="@string/adjust_brightness" />
-
- </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml
index 116bc69..b46e862 100644
--- a/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@ -100,13 +100,6 @@
</PreferenceScreen>
- <!--
- <Preference
- android:key="color_transform"
- android:title="@string/color_and_appearance"
- android:fragment="com.android.systemui.tuner.ColorAndAppearanceFragment" />
- -->
-
<PreferenceScreen
android:key="volume_and_do_not_disturb"
android:title="@string/volume_and_do_not_disturb">
diff --git a/packages/SystemUI/src/com/android/systemui/Prefs.java b/packages/SystemUI/src/com/android/systemui/Prefs.java
index 907616c..19ae295 100644
--- a/packages/SystemUI/src/com/android/systemui/Prefs.java
+++ b/packages/SystemUI/src/com/android/systemui/Prefs.java
@@ -47,7 +47,6 @@
Key.QS_DATA_SAVER_DIALOG_SHOWN,
Key.QS_INVERT_COLORS_ADDED,
Key.QS_WORK_ADDED,
- Key.QS_NIGHT_ADDED,
})
public @interface Key {
String OVERVIEW_LAST_STACK_TASK_ACTIVE_TIME = "OverviewLastStackTaskActiveTime";
@@ -67,7 +66,6 @@
String QS_DATA_SAVER_DIALOG_SHOWN = "QsDataSaverDialogShown";
String QS_INVERT_COLORS_ADDED = "QsInvertColorsAdded";
String QS_WORK_ADDED = "QsWorkAdded";
- String QS_NIGHT_ADDED = "QsNightAdded";
}
public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) {
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
index 39a3412..52b5a54 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
@@ -55,7 +55,8 @@
com.android.systemui.media.RingtonePlayer.class,
com.android.systemui.keyboard.KeyboardUI.class,
com.android.systemui.tv.pip.PipUI.class,
- com.android.systemui.shortcut.ShortcutKeyDispatcher.class
+ com.android.systemui.shortcut.ShortcutKeyDispatcher.class,
+ com.android.systemui.VendorServices.class
};
/**
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index b5561bd..21f68f5 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -29,6 +29,7 @@
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.phone.KeyguardBouncer;
+import com.android.systemui.statusbar.phone.LockscreenWallpaper;
import com.android.systemui.statusbar.phone.NotificationIconAreaController;
import com.android.systemui.statusbar.phone.PhoneStatusBar;
import com.android.systemui.statusbar.phone.QSTileHost;
@@ -94,7 +95,7 @@
}
public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,
- View headsUpScrim) {
+ View headsUpScrim, LockscreenWallpaper lockscreenWallpaper) {
return new ScrimController(scrimBehind, scrimInFront, headsUpScrim);
}
diff --git a/packages/SystemUI/src/com/android/systemui/VendorServices.java b/packages/SystemUI/src/com/android/systemui/VendorServices.java
new file mode 100644
index 0000000..0be6b12
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/VendorServices.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.systemui;
+
+/**
+ * Placeholder for any vendor-specific services.
+ */
+public class VendorServices extends SystemUI {
+
+ @Override
+ public void start() {
+ // no-op
+ }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index a5e771f..9eceeac 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -15,6 +15,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
+import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
@@ -28,9 +29,9 @@
import android.widget.ImageView;
import com.android.internal.app.AssistUtils;
+import com.android.internal.app.IVoiceInteractionSessionListener;
import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.systemui.R;
-import com.android.systemui.SystemUIFactory;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.CommandQueue;
@@ -46,13 +47,13 @@
private static final long TIMEOUT_SERVICE = 2500;
private static final long TIMEOUT_ACTIVITY = 1000;
- private final Context mContext;
+ protected final Context mContext;
private final WindowManager mWindowManager;
private final AssistDisclosure mAssistDisclosure;
private AssistOrbContainer mView;
private final BaseStatusBar mBar;
- private final AssistUtils mAssistUtils;
+ protected final AssistUtils mAssistUtils;
private IVoiceInteractionSessionShowCallback mShowCallback =
new IVoiceInteractionSessionShowCallback.Stub() {
@@ -82,6 +83,23 @@
mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
mAssistUtils = new AssistUtils(context);
mAssistDisclosure = new AssistDisclosure(context, new Handler());
+
+ registerVoiceInteractionSessionListener();
+ }
+
+ protected void registerVoiceInteractionSessionListener() {
+ mAssistUtils.registerVoiceInteractionSessionListener(
+ new IVoiceInteractionSessionListener.Stub() {
+ @Override
+ public void onVoiceSessionShown() throws RemoteException {
+ Log.v(TAG, "Voice open");
+ }
+
+ @Override
+ public void onVoiceSessionHidden() throws RemoteException {
+ Log.v(TAG, "Voice closed");
+ }
+ });
}
public void onConfigurationChanged() {
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/HistoryEvaluator.java b/packages/SystemUI/src/com/android/systemui/classifier/HistoryEvaluator.java
index 85a9bee..4c64711 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/HistoryEvaluator.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/HistoryEvaluator.java
@@ -16,6 +16,8 @@
package com.android.systemui.classifier;
+import android.os.SystemClock;
+
import java.util.ArrayList;
/**
@@ -31,7 +33,7 @@
private long mLastUpdate;
public HistoryEvaluator() {
- mLastUpdate = System.currentTimeMillis();
+ mLastUpdate = SystemClock.elapsedRealtime();
}
public void addStroke(float evaluation) {
@@ -69,15 +71,18 @@
}
private void decayValue() {
- long currentTimeMillis = System.currentTimeMillis();
+ long time = SystemClock.elapsedRealtime();
+
+ if (time <= mLastUpdate) {
+ return;
+ }
// All weights are multiplied by HISTORY_FACTOR after each INTERVAL milliseconds.
- float factor = (float) Math.pow(HISTORY_FACTOR,
- (float) (currentTimeMillis - mLastUpdate) / INTERVAL);
+ float factor = (float) Math.pow(HISTORY_FACTOR, (time - mLastUpdate) / INTERVAL);
decayValue(mStrokes, factor);
decayValue(mGestureWeights, factor);
- mLastUpdate = currentTimeMillis;
+ mLastUpdate = time;
}
private void decayValue(ArrayList<Data> list, float factor) {
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index 5f1b042..661b347 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -214,6 +214,10 @@
}
private void requestPulse(final int reason) {
+ requestPulse(reason, false /* performedProxCheck */);
+ }
+
+ private void requestPulse(final int reason, boolean performedProxCheck) {
if (mHost != null && mDreaming && !mPulsing) {
// Let the host know we want to pulse. Wait for it to be ready, then
// turn the screen on. When finished, turn the screen off again.
@@ -226,10 +230,9 @@
return;
}
final long start = SystemClock.uptimeMillis();
- final boolean nonBlocking = reason == DozeLog.PULSE_REASON_SENSOR_PICKUP
- && mDozeParameters.getPickupPerformsProxCheck();
- if (nonBlocking) {
- // proximity check is only done to capture statistics, continue pulsing
+ if (performedProxCheck) {
+ // the caller already performed a successful proximity check; we'll only do one to
+ // capture statistics, continue pulsing immediately.
continuePulsing(reason);
}
// perform a proximity check
@@ -239,7 +242,7 @@
final boolean isNear = result == RESULT_NEAR;
final long end = SystemClock.uptimeMillis();
DozeLog.traceProximityResult(mContext, isNear, end - start, reason);
- if (nonBlocking) {
+ if (performedProxCheck) {
// we already continued
return;
}
@@ -540,9 +543,12 @@
mWakeLock.acquire();
try {
if (DEBUG) Log.d(mTag, "onTrigger: " + triggerEventToString(event));
+ boolean sensorPerformsProxCheck = false;
if (mSensor.getType() == Sensor.TYPE_PICK_UP_GESTURE) {
int subType = (int) event.values[0];
MetricsLogger.action(mContext, MetricsEvent.ACTION_AMBIENT_GESTURE, subType);
+ sensorPerformsProxCheck = mDozeParameters.getPickupSubtypePerformsProxCheck(
+ subType);
}
if (mDebugVibrate) {
final Vibrator v = (Vibrator) mContext.getSystemService(
@@ -555,7 +561,7 @@
}
mRegistered = false;
- requestPulse(mPulseReason);
+ requestPulse(mPulseReason, sensorPerformsProxCheck);
updateListener(); // reregister, this sensor only fires once
// reset the notification pulse schedule, but only if we think we were not triggered
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
index 84d3599..b354a4c 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
@@ -23,6 +23,7 @@
import android.os.Debug;
import android.os.IBinder;
import android.os.Process;
+import android.os.Trace;
import android.util.Log;
import com.android.internal.policy.IKeyguardDrawnCallback;
@@ -73,21 +74,27 @@
@Override // Binder interface
public void verifyUnlock(IKeyguardExitCallback callback) {
+ Trace.beginSection("KeyguardService.mBinder#verifyUnlock");
checkPermission();
mKeyguardViewMediator.verifyUnlock(callback);
+ Trace.endSection();
}
@Override // Binder interface
public void keyguardDone(boolean authenticated, boolean wakeup) {
+ Trace.beginSection("KeyguardService.mBinder#keyguardDone");
checkPermission();
// TODO: Remove wakeup
mKeyguardViewMediator.keyguardDone(authenticated);
+ Trace.endSection();
}
@Override // Binder interface
public void setOccluded(boolean isOccluded) {
+ Trace.beginSection("KeyguardService.mBinder#setOccluded");
checkPermission();
mKeyguardViewMediator.setOccluded(isOccluded);
+ Trace.endSection();
}
@Override // Binder interface
@@ -122,20 +129,26 @@
@Override // Binder interface
public void onStartedWakingUp() {
+ Trace.beginSection("KeyguardService.mBinder#onStartedWakingUp");
checkPermission();
mKeyguardViewMediator.onStartedWakingUp();
+ Trace.endSection();
}
@Override // Binder interface
public void onScreenTurningOn(IKeyguardDrawnCallback callback) {
+ Trace.beginSection("KeyguardService.mBinder#onScreenTurningOn");
checkPermission();
mKeyguardViewMediator.onScreenTurningOn(callback);
+ Trace.endSection();
}
@Override // Binder interface
public void onScreenTurnedOn() {
+ Trace.beginSection("KeyguardService.mBinder#onScreenTurningOn");
checkPermission();
mKeyguardViewMediator.onScreenTurnedOn();
+ Trace.endSection();
}
@Override // Binder interface
@@ -152,8 +165,10 @@
@Override // Binder interface
public void onSystemReady() {
+ Trace.beginSection("KeyguardService.mBinder#onSystemReady");
checkPermission();
mKeyguardViewMediator.onSystemReady();
+ Trace.endSection();
}
@Override // Binder interface
@@ -176,8 +191,10 @@
@Override
public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {
+ Trace.beginSection("KeyguardService.mBinder#startKeyguardExitAnimation");
checkPermission();
mKeyguardViewMediator.startKeyguardExitAnimation(startTime, fadeoutDuration);
+ Trace.endSection();
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 8fd88cb..2764c5f 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -42,6 +42,7 @@
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.SystemProperties;
+import android.os.Trace;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageManager;
@@ -524,7 +525,9 @@
@Override
public void keyguardDoneDrawing() {
+ Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDoneDrawing");
mHandler.sendEmptyMessage(KEYGUARD_DONE_DRAWING);
+ Trace.endSection();
}
@Override
@@ -534,7 +537,9 @@
@Override
public void keyguardDonePending(boolean strongAuth, int targetUserId) {
+ Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending");
if (targetUserId != ActivityManager.getCurrentUser()) {
+ Trace.endSection();
return;
}
@@ -546,20 +551,25 @@
if (strongAuth) {
mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
}
+ Trace.endSection();
}
@Override
public void keyguardGone() {
+ Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");
mKeyguardDisplayManager.hide();
+ Trace.endSection();
}
@Override
public void readyForKeyguardDone() {
+ Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#readyForKeyguardDone");
if (mKeyguardDonePending) {
// Somebody has called keyguardDonePending before, which means that we are
// authenticated
KeyguardViewMediator.this.keyguardDone(true /* authenticated */);
}
+ Trace.endSection();
}
@Override
@@ -900,6 +910,7 @@
* Let's us know when the device is waking up.
*/
public void onStartedWakingUp() {
+ Trace.beginSection("KeyguardViewMediator#onStartedWakingUp");
// TODO: Rename all screen off/on references to interactive/sleeping
synchronized (this) {
@@ -911,15 +922,20 @@
}
KeyguardUpdateMonitor.getInstance(mContext).dispatchStartedWakingUp();
maybeSendUserPresentBroadcast();
+ Trace.endSection();
}
public void onScreenTurningOn(IKeyguardDrawnCallback callback) {
+ Trace.beginSection("KeyguardViewMediator#onScreenTurningOn");
notifyScreenOn(callback);
+ Trace.endSection();
}
public void onScreenTurnedOn() {
+ Trace.beginSection("KeyguardViewMediator#onScreenTurnedOn");
notifyScreenTurnedOn();
mUpdateMonitor.dispatchScreenTurnedOn();
+ Trace.endSection();
}
public void onScreenTurnedOff() {
@@ -1033,6 +1049,7 @@
* @see android.app.KeyguardManager#exitKeyguardSecurely
*/
public void verifyUnlock(IKeyguardExitCallback callback) {
+ Trace.beginSection("KeyguardViewMediator#verifyUnlock");
synchronized (this) {
if (DEBUG) Log.d(TAG, "verifyUnlock");
if (shouldWaitForProvisioning()) {
@@ -1083,6 +1100,7 @@
}
}
}
+ Trace.endSection();
}
/**
@@ -1096,16 +1114,19 @@
* Notify us when the keyguard is occluded by another window
*/
public void setOccluded(boolean isOccluded) {
+ Trace.beginSection("KeyguardViewMediator#setOccluded");
if (DEBUG) Log.d(TAG, "setOccluded " + isOccluded);
mHandler.removeMessages(SET_OCCLUDED);
Message msg = mHandler.obtainMessage(SET_OCCLUDED, (isOccluded ? 1 : 0), 0);
mHandler.sendMessage(msg);
+ Trace.endSection();
}
/**
* Handles SET_OCCLUDED message sent by setOccluded()
*/
private void handleSetOccluded(boolean isOccluded) {
+ Trace.beginSection("KeyguardViewMediator#handleSetOccluded");
synchronized (KeyguardViewMediator.this) {
if (mHiding && isOccluded) {
// We're in the process of going away but WindowManager wants to show a
@@ -1120,6 +1141,7 @@
adjustStatusBarLocked();
}
}
+ Trace.endSection();
}
/**
@@ -1308,11 +1330,13 @@
* @see #handleShow
*/
private void showLocked(Bundle options) {
+ Trace.beginSection("KeyguardViewMediator#showLocked aqcuiring mShowKeyguardWakeLock");
if (DEBUG) Log.d(TAG, "showLocked");
// ensure we stay awake until we are finished displaying the keyguard
mShowKeyguardWakeLock.acquire();
Message msg = mHandler.obtainMessage(SHOW, options);
mHandler.sendMessage(msg);
+ Trace.endSection();
}
/**
@@ -1320,9 +1344,11 @@
* @see #handleHide()
*/
private void hideLocked() {
+ Trace.beginSection("KeyguardViewMediator#hideLocked");
if (DEBUG) Log.d(TAG, "hideLocked");
Message msg = mHandler.obtainMessage(HIDE);
mHandler.sendMessage(msg);
+ Trace.endSection();
}
public boolean isSecure() {
@@ -1367,10 +1393,12 @@
};
public void keyguardDone(boolean authenticated) {
+ Trace.beginSection("KeyguardViewMediator#keyguardDone");
if (DEBUG) Log.d(TAG, "keyguardDone(" + authenticated +")");
EventLog.writeEvent(70000, 2);
Message msg = mHandler.obtainMessage(KEYGUARD_DONE, authenticated ? 1 : 0);
mHandler.sendMessage(msg);
+ Trace.endSection();
}
/**
@@ -1394,7 +1422,9 @@
handleReset();
break;
case VERIFY_UNLOCK:
+ Trace.beginSection("KeyguardViewMediator#handleMessage VERIFY_UNLOCK");
handleVerifyUnlock();
+ Trace.endSection();
break;
case NOTIFY_STARTED_GOING_TO_SLEEP:
handleNotifyStartedGoingToSleep();
@@ -1403,25 +1433,37 @@
handleNotifyFinishedGoingToSleep();
break;
case NOTIFY_SCREEN_TURNING_ON:
+ Trace.beginSection("KeyguardViewMediator#handleMessage NOTIFY_SCREEN_TURNING_ON");
handleNotifyScreenTurningOn((IKeyguardDrawnCallback) msg.obj);
+ Trace.endSection();
break;
case NOTIFY_SCREEN_TURNED_ON:
+ Trace.beginSection("KeyguardViewMediator#handleMessage NOTIFY_SCREEN_TURNED_ON");
handleNotifyScreenTurnedOn();
+ Trace.endSection();
break;
case NOTIFY_SCREEN_TURNED_OFF:
handleNotifyScreenTurnedOff();
break;
case NOTIFY_STARTED_WAKING_UP:
+ Trace.beginSection("KeyguardViewMediator#handleMessage NOTIFY_STARTED_WAKING_UP");
handleNotifyStartedWakingUp();
+ Trace.endSection();
break;
case KEYGUARD_DONE:
+ Trace.beginSection("KeyguardViewMediator#handleMessage KEYGUARD_DONE");
handleKeyguardDone(msg.arg1 != 0);
+ Trace.endSection();
break;
case KEYGUARD_DONE_DRAWING:
+ Trace.beginSection("KeyguardViewMediator#handleMessage KEYGUARD_DONE_DRAWING");
handleKeyguardDoneDrawing();
+ Trace.endSection();
break;
case SET_OCCLUDED:
+ Trace.beginSection("KeyguardViewMediator#handleMessage SET_OCCLUDED");
handleSetOccluded(msg.arg1 != 0);
+ Trace.endSection();
break;
case KEYGUARD_TIMEOUT:
synchronized (KeyguardViewMediator.this) {
@@ -1432,12 +1474,16 @@
handleDismiss();
break;
case START_KEYGUARD_EXIT_ANIM:
+ Trace.beginSection("KeyguardViewMediator#handleMessage START_KEYGUARD_EXIT_ANIM");
StartKeyguardExitAnimParams params = (StartKeyguardExitAnimParams) msg.obj;
handleStartKeyguardExitAnimation(params.startTime, params.fadeoutDuration);
FalsingManager.getInstance(mContext).onSucccessfulUnlock();
+ Trace.endSection();
break;
case KEYGUARD_DONE_PENDING_TIMEOUT:
+ Trace.beginSection("KeyguardViewMediator#handleMessage KEYGUARD_DONE_PENDING_TIMEOUT");
Log.w(TAG, "Timeout while waiting for activity drawn!");
+ Trace.endSection();
// Fall through.
case ON_ACTIVITY_DRAWN:
handleOnActivityDrawn();
@@ -1451,6 +1497,7 @@
* @see #KEYGUARD_DONE
*/
private void handleKeyguardDone(boolean authenticated) {
+ Trace.beginSection("KeyguardViewMediator#handleKeyguardDone");
final int currentUser = KeyguardUpdateMonitor.getCurrentUser();
if (mLockPatternUtils.isSecure(currentUser)) {
mLockPatternUtils.getDevicePolicyManager().reportKeyguardDismissed(currentUser);
@@ -1488,6 +1535,7 @@
}
handleHide();
+ Trace.endSection();
}
private void sendUserPresentBroadcast() {
@@ -1512,6 +1560,7 @@
* @see #KEYGUARD_DONE_DRAWING
*/
private void handleKeyguardDoneDrawing() {
+ Trace.beginSection("KeyguardViewMediator#handleKeyguardDoneDrawing");
synchronized(this) {
if (DEBUG) Log.d(TAG, "handleKeyguardDoneDrawing");
if (mWaitingUntilKeyguardVisible) {
@@ -1525,6 +1574,7 @@
mHandler.removeMessages(KEYGUARD_DONE_DRAWING);
}
}
+ Trace.endSection();
}
private void playSounds(boolean locked) {
@@ -1556,10 +1606,12 @@
}
private void updateActivityLockScreenState() {
+ Trace.beginSection("KeyguardViewMediator#updateActivityLockScreenState");
try {
ActivityManagerNative.getDefault().setLockScreenShown(mShowing, mOccluded);
} catch (RemoteException e) {
}
+ Trace.endSection();
}
/**
@@ -1567,6 +1619,7 @@
* @see #SHOW
*/
private void handleShow(Bundle options) {
+ Trace.beginSection("KeyguardViewMediator#handleShow");
final int currentUser = KeyguardUpdateMonitor.getCurrentUser();
if (mLockPatternUtils.isSecure(currentUser)) {
mLockPatternUtils.getDevicePolicyManager().reportKeyguardSecured(currentUser);
@@ -1592,11 +1645,13 @@
mShowKeyguardWakeLock.release();
}
mKeyguardDisplayManager.show();
+ Trace.endSection();
}
private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {
@Override
public void run() {
+ Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");
try {
mStatusBarKeyguardViewManager.keyguardGoingAway();
@@ -1619,6 +1674,7 @@
} catch (RemoteException e) {
Log.e(TAG, "Error while calling WindowManager", e);
}
+ Trace.endSection();
}
};
@@ -1627,6 +1683,7 @@
* @see #HIDE
*/
private void handleHide() {
+ Trace.beginSection("KeyguardViewMediator#handleHide");
synchronized (KeyguardViewMediator.this) {
if (DEBUG) Log.d(TAG, "handleHide");
@@ -1654,6 +1711,7 @@
mHideAnimation.getDuration());
}
}
+ Trace.endSection();
}
private void handleOnActivityDrawn() {
@@ -1664,6 +1722,7 @@
}
private void handleStartKeyguardExitAnimation(long startTime, long fadeoutDuration) {
+ Trace.beginSection("KeyguardViewMediator#handleStartKeyguardExitAnimation");
synchronized (KeyguardViewMediator.this) {
if (!mHiding) {
@@ -1694,6 +1753,7 @@
adjustStatusBarLocked();
sendUserPresentBroadcast();
}
+ Trace.endSection();
}
private void adjustStatusBarLocked() {
@@ -1745,12 +1805,14 @@
* @see #VERIFY_UNLOCK
*/
private void handleVerifyUnlock() {
+ Trace.beginSection("KeyguardViewMediator#handleVerifyUnlock");
synchronized (KeyguardViewMediator.this) {
if (DEBUG) Log.d(TAG, "handleVerifyUnlock");
setShowingLocked(true);
mStatusBarKeyguardViewManager.verifyUnlock();
updateActivityLockScreenState();
}
+ Trace.endSection();
}
private void handleNotifyStartedGoingToSleep() {
@@ -1772,13 +1834,16 @@
}
private void handleNotifyStartedWakingUp() {
+ Trace.beginSection("KeyguardViewMediator#handleMotifyStartedWakingUp");
synchronized (KeyguardViewMediator.this) {
if (DEBUG) Log.d(TAG, "handleNotifyWakingUp");
mStatusBarKeyguardViewManager.onStartedWakingUp();
}
+ Trace.endSection();
}
private void handleNotifyScreenTurningOn(IKeyguardDrawnCallback callback) {
+ Trace.beginSection("KeyguardViewMediator#handleNotifyScreenTurningOn");
synchronized (KeyguardViewMediator.this) {
if (DEBUG) Log.d(TAG, "handleNotifyScreenTurningOn");
mStatusBarKeyguardViewManager.onScreenTurningOn();
@@ -1790,13 +1855,16 @@
}
}
}
+ Trace.endSection();
}
private void handleNotifyScreenTurnedOn() {
+ Trace.beginSection("KeyguardViewMediator#handleNotifyScreenTurnedOn");
synchronized (this) {
if (DEBUG) Log.d(TAG, "handleNotifyScreenTurnedOn");
mStatusBarKeyguardViewManager.onScreenTurnedOn();
}
+ Trace.endSection();
}
private void handleNotifyScreenTurnedOff() {
@@ -1808,11 +1876,13 @@
}
private void notifyDrawn(final IKeyguardDrawnCallback callback) {
+ Trace.beginSection("KeyguardViewMediator#notifyDrawn");
try {
callback.onDrawn();
} catch (RemoteException e) {
Slog.w(TAG, "Exception calling onDrawn():", e);
}
+ Trace.endSection();
}
private void resetKeyguardDonePendingLocked() {
@@ -1832,8 +1902,10 @@
}
public void onWakeAndUnlocking() {
+ Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking");
mWakeAndUnlocking = true;
keyguardDone(true /* authenticated */);
+ Trace.endSection();
}
public StatusBarKeyguardViewManager registerStatusBar(PhoneStatusBar phoneStatusBar,
@@ -1846,9 +1918,11 @@
}
public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {
+ Trace.beginSection("KeyguardViewMediator#startKeyguardExitAnimation");
Message msg = mHandler.obtainMessage(START_KEYGUARD_EXIT_ANIM,
new StartKeyguardExitAnimParams(startTime, fadeoutDuration));
mHandler.sendMessage(msg);
+ Trace.endSection();
}
public void onActivityDrawn() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 71bd798..afedbe3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -10,6 +10,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel.QSTileLayout;
import com.android.systemui.qs.QSPanel.TileRecord;
@@ -207,6 +208,7 @@
}
if (DEBUG) Log.d(TAG, "Size: " + mNumPages);
mPageIndicator.setNumPages(mNumPages);
+ mDecorGroup.setVisibility(mNumPages > 1 ? View.VISIBLE : View.GONE);
setAdapter(mAdapter);
mAdapter.notifyDataSetChanged();
setCurrentItem(0, false);
@@ -238,7 +240,8 @@
maxHeight = height;
}
}
- setMeasuredDimension(getMeasuredWidth(), maxHeight + mDecorGroup.getMeasuredHeight());
+ setMeasuredDimension(getMeasuredWidth(), maxHeight
+ + (mDecorGroup.getVisibility() != View.GONE ? mDecorGroup.getMeasuredHeight() : 0));
}
private final Runnable mDistribute = new Runnable() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index dd7beee..8613aeb 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -41,8 +41,7 @@
private static final String ALLOW_FANCY_ANIMATION = "sysui_qs_fancy_anim";
private static final String MOVE_FULL_ROWS = "sysui_qs_move_whole_rows";
- public static final float EXPANDED_TILE_DELAY = .7f;
- private static final float LAST_ROW_EXPANDED_DELAY = .86f;
+ public static final float EXPANDED_TILE_DELAY = .86f;
private final ArrayList<View> mAllViews = new ArrayList<>();
private final ArrayList<View> mTopFiveQs = new ArrayList<>();
@@ -58,7 +57,7 @@
private TouchAnimator mTranslationXAnimator;
private TouchAnimator mTranslationYAnimator;
private TouchAnimator mNonfirstPageAnimator;
- private TouchAnimator mLastRowAnimator;
+ private TouchAnimator mBrightnessAnimator;
private boolean mOnKeyguard;
@@ -144,7 +143,6 @@
TouchAnimator.Builder firstPageBuilder = new Builder();
TouchAnimator.Builder translationXBuilder = new Builder();
TouchAnimator.Builder translationYBuilder = new Builder();
- TouchAnimator.Builder lastRowBuilder = new Builder();
if (mQsPanel.getHost() == null) return;
Collection<QSTile<?>> tiles = mQsPanel.getHost().getTiles();
@@ -152,7 +150,6 @@
int[] loc1 = new int[2];
int[] loc2 = new int[2];
int lastXDiff = 0;
- int lastYDiff = 0;
int lastX = 0;
clearAnimationState();
@@ -175,7 +172,6 @@
final int xDiff = loc2[0] - loc1[0];
final int yDiff = loc2[1] - loc1[1];
lastXDiff = loc1[0] - lastX;
- lastYDiff = yDiff;
// Move the quick tile right from its location to the new one.
translationXBuilder.addFloat(quickTileView, "translationX", 0, xDiff);
translationYBuilder.addFloat(quickTileView, "translationY", 0, yDiff);
@@ -209,23 +205,34 @@
mAllViews.add(tileIcon);
} else {
- lastRowBuilder.addFloat(tileView, "alpha", 0, 1);
+ firstPageBuilder.addFloat(tileView, "alpha", 0, 1);
}
mAllViews.add(tileView);
mAllViews.add(label);
count++;
}
if (mAllowFancy) {
+ // Make brightness appear static position and alpha in through second half.
+ View brightness = mQsPanel.getBrightnessView();
+ if (brightness != null) {
+ firstPageBuilder.addFloat(brightness, "translationY", mQsPanel.getHeight(), 0);
+ mBrightnessAnimator = new TouchAnimator.Builder()
+ .addFloat(brightness, "alpha", 0, 1)
+ .setStartDelay(.5f)
+ .build();
+ mAllViews.add(brightness);
+ } else {
+ mBrightnessAnimator = null;
+ }
mFirstPageAnimator = firstPageBuilder
.setListener(this)
.build();
// Fade in the tiles/labels as we reach the final position.
mFirstPageDelayedAnimator = new TouchAnimator.Builder()
.setStartDelay(EXPANDED_TILE_DELAY)
- .addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1).build();
- mLastRowAnimator = lastRowBuilder
- .setStartDelay(LAST_ROW_EXPANDED_DELAY)
- .build();
+ .addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1)
+ .addFloat(mQsPanel.getFooter().getView(), "alpha", 0, 1).build();
+ mAllViews.add(mQsPanel.getFooter().getView());
Path path = new Path();
path.moveTo(0, 0);
path.cubicTo(0, 0, 0, 1, 1, 1);
@@ -279,7 +286,9 @@
mFirstPageDelayedAnimator.setPosition(position);
mTranslationXAnimator.setPosition(position);
mTranslationYAnimator.setPosition(position);
- mLastRowAnimator.setPosition(position);
+ if (mBrightnessAnimator != null) {
+ mBrightnessAnimator.setPosition(position);
+ }
} else {
mNonfirstPageAnimator.setPosition(position);
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
index 805e9d6..90b2e90 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
@@ -63,11 +63,12 @@
private boolean mScanState;
private boolean mClosingDetail;
private boolean mFullyExpanded;
- protected View mQsDetailHeaderBack;
private BaseStatusBarHeader mHeader;
private boolean mTriggeredExpand;
private int mOpenX;
private int mOpenY;
+ private boolean mAnimatingOpen;
+ private boolean mSwitchState;
public QSDetail(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
@@ -92,7 +93,6 @@
mDetailDoneButton = (TextView) findViewById(android.R.id.button1);
mQsDetailHeader = findViewById(R.id.qs_detail_header);
- mQsDetailHeaderBack = mQsDetailHeader.findViewById(com.android.internal.R.id.up);
mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title);
mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle);
mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress);
@@ -109,7 +109,6 @@
mQsPanel.closeDetail();
}
};
- mQsDetailHeaderBack.setOnClickListener(doneListener);
mDetailDoneButton.setOnClickListener(doneListener);
}
@@ -215,6 +214,7 @@
protected void animateDetailVisibleDiff(int x, int y, boolean visibleDiff, AnimatorListener listener) {
if (visibleDiff) {
+ mAnimatingOpen = mDetailAdapter != null;
if (mFullyExpanded || mDetailAdapter != null) {
setAlpha(1);
mClipper.animateCircularClip(x, y, mDetailAdapter != null, listener);
@@ -246,7 +246,7 @@
mQsDetailHeader.setClickable(false);
} else {
mQsDetailHeaderSwitch.setVisibility(VISIBLE);
- mQsDetailHeaderSwitch.setChecked(toggleState);
+ handleToggleStateChanged(toggleState, adapter.getToggleEnabled());
mQsDetailHeader.setClickable(true);
mQsDetailHeader.setOnClickListener(new OnClickListener() {
@Override
@@ -259,8 +259,14 @@
}
}
- private void handleToggleStateChanged(boolean state) {
+ private void handleToggleStateChanged(boolean state, boolean toggleEnabled) {
+ mSwitchState = state;
+ if (mAnimatingOpen) {
+ return;
+ }
mQsDetailHeaderSwitch.setChecked(state);
+ mQsDetailHeader.setEnabled(toggleEnabled);
+ mQsDetailHeaderSwitch.setEnabled(toggleEnabled);
}
private void handleScanStateChanged(boolean state) {
@@ -276,13 +282,19 @@
}
}
+ private void checkPendingAnimations() {
+ handleToggleStateChanged(mSwitchState,
+ mDetailAdapter != null && mDetailAdapter.getToggleEnabled());
+ }
+
protected QSPanel.Callback mQsPanelCallback = new QSPanel.Callback() {
@Override
public void onToggleStateChanged(final boolean state) {
post(new Runnable() {
@Override
public void run() {
- handleToggleStateChanged(state);
+ handleToggleStateChanged(state,
+ mDetailAdapter != null && mDetailAdapter.getToggleEnabled());
}
});
}
@@ -313,6 +325,8 @@
// If we have been cancelled, remove the listener so that onAnimationEnd doesn't get
// called, this will avoid accidentally turning off the grid when we don't want to.
animation.removeListener(this);
+ mAnimatingOpen = false;
+ checkPendingAnimations();
};
@Override
@@ -322,6 +336,8 @@
mQsPanel.setGridContentVisibility(false);
mHeader.setVisibility(View.INVISIBLE);
}
+ mAnimatingOpen = false;
+ checkPendingAnimations();
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 28b27c0..7ad5054 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -23,7 +23,6 @@
import android.os.Handler;
import android.os.Message;
import android.util.AttributeSet;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
@@ -167,6 +166,10 @@
brightnessSlider.setMirrorController(c);
}
+ View getBrightnessView() {
+ return mBrightnessView;
+ }
+
public void setCallback(Callback callback) {
mCallback = callback;
}
@@ -508,6 +511,10 @@
return null;
}
+ public QSFooter getFooter() {
+ return mFooter;
+ }
+
private class H extends Handler {
private static final int SHOW_DETAIL = 1;
private static final int SET_TILE_VISIBILITY = 2;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index c56c24a..6657b62 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -39,7 +39,6 @@
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.BluetoothController;
import com.android.systemui.statusbar.policy.CastController;
-import com.android.systemui.statusbar.policy.NightModeController;
import com.android.systemui.statusbar.policy.FlashlightController;
import com.android.systemui.statusbar.policy.HotspotController;
import com.android.systemui.statusbar.policy.KeyguardMonitor;
@@ -151,6 +150,9 @@
public interface DetailAdapter {
CharSequence getTitle();
Boolean getToggleState();
+ default boolean getToggleEnabled() {
+ return true;
+ }
View createDetailView(Context context, View convertView, ViewGroup parent);
Intent getSettingsIntent();
void setToggleState(boolean state);
@@ -460,7 +462,6 @@
UserInfoController getUserInfoController();
BatteryController getBatteryController();
TileServices getTileServices();
- NightModeController getNightModeController();
void removeTile(String tileSpec);
ManagedProfileController getManagedProfileController();
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
index 32c66ce..2b7fcc5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
@@ -63,6 +63,7 @@
setClipChildren(false);
setClipToPadding(false);
mCollapsedView = collapsedView;
+ setFocusable(true);
}
protected Drawable newTileBackground() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
index d3f5d26..b36221d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
@@ -71,7 +71,7 @@
super(host);
mWindowManager = WindowManagerGlobal.getWindowManagerService();
mComponent = ComponentName.unflattenFromString(action);
- mTile = new Tile(mComponent);
+ mTile = new Tile();
setTileIcon();
mServiceManager = host.getTileServices().getTileWrapper(this);
mService = mServiceManager.getTileService();
@@ -82,8 +82,11 @@
private void setTileIcon() {
try {
PackageManager pm = mContext.getPackageManager();
- ServiceInfo info = pm.getServiceInfo(mComponent,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
+ int flags = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
+ if (isSystemApp(pm)) {
+ flags |= PackageManager.MATCH_DISABLED_COMPONENTS;
+ }
+ ServiceInfo info = pm.getServiceInfo(mComponent, flags);
int icon = info.icon != 0 ? info.icon
: info.applicationInfo.icon;
// Update the icon if its not set or is the default icon.
@@ -103,6 +106,10 @@
}
}
+ private boolean isSystemApp(PackageManager pm) throws PackageManager.NameNotFoundException {
+ return pm.getApplicationInfo(mComponent.getPackageName(), 0).isSystemApp();
+ }
+
/**
* Compare two icons, only works for resources.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java b/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java
index 407453c..451e1f6 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java
@@ -94,4 +94,8 @@
return false;
}
}
+
+ public IQSTileService getService() {
+ return mService;
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
index 79f9de6..681005c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
@@ -26,6 +26,7 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ServiceInfo;
import android.net.Uri;
+import android.os.Binder;
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
@@ -37,6 +38,7 @@
import android.support.annotation.VisibleForTesting;
import android.util.ArraySet;
import android.util.Log;
+
import libcore.util.Objects;
import java.util.Set;
@@ -67,6 +69,7 @@
private final Handler mHandler;
private final Intent mIntent;
private final UserHandle mUser;
+ private final IBinder mToken = new Binder();
private Set<Integer> mQueuedMessages = new ArraySet<>();
private QSTileServiceWrapper mWrapper;
@@ -88,7 +91,7 @@
mHandler = handler;
mIntent = intent;
mIntent.putExtra(TileService.EXTRA_SERVICE, service.asBinder());
- mIntent.putExtra(TileService.EXTRA_COMPONENT, intent.getComponent());
+ mIntent.putExtra(TileService.EXTRA_TOKEN, mToken);
mUser = user;
if (DEBUG) Log.d(TAG, "Creating " + mIntent + " " + mUser);
}
@@ -396,6 +399,10 @@
handleDeath();
}
+ public IBinder getToken() {
+ return mToken;
+ }
+
public interface TileChangeListener {
void onTileChanged(ComponentName tile);
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
index 3d030f9..f3e4d60 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
@@ -25,6 +25,7 @@
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Handler;
+import android.os.IBinder;
import android.os.UserHandle;
import android.service.quicksettings.IQSTileService;
import android.service.quicksettings.Tile;
@@ -32,6 +33,7 @@
import android.support.annotation.VisibleForTesting;
import android.util.Log;
+import com.android.systemui.qs.customize.TileQueryHelper.TileStateListener;
import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener;
import java.util.List;
@@ -106,6 +108,10 @@
return mStateManager;
}
+ public IBinder getToken() {
+ return mStateManager.getToken();
+ }
+
public void setBindRequested(boolean bindRequested) {
if (mBindRequested == bindRequested) return;
mBindRequested = bindRequested;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
index 6f0bed2..6bc94b2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
@@ -25,10 +25,12 @@
import android.graphics.drawable.Icon;
import android.os.Binder;
import android.os.Handler;
+import android.os.IBinder;
import android.os.Looper;
import android.os.RemoteException;
import android.os.UserHandle;
import android.service.quicksettings.IQSService;
+import android.service.quicksettings.IQSTileService;
import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
import android.util.ArrayMap;
@@ -52,6 +54,7 @@
private final ArrayMap<CustomTile, TileServiceManager> mServices = new ArrayMap<>();
private final ArrayMap<ComponentName, CustomTile> mTiles = new ArrayMap<>();
+ private final ArrayMap<IBinder, CustomTile> mTokenMap = new ArrayMap<>();
private final Context mContext;
private final Handler mHandler;
private final Handler mMainHandler;
@@ -82,6 +85,7 @@
synchronized (mServices) {
mServices.put(tile, service);
mTiles.put(component, tile);
+ mTokenMap.put(service.getToken(), tile);
}
return service;
}
@@ -95,6 +99,7 @@
service.setBindAllowed(false);
service.handleDestroy();
mServices.remove(tile);
+ mTokenMap.remove(service.getToken());
mTiles.remove(tile.getComponent());
final String slot = tile.getComponent().getClassName();
mMainHandler.post(new Runnable() {
@@ -138,8 +143,9 @@
}
}
- private void verifyCaller(String packageName) {
+ private void verifyCaller(CustomTile tile) {
try {
+ String packageName = tile.getComponent().getPackageName();
int uid = mContext.getPackageManager().getPackageUidAsUser(packageName,
Binder.getCallingUserHandle().getIdentifier());
if (Binder.getCallingUid() != uid) {
@@ -170,11 +176,10 @@
}
@Override
- public void updateQsTile(Tile tile) {
- ComponentName componentName = tile.getComponentName();
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public void updateQsTile(Tile tile, IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
synchronized (mServices) {
final TileServiceManager tileServiceManager = mServices.get(customTile);
tileServiceManager.clearPendingBind();
@@ -186,11 +191,10 @@
}
@Override
- public void onStartSuccessful(Tile tile) {
- ComponentName componentName = tile.getComponentName();
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public void onStartSuccessful(IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
synchronized (mServices) {
final TileServiceManager tileServiceManager = mServices.get(customTile);
tileServiceManager.clearPendingBind();
@@ -200,11 +204,10 @@
}
@Override
- public void onShowDialog(Tile tile) {
- ComponentName componentName = tile.getComponentName();
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public void onShowDialog(IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
customTile.onDialogShown();
mHost.collapsePanels();
mServices.get(customTile).setShowingDialog(true);
@@ -212,34 +215,32 @@
}
@Override
- public void onDialogHidden(Tile tile) {
- ComponentName componentName = tile.getComponentName();
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public void onDialogHidden(IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
mServices.get(customTile).setShowingDialog(false);
customTile.onDialogHidden();
}
}
@Override
- public void onStartActivity(Tile tile) {
- ComponentName componentName = tile.getComponentName();
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public void onStartActivity(IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
mHost.collapsePanels();
}
}
@Override
- public void updateStatusIcon(Tile tile, Icon icon, String contentDescription) {
- final ComponentName componentName = tile.getComponentName();
- String packageName = componentName.getPackageName();
- verifyCaller(packageName);
- CustomTile customTile = getTileForComponent(componentName);
+ public void updateStatusIcon(IBinder token, Icon icon, String contentDescription) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
try {
+ ComponentName componentName = customTile.getComponent();
+ String packageName = componentName.getPackageName();
UserHandle userHandle = getCallingUserHandle();
PackageInfo info = mContext.getPackageManager().getPackageInfoAsUser(packageName, 0,
userHandle.getIdentifier());
@@ -263,21 +264,20 @@
}
@Override
- public Tile getTile(ComponentName componentName) {
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public Tile getTile(IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
return customTile.getQsTile();
}
return null;
}
@Override
- public void startUnlockAndRun(Tile tile) {
- ComponentName componentName = tile.getComponentName();
- verifyCaller(componentName.getPackageName());
- CustomTile customTile = getTileForComponent(componentName);
+ public void startUnlockAndRun(IBinder token) {
+ CustomTile customTile = getTileForToken(token);
if (customTile != null) {
+ verifyCaller(customTile);
customTile.startUnlockAndRun();
}
}
@@ -294,6 +294,12 @@
return keyguardMonitor.isSecure() && keyguardMonitor.isShowing();
}
+ private CustomTile getTileForToken(IBinder token) {
+ synchronized (mServices) {
+ return mTokenMap.get(token);
+ }
+ }
+
private CustomTile getTileForComponent(ComponentName component) {
synchronized (mServices) {
return mTiles.get(component);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index f892a24..8d8474a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -16,6 +16,7 @@
package com.android.systemui.qs.tiles;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
@@ -90,11 +91,11 @@
mHost.startActivityDismissingKeyguard(new Intent(Settings.ACTION_BLUETOOTH_SETTINGS));
return;
}
+ showDetail(true);
if (!mState.value) {
mState.value = true;
mController.setBluetoothEnabled(true);
}
- showDetail(true);
}
@Override
@@ -213,6 +214,12 @@
}
@Override
+ public boolean getToggleEnabled() {
+ return mController.getBluetoothState() == BluetoothAdapter.STATE_OFF
+ || mController.getBluetoothState() == BluetoothAdapter.STATE_ON;
+ }
+
+ @Override
public Intent getSettingsIntent() {
return BLUETOOTH_SETTINGS;
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
index 04cb553..91821ba 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
@@ -122,9 +122,9 @@
if (mState.value) {
mController.setZen(Global.ZEN_MODE_OFF, null, TAG);
} else {
+ showDetail(true);
int zen = Prefs.getInt(mContext, Prefs.Key.DND_FAVORITE_ZEN, Global.ZEN_MODE_ALARMS);
mController.setZen(zen, null, TAG);
- showDetail(true);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
new file mode 100644
index 0000000..2d1f753
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.Intent;
+import android.provider.Settings;
+import android.widget.Switch;
+
+import com.android.internal.app.NightDisplayController;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.systemui.R;
+import com.android.systemui.qs.QSTile;
+
+public class NightDisplayTile extends QSTile<QSTile.BooleanState>
+ implements NightDisplayController.Callback {
+
+ private final NightDisplayController mController;
+
+ public NightDisplayTile(Host host) {
+ super(host);
+ mController = new NightDisplayController(mContext);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return NightDisplayController.isAvailable(mContext);
+ }
+
+ @Override
+ public BooleanState newTileState() {
+ return new BooleanState();
+ }
+
+ @Override
+ protected void handleClick() {
+ final boolean activated = !mState.value;
+ MetricsLogger.action(mContext, getMetricsCategory(), activated);
+ mController.setActivated(activated);
+ }
+
+ @Override
+ protected void handleUpdateState(BooleanState state, Object arg) {
+ final boolean isActivated = mController.isActivated();
+ state.value = isActivated;
+ state.label = mContext.getString(R.string.quick_settings_night_display_label);
+ state.icon = ResourceIcon.get(isActivated ? R.drawable.ic_qs_night_display_on
+ : R.drawable.ic_qs_night_display_off);
+ state.contentDescription = mContext.getString(isActivated
+ ? R.string.quick_settings_night_display_summary_on
+ : R.string.quick_settings_night_display_summary_off);
+ state.minimalAccessibilityClassName = state.expandedAccessibilityClassName
+ = Switch.class.getName();
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.QS_NIGHT_DISPLAY;
+ }
+
+ @Override
+ public Intent getLongClickIntent() {
+ return new Intent(Settings.ACTION_NIGHT_DISPLAY_SETTINGS);
+ }
+
+ @Override
+ protected void setListening(boolean listening) {
+ if (listening) {
+ mController.setListener(this);
+ refreshState();
+ } else {
+ mController.setListener(null);
+ }
+ }
+
+ @Override
+ public CharSequence getTileLabel() {
+ return mContext.getString(R.string.quick_settings_night_display_label);
+ }
+
+ @Override
+ public void onActivated(boolean activated) {
+ refreshState();
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index 8910864..ba79a18 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -116,11 +116,11 @@
mHost.startActivityDismissingKeyguard(new Intent(Settings.ACTION_WIFI_SETTINGS));
return;
}
+ showDetail(true);
if (!mState.value) {
mController.setWifiEnabled(true);
mState.value = true;
}
- showDetail(true);
}
@Override
@@ -371,5 +371,5 @@
}
mItems.setItems(items);
}
- };
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 0f356e0..7bdb1c4 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -801,9 +801,13 @@
Recents.getTaskLoader().dump(prefix, writer);
String id = Integer.toHexString(System.identityHashCode(this));
+ long lastStackActiveTime = Prefs.getLong(this,
+ Prefs.Key.OVERVIEW_LAST_STACK_TASK_ACTIVE_TIME, -1);
writer.print(prefix); writer.print(TAG);
writer.print(" visible="); writer.print(mIsVisible ? "Y" : "N");
+ writer.print(" lastStackTaskActiveTime="); writer.print(lastStackActiveTime);
+ writer.print(" currentTime="); writer.print(System.currentTimeMillis());
writer.print(" [0x"); writer.print(id); writer.print("]");
writer.println();
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
index de65f2f..f299c19 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
@@ -185,7 +185,9 @@
mHeaderBar = (TaskViewHeader) inflater.inflate(R.layout.recents_task_view_header,
null, false);
reloadResources();
+ }
+ public void onBootCompleted() {
// When we start, preload the data associated with the previous recent tasks.
// We can use a new plan since the caches will be the same.
RecentsTaskLoader loader = Recents.getTaskLoader();
@@ -198,10 +200,6 @@
loader.loadTasks(mContext, plan, launchOpts);
}
- public void onBootCompleted() {
- // Do nothing
- }
-
public void onConfigurationChanged() {
reloadResources();
mDummyStackView.reloadOnConfigurationChange();
@@ -614,7 +612,7 @@
stackLayout.setSystemInsets(systemInsets);
if (stack != null) {
stackLayout.getTaskStackBounds(displayRect, windowRect, systemInsets.top,
- systemInsets.right, mTaskStackBounds);
+ systemInsets.left, systemInsets.right, mTaskStackBounds);
stackLayout.reset();
stackLayout.initialize(displayRect, windowRect, mTaskStackBounds,
TaskStackLayoutAlgorithm.StackState.getStackStateForStack(stack));
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index b5ec763..a93b283 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@ -315,8 +315,12 @@
if (includeFrontMostExcludedTask) {
flags |= ActivityManager.RECENT_WITH_EXCLUDED;
}
- List<ActivityManager.RecentTaskInfo> tasks = mAm.getRecentTasksForUser(numTasksToQuery,
- flags, userId);
+ List<ActivityManager.RecentTaskInfo> tasks = null;
+ try {
+ tasks = mAm.getRecentTasksForUser(numTasksToQuery, flags, userId);
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to get recent tasks", e);
+ }
// Break early if we can't get a valid set of tasks
if (tasks == null) {
@@ -331,8 +335,9 @@
// NOTE: The order of these checks happens in the expected order of the traversal of the
// tasks
- // Remove the task if it is blacklisted
- if (sRecentsBlacklist.contains(t.realActivity.getClassName())) {
+ // Remove the task if it or it's package are blacklsited
+ if (sRecentsBlacklist.contains(t.realActivity.getClassName()) ||
+ sRecentsBlacklist.contains(t.realActivity.getPackageName())) {
iter.remove();
continue;
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
index 26200d0..b5753ba 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
@@ -511,8 +511,8 @@
int top = dockArea.bottom < 1f
? 0
: insets.top;
- layoutAlgorithm.getTaskStackBounds(displayRect, windowRectOut, top, insets.right,
- taskStackBounds);
+ layoutAlgorithm.getTaskStackBounds(displayRect, windowRectOut, top, insets.left,
+ insets.right, taskStackBounds);
return taskStackBounds;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index a893910..43d0cf6 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -140,8 +140,6 @@
LayoutInflater inflater = LayoutInflater.from(context);
if (RecentsDebugFlags.Static.EnableStackActionButton) {
- float cornerRadius = context.getResources().getDimensionPixelSize(
- R.dimen.recents_task_view_rounded_corners_radius);
mStackActionButton = (TextView) inflater.inflate(R.layout.recents_stack_action_button,
this, false);
mStackActionButton.setOnClickListener(new View.OnClickListener() {
@@ -151,13 +149,6 @@
}
});
addView(mStackActionButton);
- mStackActionButton.setClipToOutline(true);
- mStackActionButton.setOutlineProvider(new ViewOutlineProvider() {
- @Override
- public void getOutline(View view, Outline outline) {
- outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), cornerRadius);
- }
- });
}
mEmptyView = (TextView) inflater.inflate(R.layout.recents_empty, this, false);
addView(mEmptyView);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
index e3fe1ab..89789bce 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
@@ -1058,9 +1058,9 @@
* top and right system insets (but not the bottom inset) and left/right paddings, but _not_
* the top/bottom padding or insets.
*/
- public void getTaskStackBounds(Rect displayRect, Rect windowRect, int topInset, int rightInset,
- Rect taskStackBounds) {
- taskStackBounds.set(windowRect.left, windowRect.top + topInset,
+ public void getTaskStackBounds(Rect displayRect, Rect windowRect, int topInset, int leftInset,
+ int rightInset, Rect taskStackBounds) {
+ taskStackBounds.set(windowRect.left + leftInset, windowRect.top + topInset,
windowRect.right - rightInset, windowRect.bottom);
// Ensure that the new width is at most the smaller display edge size
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 1f0a99f..fef0556 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1194,7 +1194,8 @@
// bounds have changed. This is because we may get spurious measures while dragging where
// our current stack bounds reflect the target drop region.
mLayoutAlgorithm.getTaskStackBounds(mDisplayRect, new Rect(0, 0, width, height),
- mLayoutAlgorithm.mSystemInsets.top, mLayoutAlgorithm.mSystemInsets.right, mTmpRect);
+ mLayoutAlgorithm.mSystemInsets.top, mLayoutAlgorithm.mSystemInsets.left,
+ mLayoutAlgorithm.mSystemInsets.right, mTmpRect);
if (!mTmpRect.equals(mStableStackBounds)) {
mStableStackBounds.set(mTmpRect);
mStackBounds.set(mTmpRect);
@@ -1551,11 +1552,6 @@
// Bind the task view to the new task
bindTaskView(tv, task);
- // If the doze trigger has already fired, then update the state for this task view
- if (mUIDozeTrigger.isAsleep()) {
- tv.setNoUserInteractionState();
- }
-
// Set the new state for this view, including the callbacks and view clipping
tv.setCallbacks(this);
tv.setTouchEnabled(true);
@@ -1585,6 +1581,12 @@
// Rebind the task and request that this task's data be filled into the TaskView
tv.onTaskBound(task, mTouchExplorationEnabled, mDisplayOrientation, mDisplayRect);
+ // If the doze trigger has already fired, then update the state for this task view
+ if (mUIDozeTrigger.isAsleep() ||
+ Recents.getSystemServices().hasFreeformWorkspaceSupport()) {
+ tv.setNoUserInteractionState();
+ }
+
// Load the task data
Recents.getTaskLoader().loadTaskData(task);
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
index 795dd27..99d98bc 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -216,9 +216,6 @@
protected void onFinishInflate() {
// Bind the views
mHeaderView = (TaskViewHeader) findViewById(R.id.task_view_bar);
- if (Recents.getSystemServices().hasFreeformWorkspaceSupport()) {
- mHeaderView.setNoUserInteractionState();
- }
mThumbnailView = (TaskViewThumbnail) findViewById(R.id.task_view_thumbnail);
mThumbnailView.updateClipToTaskBar(mHeaderView);
mActionButtonView = findViewById(R.id.lock_to_app_fab);
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
index 4badc42..f3bae20 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
@@ -23,6 +23,8 @@
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
+import android.os.UserManager;
+import android.util.Log;
import android.view.WindowManager;
public class TakeScreenshotService extends Service {
@@ -44,6 +46,16 @@
}
}
};
+
+ // If the storage for this user is locked, we have no place to store
+ // the screenshot, so skip taking it instead of showing a misleading
+ // animation and error notification.
+ if (!getSystemService(UserManager.class).isUserUnlocked()) {
+ Log.w(TAG, "Skipping screenshot because storage is locked!");
+ post(finisher);
+ return;
+ }
+
if (mScreenshot == null) {
mScreenshot = new GlobalScreenshot(TakeScreenshotService.this);
}
diff --git a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java
index 0aeb7b4..15d26f9 100644
--- a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java
+++ b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java
@@ -25,6 +25,8 @@
import android.content.pm.ServiceInfo;
import android.content.res.Configuration;
import android.os.RemoteException;
+import android.os.UserHandle;
+import android.util.ArraySet;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.IWindowManager;
@@ -39,6 +41,7 @@
import com.android.systemui.R;
import com.android.systemui.SystemUI;
import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.stackdivider.Divider;
import com.android.systemui.stackdivider.DividerView;
import com.android.systemui.statusbar.phone.NavigationBarGestureHelper;
@@ -102,8 +105,16 @@
int dockMode = (shortcutCode == SC_DOCK_LEFT)
? ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT
: ActivityManager.DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT;
- recents.dockTopTask(NavigationBarGestureHelper.DRAG_MODE_NONE, dockMode, null,
- MetricsEvent.WINDOW_DOCK_SHORTCUTS);
+ List<ActivityManager.RecentTaskInfo> taskList =
+ SystemServicesProxy.getInstance(mContext).getRecentTasks(1,
+ UserHandle.USER_CURRENT, false, new ArraySet<>());
+ recents.showRecents(
+ false /* triggeredFromAltTab */,
+ false /* fromHome */);
+ if (!taskList.isEmpty()) {
+ SystemServicesProxy.getInstance(mContext).startTaskInDockedMode(
+ taskList.get(0).id, dockMode);
+ }
} else {
// If there is already a docked window, we respond by resizing the docking pane.
DividerView dividerView = getComponent(Divider.class).getView();
@@ -111,11 +122,11 @@
int dividerPosition = dividerView.getCurrentPosition();
DividerSnapAlgorithm.SnapTarget currentTarget =
snapAlgorithm.calculateNonDismissingSnapTarget(dividerPosition);
- int increment = (shortcutCode == SC_DOCK_LEFT) ? -1 : 1;
- DividerSnapAlgorithm.SnapTarget target = snapAlgorithm.cycleNonDismissTarget(
- currentTarget, increment);
+ DividerSnapAlgorithm.SnapTarget target = (shortcutCode == SC_DOCK_LEFT)
+ ? snapAlgorithm.getPreviousTarget(currentTarget)
+ : snapAlgorithm.getNextTarget(currentTarget);
dividerView.startDragging(true /* animate */, false /* touching */);
- dividerView.stopDragging(target.position, 0f, true /* avoidDismissStart */,
+ dividerView.stopDragging(target.position, 0f, false /* avoidDismissStart */,
true /* logMetrics */);
}
} catch (RemoteException e) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
index 42c9a126..9afb384 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
@@ -137,11 +137,13 @@
private float mNormalBackgroundVisibilityAmount;
private ValueAnimator mFadeInFromDarkAnimator;
+ private float mDimmedBackgroundFadeInAmount = -1;
private ValueAnimator.AnimatorUpdateListener mBackgroundVisibilityUpdater
= new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
setNormalBackgroundVisibilityAmount(mBackgroundNormal.getAlpha());
+ mDimmedBackgroundFadeInAmount = mBackgroundDimmed.getAlpha();
}
};
private AnimatorListenerAdapter mFadeInEndListener = new AnimatorListenerAdapter() {
@@ -149,6 +151,7 @@
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
mFadeInFromDarkAnimator = null;
+ mDimmedBackgroundFadeInAmount = -1;
updateBackground();
}
};
@@ -597,7 +600,10 @@
}
protected void updateBackgroundAlpha(float transformationAmount) {
- mBgAlpha = isChildInGroup() && mDimmed ? transformationAmount : 1f;
+ mBgAlpha = isChildInGroup() && mDimmed ? transformationAmount : 1f;
+ if (mDimmedBackgroundFadeInAmount != -1) {
+ mBgAlpha *= mDimmedBackgroundFadeInAmount;
+ }
mBackgroundDimmed.setAlpha(mBgAlpha);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index ff2aa6c..d93889c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -40,7 +40,6 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo;
import android.content.res.Configuration;
-import android.content.res.Resources;
import android.database.ContentObserver;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
@@ -472,20 +471,28 @@
}
}
- riv.setVisibility(View.VISIBLE);
- int cx = view.getLeft() + view.getWidth() / 2;
+ int width = view.getWidth();
+ if (view instanceof TextView) {
+ // Center the reveal on the text which might be off-center from the TextView
+ TextView tv = (TextView) view;
+ if (tv.getLayout() != null) {
+ int innerWidth = (int) tv.getLayout().getLineWidth(0);
+ innerWidth += tv.getCompoundPaddingLeft() + tv.getCompoundPaddingRight();
+ width = Math.min(width, innerWidth);
+ }
+ }
+ int cx = view.getLeft() + width / 2;
int cy = view.getTop() + view.getHeight() / 2;
int w = riv.getWidth();
int h = riv.getHeight();
int r = Math.max(
Math.max(cx + cy, cx + (h - cy)),
Math.max((w - cx) + cy, (w - cx) + (h - cy)));
- ViewAnimationUtils.createCircularReveal(riv, cx, cy, 0, r)
- .start();
+ riv.setRevealParameters(cx, cy, r);
riv.setPendingIntent(pendingIntent);
riv.setRemoteInput(inputs, input);
- riv.focus();
+ riv.focusAnimated();
return true;
}
@@ -512,7 +519,7 @@
recentTask = ActivityManagerNative.getDefault().getRecentTasks(1,
ActivityManager.RECENT_WITH_EXCLUDED
| ActivityManager.RECENT_INCLUDE_PROFILES,
- mCurrentUserId);
+ mCurrentUserId).getList();
} catch (RemoteException e) {
// Abandon hope activity manager not running.
}
@@ -963,18 +970,15 @@
}
}
- protected View bindVetoButtonClickListener(View row, final StatusBarNotification n) {
- View vetoButton = row.findViewById(R.id.veto);
- vetoButton.setOnClickListener(new View.OnClickListener() {
+ protected void bindDismissListener(final ExpandableNotificationRow row) {
+ row.setOnDismissListener(new View.OnClickListener() {
public void onClick(View v) {
// Accessibility feedback
v.announceForAccessibility(
mContext.getString(R.string.accessibility_notification_dismissed));
- performRemoveNotification(n, false /* removeView */);
+ performRemoveNotification(row.getStatusBarNotification(), false /* removeView */);
}
});
- vetoButton.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
- return vetoButton;
}
protected void performRemoveNotification(StatusBarNotification n, boolean removeView) {
@@ -1651,9 +1655,7 @@
}
workAroundBadLayerDrawableOpacity(row);
- View vetoButton = bindVetoButtonClickListener(row, sbn);
- vetoButton.setContentDescription(mContext.getString(
- R.string.accessibility_remove_notification));
+ bindDismissListener(row);
// NB: the large icon is now handled entirely by the template
@@ -2413,10 +2415,6 @@
updateHeadsUp(key, entry, shouldPeek, alertAgain);
updateNotifications();
- // Update the veto button accordingly (and as a result, whether this row is
- // swipe-dismissable)
- bindVetoButtonClickListener(entry.row, notification);
-
if (!notification.isClearable()) {
// The user may have performed a dismiss action on the notification, since it's
// not clearable we should snap it back.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index f09eae8..58d402b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -109,7 +109,6 @@
private int mHeadsUpHeight;
private View mVetoButton;
private int mNotificationColor;
- private boolean mClearable;
private ExpansionLogger mLogger;
private String mLoggingKey;
private NotificationSettingsIconRow mSettingsIconRow;
@@ -280,7 +279,6 @@
mPublicLayout.onNotificationUpdated(entry);
mShowingPublicInitialized = false;
updateNotificationColor();
- updateClearability();
if (mIsSummaryWithChildren) {
mChildrenContainer.recreateNotificationHeader(mExpandClickListener, mEntry.notification);
mChildrenContainer.onNotificationUpdated();
@@ -779,6 +777,14 @@
return mGroupParentWhenDismissed;
}
+ public void performDismiss() {
+ mVetoButton.performClick();
+ }
+
+ public void setOnDismissListener(OnClickListener listener) {
+ mVetoButton.setOnClickListener(listener);
+ }
+
public interface ExpansionLogger {
public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
}
@@ -880,6 +886,9 @@
}
});
mVetoButton = findViewById(R.id.veto);
+ mVetoButton.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+ mVetoButton.setContentDescription(mContext.getString(
+ R.string.accessibility_remove_notification));
// Add the views that we translate to reveal the gear
mTranslateableViews = new ArrayList<View>();
@@ -893,6 +902,10 @@
mTranslateableViews.remove(mGutsStub);
}
+ public View getVetoButton() {
+ return mVetoButton;
+ }
+
public void resetTranslation() {
if (mTranslateableViews != null) {
for (int i = 0; i < mTranslateableViews.size(); i++) {
@@ -1109,7 +1122,7 @@
mPrivateLayout.setUserExpanding(userLocked);
if (mIsSummaryWithChildren) {
mChildrenContainer.setUserLocked(userLocked);
- if (userLocked || (!userLocked && !isGroupExpanded())) {
+ if (userLocked || !isGroupExpanded()) {
updateBackgroundForGroupState();
}
}
@@ -1157,10 +1170,25 @@
}
/**
- * @return Can the underlying notification be cleared?
+ * @return Can the underlying notification be cleared? This can be different from whether the
+ * notification can be dismissed in case notifications are sensitive on the lockscreen.
+ * @see #canViewBeDismissed()
*/
public boolean isClearable() {
- return mStatusBarNotification != null && mStatusBarNotification.isClearable();
+ if (mStatusBarNotification == null || !mStatusBarNotification.isClearable()) {
+ return false;
+ }
+ if (mIsSummaryWithChildren) {
+ List<ExpandableNotificationRow> notificationChildren =
+ mChildrenContainer.getNotificationChildren();
+ for (int i = 0; i < notificationChildren.size(); i++) {
+ ExpandableNotificationRow child = notificationChildren.get(i);
+ if (!child.isClearable()) {
+ return false;
+ }
+ }
+ }
+ return true;
}
@Override
@@ -1317,7 +1345,6 @@
NotificationContentView showingLayout = getShowingLayout();
showingLayout.updateBackgroundColor(animated);
mPrivateLayout.updateExpandButtons(isExpandable());
- updateClearability();
mShowingPublicInitialized = true;
}
@@ -1357,12 +1384,12 @@
return mIsHeadsUp;
}
- private void updateClearability() {
- // public versions cannot be dismissed
- mVetoButton.setVisibility(canViewBeDismissed() ? View.VISIBLE : View.GONE);
- }
-
- private boolean canViewBeDismissed() {
+ /**
+ * @return Whether this view is allowed to be dismissed. Only valid for visible notifications as
+ * otherwise some state might not be updated. To request about the general clearability
+ * see {@link #isClearable()}.
+ */
+ public boolean canViewBeDismissed() {
return isClearable() && (!mShowingPublic || !mSensitiveHiddenInGeneral);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 71904fa..6d73ccb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -16,6 +16,7 @@
package com.android.systemui.statusbar;
+import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -30,6 +31,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
+import android.os.UserManager;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.util.Log;
@@ -57,6 +59,7 @@
private final Context mContext;
private final KeyguardIndicationTextView mTextView;
+ private final UserManager mUserManager;
private final IBatteryStats mBatteryInfo;
private final int mSlowThreshold;
@@ -85,9 +88,10 @@
mSlowThreshold = res.getInteger(R.integer.config_chargingSlowlyThreshold);
mFastThreshold = res.getInteger(R.integer.config_chargingFastThreshold);
-
+ mUserManager = context.getSystemService(UserManager.class);
mBatteryInfo = IBatteryStats.Stub.asInterface(
ServiceManager.getService(BatteryStats.SERVICE_NAME));
+
KeyguardUpdateMonitor.getInstance(context).registerCallback(mUpdateMonitor);
context.registerReceiverAsUser(mReceiver, UserHandle.SYSTEM,
new IntentFilter(Intent.ACTION_TIME_TICK), null, null);
@@ -155,30 +159,29 @@
private void updateIndication() {
if (mVisible) {
- mTextView.switchIndication(computeIndication());
- mTextView.setTextColor(computeColor());
- }
- }
+ // Walk down a precedence-ordered list of what should indication
+ // should be shown based on user or device state
+ if (!mUserManager.isUserUnlocked(ActivityManager.getCurrentUser())) {
+ mTextView.switchIndication(com.android.internal.R.string.lockscreen_storage_locked);
+ mTextView.setTextColor(Color.WHITE);
- private int computeColor() {
- if (!TextUtils.isEmpty(mTransientIndication)) {
- return mTransientTextColor;
- }
- return Color.WHITE;
- }
+ } else if (!TextUtils.isEmpty(mTransientIndication)) {
+ mTextView.switchIndication(mTransientIndication);
+ mTextView.setTextColor(mTransientTextColor);
- private String computeIndication() {
- if (!TextUtils.isEmpty(mTransientIndication)) {
- return mTransientIndication;
- }
- if (mPowerPluggedIn) {
- String indication = computePowerIndication();
- if (DEBUG_CHARGING_SPEED) {
- indication += ", " + (mChargingWattage / 1000) + " mW";
+ } else if (mPowerPluggedIn) {
+ String indication = computePowerIndication();
+ if (DEBUG_CHARGING_SPEED) {
+ indication += ", " + (mChargingWattage / 1000) + " mW";
+ }
+ mTextView.switchIndication(indication);
+ mTextView.setTextColor(Color.WHITE);
+
+ } else {
+ mTextView.switchIndication(mRestingIndication);
+ mTextView.setTextColor(Color.WHITE);
}
- return indication;
}
- return mRestingIndication;
}
private String computePowerIndication() {
@@ -225,6 +228,8 @@
}
KeyguardUpdateMonitorCallback mUpdateMonitor = new KeyguardUpdateMonitorCallback() {
+ public int mLastSuccessiveErrorMessage = -1;
+
@Override
public void onRefreshBatteryInfo(KeyguardUpdateMonitor.BatteryStatus status) {
boolean isChargingOrFull = status.status == BatteryManager.BATTERY_STATUS_CHARGING
@@ -252,6 +257,9 @@
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_CLEAR_FP_MSG),
TRANSIENT_FP_ERROR_TIMEOUT);
}
+ // Help messages indicate that there was actually a try since the last error, so those
+ // are not two successive error messages anymore.
+ mLastSuccessiveErrorMessage = -1;
}
@Override
@@ -263,15 +271,22 @@
}
int errorColor = mContext.getResources().getColor(R.color.system_warning_color, null);
if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
- mStatusBarKeyguardViewManager.showBouncerMessage(errString, errorColor);
+ // When swiping up right after receiving a fingerprint error, the bouncer calls
+ // authenticate leading to the same message being shown again on the bouncer.
+ // We want to avoid this, as it may confuse the user when the message is too
+ // generic.
+ if (mLastSuccessiveErrorMessage != msgId) {
+ mStatusBarKeyguardViewManager.showBouncerMessage(errString, errorColor);
+ }
} else if (updateMonitor.isDeviceInteractive()) {
- showTransientIndication(errString, errorColor);
- // We want to keep this message around in case the screen was off
- mHandler.removeMessages(MSG_HIDE_TRANSIENT);
- hideTransientIndicationDelayed(5000);
- } else {
- mMessageToShowOnScreenOn = errString;
+ showTransientIndication(errString, errorColor);
+ // We want to keep this message around in case the screen was off
+ mHandler.removeMessages(MSG_HIDE_TRANSIENT);
+ hideTransientIndicationDelayed(5000);
+ } else {
+ mMessageToShowOnScreenOn = errString;
}
+ mLastSuccessiveErrorMessage = msgId;
}
@Override
@@ -293,6 +308,18 @@
mMessageToShowOnScreenOn = null;
}
}
+
+ @Override
+ public void onFingerprintAuthenticated(int userId) {
+ super.onFingerprintAuthenticated(userId);
+ mLastSuccessiveErrorMessage = -1;
+ }
+
+ @Override
+ public void onFingerprintAuthFailed() {
+ super.onFingerprintAuthFailed();
+ mLastSuccessiveErrorMessage = -1;
+ }
};
BroadcastReceiver mReceiver = new BroadcastReceiver() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
index b66a4fb..c497cfd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
@@ -186,7 +186,7 @@
try {
final PackageInfo info =
pm.getPackageInfo(sbn.getPackageName(), PackageManager.GET_SIGNATURES);
- systemApp = Utils.isSystemPackage(pm, info);
+ systemApp = Utils.isSystemPackage(getResources(), pm, info);
} catch (PackageManager.NameNotFoundException e) {
// unlikely.
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
index 7794d5b..3e4c758 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
@@ -240,7 +240,11 @@
// Also, the notification might have been modified during the animation, so background
// might be null here.
if (iconDrawable != null) {
- iconDrawable.mutate().setColorFilter(mIconColorFilter);
+ Drawable d = iconDrawable.mutate();
+ // DrawableContainer ignores the color filter if it's already set, so clear it first to
+ // get it set and invalidated properly.
+ d.setColorFilter(null);
+ d.setColorFilter(mIconColorFilter);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java
index 58fbd4c..b742479 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java
@@ -24,7 +24,6 @@
import com.android.systemui.statusbar.policy.DataSaverController.Listener;
import com.android.systemui.statusbar.policy.HotspotController;
import com.android.systemui.statusbar.policy.HotspotController.Callback;
-import com.android.systemui.statusbar.policy.NightModeController;
/**
* Manages which tiles should be automatically added to QS.
@@ -67,35 +66,12 @@
if (!Prefs.getBoolean(context, Key.QS_WORK_ADDED, false)) {
host.getManagedProfileController().addCallback(mProfileCallback);
}
- if (!Prefs.getBoolean(context, Key.QS_NIGHT_ADDED, false)) {
- host.getNightModeController().addListener(mNightModeListener);
- }
}
public void destroy() {
// TODO: Remove any registered listeners.
}
- private final NightModeController.Listener mNightModeListener =
- new NightModeController.Listener() {
- @Override
- public void onNightModeChanged() {
- if (mHost.getNightModeController().isEnabled()) {
- mHost.addTile("night");
- Prefs.putBoolean(mContext, Key.QS_NIGHT_ADDED, true);
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mHost.getNightModeController().removeListener(mNightModeListener);
- }
- });
- }
- }
-
- @Override
- public void onTwilightAutoChanged() { }
- };
-
private final ManagedProfileController.Callback mProfileCallback =
new ManagedProfileController.Callback() {
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
index b5a48a3..95cb672 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
@@ -49,6 +49,13 @@
mViews.clear();
}
+ void addView(View view, boolean landscape) {
+ addView(view);
+ if (view instanceof ButtonInterface) {
+ ((ButtonInterface) view).setLandscape(landscape);
+ }
+ }
+
void addView(View view) {
mViews.add(view);
view.setOnClickListener(mClickListener);
@@ -157,6 +164,10 @@
}
}
+ public ArrayList<View> getViews() {
+ return mViews;
+ }
+
public View getCurrentView() {
return mCurrentView;
}
@@ -165,8 +176,18 @@
mCurrentView = currentView.findViewById(mId);
}
+ public void setCarMode(boolean carMode) {
+ final int N = mViews.size();
+ for (int i = 0; i < N; i++) {
+ final View view = mViews.get(i);
+ if (view instanceof ButtonInterface) {
+ ((ButtonInterface) view).setCarMode(carMode);
+ }
+ }
+ }
+
/**
- * Interface for ImageView button actions.
+ * Interface for button actions.
*/
public interface ButtonInterface {
void setImageResource(@DrawableRes int resId);
@@ -174,5 +195,9 @@
void setImageDrawable(@Nullable Drawable drawable);
void abortCurrentGesture();
+
+ void setLandscape(boolean landscape);
+
+ void setCarMode(boolean carMode);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index 1d890d0..9b3ed33 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -21,6 +21,7 @@
import android.text.TextUtils;
import android.util.Log;
import android.util.MathUtils;
+import android.util.SparseBooleanArray;
import com.android.systemui.R;
@@ -39,6 +40,8 @@
private static PulseSchedule sPulseSchedule;
+ private static IntInOutMatcher sPickupSubtypePerformsProxMatcher;
+
public DozeParameters(Context context) {
mContext = context;
}
@@ -61,7 +64,20 @@
pw.print(" getPulseSchedule(): "); pw.println(getPulseSchedule());
pw.print(" getPulseScheduleResets(): "); pw.println(getPulseScheduleResets());
pw.print(" getPickupVibrationThreshold(): "); pw.println(getPickupVibrationThreshold());
- pw.print(" getPickupPerformsProxCheck(): "); pw.println(getPickupPerformsProxCheck());
+ pw.print(" getPickupSubtypePerformsProxCheck(): ");pw.println(
+ dumpPickupSubtypePerformsProxCheck());
+ }
+
+ private String dumpPickupSubtypePerformsProxCheck() {
+ // Refresh sPickupSubtypePerformsProxMatcher
+ getPickupSubtypePerformsProxCheck(0);
+
+ if (sPickupSubtypePerformsProxMatcher == null) {
+ return "fallback: " + mContext.getResources().getBoolean(
+ R.bool.doze_pickup_performs_proximity_check);
+ } else {
+ return "spec: " + sPickupSubtypePerformsProxMatcher.mSpec;
+ }
}
public boolean getDisplayStateSupported() {
@@ -106,10 +122,6 @@
return getBoolean("doze.pulse.proxcheck", R.bool.doze_proximity_check_before_pulse);
}
- public boolean getPickupPerformsProxCheck() {
- return getBoolean("doze.pickup.proxcheck", R.bool.doze_pickup_performs_proximity_check);
- }
-
public boolean getPulseOnNotifications() {
return getBoolean("doze.pulse.notifications", R.bool.doze_pulse_on_notifications);
}
@@ -143,6 +155,101 @@
return SystemProperties.get(propName, mContext.getString(resId));
}
+ public boolean getPickupSubtypePerformsProxCheck(int subType) {
+ String spec = getString("doze.pickup.proxcheck",
+ R.string.doze_pickup_subtype_performs_proximity_check);
+
+ if (TextUtils.isEmpty(spec)) {
+ // Fall back to non-subtype based property.
+ return mContext.getResources().getBoolean(R.bool.doze_pickup_performs_proximity_check);
+ }
+
+ if (sPickupSubtypePerformsProxMatcher == null
+ || !TextUtils.equals(spec, sPickupSubtypePerformsProxMatcher.mSpec)) {
+ sPickupSubtypePerformsProxMatcher = new IntInOutMatcher(spec);
+ }
+
+ return sPickupSubtypePerformsProxMatcher.isIn(subType);
+ }
+
+
+ /**
+ * Parses a spec of the form `1,2,3,!5,*`. The resulting object will match numbers that are
+ * listed, will not match numbers that are listed with a ! prefix, and will match / not match
+ * unlisted numbers depending on whether * or !* is present.
+ *
+ * * -> match any numbers that are not explicitly listed
+ * !* -> don't match any numbers that are not explicitly listed
+ * 2 -> match 2
+ * !3 -> don't match 3
+ *
+ * It is illegal to specify:
+ * - an empty spec
+ * - a spec containing that are empty, or a lone !
+ * - a spec for anything other than numbers or *
+ * - multiple terms for the same number / multiple *s
+ */
+ public static class IntInOutMatcher {
+ private static final String WILDCARD = "*";
+ private static final char OUT_PREFIX = '!';
+
+ private final SparseBooleanArray mIsIn;
+ private final boolean mDefaultIsIn;
+ final String mSpec;
+
+ public IntInOutMatcher(String spec) {
+ if (TextUtils.isEmpty(spec)) {
+ throw new IllegalArgumentException("Spec must not be empty");
+ }
+
+ boolean defaultIsIn = false;
+ boolean foundWildcard = false;
+
+ mSpec = spec;
+ mIsIn = new SparseBooleanArray();
+
+ for (String itemPrefixed : spec.split(",", -1)) {
+ if (itemPrefixed.length() == 0) {
+ throw new IllegalArgumentException(
+ "Illegal spec, must not have zero-length items: `" + spec + "`");
+ }
+ boolean isIn = itemPrefixed.charAt(0) != OUT_PREFIX;
+ String item = isIn ? itemPrefixed : itemPrefixed.substring(1);
+
+ if (itemPrefixed.length() == 0) {
+ throw new IllegalArgumentException(
+ "Illegal spec, must not have zero-length items: `" + spec + "`");
+ }
+
+ if (WILDCARD.equals(item)) {
+ if (foundWildcard) {
+ throw new IllegalArgumentException("Illegal spec, `" + WILDCARD +
+ "` must not appear multiple times in `" + spec + "`");
+ }
+ defaultIsIn = isIn;
+ foundWildcard = true;
+ } else {
+ int key = Integer.parseInt(item);
+ if (mIsIn.indexOfKey(key) >= 0) {
+ throw new IllegalArgumentException("Illegal spec, `" + key +
+ "` must not appear multiple times in `" + spec + "`");
+ }
+ mIsIn.put(key, isIn);
+ }
+ }
+
+ if (!foundWildcard) {
+ throw new IllegalArgumentException("Illegal spec, must specify either * or !*");
+ }
+
+ mDefaultIsIn = defaultIsIn;
+ }
+
+ public boolean isIn(int value) {
+ return (mIsIn.get(value, mDefaultIsIn));
+ }
+ }
+
public static class PulseSchedule {
private static final Pattern PATTERN = Pattern.compile("(\\d+?)s", 0);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
index 1c9d937..2c3e805 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
@@ -20,6 +20,7 @@
import android.os.Handler;
import android.os.PowerManager;
import android.os.SystemClock;
+import android.os.Trace;
import android.util.Log;
import com.android.keyguard.KeyguardConstants;
@@ -140,11 +141,14 @@
@Override
public void onFingerprintAcquired() {
+ Trace.beginSection("FingerprintUnlockController#onFingerprintAcquired");
releaseFingerprintWakeLock();
if (!mUpdateMonitor.isDeviceInteractive()) {
mWakeLock = mPowerManager.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, FINGERPRINT_WAKE_LOCK_NAME);
+ Trace.beginSection("acquiring wake-and-unlock");
mWakeLock.acquire();
+ Trace.endSection();
if (DEBUG_FP_WAKELOCK) {
Log.i(TAG, "fingerprint acquired, grabbing fp wakelock");
}
@@ -159,12 +163,15 @@
mStatusBarWindowManager.setForceDozeBrightness(true);
}
}
+ Trace.endSection();
}
@Override
public void onFingerprintAuthenticated(int userId) {
+ Trace.beginSection("FingerprintUnlockController#onFingerprintAuthenticated");
if (mUpdateMonitor.isGoingToSleep()) {
mPendingAuthenticatedUserId = userId;
+ Trace.endSection();
return;
}
boolean wasDeviceInteractive = mUpdateMonitor.isDeviceInteractive();
@@ -175,25 +182,34 @@
}
mPowerManager.wakeUp(SystemClock.uptimeMillis(), "android.policy:FINGERPRINT");
}
+ Trace.beginSection("release wake-and-unlock");
releaseFingerprintWakeLock();
+ Trace.endSection();
switch (mMode) {
case MODE_DISMISS_BOUNCER:
+ Trace.beginSection("MODE_DISMISS");
mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated(
false /* strongAuth */);
+ Trace.endSection();
break;
case MODE_UNLOCK:
case MODE_SHOW_BOUNCER:
+ Trace.beginSection("MODE_UNLOCK or MODE_SHOW_BOUNCER");
if (!wasDeviceInteractive) {
mStatusBarKeyguardViewManager.notifyDeviceWakeUpRequested();
}
mStatusBarKeyguardViewManager.animateCollapsePanels(
FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR);
+ Trace.endSection();
break;
case MODE_WAKE_AND_UNLOCK_PULSING:
+ Trace.beginSection("MODE_WAKE_AND_UNLOCK_PULSING");
mPhoneStatusBar.updateMediaMetaData(false /* metaDataChanged */,
true /* allowEnterAnimation */);
// Fall through.
+ Trace.endSection();
case MODE_WAKE_AND_UNLOCK:
+ Trace.beginSection("MODE_WAKE_AND_UNLOCK");
mStatusBarWindowManager.setStatusBarFocusable(false);
mDozeScrimController.abortPulsing();
mKeyguardViewMediator.onWakeAndUnlocking();
@@ -201,6 +217,7 @@
if (mPhoneStatusBar.getNavigationBarView() != null) {
mPhoneStatusBar.getNavigationBarView().setWakeAndUnlocking(true);
}
+ Trace.endSection();
break;
case MODE_ONLY_WAKE:
case MODE_NONE:
@@ -210,6 +227,7 @@
mStatusBarWindowManager.setForceDozeBrightness(false);
}
mPhoneStatusBar.notifyFpAuthModeChanged();
+ Trace.endSection();
}
@Override
@@ -219,6 +237,7 @@
@Override
public void onFinishedGoingToSleep(int why) {
+ Trace.beginSection("FingerprintUnlockController#onFinishedGoingToSleep");
if (mPendingAuthenticatedUserId != -1) {
// Post this to make sure it's executed after the device is fully locked.
@@ -230,6 +249,7 @@
});
}
mPendingAuthenticatedUserId = -1;
+ Trace.endSection();
}
public int getMode() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index 772c766..a98601a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -18,6 +18,7 @@
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
+import android.app.ActivityOptions;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -44,6 +45,7 @@
import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
+import android.view.WindowManager;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.FrameLayout;
import android.widget.TextView;
@@ -448,12 +450,24 @@
@Override
public void run() {
int result = ActivityManager.START_CANCELED;
+
+ // Normally an activity will set it's requested rotation
+ // animation on its window. However when launching an activity
+ // causes the orientation to change this is too late. In these cases
+ // the default animation is used. This doesn't look good for
+ // the camera (as it rotates the camera contents out of sync
+ // with physical reality). So, we ask the WindowManager to
+ // force the crossfade animation if an orientation change
+ // happens to occur during the launch.
+ ActivityOptions o = ActivityOptions.makeBasic();
+ o.setRotationAnimationHint(
+ WindowManager.LayoutParams.ROTATION_ANIMATION_CROSSFADE);
try {
result = ActivityManagerNative.getDefault().startActivityAsUser(
null, getContext().getBasePackageName(),
intent,
intent.resolveTypeIfNeeded(getContext().getContentResolver()),
- null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, null,
+ null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, o.toBundle(),
UserHandle.CURRENT.getIdentifier());
} catch (RemoteException e) {
Log.w(TAG, "Unable to start camera activity", e);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index e109812..bc05ff1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -234,7 +234,6 @@
mKeyguardView.setViewMediatorCallback(mCallback);
mContainer.addView(mRoot, mContainer.getChildCount());
mRoot.setVisibility(View.INVISIBLE);
- mRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_HOME);
}
protected void removeView() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 6e5e2ef..d4f98c3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.TypedValue;
@@ -59,6 +60,7 @@
private UserSwitcherController mUserSwitcherController;
private int mSystemIconsSwitcherHiddenExpandedMargin;
+ private int mSystemIconsBaseMargin;
private View mSystemIconsContainer;
public KeyguardStatusBarView(Context context, AttributeSet attrs) {
@@ -137,8 +139,11 @@
}
private void loadDimens() {
- mSystemIconsSwitcherHiddenExpandedMargin = getResources().getDimensionPixelSize(
+ Resources res = getResources();
+ mSystemIconsSwitcherHiddenExpandedMargin = res.getDimensionPixelSize(
R.dimen.system_icons_switcher_hidden_expanded_margin);
+ mSystemIconsBaseMargin = res.getDimensionPixelSize(
+ R.dimen.system_icons_super_container_avatarless_margin_end);
}
private void updateVisibilities() {
@@ -153,7 +158,8 @@
if (mKeyguardUserSwitcher == null) {
// If we have no keyguard switcher, the screen width is under 600dp. In this case,
// we don't show the multi-user avatar unless there is more than 1 user on the device.
- if (mUserSwitcherController.getSwitchableUserCount() > 1) {
+ if (mUserSwitcherController != null
+ && mUserSwitcherController.getSwitchableUserCount() > 1) {
mMultiUserSwitch.setVisibility(View.VISIBLE);
} else {
mMultiUserSwitch.setVisibility(View.GONE);
@@ -165,7 +171,13 @@
private void updateSystemIconsLayoutParams() {
RelativeLayout.LayoutParams lp =
(LayoutParams) mSystemIconsSuperContainer.getLayoutParams();
- int marginEnd = mKeyguardUserSwitcherShowing ? mSystemIconsSwitcherHiddenExpandedMargin : 0;
+ // If the avatar icon is gone, we need to have some end margin to display the system icons
+ // correctly.
+ int baseMarginEnd = mMultiUserSwitch.getVisibility() == View.GONE
+ ? mSystemIconsBaseMargin
+ : 0;
+ int marginEnd = mKeyguardUserSwitcherShowing ? mSystemIconsSwitcherHiddenExpandedMargin :
+ baseMarginEnd;
if (marginEnd != lp.getMarginEnd()) {
lp.setMarginEnd(marginEnd);
mSystemIconsSuperContainer.setLayoutParams(lp);
@@ -300,6 +312,7 @@
mMultiUserSwitch.setAlpha(1f);
} else {
updateVisibilities();
+ updateSystemIconsLayoutParams();
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
index ab5ee93..9bb4936 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -168,6 +168,7 @@
setContentDescription(contentDescription);
mHasFingerPrintIcon = anyFingerprintIcon;
if (animation != null && isAnim) {
+ animation.forceAnimationOnUI();
animation.start();
}
mLastState = state;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
index dd46b08..06c8b68 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
@@ -28,7 +28,6 @@
import android.widget.Space;
import com.android.systemui.R;
-import com.android.systemui.SystemUIFactory;
import com.android.systemui.statusbar.policy.KeyButtonView;
import com.android.systemui.tuner.TunerService;
@@ -71,6 +70,8 @@
private View mLastRot0;
private View mLastRot90;
+ private boolean mAlternativeOrder;
+
public NavigationBarInflaterView(Context context, AttributeSet attrs) {
super(context, attrs);
mDensity = context.getResources().getConfiguration().densityDpi;
@@ -114,6 +115,7 @@
false);
mRot90.setId(R.id.rot90);
addView(mRot90);
+ updateAlternativeOrder();
if (getParent() instanceof NavigationBarView) {
((NavigationBarView) getParent()).updateRotatedViews();
}
@@ -152,6 +154,26 @@
}
}
+ public void setAlternativeOrder(boolean alternativeOrder) {
+ if (alternativeOrder != mAlternativeOrder) {
+ mAlternativeOrder = alternativeOrder;
+ updateAlternativeOrder();
+ }
+ }
+
+ private void updateAlternativeOrder() {
+ updateAlternativeOrder(mRot0.findViewById(R.id.ends_group));
+ updateAlternativeOrder(mRot0.findViewById(R.id.center_group));
+ updateAlternativeOrder(mRot90.findViewById(R.id.ends_group));
+ updateAlternativeOrder(mRot90.findViewById(R.id.center_group));
+ }
+
+ private void updateAlternativeOrder(View v) {
+ if (v instanceof ReverseLinearLayout) {
+ ((ReverseLinearLayout) v).setAlternativeOrder(mAlternativeOrder);
+ }
+ }
+
private void initiallyFill(ButtonDispatcher buttonDispatcher) {
addAll(buttonDispatcher, (ViewGroup) mRot0.findViewById(R.id.ends_group));
addAll(buttonDispatcher, (ViewGroup) mRot0.findViewById(R.id.center_group));
@@ -258,7 +280,7 @@
params.width = (int) (params.width * size);
}
parent.addView(v);
- addToDispatchers(v);
+ addToDispatchers(v, landscape);
View lastView = landscape ? mLastRot90 : mLastRot0;
if (lastView != null) {
v.setAccessibilityTraversalAfter(lastView.getId());
@@ -305,16 +327,16 @@
return buttonSpec.substring(0, buttonSpec.indexOf(SIZE_MOD_START));
}
- private void addToDispatchers(View v) {
+ private void addToDispatchers(View v, boolean landscape) {
if (mButtonDispatchers != null) {
final int indexOfKey = mButtonDispatchers.indexOfKey(v.getId());
if (indexOfKey >= 0) {
- mButtonDispatchers.valueAt(indexOfKey).addView(v);
+ mButtonDispatchers.valueAt(indexOfKey).addView(v, landscape);
} else if (v instanceof ViewGroup) {
final ViewGroup viewGroup = (ViewGroup)v;
final int N = viewGroup.getChildCount();
for (int i = 0; i < N; i++) {
- addToDispatchers(viewGroup.getChildAt(i));
+ addToDispatchers(viewGroup.getChildAt(i), landscape);
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 6a2324f..5bd05b8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -99,6 +99,8 @@
private final SparseArray<ButtonDispatcher> mButtonDisatchers = new SparseArray<>();
private Configuration mConfiguration;
+ private NavigationBarInflaterView mNavigationInflaterView;
+
private class NavTransitionListener implements TransitionListener {
private boolean mBackTransitioning;
private boolean mHomeAppearing;
@@ -472,9 +474,10 @@
@Override
public void onFinishInflate() {
+ mNavigationInflaterView = (NavigationBarInflaterView) findViewById(
+ R.id.navigation_inflater);
updateRotatedViews();
- ((NavigationBarInflaterView) findViewById(R.id.navigation_inflater)).setButtonDispatchers(
- mButtonDisatchers);
+ mNavigationInflaterView.setButtonDispatchers(mButtonDisatchers);
getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener);
@@ -530,6 +533,7 @@
}
mCurrentView = mRotatedViews[rot];
mCurrentView.setVisibility(View.VISIBLE);
+ mNavigationInflaterView.setAlternativeOrder(rot == Surface.ROTATION_90);
for (int i = 0; i < mButtonDisatchers.size(); i++) {
mButtonDisatchers.valueAt(i).setCurrentView(mCurrentView);
}
@@ -623,6 +627,7 @@
mCarMode = true;
uiCarModeChanged = true;
}
+ getHomeButton().setCarMode(mCarMode);
}
return uiCarModeChanged;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 9687ba6..99fbad2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -58,6 +58,7 @@
import com.android.systemui.statusbar.KeyguardAffordanceView;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.StatusBarState;
+import com.android.systemui.statusbar.notification.NotificationUtils;
import com.android.systemui.statusbar.policy.HeadsUpManager;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
@@ -78,7 +79,6 @@
private static final int CAP_HEIGHT = 1456;
private static final int FONT_HEIGHT = 2163;
- private static final float HEADER_RUBBERBAND_FACTOR = 2.05f;
private static final float LOCK_ICON_ACTIVE_SCALE = 1.2f;
private static final String COUNTER_PANEL_OPEN = "panel_open";
@@ -1376,8 +1376,7 @@
int min = mStatusBarMinHeight;
if (mStatusBar.getBarState() != StatusBarState.KEYGUARD
&& mNotificationStackScroller.getNotGoneChildCount() == 0) {
- int minHeight = (int) ((mQsMinExpansionHeight + getOverExpansionAmount())
- * HEADER_RUBBERBAND_FACTOR);
+ int minHeight = (int) (mQsMinExpansionHeight + getOverExpansionAmount());
min = Math.max(min, minHeight);
}
int maxHeight;
@@ -1552,15 +1551,8 @@
if (mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
return 0;
}
- if (mNotificationStackScroller.getNotGoneChildCount() == 0) {
- return Math.min(0, mExpandedHeight / HEADER_RUBBERBAND_FACTOR - mQsMinExpansionHeight);
- }
- float stackTranslation = mNotificationStackScroller.getStackTranslation();
- float translation = stackTranslation / HEADER_RUBBERBAND_FACTOR;
- if (mHeadsUpManager.hasPinnedHeadsUp() || mIsExpansionFromHeadsUp) {
- translation = mNotificationStackScroller.getTopPadding() + stackTranslation
- - mQsMinExpansionHeight;
- }
+ float translation = NotificationUtils.interpolate(-mQsMinExpansionHeight, 0,
+ mNotificationStackScroller.getAppearFraction(mExpandedHeight));
return Math.min(0, translation);
}
@@ -1968,7 +1960,7 @@
if (mNotificationStackScroller.getNotGoneChildCount() > 0) {
return mNotificationStackScroller.getPeekHeight();
} else {
- return mQsMinExpansionHeight * HEADER_RUBBERBAND_FACTOR;
+ return mQsMinExpansionHeight;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index e4aa103..af85101 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -209,6 +209,9 @@
public void setTouchDisabled(boolean disabled) {
mTouchDisabled = disabled;
+ if (mTouchDisabled && mTracking) {
+ onTrackingStopped(true /* expanded */);
+ }
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index fde7cc4..a4531ce 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -17,11 +17,25 @@
package com.android.systemui.statusbar.phone;
+import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT;
+import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN;
+import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;
+import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;
+import static android.app.StatusBarManager.windowStateToString;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_SEMI_TRANSPARENT;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSLUCENT;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT;
+import static com.android.systemui.statusbar.phone.BarTransitions.MODE_WARNING;
+
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.annotation.NonNull;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
+import android.app.ActivityOptions;
import android.app.IActivityManager;
import android.app.Notification;
import android.app.PendingIntent;
@@ -51,6 +65,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.hardware.display.DisplayManager;
import android.inputmethodservice.InputMethodService;
import android.media.AudioAttributes;
import android.media.MediaMetadata;
@@ -69,6 +84,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
+import android.os.Trace;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.Vibrator;
@@ -76,6 +92,7 @@
import android.service.notification.NotificationListenerService;
import android.service.notification.NotificationListenerService.RankingMap;
import android.service.notification.StatusBarNotification;
+import android.telecom.TelecomManager;
import android.util.ArraySet;
import android.util.DisplayMetrics;
import android.util.EventLog;
@@ -97,6 +114,7 @@
import android.view.animation.Interpolator;
import android.widget.ImageView;
import android.widget.TextView;
+
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.statusbar.NotificationVisibility;
@@ -115,7 +133,6 @@
import com.android.systemui.Prefs;
import com.android.systemui.R;
import com.android.systemui.SystemUIFactory;
-import com.android.systemui.assist.AssistManager;
import com.android.systemui.classifier.FalsingLog;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.doze.DozeHost;
@@ -170,7 +187,8 @@
import com.android.systemui.statusbar.policy.UserSwitcherController;
import com.android.systemui.statusbar.policy.ZenModeController;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
-import com.android.systemui.statusbar.stack.NotificationStackScrollLayout.OnChildLocationsChangedListener;
+import com.android.systemui.statusbar.stack.NotificationStackScrollLayout
+ .OnChildLocationsChangedListener;
import com.android.systemui.statusbar.stack.StackStateAnimator;
import com.android.systemui.statusbar.stack.StackViewState;
import com.android.systemui.volume.VolumeComponent;
@@ -184,22 +202,9 @@
import java.util.List;
import java.util.Map;
-import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT;
-import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN;
-import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;
-import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;
-import static android.app.StatusBarManager.windowStateToString;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_SEMI_TRANSPARENT;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSLUCENT;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT;
-import static com.android.systemui.statusbar.phone.BarTransitions.MODE_WARNING;
-
public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
DragDownHelper.DragDownCallback, ActivityStarter, OnUnlockMethodChangedListener,
- HeadsUpManager.OnHeadsUpChangedListener {
+ HeadsUpManager.OnHeadsUpChangedListener, DisplayManager.DisplayListener {
static final String TAG = "PhoneStatusBar";
public static final boolean DEBUG = BaseStatusBar.DEBUG;
public static final boolean SPEW = false;
@@ -684,6 +689,8 @@
mUnlockMethodCache.addListener(this);
startKeyguard();
+ mContext.getSystemService(DisplayManager.class).registerDisplayListener(this, null);
+
mDozeServiceHost = new DozeServiceHost();
KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mDozeServiceHost);
putComponent(DozeHost.class, mDozeServiceHost);
@@ -788,11 +795,15 @@
mBackdropFront = (ImageView) mBackdrop.findViewById(R.id.backdrop_front);
mBackdropBack = (ImageView) mBackdrop.findViewById(R.id.backdrop_back);
+ if (ENABLE_LOCKSCREEN_WALLPAPER) {
+ mLockscreenWallpaper = new LockscreenWallpaper(mContext, this, mHandler);
+ }
+
ScrimView scrimBehind = (ScrimView) mStatusBarWindow.findViewById(R.id.scrim_behind);
ScrimView scrimInFront = (ScrimView) mStatusBarWindow.findViewById(R.id.scrim_in_front);
View headsUpScrim = mStatusBarWindow.findViewById(R.id.heads_up_scrim);
mScrimController = SystemUIFactory.getInstance().createScrimController(
- scrimBehind, scrimInFront, headsUpScrim);
+ scrimBehind, scrimInFront, headsUpScrim, mLockscreenWallpaper);
if (mScrimSrcModeEnabled) {
Runnable runnable = new Runnable() {
@Override
@@ -822,10 +833,6 @@
mKeyguardBottomArea.getLockIcon());
mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController);
- if (ENABLE_LOCKSCREEN_WALLPAPER) {
- mLockscreenWallpaper = new LockscreenWallpaper(mContext, this, mHandler);
- }
-
// set the initial view visibility
setAreThereNotifications();
@@ -880,9 +887,9 @@
mLightStatusBarController = new LightStatusBarController(mIconController,
mBatteryController);
mKeyguardMonitor = new KeyguardMonitor(mContext);
+ mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor,
+ mHandler, this);
if (UserManager.get(mContext).isUserSwitcherEnabled()) {
- mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor,
- mHandler, this);
createUserSwitcher();
}
@@ -1177,6 +1184,7 @@
}
protected void startKeyguard() {
+ Trace.beginSection("PhoneStatusBar#startKeyguard");
KeyguardViewMediator keyguardViewMediator = getComponent(KeyguardViewMediator.class);
mFingerprintUnlockController = new FingerprintUnlockController(mContext,
mStatusBarWindowManager, mDozeScrimController, keyguardViewMediator,
@@ -1211,6 +1219,7 @@
mKeyguardViewMediatorCallback = keyguardViewMediator.getViewMediatorCallback();
mLightStatusBarController.setFingerprintUnlockController(mFingerprintUnlockController);
+ Trace.endSection();
}
@Override
@@ -1301,9 +1310,29 @@
};
private final View.OnTouchListener mHomeActionListener = new View.OnTouchListener() {
+ public boolean mBlockedThisTouch;
+
@Override
public boolean onTouch(View v, MotionEvent event) {
+ if (mBlockedThisTouch && event.getActionMasked() != MotionEvent.ACTION_DOWN) {
+ return true;
+ }
+ // If an incoming call is ringing, HOME is totally disabled.
+ // (The user is already on the InCallUI at this point,
+ // and his ONLY options are to answer or reject the call.)
switch (event.getAction()) {
+ case MotionEvent.ACTION_DOWN:
+ mBlockedThisTouch = false;
+ TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
+ if (telecomManager != null && telecomManager.isRinging()) {
+ if (mStatusBarKeyguardViewManager.isShowing()) {
+ Log.i(TAG, "Ignoring HOME; there's a ringing incoming call. " +
+ "No heads up");
+ mBlockedThisTouch = true;
+ return true;
+ }
+ }
+ break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
awakenDreams();
@@ -1358,7 +1387,7 @@
prepareNavigationBarView();
- mWindowManager.updateViewLayout(mNavigationBarView, getNavigationBarLayoutParams());
+ mWindowManager.updateViewLayout(mNavigationBarView, mNavigationBarView.getLayoutParams());
}
private void notifyNavigationBarScreenOn(boolean screenOn) {
@@ -2063,12 +2092,20 @@
* Refresh or remove lockscreen artwork from media metadata or the lockscreen wallpaper.
*/
public void updateMediaMetaData(boolean metaDataChanged, boolean allowEnterAnimation) {
- if (!SHOW_LOCKSCREEN_MEDIA_ARTWORK) return;
+ Trace.beginSection("PhoneStatusBar#updateMediaMetaData");
+ if (!SHOW_LOCKSCREEN_MEDIA_ARTWORK) {
+ Trace.endSection();
+ return;
+ }
- if (mBackdrop == null) return; // called too early
+ if (mBackdrop == null) {
+ Trace.endSection();
+ return; // called too early
+ }
if (mLaunchTransitionFadingAway) {
mBackdrop.setVisibility(View.INVISIBLE);
+ Trace.endSection();
return;
}
@@ -2221,6 +2258,7 @@
}
}
}
+ Trace.endSection();
}
protected int adjustDisableFlags(int state) {
@@ -2583,7 +2621,7 @@
@Override
public void handleSystemNavigationKey(int key) {
if (SPEW) Log.d(TAG, "handleSystemNavigationKey: " + key);
- if (!panelsEnabled()) {
+ if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive()) {
return;
}
@@ -3331,13 +3369,26 @@
intent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
int result = ActivityManager.START_CANCELED;
+ ActivityOptions options = new ActivityOptions(getActivityOptions());
+ if (intent == KeyguardBottomAreaView.INSECURE_CAMERA_INTENT) {
+ // Normally an activity will set it's requested rotation
+ // animation on its window. However when launching an activity
+ // causes the orientation to change this is too late. In these cases
+ // the default animation is used. This doesn't look good for
+ // the camera (as it rotates the camera contents out of sync
+ // with physical reality). So, we ask the WindowManager to
+ // force the crossfade animation if an orientation change
+ // happens to occur during the launch.
+ options.setRotationAnimationHint(
+ WindowManager.LayoutParams.ROTATION_ANIMATION_CROSSFADE);
+ }
try {
result = ActivityManagerNative.getDefault().startActivityAsUser(
null, mContext.getBasePackageName(),
intent,
intent.resolveTypeIfNeeded(mContext.getContentResolver()),
null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null,
- getActivityOptions(), UserHandle.CURRENT.getIdentifier());
+ options.toBundle(), UserHandle.CURRENT.getIdentifier());
} catch (RemoteException e) {
Log.w(TAG, "Unable to start activity", e);
}
@@ -3492,12 +3543,26 @@
repositionNavigationBar();
updateRowStates();
- mIconController.defineSlots();
mScreenPinningRequest.onConfigurationChanged();
mNetworkController.onConfigurationChanged();
}
@Override
+ public void onDisplayAdded(int displayId) {
+ }
+
+ @Override
+ public void onDisplayRemoved(int displayId) {
+ }
+
+ @Override
+ public void onDisplayChanged(int displayId) {
+ if (displayId == Display.DEFAULT_DISPLAY) {
+ repositionNavigationBar();
+ }
+ }
+
+ @Override
public void userSwitched(int newUserId) {
super.userSwitched(newUserId);
if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId);
@@ -3508,6 +3573,7 @@
setControllerUsers();
clearCurrentMediaNotification();
mLockscreenWallpaper.setCurrentUser(newUserId);
+ mScrimController.setCurrentUser(newUserId);
updateMediaMetaData(true, false);
}
@@ -4044,6 +4110,7 @@
* @return true if we would like to stay in the shade, false if it should go away entirely
*/
public boolean hideKeyguard() {
+ Trace.beginSection("PhoneStatusBar#hideKeyguard");
boolean staying = mLeaveOpenOnKeyguardHide;
setBarState(StatusBarState.SHADE);
View viewToClick = null;
@@ -4088,6 +4155,7 @@
mNotificationPanel.onAffordanceLaunchEnded();
mNotificationPanel.animate().cancel();
mNotificationPanel.setAlpha(1f);
+ Trace.endSection();
return staying;
}
@@ -4162,6 +4230,7 @@
}
protected void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {
+ Trace.beginSection("PhoneStatusBar#updateKeyguardState");
if (mState == StatusBarState.KEYGUARD) {
mKeyguardIndicationController.setVisible(true);
mNotificationPanel.resetViews();
@@ -4193,9 +4262,11 @@
updateMediaMetaData(false, mState != StatusBarState.KEYGUARD);
mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
mStatusBarKeyguardViewManager.isSecure());
+ Trace.endSection();
}
private void updateDozingState() {
+ Trace.beginSection("PhoneStatusBar#updateDozingState");
boolean animate = !mDozing && mDozeScrimController.isPulsing();
mNotificationPanel.setDozing(mDozing, animate);
mStackScroller.setDark(mDozing, animate, mWakeUpTouchLocation);
@@ -4206,6 +4277,7 @@
mDozeScrimController.setDozing(mDozing &&
mFingerprintUnlockController.getMode()
!= FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING, animate);
+ Trace.endSection();
}
public void updateStackScrollerState(boolean goingToFullShade, boolean fromShadeLocked) {
@@ -4310,6 +4382,10 @@
mStackScroller.setActivatedChild(view);
}
+ public ButtonDispatcher getHomeButton() {
+ return mNavigationBarView.getHomeButton();
+ }
+
/**
* @param state The {@link StatusBarState} to set.
*/
@@ -4807,11 +4883,13 @@
}
private void updateDozing() {
+ Trace.beginSection("PhoneStatusBar#updateDozing");
// When in wake-and-unlock while pulsing, keep dozing state until fully unlocked.
mDozing = mDozingRequested && mState == StatusBarState.KEYGUARD
|| mFingerprintUnlockController.getMode()
== FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;
updateDozingState();
+ Trace.endSection();
}
private final class ShadeUpdates {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
index 011ec22..405ccd6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -52,6 +52,7 @@
import com.android.systemui.qs.tiles.HotspotTile;
import com.android.systemui.qs.tiles.IntentTile;
import com.android.systemui.qs.tiles.LocationTile;
+import com.android.systemui.qs.tiles.NightDisplayTile;
import com.android.systemui.qs.tiles.RotationLockTile;
import com.android.systemui.qs.tiles.UserTile;
import com.android.systemui.qs.tiles.WifiTile;
@@ -60,7 +61,6 @@
import com.android.systemui.statusbar.policy.BluetoothController;
import com.android.systemui.statusbar.policy.CastController;
import com.android.systemui.statusbar.policy.NextAlarmController;
-import com.android.systemui.statusbar.policy.NightModeController;
import com.android.systemui.statusbar.policy.FlashlightController;
import com.android.systemui.statusbar.policy.HotspotController;
import com.android.systemui.statusbar.policy.KeyguardMonitor;
@@ -71,7 +71,6 @@
import com.android.systemui.statusbar.policy.UserInfoController;
import com.android.systemui.statusbar.policy.UserSwitcherController;
import com.android.systemui.statusbar.policy.ZenModeController;
-import com.android.systemui.tuner.NightModeTile;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerService.Tunable;
@@ -111,7 +110,6 @@
private final TileServices mServices;
private final List<Callback> mCallbacks = new ArrayList<>();
- private final NightModeController mNightModeController;
private final AutoTileManager mAutoTiles;
private final ManagedProfileController mProfileController;
private final NextAlarmController mNextAlarmController;
@@ -144,7 +142,6 @@
mBattery = battery;
mIconController = iconController;
mNextAlarmController = nextAlarmController;
- mNightModeController = new NightModeController(mContext, true);
mProfileController = new ManagedProfileController(this);
final HandlerThread ht = new HandlerThread(QSTileHost.class.getSimpleName(),
@@ -308,10 +305,6 @@
return mIconController;
}
- public NightModeController getNightModeController() {
- return mNightModeController;
- }
-
public ManagedProfileController getManagedProfileController() {
return mProfileController;
}
@@ -407,7 +400,7 @@
ComponentName component = CustomTile.getComponentFromSpec(tileSpec);
Intent intent = new Intent().setComponent(component);
TileLifecycleManager lifecycleManager = new TileLifecycleManager(new Handler(),
- mContext, mServices, new Tile(component), intent,
+ mContext, mServices, new Tile(), intent,
new UserHandle(ActivityManager.getCurrentUser()));
lifecycleManager.onStopListening();
lifecycleManager.onTileRemoved();
@@ -421,7 +414,7 @@
ComponentName component = CustomTile.getComponentFromSpec(tileSpec);
Intent intent = new Intent().setComponent(component);
TileLifecycleManager lifecycleManager = new TileLifecycleManager(new Handler(),
- mContext, mServices, new Tile(component), intent,
+ mContext, mServices, new Tile(), intent,
new UserHandle(ActivityManager.getCurrentUser()));
lifecycleManager.onTileAdded();
lifecycleManager.flushMessagesAndUnbind();
@@ -448,8 +441,7 @@
else if (tileSpec.equals("user")) return new UserTile(this);
else if (tileSpec.equals("battery")) return new BatteryTile(this);
else if (tileSpec.equals("saver")) return new DataSaverTile(this);
- else if (tileSpec.equals(NightModeTile.NIGHT_MODE_SPEC))
- return new NightModeTile(this);
+ else if (tileSpec.equals("night")) return new NightDisplayTile(this);
// Intent tiles.
else if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(this,tileSpec);
else if (tileSpec.startsWith(CustomTile.PREFIX)) return CustomTile.create(this,tileSpec);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
index 505bd24..58eaf99 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
@@ -37,11 +37,11 @@
import com.android.keyguard.KeyguardStatusView;
import com.android.systemui.FontSizeUtils;
import com.android.systemui.R;
-import com.android.systemui.qs.QSAnimator;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.qs.QSPanel.Callback;
import com.android.systemui.qs.QuickQSPanel;
import com.android.systemui.qs.TouchAnimator;
+import com.android.systemui.qs.TouchAnimator.Builder;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.NextAlarmController;
import com.android.systemui.statusbar.policy.NextAlarmController.NextAlarmChangeCallback;
@@ -83,17 +83,14 @@
protected MultiUserSwitch mMultiUserSwitch;
private ImageView mMultiUserAvatar;
- private float mDateScaleFactor;
- protected float mGearTranslation;
- private TouchAnimator mSecondHalfAnimator;
- private TouchAnimator mFirstHalfAnimator;
- private TouchAnimator mDateSizeAnimator;
+ private TouchAnimator mAnimator;
protected TouchAnimator mSettingsAlpha;
private float mExpansionAmount;
protected QSTileHost mHost;
protected View mEdit;
private boolean mShowFullAlarm;
+ private float mDateTimeTranslation;
public QuickStatusBarHeader(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -114,6 +111,7 @@
mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group);
mDateTimeGroup.setPivotX(0);
mDateTimeGroup.setPivotY(0);
+ mDateTimeTranslation = getResources().getDimension(R.dimen.qs_date_time_translation);
mShowFullAlarm = getResources().getBoolean(R.bool.quick_settings_show_full_alarm);
mExpandIndicator = (ExpandableIndicator) findViewById(R.id.expand_indicator);
@@ -155,41 +153,21 @@
FontSizeUtils.updateFontSize(mAlarmStatus, R.dimen.qs_date_collapsed_size);
FontSizeUtils.updateFontSize(mEmergencyOnly, R.dimen.qs_emergency_calls_only_text_size);
- mGearTranslation = mContext.getResources().getDimension(R.dimen.qs_header_gear_translation);
-
- float dateCollapsedSize = mContext.getResources().getDimension(
- R.dimen.qs_date_collapsed_text_size);
- float dateExpandedSize = mContext.getResources().getDimension(
- R.dimen.qs_date_text_size);
- mDateScaleFactor = dateExpandedSize / dateCollapsedSize;
-
- mSecondHalfAnimator = new TouchAnimator.Builder()
+ Builder builder = new Builder()
.addFloat(mShowFullAlarm ? mAlarmStatus : findViewById(R.id.date), "alpha", 0, 1)
- .addFloat(mEmergencyOnly, "alpha", 0, 1)
- .setStartDelay(.5f)
- .build();
+ .addFloat(mEmergencyOnly, "alpha", 0, 1);
if (mShowFullAlarm) {
- mFirstHalfAnimator = new TouchAnimator.Builder()
- .addFloat(mAlarmStatusCollapsed, "alpha", 1, 0)
- .setEndDelay(.5f)
- .build();
+ builder.addFloat(mAlarmStatusCollapsed, "alpha", 1, 0);
}
- mDateSizeAnimator = new TouchAnimator.Builder()
- .addFloat(mDateTimeGroup, "scaleX", 1, mDateScaleFactor)
- .addFloat(mDateTimeGroup, "scaleY", 1, mDateScaleFactor)
- .setStartDelay(.36f)
- .build();
+ mAnimator = builder.build();
updateSettingsAnimator();
}
protected void updateSettingsAnimator() {
mSettingsAlpha = new TouchAnimator.Builder()
- .addFloat(mEdit, "translationY", -mGearTranslation, 0)
- .addFloat(mMultiUserSwitch, "translationY", -mGearTranslation, 0)
.addFloat(mEdit, "alpha", 0, 1)
.addFloat(mMultiUserSwitch, "alpha", 0, 1)
- .setStartDelay(QSAnimator.EXPANDED_TILE_DELAY)
.build();
final boolean isRtl = isLayoutRtl();
@@ -244,11 +222,8 @@
@Override
public void setExpansion(float headerExpansionFraction) {
mExpansionAmount = headerExpansionFraction;
- mSecondHalfAnimator.setPosition(headerExpansionFraction);
- if (mShowFullAlarm) {
- mFirstHalfAnimator.setPosition(headerExpansionFraction);
- }
- mDateSizeAnimator.setPosition(headerExpansionFraction);
+ updateDateTimePosition();
+ mAnimator.setPosition(headerExpansionFraction);
mSettingsAlpha.setPosition(headerExpansionFraction);
updateAlarmVisibilities();
@@ -286,6 +261,7 @@
protected void updateVisibilities() {
updateAlarmVisibilities();
+ updateDateTimePosition();
mEmergencyOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly
? View.VISIBLE : View.INVISIBLE);
mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(
@@ -293,7 +269,12 @@
final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);
mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers() && !isDemo
? View.VISIBLE : View.INVISIBLE);
- mEdit.setVisibility(isDemo ? View.INVISIBLE : View.VISIBLE);
+ mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
+ }
+
+ private void updateDateTimePosition() {
+ mDateTimeAlarmGroup.setTranslationY(mShowEmergencyCallsOnly
+ ? mExpansionAmount * mDateTimeTranslation : 0);
}
private void updateListeners() {
@@ -337,22 +318,26 @@
public void onClick(View v) {
if (v == mSettingsButton) {
MetricsLogger.action(mContext,
- MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
+ mExpanded ? MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH
+ : MetricsProto.MetricsEvent.ACTION_QS_COLLAPSED_SETTINGS_LAUNCH);
if (mSettingsButton.isTunerClick()) {
- if (TunerService.isTunerEnabled(mContext)) {
- TunerService.showResetRequest(mContext, new Runnable() {
- @Override
- public void run() {
+ mHost.startRunnableDismissingKeyguard(() -> post(() -> {
+ if (TunerService.isTunerEnabled(mContext)) {
+ TunerService.showResetRequest(mContext, () -> {
// Relaunch settings so that the tuner disappears.
startSettingsActivity();
- }
- });
- } else {
- Toast.makeText(getContext(), R.string.tuner_toast, Toast.LENGTH_LONG).show();
- TunerService.setTunerEnabled(mContext, true);
- }
+ });
+ } else {
+ Toast.makeText(getContext(), R.string.tuner_toast,
+ Toast.LENGTH_LONG).show();
+ TunerService.setTunerEnabled(mContext, true);
+ }
+ startSettingsActivity();
+
+ }));
+ } else {
+ startSettingsActivity();
}
- startSettingsActivity();
} else if (v == mAlarmStatus && mNextAlarm != null) {
PendingIntent showIntent = mNextAlarm.getShowIntent();
if (showIntent != null && showIntent.isActivity()) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ReverseLinearLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ReverseLinearLayout.java
index 3682aa1..f45967a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ReverseLinearLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ReverseLinearLayout.java
@@ -30,7 +30,11 @@
*/
public class ReverseLinearLayout extends LinearLayout {
- private boolean mIsLayoutRtl;
+ /** If true, the layout is reversed vs. a regular linear layout */
+ private boolean mIsLayoutReverse;
+
+ /** If true, the layout is opposite to it's natural reversity from the layout direction */
+ private boolean mIsAlternativeOrder;
public ReverseLinearLayout(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
@@ -39,45 +43,50 @@
@Override
protected void onFinishInflate() {
super.onFinishInflate();
- mIsLayoutRtl = getResources().getConfiguration()
- .getLayoutDirection() == LAYOUT_DIRECTION_RTL;
+ updateOrder();
}
@Override
public void addView(View child) {
reversParams(child.getLayoutParams());
- if (mIsLayoutRtl) {
- super.addView(child);
- } else {
+ if (mIsLayoutReverse) {
super.addView(child, 0);
+ } else {
+ super.addView(child);
}
}
@Override
public void addView(View child, ViewGroup.LayoutParams params) {
reversParams(params);
- if (mIsLayoutRtl) {
- super.addView(child, params);
- } else {
+ if (mIsLayoutReverse) {
super.addView(child, 0, params);
+ } else {
+ super.addView(child, params);
}
}
@Override
- protected void onConfigurationChanged(Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
- updateRTLOrder();
+ public void onRtlPropertiesChanged(int layoutDirection) {
+ super.onRtlPropertiesChanged(layoutDirection);
+ updateOrder();
+ }
+
+ public void setAlternativeOrder(boolean alternative) {
+ mIsAlternativeOrder = alternative;
+ updateOrder();
}
/**
* In landscape, the LinearLayout is not auto mirrored since it is vertical. Therefore we
* have to do it manually
*/
- private void updateRTLOrder() {
- boolean isLayoutRtl = getResources().getConfiguration()
- .getLayoutDirection() == LAYOUT_DIRECTION_RTL;
- if (mIsLayoutRtl != isLayoutRtl) {
- // RTL changed, swap the order of all views.
+ private void updateOrder() {
+ boolean isLayoutRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
+ boolean isLayoutReverse = isLayoutRtl ^ mIsAlternativeOrder;
+
+ if (mIsLayoutReverse != isLayoutReverse) {
+ // reversity changed, swap the order of all views.
int childCount = getChildCount();
ArrayList<View> childList = new ArrayList<>(childCount);
for (int i = 0; i < childCount; i++) {
@@ -87,7 +96,7 @@
for (int i = childCount - 1; i >= 0; i--) {
super.addView(childList.get(i));
}
- mIsLayoutRtl = isLayoutRtl;
+ mIsLayoutReverse = isLayoutReverse;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 94ede0c..40abaa4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -31,6 +31,7 @@
import android.view.animation.Interpolator;
import android.view.animation.PathInterpolator;
+import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.systemui.R;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.NotificationData;
@@ -47,10 +48,13 @@
public static final long ANIMATION_DURATION = 220;
public static final Interpolator KEYGUARD_FADE_OUT_INTERPOLATOR
= new PathInterpolator(0f, 0, 0.7f, 1f);
+ public static final Interpolator KEYGUARD_FADE_OUT_INTERPOLATOR_LOCKED
+ = new PathInterpolator(0.3f, 0f, 0.8f, 1f);
private static final float SCRIM_BEHIND_ALPHA = 0.62f;
- private static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.45f;
- private static final float SCRIM_BEHIND_ALPHA_UNLOCKING = 0.2f;
+ protected static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.45f;
+ protected static final float SCRIM_BEHIND_ALPHA_UNLOCKING = 0.2f;
private static final float SCRIM_IN_FRONT_ALPHA = 0.75f;
+ private static final float SCRIM_IN_FRONT_ALPHA_LOCKED = 0.85f;
private static final int TAG_KEY_ANIM = R.id.scrim;
private static final int TAG_KEY_ANIM_TARGET = R.id.scrim_target;
private static final int TAG_START_ALPHA = R.id.scrim_alpha_start;
@@ -60,6 +64,7 @@
private final ScrimView mScrimInFront;
private final UnlockMethodCache mUnlockMethodCache;
private final View mHeadsUpScrim;
+ private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
protected float mScrimBehindAlpha = SCRIM_BEHIND_ALPHA;
protected float mScrimBehindAlphaKeyguard = SCRIM_BEHIND_ALPHA_KEYGUARD;
@@ -101,6 +106,7 @@
mHeadsUpScrim = headsUpScrim;
final Context context = scrimBehind.getContext();
mUnlockMethodCache = UnlockMethodCache.getInstance(context);
+ mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(context);
updateHeadsUpScrim(false);
}
@@ -109,6 +115,13 @@
scheduleUpdate();
}
+ protected void setScrimBehindValues(float scrimBehindAlphaKeyguard,
+ float scrimBehindAlphaUnlocking) {
+ mScrimBehindAlphaKeyguard = scrimBehindAlphaKeyguard;
+ mScrimBehindAlphaUnlocking = scrimBehindAlphaUnlocking;
+ scheduleUpdate();
+ }
+
public void onTrackingStarted() {
mExpanding = true;
mDarkenWhileDragging = !mUnlockMethodCache.canSkipBouncer();
@@ -151,11 +164,19 @@
mAnimateChange = true;
mSkipFirstFrame = skipFirstFrame;
mOnAnimationFinished = onAnimationFinished;
- scheduleUpdate();
- // No need to wait for the next frame to be drawn for this case - onPreDraw will execute
- // the changes we just scheduled.
- onPreDraw();
+ if (mKeyguardUpdateMonitor.isUserUnlocked()) {
+ scheduleUpdate();
+
+ // No need to wait for the next frame to be drawn for this case - onPreDraw will execute
+ // the changes we just scheduled.
+ onPreDraw();
+ } else {
+
+ // In case the user isn't unlocked, make sure to delay a bit because the system is hosed
+ // with too many things in this case, in order to not skip the initial frames.
+ mScrimInFront.postOnAnimationDelayed(this::scheduleUpdate, 16);
+ }
}
public void abortKeyguardFadingOut() {
@@ -200,6 +221,12 @@
return mDozeInFrontAlpha;
}
+ private float getScrimInFrontAlpha() {
+ return mKeyguardUpdateMonitor.isUserUnlocked()
+ ? SCRIM_IN_FRONT_ALPHA
+ : SCRIM_IN_FRONT_ALPHA_LOCKED;
+ }
+
protected void scheduleUpdate() {
if (mUpdatePending) return;
@@ -239,10 +266,10 @@
float fraction = 1 - behindFraction;
fraction = (float) Math.pow(fraction, 0.8f);
behindFraction = (float) Math.pow(behindFraction, 0.8f);
- setScrimInFrontColor(fraction * SCRIM_IN_FRONT_ALPHA);
+ setScrimInFrontColor(fraction * getScrimInFrontAlpha());
setScrimBehindColor(behindFraction * mScrimBehindAlphaKeyguard);
} else if (mBouncerShowing && !mBouncerIsKeyguard) {
- setScrimInFrontColor(SCRIM_IN_FRONT_ALPHA);
+ setScrimInFrontColor(getScrimInFrontAlpha());
setScrimBehindColor(0f);
} else if (mBouncerShowing) {
setScrimInFrontColor(0f);
@@ -365,7 +392,13 @@
}
protected Interpolator getInterpolator() {
- return mAnimateKeyguardFadingOut ? KEYGUARD_FADE_OUT_INTERPOLATOR : mInterpolator;
+ if (mAnimateKeyguardFadingOut && !mKeyguardUpdateMonitor.isUserUnlocked()) {
+ return KEYGUARD_FADE_OUT_INTERPOLATOR_LOCKED;
+ } else if (mAnimateKeyguardFadingOut) {
+ return KEYGUARD_FADE_OUT_INTERPOLATOR;
+ } else {
+ return mInterpolator;
+ }
}
@Override
@@ -536,4 +569,8 @@
R.dimen.heads_up_scrim_height);
mHeadsUpScrim.setLayoutParams(layoutParams);
}
+
+ public void setCurrentUser(int currentUser) {
+ // Don't care in the base class.
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
index a035eee..dbe7f96 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
@@ -115,6 +115,8 @@
public StatusBarIconController(Context context, View statusBar, View keyguardStatusBar,
PhoneStatusBar phoneStatusBar) {
+ super(context.getResources().getStringArray(
+ com.android.internal.R.array.config_statusBarIcons));
mContext = context;
mPhoneStatusBar = phoneStatusBar;
mSystemIconArea = (LinearLayout) statusBar.findViewById(R.id.system_icon_area);
@@ -140,7 +142,6 @@
mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone);
mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone);
mHandler = new Handler();
- defineSlots();
loadDimens();
TunerService.get(mContext).addTunable(this, ICON_BLACKLIST);
@@ -204,11 +205,6 @@
R.dimen.status_bar_icon_padding);
}
- public void defineSlots() {
- defineSlots(mContext.getResources().getStringArray(
- com.android.internal.R.array.config_statusBarIcons));
- }
-
private void addSystemIcon(int index, StatusBarIcon icon) {
String slot = getSlot(index);
int viewIndex = getViewIndex(index);
@@ -357,11 +353,12 @@
public void dump(PrintWriter pw) {
int N = mStatusIcons.getChildCount();
- pw.println(" system icons: " + N);
+ pw.println(" icon views: " + N);
for (int i=0; i<N; i++) {
StatusBarIconView ic = (StatusBarIconView) mStatusIcons.getChildAt(i);
pw.println(" [" + i + "] icon=" + ic);
}
+ super.dump(pw);
}
public void dispatchDemoCommand(String command, Bundle args) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java
index 97b31f2..660672d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java
@@ -25,14 +25,11 @@
private ArrayList<String> mSlots = new ArrayList<>();
private ArrayList<StatusBarIcon> mIcons = new ArrayList<>();
- public void defineSlots(String[] slots) {
- mSlots.clear();
+ public StatusBarIconList(String[] slots) {
final int N = slots.length;
for (int i=0; i < N; i++) {
mSlots.add(slots[i]);
- if (mIcons.size() < mSlots.size()) {
- mIcons.add(null);
- }
+ mIcons.add(null);
}
}
@@ -81,9 +78,9 @@
public void dump(PrintWriter pw) {
final int N = mSlots.size();
- pw.println("Icon list:");
+ pw.println(" icon slots: " + N);
for (int i=0; i<N; i++) {
- pw.printf(" %2d: (%s) %s\n", i, mSlots.get(i), mIcons.get(i));
+ pw.printf(" %2d: (%s) %s\n", i, mSlots.get(i), mIcons.get(i));
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index f1d2fe9..285b9bc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -53,6 +53,11 @@
private static final long WAKE_AND_UNLOCK_SCRIM_FADEOUT_DURATION_MS = 200;
+ // Duration of the Keyguard dismissal animation in case the user is currently locked. This is to
+ // make everything a bit slower to bridge a gap until the user is unlocked and home screen has
+ // dranw its first frame.
+ private static final long KEYGUARD_DISMISS_DURATION_LOCKED = 2000;
+
private static String TAG = "StatusBarKeyguardViewManager";
protected final Context mContext;
@@ -180,13 +185,17 @@
}
public void onStartedWakingUp() {
+ Trace.beginSection("StatusBarKeyguardViewManager#onStartedWakingUp");
mDeviceInteractive = true;
mDeviceWillWakeUp = false;
mPhoneStatusBar.onStartedWakingUp();
+ Trace.endSection();
}
public void onScreenTurningOn() {
+ Trace.beginSection("StatusBarKeyguardViewManager#onScreenTurningOn");
mPhoneStatusBar.onScreenTurningOn();
+ Trace.endSection();
}
public boolean isScreenTurnedOn() {
@@ -194,6 +203,7 @@
}
public void onScreenTurnedOn() {
+ Trace.beginSection("StatusBarKeyguardViewManager#onScreenTurnedOn");
mScreenTurnedOn = true;
if (mDeferScrimFadeOut) {
mDeferScrimFadeOut = false;
@@ -202,6 +212,7 @@
updateStates();
}
mPhoneStatusBar.onScreenTurnedOn();
+ Trace.endSection();
}
@Override
@@ -277,9 +288,12 @@
/**
* Hides the keyguard view
*/
- public void hide(long startTime, final long fadeoutDuration) {
+ public void hide(long startTime, long fadeoutDuration) {
mShowing = false;
+ if (!KeyguardUpdateMonitor.getInstance(mContext).isUserUnlocked()) {
+ fadeoutDuration = KEYGUARD_DISMISS_DURATION_LOCKED;
+ }
long uptimeMillis = SystemClock.uptimeMillis();
long delay = Math.max(0, startTime + HIDE_TIMING_CORRECTION_MS - uptimeMillis);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
index 888e19c..a7a792b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
@@ -16,11 +16,16 @@
package com.android.systemui.statusbar.phone;
+import android.app.ActivityManagerNative;
+import android.app.IActivityManager;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.res.Resources;
import android.graphics.PixelFormat;
+import android.os.RemoteException;
import android.os.SystemProperties;
+import android.os.Trace;
+import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -41,11 +46,16 @@
*/
public class StatusBarWindowManager implements RemoteInputController.Callback {
+ private static final String TAG = "StatusBarWindowManager";
+
private final Context mContext;
private final WindowManager mWindowManager;
+ private final IActivityManager mActivityManager;
private View mStatusBarView;
private WindowManager.LayoutParams mLp;
private WindowManager.LayoutParams mLpChanged;
+ private boolean mHasTopUi;
+ private boolean mHasTopUiChanged;
private int mBarHeight;
private final boolean mKeyguardScreenRotation;
private final float mScreenBrightnessDoze;
@@ -54,6 +64,7 @@
public StatusBarWindowManager(Context context) {
mContext = context;
mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+ mActivityManager = ActivityManagerNative.getDefault();
mKeyguardScreenRotation = shouldEnableKeyguardScreenRotation();
mScreenBrightnessDoze = mContext.getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessDoze) / 255f;
@@ -157,7 +168,11 @@
}
private void applyFitsSystemWindows(State state) {
- mStatusBarView.setFitsSystemWindows(!state.isKeyguardShowingAndNotOccluded());
+ boolean fitsSystemWindows = !state.isKeyguardShowingAndNotOccluded();
+ if (mStatusBarView.getFitsSystemWindows() != fitsSystemWindows) {
+ mStatusBarView.setFitsSystemWindows(fitsSystemWindows);
+ mStatusBarView.requestApplyInsets();
+ }
}
private void applyUserActivityTimeout(State state) {
@@ -193,9 +208,18 @@
applyFitsSystemWindows(state);
applyModalFlag(state);
applyBrightness(state);
+ applyHasTopUi(state);
if (mLp.copyFrom(mLpChanged) != 0) {
mWindowManager.updateViewLayout(mStatusBarView, mLp);
}
+ if (mHasTopUi != mHasTopUiChanged) {
+ try {
+ mActivityManager.setHasTopUi(mHasTopUiChanged);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to call setHasTopUi", e);
+ }
+ mHasTopUi = mHasTopUiChanged;
+ }
}
private void applyForceStatusBarVisibleFlag(State state) {
@@ -224,6 +248,10 @@
}
}
+ private void applyHasTopUi(State state) {
+ mHasTopUiChanged = isExpanded(state);
+ }
+
public void setKeyguardShowing(boolean showing) {
mCurrentState.keyguardShowing = showing;
apply(mCurrentState);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index 7b22b88..47ea59e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -190,6 +190,12 @@
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
+ if (mService.interceptMediaKey(event)) {
+ return true;
+ }
+ if (super.dispatchKeyEvent(event)) {
+ return true;
+ }
boolean down = event.getAction() == KeyEvent.ACTION_DOWN;
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_BACK:
@@ -214,10 +220,7 @@
}
break;
}
- if (mService.interceptMediaKey(event)) {
- return true;
- }
- return super.dispatchKeyEvent(event);
+ return false;
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
index a91cd51..7e92edf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.phone;
import android.content.Context;
+import android.os.Trace;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardUpdateMonitor;
@@ -85,6 +86,7 @@
}
private void update(boolean updateAlways) {
+ Trace.beginSection("UnlockMethodCache#update");
int user = KeyguardUpdateMonitor.getCurrentUser();
boolean secure = mLockPatternUtils.isSecure(user);
boolean canSkipBouncer = !secure || mKeyguardUpdateMonitor.getUserCanSkipBouncer(user);
@@ -102,6 +104,7 @@
mFaceUnlockRunning = faceUnlockRunning;
notifyListeners();
}
+ Trace.endSection();
}
private void notifyListeners() {
@@ -133,10 +136,13 @@
@Override
public void onFingerprintAuthenticated(int userId) {
+ Trace.beginSection("KeyguardUpdateMonitorCallback#onFingerprintAuthenticated");
if (!mKeyguardUpdateMonitor.isUnlockingWithFingerprintAllowed()) {
+ Trace.endSection();
return;
}
update(false /* updateAlways */);
+ Trace.endSection();
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
index 5d734c6..b9c7a4b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
@@ -89,14 +89,18 @@
@Override
public void addStateChangedCallback(BatteryController.BatteryStateChangeCallback cb) {
- mChangeCallbacks.add(cb);
+ synchronized (mChangeCallbacks) {
+ mChangeCallbacks.add(cb);
+ }
cb.onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);
cb.onPowerSaveChanged(mPowerSave);
}
@Override
public void removeStateChangedCallback(BatteryController.BatteryStateChangeCallback cb) {
- mChangeCallbacks.remove(cb);
+ synchronized (mChangeCallbacks) {
+ mChangeCallbacks.remove(cb);
+ }
}
@Override
@@ -171,16 +175,20 @@
}
protected void fireBatteryLevelChanged() {
- final int N = mChangeCallbacks.size();
- for (int i = 0; i < N; i++) {
- mChangeCallbacks.get(i).onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);
+ synchronized (mChangeCallbacks) {
+ final int N = mChangeCallbacks.size();
+ for (int i = 0; i < N; i++) {
+ mChangeCallbacks.get(i).onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);
+ }
}
}
private void firePowerSaveChanged() {
- final int N = mChangeCallbacks.size();
- for (int i = 0; i < N; i++) {
- mChangeCallbacks.get(i).onPowerSaveChanged(mPowerSave);
+ synchronized (mChangeCallbacks) {
+ final int N = mChangeCallbacks.size();
+ for (int i = 0; i < N; i++) {
+ mChangeCallbacks.get(i).onPowerSaveChanged(mPowerSave);
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
index e7e2ac2..08675c4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
@@ -26,6 +26,9 @@
boolean isBluetoothSupported();
boolean isBluetoothEnabled();
+
+ int getBluetoothState();
+
boolean isBluetoothConnected();
boolean isBluetoothConnecting();
String getLastDeviceName();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
index 014cc49..4f880b4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -49,6 +49,7 @@
private CachedBluetoothDevice mLastDevice;
private final H mHandler = new H();
+ private int mState;
public BluetoothControllerImpl(Context context, Looper bgLooper) {
mLocalBluetoothManager = LocalBluetoothManager.getInstance(context, null);
@@ -120,6 +121,11 @@
}
@Override
+ public int getBluetoothState() {
+ return mState;
+ }
+
+ @Override
public boolean isBluetoothConnected() {
return mConnectionState == BluetoothAdapter.STATE_CONNECTED;
}
@@ -192,7 +198,9 @@
@Override
public void onBluetoothStateChanged(int bluetoothState) {
- mEnabled = bluetoothState == BluetoothAdapter.STATE_ON;
+ mEnabled = bluetoothState == BluetoothAdapter.STATE_ON
+ || bluetoothState == BluetoothAdapter.STATE_TURNING_ON;
+ mState = bluetoothState;
mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
index 9a21a1e..91b21ed 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.policy;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraManager;
@@ -42,6 +43,7 @@
private static final int DISPATCH_AVAILABILITY_CHANGED = 2;
private final CameraManager mCameraManager;
+ private final Context mContext;
/** Call {@link #ensureHandler()} before using */
private Handler mHandler;
@@ -51,20 +53,22 @@
/** Lock on {@code this} when accessing */
private boolean mFlashlightEnabled;
- private final String mCameraId;
+ private String mCameraId;
private boolean mTorchAvailable;
- public FlashlightController(Context mContext) {
+ public FlashlightController(Context context) {
+ mContext = context;
mCameraManager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
- String cameraId = null;
+ tryInitCamera();
+ }
+
+ private void tryInitCamera() {
try {
- cameraId = getCameraId();
+ mCameraId = getCameraId();
} catch (Throwable e) {
Log.e(TAG, "Couldn't initialize.", e);
return;
- } finally {
- mCameraId = cameraId;
}
if (mCameraId != null) {
@@ -94,7 +98,7 @@
}
public boolean hasFlashlight() {
- return mCameraId != null;
+ return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH);
}
public synchronized boolean isEnabled() {
@@ -107,6 +111,9 @@
public void addListener(FlashlightListener l) {
synchronized (mListeners) {
+ if (mCameraId == null) {
+ tryInitCamera();
+ }
cleanUpListenersLocked(l);
mListeners.add(new WeakReference<>(l));
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
index d8b1a62..61bac2d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -265,6 +265,16 @@
public void setImageDrawable(@Nullable Drawable drawable) {
super.setImageDrawable(drawable);
}
+
+ @Override
+ public void setLandscape(boolean landscape) {
+ //no op
+ }
+
+ @Override
+ public void setCarMode(boolean carMode) {
+ // no op
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
index 970fed0..c175180 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
@@ -112,6 +112,10 @@
notifyKeyguardChanged();
}
+ public boolean isDeviceInteractive() {
+ return mKeyguardUpdateMonitor.isDeviceInteractive();
+ }
+
private void updateCanSkipBouncerState() {
mCanSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(mCurrentUser);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index ac3246d..83463e2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -197,11 +197,22 @@
if (mConfig.show4gForLte) {
mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.FOUR_G);
- mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,
- TelephonyIcons.FOUR_G_PLUS);
+ if (mConfig.hideLtePlus) {
+ mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,
+ TelephonyIcons.FOUR_G);
+ } else {
+ mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,
+ TelephonyIcons.FOUR_G_PLUS);
+ }
} else {
mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.LTE);
- mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA, TelephonyIcons.LTE);
+ if (mConfig.hideLtePlus) {
+ mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,
+ TelephonyIcons.LTE);
+ } else {
+ mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,
+ TelephonyIcons.LTE_PLUS);
+ }
}
mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.WFC);
}
@@ -460,6 +471,10 @@
}
mServiceState = state;
mDataNetType = state.getDataNetworkType();
+ if (mDataNetType == TelephonyManager.NETWORK_TYPE_LTE && mServiceState != null &&
+ mServiceState.isUsingCarrierAggregation()) {
+ mDataNetType = TelephonyManager.NETWORK_TYPE_LTE_CA;
+ }
updateTelephony();
}
@@ -471,6 +486,10 @@
}
mDataState = state;
mDataNetType = networkType;
+ if (mDataNetType == TelephonyManager.NETWORK_TYPE_LTE && mServiceState != null &&
+ mServiceState.isUsingCarrierAggregation()) {
+ mDataNetType = TelephonyManager.NETWORK_TYPE_LTE_CA;
+ }
updateTelephony();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 7a042af..7893a1a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -786,6 +786,7 @@
datatype.equals("g") ? TelephonyIcons.G :
datatype.equals("h") ? TelephonyIcons.H :
datatype.equals("lte") ? TelephonyIcons.LTE :
+ datatype.equals("lte+") ? TelephonyIcons.LTE_PLUS :
datatype.equals("roam") ? TelephonyIcons.ROAMING :
TelephonyIcons.UNKNOWN;
}
@@ -851,6 +852,7 @@
boolean showAtLeast3G = false;
boolean alwaysShowCdmaRssi = false;
boolean show4gForLte = false;
+ boolean hideLtePlus = false;
boolean hspaDataDistinguishable;
static Config readConfig(Context context) {
@@ -863,6 +865,7 @@
config.show4gForLte = res.getBoolean(R.bool.config_show4GForLTE);
config.hspaDataDistinguishable =
res.getBoolean(R.bool.config_hspa_data_distinguishable);
+ config.hideLtePlus = res.getBoolean(R.bool.config_hideLtePlus);
return config;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NightModeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NightModeController.java
deleted file mode 100644
index 4611ef9..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NightModeController.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.systemui.statusbar.policy;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.opengl.Matrix;
-import android.provider.Settings.Secure;
-import android.util.MathUtils;
-import com.android.systemui.tuner.TunerService;
-
-import java.util.ArrayList;
-
-/**
- * Listens for changes to twilight from the TwilightService.
- *
- * Also pushes the current matrix to accessibility based on the current twilight
- * and various tuner settings.
- */
-public class NightModeController implements TunerService.Tunable {
-
- public static final String NIGHT_MODE_ADJUST_TINT = "tuner_night_mode_adjust_tint";
- private static final String COLOR_MATRIX_CUSTOM_VALUES = "tuner_color_custom_values";
-
- private static final String ACTION_TWILIGHT_CHANGED = "android.intent.action.TWILIGHT_CHANGED";
-
- private static final String EXTRA_IS_NIGHT = "isNight";
- private static final String EXTRA_AMOUNT = "amount";
-
- // Night mode ~= 3400 K
- private static final float[] NIGHT_VALUES = new float[] {
- 1, 0, 0, 0,
- 0, .754f, 0, 0,
- 0, 0, .516f, 0,
- 0, 0, 0, 1,
- };
- public static final float[] IDENTITY_MATRIX = new float[] {
- 1, 0, 0, 0,
- 0, 1, 0, 0,
- 0, 0, 1, 0,
- 0, 0, 0, 1,
- };
-
- private final ArrayList<Listener> mListeners = new ArrayList<>();
-
- private final Context mContext;
-
- // This is whether or not this is the main NightMode controller in SysUI that should be
- // updating relevant color matrixes or if its in the tuner process getting current state
- // for UI.
- private final boolean mUpdateMatrix;
-
- private float[] mCustomMatrix;
- private boolean mListening;
- private boolean mAdjustTint;
-
- private boolean mIsNight;
- private float mAmount;
- private boolean mIsAuto;
-
- public NightModeController(Context context) {
- this(context, false);
- }
-
- public NightModeController(Context context, boolean updateMatrix) {
- mContext = context;
- mUpdateMatrix = updateMatrix;
- TunerService.get(mContext).addTunable(this, NIGHT_MODE_ADJUST_TINT,
- COLOR_MATRIX_CUSTOM_VALUES, Secure.TWILIGHT_MODE);
- }
-
- public void setNightMode(boolean isNight) {
- if (mIsAuto) {
- if (mIsNight != isNight) {
- TunerService.get(mContext).setValue(Secure.TWILIGHT_MODE, isNight
- ? Secure.TWILIGHT_MODE_AUTO_OVERRIDE_ON
- : Secure.TWILIGHT_MODE_AUTO_OVERRIDE_OFF);
- } else {
- TunerService.get(mContext).setValue(Secure.TWILIGHT_MODE,
- Secure.TWILIGHT_MODE_AUTO);
- }
- } else {
- TunerService.get(mContext).setValue(Secure.TWILIGHT_MODE, isNight
- ? Secure.TWILIGHT_MODE_LOCKED_ON : Secure.TWILIGHT_MODE_LOCKED_OFF);
- }
- }
-
- public void setAuto(boolean auto) {
- mIsAuto = auto;
- if (auto) {
- TunerService.get(mContext).setValue(Secure.TWILIGHT_MODE, Secure.TWILIGHT_MODE_AUTO);
- } else {
- // Lock into the current state
- TunerService.get(mContext).setValue(Secure.TWILIGHT_MODE, mIsNight
- ? Secure.TWILIGHT_MODE_LOCKED_ON : Secure.TWILIGHT_MODE_LOCKED_OFF);
- }
- }
-
- public boolean isAuto() {
- return mIsAuto;
- }
-
- public void setAdjustTint(Boolean newValue) {
- TunerService.get(mContext).setValue(NIGHT_MODE_ADJUST_TINT, ((Boolean) newValue) ? 1 : 0);
- }
-
- public void addListener(Listener listener) {
- mListeners.add(listener);
- listener.onNightModeChanged();
- updateListening();
- }
-
- public void removeListener(Listener listener) {
- mListeners.remove(listener);
- updateListening();
- }
-
- private void updateListening() {
- boolean shouldListen = mListeners.size() != 0 || (mUpdateMatrix && mAdjustTint);
- if (shouldListen == mListening) return;
- mListening = shouldListen;
- if (mListening) {
- mContext.registerReceiver(mReceiver, new IntentFilter(ACTION_TWILIGHT_CHANGED));
- } else {
- mContext.unregisterReceiver(mReceiver);
- }
- }
-
- public boolean isEnabled() {
- if (!mListening) {
- updateNightMode(mContext.registerReceiver(null,
- new IntentFilter(ACTION_TWILIGHT_CHANGED)));
- }
- return mIsNight;
- }
-
- public String getCustomValues() {
- return TunerService.get(mContext).getValue(COLOR_MATRIX_CUSTOM_VALUES);
- }
-
- public void setCustomValues(String values) {
- TunerService.get(mContext).setValue(COLOR_MATRIX_CUSTOM_VALUES, values);
- }
-
- @Override
- public void onTuningChanged(String key, String newValue) {
- if (COLOR_MATRIX_CUSTOM_VALUES.equals(key)) {
- mCustomMatrix = newValue != null ? toValues(newValue) : null;
- updateCurrentMatrix();
- } else if (NIGHT_MODE_ADJUST_TINT.equals(key)) {
- mAdjustTint = newValue == null || Integer.parseInt(newValue) != 0;
- updateListening();
- updateCurrentMatrix();
- } else if (Secure.TWILIGHT_MODE.equals(key)) {
- mIsAuto = newValue != null && Integer.parseInt(newValue) >= Secure.TWILIGHT_MODE_AUTO;
- }
- }
-
- private void updateCurrentMatrix() {
- if (!mUpdateMatrix) return;
- if ((!mAdjustTint || mAmount == 0) && mCustomMatrix == null) {
- TunerService.get(mContext).setValue(Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, null);
- return;
- }
- float[] values = scaleValues(IDENTITY_MATRIX, NIGHT_VALUES, mAdjustTint ? mAmount : 0);
- if (mCustomMatrix != null) {
- values = multiply(values, mCustomMatrix);
- }
- TunerService.get(mContext).setValue(Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX,
- toString(values));
- }
-
- private void updateNightMode(Intent intent) {
- mIsNight = intent != null && intent.getBooleanExtra(EXTRA_IS_NIGHT, false);
- mAmount = intent != null ? intent.getFloatExtra(EXTRA_AMOUNT, 0) : 0;
- }
-
- private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (ACTION_TWILIGHT_CHANGED.equals(intent.getAction())) {
- updateNightMode(intent);
- updateCurrentMatrix();
- for (int i = 0; i < mListeners.size(); i++) {
- mListeners.get(i).onNightModeChanged();
- }
- }
- }
- };
-
- public interface Listener {
- void onNightModeChanged();
- void onTwilightAutoChanged();
- }
-
- private static float[] multiply(float[] matrix, float[] other) {
- if (matrix == null) {
- return other;
- }
- float[] result = new float[16];
- Matrix.multiplyMM(result, 0, matrix, 0, other, 0);
- return result;
- }
-
- private float[] scaleValues(float[] identityMatrix, float[] nightValues, float amount) {
- float[] values = new float[identityMatrix.length];
- for (int i = 0; i < values.length; i++) {
- values[i] = MathUtils.lerp(identityMatrix[i], nightValues[i], amount);
- }
- return values;
- }
-
- public static String toString(float[] values) {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < values.length; i++) {
- if (builder.length() != 0) {
- builder.append(',');
- }
- builder.append(values[i]);
- }
- return builder.toString();
- }
-
- public static float[] toValues(String customValues) {
- String[] strValues = customValues.split(",");
- float[] values = new float[strValues.length];
- for (int i = 0; i < values.length; i++) {
- values[i] = Float.parseFloat(strValues[i]);
- }
- return values;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index a2289c8..29577ef 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.policy;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.RemoteInput;
@@ -33,6 +35,7 @@
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewAnimationUtils;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.inputmethod.CompletionInfo;
@@ -47,11 +50,13 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.statusbar.ExpandableView;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.RemoteInputController;
import com.android.systemui.statusbar.stack.ScrollContainer;
+import com.android.systemui.statusbar.stack.StackStateAnimator;
/**
* Host for the remote input.
@@ -77,6 +82,10 @@
private View mScrollContainerChild;
private boolean mRemoved;
+ private int mRevealCx;
+ private int mRevealCy;
+ private int mRevealR;
+
public RemoteInputView(Context context, AttributeSet attrs) {
super(context, attrs);
}
@@ -180,14 +189,28 @@
return true;
}
- public void onDefocus() {
+ private void onDefocus(boolean animate) {
mController.removeRemoteInput(mEntry);
mEntry.remoteInputText = mEditText.getText();
// During removal, we get reattached and lose focus. Not hiding in that
// case to prevent flicker.
if (!mRemoved) {
- setVisibility(INVISIBLE);
+ if (animate && mRevealR > 0) {
+ Animator reveal = ViewAnimationUtils.createCircularReveal(
+ this, mRevealCx, mRevealCy, mRevealR, 0);
+ reveal.setInterpolator(Interpolators.FAST_OUT_LINEAR_IN);
+ reveal.setDuration(StackStateAnimator.ANIMATION_DURATION_CLOSE_REMOTE_INPUT);
+ reveal.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ setVisibility(INVISIBLE);
+ }
+ });
+ reveal.start();
+ } else {
+ setVisibility(INVISIBLE);
+ }
}
MetricsLogger.action(mContext, MetricsProto.MetricsEvent.ACTION_REMOTE_INPUT_CLOSE,
mEntry.notification.getPackageName());
@@ -223,6 +246,17 @@
mEditText.setHint(mRemoteInput.getLabel());
}
+ public void focusAnimated() {
+ if (getVisibility() != VISIBLE) {
+ Animator animator = ViewAnimationUtils.createCircularReveal(
+ this, mRevealCx, mRevealCy, 0, mRevealR);
+ animator.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
+ animator.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN);
+ animator.start();
+ }
+ focus();
+ }
+
public void focus() {
MetricsLogger.action(mContext, MetricsProto.MetricsEvent.ACTION_REMOTE_INPUT_OPEN,
mEntry.notification.getPackageName());
@@ -253,7 +287,7 @@
mProgressBar.setVisibility(INVISIBLE);
mController.removeSpinning(mEntry.key);
updateSendButton();
- onDefocus();
+ onDefocus(false /* animate */);
}
private void updateSendButton() {
@@ -272,7 +306,7 @@
}
public void close() {
- mEditText.defocusIfNeeded();
+ mEditText.defocusIfNeeded(false /* animated */);
}
@Override
@@ -321,6 +355,7 @@
other.close();
setPendingIntent(other.mPendingIntent);
setRemoteInput(other.mRemoteInputs, other.mRemoteInput);
+ setRevealParameters(other.mRevealCx, other.mRevealCy, other.mRevealR);
focus();
}
@@ -331,7 +366,6 @@
* @return true if a matching action was found, false otherwise
*/
public boolean updatePendingIntentFromActions(Notification.Action[] actions) {
- boolean found = false;
if (mPendingIntent == null || actions == null) {
return false;
}
@@ -374,6 +408,12 @@
mRemoved = true;
}
+ public void setRevealParameters(int cx, int cy, int r) {
+ mRevealCx = cx;
+ mRevealCy = cy;
+ mRevealR = r;
+ }
+
/**
* An EditText that changes appearance based on whether it's focusable and becomes
* un-focusable whenever the user navigates away from it or it becomes invisible.
@@ -389,14 +429,14 @@
mBackground = getBackground();
}
- private void defocusIfNeeded() {
+ private void defocusIfNeeded(boolean animate) {
if (mRemoteInputView != null && mRemoteInputView.mEntry.row.isChangingPosition()) {
return;
}
if (isFocusable() && isEnabled()) {
setInnerFocusable(false);
if (mRemoteInputView != null) {
- mRemoteInputView.onDefocus();
+ mRemoteInputView.onDefocus(animate);
}
mShowImeOnInputConnection = false;
}
@@ -407,7 +447,7 @@
super.onVisibilityChanged(changedView, visibility);
if (!isShown()) {
- defocusIfNeeded();
+ defocusIfNeeded(false /* animate */);
}
}
@@ -415,7 +455,7 @@
protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
super.onFocusChanged(focused, direction, previouslyFocusedRect);
if (!focused) {
- defocusIfNeeded();
+ defocusIfNeeded(true /* animate */);
}
}
@@ -432,14 +472,21 @@
}
@Override
- public boolean onKeyPreIme(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
- defocusIfNeeded();
- final InputMethodManager imm = InputMethodManager.getInstance();
- imm.hideSoftInputFromWindow(getWindowToken(), 0);
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ // Eat the DOWN event here to prevent any default behavior.
return true;
}
- return super.onKeyPreIme(keyCode, event);
+ return super.onKeyDown(keyCode, event);
+ }
+
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ defocusIfNeeded(true /* animate */);
+ return true;
+ }
+ return super.onKeyUp(keyCode, event);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
index d91b332..ed8c7ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
@@ -208,10 +208,12 @@
};
static final int QS_DATA_LTE = R.drawable.ic_qs_signal_lte;
+ static final int QS_DATA_LTE_PLUS = R.drawable.ic_qs_signal_lte_plus;
static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_airplane_mode;
static final int ROAMING_ICON = R.drawable.stat_sys_data_fully_connected_roam;
static final int ICON_LTE = R.drawable.stat_sys_data_fully_connected_lte;
+ static final int ICON_LTE_PLUS = R.drawable.stat_sys_data_fully_connected_lte_plus;
static final int ICON_G = R.drawable.stat_sys_data_fully_connected_g;
static final int ICON_E = R.drawable.stat_sys_data_fully_connected_e;
static final int ICON_H = R.drawable.stat_sys_data_fully_connected_h;
@@ -393,6 +395,21 @@
TelephonyIcons.QS_DATA_LTE
);
+ static final MobileIconGroup LTE_PLUS = new MobileIconGroup(
+ "LTE+",
+ TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH,
+ TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH,
+ AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH,
+ 0, 0,
+ TelephonyIcons.TELEPHONY_NO_NETWORK,
+ TelephonyIcons.QS_TELEPHONY_NO_NETWORK,
+ AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],
+ R.string.accessibility_data_connection_lte_plus,
+ TelephonyIcons.ICON_LTE_PLUS,
+ true,
+ TelephonyIcons.QS_DATA_LTE_PLUS
+ );
+
static final MobileIconGroup ROAMING = new MobileIconGroup(
"Roaming",
TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index 6944869..c883bba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -99,6 +99,7 @@
private Dialog mExitGuestDialog;
private Dialog mAddUserDialog;
private int mLastNonGuestUser = UserHandle.USER_SYSTEM;
+ private boolean mResumeUserOnGuestLogout = true;
private boolean mSimpleUserSwitcher;
private boolean mAddUsersWhenLocked;
private boolean mPauseRefreshUsers;
@@ -318,6 +319,10 @@
return mContext.getResources().getBoolean(R.bool.config_enableFullscreenUserSwitcher);
}
+ public void setResumeUserOnGuestLogout(boolean resume) {
+ mResumeUserOnGuestLogout = resume;
+ }
+
public void logoutCurrentUser() {
int currentUser = ActivityManager.getCurrentUser();
if (currentUser != UserHandle.USER_SYSTEM) {
@@ -420,7 +425,7 @@
private void exitGuest(int id) {
int newId = UserHandle.USER_SYSTEM;
- if (mLastNonGuestUser != UserHandle.USER_SYSTEM) {
+ if (mResumeUserOnGuestLogout && mLastNonGuestUser != UserHandle.USER_SYSTEM) {
UserInfo info = mUserManager.getUserInfo(mLastNonGuestUser);
if (info != null && info.isEnabled() && info.supportsSwitchToByUser()) {
newId = info.id;
@@ -431,23 +436,27 @@
}
private void listenForCallState() {
- TelephonyManager.from(mContext).listen(new PhoneStateListener() {
- private int mCallState;
- @Override
- public void onCallStateChanged(int state, String incomingNumber) {
- if (mCallState == state) return;
- if (DEBUG) Log.v(TAG, "Call state changed: " + state);
- mCallState = state;
- int currentUserId = ActivityManager.getCurrentUser();
- UserInfo userInfo = mUserManager.getUserInfo(currentUserId);
- if (userInfo != null && userInfo.isGuest()) {
- showGuestNotification(currentUserId);
- }
- refreshUsers(UserHandle.USER_NULL);
- }
- }, PhoneStateListener.LISTEN_CALL_STATE);
+ TelephonyManager.from(mContext).listen(mPhoneStateListener,
+ PhoneStateListener.LISTEN_CALL_STATE);
}
+ private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+ private int mCallState;
+
+ @Override
+ public void onCallStateChanged(int state, String incomingNumber) {
+ if (mCallState == state) return;
+ if (DEBUG) Log.v(TAG, "Call state changed: " + state);
+ mCallState = state;
+ int currentUserId = ActivityManager.getCurrentUser();
+ UserInfo userInfo = mUserManager.getUserInfo(currentUserId);
+ if (userInfo != null && userInfo.isGuest()) {
+ showGuestNotification(currentUserId);
+ }
+ refreshUsers(UserHandle.USER_NULL);
+ }
+ };
+
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index b4d0ffd..43336a0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -668,30 +668,74 @@
public void setStackHeight(float height) {
mLastSetStackHeight = height;
setIsExpanded(height > 0.0f);
- int newStackHeight = (int) height;
- int minStackHeight = getLayoutMinHeight();
int stackHeight;
- float paddingOffset;
- boolean trackingHeadsUp = mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp();
- int normalUnfoldPositionStart = trackingHeadsUp
- ? mHeadsUpManager.getTopHeadsUpPinnedHeight()
- : minStackHeight;
- if (newStackHeight - mTopPadding - mTopPaddingOverflow >= normalUnfoldPositionStart
- || getNotGoneChildCount() == 0) {
- paddingOffset = mTopPaddingOverflow;
- stackHeight = newStackHeight;
+ float translationY;
+ float appearEndPosition = getAppearEndPosition();
+ float appearStartPosition = getAppearStartPosition();
+ if (height >= appearEndPosition) {
+ translationY = mTopPaddingOverflow;
+ stackHeight = (int) height;
} else {
- int translationY;
- translationY = newStackHeight - normalUnfoldPositionStart;
- paddingOffset = translationY - mTopPadding;
- stackHeight = (int) (height - (translationY - mTopPadding));
+ float appearFraction = getAppearFraction(height);
+ if (appearFraction >= 0) {
+ translationY = NotificationUtils.interpolate(getExpandTranslationStart(), 0,
+ appearFraction);
+ } else {
+ // This may happen when pushing up a heads up. We linearly push it up from the
+ // start
+ translationY = height - appearStartPosition + getExpandTranslationStart();
+ }
+ stackHeight = (int) (height - translationY);
}
if (stackHeight != mCurrentStackHeight) {
mCurrentStackHeight = stackHeight;
updateAlgorithmHeightAndPadding();
requestChildrenUpdate();
}
- setStackTranslation(paddingOffset);
+ setStackTranslation(translationY);
+ }
+
+ /**
+ * @return The translation at the beginning when expanding.
+ * Measured relative to the resting position.
+ */
+ private float getExpandTranslationStart() {
+ int startPosition = mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp()
+ ? 0 : -getFirstChildMinHeight();
+ return startPosition - mTopPadding;
+ }
+
+ /**
+ * @return the position from where the appear transition starts when expanding.
+ * Measured in absolute height.
+ */
+ private float getAppearStartPosition() {
+ return mTrackingHeadsUp
+ ? mHeadsUpManager.getTopHeadsUpPinnedHeight()
+ : 0;
+ }
+
+ /**
+ * @return the position from where the appear transition ends when expanding.
+ * Measured in absolute height.
+ */
+ private float getAppearEndPosition() {
+ int firstItemHeight = mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp()
+ ? mHeadsUpManager.getTopHeadsUpPinnedHeight() + mBottomStackPeekSize
+ + mBottomStackSlowDownHeight
+ : getLayoutMinHeight();
+ return firstItemHeight + mTopPadding + mTopPaddingOverflow;
+ }
+
+ /**
+ * @param height the height of the panel
+ * @return the fraction of the appear animation that has been performed
+ */
+ public float getAppearFraction(float height) {
+ float appearEndPosition = getAppearEndPosition();
+ float appearStartPosition = getAppearStartPosition();
+ return (height - appearStartPosition)
+ / (appearEndPosition - appearStartPosition);
}
public float getStackTranslation() {
@@ -780,20 +824,20 @@
public static void performDismiss(View v, NotificationGroupManager groupManager,
boolean fromAccessibility) {
- if (v instanceof ExpandableNotificationRow) {
- ExpandableNotificationRow row = (ExpandableNotificationRow) v;
- if (groupManager.isOnlyChildInGroup(row.getStatusBarNotification())) {
- ExpandableNotificationRow groupSummary =
- groupManager.getLogicalGroupSummary(row.getStatusBarNotification());
- if (groupSummary.isClearable()) {
- performDismiss(groupSummary, groupManager, fromAccessibility);
- }
- }
- row.setDismissed(true, fromAccessibility);
+ if (!(v instanceof ExpandableNotificationRow)) {
+ return;
}
- final View veto = v.findViewById(R.id.veto);
- if (veto != null && veto.getVisibility() != View.GONE) {
- veto.performClick();
+ ExpandableNotificationRow row = (ExpandableNotificationRow) v;
+ if (groupManager.isOnlyChildInGroup(row.getStatusBarNotification())) {
+ ExpandableNotificationRow groupSummary =
+ groupManager.getLogicalGroupSummary(row.getStatusBarNotification());
+ if (groupSummary.isClearable()) {
+ performDismiss(groupSummary, groupManager, fromAccessibility);
+ }
+ }
+ row.setDismissed(true, fromAccessibility);
+ if (row.isClearable()) {
+ row.performDismiss();
}
if (DEBUG) Log.v(TAG, "onChildDismissed: " + v);
}
@@ -2098,6 +2142,12 @@
}
public int getLayoutMinHeight() {
+ int firstChildMinHeight = getFirstChildMinHeight();
+ return Math.min(firstChildMinHeight + mBottomStackPeekSize + mBottomStackSlowDownHeight,
+ mMaxLayoutHeight - mTopPadding);
+ }
+
+ private int getFirstChildMinHeight() {
final ExpandableView firstChild = getFirstChildNotGone();
int firstChildMinHeight = firstChild != null
? firstChild.getIntrinsicHeight()
@@ -2107,8 +2157,7 @@
if (mOwnScrollY > 0) {
firstChildMinHeight = Math.max(firstChildMinHeight - mOwnScrollY, mCollapsedSize);
}
- return Math.min(firstChildMinHeight + mBottomStackPeekSize + mBottomStackSlowDownHeight,
- mMaxLayoutHeight - mTopPadding);
+ return firstChildMinHeight;
}
public float getTopPaddingOverflow() {
@@ -2349,6 +2398,7 @@
if (hasAddEvent) {
// This child was just added lets remove all events.
mHeadsUpChangeAnimations.removeAll(mTmpList);
+ ((ExpandableNotificationRow ) child).setHeadsupDisappearRunning(false);
}
mTmpList.clear();
return hasAddEvent;
@@ -2606,6 +2656,10 @@
type = row.wasJustClicked()
? AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR_CLICK
: AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR;
+ if (row.isChildInGroup()) {
+ // We can otherwise get stuck in there if it was just isolated
+ row.setHeadsupDisappearRunning(false);
+ }
} else {
StackViewState viewState = mCurrentStackScrollState.getViewStateForView(row);
if (viewState == null) {
@@ -3099,6 +3153,22 @@
requestChildrenUpdate();
runAnimationFinishedRunnables();
clearViewOverlays();
+ clearHeadsUpDisappearRunning();
+ }
+
+ private void clearHeadsUpDisappearRunning() {
+ for (int i = 0; i < getChildCount(); i++) {
+ View view = getChildAt(i);
+ if (view instanceof ExpandableNotificationRow) {
+ ExpandableNotificationRow row = (ExpandableNotificationRow) view;
+ row.setHeadsupDisappearRunning(false);
+ if (row.isSummaryWithChildren()) {
+ for (ExpandableNotificationRow child : row.getNotificationChildren()) {
+ child.setHeadsupDisappearRunning(false);
+ }
+ }
+ }
+ }
}
private void clearViewOverlays() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index b0d7995..c9e4eac 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -154,8 +154,8 @@
float newNotificationEnd = newYTranslation + newHeight;
boolean isHeadsUp = (child instanceof ExpandableNotificationRow)
&& ((ExpandableNotificationRow) child).isPinned();
- if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded()
- && !isHeadsUp) {
+ if (newYTranslation < previousNotificationEnd
+ && (!isHeadsUp || ambientState.isShadeExpanded())) {
// The previous view is overlapping on top, clip!
float overlapAmount = previousNotificationEnd - newYTranslation;
state.clipTopAmount = (int) overlapAmount;
@@ -173,14 +173,14 @@
}
public static boolean canChildBeDismissed(View v) {
- if (v instanceof ExpandableNotificationRow) {
- ExpandableNotificationRow row = (ExpandableNotificationRow) v;
- if (row.areGutsExposed()) {
- return false;
- }
+ if (!(v instanceof ExpandableNotificationRow)) {
+ return false;
}
- final View veto = v.findViewById(R.id.veto);
- return (veto != null && veto.getVisibility() != View.GONE);
+ ExpandableNotificationRow row = (ExpandableNotificationRow) v;
+ if (row.areGutsExposed()) {
+ return false;
+ }
+ return row.canViewBeDismissed();
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
index 659eaf7..3804b42 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
@@ -44,6 +44,7 @@
public static final int ANIMATION_DURATION_GO_TO_FULL_SHADE = 448;
public static final int ANIMATION_DURATION_APPEAR_DISAPPEAR = 464;
public static final int ANIMATION_DURATION_DIMMED_ACTIVATED = 220;
+ public static final int ANIMATION_DURATION_CLOSE_REMOTE_INPUT = 150;
public static final int ANIMATION_DURATION_HEADS_UP_APPEAR = 650;
public static final int ANIMATION_DURATION_HEADS_UP_DISAPPEAR = 230;
public static final int ANIMATION_DELAY_PER_ELEMENT_INTERRUPTING = 80;
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java
index 8881c79..6e08139 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java
@@ -47,9 +47,9 @@
@Override
public void onAttached() {
super.onAttached();
- TunerService.get(getContext()).addTunable(this, StatusBarIconController.ICON_BLACKLIST);
mHasPercentage = Settings.System.getInt(getContext().getContentResolver(),
SHOW_PERCENT_SETTING, 0) != 0;
+ TunerService.get(getContext()).addTunable(this, StatusBarIconController.ICON_BLACKLIST);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/CalibratePreference.java b/packages/SystemUI/src/com/android/systemui/tuner/CalibratePreference.java
deleted file mode 100644
index ff7be13..0000000
--- a/packages/SystemUI/src/com/android/systemui/tuner/CalibratePreference.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.systemui.tuner;
-
-import android.content.Context;
-import android.support.v7.preference.DialogPreference;
-import android.util.AttributeSet;
-
-public class CalibratePreference extends DialogPreference {
- public CalibratePreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java
index ea92443..caa0527 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java
@@ -32,6 +32,8 @@
private boolean mHasSeconds;
private ArraySet<String> mBlacklist;
private boolean mHasSetValue;
+ private boolean mReceivedSeconds;
+ private boolean mReceivedClock;
public ClockPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -55,12 +57,14 @@
@Override
public void onTuningChanged(String key, String newValue) {
if (StatusBarIconController.ICON_BLACKLIST.equals(key)) {
+ mReceivedClock = true;
mBlacklist = StatusBarIconController.getIconBlacklist(newValue);
mClockEnabled = !mBlacklist.contains(mClock);
} else if (Clock.CLOCK_SECONDS.equals(key)) {
+ mReceivedSeconds = true;
mHasSeconds = newValue != null && Integer.parseInt(newValue) != 0;
}
- if (!mHasSetValue) {
+ if (!mHasSetValue && mReceivedClock && mReceivedSeconds) {
// Because of the complicated tri-state it can end up looping and setting state back to
// what the user didn't choose. To avoid this, just set the state once and rely on the
// preference to handle updates.
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ColorAndAppearanceFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/ColorAndAppearanceFragment.java
deleted file mode 100644
index af95cf9..0000000
--- a/packages/SystemUI/src/com/android/systemui/tuner/ColorAndAppearanceFragment.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.systemui.tuner;
-
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.provider.Settings.Secure;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.SeekBar;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.policy.NightModeController;
-
-public class ColorAndAppearanceFragment extends PreferenceFragment {
-
- private static final String KEY_CALIBRATE = "calibrate";
-
- private static final long RESET_DELAY = 10000;
- private static final CharSequence KEY_NIGHT_MODE = "night_mode";
-
- private NightModeController mNightModeController;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mNightModeController = new NightModeController(getContext());
- }
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- addPreferencesFromResource(R.xml.color_and_appearance);
- }
-
- @Override
- public void onResume() {
- super.onResume();
- MetricsLogger.visibility(getContext(), MetricsEvent.TUNER_COLOR_AND_APPEARANCE, true);
- // TODO: Figure out better title model for Tuner, to avoid any more of this.
- getActivity().setTitle(R.string.color_and_appearance);
-
- Preference nightMode = findPreference(KEY_NIGHT_MODE);
- nightMode.setSummary(mNightModeController.isEnabled()
- ? R.string.night_mode_on : R.string.night_mode_off);
- }
-
- @Override
- public void onPause() {
- super.onPause();
- MetricsLogger.visibility(getContext(), MetricsEvent.TUNER_COLOR_AND_APPEARANCE, false);
- }
-
- @Override
- public void onDisplayPreferenceDialog(Preference preference) {
- if (preference instanceof CalibratePreference) {
- CalibrateDialog.show(this);
- } else {
- super.onDisplayPreferenceDialog(preference);
- }
- }
-
- private void startRevertTimer() {
- getView().postDelayed(mResetColorMatrix, RESET_DELAY);
- }
-
- private void onApply() {
- MetricsLogger.action(getContext(), MetricsEvent.ACTION_TUNER_CALIBRATE_DISPLAY_CHANGED);
- mNightModeController.setCustomValues(Settings.Secure.getString(
- getContext().getContentResolver(), Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX));
- getView().removeCallbacks(mResetColorMatrix);
- }
-
- private void onRevert() {
- getView().removeCallbacks(mResetColorMatrix);
- mResetColorMatrix.run();
- }
-
- private final Runnable mResetColorMatrix = new Runnable() {
- @Override
- public void run() {
- ((DialogFragment) getFragmentManager().findFragmentByTag("RevertWarning")).dismiss();
- Settings.Secure.putString(getContext().getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, null);
- }
- };
-
- public static class CalibrateDialog extends DialogFragment implements
- DialogInterface.OnClickListener {
- private float[] mValues;
- private NightModeController mNightModeController;
-
- public static void show(ColorAndAppearanceFragment fragment) {
- CalibrateDialog dialog = new CalibrateDialog();
- dialog.setTargetFragment(fragment, 0);
- dialog.show(fragment.getFragmentManager(), "Calibrate");
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mNightModeController = new NightModeController(getContext());
- String customValues = mNightModeController.getCustomValues();
- if (customValues == null) {
- // Generate this as a string because its the easiest way to generate a copy of the
- // identity.
- customValues = NightModeController.toString(NightModeController.IDENTITY_MATRIX);
- }
- mValues = NightModeController.toValues(customValues);
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- View v = LayoutInflater.from(getContext()).inflate(R.layout.calibrate_sliders, null);
- bindView(v.findViewById(R.id.r_group), 0);
- bindView(v.findViewById(R.id.g_group), 5);
- bindView(v.findViewById(R.id.b_group), 10);
- MetricsLogger.visible(getContext(), MetricsEvent.TUNER_CALIBRATE_DISPLAY);
- return new AlertDialog.Builder(getContext())
- .setTitle(R.string.calibrate_display)
- .setView(v)
- .setPositiveButton(R.string.color_apply, this)
- .setNegativeButton(android.R.string.cancel, null)
- .create();
- }
-
- @Override
- public void onDismiss(DialogInterface dialog) {
- super.onDismiss(dialog);
- MetricsLogger.hidden(getContext(), MetricsEvent.TUNER_CALIBRATE_DISPLAY);
- }
-
- private void bindView(View view, final int index) {
- SeekBar seekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);
- seekBar.setMax(1000);
- seekBar.setProgress((int) (1000 * mValues[index]));
- seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
- @Override
- public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
- mValues[index] = progress / 1000f;
- }
-
- @Override
- public void onStartTrackingTouch(SeekBar seekBar) {
- }
-
- @Override
- public void onStopTrackingTouch(SeekBar seekBar) {
- }
- });
- }
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (mValues[0] == 1 && mValues[5] == 1 && mValues[10] == 1) {
- // Allow removal of matrix by all values set to highest.
- mNightModeController.setCustomValues(null);
- return;
- }
- ((ColorAndAppearanceFragment) getTargetFragment()).startRevertTimer();
- Settings.Secure.putString(getContext().getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX,
- NightModeController.toString(mValues));
- RevertWarning.show((ColorAndAppearanceFragment) getTargetFragment());
- }
- }
-
- public static class RevertWarning extends DialogFragment
- implements DialogInterface.OnClickListener {
-
- public static void show(ColorAndAppearanceFragment fragment) {
- RevertWarning warning = new RevertWarning();
- warning.setTargetFragment(fragment, 0);
- warning.show(fragment.getFragmentManager(), "RevertWarning");
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- AlertDialog alertDialog = new AlertDialog.Builder(getContext())
- .setTitle(R.string.color_revert_title)
- .setMessage(R.string.color_revert_message)
- .setPositiveButton(R.string.ok, this)
- .create();
- alertDialog.setCanceledOnTouchOutside(true);
- return alertDialog;
- }
-
- @Override
- public void onCancel(DialogInterface dialog) {
- super.onCancel(dialog);
- ((ColorAndAppearanceFragment) getTargetFragment()).onRevert();
- }
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- ((ColorAndAppearanceFragment) getTargetFragment()).onApply();
- }
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/NightModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/NightModeFragment.java
deleted file mode 100644
index ae2856c..0000000
--- a/packages/SystemUI/src/com/android/systemui/tuner/NightModeFragment.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.systemui.tuner;
-
-import android.annotation.Nullable;
-import android.app.UiModeManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.provider.Settings.Secure;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Switch;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.policy.NightModeController;
-import com.android.systemui.statusbar.policy.NightModeController.Listener;
-import com.android.systemui.tuner.TunerService.Tunable;
-
-public class NightModeFragment extends PreferenceFragment implements Tunable,
- Listener, OnPreferenceChangeListener {
-
- private static final String TAG = "NightModeFragment";
-
- public static final String EXTRA_SHOW_NIGHT_MODE = "show_night_mode";
-
- private static final CharSequence KEY_AUTO = "auto";
- private static final CharSequence KEY_ADJUST_TINT = "adjust_tint";
- private static final CharSequence KEY_ADJUST_BRIGHTNESS = "adjust_brightness";
-
- private Switch mSwitch;
-
- private NightModeController mNightModeController;
- private SwitchPreference mAutoSwitch;
- private SwitchPreference mAdjustTint;
- private SwitchPreference mAdjustBrightness;
- private UiModeManager mUiModeManager;
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mNightModeController = new NightModeController(getContext());
- mUiModeManager = getContext().getSystemService(UiModeManager.class);
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- final View view = LayoutInflater.from(getContext()).inflate(
- R.layout.night_mode_settings, container, false);
- ((ViewGroup) view).addView(super.onCreateView(inflater, container, savedInstanceState));
- return view;
- }
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- final Context context = getPreferenceManager().getContext();
-
- addPreferencesFromResource(R.xml.night_mode);
- mAutoSwitch = (SwitchPreference) findPreference(KEY_AUTO);
- mAutoSwitch.setOnPreferenceChangeListener(this);
- mAdjustTint = (SwitchPreference) findPreference(KEY_ADJUST_TINT);
- mAdjustTint.setOnPreferenceChangeListener(this);
- mAdjustBrightness = (SwitchPreference) findPreference(KEY_ADJUST_BRIGHTNESS);
- mAdjustBrightness.setOnPreferenceChangeListener(this);
- }
-
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- View switchBar = view.findViewById(R.id.switch_bar);
- mSwitch = (Switch) switchBar.findViewById(android.R.id.switch_widget);
- mSwitch.setChecked(mNightModeController.isEnabled());
- switchBar.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- boolean newState = !mNightModeController.isEnabled();
- MetricsLogger.action(getContext(), MetricsEvent.ACTION_TUNER_NIGHT_MODE, newState);
- mNightModeController.setNightMode(newState);
- mSwitch.setChecked(newState);
- }
- });
- }
-
- @Override
- public void onResume() {
- super.onResume();
- MetricsLogger.visibility(getContext(), MetricsEvent.TUNER_NIGHT_MODE, true);
- mNightModeController.addListener(this);
- TunerService.get(getContext()).addTunable(this, Secure.BRIGHTNESS_USE_TWILIGHT,
- NightModeController.NIGHT_MODE_ADJUST_TINT);
- calculateDisabled();
- }
-
- @Override
- public void onPause() {
- super.onPause();
- MetricsLogger.visibility(getContext(), MetricsEvent.TUNER_NIGHT_MODE, false);
- mNightModeController.removeListener(this);
- TunerService.get(getContext()).removeTunable(this);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final Boolean value = (Boolean) newValue;
- if (mAutoSwitch == preference) {
- MetricsLogger.action(getContext(), MetricsEvent.ACTION_TUNER_NIGHT_MODE_AUTO, value);
- mNightModeController.setAuto(value);
- } else if (mAdjustTint == preference) {
- MetricsLogger.action(getContext(),
- MetricsEvent.ACTION_TUNER_NIGHT_MODE_ADJUST_TINT, value);
- mNightModeController.setAdjustTint(value);
- postCalculateDisabled();
- } else if (mAdjustBrightness == preference) {
- MetricsLogger.action(getContext(),
- MetricsEvent.ACTION_TUNER_NIGHT_MODE_ADJUST_BRIGHTNESS, value);
- TunerService.get(getContext()).setValue(Secure.BRIGHTNESS_USE_TWILIGHT,
- value ? 1 : 0);
- postCalculateDisabled();
- } else {
- return false;
- }
- return true;
- }
-
- private void postCalculateDisabled() {
- // Post this because its the easiest way to wait for all state to be calculated.
- getView().post(new Runnable() {
- @Override
- public void run() {
- calculateDisabled();
- }
- });
- }
-
- private void calculateDisabled() {
- int enabledCount = (mAdjustTint.isChecked() ? 1 : 0)
- + (mAdjustBrightness.isChecked() ? 1 : 0);
- if (enabledCount == 1) {
- if (mAdjustTint.isChecked()) {
- mAdjustTint.setEnabled(false);
- } else {
- mAdjustBrightness.setEnabled(false);
- }
- } else {
- mAdjustTint.setEnabled(true);
- mAdjustBrightness.setEnabled(true);
- }
- }
-
- @Override
- public void onTuningChanged(String key, String newValue) {
- if (Secure.BRIGHTNESS_USE_TWILIGHT.equals(key)) {
- mAdjustBrightness.setChecked(newValue != null && Integer.parseInt(newValue) != 0);
- } else if (NightModeController.NIGHT_MODE_ADJUST_TINT.equals(key)) {
- // Default on.
- mAdjustTint.setChecked(newValue == null || Integer.parseInt(newValue) != 0);
- }
- }
-
- @Override
- public void onNightModeChanged() {
- mSwitch.setChecked(mNightModeController.isEnabled());
- }
-
- @Override
- public void onTwilightAutoChanged() {
- mAutoSwitch.setChecked(mNightModeController.isAuto());
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/NightModeTile.java b/packages/SystemUI/src/com/android/systemui/tuner/NightModeTile.java
deleted file mode 100644
index fe44502..0000000
--- a/packages/SystemUI/src/com/android/systemui/tuner/NightModeTile.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.systemui.tuner;
-
-import android.content.Intent;
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.systemui.Prefs;
-import com.android.systemui.Prefs.Key;
-import com.android.systemui.R;
-import com.android.systemui.qs.QSTile;
-import com.android.systemui.statusbar.policy.NightModeController;
-
-
-public class NightModeTile extends QSTile<QSTile.State> implements NightModeController.Listener {
-
- public static final String NIGHT_MODE_SPEC = "night";
-
- private final NightModeController mNightModeController;
-
- private int mIndex;
- private String mCurrentValue;
-
- private boolean mCustomEnabled;
- private String[] mValues;
- private CharSequence[] mValueTitles;
-
- public NightModeTile(Host host) {
- super(host);
- mNightModeController = host.getNightModeController();
- }
-
- @Override
- public boolean isAvailable() {
- return Prefs.getBoolean(mContext, Key.QS_NIGHT_ADDED, false)
- && TunerService.isTunerEnabled(mContext);
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- mNightModeController.addListener(this);
- refreshState();
- } else {
- mNightModeController.removeListener(this);
- }
- }
-
- @Override
- public State newTileState() {
- return new State();
- }
-
- @Override
- public Intent getLongClickIntent() {
- return new Intent(mContext, TunerActivity.class)
- .putExtra(NightModeFragment.EXTRA_SHOW_NIGHT_MODE, true);
- }
-
- @Override
- protected void handleClick() {
- mNightModeController.setNightMode(!mNightModeController.isEnabled());
- refreshState();
- }
-
- @Override
- public CharSequence getTileLabel() {
- return mContext.getString(R.string.night_mode);
- }
-
- @Override
- protected void handleUpdateState(State state, Object arg) {
- // TODO: Right now this is just a dropper, needs an actual night icon.
- boolean enabled = mNightModeController.isEnabled();
- state.icon = ResourceIcon.get(enabled ? R.drawable.ic_night_mode
- : R.drawable.ic_night_mode_disabled);
- state.label = mContext.getString(R.string.night_mode);
- state.contentDescription = mContext.getString(R.string.night_mode);
- }
-
- @Override
- public void onNightModeChanged() {
- refreshState();
- }
-
- @Override
- public void onTwilightAutoChanged() {
- // Don't care.
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.QS_COLOR_MATRIX;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
index 5e5da74..5fe9296 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
@@ -39,10 +39,7 @@
final String action = getIntent().getAction();
boolean showDemoMode = action != null && action.equals(
"com.android.settings.action.DEMO_MODE");
- boolean showNightMode = getIntent().getBooleanExtra(
- NightModeFragment.EXTRA_SHOW_NIGHT_MODE, false);
- final PreferenceFragment fragment = showNightMode ? new NightModeFragment()
- : showDemoMode ? new DemoModeFragment()
+ final PreferenceFragment fragment = showDemoMode ? new DemoModeFragment()
: new TunerFragment();
getFragmentManager().beginTransaction().replace(R.id.content_frame,
fragment, TAG_TUNER).commit();
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java
index cc0ffb0..1ea23bb 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java
@@ -54,7 +54,6 @@
mHeaderSwitch = findViewById(R.id.tuner_zen_switch);
mHeaderSwitch.setVisibility(View.VISIBLE);
mHeaderSwitch.setOnClickListener(this);
- mHeaderSwitch.findViewById(com.android.internal.R.id.up).setVisibility(View.GONE);
((TextView) mHeaderSwitch.findViewById(android.R.id.title)).setText(
R.string.quick_settings_dnd_label);
mZenModePanel = (ZenModePanel) findViewById(R.id.zen_mode_panel);
diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
index 30622d2..5e4854c 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
@@ -196,7 +196,23 @@
}
mInitialized = true;
mContext = context;
- Resources res = context.getResources();
+
+ mActivityManager = ActivityManagerNative.getDefault();
+ SystemServicesProxy.getInstance(context).registerTaskStackListener(mTaskStackListener);
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(Intent.ACTION_MEDIA_RESOURCE_GRANTED);
+ mContext.registerReceiver(mBroadcastReceiver, intentFilter);
+ mOnboardingShown = Prefs.getBoolean(
+ mContext, TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN, false);
+
+ loadConfigurationsAndApply();
+ mPipRecentsOverlayManager = new PipRecentsOverlayManager(context);
+ mMediaSessionManager =
+ (MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE);
+ }
+
+ private void loadConfigurationsAndApply() {
+ Resources res = mContext.getResources();
mDefaultPipBounds = Rect.unflattenFromString(res.getString(
com.android.internal.R.string.config_defaultPictureInPictureBounds));
mSettingsPipBounds = Rect.unflattenFromString(res.getString(
@@ -209,25 +225,19 @@
R.string.pip_recents_focused_bounds));
mRecentsFocusChangedAnimationDurationMs = res.getInteger(
R.integer.recents_tv_pip_focus_anim_duration);
- mPipBounds = mDefaultPipBounds;
- mActivityManager = ActivityManagerNative.getDefault();
- SystemServicesProxy.getInstance(context).registerTaskStackListener(mTaskStackListener);
- IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction(Intent.ACTION_MEDIA_RESOURCE_GRANTED);
- mContext.registerReceiver(mBroadcastReceiver, intentFilter);
- mOnboardingShown = Prefs.getBoolean(
- mContext, TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN, false);
-
- mPipRecentsOverlayManager = new PipRecentsOverlayManager(context);
- mMediaSessionManager =
- (MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE);
+ // Reset the PIP bounds and apply. PIP bounds can be changed by two reasons.
+ // 1. Configuration changed due to the language change (RTL <-> RTL)
+ // 2. SystemUI restarts after the crash
+ mPipBounds = isSettingsShown() ? mSettingsPipBounds : mDefaultPipBounds;
+ resizePinnedStack(getPinnedStackInfo() == null ? STATE_NO_PIP : STATE_PIP_OVERLAY);
}
/**
* Updates the PIP per configuration changed.
*/
void onConfigurationChanged() {
+ loadConfigurationsAndApply();
mPipRecentsOverlayManager.onConfigurationChanged(mContext);
}
@@ -443,6 +453,16 @@
return mState != STATE_NO_PIP;
}
+ private StackInfo getPinnedStackInfo() {
+ StackInfo stackInfo = null;
+ try {
+ stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
+ } catch (RemoteException e) {
+ Log.e(TAG, "getStackInfo failed", e);
+ }
+ return stackInfo;
+ }
+
private void handleMediaResourceGranted(String[] packageNames) {
if (mState == STATE_NO_PIP) {
mLastPackagesResourceGranted = packageNames;
@@ -525,10 +545,21 @@
return PLAYBACK_STATE_UNAVAILABLE;
}
- private static boolean isSettingsShown(ComponentName topActivity) {
+ private boolean isSettingsShown() {
+ List<RunningTaskInfo> runningTasks;
+ try {
+ runningTasks = mActivityManager.getTasks(1, 0);
+ if (runningTasks == null || runningTasks.size() == 0) {
+ return false;
+ }
+ } catch (RemoteException e) {
+ Log.d(TAG, "Failed to detect top activity", e);
+ return false;
+ }
+ ComponentName topActivity = runningTasks.get(0).topActivity;
for (Pair<String, String> componentName : sSettingsPackageAndClassNamePairList) {
String packageName = componentName.first;
- if (topActivity.getPackageName().equals(componentName.first)) {
+ if (topActivity.getPackageName().equals(packageName)) {
String className = componentName.second;
if (className == null || topActivity.getClassName().equals(className)) {
return true;
@@ -544,16 +575,10 @@
if (mState != STATE_NO_PIP) {
boolean hasPip = false;
- StackInfo stackInfo = null;
- try {
- stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
- if (stackInfo == null) {
- Log.w(TAG, "There is no pinned stack");
- closePipInternal(false);
- return;
- }
- } catch (RemoteException e) {
- Log.e(TAG, "getStackInfo failed", e);
+ StackInfo stackInfo = getPinnedStackInfo();
+ if (stackInfo == null || stackInfo.taskIds == null) {
+ Log.w(TAG, "There is nothing in pinned stack");
+ closePipInternal(false);
return;
}
for (int i = stackInfo.taskIds.length - 1; i >= 0; --i) {
@@ -570,20 +595,10 @@
}
}
if (mState == STATE_PIP_OVERLAY) {
- try {
- List<RunningTaskInfo> runningTasks = mActivityManager.getTasks(1, 0);
- if (runningTasks == null || runningTasks.size() == 0) {
- return;
- }
- RunningTaskInfo topTask = runningTasks.get(0);
- Rect bounds = isSettingsShown(topTask.topActivity)
- ? mSettingsPipBounds : mDefaultPipBounds;
- if (mPipBounds != bounds) {
- mPipBounds = bounds;
- resizePinnedStack(STATE_PIP_OVERLAY);
- }
- } catch (RemoteException e) {
- Log.d(TAG, "Failed to detect top activity", e);
+ Rect bounds = isSettingsShown() ? mSettingsPipBounds : mDefaultPipBounds;
+ if (mPipBounds != bounds) {
+ mPipBounds = bounds;
+ resizePinnedStack(STATE_PIP_OVERLAY);
}
}
}
@@ -591,15 +606,9 @@
@Override
public void onActivityPinned() {
if (DEBUG) Log.d(TAG, "onActivityPinned()");
- StackInfo stackInfo = null;
- try {
- stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
- if (stackInfo == null) {
- Log.w(TAG, "Cannot find pinned stack");
- return;
- }
- } catch (RemoteException e) {
- Log.e(TAG, "getStackInfo failed", e);
+ StackInfo stackInfo = getPinnedStackInfo();
+ if (stackInfo == null) {
+ Log.w(TAG, "Cannot find pinned stack");
return;
}
if (DEBUG) Log.d(TAG, "PINNED_STACK:" + stackInfo);
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
index af6fec2..f17c187 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -216,6 +216,9 @@
mExpanded = false;
mExpandButton = (ImageButton) mDialogView.findViewById(R.id.volume_expand_button);
mExpandButton.setOnClickListener(mClickExpand);
+
+ mExpandButton.setVisibility(
+ AudioSystem.isSingleVolume(mContext) ? View.GONE : View.VISIBLE);
updateWindowWidthH();
updateExpandButtonH();
@@ -237,18 +240,21 @@
});
if (mRows.isEmpty()) {
- addRow(AudioManager.STREAM_RING,
- R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, true);
addRow(AudioManager.STREAM_MUSIC,
R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, true);
- addRow(AudioManager.STREAM_ALARM,
- R.drawable.ic_volume_alarm, R.drawable.ic_volume_alarm_mute, false);
- addRow(AudioManager.STREAM_VOICE_CALL,
- R.drawable.ic_volume_voice, R.drawable.ic_volume_voice, false);
- addRow(AudioManager.STREAM_BLUETOOTH_SCO,
- R.drawable.ic_volume_bt_sco, R.drawable.ic_volume_bt_sco, false);
- addRow(AudioManager.STREAM_SYSTEM,
- R.drawable.ic_volume_system, R.drawable.ic_volume_system_mute, false);
+ if (!AudioSystem.isSingleVolume(mContext)) {
+ addRow(AudioManager.STREAM_RING,
+ R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, true);
+
+ addRow(AudioManager.STREAM_ALARM,
+ R.drawable.ic_volume_alarm, R.drawable.ic_volume_alarm_mute, false);
+ addRow(AudioManager.STREAM_VOICE_CALL,
+ R.drawable.ic_volume_voice, R.drawable.ic_volume_voice, false);
+ addRow(AudioManager.STREAM_BLUETOOTH_SCO,
+ R.drawable.ic_volume_bt_sco, R.drawable.ic_volume_bt_sco, false);
+ addRow(AudioManager.STREAM_SYSTEM,
+ R.drawable.ic_volume_system, R.drawable.ic_volume_system_mute, false);
+ }
} else {
addExistingRows();
}
@@ -973,6 +979,7 @@
mDialog.dismiss();
mZenFooter.cleanup();
initDialog();
+ mDensity = density;
}
updateWindowWidthH();
mSpTexts.update();
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
index f01e95f..995ecae 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
@@ -124,12 +124,8 @@
: null;
Util.setText(mSummaryLine1, line1);
- final boolean isForever = mConfig != null && mConfig.manualRule != null
- && mConfig.manualRule.conditionId == null;
- final CharSequence line2 =
- isForever ? mContext.getString(com.android.internal.R.string.zen_mode_forever_dnd)
- : ZenModeConfig.getConditionSummary(mContext, mConfig, mController.getCurrentUser(),
- true /*shortVersion*/);
+ final CharSequence line2 = ZenModeConfig.getConditionSummary(mContext, mConfig,
+ mController.getCurrentUser(), true /*shortVersion*/);
Util.setText(mSummaryLine2, line2);
}
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index 6c39e35..2020abb 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -15,6 +15,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := tests
LOCAL_JACK_FLAGS := --multi-dex native
@@ -23,37 +24,31 @@
LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/..
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages com.android.systemui:com.android.keyguard:android.support.v14.preference:android.support.v7.preference:android.support.v7.appcompat:android.support.v7.recyclerview \
- --extra-packages android.support.v17.leanback
+LOCAL_PACKAGE_NAME := SystemUITests
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-Iaidl-files-under, src) \
$(call all-java-files-under, ../src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
- frameworks/support/v7/preference/res \
- frameworks/support/v14/preference/res \
- frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res \
- frameworks/support/v17/leanback/res \
frameworks/base/packages/SystemUI/res \
- frameworks/base/packages/Keyguard/res
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car
-
-LOCAL_PACKAGE_NAME := SystemUITests
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- mockito-target \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
Keyguard \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
android-support-v14-preference \
- android-support-v17-leanback \
+ android-support-v17-leanback
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ mockito-target \
SystemUI-proto-tags
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car
+
+LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui
+
# sign this with platform cert, so this test is allowed to inject key events into
# UI it doesn't own. This is necessary to allow screenshots to be taken
LOCAL_CERTIFICATE := platform
diff --git a/packages/SystemUI/tests/src/com/android/systemui/phone/DozeParametersTests.java b/packages/SystemUI/tests/src/com/android/systemui/phone/DozeParametersTests.java
new file mode 100644
index 0000000..07334f3
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/phone/DozeParametersTests.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.systemui.phone;
+
+import com.android.systemui.statusbar.phone.DozeParameters.IntInOutMatcher;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+@SmallTest
+public class DozeParametersTests extends AndroidTestCase {
+
+ public void test_inOutMatcher_defaultIn() {
+ IntInOutMatcher intInOutMatcher = new IntInOutMatcher("*");
+
+ assertTrue(intInOutMatcher.isIn(1));
+ assertTrue(intInOutMatcher.isIn(-1));
+ assertTrue(intInOutMatcher.isIn(0));
+ }
+
+ public void test_inOutMatcher_defaultOut() {
+ IntInOutMatcher intInOutMatcher = new IntInOutMatcher("!*");
+
+ assertFalse(intInOutMatcher.isIn(1));
+ assertFalse(intInOutMatcher.isIn(-1));
+ assertFalse(intInOutMatcher.isIn(0));
+ }
+
+ public void test_inOutMatcher_someIn() {
+ IntInOutMatcher intInOutMatcher = new IntInOutMatcher("1,2,3,!*");
+
+ assertTrue(intInOutMatcher.isIn(1));
+ assertTrue(intInOutMatcher.isIn(2));
+ assertTrue(intInOutMatcher.isIn(3));
+
+ assertFalse(intInOutMatcher.isIn(0));
+ assertFalse(intInOutMatcher.isIn(4));
+ }
+
+ public void test_inOutMatcher_someOut() {
+ IntInOutMatcher intInOutMatcher = new IntInOutMatcher("!1,!2,!3,*");
+
+ assertFalse(intInOutMatcher.isIn(1));
+ assertFalse(intInOutMatcher.isIn(2));
+ assertFalse(intInOutMatcher.isIn(3));
+
+ assertTrue(intInOutMatcher.isIn(0));
+ assertTrue(intInOutMatcher.isIn(4));
+ }
+
+ public void test_inOutMatcher_mixed() {
+ IntInOutMatcher intInOutMatcher = new IntInOutMatcher("!1,2,!3,*");
+
+ assertFalse(intInOutMatcher.isIn(1));
+ assertTrue(intInOutMatcher.isIn(2));
+ assertFalse(intInOutMatcher.isIn(3));
+
+ assertTrue(intInOutMatcher.isIn(0));
+ assertTrue(intInOutMatcher.isIn(4));
+ }
+
+ public void test_inOutMatcher_failEmpty() {
+ try {
+ new IntInOutMatcher("");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failNull() {
+ try {
+ new IntInOutMatcher(null);
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failEmptyClause() {
+ try {
+ new IntInOutMatcher("!1,*,");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failDuplicate() {
+ try {
+ new IntInOutMatcher("!1,*,!1");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failDuplicateDefault() {
+ try {
+ new IntInOutMatcher("!1,*,*");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failMalformedNot() {
+ try {
+ new IntInOutMatcher("!,*");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failText() {
+ try {
+ new IntInOutMatcher("!abc,*");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failContradiction() {
+ try {
+ new IntInOutMatcher("1,!1,*");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failContradictionDefault() {
+ try {
+ new IntInOutMatcher("1,*,!*");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void test_inOutMatcher_failMissingDefault() {
+ try {
+ new IntInOutMatcher("1");
+ fail("Expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTests.java b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTests.java
index c93377a..7703c58 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTests.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTests.java
@@ -58,7 +58,7 @@
mHandler = new Handler(mThread.getLooper());
ComponentName component = new ComponentName(mContext, FakeTileService.class);
mStateManager = new TileLifecycleManager(mHandler, getContext(),
- Mockito.mock(IQSService.class), new Tile(component),
+ Mockito.mock(IQSService.class), new Tile(),
new Intent().setComponent(component),
new UserHandle(UserHandle.myUserId()));
mCallbacks.clear();
diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
index 47d1493..402d9ad 100644
--- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
+++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
@@ -16,17 +16,21 @@
package com.android.wallpaperbackup;
+import static android.app.WallpaperManager.FLAG_LOCK;
+import static android.app.WallpaperManager.FLAG_SYSTEM;
+
import android.app.WallpaperManager;
import android.app.backup.BackupAgent;
import android.app.backup.BackupDataInput;
import android.app.backup.BackupDataOutput;
import android.app.backup.FullBackupDataOutput;
import android.content.Context;
+import android.content.SharedPreferences;
import android.graphics.Rect;
import android.os.Environment;
+import android.os.FileUtils;
import android.os.ParcelFileDescriptor;
import android.os.UserHandle;
-import android.system.Os;
import android.util.Slog;
import android.util.Xml;
@@ -47,15 +51,28 @@
// Target filenames within the system's wallpaper directory
static final String WALLPAPER = "wallpaper_orig";
+ static final String WALLPAPER_LOCK = "wallpaper_lock_orig";
static final String WALLPAPER_INFO = "wallpaper_info.xml";
// Names of our local-data stage files/links
static final String IMAGE_STAGE = "wallpaper-stage";
+ static final String LOCK_IMAGE_STAGE = "wallpaper-lock-stage";
static final String INFO_STAGE = "wallpaper-info-stage";
static final String EMPTY_SENTINEL = "empty";
+ static final String QUOTA_SENTINEL = "quota";
- private File mWallpaperInfo; // wallpaper metadata file
- private File mWallpaperFile; // primary wallpaper image file
+ // Not-for-backup bookkeeping
+ static final String PREFS_NAME = "wbprefs.xml";
+ static final String SYSTEM_GENERATION = "system_gen";
+ static final String LOCK_GENERATION = "lock_gen";
+
+ private File mWallpaperInfo; // wallpaper metadata file
+ private File mWallpaperFile; // primary wallpaper image file
+ private File mLockWallpaperFile; // lock wallpaper image file
+
+ // If this file exists, it means we exceeded our quota last time
+ private File mQuotaFile;
+ private boolean mQuotaExceeded;
private WallpaperManager mWm;
@@ -68,7 +85,14 @@
File wallpaperDir = Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM);
mWallpaperInfo = new File(wallpaperDir, WALLPAPER_INFO);
mWallpaperFile = new File(wallpaperDir, WALLPAPER);
+ mLockWallpaperFile = new File(wallpaperDir, WALLPAPER_LOCK);
mWm = (WallpaperManager) getSystemService(Context.WALLPAPER_SERVICE);
+
+ mQuotaFile = new File(getFilesDir(), QUOTA_SENTINEL);
+ mQuotaExceeded = mQuotaFile.exists();
+ if (DEBUG) {
+ Slog.v(TAG, "quota file " + mQuotaFile.getPath() + " exists=" + mQuotaExceeded);
+ }
}
@Override
@@ -77,6 +101,7 @@
final File filesDir = getFilesDir();
final File infoStage = new File(filesDir, INFO_STAGE);
final File imageStage = new File (filesDir, IMAGE_STAGE);
+ final File lockImageStage = new File (filesDir, LOCK_IMAGE_STAGE);
final File empty = new File (filesDir, EMPTY_SENTINEL);
try {
@@ -90,30 +115,75 @@
// only back up the wallpaper if we've been told it's allowed
if (mWm.isWallpaperBackupEligible()) {
if (DEBUG) {
- Slog.v(TAG, "Wallpaper is backup-eligible; linking & writing");
+ Slog.v(TAG, "Wallpaper is backup-eligible");
}
- // In case of prior muddled state
- infoStage.delete();
- imageStage.delete();
+ SharedPreferences prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ final int lastSysGeneration = prefs.getInt(SYSTEM_GENERATION, -1);
+ final int lastLockGeneration = prefs.getInt(LOCK_GENERATION, -1);
- Os.link(mWallpaperInfo.getCanonicalPath(), infoStage.getCanonicalPath());
- fullBackupFile(infoStage, data);
- Os.link(mWallpaperFile.getCanonicalPath(), imageStage.getCanonicalPath());
- fullBackupFile(imageStage, data);
+ final int sysGeneration =
+ mWm.getWallpaperIdForUser(FLAG_SYSTEM, UserHandle.USER_SYSTEM);
+ final int lockGeneration =
+ mWm.getWallpaperIdForUser(FLAG_LOCK, UserHandle.USER_SYSTEM);
+ final boolean sysChanged = (sysGeneration != lastSysGeneration);
+ final boolean lockChanged = (lockGeneration != lastLockGeneration);
+
+ if (DEBUG) {
+ Slog.v(TAG, "sysGen=" + sysGeneration + " : sysChanged=" + sysChanged);
+ Slog.v(TAG, "lockGen=" + lockGeneration + " : lockChanged=" + lockChanged);
+ }
+ if (mWallpaperInfo.exists()) {
+ if (sysChanged || lockChanged || !infoStage.exists()) {
+ if (DEBUG) Slog.v(TAG, "New wallpaper configuration; copying");
+ FileUtils.copyFileOrThrow(mWallpaperInfo, infoStage);
+ }
+ fullBackupFile(infoStage, data);
+ }
+ if (mWallpaperFile.exists()) {
+ if (sysChanged || !imageStage.exists()) {
+ if (DEBUG) Slog.v(TAG, "New system wallpaper; copying");
+ FileUtils.copyFileOrThrow(mWallpaperFile, imageStage);
+ }
+ fullBackupFile(imageStage, data);
+ prefs.edit().putInt(SYSTEM_GENERATION, sysGeneration).apply();
+ }
+
+ // Don't try to store the lock image if we overran our quota last time
+ if (mLockWallpaperFile.exists() && !mQuotaExceeded) {
+ if (lockChanged || !lockImageStage.exists()) {
+ if (DEBUG) Slog.v(TAG, "New lock wallpaper; copying");
+ FileUtils.copyFileOrThrow(mLockWallpaperFile, lockImageStage);
+ }
+ fullBackupFile(lockImageStage, data);
+ prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply();
+ }
} else {
if (DEBUG) {
Slog.v(TAG, "Wallpaper not backup-eligible; writing no data");
}
}
} catch (Exception e) {
- Slog.e(TAG, "Unable to back up wallpaper: " + e.getMessage());
+ Slog.e(TAG, "Unable to back up wallpaper", e);
} finally {
- if (DEBUG) {
- Slog.v(TAG, "Removing backup stage links");
- }
- infoStage.delete();
- imageStage.delete();
+ // Even if this time we had to back off on attempting to store the lock image
+ // due to exceeding the data quota, try again next time. This will alternate
+ // between "try both" and "only store the primary image" until either there
+ // is no lock image to store, or the quota is raised, or both fit under the
+ // quota.
+ mQuotaFile.delete();
+ }
+ }
+
+ @Override
+ public void onQuotaExceeded(long backupDataBytes, long quotaBytes) {
+ if (DEBUG) {
+ Slog.i(TAG, "Quota exceeded (" + backupDataBytes + " vs " + quotaBytes + ')');
+ }
+ try (FileOutputStream f = new FileOutputStream(mQuotaFile)) {
+ f.write(0);
+ } catch (Exception e) {
+ Slog.w(TAG, "Unable to record quota-exceeded: " + e.getMessage());
}
}
@@ -124,42 +194,57 @@
if (DEBUG) {
Slog.v(TAG, "onRestoreFinished()");
}
- final File infoStage = new File(getFilesDir(), INFO_STAGE);
- final File imageStage = new File (getFilesDir(), IMAGE_STAGE);
+ final File filesDir = getFilesDir();
+ final File infoStage = new File(filesDir, INFO_STAGE);
+ final File imageStage = new File (filesDir, IMAGE_STAGE);
+ final File lockImageStage = new File (filesDir, LOCK_IMAGE_STAGE);
try {
- // It is valid for the imagery to be absent; it means that we were not permitted
- // to back up the original image on the source device.
- if (imageStage.exists()) {
- if (DEBUG) {
- Slog.v(TAG, "Got restored wallpaper; applying");
- }
+ // First off, revert to the factory state
+ mWm.clear(WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
- // Parse the restored info file to find the crop hint. Note that this currently
- // relies on a priori knowledge of the wallpaper info file schema.
- Rect cropHint = parseCropHint(infoStage);
- if (cropHint != null) {
- if (DEBUG) {
- Slog.v(TAG, "Restored crop hint " + cropHint + "; now writing data");
- }
- WallpaperManager wm = getSystemService(WallpaperManager.class);
- try (FileInputStream in = new FileInputStream(imageStage)) {
- wm.setStream(in, cropHint, true, WallpaperManager.FLAG_SYSTEM);
- } finally {} // auto-closes 'in'
- }
- }
+ // It is valid for the imagery to be absent; it means that we were not permitted
+ // to back up the original image on the source device, or there was no user-supplied
+ // wallpaper image present.
+ restoreFromStage(imageStage, infoStage, "wp", WallpaperManager.FLAG_SYSTEM);
+ restoreFromStage(lockImageStage, infoStage, "kwp", WallpaperManager.FLAG_LOCK);
} catch (Exception e) {
Slog.e(TAG, "Unable to restore wallpaper: " + e.getMessage());
} finally {
if (DEBUG) {
- Slog.v(TAG, "Removing restore stage files");
+ Slog.v(TAG, "Restore finished; clearing backup bookkeeping");
}
infoStage.delete();
imageStage.delete();
+ lockImageStage.delete();
+
+ SharedPreferences prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ prefs.edit()
+ .putInt(SYSTEM_GENERATION, -1)
+ .putInt(LOCK_GENERATION, -1)
+ .commit();
}
}
- private Rect parseCropHint(File wallpaperInfo) {
+ private void restoreFromStage(File stage, File info, String hintTag, int which)
+ throws IOException {
+ if (stage.exists()) {
+ // Parse the restored info file to find the crop hint. Note that this currently
+ // relies on a priori knowledge of the wallpaper info file schema.
+ Rect cropHint = parseCropHint(info, hintTag);
+ if (cropHint != null) {
+ Slog.i(TAG, "Got restored wallpaper; applying which=" + which);
+ if (DEBUG) {
+ Slog.v(TAG, "Restored crop hint " + cropHint);
+ }
+ try (FileInputStream in = new FileInputStream(stage)) {
+ mWm.setStream(in, cropHint, true, which);
+ } finally {} // auto-closes 'in'
+ }
+ }
+ }
+
+ private Rect parseCropHint(File wallpaperInfo, String sectionTag) {
Rect cropHint = new Rect();
try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {
XmlPullParser parser = Xml.newPullParser();
@@ -170,7 +255,7 @@
type = parser.next();
if (type == XmlPullParser.START_TAG) {
String tag = parser.getName();
- if ("wp".equals(tag)) {
+ if (sectionTag.equals(tag)) {
cropHint.left = getAttributeInt(parser, "cropLeft", 0);
cropHint.top = getAttributeInt(parser, "cropTop", 0);
cropHint.right = getAttributeInt(parser, "cropRight", 0);
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 308578d..41576bf 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -33,73 +33,61 @@
// OPEN: Settings > Accessibility
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCESSIBILITY = 2;
// OPEN: Settings > Accessibility > Captions
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCESSIBILITY_CAPTION_PROPERTIES = 3;
// OPEN: Settings > Accessibility > [Service]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCESSIBILITY_SERVICE = 4;
// OPEN: Settings > Accessibility > Color correction
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCESSIBILITY_TOGGLE_DALTONIZER = 5;
// OPEN: Settings > Accessibility > Accessibility shortcut
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE = 6;
// OPEN: Settings > Accessibility > Magnification gestures
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION = 7;
// OPEN: Settings > Accounts
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCOUNT = 8;
// OPEN: Settings > Accounts > [Single Account Sync Settings]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCOUNTS_ACCOUNT_SYNC = 9;
// OPEN: Settings > Accounts > Add an account
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY = 10;
// OPEN: Settings > Accounts > [List of accounts when more than one]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACCOUNTS_MANAGE_ACCOUNTS = 11;
// OPEN: Settings > Cellular network settings > APNs
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APN = 12;
// OPEN: Settings > More > Cellular network settings > APNs > [Edit APN]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APN_EDITOR = 13;
// OBSOLETE
@@ -114,7 +102,6 @@
// OPEN: Settings > Apps > Configure apps > App links > [App]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_APP_LAUNCH = 17;
// OBSOLETE
@@ -123,19 +110,16 @@
// OPEN: Settings > Internal storage > Apps storage > [App]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_APP_STORAGE = 19;
// OPEN: Settings > Apps > [App info]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_INSTALLED_APP_DETAILS = 20;
// OPEN: Settings > Memory > App usage > [App Memory usage]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_PROCESS_STATS_DETAIL = 21;
// OBSOLETE
@@ -144,19 +128,16 @@
// OPEN: Settings > Memory > App usage
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_PROCESS_STATS_UI = 23;
// OPEN: Settings > Bluetooth
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
BLUETOOTH = 24;
// OPEN: Choose Bluetooth device (ex: when sharing)
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
BLUETOOTH_DEVICE_PICKER = 25;
// OBSOLETE
@@ -165,55 +146,46 @@
// OPEN: Settings > Security > Choose screen lock
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CHOOSE_LOCK_GENERIC = 27;
// OPEN: Settings > Security > Choose screen lock > Choose your password
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CHOOSE_LOCK_PASSWORD = 28;
// OPEN: Settings > Security > Choose screen lock > Choose your pattern
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CHOOSE_LOCK_PATTERN = 29;
// OPEN: Settings > Security > Choose screen lock > Confirm your password
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CONFIRM_LOCK_PASSWORD = 30;
// OPEN: Settings > Security > Choose screen lock > Confirm your pattern
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CONFIRM_LOCK_PATTERN = 31;
// OPEN: Settings > Security > Encrypt phone
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CRYPT_KEEPER = 32;
// OPEN: Settings > Security > Encrypt phone > Confirm
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
CRYPT_KEEPER_CONFIRM = 33;
// OPEN: Settings > Search results
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DASHBOARD_SEARCH_RESULTS = 34;
// OPEN: Settings (Root page)
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DASHBOARD_SUMMARY = 35;
// OBSOLETE
@@ -222,49 +194,41 @@
// OPEN: Settings > Data usage
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DATA_USAGE_SUMMARY = 37;
// OPEN: Settings > Date & time
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DATE_TIME = 38;
// OPEN: Settings > Developer options
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DEVELOPMENT = 39;
// OPEN: Settings > About phone
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DEVICEINFO = 40;
// OPEN: Settings > About phone > Status > IMEI information
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DEVICEINFO_IMEI_INFORMATION = 41;
// OPEN: Settings > Internal storage
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DEVICEINFO_STORAGE = 42;
// OPEN: Settings > About phone > Status > SIM status
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DEVICEINFO_SIM_STATUS = 43;
// OPEN: Settings > About phone > Status
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DEVICEINFO_STATUS = 44;
// OBSOLETE
@@ -273,25 +237,21 @@
// OPEN: Settings > Display
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DISPLAY = 46;
// OPEN: Settings > Display > Daydream
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
DREAM = 47;
// OPEN: Settings > Security > Screen lock > Secure start-up
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ENCRYPTION = 48;
// OPEN: Settings > Security > Nexus Imprint
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
FINGERPRINT = 49;
// OBSOLETE
@@ -300,55 +260,46 @@
// OPEN: Settings > Battery > History details
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
FUELGAUGE_BATTERY_HISTORY_DETAIL = 51;
// OPEN: Settings > Battery > Battery saver
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
FUELGAUGE_BATTERY_SAVER = 52;
// OPEN: Settings > Battery > [App Use details]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
FUELGAUGE_POWER_USAGE_DETAIL = 53;
// OPEN: Settings > Battery
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
FUELGAUGE_POWER_USAGE_SUMMARY = 54;
// OPEN: Settings > Home
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
HOME = 55;
// OPEN: Settings > Security > SIM card lock settings
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ICC_LOCK = 56;
// OPEN: Settings > Language & input
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
INPUTMETHOD_LANGUAGE = 57;
// OPEN: Settings > Language & input > Physical keyboard
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
INPUTMETHOD_KEYBOARD = 58;
// OPEN: Settings > Language & input > Spell checker
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
INPUTMETHOD_SPELL_CHECKERS = 59;
// OBSOLETE
@@ -357,79 +308,66 @@
// OPEN: Settings > Language & input > Personal dictionary
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
INPUTMETHOD_USER_DICTIONARY = 61;
// OPEN: Settings > Language & input > Add word
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
INPUTMETHOD_USER_DICTIONARY_ADD_WORD = 62;
// OPEN: Settings > Location
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
LOCATION = 63;
// OPEN: Settings > Location > Location mode
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
LOCATION_MODE = 64;
// OPEN: Settings > Apps
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
MANAGE_APPLICATIONS = 65;
// OPEN: Settings > Backup & reset > Factory data reset
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
MASTER_CLEAR = 66;
// OPEN: Settings > Backup & reset > Factory data reset > Confirm
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
MASTER_CLEAR_CONFIRM = 67;
// OPEN: Settings > Data usage > Network restrictions
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NET_DATA_USAGE_METERED = 68;
// OPEN: Settings > More > Android Beam
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NFC_BEAM = 69;
// OPEN: Settings > Tap & pay
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NFC_PAYMENT = 70;
// OPEN: Settings > Sound & notification
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION = 71;
// OPEN: Settings > Sound & notification > App notifications > [App]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_APP_NOTIFICATION = 72;
// OPEN: Settings > Sound & notification > Other sounds
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_OTHER_SOUND = 73;
// OBSOLETE
@@ -438,13 +376,11 @@
// OPEN: Settings Widget > Notification log
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_STATION = 75;
// OPEN: Settings > Sound & notification > Do not disturb
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE = 76;
// OPEN: OBSOLETE
@@ -453,25 +389,21 @@
// OPEN: Print job notification > Print job settings
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
PRINT_JOB_SETTINGS = 78;
// OPEN: Settings > Printing > [Print Service]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
PRINT_SERVICE_SETTINGS = 79;
// OPEN: Settings > Printing
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
PRINT_SETTINGS = 80;
// OPEN: Settings > Backup & reset
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
PRIVACY = 81;
//OBSOLETE
@@ -480,37 +412,31 @@
// OPEN: Settings > Backup & reset > Network settings reset
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
RESET_NETWORK = 83;
// OPEN: Settings > Backup & reset > Network settings reset > Confirm
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
RESET_NETWORK_CONFIRM = 84;
// OPEN: Settings > Developer Options > Running Services
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
RUNNING_SERVICE_DETAILS = 85;
// OPEN: Settings > Security > Screen pinning
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
SCREEN_PINNING = 86;
// OPEN: Settings > Security
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
SECURITY = 87;
// OPEN: Settings > SIM cards
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
SIM = 88;
// OBSOLETE
@@ -519,55 +445,46 @@
// OPEN: Settings > More > Tethering & portable hotspot
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TETHER = 90;
// OPEN: Settings > Security > Trust agents
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TRUST_AGENT = 91;
// OPEN: Settings > Security > Trusted credentials
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TRUSTED_CREDENTIALS = 92;
// OPEN: Settings > Language & input > TTS output > [Engine] > Settings
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TTS_ENGINE_SETTINGS = 93;
// OPEN: Settings > Language & input > Text-to-speech output
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TTS_TEXT_TO_SPEECH = 94;
// OPEN: Settings > Security > Apps with usage access
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
USAGE_ACCESS = 95;
// OPEN: Settings > Users
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
USER = 96;
// OPEN: Settings > Users > [Restricted profile app & content access]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
USERS_APP_RESTRICTIONS = 97;
// OPEN: Settings > Users > [User settings]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
USER_DETAILS = 98;
// OBSOLETE
@@ -576,43 +493,36 @@
// OPEN: Settings > More > VPN
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
VPN = 100;
// OPEN: Settings > Display > Choose wallpaper from
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WALLPAPER_TYPE = 101;
// OPEN: Settings > Display > Cast
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WFD_WIFI_DISPLAY = 102;
// OPEN: Settings > Wi-Fi
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WIFI = 103;
// OPEN: Settings > Wi-Fi > Advanced Wi-Fi
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WIFI_ADVANCED = 104;
// OPEN: Settings > More > Wi-Fi Calling
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WIFI_CALLING = 105;
// OPEN: Settings > Wi-Fi > Saved networks
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WIFI_SAVED_ACCESS_POINTS = 106;
// OBSOLETE
@@ -624,19 +534,16 @@
// OPEN: Settings > Wi-Fi > Advanced Wi-Fi > Wi-Fi Direct
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WIFI_P2P = 109;
// OPEN: Settings > More
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
WIRELESS = 110;
// OPEN: Quick Settings Panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_PANEL = 111;
// OPEN: QS Airplane mode tile shown
@@ -644,7 +551,6 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_AIRPLANEMODE = 112;
// OPEN: QS Bluetooth tile shown
@@ -652,21 +558,18 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_BLUETOOTH = 113;
// OPEN: QS Cast tile shown
// ACTION: QS Cast tile tapped
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_CAST = 114;
// OPEN: QS Cellular tile shown
// ACTION: QS Cellular tile tapped
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_CELLULAR = 115;
// OPEN: QS Color inversion tile shown
@@ -674,13 +577,11 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_COLORINVERSION = 116;
// OPEN: QS Cellular tile > Cellular detail panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_DATAUSAGEDETAIL = 117;
// OPEN: QS Do not disturb tile shown
@@ -688,7 +589,6 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_DND = 118;
// OPEN: QS Flashlight tile shown
@@ -696,7 +596,6 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_FLASHLIGHT = 119;
// OPEN: QS Hotspot tile shown
@@ -704,14 +603,12 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_HOTSPOT = 120;
// OPEN: QS 3P tile shown
// ACTION: QS 3P tile tapped
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_INTENT = 121;
// OPEN: QS Location tile shown
@@ -719,7 +616,6 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_LOCATION = 122;
// OPEN: QS Rotation tile shown
@@ -727,7 +623,6 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_ROTATIONLOCK = 123;
// OBSOLETE
@@ -736,7 +631,6 @@
// OPEN: QS User list panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_USERDETAIL = 125;
// OPEN: QS WiFi tile shown
@@ -744,13 +638,11 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.46
QS_WIFI = 126;
// OPEN: Notification Panel (including lockscreen)
// CATEGORY: NOTIFICATION
// OS: 5.1.1
- // GMS: 7.5.26
NOTIFICATION_PANEL = 127;
// OPEN: Notification in panel became visible.
@@ -764,7 +656,6 @@
// SUBTYPE: Dismiss reason from NotificationManagerService.java
// CATEGORY: NOTIFICATION
// OS: 5.1.1
- // GMS: 7.5.26
NOTIFICATION_ITEM = 128;
// ACTION: User tapped notification action
@@ -772,19 +663,16 @@
// SUBTYPE: Index of action on notification
// CATEGORY: NOTIFICATION
// OS: 5.0
- // GMS: 7.5.26
NOTIFICATION_ITEM_ACTION = 129;
// OPEN: Settings > Apps > Configure apps > App permissions
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_ADVANCED = 130;
// OPEN: Settings > Location > Scanning
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
LOCATION_SCANNING = 131;
// OBSOLETE
@@ -793,43 +681,36 @@
// OPEN: Settings > Sound & notification > App notifications
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
MANAGE_APPLICATIONS_NOTIFICATIONS = 133;
// ACTION: Settings > Wi-Fi > Overflow > Add Network
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_WIFI_ADD_NETWORK = 134;
// ACTION: Settings > Wi-Fi > [Long press network] > Connect to network
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_WIFI_CONNECT = 135;
// ACTION: Settings > Wi-Fi > Overflow > Refresh
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_WIFI_FORCE_SCAN = 136;
// ACTION: Settings > Wi-Fi > [Long press network] > Forget network
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_WIFI_FORGET = 137;
// ACTION: Settings > Wi-Fi > Toggle off
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_WIFI_OFF = 138;
// ACTION: Settings > Wi-Fi > Toggle on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_WIFI_ON = 139;
// OBSOLETE
@@ -838,280 +719,236 @@
// OPEN: Settings > Sound & notification > DND > Priority only allows
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE_PRIORITY = 141;
// OPEN: Settings > Sound & notification > DND > Automatic rules
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE_AUTOMATION = 142;
// OPEN: Settings > Apps > Configure apps > App links
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
MANAGE_DOMAIN_URLS = 143;
// OPEN: Settings > Sound & notification > DND > [Time based rule]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE_SCHEDULE_RULE = 144;
// OPEN: Settings > Sound & notification > DND > [External rule]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE_EXTERNAL_RULE = 145;
// OPEN: Settings > Sound & notification > DND > [Event rule]
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE_EVENT_RULE = 146;
// ACTION: App notification settings > Block Notifications
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BAN_APP_NOTES = 147;
// ACTION: Notification shade > Dismiss all button
// CATEGORY: NOTIFICATION
// OS: 6.0
- // GMS: 7.5.26
ACTION_DISMISS_ALL_NOTES = 148;
// OPEN: QS Do Not Disturb detail panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_DND_DETAILS = 149;
// OPEN: QS Bluetooth detail panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_BLUETOOTH_DETAILS = 150;
// OPEN: QS Cast detail panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_CAST_DETAILS = 151;
// OPEN: QS Wi-Fi detail panel
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_WIFI_DETAILS = 152;
// ACTION: QS Wi-Fi detail panel > Wi-Fi toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_WIFI_TOGGLE = 153;
// ACTION: QS Bluetooth detail panel > Bluetooth toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_BLUETOOTH_TOGGLE = 154;
// ACTION: QS Cellular detail panel > Cellular toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_CELLULAR_TOGGLE = 155;
// ACTION: QS User list panel > Select different user
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_SWITCH_USER = 156;
// ACTION: QS Cast detail panel > Select cast device
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_CAST_SELECT = 157;
// ACTION: QS Cast detail panel > Disconnect cast device
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_CAST_DISCONNECT = 158;
// ACTION: Settings > Bluetooth > Toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BLUETOOTH_TOGGLE = 159;
// ACTION: Settings > Bluetooth > Overflow > Refresh
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BLUETOOTH_SCAN = 160;
// ACTION: Settings > Bluetooth > Overflow > Rename this device
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BLUETOOTH_RENAME = 161;
// ACTION: Settings > Bluetooth > Overflow > Show received files
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BLUETOOTH_FILES = 162;
// ACTION: QS DND details panel > Increase / Decrease exit time
// SUBTYPE: true is increase, false is decrease
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_DND_TIME = 163;
// ACTION: QS DND details panel > [Exit condition]
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_DND_CONDITION_SELECT = 164;
// ACTION: QS DND details panel > [DND mode]
// SUBTYPE: 1 is priority, 2 is silence, 3 is alarms only
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_DND_ZEN_SELECT = 165;
// ACTION: QS DND detail panel > DND toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
QS_DND_TOGGLE = 166;
// ACTION: DND Settings > Priority only allows > Reminder toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ALLOW_REMINDERS = 167;
// ACTION: DND Settings > Priority only allows > Event toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ALLOW_EVENTS = 168;
// ACTION: DND Settings > Priority only allows > Messages
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ALLOW_MESSAGES = 169;
// ACTION: DND Settings > Priority only allows > Calls
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ALLOW_CALLS = 170;
// ACTION: DND Settings > Priority only allows > Repeat callers toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ALLOW_REPEAT_CALLS = 171;
// ACTION: DND Settings > Automatic rules > Add rule
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ADD_RULE = 172;
// ACTION: DND Settings > Automatic rules > Add rule > OK
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ADD_RULE_OK = 173;
// ACTION: DND Settings > Automatic rules > [Rule] > Delete rule
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_DELETE_RULE = 174;
// ACTION: DND Settings > Automatic rules > [Rule] > Delete rule > Delete
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_DELETE_RULE_OK = 175;
// ACTION: DND Settings > Automatic rules > [Rule] > Toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ZEN_ENABLE_RULE = 176;
// ACTION: Settings > More > Airplane mode toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_AIRPLANE_TOGGLE = 177;
// ACTION: Settings > Data usage > Cellular data toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_CELL_DATA_TOGGLE = 178;
// OPEN: Settings > Sound & notification > Notification access
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ACCESS = 179;
// OPEN: Settings > Sound & notification > Do Not Disturb access
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
NOTIFICATION_ZEN_MODE_ACCESS = 180;
// OPEN: Settings > Apps > Configure apps > Default Apps
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_DEFAULT_APPS = 181;
// OPEN: Settings > Internal storage > Apps storage
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_STORAGE_APPS = 182;
// OPEN: Settings > Security > Usage access
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_USAGE_ACCESS_DETAIL = 183;
// OPEN: Settings > Battery > Battery optimization
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_HIGH_POWER_APPS = 184;
// OBSOLETE
@@ -1120,448 +957,377 @@
// ACTION: Lockscreen > Unlock gesture
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_UNLOCK = 186;
// ACTION: Lockscreen > Pull shade open
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_SHADE = 187;
// ACTION: Lockscreen > Tap on lock, shows hint
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_HINT = 188;
// ACTION: Lockscreen > Camera
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_CAMERA = 189;
// ACTION: Lockscreen > Dialer
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_DIALER = 190;
// ACTION: Lockscreen > Tap on lock, locks phone
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_LOCK = 191;
// ACTION: Lockscreen > Tap on notification, false touch rejection
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
ACTION_LS_NOTE = 192;
// ACTION: Lockscreen > Swipe down to open quick settings
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.8.22
ACTION_LS_QS = 193;
// ACTION: Swipe down to open quick settings when unlocked
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.8.22
ACTION_SHADE_QS_PULL = 194;
// ACTION: Notification shade > Tap to open quick settings
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.8.22
ACTION_SHADE_QS_TAP = 195;
// OPEN: Lockscreen
// SUBTYPE: 0 is unsecure, 1 is secured by password / pattern / PIN
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
LOCKSCREEN = 196;
// OPEN: Lockscreen > Screen to enter password / pattern / PIN
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
BOUNCER = 197;
// OPEN: Screen turned on
// SUBTYPE: 2 is user action
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.8.22
SCREEN = 198;
// OPEN: Notification caused sound, vibration, and/or LED blink
// SUBTYPE: 1 is buzz, 2 is beep, blink is 4, or'd together
// CATEGORY: NOTIFICATION
// OS: 5.1.1
- // GMS: 7.8.53
NOTIFICATION_ALERT = 199;
// ACTION: Lockscreen > Emergency Call button
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 5.1.1
- // GMS: 7.5.26
ACTION_EMERGENCY_CALL = 200;
// OPEN: Settings > Apps > Configure > Default apps > Assist & voice input
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
APPLICATIONS_MANAGE_ASSIST = 201;
// OPEN: Settings > Memory
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
PROCESS_STATS_SUMMARY = 202;
// ACTION: Settings > Display > When device is rotated
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_ROTATION_LOCK = 203;
// ACTION: Long press on notification to view controls
// CATEGORY: NOTIFICATION
// OS: 6.0
- // GMS: 7.5.26
ACTION_NOTE_CONTROLS = 204;
// ACTION: Notificatoin controls > Info button
// CATEGORY: NOTIFICATION
// OS: 6.0
- // GMS: 7.5.26
ACTION_NOTE_INFO = 205;
// ACTION: Notification controls > Settings button
// CATEGORY: NOTIFICATION
// OS: 6.0
- // GMS: 7.5.26
ACTION_APP_NOTE_SETTINGS = 206;
// OPEN: Volume Dialog (with hardware buttons)
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
VOLUME_DIALOG = 207;
// OPEN: Volume dialog > Expanded volume dialog (multiple sliders)
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
VOLUME_DIALOG_DETAILS = 208;
// ACTION: Volume dialog > Adjust volume slider
// SUBTYPE: volume level (0-7)
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_VOLUME_SLIDER = 209;
// ACTION: Volume dialog > Select non-active stream
// SUBTYPE: stream (defined in AudioSystem.java)
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_VOLUME_STREAM = 210;
// ACTION: Adjust volume with hardware key
// SUBTYPE: volume level (0-7)
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_VOLUME_KEY = 211;
// ACTION: Volume dialog > Mute a stream by tapping icon
// SUBTYPE: mute is 1, audible is 2
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_VOLUME_ICON = 212;
// ACTION: Volume dialog > Change ringer mode by tapping icon
// SUBTYPE: 2 is audible, 3 is vibrate
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_RINGER_MODE = 213;
// ACTION: Chooser shown (share target, file open, etc.)
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_ACTIVITY_CHOOSER_SHOWN = 214;
// ACTION: Chooser > User taps an app target
// SUBTYPE: Index of target
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET = 215;
// ACTION: Chooser > User taps a service target
// SUBTYPE: Index of target
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET = 216;
// ACTION: Chooser > User taps a standard target
// SUBTYPE: Index of target
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET = 217;
// ACTION: QS Brightness Slider (with auto brightness disabled)
// SUBTYPE: slider value
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BRIGHTNESS = 218;
// ACTION: QS Brightness Slider (with auto brightness enabled)
// SUBTYPE: slider value
// CATEGORY: QUICK_SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_BRIGHTNESS_AUTO = 219;
// OPEN: Settings > Display > Brightness Slider
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
BRIGHTNESS_DIALOG = 220;
// OPEN: Settings > Apps > Configure Apps > Draw over other apps
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
SYSTEM_ALERT_WINDOW_APPS = 221;
// OPEN: Display has entered dream mode
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
DREAMING = 222;
// OPEN: Display has entered ambient notification mode
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
DOZING = 223;
// OPEN: Overview
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
OVERVIEW_ACTIVITY = 224;
// OPEN: Settings > About phone > Legal information
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ABOUT_LEGAL_SETTINGS = 225;
// OPEN: Settings > Search > Perform search
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
ACTION_SEARCH_RESULTS = 226;
// OPEN: Settings > System UI Tuner
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER = 227;
// OPEN: Settings > System UI Tuner > Quick Settings
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_QS = 228;
// OPEN: Settings > System UI Tuner > Demo mode
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_DEMO_MODE = 229;
// ACTION: Settings > System UI Tuner > Quick Settings > Move tile
// PACKAGE: Tile
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_QS_REORDER = 230;
// ACTION: Settings > System UI Tuner > Quick Settings > Add tile
// PACKAGE: Tile
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_QS_ADD = 231;
// ACTION: Settings > System UI Tuner > Quick Settings > Remove tile
// PACKAGE: Tile
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_QS_REMOVE = 232;
// ACTION: Settings > System UI Tuner > Status bar > Enable icon
// PACKAGE: Icon
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_STATUS_BAR_ENABLE = 233;
// ACTION: Settings > System UI Tuner > Status bar > Disable icon
// PACKAGE: Icon
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_STATUS_BAR_DISABLE = 234;
// ACTION: Settings > System UI Tuner > Demo mode > Enable demo mode
// SUBTYPE: false is disabled, true is enabled
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_DEMO_MODE_ENABLED = 235;
// ACTION: Settings > System UI Tuner > Demo mode > Show demo mode
// SUBTYPE: false is disabled, true is enabled
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_DEMO_MODE_ON = 236;
// ACTION: Settings > System UI Tuner > Show embedded battery percentage
// SUBTYPE: 0 is disabled, 1 is enabled
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
TUNER_BATTERY_PERCENTAGE = 237;
// OPEN: Settings > Developer options > Inactive apps
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.5.26
FUELGAUGE_INACTIVE_APPS = 238;
// ACTION: Long press home to bring up assistant
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.5.26
ACTION_ASSIST_LONG_PRESS = 239;
// OPEN: Settings > Security > Nexus Imprint > Add Fingerprint
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLLING = 240;
// OPEN: Fingerprint Enroll > Find Sensor
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_FIND_SENSOR = 241;
// OPEN: Fingerprint Enroll > Fingerprint Enrolled!
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_FINISH = 242;
// OPEN: Fingerprint Enroll introduction
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_INTRO = 243;
// OPEN: Fingerprint Enroll onboarding
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_ONBOARD = 244;
// OPEN: Fingerprint Enroll > Let's Start!
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_SIDECAR = 245;
// OPEN: Fingerprint Enroll SUW > Let's Start!
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLLING_SETUP = 246;
// OPEN: Fingerprint Enroll SUW > Find Sensor
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_FIND_SENSOR_SETUP = 247;
// OPEN: Fingerprint Enroll SUW > Fingerprint Enrolled!
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_FINISH_SETUP = 248;
// OPEN: Fingerprint Enroll SUW introduction
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_INTRO_SETUP = 249;
// OPEN: Fingerprint Enroll SUW onboarding
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
FINGERPRINT_ENROLL_ONBOARD_SETUP = 250;
// ACTION: Add fingerprint > Enroll fingerprint
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
ACTION_FINGERPRINT_ENROLL = 251;
// ACTION: Authenticate using fingerprint
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
ACTION_FINGERPRINT_AUTH = 252;
// ACTION: Settings > Security > Nexus Imprint > [Fingerprint] > Delete
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
ACTION_FINGERPRINT_DELETE = 253;
// ACTION: Settings > Security > Nexus Imprint > [Fingerprint] > Rename
// CATEGORY: SETTINGS
// OS: 6.0
- // GMS: 7.8.99
ACTION_FINGERPRINT_RENAME = 254;
// ACTION: Double tap camera shortcut
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.8.99
ACTION_DOUBLE_TAP_POWER_CAMERA_GESTURE = 255;
// ACTION: Double twist camera shortcut
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: 6.0
- // GMS: 7.8.99
ACTION_WIGGLE_CAMERA_GESTURE = 256;
// OPEN: QS Work Mode tile shown
@@ -1569,13 +1335,11 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: N
- // GMS: 7.8.99
QS_WORKMODE = 257;
// OPEN: Settings > Developer Options > Background Check
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
BACKGROUND_CHECK_SUMMARY = 258;
// OPEN: QS Lock tile shown
@@ -1583,52 +1347,44 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: N
- // GMS: 7.8.99
QS_LOCK_TILE = 259;
// OPEN: QS User Tile shown
// CATEGORY: QUICK_SETTINGS
// OS: N
- // GMS: 7.8.99
QS_USER_TILE = 260;
// OPEN: QS Battery tile shown
// CATEGORY: QUICK_SETTINGS
// OS: N
- // GMS: 7.8.99
QS_BATTERY_TILE = 261;
// OPEN: Settings > Sound > Do not disturb > Visual interruptions
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS = 262;
// ACTION: Visual interruptions > No screen interuptions toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_ZEN_ALLOW_WHEN_SCREEN_OFF = 263;
// ACTION: Visual interruptions > No notification light toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_ZEN_ALLOW_LIGHTS = 264;
// OPEN: Settings > Notifications > [App] > Topic Notifications
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
NOTIFICATION_TOPIC_NOTIFICATION = 265;
// ACTION: Settings > Apps > Default Apps > Select different SMS app
// PACKAGE: Selected SMS app
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_DEFAULT_SMS_APP_CHANGED = 266;
// OPEN: QS Color modification tile shown
@@ -1636,105 +1392,88 @@
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
// OS: N
- // GMS: 7.8.99
QS_COLOR_MATRIX = 267;
// OPEN: QS Custom tile shown
// ACTION: QS Work Mode tile tapped
// CATEGORY: QUICK_SETTINGS
// OS: N
- // GMS: 7.8.99
QS_CUSTOM = 268;
// ACTION: Visual interruptions > Never turn off the screen toggle
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_ZEN_ALLOW_WHEN_SCREEN_ON = 269;
// ACTION: Overview > Long-press task, drag to enter split-screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_WINDOW_DOCK_DRAG_DROP = 270;
// ACTION: In App > Long-press Overview button to enter split-screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_WINDOW_DOCK_LONGPRESS = 271;
// ACTION: In App > Swipe Overview button to enter split-screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_WINDOW_DOCK_SWIPE = 272;
// ACTION: Launch profile-specific app > Confirm credentials
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
PROFILE_CHALLENGE = 273;
// OPEN: QS Battery detail panel
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
QS_BATTERY_DETAIL = 274;
// OPEN: Overview > History
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
OVERVIEW_HISTORY = 275;
// ACTION: Overview > Page by tapping Overview button
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_OVERVIEW_PAGE = 276;
// ACTION: Overview > Select app
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_OVERVIEW_SELECT = 277;
// ACTION: View emergency info
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_VIEW_EMERGENCY_INFO = 278;
// ACTION: Edit emergency info activity
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_EDIT_EMERGENCY_INFO = 279;
// ACTION: Edit emergency info field
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_EDIT_EMERGENCY_INFO_FIELD = 280;
// ACTION: Add emergency contact
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_ADD_EMERGENCY_CONTACT = 281;
// ACTION: Delete emergency contact
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_DELETE_EMERGENCY_CONTACT = 282;
// ACTION: Call emergency contact
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
ACTION_CALL_EMERGENCY_CONTACT = 283;
// OPEN: QS Data Saver tile shown
@@ -1745,13 +1484,11 @@
// OPEN: Settings > Security > User credentials
// CATEGORY: Settings
// OS: N
- // GMS: 7.8.99
USER_CREDENTIALS = 285;
// ACTION: In App (splitscreen) > Long-press Overview to exit split-screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_WINDOW_UNDOCK_LONGPRESS = 286;
// Logged when the user scrolls through overview manually
@@ -1773,81 +1510,68 @@
// ACTION: Long-press power button, then tap "Take bug report" option.
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_FROM_POWER_MENU_INTERACTIVE = 292;
// ACTION: Long-press power button, then long-press "Take bug report" option.
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_FROM_POWER_MENU_FULL = 293;
// ACTION: Settings -> Developer Options -> Take bug report -> Interactive report
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
// Interactive bug report initiated from Settings.
ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE = 294;
// ACTION: Settings -> Developer Options -> Take bug report -> Full report
// CATEGORY: SETTINGS
// OS: N
- // GMS: 7.8.99
// Interactive bug report initiated from Settings.
ACTION_BUGREPORT_FROM_SETTINGS_FULL = 295;
// ACTION: User tapped notification action to cancel a bug report
// CATEGORY: NOTIFICATION
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_NOTIFICATION_ACTION_CANCEL = 296;
// ACTION: User tapped notification action to launch bug report details screen
// CATEGORY: NOTIFICATION
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_NOTIFICATION_ACTION_DETAILS = 297;
// ACTION: User tapped notification action to take adition screenshot on bug report
// CATEGORY: NOTIFICATION
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_NOTIFICATION_ACTION_SCREENSHOT = 298;
// ACTION: User tapped notification to share bug report
// CATEGORY: NOTIFICATION
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_NOTIFICATION_ACTION_SHARE = 299;
// ACTION: User changed bug report name using the details screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_DETAILS_NAME_CHANGED = 300;
// ACTION: User changed bug report title using the details screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_DETAILS_TITLE_CHANGED = 301;
// ACTION: User changed bug report description using the details screen
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_DETAILS_DESCRIPTION_CHANGED = 302;
// ACTION: User tapped Save in the bug report details screen.
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_DETAILS_SAVED = 303;
// ACTION: User tapped Cancel in the bug report details screen.
// CATEGORY: GLOBAL_SYSTEM_UI
// OS: N
- // GMS: 7.8.99
ACTION_BUGREPORT_DETAILS_CANCELED = 304;
// Tuner: Open/close calibrate dialog.
@@ -1920,79 +1644,140 @@
// the transition was executed.
APP_TRANSITION_DEVICE_UPTIME_SECONDS = 325;
- // User granted access to the request folder; action takes an integer
- // representing the folder's index on Environment.STANDARD_DIRECTORIES
- // (or -2 for root access, or -1 or unknown directory).
+ // ACTION: app requested access to a scoped directory, user granted it.
+ // SUBTYPE: directory's index on Environment.STANDARD_DIRECTORIES
+ // CATEGORY: GLOBAL_SYSTEM_UI
+ // OS: N
ACTION_SCOPED_DIRECTORY_ACCESS_GRANTED_BY_FOLDER = 326;
- // User denied access to the request folder; action takes an integer
- // representing the folder's index on Environment.STANDARD_DIRECTORIES
- // (or -2 for root access, or -1 or unknown directory).
+ // ACTION: app requested access to a scoped directory, user denied it.
+ // SUBTYPE: directory's index on Environment.STANDARD_DIRECTORIES
+ // CATEGORY: GLOBAL_SYSTEM_UI
+ // OS: N
ACTION_SCOPED_DIRECTORY_ACCESS_DENIED_BY_FOLDER = 327;
- // User granted access to the request folder; action pass package name
- // of calling package.
+ // ACTION: app requested access to a scoped directory, user granted it.
+ // PACKAGE: app that requested access
+ // CATEGORY: GLOBAL_SYSTEM_UI
+ // OS: N
ACTION_SCOPED_DIRECTORY_ACCESS_GRANTED_BY_PACKAGE = 328;
- // User denied access to the request folder; action pass package name
- // of calling package.
+ // ACTION: app requested access to a scoped directory, user denied it.
+ // PACKAGE: app that requested access.
+ // CATEGORY: GLOBAL_SYSTEM_UI
+ // OS: N
ACTION_SCOPED_DIRECTORY_ACCESS_DENIED_BY_PACKAGE = 329;
- // App requested access to a directory it has already been granted
- // access before; action takes an integer representing the folder's
- // index on Environment.STANDARD_DIRECTORIES
- // (or -2 for root access, or -1 or unknown directory).
+ // ACTION: app requested access to a directory user has already been granted
+ // access before.
+ // SUBTYPE: directory's index on Environment.STANDARD_DIRECTORIES.
+ // CATEGORY: GLOBAL_SYSTEM_UI
+ // OS: N
ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED_BY_FOLDER = 330;
- // App requested access to a directory it has already been granted
- // access before; action pass package name of calling package.
+ // ACTION: app requested access to a directory user has already been granted
+ // access before.
+ // PACKAGE: app that requested access.
+ // CATEGORY: GLOBAL_SYSTEM_UI
+ // OS: N
ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED_BY_PACKAGE = 331;
- // Logged when the user slides a notification and
- // reveals the gear beneath it.
+ // ACTION: Logged when the user slides a notification and reveals the gear
+ // beneath it.
+ // CATEGORY: NOTIFICATION
+ // OS: N
ACTION_REVEAL_GEAR = 332;
- // Logged when the user taps on the gear beneath
- // a notification.
+ // ACTION: Logged when the user taps on the gear beneath a notification.
+ // CATEGORY: NOTIFICATION
+ // OS: N
ACTION_TOUCH_GEAR = 333;
// Logs that the user has edited the enabled VR listeners.
+ // CATEGORY: SETTINGS
+ // OS: N
VR_MANAGE_LISTENERS = 334;
// Settings -> Accessibility -> Click after pointer stops moving
+ // CATEGORY: SETTINGS
+ // OS: N
ACCESSIBILITY_TOGGLE_AUTOCLICK = 335;
+
// Settings -> Sound
+ // CATEGORY: SETTINGS
+ // OS: N
SOUND = 336;
+
// Settings -> Notifications -> Gear
+ // CATEGORY: SETTINGS
+ // OS: N
CONFIGURE_NOTIFICATION = 337;
+
// Settings -> Wi-Fi -> Gear
+ // CATEGORY: SETTINGS
+ // OS: N
CONFIGURE_WIFI = 338;
+
// Settings -> Display -> Display size
+ // OS: N
DISPLAY_SCREEN_ZOOM = 339;
+
// Settings -> Display -> Font size
+ // CATEGORY: SETTINGS
+ // OS: N
ACCESSIBILITY_FONT_SIZE = 340;
+
// Settings -> Data usage -> Cellular/Wi-Fi data usage
+ // CATEGORY: SETTINGS
+ // OS: N
DATA_USAGE_LIST = 341;
+
// Settings -> Data usage -> Billing cycle or DATA_USAGE_LIST -> Gear
+ // CATEGORY: SETTINGS
+ // OS: N
BILLING_CYCLE = 342;
+
// DATA_USAGE_LIST -> Any item or App info -> Data usage
+ // CATEGORY: SETTINGS
+ // OS: N
APP_DATA_USAGE = 343;
+
// Settings -> Language & input -> Language
+ // CATEGORY: SETTINGS
+ // OS: N
USER_LOCALE_LIST = 344;
+
// Settings -> Language & input -> Virtual keyboard
+ // CATEGORY: SETTINGS
+ // OS: N
VIRTUAL_KEYBOARDS = 345;
+
// Settings -> Language & input -> Physical keyboard
+ // CATEGORY: SETTINGS
+ // OS: N
PHYSICAL_KEYBOARDS = 346;
+
// Settings -> Language & input -> Virtual keyboard -> Add a virtual keyboard
+ // CATEGORY: SETTINGS
+ // OS: N
ENABLE_VIRTUAL_KEYBOARDS = 347;
+
// Settings -> Data usage -> Data Saver
+ // CATEGORY: SETTINGS
+ // OS: N
DATA_SAVER_SUMMARY = 348;
+
// Settings -> Data usage -> Data Saver -> Unrestricted data access
+ // CATEGORY: SETTINGS
+ // OS: N
DATA_USAGE_UNRESTRICTED_ACCESS = 349;
// Used for generic logging of Settings Preference Persistence, should not be used
// outside SharedPreferencesLogger.
+ // CATEGORY: SETTINGS
+ // OS: N
ACTION_GENERIC_PACKAGE = 350;
+
// Settings -> Apps -> Gear -> Special access
SPECIAL_ACCESS = 351;
@@ -2158,15 +1943,28 @@
// System UI Tuner > Other > Power notification controls > Toggle on/off
ACTION_TUNER_POWER_NOTIFICATION_CONTROLS = 393;
- // Action: user enable / disabled data saver using Settings. Arguments:
- // 0: Data Saver mode is disabled.
- // 1: Data Saver mode is enabled.
+ // Action: user enable / disabled data saver using Settings
+ // OPEN: Settings -> Data Usage -> Data saver -> On/off toggle
+ // VALUE: 1 for enabled, 0 for disabled
+ // CATEGORY: SETTINGS
+ // OS: N
ACTION_DATA_SAVER_MODE = 394;
- // User whitelisted an app for Data Saver mode; action pass package name of app.
+ // User whitelisted an app for Data Saver mode; action pass package name of app
+ // Action: user enable / disabled data saver using Settings
+ // OPEN: Settings -> Data Usage -> Data saver -> Unrestricted data access > APP toggle turned on
+ // or
+ // Settings -> Apps -> APP -> Data usage -> Unrestricted data usage toggle turned on
+ // VALUE: package name of APP
+ // CATEGORY: SETTINGS
+ // OS: N
ACTION_DATA_SAVER_WHITELIST = 395;
- // User blacklisted an app for Data Saver mode; action pass package name of app.
+ // User blacklisted an app for Data Saver mode; action pass package name of app
+ // OPEN: Settings -> Apps -> APP -> Data usage -> Background data toggle turned off
+ // VALUE: package name of APP
+ // CATEGORY: SETTINGS
+ // OS: N
ACTION_DATA_SAVER_BLACKLIST = 396;
// User opened a remote input view associated with a notification. Passes package name of app
@@ -2332,32 +2130,73 @@
SUPPORT_FRAGMENT = 475;
// ACTION: Settings -> Select summary tab.
+ // CATEGORY: SETTINGS
ACTION_SELECT_SUMMARY=476;
// ACTION: Settings -> Select support tab.
+ // CATEGORY: SETTINGS
ACTION_SELECT_SUPPORT_FRAGMENT = 477;
// ACTION: Settings -> Support -> Tips & tricks
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_TIPS_AND_TRICKS = 478;
// ACTION: Settings -> Support -> Help & feedback
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_HELP_AND_FEEDBACK = 479;
// ACTION: Settings -> Support -> Sign in
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_SIGN_IN = 480;
// ACTION: Settings -> Support -> Phone
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_PHONE = 481;
// ACTION: Settings -> Support -> Chat
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_CHAT = 482;
// ACTION: Settings -> Support -> Phone/Chat -> Disclaimer Cancel
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_DISCLAIMER_CANCEL = 483;
// ACTION: Settings -> Support -> Phone/Chat -> Disclaimer OK
+ // CATEGORY: SETTINGS
ACTION_SUPPORT_DISCLAIMER_OK = 484;
+ // ACTION: Settings -> Support -> Toll-Free Phone
+ // CATEGORY: SETTINGS
+ ACTION_SUPPORT_DAIL_TOLLFREE = 485;
+
+ // ACTION: Settings -> Support -> "Travel Abroad" Button
+ // CATEGORY: SETTINGS
+ ACTION_SUPPORT_VIEW_TRAVEL_ABROAD_DIALOG = 486;
+
+ // ACTION: Settings -> Support -> "Travel Abroad" Button -> Tolled Phone
+ // CATEGORY: SETTINGS
+ ACTION_SUPPORT_DIAL_TOLLED = 487;
+
+ // OPEN: Settings > Display > Night Light
+ // CATEGORY: SETTINGS
+ NIGHT_DISPLAY_SETTINGS = 488;
+
+ // ACTION: Settings -> Storage -> Manage storage -> Click Storage Manager
+ // SUBTYPE: false is off, true is on
+ ACTION_TOGGLE_STORAGE_MANAGER = 489;
+
+ // Settings launched from collapsed quick settings.
+ ACTION_QS_COLLAPSED_SETTINGS_LAUNCH = 490;
+
+ // OPEN: QS Night Light tile shown
+ // ACTION: QS Night Light tile tapped
+ // SUBTYPE: 0 is off, 1 is on
+ // CATEGORY: QUICK_SETTINGS
+ QS_NIGHT_DISPLAY = 491;
+
+ // Night Light on
+ SETTINGS_CONDITION_NIGHT_DISPLAY = 492;
+
// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----
// ------- Begin N Keyboard Shortcuts Helper -----
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 60d3339..955b0c1 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -426,6 +426,8 @@
@Override
public boolean sendAccessibilityEvent(AccessibilityEvent event, int userId) {
+ boolean dispatchEvent = false;
+
synchronized (mLock) {
// We treat calls from a profile as if made by its parent as profiles
// share the accessibility state of the parent. The call below
@@ -440,15 +442,31 @@
mSecurityPolicy.updateActiveAndAccessibilityFocusedWindowLocked(event.getWindowId(),
event.getSourceNodeId(), event.getEventType(), event.getAction());
mSecurityPolicy.updateEventSourceLocked(event);
- notifyAccessibilityServicesDelayedLocked(event, false);
- notifyAccessibilityServicesDelayedLocked(event, true);
+ dispatchEvent = true;
}
if (mHasInputFilter && mInputFilter != null) {
mMainHandler.obtainMessage(MainHandler.MSG_SEND_ACCESSIBILITY_EVENT_TO_INPUT_FILTER,
AccessibilityEvent.obtain(event)).sendToTarget();
}
- event.recycle();
}
+
+ if (dispatchEvent) {
+ // Make sure clients receiving this event will be able to get the
+ // current state of the windows as the window manager may be delaying
+ // the computation for performance reasons.
+ if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
+ && mWindowsForAccessibilityCallback != null) {
+ WindowManagerInternal wm = LocalServices.getService(WindowManagerInternal.class);
+ wm.computeWindowsForAccessibility();
+ }
+ synchronized (mLock) {
+ notifyAccessibilityServicesDelayedLocked(event, false);
+ notifyAccessibilityServicesDelayedLocked(event, true);
+ }
+ }
+
+ event.recycle();
+
return (OWN_PROCESS_ID != Binder.getCallingPid());
}
@@ -1422,7 +1440,8 @@
updateTouchExplorationLocked(userState);
updatePerformGesturesLocked(userState);
updateEnhancedWebAccessibilityLocked(userState);
- updateDisplayColorAdjustmentSettingsLocked(userState);
+ updateDisplayDaltonizerLocked(userState);
+ updateDisplayInversionLocked(userState);
updateMagnificationLocked(userState);
updateSoftKeyboardShowModeLocked(userState);
scheduleUpdateInputFilter(userState);
@@ -1539,7 +1558,6 @@
somethingChanged |= readEnhancedWebAccessibilityEnabledChangedLocked(userState);
somethingChanged |= readDisplayMagnificationEnabledSettingLocked(userState);
somethingChanged |= readAutoclickEnabledSettingLocked(userState);
- somethingChanged |= readDisplayColorAdjustmentSettingsLocked(userState);
return somethingChanged;
}
@@ -1602,18 +1620,6 @@
return false;
}
- private boolean readDisplayColorAdjustmentSettingsLocked(UserState userState) {
- final boolean displayAdjustmentsEnabled = DisplayAdjustmentUtils.hasAdjustments(mContext,
- userState.mUserId);
- if (displayAdjustmentsEnabled != userState.mHasDisplayColorAdjustment) {
- userState.mHasDisplayColorAdjustment = displayAdjustmentsEnabled;
- return true;
- }
- // If display adjustment is enabled, always assume there was a change in
- // the adjustment settings.
- return displayAdjustmentsEnabled;
- }
-
private boolean readHighTextContrastEnabledSettingLocked(UserState userState) {
final boolean highTextContrastEnabled = Settings.Secure.getIntForUser(
mContext.getContentResolver(),
@@ -1730,8 +1736,12 @@
return false;
}
- private void updateDisplayColorAdjustmentSettingsLocked(UserState userState) {
- DisplayAdjustmentUtils.applyAdjustments(mContext, userState.mUserId);
+ private void updateDisplayDaltonizerLocked(UserState userState) {
+ DisplayAdjustmentUtils.applyDaltonizerSetting(mContext, userState.mUserId);
+ }
+
+ private void updateDisplayInversionLocked(UserState userState) {
+ DisplayAdjustmentUtils.applyInversionSetting(mContext, userState.mUserId);
}
private void updateMagnificationLocked(UserState userState) {
@@ -2174,7 +2184,7 @@
* connection for the service.
*/
class Service extends IAccessibilityServiceConnection.Stub
- implements ServiceConnection, DeathRecipient {;
+ implements ServiceConnection, DeathRecipient, KeyEventDispatcher.KeyEventFilter {;
final int mUserId;
@@ -2260,6 +2270,23 @@
setDynamicallyConfigurableProperties(accessibilityServiceInfo);
}
+ @Override
+ public boolean onKeyEvent(KeyEvent keyEvent, int sequenceNumber) {
+ if (!mRequestFilterKeyEvents) {
+ return false;
+ }
+ if((mAccessibilityServiceInfo.getCapabilities()
+ & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS) == 0) {
+ return false;
+ }
+ try {
+ mServiceInterface.onKeyEvent(keyEvent, sequenceNumber);
+ } catch (RemoteException e) {
+ return false;
+ }
+ return true;
+ }
+
public void setDynamicallyConfigurableProperties(AccessibilityServiceInfo info) {
mEventTypes = info.eventTypes;
mFeedbackType = info.feedbackType;
@@ -4184,7 +4211,6 @@
public boolean mIsAutoclickEnabled;
public boolean mIsPerformGesturesEnabled;
public boolean mIsFilterKeyEventsEnabled;
- public boolean mHasDisplayColorAdjustment;
public boolean mAccessibilityFocusOnlyInActiveWindow;
private Service mUiAutomationService;
@@ -4300,9 +4326,6 @@
private final Uri mDisplayDaltonizerUri = Settings.Secure.getUriFor(
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER);
- private final Uri mDisplayColorMatrixUri = Settings.Secure.getUriFor(
- Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX);
-
private final Uri mHighTextContrastUri = Settings.Secure.getUriFor(
Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED);
@@ -4334,8 +4357,6 @@
contentResolver.registerContentObserver(
mDisplayDaltonizerUri, false, this, UserHandle.USER_ALL);
contentResolver.registerContentObserver(
- mDisplayColorMatrixUri, false, this, UserHandle.USER_ALL);
- contentResolver.registerContentObserver(
mHighTextContrastUri, false, this, UserHandle.USER_ALL);
contentResolver.registerContentObserver(
mAccessibilitySoftKeyboardModeUri, false, this, UserHandle.USER_ALL);
@@ -4377,14 +4398,11 @@
if (readEnhancedWebAccessibilityEnabledChangedLocked(userState)) {
onUserStateChangedLocked(userState);
}
- } else if (mDisplayInversionEnabledUri.equals(uri)
- || mDisplayDaltonizerEnabledUri.equals(uri)
+ } else if (mDisplayDaltonizerEnabledUri.equals(uri)
|| mDisplayDaltonizerUri.equals(uri)) {
- if (readDisplayColorAdjustmentSettingsLocked(userState)) {
- updateDisplayColorAdjustmentSettingsLocked(userState);
- }
- } else if (mDisplayColorMatrixUri.equals(uri)) {
- updateDisplayColorAdjustmentSettingsLocked(userState);
+ updateDisplayDaltonizerLocked(userState);
+ } else if (mDisplayInversionEnabledUri.equals(uri)) {
+ updateDisplayInversionLocked(userState);
} else if (mHighTextContrastUri.equals(uri)) {
if (readHighTextContrastEnabledSettingLocked(userState)) {
onUserStateChangedLocked(userState);
diff --git a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
index e1f3cd8..1532946 100644
--- a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
+++ b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
@@ -18,23 +18,23 @@
import android.content.ContentResolver;
import android.content.Context;
-import android.opengl.Matrix;
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.provider.Settings;
-import android.util.Slog;
+import android.provider.Settings.Secure;
import android.view.accessibility.AccessibilityManager;
+import com.android.server.LocalServices;
+import com.android.server.display.DisplayTransformManager;
+
/**
* Utility methods for performing accessibility display adjustments.
*/
class DisplayAdjustmentUtils {
- private static final String LOG_TAG = DisplayAdjustmentUtils.class.getSimpleName();
+
+ /** Default inversion mode for display color correction. */
+ private static final int DEFAULT_DISPLAY_DALTONIZER =
+ AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
/** Matrix and offset used for converting color to gray-scale. */
- private static final float[] GRAYSCALE_MATRIX = new float[] {
+ private static final float[] MATRIX_GRAYSCALE = new float[] {
.2126f, .2126f, .2126f, 0,
.7152f, .7152f, .7152f, 0,
.0722f, .0722f, .0722f, 0,
@@ -48,150 +48,44 @@
* represents a non-multiplied addition, see surfaceflinger's ProgramCache
* for full implementation details.
*/
- private static final float[] INVERSION_MATRIX_VALUE_ONLY = new float[] {
+ private static final float[] MATRIX_INVERT_COLOR = new float[] {
0.402f, -0.598f, -0.599f, 0,
-1.174f, -0.174f, -1.175f, 0,
-0.228f, -0.228f, 0.772f, 0,
1, 1, 1, 1
};
- /** Default inversion mode for display color correction. */
- private static final int DEFAULT_DISPLAY_DALTONIZER =
- AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
-
- /**
- * Returns whether the specified user with has any display color
- * adjustments.
- */
- public static boolean hasAdjustments(Context context, int userId) {
+ public static void applyDaltonizerSetting(Context context, int userId) {
final ContentResolver cr = context.getContentResolver();
+ final DisplayTransformManager dtm = LocalServices.getService(DisplayTransformManager.class);
- if (Settings.Secure.getIntForUser(cr,
- Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, userId) != 0) {
- return true;
+ int daltonizerMode = AccessibilityManager.DALTONIZER_DISABLED;
+ if (Secure.getIntForUser(cr,
+ Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0, userId) != 0) {
+ daltonizerMode = Secure.getIntForUser(cr,
+ Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, DEFAULT_DISPLAY_DALTONIZER, userId);
}
- if (Settings.Secure.getIntForUser(cr,
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0, userId) != 0) {
- return true;
+ float[] grayscaleMatrix = null;
+ if (daltonizerMode == AccessibilityManager.DALTONIZER_SIMULATE_MONOCHROMACY) {
+ // Monochromacy isn't supported by the native Daltonizer.
+ grayscaleMatrix = MATRIX_GRAYSCALE;
+ daltonizerMode = AccessibilityManager.DALTONIZER_DISABLED;
}
-
- return false;
+ dtm.setColorMatrix(DisplayTransformManager.LEVEL_COLOR_MATRIX_GRAYSCALE, grayscaleMatrix);
+ dtm.setDaltonizerMode(daltonizerMode);
}
/**
* Applies the specified user's display color adjustments.
*/
- public static void applyAdjustments(Context context, int userId) {
+ public static void applyInversionSetting(Context context, int userId) {
final ContentResolver cr = context.getContentResolver();
- float[] colorMatrix = null;
+ final DisplayTransformManager dtm = LocalServices.getService(DisplayTransformManager.class);
- if (Settings.Secure.getIntForUser(cr,
- Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, userId) != 0) {
- colorMatrix = multiply(colorMatrix, INVERSION_MATRIX_VALUE_ONLY);
- }
-
- if (Settings.Secure.getIntForUser(cr,
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0, userId) != 0) {
- final int daltonizerMode = Settings.Secure.getIntForUser(cr,
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, DEFAULT_DISPLAY_DALTONIZER,
- userId);
- // Monochromacy isn't supported by the native Daltonizer.
- if (daltonizerMode == AccessibilityManager.DALTONIZER_SIMULATE_MONOCHROMACY) {
- colorMatrix = multiply(colorMatrix, GRAYSCALE_MATRIX);
- setDaltonizerMode(AccessibilityManager.DALTONIZER_DISABLED);
- } else {
- setDaltonizerMode(daltonizerMode);
- }
- } else {
- setDaltonizerMode(AccessibilityManager.DALTONIZER_DISABLED);
- }
-
- String matrix = Settings.Secure.getStringForUser(cr,
- Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, userId);
- if (matrix != null) {
- final float[] userMatrix = get4x4Matrix(matrix);
- if (userMatrix != null) {
- colorMatrix = multiply(colorMatrix, userMatrix);
- }
- }
-
- setColorTransform(colorMatrix);
+ final boolean invertColors = Secure.getIntForUser(cr,
+ Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, userId) != 0;
+ dtm.setColorMatrix(DisplayTransformManager.LEVEL_COLOR_MATRIX_INVERT_COLOR,
+ invertColors ? MATRIX_INVERT_COLOR : null);
}
-
- private static float[] get4x4Matrix(String matrix) {
- String[] strValues = matrix.split(",");
- if (strValues.length != 16) {
- return null;
- }
- float[] values = new float[strValues.length];
- try {
- for (int i = 0; i < values.length; i++) {
- values[i] = Float.parseFloat(strValues[i]);
- }
- } catch (java.lang.NumberFormatException ex) {
- return null;
- }
- return values;
- }
-
- private static float[] multiply(float[] matrix, float[] other) {
- if (matrix == null) {
- return other;
- }
- float[] result = new float[16];
- Matrix.multiplyMM(result, 0, matrix, 0, other, 0);
- return result;
- }
-
- /**
- * Sets the surface flinger's Daltonization mode. This adjusts the color
- * space to correct for or simulate various types of color blindness.
- *
- * @param mode new Daltonization mode
- */
- private static void setDaltonizerMode(int mode) {
- try {
- final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
- if (flinger != null) {
- final Parcel data = Parcel.obtain();
- data.writeInterfaceToken("android.ui.ISurfaceComposer");
- data.writeInt(mode);
- flinger.transact(1014, data, null, 0);
- data.recycle();
- }
- } catch (RemoteException ex) {
- Slog.e(LOG_TAG, "Failed to set Daltonizer mode", ex);
- }
- }
-
- /**
- * Sets the surface flinger's color transformation as a 4x4 matrix. If the
- * matrix is null, color transformations are disabled.
- *
- * @param m the float array that holds the transformation matrix, or null to
- * disable transformation
- */
- private static void setColorTransform(float[] m) {
- try {
- final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
- if (flinger != null) {
- final Parcel data = Parcel.obtain();
- data.writeInterfaceToken("android.ui.ISurfaceComposer");
- if (m != null) {
- data.writeInt(1);
- for (int i = 0; i < 16; i++) {
- data.writeFloat(m[i]);
- }
- } else {
- data.writeInt(0);
- }
- flinger.transact(1015, data, null, 0);
- data.recycle();
- }
- } catch (RemoteException ex) {
- Slog.e(LOG_TAG, "Failed to set color transform", ex);
- }
- }
-
}
diff --git a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
index e03c16e..3358432 100644
--- a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
+++ b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
@@ -16,12 +16,10 @@
package com.android.server.accessibility;
-import android.accessibilityservice.AccessibilityServiceInfo;
import android.os.Binder;
import android.os.Handler;
import android.os.Message;
import android.os.PowerManager;
-import android.os.RemoteException;
import android.util.ArrayMap;
import android.util.Pools;
import android.util.Pools.Pool;
@@ -30,8 +28,6 @@
import android.view.KeyEvent;
import android.view.WindowManagerPolicy;
-import com.android.server.accessibility.AccessibilityManagerService.Service;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,32 +42,33 @@
* they process each call to {@code AccessibilityService.onKeyEvent} on a single thread, and so
* don't see the N+1th event until they have processed the Nth event.
*/
-public class KeyEventDispatcher {
+public class KeyEventDispatcher implements Handler.Callback {
// Debugging
private static final String LOG_TAG = "KeyEventDispatcher";
private static final boolean DEBUG = false;
/* KeyEvents must be processed in this time interval */
private static final long ON_KEY_EVENT_TIMEOUT_MILLIS = 500;
- private static final int MSG_ON_KEY_EVENT_TIMEOUT = 1;
+ public static final int MSG_ON_KEY_EVENT_TIMEOUT = 1;
private static final int MAX_POOL_SIZE = 10;
private final Pool<PendingKeyEvent> mPendingEventPool = new Pools.SimplePool<>(MAX_POOL_SIZE);
private final Object mLock;
/*
- * Track events sent to each service. If a KeyEvent is to be sent to at least one service,
+ * Track events sent to each filter. If a KeyEvent is to be sent to at least one service,
* a corresponding PendingKeyEvent is created for it. This PendingKeyEvent is placed in
* the list for each service its KeyEvent is sent to. It is removed from the list when
* the service calls setOnKeyEventResult, or when we time out waiting for the service to
* respond.
*/
- private final Map<Service, ArrayList<PendingKeyEvent>> mPendingEventsMap = new ArrayMap<>();
+ private final Map<KeyEventFilter, ArrayList<PendingKeyEvent>> mPendingEventsMap =
+ new ArrayMap<>();
private final InputEventConsistencyVerifier mSentEventsVerifier;
private final Handler mHandlerToSendKeyEventsToInputFilter;
private final int mMessageTypeForSendKeyEvent;
- private final Handler mKeyEventTimeoutHandler;
private final PowerManager mPowerManager;
+ private Handler mKeyEventTimeoutHandler;
/**
* @param handlerToSendKeyEventsToInputFilter The handler to which to post {@code KeyEvent}s
@@ -84,8 +81,7 @@
* by a service
*/
public KeyEventDispatcher(Handler handlerToSendKeyEventsToInputFilter,
- int messageTypeForSendKeyEvent, Object lock,
- PowerManager powerManager) {
+ int messageTypeForSendKeyEvent, Object lock, PowerManager powerManager) {
if (InputEventConsistencyVerifier.isInstrumentationEnabled()) {
mSentEventsVerifier = new InputEventConsistencyVerifier(
this, 0, KeyEventDispatcher.class.getSimpleName());
@@ -95,58 +91,55 @@
mHandlerToSendKeyEventsToInputFilter = handlerToSendKeyEventsToInputFilter;
mMessageTypeForSendKeyEvent = messageTypeForSendKeyEvent;
mKeyEventTimeoutHandler =
- new Handler(mHandlerToSendKeyEventsToInputFilter.getLooper(), new Callback());
+ new Handler(handlerToSendKeyEventsToInputFilter.getLooper(), this);
mLock = lock;
mPowerManager = powerManager;
}
/**
+ * See above for most params
+ * @param timeoutHandler Specify a handler to use for handling timeouts. This internal state is
+ * exposed for testing.
+ */
+ public KeyEventDispatcher(Handler handlerToSendKeyEventsToInputFilter,
+ int messageTypeForSendKeyEvent, Object lock, PowerManager powerManager,
+ Handler timeoutHandler) {
+ this(handlerToSendKeyEventsToInputFilter, messageTypeForSendKeyEvent, lock, powerManager);
+ mKeyEventTimeoutHandler = timeoutHandler;
+ }
+
+ /**
* Notify that a new KeyEvent is available to accessibility services. Must be called with the
- * lock used to construct this object held. The boundServices list must also be protected
- * by a lock.
+ * lock used to construct this object held. The keyEventFilters list must also be protected
+ * by the lock.
*
* @param event The new key event
* @param policyFlags Flags for the event
- * @param boundServices A list of currently bound AccessibilityServices
+ * @param keyEventFilters A list of keyEventFilters that should be considered for processing
+ * this event
*
* @return {@code true} if the event was passed to at least one AccessibilityService,
* {@code false} otherwise.
*/
- // TODO: The locking policy for boundServices needs some thought.
+ // TODO: The locking policy for keyEventFilters needs some thought.
public boolean notifyKeyEventLocked(
- KeyEvent event, int policyFlags, List<Service> boundServices) {
+ KeyEvent event, int policyFlags, List<? extends KeyEventFilter> keyEventFilters) {
PendingKeyEvent pendingKeyEvent = null;
KeyEvent localClone = KeyEvent.obtain(event);
- for (int i = 0; i < boundServices.size(); i++) {
- Service service = boundServices.get(i);
- // Key events are handled only by services that declared
- // this capability and requested to filter key events.
- if (!service.mRequestFilterKeyEvents) {
- continue;
+ for (int i = 0; i < keyEventFilters.size(); i++) {
+ KeyEventFilter keyEventFilter = keyEventFilters.get(i);
+ if (keyEventFilter.onKeyEvent(localClone, localClone.getSequenceNumber())) {
+ if (pendingKeyEvent == null) {
+ pendingKeyEvent = obtainPendingEventLocked(localClone, policyFlags);
+ }
+ ArrayList<PendingKeyEvent> pendingEventList = mPendingEventsMap.get(keyEventFilter);
+ if (pendingEventList == null) {
+ pendingEventList = new ArrayList<>();
+ mPendingEventsMap.put(keyEventFilter, pendingEventList);
+ }
+ pendingEventList.add(pendingKeyEvent);
+ pendingKeyEvent.referenceCount++;
}
- int filterKeyEventBit = service.mAccessibilityServiceInfo.getCapabilities()
- & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS;
- if (filterKeyEventBit == 0) {
- continue;
- }
-
- try {
- // The event will be cloned in the IPC call, so it doesn't need to be here.
- service.mServiceInterface.onKeyEvent(localClone, localClone.getSequenceNumber());
- } catch (RemoteException re) {
- continue;
- }
-
- if (pendingKeyEvent == null) {
- pendingKeyEvent = obtainPendingEventLocked(localClone, policyFlags);
- }
- ArrayList<PendingKeyEvent> pendingEventList = mPendingEventsMap.get(service);
- if (pendingEventList == null) {
- pendingEventList = new ArrayList<>();
- mPendingEventsMap.put(service, pendingEventList);
- }
- pendingEventList.add(pendingKeyEvent);
- pendingKeyEvent.referenceCount++;
}
if (pendingKeyEvent == null) {
@@ -163,14 +156,14 @@
/**
* Set the result from onKeyEvent from one service.
*
- * @param service The service setting the result
+ * @param keyEventFilter The filter setting the result
* @param handled {@code true} if the service handled the {@code KeyEvent}
* @param sequence The sequence number of the {@code KeyEvent}
*/
- public void setOnKeyEventResult(Service service, boolean handled, int sequence) {
+ public void setOnKeyEventResult(KeyEventFilter keyEventFilter, boolean handled, int sequence) {
synchronized (mLock) {
PendingKeyEvent pendingEvent =
- removeEventFromListLocked(mPendingEventsMap.get(service), sequence);
+ removeEventFromListLocked(mPendingEventsMap.get(keyEventFilter), sequence);
if (pendingEvent != null) {
if (handled && !pendingEvent.handled) {
pendingEvent.handled = handled;
@@ -190,21 +183,40 @@
/**
* Flush all pending key events for a service, treating all of them as unhandled
*
- * @param service The service for which to flush events
+ * @param keyEventFilter The filter for which to flush events
*/
- public void flush(Service service) {
+ public void flush(KeyEventFilter keyEventFilter) {
synchronized (mLock) {
- List<PendingKeyEvent> pendingEvents = mPendingEventsMap.get(service);
+ List<PendingKeyEvent> pendingEvents = mPendingEventsMap.get(keyEventFilter);
if (pendingEvents != null) {
for (int i = 0; i < pendingEvents.size(); i++) {
PendingKeyEvent pendingEvent = pendingEvents.get(i);
removeReferenceToPendingEventLocked(pendingEvent);
}
- mPendingEventsMap.remove(service);
+ mPendingEventsMap.remove(keyEventFilter);
}
}
}
+ @Override
+ public boolean handleMessage(Message message) {
+ if (message.what != MSG_ON_KEY_EVENT_TIMEOUT) {
+ Slog.w(LOG_TAG, "Unknown message: " + message.what);
+ return false;
+ }
+ PendingKeyEvent pendingKeyEvent = (PendingKeyEvent) message.obj;
+ synchronized (mLock) {
+ for (ArrayList<PendingKeyEvent> listForService : mPendingEventsMap.values()) {
+ if (listForService.remove(pendingKeyEvent)) {
+ if(removeReferenceToPendingEventLocked(pendingKeyEvent)) {
+ break;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
private PendingKeyEvent obtainPendingEventLocked(KeyEvent event, int policyFlags) {
PendingKeyEvent pendingEvent = mPendingEventPool.acquire();
if (pendingEvent == null) {
@@ -279,23 +291,16 @@
boolean handled;
}
- private class Callback implements Handler.Callback {
- @Override
- public boolean handleMessage(Message message) {
- if (message.what != MSG_ON_KEY_EVENT_TIMEOUT) {
- throw new IllegalArgumentException("Unknown message: " + message.what);
- }
- PendingKeyEvent pendingKeyEvent = (PendingKeyEvent) message.obj;
- synchronized (mLock) {
- for (ArrayList<PendingKeyEvent> listForService : mPendingEventsMap.values()) {
- if (listForService.remove(pendingKeyEvent)) {
- if(removeReferenceToPendingEventLocked(pendingKeyEvent)) {
- break;
- }
- }
- }
- }
- return true;
- }
+ public interface KeyEventFilter {
+ /**
+ * Filter a key event if possible
+ *
+ * @param event The event to filter
+ * @param sequenceNumber The sequence number of the event
+ *
+ * @return {@code true} if the filter is active and will call back with status.
+ * {@code false} if the filter is not active and will ignore the event
+ */
+ boolean onKeyEvent(KeyEvent event, int sequenceNumber);
}
}
diff --git a/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java b/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java
index 800f0e1..8042ddb 100644
--- a/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java
+++ b/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java
@@ -40,7 +40,7 @@
*
* All methods except {@code injectEvents} must be called only from the main thread.
*/
-public class MotionEventInjector implements EventStreamTransformation {
+public class MotionEventInjector implements EventStreamTransformation, Handler.Callback {
private static final String LOG_TAG = "MotionEventInjector";
private static final int MESSAGE_SEND_MOTION_EVENT = 1;
private static final int MESSAGE_INJECT_EVENTS = 2;
@@ -64,7 +64,14 @@
* @param looper A looper on the main thread to use for dispatching new events
*/
public MotionEventInjector(Looper looper) {
- mHandler = new Handler(looper, new Callback());
+ mHandler = new Handler(looper, this);
+ }
+
+ /**
+ * @param handler A handler to post messages. Exposes internal state for testing only.
+ */
+ public MotionEventInjector(Handler handler) {
+ mHandler = handler;
}
/**
@@ -127,6 +134,29 @@
mIsDestroyed = true;
}
+ @Override
+ public boolean handleMessage(Message message) {
+ if (message.what == MESSAGE_INJECT_EVENTS) {
+ SomeArgs args = (SomeArgs) message.obj;
+ injectEventsMainThread((List<MotionEvent>) args.arg1,
+ (IAccessibilityServiceClient) args.arg2, args.argi1);
+ args.recycle();
+ return true;
+ }
+ if (message.what != MESSAGE_SEND_MOTION_EVENT) {
+ Slog.e(LOG_TAG, "Unknown message: " + message.what);
+ return false;
+ }
+ MotionEvent motionEvent = (MotionEvent) message.obj;
+ sendMotionEventToNext(motionEvent, motionEvent,
+ WindowManagerPolicy.FLAG_PASS_TO_USER);
+ // If the message queue is now empty, then this gesture is complete
+ if (!mHandler.hasMessages(MESSAGE_SEND_MOTION_EVENT)) {
+ notifyService(true);
+ }
+ return true;
+ }
+
private void injectEventsMainThread(List<MotionEvent> events,
IAccessibilityServiceClient serviceInterface, int sequence) {
if (mIsDestroyed) {
@@ -201,6 +231,7 @@
MotionEvent.obtain(now, now, MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0);
sendMotionEventToNext(cancelEvent, cancelEvent,
WindowManagerPolicy.FLAG_PASS_TO_USER);
+ mOpenGesturesInProgress.put(source, false);
}
}
@@ -210,7 +241,6 @@
mHandler.removeMessages(MESSAGE_SEND_MOTION_EVENT);
notifyService(false);
}
-
}
private void notifyService(boolean success) {
@@ -222,28 +252,4 @@
+ mServiceInterfaceForCurrentGesture, re);
}
}
-
- private class Callback implements Handler.Callback {
- @Override
- public boolean handleMessage(Message message) {
- if (message.what == MESSAGE_INJECT_EVENTS) {
- SomeArgs args = (SomeArgs) message.obj;
- injectEventsMainThread((List<MotionEvent>) args.arg1,
- (IAccessibilityServiceClient) args.arg2, args.argi1);
- args.recycle();
- return true;
- }
- if (message.what != MESSAGE_SEND_MOTION_EVENT) {
- throw new IllegalArgumentException("Unknown message: " + message.what);
- }
- MotionEvent motionEvent = (MotionEvent) message.obj;
- sendMotionEventToNext(motionEvent, motionEvent,
- WindowManagerPolicy.FLAG_PASS_TO_USER);
- // If the message queue is now empty, then this gesture is complete
- if (!mHandler.hasMessages(MESSAGE_SEND_MOTION_EVENT)) {
- notifyService(true);
- }
- return true;
- }
- }
}
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index bc511ae..47094be 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1905,7 +1905,7 @@
SomeArgs args = SomeArgs.obtain();
args.arg1 = widget.host;
args.arg2 = widget.host.callbacks;
- args.arg3 = updateViews;
+ args.arg3 = (updateViews != null) ? updateViews.clone() : null;
args.arg4 = requestTime;
args.argi1 = widget.appWidgetId;
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index e6f99c1..497eac9 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -234,6 +234,7 @@
private static final int MSG_WIDGET_BROADCAST = 13;
private static final int MSG_RUN_FULL_TRANSPORT_BACKUP = 14;
private static final int MSG_REQUEST_BACKUP = 15;
+ private static final int MSG_SCHEDULE_BACKUP_PACKAGE = 16;
// backup task state machine tick
static final int MSG_BACKUP_RESTORE_STEP = 20;
@@ -796,7 +797,7 @@
queue, oldJournal, null, null, false);
Message pbtMessage = obtainMessage(MSG_BACKUP_RESTORE_STEP, pbt);
sendMessage(pbtMessage);
- } catch (RemoteException e) {
+ } catch (Exception e) {
// unable to ask the transport its dir name -- transient failure, since
// the above check succeeded. Try again next time.
Slog.e(TAG, "Transport became unavailable attempting backup");
@@ -939,7 +940,7 @@
}
if (sets == null) EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);
} catch (Exception e) {
- Slog.e(TAG, "Error from transport getting set list");
+ Slog.e(TAG, "Error from transport getting set list: " + e.getMessage());
} finally {
if (params.observer != null) {
try {
@@ -947,7 +948,7 @@
} catch (RemoteException re) {
Slog.e(TAG, "Unable to report listing to observer");
} catch (Exception e) {
- Slog.e(TAG, "Restore observer threw", e);
+ Slog.e(TAG, "Restore observer threw: " + e.getMessage());
}
}
@@ -1037,6 +1038,16 @@
sendMessage(pbtMessage);
break;
}
+
+ case MSG_SCHEDULE_BACKUP_PACKAGE:
+ {
+ String pkgName = (String)msg.obj;
+ if (MORE_DEBUG) {
+ Slog.d(TAG, "MSG_SCHEDULE_BACKUP_PACKAGE " + pkgName);
+ }
+ dataChangedImpl(pkgName);
+ break;
+ }
}
}
}
@@ -1216,7 +1227,7 @@
// Now that we know about valid backup participants, parse any
// leftover journal files into the pending backup set
- parseLeftoverJournals();
+ mBackupHandler.post(() -> parseLeftoverJournals());
// Power management
mWakelock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*backup*");
@@ -1759,8 +1770,10 @@
}
return; // done; don't fall through to the error case
}
- } catch (RemoteException e) {
+ } catch (Exception e) {
// transport threw when asked its name; fall through to the lookup-failed case
+ Slog.e(TAG, "Transport " + transportName + " failed to report name: "
+ + e.getMessage());
}
// The named transport doesn't exist or threw. This operation is
@@ -1848,7 +1861,7 @@
System.currentTimeMillis() + delay, mRunInitIntent);
}
}
- } catch (RemoteException e) {
+ } catch (Exception e) {
// the transport threw when asked its file naming prefs; declare it invalid
Slog.e(TAG, "Unable to register transport as " + name);
mTransportNames.remove(component);
@@ -2054,8 +2067,9 @@
IBackupTransport transport = IBackupTransport.Stub.asInterface(service);
registerTransport(transport.name(), name, transport);
EventLog.writeEvent(EventLogTags.BACKUP_TRANSPORT_LIFECYCLE, name, 1);
- } catch (RemoteException e) {
- Slog.e(TAG, "Unable to register transport " + component);
+ } catch (Exception e) {
+ Slog.e(TAG, "Unable to register transport " + component
+ + ": " + e.getMessage());
EventLog.writeEvent(EventLogTags.BACKUP_TRANSPORT_LIFECYCLE, name, 0);
}
}
@@ -2161,7 +2175,7 @@
int uid = pkg.applicationInfo.uid;
HashSet<String> set = mBackupParticipants.get(uid);
if (set == null) {
- set = new HashSet<String>();
+ set = new HashSet<>();
mBackupParticipants.put(uid, set);
}
set.add(pkg.packageName);
@@ -2169,7 +2183,9 @@
// Schedule a backup for it on general principles
if (MORE_DEBUG) Slog.i(TAG, "Scheduling backup for new app " + pkg.packageName);
- dataChangedImpl(pkg.packageName);
+ Message msg = mBackupHandler
+ .obtainMessage(MSG_SCHEDULE_BACKUP_PACKAGE, pkg.packageName);
+ mBackupHandler.sendMessage(msg);
}
}
}
@@ -2516,8 +2532,8 @@
String dirName;
try {
dirName = transport.transportDirName();
- } catch (RemoteException e) {
- Slog.e(TAG, "Transport became unavailable while attempting backup");
+ } catch (Exception e) {
+ Slog.e(TAG, "Transport unavailable while attempting backup: " + e.getMessage());
sendBackupFinished(observer, BackupManager.ERROR_TRANSPORT_ABORTED);
return BackupManager.ERROR_TRANSPORT_ABORTED;
}
@@ -2961,9 +2977,10 @@
try {
mCurrentToken = mTransport.getCurrentRestoreSet();
writeRestoreTokens();
- } catch (RemoteException e) {
+ } catch (Exception e) {
// nothing for it at this point, unfortunately, but this will be
// recorded the next time we fully succeed.
+ Slog.e(TAG, "Transport threw reporting restore set: " + e.getMessage());
addBackupTrace("transport threw returning token");
}
}
@@ -2988,7 +3005,7 @@
}
}
} catch (Exception e) {
- Slog.w(TAG, "Failed to query transport name heading for init", e);
+ Slog.w(TAG, "Failed to query transport name for init: " + e.getMessage());
// swallow it and proceed; we don't rely on this
}
clearMetadata();
@@ -3354,8 +3371,8 @@
try {
long quota = mTransport.getBackupQuota(mCurrentPackage.packageName, false);
mAgentBinder.doQuotaExceeded(size, quota);
- } catch (RemoteException e) {
- Slog.e(TAG, "Unable to contact backup agent for quota exceeded");
+ } catch (Exception e) {
+ Slog.e(TAG, "Unable to notify about quota exceeded: " + e.getMessage());
}
}
nextState = (mQueue.isEmpty()) ? BackupState.FINAL : BackupState.RUNNING_QUEUE;
@@ -3393,7 +3410,7 @@
try {
delay = mTransport.requestBackupTime();
} catch (Exception e) {
- Slog.w(TAG, "Unable to contact transport for recommended backoff");
+ Slog.w(TAG, "Unable to contact transport for recommended backoff: " + e.getMessage());
delay = 0; // use the scheduler's default
}
KeyValueBackupJob.schedule(mContext, delay);
@@ -4311,7 +4328,10 @@
Slog.e(TAG, "Internal exception during full backup", e);
} finally {
try {
- if (out != null) out.close();
+ if (out != null) {
+ out.flush();
+ out.close();
+ }
mOutputFile.close();
} catch (IOException e) {
/* nothing we can do about this */
@@ -4649,6 +4669,13 @@
}
cleanUpPipes(transportPipes);
cleanUpPipes(enginePipes);
+ if (currentPackage.applicationInfo != null) {
+ Slog.i(TAG, "Unbinding agent in " + packageName);
+ addBackupTrace("unbinding " + packageName);
+ try {
+ mActivityManager.unbindBackupAgent(currentPackage.applicationInfo);
+ } catch (RemoteException e) { /* can't happen; activity manager is local */ }
+ }
}
} catch (Exception e) {
backupRunStatus = BackupManager.ERROR_TRANSPORT_ABORTED;
@@ -4984,7 +5011,7 @@
return false;
}
} catch (Exception e) {
- Slog.w(TAG, "Unable to contact transport");
+ Slog.w(TAG, "Unable to get transport name: " + e.getMessage());
return false;
}
@@ -5474,11 +5501,11 @@
// If the policy is satisfied, go ahead and set up to pipe the
// data to the agent.
- if (DEBUG && okay && mAgent != null) {
+ if (MORE_DEBUG && okay && mAgent != null) {
Slog.i(TAG, "Reusing existing agent instance");
}
if (okay && mAgent == null) {
- if (DEBUG) Slog.d(TAG, "Need to launch agent for " + pkg);
+ if (MORE_DEBUG) Slog.d(TAG, "Need to launch agent for " + pkg);
try {
mTargetApp = mPackageManager.getApplicationInfo(pkg, 0);
@@ -5680,16 +5707,21 @@
}
void tearDownPipes() {
- if (mPipes != null) {
- try {
- mPipes[0].close();
- mPipes[0] = null;
- mPipes[1].close();
- mPipes[1] = null;
- } catch (IOException e) {
- Slog.w(TAG, "Couldn't close agent pipes", e);
+ // Teardown might arise from the inline restore processing or from the asynchronous
+ // timeout mechanism, and these might race. Make sure we don't try to close and
+ // null out the pipes twice.
+ synchronized (this) {
+ if (mPipes != null) {
+ try {
+ mPipes[0].close();
+ mPipes[0] = null;
+ mPipes[1].close();
+ mPipes[1] = null;
+ } catch (IOException e) {
+ Slog.w(TAG, "Couldn't close agent pipes", e);
+ }
+ mPipes = null;
}
- mPipes = null;
}
}
@@ -8208,9 +8240,9 @@
// Success; cache the metadata and continue as expected with the
// next state already enqueued
- } catch (RemoteException e) {
+ } catch (Exception e) {
// If we lost the transport at any time, halt
- Slog.e(TAG, "Unable to contact transport for restore");
+ Slog.e(TAG, "Unable to contact transport for restore: " + e.getMessage());
mStatus = BackupTransport.TRANSPORT_ERROR;
mBackupHandler.removeMessages(MSG_BACKUP_RESTORE_STEP, this);
executeNextState(UnifiedRestoreState.FINAL);
@@ -8307,8 +8339,9 @@
nextState = UnifiedRestoreState.RUNNING_QUEUE;
return;
}
- } catch (RemoteException e) {
- Slog.e(TAG, "Can't get next target from transport; ending restore");
+ } catch (Exception e) {
+ Slog.e(TAG, "Can't get next restore target from transport; halting: "
+ + e.getMessage());
EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);
nextState = UnifiedRestoreState.FINAL;
return;
@@ -8618,11 +8651,11 @@
EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE,
mCurrentPackage.packageName, "I/O error on pipes");
status = BackupTransport.AGENT_ERROR;
- } catch (RemoteException e) {
- // The transport went away; terminate the whole operation. Closing
+ } catch (Exception e) {
+ // The transport threw; terminate the whole operation. Closing
// the sockets will wake up the engine and it will then tidy up the
// remote end.
- Slog.e(TAG, "Transport failed during restore");
+ Slog.e(TAG, "Transport failed during restore: " + e.getMessage());
EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE);
status = BackupTransport.TRANSPORT_ERROR;
} finally {
@@ -8660,9 +8693,10 @@
// level is immaterial; we need to tell the transport to bail
try {
mTransport.abortFullRestore();
- } catch (RemoteException e) {
+ } catch (Exception e) {
// transport itself is dead; make sure we handle this as a
// fatal error
+ Slog.e(TAG, "Transport threw from abortFullRestore: " + e.getMessage());
status = BackupTransport.TRANSPORT_ERROR;
}
@@ -9010,16 +9044,15 @@
// Tell the transport to remove all the persistent storage for the app
// TODO - need to handle failures
mTransport.clearBackupData(mPackage);
- } catch (RemoteException e) {
- // can't happen; the transport is local
} catch (Exception e) {
- Slog.e(TAG, "Transport threw attempting to clear data for " + mPackage);
+ Slog.e(TAG, "Transport threw clearing data for " + mPackage + ": " + e.getMessage());
} finally {
try {
// TODO - need to handle failures
mTransport.finishBackup();
- } catch (RemoteException e) {
- // can't happen; the transport is local
+ } catch (Exception e) {
+ // Nothing we can do here, alas
+ Slog.e(TAG, "Unable to mark clear operation finished: " + e.getMessage());
}
// Last but not least, release the cpu
@@ -9078,8 +9111,6 @@
System.currentTimeMillis() + delay, mRunInitIntent);
}
}
- } catch (RemoteException e) {
- // can't happen; the transports are local
} catch (Exception e) {
Slog.e(TAG, "Unexpected error performing init", e);
} finally {
@@ -9767,8 +9798,9 @@
if (MORE_DEBUG) Slog.d(TAG, "getConfigurationIntent() returning config intent "
+ intent);
return intent;
- } catch (RemoteException e) {
+ } catch (Exception e) {
/* fall through to return null */
+ Slog.e(TAG, "Unable to get configuration intent from transport: " + e.getMessage());
}
}
}
@@ -9792,8 +9824,9 @@
final String text = transport.currentDestinationString();
if (MORE_DEBUG) Slog.d(TAG, "getDestinationString() returning " + text);
return text;
- } catch (RemoteException e) {
+ } catch (Exception e) {
/* fall through to return null */
+ Slog.e(TAG, "Unable to get string from transport: " + e.getMessage());
}
}
}
@@ -9814,8 +9847,9 @@
if (MORE_DEBUG) Slog.d(TAG, "getDataManagementIntent() returning intent "
+ intent);
return intent;
- } catch (RemoteException e) {
+ } catch (Exception e) {
/* fall through to return null */
+ Slog.e(TAG, "Unable to get management intent from transport: " + e.getMessage());
}
}
}
@@ -9836,8 +9870,9 @@
final String text = transport.dataManagementLabel();
if (MORE_DEBUG) Slog.d(TAG, "getDataManagementLabel() returning " + text);
return text;
- } catch (RemoteException e) {
+ } catch (Exception e) {
/* fall through to return null */
+ Slog.e(TAG, "Unable to get management label from transport: " + e.getMessage());
}
}
}
@@ -9930,9 +9965,9 @@
msg.obj = new RestoreParams(transport, dirName, null,
restoreSet, packageName, token);
mBackupHandler.sendMessage(msg);
- } catch (RemoteException e) {
- // Binding to the transport broke; back off and proceed with the installation.
- Slog.e(TAG, "Unable to contact transport");
+ } catch (Exception e) {
+ // Calling into the transport broke; back off and proceed with the installation.
+ Slog.e(TAG, "Unable to contact transport: " + e.getMessage());
skip = true;
}
}
@@ -10053,8 +10088,8 @@
try {
return transport.isAppEligibleForBackup(packageInfo,
appGetsFullBackup(packageInfo));
- } catch (RemoteException e) {
- Slog.e(TAG, "Unable to contact transport");
+ } catch (Exception e) {
+ Slog.e(TAG, "Unable to ask about eligibility: " + e.getMessage());
}
}
// If transport is not present we couldn't tell that the package is not eligible.
@@ -10156,9 +10191,9 @@
String dirName;
try {
dirName = mRestoreTransport.transportDirName();
- } catch (RemoteException e) {
+ } catch (Exception e) {
// Transport went AWOL; fail.
- Slog.e(TAG, "Unable to contact transport for restore");
+ Slog.e(TAG, "Unable to get transport dir for restore: " + e.getMessage());
return -1;
}
@@ -10238,9 +10273,9 @@
String dirName;
try {
dirName = mRestoreTransport.transportDirName();
- } catch (RemoteException e) {
+ } catch (Exception e) {
// Transport went AWOL; fail.
- Slog.e(TAG, "Unable to contact transport for restore");
+ Slog.e(TAG, "Unable to get transport name for restoreSome: " + e.getMessage());
return -1;
}
@@ -10328,9 +10363,9 @@
String dirName;
try {
dirName = mRestoreTransport.transportDirName();
- } catch (RemoteException e) {
+ } catch (Exception e) {
// Transport went AWOL; fail.
- Slog.e(TAG, "Unable to contact transport for restore");
+ Slog.e(TAG, "Unable to get transport dir for restorePackage: " + e.getMessage());
return -1;
}
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 312553a..4dd88b2 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -2547,7 +2547,9 @@
} else {
// Just in case -- even though no wakeup flag was set, make sure
// we have updated the kernel to the next alarm time.
- rescheduleKernelAlarmsLocked();
+ synchronized (mLock) {
+ rescheduleKernelAlarmsLocked();
+ }
}
}
}
diff --git a/services/core/java/com/android/server/AnyMotionDetector.java b/services/core/java/com/android/server/AnyMotionDetector.java
index a8ae914d..f93c716 100644
--- a/services/core/java/com/android/server/AnyMotionDetector.java
+++ b/services/core/java/com/android/server/AnyMotionDetector.java
@@ -70,6 +70,9 @@
/** The interval between accelerometer orientation measurements. */
private static final long ORIENTATION_MEASUREMENT_INTERVAL_MILLIS = 5000;
+ /** The maximum duration we will hold a wakelock to determine stationary status. */
+ private static final long WAKELOCK_TIMEOUT_MILLIS = 30000;
+
/**
* The duration in milliseconds after which an orientation measurement is considered
* too stale to be used.
@@ -141,25 +144,30 @@
mCurrentGravityVector = null;
mPreviousGravityVector = null;
mWakeLock.acquire();
+ Message wakelockTimeoutMsg = Message.obtain(mHandler, mWakelockTimeout);
+ mHandler.sendMessageDelayed(wakelockTimeoutMsg, WAKELOCK_TIMEOUT_MILLIS);
startOrientationMeasurementLocked();
}
}
}
public void stop() {
- if (mState == STATE_ACTIVE) {
- synchronized (mLock) {
+ synchronized (mLock) {
+ if (mState == STATE_ACTIVE) {
mState = STATE_INACTIVE;
if (DEBUG) Slog.d(TAG, "Moved from STATE_ACTIVE to STATE_INACTIVE.");
- if (mMeasurementInProgress) {
- mMeasurementInProgress = false;
- mSensorManager.unregisterListener(mListener);
- }
- mHandler.removeCallbacks(mMeasurementTimeout);
- mHandler.removeCallbacks(mSensorRestart);
- mCurrentGravityVector = null;
- mPreviousGravityVector = null;
+ }
+ if (mMeasurementInProgress) {
+ mMeasurementInProgress = false;
+ mSensorManager.unregisterListener(mListener);
+ }
+ mHandler.removeCallbacks(mMeasurementTimeout);
+ mHandler.removeCallbacks(mSensorRestart);
+ mCurrentGravityVector = null;
+ mPreviousGravityVector = null;
+ if (mWakeLock.isHeld()) {
mWakeLock.release();
+ mHandler.removeCallbacks(mWakelockTimeout);
}
}
}
@@ -173,9 +181,8 @@
mMeasurementInProgress = true;
mRunningStats.reset();
}
- Message msg = Message.obtain(mHandler, mMeasurementTimeout);
- msg.setAsynchronous(true);
- mHandler.sendMessageDelayed(msg, ACCELEROMETER_DATA_TIMEOUT_MILLIS);
+ Message measurementTimeoutMsg = Message.obtain(mHandler, mMeasurementTimeout);
+ mHandler.sendMessageDelayed(measurementTimeoutMsg, ACCELEROMETER_DATA_TIMEOUT_MILLIS);
}
}
@@ -186,10 +193,12 @@
if (mMeasurementInProgress) {
mSensorManager.unregisterListener(mListener);
mHandler.removeCallbacks(mMeasurementTimeout);
- long detectionEndTime = SystemClock.elapsedRealtime();
mMeasurementInProgress = false;
mPreviousGravityVector = mCurrentGravityVector;
mCurrentGravityVector = mRunningStats.getRunningAverage();
+ if (mRunningStats.getSampleCount() == 0) {
+ Slog.w(TAG, "No accelerometer data acquired for orientation measurement.");
+ }
if (DEBUG) {
Slog.d(TAG, "mRunningStats = " + mRunningStats.toString());
String currentGravityVectorString = (mCurrentGravityVector == null) ?
@@ -203,7 +212,10 @@
status = getStationaryStatus();
if (DEBUG) Slog.d(TAG, "getStationaryStatus() returned " + status);
if (status != RESULT_UNKNOWN) {
- mWakeLock.release();
+ if (mWakeLock.isHeld()) {
+ mWakeLock.release();
+ mHandler.removeCallbacks(mWakelockTimeout);
+ }
if (DEBUG) {
Slog.d(TAG, "Moved from STATE_ACTIVE to STATE_INACTIVE. status = " + status);
}
@@ -217,7 +229,6 @@
" scheduled in " + ORIENTATION_MEASUREMENT_INTERVAL_MILLIS +
" milliseconds.");
Message msg = Message.obtain(mHandler, mSensorRestart);
- msg.setAsynchronous(true);
mHandler.sendMessageDelayed(msg, ORIENTATION_MEASUREMENT_INTERVAL_MILLIS);
}
}
@@ -271,6 +282,7 @@
}
}
if (status != RESULT_UNKNOWN) {
+ mHandler.removeCallbacks(mWakelockTimeout);
mCallback.onAnyMotionResult(status);
}
}
@@ -290,20 +302,30 @@
};
private final Runnable mMeasurementTimeout = new Runnable() {
- @Override
- public void run() {
- int status = RESULT_UNKNOWN;
- synchronized (mLock) {
- if (DEBUG) Slog.i(TAG, "mMeasurementTimeout. Failed to collect sufficient accel " +
+ @Override
+ public void run() {
+ int status = RESULT_UNKNOWN;
+ synchronized (mLock) {
+ if (DEBUG) Slog.i(TAG, "mMeasurementTimeout. Failed to collect sufficient accel " +
"data within " + ACCELEROMETER_DATA_TIMEOUT_MILLIS + " ms. Stopping " +
"orientation measurement.");
- status = stopOrientationMeasurementLocked();
- }
- if (status != RESULT_UNKNOWN) {
- mCallback.onAnyMotionResult(status);
- }
- }
- };
+ status = stopOrientationMeasurementLocked();
+ }
+ if (status != RESULT_UNKNOWN) {
+ mHandler.removeCallbacks(mWakelockTimeout);
+ mCallback.onAnyMotionResult(status);
+ }
+ }
+ };
+
+ private final Runnable mWakelockTimeout = new Runnable() {
+ @Override
+ public void run() {
+ synchronized (mLock) {
+ stop();
+ }
+ }
+ };
/**
* A timestamped three dimensional vector and some vector operations.
diff --git a/services/core/java/com/android/server/AttributeCache.java b/services/core/java/com/android/server/AttributeCache.java
index 57f18c0..58ec836 100644
--- a/services/core/java/com/android/server/AttributeCache.java
+++ b/services/core/java/com/android/server/AttributeCache.java
@@ -25,23 +25,24 @@
import android.content.res.TypedArray;
import android.os.UserHandle;
import android.util.ArrayMap;
+import android.util.LruCache;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
-import java.lang.ref.WeakReference;
-
/**
* TODO: This should be better integrated into the system so it doesn't need
* special calls from the activity manager to clear it.
*/
public final class AttributeCache {
+ private static final int CACHE_SIZE = 4;
private static AttributeCache sInstance = null;
private final Context mContext;
@GuardedBy("this")
- private final ArrayMap<String, WeakReference<Package>> mPackages = new ArrayMap<>();
+ private final LruCache<String, Package> mPackages = new LruCache<>(CACHE_SIZE);
+
@GuardedBy("this")
private final Configuration mConfiguration = new Configuration();
@@ -86,15 +87,12 @@
public void removePackage(String packageName) {
synchronized (this) {
- final WeakReference<Package> ref = mPackages.remove(packageName);
- final Package pkg = (ref != null) ? ref.get() : null;
+ final Package pkg = mPackages.remove(packageName);
if (pkg != null) {
- if (pkg.mMap != null) {
- for (int i = 0; i < pkg.mMap.size(); i++) {
- final ArrayMap<int[], Entry> map = pkg.mMap.valueAt(i);
- for (int j = 0; j < map.size(); j++) {
- map.valueAt(j).recycle();
- }
+ for (int i = 0; i < pkg.mMap.size(); i++) {
+ final ArrayMap<int[], Entry> map = pkg.mMap.valueAt(i);
+ for (int j = 0; j < map.size(); j++) {
+ map.valueAt(j).recycle();
}
}
@@ -113,15 +111,14 @@
// The configurations being masked out are ones that commonly
// change so we don't want flushing the cache... all others
// will flush the cache.
- mPackages.clear();
+ mPackages.evictAll();
}
}
}
public Entry get(String packageName, int resId, int[] styleable, int userId) {
synchronized (this) {
- WeakReference<Package> ref = mPackages.get(packageName);
- Package pkg = (ref != null) ? ref.get() : null;
+ Package pkg = mPackages.get(packageName);
ArrayMap<int[], Entry> map = null;
Entry ent = null;
if (pkg != null) {
@@ -144,7 +141,7 @@
return null;
}
pkg = new Package(context);
- mPackages.put(packageName, new WeakReference<>(pkg));
+ mPackages.put(packageName, pkg);
}
if (map == null) {
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index baa0bbe..8b243e7 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -35,10 +35,12 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.database.ContentObserver;
import android.os.Binder;
+import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
@@ -61,7 +63,7 @@
class BluetoothManagerService extends IBluetoothManager.Stub {
private static final String TAG = "BluetoothManagerService";
- private static final boolean DBG = false;
+ private static final boolean DBG = true;
private static final String BLUETOOTH_ADMIN_PERM = android.Manifest.permission.BLUETOOTH_ADMIN;
private static final String BLUETOOTH_PERM = android.Manifest.permission.BLUETOOTH;
@@ -151,6 +153,8 @@
private final Map <Integer, ProfileServiceConnections> mProfileServices =
new HashMap <Integer, ProfileServiceConnections>();
+ private final boolean mPermissionReviewRequired;
+
private void registerForAirplaneMode(IntentFilter filter) {
final ContentResolver resolver = mContext.getContentResolver();
final String airplaneModeRadios = Settings.Global.getString(resolver,
@@ -243,6 +247,11 @@
mHandler = new BluetoothHandler(IoThread.get().getLooper());
mContext = context;
+
+ mPermissionReviewRequired = Build.PERMISSIONS_REVIEW_REQUIRED
+ || context.getResources().getBoolean(
+ com.android.internal.R.bool.config_permissionReviewRequired);
+
mBluetooth = null;
mBluetoothBinder = null;
mBluetoothGatt = null;
@@ -644,15 +653,26 @@
return true;
}
- public boolean enable() {
- if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
- (!checkIfCallerIsForegroundUser())) {
- Slog.w(TAG,"enable(): not allowed for non-active and non system user");
- return false;
+ public boolean enable(String packageName) throws RemoteException {
+ final int callingUid = Binder.getCallingUid();
+ final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
+
+ if (!callerSystem) {
+ if (!checkIfCallerIsForegroundUser()) {
+ Slog.w(TAG, "enable(): not allowed for non-active and non system user");
+ return false;
+ }
+
+ mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
+ "Need BLUETOOTH ADMIN permission");
+
+ if (!isEnabled() && mPermissionReviewRequired
+ && startConsentUiIfNeeded(packageName, callingUid,
+ BluetoothAdapter.ACTION_REQUEST_ENABLE)) {
+ return false;
+ }
}
- mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
- "Need BLUETOOTH ADMIN permission");
if (DBG) {
Slog.d(TAG,"enable(): mBluetooth =" + mBluetooth +
" mBinding = " + mBinding + " mState = " + mState);
@@ -668,14 +688,24 @@
return true;
}
- public boolean disable(boolean persist) {
- mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
- "Need BLUETOOTH ADMIN permissicacheNameAndAddresson");
+ public boolean disable(String packageName, boolean persist) throws RemoteException {
+ final int callingUid = Binder.getCallingUid();
+ final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
- if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
- (!checkIfCallerIsForegroundUser())) {
- Slog.w(TAG,"disable(): not allowed for non-active and non system user");
- return false;
+ if (!callerSystem) {
+ if (!checkIfCallerIsForegroundUser()) {
+ Slog.w(TAG, "disable(): not allowed for non-active and non system user");
+ return false;
+ }
+
+ mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
+ "Need BLUETOOTH ADMIN permission");
+
+ if (isEnabled() && mPermissionReviewRequired
+ && startConsentUiIfNeeded(packageName, callingUid,
+ BluetoothAdapter.ACTION_REQUEST_DISABLE)) {
+ return false;
+ }
}
if (DBG) {
@@ -696,6 +726,31 @@
return true;
}
+ private boolean startConsentUiIfNeeded(String packageName,
+ int callingUid, String intentAction) throws RemoteException {
+ try {
+ // Validate the package only if we are going to use it
+ ApplicationInfo applicationInfo = mContext.getPackageManager()
+ .getApplicationInfoAsUser(packageName,
+ PackageManager.MATCH_DEBUG_TRIAGED_MISSING,
+ UserHandle.getUserId(callingUid));
+ if (applicationInfo.uid != callingUid) {
+ throw new SecurityException("Package " + callingUid
+ + " not in uid " + callingUid);
+ }
+
+ // Legacy apps in permission review mode trigger a user prompt
+ if (applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
+ Intent intent = new Intent(intentAction);
+ mContext.startActivity(intent);
+ return true;
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ throw new RemoteException(e.getMessage());
+ }
+ return false;
+ }
+
public void unbindAndFinish() {
if (DBG) {
Slog.d(TAG,"unbindAndFinish(): " + mBluetooth +
@@ -1512,7 +1567,7 @@
bluetoothStateChangeHandler(BluetoothAdapter.STATE_ON,
BluetoothAdapter.STATE_TURNING_OFF);
- waitForOnOff(false, true);
+ boolean didDisableTimeout = !waitForOnOff(false, true);
bluetoothStateChangeHandler(BluetoothAdapter.STATE_TURNING_OFF,
BluetoothAdapter.STATE_OFF);
@@ -1530,7 +1585,16 @@
mBluetoothLock.writeLock().unlock();
}
- SystemClock.sleep(100);
+ //
+ // If disabling Bluetooth times out, wait for an
+ // additional amount of time to ensure the process is
+ // shut down completely before attempting to restart.
+ //
+ if (didDisableTimeout) {
+ SystemClock.sleep(3000);
+ } else {
+ SystemClock.sleep(100);
+ }
mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);
mState = BluetoothAdapter.STATE_OFF;
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 167e6cc..70f39db 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -76,6 +76,7 @@
import android.net.UidRange;
import android.net.Uri;
import android.net.metrics.DefaultNetworkEvent;
+import android.net.metrics.IpConnectivityLog;
import android.net.metrics.NetworkEvent;
import android.os.Binder;
import android.os.Build;
@@ -93,6 +94,7 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
+import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
@@ -124,6 +126,7 @@
import com.android.internal.util.AsyncChannel;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.MessageUtils;
+import com.android.internal.util.WakeupMessage;
import com.android.internal.util.XmlUtils;
import com.android.server.am.BatteryStatsService;
import com.android.server.connectivity.DataConnectionStats;
@@ -170,7 +173,7 @@
*/
public class ConnectivityService extends IConnectivityManager.Stub
implements PendingIntent.OnFinished {
- private static final String TAG = "ConnectivityService";
+ private static final String TAG = ConnectivityService.class.getSimpleName();
private static final boolean DBG = true;
private static final boolean VDBG = false;
@@ -190,6 +193,12 @@
// connect anyway?" dialog after the user selects a network that doesn't validate.
private static final int PROMPT_UNVALIDATED_DELAY_MS = 8 * 1000;
+ // Default to 30s linger time-out. Modifiable only for testing.
+ private static final String LINGER_DELAY_PROPERTY = "persist.netmon.linger";
+ private static final int DEFAULT_LINGER_DELAY_MS = 30_000;
+ @VisibleForTesting
+ protected int mLingerDelayMs; // Can't be final, or test subclass constructors can't change it.
+
// How long to delay to removal of a pending intent based request.
// See Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS
private final int mReleasePendingIntentDelayMs;
@@ -238,7 +247,8 @@
private static final int DISABLED = 0;
private static final SparseArray<String> sMagicDecoderRing = MessageUtils.findMessageNames(
- new Class[] { AsyncChannel.class, ConnectivityService.class, NetworkAgent.class });
+ new Class[] { AsyncChannel.class, ConnectivityService.class, NetworkAgent.class,
+ NetworkAgentInfo.class });
private enum ReapUnvalidatedNetworks {
// Tear down networks that have no chance (e.g. even if validated) of becoming
@@ -293,7 +303,7 @@
/**
* indicates a timeout period is over - check if we had a network yet or not
- * and if not, call the timeout calback (but leave the request live until they
+ * and if not, call the timeout callback (but leave the request live until they
* cancel it.
* includes a NetworkRequestInfo
*/
@@ -370,6 +380,16 @@
*/
private static final int EVENT_REGISTER_NETWORK_LISTENER_WITH_INTENT = 31;
+ /**
+ * Indicates a caller has requested to have its callback invoked with
+ * the latest LinkProperties or NetworkCapabilities.
+ *
+ * arg1 = UID of caller
+ * obj = NetworkRequest
+ */
+ private static final int EVENT_REQUEST_LINKPROPERTIES = 32;
+ private static final int EVENT_REQUEST_NETCAPABILITIES = 33;
+
/** Handler thread used for both of the handlers below. */
@VisibleForTesting
protected final HandlerThread mHandlerThread;
@@ -429,6 +449,11 @@
private static final int MAX_NETWORK_REQUEST_LOGS = 20;
private final LocalLog mNetworkRequestInfoLogs = new LocalLog(MAX_NETWORK_REQUEST_LOGS);
+ // NetworkInfo blocked and unblocked String log entries
+ // TODO: consider reducing memory usage. Each log line is ~40 2B chars, for a total of ~8kB.
+ private static final int MAX_NETWORK_INFO_LOGS = 100;
+ private final LocalLog mNetworkInfoBlockingLogs = new LocalLog(MAX_NETWORK_INFO_LOGS);
+
// Array of <Network,ReadOnlyLocalLogs> tracking network validation and results
private static final int MAX_VALIDATION_LOGS = 10;
private static class ValidationLog {
@@ -454,6 +479,8 @@
}
}
+ private final IpConnectivityLog mMetricsLog;
+
/**
* Implements support for the legacy "one network per network type" model.
*
@@ -650,11 +677,18 @@
public ConnectivityService(Context context, INetworkManagementService netManager,
INetworkStatsService statsService, INetworkPolicyManager policyManager) {
+ this(context, netManager, statsService, policyManager, new IpConnectivityLog());
+ }
+
+ @VisibleForTesting
+ protected ConnectivityService(Context context, INetworkManagementService netManager,
+ INetworkStatsService statsService, INetworkPolicyManager policyManager,
+ IpConnectivityLog logger) {
if (DBG) log("ConnectivityService starting up");
+ mMetricsLog = logger;
mDefaultRequest = createInternetRequestForTransport(-1);
- NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest,
- new Binder(), NetworkRequestType.REQUEST);
+ NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder());
mNetworkRequests.put(mDefaultRequest, defaultNRI);
mNetworkRequestInfoLogs.log("REGISTER " + defaultNRI);
@@ -679,6 +713,8 @@
mReleasePendingIntentDelayMs = Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, 5_000);
+ mLingerDelayMs = SystemProperties.getInt(LINGER_DELAY_PROPERTY, DEFAULT_LINGER_DELAY_MS);
+
mContext = checkNotNull(context, "missing Context");
mNetd = checkNotNull(netManager, "missing INetworkManagementService");
mStatsService = checkNotNull(statsService, "missing INetworkStatsService");
@@ -805,7 +841,8 @@
if (transportType > -1) {
netCap.addTransportType(transportType);
}
- return new NetworkRequest(netCap, TYPE_NONE, nextNetworkRequestId());
+ return new NetworkRequest(netCap, TYPE_NONE, nextNetworkRequestId(),
+ NetworkRequest.Type.REQUEST);
}
// Used only for testing.
@@ -829,7 +866,7 @@
if (enable) {
handleRegisterNetworkRequest(new NetworkRequestInfo(
- null, mDefaultMobileDataRequest, new Binder(), NetworkRequestType.REQUEST));
+ null, mDefaultMobileDataRequest, new Binder()));
} else {
handleReleaseNetworkRequest(mDefaultMobileDataRequest, Process.SYSTEM_UID);
}
@@ -989,7 +1026,9 @@
}
private void maybeLogBlockedNetworkInfo(NetworkInfo ni, int uid) {
- if (ni == null || !LOGD_BLOCKED_NETWORKINFO) return;
+ if (ni == null || !LOGD_BLOCKED_NETWORKINFO) {
+ return;
+ }
boolean removed = false;
boolean added = false;
synchronized (mBlockedAppUids) {
@@ -999,8 +1038,13 @@
removed = true;
}
}
- if (added) log("Returning blocked NetworkInfo to uid=" + uid);
- else if (removed) log("Returning unblocked NetworkInfo to uid=" + uid);
+ if (added) {
+ log("Returning blocked NetworkInfo to uid=" + uid);
+ mNetworkInfoBlockingLogs.log("BLOCKED " + uid);
+ } else if (removed) {
+ log("Returning unblocked NetworkInfo to uid=" + uid);
+ mNetworkInfoBlockingLogs.log("UNBLOCKED " + uid);
+ }
}
/**
@@ -1080,6 +1124,7 @@
return nai != null ? nai.network : null;
}
+ // Public because it's used by mLockdownTracker.
public NetworkInfo getActiveNetworkInfoUnfiltered() {
enforceAccessPermission();
final int uid = Binder.getCallingUid();
@@ -1335,6 +1380,7 @@
* desired
* @return {@code true} on success, {@code false} on failure
*/
+ @Override
public boolean requestRouteToHostAddress(int networkType, byte[] hostAddress) {
enforceChangePermission();
if (mProtectedNetworks.contains(networkType)) {
@@ -1539,10 +1585,21 @@
"ConnectivityService");
}
+ private void enforceConnectivityRestrictedNetworksPermission() {
+ try {
+ mContext.enforceCallingOrSelfPermission(
+ android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS,
+ "ConnectivityService");
+ return;
+ } catch (SecurityException e) { /* fallback to ConnectivityInternalPermission */ }
+ enforceConnectivityInternalPermission();
+ }
+
private void enforceKeepalivePermission() {
mContext.enforceCallingOrSelfPermission(KeepaliveTracker.PERMISSION, "ConnectivityService");
}
+ // Public because it's used by mLockdownTracker.
public void sendConnectedBroadcast(NetworkInfo info) {
enforceConnectivityInternalPermission();
sendGeneralBroadcast(info, CONNECTIVITY_ACTION);
@@ -1902,15 +1959,16 @@
for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
pw.println(nai.toString());
pw.increaseIndent();
- pw.println("Requests:");
+ pw.println(String.format("Requests: %d request/%d total",
+ nai.numRequestNetworkRequests(), nai.numNetworkRequests()));
pw.increaseIndent();
- for (int i = 0; i < nai.networkRequests.size(); i++) {
- pw.println(nai.networkRequests.valueAt(i).toString());
+ for (int i = 0; i < nai.numNetworkRequests(); i++) {
+ pw.println(nai.requestAt(i).toString());
}
pw.decreaseIndent();
pw.println("Lingered:");
pw.increaseIndent();
- for (NetworkRequest nr : nai.networkLingered) pw.println(nr.toString());
+ nai.dumpLingerTimers(pw);
pw.decreaseIndent();
pw.decreaseIndent();
}
@@ -1999,6 +2057,12 @@
pw.increaseIndent();
mNetworkRequestInfoLogs.reverseDump(fd, pw, args);
pw.decreaseIndent();
+
+ pw.println();
+ pw.println("mNetworkInfoBlockingLogs (most recent first):");
+ pw.increaseIndent();
+ mNetworkInfoBlockingLogs.reverseDump(fd, pw, args);
+ pw.decreaseIndent();
}
}
@@ -2014,10 +2078,6 @@
return false;
}
- private boolean isRequest(NetworkRequest request) {
- return mNetworkRequests.get(request).isRequest();
- }
-
// must be stateless - things change under us.
private class NetworkStateTrackerHandler extends Handler {
public NetworkStateTrackerHandler(Looper looper) {
@@ -2159,13 +2219,6 @@
}
break;
}
- case NetworkMonitor.EVENT_NETWORK_LINGER_COMPLETE: {
- NetworkAgentInfo nai = (NetworkAgentInfo)msg.obj;
- if (isLiveNetworkAgent(nai, msg.what)) {
- handleLingerComplete(nai);
- }
- break;
- }
case NetworkMonitor.EVENT_PROVISIONING_NOTIFICATION: {
final int netId = msg.arg2;
final boolean visible = (msg.arg1 != 0);
@@ -2198,33 +2251,50 @@
return true;
}
+ private boolean maybeHandleNetworkAgentInfoMessage(Message msg) {
+ switch (msg.what) {
+ default:
+ return false;
+ case NetworkAgentInfo.EVENT_NETWORK_LINGER_COMPLETE: {
+ NetworkAgentInfo nai = (NetworkAgentInfo) msg.obj;
+ if (nai != null && isLiveNetworkAgent(nai, msg.what)) {
+ handleLingerComplete(nai);
+ }
+ break;
+ }
+ }
+ return true;
+ }
+
@Override
public void handleMessage(Message msg) {
- if (!maybeHandleAsyncChannelMessage(msg) && !maybeHandleNetworkMonitorMessage(msg)) {
+ if (!maybeHandleAsyncChannelMessage(msg) &&
+ !maybeHandleNetworkMonitorMessage(msg) &&
+ !maybeHandleNetworkAgentInfoMessage(msg)) {
maybeHandleNetworkAgentMessage(msg);
}
}
}
- private void linger(NetworkAgentInfo nai) {
- nai.lingering = true;
- NetworkEvent.logEvent(nai.network.netId, NetworkEvent.NETWORK_LINGER);
- nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_LINGER);
- notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOSING);
- }
-
- // Cancel any lingering so the linger timeout doesn't teardown a network.
- // This should be called when a network begins satisfying a NetworkRequest.
- // Note: depending on what state the NetworkMonitor is in (e.g.,
- // if it's awaiting captive portal login, or if validation failed), this
- // may trigger a re-evaluation of the network.
- private void unlinger(NetworkAgentInfo nai) {
- nai.networkLingered.clear();
- if (!nai.lingering) return;
- nai.lingering = false;
- NetworkEvent.logEvent(nai.network.netId, NetworkEvent.NETWORK_UNLINGER);
- if (VDBG) log("Canceling linger of " + nai.name());
- nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
+ private void updateLingerState(NetworkAgentInfo nai, long now) {
+ // 1. Update the linger timer. If it's changed, reschedule or cancel the alarm.
+ // 2. If the network was lingering and there are now requests, unlinger it.
+ // 3. If this network is unneeded (which implies it is not lingering), and there is at least
+ // one lingered request, start lingering.
+ nai.updateLingerTimer();
+ if (nai.isLingering() && nai.numRequestNetworkRequests() > 0) {
+ if (DBG) log("Unlingering " + nai.name());
+ nai.unlinger();
+ logNetworkEvent(nai, NetworkEvent.NETWORK_UNLINGER);
+ } else if (unneeded(nai) && nai.getLingerExpiry() > 0) { // unneeded() calls isLingering()
+ int lingerTime = (int) (nai.getLingerExpiry() - now);
+ if (DBG) {
+ Log.d(TAG, "Lingering " + nai.name() + " for " + lingerTime + "ms");
+ }
+ nai.linger();
+ logNetworkEvent(nai, NetworkEvent.NETWORK_LINGER);
+ notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOSING, lingerTime);
+ }
}
private void handleAsyncChannelHalfConnect(Message msg) {
@@ -2234,7 +2304,7 @@
if (VDBG) log("NetworkFactory connected");
// A network factory has connected. Send it all current NetworkRequests.
for (NetworkRequestInfo nri : mNetworkRequests.values()) {
- if (!nri.isRequest()) continue;
+ if (nri.request.isListen()) continue;
NetworkAgentInfo nai = mNetworkForRequestId.get(nri.request.requestId);
ac.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK,
(nai != null ? nai.getCurrentScore() : 0), 0, nri.request);
@@ -2269,7 +2339,7 @@
NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
if (nai != null) {
if (DBG) {
- log(nai.name() + " got DISCONNECTED, was satisfying " + nai.networkRequests.size());
+ log(nai.name() + " got DISCONNECTED, was satisfying " + nai.numNetworkRequests());
}
// A network agent has disconnected.
// TODO - if we move the logic to the network agent (have them disconnect
@@ -2306,15 +2376,16 @@
mNetworkForNetId.remove(nai.network.netId);
}
// Remove all previously satisfied requests.
- for (int i = 0; i < nai.networkRequests.size(); i++) {
- NetworkRequest request = nai.networkRequests.valueAt(i);
+ for (int i = 0; i < nai.numNetworkRequests(); i++) {
+ NetworkRequest request = nai.requestAt(i);
NetworkAgentInfo currentNetwork = mNetworkForRequestId.get(request.requestId);
if (currentNetwork != null && currentNetwork.network.netId == nai.network.netId) {
mNetworkForRequestId.remove(request.requestId);
sendUpdatedScoreToFactories(request, 0);
}
}
- if (nai.networkRequests.get(mDefaultRequest.requestId) != null) {
+ nai.clearLingerState();
+ if (nai.isSatisfyingRequest(mDefaultRequest.requestId)) {
removeDataActivityTracking(nai);
notifyLockdownVpn(nai);
requestNetworkTransitionWakelock(nai.name());
@@ -2375,7 +2446,7 @@
private void handleRegisterNetworkRequest(NetworkRequestInfo nri) {
mNetworkRequests.put(nri.request, nri);
mNetworkRequestInfoLogs.log("REGISTER " + nri);
- if (!nri.isRequest()) {
+ if (nri.request.isListen()) {
for (NetworkAgentInfo network : mNetworkAgentInfos.values()) {
if (nri.request.networkCapabilities.hasSignalStrength() &&
network.satisfiesImmutableCapabilitiesOf(nri.request)) {
@@ -2384,7 +2455,7 @@
}
}
rematchAllNetworksAndRequests(null, 0);
- if (nri.isRequest() && mNetworkForRequestId.get(nri.request.requestId) == null) {
+ if (nri.request.isRequest() && mNetworkForRequestId.get(nri.request.requestId) == null) {
sendUpdatedScoreToFactories(nri.request, 0);
}
}
@@ -2401,12 +2472,15 @@
// This is whether it is satisfying any NetworkRequests or were it to become validated,
// would it have a chance of satisfying any NetworkRequests.
private boolean unneeded(NetworkAgentInfo nai) {
- if (!nai.everConnected || nai.isVPN() || nai.lingering) return false;
+ if (!nai.everConnected || nai.isVPN() ||
+ nai.isLingering() || nai.numRequestNetworkRequests() > 0) {
+ return false;
+ }
for (NetworkRequestInfo nri : mNetworkRequests.values()) {
// If this Network is already the highest scoring Network for a request, or if
// there is hope for it to become one if it validated, then it is needed.
- if (nri.isRequest() && nai.satisfies(nri.request) &&
- (nai.networkRequests.get(nri.request.requestId) != null ||
+ if (nri.request.isRequest() && nai.satisfies(nri.request) &&
+ (nai.isSatisfyingRequest(nri.request.requestId) ||
// Note that this catches two important cases:
// 1. Unvalidated cellular will not be reaped when unvalidated WiFi
// is currently satisfying the request. This is desirable when
@@ -2422,102 +2496,149 @@
return true;
}
- private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) {
- NetworkRequestInfo nri = mNetworkRequests.get(request);
+ private NetworkRequestInfo getNriForAppRequest(
+ NetworkRequest request, int callingUid, String requestedOperation) {
+ final NetworkRequestInfo nri = mNetworkRequests.get(request);
+
if (nri != null) {
if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) {
- if (DBG) log("Attempt to release unowned NetworkRequest " + request);
- return;
+ log(String.format("UID %d attempted to %s for unowned request %s",
+ callingUid, requestedOperation, nri));
+ return null;
}
- if (VDBG || (DBG && nri.isRequest())) log("releasing NetworkRequest " + request);
- nri.unlinkDeathRecipient();
- mNetworkRequests.remove(request);
- synchronized (mUidToNetworkRequestCount) {
- int requests = mUidToNetworkRequestCount.get(nri.mUid, 0);
- if (requests < 1) {
- Slog.wtf(TAG, "BUG: too small request count " + requests + " for UID " +
- nri.mUid);
- } else if (requests == 1) {
- mUidToNetworkRequestCount.removeAt(
- mUidToNetworkRequestCount.indexOfKey(nri.mUid));
- } else {
- mUidToNetworkRequestCount.put(nri.mUid, requests - 1);
- }
- }
- mNetworkRequestInfoLogs.log("RELEASE " + nri);
- if (nri.isRequest()) {
- // Find all networks that are satisfying this request and remove the request
- // from their request lists.
- // TODO - it's my understanding that for a request there is only a single
- // network satisfying it, so this loop is wasteful
- boolean wasKept = false;
- for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
- if (nai.networkRequests.get(nri.request.requestId) != null) {
- nai.networkRequests.remove(nri.request.requestId);
- if (VDBG) {
- log(" Removing from current network " + nai.name() +
- ", leaving " + nai.networkRequests.size() +
- " requests.");
- }
- if (unneeded(nai)) {
- if (DBG) log("no live requests for " + nai.name() + "; disconnecting");
- teardownUnneededNetwork(nai);
- } else {
- // suspect there should only be one pass through here
- // but if any were kept do the check below
- wasKept |= true;
- }
- }
- }
-
- NetworkAgentInfo nai = mNetworkForRequestId.get(nri.request.requestId);
- if (nai != null) {
- mNetworkForRequestId.remove(nri.request.requestId);
- }
- // Maintain the illusion. When this request arrived, we might have pretended
- // that a network connected to serve it, even though the network was already
- // connected. Now that this request has gone away, we might have to pretend
- // that the network disconnected. LegacyTypeTracker will generate that
- // phantom disconnect for this type.
- if (nri.request.legacyType != TYPE_NONE && nai != null) {
- boolean doRemove = true;
- if (wasKept) {
- // check if any of the remaining requests for this network are for the
- // same legacy type - if so, don't remove the nai
- for (int i = 0; i < nai.networkRequests.size(); i++) {
- NetworkRequest otherRequest = nai.networkRequests.valueAt(i);
- if (otherRequest.legacyType == nri.request.legacyType &&
- isRequest(otherRequest)) {
- if (DBG) log(" still have other legacy request - leaving");
- doRemove = false;
- }
- }
- }
-
- if (doRemove) {
- mLegacyTypeTracker.remove(nri.request.legacyType, nai, false);
- }
- }
-
- for (NetworkFactoryInfo nfi : mNetworkFactoryInfos.values()) {
- nfi.asyncChannel.sendMessage(android.net.NetworkFactory.CMD_CANCEL_REQUEST,
- nri.request);
- }
- } else {
- // listens don't have a singular affectedNetwork. Check all networks to see
- // if this listen request applies and remove it.
- for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
- nai.networkRequests.remove(nri.request.requestId);
- if (nri.request.networkCapabilities.hasSignalStrength() &&
- nai.satisfiesImmutableCapabilitiesOf(nri.request)) {
- updateSignalStrengthThresholds(nai, "RELEASE", nri.request);
- }
- }
- }
- callCallbackForRequest(nri, null, ConnectivityManager.CALLBACK_RELEASED);
}
+
+ return nri;
}
+ private void handleRequestCallbackUpdate(NetworkRequest request, int callingUid,
+ String description, int callbackType) {
+ final NetworkRequestInfo nri = getNriForAppRequest(request, callingUid, description);
+ if (nri == null) return;
+
+ final NetworkAgentInfo nai = mNetworkForRequestId.get(nri.request.requestId);
+ // The network that is satisfying this request may have changed since
+ // the application requested the update.
+ //
+ // - If the request is no longer satisfied, don't send any updates.
+ // - If the request is satisfied by a different network, it is the
+ // caller's responsibility to check that the Network object in the
+ // callback matches the network that was returned in the last
+ // onAvailable() callback for this request.
+ if (nai == null) return;
+ callCallbackForRequest(nri, nai, callbackType, 0);
+ }
+
+ private void handleRequestLinkProperties(NetworkRequest request, int callingUid) {
+ handleRequestCallbackUpdate(request, callingUid,
+ "request LinkProperties", ConnectivityManager.CALLBACK_IP_CHANGED);
+ }
+
+ private void handleRequestNetworkCapabilities(NetworkRequest request, int callingUid) {
+ handleRequestCallbackUpdate(request, callingUid,
+ "request NetworkCapabilities", ConnectivityManager.CALLBACK_CAP_CHANGED);
+ }
+
+ private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) {
+ final NetworkRequestInfo nri = getNriForAppRequest(
+ request, callingUid, "release NetworkRequest");
+ if (nri == null) return;
+
+ if (VDBG || (DBG && nri.request.isRequest())) log("releasing " + request);
+ nri.unlinkDeathRecipient();
+ mNetworkRequests.remove(request);
+ synchronized (mUidToNetworkRequestCount) {
+ int requests = mUidToNetworkRequestCount.get(nri.mUid, 0);
+ if (requests < 1) {
+ Slog.wtf(TAG, "BUG: too small request count " + requests + " for UID " +
+ nri.mUid);
+ } else if (requests == 1) {
+ mUidToNetworkRequestCount.removeAt(
+ mUidToNetworkRequestCount.indexOfKey(nri.mUid));
+ } else {
+ mUidToNetworkRequestCount.put(nri.mUid, requests - 1);
+ }
+ }
+ mNetworkRequestInfoLogs.log("RELEASE " + nri);
+ if (nri.request.isRequest()) {
+ boolean wasKept = false;
+ NetworkAgentInfo nai = mNetworkForRequestId.get(nri.request.requestId);
+ if (nai != null) {
+ nai.removeRequest(nri.request.requestId);
+ if (VDBG) {
+ log(" Removing from current network " + nai.name() +
+ ", leaving " + nai.numNetworkRequests() + " requests.");
+ }
+ // If there are still lingered requests on this network, don't tear it down,
+ // but resume lingering instead.
+ updateLingerState(nai, SystemClock.elapsedRealtime());
+ if (unneeded(nai)) {
+ if (DBG) log("no live requests for " + nai.name() + "; disconnecting");
+ teardownUnneededNetwork(nai);
+ } else {
+ wasKept = true;
+ }
+ mNetworkForRequestId.remove(nri.request.requestId);
+ }
+
+ // TODO: remove this code once we know that the Slog.wtf is never hit.
+ //
+ // Find all networks that are satisfying this request and remove the request
+ // from their request lists.
+ // TODO - it's my understanding that for a request there is only a single
+ // network satisfying it, so this loop is wasteful
+ for (NetworkAgentInfo otherNai : mNetworkAgentInfos.values()) {
+ if (otherNai.isSatisfyingRequest(nri.request.requestId) && otherNai != nai) {
+ Slog.wtf(TAG, "Request " + nri.request + " satisfied by " +
+ otherNai.name() + ", but mNetworkAgentInfos says " +
+ (nai != null ? nai.name() : "null"));
+ }
+ }
+
+ // Maintain the illusion. When this request arrived, we might have pretended
+ // that a network connected to serve it, even though the network was already
+ // connected. Now that this request has gone away, we might have to pretend
+ // that the network disconnected. LegacyTypeTracker will generate that
+ // phantom disconnect for this type.
+ if (nri.request.legacyType != TYPE_NONE && nai != null) {
+ boolean doRemove = true;
+ if (wasKept) {
+ // check if any of the remaining requests for this network are for the
+ // same legacy type - if so, don't remove the nai
+ for (int i = 0; i < nai.numNetworkRequests(); i++) {
+ NetworkRequest otherRequest = nai.requestAt(i);
+ if (otherRequest.legacyType == nri.request.legacyType &&
+ otherRequest.isRequest()) {
+ if (DBG) log(" still have other legacy request - leaving");
+ doRemove = false;
+ }
+ }
+ }
+
+ if (doRemove) {
+ mLegacyTypeTracker.remove(nri.request.legacyType, nai, false);
+ }
+ }
+
+ for (NetworkFactoryInfo nfi : mNetworkFactoryInfos.values()) {
+ nfi.asyncChannel.sendMessage(android.net.NetworkFactory.CMD_CANCEL_REQUEST,
+ nri.request);
+ }
+ } else {
+ // listens don't have a singular affectedNetwork. Check all networks to see
+ // if this listen request applies and remove it.
+ for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
+ nai.removeRequest(nri.request.requestId);
+ if (nri.request.networkCapabilities.hasSignalStrength() &&
+ nai.satisfiesImmutableCapabilitiesOf(nri.request)) {
+ updateSignalStrengthThresholds(nai, "RELEASE", nri.request);
+ }
+ }
+ }
+ callCallbackForRequest(nri, null, ConnectivityManager.CALLBACK_RELEASED, 0);
+ }
+
+ @Override
public void setAcceptUnvalidated(Network network, boolean accept, boolean always) {
enforceConnectivityInternalPermission();
mHandler.sendMessage(mHandler.obtainMessage(EVENT_SET_ACCEPT_UNVALIDATED,
@@ -2677,6 +2798,12 @@
handleMobileDataAlwaysOn();
break;
}
+ case EVENT_REQUEST_LINKPROPERTIES:
+ handleRequestLinkProperties((NetworkRequest) msg.obj, msg.arg1);
+ break;
+ case EVENT_REQUEST_NETCAPABILITIES:
+ handleRequestNetworkCapabilities((NetworkRequest) msg.obj, msg.arg1);
+ break;
// Sent by KeepaliveTracker to process an app request on the state machine thread.
case NetworkAgent.CMD_START_PACKET_KEEPALIVE: {
mKeepaliveTracker.handleStartKeepalive(msg);
@@ -2701,6 +2828,7 @@
}
// javadoc from interface
+ @Override
public int tether(String iface) {
ConnectivityManager.enforceTetherChangePermission(mContext);
if (isTetheringSupported()) {
@@ -2718,6 +2846,7 @@
}
// javadoc from interface
+ @Override
public int untether(String iface) {
ConnectivityManager.enforceTetherChangePermission(mContext);
@@ -2736,6 +2865,7 @@
}
// javadoc from interface
+ @Override
public int getLastTetherError(String iface) {
enforceTetherAccessPermission();
@@ -2747,6 +2877,7 @@
}
// TODO - proper iface API for selection by property, inspection, etc
+ @Override
public String[] getTetherableUsbRegexs() {
enforceTetherAccessPermission();
if (isTetheringSupported()) {
@@ -2756,6 +2887,7 @@
}
}
+ @Override
public String[] getTetherableWifiRegexs() {
enforceTetherAccessPermission();
if (isTetheringSupported()) {
@@ -2765,6 +2897,7 @@
}
}
+ @Override
public String[] getTetherableBluetoothRegexs() {
enforceTetherAccessPermission();
if (isTetheringSupported()) {
@@ -2774,6 +2907,7 @@
}
}
+ @Override
public int setUsbTethering(boolean enable) {
ConnectivityManager.enforceTetherChangePermission(mContext);
if (isTetheringSupported()) {
@@ -2785,21 +2919,25 @@
// TODO - move iface listing, queries, etc to new module
// javadoc from interface
+ @Override
public String[] getTetherableIfaces() {
enforceTetherAccessPermission();
return mTethering.getTetherableIfaces();
}
+ @Override
public String[] getTetheredIfaces() {
enforceTetherAccessPermission();
return mTethering.getTetheredIfaces();
}
+ @Override
public String[] getTetheringErroredIfaces() {
enforceTetherAccessPermission();
return mTethering.getErroredIfaces();
}
+ @Override
public String[] getTetheredDhcpRanges() {
enforceConnectivityInternalPermission();
return mTethering.getTetheredDhcpRanges();
@@ -2858,12 +2996,14 @@
}
// 100 percent is full good, 0 is full bad.
+ @Override
public void reportInetCondition(int networkType, int percentage) {
NetworkAgentInfo nai = mLegacyTypeTracker.getNetworkForType(networkType);
if (nai == null) return;
reportNetworkConnectivity(nai.network, percentage > 50);
}
+ @Override
public void reportNetworkConnectivity(Network network, boolean hasConnectivity) {
enforceAccessPermission();
enforceInternetPermission();
@@ -2908,6 +3048,7 @@
}
}
+ @Override
public ProxyInfo getProxyForNetwork(Network network) {
if (network == null) return getDefaultProxy();
final ProxyInfo globalProxy = getGlobalProxy();
@@ -3823,31 +3964,12 @@
}
}
- /**
- * A NetworkRequest as registered by an application can be one of three
- * types:
- *
- * - "listen", for which the framework will issue callbacks about any
- * and all networks that match the specified NetworkCapabilities,
- *
- * - "request", capable of causing a specific network to be created
- * first (e.g. a telephony DUN request), the framework will issue
- * callbacks about the single, highest scoring current network
- * (if any) that matches the specified NetworkCapabilities, or
- *
- * - "track the default network", a hybrid of the two designed such
- * that the framework will issue callbacks for the single, highest
- * scoring current network (if any) that matches the capabilities of
- * the default Internet request (mDefaultRequest), but which cannot
- * cause the framework to either create or retain the existence of
- * any specific network.
- *
- */
- private static enum NetworkRequestType {
- LISTEN,
- TRACK_DEFAULT,
- REQUEST
- };
+ private void ensureNetworkRequestHasType(NetworkRequest request) {
+ if (request.type == NetworkRequest.Type.NONE) {
+ throw new IllegalArgumentException(
+ "All NetworkRequests in ConnectivityService must have a type");
+ }
+ }
/**
* Tracks info about the requester.
@@ -3861,27 +3983,26 @@
final int mPid;
final int mUid;
final Messenger messenger;
- private final NetworkRequestType mType;
- NetworkRequestInfo(NetworkRequest r, PendingIntent pi, NetworkRequestType type) {
+ NetworkRequestInfo(NetworkRequest r, PendingIntent pi) {
request = r;
+ ensureNetworkRequestHasType(request);
mPendingIntent = pi;
messenger = null;
mBinder = null;
mPid = getCallingPid();
mUid = getCallingUid();
- mType = type;
enforceRequestCountLimit();
}
- NetworkRequestInfo(Messenger m, NetworkRequest r, IBinder binder, NetworkRequestType type) {
+ NetworkRequestInfo(Messenger m, NetworkRequest r, IBinder binder) {
super();
messenger = m;
request = r;
+ ensureNetworkRequestHasType(request);
mBinder = binder;
mPid = getCallingPid();
mUid = getCallingUid();
- mType = type;
mPendingIntent = null;
enforceRequestCountLimit();
@@ -3902,16 +4023,6 @@
}
}
- private String typeString() {
- switch (mType) {
- case LISTEN: return "Listen";
- case REQUEST: return "Request";
- case TRACK_DEFAULT: return "Track default";
- default:
- return "unknown type";
- }
- }
-
void unlinkDeathRecipient() {
if (mBinder != null) {
mBinder.unlinkToDeath(this, 0);
@@ -3924,29 +4035,8 @@
releaseNetworkRequest(request);
}
- /**
- * Returns true iff. the contained NetworkRequest is one that:
- *
- * - should be associated with at most one satisfying network
- * at a time;
- *
- * - should cause a network to be kept up if it is the only network
- * which can satisfy the NetworkReqeust.
- *
- * For full detail of how isRequest() is used for pairing Networks with
- * NetworkRequests read rematchNetworkAndRequests().
- *
- * TODO: Rename to something more properly descriptive.
- */
- public boolean isRequest() {
- return (mType == NetworkRequestType.TRACK_DEFAULT) ||
- (mType == NetworkRequestType.REQUEST);
- }
-
public String toString() {
- return typeString() +
- " from uid/pid:" + mUid + "/" + mPid +
- " for " + request +
+ return "uid/pid:" + mUid + "/" + mPid + " " + request +
(mPendingIntent == null ? "" : " to trigger " + mPendingIntent);
}
}
@@ -3996,20 +4086,23 @@
@Override
public NetworkRequest requestNetwork(NetworkCapabilities networkCapabilities,
Messenger messenger, int timeoutMs, IBinder binder, int legacyType) {
- final NetworkRequestType type = (networkCapabilities == null)
- ? NetworkRequestType.TRACK_DEFAULT
- : NetworkRequestType.REQUEST;
+ final NetworkRequest.Type type = (networkCapabilities == null)
+ ? NetworkRequest.Type.TRACK_DEFAULT
+ : NetworkRequest.Type.REQUEST;
// If the requested networkCapabilities is null, take them instead from
// the default network request. This allows callers to keep track of
// the system default network.
- if (type == NetworkRequestType.TRACK_DEFAULT) {
+ if (type == NetworkRequest.Type.TRACK_DEFAULT) {
networkCapabilities = new NetworkCapabilities(mDefaultRequest.networkCapabilities);
enforceAccessPermission();
} else {
networkCapabilities = new NetworkCapabilities(networkCapabilities);
enforceNetworkRequestPermissions(networkCapabilities);
+ // TODO: this is incorrect. We mark the request as metered or not depending on the state
+ // of the app when the request is filed, but we never change the request if the app
+ // changes network state. http://b/29964605
+ enforceMeteredApnPolicy(networkCapabilities);
}
- enforceMeteredApnPolicy(networkCapabilities);
ensureRequestableCapabilities(networkCapabilities);
if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {
@@ -4023,8 +4116,8 @@
}
NetworkRequest networkRequest = new NetworkRequest(networkCapabilities, legacyType,
- nextNetworkRequestId());
- NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder, type);
+ nextNetworkRequestId(), type);
+ NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder);
if (DBG) log("requestNetwork for " + nri);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_REQUEST, nri));
@@ -4037,7 +4130,7 @@
private void enforceNetworkRequestPermissions(NetworkCapabilities networkCapabilities) {
if (networkCapabilities.hasCapability(NET_CAPABILITY_NOT_RESTRICTED) == false) {
- enforceConnectivityInternalPermission();
+ enforceConnectivityRestrictedNetworksPermission();
} else {
enforceChangePermission();
}
@@ -4094,9 +4187,8 @@
ensureRequestableCapabilities(networkCapabilities);
NetworkRequest networkRequest = new NetworkRequest(networkCapabilities, TYPE_NONE,
- nextNetworkRequestId());
- NetworkRequestInfo nri = new NetworkRequestInfo(networkRequest, operation,
- NetworkRequestType.REQUEST);
+ nextNetworkRequestId(), NetworkRequest.Type.REQUEST);
+ NetworkRequestInfo nri = new NetworkRequestInfo(networkRequest, operation);
if (DBG) log("pendingRequest for " + nri);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_REQUEST_WITH_INTENT,
nri));
@@ -4146,9 +4238,9 @@
}
NetworkRequest networkRequest = new NetworkRequest(
- new NetworkCapabilities(networkCapabilities), TYPE_NONE, nextNetworkRequestId());
- NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder,
- NetworkRequestType.LISTEN);
+ new NetworkCapabilities(networkCapabilities), TYPE_NONE, nextNetworkRequestId(),
+ NetworkRequest.Type.LISTEN);
+ NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder);
if (VDBG) log("listenForNetwork for " + nri);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_LISTENER, nri));
@@ -4164,18 +4256,35 @@
}
NetworkRequest networkRequest = new NetworkRequest(
- new NetworkCapabilities(networkCapabilities), TYPE_NONE, nextNetworkRequestId());
- NetworkRequestInfo nri = new NetworkRequestInfo(networkRequest, operation,
- NetworkRequestType.LISTEN);
+ new NetworkCapabilities(networkCapabilities), TYPE_NONE, nextNetworkRequestId(),
+ NetworkRequest.Type.LISTEN);
+ NetworkRequestInfo nri = new NetworkRequestInfo(networkRequest, operation);
if (VDBG) log("pendingListenForNetwork for " + nri);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_LISTENER, nri));
}
@Override
+ public void requestLinkProperties(NetworkRequest networkRequest) {
+ ensureNetworkRequestHasType(networkRequest);
+ if (networkRequest.type == NetworkRequest.Type.LISTEN) return;
+ mHandler.sendMessage(mHandler.obtainMessage(
+ EVENT_REQUEST_LINKPROPERTIES, getCallingUid(), 0, networkRequest));
+ }
+
+ @Override
+ public void requestNetworkCapabilities(NetworkRequest networkRequest) {
+ ensureNetworkRequestHasType(networkRequest);
+ if (networkRequest.type == NetworkRequest.Type.LISTEN) return;
+ mHandler.sendMessage(mHandler.obtainMessage(
+ EVENT_REQUEST_NETCAPABILITIES, getCallingUid(), 0, networkRequest));
+ }
+
+ @Override
public void releaseNetworkRequest(NetworkRequest networkRequest) {
- mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELEASE_NETWORK_REQUEST, getCallingUid(),
- 0, networkRequest));
+ ensureNetworkRequestHasType(networkRequest);
+ mHandler.sendMessage(mHandler.obtainMessage(
+ EVENT_RELEASE_NETWORK_REQUEST, getCallingUid(), 0, networkRequest));
}
@Override
@@ -4482,10 +4591,10 @@
}
private void sendUpdatedScoreToFactories(NetworkAgentInfo nai) {
- for (int i = 0; i < nai.networkRequests.size(); i++) {
- NetworkRequest nr = nai.networkRequests.valueAt(i);
+ for (int i = 0; i < nai.numNetworkRequests(); i++) {
+ NetworkRequest nr = nai.requestAt(i);
// Don't send listening requests to factories. b/17393458
- if (!isRequest(nr)) continue;
+ if (nr.isListen()) continue;
sendUpdatedScoreToFactories(nr, nai.getCurrentScore());
}
}
@@ -4534,7 +4643,7 @@
}
private void callCallbackForRequest(NetworkRequestInfo nri,
- NetworkAgentInfo networkAgent, int notificationType) {
+ NetworkAgentInfo networkAgent, int notificationType, int arg1) {
if (nri.messenger == null) return; // Default request has no msgr
Bundle bundle = new Bundle();
bundle.putParcelable(NetworkRequest.class.getSimpleName(),
@@ -4546,7 +4655,7 @@
}
switch (notificationType) {
case ConnectivityManager.CALLBACK_LOSING: {
- msg.arg1 = 30 * 1000; // TODO - read this from NetworkMonitor
+ msg.arg1 = arg1;
break;
}
case ConnectivityManager.CALLBACK_CAP_CHANGED: {
@@ -4575,12 +4684,14 @@
}
private void teardownUnneededNetwork(NetworkAgentInfo nai) {
- for (int i = 0; i < nai.networkRequests.size(); i++) {
- NetworkRequest nr = nai.networkRequests.valueAt(i);
- // Ignore listening requests.
- if (!isRequest(nr)) continue;
- loge("Dead network still had at least " + nr);
- break;
+ if (nai.numRequestNetworkRequests() != 0) {
+ for (int i = 0; i < nai.numNetworkRequests(); i++) {
+ NetworkRequest nr = nai.requestAt(i);
+ // Ignore listening requests.
+ if (nr.isListen()) continue;
+ loge("Dead network still had at least " + nr);
+ break;
+ }
}
nai.asyncChannel.disconnect();
}
@@ -4591,7 +4702,14 @@
return;
}
if (DBG) log("handleLingerComplete for " + oldNetwork.name());
- teardownUnneededNetwork(oldNetwork);
+
+ // If we get here it means that the last linger timeout for this network expired. So there
+ // must be no other active linger timers, and we must stop lingering.
+ oldNetwork.clearLingerState();
+
+ if (unneeded(oldNetwork)) {
+ teardownUnneededNetwork(oldNetwork);
+ }
}
private void makeDefault(NetworkAgentInfo newNetwork) {
@@ -4636,7 +4754,7 @@
// performed to tear down unvalidated networks that have no chance (i.e. even if
// validated) of becoming the highest scoring network.
private void rematchNetworkAndRequests(NetworkAgentInfo newNetwork,
- ReapUnvalidatedNetworks reapUnvalidatedNetworks) {
+ ReapUnvalidatedNetworks reapUnvalidatedNetworks, long now) {
if (!newNetwork.everConnected) return;
boolean keep = newNetwork.isVPN();
boolean isNewDefault = false;
@@ -4662,7 +4780,7 @@
// check if it satisfies the NetworkCapabilities
if (VDBG) log(" checking if request is satisfied: " + nri.request);
if (satisfies) {
- if (!nri.isRequest()) {
+ if (nri.request.isListen()) {
// This is not a request, it's a callback listener.
// Add it to newNetwork regardless of score.
if (newNetwork.addRequest(nri.request)) addedRequests.add(nri);
@@ -4681,13 +4799,13 @@
if (VDBG) log("rematch for " + newNetwork.name());
if (currentNetwork != null) {
if (VDBG) log(" accepting network in place of " + currentNetwork.name());
- currentNetwork.networkRequests.remove(nri.request.requestId);
- currentNetwork.networkLingered.add(nri.request);
+ currentNetwork.removeRequest(nri.request.requestId);
+ currentNetwork.lingerRequest(nri.request, now, mLingerDelayMs);
affectedNetworks.add(currentNetwork);
} else {
if (VDBG) log(" accepting network in place of null");
}
- unlinger(newNetwork);
+ newNetwork.unlingerRequest(nri.request);
mNetworkForRequestId.put(nri.request.requestId, newNetwork);
if (!newNetwork.addRequest(nri.request)) {
Slog.wtf(TAG, "BUG: " + newNetwork.name() + " already has " + nri.request);
@@ -4705,7 +4823,7 @@
oldDefaultNetwork = currentNetwork;
}
}
- } else if (newNetwork.networkRequests.get(nri.request.requestId) != null) {
+ } else if (newNetwork.isSatisfyingRequest(nri.request.requestId)) {
// If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri",
// mark it as no longer satisfying "nri". Because networks are processed by
// rematchAllNetworkAndRequests() in descending score order, "currentNetwork" will
@@ -4717,12 +4835,12 @@
log("Network " + newNetwork.name() + " stopped satisfying" +
" request " + nri.request.requestId);
}
- newNetwork.networkRequests.remove(nri.request.requestId);
+ newNetwork.removeRequest(nri.request.requestId);
if (currentNetwork == newNetwork) {
mNetworkForRequestId.remove(nri.request.requestId);
sendUpdatedScoreToFactories(nri.request, 0);
} else {
- if (nri.isRequest()) {
+ if (nri.request.isRequest()) {
Slog.wtf(TAG, "BUG: Removing request " + nri.request.requestId + " from " +
newNetwork.name() +
" without updating mNetworkForRequestId or factories!");
@@ -4735,23 +4853,7 @@
// a) be requested and b) change is NET_CAPABILITY_TRUSTED,
// so this code is only incorrect for a network that loses
// the TRUSTED capability, which is a rare case.
- callCallbackForRequest(nri, newNetwork, ConnectivityManager.CALLBACK_LOST);
- }
- }
- // Linger any networks that are no longer needed.
- for (NetworkAgentInfo nai : affectedNetworks) {
- if (nai.lingering) {
- // Already lingered. Nothing to do. This can only happen if "nai" is in
- // "affectedNetworks" twice. The reasoning being that to get added to
- // "affectedNetworks", "nai" must have been satisfying a NetworkRequest
- // (i.e. not lingered) so it could have only been lingered by this loop.
- // unneeded(nai) will be false and we'll call unlinger() below which would
- // be bad, so handle it here.
- } else if (unneeded(nai)) {
- linger(nai);
- } else {
- // Clear nai.networkLingered we might have added above.
- unlinger(nai);
+ callCallbackForRequest(nri, newNetwork, ConnectivityManager.CALLBACK_LOST, 0);
}
}
if (isNewDefault) {
@@ -4776,6 +4878,15 @@
// before LegacyTypeTracker sends legacy broadcasts
for (NetworkRequestInfo nri : addedRequests) notifyNetworkCallback(newNetwork, nri);
+ // Linger any networks that are no longer needed. This should be done after sending the
+ // available callback for newNetwork.
+ for (NetworkAgentInfo nai : affectedNetworks) {
+ updateLingerState(nai, now);
+ }
+ // Possibly unlinger newNetwork. Unlingering a network does not send any callbacks so it
+ // does not need to be done in any particular order.
+ updateLingerState(newNetwork, now);
+
if (isNewDefault) {
// Maintain the illusion: since the legacy API only
// understands one network at a time, we must pretend
@@ -4822,9 +4933,9 @@
// (notification callbacks) and then uses the old api (getNetworkInfo(type))
// they may get old info. Reverse this after the old startUsing api is removed.
// This is on top of the multiple intent sequencing referenced in the todo above.
- for (int i = 0; i < newNetwork.networkRequests.size(); i++) {
- NetworkRequest nr = newNetwork.networkRequests.valueAt(i);
- if (nr.legacyType != TYPE_NONE && isRequest(nr)) {
+ for (int i = 0; i < newNetwork.numNetworkRequests(); i++) {
+ NetworkRequest nr = newNetwork.requestAt(i);
+ if (nr.legacyType != TYPE_NONE && nr.isRequest()) {
// legacy type tracker filters out repeat adds
mLegacyTypeTracker.add(nr.legacyType, newNetwork);
}
@@ -4841,8 +4952,19 @@
if (reapUnvalidatedNetworks == ReapUnvalidatedNetworks.REAP) {
for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
if (unneeded(nai)) {
- if (DBG) log("Reaping " + nai.name());
- teardownUnneededNetwork(nai);
+ if (nai.getLingerExpiry() > 0) {
+ // This network has active linger timers and no requests, but is not
+ // lingering. Linger it.
+ //
+ // One way (the only way?) this can happen if this network is unvalidated
+ // and became unneeded due to another network improving its score to the
+ // point where this network will no longer be able to satisfy any requests
+ // even if it validates.
+ updateLingerState(nai, now);
+ } else {
+ if (DBG) log("Reaping " + nai.name());
+ teardownUnneededNetwork(nai);
+ }
}
}
}
@@ -4869,8 +4991,9 @@
// Optimization: Only reprocess "changed" if its score improved. This is safe because it
// can only add more NetworkRequests satisfied by "changed", and this is exactly what
// rematchNetworkAndRequests() handles.
+ final long now = SystemClock.elapsedRealtime();
if (changed != null && oldScore < changed.getCurrentScore()) {
- rematchNetworkAndRequests(changed, ReapUnvalidatedNetworks.REAP);
+ rematchNetworkAndRequests(changed, ReapUnvalidatedNetworks.REAP, now);
} else {
final NetworkAgentInfo[] nais = mNetworkAgentInfos.values().toArray(
new NetworkAgentInfo[mNetworkAgentInfos.size()]);
@@ -4884,7 +5007,8 @@
// is complete could incorrectly teardown a network that hasn't yet been
// rematched.
(nai != nais[nais.length-1]) ? ReapUnvalidatedNetworks.DONT_REAP
- : ReapUnvalidatedNetworks.REAP);
+ : ReapUnvalidatedNetworks.REAP,
+ now);
}
}
}
@@ -4994,7 +5118,8 @@
updateSignalStrengthThresholds(networkAgent, "CONNECT", null);
// Consider network even though it is not yet validated.
- rematchNetworkAndRequests(networkAgent, ReapUnvalidatedNetworks.REAP);
+ final long now = SystemClock.elapsedRealtime();
+ rematchNetworkAndRequests(networkAgent, ReapUnvalidatedNetworks.REAP, now);
// This has to happen after matching the requests, because callbacks are just requests.
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_PRECHECK);
@@ -5042,14 +5167,8 @@
// notify only this one new request of the current state
protected void notifyNetworkCallback(NetworkAgentInfo nai, NetworkRequestInfo nri) {
int notifyType = ConnectivityManager.CALLBACK_AVAILABLE;
- // TODO - read state from monitor to decide what to send.
-// if (nai.networkMonitor.isLingering()) {
-// notifyType = NetworkCallbacks.LOSING;
-// } else if (nai.networkMonitor.isEvaluating()) {
-// notifyType = NetworkCallbacks.callCallbackForRequest(request, nai, notifyType);
-// }
if (nri.mPendingIntent == null) {
- callCallbackForRequest(nri, nai, notifyType);
+ callCallbackForRequest(nri, nai, notifyType, 0);
} else {
sendPendingIntentForRequest(nri, nai, notifyType);
}
@@ -5083,7 +5202,7 @@
intent.putExtra(ConnectivityManager.EXTRA_EXTRA_INFO, info.getExtraInfo());
}
NetworkAgentInfo newDefaultAgent = null;
- if (nai.networkRequests.get(mDefaultRequest.requestId) != null) {
+ if (nai.isSatisfyingRequest(mDefaultRequest.requestId)) {
newDefaultAgent = getDefaultNetwork();
if (newDefaultAgent != null) {
intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO,
@@ -5101,20 +5220,24 @@
}
}
- protected void notifyNetworkCallbacks(NetworkAgentInfo networkAgent, int notifyType) {
+ protected void notifyNetworkCallbacks(NetworkAgentInfo networkAgent, int notifyType, int arg1) {
if (VDBG) log("notifyType " + notifyTypeToName(notifyType) + " for " + networkAgent.name());
- for (int i = 0; i < networkAgent.networkRequests.size(); i++) {
- NetworkRequest nr = networkAgent.networkRequests.valueAt(i);
+ for (int i = 0; i < networkAgent.numNetworkRequests(); i++) {
+ NetworkRequest nr = networkAgent.requestAt(i);
NetworkRequestInfo nri = mNetworkRequests.get(nr);
if (VDBG) log(" sending notification for " + nr);
if (nri.mPendingIntent == null) {
- callCallbackForRequest(nri, networkAgent, notifyType);
+ callCallbackForRequest(nri, networkAgent, notifyType, arg1);
} else {
sendPendingIntentForRequest(nri, networkAgent, notifyType);
}
}
}
+ protected void notifyNetworkCallbacks(NetworkAgentInfo networkAgent, int notifyType) {
+ notifyNetworkCallbacks(networkAgent, notifyType, 0);
+ }
+
private String notifyTypeToName(int notifyType) {
switch (notifyType) {
case ConnectivityManager.CALLBACK_PRECHECK: return "PRECHECK";
@@ -5245,7 +5368,12 @@
return new NetworkMonitor(context, handler, nai, defaultRequest);
}
- private static void logDefaultNetworkEvent(NetworkAgentInfo newNai, NetworkAgentInfo prevNai) {
+ @VisibleForTesting
+ public WakeupMessage makeWakeupMessage(Context c, Handler h, String s, int cmd, Object obj) {
+ return new WakeupMessage(c, h, s, cmd, 0, 0, obj);
+ }
+
+ private void logDefaultNetworkEvent(NetworkAgentInfo newNai, NetworkAgentInfo prevNai) {
int newNetid = NETID_UNSET;
int prevNetid = NETID_UNSET;
int[] transports = new int[0];
@@ -5263,6 +5391,10 @@
hadIPv6 = lp.hasGlobalIPv6Address() && lp.hasIPv6DefaultRoute();
}
- DefaultNetworkEvent.logEvent(newNetid, transports, prevNetid, hadIPv4, hadIPv6);
+ mMetricsLog.log(new DefaultNetworkEvent(newNetid, transports, prevNetid, hadIPv4, hadIPv6));
+ }
+
+ private void logNetworkEvent(NetworkAgentInfo nai, int evtype) {
+ mMetricsLog.log(new NetworkEvent(nai.network.netId, evtype));
}
}
diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index afed5ef..488f0e7 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -973,13 +973,12 @@
cancelSensingTimeoutAlarmLocked();
}
}
- if (result == AnyMotionDetector.RESULT_MOVED) {
- if (DEBUG) Slog.d(TAG, "RESULT_MOVED received.");
+ if ((result == AnyMotionDetector.RESULT_MOVED) ||
+ (result == AnyMotionDetector.RESULT_UNKNOWN)) {
synchronized (this) {
- handleMotionDetectedLocked(mConstants.INACTIVE_TIMEOUT, "sense_motion");
+ handleMotionDetectedLocked(mConstants.INACTIVE_TIMEOUT, "non_stationary");
}
} else if (result == AnyMotionDetector.RESULT_STATIONARY) {
- if (DEBUG) Slog.d(TAG, "RESULT_STATIONARY received.");
if (mState == STATE_SENSING) {
// If we are currently sensing, it is time to move to locating.
synchronized (this) {
diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java
index 5a90488..553cb07 100644
--- a/services/core/java/com/android/server/GestureLauncherService.java
+++ b/services/core/java/com/android/server/GestureLauncherService.java
@@ -33,6 +33,7 @@
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
import android.os.SystemProperties;
+import android.os.UserHandle;
import android.provider.Settings;
import android.util.MutableBoolean;
import android.util.Slog;
@@ -284,8 +285,8 @@
* @return true if camera was launched, false otherwise.
*/
private boolean handleCameraLaunchGesture(boolean useWakelock, int source) {
- boolean userSetupComplete = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;
+ boolean userSetupComplete = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+ Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;
if (!userSetupComplete) {
if (DBG) Slog.d(TAG, String.format(
"userSetupComplete = %s, ignoring camera launch gesture.",
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index e0d89f2..71ac544 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -177,6 +177,8 @@
static final int MSG_HARD_KEYBOARD_SWITCH_CHANGED = 4000;
+ static final int MSG_SYSTEM_UNLOCK_USER = 5000;
+
static final long TIME_TO_RECONNECT = 3 * 1000;
static final int SECURE_SUGGESTION_SPANS_MAX_SIZE = 20;
@@ -800,14 +802,14 @@
@Override
public void onSwitchUser(@UserIdInt int userHandle) {
- // Called on the system server's main looper thread.
+ // Called on ActivityManager thread.
// TODO: Dispatch this to a worker thread as needed.
mService.onSwitchUser(userHandle);
}
@Override
public void onBootPhase(int phase) {
- // Called on the system server's main looper thread.
+ // Called on ActivityManager thread.
// TODO: Dispatch this to a worker thread as needed.
if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) {
StatusBarManagerService statusBarService = (StatusBarManagerService) ServiceManager
@@ -817,10 +819,10 @@
}
@Override
- public void onUnlockUser(@UserIdInt int userHandle) {
- // Called on the system server's main looper thread.
- // TODO: Dispatch this to a worker thread as needed.
- mService.onUnlockUser(userHandle);
+ public void onUnlockUser(final @UserIdInt int userHandle) {
+ // Called on ActivityManager thread.
+ mService.mHandler.sendMessage(mService.mHandler.obtainMessage(MSG_SYSTEM_UNLOCK_USER,
+ userHandle));
}
}
@@ -2970,6 +2972,10 @@
case MSG_HARD_KEYBOARD_SWITCH_CHANGED:
mHardKeyboardListener.handleHardKeyboardStatusChange(msg.arg1 == 1);
return true;
+ case MSG_SYSTEM_UNLOCK_USER:
+ final int userId = msg.arg1;
+ onUnlockUser(userId);
+ return true;
}
return false;
}
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index d64fe32..2de09a3 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -69,6 +69,7 @@
import android.util.Slog;
import com.android.internal.util.ArrayUtils;
+import com.android.internal.widget.ICheckCredentialProgressCallback;
import com.android.internal.widget.ILockSettings;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.VerifyCredentialResponse;
@@ -300,9 +301,12 @@
for (int i = 0; i < users.size(); i++) {
UserInfo user = users.get(i);
UserHandle userHandle = user.getUserHandle();
- if (!mUserManager.isUserUnlockingOrUnlocked(userHandle)) {
+ final boolean isSecure = mStorage.hasPassword(user.id) || mStorage.hasPattern(user.id);
+ if (isSecure && !mUserManager.isUserUnlockingOrUnlocked(userHandle)) {
if (!user.isManagedProfile()) {
- showEncryptionNotification(userHandle);
+ // When the user is locked, we communicate it loud-and-clear
+ // on the lockscreen; we only show a notification below for
+ // locked managed profiles.
} else {
UserInfo parent = mUserManager.getProfileParent(user.id);
if (parent != null &&
@@ -338,21 +342,6 @@
showEncryptionNotification(user, title, message, detail, intent);
}
- private void showEncryptionNotification(UserHandle user) {
- Resources r = mContext.getResources();
- CharSequence title = r.getText(
- com.android.internal.R.string.user_encrypted_title);
- CharSequence message = r.getText(
- com.android.internal.R.string.user_encrypted_message);
- CharSequence detail = r.getText(
- com.android.internal.R.string.user_encrypted_detail);
-
- PendingIntent intent = PendingIntent.getBroadcast(mContext, 0, ACTION_NULL,
- PendingIntent.FLAG_UPDATE_CURRENT);
-
- showEncryptionNotification(user, title, message, detail, intent);
- }
-
private void showEncryptionNotification(UserHandle user, CharSequence title, CharSequence message,
CharSequence detail, PendingIntent intent) {
if (DEBUG) Slog.v(TAG, "showing encryption notification, user: " + user.getIdentifier());
@@ -407,7 +396,9 @@
List<UserInfo> profiles = mUserManager.getProfiles(userId);
for (int i = 0; i < profiles.size(); i++) {
UserInfo profile = profiles.get(i);
- if (profile.isManagedProfile()) {
+ final boolean isSecure =
+ mStorage.hasPassword(profile.id) || mStorage.hasPattern(profile.id);
+ if (isSecure && profile.isManagedProfile()) {
UserHandle userHandle = profile.getUserHandle();
if (!mUserManager.isUserUnlockingOrUnlocked(userHandle) &&
!mUserManager.isQuietModeEnabled(userHandle)) {
@@ -580,6 +571,18 @@
Slog.e(TAG, "Invalid tied profile lock type: " + quality);
}
}
+ try {
+ final String alias = LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userInfo.id;
+ java.security.KeyStore keyStore =
+ java.security.KeyStore.getInstance("AndroidKeyStore");
+ keyStore.load(null);
+ if (keyStore.containsAlias(alias)) {
+ keyStore.deleteEntry(alias);
+ }
+ } catch (KeyStoreException | NoSuchAlgorithmException |
+ CertificateException | IOException e) {
+ Slog.e(TAG, "Unable to remove tied profile key", e);
+ }
}
} catch (RemoteException re) {
Slog.e(TAG, "Unable to migrate old data", re);
@@ -757,7 +760,7 @@
private void unlockChildProfile(int profileHandle) throws RemoteException {
try {
doVerifyPassword(getDecryptedPasswordForTiedProfile(profileHandle), false,
- 0 /* no challenge */, profileHandle);
+ 0 /* no challenge */, profileHandle, null /* progressCallback */);
} catch (UnrecoverableKeyException | InvalidKeyException | KeyStoreException
| NoSuchAlgorithmException | NoSuchPaddingException
| InvalidAlgorithmParameterException | IllegalBlockSizeException
@@ -944,7 +947,7 @@
CredentialHash willStore
= new CredentialHash(enrolledHandle, CredentialHash.VERSION_GATEKEEPER);
setUserKeyProtection(userId, pattern,
- doVerifyPattern(pattern, willStore, true, 0, userId));
+ doVerifyPattern(pattern, willStore, true, 0, userId, null /* progressCallback */));
mStorage.writePatternHash(enrolledHandle, userId);
fixateNewestUserKeyAuth(userId);
onUserLockChanged(userId);
@@ -1004,7 +1007,8 @@
CredentialHash willStore
= new CredentialHash(enrolledHandle, CredentialHash.VERSION_GATEKEEPER);
setUserKeyProtection(userId, password,
- doVerifyPassword(password, willStore, true, 0, userId));
+ doVerifyPassword(password, willStore, true, 0, userId,
+ null /* progressCallback */));
mStorage.writePasswordHash(enrolledHandle, userId);
fixateNewestUserKeyAuth(userId);
onUserLockChanged(userId);
@@ -1022,37 +1026,38 @@
KeyGenerator keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES);
keyGenerator.init(new SecureRandom());
SecretKey secretKey = keyGenerator.generateKey();
-
java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null);
- keyStore.setEntry(
- LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId,
- new java.security.KeyStore.SecretKeyEntry(secretKey),
- new KeyProtection.Builder(KeyProperties.PURPOSE_ENCRYPT)
- .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
- .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
- .build());
- keyStore.setEntry(
- LockPatternUtils.PROFILE_KEY_NAME_DECRYPT + userId,
- new java.security.KeyStore.SecretKeyEntry(secretKey),
- new KeyProtection.Builder(KeyProperties.PURPOSE_DECRYPT)
- .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
- .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
- .setUserAuthenticationRequired(true)
- .setUserAuthenticationValidityDurationSeconds(30)
- .build());
-
- // Key imported, obtain a reference to it.
- SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey(
- LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId, null);
- // The original key can now be discarded.
-
- Cipher cipher = Cipher.getInstance(
- KeyProperties.KEY_ALGORITHM_AES + "/" + KeyProperties.BLOCK_MODE_GCM + "/"
- + KeyProperties.ENCRYPTION_PADDING_NONE);
- cipher.init(Cipher.ENCRYPT_MODE, keyStoreEncryptionKey);
- encryptionResult = cipher.doFinal(randomLockSeed);
- iv = cipher.getIV();
+ try {
+ keyStore.setEntry(
+ LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId,
+ new java.security.KeyStore.SecretKeyEntry(secretKey),
+ new KeyProtection.Builder(KeyProperties.PURPOSE_ENCRYPT)
+ .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+ .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+ .build());
+ keyStore.setEntry(
+ LockPatternUtils.PROFILE_KEY_NAME_DECRYPT + userId,
+ new java.security.KeyStore.SecretKeyEntry(secretKey),
+ new KeyProtection.Builder(KeyProperties.PURPOSE_DECRYPT)
+ .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+ .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+ .setUserAuthenticationRequired(true)
+ .setUserAuthenticationValidityDurationSeconds(30)
+ .build());
+ // Key imported, obtain a reference to it.
+ SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey(
+ LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId, null);
+ Cipher cipher = Cipher.getInstance(
+ KeyProperties.KEY_ALGORITHM_AES + "/" + KeyProperties.BLOCK_MODE_GCM + "/"
+ + KeyProperties.ENCRYPTION_PADDING_NONE);
+ cipher.init(Cipher.ENCRYPT_MODE, keyStoreEncryptionKey);
+ encryptionResult = cipher.doFinal(randomLockSeed);
+ iv = cipher.getIV();
+ } finally {
+ // The original key can now be discarded.
+ keyStore.deleteEntry(LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId);
+ }
} catch (CertificateException | UnrecoverableKeyException
| IOException | BadPaddingException | IllegalBlockSizeException | KeyStoreException
| NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException e) {
@@ -1202,25 +1207,33 @@
}
@Override
- public VerifyCredentialResponse checkPattern(String pattern, int userId) throws RemoteException {
- return doVerifyPattern(pattern, false, 0, userId);
+ public VerifyCredentialResponse checkPattern(String pattern, int userId,
+ ICheckCredentialProgressCallback progressCallback) throws RemoteException {
+ return doVerifyPattern(pattern, false, 0, userId, progressCallback);
}
@Override
public VerifyCredentialResponse verifyPattern(String pattern, long challenge, int userId)
throws RemoteException {
- return doVerifyPattern(pattern, true, challenge, userId);
+ return doVerifyPattern(pattern, true, challenge, userId, null /* progressCallback */);
}
private VerifyCredentialResponse doVerifyPattern(String pattern, boolean hasChallenge,
- long challenge, int userId) throws RemoteException {
+ long challenge, int userId, ICheckCredentialProgressCallback progressCallback)
+ throws RemoteException {
checkPasswordReadPermission(userId);
CredentialHash storedHash = mStorage.readPatternHash(userId);
- return doVerifyPattern(pattern, storedHash, hasChallenge, challenge, userId);
+ return doVerifyPattern(pattern, storedHash, hasChallenge, challenge, userId,
+ progressCallback);
}
private VerifyCredentialResponse doVerifyPattern(String pattern, CredentialHash storedHash,
- boolean hasChallenge, long challenge, int userId) throws RemoteException {
+ boolean hasChallenge, long challenge, int userId,
+ ICheckCredentialProgressCallback progressCallback) throws RemoteException {
+
+ if (TextUtils.isEmpty(pattern)) {
+ throw new IllegalArgumentException("Pattern can't be null or empty");
+ }
boolean shouldReEnrollBaseZero = storedHash != null && storedHash.isBaseZeroPattern;
String patternToVerify;
@@ -1249,7 +1262,8 @@
public String adjustForKeystore(String pattern) {
return LockPatternUtils.patternStringToBaseZero(pattern);
}
- }
+ },
+ progressCallback
);
if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK
@@ -1261,15 +1275,15 @@
}
@Override
- public VerifyCredentialResponse checkPassword(String password, int userId)
- throws RemoteException {
- return doVerifyPassword(password, false, 0, userId);
+ public VerifyCredentialResponse checkPassword(String password, int userId,
+ ICheckCredentialProgressCallback progressCallback) throws RemoteException {
+ return doVerifyPassword(password, false, 0, userId, progressCallback);
}
@Override
public VerifyCredentialResponse verifyPassword(String password, long challenge, int userId)
throws RemoteException {
- return doVerifyPassword(password, true, challenge, userId);
+ return doVerifyPassword(password, true, challenge, userId, null /* progressCallback */);
}
@Override
@@ -1282,8 +1296,10 @@
final int parentProfileId = mUserManager.getProfileParent(userId).id;
// Unlock parent by using parent's challenge
final VerifyCredentialResponse parentResponse = isPattern
- ? doVerifyPattern(password, true, challenge, parentProfileId)
- : doVerifyPassword(password, true, challenge, parentProfileId);
+ ? doVerifyPattern(password, true, challenge, parentProfileId,
+ null /* progressCallback */)
+ : doVerifyPassword(password, true, challenge, parentProfileId,
+ null /* progressCallback */);
if (parentResponse.getResponseCode() != VerifyCredentialResponse.RESPONSE_OK) {
// Failed, just return parent's response
return parentResponse;
@@ -1293,7 +1309,7 @@
// Unlock work profile, and work profile with unified lock must use password only
return doVerifyPassword(getDecryptedPasswordForTiedProfile(userId), true,
challenge,
- userId);
+ userId, null /* progressCallback */);
} catch (UnrecoverableKeyException | InvalidKeyException | KeyStoreException
| NoSuchAlgorithmException | NoSuchPaddingException
| InvalidAlgorithmParameterException | IllegalBlockSizeException
@@ -1304,14 +1320,20 @@
}
private VerifyCredentialResponse doVerifyPassword(String password, boolean hasChallenge,
- long challenge, int userId) throws RemoteException {
+ long challenge, int userId, ICheckCredentialProgressCallback progressCallback)
+ throws RemoteException {
checkPasswordReadPermission(userId);
CredentialHash storedHash = mStorage.readPasswordHash(userId);
- return doVerifyPassword(password, storedHash, hasChallenge, challenge, userId);
+ return doVerifyPassword(password, storedHash, hasChallenge, challenge, userId,
+ progressCallback);
}
private VerifyCredentialResponse doVerifyPassword(String password, CredentialHash storedHash,
- boolean hasChallenge, long challenge, int userId) throws RemoteException {
+ boolean hasChallenge, long challenge, int userId,
+ ICheckCredentialProgressCallback progressCallback) throws RemoteException {
+ if (TextUtils.isEmpty(password)) {
+ throw new IllegalArgumentException("Password can't be null or empty");
+ }
return verifyCredential(userId, storedHash, password, hasChallenge, challenge,
new CredentialUtil() {
@Override
@@ -1329,12 +1351,12 @@
public String adjustForKeystore(String password) {
return password;
}
- }
- );
+ }, progressCallback);
}
private VerifyCredentialResponse verifyCredential(int userId, CredentialHash storedHash,
- String credential, boolean hasChallenge, long challenge, CredentialUtil credentialUtil)
+ String credential, boolean hasChallenge, long challenge, CredentialUtil credentialUtil,
+ ICheckCredentialProgressCallback progressCallback)
throws RemoteException {
if ((storedHash == null || storedHash.hash.length == 0) && TextUtils.isEmpty(credential)) {
// don't need to pass empty credentials to GateKeeper
@@ -1391,7 +1413,13 @@
}
if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {
+
+
// credential has matched
+
+ if (progressCallback != null) {
+ progressCallback.onCredentialVerified();
+ }
unlockKeystore(credential, userId);
Slog.i(TAG, "Unlocking user " + userId +
@@ -1447,7 +1475,7 @@
try {
if (mLockPatternUtils.isLockPatternEnabled(userId)) {
- if (checkPattern(password, userId).getResponseCode()
+ if (checkPattern(password, userId, null /* progressCallback */).getResponseCode()
== GateKeeperResponse.RESPONSE_OK) {
return true;
}
@@ -1457,7 +1485,7 @@
try {
if (mLockPatternUtils.isLockPasswordEnabled(userId)) {
- if (checkPassword(password, userId).getResponseCode()
+ if (checkPassword(password, userId, null /* progressCallback */).getResponseCode()
== GateKeeperResponse.RESPONSE_OK) {
return true;
}
diff --git a/services/core/java/com/android/server/NativeDaemonConnectorException.java b/services/core/java/com/android/server/NativeDaemonConnectorException.java
index 590bbcc..4d8881c 100644
--- a/services/core/java/com/android/server/NativeDaemonConnectorException.java
+++ b/services/core/java/com/android/server/NativeDaemonConnectorException.java
@@ -41,7 +41,7 @@
}
public int getCode() {
- return mEvent.getCode();
+ return mEvent != null ? mEvent.getCode() : -1;
}
public String getCmd() {
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index ba44cde..f2a2b3d 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -494,7 +494,7 @@
if (mLastPowerStateFromWifi != powerState) {
mLastPowerStateFromWifi = powerState;
try {
- getBatteryStats().noteWifiRadioPowerState(powerState, tsNanos);
+ getBatteryStats().noteWifiRadioPowerState(powerState, tsNanos, uid);
} catch (RemoteException e) {
}
}
@@ -971,6 +971,17 @@
//
// INetworkManagementService members
//
+ @Override
+ public INetd getNetdService() throws RemoteException {
+ final CountDownLatch connectedSignal = mConnectedSignal;
+ if (connectedSignal != null) {
+ try {
+ connectedSignal.await();
+ } catch (InterruptedException ignored) {}
+ }
+
+ return mNetdService;
+ }
@Override
public String[] listInterfaces() {
@@ -2740,4 +2751,19 @@
public void removeInterfaceFromLocalNetwork(String iface) {
modifyInterfaceInNetwork("remove", "local", iface);
}
+
+ @Override
+ public int removeRoutesFromLocalNetwork(List<RouteInfo> routes) {
+ int failures = 0;
+
+ for (RouteInfo route : routes) {
+ try {
+ modifyRoute("remove", "local", route);
+ } catch (IllegalStateException e) {
+ failures++;
+ }
+ }
+
+ return failures;
+ }
}
diff --git a/services/core/java/com/android/server/PersistentDataBlockService.java b/services/core/java/com/android/server/PersistentDataBlockService.java
index e233b1c..080b46c 100644
--- a/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@ -157,11 +157,10 @@
}
}
- private void enforceFactoryResetAllowed() {
- final boolean isOemUnlockRestricted = UserManager.get(mContext)
- .hasUserRestriction(UserManager.DISALLOW_FACTORY_RESET);
- if (isOemUnlockRestricted) {
- throw new SecurityException("OEM unlock is disallowed by DISALLOW_FACTORY_RESET");
+ private void enforceUserRestriction(String userRestriction) {
+ if (UserManager.get(mContext).hasUserRestriction(userRestriction)) {
+ throw new SecurityException(
+ "OEM unlock is disallowed by user restriction: " + userRestriction);
}
}
@@ -467,13 +466,9 @@
enforceIsAdmin();
if (enabled) {
- // Do not allow oem unlock to be enabled if it has been disallowed.
- if (Settings.Global.getInt(getContext().getContentResolver(),
- Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 1) {
- throw new SecurityException(
- "OEM unlock has been disallowed by OEM_UNLOCK_DISALLOWED.");
- }
- enforceFactoryResetAllowed();
+ // Do not allow oem unlock to be enabled if it's disallowed by a user restriction.
+ enforceUserRestriction(UserManager.DISALLOW_OEM_UNLOCK);
+ enforceUserRestriction(UserManager.DISALLOW_FACTORY_RESET);
}
synchronized (mLock) {
doSetOemUnlockEnabledLocked(enabled);
diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java
index d48aeed..7ea8f1f 100644
--- a/services/core/java/com/android/server/PinnerService.java
+++ b/services/core/java/com/android/server/PinnerService.java
@@ -17,18 +17,35 @@
package com.android.server;
import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.content.res.Resources;
+import android.content.Intent;
import android.util.EventLog;
import android.util.Slog;
import android.os.Binder;
import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
+import android.provider.MediaStore;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;
import android.system.StructStat;
+import com.android.internal.app.ResolverActivity;
+import com.android.internal.os.BackgroundThread;
+
+import dalvik.system.DexFile;
+import dalvik.system.VMRuntime;
+
import java.util.ArrayList;
+import java.util.List;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -37,89 +54,349 @@
/**
* <p>PinnerService pins important files for key processes in memory.</p>
* <p>Files to pin are specified in the config_defaultPinnerServiceFiles
- * overlay. </p>
+ * overlay.</p>
+ * <p>Pin the default camera application if specified in config_pinnerCameraApp.</p>
*/
public final class PinnerService extends SystemService {
private static final boolean DEBUG = false;
private static final String TAG = "PinnerService";
private final Context mContext;
- private final ArrayList<String> mPinnedFiles = new ArrayList<String>();
+ private final ArrayList<PinnedFile> mPinnedFiles = new ArrayList<PinnedFile>();
+ private final ArrayList<PinnedFile> mPinnedCameraFiles = new ArrayList<PinnedFile>();
+ private final boolean mShouldPinCamera;
private BinderService mBinderService;
+ private final long MAX_CAMERA_PIN_SIZE = 50 * (1 << 20); //50MB max
+
+ private PinnerHandler mPinnerHandler = null;
+
public PinnerService(Context context) {
super(context);
mContext = context;
-
+ mShouldPinCamera = context.getResources().getBoolean(
+ com.android.internal.R.bool.config_pinnerCameraApp);
+ mPinnerHandler = new PinnerHandler(BackgroundThread.get().getLooper());
}
@Override
public void onStart() {
- Slog.e(TAG, "Starting PinnerService");
-
+ if (DEBUG) {
+ Slog.i(TAG, "Starting PinnerService");
+ }
mBinderService = new BinderService();
publishBinderService("pinner", mBinderService);
+ mPinnerHandler.sendMessage(
+ mPinnerHandler.obtainMessage(PinnerHandler.PIN_ONSTART_MSG));
+ }
- // Files to pin come from the overlay and can be specified per-device config
- // Continue trying to pin remaining files even if there is a failure
- String[] filesToPin = mContext.getResources().getStringArray(com.android.internal.R.array.config_defaultPinnerServiceFiles);
- for (int i = 0; i < filesToPin.length; i++){
- boolean success = pinFile(filesToPin[i], 0, 0);
- if (success == true) {
- mPinnedFiles.add(filesToPin[i]);
- Slog.i(TAG, "Pinned file = " + filesToPin[i]);
- } else {
- Slog.e(TAG, "Failed to pin file = " + filesToPin[i]);
+ /**
+ * Pin camera on unlock.
+ * We have to wait for unlock because the user's
+ * preference for camera is not available from PackageManager until after
+ * unlock
+ */
+ @Override
+ public void onUnlockUser(int userHandle) {
+ mPinnerHandler.sendMessage(
+ mPinnerHandler.obtainMessage(PinnerHandler.PIN_CAMERA_MSG, userHandle, 0));
+ }
+
+ /**
+ * Pin camera on user switch.
+ * If more than one user is using the device
+ * each user may set a different preference for the camera app.
+ * Make sure that user's preference is pinned into memory.
+ */
+ @Override
+ public void onSwitchUser(int userHandle) {
+ mPinnerHandler.sendMessage(
+ mPinnerHandler.obtainMessage(PinnerHandler.PIN_CAMERA_MSG, userHandle, 0));
+ }
+
+ /**
+ * Handler for on start pinning message
+ */
+ private void handlePinOnStart() {
+ // Files to pin come from the overlay and can be specified per-device config
+ String[] filesToPin = mContext.getResources().getStringArray(
+ com.android.internal.R.array.config_defaultPinnerServiceFiles);
+ synchronized(this) {
+ // Continue trying to pin remaining files even if there is a failure
+ for (int i = 0; i < filesToPin.length; i++){
+ PinnedFile pf = pinFile(filesToPin[i], 0, 0, 0);
+ if (pf != null) {
+ mPinnedFiles.add(pf);
+ if (DEBUG) {
+ Slog.i(TAG, "Pinned file = " + pf.mFilename);
+ }
+ } else {
+ Slog.e(TAG, "Failed to pin file = " + filesToPin[i]);
+ }
}
}
}
- // mlock length bytes of fileToPin in memory, starting at offset
- // length == 0 means pin from offset to end of file
- private boolean pinFile(String fileToPin, long offset, long length) {
+ /**
+ * Handler for camera pinning message
+ */
+ private void handlePinCamera(int userHandle) {
+ if (mShouldPinCamera) {
+ synchronized(this) {
+ boolean success = pinCamera(userHandle);
+ if (!success) {
+ //this is not necessarily an error
+ if (DEBUG) {
+ Slog.v(TAG, "Failed to pin camera.");
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * determine if the camera app is already pinned by comparing the
+ * intent resolution to the pinned files list
+ */
+ private boolean alreadyPinned(int userHandle) {
+ ApplicationInfo cameraInfo = getCameraInfo(userHandle);
+ if (cameraInfo == null ) {
+ return false;
+ }
+ for (int i = 0; i < mPinnedCameraFiles.size(); i++) {
+ if (mPinnedCameraFiles.get(i).mFilename.equals(cameraInfo.sourceDir)) {
+ if (DEBUG) {
+ Slog.v(TAG, "Camera is already pinned");
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void unpinCameraApp() {
+ for (int i = 0; i < mPinnedCameraFiles.size(); i++) {
+ unpinFile(mPinnedCameraFiles.get(i));
+ }
+ mPinnedCameraFiles.clear();
+ }
+
+ private boolean isResolverActivity(ActivityInfo info) {
+ return ResolverActivity.class.getName().equals(info.name);
+ }
+
+ private ApplicationInfo getCameraInfo(int userHandle) {
+ // find the camera via an intent
+ // use INTENT_ACTION_STILL_IMAGE_CAMERA instead of _SECURE. On a
+ // device without a fbe enabled, the _SECURE intent will never get set.
+ Intent cameraIntent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
+ PackageManager pm = mContext.getPackageManager();
+ ResolveInfo cameraResolveInfo = pm.resolveActivityAsUser(
+ cameraIntent, PackageManager.MATCH_DEFAULT_ONLY, userHandle);
+ if (cameraResolveInfo == null ) {
+ //this is not necessarily an error
+ if (DEBUG) {
+ Slog.v(TAG, "Unable to resolve camera intent");
+ }
+ return null;
+ }
+
+ if (isResolverActivity(cameraResolveInfo.activityInfo))
+ {
+ return null;
+ }
+
+ return cameraResolveInfo.activityInfo.applicationInfo;
+ }
+
+ private boolean pinCamera(int userHandle){
+ //we may have already pinned a camera app. If we've pinned this
+ //camera app, we're done. otherwise, unpin and pin the new app
+ if (alreadyPinned(userHandle)){
+ return true;
+ }
+
+ ApplicationInfo cameraInfo = getCameraInfo(userHandle);
+ if (cameraInfo == null) {
+ return false;
+ }
+
+ //unpin after checking that the camera intent has resolved
+ //this prevents us from thrashing when switching users with
+ //FBE enabled, because the intent won't resolve until the unlock
+ unpinCameraApp();
+
+ //pin APK
+ String camAPK = cameraInfo.sourceDir;
+ PinnedFile pf = pinFile(camAPK, 0, 0, MAX_CAMERA_PIN_SIZE);
+ if (pf == null) {
+ Slog.e(TAG, "Failed to pin " + camAPK);
+ return false;
+ }
+ if (DEBUG) {
+ Slog.i(TAG, "Pinned " + pf.mFilename);
+ }
+ mPinnedCameraFiles.add(pf);
+
+ // determine the ABI from either ApplicationInfo or Build
+ String arch = "arm";
+ if (cameraInfo.primaryCpuAbi != null
+ && VMRuntime.is64BitAbi(cameraInfo.primaryCpuAbi)) {
+ arch = arch + "64";
+ } else {
+ if (VMRuntime.is64BitAbi(Build.SUPPORTED_ABIS[0])) {
+ arch = arch + "64";
+ }
+ }
+
+ // get the path to the odex or oat file
+ String baseCodePath = cameraInfo.getBaseCodePath();
+ String odex = null;
+ try {
+ odex = DexFile.getDexFileOutputPath(baseCodePath, arch);
+ } catch (IOException ioe) {}
+ if (odex == null) {
+ return true;
+ }
+
+ //not pinning the oat/odex is not a fatal error
+ pf = pinFile(odex, 0, 0, MAX_CAMERA_PIN_SIZE);
+ if (pf != null) {
+ mPinnedCameraFiles.add(pf);
+ if (DEBUG) {
+ Slog.i(TAG, "Pinned " + pf.mFilename);
+ }
+ }
+
+ return true;
+ }
+
+
+ /** mlock length bytes of fileToPin in memory, starting at offset
+ * length == 0 means pin from offset to end of file
+ * maxSize == 0 means infinite
+ */
+ private static PinnedFile pinFile(String fileToPin, long offset, long length, long maxSize) {
FileDescriptor fd = new FileDescriptor();
try {
- fd = Os.open(fileToPin, OsConstants.O_RDONLY | OsConstants.O_CLOEXEC | OsConstants.O_NOFOLLOW, OsConstants.O_RDONLY);
+ fd = Os.open(fileToPin,
+ OsConstants.O_RDONLY | OsConstants.O_CLOEXEC | OsConstants.O_NOFOLLOW,
+ OsConstants.O_RDONLY);
StructStat sb = Os.fstat(fd);
if (offset + length > sb.st_size) {
Os.close(fd);
- return false;
+ Slog.e(TAG, "Failed to pin file " + fileToPin +
+ ", request extends beyond end of file. offset + length = "
+ + (offset + length) + ", file length = " + sb.st_size);
+ return null;
}
if (length == 0) {
length = sb.st_size - offset;
}
- long address = Os.mmap(0, length, OsConstants.PROT_READ, OsConstants.MAP_PRIVATE, fd, offset);
+ if (maxSize > 0 && length > maxSize) {
+ Slog.e(TAG, "Could not pin file " + fileToPin +
+ ", size = " + length + ", maxSize = " + maxSize);
+ Os.close(fd);
+ return null;
+ }
+
+ long address = Os.mmap(0, length, OsConstants.PROT_READ,
+ OsConstants.MAP_PRIVATE, fd, offset);
Os.close(fd);
Os.mlock(address, length);
- return true;
+ return new PinnedFile(address, length, fileToPin);
} catch (ErrnoException e) {
- Slog.e(TAG, "Failed to pin file " + fileToPin + " with error " + e.getMessage());
+ Slog.e(TAG, "Could not pin file " + fileToPin + " with error " + e.getMessage());
if(fd.valid()) {
- try { Os.close(fd); }
- catch (ErrnoException eClose) {Slog.e(TAG, "Failed to close fd, error = " + eClose.getMessage());}
+ try {
+ Os.close(fd);
+ }
+ catch (ErrnoException eClose) {
+ Slog.e(TAG, "Failed to close fd, error = " + eClose.getMessage());
+ }
}
- return false;
+ return null;
}
}
+ private static boolean unpinFile(PinnedFile pf) {
+ try {
+ Os.munlock(pf.mAddress, pf.mLength);
+ } catch (ErrnoException e) {
+ Slog.e(TAG, "Failed to unpin file " + pf.mFilename + " with error " + e.getMessage());
+ return false;
+ }
+ if (DEBUG) {
+ Slog.i(TAG, "Unpinned file " + pf.mFilename );
+ }
+ return true;
+ }
private final class BinderService extends Binder {
@Override
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
pw.println("Pinned Files:");
- for (int i = 0; i < mPinnedFiles.size(); i++) {
- pw.println(mPinnedFiles.get(i));
+ synchronized(this) {
+ for (int i = 0; i < mPinnedFiles.size(); i++) {
+ pw.println(mPinnedFiles.get(i).mFilename);
+ }
+ for (int i = 0; i < mPinnedCameraFiles.size(); i++) {
+ pw.println(mPinnedCameraFiles.get(i).mFilename);
+ }
}
}
}
+
+ private static class PinnedFile {
+ long mAddress;
+ long mLength;
+ String mFilename;
+
+ PinnedFile(long address, long length, String filename) {
+ mAddress = address;
+ mLength = length;
+ mFilename = filename;
+ }
+ }
+
+ final class PinnerHandler extends Handler {
+ static final int PIN_CAMERA_MSG = 4000;
+ static final int PIN_ONSTART_MSG = 4001;
+
+ public PinnerHandler(Looper looper) {
+ super(looper, null, true);
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+
+ case PIN_CAMERA_MSG:
+ {
+ handlePinCamera(msg.arg1);
+ }
+ break;
+
+ case PIN_ONSTART_MSG:
+ {
+ handlePinOnStart();
+ }
+ break;
+
+ default:
+ super.handleMessage(msg);
+ }
+ }
+ }
+
}
diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java
index ecc69e9..90f507c 100644
--- a/services/core/java/com/android/server/SystemServiceManager.java
+++ b/services/core/java/com/android/server/SystemServiceManager.java
@@ -156,12 +156,15 @@
final int serviceLen = mServices.size();
for (int i = 0; i < serviceLen; i++) {
final SystemService service = mServices.get(i);
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onStartUser "
+ + service.getClass().getName());
try {
service.onStartUser(userHandle);
} catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting start of user " + userHandle
+ " to service " + service.getClass().getName(), ex);
}
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
}
@@ -169,12 +172,15 @@
final int serviceLen = mServices.size();
for (int i = 0; i < serviceLen; i++) {
final SystemService service = mServices.get(i);
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onUnlockUser "
+ + service.getClass().getName());
try {
service.onUnlockUser(userHandle);
} catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting unlock of user " + userHandle
+ " to service " + service.getClass().getName(), ex);
}
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
}
@@ -182,12 +188,15 @@
final int serviceLen = mServices.size();
for (int i = 0; i < serviceLen; i++) {
final SystemService service = mServices.get(i);
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onSwitchUser "
+ + service.getClass().getName());
try {
service.onSwitchUser(userHandle);
} catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting switch of user " + userHandle
+ " to service " + service.getClass().getName(), ex);
}
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
}
@@ -195,12 +204,15 @@
final int serviceLen = mServices.size();
for (int i = 0; i < serviceLen; i++) {
final SystemService service = mServices.get(i);
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onStopUser "
+ + service.getClass().getName());
try {
service.onStopUser(userHandle);
} catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting stop of user " + userHandle
+ " to service " + service.getClass().getName(), ex);
}
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
}
@@ -208,12 +220,15 @@
final int serviceLen = mServices.size();
for (int i = 0; i < serviceLen; i++) {
final SystemService service = mServices.get(i);
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "onCleanupUser "
+ + service.getClass().getName());
try {
service.onCleanupUser(userHandle);
} catch (Exception ex) {
Slog.wtf(TAG, "Failure reporting cleanup of user " + userHandle
+ " to service " + service.getClass().getName(), ex);
}
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
}
diff --git a/services/core/java/com/android/server/UiThread.java b/services/core/java/com/android/server/UiThread.java
index c06afc2..1bc6250 100644
--- a/services/core/java/com/android/server/UiThread.java
+++ b/services/core/java/com/android/server/UiThread.java
@@ -17,6 +17,7 @@
package com.android.server;
import android.os.Handler;
+import android.os.Process;
import android.os.Trace;
/**
@@ -29,7 +30,9 @@
private static Handler sHandler;
private UiThread() {
- super("android.ui", android.os.Process.THREAD_PRIORITY_FOREGROUND, false /*allowIo*/);
+ super("android.ui", Process.THREAD_PRIORITY_FOREGROUND, false /*allowIo*/);
+ // Make sure UiThread is in the fg stune boost group
+ Process.setThreadGroup(Process.myTid(), Process.THREAD_GROUP_TOP_APP);
}
private static void ensureThreadLocked() {
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 5b7f99c..843b109 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1233,11 +1233,13 @@
} finally {
db.endTransaction();
}
- sendAccountsChangedBroadcast(accounts.userId);
}
if (getUserManager().getUserInfo(accounts.userId).canHaveProfile()) {
addAccountToLinkedRestrictedUsers(account, accounts.userId);
}
+
+ // Only send LOGIN_ACCOUNTS_CHANGED when the database changed.
+ sendAccountsChangedBroadcast(accounts.userId);
return true;
}
@@ -1420,7 +1422,6 @@
synchronized (accounts.cacheLock) {
final SQLiteDatabase db = accounts.openHelper.getWritableDatabaseUserIsUnlocked();
db.beginTransaction();
- boolean isSuccessful = false;
Account renamedAccount = new Account(newName, accountToRename.type);
try {
final long accountId = getAccountIdLocked(db, accountToRename);
@@ -1433,54 +1434,51 @@
values.put(ACCOUNTS_PREVIOUS_NAME, accountToRename.name);
db.update(TABLE_ACCOUNTS, values, ACCOUNTS_ID + "=?", argsAccountId);
db.setTransactionSuccessful();
- isSuccessful = true;
logRecord(db, DebugDbHelper.ACTION_ACCOUNT_RENAME, TABLE_ACCOUNTS, accountId,
accounts);
}
} finally {
db.endTransaction();
- if (isSuccessful) {
- /*
- * Database transaction was successful. Clean up cached
- * data associated with the account in the user profile.
- */
- insertAccountIntoCacheLocked(accounts, renamedAccount);
- /*
- * Extract the data and token caches before removing the
- * old account to preserve the user data associated with
- * the account.
- */
- HashMap<String, String> tmpData = accounts.userDataCache.get(accountToRename);
- HashMap<String, String> tmpTokens = accounts.authTokenCache.get(accountToRename);
- removeAccountFromCacheLocked(accounts, accountToRename);
- /*
- * Update the cached data associated with the renamed
- * account.
- */
- accounts.userDataCache.put(renamedAccount, tmpData);
- accounts.authTokenCache.put(renamedAccount, tmpTokens);
- accounts.previousNameCache.put(
- renamedAccount,
- new AtomicReference<String>(accountToRename.name));
- resultAccount = renamedAccount;
+ }
+ /*
+ * Database transaction was successful. Clean up cached
+ * data associated with the account in the user profile.
+ */
+ insertAccountIntoCacheLocked(accounts, renamedAccount);
+ /*
+ * Extract the data and token caches before removing the
+ * old account to preserve the user data associated with
+ * the account.
+ */
+ HashMap<String, String> tmpData = accounts.userDataCache.get(accountToRename);
+ HashMap<String, String> tmpTokens = accounts.authTokenCache.get(accountToRename);
+ removeAccountFromCacheLocked(accounts, accountToRename);
+ /*
+ * Update the cached data associated with the renamed
+ * account.
+ */
+ accounts.userDataCache.put(renamedAccount, tmpData);
+ accounts.authTokenCache.put(renamedAccount, tmpTokens);
+ accounts.previousNameCache.put(
+ renamedAccount,
+ new AtomicReference<String>(accountToRename.name));
+ resultAccount = renamedAccount;
- int parentUserId = accounts.userId;
- if (canHaveProfile(parentUserId)) {
- /*
- * Owner or system user account was renamed, rename the account for
- * those users with which the account was shared.
- */
- List<UserInfo> users = getUserManager().getUsers(true);
- for (UserInfo user : users) {
- if (user.isRestricted()
- && (user.restrictedProfileParentId == parentUserId)) {
- renameSharedAccountAsUser(accountToRename, newName, user.id);
- }
- }
+ int parentUserId = accounts.userId;
+ if (canHaveProfile(parentUserId)) {
+ /*
+ * Owner or system user account was renamed, rename the account for
+ * those users with which the account was shared.
+ */
+ List<UserInfo> users = getUserManager().getUsers(true);
+ for (UserInfo user : users) {
+ if (user.isRestricted()
+ && (user.restrictedProfileParentId == parentUserId)) {
+ renameSharedAccountAsUser(accountToRename, newName, user.id);
}
- sendAccountsChangedBroadcast(accounts.userId);
}
}
+ sendAccountsChangedBroadcast(accounts.userId);
}
return resultAccount;
}
@@ -1563,9 +1561,15 @@
}
}
}
-
- logRecord(accounts, DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE, TABLE_ACCOUNTS);
-
+ SQLiteDatabase db = accounts.openHelper.getReadableDatabase();
+ final long accountId = getAccountIdLocked(db, account);
+ logRecord(
+ db,
+ DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE,
+ TABLE_ACCOUNTS,
+ accountId,
+ accounts,
+ callingUid);
try {
new RemoveAccountSession(accounts, response, account, expectActivityLaunch).bind();
} finally {
@@ -1597,7 +1601,15 @@
throw new SecurityException(msg);
}
UserAccounts accounts = getUserAccountsForCaller();
- logRecord(accounts, DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE, TABLE_ACCOUNTS);
+ SQLiteDatabase db = accounts.openHelper.getReadableDatabase();
+ final long accountId = getAccountIdLocked(db, account);
+ logRecord(
+ db,
+ DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE,
+ TABLE_ACCOUNTS,
+ accountId,
+ accounts,
+ callingUid);
long identityToken = clearCallingIdentity();
try {
return removeAccountInternal(accounts, account, callingUid);
@@ -1661,7 +1673,7 @@
}
private boolean removeAccountInternal(UserAccounts accounts, Account account, int callingUid) {
- int deleted;
+ boolean isChanged = false;
boolean userUnlocked = isLocalUnlockedUser(accounts.userId);
if (!userUnlocked) {
Slog.i(TAG, "Removing account " + account + " while user "+ accounts.userId
@@ -1671,25 +1683,38 @@
final SQLiteDatabase db = userUnlocked
? accounts.openHelper.getWritableDatabaseUserIsUnlocked()
: accounts.openHelper.getWritableDatabase();
- final long accountId = getAccountIdLocked(db, account);
db.beginTransaction();
+ // Set to a dummy value, this will only be used if the database
+ // transaction succeeds.
+ long accountId = -1;
try {
- deleted = db.delete(TABLE_ACCOUNTS, ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE
- + "=?", new String[]{account.name, account.type});
- if (userUnlocked) {
- // Delete from CE table
- deleted = db.delete(CE_TABLE_ACCOUNTS, ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE
- + "=?", new String[]{account.name, account.type});
+ accountId = getAccountIdLocked(db, account);
+ if (accountId >= 0) {
+ db.delete(
+ TABLE_ACCOUNTS,
+ ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE + "=?",
+ new String[]{ account.name, account.type });
+ if (userUnlocked) {
+ // Delete from CE table
+ db.delete(
+ CE_TABLE_ACCOUNTS,
+ ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE + "=?",
+ new String[]{ account.name, account.type });
+ }
+ db.setTransactionSuccessful();
+ isChanged = true;
}
- db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
- removeAccountFromCacheLocked(accounts, account);
- sendAccountsChangedBroadcast(accounts.userId);
- String action = userUnlocked ? DebugDbHelper.ACTION_ACCOUNT_REMOVE
- : DebugDbHelper.ACTION_ACCOUNT_REMOVE_DE;
- logRecord(db, action, TABLE_ACCOUNTS, accountId, accounts);
+ if (isChanged) {
+ removeAccountFromCacheLocked(accounts, account);
+ // Only broadcast LOGIN_ACCOUNTS_CHANGED if a change occured.
+ sendAccountsChangedBroadcast(accounts.userId);
+ String action = userUnlocked ? DebugDbHelper.ACTION_ACCOUNT_REMOVE
+ : DebugDbHelper.ACTION_ACCOUNT_REMOVE_DE;
+ logRecord(db, action, TABLE_ACCOUNTS, accountId, accounts);
+ }
}
long id = Binder.clearCallingIdentity();
try {
@@ -1706,7 +1731,7 @@
} finally {
Binder.restoreCallingIdentity(id);
}
- return (deleted > 0);
+ return isChanged;
}
@Override
@@ -1930,6 +1955,7 @@
if (account == null) {
return;
}
+ boolean isChanged = false;
synchronized (accounts.cacheLock) {
final SQLiteDatabase db = accounts.openHelper.getWritableDatabaseUserIsUnlocked();
db.beginTransaction();
@@ -1939,12 +1965,17 @@
final long accountId = getAccountIdLocked(db, account);
if (accountId >= 0) {
final String[] argsAccountId = {String.valueOf(accountId)};
- db.update(CE_TABLE_ACCOUNTS, values, ACCOUNTS_ID + "=?", argsAccountId);
- db.delete(CE_TABLE_AUTHTOKENS, AUTHTOKENS_ACCOUNTS_ID + "=?", argsAccountId);
+ db.update(
+ CE_TABLE_ACCOUNTS, values, ACCOUNTS_ID + "=?", argsAccountId);
+ db.delete(
+ CE_TABLE_AUTHTOKENS, AUTHTOKENS_ACCOUNTS_ID + "=?", argsAccountId);
accounts.authTokenCache.remove(account);
accounts.accountTokenCaches.remove(account);
db.setTransactionSuccessful();
-
+ // If there is an account whose password will be updated and the database
+ // transactions succeed, then we say that a change has occured. Even if the
+ // new password is the same as the old and there were no authtokens to delete.
+ isChanged = true;
String action = (password == null || password.length() == 0) ?
DebugDbHelper.ACTION_CLEAR_PASSWORD
: DebugDbHelper.ACTION_SET_PASSWORD;
@@ -1952,8 +1983,11 @@
}
} finally {
db.endTransaction();
+ if (isChanged) {
+ // Send LOGIN_ACCOUNTS_CHANGED only if the something changed.
+ sendAccountsChangedBroadcast(accounts.userId);
+ }
}
- sendAccountsChangedBroadcast(accounts.userId);
}
}
@@ -2641,14 +2675,6 @@
}
final int uid = Binder.getCallingUid();
- // Only allow system to start session
- if (!isSystemUid(uid)) {
- String msg = String.format(
- "uid %s cannot stat add account session.",
- uid);
- throw new SecurityException(msg);
- }
-
final int userId = UserHandle.getUserId(uid);
if (!canUserModifyAccounts(userId, uid)) {
try {
@@ -2854,14 +2880,6 @@
userId));
}
- // Only allow system to finish session
- if (!isSystemUid(callingUid)) {
- String msg = String.format(
- "uid %s cannot finish session because it's not system uid.",
- callingUid);
- throw new SecurityException(msg);
- }
-
if (!canUserModifyAccounts(userId, callingUid)) {
sendErrorResponse(response,
AccountManager.ERROR_CODE_USER_RESTRICTED,
@@ -3102,14 +3120,6 @@
}
final int uid = Binder.getCallingUid();
- // Only allow system to start session
- if (!isSystemUid(uid)) {
- String msg = String.format(
- "uid %s cannot start update credentials session.",
- uid);
- throw new SecurityException(msg);
- }
-
int userId = UserHandle.getCallingUserId();
// Check to see if the Password should be included to the caller.
@@ -3172,15 +3182,6 @@
throw new IllegalArgumentException("status token is empty");
}
- int uid = Binder.getCallingUid();
- // Only allow system to start session
- if (!isSystemUid(uid)) {
- String msg = String.format(
- "uid %s cannot stat add account session.",
- uid);
- throw new SecurityException(msg);
- }
-
int usrId = UserHandle.getCallingUserId();
long identityToken = clearCallingIdentity();
try {
@@ -3879,7 +3880,12 @@
ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mAccounts.userId);
ActivityInfo targetActivityInfo = resolveInfo.activityInfo;
int targetUid = targetActivityInfo.applicationInfo.uid;
- if (PackageManager.SIGNATURE_MATCH != pm.checkSignatures(authUid, targetUid)) {
+ if (!GrantCredentialsPermissionActivity.class.getName().equals(
+ targetActivityInfo.getClass().getName())
+ && !CantAddAccountActivity.class
+ .equals(targetActivityInfo.getClass().getName())
+ && PackageManager.SIGNATURE_MATCH != pm.checkSignatures(authUid,
+ targetUid)) {
String pkgName = targetActivityInfo.packageName;
String activityName = targetActivityInfo.name;
String tmpl = "KEY_INTENT resolved to an Activity (%s) in a package (%s) that "
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 7986629..d496e7a 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -43,7 +43,6 @@
import android.util.ArrayMap;
import android.util.ArraySet;
-import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.app.procstats.ServiceState;
import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.TransferPipe;
@@ -369,7 +368,7 @@
// we do not start the service and launch a review activity if the calling app
// is in the foreground passing it a pending intent to start the service when
// review is completed.
- if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (mAm.mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED) {
if (!requestStartTargetPermissionsReviewIfNeededLocked(r, callingPackage,
callingUid, service, callerFg, userId)) {
return null;
@@ -751,6 +750,17 @@
mAm.updateProcessForegroundLocked(proc, anyForeground, oomAdj);
}
+ private void updateWhitelistManagerLocked(ProcessRecord proc) {
+ proc.whitelistManager = false;
+ for (int i=proc.services.size()-1; i>=0; i--) {
+ ServiceRecord sr = proc.services.valueAt(i);
+ if (sr.whitelistManager) {
+ proc.whitelistManager = true;
+ break;
+ }
+ }
+ }
+
public void updateServiceConnectionActivitiesLocked(ProcessRecord clientProc) {
ArraySet<ProcessRecord> updatedProcesses = null;
for (int i = 0; i < clientProc.connections.size(); i++) {
@@ -881,7 +891,7 @@
// we schedule binding to the service but do not start its process, then
// we launch a review activity to which is passed a callback to invoke
// when done to start the bound service's process to completing the binding.
- if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (mAm.mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED) {
if (mAm.getPackageManagerInternalLocked().isPermissionsReviewRequired(
s.packageName, s.userId)) {
@@ -997,6 +1007,9 @@
if ((c.flags&Context.BIND_ABOVE_CLIENT) != 0) {
b.client.hasAboveClient = true;
}
+ if ((c.flags&Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0) {
+ s.whitelistManager = true;
+ }
if (s.app != null) {
updateServiceClientActivitiesLocked(s.app, c, true);
}
@@ -1019,6 +1032,9 @@
if ((flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) {
s.app.treatLikeActivity = true;
}
+ if (s.whitelistManager) {
+ s.app.whitelistManager = true;
+ }
// This could have made the service more important.
mAm.updateLruProcessLocked(s.app, s.app.hasClientActivities
|| s.app.treatLikeActivity, b.client);
@@ -1060,10 +1076,6 @@
return 1;
}
- private void foo() {
-
- }
-
void publishServiceLocked(ServiceRecord r, Intent intent, IBinder service) {
final long origId = Binder.clearCallingIdentity();
try {
@@ -1132,9 +1144,7 @@
if (r.binding.service.app != null) {
if (r.binding.service.app.whitelistManager) {
- // Must reset flag here because on computeOomAdjLocked() the service
- // connection will be gone...
- r.binding.service.app.whitelistManager = false;
+ updateWhitelistManagerLocked(r.binding.service.app);
}
// This could have made the service less important.
if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) {
@@ -1807,6 +1817,10 @@
}
}
+ if (r.whitelistManager) {
+ app.whitelistManager = true;
+ }
+
requestServiceBindingsLocked(r, execInFg);
updateServiceClientActivitiesLocked(app, null, true);
@@ -2018,6 +2032,9 @@
r.stats.stopLaunchedLocked();
}
r.app.services.remove(r);
+ if (r.whitelistManager) {
+ updateWhitelistManagerLocked(r.app);
+ }
if (r.app.thread != null) {
updateServiceForegroundLocked(r.app, false);
try {
@@ -2085,6 +2102,14 @@
if ((c.flags&Context.BIND_ABOVE_CLIENT) != 0) {
b.client.updateHasAboveClientLocked();
}
+ // If this connection requested whitelist management, see if we should
+ // now clear that state.
+ if ((c.flags&Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0) {
+ s.updateWhitelistManager();
+ if (!s.whitelistManager && s.app != null) {
+ updateWhitelistManagerLocked(s.app);
+ }
+ }
if (s.app != null) {
updateServiceClientActivitiesLocked(s.app, c, true);
}
@@ -2284,6 +2309,9 @@
if (finishing) {
if (r.app != null && !r.app.persistent) {
r.app.services.remove(r);
+ if (r.whitelistManager) {
+ updateWhitelistManagerLocked(r.app);
+ }
}
r.app = null;
}
@@ -2379,6 +2407,9 @@
service.app.removed = killProcess;
if (!service.app.persistent) {
service.app.services.remove(service);
+ if (service.whitelistManager) {
+ updateWhitelistManagerLocked(service.app);
+ }
}
}
service.app = null;
@@ -2497,6 +2528,8 @@
updateServiceConnectionActivitiesLocked(app);
app.connections.clear();
+ app.whitelistManager = false;
+
// Clear app state from services.
for (int i = app.services.size() - 1; i >= 0; i--) {
ServiceRecord sr = app.services.valueAt(i);
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index eb9da36..1d13d48 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -63,6 +63,7 @@
import org.xmlpull.v1.XmlSerializer;
import android.Manifest;
+import android.Manifest.permission;
import android.annotation.NonNull;
import android.annotation.UserIdInt;
import android.app.Activity;
@@ -140,7 +141,6 @@
import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
-import android.content.pm.ShortcutServiceInternal;
import android.content.pm.UserInfo;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
@@ -286,6 +286,7 @@
import static android.provider.Settings.Global.LENIENT_BACKGROUND_CHECK;
import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER;
import static android.provider.Settings.System.FONT_SCALE;
+import static android.security.KeyChain.ACTION_TRUST_STORE_CHANGED;
import static com.android.internal.util.XmlUtils.readBooleanAttribute;
import static com.android.internal.util.XmlUtils.readIntAttribute;
import static com.android.internal.util.XmlUtils.readLongAttribute;
@@ -569,6 +570,9 @@
private boolean mShowDialogs = true;
private boolean mInVrMode = false;
+ // Whether we should use SCHED_FIFO for UI and RenderThreads.
+ private boolean mUseFifoUiScheduling = false;
+
BroadcastQueue mFgBroadcastQueue;
BroadcastQueue mBgBroadcastQueue;
// Convenient for easy iteration over the queues. Foreground is first
@@ -587,14 +591,11 @@
}
/**
- * Activity we have told the window manager to have key focus.
+ * The last resumed activity. This is identical to the current resumed activity most
+ * of the time but could be different when we're pausing one activity before we resume
+ * another activity.
*/
- ActivityRecord mFocusedActivity = null;
-
- /**
- * User id of the last activity mFocusedActivity was set to.
- */
- private int mLastFocusedUserId;
+ private ActivityRecord mLastResumedActivity;
/**
* If non-null, we are tracking the time the user spends in the currently focused app.
@@ -635,36 +636,45 @@
final AppErrors mAppErrors;
- boolean mDoingSetFocusedActivity;
-
public boolean canShowErrorDialogs() {
return mShowDialogs && !mSleeping && !mShuttingDown;
}
- // it's a semaphore; boost when 0->1, reset when 1->0
- static ThreadLocal<Integer> sIsBoosted = new ThreadLocal<Integer>() {
- @Override protected Integer initialValue() {
- return 0;
+ private static final class PriorityState {
+ // Acts as counter for number of synchronized region that needs to acquire 'this' as a lock
+ // the current thread is currently in. When it drops down to zero, we will no longer boost
+ // the thread's priority.
+ private int regionCounter = 0;
+
+ // The thread's previous priority before boosting.
+ private int prevPriority = Integer.MIN_VALUE;
+ }
+
+ static ThreadLocal<PriorityState> sThreadPriorityState = new ThreadLocal<PriorityState>() {
+ @Override protected PriorityState initialValue() {
+ return new PriorityState();
}
};
static void boostPriorityForLockedSection() {
- if (sIsBoosted.get() == 0) {
- // boost to prio 118 while holding a global lock
- Process.setThreadPriority(Process.myTid(), -2);
- //Log.e(TAG, "PRIORITY BOOST: set priority on TID " + Process.myTid());
+ int tid = Process.myTid();
+ int prevPriority = Process.getThreadPriority(tid);
+ PriorityState state = sThreadPriorityState.get();
+ if (state.regionCounter == 0 && prevPriority > -2) {
+ state.prevPriority = prevPriority;
+ Process.setThreadPriority(tid, -2);
}
- int cur = sIsBoosted.get();
- sIsBoosted.set(cur + 1);
+ state.regionCounter++;
}
static void resetPriorityAfterLockedSection() {
- sIsBoosted.set(sIsBoosted.get() - 1);
- if (sIsBoosted.get() == 0) {
- //Log.e(TAG, "PRIORITY BOOST: reset priority on TID " + Process.myTid());
- Process.setThreadPriority(Process.myTid(), 0);
+ PriorityState state = sThreadPriorityState.get();
+ state.regionCounter--;
+ if (state.regionCounter == 0 && state.prevPriority > -2) {
+ Process.setThreadPriority(Process.myTid(), state.prevPriority);
}
}
+
public class PendingAssistExtras extends Binder implements Runnable {
public final ActivityRecord activity;
public final Bundle extras;
@@ -1073,9 +1083,9 @@
}
@Override
- public void onChange(boolean selfChange, Uri uri) {
+ public void onChange(boolean selfChange, Uri uri, @UserIdInt int userId) {
if (mFontScaleUri.equals(uri)) {
- updateFontScaleIfNeeded();
+ updateFontScaleIfNeeded(userId);
}
}
}
@@ -1522,6 +1532,7 @@
static final int NOTIFY_ACTIVITY_DISMISSING_DOCKED_STACK_MSG = 68;
static final int VR_MODE_APPLY_IF_NEEDED_MSG = 69;
static final int SHOW_UNSUPPORTED_DISPLAY_SIZE_DIALOG_MSG = 70;
+ static final int HANDLE_TRUST_STORAGE_UPDATE_MSG = 71;
static final int FIRST_ACTIVITY_STACK_MSG = 100;
static final int FIRST_BROADCAST_QUEUE_MSG = 200;
@@ -1559,6 +1570,8 @@
// being called for multiwindow assist in a single session.
private int mViSessionId = 1000;
+ final boolean mPermissionReviewRequired;
+
final class KillHandler extends Handler {
static final int KILL_PROCESS_GROUP_MSG = 4000;
@@ -2310,6 +2323,20 @@
if (mInVrMode != vrMode) {
mInVrMode = vrMode;
mShowDialogs = shouldShowDialogs(mConfiguration, mInVrMode);
+ if (r.app != null) {
+ ProcessRecord proc = r.app;
+ if (proc.vrThreadTid > 0) {
+ if (proc.curSchedGroup == ProcessList.SCHED_GROUP_TOP_APP) {
+ if (mInVrMode == true) {
+ Process.setThreadScheduler(proc.vrThreadTid,
+ Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1);
+ } else {
+ Process.setThreadScheduler(proc.vrThreadTid,
+ Process.SCHED_OTHER, 0);
+ }
+ }
+ }
+ }
}
}
vrService.setVrMode(vrMode, requestedPackage, userId, callingPackage);
@@ -2322,6 +2349,21 @@
r.info.getComponentName(), false);
}
} break;
+ case HANDLE_TRUST_STORAGE_UPDATE_MSG: {
+ synchronized (ActivityManagerService.this) {
+ for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) {
+ ProcessRecord r = mLruProcesses.get(i);
+ if (r.thread != null) {
+ try {
+ r.thread.handleTrustStorageUpdate();
+ } catch (RemoteException ex) {
+ Slog.w(TAG, "Failed to handle trust storage update for: " +
+ r.info.processName);
+ }
+ }
+ }
+ }
+ } break;
}
}
};
@@ -2585,6 +2627,9 @@
Slog.i(TAG, "Memory class: " + ActivityManager.staticGetMemoryClass());
+ mPermissionReviewRequired = mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_permissionReviewRequired);
+
mHandlerThread = new ServiceThread(TAG,
android.os.Process.THREAD_PRIORITY_FOREGROUND, false /*allowIo*/);
mHandlerThread.start();
@@ -2643,6 +2688,10 @@
GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version",
ConfigurationInfo.GL_ES_VERSION_UNDEFINED);
+ if (SystemProperties.getInt("sys.use_fifo_ui", 0) != 0) {
+ mUseFifoUiScheduling = true;
+ }
+
mTrackingAssociations = "1".equals(SystemProperties.get("debug.track-associations"));
mConfiguration.setToDefaults();
@@ -2914,25 +2963,11 @@
return mAppBindArgs;
}
- boolean setFocusedActivityLocked(ActivityRecord r, String reason) {
- if (r == null || mFocusedActivity == r) {
- return false;
- }
-
- if (!r.isFocusable()) {
- if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "setFocusedActivityLocked: unfocusable r=" + r);
- return false;
- }
-
- if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "setFocusedActivityLocked: r=" + r);
-
- final boolean wasDoingSetFocusedActivity = mDoingSetFocusedActivity;
- if (wasDoingSetFocusedActivity) Slog.w(TAG,
- "setFocusedActivityLocked: called recursively, r=" + r + ", reason=" + reason);
- mDoingSetFocusedActivity = true;
-
- final ActivityRecord last = mFocusedActivity;
- mFocusedActivity = r;
+ /**
+ * Update AMS states when an activity is resumed. This should only be called by
+ * {@link ActivityStack#setResumedActivityLocked} when an activity is resumed.
+ */
+ void setResumedActivityUncheckLocked(ActivityRecord r, String reason) {
if (r.task.isApplicationTask()) {
if (mCurAppTimeTracker != r.appTimeTracker) {
// We are switching app tracking. Complete the current one.
@@ -2961,8 +2996,9 @@
} else {
finishRunningVoiceLocked();
IVoiceInteractionSession session;
- if (last != null && ((session = last.task.voiceSession) != null
- || (session = last.voiceSession) != null)) {
+ if (mLastResumedActivity != null
+ && ((session = mLastResumedActivity.task.voiceSession) != null
+ || (session = mLastResumedActivity.voiceSession) != null)) {
// We had been in a voice interaction session, but now focused has
// move to something different. Just finish the session, we can't
// return to it and retain the proper state and synchronization with
@@ -2970,57 +3006,23 @@
finishVoiceTask(session);
}
}
- if (mStackSupervisor.moveActivityStackToFront(r, reason + " setFocusedActivity")) {
- mWindowManager.setFocusedApp(r.appToken, true);
- }
+
+ mWindowManager.setFocusedApp(r.appToken, true);
+
applyUpdateLockStateLocked(r);
applyUpdateVrModeLocked(r);
- if (mFocusedActivity.userId != mLastFocusedUserId) {
+ if (mLastResumedActivity != null && r.userId != mLastResumedActivity.userId) {
mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG);
mHandler.obtainMessage(
- FOREGROUND_PROFILE_CHANGED_MSG, mFocusedActivity.userId, 0).sendToTarget();
- mLastFocusedUserId = mFocusedActivity.userId;
+ FOREGROUND_PROFILE_CHANGED_MSG, r.userId, 0).sendToTarget();
}
- // Log a warning if the focused app is changed during the process. This could
- // indicate a problem of the focus setting logic!
- if (mFocusedActivity != r) Slog.w(TAG,
- "setFocusedActivityLocked: r=" + r + " but focused to " + mFocusedActivity);
- mDoingSetFocusedActivity = wasDoingSetFocusedActivity;
+ mLastResumedActivity = r;
- EventLogTags.writeAmFocusedActivity(
- mFocusedActivity == null ? -1 : mFocusedActivity.userId,
- mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName,
+ EventLogTags.writeAmSetResumedActivity(
+ r == null ? -1 : r.userId,
+ r == null ? "NULL" : r.shortComponentName,
reason);
- return true;
- }
-
- final void resetFocusedActivityIfNeededLocked(ActivityRecord goingAway) {
- if (mFocusedActivity != goingAway) {
- return;
- }
-
- final ActivityStack focusedStack = mStackSupervisor.getFocusedStack();
- if (focusedStack != null) {
- final ActivityRecord top = focusedStack.topActivity();
- if (top != null && top.userId != mLastFocusedUserId) {
- mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG);
- mHandler.sendMessage(
- mHandler.obtainMessage(FOREGROUND_PROFILE_CHANGED_MSG, top.userId, 0));
- mLastFocusedUserId = top.userId;
- }
- }
-
- // Try to move focus to another activity if possible.
- if (setFocusedActivityLocked(
- focusedStack.topRunningActivityLocked(), "resetFocusedActivityIfNeeded")) {
- return;
- }
-
- if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "resetFocusedActivityIfNeeded: Setting focus to NULL "
- + "prev mFocusedActivity=" + mFocusedActivity + " goingAway=" + goingAway);
- mFocusedActivity = null;
- EventLogTags.writeAmFocusedActivity(-1, "NULL", "resetFocusedActivityIfNeeded");
}
@Override
@@ -3035,7 +3037,7 @@
return;
}
final ActivityRecord r = stack.topRunningActivityLocked();
- if (setFocusedActivityLocked(r, "setFocusedStack")) {
+ if (mStackSupervisor.moveFocusableActivityStackToFrontLocked(r, "setFocusedStack")) {
mStackSupervisor.resumeFocusedStackTopActivityLocked();
}
}
@@ -3056,7 +3058,7 @@
return;
}
final ActivityRecord r = task.topRunningActivityLocked();
- if (setFocusedActivityLocked(r, "setFocusedTask")) {
+ if (mStackSupervisor.moveFocusableActivityStackToFrontLocked(r, "setFocusedTask")) {
mStackSupervisor.resumeFocusedStackTopActivityLocked();
}
}
@@ -3748,9 +3750,6 @@
checkTime(startTime, "startProcess: returned from zygote!");
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
- if (app.isolated) {
- mBatteryStatsService.addIsolatedUid(app.uid, app.info.uid);
- }
mBatteryStatsService.noteProcessStart(app.processName, app.info.uid);
checkTime(startTime, "startProcess: done updating battery stats");
@@ -5423,10 +5422,10 @@
IPackageManager pm = AppGlobals.getPackageManager();
int pkgUid = -1;
synchronized(this) {
- if (getPackageManagerInternalLocked().canPackageBeWiped(
+ if (getPackageManagerInternalLocked().isPackageDataProtected(
userId, packageName)) {
throw new SecurityException(
- "Cannot clear data for a device owner or a profile owner");
+ "Cannot clear data for a protected package: " + packageName);
}
try {
@@ -6249,6 +6248,9 @@
enqueueUidChangeLocked(uidRec, -1, UidRecord.CHANGE_ACTIVE);
}
proc.uidRecord = uidRec;
+
+ // Reset render thread tid if it was already set, so new process can set it again.
+ proc.renderThreadTid = 0;
uidRec.numProcs++;
mProcessNames.put(proc.processName, proc.uid, proc);
if (proc.isolated) {
@@ -6647,8 +6649,7 @@
@Override
public void showBootMessage(final CharSequence msg, final boolean always) {
if (Binder.getCallingUid() != Process.myUid()) {
- // These days only the core system can call this, so apps can't get in
- // the way of what we show about running them.
+ throw new SecurityException();
}
mWindowManager.showBootMessage(msg, always);
}
@@ -6685,7 +6686,7 @@
// Some stack visibility might change (e.g. docked stack)
mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
- applyVrModeIfNeededLocked(mFocusedActivity, true);
+ applyVrModeIfNeededLocked(mStackSupervisor.getResumedActivityLocked(), true);
}
}
} finally {
@@ -8577,7 +8578,8 @@
if (uri == null) {
owner.removeUriPermissionsLocked(mode);
} else {
- owner.removeUriPermissionLocked(new GrantUri(userId, uri, false), mode);
+ final boolean prefix = (mode & Intent.FLAG_GRANT_PREFIX_URI_PERMISSION) != 0;
+ owner.removeUriPermissionLocked(new GrantUri(userId, uri, prefix), mode);
}
}
}
@@ -9078,7 +9080,8 @@
}
@Override
- public List<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum, int flags, int userId) {
+ public ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum, int flags,
+ int userId) {
final int callingUid = Binder.getCallingUid();
userId = mUserController.handleIncomingUser(Binder.getCallingPid(), callingUid, userId,
false, ALLOW_FULL_ONLY, "getRecentTasks", null);
@@ -9094,7 +9097,7 @@
if (!isUserRunning(userId, ActivityManager.FLAG_AND_UNLOCKED)) {
Slog.i(TAG, "user " + userId + " is still locked. Cannot load recents");
- return Collections.emptyList();
+ return ParceledListSlice.emptyList();
}
mRecentTasks.loadUserRecentsLocked(userId);
@@ -9193,7 +9196,7 @@
maxNum--;
}
}
- return res;
+ return new ParceledListSlice<>(res);
}
}
@@ -9348,16 +9351,6 @@
Slog.w(TAG, "resizeTask: taskId=" + taskId + " not found");
return;
}
- int stackId = task.stack.mStackId;
- // We allow the task to scroll instead of resizing if this is a non-resizeable task
- // in crop windows resize mode or if the task size is affected by the docked stack
- // changing size. No need to update configuration.
- if (bounds != null && task.inCropWindowsResizeMode()
- && mStackSupervisor.isStackDockedInEffect(stackId)) {
- mWindowManager.scrollTask(task.taskId, bounds);
- return;
- }
-
// Place the task in the right stack if it isn't there already based on
// the requested bounds.
// The stack transition logic is:
@@ -9365,6 +9358,7 @@
// - a non-null bounds on a non-freeform (fullscreen OR docked) task moves
// that task to freeform
// - otherwise the task is not moved
+ int stackId = task.stack.mStackId;
if (!StackId.isTaskResizeAllowed(stackId)) {
throw new IllegalArgumentException("resizeTask not allowed on task=" + task);
}
@@ -10735,7 +10729,7 @@
// If permissions need a review before any of the app components can run,
// we return no provider and launch a review activity if the calling app
// is in the foreground.
- if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED) {
if (!requestTargetProviderPermissionsReviewIfNeededLocked(cpi, r, userId)) {
return null;
}
@@ -11421,6 +11415,14 @@
// the uid of the isolated process is specified by the caller.
uid = isolatedUid;
}
+
+ // Register the isolated UID with this application so BatteryStats knows to
+ // attribute resource usage to the application.
+ //
+ // NOTE: This is done here before addProcessNameLocked, which will tell BatteryStats
+ // about the process state of the isolated UID *before* it is registered with the
+ // owning application.
+ mBatteryStatsService.addIsolatedUid(uid, info.uid);
}
final ProcessRecord r = new ProcessRecord(stats, info, proc, uid);
if (!mBooted && !mBooting
@@ -11547,8 +11549,9 @@
}
void startTimeTrackingFocusedActivityLocked() {
- if (!mSleeping && mCurAppTimeTracker != null && mFocusedActivity != null) {
- mCurAppTimeTracker.start(mFocusedActivity.packageName);
+ final ActivityRecord resumedActivity = mStackSupervisor.getResumedActivityLocked();
+ if (!mSleeping && mCurAppTimeTracker != null && resumedActivity != null) {
+ mCurAppTimeTracker.start(resumedActivity.packageName);
}
}
@@ -12021,6 +12024,9 @@
case ActivityManager.BUGREPORT_OPTION_REMOTE:
service = "bugreportremote";
break;
+ case ActivityManager.BUGREPORT_OPTION_WEAR:
+ service = "bugreportwear";
+ break;
}
if (service == null) {
throw new IllegalArgumentException("Provided bugreport type is not correct, value: "
@@ -12489,7 +12495,7 @@
r.immersive = immersive;
// update associated state if we're frontmost
- if (r == mFocusedActivity) {
+ if (r == mStackSupervisor.getResumedActivityLocked()) {
if (DEBUG_IMMERSIVE) Slog.d(TAG_IMMERSIVE, "Frontmost changed immersion: "+ r);
applyUpdateLockStateLocked(r);
}
@@ -12507,6 +12513,76 @@
}
}
+ public void setVrThread(int tid) {
+ if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_VR_MODE)) {
+ throw new UnsupportedOperationException("VR mode not supported on this device!");
+ }
+
+ synchronized (this) {
+ ProcessRecord proc;
+ synchronized (mPidsSelfLocked) {
+ final int pid = Binder.getCallingPid();
+ proc = mPidsSelfLocked.get(pid);
+ if (proc != null && mInVrMode && tid >= 0) {
+ // ensure the tid belongs to the process
+ if (!Process.isThreadInProcess(pid, tid)) {
+ throw new IllegalArgumentException("VR thread does not belong to process");
+ }
+ // reset existing VR thread to CFS
+ if (proc.vrThreadTid != 0) {
+ Process.setThreadScheduler(proc.vrThreadTid, Process.SCHED_OTHER, 0);
+ }
+ // add check to guarantee that tid belongs to pid?
+ proc.vrThreadTid = tid;
+ // promote to FIFO now if the tid is non-zero
+ if (proc.curSchedGroup == ProcessList.SCHED_GROUP_TOP_APP && proc.vrThreadTid > 0) {
+ Process.setThreadScheduler(proc.vrThreadTid, Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1);
+ }
+ } else {
+ //Slog.e("VR_FIFO", "Didn't set thread from setVrThread?");
+ }
+ }
+ }
+ }
+
+ @Override
+ public void setRenderThread(int tid) {
+ synchronized (this) {
+ ProcessRecord proc;
+ synchronized (mPidsSelfLocked) {
+ int pid = Binder.getCallingPid();
+ proc = mPidsSelfLocked.get(pid);
+ if (proc != null && proc.renderThreadTid == 0 && tid > 0) {
+ // ensure the tid belongs to the process
+ if (!Process.isThreadInProcess(pid, tid)) {
+ throw new IllegalArgumentException(
+ "Render thread does not belong to process");
+ }
+ proc.renderThreadTid = tid;
+ if (DEBUG_OOM_ADJ) {
+ Slog.d("UI_FIFO", "Set RenderThread tid " + tid + " for pid " + pid);
+ }
+ // promote to FIFO now
+ if (proc.curSchedGroup == ProcessList.SCHED_GROUP_TOP_APP) {
+ if (DEBUG_OOM_ADJ) Slog.d("UI_FIFO", "Promoting " + tid + "out of band");
+ if (mUseFifoUiScheduling) {
+ Process.setThreadScheduler(proc.renderThreadTid,
+ Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1);
+ } else {
+ Process.setThreadPriority(proc.renderThreadTid, -10);
+ }
+ }
+ } else {
+ if (DEBUG_OOM_ADJ) {
+ Slog.d("UI_FIFO", "Didn't set thread from setRenderThread? " +
+ "PID: " + pid + ", TID: " + tid + " FIFO: " +
+ mUseFifoUiScheduling);
+ }
+ }
+ }
+ }
+ }
+
@Override
public int setVrMode(IBinder token, boolean enabled, ComponentName packageName) {
if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_VR_MODE)) {
@@ -12534,7 +12610,7 @@
r.requestedVrComponent = (enabled) ? packageName : null;
// Update associated state if this activity is currently focused
- if (r == mFocusedActivity) {
+ if (r == mStackSupervisor.getResumedActivityLocked()) {
applyUpdateVrModeLocked(r);
}
return 0;
@@ -12572,6 +12648,43 @@
}
}
+ @Override
+ public void setHasTopUi(boolean hasTopUi) throws RemoteException {
+ if (checkCallingPermission(permission.INTERNAL_SYSTEM_WINDOW) != PERMISSION_GRANTED) {
+ String msg = "Permission Denial: setHasTopUi() from pid="
+ + Binder.getCallingPid()
+ + ", uid=" + Binder.getCallingUid()
+ + " requires " + permission.INTERNAL_SYSTEM_WINDOW;
+ Slog.w(TAG, msg);
+ throw new SecurityException(msg);
+ }
+ final int pid = Binder.getCallingPid();
+ final long origId = Binder.clearCallingIdentity();
+ try {
+ synchronized (this) {
+ boolean changed = false;
+ ProcessRecord pr;
+ synchronized (mPidsSelfLocked) {
+ pr = mPidsSelfLocked.get(pid);
+ if (pr == null) {
+ Slog.w(TAG, "setHasTopUi called on unknown pid: " + pid);
+ return;
+ }
+ if (pr.hasTopUi != hasTopUi) {
+ Slog.i(TAG, "Setting hasTopUi=" + hasTopUi + " for pid=" + pid);
+ pr.hasTopUi = hasTopUi;
+ changed = true;
+ }
+ }
+ if (changed) {
+ updateOomAdjLocked(pr);
+ }
+ }
+ } finally {
+ Binder.restoreCallingIdentity(origId);
+ }
+ }
+
public final void enterSafeMode() {
synchronized(this) {
// It only makes sense to do this before the system is ready
@@ -13508,7 +13621,7 @@
sb.append("Process: ").append(processName).append("\n");
int flags = process.info.flags;
IPackageManager pm = AppGlobals.getPackageManager();
- sb.append("Flags: 0x").append(Integer.toString(flags, 16)).append("\n");
+ sb.append("Flags: 0x").append(Integer.toHexString(flags)).append("\n");
for (int ip=0; ip<process.pkgList.size(); ip++) {
String pkg = process.pkgList.keyAt(ip);
sb.append("Package: ").append(pkg);
@@ -13867,6 +13980,7 @@
boolean dumpClient = false;
boolean dumpCheckin = false;
boolean dumpCheckinFormat = false;
+ boolean dumpVisibleStacks = false;
String dumpPackage = null;
int opti = 0;
@@ -13880,6 +13994,8 @@
dumpAll = true;
} else if ("-c".equals(opt)) {
dumpClient = true;
+ } else if ("-v".equals(opt)) {
+ dumpVisibleStacks = true;
} else if ("-p".equals(opt)) {
if (opti < args.length) {
dumpPackage = args[opti];
@@ -14066,7 +14182,7 @@
LockGuard.dump(fd, pw, args);
} else {
// Dumping a single activity?
- if (!dumpActivity(fd, pw, cmd, args, opti, dumpAll)) {
+ if (!dumpActivity(fd, pw, cmd, args, opti, dumpAll, dumpVisibleStacks)) {
ActivityManagerShellCommand shell = new ActivityManagerShellCommand(this, true);
int res = shell.exec(this, null, fd, null, args, new ResultReceiver(null));
if (res < 0) {
@@ -14209,8 +14325,9 @@
dumpPackage);
boolean needSep = printedAnything;
- boolean printed = ActivityStackSupervisor.printThisActivity(pw, mFocusedActivity,
- dumpPackage, needSep, " mFocusedActivity: ");
+ boolean printed = ActivityStackSupervisor.printThisActivity(pw,
+ mStackSupervisor.getResumedActivityLocked(),
+ dumpPackage, needSep, " ResumedActivity: ");
if (printed) {
printedAnything = true;
needSep = false;
@@ -14934,11 +15051,11 @@
* - A hex number of the ActivityRecord object instance.
*/
protected boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name, String[] args,
- int opti, boolean dumpAll) {
+ int opti, boolean dumpAll, boolean dumpVisibleStacks) {
ArrayList<ActivityRecord> activities;
synchronized (this) {
- activities = mStackSupervisor.getDumpActivitiesLocked(name);
+ activities = mStackSupervisor.getDumpActivitiesLocked(name, dumpVisibleStacks);
}
if (activities.size() <= 0) {
@@ -17959,6 +18076,9 @@
}
// Lie; we don't want to crash the app.
return ActivityManager.BROADCAST_SUCCESS;
+ case android.security.KeyChain.ACTION_TRUST_STORE_CHANGED:
+ mHandler.sendEmptyMessage(HANDLE_TRUST_STORAGE_UPDATE_MSG);
+ break;
}
}
@@ -18585,23 +18705,28 @@
int userId = UserHandle.getCallingUserId();
synchronized(this) {
- final long origId = Binder.clearCallingIdentity();
- updateConfigurationLocked(values, null, false, true, userId);
+ updatePersistentConfigurationLocked(values, userId);
+ }
+ }
+
+ private void updatePersistentConfigurationLocked(Configuration values, @UserIdInt int userId) {
+ final long origId = Binder.clearCallingIdentity();
+ try {
+ updateConfigurationLocked(values, null, false, true, userId, false /* deferResume */);
+ } finally {
Binder.restoreCallingIdentity(origId);
}
}
- private void updateFontScaleIfNeeded() {
- final int currentUserId;
- synchronized(this) {
- currentUserId = mUserController.getCurrentUserIdLocked();
- }
+ private void updateFontScaleIfNeeded(@UserIdInt int userId) {
final float scaleFactor = Settings.System.getFloatForUser(mContext.getContentResolver(),
- FONT_SCALE, 1.0f, currentUserId);
+ FONT_SCALE, 1.0f, userId);
if (mConfiguration.fontScale != scaleFactor) {
final Configuration configuration = mWindowManager.computeNewConfiguration();
configuration.fontScale = scaleFactor;
- updatePersistentConfiguration(configuration);
+ synchronized (this) {
+ updatePersistentConfigurationLocked(configuration, userId);
+ }
}
}
@@ -18654,11 +18779,16 @@
updateConfigurationLocked(configuration, null, false);
}
- boolean updateConfigurationLocked(Configuration values,
- ActivityRecord starting, boolean initLocale) {
+ boolean updateConfigurationLocked(Configuration values, ActivityRecord starting,
+ boolean initLocale) {
+ return updateConfigurationLocked(values, starting, initLocale, false /* deferResume */);
+ }
+
+ boolean updateConfigurationLocked(Configuration values, ActivityRecord starting,
+ boolean initLocale, boolean deferResume) {
// pass UserHandle.USER_NULL as userId because we don't persist configuration for any user
- return updateConfigurationLocked(values, starting, initLocale, false,
- UserHandle.USER_NULL);
+ return updateConfigurationLocked(values, starting, initLocale, false /* persistent */,
+ UserHandle.USER_NULL, deferResume);
}
// To cache the list of supported system locales
@@ -18674,8 +18804,8 @@
* @param userId is only used when persistent parameter is set to true to persist configuration
* for that particular user
*/
- private boolean updateConfigurationLocked(Configuration values,
- ActivityRecord starting, boolean initLocale, boolean persistent, int userId) {
+ private boolean updateConfigurationLocked(Configuration values, ActivityRecord starting,
+ boolean initLocale, boolean persistent, int userId, boolean deferResume) {
int changes = 0;
if (mWindowManager != null) {
@@ -18774,15 +18904,6 @@
null, AppOpsManager.OP_NONE, null, false, false,
MY_PID, Process.SYSTEM_UID, UserHandle.USER_ALL);
if ((changes&ActivityInfo.CONFIG_LOCALE) != 0) {
- // Tell the shortcut manager that the system locale changed. It needs to know
- // it before any other apps receive ACTION_LOCALE_CHANGED, which is why
- // we "push" from here, rather than having the service listen to the broadcast.
- final ShortcutServiceInternal shortcutService =
- LocalServices.getService(ShortcutServiceInternal.class);
- if (shortcutService != null) {
- shortcutService.onSystemLocaleChangedNoLock();
- }
-
intent = new Intent(Intent.ACTION_LOCALE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
if (!mProcessesReady) {
@@ -18803,7 +18924,7 @@
for (int stackId : resizedStacks) {
final Rect newBounds = mWindowManager.getBoundsForNewConfiguration(stackId);
mStackSupervisor.resizeStackLocked(
- stackId, newBounds, null, null, false, false, !DEFER_RESUME);
+ stackId, newBounds, null, null, false, false, deferResume);
}
}
}
@@ -19060,6 +19181,10 @@
app.systemNoUi = false;
app.curSchedGroup = ProcessList.SCHED_GROUP_TOP_APP;
app.adjType = "pers-top-activity";
+ } else if (app.hasTopUi) {
+ app.systemNoUi = false;
+ app.curSchedGroup = ProcessList.SCHED_GROUP_TOP_APP;
+ app.adjType = "pers-top-ui";
} else if (activitiesSize > 0) {
for (int j = 0; j < activitiesSize; j++) {
final ActivityRecord r = app.activities.get(j);
@@ -19298,7 +19423,6 @@
}
boolean mayBeTop = false;
- app.whitelistManager = false;
for (int is = app.services.size()-1;
is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
@@ -19357,9 +19481,6 @@
// Binding to ourself is not interesting.
continue;
}
- if ((cr.flags & Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0) {
- app.whitelistManager = true;
- }
if ((cr.flags&Context.BIND_WAIVE_PRIORITY) == 0) {
ProcessRecord client = cr.binding.client;
@@ -19513,7 +19634,7 @@
adj = ProcessList.FOREGROUND_APP_ADJ;
if ((cr.flags&Context.BIND_NOT_FOREGROUND) == 0) {
if ((cr.flags&Context.BIND_IMPORTANT) != 0) {
- schedGroup = ProcessList.SCHED_GROUP_TOP_APP;
+ schedGroup = ProcessList.SCHED_GROUP_TOP_APP_BOUND;
} else {
schedGroup = ProcessList.SCHED_GROUP_DEFAULT;
}
@@ -20114,6 +20235,7 @@
}
if (app.setSchedGroup != app.curSchedGroup) {
+ int oldSchedGroup = app.setSchedGroup;
app.setSchedGroup = app.curSchedGroup;
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) Slog.v(TAG_OOM_ADJ,
"Setting sched group of " + app.processName
@@ -20129,30 +20251,79 @@
processGroup = Process.THREAD_GROUP_BG_NONINTERACTIVE;
break;
case ProcessList.SCHED_GROUP_TOP_APP:
+ case ProcessList.SCHED_GROUP_TOP_APP_BOUND:
processGroup = Process.THREAD_GROUP_TOP_APP;
break;
default:
processGroup = Process.THREAD_GROUP_DEFAULT;
break;
}
- if (true) {
- long oldId = Binder.clearCallingIdentity();
- try {
- Process.setProcessGroup(app.pid, processGroup);
- } catch (Exception e) {
- Slog.w(TAG, "Failed setting process group of " + app.pid
- + " to " + app.curSchedGroup);
- e.printStackTrace();
- } finally {
- Binder.restoreCallingIdentity(oldId);
- }
- } else {
- if (app.thread != null) {
- try {
- app.thread.setSchedulingGroup(processGroup);
- } catch (RemoteException e) {
+ long oldId = Binder.clearCallingIdentity();
+ try {
+ Process.setProcessGroup(app.pid, processGroup);
+ if (app.curSchedGroup == ProcessList.SCHED_GROUP_TOP_APP) {
+ // do nothing if we already switched to RT
+ if (oldSchedGroup != ProcessList.SCHED_GROUP_TOP_APP) {
+ // Switch VR thread for app to SCHED_FIFO
+ if (mInVrMode && app.vrThreadTid != 0) {
+ Process.setThreadScheduler(app.vrThreadTid,
+ Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1);
+ }
+ if (mUseFifoUiScheduling) {
+ // Switch UI pipeline for app to SCHED_FIFO
+ app.savedPriority = Process.getThreadPriority(app.pid);
+ Process.setThreadScheduler(app.pid,
+ Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1);
+ if (app.renderThreadTid != 0) {
+ Process.setThreadScheduler(app.renderThreadTid,
+ Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1);
+ if (DEBUG_OOM_ADJ) {
+ Slog.d("UI_FIFO", "Set RenderThread (TID " +
+ app.renderThreadTid + ") to FIFO");
+ }
+ } else {
+ if (DEBUG_OOM_ADJ) {
+ Slog.d("UI_FIFO", "Not setting RenderThread TID");
+ }
+ }
+ } else {
+ // Boost priority for top app UI and render threads
+ Process.setThreadPriority(app.pid, -10);
+ if (app.renderThreadTid != 0) {
+ Process.setThreadPriority(app.renderThreadTid, -10);
+ }
+ }
+ }
+ } else if (oldSchedGroup == ProcessList.SCHED_GROUP_TOP_APP &&
+ app.curSchedGroup != ProcessList.SCHED_GROUP_TOP_APP) {
+ // Reset VR thread to SCHED_OTHER
+ // Safe to do even if we're not in VR mode
+ if (app.vrThreadTid != 0) {
+ Process.setThreadScheduler(app.vrThreadTid, Process.SCHED_OTHER, 0);
+ }
+ if (mUseFifoUiScheduling) {
+ // Reset UI pipeline to SCHED_OTHER
+ Process.setThreadScheduler(app.pid, Process.SCHED_OTHER, 0);
+ Process.setThreadPriority(app.pid, app.savedPriority);
+ if (app.renderThreadTid != 0) {
+ Process.setThreadScheduler(app.renderThreadTid,
+ Process.SCHED_OTHER, 0);
+ Process.setThreadPriority(app.renderThreadTid, -4);
+ }
+ } else {
+ // Reset priority for top app UI and render threads
+ Process.setThreadPriority(app.pid, 0);
+ if (app.renderThreadTid != 0) {
+ Process.setThreadPriority(app.renderThreadTid, 0);
+ }
}
}
+ } catch (Exception e) {
+ Slog.w(TAG, "Failed setting process group of " + app.pid
+ + " to " + app.curSchedGroup);
+ e.printStackTrace();
+ } finally {
+ Binder.restoreCallingIdentity(oldId);
}
}
}
@@ -20454,7 +20625,7 @@
}
private final ActivityRecord resumedAppLocked() {
- ActivityRecord act = mStackSupervisor.resumedAppLocked();
+ ActivityRecord act = mStackSupervisor.getResumedActivityLocked();
String pkg;
int uid;
if (act != null) {
@@ -21355,8 +21526,9 @@
@Override
public boolean isUserRunning(int userId, int flags) {
- if (userId != UserHandle.getCallingUserId() && checkCallingPermission(
- INTERACT_ACROSS_USERS) != PackageManager.PERMISSION_GRANTED) {
+ if (!mUserController.isSameProfileGroup(userId, UserHandle.getCallingUserId())
+ && checkCallingPermission(INTERACT_ACROSS_USERS)
+ != PackageManager.PERMISSION_GRANTED) {
String msg = "Permission Denial: isUserRunning() from pid="
+ Binder.getCallingPid()
+ ", uid=" + Binder.getCallingUid()
@@ -21538,10 +21710,11 @@
ComponentName callingVrActivity = null;
int userId = -1;
synchronized (ActivityManagerService.this) {
- if (mFocusedActivity != null) {
- requestedVrService = mFocusedActivity.requestedVrComponent;
- callingVrActivity = mFocusedActivity.info.getComponentName();
- userId = mFocusedActivity.userId;
+ final ActivityRecord resumedActivity = mStackSupervisor.getResumedActivityLocked();
+ if (resumedActivity != null) {
+ requestedVrService = resumedActivity.requestedVrComponent;
+ callingVrActivity = resumedActivity.info.getComponentName();
+ userId = resumedActivity.userId;
}
}
@@ -21668,7 +21841,34 @@
Preconditions.checkNotNull(values, "Configuration must not be null");
Preconditions.checkArgumentNonnegative(userId, "userId " + userId + " not supported");
synchronized (ActivityManagerService.this) {
- updateConfigurationLocked(values, null, false, true, userId);
+ updateConfigurationLocked(values, null, false, true, userId,
+ false /* deferResume */);
+ }
+ }
+
+ @Override
+ public int startActivitiesAsPackage(String packageName, int userId, Intent[] intents,
+ Bundle bOptions) {
+ Preconditions.checkNotNull(intents, "intents");
+ final String[] resolvedTypes = new String[intents.length];
+ for (int i = 0; i < intents.length; i++) {
+ resolvedTypes[i] = intents[i].resolveTypeIfNeeded(mContext.getContentResolver());
+ }
+
+ // UID of the package on user userId.
+ // "= 0" is needed because otherwise catch(RemoteException) would make it look like
+ // packageUid may not be initialized.
+ int packageUid = 0;
+ try {
+ packageUid = AppGlobals.getPackageManager().getPackageUid(
+ packageName, PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userId);
+ } catch (RemoteException e) {
+ // Shouldn't happen.
+ }
+
+ synchronized (ActivityManagerService.this) {
+ return startActivitiesInPackage(packageUid, packageName, intents, resolvedTypes,
+ /*resultTo*/ null, bOptions, userId);
}
}
}
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index 8fd3dbd..06932b6 100755
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -222,6 +222,8 @@
boolean pendingVoiceInteractionStart; // Waiting for activity-invoked voice session
IVoiceInteractionSession voiceSession; // Voice interaction session for this activity
+ int mRotationAnimationHint;
+
private static String startingWindowStateToString(int state) {
switch (state) {
case STARTING_WINDOW_NOT_SHOWN:
@@ -445,17 +447,10 @@
return;
}
try {
- // Make sure fontScale is always equal to global. For fullscreen apps, config is
- // the shared EMPTY config, which has default fontScale of 1.0. We don't want it
- // to be applied as an override config.
- Configuration overrideConfig = new Configuration(config);
- overrideConfig.fontScale = service.mConfiguration.fontScale;
-
if (DEBUG_CONFIGURATION) Slog.v(TAG, "Sending new config to " + this + " " +
- "reportToActivity=" + reportToActivity + " and config: " + overrideConfig);
+ "reportToActivity=" + reportToActivity + " and config: " + config);
- app.thread.scheduleActivityConfigurationChanged(
- appToken, overrideConfig, reportToActivity);
+ app.thread.scheduleActivityConfigurationChanged(appToken, config, reportToActivity);
} catch (RemoteException e) {
// If process died, whatever.
}
@@ -636,6 +631,7 @@
if (options != null) {
pendingOptions = options;
mLaunchTaskBehind = pendingOptions.getLaunchTaskBehind();
+ mRotationAnimationHint = pendingOptions.getRotationAnimationHint();
PendingIntent usageReport = pendingOptions.getUsageTimeReport();
if (usageReport != null) {
appTimeTracker = new AppTimeTracker(usageReport);
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 4059a67..64b4739 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -712,6 +712,25 @@
}
}
+ /**
+ * @param task If non-null, the task will be moved to the back of the stack.
+ * */
+ void moveToBack(TaskRecord task) {
+ if (!isAttached()) {
+ return;
+ }
+
+ mStacks.remove(this);
+ mStacks.add(0, this);
+
+ if (task != null) {
+ mTaskHistory.remove(task);
+ mTaskHistory.add(0, task);
+ updateTaskMovement(task, false);
+ mWindowManager.moveTaskToBottom(task.taskId);
+ }
+ }
+
boolean isFocusable() {
if (StackId.canReceiveKeys(mStackId)) {
return true;
@@ -895,14 +914,10 @@
}
void minimalResumeActivityLocked(ActivityRecord r) {
- r.state = ActivityState.RESUMED;
if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to RESUMED: " + r + " (starting new instance)"
+ " callers=" + Debug.getCallers(5));
- mResumedActivity = r;
- r.task.touchActiveTime();
- mRecentTasks.addLocked(r.task);
+ setResumedActivityLocked(r, "minimalResumeActivityLocked");
completeResumeLocked(r);
- mStackSupervisor.checkReadyForSleepLocked();
setLaunchTime(r);
if (DEBUG_SAVED_STATE) Slog.i(TAG_SAVED_STATE,
"Launch completed; removing icicle of " + r.icicle);
@@ -1249,7 +1264,7 @@
r.stopped = true;
r.state = ActivityState.STOPPED;
- mWindowManager.notifyAppStopped(r.appToken, true);
+ mWindowManager.notifyAppStopped(r.appToken);
if (getVisibleBehindActivity() == r) {
mStackSupervisor.requestVisibleBehindLocked(r, false);
@@ -1350,8 +1365,11 @@
prev.cpuTimeAtResume = 0; // reset it
}
- // Notify when the task stack has changed, but only if visibilities changed (not just focus)
- if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause) {
+ // Notify when the task stack has changed, but only if visibilities changed (not just
+ // focus). Also if there is an active pinned stack - we always want to notify it about
+ // task stack changes, because its positioning may depend on it.
+ if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause
+ || mService.mStackSupervisor.getStack(PINNED_STACK_ID) != null) {
mService.notifyTaskStackChangedLocked();
mStackSupervisor.mAppVisibilitiesChangedSinceLastPause = false;
}
@@ -1428,6 +1446,7 @@
// When resuming an activity, require it to call requestVisibleBehind() again.
setVisibleBehindActivity(null);
}
+ mStackSupervisor.checkReadyForSleepLocked();
}
private void setVisible(ActivityRecord r, boolean visible) {
@@ -1595,6 +1614,28 @@
final ActivityStack focusedStack = mStackSupervisor.getFocusedStack();
final int focusedStackId = focusedStack.mStackId;
+ final TaskRecord topFocusedTask = focusedStack.topTask();
+ final boolean isOnTopLauncherFocused = topFocusedTask != null &&
+ topFocusedTask.isOnTopLauncher();
+ if (isOnTopLauncherFocused) {
+ // When an on-top launcher is focused, we should find out whether the freeform stack or
+ // the fullscreen stack appears first underneath and has activities to show, and then
+ // make it visible.
+ boolean behindFullscreenOrFreeForm = false;
+ for (int stackBehindFocusedIndex = mStacks.indexOf(focusedStack) - 1;
+ stackBehindFocusedIndex >= 0; stackBehindFocusedIndex--) {
+ ActivityStack stack = mStacks.get(stackBehindFocusedIndex);
+ if ((stack.mStackId == FREEFORM_WORKSPACE_STACK_ID
+ || stack.mStackId == FULLSCREEN_WORKSPACE_STACK_ID)
+ && stack.topRunningActivityLocked() != null) {
+ if (stackIndex == stackBehindFocusedIndex) {
+ return !behindFullscreenOrFreeForm ? STACK_VISIBLE : STACK_INVISIBLE;
+ }
+ behindFullscreenOrFreeForm = true;
+ }
+ }
+ }
+
if (mStackId == FULLSCREEN_WORKSPACE_STACK_ID
&& hasVisibleBehindActivity() && focusedStackId == HOME_STACK_ID
&& !focusedStack.topActivity().fullscreen) {
@@ -1706,7 +1747,8 @@
final boolean stackInvisible = stackVisibility != STACK_VISIBLE;
final boolean stackVisibleBehind = stackVisibility == STACK_VISIBLE_ACTIVITY_BEHIND;
boolean behindFullscreenActivity = stackInvisible;
- boolean resumeNextActivity = isFocusable() && (isInStackLocked(starting) == null);
+ boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this)
+ && (isInStackLocked(starting) == null);
boolean behindTranslucentActivity = false;
final ActivityRecord visibleBehind = getVisibleBehindActivity();
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
@@ -1783,7 +1825,28 @@
// status of an activity in a previous task affects other.
behindFullscreenActivity = stackVisibility == STACK_INVISIBLE;
} else if (mStackId == HOME_STACK_ID) {
- if (task.isHomeTask()) {
+ if (task.isOnTopLauncher()) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "On-top launcher: at " + task
+ + " stackInvisible=" + stackInvisible
+ + " behindFullscreenActivity=" + behindFullscreenActivity);
+ // When an on-top launcher is visible, (e.g. it's on the top of the home stack),
+ // other tasks in the home stack could be visible if and only if:
+ // - some app is running in the docked stack;
+ // - no app is running in either the fullscreen stack or the freefrom stack.
+ final ActivityStack dockedStack = mStackSupervisor.getStack(DOCKED_STACK_ID);
+ final ActivityStack fullscreenStack = mStackSupervisor.getStack(
+ FULLSCREEN_WORKSPACE_STACK_ID);
+ final ActivityStack freeformStack = mStackSupervisor.getStack(
+ FREEFORM_WORKSPACE_STACK_ID);
+ final boolean dockedStackEmpty = dockedStack == null ||
+ dockedStack.topRunningActivityLocked() == null;
+ final boolean fullscreenStackEmpty = fullscreenStack == null ||
+ fullscreenStack.topRunningActivityLocked() == null;
+ final boolean freeformStackEmpty = freeformStack == null ||
+ freeformStack.topRunningActivityLocked() == null;
+ behindFullscreenActivity = dockedStackEmpty || !fullscreenStackEmpty ||
+ !freeformStackEmpty;
+ } else if (task.isHomeTask()) {
if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Home task: at " + task
+ " stackInvisible=" + stackInvisible
+ " behindFullscreenActivity=" + behindFullscreenActivity);
@@ -2047,6 +2110,14 @@
// We don't want to clear starting window for activities that aren't behind fullscreen
// activities as we need to display their starting window until they are done initializing.
boolean behindFullscreenActivity = false;
+
+ if (getStackVisibilityLocked(null) == STACK_INVISIBLE) {
+ // The stack is not visible, so no activity in it should be displaying a starting
+ // window. Mark all activities below top and behind fullscreen.
+ aboveTop = false;
+ behindFullscreenActivity = true;
+ }
+
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;
for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
@@ -2109,6 +2180,16 @@
return result;
}
+ void setResumedActivityLocked(ActivityRecord r, String reason) {
+ // TODO: move mResumedActivity to stack supervisor,
+ // there should only be 1 global copy of resumed activity.
+ mResumedActivity = r;
+ r.state = ActivityState.RESUMED;
+ mService.setResumedActivityUncheckLocked(r, reason);
+ r.task.touchActiveTime();
+ mRecentTasks.addLocked(r.task);
+ }
+
private boolean resumeTopActivityInnerLocked(ActivityRecord prev, ActivityOptions options) {
if (DEBUG_LOCKSCREEN) mService.logLockScreen("");
@@ -2416,10 +2497,9 @@
mService.updateCpuStats();
if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to RESUMED: " + next + " (in existing)");
- next.state = ActivityState.RESUMED;
- mResumedActivity = next;
- next.task.touchActiveTime();
- mRecentTasks.addLocked(next.task);
+
+ setResumedActivityLocked(next, "resumeTopActivityInnerLocked");
+
mService.updateLruProcessLocked(next.app, true, null);
updateLRUListLocked(next);
mService.updateOomAdjLocked();
@@ -2451,13 +2531,12 @@
// Do over!
mStackSupervisor.scheduleResumeTopActivities();
}
- if (mStackSupervisor.reportResumedActivityLocked(next)) {
- mNoAnimActivities.clear();
- if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
- return true;
+ if (!next.visible || next.stopped) {
+ mWindowManager.setAppVisibility(next.appToken, true);
}
+ completeResumeLocked(next);
if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
- return false;
+ return true;
}
try {
@@ -2478,7 +2557,7 @@
// Well the app will no longer be stopped.
// Clear app token stopped state in window manager if needed.
- mWindowManager.notifyAppStopped(next.appToken, false);
+ mWindowManager.notifyAppResumed(next.appToken, next.stopped);
EventLog.writeEvent(EventLogTags.AM_RESUME_ACTIVITY, next.userId,
System.identityHashCode(next), next.task.taskId, next.shortComponentName);
@@ -2492,8 +2571,6 @@
next.app.thread.scheduleResumeActivity(next.appToken, next.app.repProcState,
mService.isNextTransitionForward(), resumeAnimOptions);
- mStackSupervisor.checkReadyForSleepLocked();
-
if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityLocked: Resumed " + next);
} catch (Exception e) {
// Whoops, need to restart this activity!
@@ -2586,11 +2663,14 @@
}
private void insertTaskAtTop(TaskRecord task, ActivityRecord newActivity) {
+ boolean isLastTaskOverHome = false;
// If the moving task is over home stack, transfer its return type to next task
if (task.isOverHomeStack()) {
final TaskRecord nextTask = getNextTask(task);
if (nextTask != null) {
nextTask.setTaskToReturnTo(task.getTaskToReturnTo());
+ } else {
+ isLastTaskOverHome = true;
}
}
@@ -2599,8 +2679,19 @@
if (isOnHomeDisplay()) {
ActivityStack lastStack = mStackSupervisor.getLastStack();
final boolean fromHome = lastStack.isHomeStack();
- if (!isHomeStack() && (fromHome || topTask() != task)) {
- int returnToType = APPLICATION_ACTIVITY_TYPE;
+ final boolean fromOnTopLauncher = lastStack.topTask() != null &&
+ lastStack.topTask().isOnTopLauncher();
+ if (fromOnTopLauncher) {
+ // Since an on-top launcher will is moved to back when tasks are launched from it,
+ // those tasks should first try to return to a non-home activity.
+ // This also makes sure that non-home activities are visible under a transparent
+ // non-home activity.
+ task.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE);
+ } else if (!isHomeStack() && (fromHome || topTask() != task)) {
+ // If it's a last task over home - we default to keep its return to type not to
+ // make underlying task focused when this one will be finished.
+ int returnToType = isLastTaskOverHome
+ ? task.getTaskToReturnTo() : APPLICATION_ACTIVITY_TYPE;
if (fromHome && StackId.allowTopTaskToReturnHome(mStackId)) {
returnToType = lastStack.topTask() == null
? HOME_ACTIVITY_TYPE : lastStack.topTask().taskType;
@@ -3155,8 +3246,8 @@
r.addResultLocked(null, resultWho, requestCode, resultCode, data);
}
- private void adjustFocusedActivityLocked(ActivityRecord r, String reason) {
- if (!mStackSupervisor.isFocusedStack(this) || mService.mFocusedActivity != r) {
+ private void adjustFocusedActivityStackLocked(ActivityRecord r, String reason) {
+ if (!mStackSupervisor.isFocusedStack(this) || mResumedActivity != r) {
return;
}
@@ -3165,9 +3256,7 @@
if (next != r) {
if (next != null && StackId.keepFocusInStackIfPossible(mStackId) && isFocusable()) {
// For freeform, docked, and pinned stacks we always keep the focus within the
- // stack as long as there is a running activity in the stack that we can adjust
- // focus to.
- mService.setFocusedActivityLocked(next, myReason);
+ // stack as long as there is a running activity.
return;
} else {
final TaskRecord task = r.task;
@@ -3191,7 +3280,8 @@
}
}
- mService.setFocusedActivityLocked(mStackSupervisor.topRunningActivityLocked(), myReason);
+ mStackSupervisor.moveFocusableActivityStackToFrontLocked(
+ mStackSupervisor.topRunningActivityLocked(), myReason);
}
private boolean adjustFocusToNextFocusableStackLocked(int taskToReturnTo, String reason) {
@@ -3208,7 +3298,9 @@
// visible, then use the task return to value to determine the home task to display next.
return mStackSupervisor.moveHomeStackTaskToTop(taskToReturnTo, reason);
}
- return mService.setFocusedActivityLocked(top, myReason);
+
+ stack.moveToFront(myReason);
+ return true;
}
final void stopActivityLocked(ActivityRecord r) {
@@ -3221,7 +3313,7 @@
if (requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,
"stop-no-history", false)) {
// Activity was finished, no need to continue trying to schedule stop.
- adjustFocusedActivityLocked(r, "stopActivityFinished");
+ adjustFocusedActivityStackLocked(r, "stopActivityFinished");
r.resumeKeyDispatchingLocked();
return;
}
@@ -3233,7 +3325,7 @@
}
if (r.app != null && r.app.thread != null) {
- adjustFocusedActivityLocked(r, "stopActivity");
+ adjustFocusedActivityStackLocked(r, "stopActivity");
r.resumeKeyDispatchingLocked();
try {
r.stopped = false;
@@ -3460,7 +3552,7 @@
r.pauseKeyDispatchingLocked();
- adjustFocusedActivityLocked(r, "finishActivity");
+ adjustFocusedActivityStackLocked(r, "finishActivity");
finishActivityResultsLocked(r, resultCode, resultData);
@@ -3544,11 +3636,18 @@
if (mode == FINISH_IMMEDIATELY
|| (prevState == ActivityState.PAUSED
- && (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID))
+ && (mode == FINISH_AFTER_PAUSE || mode == FINISH_AFTER_VISIBLE
+ || mStackId == PINNED_STACK_ID))
|| prevState == ActivityState.STOPPED
|| prevState == ActivityState.INITIALIZING) {
r.makeFinishingLocked();
boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm");
+
+ if (prevState == ActivityState.PAUSED && mode == FINISH_AFTER_VISIBLE) {
+ // Finishing activity that was in paused state - this can happen if it was in
+ // not currently focused stack. Need to make something visible in its place.
+ mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
+ }
if (activityRemoved) {
mStackSupervisor.resumeFocusedStackTopActivityLocked();
}
@@ -3721,7 +3820,6 @@
if (mPausingActivity == r) {
mPausingActivity = null;
}
- mService.resetFocusedActivityIfNeededLocked(r);
r.deferRelaunchUntilPaused = false;
r.frozenBeforeDestroy = false;
@@ -3759,6 +3857,10 @@
if (getVisibleBehindActivity() == r) {
mStackSupervisor.requestVisibleBehindLocked(r, false);
}
+
+ // Clean-up activities are no longer relaunching (e.g. app process died). Notify window
+ // manager so it can update its bookkeeping.
+ mWindowManager.notifyAppRelaunchesCleared(r.appToken);
}
private void removeTimeoutsForActivityLocked(ActivityRecord r) {
@@ -4276,7 +4378,7 @@
// Set focus to the top running activity of this stack.
ActivityRecord r = topRunningActivityLocked();
- mService.setFocusedActivityLocked(r, reason);
+ mStackSupervisor.moveFocusableActivityStackToFrontLocked(r, reason);
if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to front transition: task=" + tr);
if (noAnimation) {
@@ -4344,6 +4446,23 @@
if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + taskId);
if (mStackId == HOME_STACK_ID && topTask().isHomeTask()) {
+ if (topTask().isOnTopLauncher()) {
+ // An on-top launcher doesn't affect the visibility of activities on other stacks
+ // behind it. So if we're moving an on-top launcher to the back, we want to move the
+ // focus to the next focusable stack and resume an activity there.
+ // Besides, when the docked stack is visible, we should also move the home stack to
+ // the back to avoid the recents pops up on top of a fullscreen or freeform
+ // activity.
+
+ // Move the home stack to back.
+ moveToBack(topTask());
+
+ // Resume an activity in the next focusable stack.
+ adjustFocusToNextFocusableStackLocked(APPLICATION_ACTIVITY_TYPE, "moveTaskToBack");
+ mStackSupervisor.resumeFocusedStackTopActivityLocked();
+ return true;
+ }
+
// For the case where we are moving the home task back and there is an activity visible
// behind it on the fullscreen stack, we want to move the focus to the visible behind
// activity to maintain order with what the user is seeing.
@@ -4351,7 +4470,7 @@
mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID);
if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) {
final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity();
- mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack");
+ mStackSupervisor.moveFocusableActivityStackToFrontLocked(visibleBehind, "moveTaskToBack");
mStackSupervisor.resumeFocusedStackTopActivityLocked();
return true;
}
@@ -4729,18 +4848,8 @@
if (DEBUG_STATES) {
Slog.d(TAG_STATES, "Resumed after relaunch " + r);
}
- r.state = ActivityState.RESUMED;
- // Relaunch-resume could happen either when the app is already in the front,
- // or while it's being brought to front. In the latter case, it's marked RESUMED
- // but not yet visible (or stopped). We need to complete the resume here as the
- // code in resumeTopActivityInnerLocked to complete the resume might be skipped.
- if (!r.visible || r.stopped) {
- mWindowManager.setAppVisibility(r.appToken, true);
- completeResumeLocked(r);
- } else {
- r.results = null;
- r.newIntents = null;
- }
+ r.results = null;
+ r.newIntents = null;
mService.showUnsupportedZoomDialogIfNeededLocked(r);
mService.showAskCompatModeDialogLocked(r);
} else {
@@ -5194,7 +5303,7 @@
(r.info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0, r.userId, r.info.configChanges,
task.voiceSession != null, r.mLaunchTaskBehind, bounds, task.mOverrideConfig,
task.mResizeMode, r.isAlwaysFocusable(), task.isHomeTask(),
- r.appInfo.targetSdkVersion);
+ r.appInfo.targetSdkVersion, r.mRotationAnimationHint, task.isOnTopLauncher());
r.taskConfigOverride = task.mOverrideConfig;
}
@@ -5247,7 +5356,7 @@
private void setAppTask(ActivityRecord r, TaskRecord task) {
final Rect bounds = task.updateOverrideConfigurationFromLaunchBounds();
mWindowManager.setAppTask(r.appToken, task.taskId, mStackId, bounds, task.mOverrideConfig,
- task.mResizeMode, task.isHomeTask());
+ task.mResizeMode, task.isHomeTask(), task.isOnTopLauncher());
r.taskConfigOverride = task.mOverrideConfig;
}
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 82668e4..858f7e7 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -128,6 +128,7 @@
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CONTAINERS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_FOCUS;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_IDLE;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKSCREEN;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK;
@@ -140,6 +141,7 @@
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBLE_BEHIND;
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_CONTAINERS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_FOCUS;
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_IDLE;
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKTASK;
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PAUSE;
@@ -180,6 +182,7 @@
public final class ActivityStackSupervisor implements DisplayListener {
private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityStackSupervisor" : TAG_AM;
private static final String TAG_CONTAINERS = TAG + POSTFIX_CONTAINERS;
+ private static final String TAG_FOCUS = TAG + POSTFIX_FOCUS;
private static final String TAG_IDLE = TAG + POSTFIX_IDLE;
private static final String TAG_LOCKTASK = TAG + POSTFIX_LOCKTASK;
private static final String TAG_PAUSE = TAG + POSTFIX_PAUSE;
@@ -613,12 +616,6 @@
}
final ActivityRecord r = topRunningActivityLocked();
- if (!mService.mDoingSetFocusedActivity && mService.mFocusedActivity != r) {
- // The focus activity should always be the top activity in the focused stack.
- // There will be chaos and anarchy if it isn't...
- mService.setFocusedActivityLocked(r, reason + " setFocusStack");
- }
-
if (mService.mBooting || !mService.mBooted) {
if (r != null && r.idle) {
checkFinishBootingLocked();
@@ -643,7 +640,7 @@
if (top == null) {
return false;
}
- mService.setFocusedActivityLocked(top, reason);
+ moveFocusableActivityStackToFrontLocked(top, reason);
return true;
}
@@ -668,7 +665,7 @@
// Only resume home activity if isn't finishing.
if (r != null && !r.finishing) {
- mService.setFocusedActivityLocked(r, myReason);
+ moveFocusableActivityStackToFrontLocked(r, myReason);
return resumeFocusedStackTopActivityLocked(mHomeStack, prev, null);
}
return mService.startHomeActivityLocked(mCurrentUser, myReason);
@@ -807,7 +804,7 @@
return candidateTaskId;
}
- ActivityRecord resumedAppLocked() {
+ ActivityRecord getResumedActivityLocked() {
ActivityStack stack = mFocusedStack;
if (stack == null) {
return null;
@@ -1051,7 +1048,7 @@
return r;
}
- // Return to the home stack.
+ // Look in other non-focused and non-home stacks.
final ArrayList<ActivityStack> stacks = mHomeStack.mStacks;
for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = stacks.get(stackNdx);
@@ -1189,7 +1186,10 @@
Configuration config = mWindowManager.updateOrientationFromAppTokens(
mService.mConfiguration,
r.mayFreezeScreenLocked(app) ? r.appToken : null);
- mService.updateConfigurationLocked(config, r, false);
+ // Deferring resume here because we're going to launch new activity shortly.
+ // We don't want to perform a redundant launch of the same record while ensuring
+ // configurations and trying to resume top activity of focused stack.
+ mService.updateConfigurationLocked(config, r, false, true /* deferResume */);
}
r.app = app;
@@ -1539,20 +1539,6 @@
return ACTIVITY_RESTRICTION_NONE;
}
- boolean moveActivityStackToFront(ActivityRecord r, String reason) {
- if (r == null) {
- // Not sure what you are trying to do, but it is not going to work...
- return false;
- }
- final TaskRecord task = r.task;
- if (task == null || task.stack == null) {
- Slog.w(TAG, "Can't move stack to front for r=" + r + " task=" + task);
- return false;
- }
- task.stack.moveToFront(reason, task);
- return true;
- }
-
void setLaunchSource(int uid) {
mLaunchingActivity.setWorkSource(new WorkSource(uid));
}
@@ -2004,7 +1990,7 @@
boolean preserveWindows, boolean allowResizeInDockedMode, boolean deferResume) {
if (stackId == DOCKED_STACK_ID) {
resizeDockedStackLocked(bounds, tempTaskBounds, tempTaskInsetBounds, null, null,
- preserveWindows);
+ preserveWindows, deferResume);
return;
}
final ActivityStack stack = getStack(stackId);
@@ -2154,8 +2140,16 @@
}
void resizeDockedStackLocked(Rect dockedBounds, Rect tempDockedTaskBounds,
- Rect tempDockedTaskInsetBounds,
- Rect tempOtherTaskBounds, Rect tempOtherTaskInsetBounds, boolean preserveWindows) {
+ Rect tempDockedTaskInsetBounds, Rect tempOtherTaskBounds, Rect tempOtherTaskInsetBounds,
+ boolean preserveWindows) {
+ resizeDockedStackLocked(dockedBounds, tempDockedTaskBounds, tempDockedTaskInsetBounds,
+ tempOtherTaskBounds, tempOtherTaskInsetBounds, preserveWindows,
+ false /* deferResume */);
+ }
+
+ void resizeDockedStackLocked(Rect dockedBounds, Rect tempDockedTaskBounds,
+ Rect tempDockedTaskInsetBounds, Rect tempOtherTaskBounds, Rect tempOtherTaskInsetBounds,
+ boolean preserveWindows, boolean deferResume) {
if (!mAllowDockedStackResize) {
// Docked stack resize currently disabled.
@@ -2198,11 +2192,13 @@
if (StackId.isResizeableByDockedStack(i) && getStack(i) != null) {
resizeStackLocked(i, tempRect, tempOtherTaskBounds,
tempOtherTaskInsetBounds, preserveWindows,
- true /* allowResizeInDockedMode */, !DEFER_RESUME);
+ true /* allowResizeInDockedMode */, deferResume);
}
}
}
- stack.ensureVisibleActivitiesConfigurationLocked(r, preserveWindows);
+ if (!deferResume) {
+ stack.ensureVisibleActivitiesConfigurationLocked(r, preserveWindows);
+ }
} finally {
mAllowDockedStackResize = true;
mWindowManager.continueSurfaceLayout();
@@ -2591,6 +2587,34 @@
mService.notifyActivityPinnedLocked();
}
+ boolean moveFocusableActivityStackToFrontLocked(ActivityRecord r, String reason) {
+ if (r == null || !r.isFocusable()) {
+ if (DEBUG_FOCUS) Slog.d(TAG_FOCUS,
+ "moveActivityStackToFront: unfocusable r=" + r);
+ return false;
+ }
+
+ final TaskRecord task = r.task;
+ if (task == null || task.stack == null) {
+ Slog.w(TAG, "moveActivityStackToFront: invalid task or stack: r="
+ + r + " task=" + task);
+ return false;
+ }
+
+ final ActivityStack stack = task.stack;
+ if (stack == mFocusedStack && stack.topRunningActivityLocked() == r) {
+ if (DEBUG_FOCUS) Slog.d(TAG_FOCUS,
+ "moveActivityStackToFront: already on top, r=" + r);
+ return false;
+ }
+
+ if (DEBUG_FOCUS) Slog.d(TAG_FOCUS,
+ "moveActivityStackToFront: r=" + r);
+
+ stack.moveToFront(reason, task);
+ return true;
+ }
+
void positionTaskInStackLocked(int taskId, int stackId, int position) {
final TaskRecord task = anyTaskForIdLocked(taskId);
if (task == null) {
@@ -3061,7 +3085,7 @@
final boolean nowVisible = allResumedActivitiesVisible();
for (int activityNdx = mStoppingActivities.size() - 1; activityNdx >= 0; --activityNdx) {
ActivityRecord s = mStoppingActivities.get(activityNdx);
- final boolean waitingVisible = mWaitingVisibleActivities.contains(s);
+ boolean waitingVisible = mWaitingVisibleActivities.contains(s);
if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + nowVisible
+ " waitingVisible=" + waitingVisible + " finishing=" + s.finishing);
if (waitingVisible && nowVisible) {
@@ -3074,6 +3098,7 @@
// hidden by the activities in front of it.
if (DEBUG_STATES) Slog.v(TAG, "Before stopping, can hide: " + s);
mWindowManager.setAppVisibility(s.appToken, false);
+ waitingVisible = false;
}
}
if ((!waitingVisible || mService.isSleepingOrShuttingDownLocked()) && remove) {
@@ -3152,8 +3177,27 @@
pw.println(" mLockTaskModeTasks" + mLockTaskModeTasks);
}
- ArrayList<ActivityRecord> getDumpActivitiesLocked(String name) {
- return mFocusedStack.getDumpActivitiesLocked(name);
+ /**
+ * Dumps the activities matching the given {@param name} in the either the focused stack
+ * or all visible stacks if {@param dumpVisibleStacks} is true.
+ */
+ ArrayList<ActivityRecord> getDumpActivitiesLocked(String name, boolean dumpVisibleStacks) {
+ if (dumpVisibleStacks) {
+ ArrayList<ActivityRecord> activities = new ArrayList<>();
+ int numDisplays = mActivityDisplays.size();
+ for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
+ ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;
+ for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
+ ActivityStack stack = stacks.get(stackNdx);
+ if (stack.getStackVisibilityLocked(null) == STACK_VISIBLE) {
+ activities.addAll(stack.getDumpActivitiesLocked(name));
+ }
+ }
+ }
+ return activities;
+ } else {
+ return mFocusedStack.getDumpActivitiesLocked(name);
+ }
}
static boolean printThisActivity(PrintWriter pw, ActivityRecord activity, String dumpPackage,
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index 77b450f..9f875a1 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -103,6 +103,7 @@
import android.os.Bundle;
import android.os.IBinder;
import android.os.PowerManagerInternal;
+import android.os.Process;
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle;
@@ -132,6 +133,9 @@
private static final String TAG_CONFIGURATION = TAG + POSTFIX_CONFIGURATION;
private static final String TAG_USER_LEAVING = TAG + POSTFIX_USER_LEAVING;
+ // TODO b/30204367 remove when the platform fully supports ephemeral applications
+ private static final boolean USE_DEFAULT_EPHEMERAL_LAUNCHER = false;
+
private final ActivityManagerService mService;
private final ActivityStackSupervisor mSupervisor;
private ActivityStartInterceptor mInterceptor;
@@ -412,7 +416,8 @@
// If permissions need a review before any of the app components can run, we
// launch the review activity and pass a pending intent to start the activity
// we are to launching now after the review is completed.
- if (Build.PERMISSIONS_REVIEW_REQUIRED && aInfo != null) {
+ if ((mService.mPermissionReviewRequired
+ || Build.PERMISSIONS_REVIEW_REQUIRED) && aInfo != null) {
if (mService.getPackageManagerInternalLocked().isPermissionsReviewRequired(
aInfo.packageName, userId)) {
IIntentSender target = mService.getIntentSenderLocked(
@@ -456,39 +461,13 @@
// starts either the intent we resolved here [on install error] or the ephemeral
// app [on install success].
if (rInfo != null && rInfo.ephemeralResolveInfo != null) {
- // Create a pending intent to start the intent resolved here.
- final IIntentSender failureTarget = mService.getIntentSenderLocked(
- ActivityManager.INTENT_SENDER_ACTIVITY, callingPackage,
- Binder.getCallingUid(), userId, null, null, 0, new Intent[]{ intent },
- new String[]{ resolvedType },
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
- | PendingIntent.FLAG_IMMUTABLE, null);
-
- // Create a pending intent to start the ephemeral application; force it to be
- // directed to the ephemeral package.
- ephemeralIntent.setPackage(rInfo.ephemeralResolveInfo.getPackageName());
- final IIntentSender ephemeralTarget = mService.getIntentSenderLocked(
- ActivityManager.INTENT_SENDER_ACTIVITY, callingPackage,
- Binder.getCallingUid(), userId, null, null, 0, new Intent[]{ ephemeralIntent },
- new String[]{ resolvedType },
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
- | PendingIntent.FLAG_IMMUTABLE, null);
-
- int flags = intent.getFlags();
- intent = new Intent();
- intent.setFlags(flags
- | Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- intent.putExtra(Intent.EXTRA_PACKAGE_NAME,
- rInfo.ephemeralResolveInfo.getPackageName());
- intent.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, new IntentSender(failureTarget));
- intent.putExtra(Intent.EXTRA_EPHEMERAL_SUCCESS, new IntentSender(ephemeralTarget));
-
+ intent = buildEphemeralInstallerIntent(intent, ephemeralIntent,
+ rInfo.ephemeralResolveInfo.getPackageName(), callingPackage, resolvedType,
+ userId);
resolvedType = null;
callingUid = realCallingUid;
callingPid = realCallingPid;
- rInfo = rInfo.ephemeralInstaller;
aInfo = mSupervisor.resolveActivity(intent, rInfo, startFlags, null /*profilerInfo*/);
}
@@ -543,6 +522,60 @@
return err;
}
+ /**
+ * Builds and returns an intent to launch the ephemeral installer.
+ */
+ private Intent buildEphemeralInstallerIntent(Intent launchIntent, Intent origIntent,
+ String ephemeralPackage, String callingPackage, String resolvedType, int userId) {
+ final Intent nonEphemeralIntent = new Intent(origIntent);
+ nonEphemeralIntent.setFlags(nonEphemeralIntent.getFlags() | Intent.FLAG_IGNORE_EPHEMERAL);
+ // Intent that is launched if the ephemeral package couldn't be installed
+ // for any reason.
+ final IIntentSender failureIntentTarget = mService.getIntentSenderLocked(
+ ActivityManager.INTENT_SENDER_ACTIVITY, callingPackage,
+ Binder.getCallingUid(), userId, null /*token*/, null /*resultWho*/, 1,
+ new Intent[]{ nonEphemeralIntent }, new String[]{ resolvedType },
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
+ | PendingIntent.FLAG_IMMUTABLE, null /*bOptions*/);
+
+ final Intent ephemeralIntent;
+ if (USE_DEFAULT_EPHEMERAL_LAUNCHER) {
+ // Force the intent to be directed to the ephemeral package
+ ephemeralIntent = new Intent(origIntent);
+ ephemeralIntent.setPackage(ephemeralPackage);
+ } else {
+ // Success intent goes back to the installer
+ // TODO; do we need any extras for the installer?
+ ephemeralIntent = new Intent(launchIntent);
+ ephemeralIntent.setData(null);
+ }
+
+ // Intent that is eventually launched if the ephemeral package was
+ // installed successfully. This will actually be launched by a platform
+ // broadcast receiver.
+ final IIntentSender successIntentTarget = mService.getIntentSenderLocked(
+ ActivityManager.INTENT_SENDER_ACTIVITY, callingPackage,
+ Binder.getCallingUid(), userId, null /*token*/, null /*resultWho*/, 0,
+ new Intent[]{ ephemeralIntent }, new String[]{ resolvedType },
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
+ | PendingIntent.FLAG_IMMUTABLE, null /*bOptions*/);
+
+ // Finally build the actual intent to launch the ephemeral installer
+ int flags = launchIntent.getFlags();
+ final Intent intent = new Intent();
+ intent.setFlags(flags
+ | Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_CLEAR_TASK
+ | Intent.FLAG_ACTIVITY_NO_HISTORY
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, ephemeralPackage);
+ intent.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, new IntentSender(failureIntentTarget));
+ intent.putExtra(Intent.EXTRA_EPHEMERAL_SUCCESS, new IntentSender(successIntentTarget));
+ // TODO: Remove when the platform has fully implemented ephemeral apps
+ intent.setData(origIntent.getData());
+ return intent;
+ }
+
void postStartActivityUncheckedProcessing(
ActivityRecord r, int result, int prevFocusedStackId, ActivityRecord sourceRecord,
ActivityStack targetStack) {
@@ -895,13 +928,15 @@
throw new IllegalArgumentException("intents are length different than resolvedTypes");
}
+ final int realCallingPid = Binder.getCallingPid();
+ final int realCallingUid = Binder.getCallingUid();
int callingPid;
if (callingUid >= 0) {
callingPid = -1;
} else if (caller == null) {
- callingPid = Binder.getCallingPid();
- callingUid = Binder.getCallingUid();
+ callingPid = realCallingPid;
+ callingUid = realCallingUid;
} else {
callingPid = callingUid = -1;
}
@@ -942,7 +977,8 @@
i == intents.length - 1 ? bOptions : null);
int res = startActivityLocked(caller, intent, null /*ephemeralIntent*/,
resolvedTypes[i], aInfo, null /*rInfo*/, null, null, resultTo, null, -1,
- callingPid, callingUid, callingPackage, callingPid, callingUid, 0,
+ callingPid, callingUid, callingPackage,
+ realCallingPid, realCallingUid, 0,
options, false, componentSpecified, outActivity, null, null);
if (res < 0) {
return res;
@@ -1023,6 +1059,7 @@
// as the first operation, in case the activity will be resumed as a result of later
// operations.
if ((mLaunchFlags & FLAG_ACTIVITY_CLEAR_TOP) != 0
+ || isDocumentLaunchesIntoExisting(mLaunchFlags)
|| mLaunchSingleInstance || mLaunchSingleTask) {
// In this situation we want to remove all activities from the task up to the one
// being started. In most cases this means we are resetting the task to its initial
@@ -1111,45 +1148,24 @@
? mSourceRecord.task : null;
// Should this be considered a new task?
+ int result = START_SUCCESS;
if (mStartActivity.resultTo == null && mInTask == null && !mAddingToTask
&& (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) {
newTask = true;
- setTaskFromReuseOrCreateNewTask(taskToAffiliate);
-
- if (mSupervisor.isLockTaskModeViolation(mStartActivity.task)) {
- Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
- return START_RETURN_LOCK_TASK_MODE_VIOLATION;
- }
- if (!mMovedOtherTask) {
- updateTaskReturnToType(mStartActivity.task, mLaunchFlags, topStack);
- }
+ result = setTaskFromReuseOrCreateNewTask(
+ taskToAffiliate, preferredLaunchStackId, topStack);
} else if (mSourceRecord != null) {
- if (mSupervisor.isLockTaskModeViolation(mSourceRecord.task)) {
- Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
- return START_RETURN_LOCK_TASK_MODE_VIOLATION;
- }
-
- final int result = setTaskFromSourceRecord();
- if (result != START_SUCCESS) {
- return result;
- }
+ result = setTaskFromSourceRecord();
} else if (mInTask != null) {
- // The caller is asking that the new activity be started in an explicit
- // task it has provided to us.
- if (mSupervisor.isLockTaskModeViolation(mInTask)) {
- Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
- return START_RETURN_LOCK_TASK_MODE_VIOLATION;
- }
-
- final int result = setTaskFromInTask();
- if (result != START_SUCCESS) {
- return result;
- }
+ result = setTaskFromInTask();
} else {
// This not being started from an existing activity, and not part of a new task...
// just put it in the top task, though these days this case should never happen.
setTaskToCurrentTopOrCreateNewTask();
}
+ if (result != START_SUCCESS) {
+ return result;
+ }
mService.grantUriPermissionFromIntentLocked(mCallingUid, mStartActivity.packageName,
mIntent, mStartActivity.getUriPermissionsLocked(), mStartActivity.userId);
@@ -1169,12 +1185,6 @@
mTargetStack.startActivityLocked(mStartActivity, newTask, mKeepCurTransition, mOptions);
if (mDoResume) {
- if (!mLaunchTaskBehind) {
- // TODO(b/26381750): Remove this code after verification that all the decision
- // points above moved targetStack to the front which will also set the focus
- // activity.
- mService.setFocusedActivityLocked(mStartActivity, "startedActivity");
- }
final ActivityRecord topTaskActivity = mStartActivity.task.topRunningActivityLocked();
if (!mTargetStack.isFocusable()
|| (topTaskActivity != null && topTaskActivity.mTaskOverlay
@@ -1549,7 +1559,15 @@
private void updateTaskReturnToType(
TaskRecord task, int launchFlags, ActivityStack focusedStack) {
- if ((launchFlags & (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME))
+ if (focusedStack != null && focusedStack.isHomeStack() &&
+ focusedStack.topTask().isOnTopLauncher()) {
+ // Since an on-top launcher will is moved to back when tasks are launched from it,
+ // those tasks should first try to return to a non-home activity.
+ // This also makes sure that non-home activities are visible under a transparent
+ // non-home activity.
+ task.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE);
+ return;
+ } else if ((launchFlags & (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME))
== (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME)) {
// Caller wants to appear on home activity.
task.setTaskToReturnTo(HOME_ACTIVITY_TYPE);
@@ -1649,9 +1667,13 @@
mSupervisor.updateUserStackLocked(mStartActivity.userId, mTargetStack);
}
- private void setTaskFromReuseOrCreateNewTask(TaskRecord taskToAffiliate) {
- mTargetStack = computeStackFocus(mStartActivity, true, mLaunchBounds, mLaunchFlags,
- mOptions);
+ private int setTaskFromReuseOrCreateNewTask(
+ TaskRecord taskToAffiliate, int preferredLaunchStackId, ActivityStack topStack) {
+ mTargetStack = computeStackFocus(
+ mStartActivity, true, mLaunchBounds, mLaunchFlags, mOptions);
+
+ // Do no move the target stack to front yet, as we might bail if
+ // isLockTaskModeViolation fails below.
if (mReuseTask == null) {
final TaskRecord task = mTargetStack.createTaskRecord(
@@ -1675,9 +1697,31 @@
} else {
mStartActivity.setTask(mReuseTask, taskToAffiliate);
}
+
+ if (mSupervisor.isLockTaskModeViolation(mStartActivity.task)) {
+ Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
+ return START_RETURN_LOCK_TASK_MODE_VIOLATION;
+ }
+
+ if (!mMovedOtherTask) {
+ // If stack id is specified in activity options, usually it means that activity is
+ // launched not from currently focused stack (e.g. from SysUI or from shell) - in
+ // that case we check the target stack.
+ updateTaskReturnToType(mStartActivity.task, mLaunchFlags,
+ preferredLaunchStackId != INVALID_STACK_ID ? mTargetStack : topStack);
+ }
+ if (mDoResume) {
+ mTargetStack.moveToFront("reuseOrNewTask");
+ }
+ return START_SUCCESS;
}
private int setTaskFromSourceRecord() {
+ if (mSupervisor.isLockTaskModeViolation(mSourceRecord.task)) {
+ Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
+ return START_RETURN_LOCK_TASK_MODE_VIOLATION;
+ }
+
final TaskRecord sourceTask = mSourceRecord.task;
// We only want to allow changing stack if the target task is not the top one,
// otherwise we would move the launching task to the other side, rather than show
@@ -1694,14 +1738,15 @@
mSupervisor.moveTaskToStackLocked(sourceTask.taskId, mTargetStack.mStackId,
ON_TOP, FORCE_FOCUS, "launchToSide", !ANIMATE);
}
- if (mDoResume) {
- mTargetStack.moveToFront("sourceStackToFront");
- }
+
final TaskRecord topTask = mTargetStack.topTask();
if (topTask != sourceTask && !mAvoidMoveToFront) {
mTargetStack.moveTaskToFrontLocked(sourceTask, mNoAnimation, mOptions,
mStartActivity.appTimeTracker, "sourceTaskToFront");
+ } else if (mDoResume) {
+ mTargetStack.moveToFront("sourceStackToFront");
}
+
if (!mAddingToTask && (mLaunchFlags & FLAG_ACTIVITY_CLEAR_TOP) != 0) {
// In this case, we are adding the activity to an existing task, but the caller has
// asked to clear that task if the activity is already running.
@@ -1746,6 +1791,13 @@
}
private int setTaskFromInTask() {
+ // The caller is asking that the new activity be started in an explicit
+ // task it has provided to us.
+ if (mSupervisor.isLockTaskModeViolation(mInTask)) {
+ Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
+ return START_RETURN_LOCK_TASK_MODE_VIOLATION;
+ }
+
if (mLaunchBounds != null) {
mInTask.updateOverrideConfiguration(mLaunchBounds);
int stackId = mInTask.getLaunchStackId();
@@ -2035,4 +2087,9 @@
}
}
}
+
+ static boolean isDocumentLaunchesIntoExisting(int flags) {
+ return (flags & Intent.FLAG_ACTIVITY_NEW_DOCUMENT) != 0 &&
+ (flags & Intent.FLAG_ACTIVITY_MULTIPLE_TASK) == 0;
+ }
}
diff --git a/services/core/java/com/android/server/am/AppErrorDialog.java b/services/core/java/com/android/server/am/AppErrorDialog.java
index e37feb2..646f6ce 100644
--- a/services/core/java/com/android/server/am/AppErrorDialog.java
+++ b/services/core/java/com/android/server/am/AppErrorDialog.java
@@ -16,29 +16,22 @@
package com.android.server.am;
-import android.app.ActivityManagerInternal;
-import android.app.ActivityOptions;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.IPackageDataObserver;
-import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
import android.text.BidiFormatter;
-import android.util.Slog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.TextView;
-import java.util.List;
-
import static com.android.server.am.ActivityManagerService.IS_USER_BUILD;
final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListener {
@@ -47,7 +40,7 @@
private final AppErrorResult mResult;
private final ProcessRecord mProc;
private final boolean mRepeating;
- private final boolean mForeground;
+ private final boolean mIsRestartable;
private CharSequence mName;
@@ -74,7 +67,7 @@
mProc = data.proc;
mResult = data.result;
mRepeating = data.repeating;
- mForeground = data.task != null;
+ mIsRestartable = data.task != null || data.isRestartableForService;
BidiFormatter bidi = BidiFormatter.getInstance();
if ((mProc.pkgList.size() == 1) &&
@@ -118,7 +111,7 @@
LayoutInflater.from(context).inflate(
com.android.internal.R.layout.app_error_dialog, frame, true);
- boolean hasRestart = !mRepeating && mForeground;
+ boolean hasRestart = !mRepeating && mIsRestartable;
final boolean hasReceiver = mProc.errorReportReceiver != null;
final TextView restart = (TextView) findViewById(com.android.internal.R.id.aerr_restart);
@@ -214,5 +207,6 @@
TaskRecord task;
boolean repeating;
ProcessRecord proc;
+ boolean isRestartableForService;
}
}
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 49106f4..1f156df 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -58,6 +58,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Set;
import java.util.concurrent.Semaphore;
import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
@@ -386,8 +387,8 @@
} catch (IllegalArgumentException e) {
// Hmm, that didn't work, app might have crashed before creating a
// recents entry. Let's see if we have a safe-to-restart intent.
- if (task.intent.getCategories().contains(
- Intent.CATEGORY_LAUNCHER)) {
+ final Set<String> cats = task.intent.getCategories();
+ if (cats != null && cats.contains(Intent.CATEGORY_LAUNCHER)) {
mService.startActivityInPackage(task.mCallingUid,
task.mCallingPackage, task.intent,
null, null, null, 0, 0,
@@ -626,12 +627,20 @@
}
}
+ boolean procIsBoundForeground =
+ (app.curProcState == ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE);
// Bump up the crash count of any services currently running in the proc.
for (int i=app.services.size()-1; i>=0; i--) {
// Any services running in the application need to be placed
// back in the pending list.
ServiceRecord sr = app.services.valueAt(i);
sr.crashCount++;
+
+ // Allow restarting for started or bound foreground services that are crashing the
+ // first time. This includes wallpapers.
+ if (sr.crashCount <= 1 && (sr.isForeground || procIsBoundForeground)) {
+ data.isRestartableForService = true;
+ }
}
// If the crashing process is what we consider to be the "home process" and it has been
@@ -742,6 +751,12 @@
mService.updateCpuStatsNow();
}
+ // Unless configured otherwise, swallow ANRs in background processes & kill the process.
+ boolean showBackground = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0;
+
+ boolean isSilentANR;
+
synchronized (mService) {
// PowerManager.reboot() can block for a long time, so ignore ANRs while shutting down.
if (mService.mShuttingDown) {
@@ -766,25 +781,29 @@
// Dump thread traces as quickly as we can, starting with "interesting" processes.
firstPids.add(app.pid);
- int parentPid = app.pid;
- if (parent != null && parent.app != null && parent.app.pid > 0) {
- parentPid = parent.app.pid;
- }
- if (parentPid != app.pid) firstPids.add(parentPid);
+ // Don't dump other PIDs if it's a background ANR
+ isSilentANR = !showBackground && !app.isInterestingToUserLocked() && app.pid != MY_PID;
+ if (!isSilentANR) {
+ int parentPid = app.pid;
+ if (parent != null && parent.app != null && parent.app.pid > 0) {
+ parentPid = parent.app.pid;
+ }
+ if (parentPid != app.pid) firstPids.add(parentPid);
- if (MY_PID != app.pid && MY_PID != parentPid) firstPids.add(MY_PID);
+ if (MY_PID != app.pid && MY_PID != parentPid) firstPids.add(MY_PID);
- for (int i = mService.mLruProcesses.size() - 1; i >= 0; i--) {
- ProcessRecord r = mService.mLruProcesses.get(i);
- if (r != null && r.thread != null) {
- int pid = r.pid;
- if (pid > 0 && pid != app.pid && pid != parentPid && pid != MY_PID) {
- if (r.persistent) {
- firstPids.add(pid);
- if (DEBUG_ANR) Slog.i(TAG, "Adding persistent proc: " + r);
- } else {
- lastPids.put(pid, Boolean.TRUE);
- if (DEBUG_ANR) Slog.i(TAG, "Adding ANR proc: " + r);
+ for (int i = mService.mLruProcesses.size() - 1; i >= 0; i--) {
+ ProcessRecord r = mService.mLruProcesses.get(i);
+ if (r != null && r.thread != null) {
+ int pid = r.pid;
+ if (pid > 0 && pid != app.pid && pid != parentPid && pid != MY_PID) {
+ if (r.persistent) {
+ firstPids.add(pid);
+ if (DEBUG_ANR) Slog.i(TAG, "Adding persistent proc: " + r);
+ } else {
+ lastPids.put(pid, Boolean.TRUE);
+ if (DEBUG_ANR) Slog.i(TAG, "Adding ANR proc: " + r);
+ }
}
}
}
@@ -807,10 +826,18 @@
info.append("Parent: ").append(parent.shortComponentName).append("\n");
}
- final ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(true);
+ ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(true);
- File tracesFile = mService.dumpStackTraces(true, firstPids, processCpuTracker, lastPids,
- NATIVE_STACKS_OF_INTEREST);
+ String[] nativeProcs = NATIVE_STACKS_OF_INTEREST;
+ // don't dump native PIDs for background ANRs
+ File tracesFile = null;
+ if (isSilentANR) {
+ tracesFile = mService.dumpStackTraces(true, firstPids, null, lastPids,
+ null);
+ } else {
+ tracesFile = mService.dumpStackTraces(true, firstPids, processCpuTracker, lastPids,
+ nativeProcs);
+ }
String cpuInfo = null;
if (ActivityManagerService.MONITOR_CPU_USAGE) {
@@ -854,14 +881,10 @@
}
}
- // Unless configured otherwise, swallow ANRs in background processes & kill the process.
- boolean showBackground = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0;
-
synchronized (mService) {
mService.mBatteryStatsService.noteProcessAnr(app.processName, app.uid);
- if (!showBackground && !app.isInterestingToUserLocked() && app.pid != MY_PID) {
+ if (isSilentANR) {
app.kill("bg anr", true);
return;
}
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index def6828..67cac47 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -484,6 +484,20 @@
}
}
+ public void noteLongPartialWakelockStart(String name, String historyName, int uid) {
+ enforceCallingPermission();
+ synchronized (mStats) {
+ mStats.noteLongPartialWakelockStart(name, historyName, uid);
+ }
+ }
+
+ public void noteLongPartialWakelockFinish(String name, String historyName, int uid) {
+ enforceCallingPermission();
+ synchronized (mStats) {
+ mStats.noteLongPartialWakelockFinish(name, historyName, uid);
+ }
+ }
+
public void noteStartSensor(int uid, int sensor) {
enforceCallingPermission();
synchronized (mStats) {
@@ -710,7 +724,7 @@
}
@Override
- public void noteWifiRadioPowerState(int powerState, long tsNanos) {
+ public void noteWifiRadioPowerState(int powerState, long tsNanos, int uid) {
enforceCallingPermission();
// There was a change in WiFi power state.
@@ -723,7 +737,7 @@
mHandler.scheduleSync("wifi-data: " + type,
BatteryStatsImpl.ExternalStatsSync.UPDATE_WIFI);
}
- mStats.noteWifiRadioPowerState(powerState, tsNanos);
+ mStats.noteWifiRadioPowerState(powerState, tsNanos, uid);
}
}
@@ -1502,6 +1516,7 @@
mStats.updateCpuTimeLocked();
mStats.updateKernelWakelocksLocked();
+ mStats.updateKernelMemoryBandwidthLocked();
if (wifiInfo != null) {
if (wifiInfo.isValid()) {
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index a279290..4399e36 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -618,7 +618,7 @@
// the broadcast and if the calling app is in the foreground and the broadcast is
// explicit we launch the review UI passing it a pending intent to send the skipped
// broadcast.
- if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (mService.mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED) {
if (!requestStartTargetPermissionsReviewIfNeededLocked(r, filter.packageName,
filter.owningUserId)) {
r.delivery[index] = BroadcastRecord.DELIVERY_SKIPPED;
@@ -1124,7 +1124,8 @@
// the broadcast and if the calling app is in the foreground and the broadcast is
// explicit we launch the review UI passing it a pending intent to send the skipped
// broadcast.
- if (Build.PERMISSIONS_REVIEW_REQUIRED && !skip) {
+ if ((mService.mPermissionReviewRequired
+ || Build.PERMISSIONS_REVIEW_REQUIRED) && !skip) {
if (!requestStartTargetPermissionsReviewIfNeededLocked(r,
info.activityInfo.packageName, UserHandle.getUserId(
info.activityInfo.applicationInfo.uid))) {
diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags
index 2762df6..722974b 100644
--- a/services/core/java/com/android/server/am/EventLogTags.logtags
+++ b/services/core/java/com/android/server/am/EventLogTags.logtags
@@ -90,8 +90,8 @@
# Activity fully drawn time
30042 am_activity_fully_drawn_time (User|1|5),(Token|1|5),(Component Name|3),(time|2|3)
-# Activity focused
-30043 am_focused_activity (User|1|5),(Component Name|3),(Reason|3)
+# Activity set to resumed
+30043 am_set_resumed_activity (User|1|5),(Component Name|3),(Reason|3)
# Stack focus
30044 am_focused_stack (User|1|5),(Focused Stack Id|1|5),(Last Focused Stack Id|1|5),(Reason|3)
diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java
index 2467a90..9c08453 100644
--- a/services/core/java/com/android/server/am/PendingIntentRecord.java
+++ b/services/core/java/com/android/server/am/PendingIntentRecord.java
@@ -38,6 +38,7 @@
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
+import java.util.Objects;
final class PendingIntentRecord extends IIntentSender.Stub {
private static final String TAG = TAG_WITH_CLASS_NAME ? "PendingIntentRecord" : TAG_AM;
@@ -102,7 +103,7 @@
if (requestResolvedType != null) {
hash = (ODD_PRIME_NUMBER*hash) + requestResolvedType.hashCode();
}
- hash = (ODD_PRIME_NUMBER*hash) + _p.hashCode();
+ hash = (ODD_PRIME_NUMBER*hash) + (_p != null ? _p.hashCode() : 0);
hash = (ODD_PRIME_NUMBER*hash) + _t;
hashCode = hash;
//Slog.i(ActivityManagerService.TAG, this + " hashCode=0x"
@@ -121,20 +122,14 @@
if (userId != other.userId){
return false;
}
- if (!packageName.equals(other.packageName)) {
+ if (!Objects.equals(packageName, other.packageName)) {
return false;
}
if (activity != other.activity) {
return false;
}
- if (who != other.who) {
- if (who != null) {
- if (!who.equals(other.who)) {
- return false;
- }
- } else if (other.who != null) {
- return false;
- }
+ if (!Objects.equals(who, other.who)) {
+ return false;
}
if (requestCode != other.requestCode) {
return false;
@@ -148,14 +143,8 @@
return false;
}
}
- if (requestResolvedType != other.requestResolvedType) {
- if (requestResolvedType != null) {
- if (!requestResolvedType.equals(other.requestResolvedType)) {
- return false;
- }
- } else if (other.requestResolvedType != null) {
- return false;
- }
+ if (!Objects.equals(requestResolvedType, other.requestResolvedType)) {
+ return false;
}
if (flags != other.flags) {
return false;
diff --git a/services/core/java/com/android/server/am/PreBootBroadcaster.java b/services/core/java/com/android/server/am/PreBootBroadcaster.java
index 1f3ccf5..f4f6b66 100644
--- a/services/core/java/com/android/server/am/PreBootBroadcaster.java
+++ b/services/core/java/com/android/server/am/PreBootBroadcaster.java
@@ -19,17 +19,24 @@
import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import android.app.AppOpsManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
import android.content.ComponentName;
+import android.content.Context;
import android.content.IIntentReceiver;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
import android.os.Process;
import android.os.UserHandle;
import android.util.Slog;
import com.android.internal.R;
import com.android.internal.util.ProgressReporter;
+import com.android.server.UiThread;
import java.util.List;
@@ -44,6 +51,7 @@
private final ActivityManagerService mService;
private final int mUserId;
private final ProgressReporter mProgress;
+ private final boolean mQuiet;
private final Intent mIntent;
private final List<ResolveInfo> mTargets;
@@ -51,10 +59,11 @@
private int mIndex = 0;
public PreBootBroadcaster(ActivityManagerService service, int userId,
- ProgressReporter progress) {
+ ProgressReporter progress, boolean quiet) {
mService = service;
mUserId = userId;
mProgress = progress;
+ mQuiet = quiet;
mIntent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED);
mIntent.addFlags(Intent.FLAG_RECEIVER_BOOT_UPGRADE | Intent.FLAG_DEBUG_TRIAGED_MISSING);
@@ -65,16 +74,22 @@
public void sendNext() {
if (mIndex >= mTargets.size()) {
+ mHandler.obtainMessage(MSG_HIDE).sendToTarget();
onFinished();
return;
}
if (!mService.isUserRunning(mUserId, 0)) {
Slog.i(TAG, "User " + mUserId + " is no longer running; skipping remaining receivers");
+ mHandler.obtainMessage(MSG_HIDE).sendToTarget();
onFinished();
return;
}
+ if (!mQuiet) {
+ mHandler.obtainMessage(MSG_SHOW, mTargets.size(), mIndex).sendToTarget();
+ }
+
final ResolveInfo ri = mTargets.get(mIndex++);
final ComponentName componentName = ri.activityInfo.getComponentName();
@@ -100,5 +115,58 @@
sendNext();
}
+ private static final int MSG_SHOW = 1;
+ private static final int MSG_HIDE = 2;
+
+ private Handler mHandler = new Handler(UiThread.get().getLooper(), null, true) {
+ @Override
+ public void handleMessage(Message msg) {
+ final Context context = mService.mContext;
+ final NotificationManager notifManager = context
+ .getSystemService(NotificationManager.class);
+ final int max = msg.arg1;
+ final int index = msg.arg2;
+
+ switch (msg.what) {
+ case MSG_SHOW:
+ final CharSequence title = context
+ .getText(R.string.android_upgrading_notification_title);
+
+ final Intent intent = new Intent();
+ intent.setClassName("com.android.settings",
+ "com.android.settings.HelpTrampoline");
+ intent.putExtra(Intent.EXTRA_TEXT, "help_url_upgrading");
+
+ final PendingIntent contentIntent;
+ if (context.getPackageManager().resolveActivity(intent, 0) != null) {
+ contentIntent = PendingIntent.getActivity(context, 0, intent, 0);
+ } else {
+ contentIntent = null;
+ }
+
+ final Notification notif = new Notification.Builder(mService.mContext)
+ .setSmallIcon(R.drawable.stat_sys_adb)
+ .setWhen(0)
+ .setOngoing(true)
+ .setTicker(title)
+ .setDefaults(0)
+ .setPriority(Notification.PRIORITY_MAX)
+ .setColor(context.getColor(
+ com.android.internal.R.color.system_notification_accent_color))
+ .setContentTitle(title)
+ .setContentIntent(contentIntent)
+ .setVisibility(Notification.VISIBILITY_PUBLIC)
+ .setProgress(max, index, false)
+ .build();
+ notifManager.notifyAsUser(TAG, 0, notif, UserHandle.of(mUserId));
+ break;
+
+ case MSG_HIDE:
+ notifManager.cancelAsUser(TAG, 0, UserHandle.of(mUserId));
+ break;
+ }
+ }
+ };
+
public abstract void onFinished();
}
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index f073e5c..475b155 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -130,6 +130,9 @@
static final int SCHED_GROUP_DEFAULT = 1;
// Activity manager's version of Process.THREAD_GROUP_TOP_APP
static final int SCHED_GROUP_TOP_APP = 2;
+ // Activity manager's version of Process.THREAD_GROUP_TOP_APP
+ // Disambiguate between actual top app and processes bound to the top app
+ static final int SCHED_GROUP_TOP_APP_BOUND = 3;
// The minimum number of cached apps we want to be able to keep around,
// without empty apps being able to push them out of memory.
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 8911a3e..3fffefb 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -97,11 +97,14 @@
int verifiedAdj; // The last adjustment that was verified as actually being set
int curSchedGroup; // Currently desired scheduling class
int setSchedGroup; // Last set to background scheduling class
+ int vrThreadTid; // Thread currently set for VR scheduling
int trimMemoryLevel; // Last selected memory trimming level
int curProcState = PROCESS_STATE_NONEXISTENT; // Currently computed process state
int repProcState = PROCESS_STATE_NONEXISTENT; // Last reported process state
int setProcState = PROCESS_STATE_NONEXISTENT; // Last set process state in process tracker
int pssProcState = PROCESS_STATE_NONEXISTENT; // Currently requesting pss for
+ int savedPriority; // Previous priority value if we're switching to non-SCHED_OTHER
+ int renderThreadTid; // TID for RenderThread
boolean serviceb; // Process currently is on the service B list
boolean serviceHighRam; // We are forcing to service B list due to its RAM use
boolean setIsForeground; // Running foreground UI when last set?
@@ -113,6 +116,8 @@
boolean repForegroundActivities; // Last reported foreground activities.
boolean systemNoUi; // This is a system process, but not currently showing UI.
boolean hasShownUi; // Has UI been shown in this process since it was started?
+ boolean hasTopUi; // Is this process currently showing "top-level" UI that is not an
+ // activity?
boolean pendingUiClean; // Want to clean up resources from showing UI?
boolean hasAboveClient; // Bound using BIND_ABOVE_CLIENT, so want to be lower
boolean treatLikeActivity; // Bound using BIND_TREAT_LIKE_ACTIVITY
@@ -293,6 +298,7 @@
pw.print(" setSchedGroup="); pw.print(setSchedGroup);
pw.print(" systemNoUi="); pw.print(systemNoUi);
pw.print(" trimMemoryLevel="); pw.println(trimMemoryLevel);
+ pw.print(prefix); pw.print("vrThreadTid="); pw.print(vrThreadTid);
pw.print(prefix); pw.print("curProcState="); pw.print(curProcState);
pw.print(" repProcState="); pw.print(repProcState);
pw.print(" pssProcState="); pw.print(pssProcState);
@@ -430,6 +436,9 @@
pw.print(prefix); pw.print(" - "); pw.println(receivers.valueAt(i));
}
}
+ if (hasTopUi) {
+ pw.print(prefix); pw.print("hasTopUi="); pw.print(hasTopUi);
+ }
}
ProcessRecord(BatteryStatsImpl _batteryStats, ApplicationInfo _info,
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index 0a081e9..2bfc402 100644
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -90,6 +90,7 @@
ProcessRecord isolatedProc; // keep track of isolated process, if requested
ServiceState tracker; // tracking service execution, may be null
ServiceState restartTracker; // tracking service restart
+ boolean whitelistManager; // any bindings to this service have BIND_ALLOW_WHITELIST_MANAGEMENT?
boolean delayed; // are we waiting to start this service in the background?
boolean isForeground; // is service currently in foreground mode?
int foregroundId; // Notification ID of last foreground req.
@@ -225,6 +226,9 @@
if (isolatedProc != null) {
pw.print(prefix); pw.print("isolatedProc="); pw.println(isolatedProc);
}
+ if (whitelistManager) {
+ pw.print(prefix); pw.print("whitelistManager="); pw.println(whitelistManager);
+ }
if (delayed) {
pw.print(prefix); pw.print("delayed="); pw.println(delayed);
}
@@ -391,6 +395,19 @@
return false;
}
+ public void updateWhitelistManager() {
+ whitelistManager = false;
+ for (int conni=connections.size()-1; conni>=0; conni--) {
+ ArrayList<ConnectionRecord> cr = connections.valueAt(conni);
+ for (int i=0; i<cr.size(); i++) {
+ if ((cr.get(i).flags&Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0) {
+ whitelistManager = true;
+ return;
+ }
+ }
+ }
+ }
+
public void resetRestartCounter() {
restartCount = 0;
restartDelay = 0;
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 4691e1a..c2c8e3d 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -66,6 +66,7 @@
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
import static android.content.Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS;
+import static android.content.pm.ActivityInfo.FLAG_ON_TOP_LAUNCHER;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_ALWAYS;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_DEFAULT;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED;
@@ -176,6 +177,8 @@
// ActivityManager.LOCK_TASK_LAUNCH_MODE_*
private boolean mPrivileged; // The root activity application of this task holds
// privileged permissions.
+ private boolean mIsOnTopLauncher; // Whether this task is an on-top launcher. See
+ // android.R.attr#onTopLauncher.
/** Can't be put in lockTask mode. */
final static int LOCK_TASK_AUTH_DONT_LOCK = 0;
@@ -474,6 +477,7 @@
autoRemoveRecents = false;
}
mResizeMode = info.resizeMode;
+ mIsOnTopLauncher = (info.flags & FLAG_ON_TOP_LAUNCHER) != 0;
mLockTaskMode = info.lockTaskLaunchMode;
mPrivileged = (info.applicationInfo.privateFlags & PRIVATE_FLAG_PRIVILEGED) != 0;
setLockTaskAuth();
@@ -909,7 +913,8 @@
// expecting onNewIntent()), then we will finish the current
// instance of the activity so a new fresh one can be started.
if (ret.launchMode == ActivityInfo.LAUNCH_MULTIPLE
- && (launchFlags & Intent.FLAG_ACTIVITY_SINGLE_TOP) == 0) {
+ && (launchFlags & Intent.FLAG_ACTIVITY_SINGLE_TOP) == 0
+ && !ActivityStarter.isDocumentLaunchesIntoExisting(launchFlags)) {
if (!ret.finishing) {
if (stack != null) {
stack.finishActivityLocked(
@@ -1023,6 +1028,10 @@
|| ActivityInfo.isResizeableMode(mResizeMode)) && !mTemporarilyUnresizable;
}
+ boolean isOnTopLauncher() {
+ return isHomeTask() && mIsOnTopLauncher;
+ }
+
boolean inCropWindowsResizeMode() {
return !isResizeable() && mResizeMode == RESIZE_MODE_CROP_WINDOWS;
}
@@ -1536,11 +1545,6 @@
? Configuration.ORIENTATION_PORTRAIT
: Configuration.ORIENTATION_LANDSCAPE;
- // Always set fontScale to be euqal to global. Can't set to 0, as that makes the override
- // config not equal to EMPTY. Also can't set to 1, as Configuration.updateFrom will use
- // the override scale as long as it's non-zero, and we'll always use 1.
- config.fontScale = serviceConfig.fontScale;
-
// For calculating screen layout, we need to use the non-decor inset screen area for the
// calculation for compatibility reasons, i.e. screen area without system bars that could
// never go away in Honeycomb.
@@ -1602,9 +1606,6 @@
newScreenLayout = (newScreenLayout & ~SCREENLAYOUT_SIZE_MASK)
| (overrideScreenLayout & SCREENLAYOUT_SIZE_MASK);
mOverrideConfig.screenLayout = newScreenLayout;
- // we never override the fontScale, however we need to copy over the global value
- // so that the default 1.0 doesn't get applied as an override.
- mOverrideConfig.fontScale = globalConfig.fontScale;
}
static Rect validateBounds(Rect bounds) {
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 6b44f14..0d1727f 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -85,12 +85,14 @@
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.Preconditions;
import com.android.internal.widget.LockPatternUtils;
import com.android.server.LocalServices;
import com.android.server.pm.UserManagerService;
+import com.android.server.wm.WindowManagerService;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -99,6 +101,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Helper class for {@link ActivityManagerService} responsible for multi-user functionality.
@@ -113,32 +116,38 @@
// giving up on them and unfreezing the screen.
static final int USER_SWITCH_TIMEOUT = 2 * 1000;
- private final ActivityManagerService mService;
+ private final Object mLock;
+ private final Injector mInjector;
private final Handler mHandler;
// Holds the current foreground user's id
+ @GuardedBy("mLock")
private int mCurrentUserId = UserHandle.USER_SYSTEM;
// Holds the target user's id during a user switch
+ @GuardedBy("mLock")
private int mTargetUserId = UserHandle.USER_NULL;
/**
* Which users have been started, so are allowed to run code.
*/
- @GuardedBy("mService")
+ @GuardedBy("mLock")
private final SparseArray<UserState> mStartedUsers = new SparseArray<>();
/**
* LRU list of history of current users. Most recently current is at the end.
*/
+ @GuardedBy("mLock")
private final ArrayList<Integer> mUserLru = new ArrayList<>();
/**
* Constant array of the users that are currently started.
*/
+ @GuardedBy("mLock")
private int[] mStartedUserArray = new int[] { 0 };
// If there are multiple profiles for the current user, their ids are here
// Currently only the primary user can have managed profiles
+ @GuardedBy("mLock")
private int[] mCurrentProfileIds = new int[] {};
/**
@@ -155,27 +164,32 @@
/**
* Currently active user switch callbacks.
*/
+ @GuardedBy("mLock")
private volatile ArraySet<String> mCurWaitingUserSwitchCallbacks;
private volatile UserManagerService mUserManager;
private final LockPatternUtils mLockPatternUtils;
- private UserManagerInternal mUserManagerInternal;
-
UserController(ActivityManagerService service) {
- mService = service;
- mHandler = mService.mHandler;
+ this(new Injector(service));
+ }
+
+ @VisibleForTesting
+ UserController(Injector injector) {
+ mInjector = injector;
+ mLock = injector.getLock();
+ mHandler = injector.getHandler();
// User 0 is the first and only user that runs at boot.
final UserState uss = new UserState(UserHandle.SYSTEM);
mStartedUsers.put(UserHandle.USER_SYSTEM, uss);
mUserLru.add(UserHandle.USER_SYSTEM);
- mLockPatternUtils = new LockPatternUtils(mService.mContext);
+ mLockPatternUtils = mInjector.getLockPatternUtils();
updateStartedUserArrayLocked();
}
void finishUserSwitch(UserState uss) {
- synchronized (mService) {
+ synchronized (mLock) {
finishUserBoot(uss);
startProfilesLocked();
@@ -228,7 +242,7 @@
final int userId = uss.mHandle.getIdentifier();
Slog.d(TAG, "Finishing user boot " + userId);
- synchronized (mService) {
+ synchronized (mLock) {
// Bail if we ended up with a stale user
if (mStartedUsers.get(userId) != uss) return;
@@ -237,25 +251,25 @@
// but we might immediately step into RUNNING below if the user
// storage is already unlocked.
if (uss.setState(STATE_BOOTING, STATE_RUNNING_LOCKED)) {
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
int uptimeSeconds = (int)(SystemClock.elapsedRealtime() / 1000);
- MetricsLogger.histogram(mService.mContext, "framework_locked_boot_completed",
+ MetricsLogger.histogram(mInjector.getContext(), "framework_locked_boot_completed",
uptimeSeconds);
Intent intent = new Intent(Intent.ACTION_LOCKED_BOOT_COMPLETED, null);
intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT
| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
- mService.broadcastIntentLocked(null, null, intent, null, resultTo, 0, null, null,
+ mInjector.broadcastIntentLocked(intent, null, resultTo, 0, null, null,
new String[] { android.Manifest.permission.RECEIVE_BOOT_COMPLETED },
AppOpsManager.OP_NONE, null, true, false, MY_PID, SYSTEM_UID, userId);
}
// We need to delay unlocking managed profiles until the parent user
// is also unlocked.
- if (getUserManager().isManagedProfile(userId)) {
- final UserInfo parent = getUserManager().getProfileParent(userId);
+ if (mInjector.getUserManager().isManagedProfile(userId)) {
+ final UserInfo parent = mInjector.getUserManager().getProfileParent(userId);
if (parent != null
&& isUserRunningLocked(parent.id, ActivityManager.FLAG_AND_UNLOCKED)) {
Slog.d(TAG, "User " + userId + " (parent " + parent.id
@@ -278,7 +292,7 @@
*/
private void finishUserUnlocking(final UserState uss) {
final int userId = uss.mHandle.getIdentifier();
- synchronized (mService) {
+ synchronized (mLock) {
// Bail if we ended up with a stale user
if (mStartedUsers.get(uss.mHandle.getIdentifier()) != uss) return;
@@ -286,13 +300,13 @@
if (!StorageManager.isUserKeyUnlocked(userId)) return;
if (uss.setState(STATE_RUNNING_LOCKED, STATE_RUNNING_UNLOCKING)) {
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
uss.mUnlockProgress.start();
// Prepare app storage before we go any further
uss.mUnlockProgress.setProgress(5,
- mService.mContext.getString(R.string.android_start_title));
- mUserManager.onBeforeUnlockUser(userId);
+ mInjector.getContext().getString(R.string.android_start_title));
+ mInjector.getUserManager().onBeforeUnlockUser(userId);
uss.mUnlockProgress.setProgress(20);
// Dispatch unlocked to system services; when fully dispatched,
@@ -309,7 +323,7 @@
*/
void finishUserUnlocked(final UserState uss) {
final int userId = uss.mHandle.getIdentifier();
- synchronized (mService) {
+ synchronized (mLock) {
// Bail if we ended up with a stale user
if (mStartedUsers.get(uss.mHandle.getIdentifier()) != uss) return;
@@ -317,7 +331,7 @@
if (!StorageManager.isUserKeyUnlocked(userId)) return;
if (uss.setState(STATE_RUNNING_UNLOCKING, STATE_RUNNING_UNLOCKED)) {
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
uss.mUnlockProgress.finish();
// Dispatch unlocked to external apps
@@ -325,12 +339,12 @@
unlockedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
unlockedIntent.addFlags(
Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND);
- mService.broadcastIntentLocked(null, null, unlockedIntent, null, null, 0, null,
+ mInjector.broadcastIntentLocked(unlockedIntent, null, null, 0, null,
null, null, AppOpsManager.OP_NONE, null, false, false, MY_PID, SYSTEM_UID,
userId);
if (getUserInfo(userId).isManagedProfile()) {
- UserInfo parent = getUserManager().getProfileParent(userId);
+ UserInfo parent = mInjector.getUserManager().getProfileParent(userId);
if (parent != null) {
final Intent profileUnlockedIntent = new Intent(
Intent.ACTION_MANAGED_PROFILE_UNLOCKED);
@@ -338,7 +352,7 @@
profileUnlockedIntent.addFlags(
Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND);
- mService.broadcastIntentLocked(null, null, profileUnlockedIntent,
+ mInjector.broadcastIntentLocked(profileUnlockedIntent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID,
parent.id);
@@ -350,12 +364,18 @@
// PRE_BOOT receivers are finished to avoid ANR'ing apps
final UserInfo info = getUserInfo(userId);
if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) {
- new PreBootBroadcaster(mService, userId, null) {
- @Override
- public void onFinished() {
- finishUserUnlockedCompleted(uss);
- }
- }.sendNext();
+ // Suppress double notifications for managed profiles that
+ // were unlocked automatically as part of their parent user
+ // being unlocked.
+ final boolean quiet;
+ if (info.isManagedProfile()) {
+ quiet = !uss.tokenProvided
+ || !mLockPatternUtils.isSeparateProfileChallengeEnabled(userId);
+ } else {
+ quiet = false;
+ }
+ mInjector.sendPreBootBroadcast(userId, quiet,
+ () -> finishUserUnlockedCompleted(uss));
} else {
finishUserUnlockedCompleted(uss);
}
@@ -365,7 +385,7 @@
private void finishUserUnlockedCompleted(UserState uss) {
final int userId = uss.mHandle.getIdentifier();
- synchronized (mService) {
+ synchronized (mLock) {
// Bail if we ended up with a stale user
if (mStartedUsers.get(uss.mHandle.getIdentifier()) != uss) return;
final UserInfo userInfo = getUserInfo(userId);
@@ -377,21 +397,21 @@
if (!StorageManager.isUserKeyUnlocked(userId)) return;
// Remember that we logged in
- mUserManager.onUserLoggedIn(userId);
+ mInjector.getUserManager().onUserLoggedIn(userId);
if (!userInfo.isInitialized()) {
if (userId != UserHandle.USER_SYSTEM) {
Slog.d(TAG, "Initializing user #" + userId);
Intent intent = new Intent(Intent.ACTION_USER_INITIALIZE);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
- mService.broadcastIntentLocked(null, null, intent, null,
+ mInjector.broadcastIntentLocked(intent, null,
new IIntentReceiver.Stub() {
@Override
public void performReceive(Intent intent, int resultCode,
String data, Bundle extras, boolean ordered,
boolean sticky, int sendingUser) {
// Note: performReceive is called with mService lock held
- getUserManager().makeInitialized(userInfo.id);
+ mInjector.getUserManager().makeInitialized(userInfo.id);
}
}, 0, null, null, null, AppOpsManager.OP_NONE,
null, true, false, MY_PID, SYSTEM_UID, userId);
@@ -400,19 +420,20 @@
Slog.d(TAG, "Sending BOOT_COMPLETE user #" + userId);
int uptimeSeconds = (int)(SystemClock.elapsedRealtime() / 1000);
- MetricsLogger.histogram(mService.mContext, "framework_boot_completed", uptimeSeconds);
+ MetricsLogger.histogram(mInjector.getContext(), "framework_boot_completed",
+ uptimeSeconds);
final Intent bootIntent = new Intent(Intent.ACTION_BOOT_COMPLETED, null);
bootIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
bootIntent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT
| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
- mService.broadcastIntentLocked(null, null, bootIntent, null, null, 0, null, null,
+ mInjector.broadcastIntentLocked(bootIntent, null, null, 0, null, null,
new String[] { android.Manifest.permission.RECEIVE_BOOT_COMPLETED },
AppOpsManager.OP_NONE, null, true, false, MY_PID, SYSTEM_UID, userId);
}
}
int stopUser(final int userId, final boolean force, final IStopUserCallback callback) {
- if (mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
+ if (mInjector.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
String msg = "Permission Denial: switchUser() from pid="
+ Binder.getCallingPid()
@@ -424,9 +445,8 @@
if (userId < 0 || userId == UserHandle.USER_SYSTEM) {
throw new IllegalArgumentException("Can't stop system user " + userId);
}
- mService.enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES,
- userId);
- synchronized (mService) {
+ mInjector.enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, userId);
+ synchronized (mLock) {
return stopUsersLocked(userId, force, callback);
}
}
@@ -493,7 +513,7 @@
if (uss.state != UserState.STATE_STOPPING
&& uss.state != UserState.STATE_SHUTDOWN) {
uss.setState(UserState.STATE_STOPPING);
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
updateStartedUserArrayLocked();
long ident = Binder.clearCallingIdentity();
@@ -519,9 +539,9 @@
}
};
// Clear broadcast queue for the user to avoid delivering stale broadcasts
- mService.clearBroadcastQueueForUserLocked(userId);
+ mInjector.clearBroadcastQueueForUserLocked(userId);
// Kick things off.
- mService.broadcastIntentLocked(null, null, stoppingIntent,
+ mInjector.broadcastIntentLocked(stoppingIntent,
null, stoppingReceiver, 0, null, null,
new String[]{INTERACT_ACROSS_USERS}, AppOpsManager.OP_NONE,
null, true, false, MY_PID, SYSTEM_UID, UserHandle.USER_ALL);
@@ -548,22 +568,22 @@
}
};
- synchronized (mService) {
+ synchronized (mLock) {
if (uss.state != UserState.STATE_STOPPING) {
// Whoops, we are being started back up. Abort, abort!
return;
}
uss.setState(UserState.STATE_SHUTDOWN);
}
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
- mService.mBatteryStatsService.noteEvent(
+ mInjector.batteryStatsServiceNoteEvent(
BatteryStats.HistoryItem.EVENT_USER_RUNNING_FINISH,
Integer.toString(userId), userId);
- mService.mSystemServiceManager.stopUser(userId);
+ mInjector.systemServiceManagerStopUser(userId);
- synchronized (mService) {
- mService.broadcastIntentLocked(null, null, shutdownIntent,
+ synchronized (mLock) {
+ mInjector.broadcastIntentLocked(shutdownIntent,
null, shutdownReceiver, 0, null, null, null,
AppOpsManager.OP_NONE,
null, true, false, MY_PID, SYSTEM_UID, userId);
@@ -574,7 +594,7 @@
final int userId = uss.mHandle.getIdentifier();
boolean stopped;
ArrayList<IStopUserCallback> callbacks;
- synchronized (mService) {
+ synchronized (mLock) {
callbacks = new ArrayList<>(uss.mStopCallbacks);
if (mStartedUsers.get(userId) != uss) {
stopped = false;
@@ -584,11 +604,11 @@
stopped = true;
// User can no longer run.
mStartedUsers.remove(userId);
- getUserManagerInternal().removeUserState(userId);
+ mInjector.getUserManagerInternal().removeUserState(userId);
mUserLru.remove(Integer.valueOf(userId));
updateStartedUserArrayLocked();
- mService.onUserStoppedLocked(userId);
+ mInjector.activityManagerOnUserStopped(userId);
// Clean up all state and processes associated with the user.
// Kill all the processes for the user.
forceStopUserLocked(userId, "finish user");
@@ -604,13 +624,13 @@
}
if (stopped) {
- mService.mSystemServiceManager.cleanupUser(userId);
- synchronized (mService) {
- mService.mStackSupervisor.removeUserLocked(userId);
+ mInjector.systemServiceManagerCleanupUser(userId);
+ synchronized (mLock) {
+ mInjector.stackSupervisorRemoveUserLocked(userId);
}
// Remove the user if it is ephemeral.
if (getUserInfo(userId).isEphemeral()) {
- mUserManager.removeUser(userId);
+ mInjector.getUserManager().removeUser(userId);
}
}
}
@@ -646,13 +666,12 @@
}
private void forceStopUserLocked(int userId, String reason) {
- mService.forceStopPackageLocked(null, -1, false, false, true, false, false,
- userId, reason);
+ mInjector.activityManagerForceStopPackageLocked(userId, reason);
Intent intent = new Intent(Intent.ACTION_USER_STOPPED);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
- mService.broadcastIntentLocked(null, null, intent,
+ mInjector.broadcastIntentLocked(intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID, UserHandle.USER_ALL);
}
@@ -661,7 +680,7 @@
* Stops the guest or ephemeral user if it has gone to the background.
*/
private void stopGuestOrEphemeralUserIfBackground() {
- synchronized (mService) {
+ synchronized (mLock) {
final int num = mUserLru.size();
for (int i = 0; i < num; i++) {
Integer oldUserId = mUserLru.get(i);
@@ -687,7 +706,7 @@
void startProfilesLocked() {
if (DEBUG_MU) Slog.i(TAG, "startProfilesLocked");
- List<UserInfo> profiles = getUserManager().getProfiles(
+ List<UserInfo> profiles = mInjector.getUserManager().getProfiles(
mCurrentUserId, false /* enabledOnly */);
List<UserInfo> profilesToStart = new ArrayList<>(profiles.size());
for (UserInfo user : profiles) {
@@ -706,15 +725,6 @@
}
}
- private UserManagerService getUserManager() {
- UserManagerService userManager = mUserManager;
- if (userManager == null) {
- IBinder b = ServiceManager.getService(Context.USER_SERVICE);
- userManager = mUserManager = (UserManagerService) IUserManager.Stub.asInterface(b);
- }
- return userManager;
- }
-
private IMountService getMountService() {
return IMountService.Stub.asInterface(ServiceManager.getService("mount"));
}
@@ -749,7 +759,7 @@
* @return true if the user has been successfully started
*/
boolean startUser(final int userId, final boolean foreground) {
- if (mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
+ if (mInjector.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
String msg = "Permission Denial: switchUser() from pid="
+ Binder.getCallingPid()
@@ -763,13 +773,13 @@
final long ident = Binder.clearCallingIdentity();
try {
- synchronized (mService) {
+ synchronized (mLock) {
final int oldUserId = mCurrentUserId;
if (oldUserId == userId) {
return true;
}
- mService.mStackSupervisor.setLockTaskModeLocked(null,
+ mInjector.stackSupervisorSetLockTaskModeLocked(null,
ActivityManager.LOCK_TASK_MODE_NONE, "startUser", false);
final UserInfo userInfo = getUserInfo(userId);
@@ -783,7 +793,7 @@
}
if (foreground) {
- mService.mWindowManager.startFreezingScreen(
+ mInjector.getWindowManager().startFreezingScreen(
R.anim.screen_user_exit, R.anim.screen_user_enter);
}
@@ -794,7 +804,7 @@
if (mStartedUsers.get(userId) == null) {
UserState userState = new UserState(UserHandle.of(userId));
mStartedUsers.put(userId, userState);
- getUserManagerInternal().setUserState(userId, userState.state);
+ mInjector.getUserManagerInternal().setUserState(userId, userState.state);
updateStartedUserArrayLocked();
needStart = true;
}
@@ -806,17 +816,17 @@
if (foreground) {
mCurrentUserId = userId;
- mService.updateUserConfigurationLocked();
+ mInjector.updateUserConfigurationLocked();
mTargetUserId = UserHandle.USER_NULL; // reset, mCurrentUserId has caught up
updateCurrentProfileIdsLocked();
- mService.mWindowManager.setCurrentUser(userId, mCurrentProfileIds);
+ mInjector.getWindowManager().setCurrentUser(userId, mCurrentProfileIds);
// Once the internal notion of the active user has switched, we lock the device
// with the option to show the user switcher on the keyguard.
- mService.mWindowManager.lockNow(null);
+ mInjector.getWindowManager().lockNow(null);
} else {
final Integer currentUserIdInt = mCurrentUserId;
updateCurrentProfileIdsLocked();
- mService.mWindowManager.setCurrentProfileIds(mCurrentProfileIds);
+ mInjector.getWindowManager().setCurrentProfileIds(mCurrentProfileIds);
mUserLru.remove(currentUserIdInt);
mUserLru.add(currentUserIdInt);
}
@@ -828,14 +838,14 @@
// so we can just fairly silently bring the user back from
// the almost-dead.
uss.setState(uss.lastState);
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
updateStartedUserArrayLocked();
needStart = true;
} else if (uss.state == UserState.STATE_SHUTDOWN) {
// This means ACTION_SHUTDOWN has been sent, so we will
// need to treat this as a new boot of the user.
uss.setState(UserState.STATE_BOOTING);
- getUserManagerInternal().setUserState(userId, uss.state);
+ mInjector.getUserManagerInternal().setUserState(userId, uss.state);
updateStartedUserArrayLocked();
needStart = true;
}
@@ -843,7 +853,7 @@
if (uss.state == UserState.STATE_BOOTING) {
// Give user manager a chance to propagate user restrictions
// to other services and prepare app storage
- getUserManager().onBeforeStartUser(userId);
+ mInjector.getUserManager().onBeforeStartUser(userId);
// Booting up a new user, need to tell system services about it.
// Note that this is on the same handler as scheduling of broadcasts,
@@ -868,7 +878,7 @@
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
- mService.broadcastIntentLocked(null, null, intent,
+ mInjector.broadcastIntentLocked(intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID, userId);
}
@@ -876,14 +886,14 @@
if (foreground) {
moveUserToForegroundLocked(uss, oldUserId, userId);
} else {
- mService.mUserController.finishUserBoot(uss);
+ finishUserBoot(uss);
}
if (needStart) {
Intent intent = new Intent(Intent.ACTION_USER_STARTING);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
- mService.broadcastIntentLocked(null, null, intent,
+ mInjector.broadcastIntentLocked(intent,
null, new IIntentReceiver.Stub() {
@Override
public void performReceive(Intent intent, int resultCode,
@@ -912,7 +922,7 @@
}
boolean unlockUser(final int userId, byte[] token, byte[] secret, IProgressListener listener) {
- if (mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
+ if (mInjector.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
String msg = "Permission Denial: unlockUser() from pid="
+ Binder.getCallingPid()
@@ -951,7 +961,7 @@
boolean unlockUserCleared(final int userId, byte[] token, byte[] secret,
IProgressListener listener) {
- synchronized (mService) {
+ synchronized (mLock) {
// TODO Move this block outside of synchronized if it causes lock contention
if (!StorageManager.isUserKeyUnlocked(userId)) {
final UserInfo userInfo = getUserInfo(userId);
@@ -971,6 +981,7 @@
return false;
} else {
uss.mUnlockProgress.addListener(listener);
+ uss.tokenProvided = (token != null);
}
finishUserUnlocking(uss);
@@ -979,7 +990,7 @@
// managed profiles under that user.
for (int i = 0; i < mStartedUsers.size(); i++) {
final int testUserId = mStartedUsers.keyAt(i);
- final UserInfo parent = getUserManager().getProfileParent(testUserId);
+ final UserInfo parent = mInjector.getUserManager().getProfileParent(testUserId);
if (parent != null && parent.id == userId && testUserId != userId) {
Slog.d(TAG, "User " + testUserId + " (parent " + parent.id
+ "): attempting unlock because parent was just unlocked");
@@ -993,9 +1004,7 @@
void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) {
// The dialog will show and then initiate the user switch by calling startUserInForeground
- Dialog d = new UserSwitchingDialog(mService, mService.mContext, fromToUserPair.first,
- fromToUserPair.second, true /* above system */);
- d.show();
+ mInjector.showUserSwitchingDialog(fromToUserPair.first, fromToUserPair.second);
}
void dispatchForegroundProfileChanged(int userId) {
@@ -1033,7 +1042,7 @@
if (!disallowRunInBg) {
return;
}
- synchronized (mService) {
+ synchronized (mLock) {
if (DEBUG_MU) Slog.i(TAG, "stopBackgroundUsersIfEnforced stopping " + oldUserId
+ " and related users");
stopUsersLocked(oldUserId, false, null);
@@ -1041,9 +1050,8 @@
}
void timeoutUserSwitch(UserState uss, int oldUserId, int newUserId) {
- synchronized (mService) {
- Slog.wtf(TAG, "User switch timeout: from " + oldUserId + " to " + newUserId
- + ". Observers that didn't send results: " + mCurWaitingUserSwitchCallbacks);
+ synchronized (mLock) {
+ Slog.wtf(TAG, "User switch timeout: from " + oldUserId + " to " + newUserId);
sendContinueUserSwitchLocked(uss, oldUserId, newUserId);
}
}
@@ -1053,21 +1061,22 @@
final int observerCount = mUserSwitchObservers.beginBroadcast();
if (observerCount > 0) {
final ArraySet<String> curWaitingUserSwitchCallbacks = new ArraySet<>();
- synchronized (mService) {
+ synchronized (mLock) {
uss.switching = true;
mCurWaitingUserSwitchCallbacks = curWaitingUserSwitchCallbacks;
}
+ final AtomicInteger waitingCallbacksCount = new AtomicInteger(observerCount);
for (int i = 0; i < observerCount; i++) {
try {
// Prepend with unique prefix to guarantee that keys are unique
final String name = "#" + i + " " + mUserSwitchObservers.getBroadcastCookie(i);
- synchronized (mService) {
+ synchronized (mLock) {
curWaitingUserSwitchCallbacks.add(name);
}
final IRemoteCallback callback = new IRemoteCallback.Stub() {
@Override
public void sendResult(Bundle data) throws RemoteException {
- synchronized (mService) {
+ synchronized (mLock) {
// Early return if this session is no longer valid
if (curWaitingUserSwitchCallbacks
!= mCurWaitingUserSwitchCallbacks) {
@@ -1075,7 +1084,7 @@
}
curWaitingUserSwitchCallbacks.remove(name);
// Continue switching if all callbacks have been notified
- if (curWaitingUserSwitchCallbacks.isEmpty()) {
+ if (waitingCallbacksCount.decrementAndGet() == 0) {
sendContinueUserSwitchLocked(uss, oldUserId, newUserId);
}
}
@@ -1086,7 +1095,7 @@
}
}
} else {
- synchronized (mService) {
+ synchronized (mLock) {
sendContinueUserSwitchLocked(uss, oldUserId, newUserId);
}
}
@@ -1102,8 +1111,8 @@
void continueUserSwitch(UserState uss, int oldUserId, int newUserId) {
Slog.d(TAG, "Continue user switch oldUser #" + oldUserId + ", newUser #" + newUserId);
- synchronized (mService) {
- mService.mWindowManager.stopFreezingScreen();
+ synchronized (mLock) {
+ mInjector.getWindowManager().stopFreezingScreen();
}
uss.switching = false;
mHandler.removeMessages(REPORT_USER_SWITCH_COMPLETE_MSG);
@@ -1114,11 +1123,11 @@
}
void moveUserToForegroundLocked(UserState uss, int oldUserId, int newUserId) {
- boolean homeInFront = mService.mStackSupervisor.switchUserLocked(newUserId, uss);
+ boolean homeInFront = mInjector.stackSupervisorSwitchUserLocked(newUserId, uss);
if (homeInFront) {
- mService.startHomeActivityLocked(newUserId, "moveUserToForeground");
+ mInjector.startHomeActivityLocked(newUserId, "moveUserToForeground");
} else {
- mService.mStackSupervisor.resumeFocusedStackTopActivityLocked();
+ mInjector.stackSupervisorResumeFocusedStackTopActivityLocked();
}
EventLogTags.writeAmSwitchUser(newUserId);
sendUserSwitchBroadcastsLocked(oldUserId, newUserId);
@@ -1130,7 +1139,7 @@
Intent intent;
if (oldUserId >= 0) {
// Send USER_BACKGROUND broadcast to all profiles of the outgoing user
- List<UserInfo> profiles = getUserManager().getProfiles(oldUserId, false);
+ List<UserInfo> profiles = mInjector.getUserManager().getProfiles(oldUserId, false);
int count = profiles.size();
for (int i = 0; i < count; i++) {
int profileUserId = profiles.get(i).id;
@@ -1138,14 +1147,14 @@
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId);
- mService.broadcastIntentLocked(null, null, intent,
+ mInjector.broadcastIntentLocked(intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID, profileUserId);
}
}
if (newUserId >= 0) {
// Send USER_FOREGROUND broadcast to all profiles of the incoming user
- List<UserInfo> profiles = getUserManager().getProfiles(newUserId, false);
+ List<UserInfo> profiles = mInjector.getUserManager().getProfiles(newUserId, false);
int count = profiles.size();
for (int i = 0; i < count; i++) {
int profileUserId = profiles.get(i).id;
@@ -1153,7 +1162,7 @@
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId);
- mService.broadcastIntentLocked(null, null, intent,
+ mInjector.broadcastIntentLocked(intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE,
null, false, false, MY_PID, SYSTEM_UID, profileUserId);
}
@@ -1161,7 +1170,7 @@
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
| Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_USER_HANDLE, newUserId);
- mService.broadcastIntentLocked(null, null, intent,
+ mInjector.broadcastIntentLocked(intent,
null, null, 0, null, null,
new String[] {android.Manifest.permission.MANAGE_USERS},
AppOpsManager.OP_NONE, null, false, false, MY_PID, SYSTEM_UID,
@@ -1190,14 +1199,14 @@
if (callingUid != 0 && callingUid != SYSTEM_UID) {
final boolean allow;
- if (mService.checkComponentPermission(INTERACT_ACROSS_USERS_FULL, callingPid,
+ if (mInjector.checkComponentPermission(INTERACT_ACROSS_USERS_FULL, callingPid,
callingUid, -1, true) == PackageManager.PERMISSION_GRANTED) {
// If the caller has this permission, they always pass go. And collect $200.
allow = true;
} else if (allowMode == ALLOW_FULL_ONLY) {
// We require full access, sucks to be you.
allow = false;
- } else if (mService.checkComponentPermission(INTERACT_ACROSS_USERS, callingPid,
+ } else if (mInjector.checkComponentPermission(INTERACT_ACROSS_USERS, callingPid,
callingUid, -1, true) != PackageManager.PERMISSION_GRANTED) {
// If the caller does not have either permission, they are always doomed.
allow = false;
@@ -1261,7 +1270,7 @@
void registerUserSwitchObserver(IUserSwitchObserver observer, String name) {
Preconditions.checkNotNull(name, "Observer name cannot be null");
- if (mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
+ if (mInjector.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
final String msg = "Permission Denial: registerUserSwitchObserver() from pid="
+ Binder.getCallingPid()
@@ -1323,7 +1332,7 @@
* background.
*/
private void updateCurrentProfileIdsLocked() {
- final List<UserInfo> profiles = getUserManager().getProfiles(mCurrentUserId,
+ final List<UserInfo> profiles = mInjector.getUserManager().getProfiles(mCurrentUserId,
false /* enabledOnly */);
int[] currentProfileIds = new int[profiles.size()]; // profiles will not be null
for (int i = 0; i < currentProfileIds.length; i++) {
@@ -1333,7 +1342,7 @@
synchronized (mUserProfileGroupIdsSelfLocked) {
mUserProfileGroupIdsSelfLocked.clear();
- final List<UserInfo> users = getUserManager().getUsers(false);
+ final List<UserInfo> users = mInjector.getUserManager().getUsers(false);
for (int i = 0; i < users.size(); i++) {
UserInfo user = users.get(i);
if (user.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID) {
@@ -1396,9 +1405,9 @@
}
UserInfo getCurrentUser() {
- if ((mService.checkCallingPermission(INTERACT_ACROSS_USERS)
+ if ((mInjector.checkCallingPermission(INTERACT_ACROSS_USERS)
!= PackageManager.PERMISSION_GRANTED) && (
- mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
+ mInjector.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED)) {
String msg = "Permission Denial: getCurrentUser() from pid="
+ Binder.getCallingPid()
@@ -1407,7 +1416,7 @@
Slog.w(TAG, msg);
throw new SecurityException(msg);
}
- synchronized (mService) {
+ synchronized (mLock) {
return getCurrentUserLocked();
}
}
@@ -1434,29 +1443,29 @@
}
int[] getUsers() {
- UserManagerService ums = getUserManager();
+ UserManagerService ums = mInjector.getUserManager();
return ums != null ? ums.getUserIds() : new int[] { 0 };
}
UserInfo getUserInfo(int userId) {
- return getUserManager().getUserInfo(userId);
+ return mInjector.getUserManager().getUserInfo(userId);
}
int[] getUserIds() {
- return getUserManager().getUserIds();
+ return mInjector.getUserManager().getUserIds();
}
boolean exists(int userId) {
- return getUserManager().exists(userId);
+ return mInjector.getUserManager().exists(userId);
}
boolean hasUserRestriction(String restriction, int userId) {
- return getUserManager().hasUserRestriction(restriction, userId);
+ return mInjector.getUserManager().hasUserRestriction(restriction, userId);
}
Set<Integer> getProfileIds(int userId) {
Set<Integer> userIds = new HashSet<>();
- final List<UserInfo> profiles = getUserManager().getProfiles(userId,
+ final List<UserInfo> profiles = mInjector.getUserManager().getProfiles(userId,
false /* enabledOnly */);
for (UserInfo user : profiles) {
userIds.add(user.id);
@@ -1465,6 +1474,9 @@
}
boolean isSameProfileGroup(int callingUserId, int targetUserId) {
+ if (callingUserId == targetUserId) {
+ return true;
+ }
synchronized (mUserProfileGroupIdsSelfLocked) {
int callingProfile = mUserProfileGroupIdsSelfLocked.get(callingUserId,
UserInfo.NO_PROFILE_GROUP_ID);
@@ -1488,7 +1500,7 @@
* intercept activity launches for work apps when the Work Challenge is present.
*/
boolean shouldConfirmCredentials(int userId) {
- synchronized (mService) {
+ synchronized (mLock) {
if (mStartedUsers.get(userId) == null) {
return false;
}
@@ -1496,8 +1508,7 @@
if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {
return false;
}
- final KeyguardManager km = (KeyguardManager) mService.mContext
- .getSystemService(KEYGUARD_SERVICE);
+ final KeyguardManager km = mInjector.getKeyguardManager();
return km.isDeviceLocked(userId) && km.isDeviceSecure(userId);
}
@@ -1505,13 +1516,6 @@
return mLockPatternUtils.isLockScreenDisabled(userId);
}
- private UserManagerInternal getUserManagerInternal() {
- if (mUserManagerInternal == null) {
- mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);
- }
- return mUserManagerInternal;
- }
-
void dump(PrintWriter pw, boolean dumpAll) {
pw.println(" mStartedUsers:");
for (int i = 0; i < mStartedUsers.size(); i++) {
@@ -1546,4 +1550,141 @@
}
}
}
+
+ @VisibleForTesting
+ static class Injector {
+ private final ActivityManagerService mService;
+ private UserManagerService mUserManager;
+ private UserManagerInternal mUserManagerInternal;
+
+ Injector(ActivityManagerService service) {
+ mService = service;
+ }
+
+ protected Object getLock() {
+ return mService;
+ }
+
+ protected Handler getHandler() {
+ return mService.mHandler;
+ }
+
+ protected Context getContext() {
+ return mService.mContext;
+ }
+
+ protected LockPatternUtils getLockPatternUtils() {
+ return new LockPatternUtils(getContext());
+ }
+
+ protected int broadcastIntentLocked(Intent intent, String resolvedType,
+ IIntentReceiver resultTo, int resultCode, String resultData,
+ Bundle resultExtras, String[] requiredPermissions, int appOp, Bundle bOptions,
+ boolean ordered, boolean sticky, int callingPid, int callingUid, int userId) {
+ return mService.broadcastIntentLocked(null, null, intent, resolvedType, resultTo,
+ resultCode, resultData, resultExtras, requiredPermissions, appOp, bOptions,
+ ordered, sticky, callingPid, callingUid, userId);
+ }
+
+ int checkCallingPermission(String permission) {
+ return mService.checkCallingPermission(permission);
+ }
+
+ WindowManagerService getWindowManager() {
+ return mService.mWindowManager;
+ }
+ void activityManagerOnUserStopped(int userId) {
+ mService.onUserStoppedLocked(userId);
+ }
+
+ void systemServiceManagerCleanupUser(int userId) {
+ mService.mSystemServiceManager.cleanupUser(userId);
+ }
+
+ void stackSupervisorRemoveUserLocked(int userId) {
+ mService.mStackSupervisor.removeUserLocked(userId);
+ }
+
+ protected UserManagerService getUserManager() {
+ if (mUserManager == null) {
+ IBinder b = ServiceManager.getService(Context.USER_SERVICE);
+ mUserManager = (UserManagerService) IUserManager.Stub.asInterface(b);
+ }
+ return mUserManager;
+ }
+
+ UserManagerInternal getUserManagerInternal() {
+ if (mUserManagerInternal == null) {
+ mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);
+ }
+ return mUserManagerInternal;
+ }
+
+ KeyguardManager getKeyguardManager() {
+ return mService.mContext.getSystemService(KeyguardManager.class);
+ }
+
+ void batteryStatsServiceNoteEvent(int code, String name, int uid) {
+ mService.mBatteryStatsService.noteEvent(code, name, uid);
+ }
+
+ void systemServiceManagerStopUser(int userId) {
+ mService.mSystemServiceManager.stopUser(userId);
+ }
+
+ void sendPreBootBroadcast(int userId, boolean quiet, final Runnable onFinish) {
+ new PreBootBroadcaster(mService, userId, null, quiet) {
+ @Override
+ public void onFinished() {
+ onFinish.run();
+ }
+ }.sendNext();
+ }
+
+ void activityManagerForceStopPackageLocked(int userId, String reason) {
+ mService.forceStopPackageLocked(null, -1, false, false, true, false, false,
+ userId, reason);
+ };
+
+ int checkComponentPermission(String permission, int pid, int uid, int owningUid,
+ boolean exported) {
+ return mService.checkComponentPermission(permission, pid, uid, owningUid, exported);
+ }
+
+ boolean stackSupervisorSwitchUserLocked(int userId, UserState uss) {
+ return mService.mStackSupervisor.switchUserLocked(userId, uss);
+ }
+
+ void startHomeActivityLocked(int userId, String reason) {
+ mService.startHomeActivityLocked(userId, reason);
+ }
+
+ void stackSupervisorResumeFocusedStackTopActivityLocked() {
+ mService.mStackSupervisor.resumeFocusedStackTopActivityLocked();
+ }
+
+ void stackSupervisorSetLockTaskModeLocked(TaskRecord task, int lockTaskModeState,
+ String reason, boolean andResume) {
+ mService.mStackSupervisor.setLockTaskModeLocked(task, lockTaskModeState, reason,
+ andResume);
+ }
+
+ void updateUserConfigurationLocked() {
+ mService.updateUserConfigurationLocked();
+ }
+
+ void clearBroadcastQueueForUserLocked(int userId) {
+ mService.clearBroadcastQueueForUserLocked(userId);
+ }
+
+ void enforceShellRestriction(String restriction, int userId) {
+ mService.enforceShellRestriction(restriction, userId);
+ }
+
+ void showUserSwitchingDialog(UserInfo fromUser, UserInfo toUser) {
+ Dialog d = new UserSwitchingDialog(mService, mService.mContext, fromUser, toUser,
+ true /* above system */);
+ d.show();
+ }
+ }
}
diff --git a/services/core/java/com/android/server/am/UserState.java b/services/core/java/com/android/server/am/UserState.java
index 952283e..ff8014c 100644
--- a/services/core/java/com/android/server/am/UserState.java
+++ b/services/core/java/com/android/server/am/UserState.java
@@ -54,6 +54,7 @@
public int state = STATE_BOOTING;
public int lastState = STATE_BOOTING;
public boolean switching;
+ public boolean tokenProvided;
/**
* The last time that a provider was reported to usage stats as being brought to important
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index db67e00..64dea57 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -630,7 +630,11 @@
MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]);
if (maxVolume != MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]) {
MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = maxVolume;
- AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = (maxVolume * 3) / 4;
+ if (isPlatformTelevision()) {
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = maxVolume / 4;
+ } else {
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = (maxVolume * 3) / 4;
+ }
}
sSoundEffectVolumeDb = context.getResources().getInteger(
@@ -1136,8 +1140,11 @@
final int currentUser = getCurrentUserId();
// Check the current user restriction.
- boolean masterMute = mUserManagerInternal.getUserRestriction(
- currentUser, UserManager.DISALLOW_ADJUST_VOLUME);
+ boolean masterMute =
+ mUserManagerInternal.getUserRestriction(currentUser,
+ UserManager.DISALLLOW_UNMUTE_DEVICE)
+ || mUserManagerInternal.getUserRestriction(currentUser,
+ UserManager.DISALLOW_ADJUST_VOLUME);
if (mUseFixedVolume) {
masterMute = false;
AudioSystem.setMasterVolume(1.0f);
@@ -5384,9 +5391,11 @@
// Update speaker mute state.
{
final boolean wasRestricted =
- prevRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME);
+ prevRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)
+ || prevRestrictions.getBoolean(UserManager.DISALLLOW_UNMUTE_DEVICE);
final boolean isRestricted =
- newRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME);
+ newRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)
+ || newRestrictions.getBoolean(UserManager.DISALLLOW_UNMUTE_DEVICE);
if (wasRestricted != isRestricted) {
setMasterMuteInternalNoCallerCheck(isRestricted, /* flags =*/ 0, userId);
}
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 1c26846..66aa403 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -188,6 +188,14 @@
if (!canCopy) {
clip = null;
} else {
+ // We want to fix the uris of the related user's clip without changing the
+ // uris of the current user's clip.
+ // So, copy the ClipData, and then copy all the items, so that nothing
+ // is shared in memmory.
+ clip = new ClipData(clip);
+ for (int i = clip.getItemCount() - 1; i >= 0; i--) {
+ clip.setItemAt(i, new ClipData.Item(clip.getItemAt(i)));
+ }
clip.fixUrisLight(userId);
}
for (int i = 0; i < size; i++) {
diff --git a/services/core/java/com/android/server/connectivity/DnsEventListenerService.java b/services/core/java/com/android/server/connectivity/DnsEventListenerService.java
index 18ab731..8d206ef 100644
--- a/services/core/java/com/android/server/connectivity/DnsEventListenerService.java
+++ b/services/core/java/com/android/server/connectivity/DnsEventListenerService.java
@@ -17,15 +17,17 @@
package com.android.server.connectivity;
import android.content.Context;
-import android.net.metrics.DnsEvent;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.Network;
import android.net.NetworkRequest;
+import android.net.metrics.DnsEvent;
import android.net.metrics.IDnsEventListener;
+import android.net.metrics.IpConnectivityLog;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import java.io.PrintWriter;
@@ -45,12 +47,13 @@
private static final boolean DBG = true;
private static final boolean VDBG = false;
+ // TODO: read this constant from system property
private static final int MAX_LOOKUPS_PER_DNS_EVENT = 100;
// Stores the results of a number of consecutive DNS lookups on the same network.
// This class is not thread-safe and it is the responsibility of the service to call its methods
// on one thread at a time.
- private static class DnsEventBatch {
+ private class DnsEventBatch {
private final int mNetId;
private final byte[] mEventTypes = new byte[MAX_LOOKUPS_PER_DNS_EVENT];
@@ -82,7 +85,7 @@
byte[] eventTypes = Arrays.copyOf(mEventTypes, mEventCount);
byte[] returnCodes = Arrays.copyOf(mReturnCodes, mEventCount);
int[] latenciesMs = Arrays.copyOf(mLatenciesMs, mEventCount);
- DnsEvent.logEvent(mNetId, eventTypes, returnCodes, latenciesMs);
+ mMetricsLog.log(new DnsEvent(mNetId, eventTypes, returnCodes, latenciesMs));
maybeLog(String.format("Logging %d results for netId %d", mEventCount, mNetId));
mEventCount = 0;
}
@@ -96,13 +99,14 @@
// Only sorted for ease of debugging. Because we only typically have a handful of networks up
// at any given time, performance is not a concern.
@GuardedBy("this")
- private SortedMap<Integer, DnsEventBatch> mEventBatches = new TreeMap<>();
+ private final SortedMap<Integer, DnsEventBatch> mEventBatches = new TreeMap<>();
// We register a NetworkCallback to ensure that when a network disconnects, we flush the DNS
// queries we've logged on that network. Because we do not do this periodically, we might lose
// up to MAX_LOOKUPS_PER_DNS_EVENT lookup stats on each network when the system is shutting
// down. We believe this to be sufficient for now.
private final ConnectivityManager mCm;
+ private final IpConnectivityLog mMetricsLog;
private final NetworkCallback mNetworkCallback = new NetworkCallback() {
@Override
public void onLost(Network network) {
@@ -116,11 +120,15 @@
};
public DnsEventListenerService(Context context) {
+ this(context.getSystemService(ConnectivityManager.class), new IpConnectivityLog());
+ }
+
+ @VisibleForTesting
+ public DnsEventListenerService(ConnectivityManager cm, IpConnectivityLog log) {
// We are started when boot is complete, so ConnectivityService should already be running.
- final NetworkRequest request = new NetworkRequest.Builder()
- .clearCapabilities()
- .build();
- mCm = context.getSystemService(ConnectivityManager.class);
+ mCm = cm;
+ mMetricsLog = log;
+ final NetworkRequest request = new NetworkRequest.Builder().clearCapabilities().build();
mCm.registerNetworkCallback(request, mNetworkCallback);
}
diff --git a/services/core/java/com/android/server/connectivity/MetricsLoggerService.java b/services/core/java/com/android/server/connectivity/MetricsLoggerService.java
index 69ef30f..05f1a6e 100644
--- a/services/core/java/com/android/server/connectivity/MetricsLoggerService.java
+++ b/services/core/java/com/android/server/connectivity/MetricsLoggerService.java
@@ -16,6 +16,7 @@
package com.android.server.connectivity;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.server.SystemService;
import android.app.PendingIntent;
@@ -60,17 +61,11 @@
}
}
- // TODO: read from system property
- private final int MAX_NUMBER_OF_EVENTS = 1000;
-
- // TODO: read from system property
- private final int EVENTS_NOTIFICATION_THRESHOLD = 300;
-
- // TODO: read from system property
- private final int THROTTLING_TIME_INTERVAL_MILLIS = 60 * 60 * 1000; // 1 hour
-
- // TODO: read from system property
+ // TODO: read these constants from system property
+ private final int EVENTS_NOTIFICATION_THRESHOLD = 300;
+ private final int MAX_NUMBER_OF_EVENTS = 1000;
private final int THROTTLING_MAX_NUMBER_OF_MESSAGES_PER_COMPONENT = 1000;
+ private final long THROTTLING_TIME_INTERVAL_MILLIS = DateUtils.HOUR_IN_MILLIS;
private int mEventCounter = 0;
@@ -127,10 +122,13 @@
mEvents.addLast(e);
}
+ @VisibleForTesting
+ final MetricsLoggerImpl mBinder = new MetricsLoggerImpl();
+
/**
* Implementation of the IConnectivityMetricsLogger interface.
*/
- private final IConnectivityMetricsLogger.Stub mBinder = new IConnectivityMetricsLogger.Stub() {
+ final class MetricsLoggerImpl extends IConnectivityMetricsLogger.Stub {
private final ArrayList<PendingIntent> mPendingIntents = new ArrayList<>();
@@ -223,7 +221,9 @@
}
pw.println();
- mDnsListener.dump(pw);
+ if (mDnsListener != null) {
+ mDnsListener.dump(pw);
+ }
}
public long logEvent(ConnectivityMetricsEvent event) {
diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
index d487bd0..7a25df6 100644
--- a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
+++ b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
@@ -28,14 +28,21 @@
import android.net.NetworkState;
import android.os.Handler;
import android.os.Messenger;
+import android.os.SystemClock;
+import android.util.Log;
import android.util.SparseArray;
import com.android.internal.util.AsyncChannel;
+import com.android.internal.util.WakeupMessage;
import com.android.server.ConnectivityService;
import com.android.server.connectivity.NetworkMonitor;
+import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Comparator;
+import java.util.Objects;
+import java.util.SortedSet;
+import java.util.TreeSet;
/**
* A bag class used by ConnectivityService for holding a collection of most recent
@@ -143,12 +150,69 @@
// Whether a captive portal was found during the last network validation attempt.
public boolean lastCaptivePortalDetected;
- // Indicates whether the network is lingering. Networks are lingered when they become unneeded
- // as a result of their NetworkRequests being satisfied by a different network, so as to allow
- // communication to wrap up before the network is taken down. This usually only happens to the
- // default network. Lingering ends with either the linger timeout expiring and the network
- // being taken down, or the network satisfying a request again.
- public boolean lingering;
+ // Networks are lingered when they become unneeded as a result of their NetworkRequests being
+ // satisfied by a higher-scoring network. so as to allow communication to wrap up before the
+ // network is taken down. This usually only happens to the default network. Lingering ends with
+ // either the linger timeout expiring and the network being taken down, or the network
+ // satisfying a request again.
+ public static class LingerTimer implements Comparable<LingerTimer> {
+ public final NetworkRequest request;
+ public final long expiryMs;
+
+ public LingerTimer(NetworkRequest request, long expiryMs) {
+ this.request = request;
+ this.expiryMs = expiryMs;
+ }
+ public boolean equals(Object o) {
+ if (!(o instanceof LingerTimer)) return false;
+ LingerTimer other = (LingerTimer) o;
+ return (request.requestId == other.request.requestId) && (expiryMs == other.expiryMs);
+ }
+ public int hashCode() {
+ return Objects.hash(request.requestId, expiryMs);
+ }
+ public int compareTo(LingerTimer other) {
+ return (expiryMs != other.expiryMs) ?
+ Long.compare(expiryMs, other.expiryMs) :
+ Integer.compare(request.requestId, other.request.requestId);
+ }
+ public String toString() {
+ return String.format("%s, expires %dms", request.toString(),
+ expiryMs - SystemClock.elapsedRealtime());
+ }
+ }
+
+ /**
+ * Inform ConnectivityService that the network LINGER period has
+ * expired.
+ * obj = this NetworkAgentInfo
+ */
+ public static final int EVENT_NETWORK_LINGER_COMPLETE = 1001;
+
+ // All linger timers for this network, sorted by expiry time. A linger timer is added whenever
+ // a request is moved to a network with a better score, regardless of whether the network is or
+ // was lingering or not.
+ // TODO: determine if we can replace this with a smaller or unsorted data structure. (e.g.,
+ // SparseLongArray) combined with the timestamp of when the last timer is scheduled to fire.
+ private final SortedSet<LingerTimer> mLingerTimers = new TreeSet<>();
+
+ // For fast lookups. Indexes into mLingerTimers by request ID.
+ private final SparseArray<LingerTimer> mLingerTimerForRequest = new SparseArray<>();
+
+ // Linger expiry timer. Armed whenever mLingerTimers is non-empty, regardless of whether the
+ // network is lingering or not. Always set to the expiry of the LingerTimer that expires last.
+ // When the timer fires, all linger state is cleared, and if the network has no requests, it is
+ // torn down.
+ private WakeupMessage mLingerMessage;
+
+ // Linger expiry. Holds the expiry time of the linger timer, or 0 if the timer is not armed.
+ private long mLingerExpiryMs;
+
+ // Whether the network is lingering or not. Must be maintained separately from the above because
+ // it depends on the state of other networks and requests, which only ConnectivityService knows.
+ // (Example: we don't linger a network if it would become the best for a NetworkRequest if it
+ // validated).
+ private boolean mLingering;
// This represents the last score received from the NetworkAgent.
private int currentScore;
@@ -162,11 +226,11 @@
private static final int MAXIMUM_NETWORK_SCORE = 100;
// The list of NetworkRequests being satisfied by this Network.
- public final SparseArray<NetworkRequest> networkRequests = new SparseArray<NetworkRequest>();
+ private final SparseArray<NetworkRequest> mNetworkRequests = new SparseArray<>();
// The list of NetworkRequests that this Network previously satisfied with the highest
// score. A non-empty list indicates that if this Network was validated it is lingered.
- // NOTE: This list is only used for debugging.
- public final ArrayList<NetworkRequest> networkLingered = new ArrayList<NetworkRequest>();
+ // How many of the satisfied requests are actual requests and not listens.
+ private int mNumRequestNetworkRequests = 0;
public final Messenger messenger;
public final AsyncChannel asyncChannel;
@@ -174,6 +238,12 @@
// Used by ConnectivityService to keep track of 464xlat.
public Nat464Xlat clatd;
+ private static final String TAG = ConnectivityService.class.getSimpleName();
+ private static final boolean VDBG = false;
+ private final ConnectivityService mConnService;
+ private final Context mContext;
+ private final Handler mHandler;
+
public NetworkAgentInfo(Messenger messenger, AsyncChannel ac, Network net, NetworkInfo info,
LinkProperties lp, NetworkCapabilities nc, int score, Context context, Handler handler,
NetworkMisc misc, NetworkRequest defaultRequest, ConnectivityService connService) {
@@ -184,22 +254,74 @@
linkProperties = lp;
networkCapabilities = nc;
currentScore = score;
- networkMonitor = connService.createNetworkMonitor(context, handler, this, defaultRequest);
+ mConnService = connService;
+ mContext = context;
+ mHandler = handler;
+ networkMonitor = mConnService.createNetworkMonitor(context, handler, this, defaultRequest);
networkMisc = misc;
}
+ // Functions for manipulating the requests satisfied by this network.
+ //
+ // These functions must only called on ConnectivityService's main thread.
+
/**
* Add {@code networkRequest} to this network as it's satisfied by this network.
- * NOTE: This function must only be called on ConnectivityService's main thread.
* @return true if {@code networkRequest} was added or false if {@code networkRequest} was
* already present.
*/
public boolean addRequest(NetworkRequest networkRequest) {
- if (networkRequests.get(networkRequest.requestId) == networkRequest) return false;
- networkRequests.put(networkRequest.requestId, networkRequest);
+ NetworkRequest existing = mNetworkRequests.get(networkRequest.requestId);
+ if (existing == networkRequest) return false;
+ if (existing != null && existing.isRequest()) mNumRequestNetworkRequests--;
+ mNetworkRequests.put(networkRequest.requestId, networkRequest);
+ if (networkRequest.isRequest()) mNumRequestNetworkRequests++;
return true;
}
+ /**
+ * Remove the specified request from this network.
+ */
+ public void removeRequest(int requestId) {
+ NetworkRequest existing = mNetworkRequests.get(requestId);
+ if (existing == null) return;
+ mNetworkRequests.remove(requestId);
+ if (existing.isRequest()) {
+ mNumRequestNetworkRequests--;
+ unlingerRequest(existing);
+ }
+ }
+
+ /**
+ * Returns whether this network is currently satisfying the request with the specified ID.
+ */
+ public boolean isSatisfyingRequest(int id) {
+ return mNetworkRequests.get(id) != null;
+ }
+
+ /**
+ * Returns the request at the specified position in the list of requests satisfied by this
+ * network.
+ */
+ public NetworkRequest requestAt(int index) {
+ return mNetworkRequests.valueAt(index);
+ }
+
+ /**
+ * Returns the number of requests currently satisfied by this network for which
+ * {@link android.net.NetworkRequest#isRequest} returns {@code true}.
+ */
+ public int numRequestNetworkRequests() {
+ return mNumRequestNetworkRequests;
+ }
+
+ /**
+ * Returns the number of requests of any type currently satisfied by this network.
+ */
+ public int numNetworkRequests() {
+ return mNetworkRequests.size();
+ }
+
// Does this network satisfy request?
public boolean satisfies(NetworkRequest request) {
return created &&
@@ -269,13 +391,100 @@
}
}
+ /**
+ * Sets the specified request to linger on this network for the specified time. Called by
+ * ConnectivityService when the request is moved to another network with a higher score.
+ */
+ public void lingerRequest(NetworkRequest request, long now, long duration) {
+ if (mLingerTimerForRequest.get(request.requestId) != null) {
+ // Cannot happen. Once a request is lingering on a particular network, we cannot
+ // re-linger it unless that network becomes the best for that request again, in which
+ // case we should have unlingered it.
+ Log.wtf(TAG, this.name() + ": request " + request.requestId + " already lingered");
+ }
+ final long expiryMs = now + duration;
+ LingerTimer timer = new LingerTimer(request, expiryMs);
+ if (VDBG) Log.d(TAG, "Adding LingerTimer " + timer + " to " + this.name());
+ mLingerTimers.add(timer);
+ mLingerTimerForRequest.put(request.requestId, timer);
+ }
+
+ /**
+ * Cancel lingering. Called by ConnectivityService when a request is added to this network.
+ */
+ public void unlingerRequest(NetworkRequest request) {
+ LingerTimer timer = mLingerTimerForRequest.get(request.requestId);
+ if (timer != null) {
+ if (VDBG) Log.d(TAG, "Removing LingerTimer " + timer + " from " + this.name());
+ mLingerTimers.remove(timer);
+ mLingerTimerForRequest.remove(request.requestId);
+ }
+ }
+
+ public long getLingerExpiry() {
+ return mLingerExpiryMs;
+ }
+
+ public void updateLingerTimer() {
+ long newExpiry = mLingerTimers.isEmpty() ? 0 : mLingerTimers.last().expiryMs;
+ if (newExpiry == mLingerExpiryMs) return;
+
+ // Even if we're going to reschedule the timer, cancel it first. This is because the
+ // semantics of WakeupMessage guarantee that if cancel is called then the alarm will
+ // never call its callback (handleLingerComplete), even if it has already fired.
+ // WakeupMessage makes no such guarantees about rescheduling a message, so if mLingerMessage
+ // has already been dispatched, rescheduling to some time in the future it won't stop it
+ // from calling its callback immediately.
+ if (mLingerMessage != null) {
+ mLingerMessage.cancel();
+ mLingerMessage = null;
+ }
+
+ if (newExpiry > 0) {
+ mLingerMessage = mConnService.makeWakeupMessage(
+ mContext, mHandler,
+ "NETWORK_LINGER_COMPLETE." + network.netId,
+ EVENT_NETWORK_LINGER_COMPLETE, this);
+ mLingerMessage.schedule(newExpiry);
+ }
+
+ mLingerExpiryMs = newExpiry;
+ }
+
+ public void linger() {
+ mLingering = true;
+ }
+
+ public void unlinger() {
+ mLingering = false;
+ }
+
+ public boolean isLingering() {
+ return mLingering;
+ }
+
+ public void clearLingerState() {
+ if (mLingerMessage != null) {
+ mLingerMessage.cancel();
+ mLingerMessage = null;
+ }
+ mLingerTimers.clear();
+ mLingerTimerForRequest.clear();
+ updateLingerTimer(); // Sets mLingerExpiryMs, cancels and nulls out mLingerMessage.
+ mLingering = false;
+ }
+
+ public void dumpLingerTimers(PrintWriter pw) {
+ for (LingerTimer timer : mLingerTimers) { pw.println(timer); }
+ }
+
public String toString() {
return "NetworkAgentInfo{ ni{" + networkInfo + "} " +
"network{" + network + "} nethandle{" + network.getNetworkHandle() + "} " +
"lp{" + linkProperties + "} " +
"nc{" + networkCapabilities + "} Score{" + getCurrentScore() + "} " +
"everValidated{" + everValidated + "} lastValidated{" + lastValidated + "} " +
- "created{" + created + "} lingering{" + lingering + "} " +
+ "created{" + created + "} lingering{" + isLingering() + "} " +
"explicitlySelected{" + networkMisc.explicitlySelected + "} " +
"acceptUnvalidated{" + networkMisc.acceptUnvalidated + "} " +
"everCaptivePortalDetected{" + everCaptivePortalDetected + "} " +
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
index ddaebfa..42d80fc 100644
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@ -34,8 +34,9 @@
import android.net.ProxyInfo;
import android.net.TrafficStats;
import android.net.Uri;
-import android.net.metrics.ValidationProbeEvent;
+import android.net.metrics.IpConnectivityLog;
import android.net.metrics.NetworkEvent;
+import android.net.metrics.ValidationProbeEvent;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.util.Stopwatch;
@@ -131,31 +132,6 @@
public static final int EVENT_NETWORK_TESTED = BASE + 2;
/**
- * Inform NetworkMonitor to linger a network. The Monitor should
- * start a timer and/or start watching for zero live connections while
- * moving towards LINGER_COMPLETE. After the Linger period expires
- * (or other events mark the end of the linger state) the LINGER_COMPLETE
- * event should be sent and the network will be shut down. If a
- * CMD_NETWORK_CONNECTED happens before the LINGER completes
- * it indicates further desire to keep the network alive and so
- * the LINGER is aborted.
- */
- public static final int CMD_NETWORK_LINGER = BASE + 3;
-
- /**
- * Message to self indicating linger delay has expired.
- * arg1 = Token to ignore old messages.
- */
- private static final int CMD_LINGER_EXPIRED = BASE + 4;
-
- /**
- * Inform ConnectivityService that the network LINGER period has
- * expired.
- * obj = NetworkAgentInfo
- */
- public static final int EVENT_NETWORK_LINGER_COMPLETE = BASE + 5;
-
- /**
* Message to self indicating it's time to evaluate a network's connectivity.
* arg1 = Token to ignore old messages.
*/
@@ -203,12 +179,6 @@
*/
private static final int CMD_CAPTIVE_PORTAL_RECHECK = BASE + 12;
- private static final String LINGER_DELAY_PROPERTY = "persist.netmon.linger";
- // Default to 30s linger time-out. Modifyable only for testing.
- private static int DEFAULT_LINGER_DELAY_MS = 30000;
- private final int mLingerDelayMs;
- private int mLingerToken = 0;
-
// Start mReevaluateDelayMs at this value and double.
private static final int INITIAL_REEVALUATE_DELAY_MS = 1000;
private static final int MAX_REEVALUATE_DELAY_MS = 10*60*1000;
@@ -230,6 +200,7 @@
private final WifiManager mWifiManager;
private final AlarmManager mAlarmManager;
private final NetworkRequest mDefaultRequest;
+ private final IpConnectivityLog mMetricsLog;
private boolean mIsCaptivePortalCheckEnabled;
private boolean mUseHttps;
@@ -246,7 +217,6 @@
private final State mMaybeNotifyState = new MaybeNotifyState();
private final State mEvaluatingState = new EvaluatingState();
private final State mCaptivePortalState = new CaptivePortalState();
- private final State mLingeringState = new LingeringState();
private CustomIntentReceiver mLaunchCaptivePortalAppBroadcastReceiver = null;
@@ -256,10 +226,17 @@
public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,
NetworkRequest defaultRequest) {
+ this(context, handler, networkAgentInfo, defaultRequest, new IpConnectivityLog());
+ }
+
+ @VisibleForTesting
+ protected NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,
+ NetworkRequest defaultRequest, IpConnectivityLog logger) {
// Add suffix indicating which NetworkMonitor we're talking about.
super(TAG + networkAgentInfo.name());
mContext = context;
+ mMetricsLog = logger;
mConnectivityServiceHandler = handler;
mNetworkAgentInfo = networkAgentInfo;
mNetId = mNetworkAgentInfo.network.netId;
@@ -273,11 +250,8 @@
addState(mMaybeNotifyState, mDefaultState);
addState(mEvaluatingState, mMaybeNotifyState);
addState(mCaptivePortalState, mMaybeNotifyState);
- addState(mLingeringState, mDefaultState);
setInitialState(mDefaultState);
- mLingerDelayMs = SystemProperties.getInt(LINGER_DELAY_PROPERTY, DEFAULT_LINGER_DELAY_MS);
-
mIsCaptivePortalCheckEnabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED, 1) == 1;
mUseHttps = Settings.Global.getInt(mContext.getContentResolver(),
@@ -306,16 +280,12 @@
@Override
public boolean processMessage(Message message) {
switch (message.what) {
- case CMD_NETWORK_LINGER:
- log("Lingering");
- transitionTo(mLingeringState);
- return HANDLED;
case CMD_NETWORK_CONNECTED:
- NetworkEvent.logEvent(mNetId, NetworkEvent.NETWORK_CONNECTED);
+ logNetworkEvent(NetworkEvent.NETWORK_CONNECTED);
transitionTo(mEvaluatingState);
return HANDLED;
case CMD_NETWORK_DISCONNECTED:
- NetworkEvent.logEvent(mNetId, NetworkEvent.NETWORK_DISCONNECTED);
+ logNetworkEvent(NetworkEvent.NETWORK_DISCONNECTED);
if (mLaunchCaptivePortalAppBroadcastReceiver != null) {
mContext.unregisterReceiver(mLaunchCaptivePortalAppBroadcastReceiver);
mLaunchCaptivePortalAppBroadcastReceiver = null;
@@ -380,10 +350,7 @@
private class ValidatedState extends State {
@Override
public void enter() {
- if (mEvaluationTimer.isRunning()) {
- NetworkEvent.logValidated(mNetId, mEvaluationTimer.stop());
- mEvaluationTimer.reset();
- }
+ maybeLogEvaluationResult(NetworkEvent.NETWORK_VALIDATED);
mConnectivityServiceHandler.sendMessage(obtainMessage(EVENT_NETWORK_TESTED,
NETWORK_TEST_RESULT_VALID, mNetworkAgentInfo.network.netId, null));
}
@@ -530,7 +497,7 @@
} else {
final Message msg = obtainMessage(CMD_REEVALUATE, ++mReevaluateToken, 0);
sendMessageDelayed(msg, mReevaluateDelayMs);
- NetworkEvent.logEvent(mNetId, NetworkEvent.NETWORK_VALIDATION_FAILED);
+ logNetworkEvent(NetworkEvent.NETWORK_VALIDATION_FAILED);
mConnectivityServiceHandler.sendMessage(obtainMessage(
EVENT_NETWORK_TESTED, NETWORK_TEST_RESULT_INVALID, mNetId,
probeResult.mRedirectUrl));
@@ -590,10 +557,7 @@
@Override
public void enter() {
- if (mEvaluationTimer.isRunning()) {
- NetworkEvent.logCaptivePortalFound(mNetId, mEvaluationTimer.stop());
- mEvaluationTimer.reset();
- }
+ maybeLogEvaluationResult(NetworkEvent.NETWORK_CAPTIVE_PORTAL_FOUND);
// Don't annoy user with sign-in notifications.
if (mDontDisplaySigninNotification) return;
// Create a CustomIntentReceiver that sends us a
@@ -621,72 +585,6 @@
}
}
- // Being in the LingeringState State indicates a Network's validated bit is true and it once
- // was the highest scoring Network satisfying a particular NetworkRequest, but since then
- // another Network satisfied the NetworkRequest with a higher score and hence this Network
- // is "lingered" for a fixed period of time before it is disconnected. This period of time
- // allows apps to wrap up communication and allows for seamless reactivation if the other
- // higher scoring Network happens to disconnect.
- private class LingeringState extends State {
- private static final String ACTION_LINGER_EXPIRED = "android.net.netmon.lingerExpired";
-
- private WakeupMessage mWakeupMessage;
-
- @Override
- public void enter() {
- mEvaluationTimer.reset();
- final String cmdName = ACTION_LINGER_EXPIRED + "." + mNetId;
- mWakeupMessage = makeWakeupMessage(mContext, getHandler(), cmdName, CMD_LINGER_EXPIRED);
- long wakeupTime = SystemClock.elapsedRealtime() + mLingerDelayMs;
- mWakeupMessage.schedule(wakeupTime);
- }
-
- @Override
- public boolean processMessage(Message message) {
- switch (message.what) {
- case CMD_NETWORK_CONNECTED:
- log("Unlingered");
- // If already validated, go straight to validated state.
- if (mNetworkAgentInfo.lastValidated) {
- transitionTo(mValidatedState);
- return HANDLED;
- }
- return NOT_HANDLED;
- case CMD_LINGER_EXPIRED:
- mConnectivityServiceHandler.sendMessage(
- obtainMessage(EVENT_NETWORK_LINGER_COMPLETE, mNetworkAgentInfo));
- return HANDLED;
- case CMD_FORCE_REEVALUATION:
- // Ignore reevaluation attempts when lingering. A reevaluation could result
- // in a transition to the validated state which would abort the linger
- // timeout. Lingering is the result of score assessment; validity is
- // irrelevant.
- return HANDLED;
- case CMD_CAPTIVE_PORTAL_APP_FINISHED:
- // Ignore user network determination as this could abort linger timeout.
- // Networks are only lingered once validated because:
- // - Unvalidated networks are never lingered (see rematchNetworkAndRequests).
- // - Once validated, a Network's validated bit is never cleared.
- // Since networks are only lingered after being validated a user's
- // determination will not change the death sentence that lingering entails:
- // - If the user wants to use the network or bypasses the captive portal,
- // the network's score will not be increased beyond its current value
- // because it is already validated. Without a score increase there is no
- // chance of reactivation (i.e. aborting linger timeout).
- // - If the user does not want the network, lingering will disconnect the
- // network anyhow.
- return HANDLED;
- default:
- return NOT_HANDLED;
- }
- }
-
- @Override
- public void exit() {
- mWakeupMessage.cancel();
- }
- }
-
private static String getCaptivePortalServerUrl(Context context, boolean isHttps) {
String server = Settings.Global.getString(context.getContentResolver(),
Settings.Global.CAPTIVE_PORTAL_SERVER);
@@ -758,11 +656,12 @@
if (!TextUtils.isEmpty(hostToResolve)) {
String probeName = ValidationProbeEvent.getProbeName(ValidationProbeEvent.PROBE_DNS);
final Stopwatch dnsTimer = new Stopwatch().start();
+ int dnsResult;
+ long dnsLatency;
try {
InetAddress[] addresses = mNetworkAgentInfo.network.getAllByName(hostToResolve);
- long dnsLatency = dnsTimer.stop();
- ValidationProbeEvent.logEvent(mNetId, dnsLatency,
- ValidationProbeEvent.PROBE_DNS, ValidationProbeEvent.DNS_SUCCESS);
+ dnsResult = ValidationProbeEvent.DNS_SUCCESS;
+ dnsLatency = dnsTimer.stop();
final StringBuffer connectInfo = new StringBuffer(", " + hostToResolve + "=");
for (InetAddress address : addresses) {
connectInfo.append(address.getHostAddress());
@@ -770,11 +669,11 @@
}
validationLog(probeName + " OK " + dnsLatency + "ms" + connectInfo);
} catch (UnknownHostException e) {
- long dnsLatency = dnsTimer.stop();
- ValidationProbeEvent.logEvent(mNetId, dnsLatency,
- ValidationProbeEvent.PROBE_DNS, ValidationProbeEvent.DNS_FAILURE);
+ dnsResult = ValidationProbeEvent.DNS_FAILURE;
+ dnsLatency = dnsTimer.stop();
validationLog(probeName + " FAIL " + dnsLatency + "ms, " + hostToResolve);
}
+ logValidationProbe(dnsLatency, ValidationProbeEvent.PROBE_DNS, dnsResult);
}
CaptivePortalProbeResult result;
@@ -855,7 +754,7 @@
urlConnection.disconnect();
}
}
- ValidationProbeEvent.logEvent(mNetId, probeTimer.stop(), probeType, httpResponseCode);
+ logValidationProbe(probeTimer.stop(), probeType, httpResponseCode);
return new CaptivePortalProbeResult(httpResponseCode, redirectUrl);
}
@@ -999,17 +898,18 @@
PERMISSION_ACCESS_NETWORK_CONDITIONS);
}
- // Allow tests to override linger time.
- @VisibleForTesting
- public static void SetDefaultLingerTime(int time_ms) {
- if (Process.myUid() == Process.SYSTEM_UID) {
- throw new SecurityException("SetDefaultLingerTime only for internal testing.");
- }
- DEFAULT_LINGER_DELAY_MS = time_ms;
+ private void logNetworkEvent(int evtype) {
+ mMetricsLog.log(new NetworkEvent(mNetId, evtype));
}
- @VisibleForTesting
- protected WakeupMessage makeWakeupMessage(Context c, Handler h, String s, int i) {
- return new WakeupMessage(c, h, s, i);
+ private void maybeLogEvaluationResult(int evtype) {
+ if (mEvaluationTimer.isRunning()) {
+ mMetricsLog.log(new NetworkEvent(mNetId, evtype, mEvaluationTimer.stop()));
+ mEvaluationTimer.reset();
+ }
+ }
+
+ private void logValidationProbe(long durationMs, int probeType, int probeResult) {
+ mMetricsLog.log(new ValidationProbeEvent(mNetId, durationMs, probeType, probeResult));
}
}
diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
index eb1c77e..e084ff8 100644
--- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java
+++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
@@ -18,6 +18,7 @@
import static android.Manifest.permission.CHANGE_NETWORK_STATE;
import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
+import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS;
import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
import static android.content.pm.PackageManager.GET_PERMISSIONS;
@@ -65,10 +66,10 @@
private final BroadcastReceiver mIntentReceiver;
// Values are User IDs.
- private final Set<Integer> mUsers = new HashSet<Integer>();
+ private final Set<Integer> mUsers = new HashSet<>();
// Keys are App IDs. Values are true for SYSTEM permission and false for NETWORK permission.
- private final Map<Integer, Boolean> mApps = new HashMap<Integer, Boolean>();
+ private final Map<Integer, Boolean> mApps = new HashMap<>();
public PermissionMonitor(Context context, INetworkManagementService netd) {
mContext = context;
@@ -126,14 +127,14 @@
}
boolean isNetwork = hasNetworkPermission(app);
- boolean isSystem = hasSystemPermission(app);
+ boolean hasRestrictedPermission = hasRestrictedNetworkPermission(app);
- if (isNetwork || isSystem) {
+ if (isNetwork || hasRestrictedPermission) {
Boolean permission = mApps.get(uid);
// If multiple packages share a UID (cf: android:sharedUserId) and ask for different
// permissions, don't downgrade (i.e., if it's already SYSTEM, leave it as is).
if (permission == null || permission == NETWORK) {
- mApps.put(uid, isSystem);
+ mApps.put(uid, hasRestrictedPermission);
}
}
}
@@ -164,12 +165,13 @@
return hasPermission(app, CHANGE_NETWORK_STATE);
}
- private boolean hasSystemPermission(PackageInfo app) {
+ private boolean hasRestrictedNetworkPermission(PackageInfo app) {
int flags = app.applicationInfo != null ? app.applicationInfo.flags : 0;
if ((flags & FLAG_SYSTEM) != 0 || (flags & FLAG_UPDATED_SYSTEM_APP) != 0) {
return true;
}
- return hasPermission(app, CONNECTIVITY_INTERNAL);
+ return hasPermission(app, CONNECTIVITY_INTERNAL)
+ || hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS);
}
private int[] toIntArray(List<Integer> list) {
@@ -181,8 +183,8 @@
}
private void update(Set<Integer> users, Map<Integer, Boolean> apps, boolean add) {
- List<Integer> network = new ArrayList<Integer>();
- List<Integer> system = new ArrayList<Integer>();
+ List<Integer> network = new ArrayList<>();
+ List<Integer> system = new ArrayList<>();
for (Entry<Integer, Boolean> app : apps.entrySet()) {
List<Integer> list = app.getValue() ? system : network;
for (int user : users) {
@@ -209,7 +211,7 @@
}
mUsers.add(user);
- Set<Integer> users = new HashSet<Integer>();
+ Set<Integer> users = new HashSet<>();
users.add(user);
update(users, mApps, true);
}
@@ -221,7 +223,7 @@
}
mUsers.remove(user);
- Set<Integer> users = new HashSet<Integer>();
+ Set<Integer> users = new HashSet<>();
users.add(user);
update(users, mApps, false);
}
@@ -234,9 +236,9 @@
try {
final PackageInfo app = mPackageManager.getPackageInfo(name, GET_PERMISSIONS);
final boolean isNetwork = hasNetworkPermission(app);
- final boolean isSystem = hasSystemPermission(app);
- if (isNetwork || isSystem) {
- currentPermission = isSystem;
+ final boolean hasRestrictedPermission = hasRestrictedNetworkPermission(app);
+ if (isNetwork || hasRestrictedPermission) {
+ currentPermission = hasRestrictedPermission;
}
} catch (NameNotFoundException e) {
// App not found.
@@ -257,7 +259,7 @@
if (permission != mApps.get(appUid)) {
mApps.put(appUid, permission);
- Map<Integer, Boolean> apps = new HashMap<Integer, Boolean>();
+ Map<Integer, Boolean> apps = new HashMap<>();
apps.put(appUid, permission);
update(mUsers, apps, true);
}
@@ -268,7 +270,7 @@
loge("Invalid app in onAppRemoved: " + appUid);
return;
}
- Map<Integer, Boolean> apps = new HashMap<Integer, Boolean>();
+ Map<Integer, Boolean> apps = new HashMap<>();
Boolean permission = null;
String[] packages = mPackageManager.getPackagesForUid(appUid);
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index bef48d6..b6c8d5d 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -69,6 +69,7 @@
import com.android.internal.util.StateMachine;
import com.android.server.IoThread;
import com.android.server.connectivity.tethering.IControlsTethering;
+import com.android.server.connectivity.tethering.IPv6TetheringCoordinator;
import com.android.server.connectivity.tethering.TetherInterfaceStateMachine;
import com.android.server.net.BaseNetworkObserver;
@@ -270,14 +271,16 @@
trackNewTetherableInterface(iface, interfaceType);
}
} else {
- if (interfaceType == ConnectivityManager.TETHERING_USB) {
- // ignore usb0 down after enabling RNDIS
- // we will handle disconnect in interfaceRemoved instead
- if (VDBG) Log.d(TAG, "ignore interface down for " + iface);
- } else if (tetherState != null) {
+ if (interfaceType == ConnectivityManager.TETHERING_BLUETOOTH) {
tetherState.mStateMachine.sendMessage(
TetherInterfaceStateMachine.CMD_INTERFACE_DOWN);
mTetherStates.remove(iface);
+ } else {
+ // Ignore usb0 down after enabling RNDIS.
+ // We will handle disconnect in interfaceRemoved.
+ // Similarly, ignore interface down for WiFi. We monitor WiFi AP status
+ // through the WifiManager.WIFI_AP_STATE_CHANGED_ACTION intent.
+ if (VDBG) Log.d(TAG, "ignore interface down for " + iface);
}
}
}
@@ -447,8 +450,6 @@
private int setWifiTethering(final boolean enable) {
synchronized (mPublicSync) {
- // Note that we're maintaining a predicate that mWifiTetherRequested always matches
- // our last request to WifiManager re: its AP enabled status.
mWifiTetherRequested = enable;
final WifiManager wifiManager =
(WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
@@ -588,13 +589,13 @@
synchronized (mPublicSync) {
TetherState tetherState = mTetherStates.get(iface);
if (tetherState == null) {
- Log.e(TAG, "Tried to Tether an unknown iface :" + iface + ", ignoring");
+ Log.e(TAG, "Tried to Tether an unknown iface: " + iface + ", ignoring");
return ConnectivityManager.TETHER_ERROR_UNKNOWN_IFACE;
}
// Ignore the error status of the interface. If the interface is available,
// the errors are referring to past tethering attempts anyway.
if (tetherState.mLastState != IControlsTethering.STATE_AVAILABLE) {
- Log.e(TAG, "Tried to Tether an unavailable iface :" + iface + ", ignoring");
+ Log.e(TAG, "Tried to Tether an unavailable iface: " + iface + ", ignoring");
return ConnectivityManager.TETHER_ERROR_UNAVAIL_IFACE;
}
tetherState.mStateMachine.sendMessage(TetherInterfaceStateMachine.CMD_TETHER_REQUESTED);
@@ -791,10 +792,6 @@
}
} else if (action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
synchronized (Tethering.this.mPublicSync) {
- if (!mWifiTetherRequested) {
- // We only care when we're trying to tether via our WiFi interface.
- return;
- }
int curState = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE,
WifiManager.WIFI_AP_STATE_DISABLED);
switch (curState) {
@@ -802,8 +799,10 @@
// We can see this state on the way to both enabled and failure states.
break;
case WifiManager.WIFI_AP_STATE_ENABLED:
- // Tell an appropriate interface state machine that it should tether.
- tetherMatchingInterfaces(true, ConnectivityManager.TETHERING_WIFI);
+ // When the AP comes up and we've been requested to tether it, do so.
+ if (mWifiTetherRequested) {
+ tetherMatchingInterfaces(true, ConnectivityManager.TETHERING_WIFI);
+ }
break;
case WifiManager.WIFI_AP_STATE_DISABLED:
case WifiManager.WIFI_AP_STATE_DISABLING:
@@ -813,10 +812,20 @@
Log.d(TAG, "Canceling WiFi tethering request - AP_STATE=" +
curState);
}
- // Tell an appropriate interface state machine that
- // it needs to tear itself down.
- tetherMatchingInterfaces(false, ConnectivityManager.TETHERING_WIFI);
- setWifiTethering(false);
+ // Tell appropriate interface state machines that they should tear
+ // themselves down.
+ for (int i = 0; i < mTetherStates.size(); i++) {
+ TetherInterfaceStateMachine tism =
+ mTetherStates.valueAt(i).mStateMachine;
+ if (tism.interfaceType() == ConnectivityManager.TETHERING_WIFI) {
+ tism.sendMessage(
+ TetherInterfaceStateMachine.CMD_TETHER_UNREQUESTED);
+ break; // There should be at most one of these.
+ }
+ }
+ // Regardless of whether we requested this transition, the AP has gone
+ // down. Don't try to tether again unless we're requested to do so.
+ mWifiTetherRequested = false;
break;
}
}
@@ -1015,15 +1024,29 @@
*/
class UpstreamNetworkCallback extends NetworkCallback {
@Override
+ public void onAvailable(Network network) {
+ mTetherMasterSM.sendMessage(TetherMasterSM.EVENT_UPSTREAM_CALLBACK,
+ UpstreamNetworkMonitor.EVENT_ON_AVAILABLE, 0, network);
+ }
+
+ @Override
+ public void onCapabilitiesChanged(Network network, NetworkCapabilities newNc) {
+ mTetherMasterSM.sendMessage(TetherMasterSM.EVENT_UPSTREAM_CALLBACK,
+ UpstreamNetworkMonitor.EVENT_ON_CAPABILITIES, 0,
+ new NetworkState(null, null, newNc, network, null, null));
+ }
+
+ @Override
public void onLinkPropertiesChanged(Network network, LinkProperties newLp) {
- mTetherMasterSM.sendMessage(
- TetherMasterSM.EVENT_UPSTREAM_LINKPROPERTIES_CHANGED,
+ mTetherMasterSM.sendMessage(TetherMasterSM.EVENT_UPSTREAM_CALLBACK,
+ UpstreamNetworkMonitor.EVENT_ON_LINKPROPERTIES, 0,
new NetworkState(null, newLp, null, network, null, null));
}
@Override
public void onLost(Network network) {
- mTetherMasterSM.sendMessage(TetherMasterSM.EVENT_UPSTREAM_LOST, network);
+ mTetherMasterSM.sendMessage(TetherMasterSM.EVENT_UPSTREAM_CALLBACK,
+ UpstreamNetworkMonitor.EVENT_ON_LOST, 0, network);
}
}
@@ -1042,6 +1065,11 @@
* could/should be moved here.
*/
class UpstreamNetworkMonitor {
+ static final int EVENT_ON_AVAILABLE = 1;
+ static final int EVENT_ON_CAPABILITIES = 2;
+ static final int EVENT_ON_LINKPROPERTIES = 3;
+ static final int EVENT_ON_LOST = 4;
+
final HashMap<Network, NetworkState> mNetworkMap = new HashMap<>();
NetworkCallback mDefaultNetworkCallback;
NetworkCallback mDunTetheringCallback;
@@ -1076,33 +1104,107 @@
mNetworkMap.clear();
}
- // Returns true if these updated LinkProperties pertain to the current
- // upstream network interface, false otherwise (or if there is not
- // currently any upstream tethering interface).
- boolean processLinkPropertiesChanged(NetworkState networkState) {
- if (networkState == null ||
- networkState.network == null ||
- networkState.linkProperties == null) {
- return false;
- }
+ NetworkState lookup(Network network) {
+ return (network != null) ? mNetworkMap.get(network) : null;
+ }
- mNetworkMap.put(networkState.network, networkState);
-
- if (mCurrentUpstreamIface != null) {
- for (String ifname : networkState.linkProperties.getAllInterfaceNames()) {
- if (mCurrentUpstreamIface.equals(ifname)) {
- return true;
+ NetworkState processCallback(int arg1, Object obj) {
+ switch (arg1) {
+ case EVENT_ON_AVAILABLE: {
+ final Network network = (Network) obj;
+ if (VDBG) {
+ Log.d(TAG, "EVENT_ON_AVAILABLE for " + network);
}
+ if (!mNetworkMap.containsKey(network)) {
+ mNetworkMap.put(network,
+ new NetworkState(null, null, null, network, null, null));
+ }
+
+ final ConnectivityManager cm = getConnectivityManager();
+
+ if (mDefaultNetworkCallback != null) {
+ cm.requestNetworkCapabilities(mDefaultNetworkCallback);
+ cm.requestLinkProperties(mDefaultNetworkCallback);
+ }
+
+ // Requesting updates for mDunTetheringCallback is not
+ // necessary. Because it's a listen, it will already have
+ // heard all NetworkCapabilities and LinkProperties updates
+ // since UpstreamNetworkMonitor was started. Because we
+ // start UpstreamNetworkMonitor before chooseUpstreamType()
+ // is ever invoked (it can register a DUN request) this is
+ // mostly safe. However, if a DUN network is already up for
+ // some reason (unlikely, because DUN is restricted and,
+ // unless the DUN network is shared with another APN, only
+ // the system can request it and this is the only part of
+ // the system that requests it) we won't know its
+ // LinkProperties or NetworkCapabilities.
+
+ return mNetworkMap.get(network);
+ }
+ case EVENT_ON_CAPABILITIES: {
+ final NetworkState ns = (NetworkState) obj;
+ if (!mNetworkMap.containsKey(ns.network)) {
+ // Ignore updates for networks for which we have not yet
+ // received onAvailable() - which should never happen -
+ // or for which we have already received onLost().
+ return null;
+ }
+ if (VDBG) {
+ Log.d(TAG, String.format("EVENT_ON_CAPABILITIES for %s: %s",
+ ns.network, ns.networkCapabilities));
+ }
+
+ final NetworkState prev = mNetworkMap.get(ns.network);
+ mNetworkMap.put(ns.network,
+ new NetworkState(null, prev.linkProperties, ns.networkCapabilities,
+ ns.network, null, null));
+ return mNetworkMap.get(ns.network);
+ }
+ case EVENT_ON_LINKPROPERTIES: {
+ final NetworkState ns = (NetworkState) obj;
+ if (!mNetworkMap.containsKey(ns.network)) {
+ // Ignore updates for networks for which we have not yet
+ // received onAvailable() - which should never happen -
+ // or for which we have already received onLost().
+ return null;
+ }
+ if (VDBG) {
+ Log.d(TAG, String.format("EVENT_ON_LINKPROPERTIES for %s: %s",
+ ns.network, ns.linkProperties));
+ }
+
+ final NetworkState prev = mNetworkMap.get(ns.network);
+ mNetworkMap.put(ns.network,
+ new NetworkState(null, ns.linkProperties, prev.networkCapabilities,
+ ns.network, null, null));
+ return mNetworkMap.get(ns.network);
+ }
+ case EVENT_ON_LOST: {
+ final Network network = (Network) obj;
+ if (VDBG) {
+ Log.d(TAG, "EVENT_ON_LOST for " + network);
+ }
+ return mNetworkMap.remove(network);
+ }
+ default:
+ return null;
+ }
+ }
+ }
+
+ // Needed because the canonical source of upstream truth is just the
+ // upstream interface name, |mCurrentUpstreamIface|. This is ripe for
+ // future simplification, once the upstream Network is canonical.
+ boolean pertainsToCurrentUpstream(NetworkState ns) {
+ if (ns != null && ns.linkProperties != null && mCurrentUpstreamIface != null) {
+ for (String ifname : ns.linkProperties.getAllInterfaceNames()) {
+ if (mCurrentUpstreamIface.equals(ifname)) {
+ return true;
}
}
- return false;
}
-
- void processNetworkLost(Network network) {
- if (network != null) {
- mNetworkMap.remove(network);
- }
- }
+ return false;
}
class TetherMasterSM extends StateMachine {
@@ -1117,8 +1219,7 @@
static final int CMD_RETRY_UPSTREAM = BASE_MASTER + 4;
// Events from NetworkCallbacks that we process on the master state
// machine thread on behalf of the UpstreamNetworkMonitor.
- static final int EVENT_UPSTREAM_LINKPROPERTIES_CHANGED = BASE_MASTER + 5;
- static final int EVENT_UPSTREAM_LOST = BASE_MASTER + 6;
+ static final int EVENT_UPSTREAM_CALLBACK = BASE_MASTER + 5;
private State mInitialState;
private State mTetherModeAliveState;
@@ -1141,7 +1242,8 @@
// Because we excise interfaces immediately from mTetherStates, we must maintain mNotifyList
// so that the garbage collector does not clean up the state machine before it has a chance
// to tear itself down.
- private ArrayList<TetherInterfaceStateMachine> mNotifyList;
+ private final ArrayList<TetherInterfaceStateMachine> mNotifyList;
+ private final IPv6TetheringCoordinator mIPv6TetheringCoordinator;
private int mMobileApnReserved = ConnectivityManager.TYPE_NONE;
private NetworkCallback mMobileUpstreamCallback;
@@ -1169,6 +1271,7 @@
addState(mSetDnsForwardersErrorState);
mNotifyList = new ArrayList<>();
+ mIPv6TetheringCoordinator = new IPv6TetheringCoordinator(mNotifyList);
setInitialState(mInitialState);
}
@@ -1273,6 +1376,7 @@
}
protected void chooseUpstreamType(boolean tryCell) {
+ final ConnectivityManager cm = getConnectivityManager();
int upType = ConnectivityManager.TYPE_NONE;
String iface = null;
@@ -1287,8 +1391,7 @@
}
for (Integer netType : mUpstreamIfaceTypes) {
- NetworkInfo info =
- getConnectivityManager().getNetworkInfo(netType.intValue());
+ NetworkInfo info = cm.getNetworkInfo(netType.intValue());
if ((info != null) && info.isConnected()) {
upType = netType.intValue();
break;
@@ -1329,9 +1432,9 @@
break;
}
+ Network network = null;
if (upType != ConnectivityManager.TYPE_NONE) {
- LinkProperties linkProperties =
- getConnectivityManager().getLinkProperties(upType);
+ LinkProperties linkProperties = cm.getLinkProperties(upType);
if (linkProperties != null) {
// Find the interface with the default IPv4 route. It may be the
// interface described by linkProperties, or one of the interfaces
@@ -1348,7 +1451,7 @@
}
if (iface != null) {
- Network network = getConnectivityManager().getNetworkForType(upType);
+ network = cm.getNetworkForType(upType);
if (network == null) {
Log.e(TAG, "No Network for upstream type " + upType + "!");
}
@@ -1356,6 +1459,13 @@
}
}
notifyTetheredOfNewUpstreamIface(iface);
+ NetworkState ns = mUpstreamNetworkMonitor.lookup(network);
+ if (ns != null && pertainsToCurrentUpstream(ns)) {
+ // If we already have NetworkState for this network examine
+ // it immediately, because there likely will be no second
+ // EVENT_ON_AVAILABLE (it was already received).
+ handleNewUpstreamNetworkState(ns);
+ }
}
protected void setDnsForwarders(final Network network, final LinkProperties lp) {
@@ -1388,6 +1498,10 @@
ifaceName);
}
}
+
+ protected void handleNewUpstreamNetworkState(NetworkState ns) {
+ mIPv6TetheringCoordinator.updateUpstreamNetworkState(ns);
+ }
}
private final AtomicInteger mSimBcastGenerationNumber = new AtomicInteger(0);
@@ -1577,24 +1691,55 @@
chooseUpstreamType(mTryCell);
mTryCell = !mTryCell;
break;
- case EVENT_UPSTREAM_LINKPROPERTIES_CHANGED:
- NetworkState state = (NetworkState) message.obj;
- if (mUpstreamNetworkMonitor.processLinkPropertiesChanged(state)) {
- setDnsForwarders(state.network, state.linkProperties);
- } else if (mCurrentUpstreamIface == null) {
- // If we have no upstream interface, try to run through upstream
- // selection again. If, for example, IPv4 connectivity has shown up
- // after IPv6 (e.g., 464xlat became available) we want the chance to
- // notice and act accordingly.
- chooseUpstreamType(false);
+ case EVENT_UPSTREAM_CALLBACK: {
+ // First: always update local state about every network.
+ final NetworkState ns = mUpstreamNetworkMonitor.processCallback(
+ message.arg1, message.obj);
+
+ if (ns == null || !pertainsToCurrentUpstream(ns)) {
+ // TODO: In future, this is where upstream evaluation and selection
+ // could be handled for notifications which include sufficient data.
+ // For example, after CONNECTIVITY_ACTION listening is removed, here
+ // is where we could observe a Wi-Fi network becoming available and
+ // passing validation.
+ if (mCurrentUpstreamIface == null) {
+ // If we have no upstream interface, try to run through upstream
+ // selection again. If, for example, IPv4 connectivity has shown up
+ // after IPv6 (e.g., 464xlat became available) we want the chance to
+ // notice and act accordingly.
+ chooseUpstreamType(false);
+ }
+ break;
+ }
+
+ switch (message.arg1) {
+ case UpstreamNetworkMonitor.EVENT_ON_AVAILABLE:
+ // The default network changed, or DUN connected
+ // before this callback was processed. Updates
+ // for the current NetworkCapabilities and
+ // LinkProperties have been requested (default
+ // request) or are being sent shortly (DUN). Do
+ // nothing until they arrive; if no updates
+ // arrive there's nothing to do.
+ break;
+ case UpstreamNetworkMonitor.EVENT_ON_CAPABILITIES:
+ handleNewUpstreamNetworkState(ns);
+ break;
+ case UpstreamNetworkMonitor.EVENT_ON_LINKPROPERTIES:
+ setDnsForwarders(ns.network, ns.linkProperties);
+ handleNewUpstreamNetworkState(ns);
+ break;
+ case UpstreamNetworkMonitor.EVENT_ON_LOST:
+ // TODO: Re-evaluate possible upstreams. Currently upstream
+ // reevaluation is triggered via received CONNECTIVITY_ACTION
+ // broadcasts that result in being passed a
+ // TetherMasterSM.CMD_UPSTREAM_CHANGED.
+ break;
+ default:
+ break;
}
break;
- case EVENT_UPSTREAM_LOST:
- // TODO: Re-evaluate possible upstreams. Currently upstream reevaluation
- // is triggered via received CONNECTIVITY_ACTION broadcasts that result
- // in being passed a TetherMasterSM.CMD_UPSTREAM_CHANGED.
- mUpstreamNetworkMonitor.processNetworkLost((Network) message.obj);
- break;
+ }
default:
retValue = false;
break;
diff --git a/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringCoordinator.java b/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringCoordinator.java
new file mode 100644
index 0000000..8254397
--- /dev/null
+++ b/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringCoordinator.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.connectivity.tethering;
+
+import android.net.ConnectivityManager;
+import android.net.IpPrefix;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkState;
+import android.net.RouteInfo;
+import android.util.Log;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.util.ArrayList;
+
+
+/**
+ * IPv6 tethering is rather different from IPv4 owing to the absence of NAT.
+ * This coordinator is responsible for evaluating the dedicated prefixes
+ * assigned to the device and deciding how to divvy them up among downstream
+ * interfaces.
+ *
+ * @hide
+ */
+public class IPv6TetheringCoordinator {
+ private static final String TAG = IPv6TetheringCoordinator.class.getSimpleName();
+ private static final boolean DBG = false;
+ private static final boolean VDBG = false;
+
+ private final ArrayList<TetherInterfaceStateMachine> mNotifyList;
+ private NetworkState mUpstreamNetworkState;
+
+ public IPv6TetheringCoordinator(ArrayList<TetherInterfaceStateMachine> notifyList) {
+ mNotifyList = notifyList;
+ }
+
+ public void updateUpstreamNetworkState(NetworkState ns) {
+ if (VDBG) {
+ Log.d(TAG, "updateUpstreamNetworkState: " + toDebugString(ns));
+ }
+ if (ns == null || ns.network == null) {
+ stopIPv6TetheringOnAllInterfaces();
+ setUpstreamNetworkState(null);
+ return;
+ }
+
+ if (mUpstreamNetworkState != null &&
+ !ns.network.equals(mUpstreamNetworkState.network)) {
+ stopIPv6TetheringOnAllInterfaces();
+ }
+ setUpstreamNetworkState(ns);
+ maybeUpdateIPv6TetheringInterfaces();
+ }
+
+ private void stopIPv6TetheringOnAllInterfaces() {
+ for (TetherInterfaceStateMachine sm : mNotifyList) {
+ sm.sendMessage(TetherInterfaceStateMachine.CMD_IPV6_TETHER_UPDATE,
+ 0, 0, null);
+ }
+ }
+
+ private void setUpstreamNetworkState(NetworkState ns) {
+ if (!canTetherIPv6(ns)) {
+ mUpstreamNetworkState = null;
+ } else {
+ mUpstreamNetworkState = new NetworkState(
+ null,
+ new LinkProperties(ns.linkProperties),
+ new NetworkCapabilities(ns.networkCapabilities),
+ new Network(ns.network),
+ null,
+ null);
+ }
+
+ if (DBG) {
+ Log.d(TAG, "setUpstreamNetworkState: " + toDebugString(mUpstreamNetworkState));
+ }
+ }
+
+ private void maybeUpdateIPv6TetheringInterfaces() {
+ if (mUpstreamNetworkState == null) return;
+
+ for (TetherInterfaceStateMachine sm : mNotifyList) {
+ final LinkProperties lp = getInterfaceIPv6LinkProperties(sm.interfaceType());
+ if (lp != null) {
+ sm.sendMessage(TetherInterfaceStateMachine.CMD_IPV6_TETHER_UPDATE, 0, 0, lp);
+ }
+ break;
+ }
+ }
+
+ private LinkProperties getInterfaceIPv6LinkProperties(int interfaceType) {
+ // NOTE: Here, in future, we would have policies to decide how to divvy
+ // up the available dedicated prefixes among downstream interfaces.
+ // At this time we have no such mechanism--we only support tethering
+ // IPv6 toward Wi-Fi interfaces.
+
+ switch (interfaceType) {
+ case ConnectivityManager.TETHERING_WIFI:
+ final LinkProperties lp = getIPv6OnlyLinkProperties(
+ mUpstreamNetworkState.linkProperties);
+ if (lp.hasIPv6DefaultRoute() && lp.hasGlobalIPv6Address()) {
+ return lp;
+ }
+ break;
+ }
+
+ return null;
+ }
+
+ private static boolean canTetherIPv6(NetworkState ns) {
+ // Broadly speaking:
+ //
+ // [1] does the upstream have an IPv6 default route?
+ //
+ // and
+ //
+ // [2] does the upstream have one or more global IPv6 /64s
+ // dedicated to this device?
+ //
+ // In lieu of Prefix Delegation and other evaluation of whether a
+ // prefix may or may not be dedicated to this device, for now just
+ // check whether the upstream is TRANSPORT_CELLULAR. This works
+ // because "[t]he 3GPP network allocates each default bearer a unique
+ // /64 prefix", per RFC 6459, Section 5.2.
+
+ final boolean canTether =
+ (ns != null) && (ns.network != null) &&
+ (ns.linkProperties != null) && (ns.networkCapabilities != null) &&
+ // At least one upstream DNS server:
+ ns.linkProperties.isProvisioned() &&
+ // Minimal amount of IPv6 provisioning:
+ ns.linkProperties.hasIPv6DefaultRoute() &&
+ ns.linkProperties.hasGlobalIPv6Address() &&
+ // Temporary approximation of "dedicated prefix":
+ ns.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+
+ // For now, we do not support separate IPv4 and IPv6 upstreams (e.g.
+ // tethering with 464xlat involved). TODO: Rectify this shortcoming,
+ // likely by calling NetworkManagementService#startInterfaceForwarding()
+ // for all upstream interfaces.
+ RouteInfo v4default = null;
+ RouteInfo v6default = null;
+ if (canTether) {
+ for (RouteInfo r : ns.linkProperties.getAllRoutes()) {
+ if (r.isIPv4Default()) {
+ v4default = r;
+ } else if (r.isIPv6Default()) {
+ v6default = r;
+ }
+
+ if (v4default != null && v6default != null) {
+ break;
+ }
+ }
+ }
+
+ final boolean supportedConfiguration =
+ (v4default != null) && (v6default != null) &&
+ (v4default.getInterface() != null) &&
+ v4default.getInterface().equals(v6default.getInterface());
+
+ final boolean outcome = canTether && supportedConfiguration;
+
+ if (VDBG) {
+ if (ns == null) {
+ Log.d(TAG, "No available upstream.");
+ } else {
+ Log.d(TAG, String.format("IPv6 tethering is %s for upstream: %s",
+ (outcome ? "available" : "not available"), toDebugString(ns)));
+ }
+ }
+
+ return outcome;
+ }
+
+ private static LinkProperties getIPv6OnlyLinkProperties(LinkProperties lp) {
+ final LinkProperties v6only = new LinkProperties();
+ if (lp == null) {
+ return v6only;
+ }
+
+ // NOTE: At this time we don't copy over any information about any
+ // stacked links. No current stacked link configuration has IPv6.
+
+ v6only.setInterfaceName(lp.getInterfaceName());
+
+ v6only.setMtu(lp.getMtu());
+
+ for (LinkAddress linkAddr : lp.getLinkAddresses()) {
+ if (linkAddr.isGlobalPreferred() && linkAddr.getPrefixLength() == 64) {
+ v6only.addLinkAddress(linkAddr);
+ }
+ }
+
+ for (RouteInfo routeInfo : lp.getRoutes()) {
+ final IpPrefix destination = routeInfo.getDestination();
+ if ((destination.getAddress() instanceof Inet6Address) &&
+ (destination.getPrefixLength() <= 64)) {
+ v6only.addRoute(routeInfo);
+ }
+ }
+
+ for (InetAddress dnsServer : lp.getDnsServers()) {
+ if (isIPv6GlobalAddress(dnsServer)) {
+ // For now we include ULAs.
+ v6only.addDnsServer(dnsServer);
+ }
+ }
+
+ v6only.setDomains(lp.getDomains());
+
+ return v6only;
+ }
+
+ // TODO: Delete this and switch to LinkAddress#isGlobalPreferred once we
+ // announce our own IPv6 address as DNS server.
+ private static boolean isIPv6GlobalAddress(InetAddress ip) {
+ return (ip instanceof Inet6Address) &&
+ !ip.isAnyLocalAddress() &&
+ !ip.isLoopbackAddress() &&
+ !ip.isLinkLocalAddress() &&
+ !ip.isSiteLocalAddress() &&
+ !ip.isMulticastAddress();
+ }
+
+ private static String toDebugString(NetworkState ns) {
+ if (ns == null) {
+ return "NetworkState{null}";
+ }
+ return String.format("NetworkState{%s, %s, %s}",
+ ns.network,
+ ns.networkCapabilities,
+ ns.linkProperties);
+ }
+}
diff --git a/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java b/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java
new file mode 100644
index 0000000..a58d243
--- /dev/null
+++ b/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.connectivity.tethering;
+
+import android.net.IpPrefix;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
+import android.net.NetworkState;
+import android.net.RouteInfo;
+import android.net.ip.RouterAdvertisementDaemon;
+import android.net.ip.RouterAdvertisementDaemon.RaParams;
+import android.os.INetworkManagementService;
+import android.os.RemoteException;
+import android.util.Log;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+
+/**
+ * @hide
+ */
+class IPv6TetheringInterfaceServices {
+ private static final String TAG = IPv6TetheringInterfaceServices.class.getSimpleName();
+
+ private final String mIfName;
+ private final INetworkManagementService mNMService;
+
+ private NetworkInterface mNetworkInterface;
+ private byte[] mHwAddr;
+ private ArrayList<RouteInfo> mLastLocalRoutes;
+ private RouterAdvertisementDaemon mRaDaemon;
+ private RaParams mLastRaParams;
+
+ IPv6TetheringInterfaceServices(String ifname, INetworkManagementService nms) {
+ mIfName = ifname;
+ mNMService = nms;
+ }
+
+ public boolean start() {
+ try {
+ mNetworkInterface = NetworkInterface.getByName(mIfName);
+ } catch (SocketException e) {
+ Log.e(TAG, "Failed to find NetworkInterface for " + mIfName, e);
+ stop();
+ return false;
+ }
+
+ try {
+ mHwAddr = mNetworkInterface.getHardwareAddress();
+ } catch (SocketException e) {
+ Log.e(TAG, "Failed to find hardware address for " + mIfName, e);
+ stop();
+ return false;
+ }
+
+ final int ifindex = mNetworkInterface.getIndex();
+ mRaDaemon = new RouterAdvertisementDaemon(mIfName, ifindex, mHwAddr);
+ if (!mRaDaemon.start()) {
+ stop();
+ return false;
+ }
+
+ return true;
+ }
+
+ public void stop() {
+ mNetworkInterface = null;
+ mHwAddr = null;
+ updateLocalRoutes(null);
+ updateRaParams(null);
+
+ if (mRaDaemon != null) {
+ mRaDaemon.stop();
+ mRaDaemon = null;
+ }
+ }
+
+ // IPv6TetheringCoordinator sends updates with carefully curated IPv6-only
+ // LinkProperties. These have extraneous data filtered out and only the
+ // necessary prefixes included (per its prefix distribution policy).
+ //
+ // TODO: Evaluate using a data structure than is more directly suited to
+ // communicating only the relevant information.
+ public void updateUpstreamIPv6LinkProperties(LinkProperties v6only) {
+ if (mRaDaemon == null) return;
+
+ if (v6only == null) {
+ updateLocalRoutes(null);
+ updateRaParams(null);
+ return;
+ }
+
+ RaParams params = new RaParams();
+ params.mtu = v6only.getMtu();
+ params.hasDefaultRoute = v6only.hasIPv6DefaultRoute();
+
+ ArrayList<RouteInfo> localRoutes = new ArrayList<RouteInfo>();
+ for (LinkAddress linkAddr : v6only.getLinkAddresses()) {
+ final IpPrefix prefix = new IpPrefix(linkAddr.getAddress(),
+ linkAddr.getPrefixLength());
+
+ // Accumulate routes representing "prefixes to be assigned to the
+ // local interface", for subsequent addition to the local network
+ // in the routing rules.
+ localRoutes.add(new RouteInfo(prefix, null, mIfName));
+
+ params.prefixes.add(prefix);
+ }
+
+ // We need to be able to send unicast RAs, and clients might like to
+ // ping the default router's link-local address, so add that as well.
+ localRoutes.add(new RouteInfo(new IpPrefix("fe80::/64"), null, mIfName));
+
+ // TODO: Add a local interface address, update dnsmasq to listen on the
+ // new address, and use only that address as a DNS server.
+ for (InetAddress dnsServer : v6only.getDnsServers()) {
+ if (dnsServer instanceof Inet6Address) {
+ params.dnses.add((Inet6Address) dnsServer);
+ }
+ }
+
+ updateLocalRoutes(localRoutes);
+ updateRaParams(params);
+ }
+
+ private void updateLocalRoutes(ArrayList<RouteInfo> localRoutes) {
+ if (localRoutes != null) {
+ // TODO: Compare with mLastLocalRoutes and take appropriate
+ // appropriate action on the difference between the two.
+
+ if (!localRoutes.isEmpty()) {
+ try {
+ mNMService.addInterfaceToLocalNetwork(mIfName, localRoutes);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to add IPv6 routes to local table: ", e);
+ }
+ }
+ } else {
+ if (mLastLocalRoutes != null && !mLastLocalRoutes.isEmpty()) {
+ try {
+ final int removalFailures =
+ mNMService.removeRoutesFromLocalNetwork(mLastLocalRoutes);
+ if (removalFailures > 0) {
+ Log.e(TAG,
+ String.format("Failed to remove %d IPv6 routes from local table.",
+ removalFailures));
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to remove IPv6 routes from local table: ", e);
+ }
+ }
+ }
+
+ mLastLocalRoutes = localRoutes;
+ }
+
+ private void updateRaParams(RaParams params) {
+ if (mRaDaemon != null) {
+ // Currently, we send spurious RAs (5) whenever there's any update.
+ // TODO: Compare params with mLastParams to avoid spurious updates.
+ mRaDaemon.buildNewRa(params);
+ }
+
+ mLastRaParams = params;
+ }
+}
diff --git a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
index aebeb69..9e7cb93 100644
--- a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
+++ b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
@@ -20,6 +20,7 @@
import android.net.INetworkStatsService;
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
+import android.net.LinkProperties;
import android.net.NetworkUtils;
import android.os.INetworkManagementService;
import android.os.Looper;
@@ -73,6 +74,8 @@
public static final int CMD_SET_DNS_FORWARDERS_ERROR = BASE_IFACE + 11;
// the upstream connection has changed
public static final int CMD_TETHER_CONNECTION_CHANGED = BASE_IFACE + 12;
+ // new IPv6 tethering parameters need to be processed
+ public static final int CMD_IPV6_TETHER_UPDATE = BASE_IFACE + 13;
private final State mInitialState;
private final State mTetheredState;
@@ -84,6 +87,7 @@
private final String mIfaceName;
private final int mInterfaceType;
+ private final IPv6TetheringInterfaceServices mIPv6TetherSvc;
private int mLastError;
private String mMyUpstreamIfaceName; // may change over time
@@ -97,6 +101,7 @@
mTetherController = tetherController;
mIfaceName = ifaceName;
mInterfaceType = interfaceType;
+ mIPv6TetherSvc = new IPv6TetheringInterfaceServices(mIfaceName, mNMService);
mLastError = ConnectivityManager.TETHER_ERROR_NO_ERROR;
mInitialState = new InitialState();
@@ -109,6 +114,10 @@
setInitialState(mInitialState);
}
+ public int interfaceType() {
+ return mInterfaceType;
+ }
+
// configured when we start tethering and unconfig'd on error or conclusion
private boolean configureIfaceIp(boolean enabled) {
if (VDBG) Log.d(TAG, "configureIfaceIp(" + enabled + ")");
@@ -175,6 +184,10 @@
case CMD_INTERFACE_DOWN:
transitionTo(mUnavailableState);
break;
+ case CMD_IPV6_TETHER_UPDATE:
+ mIPv6TetherSvc.updateUpstreamIPv6LinkProperties(
+ (LinkProperties) message.obj);
+ break;
default:
retValue = false;
break;
@@ -200,6 +213,11 @@
transitionTo(mInitialState);
return;
}
+
+ if (!mIPv6TetherSvc.start()) {
+ Log.e(TAG, "Failed to start IPv6TetheringInterfaceServices");
+ }
+
if (DBG) Log.d(TAG, "Tethered " + mIfaceName);
mTetherController.notifyInterfaceStateChange(
mIfaceName, TetherInterfaceStateMachine.this,
@@ -211,6 +229,7 @@
// Note that at this point, we're leaving the tethered state. We can fail any
// of these operations, but it doesn't really change that we have to try them
// all in sequence.
+ mIPv6TetherSvc.stop();
cleanupUpstream();
try {
@@ -287,6 +306,10 @@
}
mMyUpstreamIfaceName = newUpstreamIfaceName;
break;
+ case CMD_IPV6_TETHER_UPDATE:
+ mIPv6TetherSvc.updateUpstreamIPv6LinkProperties(
+ (LinkProperties) message.obj);
+ break;
case CMD_IP_FORWARDING_ENABLE_ERROR:
case CMD_IP_FORWARDING_DISABLE_ERROR:
case CMD_START_TETHERING_ERROR:
diff --git a/services/core/java/com/android/server/content/SyncOperation.java b/services/core/java/com/android/server/content/SyncOperation.java
index 804be4e..c371f97 100644
--- a/services/core/java/com/android/server/content/SyncOperation.java
+++ b/services/core/java/com/android/server/content/SyncOperation.java
@@ -197,7 +197,7 @@
} else if (value instanceof Boolean) {
syncExtrasBundle.putBoolean(key, (Boolean) value);
} else if (value instanceof Float) {
- syncExtrasBundle.putDouble(key, (Double) value);
+ syncExtrasBundle.putDouble(key, (double) (float) value);
} else if (value instanceof Double) {
syncExtrasBundle.putDouble(key, (Double) value);
} else if (value instanceof String) {
diff --git a/services/core/java/com/android/server/display/DisplayAdapter.java b/services/core/java/com/android/server/display/DisplayAdapter.java
index 701b9f1..6ba25a5 100644
--- a/services/core/java/com/android/server/display/DisplayAdapter.java
+++ b/services/core/java/com/android/server/display/DisplayAdapter.java
@@ -49,13 +49,6 @@
*/
private static final AtomicInteger NEXT_DISPLAY_MODE_ID = new AtomicInteger(1); // 0 = no mode.
- /**
- * Used to generate globally unique color transform ids.
- *
- * Valid IDs start at 1 with 0 as the sentinel value for the default mode.
- */
- private static final AtomicInteger NEXT_COLOR_TRANSFORM_ID = new AtomicInteger(1);
-
// Called with SyncRoot lock held.
public DisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
Context context, Handler handler, Listener listener, String name) {
@@ -141,11 +134,6 @@
NEXT_DISPLAY_MODE_ID.getAndIncrement(), width, height, refreshRate);
}
- public static Display.ColorTransform createColorTransform(int colorTransform) {
- return new Display.ColorTransform(
- NEXT_COLOR_TRANSFORM_ID.getAndIncrement(), colorTransform);
- }
-
public interface Listener {
public void onDisplayDeviceEvent(DisplayDevice device, int event);
public void onTraversalRequested();
diff --git a/services/core/java/com/android/server/display/DisplayDevice.java b/services/core/java/com/android/server/display/DisplayDevice.java
index 7af0bdb..839ab4d 100644
--- a/services/core/java/com/android/server/display/DisplayDevice.java
+++ b/services/core/java/com/android/server/display/DisplayDevice.java
@@ -94,6 +94,11 @@
}
/**
+ * Returns whether the unique id of the device is stable across reboots.
+ */
+ public abstract boolean hasStableUniqueId();
+
+ /**
* Gets information about the display device.
*
* The information returned should not change between calls unless the display
@@ -135,7 +140,7 @@
/**
* Sets the mode, if supported.
*/
- public void requestColorTransformAndModeInTransactionLocked(int colorTransformId, int modeId) {
+ public void requestDisplayModesInTransactionLocked(int colorMode, int modeId) {
}
/**
diff --git a/services/core/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java
index 5ce66fa..6719182 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceInfo.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceInfo.java
@@ -118,6 +118,11 @@
public static final int DIFF_OTHER = 1 << 1;
/**
+ * Diff result: The color mode fields differ.
+ */
+ public static final int DIFF_COLOR_MODE = 1 << 2;
+
+ /**
* Gets the name of the display device, which may be derived from EDID or
* other sources. The name may be localized and displayed to the user.
*/
@@ -155,14 +160,11 @@
*/
public Display.Mode[] supportedModes = Display.Mode.EMPTY_ARRAY;
- /** The active color transform of the display */
- public int colorTransformId;
+ /** The active color mode of the display */
+ public int colorMode;
- /** The default color transform of the display */
- public int defaultColorTransformId;
-
- /** The supported color transforms of the display */
- public Display.ColorTransform[] supportedColorTransforms = Display.ColorTransform.EMPTY_ARRAY;
+ /** The supported color modes of the display */
+ public int[] supportedColorModes = { Display.COLOR_MODE_DEFAULT };
/**
* The HDR capabilities this display claims to support.
@@ -283,6 +285,9 @@
if (state != other.state) {
diff |= DIFF_STATE;
}
+ if (colorMode != other.colorMode) {
+ diff |= DIFF_COLOR_MODE;
+ }
if (!Objects.equal(name, other.name)
|| !Objects.equal(uniqueId, other.uniqueId)
|| width != other.width
@@ -290,9 +295,7 @@
|| modeId != other.modeId
|| defaultModeId != other.defaultModeId
|| !Arrays.equals(supportedModes, other.supportedModes)
- || colorTransformId != other.colorTransformId
- || defaultColorTransformId != other.defaultColorTransformId
- || !Arrays.equals(supportedColorTransforms, other.supportedColorTransforms)
+ || !Arrays.equals(supportedColorModes, other.supportedColorModes)
|| !Objects.equal(hdrCapabilities, other.hdrCapabilities)
|| densityDpi != other.densityDpi
|| xDpi != other.xDpi
@@ -324,9 +327,8 @@
modeId = other.modeId;
defaultModeId = other.defaultModeId;
supportedModes = other.supportedModes;
- colorTransformId = other.colorTransformId;
- defaultColorTransformId = other.defaultColorTransformId;
- supportedColorTransforms = other.supportedColorTransforms;
+ colorMode = other.colorMode;
+ supportedColorModes = other.supportedColorModes;
hdrCapabilities = other.hdrCapabilities;
densityDpi = other.densityDpi;
xDpi = other.xDpi;
@@ -353,9 +355,8 @@
sb.append(", modeId ").append(modeId);
sb.append(", defaultModeId ").append(defaultModeId);
sb.append(", supportedModes ").append(Arrays.toString(supportedModes));
- sb.append(", colorTransformId ").append(colorTransformId);
- sb.append(", defaultColorTransformId ").append(defaultColorTransformId);
- sb.append(", supportedColorTransforms ").append(Arrays.toString(supportedColorTransforms));
+ sb.append(", colorMode ").append(colorMode);
+ sb.append(", supportedColorModes ").append(Arrays.toString(supportedColorModes));
sb.append(", HdrCapabilities ").append(hdrCapabilities);
sb.append(", density ").append(densityDpi);
sb.append(", ").append(xDpi).append(" x ").append(yDpi).append(" dpi");
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 6a6570b..0abd2e7 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -239,11 +239,17 @@
@Override
public void onStart() {
+ // We need to pre-load the persistent data store so it's ready before the default display
+ // adapter is up so that we have it's configuration. We could load it lazily, but since
+ // we're going to have to read it in eventually we may as well do it here rather than after
+ // we've waited for the diplay to register itself with us.
+ mPersistentDataStore.loadIfNeeded();
mHandler.sendEmptyMessage(MSG_REGISTER_DEFAULT_DISPLAY_ADAPTER);
publishBinderService(Context.DISPLAY_SERVICE, new BinderService(),
true /*allowIsolated*/);
publishLocalService(DisplayManagerInternal.class, new LocalService());
+ publishLocalService(DisplayTransformManager.class, new DisplayTransformManager());
}
@Override
@@ -540,12 +546,12 @@
}
}
- private void requestColorTransformInternal(int displayId, int colorTransformId) {
+ private void requestColorModeInternal(int displayId, int colorMode) {
synchronized (mSyncRoot) {
LogicalDisplay display = mLogicalDisplays.get(displayId);
if (display != null &&
- display.getRequestedColorTransformIdLocked() != colorTransformId) {
- display.setRequestedColorTransformIdLocked(colorTransformId);
+ display.getRequestedColorModeLocked() != colorMode) {
+ display.setRequestedColorModeLocked(colorMode);
scheduleTraversalLocked(false);
}
}
@@ -690,11 +696,15 @@
device.mDebugLastLoggedDeviceInfo = info;
mDisplayDevices.add(device);
- addLogicalDisplayLocked(device);
+ LogicalDisplay display = addLogicalDisplayLocked(device);
Runnable work = updateDisplayStateLocked(device);
if (work != null) {
work.run();
}
+ if (display != null && display.getPrimaryDisplayDeviceLocked() == device) {
+ int colorMode = mPersistentDataStore.getColorMode(device);
+ display.setRequestedColorModeLocked(colorMode);
+ }
scheduleTraversalLocked(false);
}
@@ -713,6 +723,13 @@
} else if (diff != 0) {
Slog.i(TAG, "Display device changed: " + info);
}
+ if ((diff & DisplayDeviceInfo.DIFF_COLOR_MODE) != 0) {
+ try {
+ mPersistentDataStore.setColorMode(device, info.colorMode);
+ } finally {
+ mPersistentDataStore.saveIfNeeded();
+ }
+ }
device.mDebugLastLoggedDeviceInfo = info;
device.applyPendingDisplayDeviceInfoChangesLocked();
@@ -765,7 +782,7 @@
// Adds a new logical display based on the given display device.
// Sends notifications if needed.
- private void addLogicalDisplayLocked(DisplayDevice device) {
+ private LogicalDisplay addLogicalDisplayLocked(DisplayDevice device) {
DisplayDeviceInfo deviceInfo = device.getDisplayDeviceInfoLocked();
boolean isDefault = (deviceInfo.flags
& DisplayDeviceInfo.FLAG_DEFAULT_DISPLAY) != 0;
@@ -777,7 +794,7 @@
if (!isDefault && mSingleDisplayDemoMode) {
Slog.i(TAG, "Not creating a logical display for a secondary display "
+ " because single display demo mode is enabled: " + deviceInfo);
- return;
+ return null;
}
final int displayId = assignDisplayIdLocked(isDefault);
@@ -789,7 +806,7 @@
// This should never happen currently.
Slog.w(TAG, "Ignoring display device because the logical display "
+ "created from it was not considered valid: " + deviceInfo);
- return;
+ return null;
}
mLogicalDisplays.put(displayId, display);
@@ -800,6 +817,7 @@
}
sendDisplayEventLocked(displayId, DisplayManagerGlobal.EVENT_DISPLAY_ADDED);
+ return display;
}
private int assignDisplayIdLocked(boolean isDefault) {
@@ -1067,6 +1085,9 @@
if (mDisplayPowerController != null) {
mDisplayPowerController.dump(pw);
}
+
+ pw.println();
+ mPersistentDataStore.dump(pw);
}
}
@@ -1351,13 +1372,13 @@
}
@Override // Binder call
- public void requestColorTransform(int displayId, int colorTransformId) {
+ public void requestColorMode(int displayId, int colorMode) {
mContext.enforceCallingOrSelfPermission(
- Manifest.permission.CONFIGURE_DISPLAY_COLOR_TRANSFORM,
- "Permission required to change the display color transform");
+ Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE,
+ "Permission required to change the display color mode");
final long token = Binder.clearCallingIdentity();
try {
- requestColorTransformInternal(displayId, colorTransformId);
+ requestColorModeInternal(displayId, colorMode);
} finally {
Binder.restoreCallingIdentity(token);
}
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 8f8afd5..61af8ed 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1181,6 +1181,10 @@
}
private static Spline createAutoBrightnessSpline(int[] lux, int[] brightness) {
+ if (lux == null || lux.length == 0 || brightness == null || brightness.length == 0) {
+ Slog.e(TAG, "Could not create auto-brightness spline.");
+ return null;
+ }
try {
final int n = brightness.length;
float[] x = new float[n];
diff --git a/services/core/java/com/android/server/display/DisplayTransformManager.java b/services/core/java/com/android/server/display/DisplayTransformManager.java
new file mode 100644
index 0000000..6902b1a
--- /dev/null
+++ b/services/core/java/com/android/server/display/DisplayTransformManager.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.display;
+
+import android.opengl.Matrix;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Slog;
+import android.util.SparseArray;
+
+import com.android.internal.annotations.GuardedBy;
+
+import java.util.Arrays;
+
+/**
+ * Manager for applying color transformations to the display.
+ */
+public class DisplayTransformManager {
+
+ private static final String TAG = "DisplayTransformManager";
+
+ /**
+ * Color transform level used by Night display to tint the display red.
+ */
+ public static final int LEVEL_COLOR_MATRIX_NIGHT_DISPLAY = 100;
+ /**
+ * Color transform level used by A11y services to make the display monochromatic.
+ */
+ public static final int LEVEL_COLOR_MATRIX_GRAYSCALE = 200;
+ /**
+ * Color transform level used by A11y services to invert the display colors.
+ */
+ public static final int LEVEL_COLOR_MATRIX_INVERT_COLOR = 300;
+
+ /**
+ * Map of level -> color transformation matrix.
+ */
+ @GuardedBy("mColorMatrix")
+ private final SparseArray<float[]> mColorMatrix = new SparseArray<>(3);
+ /**
+ * Temporary matrix used internally by {@link #computeColorMatrixLocked()}.
+ */
+ @GuardedBy("mColorMatrix")
+ private final float[][] mTempColorMatrix = new float[2][16];
+
+ /**
+ * Lock used for synchronize access to {@link #mDaltonizerMode}.
+ */
+ private final Object mDaltonizerModeLock = new Object();
+ @GuardedBy("mDaltonizerModeLock")
+ private int mDaltonizerMode = -1;
+
+ /* package */ DisplayTransformManager() {
+ }
+
+ /**
+ * Returns a copy of the color transform matrix set for a given level.
+ */
+ public float[] getColorMatrix(int key) {
+ synchronized (mColorMatrix) {
+ final float[] value = mColorMatrix.get(key);
+ return value == null ? null : Arrays.copyOf(value, value.length);
+ }
+ }
+
+ /**
+ * Sets and applies a current color transform matrix for a given level.
+ * <p>
+ * Note: all color transforms are first composed to a single matrix in ascending order based
+ * on level before being applied to the display.
+ *
+ * @param level the level used to identify and compose the color transform (low -> high)
+ * @param value the 4x4 color transform matrix (in column-major order), or {@code null} to
+ * remove the color transform matrix associated with the provided level
+ */
+ public void setColorMatrix(int level, float[] value) {
+ if (value != null && value.length != 16) {
+ throw new IllegalArgumentException("Expected length: 16 (4x4 matrix)"
+ + ", actual length: " + value.length);
+ }
+
+ synchronized (mColorMatrix) {
+ final float[] oldValue = mColorMatrix.get(level);
+ if (!Arrays.equals(oldValue, value)) {
+ if (value == null) {
+ mColorMatrix.remove(level);
+ } else if (oldValue == null) {
+ mColorMatrix.put(level, Arrays.copyOf(value, value.length));
+ } else {
+ System.arraycopy(value, 0, oldValue, 0, value.length);
+ }
+
+ // Update the current color transform.
+ applyColorMatrix(computeColorMatrixLocked());
+ }
+ }
+ }
+
+ /**
+ * Returns the composition of all current color matrices, or {@code null} if there are none.
+ */
+ @GuardedBy("mColorMatrix")
+ private float[] computeColorMatrixLocked() {
+ final int count = mColorMatrix.size();
+ if (count == 0) {
+ return null;
+ }
+
+ final float[][] result = mTempColorMatrix;
+ Matrix.setIdentityM(result[0], 0);
+ for (int i = 0; i < count; i++) {
+ float[] rhs = mColorMatrix.valueAt(i);
+ Matrix.multiplyMM(result[(i + 1) % 2], 0, result[i % 2], 0, rhs, 0);
+ }
+ return result[count % 2];
+ }
+
+ /**
+ * Returns the current Daltonization mode.
+ */
+ public int getDaltonizerMode() {
+ synchronized (mDaltonizerModeLock) {
+ return mDaltonizerMode;
+ }
+ }
+
+ /**
+ * Sets the current Daltonization mode. This adjusts the color space to correct for or simulate
+ * various types of color blindness.
+ *
+ * @param mode the new Daltonization mode, or -1 to disable
+ */
+ public void setDaltonizerMode(int mode) {
+ synchronized (mDaltonizerModeLock) {
+ if (mDaltonizerMode != mode) {
+ mDaltonizerMode = mode;
+ applyDaltonizerMode(mode);
+ }
+ }
+ }
+
+ /**
+ * Propagates the provided color transformation matrix to the SurfaceFlinger.
+ */
+ private static void applyColorMatrix(float[] m) {
+ final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
+ if (flinger != null) {
+ final Parcel data = Parcel.obtain();
+ data.writeInterfaceToken("android.ui.ISurfaceComposer");
+ if (m != null) {
+ data.writeInt(1);
+ for (int i = 0; i < 16; i++) {
+ data.writeFloat(m[i]);
+ }
+ } else {
+ data.writeInt(0);
+ }
+ try {
+ flinger.transact(1015, data, null, 0);
+ } catch (RemoteException ex) {
+ Slog.e(TAG, "Failed to set color transform", ex);
+ } finally {
+ data.recycle();
+ }
+ }
+ }
+
+ /**
+ * Propagates the provided Daltonization mode to the SurfaceFlinger.
+ */
+ private static void applyDaltonizerMode(int mode) {
+ final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
+ if (flinger != null) {
+ final Parcel data = Parcel.obtain();
+ data.writeInterfaceToken("android.ui.ISurfaceComposer");
+ data.writeInt(mode);
+ try {
+ flinger.transact(1014, data, null, 0);
+ } catch (RemoteException ex) {
+ Slog.e(TAG, "Failed to set Daltonizer mode", ex);
+ } finally {
+ data.recycle();
+ }
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index ebba354..61c2eac 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -39,6 +39,8 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
/**
* A display adapter for the local displays managed by Surface Flinger.
@@ -100,14 +102,25 @@
builtInDisplayId);
return;
}
+ int activeColorMode = SurfaceControl.getActiveColorMode(displayToken);
+ if (activeColorMode < 0) {
+ // We failed to get the active color mode. We don't bail out here since on the next
+ // configuration pass we'll go ahead and set it to whatever it was set to last (or
+ // COLOR_MODE_NATIVE if this is the first configuration).
+ Slog.w(TAG, "Unable to get active color mode for display device " +
+ builtInDisplayId);
+ activeColorMode = Display.COLOR_MODE_INVALID;
+ }
+ int[] colorModes = SurfaceControl.getDisplayColorModes(displayToken);
LocalDisplayDevice device = mDevices.get(builtInDisplayId);
if (device == null) {
// Display was added.
device = new LocalDisplayDevice(displayToken, builtInDisplayId,
- configs, activeConfig);
+ configs, activeConfig, colorModes, activeColorMode);
mDevices.put(builtInDisplayId, device);
sendDisplayDeviceEventLocked(device, DISPLAY_DEVICE_EVENT_ADDED);
- } else if (device.updatePhysicalDisplayInfoLocked(configs, activeConfig)) {
+ } else if (device.updatePhysicalDisplayInfoLocked(configs, activeConfig,
+ colorModes, activeColorMode)) {
// Display properties changed.
sendDisplayDeviceEventLocked(device, DISPLAY_DEVICE_EVENT_CHANGED);
}
@@ -144,8 +157,7 @@
private final int mBuiltInDisplayId;
private final Light mBacklight;
private final SparseArray<DisplayModeRecord> mSupportedModes = new SparseArray<>();
- private final SparseArray<Display.ColorTransform> mSupportedColorTransforms =
- new SparseArray<>();
+ private final ArrayList<Integer> mSupportedColorModes = new ArrayList<>();
private DisplayDeviceInfo mInfo;
private boolean mHavePendingChanges;
@@ -155,18 +167,20 @@
private int mDefaultModeId;
private int mActiveModeId;
private boolean mActiveModeInvalid;
- private int mDefaultColorTransformId;
- private int mActiveColorTransformId;
- private boolean mActiveColorTransformInvalid;
+ private int mActiveColorMode;
+ private boolean mActiveColorModeInvalid;
private Display.HdrCapabilities mHdrCapabilities;
private SurfaceControl.PhysicalDisplayInfo mDisplayInfos[];
public LocalDisplayDevice(IBinder displayToken, int builtInDisplayId,
- SurfaceControl.PhysicalDisplayInfo[] physicalDisplayInfos, int activeDisplayInfo) {
+ SurfaceControl.PhysicalDisplayInfo[] physicalDisplayInfos, int activeDisplayInfo,
+ int[] colorModes, int activeColorMode) {
super(LocalDisplayAdapter.this, displayToken, UNIQUE_ID_PREFIX + builtInDisplayId);
mBuiltInDisplayId = builtInDisplayId;
- updatePhysicalDisplayInfoLocked(physicalDisplayInfos, activeDisplayInfo);
+ updatePhysicalDisplayInfoLocked(physicalDisplayInfos, activeDisplayInfo,
+ colorModes, activeColorMode);
+ updateColorModesLocked(colorModes, activeColorMode);
if (mBuiltInDisplayId == SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN) {
LightsManager lights = LocalServices.getService(LightsManager.class);
mBacklight = lights.getLight(LightsManager.LIGHT_ID_BACKLIGHT);
@@ -176,42 +190,16 @@
mHdrCapabilities = SurfaceControl.getHdrCapabilities(displayToken);
}
+ @Override
+ public boolean hasStableUniqueId() {
+ return true;
+ }
+
public boolean updatePhysicalDisplayInfoLocked(
- SurfaceControl.PhysicalDisplayInfo[] physicalDisplayInfos, int activeDisplayInfo) {
+ SurfaceControl.PhysicalDisplayInfo[] physicalDisplayInfos, int activeDisplayInfo,
+ int[] colorModes, int activeColorMode) {
mDisplayInfos = Arrays.copyOf(physicalDisplayInfos, physicalDisplayInfos.length);
mActivePhysIndex = activeDisplayInfo;
- ArrayList<Display.ColorTransform> colorTransforms = new ArrayList<>();
-
- // Build an updated list of all existing color transforms.
- boolean colorTransformsAdded = false;
- Display.ColorTransform activeColorTransform = null;
- for (int i = 0; i < physicalDisplayInfos.length; i++) {
- SurfaceControl.PhysicalDisplayInfo info = physicalDisplayInfos[i];
- // First check to see if we've already added this color transform
- boolean existingMode = false;
- for (int j = 0; j < colorTransforms.size(); j++) {
- if (colorTransforms.get(j).getColorTransform() == info.colorTransform) {
- existingMode = true;
- if (i == activeDisplayInfo) {
- activeColorTransform = colorTransforms.get(j);
- }
- break;
- }
- }
- if (existingMode) {
- continue;
- }
- Display.ColorTransform colorTransform = findColorTransform(info);
- if (colorTransform == null) {
- colorTransform = createColorTransform(info.colorTransform);
- colorTransformsAdded = true;
- }
- colorTransforms.add(colorTransform);
- if (i == activeDisplayInfo) {
- activeColorTransform = colorTransform;
- }
- }
-
// Build an updated list of all existing modes.
ArrayList<DisplayModeRecord> records = new ArrayList<DisplayModeRecord>();
boolean modesAdded = false;
@@ -257,21 +245,10 @@
mActiveModeInvalid = true;
sendTraversalRequestLocked();
}
- // Check whether surface flinger spontaneously changed color transforms out from under
- // us.
- if (mActiveColorTransformId != 0
- && mActiveColorTransformId != activeColorTransform.getId()) {
- mActiveColorTransformInvalid = true;
- sendTraversalRequestLocked();
- }
- boolean colorTransformsChanged =
- colorTransforms.size() != mSupportedColorTransforms.size()
- || colorTransformsAdded;
boolean recordsChanged = records.size() != mSupportedModes.size() || modesAdded;
- // If neither the records nor the supported color transforms have changed then we're
- // done here.
- if (!recordsChanged && !colorTransformsChanged) {
+ // If the records haven't changed then we're done here.
+ if (!recordsChanged) {
return false;
}
// Update the index of modes.
@@ -281,24 +258,13 @@
for (DisplayModeRecord record : records) {
mSupportedModes.put(record.mMode.getModeId(), record);
}
- mSupportedColorTransforms.clear();
- for (Display.ColorTransform colorTransform : colorTransforms) {
- mSupportedColorTransforms.put(colorTransform.getId(), colorTransform);
- }
-
- // Update the default mode and color transform if needed. This needs to be done in
- // tandem so we always have a default state to fall back to.
- if (findDisplayInfoIndexLocked(mDefaultColorTransformId, mDefaultModeId) < 0) {
+ // Update the default mode, if needed.
+ if (findDisplayInfoIndexLocked(mDefaultModeId) < 0) {
if (mDefaultModeId != 0) {
Slog.w(TAG, "Default display mode no longer available, using currently"
+ " active mode as default.");
}
mDefaultModeId = activeRecord.mMode.getModeId();
- if (mDefaultColorTransformId != 0) {
- Slog.w(TAG, "Default color transform no longer available, using currently"
- + " active color transform as default");
- }
- mDefaultColorTransformId = activeColorTransform.getId();
}
// Determine whether the active mode is still there.
if (mSupportedModes.indexOfKey(mActiveModeId) < 0) {
@@ -310,20 +276,62 @@
mActiveModeInvalid = true;
}
- // Determine whether the active color transform is still there.
- if (mSupportedColorTransforms.indexOfKey(mActiveColorTransformId) < 0) {
- if (mActiveColorTransformId != 0) {
- Slog.w(TAG, "Active color transform no longer available, reverting"
- + " to default transform.");
- }
- mActiveColorTransformId = mDefaultColorTransformId;
- mActiveColorTransformInvalid = true;
- }
// Schedule traversals so that we apply pending changes.
sendTraversalRequestLocked();
return true;
}
+ private boolean updateColorModesLocked(int[] colorModes,
+ int activeColorMode) {
+ List<Integer> pendingColorModes = new ArrayList<>();
+
+ // Build an updated list of all existing color modes.
+ boolean colorModesAdded = false;
+ for (int colorMode: colorModes) {
+ if (!mSupportedColorModes.contains(colorMode)) {
+ colorModesAdded = true;
+ }
+ pendingColorModes.add(colorMode);
+ }
+
+ boolean colorModesChanged =
+ pendingColorModes.size() != mSupportedColorModes.size()
+ || colorModesAdded;
+
+ // If the supported color modes haven't changed then we're done here.
+ if (!colorModesChanged) {
+ return false;
+ }
+
+ mHavePendingChanges = true;
+
+ mSupportedColorModes.clear();
+ mSupportedColorModes.addAll(pendingColorModes);
+ Collections.sort(mSupportedColorModes);
+
+ // Determine whether the active color mode is still there.
+ if (!mSupportedColorModes.contains(mActiveColorMode)) {
+ if (mActiveColorMode != 0) {
+ Slog.w(TAG, "Active color mode no longer available, reverting"
+ + " to default mode.");
+ mActiveColorMode = Display.COLOR_MODE_DEFAULT;
+ mActiveColorModeInvalid = true;
+ } else {
+ if (!mSupportedColorModes.isEmpty()) {
+ // This should never happen.
+ Slog.e(TAG, "Default and active color mode is no longer available!"
+ + " Reverting to first available mode.");
+ mActiveColorMode = mSupportedColorModes.get(0);
+ mActiveColorModeInvalid = true;
+ } else {
+ // This should really never happen.
+ Slog.e(TAG, "No color modes available!");
+ }
+ }
+ }
+ return true;
+ }
+
private DisplayModeRecord findDisplayModeRecord(SurfaceControl.PhysicalDisplayInfo info) {
for (int i = 0; i < mSupportedModes.size(); i++) {
DisplayModeRecord record = mSupportedModes.valueAt(i);
@@ -334,16 +342,6 @@
return null;
}
- private Display.ColorTransform findColorTransform(SurfaceControl.PhysicalDisplayInfo info) {
- for (int i = 0; i < mSupportedColorTransforms.size(); i++) {
- Display.ColorTransform transform = mSupportedColorTransforms.valueAt(i);
- if (transform.getColorTransform() == info.colorTransform) {
- return transform;
- }
- }
- return null;
- }
-
@Override
public void applyPendingDisplayDeviceInfoChangesLocked() {
if (mHavePendingChanges) {
@@ -366,12 +364,11 @@
DisplayModeRecord record = mSupportedModes.valueAt(i);
mInfo.supportedModes[i] = record.mMode;
}
- mInfo.colorTransformId = mActiveColorTransformId;
- mInfo.defaultColorTransformId = mDefaultColorTransformId;
- mInfo.supportedColorTransforms =
- new Display.ColorTransform[mSupportedColorTransforms.size()];
- for (int i = 0; i < mSupportedColorTransforms.size(); i++) {
- mInfo.supportedColorTransforms[i] = mSupportedColorTransforms.valueAt(i);
+ mInfo.colorMode = mActiveColorMode;
+ mInfo.supportedColorModes =
+ new int[mSupportedColorModes.size()];
+ for (int i = 0; i < mSupportedColorModes.size(); i++) {
+ mInfo.supportedColorModes[i] = mSupportedColorModes.get(i);
}
mInfo.hdrCapabilities = mHdrCapabilities;
mInfo.appVsyncOffsetNanos = phys.appVsyncOffsetNanos;
@@ -523,8 +520,15 @@
}
@Override
- public void requestColorTransformAndModeInTransactionLocked(
- int colorTransformId, int modeId) {
+ public void requestDisplayModesInTransactionLocked(
+ int colorMode, int modeId) {
+ if (requestModeInTransactionLocked(modeId) ||
+ requestColorModeInTransactionLocked(colorMode)) {
+ updateDeviceInfoLocked();
+ }
+ }
+
+ public boolean requestModeInTransactionLocked(int modeId) {
if (modeId == 0) {
modeId = mDefaultModeId;
} else if (mSupportedModes.indexOfKey(modeId) < 0) {
@@ -533,37 +537,36 @@
modeId = mDefaultModeId;
}
- if (colorTransformId == 0) {
- colorTransformId = mDefaultColorTransformId;
- } else if (mSupportedColorTransforms.indexOfKey(colorTransformId) < 0) {
- Slog.w(TAG, "Requested color transform " + colorTransformId + " is not supported"
- + " by this display, reverting to the default color transform");
- colorTransformId = mDefaultColorTransformId;
- }
- int physIndex = findDisplayInfoIndexLocked(colorTransformId, modeId);
+ int physIndex = findDisplayInfoIndexLocked(modeId);
if (physIndex < 0) {
- Slog.w(TAG, "Requested color transform, mode ID pair (" + colorTransformId + ", "
- + modeId + ") not available, trying color transform with default mode ID");
+ Slog.w(TAG, "Requested mode ID " + modeId + " not available,"
+ + " trying with default mode ID");
modeId = mDefaultModeId;
- physIndex = findDisplayInfoIndexLocked(colorTransformId, modeId);
- if (physIndex < 0) {
- Slog.w(TAG, "Requested color transform with default mode ID still not"
- + " available, falling back to default color transform with default"
- + " mode.");
- colorTransformId = mDefaultColorTransformId;
- physIndex = findDisplayInfoIndexLocked(colorTransformId, modeId);
- }
+ physIndex = findDisplayInfoIndexLocked(modeId);
}
if (mActivePhysIndex == physIndex) {
- return;
+ return false;
}
SurfaceControl.setActiveConfig(getDisplayTokenLocked(), physIndex);
mActivePhysIndex = physIndex;
mActiveModeId = modeId;
mActiveModeInvalid = false;
- mActiveColorTransformId = colorTransformId;
- mActiveColorTransformInvalid = false;
- updateDeviceInfoLocked();
+ return true;
+ }
+
+ public boolean requestColorModeInTransactionLocked(int colorMode) {
+ if (mActiveColorMode == colorMode) {
+ return false;
+ }
+ if (!mSupportedColorModes.contains(colorMode)) {
+ Slog.w(TAG, "Unable to find color mode " + colorMode
+ + ", ignoring request.");
+ return false;
+ }
+ SurfaceControl.setActiveColorMode(getDisplayTokenLocked(), colorMode);
+ mActiveColorMode = colorMode;
+ mActiveColorModeInvalid = false;
+ return true;
}
@Override
@@ -572,7 +575,7 @@
pw.println("mBuiltInDisplayId=" + mBuiltInDisplayId);
pw.println("mActivePhysIndex=" + mActivePhysIndex);
pw.println("mActiveModeId=" + mActiveModeId);
- pw.println("mActiveColorTransformId=" + mActiveColorTransformId);
+ pw.println("mActiveColorMode=" + mActiveColorMode);
pw.println("mState=" + Display.stateToString(mState));
pw.println("mBrightness=" + mBrightness);
pw.println("mBacklight=" + mBacklight);
@@ -584,24 +587,22 @@
for (int i = 0; i < mSupportedModes.size(); i++) {
pw.println(" " + mSupportedModes.valueAt(i));
}
- pw.println("mSupportedColorTransforms=[");
- for (int i = 0; i < mSupportedColorTransforms.size(); i++) {
+ pw.print("mSupportedColorModes=[");
+ for (int i = 0; i < mSupportedColorModes.size(); i++) {
if (i != 0) {
pw.print(", ");
}
- pw.print(mSupportedColorTransforms.valueAt(i));
+ pw.print(mSupportedColorModes.get(i));
}
pw.println("]");
}
- private int findDisplayInfoIndexLocked(int colorTransformId, int modeId) {
+ private int findDisplayInfoIndexLocked(int modeId) {
DisplayModeRecord record = mSupportedModes.get(modeId);
- Display.ColorTransform transform = mSupportedColorTransforms.get(colorTransformId);
- if (record != null && transform != null) {
+ if (record != null) {
for (int i = 0; i < mDisplayInfos.length; i++) {
SurfaceControl.PhysicalDisplayInfo info = mDisplayInfos[i];
- if (info.colorTransform == transform.getColorTransform()
- && record.hasMatchingMode(info)){
+ if (record.hasMatchingMode(info)){
return i;
}
}
diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java
index 973f04c..287a25a 100644
--- a/services/core/java/com/android/server/display/LogicalDisplay.java
+++ b/services/core/java/com/android/server/display/LogicalDisplay.java
@@ -74,7 +74,7 @@
private boolean mHasContent;
private int mRequestedModeId;
- private int mRequestedColorTransformId;
+ private int mRequestedColorMode;
// The display offsets to apply to the display projection.
private int mDisplayOffsetX;
@@ -236,11 +236,10 @@
mBaseDisplayInfo.defaultModeId = deviceInfo.defaultModeId;
mBaseDisplayInfo.supportedModes = Arrays.copyOf(
deviceInfo.supportedModes, deviceInfo.supportedModes.length);
- mBaseDisplayInfo.colorTransformId = deviceInfo.colorTransformId;
- mBaseDisplayInfo.defaultColorTransformId = deviceInfo.defaultColorTransformId;
- mBaseDisplayInfo.supportedColorTransforms = Arrays.copyOf(
- deviceInfo.supportedColorTransforms,
- deviceInfo.supportedColorTransforms.length);
+ mBaseDisplayInfo.colorMode = deviceInfo.colorMode;
+ mBaseDisplayInfo.supportedColorModes = Arrays.copyOf(
+ deviceInfo.supportedColorModes,
+ deviceInfo.supportedColorModes.length);
mBaseDisplayInfo.hdrCapabilities = deviceInfo.hdrCapabilities;
mBaseDisplayInfo.logicalDensityDpi = deviceInfo.densityDpi;
mBaseDisplayInfo.physicalXDpi = deviceInfo.xDpi;
@@ -282,12 +281,12 @@
// Set the layer stack.
device.setLayerStackInTransactionLocked(isBlanked ? BLANK_LAYER_STACK : mLayerStack);
- // Set the color transform and mode.
+ // Set the color mode and mode.
if (device == mPrimaryDisplayDevice) {
- device.requestColorTransformAndModeInTransactionLocked(
- mRequestedColorTransformId, mRequestedModeId);
+ device.requestDisplayModesInTransactionLocked(
+ mRequestedColorMode, mRequestedModeId);
} else {
- device.requestColorTransformAndModeInTransactionLocked(0, 0); // Revert to default.
+ device.requestDisplayModesInTransactionLocked(0, 0); // Revert to default.
}
// Only grab the display info now as it may have been changed based on the requests above.
@@ -391,15 +390,15 @@
}
/**
- * Requests the given color transform.
+ * Requests the given color mode.
*/
- public void setRequestedColorTransformIdLocked(int colorTransformId) {
- mRequestedColorTransformId = colorTransformId;
+ public void setRequestedColorModeLocked(int colorMode) {
+ mRequestedColorMode = colorMode;
}
- /** Returns the pending requested color transform. */
- public int getRequestedColorTransformIdLocked() {
- return mRequestedColorTransformId;
+ /** Returns the pending requested color mode. */
+ public int getRequestedColorModeLocked() {
+ return mRequestedColorMode;
}
/**
@@ -429,7 +428,7 @@
pw.println("mLayerStack=" + mLayerStack);
pw.println("mHasContent=" + mHasContent);
pw.println("mRequestedMode=" + mRequestedModeId);
- pw.println("mRequestedColorTransformId=" + mRequestedColorTransformId);
+ pw.println("mRequestedColorMode=" + mRequestedColorMode);
pw.println("mDisplayOffset=(" + mDisplayOffsetX + ", " + mDisplayOffsetY + ")");
pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null ?
mPrimaryDisplayDevice.getNameLocked() : "null"));
diff --git a/services/core/java/com/android/server/display/NightDisplayService.java b/services/core/java/com/android/server/display/NightDisplayService.java
new file mode 100644
index 0000000..39498a6
--- /dev/null
+++ b/services/core/java/com/android/server/display/NightDisplayService.java
@@ -0,0 +1,483 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.display;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TypeEvaluator;
+import android.animation.ValueAnimator;
+import android.app.AlarmManager;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.opengl.Matrix;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings.Secure;
+import android.util.MathUtils;
+import android.util.Slog;
+import android.view.animation.AnimationUtils;
+
+import com.android.internal.app.NightDisplayController;
+import com.android.server.SystemService;
+import com.android.server.twilight.TwilightListener;
+import com.android.server.twilight.TwilightManager;
+import com.android.server.twilight.TwilightState;
+
+import java.util.Calendar;
+import java.util.TimeZone;
+
+import static com.android.server.display.DisplayTransformManager.LEVEL_COLOR_MATRIX_NIGHT_DISPLAY;
+
+/**
+ * Tints the display at night.
+ */
+public final class NightDisplayService extends SystemService
+ implements NightDisplayController.Callback {
+
+ private static final String TAG = "NightDisplayService";
+ private static final boolean DEBUG = false;
+
+ /**
+ * Night display ~= 3400 K.
+ */
+ private static final float[] MATRIX_NIGHT = new float[] {
+ 1, 0, 0, 0,
+ 0, 0.754f, 0, 0,
+ 0, 0, 0.516f, 0,
+ 0, 0, 0, 1
+ };
+
+ /**
+ * The identity matrix, used if one of the given matrices is {@code null}.
+ */
+ private static final float[] MATRIX_IDENTITY = new float[16];
+ static {
+ Matrix.setIdentityM(MATRIX_IDENTITY, 0);
+ }
+
+ /**
+ * Evaluator used to animate color matrix transitions.
+ */
+ private static final ColorMatrixEvaluator COLOR_MATRIX_EVALUATOR = new ColorMatrixEvaluator();
+
+ private final Handler mHandler;
+
+ private int mCurrentUser = UserHandle.USER_NULL;
+ private ContentObserver mUserSetupObserver;
+ private boolean mBootCompleted;
+
+ private NightDisplayController mController;
+ private ValueAnimator mColorMatrixAnimator;
+ private Boolean mIsActivated;
+ private AutoMode mAutoMode;
+
+ public NightDisplayService(Context context) {
+ super(context);
+ mHandler = new Handler(Looper.getMainLooper());
+ }
+
+ @Override
+ public void onStart() {
+ // Nothing to publish.
+ }
+
+ @Override
+ public void onBootPhase(int phase) {
+ if (phase == PHASE_BOOT_COMPLETED) {
+ mBootCompleted = true;
+
+ // Register listeners now that boot is complete.
+ if (mCurrentUser != UserHandle.USER_NULL && mUserSetupObserver == null) {
+ setUp();
+ }
+ }
+ }
+
+ @Override
+ public void onStartUser(int userHandle) {
+ super.onStartUser(userHandle);
+
+ if (mCurrentUser == UserHandle.USER_NULL) {
+ onUserChanged(userHandle);
+ }
+ }
+
+ @Override
+ public void onSwitchUser(int userHandle) {
+ super.onSwitchUser(userHandle);
+
+ onUserChanged(userHandle);
+ }
+
+ @Override
+ public void onStopUser(int userHandle) {
+ super.onStopUser(userHandle);
+
+ if (mCurrentUser == userHandle) {
+ onUserChanged(UserHandle.USER_NULL);
+ }
+ }
+
+ private void onUserChanged(int userHandle) {
+ final ContentResolver cr = getContext().getContentResolver();
+
+ if (mCurrentUser != UserHandle.USER_NULL) {
+ if (mUserSetupObserver != null) {
+ cr.unregisterContentObserver(mUserSetupObserver);
+ mUserSetupObserver = null;
+ } else if (mBootCompleted) {
+ tearDown();
+ }
+ }
+
+ mCurrentUser = userHandle;
+
+ if (mCurrentUser != UserHandle.USER_NULL) {
+ if (!isUserSetupCompleted(cr, mCurrentUser)) {
+ mUserSetupObserver = new ContentObserver(mHandler) {
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ if (isUserSetupCompleted(cr, mCurrentUser)) {
+ cr.unregisterContentObserver(this);
+ mUserSetupObserver = null;
+
+ if (mBootCompleted) {
+ setUp();
+ }
+ }
+ }
+ };
+ cr.registerContentObserver(Secure.getUriFor(Secure.USER_SETUP_COMPLETE),
+ false /* notifyForDescendents */, mUserSetupObserver, mCurrentUser);
+ } else if (mBootCompleted) {
+ setUp();
+ }
+ }
+ }
+
+ private static boolean isUserSetupCompleted(ContentResolver cr, int userHandle) {
+ return Secure.getIntForUser(cr, Secure.USER_SETUP_COMPLETE, 0, userHandle) == 1;
+ }
+
+ private void setUp() {
+ // Create a new controller for the current user and start listening for changes.
+ mController = new NightDisplayController(getContext(), mCurrentUser);
+ mController.setListener(this);
+
+ // Initialize the current auto mode.
+ onAutoModeChanged(mController.getAutoMode());
+
+ // Force the initialization current activated state.
+ if (mIsActivated == null) {
+ onActivated(mController.isActivated());
+ }
+ }
+
+ private void tearDown() {
+ if (mController != null) {
+ mController.setListener(null);
+ mController = null;
+ }
+
+ if (mAutoMode != null) {
+ mAutoMode.onStop();
+ mAutoMode = null;
+ }
+
+ if (mColorMatrixAnimator != null) {
+ mColorMatrixAnimator.end();
+ mColorMatrixAnimator = null;
+ }
+
+ mIsActivated = null;
+ }
+
+ @Override
+ public void onActivated(boolean activated) {
+ if (mIsActivated == null || mIsActivated != activated) {
+ Slog.i(TAG, activated ? "Turning on night display" : "Turning off night display");
+
+ mIsActivated = activated;
+
+ if (mAutoMode != null) {
+ mAutoMode.onActivated(activated);
+ }
+
+ // Cancel the old animator if still running.
+ if (mColorMatrixAnimator != null) {
+ mColorMatrixAnimator.cancel();
+ }
+
+ final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class);
+ final float[] from = dtm.getColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY);
+ final float[] to = mIsActivated ? MATRIX_NIGHT : null;
+
+ mColorMatrixAnimator = ValueAnimator.ofObject(COLOR_MATRIX_EVALUATOR,
+ from == null ? MATRIX_IDENTITY : from, to == null ? MATRIX_IDENTITY : to);
+ mColorMatrixAnimator.setDuration(getContext().getResources()
+ .getInteger(android.R.integer.config_longAnimTime));
+ mColorMatrixAnimator.setInterpolator(AnimationUtils.loadInterpolator(
+ getContext(), android.R.interpolator.fast_out_slow_in));
+ mColorMatrixAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animator) {
+ final float[] value = (float[]) animator.getAnimatedValue();
+ dtm.setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, value);
+ }
+ });
+ mColorMatrixAnimator.addListener(new AnimatorListenerAdapter() {
+
+ private boolean mIsCancelled;
+
+ @Override
+ public void onAnimationCancel(Animator animator) {
+ mIsCancelled = true;
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animator) {
+ if (!mIsCancelled) {
+ // Ensure final color matrix is set at the end of the animation. If the
+ // animation is cancelled then don't set the final color matrix so the new
+ // animator can pick up from where this one left off.
+ dtm.setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, to);
+ }
+ mColorMatrixAnimator = null;
+ }
+ });
+ mColorMatrixAnimator.start();
+ }
+ }
+
+ @Override
+ public void onAutoModeChanged(int autoMode) {
+ if (mAutoMode != null) {
+ mAutoMode.onStop();
+ mAutoMode = null;
+ }
+
+ if (autoMode == NightDisplayController.AUTO_MODE_CUSTOM) {
+ mAutoMode = new CustomAutoMode();
+ } else if (autoMode == NightDisplayController.AUTO_MODE_TWILIGHT) {
+ mAutoMode = new TwilightAutoMode();
+ }
+
+ if (mAutoMode != null) {
+ mAutoMode.onStart();
+ }
+ }
+
+ @Override
+ public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {
+ if (mAutoMode != null) {
+ mAutoMode.onCustomStartTimeChanged(startTime);
+ }
+ }
+
+ @Override
+ public void onCustomEndTimeChanged(NightDisplayController.LocalTime endTime) {
+ if (mAutoMode != null) {
+ mAutoMode.onCustomEndTimeChanged(endTime);
+ }
+ }
+
+ private abstract class AutoMode implements NightDisplayController.Callback {
+ public abstract void onStart();
+ public abstract void onStop();
+ }
+
+ private class CustomAutoMode extends AutoMode implements AlarmManager.OnAlarmListener {
+
+ private final AlarmManager mAlarmManager;
+ private final BroadcastReceiver mTimeChangedReceiver;
+
+ private NightDisplayController.LocalTime mStartTime;
+ private NightDisplayController.LocalTime mEndTime;
+
+ private Calendar mLastActivatedTime;
+
+ public CustomAutoMode() {
+ mAlarmManager = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE);
+ mTimeChangedReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ updateActivated();
+ }
+ };
+ }
+
+ private void updateActivated() {
+ final Calendar now = Calendar.getInstance();
+ final Calendar startTime = mStartTime.getDateTimeBefore(now);
+ final Calendar endTime = mEndTime.getDateTimeAfter(startTime);
+ final boolean activated = now.before(endTime);
+
+ boolean setActivated = mIsActivated == null || mLastActivatedTime == null;
+ if (!setActivated && mIsActivated != activated) {
+ final TimeZone currentTimeZone = now.getTimeZone();
+ if (!currentTimeZone.equals(mLastActivatedTime.getTimeZone())) {
+ final int year = mLastActivatedTime.get(Calendar.YEAR);
+ final int dayOfYear = mLastActivatedTime.get(Calendar.DAY_OF_YEAR);
+ final int hourOfDay = mLastActivatedTime.get(Calendar.HOUR_OF_DAY);
+ final int minute = mLastActivatedTime.get(Calendar.MINUTE);
+
+ mLastActivatedTime.setTimeZone(currentTimeZone);
+ mLastActivatedTime.set(Calendar.YEAR, year);
+ mLastActivatedTime.set(Calendar.DAY_OF_YEAR, dayOfYear);
+ mLastActivatedTime.set(Calendar.HOUR_OF_DAY, hourOfDay);
+ mLastActivatedTime.set(Calendar.MINUTE, minute);
+ }
+
+ if (mIsActivated) {
+ setActivated = now.before(mStartTime.getDateTimeBefore(mLastActivatedTime))
+ || now.after(mEndTime.getDateTimeAfter(mLastActivatedTime));
+ } else {
+ setActivated = now.before(mEndTime.getDateTimeBefore(mLastActivatedTime))
+ || now.after(mStartTime.getDateTimeAfter(mLastActivatedTime));
+ }
+ }
+
+ if (setActivated) {
+ mController.setActivated(activated);
+ }
+ updateNextAlarm();
+ }
+
+ private void updateNextAlarm() {
+ if (mIsActivated != null) {
+ final Calendar now = Calendar.getInstance();
+ final Calendar next = mIsActivated ? mEndTime.getDateTimeAfter(now)
+ : mStartTime.getDateTimeAfter(now);
+ mAlarmManager.setExact(AlarmManager.RTC, next.getTimeInMillis(), TAG, this, null);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ final IntentFilter intentFilter = new IntentFilter(Intent.ACTION_TIME_CHANGED);
+ intentFilter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+ getContext().registerReceiver(mTimeChangedReceiver, intentFilter);
+
+ mStartTime = mController.getCustomStartTime();
+ mEndTime = mController.getCustomEndTime();
+
+ // Force an update to initialize state.
+ updateActivated();
+ }
+
+ @Override
+ public void onStop() {
+ getContext().unregisterReceiver(mTimeChangedReceiver);
+
+ mAlarmManager.cancel(this);
+ mLastActivatedTime = null;
+ }
+
+ @Override
+ public void onActivated(boolean activated) {
+ mLastActivatedTime = Calendar.getInstance();
+ updateNextAlarm();
+ }
+
+ @Override
+ public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {
+ mStartTime = startTime;
+ mLastActivatedTime = null;
+ updateActivated();
+ }
+
+ @Override
+ public void onCustomEndTimeChanged(NightDisplayController.LocalTime endTime) {
+ mEndTime = endTime;
+ mLastActivatedTime = null;
+ updateActivated();
+ }
+
+ @Override
+ public void onAlarm() {
+ if (DEBUG) Slog.d(TAG, "onAlarm");
+ updateActivated();
+ }
+ }
+
+ private class TwilightAutoMode extends AutoMode implements TwilightListener {
+
+ private final TwilightManager mTwilightManager;
+
+ private boolean mIsNight;
+
+ public TwilightAutoMode() {
+ mTwilightManager = getLocalService(TwilightManager.class);
+ }
+
+ private void updateActivated() {
+ final TwilightState state = mTwilightManager.getCurrentState();
+ final boolean isNight = state != null && state.isNight();
+ if (mIsNight != isNight) {
+ mIsNight = isNight;
+
+ if (mIsActivated == null || mIsActivated != isNight) {
+ mController.setActivated(isNight);
+ }
+ }
+ }
+
+ @Override
+ public void onStart() {
+ mTwilightManager.registerListener(this, mHandler);
+
+ // Force an update to initialize state.
+ updateActivated();
+ }
+
+ @Override
+ public void onStop() {
+ mTwilightManager.unregisterListener(this);
+ }
+
+ @Override
+ public void onTwilightStateChanged() {
+ if (DEBUG) Slog.d(TAG, "onTwilightStateChanged");
+ updateActivated();
+ }
+ }
+
+ /**
+ * Interpolates between two 4x4 color transform matrices (in column-major order).
+ */
+ private static class ColorMatrixEvaluator implements TypeEvaluator<float[]> {
+
+ /**
+ * Result matrix returned by {@link #evaluate(float, float[], float[])}.
+ */
+ private final float[] mResultMatrix = new float[16];
+
+ @Override
+ public float[] evaluate(float fraction, float[] startValue, float[] endValue) {
+ for (int i = 0; i < mResultMatrix.length; i++) {
+ mResultMatrix[i] = MathUtils.lerp(startValue[i], endValue[i], fraction);
+ }
+ return mResultMatrix;
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/display/OverlayDisplayAdapter.java b/services/core/java/com/android/server/display/OverlayDisplayAdapter.java
index cf6264a..27327d4 100644
--- a/services/core/java/com/android/server/display/OverlayDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/OverlayDisplayAdapter.java
@@ -266,6 +266,11 @@
}
@Override
+ public boolean hasStableUniqueId() {
+ return false;
+ }
+
+ @Override
public void performTraversalInTransactionLocked() {
if (mSurfaceTexture != null) {
if (mSurface == null) {
@@ -310,7 +315,7 @@
}
@Override
- public void requestColorTransformAndModeInTransactionLocked(int color, int id) {
+ public void requestDisplayModesInTransactionLocked(int color, int id) {
int index = -1;
if (id == 0) {
// Use the default.
diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java
index d676b35..5616fb9 100644
--- a/services/core/java/com/android/server/display/PersistentDataStore.java
+++ b/services/core/java/com/android/server/display/PersistentDataStore.java
@@ -27,6 +27,7 @@
import android.util.AtomicFile;
import android.util.Slog;
import android.util.Xml;
+import android.view.Display;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -35,8 +36,11 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
import libcore.io.IoUtils;
import libcore.util.Objects;
@@ -50,8 +54,13 @@
* <display-manager-state>
* <remembered-wifi-displays>
* <wifi-display deviceAddress="00:00:00:00:00:00" deviceName="XXXX" deviceAlias="YYYY" />
- * >remembered-wifi-displays>
- * >/display-manager-state>
+ * <remembered-wifi-displays>
+ * <display-states>
+ * <display>
+ * <color-mode>0</color-mode>
+ * </display>
+ * </display-states>
+ * </display-manager-state>
* </code>
*
* TODO: refactor this to extract common code shared with the input manager's data store
@@ -62,6 +71,10 @@
// Remembered Wifi display devices.
private ArrayList<WifiDisplay> mRememberedWifiDisplays = new ArrayList<WifiDisplay>();
+ // Display state by unique id.
+ private final HashMap<String, DisplayState> mDisplayStates =
+ new HashMap<String, DisplayState>();
+
// The atomic file used to safely read or write the file.
private final AtomicFile mAtomicFile;
@@ -168,7 +181,41 @@
return -1;
}
- private void loadIfNeeded() {
+ public int getColorMode(DisplayDevice device) {
+ if (!device.hasStableUniqueId()) {
+ return Display.COLOR_MODE_DEFAULT;
+ }
+ DisplayState state = getDisplayState(device.getUniqueId(), false);
+ if (state == null) {
+ return Display.COLOR_MODE_DEFAULT;
+ }
+ return state.getColorMode();
+ }
+
+ public boolean setColorMode(DisplayDevice device, int colorMode) {
+ if (!device.hasStableUniqueId()) {
+ return false;
+ }
+ DisplayState state = getDisplayState(device.getUniqueId(), true);
+ if (state.setColorMode(colorMode)) {
+ setDirty();
+ return true;
+ }
+ return false;
+ }
+
+ private DisplayState getDisplayState(String uniqueId, boolean createIfAbsent) {
+ loadIfNeeded();
+ DisplayState state = mDisplayStates.get(uniqueId);
+ if (state == null && createIfAbsent) {
+ state = new DisplayState();
+ mDisplayStates.put(uniqueId, state);
+ setDirty();
+ }
+ return state;
+ }
+
+ public void loadIfNeeded() {
if (!mLoaded) {
load();
mLoaded = true;
@@ -240,6 +287,9 @@
if (parser.getName().equals("remembered-wifi-displays")) {
loadRememberedWifiDisplaysFromXml(parser);
}
+ if (parser.getName().equals("display-states")) {
+ loadDisplaysFromXml(parser);
+ }
}
}
@@ -267,6 +317,27 @@
}
}
+ private void loadDisplaysFromXml(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
+ final int outerDepth = parser.getDepth();
+ while (XmlUtils.nextElementWithin(parser, outerDepth)) {
+ if (parser.getName().equals("display")) {
+ String uniqueId = parser.getAttributeValue(null, "unique-id");
+ if (uniqueId == null) {
+ throw new XmlPullParserException(
+ "Missing unique-id attribute on display.");
+ }
+ if (mDisplayStates.containsKey(uniqueId)) {
+ throw new XmlPullParserException("Found duplicate display.");
+ }
+
+ DisplayState state = new DisplayState();
+ state.loadFromXml(parser);
+ mDisplayStates.put(uniqueId, state);
+ }
+ }
+ }
+
private void saveToXml(XmlSerializer serializer) throws IOException {
serializer.startDocument(null, true);
serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
@@ -282,7 +353,72 @@
serializer.endTag(null, "wifi-display");
}
serializer.endTag(null, "remembered-wifi-displays");
+ serializer.startTag(null, "display-states");
+ for (Map.Entry<String, DisplayState> entry : mDisplayStates.entrySet()) {
+ final String uniqueId = entry.getKey();
+ final DisplayState state = entry.getValue();
+ serializer.startTag(null, "display");
+ serializer.attribute(null, "unique-id", uniqueId);
+ state.saveToXml(serializer);
+ serializer.endTag(null, "display");
+ }
+ serializer.endTag(null, "display-states");
serializer.endTag(null, "display-manager-state");
serializer.endDocument();
}
+
+ public void dump(PrintWriter pw) {
+ pw.println("PersistentDataStore");
+ pw.println(" mLoaded=" + mLoaded);
+ pw.println(" mDirty=" + mDirty);
+ pw.println(" RememberedWifiDisplays:");
+ int i = 0;
+ for (WifiDisplay display : mRememberedWifiDisplays) {
+ pw.println(" " + i++ + ": " + display);
+ }
+ pw.println(" DisplayStates:");
+ i = 0;
+ for (Map.Entry<String, DisplayState> entry : mDisplayStates.entrySet()) {
+ pw.println(" " + i++ + ": " + entry.getKey());
+ entry.getValue().dump(pw, " ");
+ }
+ }
+
+ private static final class DisplayState {
+ private int mColorMode;
+
+ public boolean setColorMode(int colorMode) {
+ if (colorMode == mColorMode) {
+ return false;
+ }
+ mColorMode = colorMode;
+ return true;
+ }
+
+ public int getColorMode() {
+ return mColorMode;
+ }
+
+ public void loadFromXml(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
+ final int outerDepth = parser.getDepth();
+
+ while (XmlUtils.nextElementWithin(parser, outerDepth)) {
+ if (parser.getName().equals("color-mode")) {
+ String value = parser.nextText();
+ mColorMode = Integer.parseInt(value);
+ }
+ }
+ }
+
+ public void saveToXml(XmlSerializer serializer) throws IOException {
+ serializer.startTag(null, "color-mode");
+ serializer.text(Integer.toString(mColorMode));
+ serializer.endTag(null, "color-mode");
+ }
+
+ private void dump(final PrintWriter pw, final String prefix) {
+ pw.println(prefix + "ColorMode=" + mColorMode);
+ }
+ }
}
diff --git a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java
index 986efd69..9d0fde5 100644
--- a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java
@@ -225,6 +225,11 @@
}
@Override
+ public boolean hasStableUniqueId() {
+ return false;
+ }
+
+ @Override
public Runnable requestDisplayStateLocked(int state, int brightness) {
if (state != mDisplayState) {
mDisplayState = state;
diff --git a/services/core/java/com/android/server/display/WifiDisplayAdapter.java b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
index 64bc729..08c0a1a 100644
--- a/services/core/java/com/android/server/display/WifiDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
@@ -602,6 +602,11 @@
mMode = createMode(width, height, refreshRate);
}
+ @Override
+ public boolean hasStableUniqueId() {
+ return true;
+ }
+
public void destroyLocked() {
if (mSurface != null) {
mSurface.release();
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 14e4bc6..1066434 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -72,6 +72,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
/**
@@ -90,10 +91,17 @@
private static final String ACTION_LOCKOUT_RESET =
"com.android.server.fingerprint.ACTION_LOCKOUT_RESET";
+ private class PerformanceStats {
+ int accept; // number of accepted fingerprints
+ int reject; // number of rejected fingerprints
+ int acquire; // total number of acquisitions. Should be >= accept+reject due to poor image
+ // acquisition in some cases (too fast, too slow, dirty sensor, etc.)
+ int lockout; // total number of lockouts
+ }
+
private final ArrayList<FingerprintServiceLockoutResetMonitor> mLockoutMonitors =
new ArrayList<>();
private final AppOpsManager mAppOps;
-
private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30*1000;
private static final int MAX_FAILED_ATTEMPTS = 5;
private static final long CANCEL_TIMEOUT_LIMIT = 3000; // max wait for onCancel() from HAL,in ms
@@ -110,6 +118,15 @@
private ClientMonitor mCurrentClient;
private ClientMonitor mPendingClient;
private long mCurrentAuthenticatorId;
+ private PerformanceStats mPerformanceStats;
+
+ // Normal fingerprint authentications are tracked by mPerformanceMap.
+ private HashMap<Integer, PerformanceStats> mPerformanceMap
+ = new HashMap<Integer, PerformanceStats>();
+
+ // Transactions that make use of CryptoObjects are tracked by mCryptoPerformaceMap.
+ private HashMap<Integer, PerformanceStats> mCryptoPerformanceMap
+ = new HashMap<Integer, PerformanceStats>();
private Handler mHandler = new Handler() {
@Override
@@ -246,6 +263,11 @@
if (client != null && client.onAuthenticated(fingerId, groupId)) {
removeClient(client);
}
+ if (fingerId != 0) {
+ mPerformanceStats.accept++;
+ } else {
+ mPerformanceStats.reject++;
+ }
}
protected void handleAcquired(long deviceId, int acquiredInfo) {
@@ -253,6 +275,11 @@
if (client != null && client.onAcquired(acquiredInfo)) {
removeClient(client);
}
+ if (mPerformanceStats != null && !inLockoutMode()
+ && client instanceof AuthenticationClient) {
+ // ignore enrollment acquisitions or acquisitions when we're locked out
+ mPerformanceStats.acquire++;
+ }
}
protected void handleEnrollResult(long deviceId, int fingerId, int groupId, int remaining) {
@@ -505,6 +532,9 @@
@Override
public boolean handleFailedAttempt() {
mFailedAttempts++;
+ if (mFailedAttempts == MAX_FAILED_ATTEMPTS) {
+ mPerformanceStats.lockout++;
+ }
if (inLockoutMode()) {
// Failing multiple times will continue to push out the lockout time.
scheduleLockoutReset();
@@ -742,12 +772,24 @@
mHandler.post(new Runnable() {
@Override
public void run() {
- MetricsLogger.histogram(mContext, "fingerprint_token", opId != 0L ? 1 : 0);
if (!canUseFingerprint(opPackageName, true /* foregroundOnly */,
callingUid, pid)) {
if (DEBUG) Slog.v(TAG, "authenticate(): reject " + opPackageName);
return;
}
+
+ MetricsLogger.histogram(mContext, "fingerprint_token", opId != 0L ? 1 : 0);
+
+ // Get performance stats object for this user.
+ HashMap<Integer, PerformanceStats> pmap
+ = (opId == 0) ? mPerformanceMap : mCryptoPerformanceMap;
+ PerformanceStats stats = pmap.get(mCurrentUserId);
+ if (stats == null) {
+ stats = new PerformanceStats();
+ pmap.put(mCurrentUserId, stats);
+ }
+ mPerformanceStats = stats;
+
startAuthentication(token, opId, callingUserId, groupId, receiver,
flags, restricted, opPackageName);
}
@@ -924,9 +966,21 @@
for (UserInfo user : UserManager.get(getContext()).getUsers()) {
final int userId = user.getUserHandle().getIdentifier();
final int N = mFingerprintUtils.getFingerprintsForUser(mContext, userId).size();
+ PerformanceStats stats = mPerformanceMap.get(userId);
+ PerformanceStats cryptoStats = mCryptoPerformanceMap.get(userId);
JSONObject set = new JSONObject();
set.put("id", userId);
set.put("count", N);
+ set.put("accept", (stats != null) ? stats.accept : 0);
+ set.put("reject", (stats != null) ? stats.reject : 0);
+ set.put("acquire", (stats != null) ? stats.acquire : 0);
+ set.put("lockout", (stats != null) ? stats.lockout : 0);
+ // cryptoStats measures statistics about secure fingerprint transactions
+ // (e.g. to unlock password storage, make secure purchases, etc.)
+ set.put("acceptCrypto", (cryptoStats != null) ? cryptoStats.accept : 0);
+ set.put("rejectCrypto", (cryptoStats != null) ? cryptoStats.reject : 0);
+ set.put("acquireCrypto", (cryptoStats != null) ? cryptoStats.acquire : 0);
+ set.put("lockoutCrypto", (cryptoStats != null) ? cryptoStats.lockout : 0);
sets.put(set);
}
@@ -947,6 +1001,7 @@
private void updateActiveGroup(int userId, String clientPackage) {
IFingerprintDaemon daemon = getFingerprintDaemon();
+
if (daemon != null) {
try {
userId = getUserOrWorkProfileId(clientPackage, userId);
@@ -1019,14 +1074,12 @@
}
}
+ /***
+ * @param opPackageName the name of the calling package
+ * @return authenticator id for the current user
+ */
public long getAuthenticatorId(String opPackageName) {
- if (canUseFingerprint(opPackageName, false /* foregroundOnly */,
- Binder.getCallingUid(), Binder.getCallingPid())) {
- return mCurrentAuthenticatorId;
- } else {
- Slog.w(TAG, "Client isn't current, returning authenticator_id=0");
- }
- return 0;
+ return mCurrentAuthenticatorId;
}
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java
index 55917fc..687aaa1 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecController.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java
@@ -188,15 +188,16 @@
int curAddress = (startAddress + i) % NUM_LOGICAL_ADDRESS;
if (curAddress != Constants.ADDR_UNREGISTERED
&& deviceType == HdmiUtils.getTypeFromAddress(curAddress)) {
- int failedPollingCount = 0;
+ boolean acked = false;
for (int j = 0; j < HdmiConfig.ADDRESS_ALLOCATION_RETRY; ++j) {
- if (!sendPollMessage(curAddress, curAddress, 1)) {
- failedPollingCount++;
+ if (sendPollMessage(curAddress, curAddress, 1)) {
+ acked = true;
+ break;
}
}
-
- // Pick logical address if failed ratio is more than a half of all retries.
- if (failedPollingCount * 2 > HdmiConfig.ADDRESS_ALLOCATION_RETRY) {
+ // If sending <Polling Message> failed, it becomes new logical address for the
+ // device because no device uses it as logical address of the device.
+ if (!acked) {
logicalAddress = curAddress;
break;
}
@@ -469,12 +470,14 @@
assertRunOnIoThread();
for (int i = 0; i < retryCount; ++i) {
// <Polling Message> is a message which has empty body.
- // If sending <Polling Message> failed (NAK), it becomes
- // new logical address for the device because no device uses
- // it as logical address of the device.
- if (nativeSendCecCommand(mNativePtr, sourceAddress, destinationAddress, EMPTY_BODY)
- == Constants.SEND_RESULT_SUCCESS) {
+ int ret =
+ nativeSendCecCommand(mNativePtr, sourceAddress, destinationAddress, EMPTY_BODY);
+ if (ret == Constants.SEND_RESULT_SUCCESS) {
return true;
+ } else if (ret != Constants.SEND_RESULT_NAK) {
+ // Unusual failure
+ HdmiLogger.warning("Failed to send a polling message(%d->%d) with return code %d",
+ sourceAddress, destinationAddress, ret);
}
}
return false;
diff --git a/services/core/java/com/android/server/job/JobPackageTracker.java b/services/core/java/com/android/server/job/JobPackageTracker.java
index ba96b74..82e2eb4 100644
--- a/services/core/java/com/android/server/job/JobPackageTracker.java
+++ b/services/core/java/com/android/server/job/JobPackageTracker.java
@@ -395,7 +395,10 @@
return 0;
}
final long now = SystemClock.uptimeMillis();
- long time = cur.getActiveTime(now) + cur.getPendingTime(now);
+ long time = 0;
+ if (cur != null) {
+ time += cur.getActiveTime(now) + cur.getPendingTime(now);
+ }
long period = mCurDataSet.getTotalTime(now);
if (last != null) {
time += last.getActiveTime(now) + last.getPendingTime(now);
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 8589de1..9d93146 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -28,6 +28,7 @@
import java.util.Iterator;
import java.util.List;
+import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.AppGlobals;
@@ -43,7 +44,9 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.content.pm.PackageManager.NameNotFoundException;
@@ -396,10 +399,11 @@
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
+ final String action = intent.getAction();
if (DEBUG) {
- Slog.d(TAG, "Receieved: " + intent.getAction());
+ Slog.d(TAG, "Receieved: " + action);
}
- if (Intent.ACTION_PACKAGE_CHANGED.equals(intent.getAction())) {
+ if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) {
// Purge the app's jobs if the whole package was just disabled. When this is
// the case the component name will be a bare package name.
final String pkgName = getPackageName(intent);
@@ -433,7 +437,7 @@
} else {
Slog.w(TAG, "PACKAGE_CHANGED for " + pkgName + " / uid " + pkgUid);
}
- } else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
+ } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
// If this is an outright uninstall rather than the first half of an
// app update sequence, cancel the jobs associated with the app.
if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
@@ -443,12 +447,43 @@
}
cancelJobsForUid(uidRemoved, true);
}
- } else if (Intent.ACTION_USER_REMOVED.equals(intent.getAction())) {
+ } else if (Intent.ACTION_USER_REMOVED.equals(action)) {
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
if (DEBUG) {
Slog.d(TAG, "Removing jobs for user: " + userId);
}
cancelJobsForUser(userId);
+ } else if (Intent.ACTION_QUERY_PACKAGE_RESTART.equals(action)) {
+ // Has this package scheduled any jobs, such that we will take action
+ // if it were to be force-stopped?
+ final int pkgUid = intent.getIntExtra(Intent.EXTRA_UID, -1);
+ final String pkgName = intent.getData().getSchemeSpecificPart();
+ if (pkgUid != -1) {
+ List<JobStatus> jobsForUid;
+ synchronized (mLock) {
+ jobsForUid = mJobs.getJobsByUid(pkgUid);
+ }
+ for (int i = jobsForUid.size() - 1; i >= 0; i--) {
+ if (jobsForUid.get(i).getSourcePackageName().equals(pkgName)) {
+ if (DEBUG) {
+ Slog.d(TAG, "Restart query: package " + pkgName + " at uid "
+ + pkgUid + " has jobs");
+ }
+ setResultCode(Activity.RESULT_OK);
+ break;
+ }
+ }
+ }
+ } else if (Intent.ACTION_PACKAGE_RESTARTED.equals(action)) {
+ // possible force-stop
+ final int pkgUid = intent.getIntExtra(Intent.EXTRA_UID, -1);
+ final String pkgName = intent.getData().getSchemeSpecificPart();
+ if (pkgUid != -1) {
+ if (DEBUG) {
+ Slog.d(TAG, "Removing jobs for pkg " + pkgName + " at uid " + pkgUid);
+ }
+ cancelJobsForPackageAndUid(pkgName, pkgUid);
+ }
}
}
};
@@ -583,6 +618,19 @@
}
}
+ void cancelJobsForPackageAndUid(String pkgName, int uid) {
+ List<JobStatus> jobsForUid;
+ synchronized (mLock) {
+ jobsForUid = mJobs.getJobsByUid(uid);
+ }
+ for (int i = jobsForUid.size() - 1; i >= 0; i--) {
+ final JobStatus job = jobsForUid.get(i);
+ if (job.getSourcePackageName().equals(pkgName)) {
+ cancelJobImpl(job, null);
+ }
+ }
+ }
+
/**
* Entry point from client to cancel all jobs originating from their uid.
* This will remove the job from the master list, and cancel the job if it was staged for
@@ -754,6 +802,8 @@
final IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+ filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
+ filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
filter.addDataScheme("package");
getContext().registerReceiverAsUser(
mBroadcastReceiver, UserHandle.ALL, filter, null, null);
@@ -1556,6 +1606,11 @@
}
}
+ if ((job.getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) != 0) {
+ getContext().enforceCallingOrSelfPermission(
+ android.Manifest.permission.CONNECTIVITY_INTERNAL, TAG);
+ }
+
long ident = Binder.clearCallingIdentity();
try {
return JobSchedulerService.this.schedule(job, uid);
diff --git a/services/core/java/com/android/server/job/controllers/ContentObserverController.java b/services/core/java/com/android/server/job/controllers/ContentObserverController.java
index 9dce070..5d209fc 100644
--- a/services/core/java/com/android/server/job/controllers/ContentObserverController.java
+++ b/services/core/java/com/android/server/job/controllers/ContentObserverController.java
@@ -16,12 +16,15 @@
package com.android.server.job.controllers;
+import android.annotation.UserIdInt;
import android.app.job.JobInfo;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.UserHandle;
+import android.util.Slog;
+import android.util.SparseArray;
import android.util.TimeUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -34,12 +37,14 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
/**
* Controller for monitoring changes to content URIs through a ContentObserver.
*/
public class ContentObserverController extends StateController {
private static final String TAG = "JobScheduler.Content";
+ private static final boolean DEBUG = false;
/**
* Maximum number of changing URIs we will batch together to report.
@@ -57,7 +62,11 @@
private static volatile ContentObserverController sController;
final private List<JobStatus> mTrackedTasks = new ArrayList<JobStatus>();
- ArrayMap<JobInfo.TriggerContentUri, ObserverInstance> mObservers = new ArrayMap<>();
+ /**
+ * Per-userid {@link JobInfo.TriggerContentUri} keyed ContentObserver cache.
+ */
+ SparseArray<ArrayMap<JobInfo.TriggerContentUri, ObserverInstance>> mObservers =
+ new SparseArray<>();
final Handler mHandler;
public static ContentObserverController get(JobSchedulerService taskManagerService) {
@@ -88,6 +97,9 @@
if (taskStatus.contentObserverJobInstance == null) {
taskStatus.contentObserverJobInstance = new JobInstance(taskStatus);
}
+ if (DEBUG) {
+ Slog.i(TAG, "Tracking content-trigger job " + taskStatus);
+ }
mTrackedTasks.add(taskStatus);
boolean havePendingUris = false;
// If there is a previous job associated with the new job, propagate over
@@ -175,6 +187,9 @@
taskStatus.contentObserverJobInstance = null;
}
}
+ if (DEBUG) {
+ Slog.i(TAG, "No longer tracking job " + taskStatus);
+ }
mTrackedTasks.remove(taskStatus);
}
}
@@ -194,16 +209,23 @@
}
final class ObserverInstance extends ContentObserver {
- final Uri mUri;
+ final JobInfo.TriggerContentUri mUri;
+ final @UserIdInt int mUserId;
final ArraySet<JobInstance> mJobs = new ArraySet<>();
- public ObserverInstance(Handler handler, Uri uri) {
+ public ObserverInstance(Handler handler, JobInfo.TriggerContentUri uri,
+ @UserIdInt int userId) {
super(handler);
mUri = uri;
+ mUserId = userId;
}
@Override
public void onChange(boolean selfChange, Uri uri) {
+ if (DEBUG) {
+ Slog.i(TAG, "onChange(self=" + selfChange + ") for " + uri
+ + " when mUri=" + mUri + " mUserId=" + mUserId);
+ }
synchronized (mLock) {
final int N = mJobs.size();
for (int i=0; i<N; i++) {
@@ -246,23 +268,45 @@
boolean mTriggerPending;
+ // This constructor must be called with the master job scheduler lock held.
JobInstance(JobStatus jobStatus) {
mJobStatus = jobStatus;
mExecuteRunner = new TriggerRunnable(this);
mTimeoutRunner = new TriggerRunnable(this);
final JobInfo.TriggerContentUri[] uris = jobStatus.getJob().getTriggerContentUris();
+ final int sourceUserId = jobStatus.getSourceUserId();
+ ArrayMap<JobInfo.TriggerContentUri, ObserverInstance> observersOfUser =
+ mObservers.get(sourceUserId);
+ if (observersOfUser == null) {
+ observersOfUser = new ArrayMap<>();
+ mObservers.put(sourceUserId, observersOfUser);
+ }
if (uris != null) {
for (JobInfo.TriggerContentUri uri : uris) {
- ObserverInstance obs = mObservers.get(uri);
+ ObserverInstance obs = observersOfUser.get(uri);
if (obs == null) {
- obs = new ObserverInstance(mHandler, uri.getUri());
- mObservers.put(uri, obs);
+ obs = new ObserverInstance(mHandler, uri, jobStatus.getSourceUserId());
+ observersOfUser.put(uri, obs);
+ final boolean andDescendants = (uri.getFlags() &
+ JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS) != 0;
+ if (DEBUG) {
+ Slog.v(TAG, "New observer " + obs + " for " + uri.getUri()
+ + " andDescendants=" + andDescendants
+ + " sourceUserId=" + sourceUserId);
+ }
mContext.getContentResolver().registerContentObserver(
uri.getUri(),
- (uri.getFlags() &
- JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS)
- != 0,
- obs);
+ andDescendants,
+ obs,
+ sourceUserId
+ );
+ } else {
+ if (DEBUG) {
+ final boolean andDescendants = (uri.getFlags() &
+ JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS) != 0;
+ Slog.v(TAG, "Reusing existing observer " + obs + " for " + uri.getUri()
+ + " andDescendants=" + andDescendants);
+ }
}
obs.mJobs.add(this);
mMyObservers.add(obs);
@@ -315,8 +359,15 @@
final ObserverInstance obs = mMyObservers.get(i);
obs.mJobs.remove(this);
if (obs.mJobs.size() == 0) {
+ if (DEBUG) {
+ Slog.i(TAG, "Unregistering observer " + obs + " for " + obs.mUri.getUri());
+ }
mContext.getContentResolver().unregisterContentObserver(obs);
- mObservers.remove(obs);
+ ArrayMap<JobInfo.TriggerContentUri, ObserverInstance> observerOfUser =
+ mObservers.get(obs.mUserId);
+ if (observerOfUser != null) {
+ observerOfUser.remove(obs.mUri);
+ }
}
}
}
@@ -340,60 +391,66 @@
int N = mObservers.size();
if (N > 0) {
pw.println(" Observers:");
- for (int i = 0; i < N; i++) {
- ObserverInstance obs = mObservers.valueAt(i);
- int M = obs.mJobs.size();
- boolean shouldDump = false;
- for (int j=0; j<M; j++) {
- JobInstance inst = obs.mJobs.valueAt(j);
- if (inst.mJobStatus.shouldDump(filterUid)) {
- shouldDump = true;
- break;
+ for (int userIdx = 0; userIdx < N; userIdx++) {
+ final int userId = mObservers.keyAt(userIdx);
+ ArrayMap<JobInfo.TriggerContentUri, ObserverInstance> observersOfUser =
+ mObservers.get(userId);
+ int numbOfObserversPerUser = observersOfUser.size();
+ for (int observerIdx = 0 ; observerIdx < numbOfObserversPerUser; observerIdx++) {
+ ObserverInstance obs = observersOfUser.valueAt(observerIdx);
+ int M = obs.mJobs.size();
+ boolean shouldDump = false;
+ for (int j = 0; j < M; j++) {
+ JobInstance inst = obs.mJobs.valueAt(j);
+ if (inst.mJobStatus.shouldDump(filterUid)) {
+ shouldDump = true;
+ break;
+ }
}
- }
- if (!shouldDump) {
- continue;
- }
- pw.print(" ");
- JobInfo.TriggerContentUri trigger = mObservers.keyAt(i);
- pw.print(trigger.getUri());
- pw.print(" 0x");
- pw.print(Integer.toHexString(trigger.getFlags()));
- pw.print(" (");
- pw.print(System.identityHashCode(obs));
- pw.println("):");
- pw.println(" Jobs:");
- for (int j=0; j<M; j++) {
- JobInstance inst = obs.mJobs.valueAt(j);
- pw.print(" #");
- inst.mJobStatus.printUniqueId(pw);
- pw.print(" from ");
- UserHandle.formatUid(pw, inst.mJobStatus.getSourceUid());
- if (inst.mChangedAuthorities != null) {
- pw.println(":");
- if (inst.mTriggerPending) {
- pw.print(" Trigger pending: update=");
- TimeUtils.formatDuration(
- inst.mJobStatus.getTriggerContentUpdateDelay(), pw);
- pw.print(", max=");
- TimeUtils.formatDuration(
- inst.mJobStatus.getTriggerContentMaxDelay(), pw);
+ if (!shouldDump) {
+ continue;
+ }
+ pw.print(" ");
+ JobInfo.TriggerContentUri trigger = observersOfUser.keyAt(observerIdx);
+ pw.print(trigger.getUri());
+ pw.print(" 0x");
+ pw.print(Integer.toHexString(trigger.getFlags()));
+ pw.print(" (");
+ pw.print(System.identityHashCode(obs));
+ pw.println("):");
+ pw.println(" Jobs:");
+ for (int j = 0; j < M; j++) {
+ JobInstance inst = obs.mJobs.valueAt(j);
+ pw.print(" #");
+ inst.mJobStatus.printUniqueId(pw);
+ pw.print(" from ");
+ UserHandle.formatUid(pw, inst.mJobStatus.getSourceUid());
+ if (inst.mChangedAuthorities != null) {
+ pw.println(":");
+ if (inst.mTriggerPending) {
+ pw.print(" Trigger pending: update=");
+ TimeUtils.formatDuration(
+ inst.mJobStatus.getTriggerContentUpdateDelay(), pw);
+ pw.print(", max=");
+ TimeUtils.formatDuration(
+ inst.mJobStatus.getTriggerContentMaxDelay(), pw);
+ pw.println();
+ }
+ pw.println(" Changed Authorities:");
+ for (int k = 0; k < inst.mChangedAuthorities.size(); k++) {
+ pw.print(" ");
+ pw.println(inst.mChangedAuthorities.valueAt(k));
+ }
+ if (inst.mChangedUris != null) {
+ pw.println(" Changed URIs:");
+ for (int k = 0; k < inst.mChangedUris.size(); k++) {
+ pw.print(" ");
+ pw.println(inst.mChangedUris.valueAt(k));
+ }
+ }
+ } else {
pw.println();
}
- pw.println(" Changed Authorities:");
- for (int k=0; k<inst.mChangedAuthorities.size(); k++) {
- pw.print(" ");
- pw.println(inst.mChangedAuthorities.valueAt(k));
- }
- if (inst.mChangedUris != null) {
- pw.println(" Changed URIs:");
- for (int k = 0; k<inst.mChangedUris.size(); k++) {
- pw.print(" ");
- pw.println(inst.mChangedUris.valueAt(k));
- }
- }
- } else {
- pw.println();
}
}
}
diff --git a/services/core/java/com/android/server/job/controllers/JobStatus.java b/services/core/java/com/android/server/job/controllers/JobStatus.java
index 8aef471..4b39bf9 100644
--- a/services/core/java/com/android/server/job/controllers/JobStatus.java
+++ b/services/core/java/com/android/server/job/controllers/JobStatus.java
@@ -491,6 +491,7 @@
+ ":[" + job.getService()
+ ",jId=" + job.getId()
+ ",u" + getUserId()
+ + ",suid=" + getSourceUid()
+ ",R=(" + formatRunTime(earliestRunTimeElapsedMillis, NO_EARLIEST_RUNTIME)
+ "," + formatRunTime(latestRunTimeElapsedMillis, NO_LATEST_RUNTIME) + ")"
+ ",N=" + job.getNetworkType() + ",C=" + job.isRequireCharging()
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 173f76f..7580cf4 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -393,6 +393,15 @@
// SIM/Carrier info.
private final static String SIM_STATE_CHANGED = "android.intent.action.SIM_STATE_CHANGED";
+ // Persist property for LPP_PROFILE
+ private final static String LPP_PROFILE = "persist.sys.gps.lpp";
+
+ // VZW PLMN info
+ private static final String[] VzwMccMncList = {"311480", "310004", "20404"};
+ // corresponding GID1 value, empty string means ignore gid1 match.
+ private static final String[] VzwGid1List = {"", "", "BAE0000000000000"};
+
+
private final PowerManager mPowerManager;
private final AlarmManager mAlarmManager;
private final PendingIntent mWakeupIntent;
@@ -507,14 +516,43 @@
}
};
+ private final boolean isVerizon(String mccMnc, String imsi, String groupId) {
+ if (DEBUG) Log.d(TAG, "simOperator: " + mccMnc);
+ if (!TextUtils.isEmpty(mccMnc) || !TextUtils.isEmpty(imsi)) {
+ for (int i = 0; i < VzwMccMncList.length; i++) {
+ if ((!TextUtils.isEmpty(mccMnc) && mccMnc.equals(VzwMccMncList[i])) ||
+ (!TextUtils.isEmpty(imsi) && imsi.startsWith(VzwMccMncList[i]))) {
+ // check gid too if needed
+ if (TextUtils.isEmpty(VzwGid1List[i]) || VzwGid1List[i].equals(groupId)) {
+ if (DEBUG) Log.d(TAG, "Verizon UICC");
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
private void subscriptionOrSimChanged(Context context) {
if (DEBUG) Log.d(TAG, "received SIM related action: ");
TelephonyManager phone = (TelephonyManager)
mContext.getSystemService(Context.TELEPHONY_SERVICE);
String mccMnc = phone.getSimOperator();
+ String imsi = phone.getSubscriberId();
+ String groupId = phone.getGroupIdLevel1();
if (!TextUtils.isEmpty(mccMnc)) {
if (DEBUG) Log.d(TAG, "SIM MCC/MNC is available: " + mccMnc);
synchronized (mLock) {
+ if (isVerizon(mccMnc, imsi, groupId)) {
+ // load current properties for carrier VZW
+ loadPropertiesFromResource(context, mProperties);
+ String lpp_profile = mProperties.getProperty("LPP_PROFILE");
+ // set the persist property LPP_PROFILE for VZW
+ SystemProperties.set(LPP_PROFILE, lpp_profile);
+ } else {
+ // reset the persist property for Non VZW
+ SystemProperties.set(LPP_PROFILE, "");
+ }
reloadGpsProperties(context, mProperties);
mNIHandler.setSuplEsEnabled(mSuplEsEnabled);
}
@@ -571,8 +609,10 @@
private void reloadGpsProperties(Context context, Properties properties) {
if (DEBUG) Log.d(TAG, "Reset GPS properties, previous size = " + properties.size());
loadPropertiesFromResource(context, properties);
+
boolean isPropertiesLoadedFromFile = false;
final String gpsHardware = SystemProperties.get("ro.hardware.gps");
+
if (!TextUtils.isEmpty(gpsHardware)) {
final String propFilename =
PROPERTIES_FILE_PREFIX + "." + gpsHardware + PROPERTIES_FILE_SUFFIX;
@@ -583,7 +623,11 @@
loadPropertiesFromFile(DEFAULT_PROPERTIES_FILE, properties);
}
if (DEBUG) Log.d(TAG, "GPS properties reloaded, size = " + properties.size());
-
+ String lpp_prof = SystemProperties.get(LPP_PROFILE);
+ if (!TextUtils.isEmpty(lpp_prof)) {
+ // override default value of this if lpp_prof is not empty
+ properties.setProperty("LPP_PROFILE", lpp_prof);
+ }
// TODO: we should get rid of C2K specific setting.
setSuplHostPort(properties.getProperty("SUPL_HOST"),
properties.getProperty("SUPL_PORT"));
diff --git a/services/core/java/com/android/server/media/MediaResourceMonitorService.java b/services/core/java/com/android/server/media/MediaResourceMonitorService.java
index e169d63..0eb8b55 100644
--- a/services/core/java/com/android/server/media/MediaResourceMonitorService.java
+++ b/services/core/java/com/android/server/media/MediaResourceMonitorService.java
@@ -24,6 +24,7 @@
import android.os.Binder;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.os.UserManager;
import android.util.Log;
import android.util.Slog;
import com.android.server.SystemService;
@@ -59,12 +60,20 @@
final long identity = Binder.clearCallingIdentity();
try {
String pkgNames[] = getPackageNamesFromPid(pid);
- if (pkgNames != null) {
- Intent intent = new Intent(Intent.ACTION_MEDIA_RESOURCE_GRANTED);
- intent.putExtra(Intent.EXTRA_PACKAGES, pkgNames);
- intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, type);
- getContext().sendBroadcastAsUser(intent,
- new UserHandle(ActivityManager.getCurrentUser()),
+ if (pkgNames == null) {
+ return;
+ }
+ UserManager manager = (UserManager) getContext().getSystemService(
+ Context.USER_SERVICE);
+ int[] userIds = manager.getEnabledProfileIds(ActivityManager.getCurrentUser());
+ if (userIds == null || userIds.length == 0) {
+ return;
+ }
+ Intent intent = new Intent(Intent.ACTION_MEDIA_RESOURCE_GRANTED);
+ intent.putExtra(Intent.EXTRA_PACKAGES, pkgNames);
+ intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, type);
+ for (int userId : userIds) {
+ getContext().sendBroadcastAsUser(intent, UserHandle.of(userId),
android.Manifest.permission.RECEIVE_MEDIA_RESOURCE_USAGE);
}
} finally {
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index 29c54e9..88d6c14 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -454,7 +454,7 @@
@Override
public String toString() {
- return mPackageName + "/" + mTag;
+ return mPackageName + "/" + mTag + " (uid=" + mUserId + ")";
}
private void postAdjustLocalVolume(final int stream, final int direction, final int flags,
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index cc4187f..2f77f93 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -47,10 +47,12 @@
import android.os.IBinder;
import android.os.Message;
import android.os.PowerManager;
+import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.Settings;
import android.speech.RecognizerIntent;
import android.text.TextUtils;
@@ -67,6 +69,7 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -97,7 +100,9 @@
private ContentResolver mContentResolver;
private SettingsObserver mSettingsObserver;
- private int mCurrentUserId = -1;
+ // List of user IDs running in the foreground.
+ // Multiple users can be in the foreground if the work profile is on.
+ private final List<Integer> mCurrentUserIdList = new ArrayList<>();
// Used to notify system UI when remote volume was changed. TODO find a
// better way to handle this.
@@ -181,22 +186,26 @@
}
@Override
- public void onStartUser(int userHandle) {
+ public void onStartUser(int userId) {
+ if (DEBUG) Log.d(TAG, "onStartUser: " + userId);
updateUser();
}
@Override
- public void onSwitchUser(int userHandle) {
+ public void onSwitchUser(int userId) {
+ if (DEBUG) Log.d(TAG, "onSwitchUser: " + userId);
updateUser();
}
@Override
- public void onStopUser(int userHandle) {
+ public void onStopUser(int userId) {
+ if (DEBUG) Log.d(TAG, "onStopUser: " + userId);
synchronized (mLock) {
- UserRecord user = mUserRecords.get(userHandle);
+ UserRecord user = mUserRecords.get(userId);
if (user != null) {
destroyUserLocked(user);
}
+ updateUser();
}
}
@@ -228,18 +237,24 @@
private void updateUser() {
synchronized (mLock) {
- int userId = ActivityManager.getCurrentUser();
- if (mCurrentUserId != userId) {
- final int oldUserId = mCurrentUserId;
- mCurrentUserId = userId; // do this first
-
- UserRecord oldUser = mUserRecords.get(oldUserId);
- if (oldUser != null) {
- oldUser.stopLocked();
+ UserManager manager = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
+ int currentUser = ActivityManager.getCurrentUser();
+ // Include all profiles even though they aren't yet enabled to handle work profile case.
+ int[] userIds = manager.getProfileIdsWithDisabled(currentUser);
+ mCurrentUserIdList.clear();
+ if (userIds != null && userIds.length > 0) {
+ for (int userId : userIds) {
+ mCurrentUserIdList.add(userId);
}
-
- UserRecord newUser = getOrCreateUser(userId);
- newUser.startLocked();
+ } else {
+ // This shouldn't happen.
+ Log.w(TAG, "Failed to get enabled profiles.");
+ mCurrentUserIdList.add(currentUser);
+ }
+ for (int userId : mCurrentUserIdList) {
+ if (mUserRecords.get(userId) == null) {
+ mUserRecords.put(userId, new UserRecord(getContext(), userId));
+ }
}
}
}
@@ -272,7 +287,6 @@
* @param user The user to dispose of
*/
private void destroyUserLocked(UserRecord user) {
- user.stopLocked();
user.destroyLocked();
mUserRecords.remove(user.mUserId);
}
@@ -427,6 +441,12 @@
private MediaSessionRecord createSessionLocked(int callerPid, int callerUid, int userId,
String callerPackageName, ISessionCallback cb, String tag) {
+ UserRecord user = mUserRecords.get(userId);
+ if (user == null) {
+ Log.wtf(TAG, "Request from invalid user: " + userId);
+ throw new RuntimeException("Session request from invalid user.");
+ }
+
final MediaSessionRecord session = new MediaSessionRecord(callerPid, callerUid, userId,
callerPackageName, cb, tag, this, mHandler);
try {
@@ -436,9 +456,7 @@
}
mAllSessions.add(session);
- mPriorityStack.addSession(session);
-
- UserRecord user = getOrCreateUser(userId);
+ mPriorityStack.addSession(session, mCurrentUserIdList.contains(userId));
user.addSessionLocked(session);
mHandler.post(MessageHandler.MSG_SESSIONS_CHANGED, userId, 0);
@@ -449,15 +467,6 @@
return session;
}
- private UserRecord getOrCreateUser(int userId) {
- UserRecord user = mUserRecords.get(userId);
- if (user == null) {
- user = new UserRecord(getContext(), userId);
- mUserRecords.put(userId, user);
- }
- return user;
- }
-
private int findIndexOfSessionsListenerLocked(IActiveSessionsListener listener) {
for (int i = mSessionsListeners.size() - 1; i >= 0; i--) {
if (mSessionsListeners.get(i).mListener.asBinder() == listener.asBinder()) {
@@ -536,13 +545,6 @@
restoreMediaButtonReceiver();
}
- public void startLocked() {
- }
-
- public void stopLocked() {
- // nothing for now
- }
-
public void destroyLocked() {
for (int i = mSessions.size() - 1; i >= 0; i--) {
MediaSessionRecord session = mSessions.get(i);
@@ -578,7 +580,7 @@
private void restoreMediaButtonReceiver() {
String receiverName = Settings.Secure.getStringForUser(mContentResolver,
- Settings.System.MEDIA_BUTTON_RECEIVER, UserHandle.USER_CURRENT);
+ Settings.System.MEDIA_BUTTON_RECEIVER, mUserId);
if (!TextUtils.isEmpty(receiverName)) {
ComponentName eventReceiver = ComponentName.unflattenFromString(receiverName);
if (eventReceiver == null) {
@@ -767,12 +769,22 @@
synchronized (mLock) {
// If we don't have a media button receiver to fall back on
// include non-playing sessions for dispatching
- UserRecord ur = mUserRecords.get(mCurrentUserId);
- boolean useNotPlayingSessions = (ur == null) ||
- (ur.mLastMediaButtonReceiver == null
- && ur.mRestoredMediaButtonReceiver == null);
- MediaSessionRecord session = mPriorityStack
- .getDefaultMediaButtonSession(mCurrentUserId, useNotPlayingSessions);
+ boolean useNotPlayingSessions = true;
+ for (int userId : mCurrentUserIdList) {
+ UserRecord ur = mUserRecords.get(userId);
+ if (ur.mLastMediaButtonReceiver != null
+ || ur.mRestoredMediaButtonReceiver != null) {
+ useNotPlayingSessions = false;
+ break;
+ }
+ }
+
+ if (DEBUG) {
+ Log.d(TAG, "dispatchMediaKeyEvent, useNotPlayingSessions="
+ + useNotPlayingSessions);
+ }
+ MediaSessionRecord session = mPriorityStack.getDefaultMediaButtonSession(
+ mCurrentUserIdList, useNotPlayingSessions);
if (isVoiceKey(keyEvent.getKeyCode())) {
handleVoiceKeyEventLocked(keyEvent, needWakeLock, session);
} else {
@@ -786,13 +798,11 @@
@Override
public void dispatchAdjustVolume(int suggestedStream, int delta, int flags) {
- final int pid = Binder.getCallingPid();
- final int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
MediaSessionRecord session = mPriorityStack
- .getDefaultVolumeSession(mCurrentUserId);
+ .getDefaultVolumeSession(mCurrentUserIdList);
dispatchAdjustVolumeLocked(suggestedStream, delta, flags, session);
}
} finally {
@@ -910,7 +920,7 @@
});
} else {
session.adjustVolume(direction, flags, getContext().getPackageName(),
- UserHandle.myUserId(), true);
+ Process.SYSTEM_UID, true);
}
}
@@ -957,13 +967,16 @@
// won't release it later
session.sendMediaButton(keyEvent,
needWakeLock ? mKeyEventReceiver.mLastTimeoutId : -1,
- mKeyEventReceiver, getContext().getApplicationInfo().uid,
+ mKeyEventReceiver, Process.SYSTEM_UID,
getContext().getPackageName());
} else {
// Launch the last PendingIntent we had with priority
- UserRecord user = mUserRecords.get(mCurrentUserId);
- if (user != null && (user.mLastMediaButtonReceiver != null
- || user.mRestoredMediaButtonReceiver != null)) {
+ for (int userId : mCurrentUserIdList) {
+ UserRecord user = mUserRecords.get(userId);
+ if (user.mLastMediaButtonReceiver == null
+ && user.mRestoredMediaButtonReceiver == null) {
+ continue;
+ }
if (DEBUG) {
Log.d(TAG, "Sending media key to last known PendingIntent "
+ user.mLastMediaButtonReceiver + " or restored Intent "
@@ -983,30 +996,30 @@
} else {
mediaButtonIntent.setComponent(user.mRestoredMediaButtonReceiver);
getContext().sendBroadcastAsUser(mediaButtonIntent,
- new UserHandle(mCurrentUserId));
+ UserHandle.of(userId));
}
} catch (CanceledException e) {
Log.i(TAG, "Error sending key event to media button receiver "
+ user.mLastMediaButtonReceiver, e);
}
- } else {
- if (DEBUG) {
- Log.d(TAG, "Sending media key ordered broadcast");
- }
- if (needWakeLock) {
- mMediaEventWakeLock.acquire();
- }
- // Fallback to legacy behavior
- Intent keyIntent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
- keyIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
- keyIntent.putExtra(Intent.EXTRA_KEY_EVENT, keyEvent);
- if (needWakeLock) {
- keyIntent.putExtra(EXTRA_WAKELOCK_ACQUIRED,
- WAKELOCK_RELEASE_ON_FINISHED);
- }
- getContext().sendOrderedBroadcastAsUser(keyIntent, UserHandle.CURRENT,
- null, mKeyEventDone, mHandler, Activity.RESULT_OK, null, null);
+ return;
}
+ if (DEBUG) {
+ Log.d(TAG, "Sending media key ordered broadcast");
+ }
+ if (needWakeLock) {
+ mMediaEventWakeLock.acquire();
+ }
+ // Fallback to legacy behavior
+ Intent keyIntent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
+ keyIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ keyIntent.putExtra(Intent.EXTRA_KEY_EVENT, keyEvent);
+ if (needWakeLock) {
+ keyIntent.putExtra(EXTRA_WAKELOCK_ACQUIRED, WAKELOCK_RELEASE_ON_FINISHED);
+ }
+ // Send broadcast only to the full user.
+ getContext().sendOrderedBroadcastAsUser(keyIntent, UserHandle.CURRENT,
+ null, mKeyEventDone, mHandler, Activity.RESULT_OK, null, null);
}
}
@@ -1036,6 +1049,7 @@
if (voiceIntent != null) {
voiceIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ if (DEBUG) Log.d(TAG, "voiceIntent: " + voiceIntent);
getContext().startActivityAsUser(voiceIntent, UserHandle.CURRENT);
}
} catch (ActivityNotFoundException e) {
diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java
index 61c320b..3327b36 100644
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -32,7 +32,7 @@
* Keeps track of media sessions and their priority for notifications, media
* button dispatch, etc.
*/
-public class MediaSessionStack {
+class MediaSessionStack {
/**
* These are states that usually indicate the user took an action and should
* bump priority regardless of the old state.
@@ -68,25 +68,23 @@
* Checks if a media session is created from the most recent app.
*
* @param record A media session record to be examined.
- * @return true if the media session's package name equals to the most recent app, false
- * otherwise.
+ * @return {@code true} if the media session's package name equals to the most recent app, false
+ * otherwise.
*/
private static boolean isFromMostRecentApp(MediaSessionRecord record) {
- if (ActivityManager.getCurrentUser() != record.getUserId()) {
- return false;
- }
try {
List<ActivityManager.RecentTaskInfo> tasks =
ActivityManagerNative.getDefault().getRecentTasks(1,
ActivityManager.RECENT_IGNORE_HOME_STACK_TASKS |
ActivityManager.RECENT_IGNORE_UNAVAILABLE |
ActivityManager.RECENT_INCLUDE_PROFILES |
- ActivityManager.RECENT_WITH_EXCLUDED, record.getUserId());
+ ActivityManager.RECENT_WITH_EXCLUDED, record.getUserId()).getList();
if (tasks != null && !tasks.isEmpty()) {
ActivityManager.RecentTaskInfo recentTask = tasks.get(0);
- if (recentTask.baseIntent != null)
+ if (recentTask.userId == record.getUserId() && recentTask.baseIntent != null) {
return recentTask.baseIntent.getComponent().getPackageName()
.equals(record.getPackageName());
+ }
}
} catch (RemoteException e) {
return false;
@@ -98,11 +96,12 @@
* Add a record to the priority tracker.
*
* @param record The record to add.
+ * @param fromForegroundUser {@code true} if the session is created by the foreground user.
*/
- public void addSession(MediaSessionRecord record) {
+ public void addSession(MediaSessionRecord record, boolean fromForegroundUser) {
mSessions.add(record);
clearCache();
- if (isFromMostRecentApp(record)) {
+ if (fromForegroundUser && isFromMostRecentApp(record)) {
mLastInterestingRecord = record;
}
}
@@ -210,12 +209,13 @@
/**
* Get the highest priority session that can handle media buttons.
*
- * @param userId The user to check.
+ * @param userIdList The user lists to check.
* @param includeNotPlaying Return a non-playing session if nothing else is
* available
* @return The default media button session or null.
*/
- public MediaSessionRecord getDefaultMediaButtonSession(int userId, boolean includeNotPlaying) {
+ public MediaSessionRecord getDefaultMediaButtonSession(
+ List<Integer> userIdList, boolean includeNotPlaying) {
if (mGlobalPrioritySession != null && mGlobalPrioritySession.isActive()) {
return mGlobalPrioritySession;
}
@@ -223,7 +223,7 @@
return mCachedButtonReceiver;
}
ArrayList<MediaSessionRecord> records = getPriorityListLocked(true,
- MediaSession.FLAG_HANDLES_MEDIA_BUTTONS, userId);
+ MediaSession.FLAG_HANDLES_MEDIA_BUTTONS, userIdList);
if (records.size() > 0) {
MediaSessionRecord record = records.get(0);
if (record.isPlaybackActive(false)) {
@@ -248,14 +248,14 @@
return mCachedButtonReceiver;
}
- public MediaSessionRecord getDefaultVolumeSession(int userId) {
+ public MediaSessionRecord getDefaultVolumeSession(List<Integer> userIdList) {
if (mGlobalPrioritySession != null && mGlobalPrioritySession.isActive()) {
return mGlobalPrioritySession;
}
if (mCachedVolumeDefault != null) {
return mCachedVolumeDefault;
}
- ArrayList<MediaSessionRecord> records = getPriorityListLocked(true, 0, userId);
+ ArrayList<MediaSessionRecord> records = getPriorityListLocked(true, 0, userIdList);
int size = records.size();
for (int i = 0; i < size; i++) {
MediaSessionRecord record = records.get(i);
@@ -298,6 +298,13 @@
}
}
+ private ArrayList<MediaSessionRecord> getPriorityListLocked(boolean activeOnly, int withFlags,
+ int userId) {
+ List<Integer> userIdList = new ArrayList<>();
+ userIdList.add(userId);
+ return getPriorityListLocked(activeOnly, withFlags, userIdList);
+ }
+
/**
* Get a priority sorted list of sessions. Can filter to only return active
* sessions or sessions with specific flags.
@@ -306,22 +313,23 @@
* all sessions.
* @param withFlags Only return sessions with all the specified flags set. 0
* returns all sessions.
- * @param userId The user to get sessions for. {@link UserHandle#USER_ALL}
+ * @param userIdList The user to get sessions for. {@link UserHandle#USER_ALL}
* will return sessions for all users.
* @return The priority sorted list of sessions.
*/
private ArrayList<MediaSessionRecord> getPriorityListLocked(boolean activeOnly, int withFlags,
- int userId) {
+ List<Integer> userIdList) {
ArrayList<MediaSessionRecord> result = new ArrayList<MediaSessionRecord>();
int lastLocalIndex = 0;
int lastActiveIndex = 0;
int lastPublishedIndex = 0;
+ boolean filterUser = !userIdList.contains(UserHandle.USER_ALL);
int size = mSessions.size();
for (int i = 0; i < size; i++) {
final MediaSessionRecord session = mSessions.get(i);
- if (userId != UserHandle.USER_ALL && userId != session.getUserId()) {
+ if (filterUser && !userIdList.contains(session.getUserId())) {
// Filter out sessions for the wrong user
continue;
}
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index ecc41e5..8dcf653 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1241,6 +1241,24 @@
private void setNetworkTemplateEnabled(NetworkTemplate template, boolean enabled) {
// TODO: reach into ConnectivityManager to proactively disable bringing
// up this network, since we know that traffic will be blocked.
+
+ if (template.getMatchRule() == MATCH_MOBILE_ALL) {
+ // If mobile data usage hits the limit or if the user resumes the data, we need to
+ // notify telephony.
+ final SubscriptionManager sm = SubscriptionManager.from(mContext);
+ final TelephonyManager tm = TelephonyManager.from(mContext);
+
+ final int[] subIds = sm.getActiveSubscriptionIdList();
+ for (int subId : subIds) {
+ final String subscriberId = tm.getSubscriberId(subId);
+ final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,
+ TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true);
+ // Template is matched when subscriber id matches.
+ if (template.matches(probeIdent)) {
+ tm.setPolicyDataEnabled(enabled, subId);
+ }
+ }
+ }
}
/**
@@ -2286,11 +2304,6 @@
final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);
- // roaming networks are always considered metered
- if (ident.getRoaming()) {
- return true;
- }
-
final NetworkPolicy policy;
synchronized (mNetworkPoliciesSecondLock) {
policy = findPolicyForNetworkNL(ident);
@@ -2300,7 +2313,7 @@
return policy.metered;
} else {
final int type = state.networkInfo.getType();
- if (isNetworkTypeMobile(type) || type == TYPE_WIMAX) {
+ if ((isNetworkTypeMobile(type) && ident.getMetered()) || type == TYPE_WIMAX) {
return true;
}
return false;
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index 23c111e..4658c046 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -31,6 +31,7 @@
import static android.net.NetworkStats.SET_ALL;
import static android.net.NetworkStats.SET_DEFAULT;
import static android.net.NetworkStats.SET_FOREGROUND;
+import static android.net.NetworkStats.TAG_ALL;
import static android.net.NetworkStats.TAG_NONE;
import static android.net.NetworkStats.UID_ALL;
import static android.net.NetworkTemplate.buildTemplateMobileWildcard;
@@ -79,6 +80,7 @@
import android.net.INetworkStatsService;
import android.net.INetworkStatsSession;
import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
import android.net.NetworkIdentity;
import android.net.NetworkInfo;
import android.net.NetworkState;
@@ -179,6 +181,11 @@
private static final String PREFIX_UID_TAG = "uid_tag";
/**
+ * Virtual network interface for video telephony. This is for VT data usage counting purpose.
+ */
+ public static final String VT_INTERFACE = "vt_data0";
+
+ /**
* Settings that can be changed externally.
*/
public interface NetworkStatsSettings {
@@ -967,6 +974,23 @@
if (baseIface != null) {
findOrCreateNetworkIdentitySet(mActiveIfaces, baseIface).add(ident);
findOrCreateNetworkIdentitySet(mActiveUidIfaces, baseIface).add(ident);
+
+ // Build a separate virtual interface for VT (Video Telephony) data usage.
+ // Only do this when IMS is not metered, but VT is metered.
+ // If IMS is metered, then the IMS network usage has already included VT usage.
+ // VT is considered always metered in framework's layer. If VT is not metered
+ // per carrier's policy, modem will report 0 usage for VT calls.
+ if (state.networkCapabilities.hasCapability(
+ NetworkCapabilities.NET_CAPABILITY_IMS) && !ident.getMetered()) {
+
+ // Copy the identify from IMS one but mark it as metered.
+ NetworkIdentity vtIdent = new NetworkIdentity(ident.getType(),
+ ident.getSubType(), ident.getSubscriberId(), ident.getNetworkId(),
+ ident.getRoaming(), true);
+ findOrCreateNetworkIdentitySet(mActiveIfaces, VT_INTERFACE).add(vtIdent);
+ findOrCreateNetworkIdentitySet(mActiveUidIfaces, VT_INTERFACE).add(vtIdent);
+ }
+
if (isMobile) {
mobileIfaces.add(baseIface);
}
@@ -1004,9 +1028,9 @@
private void recordSnapshotLocked(long currentTime) throws RemoteException {
// snapshot and record current counters; read UID stats first to
- // avoid overcounting dev stats.
+ // avoid over counting dev stats.
final NetworkStats uidSnapshot = getNetworkStatsUidDetail();
- final NetworkStats xtSnapshot = mNetworkManager.getNetworkStatsSummaryXt();
+ final NetworkStats xtSnapshot = getNetworkStatsXtAndVt();
final NetworkStats devSnapshot = mNetworkManager.getNetworkStatsSummaryDev();
@@ -1312,6 +1336,42 @@
}
/**
+ * Return snapshot of current XT plus VT statistics.
+ */
+ private NetworkStats getNetworkStatsXtAndVt() throws RemoteException {
+ final NetworkStats xtSnapshot = mNetworkManager.getNetworkStatsSummaryXt();
+
+ TelephonyManager tm = (TelephonyManager) mContext.getSystemService(
+ Context.TELEPHONY_SERVICE);
+
+ long usage = tm.getVtDataUsage();
+
+ if (LOGV) Slog.d(TAG, "VT call data usage = " + usage);
+
+ final NetworkStats vtSnapshot = new NetworkStats(SystemClock.elapsedRealtime(), 1);
+
+ final NetworkStats.Entry entry = new NetworkStats.Entry();
+ entry.iface = VT_INTERFACE;
+ entry.uid = -1;
+ entry.set = TAG_ALL;
+ entry.tag = TAG_NONE;
+
+ // Since modem only tell us the total usage instead of each usage for RX and TX,
+ // we need to split it up (though it might not quite accurate). At
+ // least we can make sure the data usage report to the user will still be accurate.
+ entry.rxBytes = usage / 2;
+ entry.rxPackets = 0;
+ entry.txBytes = usage - entry.rxBytes;
+ entry.txPackets = 0;
+ vtSnapshot.combineValues(entry);
+
+ // Merge VT int XT
+ xtSnapshot.combineAllValues(vtSnapshot);
+
+ return xtSnapshot;
+ }
+
+ /**
* Return snapshot of current tethering statistics. Will return empty
* {@link NetworkStats} if any problems are encountered.
*/
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 44aa2bc..d32dc14 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1851,7 +1851,7 @@
enforceSystemOrSystemUIOrVolume("INotificationManager.setZenMode");
final long identity = Binder.clearCallingIdentity();
try {
- mZenModeHelper.setManualZenMode(mode, conditionId, reason);
+ mZenModeHelper.setManualZenMode(mode, conditionId, null, reason);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -1928,7 +1928,7 @@
if (zen == -1) throw new IllegalArgumentException("Invalid filter: " + filter);
final long identity = Binder.clearCallingIdentity();
try {
- mZenModeHelper.setManualZenMode(zen, null, "setInterruptionFilter");
+ mZenModeHelper.setManualZenMode(zen, null, pkg, "setInterruptionFilter");
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -1997,6 +1997,7 @@
android.Manifest.permission.MANAGE_NOTIFICATIONS)) {
return;
}
+ checkCallerIsSameApp(pkg);
if (!checkPolicyAccess(pkg)) {
Slog.w(TAG, "Notification policy access denied calling " + method);
throw new SecurityException("Notification policy access denied");
@@ -2285,6 +2286,7 @@
.setFlag(Notification.FLAG_AUTOGROUP_SUMMARY, true)
.setFlag(Notification.FLAG_GROUP_SUMMARY, true)
.setColor(adjustedSbn.getNotification().color)
+ .setLocalOnly(true)
.build();
summaryNotification.extras.putAll(extras);
Intent appIntent = getContext().getPackageManager()
@@ -2577,7 +2579,22 @@
+ " id=" + id + " notification=" + notification);
}
- markAsSentFromNotification(notification);
+ // Whitelist pending intents.
+ if (notification.allPendingIntents != null) {
+ final int intentCount = notification.allPendingIntents.size();
+ if (intentCount > 0) {
+ final ActivityManagerInternal am = LocalServices
+ .getService(ActivityManagerInternal.class);
+ final long duration = LocalServices.getService(
+ DeviceIdleController.LocalService.class).getNotificationWhitelistDuration();
+ for (int i = 0; i < intentCount; i++) {
+ PendingIntent pendingIntent = notification.allPendingIntents.valueAt(i);
+ if (pendingIntent != null) {
+ am.setPendingIntentWhitelistDuration(pendingIntent.getTarget(), duration);
+ }
+ }
+ }
+ }
// Sanitize inputs
notification.priority = clamp(notification.priority, Notification.PRIORITY_MIN,
@@ -2593,67 +2610,6 @@
idOut[0] = id;
}
- private static void markAsSentFromNotification(Notification notification) {
- final ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class);
- final long duration = LocalServices.getService(DeviceIdleController.LocalService.class)
- .getNotificationWhitelistDuration();
-
- int size = 0;
- if (notification.contentIntent != null) {
- am.setPendingIntentWhitelistDuration(notification.contentIntent.getTarget(), duration);
- }
- if (notification.deleteIntent != null) {
- am.setPendingIntentWhitelistDuration(notification.deleteIntent.getTarget(), duration);
- }
- if (notification.fullScreenIntent != null) {
- am.setPendingIntentWhitelistDuration(notification.fullScreenIntent.getTarget(),
- duration);
- }
- if (notification.actions != null) {
- for (Notification.Action action: notification.actions) {
- if (action.actionIntent == null) {
- continue;
- }
- am.setPendingIntentWhitelistDuration(action.actionIntent.getTarget(), duration);
- setPendingIntentWhitelistDuration(am, duration, action.getExtras());
- final RemoteInput[] remoteInputs = action.getRemoteInputs();
- if (remoteInputs != null) {
- for (RemoteInput remoteInput : remoteInputs) {
- setPendingIntentWhitelistDuration(am, duration, remoteInput.getExtras());
- }
- }
- }
- }
- }
-
- private static void setPendingIntentWhitelistDuration(ActivityManagerInternal am, long duration,
- Bundle extras) {
- for (String key : extras.keySet()) {
- final Object value = extras.get(key);
- if (value instanceof Parcelable) {
- setPendingIntentWhitelistDuration(am, duration, (Parcelable) value);
- } else if (value instanceof Parcelable[]) {
- for (Parcelable parcelable : (Parcelable[]) value) {
- setPendingIntentWhitelistDuration(am, duration, parcelable);
- }
- } else if (value instanceof List) {
- for (Object element : (List <?>) value) {
- if (element instanceof Parcelable) {
- setPendingIntentWhitelistDuration(am, duration, (Parcelable) element);
- }
- }
- }
- }
- }
-
- private static void setPendingIntentWhitelistDuration(ActivityManagerInternal am, long duration,
- Parcelable parcelable) {
- if (parcelable instanceof PendingIntent) {
- am.setPendingIntentWhitelistDuration(((PendingIntent) parcelable).getTarget(),
- duration);
- }
- }
-
private class EnqueueNotificationRunnable implements Runnable {
private final NotificationRecord r;
private final int userId;
@@ -3184,6 +3140,12 @@
}
}
+ private void recordCallerLocked(NotificationRecord record) {
+ if (mZenModeHelper.isCall(record)) {
+ mZenModeHelper.recordCaller(record);
+ }
+ }
+
// let zen mode evaluate this record
private void applyZenModeLocked(NotificationRecord record) {
record.setIntercepted(mZenModeHelper.shouldIntercept(record));
@@ -3323,6 +3285,10 @@
}
private void cancelNotificationLocked(NotificationRecord r, boolean sendDelete, int reason) {
+
+ // Record caller.
+ recordCallerLocked(r);
+
// tell the app
if (sendDelete) {
if (r.getNotification().deleteIntent != null) {
@@ -3701,6 +3667,10 @@
if (isCallerSystem()) {
return;
}
+ checkCallerIsSameApp(pkg);
+ }
+
+ private static void checkCallerIsSameApp(String pkg) {
final int uid = Binder.getCallingUid();
try {
ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(
diff --git a/services/core/java/com/android/server/notification/ScheduleCalendar.java b/services/core/java/com/android/server/notification/ScheduleCalendar.java
index 22ca702..9e8b2e3 100644
--- a/services/core/java/com/android/server/notification/ScheduleCalendar.java
+++ b/services/core/java/com/android/server/notification/ScheduleCalendar.java
@@ -82,15 +82,13 @@
if (end <= start) {
end = addDays(end, 1);
}
- boolean isInSchedule =
- isInSchedule(-1, time, start, end) || isInSchedule(0, time, start, end);
- if (isInSchedule && mSchedule.exitAtAlarm
+ return isInSchedule(-1, time, start, end) || isInSchedule(0, time, start, end);
+ }
+
+ public boolean shouldExitForAlarm(long time) {
+ return mSchedule.exitAtAlarm
&& mSchedule.nextAlarm != 0
- && time >= mSchedule.nextAlarm) {
- return false;
- } else {
- return isInSchedule;
- }
+ && time >= mSchedule.nextAlarm;
}
private boolean isInSchedule(int daysOffset, long time, long start, long end) {
diff --git a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
index 8197544..32d03ce 100644
--- a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
+++ b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
@@ -25,11 +25,15 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.net.Uri;
+import android.os.Binder;
+import android.provider.Settings;
import android.service.notification.Condition;
import android.service.notification.IConditionProvider;
import android.service.notification.ZenModeConfig;
import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.text.TextUtils;
import android.util.ArrayMap;
+import android.util.ArraySet;
import android.util.Log;
import android.util.Slog;
@@ -53,9 +57,13 @@
private static final String ACTION_EVALUATE = SIMPLE_NAME + ".EVALUATE";
private static final int REQUEST_CODE_EVALUATE = 1;
private static final String EXTRA_TIME = "time";
+ private static final String SEPARATOR = ";";
+ private static final String SCP_SETTING = "snoozed_schedule_condition_provider";
+
private final Context mContext = this;
private final ArrayMap<Uri, ScheduleCalendar> mSubscriptions = new ArrayMap<>();
+ private ArraySet<Uri> mSnoozed = new ArraySet<>();
private AlarmManager mAlarmManager;
private boolean mConnected;
@@ -90,6 +98,7 @@
pw.print(" ");
pw.println(mSubscriptions.get(conditionId).toString());
}
+ pw.println(" snoozed due to alarm: " + TextUtils.join(SEPARATOR, mSnoozed));
dumpUpcomingTime(pw, "mNextAlarmTime", mNextAlarmTime, now);
}
@@ -97,6 +106,7 @@
public void onConnected() {
if (DEBUG) Slog.d(TAG, "onConnected");
mConnected = true;
+ readSnoozed();
}
@Override
@@ -126,6 +136,7 @@
public void onUnsubscribe(Uri conditionId) {
if (DEBUG) Slog.d(TAG, "onUnsubscribe " + conditionId);
mSubscriptions.remove(conditionId);
+ removeSnoozed(conditionId);
evaluateSubscriptions();
}
@@ -150,10 +161,16 @@
for (Uri conditionId : mSubscriptions.keySet()) {
final ScheduleCalendar cal = mSubscriptions.get(conditionId);
if (cal != null && cal.isInSchedule(now)) {
- notifyCondition(conditionId, Condition.STATE_TRUE, "meetsSchedule");
+ if (conditionSnoozed(conditionId) || cal.shouldExitForAlarm(now)) {
+ notifyCondition(conditionId, Condition.STATE_FALSE, "alarmCanceled");
+ addSnoozed(conditionId);
+ } else {
+ notifyCondition(conditionId, Condition.STATE_TRUE, "meetsSchedule");
+ }
cal.maybeSetNextAlarm(now, nextUserAlarmTime);
} else {
notifyCondition(conditionId, Condition.STATE_FALSE, "!meetsSchedule");
+ removeSnoozed(conditionId);
if (nextUserAlarmTime == 0) {
cal.maybeSetNextAlarm(now, nextUserAlarmTime);
}
@@ -194,7 +211,7 @@
return info != null ? info.getTriggerTime() : 0;
}
- private static boolean meetsSchedule(ScheduleCalendar cal, long time) {
+ private boolean meetsSchedule(ScheduleCalendar cal, long time) {
return cal != null && cal.isInSchedule(time);
}
@@ -237,6 +254,62 @@
return new Condition(id, summary, line1, line2, 0, state, Condition.FLAG_RELEVANT_ALWAYS);
}
+ private boolean conditionSnoozed(Uri conditionId) {
+ synchronized (mSnoozed) {
+ return mSnoozed.contains(conditionId);
+ }
+ }
+
+ private void addSnoozed(Uri conditionId) {
+ synchronized (mSnoozed) {
+ mSnoozed.add(conditionId);
+ saveSnoozedLocked();
+ }
+ }
+
+ private void removeSnoozed(Uri conditionId) {
+ synchronized (mSnoozed) {
+ mSnoozed.remove(conditionId);
+ saveSnoozedLocked();
+ }
+ }
+
+ public void saveSnoozedLocked() {
+ final String setting = TextUtils.join(SEPARATOR, mSnoozed);
+ final int currentUser = ActivityManager.getCurrentUser();
+ Settings.Secure.putStringForUser(mContext.getContentResolver(),
+ SCP_SETTING,
+ setting,
+ currentUser);
+ }
+
+ public void readSnoozed() {
+ synchronized (mSnoozed) {
+ long identity = Binder.clearCallingIdentity();
+ try {
+ final String setting = Settings.Secure.getStringForUser(
+ mContext.getContentResolver(),
+ SCP_SETTING,
+ ActivityManager.getCurrentUser());
+ if (setting != null) {
+ final String[] tokens = setting.split(SEPARATOR);
+ for (int i = 0; i < tokens.length; i++) {
+ String token = tokens[i];
+ if (token != null) {
+ token = token.trim();
+ }
+ if (TextUtils.isEmpty(token)) {
+ continue;
+ }
+ mSnoozed.add(Uri.parse(token));
+ }
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+ }
+
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/services/core/java/com/android/server/notification/ZenModeFiltering.java b/services/core/java/com/android/server/notification/ZenModeFiltering.java
index 80dc523..cbaad46 100644
--- a/services/core/java/com/android/server/notification/ZenModeFiltering.java
+++ b/services/core/java/com/android/server/notification/ZenModeFiltering.java
@@ -81,7 +81,9 @@
if (zen == Global.ZEN_MODE_NO_INTERRUPTIONS) return false; // nothing gets through
if (zen == Global.ZEN_MODE_ALARMS) return false; // not an alarm
if (zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) {
- if (config.allowRepeatCallers && REPEAT_CALLERS.isRepeat(context, extras)) return true;
+ if (config.allowRepeatCallers && REPEAT_CALLERS.isRepeat(context, extras)) {
+ return true;
+ }
if (!config.allowCalls) return false; // no other calls get through
if (validator != null) {
final float contactAffinity = validator.getContactAffinity(userHandle, extras,
@@ -97,6 +99,10 @@
? record.sbn.getNotification().extras : null;
}
+ protected void recordCall(NotificationRecord record) {
+ REPEAT_CALLERS.recordCall(mContext, extras(record));
+ }
+
public boolean shouldIntercept(int zen, ZenModeConfig config, NotificationRecord record) {
if (isSystem(record)) {
return false;
@@ -233,28 +239,45 @@
}
private static class RepeatCallers {
+ // Person : time
private final ArrayMap<String, Long> mCalls = new ArrayMap<>();
private int mThresholdMinutes;
+ private synchronized void recordCall(Context context, Bundle extras) {
+ setThresholdMinutes(context);
+ if (mThresholdMinutes <= 0 || extras == null) return;
+ final String peopleString = peopleString(extras);
+ if (peopleString == null) return;
+ final long now = System.currentTimeMillis();
+ cleanUp(mCalls, now);
+ mCalls.put(peopleString, now);
+ }
+
private synchronized boolean isRepeat(Context context, Bundle extras) {
- if (mThresholdMinutes <= 0) {
- mThresholdMinutes = context.getResources().getInteger(com.android.internal.R.integer
- .config_zen_repeat_callers_threshold);
- }
+ setThresholdMinutes(context);
if (mThresholdMinutes <= 0 || extras == null) return false;
final String peopleString = peopleString(extras);
if (peopleString == null) return false;
final long now = System.currentTimeMillis();
- final int N = mCalls.size();
+ cleanUp(mCalls, now);
+ return mCalls.containsKey(peopleString);
+ }
+
+ private synchronized void cleanUp(ArrayMap<String, Long> calls, long now) {
+ final int N = calls.size();
for (int i = N - 1; i >= 0; i--) {
final long time = mCalls.valueAt(i);
if (time > now || (now - time) > mThresholdMinutes * 1000 * 60) {
- mCalls.removeAt(i);
+ calls.removeAt(i);
}
}
- final boolean isRepeat = mCalls.containsKey(peopleString);
- mCalls.put(peopleString, now);
- return isRepeat;
+ }
+
+ private void setThresholdMinutes(Context context) {
+ if (mThresholdMinutes <= 0) {
+ mThresholdMinutes = context.getResources().getInteger(com.android.internal.R.integer
+ .config_zen_repeat_callers_threshold);
+ }
}
private static String peopleString(Bundle extras) {
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 41b78f6..4393761 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -54,7 +54,6 @@
import android.service.notification.ZenModeConfig.EventInfo;
import android.service.notification.ZenModeConfig.ScheduleInfo;
import android.service.notification.ZenModeConfig.ZenRule;
-import android.text.TextUtils;
import android.util.AndroidRuntimeException;
import android.util.Log;
import android.util.SparseArray;
@@ -140,8 +139,7 @@
ValidateNotificationPeople validator, int contactsTimeoutMs, float timeoutAffinity) {
synchronized (mConfig) {
return ZenModeFiltering.matchesCallFilter(mContext, mZenMode, mConfig, userHandle,
- extras,
- validator, contactsTimeoutMs, timeoutAffinity);
+ extras, validator, contactsTimeoutMs, timeoutAffinity);
}
}
@@ -149,6 +147,10 @@
return mFiltering.isCall(record);
}
+ public void recordCaller(NotificationRecord record) {
+ mFiltering.recordCall(record);
+ }
+
public boolean shouldIntercept(NotificationRecord record) {
synchronized (mConfig) {
return mFiltering.shouldIntercept(mZenMode, mConfig, record);
@@ -229,7 +231,7 @@
public void requestFromListener(ComponentName name, int filter) {
final int newZen = NotificationManager.zenModeFromInterruptionFilter(filter, -1);
if (newZen != -1) {
- setManualZenMode(newZen, null,
+ setManualZenMode(newZen, null, name != null ? name.getPackageName() : null,
"listener:" + (name != null ? name.flattenToShortString() : null));
}
}
@@ -452,11 +454,11 @@
rule.creationTime);
}
- public void setManualZenMode(int zenMode, Uri conditionId, String reason) {
- setManualZenMode(zenMode, conditionId, reason, true /*setRingerMode*/);
+ public void setManualZenMode(int zenMode, Uri conditionId, String caller, String reason) {
+ setManualZenMode(zenMode, conditionId, reason, caller, true /*setRingerMode*/);
}
- private void setManualZenMode(int zenMode, Uri conditionId, String reason,
+ private void setManualZenMode(int zenMode, Uri conditionId, String reason, String caller,
boolean setRingerMode) {
ZenModeConfig newConfig;
synchronized (mConfig) {
@@ -478,6 +480,7 @@
newRule.enabled = true;
newRule.zenMode = zenMode;
newRule.conditionId = conditionId;
+ newRule.enabler = caller;
newConfig.manualRule = newRule;
}
setConfigLocked(newConfig, reason, setRingerMode);
@@ -950,7 +953,8 @@
break;
}
if (newZen != -1) {
- setManualZenMode(newZen, null, "ringerModeInternal", false /*setRingerMode*/);
+ setManualZenMode(newZen, null, "ringerModeInternal", null,
+ false /*setRingerMode*/);
}
if (isChange || newZen != -1 || ringerModeExternal != ringerModeExternalOut) {
@@ -988,7 +992,8 @@
break;
}
if (newZen != -1) {
- setManualZenMode(newZen, null, "ringerModeExternal", false /*setRingerMode*/);
+ setManualZenMode(newZen, null, "ringerModeExternal", caller,
+ false /*setRingerMode*/);
}
ZenLog.traceSetRingerModeExternal(ringerModeOld, ringerModeNew, caller,
diff --git a/services/core/java/com/android/server/pm/AbstractStatsBase.java b/services/core/java/com/android/server/pm/AbstractStatsBase.java
new file mode 100644
index 0000000..612c476
--- /dev/null
+++ b/services/core/java/com/android/server/pm/AbstractStatsBase.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.pm;
+
+import android.os.Environment;
+import android.os.SystemClock;
+import android.util.AtomicFile;
+
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A simple base class for statistics that need to be saved/restored from a dedicated file. This
+ * class provides a base implementation that:
+ * <ul>
+ * <li>Provide an AtomicFile to the actual read/write code
+ * <li>A background-thread write and a synchronous write
+ * <li>Write-limiting for the background-thread (by default writes are at least 30 minutes apart)
+ * <li>Can lock on the provided data object before writing
+ * </ul>
+ * For completion, a subclass needs to implement actual {@link #writeInternal(Object) writing} and
+ * {@link #readInternal(Object) reading}.
+ */
+public abstract class AbstractStatsBase<T> {
+
+ private static final int WRITE_INTERVAL_MS =
+ (PackageManagerService.DEBUG_DEXOPT) ? 0 : 30*60*1000;
+ private final Object mFileLock = new Object();
+ private final AtomicLong mLastTimeWritten = new AtomicLong(0);
+ private final AtomicBoolean mBackgroundWriteRunning = new AtomicBoolean(false);
+ private final String mFileName;
+ private final String mBackgroundThreadName;
+ private final boolean mLock;
+
+ protected AbstractStatsBase(String fileName, String threadName, boolean lock) {
+ mFileName = fileName;
+ mBackgroundThreadName = threadName;
+ mLock = lock;
+ }
+
+ protected AtomicFile getFile() {
+ File dataDir = Environment.getDataDirectory();
+ File systemDir = new File(dataDir, "system");
+ File fname = new File(systemDir, mFileName);
+ return new AtomicFile(fname);
+ }
+
+ void writeNow(final T data) {
+ writeImpl(data);
+ mLastTimeWritten.set(SystemClock.elapsedRealtime());
+ }
+
+ boolean maybeWriteAsync(final T data) {
+ if (SystemClock.elapsedRealtime() - mLastTimeWritten.get() < WRITE_INTERVAL_MS
+ && !PackageManagerService.DEBUG_DEXOPT) {
+ return false;
+ }
+
+ if (mBackgroundWriteRunning.compareAndSet(false, true)) {
+ new Thread(mBackgroundThreadName) {
+ @Override
+ public void run() {
+ try {
+ writeImpl(data);
+ mLastTimeWritten.set(SystemClock.elapsedRealtime());
+ } finally {
+ mBackgroundWriteRunning.set(false);
+ }
+ }
+ }.start();
+ return true;
+ }
+
+ return false;
+ }
+
+ private void writeImpl(T data) {
+ if (mLock) {
+ synchronized (data) {
+ synchronized (mFileLock) {
+ writeInternal(data);
+ }
+ }
+ } else {
+ synchronized (mFileLock) {
+ writeInternal(data);
+ }
+ }
+ }
+
+ protected abstract void writeInternal(T data);
+
+ void read(T data) {
+ if (mLock) {
+ synchronized (data) {
+ synchronized (mFileLock) {
+ readInternal(data);
+ }
+ }
+ } else {
+ synchronized (mFileLock) {
+ readInternal(data);
+ }
+ }
+ // We use the current time as last-written. read() is called on system server startup
+ // (current situation), and we want to postpone I/O at boot.
+ mLastTimeWritten.set(SystemClock.elapsedRealtime());
+ }
+
+ protected abstract void readInternal(T data);
+}
diff --git a/services/core/java/com/android/server/pm/CompilerStats.java b/services/core/java/com/android/server/pm/CompilerStats.java
new file mode 100644
index 0000000..8c2fc3e
--- /dev/null
+++ b/services/core/java/com/android/server/pm/CompilerStats.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.pm;
+
+import android.util.ArrayMap;
+import android.util.AtomicFile;
+import android.util.Log;
+
+import com.android.internal.util.FastPrintWriter;
+import com.android.internal.util.IndentingPrintWriter;
+
+import libcore.io.IoUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A class that collects, serializes and deserializes compiler-related statistics on a
+ * per-package per-code-path basis.
+ *
+ * Currently used to track compile times.
+ */
+class CompilerStats extends AbstractStatsBase<Void> {
+
+ private final static String COMPILER_STATS_VERSION_HEADER = "PACKAGE_MANAGER__COMPILER_STATS__";
+ private final static int COMPILER_STATS_VERSION = 1;
+
+ /**
+ * Class to collect all stats pertaining to one package.
+ */
+ static class PackageStats {
+
+ private final String packageName;
+
+ /**
+ * This map stores compile-times for all code paths in the package. The value
+ * is in milliseconds.
+ */
+ private final Map<String, Long> compileTimePerCodePath;
+
+ /**
+ * @param packageName
+ */
+ public PackageStats(String packageName) {
+ this.packageName = packageName;
+ // We expect at least one element in here, but let's make it minimal.
+ compileTimePerCodePath = new ArrayMap<>(2);
+ }
+
+ public String getPackageName() {
+ return packageName;
+ }
+
+ /**
+ * Return the recorded compile time for a given code path. Returns
+ * 0 if there is no recorded time.
+ */
+ public long getCompileTime(String codePath) {
+ String storagePath = getStoredPathFromCodePath(codePath);
+ synchronized (compileTimePerCodePath) {
+ Long l = compileTimePerCodePath.get(storagePath);
+ if (l == null) {
+ return 0;
+ }
+ return l;
+ }
+ }
+
+ public void setCompileTime(String codePath, long compileTimeInMs) {
+ String storagePath = getStoredPathFromCodePath(codePath);
+ synchronized (compileTimePerCodePath) {
+ if (compileTimeInMs <= 0) {
+ compileTimePerCodePath.remove(storagePath);
+ } else {
+ compileTimePerCodePath.put(storagePath, compileTimeInMs);
+ }
+ }
+ }
+
+ private static String getStoredPathFromCodePath(String codePath) {
+ int lastSlash = codePath.lastIndexOf(File.separatorChar);
+ return codePath.substring(lastSlash + 1);
+ }
+
+ public void dump(IndentingPrintWriter ipw) {
+ synchronized (compileTimePerCodePath) {
+ if (compileTimePerCodePath.size() == 0) {
+ ipw.println("(No recorded stats)");
+ } else {
+ for (Map.Entry<String, Long> e : compileTimePerCodePath.entrySet()) {
+ ipw.println(" " + e.getKey() + " - " + e.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ private final Map<String, PackageStats> packageStats;
+
+ public CompilerStats() {
+ super("package-cstats.list", "CompilerStats_DiskWriter", /* lock */ false);
+ packageStats = new HashMap<>();
+ }
+
+ public PackageStats getPackageStats(String packageName) {
+ synchronized (packageStats) {
+ return packageStats.get(packageName);
+ }
+ }
+
+ public void setPackageStats(String packageName, PackageStats stats) {
+ synchronized (packageStats) {
+ packageStats.put(packageName, stats);
+ }
+ }
+
+ public PackageStats createPackageStats(String packageName) {
+ synchronized (packageStats) {
+ PackageStats newStats = new PackageStats(packageName);
+ packageStats.put(packageName, newStats);
+ return newStats;
+ }
+ }
+
+ public PackageStats getOrCreatePackageStats(String packageName) {
+ synchronized (packageStats) {
+ PackageStats existingStats = packageStats.get(packageName);
+ if (existingStats != null) {
+ return existingStats;
+ }
+
+ return createPackageStats(packageName);
+ }
+ }
+
+ public void deletePackageStats(String packageName) {
+ synchronized (packageStats) {
+ packageStats.remove(packageName);
+ }
+ }
+
+ // I/O
+
+ // The encoding is simple:
+ //
+ // 1) The first line is a line consisting of the version header and the version number.
+ //
+ // 2) The rest of the file is package data.
+ // 2.1) A package is started by any line not starting with "-";
+ // 2.2) Any line starting with "-" is code path data. The format is:
+ // '-'{code-path}':'{compile-time}
+
+ public void write(Writer out) {
+ @SuppressWarnings("resource")
+ FastPrintWriter fpw = new FastPrintWriter(out);
+
+ fpw.print(COMPILER_STATS_VERSION_HEADER);
+ fpw.println(COMPILER_STATS_VERSION);
+
+ synchronized (packageStats) {
+ for (PackageStats pkg : packageStats.values()) {
+ synchronized (pkg.compileTimePerCodePath) {
+ if (!pkg.compileTimePerCodePath.isEmpty()) {
+ fpw.println(pkg.getPackageName());
+
+ for (Map.Entry<String, Long> e : pkg.compileTimePerCodePath.entrySet()) {
+ fpw.println("-" + e.getKey() + ":" + e.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ fpw.flush();
+ }
+
+ public boolean read(Reader r) {
+ synchronized (packageStats) {
+ // TODO: Could make this a final switch, then we wouldn't have to synchronize over
+ // the whole reading.
+ packageStats.clear();
+
+ try {
+ BufferedReader in = new BufferedReader(r);
+
+ // Read header, do version check.
+ String versionLine = in.readLine();
+ if (versionLine == null) {
+ throw new IllegalArgumentException("No version line found.");
+ } else {
+ if (!versionLine.startsWith(COMPILER_STATS_VERSION_HEADER)) {
+ throw new IllegalArgumentException("Invalid version line: " + versionLine);
+ }
+ int version = Integer.parseInt(
+ versionLine.substring(COMPILER_STATS_VERSION_HEADER.length()));
+ if (version != COMPILER_STATS_VERSION) {
+ // TODO: Upgrade older formats? For now, just reject and regenerate.
+ throw new IllegalArgumentException("Unexpected version: " + version);
+ }
+ }
+
+ // For simpler code, we ignore any data lines before the first package. We
+ // collect it in a fake package.
+ PackageStats currentPackage = new PackageStats("fake package");
+
+ String s = null;
+ while ((s = in.readLine()) != null) {
+ if (s.startsWith("-")) {
+ int colonIndex = s.indexOf(':');
+ if (colonIndex == -1 || colonIndex == 1) {
+ throw new IllegalArgumentException("Could not parse data " + s);
+ }
+ String codePath = s.substring(1, colonIndex);
+ long time = Long.parseLong(s.substring(colonIndex + 1));
+ currentPackage.setCompileTime(codePath, time);
+ } else {
+ currentPackage = getOrCreatePackageStats(s);
+ }
+ }
+ } catch (Exception e) {
+ Log.e(PackageManagerService.TAG, "Error parsing compiler stats", e);
+ return false;
+ }
+
+ return true;
+ }
+ }
+
+ void writeNow() {
+ writeNow(null);
+ }
+
+ boolean maybeWriteAsync() {
+ return maybeWriteAsync(null);
+ }
+
+ @Override
+ protected void writeInternal(Void data) {
+ AtomicFile file = getFile();
+ FileOutputStream f = null;
+
+ try {
+ f = file.startWrite();
+ OutputStreamWriter osw = new OutputStreamWriter(f);
+ write(osw);
+ osw.flush();
+ file.finishWrite(f);
+ } catch (IOException e) {
+ if (f != null) {
+ file.failWrite(f);
+ }
+ Log.e(PackageManagerService.TAG, "Failed to write compiler stats", e);
+ }
+ }
+
+ void read() {
+ read((Void)null);
+ }
+
+ @Override
+ protected void readInternal(Void data) {
+ AtomicFile file = getFile();
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new InputStreamReader(file.openRead()));
+ read(in);
+ } catch (FileNotFoundException expected) {
+ } finally {
+ IoUtils.closeQuietly(in);
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 098b39e..9c9e97e 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -31,6 +31,7 @@
import android.net.Uri;
import android.os.Build;
import android.os.UserHandle;
+import android.os.storage.StorageManager;
import android.print.PrintManager;
import android.provider.CalendarContract;
import android.provider.ContactsContract;
@@ -473,6 +474,7 @@
if (emailPackage != null
&& doesPackageSupportRuntimePermissions(emailPackage)) {
grantRuntimePermissionsLPw(emailPackage, CONTACTS_PERMISSIONS, userId);
+ grantRuntimePermissionsLPw(emailPackage, CALENDAR_PERMISSIONS, userId);
}
// Browser
@@ -605,6 +607,15 @@
grantRuntimePermissionsLPw(nfcTagPkg, CONTACTS_PERMISSIONS, false, userId);
grantRuntimePermissionsLPw(nfcTagPkg, PHONE_PERMISSIONS, false, userId);
}
+
+ // Storage Manager
+ Intent storageManagerIntent = new Intent(StorageManager.ACTION_MANAGE_STORAGE);
+ PackageParser.Package storageManagerPckg = getDefaultSystemHandlerActivityPackageLPr(
+ storageManagerIntent, userId);
+ if (storageManagerPckg != null
+ && doesPackageSupportRuntimePermissions(storageManagerPckg)) {
+ grantRuntimePermissionsLPw(storageManagerPckg, STORAGE_PERMISSIONS, true, userId);
+ }
mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
}
}
@@ -619,6 +630,7 @@
grantRuntimePermissionsLPw(dialerPackage, CONTACTS_PERMISSIONS, userId);
grantRuntimePermissionsLPw(dialerPackage, SMS_PERMISSIONS, userId);
grantRuntimePermissionsLPw(dialerPackage, MICROPHONE_PERMISSIONS, userId);
+ grantRuntimePermissionsLPw(dialerPackage, CAMERA_PERMISSIONS, userId);
}
}
@@ -656,6 +668,7 @@
grantRuntimePermissionsLPw(dialerPackage, CONTACTS_PERMISSIONS, false, true, userId);
grantRuntimePermissionsLPw(dialerPackage, SMS_PERMISSIONS, false, true, userId);
grantRuntimePermissionsLPw(dialerPackage, MICROPHONE_PERMISSIONS, false, true, userId);
+ grantRuntimePermissionsLPw(dialerPackage, CAMERA_PERMISSIONS, false, true, userId);
}
}
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index 7b85a4f..72c549f 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -61,6 +61,13 @@
mInstaller = new InstallerConnection();
}
+ // Package-private installer that accepts a custom InstallerConnection. Used for
+ // OtaDexoptService.
+ Installer(Context context, InstallerConnection connection) {
+ super(context);
+ mInstaller = connection;
+ }
+
/**
* Yell loudly if someone tries making future calls while holding a lock on
* the given object.
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 46da607..cd5bcd4 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -17,8 +17,9 @@
package com.android.server.pm;
import android.annotation.NonNull;
-import android.annotation.Nullable;
import android.annotation.UserIdInt;
+import android.app.ActivityManager;
+import android.app.ActivityManagerInternal;
import android.app.AppGlobals;
import android.content.ComponentName;
import android.content.Context;
@@ -98,6 +99,7 @@
private final Context mContext;
private final PackageManager mPm;
private final UserManager mUm;
+ private final ActivityManagerInternal mActivityManagerInternal;
private final ShortcutServiceInternal mShortcutServiceInternal;
private final PackageCallbackList<IOnAppsChangedListener> mListeners
= new PackageCallbackList<IOnAppsChangedListener>();
@@ -110,6 +112,8 @@
mContext = context;
mPm = mContext.getPackageManager();
mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ mActivityManagerInternal = Preconditions.checkNotNull(
+ LocalServices.getService(ActivityManagerInternal.class));
mShortcutServiceInternal = Preconditions.checkNotNull(
LocalServices.getService(ShortcutServiceInternal.class));
mShortcutServiceInternal.addListener(mPackageMonitor);
@@ -448,23 +452,41 @@
ensureShortcutPermission(callingPackage, userId);
}
- final Intent intent = mShortcutServiceInternal.createShortcutIntent(getCallingUserId(),
- callingPackage, packageName, shortcutId, userId);
- if (intent == null) {
+ final Intent[] intents = mShortcutServiceInternal.createShortcutIntents(
+ getCallingUserId(), callingPackage, packageName, shortcutId, userId);
+ if (intents == null || intents.length == 0) {
return false;
}
// Note the target activity doesn't have to be exported.
- intent.setSourceBounds(sourceBounds);
- prepareIntentForLaunch(intent, sourceBounds);
+ intents[0].addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intents[0].setSourceBounds(sourceBounds);
- final long ident = Binder.clearCallingIdentity();
+ return startShortcutIntentsAsPublisher(
+ intents, packageName, startActivityOptions, userId);
+ }
+
+ private boolean startShortcutIntentsAsPublisher(@NonNull Intent[] intents,
+ @NonNull String publisherPackage, Bundle startActivityOptions, int userId) {
+ final int code;
+ final long ident = injectClearCallingIdentity();
try {
- mContext.startActivityAsUser(intent, startActivityOptions, UserHandle.of(userId));
+ code = mActivityManagerInternal.startActivitiesAsPackage(publisherPackage,
+ userId, intents, startActivityOptions);
+ if (code >= ActivityManager.START_SUCCESS) {
+ return true; // Success
+ } else {
+ Log.e(TAG, "Couldn't start activity, code=" + code);
+ }
+ return code >= ActivityManager.START_SUCCESS;
+ } catch (SecurityException e) {
+ if (DEBUG) {
+ Slog.d(TAG, "SecurityException while launching intent", e);
+ }
+ return false;
} finally {
- Binder.restoreCallingIdentity(ident);
+ injectRestoreCallingIdentity(ident);
}
- return true;
}
@Override
@@ -498,7 +520,9 @@
Intent launchIntent = new Intent(Intent.ACTION_MAIN);
launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);
- prepareIntentForLaunch(launchIntent, sourceBounds);
+ launchIntent.setSourceBounds(sourceBounds);
+ launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
launchIntent.setPackage(component.getPackageName());
long ident = Binder.clearCallingIdentity();
@@ -539,13 +563,6 @@
}
}
- private void prepareIntentForLaunch(@NonNull Intent launchIntent,
- @Nullable Rect sourceBounds) {
- launchIntent.setSourceBounds(sourceBounds);
- launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
- }
-
@Override
public void showAppDetailsAsUser(ComponentName component, Rect sourceBounds,
Bundle opts, UserHandle user) throws RemoteException {
diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java
index df91f4a..c5f3cfd3b 100644
--- a/services/core/java/com/android/server/pm/OtaDexoptService.java
+++ b/services/core/java/com/android/server/pm/OtaDexoptService.java
@@ -32,10 +32,12 @@
import android.util.Log;
import android.util.Slog;
+import com.android.internal.os.InstallerConnection;
import com.android.internal.os.InstallerConnection.InstallerException;
import java.io.File;
import java.io.FileDescriptor;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -49,21 +51,21 @@
private final static boolean DEBUG_DEXOPT = true;
private final Context mContext;
- private final PackageDexOptimizer mPackageDexOptimizer;
private final PackageManagerService mPackageManagerService;
// TODO: Evaluate the need for WeakReferences here.
- private List<PackageParser.Package> mDexoptPackages;
+
+ /**
+ * The list of dexopt invocations for all work.
+ */
+ private List<String> mDexoptCommands;
+
private int completeSize;
public OtaDexoptService(Context context, PackageManagerService packageManagerService) {
this.mContext = context;
this.mPackageManagerService = packageManagerService;
- // Use the package manager install and install lock here for the OTA dex optimizer.
- mPackageDexOptimizer = new OTADexoptPackageDexOptimizer(packageManagerService.mInstaller,
- packageManagerService.mInstallLock, context);
-
// Now it's time to check whether we need to move any A/B artifacts.
moveAbArtifacts(packageManagerService.mInstaller);
}
@@ -85,14 +87,43 @@
@Override
public synchronized void prepare() throws RemoteException {
- if (mDexoptPackages != null) {
+ if (mDexoptCommands != null) {
throw new IllegalStateException("already called prepare()");
}
synchronized (mPackageManagerService.mPackages) {
- mDexoptPackages = PackageManagerServiceUtils.getPackagesForDexopt(
+ // Important: the packages we need to run with ab-ota compiler-reason.
+ List<PackageParser.Package> important = PackageManagerServiceUtils.getPackagesForDexopt(
mPackageManagerService.mPackages.values(), mPackageManagerService);
+ // Others: we should optimize this with the (first-)boot compiler-reason.
+ List<PackageParser.Package> others =
+ new ArrayList<>(mPackageManagerService.mPackages.values());
+ others.removeAll(important);
+
+ // Pre-size the array list by over-allocating by a factor of 1.5.
+ mDexoptCommands = new ArrayList<>(3 * mPackageManagerService.mPackages.size() / 2);
+
+ for (PackageParser.Package p : important) {
+ // Make sure that core apps are optimized according to their own "reason".
+ // If the core apps are not preopted in the B OTA, and REASON_AB_OTA is not speed
+ // (by default is speed-profile) they will be interepreted/JITed. This in itself is
+ // not a problem as we will end up doing profile guided compilation. However, some
+ // core apps may be loaded by system server which doesn't JIT and we need to make
+ // sure we don't interpret-only
+ int compilationReason = p.coreApp
+ ? PackageManagerService.REASON_CORE_APP
+ : PackageManagerService.REASON_AB_OTA;
+ mDexoptCommands.addAll(generatePackageDexopts(p, compilationReason));
+ }
+ for (PackageParser.Package p : others) {
+ // We assume here that there are no core apps left.
+ if (p.coreApp) {
+ throw new IllegalStateException("Found a core app that's not important");
+ }
+ mDexoptCommands.addAll(
+ generatePackageDexopts(p, PackageManagerService.REASON_FIRST_BOOT));
+ }
}
- completeSize = mDexoptPackages.size();
+ completeSize = mDexoptCommands.size();
}
@Override
@@ -100,43 +131,52 @@
if (DEBUG_DEXOPT) {
Log.i(TAG, "Cleaning up OTA Dexopt state.");
}
- mDexoptPackages = null;
+ mDexoptCommands = null;
}
@Override
public synchronized boolean isDone() throws RemoteException {
- if (mDexoptPackages == null) {
+ if (mDexoptCommands == null) {
throw new IllegalStateException("done() called before prepare()");
}
- return mDexoptPackages.isEmpty();
+ return mDexoptCommands.isEmpty();
}
@Override
public synchronized float getProgress() throws RemoteException {
+ // Approximate the progress by the amount of already completed commands.
if (completeSize == 0) {
return 1f;
}
- return (completeSize - mDexoptPackages.size()) / ((float)completeSize);
+ int commandsLeft = mDexoptCommands.size();
+ return (completeSize - commandsLeft) / ((float)completeSize);
}
@Override
- public synchronized void dexoptNextPackage() throws RemoteException {
- if (mDexoptPackages == null) {
+ public synchronized String nextDexoptCommand() throws RemoteException {
+ if (mDexoptCommands == null) {
throw new IllegalStateException("dexoptNextPackage() called before prepare()");
}
- if (mDexoptPackages.isEmpty()) {
- // Tolerate repeated calls.
- return;
+
+ if (mDexoptCommands.isEmpty()) {
+ return "(all done)";
}
- PackageParser.Package nextPackage = mDexoptPackages.remove(0);
+ String next = mDexoptCommands.remove(0);
- if (DEBUG_DEXOPT) {
- Log.i(TAG, "Processing " + nextPackage.packageName + " for OTA dexopt.");
+ if (IsFreeSpaceAvailable()) {
+ return next;
+ } else {
+ mDexoptCommands.clear();
+ return "(no free space)";
}
+ }
- // Check for low space.
+ /**
+ * Check for low space. Returns true if there's space left.
+ */
+ private boolean IsFreeSpaceAvailable() {
// TODO: If apps are not installed in the internal /data partition, we should compare
// against that storage's free capacity.
File dataDir = Environment.getDataDirectory();
@@ -146,19 +186,37 @@
throw new IllegalStateException("Invalid low memory threshold");
}
long usableSpace = dataDir.getUsableSpace();
- if (usableSpace < lowThreshold) {
- Log.w(TAG, "Not running dexopt on " + nextPackage.packageName + " due to low memory: " +
- usableSpace);
- return;
- }
+ return (usableSpace >= lowThreshold);
+ }
- mPackageDexOptimizer.performDexOpt(nextPackage, nextPackage.usesLibraryFiles,
+ /**
+ * Generate all dexopt commands for the given package.
+ */
+ private synchronized List<String> generatePackageDexopts(PackageParser.Package pkg,
+ int compilationReason) {
+ // Use our custom connection that just collects the commands.
+ RecordingInstallerConnection collectingConnection = new RecordingInstallerConnection();
+ Installer collectingInstaller = new Installer(mContext, collectingConnection);
+
+ // Use the package manager install and install lock here for the OTA dex optimizer.
+ PackageDexOptimizer optimizer = new OTADexoptPackageDexOptimizer(
+ collectingInstaller, mPackageManagerService.mInstallLock, mContext);
+
+ optimizer.performDexOpt(pkg, pkg.usesLibraryFiles,
null /* ISAs */, false /* checkProfiles */,
- getCompilerFilterForReason(PackageManagerService.REASON_AB_OTA));
+ getCompilerFilterForReason(compilationReason),
+ null /* CompilerStats.PackageStats */);
+
+ return collectingConnection.commands;
+ }
+
+ @Override
+ public synchronized void dexoptNextPackage() throws RemoteException {
+ throw new UnsupportedOperationException();
}
private void moveAbArtifacts(Installer installer) {
- if (mDexoptPackages != null) {
+ if (mDexoptCommands != null) {
throw new IllegalStateException("Should not be ota-dexopting when trying to move.");
}
@@ -218,4 +276,40 @@
}
}
+
+ private static class RecordingInstallerConnection extends InstallerConnection {
+ public List<String> commands = new ArrayList<String>(1);
+
+ @Override
+ public void setWarnIfHeld(Object warnIfHeld) {
+ throw new IllegalStateException("Should not reach here");
+ }
+
+ @Override
+ public synchronized String transact(String cmd) {
+ commands.add(cmd);
+ return "0";
+ }
+
+ @Override
+ public boolean mergeProfiles(int uid, String pkgName) throws InstallerException {
+ throw new IllegalStateException("Should not reach here");
+ }
+
+ @Override
+ public boolean dumpProfiles(String gid, String packageName, String codePaths)
+ throws InstallerException {
+ throw new IllegalStateException("Should not reach here");
+ }
+
+ @Override
+ public void disconnect() {
+ throw new IllegalStateException("Should not reach here");
+ }
+
+ @Override
+ public void waitForConnection() {
+ throw new IllegalStateException("Should not reach here");
+ }
+ }
}
diff --git a/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java b/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java
index e8fdfa5..bbd4048 100644
--- a/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java
+++ b/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java
@@ -46,6 +46,8 @@
return runOtaDone();
case "step":
return runOtaStep();
+ case "next":
+ return runOtaNext();
case "progress":
return runOtaProgress();
default:
@@ -83,6 +85,11 @@
return 0;
}
+ private int runOtaNext() throws RemoteException {
+ getOutPrintWriter().println(mInterface.nextDexoptCommand());
+ return 0;
+ }
+
private int runOtaProgress() throws RemoteException {
final float progress = mInterface.getProgress();
final PrintWriter pw = getOutPrintWriter();
@@ -103,6 +110,8 @@
pw.println(" Replies whether the OTA is complete or not.");
pw.println(" step");
pw.println(" OTA dexopt the next package.");
+ pw.println(" next");
+ pw.println(" Get parameters for OTA dexopt of the next package.");
pw.println(" cleanup");
pw.println(" Clean up internal states. Ends an OTA session.");
}
diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index 26a840d..19b1201 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -90,7 +90,8 @@
* synchronized on {@link #mInstallLock}.
*/
int performDexOpt(PackageParser.Package pkg, String[] sharedLibraries,
- String[] instructionSets, boolean checkProfiles, String targetCompilationFilter) {
+ String[] instructionSets, boolean checkProfiles, String targetCompilationFilter,
+ CompilerStats.PackageStats packageStats) {
synchronized (mInstallLock) {
final boolean useLock = mSystemReady;
if (useLock) {
@@ -99,7 +100,7 @@
}
try {
return performDexOptLI(pkg, sharedLibraries, instructionSets, checkProfiles,
- targetCompilationFilter);
+ targetCompilationFilter, packageStats);
} finally {
if (useLock) {
mDexoptWakeLock.release();
@@ -150,7 +151,8 @@
}
private int performDexOptLI(PackageParser.Package pkg, String[] sharedLibraries,
- String[] targetInstructionSets, boolean checkProfiles, String targetCompilerFilter) {
+ String[] targetInstructionSets, boolean checkProfiles, String targetCompilerFilter,
+ CompilerStats.PackageStats packageStats) {
final String[] instructionSets = targetInstructionSets != null ?
targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo);
@@ -254,10 +256,17 @@
| DEXOPT_BOOTCOMPLETE);
try {
+ long startTime = System.currentTimeMillis();
+
mInstaller.dexopt(path, sharedGid, pkg.packageName, dexCodeInstructionSet,
dexoptNeeded, oatDir, dexFlags, targetCompilerFilter, pkg.volumeUuid,
sharedLibrariesPath);
performedDexOpt = true;
+
+ if (packageStats != null) {
+ long endTime = System.currentTimeMillis();
+ packageStats.setCompileTime(path, (int)(endTime - startTime));
+ }
} catch (InstallerException e) {
Slog.w(TAG, "Failed to dexopt", e);
successfulDexOpt = false;
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 83af017..6a56fa6 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -182,6 +182,10 @@
*/
private final Random mRandom = new SecureRandom();
+ /** All sessions allocated */
+ @GuardedBy("mSessions")
+ private final SparseBooleanArray mAllocatedSessions = new SparseBooleanArray();
+
@GuardedBy("mSessions")
private final SparseArray<PackageInstallerSession> mSessions = new SparseArray<>();
@@ -365,6 +369,7 @@
// keep details around for dumpsys.
mHistoricalSessions.put(session.sessionId, session);
}
+ mAllocatedSessions.put(session.sessionId, true);
}
}
}
@@ -666,23 +671,26 @@
"Too many historical sessions for UID " + callingUid);
}
- final long createdMillis = System.currentTimeMillis();
sessionId = allocateSessionIdLocked();
+ }
- // We're staging to exactly one location
- File stageDir = null;
- String stageCid = null;
- if ((params.installFlags & PackageManager.INSTALL_INTERNAL) != 0) {
- final boolean isEphemeral =
- (params.installFlags & PackageManager.INSTALL_EPHEMERAL) != 0;
- stageDir = buildStageDir(params.volumeUuid, sessionId, isEphemeral);
- } else {
- stageCid = buildExternalStageCid(sessionId);
- }
+ final long createdMillis = System.currentTimeMillis();
+ // We're staging to exactly one location
+ File stageDir = null;
+ String stageCid = null;
+ if ((params.installFlags & PackageManager.INSTALL_INTERNAL) != 0) {
+ final boolean isEphemeral =
+ (params.installFlags & PackageManager.INSTALL_EPHEMERAL) != 0;
+ stageDir = buildStageDir(params.volumeUuid, sessionId, isEphemeral);
+ } else {
+ stageCid = buildExternalStageCid(sessionId);
+ }
- session = new PackageInstallerSession(mInternalCallback, mContext, mPm,
- mInstallThread.getLooper(), sessionId, userId, installerPackageName, callingUid,
- params, createdMillis, stageDir, stageCid, false, false);
+ session = new PackageInstallerSession(mInternalCallback, mContext, mPm,
+ mInstallThread.getLooper(), sessionId, userId, installerPackageName, callingUid,
+ params, createdMillis, stageDir, stageCid, false, false);
+
+ synchronized (mSessions) {
mSessions.put(sessionId, session);
}
@@ -765,8 +773,8 @@
int sessionId;
do {
sessionId = mRandom.nextInt(Integer.MAX_VALUE - 1) + 1;
- if (mSessions.get(sessionId) == null && mHistoricalSessions.get(sessionId) == null
- && !mLegacySessions.get(sessionId, false)) {
+ if (!mAllocatedSessions.get(sessionId, false)) {
+ mAllocatedSessions.put(sessionId, true);
return sessionId;
}
} while (n++ < 32);
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 62cdefa..5a233dd 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -76,8 +76,6 @@
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.content.pm.PackageParser.PARSE_IS_PRIVILEGED;
import static android.content.pm.PackageParser.isApkFile;
-import static android.os.Process.PACKAGE_INFO_GID;
-import static android.os.Process.SYSTEM_UID;
import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;
import static android.system.OsConstants.O_CREAT;
import static android.system.OsConstants.O_RDWR;
@@ -95,6 +93,7 @@
import static com.android.server.pm.InstructionSets.getPrimaryInstructionSet;
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getFullCompilerFilter;
+import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;
import static com.android.server.pm.PermissionsState.PERMISSION_OPERATION_FAILURE;
import static com.android.server.pm.PermissionsState.PERMISSION_OPERATION_SUCCESS;
import static com.android.server.pm.PermissionsState.PERMISSION_OPERATION_SUCCESS_GIDS_CHANGED;
@@ -180,6 +179,7 @@
import android.os.Message;
import android.os.Parcel;
import android.os.ParcelFileDescriptor;
+import android.os.PatternMatcher;
import android.os.Process;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
@@ -207,7 +207,6 @@
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
-import android.util.AtomicFile;
import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.ExceptionUtils;
@@ -266,7 +265,6 @@
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
-import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -279,7 +277,6 @@
import java.io.FileReader;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.security.DigestInputStream;
@@ -306,7 +303,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
/**
* Keep track of all those APKs everywhere.
@@ -627,9 +623,9 @@
@GuardedBy("mPackages")
final ArraySet<String> mFrozenPackages = new ArraySet<>();
- final ProtectedPackages mProtectedPackages = new ProtectedPackages();
+ final ProtectedPackages mProtectedPackages;
- boolean mRestoredSettings;
+ boolean mFirstBoot;
// System configuration read by SystemConfig.
final int[] mGlobalGids;
@@ -1129,205 +1125,10 @@
final @NonNull String mServicesSystemSharedLibraryPackageName;
final @NonNull String mSharedSystemSharedLibraryPackageName;
+ final boolean mPermissionReviewRequired;
+
private final PackageUsage mPackageUsage = new PackageUsage();
-
- private class PackageUsage {
- private static final int WRITE_INTERVAL
- = (DEBUG_DEXOPT) ? 0 : 30*60*1000; // 30m in ms
-
- private final Object mFileLock = new Object();
- private final AtomicLong mLastWritten = new AtomicLong(0);
- private final AtomicBoolean mBackgroundWriteRunning = new AtomicBoolean(false);
-
- private boolean mIsHistoricalPackageUsageAvailable = true;
-
- boolean isHistoricalPackageUsageAvailable() {
- return mIsHistoricalPackageUsageAvailable;
- }
-
- void write(boolean force) {
- if (force) {
- writeInternal();
- return;
- }
- if (SystemClock.elapsedRealtime() - mLastWritten.get() < WRITE_INTERVAL
- && !DEBUG_DEXOPT) {
- return;
- }
- if (mBackgroundWriteRunning.compareAndSet(false, true)) {
- new Thread("PackageUsage_DiskWriter") {
- @Override
- public void run() {
- try {
- writeInternal();
- } finally {
- mBackgroundWriteRunning.set(false);
- }
- }
- }.start();
- }
- }
-
- private void writeInternal() {
- synchronized (mPackages) {
- synchronized (mFileLock) {
- AtomicFile file = getFile();
- FileOutputStream f = null;
- try {
- f = file.startWrite();
- BufferedOutputStream out = new BufferedOutputStream(f);
- FileUtils.setPermissions(file.getBaseFile().getPath(),
- 0640, SYSTEM_UID, PACKAGE_INFO_GID);
- StringBuilder sb = new StringBuilder();
-
- sb.append(USAGE_FILE_MAGIC_VERSION_1);
- sb.append('\n');
- out.write(sb.toString().getBytes(StandardCharsets.US_ASCII));
-
- for (PackageParser.Package pkg : mPackages.values()) {
- if (pkg.getLatestPackageUseTimeInMills() == 0L) {
- continue;
- }
- sb.setLength(0);
- sb.append(pkg.packageName);
- for (long usageTimeInMillis : pkg.mLastPackageUsageTimeInMills) {
- sb.append(' ');
- sb.append(usageTimeInMillis);
- }
- sb.append('\n');
- out.write(sb.toString().getBytes(StandardCharsets.US_ASCII));
- }
- out.flush();
- file.finishWrite(f);
- } catch (IOException e) {
- if (f != null) {
- file.failWrite(f);
- }
- Log.e(TAG, "Failed to write package usage times", e);
- }
- }
- }
- mLastWritten.set(SystemClock.elapsedRealtime());
- }
-
- void readLP() {
- synchronized (mFileLock) {
- AtomicFile file = getFile();
- BufferedInputStream in = null;
- try {
- in = new BufferedInputStream(file.openRead());
- StringBuffer sb = new StringBuffer();
-
- String firstLine = readLine(in, sb);
- if (firstLine == null) {
- // Empty file. Do nothing.
- } else if (USAGE_FILE_MAGIC_VERSION_1.equals(firstLine)) {
- readVersion1LP(in, sb);
- } else {
- readVersion0LP(in, sb, firstLine);
- }
- } catch (FileNotFoundException expected) {
- mIsHistoricalPackageUsageAvailable = false;
- } catch (IOException e) {
- Log.w(TAG, "Failed to read package usage times", e);
- } finally {
- IoUtils.closeQuietly(in);
- }
- }
- mLastWritten.set(SystemClock.elapsedRealtime());
- }
-
- private void readVersion0LP(InputStream in, StringBuffer sb, String firstLine)
- throws IOException {
- // Initial version of the file had no version number and stored one
- // package-timestamp pair per line.
- // Note that the first line has already been read from the InputStream.
- for (String line = firstLine; line != null; line = readLine(in, sb)) {
- String[] tokens = line.split(" ");
- if (tokens.length != 2) {
- throw new IOException("Failed to parse " + line +
- " as package-timestamp pair.");
- }
-
- String packageName = tokens[0];
- PackageParser.Package pkg = mPackages.get(packageName);
- if (pkg == null) {
- continue;
- }
-
- long timestamp = parseAsLong(tokens[1]);
- for (int reason = 0;
- reason < PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT;
- reason++) {
- pkg.mLastPackageUsageTimeInMills[reason] = timestamp;
- }
- }
- }
-
- private void readVersion1LP(InputStream in, StringBuffer sb) throws IOException {
- // Version 1 of the file started with the corresponding version
- // number and then stored a package name and eight timestamps per line.
- String line;
- while ((line = readLine(in, sb)) != null) {
- String[] tokens = line.split(" ");
- if (tokens.length != PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT + 1) {
- throw new IOException("Failed to parse " + line + " as a timestamp array.");
- }
-
- String packageName = tokens[0];
- PackageParser.Package pkg = mPackages.get(packageName);
- if (pkg == null) {
- continue;
- }
-
- for (int reason = 0;
- reason < PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT;
- reason++) {
- pkg.mLastPackageUsageTimeInMills[reason] = parseAsLong(tokens[reason + 1]);
- }
- }
- }
-
- private long parseAsLong(String token) throws IOException {
- try {
- return Long.parseLong(token);
- } catch (NumberFormatException e) {
- throw new IOException("Failed to parse " + token + " as a long.", e);
- }
- }
-
- private String readLine(InputStream in, StringBuffer sb) throws IOException {
- return readToken(in, sb, '\n');
- }
-
- private String readToken(InputStream in, StringBuffer sb, char endOfToken)
- throws IOException {
- sb.setLength(0);
- while (true) {
- int ch = in.read();
- if (ch == -1) {
- if (sb.length() == 0) {
- return null;
- }
- throw new IOException("Unexpected EOF");
- }
- if (ch == endOfToken) {
- return sb.toString();
- }
- sb.append((char)ch);
- }
- }
-
- private AtomicFile getFile() {
- File dataDir = Environment.getDataDirectory();
- File systemDir = new File(dataDir, "system");
- File fname = new File(systemDir, "package-usage.list");
- return new AtomicFile(fname);
- }
-
- private static final String USAGE_FILE_MAGIC = "PACKAGE_USAGE__VERSION_";
- private static final String USAGE_FILE_MAGIC_VERSION_1 = USAGE_FILE_MAGIC + "1";
- }
+ private final CompilerStats mCompilerStats = new CompilerStats();
class PackageHandler extends Handler {
private boolean mBound = false;
@@ -2165,10 +1966,6 @@
PackageManagerService m = new PackageManagerService(context, installer,
factoryTest, onlyCore);
m.enableSystemUserPackages();
- // Disable any carrier apps. We do this very early in boot to prevent the apps from being
- // disabled after already being started.
- CarrierAppUtils.disableCarrierAppsUntilPrivileged(context.getOpPackageName(), m,
- UserHandle.USER_SYSTEM);
ServiceManager.addService("package", m);
return m;
}
@@ -2222,8 +2019,37 @@
displayManager.getDisplay(Display.DEFAULT_DISPLAY).getMetrics(metrics);
}
+ /**
+ * Requests that files preopted on a secondary system partition be copied to the data partition
+ * if possible. Note that the actual copying of the files is accomplished by init for security
+ * reasons. This simply requests that the copy takes place and awaits confirmation of its
+ * completion. See platform/system/extras/cppreopt/ for the implementation of the actual copy.
+ */
+ private static void requestCopyPreoptedFiles() {
+ final int WAIT_TIME_MS = 100;
+ final String CP_PREOPT_PROPERTY = "sys.cppreopt";
+ if (SystemProperties.getInt("ro.cp_system_other_odex", 0) == 1) {
+ SystemProperties.set(CP_PREOPT_PROPERTY, "requested");
+ // We will wait for up to 100 seconds.
+ final long timeEnd = SystemClock.uptimeMillis() + 100 * 1000;
+ while (!SystemProperties.get(CP_PREOPT_PROPERTY).equals("finished")) {
+ try {
+ Thread.sleep(WAIT_TIME_MS);
+ } catch (InterruptedException e) {
+ // Do nothing
+ }
+ if (SystemClock.uptimeMillis() > timeEnd) {
+ SystemProperties.set(CP_PREOPT_PROPERTY, "timed-out");
+ Slog.wtf(TAG, "cppreopt did not finish!");
+ break;
+ }
+ }
+ }
+ }
+
public PackageManagerService(Context context, Installer installer,
boolean factoryTest, boolean onlyCore) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "create package manager");
EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_START,
SystemClock.uptimeMillis());
@@ -2232,6 +2058,10 @@
}
mContext = context;
+
+ mPermissionReviewRequired = context.getResources().getBoolean(
+ R.bool.config_permissionReviewRequired);
+
mFactoryTest = factoryTest;
mOnlyCore = onlyCore;
mMetrics = new DisplayMetrics();
@@ -2276,10 +2106,14 @@
getDefaultDisplayMetrics(context, mMetrics);
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "get system config");
SystemConfig systemConfig = SystemConfig.getInstance();
mGlobalGids = systemConfig.getGlobalGids();
mSystemPermissions = systemConfig.getSystemPermissions();
mAvailableFeatures = systemConfig.getAvailableFeatures();
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
+
+ mProtectedPackages = new ProtectedPackages(mContext);
synchronized (mInstallLock) {
// writer
@@ -2323,7 +2157,13 @@
mFoundPolicyFile = SELinuxMMAC.readInstallPolicy();
- mRestoredSettings = mSettings.readLPw(sUserManager.getUsers(false));
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "read user settings");
+ mFirstBoot = !mSettings.readLPw(sUserManager.getUsers(false));
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
+
+ if (mFirstBoot) {
+ requestCopyPreoptedFiles();
+ }
String customResolverActivity = Resources.getSystem().getString(
R.string.config_customResolverActivity);
@@ -2363,6 +2203,7 @@
* Ensure all external libraries have had dexopt run on them.
*/
if (mSharedLibraries.size() > 0) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");
// NOTE: For now, we're compiling these system "shared libraries"
// (and framework jars) into all available architectures. It's possible
// to compile them only when we come across an app that uses them (there's
@@ -2396,6 +2237,7 @@
}
}
}
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
File frameworkDir = new File(Environment.getRootDirectory(), "framework");
@@ -2674,7 +2516,8 @@
// Now that we know all the packages we are keeping,
// read and update their last usage times.
- mPackageUsage.readLP();
+ mPackageUsage.read(mPackages);
+ mCompilerStats.read();
EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_SCAN_END,
SystemClock.uptimeMillis());
@@ -2700,7 +2543,7 @@
// If this is the first boot or an update from pre-M, and it is a normal
// boot, then we need to initialize the default preferred apps across
// all defined users.
- if (!onlyCore && (mPromoteSystemApps || !mRestoredSettings)) {
+ if (!onlyCore && (mPromoteSystemApps || mFirstBoot)) {
for (UserInfo user : sUserManager.getUsers(true)) {
mSettings.applyDefaultPreferredAppsLPw(this, user.id);
applyFactoryDefaultBrowserLPw(user.id);
@@ -2718,7 +2561,7 @@
storageFlags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;
}
reconcileAppsDataLI(StorageManager.UUID_PRIVATE_INTERNAL, UserHandle.USER_SYSTEM,
- storageFlags);
+ storageFlags, true /* migrateAppData */);
// If this is first boot after an OTA, and a normal boot, then
// we need to clear code cache directories.
@@ -2749,7 +2592,9 @@
ver.databaseVersion = Settings.CURRENT_DATABASE_VERSION;
// can downgrade to reader
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "write settings");
mSettings.writeLPr();
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
// Perform dexopt on all apps that mark themselves as coreApps. We do this pretty
// early on (before the package manager declares itself as early) because other
@@ -2766,7 +2611,7 @@
}
}
- int[] stats = performDexOpt(coreApps, false,
+ int[] stats = performDexOptUpgrade(coreApps, false,
getCompilerFilterForReason(REASON_CORE_APP));
final int elapsedTimeSeconds =
@@ -2845,7 +2690,9 @@
// Now after opening every single application zip, make sure they
// are all flushed. Not really needed, but keeps things nice and
// tidy.
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "GC");
Runtime.getRuntime().gc();
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
// The initial scanning above does many calls into installd while
// holding the mPackages lock, but we're mostly interested in yelling
@@ -2854,11 +2701,12 @@
// Expose private service for system components to use.
LocalServices.addService(PackageManagerInternal.class, new PackageManagerInternalImpl());
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
@Override
public boolean isFirstBoot() {
- return !mRestoredSettings;
+ return mFirstBoot;
}
@Override
@@ -3182,8 +3030,12 @@
final PermissionsState permissionsState = ps.getPermissionsState();
- final int[] gids = permissionsState.computeGids(userId);
- final Set<String> permissions = permissionsState.getPermissions(userId);
+ // Compute GIDs only if requested
+ final int[] gids = (flags & PackageManager.GET_GIDS) == 0
+ ? EMPTY_INT_ARRAY : permissionsState.computeGids(userId);
+ // Compute granted permissions only if package has requested permissions
+ final Set<String> permissions = ArrayUtils.isEmpty(p.requestedPermissions)
+ ? Collections.<String>emptySet() : permissionsState.getPermissions(userId);
final PackageUserState state = ps.readUserState(userId);
return PackageParser.generatePackageInfo(p, gids, flags,
@@ -4145,7 +3997,7 @@
// their permissions as always granted runtime ones since we need
// to keep the review required permission flag per user while an
// install permission's state is shared across all users.
- if (Build.PERMISSIONS_REVIEW_REQUIRED
+ if ((mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED)
&& pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
&& bp.isRuntime()) {
return;
@@ -4256,7 +4108,7 @@
// their permissions as always granted runtime ones since we need
// to keep the review required permission flag per user while an
// install permission's state is shared across all users.
- if (Build.PERMISSIONS_REVIEW_REQUIRED
+ if ((mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED)
&& pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
&& bp.isRuntime()) {
return;
@@ -4890,20 +4742,6 @@
final ResolveInfo bestChoice =
chooseBestActivity(intent, resolvedType, flags, query, userId);
-
- if (isEphemeralAllowed(intent, query, userId)) {
- Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "resolveEphemeral");
- final EphemeralResolveInfo ai =
- getEphemeralResolveInfo(intent, resolvedType, userId);
- if (ai != null) {
- if (DEBUG_EPHEMERAL) {
- Slog.v(TAG, "Returning an EphemeralResolveInfo");
- }
- bestChoice.ephemeralInstaller = mEphemeralInstallerInfo;
- bestChoice.ephemeralResolveInfo = ai;
- }
- Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
- }
return bestChoice;
} finally {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
@@ -4944,9 +4782,9 @@
false, false, false, userId);
}
-
private boolean isEphemeralAllowed(
- Intent intent, List<ResolveInfo> resolvedActivites, int userId) {
+ Intent intent, List<ResolveInfo> resolvedActivities, int userId,
+ boolean skipPackageCheck) {
// Short circuit and return early if possible.
if (DISABLE_EPHEMERAL_APPS) {
return false;
@@ -4961,18 +4799,21 @@
if (intent.getComponent() != null) {
return false;
}
- if (intent.getPackage() != null) {
+ if ((intent.getFlags() & Intent.FLAG_IGNORE_EPHEMERAL) != 0) {
+ return false;
+ }
+ if (!skipPackageCheck && intent.getPackage() != null) {
return false;
}
final boolean isWebUri = hasWebURI(intent);
- if (!isWebUri) {
+ if (!isWebUri || intent.getData().getHost() == null) {
return false;
}
// Deny ephemeral apps if the user chose _ALWAYS or _ALWAYS_ASK for intent resolution.
synchronized (mPackages) {
- final int count = resolvedActivites.size();
+ final int count = (resolvedActivities == null ? 0 : resolvedActivities.size());
for (int n = 0; n < count; n++) {
- ResolveInfo info = resolvedActivites.get(n);
+ ResolveInfo info = resolvedActivities.get(n);
String packageName = info.activityInfo.packageName;
PackageSetting ps = mSettings.mPackages.get(packageName);
if (ps != null) {
@@ -4994,19 +4835,19 @@
return true;
}
- private EphemeralResolveInfo getEphemeralResolveInfo(Intent intent, String resolvedType,
- int userId) {
- final int ephemeralPrefixMask = Global.getInt(mContext.getContentResolver(),
+ private static EphemeralResolveInfo getEphemeralResolveInfo(
+ Context context, EphemeralResolverConnection resolverConnection, Intent intent,
+ String resolvedType, int userId, String packageName) {
+ final int ephemeralPrefixMask = Global.getInt(context.getContentResolver(),
Global.EPHEMERAL_HASH_PREFIX_MASK, DEFAULT_EPHEMERAL_HASH_PREFIX_MASK);
- final int ephemeralPrefixCount = Global.getInt(mContext.getContentResolver(),
+ final int ephemeralPrefixCount = Global.getInt(context.getContentResolver(),
Global.EPHEMERAL_HASH_PREFIX_COUNT, DEFAULT_EPHEMERAL_HASH_PREFIX_COUNT);
final EphemeralDigest digest = new EphemeralDigest(intent.getData(), ephemeralPrefixMask,
ephemeralPrefixCount);
final int[] shaPrefix = digest.getDigestPrefix();
final byte[][] digestBytes = digest.getDigestBytes();
final List<EphemeralResolveInfo> ephemeralResolveInfoList =
- mEphemeralResolverConnection.getEphemeralResolveInfoList(
- shaPrefix, ephemeralPrefixMask);
+ resolverConnection.getEphemeralResolveInfoList(shaPrefix, ephemeralPrefixMask);
if (ephemeralResolveInfoList == null || ephemeralResolveInfoList.size() == 0) {
// No hash prefix match; there are no ephemeral apps for this domain.
return null;
@@ -5023,6 +4864,10 @@
if (filters.isEmpty()) {
continue;
}
+ if (packageName != null
+ && !packageName.equals(ephemeralApplication.getPackageName())) {
+ continue;
+ }
// We have a domain match; resolve the filters to see if anything matches.
final EphemeralIntentResolver ephemeralResolver = new EphemeralIntentResolver();
for (int j = filters.size() - 1; j >= 0; --j) {
@@ -5426,8 +5271,12 @@
}
// reader
+ boolean sortResult = false;
+ boolean addEphemeral = false;
+ boolean matchEphemeralPackage = false;
+ List<ResolveInfo> result;
+ final String pkgName = intent.getPackage();
synchronized (mPackages) {
- final String pkgName = intent.getPackage();
if (pkgName == null) {
List<CrossProfileIntentFilter> matchingFilters =
getMatchingCrossProfileIntentFilters(intent, resolvedType, userId);
@@ -5435,15 +5284,16 @@
ResolveInfo xpResolveInfo = querySkipCurrentProfileIntents(matchingFilters, intent,
resolvedType, flags, userId);
if (xpResolveInfo != null) {
- List<ResolveInfo> result = new ArrayList<ResolveInfo>(1);
- result.add(xpResolveInfo);
- return filterIfNotSystemUser(result, userId);
+ List<ResolveInfo> xpResult = new ArrayList<ResolveInfo>(1);
+ xpResult.add(xpResolveInfo);
+ return filterIfNotSystemUser(xpResult, userId);
}
// Check for results in the current profile.
- List<ResolveInfo> result = mActivities.queryIntent(
- intent, resolvedType, flags, userId);
- result = filterIfNotSystemUser(result, userId);
+ result = filterIfNotSystemUser(mActivities.queryIntent(
+ intent, resolvedType, flags, userId), userId);
+ addEphemeral =
+ isEphemeralAllowed(intent, result, userId, false /*skipPackageCheck*/);
// Check for cross profile results.
boolean hasNonNegativePriorityResult = hasNonNegativePriority(result);
@@ -5455,7 +5305,7 @@
Collections.singletonList(xpResolveInfo), userId).size() > 0;
if (isVisibleToUser) {
result.add(xpResolveInfo);
- Collections.sort(result, mResolvePrioritySorter);
+ sortResult = true;
}
}
if (hasWebURI(intent)) {
@@ -5471,28 +5321,61 @@
// in the result.
result.remove(xpResolveInfo);
}
- if (result.size() == 0) {
+ if (result.size() == 0 && !addEphemeral) {
result.add(xpDomainInfo.resolveInfo);
return result;
}
- } else if (result.size() <= 1) {
- return result;
}
- result = filterCandidatesWithDomainPreferredActivitiesLPr(intent, flags, result,
- xpDomainInfo, userId);
- Collections.sort(result, mResolvePrioritySorter);
+ if (result.size() > 1 || addEphemeral) {
+ result = filterCandidatesWithDomainPreferredActivitiesLPr(
+ intent, flags, result, xpDomainInfo, userId);
+ sortResult = true;
+ }
}
- return result;
+ } else {
+ final PackageParser.Package pkg = mPackages.get(pkgName);
+ if (pkg != null) {
+ result = filterIfNotSystemUser(
+ mActivities.queryIntentForPackage(
+ intent, resolvedType, flags, pkg.activities, userId),
+ userId);
+ } else {
+ // the caller wants to resolve for a particular package; however, there
+ // were no installed results, so, try to find an ephemeral result
+ addEphemeral = isEphemeralAllowed(
+ intent, null /*result*/, userId, true /*skipPackageCheck*/);
+ matchEphemeralPackage = true;
+ result = new ArrayList<ResolveInfo>();
+ }
}
- final PackageParser.Package pkg = mPackages.get(pkgName);
- if (pkg != null) {
- return filterIfNotSystemUser(
- mActivities.queryIntentForPackage(
- intent, resolvedType, flags, pkg.activities, userId),
- userId);
- }
- return new ArrayList<ResolveInfo>();
}
+ if (addEphemeral) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "resolveEphemeral");
+ final EphemeralResolveInfo ai = getEphemeralResolveInfo(
+ mContext, mEphemeralResolverConnection, intent, resolvedType, userId,
+ matchEphemeralPackage ? pkgName : null);
+ if (ai != null) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.v(TAG, "Adding ephemeral installer to the ResolveInfo list");
+ }
+ final ResolveInfo ephemeralInstaller = new ResolveInfo(mEphemeralInstallerInfo);
+ ephemeralInstaller.ephemeralResolveInfo = ai;
+ // make sure this resolver is the default
+ ephemeralInstaller.isDefault = true;
+ ephemeralInstaller.match = IntentFilter.MATCH_CATEGORY_SCHEME_SPECIFIC_PART
+ | IntentFilter.MATCH_ADJUSTMENT_NORMAL;
+ // add a non-generic filter
+ ephemeralInstaller.filter = new IntentFilter(intent.getAction());
+ ephemeralInstaller.filter.addDataPath(
+ intent.getData().getPath(), PatternMatcher.PATTERN_LITERAL);
+ result.add(ephemeralInstaller);
+ }
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
+ }
+ if (sortResult) {
+ Collections.sort(result, mResolvePrioritySorter);
+ }
+ return result;
}
private static class CrossProfileDomainInfo {
@@ -6690,7 +6573,7 @@
}
private void scanDirTracedLI(File dir, final int parseFlags, int scanFlags, long currentTime) {
- Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanDir");
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanDir [" + dir.getAbsolutePath() + "]");
try {
scanDirLI(dir, parseFlags, scanFlags, currentTime);
} finally {
@@ -6808,9 +6691,12 @@
}
try {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "collectCertificates");
PackageParser.collectCertificates(pkg, policyFlags);
} catch (PackageParserException e) {
throw PackageManagerException.from(e);
+ } finally {
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
}
@@ -6820,7 +6706,7 @@
*/
private PackageParser.Package scanPackageTracedLI(File scanFile, final int parseFlags,
int scanFlags, long currentTime, UserHandle user) throws PackageManagerException {
- Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanPackage");
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanPackage [" + scanFile.toString() + "]");
try {
return scanPackageLI(scanFile, parseFlags, scanFlags, currentTime, user);
} finally {
@@ -7229,22 +7115,17 @@
try {
IMountService ms = PackageHelper.getMountService();
if (ms != null) {
- final boolean isUpgrade = isUpgrade();
- boolean doTrim = isUpgrade;
- if (doTrim) {
- Slog.w(TAG, "Running disk maintenance immediately due to system update");
- } else {
- final long interval = android.provider.Settings.Global.getLong(
- mContext.getContentResolver(),
- android.provider.Settings.Global.FSTRIM_MANDATORY_INTERVAL,
- DEFAULT_MANDATORY_FSTRIM_INTERVAL);
- if (interval > 0) {
- final long timeSinceLast = System.currentTimeMillis() - ms.lastMaintenance();
- if (timeSinceLast > interval) {
- doTrim = true;
- Slog.w(TAG, "No disk maintenance in " + timeSinceLast
- + "; running immediately");
- }
+ boolean doTrim = false;
+ final long interval = android.provider.Settings.Global.getLong(
+ mContext.getContentResolver(),
+ android.provider.Settings.Global.FSTRIM_MANDATORY_INTERVAL,
+ DEFAULT_MANDATORY_FSTRIM_INTERVAL);
+ if (interval > 0) {
+ final long timeSinceLast = System.currentTimeMillis() - ms.lastMaintenance();
+ if (timeSinceLast > interval) {
+ doTrim = true;
+ Slog.w(TAG, "No disk maintenance in " + timeSinceLast
+ + "; running immediately");
}
}
if (doTrim) {
@@ -7291,7 +7172,7 @@
}
final long startTime = System.nanoTime();
- final int[] stats = performDexOpt(pkgs, mIsPreNUpgrade /* showDialog */,
+ final int[] stats = performDexOptUpgrade(pkgs, mIsPreNUpgrade /* showDialog */,
getCompilerFilterForReason(causeFirstBoot ? REASON_FIRST_BOOT : REASON_BOOT));
final int elapsedTimeSeconds =
@@ -7310,7 +7191,7 @@
* which are (in order) {@code numberOfPackagesOptimized}, {@code numberOfPackagesSkipped}
* and {@code numberOfPackagesFailed}.
*/
- private int[] performDexOpt(List<PackageParser.Package> pkgs, boolean showDialog,
+ private int[] performDexOptUpgrade(List<PackageParser.Package> pkgs, boolean showDialog,
String compilerFilter) {
int numberOfPackagesVisited = 0;
@@ -7344,6 +7225,19 @@
}
}
+ // If the OTA updates a system app which was previously preopted to a non-preopted state
+ // the app might end up being verified at runtime. That's because by default the apps
+ // are verify-profile but for preopted apps there's no profile.
+ // Do a hacky check to ensure that if we have no profiles (a reasonable indication
+ // that before the OTA the app was preopted) the app gets compiled with a non-profile
+ // filter (by default interpret-only).
+ // Note that at this stage unused apps are already filtered.
+ if (isSystemApp(pkg) &&
+ DexFile.isProfileGuidedCompilerFilter(compilerFilter) &&
+ !Environment.getReferenceProfile(pkg.packageName).exists()) {
+ compilerFilter = getNonProfileGuidedCompilerFilter(compilerFilter);
+ }
+
// checkProfiles is false to avoid merging profiles during boot which
// might interfere with background compilation (b/28612421).
// Unfortunately this will also means that "pm.dexopt.boot=speed-profile" will
@@ -7430,7 +7324,8 @@
// Package could not be found. Report failure.
return PackageDexOptimizer.DEX_OPT_FAILED;
}
- mPackageUsage.write(false);
+ mPackageUsage.maybeWriteAsync(mPackages);
+ mCompilerStats.maybeWriteAsync();
}
long callingId = Binder.clearCallingIdentity();
try {
@@ -7475,11 +7370,12 @@
// Currently this will do a full compilation of the library by default.
pdo.performDexOpt(depPackage, null /* sharedLibraries */, instructionSets,
false /* checkProfiles */,
- getCompilerFilterForReason(REASON_NON_SYSTEM_LIBRARY));
+ getCompilerFilterForReason(REASON_NON_SYSTEM_LIBRARY),
+ getOrCreateCompilerPackageStats(depPackage));
}
}
return pdo.performDexOpt(p, p.usesLibraryFiles, instructionSets, checkProfiles,
- targetCompilerFilter);
+ targetCompilerFilter, getOrCreateCompilerPackageStats(p));
}
Collection<PackageParser.Package> findSharedNonSystemLibraries(PackageParser.Package p) {
@@ -7533,7 +7429,8 @@
}
public void shutdown() {
- mPackageUsage.write(true);
+ mPackageUsage.writeNow(mPackages);
+ mCompilerStats.writeNow();
}
@Override
@@ -7984,7 +7881,9 @@
} catch (IOException ignore) {
} finally {
try {
- jarFile.close();
+ if (jarFile != null) {
+ jarFile.close();
+ }
} catch (IOException ignore) {}
}
return false;
@@ -8434,7 +8333,9 @@
final String cpuAbiOverride = deriveAbiOverride(pkg.cpuAbiOverride, pkgSetting);
if ((scanFlags & SCAN_NEW_INSTALL) == 0) {
- derivePackageAbi(pkg, scanFile, cpuAbiOverride, true /* extract libs */);
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "derivePackageAbi");
+ derivePackageAbi(pkg, scanFile, cpuAbiOverride, true /*extractLibs*/);
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
// Some system apps still use directory structure for native libraries
// in which case we might end up not detecting abi solely based on apk
@@ -9129,12 +9030,15 @@
int abi64 = PackageManager.NO_NATIVE_LIBRARIES;
if (Build.SUPPORTED_32_BIT_ABIS.length > 0) {
if (extractLibs) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "copyNativeBinaries");
abi32 = NativeLibraryHelper.copyNativeBinariesForSupportedAbi(handle,
nativeLibraryRoot, Build.SUPPORTED_32_BIT_ABIS,
useIsaSpecificSubdirs);
} else {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "findSupportedAbi");
abi32 = NativeLibraryHelper.findSupportedAbi(handle, Build.SUPPORTED_32_BIT_ABIS);
}
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
maybeThrowExceptionForMultiArchCopy(
@@ -9142,12 +9046,15 @@
if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {
if (extractLibs) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "copyNativeBinaries");
abi64 = NativeLibraryHelper.copyNativeBinariesForSupportedAbi(handle,
nativeLibraryRoot, Build.SUPPORTED_64_BIT_ABIS,
useIsaSpecificSubdirs);
} else {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "findSupportedAbi");
abi64 = NativeLibraryHelper.findSupportedAbi(handle, Build.SUPPORTED_64_BIT_ABIS);
}
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
maybeThrowExceptionForMultiArchCopy(
@@ -9188,11 +9095,14 @@
final int copyRet;
if (extractLibs) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "copyNativeBinaries");
copyRet = NativeLibraryHelper.copyNativeBinariesForSupportedAbi(handle,
nativeLibraryRoot, abiList, useIsaSpecificSubdirs);
} else {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "findSupportedAbi");
copyRet = NativeLibraryHelper.findSupportedAbi(handle, abiList);
}
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES) {
throw new PackageManagerException(INSTALL_FAILED_INTERNAL_ERROR,
@@ -9344,15 +9254,17 @@
mEphemeralInstallerActivity.packageName = pkg.applicationInfo.packageName;
mEphemeralInstallerActivity.processName = pkg.applicationInfo.packageName;
mEphemeralInstallerActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;
- mEphemeralInstallerActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS |
- ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS;
+ mEphemeralInstallerActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS
+ | ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS;
mEphemeralInstallerActivity.theme = 0;
mEphemeralInstallerActivity.exported = true;
mEphemeralInstallerActivity.enabled = true;
mEphemeralInstallerInfo.activityInfo = mEphemeralInstallerActivity;
mEphemeralInstallerInfo.priority = 0;
- mEphemeralInstallerInfo.preferredOrder = 0;
- mEphemeralInstallerInfo.match = 0;
+ mEphemeralInstallerInfo.preferredOrder = 1;
+ mEphemeralInstallerInfo.isDefault = true;
+ mEphemeralInstallerInfo.match = IntentFilter.MATCH_CATEGORY_SCHEME_SPECIFIC_PART
+ | IntentFilter.MATCH_ADJUSTMENT_NORMAL;
if (DEBUG_EPHEMERAL) {
Slog.d(TAG, "Set ephemeral installer activity: " + mEphemeralInstallerComponent);
@@ -9915,6 +9827,7 @@
}
}
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "grantPermissions");
// Now update the permissions for all packages, in particular
// replace the granted permissions of the system packages.
if ((flags&UPDATE_PERMISSIONS_ALL) != 0) {
@@ -9936,6 +9849,7 @@
&& Objects.equals(replaceVolumeUuid, volumeUuid);
grantPermissionsLPw(pkgInfo, replace, changingPkg);
}
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
private void grantPermissionsLPw(PackageParser.Package pkg, boolean replace,
@@ -9956,8 +9870,6 @@
return;
}
- Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "grantPermissions");
-
PermissionsState permissionsState = ps.getPermissionsState();
PermissionsState origPermissions = permissionsState;
@@ -10034,7 +9946,8 @@
// their permissions as always granted runtime ones since we need
// to keep the review required permission flag per user while an
// install permission's state is shared across all users.
- if (!appSupportsRuntimePermissions && !Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (!appSupportsRuntimePermissions && !mPermissionReviewRequired
+ && !Build.PERMISSIONS_REVIEW_REQUIRED) {
// For legacy apps dangerous permissions are install time ones.
grant = GRANT_INSTALL;
} else if (origPermissions.hasInstallPermission(bp.name)) {
@@ -10120,7 +10033,7 @@
changedRuntimePermissionUserIds, userId);
}
// If the app supports runtime permissions no need for a review.
- if (Build.PERMISSIONS_REVIEW_REQUIRED
+ if ((mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED)
&& appSupportsRuntimePermissions
&& (flags & PackageManager
.FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {
@@ -10129,7 +10042,8 @@
changedRuntimePermissionUserIds = ArrayUtils.appendInt(
changedRuntimePermissionUserIds, userId);
}
- } else if (Build.PERMISSIONS_REVIEW_REQUIRED
+ } else if ((mPermissionReviewRequired
+ || Build.PERMISSIONS_REVIEW_REQUIRED)
&& !appSupportsRuntimePermissions) {
// For legacy apps that need a permission review, every new
// runtime permission is granted but it is pending a review.
@@ -10237,8 +10151,6 @@
for (int userId : changedRuntimePermissionUserIds) {
mSettings.writeRuntimePermissionsForUserLPr(userId, runtimePermissionsRevoked);
}
-
- Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
private boolean isNewPlatformPermissionForPackage(String perm, PackageParser.Package pkg) {
@@ -11661,6 +11573,18 @@
if (pkgSetting == null) {
return false;
}
+ // Do not allow "android" is being disabled
+ if ("android".equals(packageName)) {
+ Slog.w(TAG, "Cannot hide package: android");
+ return false;
+ }
+ // Only allow protected packages to hide themselves.
+ if (hidden && !UserHandle.isSameApp(uid, pkgSetting.appId)
+ && mProtectedPackages.isPackageStateProtected(userId, packageName)) {
+ Slog.w(TAG, "Not hiding protected package: " + packageName);
+ return false;
+ }
+
if (pkgSetting.getHidden(userId) != hidden) {
pkgSetting.setHidden(hidden, userId);
mSettings.writePackageRestrictionsLPr(userId);
@@ -11901,6 +11825,12 @@
return false;
}
+ if (mProtectedPackages.isPackageStateProtected(userId, packageName)) {
+ Slog.w(TAG, "Cannot suspend/un-suspend package \"" + packageName
+ + "\": protected package");
+ return false;
+ }
+
return true;
}
@@ -12434,6 +12364,9 @@
public void run() {
for (int i = 0; i < mRunningInstalls.size(); i++) {
final PostInstallData data = mRunningInstalls.valueAt(i);
+ if (data.res.returnCode != PackageManager.INSTALL_SUCCEEDED) {
+ continue;
+ }
if (pkgName.equals(data.res.pkg.applicationInfo.packageName)) {
// right package; but is it for the right user?
for (int uIndex = 0; uIndex < data.res.newUsers.length; uIndex++) {
@@ -15165,7 +15098,8 @@
// Also, don't fail application installs if the dexopt step fails.
mPackageDexOptimizer.performDexOpt(pkg, pkg.usesLibraryFiles,
null /* instructionSets */, false /* checkProfiles */,
- getCompilerFilterForReason(REASON_INSTALL));
+ getCompilerFilterForReason(REASON_INSTALL),
+ getOrCreateCompilerPackageStats(pkg));
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
// Notify BackgroundDexOptService that the package has been changed.
@@ -15956,6 +15890,12 @@
+ e.getMessage());
return false;
}
+ try {
+ // update shared libraries for the newly re-installed system package
+ updateSharedLibrariesLPw(newPkg, null);
+ } catch (PackageManagerException e) {
+ Slog.e(TAG, "updateAllSharedLibrariesLPw failed: " + e.getMessage());
+ }
prepareAppDataAfterInstallLIF(newPkg);
@@ -16431,8 +16371,9 @@
enforceCrossUserPermission(Binder.getCallingUid(), userId,
true /* requireFullPermission */, false /* checkShell */, "clear application data");
- if (mProtectedPackages.canPackageBeWiped(userId, packageName)) {
- throw new SecurityException("Cannot clear data for a device owner or a profile owner");
+ if (mProtectedPackages.isPackageDataProtected(userId, packageName)) {
+ throw new SecurityException("Cannot clear data for a protected package: "
+ + packageName);
}
// Queue up an async operation since the package deletion may take a little while.
mHandler.post(new Runnable() {
@@ -16590,7 +16531,7 @@
// If permission review is enabled and this is a legacy app, mark the
// permission as requiring a review as this is the initial state.
int flags = 0;
- if (Build.PERMISSIONS_REVIEW_REQUIRED
+ if ((mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED)
&& ps.pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
flags |= FLAG_PERMISSION_REVIEW_REQUIRED;
}
@@ -16824,9 +16765,28 @@
filter.dump(new LogPrinter(Log.INFO, TAG), " ");
pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
scheduleWritePackageRestrictionsLocked(userId);
+ postPreferredActivityChangedBroadcast(userId);
}
}
+ private void postPreferredActivityChangedBroadcast(int userId) {
+ mHandler.post(() -> {
+ final IActivityManager am = ActivityManagerNative.getDefault();
+ if (am == null) {
+ return;
+ }
+
+ final Intent intent = new Intent(Intent.ACTION_PREFERRED_ACTIVITY_CHANGED);
+ intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
+ try {
+ am.broadcastIntent(null, intent, null, null,
+ 0, null, null, null, android.app.AppOpsManager.OP_NONE,
+ null, false, false, userId);
+ } catch (RemoteException e) {
+ }
+ });
+ }
+
@Override
public void replacePreferredActivity(IntentFilter filter, int match,
ComponentName[] set, ComponentName activity, int userId) {
@@ -16978,6 +16938,9 @@
changed = true;
}
}
+ if (changed) {
+ postPreferredActivityChangedBroadcast(userId);
+ }
return changed;
}
@@ -17091,6 +17054,7 @@
mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter(
new PersistentPreferredActivity(filter, activity));
scheduleWritePackageRestrictionsLocked(userId);
+ postPreferredActivityChangedBroadcast(userId);
}
}
@@ -17133,6 +17097,7 @@
if (changed) {
scheduleWritePackageRestrictionsLocked(userId);
+ postPreferredActivityChangedBroadcast(userId);
}
}
}
@@ -17618,6 +17583,7 @@
private Intent getHomeIntent() {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_HOME);
+ intent.addCategory(Intent.CATEGORY_DEFAULT);
return intent;
}
@@ -17758,9 +17724,9 @@
+ Binder.getCallingPid()
+ ", uid=" + uid + ", package uid=" + pkgSetting.appId);
}
- // Don't allow changing profile and device owners.
- if (mProtectedPackages.canPackageStateBeChanged(userId, packageName)) {
- throw new SecurityException("Cannot disable a device owner or a profile owner");
+ // Don't allow changing protected packages.
+ if (mProtectedPackages.isPackageStateProtected(userId, packageName)) {
+ throw new SecurityException("Cannot disable a protected package: " + packageName);
}
}
@@ -17977,6 +17943,11 @@
public void systemReady() {
mSystemReady = true;
+ // Disable any carrier apps. We do this very early in boot to prevent the apps from being
+ // disabled after already being started.
+ CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(), this,
+ mContext.getContentResolver(), UserHandle.USER_SYSTEM);
+
// Read the compatibilty setting when the system is ready.
boolean compatibilityModeEnabled = android.provider.Settings.Global.getInt(
mContext.getContentResolver(),
@@ -18124,6 +18095,7 @@
public static final int DUMP_DOMAIN_PREFERRED = 1 << 18;
public static final int DUMP_FROZEN = 1 << 19;
public static final int DUMP_DEXOPT = 1 << 20;
+ public static final int DUMP_COMPILER_STATS = 1 << 21;
public static final int OPTION_SHOW_FILTERS = 1 << 0;
@@ -18241,6 +18213,7 @@
pw.println(" installs: details about install sessions");
pw.println(" check-permission <permission> <package> [<user>]: does pkg hold perm?");
pw.println(" dexopt: dump dexopt state");
+ pw.println(" compiler-stats: dump compiler statistics");
pw.println(" <package.name>: info about given package");
return;
} else if ("--checkin".equals(opt)) {
@@ -18362,6 +18335,8 @@
dumpState.setDump(DumpState.DUMP_FROZEN);
} else if ("dexopt".equals(cmd)) {
dumpState.setDump(DumpState.DUMP_DEXOPT);
+ } else if ("compiler-stats".equals(cmd)) {
+ dumpState.setDump(DumpState.DUMP_COMPILER_STATS);
} else if ("write".equals(cmd)) {
synchronized (mPackages) {
mSettings.writeLPr();
@@ -18724,6 +18699,11 @@
dumpDexoptStateLPr(pw, packageName);
}
+ if (!checkin && dumpState.isDumping(DumpState.DUMP_COMPILER_STATS)) {
+ if (dumpState.onTitlePrinted()) pw.println();
+ dumpCompilerStatsLPr(pw, packageName);
+ }
+
if (!checkin && dumpState.isDumping(DumpState.DUMP_MESSAGES) && packageName == null) {
if (dumpState.onTitlePrinted()) pw.println();
mSettings.dumpReadMessagesLPr(pw, dumpState);
@@ -18788,6 +18768,38 @@
}
}
+ private void dumpCompilerStatsLPr(PrintWriter pw, String packageName) {
+ final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ", 120);
+ ipw.println();
+ ipw.println("Compiler stats:");
+ ipw.increaseIndent();
+ Collection<PackageParser.Package> packages = null;
+ if (packageName != null) {
+ PackageParser.Package targetPackage = mPackages.get(packageName);
+ if (targetPackage != null) {
+ packages = Collections.singletonList(targetPackage);
+ } else {
+ ipw.println("Unable to find package: " + packageName);
+ return;
+ }
+ } else {
+ packages = mPackages.values();
+ }
+
+ for (PackageParser.Package pkg : packages) {
+ ipw.println("[" + pkg.packageName + "]");
+ ipw.increaseIndent();
+
+ CompilerStats.PackageStats stats = getCompilerPackageStats(pkg.packageName);
+ if (stats == null) {
+ ipw.println("(No recorded stats)");
+ } else {
+ stats.dump(ipw);
+ }
+ ipw.decreaseIndent();
+ }
+ }
+
private String dumpDomainString(String packageName) {
List<IntentFilterVerificationInfo> iviList = getIntentFilterVerifications(packageName)
.getList();
@@ -19272,7 +19284,7 @@
try {
sm.prepareUserStorage(volumeUuid, user.id, user.serialNumber, flags);
synchronized (mInstallLock) {
- reconcileAppsDataLI(volumeUuid, user.id, flags);
+ reconcileAppsDataLI(volumeUuid, user.id, flags, true /* migrateAppData */);
}
} catch (IllegalStateException e) {
// Device was probably ejected, and we'll process that event momentarily
@@ -19575,12 +19587,12 @@
* Verifies that directories exist and that ownership and labeling is
* correct for all installed apps on all mounted volumes.
*/
- void reconcileAppsData(int userId, int flags) {
+ void reconcileAppsData(int userId, int flags, boolean migrateAppsData) {
final StorageManager storage = mContext.getSystemService(StorageManager.class);
for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
final String volumeUuid = vol.getFsUuid();
synchronized (mInstallLock) {
- reconcileAppsDataLI(volumeUuid, userId, flags);
+ reconcileAppsDataLI(volumeUuid, userId, flags, migrateAppsData);
}
}
}
@@ -19594,9 +19606,10 @@
* Verifies that directories exist and that ownership and labeling is
* correct for all installed apps.
*/
- private void reconcileAppsDataLI(String volumeUuid, int userId, int flags) {
+ private void reconcileAppsDataLI(String volumeUuid, int userId, int flags,
+ boolean migrateAppData) {
Slog.v(TAG, "reconcileAppsData for " + volumeUuid + " u" + userId + " 0x"
- + Integer.toHexString(flags));
+ + Integer.toHexString(flags) + " migrateAppData=" + migrateAppData);
final File ceDir = Environment.getDataUserCeDirectory(volumeUuid, userId);
final File deDir = Environment.getDataUserDeDirectory(volumeUuid, userId);
@@ -19670,7 +19683,7 @@
if (ps.getInstalled(userId)) {
prepareAppDataLIF(ps.pkg, userId, flags, restoreconNeeded);
- if (maybeMigrateAppDataLIF(ps.pkg, userId)) {
+ if (migrateAppData && maybeMigrateAppDataLIF(ps.pkg, userId)) {
// We may have just shuffled around app data directories, so
// prepare them one more time
prepareAppDataLIF(ps.pkg, userId, flags, restoreconNeeded);
@@ -20386,19 +20399,14 @@
}
}
- void onBeforeUserStartUninitialized(final int userId) {
- synchronized (mPackages) {
- if (mSettings.areDefaultRuntimePermissionsGrantedLPr(userId)) {
- return;
- }
- }
+ void onNewUserCreated(final int userId) {
mDefaultPermissionPolicy.grantDefaultPermissions(userId);
// If permission review for legacy apps is required, we represent
// dagerous permissions for such apps as always granted runtime
// permissions to keep per user flag state whether review is needed.
// Hence, if a new user is added we have to propagate dangerous
// permission grants for these legacy apps.
- if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (mPermissionReviewRequired || Build.PERMISSIONS_REVIEW_REQUIRED) {
updatePermissionsLPw(null, null, UPDATE_PERMISSIONS_ALL
| UPDATE_PERMISSIONS_REPLACE_ALL);
}
@@ -20852,7 +20860,7 @@
public boolean isPermissionsReviewRequired(String packageName, int userId) {
synchronized (mPackages) {
// If we do not support permission review, done.
- if (!Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (!mPermissionReviewRequired && !Build.PERMISSIONS_REVIEW_REQUIRED) {
return false;
}
@@ -20892,9 +20900,8 @@
}
@Override
- public boolean canPackageBeWiped(int userId, String packageName) {
- return mProtectedPackages.canPackageBeWiped(userId,
- packageName);
+ public boolean isPackageDataProtected(int userId, String packageName) {
+ return mProtectedPackages.isPackageDataProtected(userId, packageName);
}
}
@@ -20955,4 +20962,20 @@
msg.setData(data);
mProcessLoggingHandler.sendMessage(msg);
}
+
+ public CompilerStats.PackageStats getCompilerPackageStats(String pkgName) {
+ return mCompilerStats.getPackageStats(pkgName);
+ }
+
+ public CompilerStats.PackageStats getOrCreateCompilerPackageStats(PackageParser.Package pkg) {
+ return getOrCreateCompilerPackageStats(pkg.packageName);
+ }
+
+ public CompilerStats.PackageStats getOrCreateCompilerPackageStats(String pkgName) {
+ return mCompilerStats.getOrCreatePackageStats(pkgName);
+ }
+
+ public void deleteCompilerPackageStats(String pkgName) {
+ mCompilerStats.deletePackageStats(pkgName);
+ }
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 5787bdb..61374f3 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -541,6 +541,8 @@
boolean listDisabled = false, listEnabled = false;
boolean listSystem = false, listThirdParty = false;
boolean listInstaller = false;
+ boolean showUid = false;
+ int uid = -1;
int userId = UserHandle.USER_SYSTEM;
try {
String opt;
@@ -561,12 +563,12 @@
case "-l":
// old compat
break;
- case "-lf":
- showSourceDir = true;
- break;
case "-s":
listSystem = true;
break;
+ case "-U":
+ showUid = true;
+ break;
case "-u":
getFlags |= PackageManager.GET_UNINSTALLED_PACKAGES;
break;
@@ -576,6 +578,10 @@
case "--user":
userId = UserHandle.parseUserArg(getNextArgRequired());
break;
+ case "--uid":
+ showUid = true;
+ uid = Integer.parseInt(getNextArgRequired());
+ break;
default:
pw.println("Error: Unknown option: " + opt);
return -1;
@@ -599,6 +605,9 @@
if (filter != null && !info.packageName.contains(filter)) {
continue;
}
+ if (uid != -1 && info.applicationInfo.uid != uid) {
+ continue;
+ }
final boolean isSystem =
(info.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0;
if ((!listDisabled || !info.applicationInfo.enabled) &&
@@ -615,6 +624,10 @@
pw.print(" installer=");
pw.print(mInterface.getInstallerPackageName(info.packageName));
}
+ if (showUid) {
+ pw.print(" uid:");
+ pw.print(info.applicationInfo.uid);
+ }
pw.println();
}
}
@@ -1236,7 +1249,7 @@
PackageInstaller.STATUS_FAILURE);
if (status == PackageInstaller.STATUS_SUCCESS) {
if (logSuccess) {
- System.out.println("Success");
+ pw.println("Success");
}
} else {
pw.println("Failure ["
@@ -1428,7 +1441,8 @@
pw.println(" -f: dump the name of the .apk file containing the test package");
pw.println(" list libraries");
pw.println(" Prints all system libraries.");
- pw.println(" list packages [-f] [-d] [-e] [-s] [-3] [-i] [-u] [--user USER_ID] [FILTER]");
+ pw.println(" list packages [-f] [-d] [-e] [-s] [-3] [-i] [-l] [-u] [-U] "
+ + "[--uid UID] [--user USER_ID] [FILTER]");
pw.println(" Prints all packages; optionally only those whose name contains");
pw.println(" the text in FILTER.");
pw.println(" Options:");
@@ -1438,7 +1452,11 @@
pw.println(" -s: filter to only show system packages");
pw.println(" -3: filter to only show third party packages");
pw.println(" -i: see the installer for the packages");
+ pw.println(" -l: ignored (used for compatibility with older releases)");
+ pw.println(" -U: also show the package UID");
pw.println(" -u: also include uninstalled packages");
+ pw.println(" --uid UID: filter to only show packages with the given UID");
+ pw.println(" --user USER_ID: only list packages belonging to the given user");
pw.println(" list permission-groups");
pw.println(" Prints all known permission groups.");
pw.println(" list permissions [-g] [-f] [-d] [-u] [GROUP]");
diff --git a/services/core/java/com/android/server/pm/PackageUsage.java b/services/core/java/com/android/server/pm/PackageUsage.java
new file mode 100644
index 0000000..ac1f739
--- /dev/null
+++ b/services/core/java/com/android/server/pm/PackageUsage.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.pm;
+
+import static android.os.Process.PACKAGE_INFO_GID;
+import static android.os.Process.SYSTEM_UID;
+
+import android.content.pm.PackageManager;
+import android.content.pm.PackageParser;
+import android.os.FileUtils;
+import android.util.AtomicFile;
+import android.util.Log;
+
+import libcore.io.IoUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+class PackageUsage extends AbstractStatsBase<Map<String, PackageParser.Package>> {
+
+ private static final String USAGE_FILE_MAGIC = "PACKAGE_USAGE__VERSION_";
+ private static final String USAGE_FILE_MAGIC_VERSION_1 = USAGE_FILE_MAGIC + "1";
+
+ private boolean mIsHistoricalPackageUsageAvailable = true;
+
+ PackageUsage() {
+ super("package-usage.list", "PackageUsage_DiskWriter", /* lock */ true);
+ }
+
+ boolean isHistoricalPackageUsageAvailable() {
+ return mIsHistoricalPackageUsageAvailable;
+ }
+
+ @Override
+ protected void writeInternal(Map<String, PackageParser.Package> packages) {
+ AtomicFile file = getFile();
+ FileOutputStream f = null;
+ try {
+ f = file.startWrite();
+ BufferedOutputStream out = new BufferedOutputStream(f);
+ FileUtils.setPermissions(file.getBaseFile().getPath(),
+ 0640, SYSTEM_UID, PACKAGE_INFO_GID);
+ StringBuilder sb = new StringBuilder();
+
+ sb.append(USAGE_FILE_MAGIC_VERSION_1);
+ sb.append('\n');
+ out.write(sb.toString().getBytes(StandardCharsets.US_ASCII));
+
+ for (PackageParser.Package pkg : packages.values()) {
+ if (pkg.getLatestPackageUseTimeInMills() == 0L) {
+ continue;
+ }
+ sb.setLength(0);
+ sb.append(pkg.packageName);
+ for (long usageTimeInMillis : pkg.mLastPackageUsageTimeInMills) {
+ sb.append(' ');
+ sb.append(usageTimeInMillis);
+ }
+ sb.append('\n');
+ out.write(sb.toString().getBytes(StandardCharsets.US_ASCII));
+ }
+ out.flush();
+ file.finishWrite(f);
+ } catch (IOException e) {
+ if (f != null) {
+ file.failWrite(f);
+ }
+ Log.e(PackageManagerService.TAG, "Failed to write package usage times", e);
+ }
+ }
+
+ @Override
+ protected void readInternal(Map<String, PackageParser.Package> packages) {
+ AtomicFile file = getFile();
+ BufferedInputStream in = null;
+ try {
+ in = new BufferedInputStream(file.openRead());
+ StringBuffer sb = new StringBuffer();
+
+ String firstLine = readLine(in, sb);
+ if (firstLine == null) {
+ // Empty file. Do nothing.
+ } else if (USAGE_FILE_MAGIC_VERSION_1.equals(firstLine)) {
+ readVersion1LP(packages, in, sb);
+ } else {
+ readVersion0LP(packages, in, sb, firstLine);
+ }
+ } catch (FileNotFoundException expected) {
+ mIsHistoricalPackageUsageAvailable = false;
+ } catch (IOException e) {
+ Log.w(PackageManagerService.TAG, "Failed to read package usage times", e);
+ } finally {
+ IoUtils.closeQuietly(in);
+ }
+ }
+
+ private void readVersion0LP(Map<String, PackageParser.Package> packages, InputStream in,
+ StringBuffer sb, String firstLine)
+ throws IOException {
+ // Initial version of the file had no version number and stored one
+ // package-timestamp pair per line.
+ // Note that the first line has already been read from the InputStream.
+ for (String line = firstLine; line != null; line = readLine(in, sb)) {
+ String[] tokens = line.split(" ");
+ if (tokens.length != 2) {
+ throw new IOException("Failed to parse " + line +
+ " as package-timestamp pair.");
+ }
+
+ String packageName = tokens[0];
+ PackageParser.Package pkg = packages.get(packageName);
+ if (pkg == null) {
+ continue;
+ }
+
+ long timestamp = parseAsLong(tokens[1]);
+ for (int reason = 0;
+ reason < PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT;
+ reason++) {
+ pkg.mLastPackageUsageTimeInMills[reason] = timestamp;
+ }
+ }
+ }
+
+ private void readVersion1LP(Map<String, PackageParser.Package> packages, InputStream in,
+ StringBuffer sb) throws IOException {
+ // Version 1 of the file started with the corresponding version
+ // number and then stored a package name and eight timestamps per line.
+ String line;
+ while ((line = readLine(in, sb)) != null) {
+ String[] tokens = line.split(" ");
+ if (tokens.length != PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT + 1) {
+ throw new IOException("Failed to parse " + line + " as a timestamp array.");
+ }
+
+ String packageName = tokens[0];
+ PackageParser.Package pkg = packages.get(packageName);
+ if (pkg == null) {
+ continue;
+ }
+
+ for (int reason = 0;
+ reason < PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT;
+ reason++) {
+ pkg.mLastPackageUsageTimeInMills[reason] = parseAsLong(tokens[reason + 1]);
+ }
+ }
+ }
+
+ private long parseAsLong(String token) throws IOException {
+ try {
+ return Long.parseLong(token);
+ } catch (NumberFormatException e) {
+ throw new IOException("Failed to parse " + token + " as a long.", e);
+ }
+ }
+
+ private String readLine(InputStream in, StringBuffer sb) throws IOException {
+ return readToken(in, sb, '\n');
+ }
+
+ private String readToken(InputStream in, StringBuffer sb, char endOfToken)
+ throws IOException {
+ sb.setLength(0);
+ while (true) {
+ int ch = in.read();
+ if (ch == -1) {
+ if (sb.length() == 0) {
+ return null;
+ }
+ throw new IOException("Unexpected EOF");
+ }
+ if (ch == endOfToken) {
+ return sb.toString();
+ }
+ sb.append((char)ch);
+ }
+ }
+}
\ No newline at end of file
diff --git a/services/core/java/com/android/server/pm/PermissionsState.java b/services/core/java/com/android/server/pm/PermissionsState.java
index 007b738..8f9968ec 100644
--- a/services/core/java/com/android/server/pm/PermissionsState.java
+++ b/services/core/java/com/android/server/pm/PermissionsState.java
@@ -274,7 +274,7 @@
return Collections.emptySet();
}
- Set<String> permissions = new ArraySet<>();
+ Set<String> permissions = new ArraySet<>(mPermissions.size());
final int permissionCount = mPermissions.size();
for (int i = 0; i < permissionCount; i++) {
@@ -282,6 +282,7 @@
if (hasInstallPermission(permission)) {
permissions.add(permission);
+ continue;
}
if (userId != UserHandle.USER_ALL) {
diff --git a/services/core/java/com/android/server/pm/ProtectedPackages.java b/services/core/java/com/android/server/pm/ProtectedPackages.java
index 7bdea18..e67364a 100644
--- a/services/core/java/com/android/server/pm/ProtectedPackages.java
+++ b/services/core/java/com/android/server/pm/ProtectedPackages.java
@@ -16,10 +16,15 @@
package com.android.server.pm;
+import android.annotation.Nullable;
import android.annotation.UserIdInt;
+import android.content.Context;
import android.os.UserHandle;
import android.util.SparseArray;
+import com.android.internal.R;
+import com.android.internal.annotations.GuardedBy;
+
/**
* Manages package names that need special protection.
*
@@ -29,61 +34,87 @@
*/
public class ProtectedPackages {
@UserIdInt
+ @GuardedBy("this")
private int mDeviceOwnerUserId;
+ @Nullable
+ @GuardedBy("this")
private String mDeviceOwnerPackage;
+ @Nullable
+ @GuardedBy("this")
private SparseArray<String> mProfileOwnerPackages;
- private final Object mLock = new Object();
+ @Nullable
+ @GuardedBy("this")
+ private final String mDeviceProvisioningPackage;
+
+ private final Context mContext;
+
+ public ProtectedPackages(Context context) {
+ mContext = context;
+ mDeviceProvisioningPackage = mContext.getResources().getString(
+ R.string.config_deviceProvisioningPackage);
+ }
/**
* Sets the device/profile owner information.
*/
- public void setDeviceAndProfileOwnerPackages(
+ public synchronized void setDeviceAndProfileOwnerPackages(
int deviceOwnerUserId, String deviceOwnerPackage,
SparseArray<String> profileOwnerPackages) {
- synchronized (mLock) {
- mDeviceOwnerUserId = deviceOwnerUserId;
- mDeviceOwnerPackage =
- (deviceOwnerUserId == UserHandle.USER_NULL) ? null : deviceOwnerPackage;
- mProfileOwnerPackages = (profileOwnerPackages == null) ? null
- : profileOwnerPackages.clone();
- }
+ mDeviceOwnerUserId = deviceOwnerUserId;
+ mDeviceOwnerPackage =
+ (deviceOwnerUserId == UserHandle.USER_NULL) ? null : deviceOwnerPackage;
+ mProfileOwnerPackages = (profileOwnerPackages == null) ? null
+ : profileOwnerPackages.clone();
}
- private boolean hasDeviceOwnerOrProfileOwner(int userId, String packageName) {
+ private synchronized boolean hasDeviceOwnerOrProfileOwner(int userId, String packageName) {
if (packageName == null) {
return false;
}
- synchronized (mLock) {
- if (mDeviceOwnerPackage != null) {
- if ((mDeviceOwnerUserId == userId)
- && (packageName.equals(mDeviceOwnerPackage))) {
- return true;
- }
+ if (mDeviceOwnerPackage != null) {
+ if ((mDeviceOwnerUserId == userId)
+ && (packageName.equals(mDeviceOwnerPackage))) {
+ return true;
}
- if (mProfileOwnerPackages != null) {
- if (packageName.equals(mProfileOwnerPackages.get(userId))) {
- return true;
- }
+ }
+ if (mProfileOwnerPackages != null) {
+ if (packageName.equals(mProfileOwnerPackages.get(userId))) {
+ return true;
}
}
return false;
}
/**
- * Whether a package or the components in a package's enabled state can be changed
- * by other callers than itself.
+ * Returns {@code true} if a given package is protected. Otherwise, returns {@code false}.
+ *
+ * <p>A protected package means that, apart from the package owner, no system or privileged apps
+ * can modify its data or package state.
*/
- public boolean canPackageStateBeChanged(@UserIdInt int userId, String packageName) {
- return hasDeviceOwnerOrProfileOwner(userId, packageName);
+ private synchronized boolean isProtectedPackage(String packageName) {
+ return packageName != null && packageName.equals(mDeviceProvisioningPackage);
}
/**
- * Whether a package's data be cleared.
+ * Returns {@code true} if a given package's state is protected. Otherwise, returns
+ * {@code false}.
+ *
+ * <p>This is not applicable if the caller is the package owner.
*/
- public boolean canPackageBeWiped(@UserIdInt int userId, String packageName) {
- return hasDeviceOwnerOrProfileOwner(userId, packageName);
+ public boolean isPackageStateProtected(@UserIdInt int userId, String packageName) {
+ return hasDeviceOwnerOrProfileOwner(userId, packageName)
+ || isProtectedPackage(packageName);
+ }
+
+ /**
+ * Returns {@code true} if a given package's data is protected. Otherwise, returns
+ * {@code false}.
+ */
+ public boolean isPackageDataProtected(@UserIdInt int userId, String packageName) {
+ return hasDeviceOwnerOrProfileOwner(userId, packageName)
+ || isProtectedPackage(packageName);
}
}
diff --git a/services/core/java/com/android/server/pm/ShortcutLauncher.java b/services/core/java/com/android/server/pm/ShortcutLauncher.java
index e667838..df51923 100644
--- a/services/core/java/com/android/server/pm/ShortcutLauncher.java
+++ b/services/core/java/com/android/server/pm/ShortcutLauncher.java
@@ -25,6 +25,8 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.pm.ShortcutUser.PackageWithUser;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -288,6 +290,15 @@
}
}
+ @Override
+ public JSONObject dumpCheckin(boolean clear) throws JSONException {
+ final JSONObject result = super.dumpCheckin(clear);
+
+ // Nothing really interesting to dump.
+
+ return result;
+ }
+
@VisibleForTesting
ArraySet<String> getAllPinnedShortcutsForTest(String packageName, int packageUserId) {
return new ArraySet<>(mPinnedShortcuts.get(PackageWithUser.of(packageUserId, packageName)));
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index 67e4e93..51c9619 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -23,6 +23,7 @@
import android.content.pm.PackageInfo;
import android.content.pm.ShortcutInfo;
import android.content.res.Resources;
+import android.os.Bundle;
import android.os.PersistableBundle;
import android.text.format.Formatter;
import android.util.ArrayMap;
@@ -34,7 +35,10 @@
import com.android.internal.util.Preconditions;
import com.android.internal.util.XmlUtils;
import com.android.server.pm.ShortcutService.ShortcutOperation;
+import com.android.server.pm.ShortcutService.Stats;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -60,7 +64,8 @@
private static final String TAG_VERIFY = ShortcutService.TAG + ".verify";
static final String TAG_ROOT = "package";
- private static final String TAG_INTENT_EXTRAS = "intent-extras";
+ private static final String TAG_INTENT_EXTRAS_LEGACY = "intent-extras";
+ private static final String TAG_INTENT = "intent";
private static final String TAG_EXTRAS = "extras";
private static final String TAG_SHORTCUT = "shortcut";
private static final String TAG_CATEGORIES = "categories";
@@ -79,7 +84,8 @@
private static final String ATTR_DISABLED_MESSAGE = "dmessage";
private static final String ATTR_DISABLED_MESSAGE_RES_ID = "dmessageid";
private static final String ATTR_DISABLED_MESSAGE_RES_NAME = "dmessagename";
- private static final String ATTR_INTENT = "intent";
+ private static final String ATTR_INTENT_LEGACY = "intent";
+ private static final String ATTR_INTENT_NO_EXTRA = "intent-base";
private static final String ATTR_RANK = "rank";
private static final String ATTR_TIMESTAMP = "timestamp";
private static final String ATTR_FLAGS = "flags";
@@ -92,6 +98,12 @@
private static final String TAG_STRING_ARRAY_XMLUTILS = "string-array";
private static final String ATTR_NAME_XMLUTILS = "name";
+ private static final String KEY_DYNAMIC = "dynamic";
+ private static final String KEY_MANIFEST = "manifest";
+ private static final String KEY_PINNED = "pinned";
+ private static final String KEY_BITMAPS = "bitmaps";
+ private static final String KEY_BITMAP_BYTES = "bitmapBytes";
+
/**
* All the shortcuts from the package, keyed on IDs.
*/
@@ -255,14 +267,8 @@
oldShortcut.ensureUpdatableWith(newShortcut);
wasPinned = oldShortcut.isPinned();
- if (!oldShortcut.isEnabled()) {
- newShortcut.addFlags(ShortcutInfo.FLAG_DISABLED);
- }
}
- // TODO Check max dynamic count.
- // mShortcutUser.mService.enforceMaxDynamicShortcuts(newDynamicCount);
-
// If it was originally pinned, the new one should be pinned too.
if (wasPinned) {
newShortcut.addFlags(ShortcutInfo.FLAG_PINNED);
@@ -443,8 +449,6 @@
* locale changes.
*/
public int getApiCallCount() {
- mShortcutUser.resetThrottlingIfNeeded();
-
final ShortcutService s = mShortcutUser.mService;
// Reset the counter if:
@@ -604,7 +608,37 @@
}
/**
- * Called when the package is updated or added.
+ * @return false if any of the target activities are no longer enabled.
+ */
+ private boolean areAllActivitiesStillEnabled() {
+ if (mShortcuts.size() == 0) {
+ return true;
+ }
+ final ShortcutService s = mShortcutUser.mService;
+
+ // Normally the number of target activities is 1 or so, so no need to use a complex
+ // structure like a set.
+ final ArrayList<ComponentName> checked = new ArrayList<>(4);
+
+ for (int i = mShortcuts.size() - 1; i >= 0; i--) {
+ final ShortcutInfo si = mShortcuts.valueAt(i);
+ final ComponentName activity = si.getActivity();
+
+ if (checked.contains(activity)) {
+ continue; // Already checked.
+ }
+ checked.add(activity);
+
+ if (!s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Called when the package may be added or updated, or its activities may be disabled, and
+ * if so, rescan the package and do the necessary stuff.
*
* Add case:
* - Publish manifest shortcuts.
@@ -612,23 +646,35 @@
* Update case:
* - Re-publish manifest shortcuts.
* - If there are shortcuts with resources (icons or strings), update their timestamps.
+ * - Disable shortcuts whose target activities are disabled.
*
* @return TRUE if any shortcuts have been changed.
*/
- public boolean handlePackageAddedOrUpdated(boolean isNewApp, boolean forceRescan) {
- final PackageInfo pi = mShortcutUser.mService.getPackageInfo(
- getPackageName(), getPackageUserId());
- if (pi == null) {
- return false; // Shouldn't happen.
- }
+ public boolean rescanPackageIfNeeded(boolean isNewApp, boolean forceRescan) {
+ final ShortcutService s = mShortcutUser.mService;
+ final long start = s.injectElapsedRealtime();
- if (!isNewApp && !forceRescan) {
- // Make sure the version code or last update time has changed.
- // Otherwise, nothing to do.
- if (getPackageInfo().getVersionCode() >= pi.versionCode
- && getPackageInfo().getLastUpdateTime() >= pi.lastUpdateTime) {
- return false;
+ final PackageInfo pi;
+ try {
+ pi = mShortcutUser.mService.getPackageInfo(
+ getPackageName(), getPackageUserId());
+ if (pi == null) {
+ return false; // Shouldn't happen.
}
+
+ if (!isNewApp && !forceRescan) {
+ // Return if the package hasn't changed, ie:
+ // - version code hasn't change
+ // - lastUpdateTime hasn't change
+ // - all target activities are still enabled.
+ if ((getPackageInfo().getVersionCode() >= pi.versionCode)
+ && (getPackageInfo().getLastUpdateTime() >= pi.lastUpdateTime)
+ && areAllActivitiesStillEnabled()) {
+ return false;
+ }
+ }
+ } finally {
+ s.logDurationStat(Stats.PACKAGE_UPDATE_CHECK, start);
}
// Now prepare to publish manifest shortcuts.
@@ -660,8 +706,6 @@
getPackageInfo().updateVersionInfo(pi);
- final ShortcutService s = mShortcutUser.mService;
-
boolean changed = false;
// For existing shortcuts, update timestamps if they have any resources.
@@ -1007,7 +1051,7 @@
}
}
if (changed) {
- s.scheduleSaveUser(getPackageUserId());
+ s.packageShortcutsChanged(getPackageName(), getPackageUserId());
}
}
@@ -1166,6 +1210,42 @@
}
@Override
+ public JSONObject dumpCheckin(boolean clear) throws JSONException {
+ final JSONObject result = super.dumpCheckin(clear);
+
+ int numDynamic = 0;
+ int numPinned = 0;
+ int numManifest = 0;
+ int numBitmaps = 0;
+ long totalBitmapSize = 0;
+
+ final ArrayMap<String, ShortcutInfo> shortcuts = mShortcuts;
+ final int size = shortcuts.size();
+ for (int i = 0; i < size; i++) {
+ final ShortcutInfo si = shortcuts.valueAt(i);
+
+ if (si.isDynamic()) numDynamic++;
+ if (si.isDeclaredInManifest()) numManifest++;
+ if (si.isPinned()) numPinned++;
+
+ if (si.getBitmapPath() != null) {
+ numBitmaps++;
+ totalBitmapSize += new File(si.getBitmapPath()).length();
+ }
+ }
+
+ result.put(KEY_DYNAMIC, numDynamic);
+ result.put(KEY_MANIFEST, numManifest);
+ result.put(KEY_PINNED, numPinned);
+ result.put(KEY_BITMAPS, numBitmaps);
+ result.put(KEY_BITMAP_BYTES, totalBitmapSize);
+
+ // TODO Log update frequency too.
+
+ return result;
+ }
+
+ @Override
public void saveToXml(@NonNull XmlSerializer out, boolean forBackup)
throws IOException, XmlPullParserException {
final int size = mShortcuts.size();
@@ -1191,8 +1271,8 @@
private static void saveShortcut(XmlSerializer out, ShortcutInfo si, boolean forBackup)
throws IOException, XmlPullParserException {
if (forBackup) {
- if (!si.isPinned()) {
- return; // Backup only pinned icons.
+ if (!(si.isPinned() && si.isEnabled())) {
+ return; // We only backup pinned shortcuts that are enabled.
}
}
out.startTag(null, TAG_SHORTCUT);
@@ -1211,7 +1291,6 @@
si.getDisabledMessageResourceId());
ShortcutService.writeAttr(out, ATTR_DISABLED_MESSAGE_RES_NAME,
si.getDisabledMessageResName());
- ShortcutService.writeAttr(out, ATTR_INTENT, si.getIntentNoExtras());
ShortcutService.writeAttr(out, ATTR_TIMESTAMP,
si.getLastChangedTimestamp());
if (forBackup) {
@@ -1240,9 +1319,16 @@
out.endTag(null, TAG_CATEGORIES);
}
}
+ final Intent[] intentsNoExtras = si.getIntentsNoExtras();
+ final PersistableBundle[] intentsExtras = si.getIntentPersistableExtrases();
+ final int numIntents = intentsNoExtras.length;
+ for (int i = 0; i < numIntents; i++) {
+ out.startTag(null, TAG_INTENT);
+ ShortcutService.writeAttr(out, ATTR_INTENT_NO_EXTRA, intentsNoExtras[i]);
+ ShortcutService.writeTagExtra(out, TAG_EXTRAS, intentsExtras[i]);
+ out.endTag(null, TAG_INTENT);
+ }
- ShortcutService.writeTagExtra(out, TAG_INTENT_EXTRAS,
- si.getIntentPersistableExtras());
ShortcutService.writeTagExtra(out, TAG_EXTRAS, si.getExtras());
out.endTag(null, TAG_SHORTCUT);
@@ -1305,8 +1391,9 @@
String disabledMessage;
int disabledMessageResId;
String disabledMessageResName;
- Intent intent;
- PersistableBundle intentPersistableExtras = null;
+ Intent intentLegacy;
+ PersistableBundle intentPersistableExtrasLegacy = null;
+ ArrayList<Intent> intents = new ArrayList<>();
int rank;
PersistableBundle extras = null;
long lastChangedTimestamp;
@@ -1330,7 +1417,7 @@
ATTR_DISABLED_MESSAGE_RES_ID);
disabledMessageResName = ShortcutService.parseStringAttribute(parser,
ATTR_DISABLED_MESSAGE_RES_NAME);
- intent = ShortcutService.parseIntentAttribute(parser, ATTR_INTENT);
+ intentLegacy = ShortcutService.parseIntentAttributeNoDefault(parser, ATTR_INTENT_LEGACY);
rank = (int) ShortcutService.parseLongAttribute(parser, ATTR_RANK);
lastChangedTimestamp = ShortcutService.parseLongAttribute(parser, ATTR_TIMESTAMP);
flags = (int) ShortcutService.parseLongAttribute(parser, ATTR_FLAGS);
@@ -1352,8 +1439,11 @@
depth, type, tag));
}
switch (tag) {
- case TAG_INTENT_EXTRAS:
- intentPersistableExtras = PersistableBundle.restoreFromXml(parser);
+ case TAG_INTENT_EXTRAS_LEGACY:
+ intentPersistableExtrasLegacy = PersistableBundle.restoreFromXml(parser);
+ continue;
+ case TAG_INTENT:
+ intents.add(parseIntent(parser));
continue;
case TAG_EXTRAS:
extras = PersistableBundle.restoreFromXml(parser);
@@ -1376,15 +1466,53 @@
throw ShortcutService.throwForInvalidTag(depth, tag);
}
+ if (intentLegacy != null) {
+ // For the legacy file format which supported only one intent per shortcut.
+ ShortcutInfo.setIntentExtras(intentLegacy, intentPersistableExtrasLegacy);
+ intents.clear();
+ intents.add(intentLegacy);
+ }
+
return new ShortcutInfo(
userId, id, packageName, activityComponent, /* icon =*/ null,
title, titleResId, titleResName, text, textResId, textResName,
disabledMessage, disabledMessageResId, disabledMessageResName,
- categories, intent,
- intentPersistableExtras, rank, extras, lastChangedTimestamp, flags,
+ categories,
+ intents.toArray(new Intent[intents.size()]),
+ rank, extras, lastChangedTimestamp, flags,
iconResId, iconResName, bitmapPath);
}
+ private static Intent parseIntent(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
+
+ Intent intent = ShortcutService.parseIntentAttribute(parser,
+ ATTR_INTENT_NO_EXTRA);
+
+ final int outerDepth = parser.getDepth();
+ int type;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
+ if (type != XmlPullParser.START_TAG) {
+ continue;
+ }
+ final int depth = parser.getDepth();
+ final String tag = parser.getName();
+ if (ShortcutService.DEBUG_LOAD) {
+ Slog.d(TAG, String.format(" depth=%d type=%d name=%s",
+ depth, type, tag));
+ }
+ switch (tag) {
+ case TAG_EXTRAS:
+ ShortcutInfo.setIntentExtras(intent,
+ PersistableBundle.restoreFromXml(parser));
+ continue;
+ }
+ throw ShortcutService.throwForInvalidTag(depth, tag);
+ }
+ return intent;
+ }
+
@VisibleForTesting
List<ShortcutInfo> getAllShortcutsForTest() {
return new ArrayList<>(mShortcuts.values());
@@ -1425,12 +1553,12 @@
// Verify each shortcut's status.
for (int i = mShortcuts.size() - 1; i >= 0; i--) {
final ShortcutInfo si = mShortcuts.valueAt(i);
- if (!(si.isManifestShortcut() || si.isDynamic() || si.isPinned())) {
+ if (!(si.isDeclaredInManifest() || si.isDynamic() || si.isPinned())) {
failed = true;
Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()
+ " is not manifest, dynamic or pinned.");
}
- if (si.isManifestShortcut() && si.isDynamic()) {
+ if (si.isDeclaredInManifest() && si.isDynamic()) {
failed = true;
Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()
+ " is both dynamic and manifest at the same time.");
@@ -1450,6 +1578,16 @@
Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()
+ " is floating, but has rank=" + si.getRank());
}
+ if (si.getIcon() != null) {
+ failed = true;
+ Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()
+ + " still has an icon");
+ }
+ if (si.hasIconFile() && si.hasIconResource()) {
+ failed = true;
+ Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()
+ + " has both resource and bitmap icons");
+ }
}
if (failed) {
diff --git a/services/core/java/com/android/server/pm/ShortcutPackageInfo.java b/services/core/java/com/android/server/pm/ShortcutPackageInfo.java
index 7f5d931..e7b66fc 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackageInfo.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackageInfo.java
@@ -171,7 +171,7 @@
final int versionCode = ShortcutService.parseIntAttribute(parser, ATTR_VERSION);
- final long lastUpdateTime = ShortcutService.parseIntAttribute(
+ final long lastUpdateTime = ShortcutService.parseLongAttribute(
parser, ATTR_LAST_UPDATE_TIME);
// When restoring from backup, it's always shadow.
diff --git a/services/core/java/com/android/server/pm/ShortcutPackageItem.java b/services/core/java/com/android/server/pm/ShortcutPackageItem.java
index 757dd19..79b5c4e 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackageItem.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackageItem.java
@@ -21,6 +21,8 @@
import com.android.internal.util.Preconditions;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -31,6 +33,7 @@
*/
abstract class ShortcutPackageItem {
private static final String TAG = ShortcutService.TAG;
+ private static final String KEY_NAME = "name";
private final int mPackageUserId;
private final String mPackageName;
@@ -48,6 +51,10 @@
mPackageInfo = Preconditions.checkNotNull(packageInfo);
}
+ public ShortcutUser getUser() {
+ return mShortcutUser;
+ }
+
/**
* ID of the user who actually has this package running on. For {@link ShortcutPackage},
* this is the same thing as {@link #getOwnerUserId}, but if it's a {@link ShortcutLauncher} and
@@ -133,6 +140,12 @@
public abstract void saveToXml(@NonNull XmlSerializer out, boolean forBackup)
throws IOException, XmlPullParserException;
+ public JSONObject dumpCheckin(boolean clear) throws JSONException {
+ final JSONObject result = new JSONObject();
+ result.put(KEY_NAME, mPackageName);
+ return result;
+ }
+
/**
* Verify various internal states.
*/
diff --git a/services/core/java/com/android/server/pm/ShortcutParser.java b/services/core/java/com/android/server/pm/ShortcutParser.java
index 858e1cd..3cf4200 100644
--- a/services/core/java/com/android/server/pm/ShortcutParser.java
+++ b/services/core/java/com/android/server/pm/ShortcutParser.java
@@ -20,7 +20,6 @@
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.content.pm.ShortcutInfo;
import android.content.res.TypedArray;
@@ -30,6 +29,7 @@
import android.util.AttributeSet;
import android.util.Log;
import android.util.Slog;
+import android.util.TypedValue;
import android.util.Xml;
import com.android.internal.R;
@@ -79,7 +79,7 @@
}
final ActivityInfo activityInfoWithMetadata =
- service.injectGetActivityInfoWithMetadata(
+ service.getActivityInfoWithMetadata(
activityInfoNoMetadata.getComponentName(), userId);
if (activityInfoWithMetadata != null) {
result = parseShortcutsOneFile(
@@ -127,6 +127,7 @@
ShortcutInfo currentShortcut = null;
Set<String> categories = null;
+ final ArrayList<Intent> intents = new ArrayList<>();
outer:
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
@@ -143,9 +144,15 @@
final ShortcutInfo si = currentShortcut;
currentShortcut = null; // Make sure to null out for the next iteration.
- if (si.getIntent() == null) {
- Log.e(TAG, "Shortcut " + si.getId() + " has no intent. Skipping it.");
- continue;
+ if (si.isEnabled()) {
+ if (intents.size() == 0) {
+ Log.e(TAG, "Shortcut " + si.getId() + " has no intent. Skipping it.");
+ continue;
+ }
+ } else {
+ // Just set the default intent to disabled shortcuts.
+ intents.clear();
+ intents.add(new Intent(Intent.ACTION_VIEW));
}
if (numShortcuts >= maxShortcuts) {
@@ -153,6 +160,23 @@
+ activityInfo.getComponentName() + ". Skipping the rest.");
return result;
}
+
+ // Same flag as what TaskStackBuilder adds.
+ intents.get(0).addFlags(
+ Intent.FLAG_ACTIVITY_NEW_TASK |
+ Intent.FLAG_ACTIVITY_CLEAR_TASK |
+ Intent.FLAG_ACTIVITY_TASK_ON_HOME);
+ try {
+ si.setIntents(intents.toArray(new Intent[intents.size()]));
+ } catch (RuntimeException e) {
+ // This shouldn't happen because intents in XML can't have complicated
+ // extras, but just in case Intent.parseIntent() supports such a thing one
+ // day.
+ Log.e(TAG, "Shortcut's extras contain un-persistable values. Skipping it.");
+ continue;
+ }
+ intents.clear();
+
if (categories != null) {
si.setCategories(categories);
categories = null;
@@ -196,17 +220,12 @@
}
}
}
- if (!si.isEnabled()) {
- // Just set the default intent to disabled shortcuts.
- si.setIntent(new Intent(Intent.ACTION_VIEW));
- }
currentShortcut = si;
categories = null;
continue;
}
if (depth == 3 && TAG_INTENT.equals(tag)) {
if ((currentShortcut == null)
- || (currentShortcut.getIntentNoExtras() != null)
|| !currentShortcut.isEnabled()) {
Log.e(TAG, "Ignoring excessive intent tag.");
continue;
@@ -216,17 +235,10 @@
parser, attrs);
if (TextUtils.isEmpty(intent.getAction())) {
Log.e(TAG, "Shortcut intent action must be provided. activity=" + activity);
+ currentShortcut = null; // Invalidate the current shortcut.
continue;
}
- try {
- currentShortcut.setIntent(intent);
- } catch (RuntimeException e) {
- // This shouldn't happen because intents in XML can't have complicated
- // extras, but just in case Intent.parseIntent() supports such a thing one
- // day.
- Log.e(TAG, "Shortcut's extras contain un-persistable values. Skipping it.");
- continue;
- }
+ intents.add(intent);
continue;
}
if (depth == 3 && TAG_CATEGORIES.equals(tag)) {
@@ -247,7 +259,7 @@
continue;
}
- ShortcutService.warnForInvalidTag(depth, tag);
+ Log.w(TAG, String.format("Invalid tag '%s' found at depth %d", tag, depth));
}
} finally {
if (parser != null) {
@@ -261,7 +273,12 @@
final TypedArray sa = service.mContext.getResources().obtainAttributes(attrs,
R.styleable.ShortcutCategories);
try {
- return sa.getString(R.styleable.ShortcutCategories_name);
+ if (sa.getType(R.styleable.ShortcutCategories_name) == TypedValue.TYPE_STRING) {
+ return sa.getNonResourceString(R.styleable.ShortcutCategories_name);
+ } else {
+ Log.w(TAG, "android:name for shortcut category must be string literal.");
+ return null;
+ }
} finally {
sa.recycle();
}
@@ -273,7 +290,11 @@
final TypedArray sa = service.mContext.getResources().obtainAttributes(attrs,
R.styleable.Shortcut);
try {
- final String id = sa.getString(R.styleable.Shortcut_shortcutId);
+ if (sa.getType(R.styleable.Shortcut_shortcutId) != TypedValue.TYPE_STRING) {
+ Log.w(TAG, "android:shortcutId must be string literal. activity=" + activity);
+ return null;
+ }
+ final String id = sa.getNonResourceString(R.styleable.Shortcut_shortcutId);
final boolean enabled = sa.getBoolean(R.styleable.Shortcut_enabled, true);
final int iconResId = sa.getResourceId(R.styleable.Shortcut_icon, 0);
final int titleResId = sa.getResourceId(R.styleable.Shortcut_shortcutShortLabel, 0);
@@ -282,11 +303,11 @@
R.styleable.Shortcut_shortcutDisabledMessage, 0);
if (TextUtils.isEmpty(id)) {
- Slog.w(TAG, "Shortcut ID must be provided. activity=" + activity);
+ Log.w(TAG, "android:shortcutId must be provided. activity=" + activity);
return null;
}
if (titleResId == 0) {
- Slog.w(TAG, "Shortcut title must be provided. activity=" + activity);
+ Log.w(TAG, "android:shortcutShortLabel must be provided. activity=" + activity);
return null;
}
@@ -336,7 +357,6 @@
null, // disabled message res name
null, // categories
null, // intent
- null, // intent extras
rank,
null, // extras
service.injectCurrentTimeMillis(),
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 1db1ce7..d875f1e9 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -24,9 +24,11 @@
import android.app.AppGlobals;
import android.app.IUidObserver;
import android.app.usage.UsageStatsManagerInternal;
+import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
@@ -49,10 +51,12 @@
import android.graphics.Canvas;
import android.graphics.RectF;
import android.graphics.drawable.Icon;
+import android.net.Uri;
import android.os.Binder;
import android.os.Environment;
import android.os.FileUtils;
import android.os.Handler;
+import android.os.LocaleList;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.os.PersistableBundle;
@@ -91,6 +95,9 @@
import libcore.io.IoUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -116,24 +123,16 @@
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import java.util.function.Predicate;
/**
* TODO:
- * - Deal with the async nature of PACKAGE_ADD. Basically when a publisher does anything after
- * it's upgraded, the manager should make sure the upgrade process has been executed.
- *
* - getIconMaxWidth()/getIconMaxHeight() should use xdpi and ydpi.
* -> But TypedValue.applyDimension() doesn't differentiate x and y..?
*
- * - Default launcher check does take a few ms. Worth caching.
- *
* - Detect when already registered instances are passed to APIs again, which might break
* internal bitmap handling.
- *
- * - Add more call stats.
*/
public class ShortcutService extends IShortcutService.Stub {
static final String TAG = "ShortcutService";
@@ -179,12 +178,15 @@
private static final String TAG_ROOT = "root";
private static final String TAG_LAST_RESET_TIME = "last_reset_time";
- private static final String TAG_LOCALE_CHANGE_SEQUENCE_NUMBER = "locale_seq_no";
private static final String ATTR_VALUE = "value";
private static final String LAUNCHER_INTENT_CATEGORY = Intent.CATEGORY_LAUNCHER;
+ private static final String KEY_SHORTCUT = "shortcut";
+ private static final String KEY_LOW_RAM = "lowRam";
+ private static final String KEY_ICON_SIZE = "iconSize";
+
@VisibleForTesting
interface ConfigConstants {
/**
@@ -232,6 +234,13 @@
private final Object mLock = new Object();
+ private static List<ResolveInfo> EMPTY_RESOLVE_INFO = new ArrayList<>(0);
+
+ private static Predicate<ResolveInfo> ACTIVITY_NOT_EXPORTED =
+ ri -> !ri.activityInfo.exported;
+
+ private static Predicate<PackageInfo> PACKAGE_NOT_INSTALLED = pi -> !isInstalled(pi);
+
private final Handler mHandler;
@GuardedBy("mLock")
@@ -285,16 +294,6 @@
@GuardedBy("mLock")
private List<Integer> mDirtyUserIds = new ArrayList<>();
- /**
- * A counter that increments every time the system locale changes. We keep track of it to
- * reset
- * throttling counters on the first call from each package after the last locale change.
- *
- * We need this mechanism because we can't do much in the locale change callback, which is
- * {@link ShortcutServiceInternal#onSystemLocaleChangedNoLock()}.
- */
- private final AtomicLong mLocaleChangeSequenceNumber = new AtomicLong();
-
private final AtomicBoolean mBootCompleted = new AtomicBoolean();
private static final int PACKAGE_MATCH_FLAGS =
@@ -318,8 +317,10 @@
int RESOURCE_NAME_LOOKUP = 10;
int GET_LAUNCHER_ACTIVITY = 11;
int CHECK_LAUNCHER_ACTIVITY = 12;
+ int IS_ACTIVITY_ENABLED = 13;
+ int PACKAGE_UPDATE_CHECK = 14;
- int COUNT = CHECK_LAUNCHER_ACTIVITY + 1;
+ int COUNT = PACKAGE_UPDATE_CHECK + 1;
}
final Object mStatLock = new Object();
@@ -347,12 +348,18 @@
@interface ShortcutOperation {
}
+ @GuardedBy("mLock")
+ private int mWtfCount = 0;
+
+ @GuardedBy("mLock")
+ private Exception mLastWtfStacktrace;
+
public ShortcutService(Context context) {
- this(context, BackgroundThread.get().getLooper());
+ this(context, BackgroundThread.get().getLooper(), /*onyForPackgeManagerApis*/ false);
}
@VisibleForTesting
- ShortcutService(Context context, Looper looper) {
+ ShortcutService(Context context, Looper looper, boolean onlyForPackageManagerApis) {
mContext = Preconditions.checkNotNull(context);
LocalServices.addService(ShortcutServiceInternal.class, new LocalService());
mHandler = new Handler(looper);
@@ -363,7 +370,35 @@
mUsageStatsManagerInternal = Preconditions.checkNotNull(
LocalServices.getService(UsageStatsManagerInternal.class));
- mPackageMonitor.register(context, looper, UserHandle.ALL, /* externalStorage= */ false);
+ if (onlyForPackageManagerApis) {
+ return; // Don't do anything further. For unit tests only.
+ }
+
+ // Register receivers.
+
+ // We need to set a priority, so let's just not use PackageMonitor for now.
+ // TODO Refactor PackageMonitor to support priorities.
+ final IntentFilter packageFilter = new IntentFilter();
+ packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+ packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+ packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+ packageFilter.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED);
+ packageFilter.addDataScheme("package");
+ packageFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
+ mContext.registerReceiverAsUser(mPackageMonitor, UserHandle.ALL,
+ packageFilter, null, mHandler);
+
+ final IntentFilter preferedActivityFilter = new IntentFilter();
+ preferedActivityFilter.addAction(Intent.ACTION_PREFERRED_ACTIVITY_CHANGED);
+ preferedActivityFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
+ mContext.registerReceiverAsUser(mPackageMonitor, UserHandle.ALL,
+ preferedActivityFilter, null, mHandler);
+
+ final IntentFilter localeFilter = new IntentFilter();
+ localeFilter.addAction(Intent.ACTION_LOCALE_CHANGED);
+ localeFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
+ mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL,
+ localeFilter, null, mHandler);
injectRegisterUidObserver(mUidObserver, ActivityManager.UID_OBSERVER_PROCSTATE
| ActivityManager.UID_OBSERVER_GONE);
@@ -376,8 +411,9 @@
}
}
- public long getLocaleChangeSequenceNumber() {
- return mLocaleChangeSequenceNumber.get();
+ public String injectGetLocaleTagsForUser(@UserIdInt int userId) {
+ // TODO This should get the per-user locale. b/30123329 b/30119489
+ return LocaleList.getDefault().toLanguageTags();
}
final private IUidObserver mUidObserver = new IUidObserver.Stub() {
@@ -486,8 +522,11 @@
Slog.d(TAG, "handleUnlockUser: user=" + userId);
}
synchronized (mLock) {
- // Preload
- getUserShortcutsLocked(userId);
+ // Preload the user's shortcuts.
+ // Also see if the locale has changed.
+ // Note as of nyc, the locale is per-user, so the locale shouldn't change
+ // when the user is locked. However due to b/30119489 it still happens.
+ getUserShortcutsLocked(userId).detectLocaleChange();
checkPackageChanges(userId);
}
@@ -644,7 +683,7 @@
}
@Nullable
- static Intent parseIntentAttribute(XmlPullParser parser, String attribute) {
+ static Intent parseIntentAttributeNoDefault(XmlPullParser parser, String attribute) {
final String value = parseStringAttribute(parser, attribute);
Intent parsed = null;
if (!TextUtils.isEmpty(value)) {
@@ -654,6 +693,12 @@
Slog.e(TAG, "Error parsing intent", e);
}
}
+ return parsed;
+ }
+
+ @Nullable
+ static Intent parseIntentAttribute(XmlPullParser parser, String attribute) {
+ Intent parsed = parseIntentAttributeNoDefault(parser, attribute);
if (parsed == null) {
// Default intent.
parsed = new Intent(Intent.ACTION_VIEW);
@@ -733,8 +778,6 @@
// Body.
writeTagValue(out, TAG_LAST_RESET_TIME, mRawLastResetTime);
- writeTagValue(out, TAG_LOCALE_CHANGE_SEQUENCE_NUMBER,
- mLocaleChangeSequenceNumber.get());
// Epilogue.
out.endTag(null, TAG_ROOT);
@@ -779,9 +822,6 @@
case TAG_LAST_RESET_TIME:
mRawLastResetTime = parseLongAttribute(parser, ATTR_VALUE);
break;
- case TAG_LOCALE_CHANGE_SEQUENCE_NUMBER:
- mLocaleChangeSequenceNumber.set(parseLongAttribute(parser, ATTR_VALUE));
- break;
default:
Slog.e(TAG, "Invalid tag: " + tag);
break;
@@ -798,12 +838,17 @@
getLastResetTimeLocked();
}
+ @VisibleForTesting
+ final File getUserFile(@UserIdInt int userId) {
+ return new File(injectUserDataPath(userId), FILENAME_USER_PACKAGES);
+ }
+
private void saveUserLocked(@UserIdInt int userId) {
- final File path = new File(injectUserDataPath(userId), FILENAME_USER_PACKAGES);
+ final File path = getUserFile(userId);
if (DEBUG) {
Slog.d(TAG, "Saving to " + path);
}
- path.mkdirs();
+ path.getParentFile().mkdirs();
final AtomicFile file = new AtomicFile(path);
FileOutputStream os = null;
try {
@@ -846,7 +891,7 @@
@Nullable
private ShortcutUser loadUserLocked(@UserIdInt int userId) {
- final File path = new File(injectUserDataPath(userId), FILENAME_USER_PACKAGES);
+ final File path = getUserFile(userId);
if (DEBUG) {
Slog.d(TAG, "Loading from " + path);
}
@@ -992,6 +1037,24 @@
}
}
+ private boolean isUserUnlocked(@UserIdInt int userId) {
+ final long token = injectClearCallingIdentity();
+ try {
+ // Weird: when SystemService.onUnlockUser() is called, the user state is still
+ // unlocking, as opposed to unlocked. So we need to accept the "unlocking" state too.
+ // We know when the user is unlocking, the CE storage is already unlocked.
+ return mUserManager.isUserUnlockingOrUnlocked(userId);
+ } finally {
+ injectRestoreCallingIdentity(token);
+ }
+ }
+
+ void throwIfUserLocked(@UserIdInt int userId) {
+ if (!isUserUnlocked(userId)) {
+ throw new IllegalStateException("User " + userId + " is locked or not running");
+ }
+ }
+
@GuardedBy("mLock")
@NonNull
private boolean isUserLoadedLocked(@UserIdInt int userId) {
@@ -1002,6 +1065,11 @@
@GuardedBy("mLock")
@NonNull
ShortcutUser getUserShortcutsLocked(@UserIdInt int userId) {
+ if (!isUserUnlocked(userId)) {
+ wtf("User still locked");
+ return new ShortcutUser(this, userId);
+ }
+
ShortcutUser userPackages = mUsers.get(userId);
if (userPackages == null) {
userPackages = loadUserLocked(userId);
@@ -1046,9 +1114,10 @@
new File(shortcut.getBitmapPath()).delete();
shortcut.setBitmapPath(null);
- shortcut.setIconResourceId(0);
- shortcut.clearFlags(ShortcutInfo.FLAG_HAS_ICON_FILE | ShortcutInfo.FLAG_HAS_ICON_RES);
}
+ shortcut.setIconResourceId(0);
+ shortcut.setIconResName(null);
+ shortcut.clearFlags(ShortcutInfo.FLAG_HAS_ICON_FILE | ShortcutInfo.FLAG_HAS_ICON_RES);
}
public void cleanupBitmapsForPackage(@UserIdInt int userId, String packageName) {
@@ -1165,8 +1234,7 @@
final long token = injectClearCallingIdentity();
try {
// Clear icon info on the shortcut.
- shortcut.setIconResourceId(0);
- shortcut.setBitmapPath(null);
+ removeIcon(userId, shortcut);
final Icon icon = shortcut.getIcon();
if (icon == null) {
@@ -1305,26 +1373,39 @@
}
private void enforceSystemOrShell() {
- Preconditions.checkState(isCallerSystem() || isCallerShell(),
- "Caller must be system or shell");
+ if (!(isCallerSystem() || isCallerShell())) {
+ throw new SecurityException("Caller must be system or shell");
+ }
}
private void enforceShell() {
- Preconditions.checkState(isCallerShell(), "Caller must be shell");
+ if (!isCallerShell()) {
+ throw new SecurityException("Caller must be shell");
+ }
}
private void enforceSystem() {
- Preconditions.checkState(isCallerSystem(), "Caller must be system");
+ if (!isCallerSystem()) {
+ throw new SecurityException("Caller must be system");
+ }
}
private void enforceResetThrottlingPermission() {
if (isCallerSystem()) {
return;
}
- injectEnforceCallingPermission(
+ enforceCallingOrSelfPermission(
android.Manifest.permission.RESET_SHORTCUT_MANAGER_THROTTLING, null);
}
+ private void enforceCallingOrSelfPermission(
+ @NonNull String permission, @Nullable String message) {
+ if (isCallerSystem()) {
+ return;
+ }
+ injectEnforceCallingPermission(permission, message);
+ }
+
/**
* Somehow overriding ServiceContext.enforceCallingPermission() in the unit tests would confuse
* mockito. So instead we extracted it here and override it in the tests.
@@ -1414,7 +1495,7 @@
* Clean up / validate an incoming shortcut.
* - Make sure all mandatory fields are set.
* - Make sure the intent's extras are persistable, and them to set
- * {@link ShortcutInfo#mIntentPersistableExtras}. Also clear its extras.
+ * {@link ShortcutInfo#mIntentPersistableExtrases}. Also clear its extras.
* - Clear flags.
*
* TODO Detailed unit tests
@@ -1426,6 +1507,10 @@
shortcut.getPackage().equals(shortcut.getActivity().getPackageName()),
"Cannot publish shortcut: activity " + shortcut.getActivity() + " does not"
+ " belong to package " + shortcut.getPackage());
+ Preconditions.checkState(
+ injectIsMainActivity(shortcut.getActivity(), shortcut.getUserId()),
+ "Cannot publish shortcut: activity " + shortcut.getActivity() + " is not"
+ + " main activity");
}
if (!forUpdate) {
@@ -1473,12 +1558,14 @@
public boolean setDynamicShortcuts(String packageName, ParceledListSlice shortcutInfoList,
@UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList();
final int size = newShortcuts.size();
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
ps.ensureImmutableShortcutsNotIncluded(newShortcuts);
@@ -1522,12 +1609,14 @@
public boolean updateShortcuts(String packageName, ParceledListSlice shortcutInfoList,
@UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList();
final int size = newShortcuts.size();
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
ps.ensureImmutableShortcutsNotIncluded(newShortcuts);
@@ -1571,11 +1660,6 @@
removeIcon(userId, target);
}
- if (source.getActivity() != null &&
- !source.getActivity().equals(target.getActivity())) {
- // TODO When activity is changing, check the dynamic count.
- }
-
// Note copyNonNullFieldsFrom() does the "updatable with?" check too.
target.copyNonNullFieldsFrom(source);
target.setTimestamp(injectCurrentTimeMillis());
@@ -1605,12 +1689,14 @@
public boolean addDynamicShortcuts(String packageName, ParceledListSlice shortcutInfoList,
@UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList();
final int size = newShortcuts.size();
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
ps.ensureImmutableShortcutsNotIncluded(newShortcuts);
@@ -1652,18 +1738,23 @@
@Override
public void disableShortcuts(String packageName, List shortcutIds,
- String disabledMessage, int disabledMessageResId, @UserIdInt int userId) {
+ CharSequence disabledMessage, int disabledMessageResId, @UserIdInt int userId) {
verifyCaller(packageName, userId);
Preconditions.checkNotNull(shortcutIds, "shortcutIds must be provided");
+ throwIfUserLocked(userId);
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
ps.ensureImmutableShortcutsNotIncludedWithIds((List<String>) shortcutIds);
+ final String disabledMessageString =
+ (disabledMessage == null) ? null : disabledMessage.toString();
+
for (int i = shortcutIds.size() - 1; i >= 0; i--) {
ps.disableWithId(Preconditions.checkStringNotEmpty((String) shortcutIds.get(i)),
- disabledMessage, disabledMessageResId,
+ disabledMessageString, disabledMessageResId,
/* overrideImmutable=*/ false);
}
@@ -1679,9 +1770,11 @@
public void enableShortcuts(String packageName, List shortcutIds, @UserIdInt int userId) {
verifyCaller(packageName, userId);
Preconditions.checkNotNull(shortcutIds, "shortcutIds must be provided");
+ throwIfUserLocked(userId);
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
ps.ensureImmutableShortcutsNotIncludedWithIds((List<String>) shortcutIds);
@@ -1699,9 +1792,11 @@
@UserIdInt int userId) {
verifyCaller(packageName, userId);
Preconditions.checkNotNull(shortcutIds, "shortcutIds must be provided");
+ throwIfUserLocked(userId);
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
ps.ensureImmutableShortcutsNotIncludedWithIds((List<String>) shortcutIds);
@@ -1721,9 +1816,12 @@
@Override
public void removeAllDynamicShortcuts(String packageName, @UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
synchronized (mLock) {
- getPackageShortcutsLocked(packageName, userId).deleteAllDynamicShortcuts();
+ final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
+ ps.deleteAllDynamicShortcuts();
}
packageShortcutsChanged(packageName, userId);
@@ -1734,6 +1832,8 @@
public ParceledListSlice<ShortcutInfo> getDynamicShortcuts(String packageName,
@UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
+
synchronized (mLock) {
return getShortcutsWithQueryLocked(
packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR,
@@ -1745,6 +1845,8 @@
public ParceledListSlice<ShortcutInfo> getManifestShortcuts(String packageName,
@UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
+
synchronized (mLock) {
return getShortcutsWithQueryLocked(
packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR,
@@ -1756,6 +1858,8 @@
public ParceledListSlice<ShortcutInfo> getPinnedShortcuts(String packageName,
@UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
+
synchronized (mLock) {
return getShortcutsWithQueryLocked(
packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR,
@@ -1768,13 +1872,15 @@
final ArrayList<ShortcutInfo> ret = new ArrayList<>();
- getPackageShortcutsLocked(packageName, userId).findAll(ret, query, cloneFlags);
+ final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
+ ps.findAll(ret, query, cloneFlags);
return new ParceledListSlice<>(ret);
}
@Override
- public int getMaxShortcutCountForActivity(String packageName, @UserIdInt int userId)
+ public int getMaxShortcutCountPerActivity(String packageName, @UserIdInt int userId)
throws RemoteException {
verifyCaller(packageName, userId);
@@ -1784,16 +1890,19 @@
@Override
public int getRemainingCallCount(String packageName, @UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
synchronized (mLock) {
- return mMaxUpdatesPerInterval
- - getPackageShortcutsLocked(packageName, userId).getApiCallCount();
+ final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
+ return mMaxUpdatesPerInterval - ps.getApiCallCount();
}
}
@Override
public long getRateLimitResetTime(String packageName, @UserIdInt int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
synchronized (mLock) {
return getNextResetTimeLocked();
@@ -1812,6 +1921,7 @@
@Override
public void reportShortcutUsed(String packageName, String shortcutId, int userId) {
verifyCaller(packageName, userId);
+ throwIfUserLocked(userId);
Preconditions.checkNotNull(shortcutId);
@@ -1822,6 +1932,8 @@
synchronized (mLock) {
final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId);
+ ps.getUser().onCalledByPublisher(packageName);
+
if (ps.findShortcutById(shortcutId) == null) {
Log.w(TAG, String.format("reportShortcutUsed: package %s doesn't have shortcut %s",
packageName, shortcutId));
@@ -1878,28 +1990,46 @@
Slog.d(TAG, "onApplicationActive: package=" + packageName + " userid=" + userId);
}
enforceResetThrottlingPermission();
+ if (!isUserUnlocked(userId)) {
+ // This is called by system UI, so no need to throw. Just ignore.
+ return;
+ }
resetPackageThrottling(packageName, userId);
}
// We override this method in unit tests to do a simpler check.
boolean hasShortcutHostPermission(@NonNull String callingPackage, int userId) {
- return hasShortcutHostPermissionInner(callingPackage, userId);
+ final long start = injectElapsedRealtime();
+ try {
+ return hasShortcutHostPermissionInner(callingPackage, userId);
+ } finally {
+ logDurationStat(Stats.LAUNCHER_PERMISSION_CHECK, start);
+ }
}
// This method is extracted so we can directly call this method from unit tests,
// even when hasShortcutPermission() is overridden.
@VisibleForTesting
boolean hasShortcutHostPermissionInner(@NonNull String callingPackage, int userId) {
- synchronized (mLock) {
- final long start = injectElapsedRealtime();
+ throwIfUserLocked(userId);
+ synchronized (mLock) {
final ShortcutUser user = getUserShortcutsLocked(userId);
+ // Always trust the in-memory cache.
+ final ComponentName cached = user.getCachedLauncher();
+ if (cached != null) {
+ if (cached.getPackageName().equals(callingPackage)) {
+ return true;
+ }
+ }
+ // If the cached one doesn't match, then go ahead
+
final List<ResolveInfo> allHomeCandidates = new ArrayList<>();
// Default launcher from package manager.
final long startGetHomeActivitiesAsUser = injectElapsedRealtime();
- final ComponentName defaultLauncher = injectPackageManagerInternal()
+ final ComponentName defaultLauncher = mPackageManagerInternal
.getHomeActivitiesAsUser(allHomeCandidates, userId);
logDurationStat(Stats.GET_DEFAULT_HOME, startGetHomeActivitiesAsUser);
@@ -1910,11 +2040,18 @@
Slog.v(TAG, "Default launcher from PM: " + detected);
}
} else {
- detected = user.getDefaultLauncherComponent();
+ detected = user.getLastKnownLauncher();
- // TODO: Make sure it's still enabled.
- if (DEBUG) {
- Slog.v(TAG, "Cached launcher: " + detected);
+ if (detected != null) {
+ if (injectIsActivityEnabledAndExported(detected, userId)) {
+ if (DEBUG) {
+ Slog.v(TAG, "Cached launcher: " + detected);
+ }
+ } else {
+ Slog.w(TAG, "Cached launcher " + detected + " no longer exists");
+ detected = null;
+ user.clearLauncher();
+ }
}
}
@@ -1944,13 +2081,13 @@
lastPriority = ri.priority;
}
}
- logDurationStat(Stats.LAUNCHER_PERMISSION_CHECK, start);
+ // Update the cache.
+ user.setLauncher(detected);
if (detected != null) {
if (DEBUG) {
Slog.v(TAG, "Detected launcher: " + detected);
}
- user.setDefaultLauncherComponent(detected);
return detected.getPackageName().equals(callingPackage);
} else {
// Default launcher not found.
@@ -2012,7 +2149,7 @@
if (appStillExists && (packageUserId == owningUserId)) {
// This will do the notification and save when needed, so do it after the above
// notifyListeners.
- user.handlePackageAddedOrUpdated(packageName, /* forceRescan=*/ true);
+ user.rescanPackageIfNeeded(packageName, /* forceRescan=*/ true);
}
if (!wasUserLoaded) {
@@ -2033,6 +2170,10 @@
@Nullable ComponentName componentName,
int queryFlags, int userId) {
final ArrayList<ShortcutInfo> ret = new ArrayList<>();
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return ret;
+ }
+
final boolean cloneKeyFieldOnly =
((queryFlags & ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY) != 0);
final int cloneFlag = cloneKeyFieldOnly ? ShortcutInfo.CLONE_REMOVE_NON_KEY_INFO
@@ -2110,6 +2251,10 @@
Preconditions.checkStringNotEmpty(packageName, "packageName");
Preconditions.checkStringNotEmpty(shortcutId, "shortcutId");
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return false;
+ }
+
synchronized (mLock) {
getLauncherShortcutsLocked(callingPackage, userId, launcherUserId)
.attemptToRestoreIfNeededAndSave();
@@ -2126,6 +2271,10 @@
Preconditions.checkStringNotEmpty(packageName, "packageName");
Preconditions.checkStringNotEmpty(shortcutId, "shortcutId");
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return null;
+ }
+
final ShortcutPackage p = getUserShortcutsLocked(userId)
.getPackageShortcutsIfExists(packageName);
if (p == null) {
@@ -2147,6 +2296,10 @@
Preconditions.checkStringNotEmpty(packageName, "packageName");
Preconditions.checkNotNull(shortcutIds, "shortcutIds");
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return;
+ }
+
synchronized (mLock) {
final ShortcutLauncher launcher =
getLauncherShortcutsLocked(callingPackage, userId, launcherUserId);
@@ -2160,13 +2313,17 @@
}
@Override
- public Intent createShortcutIntent(int launcherUserId,
+ public Intent[] createShortcutIntents(int launcherUserId,
@NonNull String callingPackage,
@NonNull String packageName, @NonNull String shortcutId, int userId) {
// Calling permission must be checked by LauncherAppsImpl.
Preconditions.checkStringNotEmpty(packageName, "packageName can't be empty");
Preconditions.checkStringNotEmpty(shortcutId, "shortcutId can't be empty");
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return null;
+ }
+
synchronized (mLock) {
getLauncherShortcutsLocked(callingPackage, userId, launcherUserId)
.attemptToRestoreIfNeededAndSave();
@@ -2176,9 +2333,10 @@
launcherUserId, callingPackage, packageName, shortcutId, userId);
// "si == null" should suffice here, but check the flags too just to make sure.
if (si == null || !si.isEnabled() || !si.isAlive()) {
+ Log.e(TAG, "Shortcut " + shortcutId + " does not exist or disabled");
return null;
}
- return si.getIntent();
+ return si.getIntents();
}
}
@@ -2196,6 +2354,10 @@
Preconditions.checkNotNull(packageName, "packageName");
Preconditions.checkNotNull(shortcutId, "shortcutId");
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return 0;
+ }
+
synchronized (mLock) {
getLauncherShortcutsLocked(callingPackage, userId, launcherUserId)
.attemptToRestoreIfNeededAndSave();
@@ -2220,6 +2382,10 @@
Preconditions.checkNotNull(packageName, "packageName");
Preconditions.checkNotNull(shortcutId, "shortcutId");
+ if (!isUserUnlocked(userId) || !isUserUnlocked(launcherUserId)) {
+ return null;
+ }
+
synchronized (mLock) {
getLauncherShortcutsLocked(callingPackage, userId, launcherUserId)
.attemptToRestoreIfNeededAndSave();
@@ -2252,38 +2418,24 @@
@Override
public boolean hasShortcutHostPermission(int launcherUserId,
@NonNull String callingPackage) {
+ if (!isUserUnlocked(launcherUserId)) {
+ return false;
+ }
return ShortcutService.this.hasShortcutHostPermission(callingPackage, launcherUserId);
}
+ }
- /**
- * Called by AM when the system locale changes *within the AM lock. ABSOLUTELY do not take
- * any locks in this method.
- */
+ final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
- public void onSystemLocaleChangedNoLock() {
- // DO NOT HOLD ANY LOCKS HERE.
-
- // We want to reset throttling for all packages for all users. But we can't just do so
- // here because:
- // - We can't load/save users that are locked.
- // - Even for loaded users, resetting the counters would require us to hold mLock.
- //
- // So we use a "pull" model instead. In here, we just increment the "locale change
- // sequence number". Each ShortcutUser has the "last known locale change sequence".
- //
- // This allows ShortcutUser's to detect the system locale change, so they can reset
- // counters.
-
- // Ignore all callback during system boot.
- if (mBootCompleted.get()) {
- mLocaleChangeSequenceNumber.incrementAndGet();
- if (DEBUG) {
- Slog.d(TAG, "onSystemLocaleChangedNoLock: " + mLocaleChangeSequenceNumber.get());
- }
- injectPostToHandler(() -> handleLocaleChanged());
+ public void onReceive(Context context, Intent intent) {
+ if (!mBootCompleted.get()) {
+ return; // Boot not completed, ignore the broadcast.
+ }
+ if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {
+ handleLocaleChanged();
}
}
- }
+ };
void handleLocaleChanged() {
if (DEBUG) {
@@ -2293,7 +2445,7 @@
final long token = injectClearCallingIdentity();
try {
- forEachLoadedUserLocked(u -> u.forAllPackages(p -> p.resolveResourceStrings()));
+ forEachLoadedUserLocked(user -> user.detectLocaleChange());
} finally {
injectRestoreCallingIdentity(token);
}
@@ -2303,31 +2455,75 @@
* Package event callbacks.
*/
@VisibleForTesting
- final PackageMonitor mPackageMonitor = new PackageMonitor() {
+ final BroadcastReceiver mPackageMonitor = new BroadcastReceiver() {
@Override
- public void onPackageAdded(String packageName, int uid) {
- handlePackageAdded(packageName, getChangingUserId());
- }
+ public void onReceive(Context context, Intent intent) {
+ final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
+ if (userId == UserHandle.USER_NULL) {
+ Slog.w(TAG, "Intent broadcast does not contain user handle: " + intent);
+ return;
+ }
- @Override
- public void onPackageUpdateFinished(String packageName, int uid) {
- handlePackageUpdateFinished(packageName, getChangingUserId());
- }
+ final String action = intent.getAction();
- @Override
- public void onPackageRemoved(String packageName, int uid) {
- handlePackageRemoved(packageName, getChangingUserId());
- }
+ // This is normally called on Handler, so clearCallingIdentity() isn't needed,
+ // but we still check it in unit tests.
+ final long token = injectClearCallingIdentity();
+ try {
- @Override
- public void onPackageDataCleared(String packageName, int uid) {
- handlePackageDataCleared(packageName, getChangingUserId());
- }
+ if (!isUserUnlocked(userId)) {
+ if (DEBUG) {
+ Slog.d(TAG, "Ignoring package broadcast " + action
+ + " for locked/stopped user " + userId);
+ }
+ return;
+ }
- @Override
- public boolean onPackageChanged(String packageName, int uid, String[] components) {
- handlePackageChanged(packageName, getChangingUserId());
- return false; // We don't need to receive onSomePackagesChanged(), so just false.
+ // Whenever we get one of those package broadcasts, or get
+ // ACTION_PREFERRED_ACTIVITY_CHANGED, we purge the default launcher cache.
+ synchronized (mLock) {
+ final ShortcutUser user = getUserShortcutsLocked(userId);
+ user.clearLauncher();
+ }
+ if (Intent.ACTION_PREFERRED_ACTIVITY_CHANGED.equals(action)) {
+ // Nothing farther to do.
+ return;
+ }
+
+ final Uri intentUri = intent.getData();
+ final String packageName = (intentUri != null) ? intentUri.getSchemeSpecificPart()
+ : null;
+ if (packageName == null) {
+ Slog.w(TAG, "Intent broadcast does not contain package name: " + intent);
+ return;
+ }
+
+ final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+
+ switch (action) {
+ case Intent.ACTION_PACKAGE_ADDED:
+ if (replacing) {
+ handlePackageUpdateFinished(packageName, userId);
+ } else {
+ handlePackageAdded(packageName, userId);
+ }
+ break;
+ case Intent.ACTION_PACKAGE_REMOVED:
+ if (!replacing) {
+ handlePackageRemoved(packageName, userId);
+ }
+ break;
+ case Intent.ACTION_PACKAGE_CHANGED:
+ handlePackageChanged(packageName, userId);
+
+ break;
+ case Intent.ACTION_PACKAGE_DATA_CLEARED:
+ handlePackageDataCleared(packageName, userId);
+ break;
+ }
+ } finally {
+ injectRestoreCallingIdentity(token);
+ }
}
};
@@ -2360,6 +2556,10 @@
return; // Don't delete shadow information.
}
if (!isPackageInstalled(spi.getPackageName(), spi.getPackageUserId())) {
+ if (DEBUG) {
+ Slog.d(TAG, "Uninstalled: " + spi.getPackageName()
+ + " user " + spi.getPackageUserId());
+ }
gonePackages.add(PackageWithUser.of(spi));
}
});
@@ -2374,7 +2574,7 @@
// Then for each installed app, publish manifest shortcuts when needed.
forUpdatedPackages(ownerUserId, user.getLastAppScanTime(), ai -> {
- user.handlePackageAddedOrUpdated(ai.packageName, /* forceRescan=*/ false);
+ user.rescanPackageIfNeeded(ai.packageName, /* forceRescan=*/ false);
});
// Write the time just before the scan, because there may be apps that have just
@@ -2395,7 +2595,7 @@
synchronized (mLock) {
final ShortcutUser user = getUserShortcutsLocked(userId);
user.attemptToRestoreIfNeededAndSave(this, packageName, userId);
- user.handlePackageAddedOrUpdated(packageName, /* forceRescan=*/ false);
+ user.rescanPackageIfNeeded(packageName, /* forceRescan=*/ false);
}
verifyStates();
}
@@ -2410,7 +2610,7 @@
user.attemptToRestoreIfNeededAndSave(this, packageName, userId);
if (isPackageInstalled(packageName, userId)) {
- user.handlePackageAddedOrUpdated(packageName, /* forceRescan=*/ false);
+ user.rescanPackageIfNeeded(packageName, /* forceRescan=*/ false);
}
}
verifyStates();
@@ -2446,7 +2646,7 @@
synchronized (mLock) {
final ShortcutUser user = getUserShortcutsLocked(packageUserId);
- user.handlePackageAddedOrUpdated(packageName, /* forceRescan=*/ true);
+ user.rescanPackageIfNeeded(packageName, /* forceRescan=*/ true);
}
verifyStates();
@@ -2454,21 +2654,26 @@
// === PackageManager interaction ===
+ /**
+ * Returns {@link PackageInfo} unless it's uninstalled or disabled.
+ */
@Nullable
- PackageInfo getPackageInfoWithSignatures(String packageName, @UserIdInt int userId) {
- return injectPackageInfo(packageName, userId, true);
+ final PackageInfo getPackageInfoWithSignatures(String packageName, @UserIdInt int userId) {
+ return getPackageInfo(packageName, userId, true);
}
+ /**
+ * Returns {@link PackageInfo} unless it's uninstalled or disabled.
+ */
@Nullable
- PackageInfo getPackageInfo(String packageName, @UserIdInt int userId) {
- return injectPackageInfo(packageName, userId, false);
+ final PackageInfo getPackageInfo(String packageName, @UserIdInt int userId) {
+ return getPackageInfo(packageName, userId, false);
}
int injectGetPackageUid(@NonNull String packageName, @UserIdInt int userId) {
final long token = injectClearCallingIdentity();
try {
- return mIPackageManager.getPackageUid(packageName, PACKAGE_MATCH_FLAGS
- , userId);
+ return mIPackageManager.getPackageUid(packageName, PACKAGE_MATCH_FLAGS, userId);
} catch (RemoteException e) {
// Shouldn't happen.
Slog.wtf(TAG, "RemoteException", e);
@@ -2478,16 +2683,30 @@
}
}
+ /**
+ * Returns {@link PackageInfo} unless it's uninstalled or disabled.
+ */
@Nullable
@VisibleForTesting
- PackageInfo injectPackageInfo(String packageName, @UserIdInt int userId,
+ final PackageInfo getPackageInfo(String packageName, @UserIdInt int userId,
+ boolean getSignatures) {
+ return isInstalledOrNull(injectPackageInfoWithUninstalled(
+ packageName, userId, getSignatures));
+ }
+
+ /**
+ * Do not use directly; this returns uninstalled packages too.
+ */
+ @Nullable
+ @VisibleForTesting
+ PackageInfo injectPackageInfoWithUninstalled(String packageName, @UserIdInt int userId,
boolean getSignatures) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
- return mIPackageManager.getPackageInfo(packageName, PACKAGE_MATCH_FLAGS
- | (getSignatures ? PackageManager.GET_SIGNATURES : 0)
- , userId);
+ return mIPackageManager.getPackageInfo(
+ packageName, PACKAGE_MATCH_FLAGS
+ | (getSignatures ? PackageManager.GET_SIGNATURES : 0), userId);
} catch (RemoteException e) {
// Shouldn't happen.
Slog.wtf(TAG, "RemoteException", e);
@@ -2501,9 +2720,22 @@
}
}
+ /**
+ * Returns {@link ApplicationInfo} unless it's uninstalled or disabled.
+ */
@Nullable
@VisibleForTesting
- ApplicationInfo injectApplicationInfo(String packageName, @UserIdInt int userId) {
+ final ApplicationInfo getApplicationInfo(String packageName, @UserIdInt int userId) {
+ return isInstalledOrNull(injectApplicationInfoWithUninstalled(packageName, userId));
+ }
+
+ /**
+ * Do not use directly; this returns uninstalled packages too.
+ */
+ @Nullable
+ @VisibleForTesting
+ ApplicationInfo injectApplicationInfoWithUninstalled(
+ String packageName, @UserIdInt int userId) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
@@ -2519,13 +2751,27 @@
}
}
+ /**
+ * Returns {@link ActivityInfo} with its metadata unless it's uninstalled or disabled.
+ */
@Nullable
- ActivityInfo injectGetActivityInfoWithMetadata(ComponentName activity, @UserIdInt int userId) {
+ final ActivityInfo getActivityInfoWithMetadata(ComponentName activity, @UserIdInt int userId) {
+ return isInstalledOrNull(injectGetActivityInfoWithMetadataWithUninstalled(
+ activity, userId));
+ }
+
+ /**
+ * Do not use directly; this returns uninstalled packages too.
+ */
+ @Nullable
+ @VisibleForTesting
+ ActivityInfo injectGetActivityInfoWithMetadataWithUninstalled(
+ ComponentName activity, @UserIdInt int userId) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
return mIPackageManager.getActivityInfo(activity,
- PACKAGE_MATCH_FLAGS | PackageManager.GET_META_DATA, userId);
+ (PACKAGE_MATCH_FLAGS | PackageManager.GET_META_DATA), userId);
} catch (RemoteException e) {
// Shouldn't happen.
Slog.wtf(TAG, "RemoteException", e);
@@ -2537,18 +2783,20 @@
}
}
- @Nullable
+ /**
+ * Return all installed and enabled packages.
+ */
+ @NonNull
@VisibleForTesting
- List<PackageInfo> injectInstalledPackages(@UserIdInt int userId) {
+ final List<PackageInfo> getInstalledPackages(@UserIdInt int userId) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
- final ParceledListSlice<PackageInfo> parceledList =
- mIPackageManager.getInstalledPackages(PACKAGE_MATCH_FLAGS, userId);
- if (parceledList == null) {
- return Collections.emptyList();
- }
- return parceledList.getList();
+ final List<PackageInfo> all = injectGetPackagesWithUninstalled(userId);
+
+ all.removeIf(PACKAGE_NOT_INSTALLED);
+
+ return all;
} catch (RemoteException e) {
// Shouldn't happen.
Slog.wtf(TAG, "RemoteException", e);
@@ -2560,17 +2808,31 @@
}
}
+ /**
+ * Do not use directly; this returns uninstalled packages too.
+ */
+ @NonNull
+ @VisibleForTesting
+ List<PackageInfo> injectGetPackagesWithUninstalled(@UserIdInt int userId)
+ throws RemoteException {
+ final ParceledListSlice<PackageInfo> parceledList =
+ mIPackageManager.getInstalledPackages(PACKAGE_MATCH_FLAGS, userId);
+ if (parceledList == null) {
+ return Collections.emptyList();
+ }
+ return parceledList.getList();
+ }
+
private void forUpdatedPackages(@UserIdInt int userId, long lastScanTime,
Consumer<ApplicationInfo> callback) {
if (DEBUG) {
Slog.d(TAG, "forUpdatedPackages for user " + userId + ", lastScanTime=" + lastScanTime);
}
- final List<PackageInfo> list = injectInstalledPackages(userId);
+ final List<PackageInfo> list = getInstalledPackages(userId);
for (int i = list.size() - 1; i >= 0; i--) {
final PackageInfo pi = list.get(i);
- if (((pi.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) != 0)
- && (pi.lastUpdateTime >= lastScanTime)) {
+ if (pi.lastUpdateTime >= lastScanTime) {
if (DEBUG) {
Slog.d(TAG, "Found updated package " + pi.packageName);
}
@@ -2579,13 +2841,37 @@
}
}
- private boolean isApplicationFlagSet(String packageName, int userId, int flags) {
- final ApplicationInfo ai = injectApplicationInfo(packageName, userId);
+ private boolean isApplicationFlagSet(@NonNull String packageName, int userId, int flags) {
+ final ApplicationInfo ai = injectApplicationInfoWithUninstalled(packageName, userId);
return (ai != null) && ((ai.flags & flags) == flags);
}
+ private static boolean isInstalled(@Nullable ApplicationInfo ai) {
+ return (ai != null) && (ai.flags & ApplicationInfo.FLAG_INSTALLED) != 0;
+ }
+
+ private static boolean isInstalled(@Nullable PackageInfo pi) {
+ return (pi != null) && isInstalled(pi.applicationInfo);
+ }
+
+ private static boolean isInstalled(@Nullable ActivityInfo ai) {
+ return (ai != null) && isInstalled(ai.applicationInfo);
+ }
+
+ private static ApplicationInfo isInstalledOrNull(ApplicationInfo ai) {
+ return isInstalled(ai) ? ai : null;
+ }
+
+ private static PackageInfo isInstalledOrNull(PackageInfo pi) {
+ return isInstalled(pi) ? pi : null;
+ }
+
+ private static ActivityInfo isInstalledOrNull(ActivityInfo ai) {
+ return isInstalled(ai) ? ai : null;
+ }
+
boolean isPackageInstalled(String packageName, int userId) {
- return isApplicationFlagSet(packageName, userId, ApplicationInfo.FLAG_INSTALLED);
+ return getApplicationInfo(packageName, userId) != null;
}
@Nullable
@@ -2616,20 +2902,46 @@
return intent;
}
+ /**
+ * Same as queryIntentActivitiesAsUser, except it makes sure the package is installed,
+ * and only returns exported activities.
+ */
+ @NonNull
+ @VisibleForTesting
+ List<ResolveInfo> queryActivities(@NonNull Intent baseIntent,
+ @NonNull String packageName, @Nullable ComponentName activity, int userId) {
+
+ baseIntent.setPackage(Preconditions.checkNotNull(packageName));
+ if (activity != null) {
+ baseIntent.setComponent(activity);
+ }
+
+ final List<ResolveInfo> resolved =
+ mContext.getPackageManager().queryIntentActivitiesAsUser(
+ baseIntent, PACKAGE_MATCH_FLAGS, userId);
+ if (resolved == null || resolved.size() == 0) {
+ return EMPTY_RESOLVE_INFO;
+ }
+ // Make sure the package is installed.
+ if (!isInstalled(resolved.get(0).activityInfo)) {
+ return EMPTY_RESOLVE_INFO;
+ }
+ resolved.removeIf(ACTIVITY_NOT_EXPORTED);
+ return resolved;
+ }
+
+ /**
+ * Return the main activity that is enabled and exported. If multiple activities are found,
+ * return the first one.
+ */
@Nullable
ComponentName injectGetDefaultMainActivity(@NonNull String packageName, int userId) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
- final Intent intent = getMainActivityIntent();
- intent.setPackage(packageName);
-
final List<ResolveInfo> resolved =
- mContext.getPackageManager().queryIntentActivitiesAsUser(
- intent, PACKAGE_MATCH_FLAGS, userId);
-
- return (resolved == null || resolved.size() == 0)
- ? null : resolved.get(0).activityInfo.getComponentName();
+ queryActivities(getMainActivityIntent(), packageName, null, userId);
+ return resolved.size() == 0 ? null : resolved.get(0).activityInfo.getComponentName();
} finally {
injectRestoreCallingIdentity(token);
@@ -2637,19 +2949,17 @@
}
}
+ /**
+ * Return whether an activity is enabled, exported and main.
+ */
boolean injectIsMainActivity(@NonNull ComponentName activity, int userId) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
- final Intent intent = getMainActivityIntent();
- intent.setPackage(activity.getPackageName());
- intent.setComponent(activity);
-
final List<ResolveInfo> resolved =
- mContext.getPackageManager().queryIntentActivitiesAsUser(
- intent, PACKAGE_MATCH_FLAGS, userId);
-
- return resolved != null && resolved.size() > 0;
+ queryActivities(getMainActivityIntent(), activity.getPackageName(),
+ activity, userId);
+ return resolved.size() > 0;
} finally {
injectRestoreCallingIdentity(token);
@@ -2657,19 +2967,15 @@
}
}
+ /**
+ * Return all the enabled, exported and main activities from a package.
+ */
@NonNull
List<ResolveInfo> injectGetMainActivities(@NonNull String packageName, int userId) {
final long start = injectElapsedRealtime();
final long token = injectClearCallingIdentity();
try {
- final Intent intent = getMainActivityIntent();
- intent.setPackage(packageName);
-
- final List<ResolveInfo> resolved =
- mContext.getPackageManager().queryIntentActivitiesAsUser(
- intent, PACKAGE_MATCH_FLAGS, userId);
-
- return (resolved != null) ? resolved : new ArrayList<>(0);
+ return queryActivities(getMainActivityIntent(), packageName, null, userId);
} finally {
injectRestoreCallingIdentity(token);
@@ -2677,6 +2983,24 @@
}
}
+ /**
+ * Return whether an activity is enabled and exported.
+ */
+ @VisibleForTesting
+ boolean injectIsActivityEnabledAndExported(
+ @NonNull ComponentName activity, @UserIdInt int userId) {
+ final long start = injectElapsedRealtime();
+ final long token = injectClearCallingIdentity();
+ try {
+ return queryActivities(new Intent(), activity.getPackageName(), activity, userId)
+ .size() > 0;
+ } finally {
+ injectRestoreCallingIdentity(token);
+
+ logDurationStat(Stats.IS_ACTIVITY_ENABLED, start);
+ }
+ }
+
boolean injectIsSafeModeEnabled() {
final long token = injectClearCallingIdentity();
try {
@@ -2760,20 +3084,29 @@
@Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
- != PackageManager.PERMISSION_GRANTED) {
- pw.println("Permission Denial: can't dump UserManager from from pid="
- + Binder.getCallingPid()
- + ", uid=" + Binder.getCallingUid()
- + " without permission "
- + android.Manifest.permission.DUMP);
- return;
+ enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,
+ "can't dump by this caller");
+ boolean checkin = false;
+ boolean clear = false;
+ if (args != null) {
+ for (String arg : args) {
+ if ("-c".equals(arg)) {
+ checkin = true;
+ } else if ("--checkin".equals(arg)) {
+ checkin = true;
+ clear = true;
+ }
+ }
}
- dumpInner(pw, args);
+
+ if (checkin) {
+ dumpCheckin(pw, clear);
+ } else {
+ dumpInner(pw);
+ }
}
- @VisibleForTesting
- void dumpInner(PrintWriter pw, String[] args) {
+ private void dumpInner(PrintWriter pw) {
synchronized (mLock) {
final long now = injectCurrentTimeMillis();
pw.print("Now: [");
@@ -2798,10 +3131,6 @@
pw.print("] ");
pw.print(formatTime(next));
- pw.print(" Locale change seq#: ");
- pw.print(mLocaleChangeSequenceNumber.get());
- pw.println();
-
pw.print(" Config:");
pw.print(" Max icon dim: ");
pw.println(mMaxIconDimension);
@@ -2836,6 +3165,17 @@
dumpStatLS(pw, p, Stats.RESOURCE_NAME_LOOKUP, "resourceNameLookup");
dumpStatLS(pw, p, Stats.GET_LAUNCHER_ACTIVITY, "getLauncherActivity");
dumpStatLS(pw, p, Stats.CHECK_LAUNCHER_ACTIVITY, "checkLauncherActivity");
+ dumpStatLS(pw, p, Stats.IS_ACTIVITY_ENABLED, "isActivityEnabled");
+ dumpStatLS(pw, p, Stats.PACKAGE_UPDATE_CHECK, "packageUpdateCheck");
+ }
+
+ pw.println();
+ pw.print(" #Failures: ");
+ pw.println(mWtfCount);
+
+ if (mLastWtfStacktrace != null) {
+ pw.print(" Last failure stack trace: ");
+ pw.println(Log.getStackTraceString(mLastWtfStacktrace));
}
for (int i = 0; i < mUsers.size(); i++) {
@@ -2878,6 +3218,34 @@
(count == 0 ? 0 : ((double) dur) / count)));
}
+ /**
+ * Dumpsys for checkin.
+ *
+ * @param clear if true, clear the history information. Some other system services have this
+ * behavior but shortcut service doesn't for now.
+ */
+ private void dumpCheckin(PrintWriter pw, boolean clear) {
+ synchronized (mLock) {
+ try {
+ final JSONArray users = new JSONArray();
+
+ for (int i = 0; i < mUsers.size(); i++) {
+ users.put(mUsers.valueAt(i).dumpCheckin(clear));
+ }
+
+ final JSONObject result = new JSONObject();
+
+ result.put(KEY_SHORTCUT, users);
+ result.put(KEY_LOW_RAM, injectIsLowRamDevice());
+ result.put(KEY_ICON_SIZE, mMaxIconDimension);
+
+ pw.println(result.toString(1));
+ } catch (JSONException e) {
+ Slog.e(TAG, "Unable to write in json", e);
+ }
+ }
+ }
+
// === Shell support ===
@Override
@@ -2886,9 +3254,13 @@
enforceShell();
- final int status = (new MyShellCommand()).exec(this, in, out, err, args, resultReceiver);
-
- resultReceiver.send(status, null);
+ final long token = injectClearCallingIdentity();
+ try {
+ final int status = (new MyShellCommand()).exec(this, in, out, err, args, resultReceiver);
+ resultReceiver.send(status, null);
+ } finally {
+ injectRestoreCallingIdentity(token);
+ }
}
static class CommandException extends Exception {
@@ -2912,6 +3284,10 @@
case "--user":
if (takeUser) {
mUserId = UserHandle.parseUserArg(getNextArgRequired());
+ if (!isUserUnlocked(mUserId)) {
+ throw new CommandException(
+ "User " + mUserId + " is not running or locked");
+ }
break;
}
// fallthrough
@@ -2929,9 +3305,6 @@
final PrintWriter pw = getOutPrintWriter();
try {
switch (cmd) {
- case "reset-package-throttling":
- handleResetPackageThrottling();
- break;
case "reset-throttling":
handleResetThrottling();
break;
@@ -2950,9 +3323,6 @@
case "get-default-launcher":
handleGetDefaultLauncher();
break;
- case "refresh-default-launcher":
- handleRefreshDefaultLauncher();
- break;
case "unload-user":
handleUnloadUser();
break;
@@ -2978,9 +3348,6 @@
final PrintWriter pw = getOutPrintWriter();
pw.println("Usage: cmd shortcut COMMAND [options ...]");
pw.println();
- pw.println("cmd shortcut reset-package-throttling [--user USER_ID] PACKAGE");
- pw.println(" Reset throttling for a package");
- pw.println();
pw.println("cmd shortcut reset-throttling [--user USER_ID]");
pw.println(" Reset throttling for all packages and users");
pw.println();
@@ -2997,10 +3364,7 @@
pw.println(" Clear the cached default launcher");
pw.println();
pw.println("cmd shortcut get-default-launcher [--user USER_ID]");
- pw.println(" Show the cached default launcher");
- pw.println();
- pw.println("cmd shortcut refresh-default-launcher [--user USER_ID]");
- pw.println(" Refresh the cached default launcher");
+ pw.println(" Show the default launcher");
pw.println();
pw.println("cmd shortcut unload-user [--user USER_ID]");
pw.println(" Unload a user from the memory");
@@ -3014,7 +3378,7 @@
private void handleResetThrottling() throws CommandException {
parseOptions(/* takeUser =*/ true);
- Slog.i(TAG, "cmd: handleResetThrottling");
+ Slog.i(TAG, "cmd: handleResetThrottling: user=" + mUserId);
resetThrottlingInner(mUserId);
}
@@ -3025,16 +3389,6 @@
resetAllThrottlingInner();
}
- private void handleResetPackageThrottling() throws CommandException {
- parseOptions(/* takeUser =*/ true);
-
- final String packageName = getNextArgRequired();
-
- Slog.i(TAG, "cmd: handleResetPackageThrottling: " + packageName);
-
- resetPackageThrottling(packageName, mUserId);
- }
-
private void handleOverrideConfig() throws CommandException {
final String config = getNextArgRequired();
@@ -3057,7 +3411,7 @@
private void clearLauncher() {
synchronized (mLock) {
- getUserShortcutsLocked(mUserId).setDefaultLauncherComponent(null);
+ getUserShortcutsLocked(mUserId).forceClearLauncher();
}
}
@@ -3067,7 +3421,7 @@
hasShortcutHostPermissionInner("-", mUserId);
getOutPrintWriter().println("Launcher: "
- + getUserShortcutsLocked(mUserId).getDefaultLauncherComponent());
+ + getUserShortcutsLocked(mUserId).getLastKnownLauncher());
}
}
@@ -3080,12 +3434,6 @@
private void handleGetDefaultLauncher() throws CommandException {
parseOptions(/* takeUser =*/ true);
- showLauncher();
- }
-
- private void handleRefreshDefaultLauncher() throws CommandException {
- parseOptions(/* takeUser =*/ true);
-
clearLauncher();
showLauncher();
}
@@ -3093,7 +3441,7 @@
private void handleUnloadUser() throws CommandException {
parseOptions(/* takeUser =*/ true);
- Slog.i(TAG, "cmd: handleUnloadUser: " + mUserId);
+ Slog.i(TAG, "cmd: handleUnloadUser: user=" + mUserId);
ShortcutService.this.handleCleanupUser(mUserId);
}
@@ -3102,7 +3450,7 @@
parseOptions(/* takeUser =*/ true);
final String packageName = getNextArgRequired();
- Slog.i(TAG, "cmd: handleClearShortcuts: " + mUserId + ", " + packageName);
+ Slog.i(TAG, "cmd: handleClearShortcuts: user" + mUserId + ", " + packageName);
ShortcutService.this.cleanUpPackageForAllLoadedUsers(packageName, mUserId,
/* appStillExists = */ true);
@@ -3157,7 +3505,14 @@
}
// Injection point.
- void wtf(String message, Exception e) {
+ void wtf(String message, Throwable e) {
+ if (e == null) {
+ e = new RuntimeException("Stacktrace");
+ }
+ synchronized (mLock) {
+ mWtfCount++;
+ mLastWtfStacktrace = new Exception("Last failure was logged here:");
+ }
Slog.wtf(TAG, message, e);
}
@@ -3184,11 +3539,6 @@
}
}
- @VisibleForTesting
- PackageManagerInternal injectPackageManagerInternal() {
- return mPackageManagerInternal;
- }
-
File getUserBitmapFilePath(@UserIdInt int userId) {
return new File(injectUserDataPath(userId), DIRECTORY_BITMAPS);
}
@@ -3272,7 +3622,7 @@
}
private void verifyStatesInner() {
- synchronized (this) {
+ synchronized (mLock) {
forEachLoadedUserLocked(u -> u.forAllPackageItems(ShortcutPackageItem::verifyStates));
}
}
diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java
index 7ea89c9..21e4165 100644
--- a/services/core/java/com/android/server/pm/ShortcutUser.java
+++ b/services/core/java/com/android/server/pm/ShortcutUser.java
@@ -19,6 +19,8 @@
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.content.ComponentName;
+import android.content.pm.ShortcutManager;
+import android.text.TextUtils;
import android.text.format.Formatter;
import android.util.ArrayMap;
import android.util.Slog;
@@ -30,6 +32,9 @@
import libcore.util.Objects;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -51,8 +56,11 @@
private static final String TAG_LAUNCHER = "launcher";
private static final String ATTR_VALUE = "value";
- private static final String ATTR_KNOWN_LOCALE_CHANGE_SEQUENCE_NUMBER = "locale-seq-no";
+ private static final String ATTR_KNOWN_LOCALES = "locales";
private static final String ATTR_LAST_APP_SCAN_TIME = "last-app-scan-time";
+ private static final String KEY_USER_ID = "userId";
+ private static final String KEY_LAUNCHERS = "launchers";
+ private static final String KEY_PACKAGES = "packages";
static final class PackageWithUser {
final int userId;
@@ -101,10 +109,17 @@
private final ArrayMap<PackageWithUser, ShortcutLauncher> mLaunchers = new ArrayMap<>();
- /** Default launcher that can access the launcher apps APIs. */
- private ComponentName mDefaultLauncherComponent;
+ /**
+ * Last known launcher. It's used when the default launcher isn't set in PM -- i.e.
+ * when getHomeActivitiesAsUser() return null. We need it so that in this situation the
+ * previously default launcher can still access shortcuts.
+ */
+ private ComponentName mLastKnownLauncher;
- private long mKnownLocaleChangeSequenceNumber;
+ /** In-memory-cached default launcher. */
+ private ComponentName mCachedLauncher;
+
+ private String mKnownLocales;
private long mLastAppScanTime;
@@ -225,29 +240,62 @@
}
/**
- * Reset all throttling counters for all packages, if there has been a system locale change.
+ * Must be called at any entry points on {@link ShortcutManager} APIs to make sure the
+ * information on the package is up-to-date.
+ *
+ * We use broadcasts to handle locale changes and package changes, but because broadcasts
+ * are asynchronous, there's a chance a publisher calls getXxxShortcuts() after a certain event
+ * (e.g. system locale change) but shortcut manager hasn't finished processing the broadcast.
+ *
+ * So we call this method at all entry points from publishers to make sure we update all
+ * relevant information.
+ *
+ * Similar inconsistencies can happen when the launcher fetches shortcut information, but
+ * that's a less of an issue because for the launcher we report shortcut changes with
+ * callbacks.
*/
- public void resetThrottlingIfNeeded() {
- final long currentNo = mService.getLocaleChangeSequenceNumber();
- if (mKnownLocaleChangeSequenceNumber < currentNo) {
- if (ShortcutService.DEBUG) {
- Slog.d(TAG, "LocaleChange detected for user " + mUserId);
- }
-
- mKnownLocaleChangeSequenceNumber = currentNo;
-
- forAllPackages(p -> p.resetRateLimiting());
-
- mService.scheduleSaveUser(mUserId);
- }
+ public void onCalledByPublisher(@NonNull String packageName) {
+ detectLocaleChange();
+ rescanPackageIfNeeded(packageName, /*forceRescan=*/ false);
}
- public void handlePackageAddedOrUpdated(@NonNull String packageName, boolean forceRescan) {
+ private String getKnownLocales() {
+ if (TextUtils.isEmpty(mKnownLocales)) {
+ mKnownLocales = mService.injectGetLocaleTagsForUser(mUserId);
+ mService.scheduleSaveUser(mUserId);
+ }
+ return mKnownLocales;
+ }
+
+ /**
+ * Check to see if the system locale has changed, and if so, reset throttling
+ * and update resource strings.
+ */
+ public void detectLocaleChange() {
+ final String currentLocales = mService.injectGetLocaleTagsForUser(mUserId);
+ if (getKnownLocales().equals(currentLocales)) {
+ return;
+ }
+ if (ShortcutService.DEBUG) {
+ Slog.d(TAG, "Locale changed from " + currentLocales + " to " + mKnownLocales
+ + " for user " + mUserId);
+ }
+ mKnownLocales = currentLocales;
+
+ forAllPackages(pkg -> {
+ pkg.resetRateLimiting();
+ pkg.resolveResourceStrings();
+ });
+
+ mService.scheduleSaveUser(mUserId);
+ }
+
+ public void rescanPackageIfNeeded(@NonNull String packageName, boolean forceRescan) {
final boolean isNewApp = !mPackages.containsKey(packageName);
final ShortcutPackage shortcutPackage = getPackageShortcuts(packageName);
- if (!shortcutPackage.handlePackageAddedOrUpdated(isNewApp, forceRescan)) {
+ if (!shortcutPackage.rescanPackageIfNeeded(isNewApp, forceRescan)) {
if (isNewApp) {
mPackages.remove(packageName);
}
@@ -265,13 +313,11 @@
throws IOException, XmlPullParserException {
out.startTag(null, TAG_ROOT);
- ShortcutService.writeAttr(out, ATTR_KNOWN_LOCALE_CHANGE_SEQUENCE_NUMBER,
- mKnownLocaleChangeSequenceNumber);
+ ShortcutService.writeAttr(out, ATTR_KNOWN_LOCALES, mKnownLocales);
ShortcutService.writeAttr(out, ATTR_LAST_APP_SCAN_TIME,
mLastAppScanTime);
- ShortcutService.writeTagValue(out, TAG_LAUNCHER,
- mDefaultLauncherComponent);
+ ShortcutService.writeTagValue(out, TAG_LAUNCHER, mLastKnownLauncher);
// Can't use forEachPackageItem due to the checked exceptions.
{
@@ -307,8 +353,8 @@
boolean fromBackup) throws IOException, XmlPullParserException {
final ShortcutUser ret = new ShortcutUser(s, userId);
- ret.mKnownLocaleChangeSequenceNumber = ShortcutService.parseLongAttribute(parser,
- ATTR_KNOWN_LOCALE_CHANGE_SEQUENCE_NUMBER);
+ ret.mKnownLocales = ShortcutService.parseStringAttribute(parser,
+ ATTR_KNOWN_LOCALES);
// If lastAppScanTime is in the future, that means the clock went backwards.
// Just scan all apps again.
@@ -330,7 +376,7 @@
if (depth == outerDepth + 1) {
switch (tag) {
case TAG_LAUNCHER: {
- ret.mDefaultLauncherComponent = ShortcutService.parseComponentNameAttribute(
+ ret.mLastKnownLauncher = ShortcutService.parseComponentNameAttribute(
parser, ATTR_VALUE);
continue;
}
@@ -355,18 +401,44 @@
return ret;
}
- public ComponentName getDefaultLauncherComponent() {
- return mDefaultLauncherComponent;
+ public ComponentName getLastKnownLauncher() {
+ return mLastKnownLauncher;
}
- public void setDefaultLauncherComponent(ComponentName launcherComponent) {
- if (Objects.equal(mDefaultLauncherComponent, launcherComponent)) {
+ public void setLauncher(ComponentName launcherComponent) {
+ setLauncher(launcherComponent, /* allowPurgeLastKnown */ false);
+ }
+
+ /** Clears the launcher information without clearing the last known one */
+ public void clearLauncher() {
+ setLauncher(null);
+ }
+
+ /**
+ * Clears the launcher information *with(* clearing the last known one; we do this witl
+ * "cmd shortcut clear-default-launcher".
+ */
+ public void forceClearLauncher() {
+ setLauncher(null, /* allowPurgeLastKnown */ true);
+ }
+
+ private void setLauncher(ComponentName launcherComponent, boolean allowPurgeLastKnown) {
+ mCachedLauncher = launcherComponent; // Always update the in-memory cache.
+
+ if (Objects.equal(mLastKnownLauncher, launcherComponent)) {
return;
}
- mDefaultLauncherComponent = launcherComponent;
+ if (!allowPurgeLastKnown && launcherComponent == null) {
+ return;
+ }
+ mLastKnownLauncher = launcherComponent;
mService.scheduleSaveUser(mUserId);
}
+ public ComponentName getCachedLauncher() {
+ return mCachedLauncher;
+ }
+
public void resetThrottling() {
for (int i = mPackages.size() - 1; i >= 0; i--) {
mPackages.valueAt(i).resetThrottling();
@@ -377,8 +449,8 @@
pw.print(prefix);
pw.print("User: ");
pw.print(mUserId);
- pw.print(" Known locale seq#: ");
- pw.print(mKnownLocaleChangeSequenceNumber);
+ pw.print(" Known locales: ");
+ pw.print(mKnownLocales);
pw.print(" Last app scan: [");
pw.print(mLastAppScanTime);
pw.print("] ");
@@ -388,8 +460,13 @@
prefix += prefix + " ";
pw.print(prefix);
- pw.print("Default launcher: ");
- pw.print(mDefaultLauncherComponent);
+ pw.print("Cached launcher: ");
+ pw.print(mCachedLauncher);
+ pw.println();
+
+ pw.print(prefix);
+ pw.print("Last known launcher: ");
+ pw.print(mLastKnownLauncher);
pw.println();
for (int i = 0; i < mLaunchers.size(); i++) {
@@ -432,4 +509,28 @@
pw.print(Formatter.formatFileSize(mService.mContext, size));
pw.println(")");
}
+
+ public JSONObject dumpCheckin(boolean clear) throws JSONException {
+ final JSONObject result = new JSONObject();
+
+ result.put(KEY_USER_ID, mUserId);
+
+ {
+ final JSONArray launchers = new JSONArray();
+ for (int i = 0; i < mLaunchers.size(); i++) {
+ launchers.put(mLaunchers.valueAt(i).dumpCheckin(clear));
+ }
+ result.put(KEY_LAUNCHERS, launchers);
+ }
+
+ {
+ final JSONArray packages = new JSONArray();
+ for (int i = 0; i < mPackages.size(); i++) {
+ packages.put(mPackages.valueAt(i).dumpCheckin(clear));
+ }
+ result.put(KEY_PACKAGES, packages);
+ }
+
+ return result;
+ }
}
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 627cdd0..e17d243 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -27,7 +27,6 @@
import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
import android.app.ActivityManagerNative;
-import android.app.AppGlobals;
import android.app.IActivityManager;
import android.app.IStopUserCallback;
import android.app.KeyguardManager;
@@ -456,7 +455,6 @@
setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, currentGuestUser.id);
}
- maybeInitializeDemoMode(UserHandle.USER_SYSTEM);
mContext.registerReceiver(mDisableQuietModeCallback,
new IntentFilter(ACTION_DISABLE_QUIET_MODE_AFTER_UNLOCK),
null, mHandler);
@@ -471,6 +469,8 @@
UserInfo ui = mUsers.valueAt(i).info;
if ((ui.partial || ui.guestToRemove || ui.isEphemeral()) && i != 0) {
partials.add(ui);
+ mRemovingUserIds.append(ui.id, true);
+ ui.partial = true;
}
}
}
@@ -553,7 +553,7 @@
public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {
boolean returnFullInfo = true;
if (userId != UserHandle.getCallingUserId()) {
- checkManageUsersPermission("getting profiles related to user " + userId);
+ checkManageOrCreateUsersPermission("getting profiles related to user " + userId);
} else {
returnFullInfo = hasManageUsersPermission();
}
@@ -867,12 +867,25 @@
}
}
synchronized (mUsersLock) {
- UserInfo userInfo = getUserInfoLU(userId);
+ UserInfo userInfo = getUserInfoLU(userId);
return userInfo != null && userInfo.isManagedProfile();
}
}
@Override
+ public boolean isDemoUser(int userId) {
+ int callingUserId = UserHandle.getCallingUserId();
+ if (callingUserId != userId && !hasManageUsersPermission()) {
+ throw new SecurityException("You need MANAGE_USERS permission to query if u=" + userId
+ + " is a demo user");
+ }
+ synchronized (mUsersLock) {
+ UserInfo userInfo = getUserInfoLU(userId);
+ return userInfo != null && userInfo.isDemo();
+ }
+ }
+
+ @Override
public boolean isRestricted() {
synchronized (mUsersLock) {
return getUserInfoLU(UserHandle.getCallingUserId()).isRestricted();
@@ -1784,6 +1797,18 @@
mUserVersion = USER_VERSION;
Bundle restrictions = new Bundle();
+ try {
+ final String[] defaultFirstUserRestrictions = mContext.getResources().getStringArray(
+ com.android.internal.R.array.config_defaultFirstUserRestrictions);
+ for (String userRestriction : defaultFirstUserRestrictions) {
+ if (UserRestrictionsUtils.isValidRestriction(userRestriction)) {
+ restrictions.putBoolean(userRestriction, true);
+ }
+ }
+ } catch (Resources.NotFoundException e) {
+ Log.e(LOG_TAG, "Couldn't find resource: config_defaultFirstUserRestrictions", e);
+ }
+
synchronized (mRestrictionsLock) {
mBaseUserRestrictions.append(UserHandle.USER_SYSTEM, restrictions);
}
@@ -2289,6 +2314,7 @@
synchronized (mRestrictionsLock) {
mBaseUserRestrictions.append(userId, restrictions);
}
+ mPm.onNewUserCreated(userId);
Intent addedIntent = new Intent(Intent.ACTION_USER_ADDED);
addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
mContext.sendBroadcastAsUser(addedIntent, UserHandle.ALL,
@@ -2851,18 +2877,20 @@
* app storage and apply any user restrictions.
*/
public void onBeforeStartUser(int userId) {
- final int userSerial = getUserSerialNumber(userId);
+ UserInfo userInfo = getUserInfo(userId);
+ if (userInfo == null) {
+ return;
+ }
+ final int userSerial = userInfo.serialNumber;
+ // Migrate only if build fingerprints mismatch
+ boolean migrateAppsData = !Build.FINGERPRINT.equals(userInfo.lastLoggedInFingerprint);
mPm.prepareUserData(userId, userSerial, StorageManager.FLAG_STORAGE_DE);
- mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_DE);
+ mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_DE, migrateAppsData);
if (userId != UserHandle.USER_SYSTEM) {
synchronized (mRestrictionsLock) {
applyUserRestrictionsLR(userId);
}
- UserInfo userInfo = getUserInfoNoChecks(userId);
- if (userInfo != null && !userInfo.isInitialized()) {
- mPm.onBeforeUserStartUninitialized(userId);
- }
}
maybeInitializeDemoMode(userId);
@@ -2873,9 +2901,15 @@
* app storage.
*/
public void onBeforeUnlockUser(@UserIdInt int userId) {
- final int userSerial = getUserSerialNumber(userId);
+ UserInfo userInfo = getUserInfo(userId);
+ if (userInfo == null) {
+ return;
+ }
+ final int userSerial = userInfo.serialNumber;
+ // Migrate only if build fingerprints mismatch
+ boolean migrateAppsData = !Build.FINGERPRINT.equals(userInfo.lastLoggedInFingerprint);
mPm.prepareUserData(userId, userSerial, StorageManager.FLAG_STORAGE_CE);
- mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_CE);
+ mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_CE, migrateAppsData);
}
/**
@@ -2899,19 +2933,20 @@
}
private void maybeInitializeDemoMode(int userId) {
- if (UserManager.isDeviceInDemoMode(mContext)) {
+ if (UserManager.isDeviceInDemoMode(mContext) && userId != UserHandle.USER_SYSTEM) {
String demoLauncher =
mContext.getResources().getString(
com.android.internal.R.string.config_demoModeLauncherComponent);
if (!TextUtils.isEmpty(demoLauncher)) {
ComponentName componentToEnable = ComponentName.unflattenFromString(demoLauncher);
- try {
- AppGlobals.getPackageManager().setComponentEnabledSetting(componentToEnable,
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0,
- /* userId= */ userId);
- } catch (RemoteException re) {
- // Internal, shouldn't happen
- }
+ String demoLauncherPkg = componentToEnable.getPackageName();
+ final PackageManager pm = mContext.getPackageManager();
+ pm.setComponentEnabledSettingAsUser(componentToEnable,
+ PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0,
+ /* userId= */ userId);
+ pm.setApplicationEnabledSettingAsUser(demoLauncherPkg,
+ PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0,
+ /* userId= */ userId);
}
}
}
@@ -2947,6 +2982,14 @@
* number is mismatched.
*/
public static void enforceSerialNumber(File file, int serialNumber) throws IOException {
+ if (StorageManager.isFileEncryptedEmulatedOnly()) {
+ // When we're emulating FBE, the directory may have been chmod
+ // 000'ed, meaning we can't read the serial number to enforce it;
+ // instead of destroying the user, just log a warning.
+ Slog.w(LOG_TAG, "Device is emulating FBE; assuming current serial number is valid");
+ return;
+ }
+
final int foundSerial = getSerialNumber(file);
Slog.v(LOG_TAG, "Found " + file + " with serial number " + foundSerial);
diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
index c082143..772c64e 100644
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -104,7 +104,9 @@
UserManager.DISALLOW_RUN_IN_BACKGROUND,
UserManager.DISALLOW_DATA_ROAMING,
UserManager.DISALLOW_SET_USER_ICON,
- UserManager.DISALLOW_SET_WALLPAPER
+ UserManager.DISALLOW_SET_WALLPAPER,
+ UserManager.DISALLOW_OEM_UNLOCK,
+ UserManager.DISALLLOW_UNMUTE_DEVICE,
});
/**
@@ -138,7 +140,8 @@
*/
private static final Set<String> IMMUTABLE_BY_OWNERS = Sets.newArraySet(
UserManager.DISALLOW_RECORD_AUDIO,
- UserManager.DISALLOW_WALLPAPER
+ UserManager.DISALLOW_WALLPAPER,
+ UserManager.DISALLOW_OEM_UNLOCK
);
/**
@@ -148,7 +151,8 @@
private static final Set<String> GLOBAL_RESTRICTIONS = Sets.newArraySet(
UserManager.DISALLOW_ADJUST_VOLUME,
UserManager.DISALLOW_RUN_IN_BACKGROUND,
- UserManager.DISALLOW_UNMUTE_MICROPHONE
+ UserManager.DISALLOW_UNMUTE_MICROPHONE,
+ UserManager.DISALLLOW_UNMUTE_DEVICE
);
/**
@@ -331,6 +335,9 @@
// set, and in that case even if the restriction is lifted, changing it to ON would be
// wrong. So just don't do anything in such a case. If the user hopes to enable location
// later, they can do it on the Settings UI.
+ // WARNING: Remember that Settings.Global and Settings.Secure are changeable via adb.
+ // To prevent this from happening for a given user restriction, you have to add a check to
+ // SettingsProvider.isGlobalOrSecureSettingRestrictedForUser.
final ContentResolver cr = context.getContentResolver();
final long id = Binder.clearCallingIdentity();
@@ -426,6 +433,7 @@
newValue ? 1 : 0);
break;
case UserManager.DISALLOW_FACTORY_RESET:
+ case UserManager.DISALLOW_OEM_UNLOCK:
if (newValue) {
PersistentDataBlockManager manager = (PersistentDataBlockManager) context
.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
@@ -433,6 +441,7 @@
manager.setOemUnlockEnabled(false);
}
}
+ break;
}
} finally {
Binder.restoreCallingIdentity(id);
diff --git a/services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java b/services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java
index 2e32fe3..c764833 100644
--- a/services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java
+++ b/services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java
@@ -134,7 +134,7 @@
}
public void immersiveModeChangedLw(String pkg, boolean isImmersiveMode,
- boolean userSetupComplete) {
+ boolean userSetupComplete, boolean navBarEmpty) {
mHandler.removeMessages(H.SHOW);
if (isImmersiveMode) {
final boolean disabled = PolicyControl.disableImmersiveConfirmation(pkg);
@@ -144,6 +144,7 @@
&& (DEBUG_SHOW_EVERY_TIME || !mConfirmed)
&& userSetupComplete
&& !mVrModeEnabled
+ && !navBarEmpty
&& !UserManager.isDeviceInDemoMode(mContext)) {
mHandler.sendEmptyMessageDelayed(H.SHOW, mShowDelayMs);
}
@@ -152,12 +153,13 @@
}
}
- public boolean onPowerKeyDown(boolean isScreenOn, long time, boolean inImmersiveMode) {
+ public boolean onPowerKeyDown(boolean isScreenOn, long time, boolean inImmersiveMode,
+ boolean navBarEmpty) {
if (!isScreenOn && (time - mPanicTime < mPanicThresholdMs)) {
// turning the screen back on within the panic threshold
return mClingWindow == null;
}
- if (isScreenOn && inImmersiveMode) {
+ if (isScreenOn && inImmersiveMode && !navBarEmpty) {
// turning the screen off, remember if we were in immersive mode
mPanicTime = time;
} else {
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index e9cf617..0c5f5cd 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -216,6 +216,8 @@
static final int SHORT_PRESS_SLEEP_GO_TO_SLEEP = 0;
static final int SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME = 1;
+ static final int PENDING_KEY_NULL = -1;
+
// Controls navigation bar opacity depending on which workspace stacks are currently
// visible.
// Nav bar is always opaque when either the freeform stack or docked stack is visible.
@@ -410,6 +412,10 @@
volatile boolean mRecentsVisible;
volatile boolean mTvPictureInPictureVisible;
+ // Used to hold the last user key used to wake the device. This helps us prevent up events
+ // from being passed to the foregrounded app without a corresponding down event
+ volatile int mPendingWakeKey = PENDING_KEY_NULL;
+
int mRecentAppsHeldModifiers;
boolean mLanguageSwitchKeyPressed;
@@ -1018,7 +1024,8 @@
// Detect user pressing the power button in panic when an application has
// taken over the whole screen.
boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,
- SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags));
+ SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags),
+ isNavBarEmpty(mLastSystemUiFlags));
if (panic) {
mHandler.post(mHiddenNavPanic);
}
@@ -2874,8 +2881,12 @@
+ mTopFullscreenOpaqueWindowState + " rotationAnimation="
+ (mTopFullscreenOpaqueWindowState == null ?
"0" : mTopFullscreenOpaqueWindowState.getAttrs().rotationAnimation));
- if (mTopFullscreenOpaqueWindowState != null && mTopIsFullscreen) {
- switch (mTopFullscreenOpaqueWindowState.getAttrs().rotationAnimation) {
+ if (mTopFullscreenOpaqueWindowState != null) {
+ int animationHint = mTopFullscreenOpaqueWindowState.getRotationAnimationHint();
+ if (animationHint < 0 && mTopIsFullscreen) {
+ animationHint = mTopFullscreenOpaqueWindowState.getAttrs().rotationAnimation;
+ }
+ switch (animationHint) {
case ROTATION_ANIMATION_CROSSFADE:
anim[0] = R.anim.rotation_animation_xfade_exit;
anim[1] = R.anim.rotation_animation_enter;
@@ -3050,15 +3061,6 @@
return -1;
}
- // If an incoming call is ringing, HOME is totally disabled.
- // (The user is already on the InCallUI at this point,
- // and his ONLY options are to answer or reject the call.)
- TelecomManager telecomManager = getTelecommService();
- if (telecomManager != null && telecomManager.isRinging()) {
- Log.i(TAG, "Ignoring HOME; there's a ringing incoming call.");
- return -1;
- }
-
// Delay handling home if a double-tap is possible.
if (mDoubleTapOnHomeBehavior != DOUBLE_TAP_HOME_NOTHING) {
mHandler.removeCallbacks(mHomeDoubleTapTimeoutRunnable); // just in case
@@ -5058,8 +5060,25 @@
}
}
- // Keep track of the window if it's dimming but not necessarily fullscreen.
final boolean reallyVisible = win.isVisibleOrBehindKeyguardLw() && !win.isGoneForLayoutLw();
+
+ // Voice interaction overrides both top fullscreen and top docked.
+ if (reallyVisible && win.getAttrs().type == TYPE_VOICE_INTERACTION) {
+ if (mTopFullscreenOpaqueWindowState == null) {
+ mTopFullscreenOpaqueWindowState = win;
+ if (mTopFullscreenOpaqueOrDimmingWindowState == null) {
+ mTopFullscreenOpaqueOrDimmingWindowState = win;
+ }
+ }
+ if (mTopDockedOpaqueWindowState == null) {
+ mTopDockedOpaqueWindowState = win;
+ if (mTopDockedOpaqueOrDimmingWindowState == null) {
+ mTopDockedOpaqueOrDimmingWindowState = win;
+ }
+ }
+ }
+
+ // Keep track of the window if it's dimming but not necessarily fullscreen.
if (mTopFullscreenOpaqueOrDimmingWindowState == null && reallyVisible
&& win.isDimming() && StackId.normallyFullscreenWindows(stackId)) {
mTopFullscreenOpaqueOrDimmingWindowState = win;
@@ -5539,12 +5558,24 @@
// key to the application.
result = ACTION_PASS_TO_USER;
isWakeKey = false;
- } else if (!interactive && shouldDispatchInputWhenNonInteractive()) {
+
+ if (interactive) {
+ // If the screen is awake, but the button pressed was the one that woke the device
+ // then don't pass it to the application
+ if (keyCode == mPendingWakeKey && !down) {
+ result = 0;
+ }
+ // Reset the pending key
+ mPendingWakeKey = PENDING_KEY_NULL;
+ }
+ } else if (!interactive && shouldDispatchInputWhenNonInteractive(event)) {
// If we're currently dozing with the screen on and the keyguard showing, pass the key
// to the application but preserve its wake key status to make sure we still move
// from dozing to fully interactive if we would normally go from off to fully
// interactive.
result = ACTION_PASS_TO_USER;
+ // Since we're dispatching the input, reset the pending key
+ mPendingWakeKey = PENDING_KEY_NULL;
} else {
// When the screen is off and the key is not injected, determine whether
// to wake the device but don't pass the key to the application.
@@ -5552,6 +5583,10 @@
if (isWakeKey && (!down || !isWakeKeyWhenScreenOff(keyCode))) {
isWakeKey = false;
}
+ // Cache the wake key on down event so we can also avoid sending the up event to the app
+ if (isWakeKey && down) {
+ mPendingWakeKey = keyCode;
+ }
}
// If the key would be handled globally, just return the result, don't worry about special
@@ -5928,7 +5963,7 @@
}
}
- if (shouldDispatchInputWhenNonInteractive()) {
+ if (shouldDispatchInputWhenNonInteractive(null)) {
return ACTION_PASS_TO_USER;
}
@@ -5943,7 +5978,7 @@
return 0;
}
- private boolean shouldDispatchInputWhenNonInteractive() {
+ private boolean shouldDispatchInputWhenNonInteractive(KeyEvent event) {
final boolean displayOff = (mDisplay == null || mDisplay.getState() == Display.STATE_OFF);
if (displayOff && !mHasFeatureWatch) {
@@ -5955,6 +5990,14 @@
return true;
}
+ // Watches handle BACK specially
+ if (mHasFeatureWatch
+ && event != null
+ && (event.getKeyCode() == KeyEvent.KEYCODE_BACK
+ || event.getKeyCode() == KeyEvent.KEYCODE_STEM_PRIMARY)) {
+ return false;
+ }
+
// Send events to a dozing dream even if the screen is off since the dream
// is in control of the state of the screen.
IDreamManager dreamManager = getDreamManager();
@@ -6142,7 +6185,9 @@
return;
}
mPendingPanicGestureUptime = SystemClock.uptimeMillis();
- mNavigationBarController.showTransient();
+ if (!isNavBarEmpty(mLastSystemUiFlags)) {
+ mNavigationBarController.showTransient();
+ }
}
}
};
@@ -6154,7 +6199,8 @@
return;
}
boolean sb = mStatusBarController.checkShowTransientBarLw();
- boolean nb = mNavigationBarController.checkShowTransientBarLw();
+ boolean nb = mNavigationBarController.checkShowTransientBarLw()
+ && !isNavBarEmpty(mLastSystemUiFlags);
if (sb || nb) {
// Don't show status bar when swiping on already visible navigation bar
if (!nb && swipeTarget == mNavigationBar) {
@@ -7260,8 +7306,8 @@
}
private boolean areSystemNavigationKeysEnabled() {
- return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.SYSTEM_NAVIGATION_KEYS_ENABLED, 1) == 1;
+ return Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0) == 1;
}
@Override
@@ -7508,7 +7554,9 @@
// we're no longer on the Keyguard and the screen is ready. We can now request the bars.
mPendingPanicGestureUptime = 0;
mStatusBarController.showTransient();
- mNavigationBarController.showTransient();
+ if (!isNavBarEmpty(vis)) {
+ mNavigationBarController.showTransient();
+ }
}
final boolean denyTransientStatus = mStatusBarController.isTransientShowRequested()
@@ -7540,7 +7588,7 @@
if (win != null && oldImmersiveMode != newImmersiveMode) {
final String pkg = win.getOwningPackage();
mImmersiveModeConfirmation.immersiveModeChangedLw(pkg, newImmersiveMode,
- isUserSetupComplete());
+ isUserSetupComplete(), isNavBarEmpty(win.getSystemUiVisibility()));
}
vis = mNavigationBarController.updateVisibilityLw(transientNavBarAllowed, oldVis, vis);
@@ -7599,6 +7647,14 @@
&& canHideNavigationBar();
}
+ private static boolean isNavBarEmpty(int systemUiFlags) {
+ final int disableNavigationBar = (View.STATUS_BAR_DISABLE_HOME
+ | View.STATUS_BAR_DISABLE_BACK
+ | View.STATUS_BAR_DISABLE_RECENT);
+
+ return (systemUiFlags & disableNavigationBar) == disableNavigationBar;
+ }
+
/**
* @return whether the navigation or status bar can be made translucent
*
@@ -7682,7 +7738,12 @@
return false;
}
+ // We only enable seamless rotation if the top window has requested
+ // it and is in the fullscreen opaque state. Seamless rotation
+ // requires freezing various Surface states and won't work well
+ // with animations, so we disable it in the animation case for now.
if (mTopFullscreenOpaqueWindowState != null && mTopIsFullscreen &&
+ !mTopFullscreenOpaqueWindowState.isAnimatingLw() &&
mTopFullscreenOpaqueWindowState.getAttrs().rotationAnimation ==
ROTATION_ANIMATION_JUMPCUT) {
return true;
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
index 7fed802..ed275ad 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
@@ -60,6 +60,7 @@
secure = true;
deviceHasKeyguard = true;
enabled = true;
+ currentUser = UserHandle.USER_NULL;
}
boolean showing;
boolean showingAndNotOccluded;
@@ -158,6 +159,10 @@
if (mKeyguardState.systemIsReady) {
// If the system is ready, it means keyguard crashed and restarted.
mKeyguardService.onSystemReady();
+ if (mKeyguardState.currentUser != UserHandle.USER_NULL) {
+ // There has been a user switch earlier
+ mKeyguardService.setCurrentUser(mKeyguardState.currentUser);
+ }
// This is used to hide the scrim once keyguard displays.
if (mKeyguardState.interactiveState == INTERACTIVE_STATE_AWAKE) {
mKeyguardService.onStartedWakingUp();
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index 9ccfd67..4e9f5a2 100644
--- a/services/core/java/com/android/server/power/Notifier.java
+++ b/services/core/java/com/android/server/power/Notifier.java
@@ -194,6 +194,48 @@
}
}
+ public void onLongPartialWakeLockStart(String tag, int ownerUid, WorkSource workSource,
+ String historyTag) {
+ if (DEBUG) {
+ Slog.d(TAG, "onLongPartialWakeLockStart: ownerUid=" + ownerUid
+ + ", workSource=" + workSource);
+ }
+
+ try {
+ if (workSource != null) {
+ final int N = workSource.size();
+ for (int i=0; i<N; i++) {
+ mBatteryStats.noteLongPartialWakelockStart(tag, historyTag, workSource.get(i));
+ }
+ } else {
+ mBatteryStats.noteLongPartialWakelockStart(tag, historyTag, ownerUid);
+ }
+ } catch (RemoteException ex) {
+ // Ignore
+ }
+ }
+
+ public void onLongPartialWakeLockFinish(String tag, int ownerUid, WorkSource workSource,
+ String historyTag) {
+ if (DEBUG) {
+ Slog.d(TAG, "onLongPartialWakeLockFinish: ownerUid=" + ownerUid
+ + ", workSource=" + workSource);
+ }
+
+ try {
+ if (workSource != null) {
+ final int N = workSource.size();
+ for (int i=0; i<N; i++) {
+ mBatteryStats.noteLongPartialWakelockFinish(tag, historyTag, workSource.get(i));
+ }
+ } else {
+ mBatteryStats.noteLongPartialWakelockFinish(tag, historyTag, ownerUid);
+ }
+ } catch (RemoteException ex) {
+ // Ignore
+ }
+ }
+
/**
* Called when a wake lock is changing.
*/
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 622614c..ced84f6 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -56,6 +56,7 @@
import android.service.vr.IVrManager;
import android.service.vr.IVrStateCallbacks;
import android.util.EventLog;
+import android.util.PrintWriterPrinter;
import android.util.Slog;
import android.util.SparseIntArray;
import android.util.TimeUtils;
@@ -73,9 +74,7 @@
import com.android.server.am.BatteryStatsService;
import com.android.server.lights.Light;
import com.android.server.lights.LightsManager;
-import com.android.server.vr.VrManagerInternal;
import com.android.server.vr.VrManagerService;
-import com.android.server.vr.VrStateListener;
import libcore.util.Objects;
import java.io.FileDescriptor;
@@ -108,6 +107,8 @@
private static final int MSG_SANDMAN = 2;
// Message: Sent when the screen brightness boost expires.
private static final int MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT = 3;
+ // Message: Polling to look for long held wake locks.
+ private static final int MSG_CHECK_FOR_LONG_WAKELOCKS = 4;
// Dirty bit: mWakeLocks changed
private static final int DIRTY_WAKE_LOCKS = 1 << 0;
@@ -159,6 +160,9 @@
// This should perhaps be a setting.
private static final int SCREEN_BRIGHTNESS_BOOST_TIMEOUT = 5 * 1000;
+ // How long a partial wake lock must be held until we consider it a long wake lock.
+ static final long MIN_LONG_WAKE_CHECK_INTERVAL = 60*1000;
+
// Power hints defined in hardware/libhardware/include/hardware/power.h.
private static final int POWER_HINT_LOW_POWER = 5;
private static final int POWER_HINT_VR_MODE = 7;
@@ -221,6 +225,15 @@
// A bitfield that summarizes the state of all active wakelocks.
private int mWakeLockSummary;
+ // Have we scheduled a message to check for long wake locks? This is when we will check.
+ private long mNotifyLongScheduled;
+
+ // Last time we checked for long wake locks.
+ private long mNotifyLongDispatched;
+
+ // The time we decided to do next long check.
+ private long mNotifyLongNextCheck;
+
// If true, instructs the display controller to wait for the proximity sensor to
// go negative before turning the screen on.
private boolean mRequestWaitForNegativeProximity;
@@ -591,25 +604,6 @@
mDisplayManagerInternal.initPowerManagement(
mDisplayPowerCallbacks, mHandler, sensorManager);
- // Register for broadcasts from other components of the system.
- IntentFilter filter = new IntentFilter();
- filter.addAction(Intent.ACTION_BATTERY_CHANGED);
- filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
- mContext.registerReceiver(new BatteryReceiver(), filter, null, mHandler);
-
- filter = new IntentFilter();
- filter.addAction(Intent.ACTION_DREAMING_STARTED);
- filter.addAction(Intent.ACTION_DREAMING_STOPPED);
- mContext.registerReceiver(new DreamReceiver(), filter, null, mHandler);
-
- filter = new IntentFilter();
- filter.addAction(Intent.ACTION_USER_SWITCHED);
- mContext.registerReceiver(new UserSwitchedReceiver(), filter, null, mHandler);
-
- filter = new IntentFilter();
- filter.addAction(Intent.ACTION_DOCK_EVENT);
- mContext.registerReceiver(new DockReceiver(), filter, null, mHandler);
-
// Register for settings changes.
final ContentResolver resolver = mContext.getContentResolver();
resolver.registerContentObserver(Settings.Secure.getUriFor(
@@ -667,6 +661,25 @@
mDirty |= DIRTY_BATTERY_STATE;
updatePowerStateLocked();
}
+
+ // Register for broadcasts from other components of the system.
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+ filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
+ mContext.registerReceiver(new BatteryReceiver(), filter, null, mHandler);
+
+ filter = new IntentFilter();
+ filter.addAction(Intent.ACTION_DREAMING_STARTED);
+ filter.addAction(Intent.ACTION_DREAMING_STOPPED);
+ mContext.registerReceiver(new DreamReceiver(), filter, null, mHandler);
+
+ filter = new IntentFilter();
+ filter.addAction(Intent.ACTION_USER_SWITCHED);
+ mContext.registerReceiver(new UserSwitchedReceiver(), filter, null, mHandler);
+
+ filter = new IntentFilter();
+ filter.addAction(Intent.ACTION_DOCK_EVENT);
+ mContext.registerReceiver(new DockReceiver(), filter, null, mHandler);
}
private void readConfigurationLocked() {
@@ -1026,6 +1039,38 @@
mNotifier.onWakeLockAcquired(wakeLock.mFlags, wakeLock.mTag, wakeLock.mPackageName,
wakeLock.mOwnerUid, wakeLock.mOwnerPid, wakeLock.mWorkSource,
wakeLock.mHistoryTag);
+ restartNofifyLongTimerLocked(wakeLock);
+ }
+ }
+
+ private void enqueueNotifyLongMsgLocked(long time) {
+ mNotifyLongScheduled = time;
+ Message msg = mHandler.obtainMessage(MSG_CHECK_FOR_LONG_WAKELOCKS);
+ msg.setAsynchronous(true);
+ mHandler.sendMessageAtTime(msg, time);
+ }
+
+ private void restartNofifyLongTimerLocked(WakeLock wakeLock) {
+ wakeLock.mAcquireTime = SystemClock.uptimeMillis();
+ if ((wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK)
+ == PowerManager.PARTIAL_WAKE_LOCK && mNotifyLongScheduled == 0) {
+ enqueueNotifyLongMsgLocked(wakeLock.mAcquireTime + MIN_LONG_WAKE_CHECK_INTERVAL);
+ }
+ }
+
+ private void notifyWakeLockLongStartedLocked(WakeLock wakeLock) {
+ if (mSystemReady && !wakeLock.mDisabled) {
+ wakeLock.mNotifiedLong = true;
+ mNotifier.onLongPartialWakeLockStart(wakeLock.mTag, wakeLock.mOwnerUid,
+ wakeLock.mWorkSource, wakeLock.mHistoryTag);
+ }
+ }
+
+ private void notifyWakeLockLongFinishedLocked(WakeLock wakeLock) {
+ if (wakeLock.mNotifiedLong) {
+ wakeLock.mNotifiedLong = false;
+ mNotifier.onLongPartialWakeLockFinish(wakeLock.mTag, wakeLock.mOwnerUid,
+ wakeLock.mWorkSource, wakeLock.mHistoryTag);
}
}
@@ -1035,15 +1080,23 @@
mNotifier.onWakeLockChanging(wakeLock.mFlags, wakeLock.mTag, wakeLock.mPackageName,
wakeLock.mOwnerUid, wakeLock.mOwnerPid, wakeLock.mWorkSource,
wakeLock.mHistoryTag, flags, tag, packageName, uid, pid, ws, historyTag);
+ notifyWakeLockLongFinishedLocked(wakeLock);
+ // Changing the wake lock will count as releasing the old wake lock(s) and
+ // acquiring the new ones... we do this because otherwise once a wakelock
+ // becomes long, if we just continued to treat it as long we can get in to
+ // situations where we spam battery stats with every following change to it.
+ restartNofifyLongTimerLocked(wakeLock);
}
}
private void notifyWakeLockReleasedLocked(WakeLock wakeLock) {
if (mSystemReady && wakeLock.mNotifiedAcquired) {
wakeLock.mNotifiedAcquired = false;
+ wakeLock.mAcquireTime = 0;
mNotifier.onWakeLockReleased(wakeLock.mFlags, wakeLock.mTag,
wakeLock.mPackageName, wakeLock.mOwnerUid, wakeLock.mOwnerPid,
wakeLock.mWorkSource, wakeLock.mHistoryTag);
+ notifyWakeLockLongFinishedLocked(wakeLock);
}
}
@@ -1600,6 +1653,42 @@
}
}
+ void checkForLongWakeLocks() {
+ synchronized (mLock) {
+ final long now = SystemClock.uptimeMillis();
+ mNotifyLongDispatched = now;
+ final long when = now - MIN_LONG_WAKE_CHECK_INTERVAL;
+ long nextCheckTime = Long.MAX_VALUE;
+ final int numWakeLocks = mWakeLocks.size();
+ for (int i = 0; i < numWakeLocks; i++) {
+ final WakeLock wakeLock = mWakeLocks.get(i);
+ if ((wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK)
+ == PowerManager.PARTIAL_WAKE_LOCK) {
+ if (wakeLock.mNotifiedAcquired && !wakeLock.mNotifiedLong) {
+ if (wakeLock.mAcquireTime < when) {
+ // This wake lock has exceeded the long acquire time, report!
+ notifyWakeLockLongStartedLocked(wakeLock);
+ } else {
+ // This wake lock could still become a long one, at this time.
+ long checkTime = wakeLock.mAcquireTime + MIN_LONG_WAKE_CHECK_INTERVAL;
+ if (checkTime < nextCheckTime) {
+ nextCheckTime = checkTime;
+ }
+ }
+ }
+ }
+ }
+ mNotifyLongScheduled = 0;
+ mHandler.removeMessages(MSG_CHECK_FOR_LONG_WAKELOCKS);
+ if (nextCheckTime != Long.MAX_VALUE) {
+ mNotifyLongNextCheck = nextCheckTime;
+ enqueueNotifyLongMsgLocked(nextCheckTime);
+ } else {
+ mNotifyLongNextCheck = 0;
+ }
+ }
+ }
+
/**
* Updates the value of mUserActivitySummary to summarize the user requested
* state of the system such as whether the screen should be bright or dim.
@@ -1997,7 +2086,12 @@
float screenAutoBrightnessAdjustment = 0.0f;
boolean autoBrightness = (mScreenBrightnessModeSetting ==
Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
- if (isValidBrightness(mScreenBrightnessOverrideFromWindowManager)) {
+ if (!mBootCompleted) {
+ // Keep the brightness steady during boot. This requires the
+ // bootloader brightness and the default brightness to be identical.
+ autoBrightness = false;
+ brightnessSetByUser = false;
+ } else if (isValidBrightness(mScreenBrightnessOverrideFromWindowManager)) {
screenBrightness = mScreenBrightnessOverrideFromWindowManager;
autoBrightness = false;
brightnessSetByUser = false;
@@ -2749,6 +2843,27 @@
pw.println(" mHalAutoSuspendModeEnabled=" + mHalAutoSuspendModeEnabled);
pw.println(" mHalInteractiveModeEnabled=" + mHalInteractiveModeEnabled);
pw.println(" mWakeLockSummary=0x" + Integer.toHexString(mWakeLockSummary));
+ pw.print(" mNotifyLongScheduled=");
+ if (mNotifyLongScheduled == 0) {
+ pw.print("(none)");
+ } else {
+ TimeUtils.formatDuration(mNotifyLongScheduled, SystemClock.uptimeMillis(), pw);
+ }
+ pw.println();
+ pw.print(" mNotifyLongDispatched=");
+ if (mNotifyLongDispatched == 0) {
+ pw.print("(none)");
+ } else {
+ TimeUtils.formatDuration(mNotifyLongDispatched, SystemClock.uptimeMillis(), pw);
+ }
+ pw.println();
+ pw.print(" mNotifyLongNextCheck=");
+ if (mNotifyLongNextCheck == 0) {
+ pw.print("(none)");
+ } else {
+ TimeUtils.formatDuration(mNotifyLongNextCheck, SystemClock.uptimeMillis(), pw);
+ }
+ pw.println();
pw.println(" mUserActivitySummary=0x" + Integer.toHexString(mUserActivitySummary));
pw.println(" mRequestWaitForNegativeProximity=" + mRequestWaitForNegativeProximity);
pw.println(" mSandmanScheduled=" + mSandmanScheduled);
@@ -2857,6 +2972,10 @@
}
pw.println();
+ pw.println("Looper state:");
+ mHandler.getLooper().dump(new PrintWriterPrinter(pw), " ");
+
+ pw.println();
pw.println("Wake Locks: size=" + mWakeLocks.size());
for (WakeLock wl : mWakeLocks) {
pw.println(" " + wl);
@@ -2985,6 +3104,9 @@
case MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT:
handleScreenBrightnessBoostTimeout();
break;
+ case MSG_CHECK_FOR_LONG_WAKELOCKS:
+ checkForLongWakeLocks();
+ break;
}
}
}
@@ -3001,7 +3123,9 @@
public String mHistoryTag;
public final int mOwnerUid;
public final int mOwnerPid;
+ public long mAcquireTime;
public boolean mNotifiedAcquired;
+ public boolean mNotifiedLong;
public boolean mDisabled;
public WakeLock(IBinder lock, int flags, String tag, String packageName,
@@ -3060,9 +3184,34 @@
@Override
public String toString() {
- return getLockLevelString()
- + " '" + mTag + "'" + getLockFlagsString() + (mDisabled ? " DISABLED" : "")
- + " (uid=" + mOwnerUid + ", pid=" + mOwnerPid + ", ws=" + mWorkSource + ")";
+ StringBuilder sb = new StringBuilder();
+ sb.append(getLockLevelString());
+ sb.append(" '");
+ sb.append(mTag);
+ sb.append("'");
+ sb.append(getLockFlagsString());
+ if (mDisabled) {
+ sb.append(" DISABLED");
+ }
+ if (mNotifiedAcquired) {
+ sb.append(" ACQ=");
+ TimeUtils.formatDuration(mAcquireTime-SystemClock.uptimeMillis(), sb);
+ }
+ if (mNotifiedLong) {
+ sb.append(" LONG");
+ }
+ sb.append(" (uid=");
+ sb.append(mOwnerUid);
+ if (mOwnerPid != 0) {
+ sb.append(" pid=");
+ sb.append(mOwnerPid);
+ }
+ if (mWorkSource != null) {
+ sb.append(" ws=");
+ sb.append(mWorkSource);
+ }
+ sb.append(")");
+ return sb.toString();
}
@SuppressWarnings("deprecation")
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index 8ce2fd9..1dbc6d9 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -547,7 +547,7 @@
bluetooth.getState() == BluetoothAdapter.STATE_OFF;
if (!bluetoothOff) {
Log.w(TAG, "Disabling Bluetooth...");
- bluetooth.disable(false); // disable but don't persist new state
+ bluetooth.disable(mContext.getPackageName(), false); // disable but don't persist new state
}
} catch (RemoteException ex) {
Log.e(TAG, "RemoteException during bluetooth shutdown", ex);
diff --git a/services/core/java/com/android/server/search/SearchManagerService.java b/services/core/java/com/android/server/search/SearchManagerService.java
index 4d91814..f3b9b18 100644
--- a/services/core/java/com/android/server/search/SearchManagerService.java
+++ b/services/core/java/com/android/server/search/SearchManagerService.java
@@ -33,6 +33,7 @@
import android.database.ContentObserver;
import android.os.Binder;
import android.os.Bundle;
+import android.os.Handler;
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
@@ -42,6 +43,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.content.PackageMonitor;
+import com.android.internal.os.BackgroundThread;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.LocalServices;
import com.android.server.SystemService;
@@ -57,6 +59,7 @@
*/
public class SearchManagerService extends ISearchManager.Stub {
private static final String TAG = "SearchManagerService";
+ final Handler mHandler;
public static class Lifecycle extends SystemService {
private SearchManagerService mService;
@@ -72,8 +75,13 @@
}
@Override
- public void onUnlockUser(int userHandle) {
- mService.onUnlockUser(userHandle);
+ public void onUnlockUser(final int userId) {
+ mService.mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mService.onUnlockUser(userId);
+ }
+ });
}
@Override
@@ -99,6 +107,7 @@
mContext = context;
new MyPackageMonitor().register(context, null, UserHandle.ALL, true);
new GlobalSearchProviderObserver(context.getContentResolver());
+ mHandler = BackgroundThread.getHandler();
}
private Searchables getSearchables(int userId) {
@@ -132,7 +141,12 @@
}
private void onUnlockUser(int userId) {
- getSearchables(userId, true);
+ try {
+ getSearchables(userId, true);
+ } catch (IllegalStateException ignored) {
+ // We're just trying to warm a cache, so we don't mind if the user
+ // was stopped or destroyed before we got here.
+ }
}
private void onCleanupUser(int userId) {
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index ca92b90..552803f 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -29,6 +29,7 @@
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Slog;
import android.view.KeyEvent;
@@ -942,6 +943,20 @@
+ " token=" + tok.token);
}
pw.println(" mCurrentUserId=" + mCurrentUserId);
+ pw.println(" mIcons=");
+ for (String slot : mIcons.keySet()) {
+ pw.println(" ");
+ pw.print(slot);
+ pw.print(" -> ");
+ final StatusBarIcon icon = mIcons.get(slot);
+ pw.print(icon);
+ if (!TextUtils.isEmpty(icon.contentDescription)) {
+ pw.print(" \"");
+ pw.print(icon.contentDescription);
+ pw.print("\"");
+ }
+ pw.println();
+ }
}
}
}
diff --git a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
index cbbcb0e..0ae1717 100644
--- a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
+++ b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
@@ -455,9 +455,7 @@
//log the event to event log with the amount of free storage(in bytes) left on the device
EventLog.writeEvent(EventLogTags.LOW_STORAGE, mFreeMem);
// Pack up the values and broadcast them to everyone
- Intent lowMemIntent = new Intent(Environment.isExternalStorageEmulated()
- ? Settings.ACTION_INTERNAL_STORAGE_SETTINGS
- : Intent.ACTION_MANAGE_PACKAGE_STORAGE);
+ Intent lowMemIntent = new Intent(StorageManager.ACTION_MANAGE_STORAGE);
lowMemIntent.putExtra("memory", mFreeMem);
lowMemIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
NotificationManager mNotificationMgr =
diff --git a/services/core/java/com/android/server/trust/TrustAgentWrapper.java b/services/core/java/com/android/server/trust/TrustAgentWrapper.java
index 9c2c6bf..e7c5384 100644
--- a/services/core/java/com/android/server/trust/TrustAgentWrapper.java
+++ b/services/core/java/com/android/server/trust/TrustAgentWrapper.java
@@ -51,7 +51,7 @@
private static final String EXTRA_COMPONENT_NAME = "componentName";
private static final String TRUST_EXPIRED_ACTION = "android.server.trust.TRUST_EXPIRED_ACTION";
private static final String PERMISSION = android.Manifest.permission.PROVIDE_TRUST_AGENT;
- private static final boolean DEBUG = false;
+ private static final boolean DEBUG = TrustManagerService.DEBUG;
private static final String TAG = "TrustAgentWrapper";
private static final int MSG_GRANT_TRUST = 1;
@@ -128,7 +128,7 @@
// DevicePolicyManager#KEYGUARD_DISABLE_TRUST_AGENTS.
duration = Math.min(durationMs, mMaximumTimeToLock);
if (DEBUG) {
- Log.v(TAG, "DPM lock timeout in effect. Timeout adjusted from "
+ Slog.d(TAG, "DPM lock timeout in effect. Timeout adjusted from "
+ durationMs + " to " + duration);
}
} else {
@@ -146,7 +146,7 @@
mTrustManagerService.updateTrust(mUserId, flags);
break;
case MSG_TRUST_TIMEOUT:
- if (DEBUG) Slog.v(TAG, "Trust timed out : " + mName.flattenToShortString());
+ if (DEBUG) Slog.d(TAG, "Trust timed out : " + mName.flattenToShortString());
mTrustManagerService.mArchive.logTrustTimeout(mUserId, mName);
onTrustTimeout();
// Fall through.
@@ -160,6 +160,8 @@
mTrustManagerService.updateTrust(mUserId, 0);
break;
case MSG_RESTART_TIMEOUT:
+ Slog.w(TAG, "Connection attempt to agent " + mName.flattenToShortString()
+ + " timed out, rebinding");
destroy();
mTrustManagerService.resetAgent(mName, mUserId);
break;
@@ -169,14 +171,14 @@
if (mSetTrustAgentFeaturesToken == token) {
mSetTrustAgentFeaturesToken = null;
if (mTrustDisabledByDpm && result) {
- if (DEBUG) Log.v(TAG, "Re-enabling agent because it acknowledged "
- + "enabled features: " + mName);
+ if (DEBUG) Slog.d(TAG, "Re-enabling agent because it acknowledged "
+ + "enabled features: " + mName.flattenToShortString());
mTrustDisabledByDpm = false;
mTrustManagerService.updateTrust(mUserId, 0);
}
} else {
- if (DEBUG) Log.w(TAG, "Ignoring MSG_SET_TRUST_AGENT_FEATURES_COMPLETED "
- + "with obsolete token: " + mName);
+ if (DEBUG) Slog.w(TAG, "Ignoring MSG_SET_TRUST_AGENT_FEATURES_COMPLETED "
+ + "with obsolete token: " + mName.flattenToShortString());
}
break;
case MSG_MANAGING_TRUST:
@@ -196,7 +198,7 @@
@Override
public void grantTrust(CharSequence userMessage, long durationMs, int flags) {
- if (DEBUG) Slog.v(TAG, "enableTrust(" + userMessage + ", durationMs = " + durationMs
+ if (DEBUG) Slog.d(TAG, "enableTrust(" + userMessage + ", durationMs = " + durationMs
+ ", flags = " + flags + ")");
Message msg = mHandler.obtainMessage(
@@ -207,19 +209,19 @@
@Override
public void revokeTrust() {
- if (DEBUG) Slog.v(TAG, "revokeTrust()");
+ if (DEBUG) Slog.d(TAG, "revokeTrust()");
mHandler.sendEmptyMessage(MSG_REVOKE_TRUST);
}
@Override
public void setManagingTrust(boolean managingTrust) {
- if (DEBUG) Slog.v(TAG, "managingTrust()");
+ if (DEBUG) Slog.d(TAG, "managingTrust()");
mHandler.obtainMessage(MSG_MANAGING_TRUST, managingTrust ? 1 : 0, 0).sendToTarget();
}
@Override
public void onConfigureCompleted(boolean result, IBinder token) {
- if (DEBUG) Slog.v(TAG, "onSetTrustAgentFeaturesEnabledCompleted(result=" + result);
+ if (DEBUG) Slog.d(TAG, "onSetTrustAgentFeaturesEnabledCompleted(result=" + result);
mHandler.obtainMessage(MSG_SET_TRUST_AGENT_FEATURES_COMPLETED,
result ? 1 : 0, 0, token).sendToTarget();
}
@@ -228,7 +230,7 @@
private final ServiceConnection mConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
- if (DEBUG) Log.v(TAG, "TrustAgent started : " + name.flattenToString());
+ if (DEBUG) Slog.d(TAG, "TrustAgent started : " + name.flattenToString());
mHandler.removeMessages(MSG_RESTART_TIMEOUT);
mTrustAgentService = ITrustAgentService.Stub.asInterface(service);
mTrustManagerService.mArchive.logAgentConnected(mUserId, name);
@@ -249,7 +251,7 @@
@Override
public void onServiceDisconnected(ComponentName name) {
- if (DEBUG) Log.v(TAG, "TrustAgent disconnected : " + name.flattenToShortString());
+ if (DEBUG) Slog.d(TAG, "TrustAgent disconnected : " + name.flattenToShortString());
mTrustAgentService = null;
mManagingTrust = false;
mSetTrustAgentFeaturesToken = null;
@@ -352,7 +354,7 @@
boolean updateDevicePolicyFeatures() {
boolean trustDisabled = false;
- if (DEBUG) Slog.v(TAG, "updateDevicePolicyFeatures(" + mName + ")");
+ if (DEBUG) Slog.d(TAG, "updateDevicePolicyFeatures(" + mName + ")");
try {
if (mTrustAgentService != null) {
DevicePolicyManager dpm =
@@ -363,10 +365,10 @@
List<PersistableBundle> config = dpm.getTrustAgentConfiguration(
null, mName, mUserId);
trustDisabled = true;
- if (DEBUG) Slog.v(TAG, "Detected trust agents disabled. Config = " + config);
+ if (DEBUG) Slog.d(TAG, "Detected trust agents disabled. Config = " + config);
if (config != null && config.size() > 0) {
if (DEBUG) {
- Slog.v(TAG, "TrustAgent " + mName.flattenToShortString()
+ Slog.d(TAG, "TrustAgent " + mName.flattenToShortString()
+ " disabled until it acknowledges "+ config);
}
mSetTrustAgentFeaturesToken = new Binder();
@@ -415,7 +417,7 @@
if (!mBound) {
return;
}
- if (DEBUG) Log.v(TAG, "TrustAgent unbound : " + mName.flattenToShortString());
+ if (DEBUG) Slog.d(TAG, "TrustAgent unbound : " + mName.flattenToShortString());
mTrustManagerService.mArchive.logAgentStopped(mUserId, mName);
mContext.unbindService(mConnection);
mBound = false;
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 95550aa..e60488a 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -44,6 +44,7 @@
import android.content.res.XmlResourceParser;
import android.graphics.drawable.Drawable;
import android.os.Binder;
+import android.os.Build;
import android.os.DeadObjectException;
import android.os.Handler;
import android.os.IBinder;
@@ -86,9 +87,8 @@
* instance of a {@link android.service.trust.TrustAgentService}.
*/
public class TrustManagerService extends SystemService {
-
- private static final boolean DEBUG = false;
private static final String TAG = "TrustManagerService";
+ static final boolean DEBUG = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.VERBOSE);
private static final Intent TRUST_AGENT_INTENT =
new Intent(TrustAgentService.SERVICE_INTERFACE);
@@ -255,11 +255,33 @@
for (UserInfo userInfo : userInfos) {
if (userInfo == null || userInfo.partial || !userInfo.isEnabled()
|| userInfo.guestToRemove) continue;
- if (!userInfo.supportsSwitchToByUser()) continue;
- if (!StorageManager.isUserKeyUnlocked(userInfo.id)) continue;
- if (!mActivityManager.isUserRunning(userInfo.id)) continue;
- if (!lockPatternUtils.isSecure(userInfo.id)) continue;
- if (!mStrongAuthTracker.canAgentsRunForUser(userInfo.id)) continue;
+ if (!userInfo.supportsSwitchToByUser()) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping user " + userInfo.id
+ + ": switchToByUser=false");
+ continue;
+ }
+ if (!StorageManager.isUserKeyUnlocked(userInfo.id)) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping user " + userInfo.id
+ + ": FDE still locked");
+ continue;
+ }
+ if (!mActivityManager.isUserRunning(userInfo.id)) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping user " + userInfo.id
+ + ": user not started");
+ continue;
+ }
+ if (!lockPatternUtils.isSecure(userInfo.id)) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping user " + userInfo.id
+ + ": no secure credential");
+ continue;
+ }
+ if (!mStrongAuthTracker.canAgentsRunForUser(userInfo.id)) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping user " + userInfo.id
+ + ": prevented by StrongAuthTracker = 0x"
+ + Integer.toHexString(mStrongAuthTracker.getStrongAuthForUser(
+ userInfo.id)));
+ continue;
+ }
DevicePolicyManager dpm = lockPatternUtils.getDevicePolicyManager();
int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, userInfo.id);
final boolean disableTrustAgents =
@@ -267,18 +289,30 @@
List<ComponentName> enabledAgents = lockPatternUtils.getEnabledTrustAgents(userInfo.id);
if (enabledAgents == null) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping user " + userInfo.id
+ + ": no agents enabled by user");
continue;
}
List<ResolveInfo> resolveInfos = resolveAllowedTrustAgents(pm, userInfo.id);
for (ResolveInfo resolveInfo : resolveInfos) {
ComponentName name = getComponentName(resolveInfo);
- if (!enabledAgents.contains(name)) continue;
+ if (!enabledAgents.contains(name)) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping "
+ + name.flattenToShortString() + " u"+ userInfo.id
+ + ": not enabled by user");
+ continue;
+ }
if (disableTrustAgents) {
List<PersistableBundle> config =
dpm.getTrustAgentConfiguration(null /* admin */, name, userInfo.id);
// Disable agent if no features are enabled.
- if (config == null || config.isEmpty()) continue;
+ if (config == null || config.isEmpty()) {
+ if (DEBUG) Slog.d(TAG, "refreshAgentList: skipping "
+ + name.flattenToShortString() + " u"+ userInfo.id
+ + ": not allowed by DPM");
+ continue;
+ }
}
AgentInfo agentInfo = new AgentInfo();
diff --git a/services/core/java/com/android/server/twilight/TwilightService.java b/services/core/java/com/android/server/twilight/TwilightService.java
index 6158c92..ee7a4a0 100644
--- a/services/core/java/com/android/server/twilight/TwilightService.java
+++ b/services/core/java/com/android/server/twilight/TwilightService.java
@@ -16,18 +16,12 @@
package com.android.server.twilight;
-import com.android.server.SystemService;
-import com.android.server.TwilightCalculator;
-
-import android.app.ActivityManager;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.database.ContentObserver;
import android.location.Criteria;
import android.location.Location;
import android.location.LocationListener;
@@ -36,64 +30,52 @@
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.provider.Settings.Secure;
import android.text.format.DateUtils;
import android.text.format.Time;
import android.util.Slog;
+import com.android.internal.annotations.GuardedBy;
+import com.android.server.SystemService;
+import com.android.server.TwilightCalculator;
+
import java.util.ArrayList;
import java.util.Iterator;
-
-import libcore.util.Objects;
+import java.util.List;
+import java.util.Objects;
/**
* Figures out whether it's twilight time based on the user's location.
- *
+ * <p>
* Used by the UI mode manager and other components to adjust night mode
* effects based on sunrise and sunset.
*/
public final class TwilightService extends SystemService {
- static final String TAG = "TwilightService";
- static final boolean DEBUG = false;
- static final String ACTION_UPDATE_TWILIGHT_STATE =
+
+ private static final String TAG = "TwilightService";
+ private static final boolean DEBUG = false;
+
+ private static final String ACTION_UPDATE_TWILIGHT_STATE =
"com.android.server.action.UPDATE_TWILIGHT_STATE";
- // The amount of time after or before sunrise over which to start adjusting
- // twilight affected things. We want the change to happen gradually so that
- // it is below the threshold of perceptibility and so that the adjustment has
- // maximum effect well after dusk.
+ /**
+ * The amount of time after or before sunrise over which to start adjusting twilight affected
+ * things. We want the change to happen gradually so that it is below the threshold of
+ * perceptibility and so that the adjustment has and so that the adjustment has
+ * maximum effect well after dusk.
+ */
private static final long TWILIGHT_ADJUSTMENT_TIME = DateUtils.HOUR_IN_MILLIS * 2;
- // Broadcast when twilight changes.
- public static final String ACTION_TWILIGHT_CHANGED = "android.intent.action.TWILIGHT_CHANGED";
+ private final Object mLock = new Object();
- public static final String EXTRA_IS_NIGHT = "isNight";
- public static final String EXTRA_AMOUNT = "amount";
+ @GuardedBy("mLock")
+ private final List<TwilightListenerRecord> mListeners = new ArrayList<>();
- // Amount of time the TwilightService will stay locked in an override state before switching
- // back to auto.
- private static final long RESET_TIME = DateUtils.HOUR_IN_MILLIS * 2;
- private static final String EXTRA_RESET_USER = "user";
+ private AlarmManager mAlarmManager;
+ private LocationManager mLocationManager;
+ private LocationHandler mLocationHandler;
- private static final String ACTION_RESET_TWILIGHT_AUTO =
- "com.android.server.action.RESET_TWILIGHT_AUTO";
-
- final Object mLock = new Object();
-
- AlarmManager mAlarmManager;
- LocationManager mLocationManager;
- LocationHandler mLocationHandler;
-
- final ArrayList<TwilightListenerRecord> mListeners =
- new ArrayList<TwilightListenerRecord>();
-
- TwilightState mTwilightState;
-
- private int mCurrentUser;
- private boolean mLocked;
- private boolean mBootCompleted;
+ @GuardedBy("mLock")
+ private TwilightState mTwilightState;
public TwilightService(Context context) {
super(context);
@@ -105,13 +87,11 @@
mLocationManager = (LocationManager) getContext().getSystemService(
Context.LOCATION_SERVICE);
mLocationHandler = new LocationHandler();
- mCurrentUser = ActivityManager.getCurrentUser();
IntentFilter filter = new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
filter.addAction(Intent.ACTION_TIME_CHANGED);
filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
filter.addAction(Intent.ACTION_USER_SWITCHED);
- filter.addAction(ACTION_UPDATE_TWILIGHT_STATE);
getContext().registerReceiver(mReceiver, filter);
publishLocalService(TwilightManager.class, mService);
@@ -120,81 +100,29 @@
@Override
public void onBootPhase(int phase) {
if (phase == PHASE_BOOT_COMPLETED) {
- getContext().getContentResolver().registerContentObserver(
- Secure.getUriFor(Secure.TWILIGHT_MODE), false, mContentObserver, mCurrentUser);
- mContentObserver.onChange(true);
- mBootCompleted = true;
- sendBroadcast();
- }
- }
-
- private void reregisterSettingObserver() {
- final ContentResolver contentResolver = getContext().getContentResolver();
- contentResolver.unregisterContentObserver(mContentObserver);
- contentResolver.registerContentObserver(Secure.getUriFor(Secure.TWILIGHT_MODE), false,
- mContentObserver, mCurrentUser);
- mContentObserver.onChange(true);
- }
-
- private void setLockedState(TwilightState state) {
- synchronized (mLock) {
- // Make sure we aren't locked so we can set the state.
- mLocked = false;
- setTwilightState(state);
- // Make sure we leave the state locked, so it cant be changed.
- mLocked = true;
- // TODO: Don't bother updating state when locked.
+ // Initialize the current twilight state.
+ mLocationHandler.requestTwilightUpdate();
}
}
private void setTwilightState(TwilightState state) {
synchronized (mLock) {
- if (mLocked) {
- // State has been locked by secure setting, shouldn't be changed.
- return;
- }
- if (!Objects.equal(mTwilightState, state)) {
+ if (!Objects.equals(mTwilightState, state)) {
if (DEBUG) {
Slog.d(TAG, "Twilight state changed: " + state);
}
mTwilightState = state;
- final int listenerLen = mListeners.size();
- for (int i = 0; i < listenerLen; i++) {
- mListeners.get(i).postUpdate();
+ for (TwilightListenerRecord mListener : mListeners) {
+ mListener.postUpdate();
}
}
}
- sendBroadcast();
- }
-
- private void sendBroadcast() {
- synchronized (mLock) {
- if (mTwilightState == null) {
- return;
- }
- if (mBootCompleted) {
- Intent intent = new Intent(ACTION_TWILIGHT_CHANGED);
- intent.putExtra(EXTRA_IS_NIGHT, mTwilightState.isNight());
- intent.putExtra(EXTRA_AMOUNT, mTwilightState.getAmount());
- intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
- getContext().sendStickyBroadcastAsUser(intent, UserHandle.ALL);
- }
- }
- }
-
- private void scheduleReset() {
- long resetTime = System.currentTimeMillis() + RESET_TIME;
- Intent resetIntent = new Intent(ACTION_RESET_TWILIGHT_AUTO);
- resetIntent.putExtra(EXTRA_RESET_USER, mCurrentUser);
- PendingIntent pendingIntent = PendingIntent.getBroadcast(
- getContext(), 0, resetIntent, 0);
- mAlarmManager.cancel(pendingIntent);
- mAlarmManager.setExact(AlarmManager.RTC, resetTime, pendingIntent);
}
private static class TwilightListenerRecord implements Runnable {
+
private final TwilightListener mListener;
private final Handler mHandler;
@@ -211,15 +139,9 @@
public void run() {
mListener.onTwilightStateChanged();
}
-
}
private final TwilightManager mService = new TwilightManager() {
- /**
- * Gets the current twilight state.
- *
- * @return The current twilight state, or null if no information is available.
- */
@Override
public TwilightState getCurrentState() {
synchronized (mLock) {
@@ -227,11 +149,6 @@
}
}
- /**
- * Listens for twilight time.
- *
- * @param listener The listener.
- */
@Override
public void registerListener(TwilightListener listener, Handler handler) {
synchronized (mLock) {
@@ -286,6 +203,7 @@
}
private final class LocationHandler extends Handler {
+
private static final int MSG_ENABLE_LOCATION_UPDATES = 1;
private static final int MSG_GET_NEW_LOCATION_UPDATE = 2;
private static final int MSG_PROCESS_NEW_LOCATION = 3;
@@ -301,13 +219,14 @@
private static final double FACTOR_GMT_OFFSET_LONGITUDE =
1000.0 * 360.0 / DateUtils.DAY_IN_MILLIS;
+ private final TwilightCalculator mTwilightCalculator = new TwilightCalculator();
+
private boolean mPassiveListenerEnabled;
private boolean mNetworkListenerEnabled;
private boolean mDidFirstInit;
private long mLastNetworkRegisterTime = -MIN_LOCATION_UPDATE_MS;
private long mLastUpdateInterval;
private Location mLocation;
- private final TwilightCalculator mTwilightCalculator = new TwilightCalculator();
public void processNewLocation(Location location) {
Message msg = obtainMessage(MSG_PROCESS_NEW_LOCATION, location);
@@ -334,14 +253,14 @@
public void handleMessage(Message msg) {
switch (msg.what) {
case MSG_PROCESS_NEW_LOCATION: {
- final Location location = (Location)msg.obj;
+ final Location location = (Location) msg.obj;
final boolean hasMoved = hasMoved(mLocation, location);
final boolean hasBetterAccuracy = mLocation == null
|| location.getAccuracy() < mLocation.getAccuracy();
if (DEBUG) {
Slog.d(TAG, "Processing new location: " + location
- + ", hasMoved=" + hasMoved
- + ", hasBetterAccuracy=" + hasBetterAccuracy);
+ + ", hasMoved=" + hasMoved
+ + ", hasBetterAccuracy=" + hasBetterAccuracy);
}
if (hasMoved || hasBetterAccuracy) {
setLocation(location);
@@ -373,8 +292,8 @@
// distance.
boolean networkLocationEnabled;
try {
- networkLocationEnabled =
- mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+ networkLocationEnabled = mLocationManager.isProviderEnabled(
+ LocationManager.NETWORK_PROVIDER);
} catch (Exception e) {
// we may get IllegalArgumentException if network location provider
// does not exist or is not yet installed.
@@ -398,8 +317,8 @@
// and network).
boolean passiveLocationEnabled;
try {
- passiveLocationEnabled =
- mLocationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER);
+ passiveLocationEnabled = mLocationManager.isProviderEnabled(
+ LocationManager.PASSIVE_PROVIDER);
} catch (Exception e) {
// we may get IllegalArgumentException if passive location provider
// does not exist or is not yet installed.
@@ -409,7 +328,7 @@
if (!mPassiveListenerEnabled && passiveLocationEnabled) {
mPassiveListenerEnabled = true;
mLocationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER,
- 0, LOCATION_UPDATE_DISTANCE_METER , mLocationListener);
+ 0, LOCATION_UPDATE_DISTANCE_METER, mLocationListener);
}
if (!(mNetworkListenerEnabled && mPassiveListenerEnabled)) {
@@ -444,14 +363,14 @@
// pick the most recent location
if (location == null || (lastKnownLocation != null &&
location.getElapsedRealtimeNanos() <
- lastKnownLocation.getElapsedRealtimeNanos())) {
+ lastKnownLocation.getElapsedRealtimeNanos())) {
location = lastKnownLocation;
}
}
// In the case there is no location available (e.g. GPS fix or network location
- // is not available yet), the longitude of the location is estimated using the timezone,
- // latitude and accuracy are set to get a good average.
+ // is not available yet), the longitude of the location is estimated using the
+ // timezone, latitude and accuracy are set to get a good average.
if (location == null) {
Time currentTime = new Time();
currentTime.set(System.currentTimeMillis());
@@ -543,58 +462,22 @@
Slog.d(TAG, "Next update in " + (nextUpdate - now) + " ms");
}
- Intent updateIntent = new Intent(ACTION_UPDATE_TWILIGHT_STATE);
- PendingIntent pendingIntent = PendingIntent.getBroadcast(
- getContext(), 0, updateIntent, 0);
+ final PendingIntent pendingIntent = PendingIntent.getBroadcast(
+ getContext(), 0, new Intent(ACTION_UPDATE_TWILIGHT_STATE), 0);
mAlarmManager.cancel(pendingIntent);
mAlarmManager.setExact(AlarmManager.RTC, nextUpdate, pendingIntent);
}
}
- private final ContentObserver mContentObserver = new ContentObserver(new Handler()) {
- @Override
- public void onChange(boolean selfChange) {
- super.onChange(selfChange);
- int value = Secure.getIntForUser(getContext().getContentResolver(),
- Secure.TWILIGHT_MODE, Secure.TWILIGHT_MODE_LOCKED_OFF, mCurrentUser);
- if (value == Secure.TWILIGHT_MODE_LOCKED_OFF) {
- setLockedState(new TwilightState(false, 0));
- } else if (value == Secure.TWILIGHT_MODE_LOCKED_ON) {
- setLockedState(new TwilightState(true, 1));
- } else if (value == Secure.TWILIGHT_MODE_AUTO_OVERRIDE_OFF) {
- setLockedState(new TwilightState(false, 0));
- scheduleReset();
- } else if (value == Secure.TWILIGHT_MODE_AUTO_OVERRIDE_ON) {
- setLockedState(new TwilightState(true, 1));
- scheduleReset();
- } else {
- mLocked = false;
- mLocationHandler.requestTwilightUpdate();
- }
- }
- };
-
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- if (Intent.ACTION_USER_SWITCHED.equals(intent.getAction())) {
- mCurrentUser = ActivityManager.getCurrentUser();
- reregisterSettingObserver();
- return;
- }
if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(intent.getAction())
&& !intent.getBooleanExtra("state", false)) {
// Airplane mode is now off!
mLocationHandler.requestLocationUpdate();
return;
}
-
- if (ACTION_RESET_TWILIGHT_AUTO.equals(intent.getAction())) {
- int user = intent.getIntExtra(EXTRA_RESET_USER, 0);
- Settings.Secure.putIntForUser(getContext().getContentResolver(),
- Secure.TWILIGHT_MODE, Secure.TWILIGHT_MODE_AUTO, user);
- return;
- }
// Time zone has changed or alarm expired.
mLocationHandler.requestTwilightUpdate();
}
@@ -602,32 +485,40 @@
// A LocationListener to initialize the network location provider. The location updates
// are handled through the passive location provider.
- private final LocationListener mEmptyLocationListener = new LocationListener() {
+ private final LocationListener mEmptyLocationListener = new LocationListener() {
+ @Override
public void onLocationChanged(Location location) {
}
- public void onProviderDisabled(String provider) {
+ @Override
+ public void onStatusChanged(String provider, int status, Bundle extras) {
}
+ @Override
public void onProviderEnabled(String provider) {
}
- public void onStatusChanged(String provider, int status, Bundle extras) {
+ @Override
+ public void onProviderDisabled(String provider) {
}
};
private final LocationListener mLocationListener = new LocationListener() {
+ @Override
public void onLocationChanged(Location location) {
mLocationHandler.processNewLocation(location);
}
- public void onProviderDisabled(String provider) {
+ @Override
+ public void onStatusChanged(String provider, int status, Bundle extras) {
}
+ @Override
public void onProviderEnabled(String provider) {
}
- public void onStatusChanged(String provider, int status, Bundle extras) {
+ @Override
+ public void onProviderDisabled(String provider) {
}
};
}
diff --git a/services/core/java/com/android/server/twilight/TwilightState.java b/services/core/java/com/android/server/twilight/TwilightState.java
index 81abc13..dec053b 100644
--- a/services/core/java/com/android/server/twilight/TwilightState.java
+++ b/services/core/java/com/android/server/twilight/TwilightState.java
@@ -24,6 +24,7 @@
* This object is immutable.
*/
public class TwilightState {
+
private final boolean mIsNight;
private final float mAmount;
diff --git a/services/core/java/com/android/server/vr/EnabledComponentsObserver.java b/services/core/java/com/android/server/vr/EnabledComponentsObserver.java
index 77e8b1f..7126cb5 100644
--- a/services/core/java/com/android/server/vr/EnabledComponentsObserver.java
+++ b/services/core/java/com/android/server/vr/EnabledComponentsObserver.java
@@ -215,7 +215,11 @@
*/
public ArraySet<ComponentName> getInstalled(int userId) {
synchronized (mLock) {
- return mInstalledSet.get(userId);
+ ArraySet<ComponentName> ret = mInstalledSet.get(userId);
+ if (ret == null) {
+ return new ArraySet<ComponentName>();
+ }
+ return ret;
}
}
@@ -227,7 +231,12 @@
*/
public ArraySet<ComponentName> getEnabled(int userId) {
synchronized (mLock) {
- return mEnabledSet.get(userId);
+ ArraySet<ComponentName> ret = mEnabledSet.get(userId);
+ if (ret == null) {
+ return new ArraySet<ComponentName>();
+ }
+ return ret;
+
}
}
@@ -246,7 +255,9 @@
Intent queryIntent = new Intent(serviceName);
List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
queryIntent,
- PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
+ PackageManager.GET_SERVICES | PackageManager.GET_META_DATA |
+ PackageManager.MATCH_DIRECT_BOOT_AWARE |
+ PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
userId);
if (installedServices != null) {
for (int i = 0, count = installedServices.size(); i < count; i++) {
diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index 5fefd4c..7d20931 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -403,107 +403,6 @@
publishLocalService(VrManagerInternal.class, new LocalService());
publishBinderService(VR_MANAGER_BINDER_SERVICE, mVrManager.asBinder());
-
- // If there are no VR packages installed on the device, then disable VR
- // components, otherwise, enable them.
- setEnabledStatusOfVrComponents();
- }
-
- private void setEnabledStatusOfVrComponents() {
- ArraySet<ComponentName> vrComponents = SystemConfig.getInstance().getDefaultVrComponents();
- if (vrComponents == null) {
- return;
- }
-
- // We only want to enable VR components if there is a VR package installed on the device.
- // The VR components themselves do not quality as a VR package, so exclude them.
- ArraySet<String> vrComponentPackageNames = new ArraySet<>();
- for (ComponentName componentName : vrComponents) {
- vrComponentPackageNames.add(componentName.getPackageName());
- }
-
- // Check to see if there are any packages on the device, other than the VR component
- // packages.
- PackageManager pm = mContext.getPackageManager();
- List<PackageInfo> packageInfos = pm.getInstalledPackages(
- PackageManager.GET_CONFIGURATIONS);
- boolean vrModeIsUsed = false;
- for (PackageInfo packageInfo : packageInfos) {
- if (packageInfo != null && packageInfo.packageName != null &&
- pm.getApplicationEnabledSetting(packageInfo.packageName) ==
- PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
- vrModeIsUsed = enableVrComponentsIfVrModeUsed(pm, packageInfo,
- vrComponentPackageNames, vrComponents);
- if (vrModeIsUsed) {
- break;
- }
- }
- }
-
- if (!vrModeIsUsed) {
- Slog.i(TAG, "No VR packages found, disabling VR components");
- setVrComponentsEnabledOrDisabled(vrComponents, false);
-
- // Register to receive an intent when a new package is installed, in case that package
- // requires VR components.
- IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
- intentFilter.addDataScheme("package");
- mContext.registerReceiver(new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- PackageManager pm = context.getPackageManager();
- final String packageName = intent.getData().getSchemeSpecificPart();
- if (packageName != null) {
- try {
- PackageInfo packageInfo = pm.getPackageInfo(packageName,
- PackageManager.GET_CONFIGURATIONS);
- enableVrComponentsIfVrModeUsed(pm, packageInfo,
- vrComponentPackageNames, vrComponents);
- } catch (NameNotFoundException e) {
- }
- }
- };
- }, intentFilter);
- }
- }
-
- private void setVrComponentsEnabledOrDisabled(ArraySet<ComponentName> vrComponents,
- boolean enabled) {
- int state = enabled ?
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
- PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
- PackageManager pm = mContext.getPackageManager();
- for (ComponentName componentName : vrComponents) {
- try {
- // Note that we must first check for the existance of the package before trying
- // to set its enabled state. This is to prevent PackageManager from throwing
- // an excepton if the package is not found (not just a NameNotFoundException
- // exception).
- PackageInfo packageInfo = pm.getPackageInfo(componentName.getPackageName(),
- PackageManager.GET_CONFIGURATIONS);
- pm.setApplicationEnabledSetting(componentName.getPackageName(), state , 0);
- } catch (NameNotFoundException e) {
- }
- }
- }
-
- private boolean enableVrComponentsIfVrModeUsed(PackageManager pm, PackageInfo packageInfo,
- ArraySet<String> vrComponentPackageNames, ArraySet<ComponentName> vrComponents) {
- boolean isVrComponent = vrComponents != null &&
- vrComponentPackageNames.contains(packageInfo.packageName);
- if (packageInfo != null && packageInfo.reqFeatures != null && !isVrComponent) {
- for (FeatureInfo featureInfo : packageInfo.reqFeatures) {
- if (featureInfo.name != null &&
- (featureInfo.name.equals(PackageManager.FEATURE_VR_MODE) ||
- featureInfo.name.equals(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE))) {
- Slog.i(TAG, "VR package found, enabling VR components");
- setVrComponentsEnabledOrDisabled(vrComponents, true);
- return true;
- }
- }
- }
- return false;
}
@Override
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index a825efd..95fbf55 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -85,6 +85,7 @@
import com.android.internal.R;
import com.android.internal.content.PackageMonitor;
+import com.android.internal.os.BackgroundThread;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.JournaledFile;
import com.android.server.EventLogTags;
@@ -166,7 +167,7 @@
* Observes the wallpaper for changes and notifies all IWallpaperServiceCallbacks
* that the wallpaper has changed. The CREATE is triggered when there is no
* wallpaper set and is created for the first time. The CLOSE_WRITE is triggered
- * everytime the wallpaper is changed.
+ * every time the wallpaper is changed.
*/
private class WallpaperObserver extends FileObserver {
@@ -175,7 +176,6 @@
final File mWallpaperDir;
final File mWallpaperFile;
final File mWallpaperLockFile;
- final File mWallpaperInfoFile;
public WallpaperObserver(WallpaperData wallpaper) {
super(getWallpaperDir(wallpaper.userId).getAbsolutePath(),
@@ -185,7 +185,6 @@
mWallpaper = wallpaper;
mWallpaperFile = new File(mWallpaperDir, WALLPAPER);
mWallpaperLockFile = new File(mWallpaperDir, WALLPAPER_LOCK_ORIG);
- mWallpaperInfoFile = new File(mWallpaperDir, WALLPAPER_INFO);
}
private WallpaperData dataForEvent(boolean sysChanged, boolean lockChanged) {
@@ -229,10 +228,12 @@
if (moved && lockWallpaperChanged) {
// We just migrated sys -> lock to preserve imagery for an impending
- // new system-only wallpaper. Tell keyguard about it but that's it.
+ // new system-only wallpaper. Tell keyguard about it and make sure it
+ // has the right SELinux label.
if (DEBUG) {
Slog.i(TAG, "Sys -> lock MOVED_TO");
}
+ SELinux.restorecon(changedFile);
notifyLockWallpaperChanged();
return;
}
@@ -251,9 +252,11 @@
if (DEBUG) {
Slog.v(TAG, "Wallpaper written; generating crop");
}
+ SELinux.restorecon(changedFile);
if (moved) {
// This is a restore, so generate the crop using any just-restored new
// crop guidelines, making sure to preserve our local dimension hints.
+ // We also make sure to reapply the correct SELinux label.
if (DEBUG) {
Slog.v(TAG, "moved-to, therefore restore; reloading metadata");
}
@@ -350,8 +353,8 @@
(cropHint.bottom > options.outHeight ? options.outHeight - cropHint.bottom : 0));
// Don't bother cropping if what we're left with is identity
- needCrop = (options.outHeight >= cropHint.height()
- && options.outWidth >= cropHint.width());
+ needCrop = (options.outHeight > cropHint.height()
+ && options.outWidth > cropHint.width());
}
// scale if the crop height winds up not matching the recommended metrics
@@ -484,6 +487,7 @@
final SparseArray<WallpaperData> mWallpaperMap = new SparseArray<WallpaperData>();
final SparseArray<WallpaperData> mLockWallpaperMap = new SparseArray<WallpaperData>();
+ final SparseArray<Boolean> mUserRestorecon = new SparseArray<Boolean>();
int mCurrentUserId;
static class WallpaperData {
@@ -939,10 +943,34 @@
mLockWallpaperMap.remove(userId);
}
- void onUnlockUser(int userId) {
+ void onUnlockUser(final int userId) {
synchronized (mLock) {
- if (mCurrentUserId == userId && mWaitingForUnlock) {
- switchUser(userId, null);
+ if (mCurrentUserId == userId) {
+ if (mWaitingForUnlock) {
+ // If we're switching users, now is when we transition the wallpaper
+ switchUser(userId, null);
+ }
+
+ // Make sure that the SELinux labeling of all the relevant files is correct.
+ // This corrects for mislabeling bugs that might have arisen from move-to
+ // operations involving the wallpaper files. This isn't timing-critical,
+ // so we do it in the background to avoid holding up the user unlock operation.
+ if (mUserRestorecon.get(userId) != Boolean.TRUE) {
+ mUserRestorecon.put(userId, Boolean.TRUE);
+ Runnable relabeler = new Runnable() {
+ @Override
+ public void run() {
+ final File wallpaperDir = getWallpaperDir(userId);
+ for (String filename : sPerUserFiles) {
+ File f = new File(wallpaperDir, filename);
+ if (f.exists()) {
+ SELinux.restorecon(f);
+ }
+ }
+ }
+ };
+ BackgroundThread.getHandler().post(relabeler);
+ }
}
}
}
@@ -1278,8 +1306,9 @@
}
@Override
- public WallpaperInfo getWallpaperInfo() {
- int userId = UserHandle.getCallingUserId();
+ public WallpaperInfo getWallpaperInfo(int userId) {
+ userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
+ Binder.getCallingUid(), userId, false, true, "getWallpaperIdForUser", null);
synchronized (mLock) {
WallpaperData wallpaper = mWallpaperMap.get(userId);
if (wallpaper != null && wallpaper.connection != null) {
@@ -1448,19 +1477,27 @@
}
@Override
- public void setWallpaperComponentChecked(ComponentName name, String callingPackage) {
+ public void setWallpaperComponentChecked(ComponentName name, String callingPackage,
+ int userId) {
+
if (isWallpaperSupported(callingPackage) && isSetWallpaperAllowed(callingPackage)) {
- setWallpaperComponent(name);
+ setWallpaperComponent(name, userId);
}
}
// ToDo: Remove this version of the function
@Override
public void setWallpaperComponent(ComponentName name) {
+ setWallpaperComponent(name, UserHandle.getCallingUserId());
+ }
+
+ private void setWallpaperComponent(ComponentName name, int userId) {
+ userId = ActivityManager.handleIncomingUser(getCallingPid(), getCallingUid(), userId,
+ false /* all */, true /* full */, "changing live wallpaper", null /* pkg */);
checkPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT);
+
synchronized (mLock) {
if (DEBUG) Slog.v(TAG, "setWallpaperComponent name=" + name);
- int userId = UserHandle.getCallingUserId();
WallpaperData wallpaper = mWallpaperMap.get(userId);
if (wallpaper == null) {
throw new IllegalStateException("Wallpaper not yet initialized for user " + userId);
diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index 8be5dfb..2d60f43 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -115,6 +115,16 @@
}
}
+ public void performComputeChangedWindowsNotLocked() {
+ WindowsForAccessibilityObserver observer = null;
+ synchronized (mWindowManagerService) {
+ observer = mWindowsForAccessibilityObserver;
+ }
+ if (observer != null) {
+ observer.performComputeChangedWindowsNotLocked();
+ }
+ }
+
public void setMagnificationSpecLocked(MagnificationSpec spec) {
if (mDisplayMagnifier != null) {
mDisplayMagnifier.setMagnificationSpecLocked(spec);
@@ -389,7 +399,7 @@
if (spec != null && !spec.isNop()) {
WindowManagerPolicy policy = mWindowManagerService.mPolicy;
final int windowType = windowState.mAttrs.type;
- if (!policy.isTopLevelWindow(windowType) && windowState.mAttachedWindow != null
+ if (!policy.isTopLevelWindow(windowType) && windowState.isChildWindow()
&& !policy.canMagnifyWindow(windowType)) {
return null;
}
@@ -1071,14 +1081,15 @@
Region.Op.REVERSE_DIFFERENCE);
}
- // We figured out what is touchable for the entire screen - done.
- if (unaccountedSpace.isEmpty()) {
- break;
- }
-
// If a window is modal it prevents other windows from being touched
if ((flags & (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)) == 0) {
+ // Account for all space in the task, whether the windows in it are
+ // touchable or not. The modal window blocks all touches from the task's
+ // area.
+ unaccountedSpace.op(windowState.getDisplayFrameLw(), unaccountedSpace,
+ Region.Op.REVERSE_DIFFERENCE);
+
if (task != null) {
// If the window is associated with a particular task, we can skip the
// rest of the windows for that task.
@@ -1090,6 +1101,10 @@
break;
}
}
+ // We figured out what is touchable for the entire screen - done.
+ if (unaccountedSpace.isEmpty()) {
+ break;
+ }
}
// Always report the focused window.
@@ -1196,34 +1211,10 @@
(int) windowFrame.right, (int) windowFrame.bottom);
}
- private static WindowInfo obtainPopulatedWindowInfo(WindowState windowState,
- Rect boundsInScreen) {
- WindowInfo window = WindowInfo.obtain();
- window.type = windowState.mAttrs.type;
- window.layer = windowState.mLayer;
- window.token = windowState.mClient.asBinder();
- window.title = windowState.mAttrs.accessibilityTitle;
- window.accessibilityIdOfAnchor = windowState.mAttrs.accessibilityIdOfAnchor;
-
- WindowState attachedWindow = windowState.mAttachedWindow;
- if (attachedWindow != null) {
- window.parentToken = attachedWindow.mClient.asBinder();
- }
-
- window.focused = windowState.isFocused();
+ private static WindowInfo obtainPopulatedWindowInfo(
+ WindowState windowState, Rect boundsInScreen) {
+ final WindowInfo window = windowState.getWindowInfo();
window.boundsInScreen.set(boundsInScreen);
-
- final int childCount = windowState.mChildWindows.size();
- if (childCount > 0) {
- if (window.childTokens == null) {
- window.childTokens = new ArrayList<IBinder>();
- }
- for (int j = 0; j < childCount; j++) {
- WindowState child = windowState.mChildWindows.get(j);
- window.childTokens.add(child.mClient.asBinder());
- }
- }
-
return window;
}
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 4553f8e..d4d6f32 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -162,6 +162,9 @@
private final WindowManagerService mService;
private int mNextAppTransition = TRANSIT_UNSET;
+ private int mLastUsedAppTransition = TRANSIT_UNSET;
+ private String mLastOpeningApp;
+ private String mLastClosingApp;
private static final int NEXT_TRANSIT_TYPE_NONE = 0;
private static final int NEXT_TRANSIT_TYPE_CUSTOM = 1;
@@ -285,6 +288,13 @@
private void setAppTransition(int transit) {
mNextAppTransition = transit;
+ setLastAppTransition(TRANSIT_UNSET, null, null);
+ }
+
+ void setLastAppTransition(int transit, AppWindowToken openingApp, AppWindowToken closingApp) {
+ mLastUsedAppTransition = transit;
+ mLastOpeningApp = "" + openingApp;
+ mLastClosingApp = "" + closingApp;
}
boolean isReady() {
@@ -604,7 +614,7 @@
float scaleH = mTmpRect.height() / (float) appHeight;
Animation scale = new ScaleAnimation(scaleW, 1, scaleH, 1,
computePivot(mTmpRect.left, scaleW),
- computePivot(mTmpRect.right, scaleH));
+ computePivot(mTmpRect.top, scaleH));
scale.setInterpolator(mDecelerateInterpolator);
Animation alpha = new AlphaAnimation(0, 1);
@@ -1057,7 +1067,7 @@
final float thumbWidth = thumbWidthI > 0 ? thumbWidthI : 1;
final int thumbHeightI = mTmpRect.height();
final float thumbHeight = thumbHeightI > 0 ? thumbHeightI : 1;
- final int thumbStartX = mTmpRect.left - containingFrame.left;
+ final int thumbStartX = mTmpRect.left - containingFrame.left - contentInsets.left;
final int thumbStartY = mTmpRect.top - containingFrame.top;
switch (thumbTransitState) {
@@ -1615,8 +1625,7 @@
if (isTransitionSet()) {
clear();
mNextAppTransitionType = NEXT_TRANSIT_TYPE_SCALE_UP;
- putDefaultNextAppTransitionCoordinates(startX, startY, startX + startWidth,
- startY + startHeight, null);
+ putDefaultNextAppTransitionCoordinates(startX, startY, startWidth, startHeight, null);
postAnimationCallback();
}
}
@@ -1905,6 +1914,14 @@
pw.print(prefix); pw.print("mNextAppTransitionCallback=");
pw.println(mNextAppTransitionCallback);
}
+ if (mLastUsedAppTransition != TRANSIT_NONE) {
+ pw.print(prefix); pw.print("mLastUsedAppTransition=");
+ pw.println(appTransitionToString(mLastUsedAppTransition));
+ pw.print(prefix); pw.print("mLastOpeningApp=");
+ pw.println(mLastOpeningApp);
+ pw.print(prefix); pw.print("mLastClosingApp=");
+ pw.println(mLastClosingApp);
+ }
}
public void setCurrentUser(int newUserId) {
diff --git a/services/core/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java
index a37b65a..39a549d 100644
--- a/services/core/java/com/android/server/wm/AppWindowAnimator.java
+++ b/services/core/java/com/android/server/wm/AppWindowAnimator.java
@@ -424,7 +424,7 @@
final int numAllAppWinAnimators = mAllAppWinAnimators.size();
for (int i = 0; i < numAllAppWinAnimators; i++) {
- mAllAppWinAnimators.get(i).finishExit();
+ mAllAppWinAnimators.get(i).mWin.onExitAnimationDone();
}
mService.mAppTransition.notifyAppTransitionFinishedLocked(mAppToken.token);
return false;
@@ -437,7 +437,7 @@
for (int i=0; i<NW; i++) {
WindowStateAnimator winAnimator = mAllAppWinAnimators.get(i);
if (DEBUG_VISIBILITY) Slog.v(TAG, "performing show on: " + winAnimator);
- winAnimator.performShowLocked();
+ winAnimator.mWin.performShowLocked();
isAnimating |= winAnimator.isAnimationSet();
}
return isAnimating;
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index b907da6..6b0edad 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -17,7 +17,9 @@
package com.android.server.wm;
import static android.app.ActivityManager.StackId;
+import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
+import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
@@ -26,7 +28,6 @@
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
-import static com.android.server.wm.WindowManagerService.WINDOW_REPLACEMENT_TIMEOUT_DURATION;
import static com.android.server.wm.WindowManagerService.H.NOTIFY_ACTIVITY_DRAWN;
import com.android.server.input.InputApplicationHandle;
@@ -132,8 +133,12 @@
boolean mAlwaysFocusable;
boolean mAppStopped;
+ int mRotationAnimationHint;
int mPendingRelaunchCount;
+ private ArrayList<WindowSurfaceController.SurfaceControlWithBackground> mSurfaceViewBackgrounds =
+ new ArrayList<WindowSurfaceController.SurfaceControlWithBackground>();
+
ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();
ArrayDeque<Configuration> mFrozenMergedConfig = new ArrayDeque<>();
@@ -221,7 +226,7 @@
win.mWinAnimator.mSurfaceController
+ " pv=" + win.mPolicyVisibility
+ " mDrawState=" + win.mWinAnimator.mDrawState
- + " ah=" + win.mAttachedHidden
+ + " ph=" + win.isParentWindowHidden()
+ " th="
+ (win.mAppToken != null
? win.mAppToken.hiddenRequested : false)
@@ -277,10 +282,10 @@
WindowState findMainWindow() {
WindowState candidate = null;
- int j = windows.size();
+ int j = allAppWindows.size();
while (j > 0) {
j--;
- WindowState win = windows.get(j);
+ WindowState win = allAppWindows.get(j);
if (win.mAttrs.type == WindowManager.LayoutParams.TYPE_BASE_APPLICATION
|| win.mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING) {
// In cases where there are multiple windows, we prefer the non-exiting window. This
@@ -333,16 +338,52 @@
}
}
- // Here we destroy surfaces which have been marked as eligible by the animator, taking care
- // to ensure the client has finished with them. If the client could still be using them
- // we will skip destruction and try again when the client has stopped.
+ void clearAnimatingFlags() {
+ for (int i = allAppWindows.size() - 1; i >= 0; i--) {
+ final WindowState win = allAppWindows.get(i);
+ // We don't want to clear it out for windows that get replaced, because the
+ // animation depends on the flag to remove the replaced window.
+ //
+ // We also don't clear the mAnimatingExit flag for windows which have the
+ // mRemoveOnExit flag. This indicates an explicit remove request has been issued
+ // by the client. We should let animation proceed and not clear this flag or
+ // they won't eventually be removed by WindowStateAnimator#finishExit.
+ if (!win.mWillReplaceWindow && !win.mRemoveOnExit) {
+ win.mAnimatingExit = false;
+ // Clear mAnimating flag together with mAnimatingExit. When animation
+ // changes from exiting to entering, we need to clear this flag until the
+ // new animation gets applied, so that isAnimationStarting() becomes true
+ // until then.
+ // Otherwise applySurfaceChangesTransaction will faill to skip surface
+ // placement for this window during this period, one or more frame will
+ // show up with wrong position or scale.
+ win.mWinAnimator.mAnimating = false;
+ }
+ }
+ requestUpdateWallpaperIfNeeded();
+ }
+
void destroySurfaces() {
+ destroySurfaces(false /*cleanupOnResume*/);
+ }
+
+ /**
+ * Destroy surfaces which have been marked as eligible by the animator, taking care to ensure
+ * the client has finished with them.
+ *
+ * @param cleanupOnResume whether this is done when app is resumed without fully stopped. If
+ * set to true, destroy only surfaces of removed windows, and clear relevant flags of the
+ * others so that they are ready to be reused. If set to false (common case), destroy all
+ * surfaces that's eligible, if the app is already stopped.
+ */
+
+ private void destroySurfaces(boolean cleanupOnResume) {
final ArrayList<WindowState> allWindows = (ArrayList<WindowState>) allAppWindows.clone();
final DisplayContentList displayList = new DisplayContentList();
for (int i = allWindows.size() - 1; i >= 0; i--) {
final WindowState win = allWindows.get(i);
- if (!(mAppStopped || win.mWindowRemovalAllowed)) {
+ if (!(mAppStopped || win.mWindowRemovalAllowed || cleanupOnResume)) {
continue;
}
@@ -357,14 +398,19 @@
+ " win.mWindowRemovalAllowed=" + win.mWindowRemovalAllowed
+ " win.mRemoveOnExit=" + win.mRemoveOnExit);
- win.destroyOrSaveSurface();
+ if (!cleanupOnResume || win.mRemoveOnExit) {
+ win.destroyOrSaveSurface();
+ }
if (win.mRemoveOnExit) {
- service.removeWindowInnerLocked(win);
+ win.remove();
}
final DisplayContent displayContent = win.getDisplayContent();
if (displayContent != null && !displayList.contains(displayContent)) {
displayList.add(displayContent);
}
+ if (cleanupOnResume) {
+ win.requestUpdateWallpaperIfNeeded();
+ }
win.mDestroying = false;
}
for (int i = 0; i < displayList.size(); i++) {
@@ -375,21 +421,30 @@
}
/**
- * If the application has stopped it is okay to destroy any surfaces which were keeping alive
- * in case they were still being used.
+ * Notify that the app is now resumed, and it was not stopped before, perform a clean
+ * up of the surfaces
*/
- void notifyAppStopped(boolean stopped) {
- if (DEBUG_ADD_REMOVE) Slog.v(TAG, "notifyAppStopped: stopped=" + stopped + " " + this);
- mAppStopped = stopped;
-
- if (stopped) {
- destroySurfaces();
- // Remove any starting window that was added for this app if they are still around.
- mTask.mService.scheduleRemoveStartingWindowLocked(this);
+ void notifyAppResumed(boolean wasStopped) {
+ if (DEBUG_ADD_REMOVE) Slog.v(TAG, "notifyAppResumed: wasStopped=" + wasStopped + " " + this);
+ mAppStopped = false;
+ if (!wasStopped) {
+ destroySurfaces(true /*cleanupOnResume*/);
}
}
/**
+ * Notify that the app has stopped, and it is okay to destroy any surfaces which were
+ * keeping alive in case they were still being used.
+ */
+ void notifyAppStopped() {
+ if (DEBUG_ADD_REMOVE) Slog.v(TAG, "notifyAppStopped: " + this);
+ mAppStopped = true;
+ destroySurfaces();
+ // Remove any starting window that was added for this app if they are still around.
+ mTask.mService.scheduleRemoveStartingWindowLocked(this);
+ }
+
+ /**
* Checks whether we should save surfaces for this app.
*
* @return true if the surfaces should be saved, false otherwise.
@@ -493,7 +548,7 @@
clearVisibleBeforeClientHidden();
if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.d(TAG,
- "restoreSavedSurfaces: " + appWindowToken + " allDrawn=" + allDrawn
+ "restoreSavedSurfaces: " + this + " allDrawn=" + allDrawn
+ " numInteresting=" + numInteresting + " numDrawn=" + numDrawn);
}
@@ -560,8 +615,8 @@
}
void setReplacingWindows(boolean animate) {
- if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM, "Marking app token " + appWindowToken
- + " with replacing windows.");
+ if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM,
+ "Marking app token " + this + " with replacing windows.");
for (int i = allAppWindows.size() - 1; i >= 0; i--) {
final WindowState w = allAppWindows.get(i);
@@ -578,7 +633,7 @@
}
void setReplacingChildren() {
- if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM, "Marking app token " + appWindowToken
+ if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM, "Marking app token " + this
+ " with replacing child windows.");
for (int i = allAppWindows.size() - 1; i >= 0; i--) {
final WindowState w = allAppWindows.get(i);
@@ -589,8 +644,8 @@
}
void resetReplacingWindows() {
- if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM, "Resetting app token " + appWindowToken
- + " of replacing window marks.");
+ if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM,
+ "Resetting app token " + this + " of replacing window marks.");
for (int i = allAppWindows.size() - 1; i >= 0; i--) {
final WindowState w = allAppWindows.get(i);
@@ -625,6 +680,16 @@
}
}
+ void clearRelaunching() {
+ if (mPendingRelaunchCount == 0) {
+ return;
+ }
+ if (canFreezeBounds()) {
+ unfreezeBounds();
+ }
+ mPendingRelaunchCount = 0;
+ }
+
void addWindow(WindowState w) {
for (int i = allAppWindows.size() - 1; i >= 0; i--) {
WindowState candidate = allAppWindows.get(i);
@@ -667,10 +732,10 @@
candidate.mReplacingWindow.mSkipEnterAnimationForSeamlessReplacement = false;
}
// Since the window already timed out, remove it immediately now.
- // Use removeWindowInnerLocked() instead of removeWindowLocked(), as the latter
+ // Use WindowState#remove() instead of removeWindowLocked(), as the latter
// delays removal on certain conditions, which will leave the stale window in the
// stack and marked mWillReplaceWindow=false, so the window will never be removed.
- service.removeWindowInnerLocked(candidate);
+ candidate.remove();
}
}
@@ -704,10 +769,14 @@
* Unfreezes the previously frozen bounds. See {@link #freezeBounds}.
*/
private void unfreezeBounds() {
- mFrozenBounds.remove();
- mFrozenMergedConfig.remove();
- for (int i = windows.size() - 1; i >= 0; i--) {
- final WindowState win = windows.get(i);
+ if (!mFrozenBounds.isEmpty()) {
+ mFrozenBounds.remove();
+ }
+ if (!mFrozenMergedConfig.isEmpty()) {
+ mFrozenMergedConfig.remove();
+ }
+ for (int i = allAppWindows.size() - 1; i >= 0; i--) {
+ final WindowState win = allAppWindows.get(i);
if (!win.mHasSurface) {
continue;
}
@@ -720,6 +789,36 @@
service.mWindowPlacerLocked.performSurfacePlacement();
}
+ void addSurfaceViewBackground(WindowSurfaceController.SurfaceControlWithBackground background) {
+ mSurfaceViewBackgrounds.add(background);
+ }
+
+ void removeSurfaceViewBackground(WindowSurfaceController.SurfaceControlWithBackground background) {
+ mSurfaceViewBackgrounds.remove(background);
+ updateSurfaceViewBackgroundVisibilities();
+ }
+
+ // We use DimLayers behind SurfaceViews to prevent holes while resizing and creating.
+ // However, we need to ensure one SurfaceView doesn't cover another when they are both placed
+ // below the main app window (as traditionally a SurfaceView which is never drawn
+ // to is totally translucent). So we look at all our SurfaceView backgrounds and only enable
+ // the background for the SurfaceView with lowest Z order
+ void updateSurfaceViewBackgroundVisibilities() {
+ WindowSurfaceController.SurfaceControlWithBackground bottom = null;
+ int bottomLayer = Integer.MAX_VALUE;
+ for (int i = 0; i < mSurfaceViewBackgrounds.size(); i++) {
+ WindowSurfaceController.SurfaceControlWithBackground sc = mSurfaceViewBackgrounds.get(i);
+ if (sc.mVisible && sc.mLayer < bottomLayer) {
+ bottomLayer = sc.mLayer;
+ bottom = sc;
+ }
+ }
+ for (int i = 0; i < mSurfaceViewBackgrounds.size(); i++) {
+ WindowSurfaceController.SurfaceControlWithBackground sc = mSurfaceViewBackgrounds.get(i);
+ sc.updateBackgroundVisibility(sc != bottom);
+ }
+ }
+
@Override
void dump(PrintWriter pw, String prefix) {
super.dump(pw, prefix);
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index fba439f..4cdf601 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -30,6 +30,7 @@
import android.graphics.Rect;
import android.graphics.Region;
import android.graphics.Region.Op;
+import android.hardware.display.DisplayManagerInternal;
import android.util.DisplayMetrics;
import android.util.Slog;
import android.view.Display;
@@ -94,9 +95,6 @@
/** Detect user tapping outside of current focused stack bounds .*/
Region mTouchExcludeRegion = new Region();
- /** Detect user tapping in a non-resizeable task in docked or fullscreen stack .*/
- Region mNonResizeableRegion = new Region();
-
/** Save allocating when calculating rects */
private final Rect mTmpRect = new Rect();
private final Rect mTmpRect2 = new Rect();
@@ -200,12 +198,15 @@
}
void initializeDisplayBaseInfo() {
- // Bootstrap the default logical display from the display manager.
- final DisplayInfo newDisplayInfo =
- mService.mDisplayManagerInternal.getDisplayInfo(mDisplayId);
- if (newDisplayInfo != null) {
- mDisplayInfo.copyFrom(newDisplayInfo);
+ final DisplayManagerInternal displayManagerInternal = mService.mDisplayManagerInternal;
+ if (displayManagerInternal != null) {
+ // Bootstrap the default logical display from the display manager.
+ final DisplayInfo newDisplayInfo = displayManagerInternal.getDisplayInfo(mDisplayId);
+ if (newDisplayInfo != null) {
+ mDisplayInfo.copyFrom(newDisplayInfo);
+ }
}
+
mBaseDisplayWidth = mInitialDisplayWidth = mDisplayInfo.logicalWidth;
mBaseDisplayHeight = mInitialDisplayHeight = mDisplayInfo.logicalHeight;
mBaseDisplayDensity = mInitialDisplayDensity = mDisplayInfo.logicalDensityDpi;
@@ -358,7 +359,6 @@
mTouchExcludeRegion.set(mBaseDisplayRect);
final int delta = mService.dipToPixel(RESIZE_HANDLE_WIDTH_IN_DP, mDisplayMetrics);
boolean addBackFocusedTask = false;
- mNonResizeableRegion.setEmpty();
for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
TaskStack stack = mStacks.get(stackNdx);
final ArrayList<Task> tasks = stack.getTasks();
@@ -400,11 +400,6 @@
}
mTouchExcludeRegion.op(mTmpRect, Region.Op.DIFFERENCE);
}
- if (task.isTwoFingerScrollMode()) {
- stack.getBounds(mTmpRect);
- mNonResizeableRegion.op(mTmpRect, Region.Op.UNION);
- break;
- }
}
}
// If we removed the focused task above, add it back and only leave its
@@ -432,7 +427,7 @@
mTouchExcludeRegion.op(mTmpRegion, Op.UNION);
}
if (mTapDetector != null) {
- mTapDetector.setTouchExcludeRegion(mTouchExcludeRegion, mNonResizeableRegion);
+ mTapDetector.setTouchExcludeRegion(mTouchExcludeRegion);
}
}
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index e73649d..641bae2 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -388,8 +388,8 @@
inputMethodManagerInternal.hideCurrentInputMethod();
mImeHideRequested = true;
}
- } else {
- setMinimizedDockedStack(false);
+ } else if (setMinimizedDockedStack(false)) {
+ mService.mWindowPlacerLocked.performSurfacePlacement();
}
}
@@ -519,7 +519,11 @@
final boolean homeVisible = homeTask.getTopVisibleAppToken() != null;
final boolean homeBehind = (fullscreenStack != null && fullscreenStack.isVisibleLocked())
|| (homeStackTasks.size() > 1 && topHomeStackTask != homeTask);
- setMinimizedDockedStack(homeVisible && !homeBehind, animate);
+ // If the home task is an on-top launcher, we don't want to minimize the docked stack.
+ // Instead we want everything underneath that was visible to remain visible.
+ // See android.R.attr#onTopLauncher.
+ final boolean isOnTopLauncher = topHomeStackTask.isOnTopLauncher();
+ setMinimizedDockedStack(homeVisible && !homeBehind && !isOnTopLauncher, animate);
}
private boolean isWithinDisplay(Task task) {
@@ -542,31 +546,43 @@
return;
}
- clearImeAdjustAnimation();
+ final boolean imeChanged = clearImeAdjustAnimation();
+ boolean minimizedChange = false;
if (minimizedDock) {
if (animate) {
startAdjustAnimation(0f, 1f);
} else {
- setMinimizedDockedStack(true);
+ minimizedChange |= setMinimizedDockedStack(true);
}
} else {
if (animate) {
startAdjustAnimation(1f, 0f);
} else {
- setMinimizedDockedStack(false);
+ minimizedChange |= setMinimizedDockedStack(false);
}
}
+ if (imeChanged || minimizedChange) {
+ if (imeChanged && !minimizedChange) {
+ Slog.d(TAG, "setMinimizedDockedStack: IME adjust changed due to minimizing,"
+ + " minimizedDock=" + minimizedDock
+ + " minimizedChange=" + minimizedChange);
+ }
+ mService.mWindowPlacerLocked.performSurfacePlacement();
+ }
}
- private void clearImeAdjustAnimation() {
+ private boolean clearImeAdjustAnimation() {
+ boolean changed = false;
final ArrayList<TaskStack> stacks = mDisplayContent.getStacks();
for (int i = stacks.size() - 1; i >= 0; --i) {
final TaskStack stack = stacks.get(i);
if (stack != null && stack.isAdjustedForIme()) {
stack.resetAdjustedForIme(true /* adjustBoundsNow */);
+ changed = true;
}
}
mAnimatingForIme = false;
+ return changed;
}
private void startAdjustAnimation(float from, float to) {
@@ -625,8 +641,21 @@
if (mDelayedImeWin != null) {
mDelayedImeWin.mWinAnimator.endDelayingAnimationStart();
}
+ // If the adjust status changed since this was posted, only notify
+ // the new states and don't animate.
+ long duration = 0;
+ if (mAdjustedForIme == adjustedForIme
+ && mAdjustedForDivider == adjustedForDivider) {
+ duration = IME_ADJUST_ANIM_DURATION;
+ } else {
+ Slog.w(TAG, "IME adjust changed while waiting for drawn:"
+ + " adjustedForIme=" + adjustedForIme
+ + " adjustedForDivider=" + adjustedForDivider
+ + " mAdjustedForIme=" + mAdjustedForIme
+ + " mAdjustedForDivider=" + mAdjustedForDivider);
+ }
notifyAdjustedForImeChanged(
- adjustedForIme || adjustedForDivider, IME_ADJUST_ANIM_DURATION);
+ mAdjustedForIme || mAdjustedForDivider, duration);
};
} else {
notifyAdjustedForImeChanged(
@@ -634,15 +663,10 @@
}
}
- private void setMinimizedDockedStack(boolean minimized) {
+ private boolean setMinimizedDockedStack(boolean minimized) {
final TaskStack stack = mDisplayContent.getDockedStackVisibleForUserLocked();
notifyDockedStackMinimizedChanged(minimized, 0);
- if (stack == null) {
- return;
- }
- if (stack.setAdjustedForMinimizedDock(minimized ? 1f : 0f)) {
- mService.mWindowPlacerLocked.performSurfacePlacement();
- }
+ return stack != null && stack.setAdjustedForMinimizedDock(minimized ? 1f : 0f);
}
private boolean isAnimationMaximizing() {
diff --git a/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java b/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java
index 1831ff9..7cb6fc3 100644
--- a/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java
+++ b/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java
@@ -40,6 +40,7 @@
private IBinder mActivityToken = null;
private IBinder mPermissionOwnerToken = null;
+ private IBinder mTransientToken = null;
DragAndDropPermissionsHandler(ClipData clipData, int sourceUid, String targetPackage, int mode,
int sourceUserId, int targetUserId) {
@@ -80,12 +81,13 @@
}
@Override
- public void takeTransient(IBinder permissionOwnerToken) throws RemoteException {
+ public void takeTransient(IBinder transientToken) throws RemoteException {
if (mActivityToken != null || mPermissionOwnerToken != null) {
return;
}
- mPermissionOwnerToken = permissionOwnerToken;
- mPermissionOwnerToken.linkToDeath(this, 0);
+ mPermissionOwnerToken = ActivityManagerNative.getDefault().newUriPermissionOwner("drop");
+ mTransientToken = transientToken;
+ mTransientToken.linkToDeath(this, 0);
doTake(mPermissionOwnerToken);
}
@@ -109,8 +111,9 @@
}
} else {
permissionOwner = mPermissionOwnerToken;
- mPermissionOwnerToken.unlinkToDeath(this, 0);
mPermissionOwnerToken = null;
+ mTransientToken.unlinkToDeath(this, 0);
+ mTransientToken = null;
}
for (int i = 0; i < mUris.size(); ++i) {
diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 4434730..00781c5 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -201,14 +201,6 @@
inputWindowHandle.frameRight = frame.right;
inputWindowHandle.frameBottom = frame.bottom;
- if (child.isDockedInEffect()) {
- // Adjust to account for non-resizeable tasks that's scrolled
- inputWindowHandle.frameLeft += child.mXOffset;
- inputWindowHandle.frameTop += child.mYOffset;
- inputWindowHandle.frameRight += child.mXOffset;
- inputWindowHandle.frameBottom += child.mYOffset;
- }
-
if (child.mGlobalScale != 1) {
// If we are scaling the window, input coordinates need
// to be inversely scaled to map from what is on screen
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index b4387b9..7394309 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -65,9 +65,6 @@
final Rect mPreparedFrozenBounds = new Rect();
final Configuration mPreparedFrozenMergedConfig = new Configuration();
- private Rect mPreScrollBounds = new Rect();
- private boolean mScrollValid;
-
// Bounds used to calculate the insets.
private final Rect mTempInsetBounds = new Rect();
@@ -95,12 +92,16 @@
private boolean mHomeTask;
+ // Whether this task is an on-top launcher task, which is determined by the root activity.
+ private boolean mIsOnTopLauncher;
+
Task(int taskId, TaskStack stack, int userId, WindowManagerService service, Rect bounds,
- Configuration config) {
+ Configuration config, boolean isOnTopLauncher) {
mTaskId = taskId;
mStack = stack;
mUserId = userId;
mService = service;
+ mIsOnTopLauncher = isOnTopLauncher;
setBounds(bounds, config);
}
@@ -234,22 +235,19 @@
// Can't set to fullscreen if we don't have a display to get bounds from...
return BOUNDS_CHANGE_NONE;
}
- if (mPreScrollBounds.equals(bounds) && oldFullscreen == mFullscreen && mRotation == rotation) {
+ if (mBounds.equals(bounds) && oldFullscreen == mFullscreen && mRotation == rotation) {
return BOUNDS_CHANGE_NONE;
}
int boundsChange = BOUNDS_CHANGE_NONE;
- if (mPreScrollBounds.left != bounds.left || mPreScrollBounds.top != bounds.top) {
+ if (mBounds.left != bounds.left || mBounds.top != bounds.top) {
boundsChange |= BOUNDS_CHANGE_POSITION;
}
- if (mPreScrollBounds.width() != bounds.width() || mPreScrollBounds.height() != bounds.height()) {
+ if (mBounds.width() != bounds.width() || mBounds.height() != bounds.height()) {
boundsChange |= BOUNDS_CHANGE_SIZE;
}
-
- mPreScrollBounds.set(bounds);
-
- resetScrollLocked();
+ mBounds.set(bounds);
mRotation = rotation;
if (displayContent != null) {
@@ -288,6 +286,10 @@
&& (ActivityInfo.isResizeableMode(mResizeMode) || mService.mForceResizableTasks);
}
+ boolean isOnTopLauncher() {
+ return mIsOnTopLauncher;
+ }
+
boolean cropWindowsToStackBounds() {
return !mHomeTask && (isResizeable() || mResizeMode == RESIZE_MODE_CROP_WINDOWS);
}
@@ -352,67 +354,6 @@
resizeLocked(mTmpRect2, mOverrideConfig, false /* forced */);
}
- void resetScrollLocked() {
- if (mScrollValid) {
- mScrollValid = false;
- applyScrollToAllWindows(0, 0);
- }
- mBounds.set(mPreScrollBounds);
- }
-
- void applyScrollToAllWindows(final int xOffset, final int yOffset) {
- for (int activityNdx = mAppTokens.size() - 1; activityNdx >= 0; --activityNdx) {
- final ArrayList<WindowState> windows = mAppTokens.get(activityNdx).allAppWindows;
- for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
- final WindowState win = windows.get(winNdx);
- win.mXOffset = xOffset;
- win.mYOffset = yOffset;
- }
- }
- }
-
- void applyScrollToWindowIfNeeded(final WindowState win) {
- if (mScrollValid) {
- win.mXOffset = mBounds.left;
- win.mYOffset = mBounds.top;
- }
- }
-
- boolean scrollLocked(Rect bounds) {
- // shift the task bound if it doesn't fully cover the stack area
- mStack.getDimBounds(mTmpRect);
- if (mService.mCurConfiguration.orientation == ORIENTATION_LANDSCAPE) {
- if (bounds.left > mTmpRect.left) {
- bounds.left = mTmpRect.left;
- bounds.right = mTmpRect.left + mBounds.width();
- } else if (bounds.right < mTmpRect.right) {
- bounds.left = mTmpRect.right - mBounds.width();
- bounds.right = mTmpRect.right;
- }
- } else {
- if (bounds.top > mTmpRect.top) {
- bounds.top = mTmpRect.top;
- bounds.bottom = mTmpRect.top + mBounds.height();
- } else if (bounds.bottom < mTmpRect.bottom) {
- bounds.top = mTmpRect.bottom - mBounds.height();
- bounds.bottom = mTmpRect.bottom;
- }
- }
-
- // We can stop here if we're already scrolling and the scrolled bounds not changed.
- if (mScrollValid && bounds.equals(mBounds)) {
- return false;
- }
-
- // Normal setBounds() does not allow non-null bounds for fullscreen apps.
- // We only change bounds for the scrolling case without change it size,
- // on resizing path we should still want the validation.
- mBounds.set(bounds);
- mScrollValid = true;
- applyScrollToAllWindows(bounds.left, bounds.top);
- return true;
- }
-
/** Return true if the current bound can get outputted to the rest of the system as-is. */
private boolean useCurrentBounds() {
final DisplayContent displayContent = mStack.getDisplayContent();
@@ -583,11 +524,11 @@
}
// Device rotation changed.
- // - Reset the bounds to the pre-scroll bounds as whatever scrolling was done is no longer
- // valid.
+ // - We don't want the task to move around on the screen when this happens, so update the
+ // task bounds so it stays in the same place.
// - Rotate the bounds and notify activity manager if the task can be resized independently
- // from its stack. The stack will take care of task rotation for the other case.
- mTmpRect2.set(mPreScrollBounds);
+ // from its stack. The stack will take care of task rotation for the other case.
+ mTmpRect2.set(mBounds);
if (!StackId.isTaskResizeAllowed(mStack.mStackId)) {
setBounds(mTmpRect2, mOverrideConfig);
@@ -600,7 +541,7 @@
// call. We do this to prevent a deadlock between window manager lock and activity
// manager lock been held.
mService.mH.obtainMessage(RESIZE_TASK, mTaskId,
- RESIZE_MODE_SYSTEM_SCREEN_ROTATION, mPreScrollBounds).sendToTarget();
+ RESIZE_MODE_SYSTEM_SCREEN_ROTATION, mBounds).sendToTarget();
}
}
@@ -708,36 +649,14 @@
return mStack != null && mStack.mStackId == FREEFORM_WORKSPACE_STACK_ID;
}
- boolean inDockedWorkspace() {
- return mStack != null && mStack.mStackId == DOCKED_STACK_ID;
- }
-
boolean inPinnedWorkspace() {
return mStack != null && mStack.mStackId == PINNED_STACK_ID;
}
- boolean isResizeableByDockedStack() {
- final DisplayContent displayContent = getDisplayContent();
- return displayContent != null && displayContent.getDockedStackLocked() != null
- && mStack != null && StackId.isTaskResizeableByDockedStack(mStack.mStackId);
- }
-
boolean isFloating() {
return StackId.tasksAreFloating(mStack.mStackId);
}
- /**
- * Whether the task should be treated as if it's docked. Returns true if the task
- * is currently in docked workspace, or it's side-by-side to a docked task.
- */
- boolean isDockedInEffect() {
- return inDockedWorkspace() || isResizeableByDockedStack();
- }
-
- boolean isTwoFingerScrollMode() {
- return inCropWindowsResizeMode() && isDockedInEffect();
- }
-
WindowState getTopVisibleAppMainWindow() {
final AppWindowToken token = getTopVisibleAppToken();
return token != null ? token.findMainWindow() : null;
diff --git a/services/core/java/com/android/server/wm/TaskPositioner.java b/services/core/java/com/android/server/wm/TaskPositioner.java
index 80f73dc..5c321a1 100644
--- a/services/core/java/com/android/server/wm/TaskPositioner.java
+++ b/services/core/java/com/android/server/wm/TaskPositioner.java
@@ -345,20 +345,12 @@
mStartDragX = startX;
mStartDragY = startY;
- if (mTask.isDockedInEffect()) {
- // If this is a docked task or if task size is affected by docked stack changing size,
- // we can only be here if the task is not resizeable and we're handling a two-finger
- // scrolling. Use the original task bounds to position the task, the dim bounds
- // is cropped and doesn't move.
- mTask.getBounds(mTmpRect);
- } else {
- // Use the dim bounds, not the original task bounds. The cursor
- // movement should be calculated relative to the visible bounds.
- // Also, use the dim bounds of the task which accounts for
- // multiple app windows. Don't use any bounds from win itself as it
- // may not be the same size as the task.
- mTask.getDimBounds(mTmpRect);
- }
+ // Use the dim bounds, not the original task bounds. The cursor
+ // movement should be calculated relative to the visible bounds.
+ // Also, use the dim bounds of the task which accounts for
+ // multiple app windows. Don't use any bounds from win itself as it
+ // may not be the same size as the task.
+ mTask.getDimBounds(mTmpRect);
if (resize) {
if (startX < mTmpRect.left) {
@@ -422,52 +414,37 @@
// This is a moving or scrolling operation.
mTask.mStack.getDimBounds(mTmpRect);
- boolean dragEnded = false;
int nX = (int) x;
int nY = (int) y;
if (!mTmpRect.contains(nX, nY)) {
- if (mTask.isDockedInEffect()) {
- // We end the scrolling operation if position is outside the stack bounds.
- dragEnded = true;
- } else {
- // For a moving operation we allow the pointer to go out of the stack bounds, but
- // use the clamped pointer position for the drag bounds computation.
- nX = Math.min(Math.max(nX, mTmpRect.left), mTmpRect.right);
- nY = Math.min(Math.max(nY, mTmpRect.top), mTmpRect.bottom);
- }
+ // For a moving operation we allow the pointer to go out of the stack bounds, but
+ // use the clamped pointer position for the drag bounds computation.
+ nX = Math.min(Math.max(nX, mTmpRect.left), mTmpRect.right);
+ nY = Math.min(Math.max(nY, mTmpRect.top), mTmpRect.bottom);
}
updateWindowDragBounds(nX, nY, mTmpRect);
updateDimLayerVisibility(nX);
- return dragEnded;
+ return false;
}
private void updateWindowDragBounds(int x, int y, Rect stackBounds) {
final int offsetX = Math.round(x - mStartDragX);
final int offsetY = Math.round(y - mStartDragY);
mWindowDragBounds.set(mWindowOriginalBounds);
- if (mTask.isDockedInEffect()) {
- // Offset the bounds without clamp, the bounds will be shifted later
- // by window manager before applying the scrolling.
- if (mService.mCurConfiguration.orientation == ORIENTATION_LANDSCAPE) {
- mWindowDragBounds.offset(offsetX, 0);
- } else {
- mWindowDragBounds.offset(0, offsetY);
- }
- } else {
- // Horizontally, at least mMinVisibleWidth pixels of the window should remain visible.
- final int maxLeft = stackBounds.right - mMinVisibleWidth;
- final int minLeft = stackBounds.left + mMinVisibleWidth - mWindowOriginalBounds.width();
+ // Horizontally, at least mMinVisibleWidth pixels of the window should remain visible.
+ final int maxLeft = stackBounds.right - mMinVisibleWidth;
+ final int minLeft = stackBounds.left + mMinVisibleWidth - mWindowOriginalBounds.width();
- // Vertically, the top mMinVisibleHeight of the window should remain visible.
- // (This assumes that the window caption bar is at the top of the window).
- final int minTop = stackBounds.top;
- final int maxTop = stackBounds.bottom - mMinVisibleHeight;
+ // Vertically, the top mMinVisibleHeight of the window should remain visible.
+ // (This assumes that the window caption bar is at the top of the window).
+ final int minTop = stackBounds.top;
+ final int maxTop = stackBounds.bottom - mMinVisibleHeight;
- mWindowDragBounds.offsetTo(
- Math.min(Math.max(mWindowOriginalBounds.left + offsetX, minLeft), maxLeft),
- Math.min(Math.max(mWindowOriginalBounds.top + offsetY, minTop), maxTop));
- }
+ mWindowDragBounds.offsetTo(
+ Math.min(Math.max(mWindowOriginalBounds.left + offsetX, minLeft), maxLeft),
+ Math.min(Math.max(mWindowOriginalBounds.top + offsetY, minTop), maxTop));
+
if (DEBUG_TASK_POSITIONING) Slog.d(TAG,
"updateWindowDragBounds: " + mWindowDragBounds);
}
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 8be5b19..b137840 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -182,21 +182,9 @@
Configuration config = configs.get(task.mTaskId);
if (config != null) {
Rect bounds = taskBounds.get(task.mTaskId);
- if (task.isTwoFingerScrollMode()) {
- // This is a non-resizeable task that's docked (or side-by-side to the docked
- // stack). It might have been scrolled previously, and after the stack resizing,
- // it might no longer fully cover the stack area.
- // Save the old bounds and re-apply the scroll. This adjusts the bounds to
- // fit the new stack bounds.
- task.resizeLocked(bounds, config, false /* forced */);
- task.getBounds(mTmpRect);
- task.scrollLocked(mTmpRect);
- } else {
- task.resizeLocked(bounds, config, false /* forced */);
- task.setTempInsetBounds(
- taskTempInsetBounds != null ? taskTempInsetBounds.get(task.mTaskId)
- : null);
- }
+ task.resizeLocked(bounds, config, false /* forced */);
+ task.setTempInsetBounds(taskTempInsetBounds != null ?
+ taskTempInsetBounds.get(task.mTaskId) : null);
} else {
Slog.wtf(TAG_WM, "No config for task: " + task + ", is there a mismatch with AM?");
}
@@ -250,19 +238,13 @@
if (mFullscreen) {
return;
}
+
+ final boolean alignBottom = mAdjustedForIme && getDockSide() == DOCKED_TOP;
+
// Update bounds of containing tasks.
for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) {
final Task task = mTasks.get(taskNdx);
- if (task.isTwoFingerScrollMode()) {
- // If we're scrolling we don't care about your bounds or configs,
- // they should be null as if we were in fullscreen.
- task.resizeLocked(null, null, false /* forced */);
- task.getBounds(mTmpRect2);
- task.scrollLocked(mTmpRect2);
- } else {
- final boolean alignBottom = mAdjustedForIme && getDockSide() == DOCKED_TOP;
- task.alignToAdjustedBounds(adjustedBounds, tempInsetBounds, alignBottom);
- }
+ task.alignToAdjustedBounds(adjustedBounds, tempInsetBounds, alignBottom);
}
}
@@ -542,11 +524,6 @@
if (DEBUG_TASK_MOVEMENT) Slog.d(TAG_WM,
"positionTask: task=" + task + " position=" + position);
mTasks.add(position, task);
-
- // If we are moving the task across stacks, the scroll is no longer valid.
- if (task.mStack != this) {
- task.resetScrollLocked();
- }
task.mStack = this;
task.updateDisplayInfo(mDisplayContent);
boolean toTop = position == mTasks.size() - 1;
diff --git a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
index 73ce0f2..0310b97 100644
--- a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
@@ -19,7 +19,6 @@
import android.graphics.Rect;
import android.graphics.Region;
import android.hardware.input.InputManager;
-import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.WindowManagerPolicy.PointerEventListener;
@@ -37,10 +36,6 @@
private final WindowManagerService mService;
private final DisplayContent mDisplayContent;
private final Rect mTmpRect = new Rect();
- private final Region mNonResizeableRegion = new Region();
- private boolean mTwoFingerScrolling;
- private boolean mInGestureDetection;
- private GestureDetector mGestureDetector;
private int mPointerIconType = TYPE_NOT_SPECIFIED;
public TaskTapPointerEventListener(WindowManagerService service,
@@ -49,18 +44,8 @@
mDisplayContent = displayContent;
}
- // initialize the object, note this must be done outside WindowManagerService
- // ctor, otherwise it may cause recursion as some code in GestureDetector ctor
- // depends on WMS being already created.
- void init() {
- mGestureDetector = new GestureDetector(
- mService.mContext, new TwoFingerScrollListener(), mService.mH);
- }
-
@Override
public void onPointerEvent(MotionEvent motionEvent) {
- doGestureDetection(motionEvent);
-
final int action = motionEvent.getAction();
switch (action & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: {
@@ -73,15 +58,8 @@
x, y, mDisplayContent).sendToTarget();
}
}
- break;
}
-
- case MotionEvent.ACTION_MOVE: {
- if (motionEvent.getPointerCount() != 2) {
- stopTwoFingerScroll();
- }
- break;
- }
+ break;
case MotionEvent.ACTION_HOVER_MOVE: {
final int x = (int) motionEvent.getX();
@@ -116,76 +94,14 @@
InputManager.getInstance().setPointerIconType(mPointerIconType);
}
}
- } break;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_POINTER_UP: {
- stopTwoFingerScroll();
- break;
}
+ break;
}
}
- private void doGestureDetection(MotionEvent motionEvent) {
- if (mGestureDetector == null || mNonResizeableRegion.isEmpty()) {
- return;
- }
- final int action = motionEvent.getAction() & MotionEvent.ACTION_MASK;
- final int x = (int) motionEvent.getX();
- final int y = (int) motionEvent.getY();
- final boolean isTouchInside = mNonResizeableRegion.contains(x, y);
- if (mInGestureDetection || action == MotionEvent.ACTION_DOWN && isTouchInside) {
- // If we receive the following actions, or the pointer goes out of the area
- // we're interested in, stop detecting and cancel the current detection.
- mInGestureDetection = isTouchInside
- && action != MotionEvent.ACTION_UP
- && action != MotionEvent.ACTION_POINTER_UP
- && action != MotionEvent.ACTION_CANCEL;
- if (mInGestureDetection) {
- mGestureDetector.onTouchEvent(motionEvent);
- } else {
- MotionEvent cancelEvent = motionEvent.copy();
- cancelEvent.cancel();
- mGestureDetector.onTouchEvent(cancelEvent);
- stopTwoFingerScroll();
- }
- }
- }
-
- private void onTwoFingerScroll(MotionEvent e) {
- final int x = (int)e.getX(0);
- final int y = (int)e.getY(0);
- if (!mTwoFingerScrolling) {
- mTwoFingerScrolling = true;
- mService.mH.obtainMessage(
- H.TWO_FINGER_SCROLL_START, x, y, mDisplayContent).sendToTarget();
- }
- }
-
- private void stopTwoFingerScroll() {
- if (mTwoFingerScrolling) {
- mTwoFingerScrolling = false;
- mService.mH.obtainMessage(H.FINISH_TASK_POSITIONING).sendToTarget();
- }
- }
-
- private final class TwoFingerScrollListener extends GestureDetector.SimpleOnGestureListener {
- @Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2,
- float distanceX, float distanceY) {
- if (e2.getPointerCount() == 2) {
- onTwoFingerScroll(e2);
- return true;
- }
- stopTwoFingerScroll();
- return false;
- }
- }
-
- void setTouchExcludeRegion(Region newRegion, Region nonResizeableRegion) {
+ void setTouchExcludeRegion(Region newRegion) {
synchronized (this) {
mTouchExcludeRegion.set(newRegion);
- mNonResizeableRegion.set(nonResizeableRegion);
}
}
}
diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index 88028be..7b6f9e3 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -246,7 +246,10 @@
boolean updateWallpaperOffset(WindowState wallpaperWin, int dw, int dh, boolean sync) {
boolean rawChanged = false;
- float wpx = mLastWallpaperX >= 0 ? mLastWallpaperX : 0.5f;
+ // Set the default wallpaper x-offset to either edge of the screen (depending on RTL), to
+ // match the behavior of most Launchers
+ float defaultWallpaperX = wallpaperWin.isRtl() ? 1f : 0f;
+ float wpx = mLastWallpaperX >= 0 ? mLastWallpaperX : defaultWallpaperX;
float wpxs = mLastWallpaperXStep >= 0 ? mLastWallpaperXStep : -1.0f;
int availw = wallpaperWin.mFrame.right - wallpaperWin.mFrame.left - dw;
int offset = availw > 0 ? -(int)(availw * wpx + .5f) : 0;
@@ -479,6 +482,8 @@
boolean resetTopWallpaper = false;
boolean inFreeformSpace = false;
boolean replacing = false;
+ boolean keyguardGoingAwayWithWallpaper = false;
+
for (int i = windows.size() - 1; i >= 0; i--) {
w = windows.get(i);
if ((w.mAttrs.type == TYPE_WALLPAPER)) {
@@ -506,13 +511,11 @@
inFreeformSpace = stack != null && stack.mStackId == FREEFORM_WORKSPACE_STACK_ID;
}
- replacing = replacing || w.mWillReplaceWindow;
+ replacing |= w.mWillReplaceWindow;
+ keyguardGoingAwayWithWallpaper |= (w.mAppToken != null
+ && w.mWinAnimator.mKeyguardGoingAwayWithWallpaper);
- // If the app is executing an animation because the keyguard is going away (and the
- // keyguard was showing the wallpaper) keep the wallpaper during the animation so it
- // doesn't flicker out.
- final boolean hasWallpaper = (w.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0
- || (w.mAppToken != null && w.mWinAnimator.mKeyguardGoingAwayWithWallpaper);
+ final boolean hasWallpaper = (w.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0;
if (hasWallpaper && w.isOnScreen() && (mWallpaperTarget == w || w.isDrawFinishedLw())) {
if (DEBUG_WALLPAPER) Slog.v(TAG, "Found wallpaper target: #" + i + "=" + w);
result.setWallpaperTarget(w, i);
@@ -529,18 +532,26 @@
}
}
- if (result.wallpaperTarget == null && windowDetachedI >= 0) {
+ if (result.wallpaperTarget != null) {
+ return;
+ }
+
+ if (windowDetachedI >= 0) {
if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG,
"Found animating detached wallpaper activity: #" + windowDetachedI + "=" + w);
result.setWallpaperTarget(w, windowDetachedI);
- }
- if (result.wallpaperTarget == null
- && (inFreeformSpace || (replacing && mWallpaperTarget != null))) {
+ } else if (inFreeformSpace || (replacing && mWallpaperTarget != null)) {
// In freeform mode we set the wallpaper as its own target, so we don't need an
// additional window to make it visible. When we are replacing a window and there was
// wallpaper before replacement, we want to keep the window until the new windows fully
// appear and can determine the visibility, to avoid flickering.
result.setWallpaperTarget(result.topWallpaper, result.topWallpaperIndex);
+
+ } else if (keyguardGoingAwayWithWallpaper) {
+ // If the app is executing an animation because the keyguard is going away (and the
+ // keyguard was showing the wallpaper) keep the wallpaper during the animation so it
+ // doesn't flicker out by having it be its own target.
+ result.setWallpaperTarget(result.topWallpaper, result.topWallpaperIndex);
}
}
@@ -579,18 +590,9 @@
"Animating wallpapers: old#" + oldI + "=" + oldW + "; new#"
+ wallpaperTargetIndex + "=" + wallpaperTarget);
- // Set the new target correctly.
- if (wallpaperTarget.mAppToken != null
- && wallpaperTarget.mAppToken.hiddenRequested) {
- if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG,
- "Old wallpaper still the target.");
- mWallpaperTarget = oldW;
- wallpaperTarget = oldW;
- wallpaperTargetIndex = oldI;
- }
- // Now set the upper and lower wallpaper targets correctly,
+ // Set the upper and lower wallpaper targets correctly,
// and make sure that we are positioning the wallpaper below the lower.
- else if (wallpaperTargetIndex > oldI) {
+ if (wallpaperTargetIndex > oldI) {
// The new target is on top of the old one.
if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG,
"Found target above old target.");
@@ -605,6 +607,16 @@
mUpperWallpaperTarget = oldW;
mLowerWallpaperTarget = wallpaperTarget;
}
+
+ // If the new target is going hidden, set it back to the old target.
+ if (wallpaperTarget.mAppToken != null
+ && wallpaperTarget.mAppToken.hiddenRequested) {
+ if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG,
+ "Old wallpaper still the target.");
+ mWallpaperTarget = oldW;
+ wallpaperTarget = oldW;
+ wallpaperTargetIndex = oldI;
+ }
}
}
}
@@ -651,12 +663,13 @@
// AND any starting window associated with it, AND below the
// maximum layer the policy allows for wallpapers.
while (wallpaperTargetIndex > 0) {
- WindowState wb = windows.get(wallpaperTargetIndex - 1);
- if (wb.mBaseLayer < maxLayer &&
- wb.mAttachedWindow != wallpaperTarget &&
- (wallpaperTarget.mAttachedWindow == null ||
- wb.mAttachedWindow != wallpaperTarget.mAttachedWindow) &&
- (wb.mAttrs.type != TYPE_APPLICATION_STARTING
+ final WindowState wb = windows.get(wallpaperTargetIndex - 1);
+ final WindowState wbParentWindow = wb.getParentWindow();
+ final WindowState wallpaperParentWindow = wallpaperTarget.getParentWindow();
+ if (wb.mBaseLayer < maxLayer
+ && wbParentWindow != wallpaperTarget
+ && (wallpaperParentWindow == null || wbParentWindow != wallpaperParentWindow)
+ && (wb.mAttrs.type != TYPE_APPLICATION_STARTING
|| wallpaperTarget.mToken == null
|| wb.mToken != wallpaperTarget.mToken)) {
// This window is not related to the previous one in any
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 55ade2e..a7a7a39 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -18,7 +18,6 @@
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
-import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SYSTEM_ERROR;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
@@ -353,7 +352,7 @@
+ " hasSurface=" + win.mHasSurface
+ " policyVis=" + win.mPolicyVisibility
+ " destroying=" + win.mDestroying
- + " attHidden=" + win.mAttachedHidden
+ + " parentHidden=" + win.isParentWindowHidden()
+ " vis=" + win.mViewVisibility
+ " hidden=" + win.mRootToken.hidden
+ " anim=" + win.mWinAnimator.mAnimation);
@@ -370,7 +369,7 @@
&& !mPostKeyguardExitAnimation.hasEnded()
&& !winAnimator.mKeyguardGoingAwayAnimation
&& win.hasDrawnLw()
- && win.mAttachedWindow == null
+ && !win.isChildWindow()
&& !win.mIsImWindow
&& displayId == Display.DEFAULT_DISPLAY;
@@ -388,7 +387,7 @@
if (DEBUG_KEYGUARD || DEBUG_VISIBILITY) Slog.v(TAG,
"Now policy shown: " + win);
if ((mBulkUpdateParams & SET_FORCE_HIDING_CHANGED) != 0
- && win.mAttachedWindow == null) {
+ && !win.isChildWindow()) {
if (unForceHiding == null) {
unForceHiding = new ArrayList<>();
}
@@ -450,7 +449,7 @@
final AppWindowToken atoken = win.mAppToken;
if (winAnimator.mDrawState == READY_TO_SHOW) {
if (atoken == null || atoken.allDrawn) {
- if (winAnimator.performShowLocked()) {
+ if (win.performShowLocked()) {
setPendingLayoutChanges(displayId,
WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM);
if (DEBUG_LAYOUT_REPEATS) {
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
new file mode 100644
index 0000000..8cf89ec
--- /dev/null
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.wm;
+
+import android.annotation.CallSuper;
+
+import java.util.Comparator;
+import java.util.LinkedList;
+
+/**
+ * Defines common functionality for classes that can hold windows directly or through their
+ * children.
+ * The test class is {@link WindowContainerTests} which must be kept up-to-date and ran anytime
+ * changes are made to this class.
+ */
+class WindowContainer {
+
+ // The parent of this window container.
+ private WindowContainer mParent = null;
+
+ // List of children for this window container. List is in z-order as the children appear on
+ // screen with the top-most window container at the tail of the list.
+ protected final LinkedList<WindowContainer> mChildren = new LinkedList();
+
+ protected WindowContainer getParent() {
+ return mParent;
+ }
+
+ /**
+ * Adds the input window container has a child of this container in order based on the input
+ * comparator.
+ * @param child The window container to add as a child of this window container.
+ * @param comparator Comparator to use in determining the position the child should be added to.
+ * If null, the child will be added to the top.
+ */
+ @CallSuper
+ protected void addChild(WindowContainer child, Comparator<WindowContainer> comparator) {
+ child.mParent = this;
+
+ if (mChildren.isEmpty() || comparator == null) {
+ mChildren.add(child);
+ return;
+ }
+
+ final int count = mChildren.size();
+ for (int i = 0; i < count; i++) {
+ if (comparator.compare(child, mChildren.get(i)) < 0) {
+ mChildren.add(i, child);
+ return;
+ }
+ }
+
+ mChildren.add(child);
+ }
+
+ /** Removes this window container and its children */
+ @CallSuper
+ void remove() {
+ while (!mChildren.isEmpty()) {
+ final WindowContainer child = mChildren.removeLast();
+ child.remove();
+ }
+
+ if (mParent != null) {
+ mParent.mChildren.remove(this);
+ mParent = null;
+ }
+ }
+
+ /** Returns true if this window container has the input child. */
+ boolean hasChild(WindowContainer child) {
+ for (int i = mChildren.size() - 1; i >= 0; --i) {
+ final WindowContainer current = mChildren.get(i);
+ if (current == child || current.hasChild(child)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java
index 072e10f..68c2be9 100644
--- a/services/core/java/com/android/server/wm/WindowLayersController.java
+++ b/services/core/java/com/android/server/wm/WindowLayersController.java
@@ -61,6 +61,7 @@
private ArrayDeque<WindowState> mPinnedWindows = new ArrayDeque<>();
private ArrayDeque<WindowState> mDockedWindows = new ArrayDeque<>();
private ArrayDeque<WindowState> mInputMethodWindows = new ArrayDeque<>();
+ private ArrayDeque<WindowState> mOnTopLauncherWindows = new ArrayDeque<>();
private WindowState mDockDivider = null;
private ArrayDeque<WindowState> mReplacingWindows = new ArrayDeque<>();
@@ -119,18 +120,13 @@
mInputMethodAnimLayerAdjustment = adj;
final WindowState imw = mService.mInputMethodWindow;
if (imw != null) {
- imw.mWinAnimator.mAnimLayer = imw.mLayer + adj;
- if (DEBUG_LAYERS) Slog.v(TAG_WM, "IM win " + imw
- + " anim layer: " + imw.mWinAnimator.mAnimLayer);
- for (int i = imw.mChildWindows.size() - 1; i >= 0; i--) {
- final WindowState childWindow = imw.mChildWindows.get(i);
- childWindow.mWinAnimator.mAnimLayer = childWindow.mLayer + adj;
- if (DEBUG_LAYERS) Slog.v(TAG_WM, "IM win " + childWindow
- + " anim layer: " + childWindow.mWinAnimator.mAnimLayer);
- }
+ imw.adjustAnimLayer(adj);
}
for (int i = mService.mInputMethodDialogs.size() - 1; i >= 0; i--) {
final WindowState dialog = mService.mInputMethodDialogs.get(i);
+ // TODO: This and other places setting mAnimLayer can probably use WS.adjustAnimLayer,
+ // but need to make sure we are not setting things twice for child windows that are
+ // already in the list.
dialog.mWinAnimator.mAnimLayer = dialog.mLayer + adj;
if (DEBUG_LAYERS) Slog.v(TAG_WM, "IM win " + imw
+ " anim layer: " + dialog.mWinAnimator.mAnimLayer);
@@ -170,6 +166,7 @@
mPinnedWindows.clear();
mInputMethodWindows.clear();
mDockedWindows.clear();
+ mOnTopLauncherWindows.clear();
mReplacingWindows.clear();
mDockDivider = null;
}
@@ -186,7 +183,14 @@
mInputMethodWindows.add(w);
return;
}
- final TaskStack stack = w.getStack();
+ final Task task = w.getTask();
+ if (task == null) {
+ return;
+ }
+ if (task.isOnTopLauncher()) {
+ mOnTopLauncherWindows.add(w);
+ }
+ final TaskStack stack = task.mStack;
if (stack == null) {
return;
}
@@ -207,7 +211,13 @@
layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer);
- if (mDockDivider != null && mDockDivider.isVisibleLw()) {
+ boolean onTopLauncherVisible = !mOnTopLauncherWindows.isEmpty();
+ while (!mOnTopLauncherWindows.isEmpty()) {
+ layer = assignAndIncreaseLayerIfNeeded(mOnTopLauncherWindows.remove(), layer);
+ }
+
+ // Make sure IME windows are showing above the dock divider and on-top launcher windows.
+ if ((mDockDivider != null && mDockDivider.isVisibleLw()) || onTopLauncherVisible) {
while (!mInputMethodWindows.isEmpty()) {
final WindowState w = mInputMethodWindows.remove();
// Only ever move IME windows up, else we brake IME for windows above the divider.
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index f5866fd..0493084 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -388,7 +388,7 @@
final boolean mLimitedAlphaCompositing;
- final WindowManagerPolicy mPolicy = new PhoneWindowManager();
+ final WindowManagerPolicy mPolicy;
final IActivityManager mActivityManager;
final ActivityManagerInternal mAmInternal;
@@ -545,7 +545,7 @@
SparseArray<DisplayContent> mDisplayContents = new SparseArray<>(2);
int mRotation = 0;
- int mForcedAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+ int mLastOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
boolean mAltOrientation = false;
private boolean mKeyguardWaitingForActivityDrawn;
@@ -924,14 +924,11 @@
public static WindowManagerService main(final Context context,
final InputManagerService im,
final boolean haveInputMethods, final boolean showBootMsgs,
- final boolean onlyCore) {
+ final boolean onlyCore, WindowManagerPolicy policy) {
final WindowManagerService[] holder = new WindowManagerService[1];
- DisplayThread.getHandler().runWithScissors(new Runnable() {
- @Override
- public void run() {
- holder[0] = new WindowManagerService(context, im,
- haveInputMethods, showBootMsgs, onlyCore);
- }
+ DisplayThread.getHandler().runWithScissors(() -> {
+ holder[0] = new WindowManagerService(context, im, haveInputMethods, showBootMsgs,
+ onlyCore, policy);
}, 0);
return holder[0];
}
@@ -948,7 +945,8 @@
}
private WindowManagerService(Context context, InputManagerService inputManager,
- boolean haveInputMethods, boolean showBootMsgs, boolean onlyCore) {
+ boolean haveInputMethods, boolean showBootMsgs, boolean onlyCore,
+ WindowManagerPolicy policy) {
mContext = context;
mHaveInputMethods = haveInputMethods;
mAllowBootMessages = showBootMsgs;
@@ -971,10 +969,12 @@
mWallpaperControllerLocked = new WallpaperController(this);
mWindowPlacerLocked = new WindowSurfacePlacer(this);
mLayersController = new WindowLayersController(this);
+ mPolicy = policy;
LocalServices.addService(WindowManagerPolicy.class, mPolicy);
- mPointerEventDispatcher = new PointerEventDispatcher(mInputManager.monitorInput(TAG_WM));
+ mPointerEventDispatcher = mInputManager != null
+ ? new PointerEventDispatcher(mInputManager.monitorInput(TAG_WM)) : null;
mFxSession = new SurfaceSession();
mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
@@ -987,19 +987,18 @@
mPowerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);
- mPowerManagerInternal.registerLowPowerModeObserver(
- new PowerManagerInternal.LowPowerModeListener() {
- @Override
- public void onLowPowerModeChanged(boolean enabled) {
+
+ if (mPowerManagerInternal != null) {
+ mPowerManagerInternal.registerLowPowerModeObserver((enabled) -> {
synchronized (mWindowMap) {
if (mAnimationsDisabled != enabled && !mAllowAnimationsInLowPowerMode) {
mAnimationsDisabled = enabled;
dispatchNewAnimatorScaleLocked(null);
}
}
- }
- });
- mAnimationsDisabled = mPowerManagerInternal.getLowPowerModeEnabled();
+ });
+ mAnimationsDisabled = mPowerManagerInternal.getLowPowerModeEnabled();
+ }
mScreenFrozenLock = mPowerManager.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, "SCREEN_FROZEN");
mScreenFrozenLock.setReferenceCounted(false);
@@ -1146,14 +1145,9 @@
private int indexOfWinInWindowList(WindowState targetWin, WindowList windows) {
for (int i = windows.size() - 1; i >= 0; i--) {
final WindowState w = windows.get(i);
- if (w == targetWin) {
+ if (w == targetWin || w.hasChild(targetWin)) {
return i;
}
- if (!w.mChildWindows.isEmpty()) {
- if (indexOfWinInWindowList(targetWin, w.mChildWindows) >= 0) {
- return i;
- }
- }
}
return -1;
}
@@ -1359,18 +1353,17 @@
mWindowsChanged = true;
}
- private void addAttachedWindowToListLocked(final WindowState win, boolean addToToken) {
+ private void addChildWindowToListLocked(final WindowState win, boolean addToToken) {
final WindowToken token = win.mToken;
final DisplayContent displayContent = win.getDisplayContent();
if (displayContent == null) {
return;
}
- final WindowState attached = win.mAttachedWindow;
+ final WindowState parentWindow = win.getParentWindow();
WindowList tokenWindowList = getTokenWindowsOnDisplay(token, displayContent);
- // Figure out this window's ordering relative to the window
- // it is attached to.
+ // Figure out this window's ordering relative to the parent window.
final int NA = tokenWindowList.size();
final int sublayer = win.mSubLayer;
int largestSublayer = Integer.MIN_VALUE;
@@ -1384,19 +1377,17 @@
windowWithLargestSublayer = w;
}
if (sublayer < 0) {
- // For negative sublayers, we go below all windows
- // in the same sublayer.
+ // For negative sublayers, we go below all windows in the same sublayer.
if (wSublayer >= sublayer) {
if (addToToken) {
if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "Adding " + win + " to " + token);
token.windows.add(i, win);
}
- placeWindowBefore(wSublayer >= 0 ? attached : w, win);
+ placeWindowBefore(wSublayer >= 0 ? parentWindow : w, win);
break;
}
} else {
- // For positive sublayers, we go above all windows
- // in the same sublayer.
+ // For positive sublayers, we go above all windows in the same sublayer.
if (wSublayer > sublayer) {
if (addToToken) {
if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "Adding " + win + " to " + token);
@@ -1413,12 +1404,10 @@
token.windows.add(win);
}
if (sublayer < 0) {
- placeWindowBefore(attached, win);
+ placeWindowBefore(parentWindow, win);
} else {
- placeWindowAfter(largestSublayer >= 0
- ? windowWithLargestSublayer
- : attached,
- win);
+ placeWindowAfter(
+ largestSublayer >= 0 ? windowWithLargestSublayer : parentWindow, win);
}
}
}
@@ -1426,7 +1415,7 @@
private void addWindowToListInOrderLocked(final WindowState win, boolean addToToken) {
if (DEBUG_FOCUS) Slog.d(TAG_WM, "addWindowToListInOrderLocked: win=" + win +
" Callers=" + Debug.getCallers(4));
- if (win.mAttachedWindow == null) {
+ if (!win.isChildWindow()) {
final WindowToken token = win.mToken;
int tokenWindowsPos = 0;
if (token.appWindowToken != null) {
@@ -1439,7 +1428,7 @@
token.windows.add(tokenWindowsPos, win);
}
} else {
- addAttachedWindowToListLocked(win, addToToken);
+ addChildWindowToListLocked(win, addToToken);
}
final AppWindowToken appToken = win.mAppToken;
@@ -1464,7 +1453,7 @@
+ " viewVis=" + w.mViewVisibility
+ " policyVis=" + w.mPolicyVisibility
+ " policyVisAfterAnim=" + w.mPolicyVisibilityAfterAnim
- + " attachHid=" + w.mAttachedHidden
+ + " parentHidden=" + w.isParentWindowHidden()
+ " exiting=" + w.mAnimatingExit + " destroying=" + w.mDestroying);
if (w.mAppToken != null) {
Slog.i(TAG_WM, " mAppToken.hiddenRequested=" + w.mAppToken.hiddenRequested);
@@ -1632,7 +1621,6 @@
void addInputMethodWindowToListLocked(WindowState win) {
int pos = findDesiredInputMethodWindowIndexLocked(true);
if (pos >= 0) {
- win.mTargetAppToken = mInputMethodTarget.mAppToken;
if (DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(
TAG_WM, "Adding input method window " + win + " at " + pos);
// TODO(multidisplay): IMEs are only supported on the default display.
@@ -1641,35 +1629,10 @@
moveInputMethodDialogsLocked(pos + 1);
return;
}
- win.mTargetAppToken = null;
addWindowToListInOrderLocked(win, true);
moveInputMethodDialogsLocked(pos);
}
- private int tmpRemoveWindowLocked(int interestingPos, WindowState win) {
- WindowList windows = win.getWindowList();
- int wpos = windows.indexOf(win);
- if (wpos >= 0) {
- if (wpos < interestingPos) interestingPos--;
- if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Temp removing at " + wpos + ": " + win);
- windows.remove(wpos);
- mWindowsChanged = true;
- int NC = win.mChildWindows.size();
- while (NC > 0) {
- NC--;
- WindowState cw = win.mChildWindows.get(NC);
- int cpos = windows.indexOf(cw);
- if (cpos >= 0) {
- if (cpos < interestingPos) interestingPos--;
- if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Temp removing child at "
- + cpos + ": " + cw);
- windows.remove(cpos);
- }
- }
- }
- return interestingPos;
- }
-
private void reAddWindowToListInOrderLocked(WindowState win) {
addWindowToListInOrderLocked(win, false);
// This is a hack to get all of the child windows added as well
@@ -1681,7 +1644,7 @@
if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "ReAdd removing from " + wpos + ": " + win);
windows.remove(wpos);
mWindowsChanged = true;
- reAddWindowLocked(wpos, win);
+ win.reAddWindowLocked(wpos);
}
}
@@ -1701,7 +1664,7 @@
final int N = dialogs.size();
if (DEBUG_INPUT_METHOD) Slog.v(TAG_WM, "Removing " + N + " dialogs w/pos=" + pos);
for (int i=0; i<N; i++) {
- pos = tmpRemoveWindowLocked(pos, dialogs.get(i));
+ pos = dialogs.get(i).removeFromWindowList(pos);
}
if (DEBUG_INPUT_METHOD) {
Slog.v(TAG_WM, "Window list w/pos=" + pos);
@@ -1709,12 +1672,11 @@
}
if (pos >= 0) {
- final AppWindowToken targetAppToken = mInputMethodTarget.mAppToken;
// Skip windows owned by the input method.
if (mInputMethodWindow != null) {
while (pos < windows.size()) {
WindowState wp = windows.get(pos);
- if (wp == mInputMethodWindow || wp.mAttachedWindow == mInputMethodWindow) {
+ if (wp == mInputMethodWindow || wp.getParentWindow() == mInputMethodWindow) {
pos++;
continue;
}
@@ -1724,8 +1686,7 @@
if (DEBUG_INPUT_METHOD) Slog.v(TAG_WM, "Adding " + N + " dialogs at pos=" + pos);
for (int i=0; i<N; i++) {
WindowState win = dialogs.get(i);
- win.mTargetAppToken = targetAppToken;
- pos = reAddWindowLocked(pos, win);
+ pos = win.reAddWindowLocked(pos);
}
if (DEBUG_INPUT_METHOD) {
Slog.v(TAG_WM, "Final window list:");
@@ -1735,7 +1696,6 @@
}
for (int i=0; i<N; i++) {
WindowState win = dialogs.get(i);
- win.mTargetAppToken = null;
reAddWindowToListInOrderLocked(win);
if (DEBUG_INPUT_METHOD) {
Slog.v(TAG_WM, "No IM target, final list:");
@@ -1762,16 +1722,14 @@
// First check to see if the input method windows are already
// located here, and contiguous.
final int N = windows.size();
- WindowState firstImWin = imPos < N
- ? windows.get(imPos) : null;
+ final WindowState firstImWin = imPos < N ? windows.get(imPos) : null;
// Figure out the actual input method window that should be
// at the bottom of their stack.
- WindowState baseImWin = imWin != null
- ? imWin : mInputMethodDialogs.get(0);
- if (baseImWin.mChildWindows.size() > 0) {
- WindowState cw = baseImWin.mChildWindows.get(0);
- if (cw.mSubLayer < 0) baseImWin = cw;
+ WindowState baseImWin = imWin != null ? imWin : mInputMethodDialogs.get(0);
+ final WindowState cw = baseImWin.getBottomChild();
+ if (cw != null && cw.mSubLayer < 0) {
+ baseImWin = cw;
}
if (firstImWin == baseImWin) {
@@ -1793,11 +1751,6 @@
pos++;
}
if (pos >= N) {
- // Z order is good.
- // The IM target window may be changed, so update the mTargetAppToken.
- if (imWin != null) {
- imWin.mTargetAppToken = mInputMethodTarget.mAppToken;
- }
return false;
}
}
@@ -1807,13 +1760,12 @@
Slog.v(TAG_WM, "Moving IM from " + imPos);
logWindowList(windows, " ");
}
- imPos = tmpRemoveWindowLocked(imPos, imWin);
+ imPos = imWin.removeFromWindowList(imPos);
if (DEBUG_INPUT_METHOD) {
Slog.v(TAG_WM, "List after removing with new pos " + imPos + ":");
logWindowList(windows, " ");
}
- imWin.mTargetAppToken = mInputMethodTarget.mAppToken;
- reAddWindowLocked(imPos, imWin);
+ imWin.reAddWindowLocked(imPos);
if (DEBUG_INPUT_METHOD) {
Slog.v(TAG_WM, "List after moving IM to " + imPos + ":");
logWindowList(windows, " ");
@@ -1829,8 +1781,7 @@
if (imWin != null) {
if (DEBUG_INPUT_METHOD) Slog.v(TAG_WM, "Moving IM from " + imPos);
- tmpRemoveWindowLocked(0, imWin);
- imWin.mTargetAppToken = null;
+ imWin.removeFromWindowList(0);
reAddWindowToListInOrderLocked(imWin);
if (DEBUG_INPUT_METHOD) {
Slog.v(TAG_WM, "List with no IM target:");
@@ -1850,7 +1801,7 @@
return true;
}
- private static boolean excludeWindowTypeFromTapOutTask(int windowType) {
+ static boolean excludeWindowTypeFromTapOutTask(int windowType) {
switch (windowType) {
case TYPE_STATUS_BAR:
case TYPE_NAVIGATION_BAR:
@@ -2020,8 +1971,8 @@
addToken = true;
}
- WindowState win = new WindowState(this, session, client, token,
- attachedWindow, appOp[0], seq, attrs, viewVisibility, displayContent);
+ WindowState win = new WindowState(this, session, client, token, attachedWindow,
+ appOp[0], seq, attrs, viewVisibility, displayContent, session.mUid);
if (win.mDeathRecipient == null) {
// Client has apparently died, so there is no reason to
// continue.
@@ -2108,10 +2059,6 @@
}
}
- // If the window is being added to a task that's docked but non-resizeable,
- // we need to update this new window's scroll position when it's added.
- win.applyScrollIfNeeded();
-
// If the window is being added to a stack that's currently adjusted for IME,
// make sure to apply the same adjust to this new window.
win.applyAdjustForImeIfNeeded();
@@ -2447,7 +2394,7 @@
}
}
- removeWindowInnerLocked(win);
+ win.remove();
// Removing a visible window will effect the computed orientation
// So just update orientation if needed.
if (wasVisible && updateOrientationFromAppTokensLocked(false)) {
@@ -2457,41 +2404,12 @@
Binder.restoreCallingIdentity(origId);
}
- void removeWindowInnerLocked(WindowState win) {
- if (win.mRemoved) {
- // Nothing to do.
- if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM,
- "removeWindowInnerLocked: " + win + " Already removed...");
- return;
- }
-
- for (int i = win.mChildWindows.size() - 1; i >= 0; i--) {
- WindowState cwin = win.mChildWindows.get(i);
- Slog.w(TAG_WM, "Force-removing child win " + cwin + " from container " + win);
- removeWindowInnerLocked(cwin);
- }
-
- win.mRemoved = true;
-
- if (mInputMethodTarget == win) {
- moveInputMethodWindowsIfNeededLocked(false);
- }
-
- if (false) {
- RuntimeException e = new RuntimeException("here");
- e.fillInStackTrace();
- Slog.w(TAG_WM, "Removing window " + win, e);
- }
-
- final int type = win.mAttrs.type;
- if (excludeWindowTypeFromTapOutTask(type)) {
- final DisplayContent displaycontent = win.getDisplayContent();
- displaycontent.mTapExcludedWindows.remove(win);
- }
- mPolicy.removeWindowLw(win);
- win.removeLocked();
-
- if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "removeWindowInnerLocked: " + win);
+ /**
+ * Performs some centralized bookkeeping clean-up on the window that is being removed.
+ * NOTE: Should only be called from {@link WindowState#remove()}
+ */
+ void postWindowRemoveCleanupLocked(WindowState win) {
+ if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "postWindowRemoveCleanupLocked: " + win);
mWindowMap.remove(win.mClient.asBinder());
if (win.mAppOp != AppOpsManager.OP_NONE) {
mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage());
@@ -2544,7 +2462,7 @@
}
}
- if (type == TYPE_WALLPAPER) {
+ if (win.mAttrs.type == TYPE_WALLPAPER) {
mWallpaperControllerLocked.clearLastWallpaperTimeoutTime();
getDefaultDisplayContentLocked().pendingLayoutChanges |=
WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
@@ -2711,7 +2629,7 @@
if (win == null) {
return;
}
- if (win.mAttachedWindow == null) {
+ if (!win.isChildWindow()) {
throw new IllegalArgumentException(
"repositionChild called but window is not"
+ "attached to a parent win=" + win);
@@ -2913,9 +2831,23 @@
}
result |= RELAYOUT_RES_SURFACE_CHANGED;
}
+ final WindowSurfaceController surfaceController = winAnimator.mSurfaceController;
+ if (viewVisibility == View.VISIBLE && surfaceController != null) {
+ // We already told the client to go invisible, but the message may not be
+ // handled yet, or it might want to draw a last frame. If we already have a
+ // surface, let the client use that, but don't create new surface at this point.
+ surfaceController.getSurface(outSurface);
+ } else {
+ if (DEBUG_VISIBILITY) Slog.i(TAG_WM, "Releasing surface in: " + win);
- outSurface.release();
- if (DEBUG_VISIBILITY) Slog.i(TAG_WM, "Releasing surface in: " + win);
+ try {
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "wmReleaseOutSurface_"
+ + win.mAttrs.getTitle());
+ outSurface.release();
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
+ }
+ }
}
if (focusMayChange) {
@@ -3009,8 +2941,7 @@
if (win.mAttrs.type == TYPE_APPLICATION_STARTING) {
transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;
}
- if (win.isWinVisibleLw() && !winAnimator.isAnimationSet()
- && winAnimator.applyAnimationLocked(transit, false)) {
+ if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) {
focusMayChange = isDefaultDisplay;
win.mAnimatingExit = true;
win.mWinAnimator.mAnimating = true;
@@ -3051,6 +2982,7 @@
} else {
// For some reason there isn't a surface. Clear the
// caller's object so they see the same state.
+ Slog.w(TAG_WM, "Failed to create surface control for " + win);
outSurface.release();
}
return result;
@@ -3073,6 +3005,9 @@
if (oldVisibility == View.GONE) {
winAnimator.mEnterAnimationPending = true;
}
+
+ win.mLastVisibleLayoutRotation = mRotation;
+
winAnimator.mEnteringAnimation = true;
if ((result & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) {
win.prepareWindowToDisplayDuringRelayout(outConfig);
@@ -3097,7 +3032,7 @@
// resizing (as we only have one full-screen surface). So there is no need
// to preserve and destroy windows which are attached to another, they
// will keep their surface and its size may change over time.
- if (win.mHasSurface && win.mAttachedWindow == null) {
+ if (win.mHasSurface && !win.isChildWindow()) {
winAnimator.preserveSurfaceLocked();
result |= WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME;
}
@@ -3176,6 +3111,7 @@
// frozen, there is no reason to animate and it can cause strange
// artifacts when we unfreeze the display if some different animation
// is running.
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "WM#applyAnimationLocked");
if (okToDisplay()) {
DisplayInfo displayInfo = getDefaultDisplayInfoLocked();
final int width = displayInfo.appWidth;
@@ -3227,6 +3163,7 @@
} else {
atoken.mAppAnimator.clearAnimation();
}
+ Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
return atoken.mAppAnimator.animation != null;
}
@@ -3416,7 +3353,7 @@
}
private Task createTaskLocked(int taskId, int stackId, int userId, AppWindowToken atoken,
- Rect bounds, Configuration config) {
+ Rect bounds, Configuration config, boolean isOnTopLauncher) {
if (DEBUG_STACK) Slog.i(TAG_WM, "createTaskLocked: taskId=" + taskId + " stackId=" + stackId
+ " atoken=" + atoken + " bounds=" + bounds);
final TaskStack stack = mStackIdToStack.get(stackId);
@@ -3424,7 +3361,7 @@
throw new IllegalArgumentException("addAppToken: invalid stackId=" + stackId);
}
EventLog.writeEvent(EventLogTags.WM_TASK_CREATED, taskId, stackId);
- Task task = new Task(taskId, stack, userId, this, bounds, config);
+ Task task = new Task(taskId, stack, userId, this, bounds, config, isOnTopLauncher);
mTaskIdToTask.put(taskId, task);
stack.addTask(task, !atoken.mLaunchTaskBehind /* toTop */, atoken.showForAllUsers);
return task;
@@ -3435,7 +3372,8 @@
int requestedOrientation, boolean fullscreen, boolean showForAllUsers, int userId,
int configChanges, boolean voiceInteraction, boolean launchTaskBehind,
Rect taskBounds, Configuration config, int taskResizeMode, boolean alwaysFocusable,
- boolean homeTask, int targetSdkVersion) {
+ boolean homeTask, int targetSdkVersion, int rotationAnimationHint,
+ boolean isOnTopLauncher) {
if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
"addAppToken()")) {
throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
@@ -3473,10 +3411,12 @@
atoken.mAlwaysFocusable = alwaysFocusable;
if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "addAppToken: " + atoken
+ " to stack=" + stackId + " task=" + taskId + " at " + addPos);
+ atoken.mRotationAnimationHint = rotationAnimationHint;
Task task = mTaskIdToTask.get(taskId);
if (task == null) {
- task = createTaskLocked(taskId, stackId, userId, atoken, taskBounds, config);
+ task = createTaskLocked(taskId, stackId, userId, atoken, taskBounds, config,
+ isOnTopLauncher);
}
task.addAppToken(addPos, atoken, taskResizeMode, homeTask);
@@ -3490,7 +3430,7 @@
@Override
public void setAppTask(IBinder token, int taskId, int stackId, Rect taskBounds,
- Configuration config, int taskResizeMode, boolean homeTask) {
+ Configuration config, int taskResizeMode, boolean homeTask, boolean isOnTopLauncher) {
if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
"setAppTask()")) {
throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
@@ -3508,7 +3448,8 @@
Task newTask = mTaskIdToTask.get(taskId);
if (newTask == null) {
newTask = createTaskLocked(
- taskId, stackId, oldTask.mUserId, atoken, taskBounds, config);
+ taskId, stackId, oldTask.mUserId, atoken, taskBounds, config,
+ isOnTopLauncher);
}
newTask.addAppToken(Integer.MAX_VALUE /* at top */, atoken, taskResizeMode, homeTask);
}
@@ -3525,6 +3466,16 @@
// can re-appear and inflict its own orientation on us. Keep the
// orientation stable until this all settles down.
return mLastWindowForcedOrientation;
+ } else if (mPolicy.isKeyguardLocked()) {
+ // Use the last orientation the while the display is frozen with the
+ // keyguard locked. This could be the keyguard forced orientation or
+ // from a SHOW_WHEN_LOCKED window. We don't want to check the show when
+ // locked window directly though as things aren't stable while
+ // the display is frozen, for example the window could be momentarily unavailable
+ // due to activity relaunch.
+ if (DEBUG_ORIENTATION) Slog.v(TAG_WM, "Display is frozen while keyguard locked, "
+ + "return " + mLastOrientation);
+ return mLastOrientation;
}
} else {
// TODO(multidisplay): Change to the correct display.
@@ -3654,12 +3605,12 @@
}
}
if (DEBUG_ORIENTATION) Slog.v(TAG_WM,
- "No app is requesting an orientation, return " + mForcedAppOrientation);
+ "No app is requesting an orientation, return " + mLastOrientation);
// The next app has not been requested to be visible, so we keep the current orientation
// to prevent freezing/unfreezing the display too early unless we are in multi-window, in
// which we don't let the app customize the orientation unless it was the home task that
// is handled above.
- return inMultiWindow ? SCREEN_ORIENTATION_UNSPECIFIED : mForcedAppOrientation;
+ return inMultiWindow ? SCREEN_ORIENTATION_UNSPECIFIED : mLastOrientation;
}
@Override
@@ -3742,8 +3693,8 @@
long ident = Binder.clearCallingIdentity();
try {
int req = getOrientationLocked();
- if (req != mForcedAppOrientation) {
- mForcedAppOrientation = req;
+ if (req != mLastOrientation) {
+ mLastOrientation = req;
//send a message to Policy indicating orientation change to take
//action like disabling/enabling sensors etc.,
mPolicy.setCurrentOrientationLw(req);
@@ -4343,7 +4294,7 @@
WindowState win = wtoken.allAppWindows.get(i);
if (win == wtoken.startingWindow) {
// Starting window that's exiting will be removed when the animation
- // finishes. Mark all relevant flags for that finishExit will proceed
+ // finishes. Mark all relevant flags for that onExitAnimationDone will proceed
// all the way to actually remove it.
if (!visible && win.isVisibleNow() && wtoken.mAppAnimator.isAnimating()) {
win.mAnimatingExit = true;
@@ -4455,7 +4406,25 @@
}
@Override
- public void notifyAppStopped(IBinder token, boolean stopped) {
+ public void notifyAppResumed(IBinder token, boolean wasStopped) {
+ if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
+ "notifyAppResumed()")) {
+ throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
+ }
+
+ synchronized(mWindowMap) {
+ final AppWindowToken wtoken;
+ wtoken = findAppWindowToken(token);
+ if (wtoken == null) {
+ Slog.w(TAG_WM, "Attempted to notify resumed of non-existing app token: " + token);
+ return;
+ }
+ wtoken.notifyAppResumed(wasStopped);
+ }
+ }
+
+ @Override
+ public void notifyAppStopped(IBinder token) {
if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
"notifyAppStopped()")) {
throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
@@ -4465,10 +4434,10 @@
final AppWindowToken wtoken;
wtoken = findAppWindowToken(token);
if (wtoken == null) {
- Slog.w(TAG_WM, "Attempted to set visibility of non-existing app token: " + token);
+ Slog.w(TAG_WM, "Attempted to notify stopped of non-existing app token: " + token);
return;
}
- wtoken.notifyAppStopped(stopped);
+ wtoken.notifyAppStopped();
}
}
@@ -4831,38 +4800,6 @@
}
}
- private final int reAddWindowLocked(int index, WindowState win) {
- final WindowList windows = win.getWindowList();
- // Adding child windows relies on mChildWindows being ordered by mSubLayer.
- final int NCW = win.mChildWindows.size();
- boolean winAdded = false;
- for (int j=0; j<NCW; j++) {
- WindowState cwin = win.mChildWindows.get(j);
- if (!winAdded && cwin.mSubLayer >= 0) {
- if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Re-adding child window at "
- + index + ": " + cwin);
- win.mRebuilding = false;
- windows.add(index, win);
- index++;
- winAdded = true;
- }
- if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Re-adding window at "
- + index + ": " + cwin);
- cwin.mRebuilding = false;
- windows.add(index, cwin);
- index++;
- }
- if (!winAdded) {
- if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Re-adding window at "
- + index + ": " + win);
- win.mRebuilding = false;
- windows.add(index, win);
- index++;
- }
- mWindowsChanged = true;
- return index;
- }
-
private final int reAddAppWindowsLocked(final DisplayContent displayContent, int index,
WindowToken token) {
final int NW = token.windows.size();
@@ -4871,7 +4808,7 @@
final DisplayContent winDisplayContent = win.getDisplayContent();
if (winDisplayContent == displayContent || winDisplayContent == null) {
win.mDisplayContent = displayContent;
- index = reAddWindowLocked(index, win);
+ index = win.reAddWindowLocked(index);
}
}
return index;
@@ -5254,21 +5191,6 @@
}
}
- public void scrollTask(int taskId, Rect bounds) {
- synchronized (mWindowMap) {
- Task task = mTaskIdToTask.get(taskId);
- if (task == null) {
- throw new IllegalArgumentException("scrollTask: taskId " + taskId
- + " not found.");
- }
-
- if (task.scrollLocked(bounds)) {
- task.getDisplayContent().layoutNeeded = true;
- mInputMonitor.setUpdateInputWindowsNeededLw();
- mWindowPlacerLocked.performSurfacePlacement();
- }
- }
- }
/**
* Starts deferring layout passes. Useful when doing multiple changes but to optimize
* performance, only one layout pass should be done. This can be called multiple times, and
@@ -6156,6 +6078,21 @@
}
}
+ @Override
+ public Bitmap screenshotWallpaper() {
+ if (!checkCallingPermission(Manifest.permission.READ_FRAME_BUFFER,
+ "screenshotWallpaper()")) {
+ throw new SecurityException("Requires READ_FRAME_BUFFER permission");
+ }
+ try {
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "screenshotWallpaper");
+ return screenshotApplicationsInner(null, Display.DEFAULT_DISPLAY, -1, -1, true, 1f,
+ Bitmap.Config.ARGB_8888, true);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
+ }
+ }
+
/**
* Takes a snapshot of the screen. In landscape mode this grabs the whole screen.
* In portrait mode, it grabs the upper region of the screen based on the vertical dimension
@@ -6172,7 +6109,7 @@
@Override
public void run() {
Bitmap bm = screenshotApplicationsInner(null, Display.DEFAULT_DISPLAY, -1, -1,
- true, 1f, Bitmap.Config.ARGB_8888);
+ true, 1f, Bitmap.Config.ARGB_8888, false);
try {
receiver.send(bm);
} catch (RemoteException e) {
@@ -6202,14 +6139,27 @@
try {
Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "screenshotApplications");
return screenshotApplicationsInner(appToken, displayId, width, height, false,
- frameScale, Bitmap.Config.RGB_565);
+ frameScale, Bitmap.Config.RGB_565, false);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
}
}
+ /**
+ * Takes a snapshot of the screen. In landscape mode this grabs the whole screen.
+ * In portrait mode, it grabs the full screenshot.
+ *
+ * @param displayId the Display to take a screenshot of.
+ * @param width the width of the target bitmap
+ * @param height the height of the target bitmap
+ * @param includeFullDisplay true if the screen should not be cropped before capture
+ * @param frameScale the scale to apply to the frame, only used when width = -1 and height = -1
+ * @param config of the output bitmap
+ * @param wallpaperOnly true if only the wallpaper layer should be included in the screenshot
+ */
Bitmap screenshotApplicationsInner(IBinder appToken, int displayId, int width, int height,
- boolean includeFullDisplay, float frameScale, Bitmap.Config config) {
+ boolean includeFullDisplay, float frameScale, Bitmap.Config config,
+ boolean wallpaperOnly) {
final DisplayContent displayContent;
synchronized(mWindowMap) {
displayContent = getDisplayContentLocked(displayId);
@@ -6236,7 +6186,7 @@
boolean screenshotReady;
int minLayer;
- if (appToken == null) {
+ if (appToken == null && !wallpaperOnly) {
screenshotReady = true;
minLayer = 0;
} else {
@@ -6276,11 +6226,20 @@
if (ws.mLayer >= aboveAppLayer) {
continue;
}
+ if (wallpaperOnly && !ws.mIsWallpaper) {
+ continue;
+ }
if (ws.mIsImWindow) {
if (!includeImeInScreenshot) {
continue;
}
} else if (ws.mIsWallpaper) {
+ // If this is the wallpaper layer and we're only looking for the wallpaper layer
+ // then the target window state is this one.
+ if (wallpaperOnly) {
+ appWin = ws;
+ }
+
if (appWin == null) {
// We have not ran across the target window yet, so it is probably
// behind the wallpaper. This can happen when the keyguard is up and
@@ -6328,8 +6287,10 @@
}
}
- if (ws.mAppToken != null && ws.mAppToken.token == appToken &&
- ws.isDisplayedLw() && winAnim.getShown()) {
+ final boolean foundTargetWs =
+ (ws.mAppToken != null && ws.mAppToken.token == appToken)
+ || (appWin != null && wallpaperOnly);
+ if (foundTargetWs && ws.isDisplayedLw() && winAnim.getShown()) {
screenshotReady = true;
}
@@ -6619,13 +6580,13 @@
// an orientation that has different metrics than it expected.
// eg. Portrait instead of Landscape.
- int rotation = mPolicy.rotationForOrientationLw(mForcedAppOrientation, mRotation);
+ int rotation = mPolicy.rotationForOrientationLw(mLastOrientation, mRotation);
boolean altOrientation = !mPolicy.rotationHasCompatibleMetricsLw(
- mForcedAppOrientation, rotation);
+ mLastOrientation, rotation);
if (DEBUG_ORIENTATION) {
- Slog.v(TAG_WM, "Application requested orientation "
- + mForcedAppOrientation + ", got rotation " + rotation
+ Slog.v(TAG_WM, "Selected orientation "
+ + mLastOrientation + ", got rotation " + rotation
+ " which has " + (altOrientation ? "incompatible" : "compatible")
+ " metrics");
}
@@ -6639,7 +6600,7 @@
Slog.v(TAG_WM,
"Rotation changed to " + rotation + (altOrientation ? " (alt)" : "")
+ " from " + mRotation + (mAltOrientation ? " (alt)" : "")
- + ", forceApp=" + mForcedAppOrientation);
+ + ", lastOrientation=" + mLastOrientation);
}
int oldRotation = mRotation;
@@ -7264,7 +7225,6 @@
return null;
}
Configuration config = new Configuration();
- config.fontScale = 0;
computeScreenConfigurationLocked(config);
return config;
}
@@ -7559,26 +7519,6 @@
return true;
}
- private void startScrollingTask(DisplayContent displayContent, int startX, int startY) {
- if (DEBUG_TASK_POSITIONING) Slog.d(TAG_WM,
- "startScrollingTask: " + "{" + startX + ", " + startY + "}");
-
- Task task = null;
- synchronized (mWindowMap) {
- int taskId = displayContent.taskIdFromPoint(startX, startY);
- if (taskId >= 0) {
- task = mTaskIdToTask.get(taskId);
- }
- if (task == null || !task.isDockedInEffect() || !startPositioningLocked(
- task.getTopVisibleAppMainWindow(), false /*resize*/, startX, startY)) {
- return;
- }
- }
- try {
- mActivityManager.setFocusedTask(task.mTaskId);
- } catch(RemoteException e) {}
- }
-
private void handleTapOutsideTask(DisplayContent displayContent, int x, int y) {
int taskId = -1;
synchronized (mWindowMap) {
@@ -7967,9 +7907,6 @@
if (displayContent != null) {
mAnimator.addDisplayLocked(displayId);
displayContent.initializeDisplayBaseInfo();
- if (displayContent.mTapDetector != null) {
- displayContent.mTapDetector.init();
- }
}
}
}
@@ -8034,8 +7971,6 @@
public static final int RESIZE_STACK = 42;
public static final int RESIZE_TASK = 43;
- public static final int TWO_FINGER_SCROLL_START = 44;
-
public static final int WINDOW_REPLACEMENT_TIMEOUT = 46;
public static final int NOTIFY_APP_TRANSITION_STARTING = 47;
@@ -8533,11 +8468,6 @@
}
break;
- case TWO_FINGER_SCROLL_START: {
- startScrollingTask((DisplayContent)msg.obj, msg.arg1, msg.arg2);
- }
- break;
-
case TAP_OUTSIDE_TASK: {
handleTapOutsideTask((DisplayContent)msg.obj, msg.arg1, msg.arg2);
}
@@ -8696,19 +8626,21 @@
case SEAMLESS_ROTATION_TIMEOUT: {
// Rotation only supported on primary display.
// TODO(multi-display)
- final DisplayContent displayContent = getDefaultDisplayContentLocked();
- final WindowList windows = displayContent.getWindowList();
- boolean layoutNeeded = false;
- for (int i = windows.size() - 1; i >= 0; i--) {
- WindowState w = windows.get(i);
- if (w.mSeamlesslyRotated) {
- layoutNeeded = true;
- w.setDisplayLayoutNeeded();
+ synchronized(mWindowMap) {
+ final DisplayContent displayContent = getDefaultDisplayContentLocked();
+ final WindowList windows = displayContent.getWindowList();
+ boolean layoutNeeded = false;
+ for (int i = windows.size() - 1; i >= 0; i--) {
+ WindowState w = windows.get(i);
+ if (w.mSeamlesslyRotated) {
+ layoutNeeded = true;
+ w.setDisplayLayoutNeeded();
+ }
+ w.mSeamlesslyRotated = false;
}
- w.mSeamlesslyRotated = false;
- }
- if (layoutNeeded) {
- mWindowPlacerLocked.performSurfacePlacement();
+ if (layoutNeeded) {
+ mWindowPlacerLocked.performSurfacePlacement();
+ }
}
}
break;
@@ -9371,7 +9303,7 @@
if (task != null && task.mStack.getBoundsAnimating()) {
return;
}
- w.setInsetsChanged();
+ w.setReportResizeHints();
boolean configChanged = w.isConfigChanged();
if (DEBUG_CONFIGURATION && configChanged) {
Slog.v(TAG_WM, "Win " + w + " config changed: "
@@ -9383,11 +9315,11 @@
+ ": configChanged=" + configChanged
+ " dragResizingChanged=" + dragResizingChanged
+ " last=" + w.mLastFrame + " frame=" + w.mFrame);
- w.mLastFrame.set(w.mFrame);
if (w.mContentInsetsChanged
|| w.mVisibleInsetsChanged
|| winAnimator.mSurfaceResized
|| w.mOutsetsChanged
+ || w.mFrameSizeChanged
|| configChanged
|| dragResizingChanged
|| !w.isResizedWhileNotDragResizingReported()) {
@@ -9420,6 +9352,7 @@
w.mLastVisibleInsets.set(w.mVisibleInsets);
w.mLastStableInsets.set(w.mStableInsets);
w.mLastOutsets.set(w.mOutsets);
+ w.mLastFrame.set(w.mFrame);
makeWindowFreezingScreenIfNeededLocked(w);
// If the orientation is changing, or we're starting or ending
// a drag resizing action, then we need to hold off on unfreezing
@@ -10220,6 +10153,15 @@
}
}
+ public void notifyAppRelaunchesCleared(IBinder token) {
+ synchronized (mWindowMap) {
+ final AppWindowToken appWindow = findAppWindowToken(token);
+ if (appWindow != null) {
+ appWindow.clearRelaunching();
+ }
+ }
+ }
+
@Override
public int getDockedDividerInsetsLw() {
return getDefaultDisplayContentLocked().getDockedDividerController().getContentInsets();
@@ -10481,7 +10423,7 @@
pw.print(" mRotation="); pw.print(mRotation);
pw.print(" mAltOrientation="); pw.println(mAltOrientation);
pw.print(" mLastWindowForcedOrientation="); pw.print(mLastWindowForcedOrientation);
- pw.print(" mForcedAppOrientation="); pw.println(mForcedAppOrientation);
+ pw.print(" mLastOrientation="); pw.println(mLastOrientation);
pw.print(" mDeferredRotationPauseCount="); pw.println(mDeferredRotationPauseCount);
pw.print(" Animation settings: disabled="); pw.print(mAnimationsDisabled);
pw.print(" window="); pw.print(mWindowAnimationScaleSetting);
@@ -10768,14 +10710,16 @@
displayInfo.overscanTop = rect.top;
displayInfo.overscanRight = rect.right;
displayInfo.overscanBottom = rect.bottom;
- mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(displayId, displayInfo);
- configureDisplayPolicyLocked(displayContent);
+ if (mDisplayManagerInternal != null) {
+ mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(displayId, displayInfo);
+ configureDisplayPolicyLocked(displayContent);
- // TODO: Create an input channel for each display with touch capability.
- if (displayId == Display.DEFAULT_DISPLAY) {
- displayContent.mTapDetector = new TaskTapPointerEventListener(this, displayContent);
- registerPointerEventListener(displayContent.mTapDetector);
- registerPointerEventListener(mMousePositionTracker);
+ // TODO: Create an input channel for each display with touch capability.
+ if (displayId == Display.DEFAULT_DISPLAY) {
+ displayContent.mTapDetector = new TaskTapPointerEventListener(this, displayContent);
+ registerPointerEventListener(displayContent.mTapDetector);
+ registerPointerEventListener(mMousePositionTracker);
+ }
}
return displayContent;
@@ -11463,5 +11407,16 @@
return getDefaultDisplayContentLocked().getDockedDividerController().isResizing();
}
}
+
+ @Override
+ public void computeWindowsForAccessibility() {
+ final AccessibilityController accessibilityController;
+ synchronized (mWindowMap) {
+ accessibilityController = mAccessibilityController;
+ }
+ if (accessibilityController != null) {
+ accessibilityController.performComputeChangedWindowsNotLocked();
+ }
+ }
}
}
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 99fec7b..d20529d 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -25,6 +25,7 @@
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
+import android.os.Debug;
import android.os.IBinder;
import android.os.PowerManager;
import android.os.RemoteCallbackList;
@@ -48,6 +49,7 @@
import android.view.InputEventReceiver;
import android.view.View;
import android.view.ViewTreeObserver;
+import android.view.WindowInfo;
import android.view.WindowManager;
import android.view.WindowManagerPolicy;
@@ -55,11 +57,14 @@
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedList;
import static android.app.ActivityManager.StackId;
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
+import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT;
import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME;
import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION;
@@ -99,13 +104,22 @@
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_CONFIGURATION;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS_LIGHT;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ORIENTATION;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_POWER;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_RESIZE;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_SURFACE_TRACE;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
+import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER;
+import static com.android.server.wm.WindowManagerService.TYPE_LAYER_OFFSET;
+import static com.android.server.wm.WindowStateAnimator.COMMIT_DRAW_PENDING;
+import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN;
+import static com.android.server.wm.WindowStateAnimator.READY_TO_SHOW;
class WindowList extends ArrayList<WindowState> {
WindowList() {}
@@ -117,7 +131,7 @@
/**
* A window in the window manager.
*/
-final class WindowState implements WindowManagerPolicy.WindowState {
+class WindowState extends WindowContainer implements WindowManagerPolicy.WindowState {
static final String TAG = TAG_WITH_CLASS_NAME ? "WindowState" : TAG_WM;
// The minimal size of a window within the usable area of the freeform stack.
@@ -144,14 +158,12 @@
WindowToken mToken;
WindowToken mRootToken;
AppWindowToken mAppToken;
- AppWindowToken mTargetAppToken;
// mAttrs.flags is tested in animation without being locked. If the bits tested are ever
// modified they will need to be locked.
final WindowManager.LayoutParams mAttrs = new WindowManager.LayoutParams();
final DeathRecipient mDeathRecipient;
- final WindowState mAttachedWindow;
- final WindowList mChildWindows = new WindowList();
+ private boolean mIsChildWindow;
final int mBaseLayer;
final int mSubLayer;
final boolean mLayoutAttached;
@@ -166,7 +178,7 @@
boolean mPolicyVisibilityAfterAnim = true;
boolean mAppOpVisibility = true;
boolean mAppFreezing;
- boolean mAttachedHidden; // is our parent window hidden?
+ boolean mHidden; // Used to determine if to show child windows.
boolean mWallpaperVisible; // for wallpaper, what was last vis report?
boolean mDragResizing;
boolean mDragResizingChangeReported;
@@ -287,6 +299,7 @@
// "Real" frame that the application sees, in display coordinate space.
final Rect mFrame = new Rect();
final Rect mLastFrame = new Rect();
+ boolean mFrameSizeChanged = false;
// Frame that is scaled to the application's coordinate space when in
// screen size compatibility mode.
final Rect mCompatFrame = new Rect();
@@ -331,8 +344,6 @@
*/
final Rect mInsetFrame = new Rect();
- private static final Rect sTmpRect = new Rect();
-
boolean mContentChanged;
// If a window showing a wallpaper: the requested offset for the
@@ -394,6 +405,13 @@
boolean mOrientationChanging;
/**
+ * The orientation during the last visible call to relayout. If our
+ * current orientation is different, the window can't be ready
+ * to be shown.
+ */
+ int mLastVisibleLayoutRotation = -1;
+
+ /**
* How long we last kept the screen frozen.
*/
int mLastFreezeDuration;
@@ -503,15 +521,31 @@
*/
boolean mSeamlesslyRotated = false;
+ /**
+ * Compares to window sub-layers and returns -1 if the first is lesser than the second in terms
+ * of z-order and 1 otherwise.
+ */
+ private static final Comparator<WindowContainer> sWindowSubLayerComparator = (w1, w2) -> {
+ final int layer1 = ((WindowState)w1).mSubLayer;
+ final int layer2 = ((WindowState)w2).mSubLayer;
+ if (layer1 < layer2 || (layer1 == layer2 && layer2 < 0 )) {
+ // We insert the child window into the list ordered by the sub-layer.
+ // For same sub-layers, the negative one should go below others; the positive one should
+ // go above others.
+ return -1;
+ }
+ return 1;
+ };
+
WindowState(WindowManagerService service, Session s, IWindow c, WindowToken token,
- WindowState attachedWindow, int appOp, int seq, WindowManager.LayoutParams a,
- int viewVisibility, final DisplayContent displayContent) {
+ WindowState parentWindow, int appOp, int seq, WindowManager.LayoutParams a,
+ int viewVisibility, final DisplayContent displayContent, int ownerId) {
mService = service;
mSession = s;
mClient = c;
mAppOp = appOp;
mToken = token;
- mOwnerUid = s.mUid;
+ mOwnerUid = ownerId;
mWindowId = new IWindowId.Stub() {
@Override
public void registerFocusObserver(IWindowFocusObserver observer) {
@@ -541,7 +575,7 @@
c.asBinder().linkToDeath(deathRecipient, 0);
} catch (RemoteException e) {
mDeathRecipient = null;
- mAttachedWindow = null;
+ mIsChildWindow = false;
mLayoutAttached = false;
mIsImWindow = false;
mIsWallpaper = false;
@@ -554,75 +588,47 @@
}
mDeathRecipient = deathRecipient;
- if ((mAttrs.type >= FIRST_SUB_WINDOW &&
- mAttrs.type <= LAST_SUB_WINDOW)) {
+ if ((mAttrs.type >= FIRST_SUB_WINDOW && mAttrs.type <= LAST_SUB_WINDOW)) {
// The multiplier here is to reserve space for multiple
// windows in the same type layer.
- mBaseLayer = mPolicy.windowTypeToLayerLw(
- attachedWindow.mAttrs.type) * WindowManagerService.TYPE_LAYER_MULTIPLIER
- + WindowManagerService.TYPE_LAYER_OFFSET;
+ mBaseLayer = mPolicy.windowTypeToLayerLw(parentWindow.mAttrs.type)
+ * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET;
mSubLayer = mPolicy.subWindowTypeToLayerLw(a.type);
- mAttachedWindow = attachedWindow;
- if (DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + mAttachedWindow);
+ mIsChildWindow = true;
- final WindowList childWindows = mAttachedWindow.mChildWindows;
- final int numChildWindows = childWindows.size();
- if (numChildWindows == 0) {
- childWindows.add(this);
- } else {
- boolean added = false;
- for (int i = 0; i < numChildWindows; i++) {
- final int childSubLayer = childWindows.get(i).mSubLayer;
- if (mSubLayer < childSubLayer
- || (mSubLayer == childSubLayer && childSubLayer < 0)) {
- // We insert the child window into the list ordered by the sub-layer. For
- // same sub-layers, the negative one should go below others; the positive
- // one should go above others.
- childWindows.add(i, this);
- added = true;
- break;
- }
- }
- if (!added) {
- childWindows.add(this);
- }
- }
+ if (DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + parentWindow);
+ parentWindow.addChild(this, sWindowSubLayerComparator);
mLayoutAttached = mAttrs.type !=
WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
- mIsImWindow = attachedWindow.mAttrs.type == TYPE_INPUT_METHOD
- || attachedWindow.mAttrs.type == TYPE_INPUT_METHOD_DIALOG;
- mIsWallpaper = attachedWindow.mAttrs.type == TYPE_WALLPAPER;
- mIsFloatingLayer = mIsImWindow || mIsWallpaper;
+ mIsImWindow = parentWindow.mAttrs.type == TYPE_INPUT_METHOD
+ || parentWindow.mAttrs.type == TYPE_INPUT_METHOD_DIALOG;
+ mIsWallpaper = parentWindow.mAttrs.type == TYPE_WALLPAPER;
} else {
// The multiplier here is to reserve space for multiple
// windows in the same type layer.
mBaseLayer = mPolicy.windowTypeToLayerLw(a.type)
- * WindowManagerService.TYPE_LAYER_MULTIPLIER
- + WindowManagerService.TYPE_LAYER_OFFSET;
+ * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET;
mSubLayer = 0;
- mAttachedWindow = null;
+ mIsChildWindow = false;
mLayoutAttached = false;
mIsImWindow = mAttrs.type == TYPE_INPUT_METHOD
|| mAttrs.type == TYPE_INPUT_METHOD_DIALOG;
mIsWallpaper = mAttrs.type == TYPE_WALLPAPER;
- mIsFloatingLayer = mIsImWindow || mIsWallpaper;
}
+ mIsFloatingLayer = mIsImWindow || mIsWallpaper;
- WindowState appWin = this;
- while (appWin.isChildWindow()) {
- appWin = appWin.mAttachedWindow;
- }
- WindowToken appToken = appWin.mToken;
- while (appToken.appWindowToken == null) {
- WindowToken parent = mService.mTokenMap.get(appToken.token);
- if (parent == null || appToken == parent) {
+ final WindowState topParentWindow = getTopParentWindow();
+ WindowToken rootToken = topParentWindow.mToken;
+ while (rootToken.appWindowToken == null) {
+ WindowToken parent = mService.mTokenMap.get(rootToken.token);
+ if (parent == null || rootToken == parent) {
break;
}
- appToken = parent;
+ rootToken = parent;
}
- mRootToken = appToken;
- mAppToken = appToken.appWindowToken;
+ mRootToken = rootToken;
+ mAppToken = rootToken.appWindowToken;
if (mAppToken != null) {
final DisplayContent appDisplay = getDisplayContent();
mNotOnAppsDisplay = displayContent != appDisplay;
@@ -821,10 +827,10 @@
final int height = Math.min(mFrame.height(), mContentFrame.height());
final int width = Math.min(mContentFrame.width(), mFrame.width());
final DisplayMetrics displayMetrics = getDisplayContent().getDisplayMetrics();
- final int minVisibleHeight = WindowManagerService.dipToPixel(
- MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics);
- final int minVisibleWidth = WindowManagerService.dipToPixel(
- MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics);
+ final int minVisibleHeight = Math.min(height, WindowManagerService.dipToPixel(
+ MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics));
+ final int minVisibleWidth = Math.min(width, WindowManagerService.dipToPixel(
+ MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics));
final int top = Math.max(mContentFrame.top,
Math.min(mFrame.top, mContentFrame.bottom - minVisibleHeight));
final int left = Math.max(mContentFrame.left + minVisibleWidth - width,
@@ -1038,11 +1044,7 @@
@Override
public int getBaseType() {
- WindowState win = this;
- while (win.isChildWindow()) {
- win = win.mAttachedWindow;
- }
- return win.mAttrs.type;
+ return getTopParentWindow().mAttrs.type;
}
@Override
@@ -1055,14 +1057,16 @@
return mAppToken != null && mAppToken.voiceInteraction;
}
- boolean setInsetsChanged() {
+ boolean setReportResizeHints() {
mOverscanInsetsChanged |= !mLastOverscanInsets.equals(mOverscanInsets);
mContentInsetsChanged |= !mLastContentInsets.equals(mContentInsets);
mVisibleInsetsChanged |= !mLastVisibleInsets.equals(mVisibleInsets);
mStableInsetsChanged |= !mLastStableInsets.equals(mStableInsets);
mOutsetsChanged |= !mLastOutsets.equals(mOutsets);
+ mFrameSizeChanged |= (mLastFrame.width() != mFrame.width()) ||
+ (mLastFrame.height() != mFrame.height());
return mOverscanInsetsChanged || mContentInsetsChanged || mVisibleInsetsChanged
- || mOutsetsChanged;
+ || mOutsetsChanged || mFrameSizeChanged;
}
public DisplayContent getDisplayContent() {
@@ -1169,7 +1173,7 @@
* TODO: See if there are other places we can use this check below instead of duplicating...
*/
private boolean isVisibleUnchecked() {
- return mHasSurface && mPolicyVisibility && !mAttachedHidden
+ return mHasSurface && mPolicyVisibility && !isParentWindowHidden()
&& !mAnimatingExit && !mDestroying && (!mIsWallpaper || mWallpaperVisible);
}
@@ -1197,7 +1201,7 @@
final boolean animating = atoken != null && atoken.mAppAnimator.animation != null;
return mHasSurface && !mDestroying && !mAnimatingExit
&& (atoken == null ? mPolicyVisibility : !atoken.hiddenRequested)
- && ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
+ && ((!isParentWindowHidden() && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
|| mWinAnimator.mAnimation != null || animating);
}
@@ -1236,7 +1240,7 @@
boolean isVisibleOrAdding() {
final AppWindowToken atoken = mAppToken;
return (mHasSurface || (!mRelayoutCalled && mViewVisibility == View.VISIBLE))
- && mPolicyVisibility && !mAttachedHidden
+ && mPolicyVisibility && !isParentWindowHidden()
&& (atoken == null || !atoken.hiddenRequested)
&& !mAnimatingExit && !mDestroying;
}
@@ -1260,10 +1264,10 @@
}
final AppWindowToken atoken = mAppToken;
if (atoken != null) {
- return ((!mAttachedHidden && !atoken.hiddenRequested)
+ return ((!isParentWindowHidden() && !atoken.hiddenRequested)
|| mWinAnimator.mAnimation != null || atoken.mAppAnimator.animation != null);
}
- return !mAttachedHidden || mWinAnimator.mAnimation != null;
+ return !isParentWindowHidden() || mWinAnimator.mAnimation != null;
}
/**
@@ -1301,7 +1305,7 @@
return false;
}
return mHasSurface && mPolicyVisibility && !mDestroying
- && ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
+ && ((!isParentWindowHidden() && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
|| mWinAnimator.mAnimation != null
|| ((mAppToken != null) && (mAppToken.mAppAnimator.animation != null)));
}
@@ -1321,7 +1325,7 @@
return false;
}
return mHasSurface && !mDestroying
- && ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
+ && ((!isParentWindowHidden() && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
|| mWinAnimator.mAnimation != null
|| ((atoken != null) && (atoken.mAppAnimator.animation != null)
&& !mWinAnimator.isDummyAnimation()));
@@ -1335,7 +1339,7 @@
public boolean isDisplayedLw() {
final AppWindowToken atoken = mAppToken;
return isDrawnLw() && mPolicyVisibility
- && ((!mAttachedHidden &&
+ && ((!isParentWindowHidden() &&
(atoken == null || !atoken.hiddenRequested))
|| mWinAnimator.mAnimating
|| (atoken != null && atoken.mAppAnimator.animation != null));
@@ -1357,7 +1361,7 @@
|| !mRelayoutCalled
|| (atoken == null && mRootToken.hidden)
|| (atoken != null && atoken.hiddenRequested)
- || mAttachedHidden
+ || isParentWindowHidden()
|| (mAnimatingExit && !isAnimatingLw())
|| mDestroying;
}
@@ -1368,9 +1372,9 @@
*/
public boolean isDrawFinishedLw() {
return mHasSurface && !mDestroying &&
- (mWinAnimator.mDrawState == WindowStateAnimator.COMMIT_DRAW_PENDING
- || mWinAnimator.mDrawState == WindowStateAnimator.READY_TO_SHOW
- || mWinAnimator.mDrawState == WindowStateAnimator.HAS_DRAWN);
+ (mWinAnimator.mDrawState == COMMIT_DRAW_PENDING
+ || mWinAnimator.mDrawState == READY_TO_SHOW
+ || mWinAnimator.mDrawState == HAS_DRAWN);
}
/**
@@ -1380,8 +1384,8 @@
@Override
public boolean isDrawnLw() {
return mHasSurface && !mDestroying &&
- (mWinAnimator.mDrawState == WindowStateAnimator.READY_TO_SHOW
- || mWinAnimator.mDrawState == WindowStateAnimator.HAS_DRAWN);
+ (mWinAnimator.mDrawState == READY_TO_SHOW
+ || mWinAnimator.mDrawState == HAS_DRAWN);
}
/**
@@ -1406,7 +1410,7 @@
return mHasSurface && (mContentChanged || mMovedByResize)
&& !mAnimatingExit && mService.okToDisplay()
&& (mFrame.top != mLastFrame.top || mFrame.left != mLastFrame.left)
- && (mAttachedWindow == null || !mAttachedWindow.hasMoved());
+ && (!mIsChildWindow || !getParentWindow().hasMoved());
}
boolean isObscuringFullscreen(final DisplayInfo displayInfo) {
@@ -1447,13 +1451,31 @@
&& mAppToken.mTask.mStack.isAdjustedForMinimizedDock();
}
- void removeLocked() {
+ @Override
+ void remove() {
+ super.remove();
+
+ if (mRemoved) {
+ // Nothing to do.
+ if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "WS.remove: " + this + " Already removed...");
+ return;
+ }
+
+ mRemoved = true;
+
+ if (mService.mInputMethodTarget == this) {
+ mService.moveInputMethodWindowsIfNeededLocked(false);
+ }
+
+ final int type = mAttrs.type;
+ if (WindowManagerService.excludeWindowTypeFromTapOutTask(type)) {
+ final DisplayContent displaycontent = getDisplayContent();
+ displaycontent.mTapExcludedWindows.remove(this);
+ }
+ mPolicy.removeWindowLw(this);
+
disposeInputChannel();
- if (isChildWindow()) {
- if (DEBUG_ADD_REMOVE) Slog.v(TAG, "Removing " + this + " from " + mAttachedWindow);
- mAttachedWindow.mChildWindows.remove(this);
- }
mWinAnimator.destroyDeferredSurfaceLocked();
mWinAnimator.destroySurfaceLocked();
mSession.windowRemovedLocked();
@@ -1463,6 +1485,8 @@
// Ignore if it has already been removed (usually because
// we are doing this as part of processing a death note.)
}
+
+ mService.postWindowRemoveCleanupLocked(this);
}
void setHasSurface(boolean hasSurface) {
@@ -1470,14 +1494,21 @@
}
int getAnimLayerAdjustment() {
- if (mTargetAppToken != null) {
- return mTargetAppToken.mAppAnimator.animLayerAdjustment;
- } else if (mAppToken != null) {
- return mAppToken.mAppAnimator.animLayerAdjustment;
- } else {
- // Nothing is animating, so there is no animation adjustment.
- return 0;
+ final boolean isImeType =
+ mAttrs.type == TYPE_INPUT_METHOD || mAttrs.type == TYPE_INPUT_METHOD_DIALOG;
+ if (isImeType && mService.mInputMethodTarget != null) {
+ final AppWindowToken appToken = mService.mInputMethodTarget.mAppToken;
+ if (appToken != null) {
+ return appToken.mAppAnimator.animLayerAdjustment;
+ }
}
+
+ if (mAppToken != null) {
+ return mAppToken.mAppAnimator.animLayerAdjustment;
+ }
+
+ // Nothing is animating, so there is no animation adjustment.
+ return 0;
}
void scheduleAnimationIfDimming() {
@@ -1624,7 +1655,7 @@
win.mReplacingWindow = null;
mSkipEnterAnimationForSeamlessReplacement = false;
if (win.mAnimatingExit || !animateReplacingWindow) {
- mService.removeWindowInnerLocked(win);
+ win.remove();
}
}
}
@@ -1636,29 +1667,12 @@
}
}
- boolean inDockedWorkspace() {
- final Task task = getTask();
- return task != null && task.inDockedWorkspace();
- }
-
// TODO: Strange usage of word workspace here and above.
boolean inPinnedWorkspace() {
final Task task = getTask();
return task != null && task.inPinnedWorkspace();
}
- boolean isDockedInEffect() {
- final Task task = getTask();
- return task != null && task.isDockedInEffect();
- }
-
- void applyScrollIfNeeded() {
- final Task task = getTask();
- if (task != null) {
- task.applyScrollToWindowIfNeeded(this);
- }
- }
-
void applyAdjustForImeIfNeeded() {
final Task task = getTask();
if (task != null && task.mStack != null && task.mStack.isAdjustedForIme()) {
@@ -2092,6 +2106,7 @@
Slog.v(TAG, "Destroying saved surface: " + this);
}
mWinAnimator.destroySurfaceLocked();
+ mSurfaceSaved = false;
}
mWasVisibleBeforeClientHidden = false;
}
@@ -2100,10 +2115,21 @@
if (!mSurfaceSaved) {
return;
}
+
+ // Sometimes we save surfaces due to layout invisible
+ // directly after rotation occurs. However this means
+ // the surface was never laid out in the new orientation.
+ // We can only restore to the last rotation we were
+ // laid out as visible in.
+ if (mLastVisibleLayoutRotation != mService.mRotation) {
+ destroySavedSurface();
+ return;
+ }
mSurfaceSaved = false;
+
if (mWinAnimator.mSurfaceController != null) {
setHasSurface(true);
- mWinAnimator.mDrawState = WindowStateAnimator.READY_TO_SHOW;
+ mWinAnimator.mDrawState = READY_TO_SHOW;
mAnimatingWithSavedSurface = true;
if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) {
@@ -2167,11 +2193,8 @@
}
boolean isHiddenFromUserLocked() {
- // Attached windows are evaluated based on the window that they are attached to.
- WindowState win = this;
- while (win.isChildWindow()) {
- win = win.mAttachedWindow;
- }
+ // Child windows are evaluated based on their parent window.
+ final WindowState win = getTopParentWindow();
if (win.mAttrs.type < WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW
&& win.mAppToken != null && win.mAppToken.showForAllUsers) {
@@ -2344,6 +2367,7 @@
mVisibleInsetsChanged = false;
mStableInsetsChanged = false;
mOutsetsChanged = false;
+ mFrameSizeChanged = false;
mResizedWhileNotDragResizingReported = true;
mWinAnimator.mSurfaceResized = false;
} catch (RemoteException e) {
@@ -2548,8 +2572,8 @@
pw.print(prefix); pw.print("LastRequested w="); pw.print(mLastRequestedWidth);
pw.print(" h="); pw.println(mLastRequestedHeight);
}
- if (isChildWindow() || mLayoutAttached) {
- pw.print(prefix); pw.print("mAttachedWindow="); pw.print(mAttachedWindow);
+ if (mIsChildWindow || mLayoutAttached) {
+ pw.print(prefix); pw.print("mParentWindow="); pw.print(getParentWindow());
pw.print(" mLayoutAttached="); pw.println(mLayoutAttached);
}
if (mIsImWindow || mIsWallpaper || mIsFloatingLayer) {
@@ -2562,9 +2586,7 @@
pw.print(prefix); pw.print("mBaseLayer="); pw.print(mBaseLayer);
pw.print(" mSubLayer="); pw.print(mSubLayer);
pw.print(" mAnimLayer="); pw.print(mLayer); pw.print("+");
- pw.print((mTargetAppToken != null ?
- mTargetAppToken.mAppAnimator.animLayerAdjustment
- : (mAppToken != null ? mAppToken.mAppAnimator.animLayerAdjustment : 0)));
+ pw.print(getAnimLayerAdjustment());
pw.print("="); pw.print(mWinAnimator.mAnimLayer);
pw.print(" mLastLayer="); pw.println(mWinAnimator.mLastLayer);
}
@@ -2577,9 +2599,6 @@
pw.print(isAnimatingWithSavedSurface());
pw.print(" mAppDied=");pw.println(mAppDied);
}
- if (mTargetAppToken != null) {
- pw.print(prefix); pw.print("mTargetAppToken="); pw.println(mTargetAppToken);
- }
pw.print(prefix); pw.print("mViewVisibility=0x");
pw.print(Integer.toHexString(mViewVisibility));
pw.print(" mHaveFrame="); pw.print(mHaveFrame);
@@ -2589,14 +2608,14 @@
pw.println(Integer.toHexString(mSystemUiVisibility));
}
if (!mPolicyVisibility || !mPolicyVisibilityAfterAnim || !mAppOpVisibility
- || mAttachedHidden) {
+ || isParentWindowHidden()) {
pw.print(prefix); pw.print("mPolicyVisibility=");
pw.print(mPolicyVisibility);
pw.print(" mPolicyVisibilityAfterAnim=");
pw.print(mPolicyVisibilityAfterAnim);
pw.print(" mAppOpVisibility=");
pw.print(mAppOpVisibility);
- pw.print(" mAttachedHidden="); pw.println(mAttachedHidden);
+ pw.print(" parentHidden="); pw.println(isParentWindowHidden());
}
if (!mRelayoutCalled || mLayoutNeeded) {
pw.print(prefix); pw.print("mRelayoutCalled="); pw.print(mRelayoutCalled);
@@ -2735,7 +2754,7 @@
mLastTitle = title;
mWasExiting = mAnimatingExit;
mStringNameCache = "Window{" + Integer.toHexString(System.identityHashCode(this))
- + " u" + UserHandle.getUserId(mSession.mUid)
+ + " u" + UserHandle.getUserId(mOwnerUid)
+ " " + mLastTitle + (mAnimatingExit ? " EXITING}" : "}");
}
return mStringNameCache;
@@ -2762,12 +2781,12 @@
// We need to fit it to the display if either
// a) The task is fullscreen, or we don't have a task (we assume fullscreen for the taskless
// windows)
- // b) If it's a child window, we also need to fit it to the display unless
- // FLAG_LAYOUT_NO_LIMITS is set. This is so we place Popup and similar windows on screen,
+ // b) If it's a secondary app window, we also need to fit it to the display unless
+ // FLAG_LAYOUT_NO_LIMITS is set. This is so we place Popups, dialogs, and similar windows on screen,
// but SurfaceViews want to be always at a specific location so we don't fit it to the
// display.
final boolean fitToDisplay = (task == null || !nonFullscreenTask)
- || (isChildWindow() && !noLimits);
+ || ((mAttrs.type != TYPE_BASE_APPLICATION) && !noLimits);
float x, y;
int w,h;
@@ -2838,11 +2857,42 @@
}
boolean isChildWindow() {
- return mAttachedWindow != null;
+ return mIsChildWindow;
+ }
+
+ /**
+ * Returns the bottom child window in regards to z-order of this window or null if no children.
+ */
+ WindowState getBottomChild() {
+ // Child windows are z-ordered based on sub-layer using {@link #sWindowSubLayerComparator}
+ // and the child with the lowest z-order will be at the head of the list.
+ return (WindowState) mChildren.peekFirst();
}
boolean layoutInParentFrame() {
- return isChildWindow() && (mAttrs.privateFlags & PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME) != 0;
+ return mIsChildWindow
+ && (mAttrs.privateFlags & PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME) != 0;
+ }
+
+ /** Returns the parent window if this is a child of another window, else null. */
+ WindowState getParentWindow() {
+ // NOTE: We are not calling getParent() directly as the WindowState might be a child of a
+ // WindowContainer that isn't a WindowState.
+ return (mIsChildWindow) ? ((WindowState) super.getParent()) : null;
+ }
+
+ /** Returns the topmost parent window if this is a child of another window, else this. */
+ WindowState getTopParentWindow() {
+ WindowState w = this;
+ while (w.mIsChildWindow) {
+ w = w.getParentWindow();
+ }
+ return w;
+ }
+
+ boolean isParentWindowHidden() {
+ final WindowState parent = getParentWindow();
+ return (parent == null) ? false : parent.mHidden;
}
void setReplacing(boolean animate) {
@@ -2906,6 +2956,258 @@
// them at such phases, as they won't be covered by window preservation,
// and in general we expect them to return following relaunch.
boolean shouldBeReplacedWithChildren() {
- return isChildWindow() || mAttrs.type == TYPE_APPLICATION;
+ return mIsChildWindow || mAttrs.type == TYPE_APPLICATION;
+ }
+
+ public int getRotationAnimationHint() {
+ if (mAppToken != null) {
+ return mAppToken.mRotationAnimationHint;
+ } else {
+ return -1;
+ }
+ }
+
+ // This must be called while inside a transaction.
+ boolean performShowLocked() {
+ if (isHiddenFromUserLocked()) {
+ if (DEBUG_VISIBILITY) Slog.w(TAG, "hiding " + this + ", belonging to " + mOwnerUid);
+ hideLw(false);
+ return false;
+ }
+
+ logPerformShow("performShow on ");
+
+ if (mWinAnimator.mDrawState != READY_TO_SHOW || !isReadyForDisplayIgnoringKeyguard()) {
+ return false;
+ }
+
+ logPerformShow("Showing ");
+
+ mService.enableScreenIfNeededLocked();
+ mWinAnimator.applyEnterAnimationLocked();
+
+ // Force the show in the next prepareSurfaceLocked() call.
+ mWinAnimator.mLastAlpha = -1;
+ if (DEBUG_SURFACE_TRACE || DEBUG_ANIM) Slog.v(TAG,
+ "performShowLocked: mDrawState=HAS_DRAWN in " + this);
+ mWinAnimator.mDrawState = HAS_DRAWN;
+ mService.scheduleAnimationLocked();
+
+ if (mHidden) {
+ mHidden = false;
+ final DisplayContent displayContent = getDisplayContent();
+
+ for (int i = mChildren.size() - 1; i >= 0; --i) {
+ final WindowState c = (WindowState) mChildren.get(i);
+ if (c.mWinAnimator.mSurfaceController != null) {
+ c.performShowLocked();
+ // It hadn't been shown, which means layout not performed on it, so now we
+ // want to make sure to do a layout. If called from within the transaction
+ // loop, this will cause it to restart with a new layout.
+ if (displayContent != null) {
+ displayContent.layoutNeeded = true;
+ }
+ }
+ }
+ }
+
+ if (mAttrs.type != TYPE_APPLICATION_STARTING && mAppToken != null) {
+ mAppToken.onFirstWindowDrawn(this, mWinAnimator);
+ }
+
+ if (mAttrs.type == TYPE_INPUT_METHOD) {
+ mDisplayContent.mDividerControllerLocked.resetImeHideRequested();
+ }
+
+ return true;
+ }
+
+ void logPerformShow(String prefix) {
+ if (DEBUG_VISIBILITY
+ || (DEBUG_STARTING_WINDOW && mAttrs.type == TYPE_APPLICATION_STARTING)) {
+ Slog.v(TAG, prefix + this
+ + ": mDrawState=" + mWinAnimator.drawStateToString()
+ + " readyForDisplay=" + isReadyForDisplayIgnoringKeyguard()
+ + " starting=" + (mAttrs.type == TYPE_APPLICATION_STARTING)
+ + " during animation: policyVis=" + mPolicyVisibility
+ + " parentHidden=" + isParentWindowHidden()
+ + " tok.hiddenRequested="
+ + (mAppToken != null ? mAppToken.hiddenRequested : false)
+ + " tok.hidden=" + (mAppToken != null ? mAppToken.hidden : false)
+ + " animating=" + mWinAnimator.mAnimating
+ + " tok animating="
+ + (mWinAnimator.mAppAnimator != null ? mWinAnimator.mAppAnimator.animating : false)
+ + " Callers=" + Debug.getCallers(4));
+ }
+ }
+
+ WindowInfo getWindowInfo() {
+ WindowInfo windowInfo = WindowInfo.obtain();
+ windowInfo.type = mAttrs.type;
+ windowInfo.layer = mLayer;
+ windowInfo.token = mClient.asBinder();
+ windowInfo.title = mAttrs.accessibilityTitle;
+ windowInfo.accessibilityIdOfAnchor = mAttrs.accessibilityIdOfAnchor;
+ windowInfo.focused = isFocused();
+
+ if (mIsChildWindow) {
+ windowInfo.parentToken = getParentWindow().mClient.asBinder();
+ }
+
+ final int childCount = mChildren.size();
+ if (childCount > 0) {
+ if (windowInfo.childTokens == null) {
+ windowInfo.childTokens = new ArrayList(childCount);
+ }
+ for (int j = 0; j < childCount; j++) {
+ final WindowState child = (WindowState) mChildren.get(j);
+ windowInfo.childTokens.add(child.mClient.asBinder());
+ }
+ }
+ return windowInfo;
+ }
+
+ void adjustAnimLayer(int adj) {
+ mWinAnimator.mAnimLayer = mLayer + adj;
+ if (DEBUG_LAYERS) Slog.v(TAG_WM, "win=" + this + " anim layer: " + mWinAnimator.mAnimLayer);
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState childWindow = (WindowState) mChildren.get(i);
+ childWindow.adjustAnimLayer(adj);
+ }
+ }
+
+ // TODO: come-up with a better name for this method that represents what it does.
+ // Or, it is probably not going to matter anyways if we are successful in getting rid of
+ // the WindowList concept.
+ int reAddWindowLocked(int index) {
+ final WindowList windows = getWindowList();
+ // Adding child windows relies on child windows being ordered by mSubLayer using
+ // {@link #sWindowSubLayerComparator}.
+ final int childCount = mChildren.size();
+ boolean winAdded = false;
+ for (int j = 0; j < childCount; j++) {
+ final WindowState child = (WindowState) mChildren.get(j);
+ if (!winAdded && child.mSubLayer >= 0) {
+ if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM,
+ "Re-adding child window at " + index + ": " + child);
+ mRebuilding = false;
+ windows.add(index, this);
+ index++;
+ winAdded = true;
+ }
+ if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Re-adding window at " + index + ": " + child);
+ child.mRebuilding = false;
+ windows.add(index, child);
+ index++;
+ }
+ if (!winAdded) {
+ if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Re-adding window at " + index + ": " + this);
+ mRebuilding = false;
+ windows.add(index, this);
+ index++;
+ }
+ mService.mWindowsChanged = true;
+ return index;
+ }
+
+ int removeFromWindowList(int interestingPos) {
+ final WindowList windows = getWindowList();
+ int wpos = windows.indexOf(this);
+ if (wpos < 0) {
+ return interestingPos;
+ }
+
+ if (wpos < interestingPos) interestingPos--;
+ if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM, "Temp removing at " + wpos + ": " + this);
+ windows.remove(wpos);
+ mService.mWindowsChanged = true;
+ int childCount = mChildren.size();
+ while (childCount > 0) {
+ childCount--;
+ final WindowState cw = (WindowState) mChildren.get(childCount);
+ int cpos = windows.indexOf(cw);
+ if (cpos >= 0) {
+ if (cpos < interestingPos) interestingPos--;
+ if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG_WM,
+ "Temp removing child at " + cpos + ": " + cw);
+ windows.remove(cpos);
+ }
+ }
+ return interestingPos;
+ }
+
+ void onExitAnimationDone() {
+ if (DEBUG_ANIM) Slog.v(TAG, "onExitAnimationDone in " + this
+ + ": exiting=" + mAnimatingExit + " remove=" + mRemoveOnExit
+ + " windowAnimating=" + mWinAnimator.isWindowAnimationSet());
+
+ if (!mChildren.isEmpty()) {
+ // Copying to a different list as multiple children can be removed.
+ // TODO: Not sure if we really need to copy this into a different list.
+ final LinkedList childWindows = new LinkedList(mChildren);
+ for (int i = childWindows.size() - 1; i >= 0; i--) {
+ ((WindowState)childWindows.get(i)).onExitAnimationDone();
+ }
+ }
+
+ if (mWinAnimator.mEnteringAnimation) {
+ mWinAnimator.mEnteringAnimation = false;
+ mService.requestTraversal();
+ // System windows don't have an activity and an app token as a result, but need a way
+ // to be informed about their entrance animation end.
+ if (mAppToken == null) {
+ try {
+ mClient.dispatchWindowShown();
+ } catch (RemoteException e) {
+ }
+ }
+ }
+
+ if (!mWinAnimator.isWindowAnimationSet()) {
+ //TODO (multidisplay): Accessibility is supported only for the default display.
+ if (mService.mAccessibilityController != null && getDisplayId() == DEFAULT_DISPLAY) {
+ mService.mAccessibilityController.onSomeWindowResizedOrMovedLocked();
+ }
+ }
+
+ if (!mAnimatingExit) {
+ return;
+ }
+
+ if (mWinAnimator.isWindowAnimationSet()) {
+ return;
+ }
+
+ if (WindowManagerService.localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG,
+ "Exit animation finished in " + this + ": remove=" + mRemoveOnExit);
+
+ mDestroying = true;
+
+ final boolean hasSurface = mWinAnimator.hasSurface();
+ if (hasSurface) {
+ mWinAnimator.hide("onExitAnimationDone");
+ }
+
+ // If we have an app token, we ask it to destroy the surface for us, so that it can take
+ // care to ensure the activity has actually stopped and the surface is not still in use.
+ // Otherwise we add the service to mDestroySurface and allow it to be processed in our next
+ // transaction.
+ if (mAppToken != null) {
+ mAppToken.destroySurfaces();
+ } else {
+ if (hasSurface) {
+ mService.mDestroySurface.add(this);
+ }
+ if (mRemoveOnExit) {
+ mService.mPendingRemove.add(this);
+ mRemoveOnExit = false;
+ }
+ }
+ mAnimatingExit = false;
+ mService.mWallpaperControllerLocked.hideWallpapers(this);
+ }
+
+ public boolean isRtl() {
+ return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
}
}
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 6c55495..34e5260 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -17,7 +17,6 @@
package com.android.server.wm;
import static android.app.ActivityManager.StackId;
-import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
import static android.view.WindowManager.LayoutParams.FLAG_SCALED;
@@ -25,7 +24,6 @@
import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
import static com.android.server.wm.AppWindowAnimator.sDummyAnimation;
import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;
@@ -54,7 +52,7 @@
import android.graphics.RectF;
import android.graphics.Region;
import android.os.Debug;
-import android.os.RemoteException;
+import android.os.Trace;
import android.util.Slog;
import android.view.DisplayInfo;
import android.view.MagnificationSpec;
@@ -102,7 +100,7 @@
// Unchanging local convenience fields.
final WindowManagerService mService;
final WindowState mWin;
- final WindowStateAnimator mAttachedWinAnimator;
+ private final WindowStateAnimator mParentWinAnimator;
final WindowAnimator mAnimator;
AppWindowAnimator mAppAnimator;
final Session mSession;
@@ -260,8 +258,7 @@
}
mWin = win;
- mAttachedWinAnimator = win.mAttachedWindow == null
- ? null : win.mAttachedWindow.mWinAnimator;
+ mParentWinAnimator = !win.isChildWindow() ? null : win.getParentWindow().mWinAnimator;
mAppAnimator = win.mAppToken == null ? null : win.mAppToken.mAppAnimator;
mSession = win.mSession;
mAttrType = win.mAttrs.type;
@@ -309,7 +306,7 @@
*/
boolean isAnimationSet() {
return mAnimation != null
- || (mAttachedWinAnimator != null && mAttachedWinAnimator.mAnimation != null)
+ || (mParentWinAnimator != null && mParentWinAnimator.mAnimation != null)
|| (mAppAnimator != null && mAppAnimator.isAnimating());
}
@@ -490,7 +487,7 @@
}
}
- finishExit();
+ mWin.onExitAnimationDone();
final int displayId = mWin.getDisplayId();
mAnimator.setPendingLayoutChanges(displayId, WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM);
if (DEBUG_LAYOUT_REPEATS)
@@ -504,80 +501,6 @@
return false;
}
- void finishExit() {
- if (DEBUG_ANIM) Slog.v(
- TAG, "finishExit in " + this
- + ": exiting=" + mWin.mAnimatingExit
- + " remove=" + mWin.mRemoveOnExit
- + " windowAnimating=" + isWindowAnimationSet());
-
- if (!mWin.mChildWindows.isEmpty()) {
- // Copying to a different list as multiple children can be removed.
- final WindowList childWindows = new WindowList(mWin.mChildWindows);
- for (int i = childWindows.size() - 1; i >= 0; i--) {
- childWindows.get(i).mWinAnimator.finishExit();
- }
- }
-
- if (mEnteringAnimation) {
- mEnteringAnimation = false;
- mService.requestTraversal();
- // System windows don't have an activity and an app token as a result, but need a way
- // to be informed about their entrance animation end.
- if (mWin.mAppToken == null) {
- try {
- mWin.mClient.dispatchWindowShown();
- } catch (RemoteException e) {
- }
- }
- }
-
- if (!isWindowAnimationSet()) {
- //TODO (multidisplay): Accessibility is supported only for the default display.
- if (mService.mAccessibilityController != null
- && mWin.getDisplayId() == DEFAULT_DISPLAY) {
- mService.mAccessibilityController.onSomeWindowResizedOrMovedLocked();
- }
- }
-
- if (!mWin.mAnimatingExit) {
- return;
- }
-
- if (isWindowAnimationSet()) {
- return;
- }
-
- if (WindowManagerService.localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG,
- "Exit animation finished in " + this + ": remove=" + mWin.mRemoveOnExit);
-
-
- mWin.mDestroying = true;
-
- final boolean hasSurface = hasSurface();
- if (hasSurface) {
- hide("finishExit");
- }
-
- // If we have an app token, we ask it to destroy the surface for us,
- // so that it can take care to ensure the activity has actually stopped
- // and the surface is not still in use. Otherwise we add the service to
- // mDestroySurface and allow it to be processed in our next transaction.
- if (mWin.mAppToken != null) {
- mWin.mAppToken.destroySurfaces();
- } else {
- if (hasSurface) {
- mService.mDestroySurface.add(mWin);
- }
- if (mWin.mRemoveOnExit) {
- mService.mPendingRemove.add(mWin);
- mWin.mRemoveOnExit = false;
- }
- }
- mWin.mAnimatingExit = false;
- mWallpaperControllerLocked.hideWallpapers(mWin);
- }
-
void hide(String reason) {
if (!mLastHidden) {
//dump();
@@ -629,7 +552,7 @@
boolean result = false;
final AppWindowToken atoken = mWin.mAppToken;
if (atoken == null || atoken.allDrawn || mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {
- result = performShowLocked();
+ result = mWin.performShowLocked();
}
return result;
}
@@ -852,15 +775,12 @@
return;
}
- int i = mWin.mChildWindows.size();
// When destroying a surface we want to make sure child windows are hidden. If we are
// preserving the surface until redraw though we intend to swap it out with another surface
// for resizing. In this case the window always remains visible to the user and the child
// windows should likewise remain visible.
- while (!mDestroyPreservedSurfaceUponRedraw && i > 0) {
- i--;
- WindowState c = mWin.mChildWindows.get(i);
- c.mAttachedHidden = true;
+ if (!mDestroyPreservedSurfaceUponRedraw) {
+ mWin.mHidden = true;
}
try {
@@ -928,8 +848,8 @@
void computeShownFrameLocked() {
final boolean selfTransformation = mHasLocalTransformation;
Transformation attachedTransformation =
- (mAttachedWinAnimator != null && mAttachedWinAnimator.mHasLocalTransformation)
- ? mAttachedWinAnimator.mTransformation : null;
+ (mParentWinAnimator != null && mParentWinAnimator.mHasLocalTransformation)
+ ? mParentWinAnimator.mTransformation : null;
Transformation appTransformation = (mAppAnimator != null && mAppAnimator.hasTransformation)
? mAppAnimator.transformation : null;
@@ -1160,7 +1080,7 @@
// Initialize the decor rect to the entire frame.
if (w.isDockedResizing() ||
- (w.isChildWindow() && w.mAttachedWindow.isDockedResizing())) {
+ (w.isChildWindow() && w.getParentWindow().isDockedResizing())) {
// If we are resizing with the divider, the task bounds might be smaller than the
// stack bounds. The system decor is used to clip to the task bounds, which we don't
@@ -1546,7 +1466,7 @@
if (mIsWallpaper && !mWin.mWallpaperVisible) {
// Wallpaper is no longer visible and there is no wp target => hide it.
hide("prepareSurfaceLocked");
- } else if (w.mAttachedHidden || !w.isOnScreen()) {
+ } else if (w.isParentWindowHidden() || !w.isOnScreen()) {
hide("prepareSurfaceLocked");
mWallpaperControllerLocked.hideWallpapers(w);
@@ -1703,90 +1623,6 @@
mSurfaceController.setSecure(isSecure);
}
- // This must be called while inside a transaction.
- boolean performShowLocked() {
- if (mWin.isHiddenFromUserLocked()) {
- if (DEBUG_VISIBILITY) Slog.w(TAG, "hiding " + mWin + ", belonging to " + mWin.mOwnerUid);
- mWin.hideLw(false);
- return false;
- }
- if (DEBUG_VISIBILITY || (DEBUG_STARTING_WINDOW &&
- mWin.mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING)) {
- Slog.v(TAG, "performShow on " + this
- + ": mDrawState=" + drawStateToString() + " readyForDisplay="
- + mWin.isReadyForDisplayIgnoringKeyguard()
- + " starting=" + (mWin.mAttrs.type == TYPE_APPLICATION_STARTING)
- + " during animation: policyVis=" + mWin.mPolicyVisibility
- + " attHidden=" + mWin.mAttachedHidden
- + " tok.hiddenRequested="
- + (mWin.mAppToken != null ? mWin.mAppToken.hiddenRequested : false)
- + " tok.hidden="
- + (mWin.mAppToken != null ? mWin.mAppToken.hidden : false)
- + " animating=" + mAnimating
- + " tok animating="
- + (mAppAnimator != null ? mAppAnimator.animating : false) + " Callers="
- + Debug.getCallers(3));
- }
- if (mDrawState == READY_TO_SHOW && mWin.isReadyForDisplayIgnoringKeyguard()) {
- if (DEBUG_VISIBILITY || (DEBUG_STARTING_WINDOW &&
- mWin.mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING)) {
- Slog.v(TAG, "Showing " + this
- + " during animation: policyVis=" + mWin.mPolicyVisibility
- + " attHidden=" + mWin.mAttachedHidden
- + " tok.hiddenRequested="
- + (mWin.mAppToken != null ? mWin.mAppToken.hiddenRequested : false)
- + " tok.hidden="
- + (mWin.mAppToken != null ? mWin.mAppToken.hidden : false)
- + " animating=" + mAnimating
- + " tok animating="
- + (mAppAnimator != null ? mAppAnimator.animating : false));
- }
-
- mService.enableScreenIfNeededLocked();
-
- applyEnterAnimationLocked();
-
- // Force the show in the next prepareSurfaceLocked() call.
- mLastAlpha = -1;
- if (DEBUG_SURFACE_TRACE || DEBUG_ANIM)
- Slog.v(TAG, "performShowLocked: mDrawState=HAS_DRAWN in " + mWin);
- mDrawState = HAS_DRAWN;
- mService.scheduleAnimationLocked();
-
- int i = mWin.mChildWindows.size();
- while (i > 0) {
- i--;
- WindowState c = mWin.mChildWindows.get(i);
- if (c.mAttachedHidden) {
- c.mAttachedHidden = false;
- if (c.mWinAnimator.mSurfaceController != null) {
- c.mWinAnimator.performShowLocked();
- // It hadn't been shown, which means layout not
- // performed on it, so now we want to make sure to
- // do a layout. If called from within the transaction
- // loop, this will cause it to restart with a new
- // layout.
- final DisplayContent displayContent = c.getDisplayContent();
- if (displayContent != null) {
- displayContent.layoutNeeded = true;
- }
- }
- }
- }
-
- if (mWin.mAttrs.type != TYPE_APPLICATION_STARTING && mWin.mAppToken != null) {
- mWin.mAppToken.onFirstWindowDrawn(mWin, this);
- }
-
- if (mWin.mAttrs.type == TYPE_INPUT_METHOD) {
- mWin.mDisplayContent.mDividerControllerLocked.resetImeHideRequested();
- }
-
- return true;
- }
- return false;
- }
-
/**
* Have the surface flinger show a surface, robustly dealing with
* error conditions. In particular, if there is not enough memory
@@ -1863,6 +1699,7 @@
// frozen, there is no reason to animate and it can cause strange
// artifacts when we unfreeze the display if some different animation
// is running.
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "WSA#applyAnimationLocked");
if (mService.okToDisplay()) {
int anim = mPolicy.selectAnimationLw(mWin, transit);
int attr = -1;
@@ -1902,6 +1739,8 @@
} else {
clearAnimation();
}
+ Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
+
if (mWin.mAttrs.type == TYPE_INPUT_METHOD) {
mService.adjustForImeIfNeeded(mWin.mDisplayContent);
if (isEntrance) {
@@ -2044,8 +1883,7 @@
mDeferTransactionUntilFrame = frameNumber;
mDeferTransactionTime = System.currentTimeMillis();
mSurfaceController.deferTransactionUntil(
- mWin.mAttachedWindow.mWinAnimator.mSurfaceController.getHandle(),
- frameNumber);
+ mWin.getParentWindow().mWinAnimator.mSurfaceController.getHandle(), frameNumber);
}
// Defer the current transaction to the frame number of the last saved transaction.
@@ -2064,7 +1902,7 @@
mDeferTransactionUntilFrame = -1;
} else {
mSurfaceController.deferTransactionUntil(
- mWin.mAttachedWindow.mWinAnimator.mSurfaceController.getHandle(),
+ mWin.getParentWindow().mWinAnimator.mSurfaceController.getHandle(),
mDeferTransactionUntilFrame);
}
}
@@ -2147,11 +1985,12 @@
// (in the new coordinate space). We then freeze layer updates until the resize
// occurs, at which point we undo, them.
if (w.isChildWindow() && mSurfaceController.getTransformToDisplayInverse()) {
- frameRect.set(x, y, x+width, y+height);
+ frameRect.set(x, y, x + width, y + height);
transform.mapRect(frameRect);
- w.mAttrs.x = (int) frameRect.left - w.mAttachedWindow.mFrame.left;
- w.mAttrs.y = (int) frameRect.top - w.mAttachedWindow.mFrame.top;
+ final Rect parentWindowFrame = w.getParentWindow().mFrame;
+ w.mAttrs.x = (int) frameRect.left - parentWindowFrame.left;
+ w.mAttrs.y = (int) frameRect.top - parentWindowFrame.top;
w.mAttrs.width = (int) Math.ceil(frameRect.width());
w.mAttrs.height = (int) Math.ceil(frameRect.height());
diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java
index 3121415..c77e572 100644
--- a/services/core/java/com/android/server/wm/WindowSurfaceController.java
+++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java
@@ -84,9 +84,10 @@
// to a black-out layer placed one Z-layer below the surface.
// This prevents holes to whatever app/wallpaper is underneath.
if (animator.mWin.isChildWindow() &&
- animator.mWin.mSubLayer < 0) {
+ animator.mWin.mSubLayer < 0 &&
+ animator.mWin.mAppToken != null) {
mSurfaceControl = new SurfaceControlWithBackground(s,
- name, w, h, format, flags);
+ name, w, h, format, flags, animator.mWin.mAppToken);
} else if (DEBUG_SURFACE_TRACE) {
mSurfaceControl = new SurfaceTrace(
s, name, w, h, format, flags);
@@ -758,18 +759,25 @@
}
}
- private static class SurfaceControlWithBackground extends SurfaceControl {
+ class SurfaceControlWithBackground extends SurfaceControl {
private SurfaceControl mBackgroundControl;
private boolean mOpaque = true;
- private boolean mVisible = false;
+ private boolean mAppForcedInvisible = false;
+ private AppWindowToken mAppToken;
+ public boolean mVisible = false;
+ public int mLayer = -1;
public SurfaceControlWithBackground(SurfaceSession s,
- String name, int w, int h, int format, int flags)
+ String name, int w, int h, int format, int flags,
+ AppWindowToken token)
throws OutOfResourcesException {
super(s, name, w, h, format, flags);
mBackgroundControl = new SurfaceControl(s, name, w, h,
PixelFormat.OPAQUE, flags | SurfaceControl.FX_SURFACE_DIM);
mOpaque = (flags & SurfaceControl.OPAQUE) != 0;
+ mAppToken = token;
+
+ mAppToken.addSurfaceViewBackground(this);
}
@Override
@@ -782,6 +790,10 @@
public void setLayer(int zorder) {
super.setLayer(zorder);
mBackgroundControl.setLayer(zorder - 1);
+ if (mLayer != zorder) {
+ mLayer = zorder;
+ mAppToken.updateSurfaceViewBackgroundVisibilities();
+ }
}
@Override
@@ -818,7 +830,7 @@
public void setOpaque(boolean isOpaque) {
super.setOpaque(isOpaque);
mOpaque = isOpaque;
- updateBackgroundVisibility();
+ updateBackgroundVisibility(mAppForcedInvisible);
}
@Override
@@ -834,23 +846,28 @@
@Override
public void hide() {
- mVisible = false;
super.hide();
- updateBackgroundVisibility();
+ if (mVisible) {
+ mVisible = false;
+ mAppToken.updateSurfaceViewBackgroundVisibilities();
+ }
}
@Override
public void show() {
- mVisible = true;
super.show();
- updateBackgroundVisibility();
+ if (!mVisible) {
+ mVisible = true;
+ mAppToken.updateSurfaceViewBackgroundVisibilities();
+ }
}
@Override
public void destroy() {
super.destroy();
mBackgroundControl.destroy();
- }
+ mAppToken.removeSurfaceViewBackground(this);
+ }
@Override
public void release() {
@@ -870,8 +887,9 @@
mBackgroundControl.deferTransactionUntil(handle, frame);
}
- private void updateBackgroundVisibility() {
- if (mOpaque && mVisible) {
+ void updateBackgroundVisibility(boolean forcedInvisible) {
+ mAppForcedInvisible = forcedInvisible;
+ if (mOpaque && mVisible && !mAppForcedInvisible) {
mBackgroundControl.show();
} else {
mBackgroundControl.hide();
diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
index 359063c..95f5d42 100644
--- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
+++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
@@ -9,7 +9,6 @@
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE;
-import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
import static android.view.WindowManager.LayoutParams.TYPE_DREAM;
import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;
import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
@@ -214,9 +213,9 @@
recoveringMemory = true;
// Wait a little bit for things to settle down, and off we go.
while (!mService.mForceRemoves.isEmpty()) {
- WindowState ws = mService.mForceRemoves.remove(0);
+ final WindowState ws = mService.mForceRemoves.remove(0);
Slog.i(TAG, "Force removing: " + ws);
- mService.removeWindowInnerLocked(ws);
+ ws.remove();
}
Slog.w(TAG, "Due to memory failure, waiting a bit for next layout");
Object tmp = new Object();
@@ -545,8 +544,8 @@
mService.mPendingRemove.clear();
DisplayContentList displayList = new DisplayContentList();
for (i = 0; i < N; i++) {
- WindowState w = mService.mPendingRemoveTmp[i];
- mService.removeWindowInnerLocked(w);
+ final WindowState w = mService.mPendingRemoveTmp[i];
+ w.remove();
final DisplayContent displayContent = w.getDisplayContent();
if (displayContent != null && !displayList.contains(displayContent)) {
displayList.add(displayContent);
@@ -664,8 +663,8 @@
for (int i = windows.size() - 1; i >= 0; i--) {
WindowState w = windows.get(i);
if (w.mHasSurface) {
- mService.mPolicy.applyPostLayoutPolicyLw(w, w.mAttrs,
- w.mAttachedWindow);
+ mService.mPolicy.applyPostLayoutPolicyLw(
+ w, w.mAttrs, w.getParentWindow());
}
}
displayContent.pendingLayoutChanges |=
@@ -811,7 +810,7 @@
+ winAnimator.mSurfaceController
+ " pv=" + w.mPolicyVisibility
+ " mDrawState=" + winAnimator.drawStateToString()
- + " ah=" + w.mAttachedHidden
+ + " ph=" + w.isParentWindowHidden()
+ " th=" + atoken.hiddenRequested
+ " a=" + winAnimator.mAnimating);
}
@@ -959,13 +958,13 @@
+ win.mRelayoutCalled + " hidden="
+ win.mRootToken.hidden + " hiddenRequested="
+ (atoken != null && atoken.hiddenRequested)
- + " mAttachedHidden=" + win.mAttachedHidden);
+ + " parentHidden=" + win.isParentWindowHidden());
else Slog.v(TAG, " VIS: mViewVisibility="
+ win.mViewVisibility + " mRelayoutCalled="
+ win.mRelayoutCalled + " hidden="
+ win.mRootToken.hidden + " hiddenRequested="
+ (atoken != null && atoken.hiddenRequested)
- + " mAttachedHidden=" + win.mAttachedHidden);
+ + " parentHidden=" + win.isParentWindowHidden());
}
// If this view is GONE, then skip it -- keep the current
@@ -974,7 +973,7 @@
// windows, since that means "perform layout as normal,
// just don't display").
if (!gone || !win.mHaveFrame || win.mLayoutNeeded
- || ((win.isConfigChanged() || win.setInsetsChanged())
+ || ((win.isConfigChanged() || win.setReportResizeHints())
&& !win.isGoneForLayoutLw() &&
((win.mAttrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 ||
(win.mHasSurface && win.mAppToken != null &&
@@ -1041,7 +1040,7 @@
}
win.mLayoutNeeded = false;
win.prelayout();
- mService.mPolicy.layoutWindowLw(win, win.mAttachedWindow);
+ mService.mPolicy.layoutWindowLw(win, win.getParentWindow());
win.mLayoutSeq = seq;
if (DEBUG_LAYOUT) Slog.v(TAG,
" LAYOUT: mFrame=" + win.mFrame + " mContainingFrame="
@@ -1074,6 +1073,8 @@
if (!transitionGoodToGo(appsCount)) {
return 0;
}
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "AppTransitionReady");
+
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "**** GOOD TO GO");
int transit = mService.mAppTransition.getAppTransition();
if (mService.mSkipAppTransitionAnimation) {
@@ -1095,6 +1096,26 @@
boolean fullscreenAnim = false;
boolean voiceInteraction = false;
+ int i;
+ for (i = 0; i < appsCount; i++) {
+ final AppWindowToken wtoken = mService.mOpeningApps.valueAt(i);
+ // Clearing the mAnimatingExit flag before entering animation. It's set to
+ // true if app window is removed, or window relayout to invisible.
+ // This also affects window visibility. We need to clear it *before*
+ // maybeUpdateTransitToWallpaper() as the transition selection depends on
+ // wallpaper target visibility.
+ wtoken.clearAnimatingFlags();
+
+ }
+ // Adjust wallpaper before we pull the lower/upper target, since pending changes
+ // (like the clearAnimatingFlags() above) might affect wallpaper target result.
+ final DisplayContent displayContent = mService.getDefaultDisplayContentLocked();
+ if ((displayContent.pendingLayoutChanges & FINISH_LAYOUT_REDO_WALLPAPER) != 0 &&
+ mWallpaperControllerLocked.adjustWallpaperWindows()) {
+ mService.mLayersController.assignLayersLocked(windows);
+ displayContent.layoutNeeded = true;
+ }
+
final WindowState lowerWallpaperTarget =
mWallpaperControllerLocked.getLowerWallpaperTarget();
final WindowState upperWallpaperTarget =
@@ -1111,7 +1132,6 @@
upperWallpaperAppToken = upperWallpaperTarget.mAppToken;
}
- int i;
// Do a first pass through the tokens for two
// things:
// (1) Determine if both the closing and opening
@@ -1181,6 +1201,8 @@
final AppWindowToken topOpeningApp = handleOpeningApps(transit,
animLp, voiceInteraction, topClosingLayer);
+ mService.mAppTransition.setLastAppTransition(transit, topOpeningApp, topClosingApp);
+
final AppWindowAnimator openingAppAnimator = (topOpeningApp == null) ? null :
topOpeningApp.mAppAnimator;
final AppWindowAnimator closingAppAnimator = (topClosingApp == null) ? null :
@@ -1196,7 +1218,7 @@
// This has changed the visibility of windows, so perform
// a new layout to get them all up-to-date.
- mService.getDefaultDisplayContentLocked().layoutNeeded = true;
+ displayContent.layoutNeeded = true;
// TODO(multidisplay): IMEs are only supported on the default display.
if (windows == mService.getDefaultWindowListLocked()
@@ -1207,6 +1229,9 @@
true /*updateInputWindows*/);
mService.mFocusMayChange = false;
mService.notifyActivityDrawnForKeyguard();
+
+ Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
+
return FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG;
}
@@ -1257,26 +1282,6 @@
int layer = -1;
for (int j = 0; j < wtoken.allAppWindows.size(); j++) {
final WindowState win = wtoken.allAppWindows.get(j);
- // Clearing the mAnimatingExit flag before entering animation. It will be set to true
- // if app window is removed, or window relayout to invisible. We don't want to
- // clear it out for windows that get replaced, because the animation depends on
- // the flag to remove the replaced window.
- //
- // We also don't clear the mAnimatingExit flag for windows which have the
- // mRemoveOnExit flag. This indicates an explicit remove request has been issued
- // by the client. We should let animation proceed and not clear this flag or
- // they won't eventually be removed by WindowStateAnimator#finishExit.
- if (!win.mWillReplaceWindow && !win.mRemoveOnExit) {
- win.mAnimatingExit = false;
- // Clear mAnimating flag together with mAnimatingExit. When animation
- // changes from exiting to entering, we need to clear this flag until the
- // new animation gets applied, so that isAnimationStarting() becomes true
- // until then.
- // Otherwise applySurfaceChangesTransaction will faill to skip surface
- // placement for this window during this period, one or more frame will
- // show up with wrong position or scale.
- win.mWinAnimator.mAnimating = false;
- }
if (win.mWinAnimator.mAnimLayer > layer) {
layer = win.mWinAnimator.mAnimLayer;
}
diff --git a/services/core/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp
index 407c072..8f6f613 100644
--- a/services/core/jni/com_android_server_AlarmManagerService.cpp
+++ b/services/core/jni/com_android_server_AlarmManagerService.cpp
@@ -37,11 +37,39 @@
#include <errno.h>
#include <unistd.h>
#include <linux/ioctl.h>
-#include <linux/android_alarm.h>
#include <linux/rtc.h>
#include <memory>
+//--------------------------------------------------------------------------
+// The android_alarm.h header has been deleted from the kernel headers.
+// Add only the parts still needed, this should be deleted in the future.
+#include <linux/ioctl.h>
+
+enum android_alarm_type {
+ ANDROID_ALARM_RTC_WAKEUP,
+ ANDROID_ALARM_RTC,
+ ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP,
+ ANDROID_ALARM_ELAPSED_REALTIME,
+ ANDROID_ALARM_SYSTEMTIME,
+ ANDROID_ALARM_TYPE_COUNT,
+};
+
+enum android_alarm_return_flags {
+ ANDROID_ALARM_RTC_WAKEUP_MASK = 1U << ANDROID_ALARM_RTC_WAKEUP,
+ ANDROID_ALARM_RTC_MASK = 1U << ANDROID_ALARM_RTC,
+ ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK = 1U << ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP,
+ ANDROID_ALARM_ELAPSED_REALTIME_MASK = 1U << ANDROID_ALARM_ELAPSED_REALTIME,
+ ANDROID_ALARM_SYSTEMTIME_MASK = 1U << ANDROID_ALARM_SYSTEMTIME,
+ ANDROID_ALARM_TIME_CHANGE_MASK = 1U << 16
+};
+
+#define ALARM_IOW(c,type,size) _IOW('a', (c) | ((type) << 4), size)
+#define ANDROID_ALARM_WAIT _IO('a', 1)
+#define ANDROID_ALARM_SET(type) ALARM_IOW(2, type, struct timespec)
+#define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec)
+//--------------------------------------------------------------------------
+
namespace android {
static const size_t N_ANDROID_TIMERFDS = ANDROID_ALARM_TYPE_COUNT + 1;
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 3d11e05..4ba423d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -218,6 +218,8 @@
private static final String ATTR_SETUP_COMPLETE = "setup-complete";
private static final String ATTR_PROVISIONING_STATE = "provisioning-state";
private static final String ATTR_PERMISSION_POLICY = "permission-policy";
+ private static final String ATTR_DEVICE_PROVISIONING_CONFIG_APPLIED =
+ "device-provisioning-config-applied";
private static final String ATTR_DELEGATED_CERT_INSTALLER = "delegated-cert-installer";
private static final String ATTR_APPLICATION_RESTRICTIONS_MANAGER
@@ -417,6 +419,8 @@
int mUserProvisioningState;
int mPermissionPolicy;
+ boolean mDeviceProvisioningConfigApplied = false;
+
final ArrayMap<ComponentName, ActiveAdmin> mAdminMap = new ArrayMap<>();
final ArrayList<ActiveAdmin> mAdminList = new ArrayList<>();
final ArrayList<ComponentName> mRemovingAdmins = new ArrayList<>();
@@ -486,7 +490,7 @@
}
if (Intent.ACTION_USER_UNLOCKED.equals(action)
|| Intent.ACTION_USER_STARTED.equals(action)
- || KeyChain.ACTION_STORAGE_CHANGED.equals(action)) {
+ || KeyChain.ACTION_TRUST_STORE_CHANGED.equals(action)) {
int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_ALL);
new MonitoringCertNotificationTask().execute(userId);
}
@@ -1585,7 +1589,7 @@
filter.addAction(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_USER_STARTED);
filter.addAction(Intent.ACTION_USER_UNLOCKED);
- filter.addAction(KeyChain.ACTION_STORAGE_CHANGED);
+ filter.addAction(KeyChain.ACTION_TRUST_STORE_CHANGED);
filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, mHandler);
filter = new IntentFilter();
@@ -2173,6 +2177,10 @@
out.attribute(null, ATTR_SETUP_COMPLETE,
Boolean.toString(true));
}
+ if (policy.mDeviceProvisioningConfigApplied) {
+ out.attribute(null, ATTR_DEVICE_PROVISIONING_CONFIG_APPLIED,
+ Boolean.toString(true));
+ }
if (policy.mUserProvisioningState != DevicePolicyManager.STATE_USER_UNMANAGED) {
out.attribute(null, ATTR_PROVISIONING_STATE,
Integer.toString(policy.mUserProvisioningState));
@@ -2333,6 +2341,12 @@
if (userSetupComplete != null && Boolean.toString(true).equals(userSetupComplete)) {
policy.mUserSetupComplete = true;
}
+ String deviceProvisioningConfigApplied = parser.getAttributeValue(null,
+ ATTR_DEVICE_PROVISIONING_CONFIG_APPLIED);
+ if (deviceProvisioningConfigApplied != null
+ && Boolean.toString(true).equals(deviceProvisioningConfigApplied)) {
+ policy.mDeviceProvisioningConfigApplied = true;
+ }
String provisioningState = parser.getAttributeValue(null, ATTR_PROVISIONING_STATE);
if (!TextUtils.isEmpty(provisioningState)) {
policy.mUserProvisioningState = Integer.parseInt(provisioningState);
@@ -3658,12 +3672,16 @@
private boolean isActivePasswordSufficientForUserLocked(
DevicePolicyData policy, int userHandle, boolean parent) {
- if (policy.mActivePasswordQuality < getPasswordQuality(null, userHandle, parent)
- || policy.mActivePasswordLength < getPasswordMinimumLength(
+ final int requiredPasswordQuality = getPasswordQuality(null, userHandle, parent);
+ if (policy.mActivePasswordQuality < requiredPasswordQuality) {
+ return false;
+ }
+ if (requiredPasswordQuality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC
+ && policy.mActivePasswordLength < getPasswordMinimumLength(
null, userHandle, parent)) {
return false;
}
- if (policy.mActivePasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
+ if (requiredPasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
return true;
}
return policy.mActivePasswordUpperCase >= getPasswordMinimumUpperCase(
@@ -4427,6 +4445,7 @@
intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URI, uri);
intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_ALIAS, alias);
intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_RESPONSE, response);
+ intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
final long id = mInjector.binderClearCallingIdentity();
try {
@@ -5096,10 +5115,6 @@
boolean legacyApp = false;
if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
legacyApp = true;
- } else if ("com.google.android.apps.enterprise.dmagent".equals(ai.packageName)
- && ai.versionCode == 697) {
- // TODO: STOPSHIP remove this (revert ag/895987) once a new prebuilt is dropped
- legacyApp = true;
}
final int rawStatus = getEncryptionStatus();
@@ -6083,7 +6098,13 @@
getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
final int userId = UserHandle.getCallingUserId();
enforceManagedProfile(userId, "enable the profile");
-
+ // Check if the profile is already enabled.
+ UserInfo managedProfile = getUserInfo(userId);
+ if (managedProfile.isEnabled()) {
+ Slog.e(LOG_TAG,
+ "setProfileEnabled is called when the profile is already enabled");
+ return;
+ }
long id = mInjector.binderClearCallingIdentity();
try {
mUserManager.setUserEnabled(userId);
@@ -7919,17 +7940,7 @@
Preconditions.checkNotNull(who, "ComponentName is null");
synchronized (this) {
getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
- int userId = UserHandle.getCallingUserId();
- long identity = mInjector.binderClearCallingIdentity();
- try {
- IAudioService iAudioService = IAudioService.Stub.asInterface(
- ServiceManager.getService(Context.AUDIO_SERVICE));
- iAudioService.setMasterMute(on, 0, mContext.getPackageName(), userId);
- } catch (RemoteException re) {
- Slog.e(LOG_TAG, "Failed to setMasterMute", re);
- } finally {
- mInjector.binderRestoreCallingIdentity(identity);
- }
+ setUserRestriction(who, UserManager.DISALLLOW_UNMUTE_DEVICE, on);
}
}
@@ -8244,6 +8255,12 @@
@Override
public SystemUpdatePolicy getSystemUpdatePolicy() {
+ if (UserManager.isDeviceInDemoMode(mContext)) {
+ // Pretending to have an automatic update policy when the device is in retail demo
+ // mode. This will allow the device to download and install an ota without
+ // any user interaction.
+ return SystemUpdatePolicy.createAutomaticInstallPolicy();
+ }
synchronized (this) {
SystemUpdatePolicy policy = mOwners.getSystemUpdatePolicy();
if (policy != null && !policy.isValid()) {
@@ -9019,6 +9036,11 @@
}
}
+ @Override
+ public boolean isDeviceProvisioned() {
+ return !TextUtils.isEmpty(mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT));
+ }
+
private void removePackageIfRequired(final String packageName, final int userId) {
if (!packageHasActiveAdmins(packageName, userId)) {
// Will not do anything if uninstall was not requested or was already started.
@@ -9085,4 +9107,23 @@
// restrictions.
pushUserRestrictions(userHandle);
}
+
+ @Override
+ public void setDeviceProvisioningConfigApplied() {
+ enforceManageUsers();
+ synchronized (this) {
+ DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);
+ policy.mDeviceProvisioningConfigApplied = true;
+ saveSettingsLocked(UserHandle.USER_SYSTEM);
+ }
+ }
+
+ @Override
+ public boolean isDeviceProvisioningConfigApplied() {
+ enforceManageUsers();
+ synchronized (this) {
+ final DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);
+ return policy.mDeviceProvisioningConfigApplied;
+ }
+ }
}
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index dcdf0e8..75b4dae 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -51,6 +51,7 @@
import android.view.WindowManager;
import com.android.internal.R;
+import com.android.internal.app.NightDisplayController;
import com.android.internal.os.BinderInternal;
import com.android.internal.os.SamplingProfilerIntegration;
import com.android.internal.os.ZygoteInit;
@@ -63,6 +64,7 @@
import com.android.server.connectivity.MetricsLoggerService;
import com.android.server.devicepolicy.DevicePolicyManagerService;
import com.android.server.display.DisplayManagerService;
+import com.android.server.display.NightDisplayService;
import com.android.server.dreams.DreamManagerService;
import com.android.server.fingerprint.FingerprintService;
import com.android.server.hdmi.HdmiControlService;
@@ -84,6 +86,7 @@
import com.android.server.pm.PackageManagerService;
import com.android.server.pm.ShortcutService;
import com.android.server.pm.UserManagerService;
+import com.android.server.policy.PhoneWindowManager;
import com.android.server.power.PowerManagerService;
import com.android.server.power.ShutdownThread;
import com.android.server.restrictions.RestrictionsManagerService;
@@ -157,6 +160,8 @@
"com.google.android.clockwork.ThermalObserver";
private static final String WEAR_BLUETOOTH_SERVICE_CLASS =
"com.google.android.clockwork.bluetooth.WearBluetoothService";
+ private static final String WEAR_WIFI_MEDIATOR_SERVICE_CLASS =
+ "com.google.android.clockwork.wifi.WearWifiMediatorService";
private static final String WEAR_TIME_SERVICE_CLASS =
"com.google.android.clockwork.time.WearTimeService";
private static final String ACCOUNT_SERVICE_CLASS =
@@ -612,7 +617,7 @@
traceBeginAndSlog("StartWindowManagerService");
wm = WindowManagerService.main(context, inputManager,
mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL,
- !mFirstBoot, mOnlyCore);
+ !mFirstBoot, mOnlyCore, new PhoneWindowManager());
ServiceManager.addService(Context.WINDOW_SERVICE, wm);
ServiceManager.addService(Context.INPUT_SERVICE, inputManager);
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
@@ -724,14 +729,6 @@
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
- try {
- ActivityManagerNative.getDefault().showBootMessage(
- context.getResources().getText(
- com.android.internal.R.string.android_upgrading_starting_apps),
- false);
- } catch (RemoteException e) {
- }
-
if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {
if (!disableNonCoreServices) {
traceBeginAndSlog("StartLockSettingsService");
@@ -1007,6 +1004,10 @@
mSystemServiceManager.startService(TwilightService.class);
+ if (NightDisplayController.isAvailable(context)) {
+ mSystemServiceManager.startService(NightDisplayService.class);
+ }
+
mSystemServiceManager.startService(JobSchedulerService.class);
mSystemServiceManager.startService(SoundTriggerService.class);
@@ -1169,6 +1170,7 @@
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);
+ mSystemServiceManager.startService(WEAR_WIFI_MEDIATOR_SERVICE_CLASS);
if (!disableNonCoreServices) {
mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);
}
diff --git a/services/net/java/android/net/apf/ApfFilter.java b/services/net/java/android/net/apf/ApfFilter.java
index ce37426..4bb0902 100644
--- a/services/net/java/android/net/apf/ApfFilter.java
+++ b/services/net/java/android/net/apf/ApfFilter.java
@@ -18,15 +18,21 @@
import static android.system.OsConstants.*;
+import android.os.SystemClock;
import android.net.LinkProperties;
import android.net.NetworkUtils;
import android.net.apf.ApfGenerator;
import android.net.apf.ApfGenerator.IllegalInstructionException;
import android.net.apf.ApfGenerator.Register;
import android.net.ip.IpManager;
+import android.net.metrics.ApfProgramEvent;
+import android.net.metrics.ApfStats;
+import android.net.metrics.IpConnectivityLog;
+import android.net.metrics.RaEvent;
import android.system.ErrnoException;
import android.system.Os;
import android.system.PacketSocketAddress;
+import android.text.format.DateUtils;
import android.util.Log;
import android.util.Pair;
@@ -69,6 +75,17 @@
* @hide
*/
public class ApfFilter {
+
+ // Enums describing the outcome of receiving an RA packet.
+ private static enum ProcessRaResult {
+ MATCH, // Received RA matched a known RA
+ DROPPED, // Received RA ignored due to MAX_RAS
+ PARSE_ERROR, // Received RA could not be parsed
+ ZERO_LIFETIME, // Received RA had 0 lifetime
+ UPDATE_NEW_RA, // APF program updated for new RA
+ UPDATE_EXPIRY // APF program updated for expiry
+ }
+
// Thread to listen for RAs.
@VisibleForTesting
class ReceiveThread extends Thread {
@@ -76,6 +93,16 @@
private final FileDescriptor mSocket;
private volatile boolean mStopped;
+ // Starting time of the RA receiver thread.
+ private final long mStart = SystemClock.elapsedRealtime();
+
+ private int mReceivedRas; // Number of received RAs
+ private int mMatchingRas; // Number of received RAs matching a known RA
+ private int mDroppedRas; // Number of received RAs ignored due to the MAX_RAS limit
+ private int mParseErrors; // Number of received RAs that could not be parsed
+ private int mZeroLifetimeRas; // Number of received RAs with a 0 lifetime
+ private int mProgramUpdates; // Number of APF program updates triggered by receiving a RA
+
public ReceiveThread(FileDescriptor socket) {
mSocket = socket;
}
@@ -94,13 +121,46 @@
while (!mStopped) {
try {
int length = Os.read(mSocket, mPacket, 0, mPacket.length);
- processRa(mPacket, length);
+ updateStats(processRa(mPacket, length));
} catch (IOException|ErrnoException e) {
if (!mStopped) {
Log.e(TAG, "Read error", e);
}
}
}
+ logStats();
+ }
+
+ private void updateStats(ProcessRaResult result) {
+ mReceivedRas++;
+ switch(result) {
+ case MATCH:
+ mMatchingRas++;
+ return;
+ case DROPPED:
+ mDroppedRas++;
+ return;
+ case PARSE_ERROR:
+ mParseErrors++;
+ return;
+ case ZERO_LIFETIME:
+ mZeroLifetimeRas++;
+ return;
+ case UPDATE_EXPIRY:
+ mMatchingRas++;
+ mProgramUpdates++;
+ return;
+ case UPDATE_NEW_RA:
+ mProgramUpdates++;
+ return;
+ }
+ }
+
+ private void logStats() {
+ long durationMs = SystemClock.elapsedRealtime() - mStart;
+ int maxSize = mApfCapabilities.maximumApfProgramSize;
+ mMetricsLog.log(new ApfStats(durationMs, mReceivedRas, mMatchingRas, mDroppedRas,
+ mZeroLifetimeRas, mParseErrors, mProgramUpdates, maxSize));
}
}
@@ -120,6 +180,7 @@
private static final int IPV4_FRAGMENT_OFFSET_MASK = 0x1fff;
private static final int IPV4_PROTOCOL_OFFSET = ETH_HEADER_LEN + 9;
private static final int IPV4_DEST_ADDR_OFFSET = ETH_HEADER_LEN + 16;
+ private static final int IPV4_ANY_HOST_ADDRESS = 0;
private static final int IPV6_NEXT_HEADER_OFFSET = ETH_HEADER_LEN + 6;
private static final int IPV6_SRC_ADDR_OFFSET = ETH_HEADER_LEN + 8;
@@ -131,6 +192,7 @@
private static final int ICMP6_TYPE_OFFSET = ETH_HEADER_LEN + IPV6_HEADER_LEN;
private static final int ICMP6_NEIGHBOR_ANNOUNCEMENT = 136;
+ private static final int ICMP6_ROUTER_ADVERTISEMENT = 134;
// NOTE: this must be added to the IPv4 header length in IPV4_HEADER_SIZE_MEMORY_SLOT
private static final int UDP_DESTINATION_PORT_OFFSET = ETH_HEADER_LEN + 2;
@@ -140,19 +202,22 @@
// NOTE: this must be added to the IPv4 header length in IPV4_HEADER_SIZE_MEMORY_SLOT
private static final int DHCP_CLIENT_MAC_OFFSET = ETH_HEADER_LEN + UDP_HEADER_LEN + 28;
- private static int ARP_HEADER_OFFSET = ETH_HEADER_LEN;
- private static final byte[] ARP_IPV4_REQUEST_HEADER = new byte[]{
+ private static final int ARP_HEADER_OFFSET = ETH_HEADER_LEN;
+ private static final int ARP_OPCODE_OFFSET = ARP_HEADER_OFFSET + 6;
+ private static final short ARP_OPCODE_REQUEST = 1;
+ private static final short ARP_OPCODE_REPLY = 2;
+ private static final byte[] ARP_IPV4_HEADER = new byte[]{
0, 1, // Hardware type: Ethernet (1)
8, 0, // Protocol type: IP (0x0800)
6, // Hardware size: 6
4, // Protocol size: 4
- 0, 1 // Opcode: request (1)
};
- private static int ARP_TARGET_IP_ADDRESS_OFFSET = ETH_HEADER_LEN + 24;
+ private static final int ARP_TARGET_IP_ADDRESS_OFFSET = ETH_HEADER_LEN + 24;
private final ApfCapabilities mApfCapabilities;
private final IpManager.Callback mIpManagerCallback;
private final NetworkInterface mNetworkInterface;
+ private final IpConnectivityLog mMetricsLog;
@VisibleForTesting
byte[] mHardwareAddress;
@VisibleForTesting
@@ -167,11 +232,12 @@
@VisibleForTesting
ApfFilter(ApfCapabilities apfCapabilities, NetworkInterface networkInterface,
- IpManager.Callback ipManagerCallback, boolean multicastFilter) {
+ IpManager.Callback ipManagerCallback, boolean multicastFilter, IpConnectivityLog log) {
mApfCapabilities = apfCapabilities;
mIpManagerCallback = ipManagerCallback;
mNetworkInterface = networkInterface;
mMulticastFilter = multicastFilter;
+ mMetricsLog = log;
maybeStartFilter();
}
@@ -212,8 +278,9 @@
}
// Returns seconds since Unix Epoch.
+ // TODO: use SystemClock.elapsedRealtime() instead
private static long curTime() {
- return System.currentTimeMillis() / 1000L;
+ return System.currentTimeMillis() / DateUtils.SECOND_IN_MILLIS;
}
// A class to hold information about an RA.
@@ -296,7 +363,7 @@
}
// Can't be static because it's in a non-static inner class.
- // TODO: Make this final once RA is its own class.
+ // TODO: Make this static once RA is its own class.
private int uint8(byte b) {
return b & 0xff;
}
@@ -305,8 +372,16 @@
return s & 0xffff;
}
- private long uint32(int s) {
- return s & 0xffffffff;
+ private long uint32(int i) {
+ return i & 0xffffffffL;
+ }
+
+ private long getUint16(ByteBuffer buffer, int position) {
+ return uint16(buffer.getShort(position));
+ }
+
+ private long getUint32(ByteBuffer buffer, int position) {
+ return uint32(buffer.getInt(position));
}
private void prefixOptionToString(StringBuffer sb, int offset) {
@@ -355,7 +430,7 @@
* @param lifetimeOffset offset from mPacket.position() to the next lifetime data.
* @param lifetimeLength length of the next lifetime data.
* @return offset within packet of where the next binary range of data not including
- * a lifetime. This can be passed into the next invocation of this function
+ * a lifetime. This can be passed into the next invocation of this function
* via {@code lastNonLifetimeStart}.
*/
private int addNonLifetime(int lastNonLifetimeStart, int lifetimeOffset,
@@ -366,15 +441,30 @@
return lifetimeOffset + lifetimeLength;
}
+ private int addNonLifetimeU32(int lastNonLifetimeStart) {
+ return addNonLifetime(lastNonLifetimeStart,
+ ICMP6_4_BYTE_LIFETIME_OFFSET, ICMP6_4_BYTE_LIFETIME_LEN);
+ }
+
// Note that this parses RA and may throw IllegalArgumentException (from
// Buffer.position(int) or due to an invalid-length option) or IndexOutOfBoundsException
// (from ByteBuffer.get(int) ) if parsing encounters something non-compliant with
// specifications.
Ra(byte[] packet, int length) {
- mPacket = ByteBuffer.allocate(length).put(ByteBuffer.wrap(packet, 0, length));
- mPacket.clear();
+ mPacket = ByteBuffer.wrap(Arrays.copyOf(packet, length));
mLastSeen = curTime();
+ // Sanity check packet in case a packet arrives before we attach RA filter
+ // to our packet socket. b/29586253
+ if (getUint16(mPacket, ETH_ETHERTYPE_OFFSET) != ETH_P_IPV6 ||
+ uint8(mPacket.get(IPV6_NEXT_HEADER_OFFSET)) != IPPROTO_ICMPV6 ||
+ uint8(mPacket.get(ICMP6_TYPE_OFFSET)) != ICMP6_ROUTER_ADVERTISEMENT) {
+ throw new IllegalArgumentException("Not an ICMP6 router advertisement");
+ }
+
+
+ RaEvent.Builder builder = new RaEvent.Builder();
+
// Ignore the checksum.
int lastNonLifetimeStart = addNonLifetime(0,
ICMP6_RA_CHECKSUM_OFFSET,
@@ -384,35 +474,50 @@
lastNonLifetimeStart = addNonLifetime(lastNonLifetimeStart,
ICMP6_RA_ROUTER_LIFETIME_OFFSET,
ICMP6_RA_ROUTER_LIFETIME_LEN);
+ builder.updateRouterLifetime(getUint16(mPacket, ICMP6_RA_ROUTER_LIFETIME_OFFSET));
// Ensures that the RA is not truncated.
mPacket.position(ICMP6_RA_OPTION_OFFSET);
while (mPacket.hasRemaining()) {
- int optionType = ((int)mPacket.get(mPacket.position())) & 0xff;
- int optionLength = (((int)mPacket.get(mPacket.position() + 1)) & 0xff) * 8;
+ final int position = mPacket.position();
+ final int optionType = uint8(mPacket.get(position));
+ final int optionLength = uint8(mPacket.get(position + 1)) * 8;
+ long lifetime;
switch (optionType) {
case ICMP6_PREFIX_OPTION_TYPE:
// Parse valid lifetime
lastNonLifetimeStart = addNonLifetime(lastNonLifetimeStart,
ICMP6_PREFIX_OPTION_VALID_LIFETIME_OFFSET,
ICMP6_PREFIX_OPTION_VALID_LIFETIME_LEN);
+ lifetime = getUint32(mPacket,
+ position + ICMP6_PREFIX_OPTION_VALID_LIFETIME_OFFSET);
+ builder.updatePrefixValidLifetime(lifetime);
// Parse preferred lifetime
lastNonLifetimeStart = addNonLifetime(lastNonLifetimeStart,
ICMP6_PREFIX_OPTION_PREFERRED_LIFETIME_OFFSET,
ICMP6_PREFIX_OPTION_PREFERRED_LIFETIME_LEN);
- mPrefixOptionOffsets.add(mPacket.position());
+ lifetime = getUint32(mPacket,
+ position + ICMP6_PREFIX_OPTION_PREFERRED_LIFETIME_OFFSET);
+ builder.updatePrefixPreferredLifetime(lifetime);
+ mPrefixOptionOffsets.add(position);
break;
- // These three options have the same lifetime offset and size, so process
- // together:
+ // These three options have the same lifetime offset and size, and
+ // are processed with the same specialized addNonLifetimeU32:
case ICMP6_RDNSS_OPTION_TYPE:
- mRdnssOptionOffsets.add(mPacket.position());
- // Fall through.
+ mRdnssOptionOffsets.add(position);
+ lastNonLifetimeStart = addNonLifetimeU32(lastNonLifetimeStart);
+ lifetime = getUint32(mPacket, position + ICMP6_4_BYTE_LIFETIME_OFFSET);
+ builder.updateRdnssLifetime(lifetime);
+ break;
case ICMP6_ROUTE_INFO_OPTION_TYPE:
+ lastNonLifetimeStart = addNonLifetimeU32(lastNonLifetimeStart);
+ lifetime = getUint32(mPacket, position + ICMP6_4_BYTE_LIFETIME_OFFSET);
+ builder.updateRouteInfoLifetime(lifetime);
+ break;
case ICMP6_DNSSL_OPTION_TYPE:
- // Parse lifetime
- lastNonLifetimeStart = addNonLifetime(lastNonLifetimeStart,
- ICMP6_4_BYTE_LIFETIME_OFFSET,
- ICMP6_4_BYTE_LIFETIME_LEN);
+ lastNonLifetimeStart = addNonLifetimeU32(lastNonLifetimeStart);
+ lifetime = getUint32(mPacket, position + ICMP6_4_BYTE_LIFETIME_OFFSET);
+ builder.updateDnsslLifetime(lifetime);
break;
default:
// RFC4861 section 4.2 dictates we ignore unknown options for fowards
@@ -423,11 +528,12 @@
throw new IllegalArgumentException(String.format(
"Invalid option length opt=%d len=%d", optionType, optionLength));
}
- mPacket.position(mPacket.position() + optionLength);
+ mPacket.position(position + optionLength);
}
// Mark non-lifetime bytes since last lifetime.
addNonLifetime(lastNonLifetimeStart, 0, 0);
mMinLifetime = minLifetime(packet, length);
+ mMetricsLog.log(builder.build());
}
// Ignoring lifetimes (which may change) does {@code packet} match this RA?
@@ -456,16 +562,19 @@
continue;
}
- int lifetimeLength = mNonLifetimes.get(i+1).first - offset;
- long val;
+ final int lifetimeLength = mNonLifetimes.get(i+1).first - offset;
+ final long optionLifetime;
switch (lifetimeLength) {
- case 2: val = byteBuffer.getShort(offset); break;
- case 4: val = byteBuffer.getInt(offset); break;
- default: throw new IllegalStateException("bogus lifetime size " + length);
+ case 2:
+ optionLifetime = uint16(byteBuffer.getShort(offset));
+ break;
+ case 4:
+ optionLifetime = uint32(byteBuffer.getInt(offset));
+ break;
+ default:
+ throw new IllegalStateException("bogus lifetime size " + lifetimeLength);
}
- // Mask to size, converting signed to unsigned
- val &= (1L << (lifetimeLength * 8)) - 1;
- minLifetime = Math.min(minLifetime, val);
+ minLifetime = Math.min(minLifetime, optionLifetime);
}
return minLifetime;
}
@@ -572,23 +681,48 @@
private void generateArpFilterLocked(ApfGenerator gen) throws IllegalInstructionException {
// Here's a basic summary of what the ARP filter program does:
//
- // if interface has IPv4 address:
- // if it's not an ARP IPv4 request:
- // pass
- // if it's not a request for our IPv4 address:
- // drop
+ // if not ARP IPv4
+ // pass
+ // if not ARP IPv4 reply or request
+ // pass
+ // if unicast ARP reply
+ // pass
+ // if interface has no IPv4 address
+ // if target ip is 0.0.0.0
+ // drop
+ // else
+ // if target ip is not the interface ip
+ // drop
// pass
- if (mIPv4Address != null) {
- // if it's not an ARP IPv4 request, pass
- gen.addLoadImmediate(Register.R0, ARP_HEADER_OFFSET);
- gen.addJumpIfBytesNotEqual(Register.R0, ARP_IPV4_REQUEST_HEADER, gen.PASS_LABEL);
- // if it's not a request for our IPv4 address, drop
+ final String checkTargetIPv4 = "checkTargetIPv4";
+
+ // Pass if not ARP IPv4.
+ gen.addLoadImmediate(Register.R0, ARP_HEADER_OFFSET);
+ gen.addJumpIfBytesNotEqual(Register.R0, ARP_IPV4_HEADER, gen.PASS_LABEL);
+
+ // Pass if unknown ARP opcode.
+ gen.addLoad16(Register.R0, ARP_OPCODE_OFFSET);
+ gen.addJumpIfR0Equals(ARP_OPCODE_REQUEST, checkTargetIPv4); // Skip to unicast check
+ gen.addJumpIfR0NotEquals(ARP_OPCODE_REPLY, gen.PASS_LABEL);
+
+ // Pass if unicast reply.
+ gen.addLoadImmediate(Register.R0, ETH_DEST_ADDR_OFFSET);
+ gen.addJumpIfBytesNotEqual(Register.R0, ETH_BROADCAST_MAC_ADDRESS, gen.PASS_LABEL);
+
+ // Either a unicast request, a unicast reply, or a broadcast reply.
+ gen.defineLabel(checkTargetIPv4);
+ if (mIPv4Address == null) {
+ // When there is no IPv4 address, drop GARP replies (b/29404209).
+ gen.addLoad32(Register.R0, ARP_TARGET_IP_ADDRESS_OFFSET);
+ gen.addJumpIfR0Equals(IPV4_ANY_HOST_ADDRESS, gen.DROP_LABEL);
+ } else {
+ // When there is an IPv4 address, drop unicast/broadcast requests
+ // and broadcast replies with a different target IPv4 address.
gen.addLoadImmediate(Register.R0, ARP_TARGET_IP_ADDRESS_OFFSET);
gen.addJumpIfBytesNotEqual(Register.R0, mIPv4Address, gen.DROP_LABEL);
}
- // Otherwise, pass
gen.addJump(gen.PASS_LABEL);
}
@@ -760,16 +894,19 @@
return gen;
}
+ /**
+ * Generate and install a new filter program.
+ */
@GuardedBy("this")
@VisibleForTesting
void installNewProgramLocked() {
purgeExpiredRasLocked();
+ ArrayList<Ra> rasToFilter = new ArrayList<>();
final byte[] program;
long programMinLifetime = Long.MAX_VALUE;
try {
// Step 1: Determine how many RA filters we can fit in the program.
ApfGenerator gen = beginProgramLocked();
- ArrayList<Ra> rasToFilter = new ArrayList<Ra>();
for (Ra ra : mRas) {
ra.generateFilterLocked(gen);
// Stop if we get too big.
@@ -797,17 +934,17 @@
hexDump("Installing filter: ", program, program.length);
}
mIpManagerCallback.installPacketFilter(program);
+ int flags = ApfProgramEvent.flagsFor(mIPv4Address != null, mMulticastFilter);
+ mMetricsLog.log(new ApfProgramEvent(
+ programMinLifetime, rasToFilter.size(), mRas.size(), program.length, flags));
}
- // Install a new filter program if the last installed one will die soon.
- @GuardedBy("this")
- private void maybeInstallNewProgramLocked() {
- if (mRas.size() == 0) return;
- // If the current program doesn't expire for a while, don't bother updating.
+ /**
+ * Returns {@code true} if a new program should be installed because the current one dies soon.
+ */
+ private boolean shouldInstallnewProgram() {
long expiry = mLastTimeInstalledProgram + mLastInstalledProgramMinLifetime;
- if (expiry < curTime() + MAX_PROGRAM_LIFETIME_WORTH_REFRESHING) {
- installNewProgramLocked();
- }
+ return expiry < curTime() + MAX_PROGRAM_LIFETIME_WORTH_REFRESHING;
}
private void hexDump(String msg, byte[] packet, int length) {
@@ -826,7 +963,12 @@
}
}
- private synchronized void processRa(byte[] packet, int length) {
+ /**
+ * Process an RA packet, updating the list of known RAs and installing a new APF program
+ * if the current APF program should be updated.
+ * @return a ProcessRaResult enum describing what action was performed.
+ */
+ private synchronized ProcessRaResult processRa(byte[] packet, int length) {
if (VDBG) hexDump("Read packet = ", packet, length);
// Have we seen this RA before?
@@ -848,25 +990,34 @@
// Swap to front of array.
mRas.add(0, mRas.remove(i));
- maybeInstallNewProgramLocked();
- return;
+ // If the current program doesn't expire for a while, don't update.
+ if (shouldInstallnewProgram()) {
+ installNewProgramLocked();
+ return ProcessRaResult.UPDATE_EXPIRY;
+ }
+ return ProcessRaResult.MATCH;
}
}
purgeExpiredRasLocked();
// TODO: figure out how to proceed when we've received more then MAX_RAS RAs.
- if (mRas.size() >= MAX_RAS) return;
+ if (mRas.size() >= MAX_RAS) {
+ return ProcessRaResult.DROPPED;
+ }
final Ra ra;
try {
ra = new Ra(packet, length);
} catch (Exception e) {
Log.e(TAG, "Error parsing RA: " + e);
- return;
+ return ProcessRaResult.PARSE_ERROR;
}
// Ignore 0 lifetime RAs.
- if (ra.isExpired()) return;
+ if (ra.isExpired()) {
+ return ProcessRaResult.ZERO_LIFETIME;
+ }
log("Adding " + ra);
mRas.add(ra);
installNewProgramLocked();
+ return ProcessRaResult.UPDATE_NEW_RA;
}
/**
@@ -891,7 +1042,8 @@
Log.e(TAG, "Unsupported APF version: " + apfCapabilities.apfVersionSupported);
return null;
}
- return new ApfFilter(apfCapabilities, networkInterface, ipManagerCallback, multicastFilter);
+ return new ApfFilter(apfCapabilities, networkInterface, ipManagerCallback,
+ multicastFilter, new IpConnectivityLog());
}
public synchronized void shutdown() {
diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index 96c852b..ffbea9f 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -30,6 +30,7 @@
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.NetworkUtils;
+import android.net.metrics.IpConnectivityLog;
import android.net.metrics.DhcpClientEvent;
import android.net.metrics.DhcpErrorEvent;
import android.os.Message;
@@ -163,6 +164,7 @@
// System services / libraries we use.
private final Context mContext;
private final Random mRandom;
+ private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();
// Sockets.
// - We use a packet socket to receive, because servers send us packets bound for IP addresses
@@ -192,6 +194,10 @@
private long mDhcpLeaseExpiry;
private DhcpResults mOffer;
+ // Milliseconds SystemClock timestamps used to record transition times to DhcpBoundState.
+ private long mLastInitEnterTime;
+ private long mLastBoundExitTime;
+
// States.
private State mStoppedState = new StoppedState();
private State mDhcpState = new DhcpState();
@@ -356,14 +362,14 @@
} catch (IOException|ErrnoException e) {
if (!mStopped) {
Log.e(TAG, "Read error", e);
- DhcpErrorEvent.logReceiveError(mIfaceName);
+ logError(DhcpErrorEvent.RECEIVE_ERROR);
}
} catch (DhcpPacket.ParseException e) {
Log.e(TAG, "Can't parse packet: " + e.getMessage());
if (PACKET_DBG) {
Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length));
}
- DhcpErrorEvent.logParseError(mIfaceName, e.errorCode);
+ logError(e.errorCode);
}
}
if (DBG) Log.d(TAG, "Receive thread stopped");
@@ -490,10 +496,18 @@
}
abstract class LoggingState extends State {
+ private long mEnterTimeMs;
+
@Override
public void enter() {
if (STATE_DBG) Log.d(TAG, "Entering state " + getName());
- DhcpClientEvent.logStateEvent(mIfaceName, getName());
+ mEnterTimeMs = SystemClock.elapsedRealtime();
+ }
+
+ @Override
+ public void exit() {
+ long durationMs = SystemClock.elapsedRealtime() - mEnterTimeMs;
+ logState(getName(), (int) durationMs);
}
private String messageName(int what) {
@@ -518,6 +532,13 @@
}
return NOT_HANDLED;
}
+
+ @Override
+ public String getName() {
+ // All DhcpClient's states are inner classes with a well defined name.
+ // Use getSimpleName() and avoid super's getName() creating new String instances.
+ return getClass().getSimpleName();
+ }
}
// Sends CMD_PRE_DHCP_ACTION to the controller, waits for the controller to respond with
@@ -544,10 +565,9 @@
}
}
- class StoppedState extends LoggingState {
+ class StoppedState extends State {
@Override
public boolean processMessage(Message message) {
- super.processMessage(message);
switch (message.what) {
case CMD_START_DHCP:
if (mRegisteredForPreDhcpNotification) {
@@ -576,10 +596,9 @@
}
}
- class DhcpState extends LoggingState {
+ class DhcpState extends State {
@Override
public void enter() {
- super.enter();
clearDhcpState();
if (initInterface() && initSockets()) {
mReceiveThread = new ReceiveThread();
@@ -677,7 +696,9 @@
}
}
+ @Override
public void exit() {
+ super.exit();
mKickAlarm.cancel();
mTimeoutAlarm.cancel();
}
@@ -724,6 +745,7 @@
public void enter() {
super.enter();
startNewTransaction();
+ mLastInitEnterTime = SystemClock.elapsedRealtime();
}
protected boolean sendPacket() {
@@ -782,15 +804,9 @@
}
}
- class DhcpHaveLeaseState extends LoggingState {
- @Override
- public void enter() {
- super.enter();
- }
-
+ class DhcpHaveLeaseState extends State {
@Override
public boolean processMessage(Message message) {
- super.processMessage(message);
switch (message.what) {
case CMD_EXPIRE_DHCP:
Log.d(TAG, "Lease expired!");
@@ -854,6 +870,13 @@
}
scheduleLeaseTimers();
+ logTimeToBoundState();
+ }
+
+ @Override
+ public void exit() {
+ super.exit();
+ mLastBoundExitTime = SystemClock.elapsedRealtime();
}
@Override
@@ -871,6 +894,15 @@
return NOT_HANDLED;
}
}
+
+ private void logTimeToBoundState() {
+ long now = SystemClock.elapsedRealtime();
+ if (mLastBoundExitTime > mLastInitEnterTime) {
+ logState(DhcpClientEvent.RENEWING_BOUND, (int)(now - mLastBoundExitTime));
+ } else {
+ logState(DhcpClientEvent.INITIAL_BOUND, (int)(now - mLastInitEnterTime));
+ }
+ }
}
abstract class DhcpReacquiringState extends PacketRetransmittingState {
@@ -977,4 +1009,12 @@
class DhcpRebootingState extends LoggingState {
}
+
+ private void logError(int errorCode) {
+ mMetricsLog.log(new DhcpErrorEvent(mIfaceName, errorCode));
+ }
+
+ private void logState(String name, int durationMs) {
+ mMetricsLog.log(new DhcpClientEvent(mIfaceName, name, durationMs));
+ }
}
diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
index cece6c8..654ef18 100644
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -31,6 +31,7 @@
import android.net.RouteInfo;
import android.net.StaticIpConfiguration;
import android.net.dhcp.DhcpClient;
+import android.net.metrics.IpConnectivityLog;
import android.net.metrics.IpManagerEvent;
import android.os.INetworkManagementService;
import android.os.Message;
@@ -393,6 +394,7 @@
private final WakeupMessage mProvisioningTimeoutAlarm;
private final WakeupMessage mDhcpActionTimeoutAlarm;
private final LocalLog mLocalLog;
+ private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();
private NetworkInterface mNetworkInterface;
@@ -634,8 +636,8 @@
private void recordMetric(final int type) {
if (mStartTimeMillis <= 0) { Log.wtf(mTag, "Start time undefined!"); }
- IpManagerEvent.logEvent(type, mInterfaceName,
- SystemClock.elapsedRealtime() - mStartTimeMillis);
+ final long duration = SystemClock.elapsedRealtime() - mStartTimeMillis;
+ mMetricsLog.log(new IpManagerEvent(mInterfaceName, type, duration));
}
// For now: use WifiStateMachine's historical notion of provisioned.
@@ -916,12 +918,6 @@
mDhcpClient = DhcpClient.makeDhcpClient(mContext, IpManager.this, mInterfaceName);
mDhcpClient.registerForPreDhcpNotification();
mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP);
-
- if (mConfiguration.mProvisioningTimeoutMs > 0) {
- final long alarmTime = SystemClock.elapsedRealtime() +
- mConfiguration.mProvisioningTimeoutMs;
- mProvisioningTimeoutAlarm.schedule(alarmTime);
- }
}
return true;
@@ -1041,11 +1037,24 @@
mCallback.setFallbackMulticastFilter(mMulticastFiltering);
}
+ if (mConfiguration.mProvisioningTimeoutMs > 0) {
+ final long alarmTime = SystemClock.elapsedRealtime() +
+ mConfiguration.mProvisioningTimeoutMs;
+ mProvisioningTimeoutAlarm.schedule(alarmTime);
+ }
+
if (mConfiguration.mEnableIPv6) {
// TODO: Consider transitionTo(mStoppingState) if this fails.
startIPv6();
}
+ if (mConfiguration.mEnableIPv4) {
+ if (!startIPv4()) {
+ transitionTo(mStoppingState);
+ return;
+ }
+ }
+
if (mConfiguration.mUsingIpReachabilityMonitor) {
mIpReachabilityMonitor = new IpReachabilityMonitor(
mContext,
@@ -1057,12 +1066,6 @@
}
});
}
-
- if (mConfiguration.mEnableIPv4) {
- if (!startIPv4()) {
- transitionTo(mStoppingState);
- }
- }
}
@Override
diff --git a/services/net/java/android/net/ip/IpReachabilityMonitor.java b/services/net/java/android/net/ip/IpReachabilityMonitor.java
index 27600a7..c6da3c3 100644
--- a/services/net/java/android/net/ip/IpReachabilityMonitor.java
+++ b/services/net/java/android/net/ip/IpReachabilityMonitor.java
@@ -24,6 +24,7 @@
import android.net.LinkProperties.ProvisioningChange;
import android.net.ProxyInfo;
import android.net.RouteInfo;
+import android.net.metrics.IpConnectivityLog;
import android.net.metrics.IpReachabilityEvent;
import android.net.netlink.NetlinkConstants;
import android.net.netlink.NetlinkErrorMessage;
@@ -128,7 +129,6 @@
* state it may be best for the link to disconnect completely and
* reconnect afresh.
*
- *
* @hide
*/
public class IpReachabilityMonitor {
@@ -151,6 +151,7 @@
private final Callback mCallback;
private final NetlinkSocketObserver mNetlinkSocketObserver;
private final Thread mObserverThread;
+ private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();
@GuardedBy("mLock")
private LinkProperties mLinkProperties = new LinkProperties();
// TODO: consider a map to a private NeighborState class holding more
@@ -161,6 +162,8 @@
private int mIpWatchListVersion;
@GuardedBy("mLock")
private boolean mRunning;
+ // Time in milliseconds of the last forced probe request.
+ private volatile long mLastProbeTimeMs;
/**
* Make the kernel perform neighbor reachability detection (IPv4 ARP or IPv6 ND)
@@ -337,7 +340,7 @@
private void handleNeighborLost(String msg) {
InetAddress ip = null;
- ProvisioningChange delta;
+ final ProvisioningChange delta;
synchronized (mLock) {
LinkProperties whatIfLp = new LinkProperties(mLinkProperties);
@@ -359,7 +362,6 @@
}
if (delta == ProvisioningChange.LOST_PROVISIONING) {
- IpReachabilityEvent.logProvisioningLost(mInterfaceName);
final String logMsg = "FAILURE: LOST_PROVISIONING, " + msg;
Log.w(TAG, logMsg);
if (mCallback != null) {
@@ -367,9 +369,8 @@
// an InetAddress argument.
mCallback.notifyLost(ip, logMsg);
}
- } else {
- IpReachabilityEvent.logNudFailed(mInterfaceName);
}
+ logNudFailed(delta);
}
public void probeAll() {
@@ -393,11 +394,12 @@
break;
}
final int returnValue = probeNeighbor(mInterfaceIndex, target);
- IpReachabilityEvent.logProbeEvent(mInterfaceName, returnValue);
+ logEvent(IpReachabilityEvent.PROBE, returnValue);
}
+ mLastProbeTimeMs = SystemClock.elapsedRealtime();
}
- private long getProbeWakeLockDuration() {
+ private static long getProbeWakeLockDuration() {
// Ideally, this would be computed by examining the values of:
//
// /proc/sys/net/ipv[46]/neigh/<ifname>/ucast_solicit
@@ -413,6 +415,19 @@
return (numUnicastProbes * retransTimeMs) + gracePeriodMs;
}
+ private void logEvent(int probeType, int errorCode) {
+ int eventType = probeType | (errorCode & 0xff);
+ mMetricsLog.log(new IpReachabilityEvent(mInterfaceName, eventType));
+ }
+
+ private void logNudFailed(ProvisioningChange delta) {
+ long duration = SystemClock.elapsedRealtime() - mLastProbeTimeMs;
+ boolean isFromProbe = (duration < getProbeWakeLockDuration());
+ boolean isProvisioningLost = (delta == ProvisioningChange.LOST_PROVISIONING);
+ int eventType = IpReachabilityEvent.nudFailureEventType(isFromProbe, isProvisioningLost);
+ mMetricsLog.log(new IpReachabilityEvent(mInterfaceName, eventType));
+ }
+
// TODO: simplify the number of objects by making this extend Thread.
private final class NetlinkSocketObserver implements Runnable {
private NetlinkSocket mSocket;
diff --git a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
new file mode 100644
index 0000000..407d315
--- /dev/null
+++ b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java
@@ -0,0 +1,583 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.ip;
+
+import static android.system.OsConstants.*;
+
+import android.net.IpPrefix;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.NetworkUtils;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.StructGroupReq;
+import android.system.StructTimeval;
+import android.util.Log;
+
+import com.android.internal.annotations.GuardedBy;
+
+import libcore.io.IoBridge;
+import libcore.util.HexEncoding;
+
+import java.io.FileDescriptor;
+import java.io.InterruptedIOException;
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+/**
+ * Basic IPv6 Router Advertisement Daemon.
+ *
+ * TODO:
+ *
+ * - Rewrite using Handler (and friends) so that AlarmManager can deliver
+ * "kick" messages when it's time to send a multicast RA.
+ *
+ * - Support transmitting MAX_URGENT_RTR_ADVERTISEMENTS number of empty
+ * RAs with zero default router lifetime when transitioning from an
+ * advertising state to a non-advertising state.
+ *
+ * @hide
+ */
+public class RouterAdvertisementDaemon {
+ private static final String TAG = RouterAdvertisementDaemon.class.getSimpleName();
+ private static final byte ICMPV6_ND_ROUTER_SOLICIT = asByte(133);
+ private static final byte ICMPV6_ND_ROUTER_ADVERT = asByte(134);
+ private static final int IPV6_MIN_MTU = 1280;
+ private static final int MIN_RA_HEADER_SIZE = 16;
+
+ // Summary of various timers and lifetimes.
+ private static final int MIN_RTR_ADV_INTERVAL_SEC = 300;
+ private static final int MAX_RTR_ADV_INTERVAL_SEC = 600;
+ // In general, router, prefix, and DNS lifetimes are all advised to be
+ // greater than or equal to 3 * MAX_RTR_ADV_INTERVAL. Here, we double
+ // that to allow for multicast packet loss.
+ //
+ // This MAX_RTR_ADV_INTERVAL_SEC and DEFAULT_LIFETIME are also consistent
+ // with the https://tools.ietf.org/html/rfc7772#section-4 discussion of
+ // "approximately 7 RAs per hour".
+ private static final int DEFAULT_LIFETIME = 6 * MAX_RTR_ADV_INTERVAL_SEC;
+ // From https://tools.ietf.org/html/rfc4861#section-10 .
+ private static final int MIN_DELAY_BETWEEN_RAS_SEC = 3;
+ // Both initial and final RAs, but also for changes in RA contents.
+ // From https://tools.ietf.org/html/rfc4861#section-10 .
+ private static final int MAX_URGENT_RTR_ADVERTISEMENTS = 5;
+
+ private static final int DAY_IN_SECONDS = 86_400;
+
+ private static final byte[] ALL_NODES = new byte[] {
+ (byte) 0xff, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
+ };
+
+ private final String mIfName;
+ private final int mIfIndex;
+ private final byte[] mHwAddr;
+ private final InetSocketAddress mAllNodes;
+
+ // This lock is to protect the RA from being updated while being
+ // transmitted on another thread (multicast or unicast).
+ //
+ // TODO: This should be handled with a more RCU-like approach.
+ private final Object mLock = new Object();
+ @GuardedBy("mLock")
+ private final byte[] mRA = new byte[IPV6_MIN_MTU];
+ @GuardedBy("mLock")
+ private int mRaLength;
+
+ private volatile FileDescriptor mSocket;
+ private volatile MulticastTransmitter mMulticastTransmitter;
+ private volatile UnicastResponder mUnicastResponder;
+
+ public static class RaParams {
+ public boolean hasDefaultRoute;
+ public int mtu;
+ public HashSet<IpPrefix> prefixes;
+ public HashSet<Inet6Address> dnses;
+
+ public RaParams() {
+ hasDefaultRoute = false;
+ mtu = IPV6_MIN_MTU;
+ prefixes = new HashSet<IpPrefix>();
+ dnses = new HashSet<Inet6Address>();
+ }
+
+ public RaParams(RaParams other) {
+ hasDefaultRoute = other.hasDefaultRoute;
+ mtu = other.mtu;
+ prefixes = (HashSet) other.prefixes.clone();
+ dnses = (HashSet) other.dnses.clone();
+ }
+ }
+
+
+ public RouterAdvertisementDaemon(String ifname, int ifindex, byte[] hwaddr) {
+ mIfName = ifname;
+ mIfIndex = ifindex;
+ mHwAddr = hwaddr;
+ mAllNodes = new InetSocketAddress(getAllNodesForScopeId(mIfIndex), 0);
+ }
+
+ public void buildNewRa(RaParams params) {
+ if (params == null || params.prefixes.isEmpty()) {
+ // No RA to be served at this time.
+ clearRa();
+ return;
+ }
+
+ if (params.mtu < IPV6_MIN_MTU) {
+ params.mtu = IPV6_MIN_MTU;
+ }
+
+ final ByteBuffer ra = ByteBuffer.wrap(mRA);
+ ra.order(ByteOrder.BIG_ENDIAN);
+
+ synchronized (mLock) {
+ try {
+ putHeader(ra, params.hasDefaultRoute);
+ putSlla(ra, mHwAddr);
+ // https://tools.ietf.org/html/rfc5175#section-4 says:
+ //
+ // "MUST NOT be added to a Router Advertisement message
+ // if no flags in the option are set."
+ //
+ // putExpandedFlagsOption(ra);
+ putMtu(ra, params.mtu);
+ for (IpPrefix ipp : params.prefixes) {
+ putPio(ra, ipp);
+ }
+ if (params.dnses.size() > 0) {
+ putRdnss(ra, params.dnses);
+ }
+ mRaLength = ra.position();
+ } catch (BufferOverflowException e) {
+ Log.e(TAG, "Could not construct new RA: " + e);
+ mRaLength = 0;
+ return;
+ }
+ }
+
+ maybeNotifyMulticastTransmitter();
+ }
+
+ public boolean start() {
+ if (!createSocket()) {
+ return false;
+ }
+
+ mMulticastTransmitter = new MulticastTransmitter();
+ mMulticastTransmitter.start();
+
+ mUnicastResponder = new UnicastResponder();
+ mUnicastResponder.start();
+
+ return true;
+ }
+
+ public void stop() {
+ closeSocket();
+ mMulticastTransmitter = null;
+ mUnicastResponder = null;
+ }
+
+ private void clearRa() {
+ boolean notifySocket;
+ synchronized (mLock) {
+ notifySocket = (mRaLength != 0);
+ mRaLength = 0;
+ }
+ if (notifySocket) {
+ maybeNotifyMulticastTransmitter();
+ }
+ }
+
+ private void maybeNotifyMulticastTransmitter() {
+ final MulticastTransmitter m = mMulticastTransmitter;
+ if (m != null) {
+ m.hup();
+ }
+ }
+
+ private static Inet6Address getAllNodesForScopeId(int scopeId) {
+ try {
+ return Inet6Address.getByAddress("ff02::1", ALL_NODES, scopeId);
+ } catch (UnknownHostException uhe) {
+ Log.wtf(TAG, "Failed to construct ff02::1 InetAddress: " + uhe);
+ return null;
+ }
+ }
+
+ private static byte asByte(int value) { return (byte) value; }
+ private static short asShort(int value) { return (short) value; }
+
+ private static void putHeader(ByteBuffer ra, boolean hasDefaultRoute) {
+ /**
+ Router Advertisement Message Format
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Code | Checksum |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Cur Hop Limit |M|O|H|Prf|P|R|R| Router Lifetime |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Reachable Time |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Retrans Timer |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Options ...
+ +-+-+-+-+-+-+-+-+-+-+-+-
+ */
+ final byte DEFAULT_HOPLIMIT = 64;
+ ra.put(ICMPV6_ND_ROUTER_ADVERT)
+ .put(asByte(0))
+ .putShort(asShort(0))
+ .put(DEFAULT_HOPLIMIT)
+ // RFC 4191 "high" preference, iff. advertising a default route.
+ .put(hasDefaultRoute ? asByte(0x08) : asByte(0))
+ .putShort(hasDefaultRoute ? asShort(DEFAULT_LIFETIME) : asShort(0))
+ .putInt(0)
+ .putInt(0);
+ }
+
+ private static void putSlla(ByteBuffer ra, byte[] slla) {
+ /**
+ Source/Target Link-layer Address
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Length | Link-Layer Address ...
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+ if (slla == null || slla.length != 6) {
+ // Only IEEE 802.3 6-byte addresses are supported.
+ return;
+ }
+ final byte ND_OPTION_SLLA = 1;
+ final byte SLLA_NUM_8OCTETS = 1;
+ ra.put(ND_OPTION_SLLA)
+ .put(SLLA_NUM_8OCTETS)
+ .put(slla);
+ }
+
+ private static void putExpandedFlagsOption(ByteBuffer ra) {
+ /**
+ Router Advertisement Expanded Flags Option
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Length | Bit fields available ..
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ ... for assignment |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+ final byte ND_OPTION_EFO = 26;
+ final byte EFO_NUM_8OCTETS = 1;
+
+ ra.put(ND_OPTION_EFO)
+ .put(EFO_NUM_8OCTETS)
+ .putShort(asShort(0))
+ .putInt(0);
+ }
+
+ private static void putMtu(ByteBuffer ra, int mtu) {
+ /**
+ MTU
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Length | Reserved |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | MTU |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+ final byte ND_OPTION_MTU = 5;
+ final byte MTU_NUM_8OCTETS = 1;
+ ra.put(ND_OPTION_MTU)
+ .put(MTU_NUM_8OCTETS)
+ .putShort(asShort(0))
+ .putInt(mtu);
+ }
+
+ private static void putPio(ByteBuffer ra, IpPrefix ipp) {
+ /**
+ Prefix Information
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Length | Prefix Length |L|A| Reserved1 |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Valid Lifetime |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Preferred Lifetime |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Reserved2 |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | |
+ + +
+ | |
+ + Prefix +
+ | |
+ + +
+ | |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+ final int prefixLength = ipp.getPrefixLength();
+ if (prefixLength != 64) {
+ return;
+ }
+ final byte ND_OPTION_PIO = 3;
+ final byte PIO_NUM_8OCTETS = 4;
+
+ final byte[] addr = ipp.getAddress().getAddress();
+ ra.put(ND_OPTION_PIO)
+ .put(PIO_NUM_8OCTETS)
+ .put(asByte(prefixLength))
+ .put(asByte(0xc0)) // L&A set
+ .putInt(DEFAULT_LIFETIME)
+ .putInt(DEFAULT_LIFETIME)
+ .putInt(0)
+ .put(addr);
+ }
+
+ private static void putRio(ByteBuffer ra, IpPrefix ipp) {
+ /**
+ Route Information Option
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Length | Prefix Length |Resvd|Prf|Resvd|
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Route Lifetime |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Prefix (Variable Length) |
+ . .
+ . .
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+ final int prefixLength = ipp.getPrefixLength();
+ if (prefixLength > 64) {
+ return;
+ }
+ final byte ND_OPTION_RIO = 24;
+ final byte RIO_NUM_8OCTETS = asByte(
+ (prefixLength == 0) ? 1 : (prefixLength <= 8) ? 2 : 3);
+
+ final byte[] addr = ipp.getAddress().getAddress();
+ ra.put(ND_OPTION_RIO)
+ .put(RIO_NUM_8OCTETS)
+ .put(asByte(prefixLength))
+ .put(asByte(0x18))
+ .putInt(DEFAULT_LIFETIME);
+
+ // Rely upon an IpPrefix's address being properly zeroed.
+ if (prefixLength > 0) {
+ ra.put(addr, 0, (prefixLength <= 64) ? 8 : 16);
+ }
+ }
+
+ private static void putRdnss(ByteBuffer ra, Set<Inet6Address> dnses) {
+ /**
+ Recursive DNS Server (RDNSS) Option
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Type | Length | Reserved |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | Lifetime |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ | |
+ : Addresses of IPv6 Recursive DNS Servers :
+ | |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+ final byte ND_OPTION_RDNSS = 25;
+ final byte RDNSS_NUM_8OCTETS = asByte(dnses.size() * 2 + 1);
+ ra.put(ND_OPTION_RDNSS)
+ .put(RDNSS_NUM_8OCTETS)
+ .putShort(asShort(0))
+ .putInt(DEFAULT_LIFETIME);
+
+ for (Inet6Address dns : dnses) {
+ ra.put(dns.getAddress());
+ }
+ }
+
+ private boolean createSocket() {
+ final int SEND_TIMEOUT_MS = 300;
+
+ try {
+ mSocket = Os.socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+ // Setting SNDTIMEO is purely for defensive purposes.
+ Os.setsockoptTimeval(
+ mSocket, SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(SEND_TIMEOUT_MS));
+ Os.setsockoptIfreq(mSocket, SOL_SOCKET, SO_BINDTODEVICE, mIfName);
+ NetworkUtils.protectFromVpn(mSocket);
+ NetworkUtils.setupRaSocket(mSocket, mIfIndex);
+ } catch (ErrnoException | IOException e) {
+ Log.e(TAG, "Failed to create RA daemon socket: " + e);
+ return false;
+ }
+
+ return true;
+ }
+
+ private void closeSocket() {
+ if (mSocket != null) {
+ try {
+ IoBridge.closeAndSignalBlockedThreads(mSocket);
+ } catch (IOException ignored) {}
+ }
+ mSocket = null;
+ }
+
+ private boolean isSocketValid() {
+ final FileDescriptor s = mSocket;
+ return (s != null) && s.valid();
+ }
+
+ private boolean isSuitableDestination(InetSocketAddress dest) {
+ if (mAllNodes.equals(dest)) {
+ return true;
+ }
+
+ final InetAddress destip = dest.getAddress();
+ return (destip instanceof Inet6Address) &&
+ destip.isLinkLocalAddress() &&
+ (((Inet6Address) destip).getScopeId() == mIfIndex);
+ }
+
+ private void maybeSendRA(InetSocketAddress dest) {
+ if (dest == null || !isSuitableDestination(dest)) {
+ dest = mAllNodes;
+ }
+
+ try {
+ synchronized (mLock) {
+ if (mRaLength < MIN_RA_HEADER_SIZE) {
+ // No actual RA to send.
+ return;
+ }
+ Os.sendto(mSocket, mRA, 0, mRaLength, 0, dest);
+ }
+ Log.d(TAG, "RA sendto " + dest.getAddress().getHostAddress());
+ } catch (ErrnoException | SocketException e) {
+ if (isSocketValid()) {
+ Log.e(TAG, "sendto error: " + e);
+ }
+ }
+ }
+
+ private final class UnicastResponder extends Thread {
+ private final InetSocketAddress solicitor = new InetSocketAddress();
+ // The recycled buffer for receiving Router Solicitations from clients.
+ // If the RS is larger than IPV6_MIN_MTU the packets are truncated.
+ // This is fine since currently only byte 0 is examined anyway.
+ private final byte mSolication[] = new byte[IPV6_MIN_MTU];
+
+ @Override
+ public void run() {
+ while (isSocketValid()) {
+ try {
+ // Blocking receive.
+ final int rval = Os.recvfrom(
+ mSocket, mSolication, 0, mSolication.length, 0, solicitor);
+ // Do the least possible amount of validation.
+ if (rval < 1 || mSolication[0] != ICMPV6_ND_ROUTER_SOLICIT) {
+ continue;
+ }
+ } catch (ErrnoException | SocketException e) {
+ if (isSocketValid()) {
+ Log.e(TAG, "recvfrom error: " + e);
+ }
+ continue;
+ }
+
+ maybeSendRA(solicitor);
+ }
+ }
+ }
+
+ // TODO: Consider moving this to run on a provided Looper as a Handler,
+ // with WakeupMessage-style messages providing the timer driven input.
+ private final class MulticastTransmitter extends Thread {
+ private final Random mRandom = new Random();
+ private final AtomicInteger mUrgentAnnouncements = new AtomicInteger(0);
+
+ @Override
+ public void run() {
+ while (isSocketValid()) {
+ try {
+ Thread.sleep(getNextMulticastTransmitDelayMs());
+ } catch (InterruptedException ignored) {
+ // Stop sleeping, immediately send an RA, and continue.
+ }
+
+ maybeSendRA(mAllNodes);
+ }
+ }
+
+ public void hup() {
+ // Set to one fewer that the desired number, because as soon as
+ // the thread interrupt is processed we immediately send an RA
+ // and mUrgentAnnouncements is not examined until the subsequent
+ // sleep interval computation (i.e. this way we send 3 and not 4).
+ mUrgentAnnouncements.set(MAX_URGENT_RTR_ADVERTISEMENTS - 1);
+ interrupt();
+ }
+
+ private int getNextMulticastTransmitDelaySec() {
+ synchronized (mLock) {
+ if (mRaLength < MIN_RA_HEADER_SIZE) {
+ // No actual RA to send; just sleep for 1 day.
+ return DAY_IN_SECONDS;
+ }
+ }
+
+ final int urgentPending = mUrgentAnnouncements.getAndDecrement();
+ if (urgentPending > 0) {
+ return MIN_DELAY_BETWEEN_RAS_SEC;
+ }
+
+ return MIN_RTR_ADV_INTERVAL_SEC + mRandom.nextInt(
+ MAX_RTR_ADV_INTERVAL_SEC - MIN_RTR_ADV_INTERVAL_SEC);
+ }
+
+ private long getNextMulticastTransmitDelayMs() {
+ return 1000 * (long) getNextMulticastTransmitDelaySec();
+ }
+ }
+}
diff --git a/services/print/java/com/android/server/print/UserState.java b/services/print/java/com/android/server/print/UserState.java
index 37f1aba..71f8899 100644
--- a/services/print/java/com/android/server/print/UserState.java
+++ b/services/print/java/com/android/server/print/UserState.java
@@ -779,9 +779,8 @@
public void updateIfNeededLocked() {
throwIfDestroyedLocked();
- if (readConfigurationLocked()) {
- onConfigurationChangedLocked();
- }
+ readConfigurationLocked();
+ onConfigurationChangedLocked();
}
public void destroyLocked() {
@@ -856,14 +855,12 @@
pw.println();
}
- private boolean readConfigurationLocked() {
- boolean somethingChanged = false;
- somethingChanged |= readInstalledPrintServicesLocked();
- somethingChanged |= readDisabledPrintServicesLocked();
- return somethingChanged;
+ private void readConfigurationLocked() {
+ readInstalledPrintServicesLocked();
+ readDisabledPrintServicesLocked();
}
- private boolean readInstalledPrintServicesLocked() {
+ private void readInstalledPrintServicesLocked() {
Set<PrintServiceInfo> tempPrintServices = new HashSet<PrintServiceInfo>();
List<ResolveInfo> installedServices = mContext.getPackageManager()
@@ -887,39 +884,8 @@
tempPrintServices.add(PrintServiceInfo.create(installedService, mContext));
}
- boolean someServiceChanged = false;
-
- if (tempPrintServices.size() != mInstalledServices.size()) {
- someServiceChanged = true;
- } else {
- for (PrintServiceInfo newService: tempPrintServices) {
- final int oldServiceIndex = mInstalledServices.indexOf(newService);
- if (oldServiceIndex < 0) {
- someServiceChanged = true;
- break;
- }
- // PrintServiceInfo#equals compares only the id not all members,
- // so we are also comparing the members coming from meta-data.
- PrintServiceInfo oldService = mInstalledServices.get(oldServiceIndex);
- if (!TextUtils.equals(oldService.getAddPrintersActivityName(),
- newService.getAddPrintersActivityName())
- || !TextUtils.equals(oldService.getAdvancedOptionsActivityName(),
- newService.getAdvancedOptionsActivityName())
- || !TextUtils.equals(oldService.getSettingsActivityName(),
- newService.getSettingsActivityName())) {
- someServiceChanged = true;
- break;
- }
- }
- }
-
- if (someServiceChanged) {
- mInstalledServices.clear();
- mInstalledServices.addAll(tempPrintServices);
- return true;
- }
-
- return false;
+ mInstalledServices.clear();
+ mInstalledServices.addAll(tempPrintServices);
}
/**
@@ -959,16 +925,14 @@
*
* @return true if the state changed.
*/
- private boolean readDisabledPrintServicesLocked() {
+ private void readDisabledPrintServicesLocked() {
Set<ComponentName> tempDisabledServiceNameSet = new HashSet<ComponentName>();
readPrintServicesFromSettingLocked(Settings.Secure.DISABLED_PRINT_SERVICES,
tempDisabledServiceNameSet);
if (!tempDisabledServiceNameSet.equals(mDisabledServices)) {
mDisabledServices.clear();
mDisabledServices.addAll(tempDisabledServiceNameSet);
- return true;
}
- return false;
}
private void readPrintServicesFromSettingLocked(String setting,
diff --git a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
new file mode 100644
index 0000000..7a3b461
--- /dev/null
+++ b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.retaildemo;
+
+import android.app.AppGlobals;
+import android.app.PackageInstallObserver;
+import android.content.Context;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.ArrayUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Helper class for installing preloaded APKs
+ */
+class PreloadAppsInstaller {
+ private static final String SYSTEM_SERVER_PACKAGE_NAME = "android";
+ private static String TAG = PreloadAppsInstaller.class.getSimpleName();
+ private static final String PRELOAD_APK_EXT = ".apk.preload";
+ private static boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+ private final IPackageManager mPackageManager;
+ private final File preloadsAppsDirectory;
+ private final Context mContext;
+
+ private final Map<String, String> mApkToPackageMap;
+
+ PreloadAppsInstaller(Context context) {
+ this(context, AppGlobals.getPackageManager(), Environment.getDataPreloadsAppsDirectory());
+ }
+
+ @VisibleForTesting
+ PreloadAppsInstaller(Context context, IPackageManager packageManager, File preloadsAppsDirectory) {
+ mContext = context;
+ mPackageManager = packageManager;
+ mApkToPackageMap = Collections.synchronizedMap(new ArrayMap<>());
+ this.preloadsAppsDirectory = preloadsAppsDirectory;
+ }
+
+ void installApps(int userId) {
+ File[] files = preloadsAppsDirectory.listFiles();
+ if (ArrayUtils.isEmpty(files)) {
+ return;
+ }
+ AppInstallCounter counter = new AppInstallCounter(mContext, userId);
+ int expectedCount = 0;
+ for (File file : files) {
+ String apkName = file.getName();
+ if (apkName.endsWith(PRELOAD_APK_EXT) && file.isFile()) {
+ String packageName = mApkToPackageMap.get(apkName);
+ if (packageName != null) {
+ try {
+ expectedCount++;
+ installExistingPackage(packageName, userId, counter);
+ } catch (Exception e) {
+ Slog.e(TAG, "Failed to install existing package " + packageName, e);
+ }
+ } else {
+ try {
+ installPackage(file, userId, counter);
+ expectedCount++;
+ } catch (Exception e) {
+ Slog.e(TAG, "Failed to install package from " + file, e);
+ }
+ }
+ }
+ }
+ counter.setExpectedAppsCount(expectedCount);
+ }
+
+ private void installExistingPackage(String packageName, int userId,
+ AppInstallCounter counter) {
+ if (DEBUG) {
+ Log.d(TAG, "installExistingPackage " + packageName + " u" + userId);
+ }
+ try {
+ mPackageManager.installExistingPackageAsUser(packageName, userId);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ } finally {
+ counter.appInstallFinished();
+ }
+ }
+
+ private void installPackage(File file, final int userId, AppInstallCounter counter)
+ throws IOException, RemoteException {
+ final String apkName = file.getName();
+ if (DEBUG) {
+ Log.d(TAG, "installPackage " + apkName + " u" + userId);
+ }
+ mPackageManager.installPackageAsUser(file.getPath(), new PackageInstallObserver() {
+ @Override
+ public void onPackageInstalled(String basePackageName, int returnCode, String msg,
+ Bundle extras) {
+ if (DEBUG) {
+ Log.d(TAG, "Package " + basePackageName + " installed u" + userId
+ + " returnCode: " + returnCode + " msg: " + msg);
+ }
+ // Don't notify the counter for now, we'll do it in installExistingPackage
+ if (returnCode == PackageManager.INSTALL_SUCCEEDED) {
+ mApkToPackageMap.put(apkName, basePackageName);
+ // Install on user 0 so that the package is cached when demo user is re-created
+ installExistingPackage(basePackageName, UserHandle.USER_SYSTEM, counter);
+ } else if (returnCode == PackageManager.INSTALL_FAILED_ALREADY_EXISTS) {
+ // This can only happen in first session after a reboot
+ if (!mApkToPackageMap.containsKey(apkName)) {
+ mApkToPackageMap.put(apkName, basePackageName);
+ }
+ installExistingPackage(basePackageName, userId, counter);
+ }
+ }
+ }.getBinder(), 0, SYSTEM_SERVER_PACKAGE_NAME, userId);
+ }
+
+ private static class AppInstallCounter {
+ private int expectedCount = -1; // -1 means expectedCount not set
+ private int finishedCount;
+ private final Context mContext;
+ private final int userId;
+
+ AppInstallCounter(Context context, int userId) {
+ mContext = context;
+ this.userId = userId;
+ }
+
+ synchronized void appInstallFinished() {
+ this.finishedCount++;
+ checkIfAllFinished();
+ }
+
+ synchronized void setExpectedAppsCount(int expectedCount) {
+ this.expectedCount = expectedCount;
+ checkIfAllFinished();
+ }
+
+ private void checkIfAllFinished() {
+ if (expectedCount == finishedCount) {
+ Log.i(TAG, "All preloads finished installing for user " + userId);
+ Settings.Secure.putStringForUser(mContext.getContentResolver(),
+ Settings.Secure.DEMO_USER_SETUP_COMPLETE, "1", userId);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
index 96e6da7..8d5971f 100644
--- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
@@ -16,6 +16,7 @@
package com.android.server.retaildemo;
+import android.Manifest;
import android.app.ActivityManagerInternal;
import android.app.ActivityManagerNative;
import android.app.AppGlobals;
@@ -25,6 +26,7 @@
import android.app.RetailDemoModeServiceInternal;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
+import android.content.ContentProvider;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
@@ -32,6 +34,7 @@
import android.content.IntentFilter;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Configuration;
import android.database.ContentObserver;
@@ -49,12 +52,18 @@
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.SystemClock;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
+import android.provider.CallLog;
+import android.provider.MediaStore;
import android.provider.Settings;
+import android.util.KeyValueListParser;
import android.util.Slog;
import com.android.internal.os.BackgroundThread;
import com.android.internal.R;
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.logging.MetricsLogger;
import com.android.internal.widget.LockPatternUtils;
import com.android.server.LocalServices;
import com.android.server.ServiceThread;
@@ -70,15 +79,18 @@
private static final String TAG = RetailDemoModeService.class.getSimpleName();
private static final String DEMO_USER_NAME = "Demo";
- private static final String ACTION_RESET_DEMO = "com.android.server.am.ACTION_RESET_DEMO";
+ private static final String ACTION_RESET_DEMO =
+ "com.android.server.retaildemo.ACTION_RESET_DEMO";
+ private static final String SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED = "sys.retaildemo.enabled";
private static final int MSG_TURN_SCREEN_ON = 0;
private static final int MSG_INACTIVITY_TIME_OUT = 1;
private static final int MSG_START_NEW_SESSION = 2;
private static final long SCREEN_WAKEUP_DELAY = 2500;
- private static final long USER_INACTIVITY_TIMEOUT = 30000;
- private static final long WARNING_DIALOG_TIMEOUT = 6000;
+ private static final long USER_INACTIVITY_TIMEOUT_MIN = 10000;
+ private static final long USER_INACTIVITY_TIMEOUT_DEFAULT = 30000;
+ private static final long WARNING_DIALOG_TIMEOUT_DEFAULT = 6000;
private static final long MILLIS_PER_SECOND = 1000;
private static final int[] VOLUME_STREAMS_TO_MUTE = {
@@ -86,8 +98,14 @@
AudioSystem.STREAM_MUSIC
};
+ // Tron Vars
+ private static final String DEMO_SESSION_COUNT = "retail_demo_session_count";
+ private static final String DEMO_SESSION_DURATION = "retail_demo_session_duration";
+
boolean mDeviceInDemoMode = false;
- int mCurrentUserId;
+ int mCurrentUserId = UserHandle.USER_SYSTEM;
+ long mUserInactivityTimeout;
+ long mWarningDialogTimeout;
private ActivityManagerService mAms;
private ActivityManagerInternal mAmi;
private AudioManager mAudioManager;
@@ -100,7 +118,17 @@
private PendingIntent mResetDemoPendingIntent;
private CameraManager mCameraManager;
private String[] mCameraIdsWithFlash;
- private Configuration mPrimaryUserConfiguration;
+ private Configuration mSystemUserConfiguration;
+ private PreloadAppsInstaller mPreloadAppsInstaller;
+
+ final Object mActivityLock = new Object();
+ // Whether the newly created demo user has interacted with the screen yet
+ @GuardedBy("mActivityLock")
+ boolean mUserUntouched;
+ @GuardedBy("mActivityLock")
+ long mFirstUserActivityTime;
+ @GuardedBy("mActivityLock")
+ long mLastUserActivityTime;
private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
@@ -136,18 +164,7 @@
mWakeLock.acquire();
break;
case MSG_INACTIVITY_TIME_OUT:
- final IPackageManager pm = AppGlobals.getPackageManager();
- int enabledState = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
- String demoLauncherComponent = getContext().getResources()
- .getString(R.string.config_demoModeLauncherComponent);
- try {
- enabledState = pm.getComponentEnabledSetting(
- ComponentName.unflattenFromString(demoLauncherComponent),
- mCurrentUserId);
- } catch (RemoteException exc) {
- Slog.e(TAG, "Unable to talk to Package Manager", exc);
- }
- if (enabledState == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+ if (isDemoLauncherDisabled()) {
Slog.i(TAG, "User inactivity timeout reached");
showInactivityCountdownDialog();
}
@@ -158,6 +175,9 @@
}
removeMessages(MSG_START_NEW_SESSION);
removeMessages(MSG_INACTIVITY_TIME_OUT);
+ if (mCurrentUserId != UserHandle.USER_SYSTEM) {
+ logSessionDuration();
+ }
final UserInfo demoUser = getUserManager().createUser(DEMO_USER_NAME,
UserInfo.FLAG_DEMO | UserInfo.FLAG_EPHEMERAL);
if (demoUser != null) {
@@ -169,11 +189,84 @@
}
}
+ private class SettingsObserver extends ContentObserver {
+
+ private final static String KEY_USER_INACTIVITY_TIMEOUT = "user_inactivity_timeout_ms";
+ private final static String KEY_WARNING_DIALOG_TIMEOUT = "warning_dialog_timeout_ms";
+
+ private final Uri mDeviceDemoModeUri = Settings.Global
+ .getUriFor(Settings.Global.DEVICE_DEMO_MODE);
+ private final Uri mDeviceProvisionedUri = Settings.Global
+ .getUriFor(Settings.Global.DEVICE_PROVISIONED);
+ private final Uri mRetailDemoConstantsUri = Settings.Global
+ .getUriFor(Settings.Global.RETAIL_DEMO_MODE_CONSTANTS);
+
+ private final KeyValueListParser mParser = new KeyValueListParser(',');
+
+ public SettingsObserver(Handler handler) {
+ super(handler);
+ }
+
+ public void register() {
+ ContentResolver cr = getContext().getContentResolver();
+ cr.registerContentObserver(mDeviceDemoModeUri, false, this, UserHandle.USER_SYSTEM);
+ cr.registerContentObserver(mDeviceProvisionedUri, false, this, UserHandle.USER_SYSTEM);
+ cr.registerContentObserver(mRetailDemoConstantsUri, false, this,
+ UserHandle.USER_SYSTEM);
+ }
+
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ if (mRetailDemoConstantsUri.equals(uri)) {
+ refreshTimeoutConstants();
+ return;
+ }
+ if (mDeviceDemoModeUri.equals(uri)) {
+ mDeviceInDemoMode = UserManager.isDeviceInDemoMode(getContext());
+ if (mDeviceInDemoMode) {
+ putDeviceInDemoMode();
+ } else {
+ SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "0");
+ if (mWakeLock.isHeld()) {
+ mWakeLock.release();
+ }
+ }
+ }
+ // If device is provisioned and left demo mode - run the cleanup in demo folder
+ if (!mDeviceInDemoMode && isDeviceProvisioned()) {
+ // Run on the bg thread to not block the fg thread
+ BackgroundThread.getHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ if (!deletePreloadsFolderContents()) {
+ Slog.w(TAG, "Failed to delete preloads folder contents");
+ }
+ }
+ });
+ }
+ }
+
+ private void refreshTimeoutConstants() {
+ try {
+ mParser.setString(Settings.Global.getString(getContext().getContentResolver(),
+ Settings.Global.RETAIL_DEMO_MODE_CONSTANTS));
+ } catch (IllegalArgumentException exc) {
+ Slog.e(TAG, "Invalid string passed to KeyValueListParser");
+ // Consuming the exception to fall back to default values.
+ }
+ mWarningDialogTimeout = mParser.getLong(KEY_WARNING_DIALOG_TIMEOUT,
+ WARNING_DIALOG_TIMEOUT_DEFAULT);
+ mUserInactivityTimeout = mParser.getLong(KEY_USER_INACTIVITY_TIMEOUT,
+ USER_INACTIVITY_TIMEOUT_DEFAULT);
+ mUserInactivityTimeout = Math.max(mUserInactivityTimeout, USER_INACTIVITY_TIMEOUT_MIN);
+ }
+ }
+
private void showInactivityCountdownDialog() {
UserInactivityCountdownDialog dialog = new UserInactivityCountdownDialog(getContext(),
- WARNING_DIALOG_TIMEOUT, MILLIS_PER_SECOND);
- dialog.setPositiveButtonClickListener(null);
- dialog.setNegativeButtonClickListener(new DialogInterface.OnClickListener() {
+ mWarningDialogTimeout, MILLIS_PER_SECOND);
+ dialog.setNegativeButtonClickListener(null);
+ dialog.setPositiveButtonClickListener(new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
@@ -190,6 +283,9 @@
public RetailDemoModeService(Context context) {
super(context);
+ synchronized (mActivityLock) {
+ mFirstUserActivityTime = mLastUserActivityTime = SystemClock.uptimeMillis();
+ }
}
private Notification createResetNotification() {
@@ -213,17 +309,79 @@
return mResetDemoPendingIntent;
}
+ boolean isDemoLauncherDisabled() {
+ IPackageManager pm = AppGlobals.getPackageManager();
+ int enabledState = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+ String demoLauncherComponent = getContext().getResources()
+ .getString(R.string.config_demoModeLauncherComponent);
+ try {
+ enabledState = pm.getComponentEnabledSetting(
+ ComponentName.unflattenFromString(demoLauncherComponent),
+ mCurrentUserId);
+ } catch (RemoteException exc) {
+ Slog.e(TAG, "Unable to talk to Package Manager", exc);
+ }
+ return enabledState == PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+ }
+
private void setupDemoUser(UserInfo userInfo) {
UserManager um = getUserManager();
UserHandle user = UserHandle.of(userInfo.id);
- LockPatternUtils lockPatternUtils = new LockPatternUtils(getContext());
- lockPatternUtils.setLockScreenDisabled(true, userInfo.id);
um.setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, user);
um.setUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true, user);
um.setUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, true, user);
um.setUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER, true, user);
+ um.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user);
+ um.setUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH, true, user);
+ // Set this to false because the default is true on user creation
+ um.setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, false, user);
+ // Disallow rebooting in safe mode - controlled by user 0
+ getUserManager().setUserRestriction(UserManager.DISALLOW_SAFE_BOOT, true,
+ UserHandle.SYSTEM);
Settings.Secure.putIntForUser(getContext().getContentResolver(),
Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id);
+ Settings.Secure.putIntForUser(getContext().getContentResolver(),
+ Settings.Global.PACKAGE_VERIFIER_ENABLE, 0, userInfo.id);
+
+ grantRuntimePermissionToCamera(user);
+ clearPrimaryCallLog();
+ }
+
+ private void grantRuntimePermissionToCamera(UserHandle user) {
+ final Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ final PackageManager pm = getContext().getPackageManager();
+ final ResolveInfo handler = pm.resolveActivityAsUser(cameraIntent,
+ PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
+ if (handler == null || handler.activityInfo == null) {
+ return;
+ }
+ try {
+ pm.grantRuntimePermission(handler.activityInfo.packageName,
+ Manifest.permission.ACCESS_FINE_LOCATION, user);
+ } catch (Exception e) {
+ // Ignore
+ }
+ }
+
+ private void clearPrimaryCallLog() {
+ final ContentResolver resolver = getContext().getContentResolver();
+
+ // Deleting primary user call log so that it doesn't get copied to the new demo user
+ final Uri uri = CallLog.Calls.CONTENT_URI;
+ try {
+ resolver.delete(uri, null, null);
+ } catch (Exception e) {
+ Slog.w(TAG, "Deleting call log failed: " + e);
+ }
+ }
+
+ void logSessionDuration() {
+ final int sessionDuration;
+ synchronized (mActivityLock) {
+ sessionDuration = (int) ((mLastUserActivityTime - mFirstUserActivityTime) / 1000);
+ }
+ MetricsLogger.histogram(getContext(), DEMO_SESSION_DURATION, sessionDuration);
}
private ActivityManagerService getActivityManager() {
@@ -247,49 +405,13 @@
return mAudioManager;
}
- private void registerSettingsChangeObserver() {
- final Uri deviceDemoModeUri = Settings.Global.getUriFor(Settings.Global.DEVICE_DEMO_MODE);
- final Uri deviceProvisionedUri = Settings.Global.getUriFor(
- Settings.Global.DEVICE_PROVISIONED);
- final ContentResolver cr = getContext().getContentResolver();
- final ContentObserver deviceDemoModeSettingObserver = new ContentObserver(mHandler) {
- @Override
- public void onChange(boolean selfChange, Uri uri, int userId) {
- if (deviceDemoModeUri.equals(uri)) {
- mDeviceInDemoMode = UserManager.isDeviceInDemoMode(getContext());
- if (mDeviceInDemoMode) {
- mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
- } else if (mWakeLock.isHeld()) {
- mWakeLock.release();
- }
- }
- // If device is provisioned and left demo mode - run the cleanup in demo folder
- if (!mDeviceInDemoMode && isDeviceProvisioned()) {
- // Run on the bg thread to not block the fg thread
- BackgroundThread.getHandler().post(new Runnable() {
- @Override
- public void run() {
- if (!deleteDemoFolderContents()) {
- Slog.w(TAG, "Failed to delete demo folder contents");
- }
- }
- });
- }
- }
- };
- cr.registerContentObserver(deviceDemoModeUri, false, deviceDemoModeSettingObserver,
- UserHandle.USER_SYSTEM);
- cr.registerContentObserver(deviceProvisionedUri, false, deviceDemoModeSettingObserver,
- UserHandle.USER_SYSTEM);
- }
-
private boolean isDeviceProvisioned() {
return Settings.Global.getInt(
getContext().getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) != 0;
}
- private boolean deleteDemoFolderContents() {
- final File dir = Environment.getDataPreloadsDemoDirectory();
+ private boolean deletePreloadsFolderContents() {
+ final File dir = Environment.getDataPreloadsDirectory();
Slog.i(TAG, "Deleting contents of " + dir);
return FileUtils.deleteContents(dir);
}
@@ -333,12 +455,17 @@
}
}
- private Configuration getPrimaryUsersConfiguration() {
- if (mPrimaryUserConfiguration == null) {
+ private Configuration getSystemUsersConfiguration() {
+ if (mSystemUserConfiguration == null) {
Settings.System.getConfiguration(getContext().getContentResolver(),
- mPrimaryUserConfiguration = new Configuration());
+ mSystemUserConfiguration = new Configuration());
}
- return mPrimaryUserConfiguration;
+ return mSystemUserConfiguration;
+ }
+
+ private void putDeviceInDemoMode() {
+ SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
+ mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
}
@Override
@@ -355,23 +482,31 @@
@Override
public void onBootPhase(int bootPhase) {
- if (bootPhase != PHASE_THIRD_PARTY_APPS_CAN_START) {
- return;
+ switch (bootPhase) {
+ case PHASE_THIRD_PARTY_APPS_CAN_START:
+ mPreloadAppsInstaller = new PreloadAppsInstaller(getContext());
+ mPm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
+ mAmi = LocalServices.getService(ActivityManagerInternal.class);
+ mWakeLock = mPm
+ .newWakeLock(
+ PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP,
+ TAG);
+ mNm = NotificationManager.from(getContext());
+ mCameraManager = (CameraManager) getContext()
+ .getSystemService(Context.CAMERA_SERVICE);
+ mCameraIdsWithFlash = getCameraIdsWithFlash();
+ SettingsObserver settingsObserver = new SettingsObserver(mHandler);
+ settingsObserver.register();
+ settingsObserver.refreshTimeoutConstants();
+ registerBroadcastReceiver();
+ break;
+ case PHASE_BOOT_COMPLETED:
+ if (UserManager.isDeviceInDemoMode(getContext())) {
+ mDeviceInDemoMode = true;
+ putDeviceInDemoMode();
+ }
+ break;
}
- mPm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
- mAmi = LocalServices.getService(ActivityManagerInternal.class);
- mWakeLock = mPm
- .newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
- mNm = NotificationManager.from(getContext());
- mCameraManager = (CameraManager) getContext().getSystemService(Context.CAMERA_SERVICE);
- mCameraIdsWithFlash = getCameraIdsWithFlash();
-
- if (UserManager.isDeviceInDemoMode(getContext())) {
- mDeviceInDemoMode = true;
- mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
- }
- registerSettingsChangeObserver();
- registerBroadcastReceiver();
}
@Override
@@ -391,15 +526,29 @@
mWakeLock.acquire();
}
mCurrentUserId = userId;
- mNm.notifyAsUser(TAG, 1, createResetNotification(), UserHandle.of(userId));
+ mAmi.updatePersistentConfigurationForUser(getSystemUsersConfiguration(), userId);
turnOffAllFlashLights();
muteVolumeStreams();
- mAmi.updatePersistentConfigurationForUser(getPrimaryUsersConfiguration(), userId);
+ // Disable lock screen for demo users.
+ LockPatternUtils lockPatternUtils = new LockPatternUtils(getContext());
+ lockPatternUtils.setLockScreenDisabled(true, userId);
+ mNm.notifyAsUser(TAG, 1, createResetNotification(), UserHandle.of(userId));
+
+ synchronized (mActivityLock) {
+ mUserUntouched = true;
+ }
+ MetricsLogger.count(getContext(), DEMO_SESSION_COUNT, 1);
+ mHandler.removeMessages(MSG_INACTIVITY_TIME_OUT);
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mPreloadAppsInstaller.installApps(userId);
+ }
+ });
}
private RetailDemoModeServiceInternal mLocalService = new RetailDemoModeServiceInternal() {
private static final long USER_ACTIVITY_DEBOUNCE_TIME = 2000;
- private long mLastUserActivityTime = 0;
@Override
public void onUserActivity() {
@@ -407,12 +556,19 @@
return;
}
long timeOfActivity = SystemClock.uptimeMillis();
- if (timeOfActivity < mLastUserActivityTime + USER_ACTIVITY_DEBOUNCE_TIME) {
- return;
+ synchronized (mActivityLock) {
+ if (timeOfActivity < mLastUserActivityTime + USER_ACTIVITY_DEBOUNCE_TIME) {
+ return;
+ }
+ mLastUserActivityTime = timeOfActivity;
+ if (mUserUntouched && isDemoLauncherDisabled()) {
+ Slog.d(TAG, "retail_demo first touch");
+ mUserUntouched = false;
+ mFirstUserActivityTime = timeOfActivity;
+ }
}
- mLastUserActivityTime = timeOfActivity;
mHandler.removeMessages(MSG_INACTIVITY_TIME_OUT);
- mHandler.sendEmptyMessageDelayed(MSG_INACTIVITY_TIME_OUT, USER_INACTIVITY_TIMEOUT);
+ mHandler.sendEmptyMessageDelayed(MSG_INACTIVITY_TIME_OUT, mUserInactivityTimeout);
}
};
}
diff --git a/services/retaildemo/java/com/android/server/retaildemo/UserInactivityCountdownDialog.java b/services/retaildemo/java/com/android/server/retaildemo/UserInactivityCountdownDialog.java
index e6548b7..d14f4eb 100644
--- a/services/retaildemo/java/com/android/server/retaildemo/UserInactivityCountdownDialog.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/UserInactivityCountdownDialog.java
@@ -20,8 +20,6 @@
import android.app.Dialog;
import android.content.Context;
import android.os.CountDownTimer;
-import android.view.LayoutInflater;
-import android.view.View;
import android.view.WindowManager;
import android.widget.TextView;
@@ -30,25 +28,23 @@
public class UserInactivityCountdownDialog extends AlertDialog {
private OnCountDownExpiredListener mOnCountDownExpiredListener;
- private View mDialogView;
private CountDownTimer mCountDownTimer;
private long mCountDownDuration;
private long mRefreshInterval;
UserInactivityCountdownDialog(Context context, long duration, long refreshInterval) {
super(context);
-
mCountDownDuration = duration;
mRefreshInterval = refreshInterval;
- mDialogView = LayoutInflater.from(context).inflate(R.layout.alert_dialog, null);
- String msg = context.getString(R.string.demo_user_inactivity_timeout_countdown, duration);
- getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+
+ getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
WindowManager.LayoutParams attrs = getWindow().getAttributes();
attrs.privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
getWindow().setAttributes(attrs);
+
setTitle(R.string.demo_user_inactivity_timeout_title);
- setView(mDialogView);
- setMessage(msg);
+ setMessage(getContext().getString(R.string.demo_user_inactivity_timeout_countdown,
+ duration));
}
public void setOnCountDownExpiredListener(
@@ -58,30 +54,31 @@
public void setPositiveButtonClickListener(OnClickListener onClickListener) {
setButton(Dialog.BUTTON_POSITIVE,
- getContext().getString(R.string.demo_user_inactivity_timeout_left_button),
+ getContext().getString(R.string.demo_user_inactivity_timeout_right_button),
onClickListener);
}
public void setNegativeButtonClickListener(OnClickListener onClickListener) {
setButton(Dialog.BUTTON_NEGATIVE,
- getContext().getString(R.string.demo_user_inactivity_timeout_right_button),
+ getContext().getString(R.string.demo_user_inactivity_timeout_left_button),
onClickListener);
}
@Override
public void show() {
super.show();
- mDialogView.post(new Runnable() {
+ final TextView messageView = (TextView) findViewById(R.id.message);
+ messageView.post(new Runnable() {
@Override
public void run() {
mCountDownTimer = new CountDownTimer(mCountDownDuration, mRefreshInterval) {
@Override
public void onTick(long millisUntilFinished) {
- String msg = getContext().getResources().getString(
+ String msg = getContext().getString(
R.string.demo_user_inactivity_timeout_countdown,
millisUntilFinished / 1000);
- ((TextView) mDialogView.findViewById(R.id.message)).setText(msg);
+ messageView.setText(msg);
}
@Override
@@ -96,8 +93,7 @@
}
@Override
- public void dismiss() {
- super.dismiss();
+ public void onStop() {
if (mCountDownTimer != null) {
mCountDownTimer.cancel();
}
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index 50e0662..fb8d814 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -13,6 +13,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
frameworks-base-testutils \
+ services.accessibility \
services.core \
services.devicepolicy \
services.net \
diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml
index 7017d81..b8ace28 100644
--- a/services/tests/servicestests/AndroidManifest.xml
+++ b/services/tests/servicestests/AndroidManifest.xml
@@ -108,9 +108,53 @@
<service android:name="com.android.server.job.MockPriorityJobService"
android:permission="android.permission.BIND_JOB_SERVICE" />
- <activity android:name="com.android.server.pm.ShortcutManagerTest$ShortcutActivity" />
- <activity android:name="com.android.server.pm.ShortcutManagerTest$ShortcutActivity2" />
- <activity android:name="com.android.server.pm.ShortcutManagerTest$ShortcutActivity3" />
+ <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity" />
+ <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity2" />
+ <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3" />
+
+ <activity android:name="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="true" android:exported="true" />
+
+ <activity-alias android:name="a.ShortcutEnabled"
+ android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="true" android:exported="true">
+ </activity-alias>
+ <activity-alias android:name="a.ShortcutDisabled"
+ android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="false" android:exported="true">
+ <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/>
+ </activity-alias>
+ <activity-alias android:name="a.ShortcutUnexported"
+ android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="true" android:exported="false">
+ <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/>
+ </activity-alias>
+ <activity-alias android:name="a.Shortcut1"
+ android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="true" android:exported="true">
+ <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_1"/>
+ </activity-alias>
+
+ <activity-alias android:name="a.DisabledMain"
+ android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="false" android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity-alias>
+
+ <activity-alias android:name="a.UnexportedMain"
+ android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+ android:enabled="true" android:exported="false">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity-alias>
+
</application>
<instrumentation
diff --git a/services/tests/servicestests/assets/shortcut/dumpsys_expected.txt b/services/tests/servicestests/assets/shortcut/dumpsys_expected.txt
new file mode 100644
index 0000000..eed2087
--- /dev/null
+++ b/services/tests/servicestests/assets/shortcut/dumpsys_expected.txt
@@ -0,0 +1,105 @@
+{
+ "shortcut": [
+ {
+ "userId": 0,
+ "launchers": [
+ {
+ "name": "com.android.launcher.1"
+ },
+ {
+ "name": "com.android.launcher.2"
+ },
+ {
+ "name": "com.android.launcher.3"
+ },
+ {
+ "name": "com.android.launcher.4"
+ },
+ {
+ "name": "com.android.launcher.1"
+ }
+ ],
+ "packages": [
+ {
+ "name": "com.android.test.1",
+ "dynamic": 3,
+ "manifest": 0,
+ "pinned": 4,
+ "bitmaps": 0,
+ "bitmapBytes": 0
+ },
+ {
+ "name": "com.android.test.2",
+ "dynamic": 4,
+ "manifest": 0,
+ "pinned": 5,
+ "bitmaps": 2,
+ "bitmapBytes": ***BITMAP_SIZE***
+ },
+ {
+ "name": "com.android.test.3",
+ "dynamic": 3,
+ "manifest": 0,
+ "pinned": 6,
+ "bitmaps": 0,
+ "bitmapBytes": 0
+ },
+ {
+ "name": "com.android.test.4",
+ "dynamic": 0,
+ "manifest": 0,
+ "pinned": 0,
+ "bitmaps": 0,
+ "bitmapBytes": 0
+ }
+ ]
+ },
+ {
+ "userId": 10,
+ "launchers": [
+ {
+ "name": "com.android.launcher.1"
+ }
+ ],
+ "packages": [
+ {
+ "name": "com.android.test.1",
+ "dynamic": 3,
+ "manifest": 0,
+ "pinned": 2,
+ "bitmaps": 0,
+ "bitmapBytes": 0
+ }
+ ]
+ },
+ {
+ "userId": 20,
+ "launchers": [
+ {
+ "name": "com.android.launcher.1"
+ },
+ {
+ "name": "com.android.launcher.2"
+ },
+ {
+ "name": "com.android.launcher.3"
+ },
+ {
+ "name": "com.android.launcher.1"
+ }
+ ],
+ "packages": [
+ {
+ "name": "com.android.test.1",
+ "dynamic": 3,
+ "manifest": 0,
+ "pinned": 6,
+ "bitmaps": 0,
+ "bitmapBytes": 0
+ }
+ ]
+ }
+ ],
+ "lowRam": false,
+ "iconSize": 128
+}
diff --git a/services/tests/servicestests/assets/shortcut/shortcut_legacy_file.xml b/services/tests/servicestests/assets/shortcut/shortcut_legacy_file.xml
new file mode 100644
index 0000000..872dc3a
--- /dev/null
+++ b/services/tests/servicestests/assets/shortcut/shortcut_legacy_file.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<user locales="en-US" last-app-scan-time="3113976673">
+ <package name="com.android.test.1" call-count="0" last-reset="1468976368772">
+ <package-info version="25" last_udpate_time="1230796800000" />
+ <shortcut id="manifest-shortcut-storage" activity="com.android.test.1/com.android.test.1.Settings" title="Storage" titleid="2131625197" titlename="storage_settings" textid="0" dmessageid="0" intent="#Intent;action=android.settings.INTERNAL_STORAGE_SETTINGS;end" timestamp="1469050672334" rank="4" flags="420" icon-res="2130837747" icon-resname="drawable/ic_shortcut_storage" >
+ <intent-extras>
+ <int name="key" value="12345" />
+ </intent-extras>
+ </shortcut>
+ </package>
+</user>
diff --git a/services/tests/servicestests/res/xml/shortcut_error_3.xml b/services/tests/servicestests/res/xml/shortcut_error_3.xml
index a7b9b84..24ee024 100644
--- a/services/tests/servicestests/res/xml/shortcut_error_3.xml
+++ b/services/tests/servicestests/res/xml/shortcut_error_3.xml
@@ -19,6 +19,10 @@
android:shortcutShortLabel="@string/shortcut_title1"
/>
<shortcut
+ android:shortcutId="@string/shortcut_title1"
+ android:shortcutShortLabel="@string/shortcut_title1"
+ />
+ <shortcut
android:shortcutId="x3"
android:shortcutShortLabel="@string/shortcut_title1"
>
@@ -26,5 +30,7 @@
android:action="android.intent.action.VIEW"
>
</intent>
+ <categories android:name="@string/shortcut_title1" />
+ <categories android:name="cat2" />
</shortcut>
</shortcuts>
diff --git a/services/tests/servicestests/res/xml/shortcut_error_4.xml b/services/tests/servicestests/res/xml/shortcut_error_4.xml
index 3697bb4..f680e99 100644
--- a/services/tests/servicestests/res/xml/shortcut_error_4.xml
+++ b/services/tests/servicestests/res/xml/shortcut_error_4.xml
@@ -19,7 +19,9 @@
android:shortcutId="ms1"
android:shortcutShortLabel="@string/shortcut_title1"
>
- <intent android:action="action1" />
+ <intent android:action="action1" >
+ <extra android:name="key1" android:value="value1" />
+ </intent>
</shortcut>
<!-- Invalid: no intent -->
@@ -28,13 +30,17 @@
android:shortcutShortLabel="@string/shortcut_title1"
/>
- <!-- Valid: more than one intent; first one will be picked. -->
+ <!-- Valid: more than one intent -->
<shortcut
android:shortcutId="ms2"
android:shortcutShortLabel="@string/shortcut_title1"
>
- <intent android:action="action2_1" />
- <intent android:action="action2_2" />
+ <intent android:action="action2_1" >
+ <extra android:name="key1" android:value="value1" />
+ </intent>
+ <intent android:action="action2_2">
+ <extra android:name="key2" android:value="value2" />
+ </intent>
</shortcut>
<!-- Valid: disabled shortcut doesn't need an intent -->
@@ -53,11 +59,12 @@
<intent android:action="action4" />
</shortcut>
- <!-- Invalid, no intent action -->
+ <!-- Invalid, no intent action (if any of the intents is invalid, the entire shortcut will be invalid.) -->
<shortcut
android:shortcutId="ms_ignored2"
android:shortcutShortLabel="@string/shortcut_title1"
>
<intent android:data="x"/>
+ <intent android:action="actionx"/>
</shortcut>
</shortcuts>
diff --git a/services/tests/servicestests/src/android/net/apf/ApfTest.java b/services/tests/servicestests/src/android/net/apf/ApfTest.java
index 8ac238a..bd76118 100644
--- a/services/tests/servicestests/src/android/net/apf/ApfTest.java
+++ b/services/tests/servicestests/src/android/net/apf/ApfTest.java
@@ -26,14 +26,23 @@
import android.net.apf.ApfGenerator.IllegalInstructionException;
import android.net.apf.ApfGenerator.Register;
import android.net.ip.IpManager;
+import android.net.metrics.IpConnectivityLog;
+import android.net.metrics.RaEvent;
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.os.ConditionVariable;
+import android.os.Parcelable;
import android.system.ErrnoException;
import android.system.Os;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
@@ -43,6 +52,7 @@
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.nio.ByteBuffer;
+import java.util.List;
import libcore.io.IoUtils;
import libcore.io.Streams;
@@ -56,9 +66,12 @@
public class ApfTest extends AndroidTestCase {
private static final int TIMEOUT_MS = 500;
+ @Mock IpConnectivityLog mLog;
+
@Override
public void setUp() throws Exception {
super.setUp();
+ MockitoAnnotations.initMocks(this);
// Load up native shared library containing APF interpreter exposed via JNI.
System.loadLibrary("servicestestsjni");
}
@@ -70,6 +83,9 @@
// least the minimum packet size.
private final static int MIN_PKT_SIZE = 15;
+ private final static boolean DROP_MULTICAST = true;
+ private final static boolean ALLOW_MULTICAST = false;
+
private void assertVerdict(int expected, byte[] program, byte[] packet, int filterAge) {
assertEquals(expected, apfSimulate(program, packet, filterAge));
}
@@ -562,10 +578,10 @@
public final static byte[] MOCK_MAC_ADDR = new byte[]{1,2,3,4,5,6};
private FileDescriptor mWriteSocket;
- public TestApfFilter(IpManager.Callback ipManagerCallback, boolean multicastFilter) throws
- Exception {
- super(new ApfCapabilities(2, 1000, ARPHRD_ETHER), NetworkInterface.getByName("lo"),
- ipManagerCallback, multicastFilter);
+ public TestApfFilter(IpManager.Callback ipManagerCallback, boolean multicastFilter,
+ IpConnectivityLog log) throws Exception {
+ super(new ApfCapabilities(2, 1536, ARPHRD_ETHER), NetworkInterface.getByName("lo"),
+ ipManagerCallback, multicastFilter, log);
}
// Pretend an RA packet has been received and show it to ApfFilter.
@@ -602,6 +618,7 @@
}
private static final int ETH_HEADER_LEN = 14;
+ private static final int ETH_DEST_ADDR_OFFSET = 0;
private static final int ETH_ETHERTYPE_OFFSET = 12;
private static final byte[] ETH_BROADCAST_MAC_ADDRESS = new byte[]{
(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff };
@@ -652,7 +669,7 @@
private static final int DHCP_CLIENT_PORT = 68;
private static final int DHCP_CLIENT_MAC_OFFSET = ETH_HEADER_LEN + UDP_HEADER_LEN + 48;
- private static int ARP_HEADER_OFFSET = ETH_HEADER_LEN;
+ private static final int ARP_HEADER_OFFSET = ETH_HEADER_LEN;
private static final byte[] ARP_IPV4_REQUEST_HEADER = new byte[]{
0, 1, // Hardware type: Ethernet (1)
8, 0, // Protocol type: IP (0x0800)
@@ -660,14 +677,23 @@
4, // Protocol size: 4
0, 1 // Opcode: request (1)
};
- private static int ARP_TARGET_IP_ADDRESS_OFFSET = ETH_HEADER_LEN + 24;
+ private static final byte[] ARP_IPV4_REPLY_HEADER = new byte[]{
+ 0, 1, // Hardware type: Ethernet (1)
+ 8, 0, // Protocol type: IP (0x0800)
+ 6, // Hardware size: 6
+ 4, // Protocol size: 4
+ 0, 2 // Opcode: reply (2)
+ };
+ private static final int ARP_TARGET_IP_ADDRESS_OFFSET = ETH_HEADER_LEN + 24;
- private static byte[] MOCK_IPV4_ADDR = new byte[]{10, 0, 0, 1};
+ private static final byte[] MOCK_IPV4_ADDR = new byte[]{10, 0, 0, 1};
+ private static final byte[] ANOTHER_IPV4_ADDR = new byte[]{10, 0, 0, 2};
+ private static final byte[] IPV4_ANY_HOST_ADDR = new byte[]{0, 0, 0, 0};
@LargeTest
public void testApfFilterIPv4() throws Exception {
MockIpManagerCallback ipManagerCallback = new MockIpManagerCallback();
- ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, true /* multicastFilter */);
+ ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, DROP_MULTICAST, mLog);
byte[] program = ipManagerCallback.getApfProgram();
// Verify empty packet of 100 zero bytes is passed
@@ -699,7 +725,7 @@
@LargeTest
public void testApfFilterIPv6() throws Exception {
MockIpManagerCallback ipManagerCallback = new MockIpManagerCallback();
- ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, false /* multicastFilter */);
+ ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, ALLOW_MULTICAST, mLog);
byte[] program = ipManagerCallback.getApfProgram();
// Verify empty IPv6 packet is passed
@@ -726,7 +752,7 @@
@LargeTest
public void testApfFilterMulticast() throws Exception {
MockIpManagerCallback ipManagerCallback = new MockIpManagerCallback();
- ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, false /* multicastFilter */);
+ ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, ALLOW_MULTICAST, mLog);
byte[] program = ipManagerCallback.getApfProgram();
// Construct IPv4 and IPv6 multicast packets.
@@ -772,7 +798,7 @@
// Verify it can be initialized to on
ipManagerCallback.resetApfProgramWait();
apfFilter.shutdown();
- apfFilter = new TestApfFilter(ipManagerCallback, true /* multicastFilter */);
+ apfFilter = new TestApfFilter(ipManagerCallback, DROP_MULTICAST, mLog);
program = ipManagerCallback.getApfProgram();
assertDrop(program, bcastv4packet.array(), 0);
assertDrop(program, mcastv4packet.array(), 0);
@@ -785,51 +811,81 @@
apfFilter.shutdown();
}
- private void verifyArpFilter(MockIpManagerCallback ipManagerCallback, ApfFilter apfFilter,
- LinkProperties linkProperties, int filterResult) {
- ipManagerCallback.resetApfProgramWait();
- apfFilter.setLinkProperties(linkProperties);
- byte[] program = ipManagerCallback.getApfProgram();
- ByteBuffer packet = ByteBuffer.wrap(new byte[100]);
- packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_ARP);
- assertPass(program, packet.array(), 0);
- packet.position(ARP_HEADER_OFFSET);
- packet.put(ARP_IPV4_REQUEST_HEADER);
- assertVerdict(filterResult, program, packet.array(), 0);
- packet.position(ARP_TARGET_IP_ADDRESS_OFFSET);
- packet.put(MOCK_IPV4_ADDR);
- assertPass(program, packet.array(), 0);
+ private byte[] getProgram(MockIpManagerCallback cb, ApfFilter filter, LinkProperties lp) {
+ cb.resetApfProgramWait();
+ filter.setLinkProperties(lp);
+ return cb.getApfProgram();
+ }
+
+ private void verifyArpFilter(byte[] program, int filterResult) {
+ // Verify ARP request packet
+ assertPass(program, arpRequestBroadcast(MOCK_IPV4_ADDR), 0);
+ assertVerdict(filterResult, program, arpRequestBroadcast(ANOTHER_IPV4_ADDR), 0);
+ assertDrop(program, arpRequestBroadcast(IPV4_ANY_HOST_ADDR), 0);
+
+ // Verify unicast ARP reply packet is always accepted.
+ assertPass(program, arpReplyUnicast(MOCK_IPV4_ADDR), 0);
+ assertPass(program, arpReplyUnicast(ANOTHER_IPV4_ADDR), 0);
+ assertPass(program, arpReplyUnicast(IPV4_ANY_HOST_ADDR), 0);
+
+ // Verify GARP reply packets are always filtered
+ assertDrop(program, garpReply(), 0);
}
@LargeTest
public void testApfFilterArp() throws Exception {
MockIpManagerCallback ipManagerCallback = new MockIpManagerCallback();
- ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, false /* multicastFilter */);
- byte[] program = ipManagerCallback.getApfProgram();
+ ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, ALLOW_MULTICAST, mLog);
- // Verify initially ARP filter is off
- ByteBuffer packet = ByteBuffer.wrap(new byte[100]);
- packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_ARP);
- assertPass(program, packet.array(), 0);
- packet.position(ARP_HEADER_OFFSET);
- packet.put(ARP_IPV4_REQUEST_HEADER);
- assertPass(program, packet.array(), 0);
- packet.position(ARP_TARGET_IP_ADDRESS_OFFSET);
- packet.put(MOCK_IPV4_ADDR);
- assertPass(program, packet.array(), 0);
+ // Verify initially ARP request filter is off, and GARP filter is on.
+ verifyArpFilter(ipManagerCallback.getApfProgram(), PASS);
// Inform ApfFilter of our address and verify ARP filtering is on
+ LinkAddress linkAddress = new LinkAddress(InetAddress.getByAddress(MOCK_IPV4_ADDR), 24);
LinkProperties lp = new LinkProperties();
- assertTrue(lp.addLinkAddress(
- new LinkAddress(InetAddress.getByAddress(MOCK_IPV4_ADDR), 24)));
- verifyArpFilter(ipManagerCallback, apfFilter, lp, DROP);
+ assertTrue(lp.addLinkAddress(linkAddress));
+ verifyArpFilter(getProgram(ipManagerCallback, apfFilter, lp), DROP);
// Inform ApfFilter of loss of IP and verify ARP filtering is off
- verifyArpFilter(ipManagerCallback, apfFilter, new LinkProperties(), PASS);
+ verifyArpFilter(getProgram(ipManagerCallback, apfFilter, new LinkProperties()), PASS);
apfFilter.shutdown();
}
+ private static byte[] arpRequestBroadcast(byte[] tip) {
+ ByteBuffer packet = ByteBuffer.wrap(new byte[100]);
+ packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_ARP);
+ packet.position(ETH_DEST_ADDR_OFFSET);
+ packet.put(ETH_BROADCAST_MAC_ADDRESS);
+ packet.position(ARP_HEADER_OFFSET);
+ packet.put(ARP_IPV4_REQUEST_HEADER);
+ packet.position(ARP_TARGET_IP_ADDRESS_OFFSET);
+ packet.put(tip);
+ return packet.array();
+ }
+
+ private static byte[] arpReplyUnicast(byte[] tip) {
+ ByteBuffer packet = ByteBuffer.wrap(new byte[100]);
+ packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_ARP);
+ packet.position(ARP_HEADER_OFFSET);
+ packet.put(ARP_IPV4_REPLY_HEADER);
+ packet.position(ARP_TARGET_IP_ADDRESS_OFFSET);
+ packet.put(tip);
+ return packet.array();
+ }
+
+ private static byte[] garpReply() {
+ ByteBuffer packet = ByteBuffer.wrap(new byte[100]);
+ packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_ARP);
+ packet.position(ETH_DEST_ADDR_OFFSET);
+ packet.put(ETH_BROADCAST_MAC_ADDRESS);
+ packet.position(ARP_HEADER_OFFSET);
+ packet.put(ARP_IPV4_REPLY_HEADER);
+ packet.position(ARP_TARGET_IP_ADDRESS_OFFSET);
+ packet.put(IPV4_ANY_HOST_ADDR);
+ return packet.array();
+ }
+
// Verify that the last program pushed to the IpManager.Callback properly filters the
// given packet for the given lifetime.
private void verifyRaLifetime(MockIpManagerCallback ipManagerCallback, ByteBuffer packet,
@@ -867,6 +923,35 @@
verifyRaLifetime(ipManagerCallback, packet, lifetime);
}
+ private void verifyRaEvent(RaEvent expected) {
+ ArgumentCaptor<Parcelable> captor = ArgumentCaptor.forClass(Parcelable.class);
+ verify(mLog, atLeastOnce()).log(captor.capture());
+ RaEvent got = lastRaEvent(captor.getAllValues());
+ if (!raEventEquals(expected, got)) {
+ assertEquals(expected, got); // fail for printing an assertion error message.
+ }
+ }
+
+ private RaEvent lastRaEvent(List<Parcelable> events) {
+ RaEvent got = null;
+ for (Parcelable ev : events) {
+ if (ev instanceof RaEvent) {
+ got = (RaEvent) ev;
+ }
+ }
+ return got;
+ }
+
+ private boolean raEventEquals(RaEvent ev1, RaEvent ev2) {
+ return (ev1 != null) && (ev2 != null)
+ && (ev1.routerLifetime == ev2.routerLifetime)
+ && (ev1.prefixValidLifetime == ev2.prefixValidLifetime)
+ && (ev1.prefixPreferredLifetime == ev2.prefixPreferredLifetime)
+ && (ev1.routeInfoLifetime == ev2.routeInfoLifetime)
+ && (ev1.rdnssLifetime == ev2.rdnssLifetime)
+ && (ev1.dnsslLifetime == ev2.dnsslLifetime);
+ }
+
private void assertInvalidRa(TestApfFilter apfFilter, MockIpManagerCallback ipManagerCallback,
ByteBuffer packet) throws IOException, ErrnoException {
ipManagerCallback.resetApfProgramWait();
@@ -877,7 +962,7 @@
@LargeTest
public void testApfFilterRa() throws Exception {
MockIpManagerCallback ipManagerCallback = new MockIpManagerCallback();
- TestApfFilter apfFilter = new TestApfFilter(ipManagerCallback, true /* multicastFilter */);
+ TestApfFilter apfFilter = new TestApfFilter(ipManagerCallback, DROP_MULTICAST, mLog);
byte[] program = ipManagerCallback.getApfProgram();
// Verify RA is passed the first time
@@ -891,6 +976,7 @@
assertPass(program, basePacket.array(), 0);
testRaLifetime(apfFilter, ipManagerCallback, basePacket, 1000);
+ verifyRaEvent(new RaEvent(1000, -1, -1, -1, -1, -1));
// Ensure zero-length options cause the packet to be silently skipped.
// Do this before we test other packets. http://b/29586253
@@ -916,6 +1002,7 @@
prefixOptionPacket.putInt(
ICMP6_RA_OPTION_OFFSET + ICMP6_PREFIX_OPTION_VALID_LIFETIME_OFFSET, 200);
testRaLifetime(apfFilter, ipManagerCallback, prefixOptionPacket, 100);
+ verifyRaEvent(new RaEvent(1000, 200, 100, -1, -1, -1));
ByteBuffer rdnssOptionPacket = ByteBuffer.wrap(
new byte[ICMP6_RA_OPTION_OFFSET + ICMP6_4_BYTE_OPTION_LEN]);
@@ -926,6 +1013,7 @@
rdnssOptionPacket.putInt(
ICMP6_RA_OPTION_OFFSET + ICMP6_4_BYTE_LIFETIME_OFFSET, 300);
testRaLifetime(apfFilter, ipManagerCallback, rdnssOptionPacket, 300);
+ verifyRaEvent(new RaEvent(1000, -1, -1, -1, 300, -1));
ByteBuffer routeInfoOptionPacket = ByteBuffer.wrap(
new byte[ICMP6_RA_OPTION_OFFSET + ICMP6_4_BYTE_OPTION_LEN]);
@@ -936,6 +1024,7 @@
routeInfoOptionPacket.putInt(
ICMP6_RA_OPTION_OFFSET + ICMP6_4_BYTE_LIFETIME_OFFSET, 400);
testRaLifetime(apfFilter, ipManagerCallback, routeInfoOptionPacket, 400);
+ verifyRaEvent(new RaEvent(1000, -1, -1, 400, -1, -1));
ByteBuffer dnsslOptionPacket = ByteBuffer.wrap(
new byte[ICMP6_RA_OPTION_OFFSET + ICMP6_4_BYTE_OPTION_LEN]);
@@ -948,6 +1037,7 @@
// Note that lifetime of 2000 will be ignored in favor of shorter
// route lifetime of 1000.
testRaLifetime(apfFilter, ipManagerCallback, dnsslOptionPacket, 1000);
+ verifyRaEvent(new RaEvent(1000, -1, -1, -1, -1, 2000));
// Verify that current program filters all five RAs:
verifyRaLifetime(ipManagerCallback, basePacket, 1000);
diff --git a/services/tests/servicestests/src/android/net/metrics/IpConnectivityLogTest.java b/services/tests/servicestests/src/android/net/metrics/IpConnectivityLogTest.java
new file mode 100644
index 0000000..1433f95
--- /dev/null
+++ b/services/tests/servicestests/src/android/net/metrics/IpConnectivityLogTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.metrics;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.net.ConnectivityMetricsEvent;
+import android.net.IConnectivityMetricsLogger;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+public class IpConnectivityLogTest extends TestCase {
+
+ // use same Parcel object everywhere for pointer equality
+ static final Bundle FAKE_EV = new Bundle();
+
+ @Mock IConnectivityMetricsLogger mService;
+ ArgumentCaptor<ConnectivityMetricsEvent> evCaptor;
+
+ IpConnectivityLog mLog;
+
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ evCaptor = ArgumentCaptor.forClass(ConnectivityMetricsEvent.class);
+ mLog = new IpConnectivityLog(mService);
+ }
+
+ public void testLogEvents() throws Exception {
+ assertTrue(mLog.log(1, FAKE_EV));
+ assertTrue(mLog.log(2, FAKE_EV));
+ assertTrue(mLog.log(3, FAKE_EV));
+
+ List<ConnectivityMetricsEvent> gotEvents = verifyEvents(3);
+ assertEventsEqual(expectedEvent(1), gotEvents.get(0));
+ assertEventsEqual(expectedEvent(2), gotEvents.get(1));
+ assertEventsEqual(expectedEvent(3), gotEvents.get(2));
+ }
+
+ public void testLogEventTriggerThrottling() throws Exception {
+ when(mService.logEvent(any())).thenReturn(1234L);
+
+ assertFalse(mLog.log(1, FAKE_EV));
+ }
+
+ public void testLogEventFails() throws Exception {
+ when(mService.logEvent(any())).thenReturn(-1L); // Error.
+
+ assertFalse(mLog.log(1, FAKE_EV));
+ }
+
+ public void testLogEventWhenThrottling() throws Exception {
+ when(mService.logEvent(any())).thenReturn(Long.MAX_VALUE); // Throttled
+
+ // No events are logged. The service is only called once
+ // After that, throttling state is maintained locally.
+ assertFalse(mLog.log(1, FAKE_EV));
+ assertFalse(mLog.log(2, FAKE_EV));
+
+ List<ConnectivityMetricsEvent> gotEvents = verifyEvents(1);
+ assertEventsEqual(expectedEvent(1), gotEvents.get(0));
+ }
+
+ public void testLogEventRecoverFromThrottling() throws Exception {
+ final long throttleTimeout = System.currentTimeMillis() + 50;
+ when(mService.logEvent(any())).thenReturn(throttleTimeout, 0L);
+
+ assertFalse(mLog.log(1, FAKE_EV));
+ new Thread() {
+ public void run() {
+ busySpinLog();
+ }
+ }.start();
+
+ List<ConnectivityMetricsEvent> gotEvents = verifyEvents(2, 200);
+ assertEventsEqual(expectedEvent(1), gotEvents.get(0));
+ assertEventsEqual(expectedEvent(2), gotEvents.get(1));
+ }
+
+ public void testLogEventRecoverFromThrottlingWithMultipleCallers() throws Exception {
+ final long throttleTimeout = System.currentTimeMillis() + 50;
+ when(mService.logEvent(any())).thenReturn(throttleTimeout, 0L);
+
+ assertFalse(mLog.log(1, FAKE_EV));
+ final int nCallers = 10;
+ for (int i = 0; i < nCallers; i++) {
+ new Thread() {
+ public void run() {
+ busySpinLog();
+ }
+ }.start();
+ }
+
+ List<ConnectivityMetricsEvent> gotEvents = verifyEvents(1 + nCallers, 200);
+ assertEventsEqual(expectedEvent(1), gotEvents.get(0));
+ for (int i = 0; i < nCallers; i++) {
+ assertEventsEqual(expectedEvent(2), gotEvents.get(1 + i));
+ }
+ }
+
+ void busySpinLog() {
+ final long timeout = 200;
+ final long stop = System.currentTimeMillis() + timeout;
+ try {
+ while (System.currentTimeMillis() < stop) {
+ if (mLog.log(2, FAKE_EV)) {
+ return;
+ }
+ Thread.sleep(10);
+ }
+ } catch (InterruptedException e) { }
+ }
+
+ List<ConnectivityMetricsEvent> verifyEvents(int n) throws Exception {
+ verify(mService, times(n)).logEvent(evCaptor.capture());
+ return evCaptor.getAllValues();
+ }
+
+ List<ConnectivityMetricsEvent> verifyEvents(int n, int timeoutMs) throws Exception {
+ verify(mService, timeout(timeoutMs).times(n)).logEvent(evCaptor.capture());
+ return evCaptor.getAllValues();
+ }
+
+ static ConnectivityMetricsEvent expectedEvent(int timestamp) {
+ return new ConnectivityMetricsEvent((long)timestamp, 0, 0, FAKE_EV);
+ }
+
+ /** Outer equality for ConnectivityMetricsEvent to avoid overriding equals() and hashCode(). */
+ static void assertEventsEqual(ConnectivityMetricsEvent expected, ConnectivityMetricsEvent got) {
+ assertEquals(expected.timestamp, got.timestamp);
+ assertEquals(expected.componentTag, got.componentTag);
+ assertEquals(expected.eventTag, got.eventTag);
+ assertEquals(expected.data, got.data);
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
index 68a35f1..59ccbd9 100644
--- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
@@ -17,6 +17,7 @@
package com.android.server;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
+import static android.net.ConnectivityManager.TYPE_ETHERNET;
import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName;
@@ -50,6 +51,7 @@
import android.net.NetworkMisc;
import android.net.NetworkRequest;
import android.net.RouteInfo;
+import android.net.metrics.IpConnectivityLog;
import android.os.ConditionVariable;
import android.os.Handler;
import android.os.HandlerThread;
@@ -79,6 +81,7 @@
import java.net.InetAddress;
import java.util.ArrayList;
+import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -94,12 +97,14 @@
private static final String TAG = "ConnectivityServiceTest";
private static final int TIMEOUT_MS = 500;
+ private static final int TEST_LINGER_DELAY_MS = 120;
private BroadcastInterceptingContext mServiceContext;
private WrappedConnectivityService mService;
private WrappedConnectivityManager mCm;
private MockNetworkAgent mWiFiNetworkAgent;
private MockNetworkAgent mCellNetworkAgent;
+ private MockNetworkAgent mEthernetNetworkAgent;
// This class exists to test bindProcessToNetwork and getBoundNetworkForProcess. These methods
// do not go through ConnectivityService but talk to netd directly, so they don't automatically
@@ -243,6 +248,9 @@
mNetworkCapabilities = new NetworkCapabilities();
mNetworkCapabilities.addTransportType(transport);
switch (transport) {
+ case TRANSPORT_ETHERNET:
+ mScore = 70;
+ break;
case TRANSPORT_WIFI:
mScore = 60;
break;
@@ -304,6 +312,11 @@
mNetworkAgent.sendNetworkCapabilities(mNetworkCapabilities);
}
+ public void removeCapability(int capability) {
+ mNetworkCapabilities.removeCapability(capability);
+ mNetworkAgent.sendNetworkCapabilities(mNetworkCapabilities);
+ }
+
public void setSignalStrength(int signalStrength) {
mNetworkCapabilities.setSignalStrength(signalStrength);
mNetworkAgent.sendNetworkCapabilities(mNetworkCapabilities);
@@ -319,7 +332,8 @@
* @param validated Indicate if network should pretend to be validated.
*/
public void connect(boolean validated) {
- assertEquals(mNetworkInfo.getDetailedState(), DetailedState.IDLE);
+ assertEquals("MockNetworkAgents can only be connected once",
+ mNetworkInfo.getDetailedState(), DetailedState.IDLE);
assertFalse(mNetworkCapabilities.hasCapability(NET_CAPABILITY_INTERNET));
NetworkCallback callback = null;
@@ -537,6 +551,11 @@
super(context, handler, cmdName, cmd);
}
+ public FakeWakeupMessage(Context context, Handler handler, String cmdName, int cmd,
+ int arg1, int arg2, Object obj) {
+ super(context, handler, cmdName, cmd, arg1, arg2, obj);
+ }
+
@Override
public void schedule(long when) {
long delayMs = when - SystemClock.elapsedRealtime();
@@ -545,12 +564,13 @@
fail("Attempting to send msg more than " + UNREASONABLY_LONG_WAIT +
"ms into the future: " + delayMs);
}
- mHandler.sendEmptyMessageDelayed(mCmd, delayMs);
+ Message msg = mHandler.obtainMessage(mCmd, mArg1, mArg2, mObj);
+ mHandler.sendMessageDelayed(msg, delayMs);
}
@Override
public void cancel() {
- mHandler.removeMessages(mCmd);
+ mHandler.removeMessages(mCmd, mObj);
}
@Override
@@ -566,28 +586,25 @@
public String gen204ProbeRedirectUrl = null;
public WrappedNetworkMonitor(Context context, Handler handler,
- NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest) {
- super(context, handler, networkAgentInfo, defaultRequest);
+ NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest,
+ IpConnectivityLog log) {
+ super(context, handler, networkAgentInfo, defaultRequest, log);
}
@Override
protected CaptivePortalProbeResult isCaptivePortal() {
return new CaptivePortalProbeResult(gen204ProbeResult, gen204ProbeRedirectUrl);
}
-
- @Override
- protected WakeupMessage makeWakeupMessage(
- Context context, Handler handler, String cmdName, int cmd) {
- return new FakeWakeupMessage(context, handler, cmdName, cmd);
- }
}
private class WrappedConnectivityService extends ConnectivityService {
private WrappedNetworkMonitor mLastCreatedNetworkMonitor;
public WrappedConnectivityService(Context context, INetworkManagementService netManager,
- INetworkStatsService statsService, INetworkPolicyManager policyManager) {
- super(context, netManager, statsService, policyManager);
+ INetworkStatsService statsService, INetworkPolicyManager policyManager,
+ IpConnectivityLog log) {
+ super(context, netManager, statsService, policyManager, log);
+ mLingerDelayMs = TEST_LINGER_DELAY_MS;
}
@Override
@@ -625,12 +642,18 @@
@Override
public NetworkMonitor createNetworkMonitor(Context context, Handler handler,
NetworkAgentInfo nai, NetworkRequest defaultRequest) {
- final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(context, handler, nai,
- defaultRequest);
+ final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(
+ context, handler, nai, defaultRequest, mock(IpConnectivityLog.class));
mLastCreatedNetworkMonitor = monitor;
return monitor;
}
+ @Override
+ public WakeupMessage makeWakeupMessage(
+ Context context, Handler handler, String cmdName, int cmd, Object obj) {
+ return new FakeWakeupMessage(context, handler, cmdName, cmd, 0, 0, obj);
+ }
+
public WrappedNetworkMonitor getLastCreatedWrappedNetworkMonitor() {
return mLastCreatedNetworkMonitor;
}
@@ -675,8 +698,6 @@
public void setUp() throws Exception {
super.setUp();
- NetworkMonitor.SetDefaultLingerTime(120);
-
// InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.
// http://b/25897652 .
if (Looper.myLooper() == null) {
@@ -687,21 +708,31 @@
mService = new WrappedConnectivityService(mServiceContext,
mock(INetworkManagementService.class),
mock(INetworkStatsService.class),
- mock(INetworkPolicyManager.class));
+ mock(INetworkPolicyManager.class),
+ mock(IpConnectivityLog.class));
mService.systemReady();
mCm = new WrappedConnectivityManager(getContext(), mService);
mCm.bindProcessToNetwork(null);
}
+ public void tearDown() throws Exception {
+ if (mCellNetworkAgent != null) { mCellNetworkAgent.disconnect(); }
+ if (mWiFiNetworkAgent != null) { mWiFiNetworkAgent.disconnect(); }
+ mCellNetworkAgent = mWiFiNetworkAgent = null;
+ super.tearDown();
+ }
+
private int transportToLegacyType(int transport) {
switch (transport) {
+ case TRANSPORT_ETHERNET:
+ return TYPE_ETHERNET;
case TRANSPORT_WIFI:
return TYPE_WIFI;
case TRANSPORT_CELLULAR:
return TYPE_MOBILE;
default:
- throw new IllegalStateException("Unknown transport" + transport);
+ throw new IllegalStateException("Unknown transport " + transport);
}
}
@@ -911,8 +942,6 @@
mWiFiNetworkAgent.adjustScore(11);
waitFor(cv);
verifyActiveNetwork(TRANSPORT_WIFI);
- mCellNetworkAgent.disconnect();
- mWiFiNetworkAgent.disconnect();
}
@LargeTest
@@ -984,8 +1013,6 @@
assertFalse(mCm.getNetworkCapabilities(mWiFiNetworkAgent.getNetwork()).hasCapability(
NET_CAPABILITY_VALIDATED));
verifyActiveNetwork(TRANSPORT_WIFI);
- mCellNetworkAgent.disconnect();
- mWiFiNetworkAgent.disconnect();
}
@LargeTest
@@ -1012,13 +1039,13 @@
assertFalse(mCm.getNetworkCapabilities(mCellNetworkAgent.getNetwork()).hasCapability(
NET_CAPABILITY_VALIDATED));
verifyActiveNetwork(TRANSPORT_WIFI);
- mCellNetworkAgent.disconnect();
- mWiFiNetworkAgent.disconnect();
}
enum CallbackState {
NONE,
AVAILABLE,
+ NETWORK_CAPABILITIES,
+ LINK_PROPERTIES,
LOSING,
LOST
}
@@ -1029,59 +1056,98 @@
* received. assertNoCallback may be called at any time.
*/
private class TestNetworkCallback extends NetworkCallback {
- private final ConditionVariable mConditionVariable = new ConditionVariable();
- private CallbackState mLastCallback = CallbackState.NONE;
- private Network mLastNetwork;
+ // Chosen to be much less than the linger timeout. This ensures that we can distinguish
+ // between a LOST callback that arrives immediately and a LOST callback that arrives after
+ // the linger timeout.
+ private final static int TIMEOUT_MS = 50;
+ private class CallbackInfo {
+ public final CallbackState state;
+ public final Network network;
+ public Object arg;
+ public CallbackInfo(CallbackState s, Network n, Object o) {
+ state = s; network = n; arg = o;
+ }
+ public String toString() { return String.format("%s (%s)", state, network); }
+ public boolean equals(Object o) {
+ if (!(o instanceof CallbackInfo)) return false;
+ // Ignore timeMs, since it's unpredictable.
+ CallbackInfo other = (CallbackInfo) o;
+ return state == other.state && Objects.equals(network, other.network);
+ }
+ }
+ private final LinkedBlockingQueue<CallbackInfo> mCallbacks = new LinkedBlockingQueue<>();
+
+ protected void setLastCallback(CallbackState state, Network network, Object o) {
+ mCallbacks.offer(new CallbackInfo(state, network, o));
+ }
+
+ @Override
public void onAvailable(Network network) {
- assertEquals(CallbackState.NONE, mLastCallback);
- mLastCallback = CallbackState.AVAILABLE;
- mLastNetwork = network;
- mConditionVariable.open();
+ setLastCallback(CallbackState.AVAILABLE, network, null);
}
+ @Override
public void onLosing(Network network, int maxMsToLive) {
- assertEquals(CallbackState.NONE, mLastCallback);
- mLastCallback = CallbackState.LOSING;
- mLastNetwork = network;
- mConditionVariable.open();
+ setLastCallback(CallbackState.LOSING, network, maxMsToLive /* autoboxed int */);
}
+ @Override
public void onLost(Network network) {
- assertEquals(CallbackState.NONE, mLastCallback);
- mLastCallback = CallbackState.LOST;
- mLastNetwork = network;
- mConditionVariable.open();
+ setLastCallback(CallbackState.LOST, network, null);
}
- void expectCallback(CallbackState state) {
- expectCallback(state, null);
+ void expectCallback(CallbackState state, MockNetworkAgent mockAgent, int timeoutMs) {
+ CallbackInfo expected = new CallbackInfo(
+ state, (mockAgent != null) ? mockAgent.getNetwork() : null, 0);
+ CallbackInfo actual;
+ try {
+ actual = mCallbacks.poll(timeoutMs, TimeUnit.MILLISECONDS);
+ assertEquals("Unexpected callback:", expected, actual);
+ } catch (InterruptedException e) {
+ fail("Did not receive expected " + expected + " after " + TIMEOUT_MS + "ms");
+ actual = null; // Or the compiler can't tell it's never used uninitialized.
+ }
+ if (state == CallbackState.LOSING) {
+ String msg = String.format(
+ "Invalid linger time value %d, must be between %d and %d",
+ actual.arg, 0, TEST_LINGER_DELAY_MS);
+ int maxMsToLive = (Integer) actual.arg;
+ assertTrue(msg, 0 <= maxMsToLive && maxMsToLive <= TEST_LINGER_DELAY_MS);
+ }
}
void expectCallback(CallbackState state, MockNetworkAgent mockAgent) {
- waitFor(mConditionVariable);
- assertEquals(state, mLastCallback);
- if (mockAgent != null) {
- assertEquals(mockAgent.getNetwork(), mLastNetwork);
- }
- mLastCallback = CallbackState.NONE;
- mLastNetwork = null;
- mConditionVariable.close();
+ expectCallback(state, mockAgent, TIMEOUT_MS);
}
void assertNoCallback() {
- assertEquals(CallbackState.NONE, mLastCallback);
+ mService.waitForIdle();
+ CallbackInfo c = mCallbacks.peek();
+ assertNull("Unexpected callback: " + c, c);
+ }
+ }
+
+ // Can't be part of TestNetworkCallback because "cannot be declared static; static methods can
+ // only be declared in a static or top level type".
+ static void assertNoCallbacks(TestNetworkCallback ... callbacks) {
+ for (TestNetworkCallback c : callbacks) {
+ c.assertNoCallback();
}
}
@LargeTest
public void testStateChangeNetworkCallbacks() throws Exception {
+ final TestNetworkCallback genericNetworkCallback = new TestNetworkCallback();
final TestNetworkCallback wifiNetworkCallback = new TestNetworkCallback();
final TestNetworkCallback cellNetworkCallback = new TestNetworkCallback();
+ final NetworkRequest genericRequest = new NetworkRequest.Builder()
+ .clearCapabilities().build();
final NetworkRequest wifiRequest = new NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI).build();
final NetworkRequest cellRequest = new NetworkRequest.Builder()
.addTransportType(TRANSPORT_CELLULAR).build();
+ mCm.registerNetworkCallback(genericRequest, genericNetworkCallback);
mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
mCm.registerNetworkCallback(cellRequest, cellNetworkCallback);
@@ -1089,65 +1155,275 @@
ConditionVariable cv = waitForConnectivityBroadcasts(1);
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(false);
- cellNetworkCallback.expectCallback(CallbackState.AVAILABLE);
- wifiNetworkCallback.assertNoCallback();
+ genericNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ cellNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
waitFor(cv);
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
// This should not trigger spurious onAvailable() callbacks, b/21762680.
mCellNetworkAgent.adjustScore(-1);
mService.waitForIdle();
- wifiNetworkCallback.assertNoCallback();
- cellNetworkCallback.assertNoCallback();
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
cv = waitForConnectivityBroadcasts(2);
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
mWiFiNetworkAgent.connect(false);
- wifiNetworkCallback.expectCallback(CallbackState.AVAILABLE);
- cellNetworkCallback.assertNoCallback();
+ genericNetworkCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ wifiNetworkCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
waitFor(cv);
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
cv = waitForConnectivityBroadcasts(2);
mWiFiNetworkAgent.disconnect();
- wifiNetworkCallback.expectCallback(CallbackState.LOST);
+ genericNetworkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ wifiNetworkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
cellNetworkCallback.assertNoCallback();
waitFor(cv);
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
cv = waitForConnectivityBroadcasts(1);
mCellNetworkAgent.disconnect();
- cellNetworkCallback.expectCallback(CallbackState.LOST);
- wifiNetworkCallback.assertNoCallback();
+ genericNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
+ cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
waitFor(cv);
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
// Test validated networks
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(true);
- cellNetworkCallback.expectCallback(CallbackState.AVAILABLE);
- wifiNetworkCallback.assertNoCallback();
+ genericNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ cellNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
// This should not trigger spurious onAvailable() callbacks, b/21762680.
mCellNetworkAgent.adjustScore(-1);
mService.waitForIdle();
- wifiNetworkCallback.assertNoCallback();
- cellNetworkCallback.assertNoCallback();
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
mWiFiNetworkAgent.connect(true);
- wifiNetworkCallback.expectCallback(CallbackState.AVAILABLE);
- cellNetworkCallback.expectCallback(CallbackState.LOSING);
+ genericNetworkCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ genericNetworkCallback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+ wifiNetworkCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ cellNetworkCallback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+ assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
+
+ mWiFiNetworkAgent.disconnect();
+ genericNetworkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ wifiNetworkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
+
+ mCellNetworkAgent.disconnect();
+ genericNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
+ cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
+ assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback);
+ }
+
+ @SmallTest
+ public void testMultipleLingering() {
+ NetworkRequest request = new NetworkRequest.Builder()
+ .clearCapabilities().addCapability(NET_CAPABILITY_NOT_METERED)
+ .build();
+ TestNetworkCallback callback = new TestNetworkCallback();
+ mCm.registerNetworkCallback(request, callback);
+
+ TestNetworkCallback defaultCallback = new TestNetworkCallback();
+ mCm.registerDefaultNetworkCallback(defaultCallback);
+
+ mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ mEthernetNetworkAgent = new MockNetworkAgent(TRANSPORT_ETHERNET);
+
+ mCellNetworkAgent.addCapability(NET_CAPABILITY_NOT_METERED);
+ mWiFiNetworkAgent.addCapability(NET_CAPABILITY_NOT_METERED);
+ mEthernetNetworkAgent.addCapability(NET_CAPABILITY_NOT_METERED);
+
+ mCellNetworkAgent.connect(true);
+ callback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ mWiFiNetworkAgent.connect(true);
+ // We get AVAILABLE on wifi when wifi connects and satisfies our unmetered request.
+ // We then get LOSING when wifi validates and cell is outscored.
+ callback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ mEthernetNetworkAgent.connect(true);
+ callback.expectCallback(CallbackState.AVAILABLE, mEthernetNetworkAgent);
+ callback.expectCallback(CallbackState.LOSING, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mEthernetNetworkAgent);
+ assertEquals(mEthernetNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ mEthernetNetworkAgent.disconnect();
+ callback.expectCallback(CallbackState.LOST, mEthernetNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mEthernetNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+
+ for (int i = 0; i < 4; i++) {
+ MockNetworkAgent oldNetwork, newNetwork;
+ if (i % 2 == 0) {
+ mWiFiNetworkAgent.adjustScore(-15);
+ oldNetwork = mWiFiNetworkAgent;
+ newNetwork = mCellNetworkAgent;
+ } else {
+ mWiFiNetworkAgent.adjustScore(15);
+ oldNetwork = mCellNetworkAgent;
+ newNetwork = mWiFiNetworkAgent;
+
+ }
+ callback.expectCallback(CallbackState.LOSING, oldNetwork);
+ // TODO: should we send an AVAILABLE callback to newNetwork, to indicate that it is no
+ // longer lingering?
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, newNetwork);
+ assertEquals(newNetwork.getNetwork(), mCm.getActiveNetwork());
+ }
+ assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ // Verify that if a network no longer satisfies a request, we send LOST and not LOSING, even
+ // if the network is still up.
+ mWiFiNetworkAgent.removeCapability(NET_CAPABILITY_NOT_METERED);
+ callback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+
+ // Wifi no longer satisfies our listen, which is for an unmetered network.
+ // But because its score is 55, it's still up (and the default network).
+ defaultCallback.assertNoCallback();
+ assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ // Disconnect our test networks.
+ mWiFiNetworkAgent.disconnect();
+ defaultCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ mCellNetworkAgent.disconnect();
+ defaultCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
+
+ mCm.unregisterNetworkCallback(callback);
+ mService.waitForIdle();
+
+ // Check that a network is only lingered or torn down if it would not satisfy a request even
+ // if it validated.
+ request = new NetworkRequest.Builder().clearCapabilities().build();
+ callback = new TestNetworkCallback();
+
+ mCm.registerNetworkCallback(request, callback);
+
+ mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
+ mCellNetworkAgent.connect(false); // Score: 10
+ callback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ // Bring up wifi with a score of 20.
+ // Cell stays up because it would satisfy the default request if it validated.
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ mWiFiNetworkAgent.connect(false); // Score: 20
+ callback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
mWiFiNetworkAgent.disconnect();
- wifiNetworkCallback.expectCallback(CallbackState.LOST);
- cellNetworkCallback.assertNoCallback();
+ callback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+ // Bring up wifi with a score of 70.
+ // Cell is lingered because it would not satisfy any request, even if it validated.
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ mWiFiNetworkAgent.adjustScore(50);
+ mWiFiNetworkAgent.connect(false); // Score: 70
+ callback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ // Tear down wifi.
+ mWiFiNetworkAgent.disconnect();
+ callback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ // Bring up wifi, then validate it. Previous versions would immediately tear down cell, but
+ // it's arguably correct to linger it, since it was the default network before it validated.
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ mWiFiNetworkAgent.connect(true);
+ callback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
+
+ mWiFiNetworkAgent.disconnect();
+ callback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
mCellNetworkAgent.disconnect();
- cellNetworkCallback.expectCallback(CallbackState.LOST);
- wifiNetworkCallback.assertNoCallback();
+ callback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
+
+ // If a network is lingering, and we add and remove a request from it, resume lingering.
+ mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
+ mCellNetworkAgent.connect(true);
+ callback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ mWiFiNetworkAgent.connect(true);
+ callback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+
+ NetworkRequest cellRequest = new NetworkRequest.Builder()
+ .addTransportType(TRANSPORT_CELLULAR).build();
+ NetworkCallback noopCallback = new NetworkCallback();
+ mCm.requestNetwork(cellRequest, noopCallback);
+ // TODO: should this cause an AVAILABLE callback, to indicate that the network is no longer
+ // lingering?
+ mCm.unregisterNetworkCallback(noopCallback);
+ callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+
+ // Similar to the above: lingering can start even after the lingered request is removed.
+ // Disconnect wifi and switch to cell.
+ mWiFiNetworkAgent.disconnect();
+ callback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+
+ // Cell is now the default network. Pin it with a cell-specific request.
+ noopCallback = new NetworkCallback(); // Can't reuse NetworkCallbacks. http://b/20701525
+ mCm.requestNetwork(cellRequest, noopCallback);
+
+ // Now connect wifi, and expect it to become the default network.
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ mWiFiNetworkAgent.connect(true);
+ callback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
+ // The default request is lingering on cell, but nothing happens to cell, and we send no
+ // callbacks for it, because it's kept up by cellRequest.
+ callback.assertNoCallback();
+ // Now unregister cellRequest and expect cell to start lingering.
+ mCm.unregisterNetworkCallback(noopCallback);
+ callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
+
+ // Let linger run its course.
+ callback.assertNoCallback();
+ callback.expectCallback(CallbackState.LOST, mCellNetworkAgent,
+ TEST_LINGER_DELAY_MS /* timeoutMs */);
+
+ // Clean up.
+ mWiFiNetworkAgent.disconnect();
+ callback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+ defaultCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
+
+ mCm.unregisterNetworkCallback(callback);
+ mCm.unregisterNetworkCallback(defaultCallback);
}
private void tryNetworkFactoryRequests(int capability) throws Exception {
@@ -1314,7 +1590,7 @@
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
mCellNetworkAgent.addCapability(NET_CAPABILITY_MMS);
mCellNetworkAgent.connectWithoutInternet();
- networkCallback.expectCallback(CallbackState.AVAILABLE);
+ networkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
verifyActiveNetwork(TRANSPORT_WIFI);
// Test releasing NetworkRequest disconnects cellular with MMS
cv = mCellNetworkAgent.getDisconnectedCV();
@@ -1340,7 +1616,7 @@
MockNetworkAgent mmsNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
mmsNetworkAgent.addCapability(NET_CAPABILITY_MMS);
mmsNetworkAgent.connectWithoutInternet();
- networkCallback.expectCallback(CallbackState.AVAILABLE);
+ networkCallback.expectCallback(CallbackState.AVAILABLE, mmsNetworkAgent);
verifyActiveNetwork(TRANSPORT_CELLULAR);
// Test releasing MMS NetworkRequest does not disconnect main cellular NetworkAgent
cv = mmsNetworkAgent.getDisconnectedCV();
@@ -1366,36 +1642,36 @@
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
String firstRedirectUrl = "http://example.com/firstPath";
mWiFiNetworkAgent.connectWithCaptivePortal(firstRedirectUrl);
- captivePortalCallback.expectCallback(CallbackState.AVAILABLE);
+ captivePortalCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
assertEquals(mWiFiNetworkAgent.waitForRedirectUrl(), firstRedirectUrl);
// Take down network.
// Expect onLost callback.
mWiFiNetworkAgent.disconnect();
- captivePortalCallback.expectCallback(CallbackState.LOST);
+ captivePortalCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
// Bring up a network with a captive portal.
// Expect onAvailable callback of listen for NET_CAPABILITY_CAPTIVE_PORTAL.
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
String secondRedirectUrl = "http://example.com/secondPath";
mWiFiNetworkAgent.connectWithCaptivePortal(secondRedirectUrl);
- captivePortalCallback.expectCallback(CallbackState.AVAILABLE);
+ captivePortalCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
assertEquals(mWiFiNetworkAgent.waitForRedirectUrl(), secondRedirectUrl);
// Make captive portal disappear then revalidate.
// Expect onLost callback because network no longer provides NET_CAPABILITY_CAPTIVE_PORTAL.
mWiFiNetworkAgent.getWrappedNetworkMonitor().gen204ProbeResult = 204;
mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), true);
- captivePortalCallback.expectCallback(CallbackState.LOST);
+ captivePortalCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
// Expect NET_CAPABILITY_VALIDATED onAvailable callback.
- validatedCallback.expectCallback(CallbackState.AVAILABLE);
+ validatedCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent);
// Break network connectivity.
// Expect NET_CAPABILITY_VALIDATED onLost callback.
mWiFiNetworkAgent.getWrappedNetworkMonitor().gen204ProbeResult = 500;
mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), false);
- validatedCallback.expectCallback(CallbackState.LOST);
+ validatedCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);
}
@SmallTest
@@ -1410,7 +1686,7 @@
// do nothing - should get here
}
- assertTrue("NetworkReqeuest builder with MATCH_ALL_REQUESTS_NETWORK_SPECIFIER",
+ assertTrue("NetworkRequest builder with MATCH_ALL_REQUESTS_NETWORK_SPECIFIER",
execptionCalled);
try {
@@ -1477,6 +1753,139 @@
defaultNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
}
+ private class TestRequestUpdateCallback extends TestNetworkCallback {
+ @Override
+ public void onCapabilitiesChanged(Network network, NetworkCapabilities netCap) {
+ setLastCallback(CallbackState.NETWORK_CAPABILITIES, network, netCap);
+ }
+
+ @Override
+ public void onLinkPropertiesChanged(Network network, LinkProperties linkProp) {
+ setLastCallback(CallbackState.LINK_PROPERTIES, network, linkProp);
+ }
+ }
+
+ @LargeTest
+ public void testRequestCallbackUpdates() throws Exception {
+ // File a network request for mobile.
+ final TestNetworkCallback cellNetworkCallback = new TestRequestUpdateCallback();
+ final NetworkRequest cellRequest = new NetworkRequest.Builder()
+ .addTransportType(TRANSPORT_CELLULAR).build();
+ mCm.requestNetwork(cellRequest, cellNetworkCallback);
+
+ // Bring up the mobile network.
+ mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
+ mCellNetworkAgent.connect(true);
+
+ // We should get onAvailable().
+ cellNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ // We should get onCapabilitiesChanged(), when the mobile network successfully validates.
+ cellNetworkCallback.expectCallback(CallbackState.NETWORK_CAPABILITIES, mCellNetworkAgent);
+ cellNetworkCallback.assertNoCallback();
+
+ // Update LinkProperties.
+ final LinkProperties lp = new LinkProperties();
+ lp.setInterfaceName("foonet_data0");
+ mCellNetworkAgent.sendLinkProperties(lp);
+ // We should get onLinkPropertiesChanged().
+ cellNetworkCallback.expectCallback(CallbackState.LINK_PROPERTIES, mCellNetworkAgent);
+ cellNetworkCallback.assertNoCallback();
+
+ // Register a garden variety default network request.
+ final TestNetworkCallback dfltNetworkCallback = new TestRequestUpdateCallback();
+ mCm.registerDefaultNetworkCallback(dfltNetworkCallback);
+ // Only onAvailable() is called; no other information is delivered.
+ dfltNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
+ dfltNetworkCallback.assertNoCallback();
+
+ // Request a NetworkCapabilities update; only the requesting callback is notified.
+ mCm.requestNetworkCapabilities(dfltNetworkCallback);
+ dfltNetworkCallback.expectCallback(CallbackState.NETWORK_CAPABILITIES, mCellNetworkAgent);
+ cellNetworkCallback.assertNoCallback();
+ dfltNetworkCallback.assertNoCallback();
+
+ // Request a LinkProperties update; only the requesting callback is notified.
+ mCm.requestLinkProperties(dfltNetworkCallback);
+ dfltNetworkCallback.expectCallback(CallbackState.LINK_PROPERTIES, mCellNetworkAgent);
+ cellNetworkCallback.assertNoCallback();
+ dfltNetworkCallback.assertNoCallback();
+
+ mCm.unregisterNetworkCallback(dfltNetworkCallback);
+ mCm.unregisterNetworkCallback(cellNetworkCallback);
+ }
+
+ @SmallTest
+ public void testRequestBenchmark() throws Exception {
+ // Benchmarks connecting and switching performance in the presence of a large number of
+ // NetworkRequests.
+ // 1. File NUM_REQUESTS requests.
+ // 2. Have a network connect. Wait for NUM_REQUESTS onAvailable callbacks to fire.
+ // 3. Have a new network connect and outscore the previous. Wait for NUM_REQUESTS onLosing
+ // and NUM_REQUESTS onAvailable callbacks to fire.
+ // See how long it took.
+ final int NUM_REQUESTS = 90;
+ final NetworkRequest request = new NetworkRequest.Builder().clearCapabilities().build();
+ final NetworkCallback[] callbacks = new NetworkCallback[NUM_REQUESTS];
+ final CountDownLatch availableLatch = new CountDownLatch(NUM_REQUESTS);
+ final CountDownLatch losingLatch = new CountDownLatch(NUM_REQUESTS);
+
+ final int REGISTER_TIME_LIMIT_MS = 100;
+ long startTime = System.currentTimeMillis();
+ for (int i = 0; i < NUM_REQUESTS; i++) {
+ callbacks[i] = new NetworkCallback() {
+ @Override public void onAvailable(Network n) { availableLatch.countDown(); }
+ @Override public void onLosing(Network n, int t) { losingLatch.countDown(); }
+ };
+ mCm.registerNetworkCallback(request, callbacks[i]);
+ }
+ long timeTaken = System.currentTimeMillis() - startTime;
+ String msg = String.format("Register %d callbacks: %dms, acceptable %dms",
+ NUM_REQUESTS, timeTaken, REGISTER_TIME_LIMIT_MS);
+ Log.d(TAG, msg);
+ assertTrue(msg, timeTaken < REGISTER_TIME_LIMIT_MS);
+
+ final int CONNECT_TIME_LIMIT_MS = 30;
+ mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
+ // Don't request that the network validate, because otherwise connect() will block until
+ // the network gets NET_CAPABILITY_VALIDATED, after all the callbacks below have fired,
+ // and we won't actually measure anything.
+ mCellNetworkAgent.connect(false);
+ startTime = System.currentTimeMillis();
+ if (!availableLatch.await(CONNECT_TIME_LIMIT_MS, TimeUnit.MILLISECONDS)) {
+ fail(String.format("Only dispatched %d/%d onAvailable callbacks in %dms",
+ NUM_REQUESTS - availableLatch.getCount(), NUM_REQUESTS,
+ CONNECT_TIME_LIMIT_MS));
+ }
+ timeTaken = System.currentTimeMillis() - startTime;
+ Log.d(TAG, String.format("Connect, %d callbacks: %dms, acceptable %dms",
+ NUM_REQUESTS, timeTaken, CONNECT_TIME_LIMIT_MS));
+
+ final int SWITCH_TIME_LIMIT_MS = 30;
+ mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
+ // Give wifi a high enough score that we'll linger cell when wifi comes up.
+ mWiFiNetworkAgent.adjustScore(40);
+ mWiFiNetworkAgent.connect(false);
+ startTime = System.currentTimeMillis();
+ if (!losingLatch.await(SWITCH_TIME_LIMIT_MS, TimeUnit.MILLISECONDS)) {
+ fail(String.format("Only dispatched %d/%d onLosing callbacks in %dms",
+ NUM_REQUESTS - losingLatch.getCount(), NUM_REQUESTS, SWITCH_TIME_LIMIT_MS));
+ }
+ timeTaken = System.currentTimeMillis() - startTime;
+ Log.d(TAG, String.format("Linger, %d callbacks: %dms, acceptable %dms",
+ NUM_REQUESTS, timeTaken, SWITCH_TIME_LIMIT_MS));
+
+ final int UNREGISTER_TIME_LIMIT_MS = 10;
+ startTime = System.currentTimeMillis();
+ for (int i = 0; i < NUM_REQUESTS; i++) {
+ mCm.unregisterNetworkCallback(callbacks[i]);
+ }
+ timeTaken = System.currentTimeMillis() - startTime;
+ msg = String.format("Unregister %d callbacks: %dms, acceptable %dms",
+ NUM_REQUESTS, timeTaken, UNREGISTER_TIME_LIMIT_MS);
+ Log.d(TAG, msg);
+ assertTrue(msg, timeTaken < UNREGISTER_TIME_LIMIT_MS);
+ }
+
@SmallTest
public void testMobileDataAlwaysOn() throws Exception {
final TestNetworkCallback cellNetworkCallback = new TestNetworkCallback();
@@ -1520,7 +1929,7 @@
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
testFactory.expectAddRequests(2); // Because the cell request changes score twice.
mCellNetworkAgent.connect(true);
- cellNetworkCallback.expectCallback(CallbackState.AVAILABLE);
+ cellNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent);
testFactory.waitForNetworkRequests(2);
assertFalse(testFactory.getMyStartRequested()); // Because the cell network outscores us.
@@ -1536,7 +1945,7 @@
testFactory.waitForNetworkRequests(1);
// ... and cell data to be torn down.
- cellNetworkCallback.expectCallback(CallbackState.LOST);
+ cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
assertEquals(1, mCm.getAllNetworks().length);
testFactory.unregister();
diff --git a/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
index 622e46e..979f160 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
@@ -20,6 +20,7 @@
import static android.content.Intent.EXTRA_UID;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.net.NetworkPolicy.CYCLE_NONE;
import static android.net.NetworkPolicy.LIMIT_DISABLED;
import static android.net.NetworkPolicy.WARNING_DISABLED;
import static android.net.NetworkPolicyManager.POLICY_NONE;
@@ -86,7 +87,9 @@
import org.easymock.IAnswer;
import java.io.File;
+import java.util.Calendar;
import java.util.LinkedHashSet;
+import java.util.TimeZone;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -141,8 +144,7 @@
private static final int PID_2 = 401;
private static final int PID_3 = 402;
- @Override
- public void setUp() throws Exception {
+ public void _setUp() throws Exception {
super.setUp();
setCurrentTimeMillis(TEST_START);
@@ -229,8 +231,7 @@
}
- @Override
- public void tearDown() throws Exception {
+ public void _tearDown() throws Exception {
for (File file : mPolicyDir.listFiles()) {
file.delete();
}
@@ -263,6 +264,7 @@
backgroundChanged.get();
}
+ @Suppress
public void testPidForegroundCombined() throws Exception {
IdleFuture idle;
@@ -310,6 +312,7 @@
assertFalse(mService.isUidForeground(UID_A));
}
+ @Suppress
public void testScreenChangesRules() throws Exception {
Future<Void> future;
@@ -351,6 +354,7 @@
verifyAndReset();
}
+ @Suppress
public void testPolicyNone() throws Exception {
Future<Void> future;
@@ -381,6 +385,7 @@
verifyAndReset();
}
+ @Suppress
public void testPolicyReject() throws Exception {
Future<Void> future;
@@ -412,6 +417,7 @@
verifyAndReset();
}
+ @Suppress
public void testPolicyRejectAddRemove() throws Exception {
Future<Void> future;
@@ -576,6 +582,17 @@
computeLastCycleBoundary(parseTime("2013-01-14T15:11:00.000-08:00"), policy));
}
+ public void testLastCycleBoundaryDST() throws Exception {
+ final long currentTime = parseTime("1989-01-02T07:30:00.000");
+ final long expectedCycle = parseTime("1988-12-03T02:00:00.000Z");
+
+ final NetworkPolicy policy = new NetworkPolicy(
+ sTemplateWifi, 3, "America/Argentina/Buenos_Aires", 1024L, 1024L, false);
+ final long actualCycle = computeLastCycleBoundary(currentTime, policy);
+ assertTimeEquals(expectedCycle, actualCycle);
+ }
+
+ @Suppress
public void testNetworkPolicyAppliedCycleLastMonth() throws Exception {
NetworkState[] state = null;
NetworkStats stats = null;
@@ -628,6 +645,7 @@
verifyAndReset();
}
+ @Suppress
public void testUidRemovedPolicyCleared() throws Exception {
Future<Void> future;
@@ -652,6 +670,7 @@
verifyAndReset();
}
+ @Suppress
public void testOverWarningLimitNotification() throws Exception {
NetworkState[] state = null;
NetworkStats stats = null;
@@ -783,6 +802,7 @@
}
}
+ @Suppress
public void testMeteredNetworkWithoutLimit() throws Exception {
NetworkState[] state = null;
NetworkStats stats = null;
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java
new file mode 100644
index 0000000..0ab91a1
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java
@@ -0,0 +1,592 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.accessibility;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.IPowerManager;
+import android.os.Looper;
+import android.os.Message;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
+import android.view.WindowManagerPolicy;
+import com.android.server.accessibility.KeyEventDispatcher.KeyEventFilter;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
+
+/**
+ * Tests for KeyEventDispatcher
+ */
+@RunWith(AndroidJUnit4.class)
+public class KeyEventDispatcherTest {
+ private static final int SEND_FRAMEWORK_KEY_EVENT = 4;
+
+ private final KeyEvent mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, 0x40);
+ private final KeyEvent mOtherKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, 0x50);
+ private final Object mLock = new Object();
+ private MessageCapturingHandler mInputEventsHander;
+ private KeyEventDispatcher mKeyEventDispatcher;
+ private KeyEventFilter mKeyEventFilter1;
+ private KeyEventFilter mKeyEventFilter2;
+ private IPowerManager mMockPowerManagerService;
+ private MessageCapturingHandler mMessageCapturingHandler;
+ private ArgumentCaptor<Integer> mFilter1SequenceCaptor = ArgumentCaptor.forClass(Integer.class);
+ private ArgumentCaptor<Integer> mFilter2SequenceCaptor = ArgumentCaptor.forClass(Integer.class);
+
+ @BeforeClass
+ public static void oneTimeInitialization() {
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+ }
+
+ @Before
+ public void setUp() {
+ mInputEventsHander = new MessageCapturingHandler();
+ mMockPowerManagerService = mock(IPowerManager.class);
+ // TODO: It would be better to mock PowerManager rather than its binder, but the class is
+ // final.
+ PowerManager powerManager =
+ new PowerManager(mock(Context.class), mMockPowerManagerService, new Handler());
+ mMessageCapturingHandler = new MessageCapturingHandler();
+ mKeyEventDispatcher = new KeyEventDispatcher(mInputEventsHander, SEND_FRAMEWORK_KEY_EVENT,
+ mLock, powerManager, mMessageCapturingHandler);
+
+ mKeyEventFilter1 = mock(KeyEventFilter.class);
+ when(mKeyEventFilter1.onKeyEvent((KeyEvent) anyObject(),
+ mFilter1SequenceCaptor.capture().intValue()))
+ .thenReturn(true);
+
+ mKeyEventFilter2 = mock(KeyEventFilter.class);
+ when(mKeyEventFilter2.onKeyEvent((KeyEvent) anyObject(),
+ mFilter2SequenceCaptor.capture().intValue()))
+ .thenReturn(true);
+ }
+
+ @Test
+ public void testNotifyKeyEvent_withNoBoundServices_shouldReturnFalse() {
+ assertFalse(mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Collections.EMPTY_LIST));
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testNotifyKeyEvent_boundServiceDoesntProcessEvents_shouldReturnFalse() {
+ KeyEventFilter keyEventFilter = mock(KeyEventFilter.class);
+ when(keyEventFilter.onKeyEvent((KeyEvent) anyObject(), anyInt())).thenReturn(false);
+ assertFalse(mKeyEventDispatcher
+ .notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(keyEventFilter)));
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testNotifyKeyEvent_withOneValidService_shouldNotifyService()
+ throws RemoteException {
+ assertTrue(mKeyEventDispatcher
+ .notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1)));
+ verify(mKeyEventFilter1, times(1)).onKeyEvent(argThat(new KeyEventMatcher(mKeyEvent)),
+ anyInt());
+ }
+
+ @Test
+ public void testNotifyKeyEvent_withTwoValidService_shouldNotifyBoth() throws RemoteException {
+ assertTrue(mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2)));
+ verify(mKeyEventFilter1, times(1)).onKeyEvent(argThat(new KeyEventMatcher(mKeyEvent)),
+ anyInt());
+ verify(mKeyEventFilter2, times(1)).onKeyEvent(argThat(new KeyEventMatcher(mKeyEvent)),
+ anyInt());
+ }
+
+ /*
+ * Results from services
+ */
+ @Test
+ public void testSetOnKeyResult_eventNotHandled_shouldPassEventToFramework() {
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testSetOnKeyResult_eventHandled_shouldNotPassEventToFramework()
+ throws RemoteException {
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getValue());
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verify(mMockPowerManagerService, times(1)).userActivity(anyLong(),
+ eq(PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY), eq(0));
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testSetOnKeyResult_twoServicesReturnsFalse_shouldPassEventToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getValue());
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testSetOnKeyResult_twoServicesReturnsTrue_shouldNotPassEventToFramework()
+ throws RemoteException {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getValue());
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, true,
+ mFilter2SequenceCaptor.getValue());
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verify(mMockPowerManagerService, times(1)).userActivity(anyLong(),
+ eq(PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY), eq(0));
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testSetOnKeyResult_firstOfTwoServicesReturnsTrue_shouldNotPassEventToFramework()
+ throws RemoteException {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getValue());
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getValue());
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verify(mMockPowerManagerService, times(1)).userActivity(anyLong(),
+ eq(PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY), eq(0));
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ @Test
+ public void testSetOnKeyResult_secondOfTwoServicesReturnsTrue_shouldNotPassEventToFramework()
+ throws RemoteException {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, true,
+ mFilter2SequenceCaptor.getValue());
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verify(mMockPowerManagerService, times(1)).userActivity(anyLong(),
+ eq(PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY), eq(0));
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+ // Each event should have its result set only once, but if it's set twice, we should ignore
+ // the second time.
+ @Test
+ public void testSetOnKeyResult_firstServiceReturnsTwice_secondShouldBeIgnored() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ // Verify event is sent properly when other service responds
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getValue());
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ assertFalse(mMessageCapturingHandler.isTimeoutPending());
+ }
+
+
+ /*
+ * Timeouts
+ */
+ @Test
+ public void testEventTimesOut_shouldPassToFramework() throws RemoteException {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ assertEquals(1, mMessageCapturingHandler.timedMessages.size());
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ }
+
+ @Test
+ public void testEventTimesOut_afterOneServiceReturnsFalse_shouldPassToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+
+ assertEquals(1, mMessageCapturingHandler.timedMessages.size());
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ }
+
+ @Test
+ public void testEventTimesOut_afterOneServiceReturnsTrue_shouldNotPassToFramework()
+ throws RemoteException {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getValue());
+
+ assertEquals(1, mMessageCapturingHandler.timedMessages.size());
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verify(mMockPowerManagerService, times(1)).userActivity(anyLong(),
+ eq(PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY), eq(0));
+ }
+
+ @Test
+ public void testEventTimesOut_thenServiceReturnsFalse_shouldPassToFrameworkOnce() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ assertEquals(1, mMessageCapturingHandler.timedMessages.size());
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mInputEventsHander.removeMessages(SEND_FRAMEWORK_KEY_EVENT);
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ }
+
+ @Test
+ public void testEventTimesOut_afterServiceReturnsFalse_shouldPassToFrameworkOnce() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getValue());
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mInputEventsHander.removeMessages(SEND_FRAMEWORK_KEY_EVENT);
+ assertEquals(1, mMessageCapturingHandler.timedMessages.size());
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verifyZeroInteractions(mMockPowerManagerService);
+ }
+
+ @Test
+ public void testEventTimesOut_afterServiceReturnsTrue_shouldNotPassToFramework()
+ throws RemoteException {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getValue());
+ assertEquals(1, mMessageCapturingHandler.timedMessages.size());
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ verify(mMockPowerManagerService, times(1)).userActivity(anyLong(),
+ eq(PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY), eq(0));
+ }
+
+ /*
+ * Flush services
+ */
+ @Test
+ public void testFlushService_withPendingEvent_shouldPassToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.flush(mKeyEventFilter1);
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ }
+
+ @Test
+ public void testFlushTwpServices_withPendingEvent_shouldPassToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.flush(mKeyEventFilter1);
+ mKeyEventDispatcher.flush(mKeyEventFilter2);
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ }
+
+ @Test
+ public void testFlushOneService_thenOtherReturnsTrue_shouldNotPassToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.flush(mKeyEventFilter1);
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, true,
+ mFilter2SequenceCaptor.getValue());
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ }
+
+ @Test
+ public void testFlushOneService_thenOtherReturnsFalse_shouldPassToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+
+ mKeyEventDispatcher.flush(mKeyEventFilter1);
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getValue());
+
+ assertTrue(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ }
+
+ @Test
+ public void testFlushServiceWithNoEvents_shouldNotCrash() {
+ mKeyEventDispatcher.flush(mKeyEventFilter1);
+ }
+
+ /*
+ * Multiple Events
+ */
+ @Test
+ public void twoEvents_serviceReturnsFalse_sentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+ mInputEventsHander.removeMessages(SEND_FRAMEWORK_KEY_EVENT);
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+
+ assertTwoKeyEventsSentToFrameworkInOrder(mKeyEvent, mOtherKeyEvent);
+ }
+
+ @Test
+ public void twoEvents_serviceReturnsTrue_notSentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+ }
+
+ @Test
+ public void twoEvents_serviceHandlesFirst_otherSentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+
+ assertOneKeyEventSentToFramework(mOtherKeyEvent);
+ }
+
+ @Test
+ public void twoEvents_serviceHandlesSecond_otherSentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+
+ assertOneKeyEventSentToFramework(mKeyEvent);
+ }
+
+ @Test
+ public void twoEvents_firstTimesOutThenServiceHandlesBoth_firstSentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.handleMessage(mMessageCapturingHandler.timedMessages.get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, true,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+
+ assertOneKeyEventSentToFramework(mKeyEvent);
+ }
+
+ @Test
+ public void addServiceBetweenTwoEvents_neitherEventHandled_bothSentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getValue());
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+
+ assertTwoKeyEventsSentToFrameworkInOrder(mKeyEvent, mOtherKeyEvent);
+ }
+
+ @Test
+ public void removeServiceBetweenTwoEvents_neitherEventHandled_bothSentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mKeyEvent, 0, Arrays.asList(mKeyEventFilter1, mKeyEventFilter2));
+ mKeyEventDispatcher.flush(mKeyEventFilter1);
+ mKeyEventDispatcher.notifyKeyEventLocked(
+ mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter2));
+ assertFalse(mInputEventsHander.hasMessages(SEND_FRAMEWORK_KEY_EVENT));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getAllValues().get(0));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter2, false,
+ mFilter2SequenceCaptor.getAllValues().get(1));
+
+ assertTwoKeyEventsSentToFrameworkInOrder(mKeyEvent, mOtherKeyEvent);
+ }
+
+ /*
+ * Misc
+ */
+ @Test
+ public void twoEvents_serviceReturnsFalseOutOfOrder_sentToFramework() {
+ mKeyEventDispatcher.notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+ mKeyEventDispatcher
+ .notifyKeyEventLocked(mOtherKeyEvent, 0, Arrays.asList(mKeyEventFilter1));
+
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(1));
+ mKeyEventDispatcher.setOnKeyEventResult(mKeyEventFilter1, false,
+ mFilter1SequenceCaptor.getAllValues().get(0));
+
+ // Order doesn't really matter since this is really checking that we don't do something
+ // really bad, but we'll send them in the order they are reported
+ assertTwoKeyEventsSentToFrameworkInOrder(mOtherKeyEvent, mKeyEvent);
+ }
+
+ private void assertOneKeyEventSentToFramework(KeyEvent event) {
+ assertEquals(1, mInputEventsHander.timedMessages.size());
+ assertEquals(SEND_FRAMEWORK_KEY_EVENT, mInputEventsHander.timedMessages.get(0).what);
+ assertEquals(WindowManagerPolicy.FLAG_PASS_TO_USER,
+ mInputEventsHander.timedMessages.get(0).arg1);
+ assertTrue(new KeyEventMatcher(event).matches(mInputEventsHander.timedMessages.get(0).obj));
+ }
+
+ private void assertTwoKeyEventsSentToFrameworkInOrder(KeyEvent first, KeyEvent second) {
+ assertEquals(2, mInputEventsHander.timedMessages.size());
+ assertEquals(SEND_FRAMEWORK_KEY_EVENT, mInputEventsHander.timedMessages.get(0).what);
+ assertEquals(WindowManagerPolicy.FLAG_PASS_TO_USER,
+ mInputEventsHander.timedMessages.get(0).arg1);
+ assertTrue(new KeyEventMatcher(first).matches(mInputEventsHander.timedMessages.get(0).obj));
+ assertEquals(SEND_FRAMEWORK_KEY_EVENT, mInputEventsHander.timedMessages.get(1).what);
+ assertEquals(WindowManagerPolicy.FLAG_PASS_TO_USER,
+ mInputEventsHander.timedMessages.get(1).arg1);
+ assertTrue(new KeyEventMatcher(second)
+ .matches(mInputEventsHander.timedMessages.get(1).obj));
+ }
+
+ private class KeyEventMatcher extends ArgumentMatcher<KeyEvent> {
+ private KeyEvent mEventToMatch;
+
+ KeyEventMatcher(KeyEvent eventToMatch) {
+ mEventToMatch = eventToMatch;
+ }
+
+ @Override
+ public boolean matches(Object event) {
+ if (!(event instanceof KeyEvent)) {
+ return false;
+ }
+ KeyEvent keyEvent = (KeyEvent) event;
+ return (mEventToMatch.getAction() == keyEvent.getAction())
+ && (mEventToMatch.getKeyCode() == keyEvent.getKeyCode());
+ }
+ }
+
+ private class MessageCapturingHandler extends Handler {
+ List<Message> timedMessages = new ArrayList<>();
+
+ @Override
+ public boolean sendMessageAtTime(Message message, long uptimeMillis) {
+ timedMessages.add(Message.obtain(message));
+ return super.sendMessageAtTime(message, uptimeMillis);
+ }
+
+ public boolean isTimeoutPending() {
+ return hasMessages(KeyEventDispatcher.MSG_ON_KEY_EVENT_TIMEOUT);
+ }
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java
new file mode 100644
index 0000000..5920fef
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java
@@ -0,0 +1,548 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.accessibility;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import android.accessibilityservice.IAccessibilityServiceClient;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.RemoteException;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import android.util.Pair;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.WindowManagerPolicy;
+import java.util.ArrayList;
+import java.util.List;
+
+import android.view.accessibility.AccessibilityEvent;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
+
+/**
+ * Tests for MotionEventInjector
+ */
+@RunWith(AndroidJUnit4.class)
+public class MotionEventInjectorTest {
+ private static final String LOG_TAG = "MotionEventInjectorTest";
+ private static final int CLICK_X = 100;
+ private static final int CLICK_Y_START = 200;
+ private static final int CLICK_Y_END = 201;
+ private static final int CLICK_DURATION = 10;
+ private static final int SEQUENCE = 50;
+
+ private static final int SECOND_CLICK_X = 1000;
+ private static final int SECOND_CLICK_Y = 2000;
+ private static final int SECOND_SEQUENCE = 51;
+
+ private static final int MOTION_EVENT_SOURCE = InputDevice.SOURCE_TOUCHSCREEN;
+ private static final int OTHER_EVENT_SOURCE = InputDevice.SOURCE_MOUSE;
+
+ MotionEventInjector mMotionEventInjector;
+ IAccessibilityServiceClient mServiceInterface;
+ List<MotionEvent> mClickList = new ArrayList<>();
+ List<MotionEvent> mSecondClickList = new ArrayList<>();
+ ArgumentCaptor<MotionEvent> mCaptor1 = ArgumentCaptor.forClass(MotionEvent.class);
+ ArgumentCaptor<MotionEvent> mCaptor2 = ArgumentCaptor.forClass(MotionEvent.class);
+ MessageCapturingHandler mMessageCapturingHandler;
+ MotionEventMatcher mClickEvent0Matcher;
+ MotionEventMatcher mClickEvent1Matcher;
+ MotionEventMatcher mClickEvent2Matcher;
+ MotionEventMatcher mSecondClickEvent0Matcher;
+
+ @BeforeClass
+ public static void oneTimeInitialization() {
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+ }
+
+ @Before
+ public void setUp() {
+ mMessageCapturingHandler = new MessageCapturingHandler();
+ mMotionEventInjector = new MotionEventInjector(mMessageCapturingHandler);
+ mClickList.add(
+ MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, CLICK_X, CLICK_Y_START, 0));
+ mClickList.add(MotionEvent.obtain(
+ 0, CLICK_DURATION, MotionEvent.ACTION_MOVE, CLICK_X, CLICK_Y_END, 0));
+ mClickList.add(MotionEvent.obtain(
+ 0, CLICK_DURATION, MotionEvent.ACTION_UP, CLICK_X, CLICK_Y_END, 0));
+ for (int i = 0; i < mClickList.size(); i++) {
+ mClickList.get(i).setSource(MOTION_EVENT_SOURCE);
+ }
+
+ mClickEvent0Matcher = new MotionEventMatcher(mClickList.get(0));
+ mClickEvent1Matcher = new MotionEventMatcher(mClickList.get(1));
+ mClickEvent2Matcher = new MotionEventMatcher(mClickList.get(2));
+
+ mSecondClickList.add(MotionEvent.obtain(
+ 0, 0, MotionEvent.ACTION_DOWN, SECOND_CLICK_X, SECOND_CLICK_Y, 0));
+ mSecondClickList.add(MotionEvent.obtain(
+ 0, CLICK_DURATION, MotionEvent.ACTION_MOVE, SECOND_CLICK_X, CLICK_Y_END, 0));
+ mSecondClickList.add(MotionEvent.obtain(
+ 0, CLICK_DURATION, MotionEvent.ACTION_UP, SECOND_CLICK_X, CLICK_Y_END, 0));
+ for (int i = 0; i < mSecondClickList.size(); i++) {
+ mSecondClickList.get(i).setSource(MOTION_EVENT_SOURCE);
+ }
+
+ mSecondClickEvent0Matcher = new MotionEventMatcher(mSecondClickList.get(0));
+
+ mServiceInterface = mock(IAccessibilityServiceClient.class);
+ }
+
+ @Test
+ public void testInjectEvents_shouldEmergeInOrderWithCorrectTiming() throws RemoteException {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ verifyNoMoreInteractions(next);
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+
+ verify(next).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(),
+ eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ long gestureStart = mCaptor1.getValue().getDownTime();
+ mClickEvent0Matcher.offsetTimesBy(gestureStart);
+ mClickEvent1Matcher.offsetTimesBy(gestureStart);
+ mClickEvent2Matcher.offsetTimesBy(gestureStart);
+
+ verify(next).onMotionEvent(argThat(mClickEvent0Matcher), argThat(mClickEvent0Matcher),
+ eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ verifyNoMoreInteractions(next);
+ reset(next);
+
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+ verify(next).onMotionEvent(argThat(mClickEvent1Matcher), argThat(mClickEvent1Matcher),
+ eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ verifyNoMoreInteractions(next);
+ reset(next);
+
+ verifyZeroInteractions(mServiceInterface);
+
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+ verify(next).onMotionEvent(argThat(mClickEvent2Matcher), argThat(mClickEvent2Matcher),
+ eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ verifyNoMoreInteractions(next);
+ reset(next);
+
+ verify(mServiceInterface).onPerformGestureResult(SEQUENCE, true);
+ verifyNoMoreInteractions(mServiceInterface);
+ }
+
+ @Test
+ public void testInjectEvents_eventWithManyPointers_shouldNotCrash() {
+ int manyPointersCount = 20;
+ MotionEvent.PointerCoords[] pointerCoords =
+ new MotionEvent.PointerCoords[manyPointersCount];
+ MotionEvent.PointerProperties[] pointerProperties =
+ new MotionEvent.PointerProperties[manyPointersCount];
+ for (int i = 0; i < manyPointersCount; i++) {
+ pointerProperties[i] = new MotionEvent.PointerProperties();
+ pointerProperties[i].id = i;
+ pointerProperties[i].toolType = MotionEvent.TOOL_TYPE_UNKNOWN;
+ pointerCoords[i] = new MotionEvent.PointerCoords();
+ pointerCoords[i].clear();
+ pointerCoords[i].pressure = 1.0f;
+ pointerCoords[i].size = 1.0f;
+ pointerCoords[i].x = i;
+ pointerCoords[i].y = i;
+ }
+ List<MotionEvent> events = new ArrayList<>();
+ events.add(MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, manyPointersCount,
+ pointerProperties, pointerCoords, 0, 0,
+ 1.0f, 1.0f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0));
+ events.add(MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, manyPointersCount,
+ pointerProperties, pointerCoords, 0, 0,
+ 1.0f, 1.0f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0));
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.injectEvents(events, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendAllMessages();
+ verify(next, times(2)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ assertEquals(MotionEvent.ACTION_DOWN, mCaptor1.getAllValues().get(0).getActionMasked());
+ assertEquals(MotionEvent.ACTION_UP, mCaptor1.getAllValues().get(1).getActionMasked());
+ }
+
+ @Test
+ public void testRegularEvent_afterGestureComplete_shouldPassToNext() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ mMessageCapturingHandler.sendAllMessages(); // Send all motion events
+ reset(next);
+ mMotionEventInjector.onMotionEvent(mSecondClickList.get(0), mClickList.get(0), 0);
+ verify(next).onMotionEvent(argThat(mSecondClickEvent0Matcher),
+ argThat(mClickEvent0Matcher), eq(0));
+ }
+
+ @Test
+ public void testInjectEvents_withRealGestureUnderway_shouldCancelRealAndPassInjected() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.onMotionEvent(mClickList.get(0), mClickList.get(0), 0);
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+
+ verify(next, times(2)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertEquals(MotionEvent.ACTION_CANCEL, mCaptor1.getAllValues().get(1).getActionMasked());
+ reset(next);
+
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+ verify(next).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(),
+ eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ long gestureStart = mCaptor1.getValue().getDownTime();
+ mSecondClickEvent0Matcher.offsetTimesBy(gestureStart);
+
+ verify(next).onMotionEvent(argThat(mSecondClickEvent0Matcher),
+ argThat(mSecondClickEvent0Matcher), eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ }
+
+ @Test
+ public void testInjectEvents_withRealMouseGestureUnderway_shouldContinueRealAndPassInjected() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ MotionEvent mouseEvent = MotionEvent.obtain(mClickList.get(0));
+ mouseEvent.setSource(InputDevice.SOURCE_MOUSE);
+ MotionEventMatcher mouseEventMatcher = new MotionEventMatcher(mouseEvent);
+ mMotionEventInjector.onMotionEvent(mouseEvent, mouseEvent, 0);
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+ verify(next, times(2)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ assertTrue(mouseEventMatcher.matches(mCaptor1.getAllValues().get(0)));
+ mSecondClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(1).getDownTime());
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(1)));
+ }
+
+ @Test
+ public void testInjectEvents_withRealGestureFinished_shouldJustPassInjected() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.onMotionEvent(mClickList.get(0), mClickList.get(0), 0);
+ mMotionEventInjector.onMotionEvent(mClickList.get(1), mClickList.get(1), 0);
+ mMotionEventInjector.onMotionEvent(mClickList.get(2), mClickList.get(2), 0);
+
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ verify(next, times(3)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertTrue(mClickEvent1Matcher.matches(mCaptor1.getAllValues().get(1)));
+ assertTrue(mClickEvent2Matcher.matches(mCaptor1.getAllValues().get(2)));
+ reset(next);
+
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+ verify(next).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(),
+ eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ mSecondClickEvent0Matcher.offsetTimesBy(mCaptor1.getValue().getDownTime());
+ verify(next).onMotionEvent(argThat(mSecondClickEvent0Matcher),
+ argThat(mSecondClickEvent0Matcher), eq(WindowManagerPolicy.FLAG_PASS_TO_USER));
+ }
+
+ @Test
+ public void testOnMotionEvents_openInjectedGestureInProgress_shouldCancelAndNotifyAndPassReal()
+ throws RemoteException {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+ mMotionEventInjector.onMotionEvent(mSecondClickList.get(0), mSecondClickList.get(0), 0);
+
+ verify(next, times(3)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ mClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(0).getDownTime());
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertEquals(MotionEvent.ACTION_CANCEL, mCaptor1.getAllValues().get(1).getActionMasked());
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(2)));
+ verify(mServiceInterface).onPerformGestureResult(SEQUENCE, false);
+ }
+
+ @Test
+ public void testOnMotionEvents_closedInjectedGestureInProgress_shouldOnlyNotifyAndPassReal()
+ throws RemoteException {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mClickList.add(MotionEvent.obtain(2 * CLICK_DURATION, 2 * CLICK_DURATION,
+ MotionEvent.ACTION_DOWN, CLICK_X, CLICK_Y_START, 0));
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+
+ // Send 3 motion events, leaving the extra down in the queue
+ mMessageCapturingHandler.sendOneMessage();
+ mMessageCapturingHandler.sendOneMessage();
+ mMessageCapturingHandler.sendOneMessage();
+
+ mMotionEventInjector.onMotionEvent(mSecondClickList.get(0), mClickList.get(0), 0);
+
+ verify(next, times(4)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ long gestureStart = mCaptor1.getAllValues().get(0).getDownTime();
+ mClickEvent0Matcher.offsetTimesBy(gestureStart);
+ mClickEvent1Matcher.offsetTimesBy(gestureStart);
+ mClickEvent2Matcher.offsetTimesBy(gestureStart);
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertTrue(mClickEvent1Matcher.matches(mCaptor1.getAllValues().get(1)));
+ assertTrue(mClickEvent2Matcher.matches(mCaptor1.getAllValues().get(2)));
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(3)));
+
+ verify(mServiceInterface).onPerformGestureResult(SEQUENCE, false);
+ assertFalse(mMessageCapturingHandler.hasMessages());
+ }
+
+ @Test
+ public void testInjectEvents_openInjectedGestureInProgress_shouldCancelAndNotifyAndPassNew()
+ throws RemoteException {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SECOND_SEQUENCE);
+ mMessageCapturingHandler.sendLastMessage(); // Process the second event injection
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+
+ verify(mServiceInterface, times(1)).onPerformGestureResult(SEQUENCE, false);
+ verify(next, times(3)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ mClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(0).getDownTime());
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertEquals(MotionEvent.ACTION_CANCEL, mCaptor1.getAllValues().get(1).getActionMasked());
+ mSecondClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(2).getDownTime());
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(2)));
+ }
+
+ @Test
+ public void testInjectEvents_closedInjectedGestureInProgress_shouldOnlyNotifyAndPassNew()
+ throws RemoteException {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ MotionEvent newEvent = MotionEvent.obtain(2 * CLICK_DURATION, 2 * CLICK_DURATION,
+ MotionEvent.ACTION_DOWN, CLICK_X, CLICK_Y_START, 0);
+ newEvent.setSource(mClickList.get(0).getSource());
+ mClickList.add(newEvent);
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+
+ // Send 3 motion events, leaving newEvent in the queue
+ mMessageCapturingHandler.sendOneMessage();
+ mMessageCapturingHandler.sendOneMessage();
+ mMessageCapturingHandler.sendOneMessage();
+
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SECOND_SEQUENCE);
+ mMessageCapturingHandler.sendLastMessage(); // Process the event injection
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+
+ verify(mServiceInterface).onPerformGestureResult(SEQUENCE, false);
+ verify(next, times(4)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ long gestureStart = mCaptor1.getAllValues().get(0).getDownTime();
+ mClickEvent0Matcher.offsetTimesBy(gestureStart);
+ mClickEvent1Matcher.offsetTimesBy(gestureStart);
+ mClickEvent2Matcher.offsetTimesBy(gestureStart);
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertTrue(mClickEvent1Matcher.matches(mCaptor1.getAllValues().get(1)));
+ assertTrue(mClickEvent2Matcher.matches(mCaptor1.getAllValues().get(2)));
+ mSecondClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(3).getDownTime());
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(3)));
+ }
+
+ @Test
+ public void testClearEvents_realGestureInProgress_shouldForgetAboutGesture() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.onMotionEvent(mClickList.get(0), mClickList.get(0), 0);
+ mMotionEventInjector.clearEvents(MOTION_EVENT_SOURCE);
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+
+ verify(next, times(2)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ mSecondClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(1).getDownTime());
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(1)));
+ }
+
+ @Test
+ public void testClearEventsOnOtherSource_realGestureInProgress_shouldNotForgetAboutGesture() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ mMotionEventInjector.onMotionEvent(mClickList.get(0), mClickList.get(0), 0);
+ mMotionEventInjector.clearEvents(OTHER_EVENT_SOURCE);
+ mMotionEventInjector.injectEvents(mSecondClickList, mServiceInterface, SECOND_SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ mMessageCapturingHandler.sendOneMessage(); // Send a motion event
+
+ verify(next, times(3)).onMotionEvent(mCaptor1.capture(), mCaptor2.capture(), anyInt());
+ assertTrue(mClickEvent0Matcher.matches(mCaptor1.getAllValues().get(0)));
+ assertEquals(MotionEvent.ACTION_CANCEL, mCaptor1.getAllValues().get(1).getActionMasked());
+ mSecondClickEvent0Matcher.offsetTimesBy(mCaptor1.getAllValues().get(2).getDownTime());
+ assertTrue(mSecondClickEvent0Matcher.matches(mCaptor1.getAllValues().get(2)));
+ }
+
+ @Test
+ public void testOnDestroy_shouldCancelGestures() throws RemoteException {
+ mMotionEventInjector.onDestroy();
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ verify(mServiceInterface).onPerformGestureResult(SEQUENCE, false);
+ }
+
+ @Test
+ public void testInjectEvents_withNoNext_shouldCancel() throws RemoteException {
+ mMotionEventInjector.injectEvents(mClickList, mServiceInterface, SEQUENCE);
+ mMessageCapturingHandler.sendOneMessage(); // Process the event injection
+ verify(mServiceInterface).onPerformGestureResult(SEQUENCE, false);
+ }
+
+ @Test
+ public void testOnMotionEvent_withNoNext_shouldNotCrash() {
+ mMotionEventInjector.onMotionEvent(mClickList.get(0), mClickList.get(0), 0);
+ }
+
+ @Test
+ public void testOnKeyEvent_shouldPassToNext() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ KeyEvent event = new KeyEvent(0, 0);
+ mMotionEventInjector.onKeyEvent(event, 0);
+ verify(next).onKeyEvent(event, 0);
+ }
+
+ @Test
+ public void testOnKeyEvent_withNoNext_shouldNotCrash() {
+ KeyEvent event = new KeyEvent(0, 0);
+ mMotionEventInjector.onKeyEvent(event, 0);
+ }
+
+ @Test
+ public void testOnAccessibilityEvent_shouldPassToNext() {
+ EventStreamTransformation next = attachMockNext(mMotionEventInjector);
+ AccessibilityEvent event = AccessibilityEvent.obtain();
+ mMotionEventInjector.onAccessibilityEvent(event);
+ verify(next).onAccessibilityEvent(event);
+ }
+
+ @Test
+ public void testOnAccessibilityEvent_withNoNext_shouldNotCrash() {
+ AccessibilityEvent event = AccessibilityEvent.obtain();
+ mMotionEventInjector.onAccessibilityEvent(event);
+ }
+
+ private EventStreamTransformation attachMockNext(MotionEventInjector motionEventInjector) {
+ EventStreamTransformation next = mock(EventStreamTransformation.class);
+ motionEventInjector.setNext(next);
+ return next;
+ }
+
+ static class MotionEventMatcher extends ArgumentMatcher<MotionEvent> {
+ long mDownTime;
+ long mEventTime;
+ long mActionMasked;
+ int mX;
+ int mY;
+
+ MotionEventMatcher(long downTime, long eventTime, int actionMasked, int x, int y) {
+ mDownTime = downTime;
+ mEventTime = eventTime;
+ mActionMasked = actionMasked;
+ mX = x;
+ mY = y;
+ }
+
+ MotionEventMatcher(MotionEvent event) {
+ this(event.getDownTime(), event.getEventTime(), event.getActionMasked(),
+ (int) event.getX(), (int) event.getY());
+ }
+
+ void offsetTimesBy(long timeOffset) {
+ mDownTime += timeOffset;
+ mEventTime += timeOffset;
+ }
+
+ @Override
+ public boolean matches(Object o) {
+ MotionEvent event = (MotionEvent) o;
+ if ((event.getDownTime() == mDownTime) && (event.getEventTime() == mEventTime)
+ && (event.getActionMasked() == mActionMasked) && ((int) event.getX() == mX)
+ && ((int) event.getY() == mY)) {
+ return true;
+ }
+ Log.e(LOG_TAG, "MotionEvent match failed");
+ Log.e(LOG_TAG, "event.getDownTime() = " + event.getDownTime()
+ + ", expected " + mDownTime);
+ Log.e(LOG_TAG, "event.getEventTime() = " + event.getEventTime()
+ + ", expected " + mEventTime);
+ Log.e(LOG_TAG, "event.getActionMasked() = " + event.getActionMasked()
+ + ", expected " + mActionMasked);
+ Log.e(LOG_TAG, "event.getX() = " + event.getX() + ", expected " + mX);
+ Log.e(LOG_TAG, "event.getY() = " + event.getY() + ", expected " + mY);
+ return false;
+ }
+ }
+
+ private class MessageCapturingHandler extends Handler {
+ List<Pair<Message, Long>> timedMessages = new ArrayList<>();
+
+ @Override
+ public boolean sendMessageAtTime(Message message, long uptimeMillis) {
+ timedMessages.add(new Pair<>(Message.obtain(message), uptimeMillis));
+ return super.sendMessageAtTime(message, uptimeMillis);
+ }
+
+ void sendOneMessage() {
+ Message message = timedMessages.remove(0).first;
+ removeMessages(message.what, message.obj);
+ mMotionEventInjector.handleMessage(message);
+ removeStaleMessages();
+ }
+
+ void sendAllMessages() {
+ while (!timedMessages.isEmpty()) {
+ sendOneMessage();
+ }
+ }
+
+ void sendLastMessage() {
+ Message message = timedMessages.remove(timedMessages.size() - 1).first;
+ removeMessages(message.what, message.obj);
+ mMotionEventInjector.handleMessage(message);
+ removeStaleMessages();
+ }
+
+ boolean hasMessages() {
+ removeStaleMessages();
+ return !timedMessages.isEmpty();
+ }
+
+ private void removeStaleMessages() {
+ for (int i = 0; i < timedMessages.size(); i++) {
+ Message message = timedMessages.get(i).first;
+ if (!hasMessages(message.what, message.obj)) {
+ timedMessages.remove(i--);
+ }
+ }
+ }
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
index 625fe77..bd9e6d1 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
@@ -43,7 +43,7 @@
private void testTaskIdsForUser(int userId) throws RemoteException {
List<ActivityManager.RecentTaskInfo> recentTasks = service.getRecentTasks(
- 100, 0, userId);
+ 100, 0, userId).getList();
if(recentTasks != null) {
for(ActivityManager.RecentTaskInfo recentTask : recentTasks) {
int taskId = recentTask.persistentId;
diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
new file mode 100644
index 0000000..1cf5097
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.am;
+
+import android.app.IUserSwitchObserver;
+import android.content.Context;
+import android.content.IIntentReceiver;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.os.Binder;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IRemoteCallback;
+import android.os.Looper;
+import android.os.Message;
+import android.os.RemoteException;
+import android.os.UserManagerInternal;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import com.android.server.pm.UserManagerService;
+import com.android.server.wm.WindowManagerService;
+
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static com.android.server.am.ActivityManagerService.CONTINUE_USER_SWITCH_MSG;
+import static com.android.server.am.ActivityManagerService.REPORT_USER_SWITCH_COMPLETE_MSG;
+import static com.android.server.am.ActivityManagerService.REPORT_USER_SWITCH_MSG;
+import static com.android.server.am.ActivityManagerService.SYSTEM_USER_CURRENT_MSG;
+import static com.android.server.am.ActivityManagerService.SYSTEM_USER_START_MSG;
+import static com.android.server.am.ActivityManagerService.USER_SWITCH_TIMEOUT_MSG;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.when;
+
+public class UserControllerTest extends AndroidTestCase {
+ private static final int TEST_USER_ID = 10;
+ private static String TAG = UserControllerTest.class.getSimpleName();
+ private UserController mUserController;
+ private TestInjector mInjector;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mInjector = new TestInjector(getContext());
+ mUserController = new UserController(mInjector);
+ setUpUser(TEST_USER_ID, 0);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ mInjector.handlerThread.quit();
+
+ }
+
+ public void testStartUser() throws RemoteException {
+ mUserController.startUser(TEST_USER_ID, true);
+ Mockito.verify(mInjector.getWindowManager()).startFreezingScreen(anyInt(), anyInt());
+ Mockito.verify(mInjector.getWindowManager(), never()).stopFreezingScreen();
+ List<String> expectedActions = Arrays.asList(Intent.ACTION_USER_STARTED,
+ Intent.ACTION_USER_SWITCHED, Intent.ACTION_USER_STARTING);
+ assertEquals(expectedActions, getActions(mInjector.sentIntents));
+ Set<Integer> expectedCodes = new HashSet<>(
+ Arrays.asList(REPORT_USER_SWITCH_MSG, USER_SWITCH_TIMEOUT_MSG,
+ SYSTEM_USER_START_MSG, SYSTEM_USER_CURRENT_MSG));
+ Set<Integer> actualCodes = mInjector.handler.getMessageCodes();
+ assertEquals("Unexpected message sent", expectedCodes, actualCodes);
+ Message reportMsg = mInjector.handler.getMessageForCode(REPORT_USER_SWITCH_MSG);
+ assertNotNull(reportMsg);
+ UserState userState = (UserState) reportMsg.obj;
+ assertNotNull(userState);
+ assertEquals(TEST_USER_ID, userState.mHandle.getIdentifier());
+ assertEquals("User must be in STATE_BOOTING", UserState.STATE_BOOTING, userState.state);
+ assertEquals("Unexpected old user id", 0, reportMsg.arg1);
+ assertEquals("Unexpected new user id", TEST_USER_ID, reportMsg.arg2);
+ }
+
+ public void testDispatchUserSwitch() throws RemoteException {
+ // Prepare mock observer and register it
+ IUserSwitchObserver observer = mock(IUserSwitchObserver.class);
+ when(observer.asBinder()).thenReturn(new Binder());
+ doAnswer(invocation -> {
+ IRemoteCallback callback = (IRemoteCallback) invocation.getArguments()[1];
+ callback.sendResult(null);
+ return null;
+ }).when(observer).onUserSwitching(anyInt(), any());
+ mUserController.registerUserSwitchObserver(observer, "mock");
+ // Start user -- this will update state of mUserController
+ mUserController.startUser(TEST_USER_ID, true);
+ Message reportMsg = mInjector.handler.getMessageForCode(REPORT_USER_SWITCH_MSG);
+ assertNotNull(reportMsg);
+ UserState userState = (UserState) reportMsg.obj;
+ int oldUserId = reportMsg.arg1;
+ int newUserId = reportMsg.arg2;
+ // Call dispatchUserSwitch and verify that observer was called only once
+ mInjector.handler.clearAllRecordedMessages();
+ mUserController.dispatchUserSwitch(userState, oldUserId, newUserId);
+ Mockito.verify(observer, times(1)).onUserSwitching(eq(TEST_USER_ID), any());
+ Set<Integer> expectedCodes = Collections.singleton(CONTINUE_USER_SWITCH_MSG);
+ Set<Integer> actualCodes = mInjector.handler.getMessageCodes();
+ assertEquals("Unexpected message sent", expectedCodes, actualCodes);
+ Message conMsg = mInjector.handler.getMessageForCode(CONTINUE_USER_SWITCH_MSG);
+ assertNotNull(conMsg);
+ userState = (UserState) conMsg.obj;
+ assertNotNull(userState);
+ assertEquals(TEST_USER_ID, userState.mHandle.getIdentifier());
+ assertEquals("User must be in STATE_BOOTING", UserState.STATE_BOOTING, userState.state);
+ assertEquals("Unexpected old user id", 0, conMsg.arg1);
+ assertEquals("Unexpected new user id", TEST_USER_ID, conMsg.arg2);
+ }
+
+ public void testDispatchUserSwitchBadReceiver() throws RemoteException {
+ // Prepare mock observer which doesn't notify the callback and register it
+ IUserSwitchObserver observer = mock(IUserSwitchObserver.class);
+ when(observer.asBinder()).thenReturn(new Binder());
+ mUserController.registerUserSwitchObserver(observer, "mock");
+ // Start user -- this will update state of mUserController
+ mUserController.startUser(TEST_USER_ID, true);
+ Message reportMsg = mInjector.handler.getMessageForCode(REPORT_USER_SWITCH_MSG);
+ assertNotNull(reportMsg);
+ UserState userState = (UserState) reportMsg.obj;
+ int oldUserId = reportMsg.arg1;
+ int newUserId = reportMsg.arg2;
+ // Call dispatchUserSwitch and verify that observer was called only once
+ mInjector.handler.clearAllRecordedMessages();
+ mUserController.dispatchUserSwitch(userState, oldUserId, newUserId);
+ Mockito.verify(observer, times(1)).onUserSwitching(eq(TEST_USER_ID), any());
+ // Verify that CONTINUE_USER_SWITCH_MSG is not sent (triggers timeout)
+ Set<Integer> actualCodes = mInjector.handler.getMessageCodes();
+ assertTrue("No messages should be sent", actualCodes.isEmpty());
+ }
+
+ public void testContinueUserSwitch() throws RemoteException {
+ // Start user -- this will update state of mUserController
+ mUserController.startUser(TEST_USER_ID, true);
+ Message reportMsg = mInjector.handler.getMessageForCode(REPORT_USER_SWITCH_MSG);
+ assertNotNull(reportMsg);
+ UserState userState = (UserState) reportMsg.obj;
+ int oldUserId = reportMsg.arg1;
+ int newUserId = reportMsg.arg2;
+ mInjector.handler.clearAllRecordedMessages();
+ // Verify that continueUserSwitch worked as expected
+ mUserController.continueUserSwitch(userState, oldUserId, newUserId);
+ Mockito.verify(mInjector.getWindowManager(), times(1)).stopFreezingScreen();
+ Set<Integer> expectedCodes = Collections.singleton(REPORT_USER_SWITCH_COMPLETE_MSG);
+ Set<Integer> actualCodes = mInjector.handler.getMessageCodes();
+ assertEquals("Unexpected message sent", expectedCodes, actualCodes);
+ Message msg = mInjector.handler.getMessageForCode(REPORT_USER_SWITCH_COMPLETE_MSG);
+ assertNotNull(msg);
+ assertEquals("Unexpected userId", TEST_USER_ID, msg.arg1);
+ }
+
+ private void setUpUser(int userId, int flags) {
+ UserInfo userInfo = new UserInfo(userId, "User" + userId, flags);
+ when(mInjector.userManagerMock.getUserInfo(eq(userId))).thenReturn(userInfo);
+ }
+
+ private static List<String> getActions(List<Intent> intents) {
+ List<String> result = new ArrayList<>();
+ for (Intent intent : intents) {
+ result.add(intent.getAction());
+ }
+ return result;
+ }
+
+ private static class TestInjector extends UserController.Injector {
+ final Object lock = new Object();
+ TestHandler handler;
+ HandlerThread handlerThread;
+ UserManagerService userManagerMock;
+ UserManagerInternal userManagerInternalMock;
+ WindowManagerService windowManagerMock;
+ private Context mCtx;
+ List<Intent> sentIntents = new ArrayList<>();
+
+ TestInjector(Context ctx) {
+ super(null);
+ mCtx = ctx;
+ handlerThread = new HandlerThread(TAG);
+ handlerThread.start();
+ handler = new TestHandler(handlerThread.getLooper());
+ userManagerMock = mock(UserManagerService.class);
+ userManagerInternalMock = mock(UserManagerInternal.class);
+ windowManagerMock = mock(WindowManagerService.class);
+ }
+
+ @Override
+ protected Object getLock() {
+ return lock;
+ }
+
+ @Override
+ protected Handler getHandler() {
+ return handler;
+ }
+
+ @Override
+ protected UserManagerService getUserManager() {
+ return userManagerMock;
+ }
+
+ @Override
+ UserManagerInternal getUserManagerInternal() {
+ return userManagerInternalMock;
+ }
+
+ @Override
+ protected Context getContext() {
+ return mCtx;
+ }
+
+ @Override
+ int checkCallingPermission(String permission) {
+ Log.i(TAG, "checkCallingPermission " + permission);
+ return PERMISSION_GRANTED;
+ }
+
+ @Override
+ void stackSupervisorSetLockTaskModeLocked(TaskRecord task, int lockTaskModeState,
+ String reason, boolean andResume) {
+ Log.i(TAG, "stackSupervisorSetLockTaskModeLocked");
+ }
+
+ @Override
+ WindowManagerService getWindowManager() {
+ return windowManagerMock;
+ }
+
+ @Override
+ void updateUserConfigurationLocked() {
+ Log.i(TAG, "updateUserConfigurationLocked");
+ }
+
+ @Override
+ protected int broadcastIntentLocked(Intent intent, String resolvedType,
+ IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras,
+ String[] requiredPermissions, int appOp, Bundle bOptions, boolean ordered,
+ boolean sticky, int callingPid, int callingUid, int userId) {
+ Log.i(TAG, "broadcastIntentLocked " + intent);
+ sentIntents.add(intent);
+ return 0;
+ }
+
+ @Override
+ boolean stackSupervisorSwitchUserLocked(int userId, UserState uss) {
+ Log.i(TAG, "stackSupervisorSwitchUserLocked " + userId);
+ return true;
+ }
+
+ @Override
+ void startHomeActivityLocked(int userId, String reason) {
+ Log.i(TAG, "startHomeActivityLocked " + userId);
+ }
+ }
+
+ private static class TestHandler extends Handler {
+ private final List<Message> mMessages = new ArrayList<>();
+
+ TestHandler(Looper looper) {
+ super(looper);
+ }
+
+ Set<Integer> getMessageCodes() {
+ Set<Integer> result = new LinkedHashSet<>();
+ for (Message msg : mMessages) {
+ result.add(msg.what);
+ }
+ return result;
+ }
+
+ Message getMessageForCode(int what) {
+ for (Message msg : mMessages) {
+ if (msg.what == what) {
+ return msg;
+ }
+ }
+ return null;
+ }
+
+ void clearAllRecordedMessages() {
+ mMessages.clear();
+ }
+
+ @Override
+ public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
+ Message copy = new Message();
+ copy.copyFrom(msg);
+ mMessages.add(copy);
+ return super.sendMessageAtTime(msg, uptimeMillis);
+ }
+ }
+}
\ No newline at end of file
diff --git a/services/tests/servicestests/src/com/android/server/connectivity/DnsEventListenerServiceTest.java b/services/tests/servicestests/src/com/android/server/connectivity/DnsEventListenerServiceTest.java
new file mode 100644
index 0000000..033b2c9
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/connectivity/DnsEventListenerServiceTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.connectivity;
+
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.metrics.DnsEvent;
+import android.net.metrics.IDnsEventListener;
+import android.net.metrics.IpConnectivityLog;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.stream.IntStream;
+
+public class DnsEventListenerServiceTest extends TestCase {
+
+ // TODO: read from DnsEventListenerService after this constant is read from system property
+ static final int BATCH_SIZE = 100;
+ static final int EVENT_TYPE = IDnsEventListener.EVENT_GETADDRINFO;
+ // TODO: read from IDnsEventListener
+ static final int RETURN_CODE = 1;
+
+ static final byte[] EVENT_TYPES = new byte[BATCH_SIZE];
+ static final byte[] RETURN_CODES = new byte[BATCH_SIZE];
+ static final int[] LATENCIES = new int[BATCH_SIZE];
+ static {
+ for (int i = 0; i < BATCH_SIZE; i++) {
+ EVENT_TYPES[i] = EVENT_TYPE;
+ RETURN_CODES[i] = RETURN_CODE;
+ LATENCIES[i] = i;
+ }
+ }
+
+ DnsEventListenerService mDnsService;
+
+ @Mock ConnectivityManager mCm;
+ @Mock IpConnectivityLog mLog;
+ ArgumentCaptor<NetworkCallback> mCallbackCaptor;
+ ArgumentCaptor<DnsEvent> mEvCaptor;
+
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mCallbackCaptor = ArgumentCaptor.forClass(NetworkCallback.class);
+ mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class);
+ mDnsService = new DnsEventListenerService(mCm, mLog);
+
+ verify(mCm, times(1)).registerNetworkCallback(any(), mCallbackCaptor.capture());
+ }
+
+ public void testOneBatch() throws Exception {
+ log(105, LATENCIES);
+ log(106, Arrays.copyOf(LATENCIES, BATCH_SIZE - 1)); // one lookup short of a batch event
+
+ verifyLoggedEvents(new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES));
+
+ log(106, Arrays.copyOfRange(LATENCIES, BATCH_SIZE - 1, BATCH_SIZE));
+
+ mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class); // reset argument captor
+ verifyLoggedEvents(
+ new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(106, EVENT_TYPES, RETURN_CODES, LATENCIES));
+ }
+
+ public void testSeveralBatches() throws Exception {
+ log(105, LATENCIES);
+ log(106, LATENCIES);
+ log(105, LATENCIES);
+ log(107, LATENCIES);
+
+ verifyLoggedEvents(
+ new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(106, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(107, EVENT_TYPES, RETURN_CODES, LATENCIES));
+ }
+
+ public void testBatchAndNetworkLost() throws Exception {
+ byte[] eventTypes = Arrays.copyOf(EVENT_TYPES, 20);
+ byte[] returnCodes = Arrays.copyOf(RETURN_CODES, 20);
+ int[] latencies = Arrays.copyOf(LATENCIES, 20);
+
+ log(105, LATENCIES);
+ log(105, latencies);
+ mCallbackCaptor.getValue().onLost(new Network(105));
+ log(105, LATENCIES);
+
+ verifyLoggedEvents(
+ new DnsEvent(105, eventTypes, returnCodes, latencies),
+ new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES));
+ }
+
+ public void testConcurrentBatchesAndDumps() throws Exception {
+ final long stop = System.currentTimeMillis() + 100;
+ final PrintWriter pw = new PrintWriter(new FileOutputStream("/dev/null"));
+ new Thread() {
+ public void run() {
+ while (System.currentTimeMillis() < stop) {
+ mDnsService.dump(pw);
+ }
+ }
+ }.start();
+
+ logAsync(105, LATENCIES);
+ logAsync(106, LATENCIES);
+ logAsync(107, LATENCIES);
+
+ verifyLoggedEvents(500,
+ new DnsEvent(105, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(106, EVENT_TYPES, RETURN_CODES, LATENCIES),
+ new DnsEvent(107, EVENT_TYPES, RETURN_CODES, LATENCIES));
+ }
+
+ public void testConcurrentBatchesAndNetworkLoss() throws Exception {
+ logAsync(105, LATENCIES);
+ Thread.sleep(10L);
+ // call onLost() asynchronously to logAsync's onDnsEvent() calls.
+ mCallbackCaptor.getValue().onLost(new Network(105));
+
+ // do not verify unpredictable batch
+ verify(mLog, timeout(500).times(1)).log(any());
+ }
+
+ void log(int netId, int[] latencies) {
+ for (int l : latencies) {
+ mDnsService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l);
+ }
+ }
+
+ void logAsync(int netId, int[] latencies) {
+ new Thread() {
+ public void run() {
+ log(netId, latencies);
+ }
+ }.start();
+ }
+
+ void verifyLoggedEvents(DnsEvent... expected) {
+ verifyLoggedEvents(0, expected);
+ }
+
+ void verifyLoggedEvents(int wait, DnsEvent... expectedEvents) {
+ verify(mLog, timeout(wait).times(expectedEvents.length)).log(mEvCaptor.capture());
+ for (DnsEvent got : mEvCaptor.getAllValues()) {
+ OptionalInt index = IntStream.range(0, expectedEvents.length)
+ .filter(i -> eventsEqual(expectedEvents[i], got))
+ .findFirst();
+ // Don't match same expected event more than once.
+ index.ifPresent(i -> expectedEvents[i] = null);
+ assertTrue(index.isPresent());
+ }
+ }
+
+ /** equality function for DnsEvent to avoid overriding equals() and hashCode(). */
+ static boolean eventsEqual(DnsEvent expected, DnsEvent got) {
+ return (expected == got) || ((expected != null) && (got != null)
+ && (expected.netId == got.netId)
+ && Arrays.equals(expected.eventTypes, got.eventTypes)
+ && Arrays.equals(expected.returnCodes, got.returnCodes)
+ && Arrays.equals(expected.latenciesMs, got.latenciesMs));
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/connectivity/MetricsLoggerServiceTest.java b/services/tests/servicestests/src/com/android/server/connectivity/MetricsLoggerServiceTest.java
new file mode 100644
index 0000000..5f84ea1
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/connectivity/MetricsLoggerServiceTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.connectivity;
+
+import android.content.Context;
+import android.net.ConnectivityMetricsEvent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import static android.net.ConnectivityMetricsEvent.Reference;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/*
+ * TODO:
+ * - allow overriding MetricsLoggerService constants in tests.
+ * - test intents are correctly sent after the notification threshold.
+ * - test oldest events are correctly pushed out when internal deque is full.
+ * - test throttling triggers correctly.
+ */
+public class MetricsLoggerServiceTest extends TestCase {
+
+ static final int COMPONENT_TAG = 1;
+ static final long N_EVENTS = 10L;
+ static final ConnectivityMetricsEvent EVENTS[] = new ConnectivityMetricsEvent[(int)N_EVENTS];
+ static {
+ for (int i = 0; i < N_EVENTS; i++) {
+ EVENTS[i] = new ConnectivityMetricsEvent(i, COMPONENT_TAG, i, new Bundle());
+ }
+ }
+
+ static final ConnectivityMetricsEvent NO_EVENTS[] = new ConnectivityMetricsEvent[0];
+
+ @Mock Context mContext;
+ MetricsLoggerService mService;
+
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mService = new MetricsLoggerService(mContext);
+ mService.onStart();
+ }
+
+ public void testGetNoEvents() throws Exception {
+ Reference r = new Reference(0);
+ assertArrayEquals(NO_EVENTS, mService.mBinder.getEvents(r));
+ assertEquals(0, r.getValue());
+ }
+
+ public void testLogAndGetEvents() throws Exception {
+ mService.mBinder.logEvents(EVENTS);
+
+ Reference r = new Reference(0);
+
+ assertArrayEquals(EVENTS, mService.mBinder.getEvents(r));
+ assertEquals(N_EVENTS, r.getValue());
+
+ assertArrayEquals(NO_EVENTS, mService.mBinder.getEvents(r));
+ assertEquals(N_EVENTS, r.getValue());
+ }
+
+ public void testLogOneByOne() throws Exception {
+ for (ConnectivityMetricsEvent ev : EVENTS) {
+ mService.mBinder.logEvent(ev);
+ }
+
+ Reference r = new Reference(0);
+
+ assertArrayEquals(EVENTS, mService.mBinder.getEvents(r));
+ assertEquals(N_EVENTS, r.getValue());
+
+ assertArrayEquals(NO_EVENTS, mService.mBinder.getEvents(r));
+ assertEquals(N_EVENTS, r.getValue());
+ }
+
+ public void testInterleavedLogAndGet() throws Exception {
+ mService.mBinder.logEvents(Arrays.copyOfRange(EVENTS, 0, 3));
+
+ Reference r = new Reference(0);
+
+ assertArrayEquals(Arrays.copyOfRange(EVENTS, 0, 3), mService.mBinder.getEvents(r));
+ assertEquals(3, r.getValue());
+
+ mService.mBinder.logEvents(Arrays.copyOfRange(EVENTS, 3, 8));
+ mService.mBinder.logEvents(Arrays.copyOfRange(EVENTS, 8, 10));
+
+ assertArrayEquals(Arrays.copyOfRange(EVENTS, 3, 10), mService.mBinder.getEvents(r));
+ assertEquals(N_EVENTS, r.getValue());
+
+ assertArrayEquals(NO_EVENTS, mService.mBinder.getEvents(r));
+ assertEquals(N_EVENTS, r.getValue());
+ }
+
+ public void testMultipleGetAll() throws Exception {
+ mService.mBinder.logEvents(Arrays.copyOf(EVENTS, 3));
+
+ Reference r1 = new Reference(0);
+ assertArrayEquals(Arrays.copyOf(EVENTS, 3), mService.mBinder.getEvents(r1));
+ assertEquals(3, r1.getValue());
+
+ mService.mBinder.logEvents(Arrays.copyOfRange(EVENTS, 3, 10));
+
+ Reference r2 = new Reference(0);
+ assertArrayEquals(EVENTS, mService.mBinder.getEvents(r2));
+ assertEquals(N_EVENTS, r2.getValue());
+ }
+
+ public void testLogAndDumpConcurrently() throws Exception {
+ for (int i = 0; i < 50; i++) {
+ mContext = null;
+ mService = null;
+ setUp();
+ logAndDumpConcurrently();
+ }
+ }
+
+ public void logAndDumpConcurrently() throws Exception {
+ final CountDownLatch latch = new CountDownLatch((int)N_EVENTS);
+ final FileDescriptor fd = new FileOutputStream("/dev/null").getFD();
+
+ for (ConnectivityMetricsEvent ev : EVENTS) {
+ new Thread() {
+ public void run() {
+ mService.mBinder.logEvent(ev);
+ latch.countDown();
+ }
+ }.start();
+ }
+
+ new Thread() {
+ public void run() {
+ while (latch.getCount() > 0) {
+ mService.mBinder.dump(fd, new String[]{"--all"});
+ }
+ }
+ }.start();
+
+ latch.await(100, TimeUnit.MILLISECONDS);
+
+ Reference r = new Reference(0);
+ ConnectivityMetricsEvent[] got = mService.mBinder.getEvents(r);
+ Arrays.sort(got, new EventComparator());
+ assertArrayEquals(EVENTS, got);
+ assertEquals(N_EVENTS, r.getValue());
+ }
+
+ static class EventComparator implements Comparator<ConnectivityMetricsEvent> {
+ public int compare(ConnectivityMetricsEvent ev1, ConnectivityMetricsEvent ev2) {
+ return Long.compare(ev1.timestamp, ev2.timestamp);
+ }
+ public boolean equal(Object o) {
+ return o instanceof EventComparator;
+ }
+ };
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
index 71d1a3a..0515a9a 100644
--- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
@@ -29,16 +29,17 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.annotation.RequiresPermission;
import android.annotation.UserIdInt;
import android.app.Activity;
+import android.app.ActivityManagerInternal;
import android.app.IUidObserver;
import android.app.usage.UsageStatsManagerInternal;
+import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -90,6 +91,8 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -103,18 +106,18 @@
import java.util.function.BiPredicate;
import java.util.function.Consumer;
import java.util.function.Function;
-import java.util.function.Predicate;
public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
protected static final String TAG = "ShortcutManagerTest";
+ protected static final boolean DUMP_IN_TEARDOWN = false; // DO NOT SUBMIT WITH true
+
/**
* Whether to enable dump or not. Should be only true when debugging to avoid bugs where
* dump affecting the behavior.
*/
- protected static final boolean ENABLE_DUMP = false; // DO NOT SUBMIT WITH true
-
- protected static final boolean DUMP_IN_TEARDOWN = false; // DO NOT SUBMIT WITH true
+ protected static final boolean ENABLE_DUMP = false // DO NOT SUBMIT WITH true
+ || DUMP_IN_TEARDOWN || ShortcutService.DEBUG;
protected static final String[] EMPTY_STRINGS = new String[0]; // Just for readability.
@@ -152,6 +155,11 @@
// ignore.
return null;
}
+
+ @Override
+ public void unregisterReceiver(BroadcastReceiver receiver) {
+ // ignore.
+ }
}
/** Context used in the client side */
@@ -180,11 +188,6 @@
}
@Override
- public void startActivityAsUser(@RequiresPermission Intent intent, @Nullable Bundle options,
- UserHandle userId) {
- }
-
- @Override
public int getUserId() {
return UserHandle.USER_SYSTEM;
}
@@ -205,11 +208,16 @@
IUidObserver mUidObserver;
public ShortcutServiceTestable(ServiceContext context, Looper looper) {
- super(context, looper);
+ super(context, looper, /* onyForPackageManagerApis */ false);
mContext = context;
}
@Override
+ public String injectGetLocaleTagsForUser(@UserIdInt int userId) {
+ return mInjectedLocale.toLanguageTag();
+ }
+
+ @Override
boolean injectShouldPerformVerification() {
return true; // Always verify during unit tests.
}
@@ -290,34 +298,31 @@
}
@Override
- PackageManagerInternal injectPackageManagerInternal() {
- return mMockPackageManagerInternal;
- }
-
- @Override
boolean hasShortcutHostPermission(@NonNull String callingPackage, int userId) {
return mDefaultLauncherChecker.test(callingPackage, userId);
}
@Override
- PackageInfo injectPackageInfo(String packageName, @UserIdInt int userId,
+ PackageInfo injectPackageInfoWithUninstalled(String packageName, @UserIdInt int userId,
boolean getSignatures) {
return getInjectedPackageInfo(packageName, userId, getSignatures);
}
@Override
- ApplicationInfo injectApplicationInfo(String packageName, @UserIdInt int userId) {
- PackageInfo pi = injectPackageInfo(packageName, userId, /* getSignatures= */ false);
+ ApplicationInfo injectApplicationInfoWithUninstalled(
+ String packageName, @UserIdInt int userId) {
+ PackageInfo pi = injectPackageInfoWithUninstalled(
+ packageName, userId, /* getSignatures= */ false);
return pi != null ? pi.applicationInfo : null;
}
@Override
- List<PackageInfo> injectInstalledPackages(@UserIdInt int userId) {
- return getInstalledPackages(userId);
+ List<PackageInfo> injectGetPackagesWithUninstalled(@UserIdInt int userId) {
+ return BaseShortcutManagerTest.this.getInstalledPackagesWithUninstalled(userId);
}
@Override
- ActivityInfo injectGetActivityInfoWithMetadata(ComponentName activity,
+ ActivityInfo injectGetActivityInfoWithMetadataWithUninstalled(ComponentName activity,
@UserIdInt int userId) {
final PackageInfo pi = mContext.injectGetActivitiesWithMetadata(
activity.getPackageName(), userId);
@@ -369,15 +374,18 @@
}
@Override
+ boolean injectIsActivityEnabledAndExported(ComponentName activity, @UserIdInt int userId) {
+ return mEnabledActivityChecker.test(activity, userId);
+ }
+
+ @Override
XmlResourceParser injectXmlMetaData(ActivityInfo activityInfo, String key) {
return mContext.injectXmlMetaData(activityInfo, key);
}
@Override
void injectPostToHandler(Runnable r) {
- final long token = mContext.injectClearCallingIdentity();
- r.run();
- mContext.injectRestoreCallingIdentity(token);
+ runOnHandler(r);
}
@Override
@@ -393,9 +401,9 @@
}
@Override
- void wtf(String message, Exception e) {
+ void wtf(String message, Throwable th) {
// During tests, WTF is fatal.
- fail(message + " exception: " + e);
+ fail(message + " exception: " + th + "\n" + Log.getStackTraceString(th));
}
}
@@ -445,9 +453,7 @@
@Override
void postToPackageMonitorHandler(Runnable r) {
- final long token = mContext.injectClearCallingIdentity();
- r.run();
- mContext.injectRestoreCallingIdentity(token);
+ runOnHandler(r);
}
@Override
@@ -483,6 +489,9 @@
public static class ShortcutActivity3 extends Activity {
}
+ protected Looper mLooper;
+ protected Handler mHandler;
+
protected ServiceContext mServiceContext;
protected ClientContext mClientContext;
@@ -518,6 +527,7 @@
protected PackageManagerInternal mMockPackageManagerInternal;
protected UserManager mMockUserManager;
protected UsageStatsManagerInternal mMockUsageStatsManagerInternal;
+ protected ActivityManagerInternal mMockActivityManagerInternal;
protected static final String CALLING_PACKAGE_1 = "com.android.test.1";
protected static final int CALLING_UID_1 = 10001;
@@ -600,6 +610,18 @@
protected final HashMap<String, LinkedHashMap<ComponentName, Integer>> mActivityMetadataResId
= new HashMap<>();
+ protected final Map<Integer, UserInfo> mUserInfos = new HashMap<>();
+ protected final Map<Integer, Boolean> mRunningUsers = new HashMap<>();
+ protected final Map<Integer, Boolean> mUnlockedUsers = new HashMap<>();
+
+ protected static final String PACKAGE_SYSTEM_LAUNCHER = "com.android.systemlauncher";
+ protected static final String PACKAGE_SYSTEM_LAUNCHER_NAME = "systemlauncher_name";
+ protected static final int PACKAGE_SYSTEM_LAUNCHER_PRIORITY = 0;
+
+ protected static final String PACKAGE_FALLBACK_LAUNCHER = "com.android.settings";
+ protected static final String PACKAGE_FALLBACK_LAUNCHER_NAME = "fallback";
+ protected static final int PACKAGE_FALLBACK_LAUNCHER_PRIORITY = -999;
+
static {
QUERY_ALL.setQueryFlags(
ShortcutQuery.FLAG_GET_ALL_KINDS);
@@ -609,6 +631,9 @@
protected void setUp() throws Exception {
super.setUp();
+ mLooper = Looper.getMainLooper();
+ mHandler = new Handler(mLooper);
+
mServiceContext = spy(new ServiceContext());
mClientContext = new ClientContext();
@@ -616,11 +641,14 @@
mMockPackageManagerInternal = mock(PackageManagerInternal.class);
mMockUserManager = mock(UserManager.class);
mMockUsageStatsManagerInternal = mock(UsageStatsManagerInternal.class);
+ mMockActivityManagerInternal = mock(ActivityManagerInternal.class);
LocalServices.removeServiceForTest(PackageManagerInternal.class);
LocalServices.addService(PackageManagerInternal.class, mMockPackageManagerInternal);
LocalServices.removeServiceForTest(UsageStatsManagerInternal.class);
LocalServices.addService(UsageStatsManagerInternal.class, mMockUsageStatsManagerInternal);
+ LocalServices.removeServiceForTest(ActivityManagerInternal.class);
+ LocalServices.addService(ActivityManagerInternal.class, mMockActivityManagerInternal);
// Prepare injection values.
@@ -649,56 +677,69 @@
deleteAllSavedFiles();
// Set up users.
- doAnswer(inv -> {
- assertSystem();
- return USER_INFO_0;
- }).when(mMockUserManager).getUserInfo(eq(USER_0));
+ when(mMockUserManager.getUserInfo(anyInt())).thenAnswer(new AnswerWithSystemCheck<>(
+ inv -> mUserInfos.get((Integer) inv.getArguments()[0])));
- doAnswer(inv -> {
- assertSystem();
- return USER_INFO_10;
- }).when(mMockUserManager).getUserInfo(eq(USER_10));
+ mUserInfos.put(USER_0, USER_INFO_0);
+ mUserInfos.put(USER_10, USER_INFO_10);
+ mUserInfos.put(USER_11, USER_INFO_11);
+ mUserInfos.put(USER_P0, USER_INFO_P0);
- doAnswer(inv -> {
- assertSystem();
- return USER_INFO_11;
- }).when(mMockUserManager).getUserInfo(eq(USER_11));
+ // Set up isUserRunning and isUserUnlocked.
+ when(mMockUserManager.isUserRunning(anyInt())).thenAnswer(new AnswerWithSystemCheck<>(
+ inv -> b(mRunningUsers.get((Integer) inv.getArguments()[0]))));
- doAnswer(inv -> {
- assertSystem();
- return USER_INFO_P0;
- }).when(mMockUserManager).getUserInfo(eq(USER_P0));
+ when(mMockUserManager.isUserUnlocked(anyInt()))
+ .thenAnswer(new AnswerWithSystemCheck<>(inv -> {
+ final int userId = (Integer) inv.getArguments()[0];
+ return b(mRunningUsers.get(userId)) && b(mUnlockedUsers.get(userId));
+ }));
+ // isUserUnlockingOrUnlocked() return the same value as isUserUnlocked().
+ when(mMockUserManager.isUserUnlockingOrUnlocked(anyInt()))
+ .thenAnswer(new AnswerWithSystemCheck<>(inv -> {
+ final int userId = (Integer) inv.getArguments()[0];
+ return b(mRunningUsers.get(userId)) && b(mUnlockedUsers.get(userId));
+ }));
- // User 0 is always running.
- when(mMockUserManager.isUserRunning(eq(USER_0))).thenAnswer(new AnswerIsUserRunning(true));
+ // User 0 and P0 are always running
+ mRunningUsers.put(USER_0, true);
+ mRunningUsers.put(USER_10, false);
+ mRunningUsers.put(USER_11, false);
+ mRunningUsers.put(USER_P0, true);
+ // Unlock all users by default.
+ mUnlockedUsers.put(USER_0, true);
+ mUnlockedUsers.put(USER_10, true);
+ mUnlockedUsers.put(USER_11, true);
+ mUnlockedUsers.put(USER_P0, true);
+
+ // Set up resources
setUpAppResources();
// Start the service.
initService();
setCaller(CALLING_PACKAGE_1);
+ }
- // In order to complicate the situation, we set mLocaleChangeSequenceNumber to 1 by
- // calling this. Running test with mLocaleChangeSequenceNumber == 0 might make us miss
- // some edge cases.
- mInternal.onSystemLocaleChangedNoLock();
+ private static boolean b(Boolean value) {
+ return (value != null && value);
}
/**
* Returns a boolean but also checks if the current UID is SYSTEM_UID.
*/
- protected class AnswerIsUserRunning implements Answer<Boolean> {
- protected final boolean mAnswer;
+ protected class AnswerWithSystemCheck<T> implements Answer<T> {
+ private final Function<InvocationOnMock, T> mChecker;
- protected AnswerIsUserRunning(boolean answer) {
- mAnswer = answer;
+ public AnswerWithSystemCheck(Function<InvocationOnMock, T> checker) {
+ mChecker = checker;
}
@Override
- public Boolean answer(InvocationOnMock invocation) throws Throwable {
- assertEquals("isUserRunning() must be called on SYSTEM UID.",
+ public T answer(InvocationOnMock invocation) throws Throwable {
+ assertEquals("Must be called on SYSTEM UID.",
Process.SYSTEM_UID, mInjectedCallingUid);
- return mAnswer;
+ return mChecker.apply(invocation);
}
}
@@ -787,7 +828,7 @@
LocalServices.removeServiceForTest(ShortcutServiceInternal.class);
// Instantiate targets.
- mService = new ShortcutServiceTestable(mServiceContext, Looper.getMainLooper());
+ mService = new ShortcutServiceTestable(mServiceContext, mLooper);
mManager = new ShortcutManagerTestable(mClientContext, mService);
mInternal = LocalServices.getService(ShortcutServiceInternal.class);
@@ -799,12 +840,6 @@
// Send boot sequence events.
mService.onBootPhase(SystemService.PHASE_LOCK_SETTINGS_READY);
- // Make sure a call to onSystemLocaleChangedNoLock() before PHASE_BOOT_COMPLETED will be
- // ignored.
- final long origSequenceNumber = mService.getLocaleChangeSequenceNumber();
- mInternal.onSystemLocaleChangedNoLock();
- assertEquals(origSequenceNumber, mService.getLocaleChangeSequenceNumber());
-
mService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);
}
@@ -826,6 +861,15 @@
mLauncherAppsMap.clear();
}
+ protected void runOnHandler(Runnable r) {
+ final long token = mServiceContext.injectClearCallingIdentity();
+ try {
+ r.run();
+ } finally {
+ mServiceContext.injectRestoreCallingIdentity(token);
+ }
+ }
+
protected void addPackage(String packageName, int uid, int version) {
addPackage(packageName, uid, version, packageName);
}
@@ -939,7 +983,7 @@
}
}
- private List<PackageInfo> getInstalledPackages(int userId) {
+ private List<PackageInfo> getInstalledPackagesWithUninstalled(int userId) {
final ArrayList<PackageInfo> ret = new ArrayList<>();
addPackageInfo(getInjectedPackageInfo(CALLING_PACKAGE_1, userId, false), ret);
@@ -978,6 +1022,7 @@
ai.name = cn.getClassName();
ai.metaData = new Bundle();
ai.metaData.putInt(ShortcutParser.METADATA_KEY, activities.get(cn));
+ ai.applicationInfo = ret.applicationInfo;
list.add(ai);
}
ret.activities = list.toArray(new ActivityInfo[list.size()]);
@@ -1063,17 +1108,32 @@
protected void dumpsysOnLogcat(String message, boolean force) {
if (force || !ENABLE_DUMP) return;
- final ByteArrayOutputStream out = new ByteArrayOutputStream();
- final PrintWriter pw = new PrintWriter(out);
- mService.dumpInner(pw, null);
- pw.close();
-
Log.v(TAG, "Dumping ShortcutService: " + message);
- for (String line : out.toString().split("\n")) {
+ for (String line : dumpsys(null).split("\n")) {
Log.v(TAG, line);
}
}
+ protected String dumpCheckin() {
+ return dumpsys(new String[]{"--checkin"});
+ }
+
+ private String dumpsys(String[] args) {
+ final ArrayList<String> origPermissions = new ArrayList<>(mCallerPermissions);
+ mCallerPermissions.add(android.Manifest.permission.DUMP);
+ try {
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
+ final PrintWriter pw = new PrintWriter(out);
+ mService.dump(/* fd */ null, pw, args);
+ pw.close();
+
+ return out.toString();
+ } finally {
+ mCallerPermissions.clear();
+ mCallerPermissions.addAll(origPermissions);
+ }
+ }
+
/**
* For debugging, dump arbitrary file on logcat.
*/
@@ -1243,6 +1303,35 @@
return s;
}
+ protected ShortcutInfo makeShortcutWithIntents(String id, Intent... intents) {
+ return makeShortcut(
+ id, "Title-" + id, /* activity =*/ null, /* icon =*/ null,
+ intents, /* rank =*/ 0);
+ }
+
+ /**
+ * Make a shortcut with details.
+ */
+ protected ShortcutInfo makeShortcut(String id, String title, ComponentName activity,
+ Icon icon, Intent[] intents, int rank) {
+ final ShortcutInfo.Builder b = new ShortcutInfo.Builder(mClientContext, id)
+ .setActivity(new ComponentName(mClientContext.getPackageName(), "dummy"))
+ .setShortLabel(title)
+ .setRank(rank)
+ .setIntents(intents);
+ if (icon != null) {
+ b.setIcon(icon);
+ }
+ if (activity != null) {
+ b.setActivity(activity);
+ }
+ final ShortcutInfo s = b.build();
+
+ s.setTimestamp(mInjectedCurrentTimeMillis); // HACK
+
+ return s;
+ }
+
/**
* Make a shortcut with details.
*/
@@ -1328,33 +1417,53 @@
assertTrue(getPackageShortcut(packageName, shortcutId, userId) == null);
}
+ protected Intent[] launchShortcutAndGetIntentsInner(Runnable shortcutStarter,
+ @NonNull String packageName, @NonNull String shortcutId, int userId) {
+ reset(mMockActivityManagerInternal);
+ shortcutStarter.run();
+
+ final ArgumentCaptor<Intent[]> intentsCaptor = ArgumentCaptor.forClass(Intent[].class);
+ verify(mMockActivityManagerInternal).startActivitiesAsPackage(
+ eq(packageName),
+ eq(userId),
+ intentsCaptor.capture(),
+ any(Bundle.class));
+ return intentsCaptor.getValue();
+ }
+
+ protected Intent[] launchShortcutAndGetIntents(
+ @NonNull String packageName, @NonNull String shortcutId, int userId) {
+ return launchShortcutAndGetIntentsInner(
+ () -> {
+ mLauncherApps.startShortcut(packageName, shortcutId, null, null,
+ UserHandle.of(userId));
+ }, packageName, shortcutId, userId
+ );
+ }
+
protected Intent launchShortcutAndGetIntent(
@NonNull String packageName, @NonNull String shortcutId, int userId) {
- reset(mServiceContext);
- assertTrue(mLauncherApps.startShortcut(packageName, shortcutId, null, null,
- UserHandle.of(userId)));
+ final Intent[] intents = launchShortcutAndGetIntents(packageName, shortcutId, userId);
+ assertEquals(1, intents.length);
+ return intents[0];
+ }
- final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mServiceContext).startActivityAsUser(
- intentCaptor.capture(),
- any(Bundle.class),
- eq(UserHandle.of(userId)));
- return intentCaptor.getValue();
+ protected Intent[] launchShortcutAndGetIntents_withShortcutInfo(
+ @NonNull String packageName, @NonNull String shortcutId, int userId) {
+ return launchShortcutAndGetIntentsInner(
+ () -> {
+ mLauncherApps.startShortcut(
+ getShortcutInfoAsLauncher(packageName, shortcutId, userId), null, null);
+ }, packageName, shortcutId, userId
+ );
}
protected Intent launchShortcutAndGetIntent_withShortcutInfo(
@NonNull String packageName, @NonNull String shortcutId, int userId) {
- reset(mServiceContext);
-
- assertTrue(mLauncherApps.startShortcut(
- getShortcutInfoAsLauncher(packageName, shortcutId, userId), null, null));
-
- final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mServiceContext).startActivityAsUser(
- intentCaptor.capture(),
- any(Bundle.class),
- eq(UserHandle.of(userId)));
- return intentCaptor.getValue();
+ final Intent[] intents = launchShortcutAndGetIntents_withShortcutInfo(
+ packageName, shortcutId, userId);
+ assertEquals(1, intents.length);
+ return intents[0];
}
protected void assertShortcutLaunchable(@NonNull String packageName, @NonNull String shortcutId,
@@ -1363,18 +1472,34 @@
assertNotNull(launchShortcutAndGetIntent_withShortcutInfo(packageName, shortcutId, userId));
}
- protected void assertShortcutNotLaunchable(@NonNull String packageName,
+ protected void assertShortcutNotLaunched(@NonNull String packageName,
@NonNull String shortcutId, int userId) {
+ reset(mMockActivityManagerInternal);
try {
- final boolean ok = mLauncherApps.startShortcut(packageName, shortcutId, null, null,
+ mLauncherApps.startShortcut(packageName, shortcutId, null, null,
UserHandle.of(userId));
- if (!ok) {
- return; // didn't launch, okay.
- }
- fail();
- } catch (SecurityException expected) {
- // security exception is okay too.
+ fail("ActivityNotFoundException was not thrown");
+ } catch (ActivityNotFoundException expected) {
}
+ // This shouldn't have been called.
+ verify(mMockActivityManagerInternal, times(0)).startActivitiesAsPackage(
+ anyString(),
+ anyInt(),
+ any(Intent[].class),
+ any(Bundle.class));
+ }
+
+ protected void assertStartShortcutThrowsException(@NonNull String packageName,
+ @NonNull String shortcutId, int userId, Class<?> expectedException) {
+ Exception thrown = null;
+ try {
+ mLauncherApps.startShortcut(packageName, shortcutId, null, null,
+ UserHandle.of(userId));
+ } catch (Exception e) {
+ thrown = e;
+ }
+ assertNotNull("Exception was not thrown", thrown);
+ assertEquals("Exception type different", expectedException, thrown.getClass());
}
protected void assertBitmapDirectories(int userId, String... expectedDirectories) {
@@ -1420,12 +1545,30 @@
return new File(si.getBitmapPath()).getName();
}
+ /**
+ * @return all shortcuts stored internally for the caller. This reflects the *internal* view
+ * of shortcuts, which may be different from what {@link #getCallerVisibleShortcuts} would
+ * return, because getCallerVisibleShortcuts() will get shortcuts from the proper "front door"
+ * which performs some extra checks, like {@link ShortcutPackage#onRestored}.
+ */
protected List<ShortcutInfo> getCallerShortcuts() {
final ShortcutPackage p = mService.getPackageShortcutForTest(
getCallingPackage(), getCallingUserId());
return p == null ? null : p.getAllShortcutsForTest();
}
+ /**
+ * @return all shortcuts owned by caller that are actually visible via ShortcutManager.
+ * See also {@link #getCallerShortcuts}.
+ */
+ protected List<ShortcutInfo> getCallerVisibleShortcuts() {
+ final ArrayList<ShortcutInfo> ret = new ArrayList<>();
+ ret.addAll(mManager.getDynamicShortcuts());
+ ret.addAll(mManager.getPinnedShortcuts());
+ ret.addAll(mManager.getManifestShortcuts());
+ return ret;
+ }
+
protected ShortcutInfo getCallerShortcut(String shortcutId) {
return getPackageShortcut(getCallingPackage(), shortcutId, getCallingUserId());
}
@@ -1453,14 +1596,18 @@
return infoList.get(0);
}
- protected Intent genPackageAddIntent(String pakcageName, int userId) {
+ protected Intent genPackageAddIntent(String packageName, int userId) {
+ installPackage(userId, packageName);
+
Intent i = new Intent(Intent.ACTION_PACKAGE_ADDED);
- i.setData(Uri.parse("package:" + pakcageName));
+ i.setData(Uri.parse("package:" + packageName));
i.putExtra(Intent.EXTRA_USER_HANDLE, userId);
return i;
}
protected Intent genPackageDeleteIntent(String pakcageName, int userId) {
+ uninstallPackage(userId, pakcageName);
+
Intent i = new Intent(Intent.ACTION_PACKAGE_REMOVED);
i.setData(Uri.parse("package:" + pakcageName));
i.putExtra(Intent.EXTRA_USER_HANDLE, userId);
@@ -1468,6 +1615,8 @@
}
protected Intent genPackageUpdateIntent(String pakcageName, int userId) {
+ installPackage(userId, pakcageName);
+
Intent i = new Intent(Intent.ACTION_PACKAGE_ADDED);
i.setData(Uri.parse("package:" + pakcageName));
i.putExtra(Intent.EXTRA_USER_HANDLE, userId);
@@ -1587,6 +1736,8 @@
}
protected void prepareCrossProfileDataSet() {
+ mRunningUsers.put(USER_10, true); // this test needs user 10.
+
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"),
@@ -1630,6 +1781,8 @@
mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, list("s2", "s5"), HANDLE_USER_P0);
});
+
+ // Note LAUNCHER_3 has allowBackup=false.
runWithCaller(LAUNCHER_3, USER_0, () -> {
mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, list("s3"), HANDLE_USER_0);
mLauncherApps.pinShortcuts(CALLING_PACKAGE_2, list("s3", "s4"), HANDLE_USER_0);
@@ -1719,4 +1872,54 @@
}
return actualShortcuts;
}
+
+ public String readTestAsset(String assetPath) throws IOException {
+ final StringBuilder sb = new StringBuilder();
+ try (BufferedReader br = new BufferedReader(
+ new InputStreamReader(
+ getTestContext().getResources().getAssets().open(assetPath)))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ sb.append(System.lineSeparator());
+ }
+ }
+ return sb.toString();
+ }
+
+ protected void prepareGetHomeActivitiesAsUser(ComponentName preferred,
+ List<ResolveInfo> candidates, int userId) {
+ doAnswer(inv -> {
+ ((List) inv.getArguments()[0]).addAll(candidates);
+ return preferred;
+ }).when(mMockPackageManagerInternal).getHomeActivitiesAsUser(any(List.class), eq(userId));
+ }
+
+ protected static ComponentName cn(String packageName, String name) {
+ return new ComponentName(packageName, name);
+ }
+
+ protected static ResolveInfo ri(String packageName, String name, boolean isSystem, int priority) {
+ final ResolveInfo ri = new ResolveInfo();
+ ri.activityInfo = new ActivityInfo();
+ ri.activityInfo.applicationInfo = new ApplicationInfo();
+
+ ri.activityInfo.packageName = packageName;
+ ri.activityInfo.name = name;
+ if (isSystem) {
+ ri.activityInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
+ }
+ ri.priority = priority;
+ return ri;
+ }
+
+ protected static ResolveInfo getSystemLauncher() {
+ return ri(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME, true,
+ PACKAGE_SYSTEM_LAUNCHER_PRIORITY);
+ }
+
+ protected static ResolveInfo getFallbackLauncher() {
+ return ri(PACKAGE_FALLBACK_LAUNCHER, PACKAGE_FALLBACK_LAUNCHER_NAME, true,
+ PACKAGE_FALLBACK_LAUNCHER_PRIORITY);
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
index bf6343f..46ff4b4 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
@@ -21,12 +21,19 @@
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
import android.annotation.NonNull;
import android.content.Context;
import android.content.pm.PackageParser;
import android.content.pm.UserInfo;
import android.os.UserHandle;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
@@ -34,6 +41,9 @@
import com.android.internal.os.AtomicFile;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import java.lang.reflect.Constructor;
import java.io.File;
import java.io.FileOutputStream;
@@ -42,14 +52,121 @@
import java.util.ArrayList;
import java.util.List;
-public class PackageManagerSettingsTests extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class PackageManagerSettingsTests {
private static final String PACKAGE_NAME_2 = "com.google.app2";
private static final String PACKAGE_NAME_3 = "com.android.app3";
private static final String PACKAGE_NAME_1 = "com.google.app1";
- private static final boolean localLOGV = true;
public static final String TAG = "PackageManagerSettingsTests";
protected final String PREFIX = "android.content.pm";
+ /** make sure our initialized KeySetManagerService metadata matches packages.xml */
+ @Test
+ public void testReadKeySetSettings()
+ throws ReflectiveOperationException, IllegalAccessException {
+ /* write out files and read */
+ writeOldFiles();
+ createUserManagerServiceRef();
+ Settings settings =
+ new Settings(InstrumentationRegistry.getContext().getFilesDir(), new Object());
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+ verifyKeySetMetaData(settings);
+ }
+
+ /** read in data, write it out, and read it back in. Verify same. */
+ @Test
+ public void testWriteKeySetSettings()
+ throws ReflectiveOperationException, IllegalAccessException {
+ // write out files and read
+ writeOldFiles();
+ createUserManagerServiceRef();
+ Settings settings =
+ new Settings(InstrumentationRegistry.getContext().getFilesDir(), new Object());
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+
+ // write out, read back in and verify the same
+ settings.writeLPr();
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+ verifyKeySetMetaData(settings);
+ }
+
+ @Test
+ public void testSettingsReadOld() {
+ // Write the package files and make sure they're parsed properly the first time
+ writeOldFiles();
+ Settings settings =
+ new Settings(InstrumentationRegistry.getContext().getFilesDir(), new Object());
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+ assertThat(settings.peekPackageLPr(PACKAGE_NAME_3), is(notNullValue()));
+ assertThat(settings.peekPackageLPr(PACKAGE_NAME_1), is(notNullValue()));
+
+ PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);
+ assertThat(ps.getEnabled(0), is(COMPONENT_ENABLED_STATE_DEFAULT));
+ assertThat(ps.getNotLaunched(0), is(true));
+
+ ps = settings.peekPackageLPr(PACKAGE_NAME_2);
+ assertThat(ps.getStopped(0), is(false));
+ assertThat(ps.getEnabled(0), is(COMPONENT_ENABLED_STATE_DISABLED_USER));
+ assertThat(ps.getEnabled(1), is(COMPONENT_ENABLED_STATE_DEFAULT));
+ }
+
+ @Test
+ public void testNewPackageRestrictionsFile() throws ReflectiveOperationException {
+ // Write the package files and make sure they're parsed properly the first time
+ writeOldFiles();
+ createUserManagerServiceRef();
+ Settings settings =
+ new Settings(InstrumentationRegistry.getContext().getFilesDir(), new Object());
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+ settings.writeLPr();
+
+ // Create Settings again to make it read from the new files
+ settings = new Settings(InstrumentationRegistry.getContext().getFilesDir(), new Object());
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+
+ PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_2);
+ assertThat(ps.getEnabled(0), is(COMPONENT_ENABLED_STATE_DISABLED_USER));
+ assertThat(ps.getEnabled(1), is(COMPONENT_ENABLED_STATE_DEFAULT));
+ }
+
+ @Test
+ public void testEnableDisable() {
+ // Write the package files and make sure they're parsed properly the first time
+ writeOldFiles();
+ Settings settings =
+ new Settings(InstrumentationRegistry.getContext().getFilesDir(), new Object());
+ assertThat(settings.readLPw(createFakeUsers()), is(true));
+
+ // Enable/Disable a package
+ PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);
+ ps.setEnabled(COMPONENT_ENABLED_STATE_DISABLED, 0, null);
+ ps.setEnabled(COMPONENT_ENABLED_STATE_ENABLED, 1, null);
+ assertThat(ps.getEnabled(0), is(COMPONENT_ENABLED_STATE_DISABLED));
+ assertThat(ps.getEnabled(1), is(COMPONENT_ENABLED_STATE_ENABLED));
+
+ // Enable/Disable a component
+ ArraySet<String> components = new ArraySet<String>();
+ String component1 = PACKAGE_NAME_1 + "/.Component1";
+ components.add(component1);
+ ps.setDisabledComponents(components, 0);
+ ArraySet<String> componentsDisabled = ps.getDisabledComponents(0);
+ assertThat(componentsDisabled.size(), is(1));
+ assertThat(componentsDisabled.toArray()[0], is(component1));
+ boolean hasEnabled =
+ ps.getEnabledComponents(0) != null && ps.getEnabledComponents(1).size() > 0;
+ assertThat(hasEnabled, is(false));
+
+ // User 1 should not have any disabled components
+ boolean hasDisabled =
+ ps.getDisabledComponents(1) != null && ps.getDisabledComponents(1).size() > 0;
+ assertThat(hasDisabled, is(false));
+ ps.setEnabledComponents(components, 1);
+ assertThat(ps.getEnabledComponents(1).size(), is(1));
+ hasEnabled = ps.getEnabledComponents(0) != null && ps.getEnabledComponents(0).size() > 0;
+ assertThat(hasEnabled, is(false));
+ }
+
private @NonNull List<UserInfo> createFakeUsers() {
ArrayList<UserInfo> users = new ArrayList<>();
users.add(new UserInfo(UserHandle.USER_SYSTEM, "test user", UserInfo.FLAG_INITIALIZED));
@@ -69,7 +186,7 @@
}
private void writePackagesXml() {
- writeFile(new File(getContext().getFilesDir(), "system/packages.xml"),
+ writeFile(new File(InstrumentationRegistry.getContext().getFilesDir(), "system/packages.xml"),
("<?xml version='1.0' encoding='utf-8' standalone='yes' ?>"
+ "<packages>"
+ "<last-platform-version internal=\"15\" external=\"0\" fingerprint=\"foo\" />"
@@ -139,7 +256,7 @@
}
private void writeStoppedPackagesXml() {
- writeFile(new File(getContext().getFilesDir(), "system/packages-stopped.xml"),
+ writeFile(new File(InstrumentationRegistry.getContext().getFilesDir(), "system/packages-stopped.xml"),
( "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>"
+ "<stopped-packages>"
+ "<pkg name=\"com.google.app1\" nl=\"1\" />"
@@ -149,7 +266,7 @@
}
private void writePackagesList() {
- writeFile(new File(getContext().getFilesDir(), "system/packages.list"),
+ writeFile(new File(InstrumentationRegistry.getContext().getFilesDir(), "system/packages.list"),
( "com.google.app1 11000 0 /data/data/com.google.app1 seinfo1"
+ "com.google.app2 11001 0 /data/data/com.google.app2 seinfo2"
+ "com.android.app3 11030 0 /data/data/com.android.app3 seinfo3")
@@ -157,7 +274,7 @@
}
private void deleteSystemFolder() {
- File systemFolder = new File(getContext().getFilesDir(), "system");
+ File systemFolder = new File(InstrumentationRegistry.getContext().getFilesDir(), "system");
deleteFolder(systemFolder);
}
@@ -179,18 +296,27 @@
}
private void createUserManagerServiceRef() throws ReflectiveOperationException {
- Constructor<UserManagerService> umsc =
- UserManagerService.class.getDeclaredConstructor(
- Context.class,
- PackageManagerService.class,
- Object.class,
- Object.class,
- File.class,
- File.class);
- umsc.setAccessible(true);
- UserManagerService ums = umsc.newInstance(getContext(), null,
- new Object(), new Object(), getContext().getFilesDir(),
- new File(getContext().getFilesDir(), "user"));
+ InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ Constructor<UserManagerService> umsc;
+ try {
+ umsc = UserManagerService.class.getDeclaredConstructor(
+ Context.class,
+ PackageManagerService.class,
+ Object.class,
+ File.class);
+ umsc.setAccessible(true);
+ UserManagerService ums = umsc.newInstance(InstrumentationRegistry.getContext(),
+ null /*PackageManagerService*/, new Object() /*packagesLock*/,
+ new File(InstrumentationRegistry.getContext().getFilesDir(), "user"));
+ } catch (SecurityException
+ | ReflectiveOperationException
+ | IllegalArgumentException e) {
+ fail("Could not create user manager service; msg=" + e.getMessage());
+ }
+ }
+ });
}
private void verifyKeySetMetaData(Settings settings)
@@ -199,151 +325,52 @@
KeySetManagerService ksms = settings.mKeySetManagerService;
/* verify keyset and public key ref counts */
- assertEquals(2, KeySetUtils.getKeySetRefCount(ksms, 1));
- assertEquals(1, KeySetUtils.getKeySetRefCount(ksms, 2));
- assertEquals(1, KeySetUtils.getKeySetRefCount(ksms, 3));
- assertEquals(1, KeySetUtils.getKeySetRefCount(ksms, 4));
- assertEquals(2, KeySetUtils.getPubKeyRefCount(ksms, 1));
- assertEquals(2, KeySetUtils.getPubKeyRefCount(ksms, 2));
- assertEquals(1, KeySetUtils.getPubKeyRefCount(ksms, 3));
+ assertThat(KeySetUtils.getKeySetRefCount(ksms, 1), is(2));
+ assertThat(KeySetUtils.getKeySetRefCount(ksms, 2), is(1));
+ assertThat(KeySetUtils.getKeySetRefCount(ksms, 3), is(1));
+ assertThat(KeySetUtils.getKeySetRefCount(ksms, 4), is(1));
+ assertThat(KeySetUtils.getPubKeyRefCount(ksms, 1), is(2));
+ assertThat(KeySetUtils.getPubKeyRefCount(ksms, 2), is(2));
+ assertThat(KeySetUtils.getPubKeyRefCount(ksms, 3), is(1));
/* verify public keys properly read */
PublicKey keyA = PackageParser.parsePublicKey(KeySetStrings.ctsKeySetPublicKeyA);
PublicKey keyB = PackageParser.parsePublicKey(KeySetStrings.ctsKeySetPublicKeyB);
PublicKey keyC = PackageParser.parsePublicKey(KeySetStrings.ctsKeySetPublicKeyC);
- assertEquals(keyA, KeySetUtils.getPubKey(ksms, 1));
- assertEquals(keyB, KeySetUtils.getPubKey(ksms, 2));
- assertEquals(keyC, KeySetUtils.getPubKey(ksms, 3));
+ assertThat(KeySetUtils.getPubKey(ksms, 1), is(keyA));
+ assertThat(KeySetUtils.getPubKey(ksms, 2), is(keyB));
+ assertThat(KeySetUtils.getPubKey(ksms, 3), is(keyC));
/* verify mapping is correct (ks -> pub keys) */
LongSparseArray<ArraySet<Long>> ksMapping = KeySetUtils.getKeySetMapping(ksms);
ArraySet<Long> mapping = ksMapping.get(1);
- assertEquals(1, mapping.size());
- assertTrue(mapping.contains(new Long(1)));
+ assertThat(mapping.size(), is(1));
+ assertThat(mapping.contains(new Long(1)), is(true));
mapping = ksMapping.get(2);
- assertEquals(1, mapping.size());
- assertTrue(mapping.contains(new Long(2)));
+ assertThat(mapping.size(), is(1));
+ assertThat(mapping.contains(new Long(2)), is(true));
mapping = ksMapping.get(3);
- assertEquals(1, mapping.size());
- assertTrue(mapping.contains(new Long(3)));
+ assertThat(mapping.size(), is(1));
+ assertThat(mapping.contains(new Long(3)), is(true));
mapping = ksMapping.get(4);
- assertEquals(2, mapping.size());
- assertTrue(mapping.contains(new Long(1)));
- assertTrue(mapping.contains(new Long(2)));
+ assertThat(mapping.size(), is(2));
+ assertThat(mapping.contains(new Long(1)), is(true));
+ assertThat(mapping.contains(new Long(2)), is(true));
/* verify lastIssuedIds are consistent */
- assertEquals(new Long(3), KeySetUtils.getLastIssuedKeyId(ksms));
- assertEquals(new Long(4), KeySetUtils.getLastIssuedKeySetId(ksms));
+ assertThat(KeySetUtils.getLastIssuedKeyId(ksms), is(3L));
+ assertThat(KeySetUtils.getLastIssuedKeySetId(ksms), is(4L));
- /* verify packages have been given the appropriat information */
+ /* verify packages have been given the appropriate information */
PackageSetting ps = packages.get("com.google.app1");
- assertEquals(1, ps.keySetData.getProperSigningKeySet());
+ assertThat(ps.keySetData.getProperSigningKeySet(), is(1L));
ps = packages.get("com.google.app2");
- assertEquals(1, ps.keySetData.getProperSigningKeySet());
- assertEquals(new Long(4), ps.keySetData.getAliases().get("AB"));
+ assertThat(ps.keySetData.getProperSigningKeySet(), is(1L));
+ assertThat(ps.keySetData.getAliases().get("AB"), is(4L));
ps = packages.get("com.android.app3");
- assertEquals(2, ps.keySetData.getProperSigningKeySet());
- assertEquals(new Long(3), ps.keySetData.getAliases().get("C"));
- assertEquals(1, ps.keySetData.getUpgradeKeySets().length);
- assertEquals(3, ps.keySetData.getUpgradeKeySets()[0]);
- }
-
- /* make sure our initialized keysetmanagerservice metadata matches packages.xml */
- public void testReadKeySetSettings()
- throws ReflectiveOperationException, IllegalAccessException {
-
- /* write out files and read */
- writeOldFiles();
- createUserManagerServiceRef();
- Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(createFakeUsers()));
- verifyKeySetMetaData(settings);
- }
-
- /* read in data, write it out, and read it back in. Verify same. */
- public void testWriteKeySetSettings()
- throws ReflectiveOperationException, IllegalAccessException {
-
- /* write out files and read */
- writeOldFiles();
- createUserManagerServiceRef();
- Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(createFakeUsers()));
-
- /* write out, read back in and verify the same */
- settings.writeLPr();
- assertEquals(true, settings.readLPw(createFakeUsers()));
- verifyKeySetMetaData(settings);
- }
-
- public void testSettingsReadOld() {
- // Write the package files and make sure they're parsed properly the first time
- writeOldFiles();
- Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(createFakeUsers()));
- assertNotNull(settings.peekPackageLPr(PACKAGE_NAME_3));
- assertNotNull(settings.peekPackageLPr(PACKAGE_NAME_1));
-
- PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);
- assertEquals(COMPONENT_ENABLED_STATE_DEFAULT, ps.getEnabled(0));
- assertEquals(true, ps.getNotLaunched(0));
-
- ps = settings.peekPackageLPr(PACKAGE_NAME_2);
- assertEquals(false, ps.getStopped(0));
- assertEquals(COMPONENT_ENABLED_STATE_DISABLED_USER, ps.getEnabled(0));
- assertEquals(COMPONENT_ENABLED_STATE_DEFAULT, ps.getEnabled(1));
- }
-
- public void testNewPackageRestrictionsFile() throws ReflectiveOperationException {
-
- // Write the package files and make sure they're parsed properly the first time
- writeOldFiles();
- createUserManagerServiceRef();
- Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(createFakeUsers()));
- settings.writeLPr();
-
- // Create Settings again to make it read from the new files
- settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(createFakeUsers()));
-
- PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_2);
- assertEquals(COMPONENT_ENABLED_STATE_DISABLED_USER, ps.getEnabled(0));
- assertEquals(COMPONENT_ENABLED_STATE_DEFAULT, ps.getEnabled(1));
- }
-
- public void testEnableDisable() {
- // Write the package files and make sure they're parsed properly the first time
- writeOldFiles();
- Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(createFakeUsers()));
-
- // Enable/Disable a package
- PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);
- ps.setEnabled(COMPONENT_ENABLED_STATE_DISABLED, 0, null);
- ps.setEnabled(COMPONENT_ENABLED_STATE_ENABLED, 1, null);
- assertEquals(COMPONENT_ENABLED_STATE_DISABLED, ps.getEnabled(0));
- assertEquals(COMPONENT_ENABLED_STATE_ENABLED, ps.getEnabled(1));
-
- // Enable/Disable a component
- ArraySet<String> components = new ArraySet<String>();
- String component1 = PACKAGE_NAME_1 + "/.Component1";
- components.add(component1);
- ps.setDisabledComponents(components, 0);
- ArraySet<String> componentsDisabled = ps.getDisabledComponents(0);
- assertEquals(1, componentsDisabled.size());
- assertEquals(component1, componentsDisabled.toArray()[0]);
- boolean hasEnabled =
- ps.getEnabledComponents(0) != null && ps.getEnabledComponents(1).size() > 0;
- assertEquals(false, hasEnabled);
-
- // User 1 should not have any disabled components
- boolean hasDisabled =
- ps.getDisabledComponents(1) != null && ps.getDisabledComponents(1).size() > 0;
- assertEquals(false, hasDisabled);
- ps.setEnabledComponents(components, 1);
- assertEquals(1, ps.getEnabledComponents(1).size());
- hasEnabled = ps.getEnabledComponents(0) != null && ps.getEnabledComponents(0).size() > 0;
- assertEquals(false, hasEnabled);
+ assertThat(ps.keySetData.getProperSigningKeySet(), is(2L));
+ assertThat(ps.keySetData.getAliases().get("C"), is(3L));
+ assertThat(ps.keySetData.getUpgradeKeySets().length, is(1));
+ assertThat(ps.keySetData.getUpgradeKeySets()[0], is(3L));
}
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
index 7d33a30..b1c0ed4 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
@@ -58,12 +58,16 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.Manifest.permission;
+import android.app.ActivityManager;
+import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -75,6 +79,7 @@
import android.graphics.BitmapFactory;
import android.graphics.drawable.Icon;
import android.net.Uri;
+import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
@@ -86,7 +91,6 @@
import com.android.server.pm.ShortcutService.ConfigConstants;
import com.android.server.pm.ShortcutService.FileOutputStreamWithPath;
import com.android.server.pm.ShortcutUser.PackageWithUser;
-import com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.ShortcutListAsserter;
import org.mockito.ArgumentCaptor;
@@ -94,9 +98,6 @@
import java.io.IOException;
import java.util.List;
import java.util.Locale;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
/**
* Tests for ShortcutService and ShortcutManager.
@@ -106,15 +107,6 @@
-r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk &&
adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 \
-w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
-
-
- * TODO More tests for pinning + manifest shortcuts
- * TODO Manifest shortcuts + app upgrade -> launcher callback.
- * Also locale change should trigger launcehr callbacks too, when they use strign resoucres.
- * (not implemented yet.)
- * TODO: Add checks with assertAllNotHaveIcon()
- * TODO: Detailed test for hasShortcutPermissionInner().
- * TODO: Add tests for the command line functions too.
*/
@SmallTest
public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
@@ -302,6 +294,8 @@
// TODO Check max number
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
assertTrue(mManager.setDynamicShortcuts(list(makeShortcut("s1"))));
});
@@ -348,6 +342,8 @@
// TODO Check fields.
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
assertTrue(mManager.addDynamicShortcuts(list(makeShortcut("s1"))));
});
@@ -356,6 +352,8 @@
public void testPublishWithNoActivity() {
// If activity is not explicitly set, use the default one.
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
// s1 and s3 has no activities.
final ShortcutInfo si1 = new ShortcutInfo.Builder(mClientContext, "si1")
@@ -458,6 +456,8 @@
}
public void testPublishWithNoActivity_noMainActivityInPackage() {
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
final ShortcutInfo si1 = new ShortcutInfo.Builder(mClientContext, "si1")
.setShortLabel("label1")
@@ -730,6 +730,8 @@
});
// For USER-10, let's try without updating the times.
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
mManager.setDynamicShortcuts(list(
makeShortcutWithIcon("10s1", bmp32x32),
@@ -1079,11 +1081,80 @@
// TODO Check bitmap removal too.
+ mRunningUsers.put(USER_11, true);
+
runWithCaller(CALLING_PACKAGE_2, USER_11, () -> {
mManager.updateShortcuts(list());
});
}
+ public void testUpdateShortcuts_icons() {
+ runWithCaller(CALLING_PACKAGE_1, UserHandle.USER_SYSTEM, () -> {
+ assertTrue(mManager.setDynamicShortcuts(list(
+ makeShortcut("s1")
+ )));
+
+ // Set resource icon
+ assertTrue(mManager.updateShortcuts(list(
+ new ShortcutInfo.Builder(mClientContext, "s1")
+ .setIcon(Icon.createWithResource(getTestContext(), R.drawable.black_32x32))
+ .build()
+ )));
+
+ assertWith(getCallerShortcuts())
+ .forShortcutWithId("s1", si -> {
+ assertTrue(si.hasIconResource());
+ assertEquals(R.drawable.black_32x32, si.getIconResourceId());
+ });
+
+ // Set bitmap icon
+ assertTrue(mManager.updateShortcuts(list(
+ new ShortcutInfo.Builder(mClientContext, "s1")
+ .setIcon(Icon.createWithBitmap(BitmapFactory.decodeResource(
+ getTestContext().getResources(), R.drawable.black_64x64)))
+ .build()
+ )));
+
+ assertWith(getCallerShortcuts())
+ .forShortcutWithId("s1", si -> {
+ assertTrue(si.hasIconFile());
+ });
+
+ mInjectedCurrentTimeMillis += INTERVAL; // reset throttling
+
+ // Do it again, with the reverse order (bitmap -> icon)
+ assertTrue(mManager.setDynamicShortcuts(list(
+ makeShortcut("s1")
+ )));
+
+ // Set bitmap icon
+ assertTrue(mManager.updateShortcuts(list(
+ new ShortcutInfo.Builder(mClientContext, "s1")
+ .setIcon(Icon.createWithBitmap(BitmapFactory.decodeResource(
+ getTestContext().getResources(), R.drawable.black_64x64)))
+ .build()
+ )));
+
+ assertWith(getCallerShortcuts())
+ .forShortcutWithId("s1", si -> {
+ assertTrue(si.hasIconFile());
+ });
+
+ // Set resource icon
+ assertTrue(mManager.updateShortcuts(list(
+ new ShortcutInfo.Builder(mClientContext, "s1")
+ .setIcon(Icon.createWithResource(getTestContext(), R.drawable.black_32x32))
+ .build()
+ )));
+
+ assertWith(getCallerShortcuts())
+ .forShortcutWithId("s1", si -> {
+ assertTrue(si.hasIconResource());
+ assertEquals(R.drawable.black_32x32, si.getIconResourceId());
+ });
+ });
+ }
+
// === Test for launcher side APIs ===
public void testGetShortcuts() {
@@ -1608,22 +1679,33 @@
// Get pinned shortcuts from launcher
runWithCaller(LAUNCHER_1, USER_0, () -> {
- // CALLING_PACKAGE_1 deleted s2, but it's pinned, so it still exists.
- assertShortcutIds(assertAllPinned(assertAllNotKeyFieldsOnly(assertAllDisabled(
- mLauncherApps.getShortcuts(buildQuery(/* time =*/ 0, CALLING_PACKAGE_1,
- /* activity =*/ null, ShortcutQuery.FLAG_GET_PINNED), getCallingUser())))),
- "s2");
- assertFalse(mLauncherApps.startShortcut(
- CALLING_PACKAGE_1, "s2", null, null, HANDLE_USER_0));
+ // CALLING_PACKAGE_1 deleted s2, but it's pinned, so it still exists, and disabled.
+ assertWith(mLauncherApps.getShortcuts(buildQuery(/* time =*/ 0, CALLING_PACKAGE_1,
+ /* activity =*/ null, ShortcutQuery.FLAG_GET_PINNED), getCallingUser()))
+ .haveIds("s2")
+ .areAllPinned()
+ .areAllNotWithKeyFieldsOnly()
+ .areAllDisabled();
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_0,
+ ActivityNotFoundException.class);
- assertShortcutIds(assertAllPinned(assertAllNotKeyFieldsOnly(
- mLauncherApps.getShortcuts(buildQuery(/* time =*/ 0, CALLING_PACKAGE_2,
- /* activity =*/ null, ShortcutQuery.FLAG_GET_PINNED), getCallingUser()))),
- "s3", "s4");
- assertFalse(mLauncherApps.startShortcut(
- CALLING_PACKAGE_2, "s3", null, null, HANDLE_USER_0));
- assertTrue(mLauncherApps.startShortcut(
- CALLING_PACKAGE_2, "s4", null, null, HANDLE_USER_0));
+ // Here, s4 is still enabled and launchable, but s3 is disabled.
+ assertWith(mLauncherApps.getShortcuts(buildQuery(/* time =*/ 0, CALLING_PACKAGE_2,
+ /* activity =*/ null, ShortcutQuery.FLAG_GET_PINNED), getCallingUser()))
+ .haveIds("s3", "s4")
+ .areAllPinned()
+ .areAllNotWithKeyFieldsOnly()
+
+ .selectByIds("s3")
+ .areAllDisabled()
+
+ .revertToOriginalList()
+ .selectByIds("s4")
+ .areAllEnabled();
+
+ assertStartShortcutThrowsException(CALLING_PACKAGE_2, "s3", USER_0,
+ ActivityNotFoundException.class);
+ assertShortcutLaunchable(CALLING_PACKAGE_2, "s4", USER_0);
assertShortcutIds(assertAllPinned(assertAllNotKeyFieldsOnly(assertAllEnabled(
mLauncherApps.getShortcuts(buildQuery(/* time =*/ 0, CALLING_PACKAGE_3,
@@ -1643,8 +1725,77 @@
mLauncherApps.getShortcuts(buildQuery(/* time =*/ 0, CALLING_PACKAGE_1,
/* activity =*/ null, ShortcutQuery.FLAG_GET_PINNED), getCallingUser())))),
"s2");
- assertTrue(mLauncherApps.startShortcut(
- CALLING_PACKAGE_1, "s2", null, null, HANDLE_USER_0));
+ assertShortcutLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
+ });
+ }
+
+ public void testDisableShortcuts_thenRepublish() {
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.setDynamicShortcuts(list(
+ makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"))));
+
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ mLauncherApps.pinShortcuts(
+ CALLING_PACKAGE_1, list("s1", "s2", "s3"), HANDLE_USER_0);
+ });
+
+ mManager.disableShortcuts(list("s1", "s2", "s3"));
+
+ assertWith(getCallerShortcuts())
+ .haveIds("s1", "s2", "s3")
+ .areAllNotDynamic()
+ .areAllPinned()
+ .areAllDisabled();
+
+ // Make sure updateShortcuts() will not re-enable them.
+ assertTrue(mManager.updateShortcuts(list(
+ makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"))));
+
+ assertWith(getCallerShortcuts())
+ .haveIds("s1", "s2", "s3")
+ .areAllNotDynamic()
+ .areAllPinned()
+ .areAllDisabled();
+
+ // Re-publish s1 with setDynamicShortcuts.
+ mInjectedCurrentTimeMillis += INTERVAL; // reset throttling
+
+ assertTrue(mManager.setDynamicShortcuts(list(
+ makeShortcut("s1"))));
+
+ assertWith(getCallerShortcuts())
+ .haveIds("s1", "s2", "s3")
+
+ .selectByIds("s1")
+ .areAllDynamic()
+ .areAllPinned()
+ .areAllEnabled()
+
+ .revertToOriginalList()
+ .selectByIds("s2", "s3")
+ .areAllNotDynamic()
+ .areAllPinned()
+ .areAllDisabled();
+
+ // Re-publish s2 with addDynamicShortcuts.
+ mInjectedCurrentTimeMillis += INTERVAL; // reset throttling
+
+ assertTrue(mManager.addDynamicShortcuts(list(
+ makeShortcut("s2"))));
+
+ assertWith(getCallerShortcuts())
+ .haveIds("s1", "s2", "s3")
+
+ .selectByIds("s1", "s2")
+ .areAllDynamic()
+ .areAllPinned()
+ .areAllEnabled()
+
+ .revertToOriginalList()
+ .selectByIds("s3")
+ .areAllNotDynamic()
+ .areAllPinned()
+ .areAllDisabled();
});
}
@@ -1909,6 +2060,9 @@
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"))));
});
+
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"),
@@ -1984,12 +2138,18 @@
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_1, USER_P0, () -> {
assertShortcutIds(assertAllPinned(
@@ -2026,12 +2186,18 @@
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_2, USER_P0, () -> {
assertShortcutIds(assertAllPinned(
@@ -2068,12 +2234,18 @@
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_2, USER_10, () -> {
assertShortcutIds(assertAllPinned(
@@ -2133,19 +2305,27 @@
"s1", "s2", "s3");
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_0,
+ ActivityNotFoundException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_1, USER_P0, () -> {
assertShortcutIds(assertAllPinned(
@@ -2176,18 +2356,25 @@
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_2, USER_P0, () -> {
assertShortcutIds(assertAllPinned(
@@ -2217,19 +2404,27 @@
"s1", "s3");
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_2, "s2", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_2, USER_10, () -> {
assertShortcutIds(assertAllPinned(
@@ -2245,20 +2440,29 @@
/* activity =*/ null, PIN_AND_DYNAMIC), HANDLE_USER_10)),
"s1", "s2", "s3");
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_0,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_0,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_0,
+ SecurityException.class);
- assertShortcutNotLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_2, "s1", USER_0,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_2, "s2", USER_0,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_2, "s3", USER_0,
+ SecurityException.class);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ ActivityNotFoundException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ ActivityNotFoundException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ ActivityNotFoundException.class);
});
// Save & load and make sure we still have the same information.
@@ -2294,19 +2498,27 @@
"s1", "s2", "s3");
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_0,
+ ActivityNotFoundException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_1, USER_P0, () -> {
assertShortcutIds(assertAllPinned(
@@ -2337,18 +2549,25 @@
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
runWithCaller(LAUNCHER_2, USER_P0, () -> {
assertShortcutIds(assertAllPinned(
@@ -2378,80 +2597,159 @@
"s1", "s3");
assertShortcutLaunchable(CALLING_PACKAGE_1, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s1", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_2, "s2", USER_0);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_2, "s2", USER_0,
+ ActivityNotFoundException.class);
assertShortcutLaunchable(CALLING_PACKAGE_2, "s3", USER_0);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s1", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s2", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s3", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s4", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s5", USER_10);
- assertShortcutNotLaunchable(CALLING_PACKAGE_1, "s6", USER_10);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s2", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s3", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s4", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s5", USER_10,
+ SecurityException.class);
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s6", USER_10,
+ SecurityException.class);
});
}
public void testStartShortcut() {
// Create some shortcuts.
- setCaller(CALLING_PACKAGE_1);
- final ShortcutInfo s1_1 = makeShortcut(
- "s1",
- "Title 1",
- makeComponent(ShortcutActivity.class),
- /* icon =*/ null,
- makeIntent(Intent.ACTION_ASSIST, ShortcutActivity2.class,
- "key1", "val1", "nest", makeBundle("key", 123)),
- /* weight */ 10);
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ final ShortcutInfo s1_1 = makeShortcut(
+ "s1",
+ "Title 1",
+ makeComponent(ShortcutActivity.class),
+ /* icon =*/ null,
+ new Intent[] {makeIntent(Intent.ACTION_ASSIST, ShortcutActivity2.class,
+ "key1", "val1", "nest", makeBundle("key", 123))
+ .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK),
+ new Intent("act2").setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)},
+ /* rank */ 10);
- final ShortcutInfo s1_2 = makeShortcut(
- "s2",
- "Title 2",
- /* activity */ null,
- /* icon =*/ null,
- makeIntent(Intent.ACTION_ASSIST, ShortcutActivity3.class),
- /* weight */ 12);
+ final ShortcutInfo s1_2 = makeShortcut(
+ "s2",
+ "Title 2",
+ /* activity */ null,
+ /* icon =*/ null,
+ makeIntent(Intent.ACTION_ASSIST, ShortcutActivity3.class),
+ /* rank */ 12);
- assertTrue(mManager.setDynamicShortcuts(list(s1_1, s1_2)));
+ final ShortcutInfo s1_3 = makeShortcut("s3");
- setCaller(CALLING_PACKAGE_2);
- final ShortcutInfo s2_1 = makeShortcut(
- "s1",
- "ABC",
- makeComponent(ShortcutActivity.class),
- /* icon =*/ null,
- makeIntent(Intent.ACTION_ANSWER, ShortcutActivity.class,
- "key1", "val1", "nest", makeBundle("key", 123)),
- /* weight */ 10);
- assertTrue(mManager.setDynamicShortcuts(list(s2_1)));
+ assertTrue(mManager.setDynamicShortcuts(list(s1_1, s1_2, s1_3)));
+ });
- // Pin all.
- setCaller(LAUNCHER_1);
- mLauncherApps.pinShortcuts(CALLING_PACKAGE_1,
- list("s1", "s2"), getCallingUser());
+ runWithCaller(CALLING_PACKAGE_2, USER_0, () -> {
+ final ShortcutInfo s2_1 = makeShortcut(
+ "s1",
+ "ABC",
+ makeComponent(ShortcutActivity.class),
+ /* icon =*/ null,
+ makeIntent(Intent.ACTION_ANSWER, ShortcutActivity.class,
+ "key1", "val1", "nest", makeBundle("key", 123)),
+ /* weight */ 10);
+ assertTrue(mManager.setDynamicShortcuts(list(s2_1)));
+ });
- mLauncherApps.pinShortcuts(CALLING_PACKAGE_2,
- list("s1"), getCallingUser());
+ // Pin some.
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ mLauncherApps.pinShortcuts(CALLING_PACKAGE_1,
+ list("s1", "s2"), getCallingUser());
+
+ mLauncherApps.pinShortcuts(CALLING_PACKAGE_2,
+ list("s1"), getCallingUser());
+ });
// Just to make it complicated, delete some.
- setCaller(CALLING_PACKAGE_1);
- mManager.removeDynamicShortcuts(list("s2"));
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ mManager.removeDynamicShortcuts(list("s2"));
+ });
- // intent and check.
- setCaller(LAUNCHER_1);
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ final Intent[] intents = launchShortcutAndGetIntents(CALLING_PACKAGE_1, "s1", USER_0);
+ assertEquals(ShortcutActivity2.class.getName(),
+ intents[0].getComponent().getClassName());
+ assertEquals(Intent.ACTION_ASSIST,
+ intents[0].getAction());
+ assertEquals(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK,
+ intents[0].getFlags());
- Intent intent;
- intent = launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s1", USER_0);
- assertEquals(ShortcutActivity2.class.getName(), intent.getComponent().getClassName());
+ assertEquals("act2",
+ intents[1].getAction());
+ assertEquals(Intent.FLAG_ACTIVITY_NO_ANIMATION,
+ intents[1].getFlags());
+ assertEquals(
+ ShortcutActivity3.class.getName(),
+ launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s2", USER_0)
+ .getComponent().getClassName());
+ assertEquals(
+ ShortcutActivity.class.getName(),
+ launchShortcutAndGetIntent(CALLING_PACKAGE_2, "s1", USER_0)
+ .getComponent().getClassName());
- intent = launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s2", USER_0);
- assertEquals(ShortcutActivity3.class.getName(), intent.getComponent().getClassName());
+ assertShortcutLaunchable(CALLING_PACKAGE_1, "s3", USER_0);
- intent = launchShortcutAndGetIntent(CALLING_PACKAGE_2, "s1", USER_0);
- assertEquals(ShortcutActivity.class.getName(), intent.getComponent().getClassName());
+ assertShortcutNotLaunched("no-such-package", "s2", USER_0);
+ assertShortcutNotLaunched(CALLING_PACKAGE_1, "xxxx", USER_0);
+ });
+
+ // LAUNCHER_1 is no longer the default launcher
+ setDefaultLauncherChecker((pkg, userId) -> false);
+
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ // Not the default launcher, but pinned shortcuts are still lauchable.
+ final Intent[] intents = launchShortcutAndGetIntents(CALLING_PACKAGE_1, "s1", USER_0);
+ assertEquals(ShortcutActivity2.class.getName(),
+ intents[0].getComponent().getClassName());
+ assertEquals(Intent.ACTION_ASSIST,
+ intents[0].getAction());
+ assertEquals(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK,
+ intents[0].getFlags());
+
+ assertEquals("act2",
+ intents[1].getAction());
+ assertEquals(Intent.FLAG_ACTIVITY_NO_ANIMATION,
+ intents[1].getFlags());
+ assertEquals(
+ ShortcutActivity3.class.getName(),
+ launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s2", USER_0)
+ .getComponent().getClassName());
+ assertEquals(
+ ShortcutActivity.class.getName(),
+ launchShortcutAndGetIntent(CALLING_PACKAGE_2, "s1", USER_0)
+ .getComponent().getClassName());
+
+ // Not pinned, so not lauchable.
+ });
+
+ // Test inner errors.
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ // Not launchable.
+ doReturn(ActivityManager.START_CLASS_NOT_FOUND)
+ .when(mMockActivityManagerInternal).startActivitiesAsPackage(
+ anyString(), anyInt(), any(Intent[].class), any(Bundle.class));
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_0,
+ ActivityNotFoundException.class);
+
+ // Still not launchable.
+ doReturn(ActivityManager.START_CLASS_NOT_FOUND)
+ .when(mMockActivityManagerInternal)
+ .startActivitiesAsPackage(
+ anyString(), anyInt(), any(Intent[].class), any(Bundle.class));
+ assertStartShortcutThrowsException(CALLING_PACKAGE_1, "s1", USER_0,
+ ActivityNotFoundException.class);
+ });
+
// TODO Check extra, etc
}
@@ -2486,6 +2784,8 @@
.areAllWithKeyFieldsOnly()
.areAllDynamic();
+ mRunningUsers.put(USER_10, true);
+
// Different user, callback shouldn't be called.
assertForLauncherCallback(mLauncherApps, () -> {
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -2697,27 +2997,7 @@
assertCallbackReceived(cP0_1, HANDLE_USER_0, CALLING_PACKAGE_3,
"s1", "s2", "s3", "s4", "s5", "s6");
- // Work profile, but not running, so don't send notifications.
-
- resetAll(all);
- runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> {
- mManager.removeDynamicShortcuts(list());
- });
- waitOnMainThread();
-
- assertCallbackNotReceived(c0_1);
- assertCallbackNotReceived(c0_2);
- assertCallbackNotReceived(c0_3);
- assertCallbackNotReceived(c0_4);
- assertCallbackNotReceived(cP0_1);
- assertCallbackNotReceived(c10_1);
- assertCallbackNotReceived(c10_2);
- assertCallbackNotReceived(c11_1);
-
- // Work profile, now running.
- doAnswer(new AnswerIsUserRunning(false)).when(mMockUserManager).isUserRunning(anyInt());
- doAnswer(new AnswerIsUserRunning(true)).when(mMockUserManager).isUserRunning(eq(USER_P0));
-
+ // Work profile.
resetAll(all);
runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> {
mManager.removeDynamicShortcuts(list());
@@ -2734,9 +3014,7 @@
assertCallbackReceived(cP0_1, HANDLE_USER_P0, CALLING_PACKAGE_1, "s1", "s2", "s3", "s4");
// Normal secondary user.
-
- doAnswer(new AnswerIsUserRunning(false)).when(mMockUserManager).isUserRunning(anyInt());
- doAnswer(new AnswerIsUserRunning(true)).when(mMockUserManager).isUserRunning(eq(USER_10));
+ mRunningUsers.put(USER_10, true);
resetAll(all);
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -2830,6 +3108,9 @@
assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
assertEquals(2, mManager.getRemainingCallCount());
});
+
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
final Icon icon1 = Icon.createWithResource(getTestContext(), R.drawable.black_64x64);
final Icon icon2 = Icon.createWithBitmap(BitmapFactory.decodeResource(
@@ -2858,7 +3139,7 @@
assertEquals(2, mManager.getRemainingCallCount());
});
- mService.getShortcutsForTest().get(UserHandle.USER_SYSTEM).setDefaultLauncherComponent(
+ mService.getShortcutsForTest().get(UserHandle.USER_SYSTEM).setLauncher(
new ComponentName("pkg1", "class"));
// Restore.
@@ -2892,7 +3173,7 @@
});
assertEquals("pkg1", mService.getShortcutsForTest().get(UserHandle.USER_SYSTEM)
- .getDefaultLauncherComponent().getPackageName());
+ .getLastKnownLauncher().getPackageName());
// Start another user
mService.handleUnlockUser(USER_10);
@@ -2908,7 +3189,7 @@
assertEquals("title10-1-1", getCallerShortcut("s1").getTitle());
assertEquals("title10-1-2", getCallerShortcut("s2").getTitle());
});
- assertNull(mService.getShortcutsForTest().get(USER_10).getDefaultLauncherComponent());
+ assertNull(mService.getShortcutsForTest().get(USER_10).getLastKnownLauncher());
// Try stopping the user
mService.handleCleanupUser(USER_10);
@@ -2941,6 +3222,8 @@
HANDLE_USER_0);
});
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcut("s10_1"))));
@@ -3199,7 +3482,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -3216,7 +3499,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -3276,6 +3559,9 @@
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"))));
});
+
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcut("s1"), makeShortcut("s2"), makeShortcut("s3"))));
@@ -3578,7 +3864,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
assertWith(getCallerShortcuts())
@@ -3594,6 +3880,8 @@
setCaller(CALLING_PACKAGE_3, USER_0);
assertTrue(mManager.addDynamicShortcuts(list(makeShortcutWithIcon("s1", bmp32x32))));
+ mRunningUsers.put(USER_10, true);
+
setCaller(CALLING_PACKAGE_1, USER_10);
assertTrue(mManager.addDynamicShortcuts(list(makeShortcutWithIcon("s1", bmp32x32))));
@@ -3618,7 +3906,7 @@
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_3, USER_10));
uninstallPackage(USER_0, CALLING_PACKAGE_1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageDeleteIntent(CALLING_PACKAGE_1, USER_0));
assertNull(mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "s1", USER_0));
@@ -3635,8 +3923,10 @@
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_2, USER_10));
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_3, USER_10));
+ mRunningUsers.put(USER_10, true);
+
uninstallPackage(USER_10, CALLING_PACKAGE_2);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageDeleteIntent(CALLING_PACKAGE_2, USER_10));
assertNull(mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "s1", USER_0));
@@ -3704,6 +3994,8 @@
setCaller(CALLING_PACKAGE_3, USER_0);
assertTrue(mManager.addDynamicShortcuts(list(makeShortcutWithIcon("s1", bmp32x32))));
+ mRunningUsers.put(USER_10, true);
+
setCaller(CALLING_PACKAGE_1, USER_10);
assertTrue(mManager.addDynamicShortcuts(list(makeShortcutWithIcon("s1", bmp32x32))));
@@ -3727,7 +4019,7 @@
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_2, USER_10));
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_3, USER_10));
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageDataClear(CALLING_PACKAGE_1, USER_0));
assertNull(mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "s1", USER_0));
@@ -3744,7 +4036,9 @@
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_2, USER_10));
assertTrue(bitmapDirectoryExists(CALLING_PACKAGE_3, USER_10));
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mRunningUsers.put(USER_10, true);
+
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageDataClear(CALLING_PACKAGE_2, USER_10));
assertNull(mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "s1", USER_0));
@@ -3764,12 +4058,14 @@
public void testHandlePackageClearData_manifestRepublished() {
+ mRunningUsers.put(USER_10, true);
+
// Add two manifests and two dynamics.
addManifestShortcutResource(
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_10));
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -3826,6 +4122,8 @@
makeShortcutWithIcon("s1", res32x32))));
});
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
assertTrue(mManager.setDynamicShortcuts(list(
makeShortcutWithIcon("s1", res32x32),
@@ -3855,9 +4153,9 @@
reset(c0);
reset(c10);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_1, USER_0));
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_1, USER_10));
waitOnMainThread();
@@ -3878,7 +4176,7 @@
updatePackageVersion(CALLING_PACKAGE_1, 1);
// Then send the broadcast, to only user-0.
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_1, USER_0));
waitOnMainThread();
@@ -3909,12 +4207,14 @@
// notification to the launcher.
mInjectedCurrentTimeMillis = START_TIME + 200;
- doAnswer(new AnswerIsUserRunning(true)).when(mMockUserManager).isUserRunning(eq(USER_10));
+ mRunningUsers.put(USER_10, true);
reset(c0);
reset(c10);
mService.handleUnlockUser(USER_10);
+ waitOnMainThread();
+
shortcuts = ArgumentCaptor.forClass(List.class);
verify(c0, times(0)).onShortcutsChanged(
eq(CALLING_PACKAGE_1),
@@ -3941,7 +4241,7 @@
updatePackageVersion(CALLING_PACKAGE_2, 10);
// Then send the broadcast, to only user-0.
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_2, USER_0));
mService.handleUnlockUser(USER_10);
@@ -3965,7 +4265,7 @@
updatePackageVersion(CALLING_PACKAGE_3, 100);
// Then send the broadcast, to only user-0.
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_3, USER_0));
mService.handleUnlockUser(USER_10);
@@ -4047,7 +4347,7 @@
// Update the package.
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -4073,8 +4373,10 @@
addManifestShortcutResource(ACTIVITY1, R.xml.shortcut_1);
addManifestShortcutResource(ACTIVITY2, R.xml.shortcut_1_alt);
+ mRunningUsers.put(USER_10, true);
+
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_10));
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -4106,7 +4408,7 @@
});
// First, no changes.
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageChangedIntent(CALLING_PACKAGE_1, USER_10));
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -4129,7 +4431,7 @@
// Disable activity 1
mEnabledActivityChecker = (activity, userId) -> !ACTIVITY1.equals(activity);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageChangedIntent(CALLING_PACKAGE_1, USER_10));
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -4149,7 +4451,7 @@
// Re-enable activity 1.
// Manifest shortcuts will be re-published, but dynamic ones are not.
mEnabledActivityChecker = (activity, userId) -> true;
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageChangedIntent(CALLING_PACKAGE_1, USER_10));
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -4173,7 +4475,7 @@
// Disable activity 2
// Because "ms1-alt" and "s2" are both pinned, they will remain, but disabled.
mEnabledActivityChecker = (activity, userId) -> !ACTIVITY2.equals(activity);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageChangedIntent(CALLING_PACKAGE_1, USER_10));
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
@@ -4236,7 +4538,7 @@
setCaller(LAUNCHER_1, USER_0);
assertForLauncherCallback(mLauncherApps, () -> {
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageUpdateIntent(CALLING_PACKAGE_1, USER_0));
}).assertCallbackCalledForPackageAndUser(CALLING_PACKAGE_1, HANDLE_USER_0)
// Make sure the launcher gets callbacks.
@@ -4353,8 +4655,10 @@
final ShortcutUser user0 = mService.getUserShortcutsLocked(USER_0);
assertExistsAndShadow(user0.getAllPackagesForTest().get(CALLING_PACKAGE_1));
assertExistsAndShadow(user0.getAllPackagesForTest().get(CALLING_PACKAGE_2));
- assertExistsAndShadow(user0.getAllLaunchersForTest().get(PackageWithUser.of(USER_0, LAUNCHER_1)));
- assertExistsAndShadow(user0.getAllLaunchersForTest().get(PackageWithUser.of(USER_0, LAUNCHER_2)));
+ assertExistsAndShadow(user0.getAllLaunchersForTest().get(
+ PackageWithUser.of(USER_0, LAUNCHER_1)));
+ assertExistsAndShadow(user0.getAllLaunchersForTest().get(
+ PackageWithUser.of(USER_0, LAUNCHER_2)));
assertNull(user0.getAllPackagesForTest().get(CALLING_PACKAGE_3));
assertNull(user0.getAllLaunchersForTest().get(PackageWithUser.of(USER_0, LAUNCHER_3)));
@@ -4362,90 +4666,98 @@
installPackage(USER_0, CALLING_PACKAGE_1);
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
- assertEquals(0, mManager.getDynamicShortcuts().size());
- assertShortcutIds(assertAllPinned(
- mManager.getPinnedShortcuts()),
- "s1", "s2");
+ assertWith(getCallerVisibleShortcuts())
+ .selectDynamic()
+ .isEmpty()
+
+ .revertToOriginalList()
+ .selectPinned()
+ .haveIds("s1", "s2");
});
installPackage(USER_0, LAUNCHER_1);
runWithCaller(LAUNCHER_1, USER_0, () -> {
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0)),
- "s1");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
- /* empty, not restored */ );
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
- /* empty, not restored */ );
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s1");
- assertEquals(0, mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0).size());
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0))
+ .isEmpty();
});
installPackage(USER_0, CALLING_PACKAGE_2);
runWithCaller(CALLING_PACKAGE_2, USER_0, () -> {
- assertEquals(0, mManager.getDynamicShortcuts().size());
- assertShortcutIds(assertAllPinned(
- mManager.getPinnedShortcuts()),
- "s1", "s2", "s3");
+ assertWith(getCallerVisibleShortcuts())
+ .selectDynamic()
+ .isEmpty()
+
+ .revertToOriginalList()
+ .selectPinned()
+ .haveIds("s1", "s2", "s3");
});
runWithCaller(LAUNCHER_1, USER_0, () -> {
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0)),
- "s1");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0)),
- "s1", "s2");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
- /* empty, not restored */ );
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s1");
- assertEquals(0, mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0).size());
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s1", "s2");
+
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0))
+ .isEmpty();
});
// 3 shouldn't be backed up, so no pinned shortcuts.
installPackage(USER_0, CALLING_PACKAGE_3);
runWithCaller(CALLING_PACKAGE_3, USER_0, () -> {
- assertEquals(0, mManager.getDynamicShortcuts().size());
- assertEquals(0, mManager.getPinnedShortcuts().size());
+ assertWith(getCallerVisibleShortcuts())
+ .isEmpty();
});
// Launcher on a different profile shouldn't be restored.
runWithCaller(LAUNCHER_1, USER_P0, () -> {
- assertEquals(0,
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0)
- .size());
- assertEquals(0,
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0)
- .size());
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
- /* wasn't restored, so still empty */ );
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0))
+ .isEmpty();
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
+ .isEmpty();
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
+ .isEmpty();
});
// Package on a different profile, no restore.
installPackage(USER_P0, CALLING_PACKAGE_1);
runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> {
- assertEquals(0, mManager.getDynamicShortcuts().size());
- assertEquals(0, mManager.getPinnedShortcuts().size());
+ assertWith(getCallerVisibleShortcuts())
+ .isEmpty();
});
// Restore launcher 2 on user 0.
installPackage(USER_0, LAUNCHER_2);
runWithCaller(LAUNCHER_2, USER_0, () -> {
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0)),
- "s2");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0)),
- "s2", "s3");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
- /* wasn't restored, so still empty */ );
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s2");
- assertEquals(0, mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0).size());
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s2", "s3");
+
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0))
+ .isEmpty();
});
@@ -4453,33 +4765,33 @@
// make sure they still have the same result.
installPackage(USER_0, CALLING_PACKAGE_1);
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
- assertEquals(0, mManager.getDynamicShortcuts().size());
- assertShortcutIds(assertAllPinned(
- mManager.getPinnedShortcuts()),
- "s1", "s2");
+ assertWith(getCallerVisibleShortcuts())
+ .areAllPinned()
+ .haveIds("s1", "s2");
});
installPackage(USER_0, LAUNCHER_1);
runWithCaller(LAUNCHER_1, USER_0, () -> {
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0)),
- "s1");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0)),
- "s1", "s2");
- assertShortcutIds(assertAllPinned(
- mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
- /* wasn't restored, so still empty */ );
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s1");
- assertEquals(0, mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0).size());
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
+ .areAllPinned()
+ .haveIds("s1", "s2");
+
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0))
+ .isEmpty();
});
installPackage(USER_0, CALLING_PACKAGE_2);
runWithCaller(CALLING_PACKAGE_2, USER_0, () -> {
- assertEquals(0, mManager.getDynamicShortcuts().size());
- assertShortcutIds(assertAllPinned(
- mManager.getPinnedShortcuts()),
- "s1", "s2", "s3");
+ assertWith(getCallerVisibleShortcuts())
+ .areAllPinned()
+ .haveIds("s1", "s2", "s3");
});
}
@@ -4800,6 +5112,112 @@
});
}
+ public void testBackupAndRestore_disabled() {
+ prepareCrossProfileDataSet();
+
+ // Before doing backup & restore, disable s1.
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ mManager.disableShortcuts(list("s1"));
+ });
+
+ backupAndRestore();
+
+ // Below is copied from checkBackupAndRestore_success.
+
+ // Make sure non-system user is not restored.
+ final ShortcutUser userP0 = mService.getUserShortcutsLocked(USER_P0);
+ assertEquals(0, userP0.getAllPackagesForTest().size());
+ assertEquals(0, userP0.getAllLaunchersForTest().size());
+
+ // Make sure only "allowBackup" apps are restored, and are shadow.
+ final ShortcutUser user0 = mService.getUserShortcutsLocked(USER_0);
+ assertExistsAndShadow(user0.getAllPackagesForTest().get(CALLING_PACKAGE_1));
+ assertExistsAndShadow(user0.getAllPackagesForTest().get(CALLING_PACKAGE_2));
+ assertExistsAndShadow(user0.getAllLaunchersForTest().get(
+ PackageWithUser.of(USER_0, LAUNCHER_1)));
+ assertExistsAndShadow(user0.getAllLaunchersForTest().get(
+ PackageWithUser.of(USER_0, LAUNCHER_2)));
+
+ assertNull(user0.getAllPackagesForTest().get(CALLING_PACKAGE_3));
+ assertNull(user0.getAllLaunchersForTest().get(PackageWithUser.of(USER_0, LAUNCHER_3)));
+ assertNull(user0.getAllLaunchersForTest().get(PackageWithUser.of(USER_P0, LAUNCHER_1)));
+
+ installPackage(USER_0, CALLING_PACKAGE_1);
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertWith(getCallerVisibleShortcuts())
+ .areAllEnabled() // disabled shortcuts shouldn't be restored.
+
+ .selectDynamic()
+ .isEmpty()
+
+ .revertToOriginalList()
+ .selectPinned()
+ // s1 is not restored.
+ .haveIds("s2");
+ });
+
+ installPackage(USER_0, LAUNCHER_1);
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ // Note, s1 was pinned by launcher 1, but was disabled, so isn't restored.
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_1), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_2), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(buildAllQuery(CALLING_PACKAGE_3), HANDLE_USER_0))
+ .isEmpty();
+
+ assertWith(mLauncherApps.getShortcuts(QUERY_ALL, HANDLE_USER_P0))
+ .isEmpty();
+ });
+ }
+
+
+ public void testBackupAndRestore_manifestNotRestored() {
+ // Publish two manifest shortcuts.
+ addManifestShortcutResource(
+ new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
+ R.xml.shortcut_2);
+ updatePackageVersion(CALLING_PACKAGE_1, 1);
+ mService.mPackageMonitor.onReceive(mServiceContext,
+ genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
+
+ // Pin from launcher 1.
+ runWithCaller(LAUNCHER_1, USER_0, () -> {
+ mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, list("ms1", "ms2"), HANDLE_USER_0);
+ });
+
+ // Update and now ms2 is gone -> disabled.
+ addManifestShortcutResource(
+ new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
+ R.xml.shortcut_1);
+ updatePackageVersion(CALLING_PACKAGE_1, 1);
+ mService.mPackageMonitor.onReceive(mServiceContext,
+ genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
+
+ // Make sure the manifest shortcuts have been published.
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertWith(getCallerShortcuts())
+ .areAllPinned()
+ .haveIds("ms1", "ms2")
+
+ .selectByIds("ms1")
+ .areAllManifest()
+ .areAllEnabled()
+
+ .revertToOriginalList()
+ .selectByIds("ms2")
+ .areAllNotManifest()
+ .areAllDisabled();
+ });
+
+ // Now do the regular backup & restore test.
+ // The existence of the manifest shortcuts shouldn't affect the result.
+ prepareCrossProfileDataSet();
+ backupAndRestore();
+ }
+
public void testSaveAndLoad_crossProfile() {
prepareCrossProfileDataSet();
@@ -5033,6 +5451,8 @@
});
// Try on another user, with some packages uninstalled.
+ mRunningUsers.put(USER_10, true);
+
uninstallPackage(USER_10, CALLING_PACKAGE_1);
uninstallPackage(USER_10, CALLING_PACKAGE_3);
@@ -5213,6 +5633,8 @@
uninstallPackage(USER_10, CALLING_PACKAGE_4);
mService.handleUnlockUser(USER_0);
+
+ mRunningUsers.put(USER_10, true);
mService.handleUnlockUser(USER_10);
// Originally no manifest shortcuts.
@@ -5236,7 +5658,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5257,7 +5679,7 @@
new ComponentName(CALLING_PACKAGE_2, ShortcutActivity.class.getName()),
R.xml.shortcut_5);
updatePackageVersion(CALLING_PACKAGE_2, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_2, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5294,7 +5716,7 @@
new ComponentName(CALLING_PACKAGE_2, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageLastUpdateTime(CALLING_PACKAGE_2, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_2, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5327,9 +5749,36 @@
assertEmpty(mManager.getManifestShortcuts());
assertEmpty(mManager.getPinnedShortcuts());
});
- // Send PACKAGE_ADD broadcast to have Package 2 on user-10 publish manifest shortcuts.
+ // Send add broadcast, but the user is not running, so should be ignored.
+ mRunningUsers.put(USER_10, false);
+ mUnlockedUsers.put(USER_10, false);
+
mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_2, USER_10));
+ runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
+ // Don't use the mManager APIs to get shortcuts, because they'll trigger the package
+ // update check.
+ // So look the internal data directly using getCallerShortcuts().
+ assertEmpty(getCallerShortcuts());
+ });
+
+ // Try again, but the user is locked, so still ignored.
+ mRunningUsers.put(USER_10, true);
+ mService.mPackageMonitor.onReceive(getTestContext(),
+ genPackageAddIntent(CALLING_PACKAGE_2, USER_10));
+ runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
+ // Don't use the mManager APIs to get shortcuts, because they'll trigger the package
+ // update check.
+ // So look the internal data directly using getCallerShortcuts().
+ assertEmpty(getCallerShortcuts());
+ });
+
+ // Unlock the user, now it should work.
+ mUnlockedUsers.put(USER_10, true);
+
+ // Send PACKAGE_ADD broadcast to have Package 2 on user-10 publish manifest shortcuts.
+ mService.mPackageMonitor.onReceive(getTestContext(),
+ genPackageAddIntent(CALLING_PACKAGE_2, USER_10));
runWithCaller(CALLING_PACKAGE_2, USER_10, () -> {
assertShortcutIds(assertAllManifest(assertAllImmutable(assertAllEnabled(
@@ -5369,7 +5818,7 @@
R.xml.shortcut_5_reverse);
updatePackageLastUpdateTime(CALLING_PACKAGE_2, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_2, USER_0));
runWithCaller(CALLING_PACKAGE_2, USER_0, () -> {
@@ -5397,7 +5846,7 @@
new ComponentName(CALLING_PACKAGE_2, ShortcutActivity2.class.getName()),
R.xml.shortcut_0);
updatePackageLastUpdateTime(CALLING_PACKAGE_2, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_2, USER_0));
// No manifest shortcuts, and pinned ones are disabled.
@@ -5428,14 +5877,16 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_error_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Only the valid one is published.
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
- assertShortcutIds(assertAllManifest(assertAllImmutable(assertAllEnabled(
- mManager.getManifestShortcuts()))),
- "x1");
+ assertWith(getCallerShortcuts())
+ .areAllManifest()
+ .areAllImmutable()
+ .areAllEnabled()
+ .haveIds("x1");
});
// Package 1 updated, which has one valid manifest shortcut and one invalid.
@@ -5443,14 +5894,16 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_error_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Only the valid one is published.
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
- assertShortcutIds(assertAllManifest(assertAllImmutable(assertAllEnabled(
- mManager.getManifestShortcuts()))),
- "x2");
+ assertWith(getCallerShortcuts())
+ .areAllManifest()
+ .areAllImmutable()
+ .areAllEnabled()
+ .haveIds("x2");
});
// Package 1 updated, which has one valid manifest shortcut and one invalid.
@@ -5458,14 +5911,19 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_error_3);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Only the valid one is published.
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
- assertShortcutIds(assertAllManifest(assertAllImmutable(assertAllEnabled(
- mManager.getManifestShortcuts()))),
- "x3");
+ assertWith(getCallerShortcuts())
+ .areAllManifest()
+ .areAllImmutable()
+ .areAllEnabled()
+ .haveIds("x3")
+ .forShortcutWithId("x3", si -> {
+ assertEquals(set("cat2"), si.getCategories());
+ });
});
}
@@ -5474,7 +5932,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_error_4);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5489,11 +5947,41 @@
.areAllEnabled()
.forShortcutWithId("ms1", si -> {
assertTrue(si.isEnabled());
+ assertEquals(1, si.getIntents().length);
+
assertEquals("action1", si.getIntent().getAction());
+ assertEquals("value1", si.getIntent().getStringExtra("key1"));
+ assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK |
+ Intent.FLAG_ACTIVITY_CLEAR_TASK |
+ Intent.FLAG_ACTIVITY_TASK_ON_HOME, si.getIntent().getFlags());
+
+ assertEquals("action1", si.getIntents()[0].getAction());
+ assertEquals("value1", si.getIntents()[0].getStringExtra("key1"));
+ assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK |
+ Intent.FLAG_ACTIVITY_CLEAR_TASK |
+ Intent.FLAG_ACTIVITY_TASK_ON_HOME, si.getIntents()[0].getFlags());
})
.forShortcutWithId("ms2", si -> {
assertTrue(si.isEnabled());
- assertEquals("action2_1", si.getIntent().getAction());
+ assertEquals(2, si.getIntents().length);
+
+ // getIntent will return the last one.
+ assertEquals("action2_2", si.getIntent().getAction());
+ assertEquals("value2", si.getIntent().getStringExtra("key2"));
+ assertEquals(0, si.getIntent().getFlags());
+
+ final Intent i1 = si.getIntents()[0];
+ final Intent i2 = si.getIntents()[1];
+
+ assertEquals("action2_1", i1.getAction());
+ assertEquals("value1", i1.getStringExtra("key1"));
+ assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK |
+ Intent.FLAG_ACTIVITY_CLEAR_TASK |
+ Intent.FLAG_ACTIVITY_TASK_ON_HOME, i1.getFlags());
+
+ assertEquals("action2_2", i2.getAction());
+ assertEquals("value2", i2.getStringExtra("key2"));
+ assertEquals(0, i2.getFlags());
});
});
@@ -5502,7 +5990,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_5);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5540,7 +6028,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_error_4);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Make sure 3, 4 and 5 still exist but disabled.
@@ -5566,7 +6054,8 @@
assertEquals(si.getId(), "action1", si.getIntent().getAction());
})
.forShortcutWithId("ms2", si -> {
- assertEquals(si.getId(), "action2_1", si.getIntent().getAction());
+ // getIntent returns the last one.
+ assertEquals(si.getId(), "action2_2", si.getIntent().getAction());
})
.forShortcutWithId("ms3", si -> {
assertEquals(si.getId(), Intent.ACTION_VIEW, si.getIntent().getAction());
@@ -5588,7 +6077,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_5);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Only the valid one is published.
@@ -5685,7 +6174,7 @@
});
}
- public void testManifestShortcuts_localeChange() {
+ public void testManifestShortcuts_localeChange() throws InterruptedException {
mService.handleUnlockUser(USER_0);
// Package 1 updated, which has one valid manifest shortcut and one invalid.
@@ -5693,7 +6182,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5741,8 +6230,15 @@
mInjectedCurrentTimeMillis++;
+ // Change the locale and send the broadcast, make sure the launcher gets a callback too.
mInjectedLocale = Locale.JAPANESE;
- mInternal.onSystemLocaleChangedNoLock();
+
+ setCaller(LAUNCHER_1, USER_0);
+
+ assertForLauncherCallback(mLauncherApps, () -> {
+ mService.mReceiver.onReceive(mServiceContext, new Intent(Intent.ACTION_LOCALE_CHANGED));
+ }).assertCallbackCalledForPackageAndUser(CALLING_PACKAGE_1, HANDLE_USER_0)
+ .haveIds("ms1", "ms2", "s1");
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
// check first shortcut.
@@ -5790,7 +6286,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Only the valid one is published.
@@ -5809,7 +6305,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1_disable);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Because shortcut 1 wasn't pinned, it'll just go away.
@@ -5830,7 +6326,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Only the valid one is published.
@@ -5853,7 +6349,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1_disable);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
// Because shortcut 1 was pinned, it'll still exist as pinned, but disabled.
@@ -5886,7 +6382,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2_duplicate);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5916,7 +6412,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity2.class.getName()),
R.xml.shortcut_5);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -5988,7 +6484,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_5);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -6038,7 +6534,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(LAUNCHER_1, USER_0, () -> {
@@ -6049,7 +6545,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -6131,7 +6627,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_5);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
@@ -6201,7 +6697,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
assertEquals(2, mManager.getManifestShortcuts().size());
@@ -6327,7 +6823,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_2);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
assertEquals(2, mManager.getManifestShortcuts().size());
@@ -6476,7 +6972,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
R.xml.shortcut_1);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
assertEquals(1, mManager.getManifestShortcuts().size());
@@ -6496,7 +6992,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity2.class.getName()),
R.xml.shortcut_1_alt);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
assertEquals(3, mManager.getManifestShortcuts().size());
@@ -6516,7 +7012,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity2.class.getName()),
R.xml.shortcut_5_alt); // manifest has 5, but max is 3, so a2 will have 3.
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
assertEquals(5, mManager.getManifestShortcuts().size());
@@ -6535,7 +7031,7 @@
new ComponentName(CALLING_PACKAGE_1, ShortcutActivity2.class.getName()),
R.xml.shortcut_0);
updatePackageVersion(CALLING_PACKAGE_1, 1);
- mService.mPackageMonitor.onReceive(getTestContext(),
+ mService.mPackageMonitor.onReceive(getTestContext(),
genPackageAddIntent(CALLING_PACKAGE_1, USER_0));
assertEquals(0, mManager.getManifestShortcuts().size());
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
index f570ff2..ad5bc77 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
@@ -47,6 +47,14 @@
import com.android.frameworks.servicestests.R;
import com.android.server.pm.ShortcutService.ConfigConstants;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Locale;
+
/**
* Tests for ShortcutService and ShortcutManager.
*
@@ -84,7 +92,7 @@
assertExpectException(
RuntimeException.class,
- "intent cannot be null",
+ "intents cannot contain null",
() -> new ShortcutInfo.Builder(getTestContext(), "id").setIntent(null));
assertExpectException(
@@ -94,6 +102,12 @@
assertExpectException(
RuntimeException.class,
+ "action must be set",
+ () -> new ShortcutInfo.Builder(getTestContext(), "id")
+ .setIntents(new Intent[]{new Intent("action"), new Intent()}));
+
+ assertExpectException(
+ RuntimeException.class,
"activity cannot be null",
() -> new ShortcutInfo.Builder(getTestContext(), "id").setActivity(null));
@@ -130,7 +144,6 @@
assertExpectException(NullPointerException.class, "action must be set",
() -> new ShortcutInfo.Builder(getTestContext(), "id").setIntent(new Intent()));
- // same for add.
assertExpectException(
IllegalArgumentException.class, "Short label must be provided", () -> {
ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(), "id")
@@ -139,6 +152,7 @@
assertTrue(getManager().setDynamicShortcuts(list(si)));
});
+ // same for add.
assertExpectException(
IllegalArgumentException.class, "Short label must be provided", () -> {
ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(), "id")
@@ -147,7 +161,6 @@
assertTrue(getManager().addDynamicShortcuts(list(si)));
});
- // same for add.
assertExpectException(NullPointerException.class, "Intent must be provided", () -> {
ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(), "id")
.setActivity(new ComponentName(getTestContext().getPackageName(), "s"))
@@ -181,6 +194,33 @@
.build();
assertTrue(getManager().addDynamicShortcuts(list(si)));
});
+
+ // Now all activities are not main.
+ mMainActivityChecker = (component, userId) -> false;
+
+ assertExpectException(
+ IllegalStateException.class, "is not main", () -> {
+ ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(), "id")
+ .setActivity(new ComponentName(getTestContext(), "s"))
+ .build();
+ assertTrue(getManager().setDynamicShortcuts(list(si)));
+ });
+ // For add
+ assertExpectException(
+ IllegalStateException.class, "is not main", () -> {
+ ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(), "id")
+ .setActivity(new ComponentName(getTestContext(), "s"))
+ .build();
+ assertTrue(getManager().addDynamicShortcuts(list(si)));
+ });
+ // For update
+ assertExpectException(
+ IllegalStateException.class, "is not main", () -> {
+ ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(), "id")
+ .setActivity(new ComponentName(getTestContext(), "s"))
+ .build();
+ assertTrue(getManager().updateShortcuts(list(si)));
+ });
}
public void testShortcutInfoParcel() {
@@ -811,6 +851,8 @@
}
public void testShortcutInfoSaveAndLoad() throws InterruptedException {
+ mRunningUsers.put(USER_10, true);
+
setCaller(CALLING_PACKAGE_1, USER_10);
final Icon bmp32x32 = Icon.createWithBitmap(BitmapFactory.decodeResource(
@@ -847,11 +889,16 @@
final long now = mInjectedCurrentTimeMillis;
mInjectedCurrentTimeMillis += 1;
+ dumpsysOnLogcat("before save");
+
// Save and load.
mService.saveDirtyInfo();
initService();
mService.handleUnlockUser(USER_10);
+ dumpUserFile(USER_10);
+ dumpsysOnLogcat("after load");
+
ShortcutInfo si;
si = mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "id", USER_10);
@@ -880,9 +927,13 @@
// to test it.
si = mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "id2", USER_10);
assertEquals(1, si.getRank());
+
+ dumpUserFile(USER_10);
}
public void testShortcutInfoSaveAndLoad_resId() throws InterruptedException {
+ mRunningUsers.put(USER_10, true);
+
setCaller(CALLING_PACKAGE_1, USER_10);
final Icon res32x32 = Icon.createWithResource(mClientContext, R.drawable.black_32x32);
@@ -1101,7 +1152,30 @@
assertEquals(intent.getAction(), si.getIntent().getAction());
assertEquals(intent.getData(), si.getIntent().getData());
assertEquals(intent.getComponent(), si.getIntent().getComponent());
- assertBundlesEqual(intent.getExtras(), si.getExtras());
+ assertBundlesEqual(intent.getExtras(), si.getIntent().getExtras());
+ });
+ }
+
+ private void checkShortcutInfoSaveAndLoad_intents(Intent... intents) {
+ assertTrue(mManager.setDynamicShortcuts(list(
+ makeShortcutWithIntents("s1", intents))));
+ initService();
+ mService.handleUnlockUser(USER_0);
+
+ assertWith(getCallerShortcuts())
+ .haveIds("s1")
+ .forShortcutWithId("s1", si -> {
+
+ final Intent[] actual = si.getIntents();
+ assertEquals(intents.length, actual.length);
+
+ for (int i = 0; i < intents.length; i++) {
+ assertEquals(intents[i].getAction(), actual[i].getAction());
+ assertEquals(intents[i].getData(), actual[i].getData());
+ assertEquals(intents[i].getComponent(), actual[i].getComponent());
+ assertEquals(intents[i].getFlags(), actual[i].getFlags());
+ assertBundlesEqual(intents[i].getExtras(), actual[i].getExtras());
+ }
});
}
@@ -1144,6 +1218,30 @@
.putExtras(makeBundle("a", "b")));
mInjectedCurrentTimeMillis += INTERVAL; // reset throttling.
+
+ // Multi-intents
+ checkShortcutInfoSaveAndLoad_intents(
+ new Intent(Intent.ACTION_MAIN).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK),
+ new Intent(Intent.ACTION_VIEW).setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
+ );
+
+ checkShortcutInfoSaveAndLoad_intents(
+ new Intent(Intent.ACTION_MAIN).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+ .setComponent(new ComponentName("a", "b")),
+ new Intent(Intent.ACTION_VIEW)
+ .setComponent(new ComponentName("a", "b"))
+ );
+
+ checkShortcutInfoSaveAndLoad_intents(
+ new Intent(Intent.ACTION_MAIN)
+ .setComponent(new ComponentName("a", "b")),
+ new Intent(Intent.ACTION_VIEW).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+ .setComponent(new ComponentName("a", "b")),
+ new Intent("xyz").setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
+ | Intent.FILL_IN_COMPONENT)
+ .setComponent(new ComponentName("a", "b")).putExtras(
+ makeBundle("xx", "yy"))
+ );
}
public void testThrottling() {
@@ -1331,13 +1429,12 @@
mService.saveDirtyInfo();
initService();
- final long origSequenceNumber = mService.getLocaleChangeSequenceNumber();
-
- mInternal.onSystemLocaleChangedNoLock();
- assertEquals(origSequenceNumber + 1, mService.getLocaleChangeSequenceNumber());
+ mInjectedLocale = Locale.CHINA;
+ mService.mReceiver.onReceive(mServiceContext, new Intent(Intent.ACTION_LOCALE_CHANGED));
// Note at this point only user-0 is loaded, and the counters are reset for this user,
- // but it will work for other users too, because we persist when
+ // but it will work for other users too because we check the locale change at any
+ // API entry point.
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
assertEquals(3, mManager.getRemainingCallCount());
@@ -1358,11 +1455,28 @@
assertEquals(3, mManager.getRemainingCallCount());
});
+ // Make sure even if we receive ACTION_LOCALE_CHANGED, if the locale hasn't actually
+ // changed, we don't reset throttling.
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ mManager.updateShortcuts(list());
+ assertEquals(2, mManager.getRemainingCallCount());
+ });
+
+ mService.mReceiver.onReceive(mServiceContext, new Intent(Intent.ACTION_LOCALE_CHANGED));
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertEquals(2, mManager.getRemainingCallCount()); // Still 2.
+ });
+
mService.saveDirtyInfo();
initService();
- // Make sure the counter is persisted.
- assertEquals(origSequenceNumber + 1, mService.getLocaleChangeSequenceNumber());
+ // The locale should be persisted, so it still shouldn't reset throttling.
+ mService.mReceiver.onReceive(mServiceContext, new Intent(Intent.ACTION_LOCALE_CHANGED));
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertEquals(2, mManager.getRemainingCallCount()); // Still 2.
+ });
}
public void testThrottling_foreground() throws Exception {
@@ -1518,12 +1632,22 @@
ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE);
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
assertEquals(3, mManager.getRemainingCallCount());
+ assertFalse(mManager.isRateLimitingActive());
mManager.setDynamicShortcuts(list(makeShortcut("s")));
+
+ assertEquals(2, mManager.getRemainingCallCount());
+ assertFalse(mManager.isRateLimitingActive());
+
mManager.setDynamicShortcuts(list(makeShortcut("s")));
+
+ assertEquals(1, mManager.getRemainingCallCount());
+ assertFalse(mManager.isRateLimitingActive());
+
mManager.setDynamicShortcuts(list(makeShortcut("s")));
assertEquals(0, mManager.getRemainingCallCount());
+ assertTrue(mManager.isRateLimitingActive());
});
runWithCaller(CALLING_PACKAGE_2, USER_0, () -> {
assertEquals(3, mManager.getRemainingCallCount());
@@ -1533,6 +1657,7 @@
mManager.setDynamicShortcuts(list(makeShortcut("s")));
assertEquals(0, mManager.getRemainingCallCount());
+ assertTrue(mManager.isRateLimitingActive());
});
runWithCaller(CALLING_PACKAGE_3, USER_0, () -> {
MoreAsserts.assertNotEqual(3, mManager.getRemainingCallCount());
@@ -1542,6 +1667,7 @@
mManager.setDynamicShortcuts(list(makeShortcut("s")));
assertEquals(0, mManager.getRemainingCallCount());
+ assertTrue(mManager.isRateLimitingActive());
});
runWithCaller(CALLING_PACKAGE_4, USER_0, () -> {
MoreAsserts.assertNotEqual(3, mManager.getRemainingCallCount());
@@ -1551,6 +1677,7 @@
mManager.setDynamicShortcuts(list(makeShortcut("s")));
assertEquals(0, mManager.getRemainingCallCount());
+ assertTrue(mManager.isRateLimitingActive());
});
runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> {
MoreAsserts.assertNotEqual(3, mManager.getRemainingCallCount());
@@ -1560,6 +1687,7 @@
mManager.setDynamicShortcuts(list(makeShortcut("s")));
assertEquals(0, mManager.getRemainingCallCount());
+ assertTrue(mManager.isRateLimitingActive());
});
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
assertEquals(3, mManager.getRemainingCallCount());
@@ -1569,6 +1697,7 @@
mManager.setDynamicShortcuts(list(makeShortcut("s")));
assertEquals(3, mManager.getRemainingCallCount()); // Still 3!
+ assertFalse(mManager.isRateLimitingActive());
});
}
@@ -1669,6 +1798,8 @@
}
public void testReportShortcutUsed() {
+ mRunningUsers.put(USER_10, true);
+
runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
reset(mMockUsageStatsManagerInternal);
@@ -1808,4 +1939,70 @@
ShortcutInfo.lookUpResourceId(res, "drawable/black_16x64", null,
getTestContext().getPackageName()));
}
+
+ public void testDumpCheckin() throws IOException {
+ prepareCrossProfileDataSet();
+
+ // prepareCrossProfileDataSet() doesn't set any icons, so do set here.
+ final Icon res32x32 = Icon.createWithResource(getTestContext(), R.drawable.black_32x32);
+ final Icon res64x64 = Icon.createWithResource(getTestContext(), R.drawable.black_64x64);
+ final Icon bmp32x32 = Icon.createWithBitmap(BitmapFactory.decodeResource(
+ getTestContext().getResources(), R.drawable.black_32x32));
+ final Icon bmp64x64 = Icon.createWithBitmap(BitmapFactory.decodeResource(
+ getTestContext().getResources(), R.drawable.black_64x64));
+
+ runWithCaller(CALLING_PACKAGE_2, USER_0, () -> {
+ assertTrue(mManager.setDynamicShortcuts(list(
+ makeShortcutWithIcon("res32x32", res32x32),
+ makeShortcutWithIcon("res64x64", res64x64),
+ makeShortcutWithIcon("bmp32x32", bmp32x32),
+ makeShortcutWithIcon("bmp64x64", bmp64x64))));
+ });
+ // We can't predict the compressed bitmap sizes, so get the real sizes here.
+ final long bitmapTotal =
+ new File(getPackageShortcut(CALLING_PACKAGE_2, "bmp32x32", USER_0)
+ .getBitmapPath()).length() +
+ new File(getPackageShortcut(CALLING_PACKAGE_2, "bmp64x64", USER_0)
+ .getBitmapPath()).length();
+
+ // Read the expected output and inject the bitmap size.
+ final String expected = readTestAsset("shortcut/dumpsys_expected.txt")
+ .replace("***BITMAP_SIZE***", String.valueOf(bitmapTotal));
+
+ assertEquals(expected, dumpCheckin());
+ }
+
+ public void testDumpsysNoPermission() {
+ assertExpectException(SecurityException.class, "android.permission.DUMP",
+ () -> mService.dump(null, new PrintWriter(new StringWriter()), null));
+
+ // System can call it without the permission.
+ runWithSystemUid(() -> {
+ mService.dump(null, new PrintWriter(new StringWriter()), null);
+ });
+ }
+
+ /**
+ * Make sure the legacy file format that only supported a single intent per shortcut
+ * can still be read.
+ */
+ public void testLoadLegacySavedFile() throws Exception {
+ final File path = mService.getUserFile(USER_0);
+ path.getParentFile().mkdirs();
+ try (Writer w = new FileWriter(path)) {
+ w.write(readTestAsset("shortcut/shortcut_legacy_file.xml"));
+ };
+ initService();
+ mService.handleUnlockUser(USER_0);
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertWith(getCallerShortcuts())
+ .haveIds("manifest-shortcut-storage")
+ .forShortcutWithId("manifest-shortcut-storage", si -> {
+ assertEquals("android.settings.INTERNAL_STORAGE_SETTINGS",
+ si.getIntent().getAction());
+ assertEquals(12345, si.getIntent().getIntExtra("key", 0));
+ });
+ });
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest4.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest4.java
index a36c0ad..583c3d4 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest4.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest4.java
@@ -24,7 +24,9 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.PersistableBundle;
+import android.test.suitebuilder.annotation.SmallTest;
+@SmallTest
public class ShortcutManagerTest4 extends BaseShortcutManagerTest {
private static Bundle sIntentExtras = makeBundle(
@@ -98,7 +100,7 @@
);
public void testPersistingWeirdCharacters() {
- final Intent intent = new Intent(Intent.ACTION_VIEW)
+ final Intent intent = new Intent(Intent.ACTION_MAIN)
.putExtras(sIntentExtras);
runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java
new file mode 100644
index 0000000..29c98dc
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.pm;
+
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.set;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.ShortcutServiceInternal;
+import android.content.res.XmlResourceParser;
+import android.os.Looper;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.server.LocalServices;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Unit tests for all the IPackageManager related methods in {@link ShortcutService}.
+ *
+ * All the tests here actually talks to the real IPackageManager, so we can't test complicated
+ * cases. Instead we just make sure they all work reasonably without at least crashing.
+ */
+@SmallTest
+public class ShortcutManagerTest5 extends BaseShortcutManagerTest {
+ private ShortcutService mShortcutService;
+
+ private String mMyPackage;
+ private int mMyUserId;
+
+ public static class ShortcutEnabled extends Activity {
+ }
+
+ public static class ShortcutDisabled extends Activity {
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ LocalServices.removeServiceForTest(ShortcutServiceInternal.class);
+ mShortcutService = new ShortcutService(getTestContext(), Looper.getMainLooper(),
+ /* onyForPackageManagerApis */ true);
+
+ mMyPackage = getTestContext().getPackageName();
+ mMyUserId = android.os.Process.myUserHandle().getIdentifier();
+ }
+
+ public void testGetPackageUid() {
+ assertTrue(mShortcutService.injectGetPackageUid(
+ mMyPackage, mMyUserId) != 0);
+
+ assertEquals(-1, mShortcutService.injectGetPackageUid(
+ "no.such.package", mMyUserId));
+ }
+
+ public void testGetPackageInfo() {
+ PackageInfo pi = mShortcutService.getPackageInfo(
+ mMyPackage, mMyUserId, /*signature*/ false);
+ assertEquals(mMyPackage, pi.packageName);
+ assertNull(pi.signatures);
+
+ pi = mShortcutService.getPackageInfo(
+ mMyPackage, mMyUserId, /*signature*/ true);
+ assertEquals(mMyPackage, pi.packageName);
+ assertNotNull(pi.signatures);
+
+ pi = mShortcutService.getPackageInfo(
+ "no.such.package", mMyUserId, /*signature*/ true);
+ assertNull(pi);
+ }
+
+ public void testGetApplicationInfo() {
+ ApplicationInfo ai = mShortcutService.getApplicationInfo(
+ mMyPackage, mMyUserId);
+ assertEquals(mMyPackage, ai.packageName);
+
+ ai = mShortcutService.getApplicationInfo(
+ "no.such.package", mMyUserId);
+ assertNull(ai);
+ }
+
+ public void testGetActivityInfoWithMetadata() {
+ // Disabled activity
+ ActivityInfo ai = mShortcutService.getActivityInfoWithMetadata(
+ new ComponentName(mMyPackage, "ShortcutDisabled"), mMyUserId);
+ assertNull(ai);
+
+ // Nonexistent
+ ai = mShortcutService.getActivityInfoWithMetadata(
+ new ComponentName("no.such.package", "ShortcutDisabled"), mMyUserId);
+ assertNull(ai);
+
+ // Existent, with no metadata.
+ ai = mShortcutService.getActivityInfoWithMetadata(
+ new ComponentName(mMyPackage, "a.ShortcutEnabled"), mMyUserId);
+ assertEquals(mMyPackage, ai.packageName);
+ assertEquals("a.ShortcutEnabled", ai.name);
+ assertNull(ai.loadXmlMetaData(getTestContext().getPackageManager(),
+ "android.app.shortcuts"));
+
+ // Existent, with a shortcut metadata.
+ ai = mShortcutService.getActivityInfoWithMetadata(
+ new ComponentName(mMyPackage, "a.Shortcut1"), mMyUserId);
+ assertEquals(mMyPackage, ai.packageName);
+ assertEquals("a.Shortcut1", ai.name);
+ XmlResourceParser meta = ai.loadXmlMetaData(getTestContext().getPackageManager(),
+ "android.app.shortcuts");
+ assertNotNull(meta);
+ meta.close();
+ }
+
+ public void testGetInstalledPackages() {
+ List<PackageInfo> apks = mShortcutService.getInstalledPackages(mMyUserId);
+
+ Set<String> expectedPackages = set("com.android.settings", mMyPackage);
+ for (PackageInfo pi : apks) {
+ expectedPackages.remove(pi.packageName);
+ }
+ assertEquals(set(), expectedPackages);
+ }
+
+ public void testGetDefaultMainActivity() {
+ ComponentName cn = mShortcutService.injectGetDefaultMainActivity(
+ "com.android.settings", mMyUserId);
+
+ assertEquals(
+ ComponentName.unflattenFromString("com.android.settings/.Settings"),
+ cn);
+
+ // This package has no main activity.
+ assertNull(mShortcutService.injectGetDefaultMainActivity(
+ mMyPackage, mMyUserId));
+
+ // Nonexistent.
+ assertNull(mShortcutService.injectGetDefaultMainActivity(
+ "no.such.package", mMyUserId));
+ }
+
+ public void testIsMainActivity() {
+ assertTrue(mShortcutService.injectIsMainActivity(
+ ComponentName.unflattenFromString("com.android.settings/.Settings"), mMyUserId));
+ assertFalse(mShortcutService.injectIsMainActivity(
+ ComponentName.unflattenFromString("com.android.settings/.xxx"), mMyUserId));
+ assertFalse(mShortcutService.injectIsMainActivity(
+ ComponentName.unflattenFromString("no.such.package/.xxx"), mMyUserId));
+
+ assertFalse(mShortcutService.injectIsMainActivity(
+ new ComponentName(mMyPackage, "a.DisabledMain"), mMyUserId));
+ assertFalse(mShortcutService.injectIsMainActivity(
+ new ComponentName(mMyPackage, "a.UnexportedMain"), mMyUserId));
+
+ }
+
+ public void testGetMainActivities() {
+ assertEquals(1, mShortcutService.injectGetMainActivities(
+ "com.android.settings", mMyUserId).size());
+
+ // This APK has no main activities.
+ assertEquals(0, mShortcutService.injectGetMainActivities(
+ mMyPackage, mMyUserId).size());
+ }
+
+ public void testIsActivityEnabledAndExported() {
+ assertTrue(mShortcutService.injectIsActivityEnabledAndExported(
+ ComponentName.unflattenFromString("com.android.settings/.Settings"), mMyUserId));
+ assertFalse(mShortcutService.injectIsActivityEnabledAndExported(
+ ComponentName.unflattenFromString("com.android.settings/.xxx"), mMyUserId));
+ assertFalse(mShortcutService.injectIsActivityEnabledAndExported(
+ ComponentName.unflattenFromString("no.such.package/.xxx"), mMyUserId));
+
+ assertTrue(mShortcutService.injectIsActivityEnabledAndExported(
+ new ComponentName(mMyPackage, "com.android.server.pm.ShortcutTestActivity"),
+ mMyUserId));
+
+ assertTrue(mShortcutService.injectIsActivityEnabledAndExported(
+ new ComponentName(mMyPackage, "a.ShortcutEnabled"), mMyUserId));
+
+ assertFalse(mShortcutService.injectIsActivityEnabledAndExported(
+ new ComponentName(mMyPackage, "a.ShortcutDisabled"), mMyUserId));
+ assertFalse(mShortcutService.injectIsActivityEnabledAndExported(
+ new ComponentName(mMyPackage, "a.ShortcutUnexported"), mMyUserId));
+
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java
new file mode 100644
index 0000000..ba4dbc1
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.pm;
+
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.list;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import java.util.List;
+
+/**
+ * Tests for {@link ShortcutService#hasShortcutHostPermissionInner}.
+ */
+@SmallTest
+public class ShortcutManagerTest6 extends BaseShortcutManagerTest {
+ public void testHasShortcutHostPermissionInner_systemLauncherOnly() {
+ // Preferred isn't set, use the system launcher.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ null,
+ list(getSystemLauncher(), getFallbackLauncher()),
+ USER_0);
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_0));
+
+ // Should be cached.
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ // Also make sure the last known is saved, but the cached is not.
+
+ initService();
+
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(null,
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+ }
+
+ public void testHasShortcutHostPermissionInner_with3pLauncher() {
+ // Preferred isn't set, still use the system launcher.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ null,
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_0);
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_0));
+
+ // Should be cached.
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+ }
+
+ public void testHasShortcutHostPermissionInner_with3pLauncher_complicated() {
+ // Preferred is set. That's the default launcher.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ cn(CALLING_PACKAGE_2, "name"),
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_0);
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+ assertTrue(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_0));
+
+ // Should be cached.
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+
+ // Once set, even after the preferred launcher is cleared, SM still allows it to access
+ // shortcuts.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ null,
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_0);
+
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+ assertTrue(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_0));
+
+ // Should be cached.
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ // However, if the component has been disabled, then we'll recalculate it.
+ mEnabledActivityChecker = (comp, user) -> false;
+
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_0));
+
+ mEnabledActivityChecker = (comp, user) -> true;
+
+ // Now the preferred changed.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ cn(CALLING_PACKAGE_1, "xyz"),
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_0);
+
+ assertTrue(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+
+ // Should be cached.
+ assertEquals(cn(CALLING_PACKAGE_1, "xyz"),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(CALLING_PACKAGE_1, "xyz"),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+
+ // As long as there's the cached launcher set, even if getHomeActivitiesAsUser()
+ // returns different values, the cached one is still the default.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ getSystemLauncher().activityInfo.getComponentName(),
+ list(getSystemLauncher(), getFallbackLauncher()),
+ USER_0);
+
+ assertTrue(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+
+ // Cached ones haven't changed.
+ assertEquals(cn(CALLING_PACKAGE_1, "xyz"),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(CALLING_PACKAGE_1, "xyz"),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ // However, now the "real" default launcher is the system one. So if the system
+ // launcher asks for shortcuts, we'll allow it.
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+
+ // Since the cache is updated, CALLING_PACKAGE_1 no longer has the permission.
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+
+ // Cached ones haven't changed.
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+ }
+
+ public void testHasShortcutHostPermissionInner_multiUser() {
+ mRunningUsers.put(USER_10, true);
+
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ null,
+ list(getSystemLauncher(), getFallbackLauncher()),
+ USER_0);
+
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ cn(CALLING_PACKAGE_2, "name"),
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_10);
+
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_0));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_0));
+
+ // Check the cache.
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getLastKnownLauncher());
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_10));
+ assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_FALLBACK_LAUNCHER, USER_10));
+ assertFalse(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_1, USER_10));
+ assertTrue(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_10));
+
+ // Check the cache.
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_10).getLastKnownLauncher());
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_10).getCachedLauncher());
+ }
+
+ public void testHasShortcutHostPermissionInner_clearCache() {
+ mRunningUsers.put(USER_10, true);
+
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ null,
+ list(getSystemLauncher(), getFallbackLauncher()),
+ USER_0);
+
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ cn(CALLING_PACKAGE_2, "name"),
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_10);
+
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+ assertTrue(mService.hasShortcutHostPermissionInner(CALLING_PACKAGE_2, USER_10));
+
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_10).getCachedLauncher());
+
+ // Test it on a non-running user.
+ // Send ACTION_PREFERRED_ACTIVITY_CHANGED on user 10.
+ // But the user is not running, so will be ignored.
+ mRunningUsers.put(USER_10, false);
+
+ mService.mPackageMonitor.onReceive(mServiceContext,
+ new Intent(Intent.ACTION_PREFERRED_ACTIVITY_CHANGED).putExtra(
+ Intent.EXTRA_USER_HANDLE, USER_10));
+
+ // Need to run the user again to access the internal status.
+ mRunningUsers.put(USER_10, true);
+
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ assertEquals(cn(CALLING_PACKAGE_2, "name"),
+ mService.getUserShortcutsLocked(USER_10).getCachedLauncher());
+
+ // Send it again after starting the user.
+ mRunningUsers.put(USER_10, true);
+ mService.mPackageMonitor.onReceive(mServiceContext,
+ new Intent(Intent.ACTION_PREFERRED_ACTIVITY_CHANGED).putExtra(
+ Intent.EXTRA_USER_HANDLE, USER_10));
+
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ // Only user-10's cache is cleared.
+ assertEquals(null,
+ mService.getUserShortcutsLocked(USER_10).getCachedLauncher());
+
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java
new file mode 100644
index 0000000..3c99174
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.pm;
+
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertContains;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertExpectException;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertSuccess;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertWith;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.list;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.readAll;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.resultContains;
+
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.ResultReceiver;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.frameworks.servicestests.R;
+import com.android.server.pm.ShortcutService.ConfigConstants;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Unit test for "cmd shortcut"
+ *
+ * Launcher related commands are tested in
+ */
+@SmallTest
+public class ShortcutManagerTest7 extends BaseShortcutManagerTest {
+ private List<String> callShellCommand(String... args) throws IOException, RemoteException {
+
+ // For reset to work, the current time needs to be incrementing.
+ mInjectedCurrentTimeMillis++;
+
+ final AtomicInteger resultCode = new AtomicInteger(Integer.MIN_VALUE);
+
+ final ResultReceiver rr = new ResultReceiver(mHandler) {
+ @Override
+ public void send(int resultCode_, Bundle resultData) {
+ resultCode.set(resultCode_);
+ }
+ };
+ final File out = File.createTempFile("shellout-", ".tmp",
+ getTestContext().getCacheDir());
+ try {
+ try (final ParcelFileDescriptor fd = ParcelFileDescriptor.open(out,
+ ParcelFileDescriptor.MODE_READ_WRITE)) {
+ mService.onShellCommand(
+ /* fdin*/ null,
+ /* fdout*/ fd.getFileDescriptor(),
+ /* fderr*/ fd.getFileDescriptor(),
+ args, rr);
+ }
+ return readAll(out);
+ } finally {
+ out.delete();
+ }
+ }
+
+ public void testNonShell() throws Exception {
+ mService.mMaxUpdatesPerInterval = 99;
+
+ mInjectedCallingUid = 12345;
+ assertExpectException(SecurityException.class, "must be shell",
+ () -> callShellCommand("reset-config"));
+
+ mInjectedCallingUid = Process.SYSTEM_UID;
+ assertExpectException(SecurityException.class, "must be shell",
+ () -> callShellCommand("reset-config"));
+
+ assertEquals(99, mService.mMaxUpdatesPerInterval);
+ }
+
+ public void testRoot() throws Exception {
+ mService.mMaxUpdatesPerInterval = 99;
+
+ mInjectedCallingUid = Process.ROOT_UID;
+ assertSuccess(callShellCommand("reset-config"));
+
+ assertEquals(3, mService.mMaxUpdatesPerInterval);
+ }
+
+ public void testRestConfig() throws Exception {
+ mService.mMaxUpdatesPerInterval = 99;
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("reset-config"));
+
+ assertEquals(3, mService.mMaxUpdatesPerInterval);
+ }
+
+ public void testOverrideConfig() throws Exception {
+ mService.mMaxUpdatesPerInterval = 99;
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("override-config",
+ ConfigConstants.KEY_MAX_UPDATES_PER_INTERVAL + "=1"));
+
+ assertEquals(1, mService.mMaxUpdatesPerInterval);
+ }
+
+ public void testResetThrottling() throws Exception {
+ prepareCrossProfileDataSet();
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("reset-throttling"));
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertEquals(3, mManager.getRemainingCallCount());
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ }
+
+ public void testResetThrottling_user_not_running() throws Exception {
+ prepareCrossProfileDataSet();
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+
+ mInjectedCallingUid = Process.SHELL_UID;
+
+ mRunningUsers.put(USER_10, false);
+
+ assertTrue(resultContains(
+ callShellCommand("reset-throttling", "--user", "10"),
+ "User 10 is not running or locked"));
+
+ mRunningUsers.put(USER_10, true);
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ }
+
+ public void testResetThrottling_user_running() throws Exception {
+ prepareCrossProfileDataSet();
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+
+ mRunningUsers.put(USER_10, true);
+ mUnlockedUsers.put(USER_10, true);
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("reset-throttling", "--user", "10"));
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertEquals(3, mManager.getRemainingCallCount());
+ });
+ }
+
+ public void testResetAllThrottling() throws Exception {
+ prepareCrossProfileDataSet();
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.getRemainingCallCount() < 3);
+ });
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("reset-all-throttling"));
+
+ runWithCaller(CALLING_PACKAGE_1, USER_0, () -> {
+ assertEquals(3, mManager.getRemainingCallCount());
+ });
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertEquals(3, mManager.getRemainingCallCount());
+ });
+ }
+
+ public void testLauncherCommands() throws Exception {
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ null,
+ list(getSystemLauncher(), getFallbackLauncher()),
+ USER_0);
+
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ cn(CALLING_PACKAGE_2, "name"),
+ list(getSystemLauncher(), getFallbackLauncher(),
+ ri(CALLING_PACKAGE_1, "name", false, 0),
+ ri(CALLING_PACKAGE_2, "name", false, 0)
+ ),
+ USER_10);
+
+ assertTrue(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_0));
+
+ // First, test "get".
+
+ mRunningUsers.put(USER_10, true);
+ mUnlockedUsers.put(USER_10, true);
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertContains(
+ assertSuccess(callShellCommand("get-default-launcher")),
+ "Launcher: ComponentInfo{com.android.systemlauncher/systemlauncher_name}");
+
+ assertContains(
+ assertSuccess(callShellCommand("get-default-launcher", "--user", "10")),
+ "Launcher: ComponentInfo{com.android.test.2/name}");
+
+ // Next, test "clear".
+ assertSuccess(callShellCommand("clear-default-launcher", "--user", "10"));
+
+ // User-10's launcher should be cleared.
+ assertEquals(null, mService.getUserShortcutsLocked(USER_10).getLastKnownLauncher());
+ assertEquals(null, mService.getUserShortcutsLocked(USER_10).getCachedLauncher());
+
+ // but user'0's shouldn't.
+ assertEquals(cn(PACKAGE_SYSTEM_LAUNCHER, PACKAGE_SYSTEM_LAUNCHER_NAME),
+ mService.getUserShortcutsLocked(USER_0).getCachedLauncher());
+
+ // Change user-0's launcher.
+ prepareGetHomeActivitiesAsUser(
+ /* preferred */ cn(CALLING_PACKAGE_1, "name"),
+ list(
+ ri(CALLING_PACKAGE_1, "name", false, 0)
+ ),
+ USER_0);
+ assertContains(
+ assertSuccess(callShellCommand("get-default-launcher")),
+ "Launcher: ComponentInfo{com.android.test.1/name}");
+ }
+
+ public void testUnloadUser() throws Exception {
+ prepareCrossProfileDataSet();
+
+ assertNotNull(mService.getShortcutsForTest().get(USER_10));
+
+ mRunningUsers.put(USER_10, true);
+ mUnlockedUsers.put(USER_10, true);
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("unload-user", "--user", "10"));
+
+ assertNull(mService.getShortcutsForTest().get(USER_10));
+ }
+
+ public void testClearShortcuts() throws Exception {
+
+ mRunningUsers.put(USER_10, true);
+
+ // Add two manifests and two dynamics.
+ addManifestShortcutResource(
+ new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),
+ R.xml.shortcut_2);
+ updatePackageVersion(CALLING_PACKAGE_1, 1);
+ mService.mPackageMonitor.onReceive(getTestContext(),
+ genPackageAddIntent(CALLING_PACKAGE_1, USER_10));
+
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertTrue(mManager.addDynamicShortcuts(list(
+ makeShortcut("s1"), makeShortcut("s2"))));
+ });
+ runWithCaller(LAUNCHER_1, USER_10, () -> {
+ mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, list("ms2", "s2"), HANDLE_USER_10);
+ });
+
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertWith(getCallerShortcuts())
+ .haveIds("ms1", "ms2", "s1", "s2")
+ .areAllEnabled()
+
+ .selectPinned()
+ .haveIds("ms2", "s2");
+ });
+
+ // First, call for a different package.
+
+ mRunningUsers.put(USER_10, true);
+ mUnlockedUsers.put(USER_10, true);
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("clear-shortcuts", "--user", "10", CALLING_PACKAGE_2));
+
+ // Shouldn't be cleared yet.
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertWith(getCallerShortcuts())
+ .haveIds("ms1", "ms2", "s1", "s2")
+ .areAllEnabled()
+
+ .selectPinned()
+ .haveIds("ms2", "s2");
+ });
+
+ mInjectedCallingUid = Process.SHELL_UID;
+ assertSuccess(callShellCommand("clear-shortcuts", "--user", "10", CALLING_PACKAGE_1));
+
+ // Only manifest shortcuts will remain, and are no longer pinned.
+ runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
+ assertWith(getCallerShortcuts())
+ .haveIds("ms1", "ms2")
+ .areAllEnabled()
+ .areAllNotPinned();
+ });
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutTestActivity.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutTestActivity.java
new file mode 100644
index 0000000..d82b0d5
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutTestActivity.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.pm;
+
+import android.app.Activity;
+
+public class ShortcutTestActivity extends Activity {
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index ced4980..34e86e7 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -21,11 +21,15 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.UserInfo;
+import android.app.ActivityManager;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
+import android.provider.Settings;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.internal.util.ArrayUtils;
@@ -34,24 +38,39 @@
import java.util.List;
/** Test {@link UserManager} functionality. */
-@MediumTest
public class UserManagerTest extends AndroidTestCase {
- private static final int REMOVE_CHECK_INTERVAL = 500;
- private static final int REMOVE_TIMEOUT = 60 * 1000;
+ private static final int REMOVE_CHECK_INTERVAL_MILLIS = 500; // 0.5 seconds
+ private static final int REMOVE_TIMEOUT_MILLIS = 60 * 1000; // 60 seconds
+ private static final int SWITCH_CHECK_INTERVAL_MILLIS = 2 * 1000; // 2 seconds
+ private static final int SWITCH_USER_TIMEOUT_MILLIS = 40 * 1000; // 40 seconds
+
+ private final Object mUserRemoveLock = new Object();
+ private final Object mUserSwitchLock = new Object();
+
private UserManager mUserManager = null;
- private final Object mUserLock = new Object();
private List<Integer> usersToRemove;
@Override
public void setUp() throws Exception {
super.setUp();
mUserManager = UserManager.get(getContext());
+
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
+ filter.addAction(Intent.ACTION_USER_SWITCHED);
getContext().registerReceiver(new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- synchronized (mUserLock) {
- mUserLock.notifyAll();
+ switch (intent.getAction()) {
+ case Intent.ACTION_USER_REMOVED:
+ synchronized (mUserRemoveLock) {
+ mUserRemoveLock.notifyAll();
+ }
+ break;
+ case Intent.ACTION_USER_SWITCHED:
+ synchronized (mUserSwitchLock) {
+ mUserSwitchLock.notifyAll();
+ }
+ break;
}
}
}, filter);
@@ -81,10 +100,12 @@
}
}
+ @SmallTest
public void testHasSystemUser() throws Exception {
assertTrue(findUser(UserHandle.USER_SYSTEM));
}
+ @MediumTest
public void testAddUser() throws Exception {
UserInfo userInfo = createUser("Guest 1", UserInfo.FLAG_GUEST);
assertTrue(userInfo != null);
@@ -105,6 +126,7 @@
assertTrue(found);
}
+ @MediumTest
public void testAdd2Users() throws Exception {
UserInfo user1 = createUser("Guest 1", UserInfo.FLAG_GUEST);
UserInfo user2 = createUser("User 2", UserInfo.FLAG_ADMIN);
@@ -117,6 +139,7 @@
assertTrue(findUser(user2.id));
}
+ @MediumTest
public void testRemoveUser() throws Exception {
UserInfo userInfo = createUser("Guest 1", UserInfo.FLAG_GUEST);
removeUser(userInfo.id);
@@ -124,6 +147,7 @@
assertFalse(findUser(userInfo.id));
}
+ @MediumTest
public void testAddGuest() throws Exception {
UserInfo userInfo1 = createUser("Guest 1", UserInfo.FLAG_GUEST);
UserInfo userInfo2 = createUser("Guest 2", UserInfo.FLAG_GUEST);
@@ -131,19 +155,54 @@
assertNull(userInfo2);
}
+ @MediumTest
+ public void testGetProfileParent() throws Exception {
+ final int primaryUserId = mUserManager.getPrimaryUser().id;
+
+ UserInfo userInfo = createProfileForUser("Profile",
+ UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ assertNotNull(userInfo);
+
+ UserInfo parentProfileInfo = mUserManager.getProfileParent(userInfo.id);
+ assertNotNull(parentProfileInfo);
+ assertEquals(parentProfileInfo.id, primaryUserId);
+ }
+
// Make sure only one managed profile can be created
+ @MediumTest
public void testAddManagedProfile() throws Exception {
final int primaryUserId = mUserManager.getPrimaryUser().id;
UserInfo userInfo1 = createProfileForUser("Managed 1",
UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
UserInfo userInfo2 = createProfileForUser("Managed 2",
UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+
assertNotNull(userInfo1);
assertNull(userInfo2);
// Verify that current user is not a managed profile
assertFalse(mUserManager.isManagedProfile());
}
+ @MediumTest
+ public void testAddRestrictedProfile() throws Exception {
+ UserInfo userInfo = createRestrictedProfile("Profile");
+ assertNotNull(userInfo);
+
+ Bundle restrictions = mUserManager.getUserRestrictions(UserHandle.of(userInfo.id));
+ assertTrue("Restricted profile should have DISALLOW_MODIFY_ACCOUNTS restriction by default",
+ restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS));
+ assertTrue("Restricted profile should have DISALLOW_SHARE_LOCATION restriction by default",
+ restrictions.getBoolean(UserManager.DISALLOW_SHARE_LOCATION));
+
+ int locationMode = Settings.Secure.getIntForUser(getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE,
+ Settings.Secure.LOCATION_MODE_HIGH_ACCURACY,
+ userInfo.id);
+ assertEquals("Restricted profile should have setting LOCATION_MODE set to "
+ + "LOCATION_MODE_OFF by default", locationMode, Settings.Secure.LOCATION_MODE_OFF);
+ }
+
+ @MediumTest
public void testGetUserCreationTime() throws Exception {
final int primaryUserId = mUserManager.getPrimaryUser().id;
UserInfo profile = createProfileForUser("Managed 1",
@@ -177,7 +236,6 @@
}
}
-
private boolean findUser(int id) {
List<UserInfo> list = mUserManager.getUsers();
@@ -189,6 +247,7 @@
return false;
}
+ @MediumTest
public void testSerialNumber() {
UserInfo user1 = createUser("User 1", 0);
int serialNumber1 = user1.serialNumber;
@@ -201,6 +260,7 @@
assertEquals(user2.id, mUserManager.getUserHandle(serialNumber2));
}
+ @MediumTest
public void testGetSerialNumbersOfUsers() {
UserInfo user1 = createUser("User 1", 0);
UserInfo user2 = createUser("User 2", 0);
@@ -212,6 +272,7 @@
ArrayUtils.contains(serialNumbersOfUsers, user2.serialNumber));
}
+ @MediumTest
public void testMaxUsers() {
int N = UserManager.getMaxSupportedUsers();
int count = mUserManager.getUsers().size();
@@ -226,6 +287,17 @@
assertNull(extra);
}
+ @MediumTest
+ public void testGetUserCount() {
+ int count = mUserManager.getUsers().size();
+ UserInfo user1 = createUser("User 1", 0);
+ assertNotNull(user1);
+ UserInfo user2 = createUser("User 2", 0);
+ assertNotNull(user2);
+ assertEquals(count + 2, mUserManager.getUserCount());
+ }
+
+ @MediumTest
public void testRestrictions() {
UserInfo testUser = createUser("User 1", 0);
@@ -241,18 +313,66 @@
assertEquals(stored.getBoolean(UserManager.DISALLOW_INSTALL_APPS), true);
}
- private void removeUser(int userId) {
- synchronized (mUserLock) {
- mUserManager.removeUser(userId);
+ @MediumTest
+ public void testSetDefaultGuestRestrictions() {
+ final Bundle origGuestRestrictions = mUserManager.getDefaultGuestRestrictions();
+ Bundle restrictions = new Bundle();
+ restrictions.putBoolean(UserManager.DISALLOW_FUN, true);
+ mUserManager.setDefaultGuestRestrictions(restrictions);
+
+ try {
+ UserInfo guest = createUser("Guest", UserInfo.FLAG_GUEST);
+ assertNotNull(guest);
+ assertTrue(mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN,
+ guest.getUserHandle()));
+ } finally {
+ mUserManager.setDefaultGuestRestrictions(origGuestRestrictions);
+ }
+ }
+
+ @LargeTest
+ public void testSwitchUser() {
+ ActivityManager am = getContext().getSystemService(ActivityManager.class);
+ final int startUser = am.getCurrentUser();
+ UserInfo user = createUser("User", 0);
+ assertNotNull(user);
+ // Switch to the user just created.
+ switchUser(user.id);
+ // Switch back to the starting user.
+ switchUser(startUser);
+ }
+
+ private void switchUser(int userId) {
+ synchronized (mUserSwitchLock) {
+ ActivityManager am = getContext().getSystemService(ActivityManager.class);
+ am.switchUser(userId);
long time = System.currentTimeMillis();
- while (mUserManager.getUserInfo(userId) != null) {
+ while (am.getCurrentUser() != userId) {
try {
- mUserLock.wait(REMOVE_CHECK_INTERVAL);
+ mUserSwitchLock.wait(SWITCH_CHECK_INTERVAL_MILLIS);
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
return;
}
- if (System.currentTimeMillis() - time > REMOVE_TIMEOUT) {
+ if (System.currentTimeMillis() - time > SWITCH_USER_TIMEOUT_MILLIS) {
+ fail("Timeout waiting for the user switch to u" + userId);
+ }
+ }
+ }
+ }
+
+ private void removeUser(int userId) {
+ synchronized (mUserRemoveLock) {
+ mUserManager.removeUser(userId);
+ long time = System.currentTimeMillis();
+ while (mUserManager.getUserInfo(userId) != null) {
+ try {
+ mUserRemoveLock.wait(REMOVE_CHECK_INTERVAL_MILLIS);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ return;
+ }
+ if (System.currentTimeMillis() - time > REMOVE_TIMEOUT_MILLIS) {
fail("Timeout waiting for removeUser. userId = " + userId);
}
}
@@ -275,4 +395,11 @@
return profile;
}
+ private UserInfo createRestrictedProfile(String name) {
+ UserInfo profile = mUserManager.createRestrictedProfile(name);
+ if (profile != null) {
+ usersToRemove.add(profile.id);
+ }
+ return profile;
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java b/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java
index e2dce853..11f9ebb 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java
@@ -16,15 +16,14 @@
package com.android.server.pm;
-import android.os.UserHandle;
-import com.android.server.devicepolicy.DpmTestUtils;
-
import android.os.Bundle;
+import android.os.UserHandle;
import android.os.UserManager;
import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
import android.test.suitebuilder.annotation.SmallTest;
+import com.android.server.devicepolicy.DpmTestUtils;
+
/**
* Tests for {@link com.android.server.pm.UserRestrictionsUtils}.
*
diff --git a/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java b/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java
new file mode 100644
index 0000000..1514e69
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.wm;
+
+import com.android.internal.os.IResultReceiver;
+
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.view.DragEvent;
+import android.view.IWindow;
+
+public class TestIWindow extends IWindow.Stub {
+ @Override
+ public void executeCommand(String command, String parameters,
+ ParcelFileDescriptor descriptor)
+ throws RemoteException {
+
+ }
+
+ @Override
+ public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets,
+ Rect stableInsets, Rect outsets, boolean reportDraw, Configuration newConfig,
+ Rect backDropFrame, boolean forceLayout, boolean alwaysConsumeNavBar)
+ throws RemoteException {
+
+ }
+
+ @Override
+ public void moved(int newX, int newY) throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchAppVisibility(boolean visible) throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchGetNewSurface() throws RemoteException {
+
+ }
+
+ @Override
+ public void windowFocusChanged(boolean hasFocus, boolean inTouchMode)
+ throws RemoteException {
+
+ }
+
+ @Override
+ public void closeSystemDialogs(String reason) throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchWallpaperOffsets(float x, float y, float xStep, float yStep,
+ boolean sync)
+ throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchWallpaperCommand(String action, int x, int y, int z, Bundle extras,
+ boolean sync) throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchDragEvent(DragEvent event) throws RemoteException {
+
+ }
+
+ @Override
+ public void updatePointerIcon(float x, float y) throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchSystemUiVisibilityChanged(int seq, int globalVisibility, int localValue,
+ int localChanges) throws RemoteException {
+
+ }
+
+ @Override
+ public void dispatchWindowShown() throws RemoteException {
+
+ }
+
+ @Override
+ public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId)
+ throws RemoteException {
+
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java
new file mode 100644
index 0000000..936949e
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java
@@ -0,0 +1,711 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.wm;
+
+import com.android.internal.policy.IShortcutService;
+
+import android.content.Context;
+import android.content.res.CompatibilityInfo;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.Display;
+import android.view.IWindowManager;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.WindowManagerPolicy;
+import android.view.animation.Animation;
+
+import java.io.PrintWriter;
+
+import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
+import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
+import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS;
+import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
+import static android.view.WindowManager.LayoutParams.TYPE_DRAG;
+import static android.view.WindowManager.LayoutParams.TYPE_DREAM;
+import static android.view.WindowManager.LayoutParams.TYPE_INPUT_CONSUMER;
+import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
+import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_SCRIM;
+import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_PHONE;
+import static android.view.WindowManager.LayoutParams.TYPE_POINTER;
+import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE;
+import static android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION;
+import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT;
+import static android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR;
+import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;
+import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
+import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION;
+import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION_STARTING;
+import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
+
+public class TestWindowManagerPolicy implements WindowManagerPolicy {
+ private static final String TAG = "TestWindowManagerPolicy";
+
+ @Override
+ public void registerShortcutKey(long shortcutCode, IShortcutService shortcutKeyReceiver)
+ throws RemoteException {
+
+ }
+
+ @Override
+ public void init(Context context, IWindowManager windowManager,
+ WindowManagerFuncs windowManagerFuncs) {
+
+ }
+
+ @Override
+ public boolean isDefaultOrientationForced() {
+ return false;
+ }
+
+ @Override
+ public void setInitialDisplaySize(Display display, int width, int height, int density) {
+
+ }
+
+ @Override
+ public void setDisplayOverscan(Display display, int left, int top, int right, int bottom) {
+
+ }
+
+ @Override
+ public int checkAddPermission(WindowManager.LayoutParams attrs, int[] outAppOp) {
+ return 0;
+ }
+
+ @Override
+ public boolean checkShowToOwnerOnly(WindowManager.LayoutParams attrs) {
+ return false;
+ }
+
+ @Override
+ public void adjustWindowParamsLw(WindowManager.LayoutParams attrs) {
+
+ }
+
+ @Override
+ public void adjustConfigurationLw(Configuration config, int keyboardPresence,
+ int navigationPresence) {
+
+ }
+
+ @Override
+ public int windowTypeToLayerLw(int type) {
+ // TODO: figure-out a good way to keep this in-sync with PhoneWindowManager...sigh!
+ if (type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW) {
+ return 2;
+ }
+ switch (type) {
+ case TYPE_PRIVATE_PRESENTATION:
+ return 2;
+ case TYPE_WALLPAPER:
+ // wallpaper is at the bottom, though the window manager may move it.
+ return 2;
+ case TYPE_DOCK_DIVIDER:
+ return 2;
+ case TYPE_QS_DIALOG:
+ return 2;
+ case TYPE_PHONE:
+ return 3;
+ case TYPE_SEARCH_BAR:
+ case TYPE_VOICE_INTERACTION_STARTING:
+ return 4;
+ case TYPE_VOICE_INTERACTION:
+ // voice interaction layer is almost immediately above apps.
+ return 5;
+ case TYPE_INPUT_CONSUMER:
+ return 6;
+ case TYPE_SYSTEM_DIALOG:
+ return 7;
+ case TYPE_TOAST:
+ // toasts and the plugged-in battery thing
+ return 8;
+ case TYPE_PRIORITY_PHONE:
+ // SIM errors and unlock. Not sure if this really should be in a high layer.
+ return 9;
+ case TYPE_DREAM:
+ // used for Dreams (screensavers with TYPE_DREAM windows)
+ return 10;
+ case TYPE_SYSTEM_ALERT:
+ // like the ANR / app crashed dialogs
+ return 11;
+ case TYPE_INPUT_METHOD:
+ // on-screen keyboards and other such input method user interfaces go here.
+ return 12;
+ case TYPE_INPUT_METHOD_DIALOG:
+ // on-screen keyboards and other such input method user interfaces go here.
+ return 13;
+ case TYPE_KEYGUARD_SCRIM:
+ // the safety window that shows behind keyguard while keyguard is starting
+ return 14;
+ case TYPE_STATUS_BAR_SUB_PANEL:
+ return 15;
+ case TYPE_STATUS_BAR:
+ return 16;
+ case TYPE_STATUS_BAR_PANEL:
+ return 17;
+ case TYPE_KEYGUARD_DIALOG:
+ return 18;
+ case TYPE_VOLUME_OVERLAY:
+ // the on-screen volume indicator and controller shown when the user
+ // changes the device volume
+ return 19;
+ case TYPE_SYSTEM_OVERLAY:
+ // the on-screen volume indicator and controller shown when the user
+ // changes the device volume
+ return 20;
+ case TYPE_NAVIGATION_BAR:
+ // the navigation bar, if available, shows atop most things
+ return 21;
+ case TYPE_NAVIGATION_BAR_PANEL:
+ // some panels (e.g. search) need to show on top of the navigation bar
+ return 22;
+ case TYPE_SCREENSHOT:
+ // screenshot selection layer shouldn't go above system error, but it should cover
+ // navigation bars at the very least.
+ return 23;
+ case TYPE_SYSTEM_ERROR:
+ // system-level error dialogs
+ return 24;
+ case TYPE_MAGNIFICATION_OVERLAY:
+ // used to highlight the magnified portion of a display
+ return 25;
+ case TYPE_DISPLAY_OVERLAY:
+ // used to simulate secondary display devices
+ return 26;
+ case TYPE_DRAG:
+ // the drag layer: input for drag-and-drop is associated with this window,
+ // which sits above all other focusable windows
+ return 27;
+ case TYPE_ACCESSIBILITY_OVERLAY:
+ // overlay put by accessibility services to intercept user interaction
+ return 28;
+ case TYPE_SECURE_SYSTEM_OVERLAY:
+ return 29;
+ case TYPE_BOOT_PROGRESS:
+ return 30;
+ case TYPE_POINTER:
+ // the (mouse) pointer layer
+ return 31;
+ }
+ Log.e(TAG, "Unknown window type: " + type);
+ return 2;
+ }
+
+ @Override
+ public int subWindowTypeToLayerLw(int type) {
+ // TODO: figure-out a good way to keep this in-sync with PhoneWindowManager...
+ switch (type) {
+ case TYPE_APPLICATION_PANEL:
+ case TYPE_APPLICATION_ATTACHED_DIALOG:
+ return 1;
+ case TYPE_APPLICATION_MEDIA:
+ return -2;
+ case TYPE_APPLICATION_MEDIA_OVERLAY:
+ return -1;
+ case TYPE_APPLICATION_SUB_PANEL:
+ return 2;
+ case TYPE_APPLICATION_ABOVE_SUB_PANEL:
+ return 3;
+ }
+ Log.e(TAG, "Unknown sub-window type: " + type);
+ return 0;
+ }
+
+ @Override
+ public int getMaxWallpaperLayer() {
+ return 0;
+ }
+
+ @Override
+ public int getNonDecorDisplayWidth(int fullWidth, int fullHeight, int rotation, int uiMode) {
+ return 0;
+ }
+
+ @Override
+ public int getNonDecorDisplayHeight(int fullWidth, int fullHeight, int rotation, int uiMode) {
+ return 0;
+ }
+
+ @Override
+ public int getConfigDisplayWidth(int fullWidth, int fullHeight, int rotation, int uiMode) {
+ return 0;
+ }
+
+ @Override
+ public int getConfigDisplayHeight(int fullWidth, int fullHeight, int rotation, int uiMode) {
+ return 0;
+ }
+
+ @Override
+ public boolean isForceHiding(WindowManager.LayoutParams attrs) {
+ return false;
+ }
+
+ @Override
+ public boolean isKeyguardHostWindow(WindowManager.LayoutParams attrs) {
+ return false;
+ }
+
+ @Override
+ public boolean canBeForceHidden(WindowState win,
+ WindowManager.LayoutParams attrs) {
+ return false;
+ }
+
+ @Override
+ public WindowState getWinShowWhenLockedLw() {
+ return null;
+ }
+
+ @Override
+ public View addStartingWindow(IBinder appToken, String packageName, int theme,
+ CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon,
+ int logo, int windowFlags, Configuration overrideConfig) {
+ return null;
+ }
+
+ @Override
+ public void removeStartingWindow(IBinder appToken, View window) {
+
+ }
+
+ @Override
+ public int prepareAddWindowLw(WindowState win,
+ WindowManager.LayoutParams attrs) {
+ return 0;
+ }
+
+ @Override
+ public void removeWindowLw(WindowState win) {
+
+ }
+
+ @Override
+ public int selectAnimationLw(WindowState win, int transit) {
+ return 0;
+ }
+
+ @Override
+ public void selectRotationAnimationLw(int[] anim) {
+
+ }
+
+ @Override
+ public boolean validateRotationAnimationLw(int exitAnimId, int enterAnimId,
+ boolean forceDefault) {
+ return false;
+ }
+
+ @Override
+ public Animation createForceHideEnterAnimation(boolean onWallpaper,
+ boolean goingToNotificationShade) {
+ return null;
+ }
+
+ @Override
+ public Animation createForceHideWallpaperExitAnimation(boolean goingToNotificationShade) {
+ return null;
+ }
+
+ @Override
+ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {
+ return 0;
+ }
+
+ @Override
+ public int interceptMotionBeforeQueueingNonInteractive(long whenNanos, int policyFlags) {
+ return 0;
+ }
+
+ @Override
+ public long interceptKeyBeforeDispatching(WindowState win, KeyEvent event,
+ int policyFlags) {
+ return 0;
+ }
+
+ @Override
+ public KeyEvent dispatchUnhandledKey(WindowState win, KeyEvent event,
+ int policyFlags) {
+ return null;
+ }
+
+ @Override
+ public void beginLayoutLw(boolean isDefaultDisplay, int displayWidth, int displayHeight,
+ int displayRotation, int uiMode) {
+
+ }
+
+ @Override
+ public int getSystemDecorLayerLw() {
+ return 0;
+ }
+
+ @Override
+ public void getContentRectLw(Rect r) {
+
+ }
+
+ @Override
+ public void layoutWindowLw(WindowState win,
+ WindowState attached) {
+
+ }
+
+ @Override
+ public boolean getInsetHintLw(WindowManager.LayoutParams attrs, Rect taskBounds,
+ int displayRotation, int displayWidth, int displayHeight, Rect outContentInsets,
+ Rect outStableInsets, Rect outOutsets) {
+ return false;
+ }
+
+ @Override
+ public void finishLayoutLw() {
+
+ }
+
+ @Override
+ public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) {
+
+ }
+
+ @Override
+ public void applyPostLayoutPolicyLw(WindowState win,
+ WindowManager.LayoutParams attrs, WindowState attached) {
+
+ }
+
+ @Override
+ public int finishPostLayoutPolicyLw() {
+ return 0;
+ }
+
+ @Override
+ public boolean allowAppAnimationsLw() {
+ return false;
+ }
+
+ @Override
+ public int focusChangedLw(WindowState lastFocus,
+ WindowState newFocus) {
+ return 0;
+ }
+
+ @Override
+ public void startedWakingUp() {
+
+ }
+
+ @Override
+ public void finishedWakingUp() {
+
+ }
+
+ @Override
+ public void startedGoingToSleep(int why) {
+
+ }
+
+ @Override
+ public void finishedGoingToSleep(int why) {
+
+ }
+
+ @Override
+ public void screenTurningOn(ScreenOnListener screenOnListener) {
+
+ }
+
+ @Override
+ public void screenTurnedOn() {
+
+ }
+
+ @Override
+ public void screenTurnedOff() {
+
+ }
+
+ @Override
+ public boolean isScreenOn() {
+ return false;
+ }
+
+ @Override
+ public void notifyLidSwitchChanged(long whenNanos, boolean lidOpen) {
+
+ }
+
+ @Override
+ public void notifyCameraLensCoverSwitchChanged(long whenNanos, boolean lensCovered) {
+
+ }
+
+ @Override
+ public void enableKeyguard(boolean enabled) {
+
+ }
+
+ @Override
+ public void exitKeyguardSecurely(OnKeyguardExitResult callback) {
+
+ }
+
+ @Override
+ public boolean isKeyguardLocked() {
+ return false;
+ }
+
+ @Override
+ public boolean isKeyguardSecure(int userId) {
+ return false;
+ }
+
+ @Override
+ public boolean isKeyguardShowingOrOccluded() {
+ return false;
+ }
+
+ @Override
+ public boolean isKeyguardShowingAndNotOccluded() {
+ return false;
+ }
+
+ @Override
+ public boolean inKeyguardRestrictedKeyInputMode() {
+ return false;
+ }
+
+ @Override
+ public void dismissKeyguardLw() {
+
+ }
+
+ @Override
+ public void notifyActivityDrawnForKeyguardLw() {
+
+ }
+
+ @Override
+ public boolean isKeyguardDrawnLw() {
+ return false;
+ }
+
+ @Override
+ public int rotationForOrientationLw(int orientation,
+ int lastRotation) {
+ return 0;
+ }
+
+ @Override
+ public boolean rotationHasCompatibleMetricsLw(int orientation,
+ int rotation) {
+ return false;
+ }
+
+ @Override
+ public void setRotationLw(int rotation) {
+
+ }
+
+ @Override
+ public void setSafeMode(boolean safeMode) {
+
+ }
+
+ @Override
+ public void systemReady() {
+
+ }
+
+ @Override
+ public void systemBooted() {
+
+ }
+
+ @Override
+ public void showBootMessage(CharSequence msg, boolean always) {
+
+ }
+
+ @Override
+ public void hideBootMessages() {
+
+ }
+
+ @Override
+ public void userActivity() {
+
+ }
+
+ @Override
+ public void enableScreenAfterBoot() {
+
+ }
+
+ @Override
+ public void setCurrentOrientationLw(int newOrientation) {
+
+ }
+
+ @Override
+ public boolean performHapticFeedbackLw(WindowState win, int effectId,
+ boolean always) {
+ return false;
+ }
+
+ @Override
+ public void keepScreenOnStartedLw() {
+
+ }
+
+ @Override
+ public void keepScreenOnStoppedLw() {
+
+ }
+
+ @Override
+ public int getUserRotationMode() {
+ return 0;
+ }
+
+ @Override
+ public void setUserRotationMode(int mode,
+ int rotation) {
+
+ }
+
+ @Override
+ public int adjustSystemUiVisibilityLw(int visibility) {
+ return 0;
+ }
+
+ @Override
+ public boolean hasNavigationBar() {
+ return false;
+ }
+
+ @Override
+ public void lockNow(Bundle options) {
+
+ }
+
+ @Override
+ public void setLastInputMethodWindowLw(WindowState ime,
+ WindowState target) {
+
+ }
+
+ @Override
+ public void showRecentApps(boolean fromHome) {
+
+ }
+
+ @Override
+ public void showGlobalActions() {
+
+ }
+
+ @Override
+ public int getInputMethodWindowVisibleHeightLw() {
+ return 0;
+ }
+
+ @Override
+ public void setCurrentUserLw(int newUserId) {
+
+ }
+
+ @Override
+ public void dump(String prefix, PrintWriter writer, String[] args) {
+
+ }
+
+ @Override
+ public boolean canMagnifyWindow(int windowType) {
+ return false;
+ }
+
+ @Override
+ public boolean isTopLevelWindow(int windowType) {
+ return false;
+ }
+
+ @Override
+ public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {
+
+ }
+
+ @Override
+ public void getStableInsetsLw(int displayRotation, int displayWidth, int displayHeight,
+ Rect outInsets) {
+
+ }
+
+ @Override
+ public boolean isNavBarForcedShownLw(WindowState win) {
+ return false;
+ }
+
+ @Override
+ public void getNonDecorInsetsLw(int displayRotation, int displayWidth, int displayHeight,
+ Rect outInsets) {
+
+ }
+
+ @Override
+ public boolean isDockSideAllowed(int dockSide) {
+ return false;
+ }
+
+ @Override
+ public void onConfigurationChanged() {
+
+ }
+
+ @Override
+ public boolean shouldRotateSeamlessly(int oldRotation, int newRotation) {
+ return false;
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java
new file mode 100644
index 0000000..bd7c0b3
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.wm;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import java.util.Comparator;
+
+/**
+ * Test class for {@link WindowContainer}.
+ *
+ * Build: mmma -j32 frameworks/base/services/tests/servicestests
+ * Install: adb install -r out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
+ * Run: adb shell am instrument -w -e class com.android.server.wm.WindowContainerTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
+ */
+@SmallTest
+public class WindowContainerTests extends AndroidTestCase {
+
+ public void testCreation() throws Exception {
+ final TestWindowContainer w = new TestWindowContainer();
+ assertNull("window must have no parent", w.getParentWindow());
+ assertEquals("window must have no children", 0, w.getChildrenCount());
+ }
+
+ public void testAdd() throws Exception {
+ final TestWindowContainer root = new TestWindowContainer();
+
+ final TestWindowContainer layer1 = root.addChildWindow(1);
+ final TestWindowContainer secondLayer1 = root.addChildWindow(1);
+ final TestWindowContainer layer2 = root.addChildWindow(2);
+ final TestWindowContainer layerNeg1 = root.addChildWindow(-1);
+ final TestWindowContainer layerNeg2 = root.addChildWindow(-2);
+ final TestWindowContainer secondLayerNeg1 = root.addChildWindow(-1);
+ final TestWindowContainer layer0 = root.addChildWindow(0);
+
+ assertEquals(7, root.getChildrenCount());
+
+ assertEquals(root, layer1.getParentWindow());
+ assertEquals(root, secondLayer1.getParentWindow());
+ assertEquals(root, layer2.getParentWindow());
+ assertEquals(root, layerNeg1.getParentWindow());
+ assertEquals(root, layerNeg2.getParentWindow());
+ assertEquals(root, secondLayerNeg1.getParentWindow());
+ assertEquals(root, layer0.getParentWindow());
+
+ assertEquals(layerNeg2, root.getChildAt(0));
+ assertEquals(secondLayerNeg1, root.getChildAt(1));
+ assertEquals(layerNeg1, root.getChildAt(2));
+ assertEquals(layer0, root.getChildAt(3));
+ assertEquals(layer1, root.getChildAt(4));
+ assertEquals(secondLayer1, root.getChildAt(5));
+ assertEquals(layer2, root.getChildAt(6));
+ }
+
+ public void testHasChild() throws Exception {
+ final TestWindowContainer root = new TestWindowContainer();
+
+ final TestWindowContainer child1 = root.addChildWindow(1);
+ final TestWindowContainer child2 = root.addChildWindow(1);
+ final TestWindowContainer child11 = child1.addChildWindow(1);
+ final TestWindowContainer child12 = child1.addChildWindow(1);
+ final TestWindowContainer child21 = child2.addChildWindow(1);
+
+ assertEquals(2, root.getChildrenCount());
+ assertEquals(2, child1.getChildrenCount());
+ assertEquals(1, child2.getChildrenCount());
+
+ assertTrue(root.hasChild(child1));
+ assertTrue(root.hasChild(child2));
+ assertTrue(root.hasChild(child11));
+ assertTrue(root.hasChild(child12));
+ assertTrue(root.hasChild(child21));
+
+ assertTrue(child1.hasChild(child11));
+ assertTrue(child1.hasChild(child12));
+ assertFalse(child1.hasChild(child21));
+
+ assertTrue(child2.hasChild(child21));
+ assertFalse(child2.hasChild(child11));
+ assertFalse(child2.hasChild(child12));
+ }
+
+ public void testRemove() throws Exception {
+ final TestWindowContainer root = new TestWindowContainer();
+
+ final TestWindowContainer child1 = root.addChildWindow(1);
+ final TestWindowContainer child2 = root.addChildWindow(1);
+ final TestWindowContainer child11 = child1.addChildWindow(1);
+ final TestWindowContainer child12 = child1.addChildWindow(1);
+ final TestWindowContainer child21 = child2.addChildWindow(1);
+
+ child12.remove();
+ assertNull(child12.getParentWindow());
+ assertEquals(1, child1.getChildrenCount());
+ assertFalse(child1.hasChild(child12));
+ assertFalse(root.hasChild(child12));
+
+ child2.remove();
+ assertNull(child2.getParentWindow());
+ assertNull(child21.getParentWindow());
+ assertEquals(0, child2.getChildrenCount());
+ assertEquals(1, root.getChildrenCount());
+ assertFalse(root.hasChild(child2));
+ assertFalse(root.hasChild(child21));
+
+ assertTrue(root.hasChild(child1));
+ assertTrue(root.hasChild(child11));
+
+ root.remove();
+ assertEquals(0, root.getChildrenCount());
+ }
+
+ /* Used so we can gain access to some protected members of the {@link WindowContainer} class */
+ private class TestWindowContainer extends WindowContainer {
+ private final int mLayer;
+
+ /**
+ * Compares 2 window layers and returns -1 if the first is lesser than the second in terms
+ * of z-order and 1 otherwise.
+ */
+ private final Comparator<WindowContainer> mWindowSubLayerComparator = (w1, w2) -> {
+ final int layer1 = ((TestWindowContainer)w1).mLayer;
+ final int layer2 = ((TestWindowContainer)w2).mLayer;
+ if (layer1 < layer2 || (layer1 == layer2 && layer2 < 0 )) {
+ // We insert the child window into the list ordered by the mLayer.
+ // For same layers, the negative one should go below others; the positive one should
+ // go above others.
+ return -1;
+ }
+ return 1;
+ };
+
+ TestWindowContainer() {
+ mLayer = 0;
+ }
+
+ TestWindowContainer(int layer) {
+ mLayer = layer;
+ }
+
+ TestWindowContainer getParentWindow() {
+ return (TestWindowContainer) getParent();
+ }
+
+ int getChildrenCount() {
+ return mChildren.size();
+ }
+
+ TestWindowContainer addChildWindow(int layer) {
+ TestWindowContainer child = new TestWindowContainer(layer);
+ addChild(child, mWindowSubLayerComparator);
+ return child;
+ }
+
+ TestWindowContainer getChildAt(int index) {
+ return (TestWindowContainer) mChildren.get(index);
+ }
+ }
+
+}
diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
new file mode 100644
index 0000000..64de15d
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.wm;
+
+import android.content.Context;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.view.IWindow;
+import android.view.WindowManager;
+import android.view.WindowManagerPolicy;
+
+import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
+
+/**
+ * Tests for the {@link WindowState} class.
+ *
+ * Build: mmma -j32 frameworks/base/services/tests/servicestests
+ * Install: adb install -r out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
+ * Run: adb shell am instrument -w -e class com.android.server.wm.WindowStateTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
+ */
+@SmallTest
+public class WindowStateTests extends AndroidTestCase {
+
+ private static WindowManagerService sWm = null;
+ private WindowToken mWindowToken;
+ private final WindowManagerPolicy mPolicy = new TestWindowManagerPolicy();
+ private final IWindow mIWindow = new TestIWindow();
+
+ @Override
+ public void setUp() throws Exception {
+ final Context context = getContext();
+// final InputManagerService im = new InputManagerService(context);
+ if (sWm == null) {
+ // We only want to do this once for the test process as we don't want WM to try to
+ // register a bunch of local services again.
+ sWm = WindowManagerService.main(context, /*im*/ null, true, false, false, mPolicy);
+ }
+ mWindowToken = new WindowToken(sWm, null, 0, false);
+ }
+
+ public void testIsParentWindowHidden() throws Exception {
+ final WindowState parentWindow = createWindow(null, TYPE_APPLICATION);
+ final WindowState child1 = createWindow(parentWindow, FIRST_SUB_WINDOW);
+ final WindowState child2 = createWindow(parentWindow, FIRST_SUB_WINDOW);
+
+ assertFalse(parentWindow.mHidden);
+ assertFalse(parentWindow.isParentWindowHidden());
+ assertFalse(child1.isParentWindowHidden());
+ assertFalse(child2.isParentWindowHidden());
+
+ parentWindow.mHidden = true;
+ assertFalse(parentWindow.isParentWindowHidden());
+ assertTrue(child1.isParentWindowHidden());
+ assertTrue(child2.isParentWindowHidden());
+ }
+
+ public void testIsChildWindow() throws Exception {
+ final WindowState parentWindow = createWindow(null, TYPE_APPLICATION);
+ final WindowState child1 = createWindow(parentWindow, FIRST_SUB_WINDOW);
+ final WindowState child2 = createWindow(parentWindow, FIRST_SUB_WINDOW);
+ final WindowState randomWindow = createWindow(null, TYPE_APPLICATION);
+
+ assertFalse(parentWindow.isChildWindow());
+ assertTrue(child1.isChildWindow());
+ assertTrue(child2.isChildWindow());
+ assertFalse(randomWindow.isChildWindow());
+ }
+
+ public void testHasChild() throws Exception {
+ final WindowState win1 = createWindow(null, TYPE_APPLICATION);
+ final WindowState win11 = createWindow(win1, FIRST_SUB_WINDOW);
+ final WindowState win12 = createWindow(win1, FIRST_SUB_WINDOW);
+ final WindowState win2 = createWindow(null, TYPE_APPLICATION);
+ final WindowState win21 = createWindow(win2, FIRST_SUB_WINDOW);
+ final WindowState randomWindow = createWindow(null, TYPE_APPLICATION);
+
+ assertTrue(win1.hasChild(win11));
+ assertTrue(win1.hasChild(win12));
+ assertTrue(win2.hasChild(win21));
+
+ assertFalse(win1.hasChild(win21));
+ assertFalse(win1.hasChild(randomWindow));
+
+ assertFalse(win2.hasChild(win11));
+ assertFalse(win2.hasChild(win12));
+ assertFalse(win2.hasChild(randomWindow));
+ }
+
+ public void testGetBottomChild() throws Exception {
+ final WindowState parentWindow = createWindow(null, TYPE_APPLICATION);
+ assertNull(parentWindow.getBottomChild());
+
+ final WindowState child1 = createWindow(parentWindow, TYPE_APPLICATION_PANEL);
+ assertEquals(child1, parentWindow.getBottomChild());
+
+ final WindowState child2 = createWindow(parentWindow, TYPE_APPLICATION_PANEL);
+ // Since child1 and child2 are at the same layer, then child2 is expect to be added on top
+ // on child1
+ assertEquals(child1, parentWindow.getBottomChild());
+
+ final WindowState child3 = createWindow(parentWindow, TYPE_APPLICATION_MEDIA_OVERLAY);
+ // Since child3 is a negative layer, we would expect it to be added below current children
+ // with positive layers.
+ assertEquals(child3, parentWindow.getBottomChild());
+
+ final WindowState child4 = createWindow(parentWindow, TYPE_APPLICATION_MEDIA_OVERLAY);
+ // We would also expect additional negative layers to be added below existing negative
+ // layers.
+ assertEquals(child4, parentWindow.getBottomChild());
+ }
+
+ public void testGetParentWindow() throws Exception {
+ final WindowState parentWindow = createWindow(null, TYPE_APPLICATION);
+ final WindowState child1 = createWindow(parentWindow, FIRST_SUB_WINDOW);
+ final WindowState child2 = createWindow(parentWindow, FIRST_SUB_WINDOW);
+
+ assertNull(parentWindow.getParentWindow());
+ assertEquals(parentWindow, child1.getParentWindow());
+ assertEquals(parentWindow, child2.getParentWindow());
+ }
+
+ public void testGetTopParentWindow() throws Exception {
+ final WindowState root = createWindow(null, TYPE_APPLICATION);
+ final WindowState child1 = createWindow(root, FIRST_SUB_WINDOW);
+ final WindowState child2 = createWindow(child1, FIRST_SUB_WINDOW);
+
+ assertEquals(root, root.getTopParentWindow());
+ assertEquals(root, child1.getTopParentWindow());
+ assertEquals(child1, child2.getParentWindow());
+ assertEquals(root, child2.getTopParentWindow());
+ }
+
+ private WindowState createWindow(WindowState parent, int type) {
+ final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(type);
+
+ return new WindowState(sWm, null, mIWindow, mWindowToken, parent, 0, 0, attrs, 0,
+ sWm.getDefaultDisplayContentLocked(), 0);
+ }
+}
diff --git a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
index 7d7285a..78f95c4 100644
--- a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
+++ b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
@@ -18,13 +18,11 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNotSame;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -50,19 +48,21 @@
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.test.MoreAsserts;
-import android.util.ArraySet;
import android.util.Log;
import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
@@ -88,7 +88,7 @@
public class ShortcutManagerTestUtils {
private static final String TAG = "ShortcutManagerUtils";
- private static final boolean ENABLE_DUMPSYS = false; // DO NOT SUBMIT WITH true
+ private static final boolean ENABLE_DUMPSYS = true; // DO NOT SUBMIT WITH true
private static final int STANDARD_TIMEOUT_SEC = 5;
@@ -97,7 +97,12 @@
private ShortcutManagerTestUtils() {
}
- private static List<String> readAll(ParcelFileDescriptor pfd) {
+ public static List<String> readAll(File file) throws FileNotFoundException {
+ return readAll(ParcelFileDescriptor.open(
+ file.getAbsoluteFile(), ParcelFileDescriptor.MODE_READ_ONLY));
+ }
+
+ public static List<String> readAll(ParcelFileDescriptor pfd) {
try {
try {
final ArrayList<String> ret = new ArrayList<>();
@@ -118,7 +123,7 @@
}
}
- private static String concatResult(List<String> result) {
+ public static String concatResult(List<String> result) {
final StringBuilder sb = new StringBuilder();
for (String s : result) {
sb.append(s);
@@ -127,6 +132,30 @@
return sb.toString();
}
+ public static boolean resultContains(List<String> result, String expected) {
+ for (String line : result) {
+ if (line.contains(expected)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static List<String> assertSuccess(List<String> result) {
+ if (!resultContains(result, "Success")) {
+ fail("Command failed. Result was:\n" + concatResult(result));
+ }
+ return result;
+ }
+
+ public static List<String> assertContains(List<String> result, String expected) {
+ if (!resultContains(result, expected)) {
+ fail("Didn't contain expected string=" + expected
+ + "\nActual:\n" + concatResult(result));
+ }
+ return result;
+ }
+
private static List<String> runCommand(Instrumentation instrumentation, String command) {
return runCommand(instrumentation, command, null);
}
@@ -206,6 +235,29 @@
+ " --user " + userId + " " + packageName);
}
+ public static void anyContains(List<String> result, String expected) {
+ for (String l : result) {
+ if (l.contains(expected)) {
+ return;
+ }
+ }
+ fail("Result didn't contain '" + expected + "': was\n" + result);
+ }
+
+ public static void enableComponent(Instrumentation instrumentation, ComponentName cn,
+ boolean enable) {
+
+ final String word = (enable ? "enable" : "disable");
+ runCommand(instrumentation,
+ "pm " + word + " " + cn.flattenToString()
+ , result ->concatResult(result).contains(word));
+ }
+
+ public static void appOps(Instrumentation instrumentation, String packageName,
+ String op, String mode) {
+ runCommand(instrumentation, "appops set " + packageName + " " + op + " " + mode);
+ }
+
public static void dumpsysShortcut(Instrumentation instrumentation) {
if (!ENABLE_DUMPSYS) {
return;
@@ -216,6 +268,18 @@
}
}
+ public static JSONObject getCheckinDump(Instrumentation instrumentation) throws JSONException {
+ return new JSONObject(concatResult(runCommand(instrumentation, "dumpsys shortcut -c")));
+ }
+
+ public static boolean isLowRamDevice(Instrumentation instrumentation) throws JSONException {
+ return getCheckinDump(instrumentation).getBoolean("lowRam");
+ }
+
+ public static int getIconSize(Instrumentation instrumentation) throws JSONException {
+ return getCheckinDump(instrumentation).getInt("iconSize");
+ }
+
public static Bundle makeBundle(Object... keysAndValues) {
assertTrue((keysAndValues.length % 2) == 0);
@@ -325,24 +389,29 @@
return filter(list, si -> si.getLastChangedTimestamp() >= time);
}
+ @FunctionalInterface
+ public interface ExceptionRunnable {
+ void run() throws Exception;
+ }
+
public static void assertExpectException(Class<? extends Throwable> expectedExceptionType,
- String expectedExceptionMessageRegex, Runnable r) {
+ String expectedExceptionMessageRegex, ExceptionRunnable r) {
assertExpectException("", expectedExceptionType, expectedExceptionMessageRegex, r);
}
public static void assertCannotUpdateImmutable(Runnable r) {
assertExpectException(
- IllegalArgumentException.class, "may not be manipulated via APIs", r);
+ IllegalArgumentException.class, "may not be manipulated via APIs", r::run);
}
public static void assertDynamicShortcutCountExceeded(Runnable r) {
assertExpectException(IllegalArgumentException.class,
- "Max number of dynamic shortcuts exceeded", r);
+ "Max number of dynamic shortcuts exceeded", r::run);
}
public static void assertExpectException(String message,
Class<? extends Throwable> expectedExceptionType,
- String expectedExceptionMessageRegex, Runnable r) {
+ String expectedExceptionMessageRegex, ExceptionRunnable r) {
try {
r.run();
} catch (Throwable e) {
@@ -865,8 +934,8 @@
if (b1 == null && b2 == null) {
return; // pass
}
- assertNotNull(b1);
- assertNotNull(b2);
+ assertNotNull("b1 is null but b2 is not", b1);
+ assertNotNull("b2 is null but b1 is not", b2);
// HashSet makes the error message readable.
assertEquals(set(b1.keySet()), set(b2.keySet()));
@@ -977,6 +1046,23 @@
waitOnMainThread();
+ // TODO unregister doesn't work well during unit tests. Figure out and fix it.
+ // launcherApps.unregisterCallback(asserter.getMockCallback());
+
return asserter;
}
+
+ public static void retryUntil(BooleanSupplier checker, String message) {
+ final long timeOut = System.currentTimeMillis() + 30 * 1000; // wait for 30 seconds.
+ while (!checker.getAsBoolean()) {
+ if (System.currentTimeMillis() > timeOut) {
+ break;
+ }
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException ignore) {
+ }
+ }
+ assertTrue(message, checker.getAsBoolean());
+ }
}
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index eb3c665..69cf1a2 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -838,6 +838,10 @@
&& mAppWidgetManager.isBoundWidgetPackage(packageName, userId)) {
return false;
}
+
+ if (isDeviceProvisioningPackage(packageName)) {
+ return false;
+ }
}
if (!isAppIdleUnfiltered(packageName, userId, elapsedRealtime)) {
@@ -930,6 +934,16 @@
return dpm.packageHasActiveAdmins(packageName, userId);
}
+ /**
+ * Returns {@code true} if the supplied package is the device provisioning app. Otherwise,
+ * returns {@code false}.
+ */
+ private boolean isDeviceProvisioningPackage(String packageName) {
+ String deviceProvisioningPackage = getContext().getResources().getString(
+ com.android.internal.R.string.config_deviceProvisioningPackage);
+ return deviceProvisioningPackage != null && deviceProvisioningPackage.equals(packageName);
+ }
+
private boolean isCarrierApp(String packageName) {
synchronized (mLock) {
if (!mHaveCarrierPrivilegedApps) {
diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
index 3779d87..e89585c 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
@@ -696,8 +696,13 @@
Slog.w(TAG, "Recognition aborted");
MetricsLogger.count(mContext, "sth_recognition_aborted", 1);
ModelData modelData = getModelDataForLocked(event.soundModelHandle);
- if (modelData != null) {
+ if (modelData != null && modelData.isModelStarted()) {
modelData.setStopped();
+ try {
+ modelData.getCallback().onRecognitionPaused();
+ } catch (RemoteException e) {
+ Slog.w(TAG, "RemoteException in onRecognitionPaused", e);
+ }
}
}
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 23c58fe..43d2a1f 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -41,6 +41,7 @@
import android.os.Handler;
import android.os.IBinder;
import android.os.Parcel;
+import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
@@ -55,15 +56,16 @@
import android.util.Log;
import android.util.Slog;
+import com.android.internal.app.IVoiceInteractionSessionListener;
import com.android.internal.app.IVoiceInteractionManagerService;
import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.internal.app.IVoiceInteractor;
import com.android.internal.content.PackageMonitor;
import com.android.internal.os.BackgroundThread;
import com.android.server.LocalServices;
-import com.android.server.soundtrigger.SoundTriggerInternal;
import com.android.server.SystemService;
import com.android.server.UiThread;
+import com.android.server.soundtrigger.SoundTriggerInternal;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -84,6 +86,9 @@
final TreeSet<Integer> mLoadedKeyphraseIds;
SoundTriggerInternal mSoundTriggerInternal;
+ private final RemoteCallbackList<IVoiceInteractionSessionListener>
+ mVoiceInteractionSessionListeners = new RemoteCallbackList<>();
+
public VoiceInteractionManagerService(Context context) {
super(context);
mContext = context;
@@ -1038,6 +1043,48 @@
}
@Override
+ public void registerVoiceInteractionSessionListener(
+ IVoiceInteractionSessionListener listener) {
+ enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE);
+ synchronized (this) {
+ mVoiceInteractionSessionListeners.register(listener);
+ }
+ }
+
+ public void onSessionShown() {
+ synchronized (this) {
+ final int size = mVoiceInteractionSessionListeners.beginBroadcast();
+ for (int i = 0; i < size; ++i) {
+ final IVoiceInteractionSessionListener listener =
+ mVoiceInteractionSessionListeners.getBroadcastItem(i);
+ try {
+ listener.onVoiceSessionShown();
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Error delivering voice interaction open event.", e);
+ }
+ }
+ mVoiceInteractionSessionListeners.finishBroadcast();
+ }
+ }
+
+ public void onSessionHidden() {
+ synchronized (this) {
+ final int size = mVoiceInteractionSessionListeners.beginBroadcast();
+ for (int i = 0; i < size; ++i) {
+ final IVoiceInteractionSessionListener listener =
+ mVoiceInteractionSessionListeners.getBroadcastItem(i);
+ try {
+ listener.onVoiceSessionHidden();
+
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Error delivering voice interaction closed event.", e);
+ }
+ }
+ mVoiceInteractionSessionListeners.finishBroadcast();
+ }
+ }
+
+ @Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
if (mContext.checkCallingOrSelfPermission(Manifest.permission.DUMP)
!= PackageManager.PERMISSION_GRANTED) {
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
index 3f9da4c..a46ccee 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
@@ -41,6 +41,7 @@
import android.util.Slog;
import android.view.IWindowManager;
+import com.android.internal.app.IVoiceInteractionSessionListener;
import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.internal.app.IVoiceInteractor;
import com.android.server.LocalServices;
@@ -58,7 +59,7 @@
final Context mContext;
final Handler mHandler;
- final Object mLock;
+ final VoiceInteractionManagerService.VoiceInteractionManagerServiceStub mServiceStub;
final int mUser;
final ComponentName mComponent;
final IActivityManager mAm;
@@ -77,7 +78,7 @@
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {
String reason = intent.getStringExtra("reason");
if (!CLOSE_REASON_VOICE_INTERACTION.equals(reason) && !"dream".equals(reason)) {
- synchronized (mLock) {
+ synchronized (mServiceStub) {
if (mActiveSession != null && mActiveSession.mSession != null) {
try {
mActiveSession.mSession.closeSystemDialogs();
@@ -93,7 +94,7 @@
final ServiceConnection mConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
- synchronized (mLock) {
+ synchronized (mServiceStub) {
mService = IVoiceInteractionService.Stub.asInterface(service);
try {
mService.ready();
@@ -108,11 +109,12 @@
}
};
- VoiceInteractionManagerServiceImpl(Context context, Handler handler, Object lock,
+ VoiceInteractionManagerServiceImpl(Context context, Handler handler,
+ VoiceInteractionManagerService.VoiceInteractionManagerServiceStub stub,
int userHandle, ComponentName service) {
mContext = context;
mHandler = handler;
- mLock = lock;
+ mServiceStub = stub;
mUser = userHandle;
mComponent = service;
mAm = ActivityManagerNative.getDefault();
@@ -148,8 +150,9 @@
public boolean showSessionLocked(Bundle args, int flags,
IVoiceInteractionSessionShowCallback showCallback, IBinder activityToken) {
if (mActiveSession == null) {
- mActiveSession = new VoiceInteractionSessionConnection(mLock, mSessionComponentName,
- mUser, mContext, this, mInfo.getServiceInfo().applicationInfo.uid, mHandler);
+ mActiveSession = new VoiceInteractionSessionConnection(mServiceStub,
+ mSessionComponentName, mUser, mContext, this,
+ mInfo.getServiceInfo().applicationInfo.uid, mHandler);
}
List<IBinder> activityTokens = null;
if (activityToken == null) {
@@ -355,8 +358,18 @@
@Override
public void sessionConnectionGone(VoiceInteractionSessionConnection connection) {
- synchronized (mLock) {
+ synchronized (mServiceStub) {
finishLocked(connection.mToken, false);
}
}
+
+ @Override
+ public void onSessionShown(VoiceInteractionSessionConnection connection) {
+ mServiceStub.onSessionShown();
+ }
+
+ @Override
+ public void onSessionHidden(VoiceInteractionSessionConnection connection) {
+ mServiceStub.onSessionHidden();
+ }
}
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
index 0694911..b0cc2ac 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
@@ -130,6 +130,8 @@
public interface Callback {
public void sessionConnectionGone(VoiceInteractionSessionConnection connection);
+ public void onSessionShown(VoiceInteractionSessionConnection connection);
+ public void onSessionHidden(VoiceInteractionSessionConnection connection);
}
final ServiceConnection mFullConnection = new ServiceConnection() {
@@ -313,6 +315,7 @@
} else if (showCallback != null) {
mPendingShowCallbacks.add(showCallback);
}
+ mCallback.onSessionShown(this);
return true;
}
if (showCallback != null) {
@@ -468,6 +471,7 @@
} catch (RemoteException e) {
}
}
+ mCallback.onSessionHidden(this);
}
if (mFullyBound) {
mContext.unbindService(mFullConnection);
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 3a6d1fd..62625bdf 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -701,6 +701,24 @@
}
}
+ /**
+ * Defines callbacks which inform the {@link InCallService} of changes to a {@link Call}.
+ * These callbacks can originate from the Telecom framework, or a {@link ConnectionService}
+ * implementation.
+ * <p>
+ * You can handle these callbacks by extending the {@link Callback} class and overriding the
+ * callbacks that your {@link InCallService} is interested in. The callback methods include the
+ * {@link Call} for which the callback applies, allowing reuse of a single instance of your
+ * {@link Callback} implementation, if desired.
+ * <p>
+ * Use {@link Call#registerCallback(Callback)} to register your callback(s). Ensure
+ * {@link Call#unregisterCallback(Callback)} is called when you no longer require callbacks
+ * (typically in {@link InCallService#onCallRemoved(Call)}).
+ * Note: Callbacks which occur before you call {@link Call#registerCallback(Callback)} will not
+ * reach your implementation of {@link Callback}, so it is important to register your callback
+ * as soon as your {@link InCallService} is notified of a new call via
+ * {@link InCallService#onCallAdded(Call)}.
+ */
public static abstract class Callback {
/**
* Invoked when the state of this {@code Call} has changed. See {@link #getState()}.
@@ -785,7 +803,13 @@
public void onConferenceableCallsChanged(Call call, List<Call> conferenceableCalls) {}
/**
- * Invoked when a call receives an event from its associated {@link Connection}.
+ * Invoked when a {@link Call} receives an event from its associated {@link Connection}.
+ * <p>
+ * Where possible, the Call should make an attempt to handle {@link Connection} events which
+ * are part of the {@code android.telecom.*} namespace. The Call should ignore any events
+ * it does not wish to handle. Unexpected events should be handled gracefully, as it is
+ * possible that a {@link ConnectionService} has defined its own Connection events which a
+ * Call is not aware of.
* <p>
* See {@link Connection#sendConnectionEvent(String, Bundle)}.
*
@@ -984,11 +1008,32 @@
* Sends a {@code Call} event from this {@code Call} to the associated {@link Connection} in
* the {@link ConnectionService}.
* <p>
+ * Call events are used to communicate point in time information from an {@link InCallService}
+ * to a {@link ConnectionService}. A {@link ConnectionService} implementation could define
+ * events which enable the {@link InCallService}, for example, toggle a unique feature of the
+ * {@link ConnectionService}.
+ * <p>
+ * A {@link ConnectionService} can communicate to the {@link InCallService} using
+ * {@link Connection#sendConnectionEvent(String, Bundle)}.
+ * <p>
* Events are exposed to {@link ConnectionService} implementations via
* {@link android.telecom.Connection#onCallEvent(String, Bundle)}.
* <p>
* No assumptions should be made as to how a {@link ConnectionService} will handle these events.
- * Events should be fully qualified (e.g., com.example.event.MY_EVENT) to avoid conflicts.
+ * The {@link InCallService} must assume that the {@link ConnectionService} could chose to
+ * ignore some events altogether.
+ * <p>
+ * Events should be fully qualified (e.g., {@code com.example.event.MY_EVENT}) to avoid
+ * conflicts between {@link InCallService} implementations. Further, {@link InCallService}
+ * implementations shall not re-purpose events in the {@code android.*} namespace, nor shall
+ * they define their own event types in this namespace. When defining a custom event type,
+ * ensure the contents of the extras {@link Bundle} is clearly defined. Extra keys for this
+ * bundle should be named similar to the event type (e.g. {@code com.example.extra.MY_EXTRA}).
+ * <p>
+ * When defining events and the associated extras, it is important to keep their behavior
+ * consistent when the associated {@link InCallService} is updated. Support for deprecated
+ * events/extras should me maintained to ensure backwards compatibility with older
+ * {@link ConnectionService} implementations which were built to support the older behavior.
*
* @param event The connection event.
* @param extras Bundle containing extra information associated with the event.
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 0eabf15..a012082 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -256,60 +256,63 @@
}
/**
- * Invoked when the Conference and all it's {@link Connection}s should be disconnected.
+ * Notifies the {@link Conference} when the Conference and all it's {@link Connection}s should
+ * be disconnected.
*/
public void onDisconnect() {}
/**
- * Invoked when the specified {@link Connection} should be separated from the conference call.
+ * Notifies the {@link Conference} when the specified {@link Connection} should be separated
+ * from the conference call.
*
* @param connection The connection to separate.
*/
public void onSeparate(Connection connection) {}
/**
- * Invoked when the specified {@link Connection} should merged with the conference call.
+ * Notifies the {@link Conference} when the specified {@link Connection} should merged with the
+ * conference call.
*
* @param connection The {@code Connection} to merge.
*/
public void onMerge(Connection connection) {}
/**
- * Invoked when the conference should be put on hold.
+ * Notifies the {@link Conference} when it should be put on hold.
*/
public void onHold() {}
/**
- * Invoked when the conference should be moved from hold to active.
+ * Notifies the {@link Conference} when it should be moved from a held to active state.
*/
public void onUnhold() {}
/**
- * Invoked when the child calls should be merged. Only invoked if the conference contains the
- * capability {@link Connection#CAPABILITY_MERGE_CONFERENCE}.
+ * Notifies the {@link Conference} when the child calls should be merged. Only invoked if the
+ * conference contains the capability {@link Connection#CAPABILITY_MERGE_CONFERENCE}.
*/
public void onMerge() {}
/**
- * Invoked when the child calls should be swapped. Only invoked if the conference contains the
- * capability {@link Connection#CAPABILITY_SWAP_CONFERENCE}.
+ * Notifies the {@link Conference} when the child calls should be swapped. Only invoked if the
+ * conference contains the capability {@link Connection#CAPABILITY_SWAP_CONFERENCE}.
*/
public void onSwap() {}
/**
- * Notifies this conference of a request to play a DTMF tone.
+ * Notifies the {@link Conference} of a request to play a DTMF tone.
*
* @param c A DTMF character.
*/
public void onPlayDtmfTone(char c) {}
/**
- * Notifies this conference of a request to stop any currently playing DTMF tones.
+ * Notifies the {@link Conference} of a request to stop any currently playing DTMF tones.
*/
public void onStopDtmfTone() {}
/**
- * Notifies this conference that the {@link #getAudioState()} property has a new value.
+ * Notifies the {@link Conference} that the {@link #getAudioState()} property has a new value.
*
* @param state The new call audio state.
* @deprecated Use {@link #onCallAudioStateChanged(CallAudioState)} instead.
@@ -320,14 +323,15 @@
public void onAudioStateChanged(AudioState state) {}
/**
- * Notifies this conference that the {@link #getCallAudioState()} property has a new value.
+ * Notifies the {@link Conference} that the {@link #getCallAudioState()} property has a new
+ * value.
*
* @param state The new call audio state.
*/
public void onCallAudioStateChanged(CallAudioState state) {}
/**
- * Notifies this conference that a connection has been added to it.
+ * Notifies the {@link Conference} that a {@link Connection} has been added to it.
*
* @param connection The newly added connection.
*/
@@ -680,12 +684,13 @@
* New or existing keys are replaced in the {@code Conference} extras. Keys which are no longer
* in the new extras, but were present the last time {@code setExtras} was called are removed.
* <p>
+ * Alternatively you may use the {@link #putExtras(Bundle)}, and
+ * {@link #removeExtras(String...)} methods to modify the extras.
+ * <p>
* No assumptions should be made as to how an In-Call UI or service will handle these extras.
- * Keys should be fully qualified (e.g., com.example.MY_EXTRA) to avoid conflicts.
+ * Keys should be fully qualified (e.g., com.example.extras.MY_EXTRA) to avoid conflicts.
*
* @param extras The extras associated with this {@code Conference}.
- * @deprecated Use {@link #putExtras(Bundle)} to add extras. Use {@link #removeExtras(List)}
- * to remove extras.
*/
public final void setExtras(@Nullable Bundle extras) {
// Keeping putExtras and removeExtras in the same lock so that this operation happens as a
diff --git a/telecomm/java/android/telecom/ConferenceParticipant.java b/telecomm/java/android/telecom/ConferenceParticipant.java
index db0f151..20b04eb 100644
--- a/telecomm/java/android/telecom/ConferenceParticipant.java
+++ b/telecomm/java/android/telecom/ConferenceParticipant.java
@@ -114,13 +114,13 @@
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("[ConferenceParticipant Handle: ");
- sb.append(mHandle);
+ sb.append(Log.pii(mHandle));
sb.append(" DisplayName: ");
- sb.append(mDisplayName);
+ sb.append(Log.pii(mDisplayName));
sb.append(" Endpoint: ");
- sb.append(mEndpoint);
+ sb.append(Log.pii(mEndpoint));
sb.append(" State: ");
- sb.append(mState);
+ sb.append(Connection.stateToString(mState));
sb.append("]");
return sb.toString();
}
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 3930208..4da5ff2 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -53,6 +53,37 @@
* Implementations are then responsible for updating the state of the {@code Connection}, and
* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
* longer used and associated resources may be recovered.
+ * <p>
+ * Subclasses of {@code Connection} override the {@code on*} methods to provide the the
+ * {@link ConnectionService}'s implementation of calling functionality. The {@code on*} methods are
+ * called by Telecom to inform an instance of a {@code Connection} of actions specific to that
+ * {@code Connection} instance.
+ * <p>
+ * Basic call support requires overriding the following methods: {@link #onAnswer()},
+ * {@link #onDisconnect()}, {@link #onReject()}, {@link #onAbort()}
+ * <p>
+ * Where a {@code Connection} has {@link #CAPABILITY_SUPPORT_HOLD}, the {@link #onHold()} and
+ * {@link #onUnhold()} methods should be overridden to provide hold support for the
+ * {@code Connection}.
+ * <p>
+ * Where a {@code Connection} supports a variation of video calling (e.g. the
+ * {@code CAPABILITY_SUPPORTS_VT_*} capability bits), {@link #onAnswer(int)} should be overridden
+ * to support answering a call as a video call.
+ * <p>
+ * Where a {@code Connection} has {@link #PROPERTY_IS_EXTERNAL_CALL} and
+ * {@link #CAPABILITY_CAN_PULL_CALL}, {@link #onPullExternalCall()} should be overridden to provide
+ * support for pulling the external call.
+ * <p>
+ * Where a {@code Connection} supports conference calling {@link #onSeparate()} should be
+ * overridden.
+ * <p>
+ * There are a number of other {@code on*} methods which a {@code Connection} can choose to
+ * implement, depending on whether it is concerned with the associated calls from Telecom. If,
+ * for example, call events from a {@link InCallService} are handled,
+ * {@link #onCallEvent(String, Bundle)} should be overridden. Another example is
+ * {@link #onExtrasChanged(Bundle)}, which should be overridden if the {@code Connection} wishes to
+ * make use of extra information provided via the {@link Call#putExtras(Bundle)} and
+ * {@link Call#removeExtras(String...)} methods.
*/
public abstract class Connection extends Conferenceable {
@@ -339,8 +370,14 @@
*/
public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 1<<5;
+ /**
+ * Indicates that the connection represents a downgraded IMS conference.
+ * @hide
+ */
+ public static final int PROPERTY_IS_DOWNGRADED_CONFERENCE = 1<<6;
+
//**********************************************************************************************
- // Next PROPERTY value: 1<<6
+ // Next PROPERTY value: 1<<7
//**********************************************************************************************
/**
@@ -375,9 +412,17 @@
"android.telecom.extra.ANSWERING_DROPS_FG_CALL";
/**
+ * Boolean connection extra key on a {@link Connection} which indicates that adding an
+ * additional call is disallowed.
+ * @hide
+ */
+ public static final String EXTRA_DISABLE_ADD_CALL =
+ "android.telecom.extra.DISABLE_ADD_CALL";
+
+ /**
* Connection event used to inform Telecom that it should play the on hold tone. This is used
* to play a tone when the peer puts the current call on hold. Sent to Telecom via
- * {@link #sendConnectionEvent(String)}.
+ * {@link #sendConnectionEvent(String, Bundle)}.
* @hide
*/
public static final String EVENT_ON_HOLD_TONE_START =
@@ -386,7 +431,7 @@
/**
* Connection event used to inform Telecom that it should stop the on hold tone. This is used
* to stop a tone when the peer puts the current call on hold. Sent to Telecom via
- * {@link #sendConnectionEvent(String)}.
+ * {@link #sendConnectionEvent(String, Bundle)}.
* @hide
*/
public static final String EVENT_ON_HOLD_TONE_END =
@@ -401,12 +446,18 @@
* {@link Call.Details#PROPERTY_IS_EXTERNAL_CALL} and
* {@link Call.Details#CAPABILITY_CAN_PULL_CALL}, but the {@link ConnectionService} could not
* pull the external call due to an error condition.
+ * <p>
+ * Sent via {@link #sendConnectionEvent(String, Bundle)}. The {@link Bundle} parameter is
+ * expected to be null when this connection event is used.
*/
public static final String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";
/**
* Connection event used to inform {@link InCallService}s when the merging of two calls has
* failed. The User Interface should use this message to inform the user of the error.
+ * <p>
+ * Sent via {@link #sendConnectionEvent(String, Bundle)}. The {@link Bundle} parameter is
+ * expected to be null when this connection event is used.
*/
public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";
@@ -456,101 +507,150 @@
mConnectionCapabilities |= capability;
}
-
+ /**
+ * Renders a set of capability bits ({@code CAPABILITY_*}) as a human readable string.
+ *
+ * @param capabilities A capability bit field.
+ * @return A human readable string representation.
+ */
public static String capabilitiesToString(int capabilities) {
+ return capabilitiesToStringInternal(capabilities, true /* isLong */);
+ }
+
+ /**
+ * Renders a set of capability bits ({@code CAPABILITY_*}) as a *short* human readable
+ * string.
+ *
+ * @param capabilities A capability bit field.
+ * @return A human readable string representation.
+ * @hide
+ */
+ public static String capabilitiesToStringShort(int capabilities) {
+ return capabilitiesToStringInternal(capabilities, false /* isLong */);
+ }
+
+ private static String capabilitiesToStringInternal(int capabilities, boolean isLong) {
StringBuilder builder = new StringBuilder();
- builder.append("[Capabilities:");
+ builder.append("[");
+ if (isLong) {
+ builder.append("Capabilities:");
+ }
+
if (can(capabilities, CAPABILITY_HOLD)) {
- builder.append(" CAPABILITY_HOLD");
+ builder.append(isLong ? " CAPABILITY_HOLD" : " hld");
}
if (can(capabilities, CAPABILITY_SUPPORT_HOLD)) {
- builder.append(" CAPABILITY_SUPPORT_HOLD");
+ builder.append(isLong ? " CAPABILITY_SUPPORT_HOLD" : " sup_hld");
}
if (can(capabilities, CAPABILITY_MERGE_CONFERENCE)) {
- builder.append(" CAPABILITY_MERGE_CONFERENCE");
+ builder.append(isLong ? " CAPABILITY_MERGE_CONFERENCE" : " mrg_cnf");
}
if (can(capabilities, CAPABILITY_SWAP_CONFERENCE)) {
- builder.append(" CAPABILITY_SWAP_CONFERENCE");
+ builder.append(isLong ? " CAPABILITY_SWAP_CONFERENCE" : " swp_cnf");
}
if (can(capabilities, CAPABILITY_RESPOND_VIA_TEXT)) {
- builder.append(" CAPABILITY_RESPOND_VIA_TEXT");
+ builder.append(isLong ? " CAPABILITY_RESPOND_VIA_TEXT" : " txt");
}
if (can(capabilities, CAPABILITY_MUTE)) {
- builder.append(" CAPABILITY_MUTE");
+ builder.append(isLong ? " CAPABILITY_MUTE" : " mut");
}
if (can(capabilities, CAPABILITY_MANAGE_CONFERENCE)) {
- builder.append(" CAPABILITY_MANAGE_CONFERENCE");
+ builder.append(isLong ? " CAPABILITY_MANAGE_CONFERENCE" : " mng_cnf");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_RX)) {
- builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_RX");
+ builder.append(isLong ? " CAPABILITY_SUPPORTS_VT_LOCAL_RX" : " VTlrx");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {
- builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX");
+ builder.append(isLong ? " CAPABILITY_SUPPORTS_VT_LOCAL_TX" : " VTltx");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL)) {
- builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL");
+ builder.append(isLong ? " CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL" : " VTlbi");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {
- builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX");
+ builder.append(isLong ? " CAPABILITY_SUPPORTS_VT_REMOTE_RX" : " VTrrx");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) {
- builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX");
+ builder.append(isLong ? " CAPABILITY_SUPPORTS_VT_REMOTE_TX" : " VTrtx");
}
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) {
- builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL");
+ builder.append(isLong ? " CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL" : " VTrbi");
}
if (can(capabilities, CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO)) {
- builder.append(" CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO");
+ builder.append(isLong ? " CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO" : " !v2a");
}
if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
- builder.append(" CAPABILITY_SPEED_UP_MT_AUDIO");
+ builder.append(isLong ? " CAPABILITY_SPEED_UP_MT_AUDIO" : " spd_aud");
}
if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {
- builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO");
+ builder.append(isLong ? " CAPABILITY_CAN_UPGRADE_TO_VIDEO" : " a2v");
}
if (can(capabilities, CAPABILITY_CAN_PAUSE_VIDEO)) {
- builder.append(" CAPABILITY_CAN_PAUSE_VIDEO");
+ builder.append(isLong ? " CAPABILITY_CAN_PAUSE_VIDEO" : " paus_VT");
}
if (can(capabilities, CAPABILITY_CONFERENCE_HAS_NO_CHILDREN)) {
- builder.append(" CAPABILITY_SINGLE_PARTY_CONFERENCE");
+ builder.append(isLong ? " CAPABILITY_SINGLE_PARTY_CONFERENCE" : " 1p_cnf");
}
if (can(capabilities, CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION)) {
- builder.append(" CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION");
+ builder.append(isLong ? " CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION" : " rsp_by_con");
}
if (can(capabilities, CAPABILITY_CAN_PULL_CALL)) {
- builder.append(" CAPABILITY_CAN_PULL_CALL");
+ builder.append(isLong ? " CAPABILITY_CAN_PULL_CALL" : " pull");
}
builder.append("]");
return builder.toString();
}
+ /**
+ * Renders a set of property bits ({@code PROPERTY_*}) as a human readable string.
+ *
+ * @param properties A property bit field.
+ * @return A human readable string representation.
+ */
public static String propertiesToString(int properties) {
+ return propertiesToStringInternal(properties, true /* isLong */);
+ }
+
+ /**
+ * Renders a set of property bits ({@code PROPERTY_*}) as a *short* human readable string.
+ *
+ * @param properties A property bit field.
+ * @return A human readable string representation.
+ * @hide
+ */
+ public static String propertiesToStringShort(int properties) {
+ return propertiesToStringInternal(properties, false /* isLong */);
+ }
+
+ private static String propertiesToStringInternal(int properties, boolean isLong) {
StringBuilder builder = new StringBuilder();
- builder.append("[Properties:");
+ builder.append("[");
+ if (isLong) {
+ builder.append("Properties:");
+ }
if (can(properties, PROPERTY_SHOW_CALLBACK_NUMBER)) {
- builder.append(" PROPERTY_SHOW_CALLBACK_NUMBER");
+ builder.append(isLong ? " PROPERTY_SHOW_CALLBACK_NUMBER" : " clbk");
}
if (can(properties, PROPERTY_HIGH_DEF_AUDIO)) {
- builder.append(" PROPERTY_HIGH_DEF_AUDIO");
+ builder.append(isLong ? " PROPERTY_HIGH_DEF_AUDIO" : " HD");
}
if (can(properties, PROPERTY_WIFI)) {
- builder.append(" PROPERTY_WIFI");
+ builder.append(isLong ? " PROPERTY_WIFI" : " wifi");
}
if (can(properties, PROPERTY_GENERIC_CONFERENCE)) {
- builder.append(" PROPERTY_GENERIC_CONFERENCE");
+ builder.append(isLong ? " PROPERTY_GENERIC_CONFERENCE" : " gen_conf");
}
if (can(properties, PROPERTY_IS_EXTERNAL_CALL)) {
- builder.append(" PROPERTY_IS_EXTERNAL_CALL");
+ builder.append(isLong ? " PROPERTY_IS_EXTERNAL_CALL" : " xtrnl");
}
if (can(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
- builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");
+ builder.append(isLong ? " PROPERTY_HAS_CDMA_VOICE_PRIVACY" : " priv");
}
builder.append("]");
@@ -586,6 +686,8 @@
public void onExtrasChanged(Connection c, Bundle extras) {}
public void onExtrasRemoved(Connection c, List<String> keys) {}
public void onConnectionEvent(Connection c, String event, Bundle extras) {}
+ /** @hide */
+ public void onConferenceSupportedChanged(Connection c, boolean isConferenceSupported) {}
}
/**
@@ -1493,6 +1595,8 @@
return "RINGING";
case STATE_DIALING:
return "DIALING";
+ case STATE_PULLING_CALL:
+ return "PULLING_CALL";
case STATE_ACTIVE:
return "ACTIVE";
case STATE_HOLDING:
@@ -1614,6 +1718,16 @@
}
/**
+ * Sets state to pulling (e.g. the connection is being pulled to the local device from another
+ * device). Only applicable for {@link Connection}s with
+ * {@link Connection#PROPERTY_IS_EXTERNAL_CALL} and {@link Connection#CAPABILITY_CAN_PULL_CALL}.
+ */
+ public final void setPulling() {
+ checkImmutable();
+ setState(STATE_PULLING_CALL);
+ }
+
+ /**
* Sets state to be on hold.
*/
public final void setOnHold() {
@@ -1899,12 +2013,13 @@
* New or existing keys are replaced in the {@code Connection} extras. Keys which are no longer
* in the new extras, but were present the last time {@code setExtras} was called are removed.
* <p>
+ * Alternatively you may use the {@link #putExtras(Bundle)}, and
+ * {@link #removeExtras(String...)} methods to modify the extras.
+ * <p>
* No assumptions should be made as to how an In-Call UI or service will handle these extras.
* Keys should be fully qualified (e.g., com.example.MY_EXTRA) to avoid conflicts.
*
* @param extras The extras associated with this {@code Connection}.
- * @deprecated Use {@link #putExtras(Bundle)} to add extras. Use {@link #removeExtras(List)}
- * to remove extras.
*/
public final void setExtras(@Nullable Bundle extras) {
checkImmutable();
@@ -2165,6 +2280,12 @@
* <p>
* The {@link InCallService} issues a Call event via {@link Call#sendCallEvent(String, Bundle)}.
* <p>
+ * Where possible, the Connection should make an attempt to handle {@link Call} events which
+ * are part of the {@code android.telecom.*} namespace. The Connection should ignore any events
+ * it does not wish to handle. Unexpected events should be handled gracefully, as it is
+ * possible that a {@link InCallService} has defined its own Call events which a Connection is
+ * not aware of.
+ * <p>
* See also {@link Call#sendCallEvent(String, Bundle)}.
*
* @param event The call event.
@@ -2355,16 +2476,54 @@
}
/**
- * Sends an event associated with this {@code Connection}, with associated event extras.
- *
- * Events are exposed to {@link InCallService} implementations via the
- * {@link Call.Callback#onConnectionEvent(Call, String, Bundle)} API.
- *
+ * Notifies listeners when a change has occurred to the Connection which impacts its ability to
+ * be a part of a conference call.
+ * @param isConferenceSupported {@code true} if the connection supports being part of a
+ * conference call, {@code false} otherwise.
+ * @hide
+ */
+ protected void notifyConferenceSupportedChanged(boolean isConferenceSupported) {
+ for (Listener l : mListeners) {
+ l.onConferenceSupportedChanged(this, isConferenceSupported);
+ }
+ }
+
+ /**
+ * Sends an event associated with this {@code Connection} with associated event extras to the
+ * {@link InCallService}.
+ * <p>
+ * Connection events are used to communicate point in time information from a
+ * {@link ConnectionService} to a {@link InCallService} implementations. An example of a
+ * custom connection event includes notifying the UI when a WIFI call has been handed over to
+ * LTE, which the InCall UI might use to inform the user that billing charges may apply. The
+ * Android Telephony framework will send the {@link #EVENT_CALL_MERGE_FAILED} connection event
+ * when a call to {@link Call#mergeConference()} has failed to complete successfully. A
+ * connection event could also be used to trigger UI in the {@link InCallService} which prompts
+ * the user to make a choice (e.g. whether they want to incur roaming costs for making a call),
+ * which is communicated back via {@link Call#sendCallEvent(String, Bundle)}.
+ * <p>
+ * Events are exposed to {@link InCallService} implementations via
+ * {@link Call.Callback#onConnectionEvent(Call, String, Bundle)}.
+ * <p>
* No assumptions should be made as to how an In-Call UI or service will handle these events.
- * Events should be fully qualified (e.g., com.example.event.MY_EVENT) to avoid conflicts.
+ * The {@link ConnectionService} must assume that the In-Call UI could even chose to ignore
+ * some events altogether.
+ * <p>
+ * Events should be fully qualified (e.g. {@code com.example.event.MY_EVENT}) to avoid
+ * conflicts between {@link ConnectionService} implementations. Further, custom
+ * {@link ConnectionService} implementations shall not re-purpose events in the
+ * {@code android.*} namespace, nor shall they define new event types in this namespace. When
+ * defining a custom event type, ensure the contents of the extras {@link Bundle} is clearly
+ * defined. Extra keys for this bundle should be named similar to the event type (e.g.
+ * {@code com.example.extra.MY_EXTRA}).
+ * <p>
+ * When defining events and the associated extras, it is important to keep their behavior
+ * consistent when the associated {@link ConnectionService} is updated. Support for deprecated
+ * events/extras should me maintained to ensure backwards compatibility with older
+ * {@link InCallService} implementations which were built to support the older behavior.
*
* @param event The connection event.
- * @param extras Bundle containing extra information associated with the event.
+ * @param extras Optional bundle containing extra information associated with the event.
*/
public void sendConnectionEvent(String event, Bundle extras) {
for (Listener l : mListeners) {
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index fc7d741..0c75630 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -556,6 +556,9 @@
case Connection.STATE_DIALING:
mAdapter.setDialing(id);
break;
+ case Connection.STATE_PULLING_CALL:
+ mAdapter.setPulling(id);
+ break;
case Connection.STATE_DISCONNECTED:
// Handled in onDisconnected()
break;
diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapter.java b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
index c8cd3c0..df7d539 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapter.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
@@ -143,6 +143,21 @@
}
/**
+ * Sets a call's state to pulling (e.g. a call with {@link Connection#PROPERTY_IS_EXTERNAL_CALL}
+ * is being pulled to the local device.
+ *
+ * @param callId The unique ID of the call whose state is changing to dialing.
+ */
+ void setPulling(String callId) {
+ for (IConnectionServiceAdapter adapter : mAdapters) {
+ try {
+ adapter.setPulling(callId);
+ } catch (RemoteException e) {
+ }
+ }
+ }
+
+ /**
* Sets a call's state to disconnected.
*
* @param callId The unique ID of the call whose state is changing to disconnected.
diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
index bf28feb..486f9d5 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
@@ -65,6 +65,7 @@
private static final int MSG_REMOVE_EXTRAS = 25;
private static final int MSG_ON_CONNECTION_EVENT = 26;
private static final int MSG_SET_CONNECTION_PROPERTIES = 27;
+ private static final int MSG_SET_PULLING = 28;
private final IConnectionServiceAdapter mDelegate;
@@ -101,6 +102,9 @@
case MSG_SET_DIALING:
mDelegate.setDialing((String) msg.obj);
break;
+ case MSG_SET_PULLING:
+ mDelegate.setPulling((String) msg.obj);
+ break;
case MSG_SET_DISCONNECTED: {
SomeArgs args = (SomeArgs) msg.obj;
try {
@@ -299,6 +303,11 @@
}
@Override
+ public void setPulling(String connectionId) {
+ mHandler.obtainMessage(MSG_SET_PULLING, connectionId).sendToTarget();
+ }
+
+ @Override
public void setDisconnected(
String connectionId, DisconnectCause disconnectCause) {
SomeArgs args = SomeArgs.obtain();
diff --git a/telecomm/java/android/telecom/DisconnectCause.java b/telecomm/java/android/telecom/DisconnectCause.java
index cf73d4f..6860269 100644
--- a/telecomm/java/android/telecom/DisconnectCause.java
+++ b/telecomm/java/android/telecom/DisconnectCause.java
@@ -275,6 +275,12 @@
case CONNECTION_MANAGER_NOT_SUPPORTED:
code = "CONNECTION_MANAGER_NOT_SUPPORTED";
break;
+ case CALL_PULLED:
+ code = "CALL_PULLED";
+ break;
+ case ANSWERED_ELSEWHERE:
+ code = "ANSWERED_ELSEWHERE";
+ break;
default:
code = "invalid code: " + mDisconnectCode;
break;
diff --git a/telecomm/java/android/telecom/ParcelableCallAnalytics.java b/telecomm/java/android/telecom/ParcelableCallAnalytics.java
index 0ee9bab..383d10b 100644
--- a/telecomm/java/android/telecom/ParcelableCallAnalytics.java
+++ b/telecomm/java/android/telecom/ParcelableCallAnalytics.java
@@ -21,6 +21,7 @@
import android.os.Parcelable;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -28,6 +29,68 @@
*/
@SystemApi
public class ParcelableCallAnalytics implements Parcelable {
+ /** {@hide} */
+ public static final class VideoEvent implements Parcelable {
+ public static final int SEND_LOCAL_SESSION_MODIFY_REQUEST = 0;
+ public static final int SEND_LOCAL_SESSION_MODIFY_RESPONSE = 1;
+ public static final int RECEIVE_REMOTE_SESSION_MODIFY_REQUEST = 2;
+ public static final int RECEIVE_REMOTE_SESSION_MODIFY_RESPONSE = 3;
+
+ public static final Parcelable.Creator<VideoEvent> CREATOR =
+ new Parcelable.Creator<VideoEvent> () {
+
+ @Override
+ public VideoEvent createFromParcel(Parcel in) {
+ return new VideoEvent(in);
+ }
+
+ @Override
+ public VideoEvent[] newArray(int size) {
+ return new VideoEvent[size];
+ }
+ };
+
+ private int mEventName;
+ private long mTimeSinceLastEvent;
+ private int mVideoState;
+
+ public VideoEvent(int eventName, long timeSinceLastEvent, int videoState) {
+ mEventName = eventName;
+ mTimeSinceLastEvent = timeSinceLastEvent;
+ mVideoState = videoState;
+ }
+
+ VideoEvent(Parcel in) {
+ mEventName = in.readInt();
+ mTimeSinceLastEvent = in.readLong();
+ mVideoState = in.readInt();
+ }
+
+ public int getEventName() {
+ return mEventName;
+ }
+
+ public long getTimeSinceLastEvent() {
+ return mTimeSinceLastEvent;
+ }
+
+ public int getVideoState() {
+ return mVideoState;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeInt(mEventName);
+ out.writeLong(mTimeSinceLastEvent);
+ out.writeInt(mVideoState);
+ }
+ }
+
public static final class AnalyticsEvent implements Parcelable {
public static final int SET_SELECT_PHONE_ACCOUNT = 0;
public static final int SET_ACTIVE = 1;
@@ -250,6 +313,12 @@
// A map from event-pair names to their durations.
private final List<EventTiming> eventTimings;
+ // Whether the call has ever been a video call.
+ private boolean isVideoCall = false;
+
+ // A list of video events that have occurred.
+ private List<VideoEvent> videoEvents;
+
public ParcelableCallAnalytics(long startTimeMillis, long callDurationMillis, int callType,
boolean isAdditionalCall, boolean isInterrupted, int callTechnologies,
int callTerminationCode, boolean isEmergencyCall, String connectionService,
@@ -284,6 +353,9 @@
in.readTypedList(analyticsEvents, AnalyticsEvent.CREATOR);
eventTimings = new ArrayList<>();
in.readTypedList(eventTimings, EventTiming.CREATOR);
+ isVideoCall = readByteAsBoolean(in);
+ videoEvents = new LinkedList<>();
+ in.readTypedList(videoEvents, VideoEvent.CREATOR);
}
public void writeToParcel(Parcel out, int flags) {
@@ -299,6 +371,18 @@
writeBooleanAsByte(out, isCreatedFromExistingConnection);
out.writeTypedList(analyticsEvents);
out.writeTypedList(eventTimings);
+ writeBooleanAsByte(out, isVideoCall);
+ out.writeTypedList(videoEvents);
+ }
+
+ /** {@hide} */
+ public void setIsVideoCall(boolean isVideoCall) {
+ this.isVideoCall = isVideoCall;
+ }
+
+ /** {@hide} */
+ public void setVideoEvents(List<VideoEvent> videoEvents) {
+ this.videoEvents = videoEvents;
}
public long getStartTimeMillis() {
@@ -349,6 +433,16 @@
return eventTimings;
}
+ /** {@hide} */
+ public boolean isVideoCall() {
+ return isVideoCall;
+ }
+
+ /** {@hide} */
+ public List<VideoEvent> getVideoEvents() {
+ return videoEvents;
+ }
+
@Override
public int describeContents() {
return 0;
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index dbc2b0c..473e394 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -220,6 +220,7 @@
private final Icon mIcon;
private final Bundle mExtras;
private boolean mIsEnabled;
+ private String mGroupId;
/**
* Helper class for creating a {@link PhoneAccount}.
@@ -236,6 +237,7 @@
private Icon mIcon;
private Bundle mExtras;
private boolean mIsEnabled = false;
+ private String mGroupId = "";
/**
* Creates a builder with the specified {@link PhoneAccountHandle} and label.
@@ -263,6 +265,7 @@
mIcon = phoneAccount.getIcon();
mIsEnabled = phoneAccount.isEnabled();
mExtras = phoneAccount.getExtras();
+ mGroupId = phoneAccount.getGroupId();
}
/**
@@ -387,6 +390,27 @@
}
/**
+ * Sets the group Id of the {@link PhoneAccount}. When a new {@link PhoneAccount} is
+ * registered to Telecom, it will replace another {@link PhoneAccount} that is already
+ * registered in Telecom and take on the current user defaults and enabled status. There can
+ * only be one {@link PhoneAccount} with a non-empty group number registered to Telecom at a
+ * time. By default, there is no group Id for a {@link PhoneAccount} (an empty String). Only
+ * grouped {@link PhoneAccount}s with the same {@link ConnectionService} can be replaced.
+ * @param groupId The group Id of the {@link PhoneAccount} that will replace any other
+ * registered {@link PhoneAccount} in Telecom with the same Group Id.
+ * @return The builder
+ * @hide
+ */
+ public Builder setGroupId(String groupId) {
+ if (groupId != null) {
+ mGroupId = groupId;
+ } else {
+ mGroupId = "";
+ }
+ return this;
+ }
+
+ /**
* Creates an instance of a {@link PhoneAccount} based on the current builder settings.
*
* @return The {@link PhoneAccount}.
@@ -408,7 +432,8 @@
mShortDescription,
mSupportedUriSchemes,
mExtras,
- mIsEnabled);
+ mIsEnabled,
+ mGroupId);
}
}
@@ -423,7 +448,8 @@
CharSequence shortDescription,
List<String> supportedUriSchemes,
Bundle extras,
- boolean isEnabled) {
+ boolean isEnabled,
+ String groupId) {
mAccountHandle = account;
mAddress = address;
mSubscriptionAddress = subscriptionAddress;
@@ -435,6 +461,7 @@
mSupportedUriSchemes = Collections.unmodifiableList(supportedUriSchemes);
mExtras = extras;
mIsEnabled = isEnabled;
+ mGroupId = groupId;
}
public static Builder builder(
@@ -564,6 +591,21 @@
}
/**
+ * A non-empty {@link String} representing the group that A {@link PhoneAccount} is in or an
+ * empty {@link String} if the {@link PhoneAccount} is not in a group. If this
+ * {@link PhoneAccount} is in a group, this new {@link PhoneAccount} will replace a registered
+ * {@link PhoneAccount} that is in the same group. When the {@link PhoneAccount} is replaced,
+ * its user defined defaults and enabled status will also pass to this new {@link PhoneAccount}.
+ * Only {@link PhoneAccount}s that share the same {@link ConnectionService} can be replaced.
+ *
+ * @return A non-empty String Id if this {@link PhoneAccount} belongs to a group.
+ * @hide
+ */
+ public String getGroupId() {
+ return mGroupId;
+ }
+
+ /**
* Determines if the {@link PhoneAccount} supports calls to/from addresses with a specified URI
* scheme.
*
@@ -644,6 +686,7 @@
}
out.writeByte((byte) (mIsEnabled ? 1 : 0));
out.writeBundle(mExtras);
+ out.writeString(mGroupId);
}
public static final Creator<PhoneAccount> CREATOR
@@ -687,6 +730,7 @@
}
mIsEnabled = in.readByte() == 1;
mExtras = in.readBundle();
+ mGroupId = in.readString();
}
@Override
@@ -704,6 +748,8 @@
}
sb.append(" Extras: ");
sb.append(mExtras);
+ sb.append(" GroupId: ");
+ sb.append(Log.pii(mGroupId));
sb.append("]");
return sb.toString();
}
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index 21a7706..306b3c1 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -118,6 +118,12 @@
}
@Override
+ public void setPulling(String callId) {
+ findConnectionForAction(callId, "setPulling")
+ .setState(Connection.STATE_PULLING_CALL);
+ }
+
+ @Override
public void setDisconnected(String callId, DisconnectCause disconnectCause) {
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "setDisconnected")
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
index 9bc8ffe..3bf83ae 100644
--- a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
@@ -47,6 +47,8 @@
void setDialing(String callId);
+ void setPulling(String callId);
+
void setDisconnected(String callId, in DisconnectCause disconnectCause);
void setOnHold(String callId);
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 1b488a6..3d85ec5 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -24,6 +24,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
+import com.android.ims.ImsReasonInfo;
import com.android.internal.telephony.ICarrierConfigLoader;
/**
@@ -285,6 +286,16 @@
public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL =
"carrier_default_wfc_ims_roaming_enabled_bool";
+ /**
+ * Flag indicating whether failed calls due to no service should prompt the user to enable
+ * WIFI calling. When {@code true}, if the user attempts to establish a call when there is no
+ * service available, they are connected to WIFI, and WIFI calling is disabled, a different
+ * call failure message will be used to encourage the user to enable WIFI calling.
+ * @hide
+ */
+ public static final String KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL =
+ "carrier_promote_wfc_on_call_fail_bool";
+
/** Flag specifying whether provisioning is required for VOLTE. */
public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
= "carrier_volte_provisioning_required_bool";
@@ -392,6 +403,13 @@
"always_show_emergency_alert_onoff_bool";
/**
+ * The flag to disable cell broadcast severe alert when extreme alert is disabled.
+ * @hide
+ */
+ public static final String KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL =
+ "disable_severe_when_extreme_disabled_bool";
+
+ /**
* The data call APN retry configuration for default type APN.
* @hide
*/
@@ -679,6 +697,8 @@
public static final String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
public static final String KEY_MMS_USER_AGENT_STRING = "userAgent";
+ /** @hide */
+ public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection";
/**
* If carriers require differentiate un-provisioned status: cold sim or out of credit sim
@@ -784,6 +804,13 @@
public static final int CDMA_ROAMING_MODE_ANY = 2;
/**
+ * Report IMEI as device id even if it's a CDMA/LTE phone.
+ *
+ * @hide
+ */
+ public static final String KEY_FORCE_IMEI_BOOL = "force_imei_bool";
+
+ /**
* The families of Radio Access Technologies that will get clustered and ratcheted,
* ie, we will report transitions up within the family, but not down until we change
* cells. This prevents flapping between base technologies and higher techs that are
@@ -814,11 +841,69 @@
public static final String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL =
"drop_video_call_when_answering_audio_call_bool";
+ /**
+ * Flag indicating whether the carrier supports merging wifi calls when VoWIFI is disabled.
+ * This can happen in the case of a carrier which allows offloading video calls to WIFI
+ * separately of whether voice over wifi is enabled. In such a scenario when two video calls
+ * are downgraded to voice, they remain over wifi. However, if VoWIFI is disabled, these calls
+ * cannot be merged.
+ */
+ public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL =
+ "allow_merge_wifi_calls_when_vowifi_off_bool";
+
+ /**
+ * Flag indicating whether the carrier supports the Hold command while in an IMS call.
+ * @hide
+ */
+ public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";
+
+ /**
+ * When true, indicates that adding a call is disabled when there is an ongoing video call
+ * or when there is an ongoing call on wifi which was downgraded from video and VoWifi is
+ * turned off.
+ */
+ public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL =
+ "allow_add_call_during_video_call";
+
+ /**
+ * When true, indicates that the HD audio icon in the in-call screen should not be shown for
+ * VoWifi calls.
+ * @hide
+ */
+ public static final String KEY_WIFI_CALLS_CAN_BE_HD_AUDIO = "wifi_calls_can_be_hd_audio";
+
+ /**
+ * When true, indicates that the HD audio icon in the in-call screen should not be shown for
+ * video calls.
+ * @hide
+ */
+ public static final String KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO = "video_calls_can_be_hd_audio";
+
+ /**
+ * Defines operator-specific {@link com.android.ims.ImsReasonInfo} mappings.
+ *
+ * Format: "ORIGINAL_CODE|MESSAGE|NEW_CODE"
+ * Where {@code ORIGINAL_CODE} corresponds to a {@link ImsReasonInfo#getCode()} code,
+ * {@code MESSAGE} corresponds to an expected {@link ImsReasonInfo#getExtraMessage()} string,
+ * and {@code NEW_CODE} is the new {@code ImsReasonInfo#CODE_*} which this combination of
+ * original code and message shall be remapped to.
+ *
+ * Example: "501|call completion elsewhere|1014"
+ * When the {@link ImsReasonInfo#getCode()} is {@link ImsReasonInfo#CODE_USER_TERMINATED} and
+ * the {@link ImsReasonInfo#getExtraMessage()} is {@code "call completion elsewhere"},
+ * {@link ImsReasonInfo#CODE_ANSWERED_ELSEWHERE} shall be used as the {@link ImsReasonInfo}
+ * code instead.
+ * @hide
+ */
+ public static final String KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY =
+ "ims_reasoninfo_mapping_string_array";
+
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
static {
sDefaults = new PersistableBundle();
+ sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);
sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);
sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);
sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);
@@ -831,6 +916,7 @@
sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL, false);
+ sDefaults.putBoolean(KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL, false);
sDefaults.putInt(KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT, 2);
sDefaults.putBoolean(KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);
@@ -881,6 +967,7 @@
sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);
sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);
+ sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);
sDefaults.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_DEFAULT_STRING,
"default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000,"
+ "320000:5000,640000:5000,1280000:5000,1800000:5000");
@@ -933,6 +1020,7 @@
sDefaults.putBoolean(KEY_MMS_SMS_DELIVERY_REPORT_ENABLED_BOOL, true);
sDefaults.putBoolean(KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL, false);
sDefaults.putBoolean(KEY_MMS_SUPPORT_MMS_CONTENT_DISPOSITION_BOOL, true);
+ sDefaults.putBoolean(KEY_MMS_CLOSE_CONNECTION_BOOL, false);
sDefaults.putInt(KEY_MMS_ALIAS_MAX_CHARS_INT, 48);
sDefaults.putInt(KEY_MMS_ALIAS_MIN_CHARS_INT, 2);
sDefaults.putInt(KEY_MMS_HTTP_SOCKET_TIMEOUT_INT, 60 * 1000);
@@ -952,6 +1040,7 @@
sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");
sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);
sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);
+ sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);
sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);
// Carrier Signalling Receivers
@@ -965,8 +1054,14 @@
// Order is important - lowest precidence first
sDefaults.putStringArray(KEY_RATCHET_RAT_FAMILIES,
new String[]{"1,2","7,8,12","3,11,9,10,15","14,19"});
- sDefaults.putBoolean(KEY_TREAT_DOWNGRADED_VIDEO_CALLS_AS_VIDEO_CALLS_BOOL, true);
- sDefaults.putBoolean(KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL, true);
+ sDefaults.putBoolean(KEY_TREAT_DOWNGRADED_VIDEO_CALLS_AS_VIDEO_CALLS_BOOL, false);
+ sDefaults.putBoolean(KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL, false);
+ sDefaults.putBoolean(KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL, true);
+ sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true);
+ sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true);
+ sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true);
+
+ sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);
}
/**
diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java
index 7a9170f..d7d4e84 100644
--- a/telephony/java/android/telephony/DisconnectCause.java
+++ b/telephony/java/android/telephony/DisconnectCause.java
@@ -200,6 +200,18 @@
*/
public static final int CALL_PULLED = 51;
+ /**
+ * The call was terminated because it was answered on another device.
+ * {@hide}
+ */
+ public static final int ANSWERED_ELSEWHERE = 52;
+
+ /**
+ * The call was terminated because the maximum allowable number of calls has been reached.
+ * {@hide}
+ */
+ public static final int MAXIMUM_NUMBER_OF_CALLS_REACHED = 53;
+
//*********************************************************************************************
// When adding a disconnect type:
// 1) Please assign the new type the next id value below.
@@ -208,14 +220,14 @@
// 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
//
- // NextId: 50
+ // NextId: 54
//*********************************************************************************************
/** Smallest valid value for call disconnect codes. */
public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;
/** Largest valid value for call disconnect codes. */
- public static final int MAXIMUM_VALID_VALUE = VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED;
+ public static final int MAXIMUM_VALID_VALUE = MAXIMUM_NUMBER_OF_CALLS_REACHED;
/** Private constructor to avoid class instantiation. */
private DisconnectCause() {
@@ -327,6 +339,10 @@
return "VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED";
case CALL_PULLED:
return "CALL_PULLED";
+ case ANSWERED_ELSEWHERE:
+ return "ANSWERED_ELSEWHERE";
+ case MAXIMUM_NUMBER_OF_CALLS_REACHED:
+ return "MAXIMUM_NUMER_OF_CALLS_REACHED";
default:
return "INVALID: " + cause;
}
diff --git a/telephony/java/android/telephony/Rlog.java b/telephony/java/android/telephony/Rlog.java
index 2a7f7af..b4f400f 100644
--- a/telephony/java/android/telephony/Rlog.java
+++ b/telephony/java/android/telephony/Rlog.java
@@ -85,5 +85,13 @@
return Log.isLoggable(tag, level);
}
+ /**
+ * Redact personally identifiable information for production users.
+ * If log tag is loggable in verbose mode, return the original string, otherwise return XXX.
+ */
+ public static String pii(String tag, Object pii) {
+ return (isLoggable(tag, Log.VERBOSE) ? String.valueOf(pii) : "XXX");
+ }
+
}
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index f437a92..11d84c1 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -240,6 +240,8 @@
private boolean mIsDataRoamingFromRegistration;
+ private boolean mIsUsingCarrierAggregation;
+
/**
* get String description of roaming type
* @hide
@@ -318,6 +320,7 @@
mCdmaEriIconMode = s.mCdmaEriIconMode;
mIsEmergencyOnly = s.mIsEmergencyOnly;
mIsDataRoamingFromRegistration = s.mIsDataRoamingFromRegistration;
+ mIsUsingCarrierAggregation = s.mIsUsingCarrierAggregation;
}
/**
@@ -346,6 +349,7 @@
mCdmaEriIconMode = in.readInt();
mIsEmergencyOnly = in.readInt() != 0;
mIsDataRoamingFromRegistration = in.readInt() != 0;
+ mIsUsingCarrierAggregation = in.readInt() != 0;
}
public void writeToParcel(Parcel out, int flags) {
@@ -371,6 +375,7 @@
out.writeInt(mCdmaEriIconMode);
out.writeInt(mIsEmergencyOnly ? 1 : 0);
out.writeInt(mIsDataRoamingFromRegistration ? 1 : 0);
+ out.writeInt(mIsUsingCarrierAggregation ? 1 : 0);
}
public int describeContents() {
@@ -680,7 +685,8 @@
&& equalsHandlesNulls(mCdmaDefaultRoamingIndicator,
s.mCdmaDefaultRoamingIndicator)
&& mIsEmergencyOnly == s.mIsEmergencyOnly
- && mIsDataRoamingFromRegistration == s.mIsDataRoamingFromRegistration);
+ && mIsDataRoamingFromRegistration == s.mIsDataRoamingFromRegistration
+ && mIsUsingCarrierAggregation == s.mIsUsingCarrierAggregation);
}
/**
@@ -788,7 +794,8 @@
+ " RoamInd=" + mCdmaRoamingIndicator
+ " DefRoamInd=" + mCdmaDefaultRoamingIndicator
+ " EmergOnly=" + mIsEmergencyOnly
- + " IsDataRoamingFromRegistration=" + mIsDataRoamingFromRegistration);
+ + " IsDataRoamingFromRegistration=" + mIsDataRoamingFromRegistration
+ + " IsUsingCarrierAggregation=" + mIsUsingCarrierAggregation);
}
private void setNullState(int state) {
@@ -815,6 +822,7 @@
mCdmaEriIconMode = -1;
mIsEmergencyOnly = false;
mIsDataRoamingFromRegistration = false;
+ mIsUsingCarrierAggregation = false;
}
public void setStateOutOfService() {
@@ -988,6 +996,7 @@
mCdmaDefaultRoamingIndicator = m.getInt("cdmaDefaultRoamingIndicator");
mIsEmergencyOnly = m.getBoolean("emergencyOnly");
mIsDataRoamingFromRegistration = m.getBoolean("isDataRoamingFromRegistration");
+ mIsUsingCarrierAggregation = m.getBoolean("isUsingCarrierAggregation");
}
/**
@@ -1017,21 +1026,42 @@
m.putInt("cdmaDefaultRoamingIndicator", mCdmaDefaultRoamingIndicator);
m.putBoolean("emergencyOnly", mIsEmergencyOnly);
m.putBoolean("isDataRoamingFromRegistration", mIsDataRoamingFromRegistration);
+ m.putBoolean("isUsingCarrierAggregation", mIsUsingCarrierAggregation);
}
/** @hide */
public void setRilVoiceRadioTechnology(int rt) {
+ if (rt == RIL_RADIO_TECHNOLOGY_LTE_CA) {
+ rt = RIL_RADIO_TECHNOLOGY_LTE;
+ }
+
this.mRilVoiceRadioTechnology = rt;
}
/** @hide */
public void setRilDataRadioTechnology(int rt) {
+ if (rt == RIL_RADIO_TECHNOLOGY_LTE_CA) {
+ rt = RIL_RADIO_TECHNOLOGY_LTE;
+ this.mIsUsingCarrierAggregation = true;
+ } else {
+ this.mIsUsingCarrierAggregation = false;
+ }
this.mRilDataRadioTechnology = rt;
if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setRilDataRadioTechnology=" +
mRilDataRadioTechnology);
}
/** @hide */
+ public boolean isUsingCarrierAggregation() {
+ return mIsUsingCarrierAggregation;
+ }
+
+ /** @hide */
+ public void setIsUsingCarrierAggregation(boolean ca) {
+ mIsUsingCarrierAggregation = ca;
+ }
+
+ /** @hide */
public void setCssIndicator(int css) {
this.mCssIndicator = (css != 0);
}
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 04d2864..18772cc 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5423,7 +5423,40 @@
return null;
}
- /*
+ /**
+ * Return the Preferred Roaming List Version
+ *
+ * Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission
+ *
+ * @return PRLVersion or null if error.
+ * @hide
+ */
+ public String getCdmaPrlVersion() {
+ return getCdmaPrlVersion(getDefaultSubscription());
+ }
+
+ /**
+ * Return the Preferred Roaming List Version
+ *
+ * Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission
+ *
+ * @param subId the subscription ID that this request applies to.
+ * @return PRLVersion or null if error.
+ * @hide
+ */
+ public String getCdmaPrlVersion(int subId) {
+ try {
+ ITelephony service = getITelephony();
+ if (service != null) {
+ return service.getCdmaPrlVersion(subId);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error calling ITelephony#getCdmaPrlVersion", e);
+ }
+ return null;
+ }
+
+ /**
* Get snapshot of Telephony histograms
* @return List of Telephony histograms
* Requires Permission:
@@ -5519,5 +5552,41 @@
Log.e(TAG, "Error calling ITelephony#carrierActionSetRadioEnabled", e);
}
}
+
+ /**
+ * Get aggregated video call data usage since boot.
+ * Permissions android.Manifest.permission.READ_NETWORK_USAGE_HISTORY is required.
+ * @return total data usage in bytes
+ * @hide
+ */
+ public long getVtDataUsage() {
+
+ try {
+ ITelephony service = getITelephony();
+ if (service != null) {
+ return service.getVtDataUsage();
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error calling getVtDataUsage", e);
+ }
+ return 0;
+ }
+
+ /**
+ * Policy control of data connection. Usually used when data limit is passed.
+ * @param enabled True if enabling the data, otherwise disabling.
+ * @param subId sub id
+ * @hide
+ */
+ public void setPolicyDataEnabled(boolean enabled, int subId) {
+ try {
+ ITelephony service = getITelephony();
+ if (service != null) {
+ service.setPolicyDataEnabled(enabled, subId);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error calling ITelephony#setPolicyDataEnabled", e);
+ }
+ }
}
diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java
index 65254d8..36abfc9 100644
--- a/telephony/java/com/android/ims/ImsCallProfile.java
+++ b/telephony/java/com/android/ims/ImsCallProfile.java
@@ -205,6 +205,14 @@
*/
public static final String EXTRA_CALL_RAT_TYPE = "CallRadioTech";
+ /**
+ * Similar to {@link #EXTRA_CALL_RAT_TYPE}, except with a lowercase 'c'. Used to ensure
+ * compatibility with modems that are non-compliant with the {@link #EXTRA_CALL_RAT_TYPE}
+ * extra key. Should be removed when the non-compliant modems are fixed.
+ * @hide
+ */
+ public static final String EXTRA_CALL_RAT_TYPE_ALT = "callRadioTech";
+
public int mServiceType;
public int mCallType;
public int mRestrictCause = CALL_RESTRICT_CAUSE_NONE;
diff --git a/telephony/java/com/android/ims/ImsExternalCallState.java b/telephony/java/com/android/ims/ImsExternalCallState.java
index 71c1837..da26073 100644
--- a/telephony/java/com/android/ims/ImsExternalCallState.java
+++ b/telephony/java/com/android/ims/ImsExternalCallState.java
@@ -19,6 +19,7 @@
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
+import android.telecom.Log;
import android.telephony.Rlog;
/*
@@ -130,7 +131,7 @@
@Override
public String toString() {
return "ImsExternalCallState { mCallId = " + mCallId +
- ", mAddress = " + mAddress +
+ ", mAddress = " + Log.pii(mAddress) +
", mIsPullable = " + mIsPullable +
", mCallState = " + mCallState +
", mCallType = " + mCallType +
diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java
index 9369b20..408ad31 100644
--- a/telephony/java/com/android/ims/ImsReasonInfo.java
+++ b/telephony/java/com/android/ims/ImsReasonInfo.java
@@ -25,6 +25,7 @@
* @hide
*/
public class ImsReasonInfo implements Parcelable {
+
/**
* Specific code of each types
*/
@@ -284,6 +285,19 @@
public static final int CODE_EPDG_TUNNEL_LOST_CONNECTION = 1402;
/**
+ * The maximum number of calls allowed has been reached. Used in a multi-endpoint scenario
+ * where the number of calls across all connected devices has reached the maximum.
+ */
+ public static final int CODE_MAXIMUM_NUMBER_OF_CALLS_REACHED = 1403;
+
+ /**
+ * Similar to {@link #CODE_LOCAL_CALL_DECLINE}, except indicates that a remote device has
+ * declined the call. Used in a multi-endpoint scenario where a remote device declined an
+ * incoming call.
+ */
+ public static final int CODE_REMOTE_CALL_DECLINE = 1404;
+
+ /**
* Network string error messages.
* mExtraMessage may have these values.
*/
diff --git a/telephony/java/com/android/internal/telephony/CarrierAppUtils.java b/telephony/java/com/android/internal/telephony/CarrierAppUtils.java
index ca7354f..8b81b0d 100644
--- a/telephony/java/com/android/internal/telephony/CarrierAppUtils.java
+++ b/telephony/java/com/android/internal/telephony/CarrierAppUtils.java
@@ -17,18 +17,23 @@
package com.android.internal.telephony;
import android.annotation.Nullable;
+import android.content.ContentResolver;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.RemoteException;
+import android.provider.Settings;
import android.telephony.TelephonyManager;
+import android.util.ArrayMap;
import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.SystemConfig;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* Utilities for handling carrier applications.
@@ -53,6 +58,11 @@
* in the default state (e.g. not explicitly DISABLED/DISABLED_BY_USER/ENABLED), or we enable if
* the app is carrier privileged and in either the default state or DISABLED_UNTIL_USED.
*
+ * In addition, there is a list of carrier-associated applications in
+ * {@link SystemConfig#getDisabledUntilUsedPreinstalledCarrierAssociatedApps}. Each app in this
+ * list is associated with a carrier app. When the given carrier app is enabled/disabled per the
+ * above, the associated applications are enabled/disabled to match.
+ *
* When enabling a carrier app we also grant it default permissions.
*
* This method is idempotent and is safe to be called at any time; it should be called once at
@@ -60,19 +70,24 @@
* privileged apps may have changed.
*/
public synchronized static void disableCarrierAppsUntilPrivileged(String callingPackage,
- IPackageManager packageManager, TelephonyManager telephonyManager, int userId) {
+ IPackageManager packageManager, TelephonyManager telephonyManager,
+ ContentResolver contentResolver, int userId) {
if (DEBUG) {
Slog.d(TAG, "disableCarrierAppsUntilPrivileged");
}
+ SystemConfig config = SystemConfig.getInstance();
String[] systemCarrierAppsDisabledUntilUsed = Resources.getSystem().getStringArray(
com.android.internal.R.array.config_disabledUntilUsedPreinstalledCarrierApps);
- disableCarrierAppsUntilPrivileged(callingPackage, packageManager, telephonyManager, userId,
- systemCarrierAppsDisabledUntilUsed);
+ ArrayMap<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed =
+ config.getDisabledUntilUsedPreinstalledCarrierAssociatedApps();
+ disableCarrierAppsUntilPrivileged(callingPackage, packageManager, telephonyManager,
+ contentResolver, userId, systemCarrierAppsDisabledUntilUsed,
+ systemCarrierAssociatedAppsDisabledUntilUsed);
}
/**
* Like {@link #disableCarrierAppsUntilPrivileged(String, IPackageManager, TelephonyManager,
- * int)}, but assumes that no carrier apps have carrier privileges.
+ * ContentResolver, int)}, but assumes that no carrier apps have carrier privileges.
*
* This prevents a potential race condition on first boot - since the app's default state is
* enabled, we will initially disable it when the telephony stack is first initialized as it has
@@ -82,29 +97,43 @@
* Manager can kill it, and this can lead to crashes as the app is in an unexpected state.
*/
public synchronized static void disableCarrierAppsUntilPrivileged(String callingPackage,
- IPackageManager packageManager, int userId) {
+ IPackageManager packageManager, ContentResolver contentResolver, int userId) {
if (DEBUG) {
Slog.d(TAG, "disableCarrierAppsUntilPrivileged");
}
+ SystemConfig config = SystemConfig.getInstance();
String[] systemCarrierAppsDisabledUntilUsed = Resources.getSystem().getStringArray(
com.android.internal.R.array.config_disabledUntilUsedPreinstalledCarrierApps);
+ ArrayMap<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed =
+ config.getDisabledUntilUsedPreinstalledCarrierAssociatedApps();
disableCarrierAppsUntilPrivileged(callingPackage, packageManager,
- null /* telephonyManager */, userId, systemCarrierAppsDisabledUntilUsed);
+ null /* telephonyManager */, contentResolver, userId,
+ systemCarrierAppsDisabledUntilUsed, systemCarrierAssociatedAppsDisabledUntilUsed);
}
// Must be public b/c framework unit tests can't access package-private methods.
@VisibleForTesting
public static void disableCarrierAppsUntilPrivileged(String callingPackage,
- IPackageManager packageManager, @Nullable TelephonyManager telephonyManager, int userId,
- String[] systemCarrierAppsDisabledUntilUsed) {
+ IPackageManager packageManager, @Nullable TelephonyManager telephonyManager,
+ ContentResolver contentResolver, int userId,
+ String[] systemCarrierAppsDisabledUntilUsed,
+ ArrayMap<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed) {
List<ApplicationInfo> candidates = getDefaultCarrierAppCandidatesHelper(packageManager,
userId, systemCarrierAppsDisabledUntilUsed);
if (candidates == null || candidates.isEmpty()) {
return;
}
+ Map<String, List<ApplicationInfo>> associatedApps = getDefaultCarrierAssociatedAppsHelper(
+ packageManager,
+ userId,
+ systemCarrierAssociatedAppsDisabledUntilUsed);
+
List<String> enabledCarrierPackages = new ArrayList<>();
+ boolean hasRunOnce = Settings.Secure.getIntForUser(
+ contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 0, userId) == 1;
+
try {
for (ApplicationInfo ai : candidates) {
String packageName = ai.packageName;
@@ -112,33 +141,92 @@
telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(packageName) ==
TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;
- // Only update enabled state for the app on /system. Once it has been updated we
- // shouldn't touch it.
- if (!ai.isUpdatedSystemApp()) {
- if (hasPrivileges
- && (ai.enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
+ if (hasPrivileges) {
+ // Only update enabled state for the app on /system. Once it has been
+ // updated we shouldn't touch it.
+ if (!ai.isUpdatedSystemApp()
+ && (ai.enabledSetting ==
+ PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
|| ai.enabledSetting ==
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED)) {
Slog.i(TAG, "Update state(" + packageName + "): ENABLED for user "
+ userId);
- packageManager.setApplicationEnabledSetting(packageName,
+ packageManager.setApplicationEnabledSetting(
+ packageName,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
- PackageManager.DONT_KILL_APP, userId, callingPackage);
- } else if (!hasPrivileges
+ PackageManager.DONT_KILL_APP,
+ userId,
+ callingPackage);
+ }
+
+ // Also enable any associated apps for this carrier app.
+ List<ApplicationInfo> associatedAppList = associatedApps.get(packageName);
+ if (associatedAppList != null) {
+ for (ApplicationInfo associatedApp : associatedAppList) {
+ if (associatedApp.enabledSetting ==
+ PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
+ || associatedApp.enabledSetting ==
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
+ Slog.i(TAG, "Update associated state(" + associatedApp.packageName
+ + "): ENABLED for user " + userId);
+ packageManager.setApplicationEnabledSetting(
+ associatedApp.packageName,
+ PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+ PackageManager.DONT_KILL_APP,
+ userId,
+ callingPackage);
+ }
+ }
+ }
+
+ // Always re-grant default permissions to carrier apps w/ privileges.
+ enabledCarrierPackages.add(ai.packageName);
+ } else { // No carrier privileges
+ // Only update enabled state for the app on /system. Once it has been
+ // updated we shouldn't touch it.
+ if (!ai.isUpdatedSystemApp()
&& ai.enabledSetting ==
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
Slog.i(TAG, "Update state(" + packageName
+ "): DISABLED_UNTIL_USED for user " + userId);
- packageManager.setApplicationEnabledSetting(packageName,
- PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED, 0,
- userId, callingPackage);
+ packageManager.setApplicationEnabledSetting(
+ packageName,
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED,
+ 0,
+ userId,
+ callingPackage);
+ }
+
+ // Also disable any associated apps for this carrier app if this is the first
+ // run. We avoid doing this a second time because it is brittle to rely on the
+ // distinction between "default" and "enabled".
+ if (!hasRunOnce) {
+ List<ApplicationInfo> associatedAppList = associatedApps.get(packageName);
+ if (associatedAppList != null) {
+ for (ApplicationInfo associatedApp : associatedAppList) {
+ if (associatedApp.enabledSetting
+ == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
+ Slog.i(TAG,
+ "Update associated state(" + associatedApp.packageName
+ + "): DISABLED_UNTIL_USED for user " + userId);
+ packageManager.setApplicationEnabledSetting(
+ associatedApp.packageName,
+ PackageManager
+ .COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED,
+ 0,
+ userId,
+ callingPackage);
+ }
+ }
+ }
}
}
+ }
- // Always re-grant default permissions to carrier apps w/ privileges.
- if (hasPrivileges) {
- enabledCarrierPackages.add(ai.packageName);
- }
+ // Mark the execution so we do not disable apps again.
+ if (!hasRunOnce) {
+ Settings.Secure.putIntForUser(
+ contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 1, userId);
}
if (!enabledCarrierPackages.isEmpty()) {
@@ -190,8 +278,8 @@
*
* These are the apps subject to the hiding/showing logic in
* {@link CarrierAppUtils#disableCarrierAppsUntilPrivileged(String, IPackageManager,
- * TelephonyManager, int)}, as well as the apps which should have default permissions granted,
- * when a matching SIM is inserted.
+ * TelephonyManager, ContentResolver, int)}, as well as the apps which should have default
+ * permissions granted, when a matching SIM is inserted.
*
* Whether or not the app is actually considered a default app depends on whether the app has
* carrier privileges as determined by the SIMs in the device.
@@ -205,30 +293,68 @@
}
private static List<ApplicationInfo> getDefaultCarrierAppCandidatesHelper(
- IPackageManager packageManager, int userId,
+ IPackageManager packageManager,
+ int userId,
String[] systemCarrierAppsDisabledUntilUsed) {
if (systemCarrierAppsDisabledUntilUsed == null
|| systemCarrierAppsDisabledUntilUsed.length == 0) {
return null;
}
- List<ApplicationInfo> apps = null;
- try {
- apps = new ArrayList<>(systemCarrierAppsDisabledUntilUsed.length);
- for (String packageName : systemCarrierAppsDisabledUntilUsed) {
- ApplicationInfo ai = packageManager.getApplicationInfo(packageName,
- PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, userId);
- if (ai == null) {
- // No app found for packageName
- continue;
- }
- if (!ai.isSystemApp()) {
- continue;
- }
+ List<ApplicationInfo> apps = new ArrayList<>(systemCarrierAppsDisabledUntilUsed.length);
+ for (int i = 0; i < systemCarrierAppsDisabledUntilUsed.length; i++) {
+ String packageName = systemCarrierAppsDisabledUntilUsed[i];
+ ApplicationInfo ai =
+ getApplicationInfoIfSystemApp(packageManager, userId, packageName);
+ if (ai != null) {
apps.add(ai);
}
+ }
+ return apps;
+ }
+
+ private static Map<String, List<ApplicationInfo>> getDefaultCarrierAssociatedAppsHelper(
+ IPackageManager packageManager,
+ int userId,
+ ArrayMap<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed) {
+ int size = systemCarrierAssociatedAppsDisabledUntilUsed.size();
+ Map<String, List<ApplicationInfo>> associatedApps = new ArrayMap<>(size);
+ for (int i = 0; i < size; i++) {
+ String carrierAppPackage = systemCarrierAssociatedAppsDisabledUntilUsed.keyAt(i);
+ List<String> associatedAppPackages =
+ systemCarrierAssociatedAppsDisabledUntilUsed.valueAt(i);
+ for (int j = 0; j < associatedAppPackages.size(); j++) {
+ ApplicationInfo ai =
+ getApplicationInfoIfSystemApp(
+ packageManager, userId, associatedAppPackages.get(j));
+ // Only update enabled state for the app on /system. Once it has been updated we
+ // shouldn't touch it.
+ if (ai != null && !ai.isUpdatedSystemApp()) {
+ List<ApplicationInfo> appList = associatedApps.get(carrierAppPackage);
+ if (appList == null) {
+ appList = new ArrayList<>();
+ associatedApps.put(carrierAppPackage, appList);
+ }
+ appList.add(ai);
+ }
+ }
+ }
+ return associatedApps;
+ }
+
+ @Nullable
+ private static ApplicationInfo getApplicationInfoIfSystemApp(
+ IPackageManager packageManager,
+ int userId,
+ String packageName) {
+ try {
+ ApplicationInfo ai = packageManager.getApplicationInfo(packageName,
+ PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, userId);
+ if (ai != null && ai.isSystemApp()) {
+ return ai;
+ }
} catch (RemoteException e) {
Slog.w(TAG, "Could not reach PackageManager", e);
}
- return apps;
+ return null;
}
}
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java
index 8166e00..f01e4c0 100644
--- a/telephony/java/com/android/internal/telephony/DctConstants.java
+++ b/telephony/java/com/android/internal/telephony/DctConstants.java
@@ -105,6 +105,7 @@
public static final int EVENT_DEVICE_PROVISIONED_CHANGE = BASE + 43;
public static final int EVENT_REDIRECTION_DETECTED = BASE + 44;
public static final int EVENT_PCO_DATA_RECEIVED = BASE + 45;
+ public static final int EVENT_SET_CARRIER_DATA_ENABLED = BASE + 46;
/***** Constants *****/
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 2171c9e..7e7071e 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -1107,6 +1107,16 @@
String getEsn(int subId);
/**
+ * Return the Preferred Roaming List Version
+ *
+ * Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission
+ * @param subId the subscription ID that this request applies to.
+ * @return PRLVersion or null if error.
+ * @hide
+ */
+ String getCdmaPrlVersion(int subId);
+
+ /**
* Get snapshot of Telephony histograms
* @return List of Telephony histograms
* Requires Permission:
@@ -1133,13 +1143,13 @@
*/
List<CarrierIdentifier> getAllowedCarriers(int slotId);
- /**
- * Action set from carrier signalling broadcast receivers to enable/disable metered apns
- * Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required
- * @param subId the subscription ID that this action applies to.
- * @param enabled control enable or disable metered apns.
- * @hide
- */
+ /**
+ * Action set from carrier signalling broadcast receivers to enable/disable metered apns
+ * Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required
+ * @param subId the subscription ID that this action applies to.
+ * @param enabled control enable or disable metered apns.
+ * @hide
+ */
void carrierActionSetMeteredApnsEnabled(int subId, boolean visible);
/**
@@ -1150,4 +1160,20 @@
* @hide
*/
void carrierActionSetRadioEnabled(int subId, boolean enabled);
+
+ /**
+ * Get aggregated video call data usage since boot.
+ * Permissions android.Manifest.permission.READ_NETWORK_USAGE_HISTORY is required.
+ * @return total data usage in bytes
+ * @hide
+ */
+ long getVtDataUsage();
+
+ /**
+ * Policy control of data connection. Usually used when data limit is passed.
+ * @param enabled True if enabling the data, otherwise disabling.
+ * @param subId Subscription index
+ * @hide
+ */
+ void setPolicyDataEnabled(boolean enabled, int subId);
}
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 9471326..fdd971b 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -404,6 +404,14 @@
}
/** @hide */
+ @SystemApi
+ @Override
+ public void sendBroadcastAsUser(Intent intent, UserHandle user,
+ String receiverPermission, Bundle options) {
+ throw new UnsupportedOperationException();
+ }
+
+ /** @hide */
@Override
public void sendBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp) {
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index 330dbab..4eae4ab 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -752,6 +752,13 @@
throw new UnsupportedOperationException();
}
+ /** @hide - hidden in superclass */
+ @Override
+ public void setComponentEnabledSettingAsUser(ComponentName componentName,
+ int newState, int flags, int userId) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public int getComponentEnabledSetting(ComponentName componentName) {
throw new UnsupportedOperationException();
@@ -762,6 +769,13 @@
throw new UnsupportedOperationException();
}
+ /** @hide - hidden in superclass */
+ @Override
+ public void setApplicationEnabledSettingAsUser(String packageName, int newState, int flags,
+ int userId) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public int getApplicationEnabledSetting(String packageName) {
throw new UnsupportedOperationException();
diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk
index c0560fd..e6f6c39 100644
--- a/tests/AppLaunch/Android.mk
+++ b/tests/AppLaunch/Android.mk
@@ -11,7 +11,9 @@
LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/AppLaunch/AndroidManifest.xml b/tests/AppLaunch/AndroidManifest.xml
index ac6760b..7dfd7ba 100644
--- a/tests/AppLaunch/AndroidManifest.xml
+++ b/tests/AppLaunch/AndroidManifest.xml
@@ -3,6 +3,14 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.tests.applaunch"
android:sharedUserId="android.uid.system" >
+
+ <uses-permission android:name="android.permission.REAL_GET_TASKS" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+ <uses-sdk
+ android:minSdkVersion="22"
+ android:targetSdkVersion="24" />
+
<instrumentation android:label="Measure app start up time"
android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.tests.applaunch" />
@@ -10,4 +18,4 @@
<application android:label="App Launch Test">
<uses-library android:name="android.test.runner" />
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
index 085b7aa..2346f85 100644
--- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
+++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
@@ -15,14 +15,13 @@
*/
package com.android.tests.applaunch;
+import java.io.OutputStreamWriter;
+
import android.accounts.Account;
import android.accounts.AccountManager;
+import android.app.ActivityManagerNative;
import android.app.ActivityManager;
import android.app.ActivityManager.ProcessErrorStateInfo;
-import android.app.ActivityManagerNative;
-import android.app.IActivityManager;
-import android.app.IActivityManager.WaitResult;
-import android.app.UiAutomation;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -31,16 +30,29 @@
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.app.UiAutomation;
+import android.app.IActivityManager;
+import android.app.IActivityManager.WaitResult;
+import android.support.test.rule.logging.AtraceLogger;
import android.test.InstrumentationTestCase;
import android.test.InstrumentationTestRunner;
import android.util.Log;
-
+import java.io.File;
+import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
+import android.os.ParcelFileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.InputStreamReader;
/**
* This test is intended to measure the time it takes for the apps to start.
@@ -55,27 +67,66 @@
private static final int JOIN_TIMEOUT = 10000;
private static final String TAG = AppLaunch.class.getSimpleName();
- private static final String KEY_APPS = "apps";
- private static final String KEY_LAUNCH_ITERATIONS = "launch_iterations";
// optional parameter: comma separated list of required account types before proceeding
// with the app launch
private static final String KEY_REQUIRED_ACCOUNTS = "required_accounts";
- private static final String KEY_SKIP_INITIAL_LAUNCH = "skip_initial_launch";
+ private static final String KEY_APPS = "apps";
+ private static final String KEY_TRIAL_LAUNCH = "trial_launch";
+ private static final String KEY_LAUNCH_ITERATIONS = "launch_iterations";
+ private static final String KEY_LAUNCH_ORDER = "launch_order";
+ private static final String KEY_DROP_CACHE = "drop_cache";
+ private static final String KEY_SIMPLEPPERF_CMD = "simpleperf_cmd";
+ private static final String KEY_TRACE_ITERATIONS = "trace_iterations";
+ private static final String KEY_LAUNCH_DIRECTORY = "launch_directory";
+ private static final String KEY_TRACE_DIRECTORY = "trace_directory";
+ private static final String KEY_TRACE_CATEGORY = "trace_categories";
+ private static final String KEY_TRACE_BUFFERSIZE = "trace_bufferSize";
+ private static final String KEY_TRACE_DUMPINTERVAL = "tracedump_interval";
private static final String WEARABLE_ACTION_GOOGLE =
"com.google.android.wearable.action.GOOGLE";
private static final int INITIAL_LAUNCH_IDLE_TIMEOUT = 60000; //60s to allow app to idle
private static final int POST_LAUNCH_IDLE_TIMEOUT = 750; //750ms idle for non initial launches
- private static final int BETWEEN_LAUNCH_SLEEP_TIMEOUT = 2000; //2s between launching apps
+ private static final int BETWEEN_LAUNCH_SLEEP_TIMEOUT = 5000; //5s between launching apps
+ private static final String LAUNCH_SUB_DIRECTORY = "launch_logs";
+ private static final String LAUNCH_FILE = "applaunch.txt";
+ private static final String TRACE_SUB_DIRECTORY = "atrace_logs";
+ private static final String DEFAULT_TRACE_CATEGORIES = "sched,freq,gfx,view,dalvik,webview,"
+ + "input,wm,disk,am,wm";
+ private static final String DEFAULT_TRACE_BUFFER_SIZE = "20000";
+ private static final String DEFAULT_TRACE_DUMP_INTERVAL = "10";
+ private static final String TRIAL_LAUNCH = "TRAIL_LAUNCH";
+ private static final String DELIMITER = ",";
+ private static final String DROP_CACHE_SCRIPT = "/data/local/tmp/dropCache.sh";
+ private static final String APP_LAUNCH_CMD = "am start -W -n";
+ private static final String SUCCESS_MESSAGE = "Status: ok";
+ private static final String THIS_TIME = "ThisTime:";
+ private static final String LAUNCH_ITERATION = "LAUNCH_ITERATION - %d";
+ private static final String TRACE_ITERATION = "TRACE_ITERATION - %d";
+ private static final String LAUNCH_ITERATION_PREFIX = "LAUNCH_ITERATION";
+ private static final String TRACE_ITERATION_PREFIX = "TRACE_ITERATION";
+ private static final String LAUNCH_ORDER_CYCLIC = "cyclic";
+ private static final String LAUNCH_ORDER_SEQUENTIAL = "sequential";
+
private Map<String, Intent> mNameToIntent;
private Map<String, String> mNameToProcess;
+ private List<LaunchOrder> mLaunchOrderList = new ArrayList<LaunchOrder>();
private Map<String, String> mNameToResultKey;
- private Map<String, Long> mNameToLaunchTime;
+ private Map<String, List<Long>> mNameToLaunchTime;
private IActivityManager mAm;
+ private String mSimplePerfCmd = null;
+ private String mLaunchOrder = null;
+ private boolean mDropCache = false;
private int mLaunchIterations = 10;
+ private int mTraceLaunchCount = 0;
+ private String mTraceDirectoryStr = null;
private Bundle mResult = new Bundle();
private Set<String> mRequiredAccounts;
- private boolean mSkipInitialLaunch = false;
+ private boolean mTrailLaunch = true;
+ private File mFile = null;
+ private FileOutputStream mOutputStream = null;
+ private BufferedWriter mBufferedWriter = null;
+
@Override
protected void setUp() throws Exception {
@@ -89,69 +140,231 @@
super.tearDown();
}
- public void testMeasureStartUpTime() throws RemoteException, NameNotFoundException {
+ public void testMeasureStartUpTime() throws RemoteException, NameNotFoundException,
+ IOException, InterruptedException {
InstrumentationTestRunner instrumentation =
(InstrumentationTestRunner)getInstrumentation();
Bundle args = instrumentation.getArguments();
mAm = ActivityManagerNative.getDefault();
-
+ String launchDirectory = args.getString(KEY_LAUNCH_DIRECTORY);
+ mTraceDirectoryStr = args.getString(KEY_TRACE_DIRECTORY);
+ mDropCache = Boolean.parseBoolean(args.getString(KEY_DROP_CACHE));
+ mSimplePerfCmd = args.getString(KEY_SIMPLEPPERF_CMD);
+ mLaunchOrder = args.getString(KEY_LAUNCH_ORDER, LAUNCH_ORDER_CYCLIC);
createMappings();
parseArgs(args);
checkAccountSignIn();
- if (!mSkipInitialLaunch) {
- // do initial app launch, without force stopping
- for (String app : mNameToResultKey.keySet()) {
- long launchTime = startApp(app, false);
- if (launchTime <= 0) {
- mNameToLaunchTime.put(app, -1L);
- // simply pass the app if launch isn't successful
- // error should have already been logged by startApp
- continue;
- } else {
- mNameToLaunchTime.put(app, launchTime);
- }
- sleep(INITIAL_LAUNCH_IDLE_TIMEOUT);
- closeApp(app, false);
- sleep(BETWEEN_LAUNCH_SLEEP_TIMEOUT);
+ // Root directory for applaunch file to log the app launch output
+ // Will be useful in case of simpleperf command is used
+ File launchRootDir = null;
+ if (null != launchDirectory && !launchDirectory.isEmpty()) {
+ launchRootDir = new File(launchDirectory);
+ if (!launchRootDir.exists() && !launchRootDir.mkdirs()) {
+ throw new IOException("Unable to create the destination directory");
}
}
- // do the real app launch now
- for (int i = 0; i < mLaunchIterations; i++) {
- for (String app : mNameToResultKey.keySet()) {
- long prevLaunchTime = mNameToLaunchTime.get(app);
- long launchTime = 0;
- if (prevLaunchTime < 0) {
- // skip if the app has previous failures
- continue;
+
+ try {
+ File launchSubDir = new File(launchRootDir, LAUNCH_SUB_DIRECTORY);
+ if (!launchSubDir.exists() && !launchSubDir.mkdirs()) {
+ throw new IOException("Unable to create the lauch file sub directory");
+ }
+ mFile = new File(launchSubDir, LAUNCH_FILE);
+ mOutputStream = new FileOutputStream(mFile);
+ mBufferedWriter = new BufferedWriter(new OutputStreamWriter(
+ mOutputStream));
+
+ // Root directory for trace file during the launches
+ File rootTrace = null;
+ File rootTraceSubDir = null;
+ int traceBufferSize = 0;
+ int traceDumpInterval = 0;
+ Set<String> traceCategoriesSet = null;
+ if (null != mTraceDirectoryStr && !mTraceDirectoryStr.isEmpty()) {
+ rootTrace = new File(mTraceDirectoryStr);
+ if (!rootTrace.exists() && !rootTrace.mkdirs()) {
+ throw new IOException("Unable to create the trace directory");
}
- launchTime = startApp(app, true);
- if (launchTime <= 0) {
- // if it fails once, skip the rest of the launches
- mNameToLaunchTime.put(app, -1L);
- continue;
+ rootTraceSubDir = new File(rootTrace, TRACE_SUB_DIRECTORY);
+ if (!rootTraceSubDir.exists() && !rootTraceSubDir.mkdirs()) {
+ throw new IOException("Unable to create the trace sub directory");
}
- // keep the min launch time
- if (launchTime < prevLaunchTime) {
- mNameToLaunchTime.put(app, launchTime);
+ assertNotNull("Trace iteration parameter is mandatory",
+ args.getString(KEY_TRACE_ITERATIONS));
+ mTraceLaunchCount = Integer.parseInt(args.getString(KEY_TRACE_ITERATIONS));
+ String traceCategoriesStr = args
+ .getString(KEY_TRACE_CATEGORY, DEFAULT_TRACE_CATEGORIES);
+ traceBufferSize = Integer.parseInt(args.getString(KEY_TRACE_BUFFERSIZE,
+ DEFAULT_TRACE_BUFFER_SIZE));
+ traceDumpInterval = Integer.parseInt(args.getString(KEY_TRACE_DUMPINTERVAL,
+ DEFAULT_TRACE_DUMP_INTERVAL));
+ traceCategoriesSet = new HashSet<String>();
+ if (!traceCategoriesStr.isEmpty()) {
+ String[] traceCategoriesSplit = traceCategoriesStr.split(DELIMITER);
+ for (int i = 0; i < traceCategoriesSplit.length; i++) {
+ traceCategoriesSet.add(traceCategoriesSplit[i]);
+ }
}
- sleep(POST_LAUNCH_IDLE_TIMEOUT);
- closeApp(app, true);
- sleep(BETWEEN_LAUNCH_SLEEP_TIMEOUT);
+ }
+
+ // Get the app launch order based on launch order, trial launch,
+ // launch iterations and trace iterations
+ setLaunchOrder();
+
+ for (LaunchOrder launch : mLaunchOrderList) {
+
+ // App launch times for trial launch will not be used for final
+ // launch time calculations.
+ if (launch.getLaunchReason().equals(TRIAL_LAUNCH)) {
+ // In the "applaunch.txt" file, trail launches is referenced using
+ // "TRIAL_LAUNCH"
+ long launchTime = startApp(launch.getApp(), true, launch.getLaunchReason());
+ if (launchTime < 0) {
+ List<Long> appLaunchList = new ArrayList<Long>();
+ appLaunchList.add(-1L);
+ mNameToLaunchTime.put(launch.getApp(), appLaunchList);
+ // simply pass the app if launch isn't successful
+ // error should have already been logged by startApp
+ continue;
+ }
+ sleep(INITIAL_LAUNCH_IDLE_TIMEOUT);
+ closeApp(launch.getApp(), true);
+ dropCache();
+ sleep(BETWEEN_LAUNCH_SLEEP_TIMEOUT);
+ }
+
+ // App launch times used for final calculation
+ if (launch.getLaunchReason().contains(LAUNCH_ITERATION_PREFIX)) {
+ long launchTime = -1;
+ if (null != mNameToLaunchTime.get(launch.getApp())) {
+ long firstLaunchTime = mNameToLaunchTime.get(launch.getApp()).get(0);
+ if (firstLaunchTime < 0) {
+ // skip if the app has failures while launched first
+ continue;
+ }
+ }
+ // In the "applaunch.txt" file app launches are referenced using
+ // "LAUNCH_ITERATION - ITERATION NUM"
+ launchTime = startApp(launch.getApp(), true, launch.getLaunchReason());
+ if (launchTime < 0) {
+ // if it fails once, skip the rest of the launches
+ List<Long> appLaunchList = new ArrayList<Long>();
+ appLaunchList.add(-1L);
+ mNameToLaunchTime.put(launch.getApp(), appLaunchList);
+ continue;
+ } else {
+ if (null != mNameToLaunchTime.get(launch.getApp())) {
+ mNameToLaunchTime.get(launch.getApp()).add(launchTime);
+ } else {
+ List<Long> appLaunchList = new ArrayList<Long>();
+ appLaunchList.add(launchTime);
+ mNameToLaunchTime.put(launch.getApp(), appLaunchList);
+ }
+ }
+ sleep(POST_LAUNCH_IDLE_TIMEOUT);
+ closeApp(launch.getApp(), true);
+ dropCache();
+ sleep(BETWEEN_LAUNCH_SLEEP_TIMEOUT);
+ }
+
+ // App launch times for trace launch will not be used for final
+ // launch time calculations.
+ if (launch.getLaunchReason().contains(TRACE_ITERATION_PREFIX)) {
+ AtraceLogger atraceLogger = AtraceLogger
+ .getAtraceLoggerInstance(getInstrumentation());
+ // Start the trace
+ try {
+ atraceLogger.atraceStart(traceCategoriesSet, traceBufferSize,
+ traceDumpInterval, rootTraceSubDir,
+ String.format("%s-%s", launch.getApp(), launch.getLaunchReason()));
+ startApp(launch.getApp(), true, launch.getLaunchReason());
+ sleep(POST_LAUNCH_IDLE_TIMEOUT);
+ } finally {
+ // Stop the trace
+ atraceLogger.atraceStop();
+ closeApp(launch.getApp(), true);
+ dropCache();
+ sleep(BETWEEN_LAUNCH_SLEEP_TIMEOUT);
+ }
+ }
+ }
+ } finally {
+ if (null != mBufferedWriter) {
+ mBufferedWriter.close();
}
}
+
for (String app : mNameToResultKey.keySet()) {
- long launchTime = mNameToLaunchTime.get(app);
- if (launchTime != -1) {
- mResult.putLong(mNameToResultKey.get(app), launchTime);
+ StringBuilder launchTimes = new StringBuilder();
+ for (Long launch : mNameToLaunchTime.get(app)) {
+ launchTimes.append(launch);
+ launchTimes.append(",");
}
+ mResult.putString(mNameToResultKey.get(app), launchTimes.toString());
}
instrumentation.sendStatus(0, mResult);
}
+ /**
+ * If launch order is "cyclic" then apps will be launched one after the
+ * other for each iteration count.
+ * If launch order is "sequential" then each app will be launched for given number
+ * iterations at once before launching the other apps.
+ */
+ private void setLaunchOrder() {
+ if (LAUNCH_ORDER_CYCLIC.equalsIgnoreCase(mLaunchOrder)) {
+ if (mTrailLaunch) {
+ for (String app : mNameToResultKey.keySet()) {
+ mLaunchOrderList.add(new LaunchOrder(app, TRIAL_LAUNCH));
+ }
+ }
+ for (int launchCount = 0; launchCount < mLaunchIterations; launchCount++) {
+ for (String app : mNameToResultKey.keySet()) {
+ mLaunchOrderList.add(new LaunchOrder(app,
+ String.format(LAUNCH_ITERATION, launchCount)));
+ }
+ }
+ if (mTraceDirectoryStr != null && !mTraceDirectoryStr.isEmpty()) {
+ for (int traceCount = 0; traceCount < mTraceLaunchCount; traceCount++) {
+ for (String app : mNameToResultKey.keySet()) {
+ mLaunchOrderList.add(new LaunchOrder(app,
+ String.format(TRACE_ITERATION, traceCount)));
+ }
+ }
+ }
+ } else if (LAUNCH_ORDER_SEQUENTIAL.equalsIgnoreCase(mLaunchOrder)) {
+ for (String app : mNameToResultKey.keySet()) {
+ if (mTrailLaunch) {
+ mLaunchOrderList.add(new LaunchOrder(app, TRIAL_LAUNCH));
+ }
+ for (int launchCount = 0; launchCount < mLaunchIterations; launchCount++) {
+ mLaunchOrderList.add(new LaunchOrder(app,
+ String.format(LAUNCH_ITERATION, launchCount)));
+ }
+ if (mTraceDirectoryStr != null && !mTraceDirectoryStr.isEmpty()) {
+ for (int traceCount = 0; traceCount < mTraceLaunchCount; traceCount++) {
+ mLaunchOrderList.add(new LaunchOrder(app,
+ String.format(TRACE_ITERATION, traceCount)));
+ }
+ }
+ }
+ } else {
+ assertTrue("Launch order is not valid parameter", false);
+ }
+ }
+
+ private void dropCache() {
+ if (true == mDropCache) {
+ assertNotNull("Issue in dropping the cache",
+ getInstrumentation().getUiAutomation()
+ .executeShellCommand(DROP_CACHE_SCRIPT));
+ }
+ }
+
private void parseArgs(Bundle args) {
mNameToResultKey = new LinkedHashMap<String, String>();
- mNameToLaunchTime = new HashMap<String, Long>();
+ mNameToLaunchTime = new HashMap<String, List<Long>>();
String launchIterations = args.getString(KEY_LAUNCH_ITERATIONS);
if (launchIterations != null) {
mLaunchIterations = Integer.parseInt(launchIterations);
@@ -169,7 +382,7 @@
}
mNameToResultKey.put(parts[0], parts[1]);
- mNameToLaunchTime.put(parts[0], 0L);
+ mNameToLaunchTime.put(parts[0], null);
}
String requiredAccounts = args.getString(KEY_REQUIRED_ACCOUNTS);
if (requiredAccounts != null) {
@@ -178,7 +391,7 @@
mRequiredAccounts.add(accountType);
}
}
- mSkipInitialLaunch = "true".equals(args.getString(KEY_SKIP_INITIAL_LAUNCH));
+ mTrailLaunch = "true".equals(args.getString(KEY_TRIAL_LAUNCH));
}
private boolean hasLeanback(Context context) {
@@ -222,7 +435,7 @@
}
}
- private long startApp(String appName, boolean forceStopBeforeLaunch)
+ private long startApp(String appName, boolean forceStopBeforeLaunch, String launchReason)
throws NameNotFoundException, RemoteException {
Log.i(TAG, "Starting " + appName);
@@ -230,9 +443,10 @@
if (startIntent == null) {
Log.w(TAG, "App does not exist: " + appName);
mResult.putString(mNameToResultKey.get(appName), "App does not exist");
- return -1;
+ return -1L;
}
- AppLaunchRunnable runnable = new AppLaunchRunnable(startIntent, forceStopBeforeLaunch);
+ AppLaunchRunnable runnable = new AppLaunchRunnable(startIntent, forceStopBeforeLaunch ,
+ launchReason);
Thread t = new Thread(runnable);
t.start();
try {
@@ -240,21 +454,7 @@
} catch (InterruptedException e) {
// ignore
}
- WaitResult result = runnable.getResult();
- // report error if any of the following is true:
- // * launch thread is alive
- // * result is not null, but:
- // * result is not START_SUCCESS
- // * or in case of no force stop, result is not TASK_TO_FRONT either
- if (t.isAlive() || (result != null
- && ((result.result != ActivityManager.START_SUCCESS)
- && (!forceStopBeforeLaunch
- && result.result != ActivityManager.START_TASK_TO_FRONT)))) {
- Log.w(TAG, "Assuming app " + appName + " crashed.");
- reportError(appName, mNameToProcess.get(appName));
- return -1;
- }
- return result.thisTime;
+ return runnable.getResult();
}
private void checkAccountSignIn() {
@@ -337,39 +537,117 @@
+ " not found in process list, most likely it is crashed");
}
- private class AppLaunchRunnable implements Runnable {
- private Intent mLaunchIntent;
- private IActivityManager.WaitResult mResult;
- private boolean mForceStopBeforeLaunch;
+ private class LaunchOrder {
+ private String mApp;
+ private String mLaunchReason;
- public AppLaunchRunnable(Intent intent, boolean forceStopBeforeLaunch) {
- mLaunchIntent = intent;
- mForceStopBeforeLaunch = forceStopBeforeLaunch;
+ LaunchOrder(String app,String launchReason){
+ mApp = app;
+ mLaunchReason = launchReason;
}
- public IActivityManager.WaitResult getResult() {
+ public String getApp() {
+ return mApp;
+ }
+
+ public void setApp(String app) {
+ mApp = app;
+ }
+
+ public String getLaunchReason() {
+ return mLaunchReason;
+ }
+
+ public void setLaunchReason(String launchReason) {
+ mLaunchReason = launchReason;
+ }
+ }
+
+ private class AppLaunchRunnable implements Runnable {
+ private Intent mLaunchIntent;
+ private Long mResult;
+ private boolean mForceStopBeforeLaunch;
+ private String mLaunchReason;
+
+ public AppLaunchRunnable(Intent intent, boolean forceStopBeforeLaunch,
+ String launchReason) {
+ mLaunchIntent = intent;
+ mForceStopBeforeLaunch = forceStopBeforeLaunch;
+ mLaunchReason = launchReason;
+ }
+
+ public Long getResult() {
return mResult;
}
public void run() {
try {
String packageName = mLaunchIntent.getComponent().getPackageName();
+ String componentName = mLaunchIntent.getComponent().flattenToShortString();
if (mForceStopBeforeLaunch) {
mAm.forceStopPackage(packageName, UserHandle.USER_CURRENT);
}
- String mimeType = mLaunchIntent.getType();
- if (mimeType == null && mLaunchIntent.getData() != null
- && "content".equals(mLaunchIntent.getData().getScheme())) {
- mimeType = mAm.getProviderMimeType(mLaunchIntent.getData(),
- UserHandle.USER_CURRENT);
+ String launchCmd = String.format("%s %s", APP_LAUNCH_CMD, componentName);
+ if (null != mSimplePerfCmd) {
+ launchCmd = String.format("%s %s", mSimplePerfCmd, launchCmd);
}
-
- mResult = mAm.startActivityAndWait(null, null, mLaunchIntent, mimeType,
- null, null, 0, mLaunchIntent.getFlags(), null, null,
- UserHandle.USER_CURRENT);
+ Log.v(TAG, "Final launch cmd:" + launchCmd);
+ ParcelFileDescriptor parcelDesc = getInstrumentation().getUiAutomation()
+ .executeShellCommand(launchCmd);
+ mResult = Long.parseLong(parseLaunchTimeAndWrite(parcelDesc, String.format
+ ("App Launch :%s %s",
+ componentName, mLaunchReason)), 10);
} catch (RemoteException e) {
Log.w(TAG, "Error launching app", e);
}
}
+
+ /**
+ * Method to parse the launch time info and write the result to file
+ *
+ * @param parcelDesc
+ * @return
+ */
+ private String parseLaunchTimeAndWrite(ParcelFileDescriptor parcelDesc, String headerInfo) {
+ String launchTime = "-1";
+ boolean launchSuccess = false;
+ try {
+ InputStream inputStream = new FileInputStream(parcelDesc.getFileDescriptor());
+ StringBuilder appLaunchOuput = new StringBuilder();
+ /* SAMPLE OUTPUT :
+ Starting: Intent { cmp=com.google.android.calculator/com.android.calculator2.Calculator }
+ Status: ok
+ Activity: com.google.android.calculator/com.android.calculator2.Calculator
+ ThisTime: 357
+ TotalTime: 357
+ WaitTime: 377
+ Complete*/
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(
+ inputStream));
+ String line = null;
+ int lineCount = 1;
+ mBufferedWriter.newLine();
+ mBufferedWriter.write(headerInfo);
+ mBufferedWriter.newLine();
+ while ((line = bufferedReader.readLine()) != null) {
+ if (lineCount == 2 && line.contains(SUCCESS_MESSAGE)) {
+ launchSuccess = true;
+ }
+ if (launchSuccess && lineCount == 4) {
+ String launchSplit[] = line.split(":");
+ launchTime = launchSplit[1].trim();
+ }
+ mBufferedWriter.write(line);
+ mBufferedWriter.newLine();
+ lineCount++;
+ }
+ mBufferedWriter.flush();
+ inputStream.close();
+ } catch (IOException e) {
+ Log.w(TAG, "Error writing the launch file", e);
+ }
+ return launchTime;
+ }
+
}
}
diff --git a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
index 851bda9..0718628 100644
--- a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
+++ b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
@@ -77,6 +77,9 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
+
+ getWindow().getWindow().getDecorView().setSystemUiVisibility(
+ View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
@Override
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java
index 63fa3f9..7713f5d 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java
@@ -27,7 +27,6 @@
import android.view.DisplayListCanvas;
import android.view.ThreadedRenderer;
import android.view.RenderNode;
-import android.view.ThreadedRenderer;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AbsoluteLayout;
@@ -120,7 +119,7 @@
if (view == null) {
view.postDelayed(mSetup, 50);
}
- ThreadedRenderer renderer = view.getHardwareRenderer();
+ ThreadedRenderer renderer = view.getThreadedRenderer();
if (renderer == null || view.getWidth() == 0) {
view.postDelayed(mSetup, 50);
}
diff --git a/tests/SoundTriggerTestApp/AndroidManifest.xml b/tests/SoundTriggerTestApp/AndroidManifest.xml
index 71d6001..87f3e92 100644
--- a/tests/SoundTriggerTestApp/AndroidManifest.xml
+++ b/tests/SoundTriggerTestApp/AndroidManifest.xml
@@ -1,25 +1,28 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.test.soundtrigger">
-
+ <uses-permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD" />
<uses-permission android:name="android.permission.MANAGE_SOUND_TRIGGER" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application>
<activity
- android:name="TestSoundTriggerActivity"
+ android:name=".SoundTriggerTestActivity"
android:label="SoundTrigger Test Application"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Material">
- <!--
- <intent-filter>
- <action android:name="com.android.intent.action.MANAGE_SOUND_TRIGGER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- -->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <service
+ android:name=".SoundTriggerTestService"
+ android:stopWithTask="false"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="com.android.intent.action.MANAGE_SOUND_TRIGGER" />
+ </intent-filter>
+ </service>
</application>
</manifest>
diff --git a/tests/SoundTriggerTestApp/res/layout/main.xml b/tests/SoundTriggerTestApp/res/layout/main.xml
index 06949a0..0fd8b12 100644
--- a/tests/SoundTriggerTestApp/res/layout/main.xml
+++ b/tests/SoundTriggerTestApp/res/layout/main.xml
@@ -18,81 +18,107 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- >
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
+ android:orientation="vertical">
- <Button
- android:layout_width="wrap_content"
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/load"
+ android:onClick="onLoadButtonClicked"
+ android:padding="20dp" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/start_recog"
+ android:onClick="onStartRecognitionButtonClicked"
+ android:padding="20dp" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/stop_recog"
+ android:onClick="onStopRecognitionButtonClicked"
+ android:padding="20dp" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/unload"
+ android:onClick="onUnloadButtonClicked"
+ android:padding="20dp" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/reload"
+ android:onClick="onReloadButtonClicked"
+ android:padding="20dp" />
+
+ <Button
+ android:id="@+id/play_trigger_id"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/play_trigger"
+ android:onClick="onPlayTriggerButtonClicked"
+ android:padding="20dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/enroll"
- android:onClick="onEnrollButtonClicked"
- android:padding="20dp" />
+ android:layout_gravity="right">
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/reenroll"
- android:onClick="onReEnrollButtonClicked"
- android:padding="20dp" />
+ <CheckBox
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/capture"
+ android:id="@+id/caputre_check_box"
+ android:layout_gravity="center_horizontal"
+ android:padding="20dp" />
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/start_recog"
- android:onClick="onStartRecognitionButtonClicked"
- android:padding="20dp" />
+ <Button
+ android:id="@+id/play_captured_id"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/play_capture"
+ android:padding="20dp"
+ android:enabled="false" />
+ </LinearLayout>
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/stop_recog"
- android:onClick="onStopRecognitionButtonClicked"
- android:padding="20dp" />
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/unenroll"
- android:onClick="onUnEnrollButtonClicked"
- android:padding="20dp" />
-
- <Button
- android:id="@+id/play_trigger_id"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/play_trigger"
- android:onClick="onPlayTriggerButtonClicked"
- android:padding="20dp" />
-
-</LinearLayout>
-
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+ <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/model_group_id"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="20dp"
- android:orientation="vertical">
-</RadioGroup>
+ android:orientation="vertical" />
-<ScrollView
+ <ScrollView
android:id="@+id/scroller_id"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"
android:fillViewport="true">
- <TextView
- android:id="@+id/console"
- android:paddingTop="20pt"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:textSize="14dp"
- android:layout_weight="1.0"
- android:text="@string/none">
- </TextView>
-</ScrollView>
+ <TextView
+ android:id="@+id/console"
+ android:paddingTop="20pt"
+ android:layout_height="fill_parent"
+ android:layout_width="fill_parent"
+ android:textSize="14dp"
+ android:layout_weight="1.0"
+ android:text="@string/none" />
+ </ScrollView>
</LinearLayout>
diff --git a/tests/SoundTriggerTestApp/res/values/strings.xml b/tests/SoundTriggerTestApp/res/values/strings.xml
index 7c1f649..c48b648 100644
--- a/tests/SoundTriggerTestApp/res/values/strings.xml
+++ b/tests/SoundTriggerTestApp/res/values/strings.xml
@@ -16,11 +16,14 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="enroll">Load</string>
- <string name="reenroll">Re-load</string>
- <string name="unenroll">Un-load</string>
+ <string name="load">Load</string>
+ <string name="reload">Reload</string>
+ <string name="unload">Unload</string>
<string name="start_recog">Start</string>
<string name="stop_recog">Stop</string>
<string name="play_trigger">Play Trigger Audio</string>
+ <string name="capture">Capture Audio</string>
+ <string name="stop_capture">Stop Capturing Audio</string>
+ <string name="play_capture">Play Captured Audio</string>
<string name="none">Debug messages appear here:\n</string>
</resources>
diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestActivity.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestActivity.java
new file mode 100644
index 0000000..4841bc5
--- /dev/null
+++ b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestActivity.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test.soundtrigger;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.text.Editable;
+import android.text.method.ScrollingMovementMethod;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.test.soundtrigger.SoundTriggerTestService.SoundTriggerTestBinder;
+
+public class SoundTriggerTestActivity extends Activity implements SoundTriggerTestService.UserActivity {
+ private static final String TAG = "SoundTriggerTest";
+ private static final int AUDIO_PERMISSIONS_REQUEST = 1;
+
+ private SoundTriggerTestService mService = null;
+
+ private static UUID mSelectedModelUuid = null;
+
+ private Map<RadioButton, UUID> mButtonModelUuidMap;
+ private Map<UUID, RadioButton> mModelButtons;
+ private Map<UUID, String> mModelNames;
+ private List<RadioButton> mModelRadioButtons;
+
+ private TextView mDebugView = null;
+ private ScrollView mScrollView = null;
+ private Button mPlayTriggerButton = null;
+ private PowerManager.WakeLock mScreenWakelock;
+ private Handler mHandler;
+ private RadioGroup mRadioGroup;
+ private CheckBox mCaptureAudioCheckBox;
+ private Button mPlayCapturedAudioButton = null;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ // Make sure that this activity can punch through the lockscreen if needed.
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
+ WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+ mDebugView = (TextView) findViewById(R.id.console);
+ mScrollView = (ScrollView) findViewById(R.id.scroller_id);
+ mRadioGroup = (RadioGroup) findViewById(R.id.model_group_id);
+ mPlayTriggerButton = (Button) findViewById(R.id.play_trigger_id);
+ mDebugView.setText(mDebugView.getText(), TextView.BufferType.EDITABLE);
+ mDebugView.setMovementMethod(new ScrollingMovementMethod());
+ mCaptureAudioCheckBox = (CheckBox) findViewById(R.id.caputre_check_box);
+ mPlayCapturedAudioButton = (Button) findViewById(R.id.play_captured_id);
+ mHandler = new Handler();
+ mButtonModelUuidMap = new HashMap();
+ mModelButtons = new HashMap();
+ mModelNames = new HashMap();
+ mModelRadioButtons = new LinkedList();
+
+ setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+ // Make sure that the service is started, so even if our activity goes down, we'll still
+ // have a request for it to run.
+ startService(new Intent(getBaseContext(), SoundTriggerTestService.class));
+
+ // Bind to SoundTriggerTestService.
+ Intent intent = new Intent(this, SoundTriggerTestService.class);
+ bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ // Unbind from the service.
+ if (mService != null) {
+ mService.setUserActivity(null);
+ unbindService(mConnection);
+ }
+ }
+
+ @Override
+ public void addModel(UUID modelUuid, String name) {
+ // Create a new widget for this model, and insert everything we'd need into the map.
+ RadioButton button = new RadioButton(this);
+ mModelRadioButtons.add(button);
+ button.setText(name);
+ button.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ onRadioButtonClicked(v);
+ }
+ });
+ mButtonModelUuidMap.put(button, modelUuid);
+ mModelButtons.put(modelUuid, button);
+ mModelNames.put(modelUuid, name);
+
+ // Sort all the radio buttons by name, then push them into the group in order.
+ Collections.sort(mModelRadioButtons, new Comparator<RadioButton>(){
+ @Override
+ public int compare(RadioButton button0, RadioButton button1) {
+ return button0.getText().toString().compareTo(button1.getText().toString());
+ }
+ });
+ mRadioGroup.removeAllViews();
+ for (View v : mModelRadioButtons) {
+ mRadioGroup.addView(v);
+ }
+
+ // If we don't have something selected, select this first thing.
+ if (mSelectedModelUuid == null || mSelectedModelUuid.equals(modelUuid)) {
+ button.setChecked(true);
+ onRadioButtonClicked(button);
+ }
+ }
+
+ @Override
+ public void setModelState(UUID modelUuid, String state) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ String newButtonText = mModelNames.get(modelUuid);
+ if (state != null) {
+ newButtonText += ": " + state;
+ }
+ mModelButtons.get(modelUuid).setText(newButtonText);
+ updateSelectModelSpecificUiElements();
+ }
+ });
+ }
+
+ @Override
+ public void showMessage(String msg, boolean showToast) {
+ // Append the message to the text field, then show the toast if requested.
+ this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ ((Editable) mDebugView.getText()).append(msg + "\n");
+ mScrollView.post(new Runnable() {
+ public void run() {
+ mScrollView.smoothScrollTo(0, mDebugView.getBottom());
+ }
+ });
+ if (showToast) {
+ Toast.makeText(SoundTriggerTestActivity.this, msg, Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+ }
+
+ @Override
+ public void handleDetection(UUID modelUuid) {
+ screenWakeup();
+ mHandler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ screenRelease();
+ }
+ }, 1000L);
+ }
+
+ private void screenWakeup() {
+ if (mScreenWakelock == null) {
+ PowerManager pm = ((PowerManager)getSystemService(POWER_SERVICE));
+ mScreenWakelock = pm.newWakeLock(
+ PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
+ }
+ mScreenWakelock.acquire();
+ }
+
+ private void screenRelease() {
+ mScreenWakelock.release();
+ }
+
+ public void onLoadButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Could not load sound model: not bound to SoundTriggerTestService");
+ } else {
+ mService.loadModel(mSelectedModelUuid);
+ }
+ }
+
+ public void onUnloadButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Can't unload model: not bound to SoundTriggerTestService");
+ } else {
+ mService.unloadModel(mSelectedModelUuid);
+ }
+ }
+
+ public void onReloadButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Can't reload model: not bound to SoundTriggerTestService");
+ } else {
+ mService.reloadModel(mSelectedModelUuid);
+ }
+ }
+
+ public void onStartRecognitionButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Can't start recognition: not bound to SoundTriggerTestService");
+ } else {
+ mService.startRecognition(mSelectedModelUuid);
+ }
+ }
+
+ public void onStopRecognitionButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Can't stop recognition: not bound to SoundTriggerTestService");
+ } else {
+ mService.stopRecognition(mSelectedModelUuid);
+ }
+ }
+
+ public synchronized void onPlayTriggerButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Can't play trigger audio: not bound to SoundTriggerTestService");
+ } else {
+ mService.playTriggerAudio(mSelectedModelUuid);
+ }
+ }
+
+ public synchronized void onCaptureAudioCheckboxClicked(View v) {
+ // See if we have the right permissions
+ if (!mService.hasMicrophonePermission()) {
+ requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO},
+ AUDIO_PERMISSIONS_REQUEST);
+ return;
+ } else {
+ mService.setCaptureAudio(mSelectedModelUuid, mCaptureAudioCheckBox.isChecked());
+ }
+ }
+
+ @Override
+ public synchronized void onRequestPermissionsResult(int requestCode, String permissions[],
+ int[] grantResults) {
+ if (requestCode == AUDIO_PERMISSIONS_REQUEST) {
+ if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+ // Make sure that the check box is set to false.
+ mCaptureAudioCheckBox.setChecked(false);
+ }
+ mService.setCaptureAudio(mSelectedModelUuid, mCaptureAudioCheckBox.isChecked());
+ }
+ }
+
+ public synchronized void onPlayCapturedAudioButtonClicked(View v) {
+ if (mService == null) {
+ Log.e(TAG, "Can't play captured audio: not bound to SoundTriggerTestService");
+ } else {
+ mService.playCapturedAudio(mSelectedModelUuid);
+ }
+ }
+
+ public synchronized void onRadioButtonClicked(View view) {
+ // Is the button now checked?
+ boolean checked = ((RadioButton) view).isChecked();
+ if (checked) {
+ mSelectedModelUuid = mButtonModelUuidMap.get(view);
+ showMessage("Selected " + mModelNames.get(mSelectedModelUuid), false);
+ updateSelectModelSpecificUiElements();
+ }
+ }
+
+ private synchronized void updateSelectModelSpecificUiElements() {
+ // Set the play trigger button to be enabled only if we actually have some audio.
+ mPlayTriggerButton.setEnabled(mService.modelHasTriggerAudio((mSelectedModelUuid)));
+ // Similar logic for the captured audio.
+ mCaptureAudioCheckBox.setChecked(
+ mService.modelWillCaptureTriggerAudio(mSelectedModelUuid));
+ mPlayCapturedAudioButton.setEnabled(mService.modelHasCapturedAudio((mSelectedModelUuid)));
+ }
+
+ private ServiceConnection mConnection = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName className, IBinder service) {
+ synchronized (SoundTriggerTestActivity.this) {
+ // We've bound to LocalService, cast the IBinder and get LocalService instance
+ SoundTriggerTestBinder binder = (SoundTriggerTestBinder) service;
+ mService = binder.getService();
+ mService.setUserActivity(SoundTriggerTestActivity.this);
+ }
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName arg0) {
+ synchronized (SoundTriggerTestActivity.this) {
+ mService.setUserActivity(null);
+ mService = null;
+ }
+ }
+ };
+}
diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java
new file mode 100644
index 0000000..a2385d6
--- /dev/null
+++ b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java
@@ -0,0 +1,720 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test.soundtrigger;
+
+import android.Manifest;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.hardware.soundtrigger.SoundTrigger.GenericSoundModel;
+import android.media.AudioAttributes;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.media.MediaPlayer;
+import android.media.soundtrigger.SoundTriggerDetector;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.UUID;
+
+public class SoundTriggerTestService extends Service {
+ private static final String TAG = "SoundTriggerTestSrv";
+ private static final String INTENT_ACTION = "com.android.intent.action.MANAGE_SOUND_TRIGGER";
+
+ // Binder given to clients.
+ private final IBinder mBinder;
+ private final Map<UUID, ModelInfo> mModelInfoMap;
+ private SoundTriggerUtil mSoundTriggerUtil;
+ private Random mRandom;
+ private UserActivity mUserActivity;
+
+ public interface UserActivity {
+ void addModel(UUID modelUuid, String state);
+ void setModelState(UUID modelUuid, String state);
+ void showMessage(String msg, boolean showToast);
+ void handleDetection(UUID modelUuid);
+ }
+
+ public SoundTriggerTestService() {
+ super();
+ mRandom = new Random();
+ mModelInfoMap = new HashMap();
+ mBinder = new SoundTriggerTestBinder();
+ }
+
+ @Override
+ public synchronized int onStartCommand(Intent intent, int flags, int startId) {
+ if (mModelInfoMap.isEmpty()) {
+ mSoundTriggerUtil = new SoundTriggerUtil(this);
+ loadModelsInDataDir();
+ }
+
+ // If we get killed, after returning from here, restart
+ return START_STICKY;
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(INTENT_ACTION);
+ registerReceiver(mBroadcastReceiver, filter);
+
+ // Make sure the data directory exists, and we're the owner of it.
+ try {
+ getFilesDir().mkdir();
+ } catch (Exception e) {
+ // Don't care - we either made it, or it already exists.
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ stopAllRecognitions();
+ unregisterReceiver(mBroadcastReceiver);
+ }
+
+ private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent != null && INTENT_ACTION.equals(intent.getAction())) {
+ String command = intent.getStringExtra("command");
+ if (command == null) {
+ Log.e(TAG, "No 'command' specified in " + INTENT_ACTION);
+ } else {
+ try {
+ if (command.equals("load")) {
+ loadModel(getModelUuidFromIntent(intent));
+ } else if (command.equals("unload")) {
+ unloadModel(getModelUuidFromIntent(intent));
+ } else if (command.equals("start")) {
+ startRecognition(getModelUuidFromIntent(intent));
+ } else if (command.equals("stop")) {
+ stopRecognition(getModelUuidFromIntent(intent));
+ } else if (command.equals("play_trigger")) {
+ playTriggerAudio(getModelUuidFromIntent(intent));
+ } else if (command.equals("play_captured")) {
+ playCapturedAudio(getModelUuidFromIntent(intent));
+ } else if (command.equals("set_capture")) {
+ setCaptureAudio(getModelUuidFromIntent(intent),
+ intent.getBooleanExtra("enabled", true));
+ } else if (command.equals("set_capture_timeout")) {
+ setCaptureAudioTimeout(getModelUuidFromIntent(intent),
+ intent.getIntExtra("timeout", 5000));
+ } else {
+ Log.e(TAG, "Unknown command '" + command + "'");
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to process " + command, e);
+ }
+ }
+ }
+ }
+ };
+
+ private UUID getModelUuidFromIntent(Intent intent) {
+ // First, see if the specified the UUID straight up.
+ String value = intent.getStringExtra("modelUuid");
+ if (value != null) {
+ return UUID.fromString(value);
+ }
+
+ // If they specified a name, use that to iterate through the map of models and find it.
+ value = intent.getStringExtra("name");
+ if (value != null) {
+ for (ModelInfo modelInfo : mModelInfoMap.values()) {
+ if (value.equals(modelInfo.name)) {
+ return modelInfo.modelUuid;
+ }
+ }
+ Log.e(TAG, "Failed to find a matching model with name '" + value + "'");
+ }
+
+ // We couldn't figure out what they were asking for.
+ throw new RuntimeException("Failed to get model from intent - specify either " +
+ "'modelUuid' or 'name'");
+ }
+
+ /**
+ * Will be called when the service is killed (through swipe aways, not if we're force killed).
+ */
+ @Override
+ public void onTaskRemoved(Intent rootIntent) {
+ super.onTaskRemoved(rootIntent);
+ stopAllRecognitions();
+ stopSelf();
+ }
+
+ @Override
+ public synchronized IBinder onBind(Intent intent) {
+ return mBinder;
+ }
+
+ public class SoundTriggerTestBinder extends Binder {
+ SoundTriggerTestService getService() {
+ // Return instance of our parent so clients can call public methods.
+ return SoundTriggerTestService.this;
+ }
+ }
+
+ public synchronized void setUserActivity(UserActivity activity) {
+ mUserActivity = activity;
+ if (mUserActivity != null) {
+ for (Map.Entry<UUID, ModelInfo> entry : mModelInfoMap.entrySet()) {
+ mUserActivity.addModel(entry.getKey(), entry.getValue().name);
+ mUserActivity.setModelState(entry.getKey(), entry.getValue().state);
+ }
+ }
+ }
+
+ private synchronized void stopAllRecognitions() {
+ for (ModelInfo modelInfo : mModelInfoMap.values()) {
+ if (modelInfo.detector != null) {
+ Log.i(TAG, "Stopping recognition for " + modelInfo.name);
+ try {
+ modelInfo.detector.stopRecognition();
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to stop recognition", e);
+ }
+ }
+ }
+ }
+
+ // Helper struct for holding information about a model.
+ public static class ModelInfo {
+ public String name;
+ public String state;
+ public UUID modelUuid;
+ public UUID vendorUuid;
+ public MediaPlayer triggerAudioPlayer;
+ public SoundTriggerDetector detector;
+ public byte modelData[];
+ public boolean captureAudio;
+ public int captureAudioMs;
+ public AudioTrack captureAudioTrack;
+ }
+
+ private GenericSoundModel createNewSoundModel(ModelInfo modelInfo) {
+ return new GenericSoundModel(modelInfo.modelUuid, modelInfo.vendorUuid,
+ modelInfo.modelData);
+ }
+
+ public synchronized void loadModel(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+
+ postMessage("Loading model: " + modelInfo.name);
+
+ GenericSoundModel soundModel = createNewSoundModel(modelInfo);
+
+ boolean status = mSoundTriggerUtil.addOrUpdateSoundModel(soundModel);
+ if (status) {
+ postToast("Successfully loaded " + modelInfo.name + ", UUID=" + soundModel.uuid);
+ setModelState(modelInfo, "Loaded");
+ } else {
+ postErrorToast("Failed to load " + modelInfo.name + ", UUID=" + soundModel.uuid + "!");
+ setModelState(modelInfo, "Failed to load");
+ }
+ }
+
+ public synchronized void unloadModel(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+
+ postMessage("Unloading model: " + modelInfo.name);
+
+ GenericSoundModel soundModel = mSoundTriggerUtil.getSoundModel(modelUuid);
+ if (soundModel == null) {
+ postErrorToast("Sound model not found for " + modelInfo.name + "!");
+ return;
+ }
+ modelInfo.detector = null;
+ boolean status = mSoundTriggerUtil.deleteSoundModel(modelUuid);
+ if (status) {
+ postToast("Successfully unloaded " + modelInfo.name + ", UUID=" + soundModel.uuid);
+ setModelState(modelInfo, "Unloaded");
+ } else {
+ postErrorToast("Failed to unload " +
+ modelInfo.name + ", UUID=" + soundModel.uuid + "!");
+ setModelState(modelInfo, "Failed to unload");
+ }
+ }
+
+ public synchronized void reloadModel(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+ postMessage("Reloading model: " + modelInfo.name);
+ GenericSoundModel soundModel = mSoundTriggerUtil.getSoundModel(modelUuid);
+ if (soundModel == null) {
+ postErrorToast("Sound model not found for " + modelInfo.name + "!");
+ return;
+ }
+ GenericSoundModel updated = createNewSoundModel(modelInfo);
+ boolean status = mSoundTriggerUtil.addOrUpdateSoundModel(updated);
+ if (status) {
+ postToast("Successfully reloaded " + modelInfo.name + ", UUID=" + modelInfo.modelUuid);
+ setModelState(modelInfo, "Reloaded");
+ } else {
+ postErrorToast("Failed to reload "
+ + modelInfo.name + ", UUID=" + modelInfo.modelUuid + "!");
+ setModelState(modelInfo, "Failed to reload");
+ }
+ }
+
+ public synchronized void startRecognition(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+
+ if (modelInfo.detector == null) {
+ postMessage("Creating SoundTriggerDetector for " + modelInfo.name);
+ modelInfo.detector = mSoundTriggerUtil.createSoundTriggerDetector(
+ modelUuid, new DetectorCallback(modelInfo));
+ }
+
+ postMessage("Starting recognition for " + modelInfo.name + ", UUID=" + modelInfo.modelUuid);
+ if (modelInfo.detector.startRecognition(modelInfo.captureAudio ?
+ SoundTriggerDetector.RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO :
+ SoundTriggerDetector.RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS)) {
+ setModelState(modelInfo, "Started");
+ } else {
+ postErrorToast("Fast failure attempting to start recognition for " +
+ modelInfo.name + ", UUID=" + modelInfo.modelUuid);
+ setModelState(modelInfo, "Failed to start");
+ }
+ }
+
+ public synchronized void stopRecognition(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+
+ if (modelInfo.detector == null) {
+ postErrorToast("Stop called on null detector for " +
+ modelInfo.name + ", UUID=" + modelInfo.modelUuid);
+ return;
+ }
+ postMessage("Triggering stop recognition for " +
+ modelInfo.name + ", UUID=" + modelInfo.modelUuid);
+ if (modelInfo.detector.stopRecognition()) {
+ setModelState(modelInfo, "Stopped");
+ } else {
+ postErrorToast("Fast failure attempting to stop recognition for " +
+ modelInfo.name + ", UUID=" + modelInfo.modelUuid);
+ setModelState(modelInfo, "Failed to stop");
+ }
+ }
+
+ public synchronized void playTriggerAudio(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+ if (modelInfo.triggerAudioPlayer != null) {
+ postMessage("Playing trigger audio for " + modelInfo.name);
+ modelInfo.triggerAudioPlayer.start();
+ } else {
+ postMessage("No trigger audio for " + modelInfo.name);
+ }
+ }
+
+ public synchronized void playCapturedAudio(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+ if (modelInfo.captureAudioTrack != null) {
+ postMessage("Playing captured audio for " + modelInfo.name);
+ modelInfo.captureAudioTrack.stop();
+ modelInfo.captureAudioTrack.reloadStaticData();
+ modelInfo.captureAudioTrack.play();
+ } else {
+ postMessage("No captured audio for " + modelInfo.name);
+ }
+ }
+
+ public synchronized void setCaptureAudioTimeout(UUID modelUuid, int captureTimeoutMs) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+ modelInfo.captureAudioMs = captureTimeoutMs;
+ Log.i(TAG, "Set " + modelInfo.name + " capture audio timeout to " +
+ captureTimeoutMs + "ms");
+ }
+
+ public synchronized void setCaptureAudio(UUID modelUuid, boolean captureAudio) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ if (modelInfo == null) {
+ postError("Could not find model for: " + modelUuid.toString());
+ return;
+ }
+ modelInfo.captureAudio = captureAudio;
+ Log.i(TAG, "Set " + modelInfo.name + " capture audio to " + captureAudio);
+ }
+
+ public synchronized boolean hasMicrophonePermission() {
+ return getBaseContext().checkSelfPermission(Manifest.permission.RECORD_AUDIO)
+ == PackageManager.PERMISSION_GRANTED;
+ }
+
+ public synchronized boolean modelHasTriggerAudio(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ return modelInfo != null && modelInfo.triggerAudioPlayer != null;
+ }
+
+ public synchronized boolean modelWillCaptureTriggerAudio(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ return modelInfo != null && modelInfo.captureAudio;
+ }
+
+ public synchronized boolean modelHasCapturedAudio(UUID modelUuid) {
+ ModelInfo modelInfo = mModelInfoMap.get(modelUuid);
+ return modelInfo != null && modelInfo.captureAudioTrack != null;
+ }
+
+ private void loadModelsInDataDir() {
+ // Load all the models in the data dir.
+ boolean loadedModel = false;
+ for (File file : getFilesDir().listFiles()) {
+ // Find meta-data in .properties files, ignore everything else.
+ if (!file.getName().endsWith(".properties")) {
+ continue;
+ }
+ try {
+ Properties properties = new Properties();
+ properties.load(new FileInputStream(file));
+ createModelInfo(properties);
+ loadedModel = true;
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to load properties file " + file.getName());
+ }
+ }
+
+ // Create a few dummy models if we didn't load anything.
+ if (!loadedModel) {
+ Properties dummyModelProperties = new Properties();
+ for (String name : new String[]{"1", "2", "3"}) {
+ dummyModelProperties.setProperty("name", "Model " + name);
+ createModelInfo(dummyModelProperties);
+ }
+ }
+ }
+
+ /** Parses a Properties collection to generate a sound model.
+ *
+ * Missing keys are filled in with default/random values.
+ * @param properties Has the required 'name' property, but the remaining 'modelUuid',
+ * 'vendorUuid', 'triggerAudio', and 'dataFile' optional properties.
+ *
+ */
+ private synchronized void createModelInfo(Properties properties) {
+ try {
+ ModelInfo modelInfo = new ModelInfo();
+
+ if (!properties.containsKey("name")) {
+ throw new RuntimeException("must have a 'name' property");
+ }
+ modelInfo.name = properties.getProperty("name");
+
+ if (properties.containsKey("modelUuid")) {
+ modelInfo.modelUuid = UUID.fromString(properties.getProperty("modelUuid"));
+ } else {
+ modelInfo.modelUuid = UUID.randomUUID();
+ }
+
+ if (properties.containsKey("vendorUuid")) {
+ modelInfo.vendorUuid = UUID.fromString(properties.getProperty("vendorUuid"));
+ } else {
+ modelInfo.vendorUuid = UUID.randomUUID();
+ }
+
+ if (properties.containsKey("triggerAudio")) {
+ modelInfo.triggerAudioPlayer = MediaPlayer.create(this, Uri.parse(
+ getFilesDir().getPath() + "/" + properties.getProperty("triggerAudio")));
+ if (modelInfo.triggerAudioPlayer.getDuration() == 0) {
+ modelInfo.triggerAudioPlayer.release();
+ modelInfo.triggerAudioPlayer = null;
+ }
+ }
+
+ if (properties.containsKey("dataFile")) {
+ File modelDataFile = new File(
+ getFilesDir().getPath() + "/" + properties.getProperty("dataFile"));
+ modelInfo.modelData = new byte[(int) modelDataFile.length()];
+ FileInputStream input = new FileInputStream(modelDataFile);
+ input.read(modelInfo.modelData, 0, modelInfo.modelData.length);
+ } else {
+ modelInfo.modelData = new byte[1024];
+ mRandom.nextBytes(modelInfo.modelData);
+ }
+
+ modelInfo.captureAudioMs = Integer.parseInt((String) properties.getOrDefault(
+ "captureAudioDurationMs", "5000"));
+
+ // TODO: Add property support for keyphrase models when they're exposed by the
+ // service.
+
+ // Update our maps containing the button -> id and id -> modelInfo.
+ mModelInfoMap.put(modelInfo.modelUuid, modelInfo);
+ if (mUserActivity != null) {
+ mUserActivity.addModel(modelInfo.modelUuid, modelInfo.name);
+ mUserActivity.setModelState(modelInfo.modelUuid, modelInfo.state);
+ }
+ } catch (IOException e) {
+ Log.e(TAG, "Error parsing properties for " + properties.getProperty("name"), e);
+ }
+ }
+
+ private class CaptureAudioRecorder implements Runnable {
+ private final ModelInfo mModelInfo;
+ private final SoundTriggerDetector.EventPayload mEvent;
+
+ public CaptureAudioRecorder(ModelInfo modelInfo, SoundTriggerDetector.EventPayload event) {
+ mModelInfo = modelInfo;
+ mEvent = event;
+ }
+
+ @Override
+ public void run() {
+ AudioFormat format = mEvent.getCaptureAudioFormat();
+ if (format == null) {
+ postErrorToast("No audio format in recognition event.");
+ return;
+ }
+
+ AudioRecord audioRecord = null;
+ AudioTrack playbackTrack = null;
+ try {
+ // Inform the audio flinger that we really do want the stream from the soundtrigger.
+ AudioAttributes.Builder attributesBuilder = new AudioAttributes.Builder();
+ attributesBuilder.setInternalCapturePreset(1999);
+ AudioAttributes attributes = attributesBuilder.build();
+
+ // Make sure we understand this kind of playback so we know how many bytes to read.
+ String encoding;
+ int bytesPerSample;
+ switch (format.getEncoding()) {
+ case AudioFormat.ENCODING_PCM_8BIT:
+ encoding = "8bit";
+ bytesPerSample = 1;
+ break;
+ case AudioFormat.ENCODING_PCM_16BIT:
+ encoding = "16bit";
+ bytesPerSample = 2;
+ break;
+ case AudioFormat.ENCODING_PCM_FLOAT:
+ encoding = "float";
+ bytesPerSample = 4;
+ break;
+ default:
+ throw new RuntimeException("Unhandled audio format in event");
+ }
+
+ int bytesRequired = format.getSampleRate() * format.getChannelCount() *
+ bytesPerSample * mModelInfo.captureAudioMs / 1000;
+ int minBufferSize = AudioRecord.getMinBufferSize(
+ format.getSampleRate(), format.getChannelMask(), format.getEncoding());
+ if (minBufferSize > bytesRequired) {
+ bytesRequired = minBufferSize;
+ }
+
+ // Make an AudioTrack so we can play the data back out after it's finished
+ // recording.
+ try {
+ int channelConfig = AudioFormat.CHANNEL_OUT_MONO;
+ if (format.getChannelCount() == 2) {
+ channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+ } else if (format.getChannelCount() >= 3) {
+ throw new RuntimeException(
+ "Too many channels in captured audio for playback");
+ }
+
+ playbackTrack = new AudioTrack(AudioManager.STREAM_MUSIC,
+ format.getSampleRate(), channelConfig, format.getEncoding(),
+ bytesRequired, AudioTrack.MODE_STATIC);
+ } catch (Exception e) {
+ Log.e(TAG, "Exception creating playback track", e);
+ postErrorToast("Failed to create playback track: " + e.getMessage());
+ }
+
+ audioRecord = new AudioRecord(attributes, format, bytesRequired,
+ mEvent.getCaptureSession());
+
+ byte[] buffer = new byte[bytesRequired];
+
+ // Create a file so we can save the output data there for analysis later.
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream( new File(
+ getFilesDir() + File.separator + mModelInfo.name.replace(' ', '_') +
+ "_capture_" + format.getChannelCount() + "ch_" +
+ format.getSampleRate() + "hz_" + encoding + ".pcm"));
+ } catch (IOException e) {
+ Log.e(TAG, "Failed to open output for saving PCM data", e);
+ postErrorToast("Failed to open output for saving PCM data: " + e.getMessage());
+ }
+
+ // Inform the user we're recording.
+ setModelState(mModelInfo, "Recording");
+ audioRecord.startRecording();
+ while (bytesRequired > 0) {
+ int bytesRead = audioRecord.read(buffer, 0, buffer.length);
+ if (bytesRead == -1) {
+ break;
+ }
+ if (fos != null) {
+ fos.write(buffer, 0, bytesRead);
+ }
+ if (playbackTrack != null) {
+ playbackTrack.write(buffer, 0, bytesRead);
+ }
+ bytesRequired -= bytesRead;
+ }
+ audioRecord.stop();
+ } catch (Exception e) {
+ Log.e(TAG, "Error recording trigger audio", e);
+ postErrorToast("Error recording trigger audio: " + e.getMessage());
+ } finally {
+ if (audioRecord != null) {
+ audioRecord.release();
+ }
+ synchronized (SoundTriggerTestService.this) {
+ if (mModelInfo.captureAudioTrack != null) {
+ mModelInfo.captureAudioTrack.release();
+ }
+ mModelInfo.captureAudioTrack = playbackTrack;
+ }
+ setModelState(mModelInfo, "Recording finished");
+ }
+ }
+ }
+
+ // Implementation of SoundTriggerDetector.Callback.
+ private class DetectorCallback extends SoundTriggerDetector.Callback {
+ private final ModelInfo mModelInfo;
+
+ public DetectorCallback(ModelInfo modelInfo) {
+ mModelInfo = modelInfo;
+ }
+
+ public void onAvailabilityChanged(int status) {
+ postMessage(mModelInfo.name + " availability changed to: " + status);
+ }
+
+ public void onDetected(SoundTriggerDetector.EventPayload event) {
+ postMessage(mModelInfo.name + " onDetected(): " + eventPayloadToString(event));
+ synchronized (SoundTriggerTestService.this) {
+ if (mUserActivity != null) {
+ mUserActivity.handleDetection(mModelInfo.modelUuid);
+ }
+ if (mModelInfo.captureAudio) {
+ new Thread(new CaptureAudioRecorder(mModelInfo, event)).start();
+ }
+ }
+ }
+
+ public void onError() {
+ postMessage(mModelInfo.name + " onError()");
+ setModelState(mModelInfo, "Error");
+ }
+
+ public void onRecognitionPaused() {
+ postMessage(mModelInfo.name + " onRecognitionPaused()");
+ setModelState(mModelInfo, "Paused");
+ }
+
+ public void onRecognitionResumed() {
+ postMessage(mModelInfo.name + " onRecognitionResumed()");
+ setModelState(mModelInfo, "Resumed");
+ }
+ }
+
+ private String eventPayloadToString(SoundTriggerDetector.EventPayload event) {
+ String result = "EventPayload(";
+ AudioFormat format = event.getCaptureAudioFormat();
+ result = result + "AudioFormat: " + ((format == null) ? "null" : format.toString());
+ byte[] triggerAudio = event.getTriggerAudio();
+ result = result + "TriggerAudio: " + (triggerAudio == null ? "null" : triggerAudio.length);
+ result = result + "CaptureSession: " + event.getCaptureSession();
+ result += " )";
+ return result;
+ }
+
+ private void postMessage(String msg) {
+ showMessage(msg, Log.INFO, false);
+ }
+
+ private void postError(String msg) {
+ showMessage(msg, Log.ERROR, false);
+ }
+
+ private void postToast(String msg) {
+ showMessage(msg, Log.INFO, true);
+ }
+
+ private void postErrorToast(String msg) {
+ showMessage(msg, Log.ERROR, true);
+ }
+
+ /** Logs the message at the specified level, then forwards it to the activity if present. */
+ private synchronized void showMessage(String msg, int logLevel, boolean showToast) {
+ Log.println(logLevel, TAG, msg);
+ if (mUserActivity != null) {
+ mUserActivity.showMessage(msg, showToast);
+ }
+ }
+
+ private synchronized void setModelState(ModelInfo modelInfo, String state) {
+ modelInfo.state = state;
+ if (mUserActivity != null) {
+ mUserActivity.setModelState(modelInfo.modelUuid, modelInfo.state);
+ }
+ }
+}
diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java
index 881d5d2..6b89b62 100644
--- a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java
+++ b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java
@@ -18,7 +18,6 @@
import android.annotation.Nullable;
import android.content.Context;
-import android.hardware.soundtrigger.SoundTrigger;
import android.hardware.soundtrigger.SoundTrigger.GenericSoundModel;
import android.media.soundtrigger.SoundTriggerDetector;
import android.media.soundtrigger.SoundTriggerManager;
@@ -36,7 +35,7 @@
* Utility class for the managing sound trigger sound models.
*/
public class SoundTriggerUtil {
- private static final String TAG = "TestSoundTriggerUtil:Hotsound";
+ private static final String TAG = "SoundTriggerTestUtil";
private final ISoundTriggerService mSoundTriggerService;
private final SoundTriggerManager mSoundTriggerManager;
@@ -68,10 +67,6 @@
return true;
}
- public void addOrUpdateSoundModel(SoundTriggerManager.Model soundModel) {
- mSoundTriggerManager.updateModel(soundModel);
- }
-
/**
* Gets the sound model for the given keyphrase, null if none exists.
* If a sound model for a given keyphrase exists, and it needs to be updated,
@@ -91,7 +86,7 @@
}
if (model == null) {
- Log.w(TAG, "No models present for the gien keyphrase ID");
+ Log.w(TAG, "No models present for the given keyphrase ID");
return null;
} else {
return model;
@@ -108,18 +103,14 @@
try {
mSoundTriggerService.deleteSoundModel(new ParcelUuid(modelId));
} catch (RemoteException e) {
- Log.e(TAG, "RemoteException in updateSoundModel");
+ Log.e(TAG, "RemoteException in deleteSoundModel");
+ return false;
}
return true;
}
- public void deleteSoundModelUsingManager(UUID modelId) {
- mSoundTriggerManager.deleteModel(modelId);
- }
-
public SoundTriggerDetector createSoundTriggerDetector(UUID modelId,
SoundTriggerDetector.Callback callback) {
return mSoundTriggerManager.createSoundTriggerDetector(modelId, callback, null);
}
-
}
diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java
deleted file mode 100644
index 5fd38e9..0000000
--- a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.soundtrigger;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.UUID;
-
-import android.app.Activity;
-import android.hardware.soundtrigger.SoundTrigger.GenericSoundModel;
-import android.hardware.soundtrigger.SoundTrigger;
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.media.soundtrigger.SoundTriggerDetector;
-import android.media.soundtrigger.SoundTriggerManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.PowerManager;
-import android.os.UserManager;
-import android.text.Editable;
-import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.RadioButton;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class TestSoundTriggerActivity extends Activity {
- private static final String TAG = "TestSoundTriggerActivity";
- private static final boolean DBG = false;
-
- private SoundTriggerUtil mSoundTriggerUtil;
- private Random mRandom;
-
- private Map<Integer, ModelInfo> mModelInfoMap;
- private Map<View, Integer> mModelIdMap;
-
- private TextView mDebugView = null;
- private int mSelectedModelId = -1;
- private ScrollView mScrollView = null;
- private Button mPlayTriggerButton = null;
- private PowerManager.WakeLock mScreenWakelock;
- private Handler mHandler;
- private RadioGroup mRadioGroup;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- if (DBG) Log.d(TAG, "onCreate");
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
- mDebugView = (TextView) findViewById(R.id.console);
- mScrollView = (ScrollView) findViewById(R.id.scroller_id);
- mRadioGroup = (RadioGroup) findViewById(R.id.model_group_id);
- mPlayTriggerButton = (Button) findViewById(R.id.play_trigger_id);
- mDebugView.setText(mDebugView.getText(), TextView.BufferType.EDITABLE);
- mDebugView.setMovementMethod(new ScrollingMovementMethod());
- mSoundTriggerUtil = new SoundTriggerUtil(this);
- mRandom = new Random();
- mHandler = new Handler();
-
- mModelInfoMap = new HashMap();
- mModelIdMap = new HashMap();
-
- setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
- // Load all the models in the data dir.
- for (File file : getFilesDir().listFiles()) {
- // Find meta-data in .properties files, ignore everything else.
- if (!file.getName().endsWith(".properties")) {
- continue;
- }
- try {
- Properties properties = new Properties();
- properties.load(new FileInputStream(file));
- createModelInfoAndWidget(properties);
- } catch (Exception e) {
- Log.e(TAG, "Failed to load properties file " + file.getName());
- }
- }
-
- // Create a few dummy models if we didn't load anything.
- if (mModelIdMap.isEmpty()) {
- Properties dummyModelProperties = new Properties();
- for (String name : new String[]{"One", "Two", "Three"}) {
- dummyModelProperties.setProperty("name", "Model " + name);
- createModelInfoAndWidget(dummyModelProperties);
- }
- }
- }
-
- private void createModelInfoAndWidget(Properties properties) {
- try {
- ModelInfo modelInfo = new ModelInfo();
-
- if (!properties.containsKey("name")) {
- throw new RuntimeException("must have a 'name' property");
- }
- modelInfo.name = properties.getProperty("name");
-
- if (properties.containsKey("modelUuid")) {
- modelInfo.modelUuid = UUID.fromString(properties.getProperty("modelUuid"));
- } else {
- modelInfo.modelUuid = UUID.randomUUID();
- }
-
- if (properties.containsKey("vendorUuid")) {
- modelInfo.vendorUuid = UUID.fromString(properties.getProperty("vendorUuid"));
- } else {
- modelInfo.vendorUuid = UUID.randomUUID();
- }
-
- if (properties.containsKey("triggerAudio")) {
- modelInfo.triggerAudioPlayer = MediaPlayer.create(this, Uri.parse(
- getFilesDir().getPath() + "/" + properties.getProperty("triggerAudio")));
- }
-
- if (properties.containsKey("dataFile")) {
- File modelDataFile = new File(
- getFilesDir().getPath() + "/" + properties.getProperty("dataFile"));
- modelInfo.modelData = new byte[(int) modelDataFile.length()];
- FileInputStream input = new FileInputStream(modelDataFile);
- input.read(modelInfo.modelData, 0, modelInfo.modelData.length);
- } else {
- modelInfo.modelData = new byte[1024];
- mRandom.nextBytes(modelInfo.modelData);
- }
-
- // TODO: Add property support for keyphrase models when they're exposed by the
- // service. Also things like how much audio they should record with the capture session
- // provided in the callback.
-
- // Add a widget into the radio group.
- RadioButton button = new RadioButton(this);
- mRadioGroup.addView(button);
- button.setText(modelInfo.name);
- button.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- onRadioButtonClicked(v);
- }
- });
-
- // Update our maps containing the button -> id and id -> modelInfo.
- int newModelId = mModelIdMap.size() + 1;
- mModelIdMap.put(button, newModelId);
- mModelInfoMap.put(newModelId, modelInfo);
-
- // If we don't have something selected, select this first thing.
- if (mSelectedModelId < 0) {
- button.setChecked(true);
- onRadioButtonClicked(button);
- }
- } catch (IOException e) {
- Log.e(TAG, "Error parsing properties for " + properties.getProperty("name"), e);
- }
- }
-
- private void postMessage(String msg) {
- Log.i(TAG, "Posted: " + msg);
- ((Editable) mDebugView.getText()).append(msg + "\n");
- if ((mDebugView.getMeasuredHeight() - mScrollView.getScrollY()) <=
- (mScrollView.getHeight() + mDebugView.getLineHeight())) {
- scrollToBottom();
- }
- }
-
- private void scrollToBottom() {
- mScrollView.post(new Runnable() {
- public void run() {
- mScrollView.smoothScrollTo(0, mDebugView.getBottom());
- }
- });
- }
-
- private synchronized UUID getSelectedUuid() {
- return mModelInfoMap.get(mSelectedModelId).modelUuid;
- }
-
- private synchronized void setDetector(SoundTriggerDetector detector) {
- mModelInfoMap.get(mSelectedModelId).detector = detector;
- }
-
- private synchronized SoundTriggerDetector getDetector() {
- return mModelInfoMap.get(mSelectedModelId).detector;
- }
-
- private void screenWakeup() {
- PowerManager pm = ((PowerManager)getSystemService(POWER_SERVICE));
- if (mScreenWakelock == null) {
- mScreenWakelock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "TAG");
- }
- mScreenWakelock.acquire();
- }
-
- private void screenRelease() {
- PowerManager pm = ((PowerManager)getSystemService(POWER_SERVICE));
- mScreenWakelock.release();
- }
-
- /** TODO: Should return the abstract sound model that can be then sent to the service. */
- private GenericSoundModel createNewSoundModel() {
- ModelInfo modelInfo = mModelInfoMap.get(mSelectedModelId);
- return new GenericSoundModel(modelInfo.modelUuid, modelInfo.vendorUuid,
- modelInfo.modelData);
- }
-
- /**
- * Called when the user clicks the enroll button.
- * Performs a fresh enrollment.
- */
- public void onEnrollButtonClicked(View v) {
- postMessage("Loading model: " + mSelectedModelId);
-
- GenericSoundModel model = createNewSoundModel();
-
- boolean status = mSoundTriggerUtil.addOrUpdateSoundModel(model);
- if (status) {
- Toast.makeText(
- this, "Successfully created sound trigger model UUID=" + model.uuid,
- Toast.LENGTH_SHORT).show();
- } else {
- Toast.makeText(this, "Failed to enroll!!!" + model.uuid, Toast.LENGTH_SHORT).show();
- }
-
- // Test the SoundManager API.
- }
-
- /**
- * Called when the user clicks the un-enroll button.
- * Clears the enrollment information for the user.
- */
- public void onUnEnrollButtonClicked(View v) {
- postMessage("Unloading model: " + mSelectedModelId);
- UUID modelUuid = getSelectedUuid();
- GenericSoundModel soundModel = mSoundTriggerUtil.getSoundModel(modelUuid);
- if (soundModel == null) {
- Toast.makeText(this, "Sound model not found!!!", Toast.LENGTH_SHORT).show();
- return;
- }
- boolean status = mSoundTriggerUtil.deleteSoundModel(modelUuid);
- if (status) {
- Toast.makeText(this, "Successfully deleted model UUID=" + soundModel.uuid,
- Toast.LENGTH_SHORT)
- .show();
- } else {
- Toast.makeText(this, "Failed to delete sound model!!!", Toast.LENGTH_SHORT).show();
- }
- }
-
- /**
- * Called when the user clicks the re-enroll button.
- * Uses the previously enrolled sound model and makes changes to it before pushing it back.
- */
- public void onReEnrollButtonClicked(View v) {
- postMessage("Re-loading model: " + mSelectedModelId);
- UUID modelUuid = getSelectedUuid();
- GenericSoundModel soundModel = mSoundTriggerUtil.getSoundModel(modelUuid);
- if (soundModel == null) {
- Toast.makeText(this, "Sound model not found!!!", Toast.LENGTH_SHORT).show();
- return;
- }
- GenericSoundModel updated = createNewSoundModel();
- boolean status = mSoundTriggerUtil.addOrUpdateSoundModel(updated);
- if (status) {
- Toast.makeText(this, "Successfully re-enrolled, model UUID=" + updated.uuid,
- Toast.LENGTH_SHORT)
- .show();
- } else {
- Toast.makeText(this, "Failed to re-enroll!!!", Toast.LENGTH_SHORT).show();
- }
- }
-
- public void onStartRecognitionButtonClicked(View v) {
- UUID modelUuid = getSelectedUuid();
- SoundTriggerDetector detector = getDetector();
- if (detector == null) {
- Log.i(TAG, "Created an instance of the SoundTriggerDetector for model #" +
- mSelectedModelId);
- postMessage("Created an instance of the SoundTriggerDetector for model #" +
- mSelectedModelId);
- detector = mSoundTriggerUtil.createSoundTriggerDetector(modelUuid,
- new DetectorCallback());
- setDetector(detector);
- }
- postMessage("Triggering start recognition for model: " + mSelectedModelId);
- if (!detector.startRecognition(
- SoundTriggerDetector.RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS)) {
- Log.e(TAG, "Fast failure attempting to start recognition.");
- postMessage("Fast failure attempting to start recognition:" + mSelectedModelId);
- }
- }
-
- public void onStopRecognitionButtonClicked(View v) {
- SoundTriggerDetector detector = getDetector();
- if (detector == null) {
- Log.e(TAG, "Stop called on null detector.");
- postMessage("Error: Stop called on null detector.");
- return;
- }
- postMessage("Triggering stop recognition for model: " + mSelectedModelId);
- if (!detector.stopRecognition()) {
- Log.e(TAG, "Fast failure attempting to stop recognition.");
- postMessage("Fast failure attempting to stop recognition: " + mSelectedModelId);
- }
- }
-
- public synchronized void onRadioButtonClicked(View view) {
- // Is the button now checked?
- boolean checked = ((RadioButton) view).isChecked();
- if (checked) {
- mSelectedModelId = mModelIdMap.get(view);
- ModelInfo modelInfo = mModelInfoMap.get(mSelectedModelId);
- postMessage("Selected " + modelInfo.name);
-
- // Set the play trigger button to be enabled only if we actually have some audio.
- mPlayTriggerButton.setEnabled(modelInfo.triggerAudioPlayer != null);
- }
- }
-
- public synchronized void onPlayTriggerButtonClicked(View v) {
- ModelInfo modelInfo = mModelInfoMap.get(mSelectedModelId);
- modelInfo.triggerAudioPlayer.start();
- postMessage("Playing trigger audio for " + modelInfo.name);
- }
-
- // Helper struct for holding information about a model.
- private static class ModelInfo {
- public String name;
- public UUID modelUuid;
- public UUID vendorUuid;
- public MediaPlayer triggerAudioPlayer;
- public SoundTriggerDetector detector;
- public byte modelData[];
- };
-
- // Implementation of SoundTriggerDetector.Callback.
- public class DetectorCallback extends SoundTriggerDetector.Callback {
- public void onAvailabilityChanged(int status) {
- postMessage("Availability changed to: " + status);
- }
-
- public void onDetected(SoundTriggerDetector.EventPayload event) {
- postMessage("onDetected(): " + eventPayloadToString(event));
- screenWakeup();
- mHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- screenRelease();
- }
- }, 1000L);
- }
-
- public void onError() {
- postMessage("onError()");
- }
-
- public void onRecognitionPaused() {
- postMessage("onRecognitionPaused()");
- }
-
- public void onRecognitionResumed() {
- postMessage("onRecognitionResumed()");
- }
- }
-
- private String eventPayloadToString(SoundTriggerDetector.EventPayload event) {
- String result = "EventPayload(";
- AudioFormat format = event.getCaptureAudioFormat();
- result = result + "AudioFormat: " + ((format == null) ? "null" : format.toString());
- byte[] triggerAudio = event.getTriggerAudio();
- result = result + "TriggerAudio: " + (triggerAudio == null ? "null" : triggerAudio.length);
- result = result + "CaptureSession: " + event.getCaptureSession();
- result += " )";
- return result;
- }
-}
diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk
index 0e678cd..f65d109 100644
--- a/tests/UiBench/Android.mk
+++ b/tests/UiBench/Android.mk
@@ -10,17 +10,20 @@
# regressions are reflected in test data
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res \
+ frameworks/support/design/res \
frameworks/support/v7/appcompat/res \
frameworks/support/v7/cardview/res \
frameworks/support/v7/recyclerview/res
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
+ --extra-packages android.support.design \
--extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.cardview \
--extra-packages android.support.v7.recyclerview
LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-design \
android-support-v4 \
android-support-v7-appcompat \
android-support-v7-cardview \
diff --git a/tests/UiBench/AndroidManifest.xml b/tests/UiBench/AndroidManifest.xml
index 95bbb21..12143b7 100644
--- a/tests/UiBench/AndroidManifest.xml
+++ b/tests/UiBench/AndroidManifest.xml
@@ -68,6 +68,14 @@
</intent-filter>
</activity>
<activity
+ android:name=".InvalidateTreeActivity"
+ android:label="General/Invalidate Tree" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
+ <activity
android:name=".TrivialAnimationActivity"
android:label="General/Trivial Animation" >
<intent-filter>
@@ -172,5 +180,25 @@
</intent-filter>
</activity>
+ <!-- Navigation Drawer -->
+ <activity
+ android:name=".NavigationDrawerActivity"
+ android:label="Navigation Drawer Activity"
+ android:theme="@style/NoActionBar">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
+
+ <!-- Notification Shade -->
+ <activity
+ android:name=".NotificationShadeActivity"
+ android:label="Notification Shade">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
</application>
</manifest>
diff --git a/tests/UiBench/build.gradle b/tests/UiBench/build.gradle
index 0756a8a..03ef7f1 100644
--- a/tests/UiBench/build.gradle
+++ b/tests/UiBench/build.gradle
@@ -3,8 +3,7 @@
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
-
+ classpath 'com.android.tools.build:gradle:2.1.2'
}
}
@@ -12,10 +11,10 @@
android {
compileSdkVersion 23
- buildToolsVersion "22.0.0"
+ buildToolsVersion "23.0.3"
defaultConfig {
- minSdkVersion 14
+ minSdkVersion 21
targetSdkVersion 23
versionCode 1
versionName "1.0"
@@ -36,4 +35,5 @@
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:cardview-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
+ compile 'com.android.support:design:23.0.1'
}
diff --git a/tests/UiBench/gradle/wrapper/gradle-wrapper.properties b/tests/UiBench/gradle/wrapper/gradle-wrapper.properties
index 12582f8..03ac778 100644
--- a/tests/UiBench/gradle/wrapper/gradle-wrapper.properties
+++ b/tests/UiBench/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 26 10:51:13 PDT 2015
+#Thu Jun 30 15:56:17 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/tests/UiBench/res/drawable/ic_menu_camera.xml b/tests/UiBench/res/drawable/ic_menu_camera.xml
new file mode 100644
index 0000000..189ef97
--- /dev/null
+++ b/tests/UiBench/res/drawable/ic_menu_camera.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/tests/UiBench/res/drawable/ic_menu_gallery.xml b/tests/UiBench/res/drawable/ic_menu_gallery.xml
new file mode 100644
index 0000000..d41f250
--- /dev/null
+++ b/tests/UiBench/res/drawable/ic_menu_gallery.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z"/>
+</vector>
diff --git a/tests/UiBench/res/drawable/ic_menu_manage.xml b/tests/UiBench/res/drawable/ic_menu_manage.xml
new file mode 100644
index 0000000..f81e0f9
--- /dev/null
+++ b/tests/UiBench/res/drawable/ic_menu_manage.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
+</vector>
\ No newline at end of file
diff --git a/tests/UiBench/res/drawable/ic_menu_send.xml b/tests/UiBench/res/drawable/ic_menu_send.xml
new file mode 100644
index 0000000..0d86c76
--- /dev/null
+++ b/tests/UiBench/res/drawable/ic_menu_send.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
diff --git a/tests/UiBench/res/drawable/ic_menu_share.xml b/tests/UiBench/res/drawable/ic_menu_share.xml
new file mode 100644
index 0000000..b3e6ff1
--- /dev/null
+++ b/tests/UiBench/res/drawable/ic_menu_share.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/tests/UiBench/res/drawable/ic_menu_slideshow.xml b/tests/UiBench/res/drawable/ic_menu_slideshow.xml
new file mode 100644
index 0000000..d79950b
--- /dev/null
+++ b/tests/UiBench/res/drawable/ic_menu_slideshow.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z"/>
+</vector>
diff --git a/tests/UiBench/res/drawable/side_nav_bar.xml b/tests/UiBench/res/drawable/side_nav_bar.xml
new file mode 100644
index 0000000..59f4cf3
--- /dev/null
+++ b/tests/UiBench/res/drawable/side_nav_bar.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <gradient
+ android:angle="135"
+ android:centerColor="#4CAF50"
+ android:endColor="#2E7D32"
+ android:startColor="#81C784"
+ android:type="linear"/>
+</shape>
\ No newline at end of file
diff --git a/tests/UiBench/res/layout/activity_navigation_drawer.xml b/tests/UiBench/res/layout/activity_navigation_drawer.xml
new file mode 100644
index 0000000..8d4bfaf
--- /dev/null
+++ b/tests/UiBench/res/layout/activity_navigation_drawer.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<android.support.v4.widget.DrawerLayout
+ android:id="@+id/drawer_layout"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
+ <include
+ layout="@layout/app_bar_navigation_drawer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <android.support.design.widget.NavigationView
+ android:id="@+id/nav_view"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:fitsSystemWindows="true"
+ app:headerLayout="@layout/nav_header_navigation_drawer"
+ app:menu="@menu/activity_navigation_drawer_drawer"/>
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/tests/UiBench/res/layout/app_bar_navigation_drawer.xml b/tests/UiBench/res/layout/app_bar_navigation_drawer.xml
new file mode 100644
index 0000000..ede2a56
--- /dev/null
+++ b/tests/UiBench/res/layout/app_bar_navigation_drawer.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<android.support.design.widget.CoordinatorLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
+ <android.support.design.widget.AppBarLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"/>
+ </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/tests/UiBench/res/layout/nav_header_navigation_drawer.xml b/tests/UiBench/res/layout/nav_header_navigation_drawer.xml
new file mode 100644
index 0000000..789f291
--- /dev/null
+++ b/tests/UiBench/res/layout/nav_header_navigation_drawer.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="160dp"
+ android:background="@drawable/side_nav_bar"
+ android:gravity="bottom"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/default_spacing"
+ android:paddingLeft="@dimen/default_spacing"
+ android:paddingRight="@dimen/default_spacing"
+ android:paddingTop="@dimen/default_spacing"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/default_spacing"
+ android:src="@android:drawable/sym_def_app_icon"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/default_spacing"
+ android:text="UiBench"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="hwui-team@google.com"/>
+
+</LinearLayout>
diff --git a/tests/UiBench/res/layout/notification.xml b/tests/UiBench/res/layout/notification.xml
new file mode 100644
index 0000000..57c5b44
--- /dev/null
+++ b/tests/UiBench/res/layout/notification.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:background="@android:color/white"
+ android:paddingBottom="4dp">
+ <View android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="#aaa"/>
+ <TextView
+ android:id="@+id/info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawablePadding="2dp"
+ android:gravity="center_vertical"
+ android:textAppearance="@android:style/TextAppearance.Material.Notification.Info"
+ android:paddingLeft="16dp"
+ android:paddingTop="4dp"/>
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@android:style/TextAppearance.Material.Notification.Title"
+ android:paddingLeft="16dp"/>
+ <TextView
+ android:id="@+id/line2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@android:style/TextAppearance.Material.Notification.Line2"
+ android:paddingLeft="16dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/UiBench/res/menu/activity_navigation_drawer_drawer.xml b/tests/UiBench/res/menu/activity_navigation_drawer_drawer.xml
new file mode 100644
index 0000000..9bb785d
--- /dev/null
+++ b/tests/UiBench/res/menu/activity_navigation_drawer_drawer.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <group android:checkableBehavior="single">
+ <item
+ android:icon="@drawable/ic_menu_camera"
+ android:title="Import"/>
+ <item
+ android:icon="@drawable/ic_menu_gallery"
+ android:title="Gallery"/>
+ <item
+ android:icon="@drawable/ic_menu_slideshow"
+ android:title="Slideshow"/>
+ <item
+ android:icon="@drawable/ic_menu_manage"
+ android:title="Tools"/>
+ </group>
+
+ <item android:title="Communicate">
+ <menu>
+ <item
+ android:icon="@drawable/ic_menu_share"
+ android:title="Share"/>
+ <item
+ android:icon="@drawable/ic_menu_send"
+ android:title="Send"/>
+ </menu>
+ </item>
+
+</menu>
diff --git a/tests/UiBench/res/values/dimens.xml b/tests/UiBench/res/values/dimens.xml
new file mode 100644
index 0000000..a788491
--- /dev/null
+++ b/tests/UiBench/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="default_spacing">16dp</dimen>
+ <dimen name="notification_icon_size">16dp</dimen>
+</resources>
diff --git a/tests/UiBench/res/values/strings.xml b/tests/UiBench/res/values/strings.xml
new file mode 100644
index 0000000..e9fdc8a
--- /dev/null
+++ b/tests/UiBench/res/values/strings.xml
@@ -0,0 +1,19 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources>
+ <string name="navigation_drawer_open">Open navigation drawer</string>
+ <string name="navigation_drawer_close">Close navigation drawer</string>
+</resources>
diff --git a/tests/UiBench/res/values/styles.xml b/tests/UiBench/res/values/styles.xml
new file mode 100644
index 0000000..26552a2
--- /dev/null
+++ b/tests/UiBench/res/values/styles.xml
@@ -0,0 +1,23 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources>
+ <style name="NoActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
+ </style>
+</resources>
diff --git a/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java b/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java
index 93d67a6..81d03ff 100644
--- a/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java
+++ b/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java
@@ -31,7 +31,7 @@
* Tests invalidation performance by invalidating a large number of easily rendered views,
*/
public class InvalidateActivity extends AppCompatActivity {
- public static class ColorView extends View {
+ private static class ColorView extends View {
@ColorInt
public int mColor;
@@ -50,7 +50,7 @@
}
}
- ColorView[][] mColorViews;
+ private ColorView[][] mColorViews;
@SuppressWarnings("unused")
public void setColorValue(int colorValue) {
diff --git a/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java b/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java
new file mode 100644
index 0000000..b800c26
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.test.uibench;
+
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import java.util.ArrayList;
+
+/**
+ * Tests invalidation/record performance by invalidating a large number of easily rendered
+ * nested views.
+ */
+public class InvalidateTreeActivity extends AppCompatActivity {
+ private final ArrayList<LinearLayout> mLayouts = new ArrayList<>();
+
+ private int mColorToggle = 0;
+
+ private void createQuadTree(LinearLayout parent, int remainingDepth) {
+ mLayouts.add(parent);
+ if (remainingDepth <= 0) {
+ mColorToggle = (mColorToggle + 1) % 4;
+ parent.setBackgroundColor((mColorToggle < 2) ? Color.RED : Color.BLUE);
+ return;
+ }
+
+ boolean vertical = remainingDepth % 2 == 0;
+ parent.setOrientation(vertical ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
+
+ for (int i = 0; i < 2; i++) {
+ LinearLayout child = new LinearLayout(this);
+ // vertical: match parent in x axis, horizontal: y axis.
+ parent.addView(child, new LinearLayout.LayoutParams(
+ (vertical ? ViewGroup.LayoutParams.MATCH_PARENT : 0),
+ (vertical ? 0 : ViewGroup.LayoutParams.MATCH_PARENT),
+ 1.0f));
+
+ createQuadTree(child, remainingDepth - 1);
+ }
+ }
+
+ @SuppressWarnings("unused")
+ public void setIgnoredValue(int ignoredValue) {
+ for (int i = 0; i < mLayouts.size(); i++) {
+ mLayouts.get(i).invalidate();
+ }
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ LinearLayout root = new LinearLayout(this);
+ createQuadTree(root, 8);
+ setContentView(root);
+
+ ObjectAnimator animator = ObjectAnimator.ofInt(this, "ignoredValue", 0, 1000);
+ animator.setRepeatMode(ValueAnimator.REVERSE);
+ animator.setRepeatCount(ValueAnimator.INFINITE);
+ animator.start();
+ }
+}
diff --git a/tests/UiBench/src/com/android/test/uibench/MainActivity.java b/tests/UiBench/src/com/android/test/uibench/MainActivity.java
index 2111274..79837b6 100644
--- a/tests/UiBench/src/com/android/test/uibench/MainActivity.java
+++ b/tests/UiBench/src/com/android/test/uibench/MainActivity.java
@@ -38,6 +38,23 @@
private static final String EXTRA_PATH = "activity_path";
private static final String CATEGORY_HWUI_TEST = "com.android.test.uibench.TEST";
+ public static class TestListFragment extends ListFragment {
+ @Override
+ @SuppressWarnings("unchecked")
+ public void onListItemClick(ListView l, View v, int position, long id) {
+ Map<String, Object> map = (Map<String, Object>)l.getItemAtPosition(position);
+
+ Intent intent = (Intent) map.get("intent");
+ startActivity(intent);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ getListView().setTextFilterEnabled(true);
+ }
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -54,22 +71,7 @@
FragmentManager fm = getSupportFragmentManager();
if (fm.findFragmentById(android.R.id.content) == null) {
- ListFragment listFragment = new ListFragment() {
- @Override
- @SuppressWarnings("unchecked")
- public void onListItemClick(ListView l, View v, int position, long id) {
- Map<String, Object> map = (Map<String, Object>)l.getItemAtPosition(position);
-
- Intent intent = (Intent) map.get("intent");
- startActivity(intent);
- }
-
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- getListView().setTextFilterEnabled(true);
- }
- };
+ ListFragment listFragment = new TestListFragment();
listFragment.setListAdapter(new SimpleAdapter(this, getData(path),
android.R.layout.simple_list_item_1, new String[] { "title" },
new int[] { android.R.id.text1 }));
diff --git a/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java b/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java
new file mode 100644
index 0000000..1d68767
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.test.uibench;
+
+import android.os.Bundle;
+import android.support.design.widget.NavigationView;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+public class NavigationDrawerActivity extends AppCompatActivity
+ implements NavigationView.OnNavigationItemSelectedListener {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_navigation_drawer);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+ DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+ ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+ this, drawer, toolbar, R.string.navigation_drawer_open,
+ R.string.navigation_drawer_close);
+ drawer.setDrawerListener(toggle);
+ toggle.syncState();
+
+ NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+ navigationView.setNavigationItemSelectedListener(this);
+ }
+
+ @Override
+ public boolean onNavigationItemSelected(MenuItem item) {
+ DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+ drawer.closeDrawer(GravityCompat.START);
+ return true;
+ }
+}
diff --git a/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java b/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java
new file mode 100644
index 0000000..70deeea
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.test.uibench;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.GestureDetector;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.widget.LinearLayout;
+import android.widget.Scroller;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+public class NotificationShadeActivity extends AppCompatActivity {
+
+ private static class FakeNotificationStackView extends LinearLayout {
+ private static final int INITIAL_ELEVATION = 40;
+
+ private LayoutInflater mLayoutInflater;
+ private GestureDetector mGestureDetector;
+ private Scroller mScroller;
+ private ArrayList<View> mChildren = new ArrayList<>();
+ private int mChildrenCount = 0;
+ private int mFullHeight = 0;
+ private int mScaledTouchSlop;
+
+ private Runnable mUpdateAction = new Runnable() {
+ @Override
+ public void run() {
+ if (mScroller.computeScrollOffset()) {
+ updateState(mScroller.getCurrY());
+ postOnAnimation(this);
+ }
+ }
+ };
+
+ private GestureDetector.OnGestureListener mGestureListener =
+ new GestureDetector.SimpleOnGestureListener() {
+ @Override
+ public boolean onDown(MotionEvent motionEvent) {
+ return true;
+ }
+
+ @Override
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float vX, float vY) {
+ if (Math.abs(e1.getY() - e2.getY()) <= mScaledTouchSlop) {
+ return false;
+ }
+ mScroller.fling(0, mFullHeight, 0, (int) vY, 0, 0, 0, getHeight());
+ postOnAnimation(mUpdateAction);
+ return true;
+ }
+ };
+
+ private void generateNextView() {
+ View view = mLayoutInflater.inflate(R.layout.notification, this, false);
+ boolean even = mChildren.size() % 2 == 0;
+ Context context = getContext();
+ ((TextView) view.findViewById(R.id.title)).setText(even ?
+ "Very important notification" : "Next video to watch");
+ ((TextView) view.findViewById(R.id.line2)).setText(even ?
+ "Wifi nearby" : "Amazing cats");
+ TextView infoView = (TextView) view.findViewById(R.id.info);
+ Drawable drawable = context.getDrawable(even ? R.drawable.ic_menu_manage
+ : R.drawable.ic_menu_slideshow);
+ int size = context.getResources().getDimensionPixelSize(R.dimen.notification_icon_size);
+ drawable.setBounds(0, 0, size, size);
+ infoView.setCompoundDrawables(drawable, null, null, null);
+ infoView.setText(even ? "Android System" : "Youtube");
+ mChildren.add(view);
+ }
+
+ public FakeNotificationStackView(Context context) {
+ super(context);
+ setOrientation(LinearLayout.VERTICAL);
+ mLayoutInflater = LayoutInflater.from(getContext());
+ mGestureDetector = new GestureDetector(getContext(), mGestureListener);
+ mScaledTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
+ mScroller = new Scroller(getContext());
+ }
+
+ private int lastChildHeight() {
+ return (int) mChildren.get(mChildrenCount - 1).getTag();
+ }
+
+ private void updateState(int expectedHeight) {
+ if (expectedHeight == 0 && mChildrenCount == 0) {
+ return;
+ }
+ for (View v: mChildren) {
+ v.setTranslationY(0);
+ v.setElevation(INITIAL_ELEVATION);
+ }
+ if (mChildrenCount != 0 && expectedHeight < mFullHeight - lastChildHeight()) {
+ while (mChildrenCount > 0){
+ if (expectedHeight > mFullHeight - lastChildHeight()) {
+ break;
+ }
+ mFullHeight -= lastChildHeight();
+ removeView(mChildren.get(mChildrenCount - 1));
+ mChildrenCount--;
+ }
+ } else if (expectedHeight > mFullHeight) {
+ while (expectedHeight > mFullHeight) {
+ if (mChildrenCount == mChildren.size()) {
+ generateNextView();
+ }
+ mChildrenCount++;
+ View child = mChildren.get(mChildrenCount - 1);
+ child.setElevation(INITIAL_ELEVATION);
+ int widthSpec = MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.AT_MOST);
+ int heightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+ child.measure(widthSpec, heightSpec);
+ addView(child);
+ int measuredHeight = child.getMeasuredHeight();
+ child.setTag(measuredHeight);
+ mFullHeight += measuredHeight;
+ }
+ }
+ if (mChildrenCount == 0) {
+ return;
+ }
+ View lastChild = mChildren.get(mChildrenCount - 1);
+ int translationY = expectedHeight - mFullHeight;
+ lastChild.setTranslationY(translationY);
+ float p = - ((float) translationY) / lastChildHeight();
+ lastChild.setElevation((1 - p) * INITIAL_ELEVATION);
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent ev) {
+ return mGestureDetector.onTouchEvent(ev);
+ }
+ }
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(new FakeNotificationStackView(this));
+ }
+}
diff --git a/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java b/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java
index d32f071..88847ee 100644
--- a/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java
+++ b/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java
@@ -23,19 +23,22 @@
import android.widget.ArrayAdapter;
public class ShadowGridActivity extends AppCompatActivity {
+ public static class NoDividerListFragment extends ListFragment {
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ getListView().setDivider(null);
+ }
+ };
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
FragmentManager fm = getSupportFragmentManager();
if (fm.findFragmentById(android.R.id.content) == null) {
- ListFragment listFragment = new ListFragment() {
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- getListView().setDivider(null);
- }
- };
+ ListFragment listFragment = new NoDividerListFragment();
listFragment.setListAdapter(new ArrayAdapter<>(this,
R.layout.card_row, R.id.card_text, TextUtils.buildSimpleStringList()));
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_group_clip.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_group_clip.xml
new file mode 100644
index 0000000..9574d7e
--- /dev/null
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_group_clip.xml
@@ -0,0 +1,50 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="48dp"
+ android:width="48dp"
+ android:viewportHeight="48"
+ android:viewportWidth="48">
+
+ <group>
+ <clip-path
+ android:name="clip1"
+ android:pathData="M 0, 0 l 48, 0 l 0, 30 l -48, 0 z"/>
+
+ <group>
+ <clip-path
+ android:name="clip2"
+ android:pathData="M 0, 18 l 48, 0 l 0, 30 l -48, 0 z"/>
+
+ <path
+ android:name="plus1"
+ android:pathData="M20 16h-4v8h-8v4h8v8h4v-8h8v-4h-8zm9-3.84v3.64l5-1v21.2h4v-26z"
+ android:fillColor="#ff00ff00"/>
+ </group>
+
+
+ <group android:name="backgroundGroup" >
+ <path
+ android:name="background1"
+ android:fillColor="#80000000"
+ android:pathData="M 0,0 l 24,0 l 0,24 l -24, 0 z" />
+ <path
+ android:name="background2"
+ android:fillColor="#80000000"
+ android:pathData="M 24,24 l 24,0 l 0, 24 l -24, 0 z" />
+ </group>
+ </group>
+</vector>
diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
index 5856f49..0d2d2e4 100644
--- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
+++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
@@ -75,6 +75,7 @@
R.drawable.vector_drawable28,
R.drawable.vector_drawable29,
R.drawable.vector_drawable30,
+ R.drawable.vector_drawable_group_clip,
R.drawable.vector_drawable_scale0,
R.drawable.vector_drawable_scale1,
R.drawable.vector_drawable_scale2,
diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
index a726a15..8424344 100644
--- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
+++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
@@ -93,7 +93,7 @@
try {
mWm.addAppToken(0, null, 0, 0, 0, false, false, 0, 0, false, false, null,
- Configuration.EMPTY, 0, false, false, 0);
+ Configuration.EMPTY, 0, false, false, 0, -1, false);
fail("IWindowManager.addAppToken did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {
@@ -103,7 +103,7 @@
}
try {
- mWm.setAppTask(null, 0, INVALID_STACK_ID, null, null, 0, false);
+ mWm.setAppTask(null, 0, INVALID_STACK_ID, null, null, 0, false, false);
fail("IWindowManager.setAppGroupId did not throw SecurityException as"
+ " expected");
} catch (SecurityException e) {
diff --git a/tests/utils/testutils/Android.mk b/tests/utils/testutils/Android.mk
index d53167f..4bfd234 100644
--- a/tests/utils/testutils/Android.mk
+++ b/tests/utils/testutils/Android.mk
@@ -25,6 +25,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- mockito-target
+ mockito-target-minus-junit4
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index b701445..2a490d1 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -57,8 +57,8 @@
aaptHostStaticLibs := \
libandroidfw \
libpng \
- liblog \
libutils \
+ liblog \
libcutils \
libexpat \
libziparchive-host \
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 447ace6..288b2a3 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -750,7 +750,7 @@
}
// Source for AndroidManifest.xml
- const String8 manifestFile = String8::format("%s@AndroidManifest.xml", filename);
+ const String8 manifestFile("AndroidManifest.xml");
// The dynamicRefTable can be null if there are no resources for this asset cookie.
// This fine.
@@ -850,14 +850,16 @@
depth++;
const char16_t* ctag16 = tree.getElementName(&len);
if (ctag16 == NULL) {
- fprintf(stderr, "ERROR: failed to get XML element name (bad string pool)\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: failed to get XML element name (bad string pool)");
goto bail;
}
String8 tag(ctag16);
//printf("Depth %d tag %s\n", depth, tag.string());
if (depth == 1) {
if (tag != "manifest") {
- fprintf(stderr, "ERROR: manifest does not start with <manifest> tag\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: manifest does not start with <manifest> tag");
goto bail;
}
String8 pkg = AaptXml::getAttribute(tree, NULL, "package", NULL);
@@ -867,12 +869,14 @@
String8 error;
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR: %s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name': %s", error.string());
goto bail;
}
if (name == "") {
- fprintf(stderr, "ERROR: missing 'android:name' for permission\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: missing 'android:name' for permission");
goto bail;
}
printf("permission: %s\n",
@@ -881,12 +885,14 @@
String8 error;
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR: %s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
goto bail;
}
if (name == "") {
- fprintf(stderr, "ERROR: missing 'android:name' for uses-permission\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: missing 'android:name' for uses-permission");
goto bail;
}
printUsesPermission(name,
@@ -896,13 +902,14 @@
String8 error;
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR: %s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
goto bail;
}
if (name == "") {
- fprintf(stderr, "ERROR: missing 'android:name' for "
- "uses-permission-sdk-23\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: missing 'android:name' for uses-permission-sdk-23");
goto bail;
}
printUsesPermissionSdk23(
@@ -1163,14 +1170,16 @@
const char16_t* ctag16 = tree.getElementName(&len);
if (ctag16 == NULL) {
- fprintf(stderr, "ERROR: failed to get XML element name (bad string pool)\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: failed to get XML element name (bad string pool)");
goto bail;
}
String8 tag(ctag16);
//printf("Depth %d, %s\n", depth, tag.string());
if (depth == 1) {
if (tag != "manifest") {
- fprintf(stderr, "ERROR: manifest does not start with <manifest> tag\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: manifest does not start with <manifest> tag");
goto bail;
}
pkg = AaptXml::getAttribute(tree, NULL, "package", NULL);
@@ -1179,7 +1188,8 @@
int32_t versionCode = AaptXml::getIntegerAttribute(tree, VERSION_CODE_ATTR,
&error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:versionCode' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:versionCode' attribute: %s",
error.string());
goto bail;
}
@@ -1191,7 +1201,8 @@
String8 versionName = AaptXml::getResolvedAttribute(res, tree,
VERSION_NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:versionName' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:versionName' attribute: %s",
error.string());
goto bail;
}
@@ -1212,7 +1223,8 @@
int32_t installLocation = AaptXml::getResolvedIntegerAttribute(res, tree,
INSTALL_LOCATION_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:installLocation' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:installLocation' attribute: %s",
error.string());
goto bail;
}
@@ -1278,14 +1290,15 @@
String8 icon = AaptXml::getResolvedAttribute(res, tree, ICON_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:icon' attribute: %s", error.string());
goto bail;
}
int32_t testOnly = AaptXml::getIntegerAttribute(tree, TEST_ONLY_ATTR, 0,
&error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:testOnly' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:testOnly' attribute: %s",
error.string());
goto bail;
}
@@ -1293,8 +1306,8 @@
String8 banner = AaptXml::getResolvedAttribute(res, tree, BANNER_ATTR,
&error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:banner' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:banner' attribute: %s", error.string());
goto bail;
}
printf("application: label='%s' ",
@@ -1312,8 +1325,8 @@
int32_t isGame = AaptXml::getResolvedIntegerAttribute(res, tree,
ISGAME_ATTR, 0, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:isGame' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:isGame' attribute: %s", error.string());
goto bail;
}
if (isGame != 0) {
@@ -1323,7 +1336,8 @@
int32_t debuggable = AaptXml::getResolvedIntegerAttribute(res, tree,
DEBUGGABLE_ATTR, 0, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:debuggable' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:debuggable' attribute: %s",
error.string());
goto bail;
}
@@ -1352,8 +1366,8 @@
String8 name = AaptXml::getResolvedAttribute(res, tree,
MIN_SDK_VERSION_ATTR, &error);
if (error != "") {
- fprintf(stderr,
- "ERROR getting 'android:minSdkVersion' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:minSdkVersion' attribute: %s",
error.string());
goto bail;
}
@@ -1374,8 +1388,8 @@
String8 name = AaptXml::getResolvedAttribute(res, tree,
TARGET_SDK_VERSION_ATTR, &error);
if (error != "") {
- fprintf(stderr,
- "ERROR getting 'android:targetSdkVersion' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:targetSdkVersion' attribute: %s",
error.string());
goto bail;
}
@@ -1440,8 +1454,8 @@
FeatureGroup group;
group.label = AaptXml::getResolvedAttribute(res, tree, LABEL_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:label' attribute:"
- " %s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:label' attribute: %s", error.string());
goto bail;
}
featureGroups.add(group);
@@ -1486,13 +1500,14 @@
} else if (tag == "uses-permission") {
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
goto bail;
}
if (name == "") {
- fprintf(stderr, "ERROR: missing 'android:name' for uses-permission\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: missing 'android:name' for uses-permission");
goto bail;
}
@@ -1521,14 +1536,14 @@
} else if (tag == "uses-permission-sdk-23" || tag == "uses-permission-sdk-m") {
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
goto bail;
}
if (name == "") {
- fprintf(stderr, "ERROR: missing 'android:name' for "
- "uses-permission-sdk-23\n");
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR: missing 'android:name' for uses-permission-sdk-23");
goto bail;
}
@@ -1543,9 +1558,9 @@
printf("uses-package:'%s'\n",
ResTable::normalizeForOutput(name.string()).string());
} else {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
- error.string());
- goto bail;
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
+ goto bail;
}
} else if (tag == "original-package") {
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
@@ -1553,9 +1568,9 @@
printf("original-package:'%s'\n",
ResTable::normalizeForOutput(name.string()).string());
} else {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
- error.string());
- goto bail;
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
+ goto bail;
}
} else if (tag == "supports-gl-texture") {
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
@@ -1563,15 +1578,15 @@
printf("supports-gl-texture:'%s'\n",
ResTable::normalizeForOutput(name.string()).string());
} else {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
- error.string());
- goto bail;
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
+ goto bail;
}
} else if (tag == "compatible-screens") {
printCompatibleScreens(tree, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting compatible screens: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting compatible screens: %s", error.string());
goto bail;
}
depth--;
@@ -1608,7 +1623,8 @@
withinActivity = true;
activityName = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s",
error.string());
goto bail;
}
@@ -1616,7 +1632,8 @@
activityLabel = AaptXml::getResolvedAttribute(res, tree, LABEL_ATTR,
&error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:label' attribute: %s",
error.string());
goto bail;
}
@@ -1624,7 +1641,8 @@
activityIcon = AaptXml::getResolvedAttribute(res, tree, ICON_ATTR,
&error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:icon' attribute: %s",
error.string());
goto bail;
}
@@ -1632,7 +1650,8 @@
activityBanner = AaptXml::getResolvedAttribute(res, tree, BANNER_ATTR,
&error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:banner' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:banner' attribute: %s",
error.string());
goto bail;
}
@@ -1659,9 +1678,9 @@
} else if (tag == "uses-library") {
String8 libraryName = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr,
+ SourcePos(manifestFile, tree.getLineNumber()).error(
"ERROR getting 'android:name' attribute for uses-library"
- " %s\n", error.string());
+ " %s", error.string());
goto bail;
}
int req = AaptXml::getIntegerAttribute(tree,
@@ -1674,9 +1693,9 @@
receiverName = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr,
+ SourcePos(manifestFile, tree.getLineNumber()).error(
"ERROR getting 'android:name' attribute for receiver:"
- " %s\n", error.string());
+ " %s", error.string());
goto bail;
}
@@ -1687,9 +1706,9 @@
hasBindDeviceAdminPermission = true;
}
} else {
- fprintf(stderr,
+ SourcePos(manifestFile, tree.getLineNumber()).error(
"ERROR getting 'android:permission' attribute for"
- " receiver '%s': %s\n",
+ " receiver '%s': %s",
receiverName.string(), error.string());
}
} else if (tag == "service") {
@@ -1697,8 +1716,9 @@
serviceName = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute for "
- "service:%s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute for "
+ "service:%s", error.string());
goto bail;
}
@@ -1723,8 +1743,9 @@
hasBindDreamServicePermission = true;
}
} else {
- fprintf(stderr, "ERROR getting 'android:permission' attribute for "
- "service '%s': %s\n", serviceName.string(), error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:permission' attribute for "
+ "service '%s': %s", serviceName.string(), error.string());
}
} else if (tag == "provider") {
withinProvider = true;
@@ -1732,26 +1753,27 @@
bool exported = AaptXml::getResolvedIntegerAttribute(res, tree,
EXPORTED_ATTR, &error);
if (error != "") {
- fprintf(stderr,
+ SourcePos(manifestFile, tree.getLineNumber()).error(
"ERROR getting 'android:exported' attribute for provider:"
- " %s\n", error.string());
+ " %s", error.string());
goto bail;
}
bool grantUriPermissions = AaptXml::getResolvedIntegerAttribute(
res, tree, GRANT_URI_PERMISSIONS_ATTR, &error);
if (error != "") {
- fprintf(stderr,
+ SourcePos(manifestFile, tree.getLineNumber()).error(
"ERROR getting 'android:grantUriPermissions' attribute for "
- "provider: %s\n", error.string());
+ "provider: %s", error.string());
goto bail;
}
String8 permission = AaptXml::getResolvedAttribute(res, tree,
PERMISSION_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:permission' attribute for "
- "provider: %s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:permission' attribute for "
+ "provider: %s", error.string());
goto bail;
}
@@ -1762,8 +1784,9 @@
String8 metaDataName = AaptXml::getResolvedAttribute(res, tree,
NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute for "
- "meta-data:%s\n", error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute for "
+ "meta-data: %s", error.string());
goto bail;
}
printf("meta-data: name='%s' ",
@@ -1776,9 +1799,10 @@
printResolvedResourceAttribute(res, tree, RESOURCE_ATTR,
String8("resource"), &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:value' or "
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:value' or "
"'android:resource' attribute for "
- "meta-data:%s\n", error.string());
+ "meta-data: %s", error.string());
goto bail;
}
}
@@ -1788,7 +1812,8 @@
if (name != "" && error == "") {
supportedInput.add(name);
} else {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s",
error.string());
goto bail;
}
@@ -1847,8 +1872,9 @@
} else if (withinService && tag == "meta-data") {
String8 name = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute for "
- "meta-data tag in service '%s': %s\n", serviceName.string(),
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute for "
+ "meta-data tag in service '%s': %s", serviceName.string(),
error.string());
goto bail;
}
@@ -1863,8 +1889,9 @@
String8 xmlPath = AaptXml::getResolvedAttribute(res, tree,
RESOURCE_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:resource' attribute for "
- "meta-data tag in service '%s': %s\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:resource' attribute for "
+ "meta-data tag in service '%s': %s",
serviceName.string(), error.string());
goto bail;
}
@@ -1872,7 +1899,8 @@
Vector<String8> categories = getNfcAidCategories(assets, xmlPath,
offHost, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting AID category for service '%s'\n",
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting AID category for service '%s'",
serviceName.string());
goto bail;
}
@@ -1893,8 +1921,8 @@
if (tag == "action") {
action = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'android:name' attribute: %s", error.string());
goto bail;
}
@@ -1949,8 +1977,8 @@
if (tag == "category") {
String8 category = AaptXml::getAttribute(tree, NAME_ATTR, &error);
if (error != "") {
- fprintf(stderr, "ERROR getting 'name' attribute: %s\n",
- error.string());
+ SourcePos(manifestFile, tree.getLineNumber()).error(
+ "ERROR getting 'name' attribute: %s", error.string());
goto bail;
}
if (withinActivity) {
@@ -2261,6 +2289,10 @@
result = NO_ERROR;
bail:
+ if (SourcePos::hasErrors()) {
+ SourcePos::printErrors(stderr);
+ }
+
if (asset) {
delete asset;
}
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 9939c18..aea16c7 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -808,13 +808,13 @@
assert(outPatch->paddingTop == inPatch->paddingTop);
assert(outPatch->paddingBottom == inPatch->paddingBottom);
for (int i = 0; i < outPatch->numXDivs; i++) {
- assert(outPatch->xDivs[i] == inPatch->xDivs[i]);
+ assert(outPatch->getXDivs()[i] == inPatch->getXDivs()[i]);
}
for (int i = 0; i < outPatch->numYDivs; i++) {
- assert(outPatch->yDivs[i] == inPatch->yDivs[i]);
+ assert(outPatch->getYDivs()[i] == inPatch->getYDivs()[i]);
}
for (int i = 0; i < outPatch->numColors; i++) {
- assert(outPatch->colors[i] == inPatch->colors[i]);
+ assert(outPatch->getColors()[i] == inPatch->getColors()[i]);
}
free(newData);
}
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index e640733..b278831 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -326,13 +326,18 @@
}
String8 resPath = it.getPath();
resPath.convertToResPath();
- table->addEntry(SourcePos(it.getPath(), 0), String16(assets->getPackage()),
+ status_t result = table->addEntry(SourcePos(it.getPath(), 0),
+ String16(assets->getPackage()),
type16,
baseName,
String16(resPath),
NULL,
&it.getParams());
- assets->addResource(it.getLeafName(), resPath, it.getFile(), type8);
+ if (result != NO_ERROR) {
+ hasErrors = true;
+ } else {
+ assets->addResource(it.getLeafName(), resPath, it.getFile(), type8);
+ }
}
return hasErrors ? STATUST(UNKNOWN_ERROR) : NO_ERROR;
@@ -1370,6 +1375,10 @@
}
}
+ if (hasErrors) {
+ return UNKNOWN_ERROR;
+ }
+
// --------------------------------------------------------------------
// Assignment of resource IDs and initial generation of resource table.
// --------------------------------------------------------------------
@@ -2920,6 +2929,19 @@
if (!keepTag && inApplication && depth == 3) {
if (tag == "activity" || tag == "service" || tag == "receiver" || tag == "provider") {
keepTag = true;
+
+ if (mainDex) {
+ String8 componentProcess = AaptXml::getAttribute(tree,
+ "http://schemas.android.com/apk/res/android", "process", &error);
+ if (error != "") {
+ fprintf(stderr, "ERROR: %s\n", error.string());
+ return -1;
+ }
+
+ const String8& process =
+ componentProcess.length() > 0 ? componentProcess : defaultProcess;
+ keepTag = process.length() > 0 && process.find(":") != 0;
+ }
}
}
if (keepTag) {
@@ -2932,19 +2954,6 @@
keepTag = name.length() > 0;
- if (keepTag && mainDex) {
- String8 componentProcess = AaptXml::getAttribute(tree,
- "http://schemas.android.com/apk/res/android", "process", &error);
- if (error != "") {
- fprintf(stderr, "ERROR: %s\n", error.string());
- return -1;
- }
-
- const String8& process =
- componentProcess.length() > 0 ? componentProcess : defaultProcess;
- keepTag = process.length() > 0 && process.find(":") != 0;
- }
-
if (keepTag) {
addProguardKeepRule(keep, name, pkg.string(),
assFile->getPrintableSource(), tree.getLineNumber());
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 6a4b637..6d80a69 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -4521,6 +4521,7 @@
const ConfigDescription& sourceConfig,
const int sdkVersionToGenerate) {
assert(sdkVersionToGenerate > sourceConfig.sdkVersion);
+ assert(configList != NULL);
const DefaultKeyedVector<ConfigDescription, sp<ResourceTable::Entry>>& entries
= configList->getEntries();
ssize_t idx = entries.indexOfKey(sourceConfig);
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index 4b5ea65..bbb9a51 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -39,6 +39,7 @@
link/PrivateAttributeMover.cpp \
link/ReferenceLinker.cpp \
link/TableMerger.cpp \
+ link/VersionCollapser.cpp \
link/XmlReferenceLinker.cpp \
process/SymbolTable.cpp \
proto/ProtoHelpers.cpp \
@@ -87,6 +88,7 @@
link/ProductFilter_test.cpp \
link/ReferenceLinker_test.cpp \
link/TableMerger_test.cpp \
+ link/VersionCollapser_test.cpp \
link/XmlReferenceLinker_test.cpp \
process/SymbolTable_test.cpp \
proto/TableProtoSerializer_test.cpp \
@@ -101,6 +103,7 @@
java/JavaClassGenerator_test.cpp \
java/ManifestClassGenerator_test.cpp \
Locale_test.cpp \
+ NameMangler_test.cpp \
Resource_test.cpp \
ResourceParser_test.cpp \
ResourceTable_test.cpp \
diff --git a/tools/aapt2/AppInfo.h b/tools/aapt2/AppInfo.h
index 30047f7..1d39b72 100644
--- a/tools/aapt2/AppInfo.h
+++ b/tools/aapt2/AppInfo.h
@@ -17,6 +17,8 @@
#ifndef AAPT_APP_INFO_H
#define AAPT_APP_INFO_H
+#include "util/Maybe.h"
+
#include <string>
namespace aapt {
@@ -29,7 +31,12 @@
/**
* App's package name.
*/
- std::u16string package;
+ std::string package;
+
+ /**
+ * The App's minimum SDK version.
+ */
+ Maybe<std::string> minSdkVersion;
};
} // namespace aapt
diff --git a/tools/aapt2/ConfigDescription.cpp b/tools/aapt2/ConfigDescription.cpp
index 13f8b3b..c1697e7 100644
--- a/tools/aapt2/ConfigDescription.cpp
+++ b/tools/aapt2/ConfigDescription.cpp
@@ -783,4 +783,10 @@
}
}
+ConfigDescription ConfigDescription::copyWithoutSdkVersion() const {
+ ConfigDescription copy = *this;
+ copy.sdkVersion = 0;
+ return copy;
+}
+
} // namespace aapt
diff --git a/tools/aapt2/ConfigDescription.h b/tools/aapt2/ConfigDescription.h
index 5749816..ef0d147 100644
--- a/tools/aapt2/ConfigDescription.h
+++ b/tools/aapt2/ConfigDescription.h
@@ -65,6 +65,8 @@
bool operator!=(const ConfigDescription& o) const;
bool operator>=(const ConfigDescription& o) const;
bool operator>(const ConfigDescription& o) const;
+
+ ConfigDescription copyWithoutSdkVersion() const;
};
inline ConfigDescription::ConfigDescription() {
diff --git a/tools/aapt2/ConfigDescription_test.cpp b/tools/aapt2/ConfigDescription_test.cpp
index e68d6be..455a57f 100644
--- a/tools/aapt2/ConfigDescription_test.cpp
+++ b/tools/aapt2/ConfigDescription_test.cpp
@@ -16,10 +16,9 @@
#include "ConfigDescription.h"
#include "SdkConstants.h"
-
+#include "test/Test.h"
#include "util/StringPiece.h"
-#include <gtest/gtest.h>
#include <string>
namespace aapt {
diff --git a/tools/aapt2/Flags.cpp b/tools/aapt2/Flags.cpp
index 666e8a8e..2033a4c 100644
--- a/tools/aapt2/Flags.cpp
+++ b/tools/aapt2/Flags.cpp
@@ -101,7 +101,7 @@
// Split the description by newlines and write out the argument (which is empty after
// the first line) followed by the description line. This will make sure that multiline
// descriptions are still right justified and aligned.
- for (StringPiece line : util::tokenize<char>(flag.description, '\n')) {
+ for (StringPiece line : util::tokenize(flag.description, '\n')) {
*out << " " << std::setw(kWidth) << std::left << argLine << line << "\n";
argLine = " ";
}
diff --git a/tools/aapt2/Locale.cpp b/tools/aapt2/Locale.cpp
index be57661..f7956c0 100644
--- a/tools/aapt2/Locale.cpp
+++ b/tools/aapt2/Locale.cpp
@@ -223,33 +223,6 @@
return static_cast<ssize_t>(iter - startIter);
}
-
-std::string LocaleValue::toDirName() const {
- std::string dirName;
- if (language[0]) {
- dirName += language;
- } else {
- return dirName;
- }
-
- if (script[0]) {
- dirName += "-s";
- dirName += script;
- }
-
- if (region[0]) {
- dirName += "-r";
- dirName += region;
- }
-
- if (variant[0]) {
- dirName += "-v";
- dirName += variant;
- }
-
- return dirName;
-}
-
void LocaleValue::initFromResTable(const ResTable_config& config) {
config.unpackLanguage(language);
config.unpackRegion(region);
diff --git a/tools/aapt2/Locale.h b/tools/aapt2/Locale.h
index b1c80ab..33f80ad 100644
--- a/tools/aapt2/Locale.h
+++ b/tools/aapt2/Locale.h
@@ -57,8 +57,6 @@
*/
void writeTo(android::ResTable_config* out) const;
- std::string toDirName() const;
-
inline int compare(const LocaleValue& other) const;
inline bool operator<(const LocaleValue& o) const;
diff --git a/tools/aapt2/Locale_test.cpp b/tools/aapt2/Locale_test.cpp
index 758e1e3..e4b8ce7 100644
--- a/tools/aapt2/Locale_test.cpp
+++ b/tools/aapt2/Locale_test.cpp
@@ -23,7 +23,7 @@
namespace aapt {
static ::testing::AssertionResult TestLanguage(const char* input, const char* lang) {
- std::vector<std::string> parts = util::splitAndLowercase(std::string(input), '-');
+ std::vector<std::string> parts = util::splitAndLowercase(input, '-');
LocaleValue lv;
ssize_t count = lv.initFromParts(std::begin(parts), std::end(parts));
if (count < 0) {
@@ -45,7 +45,7 @@
static ::testing::AssertionResult TestLanguageRegion(const char* input, const char* lang,
const char* region) {
- std::vector<std::string> parts = util::splitAndLowercase(std::string(input), '-');
+ std::vector<std::string> parts = util::splitAndLowercase(input, '-');
LocaleValue lv;
ssize_t count = lv.initFromParts(std::begin(parts), std::end(parts));
if (count < 0) {
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp
index 00d8aae..a74b5aa 100644
--- a/tools/aapt2/Main.cpp
+++ b/tools/aapt2/Main.cpp
@@ -21,6 +21,18 @@
namespace aapt {
+// DO NOT UPDATE, this is more of a marketing version.
+static const char* sMajorVersion = "2";
+
+// Update minor version whenever a feature or flag is added.
+static const char* sMinorVersion = "0";
+
+int printVersion() {
+ std::cerr << "Android Asset Packaging Tool (aapt) "
+ << sMajorVersion << "." << sMinorVersion << std::endl;
+ return 0;
+}
+
extern int compile(const std::vector<StringPiece>& args);
extern int link(const std::vector<StringPiece>& args);
extern int dump(const std::vector<StringPiece>& args);
@@ -47,12 +59,14 @@
return aapt::dump(args);
} else if (command == "diff") {
return aapt::diff(args);
+ } else if (command == "version") {
+ return aapt::printVersion();
}
std::cerr << "unknown command '" << command << "'\n";
} else {
std::cerr << "no command specified\n";
}
- std::cerr << "\nusage: aapt2 [compile|link|dump|diff] ..." << std::endl;
+ std::cerr << "\nusage: aapt2 [compile|link|dump|diff|version] ..." << std::endl;
return 1;
}
diff --git a/tools/aapt2/NameMangler.h b/tools/aapt2/NameMangler.h
index 054b9ee..505a982e 100644
--- a/tools/aapt2/NameMangler.h
+++ b/tools/aapt2/NameMangler.h
@@ -18,7 +18,6 @@
#define AAPT_NAME_MANGLER_H
#include "Resource.h"
-
#include "util/Maybe.h"
#include <set>
@@ -31,12 +30,12 @@
* Represents the package we are trying to build. References pointing
* to this package are not mangled, and mangled references inherit this package name.
*/
- std::u16string targetPackageName;
+ std::string targetPackageName;
/**
* We must know which references to mangle, and which to keep (android vs. com.android.support).
*/
- std::set<std::u16string> packagesToMangle;
+ std::set<std::string> packagesToMangle;
};
class NameMangler {
@@ -53,14 +52,11 @@
return {};
}
- return ResourceName{
- mPolicy.targetPackageName,
- name.type,
- mangleEntry(name.package, name.entry)
- };
+ std::string mangledEntryName = mangleEntry(name.package, name.entry);
+ return ResourceName(mPolicy.targetPackageName, name.type, mangledEntryName);
}
- bool shouldMangle(const std::u16string& package) const {
+ bool shouldMangle(const std::string& package) const {
if (package.empty() || mPolicy.targetPackageName == package) {
return false;
}
@@ -72,8 +68,8 @@
* The mangled name should contain symbols that are illegal to define in XML,
* so that there will never be name mangling collisions.
*/
- static std::u16string mangleEntry(const std::u16string& package, const std::u16string& name) {
- return package + u"$" + name;
+ static std::string mangleEntry(const std::string& package, const std::string& name) {
+ return package + "$" + name;
}
/**
@@ -81,8 +77,8 @@
* and the package in `outPackage`. Returns true if the name was unmangled or
* false if the name was never mangled to begin with.
*/
- static bool unmangle(std::u16string* outName, std::u16string* outPackage) {
- size_t pivot = outName->find(u'$');
+ static bool unmangle(std::string* outName, std::string* outPackage) {
+ size_t pivot = outName->find('$');
if (pivot == std::string::npos) {
return false;
}
diff --git a/tools/aapt2/NameMangler_test.cpp b/tools/aapt2/NameMangler_test.cpp
index 6103655..f624df2 100644
--- a/tools/aapt2/NameMangler_test.cpp
+++ b/tools/aapt2/NameMangler_test.cpp
@@ -15,31 +15,32 @@
*/
#include "NameMangler.h"
+#include "test/Test.h"
-#include <gtest/gtest.h>
#include <string>
namespace aapt {
TEST(NameManglerTest, MangleName) {
- std::u16string package = u"android.appcompat";
- std::u16string name = u"Platform.AppCompat";
+ std::string package = "android.appcompat";
+ std::string name = "Platform.AppCompat";
- NameMangler::mangle(package, &name);
- EXPECT_EQ(name, u"android.appcompat$Platform.AppCompat");
+ std::string mangledName = NameMangler::mangleEntry(package, name);
+ EXPECT_EQ(mangledName, "android.appcompat$Platform.AppCompat");
- std::u16string newPackage;
- ASSERT_TRUE(NameMangler::unmangle(&name, &newPackage));
- EXPECT_EQ(name, u"Platform.AppCompat");
- EXPECT_EQ(newPackage, u"android.appcompat");
+ std::string unmangledPackage;
+ std::string unmangledName = mangledName;
+ ASSERT_TRUE(NameMangler::unmangle(&unmangledName, &unmangledPackage));
+ EXPECT_EQ(unmangledName, "Platform.AppCompat");
+ EXPECT_EQ(unmangledPackage, "android.appcompat");
}
TEST(NameManglerTest, IgnoreUnmangledName) {
- std::u16string package;
- std::u16string name = u"foo_bar";
+ std::string package;
+ std::string name = "foo_bar";
EXPECT_FALSE(NameMangler::unmangle(&name, &package));
- EXPECT_EQ(name, u"foo_bar");
+ EXPECT_EQ(name, "foo_bar");
}
} // namespace aapt
diff --git a/tools/aapt2/Resource.cpp b/tools/aapt2/Resource.cpp
index 9328b69..b7a091e 100644
--- a/tools/aapt2/Resource.cpp
+++ b/tools/aapt2/Resource.cpp
@@ -22,62 +22,62 @@
namespace aapt {
-StringPiece16 toString(ResourceType type) {
+StringPiece toString(ResourceType type) {
switch (type) {
- case ResourceType::kAnim: return u"anim";
- case ResourceType::kAnimator: return u"animator";
- case ResourceType::kArray: return u"array";
- case ResourceType::kAttr: return u"attr";
- case ResourceType::kAttrPrivate: return u"^attr-private";
- case ResourceType::kBool: return u"bool";
- case ResourceType::kColor: return u"color";
- case ResourceType::kDimen: return u"dimen";
- case ResourceType::kDrawable: return u"drawable";
- case ResourceType::kFraction: return u"fraction";
- case ResourceType::kId: return u"id";
- case ResourceType::kInteger: return u"integer";
- case ResourceType::kInterpolator: return u"interpolator";
- case ResourceType::kLayout: return u"layout";
- case ResourceType::kMenu: return u"menu";
- case ResourceType::kMipmap: return u"mipmap";
- case ResourceType::kPlurals: return u"plurals";
- case ResourceType::kRaw: return u"raw";
- case ResourceType::kString: return u"string";
- case ResourceType::kStyle: return u"style";
- case ResourceType::kStyleable: return u"styleable";
- case ResourceType::kTransition: return u"transition";
- case ResourceType::kXml: return u"xml";
+ case ResourceType::kAnim: return "anim";
+ case ResourceType::kAnimator: return "animator";
+ case ResourceType::kArray: return "array";
+ case ResourceType::kAttr: return "attr";
+ case ResourceType::kAttrPrivate: return "^attr-private";
+ case ResourceType::kBool: return "bool";
+ case ResourceType::kColor: return "color";
+ case ResourceType::kDimen: return "dimen";
+ case ResourceType::kDrawable: return "drawable";
+ case ResourceType::kFraction: return "fraction";
+ case ResourceType::kId: return "id";
+ case ResourceType::kInteger: return "integer";
+ case ResourceType::kInterpolator: return "interpolator";
+ case ResourceType::kLayout: return "layout";
+ case ResourceType::kMenu: return "menu";
+ case ResourceType::kMipmap: return "mipmap";
+ case ResourceType::kPlurals: return "plurals";
+ case ResourceType::kRaw: return "raw";
+ case ResourceType::kString: return "string";
+ case ResourceType::kStyle: return "style";
+ case ResourceType::kStyleable: return "styleable";
+ case ResourceType::kTransition: return "transition";
+ case ResourceType::kXml: return "xml";
}
return {};
}
-static const std::map<StringPiece16, ResourceType> sResourceTypeMap {
- { u"anim", ResourceType::kAnim },
- { u"animator", ResourceType::kAnimator },
- { u"array", ResourceType::kArray },
- { u"attr", ResourceType::kAttr },
- { u"^attr-private", ResourceType::kAttrPrivate },
- { u"bool", ResourceType::kBool },
- { u"color", ResourceType::kColor },
- { u"dimen", ResourceType::kDimen },
- { u"drawable", ResourceType::kDrawable },
- { u"fraction", ResourceType::kFraction },
- { u"id", ResourceType::kId },
- { u"integer", ResourceType::kInteger },
- { u"interpolator", ResourceType::kInterpolator },
- { u"layout", ResourceType::kLayout },
- { u"menu", ResourceType::kMenu },
- { u"mipmap", ResourceType::kMipmap },
- { u"plurals", ResourceType::kPlurals },
- { u"raw", ResourceType::kRaw },
- { u"string", ResourceType::kString },
- { u"style", ResourceType::kStyle },
- { u"styleable", ResourceType::kStyleable },
- { u"transition", ResourceType::kTransition },
- { u"xml", ResourceType::kXml },
+static const std::map<StringPiece, ResourceType> sResourceTypeMap {
+ { "anim", ResourceType::kAnim },
+ { "animator", ResourceType::kAnimator },
+ { "array", ResourceType::kArray },
+ { "attr", ResourceType::kAttr },
+ { "^attr-private", ResourceType::kAttrPrivate },
+ { "bool", ResourceType::kBool },
+ { "color", ResourceType::kColor },
+ { "dimen", ResourceType::kDimen },
+ { "drawable", ResourceType::kDrawable },
+ { "fraction", ResourceType::kFraction },
+ { "id", ResourceType::kId },
+ { "integer", ResourceType::kInteger },
+ { "interpolator", ResourceType::kInterpolator },
+ { "layout", ResourceType::kLayout },
+ { "menu", ResourceType::kMenu },
+ { "mipmap", ResourceType::kMipmap },
+ { "plurals", ResourceType::kPlurals },
+ { "raw", ResourceType::kRaw },
+ { "string", ResourceType::kString },
+ { "style", ResourceType::kStyle },
+ { "styleable", ResourceType::kStyleable },
+ { "transition", ResourceType::kTransition },
+ { "xml", ResourceType::kXml },
};
-const ResourceType* parseResourceType(const StringPiece16& str) {
+const ResourceType* parseResourceType(const StringPiece& str) {
auto iter = sResourceTypeMap.find(str);
if (iter == std::end(sResourceTypeMap)) {
return nullptr;
diff --git a/tools/aapt2/Resource.h b/tools/aapt2/Resource.h
index 03ca42b..0ba0345 100644
--- a/tools/aapt2/Resource.h
+++ b/tools/aapt2/Resource.h
@@ -19,11 +19,13 @@
#include "ConfigDescription.h"
#include "Source.h"
-
#include "util/StringPiece.h"
+#include <utils/JenkinsHash.h>
+
#include <iomanip>
#include <limits>
+#include <sstream>
#include <string>
#include <tuple>
#include <vector>
@@ -60,28 +62,28 @@
kXml,
};
-StringPiece16 toString(ResourceType type);
+StringPiece toString(ResourceType type);
/**
* Returns a pointer to a valid ResourceType, or nullptr if
* the string was invalid.
*/
-const ResourceType* parseResourceType(const StringPiece16& str);
+const ResourceType* parseResourceType(const StringPiece& str);
/**
* A resource's name. This can uniquely identify
* a resource in the ResourceTable.
*/
struct ResourceName {
- std::u16string package;
+ std::string package;
ResourceType type;
- std::u16string entry;
+ std::string entry;
ResourceName() : type(ResourceType::kRaw) {}
- ResourceName(const StringPiece16& p, ResourceType t, const StringPiece16& e);
+ ResourceName(const StringPiece& p, ResourceType t, const StringPiece& e);
bool isValid() const;
- std::u16string toString() const;
+ std::string toString() const;
};
/**
@@ -91,15 +93,15 @@
* of the original string.
*/
struct ResourceNameRef {
- StringPiece16 package;
+ StringPiece package;
ResourceType type;
- StringPiece16 entry;
+ StringPiece entry;
ResourceNameRef() = default;
ResourceNameRef(const ResourceNameRef&) = default;
ResourceNameRef(ResourceNameRef&&) = default;
ResourceNameRef(const ResourceName& rhs);
- ResourceNameRef(const StringPiece16& p, ResourceType t, const StringPiece16& e);
+ ResourceNameRef(const StringPiece& p, ResourceType t, const StringPiece& e);
ResourceNameRef& operator=(const ResourceNameRef& rhs) = default;
ResourceNameRef& operator=(ResourceNameRef&& rhs) = default;
ResourceNameRef& operator=(const ResourceName& rhs);
@@ -252,7 +254,7 @@
// ResourceName implementation.
//
-inline ResourceName::ResourceName(const StringPiece16& p, ResourceType t, const StringPiece16& e) :
+inline ResourceName::ResourceName(const StringPiece& p, ResourceType t, const StringPiece& e) :
package(p.toString()), type(t), entry(e.toString()) {
}
@@ -275,14 +277,6 @@
!= std::tie(rhs.package, rhs.type, rhs.entry);
}
-inline std::u16string ResourceName::toString() const {
- std::u16string result;
- if (!package.empty()) {
- result = package + u":";
- }
- return result + aapt::toString(type).toString() + u"/" + entry;
-}
-
inline ::std::ostream& operator<<(::std::ostream& out, const ResourceName& name) {
if (!name.package.empty()) {
out << name.package << ":";
@@ -290,6 +284,11 @@
return out << name.type << "/" << name.entry;
}
+inline std::string ResourceName::toString() const {
+ std::stringstream stream;
+ stream << *this;
+ return stream.str();
+}
//
// ResourceNameRef implementation.
@@ -299,8 +298,8 @@
package(rhs.package), type(rhs.type), entry(rhs.entry) {
}
-inline ResourceNameRef::ResourceNameRef(const StringPiece16& p, ResourceType t,
- const StringPiece16& e) :
+inline ResourceNameRef::ResourceNameRef(const StringPiece& p, ResourceType t,
+ const StringPiece& e) :
package(p), type(t), entry(e) {
}
@@ -312,7 +311,7 @@
}
inline ResourceName ResourceNameRef::toResourceName() const {
- return { package.toString(), type, entry.toString() };
+ return ResourceName(package, type, entry);
}
inline bool ResourceNameRef::isValid() const {
@@ -355,4 +354,18 @@
} // namespace aapt
+namespace std {
+
+template <> struct hash<aapt::ResourceName> {
+ size_t operator()(const aapt::ResourceName& name) const {
+ android::hash_t h = 0;
+ h = android::JenkinsHashMix(h, hash<string>()(name.package));
+ h = android::JenkinsHashMix(h, static_cast<uint32_t>(name.type));
+ h = android::JenkinsHashMix(h, hash<string>()(name.entry));
+ return static_cast<size_t>(h);
+ }
+};
+
+} // namespace std
+
#endif // AAPT_RESOURCE_H
diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index a84c306..a144c6a 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -28,33 +28,33 @@
namespace aapt {
-constexpr const char16_t* sXliffNamespaceUri = u"urn:oasis:names:tc:xliff:document:1.2";
+constexpr const char* sXliffNamespaceUri = "urn:oasis:names:tc:xliff:document:1.2";
/**
* Returns true if the element is <skip> or <eat-comment> and can be safely ignored.
*/
-static bool shouldIgnoreElement(const StringPiece16& ns, const StringPiece16& name) {
- return ns.empty() && (name == u"skip" || name == u"eat-comment");
+static bool shouldIgnoreElement(const StringPiece& ns, const StringPiece& name) {
+ return ns.empty() && (name == "skip" || name == "eat-comment");
}
-static uint32_t parseFormatType(const StringPiece16& piece) {
- if (piece == u"reference") return android::ResTable_map::TYPE_REFERENCE;
- else if (piece == u"string") return android::ResTable_map::TYPE_STRING;
- else if (piece == u"integer") return android::ResTable_map::TYPE_INTEGER;
- else if (piece == u"boolean") return android::ResTable_map::TYPE_BOOLEAN;
- else if (piece == u"color") return android::ResTable_map::TYPE_COLOR;
- else if (piece == u"float") return android::ResTable_map::TYPE_FLOAT;
- else if (piece == u"dimension") return android::ResTable_map::TYPE_DIMENSION;
- else if (piece == u"fraction") return android::ResTable_map::TYPE_FRACTION;
- else if (piece == u"enum") return android::ResTable_map::TYPE_ENUM;
- else if (piece == u"flags") return android::ResTable_map::TYPE_FLAGS;
+static uint32_t parseFormatType(const StringPiece& piece) {
+ if (piece == "reference") return android::ResTable_map::TYPE_REFERENCE;
+ else if (piece == "string") return android::ResTable_map::TYPE_STRING;
+ else if (piece == "integer") return android::ResTable_map::TYPE_INTEGER;
+ else if (piece == "boolean") return android::ResTable_map::TYPE_BOOLEAN;
+ else if (piece == "color") return android::ResTable_map::TYPE_COLOR;
+ else if (piece == "float") return android::ResTable_map::TYPE_FLOAT;
+ else if (piece == "dimension") return android::ResTable_map::TYPE_DIMENSION;
+ else if (piece == "fraction") return android::ResTable_map::TYPE_FRACTION;
+ else if (piece == "enum") return android::ResTable_map::TYPE_ENUM;
+ else if (piece == "flags") return android::ResTable_map::TYPE_FLAGS;
return 0;
}
-static uint32_t parseFormatAttribute(const StringPiece16& str) {
+static uint32_t parseFormatAttribute(const StringPiece& str) {
uint32_t mask = 0;
- for (StringPiece16 part : util::tokenize(str, u'|')) {
- StringPiece16 trimmedPart = util::trimWhitespace(part);
+ for (StringPiece part : util::tokenize(str, '|')) {
+ StringPiece trimmedPart = util::trimWhitespace(part);
uint32_t type = parseFormatType(trimmedPart);
if (type == 0) {
return 0;
@@ -74,14 +74,14 @@
Source source;
ResourceId id;
Maybe<SymbolState> symbolState;
- std::u16string comment;
+ std::string comment;
std::unique_ptr<Value> value;
std::list<ParsedResource> childResources;
};
// Recursively adds resources to the ResourceTable.
static bool addResourcesToTable(ResourceTable* table, IDiagnostics* diag, ParsedResource* res) {
- StringPiece16 trimmedComment = util::trimWhitespace(res->comment);
+ StringPiece trimmedComment = util::trimWhitespace(res->comment);
if (trimmedComment.size() != res->comment.size()) {
// Only if there was a change do we re-assign.
res->comment = trimmedComment.toString();
@@ -130,7 +130,7 @@
/**
* Build a string from XML that converts nested elements into Span objects.
*/
-bool ResourceParser::flattenXmlSubtree(xml::XmlPullParser* parser, std::u16string* outRawString,
+bool ResourceParser::flattenXmlSubtree(xml::XmlPullParser* parser, std::string* outRawString,
StyleString* outStyleString) {
std::vector<Span> spanStack;
@@ -176,12 +176,12 @@
depth++;
// Build a span object out of the nested element.
- std::u16string spanName = parser->getElementName();
+ std::string spanName = parser->getElementName();
const auto endAttrIter = parser->endAttributes();
for (auto attrIter = parser->beginAttributes(); attrIter != endAttrIter; ++attrIter) {
- spanName += u";";
+ spanName += ";";
spanName += attrIter->name;
- spanName += u"=";
+ spanName += "=";
spanName += attrIter->value;
}
@@ -214,7 +214,7 @@
continue;
}
- if (!parser->getElementNamespace().empty() || parser->getElementName() != u"resources") {
+ if (!parser->getElementNamespace().empty() || parser->getElementName() != "resources") {
mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
<< "root element must be <resources>");
return false;
@@ -236,7 +236,7 @@
std::set<ResourceName> strippedResources;
bool error = false;
- std::u16string comment;
+ std::string comment;
const size_t depth = parser->getDepth();
while (xml::XmlPullParser::nextChildNode(parser, depth)) {
const xml::XmlPullParser::Event event = parser->getEvent();
@@ -261,9 +261,9 @@
continue;
}
- std::u16string elementName = parser->getElementName();
- if (elementName == u"skip" || elementName == u"eat-comment") {
- comment = u"";
+ std::string elementName = parser->getElementName();
+ if (elementName == "skip" || elementName == "eat-comment") {
+ comment = "";
continue;
}
@@ -273,8 +273,8 @@
parsedResource.comment = std::move(comment);
// Extract the product name if it exists.
- if (Maybe<StringPiece16> maybeProduct = xml::findNonEmptyAttribute(parser, u"product")) {
- parsedResource.product = util::utf16ToUtf8(maybeProduct.value());
+ if (Maybe<StringPiece> maybeProduct = xml::findNonEmptyAttribute(parser, "product")) {
+ parsedResource.product = maybeProduct.value().toString();
}
// Parse the resource regardless of product.
@@ -310,43 +310,43 @@
using BagParseFunc = std::function<bool(ResourceParser*, xml::XmlPullParser*, ParsedResource*)>;
- static const auto elToItemMap = ImmutableMap<std::u16string, ItemTypeFormat>::createPreSorted({
- { u"bool", { ResourceType::kBool, android::ResTable_map::TYPE_BOOLEAN } },
- { u"color", { ResourceType::kColor, android::ResTable_map::TYPE_COLOR } },
- { u"dimen", { ResourceType::kDimen, android::ResTable_map::TYPE_FLOAT
+ static const auto elToItemMap = ImmutableMap<std::string, ItemTypeFormat>::createPreSorted({
+ { "bool", { ResourceType::kBool, android::ResTable_map::TYPE_BOOLEAN } },
+ { "color", { ResourceType::kColor, android::ResTable_map::TYPE_COLOR } },
+ { "dimen", { ResourceType::kDimen, android::ResTable_map::TYPE_FLOAT
| android::ResTable_map::TYPE_FRACTION
| android::ResTable_map::TYPE_DIMENSION } },
- { u"drawable", { ResourceType::kDrawable, android::ResTable_map::TYPE_COLOR } },
- { u"fraction", { ResourceType::kFraction, android::ResTable_map::TYPE_FLOAT
+ { "drawable", { ResourceType::kDrawable, android::ResTable_map::TYPE_COLOR } },
+ { "fraction", { ResourceType::kFraction, android::ResTable_map::TYPE_FLOAT
| android::ResTable_map::TYPE_FRACTION
| android::ResTable_map::TYPE_DIMENSION } },
- { u"integer", { ResourceType::kInteger, android::ResTable_map::TYPE_INTEGER } },
- { u"string", { ResourceType::kString, android::ResTable_map::TYPE_STRING } },
+ { "integer", { ResourceType::kInteger, android::ResTable_map::TYPE_INTEGER } },
+ { "string", { ResourceType::kString, android::ResTable_map::TYPE_STRING } },
});
- static const auto elToBagMap = ImmutableMap<std::u16string, BagParseFunc>::createPreSorted({
- { u"add-resource", std::mem_fn(&ResourceParser::parseAddResource) },
- { u"array", std::mem_fn(&ResourceParser::parseArray) },
- { u"attr", std::mem_fn(&ResourceParser::parseAttr) },
- { u"declare-styleable", std::mem_fn(&ResourceParser::parseDeclareStyleable) },
- { u"integer-array", std::mem_fn(&ResourceParser::parseIntegerArray) },
- { u"java-symbol", std::mem_fn(&ResourceParser::parseSymbol) },
- { u"plurals", std::mem_fn(&ResourceParser::parsePlural) },
- { u"public", std::mem_fn(&ResourceParser::parsePublic) },
- { u"public-group", std::mem_fn(&ResourceParser::parsePublicGroup) },
- { u"string-array", std::mem_fn(&ResourceParser::parseStringArray) },
- { u"style", std::mem_fn(&ResourceParser::parseStyle) },
- { u"symbol", std::mem_fn(&ResourceParser::parseSymbol) },
+ static const auto elToBagMap = ImmutableMap<std::string, BagParseFunc>::createPreSorted({
+ { "add-resource", std::mem_fn(&ResourceParser::parseAddResource) },
+ { "array", std::mem_fn(&ResourceParser::parseArray) },
+ { "attr", std::mem_fn(&ResourceParser::parseAttr) },
+ { "declare-styleable", std::mem_fn(&ResourceParser::parseDeclareStyleable) },
+ { "integer-array", std::mem_fn(&ResourceParser::parseIntegerArray) },
+ { "java-symbol", std::mem_fn(&ResourceParser::parseSymbol) },
+ { "plurals", std::mem_fn(&ResourceParser::parsePlural) },
+ { "public", std::mem_fn(&ResourceParser::parsePublic) },
+ { "public-group", std::mem_fn(&ResourceParser::parsePublicGroup) },
+ { "string-array", std::mem_fn(&ResourceParser::parseStringArray) },
+ { "style", std::mem_fn(&ResourceParser::parseStyle) },
+ { "symbol", std::mem_fn(&ResourceParser::parseSymbol) },
});
- std::u16string resourceType = parser->getElementName();
+ std::string resourceType = parser->getElementName();
// The value format accepted for this resource.
uint32_t resourceFormat = 0u;
- if (resourceType == u"item") {
+ if (resourceType == "item") {
// Items have their type encoded in the type attribute.
- if (Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type")) {
+ if (Maybe<StringPiece> maybeType = xml::findNonEmptyAttribute(parser, "type")) {
resourceType = maybeType.value().toString();
} else {
mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
@@ -354,7 +354,7 @@
return false;
}
- if (Maybe<StringPiece16> maybeFormat = xml::findNonEmptyAttribute(parser, u"format")) {
+ if (Maybe<StringPiece> maybeFormat = xml::findNonEmptyAttribute(parser, "format")) {
// An explicit format for this resource was specified. The resource will retain
// its type in its name, but the accepted value for this type is overridden.
resourceFormat = parseFormatType(maybeFormat.value());
@@ -368,9 +368,9 @@
// Get the name of the resource. This will be checked later, because not all
// XML elements require a name.
- Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
+ Maybe<StringPiece> maybeName = xml::findNonEmptyAttribute(parser, "name");
- if (resourceType == u"id") {
+ if (resourceType == "id") {
if (!maybeName) {
mDiag->error(DiagMessage(outResource->source)
<< "<" << parser->getElementName() << "> missing 'name' attribute");
@@ -411,7 +411,7 @@
const auto bagIter = elToBagMap.find(resourceType);
if (bagIter != elToBagMap.end()) {
// Ensure we have a name (unless this is a <public-group>).
- if (resourceType != u"public-group") {
+ if (resourceType != "public-group") {
if (!maybeName) {
mDiag->error(DiagMessage(outResource->source)
<< "<" << parser->getElementName() << "> missing 'name' attribute");
@@ -480,7 +480,7 @@
const bool allowRawValue) {
const size_t beginXmlLine = parser->getLineNumber();
- std::u16string rawValue;
+ std::string rawValue;
StyleString styleString;
if (!flattenXmlSubtree(parser, &rawValue, &styleString)) {
return {};
@@ -505,7 +505,7 @@
if (processedItem) {
// Fix up the reference.
if (Reference* ref = valueCast<Reference>(processedItem.get())) {
- transformReferenceFromNamespace(parser, u"", ref);
+ transformReferenceFromNamespace(parser, "", ref);
}
return processedItem;
}
@@ -527,7 +527,7 @@
bool ResourceParser::parseString(xml::XmlPullParser* parser, ParsedResource* outResource) {
bool formatted = true;
- if (Maybe<StringPiece16> formattedAttr = xml::findAttribute(parser, u"formatted")) {
+ if (Maybe<StringPiece> formattedAttr = xml::findAttribute(parser, "formatted")) {
if (!ResourceUtils::tryParseBool(formattedAttr.value(), &formatted)) {
mDiag->error(DiagMessage(outResource->source)
<< "invalid value for 'formatted'. Must be a boolean");
@@ -536,7 +536,7 @@
}
bool translateable = mOptions.translatable;
- if (Maybe<StringPiece16> translateableAttr = xml::findAttribute(parser, u"translatable")) {
+ if (Maybe<StringPiece> translateableAttr = xml::findAttribute(parser, "translatable")) {
if (!ResourceUtils::tryParseBool(translateableAttr.value(), &translateable)) {
mDiag->error(DiagMessage(outResource->source)
<< "invalid value for 'translatable'. Must be a boolean");
@@ -574,7 +574,7 @@
}
bool ResourceParser::parsePublic(xml::XmlPullParser* parser, ParsedResource* outResource) {
- Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type");
+ Maybe<StringPiece> maybeType = xml::findNonEmptyAttribute(parser, "type");
if (!maybeType) {
mDiag->error(DiagMessage(outResource->source) << "<public> must have a 'type' attribute");
return false;
@@ -589,17 +589,14 @@
outResource->name.type = *parsedType;
- if (Maybe<StringPiece16> maybeId = xml::findNonEmptyAttribute(parser, u"id")) {
- android::Res_value val;
- bool result = android::ResTable::stringToInt(maybeId.value().data(),
- maybeId.value().size(), &val);
- ResourceId resourceId(val.data);
- if (!result || !resourceId.isValid()) {
+ if (Maybe<StringPiece> maybeIdStr = xml::findNonEmptyAttribute(parser, "id")) {
+ Maybe<ResourceId> maybeId = ResourceUtils::tryParseResourceId(maybeIdStr.value());
+ if (!maybeId) {
mDiag->error(DiagMessage(outResource->source)
<< "invalid resource ID '" << maybeId.value() << "' in <public>");
return false;
}
- outResource->id = resourceId;
+ outResource->id = maybeId.value();
}
if (*parsedType == ResourceType::kId) {
@@ -612,7 +609,7 @@
}
bool ResourceParser::parsePublicGroup(xml::XmlPullParser* parser, ParsedResource* outResource) {
- Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type");
+ Maybe<StringPiece> maybeType = xml::findNonEmptyAttribute(parser, "type");
if (!maybeType) {
mDiag->error(DiagMessage(outResource->source)
<< "<public-group> must have a 'type' attribute");
@@ -626,24 +623,23 @@
return false;
}
- Maybe<StringPiece16> maybeId = xml::findNonEmptyAttribute(parser, u"first-id");
- if (!maybeId) {
+ Maybe<StringPiece> maybeIdStr = xml::findNonEmptyAttribute(parser, "first-id");
+ if (!maybeIdStr) {
mDiag->error(DiagMessage(outResource->source)
<< "<public-group> must have a 'first-id' attribute");
return false;
}
- android::Res_value val;
- bool result = android::ResTable::stringToInt(maybeId.value().data(),
- maybeId.value().size(), &val);
- ResourceId nextId(val.data);
- if (!result || !nextId.isValid()) {
+ Maybe<ResourceId> maybeId = ResourceUtils::tryParseResourceId(maybeIdStr.value());
+ if (!maybeId) {
mDiag->error(DiagMessage(outResource->source)
- << "invalid resource ID '" << maybeId.value() << "' in <public-group>");
+ << "invalid resource ID '" << maybeIdStr.value() << "' in <public-group>");
return false;
}
- std::u16string comment;
+ ResourceId nextId = maybeId.value();
+
+ std::string comment;
bool error = false;
const size_t depth = parser->getDepth();
while (xml::XmlPullParser::nextChildNode(parser, depth)) {
@@ -656,23 +652,23 @@
}
const Source itemSource = mSource.withLine(parser->getLineNumber());
- const std::u16string& elementNamespace = parser->getElementNamespace();
- const std::u16string& elementName = parser->getElementName();
- if (elementNamespace.empty() && elementName == u"public") {
- Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
+ const std::string& elementNamespace = parser->getElementNamespace();
+ const std::string& elementName = parser->getElementName();
+ if (elementNamespace.empty() && elementName == "public") {
+ Maybe<StringPiece> maybeName = xml::findNonEmptyAttribute(parser, "name");
if (!maybeName) {
mDiag->error(DiagMessage(itemSource) << "<public> must have a 'name' attribute");
error = true;
continue;
}
- if (xml::findNonEmptyAttribute(parser, u"id")) {
+ if (xml::findNonEmptyAttribute(parser, "id")) {
mDiag->error(DiagMessage(itemSource) << "'id' is ignored within <public-group>");
error = true;
continue;
}
- if (xml::findNonEmptyAttribute(parser, u"type")) {
+ if (xml::findNonEmptyAttribute(parser, "type")) {
mDiag->error(DiagMessage(itemSource) << "'type' is ignored within <public-group>");
error = true;
continue;
@@ -698,7 +694,7 @@
}
bool ResourceParser::parseSymbolImpl(xml::XmlPullParser* parser, ParsedResource* outResource) {
- Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type");
+ Maybe<StringPiece> maybeType = xml::findNonEmptyAttribute(parser, "type");
if (!maybeType) {
mDiag->error(DiagMessage(outResource->source)
<< "<" << parser->getElementName() << "> must have a 'type' attribute");
@@ -751,7 +747,7 @@
uint32_t typeMask = 0;
- Maybe<StringPiece16> maybeFormat = xml::findAttribute(parser, u"format");
+ Maybe<StringPiece> maybeFormat = xml::findAttribute(parser, "format");
if (maybeFormat) {
typeMask = parseFormatAttribute(maybeFormat.value());
if (typeMask == 0) {
@@ -763,11 +759,12 @@
Maybe<int32_t> maybeMin, maybeMax;
- if (Maybe<StringPiece16> maybeMinStr = xml::findAttribute(parser, u"min")) {
- StringPiece16 minStr = util::trimWhitespace(maybeMinStr.value());
+ if (Maybe<StringPiece> maybeMinStr = xml::findAttribute(parser, "min")) {
+ StringPiece minStr = util::trimWhitespace(maybeMinStr.value());
if (!minStr.empty()) {
+ std::u16string minStr16 = util::utf8ToUtf16(minStr);
android::Res_value value;
- if (android::ResTable::stringToInt(minStr.data(), minStr.size(), &value)) {
+ if (android::ResTable::stringToInt(minStr16.data(), minStr16.size(), &value)) {
maybeMin = static_cast<int32_t>(value.data);
}
}
@@ -779,11 +776,12 @@
}
}
- if (Maybe<StringPiece16> maybeMaxStr = xml::findAttribute(parser, u"max")) {
- StringPiece16 maxStr = util::trimWhitespace(maybeMaxStr.value());
+ if (Maybe<StringPiece> maybeMaxStr = xml::findAttribute(parser, "max")) {
+ StringPiece maxStr = util::trimWhitespace(maybeMaxStr.value());
if (!maxStr.empty()) {
+ std::u16string maxStr16 = util::utf8ToUtf16(maxStr);
android::Res_value value;
- if (android::ResTable::stringToInt(maxStr.data(), maxStr.size(), &value)) {
+ if (android::ResTable::stringToInt(maxStr16.data(), maxStr16.size(), &value)) {
maybeMax = static_cast<int32_t>(value.data);
}
}
@@ -809,7 +807,7 @@
std::set<Attribute::Symbol, SymbolComparator> items;
- std::u16string comment;
+ std::string comment;
bool error = false;
const size_t depth = parser->getDepth();
while (xml::XmlPullParser::nextChildNode(parser, depth)) {
@@ -822,10 +820,10 @@
}
const Source itemSource = mSource.withLine(parser->getLineNumber());
- const std::u16string& elementNamespace = parser->getElementNamespace();
- const std::u16string& elementName = parser->getElementName();
- if (elementNamespace.empty() && (elementName == u"flag" || elementName == u"enum")) {
- if (elementName == u"enum") {
+ const std::string& elementNamespace = parser->getElementNamespace();
+ const std::string& elementName = parser->getElementName();
+ if (elementNamespace.empty() && (elementName == "flag" || elementName == "enum")) {
+ if (elementName == "enum") {
if (typeMask & android::ResTable_map::TYPE_FLAGS) {
mDiag->error(DiagMessage(itemSource)
<< "can not define an <enum>; already defined a <flag>");
@@ -834,7 +832,7 @@
}
typeMask |= android::ResTable_map::TYPE_ENUM;
- } else if (elementName == u"flag") {
+ } else if (elementName == "flag") {
if (typeMask & android::ResTable_map::TYPE_ENUM) {
mDiag->error(DiagMessage(itemSource)
<< "can not define a <flag>; already defined an <enum>");
@@ -896,24 +894,24 @@
}
Maybe<Attribute::Symbol> ResourceParser::parseEnumOrFlagItem(xml::XmlPullParser* parser,
- const StringPiece16& tag) {
+ const StringPiece& tag) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
+ Maybe<StringPiece> maybeName = xml::findNonEmptyAttribute(parser, "name");
if (!maybeName) {
mDiag->error(DiagMessage(source) << "no attribute 'name' found for tag <" << tag << ">");
return {};
}
- Maybe<StringPiece16> maybeValue = xml::findNonEmptyAttribute(parser, u"value");
+ Maybe<StringPiece> maybeValue = xml::findNonEmptyAttribute(parser, "value");
if (!maybeValue) {
mDiag->error(DiagMessage(source) << "no attribute 'value' found for tag <" << tag << ">");
return {};
}
+ std::u16string value16 = util::utf8ToUtf16(maybeValue.value());
android::Res_value val;
- if (!android::ResTable::stringToInt(maybeValue.value().data(),
- maybeValue.value().size(), &val)) {
+ if (!android::ResTable::stringToInt(value16.data(), value16.size(), &val)) {
mDiag->error(DiagMessage(source) << "invalid value '" << maybeValue.value()
<< "' for <" << tag << ">; must be an integer");
return {};
@@ -923,25 +921,25 @@
Reference(ResourceNameRef({}, ResourceType::kId, maybeName.value())), val.data };
}
-static Maybe<Reference> parseXmlAttributeName(StringPiece16 str) {
+static Maybe<Reference> parseXmlAttributeName(StringPiece str) {
str = util::trimWhitespace(str);
- const char16_t* start = str.data();
- const char16_t* const end = start + str.size();
- const char16_t* p = start;
+ const char* start = str.data();
+ const char* const end = start + str.size();
+ const char* p = start;
Reference ref;
- if (p != end && *p == u'*') {
+ if (p != end && *p == '*') {
ref.privateReference = true;
start++;
p++;
}
- StringPiece16 package;
- StringPiece16 name;
+ StringPiece package;
+ StringPiece name;
while (p != end) {
- if (*p == u':') {
- package = StringPiece16(start, p - start);
- name = StringPiece16(p + 1, end - (p + 1));
+ if (*p == ':') {
+ package = StringPiece(start, p - start);
+ name = StringPiece(p + 1, end - (p + 1));
break;
}
p++;
@@ -955,7 +953,7 @@
bool ResourceParser::parseStyleItem(xml::XmlPullParser* parser, Style* style) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
+ Maybe<StringPiece> maybeName = xml::findNonEmptyAttribute(parser, "name");
if (!maybeName) {
mDiag->error(DiagMessage(source) << "<item> must have a 'name' attribute");
return false;
@@ -967,7 +965,7 @@
return false;
}
- transformReferenceFromNamespace(parser, u"", &maybeKey.value());
+ transformReferenceFromNamespace(parser, "", &maybeKey.value());
maybeKey.value().setSource(source);
std::unique_ptr<Item> value = parseXml(parser, 0, kAllowRawString);
@@ -985,7 +983,7 @@
std::unique_ptr<Style> style = util::make_unique<Style>();
- Maybe<StringPiece16> maybeParent = xml::findAttribute(parser, u"parent");
+ Maybe<StringPiece> maybeParent = xml::findAttribute(parser, "parent");
if (maybeParent) {
// If the parent is empty, we don't have a parent, but we also don't infer either.
if (!maybeParent.value().empty()) {
@@ -998,12 +996,12 @@
// Transform the namespace prefix to the actual package name, and mark the reference as
// private if appropriate.
- transformReferenceFromNamespace(parser, u"", &style->parent.value());
+ transformReferenceFromNamespace(parser, "", &style->parent.value());
}
} else {
// No parent was specified, so try inferring it from the style name.
- std::u16string styleName = outResource->name.entry;
+ std::string styleName = outResource->name.entry;
size_t pos = styleName.find_last_of(u'.');
if (pos != std::string::npos) {
style->parentInferred = true;
@@ -1020,9 +1018,9 @@
continue;
}
- const std::u16string& elementNamespace = parser->getElementNamespace();
- const std::u16string& elementName = parser->getElementName();
- if (elementNamespace == u"" && elementName == u"item") {
+ const std::string& elementNamespace = parser->getElementNamespace();
+ const std::string& elementName = parser->getElementName();
+ if (elementNamespace == "" && elementName == "item") {
error |= !parseStyleItem(parser, style.get());
} else if (!shouldIgnoreElement(elementNamespace, elementName)) {
@@ -1059,7 +1057,7 @@
std::unique_ptr<Array> array = util::make_unique<Array>();
bool translateable = mOptions.translatable;
- if (Maybe<StringPiece16> translateableAttr = xml::findAttribute(parser, u"translatable")) {
+ if (Maybe<StringPiece> translateableAttr = xml::findAttribute(parser, "translatable")) {
if (!ResourceUtils::tryParseBool(translateableAttr.value(), &translateable)) {
mDiag->error(DiagMessage(outResource->source)
<< "invalid value for 'translatable'. Must be a boolean");
@@ -1077,9 +1075,9 @@
}
const Source itemSource = mSource.withLine(parser->getLineNumber());
- const std::u16string& elementNamespace = parser->getElementNamespace();
- const std::u16string& elementName = parser->getElementName();
- if (elementNamespace.empty() && elementName == u"item") {
+ const std::string& elementNamespace = parser->getElementNamespace();
+ const std::string& elementName = parser->getElementName();
+ if (elementNamespace.empty() && elementName == "item") {
std::unique_ptr<Item> item = parseXml(parser, typeMask, kNoRawString);
if (!item) {
mDiag->error(DiagMessage(itemSource) << "could not parse array item");
@@ -1118,10 +1116,10 @@
}
const Source itemSource = mSource.withLine(parser->getLineNumber());
- const std::u16string& elementNamespace = parser->getElementNamespace();
- const std::u16string& elementName = parser->getElementName();
- if (elementNamespace.empty() && elementName == u"item") {
- Maybe<StringPiece16> maybeQuantity = xml::findNonEmptyAttribute(parser, u"quantity");
+ const std::string& elementNamespace = parser->getElementNamespace();
+ const std::string& elementName = parser->getElementName();
+ if (elementNamespace.empty() && elementName == "item") {
+ Maybe<StringPiece> maybeQuantity = xml::findNonEmptyAttribute(parser, "quantity");
if (!maybeQuantity) {
mDiag->error(DiagMessage(itemSource) << "<item> in <plurals> requires attribute "
<< "'quantity'");
@@ -1129,19 +1127,19 @@
continue;
}
- StringPiece16 trimmedQuantity = util::trimWhitespace(maybeQuantity.value());
+ StringPiece trimmedQuantity = util::trimWhitespace(maybeQuantity.value());
size_t index = 0;
- if (trimmedQuantity == u"zero") {
+ if (trimmedQuantity == "zero") {
index = Plural::Zero;
- } else if (trimmedQuantity == u"one") {
+ } else if (trimmedQuantity == "one") {
index = Plural::One;
- } else if (trimmedQuantity == u"two") {
+ } else if (trimmedQuantity == "two") {
index = Plural::Two;
- } else if (trimmedQuantity == u"few") {
+ } else if (trimmedQuantity == "few") {
index = Plural::Few;
- } else if (trimmedQuantity == u"many") {
+ } else if (trimmedQuantity == "many") {
index = Plural::Many;
- } else if (trimmedQuantity == u"other") {
+ } else if (trimmedQuantity == "other") {
index = Plural::Other;
} else {
mDiag->error(DiagMessage(itemSource)
@@ -1196,7 +1194,7 @@
std::unique_ptr<Styleable> styleable = util::make_unique<Styleable>();
- std::u16string comment;
+ std::string comment;
bool error = false;
const size_t depth = parser->getDepth();
while (xml::XmlPullParser::nextChildNode(parser, depth)) {
@@ -1209,10 +1207,10 @@
}
const Source itemSource = mSource.withLine(parser->getLineNumber());
- const std::u16string& elementNamespace = parser->getElementNamespace();
- const std::u16string& elementName = parser->getElementName();
- if (elementNamespace.empty() && elementName == u"attr") {
- Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
+ const std::string& elementNamespace = parser->getElementNamespace();
+ const std::string& elementName = parser->getElementName();
+ if (elementNamespace.empty() && elementName == "attr") {
+ Maybe<StringPiece> maybeName = xml::findNonEmptyAttribute(parser, "name");
if (!maybeName) {
mDiag->error(DiagMessage(itemSource) << "<attr> tag must have a 'name' attribute");
error = true;
@@ -1230,7 +1228,7 @@
}
Reference& childRef = maybeRef.value();
- xml::transformReferenceFromNamespace(parser, u"", &childRef);
+ xml::transformReferenceFromNamespace(parser, "", &childRef);
// Create the ParsedResource that will add the attribute to the table.
ParsedResource childResource;
diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h
index ee5b337..ece3090 100644
--- a/tools/aapt2/ResourceParser.h
+++ b/tools/aapt2/ResourceParser.h
@@ -63,7 +63,7 @@
* contains the escaped and whitespace trimmed text, while `outRawString`
* contains the unescaped text. Returns true on success.
*/
- bool flattenXmlSubtree(xml::XmlPullParser* parser, std::u16string* outRawString,
+ bool flattenXmlSubtree(xml::XmlPullParser* parser, std::string* outRawString,
StyleString* outStyleString);
/*
@@ -89,7 +89,7 @@
bool parseAttr(xml::XmlPullParser* parser, ParsedResource* outResource);
bool parseAttrImpl(xml::XmlPullParser* parser, ParsedResource* outResource, bool weak);
Maybe<Attribute::Symbol> parseEnumOrFlagItem(xml::XmlPullParser* parser,
- const StringPiece16& tag);
+ const StringPiece& tag);
bool parseStyle(xml::XmlPullParser* parser, ParsedResource* outResource);
bool parseStyleItem(xml::XmlPullParser* parser, Style* style);
bool parseDeclareStyleable(xml::XmlPullParser* parser, ParsedResource* outResource);
diff --git a/tools/aapt2/ResourceParser_test.cpp b/tools/aapt2/ResourceParser_test.cpp
index 3450de9..3d03a88 100644
--- a/tools/aapt2/ResourceParser_test.cpp
+++ b/tools/aapt2/ResourceParser_test.cpp
@@ -18,10 +18,9 @@
#include "ResourceTable.h"
#include "ResourceUtils.h"
#include "ResourceValues.h"
-#include "test/Context.h"
+#include "test/Test.h"
#include "xml/XmlPullParser.h"
-#include <gtest/gtest.h>
#include <sstream>
#include <string>
@@ -69,18 +68,18 @@
std::string input = "<string name=\"foo\"> \" hey there \" </string>";
ASSERT_TRUE(testParse(input));
- String* str = test::getValue<String>(&mTable, u"@string/foo");
+ String* str = test::getValue<String>(&mTable, "string/foo");
ASSERT_NE(nullptr, str);
- EXPECT_EQ(std::u16string(u" hey there "), *str->value);
+ EXPECT_EQ(std::string(" hey there "), *str->value);
}
TEST_F(ResourceParserTest, ParseEscapedString) {
std::string input = "<string name=\"foo\">\\?123</string>";
ASSERT_TRUE(testParse(input));
- String* str = test::getValue<String>(&mTable, u"@string/foo");
+ String* str = test::getValue<String>(&mTable, "string/foo");
ASSERT_NE(nullptr, str);
- EXPECT_EQ(std::u16string(u"?123"), *str->value);
+ EXPECT_EQ(std::string("?123"), *str->value);
}
TEST_F(ResourceParserTest, ParseFormattedString) {
@@ -97,9 +96,9 @@
" There are <xliff:g id=\"count\">%1$d</xliff:g> apples</string>";
ASSERT_TRUE(testParse(input));
- String* str = test::getValue<String>(&mTable, u"@string/foo");
+ String* str = test::getValue<String>(&mTable, "string/foo");
ASSERT_NE(nullptr, str);
- EXPECT_EQ(StringPiece16(u"There are %1$d apples"), StringPiece16(*str->value));
+ EXPECT_EQ(StringPiece("There are %1$d apples"), StringPiece(*str->value));
}
TEST_F(ResourceParserTest, ParseNull) {
@@ -110,7 +109,7 @@
// a non-existing value, and this causes problems in styles when trying to resolve
// an attribute. Null values must be encoded as android::Res_value::TYPE_REFERENCE
// with a data value of 0.
- BinaryPrimitive* integer = test::getValue<BinaryPrimitive>(&mTable, u"@integer/foo");
+ BinaryPrimitive* integer = test::getValue<BinaryPrimitive>(&mTable, "integer/foo");
ASSERT_NE(nullptr, integer);
EXPECT_EQ(uint16_t(android::Res_value::TYPE_REFERENCE), integer->value.dataType);
EXPECT_EQ(0u, integer->value.data);
@@ -120,7 +119,7 @@
std::string input = "<integer name=\"foo\">@empty</integer>";
ASSERT_TRUE(testParse(input));
- BinaryPrimitive* integer = test::getValue<BinaryPrimitive>(&mTable, u"@integer/foo");
+ BinaryPrimitive* integer = test::getValue<BinaryPrimitive>(&mTable, "integer/foo");
ASSERT_NE(nullptr, integer);
EXPECT_EQ(uint16_t(android::Res_value::TYPE_NULL), integer->value.dataType);
EXPECT_EQ(uint32_t(android::Res_value::DATA_NULL_EMPTY), integer->value.data);
@@ -131,11 +130,11 @@
"<attr name=\"bar\"/>";
ASSERT_TRUE(testParse(input));
- Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* attr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(nullptr, attr);
EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_STRING), attr->typeMask);
- attr = test::getValue<Attribute>(&mTable, u"@attr/bar");
+ attr = test::getValue<Attribute>(&mTable, "attr/bar");
ASSERT_NE(nullptr, attr);
EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_ANY), attr->typeMask);
}
@@ -151,20 +150,20 @@
</declare-styleable>)EOF";
ASSERT_TRUE(testParse(input, watchConfig));
- EXPECT_EQ(nullptr, test::getValueForConfig<Attribute>(&mTable, u"@attr/foo", watchConfig));
- EXPECT_EQ(nullptr, test::getValueForConfig<Attribute>(&mTable, u"@attr/baz", watchConfig));
- EXPECT_EQ(nullptr, test::getValueForConfig<Styleable>(&mTable, u"@styleable/bar", watchConfig));
+ EXPECT_EQ(nullptr, test::getValueForConfig<Attribute>(&mTable, "attr/foo", watchConfig));
+ EXPECT_EQ(nullptr, test::getValueForConfig<Attribute>(&mTable, "attr/baz", watchConfig));
+ EXPECT_EQ(nullptr, test::getValueForConfig<Styleable>(&mTable, "styleable/bar", watchConfig));
- EXPECT_NE(nullptr, test::getValue<Attribute>(&mTable, u"@attr/foo"));
- EXPECT_NE(nullptr, test::getValue<Attribute>(&mTable, u"@attr/baz"));
- EXPECT_NE(nullptr, test::getValue<Styleable>(&mTable, u"@styleable/bar"));
+ EXPECT_NE(nullptr, test::getValue<Attribute>(&mTable, "attr/foo"));
+ EXPECT_NE(nullptr, test::getValue<Attribute>(&mTable, "attr/baz"));
+ EXPECT_NE(nullptr, test::getValue<Styleable>(&mTable, "styleable/bar"));
}
TEST_F(ResourceParserTest, ParseAttrWithMinMax) {
std::string input = "<attr name=\"foo\" min=\"10\" max=\"23\" format=\"integer\"/>";
ASSERT_TRUE(testParse(input));
- Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* attr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(nullptr, attr);
EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_INTEGER), attr->typeMask);
EXPECT_EQ(10, attr->minInt);
@@ -183,7 +182,7 @@
"<attr name=\"foo\" format=\"string\"/>";
ASSERT_TRUE(testParse(input));
- Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* attr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(nullptr, attr);
EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_STRING), attr->typeMask);
}
@@ -197,7 +196,7 @@
"</declare-styleable>";
ASSERT_TRUE(testParse(input));
- Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* attr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(nullptr, attr);
EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_BOOLEAN), attr->typeMask);
}
@@ -210,21 +209,21 @@
"</attr>";
ASSERT_TRUE(testParse(input));
- Attribute* enumAttr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* enumAttr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(enumAttr, nullptr);
EXPECT_EQ(enumAttr->typeMask, android::ResTable_map::TYPE_ENUM);
ASSERT_EQ(enumAttr->symbols.size(), 3u);
AAPT_ASSERT_TRUE(enumAttr->symbols[0].symbol.name);
- EXPECT_EQ(enumAttr->symbols[0].symbol.name.value().entry, u"bar");
+ EXPECT_EQ(enumAttr->symbols[0].symbol.name.value().entry, "bar");
EXPECT_EQ(enumAttr->symbols[0].value, 0u);
AAPT_ASSERT_TRUE(enumAttr->symbols[1].symbol.name);
- EXPECT_EQ(enumAttr->symbols[1].symbol.name.value().entry, u"bat");
+ EXPECT_EQ(enumAttr->symbols[1].symbol.name.value().entry, "bat");
EXPECT_EQ(enumAttr->symbols[1].value, 1u);
AAPT_ASSERT_TRUE(enumAttr->symbols[2].symbol.name);
- EXPECT_EQ(enumAttr->symbols[2].symbol.name.value().entry, u"baz");
+ EXPECT_EQ(enumAttr->symbols[2].symbol.name.value().entry, "baz");
EXPECT_EQ(enumAttr->symbols[2].value, 2u);
}
@@ -236,25 +235,25 @@
"</attr>";
ASSERT_TRUE(testParse(input));
- Attribute* flagAttr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* flagAttr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(nullptr, flagAttr);
EXPECT_EQ(flagAttr->typeMask, android::ResTable_map::TYPE_FLAGS);
ASSERT_EQ(flagAttr->symbols.size(), 3u);
AAPT_ASSERT_TRUE(flagAttr->symbols[0].symbol.name);
- EXPECT_EQ(flagAttr->symbols[0].symbol.name.value().entry, u"bar");
+ EXPECT_EQ(flagAttr->symbols[0].symbol.name.value().entry, "bar");
EXPECT_EQ(flagAttr->symbols[0].value, 0u);
AAPT_ASSERT_TRUE(flagAttr->symbols[1].symbol.name);
- EXPECT_EQ(flagAttr->symbols[1].symbol.name.value().entry, u"bat");
+ EXPECT_EQ(flagAttr->symbols[1].symbol.name.value().entry, "bat");
EXPECT_EQ(flagAttr->symbols[1].value, 1u);
AAPT_ASSERT_TRUE(flagAttr->symbols[2].symbol.name);
- EXPECT_EQ(flagAttr->symbols[2].symbol.name.value().entry, u"baz");
+ EXPECT_EQ(flagAttr->symbols[2].symbol.name.value().entry, "baz");
EXPECT_EQ(flagAttr->symbols[2].value, 2u);
std::unique_ptr<BinaryPrimitive> flagValue = ResourceUtils::tryParseFlagSymbol(flagAttr,
- u"baz|bat");
+ "baz|bat");
ASSERT_NE(nullptr, flagValue);
EXPECT_EQ(flagValue->value.data, 1u | 2u);
}
@@ -276,32 +275,32 @@
"</style>";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo");
+ Style* style = test::getValue<Style>(&mTable, "style/foo");
ASSERT_NE(nullptr, style);
AAPT_ASSERT_TRUE(style->parent);
AAPT_ASSERT_TRUE(style->parent.value().name);
- EXPECT_EQ(test::parseNameOrDie(u"@style/fu"), style->parent.value().name.value());
+ EXPECT_EQ(test::parseNameOrDie("style/fu"), style->parent.value().name.value());
ASSERT_EQ(3u, style->entries.size());
AAPT_ASSERT_TRUE(style->entries[0].key.name);
- EXPECT_EQ(test::parseNameOrDie(u"@attr/bar"), style->entries[0].key.name.value());
+ EXPECT_EQ(test::parseNameOrDie("attr/bar"), style->entries[0].key.name.value());
AAPT_ASSERT_TRUE(style->entries[1].key.name);
- EXPECT_EQ(test::parseNameOrDie(u"@attr/bat"), style->entries[1].key.name.value());
+ EXPECT_EQ(test::parseNameOrDie("attr/bat"), style->entries[1].key.name.value());
AAPT_ASSERT_TRUE(style->entries[2].key.name);
- EXPECT_EQ(test::parseNameOrDie(u"@attr/baz"), style->entries[2].key.name.value());
+ EXPECT_EQ(test::parseNameOrDie("attr/baz"), style->entries[2].key.name.value());
}
TEST_F(ResourceParserTest, ParseStyleWithShorthandParent) {
std::string input = "<style name=\"foo\" parent=\"com.app:Theme\"/>";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo");
+ Style* style = test::getValue<Style>(&mTable, "style/foo");
ASSERT_NE(nullptr, style);
AAPT_ASSERT_TRUE(style->parent);
AAPT_ASSERT_TRUE(style->parent.value().name);
- EXPECT_EQ(test::parseNameOrDie(u"@com.app:style/Theme"), style->parent.value().name.value());
+ EXPECT_EQ(test::parseNameOrDie("com.app:style/Theme"), style->parent.value().name.value());
}
TEST_F(ResourceParserTest, ParseStyleWithPackageAliasedParent) {
@@ -309,11 +308,11 @@
" name=\"foo\" parent=\"app:Theme\"/>";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo");
+ Style* style = test::getValue<Style>(&mTable, "style/foo");
ASSERT_NE(nullptr, style);
AAPT_ASSERT_TRUE(style->parent);
AAPT_ASSERT_TRUE(style->parent.value().name);
- EXPECT_EQ(test::parseNameOrDie(u"@android:style/Theme"), style->parent.value().name.value());
+ EXPECT_EQ(test::parseNameOrDie("android:style/Theme"), style->parent.value().name.value());
}
TEST_F(ResourceParserTest, ParseStyleWithPackageAliasedItems) {
@@ -323,21 +322,21 @@
"</style>";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo");
+ Style* style = test::getValue<Style>(&mTable, "style/foo");
ASSERT_NE(nullptr, style);
ASSERT_EQ(1u, style->entries.size());
- EXPECT_EQ(test::parseNameOrDie(u"@android:attr/bar"), style->entries[0].key.name.value());
+ EXPECT_EQ(test::parseNameOrDie("android:attr/bar"), style->entries[0].key.name.value());
}
TEST_F(ResourceParserTest, ParseStyleWithInferredParent) {
std::string input = "<style name=\"foo.bar\"/>";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo.bar");
+ Style* style = test::getValue<Style>(&mTable, "style/foo.bar");
ASSERT_NE(nullptr, style);
AAPT_ASSERT_TRUE(style->parent);
AAPT_ASSERT_TRUE(style->parent.value().name);
- EXPECT_EQ(style->parent.value().name.value(), test::parseNameOrDie(u"@style/foo"));
+ EXPECT_EQ(style->parent.value().name.value(), test::parseNameOrDie("style/foo"));
EXPECT_TRUE(style->parentInferred);
}
@@ -345,7 +344,7 @@
std::string input = "<style name=\"foo.bar\" parent=\"\"/>";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo.bar");
+ Style* style = test::getValue<Style>(&mTable, "style/foo.bar");
ASSERT_NE(nullptr, style);
AAPT_EXPECT_FALSE(style->parent);
EXPECT_FALSE(style->parentInferred);
@@ -355,7 +354,7 @@
std::string input = R"EOF(<style name="foo" parent="*android:style/bar" />)EOF";
ASSERT_TRUE(testParse(input));
- Style* style = test::getValue<Style>(&mTable, u"@style/foo");
+ Style* style = test::getValue<Style>(&mTable, "style/foo");
ASSERT_NE(nullptr, style);
AAPT_ASSERT_TRUE(style->parent);
EXPECT_TRUE(style->parent.value().privateReference);
@@ -365,7 +364,7 @@
std::string input = "<string name=\"foo\">@+id/bar</string>";
ASSERT_TRUE(testParse(input));
- Id* id = test::getValue<Id>(&mTable, u"@id/bar");
+ Id* id = test::getValue<Id>(&mTable, "id/bar");
ASSERT_NE(id, nullptr);
}
@@ -380,31 +379,31 @@
ASSERT_TRUE(testParse(input));
Maybe<ResourceTable::SearchResult> result =
- mTable.findResource(test::parseNameOrDie(u"@styleable/foo"));
+ mTable.findResource(test::parseNameOrDie("styleable/foo"));
AAPT_ASSERT_TRUE(result);
EXPECT_EQ(SymbolState::kPublic, result.value().entry->symbolStatus.state);
- Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/bar");
+ Attribute* attr = test::getValue<Attribute>(&mTable, "attr/bar");
ASSERT_NE(attr, nullptr);
EXPECT_TRUE(attr->isWeak());
- attr = test::getValue<Attribute>(&mTable, u"@attr/bat");
+ attr = test::getValue<Attribute>(&mTable, "attr/bat");
ASSERT_NE(attr, nullptr);
EXPECT_TRUE(attr->isWeak());
- attr = test::getValue<Attribute>(&mTable, u"@attr/baz");
+ attr = test::getValue<Attribute>(&mTable, "attr/baz");
ASSERT_NE(attr, nullptr);
EXPECT_TRUE(attr->isWeak());
EXPECT_EQ(1u, attr->symbols.size());
- EXPECT_NE(nullptr, test::getValue<Id>(&mTable, u"@id/foo"));
+ EXPECT_NE(nullptr, test::getValue<Id>(&mTable, "id/foo"));
- Styleable* styleable = test::getValue<Styleable>(&mTable, u"@styleable/foo");
+ Styleable* styleable = test::getValue<Styleable>(&mTable, "styleable/foo");
ASSERT_NE(styleable, nullptr);
ASSERT_EQ(3u, styleable->entries.size());
- EXPECT_EQ(test::parseNameOrDie(u"@attr/bar"), styleable->entries[0].name.value());
- EXPECT_EQ(test::parseNameOrDie(u"@attr/bat"), styleable->entries[1].name.value());
+ EXPECT_EQ(test::parseNameOrDie("attr/bar"), styleable->entries[0].name.value());
+ EXPECT_EQ(test::parseNameOrDie("attr/bat"), styleable->entries[1].name.value());
}
TEST_F(ResourceParserTest, ParsePrivateAttributesDeclareStyleable) {
@@ -413,17 +412,17 @@
" <attr name=\"privAndroid:bat\" />\n"
"</declare-styleable>";
ASSERT_TRUE(testParse(input));
- Styleable* styleable = test::getValue<Styleable>(&mTable, u"@styleable/foo");
+ Styleable* styleable = test::getValue<Styleable>(&mTable, "styleable/foo");
ASSERT_NE(nullptr, styleable);
ASSERT_EQ(2u, styleable->entries.size());
EXPECT_TRUE(styleable->entries[0].privateReference);
AAPT_ASSERT_TRUE(styleable->entries[0].name);
- EXPECT_EQ(std::u16string(u"android"), styleable->entries[0].name.value().package);
+ EXPECT_EQ(std::string("android"), styleable->entries[0].name.value().package);
EXPECT_TRUE(styleable->entries[1].privateReference);
AAPT_ASSERT_TRUE(styleable->entries[1].name);
- EXPECT_EQ(std::u16string(u"android"), styleable->entries[1].name.value().package);
+ EXPECT_EQ(std::string("android"), styleable->entries[1].name.value().package);
}
TEST_F(ResourceParserTest, ParseArray) {
@@ -434,7 +433,7 @@
"</array>";
ASSERT_TRUE(testParse(input));
- Array* array = test::getValue<Array>(&mTable, u"@array/foo");
+ Array* array = test::getValue<Array>(&mTable, "array/foo");
ASSERT_NE(array, nullptr);
ASSERT_EQ(3u, array->items.size());
@@ -448,7 +447,7 @@
" <item>\"Werk\"</item>\n"
"</string-array>\n";
ASSERT_TRUE(testParse(input));
- EXPECT_NE(nullptr, test::getValue<Array>(&mTable, u"@array/foo"));
+ EXPECT_NE(nullptr, test::getValue<Array>(&mTable, "array/foo"));
}
TEST_F(ResourceParserTest, ParsePlural) {
@@ -464,9 +463,9 @@
"<string name=\"foo\">Hi</string>";
ASSERT_TRUE(testParse(input));
- String* value = test::getValue<String>(&mTable, u"@string/foo");
+ String* value = test::getValue<String>(&mTable, "string/foo");
ASSERT_NE(nullptr, value);
- EXPECT_EQ(value->getComment(), u"This is a comment");
+ EXPECT_EQ(value->getComment(), "This is a comment");
}
TEST_F(ResourceParserTest, DoNotCombineMultipleComments) {
@@ -476,9 +475,9 @@
ASSERT_TRUE(testParse(input));
- String* value = test::getValue<String>(&mTable, u"@string/foo");
+ String* value = test::getValue<String>(&mTable, "string/foo");
ASSERT_NE(nullptr, value);
- EXPECT_EQ(value->getComment(), u"Two");
+ EXPECT_EQ(value->getComment(), "Two");
}
TEST_F(ResourceParserTest, IgnoreCommentBeforeEndTag) {
@@ -490,9 +489,9 @@
ASSERT_TRUE(testParse(input));
- String* value = test::getValue<String>(&mTable, u"@string/foo");
+ String* value = test::getValue<String>(&mTable, "string/foo");
ASSERT_NE(nullptr, value);
- EXPECT_EQ(value->getComment(), u"One");
+ EXPECT_EQ(value->getComment(), "One");
}
TEST_F(ResourceParserTest, ParseNestedComments) {
@@ -510,17 +509,17 @@
</attr>)EOF";
ASSERT_TRUE(testParse(input));
- Styleable* styleable = test::getValue<Styleable>(&mTable, u"@styleable/foo");
+ Styleable* styleable = test::getValue<Styleable>(&mTable, "styleable/foo");
ASSERT_NE(nullptr, styleable);
ASSERT_EQ(1u, styleable->entries.size());
- EXPECT_EQ(StringPiece16(u"The name of the bar"), styleable->entries.front().getComment());
+ EXPECT_EQ(StringPiece("The name of the bar"), styleable->entries.front().getComment());
- Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ Attribute* attr = test::getValue<Attribute>(&mTable, "attr/foo");
ASSERT_NE(nullptr, attr);
ASSERT_EQ(1u, attr->symbols.size());
- EXPECT_EQ(StringPiece16(u"The very first"), attr->symbols.front().symbol.getComment());
+ EXPECT_EQ(StringPiece("The very first"), attr->symbols.front().symbol.getComment());
}
/*
@@ -531,7 +530,7 @@
std::string input = "<public type=\"id\" name=\"foo\"/>";
ASSERT_TRUE(testParse(input));
- Id* id = test::getValue<Id>(&mTable, u"@id/foo");
+ Id* id = test::getValue<Id>(&mTable, "id/foo");
ASSERT_NE(nullptr, id);
}
@@ -546,22 +545,22 @@
)EOF";
ASSERT_TRUE(testParse(input));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, u"@string/foo",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, "string/foo",
ConfigDescription::defaultConfig(),
"phone"));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, u"@string/foo",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, "string/foo",
ConfigDescription::defaultConfig(),
"no-sdcard"));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, u"@string/bar",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, "string/bar",
ConfigDescription::defaultConfig(),
""));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, u"@string/baz",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, "string/baz",
ConfigDescription::defaultConfig(),
""));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, u"@string/bit",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, "string/bit",
ConfigDescription::defaultConfig(),
"phablet"));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, u"@string/bot",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<String>(&mTable, "string/bot",
ConfigDescription::defaultConfig(),
"default"));
}
@@ -575,7 +574,7 @@
ASSERT_TRUE(testParse(input));
Maybe<ResourceTable::SearchResult> result = mTable.findResource(
- test::parseNameOrDie(u"@attr/foo"));
+ test::parseNameOrDie("attr/foo"));
AAPT_ASSERT_TRUE(result);
AAPT_ASSERT_TRUE(result.value().package->id);
@@ -586,7 +585,7 @@
result.value().entry->id.value());
EXPECT_EQ(ResourceId(0x01010040), actualId);
- result = mTable.findResource(test::parseNameOrDie(u"@attr/bar"));
+ result = mTable.findResource(test::parseNameOrDie("attr/bar"));
AAPT_ASSERT_TRUE(result);
AAPT_ASSERT_TRUE(result.value().package->id);
@@ -611,7 +610,7 @@
ASSERT_TRUE(testParse(input));
Maybe<ResourceTable::SearchResult> result = mTable.findResource(
- test::parseNameOrDie(u"@string/bar"));
+ test::parseNameOrDie("string/bar"));
AAPT_ASSERT_TRUE(result);
const ResourceEntry* entry = result.value().entry;
ASSERT_NE(nullptr, entry);
@@ -622,7 +621,7 @@
std::string input = R"EOF(<item name="foo" type="integer" format="float">0.3</item>)EOF";
ASSERT_TRUE(testParse(input));
- BinaryPrimitive* val = test::getValue<BinaryPrimitive>(&mTable, u"@integer/foo");
+ BinaryPrimitive* val = test::getValue<BinaryPrimitive>(&mTable, "integer/foo");
ASSERT_NE(nullptr, val);
EXPECT_EQ(uint32_t(android::Res_value::TYPE_FLOAT), val->value.dataType);
diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp
index e700ed9..4d418d9 100644
--- a/tools/aapt2/ResourceTable.cpp
+++ b/tools/aapt2/ResourceTable.cpp
@@ -35,11 +35,11 @@
template <typename T>
static bool lessThanStructWithName(const std::unique_ptr<T>& lhs,
- const StringPiece16& rhs) {
+ const StringPiece& rhs) {
return lhs->name.compare(0, lhs->name.size(), rhs.data(), rhs.size()) < 0;
}
-ResourceTablePackage* ResourceTable::findPackage(const StringPiece16& name) {
+ResourceTablePackage* ResourceTable::findPackage(const StringPiece& name) {
const auto last = packages.end();
auto iter = std::lower_bound(packages.begin(), last, name,
lessThanStructWithName<ResourceTablePackage>);
@@ -58,7 +58,7 @@
return nullptr;
}
-ResourceTablePackage* ResourceTable::createPackage(const StringPiece16& name, Maybe<uint8_t> id) {
+ResourceTablePackage* ResourceTable::createPackage(const StringPiece& name, Maybe<uint8_t> id) {
ResourceTablePackage* package = findOrCreatePackage(name);
if (id && !package->id) {
package->id = id;
@@ -71,7 +71,7 @@
return package;
}
-ResourceTablePackage* ResourceTable::findOrCreatePackage(const StringPiece16& name) {
+ResourceTablePackage* ResourceTable::findOrCreatePackage(const StringPiece& name) {
const auto last = packages.end();
auto iter = std::lower_bound(packages.begin(), last, name,
lessThanStructWithName<ResourceTablePackage>);
@@ -102,7 +102,7 @@
return types.emplace(iter, new ResourceTableType(type))->get();
}
-ResourceEntry* ResourceTableType::findEntry(const StringPiece16& name) {
+ResourceEntry* ResourceTableType::findEntry(const StringPiece& name) {
const auto last = entries.end();
auto iter = std::lower_bound(entries.begin(), last, name,
lessThanStructWithName<ResourceEntry>);
@@ -112,7 +112,7 @@
return nullptr;
}
-ResourceEntry* ResourceTableType::findOrCreateEntry(const StringPiece16& name) {
+ResourceEntry* ResourceTableType::findOrCreateEntry(const StringPiece& name) {
auto last = entries.end();
auto iter = std::lower_bound(entries.begin(), last, name,
lessThanStructWithName<ResourceEntry>);
@@ -261,8 +261,8 @@
return 0;
}
-static constexpr const char16_t* kValidNameChars = u"._-";
-static constexpr const char16_t* kValidNameMangledChars = u"._-$";
+static constexpr const char* kValidNameChars = "._-";
+static constexpr const char* kValidNameMangledChars = "._-$";
bool ResourceTable::addResource(const ResourceNameRef& name,
const ConfigDescription& config,
@@ -286,7 +286,7 @@
bool ResourceTable::addFileReference(const ResourceNameRef& name,
const ConfigDescription& config,
const Source& source,
- const StringPiece16& path,
+ const StringPiece& path,
IDiagnostics* diag) {
return addFileReferenceImpl(name, config, source, path, nullptr, kValidNameChars, diag);
}
@@ -294,7 +294,7 @@
bool ResourceTable::addFileReferenceAllowMangled(const ResourceNameRef& name,
const ConfigDescription& config,
const Source& source,
- const StringPiece16& path,
+ const StringPiece& path,
io::IFile* file,
IDiagnostics* diag) {
return addFileReferenceImpl(name, config, source, path, file, kValidNameMangledChars, diag);
@@ -303,9 +303,9 @@
bool ResourceTable::addFileReferenceImpl(const ResourceNameRef& name,
const ConfigDescription& config,
const Source& source,
- const StringPiece16& path,
+ const StringPiece& path,
io::IFile* file,
- const char16_t* validChars,
+ const char* validChars,
IDiagnostics* diag) {
std::unique_ptr<FileReference> fileRef = util::make_unique<FileReference>(
stringPool.makeRef(path));
@@ -339,7 +339,7 @@
const ConfigDescription& config,
const StringPiece& product,
std::unique_ptr<Value> value,
- const char16_t* validChars,
+ const char* validChars,
std::function<int(Value*,Value*)> conflictResolver,
IDiagnostics* diag) {
assert(value && "value can't be nullptr");
@@ -353,7 +353,7 @@
<< "' has invalid entry name '"
<< name.entry
<< "'. Invalid character '"
- << StringPiece16(badCharIter, 1)
+ << StringPiece(badCharIter, 1)
<< "'");
return false;
}
@@ -438,7 +438,7 @@
}
bool ResourceTable::setSymbolStateImpl(const ResourceNameRef& name, const ResourceId resId,
- const Symbol& symbol, const char16_t* validChars,
+ const Symbol& symbol, const char* validChars,
IDiagnostics* diag) {
assert(diag && "diagnostics can't be nullptr");
@@ -450,7 +450,7 @@
<< "' has invalid entry name '"
<< name.entry
<< "'. Invalid character '"
- << StringPiece16(badCharIter, 1)
+ << StringPiece(badCharIter, 1)
<< "'");
return false;
}
diff --git a/tools/aapt2/ResourceTable.h b/tools/aapt2/ResourceTable.h
index 5690ea6..a5efe35 100644
--- a/tools/aapt2/ResourceTable.h
+++ b/tools/aapt2/ResourceTable.h
@@ -48,7 +48,7 @@
struct Symbol {
SymbolState state = SymbolState::kUndefined;
Source source;
- std::u16string comment;
+ std::string comment;
};
class ResourceConfigValue {
@@ -86,7 +86,7 @@
* this determines the order of this resource
* when doing lookups.
*/
- const std::u16string name;
+ const std::string name;
/**
* The entry ID for this resource.
@@ -103,7 +103,7 @@
*/
std::vector<std::unique_ptr<ResourceConfigValue>> values;
- ResourceEntry(const StringPiece16& name) : name(name.toString()) { }
+ ResourceEntry(const StringPiece& name) : name(name.toString()) { }
ResourceConfigValue* findValue(const ConfigDescription& config);
ResourceConfigValue* findValue(const ConfigDescription& config, const StringPiece& product);
@@ -147,8 +147,8 @@
explicit ResourceTableType(const ResourceType type) : type(type) { }
- ResourceEntry* findEntry(const StringPiece16& name);
- ResourceEntry* findOrCreateEntry(const StringPiece16& name);
+ ResourceEntry* findEntry(const StringPiece& name);
+ ResourceEntry* findOrCreateEntry(const StringPiece& name);
private:
DISALLOW_COPY_AND_ASSIGN(ResourceTableType);
@@ -165,7 +165,7 @@
public:
PackageType type = PackageType::App;
Maybe<uint8_t> id;
- std::u16string name;
+ std::string name;
std::vector<std::unique_ptr<ResourceTableType>> types;
@@ -209,13 +209,13 @@
bool addFileReference(const ResourceNameRef& name,
const ConfigDescription& config,
const Source& source,
- const StringPiece16& path,
+ const StringPiece& path,
IDiagnostics* diag);
bool addFileReferenceAllowMangled(const ResourceNameRef& name,
const ConfigDescription& config,
const Source& source,
- const StringPiece16& path,
+ const StringPiece& path,
io::IFile* file,
IDiagnostics* diag);
@@ -276,21 +276,21 @@
* exist. The empty string is a valid package and typically is used to represent the
* 'current' package before it is known to the ResourceTable.
*/
- ResourceTablePackage* findPackage(const StringPiece16& name);
+ ResourceTablePackage* findPackage(const StringPiece& name);
ResourceTablePackage* findPackageById(uint8_t id);
- ResourceTablePackage* createPackage(const StringPiece16& name, Maybe<uint8_t> id = {});
+ ResourceTablePackage* createPackage(const StringPiece& name, Maybe<uint8_t> id = {});
private:
- ResourceTablePackage* findOrCreatePackage(const StringPiece16& name);
+ ResourceTablePackage* findOrCreatePackage(const StringPiece& name);
bool addFileReferenceImpl(const ResourceNameRef& name,
const ConfigDescription& config,
const Source& source,
- const StringPiece16& path,
+ const StringPiece& path,
io::IFile* file,
- const char16_t* validChars,
+ const char* validChars,
IDiagnostics* diag);
bool addResourceImpl(const ResourceNameRef& name,
@@ -298,14 +298,14 @@
const ConfigDescription& config,
const StringPiece& product,
std::unique_ptr<Value> value,
- const char16_t* validChars,
+ const char* validChars,
std::function<int(Value*,Value*)> conflictResolver,
IDiagnostics* diag);
bool setSymbolStateImpl(const ResourceNameRef& name,
ResourceId resId,
const Symbol& symbol,
- const char16_t* validChars,
+ const char* validChars,
IDiagnostics* diag);
DISALLOW_COPY_AND_ASSIGN(ResourceTable);
diff --git a/tools/aapt2/ResourceTable_test.cpp b/tools/aapt2/ResourceTable_test.cpp
index d6c52ab..4db40a6 100644
--- a/tools/aapt2/ResourceTable_test.cpp
+++ b/tools/aapt2/ResourceTable_test.cpp
@@ -17,12 +17,10 @@
#include "Diagnostics.h"
#include "ResourceTable.h"
#include "ResourceValues.h"
+#include "test/Test.h"
#include "util/Util.h"
-#include "test/Builders.h"
-
#include <algorithm>
-#include <gtest/gtest.h>
#include <ostream>
#include <string>
@@ -32,13 +30,13 @@
ResourceTable table;
EXPECT_FALSE(table.addResource(
- ResourceNameRef(u"android", ResourceType::kId, u"hey,there"),
+ test::parseNameOrDie("android:id/hey,there"),
ConfigDescription{}, "",
test::ValueBuilder<Id>().setSource("test.xml", 21u).build(),
test::getDiagnostics()));
EXPECT_FALSE(table.addResource(
- ResourceNameRef(u"android", ResourceType::kId, u"hey:there"),
+ test::parseNameOrDie("android:id/hey:there"),
ConfigDescription{}, "",
test::ValueBuilder<Id>().setSource("test.xml", 21u).build(),
test::getDiagnostics()));
@@ -47,14 +45,13 @@
TEST(ResourceTableTest, AddOneResource) {
ResourceTable table;
- EXPECT_TRUE(table.addResource(test::parseNameOrDie(u"@android:attr/id"),
- ConfigDescription{},
- "",
- test::ValueBuilder<Id>()
- .setSource("test/path/file.xml", 23u).build(),
- test::getDiagnostics()));
+ EXPECT_TRUE(table.addResource(
+ test::parseNameOrDie("android:attr/id"),
+ ConfigDescription{}, "",
+ test::ValueBuilder<Id>().setSource("test/path/file.xml", 23u).build(),
+ test::getDiagnostics()));
- ASSERT_NE(nullptr, test::getValue<Id>(&table, u"@android:attr/id"));
+ ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:attr/id"));
}
TEST(ResourceTableTest, AddMultipleResources) {
@@ -65,56 +62,58 @@
memcpy(languageConfig.language, "pl", sizeof(languageConfig.language));
EXPECT_TRUE(table.addResource(
- test::parseNameOrDie(u"@android:attr/layout_width"),
- config,
- "",
+ test::parseNameOrDie("android:attr/layout_width"),
+ config, "",
test::ValueBuilder<Id>().setSource("test/path/file.xml", 10u).build(),
test::getDiagnostics()));
EXPECT_TRUE(table.addResource(
- test::parseNameOrDie(u"@android:attr/id"),
- config,
- "",
+ test::parseNameOrDie("android:attr/id"),
+ config, "",
test::ValueBuilder<Id>().setSource("test/path/file.xml", 12u).build(),
test::getDiagnostics()));
EXPECT_TRUE(table.addResource(
- test::parseNameOrDie(u"@android:string/ok"),
- config,
- "",
+ test::parseNameOrDie("android:string/ok"),
+ config, "",
test::ValueBuilder<Id>().setSource("test/path/file.xml", 14u).build(),
test::getDiagnostics()));
EXPECT_TRUE(table.addResource(
- test::parseNameOrDie(u"@android:string/ok"),
- languageConfig,
- "",
+ test::parseNameOrDie("android:string/ok"),
+ languageConfig, "",
test::ValueBuilder<BinaryPrimitive>(android::Res_value{})
.setSource("test/path/file.xml", 20u)
.build(),
test::getDiagnostics()));
- ASSERT_NE(nullptr, test::getValue<Id>(&table, u"@android:attr/layout_width"));
- ASSERT_NE(nullptr, test::getValue<Id>(&table, u"@android:attr/id"));
- ASSERT_NE(nullptr, test::getValue<Id>(&table, u"@android:string/ok"));
- ASSERT_NE(nullptr, test::getValueForConfig<BinaryPrimitive>(&table, u"@android:string/ok",
+ ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:attr/layout_width"));
+ ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:attr/id"));
+ ASSERT_NE(nullptr, test::getValue<Id>(&table, "android:string/ok"));
+ ASSERT_NE(nullptr, test::getValueForConfig<BinaryPrimitive>(&table, "android:string/ok",
languageConfig));
}
TEST(ResourceTableTest, OverrideWeakResourceValue) {
ResourceTable table;
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:attr/foo"), ConfigDescription{},
- "", util::make_unique<Attribute>(true), test::getDiagnostics()));
+ ASSERT_TRUE(table.addResource(
+ test::parseNameOrDie("android:attr/foo"),
+ ConfigDescription{}, "",
+ util::make_unique<Attribute>(true),
+ test::getDiagnostics()));
- Attribute* attr = test::getValue<Attribute>(&table, u"@android:attr/foo");
+ Attribute* attr = test::getValue<Attribute>(&table, "android:attr/foo");
ASSERT_NE(nullptr, attr);
EXPECT_TRUE(attr->isWeak());
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:attr/foo"), ConfigDescription{},
- "", util::make_unique<Attribute>(false), test::getDiagnostics()));
+ ASSERT_TRUE(table.addResource(
+ test::parseNameOrDie("android:attr/foo"),
+ ConfigDescription{}, "",
+ util::make_unique<Attribute>(false),
+ test::getDiagnostics()));
- attr = test::getValue<Attribute>(&table, u"@android:attr/foo");
+ attr = test::getValue<Attribute>(&table, "android:attr/foo");
ASSERT_NE(nullptr, attr);
EXPECT_FALSE(attr->isWeak());
}
@@ -122,26 +121,24 @@
TEST(ResourceTableTest, ProductVaryingValues) {
ResourceTable table;
- EXPECT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/foo"),
- test::parseConfigOrDie("land"),
- "tablet",
+ EXPECT_TRUE(table.addResource(test::parseNameOrDie("android:string/foo"),
+ test::parseConfigOrDie("land"), "tablet",
util::make_unique<Id>(),
test::getDiagnostics()));
- EXPECT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/foo"),
- test::parseConfigOrDie("land"),
- "phone",
+ EXPECT_TRUE(table.addResource(test::parseNameOrDie("android:string/foo"),
+ test::parseConfigOrDie("land"), "phone",
util::make_unique<Id>(),
test::getDiagnostics()));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/foo",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/foo",
test::parseConfigOrDie("land"),
"tablet"));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/foo",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/foo",
test::parseConfigOrDie("land"),
"phone"));
Maybe<ResourceTable::SearchResult> sr = table.findResource(
- test::parseNameOrDie(u"@android:string/foo"));
+ test::parseNameOrDie("android:string/foo"));
AAPT_ASSERT_TRUE(sr);
std::vector<ResourceConfigValue*> values = sr.value().entry->findAllValues(
test::parseConfigOrDie("land"));
diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp
index a0a7efc..7dc88ded 100644
--- a/tools/aapt2/ResourceUtils.cpp
+++ b/tools/aapt2/ResourceUtils.cpp
@@ -16,6 +16,7 @@
#include "NameMangler.h"
#include "ResourceUtils.h"
+#include "SdkConstants.h"
#include "flatten/ResourceTypeExtensions.h"
#include "util/Files.h"
#include "util/Util.h"
@@ -26,19 +27,52 @@
namespace aapt {
namespace ResourceUtils {
-bool extractResourceName(const StringPiece16& str, StringPiece16* outPackage,
- StringPiece16* outType, StringPiece16* outEntry) {
+Maybe<ResourceName> toResourceName(const android::ResTable::resource_name& nameIn) {
+ ResourceName nameOut;
+ if (!nameIn.package) {
+ return {};
+ }
+
+ nameOut.package = util::utf16ToUtf8(StringPiece16(nameIn.package, nameIn.packageLen));
+
+ const ResourceType* type;
+ if (nameIn.type) {
+ type = parseResourceType(util::utf16ToUtf8(StringPiece16(nameIn.type, nameIn.typeLen)));
+ } else if (nameIn.type8) {
+ type = parseResourceType(StringPiece(nameIn.type8, nameIn.typeLen));
+ } else {
+ return {};
+ }
+
+ if (!type) {
+ return {};
+ }
+
+ nameOut.type = *type;
+
+ if (nameIn.name) {
+ nameOut.entry = util::utf16ToUtf8(StringPiece16(nameIn.name, nameIn.nameLen));
+ } else if (nameIn.name8) {
+ nameOut.entry = StringPiece(nameIn.name8, nameIn.nameLen).toString();
+ } else {
+ return {};
+ }
+ return nameOut;
+}
+
+bool extractResourceName(const StringPiece& str, StringPiece* outPackage,
+ StringPiece* outType, StringPiece* outEntry) {
bool hasPackageSeparator = false;
bool hasTypeSeparator = false;
- const char16_t* start = str.data();
- const char16_t* end = start + str.size();
- const char16_t* current = start;
+ const char* start = str.data();
+ const char* end = start + str.size();
+ const char* current = start;
while (current != end) {
- if (outType->size() == 0 && *current == u'/') {
+ if (outType->size() == 0 && *current == '/') {
hasTypeSeparator = true;
outType->assign(start, current - start);
start = current + 1;
- } else if (outPackage->size() == 0 && *current == u':') {
+ } else if (outPackage->size() == 0 && *current == ':') {
hasPackageSeparator = true;
outPackage->assign(start, current - start);
start = current + 1;
@@ -50,21 +84,21 @@
return !(hasPackageSeparator && outPackage->empty()) && !(hasTypeSeparator && outType->empty());
}
-bool parseResourceName(const StringPiece16& str, ResourceNameRef* outRef, bool* outPrivate) {
+bool parseResourceName(const StringPiece& str, ResourceNameRef* outRef, bool* outPrivate) {
if (str.empty()) {
return false;
}
size_t offset = 0;
bool priv = false;
- if (str.data()[0] == u'*') {
+ if (str.data()[0] == '*') {
priv = true;
offset = 1;
}
- StringPiece16 package;
- StringPiece16 type;
- StringPiece16 entry;
+ StringPiece package;
+ StringPiece type;
+ StringPiece entry;
if (!extractResourceName(str.substr(offset, str.size() - offset), &package, &type, &entry)) {
return false;
}
@@ -90,18 +124,18 @@
return true;
}
-bool tryParseReference(const StringPiece16& str, ResourceNameRef* outRef, bool* outCreate,
+bool tryParseReference(const StringPiece& str, ResourceNameRef* outRef, bool* outCreate,
bool* outPrivate) {
- StringPiece16 trimmedStr(util::trimWhitespace(str));
+ StringPiece trimmedStr(util::trimWhitespace(str));
if (trimmedStr.empty()) {
return false;
}
bool create = false;
bool priv = false;
- if (trimmedStr.data()[0] == u'@') {
+ if (trimmedStr.data()[0] == '@') {
size_t offset = 1;
- if (trimmedStr.data()[1] == u'+') {
+ if (trimmedStr.data()[1] == '+') {
create = true;
offset += 1;
}
@@ -136,26 +170,26 @@
return false;
}
-bool isReference(const StringPiece16& str) {
+bool isReference(const StringPiece& str) {
return tryParseReference(str, nullptr, nullptr, nullptr);
}
-bool tryParseAttributeReference(const StringPiece16& str, ResourceNameRef* outRef) {
- StringPiece16 trimmedStr(util::trimWhitespace(str));
+bool tryParseAttributeReference(const StringPiece& str, ResourceNameRef* outRef) {
+ StringPiece trimmedStr(util::trimWhitespace(str));
if (trimmedStr.empty()) {
return false;
}
- if (*trimmedStr.data() == u'?') {
- StringPiece16 package;
- StringPiece16 type;
- StringPiece16 entry;
+ if (*trimmedStr.data() == '?') {
+ StringPiece package;
+ StringPiece type;
+ StringPiece entry;
if (!extractResourceName(trimmedStr.substr(1, trimmedStr.size() - 1),
&package, &type, &entry)) {
return false;
}
- if (!type.empty() && type != u"attr") {
+ if (!type.empty() && type != "attr") {
return false;
}
@@ -173,7 +207,7 @@
return false;
}
-bool isAttributeReference(const StringPiece16& str) {
+bool isAttributeReference(const StringPiece& str) {
return tryParseAttributeReference(str, nullptr);
}
@@ -185,23 +219,23 @@
* <[*]package>:[style/]<entry>
* [[*]package:style/]<entry>
*/
-Maybe<Reference> parseStyleParentReference(const StringPiece16& str, std::string* outError) {
+Maybe<Reference> parseStyleParentReference(const StringPiece& str, std::string* outError) {
if (str.empty()) {
return {};
}
- StringPiece16 name = str;
+ StringPiece name = str;
bool hasLeadingIdentifiers = false;
bool privateRef = false;
// Skip over these identifiers. A style's parent is a normal reference.
- if (name.data()[0] == u'@' || name.data()[0] == u'?') {
+ if (name.data()[0] == '@' || name.data()[0] == '?') {
hasLeadingIdentifiers = true;
name = name.substr(1, name.size() - 1);
}
- if (name.data()[0] == u'*') {
+ if (name.data()[0] == '*') {
privateRef = true;
name = name.substr(1, name.size() - 1);
}
@@ -209,7 +243,7 @@
ResourceNameRef ref;
ref.type = ResourceType::kStyle;
- StringPiece16 typeStr;
+ StringPiece typeStr;
extractResourceName(name, &ref.package, &typeStr, &ref.entry);
if (!typeStr.empty()) {
// If we have a type, make sure it is a Style.
@@ -234,7 +268,7 @@
return result;
}
-std::unique_ptr<Reference> tryParseReference(const StringPiece16& str, bool* outCreate) {
+std::unique_ptr<Reference> tryParseReference(const StringPiece& str, bool* outCreate) {
ResourceNameRef ref;
bool privateRef = false;
if (tryParseReference(str, &ref, outCreate, &privateRef)) {
@@ -252,14 +286,14 @@
return {};
}
-std::unique_ptr<BinaryPrimitive> tryParseNullOrEmpty(const StringPiece16& str) {
- StringPiece16 trimmedStr(util::trimWhitespace(str));
+std::unique_ptr<BinaryPrimitive> tryParseNullOrEmpty(const StringPiece& str) {
+ StringPiece trimmedStr(util::trimWhitespace(str));
android::Res_value value = { };
- if (trimmedStr == u"@null") {
+ if (trimmedStr == "@null") {
// TYPE_NULL with data set to 0 is interpreted by the runtime as an error.
// Instead we set the data type to TYPE_REFERENCE with a value of 0.
value.dataType = android::Res_value::TYPE_REFERENCE;
- } else if (trimmedStr == u"@empty") {
+ } else if (trimmedStr == "@empty") {
// TYPE_NULL with value of DATA_NULL_EMPTY is handled fine by the runtime.
value.dataType = android::Res_value::TYPE_NULL;
value.data = android::Res_value::DATA_NULL_EMPTY;
@@ -270,8 +304,8 @@
}
std::unique_ptr<BinaryPrimitive> tryParseEnumSymbol(const Attribute* enumAttr,
- const StringPiece16& str) {
- StringPiece16 trimmedStr(util::trimWhitespace(str));
+ const StringPiece& str) {
+ StringPiece trimmedStr(util::trimWhitespace(str));
for (const Attribute::Symbol& symbol : enumAttr->symbols) {
// Enum symbols are stored as @package:id/symbol resources,
// so we need to match against the 'entry' part of the identifier.
@@ -287,7 +321,7 @@
}
std::unique_ptr<BinaryPrimitive> tryParseFlagSymbol(const Attribute* flagAttr,
- const StringPiece16& str) {
+ const StringPiece& str) {
android::Res_value flags = { };
flags.dataType = android::Res_value::TYPE_INT_HEX;
flags.data = 0u;
@@ -297,8 +331,8 @@
return util::make_unique<BinaryPrimitive>(flags);
}
- for (StringPiece16 part : util::tokenize(str, u'|')) {
- StringPiece16 trimmedPart = util::trimWhitespace(part);
+ for (StringPiece part : util::tokenize(str, '|')) {
+ StringPiece trimmedPart = util::trimWhitespace(part);
bool flagSet = false;
for (const Attribute::Symbol& symbol : flagAttr->symbols) {
@@ -319,24 +353,24 @@
return util::make_unique<BinaryPrimitive>(flags);
}
-static uint32_t parseHex(char16_t c, bool* outError) {
- if (c >= u'0' && c <= u'9') {
- return c - u'0';
- } else if (c >= u'a' && c <= u'f') {
- return c - u'a' + 0xa;
- } else if (c >= u'A' && c <= u'F') {
- return c - u'A' + 0xa;
+static uint32_t parseHex(char c, bool* outError) {
+ if (c >= '0' && c <= '9') {
+ return c - '0';
+ } else if (c >= 'a' && c <= 'f') {
+ return c - 'a' + 0xa;
+ } else if (c >= 'A' && c <= 'F') {
+ return c - 'A' + 0xa;
} else {
*outError = true;
return 0xffffffffu;
}
}
-std::unique_ptr<BinaryPrimitive> tryParseColor(const StringPiece16& str) {
- StringPiece16 colorStr(util::trimWhitespace(str));
- const char16_t* start = colorStr.data();
+std::unique_ptr<BinaryPrimitive> tryParseColor(const StringPiece& str) {
+ StringPiece colorStr(util::trimWhitespace(str));
+ const char* start = colorStr.data();
const size_t len = colorStr.size();
- if (len == 0 || start[0] != u'#') {
+ if (len == 0 || start[0] != '#') {
return {};
}
@@ -386,14 +420,14 @@
return error ? std::unique_ptr<BinaryPrimitive>() : util::make_unique<BinaryPrimitive>(value);
}
-bool tryParseBool(const StringPiece16& str, bool* outValue) {
- StringPiece16 trimmedStr(util::trimWhitespace(str));
- if (trimmedStr == u"true" || trimmedStr == u"TRUE" || trimmedStr == u"True") {
+bool tryParseBool(const StringPiece& str, bool* outValue) {
+ StringPiece trimmedStr(util::trimWhitespace(str));
+ if (trimmedStr == "true" || trimmedStr == "TRUE" || trimmedStr == "True") {
if (outValue) {
*outValue = true;
}
return true;
- } else if (trimmedStr == u"false" || trimmedStr == u"FALSE" || trimmedStr == u"False") {
+ } else if (trimmedStr == "false" || trimmedStr == "FALSE" || trimmedStr == "False") {
if (outValue) {
*outValue = false;
}
@@ -402,7 +436,40 @@
return false;
}
-std::unique_ptr<BinaryPrimitive> tryParseBool(const StringPiece16& str) {
+Maybe<ResourceId> tryParseResourceId(const StringPiece& str) {
+ StringPiece trimmedStr(util::trimWhitespace(str));
+
+ std::u16string str16 = util::utf8ToUtf16(trimmedStr);
+ android::Res_value value;
+ if (android::ResTable::stringToInt(str16.data(), str16.size(), &value)) {
+ if (value.dataType == android::Res_value::TYPE_INT_HEX) {
+ ResourceId id(value.data);
+ if (id.isValid()) {
+ return id;
+ }
+ }
+ }
+ return {};
+}
+
+Maybe<int> tryParseSdkVersion(const StringPiece& str) {
+ StringPiece trimmedStr(util::trimWhitespace(str));
+
+ std::u16string str16 = util::utf8ToUtf16(trimmedStr);
+ android::Res_value value;
+ if (android::ResTable::stringToInt(str16.data(), str16.size(), &value)) {
+ return static_cast<int>(value.data);
+ }
+
+ // Try parsing the code name.
+ std::pair<StringPiece, int> entry = getDevelopmentSdkCodeNameAndVersion();
+ if (entry.first == trimmedStr) {
+ return entry.second;
+ }
+ return {};
+}
+
+std::unique_ptr<BinaryPrimitive> tryParseBool(const StringPiece& str) {
bool result = false;
if (tryParseBool(str, &result)) {
android::Res_value value = {};
@@ -418,17 +485,19 @@
return {};
}
-std::unique_ptr<BinaryPrimitive> tryParseInt(const StringPiece16& str) {
+std::unique_ptr<BinaryPrimitive> tryParseInt(const StringPiece& str) {
+ std::u16string str16 = util::utf8ToUtf16(str);
android::Res_value value;
- if (!android::ResTable::stringToInt(str.data(), str.size(), &value)) {
+ if (!android::ResTable::stringToInt(str16.data(), str16.size(), &value)) {
return {};
}
return util::make_unique<BinaryPrimitive>(value);
}
-std::unique_ptr<BinaryPrimitive> tryParseFloat(const StringPiece16& str) {
+std::unique_ptr<BinaryPrimitive> tryParseFloat(const StringPiece& str) {
+ std::u16string str16 = util::utf8ToUtf16(str);
android::Res_value value;
- if (!android::ResTable::stringToFloat(str.data(), str.size(), &value)) {
+ if (!android::ResTable::stringToFloat(str16.data(), str16.size(), &value)) {
return {};
}
return util::make_unique<BinaryPrimitive>(value);
@@ -474,7 +543,8 @@
}
std::unique_ptr<Item> parseItemForAttribute(
- const StringPiece16& value, uint32_t typeMask,
+ const StringPiece& value,
+ uint32_t typeMask,
std::function<void(const ResourceName&)> onCreateReference) {
std::unique_ptr<BinaryPrimitive> nullOrEmpty = tryParseNullOrEmpty(value);
if (nullOrEmpty) {
@@ -533,7 +603,7 @@
* allows.
*/
std::unique_ptr<Item> parseItemForAttribute(
- const StringPiece16& str, const Attribute* attr,
+ const StringPiece& str, const Attribute* attr,
std::function<void(const ResourceName&)> onCreateReference) {
const uint32_t typeMask = attr->typeMask;
std::unique_ptr<Item> value = parseItemForAttribute(str, typeMask, onCreateReference);
diff --git a/tools/aapt2/ResourceUtils.h b/tools/aapt2/ResourceUtils.h
index a0fbcc6..31b8e89 100644
--- a/tools/aapt2/ResourceUtils.h
+++ b/tools/aapt2/ResourceUtils.h
@@ -28,6 +28,11 @@
namespace aapt {
namespace ResourceUtils {
+/**
+ * Convert an android::ResTable::resource_name to an aapt::ResourceName struct.
+ */
+Maybe<ResourceName> toResourceName(const android::ResTable::resource_name& name);
+
/*
* Extracts the package, type, and name from a string of the format:
*
@@ -37,15 +42,15 @@
* individual extracted piece to verify that the pieces are valid.
* Returns false if there was no package but a ':' was present.
*/
-bool extractResourceName(const StringPiece16& str, StringPiece16* outPackage,
- StringPiece16* outType, StringPiece16* outEntry);
+bool extractResourceName(const StringPiece& str, StringPiece* outPackage,
+ StringPiece* outType, StringPiece* outEntry);
/**
* Returns true if the string was parsed as a resource name ([*][package:]type/name), with
* `outResource` set to the parsed resource name and `outPrivate` set to true if a '*' prefix
* was present.
*/
-bool parseResourceName(const StringPiece16& str, ResourceNameRef* outResource,
+bool parseResourceName(const StringPiece& str, ResourceNameRef* outResource,
bool* outPrivate = nullptr);
/*
@@ -55,29 +60,39 @@
* If '+' was present in the reference, `outCreate` is set to true.
* If '*' was present in the reference, `outPrivate` is set to true.
*/
-bool tryParseReference(const StringPiece16& str, ResourceNameRef* outReference,
+bool tryParseReference(const StringPiece& str, ResourceNameRef* outReference,
bool* outCreate = nullptr, bool* outPrivate = nullptr);
/*
* Returns true if the string is in the form of a resource reference (@[+][package:]type/name).
*/
-bool isReference(const StringPiece16& str);
+bool isReference(const StringPiece& str);
/*
* Returns true if the string was parsed as an attribute reference (?[package:][type/]name),
* with `outReference` set to the parsed reference.
*/
-bool tryParseAttributeReference(const StringPiece16& str, ResourceNameRef* outReference);
+bool tryParseAttributeReference(const StringPiece& str, ResourceNameRef* outReference);
/**
* Returns true if the string is in the form of an attribute reference(?[package:][type/]name).
*/
-bool isAttributeReference(const StringPiece16& str);
+bool isAttributeReference(const StringPiece& str);
/**
* Returns true if the value is a boolean, putting the result in `outValue`.
*/
-bool tryParseBool(const StringPiece16& str, bool* outValue);
+bool tryParseBool(const StringPiece& str, bool* outValue);
+
+/**
+ * Returns an ID if it the string represented a valid ID.
+ */
+Maybe<ResourceId> tryParseResourceId(const StringPiece& str);
+
+/**
+ * Parses an SDK version, which can be an integer, or a letter from A-Z.
+ */
+Maybe<int> tryParseSdkVersion(const StringPiece& str);
/*
* Returns a Reference, or None Maybe instance if the string `str` was parsed as a
@@ -88,58 +103,58 @@
* ?[package:]style/<entry> or
* <package>:[style/]<entry>
*/
-Maybe<Reference> parseStyleParentReference(const StringPiece16& str, std::string* outError);
+Maybe<Reference> parseStyleParentReference(const StringPiece& str, std::string* outError);
/*
* Returns a Reference object if the string was parsed as a resource or attribute reference,
* ( @[+][package:]type/name | ?[package:]type/name ) setting outCreate to true if
* the '+' was present in the string.
*/
-std::unique_ptr<Reference> tryParseReference(const StringPiece16& str, bool* outCreate = nullptr);
+std::unique_ptr<Reference> tryParseReference(const StringPiece& str, bool* outCreate = nullptr);
/*
* Returns a BinaryPrimitve object representing @null or @empty if the string was parsed
* as one.
*/
-std::unique_ptr<BinaryPrimitive> tryParseNullOrEmpty(const StringPiece16& str);
+std::unique_ptr<BinaryPrimitive> tryParseNullOrEmpty(const StringPiece& str);
/*
* Returns a BinaryPrimitve object representing a color if the string was parsed
* as one.
*/
-std::unique_ptr<BinaryPrimitive> tryParseColor(const StringPiece16& str);
+std::unique_ptr<BinaryPrimitive> tryParseColor(const StringPiece& str);
/*
* Returns a BinaryPrimitve object representing a boolean if the string was parsed
* as one.
*/
-std::unique_ptr<BinaryPrimitive> tryParseBool(const StringPiece16& str);
+std::unique_ptr<BinaryPrimitive> tryParseBool(const StringPiece& str);
/*
* Returns a BinaryPrimitve object representing an integer if the string was parsed
* as one.
*/
-std::unique_ptr<BinaryPrimitive> tryParseInt(const StringPiece16& str);
+std::unique_ptr<BinaryPrimitive> tryParseInt(const StringPiece& str);
/*
* Returns a BinaryPrimitve object representing a floating point number
* (float, dimension, etc) if the string was parsed as one.
*/
-std::unique_ptr<BinaryPrimitive> tryParseFloat(const StringPiece16& str);
+std::unique_ptr<BinaryPrimitive> tryParseFloat(const StringPiece& str);
/*
* Returns a BinaryPrimitve object representing an enum symbol if the string was parsed
* as one.
*/
std::unique_ptr<BinaryPrimitive> tryParseEnumSymbol(const Attribute* enumAttr,
- const StringPiece16& str);
+ const StringPiece& str);
/*
* Returns a BinaryPrimitve object representing a flag symbol if the string was parsed
* as one.
*/
std::unique_ptr<BinaryPrimitive> tryParseFlagSymbol(const Attribute* enumAttr,
- const StringPiece16& str);
+ const StringPiece& str);
/*
* Try to convert a string to an Item for the given attribute. The attribute will
* restrict what values the string can be converted to.
@@ -147,11 +162,11 @@
* reference to an ID that must be created (@+id/foo).
*/
std::unique_ptr<Item> parseItemForAttribute(
- const StringPiece16& value, const Attribute* attr,
+ const StringPiece& value, const Attribute* attr,
std::function<void(const ResourceName&)> onCreateReference = {});
std::unique_ptr<Item> parseItemForAttribute(
- const StringPiece16& value, uint32_t typeMask,
+ const StringPiece& value, uint32_t typeMask,
std::function<void(const ResourceName&)> onCreateReference = {});
uint32_t androidTypeToAttributeTypeMask(uint16_t type);
diff --git a/tools/aapt2/ResourceUtils_test.cpp b/tools/aapt2/ResourceUtils_test.cpp
index 7425f97..fb76914 100644
--- a/tools/aapt2/ResourceUtils_test.cpp
+++ b/tools/aapt2/ResourceUtils_test.cpp
@@ -16,69 +16,66 @@
#include "Resource.h"
#include "ResourceUtils.h"
-#include "test/Builders.h"
-#include "test/Common.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
TEST(ResourceUtilsTest, ParseBool) {
bool val = false;
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"true", &val));
+ EXPECT_TRUE(ResourceUtils::tryParseBool("true", &val));
EXPECT_TRUE(val);
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"TRUE", &val));
+ EXPECT_TRUE(ResourceUtils::tryParseBool("TRUE", &val));
EXPECT_TRUE(val);
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"True", &val));
+ EXPECT_TRUE(ResourceUtils::tryParseBool("True", &val));
EXPECT_TRUE(val);
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"false", &val));
+ EXPECT_TRUE(ResourceUtils::tryParseBool("false", &val));
EXPECT_FALSE(val);
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"FALSE", &val));
+ EXPECT_TRUE(ResourceUtils::tryParseBool("FALSE", &val));
EXPECT_FALSE(val);
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"False", &val));
+ EXPECT_TRUE(ResourceUtils::tryParseBool("False", &val));
EXPECT_FALSE(val);
}
TEST(ResourceUtilsTest, ParseResourceName) {
ResourceNameRef actual;
bool actualPriv = false;
- EXPECT_TRUE(ResourceUtils::parseResourceName(u"android:color/foo", &actual, &actualPriv));
- EXPECT_EQ(ResourceNameRef(u"android", ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(ResourceUtils::parseResourceName("android:color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef("android", ResourceType::kColor, "foo"), actual);
EXPECT_FALSE(actualPriv);
- EXPECT_TRUE(ResourceUtils::parseResourceName(u"color/foo", &actual, &actualPriv));
- EXPECT_EQ(ResourceNameRef({}, ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(ResourceUtils::parseResourceName("color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef({}, ResourceType::kColor, "foo"), actual);
EXPECT_FALSE(actualPriv);
- EXPECT_TRUE(ResourceUtils::parseResourceName(u"*android:color/foo", &actual, &actualPriv));
- EXPECT_EQ(ResourceNameRef(u"android", ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(ResourceUtils::parseResourceName("*android:color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef("android", ResourceType::kColor, "foo"), actual);
EXPECT_TRUE(actualPriv);
- EXPECT_FALSE(ResourceUtils::parseResourceName(StringPiece16(), &actual, &actualPriv));
+ EXPECT_FALSE(ResourceUtils::parseResourceName(StringPiece(), &actual, &actualPriv));
}
TEST(ResourceUtilsTest, ParseReferenceWithNoPackage) {
- ResourceNameRef expected({}, ResourceType::kColor, u"foo");
+ ResourceNameRef expected({}, ResourceType::kColor, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@color/foo", &actual, &create, &privateRef));
+ EXPECT_TRUE(ResourceUtils::tryParseReference("@color/foo", &actual, &create, &privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
EXPECT_FALSE(privateRef);
}
TEST(ResourceUtilsTest, ParseReferenceWithPackage) {
- ResourceNameRef expected(u"android", ResourceType::kColor, u"foo");
+ ResourceNameRef expected("android", ResourceType::kColor, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@android:color/foo", &actual, &create,
+ EXPECT_TRUE(ResourceUtils::tryParseReference("@android:color/foo", &actual, &create,
&privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
@@ -86,11 +83,11 @@
}
TEST(ResourceUtilsTest, ParseReferenceWithSurroundingWhitespace) {
- ResourceNameRef expected(u"android", ResourceType::kColor, u"foo");
+ ResourceNameRef expected("android", ResourceType::kColor, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"\t @android:color/foo\n \n\t", &actual,
+ EXPECT_TRUE(ResourceUtils::tryParseReference("\t @android:color/foo\n \n\t", &actual,
&create, &privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
@@ -98,11 +95,11 @@
}
TEST(ResourceUtilsTest, ParseAutoCreateIdReference) {
- ResourceNameRef expected(u"android", ResourceType::kId, u"foo");
+ ResourceNameRef expected("android", ResourceType::kId, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@+android:id/foo", &actual, &create,
+ EXPECT_TRUE(ResourceUtils::tryParseReference("@+android:id/foo", &actual, &create,
&privateRef));
EXPECT_EQ(expected, actual);
EXPECT_TRUE(create);
@@ -110,11 +107,11 @@
}
TEST(ResourceUtilsTest, ParsePrivateReference) {
- ResourceNameRef expected(u"android", ResourceType::kId, u"foo");
+ ResourceNameRef expected("android", ResourceType::kId, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@*android:id/foo", &actual, &create,
+ EXPECT_TRUE(ResourceUtils::tryParseReference("@*android:id/foo", &actual, &create,
&privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
@@ -125,68 +122,68 @@
bool create = false;
bool privateRef = false;
ResourceNameRef actual;
- EXPECT_FALSE(ResourceUtils::tryParseReference(u"@+android:color/foo", &actual, &create,
+ EXPECT_FALSE(ResourceUtils::tryParseReference("@+android:color/foo", &actual, &create,
&privateRef));
}
TEST(ResourceUtilsTest, ParseAttributeReferences) {
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android"));
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android:foo"));
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?attr/foo"));
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android:attr/foo"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference("?android"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference("?android:foo"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference("?attr/foo"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference("?android:attr/foo"));
}
TEST(ResourceUtilsTest, FailParseIncompleteReference) {
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?style/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:style/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:attr/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:attr/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:attr/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?attr/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?style/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?android:style/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?android:"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?android:attr/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?:attr/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?:attr/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?:/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?:/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?attr/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference("?/foo"));
}
TEST(ResourceUtilsTest, ParseStyleParentReference) {
- const ResourceName kAndroidStyleFooName(u"android", ResourceType::kStyle, u"foo");
- const ResourceName kStyleFooName({}, ResourceType::kStyle, u"foo");
+ const ResourceName kAndroidStyleFooName("android", ResourceType::kStyle, "foo");
+ const ResourceName kStyleFooName({}, ResourceType::kStyle, "foo");
std::string errStr;
- Maybe<Reference> ref = ResourceUtils::parseStyleParentReference(u"@android:style/foo", &errStr);
+ Maybe<Reference> ref = ResourceUtils::parseStyleParentReference("@android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"@style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("@style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"?android:style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("?android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"?style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("?style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"android:style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"android:foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("android:foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"@android:foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("@android:foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"*android:style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("*android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
EXPECT_TRUE(ref.value().privateReference);
@@ -195,11 +192,11 @@
TEST(ResourceUtilsTest, ParseEmptyFlag) {
std::unique_ptr<Attribute> attr = test::AttributeBuilder(false)
.setTypeMask(android::ResTable_map::TYPE_FLAGS)
- .addItem(u"one", 0x01)
- .addItem(u"two", 0x02)
+ .addItem("one", 0x01)
+ .addItem("two", 0x02)
.build();
- std::unique_ptr<BinaryPrimitive> result = ResourceUtils::tryParseFlagSymbol(attr.get(), u"");
+ std::unique_ptr<BinaryPrimitive> result = ResourceUtils::tryParseFlagSymbol(attr.get(), "");
ASSERT_NE(nullptr, result);
EXPECT_EQ(0u, result->value.data);
}
diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp
index c10b134..4a86579 100644
--- a/tools/aapt2/ResourceValues.cpp
+++ b/tools/aapt2/ResourceValues.cpp
@@ -21,6 +21,7 @@
#include "io/File.h"
#include "util/Util.h"
+#include <algorithm>
#include <androidfw/ResourceTypes.h>
#include <limits>
@@ -302,18 +303,42 @@
mWeak = w;
}
+template <typename T>
+T* addPointer(T& val) {
+ return &val;
+}
+
bool Attribute::equals(const Value* value) const {
const Attribute* other = valueCast<Attribute>(value);
if (!other) {
return false;
}
- return this->typeMask == other->typeMask && this->minInt == other->minInt &&
- this->maxInt == other->maxInt &&
- std::equal(this->symbols.begin(), this->symbols.end(),
- other->symbols.begin(),
- [](const Symbol& a, const Symbol& b) -> bool {
- return a.symbol.equals(&b.symbol) && a.value == b.value;
+ if (symbols.size() != other->symbols.size()) {
+ return false;
+ }
+
+ if (typeMask != other->typeMask || minInt != other->minInt || maxInt != other->maxInt) {
+ return false;
+ }
+
+ std::vector<const Symbol*> sortedA;
+ std::transform(symbols.begin(), symbols.end(),
+ std::back_inserter(sortedA), addPointer<const Symbol>);
+ std::sort(sortedA.begin(), sortedA.end(), [](const Symbol* a, const Symbol* b) -> bool {
+ return a->symbol.name < b->symbol.name;
+ });
+
+ std::vector<const Symbol*> sortedB;
+ std::transform(other->symbols.begin(), other->symbols.end(),
+ std::back_inserter(sortedB), addPointer<const Symbol>);
+ std::sort(sortedB.begin(), sortedB.end(), [](const Symbol* a, const Symbol* b) -> bool {
+ return a->symbol.name < b->symbol.name;
+ });
+
+ return std::equal(sortedA.begin(), sortedA.end(), sortedB.begin(),
+ [](const Symbol* a, const Symbol* b) -> bool {
+ return a->symbol.equals(&b->symbol) && a->value == b->value;
});
}
@@ -526,9 +551,28 @@
(parent && other->parent && !parent.value().equals(&other->parent.value()))) {
return false;
}
- return std::equal(entries.begin(), entries.end(), other->entries.begin(),
- [](const Entry& a, const Entry& b) -> bool {
- return a.key.equals(&b.key) && a.value->equals(b.value.get());
+
+ if (entries.size() != other->entries.size()) {
+ return false;
+ }
+
+ std::vector<const Entry*> sortedA;
+ std::transform(entries.begin(), entries.end(),
+ std::back_inserter(sortedA), addPointer<const Entry>);
+ std::sort(sortedA.begin(), sortedA.end(), [](const Entry* a, const Entry* b) -> bool {
+ return a->key.name < b->key.name;
+ });
+
+ std::vector<const Entry*> sortedB;
+ std::transform(other->entries.begin(), other->entries.end(),
+ std::back_inserter(sortedB), addPointer<const Entry>);
+ std::sort(sortedB.begin(), sortedB.end(), [](const Entry* a, const Entry* b) -> bool {
+ return a->key.name < b->key.name;
+ });
+
+ return std::equal(sortedA.begin(), sortedA.end(), sortedB.begin(),
+ [](const Entry* a, const Entry* b) -> bool {
+ return a->key.equals(&b->key) && a->value->equals(b->value.get());
});
}
@@ -563,6 +607,8 @@
static ::std::ostream& operator<<(::std::ostream& out, const Style::Entry& value) {
if (value.key.name) {
out << value.key.name.value();
+ } else if (value.key.id) {
+ out << value.key.id.value();
} else {
out << "???";
}
@@ -577,6 +623,10 @@
return false;
}
+ if (items.size() != other->items.size()) {
+ return false;
+ }
+
return std::equal(items.begin(), items.end(), other->items.begin(),
[](const std::unique_ptr<Item>& a, const std::unique_ptr<Item>& b) -> bool {
return a->equals(b.get());
@@ -605,6 +655,10 @@
return false;
}
+ if (values.size() != other->values.size()) {
+ return false;
+ }
+
return std::equal(values.begin(), values.end(), other->values.begin(),
[](const std::unique_ptr<Item>& a, const std::unique_ptr<Item>& b) -> bool {
if (bool(a) != bool(b)) {
@@ -659,6 +713,11 @@
if (!other) {
return false;
}
+
+ if (entries.size() != other->entries.size()) {
+ return false;
+ }
+
return std::equal(entries.begin(), entries.end(), other->entries.begin(),
[](const Reference& a, const Reference& b) -> bool {
return a.equals(&b);
diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h
index aa1b550..8ae71ad 100644
--- a/tools/aapt2/ResourceValues.h
+++ b/tools/aapt2/ResourceValues.h
@@ -84,15 +84,15 @@
/**
* Returns the comment that was associated with this resource.
*/
- StringPiece16 getComment() const {
+ const std::string& getComment() const {
return mComment;
}
- void setComment(const StringPiece16& str) {
+ void setComment(const StringPiece& str) {
mComment = str.toString();
}
- void setComment(std::u16string&& str) {
+ void setComment(std::string&& str) {
mComment = std::move(str);
}
@@ -115,7 +115,7 @@
protected:
Source mSource;
- std::u16string mComment;
+ std::string mComment;
bool mWeak = false;
bool mTranslateable = true;
};
diff --git a/tools/aapt2/Resource_test.cpp b/tools/aapt2/Resource_test.cpp
index 48dc521..06cddc7 100644
--- a/tools/aapt2/Resource_test.cpp
+++ b/tools/aapt2/Resource_test.cpp
@@ -14,102 +14,101 @@
* limitations under the License.
*/
-#include <gtest/gtest.h>
-
#include "Resource.h"
+#include "test/Test.h"
namespace aapt {
TEST(ResourceTypeTest, ParseResourceTypes) {
- const ResourceType* type = parseResourceType(u"anim");
+ const ResourceType* type = parseResourceType("anim");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kAnim);
- type = parseResourceType(u"animator");
+ type = parseResourceType("animator");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kAnimator);
- type = parseResourceType(u"array");
+ type = parseResourceType("array");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kArray);
- type = parseResourceType(u"attr");
+ type = parseResourceType("attr");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kAttr);
- type = parseResourceType(u"^attr-private");
+ type = parseResourceType("^attr-private");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kAttrPrivate);
- type = parseResourceType(u"bool");
+ type = parseResourceType("bool");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kBool);
- type = parseResourceType(u"color");
+ type = parseResourceType("color");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kColor);
- type = parseResourceType(u"dimen");
+ type = parseResourceType("dimen");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kDimen);
- type = parseResourceType(u"drawable");
+ type = parseResourceType("drawable");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kDrawable);
- type = parseResourceType(u"fraction");
+ type = parseResourceType("fraction");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kFraction);
- type = parseResourceType(u"id");
+ type = parseResourceType("id");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kId);
- type = parseResourceType(u"integer");
+ type = parseResourceType("integer");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kInteger);
- type = parseResourceType(u"interpolator");
+ type = parseResourceType("interpolator");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kInterpolator);
- type = parseResourceType(u"layout");
+ type = parseResourceType("layout");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kLayout);
- type = parseResourceType(u"menu");
+ type = parseResourceType("menu");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kMenu);
- type = parseResourceType(u"mipmap");
+ type = parseResourceType("mipmap");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kMipmap);
- type = parseResourceType(u"plurals");
+ type = parseResourceType("plurals");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kPlurals);
- type = parseResourceType(u"raw");
+ type = parseResourceType("raw");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kRaw);
- type = parseResourceType(u"string");
+ type = parseResourceType("string");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kString);
- type = parseResourceType(u"style");
+ type = parseResourceType("style");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kStyle);
- type = parseResourceType(u"transition");
+ type = parseResourceType("transition");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kTransition);
- type = parseResourceType(u"xml");
+ type = parseResourceType("xml");
ASSERT_NE(type, nullptr);
EXPECT_EQ(*type, ResourceType::kXml);
- type = parseResourceType(u"blahaha");
+ type = parseResourceType("blahaha");
EXPECT_EQ(type, nullptr);
}
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index c2a22bf..91e755d 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -23,6 +23,9 @@
namespace aapt {
+static const char* sDevelopmentSdkCodeName = "O";
+static int sDevelopmentSdkLevel = 26;
+
static const std::vector<std::pair<uint16_t, size_t>> sAttrIdMap = {
{ 0x021c, 1 },
{ 0x021d, 2 },
@@ -60,671 +63,671 @@
return iter->second;
}
-static const std::unordered_map<std::u16string, size_t> sAttrMap = {
- { u"marqueeRepeatLimit", 2 },
- { u"windowNoDisplay", 3 },
- { u"backgroundDimEnabled", 3 },
- { u"inputType", 3 },
- { u"isDefault", 3 },
- { u"windowDisablePreview", 3 },
- { u"privateImeOptions", 3 },
- { u"editorExtras", 3 },
- { u"settingsActivity", 3 },
- { u"fastScrollEnabled", 3 },
- { u"reqTouchScreen", 3 },
- { u"reqKeyboardType", 3 },
- { u"reqHardKeyboard", 3 },
- { u"reqNavigation", 3 },
- { u"windowSoftInputMode", 3 },
- { u"imeFullscreenBackground", 3 },
- { u"noHistory", 3 },
- { u"headerDividersEnabled", 3 },
- { u"footerDividersEnabled", 3 },
- { u"candidatesTextStyleSpans", 3 },
- { u"smoothScrollbar", 3 },
- { u"reqFiveWayNav", 3 },
- { u"keyBackground", 3 },
- { u"keyTextSize", 3 },
- { u"labelTextSize", 3 },
- { u"keyTextColor", 3 },
- { u"keyPreviewLayout", 3 },
- { u"keyPreviewOffset", 3 },
- { u"keyPreviewHeight", 3 },
- { u"verticalCorrection", 3 },
- { u"popupLayout", 3 },
- { u"state_long_pressable", 3 },
- { u"keyWidth", 3 },
- { u"keyHeight", 3 },
- { u"horizontalGap", 3 },
- { u"verticalGap", 3 },
- { u"rowEdgeFlags", 3 },
- { u"codes", 3 },
- { u"popupKeyboard", 3 },
- { u"popupCharacters", 3 },
- { u"keyEdgeFlags", 3 },
- { u"isModifier", 3 },
- { u"isSticky", 3 },
- { u"isRepeatable", 3 },
- { u"iconPreview", 3 },
- { u"keyOutputText", 3 },
- { u"keyLabel", 3 },
- { u"keyIcon", 3 },
- { u"keyboardMode", 3 },
- { u"isScrollContainer", 3 },
- { u"fillEnabled", 3 },
- { u"updatePeriodMillis", 3 },
- { u"initialLayout", 3 },
- { u"voiceSearchMode", 3 },
- { u"voiceLanguageModel", 3 },
- { u"voicePromptText", 3 },
- { u"voiceLanguage", 3 },
- { u"voiceMaxResults", 3 },
- { u"bottomOffset", 3 },
- { u"topOffset", 3 },
- { u"allowSingleTap", 3 },
- { u"handle", 3 },
- { u"content", 3 },
- { u"animateOnClick", 3 },
- { u"configure", 3 },
- { u"hapticFeedbackEnabled", 3 },
- { u"innerRadius", 3 },
- { u"thickness", 3 },
- { u"sharedUserLabel", 3 },
- { u"dropDownWidth", 3 },
- { u"dropDownAnchor", 3 },
- { u"imeOptions", 3 },
- { u"imeActionLabel", 3 },
- { u"imeActionId", 3 },
- { u"imeExtractEnterAnimation", 3 },
- { u"imeExtractExitAnimation", 3 },
- { u"tension", 4 },
- { u"extraTension", 4 },
- { u"anyDensity", 4 },
- { u"searchSuggestThreshold", 4 },
- { u"includeInGlobalSearch", 4 },
- { u"onClick", 4 },
- { u"targetSdkVersion", 4 },
- { u"maxSdkVersion", 4 },
- { u"testOnly", 4 },
- { u"contentDescription", 4 },
- { u"gestureStrokeWidth", 4 },
- { u"gestureColor", 4 },
- { u"uncertainGestureColor", 4 },
- { u"fadeOffset", 4 },
- { u"fadeDuration", 4 },
- { u"gestureStrokeType", 4 },
- { u"gestureStrokeLengthThreshold", 4 },
- { u"gestureStrokeSquarenessThreshold", 4 },
- { u"gestureStrokeAngleThreshold", 4 },
- { u"eventsInterceptionEnabled", 4 },
- { u"fadeEnabled", 4 },
- { u"backupAgent", 4 },
- { u"allowBackup", 4 },
- { u"glEsVersion", 4 },
- { u"queryAfterZeroResults", 4 },
- { u"dropDownHeight", 4 },
- { u"smallScreens", 4 },
- { u"normalScreens", 4 },
- { u"largeScreens", 4 },
- { u"progressBarStyleInverse", 4 },
- { u"progressBarStyleSmallInverse", 4 },
- { u"progressBarStyleLargeInverse", 4 },
- { u"searchSettingsDescription", 4 },
- { u"textColorPrimaryInverseDisableOnly", 4 },
- { u"autoUrlDetect", 4 },
- { u"resizeable", 4 },
- { u"required", 5 },
- { u"accountType", 5 },
- { u"contentAuthority", 5 },
- { u"userVisible", 5 },
- { u"windowShowWallpaper", 5 },
- { u"wallpaperOpenEnterAnimation", 5 },
- { u"wallpaperOpenExitAnimation", 5 },
- { u"wallpaperCloseEnterAnimation", 5 },
- { u"wallpaperCloseExitAnimation", 5 },
- { u"wallpaperIntraOpenEnterAnimation", 5 },
- { u"wallpaperIntraOpenExitAnimation", 5 },
- { u"wallpaperIntraCloseEnterAnimation", 5 },
- { u"wallpaperIntraCloseExitAnimation", 5 },
- { u"supportsUploading", 5 },
- { u"killAfterRestore", 5 },
- { u"restoreNeedsApplication", 5 },
- { u"smallIcon", 5 },
- { u"accountPreferences", 5 },
- { u"textAppearanceSearchResultSubtitle", 5 },
- { u"textAppearanceSearchResultTitle", 5 },
- { u"summaryColumn", 5 },
- { u"detailColumn", 5 },
- { u"detailSocialSummary", 5 },
- { u"thumbnail", 5 },
- { u"detachWallpaper", 5 },
- { u"finishOnCloseSystemDialogs", 5 },
- { u"scrollbarFadeDuration", 5 },
- { u"scrollbarDefaultDelayBeforeFade", 5 },
- { u"fadeScrollbars", 5 },
- { u"colorBackgroundCacheHint", 5 },
- { u"dropDownHorizontalOffset", 5 },
- { u"dropDownVerticalOffset", 5 },
- { u"quickContactBadgeStyleWindowSmall", 6 },
- { u"quickContactBadgeStyleWindowMedium", 6 },
- { u"quickContactBadgeStyleWindowLarge", 6 },
- { u"quickContactBadgeStyleSmallWindowSmall", 6 },
- { u"quickContactBadgeStyleSmallWindowMedium", 6 },
- { u"quickContactBadgeStyleSmallWindowLarge", 6 },
- { u"author", 7 },
- { u"autoStart", 7 },
- { u"expandableListViewWhiteStyle", 8 },
- { u"installLocation", 8 },
- { u"vmSafeMode", 8 },
- { u"webTextViewStyle", 8 },
- { u"restoreAnyVersion", 8 },
- { u"tabStripLeft", 8 },
- { u"tabStripRight", 8 },
- { u"tabStripEnabled", 8 },
- { u"logo", 9 },
- { u"xlargeScreens", 9 },
- { u"immersive", 9 },
- { u"overScrollMode", 9 },
- { u"overScrollHeader", 9 },
- { u"overScrollFooter", 9 },
- { u"filterTouchesWhenObscured", 9 },
- { u"textSelectHandleLeft", 9 },
- { u"textSelectHandleRight", 9 },
- { u"textSelectHandle", 9 },
- { u"textSelectHandleWindowStyle", 9 },
- { u"popupAnimationStyle", 9 },
- { u"screenSize", 9 },
- { u"screenDensity", 9 },
- { u"allContactsName", 11 },
- { u"windowActionBar", 11 },
- { u"actionBarStyle", 11 },
- { u"navigationMode", 11 },
- { u"displayOptions", 11 },
- { u"subtitle", 11 },
- { u"customNavigationLayout", 11 },
- { u"hardwareAccelerated", 11 },
- { u"measureWithLargestChild", 11 },
- { u"animateFirstView", 11 },
- { u"dropDownSpinnerStyle", 11 },
- { u"actionDropDownStyle", 11 },
- { u"actionButtonStyle", 11 },
- { u"showAsAction", 11 },
- { u"previewImage", 11 },
- { u"actionModeBackground", 11 },
- { u"actionModeCloseDrawable", 11 },
- { u"windowActionModeOverlay", 11 },
- { u"valueFrom", 11 },
- { u"valueTo", 11 },
- { u"valueType", 11 },
- { u"propertyName", 11 },
- { u"ordering", 11 },
- { u"fragment", 11 },
- { u"windowActionBarOverlay", 11 },
- { u"fragmentOpenEnterAnimation", 11 },
- { u"fragmentOpenExitAnimation", 11 },
- { u"fragmentCloseEnterAnimation", 11 },
- { u"fragmentCloseExitAnimation", 11 },
- { u"fragmentFadeEnterAnimation", 11 },
- { u"fragmentFadeExitAnimation", 11 },
- { u"actionBarSize", 11 },
- { u"imeSubtypeLocale", 11 },
- { u"imeSubtypeMode", 11 },
- { u"imeSubtypeExtraValue", 11 },
- { u"splitMotionEvents", 11 },
- { u"listChoiceBackgroundIndicator", 11 },
- { u"spinnerMode", 11 },
- { u"animateLayoutChanges", 11 },
- { u"actionBarTabStyle", 11 },
- { u"actionBarTabBarStyle", 11 },
- { u"actionBarTabTextStyle", 11 },
- { u"actionOverflowButtonStyle", 11 },
- { u"actionModeCloseButtonStyle", 11 },
- { u"titleTextStyle", 11 },
- { u"subtitleTextStyle", 11 },
- { u"iconifiedByDefault", 11 },
- { u"actionLayout", 11 },
- { u"actionViewClass", 11 },
- { u"activatedBackgroundIndicator", 11 },
- { u"state_activated", 11 },
- { u"listPopupWindowStyle", 11 },
- { u"popupMenuStyle", 11 },
- { u"textAppearanceLargePopupMenu", 11 },
- { u"textAppearanceSmallPopupMenu", 11 },
- { u"breadCrumbTitle", 11 },
- { u"breadCrumbShortTitle", 11 },
- { u"listDividerAlertDialog", 11 },
- { u"textColorAlertDialogListItem", 11 },
- { u"loopViews", 11 },
- { u"dialogTheme", 11 },
- { u"alertDialogTheme", 11 },
- { u"dividerVertical", 11 },
- { u"homeAsUpIndicator", 11 },
- { u"enterFadeDuration", 11 },
- { u"exitFadeDuration", 11 },
- { u"selectableItemBackground", 11 },
- { u"autoAdvanceViewId", 11 },
- { u"useIntrinsicSizeAsMinimum", 11 },
- { u"actionModeCutDrawable", 11 },
- { u"actionModeCopyDrawable", 11 },
- { u"actionModePasteDrawable", 11 },
- { u"textEditPasteWindowLayout", 11 },
- { u"textEditNoPasteWindowLayout", 11 },
- { u"textIsSelectable", 11 },
- { u"windowEnableSplitTouch", 11 },
- { u"indeterminateProgressStyle", 11 },
- { u"progressBarPadding", 11 },
- { u"animationResolution", 11 },
- { u"state_accelerated", 11 },
- { u"baseline", 11 },
- { u"homeLayout", 11 },
- { u"opacity", 11 },
- { u"alpha", 11 },
- { u"transformPivotX", 11 },
- { u"transformPivotY", 11 },
- { u"translationX", 11 },
- { u"translationY", 11 },
- { u"scaleX", 11 },
- { u"scaleY", 11 },
- { u"rotation", 11 },
- { u"rotationX", 11 },
- { u"rotationY", 11 },
- { u"showDividers", 11 },
- { u"dividerPadding", 11 },
- { u"borderlessButtonStyle", 11 },
- { u"dividerHorizontal", 11 },
- { u"itemPadding", 11 },
- { u"buttonBarStyle", 11 },
- { u"buttonBarButtonStyle", 11 },
- { u"segmentedButtonStyle", 11 },
- { u"staticWallpaperPreview", 11 },
- { u"allowParallelSyncs", 11 },
- { u"isAlwaysSyncable", 11 },
- { u"verticalScrollbarPosition", 11 },
- { u"fastScrollAlwaysVisible", 11 },
- { u"fastScrollThumbDrawable", 11 },
- { u"fastScrollPreviewBackgroundLeft", 11 },
- { u"fastScrollPreviewBackgroundRight", 11 },
- { u"fastScrollTrackDrawable", 11 },
- { u"fastScrollOverlayPosition", 11 },
- { u"customTokens", 11 },
- { u"nextFocusForward", 11 },
- { u"firstDayOfWeek", 11 },
- { u"showWeekNumber", 11 },
- { u"minDate", 11 },
- { u"maxDate", 11 },
- { u"shownWeekCount", 11 },
- { u"selectedWeekBackgroundColor", 11 },
- { u"focusedMonthDateColor", 11 },
- { u"unfocusedMonthDateColor", 11 },
- { u"weekNumberColor", 11 },
- { u"weekSeparatorLineColor", 11 },
- { u"selectedDateVerticalBar", 11 },
- { u"weekDayTextAppearance", 11 },
- { u"dateTextAppearance", 11 },
- { u"solidColor", 11 },
- { u"spinnersShown", 11 },
- { u"calendarViewShown", 11 },
- { u"state_multiline", 11 },
- { u"detailsElementBackground", 11 },
- { u"textColorHighlightInverse", 11 },
- { u"textColorLinkInverse", 11 },
- { u"editTextColor", 11 },
- { u"editTextBackground", 11 },
- { u"horizontalScrollViewStyle", 11 },
- { u"layerType", 11 },
- { u"alertDialogIcon", 11 },
- { u"windowMinWidthMajor", 11 },
- { u"windowMinWidthMinor", 11 },
- { u"queryHint", 11 },
- { u"fastScrollTextColor", 11 },
- { u"largeHeap", 11 },
- { u"windowCloseOnTouchOutside", 11 },
- { u"datePickerStyle", 11 },
- { u"calendarViewStyle", 11 },
- { u"textEditSidePasteWindowLayout", 11 },
- { u"textEditSideNoPasteWindowLayout", 11 },
- { u"actionMenuTextAppearance", 11 },
- { u"actionMenuTextColor", 11 },
- { u"textCursorDrawable", 12 },
- { u"resizeMode", 12 },
- { u"requiresSmallestWidthDp", 12 },
- { u"compatibleWidthLimitDp", 12 },
- { u"largestWidthLimitDp", 12 },
- { u"state_hovered", 13 },
- { u"state_drag_can_accept", 13 },
- { u"state_drag_hovered", 13 },
- { u"stopWithTask", 13 },
- { u"switchTextOn", 13 },
- { u"switchTextOff", 13 },
- { u"switchPreferenceStyle", 13 },
- { u"switchTextAppearance", 13 },
- { u"track", 13 },
- { u"switchMinWidth", 13 },
- { u"switchPadding", 13 },
- { u"thumbTextPadding", 13 },
- { u"textSuggestionsWindowStyle", 13 },
- { u"textEditSuggestionItemLayout", 13 },
- { u"rowCount", 13 },
- { u"rowOrderPreserved", 13 },
- { u"columnCount", 13 },
- { u"columnOrderPreserved", 13 },
- { u"useDefaultMargins", 13 },
- { u"alignmentMode", 13 },
- { u"layout_row", 13 },
- { u"layout_rowSpan", 13 },
- { u"layout_columnSpan", 13 },
- { u"actionModeSelectAllDrawable", 13 },
- { u"isAuxiliary", 13 },
- { u"accessibilityEventTypes", 13 },
- { u"packageNames", 13 },
- { u"accessibilityFeedbackType", 13 },
- { u"notificationTimeout", 13 },
- { u"accessibilityFlags", 13 },
- { u"canRetrieveWindowContent", 13 },
- { u"listPreferredItemHeightLarge", 13 },
- { u"listPreferredItemHeightSmall", 13 },
- { u"actionBarSplitStyle", 13 },
- { u"actionProviderClass", 13 },
- { u"backgroundStacked", 13 },
- { u"backgroundSplit", 13 },
- { u"textAllCaps", 13 },
- { u"colorPressedHighlight", 13 },
- { u"colorLongPressedHighlight", 13 },
- { u"colorFocusedHighlight", 13 },
- { u"colorActivatedHighlight", 13 },
- { u"colorMultiSelectHighlight", 13 },
- { u"drawableStart", 13 },
- { u"drawableEnd", 13 },
- { u"actionModeStyle", 13 },
- { u"minResizeWidth", 13 },
- { u"minResizeHeight", 13 },
- { u"actionBarWidgetTheme", 13 },
- { u"uiOptions", 13 },
- { u"subtypeLocale", 13 },
- { u"subtypeExtraValue", 13 },
- { u"actionBarDivider", 13 },
- { u"actionBarItemBackground", 13 },
- { u"actionModeSplitBackground", 13 },
- { u"textAppearanceListItem", 13 },
- { u"textAppearanceListItemSmall", 13 },
- { u"targetDescriptions", 13 },
- { u"directionDescriptions", 13 },
- { u"overridesImplicitlyEnabledSubtype", 13 },
- { u"listPreferredItemPaddingLeft", 13 },
- { u"listPreferredItemPaddingRight", 13 },
- { u"requiresFadingEdge", 13 },
- { u"publicKey", 13 },
- { u"parentActivityName", 16 },
- { u"isolatedProcess", 16 },
- { u"importantForAccessibility", 16 },
- { u"keyboardLayout", 16 },
- { u"fontFamily", 16 },
- { u"mediaRouteButtonStyle", 16 },
- { u"mediaRouteTypes", 16 },
- { u"supportsRtl", 17 },
- { u"textDirection", 17 },
- { u"textAlignment", 17 },
- { u"layoutDirection", 17 },
- { u"paddingStart", 17 },
- { u"paddingEnd", 17 },
- { u"layout_marginStart", 17 },
- { u"layout_marginEnd", 17 },
- { u"layout_toStartOf", 17 },
- { u"layout_toEndOf", 17 },
- { u"layout_alignStart", 17 },
- { u"layout_alignEnd", 17 },
- { u"layout_alignParentStart", 17 },
- { u"layout_alignParentEnd", 17 },
- { u"listPreferredItemPaddingStart", 17 },
- { u"listPreferredItemPaddingEnd", 17 },
- { u"singleUser", 17 },
- { u"presentationTheme", 17 },
- { u"subtypeId", 17 },
- { u"initialKeyguardLayout", 17 },
- { u"widgetCategory", 17 },
- { u"permissionGroupFlags", 17 },
- { u"labelFor", 17 },
- { u"permissionFlags", 17 },
- { u"checkedTextViewStyle", 17 },
- { u"showOnLockScreen", 17 },
- { u"format12Hour", 17 },
- { u"format24Hour", 17 },
- { u"timeZone", 17 },
- { u"mipMap", 18 },
- { u"mirrorForRtl", 18 },
- { u"windowOverscan", 18 },
- { u"requiredForAllUsers", 18 },
- { u"indicatorStart", 18 },
- { u"indicatorEnd", 18 },
- { u"childIndicatorStart", 18 },
- { u"childIndicatorEnd", 18 },
- { u"restrictedAccountType", 18 },
- { u"requiredAccountType", 18 },
- { u"canRequestTouchExplorationMode", 18 },
- { u"canRequestEnhancedWebAccessibility", 18 },
- { u"canRequestFilterKeyEvents", 18 },
- { u"layoutMode", 18 },
- { u"keySet", 19 },
- { u"targetId", 19 },
- { u"fromScene", 19 },
- { u"toScene", 19 },
- { u"transition", 19 },
- { u"transitionOrdering", 19 },
- { u"fadingMode", 19 },
- { u"startDelay", 19 },
- { u"ssp", 19 },
- { u"sspPrefix", 19 },
- { u"sspPattern", 19 },
- { u"addPrintersActivity", 19 },
- { u"vendor", 19 },
- { u"category", 19 },
- { u"isAsciiCapable", 19 },
- { u"autoMirrored", 19 },
- { u"supportsSwitchingToNextInputMethod", 19 },
- { u"requireDeviceUnlock", 19 },
- { u"apduServiceBanner", 19 },
- { u"accessibilityLiveRegion", 19 },
- { u"windowTranslucentStatus", 19 },
- { u"windowTranslucentNavigation", 19 },
- { u"advancedPrintOptionsActivity", 19 },
- { u"banner", 20 },
- { u"windowSwipeToDismiss", 20 },
- { u"isGame", 20 },
- { u"allowEmbedded", 20 },
- { u"setupActivity", 20 },
- { u"fastScrollStyle", 21 },
- { u"windowContentTransitions", 21 },
- { u"windowContentTransitionManager", 21 },
- { u"translationZ", 21 },
- { u"tintMode", 21 },
- { u"controlX1", 21 },
- { u"controlY1", 21 },
- { u"controlX2", 21 },
- { u"controlY2", 21 },
- { u"transitionName", 21 },
- { u"transitionGroup", 21 },
- { u"viewportWidth", 21 },
- { u"viewportHeight", 21 },
- { u"fillColor", 21 },
- { u"pathData", 21 },
- { u"strokeColor", 21 },
- { u"strokeWidth", 21 },
- { u"trimPathStart", 21 },
- { u"trimPathEnd", 21 },
- { u"trimPathOffset", 21 },
- { u"strokeLineCap", 21 },
- { u"strokeLineJoin", 21 },
- { u"strokeMiterLimit", 21 },
- { u"colorControlNormal", 21 },
- { u"colorControlActivated", 21 },
- { u"colorButtonNormal", 21 },
- { u"colorControlHighlight", 21 },
- { u"persistableMode", 21 },
- { u"titleTextAppearance", 21 },
- { u"subtitleTextAppearance", 21 },
- { u"slideEdge", 21 },
- { u"actionBarTheme", 21 },
- { u"textAppearanceListItemSecondary", 21 },
- { u"colorPrimary", 21 },
- { u"colorPrimaryDark", 21 },
- { u"colorAccent", 21 },
- { u"nestedScrollingEnabled", 21 },
- { u"windowEnterTransition", 21 },
- { u"windowExitTransition", 21 },
- { u"windowSharedElementEnterTransition", 21 },
- { u"windowSharedElementExitTransition", 21 },
- { u"windowAllowReturnTransitionOverlap", 21 },
- { u"windowAllowEnterTransitionOverlap", 21 },
- { u"sessionService", 21 },
- { u"stackViewStyle", 21 },
- { u"switchStyle", 21 },
- { u"elevation", 21 },
- { u"excludeId", 21 },
- { u"excludeClass", 21 },
- { u"hideOnContentScroll", 21 },
- { u"actionOverflowMenuStyle", 21 },
- { u"documentLaunchMode", 21 },
- { u"maxRecents", 21 },
- { u"autoRemoveFromRecents", 21 },
- { u"stateListAnimator", 21 },
- { u"toId", 21 },
- { u"fromId", 21 },
- { u"reversible", 21 },
- { u"splitTrack", 21 },
- { u"targetName", 21 },
- { u"excludeName", 21 },
- { u"matchOrder", 21 },
- { u"windowDrawsSystemBarBackgrounds", 21 },
- { u"statusBarColor", 21 },
- { u"navigationBarColor", 21 },
- { u"contentInsetStart", 21 },
- { u"contentInsetEnd", 21 },
- { u"contentInsetLeft", 21 },
- { u"contentInsetRight", 21 },
- { u"paddingMode", 21 },
- { u"layout_rowWeight", 21 },
- { u"layout_columnWeight", 21 },
- { u"translateX", 21 },
- { u"translateY", 21 },
- { u"selectableItemBackgroundBorderless", 21 },
- { u"elegantTextHeight", 21 },
- { u"searchKeyphraseId", 21 },
- { u"searchKeyphrase", 21 },
- { u"searchKeyphraseSupportedLocales", 21 },
- { u"windowTransitionBackgroundFadeDuration", 21 },
- { u"overlapAnchor", 21 },
- { u"progressTint", 21 },
- { u"progressTintMode", 21 },
- { u"progressBackgroundTint", 21 },
- { u"progressBackgroundTintMode", 21 },
- { u"secondaryProgressTint", 21 },
- { u"secondaryProgressTintMode", 21 },
- { u"indeterminateTint", 21 },
- { u"indeterminateTintMode", 21 },
- { u"backgroundTint", 21 },
- { u"backgroundTintMode", 21 },
- { u"foregroundTint", 21 },
- { u"foregroundTintMode", 21 },
- { u"buttonTint", 21 },
- { u"buttonTintMode", 21 },
- { u"thumbTint", 21 },
- { u"thumbTintMode", 21 },
- { u"fullBackupOnly", 21 },
- { u"propertyXName", 21 },
- { u"propertyYName", 21 },
- { u"relinquishTaskIdentity", 21 },
- { u"tileModeX", 21 },
- { u"tileModeY", 21 },
- { u"actionModeShareDrawable", 21 },
- { u"actionModeFindDrawable", 21 },
- { u"actionModeWebSearchDrawable", 21 },
- { u"transitionVisibilityMode", 21 },
- { u"minimumHorizontalAngle", 21 },
- { u"minimumVerticalAngle", 21 },
- { u"maximumAngle", 21 },
- { u"searchViewStyle", 21 },
- { u"closeIcon", 21 },
- { u"goIcon", 21 },
- { u"searchIcon", 21 },
- { u"voiceIcon", 21 },
- { u"commitIcon", 21 },
- { u"suggestionRowLayout", 21 },
- { u"queryBackground", 21 },
- { u"submitBackground", 21 },
- { u"buttonBarPositiveButtonStyle", 21 },
- { u"buttonBarNeutralButtonStyle", 21 },
- { u"buttonBarNegativeButtonStyle", 21 },
- { u"popupElevation", 21 },
- { u"actionBarPopupTheme", 21 },
- { u"multiArch", 21 },
- { u"touchscreenBlocksFocus", 21 },
- { u"windowElevation", 21 },
- { u"launchTaskBehindTargetAnimation", 21 },
- { u"launchTaskBehindSourceAnimation", 21 },
- { u"restrictionType", 21 },
- { u"dayOfWeekBackground", 21 },
- { u"dayOfWeekTextAppearance", 21 },
- { u"headerMonthTextAppearance", 21 },
- { u"headerDayOfMonthTextAppearance", 21 },
- { u"headerYearTextAppearance", 21 },
- { u"yearListItemTextAppearance", 21 },
- { u"yearListSelectorColor", 21 },
- { u"calendarTextColor", 21 },
- { u"recognitionService", 21 },
- { u"timePickerStyle", 21 },
- { u"timePickerDialogTheme", 21 },
- { u"headerTimeTextAppearance", 21 },
- { u"headerAmPmTextAppearance", 21 },
- { u"numbersTextColor", 21 },
- { u"numbersBackgroundColor", 21 },
- { u"numbersSelectorColor", 21 },
- { u"amPmTextColor", 21 },
- { u"amPmBackgroundColor", 21 },
- { u"searchKeyphraseRecognitionFlags", 21 },
- { u"checkMarkTint", 21 },
- { u"checkMarkTintMode", 21 },
- { u"popupTheme", 21 },
- { u"toolbarStyle", 21 },
- { u"windowClipToOutline", 21 },
- { u"datePickerDialogTheme", 21 },
- { u"showText", 21 },
- { u"windowReturnTransition", 21 },
- { u"windowReenterTransition", 21 },
- { u"windowSharedElementReturnTransition", 21 },
- { u"windowSharedElementReenterTransition", 21 },
- { u"resumeWhilePausing", 21 },
- { u"datePickerMode", 21 },
- { u"timePickerMode", 21 },
- { u"inset", 21 },
- { u"letterSpacing", 21 },
- { u"fontFeatureSettings", 21 },
- { u"outlineProvider", 21 },
- { u"contentAgeHint", 21 },
- { u"country", 21 },
- { u"windowSharedElementsUseOverlay", 21 },
- { u"reparent", 21 },
- { u"reparentWithOverlay", 21 },
- { u"ambientShadowAlpha", 21 },
- { u"spotShadowAlpha", 21 },
- { u"navigationIcon", 21 },
- { u"navigationContentDescription", 21 },
- { u"fragmentExitTransition", 21 },
- { u"fragmentEnterTransition", 21 },
- { u"fragmentSharedElementEnterTransition", 21 },
- { u"fragmentReturnTransition", 21 },
- { u"fragmentSharedElementReturnTransition", 21 },
- { u"fragmentReenterTransition", 21 },
- { u"fragmentAllowEnterTransitionOverlap", 21 },
- { u"fragmentAllowReturnTransitionOverlap", 21 },
- { u"patternPathData", 21 },
- { u"strokeAlpha", 21 },
- { u"fillAlpha", 21 },
- { u"windowActivityTransitions", 21 },
- { u"colorEdgeEffect", 21 }
+static const std::unordered_map<std::string, size_t> sAttrMap = {
+ { "marqueeRepeatLimit", 2 },
+ { "windowNoDisplay", 3 },
+ { "backgroundDimEnabled", 3 },
+ { "inputType", 3 },
+ { "isDefault", 3 },
+ { "windowDisablePreview", 3 },
+ { "privateImeOptions", 3 },
+ { "editorExtras", 3 },
+ { "settingsActivity", 3 },
+ { "fastScrollEnabled", 3 },
+ { "reqTouchScreen", 3 },
+ { "reqKeyboardType", 3 },
+ { "reqHardKeyboard", 3 },
+ { "reqNavigation", 3 },
+ { "windowSoftInputMode", 3 },
+ { "imeFullscreenBackground", 3 },
+ { "noHistory", 3 },
+ { "headerDividersEnabled", 3 },
+ { "footerDividersEnabled", 3 },
+ { "candidatesTextStyleSpans", 3 },
+ { "smoothScrollbar", 3 },
+ { "reqFiveWayNav", 3 },
+ { "keyBackground", 3 },
+ { "keyTextSize", 3 },
+ { "labelTextSize", 3 },
+ { "keyTextColor", 3 },
+ { "keyPreviewLayout", 3 },
+ { "keyPreviewOffset", 3 },
+ { "keyPreviewHeight", 3 },
+ { "verticalCorrection", 3 },
+ { "popupLayout", 3 },
+ { "state_long_pressable", 3 },
+ { "keyWidth", 3 },
+ { "keyHeight", 3 },
+ { "horizontalGap", 3 },
+ { "verticalGap", 3 },
+ { "rowEdgeFlags", 3 },
+ { "codes", 3 },
+ { "popupKeyboard", 3 },
+ { "popupCharacters", 3 },
+ { "keyEdgeFlags", 3 },
+ { "isModifier", 3 },
+ { "isSticky", 3 },
+ { "isRepeatable", 3 },
+ { "iconPreview", 3 },
+ { "keyOutputText", 3 },
+ { "keyLabel", 3 },
+ { "keyIcon", 3 },
+ { "keyboardMode", 3 },
+ { "isScrollContainer", 3 },
+ { "fillEnabled", 3 },
+ { "updatePeriodMillis", 3 },
+ { "initialLayout", 3 },
+ { "voiceSearchMode", 3 },
+ { "voiceLanguageModel", 3 },
+ { "voicePromptText", 3 },
+ { "voiceLanguage", 3 },
+ { "voiceMaxResults", 3 },
+ { "bottomOffset", 3 },
+ { "topOffset", 3 },
+ { "allowSingleTap", 3 },
+ { "handle", 3 },
+ { "content", 3 },
+ { "animateOnClick", 3 },
+ { "configure", 3 },
+ { "hapticFeedbackEnabled", 3 },
+ { "innerRadius", 3 },
+ { "thickness", 3 },
+ { "sharedUserLabel", 3 },
+ { "dropDownWidth", 3 },
+ { "dropDownAnchor", 3 },
+ { "imeOptions", 3 },
+ { "imeActionLabel", 3 },
+ { "imeActionId", 3 },
+ { "imeExtractEnterAnimation", 3 },
+ { "imeExtractExitAnimation", 3 },
+ { "tension", 4 },
+ { "extraTension", 4 },
+ { "anyDensity", 4 },
+ { "searchSuggestThreshold", 4 },
+ { "includeInGlobalSearch", 4 },
+ { "onClick", 4 },
+ { "targetSdkVersion", 4 },
+ { "maxSdkVersion", 4 },
+ { "testOnly", 4 },
+ { "contentDescription", 4 },
+ { "gestureStrokeWidth", 4 },
+ { "gestureColor", 4 },
+ { "uncertainGestureColor", 4 },
+ { "fadeOffset", 4 },
+ { "fadeDuration", 4 },
+ { "gestureStrokeType", 4 },
+ { "gestureStrokeLengthThreshold", 4 },
+ { "gestureStrokeSquarenessThreshold", 4 },
+ { "gestureStrokeAngleThreshold", 4 },
+ { "eventsInterceptionEnabled", 4 },
+ { "fadeEnabled", 4 },
+ { "backupAgent", 4 },
+ { "allowBackup", 4 },
+ { "glEsVersion", 4 },
+ { "queryAfterZeroResults", 4 },
+ { "dropDownHeight", 4 },
+ { "smallScreens", 4 },
+ { "normalScreens", 4 },
+ { "largeScreens", 4 },
+ { "progressBarStyleInverse", 4 },
+ { "progressBarStyleSmallInverse", 4 },
+ { "progressBarStyleLargeInverse", 4 },
+ { "searchSettingsDescription", 4 },
+ { "textColorPrimaryInverseDisableOnly", 4 },
+ { "autoUrlDetect", 4 },
+ { "resizeable", 4 },
+ { "required", 5 },
+ { "accountType", 5 },
+ { "contentAuthority", 5 },
+ { "userVisible", 5 },
+ { "windowShowWallpaper", 5 },
+ { "wallpaperOpenEnterAnimation", 5 },
+ { "wallpaperOpenExitAnimation", 5 },
+ { "wallpaperCloseEnterAnimation", 5 },
+ { "wallpaperCloseExitAnimation", 5 },
+ { "wallpaperIntraOpenEnterAnimation", 5 },
+ { "wallpaperIntraOpenExitAnimation", 5 },
+ { "wallpaperIntraCloseEnterAnimation", 5 },
+ { "wallpaperIntraCloseExitAnimation", 5 },
+ { "supportsUploading", 5 },
+ { "killAfterRestore", 5 },
+ { "restoreNeedsApplication", 5 },
+ { "smallIcon", 5 },
+ { "accountPreferences", 5 },
+ { "textAppearanceSearchResultSubtitle", 5 },
+ { "textAppearanceSearchResultTitle", 5 },
+ { "summaryColumn", 5 },
+ { "detailColumn", 5 },
+ { "detailSocialSummary", 5 },
+ { "thumbnail", 5 },
+ { "detachWallpaper", 5 },
+ { "finishOnCloseSystemDialogs", 5 },
+ { "scrollbarFadeDuration", 5 },
+ { "scrollbarDefaultDelayBeforeFade", 5 },
+ { "fadeScrollbars", 5 },
+ { "colorBackgroundCacheHint", 5 },
+ { "dropDownHorizontalOffset", 5 },
+ { "dropDownVerticalOffset", 5 },
+ { "quickContactBadgeStyleWindowSmall", 6 },
+ { "quickContactBadgeStyleWindowMedium", 6 },
+ { "quickContactBadgeStyleWindowLarge", 6 },
+ { "quickContactBadgeStyleSmallWindowSmall", 6 },
+ { "quickContactBadgeStyleSmallWindowMedium", 6 },
+ { "quickContactBadgeStyleSmallWindowLarge", 6 },
+ { "author", 7 },
+ { "autoStart", 7 },
+ { "expandableListViewWhiteStyle", 8 },
+ { "installLocation", 8 },
+ { "vmSafeMode", 8 },
+ { "webTextViewStyle", 8 },
+ { "restoreAnyVersion", 8 },
+ { "tabStripLeft", 8 },
+ { "tabStripRight", 8 },
+ { "tabStripEnabled", 8 },
+ { "logo", 9 },
+ { "xlargeScreens", 9 },
+ { "immersive", 9 },
+ { "overScrollMode", 9 },
+ { "overScrollHeader", 9 },
+ { "overScrollFooter", 9 },
+ { "filterTouchesWhenObscured", 9 },
+ { "textSelectHandleLeft", 9 },
+ { "textSelectHandleRight", 9 },
+ { "textSelectHandle", 9 },
+ { "textSelectHandleWindowStyle", 9 },
+ { "popupAnimationStyle", 9 },
+ { "screenSize", 9 },
+ { "screenDensity", 9 },
+ { "allContactsName", 11 },
+ { "windowActionBar", 11 },
+ { "actionBarStyle", 11 },
+ { "navigationMode", 11 },
+ { "displayOptions", 11 },
+ { "subtitle", 11 },
+ { "customNavigationLayout", 11 },
+ { "hardwareAccelerated", 11 },
+ { "measureWithLargestChild", 11 },
+ { "animateFirstView", 11 },
+ { "dropDownSpinnerStyle", 11 },
+ { "actionDropDownStyle", 11 },
+ { "actionButtonStyle", 11 },
+ { "showAsAction", 11 },
+ { "previewImage", 11 },
+ { "actionModeBackground", 11 },
+ { "actionModeCloseDrawable", 11 },
+ { "windowActionModeOverlay", 11 },
+ { "valueFrom", 11 },
+ { "valueTo", 11 },
+ { "valueType", 11 },
+ { "propertyName", 11 },
+ { "ordering", 11 },
+ { "fragment", 11 },
+ { "windowActionBarOverlay", 11 },
+ { "fragmentOpenEnterAnimation", 11 },
+ { "fragmentOpenExitAnimation", 11 },
+ { "fragmentCloseEnterAnimation", 11 },
+ { "fragmentCloseExitAnimation", 11 },
+ { "fragmentFadeEnterAnimation", 11 },
+ { "fragmentFadeExitAnimation", 11 },
+ { "actionBarSize", 11 },
+ { "imeSubtypeLocale", 11 },
+ { "imeSubtypeMode", 11 },
+ { "imeSubtypeExtraValue", 11 },
+ { "splitMotionEvents", 11 },
+ { "listChoiceBackgroundIndicator", 11 },
+ { "spinnerMode", 11 },
+ { "animateLayoutChanges", 11 },
+ { "actionBarTabStyle", 11 },
+ { "actionBarTabBarStyle", 11 },
+ { "actionBarTabTextStyle", 11 },
+ { "actionOverflowButtonStyle", 11 },
+ { "actionModeCloseButtonStyle", 11 },
+ { "titleTextStyle", 11 },
+ { "subtitleTextStyle", 11 },
+ { "iconifiedByDefault", 11 },
+ { "actionLayout", 11 },
+ { "actionViewClass", 11 },
+ { "activatedBackgroundIndicator", 11 },
+ { "state_activated", 11 },
+ { "listPopupWindowStyle", 11 },
+ { "popupMenuStyle", 11 },
+ { "textAppearanceLargePopupMen", 11 },
+ { "textAppearanceSmallPopupMen", 11 },
+ { "breadCrumbTitle", 11 },
+ { "breadCrumbShortTitle", 11 },
+ { "listDividerAlertDialog", 11 },
+ { "textColorAlertDialogListItem", 11 },
+ { "loopViews", 11 },
+ { "dialogTheme", 11 },
+ { "alertDialogTheme", 11 },
+ { "dividerVertical", 11 },
+ { "homeAsUpIndicator", 11 },
+ { "enterFadeDuration", 11 },
+ { "exitFadeDuration", 11 },
+ { "selectableItemBackground", 11 },
+ { "autoAdvanceViewId", 11 },
+ { "useIntrinsicSizeAsMinimum", 11 },
+ { "actionModeCutDrawable", 11 },
+ { "actionModeCopyDrawable", 11 },
+ { "actionModePasteDrawable", 11 },
+ { "textEditPasteWindowLayout", 11 },
+ { "textEditNoPasteWindowLayout", 11 },
+ { "textIsSelectable", 11 },
+ { "windowEnableSplitTouch", 11 },
+ { "indeterminateProgressStyle", 11 },
+ { "progressBarPadding", 11 },
+ { "animationResolution", 11 },
+ { "state_accelerated", 11 },
+ { "baseline", 11 },
+ { "homeLayout", 11 },
+ { "opacity", 11 },
+ { "alpha", 11 },
+ { "transformPivotX", 11 },
+ { "transformPivotY", 11 },
+ { "translationX", 11 },
+ { "translationY", 11 },
+ { "scaleX", 11 },
+ { "scaleY", 11 },
+ { "rotation", 11 },
+ { "rotationX", 11 },
+ { "rotationY", 11 },
+ { "showDividers", 11 },
+ { "dividerPadding", 11 },
+ { "borderlessButtonStyle", 11 },
+ { "dividerHorizontal", 11 },
+ { "itemPadding", 11 },
+ { "buttonBarStyle", 11 },
+ { "buttonBarButtonStyle", 11 },
+ { "segmentedButtonStyle", 11 },
+ { "staticWallpaperPreview", 11 },
+ { "allowParallelSyncs", 11 },
+ { "isAlwaysSyncable", 11 },
+ { "verticalScrollbarPosition", 11 },
+ { "fastScrollAlwaysVisible", 11 },
+ { "fastScrollThumbDrawable", 11 },
+ { "fastScrollPreviewBackgroundLeft", 11 },
+ { "fastScrollPreviewBackgroundRight", 11 },
+ { "fastScrollTrackDrawable", 11 },
+ { "fastScrollOverlayPosition", 11 },
+ { "customTokens", 11 },
+ { "nextFocusForward", 11 },
+ { "firstDayOfWeek", 11 },
+ { "showWeekNumber", 11 },
+ { "minDate", 11 },
+ { "maxDate", 11 },
+ { "shownWeekCount", 11 },
+ { "selectedWeekBackgroundColor", 11 },
+ { "focusedMonthDateColor", 11 },
+ { "unfocusedMonthDateColor", 11 },
+ { "weekNumberColor", 11 },
+ { "weekSeparatorLineColor", 11 },
+ { "selectedDateVerticalBar", 11 },
+ { "weekDayTextAppearance", 11 },
+ { "dateTextAppearance", 11 },
+ { "solidColor", 11 },
+ { "spinnersShown", 11 },
+ { "calendarViewShown", 11 },
+ { "state_multiline", 11 },
+ { "detailsElementBackground", 11 },
+ { "textColorHighlightInverse", 11 },
+ { "textColorLinkInverse", 11 },
+ { "editTextColor", 11 },
+ { "editTextBackground", 11 },
+ { "horizontalScrollViewStyle", 11 },
+ { "layerType", 11 },
+ { "alertDialogIcon", 11 },
+ { "windowMinWidthMajor", 11 },
+ { "windowMinWidthMinor", 11 },
+ { "queryHint", 11 },
+ { "fastScrollTextColor", 11 },
+ { "largeHeap", 11 },
+ { "windowCloseOnTouchOutside", 11 },
+ { "datePickerStyle", 11 },
+ { "calendarViewStyle", 11 },
+ { "textEditSidePasteWindowLayout", 11 },
+ { "textEditSideNoPasteWindowLayout", 11 },
+ { "actionMenuTextAppearance", 11 },
+ { "actionMenuTextColor", 11 },
+ { "textCursorDrawable", 12 },
+ { "resizeMode", 12 },
+ { "requiresSmallestWidthDp", 12 },
+ { "compatibleWidthLimitDp", 12 },
+ { "largestWidthLimitDp", 12 },
+ { "state_hovered", 13 },
+ { "state_drag_can_accept", 13 },
+ { "state_drag_hovered", 13 },
+ { "stopWithTask", 13 },
+ { "switchTextOn", 13 },
+ { "switchTextOff", 13 },
+ { "switchPreferenceStyle", 13 },
+ { "switchTextAppearance", 13 },
+ { "track", 13 },
+ { "switchMinWidth", 13 },
+ { "switchPadding", 13 },
+ { "thumbTextPadding", 13 },
+ { "textSuggestionsWindowStyle", 13 },
+ { "textEditSuggestionItemLayout", 13 },
+ { "rowCount", 13 },
+ { "rowOrderPreserved", 13 },
+ { "columnCount", 13 },
+ { "columnOrderPreserved", 13 },
+ { "useDefaultMargins", 13 },
+ { "alignmentMode", 13 },
+ { "layout_row", 13 },
+ { "layout_rowSpan", 13 },
+ { "layout_columnSpan", 13 },
+ { "actionModeSelectAllDrawable", 13 },
+ { "isAuxiliary", 13 },
+ { "accessibilityEventTypes", 13 },
+ { "packageNames", 13 },
+ { "accessibilityFeedbackType", 13 },
+ { "notificationTimeout", 13 },
+ { "accessibilityFlags", 13 },
+ { "canRetrieveWindowContent", 13 },
+ { "listPreferredItemHeightLarge", 13 },
+ { "listPreferredItemHeightSmall", 13 },
+ { "actionBarSplitStyle", 13 },
+ { "actionProviderClass", 13 },
+ { "backgroundStacked", 13 },
+ { "backgroundSplit", 13 },
+ { "textAllCaps", 13 },
+ { "colorPressedHighlight", 13 },
+ { "colorLongPressedHighlight", 13 },
+ { "colorFocusedHighlight", 13 },
+ { "colorActivatedHighlight", 13 },
+ { "colorMultiSelectHighlight", 13 },
+ { "drawableStart", 13 },
+ { "drawableEnd", 13 },
+ { "actionModeStyle", 13 },
+ { "minResizeWidth", 13 },
+ { "minResizeHeight", 13 },
+ { "actionBarWidgetTheme", 13 },
+ { "uiOptions", 13 },
+ { "subtypeLocale", 13 },
+ { "subtypeExtraValue", 13 },
+ { "actionBarDivider", 13 },
+ { "actionBarItemBackground", 13 },
+ { "actionModeSplitBackground", 13 },
+ { "textAppearanceListItem", 13 },
+ { "textAppearanceListItemSmall", 13 },
+ { "targetDescriptions", 13 },
+ { "directionDescriptions", 13 },
+ { "overridesImplicitlyEnabledSubtype", 13 },
+ { "listPreferredItemPaddingLeft", 13 },
+ { "listPreferredItemPaddingRight", 13 },
+ { "requiresFadingEdge", 13 },
+ { "publicKey", 13 },
+ { "parentActivityName", 16 },
+ { "isolatedProcess", 16 },
+ { "importantForAccessibility", 16 },
+ { "keyboardLayout", 16 },
+ { "fontFamily", 16 },
+ { "mediaRouteButtonStyle", 16 },
+ { "mediaRouteTypes", 16 },
+ { "supportsRtl", 17 },
+ { "textDirection", 17 },
+ { "textAlignment", 17 },
+ { "layoutDirection", 17 },
+ { "paddingStart", 17 },
+ { "paddingEnd", 17 },
+ { "layout_marginStart", 17 },
+ { "layout_marginEnd", 17 },
+ { "layout_toStartOf", 17 },
+ { "layout_toEndOf", 17 },
+ { "layout_alignStart", 17 },
+ { "layout_alignEnd", 17 },
+ { "layout_alignParentStart", 17 },
+ { "layout_alignParentEnd", 17 },
+ { "listPreferredItemPaddingStart", 17 },
+ { "listPreferredItemPaddingEnd", 17 },
+ { "singleUser", 17 },
+ { "presentationTheme", 17 },
+ { "subtypeId", 17 },
+ { "initialKeyguardLayout", 17 },
+ { "widgetCategory", 17 },
+ { "permissionGroupFlags", 17 },
+ { "labelFor", 17 },
+ { "permissionFlags", 17 },
+ { "checkedTextViewStyle", 17 },
+ { "showOnLockScreen", 17 },
+ { "format12Hour", 17 },
+ { "format24Hour", 17 },
+ { "timeZone", 17 },
+ { "mipMap", 18 },
+ { "mirrorForRtl", 18 },
+ { "windowOverscan", 18 },
+ { "requiredForAllUsers", 18 },
+ { "indicatorStart", 18 },
+ { "indicatorEnd", 18 },
+ { "childIndicatorStart", 18 },
+ { "childIndicatorEnd", 18 },
+ { "restrictedAccountType", 18 },
+ { "requiredAccountType", 18 },
+ { "canRequestTouchExplorationMode", 18 },
+ { "canRequestEnhancedWebAccessibility", 18 },
+ { "canRequestFilterKeyEvents", 18 },
+ { "layoutMode", 18 },
+ { "keySet", 19 },
+ { "targetId", 19 },
+ { "fromScene", 19 },
+ { "toScene", 19 },
+ { "transition", 19 },
+ { "transitionOrdering", 19 },
+ { "fadingMode", 19 },
+ { "startDelay", 19 },
+ { "ssp", 19 },
+ { "sspPrefix", 19 },
+ { "sspPattern", 19 },
+ { "addPrintersActivity", 19 },
+ { "vendor", 19 },
+ { "category", 19 },
+ { "isAsciiCapable", 19 },
+ { "autoMirrored", 19 },
+ { "supportsSwitchingToNextInputMethod", 19 },
+ { "requireDeviceUnlock", 19 },
+ { "apduServiceBanner", 19 },
+ { "accessibilityLiveRegion", 19 },
+ { "windowTranslucentStatus", 19 },
+ { "windowTranslucentNavigation", 19 },
+ { "advancedPrintOptionsActivity", 19 },
+ { "banner", 20 },
+ { "windowSwipeToDismiss", 20 },
+ { "isGame", 20 },
+ { "allowEmbedded", 20 },
+ { "setupActivity", 20 },
+ { "fastScrollStyle", 21 },
+ { "windowContentTransitions", 21 },
+ { "windowContentTransitionManager", 21 },
+ { "translationZ", 21 },
+ { "tintMode", 21 },
+ { "controlX1", 21 },
+ { "controlY1", 21 },
+ { "controlX2", 21 },
+ { "controlY2", 21 },
+ { "transitionName", 21 },
+ { "transitionGroup", 21 },
+ { "viewportWidth", 21 },
+ { "viewportHeight", 21 },
+ { "fillColor", 21 },
+ { "pathData", 21 },
+ { "strokeColor", 21 },
+ { "strokeWidth", 21 },
+ { "trimPathStart", 21 },
+ { "trimPathEnd", 21 },
+ { "trimPathOffset", 21 },
+ { "strokeLineCap", 21 },
+ { "strokeLineJoin", 21 },
+ { "strokeMiterLimit", 21 },
+ { "colorControlNormal", 21 },
+ { "colorControlActivated", 21 },
+ { "colorButtonNormal", 21 },
+ { "colorControlHighlight", 21 },
+ { "persistableMode", 21 },
+ { "titleTextAppearance", 21 },
+ { "subtitleTextAppearance", 21 },
+ { "slideEdge", 21 },
+ { "actionBarTheme", 21 },
+ { "textAppearanceListItemSecondary", 21 },
+ { "colorPrimary", 21 },
+ { "colorPrimaryDark", 21 },
+ { "colorAccent", 21 },
+ { "nestedScrollingEnabled", 21 },
+ { "windowEnterTransition", 21 },
+ { "windowExitTransition", 21 },
+ { "windowSharedElementEnterTransition", 21 },
+ { "windowSharedElementExitTransition", 21 },
+ { "windowAllowReturnTransitionOverlap", 21 },
+ { "windowAllowEnterTransitionOverlap", 21 },
+ { "sessionService", 21 },
+ { "stackViewStyle", 21 },
+ { "switchStyle", 21 },
+ { "elevation", 21 },
+ { "excludeId", 21 },
+ { "excludeClass", 21 },
+ { "hideOnContentScroll", 21 },
+ { "actionOverflowMenuStyle", 21 },
+ { "documentLaunchMode", 21 },
+ { "maxRecents", 21 },
+ { "autoRemoveFromRecents", 21 },
+ { "stateListAnimator", 21 },
+ { "toId", 21 },
+ { "fromId", 21 },
+ { "reversible", 21 },
+ { "splitTrack", 21 },
+ { "targetName", 21 },
+ { "excludeName", 21 },
+ { "matchOrder", 21 },
+ { "windowDrawsSystemBarBackgrounds", 21 },
+ { "statusBarColor", 21 },
+ { "navigationBarColor", 21 },
+ { "contentInsetStart", 21 },
+ { "contentInsetEnd", 21 },
+ { "contentInsetLeft", 21 },
+ { "contentInsetRight", 21 },
+ { "paddingMode", 21 },
+ { "layout_rowWeight", 21 },
+ { "layout_columnWeight", 21 },
+ { "translateX", 21 },
+ { "translateY", 21 },
+ { "selectableItemBackgroundBorderless", 21 },
+ { "elegantTextHeight", 21 },
+ { "searchKeyphraseId", 21 },
+ { "searchKeyphrase", 21 },
+ { "searchKeyphraseSupportedLocales", 21 },
+ { "windowTransitionBackgroundFadeDuration", 21 },
+ { "overlapAnchor", 21 },
+ { "progressTint", 21 },
+ { "progressTintMode", 21 },
+ { "progressBackgroundTint", 21 },
+ { "progressBackgroundTintMode", 21 },
+ { "secondaryProgressTint", 21 },
+ { "secondaryProgressTintMode", 21 },
+ { "indeterminateTint", 21 },
+ { "indeterminateTintMode", 21 },
+ { "backgroundTint", 21 },
+ { "backgroundTintMode", 21 },
+ { "foregroundTint", 21 },
+ { "foregroundTintMode", 21 },
+ { "buttonTint", 21 },
+ { "buttonTintMode", 21 },
+ { "thumbTint", 21 },
+ { "thumbTintMode", 21 },
+ { "fullBackupOnly", 21 },
+ { "propertyXName", 21 },
+ { "propertyYName", 21 },
+ { "relinquishTaskIdentity", 21 },
+ { "tileModeX", 21 },
+ { "tileModeY", 21 },
+ { "actionModeShareDrawable", 21 },
+ { "actionModeFindDrawable", 21 },
+ { "actionModeWebSearchDrawable", 21 },
+ { "transitionVisibilityMode", 21 },
+ { "minimumHorizontalAngle", 21 },
+ { "minimumVerticalAngle", 21 },
+ { "maximumAngle", 21 },
+ { "searchViewStyle", 21 },
+ { "closeIcon", 21 },
+ { "goIcon", 21 },
+ { "searchIcon", 21 },
+ { "voiceIcon", 21 },
+ { "commitIcon", 21 },
+ { "suggestionRowLayout", 21 },
+ { "queryBackground", 21 },
+ { "submitBackground", 21 },
+ { "buttonBarPositiveButtonStyle", 21 },
+ { "buttonBarNeutralButtonStyle", 21 },
+ { "buttonBarNegativeButtonStyle", 21 },
+ { "popupElevation", 21 },
+ { "actionBarPopupTheme", 21 },
+ { "multiArch", 21 },
+ { "touchscreenBlocksFocus", 21 },
+ { "windowElevation", 21 },
+ { "launchTaskBehindTargetAnimation", 21 },
+ { "launchTaskBehindSourceAnimation", 21 },
+ { "restrictionType", 21 },
+ { "dayOfWeekBackground", 21 },
+ { "dayOfWeekTextAppearance", 21 },
+ { "headerMonthTextAppearance", 21 },
+ { "headerDayOfMonthTextAppearance", 21 },
+ { "headerYearTextAppearance", 21 },
+ { "yearListItemTextAppearance", 21 },
+ { "yearListSelectorColor", 21 },
+ { "calendarTextColor", 21 },
+ { "recognitionService", 21 },
+ { "timePickerStyle", 21 },
+ { "timePickerDialogTheme", 21 },
+ { "headerTimeTextAppearance", 21 },
+ { "headerAmPmTextAppearance", 21 },
+ { "numbersTextColor", 21 },
+ { "numbersBackgroundColor", 21 },
+ { "numbersSelectorColor", 21 },
+ { "amPmTextColor", 21 },
+ { "amPmBackgroundColor", 21 },
+ { "searchKeyphraseRecognitionFlags", 21 },
+ { "checkMarkTint", 21 },
+ { "checkMarkTintMode", 21 },
+ { "popupTheme", 21 },
+ { "toolbarStyle", 21 },
+ { "windowClipToOutline", 21 },
+ { "datePickerDialogTheme", 21 },
+ { "showText", 21 },
+ { "windowReturnTransition", 21 },
+ { "windowReenterTransition", 21 },
+ { "windowSharedElementReturnTransition", 21 },
+ { "windowSharedElementReenterTransition", 21 },
+ { "resumeWhilePausing", 21 },
+ { "datePickerMode", 21 },
+ { "timePickerMode", 21 },
+ { "inset", 21 },
+ { "letterSpacing", 21 },
+ { "fontFeatureSettings", 21 },
+ { "outlineProvider", 21 },
+ { "contentAgeHint", 21 },
+ { "country", 21 },
+ { "windowSharedElementsUseOverlay", 21 },
+ { "reparent", 21 },
+ { "reparentWithOverlay", 21 },
+ { "ambientShadowAlpha", 21 },
+ { "spotShadowAlpha", 21 },
+ { "navigationIcon", 21 },
+ { "navigationContentDescription", 21 },
+ { "fragmentExitTransition", 21 },
+ { "fragmentEnterTransition", 21 },
+ { "fragmentSharedElementEnterTransition", 21 },
+ { "fragmentReturnTransition", 21 },
+ { "fragmentSharedElementReturnTransition", 21 },
+ { "fragmentReenterTransition", 21 },
+ { "fragmentAllowEnterTransitionOverlap", 21 },
+ { "fragmentAllowReturnTransitionOverlap", 21 },
+ { "patternPathData", 21 },
+ { "strokeAlpha", 21 },
+ { "fillAlpha", 21 },
+ { "windowActivityTransitions", 21 },
+ { "colorEdgeEffect", 21 }
};
size_t findAttributeSdkLevel(const ResourceName& name) {
- if (name.package != u"android" && name.type != ResourceType::kAttr) {
+ if (name.package != "android" && name.type != ResourceType::kAttr) {
return 0;
}
@@ -735,4 +738,8 @@
return SDK_LOLLIPOP_MR1;
}
+std::pair<StringPiece, int> getDevelopmentSdkCodeNameAndVersion() {
+ return std::make_pair(StringPiece(sDevelopmentSdkCodeName), sDevelopmentSdkLevel);
+}
+
} // namespace aapt
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 282ed9a..f28679f 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -19,6 +19,8 @@
#include "Resource.h"
+#include <utility>
+
namespace aapt {
enum {
@@ -47,6 +49,7 @@
size_t findAttributeSdkLevel(ResourceId id);
size_t findAttributeSdkLevel(const ResourceName& name);
+std::pair<StringPiece, int> getDevelopmentSdkCodeNameAndVersion();
} // namespace aapt
diff --git a/tools/aapt2/StringPool.cpp b/tools/aapt2/StringPool.cpp
index aadb00b..fe4b967 100644
--- a/tools/aapt2/StringPool.cpp
+++ b/tools/aapt2/StringPool.cpp
@@ -59,11 +59,11 @@
return *this;
}
-const std::u16string* StringPool::Ref::operator->() const {
+const std::string* StringPool::Ref::operator->() const {
return &mEntry->value;
}
-const std::u16string& StringPool::Ref::operator*() const {
+const std::string& StringPool::Ref::operator*() const {
return mEntry->value;
}
@@ -124,15 +124,15 @@
return mEntry->str.getContext();
}
-StringPool::Ref StringPool::makeRef(const StringPiece16& str) {
+StringPool::Ref StringPool::makeRef(const StringPiece& str) {
return makeRefImpl(str, Context{}, true);
}
-StringPool::Ref StringPool::makeRef(const StringPiece16& str, const Context& context) {
+StringPool::Ref StringPool::makeRef(const StringPiece& str, const Context& context) {
return makeRefImpl(str, context, true);
}
-StringPool::Ref StringPool::makeRefImpl(const StringPiece16& str, const Context& context,
+StringPool::Ref StringPool::makeRefImpl(const StringPiece& str, const Context& context,
bool unique) {
if (unique) {
auto iter = mIndexedStrings.find(str);
@@ -147,7 +147,7 @@
entry->index = mStrings.size();
entry->ref = 0;
mStrings.emplace_back(entry);
- mIndexedStrings.insert(std::make_pair(StringPiece16(entry->value), entry));
+ mIndexedStrings.insert(std::make_pair(StringPiece(entry->value), entry));
return Ref(entry);
}
@@ -162,13 +162,12 @@
entry->index = mStrings.size();
entry->ref = 0;
mStrings.emplace_back(entry);
- mIndexedStrings.insert(std::make_pair(StringPiece16(entry->value), entry));
+ mIndexedStrings.insert(std::make_pair(StringPiece(entry->value), entry));
StyleEntry* styleEntry = new StyleEntry();
styleEntry->str = Ref(entry);
for (const aapt::Span& span : str.spans) {
- styleEntry->spans.emplace_back(Span{makeRef(span.name),
- span.firstChar, span.lastChar});
+ styleEntry->spans.emplace_back(Span{ makeRef(span.name), span.firstChar, span.lastChar });
}
styleEntry->ref = 0;
mStyles.emplace_back(styleEntry);
@@ -182,7 +181,7 @@
entry->index = mStrings.size();
entry->ref = 0;
mStrings.emplace_back(entry);
- mIndexedStrings.insert(std::make_pair(StringPiece16(entry->value), entry));
+ mIndexedStrings.insert(std::make_pair(StringPiece(entry->value), entry));
StyleEntry* styleEntry = new StyleEntry();
styleEntry->str = Ref(entry);
@@ -320,33 +319,40 @@
indices++;
if (utf8) {
- std::string encoded = util::utf16ToUtf8(entry->value);
+ const std::string& encoded = entry->value;
+ const ssize_t utf16Length = utf8_to_utf16_length(
+ reinterpret_cast<const uint8_t*>(entry->value.data()), entry->value.size());
+ assert(utf16Length >= 0);
- const size_t totalSize = encodedLengthUnits<char>(entry->value.size())
+ const size_t totalSize = encodedLengthUnits<char>(utf16Length)
+ encodedLengthUnits<char>(encoded.length())
+ encoded.size() + 1;
char* data = out->nextBlock<char>(totalSize);
- // First encode the actual UTF16 string length.
- data = encodeLength(data, entry->value.size());
+ // First encode the UTF16 string length.
+ data = encodeLength(data, utf16Length);
- // Now encode the size of the converted UTF8 string.
+ // Now encode the size of the real UTF8 string.
data = encodeLength(data, encoded.length());
strncpy(data, encoded.data(), encoded.size());
+
} else {
- const size_t totalSize = encodedLengthUnits<char16_t>(entry->value.size())
- + entry->value.size() + 1;
+ const std::u16string encoded = util::utf8ToUtf16(entry->value);
+ const ssize_t utf16Length = encoded.size();
+
+ // Total number of 16-bit words to write.
+ const size_t totalSize = encodedLengthUnits<char16_t>(utf16Length) + encoded.size() + 1;
char16_t* data = out->nextBlock<char16_t>(totalSize);
// Encode the actual UTF16 string length.
- data = encodeLength(data, entry->value.size());
- const size_t byteLength = entry->value.size() * sizeof(char16_t);
+ data = encodeLength(data, utf16Length);
+ const size_t byteLength = encoded.size() * sizeof(char16_t);
// NOTE: For some reason, strncpy16(data, entry->value.data(), entry->value.size())
// truncates the string.
- memcpy(data, entry->value.data(), byteLength);
+ memcpy(data, encoded.data(), byteLength);
// The null-terminating character is already here due to the block of data being set
// to 0s on allocation.
diff --git a/tools/aapt2/StringPool.h b/tools/aapt2/StringPool.h
index 5f88543..72ae9d1 100644
--- a/tools/aapt2/StringPool.h
+++ b/tools/aapt2/StringPool.h
@@ -30,13 +30,13 @@
namespace aapt {
struct Span {
- std::u16string name;
+ std::string name;
uint32_t firstChar;
uint32_t lastChar;
};
struct StyleString {
- std::u16string str;
+ std::string str;
std::vector<Span> spans;
};
@@ -56,8 +56,8 @@
~Ref();
Ref& operator=(const Ref& rhs);
- const std::u16string* operator->() const;
- const std::u16string& operator*() const;
+ const std::string* operator->() const;
+ const std::string& operator*() const;
size_t getIndex() const;
const Context& getContext() const;
@@ -95,7 +95,7 @@
class Entry {
public:
- std::u16string value;
+ std::string value;
Context context;
size_t index;
@@ -136,14 +136,14 @@
* Adds a string to the pool, unless it already exists. Returns
* a reference to the string in the pool.
*/
- Ref makeRef(const StringPiece16& str);
+ Ref makeRef(const StringPiece& str);
/**
* Adds a string to the pool, unless it already exists, with a context
* object that can be used when sorting the string pool. Returns
* a reference to the string in the pool.
*/
- Ref makeRef(const StringPiece16& str, const Context& context);
+ Ref makeRef(const StringPiece& str, const Context& context);
/**
* Adds a style to the string pool and returns a reference to it.
@@ -195,11 +195,11 @@
static bool flatten(BigBuffer* out, const StringPool& pool, bool utf8);
- Ref makeRefImpl(const StringPiece16& str, const Context& context, bool unique);
+ Ref makeRefImpl(const StringPiece& str, const Context& context, bool unique);
std::vector<std::unique_ptr<Entry>> mStrings;
std::vector<std::unique_ptr<StyleEntry>> mStyles;
- std::unordered_multimap<StringPiece16, Entry*> mIndexedStrings;
+ std::unordered_multimap<StringPiece, Entry*> mIndexedStrings;
};
//
diff --git a/tools/aapt2/StringPool_test.cpp b/tools/aapt2/StringPool_test.cpp
index 2b2d348..1367af7 100644
--- a/tools/aapt2/StringPool_test.cpp
+++ b/tools/aapt2/StringPool_test.cpp
@@ -15,9 +15,9 @@
*/
#include "StringPool.h"
+#include "test/Test.h"
#include "util/Util.h"
-#include <gtest/gtest.h>
#include <string>
namespace aapt {
@@ -25,37 +25,37 @@
TEST(StringPoolTest, InsertOneString) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"wut");
- EXPECT_EQ(*ref, u"wut");
+ StringPool::Ref ref = pool.makeRef("wut");
+ EXPECT_EQ(*ref, "wut");
}
TEST(StringPoolTest, InsertTwoUniqueStrings) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"wut");
- StringPool::Ref ref2 = pool.makeRef(u"hey");
+ StringPool::Ref ref = pool.makeRef("wut");
+ StringPool::Ref ref2 = pool.makeRef("hey");
- EXPECT_EQ(*ref, u"wut");
- EXPECT_EQ(*ref2, u"hey");
+ EXPECT_EQ(*ref, "wut");
+ EXPECT_EQ(*ref2, "hey");
}
TEST(StringPoolTest, DoNotInsertNewDuplicateString) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"wut");
- StringPool::Ref ref2 = pool.makeRef(u"wut");
+ StringPool::Ref ref = pool.makeRef("wut");
+ StringPool::Ref ref2 = pool.makeRef("wut");
- EXPECT_EQ(*ref, u"wut");
- EXPECT_EQ(*ref2, u"wut");
+ EXPECT_EQ(*ref, "wut");
+ EXPECT_EQ(*ref2, "wut");
EXPECT_EQ(1u, pool.size());
}
TEST(StringPoolTest, MaintainInsertionOrderIndex) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"z");
- StringPool::Ref ref2 = pool.makeRef(u"a");
- StringPool::Ref ref3 = pool.makeRef(u"m");
+ StringPool::Ref ref = pool.makeRef("z");
+ StringPool::Ref ref2 = pool.makeRef("a");
+ StringPool::Ref ref3 = pool.makeRef("m");
EXPECT_EQ(0u, ref.getIndex());
EXPECT_EQ(1u, ref2.getIndex());
@@ -65,39 +65,39 @@
TEST(StringPoolTest, PruneStringsWithNoReferences) {
StringPool pool;
- StringPool::Ref refA = pool.makeRef(u"foo");
+ StringPool::Ref refA = pool.makeRef("foo");
{
- StringPool::Ref ref = pool.makeRef(u"wut");
- EXPECT_EQ(*ref, u"wut");
+ StringPool::Ref ref = pool.makeRef("wut");
+ EXPECT_EQ(*ref, "wut");
EXPECT_EQ(2u, pool.size());
}
- StringPool::Ref refB = pool.makeRef(u"bar");
+ StringPool::Ref refB = pool.makeRef("bar");
EXPECT_EQ(3u, pool.size());
pool.prune();
EXPECT_EQ(2u, pool.size());
StringPool::const_iterator iter = begin(pool);
- EXPECT_EQ((*iter)->value, u"foo");
+ EXPECT_EQ((*iter)->value, "foo");
EXPECT_LT((*iter)->index, 2u);
++iter;
- EXPECT_EQ((*iter)->value, u"bar");
+ EXPECT_EQ((*iter)->value, "bar");
EXPECT_LT((*iter)->index, 2u);
}
TEST(StringPoolTest, SortAndMaintainIndexesInReferences) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"z");
- StringPool::StyleRef ref2 = pool.makeRef(StyleString{ {u"a"} });
- StringPool::Ref ref3 = pool.makeRef(u"m");
+ StringPool::Ref ref = pool.makeRef("z");
+ StringPool::StyleRef ref2 = pool.makeRef(StyleString{ {"a"} });
+ StringPool::Ref ref3 = pool.makeRef("m");
- EXPECT_EQ(*ref, u"z");
+ EXPECT_EQ(*ref, "z");
EXPECT_EQ(0u, ref.getIndex());
- EXPECT_EQ(*(ref2->str), u"a");
+ EXPECT_EQ(*(ref2->str), "a");
EXPECT_EQ(1u, ref2.getIndex());
- EXPECT_EQ(*ref3, u"m");
+ EXPECT_EQ(*ref3, "m");
EXPECT_EQ(2u, ref3.getIndex());
pool.sort([](const StringPool::Entry& a, const StringPool::Entry& b) -> bool {
@@ -105,30 +105,30 @@
});
- EXPECT_EQ(*ref, u"z");
+ EXPECT_EQ(*ref, "z");
EXPECT_EQ(2u, ref.getIndex());
- EXPECT_EQ(*(ref2->str), u"a");
+ EXPECT_EQ(*(ref2->str), "a");
EXPECT_EQ(0u, ref2.getIndex());
- EXPECT_EQ(*ref3, u"m");
+ EXPECT_EQ(*ref3, "m");
EXPECT_EQ(1u, ref3.getIndex());
}
TEST(StringPoolTest, SortAndStillDedupe) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"z");
- StringPool::Ref ref2 = pool.makeRef(u"a");
- StringPool::Ref ref3 = pool.makeRef(u"m");
+ StringPool::Ref ref = pool.makeRef("z");
+ StringPool::Ref ref2 = pool.makeRef("a");
+ StringPool::Ref ref3 = pool.makeRef("m");
pool.sort([](const StringPool::Entry& a, const StringPool::Entry& b) -> bool {
return a.value < b.value;
});
- StringPool::Ref ref4 = pool.makeRef(u"z");
- StringPool::Ref ref5 = pool.makeRef(u"a");
- StringPool::Ref ref6 = pool.makeRef(u"m");
+ StringPool::Ref ref4 = pool.makeRef("z");
+ StringPool::Ref ref5 = pool.makeRef("a");
+ StringPool::Ref ref6 = pool.makeRef("m");
EXPECT_EQ(ref4.getIndex(), ref.getIndex());
EXPECT_EQ(ref5.getIndex(), ref2.getIndex());
@@ -139,20 +139,20 @@
StringPool pool;
StyleString str {
- { u"android" },
+ { "android" },
{
- Span{ { u"b" }, 2, 6 }
+ Span{ { "b" }, 2, 6 }
}
};
StringPool::StyleRef ref = pool.makeRef(str);
EXPECT_EQ(0u, ref.getIndex());
- EXPECT_EQ(std::u16string(u"android"), *(ref->str));
+ EXPECT_EQ(std::string("android"), *(ref->str));
ASSERT_EQ(1u, ref->spans.size());
const StringPool::Span& span = ref->spans.front();
- EXPECT_EQ(*(span.name), u"b");
+ EXPECT_EQ(*(span.name), "b");
EXPECT_EQ(2u, span.firstChar);
EXPECT_EQ(6u, span.lastChar);
}
@@ -160,9 +160,9 @@
TEST(StringPoolTest, DoNotDedupeStyleWithSameStringAsNonStyle) {
StringPool pool;
- StringPool::Ref ref = pool.makeRef(u"android");
+ StringPool::Ref ref = pool.makeRef("android");
- StyleString str { { u"android" } };
+ StyleString str { { "android" } };
StringPool::StyleRef styleRef = pool.makeRef(str);
EXPECT_NE(ref.getIndex(), styleRef.getIndex());
@@ -184,7 +184,7 @@
using namespace android; // For NO_ERROR on Windows.
StringPool pool;
- pool.makeRef(u"\u093f");
+ pool.makeRef("\u093f");
BigBuffer buffer(1024);
StringPool::flattenUtf16(&buffer, pool);
@@ -198,48 +198,65 @@
EXPECT_EQ(0u, str[1]);
}
-constexpr const char16_t* sLongString = u"バッテリーを長持ちさせるため、バッテリーセーバーは端末のパフォーマンスを抑え、バイブレーション、位置情報サービス、大半のバックグラウンドデータを制限します。メール、SMSや、同期を使 用するその他のアプリは、起動しても更新されないことがあります。バッテリーセーバーは端末の充電中は自動的にOFFになります。";
+constexpr const char* sLongString = "バッテリーを長持ちさせるため、バッテリーセーバーは端末のパフォーマンスを抑え、バイブレーション、位置情報サービス、大半のバックグラウンドデータを制限します。メール、SMSや、同期を使 用するその他のアプリは、起動しても更新されないことがあります。バッテリーセーバーは端末の充電中は自動的にOFFになります。";
-TEST(StringPoolTest, FlattenUtf8) {
+TEST(StringPoolTest, Flatten) {
using namespace android; // For NO_ERROR on Windows.
StringPool pool;
- StringPool::Ref ref1 = pool.makeRef(u"hello");
- StringPool::Ref ref2 = pool.makeRef(u"goodbye");
+ StringPool::Ref ref1 = pool.makeRef("hello");
+ StringPool::Ref ref2 = pool.makeRef("goodbye");
StringPool::Ref ref3 = pool.makeRef(sLongString);
- StringPool::StyleRef ref4 = pool.makeRef(StyleString{
- { u"style" },
- { Span{ { u"b" }, 0, 1 }, Span{ { u"i" }, 2, 3 } }
+ StringPool::Ref ref4 = pool.makeRef("");
+ StringPool::StyleRef ref5 = pool.makeRef(StyleString{
+ { "style" },
+ { Span{ { "b" }, 0, 1 }, Span{ { "i" }, 2, 3 } }
});
EXPECT_EQ(0u, ref1.getIndex());
EXPECT_EQ(1u, ref2.getIndex());
EXPECT_EQ(2u, ref3.getIndex());
EXPECT_EQ(3u, ref4.getIndex());
+ EXPECT_EQ(4u, ref5.getIndex());
- BigBuffer buffer(1024);
- StringPool::flattenUtf8(&buffer, pool);
+ BigBuffer buffers[2] = { BigBuffer(1024), BigBuffer(1024) };
+ StringPool::flattenUtf8(&buffers[0], pool);
+ StringPool::flattenUtf16(&buffers[1], pool);
- std::unique_ptr<uint8_t[]> data = util::copy(buffer);
- {
+ // Test both UTF-8 and UTF-16 buffers.
+ for (const BigBuffer& buffer : buffers) {
+ std::unique_ptr<uint8_t[]> data = util::copy(buffer);
+
ResStringPool test;
ASSERT_EQ(test.setTo(data.get(), buffer.size()), NO_ERROR);
- EXPECT_EQ(util::getString(test, 0), u"hello");
- EXPECT_EQ(util::getString(test, 1), u"goodbye");
- EXPECT_EQ(util::getString(test, 2), sLongString);
- EXPECT_EQ(util::getString(test, 3), u"style");
+ EXPECT_EQ(std::string("hello"), util::getString(test, 0));
+ EXPECT_EQ(StringPiece16(u"hello"), util::getString16(test, 0));
- const ResStringPool_span* span = test.styleAt(3);
+ EXPECT_EQ(std::string("goodbye"), util::getString(test, 1));
+ EXPECT_EQ(StringPiece16(u"goodbye"), util::getString16(test, 1));
+
+ EXPECT_EQ(StringPiece(sLongString), util::getString(test, 2));
+ EXPECT_EQ(util::utf8ToUtf16(sLongString), util::getString16(test, 2).toString());
+
+ size_t len;
+ EXPECT_TRUE(test.stringAt(3, &len) != nullptr || test.string8At(3, &len) != nullptr);
+
+ EXPECT_EQ(std::string("style"), util::getString(test, 4));
+ EXPECT_EQ(StringPiece16(u"style"), util::getString16(test, 4));
+
+ const ResStringPool_span* span = test.styleAt(4);
ASSERT_NE(nullptr, span);
- EXPECT_EQ(util::getString(test, span->name.index), u"b");
+ EXPECT_EQ(std::string("b"), util::getString(test, span->name.index));
+ EXPECT_EQ(StringPiece16(u"b"), util::getString16(test, span->name.index));
EXPECT_EQ(0u, span->firstChar);
EXPECT_EQ(1u, span->lastChar);
span++;
ASSERT_NE(ResStringPool_span::END, span->name.index);
- EXPECT_EQ(util::getString(test, span->name.index), u"i");
+ EXPECT_EQ(std::string("i"), util::getString(test, span->name.index));
+ EXPECT_EQ(StringPiece16(u"i"), util::getString16(test, span->name.index));
EXPECT_EQ(2u, span->firstChar);
EXPECT_EQ(3u, span->lastChar);
span++;
diff --git a/tools/aapt2/ValueVisitor_test.cpp b/tools/aapt2/ValueVisitor_test.cpp
index 1624079..54e9fcd 100644
--- a/tools/aapt2/ValueVisitor_test.cpp
+++ b/tools/aapt2/ValueVisitor_test.cpp
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-#include <gtest/gtest.h>
-#include <string>
-
#include "ResourceValues.h"
-#include "util/Util.h"
#include "ValueVisitor.h"
-#include "test/Builders.h"
+#include "test/Test.h"
+#include "util/Util.h"
+
+#include <string>
namespace aapt {
@@ -51,7 +50,7 @@
};
TEST(ValueVisitorTest, VisitsReference) {
- Reference ref(ResourceName{u"android", ResourceType::kAttr, u"foo"});
+ Reference ref(ResourceName{"android", ResourceType::kAttr, "foo"});
SingleReferenceVisitor visitor;
ref.accept(&visitor);
@@ -60,8 +59,8 @@
TEST(ValueVisitorTest, VisitsReferencesInStyle) {
std::unique_ptr<Style> style = test::StyleBuilder()
- .setParent(u"@android:style/foo")
- .addItem(u"@android:attr/one", test::buildReference(u"@android:id/foo"))
+ .setParent("android:style/foo")
+ .addItem("android:attr/one", test::buildReference("android:id/foo"))
.build();
StyleVisitor visitor;
@@ -74,11 +73,11 @@
}
TEST(ValueVisitorTest, ValueCast) {
- std::unique_ptr<Reference> ref = test::buildReference(u"@android:color/white");
+ std::unique_ptr<Reference> ref = test::buildReference("android:color/white");
EXPECT_NE(valueCast<Reference>(ref.get()), nullptr);
std::unique_ptr<Style> style = test::StyleBuilder()
- .addItem(u"@android:attr/foo", test::buildReference(u"@android:color/black"))
+ .addItem("android:attr/foo", test::buildReference("android:color/black"))
.build();
EXPECT_NE(valueCast<Style>(style.get()), nullptr);
EXPECT_EQ(valueCast<Reference>(style.get()), nullptr);
diff --git a/tools/aapt2/compile/Compile.cpp b/tools/aapt2/compile/Compile.cpp
index 2452a1d..39e4489 100644
--- a/tools/aapt2/compile/Compile.cpp
+++ b/tools/aapt2/compile/Compile.cpp
@@ -43,8 +43,8 @@
struct ResourcePathData {
Source source;
- std::u16string resourceDir;
- std::u16string name;
+ std::string resourceDir;
+ std::string name;
std::string extension;
// Original config str. We keep this because when we parse the config, we may add on
@@ -96,8 +96,8 @@
return ResourcePathData{
Source(path),
- util::utf8ToUtf16(dirStr),
- util::utf8ToUtf16(name),
+ dirStr.toString(),
+ name.toString(),
extension.toString(),
configStr.toString(),
config
@@ -127,7 +127,7 @@
}
static bool isHidden(const StringPiece& filename) {
- return util::stringStartsWith<char>(filename, ".");
+ return util::stringStartsWith(filename, ".");
}
/**
@@ -200,7 +200,7 @@
parserOptions.errorOnPositionalArguments = !options.legacyMode;
// If the filename includes donottranslate, then the default translatable is false.
- parserOptions.translatable = pathData.name.find(u"donottranslate") == std::string::npos;
+ parserOptions.translatable = pathData.name.find("donottranslate") == std::string::npos;
ResourceParser resParser(context->getDiagnostics(), &table, pathData.source,
pathData.config, parserOptions);
@@ -440,8 +440,8 @@
return nullptr;
}
- const std::u16string& getCompilationPackage() override {
- static std::u16string empty;
+ const std::string& getCompilationPackage() override {
+ static std::string empty;
return empty;
}
@@ -454,6 +454,10 @@
return nullptr;
}
+ int getMinSdkVersion() override {
+ return 0;
+ }
+
private:
StdErrDiagnostics mDiagnostics;
bool mVerbose = false;
@@ -526,7 +530,7 @@
context.getDiagnostics()->note(DiagMessage(pathData.source) << "processing");
}
- if (pathData.resourceDir == u"values") {
+ if (pathData.resourceDir == "values") {
// Overwrite the extension.
pathData.extension = "arsc";
diff --git a/tools/aapt2/compile/IdAssigner.cpp b/tools/aapt2/compile/IdAssigner.cpp
index aa4a580..501ae9d 100644
--- a/tools/aapt2/compile/IdAssigner.cpp
+++ b/tools/aapt2/compile/IdAssigner.cpp
@@ -15,92 +15,184 @@
*/
#include "ResourceTable.h"
-
#include "compile/IdAssigner.h"
#include "process/IResourceTableConsumer.h"
#include "util/Util.h"
-#include <bitset>
#include <cassert>
-#include <set>
+#include <map>
namespace aapt {
+/**
+ * Assigns the intended ID to the ResourceTablePackage, ResourceTableType, and ResourceEntry,
+ * as long as there is no existing ID or the ID is the same.
+ */
+static bool assignId(IDiagnostics* diag, const ResourceId id, const ResourceName& name,
+ ResourceTablePackage* pkg, ResourceTableType* type, ResourceEntry* entry) {
+ if (pkg->id.value() == id.packageId()) {
+ if (!type->id || type->id.value() == id.typeId()) {
+ type->id = id.typeId();
+
+ if (!entry->id || entry->id.value() == id.entryId()) {
+ entry->id = id.entryId();
+ return true;
+ }
+ }
+ }
+
+ const ResourceId existingId(pkg->id.value(),
+ type->id ? type->id.value() : 0,
+ entry->id ? entry->id.value() : 0);
+ diag->error(DiagMessage() << "can't assign ID " << id
+ << " to resource " << name
+ << " with conflicting ID " << existingId);
+ return false;
+}
+
bool IdAssigner::consume(IAaptContext* context, ResourceTable* table) {
- std::bitset<256> usedTypeIds;
- std::set<uint16_t> usedEntryIds;
+ std::map<ResourceId, ResourceName> assignedIds;
for (auto& package : table->packages) {
assert(package->id && "packages must have manually assigned IDs");
- usedTypeIds.reset();
-
- // Type ID 0 is invalid, reserve it.
- usedTypeIds.set(0);
-
- // Collect used type IDs.
for (auto& type : package->types) {
- if (type->id) {
- usedEntryIds.clear();
+ for (auto& entry : type->entries) {
+ const ResourceName name(package->name, type->type, entry->name);
- if (usedTypeIds[type->id.value()]) {
- // This ID is already taken!
- context->getDiagnostics()->error(DiagMessage()
- << "type '" << type->type << "' in "
- << "package '" << package->name << "' has "
- << "duplicate ID "
- << std::hex << (int) type->id.value()
- << std::dec);
- return false;
+ if (mAssignedIdMap) {
+ // Assign the pre-assigned stable ID meant for this resource.
+ const auto iter = mAssignedIdMap->find(name);
+ if (iter != mAssignedIdMap->end()) {
+ const ResourceId assignedId = iter->second;
+ const bool result = assignId(context->getDiagnostics(), assignedId, name,
+ package.get(), type.get(), entry.get());
+ if (!result) {
+ return false;
+ }
+ }
}
- // Mark the type ID as taken.
- usedTypeIds.set(type->id.value());
- }
-
- // Collect used entry IDs.
- for (auto& entry : type->entries) {
- if (entry->id) {
- // Mark entry ID as taken.
- if (!usedEntryIds.insert(entry->id.value()).second) {
- // This ID existed before!
- ResourceNameRef nameRef(package->name, type->type, entry->name);
- context->getDiagnostics()->error(DiagMessage()
- << "resource '" << nameRef << "' "
- << "has duplicate entry ID "
- << std::hex << (int) entry->id.value()
- << std::dec);
+ if (package->id && type->id && entry->id) {
+ // If the ID is set for this resource, then reserve it.
+ ResourceId resourceId(package->id.value(), type->id.value(), entry->id.value());
+ auto result = assignedIds.insert({ resourceId, name });
+ const ResourceName& existingName = result.first->second;
+ if (!result.second) {
+ context->getDiagnostics()->error(DiagMessage() << "resource " << name
+ << " has same ID "
+ << resourceId
+ << " as " << existingName);
return false;
}
}
}
+ }
+ }
- // Assign unused entry IDs.
- const auto endUsedEntryIter = usedEntryIds.end();
- auto nextUsedEntryIter = usedEntryIds.begin();
- uint16_t nextId = 0;
- for (auto& entry : type->entries) {
- if (!entry->id) {
- // Assign the next available entryID.
- while (nextUsedEntryIter != endUsedEntryIter &&
- nextId == *nextUsedEntryIter) {
- nextId++;
- ++nextUsedEntryIter;
- }
- entry->id = nextId++;
- }
+ if (mAssignedIdMap) {
+ // Reserve all the IDs mentioned in the stable ID map. That way we won't assign
+ // IDs that were listed in the map if they don't exist in the table.
+ for (const auto& stableIdEntry : *mAssignedIdMap) {
+ const ResourceName& preAssignedName = stableIdEntry.first;
+ const ResourceId& preAssignedId = stableIdEntry.second;
+ auto result = assignedIds.insert({ preAssignedId, preAssignedName });
+ const ResourceName& existingName = result.first->second;
+ if (!result.second && existingName != preAssignedName) {
+ context->getDiagnostics()->error(DiagMessage() << "stable ID " << preAssignedId
+ << " for resource " << preAssignedName
+ << " is already taken by resource "
+ << existingName);
+ return false;
}
}
+ }
- // Assign unused type IDs.
- size_t nextTypeId = 0;
+ // Assign any resources without IDs the next available ID. Gaps will be filled if possible,
+ // unless those IDs have been reserved.
+
+ const auto assignedIdsIterEnd = assignedIds.end();
+ for (auto& package : table->packages) {
+ assert(package->id && "packages must have manually assigned IDs");
+
+ // Build a half filled ResourceId object, which will be used to find the closest matching
+ // reserved ID in the assignedId map. From that point the next available type ID can be
+ // found.
+ ResourceId resourceId(package->id.value(), 0, 0);
+ uint8_t nextExpectedTypeId = 1;
+
+ // Find the closest matching ResourceId that is <= the one with only the package set.
+ auto nextTypeIter = assignedIds.lower_bound(resourceId);
for (auto& type : package->types) {
if (!type->id) {
- while (nextTypeId < usedTypeIds.size() && usedTypeIds[nextTypeId]) {
- nextTypeId++;
+ // We need to assign a type ID. Iterate over the reserved IDs until we find
+ // some type ID that is a distance of 2 greater than the last one we've seen.
+ // That means there is an available type ID between these reserved IDs.
+ while (nextTypeIter != assignedIdsIterEnd) {
+ if (nextTypeIter->first.packageId() != package->id.value()) {
+ break;
+ }
+
+ const uint8_t typeId = nextTypeIter->first.typeId();
+ if (typeId > nextExpectedTypeId) {
+ // There is a gap in the type IDs, so use the missing one.
+ type->id = nextExpectedTypeId++;
+ break;
+ }
+
+ // Set our expectation to be the next type ID after the reserved one we
+ // just saw.
+ nextExpectedTypeId = typeId + 1;
+
+ // Move to the next reserved ID.
+ ++nextTypeIter;
}
- type->id = static_cast<uint8_t>(nextTypeId);
- nextTypeId++;
+
+ if (!type->id) {
+ // We must have hit the end of the reserved IDs and not found a gap.
+ // That means the next ID is available.
+ type->id = nextExpectedTypeId++;
+ }
+ }
+
+ resourceId = ResourceId(package->id.value(), type->id.value(), 0);
+ uint16_t nextExpectedEntryId = 0;
+
+ // Find the closest matching ResourceId that is <= the one with only the package
+ // and type set.
+ auto nextEntryIter = assignedIds.lower_bound(resourceId);
+ for (auto& entry : type->entries) {
+ if (!entry->id) {
+ // We need to assign an entry ID. Iterate over the reserved IDs until we find
+ // some entry ID that is a distance of 2 greater than the last one we've seen.
+ // That means there is an available entry ID between these reserved IDs.
+ while (nextEntryIter != assignedIdsIterEnd) {
+ if (nextEntryIter->first.packageId() != package->id.value() ||
+ nextEntryIter->first.typeId() != type->id.value()) {
+ break;
+ }
+
+ const uint16_t entryId = nextEntryIter->first.entryId();
+ if (entryId > nextExpectedEntryId) {
+ // There is a gap in the entry IDs, so use the missing one.
+ entry->id = nextExpectedEntryId++;
+ break;
+ }
+
+ // Set our expectation to be the next type ID after the reserved one we
+ // just saw.
+ nextExpectedEntryId = entryId + 1;
+
+ // Move to the next reserved entry ID.
+ ++nextEntryIter;
+ }
+
+ if (!entry->id) {
+ // We must have hit the end of the reserved IDs and not found a gap.
+ // That means the next ID is available.
+ entry->id = nextExpectedEntryId++;
+ }
+ }
}
}
}
diff --git a/tools/aapt2/compile/IdAssigner.h b/tools/aapt2/compile/IdAssigner.h
index 514df3a..06cd5e3 100644
--- a/tools/aapt2/compile/IdAssigner.h
+++ b/tools/aapt2/compile/IdAssigner.h
@@ -17,16 +17,29 @@
#ifndef AAPT_COMPILE_IDASSIGNER_H
#define AAPT_COMPILE_IDASSIGNER_H
+#include "Resource.h"
#include "process/IResourceTableConsumer.h"
+#include <android-base/macros.h>
+#include <unordered_map>
+
namespace aapt {
/**
* Assigns IDs to each resource in the table, respecting existing IDs and filling in gaps
* in between fixed ID assignments.
*/
-struct IdAssigner : public IResourceTableConsumer {
+class IdAssigner : public IResourceTableConsumer {
+public:
+ IdAssigner() = default;
+ explicit IdAssigner(const std::unordered_map<ResourceName, ResourceId>* map) :
+ mAssignedIdMap(map) {
+ }
+
bool consume(IAaptContext* context, ResourceTable* table) override;
+
+private:
+ const std::unordered_map<ResourceName, ResourceId>* mAssignedIdMap = nullptr;
};
} // namespace aapt
diff --git a/tools/aapt2/compile/IdAssigner_test.cpp b/tools/aapt2/compile/IdAssigner_test.cpp
index e25a17a..d21fcba 100644
--- a/tools/aapt2/compile/IdAssigner_test.cpp
+++ b/tools/aapt2/compile/IdAssigner_test.cpp
@@ -15,11 +15,7 @@
*/
#include "compile/IdAssigner.h"
-
-#include "test/Context.h"
-#include "test/Builders.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
@@ -27,10 +23,10 @@
TEST(IdAssignerTest, AssignIds) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addSimple(u"@android:attr/foo")
- .addSimple(u"@android:attr/bar")
- .addSimple(u"@android:id/foo")
- .setPackageId(u"android", 0x01)
+ .addSimple("android:attr/foo")
+ .addSimple("android:attr/bar")
+ .addSimple("android:id/foo")
+ .setPackageId("android", 0x01)
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
@@ -42,12 +38,17 @@
TEST(IdAssignerTest, AssignIdsWithReservedIds) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addSimple(u"@android:attr/foo", ResourceId(0x01040006))
- .addSimple(u"@android:attr/bar")
- .addSimple(u"@android:id/foo")
- .addSimple(u"@app:id/biz")
- .setPackageId(u"android", 0x01)
- .setPackageId(u"app", 0x7f)
+ .addSimple("android:id/foo", ResourceId(0x01010000))
+ .addSimple("android:dimen/two")
+ .addSimple("android:integer/three")
+ .addSimple("android:string/five")
+ .addSimple("android:attr/fun", ResourceId(0x01040000))
+ .addSimple("android:attr/foo", ResourceId(0x01040006))
+ .addSimple("android:attr/bar")
+ .addSimple("android:attr/baz")
+ .addSimple("app:id/biz")
+ .setPackageId("android", 0x01)
+ .setPackageId("app", 0x7f)
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
@@ -55,14 +56,42 @@
ASSERT_TRUE(assigner.consume(context.get(), table.get()));
ASSERT_TRUE(verifyIds(table.get()));
+
+ Maybe<ResourceTable::SearchResult> maybeResult;
+
+ // Expect to fill in the gaps between 0x0101XXXX and 0x0104XXXX.
+
+ maybeResult = table->findResource(test::parseNameOrDie("android:dimen/two"));
+ AAPT_ASSERT_TRUE(maybeResult);
+ EXPECT_EQ(make_value<uint8_t>(2), maybeResult.value().type->id);
+
+ maybeResult = table->findResource(test::parseNameOrDie("android:integer/three"));
+ AAPT_ASSERT_TRUE(maybeResult);
+ EXPECT_EQ(make_value<uint8_t>(3), maybeResult.value().type->id);
+
+ // Expect to bypass the reserved 0x0104XXXX IDs and use the next 0x0105XXXX IDs.
+
+ maybeResult = table->findResource(test::parseNameOrDie("android:string/five"));
+ AAPT_ASSERT_TRUE(maybeResult);
+ EXPECT_EQ(make_value<uint8_t>(5), maybeResult.value().type->id);
+
+ // Expect to fill in the gaps between 0x01040000 and 0x01040006.
+
+ maybeResult = table->findResource(test::parseNameOrDie("android:attr/bar"));
+ AAPT_ASSERT_TRUE(maybeResult);
+ EXPECT_EQ(make_value<uint16_t>(1), maybeResult.value().entry->id);
+
+ maybeResult = table->findResource(test::parseNameOrDie("android:attr/baz"));
+ AAPT_ASSERT_TRUE(maybeResult);
+ EXPECT_EQ(make_value<uint16_t>(2), maybeResult.value().entry->id);
}
TEST(IdAssignerTest, FailWhenNonUniqueIdsAssigned) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addSimple(u"@android:attr/foo", ResourceId(0x01040006))
- .addSimple(u"@android:attr/bar", ResourceId(0x01040006))
- .setPackageId(u"android", 0x01)
- .setPackageId(u"app", 0x7f)
+ .addSimple("android:attr/foo", ResourceId(0x01040006))
+ .addSimple("android:attr/bar", ResourceId(0x01040006))
+ .setPackageId("android", 0x01)
+ .setPackageId("app", 0x7f)
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
@@ -71,6 +100,29 @@
ASSERT_FALSE(assigner.consume(context.get(), table.get()));
}
+TEST(IdAssignerTest, AssignIdsWithIdMap) {
+ std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
+ .addSimple("android:attr/foo")
+ .addSimple("android:attr/bar")
+ .setPackageId("android", 0x01)
+ .build();
+
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
+ std::unordered_map<ResourceName, ResourceId> idMap = {
+ { test::parseNameOrDie("android:attr/foo"), ResourceId(0x01010002) } };
+ IdAssigner assigner(&idMap);
+ ASSERT_TRUE(assigner.consume(context.get(), table.get()));
+ ASSERT_TRUE(verifyIds(table.get()));
+ Maybe<ResourceTable::SearchResult> result = table->findResource(
+ test::parseNameOrDie("android:attr/foo"));
+ AAPT_ASSERT_TRUE(result);
+
+ const ResourceTable::SearchResult& searchResult = result.value();
+ EXPECT_EQ(make_value<uint8_t>(0x01), searchResult.package->id);
+ EXPECT_EQ(make_value<uint8_t>(0x01), searchResult.type->id);
+ EXPECT_EQ(make_value<uint16_t>(0x0002), searchResult.entry->id);
+}
+
::testing::AssertionResult verifyIds(ResourceTable* table) {
std::set<uint8_t> packageIds;
for (auto& package : table->packages) {
diff --git a/tools/aapt2/compile/Png.cpp b/tools/aapt2/compile/Png.cpp
index bbf7f41..055d8b5 100644
--- a/tools/aapt2/compile/Png.cpp
+++ b/tools/aapt2/compile/Png.cpp
@@ -1234,7 +1234,7 @@
goto bail;
}
- if (util::stringEndsWith<char>(source.path, ".9.png")) {
+ if (util::stringEndsWith(source.path, ".9.png")) {
std::string errorMsg;
if (!do9Patch(&pngInfo, &errorMsg)) {
mDiag->error(DiagMessage() << errorMsg);
diff --git a/tools/aapt2/compile/PseudolocaleGenerator.cpp b/tools/aapt2/compile/PseudolocaleGenerator.cpp
index d080e16..732101f 100644
--- a/tools/aapt2/compile/PseudolocaleGenerator.cpp
+++ b/tools/aapt2/compile/PseudolocaleGenerator.cpp
@@ -29,7 +29,7 @@
StringPool* pool) {
Pseudolocalizer localizer(method);
- const StringPiece16 originalText = *string->value->str;
+ const StringPiece originalText = *string->value->str;
StyleString localized;
@@ -147,7 +147,7 @@
}
void visit(String* string) override {
- std::u16string result = mLocalizer.start() + mLocalizer.text(*string->value) +
+ std::string result = mLocalizer.start() + mLocalizer.text(*string->value) +
mLocalizer.end();
std::unique_ptr<String> localized = util::make_unique<String>(mPool->makeRef(result));
localized->setSource(string->getSource());
diff --git a/tools/aapt2/compile/PseudolocaleGenerator_test.cpp b/tools/aapt2/compile/PseudolocaleGenerator_test.cpp
index 4cb6ea2..1f62f90 100644
--- a/tools/aapt2/compile/PseudolocaleGenerator_test.cpp
+++ b/tools/aapt2/compile/PseudolocaleGenerator_test.cpp
@@ -15,21 +15,18 @@
*/
#include "compile/PseudolocaleGenerator.h"
-#include "test/Builders.h"
-#include "test/Common.h"
-#include "test/Context.h"
+#include "test/Test.h"
#include "util/Util.h"
#include <androidfw/ResourceTypes.h>
-#include <gtest/gtest.h>
namespace aapt {
TEST(PseudolocaleGeneratorTest, PseudolocalizeStyledString) {
StringPool pool;
StyleString originalStyle;
- originalStyle.str = u"Hello world!";
- originalStyle.spans = { Span{ u"b", 2, 3 }, Span{ u"b", 6, 7 }, Span{ u"i", 1, 10 } };
+ originalStyle.str = "Hello world!";
+ originalStyle.spans = { Span{ "b", 2, 3 }, Span{ "b", 6, 7 }, Span{ "i", 1, 10 } };
std::unique_ptr<StyledString> newString = pseudolocalizeStyledString(
util::make_unique<StyledString>(pool.makeRef(originalStyle)).get(),
@@ -38,51 +35,52 @@
EXPECT_EQ(originalStyle.str, *newString->value->str);
ASSERT_EQ(originalStyle.spans.size(), newString->value->spans.size());
- EXPECT_EQ(2u, newString->value->spans[0].firstChar);
- EXPECT_EQ(3u, newString->value->spans[0].lastChar);
- EXPECT_EQ(std::u16string(u"b"), *newString->value->spans[0].name);
+ EXPECT_EQ(std::string("He").size(), newString->value->spans[0].firstChar);
+ EXPECT_EQ(std::string("Hel").size(), newString->value->spans[0].lastChar);
+ EXPECT_EQ(std::string("b"), *newString->value->spans[0].name);
- EXPECT_EQ(6u, newString->value->spans[1].firstChar);
- EXPECT_EQ(7u, newString->value->spans[1].lastChar);
- EXPECT_EQ(std::u16string(u"b"), *newString->value->spans[1].name);
+ EXPECT_EQ(std::string("Hello ").size(), newString->value->spans[1].firstChar);
+ EXPECT_EQ(std::string("Hello w").size(), newString->value->spans[1].lastChar);
+ EXPECT_EQ(std::string("b"), *newString->value->spans[1].name);
- EXPECT_EQ(1u, newString->value->spans[2].firstChar);
- EXPECT_EQ(10u, newString->value->spans[2].lastChar);
- EXPECT_EQ(std::u16string(u"i"), *newString->value->spans[2].name);
+ EXPECT_EQ(std::string("H").size(), newString->value->spans[2].firstChar);
+ EXPECT_EQ(std::string("Hello worl").size(), newString->value->spans[2].lastChar);
+ EXPECT_EQ(std::string("i"), *newString->value->spans[2].name);
- originalStyle.spans.push_back(Span{ u"em", 0, 11u });
+ originalStyle.spans.push_back(Span{ "em", 0, 11u });
newString = pseudolocalizeStyledString(
util::make_unique<StyledString>(pool.makeRef(originalStyle)).get(),
Pseudolocalizer::Method::kAccent, &pool);
- EXPECT_EQ(std::u16string(u"[Ĥéļļö ŵöŕļð¡ one two]"), *newString->value->str);
+ EXPECT_EQ(std::string("[Ĥéļļö ŵöŕļð¡ one two]"), *newString->value->str);
ASSERT_EQ(originalStyle.spans.size(), newString->value->spans.size());
- EXPECT_EQ(3u, newString->value->spans[0].firstChar);
- EXPECT_EQ(4u, newString->value->spans[0].lastChar);
+ EXPECT_EQ(std::string("[Ĥé").size(), newString->value->spans[0].firstChar);
+ EXPECT_EQ(std::string("[Ĥéļ").size(), newString->value->spans[0].lastChar);
- EXPECT_EQ(7u, newString->value->spans[1].firstChar);
- EXPECT_EQ(8u, newString->value->spans[1].lastChar);
+ EXPECT_EQ(std::string("[Ĥéļļö ").size(), newString->value->spans[1].firstChar);
+ EXPECT_EQ(std::string("[Ĥéļļö ŵ").size(), newString->value->spans[1].lastChar);
- EXPECT_EQ(2u, newString->value->spans[2].firstChar);
- EXPECT_EQ(11u, newString->value->spans[2].lastChar);
+ EXPECT_EQ(std::string("[Ĥ").size(), newString->value->spans[2].firstChar);
+ EXPECT_EQ(std::string("[Ĥéļļö ŵöŕļ").size(), newString->value->spans[2].lastChar);
- EXPECT_EQ(1u, newString->value->spans[3].firstChar);
- EXPECT_EQ(12u, newString->value->spans[3].lastChar);
+ EXPECT_EQ(std::string("[").size(), newString->value->spans[3].firstChar);
+ EXPECT_EQ(std::string("[Ĥéļļö ŵöŕļð").size(), newString->value->spans[3].lastChar);
}
TEST(PseudolocaleGeneratorTest, PseudolocalizeOnlyDefaultConfigs) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addString(u"@android:string/one", u"one")
- .addString(u"@android:string/two", ResourceId{}, test::parseConfigOrDie("en"), u"two")
- .addString(u"@android:string/three", u"three")
- .addString(u"@android:string/three", ResourceId{}, test::parseConfigOrDie("en-rXA"),
- u"three")
- .addString(u"@android:string/four", u"four")
+ .addString("android:string/one", "one")
+ .addString("android:string/two", ResourceId{}, test::parseConfigOrDie("en"), "two")
+ .addString("android:string/three", "three")
+ .addString("android:string/three", ResourceId{}, test::parseConfigOrDie("en-rXA"),
+ "three")
+ .addString("android:string/four", "four")
.build();
- String* val = test::getValue<String>(table.get(), u"@android:string/four");
+ String* val = test::getValue<String>(table.get(), "android:string/four");
+ ASSERT_NE(nullptr, val);
val->setTranslateable(false);
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
@@ -90,31 +88,31 @@
ASSERT_TRUE(generator.consume(context.get(), table.get()));
// Normal pseudolocalization should take place.
- ASSERT_NE(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/one",
+ ASSERT_NE(nullptr, test::getValueForConfig<String>(table.get(), "android:string/one",
test::parseConfigOrDie("en-rXA")));
- ASSERT_NE(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/one",
+ ASSERT_NE(nullptr, test::getValueForConfig<String>(table.get(), "android:string/one",
test::parseConfigOrDie("ar-rXB")));
// No default config for android:string/two, so no pseudlocales should exist.
- ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/two",
+ ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), "android:string/two",
test::parseConfigOrDie("en-rXA")));
- ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/two",
+ ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), "android:string/two",
test::parseConfigOrDie("ar-rXB")));
// Check that we didn't override manual pseudolocalization.
- val = test::getValueForConfig<String>(table.get(), u"@android:string/three",
+ val = test::getValueForConfig<String>(table.get(), "android:string/three",
test::parseConfigOrDie("en-rXA"));
ASSERT_NE(nullptr, val);
- EXPECT_EQ(std::u16string(u"three"), *val->value);
+ EXPECT_EQ(std::string("three"), *val->value);
- ASSERT_NE(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/three",
+ ASSERT_NE(nullptr, test::getValueForConfig<String>(table.get(), "android:string/three",
test::parseConfigOrDie("ar-rXB")));
// Check that four's translateable marker was honored.
- ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/four",
+ ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), "android:string/four",
test::parseConfigOrDie("en-rXA")));
- ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), u"@android:string/four",
+ ASSERT_EQ(nullptr, test::getValueForConfig<String>(table.get(), "android:string/four",
test::parseConfigOrDie("ar-rXB")));
}
diff --git a/tools/aapt2/compile/Pseudolocalizer.cpp b/tools/aapt2/compile/Pseudolocalizer.cpp
index 767d746..90d0d85 100644
--- a/tools/aapt2/compile/Pseudolocalizer.cpp
+++ b/tools/aapt2/compile/Pseudolocalizer.cpp
@@ -20,41 +20,41 @@
namespace aapt {
// String basis to generate expansion
-static const std::u16string k_expansion_string = u"one two three "
+static const std::string k_expansion_string = "one two three "
"four five six seven eight nine ten eleven twelve thirteen "
"fourteen fiveteen sixteen seventeen nineteen twenty";
// Special unicode characters to override directionality of the words
-static const std::u16string k_rlm = u"\u200f";
-static const std::u16string k_rlo = u"\u202e";
-static const std::u16string k_pdf = u"\u202c";
+static const std::string k_rlm = "\u200f";
+static const std::string k_rlo = "\u202e";
+static const std::string k_pdf = "\u202c";
// Placeholder marks
-static const std::u16string k_placeholder_open = u"\u00bb";
-static const std::u16string k_placeholder_close = u"\u00ab";
+static const std::string k_placeholder_open = "\u00bb";
+static const std::string k_placeholder_close = "\u00ab";
-static const char16_t k_arg_start = u'{';
-static const char16_t k_arg_end = u'}';
+static const char k_arg_start = '{';
+static const char k_arg_end = '}';
class PseudoMethodNone : public PseudoMethodImpl {
public:
- std::u16string text(const StringPiece16& text) override { return text.toString(); }
- std::u16string placeholder(const StringPiece16& text) override { return text.toString(); }
+ std::string text(const StringPiece& text) override { return text.toString(); }
+ std::string placeholder(const StringPiece& text) override { return text.toString(); }
};
class PseudoMethodBidi : public PseudoMethodImpl {
public:
- std::u16string text(const StringPiece16& text) override;
- std::u16string placeholder(const StringPiece16& text) override;
+ std::string text(const StringPiece& text) override;
+ std::string placeholder(const StringPiece& text) override;
};
class PseudoMethodAccent : public PseudoMethodImpl {
public:
PseudoMethodAccent() : mDepth(0), mWordCount(0), mLength(0) {}
- std::u16string start() override;
- std::u16string end() override;
- std::u16string text(const StringPiece16& text) override;
- std::u16string placeholder(const StringPiece16& text) override;
+ std::string start() override;
+ std::string end() override;
+ std::string text(const StringPiece& text) override;
+ std::string placeholder(const StringPiece& text) override;
private:
size_t mDepth;
size_t mWordCount;
@@ -79,12 +79,12 @@
}
}
-std::u16string Pseudolocalizer::text(const StringPiece16& text) {
- std::u16string out;
+std::string Pseudolocalizer::text(const StringPiece& text) {
+ std::string out;
size_t depth = mLastDepth;
size_t lastpos, pos;
const size_t length = text.size();
- const char16_t* str = text.data();
+ const char* str = text.data();
bool escaped = false;
for (lastpos = pos = 0; pos < length; pos++) {
char16_t c = str[pos];
@@ -111,7 +111,7 @@
}
size_t size = nextpos - lastpos;
if (size) {
- std::u16string chunk = text.substr(lastpos, size).toString();
+ std::string chunk = text.substr(lastpos, size).toString();
if (pseudo) {
chunk = mImpl->text(chunk);
} else if (str[lastpos] == k_arg_start && str[nextpos - 1] == k_arg_end) {
@@ -131,67 +131,67 @@
return out;
}
-static const char16_t* pseudolocalizeChar(const char16_t c) {
+static const char* pseudolocalizeChar(const char c) {
switch (c) {
- case 'a': return u"\u00e5";
- case 'b': return u"\u0253";
- case 'c': return u"\u00e7";
- case 'd': return u"\u00f0";
- case 'e': return u"\u00e9";
- case 'f': return u"\u0192";
- case 'g': return u"\u011d";
- case 'h': return u"\u0125";
- case 'i': return u"\u00ee";
- case 'j': return u"\u0135";
- case 'k': return u"\u0137";
- case 'l': return u"\u013c";
- case 'm': return u"\u1e3f";
- case 'n': return u"\u00f1";
- case 'o': return u"\u00f6";
- case 'p': return u"\u00fe";
- case 'q': return u"\u0051";
- case 'r': return u"\u0155";
- case 's': return u"\u0161";
- case 't': return u"\u0163";
- case 'u': return u"\u00fb";
- case 'v': return u"\u0056";
- case 'w': return u"\u0175";
- case 'x': return u"\u0445";
- case 'y': return u"\u00fd";
- case 'z': return u"\u017e";
- case 'A': return u"\u00c5";
- case 'B': return u"\u03b2";
- case 'C': return u"\u00c7";
- case 'D': return u"\u00d0";
- case 'E': return u"\u00c9";
- case 'G': return u"\u011c";
- case 'H': return u"\u0124";
- case 'I': return u"\u00ce";
- case 'J': return u"\u0134";
- case 'K': return u"\u0136";
- case 'L': return u"\u013b";
- case 'M': return u"\u1e3e";
- case 'N': return u"\u00d1";
- case 'O': return u"\u00d6";
- case 'P': return u"\u00de";
- case 'Q': return u"\u0071";
- case 'R': return u"\u0154";
- case 'S': return u"\u0160";
- case 'T': return u"\u0162";
- case 'U': return u"\u00db";
- case 'V': return u"\u03bd";
- case 'W': return u"\u0174";
- case 'X': return u"\u00d7";
- case 'Y': return u"\u00dd";
- case 'Z': return u"\u017d";
- case '!': return u"\u00a1";
- case '?': return u"\u00bf";
- case '$': return u"\u20ac";
- default: return NULL;
+ case 'a': return "\u00e5";
+ case 'b': return "\u0253";
+ case 'c': return "\u00e7";
+ case 'd': return "\u00f0";
+ case 'e': return "\u00e9";
+ case 'f': return "\u0192";
+ case 'g': return "\u011d";
+ case 'h': return "\u0125";
+ case 'i': return "\u00ee";
+ case 'j': return "\u0135";
+ case 'k': return "\u0137";
+ case 'l': return "\u013c";
+ case 'm': return "\u1e3f";
+ case 'n': return "\u00f1";
+ case 'o': return "\u00f6";
+ case 'p': return "\u00fe";
+ case 'q': return "\u0051";
+ case 'r': return "\u0155";
+ case 's': return "\u0161";
+ case 't': return "\u0163";
+ case 'u': return "\u00fb";
+ case 'v': return "\u0056";
+ case 'w': return "\u0175";
+ case 'x': return "\u0445";
+ case 'y': return "\u00fd";
+ case 'z': return "\u017e";
+ case 'A': return "\u00c5";
+ case 'B': return "\u03b2";
+ case 'C': return "\u00c7";
+ case 'D': return "\u00d0";
+ case 'E': return "\u00c9";
+ case 'G': return "\u011c";
+ case 'H': return "\u0124";
+ case 'I': return "\u00ce";
+ case 'J': return "\u0134";
+ case 'K': return "\u0136";
+ case 'L': return "\u013b";
+ case 'M': return "\u1e3e";
+ case 'N': return "\u00d1";
+ case 'O': return "\u00d6";
+ case 'P': return "\u00de";
+ case 'Q': return "\u0071";
+ case 'R': return "\u0154";
+ case 'S': return "\u0160";
+ case 'T': return "\u0162";
+ case 'U': return "\u00db";
+ case 'V': return "\u03bd";
+ case 'W': return "\u0174";
+ case 'X': return "\u00d7";
+ case 'Y': return "\u00dd";
+ case 'Z': return "\u017d";
+ case '!': return "\u00a1";
+ case '?': return "\u00bf";
+ case '$': return "\u20ac";
+ default: return nullptr;
}
}
-static bool isPossibleNormalPlaceholderEnd(const char16_t c) {
+static bool isPossibleNormalPlaceholderEnd(const char c) {
switch (c) {
case 's': return true;
case 'S': return true;
@@ -218,11 +218,11 @@
}
}
-static std::u16string pseudoGenerateExpansion(const unsigned int length) {
- std::u16string result = k_expansion_string;
- const char16_t* s = result.data();
+static std::string pseudoGenerateExpansion(const unsigned int length) {
+ std::string result = k_expansion_string;
+ const char* s = result.data();
if (result.size() < length) {
- result += u" ";
+ result += " ";
result += pseudoGenerateExpansion(length - result.size());
} else {
int ext = 0;
@@ -238,26 +238,26 @@
return result;
}
-std::u16string PseudoMethodAccent::start() {
- std::u16string result;
+std::string PseudoMethodAccent::start() {
+ std::string result;
if (mDepth == 0) {
- result = u"[";
+ result = "[";
}
mWordCount = mLength = 0;
mDepth++;
return result;
}
-std::u16string PseudoMethodAccent::end() {
- std::u16string result;
+std::string PseudoMethodAccent::end() {
+ std::string result;
if (mLength) {
- result += u" ";
+ result += " ";
result += pseudoGenerateExpansion(mWordCount > 3 ? mLength : mLength / 2);
}
mWordCount = mLength = 0;
mDepth--;
if (mDepth == 0) {
- result += u"]";
+ result += "]";
}
return result;
}
@@ -267,17 +267,17 @@
*
* Note: This leaves placeholder syntax untouched.
*/
-std::u16string PseudoMethodAccent::text(const StringPiece16& source)
+std::string PseudoMethodAccent::text(const StringPiece& source)
{
- const char16_t* s = source.data();
- std::u16string result;
+ const char* s = source.data();
+ std::string result;
const size_t I = source.size();
bool lastspace = true;
for (size_t i = 0; i < I; i++) {
- char16_t c = s[i];
+ char c = s[i];
if (c == '%') {
// Placeholder syntax, no need to pseudolocalize
- std::u16string chunk;
+ std::string chunk;
bool end = false;
chunk.append(&c, 1);
while (!end && i + 1 < I) {
@@ -300,7 +300,7 @@
bool tag_closed = false;
while (!tag_closed && i < I) {
if (c == '&') {
- std::u16string escapeText;
+ std::string escapeText;
escapeText.append(&c, 1);
bool end = false;
size_t htmlCodePos = i;
@@ -322,7 +322,7 @@
}
}
result += escapeText;
- if (escapeText != u"<") {
+ if (escapeText != "<") {
tag_closed = true;
}
continue;
@@ -338,11 +338,11 @@
}
} else {
// This is a pure text that should be pseudolocalized
- const char16_t* p = pseudolocalizeChar(c);
+ const char* p = pseudolocalizeChar(c);
if (p != nullptr) {
result += p;
} else {
- bool space = util::isspace16(c);
+ bool space = isspace(c);
if (lastspace && !space) {
mWordCount++;
}
@@ -356,19 +356,19 @@
return result;
}
-std::u16string PseudoMethodAccent::placeholder(const StringPiece16& source) {
+std::string PseudoMethodAccent::placeholder(const StringPiece& source) {
// Surround a placeholder with brackets
return k_placeholder_open + source.toString() + k_placeholder_close;
}
-std::u16string PseudoMethodBidi::text(const StringPiece16& source) {
- const char16_t* s = source.data();
- std::u16string result;
+std::string PseudoMethodBidi::text(const StringPiece& source) {
+ const char* s = source.data();
+ std::string result;
bool lastspace = true;
bool space = true;
for (size_t i = 0; i < source.size(); i++) {
- char16_t c = s[i];
- space = util::isspace16(c);
+ char c = s[i];
+ space = isspace(c);
if (lastspace && !space) {
// Word start
result += k_rlm + k_rlo;
@@ -386,7 +386,7 @@
return result;
}
-std::u16string PseudoMethodBidi::placeholder(const StringPiece16& source) {
+std::string PseudoMethodBidi::placeholder(const StringPiece& source) {
// Surround a placeholder with directionality change sequence
return k_rlm + k_rlo + source.toString() + k_pdf + k_rlm;
}
diff --git a/tools/aapt2/compile/Pseudolocalizer.h b/tools/aapt2/compile/Pseudolocalizer.h
index 8818c17..7db88de 100644
--- a/tools/aapt2/compile/Pseudolocalizer.h
+++ b/tools/aapt2/compile/Pseudolocalizer.h
@@ -29,10 +29,10 @@
class PseudoMethodImpl {
public:
virtual ~PseudoMethodImpl() {}
- virtual std::u16string start() { return {}; }
- virtual std::u16string end() { return {}; }
- virtual std::u16string text(const StringPiece16& text) = 0;
- virtual std::u16string placeholder(const StringPiece16& text) = 0;
+ virtual std::string start() { return {}; }
+ virtual std::string end() { return {}; }
+ virtual std::string text(const StringPiece& text) = 0;
+ virtual std::string placeholder(const StringPiece& text) = 0;
};
class Pseudolocalizer {
@@ -45,9 +45,9 @@
Pseudolocalizer(Method method);
void setMethod(Method method);
- std::u16string start() { return mImpl->start(); }
- std::u16string end() { return mImpl->end(); }
- std::u16string text(const StringPiece16& text);
+ std::string start() { return mImpl->start(); }
+ std::string end() { return mImpl->end(); }
+ std::string text(const StringPiece& text);
private:
std::unique_ptr<PseudoMethodImpl> mImpl;
size_t mLastDepth;
diff --git a/tools/aapt2/compile/Pseudolocalizer_test.cpp b/tools/aapt2/compile/Pseudolocalizer_test.cpp
index 36c8896..c33e152 100644
--- a/tools/aapt2/compile/Pseudolocalizer_test.cpp
+++ b/tools/aapt2/compile/Pseudolocalizer_test.cpp
@@ -28,9 +28,8 @@
static ::testing::AssertionResult simpleHelper(const char* input, const char* expected,
Pseudolocalizer::Method method) {
Pseudolocalizer pseudo(method);
- std::string result = util::utf16ToUtf8(
- pseudo.start() + pseudo.text(util::utf8ToUtf16(input)) + pseudo.end());
- if (StringPiece(expected) != result) {
+ std::string result = pseudo.start() + pseudo.text(input) + pseudo.end();
+ if (result != expected) {
return ::testing::AssertionFailure() << expected << " != " << result;
}
return ::testing::AssertionSuccess();
@@ -40,12 +39,9 @@
const char* expected,
Pseudolocalizer::Method method) {
Pseudolocalizer pseudo(method);
- std::string result = util::utf16ToUtf8(pseudo.start() +
- pseudo.text(util::utf8ToUtf16(in1)) +
- pseudo.text(util::utf8ToUtf16(in2)) +
- pseudo.text(util::utf8ToUtf16(in3)) +
- pseudo.end());
- if (StringPiece(expected) != result) {
+ std::string result = pseudo.start() + pseudo.text(in1) + pseudo.text(in2) + pseudo.text(in3) +
+ pseudo.end();
+ if (result != expected) {
return ::testing::AssertionFailure() << expected << " != " << result;
}
return ::testing::AssertionSuccess();
@@ -218,10 +214,10 @@
TEST(PseudolocalizerTest, RedefineMethod) {
Pseudolocalizer pseudo(Pseudolocalizer::Method::kAccent);
- std::u16string result = pseudo.text(u"Hello, ");
+ std::string result = pseudo.text("Hello, ");
pseudo.setMethod(Pseudolocalizer::Method::kNone);
- result += pseudo.text(u"world!");
- ASSERT_EQ(StringPiece("Ĥéļļö, world!"), util::utf16ToUtf8(result));
+ result += pseudo.text("world!");
+ ASSERT_EQ(StringPiece("Ĥéļļö, world!"), result);
}
} // namespace aapt
diff --git a/tools/aapt2/compile/XmlIdCollector_test.cpp b/tools/aapt2/compile/XmlIdCollector_test.cpp
index a37ea86..2c9eab8 100644
--- a/tools/aapt2/compile/XmlIdCollector_test.cpp
+++ b/tools/aapt2/compile/XmlIdCollector_test.cpp
@@ -38,13 +38,13 @@
ASSERT_TRUE(collector.consume(context.get(), doc.get()));
EXPECT_EQ(1, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(),
- SourcedResourceName{ test::parseNameOrDie(u"@id/foo"), 3u }));
+ SourcedResourceName{ test::parseNameOrDie("id/foo"), 3u }));
EXPECT_EQ(1, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(),
- SourcedResourceName{ test::parseNameOrDie(u"@id/bar"), 3u }));
+ SourcedResourceName{ test::parseNameOrDie("id/bar"), 3u }));
EXPECT_EQ(1, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(),
- SourcedResourceName{ test::parseNameOrDie(u"@id/car"), 6u }));
+ SourcedResourceName{ test::parseNameOrDie("id/car"), 6u }));
}
TEST(XmlIdCollectorTest, DontCollectNonIds) {
diff --git a/tools/aapt2/diff/Diff.cpp b/tools/aapt2/diff/Diff.cpp
index 20b7b59..9b1f057 100644
--- a/tools/aapt2/diff/Diff.cpp
+++ b/tools/aapt2/diff/Diff.cpp
@@ -16,6 +16,7 @@
#include "Flags.h"
#include "ResourceTable.h"
+#include "ValueVisitor.h"
#include "io/ZipArchive.h"
#include "process/IResourceTableConsumer.h"
#include "process/SymbolTable.h"
@@ -27,7 +28,7 @@
class DiffContext : public IAaptContext {
public:
- const std::u16string& getCompilationPackage() override {
+ const std::string& getCompilationPackage() override {
return mEmpty;
}
@@ -51,8 +52,12 @@
return false;
}
+ int getMinSdkVersion() override {
+ return 0;
+ }
+
private:
- std::u16string mEmpty;
+ std::string mEmpty;
StdErrDiagnostics mDiagnostics;
NameMangler mNameMangler = NameMangler(NameManglerPolicy{});
SymbolTable mSymbolTable;
@@ -381,6 +386,24 @@
return diff;
}
+class ZeroingReferenceVisitor : public ValueVisitor {
+public:
+ using ValueVisitor::visit;
+
+ void visit(Reference* ref) override {
+ if (ref->name && ref->id) {
+ if (ref->id.value().packageId() == 0x7f) {
+ ref->id = {};
+ }
+ }
+ }
+};
+
+static void zeroOutAppReferences(ResourceTable* table) {
+ ZeroingReferenceVisitor visitor;
+ visitAllValuesInTable(table, &visitor);
+}
+
int diff(const std::vector<StringPiece>& args) {
DiffContext context;
@@ -401,6 +424,10 @@
return 1;
}
+ // Zero out Application IDs in references.
+ zeroOutAppReferences(apkA->getResourceTable());
+ zeroOutAppReferences(apkB->getResourceTable());
+
if (emitResourceTableDiff(&context, apkA.get(), apkB.get())) {
// We emitted a diff, so return 1 (failure).
return 1;
diff --git a/tools/aapt2/dump/Dump.cpp b/tools/aapt2/dump/Dump.cpp
index 56b9f9a..88c6f64 100644
--- a/tools/aapt2/dump/Dump.cpp
+++ b/tools/aapt2/dump/Dump.cpp
@@ -20,6 +20,7 @@
#include "io/ZipArchive.h"
#include "process/IResourceTableConsumer.h"
#include "proto/ProtoSerialize.h"
+#include "unflatten/BinaryResourceParser.h"
#include "util/Files.h"
#include "util/StringPiece.h"
@@ -44,18 +45,9 @@
<< "Source: " << file->source << "\n";
}
-void dumpCompiledTable(const pb::ResourceTable& pbTable, const Source& source,
- IAaptContext* context) {
- std::unique_ptr<ResourceTable> table = deserializeTableFromPb(pbTable, source,
- context->getDiagnostics());
- if (!table) {
- return;
- }
-
- Debug::printTable(table.get());
-}
-
void tryDumpFile(IAaptContext* context, const std::string& filePath) {
+ std::unique_ptr<ResourceTable> table;
+
std::string err;
std::unique_ptr<io::ZipFileCollection> zip = io::ZipFileCollection::create(filePath, &err);
if (zip) {
@@ -75,37 +67,62 @@
return;
}
- std::unique_ptr<ResourceTable> table = deserializeTableFromPb(
+ table = deserializeTableFromPb(
pbTable, Source(filePath), context->getDiagnostics());
- if (table) {
- DebugPrintTableOptions debugPrintTableOptions;
- debugPrintTableOptions.showSources = true;
- Debug::printTable(table.get(), debugPrintTableOptions);
+ if (!table) {
+ return;
}
}
- return;
+
+ if (!table) {
+ file = zip->findFile("resources.arsc");
+ if (file) {
+ std::unique_ptr<io::IData> data = file->openAsData();
+ if (!data) {
+ context->getDiagnostics()->error(DiagMessage(filePath)
+ << "failed to open resources.arsc");
+ return;
+ }
+
+ table = util::make_unique<ResourceTable>();
+ BinaryResourceParser parser(context, table.get(), Source(filePath),
+ data->data(), data->size());
+ if (!parser.parse()) {
+ return;
+ }
+ }
+ }
}
- Maybe<android::FileMap> file = file::mmapPath(filePath, &err);
- if (!file) {
- context->getDiagnostics()->error(DiagMessage(filePath) << err);
- return;
+ if (!table) {
+ Maybe<android::FileMap> file = file::mmapPath(filePath, &err);
+ if (!file) {
+ context->getDiagnostics()->error(DiagMessage(filePath) << err);
+ return;
+ }
+
+ android::FileMap* fileMap = &file.value();
+
+ // Try as a compiled table.
+ pb::ResourceTable pbTable;
+ if (pbTable.ParseFromArray(fileMap->getDataPtr(), fileMap->getDataLength())) {
+ table = deserializeTableFromPb(pbTable, Source(filePath), context->getDiagnostics());
+ }
+
+ if (!table) {
+ // Try as a compiled file.
+ CompiledFileInputStream input(fileMap->getDataPtr(), fileMap->getDataLength());
+ if (const pb::CompiledFile* pbFile = input.CompiledFile()) {
+ dumpCompiledFile(*pbFile, input.data(), input.size(), Source(filePath), context);
+ return;
+ }
+ }
}
- android::FileMap* fileMap = &file.value();
-
- // Try as a compiled table.
- pb::ResourceTable pbTable;
- if (pbTable.ParseFromArray(fileMap->getDataPtr(), fileMap->getDataLength())) {
- dumpCompiledTable(pbTable, Source(filePath), context);
- return;
- }
-
- // Try as a compiled file.
- CompiledFileInputStream input(fileMap->getDataPtr(), fileMap->getDataLength());
- if (const pb::CompiledFile* pbFile = input.CompiledFile()) {
- dumpCompiledFile(*pbFile, input.data(), input.size(), Source(filePath), context);
- return;
+ if (table) {
+ DebugPrintTableOptions debugPrintTableOptions;
+ debugPrintTableOptions.showSources = true;
+ Debug::printTable(table.get(), debugPrintTableOptions);
}
}
@@ -120,8 +137,8 @@
return nullptr;
}
- const std::u16string& getCompilationPackage() override {
- static std::u16string empty;
+ const std::string& getCompilationPackage() override {
+ static std::string empty;
return empty;
}
@@ -142,6 +159,10 @@
mVerbose = val;
}
+ int getMinSdkVersion() override {
+ return 0;
+ }
+
private:
StdErrDiagnostics mDiagnostics;
bool mVerbose = false;
diff --git a/tools/aapt2/flatten/TableFlattener.cpp b/tools/aapt2/flatten/TableFlattener.cpp
index 28a7928..6a35e8c 100644
--- a/tools/aapt2/flatten/TableFlattener.cpp
+++ b/tools/aapt2/flatten/TableFlattener.cpp
@@ -25,6 +25,7 @@
#include <android-base/macros.h>
#include <algorithm>
+#include <sstream>
#include <type_traits>
#include <numeric>
@@ -231,7 +232,8 @@
}
// Copy the package name in device endianness.
- strcpy16_htod(pkgHeader->name, arraysize(pkgHeader->name), mPackage->name);
+ strcpy16_htod(pkgHeader->name, arraysize(pkgHeader->name),
+ util::utf8ToUtf16(mPackage->name));
// Serialize the types. We do this now so that our type and key strings
// are populated. We write those first.
@@ -242,7 +244,7 @@
StringPool::flattenUtf16(pkgWriter.getBuffer(), mTypePool);
pkgHeader->keyStrings = util::hostToDevice32(pkgWriter.size());
- StringPool::flattenUtf16(pkgWriter.getBuffer(), mKeyPool);
+ StringPool::flattenUtf8(pkgWriter.getBuffer(), mKeyPool);
// Append the types.
buffer->appendBuffer(std::move(typeBuffer));
@@ -423,9 +425,9 @@
// If there is a gap in the type IDs, fill in the StringPool
// with empty values until we reach the ID we expect.
while (type->id.value() > expectedTypeId) {
- std::u16string typeName(u"?");
- typeName += expectedTypeId;
- mTypePool.makeRef(typeName);
+ std::stringstream typeName;
+ typeName << "?" << expectedTypeId;
+ mTypePool.makeRef(typeName.str());
expectedTypeId++;
}
expectedTypeId++;
diff --git a/tools/aapt2/flatten/TableFlattener_test.cpp b/tools/aapt2/flatten/TableFlattener_test.cpp
index 39c4fd3..0b92ba5 100644
--- a/tools/aapt2/flatten/TableFlattener_test.cpp
+++ b/tools/aapt2/flatten/TableFlattener_test.cpp
@@ -14,15 +14,12 @@
* limitations under the License.
*/
+#include "ResourceUtils.h"
#include "flatten/TableFlattener.h"
-#include "test/Builders.h"
-#include "test/Context.h"
+#include "test/Test.h"
#include "unflatten/BinaryResourceParser.h"
#include "util/Util.h"
-
-#include <gtest/gtest.h>
-
using namespace android;
namespace aapt {
@@ -31,7 +28,7 @@
public:
void SetUp() override {
mContext = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
.build();
}
@@ -66,7 +63,7 @@
}
::testing::AssertionResult exists(ResTable* table,
- const StringPiece16& expectedName,
+ const StringPiece& expectedName,
const ResourceId expectedId,
const ConfigDescription& expectedConfig,
const uint8_t expectedDataType, const uint32_t expectedData,
@@ -108,25 +105,16 @@
return ::testing::AssertionFailure() << "failed to find resource name";
}
- StringPiece16 package16(actualName.package, actualName.packageLen);
- if (package16 != expectedResName.package) {
+ Maybe<ResourceName> resName = ResourceUtils::toResourceName(actualName);
+ if (!resName) {
return ::testing::AssertionFailure()
- << "expected package '" << expectedResName.package << "' but got '"
- << package16 << "'";
- }
-
- StringPiece16 type16(actualName.type, actualName.typeLen);
- if (type16 != toString(expectedResName.type)) {
- return ::testing::AssertionFailure()
- << "expected type '" << expectedResName.type
- << "' but got '" << type16 << "'";
- }
-
- StringPiece16 name16(actualName.name, actualName.nameLen);
- if (name16 != expectedResName.entry) {
- return ::testing::AssertionFailure()
- << "expected name '" << expectedResName.entry
- << "' but got '" << name16 << "'";
+ << "expected name '" << expectedResName << "' but got '"
+ << StringPiece16(actualName.package, actualName.packageLen)
+ << ":"
+ << StringPiece16(actualName.type, actualName.typeLen)
+ << "/"
+ << StringPiece16(actualName.name, actualName.nameLen)
+ << "'";
}
if (expectedConfig != config) {
@@ -143,67 +131,67 @@
TEST_F(TableFlattenerTest, FlattenFullyLinkedTable) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addSimple(u"@com.app.test:id/one", ResourceId(0x7f020000))
- .addSimple(u"@com.app.test:id/two", ResourceId(0x7f020001))
- .addValue(u"@com.app.test:id/three", ResourceId(0x7f020002),
- test::buildReference(u"@com.app.test:id/one", ResourceId(0x7f020000)))
- .addValue(u"@com.app.test:integer/one", ResourceId(0x7f030000),
+ .setPackageId("com.app.test", 0x7f)
+ .addSimple("com.app.test:id/one", ResourceId(0x7f020000))
+ .addSimple("com.app.test:id/two", ResourceId(0x7f020001))
+ .addValue("com.app.test:id/three", ResourceId(0x7f020002),
+ test::buildReference("com.app.test:id/one", ResourceId(0x7f020000)))
+ .addValue("com.app.test:integer/one", ResourceId(0x7f030000),
util::make_unique<BinaryPrimitive>(uint8_t(Res_value::TYPE_INT_DEC), 1u))
- .addValue(u"@com.app.test:integer/one", ResourceId(0x7f030000),
- test::parseConfigOrDie("v1"),
+ .addValue("com.app.test:integer/one", test::parseConfigOrDie("v1"),
+ ResourceId(0x7f030000),
util::make_unique<BinaryPrimitive>(uint8_t(Res_value::TYPE_INT_DEC), 2u))
- .addString(u"@com.app.test:string/test", ResourceId(0x7f040000), u"foo")
- .addString(u"@com.app.test:layout/bar", ResourceId(0x7f050000), u"res/layout/bar.xml")
+ .addString("com.app.test:string/test", ResourceId(0x7f040000), "foo")
+ .addString("com.app.test:layout/bar", ResourceId(0x7f050000), "res/layout/bar.xml")
.build();
ResTable resTable;
ASSERT_TRUE(flatten(table.get(), &resTable));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:id/one", ResourceId(0x7f020000), {},
+ EXPECT_TRUE(exists(&resTable, "com.app.test:id/one", ResourceId(0x7f020000), {},
Res_value::TYPE_INT_BOOLEAN, 0u, 0u));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:id/two", ResourceId(0x7f020001), {},
+ EXPECT_TRUE(exists(&resTable, "com.app.test:id/two", ResourceId(0x7f020001), {},
Res_value::TYPE_INT_BOOLEAN, 0u, 0u));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:id/three", ResourceId(0x7f020002), {},
+ EXPECT_TRUE(exists(&resTable, "com.app.test:id/three", ResourceId(0x7f020002), {},
Res_value::TYPE_REFERENCE, 0x7f020000u, 0u));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:integer/one", ResourceId(0x7f030000),
+ EXPECT_TRUE(exists(&resTable, "com.app.test:integer/one", ResourceId(0x7f030000),
{}, Res_value::TYPE_INT_DEC, 1u,
ResTable_config::CONFIG_VERSION));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:integer/one", ResourceId(0x7f030000),
+ EXPECT_TRUE(exists(&resTable, "com.app.test:integer/one", ResourceId(0x7f030000),
test::parseConfigOrDie("v1"), Res_value::TYPE_INT_DEC, 2u,
ResTable_config::CONFIG_VERSION));
- StringPiece16 fooStr = u"foo";
+ std::u16string fooStr = u"foo";
ssize_t idx = resTable.getTableStringBlock(0)->indexOfString(fooStr.data(), fooStr.size());
ASSERT_GE(idx, 0);
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:string/test", ResourceId(0x7f040000),
+ EXPECT_TRUE(exists(&resTable, "com.app.test:string/test", ResourceId(0x7f040000),
{}, Res_value::TYPE_STRING, (uint32_t) idx, 0u));
- StringPiece16 barPath = u"res/layout/bar.xml";
+ std::u16string barPath = u"res/layout/bar.xml";
idx = resTable.getTableStringBlock(0)->indexOfString(barPath.data(), barPath.size());
ASSERT_GE(idx, 0);
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:layout/bar", ResourceId(0x7f050000), {},
+ EXPECT_TRUE(exists(&resTable, "com.app.test:layout/bar", ResourceId(0x7f050000), {},
Res_value::TYPE_STRING, (uint32_t) idx, 0u));
}
TEST_F(TableFlattenerTest, FlattenEntriesWithGapsInIds) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addSimple(u"@com.app.test:id/one", ResourceId(0x7f020001))
- .addSimple(u"@com.app.test:id/three", ResourceId(0x7f020003))
+ .setPackageId("com.app.test", 0x7f)
+ .addSimple("com.app.test:id/one", ResourceId(0x7f020001))
+ .addSimple("com.app.test:id/three", ResourceId(0x7f020003))
.build();
ResTable resTable;
ASSERT_TRUE(flatten(table.get(), &resTable));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:id/one", ResourceId(0x7f020001), {},
+ EXPECT_TRUE(exists(&resTable, "com.app.test:id/one", ResourceId(0x7f020001), {},
Res_value::TYPE_INT_BOOLEAN, 0u, 0u));
- EXPECT_TRUE(exists(&resTable, u"@com.app.test:id/three", ResourceId(0x7f020003), {},
- Res_value::TYPE_INT_BOOLEAN, 0u, 0u));
+ EXPECT_TRUE(exists(&resTable, "com.app.test:id/three", ResourceId(0x7f020003), {},
+ Res_value::TYPE_INT_BOOLEAN, 0u, 0u));
}
TEST_F(TableFlattenerTest, FlattenMinMaxAttributes) {
@@ -212,15 +200,15 @@
attr.minInt = 10;
attr.maxInt = 23;
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addValue(u"@android:attr/foo", ResourceId(0x01010000),
+ .setPackageId("android", 0x01)
+ .addValue("android:attr/foo", ResourceId(0x01010000),
util::make_unique<Attribute>(attr))
.build();
ResourceTable result;
ASSERT_TRUE(flatten(table.get(), &result));
- Attribute* actualAttr = test::getValue<Attribute>(&result, u"@android:attr/foo");
+ Attribute* actualAttr = test::getValue<Attribute>(&result, "android:attr/foo");
ASSERT_NE(nullptr, actualAttr);
EXPECT_EQ(attr.isWeak(), actualAttr->isWeak());
EXPECT_EQ(attr.typeMask, actualAttr->typeMask);
diff --git a/tools/aapt2/flatten/XmlFlattener.cpp b/tools/aapt2/flatten/XmlFlattener.cpp
index cc45789..3c1750c 100644
--- a/tools/aapt2/flatten/XmlFlattener.cpp
+++ b/tools/aapt2/flatten/XmlFlattener.cpp
@@ -57,14 +57,15 @@
mBuffer(buffer), mOptions(options) {
}
- void addString(const StringPiece16& str, uint32_t priority, android::ResStringPool_ref* dest) {
- if (!str.empty()) {
+ void addString(const StringPiece& str, uint32_t priority, android::ResStringPool_ref* dest,
+ bool treatEmptyStringAsNull = false) {
+ if (str.empty() && treatEmptyStringAsNull) {
+ // Some parts of the runtime treat null differently than empty string.
+ dest->index = util::deviceToHost32(-1);
+ } else {
mStringRefs.push_back(StringFlattenDest{
mPool.makeRef(str, StringPool::Context{ priority }),
dest });
- } else {
- // The device doesn't think a string of size 0 is the same as null.
- dest->index = util::deviceToHost32(-1);
}
}
@@ -118,8 +119,14 @@
flatNode->comment.index = util::hostToDevice32(-1);
ResXMLTree_attrExt* flatElem = startWriter.nextBlock<ResXMLTree_attrExt>();
- addString(node->namespaceUri, kLowPriority, &flatElem->ns);
- addString(node->name, kLowPriority, &flatElem->name);
+
+ // A missing namespace must be null, not an empty string. Otherwise the runtime
+ // complains.
+ addString(node->namespaceUri, kLowPriority, &flatElem->ns,
+ true /* treatEmptyStringAsNull */);
+ addString(node->name, kLowPriority, &flatElem->name,
+ true /* treatEmptyStringAsNull */);
+
flatElem->attributeStart = util::hostToDevice16(sizeof(*flatElem));
flatElem->attributeSize = util::hostToDevice16(sizeof(ResXMLTree_attribute));
@@ -138,7 +145,8 @@
flatEndNode->comment.index = util::hostToDevice32(-1);
ResXMLTree_endElementExt* flatEndElem = endWriter.nextBlock<ResXMLTree_endElementExt>();
- addString(node->namespaceUri, kLowPriority, &flatEndElem->ns);
+ addString(node->namespaceUri, kLowPriority, &flatEndElem->ns,
+ true /* treatEmptyStringAsNull */);
addString(node->name, kLowPriority, &flatEndElem->name);
endWriter.finish();
@@ -197,16 +205,18 @@
xmlAttr->compiledAttribute.value().id.value() == kIdAttr) {
flatElem->idIndex = util::hostToDevice16(attributeIndex);
} else if (xmlAttr->namespaceUri.empty()) {
- if (xmlAttr->name == u"class") {
+ if (xmlAttr->name == "class") {
flatElem->classIndex = util::hostToDevice16(attributeIndex);
- } else if (xmlAttr->name == u"style") {
+ } else if (xmlAttr->name == "style") {
flatElem->styleIndex = util::hostToDevice16(attributeIndex);
}
}
attributeIndex++;
- // Add the namespaceUri to the list of StringRefs to encode.
- addString(xmlAttr->namespaceUri, kLowPriority, &flatAttr->ns);
+ // Add the namespaceUri to the list of StringRefs to encode. Use null if the namespace
+ // is empty (doesn't exist).
+ addString(xmlAttr->namespaceUri, kLowPriority, &flatAttr->ns,
+ true /* treatEmptyStringAsNull */);
flatAttr->rawValue.index = util::hostToDevice32(-1);
@@ -279,7 +289,7 @@
xmlHeaderWriter.startChunk<ResXMLTree_header>(RES_XML_TYPE);
// Flatten the StringPool.
- StringPool::flattenUtf16(mBuffer, visitor.mPool);
+ StringPool::flattenUtf8(mBuffer, visitor.mPool);
{
// Write the array of resource IDs, indexed by StringPool order.
diff --git a/tools/aapt2/flatten/XmlFlattener_test.cpp b/tools/aapt2/flatten/XmlFlattener_test.cpp
index 4e6eb81..8b3378f 100644
--- a/tools/aapt2/flatten/XmlFlattener_test.cpp
+++ b/tools/aapt2/flatten/XmlFlattener_test.cpp
@@ -16,13 +16,11 @@
#include "flatten/XmlFlattener.h"
#include "link/Linkers.h"
-#include "test/Builders.h"
-#include "test/Context.h"
+#include "test/Test.h"
#include "util/BigBuffer.h"
#include "util/Util.h"
#include <androidfw/ResourceTypes.h>
-#include <gtest/gtest.h>
namespace aapt {
@@ -30,15 +28,15 @@
public:
void SetUp() override {
mContext = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setCompilationPackage("com.app.test")
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@android:attr/id", ResourceId(0x010100d0),
+ .addSymbol("android:attr/id", ResourceId(0x010100d0),
test::AttributeBuilder().build())
- .addSymbol(u"@com.app.test:id/id", ResourceId(0x7f020000))
- .addSymbol(u"@android:attr/paddingStart", ResourceId(0x010103b3),
+ .addSymbol("com.app.test:id/id", ResourceId(0x7f020000))
+ .addSymbol("android:attr/paddingStart", ResourceId(0x010103b3),
test::AttributeBuilder().build())
- .addSymbol(u"@android:attr/colorAccent", ResourceId(0x01010435),
+ .addSymbol("android:attr/colorAccent", ResourceId(0x01010435),
test::AttributeBuilder().build())
.build())
.build();
@@ -207,4 +205,23 @@
EXPECT_GE(tree.indexOfAttribute(nullptr, 0, kPackage.data(), kPackage.size()), 0);
}
+TEST_F(XmlFlattenerTest, EmptyStringValueInAttributeIsNotNull) {
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom("<View package=\"\"/>");
+
+ android::ResXMLTree tree;
+ ASSERT_TRUE(flatten(doc.get(), &tree));
+
+ while (tree.next() != android::ResXMLTree::START_TAG) {
+ ASSERT_NE(tree.getEventType(), android::ResXMLTree::BAD_DOCUMENT);
+ ASSERT_NE(tree.getEventType(), android::ResXMLTree::END_DOCUMENT);
+ }
+
+ const StringPiece16 kPackage = u"package";
+ ssize_t idx = tree.indexOfAttribute(nullptr, 0, kPackage.data(), kPackage.size());
+ ASSERT_GE(idx, 0);
+
+ size_t len;
+ EXPECT_NE(nullptr, tree.getAttributeStringValue(idx, &len));
+}
+
} // namespace aapt
diff --git a/tools/aapt2/java/AnnotationProcessor.cpp b/tools/aapt2/java/AnnotationProcessor.cpp
index b7e7f90..23ff8ab 100644
--- a/tools/aapt2/java/AnnotationProcessor.cpp
+++ b/tools/aapt2/java/AnnotationProcessor.cpp
@@ -47,23 +47,13 @@
mComment << "\n * " << std::move(comment);
}
-void AnnotationProcessor::appendComment(const StringPiece16& comment) {
- // We need to process line by line to clean-up whitespace and append prefixes.
- for (StringPiece16 line : util::tokenize(comment, u'\n')) {
- line = util::trimWhitespace(line);
- if (!line.empty()) {
- std::string utf8Line = util::utf16ToUtf8(line);
- appendCommentLine(utf8Line);
- }
- }
-}
-
void AnnotationProcessor::appendComment(const StringPiece& comment) {
+ // We need to process line by line to clean-up whitespace and append prefixes.
for (StringPiece line : util::tokenize(comment, '\n')) {
line = util::trimWhitespace(line);
if (!line.empty()) {
- std::string utf8Line = line.toString();
- appendCommentLine(utf8Line);
+ std::string lineCopy = line.toString();
+ appendCommentLine(lineCopy);
}
}
}
@@ -75,7 +65,7 @@
void AnnotationProcessor::writeToStream(std::ostream* out, const StringPiece& prefix) const {
if (mHasComments) {
std::string result = mComment.str();
- for (StringPiece line : util::tokenize<char>(result, '\n')) {
+ for (StringPiece line : util::tokenize(result, '\n')) {
*out << prefix << line << "\n";
}
*out << prefix << " */" << "\n";
diff --git a/tools/aapt2/java/AnnotationProcessor.h b/tools/aapt2/java/AnnotationProcessor.h
index 8309dd9..cfc32f3 100644
--- a/tools/aapt2/java/AnnotationProcessor.h
+++ b/tools/aapt2/java/AnnotationProcessor.h
@@ -57,7 +57,6 @@
* Adds more comments. Since resources can have various values with different configurations,
* we need to collect all the comments.
*/
- void appendComment(const StringPiece16& comment);
void appendComment(const StringPiece& comment);
void appendNewLine();
diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp
index 84df0b4..fbaefb1 100644
--- a/tools/aapt2/java/JavaClassGenerator.cpp
+++ b/tools/aapt2/java/JavaClassGenerator.cpp
@@ -19,7 +19,6 @@
#include "ResourceTable.h"
#include "ResourceValues.h"
#include "ValueVisitor.h"
-
#include "java/AnnotationProcessor.h"
#include "java/ClassDefinition.h"
#include "java/JavaClassGenerator.h"
@@ -39,20 +38,20 @@
mContext(context), mTable(table), mOptions(options) {
}
-static const std::set<StringPiece16> sJavaIdentifiers = {
- u"abstract", u"assert", u"boolean", u"break", u"byte",
- u"case", u"catch", u"char", u"class", u"const", u"continue",
- u"default", u"do", u"double", u"else", u"enum", u"extends",
- u"final", u"finally", u"float", u"for", u"goto", u"if",
- u"implements", u"import", u"instanceof", u"int", u"interface",
- u"long", u"native", u"new", u"package", u"private", u"protected",
- u"public", u"return", u"short", u"static", u"strictfp", u"super",
- u"switch", u"synchronized", u"this", u"throw", u"throws",
- u"transient", u"try", u"void", u"volatile", u"while", u"true",
- u"false", u"null"
+static const std::set<StringPiece> sJavaIdentifiers = {
+ "abstract", "assert", "boolean", "break", "byte",
+ "case", "catch", "char", "class", "const", "continue",
+ "default", "do", "double", "else", "enum", "extends",
+ "final", "finally", "float", "for", "goto", "if",
+ "implements", "import", "instanceof", "int", "interface",
+ "long", "native", "new", "package", "private", "protected",
+ "public", "return", "short", "static", "strictfp", "super",
+ "switch", "synchronized", "this", "throw", "throws",
+ "transient", "try", "void", "volatile", "while", "true",
+ "false", "null"
};
-static bool isValidSymbol(const StringPiece16& symbol) {
+static bool isValidSymbol(const StringPiece& symbol) {
return sJavaIdentifiers.find(symbol) == sJavaIdentifiers.end();
}
@@ -60,8 +59,8 @@
* Java symbols can not contain . or -, but those are valid in a resource name.
* Replace those with '_'.
*/
-static std::string transform(const StringPiece16& symbol) {
- std::string output = util::utf16ToUtf8(symbol);
+static std::string transform(const StringPiece& symbol) {
+ std::string output = symbol.toString();
for (char& c : output) {
if (c == '.' || c == '-') {
c = '_';
@@ -83,7 +82,7 @@
*/
static std::string transformNestedAttr(const ResourceNameRef& attrName,
const std::string& styleableClassName,
- const StringPiece16& packageNameToGenerate) {
+ const StringPiece& packageNameToGenerate) {
std::string output = styleableClassName;
// We may reference IDs from other packages, so prefix the entry name with
@@ -204,8 +203,8 @@
}
}
-void JavaClassGenerator::addMembersToStyleableClass(const StringPiece16& packageNameToGenerate,
- const std::u16string& entryName,
+void JavaClassGenerator::addMembersToStyleableClass(const StringPiece& packageNameToGenerate,
+ const std::string& entryName,
const Styleable* styleable,
ClassDefinition* outStyleableClassDef) {
const std::string className = transform(entryName);
@@ -284,8 +283,8 @@
continue;
}
- StringPiece16 attrCommentLine = entry.symbol->attribute->getComment();
- if (attrCommentLine.contains(StringPiece16(u"@removed"))) {
+ StringPiece attrCommentLine = entry.symbol->attribute->getComment();
+ if (attrCommentLine.contains("@removed")) {
// Removed attributes are public but hidden from the documentation, so don't emit
// them as part of the class documentation.
continue;
@@ -354,12 +353,12 @@
continue;
}
- StringPiece16 comment = styleableAttr.attrRef->getComment();
+ StringPiece comment = styleableAttr.attrRef->getComment();
if (styleableAttr.symbol->attribute && comment.empty()) {
comment = styleableAttr.symbol->attribute->getComment();
}
- if (comment.contains(StringPiece16(u"@removed"))) {
+ if (comment.contains("@removed")) {
// Removed attributes are public but hidden from the documentation, so don't emit them
// as part of the class documentation.
continue;
@@ -367,7 +366,7 @@
const ResourceName& attrName = styleableAttr.attrRef->name.value();
- StringPiece16 packageName = attrName.package;
+ StringPiece packageName = attrName.package;
if (packageName.empty()) {
packageName = mContext->getCompilationPackage();
}
@@ -403,7 +402,7 @@
}
}
-bool JavaClassGenerator::addMembersToTypeClass(const StringPiece16& packageNameToGenerate,
+bool JavaClassGenerator::addMembersToTypeClass(const StringPiece& packageNameToGenerate,
const ResourceTablePackage* package,
const ResourceTableType* type,
ClassDefinition* outTypeClassDef) {
@@ -418,8 +417,8 @@
id = ResourceId(package->id.value(), type->id.value(), entry->id.value());
}
- std::u16string unmangledPackage;
- std::u16string unmangledName = entry->name;
+ std::string unmangledPackage;
+ std::string unmangledName = entry->name;
if (NameMangler::unmangle(&unmangledName, &unmangledPackage)) {
// The entry name was mangled, and we successfully unmangled it.
// Check that we want to emit this symbol.
@@ -481,7 +480,7 @@
return true;
}
-bool JavaClassGenerator::generate(const StringPiece16& packageNameToGenerate, std::ostream* out) {
+bool JavaClassGenerator::generate(const StringPiece& packageNameToGenerate, std::ostream* out) {
return generate(packageNameToGenerate, packageNameToGenerate, out);
}
@@ -494,8 +493,8 @@
}
}
-bool JavaClassGenerator::generate(const StringPiece16& packageNameToGenerate,
- const StringPiece16& outPackageName, std::ostream* out) {
+bool JavaClassGenerator::generate(const StringPiece& packageNameToGenerate,
+ const StringPiece& outPackageName, std::ostream* out) {
ClassDefinition rClass("R", ClassQualifier::None, true);
@@ -509,8 +508,7 @@
(mOptions.types == JavaClassGeneratorOptions::SymbolTypes::kPublic);
std::unique_ptr<ClassDefinition> classDef = util::make_unique<ClassDefinition>(
- util::utf16ToUtf8(toString(type->type)), ClassQualifier::Static,
- forceCreationIfEmpty);
+ toString(type->type), ClassQualifier::Static, forceCreationIfEmpty);
bool result = addMembersToTypeClass(packageNameToGenerate, package.get(), type.get(),
classDef.get());
@@ -545,8 +543,7 @@
appendJavaDocAnnotations(mOptions.javadocAnnotations, rClass.getCommentBuilder());
- if (!ClassDefinition::writeJavaFile(&rClass, util::utf16ToUtf8(outPackageName),
- mOptions.useFinal, out)) {
+ if (!ClassDefinition::writeJavaFile(&rClass, outPackageName, mOptions.useFinal, out)) {
return false;
}
diff --git a/tools/aapt2/java/JavaClassGenerator.h b/tools/aapt2/java/JavaClassGenerator.h
index 77e0ed7..901a86e 100644
--- a/tools/aapt2/java/JavaClassGenerator.h
+++ b/tools/aapt2/java/JavaClassGenerator.h
@@ -66,22 +66,22 @@
* We need to generate these symbols in a separate file.
* Returns true on success.
*/
- bool generate(const StringPiece16& packageNameToGenerate, std::ostream* out);
+ bool generate(const StringPiece& packageNameToGenerate, std::ostream* out);
- bool generate(const StringPiece16& packageNameToGenerate,
- const StringPiece16& outputPackageName,
+ bool generate(const StringPiece& packageNameToGenerate,
+ const StringPiece& outputPackageName,
std::ostream* out);
const std::string& getError() const;
private:
- bool addMembersToTypeClass(const StringPiece16& packageNameToGenerate,
+ bool addMembersToTypeClass(const StringPiece& packageNameToGenerate,
const ResourceTablePackage* package,
const ResourceTableType* type,
ClassDefinition* outTypeClassDef);
- void addMembersToStyleableClass(const StringPiece16& packageNameToGenerate,
- const std::u16string& entryName,
+ void addMembersToStyleableClass(const StringPiece& packageNameToGenerate,
+ const std::string& entryName,
const Styleable* styleable,
ClassDefinition* outStyleableClassDef);
diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp
index 46266b3..ed7c6bd 100644
--- a/tools/aapt2/java/JavaClassGenerator_test.cpp
+++ b/tools/aapt2/java/JavaClassGenerator_test.cpp
@@ -25,40 +25,40 @@
TEST(JavaClassGeneratorTest, FailWhenEntryIsJavaKeyword) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addSimple(u"@android:id/class", ResourceId(0x01020000))
+ .setPackageId("android", 0x01)
+ .addSimple("android:id/class", ResourceId(0x01020000))
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
- EXPECT_FALSE(generator.generate(u"android", &out));
+ EXPECT_FALSE(generator.generate("android", &out));
}
TEST(JavaClassGeneratorTest, TransformInvalidJavaIdentifierCharacter) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addSimple(u"@android:id/hey-man", ResourceId(0x01020000))
- .addValue(u"@android:attr/cool.attr", ResourceId(0x01010000),
+ .setPackageId("android", 0x01)
+ .addSimple("android:id/hey-man", ResourceId(0x01020000))
+ .addValue("android:attr/cool.attr", ResourceId(0x01010000),
test::AttributeBuilder(false).build())
- .addValue(u"@android:styleable/hey.dude", ResourceId(0x01030000),
+ .addValue("android:styleable/hey.dude", ResourceId(0x01030000),
test::StyleableBuilder()
- .addItem(u"@android:attr/cool.attr", ResourceId(0x01010000))
+ .addItem("android:attr/cool.attr", ResourceId(0x01010000))
.build())
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
- EXPECT_TRUE(generator.generate(u"android", &out));
+ EXPECT_TRUE(generator.generate("android", &out));
std::string output = out.str();
@@ -74,18 +74,18 @@
TEST(JavaClassGeneratorTest, CorrectPackageNameIsUsed) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addSimple(u"@android:id/one", ResourceId(0x01020000))
- .addSimple(u"@android:id/com.foo$two", ResourceId(0x01020001))
+ .setPackageId("android", 0x01)
+ .addSimple("android:id/one", ResourceId(0x01020000))
+ .addSimple("android:id/com.foo$two", ResourceId(0x01020001))
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", u"com.android.internal", &out));
+ ASSERT_TRUE(generator.generate("android", "com.android.internal", &out));
std::string output = out.str();
EXPECT_NE(std::string::npos, output.find("package com.android.internal;"));
@@ -96,18 +96,18 @@
TEST(JavaClassGeneratorTest, AttrPrivateIsWrittenAsAttr) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addSimple(u"@android:attr/two", ResourceId(0x01010001))
- .addSimple(u"@android:^attr-private/one", ResourceId(0x01010000))
+ .setPackageId("android", 0x01)
+ .addSimple("android:attr/two", ResourceId(0x01010001))
+ .addSimple("android:^attr-private/one", ResourceId(0x01010000))
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string output = out.str();
EXPECT_NE(std::string::npos, output.find("public static final class attr"));
@@ -117,17 +117,17 @@
TEST(JavaClassGeneratorTest, OnlyWritePublicResources) {
StdErrDiagnostics diag;
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addSimple(u"@android:id/one", ResourceId(0x01020000))
- .addSimple(u"@android:id/two", ResourceId(0x01020001))
- .addSimple(u"@android:id/three", ResourceId(0x01020002))
- .setSymbolState(u"@android:id/one", ResourceId(0x01020000), SymbolState::kPublic)
- .setSymbolState(u"@android:id/two", ResourceId(0x01020001), SymbolState::kPrivate)
+ .setPackageId("android", 0x01)
+ .addSimple("android:id/one", ResourceId(0x01020000))
+ .addSimple("android:id/two", ResourceId(0x01020001))
+ .addSimple("android:id/three", ResourceId(0x01020002))
+ .setSymbolState("android:id/one", ResourceId(0x01020000), SymbolState::kPublic)
+ .setSymbolState("android:id/two", ResourceId(0x01020001), SymbolState::kPrivate)
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGeneratorOptions options;
@@ -135,7 +135,7 @@
{
JavaClassGenerator generator(context.get(), table.get(), options);
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string output = out.str();
EXPECT_NE(std::string::npos, output.find("public static final int one=0x01020000;"));
EXPECT_EQ(std::string::npos, output.find("two"));
@@ -146,7 +146,7 @@
{
JavaClassGenerator generator(context.get(), table.get(), options);
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string output = out.str();
EXPECT_NE(std::string::npos, output.find("public static final int one=0x01020000;"));
EXPECT_NE(std::string::npos, output.find("public static final int two=0x01020001;"));
@@ -157,7 +157,7 @@
{
JavaClassGenerator generator(context.get(), table.get(), options);
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string output = out.str();
EXPECT_NE(std::string::npos, output.find("public static final int one=0x01020000;"));
EXPECT_NE(std::string::npos, output.find("public static final int two=0x01020001;"));
@@ -198,27 +198,27 @@
TEST(JavaClassGeneratorTest, EmitOtherPackagesAttributesInStyleable) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .setPackageId(u"com.lib", 0x02)
- .addValue(u"@android:attr/bar", ResourceId(0x01010000),
+ .setPackageId("android", 0x01)
+ .setPackageId("com.lib", 0x02)
+ .addValue("android:attr/bar", ResourceId(0x01010000),
test::AttributeBuilder(false).build())
- .addValue(u"@com.lib:attr/bar", ResourceId(0x02010000),
+ .addValue("com.lib:attr/bar", ResourceId(0x02010000),
test::AttributeBuilder(false).build())
- .addValue(u"@android:styleable/foo", ResourceId(0x01030000),
+ .addValue("android:styleable/foo", ResourceId(0x01030000),
test::StyleableBuilder()
- .addItem(u"@android:attr/bar", ResourceId(0x01010000))
- .addItem(u"@com.lib:attr/bar", ResourceId(0x02010000))
+ .addItem("android:attr/bar", ResourceId(0x01010000))
+ .addItem("com.lib:attr/bar", ResourceId(0x02010000))
.build())
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
- EXPECT_TRUE(generator.generate(u"android", &out));
+ EXPECT_TRUE(generator.generate("android", &out));
std::string output = out.str();
EXPECT_NE(std::string::npos, output.find("int foo_bar="));
@@ -227,19 +227,19 @@
TEST(JavaClassGeneratorTest, CommentsForSimpleResourcesArePresent) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addSimple(u"@android:id/foo", ResourceId(0x01010000))
+ .setPackageId("android", 0x01)
+ .addSimple("android:id/foo", ResourceId(0x01010000))
.build();
- test::getValue<Id>(table.get(), u"@android:id/foo")
- ->setComment(std::u16string(u"This is a comment\n@deprecated"));
+ test::getValue<Id>(table.get(), "android:id/foo")
+ ->setComment(std::string("This is a comment\n@deprecated"));
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string actual = out.str();
const char* expectedText =
@@ -259,67 +259,64 @@
TEST(JavaClassGeneratorTest, CommentsForStyleablesAndNestedAttributesArePresent) {
Attribute attr(false);
- attr.setComment(StringPiece16(u"This is an attribute"));
+ attr.setComment(StringPiece("This is an attribute"));
Styleable styleable;
- styleable.entries.push_back(Reference(test::parseNameOrDie(u"@android:attr/one")));
- styleable.setComment(StringPiece16(u"This is a styleable"));
+ styleable.entries.push_back(Reference(test::parseNameOrDie("android:attr/one")));
+ styleable.setComment(StringPiece("This is a styleable"));
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addValue(u"@android:attr/one", util::make_unique<Attribute>(attr))
- .addValue(u"@android:styleable/Container",
+ .setPackageId("android", 0x01)
+ .addValue("android:attr/one", util::make_unique<Attribute>(attr))
+ .addValue("android:styleable/Container",
std::unique_ptr<Styleable>(styleable.clone(nullptr)))
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGeneratorOptions options;
options.useFinal = false;
JavaClassGenerator generator(context.get(), table.get(), options);
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string actual = out.str();
- EXPECT_NE(std::string::npos, actual.find("@attr name android:one"));
- EXPECT_NE(std::string::npos, actual.find("@attr description"));
- EXPECT_NE(std::string::npos, actual.find(util::utf16ToUtf8(attr.getComment())));
- EXPECT_NE(std::string::npos, actual.find(util::utf16ToUtf8(styleable.getComment())));
+ EXPECT_NE(std::string::npos, actual.find("attr name android:one"));
+ EXPECT_NE(std::string::npos, actual.find("attr description"));
+ EXPECT_NE(std::string::npos, actual.find(attr.getComment().data()));
+ EXPECT_NE(std::string::npos, actual.find(styleable.getComment().data()));
}
TEST(JavaClassGeneratorTest, CommentsForRemovedAttributesAreNotPresentInClass) {
Attribute attr(false);
- attr.setComment(StringPiece16(u"@removed"));
-
+ attr.setComment(StringPiece("removed"));
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"android", 0x01)
- .addValue(u"@android:attr/one", util::make_unique<Attribute>(attr))
+ .setPackageId("android", 0x01)
+ .addValue("android:attr/one", util::make_unique<Attribute>(attr))
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.build();
JavaClassGeneratorOptions options;
options.useFinal = false;
JavaClassGenerator generator(context.get(), table.get(), options);
std::stringstream out;
- ASSERT_TRUE(generator.generate(u"android", &out));
+ ASSERT_TRUE(generator.generate("android", &out));
std::string actual = out.str();
- std::cout << actual << std::endl;
-
EXPECT_EQ(std::string::npos, actual.find("@attr name android:one"));
EXPECT_EQ(std::string::npos, actual.find("@attr description"));
// We should find @removed only in the attribute javadoc and not anywhere else (i.e. the class
// javadoc).
- const size_t pos = actual.find("@removed");
+ const size_t pos = actual.find("removed");
EXPECT_NE(std::string::npos, pos);
- EXPECT_EQ(std::string::npos, actual.find("@removed", pos + 1));
+ EXPECT_EQ(std::string::npos, actual.find("removed", pos + 1));
}
} // namespace aapt
diff --git a/tools/aapt2/java/ManifestClassGenerator.cpp b/tools/aapt2/java/ManifestClassGenerator.cpp
index be8955e..5ff11b1 100644
--- a/tools/aapt2/java/ManifestClassGenerator.cpp
+++ b/tools/aapt2/java/ManifestClassGenerator.cpp
@@ -25,12 +25,12 @@
namespace aapt {
-static Maybe<StringPiece16> extractJavaIdentifier(IDiagnostics* diag, const Source& source,
- const StringPiece16& value) {
- const StringPiece16 sep = u".";
+static Maybe<StringPiece> extractJavaIdentifier(IDiagnostics* diag, const Source& source,
+ const StringPiece& value) {
+ const StringPiece sep = ".";
auto iter = std::find_end(value.begin(), value.end(), sep.begin(), sep.end());
- StringPiece16 result;
+ StringPiece result;
if (iter != value.end()) {
result.assign(iter + sep.size(), value.end() - (iter + sep.size()));
} else {
@@ -42,15 +42,15 @@
return {};
}
- iter = util::findNonAlphaNumericAndNotInSet(result, u"_");
+ iter = util::findNonAlphaNumericAndNotInSet(result, "_");
if (iter != result.end()) {
diag->error(DiagMessage(source)
- << "invalid character '" << StringPiece16(iter, 1)
+ << "invalid character '" << StringPiece(iter, 1)
<< "' in '" << result << "'");
return {};
}
- if (*result.begin() >= u'0' && *result.begin() <= u'9') {
+ if (*result.begin() >= '0' && *result.begin() <= '9') {
diag->error(DiagMessage(source) << "symbol can not start with a digit");
return {};
}
@@ -60,20 +60,20 @@
static bool writeSymbol(const Source& source, IDiagnostics* diag, xml::Element* el,
ClassDefinition* classDef) {
- xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, u"name");
+ xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, "name");
if (!attr) {
diag->error(DiagMessage(source) << "<" << el->name << "> must define 'android:name'");
return false;
}
- Maybe<StringPiece16> result = extractJavaIdentifier(diag, source.withLine(el->lineNumber),
- attr->value);
+ Maybe<StringPiece> result = extractJavaIdentifier(diag, source.withLine(el->lineNumber),
+ attr->value);
if (!result) {
return false;
}
std::unique_ptr<StringMember> stringMember = util::make_unique<StringMember>(
- util::utf16ToUtf8(result.value()), util::utf16ToUtf8(attr->value));
+ result.value(), attr->value);
stringMember->getCommentBuilder()->appendComment(el->comment);
classDef->addMember(std::move(stringMember));
@@ -87,7 +87,7 @@
return {};
}
- if (el->name != u"manifest" && !el->namespaceUri.empty()) {
+ if (el->name != "manifest" && !el->namespaceUri.empty()) {
diag->error(DiagMessage(res->file.source) << "no <manifest> root tag defined");
return {};
}
@@ -102,9 +102,9 @@
std::vector<xml::Element*> children = el->getChildElements();
for (xml::Element* childEl : children) {
if (childEl->namespaceUri.empty()) {
- if (childEl->name == u"permission") {
+ if (childEl->name == "permission") {
error |= !writeSymbol(res->file.source, diag, childEl, permissionClass.get());
- } else if (childEl->name == u"permission-group") {
+ } else if (childEl->name == "permission-group") {
error |= !writeSymbol(res->file.source, diag, childEl, permissionGroupClass.get());
}
}
diff --git a/tools/aapt2/java/ManifestClassGenerator_test.cpp b/tools/aapt2/java/ManifestClassGenerator_test.cpp
index d3bca70..eecb544 100644
--- a/tools/aapt2/java/ManifestClassGenerator_test.cpp
+++ b/tools/aapt2/java/ManifestClassGenerator_test.cpp
@@ -15,10 +15,7 @@
*/
#include "java/ManifestClassGenerator.h"
-#include "test/Builders.h"
-#include "test/Context.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
diff --git a/tools/aapt2/java/ProguardRules.cpp b/tools/aapt2/java/ProguardRules.cpp
index 53ff961..902ec4c 100644
--- a/tools/aapt2/java/ProguardRules.cpp
+++ b/tools/aapt2/java/ProguardRules.cpp
@@ -43,7 +43,7 @@
node->namespaceUri);
if (maybePackage) {
// This is a custom view, let's figure out the class name from this.
- std::u16string package = maybePackage.value().package + u"." + node->name;
+ std::string package = maybePackage.value().package + "." + node->name;
if (util::isJavaClassName(package)) {
addClass(node->lineNumber, package);
}
@@ -58,11 +58,11 @@
}
protected:
- void addClass(size_t lineNumber, const std::u16string& className) {
+ void addClass(size_t lineNumber, const std::string& className) {
mKeepSet->addClass(Source(mSource.path, lineNumber), className);
}
- void addMethod(size_t lineNumber, const std::u16string& methodName) {
+ void addMethod(size_t lineNumber, const std::string& methodName) {
mKeepSet->addMethod(Source(mSource.path, lineNumber), methodName);
}
@@ -79,19 +79,19 @@
bool checkClass = false;
bool checkName = false;
if (node->namespaceUri.empty()) {
- checkClass = node->name == u"view" || node->name == u"fragment";
+ checkClass = node->name == "view" || node->name == "fragment";
} else if (node->namespaceUri == xml::kSchemaAndroid) {
- checkName = node->name == u"fragment";
+ checkName = node->name == "fragment";
}
for (const auto& attr : node->attributes) {
- if (checkClass && attr.namespaceUri.empty() && attr.name == u"class" &&
+ if (checkClass && attr.namespaceUri.empty() && attr.name == "class" &&
util::isJavaClassName(attr.value)) {
addClass(node->lineNumber, attr.value);
} else if (checkName && attr.namespaceUri == xml::kSchemaAndroid &&
- attr.name == u"name" && util::isJavaClassName(attr.value)) {
+ attr.name == "name" && util::isJavaClassName(attr.value)) {
addClass(node->lineNumber, attr.value);
- } else if (attr.namespaceUri == xml::kSchemaAndroid && attr.name == u"onClick") {
+ } else if (attr.namespaceUri == xml::kSchemaAndroid && attr.name == "onClick") {
addMethod(node->lineNumber, attr.value);
}
}
@@ -107,11 +107,11 @@
virtual void visit(xml::Element* node) override {
bool checkFragment = false;
if (node->namespaceUri.empty()) {
- checkFragment = node->name == u"PreferenceScreen" || node->name == u"header";
+ checkFragment = node->name == "PreferenceScreen" || node->name == "header";
}
if (checkFragment) {
- xml::Attribute* attr = node->findAttribute(xml::kSchemaAndroid, u"fragment");
+ xml::Attribute* attr = node->findAttribute(xml::kSchemaAndroid, "fragment");
if (attr && util::isJavaClassName(attr->value)) {
addClass(node->lineNumber, attr->value);
}
@@ -127,9 +127,9 @@
virtual void visit(xml::Element* node) override {
bool checkClass = node->namespaceUri.empty() &&
- (node->name == u"transition" || node->name == u"pathMotion");
+ (node->name == "transition" || node->name == "pathMotion");
if (checkClass) {
- xml::Attribute* attr = node->findAttribute({}, u"class");
+ xml::Attribute* attr = node->findAttribute({}, "class");
if (attr && util::isJavaClassName(attr->value)) {
addClass(node->lineNumber, attr->value);
}
@@ -147,50 +147,51 @@
virtual void visit(xml::Element* node) override {
if (node->namespaceUri.empty()) {
bool getName = false;
- if (node->name == u"manifest") {
- xml::Attribute* attr = node->findAttribute({}, u"package");
+ if (node->name == "manifest") {
+ xml::Attribute* attr = node->findAttribute({}, "package");
if (attr) {
mPackage = attr->value;
}
- } else if (node->name == u"application") {
+ } else if (node->name == "application") {
getName = true;
- xml::Attribute* attr = node->findAttribute(xml::kSchemaAndroid, u"backupAgent");
+ xml::Attribute* attr = node->findAttribute(xml::kSchemaAndroid, "backupAgent");
if (attr) {
- Maybe<std::u16string> result = util::getFullyQualifiedClassName(mPackage,
- attr->value);
+ Maybe<std::string> result = util::getFullyQualifiedClassName(mPackage,
+ attr->value);
if (result) {
addClass(node->lineNumber, result.value());
}
}
if (mMainDexOnly) {
xml::Attribute* defaultProcess = node->findAttribute(xml::kSchemaAndroid,
- u"process");
+ "process");
if (defaultProcess) {
mDefaultProcess = defaultProcess->value;
}
}
- } else if (node->name == u"activity" || node->name == u"service" ||
- node->name == u"receiver" || node->name == u"provider" ||
- node->name == u"instrumentation") {
+ } else if (node->name == "activity" || node->name == "service" ||
+ node->name == "receiver" || node->name == "provider") {
+ getName = true;
+
+ if (mMainDexOnly) {
+ xml::Attribute* componentProcess = node->findAttribute(xml::kSchemaAndroid,
+ "process");
+
+ const std::string& process = componentProcess ? componentProcess->value
+ : mDefaultProcess;
+ getName = !process.empty() && process[0] != ':';
+ }
+ } else if (node-> name == "instrumentation") {
getName = true;
}
if (getName) {
- xml::Attribute* attr = node->findAttribute(xml::kSchemaAndroid, u"name");
+ xml::Attribute* attr = node->findAttribute(xml::kSchemaAndroid, "name");
getName = attr != nullptr;
- if (getName && mMainDexOnly) {
- xml::Attribute* componentProcess = node->findAttribute(xml::kSchemaAndroid,
- u"process");
-
- const std::u16string& process = componentProcess ? componentProcess->value
- : mDefaultProcess;
- getName = !process.empty() && process[0] != u':';
- }
-
if (getName) {
- Maybe<std::u16string> result = util::getFullyQualifiedClassName(mPackage,
- attr->value);
+ Maybe<std::string> result = util::getFullyQualifiedClassName(mPackage,
+ attr->value);
if (result) {
addClass(node->lineNumber, result.value());
}
@@ -201,9 +202,9 @@
}
private:
- std::u16string mPackage;
+ std::string mPackage;
const bool mMainDexOnly;
- std::u16string mDefaultProcess;
+ std::string mDefaultProcess;
};
bool collectProguardRulesForManifest(const Source& source, xml::XmlResource* res,
diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h
index 744ae5b..c2d2bd9 100644
--- a/tools/aapt2/java/ProguardRules.h
+++ b/tools/aapt2/java/ProguardRules.h
@@ -31,19 +31,19 @@
class KeepSet {
public:
- inline void addClass(const Source& source, const std::u16string& className) {
+ inline void addClass(const Source& source, const std::string& className) {
mKeepSet[className].insert(source);
}
- inline void addMethod(const Source& source, const std::u16string& methodName) {
+ inline void addMethod(const Source& source, const std::string& methodName) {
mKeepMethodSet[methodName].insert(source);
}
private:
friend bool writeKeepSet(std::ostream* out, const KeepSet& keepSet);
- std::map<std::u16string, std::set<Source>> mKeepSet;
- std::map<std::u16string, std::set<Source>> mKeepMethodSet;
+ std::map<std::string, std::set<Source>> mKeepSet;
+ std::map<std::string, std::set<Source>> mKeepMethodSet;
};
bool collectProguardRulesForManifest(const Source& source, xml::XmlResource* res, KeepSet* keepSet,
diff --git a/tools/aapt2/link/AutoVersioner.cpp b/tools/aapt2/link/AutoVersioner.cpp
index 459c330..8ed27c3 100644
--- a/tools/aapt2/link/AutoVersioner.cpp
+++ b/tools/aapt2/link/AutoVersioner.cpp
@@ -27,7 +27,9 @@
bool shouldGenerateVersionedResource(const ResourceEntry* entry, const ConfigDescription& config,
const int sdkVersionToGenerate) {
+ // We assume the caller is trying to generate a version greater than the current configuration.
assert(sdkVersionToGenerate > config.sdkVersion);
+
const auto endIter = entry->values.end();
auto iter = entry->values.begin();
for (; iter != endIter; ++iter) {
diff --git a/tools/aapt2/link/AutoVersioner_test.cpp b/tools/aapt2/link/AutoVersioner_test.cpp
index 9b3a87c..3a61da5 100644
--- a/tools/aapt2/link/AutoVersioner_test.cpp
+++ b/tools/aapt2/link/AutoVersioner_test.cpp
@@ -16,10 +16,7 @@
#include "ConfigDescription.h"
#include "link/Linkers.h"
-#include "test/Builders.h"
-#include "test/Context.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
@@ -28,7 +25,7 @@
const ConfigDescription landConfig = test::parseConfigOrDie("land");
const ConfigDescription sw600dpLandConfig = test::parseConfigOrDie("sw600dp-land");
- ResourceEntry entry(u"foo");
+ ResourceEntry entry("foo");
entry.values.push_back(util::make_unique<ResourceConfigValue>(defaultConfig, ""));
entry.values.push_back(util::make_unique<ResourceConfigValue>(landConfig, ""));
entry.values.push_back(util::make_unique<ResourceConfigValue>(sw600dpLandConfig, ""));
@@ -42,7 +39,7 @@
const ConfigDescription sw600dpV13Config = test::parseConfigOrDie("sw600dp-v13");
const ConfigDescription v21Config = test::parseConfigOrDie("v21");
- ResourceEntry entry(u"foo");
+ ResourceEntry entry("foo");
entry.values.push_back(util::make_unique<ResourceConfigValue>(defaultConfig, ""));
entry.values.push_back(util::make_unique<ResourceConfigValue>(sw600dpV13Config, ""));
entry.values.push_back(util::make_unique<ResourceConfigValue>(v21Config, ""));
@@ -53,73 +50,73 @@
TEST(AutoVersionerTest, VersionStylesForTable) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"app", 0x7f)
- .addValue(u"@app:style/Foo", ResourceId(0x7f020000), test::parseConfigOrDie("v4"),
+ .setPackageId("app", 0x7f)
+ .addValue("app:style/Foo", test::parseConfigOrDie("v4"), ResourceId(0x7f020000),
test::StyleBuilder()
- .addItem(u"@android:attr/onClick", ResourceId(0x0101026f),
+ .addItem("android:attr/onClick", ResourceId(0x0101026f),
util::make_unique<Id>())
- .addItem(u"@android:attr/paddingStart", ResourceId(0x010103b3),
+ .addItem("android:attr/paddingStart", ResourceId(0x010103b3),
util::make_unique<Id>())
- .addItem(u"@android:attr/requiresSmallestWidthDp",
+ .addItem("android:attr/requiresSmallestWidthDp",
ResourceId(0x01010364), util::make_unique<Id>())
- .addItem(u"@android:attr/colorAccent", ResourceId(0x01010435),
+ .addItem("android:attr/colorAccent", ResourceId(0x01010435),
util::make_unique<Id>())
.build())
- .addValue(u"@app:style/Foo", ResourceId(0x7f020000), test::parseConfigOrDie("v21"),
+ .addValue("app:style/Foo", test::parseConfigOrDie("v21"), ResourceId(0x7f020000),
test::StyleBuilder()
- .addItem(u"@android:attr/paddingEnd", ResourceId(0x010103b4),
+ .addItem("android:attr/paddingEnd", ResourceId(0x010103b4),
util::make_unique<Id>())
.build())
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"app")
+ .setCompilationPackage("app")
.setPackageId(0x7f)
.build();
AutoVersioner versioner;
ASSERT_TRUE(versioner.consume(context.get(), table.get()));
- Style* style = test::getValueForConfig<Style>(table.get(), u"@app:style/Foo",
+ Style* style = test::getValueForConfig<Style>(table.get(), "app:style/Foo",
test::parseConfigOrDie("v4"));
ASSERT_NE(style, nullptr);
ASSERT_EQ(style->entries.size(), 1u);
AAPT_ASSERT_TRUE(style->entries.front().key.name);
EXPECT_EQ(style->entries.front().key.name.value(),
- test::parseNameOrDie(u"@android:attr/onClick"));
+ test::parseNameOrDie("android:attr/onClick"));
- style = test::getValueForConfig<Style>(table.get(), u"@app:style/Foo",
+ style = test::getValueForConfig<Style>(table.get(), "app:style/Foo",
test::parseConfigOrDie("v13"));
ASSERT_NE(style, nullptr);
ASSERT_EQ(style->entries.size(), 2u);
AAPT_ASSERT_TRUE(style->entries[0].key.name);
EXPECT_EQ(style->entries[0].key.name.value(),
- test::parseNameOrDie(u"@android:attr/onClick"));
+ test::parseNameOrDie("android:attr/onClick"));
AAPT_ASSERT_TRUE(style->entries[1].key.name);
EXPECT_EQ(style->entries[1].key.name.value(),
- test::parseNameOrDie(u"@android:attr/requiresSmallestWidthDp"));
+ test::parseNameOrDie("android:attr/requiresSmallestWidthDp"));
- style = test::getValueForConfig<Style>(table.get(), u"@app:style/Foo",
+ style = test::getValueForConfig<Style>(table.get(), "app:style/Foo",
test::parseConfigOrDie("v17"));
ASSERT_NE(style, nullptr);
ASSERT_EQ(style->entries.size(), 3u);
AAPT_ASSERT_TRUE(style->entries[0].key.name);
EXPECT_EQ(style->entries[0].key.name.value(),
- test::parseNameOrDie(u"@android:attr/onClick"));
+ test::parseNameOrDie("android:attr/onClick"));
AAPT_ASSERT_TRUE(style->entries[1].key.name);
EXPECT_EQ(style->entries[1].key.name.value(),
- test::parseNameOrDie(u"@android:attr/requiresSmallestWidthDp"));
+ test::parseNameOrDie("android:attr/requiresSmallestWidthDp"));
AAPT_ASSERT_TRUE(style->entries[2].key.name);
EXPECT_EQ(style->entries[2].key.name.value(),
- test::parseNameOrDie(u"@android:attr/paddingStart"));
+ test::parseNameOrDie("android:attr/paddingStart"));
- style = test::getValueForConfig<Style>(table.get(), u"@app:style/Foo",
+ style = test::getValueForConfig<Style>(table.get(), "app:style/Foo",
test::parseConfigOrDie("v21"));
ASSERT_NE(style, nullptr);
ASSERT_EQ(style->entries.size(), 1u);
AAPT_ASSERT_TRUE(style->entries.front().key.name);
EXPECT_EQ(style->entries.front().key.name.value(),
- test::parseNameOrDie(u"@android:attr/paddingEnd"));
+ test::parseNameOrDie("android:attr/paddingEnd"));
}
} // namespace aapt
diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/link/Link.cpp
index 4767bc9..ded661e 100644
--- a/tools/aapt2/link/Link.cpp
+++ b/tools/aapt2/link/Link.cpp
@@ -44,10 +44,12 @@
#include "util/StringPiece.h"
#include "xml/XmlDom.h"
+#include <android-base/file.h>
#include <google/protobuf/io/coded_stream.h>
#include <fstream>
#include <sys/stat.h>
+#include <unordered_map>
#include <vector>
namespace aapt {
@@ -58,8 +60,8 @@
std::vector<std::string> includePaths;
std::vector<std::string> overlayFiles;
Maybe<std::string> generateJavaClassPath;
- Maybe<std::u16string> customJavaPackage;
- std::set<std::u16string> extraJavaPackages;
+ Maybe<std::string> customJavaPackage;
+ std::set<std::string> extraJavaPackages;
Maybe<std::string> generateProguardRulesPath;
Maybe<std::string> generateMainDexProguardRulesPath;
bool noAutoVersion = false;
@@ -72,10 +74,12 @@
bool autoAddOverlay = false;
bool doNotCompressAnything = false;
std::vector<std::string> extensionsToNotCompress;
- Maybe<std::u16string> privateSymbols;
+ Maybe<std::string> privateSymbols;
ManifestFixerOptions manifestFixerOptions;
std::unordered_set<std::string> products;
TableSplitterOptions tableSplitterOptions;
+ std::unordered_map<ResourceName, ResourceId> stableIdMap;
+ Maybe<std::string> resourceIdMapPath;
};
class LinkContext : public IAaptContext {
@@ -95,11 +99,11 @@
mNameMangler = NameMangler(policy);
}
- const std::u16string& getCompilationPackage() override {
+ const std::string& getCompilationPackage() override {
return mCompilationPackage;
}
- void setCompilationPackage(const StringPiece16& packageName) {
+ void setCompilationPackage(const StringPiece& packageName) {
mCompilationPackage = packageName.toString();
}
@@ -123,13 +127,22 @@
mVerbose = val;
}
+ int getMinSdkVersion() override {
+ return mMinSdkVersion;
+ }
+
+ void setMinSdkVersion(int minSdk) {
+ mMinSdkVersion = minSdk;
+ }
+
private:
StdErrDiagnostics mDiagnostics;
NameMangler mNameMangler;
- std::u16string mCompilationPackage;
+ std::string mCompilationPackage;
uint8_t mPackageId = 0x0;
SymbolTable mSymbols;
bool mVerbose = false;
+ int mMinSdkVersion = 0;
};
static bool copyFileToArchive(io::IFile* file, const std::string& outPath,
@@ -146,7 +159,7 @@
size_t bufferSize = data->size();
// If the file ends with .flat, we must strip off the CompiledFileHeader from it.
- if (util::stringEndsWith<char>(file->getSource().path, ".flat")) {
+ if (util::stringEndsWith(file->getSource().path, ".flat")) {
CompiledFileInputStream inputStream(data->data(), data->size());
if (!inputStream.CompiledFile()) {
context->getDiagnostics()->error(DiagMessage(file->getSource())
@@ -204,16 +217,6 @@
return false;
}
-/*static std::unique_ptr<ResourceTable> loadTable(const Source& source, const void* data, size_t len,
- IDiagnostics* diag) {
- std::unique_ptr<ResourceTable> table = util::make_unique<ResourceTable>();
- BinaryResourceParser parser(diag, table.get(), source, data, len);
- if (!parser.parse()) {
- return {};
- }
- return table;
-}*/
-
static std::unique_ptr<ResourceTable> loadTableFromPb(const Source& source,
const void* data, size_t len,
IDiagnostics* diag) {
@@ -320,7 +323,7 @@
}
for (const std::string& extension : mOptions.extensionsToNotCompress) {
- if (util::stringEndsWith<char>(str, extension)) {
+ if (util::stringEndsWith(str, extension)) {
return 0;
}
}
@@ -343,7 +346,7 @@
return false;
}
- if (util::stringEndsWith<char>(srcPath, ".flat")) {
+ if (util::stringEndsWith(srcPath, ".flat")) {
outFileOp->xmlToFlatten = loadBinaryXmlSkipFileExport(file->getSource(),
data->data(), data->size(),
mContext->getDiagnostics());
@@ -375,7 +378,7 @@
// Skip this if it is a vector or animated-vector.
xml::Element* el = xml::findRootElement(outFileOp->xmlToFlatten.get());
if (el && el->namespaceUri.empty()) {
- if (el->name == u"vector" || el->name == u"animated-vector") {
+ if (el->name == "vector" || el->name == "animated-vector") {
// We are NOT going to version this file.
outFileOp->skipVersion = true;
return true;
@@ -404,8 +407,8 @@
<< versionedFileDesc.config << "'");
}
- std::u16string genPath = util::utf8ToUtf16(ResourceUtils::buildResourceFileName(
- versionedFileDesc, mContext->getNameMangler()));
+ std::string genPath = ResourceUtils::buildResourceFileName(
+ versionedFileDesc, mContext->getNameMangler());
bool added = table->addFileReferenceAllowMangled(versionedFileDesc.name,
versionedFileDesc.config,
@@ -429,7 +432,7 @@
*/
bool ResourceFileFlattener::flatten(ResourceTable* table, IArchiveWriter* archiveWriter) {
bool error = false;
- std::map<std::pair<ConfigDescription, StringPiece16>, FileOperation> configSortedFiles;
+ std::map<std::pair<ConfigDescription, StringPiece>, FileOperation> configSortedFiles;
for (auto& pkg : table->packages) {
for (auto& type : pkg->types) {
@@ -454,12 +457,12 @@
}
FileOperation fileOp;
- fileOp.dstPath = util::utf16ToUtf8(*fileRef->path);
+ fileOp.dstPath = *fileRef->path;
const StringPiece srcPath = file->getSource().path;
if (type->type != ResourceType::kRaw &&
- (util::stringEndsWith<char>(srcPath, ".xml.flat") ||
- util::stringEndsWith<char>(srcPath, ".xml"))) {
+ (util::stringEndsWith(srcPath, ".xml.flat") ||
+ util::stringEndsWith(srcPath, ".xml"))) {
ResourceFile fileDesc;
fileDesc.config = configValue->config;
fileDesc.name = ResourceName(pkg->name, type->type, entry->name);
@@ -477,7 +480,7 @@
// we end up copying the string in the std::make_pair() method, then creating
// a StringPiece16 from the copy, which would cause us to end up referencing
// garbage in the map.
- const StringPiece16 entryName(entry->name);
+ const StringPiece entryName(entry->name);
configSortedFiles[std::make_pair(configValue->config, entryName)] =
std::move(fileOp);
}
@@ -518,6 +521,77 @@
return !error;
}
+static bool writeStableIdMapToPath(IDiagnostics* diag,
+ const std::unordered_map<ResourceName, ResourceId>& idMap,
+ const std::string idMapPath) {
+ std::ofstream fout(idMapPath, std::ofstream::binary);
+ if (!fout) {
+ diag->error(DiagMessage(idMapPath) << strerror(errno));
+ return false;
+ }
+
+ for (const auto& entry : idMap) {
+ const ResourceName& name = entry.first;
+ const ResourceId& id = entry.second;
+ fout << name << " = " << id << "\n";
+ }
+
+ if (!fout) {
+ diag->error(DiagMessage(idMapPath) << "failed writing to file: " << strerror(errno));
+ return false;
+ }
+
+ return true;
+}
+
+static bool loadStableIdMap(IDiagnostics* diag, const std::string& path,
+ std::unordered_map<ResourceName, ResourceId>* outIdMap) {
+ std::string content;
+ if (!android::base::ReadFileToString(path, &content)) {
+ diag->error(DiagMessage(path) << "failed reading stable ID file");
+ return false;
+ }
+
+ outIdMap->clear();
+ size_t lineNo = 0;
+ for (StringPiece line : util::tokenize(content, '\n')) {
+ lineNo++;
+ line = util::trimWhitespace(line);
+ if (line.empty()) {
+ continue;
+ }
+
+ auto iter = std::find(line.begin(), line.end(), '=');
+ if (iter == line.end()) {
+ diag->error(DiagMessage(Source(path, lineNo)) << "missing '='");
+ return false;
+ }
+
+ ResourceNameRef name;
+ StringPiece resNameStr = util::trimWhitespace(
+ line.substr(0, std::distance(line.begin(), iter)));
+ if (!ResourceUtils::parseResourceName(resNameStr, &name)) {
+ diag->error(DiagMessage(Source(path, lineNo))
+ << "invalid resource name '" << resNameStr << "'");
+ return false;
+ }
+
+ const size_t resIdStartIdx = std::distance(line.begin(), iter) + 1;
+ const size_t resIdStrLen = line.size() - resIdStartIdx;
+ StringPiece resIdStr = util::trimWhitespace(line.substr(resIdStartIdx, resIdStrLen));
+
+ Maybe<ResourceId> maybeId = ResourceUtils::tryParseResourceId(resIdStr);
+ if (!maybeId) {
+ diag->error(DiagMessage(Source(path, lineNo)) << "invalid resource ID '"
+ << resIdStr << "'");
+ return false;
+ }
+
+ (*outIdMap)[name.toResourceName()] = maybeId.value();
+ }
+ return true;
+}
+
class LinkCommand {
public:
LinkCommand(LinkContext* context, const LinkOptions& options) :
@@ -578,14 +652,33 @@
return true;
}
- Maybe<AppInfo> extractAppInfoFromManifest(xml::XmlResource* xmlRes) {
+ Maybe<AppInfo> extractAppInfoFromManifest(xml::XmlResource* xmlRes, IDiagnostics* diag) {
// Make sure the first element is <manifest> with package attribute.
if (xml::Element* manifestEl = xml::findRootElement(xmlRes->root.get())) {
- if (manifestEl->namespaceUri.empty() && manifestEl->name == u"manifest") {
- if (xml::Attribute* packageAttr = manifestEl->findAttribute({}, u"package")) {
- return AppInfo{ packageAttr->value };
+ AppInfo appInfo;
+
+ if (!manifestEl->namespaceUri.empty() || manifestEl->name != "manifest") {
+ diag->error(DiagMessage(xmlRes->file.source) << "root tag must be <manifest>");
+ return {};
+ }
+
+ xml::Attribute* packageAttr = manifestEl->findAttribute({}, "package");
+ if (!packageAttr) {
+ diag->error(DiagMessage(xmlRes->file.source)
+ << "<manifest> must have a 'package' attribute");
+ return {};
+ }
+
+ appInfo.package = packageAttr->value;
+
+ if (xml::Element* usesSdkEl = manifestEl->findChild({}, "uses-sdk")) {
+ if (xml::Attribute* minSdk =
+ usesSdkEl->findAttribute(xml::kSchemaAndroid, "minSdkVersion")) {
+ appInfo.minSdkVersion = minSdk->value;
}
}
+
+ return appInfo;
}
return {};
}
@@ -614,7 +707,7 @@
// Special case the occurrence of an ID that is being generated for the
// 'android' package. This is due to legacy reasons.
if (valueCast<Id>(configValue->value.get()) &&
- package->name == u"android") {
+ package->name == "android") {
mContext->getDiagnostics()->warn(
DiagMessage(configValue->value->getSource())
<< "generated id '" << resName
@@ -724,14 +817,14 @@
return true;
}
- bool writeJavaFile(ResourceTable* table, const StringPiece16& packageNameToGenerate,
- const StringPiece16& outPackage, JavaClassGeneratorOptions javaOptions) {
+ bool writeJavaFile(ResourceTable* table, const StringPiece& packageNameToGenerate,
+ const StringPiece& outPackage, JavaClassGeneratorOptions javaOptions) {
if (!mOptions.generateJavaClassPath) {
return true;
}
std::string outPath = mOptions.generateJavaClassPath.value();
- file::appendPath(&outPath, file::packageToPath(util::utf16ToUtf8(outPackage)));
+ file::appendPath(&outPath, file::packageToPath(outPackage));
if (!file::mkdirs(outPath)) {
mContext->getDiagnostics()->error(
DiagMessage() << "failed to create directory '" << outPath << "'");
@@ -785,7 +878,7 @@
manifestClass->getCommentBuilder()->appendComment(properAnnotation);
}
- const std::string packageUtf8 = util::utf16ToUtf8(mContext->getCompilationPackage());
+ const std::string& packageUtf8 = mContext->getCompilationPackage();
std::string outPath = mOptions.generateJavaClassPath.value();
file::appendPath(&outPath, file::packageToPath(packageUtf8));
@@ -893,7 +986,7 @@
mOptions.extraJavaPackages.insert(pkg->name);
}
- pkg->name = u"";
+ pkg->name = "";
if (override) {
result = mTableMerger->mergeOverlay(Source(input), table.get(), collection.get());
} else {
@@ -1031,12 +1124,12 @@
* Otherwise the files is processed on its own.
*/
bool mergePath(const std::string& path, bool override) {
- if (util::stringEndsWith<char>(path, ".flata") ||
- util::stringEndsWith<char>(path, ".jar") ||
- util::stringEndsWith<char>(path, ".jack") ||
- util::stringEndsWith<char>(path, ".zip")) {
+ if (util::stringEndsWith(path, ".flata") ||
+ util::stringEndsWith(path, ".jar") ||
+ util::stringEndsWith(path, ".jack") ||
+ util::stringEndsWith(path, ".zip")) {
return mergeArchive(path, override);
- } else if (util::stringEndsWith<char>(path, ".apk")) {
+ } else if (util::stringEndsWith(path, ".apk")) {
return mergeStaticLibrary(path, override);
}
@@ -1057,10 +1150,10 @@
*/
bool mergeFile(io::IFile* file, bool override) {
const Source& src = file->getSource();
- if (util::stringEndsWith<char>(src.path, ".arsc.flat")) {
+ if (util::stringEndsWith(src.path, ".arsc.flat")) {
return mergeResourceTable(file, override);
- } else if (util::stringEndsWith<char>(src.path, ".flat")){
+ } else if (util::stringEndsWith(src.path, ".flat")){
// Try opening the file and looking for an Export header.
std::unique_ptr<io::IData> data = file->openAsData();
if (!data) {
@@ -1089,11 +1182,11 @@
return 1;
}
- if (Maybe<AppInfo> maybeAppInfo = extractAppInfoFromManifest(manifestXml.get())) {
- mContext->setCompilationPackage(maybeAppInfo.value().package);
+ if (Maybe<AppInfo> maybeAppInfo = extractAppInfoFromManifest(manifestXml.get(),
+ mContext->getDiagnostics())) {
+ AppInfo& appInfo = maybeAppInfo.value();
+ mContext->setCompilationPackage(appInfo.package);
} else {
- mContext->getDiagnostics()->error(DiagMessage(mOptions.manifestPath)
- << "no package specified in <manifest> tag");
return 1;
}
@@ -1107,7 +1200,7 @@
mContext->setNameManglerPolicy(NameManglerPolicy{ mContext->getCompilationPackage() });
- if (mContext->getCompilationPackage() == u"android") {
+ if (mContext->getCompilationPackage() == "android") {
mContext->setPackageId(0x01);
} else {
mContext->setPackageId(0x7f);
@@ -1158,11 +1251,32 @@
if (!mOptions.staticLib) {
// Assign IDs if we are building a regular app.
- IdAssigner idAssigner;
+ IdAssigner idAssigner(&mOptions.stableIdMap);
if (!idAssigner.consume(mContext, &mFinalTable)) {
mContext->getDiagnostics()->error(DiagMessage() << "failed assigning IDs");
return 1;
}
+
+ // Now grab each ID and emit it as a file.
+ if (mOptions.resourceIdMapPath) {
+ for (auto& package : mFinalTable.packages) {
+ for (auto& type : package->types) {
+ for (auto& entry : type->entries) {
+ ResourceName name(package->name, type->type, entry->name);
+ // The IDs are guaranteed to exist.
+ mOptions.stableIdMap[std::move(name)] = ResourceId(package->id.value(),
+ type->id.value(),
+ entry->id.value());
+ }
+ }
+ }
+
+ if (!writeStableIdMapToPath(mContext->getDiagnostics(),
+ mOptions.stableIdMap,
+ mOptions.resourceIdMapPath.value())) {
+ return 1;
+ }
+ }
} else {
// Static libs are merged with other apps, and ID collisions are bad, so verify that
// no IDs have been set.
@@ -1297,6 +1411,28 @@
}
}
+ Maybe<AppInfo> maybeAppInfo = extractAppInfoFromManifest(manifestXml.get(),
+ mContext->getDiagnostics());
+ if (maybeAppInfo && maybeAppInfo.value().minSdkVersion) {
+ if (Maybe<int> maybeMinSdkVersion =
+ ResourceUtils::tryParseSdkVersion(maybeAppInfo.value().minSdkVersion.value())) {
+ mContext->setMinSdkVersion(maybeMinSdkVersion.value());
+ }
+ }
+
+ if (!mOptions.staticLib && mContext->getMinSdkVersion() > 0) {
+ if (mContext->verbose()) {
+ mContext->getDiagnostics()->note(
+ DiagMessage() << "collapsing resource versions for minimum SDK "
+ << mContext->getMinSdkVersion());
+ }
+
+ VersionCollapser collapser;
+ if (!collapser.consume(mContext, &mFinalTable)) {
+ return 1;
+ }
+ }
+
if (mOptions.staticLib) {
if (!flattenTableToPb(&mFinalTable, archiveWriter.get())) {
mContext->getDiagnostics()->error(DiagMessage()
@@ -1320,8 +1456,8 @@
options.useFinal = false;
}
- const StringPiece16 actualPackage = mContext->getCompilationPackage();
- StringPiece16 outputPackage = mContext->getCompilationPackage();
+ const StringPiece actualPackage = mContext->getCompilationPackage();
+ StringPiece outputPackage = mContext->getCompilationPackage();
if (mOptions.customJavaPackage) {
// Override the output java package to the custom one.
outputPackage = mOptions.customJavaPackage.value();
@@ -1345,7 +1481,7 @@
return 1;
}
- for (const std::u16string& extraPackage : mOptions.extraJavaPackages) {
+ for (const std::string& extraPackage : mOptions.extraJavaPackages) {
if (!writeJavaFile(&mFinalTable, actualPackage, extraPackage, options)) {
return 1;
}
@@ -1390,11 +1526,6 @@
LinkContext context;
LinkOptions options;
std::vector<std::string> overlayArgList;
- Maybe<std::string> privateSymbolsPackage;
- Maybe<std::string> minSdkVersion, targetSdkVersion;
- Maybe<std::string> renameManifestPackage, renameInstrumentationTargetPackage;
- Maybe<std::string> versionCode, versionName;
- Maybe<std::string> customJavaPackage;
std::vector<std::string> extraJavaPackages;
Maybe<std::string> configs;
Maybe<std::string> preferredDensity;
@@ -1402,6 +1533,7 @@
bool legacyXFlag = false;
bool requireLocalization = false;
bool verbose = false;
+ Maybe<std::string> stableIdFilePath;
Flags flags = Flags()
.requiredFlag("-o", "Output path", &options.outputPath)
.requiredFlag("--manifest", "Path to the Android manifest to build",
@@ -1439,41 +1571,56 @@
"by -o",
&options.outputToDirectory)
.optionalFlag("--min-sdk-version", "Default minimum SDK version to use for "
- "AndroidManifest.xml", &minSdkVersion)
+ "AndroidManifest.xml",
+ &options.manifestFixerOptions.minSdkVersionDefault)
.optionalFlag("--target-sdk-version", "Default target SDK version to use for "
- "AndroidManifest.xml", &targetSdkVersion)
+ "AndroidManifest.xml",
+ &options.manifestFixerOptions.targetSdkVersionDefault)
.optionalFlag("--version-code", "Version code (integer) to inject into the "
- "AndroidManifest.xml if none is present", &versionCode)
+ "AndroidManifest.xml if none is present",
+ &options.manifestFixerOptions.versionCodeDefault)
.optionalFlag("--version-name", "Version name to inject into the AndroidManifest.xml "
- "if none is present", &versionName)
- .optionalSwitch("--static-lib", "Generate a static Android library", &options.staticLib)
+ "if none is present",
+ &options.manifestFixerOptions.versionNameDefault)
+ .optionalSwitch("--static-lib", "Generate a static Android library",
+ &options.staticLib)
.optionalSwitch("--no-static-lib-packages",
"Merge all library resources under the app's package",
&options.noStaticLibPackages)
.optionalSwitch("--non-final-ids", "Generates R.java without the final modifier.\n"
"This is implied when --static-lib is specified.",
&options.generateNonFinalIds)
+ .optionalFlag("--stable-ids", "File containing a list of name to ID mapping.",
+ &stableIdFilePath)
+ .optionalFlag("--emit-ids", "Emit a file at the given path with a list of name to ID\n"
+ "mappings, suitable for use with --stable-ids.",
+ &options.resourceIdMapPath)
.optionalFlag("--private-symbols", "Package name to use when generating R.java for "
"private symbols.\n"
"If not specified, public and private symbols will use the application's "
- "package name", &privateSymbolsPackage)
+ "package name",
+ &options.privateSymbols)
.optionalFlag("--custom-package", "Custom Java package under which to generate R.java",
- &customJavaPackage)
+ &options.customJavaPackage)
.optionalFlagList("--extra-packages", "Generate the same R.java but with different "
- "package names", &extraJavaPackages)
+ "package names",
+ &extraJavaPackages)
.optionalFlagList("--add-javadoc-annotation", "Adds a JavaDoc annotation to all "
- "generated Java classes", &options.javadocAnnotations)
+ "generated Java classes",
+ &options.javadocAnnotations)
.optionalSwitch("--auto-add-overlay", "Allows the addition of new resources in "
- "overlays without <add-resource> tags", &options.autoAddOverlay)
+ "overlays without <add-resource> tags",
+ &options.autoAddOverlay)
.optionalFlag("--rename-manifest-package", "Renames the package in AndroidManifest.xml",
- &renameManifestPackage)
+ &options.manifestFixerOptions.renameManifestPackage)
.optionalFlag("--rename-instrumentation-target-package",
"Changes the name of the target package for instrumentation. Most useful "
"when used\nin conjunction with --rename-manifest-package",
- &renameInstrumentationTargetPackage)
+ &options.manifestFixerOptions.renameInstrumentationTargetPackage)
.optionalFlagList("-0", "File extensions not to compress",
&options.extensionsToNotCompress)
- .optionalSwitch("-v", "Enables verbose logging", &verbose);
+ .optionalSwitch("-v", "Enables verbose logging",
+ &verbose);
if (!flags.parse("aapt2 link", args, &std::cerr)) {
return 1;
@@ -1482,7 +1629,7 @@
// Expand all argument-files passed into the command line. These start with '@'.
std::vector<std::string> argList;
for (const std::string& arg : flags.getArgs()) {
- if (util::stringStartsWith<char>(arg, "@")) {
+ if (util::stringStartsWith(arg, "@")) {
const std::string path = arg.substr(1, arg.size() - 1);
std::string error;
if (!file::appendArgsFromFile(path, &argList, &error)) {
@@ -1496,7 +1643,7 @@
// Expand all argument-files passed to -R.
for (const std::string& arg : overlayArgList) {
- if (util::stringStartsWith<char>(arg, "@")) {
+ if (util::stringStartsWith(arg, "@")) {
const std::string path = arg.substr(1, arg.size() - 1);
std::string error;
if (!file::appendArgsFromFile(path, &options.overlayFiles, &error)) {
@@ -1512,52 +1659,16 @@
context.setVerbose(verbose);
}
- if (privateSymbolsPackage) {
- options.privateSymbols = util::utf8ToUtf16(privateSymbolsPackage.value());
- }
-
- if (minSdkVersion) {
- options.manifestFixerOptions.minSdkVersionDefault =
- util::utf8ToUtf16(minSdkVersion.value());
- }
-
- if (targetSdkVersion) {
- options.manifestFixerOptions.targetSdkVersionDefault =
- util::utf8ToUtf16(targetSdkVersion.value());
- }
-
- if (renameManifestPackage) {
- options.manifestFixerOptions.renameManifestPackage =
- util::utf8ToUtf16(renameManifestPackage.value());
- }
-
- if (renameInstrumentationTargetPackage) {
- options.manifestFixerOptions.renameInstrumentationTargetPackage =
- util::utf8ToUtf16(renameInstrumentationTargetPackage.value());
- }
-
- if (versionCode) {
- options.manifestFixerOptions.versionCodeDefault = util::utf8ToUtf16(versionCode.value());
- }
-
- if (versionName) {
- options.manifestFixerOptions.versionNameDefault = util::utf8ToUtf16(versionName.value());
- }
-
- if (customJavaPackage) {
- options.customJavaPackage = util::utf8ToUtf16(customJavaPackage.value());
- }
-
// Populate the set of extra packages for which to generate R.java.
for (std::string& extraPackage : extraJavaPackages) {
// A given package can actually be a colon separated list of packages.
for (StringPiece package : util::split(extraPackage, ':')) {
- options.extraJavaPackages.insert(util::utf8ToUtf16(package));
+ options.extraJavaPackages.insert(package.toString());
}
}
if (productList) {
- for (StringPiece product : util::tokenize<char>(productList.value(), ',')) {
+ for (StringPiece product : util::tokenize(productList.value(), ',')) {
if (product != "" && product != "default") {
options.products.insert(product.toString());
}
@@ -1566,7 +1677,7 @@
AxisConfigFilter filter;
if (configs) {
- for (const StringPiece& configStr : util::tokenize<char>(configs.value(), ',')) {
+ for (const StringPiece& configStr : util::tokenize(configs.value(), ',')) {
ConfigDescription config;
LocaleValue lv;
if (lv.initFromFilterString(configStr)) {
@@ -1610,6 +1721,13 @@
options.tableSplitterOptions.preferredDensity = preferredDensityConfig.density;
}
+ if (!options.staticLib && stableIdFilePath) {
+ if (!loadStableIdMap(context.getDiagnostics(), stableIdFilePath.value(),
+ &options.stableIdMap)) {
+ return 1;
+ }
+ }
+
// Turn off auto versioning for static-libs.
if (options.staticLib) {
options.noAutoVersion = true;
diff --git a/tools/aapt2/link/Linkers.h b/tools/aapt2/link/Linkers.h
index ec532ab..43b8fb4 100644
--- a/tools/aapt2/link/Linkers.h
+++ b/tools/aapt2/link/Linkers.h
@@ -44,14 +44,21 @@
bool shouldGenerateVersionedResource(const ResourceEntry* entry, const ConfigDescription& config,
const int sdkVersionToGenerate);
-struct AutoVersioner : public IResourceTableConsumer {
+class AutoVersioner : public IResourceTableConsumer {
+public:
bool consume(IAaptContext* context, ResourceTable* table) override;
};
-struct XmlAutoVersioner : public IXmlResourceConsumer {
+class XmlAutoVersioner : public IXmlResourceConsumer {
+public:
bool consume(IAaptContext* context, xml::XmlResource* resource) override;
};
+class VersionCollapser : public IResourceTableConsumer {
+public:
+ bool consume(IAaptContext* context, ResourceTable* table) override;
+};
+
/**
* If any attribute resource values are defined as public, this consumer will move all private
* attribute resource values to a private ^private-attr type, avoiding backwards compatibility
diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 45e07a7..1203db7 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -20,6 +20,8 @@
#include "xml/XmlActionExecutor.h"
#include "xml/XmlDom.h"
+#include <unordered_set>
+
namespace aapt {
/**
@@ -27,21 +29,15 @@
*/
static bool nameIsJavaClassName(xml::Element* el, xml::Attribute* attr,
SourcePathDiagnostics* diag) {
- std::u16string className = attr->value;
- if (className.find(u'.') == std::u16string::npos) {
- // There is no '.', so add one to the beginning.
- className = u".";
- className += attr->value;
- }
-
// We allow unqualified class names (ie: .HelloActivity)
// Since we don't know the package name, we can just make a fake one here and
// the test will be identical as long as the real package name is valid too.
- Maybe<std::u16string> fullyQualifiedClassName =
- util::getFullyQualifiedClassName(u"a", className);
+ Maybe<std::string> fullyQualifiedClassName =
+ util::getFullyQualifiedClassName("a", attr->value);
- StringPiece16 qualifiedClassName = fullyQualifiedClassName
- ? fullyQualifiedClassName.value() : className;
+ StringPiece qualifiedClassName = fullyQualifiedClassName
+ ? fullyQualifiedClassName.value() : attr->value;
+
if (!util::isJavaClassName(qualifiedClassName)) {
diag->error(DiagMessage(el->lineNumber)
<< "attribute 'android:name' in <"
@@ -52,14 +48,14 @@
}
static bool optionalNameIsJavaClassName(xml::Element* el, SourcePathDiagnostics* diag) {
- if (xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, u"name")) {
+ if (xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, "name")) {
return nameIsJavaClassName(el, attr, diag);
}
return true;
}
static bool requiredNameIsJavaClassName(xml::Element* el, SourcePathDiagnostics* diag) {
- if (xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, u"name")) {
+ if (xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, "name")) {
return nameIsJavaClassName(el, attr, diag);
}
diag->error(DiagMessage(el->lineNumber)
@@ -68,7 +64,7 @@
}
static bool verifyManifest(xml::Element* el, SourcePathDiagnostics* diag) {
- xml::Attribute* attr = el->findAttribute({}, u"package");
+ xml::Attribute* attr = el->findAttribute({}, "package");
if (!attr) {
diag->error(DiagMessage(el->lineNumber) << "<manifest> tag is missing 'package' attribute");
return false;
@@ -105,31 +101,31 @@
// Common intent-filter actions.
xml::XmlNodeAction intentFilterAction;
- intentFilterAction[u"action"];
- intentFilterAction[u"category"];
- intentFilterAction[u"data"];
+ intentFilterAction["action"];
+ intentFilterAction["category"];
+ intentFilterAction["data"];
// Common meta-data actions.
xml::XmlNodeAction metaDataAction;
// Manifest actions.
- xml::XmlNodeAction& manifestAction = (*executor)[u"manifest"];
+ xml::XmlNodeAction& manifestAction = (*executor)["manifest"];
manifestAction.action(verifyManifest);
manifestAction.action([&](xml::Element* el) -> bool {
if (mOptions.versionNameDefault) {
- if (el->findAttribute(xml::kSchemaAndroid, u"versionName") == nullptr) {
+ if (el->findAttribute(xml::kSchemaAndroid, "versionName") == nullptr) {
el->attributes.push_back(xml::Attribute{
xml::kSchemaAndroid,
- u"versionName",
+ "versionName",
mOptions.versionNameDefault.value() });
}
}
if (mOptions.versionCodeDefault) {
- if (el->findAttribute(xml::kSchemaAndroid, u"versionCode") == nullptr) {
+ if (el->findAttribute(xml::kSchemaAndroid, "versionCode") == nullptr) {
el->attributes.push_back(xml::Attribute{
xml::kSchemaAndroid,
- u"versionCode",
+ "versionCode",
mOptions.versionCodeDefault.value() });
}
}
@@ -137,87 +133,89 @@
});
// Meta tags.
- manifestAction[u"eat-comment"];
+ manifestAction["eat-comment"];
// Uses-sdk actions.
- manifestAction[u"uses-sdk"].action([&](xml::Element* el) -> bool {
+ manifestAction["uses-sdk"].action([&](xml::Element* el) -> bool {
if (mOptions.minSdkVersionDefault &&
- el->findAttribute(xml::kSchemaAndroid, u"minSdkVersion") == nullptr) {
+ el->findAttribute(xml::kSchemaAndroid, "minSdkVersion") == nullptr) {
// There was no minSdkVersion defined and we have a default to assign.
el->attributes.push_back(xml::Attribute{
- xml::kSchemaAndroid, u"minSdkVersion",
+ xml::kSchemaAndroid, "minSdkVersion",
mOptions.minSdkVersionDefault.value() });
}
if (mOptions.targetSdkVersionDefault &&
- el->findAttribute(xml::kSchemaAndroid, u"targetSdkVersion") == nullptr) {
+ el->findAttribute(xml::kSchemaAndroid, "targetSdkVersion") == nullptr) {
// There was no targetSdkVersion defined and we have a default to assign.
el->attributes.push_back(xml::Attribute{
- xml::kSchemaAndroid, u"targetSdkVersion",
+ xml::kSchemaAndroid, "targetSdkVersion",
mOptions.targetSdkVersionDefault.value() });
}
return true;
});
// Instrumentation actions.
- manifestAction[u"instrumentation"].action([&](xml::Element* el) -> bool {
+ manifestAction["instrumentation"].action([&](xml::Element* el) -> bool {
if (!mOptions.renameInstrumentationTargetPackage) {
return true;
}
- if (xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, u"targetPackage")) {
+ if (xml::Attribute* attr = el->findAttribute(xml::kSchemaAndroid, "targetPackage")) {
attr->value = mOptions.renameInstrumentationTargetPackage.value();
}
return true;
});
- manifestAction[u"original-package"];
- manifestAction[u"protected-broadcast"];
- manifestAction[u"uses-permission"];
- manifestAction[u"permission"];
- manifestAction[u"permission-tree"];
- manifestAction[u"permission-group"];
+ manifestAction["original-package"];
+ manifestAction["protected-broadcast"];
+ manifestAction["uses-permission"];
+ manifestAction["permission"];
+ manifestAction["permission-tree"];
+ manifestAction["permission-group"];
- manifestAction[u"uses-configuration"];
- manifestAction[u"uses-feature"];
- manifestAction[u"supports-screens"];
- manifestAction[u"compatible-screens"];
- manifestAction[u"supports-gl-texture"];
+ manifestAction["uses-configuration"];
+ manifestAction["uses-feature"];
+ manifestAction["supports-screens"];
+ manifestAction["compatible-screens"];
+ manifestAction["supports-gl-texture"];
// Application actions.
- xml::XmlNodeAction& applicationAction = (*executor)[u"manifest"][u"application"];
+ xml::XmlNodeAction& applicationAction = manifestAction["application"];
applicationAction.action(optionalNameIsJavaClassName);
// Uses library actions.
- applicationAction[u"uses-library"];
+ applicationAction["uses-library"];
// Meta-data.
- applicationAction[u"meta-data"] = metaDataAction;
+ applicationAction["meta-data"] = metaDataAction;
// Activity actions.
- applicationAction[u"activity"].action(requiredNameIsJavaClassName);
- applicationAction[u"activity"][u"intent-filter"] = intentFilterAction;
- applicationAction[u"activity"][u"meta-data"] = metaDataAction;
+ applicationAction["activity"].action(requiredNameIsJavaClassName);
+ applicationAction["activity"]["intent-filter"] = intentFilterAction;
+ applicationAction["activity"]["meta-data"] = metaDataAction;
// Activity alias actions.
- applicationAction[u"activity-alias"][u"intent-filter"] = intentFilterAction;
- applicationAction[u"activity-alias"][u"meta-data"] = metaDataAction;
+ applicationAction["activity-alias"]["intent-filter"] = intentFilterAction;
+ applicationAction["activity-alias"]["meta-data"] = metaDataAction;
// Service actions.
- applicationAction[u"service"].action(requiredNameIsJavaClassName);
- applicationAction[u"service"][u"intent-filter"] = intentFilterAction;
- applicationAction[u"service"][u"meta-data"] = metaDataAction;
+ applicationAction["service"].action(requiredNameIsJavaClassName);
+ applicationAction["service"]["intent-filter"] = intentFilterAction;
+ applicationAction["service"]["meta-data"] = metaDataAction;
// Receiver actions.
- applicationAction[u"receiver"].action(requiredNameIsJavaClassName);
- applicationAction[u"receiver"][u"intent-filter"] = intentFilterAction;
- applicationAction[u"receiver"][u"meta-data"] = metaDataAction;
+ applicationAction["receiver"].action(requiredNameIsJavaClassName);
+ applicationAction["receiver"]["intent-filter"] = intentFilterAction;
+ applicationAction["receiver"]["meta-data"] = metaDataAction;
// Provider actions.
- applicationAction[u"provider"].action(requiredNameIsJavaClassName);
- applicationAction[u"provider"][u"grant-uri-permissions"];
- applicationAction[u"provider"][u"meta-data"] = metaDataAction;
- applicationAction[u"provider"][u"path-permissions"];
+ applicationAction["provider"].action(requiredNameIsJavaClassName);
+ applicationAction["provider"]["intent-filter"] = intentFilterAction;
+ applicationAction["provider"]["meta-data"] = metaDataAction;
+ applicationAction["provider"]["grant-uri-permissions"];
+ applicationAction["provider"]["path-permissions"];
+
return true;
}
@@ -225,14 +223,17 @@
public:
using xml::Visitor::visit;
- explicit FullyQualifiedClassNameVisitor(const StringPiece16& package) : mPackage(package) {
+ explicit FullyQualifiedClassNameVisitor(const StringPiece& package) : mPackage(package) {
}
void visit(xml::Element* el) override {
for (xml::Attribute& attr : el->attributes) {
- if (Maybe<std::u16string> newValue =
- util::getFullyQualifiedClassName(mPackage, attr.value)) {
- attr.value = std::move(newValue.value());
+ if (attr.namespaceUri == xml::kSchemaAndroid
+ && mClassAttributes.find(attr.name) != mClassAttributes.end()) {
+ if (Maybe<std::string> newValue =
+ util::getFullyQualifiedClassName(mPackage, attr.value)) {
+ attr.value = std::move(newValue.value());
+ }
}
}
@@ -241,16 +242,17 @@
}
private:
- StringPiece16 mPackage;
+ StringPiece mPackage;
+ std::unordered_set<StringPiece> mClassAttributes = { "name" };
};
-static bool renameManifestPackage(const StringPiece16& packageOverride, xml::Element* manifestEl) {
- xml::Attribute* attr = manifestEl->findAttribute({}, u"package");
+static bool renameManifestPackage(const StringPiece& packageOverride, xml::Element* manifestEl) {
+ xml::Attribute* attr = manifestEl->findAttribute({}, "package");
// We've already verified that the manifest element is present, with a package name specified.
assert(attr);
- std::u16string originalPackage = std::move(attr->value);
+ std::string originalPackage = std::move(attr->value);
attr->value = packageOverride.toString();
FullyQualifiedClassNameVisitor visitor(originalPackage);
@@ -260,17 +262,17 @@
bool ManifestFixer::consume(IAaptContext* context, xml::XmlResource* doc) {
xml::Element* root = xml::findRootElement(doc->root.get());
- if (!root || !root->namespaceUri.empty() || root->name != u"manifest") {
+ if (!root || !root->namespaceUri.empty() || root->name != "manifest") {
context->getDiagnostics()->error(DiagMessage(doc->file.source)
<< "root tag must be <manifest>");
return false;
}
if ((mOptions.minSdkVersionDefault || mOptions.targetSdkVersionDefault)
- && root->findChild({}, u"uses-sdk") == nullptr) {
+ && root->findChild({}, "uses-sdk") == nullptr) {
// Auto insert a <uses-sdk> element.
std::unique_ptr<xml::Element> usesSdk = util::make_unique<xml::Element>();
- usesSdk->name = u"uses-sdk";
+ usesSdk->name = "uses-sdk";
root->addChild(std::move(usesSdk));
}
diff --git a/tools/aapt2/link/ManifestFixer.h b/tools/aapt2/link/ManifestFixer.h
index 4d9356a..55b587e 100644
--- a/tools/aapt2/link/ManifestFixer.h
+++ b/tools/aapt2/link/ManifestFixer.h
@@ -27,12 +27,12 @@
namespace aapt {
struct ManifestFixerOptions {
- Maybe<std::u16string> minSdkVersionDefault;
- Maybe<std::u16string> targetSdkVersionDefault;
- Maybe<std::u16string> renameManifestPackage;
- Maybe<std::u16string> renameInstrumentationTargetPackage;
- Maybe<std::u16string> versionNameDefault;
- Maybe<std::u16string> versionCodeDefault;
+ Maybe<std::string> minSdkVersionDefault;
+ Maybe<std::string> targetSdkVersionDefault;
+ Maybe<std::string> renameManifestPackage;
+ Maybe<std::string> renameInstrumentationTargetPackage;
+ Maybe<std::string> versionNameDefault;
+ Maybe<std::string> versionCodeDefault;
};
/**
diff --git a/tools/aapt2/link/ManifestFixer_test.cpp b/tools/aapt2/link/ManifestFixer_test.cpp
index f993720..1c69a8c 100644
--- a/tools/aapt2/link/ManifestFixer_test.cpp
+++ b/tools/aapt2/link/ManifestFixer_test.cpp
@@ -27,25 +27,25 @@
void SetUp() override {
mContext = test::ContextBuilder()
- .setCompilationPackage(u"android")
+ .setCompilationPackage("android")
.setPackageId(0x01)
- .setNameManglerPolicy(NameManglerPolicy{ u"android" })
+ .setNameManglerPolicy(NameManglerPolicy{ "android" })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@android:attr/package", ResourceId(0x01010000),
+ .addSymbol("android:attr/package", ResourceId(0x01010000),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_STRING)
.build())
- .addSymbol(u"@android:attr/minSdkVersion", ResourceId(0x01010001),
+ .addSymbol("android:attr/minSdkVersion", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_STRING |
android::ResTable_map::TYPE_INTEGER)
.build())
- .addSymbol(u"@android:attr/targetSdkVersion", ResourceId(0x01010002),
+ .addSymbol("android:attr/targetSdkVersion", ResourceId(0x01010002),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_STRING |
android::ResTable_map::TYPE_INTEGER)
.build())
- .addSymbol(u"@android:string/str", ResourceId(0x01060000))
+ .addSymbol("android:string/str", ResourceId(0x01060000))
.build())
.build();
}
@@ -83,7 +83,7 @@
}
TEST_F(ManifestFixerTest, UseDefaultSdkVersionsIfNonePresent) {
- ManifestFixerOptions options = { std::u16string(u"8"), std::u16string(u"22") };
+ ManifestFixerOptions options = { std::string("8"), std::string("22") };
std::unique_ptr<xml::XmlResource> doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -97,14 +97,14 @@
el = xml::findRootElement(doc.get());
ASSERT_NE(nullptr, el);
- el = el->findChild({}, u"uses-sdk");
+ el = el->findChild({}, "uses-sdk");
ASSERT_NE(nullptr, el);
- attr = el->findAttribute(xml::kSchemaAndroid, u"minSdkVersion");
+ attr = el->findAttribute(xml::kSchemaAndroid, "minSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"7", attr->value);
- attr = el->findAttribute(xml::kSchemaAndroid, u"targetSdkVersion");
+ EXPECT_EQ("7", attr->value);
+ attr = el->findAttribute(xml::kSchemaAndroid, "targetSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"21", attr->value);
+ EXPECT_EQ("21", attr->value);
doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -115,14 +115,14 @@
el = xml::findRootElement(doc.get());
ASSERT_NE(nullptr, el);
- el = el->findChild({}, u"uses-sdk");
+ el = el->findChild({}, "uses-sdk");
ASSERT_NE(nullptr, el);
- attr = el->findAttribute(xml::kSchemaAndroid, u"minSdkVersion");
+ attr = el->findAttribute(xml::kSchemaAndroid, "minSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"8", attr->value);
- attr = el->findAttribute(xml::kSchemaAndroid, u"targetSdkVersion");
+ EXPECT_EQ("8", attr->value);
+ attr = el->findAttribute(xml::kSchemaAndroid, "targetSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"21", attr->value);
+ EXPECT_EQ("21", attr->value);
doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -133,14 +133,14 @@
el = xml::findRootElement(doc.get());
ASSERT_NE(nullptr, el);
- el = el->findChild({}, u"uses-sdk");
+ el = el->findChild({}, "uses-sdk");
ASSERT_NE(nullptr, el);
- attr = el->findAttribute(xml::kSchemaAndroid, u"minSdkVersion");
+ attr = el->findAttribute(xml::kSchemaAndroid, "minSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"8", attr->value);
- attr = el->findAttribute(xml::kSchemaAndroid, u"targetSdkVersion");
+ EXPECT_EQ("8", attr->value);
+ attr = el->findAttribute(xml::kSchemaAndroid, "targetSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"22", attr->value);
+ EXPECT_EQ("22", attr->value);
doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -149,19 +149,19 @@
el = xml::findRootElement(doc.get());
ASSERT_NE(nullptr, el);
- el = el->findChild({}, u"uses-sdk");
+ el = el->findChild({}, "uses-sdk");
ASSERT_NE(nullptr, el);
- attr = el->findAttribute(xml::kSchemaAndroid, u"minSdkVersion");
+ attr = el->findAttribute(xml::kSchemaAndroid, "minSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"8", attr->value);
- attr = el->findAttribute(xml::kSchemaAndroid, u"targetSdkVersion");
+ EXPECT_EQ("8", attr->value);
+ attr = el->findAttribute(xml::kSchemaAndroid, "targetSdkVersion");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(u"22", attr->value);
+ EXPECT_EQ("22", attr->value);
}
TEST_F(ManifestFixerTest, RenameManifestPackageAndFullyQualifyClasses) {
ManifestFixerOptions options;
- options.renameManifestPackage = std::u16string(u"com.android");
+ options.renameManifestPackage = std::string("com.android");
std::unique_ptr<xml::XmlResource> doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -178,40 +178,40 @@
xml::Attribute* attr = nullptr;
- attr = manifestEl->findAttribute({}, u"package");
+ attr = manifestEl->findAttribute({},"package");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(std::u16string(u"com.android"), attr->value);
+ EXPECT_EQ(std::string("com.android"), attr->value);
- xml::Element* applicationEl = manifestEl->findChild({}, u"application");
+ xml::Element* applicationEl = manifestEl->findChild({}, "application");
ASSERT_NE(nullptr, applicationEl);
- attr = applicationEl->findAttribute(xml::kSchemaAndroid, u"name");
+ attr = applicationEl->findAttribute(xml::kSchemaAndroid, "name");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(std::u16string(u"android.MainApplication"), attr->value);
+ EXPECT_EQ(std::string("android.MainApplication"), attr->value);
- attr = applicationEl->findAttribute({}, u"text");
+ attr = applicationEl->findAttribute({}, "text");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(std::u16string(u"hello"), attr->value);
+ EXPECT_EQ(std::string("hello"), attr->value);
xml::Element* el;
- el = applicationEl->findChild({}, u"activity");
+ el = applicationEl->findChild({}, "activity");
ASSERT_NE(nullptr, el);
- attr = el->findAttribute(xml::kSchemaAndroid, u"name");
+ attr = el->findAttribute(xml::kSchemaAndroid, "name");
ASSERT_NE(nullptr, el);
- EXPECT_EQ(std::u16string(u"android.activity.Start"), attr->value);
+ EXPECT_EQ(std::string("android.activity.Start"), attr->value);
- el = applicationEl->findChild({}, u"receiver");
+ el = applicationEl->findChild({}, "receiver");
ASSERT_NE(nullptr, el);
- attr = el->findAttribute(xml::kSchemaAndroid, u"name");
+ attr = el->findAttribute(xml::kSchemaAndroid, "name");
ASSERT_NE(nullptr, el);
- EXPECT_EQ(std::u16string(u"com.google.android.Receiver"), attr->value);
+ EXPECT_EQ(std::string("com.google.android.Receiver"), attr->value);
}
TEST_F(ManifestFixerTest, RenameManifestInstrumentationPackageAndFullyQualifyTarget) {
ManifestFixerOptions options;
- options.renameInstrumentationTargetPackage = std::u16string(u"com.android");
+ options.renameInstrumentationTargetPackage = std::string("com.android");
std::unique_ptr<xml::XmlResource> doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -223,18 +223,18 @@
xml::Element* manifestEl = xml::findRootElement(doc.get());
ASSERT_NE(nullptr, manifestEl);
- xml::Element* instrumentationEl = manifestEl->findChild({}, u"instrumentation");
+ xml::Element* instrumentationEl = manifestEl->findChild({}, "instrumentation");
ASSERT_NE(nullptr, instrumentationEl);
- xml::Attribute* attr = instrumentationEl->findAttribute(xml::kSchemaAndroid, u"targetPackage");
+ xml::Attribute* attr = instrumentationEl->findAttribute(xml::kSchemaAndroid, "targetPackage");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(std::u16string(u"com.android"), attr->value);
+ EXPECT_EQ(std::string("com.android"), attr->value);
}
TEST_F(ManifestFixerTest, UseDefaultVersionNameAndCode) {
ManifestFixerOptions options;
- options.versionNameDefault = std::u16string(u"Beta");
- options.versionCodeDefault = std::u16string(u"0x10000000");
+ options.versionNameDefault = std::string("Beta");
+ options.versionCodeDefault = std::string("0x10000000");
std::unique_ptr<xml::XmlResource> doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -244,13 +244,13 @@
xml::Element* manifestEl = xml::findRootElement(doc.get());
ASSERT_NE(nullptr, manifestEl);
- xml::Attribute* attr = manifestEl->findAttribute(xml::kSchemaAndroid, u"versionName");
+ xml::Attribute* attr = manifestEl->findAttribute(xml::kSchemaAndroid, "versionName");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(std::u16string(u"Beta"), attr->value);
+ EXPECT_EQ(std::string("Beta"), attr->value);
- attr = manifestEl->findAttribute(xml::kSchemaAndroid, u"versionCode");
+ attr = manifestEl->findAttribute(xml::kSchemaAndroid, "versionCode");
ASSERT_NE(nullptr, attr);
- EXPECT_EQ(std::u16string(u"0x10000000"), attr->value);
+ EXPECT_EQ(std::string("0x10000000"), attr->value);
}
} // namespace aapt
diff --git a/tools/aapt2/link/PrivateAttributeMover_test.cpp b/tools/aapt2/link/PrivateAttributeMover_test.cpp
index dbe0c92..c9d1a08 100644
--- a/tools/aapt2/link/PrivateAttributeMover_test.cpp
+++ b/tools/aapt2/link/PrivateAttributeMover_test.cpp
@@ -15,10 +15,7 @@
*/
#include "link/Linkers.h"
-#include "test/Builders.h"
-#include "test/Context.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
@@ -26,45 +23,45 @@
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addSimple(u"@android:attr/publicA")
- .addSimple(u"@android:attr/privateA")
- .addSimple(u"@android:attr/publicB")
- .addSimple(u"@android:attr/privateB")
- .setSymbolState(u"@android:attr/publicA", ResourceId(0x01010000), SymbolState::kPublic)
- .setSymbolState(u"@android:attr/publicB", ResourceId(0x01010000), SymbolState::kPublic)
+ .addSimple("android:attr/publicA")
+ .addSimple("android:attr/privateA")
+ .addSimple("android:attr/publicB")
+ .addSimple("android:attr/privateB")
+ .setSymbolState("android:attr/publicA", ResourceId(0x01010000), SymbolState::kPublic)
+ .setSymbolState("android:attr/publicB", ResourceId(0x01010000), SymbolState::kPublic)
.build();
PrivateAttributeMover mover;
ASSERT_TRUE(mover.consume(context.get(), table.get()));
- ResourceTablePackage* package = table->findPackage(u"android");
+ ResourceTablePackage* package = table->findPackage("android");
ASSERT_NE(package, nullptr);
ResourceTableType* type = package->findType(ResourceType::kAttr);
ASSERT_NE(type, nullptr);
ASSERT_EQ(type->entries.size(), 2u);
- EXPECT_NE(type->findEntry(u"publicA"), nullptr);
- EXPECT_NE(type->findEntry(u"publicB"), nullptr);
+ EXPECT_NE(type->findEntry("publicA"), nullptr);
+ EXPECT_NE(type->findEntry("publicB"), nullptr);
type = package->findType(ResourceType::kAttrPrivate);
ASSERT_NE(type, nullptr);
ASSERT_EQ(type->entries.size(), 2u);
- EXPECT_NE(type->findEntry(u"privateA"), nullptr);
- EXPECT_NE(type->findEntry(u"privateB"), nullptr);
+ EXPECT_NE(type->findEntry("privateA"), nullptr);
+ EXPECT_NE(type->findEntry("privateB"), nullptr);
}
TEST(PrivateAttributeMoverTest, LeavePrivateAttributesWhenNoPublicAttributesDefined) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addSimple(u"@android:attr/privateA")
- .addSimple(u"@android:attr/privateB")
+ .addSimple("android:attr/privateA")
+ .addSimple("android:attr/privateB")
.build();
PrivateAttributeMover mover;
ASSERT_TRUE(mover.consume(context.get(), table.get()));
- ResourceTablePackage* package = table->findPackage(u"android");
+ ResourceTablePackage* package = table->findPackage("android");
ASSERT_NE(package, nullptr);
ResourceTableType* type = package->findType(ResourceType::kAttr);
diff --git a/tools/aapt2/link/ProductFilter_test.cpp b/tools/aapt2/link/ProductFilter_test.cpp
index f4f756a..a3376ac 100644
--- a/tools/aapt2/link/ProductFilter_test.cpp
+++ b/tools/aapt2/link/ProductFilter_test.cpp
@@ -15,10 +15,7 @@
*/
#include "link/ProductFilter.h"
-#include "test/Builders.h"
-#include "test/Context.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
@@ -29,23 +26,23 @@
const ConfigDescription port = test::parseConfigOrDie("port");
ResourceTable table;
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
land, "",
test::ValueBuilder<Id>()
.setSource(Source("land/default.xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
land, "tablet",
test::ValueBuilder<Id>()
.setSource(Source("land/tablet.xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
port, "",
test::ValueBuilder<Id>()
.setSource(Source("port/default.xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
port, "tablet",
test::ValueBuilder<Id>()
.setSource(Source("port/tablet.xml")).build(),
@@ -54,13 +51,13 @@
ProductFilter filter({ "tablet" });
ASSERT_TRUE(filter.consume(context.get(), &table));
- EXPECT_EQ(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/one",
+ EXPECT_EQ(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/one",
land, ""));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/one",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/one",
land, "tablet"));
- EXPECT_EQ(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/one",
+ EXPECT_EQ(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/one",
port, ""));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/one",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/one",
port, "tablet"));
}
@@ -68,12 +65,12 @@
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
ResourceTable table;
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "",
test::ValueBuilder<Id>()
.setSource(Source("default.xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "tablet",
test::ValueBuilder<Id>()
.setSource(Source("tablet.xml")).build(),
@@ -82,10 +79,10 @@
ProductFilter filter({});
ASSERT_TRUE(filter.consume(context.get(), &table));
- EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/one",
+ EXPECT_NE(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/one",
ConfigDescription::defaultConfig(),
""));
- EXPECT_EQ(nullptr, test::getValueForConfigAndProduct<Id>(&table, u"@android:string/one",
+ EXPECT_EQ(nullptr, test::getValueForConfigAndProduct<Id>(&table, "android:string/one",
ConfigDescription::defaultConfig(),
"tablet"));
}
@@ -94,17 +91,17 @@
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
ResourceTable table;
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "",
test::ValueBuilder<Id>()
.setSource(Source("default.xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "tablet",
test::ValueBuilder<Id>()
.setSource(Source("tablet.xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "no-sdcard",
test::ValueBuilder<Id>()
.setSource(Source("no-sdcard.xml")).build(),
@@ -118,12 +115,12 @@
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
ResourceTable table;
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "",
test::ValueBuilder<Id>()
.setSource(Source(".xml")).build(),
context->getDiagnostics()));
- ASSERT_TRUE(table.addResource(test::parseNameOrDie(u"@android:string/one"),
+ ASSERT_TRUE(table.addResource(test::parseNameOrDie("android:string/one"),
ConfigDescription::defaultConfig(), "default",
test::ValueBuilder<Id>()
.setSource(Source("default.xml")).build(),
diff --git a/tools/aapt2/link/ReferenceLinker.cpp b/tools/aapt2/link/ReferenceLinker.cpp
index 66eb0df..fe886de 100644
--- a/tools/aapt2/link/ReferenceLinker.cpp
+++ b/tools/aapt2/link/ReferenceLinker.cpp
@@ -288,7 +288,7 @@
struct EmptyDeclStack : public xml::IPackageDeclStack {
Maybe<xml::ExtractedPackage> transformPackageAlias(
- const StringPiece16& alias, const StringPiece16& localPackage) const override {
+ const StringPiece& alias, const StringPiece& localPackage) const override {
if (alias.empty()) {
return xml::ExtractedPackage{ localPackage.toString(), true /* private */ };
}
diff --git a/tools/aapt2/link/ReferenceLinker_test.cpp b/tools/aapt2/link/ReferenceLinker_test.cpp
index 76b2309..5c1511f 100644
--- a/tools/aapt2/link/ReferenceLinker_test.cpp
+++ b/tools/aapt2/link/ReferenceLinker_test.cpp
@@ -23,41 +23,41 @@
TEST(ReferenceLinkerTest, LinkSimpleReferences) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
- u"@com.app.test:string/bar")
+ .setPackageId("com.app.test", 0x7f)
+ .addReference("com.app.test:string/foo", ResourceId(0x7f020000),
+ "com.app.test:string/bar")
// Test use of local reference (w/o package name).
- .addReference(u"@com.app.test:string/bar", ResourceId(0x7f020001), u"@string/baz")
+ .addReference("com.app.test:string/bar", ResourceId(0x7f020001), "string/baz")
- .addReference(u"@com.app.test:string/baz", ResourceId(0x7f020002),
- u"@android:string/ok")
+ .addReference("com.app.test:string/baz", ResourceId(0x7f020002),
+ "android:string/ok")
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@android:string/ok", ResourceId(0x01040034))
+ .addPublicSymbol("android:string/ok", ResourceId(0x01040034))
.build())
.build();
ReferenceLinker linker;
ASSERT_TRUE(linker.consume(context.get(), table.get()));
- Reference* ref = test::getValue<Reference>(table.get(), u"@com.app.test:string/foo");
+ Reference* ref = test::getValue<Reference>(table.get(), "com.app.test:string/foo");
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x7f020001));
- ref = test::getValue<Reference>(table.get(), u"@com.app.test:string/bar");
+ ref = test::getValue<Reference>(table.get(), "com.app.test:string/bar");
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x7f020002));
- ref = test::getValue<Reference>(table.get(), u"@com.app.test:string/baz");
+ ref = test::getValue<Reference>(table.get(), "com.app.test:string/baz");
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x01040034));
@@ -65,39 +65,39 @@
TEST(ReferenceLinkerTest, LinkStyleAttributes) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addValue(u"@com.app.test:style/Theme", test::StyleBuilder()
- .setParent(u"@android:style/Theme.Material")
- .addItem(u"@android:attr/foo", ResourceUtils::tryParseColor(u"#ff00ff"))
- .addItem(u"@android:attr/bar", {} /* placeholder */)
+ .setPackageId("com.app.test", 0x7f)
+ .addValue("com.app.test:style/Theme", test::StyleBuilder()
+ .setParent("android:style/Theme.Material")
+ .addItem("android:attr/foo", ResourceUtils::tryParseColor("#ff00ff"))
+ .addItem("android:attr/bar", {} /* placeholder */)
.build())
.build();
{
// We need to fill in the value for the attribute android:attr/bar after we build the
// table, because we need access to the string pool.
- Style* style = test::getValue<Style>(table.get(), u"@com.app.test:style/Theme");
+ Style* style = test::getValue<Style>(table.get(), "com.app.test:style/Theme");
ASSERT_NE(style, nullptr);
style->entries.back().value = util::make_unique<RawString>(
- table->stringPool.makeRef(u"one|two"));
+ table->stringPool.makeRef("one|two"));
}
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@android:style/Theme.Material",
+ .addPublicSymbol("android:style/Theme.Material",
ResourceId(0x01060000))
- .addPublicSymbol(u"@android:attr/foo", ResourceId(0x01010001),
+ .addPublicSymbol("android:attr/foo", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(ResTable_map::TYPE_COLOR)
.build())
- .addPublicSymbol(u"@android:attr/bar", ResourceId(0x01010002),
+ .addPublicSymbol("android:attr/bar", ResourceId(0x01010002),
test::AttributeBuilder()
.setTypeMask(ResTable_map::TYPE_FLAGS)
- .addItem(u"one", 0x01)
- .addItem(u"two", 0x02)
+ .addItem("one", 0x01)
+ .addItem("two", 0x02)
.build())
.build())
.build();
@@ -105,7 +105,7 @@
ReferenceLinker linker;
ASSERT_TRUE(linker.consume(context.get(), table.get()));
- Style* style = test::getValue<Style>(table.get(), u"@com.app.test:style/Theme");
+ Style* style = test::getValue<Style>(table.get(), "com.app.test:style/Theme");
ASSERT_NE(style, nullptr);
AAPT_ASSERT_TRUE(style->parent);
AAPT_ASSERT_TRUE(style->parent.value().id);
@@ -124,11 +124,11 @@
TEST(ReferenceLinkerTest, LinkMangledReferencesAndAttributes) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test", { u"com.android.support" } })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test", { "com.android.support" } })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@com.app.test:attr/com.android.support$foo",
+ .addPublicSymbol("com.app.test:attr/com.android.support$foo",
ResourceId(0x7f010000),
test::AttributeBuilder()
.setTypeMask(ResTable_map::TYPE_COLOR)
@@ -137,17 +137,17 @@
.build();
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addValue(u"@com.app.test:style/Theme", ResourceId(0x7f020000),
- test::StyleBuilder().addItem(u"@com.android.support:attr/foo",
- ResourceUtils::tryParseColor(u"#ff0000"))
+ .setPackageId("com.app.test", 0x7f)
+ .addValue("com.app.test:style/Theme", ResourceId(0x7f020000),
+ test::StyleBuilder().addItem("com.android.support:attr/foo",
+ ResourceUtils::tryParseColor("#ff0000"))
.build())
.build();
ReferenceLinker linker;
ASSERT_TRUE(linker.consume(context.get(), table.get()));
- Style* style = test::getValue<Style>(table.get(), u"@com.app.test:style/Theme");
+ Style* style = test::getValue<Style>(table.get(), "com.app.test:style/Theme");
ASSERT_NE(style, nullptr);
ASSERT_EQ(1u, style->entries.size());
AAPT_ASSERT_TRUE(style->entries.front().key.id);
@@ -156,18 +156,18 @@
TEST(ReferenceLinkerTest, FailToLinkPrivateSymbols) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
- u"@android:string/hidden")
+ .setPackageId("com.app.test", 0x7f)
+ .addReference("com.app.test:string/foo", ResourceId(0x7f020000),
+ "android:string/hidden")
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@android:string/hidden", ResourceId(0x01040034))
+ .addSymbol("android:string/hidden", ResourceId(0x01040034))
.build())
.build();
@@ -177,18 +177,18 @@
TEST(ReferenceLinkerTest, FailToLinkPrivateMangledSymbols) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
- u"@com.app.lib:string/hidden")
+ .setPackageId("com.app.test", 0x7f)
+ .addReference("com.app.test:string/foo", ResourceId(0x7f020000),
+ "com.app.lib:string/hidden")
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test", { u"com.app.lib" } })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test", { "com.app.lib" } })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@com.app.test:string/com.app.lib$hidden",
+ .addSymbol("com.app.test:string/com.app.lib$hidden",
ResourceId(0x7f040034))
.build())
@@ -200,19 +200,19 @@
TEST(ReferenceLinkerTest, FailToLinkPrivateStyleAttributes) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.test", 0x7f)
- .addValue(u"@com.app.test:style/Theme", test::StyleBuilder()
- .addItem(u"@android:attr/hidden", ResourceUtils::tryParseColor(u"#ff00ff"))
+ .setPackageId("com.app.test", 0x7f)
+ .addValue("com.app.test:style/Theme", test::StyleBuilder()
+ .addItem("android:attr/hidden", ResourceUtils::tryParseColor("#ff00ff"))
.build())
.build();
std::unique_ptr<IAaptContext> context = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setPackageId(0x7f)
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.test" })
.addSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addSymbol(u"@android:attr/hidden", ResourceId(0x01010001),
+ .addSymbol("android:attr/hidden", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(
android::ResTable_map::TYPE_COLOR)
diff --git a/tools/aapt2/link/TableMerger.cpp b/tools/aapt2/link/TableMerger.cpp
index 7471e15..2cd2639 100644
--- a/tools/aapt2/link/TableMerger.cpp
+++ b/tools/aapt2/link/TableMerger.cpp
@@ -67,7 +67,7 @@
callback = [&](const ResourceNameRef& name, const ConfigDescription& config,
FileReference* newFile, FileReference* oldFile) -> bool {
// The old file's path points inside the APK, so we can use it as is.
- io::IFile* f = collection->findFile(util::utf16ToUtf8(*oldFile->path));
+ io::IFile* f = collection->findFile(*oldFile->path);
if (!f) {
mContext->getDiagnostics()->error(DiagMessage(src) << "file '"
<< *oldFile->path
@@ -95,7 +95,7 @@
/**
* This will merge and mangle resources from a static library.
*/
-bool TableMerger::mergeAndMangle(const Source& src, const StringPiece16& packageName,
+bool TableMerger::mergeAndMangle(const Source& src, const StringPiece& packageName,
ResourceTable* table, io::IFileCollection* collection) {
bool error = false;
for (auto& package : table->packages) {
@@ -112,7 +112,7 @@
auto callback = [&](const ResourceNameRef& name, const ConfigDescription& config,
FileReference* newFile, FileReference* oldFile) -> bool {
// The old file's path points inside the APK, so we can use it as is.
- io::IFile* f = collection->findFile(util::utf16ToUtf8(*oldFile->path));
+ io::IFile* f = collection->findFile(*oldFile->path);
if (!f) {
mContext->getDiagnostics()->error(DiagMessage(src) << "file '" << *oldFile->path
<< "' not found");
@@ -159,8 +159,8 @@
for (auto& srcEntry : srcType->entries) {
ResourceEntry* dstEntry;
if (manglePackage) {
- std::u16string mangledName = NameMangler::mangleEntry(srcPackage->name,
- srcEntry->name);
+ std::string mangledName = NameMangler::mangleEntry(srcPackage->name,
+ srcEntry->name);
if (allowNewResources) {
dstEntry = dstType->findOrCreateEntry(mangledName);
} else {
@@ -275,13 +275,13 @@
return !error;
}
-std::unique_ptr<FileReference> TableMerger::cloneAndMangleFile(const std::u16string& package,
+std::unique_ptr<FileReference> TableMerger::cloneAndMangleFile(const std::string& package,
const FileReference& fileRef) {
- StringPiece16 prefix, entry, suffix;
+ StringPiece prefix, entry, suffix;
if (util::extractResFilePathParts(*fileRef.path, &prefix, &entry, &suffix)) {
- std::u16string mangledEntry = NameMangler::mangleEntry(package, entry.toString());
- std::u16string newPath = prefix.toString() + mangledEntry + suffix.toString();
+ std::string mangledEntry = NameMangler::mangleEntry(package, entry.toString());
+ std::string newPath = prefix.toString() + mangledEntry + suffix.toString();
std::unique_ptr<FileReference> newFileRef = util::make_unique<FileReference>(
mMasterTable->stringPool.makeRef(newPath));
newFileRef->setComment(fileRef.getComment());
@@ -293,8 +293,7 @@
bool TableMerger::mergeFileImpl(const ResourceFile& fileDesc, io::IFile* file, bool overlay) {
ResourceTable table;
- std::u16string path = util::utf8ToUtf16(ResourceUtils::buildResourceFileName(fileDesc,
- nullptr));
+ std::string path = ResourceUtils::buildResourceFileName(fileDesc, nullptr);
std::unique_ptr<FileReference> fileRef = util::make_unique<FileReference>(
table.stringPool.makeRef(path));
fileRef->setSource(fileDesc.source);
diff --git a/tools/aapt2/link/TableMerger.h b/tools/aapt2/link/TableMerger.h
index 80c2a5e..6997f93 100644
--- a/tools/aapt2/link/TableMerger.h
+++ b/tools/aapt2/link/TableMerger.h
@@ -59,7 +59,7 @@
*/
TableMerger(IAaptContext* context, ResourceTable* outTable, const TableMergerOptions& options);
- const std::set<std::u16string>& getMergedPackages() const {
+ const std::set<std::string>& getMergedPackages() const {
return mMergedPackages;
}
@@ -81,7 +81,7 @@
* Merges resources from the given package, mangling the name. This is for static libraries.
* An io::IFileCollection is needed in order to find the referenced Files and process them.
*/
- bool mergeAndMangle(const Source& src, const StringPiece16& package, ResourceTable* table,
+ bool mergeAndMangle(const Source& src, const StringPiece& package, ResourceTable* table,
io::IFileCollection* collection);
/**
@@ -104,7 +104,7 @@
TableMergerOptions mOptions;
ResourceTablePackage* mMasterPackage;
- std::set<std::u16string> mMergedPackages;
+ std::set<std::string> mMergedPackages;
bool mergeFileImpl(const ResourceFile& fileDesc, io::IFile* file, bool overlay);
@@ -117,7 +117,7 @@
const bool allowNewResources,
FileMergeCallback callback);
- std::unique_ptr<FileReference> cloneAndMangleFile(const std::u16string& package,
+ std::unique_ptr<FileReference> cloneAndMangleFile(const std::string& package,
const FileReference& value);
};
diff --git a/tools/aapt2/link/TableMerger_test.cpp b/tools/aapt2/link/TableMerger_test.cpp
index 4a80d3f..300b56d 100644
--- a/tools/aapt2/link/TableMerger_test.cpp
+++ b/tools/aapt2/link/TableMerger_test.cpp
@@ -30,13 +30,13 @@
void SetUp() override {
mContext = test::ContextBuilder()
// We are compiling this package.
- .setCompilationPackage(u"com.app.a")
+ .setCompilationPackage("com.app.a")
// Merge all packages that have this package ID.
.setPackageId(0x7f)
// Mangle all packages that do not have this package name.
- .setNameManglerPolicy(NameManglerPolicy{ u"com.app.a", { u"com.app.b" } })
+ .setNameManglerPolicy(NameManglerPolicy{ "com.app.a", { "com.app.b" } })
.build();
}
@@ -44,17 +44,17 @@
TEST_F(TableMergerTest, SimpleMerge) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
- .setPackageId(u"com.app.a", 0x7f)
- .addReference(u"@com.app.a:id/foo", u"@com.app.a:id/bar")
- .addReference(u"@com.app.a:id/bar", u"@com.app.b:id/foo")
- .addValue(u"@com.app.a:styleable/view", test::StyleableBuilder()
- .addItem(u"@com.app.b:id/foo")
+ .setPackageId("com.app.a", 0x7f)
+ .addReference("com.app.a:id/foo", "com.app.a:id/bar")
+ .addReference("com.app.a:id/bar", "com.app.b:id/foo")
+ .addValue("com.app.a:styleable/view", test::StyleableBuilder()
+ .addItem("com.app.b:id/foo")
.build())
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
- .setPackageId(u"com.app.b", 0x7f)
- .addSimple(u"@com.app.b:id/foo")
+ .setPackageId("com.app.b", 0x7f)
+ .addSimple("com.app.b:id/foo")
.build();
ResourceTable finalTable;
@@ -62,20 +62,20 @@
io::FileCollection collection;
ASSERT_TRUE(merger.merge({}, tableA.get()));
- ASSERT_TRUE(merger.mergeAndMangle({}, u"com.app.b", tableB.get(), &collection));
+ ASSERT_TRUE(merger.mergeAndMangle({}, "com.app.b", tableB.get(), &collection));
- EXPECT_TRUE(merger.getMergedPackages().count(u"com.app.b") != 0);
+ EXPECT_TRUE(merger.getMergedPackages().count("com.app.b") != 0);
// Entries from com.app.a should not be mangled.
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie(u"@com.app.a:id/foo")));
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie(u"@com.app.a:id/bar")));
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie(u"@com.app.a:styleable/view")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:id/foo")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:id/bar")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:styleable/view")));
// The unmangled name should not be present.
- AAPT_EXPECT_FALSE(finalTable.findResource(test::parseNameOrDie(u"@com.app.b:id/foo")));
+ AAPT_EXPECT_FALSE(finalTable.findResource(test::parseNameOrDie("com.app.b:id/foo")));
// Look for the mangled name.
- AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie(u"@com.app.a:id/com.app.b$foo")));
+ AAPT_EXPECT_TRUE(finalTable.findResource(test::parseNameOrDie("com.app.a:id/com.app.b$foo")));
}
TEST_F(TableMergerTest, MergeFile) {
@@ -86,17 +86,17 @@
ResourceFile fileDesc;
fileDesc.config = test::parseConfigOrDie("hdpi-v4");
- fileDesc.name = test::parseNameOrDie(u"@layout/main");
+ fileDesc.name = test::parseNameOrDie("layout/main");
fileDesc.source = Source("res/layout-hdpi/main.xml");
test::TestFile testFile("path/to/res/layout-hdpi/main.xml.flat");
ASSERT_TRUE(merger.mergeFile(fileDesc, &testFile));
FileReference* file = test::getValueForConfig<FileReference>(&finalTable,
- u"@com.app.a:layout/main",
+ "com.app.a:layout/main",
test::parseConfigOrDie("hdpi-v4"));
ASSERT_NE(nullptr, file);
- EXPECT_EQ(std::u16string(u"res/layout-hdpi-v4/main.xml"), *file->path);
+ EXPECT_EQ(std::string("res/layout-hdpi-v4/main.xml"), *file->path);
}
TEST_F(TableMergerTest, MergeFileOverlay) {
@@ -106,7 +106,7 @@
TableMerger merger(mContext.get(), &finalTable, tableMergerOptions);
ResourceFile fileDesc;
- fileDesc.name = test::parseNameOrDie(u"@xml/foo");
+ fileDesc.name = test::parseNameOrDie("xml/foo");
test::TestFile fileA("path/to/fileA.xml.flat");
test::TestFile fileB("path/to/fileB.xml.flat");
@@ -116,12 +116,12 @@
TEST_F(TableMergerTest, MergeFileReferences) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
- .setPackageId(u"com.app.a", 0x7f)
- .addFileReference(u"@com.app.a:xml/file", u"res/xml/file.xml")
+ .setPackageId("com.app.a", 0x7f)
+ .addFileReference("com.app.a:xml/file", "res/xml/file.xml")
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
- .setPackageId(u"com.app.b", 0x7f)
- .addFileReference(u"@com.app.b:xml/file", u"res/xml/file.xml")
+ .setPackageId("com.app.b", 0x7f)
+ .addFileReference("com.app.b:xml/file", "res/xml/file.xml")
.build();
ResourceTable finalTable;
@@ -130,25 +130,25 @@
collection.insertFile("res/xml/file.xml");
ASSERT_TRUE(merger.merge({}, tableA.get()));
- ASSERT_TRUE(merger.mergeAndMangle({}, u"com.app.b", tableB.get(), &collection));
+ ASSERT_TRUE(merger.mergeAndMangle({}, "com.app.b", tableB.get(), &collection));
- FileReference* f = test::getValue<FileReference>(&finalTable, u"@com.app.a:xml/file");
+ FileReference* f = test::getValue<FileReference>(&finalTable, "com.app.a:xml/file");
ASSERT_NE(f, nullptr);
- EXPECT_EQ(std::u16string(u"res/xml/file.xml"), *f->path);
+ EXPECT_EQ(std::string("res/xml/file.xml"), *f->path);
- f = test::getValue<FileReference>(&finalTable, u"@com.app.a:xml/com.app.b$file");
+ f = test::getValue<FileReference>(&finalTable, "com.app.a:xml/com.app.b$file");
ASSERT_NE(f, nullptr);
- EXPECT_EQ(std::u16string(u"res/xml/com.app.b$file.xml"), *f->path);
+ EXPECT_EQ(std::string("res/xml/com.app.b$file.xml"), *f->path);
}
TEST_F(TableMergerTest, OverrideResourceWithOverlay) {
std::unique_ptr<ResourceTable> base = test::ResourceTableBuilder()
- .setPackageId(u"", 0x00)
- .addValue(u"@bool/foo", ResourceUtils::tryParseBool(u"true"))
+ .setPackageId("", 0x00)
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
std::unique_ptr<ResourceTable> overlay = test::ResourceTableBuilder()
- .setPackageId(u"", 0x00)
- .addValue(u"@bool/foo", ResourceUtils::tryParseBool(u"false"))
+ .setPackageId("", 0x00)
+ .addValue("bool/foo", ResourceUtils::tryParseBool("false"))
.build();
ResourceTable finalTable;
@@ -159,19 +159,19 @@
ASSERT_TRUE(merger.merge({}, base.get()));
ASSERT_TRUE(merger.mergeOverlay({}, overlay.get()));
- BinaryPrimitive* foo = test::getValue<BinaryPrimitive>(&finalTable, u"@com.app.a:bool/foo");
+ BinaryPrimitive* foo = test::getValue<BinaryPrimitive>(&finalTable, "com.app.a:bool/foo");
ASSERT_NE(nullptr, foo);
EXPECT_EQ(0x0u, foo->value.data);
}
TEST_F(TableMergerTest, MergeAddResourceFromOverlay) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
- .setPackageId(u"", 0x7f)
- .setSymbolState(u"@bool/foo", {}, SymbolState::kUndefined)
+ .setPackageId("", 0x7f)
+ .setSymbolState("bool/foo", {}, SymbolState::kUndefined)
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
- .setPackageId(u"", 0x7f)
- .addValue(u"@bool/foo", ResourceUtils::tryParseBool(u"true"))
+ .setPackageId("", 0x7f)
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
ResourceTable finalTable;
@@ -183,11 +183,11 @@
TEST_F(TableMergerTest, MergeAddResourceFromOverlayWithAutoAddOverlay) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
- .setPackageId(u"", 0x7f)
+ .setPackageId("", 0x7f)
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
- .setPackageId(u"", 0x7f)
- .addValue(u"@bool/foo", ResourceUtils::tryParseBool(u"true"))
+ .setPackageId("", 0x7f)
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
ResourceTable finalTable;
@@ -201,11 +201,11 @@
TEST_F(TableMergerTest, FailToMergeNewResourceWithoutAutoAddOverlay) {
std::unique_ptr<ResourceTable> tableA = test::ResourceTableBuilder()
- .setPackageId(u"", 0x7f)
+ .setPackageId("", 0x7f)
.build();
std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder()
- .setPackageId(u"", 0x7f)
- .addValue(u"@bool/foo", ResourceUtils::tryParseBool(u"true"))
+ .setPackageId("", 0x7f)
+ .addValue("bool/foo", ResourceUtils::tryParseBool("true"))
.build();
ResourceTable finalTable;
diff --git a/tools/aapt2/link/VersionCollapser.cpp b/tools/aapt2/link/VersionCollapser.cpp
new file mode 100644
index 0000000..949d656
--- /dev/null
+++ b/tools/aapt2/link/VersionCollapser.cpp
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ResourceTable.h"
+#include "link/Linkers.h"
+
+#include <algorithm>
+#include <vector>
+
+namespace aapt {
+
+template <typename Iterator, typename Pred>
+class FilterIterator {
+public:
+ FilterIterator(Iterator begin, Iterator end, Pred pred=Pred()) :
+ mCurrent(begin), mEnd(end), mPred(pred) {
+ advance();
+ }
+
+ bool hasNext() {
+ return mCurrent != mEnd;
+ }
+
+ Iterator nextIter() {
+ Iterator iter = mCurrent;
+ ++mCurrent;
+ advance();
+ return iter;
+ }
+
+ typename Iterator::reference next() {
+ return *nextIter();
+ }
+
+private:
+ void advance() {
+ for (; mCurrent != mEnd; ++mCurrent) {
+ if (mPred(*mCurrent)) {
+ return;
+ }
+ }
+ }
+
+ Iterator mCurrent, mEnd;
+ Pred mPred;
+};
+
+template <typename Iterator, typename Pred>
+FilterIterator<Iterator, Pred> makeFilterIterator(Iterator begin, Iterator end=Iterator(),
+ Pred pred=Pred()) {
+ return FilterIterator<Iterator, Pred>(begin, end, pred);
+}
+
+/**
+ * Every Configuration with an SDK version specified that is less than minSdk will be removed.
+ * The exception is when there is no exact matching resource for the minSdk. The next smallest
+ * one will be kept.
+ */
+static void collapseVersions(int minSdk, ResourceEntry* entry) {
+ // First look for all sdks less than minSdk.
+ for (auto iter = entry->values.rbegin(); iter != entry->values.rend(); ++iter) {
+ // Check if the item was already marked for removal.
+ if (!(*iter)) {
+ continue;
+ }
+
+ const ConfigDescription& config = (*iter)->config;
+ if (config.sdkVersion <= minSdk) {
+ // This is the first configuration we've found with a smaller or equal SDK level
+ // to the minimum. We MUST keep this one, but remove all others we find, which get
+ // overridden by this one.
+
+ ConfigDescription configWithoutSdk = config;
+ configWithoutSdk.sdkVersion = 0;
+ auto pred = [&](const std::unique_ptr<ResourceConfigValue>& val) -> bool {
+ // Check that the value hasn't already been marked for removal.
+ if (!val) {
+ return false;
+ }
+
+ // Only return Configs that differ in SDK version.
+ configWithoutSdk.sdkVersion = val->config.sdkVersion;
+ return configWithoutSdk == val->config && val->config.sdkVersion <= minSdk;
+ };
+
+ // Remove the rest that match.
+ auto filterIter = makeFilterIterator(iter + 1, entry->values.rend(), pred);
+ while (filterIter.hasNext()) {
+ filterIter.next() = {};
+ }
+ }
+ }
+
+ // Now erase the nullptr values.
+ entry->values.erase(std::remove_if(entry->values.begin(), entry->values.end(),
+ [](const std::unique_ptr<ResourceConfigValue>& val) -> bool {
+ return val == nullptr;
+ }), entry->values.end());
+
+ // Strip the version qualifiers for every resource with version <= minSdk. This will ensure
+ // that the resource entries are all packed together in the same ResTable_type struct
+ // and take up less space in the resources.arsc table.
+ bool modified = false;
+ for (std::unique_ptr<ResourceConfigValue>& configValue : entry->values) {
+ if (configValue->config.sdkVersion != 0 && configValue->config.sdkVersion <= minSdk) {
+ // Override the resource with a Configuration without an SDK.
+ std::unique_ptr<ResourceConfigValue> newValue = util::make_unique<ResourceConfigValue>(
+ configValue->config.copyWithoutSdkVersion(), configValue->product);
+ newValue->value = std::move(configValue->value);
+ configValue = std::move(newValue);
+
+ modified = true;
+ }
+ }
+
+ if (modified) {
+ // We've modified the keys (ConfigDescription) by changing the sdkVersion to 0.
+ // We MUST re-sort to ensure ordering guarantees hold.
+ std::sort(entry->values.begin(), entry->values.end(),
+ [](const std::unique_ptr<ResourceConfigValue>& a,
+ const std::unique_ptr<ResourceConfigValue>& b) -> bool {
+ return a->config.compare(b->config) < 0;
+ });
+ }
+}
+
+bool VersionCollapser::consume(IAaptContext* context, ResourceTable* table) {
+ const int minSdk = context->getMinSdkVersion();
+ for (auto& package : table->packages) {
+ for (auto& type : package->types) {
+ for (auto& entry : type->entries) {
+ collapseVersions(minSdk, entry.get());
+ }
+ }
+ }
+ return true;
+}
+
+} // namespace aapt
diff --git a/tools/aapt2/link/VersionCollapser_test.cpp b/tools/aapt2/link/VersionCollapser_test.cpp
new file mode 100644
index 0000000..dd5f1d1
--- /dev/null
+++ b/tools/aapt2/link/VersionCollapser_test.cpp
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "link/Linkers.h"
+#include "test/Test.h"
+
+namespace aapt {
+
+template <typename T>
+using uptr = std::unique_ptr<T>;
+
+static uptr<ResourceTable> buildTableWithConfigs(const StringPiece& name,
+ std::initializer_list<std::string> list) {
+ test::ResourceTableBuilder builder;
+ for (const std::string& item : list) {
+ builder.addSimple(name, test::parseConfigOrDie(item));
+ }
+ return builder.build();
+}
+
+TEST(VersionCollapserTest, CollapseVersions) {
+ uptr<IAaptContext> context = test::ContextBuilder().setMinSdkVersion(7).build();
+
+ const StringPiece resName = "@android:string/foo";
+
+ uptr<ResourceTable> table =
+ buildTableWithConfigs(resName,
+ { "land-v4", "land-v5", "sw600dp", "land-v6",
+ "land-v14", "land-v21" });
+
+ VersionCollapser collapser;
+ ASSERT_TRUE(collapser.consume(context.get(), table.get()));
+
+ // These should be removed.
+ EXPECT_EQ(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v4")));
+ EXPECT_EQ(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v5")));
+ // This one should be removed because it was renamed to 'land', with the version dropped.
+ EXPECT_EQ(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v6")));
+
+ // These should remain.
+ EXPECT_NE(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("sw600dp")));
+
+ // 'land' should be present because it was renamed from 'land-v6'.
+ EXPECT_NE(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land")));
+ EXPECT_NE(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v14")));
+ EXPECT_NE(nullptr,
+ test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v21")));
+}
+
+TEST(VersionCollapserTest, CollapseVersionsWhenMinSdkIsHighest) {
+ uptr<IAaptContext> context = test::ContextBuilder().setMinSdkVersion(21).build();
+
+ const StringPiece resName = "@android:string/foo";
+
+ uptr<ResourceTable> table =
+ buildTableWithConfigs(resName,
+ { "land-v4", "land-v5", "sw600dp", "land-v6",
+ "land-v14", "land-v21", "land-v22" });
+ VersionCollapser collapser;
+ ASSERT_TRUE(collapser.consume(context.get(), table.get()));
+
+ // These should all be removed.
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
+ test::parseConfigOrDie("land-v4")));
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
+ test::parseConfigOrDie("land-v5")));
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
+ test::parseConfigOrDie("land-v6")));
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(table.get(), resName,
+ test::parseConfigOrDie("land-v14")));
+
+ // These should remain.
+ EXPECT_NE(nullptr, test::getValueForConfig<Id>(
+ table.get(), resName, test::parseConfigOrDie("sw600dp").copyWithoutSdkVersion()));
+
+ // land-v21 should have been converted to land.
+ EXPECT_NE(nullptr, test::getValueForConfig<Id>(table.get(), resName,
+ test::parseConfigOrDie("land")));
+ // land-v22 should remain as-is.
+ EXPECT_NE(nullptr, test::getValueForConfig<Id>(table.get(), resName,
+ test::parseConfigOrDie("land-v22")));
+}
+
+} // namespace aapt
diff --git a/tools/aapt2/link/XmlReferenceLinker.cpp b/tools/aapt2/link/XmlReferenceLinker.cpp
index 568bc74..02af5e3 100644
--- a/tools/aapt2/link/XmlReferenceLinker.cpp
+++ b/tools/aapt2/link/XmlReferenceLinker.cpp
@@ -81,7 +81,7 @@
xml::extractPackageFromNamespace(attr.namespaceUri);
if (maybePackage) {
// There is a valid package name for this attribute. We will look this up.
- StringPiece16 package = maybePackage.value().package;
+ StringPiece package = maybePackage.value().package;
if (package.empty()) {
// Empty package means the 'current' or 'local' package.
package = mContext->getCompilationPackage();
diff --git a/tools/aapt2/link/XmlReferenceLinker_test.cpp b/tools/aapt2/link/XmlReferenceLinker_test.cpp
index af9098b..51eb62c 100644
--- a/tools/aapt2/link/XmlReferenceLinker_test.cpp
+++ b/tools/aapt2/link/XmlReferenceLinker_test.cpp
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <test/Context.h>
#include "link/Linkers.h"
#include "test/Test.h"
@@ -24,44 +23,44 @@
public:
void SetUp() override {
mContext = test::ContextBuilder()
- .setCompilationPackage(u"com.app.test")
+ .setCompilationPackage("com.app.test")
.setNameManglerPolicy(
- NameManglerPolicy{ u"com.app.test", { u"com.android.support" } })
+ NameManglerPolicy{ "com.app.test", { "com.android.support" } })
.addSymbolSource(test::StaticSymbolSourceBuilder()
- .addPublicSymbol(u"@android:attr/layout_width", ResourceId(0x01010000),
+ .addPublicSymbol("android:attr/layout_width", ResourceId(0x01010000),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_ENUM |
android::ResTable_map::TYPE_DIMENSION)
- .addItem(u"match_parent", 0xffffffff)
+ .addItem("match_parent", 0xffffffff)
.build())
- .addPublicSymbol(u"@android:attr/background", ResourceId(0x01010001),
+ .addPublicSymbol("android:attr/background", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
- .addPublicSymbol(u"@android:attr/attr", ResourceId(0x01010002),
+ .addPublicSymbol("android:attr/attr", ResourceId(0x01010002),
test::AttributeBuilder().build())
- .addPublicSymbol(u"@android:attr/text", ResourceId(0x01010003),
+ .addPublicSymbol("android:attr/text", ResourceId(0x01010003),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_STRING)
.build())
// Add one real symbol that was introduces in v21
- .addPublicSymbol(u"@android:attr/colorAccent", ResourceId(0x01010435),
+ .addPublicSymbol("android:attr/colorAccent", ResourceId(0x01010435),
test::AttributeBuilder().build())
// Private symbol.
- .addSymbol(u"@android:color/hidden", ResourceId(0x01020001))
+ .addSymbol("android:color/hidden", ResourceId(0x01020001))
- .addPublicSymbol(u"@android:id/id", ResourceId(0x01030000))
- .addSymbol(u"@com.app.test:id/id", ResourceId(0x7f030000))
- .addSymbol(u"@com.app.test:color/green", ResourceId(0x7f020000))
- .addSymbol(u"@com.app.test:color/red", ResourceId(0x7f020001))
- .addSymbol(u"@com.app.test:attr/colorAccent", ResourceId(0x7f010000),
+ .addPublicSymbol("android:id/id", ResourceId(0x01030000))
+ .addSymbol("com.app.test:id/id", ResourceId(0x7f030000))
+ .addSymbol("com.app.test:color/green", ResourceId(0x7f020000))
+ .addSymbol("com.app.test:color/red", ResourceId(0x7f020001))
+ .addSymbol("com.app.test:attr/colorAccent", ResourceId(0x7f010000),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
- .addPublicSymbol(u"@com.app.test:attr/com.android.support$colorAccent",
+ .addPublicSymbol("com.app.test:attr/com.android.support$colorAccent",
ResourceId(0x7f010001), test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
- .addPublicSymbol(u"@com.app.test:attr/attr", ResourceId(0x7f010002),
+ .addPublicSymbol("com.app.test:attr/attr", ResourceId(0x7f010002),
test::AttributeBuilder().build())
.build())
.build();
@@ -85,8 +84,7 @@
xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
- xml::Attribute* xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res/android",
- u"layout_width");
+ xml::Attribute* xmlAttr = viewEl->findAttribute(xml::kSchemaAndroid, "layout_width");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
@@ -94,7 +92,7 @@
ASSERT_NE(xmlAttr->compiledValue, nullptr);
ASSERT_NE(valueCast<BinaryPrimitive>(xmlAttr->compiledValue.get()), nullptr);
- xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res/android", u"background");
+ xmlAttr = viewEl->findAttribute(xml::kSchemaAndroid, "background");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
@@ -103,17 +101,17 @@
Reference* ref = valueCast<Reference>(xmlAttr->compiledValue.get());
ASSERT_NE(ref, nullptr);
AAPT_ASSERT_TRUE(ref->name);
- EXPECT_EQ(ref->name.value(), test::parseNameOrDie(u"@color/green")); // Make sure the name
- // didn't change.
+ EXPECT_EQ(ref->name.value(), test::parseNameOrDie("color/green")); // Make sure the name
+ // didn't change.
AAPT_ASSERT_TRUE(ref->id);
EXPECT_EQ(ref->id.value(), ResourceId(0x7f020000));
- xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res/android", u"text");
+ xmlAttr = viewEl->findAttribute(xml::kSchemaAndroid, "text");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
ASSERT_FALSE(xmlAttr->compiledValue); // Strings don't get compiled for memory sake.
- xmlAttr = viewEl->findAttribute(u"", u"class");
+ xmlAttr = viewEl->findAttribute("", "class");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_FALSE(xmlAttr->compiledAttribute);
ASSERT_EQ(xmlAttr->compiledValue, nullptr);
@@ -159,7 +157,7 @@
ASSERT_NE(viewEl, nullptr);
xml::Attribute* xmlAttr = viewEl->findAttribute(
- u"http://schemas.android.com/apk/res/com.android.support", u"colorAccent");
+ xml::buildPackageNamespace("com.android.support"), "colorAccent");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
@@ -178,8 +176,7 @@
xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
- xml::Attribute* xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res-auto",
- u"colorAccent");
+ xml::Attribute* xmlAttr = viewEl->findAttribute(xml::kSchemaAuto, "colorAccent");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
@@ -206,8 +203,7 @@
ASSERT_NE(viewEl, nullptr);
// All attributes and references in this element should be referring to "android" (0x01).
- xml::Attribute* xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res/android",
- u"attr");
+ xml::Attribute* xmlAttr = viewEl->findAttribute(xml::kSchemaAndroid, "attr");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
@@ -222,7 +218,7 @@
ASSERT_NE(viewEl, nullptr);
// All attributes and references in this element should be referring to "com.app.test" (0x7f).
- xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res/com.app.test", u"attr");
+ xmlAttr = viewEl->findAttribute(xml::buildPackageNamespace("com.app.test"), "attr");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
@@ -245,8 +241,8 @@
ASSERT_NE(viewEl, nullptr);
// All attributes and references in this element should be referring to "com.app.test" (0x7f).
- xml::Attribute* xmlAttr = viewEl->findAttribute(
- u"http://schemas.android.com/apk/res/com.app.test", u"attr");
+ xml::Attribute* xmlAttr = viewEl->findAttribute(xml::buildPackageNamespace("com.app.test"),
+ "attr");
ASSERT_NE(xmlAttr, nullptr);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute);
AAPT_ASSERT_TRUE(xmlAttr->compiledAttribute.value().id);
diff --git a/tools/aapt2/process/IResourceTableConsumer.h b/tools/aapt2/process/IResourceTableConsumer.h
index 9affb83..69b7d92 100644
--- a/tools/aapt2/process/IResourceTableConsumer.h
+++ b/tools/aapt2/process/IResourceTableConsumer.h
@@ -37,10 +37,11 @@
virtual SymbolTable* getExternalSymbols() = 0;
virtual IDiagnostics* getDiagnostics() = 0;
- virtual const std::u16string& getCompilationPackage() = 0;
+ virtual const std::string& getCompilationPackage() = 0;
virtual uint8_t getPackageId() = 0;
virtual NameMangler* getNameMangler() = 0;
virtual bool verbose() = 0;
+ virtual int getMinSdkVersion() = 0;
};
struct IResourceTableConsumer {
diff --git a/tools/aapt2/process/SymbolTable.cpp b/tools/aapt2/process/SymbolTable.cpp
index eaaf06f..6c506df 100644
--- a/tools/aapt2/process/SymbolTable.cpp
+++ b/tools/aapt2/process/SymbolTable.cpp
@@ -16,6 +16,7 @@
#include "ConfigDescription.h"
#include "Resource.h"
+#include "ResourceUtils.h"
#include "ValueVisitor.h"
#include "process/SymbolTable.h"
#include "util/Util.h"
@@ -84,7 +85,7 @@
const SymbolTable::Symbol* SymbolTable::findByReference(const Reference& ref) {
// First try the ID. This is because when we lookup by ID, we only fill in the ID cache.
// Looking up by name fills in the name and ID cache. So a cache miss will cause a failed
- // ID lookup, then a successfull name lookup. Subsequent look ups will hit immediately
+ // ID lookup, then a successful name lookup. Subsequent look ups will hit immediately
// because the ID is cached too.
//
// If we looked up by name first, a cache miss would mean we failed to lookup by name, then
@@ -184,18 +185,13 @@
return nullptr;
}
- const ResourceType* parsedType = parseResourceType(
- StringPiece16(entryName.type, entryName.typeLen));
- if (!parsedType) {
- table.unlockBag(entry);
+ Maybe<ResourceName> parsedName = ResourceUtils::toResourceName(entryName);
+ if (!parsedName) {
return nullptr;
}
Attribute::Symbol symbol;
- symbol.symbol.name = ResourceName(
- StringPiece16(entryName.package, entryName.packageLen),
- *parsedType,
- StringPiece16(entryName.name, entryName.nameLen));
+ symbol.symbol.name = parsedName.value();
symbol.symbol.id = ResourceId(mapEntry.name.ident);
symbol.value = mapEntry.value.data;
s->attribute->symbols.push_back(std::move(symbol));
@@ -208,11 +204,15 @@
std::unique_ptr<SymbolTable::Symbol> AssetManagerSymbolSource::findByName(
const ResourceName& name) {
const android::ResTable& table = mAssets.getResources(false);
- StringPiece16 typeStr = toString(name.type);
+
+ const std::u16string package16 = util::utf8ToUtf16(name.package);
+ const std::u16string type16 = util::utf8ToUtf16(toString(name.type));
+ const std::u16string entry16 = util::utf8ToUtf16(name.entry);
+
uint32_t typeSpecFlags = 0;
- ResourceId resId = table.identifierForName(name.entry.data(), name.entry.size(),
- typeStr.data(), typeStr.size(),
- name.package.data(), name.package.size(),
+ ResourceId resId = table.identifierForName(entry16.data(), entry16.size(),
+ type16.data(), type16.size(),
+ package16.data(), package16.size(),
&typeSpecFlags);
if (!resId.isValid()) {
return {};
@@ -238,37 +238,7 @@
if (!table.getResourceName(id.id, true, &resName)) {
return {};
}
-
- ResourceName name;
- if (resName.package) {
- name.package = StringPiece16(resName.package, resName.packageLen).toString();
- }
-
- const ResourceType* type;
- if (resName.type) {
- type = parseResourceType(StringPiece16(resName.type, resName.typeLen));
-
- } else if (resName.type8) {
- type = parseResourceType(util::utf8ToUtf16(StringPiece(resName.type8, resName.typeLen)));
- } else {
- return {};
- }
-
- if (!type) {
- return {};
- }
-
- name.type = *type;
-
- if (resName.name) {
- name.entry = StringPiece16(resName.name, resName.nameLen).toString();
- } else if (resName.name8) {
- name.entry = util::utf8ToUtf16(StringPiece(resName.name8, resName.nameLen));
- } else {
- return {};
- }
-
- return name;
+ return ResourceUtils::toResourceName(resName);
}
std::unique_ptr<SymbolTable::Symbol> AssetManagerSymbolSource::findById(ResourceId id) {
diff --git a/tools/aapt2/process/SymbolTable.h b/tools/aapt2/process/SymbolTable.h
index e684bb0..43f4dd7 100644
--- a/tools/aapt2/process/SymbolTable.h
+++ b/tools/aapt2/process/SymbolTable.h
@@ -34,7 +34,7 @@
namespace aapt {
inline android::hash_t hash_type(const ResourceName& name) {
- std::hash<std::u16string> strHash;
+ std::hash<std::string> strHash;
android::hash_t hash = 0;
hash = android::JenkinsHashMix(hash, (uint32_t) strHash(name.package));
hash = android::JenkinsHashMix(hash, (uint32_t) name.type);
diff --git a/tools/aapt2/process/SymbolTable_test.cpp b/tools/aapt2/process/SymbolTable_test.cpp
index 34f31be..1626352 100644
--- a/tools/aapt2/process/SymbolTable_test.cpp
+++ b/tools/aapt2/process/SymbolTable_test.cpp
@@ -21,31 +21,31 @@
TEST(ResourceTableSymbolSourceTest, FindSymbols) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addSimple(u"@android:id/foo", ResourceId(0x01020000))
- .addSimple(u"@android:id/bar")
- .addValue(u"@android:attr/foo", ResourceId(0x01010000),
+ .addSimple("android:id/foo", ResourceId(0x01020000))
+ .addSimple("android:id/bar")
+ .addValue("android:attr/foo", ResourceId(0x01010000),
test::AttributeBuilder().build())
.build();
ResourceTableSymbolSource symbolSource(table.get());
- EXPECT_NE(nullptr, symbolSource.findByName(test::parseNameOrDie(u"@android:id/foo")));
- EXPECT_NE(nullptr, symbolSource.findByName(test::parseNameOrDie(u"@android:id/bar")));
+ EXPECT_NE(nullptr, symbolSource.findByName(test::parseNameOrDie("android:id/foo")));
+ EXPECT_NE(nullptr, symbolSource.findByName(test::parseNameOrDie("android:id/bar")));
std::unique_ptr<SymbolTable::Symbol> s = symbolSource.findByName(
- test::parseNameOrDie(u"@android:attr/foo"));
+ test::parseNameOrDie("android:attr/foo"));
ASSERT_NE(nullptr, s);
EXPECT_NE(nullptr, s->attribute);
}
TEST(ResourceTableSymbolSourceTest, FindPrivateAttrSymbol) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addValue(u"@android:^attr-private/foo", ResourceId(0x01010000),
+ .addValue("android:^attr-private/foo", ResourceId(0x01010000),
test::AttributeBuilder().build())
.build();
ResourceTableSymbolSource symbolSource(table.get());
std::unique_ptr<SymbolTable::Symbol> s = symbolSource.findByName(
- test::parseNameOrDie(u"@android:attr/foo"));
+ test::parseNameOrDie("android:attr/foo"));
ASSERT_NE(nullptr, s);
EXPECT_NE(nullptr, s->attribute);
}
diff --git a/tools/aapt2/proto/ProtoHelpers.cpp b/tools/aapt2/proto/ProtoHelpers.cpp
index 99981c5..2aa8aa5 100644
--- a/tools/aapt2/proto/ProtoHelpers.cpp
+++ b/tools/aapt2/proto/ProtoHelpers.cpp
@@ -33,7 +33,7 @@
}
void serializeSourceToPb(const Source& source, StringPool* srcPool, pb::Source* outPbSource) {
- StringPool::Ref ref = srcPool->makeRef(util::utf8ToUtf16(source.path));
+ StringPool::Ref ref = srcPool->makeRef(source.path);
outPbSource->set_path_idx(static_cast<uint32_t>(ref.getIndex()));
if (source.line) {
outPbSource->set_line_no(static_cast<uint32_t>(source.line.value()));
@@ -43,7 +43,7 @@
void deserializeSourceFromPb(const pb::Source& pbSource, const android::ResStringPool& srcPool,
Source* outSource) {
if (pbSource.has_path_idx()) {
- outSource->path = util::getString8(srcPool, pbSource.path_idx()).toString();
+ outSource->path = util::getString(srcPool, pbSource.path_idx());
}
if (pbSource.has_line_no()) {
diff --git a/tools/aapt2/proto/TableProtoDeserializer.cpp b/tools/aapt2/proto/TableProtoDeserializer.cpp
index a7798e7..98ff87f 100644
--- a/tools/aapt2/proto/TableProtoDeserializer.cpp
+++ b/tools/aapt2/proto/TableProtoDeserializer.cpp
@@ -70,10 +70,9 @@
std::map<ResourceId, ResourceNameRef> idIndex;
- ResourceTablePackage* pkg = table->createPackage(
- util::utf8ToUtf16(pbPackage.package_name()), id);
+ ResourceTablePackage* pkg = table->createPackage(pbPackage.package_name(), id);
for (const pb::Type& pbType : pbPackage.types()) {
- const ResourceType* resType = parseResourceType(util::utf8ToUtf16(pbType.name()));
+ const ResourceType* resType = parseResourceType(pbType.name());
if (!resType) {
mDiag->error(DiagMessage(mSource) << "unknown type '" << pbType.name() << "'");
return {};
@@ -82,7 +81,7 @@
ResourceTableType* type = pkg->findOrCreateType(*resType);
for (const pb::Entry& pbEntry : pbType.entries()) {
- ResourceEntry* entry = type->findOrCreateEntry(util::utf8ToUtf16(pbEntry.name()));
+ ResourceEntry* entry = type->findOrCreateEntry(pbEntry.name());
// Deserialize the symbol status (public/private with source and comments).
if (pbEntry.has_symbol_status()) {
@@ -93,7 +92,7 @@
}
if (pbStatus.has_comment()) {
- entry->symbolStatus.comment = util::utf8ToUtf16(pbStatus.comment());
+ entry->symbolStatus.comment = pbStatus.comment();
}
SymbolState visibility = deserializeVisibilityFromPb(pbStatus.visibility());
@@ -179,14 +178,14 @@
} else if (pbItem.has_str()) {
const uint32_t idx = pbItem.str().idx();
- StringPiece16 str = util::getString(*mValuePool, idx);
+ const std::string str = util::getString(*mValuePool, idx);
const android::ResStringPool_span* spans = mValuePool->styleAt(idx);
if (spans && spans->name.index != android::ResStringPool_span::END) {
- StyleString styleStr = { str.toString() };
+ StyleString styleStr = { str };
while (spans->name.index != android::ResStringPool_span::END) {
styleStr.spans.push_back(Span{
- util::getString(*mValuePool, spans->name.index).toString(),
+ util::getString(*mValuePool, spans->name.index),
spans->firstChar,
spans->lastChar
});
@@ -200,13 +199,13 @@
} else if (pbItem.has_raw_str()) {
const uint32_t idx = pbItem.raw_str().idx();
- StringPiece16 str = util::getString(*mValuePool, idx);
+ const std::string str = util::getString(*mValuePool, idx);
return util::make_unique<RawString>(
pool->makeRef(str, StringPool::Context{ 1, config }));
} else if (pbItem.has_file()) {
const uint32_t idx = pbItem.file().path_idx();
- StringPiece16 str = util::getString(*mValuePool, idx);
+ const std::string str = util::getString(*mValuePool, idx);
return util::make_unique<FileReference>(
pool->makeRef(str, StringPool::Context{ 0, config }));
@@ -351,7 +350,7 @@
}
if (pbRef.has_symbol_idx()) {
- StringPiece16 strSymbol = util::getString(*mSymbolPool, pbRef.symbol_idx());
+ const std::string strSymbol = util::getString(*mSymbolPool, pbRef.symbol_idx());
ResourceNameRef nameRef;
if (!ResourceUtils::parseResourceName(strSymbol, &nameRef, nullptr)) {
mDiag->error(DiagMessage(mSource) << "invalid reference name '"
@@ -373,7 +372,7 @@
}
if (pbItem.has_comment()) {
- outValue->setComment(util::utf8ToUtf16(pbItem.comment()));
+ outValue->setComment(pbItem.comment());
}
}
@@ -446,8 +445,7 @@
ResourceNameRef nameRef;
// Need to create an lvalue here so that nameRef can point to something real.
- std::u16string utf16Name = util::utf8ToUtf16(pbFile.resource_name());
- if (!ResourceUtils::parseResourceName(utf16Name, &nameRef)) {
+ if (!ResourceUtils::parseResourceName(pbFile.resource_name(), &nameRef)) {
diag->error(DiagMessage(source) << "invalid resource name in compiled file header: "
<< pbFile.resource_name());
return {};
@@ -458,8 +456,7 @@
for (const pb::CompiledFile_Symbol& pbSymbol : pbFile.exported_symbols()) {
// Need to create an lvalue here so that nameRef can point to something real.
- utf16Name = util::utf8ToUtf16(pbSymbol.resource_name());
- if (!ResourceUtils::parseResourceName(utf16Name, &nameRef)) {
+ if (!ResourceUtils::parseResourceName(pbSymbol.resource_name(), &nameRef)) {
diag->error(DiagMessage(source) << "invalid resource name for exported symbol in "
"compiled file header: "
<< pbFile.resource_name());
diff --git a/tools/aapt2/proto/TableProtoSerializer.cpp b/tools/aapt2/proto/TableProtoSerializer.cpp
index 5d1b72b..425fca6 100644
--- a/tools/aapt2/proto/TableProtoSerializer.cpp
+++ b/tools/aapt2/proto/TableProtoSerializer.cpp
@@ -171,7 +171,7 @@
void serializeItemCommonToPb(const Item& item, T* pbItem) {
serializeSourceToPb(item.getSource(), mSourcePool, pbItem->mutable_source());
if (!item.getComment().empty()) {
- pbItem->set_comment(util::utf16ToUtf8(item.getComment()));
+ pbItem->set_comment(item.getComment());
}
}
@@ -220,28 +220,28 @@
if (package->id) {
pbPackage->set_package_id(package->id.value());
}
- pbPackage->set_package_name(util::utf16ToUtf8(package->name));
+ pbPackage->set_package_name(package->name);
for (auto& type : package->types) {
pb::Type* pbType = pbPackage->add_types();
if (type->id) {
pbType->set_id(type->id.value());
}
- pbType->set_name(util::utf16ToUtf8(toString(type->type)));
+ pbType->set_name(toString(type->type).toString());
for (auto& entry : type->entries) {
pb::Entry* pbEntry = pbType->add_entries();
if (entry->id) {
pbEntry->set_id(entry->id.value());
}
- pbEntry->set_name(util::utf16ToUtf8(entry->name));
+ pbEntry->set_name(entry->name);
// Write the SymbolStatus struct.
pb::SymbolStatus* pbStatus = pbEntry->mutable_symbol_status();
pbStatus->set_visibility(serializeVisibilityToPb(entry->symbolStatus.state));
serializeSourceToPb(entry->symbolStatus.source, &sourcePool,
pbStatus->mutable_source());
- pbStatus->set_comment(util::utf16ToUtf8(entry->symbolStatus.comment));
+ pbStatus->set_comment(entry->symbolStatus.comment);
for (auto& configValue : entry->values) {
pb::ConfigValue* pbConfigValue = pbEntry->add_config_values();
@@ -254,7 +254,7 @@
serializeSourceToPb(configValue->value->getSource(), &sourcePool,
pbValue->mutable_source());
if (!configValue->value->getComment().empty()) {
- pbValue->set_comment(util::utf16ToUtf8(configValue->value->getComment()));
+ pbValue->set_comment(configValue->value->getComment());
}
if (configValue->value->isWeak()) {
@@ -275,13 +275,13 @@
std::unique_ptr<pb::CompiledFile> serializeCompiledFileToPb(const ResourceFile& file) {
std::unique_ptr<pb::CompiledFile> pbFile = util::make_unique<pb::CompiledFile>();
- pbFile->set_resource_name(util::utf16ToUtf8(file.name.toString()));
+ pbFile->set_resource_name(file.name.toString());
pbFile->set_source_path(file.source.path);
serializeConfig(file.config, pbFile->mutable_config());
for (const SourcedResourceName& exported : file.exportedSymbols) {
pb::CompiledFile_Symbol* pbSymbol = pbFile->add_exported_symbols();
- pbSymbol->set_resource_name(util::utf16ToUtf8(exported.name.toString()));
+ pbSymbol->set_resource_name(exported.name.toString());
pbSymbol->set_line_no(exported.line);
}
return pbFile;
diff --git a/tools/aapt2/proto/TableProtoSerializer_test.cpp b/tools/aapt2/proto/TableProtoSerializer_test.cpp
index dd995d8..af1b011 100644
--- a/tools/aapt2/proto/TableProtoSerializer_test.cpp
+++ b/tools/aapt2/proto/TableProtoSerializer_test.cpp
@@ -16,49 +16,45 @@
#include "ResourceTable.h"
#include "proto/ProtoSerialize.h"
-#include "test/Builders.h"
-#include "test/Common.h"
-#include "test/Context.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
TEST(TableProtoSerializer, SerializeSinglePackage) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .setPackageId(u"com.app.a", 0x7f)
- .addFileReference(u"@com.app.a:layout/main", ResourceId(0x7f020000),
- u"res/layout/main.xml")
- .addReference(u"@com.app.a:layout/other", ResourceId(0x7f020001),
- u"@com.app.a:layout/main")
- .addString(u"@com.app.a:string/text", {}, u"hi")
- .addValue(u"@com.app.a:id/foo", {}, util::make_unique<Id>())
+ .setPackageId("com.app.a", 0x7f)
+ .addFileReference("com.app.a:layout/main", ResourceId(0x7f020000),
+ "res/layout/main.xml")
+ .addReference("com.app.a:layout/other", ResourceId(0x7f020001),
+ "com.app.a:layout/main")
+ .addString("com.app.a:string/text", {}, "hi")
+ .addValue("com.app.a:id/foo", {}, util::make_unique<Id>())
.build();
Symbol publicSymbol;
publicSymbol.state = SymbolState::kPublic;
- ASSERT_TRUE(table->setSymbolState(test::parseNameOrDie(u"@com.app.a:layout/main"),
+ ASSERT_TRUE(table->setSymbolState(test::parseNameOrDie("com.app.a:layout/main"),
ResourceId(0x7f020000),
publicSymbol, context->getDiagnostics()));
- Id* id = test::getValue<Id>(table.get(), u"@com.app.a:id/foo");
+ Id* id = test::getValue<Id>(table.get(), "com.app.a:id/foo");
ASSERT_NE(nullptr, id);
// Make a plural.
std::unique_ptr<Plural> plural = util::make_unique<Plural>();
- plural->values[Plural::One] = util::make_unique<String>(table->stringPool.makeRef(u"one"));
- ASSERT_TRUE(table->addResource(test::parseNameOrDie(u"@com.app.a:plurals/hey"),
- ConfigDescription{}, std::string(), std::move(plural),
+ plural->values[Plural::One] = util::make_unique<String>(table->stringPool.makeRef("one"));
+ ASSERT_TRUE(table->addResource(test::parseNameOrDie("com.app.a:plurals/hey"),
+ ConfigDescription{}, {}, std::move(plural),
context->getDiagnostics()));
// Make a resource with different products.
- ASSERT_TRUE(table->addResource(test::parseNameOrDie(u"@com.app.a:integer/one"),
- test::parseConfigOrDie("land"), std::string(),
+ ASSERT_TRUE(table->addResource(test::parseNameOrDie("com.app.a:integer/one"),
+ test::parseConfigOrDie("land"), {},
test::buildPrimitive(android::Res_value::TYPE_INT_DEC, 123u),
context->getDiagnostics()));
- ASSERT_TRUE(table->addResource(test::parseNameOrDie(u"@com.app.a:integer/one"),
- test::parseConfigOrDie("land"), std::string("tablet"),
+ ASSERT_TRUE(table->addResource(test::parseNameOrDie("com.app.a:integer/one"),
+ test::parseConfigOrDie("land"), "tablet",
test::buildPrimitive(android::Res_value::TYPE_INT_DEC, 321u),
context->getDiagnostics()));
@@ -66,10 +62,10 @@
// The reference should point to a resource outside of this table to test that both
// name and id get serialized.
Reference expectedRef;
- expectedRef.name = test::parseNameOrDie(u"@android:layout/main");
+ expectedRef.name = test::parseNameOrDie("android:layout/main");
expectedRef.id = ResourceId(0x01020000);
- ASSERT_TRUE(table->addResource(test::parseNameOrDie(u"@com.app.a:layout/abc"),
- ConfigDescription::defaultConfig(), std::string(),
+ ASSERT_TRUE(table->addResource(test::parseNameOrDie("com.app.a:layout/abc"),
+ ConfigDescription::defaultConfig(), {},
util::make_unique<Reference>(expectedRef),
context->getDiagnostics()));
@@ -81,28 +77,28 @@
context->getDiagnostics());
ASSERT_NE(nullptr, newTable);
- Id* newId = test::getValue<Id>(newTable.get(), u"@com.app.a:id/foo");
+ Id* newId = test::getValue<Id>(newTable.get(), "com.app.a:id/foo");
ASSERT_NE(nullptr, newId);
EXPECT_EQ(id->isWeak(), newId->isWeak());
Maybe<ResourceTable::SearchResult> result = newTable->findResource(
- test::parseNameOrDie(u"@com.app.a:layout/main"));
+ test::parseNameOrDie("com.app.a:layout/main"));
AAPT_ASSERT_TRUE(result);
EXPECT_EQ(SymbolState::kPublic, result.value().type->symbolStatus.state);
EXPECT_EQ(SymbolState::kPublic, result.value().entry->symbolStatus.state);
// Find the product-dependent values
BinaryPrimitive* prim = test::getValueForConfigAndProduct<BinaryPrimitive>(
- newTable.get(), u"@com.app.a:integer/one", test::parseConfigOrDie("land"), "");
+ newTable.get(), "com.app.a:integer/one", test::parseConfigOrDie("land"), "");
ASSERT_NE(nullptr, prim);
EXPECT_EQ(123u, prim->value.data);
prim = test::getValueForConfigAndProduct<BinaryPrimitive>(
- newTable.get(), u"@com.app.a:integer/one", test::parseConfigOrDie("land"), "tablet");
+ newTable.get(), "com.app.a:integer/one", test::parseConfigOrDie("land"), "tablet");
ASSERT_NE(nullptr, prim);
EXPECT_EQ(321u, prim->value.data);
- Reference* actualRef = test::getValue<Reference>(newTable.get(), u"@com.app.a:layout/abc");
+ Reference* actualRef = test::getValue<Reference>(newTable.get(), "com.app.a:layout/abc");
ASSERT_NE(nullptr, actualRef);
AAPT_ASSERT_TRUE(actualRef->name);
AAPT_ASSERT_TRUE(actualRef->id);
@@ -115,9 +111,9 @@
ResourceFile f;
f.config = test::parseConfigOrDie("hdpi-v9");
- f.name = test::parseNameOrDie(u"@com.app.a:layout/main");
+ f.name = test::parseNameOrDie("com.app.a:layout/main");
f.source.path = "res/layout-hdpi-v9/main.xml";
- f.exportedSymbols.push_back(SourcedResourceName{ test::parseNameOrDie(u"@+id/unchecked"), 23u });
+ f.exportedSymbols.push_back(SourcedResourceName{ test::parseNameOrDie("id/unchecked"), 23u });
const std::string expectedData = "1234";
@@ -136,7 +132,7 @@
const pb::CompiledFile* newPbFile = inFileStream.CompiledFile();
ASSERT_NE(nullptr, newPbFile);
- std::unique_ptr<ResourceFile> file = deserializeCompiledFileFromPb(*newPbFile, Source{ "test" },
+ std::unique_ptr<ResourceFile> file = deserializeCompiledFileFromPb(*newPbFile, Source("test"),
context->getDiagnostics());
ASSERT_NE(nullptr, file);
@@ -145,7 +141,7 @@
EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(inFileStream.data()) & 0x03);
ASSERT_EQ(1u, file->exportedSymbols.size());
- EXPECT_EQ(test::parseNameOrDie(u"@+id/unchecked"), file->exportedSymbols[0].name);
+ EXPECT_EQ(test::parseNameOrDie("id/unchecked"), file->exportedSymbols[0].name);
}
TEST(TableProtoSerializer, DeserializeCorruptHeaderSafely) {
diff --git a/tools/aapt2/readme.md b/tools/aapt2/readme.md
new file mode 100644
index 0000000..95c0173
--- /dev/null
+++ b/tools/aapt2/readme.md
@@ -0,0 +1,18 @@
+# Android Asset Packaging Tool 2.0 (AAPT2) release notes
+
+## Version 2.0
+### `aapt2 compile ...`
+- Pseudo-localization: generates pseudolocalized versions of default strings when the
+ `--pseudo-localize` option is specified.
+- Legacy mode: treats some class of errors as warnings in order to be more compatible
+ with AAPT when `--legacy` is specified.
+- Compile directory: treats the input file as a directory when `--dir` is
+ specified. This will emit a zip of compiled files, one for each file in the directory.
+ The directory must follow the Android resource directory structure
+ (res/values-[qualifiers]/file.ext).
+
+### `aapt2 link ...`
+- Automatic attribute versioning: adds version qualifiers to resources that use attributes
+ introduced in a later SDK level. This can be disabled with `--no-auto-version`.
+- Min SDK resource filtering: removes resources that can't possibly be selected at runtime due
+ to the application's minimum supported SDK level.
diff --git a/tools/aapt2/remove-duplicates.py b/tools/aapt2/remove-duplicates.py
new file mode 100644
index 0000000..fb98bb7
--- /dev/null
+++ b/tools/aapt2/remove-duplicates.py
@@ -0,0 +1,181 @@
+#!/usr/bin/env python
+
+import os
+import os.path
+import sys
+import tempfile
+import xml.parsers.expat
+
+"""
+Scans each resource file in res/values/ looking for duplicates.
+All but the last occurrence of resource definition are removed.
+This creates no semantic changes, the resulting APK when built
+should contain the same definition.
+"""
+
+class Duplicate:
+ """A small struct to maintain the positions of a Duplicate resource definition."""
+ def __init__(self, name, product, depth, start, end):
+ self.name = name
+ self.product = product
+ self.depth = depth
+ self.start = start
+ self.end = end
+
+class ResourceDefinitionLocator:
+ """Callback class for xml.parsers.expat which records resource definitions and their
+ locations.
+ """
+ def __init__(self, parser):
+ self.resource_definitions = {}
+ self._parser = parser
+ self._depth = 0
+ self._current_resource = None
+
+ def start_element(self, tag_name, attrs):
+ self._depth += 1
+ if self._depth == 2 and tag_name not in ["public", "java-symbol", "eat-comment", "skip"]:
+ resource_name = None
+ product = ""
+ try:
+ product = attrs["product"]
+ except KeyError:
+ pass
+
+ if tag_name == "item":
+ resource_name = "{0}/{1}".format(attrs["type"], attrs["name"])
+ else:
+ resource_name = "{0}/{1}".format(tag_name, attrs["name"])
+ self._current_resource = Duplicate(
+ resource_name,
+ product,
+ self._depth,
+ (self._parser.CurrentLineNumber - 1, self._parser.CurrentColumnNumber),
+ None)
+
+ def end_element(self, tag_name):
+ if self._current_resource and self._depth == self._current_resource.depth:
+ # Record the end position of the element, which is the length of the name
+ # plus the </> symbols (len("</>") == 3).
+ self._current_resource.end = (self._parser.CurrentLineNumber - 1,
+ self._parser.CurrentColumnNumber + 3 + len(tag_name))
+ key_name = "{0}:{1}".format(self._current_resource.name,
+ self._current_resource.product)
+ try:
+ self.resource_definitions[key_name] += [self._current_resource]
+ except KeyError:
+ self.resource_definitions[key_name] = [self._current_resource]
+ self._current_resource = None
+ self._depth -= 1
+
+def remove_duplicates(xml_path):
+ """Reads the input file and generates an output file with any duplicate
+ resources removed, keeping the last occurring definition and removing
+ the others. The output is written to a temporary and then renamed
+ to the original file name.
+ """
+ input = ""
+ with open(xml_path) as fin:
+ input = fin.read()
+
+ parser = xml.parsers.expat.ParserCreate("utf-8")
+ parser.returns_unicode = True
+ tracker = ResourceDefinitionLocator(parser)
+ parser.StartElementHandler = tracker.start_element
+ parser.EndElementHandler = tracker.end_element
+ parser.Parse(input)
+
+ # Treat the input as UTF-8 or else column numbers will be wrong.
+ input_lines = input.decode('utf-8').splitlines(True)
+
+ # Extract the duplicate resource definitions, ignoring the last definition
+ # which will take precedence and be left intact.
+ duplicates = []
+ for res_name, entries in tracker.resource_definitions.iteritems():
+ if len(entries) > 1:
+ duplicates += entries[:-1]
+
+ # Sort the duplicates so that they are in order. That way we only do one pass.
+ duplicates = sorted(duplicates, key=lambda x: x.start)
+
+ last_line_no = 0
+ last_col_no = 0
+ output_lines = []
+ current_line = ""
+ for definition in duplicates:
+ print "{0}:{1}:{2}: removing duplicate resource '{3}'".format(
+ xml_path, definition.start[0] + 1, definition.start[1], definition.name)
+
+ if last_line_no < definition.start[0]:
+ # The next definition is on a new line, so write what we have
+ # to the output.
+ new_line = current_line + input_lines[last_line_no][last_col_no:]
+ if not new_line.isspace():
+ output_lines.append(new_line)
+ current_line = ""
+ last_col_no = 0
+ last_line_no += 1
+
+ # Copy all the lines up until this one.
+ for line_to_copy in xrange(last_line_no, definition.start[0]):
+ output_lines.append(input_lines[line_to_copy])
+
+ # Add to the existing line we're building, by including the prefix of this line
+ # and skipping the lines and characters until the end of this duplicate definition.
+ last_line_no = definition.start[0]
+ current_line += input_lines[last_line_no][last_col_no:definition.start[1]]
+ last_line_no = definition.end[0]
+ last_col_no = definition.end[1]
+
+ new_line = current_line + input_lines[last_line_no][last_col_no:]
+ if not new_line.isspace():
+ output_lines.append(new_line)
+ current_line = ""
+ last_line_no += 1
+ last_col_no = 0
+
+ for line_to_copy in xrange(last_line_no, len(input_lines)):
+ output_lines.append(input_lines[line_to_copy])
+
+ if len(duplicates) > 0:
+ print "{0}: writing deduped copy...".format(xml_path)
+
+ # Write the lines to a temporary file.
+ dirname, basename = os.path.split(xml_path)
+ temp_name = ""
+ with tempfile.NamedTemporaryFile(prefix=basename, dir=dirname, delete=False) as temp:
+ temp_name = temp.name
+ for line in output_lines:
+ temp.write(line.encode('utf-8'))
+
+ # Now rename that file to the original so we have an atomic write that is consistent.
+ os.rename(temp.name, xml_path)
+
+def enumerate_files(res_path):
+ """Enumerates all files in the resource directory that are XML files and
+ within a values-* subdirectory. These types of files end up compiled
+ in the resources.arsc table of an APK.
+ """
+ values_directories = os.listdir(res_path)
+ values_directories = filter(lambda f: f.startswith('values'), values_directories)
+ values_directories = map(lambda f: os.path.join(res_path, f), values_directories)
+ all_files = []
+ for dir in values_directories:
+ files = os.listdir(dir)
+ files = filter(lambda f: f.endswith('.xml'), files)
+ files = map(lambda f: os.path.join(dir, f), files)
+ all_files += files
+ return all_files
+
+if __name__ == '__main__':
+ if len(sys.argv) < 2:
+ print >> sys.stderr, "please specify a path to a resource directory"
+ sys.exit(1)
+
+ res_path = os.path.abspath(sys.argv[1])
+ print "looking in {0} ...".format(res_path)
+
+ for f in enumerate_files(res_path):
+ print "checking {0} ...".format(f)
+ remove_duplicates(f)
+
diff --git a/tools/aapt2/split/TableSplitter_test.cpp b/tools/aapt2/split/TableSplitter_test.cpp
index 74ca32e..bad02a5 100644
--- a/tools/aapt2/split/TableSplitter_test.cpp
+++ b/tools/aapt2/split/TableSplitter_test.cpp
@@ -15,24 +15,21 @@
*/
#include "split/TableSplitter.h"
-#include "test/Builders.h"
-#include "test/Common.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
TEST(TableSplitterTest, NoSplitPreferredDensity) {
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
- .addFileReference(u"@android:drawable/icon", u"res/drawable-mdpi/icon.png",
+ .addFileReference("android:drawable/icon", "res/drawable-mdpi/icon.png",
test::parseConfigOrDie("mdpi"))
- .addFileReference(u"@android:drawable/icon", u"res/drawable-hdpi/icon.png",
+ .addFileReference("android:drawable/icon", "res/drawable-hdpi/icon.png",
test::parseConfigOrDie("hdpi"))
- .addFileReference(u"@android:drawable/icon", u"res/drawable-xhdpi/icon.png",
+ .addFileReference("android:drawable/icon", "res/drawable-xhdpi/icon.png",
test::parseConfigOrDie("xhdpi"))
- .addFileReference(u"@android:drawable/icon", u"res/drawable-xxhdpi/icon.png",
+ .addFileReference("android:drawable/icon", "res/drawable-xxhdpi/icon.png",
test::parseConfigOrDie("xxhdpi"))
- .addSimple(u"@android:string/one", {})
+ .addSimple("android:string/one")
.build();
TableSplitterOptions options;
@@ -41,24 +38,24 @@
splitter.splitTable(table.get());
EXPECT_EQ(nullptr, test::getValueForConfig<FileReference>(table.get(),
- u"@android:drawable/icon",
+ "android:drawable/icon",
test::parseConfigOrDie("mdpi")));
EXPECT_EQ(nullptr, test::getValueForConfig<FileReference>(table.get(),
- u"@android:drawable/icon",
+ "android:drawable/icon",
test::parseConfigOrDie("hdpi")));
EXPECT_NE(nullptr, test::getValueForConfig<FileReference>(table.get(),
- u"@android:drawable/icon",
+ "android:drawable/icon",
test::parseConfigOrDie("xhdpi")));
EXPECT_EQ(nullptr, test::getValueForConfig<FileReference>(table.get(),
- u"@android:drawable/icon",
+ "android:drawable/icon",
test::parseConfigOrDie("xxhdpi")));
- EXPECT_NE(nullptr, test::getValue<Id>(table.get(), u"@android:string/one"));
+ EXPECT_NE(nullptr, test::getValue<Id>(table.get(), "android:string/one"));
}
TEST(TableSplitterTest, SplitTableByConfigAndDensity) {
ResourceTable table;
- const ResourceName foo = test::parseNameOrDie(u"@android:string/foo");
+ const ResourceName foo = test::parseNameOrDie("android:string/foo");
ASSERT_TRUE(table.addResource(foo, test::parseConfigOrDie("land-hdpi"), {},
util::make_unique<Id>(),
test::getDiagnostics()));
@@ -82,25 +79,25 @@
ResourceTable* splitTwo = splitter.getSplits()[1].get();
// Since a split was defined, all densities should be gone from base.
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(&table, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(&table, "android:string/foo",
test::parseConfigOrDie("land-hdpi")));
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(&table, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(&table, "android:string/foo",
test::parseConfigOrDie("land-xhdpi")));
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(&table, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(&table, "android:string/foo",
test::parseConfigOrDie("land-xxhdpi")));
- EXPECT_NE(nullptr, test::getValueForConfig<Id>(splitOne, u"@android:string/foo",
+ EXPECT_NE(nullptr, test::getValueForConfig<Id>(splitOne, "android:string/foo",
test::parseConfigOrDie("land-hdpi")));
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitOne, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitOne, "android:string/foo",
test::parseConfigOrDie("land-xhdpi")));
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitOne, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitOne, "android:string/foo",
test::parseConfigOrDie("land-xxhdpi")));
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitTwo, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitTwo, "android:string/foo",
test::parseConfigOrDie("land-hdpi")));
- EXPECT_NE(nullptr, test::getValueForConfig<Id>(splitTwo, u"@android:string/foo",
+ EXPECT_NE(nullptr, test::getValueForConfig<Id>(splitTwo, "android:string/foo",
test::parseConfigOrDie("land-xhdpi")));
- EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitTwo, u"@android:string/foo",
+ EXPECT_EQ(nullptr, test::getValueForConfig<Id>(splitTwo, "android:string/foo",
test::parseConfigOrDie("land-xxhdpi")));
}
diff --git a/tools/aapt2/test/Builders.h b/tools/aapt2/test/Builders.h
index 8eb4bc8..c0c0160 100644
--- a/tools/aapt2/test/Builders.h
+++ b/tools/aapt2/test/Builders.h
@@ -40,77 +40,81 @@
return &mTable->stringPool;
}
- ResourceTableBuilder& setPackageId(const StringPiece16& packageName, uint8_t id) {
+ ResourceTableBuilder& setPackageId(const StringPiece& packageName, uint8_t id) {
ResourceTablePackage* package = mTable->createPackage(packageName, id);
assert(package);
return *this;
}
- ResourceTableBuilder& addSimple(const StringPiece16& name, const ResourceId id = {}) {
+ ResourceTableBuilder& addSimple(const StringPiece& name, const ResourceId id = {}) {
return addValue(name, id, util::make_unique<Id>());
}
- ResourceTableBuilder& addReference(const StringPiece16& name, const StringPiece16& ref) {
+ ResourceTableBuilder& addSimple(const StringPiece& name, const ConfigDescription& config,
+ const ResourceId id = {}) {
+ return addValue(name, config, id, util::make_unique<Id>());
+ }
+
+ ResourceTableBuilder& addReference(const StringPiece& name, const StringPiece& ref) {
return addReference(name, {}, ref);
}
- ResourceTableBuilder& addReference(const StringPiece16& name, const ResourceId id,
- const StringPiece16& ref) {
+ ResourceTableBuilder& addReference(const StringPiece& name, const ResourceId id,
+ const StringPiece& ref) {
return addValue(name, id, util::make_unique<Reference>(parseNameOrDie(ref)));
}
- ResourceTableBuilder& addString(const StringPiece16& name, const StringPiece16& str) {
+ ResourceTableBuilder& addString(const StringPiece& name, const StringPiece& str) {
return addString(name, {}, str);
}
- ResourceTableBuilder& addString(const StringPiece16& name, const ResourceId id,
- const StringPiece16& str) {
+ ResourceTableBuilder& addString(const StringPiece& name, const ResourceId id,
+ const StringPiece& str) {
return addValue(name, id, util::make_unique<String>(mTable->stringPool.makeRef(str)));
}
- ResourceTableBuilder& addString(const StringPiece16& name, const ResourceId id,
- const ConfigDescription& config, const StringPiece16& str) {
- return addValue(name, id, config,
+ ResourceTableBuilder& addString(const StringPiece& name, const ResourceId id,
+ const ConfigDescription& config, const StringPiece& str) {
+ return addValue(name, config, id,
util::make_unique<String>(mTable->stringPool.makeRef(str)));
}
- ResourceTableBuilder& addFileReference(const StringPiece16& name, const StringPiece16& path) {
+ ResourceTableBuilder& addFileReference(const StringPiece& name, const StringPiece& path) {
return addFileReference(name, {}, path);
}
- ResourceTableBuilder& addFileReference(const StringPiece16& name, const ResourceId id,
- const StringPiece16& path) {
+ ResourceTableBuilder& addFileReference(const StringPiece& name, const ResourceId id,
+ const StringPiece& path) {
return addValue(name, id,
util::make_unique<FileReference>(mTable->stringPool.makeRef(path)));
}
- ResourceTableBuilder& addFileReference(const StringPiece16& name, const StringPiece16& path,
+ ResourceTableBuilder& addFileReference(const StringPiece& name, const StringPiece& path,
const ConfigDescription& config) {
- return addValue(name, {}, config,
+ return addValue(name, config, {},
util::make_unique<FileReference>(mTable->stringPool.makeRef(path)));
}
- ResourceTableBuilder& addValue(const StringPiece16& name,
+ ResourceTableBuilder& addValue(const StringPiece& name,
std::unique_ptr<Value> value) {
return addValue(name, {}, std::move(value));
}
- ResourceTableBuilder& addValue(const StringPiece16& name, const ResourceId id,
- std::unique_ptr<Value> value) {
- return addValue(name, id, {}, std::move(value));
+ ResourceTableBuilder& addValue(const StringPiece& name, const ResourceId id,
+ std::unique_ptr<Value> value) {
+ return addValue(name, {}, id, std::move(value));
}
- ResourceTableBuilder& addValue(const StringPiece16& name, const ResourceId id,
- const ConfigDescription& config,
- std::unique_ptr<Value> value) {
+ ResourceTableBuilder& addValue(const StringPiece& name, const ConfigDescription& config,
+ const ResourceId id, std::unique_ptr<Value> value) {
ResourceName resName = parseNameOrDie(name);
- bool result = mTable->addResourceAllowMangled(resName, id, config, std::string(),
+ bool result = mTable->addResourceAllowMangled(resName, id, config, {},
std::move(value), &mDiagnostics);
assert(result);
return *this;
}
- ResourceTableBuilder& setSymbolState(const StringPiece16& name, ResourceId id,
+ ResourceTableBuilder& setSymbolState(const StringPiece& name, ResourceId id,
SymbolState state) {
ResourceName resName = parseNameOrDie(name);
Symbol symbol;
@@ -125,7 +129,7 @@
}
};
-inline std::unique_ptr<Reference> buildReference(const StringPiece16& ref,
+inline std::unique_ptr<Reference> buildReference(const StringPiece& ref,
Maybe<ResourceId> id = {}) {
std::unique_ptr<Reference> reference = util::make_unique<Reference>(parseNameOrDie(ref));
reference->id = id;
@@ -156,7 +160,7 @@
return *this;
}
- ValueBuilder& setComment(const StringPiece16& str) {
+ ValueBuilder& setComment(const StringPiece& str) {
mValue->setComment(str);
return *this;
}
@@ -180,9 +184,9 @@
return *this;
}
- AttributeBuilder& addItem(const StringPiece16& name, uint32_t value) {
+ AttributeBuilder& addItem(const StringPiece& name, uint32_t value) {
mAttr->symbols.push_back(Attribute::Symbol{
- Reference(ResourceName{ {}, ResourceType::kId, name.toString()}),
+ Reference(ResourceName({}, ResourceType::kId, name)),
value});
return *this;
}
@@ -197,17 +201,17 @@
std::unique_ptr<Style> mStyle = util::make_unique<Style>();
public:
- StyleBuilder& setParent(const StringPiece16& str) {
+ StyleBuilder& setParent(const StringPiece& str) {
mStyle->parent = Reference(parseNameOrDie(str));
return *this;
}
- StyleBuilder& addItem(const StringPiece16& str, std::unique_ptr<Item> value) {
+ StyleBuilder& addItem(const StringPiece& str, std::unique_ptr<Item> value) {
mStyle->entries.push_back(Style::Entry{ Reference(parseNameOrDie(str)), std::move(value) });
return *this;
}
- StyleBuilder& addItem(const StringPiece16& str, ResourceId id, std::unique_ptr<Item> value) {
+ StyleBuilder& addItem(const StringPiece& str, ResourceId id, std::unique_ptr<Item> value) {
addItem(str, std::move(value));
mStyle->entries.back().key.id = id;
return *this;
@@ -223,7 +227,7 @@
std::unique_ptr<Styleable> mStyleable = util::make_unique<Styleable>();
public:
- StyleableBuilder& addItem(const StringPiece16& str, Maybe<ResourceId> id = {}) {
+ StyleableBuilder& addItem(const StringPiece& str, Maybe<ResourceId> id = {}) {
mStyleable->entries.push_back(Reference(parseNameOrDie(str)));
mStyleable->entries.back().id = id;
return *this;
diff --git a/tools/aapt2/test/Common.h b/tools/aapt2/test/Common.h
index faccd477..624a71a 100644
--- a/tools/aapt2/test/Common.h
+++ b/tools/aapt2/test/Common.h
@@ -62,9 +62,9 @@
return &diag;
}
-inline ResourceName parseNameOrDie(const StringPiece16& str) {
+inline ResourceName parseNameOrDie(const StringPiece& str) {
ResourceNameRef ref;
- bool result = ResourceUtils::tryParseReference(str, &ref);
+ bool result = ResourceUtils::parseResourceName(str, &ref);
assert(result && "invalid resource name");
return ref.toResourceName();
}
@@ -77,7 +77,7 @@
}
template <typename T> T* getValueForConfigAndProduct(ResourceTable* table,
- const StringPiece16& resName,
+ const StringPiece& resName,
const ConfigDescription& config,
const StringPiece& product) {
Maybe<ResourceTable::SearchResult> result = table->findResource(parseNameOrDie(resName));
@@ -90,12 +90,12 @@
return nullptr;
}
-template <typename T> T* getValueForConfig(ResourceTable* table, const StringPiece16& resName,
+template <typename T> T* getValueForConfig(ResourceTable* table, const StringPiece& resName,
const ConfigDescription& config) {
return getValueForConfigAndProduct<T>(table, resName, config, {});
}
-template <typename T> T* getValue(ResourceTable* table, const StringPiece16& resName) {
+template <typename T> T* getValue(ResourceTable* table, const StringPiece& resName) {
return getValueForConfig<T>(table, resName, {});
}
diff --git a/tools/aapt2/test/Context.h b/tools/aapt2/test/Context.h
index 96752d3..b053e07 100644
--- a/tools/aapt2/test/Context.h
+++ b/tools/aapt2/test/Context.h
@@ -19,7 +19,6 @@
#include "NameMangler.h"
#include "util/Util.h"
-
#include "process/IResourceTableConsumer.h"
#include "process/SymbolTable.h"
#include "test/Common.h"
@@ -40,7 +39,7 @@
return &mDiagnostics;
}
- const std::u16string& getCompilationPackage() override {
+ const std::string& getCompilationPackage() override {
assert(mCompilationPackage && "package name not set");
return mCompilationPackage.value();
}
@@ -58,17 +57,19 @@
return false;
}
+ int getMinSdkVersion() override {
+ return mMinSdkVersion;
+ }
+
private:
friend class ContextBuilder;
- Context() : mNameMangler({}) {
- }
-
- Maybe<std::u16string> mCompilationPackage;
+ Maybe<std::string> mCompilationPackage;
Maybe<uint8_t> mPackageId;
StdErrDiagnostics mDiagnostics;
SymbolTable mSymbols;
- NameMangler mNameMangler;
+ NameMangler mNameMangler = NameMangler({});
+ int mMinSdkVersion = 0;
};
class ContextBuilder {
@@ -76,7 +77,7 @@
std::unique_ptr<Context> mContext = std::unique_ptr<Context>(new Context());
public:
- ContextBuilder& setCompilationPackage(const StringPiece16& package) {
+ ContextBuilder& setCompilationPackage(const StringPiece& package) {
mContext->mCompilationPackage = package.toString();
return *this;
}
@@ -96,6 +97,11 @@
return *this;
}
+ ContextBuilder& setMinSdkVersion(int minSdk) {
+ mContext->mMinSdkVersion = minSdk;
+ return *this;
+ }
+
std::unique_ptr<Context> build() {
return std::move(mContext);
}
@@ -103,7 +109,7 @@
class StaticSymbolSourceBuilder {
public:
- StaticSymbolSourceBuilder& addPublicSymbol(const StringPiece16& name, ResourceId id,
+ StaticSymbolSourceBuilder& addPublicSymbol(const StringPiece& name, ResourceId id,
std::unique_ptr<Attribute> attr = {}) {
std::unique_ptr<SymbolTable::Symbol> symbol = util::make_unique<SymbolTable::Symbol>(
id, std::move(attr), true);
@@ -113,7 +119,7 @@
return *this;
}
- StaticSymbolSourceBuilder& addSymbol(const StringPiece16& name, ResourceId id,
+ StaticSymbolSourceBuilder& addSymbol(const StringPiece& name, ResourceId id,
std::unique_ptr<Attribute> attr = {}) {
std::unique_ptr<SymbolTable::Symbol> symbol = util::make_unique<SymbolTable::Symbol>(
id, std::move(attr), false);
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp
index 5cd1c8b..4fd77c8 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.cpp
+++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp
@@ -61,7 +61,6 @@
auto cacheIter = mMapping->find(id);
if (cacheIter != mMapping->end()) {
reference->name = cacheIter->second;
- reference->id = {};
}
}
};
@@ -179,7 +178,8 @@
packageName[i] = util::deviceToHost16(packageHeader->name[i]);
}
- ResourceTablePackage* package = mTable->createPackage(packageName, (uint8_t) packageId);
+ ResourceTablePackage* package = mTable->createPackage(util::utf16ToUtf8(packageName),
+ static_cast<uint8_t>(packageId));
if (!package) {
mContext->getDiagnostics()->error(DiagMessage(mSource)
<< "incompatible package '" << packageName
@@ -309,12 +309,12 @@
ConfigDescription config;
config.copyFromDtoH(type->config);
- StringPiece16 typeStr16 = util::getString(mTypePool, type->id - 1);
+ const std::string typeStr = util::getString(mTypePool, type->id - 1);
- const ResourceType* parsedType = parseResourceType(typeStr16);
+ const ResourceType* parsedType = parseResourceType(typeStr);
if (!parsedType) {
mContext->getDiagnostics()->error(DiagMessage(mSource)
- << "invalid type name '" << typeStr16
+ << "invalid type name '" << typeStr
<< "' for type with ID " << (int) type->id);
return false;
}
@@ -328,7 +328,7 @@
const ResourceName name(package->name, *parsedType,
util::getString(mKeyPool,
- util::deviceToHost32(entry->key.index)).toString());
+ util::deviceToHost32(entry->key.index)));
const ResourceId resId(package->id.value(), type->id, static_cast<uint16_t>(it.index()));
@@ -388,16 +388,16 @@
const uint32_t data = util::deviceToHost32(value->data);
if (value->dataType == Res_value::TYPE_STRING) {
- StringPiece16 str = util::getString(mValuePool, data);
+ const std::string str = util::getString(mValuePool, data);
const ResStringPool_span* spans = mValuePool.styleAt(data);
// Check if the string has a valid style associated with it.
if (spans != nullptr && spans->name.index != ResStringPool_span::END) {
- StyleString styleStr = { str.toString() };
+ StyleString styleStr = { str };
while (spans->name.index != ResStringPool_span::END) {
styleStr.spans.push_back(Span{
- util::getString(mValuePool, spans->name.index).toString(),
+ util::getString(mValuePool, spans->name.index),
spans->firstChar,
spans->lastChar
});
@@ -407,7 +407,7 @@
styleStr, StringPool::Context{1, config}));
} else {
if (name.type != ResourceType::kString &&
- util::stringStartsWith<char16_t>(str, u"res/")) {
+ util::stringStartsWith(str, "res/")) {
// This must be a FileReference.
return util::make_unique<FileReference>(mTable->stringPool.makeRef(
str, StringPool::Context{ 0, config }));
diff --git a/tools/aapt2/util/Files.cpp b/tools/aapt2/util/Files.cpp
index f5e49f1..c9b3811 100644
--- a/tools/aapt2/util/Files.cpp
+++ b/tools/aapt2/util/Files.cpp
@@ -157,7 +157,7 @@
std::string packageToPath(const StringPiece& package) {
std::string outPath;
- for (StringPiece part : util::tokenize<char>(package, '.')) {
+ for (StringPiece part : util::tokenize(package, '.')) {
appendPath(&outPath, part);
}
return outPath;
@@ -199,7 +199,7 @@
return false;
}
- for (StringPiece line : util::tokenize<char>(contents, ' ')) {
+ for (StringPiece line : util::tokenize(contents, ' ')) {
line = util::trimWhitespace(line);
if (!line.empty()) {
outArgList->push_back(line.toString());
diff --git a/tools/aapt2/util/Maybe.h b/tools/aapt2/util/Maybe.h
index 595db96..a31bc89 100644
--- a/tools/aapt2/util/Maybe.h
+++ b/tools/aapt2/util/Maybe.h
@@ -88,6 +88,8 @@
*/
const T& value() const;
+ T valueOrDefault(const T& def) const;
+
private:
template <typename U>
friend class Maybe;
@@ -263,6 +265,14 @@
}
template <typename T>
+T Maybe<T>::valueOrDefault(const T& def) const {
+ if (mNothing) {
+ return def;
+ }
+ return reinterpret_cast<const T&>(mStorage);
+}
+
+template <typename T>
void Maybe<T>::destroy() {
reinterpret_cast<T&>(mStorage).~T();
}
@@ -306,6 +316,19 @@
return !(a == b);
}
+template <typename T, typename U>
+typename std::enable_if<
+ has_lt_op<T, U>::value,
+ bool
+>::type operator<(const Maybe<T>& a, const Maybe<U>& b) {
+ if (a && b) {
+ return a.value() < b.value();
+ } else if (!a && !b) {
+ return false;
+ }
+ return !a;
+}
+
} // namespace aapt
#endif // AAPT_MAYBE_H
diff --git a/tools/aapt2/util/StringPiece_test.cpp b/tools/aapt2/util/StringPiece_test.cpp
index 853a9a4..a87065a 100644
--- a/tools/aapt2/util/StringPiece_test.cpp
+++ b/tools/aapt2/util/StringPiece_test.cpp
@@ -34,16 +34,16 @@
}
TEST(StringPieceTest, PiecesHaveCorrectSortOrder) {
- std::u16string testing(u"testing");
- std::u16string banana(u"banana");
- std::u16string car(u"car");
+ std::string testing("testing");
+ std::string banana("banana");
+ std::string car("car");
- EXPECT_TRUE(StringPiece16(testing) > banana);
- EXPECT_TRUE(StringPiece16(testing) > car);
- EXPECT_TRUE(StringPiece16(banana) < testing);
- EXPECT_TRUE(StringPiece16(banana) < car);
- EXPECT_TRUE(StringPiece16(car) < testing);
- EXPECT_TRUE(StringPiece16(car) > banana);
+ EXPECT_TRUE(StringPiece(testing) > banana);
+ EXPECT_TRUE(StringPiece(testing) > car);
+ EXPECT_TRUE(StringPiece(banana) < testing);
+ EXPECT_TRUE(StringPiece(banana) < car);
+ EXPECT_TRUE(StringPiece(car) < testing);
+ EXPECT_TRUE(StringPiece(car) > banana);
}
TEST(StringPieceTest, PiecesHaveCorrectSortOrderUtf8) {
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp
index 7b0c71d..3c0e9bde 100644
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -54,23 +54,18 @@
return splitAndTransform(str, sep, ::tolower);
}
-StringPiece16 trimWhitespace(const StringPiece16& str) {
- if (str.size() == 0 || str.data() == nullptr) {
- return str;
+bool stringStartsWith(const StringPiece& str, const StringPiece& prefix) {
+ if (str.size() < prefix.size()) {
+ return false;
}
+ return str.substr(0, prefix.size()) == prefix;
+}
- const char16_t* start = str.data();
- const char16_t* end = str.data() + str.length();
-
- while (start != end && util::isspace16(*start)) {
- start++;
+bool stringEndsWith(const StringPiece& str, const StringPiece& suffix) {
+ if (str.size() < suffix.size()) {
+ return false;
}
-
- while (end != start && util::isspace16(*(end - 1))) {
- end--;
- }
-
- return StringPiece16(start, end - start);
+ return str.substr(str.size() - suffix.size(), suffix.size()) == suffix;
}
StringPiece trimWhitespace(const StringPiece& str) {
@@ -92,11 +87,11 @@
return StringPiece(start, end - start);
}
-StringPiece16::const_iterator findNonAlphaNumericAndNotInSet(const StringPiece16& str,
- const StringPiece16& allowedChars) {
+StringPiece::const_iterator findNonAlphaNumericAndNotInSet(const StringPiece& str,
+ const StringPiece& allowedChars) {
const auto endIter = str.end();
for (auto iter = str.begin(); iter != endIter; ++iter) {
- char16_t c = *iter;
+ char c = *iter;
if ((c >= u'a' && c <= u'z') ||
(c >= u'A' && c <= u'Z') ||
(c >= u'0' && c <= u'9')) {
@@ -104,7 +99,7 @@
}
bool match = false;
- for (char16_t i : allowedChars) {
+ for (char i : allowedChars) {
if (c == i) {
match = true;
break;
@@ -118,51 +113,51 @@
return endIter;
}
-bool isJavaClassName(const StringPiece16& str) {
+bool isJavaClassName(const StringPiece& str) {
size_t pieces = 0;
- for (const StringPiece16& piece : tokenize(str, u'.')) {
+ for (const StringPiece& piece : tokenize(str, '.')) {
pieces++;
if (piece.empty()) {
return false;
}
// Can't have starting or trailing $ character.
- if (piece.data()[0] == u'$' || piece.data()[piece.size() - 1] == u'$') {
+ if (piece.data()[0] == '$' || piece.data()[piece.size() - 1] == '$') {
return false;
}
- if (findNonAlphaNumericAndNotInSet(piece, u"$_") != piece.end()) {
+ if (findNonAlphaNumericAndNotInSet(piece, "$_") != piece.end()) {
return false;
}
}
return pieces >= 2;
}
-bool isJavaPackageName(const StringPiece16& str) {
+bool isJavaPackageName(const StringPiece& str) {
if (str.empty()) {
return false;
}
size_t pieces = 0;
- for (const StringPiece16& piece : tokenize(str, u'.')) {
+ for (const StringPiece& piece : tokenize(str, '.')) {
pieces++;
if (piece.empty()) {
return false;
}
- if (piece.data()[0] == u'_' || piece.data()[piece.size() - 1] == u'_') {
+ if (piece.data()[0] == '_' || piece.data()[piece.size() - 1] == '_') {
return false;
}
- if (findNonAlphaNumericAndNotInSet(piece, u"_") != piece.end()) {
+ if (findNonAlphaNumericAndNotInSet(piece, "_") != piece.end()) {
return false;
}
}
return pieces >= 1;
}
-Maybe<std::u16string> getFullyQualifiedClassName(const StringPiece16& package,
- const StringPiece16& className) {
+Maybe<std::string> getFullyQualifiedClassName(const StringPiece& package,
+ const StringPiece& className) {
if (className.empty()) {
return {};
}
@@ -175,11 +170,11 @@
return {};
}
- if (className.data()[0] != u'.') {
- return {};
+ std::string result(package.data(), package.size());
+ if (className.data()[0] != '.') {
+ result += '.';
}
- std::u16string result(package.data(), package.size());
result.append(className.data(), className.size());
if (!isJavaClassName(result)) {
return {};
@@ -187,23 +182,23 @@
return result;
}
-static size_t consumeDigits(const char16_t* start, const char16_t* end) {
- const char16_t* c = start;
- for (; c != end && *c >= u'0' && *c <= u'9'; c++) {}
+static size_t consumeDigits(const char* start, const char* end) {
+ const char* c = start;
+ for (; c != end && *c >= '0' && *c <= '9'; c++) {}
return static_cast<size_t>(c - start);
}
-bool verifyJavaStringFormat(const StringPiece16& str) {
- const char16_t* c = str.begin();
- const char16_t* const end = str.end();
+bool verifyJavaStringFormat(const StringPiece& str) {
+ const char* c = str.begin();
+ const char* const end = str.end();
size_t argCount = 0;
bool nonpositional = false;
while (c != end) {
- if (*c == u'%' && c + 1 < end) {
+ if (*c == '%' && c + 1 < end) {
c++;
- if (*c == u'%') {
+ if (*c == '%') {
c++;
continue;
}
@@ -213,11 +208,11 @@
size_t numDigits = consumeDigits(c, end);
if (numDigits > 0) {
c += numDigits;
- if (c != end && *c != u'$') {
+ if (c != end && *c != '$') {
// The digits were a size, but not a positional argument.
nonpositional = true;
}
- } else if (*c == u'<') {
+ } else if (*c == '<') {
// Reusing last argument, bad idea since positions can be moved around
// during translation.
nonpositional = true;
@@ -225,7 +220,7 @@
c++;
// Optionally we can have a $ after
- if (c != end && *c == u'$') {
+ if (c != end && *c == '$') {
c++;
}
} else {
@@ -233,13 +228,13 @@
}
// Ignore size, width, flags, etc.
- while (c != end && (*c == u'-' ||
- *c == u'#' ||
- *c == u'+' ||
- *c == u' ' ||
- *c == u',' ||
- *c == u'(' ||
- (*c >= u'0' && *c <= '9'))) {
+ while (c != end && (*c == '-' ||
+ *c == '#' ||
+ *c == '+' ||
+ *c == ' ' ||
+ *c == ',' ||
+ *c == '(' ||
+ (*c >= '0' && *c <= '9'))) {
c++;
}
@@ -286,11 +281,11 @@
return true;
}
-static Maybe<char16_t> parseUnicodeCodepoint(const char16_t** start, const char16_t* end) {
- char16_t code = 0;
+static Maybe<std::string> parseUnicodeCodepoint(const char** start, const char* end) {
+ char32_t code = 0;
for (size_t i = 0; i < 4 && *start != end; i++, (*start)++) {
- char16_t c = **start;
- int a;
+ char c = **start;
+ char32_t a;
if (c >= '0' && c <= '9') {
a = c - '0';
} else if (c >= 'a' && c <= 'f') {
@@ -298,51 +293,60 @@
} else if (c >= 'A' && c <= 'F') {
a = c - 'A' + 10;
} else {
- return make_nothing<char16_t>();
+ return {};
}
code = (code << 4) | a;
}
- return make_value(code);
+
+ ssize_t len = utf32_to_utf8_length(&code, 1);
+ if (len < 0) {
+ return {};
+ }
+
+ std::string resultUtf8;
+ resultUtf8.resize(len);
+ utf32_to_utf8(&code, 1, &*resultUtf8.begin(), len + 1);
+ return resultUtf8;
}
-StringBuilder& StringBuilder::append(const StringPiece16& str) {
+StringBuilder& StringBuilder::append(const StringPiece& str) {
if (!mError.empty()) {
return *this;
}
- const char16_t* const end = str.end();
- const char16_t* start = str.begin();
- const char16_t* current = start;
+ const char* const end = str.end();
+ const char* start = str.begin();
+ const char* current = start;
while (current != end) {
if (mLastCharWasEscape) {
switch (*current) {
- case u't':
- mStr += u'\t';
+ case 't':
+ mStr += '\t';
break;
- case u'n':
- mStr += u'\n';
+ case 'n':
+ mStr += '\n';
break;
- case u'#':
- mStr += u'#';
+ case '#':
+ mStr += '#';
break;
- case u'@':
- mStr += u'@';
+ case '@':
+ mStr += '@';
break;
- case u'?':
- mStr += u'?';
+ case '?':
+ mStr += '?';
break;
- case u'"':
- mStr += u'"';
+ case '"':
+ mStr += '"';
break;
- case u'\'':
- mStr += u'\'';
+ case '\'':
+ mStr += '\'';
break;
- case u'\\':
- mStr += u'\\';
+ case '\\':
+ mStr += '\\';
break;
- case u'u': {
+ case 'u': {
current++;
- Maybe<char16_t> c = parseUnicodeCodepoint(¤t, end);
+ Maybe<std::string> c = parseUnicodeCodepoint(¤t, end);
if (!c) {
mError = "invalid unicode escape sequence";
return *this;
@@ -358,7 +362,7 @@
}
mLastCharWasEscape = false;
start = current + 1;
- } else if (*current == u'"') {
+ } else if (*current == '"') {
if (!mQuote && mTrailingSpace) {
// We found an opening quote, and we have
// trailing space, so we should append that
@@ -367,7 +371,7 @@
// We had trailing whitespace, so
// replace with a single space.
if (!mStr.empty()) {
- mStr += u' ';
+ mStr += ' ';
}
mTrailingSpace = false;
}
@@ -375,17 +379,17 @@
mQuote = !mQuote;
mStr.append(start, current - start);
start = current + 1;
- } else if (*current == u'\'' && !mQuote) {
+ } else if (*current == '\'' && !mQuote) {
// This should be escaped.
mError = "unescaped apostrophe";
return *this;
- } else if (*current == u'\\') {
+ } else if (*current == '\\') {
// This is an escape sequence, convert to the real value.
if (!mQuote && mTrailingSpace) {
// We had trailing whitespace, so
// replace with a single space.
if (!mStr.empty()) {
- mStr += u' ';
+ mStr += ' ';
}
mTrailingSpace = false;
}
@@ -394,7 +398,7 @@
mLastCharWasEscape = true;
} else if (!mQuote) {
// This is not quoted text, so look for whitespace.
- if (isspace16(*current)) {
+ if (isspace(*current)) {
// We found whitespace, see if we have seen some
// before.
if (!mTrailingSpace) {
@@ -410,7 +414,7 @@
// We saw trailing space before, so replace all
// that trailing space with one space.
if (!mStr.empty()) {
- mStr += u' ';
+ mStr += ' ';
}
mTrailingSpace = false;
}
@@ -442,7 +446,7 @@
std::string utf8;
utf8.resize(utf8Length);
- utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin());
+ utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin(), utf8Length + 1);
return utf8;
}
@@ -465,15 +469,58 @@
return data;
}
-bool extractResFilePathParts(const StringPiece16& path, StringPiece16* outPrefix,
- StringPiece16* outEntry, StringPiece16* outSuffix) {
- if (!stringStartsWith<char16_t>(path, u"res/")) {
+typename Tokenizer::iterator& Tokenizer::iterator::operator++() {
+ const char* start = mToken.end();
+ const char* end = mStr.end();
+ if (start == end) {
+ mEnd = true;
+ mToken.assign(mToken.end(), 0);
+ return *this;
+ }
+
+ start += 1;
+ const char* current = start;
+ while (current != end) {
+ if (*current == mSeparator) {
+ mToken.assign(start, current - start);
+ return *this;
+ }
+ ++current;
+ }
+ mToken.assign(start, end - start);
+ return *this;
+}
+
+bool Tokenizer::iterator::operator==(const iterator& rhs) const {
+ // We check equality here a bit differently.
+ // We need to know that the addresses are the same.
+ return mToken.begin() == rhs.mToken.begin() && mToken.end() == rhs.mToken.end() &&
+ mEnd == rhs.mEnd;
+}
+
+bool Tokenizer::iterator::operator!=(const iterator& rhs) const {
+ return !(*this == rhs);
+}
+
+Tokenizer::iterator::iterator(StringPiece s, char sep, StringPiece tok, bool end) :
+ mStr(s), mSeparator(sep), mToken(tok), mEnd(end) {
+}
+
+Tokenizer::Tokenizer(StringPiece str, char sep) :
+ mBegin(++iterator(str, sep, StringPiece(str.begin() - 1, 0), false)),
+ mEnd(str, sep, StringPiece(str.end(), 0), true) {
+}
+
+bool extractResFilePathParts(const StringPiece& path, StringPiece* outPrefix,
+ StringPiece* outEntry, StringPiece* outSuffix) {
+ const StringPiece resPrefix("res/");
+ if (!stringStartsWith(path, resPrefix)) {
return false;
}
- StringPiece16::const_iterator lastOccurence = path.end();
- for (auto iter = path.begin() + StringPiece16(u"res/").size(); iter != path.end(); ++iter) {
- if (*iter == u'/') {
+ StringPiece::const_iterator lastOccurence = path.end();
+ for (auto iter = path.begin() + resPrefix.size(); iter != path.end(); ++iter) {
+ if (*iter == '/') {
lastOccurence = iter;
}
}
@@ -482,12 +529,30 @@
return false;
}
- auto iter = std::find(lastOccurence, path.end(), u'.');
- *outSuffix = StringPiece16(iter, path.end() - iter);
- *outEntry = StringPiece16(lastOccurence + 1, iter - lastOccurence - 1);
- *outPrefix = StringPiece16(path.begin(), lastOccurence - path.begin() + 1);
+ auto iter = std::find(lastOccurence, path.end(), '.');
+ *outSuffix = StringPiece(iter, path.end() - iter);
+ *outEntry = StringPiece(lastOccurence + 1, iter - lastOccurence - 1);
+ *outPrefix = StringPiece(path.begin(), lastOccurence - path.begin() + 1);
return true;
}
+StringPiece16 getString16(const android::ResStringPool& pool, size_t idx) {
+ size_t len;
+ const char16_t* str = pool.stringAt(idx, &len);
+ if (str != nullptr) {
+ return StringPiece16(str, len);
+ }
+ return StringPiece16();
+}
+
+std::string getString(const android::ResStringPool& pool, size_t idx) {
+ size_t len;
+ const char* str = pool.string8At(idx, &len);
+ if (str != nullptr) {
+ return std::string(str, len);
+ }
+ return utf16ToUtf8(getString16(pool, idx));
+}
+
} // namespace util
} // namespace aapt
diff --git a/tools/aapt2/util/Util.h b/tools/aapt2/util/Util.h
index 0dacbd7..4a10987 100644
--- a/tools/aapt2/util/Util.h
+++ b/tools/aapt2/util/Util.h
@@ -37,30 +37,18 @@
/**
* Returns true if the string starts with prefix.
*/
-template <typename T>
-bool stringStartsWith(const BasicStringPiece<T>& str, const BasicStringPiece<T>& prefix) {
- if (str.size() < prefix.size()) {
- return false;
- }
- return str.substr(0, prefix.size()) == prefix;
-}
+bool stringStartsWith(const StringPiece& str, const StringPiece& prefix);
/**
* Returns true if the string ends with suffix.
*/
-template <typename T>
-bool stringEndsWith(const BasicStringPiece<T>& str, const BasicStringPiece<T>& suffix) {
- if (str.size() < suffix.size()) {
- return false;
- }
- return str.substr(str.size() - suffix.size(), suffix.size()) == suffix;
-}
+bool stringEndsWith(const StringPiece& str, const StringPiece& suffix);
/**
* Creates a new StringPiece16 that points to a substring
* of the original string without leading or trailing whitespace.
*/
-StringPiece16 trimWhitespace(const StringPiece16& str);
+StringPiece trimWhitespace(const StringPiece& str);
StringPiece trimWhitespace(const StringPiece& str);
@@ -76,18 +64,18 @@
* Returns an iterator to the first character that is not alpha-numeric and that
* is not in the allowedChars set.
*/
-StringPiece16::const_iterator findNonAlphaNumericAndNotInSet(const StringPiece16& str,
- const StringPiece16& allowedChars);
+StringPiece::const_iterator findNonAlphaNumericAndNotInSet(const StringPiece& str,
+ const StringPiece& allowedChars);
/**
* Tests that the string is a valid Java class name.
*/
-bool isJavaClassName(const StringPiece16& str);
+bool isJavaClassName(const StringPiece& str);
/**
* Tests that the string is a valid Java package name.
*/
-bool isJavaPackageName(const StringPiece16& str);
+bool isJavaPackageName(const StringPiece& str);
/**
* Converts the class name to a fully qualified class name from the given `package`. Ex:
@@ -97,9 +85,8 @@
* .a.b --> package.a.b
* asdf.adsf --> asdf.adsf
*/
-Maybe<std::u16string> getFullyQualifiedClassName(const StringPiece16& package,
- const StringPiece16& className);
-
+Maybe<std::string> getFullyQualifiedClassName(const StringPiece& package,
+ const StringPiece& className);
/**
* Makes a std::unique_ptr<> with the template parameter inferred by the compiler.
@@ -147,25 +134,17 @@
}
/**
- * Helper method to extract a string from a StringPool.
+ * Helper method to extract a UTF-16 string from a StringPool. If the string is stored as UTF-8,
+ * the conversion to UTF-16 happens within ResStringPool.
*/
-inline StringPiece16 getString(const android::ResStringPool& pool, size_t idx) {
- size_t len;
- const char16_t* str = pool.stringAt(idx, &len);
- if (str != nullptr) {
- return StringPiece16(str, len);
- }
- return StringPiece16();
-}
+StringPiece16 getString16(const android::ResStringPool& pool, size_t idx);
-inline StringPiece getString8(const android::ResStringPool& pool, size_t idx) {
- size_t len;
- const char* str = pool.string8At(idx, &len);
- if (str != nullptr) {
- return StringPiece(str, len);
- }
- return StringPiece();
-}
+/**
+ * Helper method to extract a UTF-8 string from a StringPool. If the string is stored as UTF-16,
+ * the conversion from UTF-16 to UTF-8 does not happen in ResStringPool and is done by this method,
+ * which maintains no state or cache. This means we must return an std::string copy.
+ */
+std::string getString(const android::ResStringPool& pool, size_t idx);
/**
* Checks that the Java string format contains no non-positional arguments (arguments without
@@ -173,24 +152,24 @@
* because translations may rearrange the order of the arguments in the string, which will
* break the string interpolation.
*/
-bool verifyJavaStringFormat(const StringPiece16& str);
+bool verifyJavaStringFormat(const StringPiece& str);
class StringBuilder {
public:
- StringBuilder& append(const StringPiece16& str);
- const std::u16string& str() const;
+ StringBuilder& append(const StringPiece& str);
+ const std::string& str() const;
const std::string& error() const;
operator bool() const;
private:
- std::u16string mStr;
+ std::string mStr;
bool mQuote = false;
bool mTrailingSpace = false;
bool mLastCharWasEscape = false;
std::string mError;
};
-inline const std::u16string& StringBuilder::str() const {
+inline const std::string& StringBuilder::str() const {
return mStr;
}
@@ -206,7 +185,7 @@
* Converts a UTF8 string to a UTF16 string.
*/
std::u16string utf8ToUtf16(const StringPiece& utf8);
-std::string utf16ToUtf8(const StringPiece16& utf8);
+std::string utf16ToUtf8(const StringPiece16& utf16);
/**
* Writes the entire BigBuffer to the output stream.
@@ -222,7 +201,6 @@
* A Tokenizer implemented as an iterable collection. It does not allocate
* any memory on the heap nor use standard containers.
*/
-template <typename Char>
class Tokenizer {
public:
class iterator {
@@ -231,96 +209,41 @@
iterator& operator=(const iterator&) = default;
iterator& operator++();
- BasicStringPiece<Char> operator*();
+
+ StringPiece operator*() {
+ return mToken;
+ }
bool operator==(const iterator& rhs) const;
bool operator!=(const iterator& rhs) const;
private:
- friend class Tokenizer<Char>;
+ friend class Tokenizer;
- iterator(BasicStringPiece<Char> s, Char sep, BasicStringPiece<Char> tok, bool end);
+ iterator(StringPiece s, char sep, StringPiece tok, bool end);
- BasicStringPiece<Char> mStr;
- Char mSeparator;
- BasicStringPiece<Char> mToken;
+ StringPiece mStr;
+ char mSeparator;
+ StringPiece mToken;
bool mEnd;
};
- Tokenizer(BasicStringPiece<Char> str, Char sep);
- iterator begin();
- iterator end();
+ Tokenizer(StringPiece str, char sep);
+
+ iterator begin() {
+ return mBegin;
+ }
+
+ iterator end() {
+ return mEnd;
+ }
private:
const iterator mBegin;
const iterator mEnd;
};
-template <typename Char>
-inline Tokenizer<Char> tokenize(BasicStringPiece<Char> str, Char sep) {
- return Tokenizer<Char>(str, sep);
-}
-
-template <typename Char>
-typename Tokenizer<Char>::iterator& Tokenizer<Char>::iterator::operator++() {
- const Char* start = mToken.end();
- const Char* end = mStr.end();
- if (start == end) {
- mEnd = true;
- mToken.assign(mToken.end(), 0);
- return *this;
- }
-
- start += 1;
- const Char* current = start;
- while (current != end) {
- if (*current == mSeparator) {
- mToken.assign(start, current - start);
- return *this;
- }
- ++current;
- }
- mToken.assign(start, end - start);
- return *this;
-}
-
-template <typename Char>
-inline BasicStringPiece<Char> Tokenizer<Char>::iterator::operator*() {
- return mToken;
-}
-
-template <typename Char>
-inline bool Tokenizer<Char>::iterator::operator==(const iterator& rhs) const {
- // We check equality here a bit differently.
- // We need to know that the addresses are the same.
- return mToken.begin() == rhs.mToken.begin() && mToken.end() == rhs.mToken.end() &&
- mEnd == rhs.mEnd;
-}
-
-template <typename Char>
-inline bool Tokenizer<Char>::iterator::operator!=(const iterator& rhs) const {
- return !(*this == rhs);
-}
-
-template <typename Char>
-inline Tokenizer<Char>::iterator::iterator(BasicStringPiece<Char> s, Char sep,
- BasicStringPiece<Char> tok, bool end) :
- mStr(s), mSeparator(sep), mToken(tok), mEnd(end) {
-}
-
-template <typename Char>
-inline typename Tokenizer<Char>::iterator Tokenizer<Char>::begin() {
- return mBegin;
-}
-
-template <typename Char>
-inline typename Tokenizer<Char>::iterator Tokenizer<Char>::end() {
- return mEnd;
-}
-
-template <typename Char>
-inline Tokenizer<Char>::Tokenizer(BasicStringPiece<Char> str, Char sep) :
- mBegin(++iterator(str, sep, BasicStringPiece<Char>(str.begin() - 1, 0), false)),
- mEnd(str, sep, BasicStringPiece<Char>(str.end(), 0), true) {
+inline Tokenizer tokenize(StringPiece str, char sep) {
+ return Tokenizer(str, sep);
}
inline uint16_t hostToDevice16(uint16_t value) {
@@ -348,8 +271,8 @@
*
* Returns true if successful.
*/
-bool extractResFilePathParts(const StringPiece16& path, StringPiece16* outPrefix,
- StringPiece16* outEntry, StringPiece16* outSuffix);
+bool extractResFilePathParts(const StringPiece& path, StringPiece* outPrefix,
+ StringPiece* outEntry, StringPiece* outSuffix);
} // namespace util
diff --git a/tools/aapt2/util/Util_test.cpp b/tools/aapt2/util/Util_test.cpp
index 1e0c7fa..0e27213 100644
--- a/tools/aapt2/util/Util_test.cpp
+++ b/tools/aapt2/util/Util_test.cpp
@@ -14,191 +14,191 @@
* limitations under the License.
*/
-#include "test/Common.h"
+#include "test/Test.h"
#include "util/StringPiece.h"
#include "util/Util.h"
-#include <gtest/gtest.h>
#include <string>
namespace aapt {
TEST(UtilTest, TrimOnlyWhitespace) {
- const std::u16string full = u"\n ";
+ const std::string full = "\n ";
- StringPiece16 trimmed = util::trimWhitespace(full);
+ StringPiece trimmed = util::trimWhitespace(full);
EXPECT_TRUE(trimmed.empty());
EXPECT_EQ(0u, trimmed.size());
}
TEST(UtilTest, StringEndsWith) {
- EXPECT_TRUE(util::stringEndsWith<char>("hello.xml", ".xml"));
+ EXPECT_TRUE(util::stringEndsWith("hello.xml", ".xml"));
}
TEST(UtilTest, StringStartsWith) {
- EXPECT_TRUE(util::stringStartsWith<char>("hello.xml", "he"));
+ EXPECT_TRUE(util::stringStartsWith("hello.xml", "he"));
}
TEST(UtilTest, StringBuilderSplitEscapeSequence) {
- EXPECT_EQ(StringPiece16(u"this is a new\nline."),
- util::StringBuilder().append(u"this is a new\\")
- .append(u"nline.")
+ EXPECT_EQ(StringPiece("this is a new\nline."),
+ util::StringBuilder().append("this is a new\\")
+ .append("nline.")
.str());
}
TEST(UtilTest, StringBuilderWhitespaceRemoval) {
- EXPECT_EQ(StringPiece16(u"hey guys this is so cool"),
- util::StringBuilder().append(u" hey guys ")
- .append(u" this is so cool ")
+ EXPECT_EQ(StringPiece("hey guys this is so cool"),
+ util::StringBuilder().append(" hey guys ")
+ .append(" this is so cool ")
.str());
- EXPECT_EQ(StringPiece16(u" wow, so many \t spaces. what?"),
- util::StringBuilder().append(u" \" wow, so many \t ")
- .append(u"spaces. \"what? ")
+ EXPECT_EQ(StringPiece(" wow, so many \t spaces. what?"),
+ util::StringBuilder().append(" \" wow, so many \t ")
+ .append("spaces. \"what? ")
.str());
- EXPECT_EQ(StringPiece16(u"where is the pie?"),
- util::StringBuilder().append(u" where \t ")
- .append(u" \nis the "" pie?")
+ EXPECT_EQ(StringPiece("where is the pie?"),
+ util::StringBuilder().append(" where \t ")
+ .append(" \nis the "" pie?")
.str());
}
TEST(UtilTest, StringBuilderEscaping) {
- EXPECT_EQ(StringPiece16(u"hey guys\n this \t is so\\ cool"),
- util::StringBuilder().append(u" hey guys\\n ")
- .append(u" this \\t is so\\\\ cool ")
+ EXPECT_EQ(StringPiece("hey guys\n this \t is so\\ cool"),
+ util::StringBuilder().append(" hey guys\\n ")
+ .append(" this \\t is so\\\\ cool ")
.str());
- EXPECT_EQ(StringPiece16(u"@?#\\\'"),
- util::StringBuilder().append(u"\\@\\?\\#\\\\\\'")
+ EXPECT_EQ(StringPiece("@?#\\\'"),
+ util::StringBuilder().append("\\@\\?\\#\\\\\\'")
.str());
}
TEST(UtilTest, StringBuilderMisplacedQuote) {
util::StringBuilder builder{};
- EXPECT_FALSE(builder.append(u"they're coming!"));
+ EXPECT_FALSE(builder.append("they're coming!"));
}
TEST(UtilTest, StringBuilderUnicodeCodes) {
- EXPECT_EQ(StringPiece16(u"\u00AF\u0AF0 woah"),
- util::StringBuilder().append(u"\\u00AF\\u0AF0 woah")
+ EXPECT_EQ(std::string("\u00AF\u0AF0 woah"),
+ util::StringBuilder().append("\\u00AF\\u0AF0 woah")
.str());
- EXPECT_FALSE(util::StringBuilder().append(u"\\u00 yo"));
+ EXPECT_FALSE(util::StringBuilder().append("\\u00 yo"));
}
TEST(UtilTest, TokenizeInput) {
- auto tokenizer = util::tokenize(StringPiece16(u"this| is|the|end"), u'|');
+ auto tokenizer = util::tokenize(StringPiece("this| is|the|end"), '|');
auto iter = tokenizer.begin();
- ASSERT_EQ(*iter, StringPiece16(u"this"));
+ ASSERT_EQ(*iter, StringPiece("this"));
++iter;
- ASSERT_EQ(*iter, StringPiece16(u" is"));
+ ASSERT_EQ(*iter, StringPiece(" is"));
++iter;
- ASSERT_EQ(*iter, StringPiece16(u"the"));
+ ASSERT_EQ(*iter, StringPiece("the"));
++iter;
- ASSERT_EQ(*iter, StringPiece16(u"end"));
+ ASSERT_EQ(*iter, StringPiece("end"));
++iter;
ASSERT_EQ(tokenizer.end(), iter);
}
TEST(UtilTest, TokenizeEmptyString) {
- auto tokenizer = util::tokenize(StringPiece16(u""), u'|');
+ auto tokenizer = util::tokenize(StringPiece(""), '|');
auto iter = tokenizer.begin();
ASSERT_NE(tokenizer.end(), iter);
- ASSERT_EQ(StringPiece16(), *iter);
+ ASSERT_EQ(StringPiece(), *iter);
++iter;
ASSERT_EQ(tokenizer.end(), iter);
}
TEST(UtilTest, TokenizeAtEnd) {
- auto tokenizer = util::tokenize(StringPiece16(u"one."), u'.');
+ auto tokenizer = util::tokenize(StringPiece("one."), '.');
auto iter = tokenizer.begin();
- ASSERT_EQ(*iter, StringPiece16(u"one"));
+ ASSERT_EQ(*iter, StringPiece("one"));
++iter;
ASSERT_NE(iter, tokenizer.end());
- ASSERT_EQ(*iter, StringPiece16());
+ ASSERT_EQ(*iter, StringPiece());
}
TEST(UtilTest, IsJavaClassName) {
- EXPECT_TRUE(util::isJavaClassName(u"android.test.Class"));
- EXPECT_TRUE(util::isJavaClassName(u"android.test.Class$Inner"));
- EXPECT_TRUE(util::isJavaClassName(u"android_test.test.Class"));
- EXPECT_TRUE(util::isJavaClassName(u"_android_.test._Class_"));
- EXPECT_FALSE(util::isJavaClassName(u"android.test.$Inner"));
- EXPECT_FALSE(util::isJavaClassName(u"android.test.Inner$"));
- EXPECT_FALSE(util::isJavaClassName(u".test.Class"));
- EXPECT_FALSE(util::isJavaClassName(u"android"));
+ EXPECT_TRUE(util::isJavaClassName("android.test.Class"));
+ EXPECT_TRUE(util::isJavaClassName("android.test.Class$Inner"));
+ EXPECT_TRUE(util::isJavaClassName("android_test.test.Class"));
+ EXPECT_TRUE(util::isJavaClassName("_android_.test._Class_"));
+ EXPECT_FALSE(util::isJavaClassName("android.test.$Inner"));
+ EXPECT_FALSE(util::isJavaClassName("android.test.Inner$"));
+ EXPECT_FALSE(util::isJavaClassName(".test.Class"));
+ EXPECT_FALSE(util::isJavaClassName("android"));
}
TEST(UtilTest, IsJavaPackageName) {
- EXPECT_TRUE(util::isJavaPackageName(u"android"));
- EXPECT_TRUE(util::isJavaPackageName(u"android.test"));
- EXPECT_TRUE(util::isJavaPackageName(u"android.test_thing"));
- EXPECT_FALSE(util::isJavaPackageName(u"_android"));
- EXPECT_FALSE(util::isJavaPackageName(u"android_"));
- EXPECT_FALSE(util::isJavaPackageName(u"android."));
- EXPECT_FALSE(util::isJavaPackageName(u".android"));
- EXPECT_FALSE(util::isJavaPackageName(u"android._test"));
- EXPECT_FALSE(util::isJavaPackageName(u".."));
+ EXPECT_TRUE(util::isJavaPackageName("android"));
+ EXPECT_TRUE(util::isJavaPackageName("android.test"));
+ EXPECT_TRUE(util::isJavaPackageName("android.test_thing"));
+ EXPECT_FALSE(util::isJavaPackageName("_android"));
+ EXPECT_FALSE(util::isJavaPackageName("android_"));
+ EXPECT_FALSE(util::isJavaPackageName("android."));
+ EXPECT_FALSE(util::isJavaPackageName(".android"));
+ EXPECT_FALSE(util::isJavaPackageName("android._test"));
+ EXPECT_FALSE(util::isJavaPackageName(".."));
}
TEST(UtilTest, FullyQualifiedClassName) {
- Maybe<std::u16string> res = util::getFullyQualifiedClassName(u"android", u"asdf");
+ Maybe<std::string> res = util::getFullyQualifiedClassName("android", ".asdf");
+ AAPT_ASSERT_TRUE(res);
+ EXPECT_EQ(res.value(), "android.asdf");
+
+ res = util::getFullyQualifiedClassName("android", ".a.b");
+ AAPT_ASSERT_TRUE(res);
+ EXPECT_EQ(res.value(), "android.a.b");
+
+ res = util::getFullyQualifiedClassName("android", "a.b");
+ AAPT_ASSERT_TRUE(res);
+ EXPECT_EQ(res.value(), "a.b");
+
+ res = util::getFullyQualifiedClassName("", "a.b");
+ AAPT_ASSERT_TRUE(res);
+ EXPECT_EQ(res.value(), "a.b");
+
+ res = util::getFullyQualifiedClassName("android", "Class");
+ AAPT_ASSERT_TRUE(res);
+ EXPECT_EQ(res.value(), "android.Class");
+
+ res = util::getFullyQualifiedClassName("", "");
AAPT_ASSERT_FALSE(res);
- res = util::getFullyQualifiedClassName(u"android", u".asdf");
- AAPT_ASSERT_TRUE(res);
- EXPECT_EQ(res.value(), u"android.asdf");
-
- res = util::getFullyQualifiedClassName(u"android", u".a.b");
- AAPT_ASSERT_TRUE(res);
- EXPECT_EQ(res.value(), u"android.a.b");
-
- res = util::getFullyQualifiedClassName(u"android", u"a.b");
- AAPT_ASSERT_TRUE(res);
- EXPECT_EQ(res.value(), u"a.b");
-
- res = util::getFullyQualifiedClassName(u"", u"a.b");
- AAPT_ASSERT_TRUE(res);
- EXPECT_EQ(res.value(), u"a.b");
-
- res = util::getFullyQualifiedClassName(u"", u"");
- AAPT_ASSERT_FALSE(res);
-
- res = util::getFullyQualifiedClassName(u"android", u"./Apple");
+ res = util::getFullyQualifiedClassName("android", "./Apple");
AAPT_ASSERT_FALSE(res);
}
TEST(UtilTest, ExtractResourcePathComponents) {
- StringPiece16 prefix, entry, suffix;
- ASSERT_TRUE(util::extractResFilePathParts(u"res/xml-sw600dp/entry.xml", &prefix, &entry,
+ StringPiece prefix, entry, suffix;
+ ASSERT_TRUE(util::extractResFilePathParts("res/xml-sw600dp/entry.xml", &prefix, &entry,
&suffix));
- EXPECT_EQ(prefix, u"res/xml-sw600dp/");
- EXPECT_EQ(entry, u"entry");
- EXPECT_EQ(suffix, u".xml");
+ EXPECT_EQ(prefix, "res/xml-sw600dp/");
+ EXPECT_EQ(entry, "entry");
+ EXPECT_EQ(suffix, ".xml");
- ASSERT_TRUE(util::extractResFilePathParts(u"res/xml-sw600dp/entry.9.png", &prefix, &entry,
+ ASSERT_TRUE(util::extractResFilePathParts("res/xml-sw600dp/entry.9.png", &prefix, &entry,
&suffix));
- EXPECT_EQ(prefix, u"res/xml-sw600dp/");
- EXPECT_EQ(entry, u"entry");
- EXPECT_EQ(suffix, u".9.png");
+ EXPECT_EQ(prefix, "res/xml-sw600dp/");
+ EXPECT_EQ(entry, "entry");
+ EXPECT_EQ(suffix, ".9.png");
- EXPECT_FALSE(util::extractResFilePathParts(u"AndroidManifest.xml", &prefix, &entry, &suffix));
- EXPECT_FALSE(util::extractResFilePathParts(u"res/.xml", &prefix, &entry, &suffix));
+ EXPECT_FALSE(util::extractResFilePathParts("AndroidManifest.xml", &prefix, &entry, &suffix));
+ EXPECT_FALSE(util::extractResFilePathParts("res/.xml", &prefix, &entry, &suffix));
- ASSERT_TRUE(util::extractResFilePathParts(u"res//.", &prefix, &entry, &suffix));
- EXPECT_EQ(prefix, u"res//");
- EXPECT_EQ(entry, u"");
- EXPECT_EQ(suffix, u".");
+ ASSERT_TRUE(util::extractResFilePathParts("res//.", &prefix, &entry, &suffix));
+ EXPECT_EQ(prefix, "res//");
+ EXPECT_EQ(entry, "");
+ EXPECT_EQ(suffix, ".");
}
TEST(UtilTest, VerifyJavaStringFormat) {
- ASSERT_TRUE(util::verifyJavaStringFormat(u"%09.34f"));
- ASSERT_TRUE(util::verifyJavaStringFormat(u"%9$.34f %8$"));
- ASSERT_TRUE(util::verifyJavaStringFormat(u"%% %%"));
- ASSERT_FALSE(util::verifyJavaStringFormat(u"%09$f %f"));
- ASSERT_FALSE(util::verifyJavaStringFormat(u"%09f %08s"));
+ ASSERT_TRUE(util::verifyJavaStringFormat("%09.34f"));
+ ASSERT_TRUE(util::verifyJavaStringFormat("%9$.34f %8$"));
+ ASSERT_TRUE(util::verifyJavaStringFormat("%% %%"));
+ ASSERT_FALSE(util::verifyJavaStringFormat("%09$f %f"));
+ ASSERT_FALSE(util::verifyJavaStringFormat("%09f %08s"));
}
} // namespace aapt
diff --git a/tools/aapt2/xml/XmlActionExecutor.cpp b/tools/aapt2/xml/XmlActionExecutor.cpp
index 0ef67ea..745079c 100644
--- a/tools/aapt2/xml/XmlActionExecutor.cpp
+++ b/tools/aapt2/xml/XmlActionExecutor.cpp
@@ -57,8 +57,7 @@
for (Element* childEl : el->getChildElements()) {
if (childEl->namespaceUri.empty()) {
- std::map<std::u16string, XmlNodeAction>::const_iterator iter =
- mMap.find(childEl->name);
+ std::map<std::string, XmlNodeAction>::const_iterator iter = mMap.find(childEl->name);
if (iter != mMap.end()) {
error |= !iter->second.execute(policy, diag, childEl);
continue;
@@ -91,7 +90,7 @@
}
if (el->namespaceUri.empty()) {
- std::map<std::u16string, XmlNodeAction>::const_iterator iter = mMap.find(el->name);
+ std::map<std::string, XmlNodeAction>::const_iterator iter = mMap.find(el->name);
if (iter != mMap.end()) {
return iter->second.execute(policy, &sourceDiag, el);
}
diff --git a/tools/aapt2/xml/XmlActionExecutor.h b/tools/aapt2/xml/XmlActionExecutor.h
index 36b94db..cad508c 100644
--- a/tools/aapt2/xml/XmlActionExecutor.h
+++ b/tools/aapt2/xml/XmlActionExecutor.h
@@ -55,7 +55,7 @@
* Find or create a child XmlNodeAction that will be performed for the child element
* with the name `name`.
*/
- XmlNodeAction& operator[](const std::u16string& name) {
+ XmlNodeAction& operator[](const std::string& name) {
return mMap[name];
}
@@ -70,7 +70,7 @@
bool execute(XmlActionExecutorPolicy policy, SourcePathDiagnostics* diag, Element* el) const;
- std::map<std::u16string, XmlNodeAction> mMap;
+ std::map<std::string, XmlNodeAction> mMap;
std::vector<ActionFuncWithDiag> mActions;
};
@@ -86,7 +86,7 @@
* Find or create a root XmlNodeAction that will be performed for the root XML element
* with the name `name`.
*/
- XmlNodeAction& operator[](const std::u16string& name) {
+ XmlNodeAction& operator[](const std::string& name) {
return mMap[name];
}
@@ -97,7 +97,7 @@
bool execute(XmlActionExecutorPolicy policy, IDiagnostics* diag, XmlResource* doc) const;
private:
- std::map<std::u16string, XmlNodeAction> mMap;
+ std::map<std::string, XmlNodeAction> mMap;
DISALLOW_COPY_AND_ASSIGN(XmlActionExecutor);
};
diff --git a/tools/aapt2/xml/XmlActionExecutor_test.cpp b/tools/aapt2/xml/XmlActionExecutor_test.cpp
index ebf287a..106e856 100644
--- a/tools/aapt2/xml/XmlActionExecutor_test.cpp
+++ b/tools/aapt2/xml/XmlActionExecutor_test.cpp
@@ -22,8 +22,8 @@
TEST(XmlActionExecutorTest, BuildsAccessibleNestedPattern) {
XmlActionExecutor executor;
- XmlNodeAction& manifestAction = executor[u"manifest"];
- XmlNodeAction& applicationAction = manifestAction[u"application"];
+ XmlNodeAction& manifestAction = executor["manifest"];
+ XmlNodeAction& applicationAction = manifestAction["application"];
Element* manifestEl = nullptr;
manifestAction.action([&](Element* manifest) -> bool {
@@ -42,15 +42,15 @@
StdErrDiagnostics diag;
ASSERT_TRUE(executor.execute(XmlActionExecutorPolicy::None, &diag, doc.get()));
ASSERT_NE(nullptr, manifestEl);
- EXPECT_EQ(std::u16string(u"manifest"), manifestEl->name);
+ EXPECT_EQ(std::string("manifest"), manifestEl->name);
ASSERT_NE(nullptr, applicationEl);
- EXPECT_EQ(std::u16string(u"application"), applicationEl->name);
+ EXPECT_EQ(std::string("application"), applicationEl->name);
}
TEST(XmlActionExecutorTest, FailsWhenUndefinedHierarchyExists) {
XmlActionExecutor executor;
- executor[u"manifest"][u"application"];
+ executor["manifest"]["application"];
std::unique_ptr<XmlResource> doc = test::buildXmlDom(
"<manifest><application /><activity /></manifest>");
diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp
index 0ce333a..39bd5bf 100644
--- a/tools/aapt2/xml/XmlDom.cpp
+++ b/tools/aapt2/xml/XmlDom.cpp
@@ -33,13 +33,13 @@
struct Stack {
std::unique_ptr<xml::Node> root;
std::stack<xml::Node*> nodeStack;
- std::u16string pendingComment;
+ std::string pendingComment;
};
/**
* Extracts the namespace and name of an expanded element or attribute name.
*/
-static void splitName(const char* name, std::u16string* outNs, std::u16string* outName) {
+static void splitName(const char* name, std::string* outNs, std::string* outName) {
const char* p = name;
while (*p != 0 && *p != kXmlNamespaceSep) {
p++;
@@ -47,10 +47,10 @@
if (*p == 0) {
outNs->clear();
- *outName = util::utf8ToUtf16(name);
+ *outName = StringPiece(name).toString();
} else {
- *outNs = util::utf8ToUtf16(StringPiece(name, (p - name)));
- *outName = util::utf8ToUtf16(p + 1);
+ *outNs = StringPiece(name, (p - name)).toString();
+ *outName = StringPiece(p + 1).toString();
}
}
@@ -76,11 +76,11 @@
std::unique_ptr<Namespace> ns = util::make_unique<Namespace>();
if (prefix) {
- ns->namespacePrefix = util::utf8ToUtf16(prefix);
+ ns->namespacePrefix = StringPiece(prefix).toString();
}
if (uri) {
- ns->namespaceUri = util::utf8ToUtf16(uri);
+ ns->namespaceUri = StringPiece(uri).toString();
}
addToStack(stack, parser, std::move(ns));
@@ -109,7 +109,7 @@
while (*attrs) {
Attribute attribute;
splitName(*attrs++, &attribute.namespaceUri, &attribute.name);
- attribute.value = util::utf8ToUtf16(*attrs++);
+ attribute.value = StringPiece(*attrs++).toString();
// Insert in sorted order.
auto iter = std::lower_bound(el->attributes.begin(), el->attributes.end(), attribute,
@@ -144,14 +144,14 @@
if (!currentParent->children.empty()) {
Node* lastChild = currentParent->children.back().get();
if (Text* text = nodeCast<Text>(lastChild)) {
- text->text += util::utf8ToUtf16(StringPiece(s, len));
+ text->text += StringPiece(s, len).toString();
return;
}
}
}
std::unique_ptr<Text> text = util::make_unique<Text>();
- text->text = util::utf8ToUtf16(StringPiece(s, len));
+ text->text = StringPiece(s, len).toString();
addToStack(stack, parser, std::move(text));
}
@@ -162,7 +162,7 @@
if (!stack->pendingComment.empty()) {
stack->pendingComment += '\n';
}
- stack->pendingComment += util::utf8ToUtf16(comment);
+ stack->pendingComment += comment;
}
std::unique_ptr<XmlResource> inflate(std::istream* in, IDiagnostics* diag, const Source& source) {
@@ -209,17 +209,17 @@
size_t len;
const char16_t* str16 = parser->getAttributeNamespace(i, &len);
if (str16) {
- attr.namespaceUri.assign(str16, len);
+ attr.namespaceUri = util::utf16ToUtf8(StringPiece16(str16, len));
}
str16 = parser->getAttributeName(i, &len);
if (str16) {
- attr.name.assign(str16, len);
+ attr.name = util::utf16ToUtf8(StringPiece16(str16, len));
}
str16 = parser->getAttributeStringValue(i, &len);
if (str16) {
- attr.value.assign(str16, len);
+ attr.value = util::utf16ToUtf8(StringPiece16(str16, len));
}
el->attributes.push_back(std::move(attr));
}
@@ -250,12 +250,12 @@
size_t len;
const char16_t* str16 = tree.getNamespacePrefix(&len);
if (str16) {
- node->namespacePrefix.assign(str16, len);
+ node->namespacePrefix = util::utf16ToUtf8(StringPiece16(str16, len));
}
str16 = tree.getNamespaceUri(&len);
if (str16) {
- node->namespaceUri.assign(str16, len);
+ node->namespaceUri = util::utf16ToUtf8(StringPiece16(str16, len));
}
newNode = std::move(node);
break;
@@ -266,12 +266,12 @@
size_t len;
const char16_t* str16 = tree.getElementNamespace(&len);
if (str16) {
- node->namespaceUri.assign(str16, len);
+ node->namespaceUri = util::utf16ToUtf8(StringPiece16(str16, len));
}
str16 = tree.getElementName(&len);
if (str16) {
- node->name.assign(str16, len);
+ node->name = util::utf16ToUtf8(StringPiece16(str16, len));
}
copyAttributes(node.get(), &tree);
@@ -285,7 +285,7 @@
size_t len;
const char16_t* str16 = tree.getText(&len);
if (str16) {
- node->text.assign(str16, len);
+ node->text = util::utf16ToUtf8(StringPiece16(str16, len));
}
newNode = std::move(node);
break;
@@ -347,7 +347,7 @@
children.push_back(std::move(child));
}
-Attribute* Element::findAttribute(const StringPiece16& ns, const StringPiece16& name) {
+Attribute* Element::findAttribute(const StringPiece& ns, const StringPiece& name) {
for (auto& attr : attributes) {
if (ns == attr.namespaceUri && name == attr.name) {
return &attr;
@@ -356,13 +356,13 @@
return nullptr;
}
-Element* Element::findChild(const StringPiece16& ns, const StringPiece16& name) {
+Element* Element::findChild(const StringPiece& ns, const StringPiece& name) {
return findChildWithAttribute(ns, name, {}, {}, {});
}
-Element* Element::findChildWithAttribute(const StringPiece16& ns, const StringPiece16& name,
- const StringPiece16& attrNs, const StringPiece16& attrName,
- const StringPiece16& attrValue) {
+Element* Element::findChildWithAttribute(const StringPiece& ns, const StringPiece& name,
+ const StringPiece& attrNs, const StringPiece& attrName,
+ const StringPiece& attrValue) {
for (auto& childNode : children) {
Node* child = childNode.get();
while (nodeCast<Namespace>(child)) {
@@ -422,7 +422,7 @@
}
Maybe<ExtractedPackage> PackageAwareVisitor::transformPackageAlias(
- const StringPiece16& alias, const StringPiece16& localPackage) const {
+ const StringPiece& alias, const StringPiece& localPackage) const {
if (alias.empty()) {
return ExtractedPackage{ localPackage.toString(), false /* private */ };
}
diff --git a/tools/aapt2/xml/XmlDom.h b/tools/aapt2/xml/XmlDom.h
index b374d20..d083d82 100644
--- a/tools/aapt2/xml/XmlDom.h
+++ b/tools/aapt2/xml/XmlDom.h
@@ -41,7 +41,7 @@
Node* parent = nullptr;
size_t lineNumber = 0;
size_t columnNumber = 0;
- std::u16string comment;
+ std::string comment;
std::vector<std::unique_ptr<Node>> children;
virtual ~Node() = default;
@@ -63,8 +63,8 @@
* A Namespace XML node. Can only have one child.
*/
struct Namespace : public BaseNode<Namespace> {
- std::u16string namespacePrefix;
- std::u16string namespaceUri;
+ std::string namespacePrefix;
+ std::string namespaceUri;
};
struct AaptAttribute {
@@ -76,9 +76,9 @@
* An XML attribute.
*/
struct Attribute {
- std::u16string namespaceUri;
- std::u16string name;
- std::u16string value;
+ std::string namespaceUri;
+ std::string name;
+ std::string value;
Maybe<AaptAttribute> compiledAttribute;
std::unique_ptr<Item> compiledValue;
@@ -88,16 +88,16 @@
* An Element XML node.
*/
struct Element : public BaseNode<Element> {
- std::u16string namespaceUri;
- std::u16string name;
+ std::string namespaceUri;
+ std::string name;
std::vector<Attribute> attributes;
- Attribute* findAttribute(const StringPiece16& ns, const StringPiece16& name);
- xml::Element* findChild(const StringPiece16& ns, const StringPiece16& name);
- xml::Element* findChildWithAttribute(const StringPiece16& ns, const StringPiece16& name,
- const StringPiece16& attrNs,
- const StringPiece16& attrName,
- const StringPiece16& attrValue);
+ Attribute* findAttribute(const StringPiece& ns, const StringPiece& name);
+ xml::Element* findChild(const StringPiece& ns, const StringPiece& name);
+ xml::Element* findChildWithAttribute(const StringPiece& ns, const StringPiece& name,
+ const StringPiece& attrNs,
+ const StringPiece& attrName,
+ const StringPiece& attrValue);
std::vector<xml::Element*> getChildElements();
};
@@ -105,7 +105,7 @@
* A Text (CDATA) XML node. Can not have any children.
*/
struct Text : public BaseNode<Text> {
- std::u16string text;
+ std::string text;
};
/**
@@ -175,7 +175,7 @@
class PackageAwareVisitor : public Visitor, public IPackageDeclStack {
private:
struct PackageDecl {
- std::u16string prefix;
+ std::string prefix;
ExtractedPackage package;
};
@@ -186,7 +186,7 @@
void visit(Namespace* ns) override;
Maybe<ExtractedPackage> transformPackageAlias(
- const StringPiece16& alias, const StringPiece16& localPackage) const override;
+ const StringPiece& alias, const StringPiece& localPackage) const override;
};
// Implementations
diff --git a/tools/aapt2/xml/XmlDom_test.cpp b/tools/aapt2/xml/XmlDom_test.cpp
index 431ee2c..1909f75 100644
--- a/tools/aapt2/xml/XmlDom_test.cpp
+++ b/tools/aapt2/xml/XmlDom_test.cpp
@@ -43,8 +43,8 @@
xml::Namespace* ns = xml::nodeCast<xml::Namespace>(doc->root.get());
ASSERT_NE(ns, nullptr);
- EXPECT_EQ(ns->namespaceUri, u"http://schemas.android.com/apk/res/android");
- EXPECT_EQ(ns->namespacePrefix, u"android");
+ EXPECT_EQ(ns->namespaceUri, xml::kSchemaAndroid);
+ EXPECT_EQ(ns->namespacePrefix, "android");
}
} // namespace aapt
diff --git a/tools/aapt2/xml/XmlPullParser.cpp b/tools/aapt2/xml/XmlPullParser.cpp
index 323ec05..4a944f1 100644
--- a/tools/aapt2/xml/XmlPullParser.cpp
+++ b/tools/aapt2/xml/XmlPullParser.cpp
@@ -98,7 +98,7 @@
return mLastError;
}
-const std::u16string& XmlPullParser::getComment() const {
+const std::string& XmlPullParser::getComment() const {
return mEventQueue.front().data1;
}
@@ -110,14 +110,14 @@
return mEventQueue.front().depth;
}
-const std::u16string& XmlPullParser::getText() const {
+const std::string& XmlPullParser::getText() const {
if (getEvent() != Event::kText) {
return mEmpty;
}
return mEventQueue.front().data1;
}
-const std::u16string& XmlPullParser::getNamespacePrefix() const {
+const std::string& XmlPullParser::getNamespacePrefix() const {
const Event currentEvent = getEvent();
if (currentEvent != Event::kStartNamespace && currentEvent != Event::kEndNamespace) {
return mEmpty;
@@ -125,7 +125,7 @@
return mEventQueue.front().data1;
}
-const std::u16string& XmlPullParser::getNamespaceUri() const {
+const std::string& XmlPullParser::getNamespaceUri() const {
const Event currentEvent = getEvent();
if (currentEvent != Event::kStartNamespace && currentEvent != Event::kEndNamespace) {
return mEmpty;
@@ -134,7 +134,7 @@
}
Maybe<ExtractedPackage> XmlPullParser::transformPackageAlias(
- const StringPiece16& alias, const StringPiece16& localPackage) const {
+ const StringPiece& alias, const StringPiece& localPackage) const {
if (alias.empty()) {
return ExtractedPackage{ localPackage.toString(), false /* private */ };
}
@@ -152,7 +152,7 @@
return {};
}
-const std::u16string& XmlPullParser::getElementNamespace() const {
+const std::string& XmlPullParser::getElementNamespace() const {
const Event currentEvent = getEvent();
if (currentEvent != Event::kStartElement && currentEvent != Event::kEndElement) {
return mEmpty;
@@ -160,7 +160,7 @@
return mEventQueue.front().data1;
}
-const std::u16string& XmlPullParser::getElementName() const {
+const std::string& XmlPullParser::getElementName() const {
const Event currentEvent = getEvent();
if (currentEvent != Event::kStartElement && currentEvent != Event::kEndElement) {
return mEmpty;
@@ -186,31 +186,31 @@
/**
* Extracts the namespace and name of an expanded element or attribute name.
*/
-static void splitName(const char* name, std::u16string& outNs, std::u16string& outName) {
+static void splitName(const char* name, std::string& outNs, std::string& outName) {
const char* p = name;
while (*p != 0 && *p != kXmlNamespaceSep) {
p++;
}
if (*p == 0) {
- outNs = std::u16string();
- outName = util::utf8ToUtf16(name);
+ outNs = std::string();
+ outName = name;
} else {
- outNs = util::utf8ToUtf16(StringPiece(name, (p - name)));
- outName = util::utf8ToUtf16(p + 1);
+ outNs = StringPiece(name, (p - name)).toString();
+ outName = p + 1;
}
}
void XMLCALL XmlPullParser::startNamespaceHandler(void* userData, const char* prefix,
const char* uri) {
XmlPullParser* parser = reinterpret_cast<XmlPullParser*>(userData);
- std::u16string namespaceUri = uri != nullptr ? util::utf8ToUtf16(uri) : std::u16string();
+ std::string namespaceUri = uri != nullptr ? uri : std::string();
parser->mNamespaceUris.push(namespaceUri);
parser->mEventQueue.push(EventData{
Event::kStartNamespace,
XML_GetCurrentLineNumber(parser->mParser),
parser->mDepth++,
- prefix != nullptr ? util::utf8ToUtf16(prefix) : std::u16string(),
+ prefix != nullptr ? prefix : std::string(),
namespaceUri
});
}
@@ -227,7 +227,7 @@
while (*attrs) {
Attribute attribute;
splitName(*attrs++, attribute.namespaceUri, attribute.name);
- attribute.value = util::utf8ToUtf16(*attrs++);
+ attribute.value = *attrs++;
// Insert in sorted order.
auto iter = std::lower_bound(data.attributes.begin(), data.attributes.end(), attribute);
@@ -245,7 +245,7 @@
Event::kText,
XML_GetCurrentLineNumber(parser->mParser),
parser->mDepth,
- util::utf8ToUtf16(StringPiece(s, len))
+ StringPiece(s, len).toString()
});
}
@@ -268,7 +268,7 @@
Event::kEndNamespace,
XML_GetCurrentLineNumber(parser->mParser),
--(parser->mDepth),
- prefix != nullptr ? util::utf8ToUtf16(prefix) : std::u16string(),
+ prefix != nullptr ? prefix : std::string(),
parser->mNamespaceUris.top()
});
parser->mNamespaceUris.pop();
@@ -281,22 +281,22 @@
Event::kComment,
XML_GetCurrentLineNumber(parser->mParser),
parser->mDepth,
- util::utf8ToUtf16(comment)
+ comment
});
}
-Maybe<StringPiece16> findAttribute(const XmlPullParser* parser, const StringPiece16& name) {
- auto iter = parser->findAttribute(u"", name);
+Maybe<StringPiece> findAttribute(const XmlPullParser* parser, const StringPiece& name) {
+ auto iter = parser->findAttribute("", name);
if (iter != parser->endAttributes()) {
- return StringPiece16(util::trimWhitespace(iter->value));
+ return StringPiece(util::trimWhitespace(iter->value));
}
return {};
}
-Maybe<StringPiece16> findNonEmptyAttribute(const XmlPullParser* parser, const StringPiece16& name) {
- auto iter = parser->findAttribute(u"", name);
+Maybe<StringPiece> findNonEmptyAttribute(const XmlPullParser* parser, const StringPiece& name) {
+ auto iter = parser->findAttribute("", name);
if (iter != parser->endAttributes()) {
- StringPiece16 trimmed = util::trimWhitespace(iter->value);
+ StringPiece trimmed = util::trimWhitespace(iter->value);
if (!trimmed.empty()) {
return trimmed;
}
diff --git a/tools/aapt2/xml/XmlPullParser.h b/tools/aapt2/xml/XmlPullParser.h
index 7e7070e..ee51b36 100644
--- a/tools/aapt2/xml/XmlPullParser.h
+++ b/tools/aapt2/xml/XmlPullParser.h
@@ -80,28 +80,28 @@
// These are available for all nodes.
//
- const std::u16string& getComment() const;
+ const std::string& getComment() const;
size_t getLineNumber() const;
size_t getDepth() const;
/**
* Returns the character data for a Text event.
*/
- const std::u16string& getText() const;
+ const std::string& getText() const;
//
// Namespace prefix and URI are available for StartNamespace and EndNamespace.
//
- const std::u16string& getNamespacePrefix() const;
- const std::u16string& getNamespaceUri() const;
+ const std::string& getNamespacePrefix() const;
+ const std::string& getNamespaceUri() const;
//
// These are available for StartElement and EndElement.
//
- const std::u16string& getElementNamespace() const;
- const std::u16string& getElementName() const;
+ const std::string& getElementNamespace() const;
+ const std::string& getElementName() const;
/*
* Uses the current stack of namespaces to resolve the package. Eg:
@@ -115,7 +115,7 @@
* 'package' will be set to 'defaultPackage'.
*/
Maybe<ExtractedPackage> transformPackageAlias(
- const StringPiece16& alias, const StringPiece16& localPackage) const override;
+ const StringPiece& alias, const StringPiece& localPackage) const override;
//
// Remaining methods are for retrieving information about attributes
@@ -126,9 +126,9 @@
//
struct Attribute {
- std::u16string namespaceUri;
- std::u16string name;
- std::u16string value;
+ std::string namespaceUri;
+ std::string name;
+ std::string value;
int compare(const Attribute& rhs) const;
bool operator<(const Attribute& rhs) const;
@@ -141,7 +141,7 @@
const_iterator beginAttributes() const;
const_iterator endAttributes() const;
size_t getAttributeCount() const;
- const_iterator findAttribute(StringPiece16 namespaceUri, StringPiece16 name) const;
+ const_iterator findAttribute(StringPiece namespaceUri, StringPiece name) const;
private:
static void XMLCALL startNamespaceHandler(void* userData, const char* prefix, const char* uri);
@@ -155,8 +155,8 @@
Event event;
size_t lineNumber;
size_t depth;
- std::u16string data1;
- std::u16string data2;
+ std::string data1;
+ std::string data2;
std::vector<Attribute> attributes;
};
@@ -165,12 +165,12 @@
char mBuffer[16384];
std::queue<EventData> mEventQueue;
std::string mLastError;
- const std::u16string mEmpty;
+ const std::string mEmpty;
size_t mDepth;
- std::stack<std::u16string> mNamespaceUris;
+ std::stack<std::string> mNamespaceUris;
struct PackageDecl {
- std::u16string prefix;
+ std::string prefix;
ExtractedPackage package;
};
std::vector<PackageDecl> mPackageAliases;
@@ -179,13 +179,13 @@
/**
* Finds the attribute in the current element within the global namespace.
*/
-Maybe<StringPiece16> findAttribute(const XmlPullParser* parser, const StringPiece16& name);
+Maybe<StringPiece> findAttribute(const XmlPullParser* parser, const StringPiece& name);
/**
* Finds the attribute in the current element within the global namespace. The attribute's value
* must not be the empty string.
*/
-Maybe<StringPiece16> findNonEmptyAttribute(const XmlPullParser* parser, const StringPiece16& name);
+Maybe<StringPiece> findNonEmptyAttribute(const XmlPullParser* parser, const StringPiece& name);
//
// Implementation
@@ -270,12 +270,12 @@
return compare(rhs) != 0;
}
-inline XmlPullParser::const_iterator XmlPullParser::findAttribute(StringPiece16 namespaceUri,
- StringPiece16 name) const {
+inline XmlPullParser::const_iterator XmlPullParser::findAttribute(StringPiece namespaceUri,
+ StringPiece name) const {
const auto endIter = endAttributes();
const auto iter = std::lower_bound(beginAttributes(), endIter,
- std::pair<StringPiece16, StringPiece16>(namespaceUri, name),
- [](const Attribute& attr, const std::pair<StringPiece16, StringPiece16>& rhs) -> bool {
+ std::pair<StringPiece, StringPiece>(namespaceUri, name),
+ [](const Attribute& attr, const std::pair<StringPiece, StringPiece>& rhs) -> bool {
int cmp = attr.namespaceUri.compare(0, attr.namespaceUri.size(),
rhs.first.data(), rhs.first.size());
if (cmp < 0) return true;
diff --git a/tools/aapt2/xml/XmlPullParser_test.cpp b/tools/aapt2/xml/XmlPullParser_test.cpp
index 8fa2c6d..2c1fdc7 100644
--- a/tools/aapt2/xml/XmlPullParser_test.cpp
+++ b/tools/aapt2/xml/XmlPullParser_test.cpp
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+#include "test/Test.h"
#include "util/StringPiece.h"
#include "xml/XmlPullParser.h"
-#include <gtest/gtest.h>
#include <sstream>
namespace aapt {
@@ -32,21 +32,21 @@
ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthOuter));
EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
- EXPECT_EQ(StringPiece16(u"a"), StringPiece16(parser.getElementName()));
+ EXPECT_EQ(StringPiece("a"), StringPiece(parser.getElementName()));
const size_t depthA = parser.getDepth();
ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthA));
EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
- EXPECT_EQ(StringPiece16(u"b"), StringPiece16(parser.getElementName()));
+ EXPECT_EQ(StringPiece("b"), StringPiece(parser.getElementName()));
const size_t depthB = parser.getDepth();
ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthB));
EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
- EXPECT_EQ(StringPiece16(u"c"), StringPiece16(parser.getElementName()));
+ EXPECT_EQ(StringPiece("c"), StringPiece(parser.getElementName()));
ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthB));
EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
- EXPECT_EQ(StringPiece16(u"e"), StringPiece16(parser.getElementName()));
+ EXPECT_EQ(StringPiece("e"), StringPiece(parser.getElementName()));
ASSERT_FALSE(xml::XmlPullParser::nextChildNode(&parser, depthOuter));
EXPECT_EQ(xml::XmlPullParser::Event::kEndDocument, parser.getEvent());
diff --git a/tools/aapt2/xml/XmlUtil.cpp b/tools/aapt2/xml/XmlUtil.cpp
index ab9f544..0e9d005 100644
--- a/tools/aapt2/xml/XmlUtil.cpp
+++ b/tools/aapt2/xml/XmlUtil.cpp
@@ -23,19 +23,25 @@
namespace aapt {
namespace xml {
-Maybe<ExtractedPackage> extractPackageFromNamespace(const std::u16string& namespaceUri) {
- if (util::stringStartsWith<char16_t>(namespaceUri, kSchemaPublicPrefix)) {
- StringPiece16 schemaPrefix = kSchemaPublicPrefix;
- StringPiece16 package = namespaceUri;
+std::string buildPackageNamespace(const StringPiece& package) {
+ std::string result = kSchemaPublicPrefix;
+ result.append(package.data(), package.size());
+ return result;
+}
+
+Maybe<ExtractedPackage> extractPackageFromNamespace(const std::string& namespaceUri) {
+ if (util::stringStartsWith(namespaceUri, kSchemaPublicPrefix)) {
+ StringPiece schemaPrefix = kSchemaPublicPrefix;
+ StringPiece package = namespaceUri;
package = package.substr(schemaPrefix.size(), package.size() - schemaPrefix.size());
if (package.empty()) {
return {};
}
return ExtractedPackage{ package.toString(), false /* isPrivate */ };
- } else if (util::stringStartsWith<char16_t>(namespaceUri, kSchemaPrivatePrefix)) {
- StringPiece16 schemaPrefix = kSchemaPrivatePrefix;
- StringPiece16 package = namespaceUri;
+ } else if (util::stringStartsWith(namespaceUri, kSchemaPrivatePrefix)) {
+ StringPiece schemaPrefix = kSchemaPrivatePrefix;
+ StringPiece package = namespaceUri;
package = package.substr(schemaPrefix.size(), package.size() - schemaPrefix.size());
if (package.empty()) {
return {};
@@ -43,13 +49,13 @@
return ExtractedPackage{ package.toString(), true /* isPrivate */ };
} else if (namespaceUri == kSchemaAuto) {
- return ExtractedPackage{ std::u16string(), true /* isPrivate */ };
+ return ExtractedPackage{ std::string(), true /* isPrivate */ };
}
return {};
}
void transformReferenceFromNamespace(IPackageDeclStack* declStack,
- const StringPiece16& localPackage, Reference* inRef) {
+ const StringPiece& localPackage, Reference* inRef) {
if (inRef->name) {
if (Maybe<ExtractedPackage> transformedPackage =
declStack->transformPackageAlias(inRef->name.value().package, localPackage)) {
diff --git a/tools/aapt2/xml/XmlUtil.h b/tools/aapt2/xml/XmlUtil.h
index 98e5520..f0d59b7 100644
--- a/tools/aapt2/xml/XmlUtil.h
+++ b/tools/aapt2/xml/XmlUtil.h
@@ -25,10 +25,10 @@
namespace aapt {
namespace xml {
-constexpr const char16_t* kSchemaAuto = u"http://schemas.android.com/apk/res-auto";
-constexpr const char16_t* kSchemaPublicPrefix = u"http://schemas.android.com/apk/res/";
-constexpr const char16_t* kSchemaPrivatePrefix = u"http://schemas.android.com/apk/prv/res/";
-constexpr const char16_t* kSchemaAndroid = u"http://schemas.android.com/apk/res/android";
+constexpr const char* kSchemaAuto = "http://schemas.android.com/apk/res-auto";
+constexpr const char* kSchemaPublicPrefix = "http://schemas.android.com/apk/res/";
+constexpr const char* kSchemaPrivatePrefix = "http://schemas.android.com/apk/prv/res/";
+constexpr const char* kSchemaAndroid = "http://schemas.android.com/apk/res/android";
/**
* Result of extracting a package name from a namespace URI declaration.
@@ -38,7 +38,7 @@
* The name of the package. This can be the empty string, which means that the package
* should be assumed to be the package being compiled.
*/
- std::u16string package;
+ std::string package;
/**
* True if the package's private namespace was declared. This means that private resources
@@ -55,7 +55,14 @@
* Special case: if namespaceUri is http://schemas.android.com/apk/res-auto,
* returns an empty package name.
*/
-Maybe<ExtractedPackage> extractPackageFromNamespace(const std::u16string& namespaceUri);
+Maybe<ExtractedPackage> extractPackageFromNamespace(const std::string& namespaceUri);
+
+/**
+ * Returns an XML Android namespace for the given package of the form:
+ *
+ * http://schemas.android.com/apk/res/<package>
+ */
+std::string buildPackageNamespace(const StringPiece& package);
/**
* Interface representing a stack of XML namespace declarations. When looking up the package
@@ -68,7 +75,7 @@
* Returns an ExtractedPackage struct if the alias given corresponds with a package declaration.
*/
virtual Maybe<ExtractedPackage> transformPackageAlias(
- const StringPiece16& alias, const StringPiece16& localPackage) const = 0;
+ const StringPiece& alias, const StringPiece& localPackage) const = 0;
};
/**
@@ -77,7 +84,7 @@
* the package declaration was private.
*/
void transformReferenceFromNamespace(IPackageDeclStack* declStack,
- const StringPiece16& localPackage, Reference* inRef);
+ const StringPiece& localPackage, Reference* inRef);
} // namespace xml
} // namespace aapt
diff --git a/tools/aapt2/xml/XmlUtil_test.cpp b/tools/aapt2/xml/XmlUtil_test.cpp
index 319e770..cbeb8bc 100644
--- a/tools/aapt2/xml/XmlUtil_test.cpp
+++ b/tools/aapt2/xml/XmlUtil_test.cpp
@@ -14,40 +14,37 @@
* limitations under the License.
*/
-#include "test/Common.h"
+#include "test/Test.h"
#include "xml/XmlUtil.h"
-#include <gtest/gtest.h>
-
namespace aapt {
TEST(XmlUtilTest, ExtractPackageFromNamespace) {
- AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"com.android"));
- AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"http://schemas.android.com/apk"));
- AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res"));
- AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res/"));
- AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(
- u"http://schemas.android.com/apk/prv/res/"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace("com.android"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace("http://schemas.android.com/apk"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace("http://schemas.android.com/apk/res"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace("http://schemas.android.com/apk/res/"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace("http://schemas.android.com/apk/prv/res/"));
Maybe<xml::ExtractedPackage> p =
- xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res/a");
+ xml::extractPackageFromNamespace("http://schemas.android.com/apk/res/a");
AAPT_ASSERT_TRUE(p);
- EXPECT_EQ(std::u16string(u"a"), p.value().package);
+ EXPECT_EQ(std::string("a"), p.value().package);
EXPECT_FALSE(p.value().privateNamespace);
- p = xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/prv/res/android");
+ p = xml::extractPackageFromNamespace("http://schemas.android.com/apk/prv/res/android");
AAPT_ASSERT_TRUE(p);
- EXPECT_EQ(std::u16string(u"android"), p.value().package);
+ EXPECT_EQ(std::string("android"), p.value().package);
EXPECT_TRUE(p.value().privateNamespace);
- p = xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/prv/res/com.test");
+ p = xml::extractPackageFromNamespace("http://schemas.android.com/apk/prv/res/com.test");
AAPT_ASSERT_TRUE(p);
- EXPECT_EQ(std::u16string(u"com.test"), p.value().package);
+ EXPECT_EQ(std::string("com.test"), p.value().package);
EXPECT_TRUE(p.value().privateNamespace);
- p = xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res-auto");
+ p = xml::extractPackageFromNamespace("http://schemas.android.com/apk/res-auto");
AAPT_ASSERT_TRUE(p);
- EXPECT_EQ(std::u16string(), p.value().package);
+ EXPECT_EQ(std::string(), p.value().package);
EXPECT_TRUE(p.value().privateNamespace);
}
diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_lint.py
index 2e717a6..072a4a7 100755
--- a/tools/fonts/fontchain_lint.py
+++ b/tools/fonts/fontchain_lint.py
@@ -256,13 +256,20 @@
def check_emoji_coverage(all_emoji, equivalent_emoji):
+ emoji_font = get_emoji_font()
+ check_emoji_font_coverage(emoji_font, all_emoji, equivalent_emoji)
+
+
+def get_emoji_font():
emoji_fonts = [
record.font for record in _fallback_chain
if 'Zsye' in record.scripts]
assert len(emoji_fonts) == 1, 'There are %d emoji fonts.' % len(emoji_fonts)
- emoji_font = emoji_fonts[0]
- coverage = get_emoji_map(emoji_font)
+ return emoji_fonts[0]
+
+def check_emoji_font_coverage(emoji_font, all_emoji, equivalent_emoji):
+ coverage = get_emoji_map(emoji_font)
for sequence in all_emoji:
assert sequence in coverage, (
'%s is not supported in the emoji font.' % printable(sequence))
@@ -322,15 +329,9 @@
# Noto does not have monochrome glyphs for Unicode 7.0 wingdings and
# webdings yet.
missing_text_chars -= _chars_by_age['7.0']
- # TODO: Remove these after b/26113320 is fixed
- missing_text_chars -= {
- 0x263A, # WHITE SMILING FACE
- 0x270C, # VICTORY HAND
- 0x2744, # SNOWFLAKE
- 0x2764, # HEAVY BLACK HEART
- }
assert missing_text_chars == set(), (
- 'Text style version of some emoji characters are missing: ' + repr(missing_text_chars))
+ 'Text style version of some emoji characters are missing: ' +
+ repr(missing_text_chars))
# Setting reverse to true returns a dictionary that maps the values to sets of
@@ -350,7 +351,7 @@
if not line:
continue
- chars, prop = line.split(';')
+ chars, prop = line.split(';')[:2]
chars = chars.strip()
prop = prop.strip()
@@ -422,7 +423,8 @@
flag_sequence('GF'), flag_sequence('GP'), flag_sequence('GS'),
flag_sequence('MF'), flag_sequence('MQ'), flag_sequence('NC'),
flag_sequence('PM'), flag_sequence('RE'), flag_sequence('TF'),
- flag_sequence('WF'), flag_sequence('XK'), flag_sequence('YT'),
+ flag_sequence('UN'), flag_sequence('WF'), flag_sequence('XK'),
+ flag_sequence('YT'),
})
EQUIVALENT_FLAGS = {
@@ -435,6 +437,22 @@
COMBINING_KEYCAP = 0x20E3
+# Characters that Android defaults to emoji style, different from the recommendations in UTR #51
+ANDROID_DEFAULT_EMOJI = frozenset({
+ 0x2600, # BLACK SUN WITH RAYS
+ 0x2601, # CLOUD
+ 0x260E, # BLACK TELEPHONE
+ 0x261D, # WHITE UP POINTING INDEX
+ 0x263A, # WHITE SMILING FACE
+ 0x2660, # BLACK SPADE SUIT
+ 0x2663, # BLACK CLUB SUIT
+ 0x2665, # BLACK HEART SUIT
+ 0x2666, # BLACK DIAMOND SUIT
+ 0x270C, # VICTORY HAND
+ 0x2744, # SNOWFLAKE
+ 0x2764, # HEAVY BLACK HEART
+})
+
LEGACY_ANDROID_EMOJI = {
0xFE4E5: flag_sequence('JP'),
0xFE4E6: flag_sequence('US'),
@@ -468,6 +486,21 @@
(0x1F468, 0x200D, 0x1F469, 0x200D, 0x1F466): 0x1F46A,
}
+
+def is_fitzpatrick_modifier(cp):
+ return 0x1F3FB <= cp <= 0x1F3FF
+
+
+def reverse_emoji(seq):
+ rev = list(reversed(seq))
+ # if there are fitzpatrick modifiers in the sequence, keep them after
+ # the emoji they modify
+ for i in xrange(1, len(rev)):
+ if is_fitzpatrick_modifier(rev[i-1]):
+ rev[i], rev[i-1] = rev[i-1], rev[i]
+ return tuple(rev)
+
+
def compute_expected_emoji():
equivalent_emoji = {}
sequence_pieces = set()
@@ -485,7 +518,7 @@
sequence_pieces.update(sequence)
# Add reverse of all emoji ZWJ sequences, which are added to the fonts
# as a workaround to get the sequences work in RTL text.
- reversed_seq = tuple(reversed(sequence))
+ reversed_seq = reverse_emoji(sequence)
all_sequences.add(reversed_seq)
equivalent_emoji[reversed_seq] = sequence
@@ -504,6 +537,7 @@
set(LEGACY_ANDROID_EMOJI.keys()))
default_emoji = (
_emoji_properties['Emoji_Presentation'] |
+ ANDROID_DEFAULT_EMOJI |
all_sequences |
set(LEGACY_ANDROID_EMOJI.keys()))
@@ -520,14 +554,29 @@
return all_emoji, default_emoji, equivalent_emoji
+def check_vertical_metrics():
+ for record in _fallback_chain:
+ if record.name in ['sans-serif', 'sans-serif-condensed']:
+ font = open_font(record.font)
+ assert font['head'].yMax == 2163 and font['head'].yMin == -555, (
+ 'yMax and yMin of %s do not match expected values.' % (record.font,))
+
+ if record.name in ['sans-serif', 'sans-serif-condensed', 'serif', 'monospace']:
+ font = open_font(record.font)
+ assert font['hhea'].ascent == 1900 and font['hhea'].descent == -500, (
+ 'ascent and descent of %s do not match expected values.' % (record.font,))
+
+
def main():
- target_out = sys.argv[1]
global _fonts_dir
+ target_out = sys.argv[1]
_fonts_dir = path.join(target_out, 'fonts')
fonts_xml_path = path.join(target_out, 'etc', 'fonts.xml')
parse_fonts_xml(fonts_xml_path)
+ check_vertical_metrics()
+
hyphens_dir = path.join(target_out, 'usr', 'hyphen-data')
check_hyphens(hyphens_dir)
diff --git a/tools/layoutlib/.idea/inspectionProfiles/Project_Default.xml b/tools/layoutlib/.idea/inspectionProfiles/Project_Default.xml
index 3681f2a..74fa549 100644
--- a/tools/layoutlib/.idea/inspectionProfiles/Project_Default.xml
+++ b/tools/layoutlib/.idea/inspectionProfiles/Project_Default.xml
@@ -11,7 +11,6 @@
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
- <inspection_tool class="ToArrayCallWithZeroLengthArrayArgument" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">
<option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />
<option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />
diff --git a/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java b/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java
index ea320c7..c3d4cef6 100644
--- a/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java
@@ -45,6 +45,7 @@
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
+import android.util.LruCache;
import android.util.TypedValue;
import android.view.ViewGroup.LayoutParams;
@@ -58,6 +59,9 @@
public class Resources_Delegate {
private static boolean[] mPlatformResourceFlag = new boolean[1];
+ // TODO: This cache is cleared every time a render session is disposed. Look into making this
+ // more long lived.
+ private static LruCache<String, Drawable.ConstantState> sDrawableCache = new LruCache<>(50);
public static Resources initSystem(BridgeContext context,
AssetManager assets,
@@ -75,6 +79,7 @@
* would prevent us from unloading the library.
*/
public static void disposeSystem() {
+ sDrawableCache.evictAll();
Resources.mSystem.mContext = null;
Resources.mSystem.mLayoutlibCallback = null;
Resources.mSystem = null;
@@ -137,9 +142,23 @@
@LayoutlibDelegate
static Drawable getDrawable(Resources resources, int id, Theme theme) {
Pair<String, ResourceValue> value = getResourceValue(resources, id, mPlatformResourceFlag);
-
if (value != null) {
- return ResourceHelper.getDrawable(value.getSecond(), resources.mContext, theme);
+ String key = value.getSecond().getValue();
+
+ Drawable.ConstantState constantState = key != null ? sDrawableCache.get(key) : null;
+ Drawable drawable;
+ if (constantState != null) {
+ drawable = constantState.newDrawable(resources, theme);
+ } else {
+ drawable =
+ ResourceHelper.getDrawable(value.getSecond(), resources.mContext, theme);
+
+ if (key != null) {
+ sDrawableCache.put(key, drawable.getConstantState());
+ }
+ }
+
+ return drawable;
}
// id was not found or not resolved. Throw a NotFoundException.
diff --git a/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java
index 2b969cc..3e81e83 100644
--- a/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java
@@ -70,6 +70,13 @@
private static final DelegateManager<VNativeObject> sPathManager =
new DelegateManager<>(VNativeObject.class);
+ private static long addNativeObject(VNativeObject object) {
+ long ptr = sPathManager.addNewDelegate(object);
+ object.setNativePtr(ptr);
+
+ return ptr;
+ }
+
/**
* Obtains styled attributes from the theme, if available, or unstyled resources if the theme is
* null.
@@ -91,16 +98,14 @@
@LayoutlibDelegate
static long nCreateTree(long rootGroupPtr) {
- VGroup_Delegate rootGroup = VNativeObject.getDelegate(rootGroupPtr);
- return sPathManager.addNewDelegate(new VPathRenderer_Delegate(rootGroup));
+ return addNativeObject(new VPathRenderer_Delegate(rootGroupPtr));
}
@LayoutlibDelegate
static long nCreateTreeFromCopy(long rendererToCopyPtr, long rootGroupPtr) {
- VGroup_Delegate rootGroup = VNativeObject.getDelegate(rootGroupPtr);
VPathRenderer_Delegate rendererToCopy = VNativeObject.getDelegate(rendererToCopyPtr);
- return sPathManager.addNewDelegate(new VPathRenderer_Delegate(rendererToCopy,
- rootGroup));
+ return addNativeObject(new VPathRenderer_Delegate(rendererToCopy,
+ rootGroupPtr));
}
@LayoutlibDelegate
@@ -157,14 +162,13 @@
@LayoutlibDelegate
static long nCreateFullPath() {
- return sPathManager.addNewDelegate(new VFullPath_Delegate());
+ return addNativeObject(new VFullPath_Delegate());
}
@LayoutlibDelegate
static long nCreateFullPath(long nativeFullPathPtr) {
VFullPath_Delegate original = VNativeObject.getDelegate(nativeFullPathPtr);
-
- return sPathManager.addNewDelegate(new VFullPath_Delegate(original));
+ return addNativeObject(new VFullPath_Delegate(original));
}
@LayoutlibDelegate
@@ -230,25 +234,24 @@
@LayoutlibDelegate
static long nCreateClipPath() {
- return sPathManager.addNewDelegate(new VClipPath_Delegate());
+ return addNativeObject(new VClipPath_Delegate());
}
@LayoutlibDelegate
static long nCreateClipPath(long clipPathPtr) {
VClipPath_Delegate original = VNativeObject.getDelegate(clipPathPtr);
- return sPathManager.addNewDelegate(new VClipPath_Delegate(original));
+ return addNativeObject(new VClipPath_Delegate(original));
}
@LayoutlibDelegate
static long nCreateGroup() {
- return sPathManager.addNewDelegate(new VGroup_Delegate());
+ return addNativeObject(new VGroup_Delegate());
}
@LayoutlibDelegate
static long nCreateGroup(long groupPtr) {
VGroup_Delegate original = VNativeObject.getDelegate(groupPtr);
- return sPathManager.addNewDelegate(
- new VGroup_Delegate(original, new ArrayMap<String, Object>()));
+ return addNativeObject(new VGroup_Delegate(original, new ArrayMap<>()));
}
@LayoutlibDelegate
@@ -501,7 +504,9 @@
* not need it
* </ol>
*/
- interface VNativeObject {
+ abstract static class VNativeObject {
+ long mNativePtr = 0;
+
@NonNull
static <T> T getDelegate(long nativePtr) {
//noinspection unchecked
@@ -511,7 +516,17 @@
return vNativeObject;
}
- void setName(String name);
+ abstract void setName(String name);
+
+ void setNativePtr(long nativePtr) {
+ mNativePtr = nativePtr;
+ }
+
+ /**
+ * Method to explicitly dispose native objects
+ */
+ void dispose() {
+ }
}
private static class VClipPath_Delegate extends VPath_Delegate {
@@ -781,7 +796,7 @@
}
}
- static class VGroup_Delegate implements VNativeObject {
+ static class VGroup_Delegate extends VNativeObject {
// This constants need to be kept in sync with their definitions in VectorDrawable.Group
private static final int ROTATE_INDEX = 0;
private static final int PIVOT_X_INDEX = 1;
@@ -967,9 +982,28 @@
public void setName(String name) {
mGroupName = name;
}
+
+ @Override
+ protected void dispose() {
+ mChildren.stream().filter(child -> child instanceof VNativeObject).forEach(child
+ -> {
+ VNativeObject nativeObject = (VNativeObject) child;
+ if (nativeObject.mNativePtr != 0) {
+ sPathManager.removeJavaReferenceFor(nativeObject.mNativePtr);
+ nativeObject.mNativePtr = 0;
+ }
+ nativeObject.dispose();
+ });
+ mChildren.clear();
+ }
+
+ @Override
+ protected void finalize() throws Throwable {
+ super.finalize();
+ }
}
- public static class VPath_Delegate implements VNativeObject {
+ public static class VPath_Delegate extends VNativeObject {
protected PathParser_Delegate.PathDataNode[] mNodes = null;
String mPathName;
int mChangingConfigurations;
@@ -981,7 +1015,7 @@
public VPath_Delegate(VPath_Delegate copy) {
mPathName = copy.mPathName;
mChangingConfigurations = copy.mChangingConfigurations;
- mNodes = PathParser_Delegate.deepCopyNodes(copy.mNodes);
+ mNodes = copy.mNodes != null ? PathParser_Delegate.deepCopyNodes(copy.mNodes) : null;
}
public void toPath(Path path) {
@@ -1009,9 +1043,14 @@
PathParser_Delegate.updateNodes(mNodes, nodes);
}
}
+
+ @Override
+ void dispose() {
+ mNodes = null;
+ }
}
- static class VPathRenderer_Delegate implements VNativeObject {
+ static class VPathRenderer_Delegate extends VNativeObject {
/* Right now the internal data structure is organized as a tree.
* Each node can be a group node, or a path.
* A group node can have groups or paths as children, but a path node has
@@ -1029,7 +1068,7 @@
private final Path mPath;
private final Path mRenderPath;
private final Matrix mFinalPathMatrix = new Matrix();
- private final VGroup_Delegate mRootGroup;
+ private final long mRootGroupPtr;
private float mViewportWidth = 0;
private float mViewportHeight = 0;
private float mRootAlpha = 1.0f;
@@ -1037,15 +1076,15 @@
private Paint mFillPaint;
private PathMeasure mPathMeasure;
- private VPathRenderer_Delegate(VGroup_Delegate rootGroup) {
- mRootGroup = rootGroup;
+ private VPathRenderer_Delegate(long rootGroupPtr) {
+ mRootGroupPtr = rootGroupPtr;
mPath = new Path();
mRenderPath = new Path();
}
private VPathRenderer_Delegate(VPathRenderer_Delegate rendererToCopy,
- VGroup_Delegate rootGroup) {
- this(rootGroup);
+ long rootGroupPtr) {
+ this(rootGroupPtr);
mViewportWidth = rendererToCopy.mViewportWidth;
mViewportHeight = rendererToCopy.mViewportHeight;
mRootAlpha = rendererToCopy.mRootAlpha;
@@ -1087,7 +1126,7 @@
public void draw(long canvasPtr, long filterPtr, int w, int h) {
// Traverse the tree in pre-order to draw.
- drawGroupTree(mRootGroup, Matrix.IDENTITY_MATRIX, canvasPtr, w, h, filterPtr);
+ drawGroupTree(VNativeObject.getDelegate(mRootGroupPtr), Matrix.IDENTITY_MATRIX, canvasPtr, w, h, filterPtr);
}
private void drawPath(VGroup_Delegate VGroup, VPath_Delegate VPath, long canvasPtr,
@@ -1227,5 +1266,17 @@
@Override
public void setName(String name) {
}
+
+ @Override
+ protected void finalize() throws Throwable {
+ // The mRootGroupPtr is not explicitly freed by anything in the VectorDrawable so we
+ // need to free it here.
+ VNativeObject nativeObject = sPathManager.getDelegate(mRootGroupPtr);
+ sPathManager.removeJavaReferenceFor(mRootGroupPtr);
+ assert nativeObject != null;
+ nativeObject.dispose();
+
+ super.finalize();
+ }
}
}
diff --git a/tools/layoutlib/bridge/src/android/preference/BridgePreferenceInflater.java b/tools/layoutlib/bridge/src/android/preference/BridgePreferenceInflater.java
index 4f00b5d..aa393a9 100644
--- a/tools/layoutlib/bridge/src/android/preference/BridgePreferenceInflater.java
+++ b/tools/layoutlib/bridge/src/android/preference/BridgePreferenceInflater.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.util.AttributeSet;
+import android.view.InflateException;
public class BridgePreferenceInflater extends PreferenceInflater {
@@ -42,7 +43,15 @@
viewKey = ((BridgeXmlBlockParser) attrs).getViewCookie();
}
- Preference preference = super.onCreateItem(name, attrs);
+ Preference preference = null;
+ try {
+ preference = super.onCreateItem(name, attrs);
+ } catch (ClassNotFoundException | InflateException exception) {
+ // name is probably not a valid preference type
+ if ("SwitchPreferenceCompat".equals(name)) {
+ preference = super.onCreateItem("SwitchPreference", attrs);
+ }
+ }
if (viewKey != null && bc != null) {
bc.addCookie(preference, viewKey);
diff --git a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
index 3667f58..1f72106 100644
--- a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
+++ b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
@@ -75,6 +75,14 @@
* being an AppCompat theme.
*/
private boolean mLoadAppCompatViews;
+ /**
+ * This set contains the framework views that have an AppCompat version but failed to load.
+ * This might happen because not all widgets are contained in all versions of the support
+ * library.
+ * This will help us to avoid trying to load the AppCompat version multiple times if it
+ * doesn't exist.
+ */
+ private Set<String> mFailedAppCompatViews = new HashSet<>();
private boolean mIsInMerge = false;
private ResourceReference mResourceReference;
private Map<View, String> mOpenDrawerLayouts;
@@ -136,15 +144,18 @@
View view = null;
try {
- if (mLoadAppCompatViews && APPCOMPAT_VIEWS.contains(name)) {
+ if (mLoadAppCompatViews
+ && APPCOMPAT_VIEWS.contains(name)
+ && !mFailedAppCompatViews.contains(name)) {
// We are using an AppCompat theme so try to load the appcompat views
- view = loadCustomView(APPCOMPAT_WIDGET_PREFIX + name, attrs);
+ view = loadCustomView(APPCOMPAT_WIDGET_PREFIX + name, attrs, true);
if (view == null) {
- mLoadAppCompatViews = false; // Do not try anymore
+ mFailedAppCompatViews.add(name); // Do not try this one anymore
}
- } else {
+ }
+ if (view == null) {
// First try to find a class using the default Android prefixes
for (String prefix : sClassPrefixList) {
try {
@@ -297,7 +308,15 @@
return null;
}
- private View loadCustomView(String name, AttributeSet attrs) throws Exception {
+ /**
+ * Instantiates the given view name and returns the instance. If the view doesn't exist, a
+ * MockView or null might be returned.
+ * @param name the custom view name
+ * @param attrs the {@link AttributeSet} to be passed to the view constructor
+ * @param silent if true, errors while loading the view won't be reported and, if the view
+ * doesn't exist, null will be returned.
+ */
+ private View loadCustomView(String name, AttributeSet attrs, boolean silent) throws Exception {
if (mLayoutlibCallback != null) {
// first get the classname in case it's not the node name
if (name.equals("view")) {
@@ -309,8 +328,9 @@
mConstructorArgs[1] = attrs;
- Object customView = mLayoutlibCallback.loadView(name, mConstructorSignature,
- mConstructorArgs);
+ Object customView = silent ?
+ mLayoutlibCallback.loadClass(name, mConstructorSignature, mConstructorArgs)
+ : mLayoutlibCallback.loadView(name, mConstructorSignature, mConstructorArgs);
if (customView instanceof View) {
return (View)customView;
@@ -320,6 +340,10 @@
return null;
}
+ private View loadCustomView(String name, AttributeSet attrs) throws Exception {
+ return loadCustomView(name, attrs, false);
+ }
+
private void setupViewInContext(View view, AttributeSet attrs) {
Context context = getContext();
context = getBaseContext(context);
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 04a59bc..a1d2b0f 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -78,7 +78,8 @@
@Override
public void addAppToken(int arg0, IApplicationToken arg1, int arg2, int arg3, int arg4,
boolean arg5, boolean arg6, int arg7, int arg8, boolean arg9, boolean arg10,
- Rect arg11, Configuration arg12, int arg13, boolean arg14, boolean arg15, int arg16)
+ Rect arg11, Configuration arg12, int arg13, boolean arg14, boolean arg15, int arg16,
+ int arg17, boolean arg18)
throws RemoteException {
// TODO Auto-generated method stub
}
@@ -325,7 +326,7 @@
@Override
public void setAppTask(IBinder arg0, int arg1, int arg2, Rect arg3, Configuration arg4,
- int arg5, boolean arg6)
+ int arg5, boolean arg6, boolean arg7)
throws RemoteException {
// TODO Auto-generated method stub
}
@@ -350,7 +351,12 @@
}
@Override
- public void notifyAppStopped(IBinder token, boolean stopped) throws RemoteException {
+ public void notifyAppResumed(IBinder token, boolean wasStopped) throws RemoteException {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public void notifyAppStopped(IBinder token) throws RemoteException {
// TODO Auto-generated method stub
}
@@ -589,4 +595,9 @@
@Override
public void removeWallpaperInputConsumer() throws RemoteException {}
+
+ @Override
+ public Bitmap screenshotWallpaper() throws RemoteException {
+ return null;
+ }
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 72ac4c3..8d93b7f 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1657,6 +1657,12 @@
// pass
}
+ @Override
+ public void sendBroadcastAsUser(Intent intent, UserHandle user,
+ String receiverPermission, Bundle options) {
+ // pass
+ }
+
public void sendBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp) {
// pass
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
index b3ed9e1..cef622b 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
@@ -712,6 +712,11 @@
}
@Override
+ public void setComponentEnabledSettingAsUser(ComponentName componentName, int newState,
+ int flags, int userId) {
+ }
+
+ @Override
public int getComponentEnabledSetting(ComponentName componentName) {
return 0;
}
@@ -721,6 +726,11 @@
}
@Override
+ public void setApplicationEnabledSettingAsUser(String packageName, int newState, int flags,
+ int userId) {
+ }
+
+ @Override
public int getApplicationEnabledSetting(String packageName) {
return 0;
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java
index d432120..ab27819 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java
@@ -21,6 +21,7 @@
import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.android.RenderParamsFlags;
+import com.android.layoutlib.bridge.util.ReflectionUtils;
import com.android.layoutlib.bridge.util.ReflectionUtils.ReflectionException;
import android.annotation.NonNull;
@@ -116,7 +117,7 @@
private static void setProperty(@NonNull Object object, @NonNull String propertyClassName,
@NonNull Object propertyValue, @NonNull String propertySetter)
throws ReflectionException {
- Class<?> propertyClass = getClassInstance(propertyValue, propertyClassName);
+ Class<?> propertyClass = ReflectionUtils.getClassInstance(propertyValue, propertyClassName);
setProperty(object, propertyClass, propertyValue, propertySetter);
}
@@ -126,22 +127,4 @@
invoke(getMethod(object.getClass(), propertySetter, propertyClass), object, propertyValue);
}
- /**
- * Looks through the class hierarchy of {@code object} at runtime and returns the class matching
- * the name {@code className}.
- * <p/>
- * This is used when we cannot use Class.forName() since the class we want was loaded from a
- * different ClassLoader.
- */
- @NonNull
- private static Class<?> getClassInstance(@NonNull Object object, @NonNull String className) {
- Class<?> superClass = object.getClass();
- while (superClass != null) {
- if (className.equals(superClass.getName())) {
- return superClass;
- }
- superClass = superClass.getSuperclass();
- }
- throw new RuntimeException("invalid object/classname combination.");
- }
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/SupportPreferencesUtil.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/SupportPreferencesUtil.java
new file mode 100644
index 0000000..6ad9efc
--- /dev/null
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/SupportPreferencesUtil.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.layoutlib.bridge.android.support;
+
+import com.android.ide.common.rendering.api.LayoutlibCallback;
+import com.android.ide.common.rendering.api.RenderResources;
+import com.android.ide.common.rendering.api.ResourceValue;
+import com.android.ide.common.rendering.api.StyleResourceValue;
+import com.android.layoutlib.bridge.android.BridgeContext;
+import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;
+import com.android.layoutlib.bridge.util.ReflectionUtils.ReflectionException;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.ScrollView;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+import static com.android.layoutlib.bridge.util.ReflectionUtils.getAccessibleMethod;
+import static com.android.layoutlib.bridge.util.ReflectionUtils.getClassInstance;
+import static com.android.layoutlib.bridge.util.ReflectionUtils.getMethod;
+import static com.android.layoutlib.bridge.util.ReflectionUtils.invoke;
+
+/**
+ * Class with utility methods to instantiate Preferences provided by the support library.
+ * This class uses reflection to access the support preference objects so it heavily depends on
+ * the API being stable.
+ */
+public class SupportPreferencesUtil {
+ private static final String PREFERENCE_PKG = "android.support.v7.preference";
+ private static final String PREFERENCE_MANAGER = PREFERENCE_PKG + ".PreferenceManager";
+ private static final String PREFERENCE_GROUP = PREFERENCE_PKG + ".PreferenceGroup";
+ private static final String PREFERENCE_GROUP_ADAPTER =
+ PREFERENCE_PKG + ".PreferenceGroupAdapter";
+ private static final String PREFERENCE_INFLATER = PREFERENCE_PKG + ".PreferenceInflater";
+
+ private SupportPreferencesUtil() {
+ }
+
+ @NonNull
+ private static Object instantiateClass(@NonNull LayoutlibCallback callback,
+ @NonNull String className, @Nullable Class[] constructorSignature,
+ @Nullable Object[] constructorArgs) throws ReflectionException {
+ try {
+ Object instance = callback.loadClass(className, constructorSignature, constructorArgs);
+ if (instance == null) {
+ throw new ClassNotFoundException(className + " class not found");
+ }
+ return instance;
+ } catch (ClassNotFoundException e) {
+ throw new ReflectionException(e);
+ }
+ }
+
+ @NonNull
+ private static Object createPreferenceGroupAdapter(@NonNull LayoutlibCallback callback,
+ @NonNull Object preferenceScreen) throws ReflectionException {
+ Class<?> preferenceGroupClass = getClassInstance(preferenceScreen, PREFERENCE_GROUP);
+
+ return instantiateClass(callback, PREFERENCE_GROUP_ADAPTER,
+ new Class[]{preferenceGroupClass}, new Object[]{preferenceScreen});
+ }
+
+ @NonNull
+ private static Object createInflatedPreference(@NonNull LayoutlibCallback callback,
+ @NonNull Context context, @NonNull XmlPullParser parser, @NonNull Object preferenceScreen,
+ @NonNull Object preferenceManager) throws ReflectionException {
+ Class<?> preferenceGroupClass = getClassInstance(preferenceScreen, PREFERENCE_GROUP);
+ Object preferenceInflater = instantiateClass(callback, PREFERENCE_INFLATER,
+ new Class[]{Context.class, preferenceManager.getClass()},
+ new Object[]{context, preferenceManager});
+ Object inflatedPreference =
+ invoke(getAccessibleMethod(preferenceInflater.getClass(), "inflate",
+ XmlPullParser.class, preferenceGroupClass), preferenceInflater, parser,
+ null);
+
+ if (inflatedPreference == null) {
+ throw new ReflectionException("inflate method returned null");
+ }
+
+ return inflatedPreference;
+ }
+
+ /**
+ * Returns a themed wrapper context of {@link BridgeContext} with the theme specified in
+ * ?attr/preferenceTheme applied to it.
+ */
+ @Nullable
+ private static Context getThemedContext(@NonNull BridgeContext bridgeContext) {
+ RenderResources resources = bridgeContext.getRenderResources();
+ ResourceValue preferenceTheme = resources.findItemInTheme("preferenceTheme", false);
+
+ if (preferenceTheme != null) {
+ // resolve it, if needed.
+ preferenceTheme = resources.resolveResValue(preferenceTheme);
+ }
+ if (preferenceTheme instanceof StyleResourceValue) {
+ int styleId = bridgeContext.getDynamicIdByStyle(((StyleResourceValue) preferenceTheme));
+ if (styleId != 0) {
+ return new ContextThemeWrapper(bridgeContext, styleId);
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Returns a {@link LinearLayout} containing all the UI widgets representing the preferences
+ * passed in the group adapter.
+ */
+ @Nullable
+ private static LinearLayout setUpPreferencesListView(@NonNull BridgeContext bridgeContext,
+ @NonNull Context themedContext, @NonNull ArrayList<Object> viewCookie,
+ @NonNull Object preferenceGroupAdapter) throws ReflectionException {
+ // Setup the LinearLayout that will contain the preferences
+ LinearLayout listView = new LinearLayout(themedContext);
+ listView.setOrientation(LinearLayout.VERTICAL);
+ listView.setLayoutParams(
+ new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+ if (!viewCookie.isEmpty()) {
+ bridgeContext.addViewKey(listView, viewCookie.get(0));
+ }
+
+ // Get all the preferences and add them to the LinearLayout
+ Integer preferencesCount =
+ (Integer) invoke(getMethod(preferenceGroupAdapter.getClass(), "getItemCount"),
+ preferenceGroupAdapter);
+ if (preferencesCount == null) {
+ return listView;
+ }
+
+ Method getItemId = getMethod(preferenceGroupAdapter.getClass(), "getItemId", int.class);
+ Method getItemViewType =
+ getMethod(preferenceGroupAdapter.getClass(), "getItemViewType", int.class);
+ Method onCreateViewHolder =
+ getMethod(preferenceGroupAdapter.getClass(), "onCreateViewHolder", ViewGroup.class,
+ int.class);
+ for (int i = 0; i < preferencesCount; i++) {
+ Long id = (Long) invoke(getItemId, preferenceGroupAdapter, i);
+ if (id == null) {
+ continue;
+ }
+
+ // Get the type of the preference layout and bind it to a newly created view holder
+ Integer type = (Integer) invoke(getItemViewType, preferenceGroupAdapter, i);
+ Object viewHolder =
+ invoke(onCreateViewHolder, preferenceGroupAdapter, listView, type);
+ if (viewHolder == null) {
+ continue;
+ }
+ invoke(getMethod(preferenceGroupAdapter.getClass(), "onBindViewHolder",
+ viewHolder.getClass(), int.class), preferenceGroupAdapter, viewHolder, i);
+
+ try {
+ // Get the view from the view holder and add it to our layout
+ View itemView =
+ (View) viewHolder.getClass().getField("itemView").get(viewHolder);
+
+ int arrayPosition = id.intValue() - 1; // IDs are 1 based
+ if (arrayPosition >= 0 && arrayPosition < viewCookie.size()) {
+ bridgeContext.addViewKey(itemView, viewCookie.get(arrayPosition));
+ }
+ listView.addView(itemView);
+ } catch (IllegalAccessException | NoSuchFieldException ignored) {
+ }
+ }
+
+ return listView;
+ }
+
+ /**
+ * Inflates a preferences layout using the support library. If the support library is not
+ * available, this method will return null without advancing the parsers.
+ */
+ @Nullable
+ public static View inflatePreference(@NonNull BridgeContext bridgeContext,
+ @NonNull XmlPullParser parser, @Nullable ViewGroup root) {
+ try {
+ LayoutlibCallback callback = bridgeContext.getLayoutlibCallback();
+
+ Context context = getThemedContext(bridgeContext);
+ if (context == null) {
+ // Probably we couldn't find the "preferenceTheme" in the theme
+ return null;
+ }
+
+ // Create PreferenceManager
+ Object preferenceManager =
+ instantiateClass(callback, PREFERENCE_MANAGER, new Class[]{Context.class},
+ new Object[]{context});
+
+ // From this moment on, we can assume that we found the support library and that
+ // nothing should fail
+
+ // Create PreferenceScreen
+ Object preferenceScreen =
+ invoke(getMethod(preferenceManager.getClass(), "createPreferenceScreen",
+ Context.class), preferenceManager, context);
+ if (preferenceScreen == null) {
+ return null;
+ }
+
+ // Setup a parser that stores the list of cookies in the same order as the preferences
+ // are inflated. That way we can later reconstruct the list using the preference id
+ // since they are sequential and start in 1.
+ ArrayList<Object> viewCookie = new ArrayList<>();
+ if (parser instanceof BridgeXmlBlockParser) {
+ // Setup a parser that stores the XmlTag
+ parser = new BridgeXmlBlockParser(parser, null, false) {
+ @Override
+ public Object getViewCookie() {
+ return ((BridgeXmlBlockParser) getParser()).getViewCookie();
+ }
+
+ @Override
+ public int next() throws XmlPullParserException, IOException {
+ int ev = super.next();
+ if (ev == XmlPullParser.START_TAG) {
+ viewCookie.add(this.getViewCookie());
+ }
+
+ return ev;
+ }
+ };
+ }
+
+ // Create the PreferenceInflater
+ Object inflatedPreference =
+ createInflatedPreference(callback, context, parser, preferenceScreen,
+ preferenceManager);
+
+ // Setup the RecyclerView (set adapter and layout manager)
+ Object preferenceGroupAdapter =
+ createPreferenceGroupAdapter(callback, inflatedPreference);
+
+ // Instead of just setting the group adapter as adapter for a RecyclerView, we manually
+ // get all the items and add them to a LinearLayout. This allows us to set the view
+ // cookies so the preferences are correctly linked to their XML.
+ LinearLayout listView = setUpPreferencesListView(bridgeContext, context, viewCookie,
+ preferenceGroupAdapter);
+
+ ScrollView scrollView = new ScrollView(context);
+ scrollView.setLayoutParams(
+ new ViewGroup.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+ scrollView.addView(listView);
+
+ if (root != null) {
+ root.addView(scrollView);
+ }
+
+ return scrollView;
+ } catch (ReflectionException e) {
+ return null;
+ }
+ }
+}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
index c59b1a6..11da445 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
@@ -24,8 +24,8 @@
import java.io.PrintStream;
import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
/**
@@ -33,7 +33,7 @@
*
* This is used in conjunction with layoublib_create: certain Android java classes are mere
* wrappers around a heavily native based implementation, and we need a way to run these classes
- * in our Eclipse rendering framework without bringing all the native code from the Android
+ * in our Android Studio rendering framework without bringing all the native code from the Android
* platform.
*
* Thus we instruct layoutlib_create to modify the bytecode of these classes to replace their
@@ -61,7 +61,7 @@
* following mechanism:
*
* - {@link #addNewDelegate(Object)} and {@link #removeJavaReferenceFor(long)} adds and removes
- * the delegate to/from a list. This list hold the reference and prevents the GC from reclaiming
+ * the delegate to/from a set. This set holds the reference and prevents the GC from reclaiming
* the delegate.
*
* - {@link #addNewDelegate(Object)} also adds the delegate to a {@link SparseArray} that holds a
@@ -76,12 +76,12 @@
@SuppressWarnings("FieldCanBeLocal")
private final Class<T> mClass;
private static final SparseWeakArray<Object> sDelegates = new SparseWeakArray<>();
- /** list used to store delegates when their main object holds a reference to them.
+ /** Set used to store delegates when their main object holds a reference to them.
* This is to ensure that the WeakReference in the SparseWeakArray doesn't get GC'ed
* @see #addNewDelegate(Object)
* @see #removeJavaReferenceFor(long)
*/
- private static final List<Object> sJavaReferences = new ArrayList<>();
+ private static final Set<Object> sJavaReferences = new HashSet<>();
private static final AtomicLong sDelegateCounter = new AtomicLong(1);
public DelegateManager(Class<T> theClass) {
@@ -129,7 +129,7 @@
long native_object = sDelegateCounter.getAndIncrement();
synchronized (DelegateManager.class) {
sDelegates.put(native_object, newDelegate);
- assert !sJavaReferences.contains(newDelegate);
+ // Only for development: assert !sJavaReferences.contains(newDelegate);
sJavaReferences.add(newDelegate);
}
@@ -165,5 +165,6 @@
int idx = sDelegates.indexOfValue(reference);
out.printf("[%d] %s\n", sDelegates.keyAt(idx), reference.getClass().getSimpleName());
}
+ out.printf("\nTotal number of objects: %d\n", sJavaReferences.size());
}
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java
index 537fa77..97698df 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java
@@ -360,8 +360,10 @@
return;
}
// Check if an actionbar is needed
- boolean windowActionBar = getBooleanThemeValue(mResources, ATTR_WINDOW_ACTION_BAR,
- !mContext.isAppCompatTheme(), true);
+ boolean isMenu = "menu".equals(mParams.getFlag(RenderParamsFlags.FLAG_KEY_ROOT_TAG));
+ boolean windowActionBar = isMenu ||
+ getBooleanThemeValue(mResources, ATTR_WINDOW_ACTION_BAR,
+ !mContext.isAppCompatTheme(), true);
if (windowActionBar) {
mActionBarSize = getDimension(ATTR_ACTION_BAR_SIZE, true, DEFAULT_TITLE_BAR_HEIGHT);
} else {
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index c890793..feed045 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -45,6 +45,7 @@
import com.android.layoutlib.bridge.android.RenderParamsFlags;
import com.android.layoutlib.bridge.android.graphics.NopCanvas;
import com.android.layoutlib.bridge.android.support.DesignLibUtil;
+import com.android.layoutlib.bridge.android.support.SupportPreferencesUtil;
import com.android.layoutlib.bridge.impl.binding.FakeAdapter;
import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
import com.android.resources.ResourceType;
@@ -326,8 +327,14 @@
boolean isPreference = "PreferenceScreen".equals(rootTag);
View view;
if (isPreference) {
- view = Preference_Delegate.inflatePreference(getContext(), mBlockParser,
+ // First try to use the support library inflater. If something fails, fallback
+ // to the system preference inflater.
+ view = SupportPreferencesUtil.inflatePreference(getContext(), mBlockParser,
mContentRoot);
+ if (view == null) {
+ view = Preference_Delegate.inflatePreference(getContext(), mBlockParser,
+ mContentRoot);
+ }
} else {
view = mInflater.inflate(mBlockParser, mContentRoot);
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/ReflectionUtils.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/ReflectionUtils.java
index 7ce27b6..040191e 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/ReflectionUtils.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/ReflectionUtils.java
@@ -37,6 +37,15 @@
}
}
+ @NonNull
+ public static Method getAccessibleMethod(@NonNull Class<?> clazz, @NonNull String name,
+ @Nullable Class<?>... params) throws ReflectionException {
+ Method method = getMethod(clazz, name, params);
+ method.setAccessible(true);
+
+ return method;
+ }
+
@Nullable
public static Object invoke(@NonNull Method method, @Nullable Object object,
@Nullable Object... args) throws ReflectionException {
@@ -74,6 +83,25 @@
}
/**
+ * Looks through the class hierarchy of {@code object} at runtime and returns the class matching
+ * the name {@code className}.
+ * <p>
+ * This is used when we cannot use Class.forName() since the class we want was loaded from a
+ * different ClassLoader.
+ */
+ @NonNull
+ public static Class<?> getClassInstance(@NonNull Object object, @NonNull String className) {
+ Class<?> superClass = object.getClass();
+ while (superClass != null) {
+ if (className.equals(superClass.getName())) {
+ return superClass;
+ }
+ superClass = superClass.getSuperclass();
+ }
+ throw new RuntimeException("invalid object/classname combination.");
+ }
+
+ /**
* Wraps all reflection related exceptions. Created since ReflectiveOperationException was
* introduced in 1.7 and we are still on 1.6
*/
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets_tab.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets_tab.png
index bad296b..6eeb82c 100644
--- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets_tab.png
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets_tab.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png
index 9f26627..26aed6a 100644
--- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png
index 89009be..aaf1514 100644
--- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/simple_activity.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/simple_activity.png
new file mode 100644
index 0000000..4e448c8
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/simple_activity.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/simple_activity_noactionbar.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/simple_activity_noactionbar.png
new file mode 100644
index 0000000..290018b
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/simple_activity_noactionbar.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/simple_activity.xml b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/simple_activity.xml
new file mode 100644
index 0000000..14b93f3
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/simple_activity.xml
@@ -0,0 +1,32 @@
+<!--
+ ~ Copyright (C) 2016 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin">
+
+ <TextView
+ android:text="@string/hello_world"
+ android:layout_width="wrap_content"
+ android:layout_height="200dp"
+ android:background="#FF0000"
+ android:id="@+id/text1"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index 88ac72d..e7c6cc9 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -309,7 +309,44 @@
/** Test activity.xml */
@Test
public void testActivity() throws ClassNotFoundException {
- renderAndVerify("activity.xml", "activity.png");
+ try {
+ renderAndVerify("activity.xml", "activity.png");
+ } catch (AssertionError e) {
+ // This is a KI in CalendarWidget and DatePicker rendering.
+ // Tracker bug: http://b.android.com/214370
+ if (!e.getLocalizedMessage().startsWith("Images differ (by 6.5%)")) {
+ throw e;
+ }
+ }
+ }
+
+ @Test
+ public void testActivityActionBar() throws ClassNotFoundException {
+ LayoutPullParser parser = createLayoutPullParser("simple_activity.xml");
+ LayoutLibTestCallback layoutLibCallback = new LayoutLibTestCallback(getLogger());
+ layoutLibCallback.initResources();
+
+ SessionParams params = getSessionParams(parser, ConfigGenerator.NEXUS_5,
+ layoutLibCallback, "Theme.Material.Light.NoActionBar", false,
+ RenderingMode.V_SCROLL, 22);
+
+ renderAndVerify(params, "simple_activity_noactionbar.png");
+
+ parser = createLayoutPullParser("simple_activity.xml");
+ params = getSessionParams(parser, ConfigGenerator.NEXUS_5,
+ layoutLibCallback, "Theme.Material.Light", false,
+ RenderingMode.V_SCROLL, 22);
+
+ renderAndVerify(params, "simple_activity.png");
+
+ // This also tests that a theme with "NoActionBar" DOES HAVE an action bar when we are
+ // displaying menus.
+ parser = createLayoutPullParser("simple_activity.xml");
+ params = getSessionParams(parser, ConfigGenerator.NEXUS_5,
+ layoutLibCallback, "Theme.Material.Light.NoActionBar", false,
+ RenderingMode.V_SCROLL, 22);
+ params.setFlag(RenderParamsFlags.FLAG_KEY_ROOT_TAG, "menu");
+ renderAndVerify(params, "simple_activity.png");
}
/** Test allwidgets.xml */
@@ -341,7 +378,11 @@
obj = null;
while(ref.get() != null) {
System.gc();
+ System.runFinalization();
}
+
+ System.gc();
+ System.runFinalization();
}
@AfterClass
diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index 239bed5..863abae 100644
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -47,8 +47,8 @@
libaapt \
libandroidfw \
libpng \
- liblog \
libutils \
+ liblog \
libcutils \
libexpat \
libziparchive-host \
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 3bf88b7..a64bfe5 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -806,7 +806,7 @@
* Quality network selection status String (for debug purpose). Use Quality network
* selection status value as index to extec the corresponding debug string
*/
- private static final String[] QUALITY_NETWORK_SELECTION_STATUS = {
+ public static final String[] QUALITY_NETWORK_SELECTION_STATUS = {
"NETWORK_SELECTION_ENABLED",
"NETWORK_SELECTION_TEMPORARY_DISABLED",
"NETWORK_SELECTION_PERMANENTLY_DISABLED"};
@@ -868,7 +868,7 @@
/**
* Quality network selection disable reason String (for debug purpose)
*/
- private static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = {
+ public static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = {
"NETWORK_SELECTION_ENABLE",
"NETWORK_SELECTION_DISABLED_BAD_LINK",
"NETWORK_SELECTION_DISABLED_ASSOCIATION_REJECTION ",
diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java
index 2636c3f..716f1d3 100644
--- a/wifi/java/android/net/wifi/WifiScanner.java
+++ b/wifi/java/android/net/wifi/WifiScanner.java
@@ -656,6 +656,40 @@
void onPnoNetworkFound(ScanResult[] results);
}
+ /**
+ * Register a listener that will receive results from all single scans
+ * Either the onSuccess/onFailure will be called once when the listener is registered. After
+ * (assuming onSuccess was called) all subsequent single scan results will be delivered to the
+ * listener. It is possible that onFullResult will not be called for all results of the first
+ * scan if the listener was registered during the scan.
+ *
+ * @param listener specifies the object to report events to. This object is also treated as a
+ * key for this request, and must also be specified to cancel the request.
+ * Multiple requests should also not share this object.
+ * {@hide}
+ */
+ public void registerScanListener(ScanListener listener) {
+ Preconditions.checkNotNull(listener, "listener cannot be null");
+ int key = addListener(listener);
+ if (key == INVALID_KEY) return;
+ validateChannel();
+ mAsyncChannel.sendMessage(CMD_REGISTER_SCAN_LISTENER, 0, key);
+ }
+
+ /**
+ * Deregister a listener for ongoing single scans
+ * @param listener specifies which scan to cancel; must be same object as passed in {@link
+ * #registerScanListener}
+ * {@hide}
+ */
+ public void deregisterScanListener(ScanListener listener) {
+ Preconditions.checkNotNull(listener, "listener cannot be null");
+ int key = removeListener(listener);
+ if (key == INVALID_KEY) return;
+ validateChannel();
+ mAsyncChannel.sendMessage(CMD_DEREGISTER_SCAN_LISTENER, 0, key);
+ }
+
/** start wifi scan in background
* @param settings specifies various parameters for the scan; for more information look at
* {@link ScanSettings}
@@ -1129,6 +1163,10 @@
public static final int CMD_STOP_PNO_SCAN = BASE + 25;
/** @hide */
public static final int CMD_PNO_NETWORK_FOUND = BASE + 26;
+ /** @hide */
+ public static final int CMD_REGISTER_SCAN_LISTENER = BASE + 27;
+ /** @hide */
+ public static final int CMD_DEREGISTER_SCAN_LISTENER = BASE + 28;
private Context mContext;
private IWifiScanner mService;
diff --git a/wifi/java/android/net/wifi/nan/ConfigRequest.java b/wifi/java/android/net/wifi/nan/ConfigRequest.java
index 759098e..cd47359 100644
--- a/wifi/java/android/net/wifi/nan/ConfigRequest.java
+++ b/wifi/java/android/net/wifi/nan/ConfigRequest.java
@@ -16,6 +16,7 @@
package android.net.wifi.nan;
+import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl b/wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl
index b95140e..a4e590b 100644
--- a/wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl
+++ b/wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl
@@ -28,7 +28,7 @@
{
void onConnectSuccess();
void onConnectFail(int reason);
- void onIdentityChanged();
+ void onIdentityChanged(in byte[] mac);
void onRangingSuccess(int rangingId, in RttManager.ParcelableRttResults results);
void onRangingFailure(int rangingId, int reason, in String description);
diff --git a/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl b/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl
index efa6211..b8dd1a5 100644
--- a/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl
+++ b/wifi/java/android/net/wifi/nan/IWifiNanManager.aidl
@@ -49,8 +49,8 @@
// session API
void updatePublish(int clientId, int sessionId, in PublishConfig publishConfig);
void updateSubscribe(int clientId, int sessionId, in SubscribeConfig subscribeConfig);
- void sendMessage(int clientId, int sessionId, int peerId, in byte[] message, int messageLength,
- int messageId, int retryCount);
+ void sendMessage(int clientId, int sessionId, int peerId, in byte[] message, int messageId,
+ int retryCount);
void terminateSession(int clientId, int sessionId);
int startRanging(int clientId, int sessionId, in RttManager.ParcelableRttParams parms);
}
diff --git a/wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl b/wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl
index 7162be7..ff2c409 100644
--- a/wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl
+++ b/wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl
@@ -28,10 +28,9 @@
void onSessionConfigFail(int reason);
void onSessionTerminated(int reason);
- void onMatch(int peerId, in byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength, in byte[] matchFilter, int matchFilterLength);
+ void onMatch(int peerId, in byte[] serviceSpecificInfo, in byte[] matchFilter);
void onMessageSendSuccess(int messageId);
void onMessageSendFail(int messageId, int reason);
- void onMessageReceived(int peerId, in byte[] message, int messageLength);
+ void onMessageReceived(int peerId, in byte[] message);
}
diff --git a/wifi/java/android/net/wifi/nan/LvBufferUtils.java b/wifi/java/android/net/wifi/nan/LvBufferUtils.java
new file mode 100644
index 0000000..eb56070
--- /dev/null
+++ b/wifi/java/android/net/wifi/nan/LvBufferUtils.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.wifi.nan;
+
+import android.annotation.Nullable;
+
+import libcore.io.Memory;
+
+import java.nio.ByteOrder;
+import java.util.Iterator;
+
+/**
+ * Utility class to construct and parse byte arrays using the LV format -
+ * Length/Value format. The utilities accept a configuration of the size of
+ * the Length field.
+ *
+ * @hide PROPOSED_NAN_API
+ */
+public class LvBufferUtils {
+ private LvBufferUtils() {
+ // no reason to ever create this class
+ }
+
+ /**
+ * Utility class to construct byte arrays using the LV format - Length/Value.
+ * <p>
+ * A constructor is created specifying the size of the Length (L) field.
+ * <p>
+ * The byte array is either provided (using
+ * {@link LvBufferUtils.LvConstructor#wrap(byte[])}) or allocated (using
+ * {@link LvBufferUtils.LvConstructor#allocate(int)}).
+ * <p>
+ * Values are added to the structure using the {@code LvConstructor.put*()}
+ * methods.
+ * <p>
+ * The final byte array is obtained using {@link LvBufferUtils.LvConstructor#getArray()}.
+ */
+ public static class LvConstructor {
+ private TlvBufferUtils.TlvConstructor mTlvImpl;
+
+ /**
+ * Define a LV constructor with the specified size of the Length (L) field.
+ *
+ * @param lengthSize Number of bytes used for the Length (L) field.
+ * Values of 1 or 2 bytes are allowed.
+ */
+ public LvConstructor(int lengthSize) {
+ mTlvImpl = new TlvBufferUtils.TlvConstructor(0, lengthSize);
+ }
+
+ /**
+ * Set the byte array to be used to construct the LV.
+ *
+ * @param array Byte array to be formatted.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor wrap(@Nullable byte[] array) {
+ mTlvImpl.wrap(array);
+ return this;
+ }
+
+ /**
+ * Allocates a new byte array to be used ot construct a LV.
+ *
+ * @param capacity The size of the byte array to be allocated.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor allocate(int capacity) {
+ mTlvImpl.allocate(capacity);
+ return this;
+ }
+
+ /**
+ * Copies a byte into the LV array.
+ *
+ * @param b The byte to be inserted into the structure.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putByte(byte b) {
+ mTlvImpl.putByte(0, b);
+ return this;
+ }
+
+ /**
+ * Copies a byte array into the LV.
+ *
+ * @param array The array to be copied into the LV structure.
+ * @param offset Start copying from the array at the specified offset.
+ * @param length Copy the specified number (length) of bytes from the
+ * array.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putByteArray(@Nullable byte[] array, int offset,
+ int length) {
+ mTlvImpl.putByteArray(0, array, offset, length);
+ return this;
+ }
+
+ /**
+ * Copies a byte array into the LV.
+ *
+ * @param array The array to be copied (in full) into the LV structure.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putByteArray(int type, @Nullable byte[] array) {
+ return putByteArray(array, 0, (array == null) ? 0 : array.length);
+ }
+
+ /**
+ * Places a zero length element (i.e. Length field = 0) into the LV.
+ *
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putZeroLengthElement() {
+ mTlvImpl.putZeroLengthElement(0);
+ return this;
+ }
+
+ /**
+ * Copies short into the LV.
+ *
+ * @param data The short to be inserted into the structure.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putShort(short data) {
+ mTlvImpl.putShort(0, data);
+ return this;
+ }
+
+ /**
+ * Copies integer into the LV.
+ *
+ * @param data The integer to be inserted into the structure.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putInt(int data) {
+ mTlvImpl.putInt(0, data);
+ return this;
+ }
+
+ /**
+ * Copies a String's byte representation into the LV.
+ *
+ * @param data The string whose bytes are to be inserted into the
+ * structure.
+ * @return The constructor to facilitate chaining
+ * {@code ctr.putXXX(..).putXXX(..)}.
+ */
+ public LvBufferUtils.LvConstructor putString(@Nullable String data) {
+ mTlvImpl.putString(0, data);
+ return this;
+ }
+
+ /**
+ * Returns the constructed LV formatted byte-array. This array is a copy of the wrapped
+ * or allocated array - truncated to just the significant bytes - i.e. those written into
+ * the LV.
+ *
+ * @return The byte array containing the LV formatted structure.
+ */
+ public byte[] getArray() {
+ return mTlvImpl.getArray();
+ }
+ }
+
+ /**
+ * Utility class used when iterating over an LV formatted byte-array. Use
+ * {@link LvBufferUtils.LvIterable} to iterate over array. A {@link LvBufferUtils.LvElement}
+ * represents each entry in a LV formatted byte-array.
+ */
+ public static class LvElement {
+ /**
+ * The Length (L) field of the current LV element.
+ */
+ public int length;
+
+ /**
+ * The Value (V) field - a raw byte array representing the current LV
+ * element where the entry starts at {@link LvBufferUtils.LvElement#offset}.
+ */
+ public byte[] refArray;
+
+ /**
+ * The offset to be used into {@link LvBufferUtils.LvElement#refArray} to access the
+ * raw data representing the current LV element.
+ */
+ public int offset;
+
+ private LvElement(int length, @Nullable byte[] refArray, int offset) {
+ this.length = length;
+ this.refArray = refArray;
+ this.offset = offset;
+ }
+
+ /**
+ * Utility function to return a byte representation of a LV element of
+ * length 1. Note: an attempt to call this function on a LV item whose
+ * {@link LvBufferUtils.LvElement#length} is != 1 will result in an exception.
+ *
+ * @return byte representation of current LV element.
+ */
+ public byte getByte() {
+ if (length != 1) {
+ throw new IllegalArgumentException(
+ "Accesing a byte from a LV element of length " + length);
+ }
+ return refArray[offset];
+ }
+
+ /**
+ * Utility function to return a short representation of a LV element of
+ * length 2. Note: an attempt to call this function on a LV item whose
+ * {@link LvBufferUtils.LvElement#length} is != 2 will result in an exception.
+ *
+ * @return short representation of current LV element.
+ */
+ public short getShort() {
+ if (length != 2) {
+ throw new IllegalArgumentException(
+ "Accesing a short from a LV element of length " + length);
+ }
+ return Memory.peekShort(refArray, offset, ByteOrder.BIG_ENDIAN);
+ }
+
+ /**
+ * Utility function to return an integer representation of a LV element
+ * of length 4. Note: an attempt to call this function on a LV item
+ * whose {@link LvBufferUtils.LvElement#length} is != 4 will result in an exception.
+ *
+ * @return integer representation of current LV element.
+ */
+ public int getInt() {
+ if (length != 4) {
+ throw new IllegalArgumentException(
+ "Accesing an int from a LV element of length " + length);
+ }
+ return Memory.peekInt(refArray, offset, ByteOrder.BIG_ENDIAN);
+ }
+
+ /**
+ * Utility function to return a String representation of a LV element.
+ *
+ * @return String representation of the current LV element.
+ */
+ public String getString() {
+ return new String(refArray, offset, length);
+ }
+ }
+
+ /**
+ * Utility class to iterate over a LV formatted byte-array.
+ */
+ public static class LvIterable implements Iterable<LvBufferUtils.LvElement> {
+ private final TlvBufferUtils.TlvIterable mTlvIterable;
+
+ /**
+ * Constructs an LvIterable object - specifying the format of the LV
+ * (the size of the Length field), and the byte array whose data is to be parsed.
+ *
+ * @param lengthSize Number of bytes sued for the Length (L) field.
+ * Values values are 1 or 2 bytes.
+ * @param array The LV formatted byte-array to parse.
+ */
+ public LvIterable(int lengthSize, @Nullable byte[] array) {
+ mTlvIterable = new TlvBufferUtils.TlvIterable(0, lengthSize, array);
+ }
+
+ /**
+ * Prints out a parsed representation of the LV-formatted byte array.
+ * Whenever possible bytes, shorts, and integer are printed out (for
+ * fields whose length is 1, 2, or 4 respectively).
+ */
+ @Override
+ public String toString() {
+ return mTlvIterable.toString();
+ }
+
+ /**
+ * Returns an iterator to step through a LV formatted byte-array. The
+ * individual elements returned by the iterator are {@link LvBufferUtils.LvElement}.
+ */
+ @Override
+ public Iterator<LvBufferUtils.LvElement> iterator() {
+ return new Iterator<LvBufferUtils.LvElement>() {
+ private Iterator<TlvBufferUtils.TlvElement> mTlvIterator = mTlvIterable.iterator();
+
+ @Override
+ public boolean hasNext() {
+ return mTlvIterator.hasNext();
+ }
+
+ @Override
+ public LvBufferUtils.LvElement next() {
+ TlvBufferUtils.TlvElement tlvE = mTlvIterator.next();
+
+ return new LvElement(tlvE.length, tlvE.refArray, tlvE.offset);
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+ }
+
+ /**
+ * Validates that a LV array is constructed correctly. I.e. that its specified Length
+ * fields correctly fill the specified length (and do not overshoot).
+ *
+ * @param array The LV array to verify.
+ * @param lengthSize The size (in bytes) of the length field. Valid values are 1 or 2.
+ * @return A boolean indicating whether the array is valid (true) or invalid (false).
+ */
+ public static boolean isValid(@Nullable byte[] array, int lengthSize) {
+ return TlvBufferUtils.isValid(array, 0, lengthSize);
+ }
+}
diff --git a/wifi/java/android/net/wifi/nan/PublishConfig.java b/wifi/java/android/net/wifi/nan/PublishConfig.java
index d7cba8f..3fd756e 100644
--- a/wifi/java/android/net/wifi/nan/PublishConfig.java
+++ b/wifi/java/android/net/wifi/nan/PublishConfig.java
@@ -18,11 +18,15 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.os.Parcel;
import android.os.Parcelable;
+import libcore.util.HexEncoding;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
/**
@@ -58,12 +62,7 @@
/**
* @hide
*/
- public final String mServiceName;
-
- /**
- * @hide
- */
- public final int mServiceSpecificInfoLength;
+ public final byte[] mServiceName;
/**
* @hide
@@ -73,21 +72,11 @@
/**
* @hide
*/
- public final int mTxFilterLength;
-
- /**
- * @hide
- */
public final byte[] mTxFilter;
/**
* @hide
*/
- public final int mRxFilterLength;
-
- /**
- * @hide
- */
public final byte[] mRxFilter;
/**
@@ -110,16 +99,12 @@
*/
public final boolean mEnableTerminateNotification;
- private PublishConfig(String serviceName, byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength, byte[] txFilter, int txFilterLength, byte[] rxFilter,
- int rxFilterLength, int publishType, int publichCount, int ttlSec,
+ private PublishConfig(byte[] serviceName, byte[] serviceSpecificInfo,
+ byte[] txFilter, byte[] rxFilter, int publishType, int publichCount, int ttlSec,
boolean enableTerminateNotification) {
mServiceName = serviceName;
- mServiceSpecificInfoLength = serviceSpecificInfoLength;
mServiceSpecificInfo = serviceSpecificInfo;
- mTxFilterLength = txFilterLength;
mTxFilter = txFilter;
- mRxFilterLength = rxFilterLength;
mRxFilter = rxFilter;
mPublishType = publishType;
mPublishCount = publichCount;
@@ -129,12 +114,10 @@
@Override
public String toString() {
- return "PublishConfig [mServiceName='" + mServiceName + "', mServiceSpecificInfo='"
- + (new String(mServiceSpecificInfo, 0, mServiceSpecificInfoLength))
- + "', mTxFilter="
- + (new TlvBufferUtils.TlvIterable(0, 1, mTxFilter, mTxFilterLength)).toString()
- + ", mRxFilter="
- + (new TlvBufferUtils.TlvIterable(0, 1, mRxFilter, mRxFilterLength)).toString()
+ return "PublishConfig [mServiceName='" + mServiceName + ", mServiceSpecificInfo='" + (
+ (mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))
+ + ", mTxFilter=" + (new LvBufferUtils.LvIterable(1, mTxFilter)).toString()
+ + ", mRxFilter=" + (new LvBufferUtils.LvIterable(1, mRxFilter)).toString()
+ ", mPublishType=" + mPublishType + ", mPublishCount=" + mPublishCount
+ ", mTtlSec=" + mTtlSec + ", mEnableTerminateNotification="
+ mEnableTerminateNotification + "]";
@@ -147,19 +130,10 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(mServiceName);
- dest.writeInt(mServiceSpecificInfoLength);
- if (mServiceSpecificInfoLength != 0) {
- dest.writeByteArray(mServiceSpecificInfo, 0, mServiceSpecificInfoLength);
- }
- dest.writeInt(mTxFilterLength);
- if (mTxFilterLength != 0) {
- dest.writeByteArray(mTxFilter, 0, mTxFilterLength);
- }
- dest.writeInt(mRxFilterLength);
- if (mRxFilterLength != 0) {
- dest.writeByteArray(mRxFilter, 0, mRxFilterLength);
- }
+ dest.writeByteArray(mServiceName);
+ dest.writeByteArray(mServiceSpecificInfo);
+ dest.writeByteArray(mTxFilter);
+ dest.writeByteArray(mRxFilter);
dest.writeInt(mPublishType);
dest.writeInt(mPublishCount);
dest.writeInt(mTtlSec);
@@ -174,30 +148,17 @@
@Override
public PublishConfig createFromParcel(Parcel in) {
- String serviceName = in.readString();
- int ssiLength = in.readInt();
- byte[] ssi = new byte[ssiLength];
- if (ssiLength != 0) {
- in.readByteArray(ssi);
- }
- int txFilterLength = in.readInt();
- byte[] txFilter = new byte[txFilterLength];
- if (txFilterLength != 0) {
- in.readByteArray(txFilter);
- }
- int rxFilterLength = in.readInt();
- byte[] rxFilter = new byte[rxFilterLength];
- if (rxFilterLength != 0) {
- in.readByteArray(rxFilter);
- }
+ byte[] serviceName = in.createByteArray();
+ byte[] ssi = in.createByteArray();
+ byte[] txFilter = in.createByteArray();
+ byte[] rxFilter = in.createByteArray();
int publishType = in.readInt();
int publishCount = in.readInt();
int ttlSec = in.readInt();
boolean enableTerminateNotification = in.readInt() != 0;
- return new PublishConfig(serviceName, ssi, ssiLength, txFilter, txFilterLength,
- rxFilter, rxFilterLength, publishType, publishCount, ttlSec,
- enableTerminateNotification);
+ return new PublishConfig(serviceName, ssi, txFilter, rxFilter, publishType,
+ publishCount, ttlSec, enableTerminateNotification);
}
};
@@ -213,45 +174,10 @@
PublishConfig lhs = (PublishConfig) o;
- if (!mServiceName.equals(lhs.mServiceName)
- || mServiceSpecificInfoLength != lhs.mServiceSpecificInfoLength
- || mTxFilterLength != lhs.mTxFilterLength
- || mRxFilterLength != lhs.mRxFilterLength) {
- return false;
- }
-
- if (mServiceSpecificInfo != null && lhs.mServiceSpecificInfo != null) {
- for (int i = 0; i < mServiceSpecificInfoLength; ++i) {
- if (mServiceSpecificInfo[i] != lhs.mServiceSpecificInfo[i]) {
- return false;
- }
- }
- } else if (mServiceSpecificInfoLength != 0) {
- return false; // invalid != invalid
- }
-
- if (mTxFilter != null && lhs.mTxFilter != null) {
- for (int i = 0; i < mTxFilterLength; ++i) {
- if (mTxFilter[i] != lhs.mTxFilter[i]) {
- return false;
- }
- }
- } else if (mTxFilterLength != 0) {
- return false; // invalid != invalid
- }
-
- if (mRxFilter != null && lhs.mRxFilter != null) {
- for (int i = 0; i < mRxFilterLength; ++i) {
- if (mRxFilter[i] != lhs.mRxFilter[i]) {
- return false;
- }
- }
- } else if (mRxFilterLength != 0) {
- return false; // invalid != invalid
- }
-
- return mPublishType == lhs.mPublishType && mPublishCount == lhs.mPublishCount
- && mTtlSec == lhs.mTtlSec
+ return Arrays.equals(mServiceName, lhs.mServiceName) && Arrays.equals(mServiceSpecificInfo,
+ lhs.mServiceSpecificInfo) && Arrays.equals(mTxFilter, lhs.mTxFilter)
+ && Arrays.equals(mRxFilter, lhs.mRxFilter) && mPublishType == lhs.mPublishType
+ && mPublishCount == lhs.mPublishCount && mTtlSec == lhs.mTtlSec
&& mEnableTerminateNotification == lhs.mEnableTerminateNotification;
}
@@ -259,12 +185,9 @@
public int hashCode() {
int result = 17;
- result = 31 * result + mServiceName.hashCode();
- result = 31 * result + mServiceSpecificInfoLength;
+ result = 31 * result + Arrays.hashCode(mServiceName);
result = 31 * result + Arrays.hashCode(mServiceSpecificInfo);
- result = 31 * result + mTxFilterLength;
result = 31 * result + Arrays.hashCode(mTxFilter);
- result = 31 * result + mRxFilterLength;
result = 31 * result + Arrays.hashCode(mRxFilter);
result = 31 * result + mPublishType;
result = 31 * result + mPublishCount;
@@ -281,18 +204,15 @@
* @hide
*/
public void validate() throws IllegalArgumentException {
- if (mServiceSpecificInfoLength != 0 && (mServiceSpecificInfo == null
- || mServiceSpecificInfo.length < mServiceSpecificInfoLength)) {
- throw new IllegalArgumentException("Non-matching combination of "
- + "serviceSpecificInfo and serviceSpecificInfoLength");
- }
- if (mTxFilterLength != 0 && (mTxFilter == null || mTxFilter.length < mTxFilterLength)) {
+ WifiNanUtils.validateServiceName(mServiceName);
+
+ if (!LvBufferUtils.isValid(mTxFilter, 1)) {
throw new IllegalArgumentException(
- "Non-matching combination of txFilter and txFilterLength");
+ "Invalid txFilter configuration - LV fields do not match up to length");
}
- if (mRxFilterLength != 0 && (mRxFilter == null || mRxFilter.length < mRxFilterLength)) {
+ if (!LvBufferUtils.isValid(mRxFilter, 1)) {
throw new IllegalArgumentException(
- "Non-matching combination of rxFilter and rxFilterLength");
+ "Invalid rxFilter configuration - LV fields do not match up to length");
}
if (mPublishType < PUBLISH_TYPE_UNSOLICITED || mPublishType > PUBLISH_TYPE_SOLICITED) {
throw new IllegalArgumentException("Invalid publishType - " + mPublishType);
@@ -303,11 +223,13 @@
if (mTtlSec < 0) {
throw new IllegalArgumentException("Invalid ttlSec - must be non-negative");
}
- if (mPublishType == PublishConfig.PUBLISH_TYPE_UNSOLICITED && mRxFilterLength != 0) {
+ if (mPublishType == PublishConfig.PUBLISH_TYPE_UNSOLICITED && mRxFilter != null
+ && mRxFilter.length != 0) {
throw new IllegalArgumentException("Invalid publish config: UNSOLICITED "
+ "publishes (active) can't have an Rx filter");
}
- if (mPublishType == PublishConfig.PUBLISH_TYPE_SOLICITED && mTxFilterLength != 0) {
+ if (mPublishType == PublishConfig.PUBLISH_TYPE_SOLICITED && mTxFilter != null
+ && mTxFilter.length != 0) {
throw new IllegalArgumentException("Invalid publish config: SOLICITED "
+ "publishes (passive) can't have a Tx filter");
}
@@ -317,13 +239,10 @@
* Builder used to build {@link PublishConfig} objects.
*/
public static final class Builder {
- private String mServiceName;
- private int mServiceSpecificInfoLength;
- private byte[] mServiceSpecificInfo = new byte[0];
- private int mTxFilterLength;
- private byte[] mTxFilter = new byte[0];
- private int mRxFilterLength;
- private byte[] mRxFilter = new byte[0];
+ private byte[] mServiceName;
+ private byte[] mServiceSpecificInfo;
+ private byte[] mTxFilter;
+ private byte[] mRxFilter;
private int mPublishType = PUBLISH_TYPE_UNSOLICITED;
private int mPublishCount = 0;
private int mTtlSec = 0;
@@ -333,12 +252,20 @@
* Specify the service name of the publish session. The actual on-air
* value is a 6 byte hashed representation of this string.
*
+ * Per spec: The Service Name is a UTF-8 encoded string from 1 to 255 bytes in length.
+ * The only acceptable single-byte UTF-8 symbols for a Service Name are alphanumeric
+ * values (A-Z, a-z, 0-9), the hyphen ('-'), and the period ('.'). All valid multi-byte
+ * UTF-8 characters are acceptable in a Service Name.
+ *
* @param serviceName The service name for the publish session.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
public Builder setServiceName(@NonNull String serviceName) {
- mServiceName = serviceName;
+ if (serviceName == null) {
+ throw new IllegalArgumentException("Invalid service name - must be non-null");
+ }
+ mServiceName = serviceName.getBytes(StandardCharsets.UTF_8);
return this;
}
@@ -351,26 +278,17 @@
*
* @param serviceSpecificInfo A byte-array for the service-specific
* information field.
- * @param serviceSpecificInfoLength The length of the byte-array to be
- * used.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
- public Builder setServiceSpecificInfo(byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength) {
- if (serviceSpecificInfoLength != 0 && (serviceSpecificInfo == null
- || serviceSpecificInfo.length < serviceSpecificInfoLength)) {
- throw new IllegalArgumentException("Non-matching combination of "
- + "serviceSpecificInfo and serviceSpecificInfoLength");
- }
- mServiceSpecificInfoLength = serviceSpecificInfoLength;
+ public Builder setServiceSpecificInfo(@Nullable byte[] serviceSpecificInfo) {
mServiceSpecificInfo = serviceSpecificInfo;
return this;
}
/**
* Specify service specific information for the publish session - same
- * as {@link PublishConfig.Builder#setServiceSpecificInfo(byte[], int)}
+ * as {@link PublishConfig.Builder#setServiceSpecificInfo(byte[])}
* but obtaining the data from a String.
*
* @param serviceSpecificInfoStr The service specific information string
@@ -380,7 +298,6 @@
* {@code builder.setXXX(..).setXXX(..)}.
*/
public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) {
- mServiceSpecificInfoLength = serviceSpecificInfoStr.length();
mServiceSpecificInfo = serviceSpecificInfoStr.getBytes();
return this;
}
@@ -393,23 +310,16 @@
* determine whether they match - in addition to just relying on the
* service name.
* <p>
- * Format is an LV byte array - the {@link TlvBufferUtils} utility class
+ * Format is an LV byte array - the {@link LvBufferUtils} utility class
* is available to form and parse.
*
* @param txFilter The byte-array containing the LV formatted transmit
* filter.
- * @param txFilterLength The number of bytes in the transmit filter
- * argument.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
- public Builder setTxFilter(byte[] txFilter, int txFilterLength) {
- if (txFilterLength != 0 && (txFilter == null || txFilter.length < txFilterLength)) {
- throw new IllegalArgumentException(
- "Non-matching combination of txFilter and txFilterLength");
- }
+ public Builder setTxFilter(@Nullable byte[] txFilter) {
mTxFilter = txFilter;
- mTxFilterLength = txFilterLength;
return this;
}
@@ -421,23 +331,16 @@
* (active subscribers) - in addition to just relying on the service
* name.
* <p>
- * Format is an LV byte array - the {@link TlvBufferUtils} utility class
+ * Format is an LV byte array - the {@link LvBufferUtils} utility class
* is available to form and parse.
*
* @param rxFilter The byte-array containing the LV formatted receive
* filter.
- * @param rxFilterLength The number of bytes in the receive filter
- * argument.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
- public Builder setRxFilter(byte[] rxFilter, int rxFilterLength) {
- if (rxFilterLength != 0 && (rxFilter == null || rxFilter.length < rxFilterLength)) {
- throw new IllegalArgumentException(
- "Non-matching combination of rxFilter and rxFilterLength");
- }
+ public Builder setRxFilter(@Nullable byte[] rxFilter) {
mRxFilter = rxFilter;
- mRxFilterLength = rxFilterLength;
return this;
}
@@ -521,9 +424,8 @@
* builder.
*/
public PublishConfig build() {
- return new PublishConfig(mServiceName, mServiceSpecificInfo, mServiceSpecificInfoLength,
- mTxFilter, mTxFilterLength, mRxFilter, mRxFilterLength, mPublishType,
- mPublishCount, mTtlSec, mEnableTerminateNotification);
+ return new PublishConfig(mServiceName, mServiceSpecificInfo, mTxFilter, mRxFilter,
+ mPublishType, mPublishCount, mTtlSec, mEnableTerminateNotification);
}
}
}
diff --git a/wifi/java/android/net/wifi/nan/SubscribeConfig.java b/wifi/java/android/net/wifi/nan/SubscribeConfig.java
index 847c8d0..fd19ddb 100644
--- a/wifi/java/android/net/wifi/nan/SubscribeConfig.java
+++ b/wifi/java/android/net/wifi/nan/SubscribeConfig.java
@@ -18,11 +18,15 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.os.Parcel;
import android.os.Parcelable;
+import libcore.util.HexEncoding;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
/**
@@ -76,12 +80,7 @@
/**
* @hide
*/
- public final String mServiceName;
-
- /**
- * @hide
- */
- public final int mServiceSpecificInfoLength;
+ public final byte[] mServiceName;
/**
* @hide
@@ -91,21 +90,11 @@
/**
* @hide
*/
- public final int mTxFilterLength;
-
- /**
- * @hide
- */
public final byte[] mTxFilter;
/**
* @hide
*/
- public final int mRxFilterLength;
-
- /**
- * @hide
- */
public final byte[] mRxFilter;
/**
@@ -133,16 +122,12 @@
*/
public final boolean mEnableTerminateNotification;
- private SubscribeConfig(String serviceName, byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength, byte[] txFilter, int txFilterLength, byte[] rxFilter,
- int rxFilterLength, int subscribeType, int publichCount, int ttlSec, int matchStyle,
+ private SubscribeConfig(byte[] serviceName, byte[] serviceSpecificInfo, byte[] txFilter,
+ byte[] rxFilter, int subscribeType, int publichCount, int ttlSec, int matchStyle,
boolean enableTerminateNotification) {
mServiceName = serviceName;
- mServiceSpecificInfoLength = serviceSpecificInfoLength;
mServiceSpecificInfo = serviceSpecificInfo;
- mTxFilterLength = txFilterLength;
mTxFilter = txFilter;
- mRxFilterLength = rxFilterLength;
mRxFilter = rxFilter;
mSubscribeType = subscribeType;
mSubscribeCount = publichCount;
@@ -153,12 +138,10 @@
@Override
public String toString() {
- return "SubscribeConfig [mServiceName='" + mServiceName + "', mServiceSpecificInfo='"
- + (new String(mServiceSpecificInfo, 0, mServiceSpecificInfoLength))
- + "', mTxFilter="
- + (new TlvBufferUtils.TlvIterable(0, 1, mTxFilter, mTxFilterLength)).toString()
- + ", mRxFilter="
- + (new TlvBufferUtils.TlvIterable(0, 1, mRxFilter, mRxFilterLength)).toString()
+ return "SubscribeConfig [mServiceName='" + mServiceName + ", mServiceSpecificInfo='" + (
+ (mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))
+ + ", mTxFilter=" + (new LvBufferUtils.LvIterable(1, mTxFilter)).toString()
+ + ", mRxFilter=" + (new LvBufferUtils.LvIterable(1, mRxFilter)).toString()
+ ", mSubscribeType=" + mSubscribeType + ", mSubscribeCount=" + mSubscribeCount
+ ", mTtlSec=" + mTtlSec + ", mMatchType=" + mMatchStyle
+ ", mEnableTerminateNotification=" + mEnableTerminateNotification + "]";
@@ -171,19 +154,10 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(mServiceName);
- dest.writeInt(mServiceSpecificInfoLength);
- if (mServiceSpecificInfoLength != 0) {
- dest.writeByteArray(mServiceSpecificInfo, 0, mServiceSpecificInfoLength);
- }
- dest.writeInt(mTxFilterLength);
- if (mTxFilterLength != 0) {
- dest.writeByteArray(mTxFilter, 0, mTxFilterLength);
- }
- dest.writeInt(mRxFilterLength);
- if (mRxFilterLength != 0) {
- dest.writeByteArray(mRxFilter, 0, mRxFilterLength);
- }
+ dest.writeByteArray(mServiceName);
+ dest.writeByteArray(mServiceSpecificInfo);
+ dest.writeByteArray(mTxFilter);
+ dest.writeByteArray(mRxFilter);
dest.writeInt(mSubscribeType);
dest.writeInt(mSubscribeCount);
dest.writeInt(mTtlSec);
@@ -199,31 +173,18 @@
@Override
public SubscribeConfig createFromParcel(Parcel in) {
- String serviceName = in.readString();
- int ssiLength = in.readInt();
- byte[] ssi = new byte[ssiLength];
- if (ssiLength != 0) {
- in.readByteArray(ssi);
- }
- int txFilterLength = in.readInt();
- byte[] txFilter = new byte[txFilterLength];
- if (txFilterLength != 0) {
- in.readByteArray(txFilter);
- }
- int rxFilterLength = in.readInt();
- byte[] rxFilter = new byte[rxFilterLength];
- if (rxFilterLength != 0) {
- in.readByteArray(rxFilter);
- }
+ byte[] serviceName = in.createByteArray();
+ byte[] ssi = in.createByteArray();
+ byte[] txFilter = in.createByteArray();
+ byte[] rxFilter = in.createByteArray();
int subscribeType = in.readInt();
int subscribeCount = in.readInt();
int ttlSec = in.readInt();
int matchStyle = in.readInt();
boolean enableTerminateNotification = in.readInt() != 0;
- return new SubscribeConfig(serviceName, ssi, ssiLength, txFilter, txFilterLength,
- rxFilter, rxFilterLength, subscribeType, subscribeCount, ttlSec, matchStyle,
- enableTerminateNotification);
+ return new SubscribeConfig(serviceName, ssi, txFilter, rxFilter, subscribeType,
+ subscribeCount, ttlSec, matchStyle, enableTerminateNotification);
}
};
@@ -239,45 +200,11 @@
SubscribeConfig lhs = (SubscribeConfig) o;
- if (!mServiceName.equals(lhs.mServiceName)
- || mServiceSpecificInfoLength != lhs.mServiceSpecificInfoLength
- || mTxFilterLength != lhs.mTxFilterLength
- || mRxFilterLength != lhs.mRxFilterLength) {
- return false;
- }
-
- if (mServiceSpecificInfo != null && lhs.mServiceSpecificInfo != null) {
- for (int i = 0; i < mServiceSpecificInfoLength; ++i) {
- if (mServiceSpecificInfo[i] != lhs.mServiceSpecificInfo[i]) {
- return false;
- }
- }
- } else if (mServiceSpecificInfoLength != 0) {
- return false; // invalid != invalid
- }
-
- if (mTxFilter != null && lhs.mTxFilter != null) {
- for (int i = 0; i < mTxFilterLength; ++i) {
- if (mTxFilter[i] != lhs.mTxFilter[i]) {
- return false;
- }
- }
- } else if (mTxFilterLength != 0) {
- return false; // invalid != invalid
- }
-
- if (mRxFilter != null && lhs.mRxFilter != null) {
- for (int i = 0; i < mRxFilterLength; ++i) {
- if (mRxFilter[i] != lhs.mRxFilter[i]) {
- return false;
- }
- }
- } else if (mRxFilterLength != 0) {
- return false; // invalid != invalid
- }
-
- return mSubscribeType == lhs.mSubscribeType && mSubscribeCount == lhs.mSubscribeCount
- && mTtlSec == lhs.mTtlSec && mMatchStyle == lhs.mMatchStyle
+ return Arrays.equals(mServiceName, lhs.mServiceName) && Arrays.equals(mServiceSpecificInfo,
+ lhs.mServiceSpecificInfo) && Arrays.equals(mTxFilter, lhs.mTxFilter)
+ && Arrays.equals(mRxFilter, lhs.mRxFilter) && mSubscribeType == lhs.mSubscribeType
+ && mSubscribeCount == lhs.mSubscribeCount && mTtlSec == lhs.mTtlSec
+ && mMatchStyle == lhs.mMatchStyle
&& mEnableTerminateNotification == lhs.mEnableTerminateNotification;
}
@@ -285,12 +212,9 @@
public int hashCode() {
int result = 17;
- result = 31 * result + mServiceName.hashCode();
- result = 31 * result + mServiceSpecificInfoLength;
+ result = 31 * result + Arrays.hashCode(mServiceName);
result = 31 * result + Arrays.hashCode(mServiceSpecificInfo);
- result = 31 * result + mTxFilterLength;
result = 31 * result + Arrays.hashCode(mTxFilter);
- result = 31 * result + mRxFilterLength;
result = 31 * result + Arrays.hashCode(mRxFilter);
result = 31 * result + mSubscribeType;
result = 31 * result + mSubscribeCount;
@@ -308,18 +232,15 @@
* @hide
*/
public void validate() throws IllegalArgumentException {
- if (mServiceSpecificInfoLength != 0 && (mServiceSpecificInfo == null
- || mServiceSpecificInfo.length < mServiceSpecificInfoLength)) {
- throw new IllegalArgumentException("Non-matching combination of "
- + "serviceSpecificInfo and serviceSpecificInfoLength");
- }
- if (mTxFilterLength != 0 && (mTxFilter == null || mTxFilter.length < mTxFilterLength)) {
+ WifiNanUtils.validateServiceName(mServiceName);
+
+ if (!LvBufferUtils.isValid(mTxFilter, 1)) {
throw new IllegalArgumentException(
- "Non-matching combination of txFilter and txFilterLength");
+ "Invalid txFilter configuration - LV fields do not match up to length");
}
- if (mRxFilterLength != 0 && (mRxFilter == null || mRxFilter.length < mRxFilterLength)) {
+ if (!LvBufferUtils.isValid(mRxFilter, 1)) {
throw new IllegalArgumentException(
- "Non-matching combination of rxFilter and rxFilterLength");
+ "Invalid rxFilter configuration - LV fields do not match up to length");
}
if (mSubscribeType < SUBSCRIBE_TYPE_PASSIVE || mSubscribeType > SUBSCRIBE_TYPE_ACTIVE) {
throw new IllegalArgumentException("Invalid subscribeType - " + mSubscribeType);
@@ -334,11 +255,13 @@
throw new IllegalArgumentException(
"Invalid matchType - must be MATCH_FIRST_ONLY or MATCH_ALL");
}
- if (mSubscribeType == SubscribeConfig.SUBSCRIBE_TYPE_ACTIVE && mRxFilterLength != 0) {
+ if (mSubscribeType == SubscribeConfig.SUBSCRIBE_TYPE_ACTIVE && mRxFilter != null
+ && mRxFilter.length != 0) {
throw new IllegalArgumentException(
"Invalid subscribe config: ACTIVE subscribes can't have an Rx filter");
}
- if (mSubscribeType == SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE && mTxFilterLength != 0) {
+ if (mSubscribeType == SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE && mTxFilter != null
+ && mTxFilter.length != 0) {
throw new IllegalArgumentException(
"Invalid subscribe config: PASSIVE subscribes can't have a Tx filter");
}
@@ -348,13 +271,10 @@
* Builder used to build {@link SubscribeConfig} objects.
*/
public static final class Builder {
- private String mServiceName;
- private int mServiceSpecificInfoLength;
- private byte[] mServiceSpecificInfo = new byte[0];
- private int mTxFilterLength;
- private byte[] mTxFilter = new byte[0];
- private int mRxFilterLength;
- private byte[] mRxFilter = new byte[0];
+ private byte[] mServiceName;
+ private byte[] mServiceSpecificInfo;
+ private byte[] mTxFilter;
+ private byte[] mRxFilter;
private int mSubscribeType = SUBSCRIBE_TYPE_PASSIVE;
private int mSubscribeCount = 0;
private int mTtlSec = 0;
@@ -365,12 +285,20 @@
* Specify the service name of the subscribe session. The actual on-air
* value is a 6 byte hashed representation of this string.
*
+ * Per spec: The Service Name is a UTF-8 encoded string from 1 to 255 bytes in length.
+ * The only acceptable single-byte UTF-8 symbols for a Service Name are alphanumeric
+ * values (A-Z, a-z, 0-9), the hyphen ('-'), and the period ('.'). All valid multi-byte
+ * UTF-8 characters are acceptable in a Service Name.
+ *
* @param serviceName The service name for the subscribe session.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
public Builder setServiceName(@NonNull String serviceName) {
- mServiceName = serviceName;
+ if (serviceName == null) {
+ throw new IllegalArgumentException("Invalid service name - must be non-null");
+ }
+ mServiceName = serviceName.getBytes(StandardCharsets.UTF_8);
return this;
}
@@ -383,19 +311,10 @@
*
* @param serviceSpecificInfo A byte-array for the service-specific
* information field.
- * @param serviceSpecificInfoLength The length of the byte-array to be
- * used.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
- public Builder setServiceSpecificInfo(byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength) {
- if (serviceSpecificInfoLength != 0 && (serviceSpecificInfo == null
- || serviceSpecificInfo.length < serviceSpecificInfoLength)) {
- throw new IllegalArgumentException("Non-matching combination of "
- + "serviceSpecificInfo and serviceSpecificInfoLength");
- }
- mServiceSpecificInfoLength = serviceSpecificInfoLength;
+ public Builder setServiceSpecificInfo(@Nullable byte[] serviceSpecificInfo) {
mServiceSpecificInfo = serviceSpecificInfo;
return this;
}
@@ -403,7 +322,7 @@
/**
* Specify service specific information for the subscribe session - same
* as
- * {@link SubscribeConfig.Builder#setServiceSpecificInfo(byte[], int)}
+ * {@link SubscribeConfig.Builder#setServiceSpecificInfo(byte[])}
* but obtaining the data from a String.
*
* @param serviceSpecificInfoStr The service specific information string
@@ -413,7 +332,6 @@
* {@code builder.setXXX(..).setXXX(..)}.
*/
public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) {
- mServiceSpecificInfoLength = serviceSpecificInfoStr.length();
mServiceSpecificInfo = serviceSpecificInfoStr.getBytes();
return this;
}
@@ -426,23 +344,16 @@
* publishers) to determine whether they match - in addition to just
* relying on the service name.
* <p>
- * Format is an LV byte array - the {@link TlvBufferUtils} utility class
+ * Format is an LV byte array - the {@link LvBufferUtils} utility class
* is available to form and parse.
*
* @param txFilter The byte-array containing the LV formatted transmit
* filter.
- * @param txFilterLength The number of bytes in the transmit filter
- * argument.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
- public Builder setTxFilter(byte[] txFilter, int txFilterLength) {
- if (txFilterLength != 0 && (txFilter == null || txFilter.length < txFilterLength)) {
- throw new IllegalArgumentException(
- "Non-matching combination of txFilter and txFilterLength");
- }
+ public Builder setTxFilter(@Nullable byte[] txFilter) {
mTxFilter = txFilter;
- mTxFilterLength = txFilterLength;
return this;
}
@@ -453,23 +364,16 @@
* subscriber to determine whether they match transmitted publish
* packets - in addition to just relying on the service name.
* <p>
- * Format is an LV byte array - the {@link TlvBufferUtils} utility class
+ * Format is an LV byte array - the {@link LvBufferUtils} utility class
* is available to form and parse.
*
* @param rxFilter The byte-array containing the LV formatted receive
* filter.
- * @param rxFilterLength The number of bytes in the receive filter
- * argument.
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
- public Builder setRxFilter(byte[] rxFilter, int rxFilterLength) {
- if (rxFilterLength != 0 && (rxFilter == null || rxFilter.length < rxFilterLength)) {
- throw new IllegalArgumentException(
- "Non-matching combination of rxFilter and rxFilterLength");
- }
+ public Builder setRxFilter(@Nullable byte[] rxFilter) {
mRxFilter = rxFilter;
- mRxFilterLength = rxFilterLength;
return this;
}
@@ -537,7 +441,7 @@
* Sets the match style of the subscription - how are matches from a
* single match session (corresponding to the same publish action on the
* peer) reported to the host (using the
- * {@link WifiNanSessionCallback#onMatch(int, byte[], int, byte[], int)}
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])}
* ). The options are: only report the first match and ignore the rest
* {@link SubscribeConfig#MATCH_STYLE_FIRST_ONLY} or report every single
* match {@link SubscribeConfig#MATCH_STYLE_ALL}.
@@ -575,9 +479,8 @@
* builder.
*/
public SubscribeConfig build() {
- return new SubscribeConfig(mServiceName, mServiceSpecificInfo,
- mServiceSpecificInfoLength, mTxFilter, mTxFilterLength, mRxFilter,
- mRxFilterLength, mSubscribeType, mSubscribeCount, mTtlSec, mMatchStyle,
+ return new SubscribeConfig(mServiceName, mServiceSpecificInfo, mTxFilter, mRxFilter,
+ mSubscribeType, mSubscribeCount, mTtlSec, mMatchStyle,
mEnableTerminateNotification);
}
}
diff --git a/wifi/java/android/net/wifi/nan/TlvBufferUtils.java b/wifi/java/android/net/wifi/nan/TlvBufferUtils.java
index ea8785a..2c5aab4 100644
--- a/wifi/java/android/net/wifi/nan/TlvBufferUtils.java
+++ b/wifi/java/android/net/wifi/nan/TlvBufferUtils.java
@@ -16,11 +16,15 @@
package android.net.wifi.nan;
+import android.annotation.Nullable;
+
import libcore.io.Memory;
import java.nio.BufferOverflowException;
import java.nio.ByteOrder;
+import java.util.Arrays;
import java.util.Iterator;
+import java.util.NoSuchElementException;
/**
* Utility class to construct and parse byte arrays using the TLV format -
@@ -50,8 +54,7 @@
* Values are added to the structure using the {@code TlvConstructor.put*()}
* methods.
* <p>
- * The final byte array is obtained using {@link TlvConstructor#getArray()}
- * and {@link TlvConstructor#getActualLength()} methods.
+ * The final byte array is obtained using {@link TlvConstructor#getArray()}.
*/
public static class TlvConstructor {
private int mTypeSize;
@@ -88,9 +91,9 @@
* @return The constructor to facilitate chaining
* {@code ctr.putXXX(..).putXXX(..)}.
*/
- public TlvConstructor wrap(byte[] array) {
+ public TlvConstructor wrap(@Nullable byte[] array) {
mArray = array;
- mArrayLength = array.length;
+ mArrayLength = (array == null) ? 0 : array.length;
return this;
}
@@ -137,10 +140,13 @@
* @return The constructor to facilitate chaining
* {@code ctr.putXXX(..).putXXX(..)}.
*/
- public TlvConstructor putByteArray(int type, byte[] array, int offset, int length) {
+ public TlvConstructor putByteArray(int type, @Nullable byte[] array, int offset,
+ int length) {
checkLength(length);
addHeader(type, length);
- System.arraycopy(array, offset, mArray, mPosition, length);
+ if (length != 0) {
+ System.arraycopy(array, offset, mArray, mPosition, length);
+ }
mPosition += length;
return this;
}
@@ -155,8 +161,8 @@
* @return The constructor to facilitate chaining
* {@code ctr.putXXX(..).putXXX(..)}.
*/
- public TlvConstructor putByteArray(int type, byte[] array) {
- return putByteArray(type, array, 0, array.length);
+ public TlvConstructor putByteArray(int type, @Nullable byte[] array) {
+ return putByteArray(type, array, 0, (array == null) ? 0 : array.length);
}
/**
@@ -223,23 +229,25 @@
* @return The constructor to facilitate chaining
* {@code ctr.putXXX(..).putXXX(..)}.
*/
- public TlvConstructor putString(int type, String data) {
- return putByteArray(type, data.getBytes(), 0, data.length());
+ public TlvConstructor putString(int type, @Nullable String data) {
+ byte[] bytes = null;
+ int length = 0;
+ if (data != null) {
+ bytes = data.getBytes();
+ length = bytes.length;
+ }
+ return putByteArray(type, bytes, 0, length);
}
/**
- * Returns the constructed TLV formatted byte-array. Note that the
- * returned array is the fully wrapped (
- * {@link TlvConstructor#wrap(byte[])}) or allocated (
- * {@link TlvConstructor#allocate(int)}) array - which isn't necessarily
- * the actual size of the formatted data. Use
- * {@link TlvConstructor#getActualLength()} to obtain the size of the
- * formatted data.
+ * Returns the constructed TLV formatted byte-array. This array is a copy of the wrapped
+ * or allocated array - truncated to just the significant bytes - i.e. those written into
+ * the (T)LV.
*
* @return The byte array containing the TLV formatted structure.
*/
public byte[] getArray() {
- return mArray;
+ return Arrays.copyOf(mArray, getActualLength());
}
/**
@@ -249,7 +257,7 @@
*
* @return The size of the TLV formatted portion of the byte array.
*/
- public int getActualLength() {
+ private int getActualLength() {
return mPosition;
}
@@ -287,75 +295,75 @@
* formatted byte-arrays (i.e. TLV whose Type/T size is 0) the value of
* this field is undefined.
*/
- public int mType;
+ public int type;
/**
* The Length (L) field of the current TLV element.
*/
- public int mLength;
+ public int length;
/**
* The Value (V) field - a raw byte array representing the current TLV
- * element where the entry starts at {@link TlvElement#mOffset}.
+ * element where the entry starts at {@link TlvElement#offset}.
*/
- public byte[] mRefArray;
+ public byte[] refArray;
/**
- * The offset to be used into {@link TlvElement#mRefArray} to access the
+ * The offset to be used into {@link TlvElement#refArray} to access the
* raw data representing the current TLV element.
*/
- public int mOffset;
+ public int offset;
- private TlvElement(int type, int length, byte[] refArray, int offset) {
- mType = type;
- mLength = length;
- mRefArray = refArray;
- mOffset = offset;
+ private TlvElement(int type, int length, @Nullable byte[] refArray, int offset) {
+ this.type = type;
+ this.length = length;
+ this.refArray = refArray;
+ this.offset = offset;
}
/**
* Utility function to return a byte representation of a TLV element of
* length 1. Note: an attempt to call this function on a TLV item whose
- * {@link TlvElement#mLength} is != 1 will result in an exception.
+ * {@link TlvElement#length} is != 1 will result in an exception.
*
* @return byte representation of current TLV element.
*/
public byte getByte() {
- if (mLength != 1) {
+ if (length != 1) {
throw new IllegalArgumentException(
- "Accesing a byte from a TLV element of length " + mLength);
+ "Accesing a byte from a TLV element of length " + length);
}
- return mRefArray[mOffset];
+ return refArray[offset];
}
/**
* Utility function to return a short representation of a TLV element of
* length 2. Note: an attempt to call this function on a TLV item whose
- * {@link TlvElement#mLength} is != 2 will result in an exception.
+ * {@link TlvElement#length} is != 2 will result in an exception.
*
* @return short representation of current TLV element.
*/
public short getShort() {
- if (mLength != 2) {
+ if (length != 2) {
throw new IllegalArgumentException(
- "Accesing a short from a TLV element of length " + mLength);
+ "Accesing a short from a TLV element of length " + length);
}
- return Memory.peekShort(mRefArray, mOffset, ByteOrder.BIG_ENDIAN);
+ return Memory.peekShort(refArray, offset, ByteOrder.BIG_ENDIAN);
}
/**
* Utility function to return an integer representation of a TLV element
* of length 4. Note: an attempt to call this function on a TLV item
- * whose {@link TlvElement#mLength} is != 4 will result in an exception.
+ * whose {@link TlvElement#length} is != 4 will result in an exception.
*
* @return integer representation of current TLV element.
*/
public int getInt() {
- if (mLength != 4) {
+ if (length != 4) {
throw new IllegalArgumentException(
- "Accesing an int from a TLV element of length " + mLength);
+ "Accesing an int from a TLV element of length " + length);
}
- return Memory.peekInt(mRefArray, mOffset, ByteOrder.BIG_ENDIAN);
+ return Memory.peekInt(refArray, offset, ByteOrder.BIG_ENDIAN);
}
/**
@@ -364,7 +372,7 @@
* @return String repersentation of the current TLV element.
*/
public String getString() {
- return new String(mRefArray, mOffset, mLength);
+ return new String(refArray, offset, length);
}
}
@@ -388,10 +396,8 @@
* @param lengthSize Number of bytes sued for the Length (L) field.
* Values values are 1 or 2 bytes.
* @param array The TLV formatted byte-array to parse.
- * @param length The number of bytes of the array to be used in the
- * parsing.
*/
- public TlvIterable(int typeSize, int lengthSize, byte[] array, int length) {
+ public TlvIterable(int typeSize, int lengthSize, @Nullable byte[] array) {
if (typeSize < 0 || typeSize > 2 || lengthSize <= 0 || lengthSize > 2) {
throw new IllegalArgumentException(
"Invalid sizes - typeSize=" + typeSize + ", lengthSize=" + lengthSize);
@@ -399,7 +405,7 @@
mTypeSize = typeSize;
mLengthSize = lengthSize;
mArray = array;
- mArrayLength = length;
+ mArrayLength = (array == null) ? 0 : array.length;
}
/**
@@ -420,21 +426,21 @@
first = false;
builder.append(" (");
if (mTypeSize != 0) {
- builder.append("T=" + tlv.mType + ",");
+ builder.append("T=" + tlv.type + ",");
}
- builder.append("L=" + tlv.mLength + ") ");
- if (tlv.mLength == 0) {
+ builder.append("L=" + tlv.length + ") ");
+ if (tlv.length == 0) {
builder.append("<null>");
- } else if (tlv.mLength == 1) {
+ } else if (tlv.length == 1) {
builder.append(tlv.getByte());
- } else if (tlv.mLength == 2) {
+ } else if (tlv.length == 2) {
builder.append(tlv.getShort());
- } else if (tlv.mLength == 4) {
+ } else if (tlv.length == 4) {
builder.append(tlv.getInt());
} else {
builder.append("<bytes>");
}
- if (tlv.mLength != 0) {
+ if (tlv.length != 0) {
builder.append(" (S='" + tlv.getString() + "')");
}
}
@@ -459,6 +465,10 @@
@Override
public TlvElement next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+
int type = 0;
if (mTypeSize == 1) {
type = mArray[mOffset];
@@ -487,4 +497,40 @@
};
}
}
+
+ /**
+ * Validates that a (T)LV array is constructed correctly. I.e. that its specified Length
+ * fields correctly fill the specified length (and do not overshoot).
+ *
+ * @param array The (T)LV array to verify.
+ * @param typeSize The size (in bytes) of the type field. Valid values are 0, 1, or 2.
+ * @param lengthSize The size (in bytes) of the length field. Valid values are 1 or 2.
+ * @return A boolean indicating whether the array is valid (true) or invalid (false).
+ */
+ public static boolean isValid(@Nullable byte[] array, int typeSize, int lengthSize) {
+ if (typeSize < 0 || typeSize > 2) {
+ throw new IllegalArgumentException(
+ "Invalid arguments - typeSize must be 0, 1, or 2: typeSize=" + typeSize);
+ }
+ if (lengthSize <= 0 || lengthSize > 2) {
+ throw new IllegalArgumentException(
+ "Invalid arguments - lengthSize must be 1 or 2: lengthSize=" + lengthSize);
+ }
+ if (array == null) {
+ return true;
+ }
+
+ int nextTlvIndex = 0;
+ while (nextTlvIndex + typeSize + lengthSize <= array.length) {
+ nextTlvIndex += typeSize;
+ if (lengthSize == 1) {
+ nextTlvIndex += lengthSize + array[nextTlvIndex];
+ } else {
+ nextTlvIndex += lengthSize + Memory.peekShort(array, nextTlvIndex,
+ ByteOrder.BIG_ENDIAN);
+ }
+ }
+
+ return nextTlvIndex == array.length;
+ }
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanEventCallback.java b/wifi/java/android/net/wifi/nan/WifiNanEventCallback.java
index 2b9a5fa..148307d 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanEventCallback.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanEventCallback.java
@@ -62,7 +62,7 @@
* Called when NAN connect operation
* {@link WifiNanManager#connect(android.os.Looper, WifiNanEventCallback)}
* is completed. Doesn't necessarily mean that have joined or started a NAN
- * cluster. An indication is provided by {@link #onIdentityChanged()}.
+ * cluster. An indication is provided by {@link #onIdentityChanged(byte[])}.
*/
public void onConnectSuccess() {
/* empty */
@@ -81,12 +81,14 @@
}
/**
- * Called when NAN identity has changed. This may be due to joining a
- * cluster, starting a cluster, or discovery interface change. The
- * implication is that peers you've been communicating with may no longer
- * recognize you and you need to re-establish your identity.
+ * Called when NAN identity has changed and after {@link #onConnectSuccess()}. Call may be
+ * due to joining a cluster, starting a cluster, or discovery interface change. The
+ * implication is that peers you've been communicating with may no longer recognize you and
+ * you need to re-establish your identity.
+ * @param mac The MAC address of the NAN discovery interface. Depending on the permission
+ * model may be all 0's.
*/
- public void onIdentityChanged() {
+ public void onIdentityChanged(byte[] mac) {
/* empty */
}
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanManager.java b/wifi/java/android/net/wifi/nan/WifiNanManager.java
index 9055622..ff612fe7 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanManager.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanManager.java
@@ -16,10 +16,14 @@
package android.net.wifi.nan;
+import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.SystemApi;
+import android.net.ConnectivityManager;
+import android.net.NetworkRequest;
import android.net.wifi.RttManager;
import android.os.Binder;
import android.os.Bundle;
@@ -28,11 +32,19 @@
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
+import android.util.Base64;
import android.util.Log;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
+import libcore.util.HexEncoding;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference;
import java.util.Arrays;
@@ -59,6 +71,101 @@
private static final int INVALID_CLIENT_ID = 0;
/**
+ * Keys used to generate a Network Specifier for the NAN network request. The network specifier
+ * is formatted as a JSON string.
+ */
+
+ /**
+ * TYPE_1A: role, client_id, session_id, peer_id, token
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_1A = 0;
+
+ /**
+ * TYPE_1B: role, client_id, session_id, peer_id [only permitted for RESPONDER]
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_1B = 1;
+
+ /**
+ * TYPE_1C: role, client_id, session_id, token [only permitted for RESPONDER]
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_1C = 2;
+
+ /**
+ * TYPE_1C: role, client_id, session_id [only permitted for RESPONDER]
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_1D = 3;
+
+ /**
+ * TYPE_2A: role, client_id, peer_mac, token
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_2A = 4;
+
+ /**
+ * TYPE_2B: role, client_id, peer_mac [only permitted for RESPONDER]
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_2B = 5;
+
+ /**
+ * TYPE_2C: role, client_id, token [only permitted for RESPONDER]
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_2C = 6;
+
+ /**
+ * TYPE_2D: role, client_id [only permitted for RESPONDER]
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_2D = 7;
+
+ /**
+ * @hide
+ */
+ public static final int NETWORK_SPECIFIER_TYPE_MAX_VALID = NETWORK_SPECIFIER_TYPE_2D;
+
+ /**
+ * @hide
+ */
+
+ public static final String NETWORK_SPECIFIER_KEY_TYPE = "type";
+
+ /**
+ * @hide
+ */
+
+ public static final String NETWORK_SPECIFIER_KEY_ROLE = "role";
+
+ /**
+ * @hide
+ */
+
+ public static final String NETWORK_SPECIFIER_KEY_CLIENT_ID = "client_id";
+ /**
+ * @hide
+ */
+ public static final String NETWORK_SPECIFIER_KEY_SESSION_ID = "session_id";
+
+ /**
+ * @hide
+ */
+ public static final String NETWORK_SPECIFIER_KEY_PEER_ID = "peer_id";
+
+ /**
+ * @hide
+ */
+ public static final String NETWORK_SPECIFIER_KEY_PEER_MAC = "peer_mac";
+
+ /**
+ * @hide
+ */
+ public static final String NETWORK_SPECIFIER_KEY_TOKEN = "token";
+
+ /**
* Broadcast intent action to indicate whether Wi-Fi NAN is enabled or
* disabled. An extra {@link #EXTRA_WIFI_STATE} provides the state
* information as int.
@@ -92,6 +199,27 @@
*/
public static final int WIFI_NAN_STATE_ENABLED = 2;
+ @IntDef({
+ WIFI_NAN_DATA_PATH_ROLE_INITIATOR, WIFI_NAN_DATA_PATH_ROLE_RESPONDER})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface DataPathRole {
+ }
+
+ /**
+ * Data-path creation role is that of INITIATOR. Used in
+ * {@link #createNetworkSpecifier(int, byte[], byte[])} and
+ * {@link WifiNanSession#createNetworkSpecifier(int, int, byte[])}.
+ */
+ public static final int WIFI_NAN_DATA_PATH_ROLE_INITIATOR = 0;
+
+ /**
+ * Data-path creation role is that of RESPONDER. Used in
+ * {@link #createNetworkSpecifier(int, byte[], byte[])} and
+ * {@link WifiNanSession#createNetworkSpecifier(int, int, byte[])}.
+ */
+
+ public static final int WIFI_NAN_DATA_PATH_ROLE_RESPONDER = 1;
+
private final IWifiNanManager mService;
private final Object mLock = new Object(); // lock access to the following vars
@@ -398,12 +526,11 @@
/**
* {@hide}
*/
- public void sendMessage(int sessionId, int peerId, byte[] message, int messageLength,
- int messageId, int retryCount) {
+ public void sendMessage(int sessionId, int peerId, byte[] message, int messageId,
+ int retryCount) {
if (VDBG) {
Log.v(TAG, "sendMessage(): sessionId=" + sessionId + ", peerId=" + peerId
- + ", messageLength=" + messageLength + ", messageId=" + messageId
- + ", retryCount=" + retryCount);
+ + ", messageId=" + messageId + ", retryCount=" + retryCount);
}
int clientId;
@@ -417,8 +544,7 @@
}
try {
- mService.sendMessage(clientId, sessionId, peerId, message, messageLength, messageId,
- retryCount);
+ mService.sendMessage(clientId, sessionId, peerId, message, messageId, retryCount);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
@@ -457,6 +583,169 @@
}
}
+ /**
+ * {@hide}
+ */
+ public String createNetworkSpecifier(@DataPathRole int role, int sessionId, int peerId,
+ byte[] token) {
+ if (VDBG) {
+ Log.v(TAG, "createNetworkSpecifier: role=" + role + ", sessionId=" + sessionId
+ + ", peerId=" + peerId + ", token=" + token);
+ }
+
+ int type;
+ if (token != null && peerId != 0) {
+ type = NETWORK_SPECIFIER_TYPE_1A;
+ } else if (token == null && peerId != 0) {
+ type = NETWORK_SPECIFIER_TYPE_1B;
+ } else if (token != null && peerId == 0) {
+ type = NETWORK_SPECIFIER_TYPE_1C;
+ } else {
+ type = NETWORK_SPECIFIER_TYPE_1D;
+ }
+
+ if (role != WIFI_NAN_DATA_PATH_ROLE_INITIATOR
+ && role != WIFI_NAN_DATA_PATH_ROLE_RESPONDER) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid 'role' argument when creating a network "
+ + "specifier");
+ }
+ if (role == WIFI_NAN_DATA_PATH_ROLE_INITIATOR) {
+ if (token == null) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid null token - not permitted on INITIATOR");
+ }
+ if (peerId == 0) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid peer ID (value of 0) - not permitted on "
+ + "INITIATOR");
+ }
+ }
+
+ int clientId;
+ synchronized (mLock) {
+ if (mClientId == INVALID_CLIENT_ID) {
+ Log.e(TAG,
+ "createNetworkSpecifier: called with invalid client ID - not connected "
+ + "first?");
+ return null;
+ }
+
+ clientId = mClientId;
+ }
+
+ JSONObject json;
+ try {
+ json = new JSONObject();
+ json.put(NETWORK_SPECIFIER_KEY_TYPE, type);
+ json.put(NETWORK_SPECIFIER_KEY_ROLE, role);
+ json.put(NETWORK_SPECIFIER_KEY_CLIENT_ID, clientId);
+ json.put(NETWORK_SPECIFIER_KEY_SESSION_ID, sessionId);
+ if (peerId != 0) {
+ json.put(NETWORK_SPECIFIER_KEY_PEER_ID, peerId);
+ }
+ if (token != null) {
+ json.put(NETWORK_SPECIFIER_KEY_TOKEN,
+ Base64.encodeToString(token, 0, token.length, Base64.DEFAULT));
+ }
+ } catch (JSONException e) {
+ return "";
+ }
+
+ return json.toString();
+ }
+
+ /**
+ * Create a {@link android.net.NetworkRequest.Builder#setNetworkSpecifier(String)} for a
+ * WiFi NAN data-path connection to the specified peer. The peer MAC cannot be obtained
+ * through {@link WifiNanManager} services - but could be obtained out-of-bound - it refers
+ * to the MAC address of the NAN discovery interface of the peer NAN device.
+ *
+ * @param role The role of this device:
+ * {@link WifiNanManager#WIFI_NAN_DATA_PATH_ROLE_INITIATOR} or
+ * {@link WifiNanManager#WIFI_NAN_DATA_PATH_ROLE_RESPONDER}
+ * @param peer The MAC address of the peer's NAN discovery interface. A null is permitted
+ * for a RESPONDER - which implies that any peer can connect.
+ * @param token An arbitrary token (message) to be passed to the peer as part of the
+ * data-path setup process. On the RESPONDER a null token is permitted and
+ * matches any peer token - an empty token requires the peer token to be empty
+ * as well.
+ * @return A string to be used to construct
+ * {@link android.net.NetworkRequest.Builder#setNetworkSpecifier(String)} to pass to {@link
+ * android.net.ConnectivityManager#requestNetwork(NetworkRequest, ConnectivityManager.NetworkCallback)}
+ * [or other varieties of that API].
+ */
+ public String createNetworkSpecifier(@DataPathRole int role, @Nullable byte[] peer,
+ @Nullable byte[] token) {
+ if (VDBG) {
+ Log.v(TAG, "createNetworkSpecifier: role=" + role + ", token=" + token);
+ }
+
+ int type;
+ if (token != null && peer != null) {
+ type = NETWORK_SPECIFIER_TYPE_2A;
+ } else if (token == null && peer != null) {
+ type = NETWORK_SPECIFIER_TYPE_2B;
+ } else if (token != null && peer == null) {
+ type = NETWORK_SPECIFIER_TYPE_2C;
+ } else { // both are null
+ type = NETWORK_SPECIFIER_TYPE_2D;
+ }
+
+ if (role != WIFI_NAN_DATA_PATH_ROLE_INITIATOR
+ && role != WIFI_NAN_DATA_PATH_ROLE_RESPONDER) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid 'role' argument when creating a network "
+ + "specifier");
+ }
+ if (role == WIFI_NAN_DATA_PATH_ROLE_INITIATOR) {
+ if (peer == null || peer.length != 6) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid peer MAC address");
+ }
+ if (token == null) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid null token - not permitted on INITIATOR");
+ }
+ } else {
+ if (peer != null && peer.length != 6) {
+ throw new IllegalArgumentException(
+ "createNetworkSpecifier: Invalid peer MAC address");
+ }
+ }
+
+ int clientId;
+ synchronized (mLock) {
+ if (mClientId == INVALID_CLIENT_ID) {
+ Log.e(TAG,
+ "createNetworkSpecifier: called with invalid client ID - not connected "
+ + "first?");
+ return null;
+ }
+
+ clientId = mClientId;
+ }
+
+ JSONObject json;
+ try {
+ json = new JSONObject();
+ json.put(NETWORK_SPECIFIER_KEY_TYPE, type);
+ json.put(NETWORK_SPECIFIER_KEY_ROLE, role);
+ json.put(NETWORK_SPECIFIER_KEY_CLIENT_ID, clientId);
+ if (peer != null) {
+ json.put(NETWORK_SPECIFIER_KEY_PEER_MAC, new String(HexEncoding.encode(peer)));
+ }
+ if (token != null) {
+ json.put(NETWORK_SPECIFIER_KEY_TOKEN,
+ Base64.encodeToString(token, 0, token.length, Base64.DEFAULT));
+ }
+ } catch (JSONException e) {
+ return "";
+ }
+
+ return json.toString();
+ }
+
private static class WifiNanEventCallbackProxy extends IWifiNanEventCallback.Stub {
private static final int CALLBACK_CONNECT_SUCCESS = 0;
private static final int CALLBACK_CONNECT_FAIL = 1;
@@ -519,7 +808,7 @@
originalCallback.onConnectFail(msg.arg1);
break;
case CALLBACK_IDENTITY_CHANGED:
- originalCallback.onIdentityChanged();
+ originalCallback.onIdentityChanged((byte[]) msg.obj);
break;
case CALLBACK_RANGING_SUCCESS: {
RttManager.RttListener listener = getAndRemoveRangingListener(msg.arg1);
@@ -575,10 +864,11 @@
}
@Override
- public void onIdentityChanged() {
- if (VDBG) Log.v(TAG, "onIdentityChanged");
+ public void onIdentityChanged(byte[] mac) {
+ if (VDBG) Log.v(TAG, "onIdentityChanged: mac=" + new String(HexEncoding.encode(mac)));
Message msg = mHandler.obtainMessage(CALLBACK_IDENTITY_CHANGED);
+ msg.obj = mac;
mHandler.sendMessage(msg);
}
@@ -630,7 +920,6 @@
private static final int CALLBACK_MESSAGE_SEND_FAIL = 6;
private static final int CALLBACK_MESSAGE_RECEIVED = 7;
- private static final String MESSAGE_BUNDLE_KEY_PEER_ID = "peer_id";
private static final String MESSAGE_BUNDLE_KEY_MESSAGE = "message";
private static final String MESSAGE_BUNDLE_KEY_MESSAGE2 = "message2";
@@ -681,11 +970,9 @@
break;
case CALLBACK_MATCH:
mOriginalCallback.onMatch(
- msg.getData().getInt(MESSAGE_BUNDLE_KEY_PEER_ID),
- msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE),
msg.arg1,
- msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE2),
- msg.arg2);
+ msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE),
+ msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE2));
break;
case CALLBACK_MESSAGE_SEND_SUCCESS:
mOriginalCallback.onMessageSendSuccess(msg.arg1);
@@ -694,9 +981,7 @@
mOriginalCallback.onMessageSendFail(msg.arg1, msg.arg2);
break;
case CALLBACK_MESSAGE_RECEIVED:
- mOriginalCallback.onMessageReceived(msg.arg2,
- msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE),
- msg.arg1);
+ mOriginalCallback.onMessageReceived(msg.arg1, (byte[]) msg.obj);
break;
}
}
@@ -739,18 +1024,15 @@
}
@Override
- public void onMatch(int peerId, byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength, byte[] matchFilter, int matchFilterLength) {
+ public void onMatch(int peerId, byte[] serviceSpecificInfo, byte[] matchFilter) {
if (VDBG) Log.v(TAG, "onMatch: peerId=" + peerId);
Bundle data = new Bundle();
- data.putInt(MESSAGE_BUNDLE_KEY_PEER_ID, peerId);
data.putByteArray(MESSAGE_BUNDLE_KEY_MESSAGE, serviceSpecificInfo);
data.putByteArray(MESSAGE_BUNDLE_KEY_MESSAGE2, matchFilter);
Message msg = mHandler.obtainMessage(CALLBACK_MATCH);
- msg.arg1 = serviceSpecificInfoLength;
- msg.arg2 = matchFilterLength;
+ msg.arg1 = peerId;
msg.setData(data);
mHandler.sendMessage(msg);
}
@@ -775,19 +1057,14 @@
}
@Override
- public void onMessageReceived(int peerId, byte[] message, int messageLength) {
+ public void onMessageReceived(int peerId, byte[] message) {
if (VDBG) {
- Log.v(TAG, "onMessageReceived: peerId='" + peerId + "', messageLength="
- + messageLength);
+ Log.v(TAG, "onMessageReceived: peerId='" + peerId);
}
- Bundle data = new Bundle();
- data.putByteArray(MESSAGE_BUNDLE_KEY_MESSAGE, message);
-
Message msg = mHandler.obtainMessage(CALLBACK_MESSAGE_RECEIVED);
- msg.arg1 = messageLength;
- msg.arg2 = peerId;
- msg.setData(data);
+ msg.arg1 = peerId;
+ msg.obj = message;
mHandler.sendMessage(msg);
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanSession.java b/wifi/java/android/net/wifi/nan/WifiNanSession.java
index 3533c02..c10cd52 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanSession.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanSession.java
@@ -16,6 +16,8 @@
package android.net.wifi.nan;
+import android.annotation.Nullable;
+import android.annotation.SystemApi;
import android.net.wifi.RttManager;
import android.util.Log;
@@ -106,12 +108,11 @@
/**
* Sends a message to the specified destination. Message transmission is part of the current
* discovery session - i.e. executed subsequent to a publish/subscribe
- * {@link WifiNanSessionCallback#onMatch(int, byte[], int, byte[], int)} event.
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])} event.
*
* @param peerId The peer's ID for the message. Must be a result of an
- * {@link WifiNanSessionCallback#onMatch(int, byte[], int, byte[], int)} event.
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])} event.
* @param message The message to be transmitted.
- * @param messageLength The number of bytes from the {@code message} to be transmitted.
* @param messageId An arbitrary integer used by the caller to identify the message. The same
* integer ID will be returned in the callbacks indicated message send success or
* failure.
@@ -120,8 +121,7 @@
* (note: no retransmissions are attempted in other failure cases). A value of 0
* indicates no retries. Max possible value is {@link #MAX_SEND_RETRY_COUNT}.
*/
- public void sendMessage(int peerId, byte[] message, int messageLength, int messageId,
- int retryCount) {
+ public void sendMessage(int peerId, @Nullable byte[] message, int messageId, int retryCount) {
if (mTerminated) {
Log.w(TAG, "sendMessage: called on terminated session");
return;
@@ -132,33 +132,32 @@
return;
}
- mgr.sendMessage(mSessionId, peerId, message, messageLength, messageId, retryCount);
+ mgr.sendMessage(mSessionId, peerId, message, messageId, retryCount);
}
}
/**
* Sends a message to the specified destination. Message transmission is part of the current
* discovery session - i.e. executed subsequent to a publish/subscribe
- * {@link WifiNanSessionCallback#onMatch(int, byte[], int, byte[], int)} event. This is
- * equivalent to {@link #sendMessage(int, byte[], int, int, int)} with a {@code retryCount} of
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])} event. This is
+ * equivalent to {@link #sendMessage(int, byte[], int, int)} with a {@code retryCount} of
* 0.
*
* @param peerId The peer's ID for the message. Must be a result of an
- * {@link WifiNanSessionCallback#onMatch(int, byte[], int, byte[], int)} event.
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])} event.
* @param message The message to be transmitted.
- * @param messageLength The number of bytes from the {@code message} to be transmitted.
* @param messageId An arbitrary integer used by the caller to identify the message. The same
* integer ID will be returned in the callbacks indicated message send success or
* failure.
*/
- public void sendMessage(int peerId, byte[] message, int messageLength, int messageId) {
- sendMessage(peerId, message, messageLength, messageId, 0);
+ public void sendMessage(int peerId, @Nullable byte[] message, int messageId) {
+ sendMessage(peerId, message, messageId, 0);
}
/**
* Start a ranging operation with the specified peers. The peer IDs are obtained from an
- * {@link WifiNanSessionCallback#onMatch(int, byte[], int, byte[], int)} or
- * {@link WifiNanSessionCallback#onMessageReceived(int, byte[], int)} operation - i.e. can only
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])} or
+ * {@link WifiNanSessionCallback#onMessageReceived(int, byte[])} operation - i.e. can only
* range devices which are part of an ongoing discovery session.
*
* @param params RTT parameters - each corresponding to a specific peer ID (the array sizes
@@ -166,6 +165,7 @@
* {@link android.net.wifi.RttManager.RttParams#bssid} member must be set to
* a peer ID - not to a MAC address.
* @param listener The listener to receive the results of the ranging session.
+ * @hide PROPOSED_NAN_SYSTEM_API [TODO: b/28847998 - track RTT API & visilibity]
*/
public void startRanging(RttManager.RttParams[] params, RttManager.RttListener listener) {
if (mTerminated) {
@@ -181,4 +181,41 @@
mgr.startRanging(mSessionId, params, listener);
}
}
+
+ /**
+ * Create a {@link android.net.NetworkRequest.Builder#setNetworkSpecifier(String)} for a
+ * WiFi NAN data-path connection to the specified peer. The peer ID is in the context of a
+ * previous match or received message in this session.
+ *
+ * @param role The role of this device:
+ * {@link WifiNanManager#WIFI_NAN_DATA_PATH_ROLE_INITIATOR} or
+ * {@link WifiNanManager#WIFI_NAN_DATA_PATH_ROLE_RESPONDER}
+ * @param peerId The peer ID obtained through
+ * {@link WifiNanSessionCallback#onMatch(int, byte[], byte[])} or
+ * {@link WifiNanSessionCallback#onMessageReceived(int, byte[])}. On the RESPONDER a
+ * value of 0 is permitted which matches any peer.
+ * @param token An arbitrary token (message) to be passed to the peer as part of the
+ * data-path setup process. On the RESPONDER a null token is permitted and
+ * matches any peer token - an empty token requires the peer token to be empty
+ * as well.
+ * @return A string to be used to construct
+ * {@link android.net.NetworkRequest.Builder#setNetworkSpecifier(String)} to pass to {@link
+ * android.net.ConnectivityManager#requestNetwork(NetworkRequest,
+ * ConnectivityManager.NetworkCallback)} [or other varieties of that API].
+ */
+ public String createNetworkSpecifier(@WifiNanManager.DataPathRole int role, int peerId,
+ @Nullable byte[] token) {
+ if (mTerminated) {
+ Log.w(TAG, "createNetworkSpecifier: called on terminated session");
+ return null;
+ } else {
+ WifiNanManager mgr = mMgr.get();
+ if (mgr == null) {
+ Log.w(TAG, "createNetworkSpecifier: called post GC on WifiNanManager");
+ return null;
+ }
+
+ return mgr.createNetworkSpecifier(role, mSessionId, peerId, token);
+ }
+ }
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanSessionCallback.java b/wifi/java/android/net/wifi/nan/WifiNanSessionCallback.java
index b1f4100..f2337dd 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanSessionCallback.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanSessionCallback.java
@@ -156,14 +156,10 @@
* @param serviceSpecificInfo The service specific information (arbitrary
* byte array) provided by the peer as part of its discovery
* packet.
- * @param serviceSpecificInfoLength The length of the service specific
- * information array.
* @param matchFilter The filter (Tx on advertiser and Rx on listener) which
* resulted in this match.
- * @param matchFilterLength The length of the match filter array.
*/
- public void onMatch(int peerId, byte[] serviceSpecificInfo,
- int serviceSpecificInfoLength, byte[] matchFilter, int matchFilterLength) {
+ public void onMatch(int peerId, byte[] serviceSpecificInfo, byte[] matchFilter) {
/* empty */
}
@@ -204,10 +200,8 @@
*
* @param peerId The ID of the peer sending the message.
* @param message A byte array containing the message.
- * @param messageLength The length of the byte array containing the relevant
- * message bytes.
*/
- public void onMessageReceived(int peerId, byte[] message, int messageLength) {
+ public void onMessageReceived(int peerId, byte[] message) {
/* empty */
}
}
diff --git a/wifi/java/android/net/wifi/nan/WifiNanUtils.java b/wifi/java/android/net/wifi/nan/WifiNanUtils.java
new file mode 100644
index 0000000..c0f36b4
--- /dev/null
+++ b/wifi/java/android/net/wifi/nan/WifiNanUtils.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.wifi.nan;
+
+/**
+ * Provides utilities for the Wifi NAN manager/service.
+ *
+ * @hide
+ */
+public class WifiNanUtils {
+ /**
+ * Per spec: The Service Name is a UTF-8 encoded string from 1 to 255 bytes in length. The
+ * only acceptable single-byte UTF-8 symbols for a Service Name are alphanumeric values (A-Z,
+ * a-z, 0-9), the hyphen ('-'), and the period ('.'). All valid multi-byte UTF-8 characters
+ * are acceptable in a Service Name.
+ */
+ public static void validateServiceName(byte[] serviceNameData) throws IllegalArgumentException {
+ if (serviceNameData == null) {
+ throw new IllegalArgumentException("Invalid service name - null");
+ }
+
+ if (serviceNameData.length < 1 || serviceNameData.length > 255) {
+ throw new IllegalArgumentException("Invalid service name length - must be between "
+ + "1 and 255 bytes (UTF-8 encoding)");
+ }
+
+ int index = 0;
+ while (index < serviceNameData.length) {
+ byte b = serviceNameData[index];
+ if ((b & 0x80) == 0x00) {
+ if (!((b >= '0' && b <= '9') || (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z')
+ || b == '-' || b == '.')) {
+ throw new IllegalArgumentException("Invalid service name - illegal characters,"
+ + " allowed = (0-9, a-z,A-Z, -, .)");
+ }
+ }
+ ++index;
+ }
+ }
+}
